3068 files changed, 152891 insertions, 133499 deletions

diff --git a/.gitignore b/.gitignore
index e4079c6b4d..95a6964dd7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,6 +36,8 @@
 qt*-config.h
 qt*-config_p.h
 qt*-config.pri
+*.pyc
+.mypy_cache
 
 /include/
 
@@ -56,11 +58,12 @@ qt*-config.pri
 /src/angle/src/QtANGLE/libANGLE/
 /src/angle/src/libGLESv2/libANGLE/
 
-/examples/*/*/*
-!/examples/*/*/*[.]*
-!/examples/*/*/README
-!/examples/*/doc/*
-!/examples/*/doc/*/*
+# FIXME: Ignore these again?
+# /examples/*/*/*
+# !/examples/*/*/*[.]*
+# !/examples/*/*/README
+# !/examples/*/doc/*
+# !/examples/*/doc/*/*
 
 /translations/*.qm
 /translations/*_en.ts
@@ -321,3 +324,6 @@ wrapper.bat
 
 # Generated by qt.prf
 *_plugin_import.cpp
+
+# Typical cmake build directories
+/build*
diff --git a/.qmake.conf b/.qmake.conf
index 8cc650fc21..de7af300dc 100644
--- a/.qmake.conf
+++ b/.qmake.conf
@@ -6,4 +6,4 @@ DEFINES += QT_NO_JAVA_STYLE_ITERATORS
 QT_SOURCE_TREE = $$PWD
 QT_BUILD_TREE = $$shadowed($$PWD)
 
-MODULE_VERSION = 5.15.0
+MODULE_VERSION = 6.0.0
diff --git a/CMakeLists.txt b/CMakeLists.txt
new file mode 100644
index 0000000000..6c670e3eb8
--- /dev/null
+++ b/CMakeLists.txt
@@ -0,0 +1,102 @@
+# special case skip regeneration
+cmake_minimum_required(VERSION 3.15.0)
+
+# Run auto detection routines
+include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/QtAutoDetect.cmake)
+
+project(QtBase
+    VERSION 6.0.0
+    DESCRIPTION "Qt Base Libraries"
+    HOMEPAGE_URL "https://qt.io/"
+    LANGUAGES CXX C ASM
+)
+
+if(NOT QT_BUILD_STANDALONE_TESTS)
+    ## Add some paths to check for cmake modules:
+    list(PREPEND CMAKE_MODULE_PATH
+        "${CMAKE_CURRENT_SOURCE_DIR}/cmake"
+        "${CMAKE_CURRENT_SOURCE_DIR}/cmake/3rdparty/extra-cmake-modules/find-modules"
+        "${CMAKE_CURRENT_SOURCE_DIR}/cmake/3rdparty/kwin"
+    )
+
+    ## Find the build internals package.
+    set(QT_BUILD_INTERNALS_SKIP_CMAKE_MODULE_PATH_ADDITION TRUE)
+    list(PREPEND CMAKE_PREFIX_PATH
+        "${CMAKE_CURRENT_SOURCE_DIR}/cmake"
+    )
+    find_package(QtBuildInternals CMAKE_FIND_ROOT_PATH_BOTH)
+    unset(QT_BUILD_INTERNALS_SKIP_CMAKE_MODULE_PATH_ADDITION)
+else()
+    # When building standalone tests, an istalled BuildInternals package already exists.
+    find_package(Qt6 REQUIRED COMPONENTS BuildInternals CMAKE_FIND_ROOT_PATH_BOTH)
+endif()
+
+qt_build_repo_begin()
+
+if(NOT QT_BUILD_STANDALONE_TESTS)
+    ## Should this Qt be static or dynamically linked?
+    option(BUILD_SHARED_LIBS "Build Qt statically or dynamically" ON)
+    set(QT_BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS})
+
+    ## Should this Qt be built with Werror?
+    option(WARNINGS_ARE_ERRORS "Build Qt with warnings as errors" ${FEATURE_developer_build})
+
+    ## Should Qt be built using PCH?
+    option(BUILD_WITH_PCH "Build Qt using precompiled headers?" ON)
+
+    ## QtBase specific configure tests:
+    include(QtBaseConfigureTests)
+
+    ## Build System tests:
+    include(QtBaseCMakeTesting)
+
+    ## Targets for global features, etc.:
+    include(QtBaseGlobalTargets)
+
+    ## Set language standards after QtBaseGlobalTargets, because that's when the relevant
+    ## feature variables are available.
+    qt_set_language_standards()
+
+    #include CoreMacros() for qt6_generate_meta_types()
+    include(src/corelib/Qt6CoreMacros.cmake)
+
+    ## Setup documentation
+    add_subdirectory(doc)
+
+    ## Visit all the directories:
+    add_subdirectory(src)
+endif()
+
+if(BUILD_TESTING)
+    add_subdirectory(tests)
+    if(QT_NO_MAKE_TESTS)
+        set_property(DIRECTORY tests PROPERTY EXCLUDE_FROM_ALL TRUE)
+    endif()
+endif()
+
+if(NOT QT_BUILD_STANDALONE_TESTS)
+    if(QT_WILL_BUILD_TOOLS)
+        add_subdirectory(qmake)
+    endif()
+    # As long as we use the mkspecs (for qplatformdefs.h), we need to always
+    # install it, especially when cross-compiling.
+    set(mkspecs_install_dir "${INSTALL_MKSPECSDIR}")
+    qt_path_join(mkspecs_install_dir ${QT_INSTALL_DIR} ${mkspecs_install_dir})
+
+    file(GLOB mkspecs_subdirs
+        LIST_DIRECTORIES TRUE
+        "${PROJECT_SOURCE_DIR}/mkspecs/*")
+    foreach(directory IN LISTS mkspecs_subdirs)
+        qt_copy_or_install(DIRECTORY "${directory}"
+                          DESTINATION ${mkspecs_install_dir})
+    endforeach()
+endif()
+
+qt_build_repo_end()
+
+if(NOT QT_BUILD_STANDALONE_TESTS AND BUILD_EXAMPLES)
+    add_subdirectory(examples)
+    if(QT_NO_MAKE_EXAMPLES)
+        set_property(DIRECTORY examples PROPERTY EXCLUDE_FROM_ALL TRUE)
+    endif()
+endif()
diff --git a/bin/qt-cmake.bat.in b/bin/qt-cmake.bat.in
new file mode 100644
index 0000000000..6e5b27010b
--- /dev/null
+++ b/bin/qt-cmake.bat.in
@@ -0,0 +1 @@
+"@CMAKE_COMMAND@" -DCMAKE_TOOLCHAIN_FILE="@__GlobalConfig_install_dir_absolute@/qt.toolchain.cmake" @__qt_cmake_extra@ %*
diff --git a/bin/qt-cmake.in b/bin/qt-cmake.in
new file mode 100755
index 0000000000..2b42592267
--- /dev/null
+++ b/bin/qt-cmake.in
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exec @CMAKE_COMMAND@ -DCMAKE_TOOLCHAIN_FILE=@__GlobalConfig_install_dir_absolute@/qt.toolchain.cmake @__qt_cmake_extra@ "$@"
diff --git a/cmake/3rdparty/extra-cmake-modules/COPYING-CMAKE-SCRIPTS b/cmake/3rdparty/extra-cmake-modules/COPYING-CMAKE-SCRIPTS
new file mode 100644
index 0000000000..4b417765f3
--- /dev/null
+++ b/cmake/3rdparty/extra-cmake-modules/COPYING-CMAKE-SCRIPTS
@@ -0,0 +1,22 @@
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the copyright
+   notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+3. The name of the author may not be used to endorse or promote products 
+   derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/cmake/3rdparty/extra-cmake-modules/find-modules/ECMFindModuleHelpersStub.cmake b/cmake/3rdparty/extra-cmake-modules/find-modules/ECMFindModuleHelpersStub.cmake
new file mode 100644
index 0000000000..bb8c9a62fc
--- /dev/null
+++ b/cmake/3rdparty/extra-cmake-modules/find-modules/ECMFindModuleHelpersStub.cmake
@@ -0,0 +1 @@
+include(${CMAKE_CURRENT_LIST_DIR}/../modules/ECMFindModuleHelpers.cmake)
diff --git a/cmake/3rdparty/extra-cmake-modules/find-modules/FindEGL.cmake b/cmake/3rdparty/extra-cmake-modules/find-modules/FindEGL.cmake
new file mode 100644
index 0000000000..48e5172877
--- /dev/null
+++ b/cmake/3rdparty/extra-cmake-modules/find-modules/FindEGL.cmake
@@ -0,0 +1,172 @@
+#.rst:
+# FindEGL
+# -------
+#
+# Try to find EGL.
+#
+# This will define the following variables:
+#
+# ``EGL_FOUND``
+#     True if (the requested version of) EGL is available
+# ``EGL_VERSION``
+#     The version of EGL; note that this is the API version defined in the
+#     headers, rather than the version of the implementation (eg: Mesa)
+# ``EGL_LIBRARIES``
+#     This can be passed to target_link_libraries() instead of the ``EGL::EGL``
+#     target
+# ``EGL_INCLUDE_DIRS``
+#     This should be passed to target_include_directories() if the target is not
+#     used for linking
+# ``EGL_DEFINITIONS``
+#     This should be passed to target_compile_options() if the target is not
+#     used for linking
+#
+# If ``EGL_FOUND`` is TRUE, it will also define the following imported target:
+#
+# ``EGL::EGL``
+#     The EGL library
+#
+# In general we recommend using the imported target, as it is easier to use.
+# Bear in mind, however, that if the target is in the link interface of an
+# exported library, it must be made available by the package config file.
+#
+# Since pre-1.0.0.
+
+#=============================================================================
+# Copyright 2014 Alex Merry <alex.merry@kde.org>
+# Copyright 2014 Martin Gräßlin <mgraesslin@kde.org>
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+# 3. The name of the author may not be used to endorse or promote products
+#    derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#=============================================================================
+
+include(${CMAKE_CURRENT_LIST_DIR}/ECMFindModuleHelpersStub.cmake)
+include(CheckCXXSourceCompiles)
+include(CMakePushCheckState)
+
+ecm_find_package_version_check(EGL)
+
+# Use pkg-config to get the directories and then use these values
+# in the FIND_PATH() and FIND_LIBRARY() calls
+find_package(PkgConfig)
+pkg_check_modules(PKG_EGL QUIET egl)
+
+set(EGL_DEFINITIONS ${PKG_EGL_CFLAGS_OTHER})
+
+find_path(EGL_INCLUDE_DIR
+    NAMES
+        EGL/egl.h
+    HINTS
+        ${PKG_EGL_INCLUDE_DIRS}
+)
+find_library(EGL_LIBRARY
+    NAMES
+        EGL
+    HINTS
+        ${PKG_EGL_LIBRARY_DIRS}
+)
+
+# NB: We do *not* use the version information from pkg-config, as that
+#     is the implementation version (eg: the Mesa version)
+if(EGL_INCLUDE_DIR)
+    # egl.h has defines of the form EGL_VERSION_x_y for each supported
+    # version; so the header for EGL 1.1 will define EGL_VERSION_1_0 and
+    # EGL_VERSION_1_1.  Finding the highest supported version involves
+    # finding all these defines and selecting the highest numbered.
+    file(READ "${EGL_INCLUDE_DIR}/EGL/egl.h" _EGL_header_contents)
+    string(REGEX MATCHALL
+        "[ \t]EGL_VERSION_[0-9_]+"
+        _EGL_version_lines
+        "${_EGL_header_contents}"
+    )
+    unset(_EGL_header_contents)
+    foreach(_EGL_version_line ${_EGL_version_lines})
+        string(REGEX REPLACE
+            "[ \t]EGL_VERSION_([0-9_]+)"
+            "\\1"
+            _version_candidate
+            "${_EGL_version_line}"
+        )
+        string(REPLACE "_" "." _version_candidate "${_version_candidate}")
+        if(NOT DEFINED EGL_VERSION OR EGL_VERSION VERSION_LESS _version_candidate)
+            set(EGL_VERSION "${_version_candidate}")
+        endif()
+    endforeach()
+    unset(_EGL_version_lines)
+endif()
+
+cmake_push_check_state(RESET)
+list(APPEND CMAKE_REQUIRED_LIBRARIES "${EGL_LIBRARY}")
+list(APPEND CMAKE_REQUIRED_INCLUDES "${EGL_INCLUDE_DIR}")
+
+check_cxx_source_compiles("
+#include <EGL/egl.h>
+
+int main(int argc, char *argv[]) {
+    EGLint x = 0; EGLDisplay dpy = 0; EGLContext ctx = 0;
+    eglDestroyContext(dpy, ctx);
+}" HAVE_EGL)
+
+cmake_pop_check_state()
+
+set(required_vars EGL_INCLUDE_DIR HAVE_EGL)
+if(NOT EMSCRIPTEN)
+    list(APPEND required_vars EGL_LIBRARY)
+endif()
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(EGL
+    FOUND_VAR
+        EGL_FOUND
+    REQUIRED_VARS
+        ${required_vars}
+    VERSION_VAR
+        EGL_VERSION
+)
+
+if(EGL_FOUND AND NOT TARGET EGL::EGL)
+    if (EMSCRIPTEN)
+        add_library(EGL::EGL INTERFACE IMPORTED)
+        # Nothing further to be done, system include paths have headers and linkage is implicit.
+    else()
+        add_library(EGL::EGL UNKNOWN IMPORTED)
+        set_target_properties(EGL::EGL PROPERTIES
+            IMPORTED_LOCATION "${EGL_LIBRARY}"
+            INTERFACE_COMPILE_OPTIONS "${EGL_DEFINITIONS}"
+            INTERFACE_INCLUDE_DIRECTORIES "${EGL_INCLUDE_DIR}"
+        )
+    endif()
+endif()
+
+mark_as_advanced(EGL_LIBRARY EGL_INCLUDE_DIR HAVE_EGL)
+
+# compatibility variables
+set(EGL_LIBRARIES ${EGL_LIBRARY})
+set(EGL_INCLUDE_DIRS ${EGL_INCLUDE_DIR})
+set(EGL_VERSION_STRING ${EGL_VERSION})
+
+include(FeatureSummary)
+set_package_properties(EGL PROPERTIES
+    URL "https://www.khronos.org/egl/"
+    DESCRIPTION "A platform-agnostic mechanism for creating rendering surfaces for use with other graphics libraries, such as OpenGL|ES and OpenVG."
+)
diff --git a/cmake/3rdparty/extra-cmake-modules/find-modules/FindGLIB2.cmake b/cmake/3rdparty/extra-cmake-modules/find-modules/FindGLIB2.cmake
new file mode 100644
index 0000000000..993535123a
--- /dev/null
+++ b/cmake/3rdparty/extra-cmake-modules/find-modules/FindGLIB2.cmake
@@ -0,0 +1,101 @@
+#.rst:
+# FindGLIB2
+# ---------
+#
+# Try to locate the GLib2 library.
+# If found, this will define the following variables:
+#
+# ``GLIB2_FOUND``
+#     True if the GLib2 library is available
+# ``GLIB2_INCLUDE_DIRS``
+#     The GLib2 include directories
+# ``GLIB2_LIBRARIES``
+#     The GLib2 libraries for linking
+# ``GLIB2_INCLUDE_DIR``
+#     Deprecated, use ``GLIB2_INCLUDE_DIRS``
+# ``GLIB2_LIBRARY``
+#     Deprecated, use ``GLIB2_LIBRARIES``
+#
+# If ``GLIB2_FOUND`` is TRUE, it will also define the following
+# imported target:
+#
+# ``GLIB2::GLIB2``
+#     The GLIB2 library
+#
+# Since 5.41.0.
+
+#=============================================================================
+# Copyright (c) 2008 Laurent Montel, <montel@kde.org>
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+# 3. The name of the author may not be used to endorse or promote products
+#    derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#=============================================================================
+
+find_package(PkgConfig)
+pkg_check_modules(PC_GLIB2 QUIET glib-2.0)
+
+find_path(GLIB2_INCLUDE_DIRS
+          NAMES glib.h
+          HINTS ${PC_GLIB2_INCLUDEDIR}
+          PATH_SUFFIXES glib-2.0)
+
+find_library(GLIB2_LIBRARIES
+             NAMES glib-2.0
+             HINTS ${PC_GLIB2_LIBDIR}
+)
+
+# search the glibconfig.h include dir under the same root where the library is found
+get_filename_component(glib2LibDir "${GLIB2_LIBRARIES}" PATH)
+
+find_path(GLIB2_INTERNAL_INCLUDE_DIR glibconfig.h
+          PATH_SUFFIXES glib-2.0/include
+          HINTS ${PC_GLIB2_INCLUDEDIR} "${glib2LibDir}" ${CMAKE_SYSTEM_LIBRARY_PATH})
+
+# not sure if this include dir is optional or required
+# for now it is optional
+if(GLIB2_INTERNAL_INCLUDE_DIR)
+  list(APPEND GLIB2_INCLUDE_DIRS "${GLIB2_INTERNAL_INCLUDE_DIR}")
+endif()
+
+# Deprecated synonyms
+set(GLIB2_INCLUDE_DIR "${GLIB2_INCLUDE_DIRS}")
+set(GLIB2_LIBRARY "${GLIB2_LIBRARIES}")
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(GLIB2 DEFAULT_MSG GLIB2_LIBRARIES GLIB2_INCLUDE_DIRS)
+
+if(GLIB2_FOUND AND NOT TARGET GLIB2::GLIB2)
+  add_library(GLIB2::GLIB2 UNKNOWN IMPORTED)
+  set_target_properties(GLIB2::GLIB2 PROPERTIES
+                        IMPORTED_LOCATION "${GLIB2_LIBRARIES}"
+			INTERFACE_INCLUDE_DIRECTORIES "${GLIB2_INCLUDE_DIRS}")
+endif()
+
+mark_as_advanced(GLIB2_INCLUDE_DIRS GLIB2_INCLUDE_DIR
+                 GLIB2_LIBRARIES GLIB2_LIBRARY)
+
+include(FeatureSummary)
+set_package_properties(GLIB2 PROPERTIES
+  URL "https://wiki.gnome.org/Projects/GLib"
+  DESCRIPTION "Event loop and utility library")
+
diff --git a/cmake/3rdparty/extra-cmake-modules/find-modules/FindWayland.cmake b/cmake/3rdparty/extra-cmake-modules/find-modules/FindWayland.cmake
new file mode 100644
index 0000000000..233cc88d02
--- /dev/null
+++ b/cmake/3rdparty/extra-cmake-modules/find-modules/FindWayland.cmake
@@ -0,0 +1,143 @@
+#.rst:
+# FindWayland
+# -----------
+#
+# Try to find Wayland.
+#
+# This is a component-based find module, which makes use of the COMPONENTS
+# and OPTIONAL_COMPONENTS arguments to find_module.  The following components
+# are available::
+#
+#   Client  Server  Cursor  Egl
+#
+# If no components are specified, this module will act as though all components
+# were passed to OPTIONAL_COMPONENTS.
+#
+# This module will define the following variables, independently of the
+# components searched for or found:
+#
+# ``Wayland_FOUND``
+#     TRUE if (the requested version of) Wayland is available
+# ``Wayland_VERSION``
+#     Found Wayland version
+# ``Wayland_TARGETS``
+#     A list of all targets imported by this module (note that there may be more
+#     than the components that were requested)
+# ``Wayland_LIBRARIES``
+#     This can be passed to target_link_libraries() instead of the imported
+#     targets
+# ``Wayland_INCLUDE_DIRS``
+#     This should be passed to target_include_directories() if the targets are
+#     not used for linking
+# ``Wayland_DEFINITIONS``
+#     This should be passed to target_compile_options() if the targets are not
+#     used for linking
+#
+# For each searched-for components, ``Wayland_<component>_FOUND`` will be set to
+# TRUE if the corresponding Wayland library was found, and FALSE otherwise.  If
+# ``Wayland_<component>_FOUND`` is TRUE, the imported target
+# ``Wayland::<component>`` will be defined.  This module will also attempt to
+# determine ``Wayland_*_VERSION`` variables for each imported target, although
+# ``Wayland_VERSION`` should normally be sufficient.
+#
+# In general we recommend using the imported targets, as they are easier to use
+# and provide more control.  Bear in mind, however, that if any target is in the
+# link interface of an exported library, it must be made available by the
+# package config file.
+#
+# Since pre-1.0.0.
+
+#=============================================================================
+# Copyright 2014 Alex Merry <alex.merry@kde.org>
+# Copyright 2014 Martin Gräßlin <mgraesslin@kde.org>
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+# 3. The name of the author may not be used to endorse or promote products
+#    derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#=============================================================================
+
+include(${CMAKE_CURRENT_LIST_DIR}/ECMFindModuleHelpersStub.cmake)
+
+ecm_find_package_version_check(Wayland)
+
+set(Wayland_known_components
+    Client
+    Server
+    Cursor
+    Egl
+)
+foreach(_comp ${Wayland_known_components})
+    string(TOLOWER "${_comp}" _lc_comp)
+    set(Wayland_${_comp}_component_deps)
+    set(Wayland_${_comp}_pkg_config "wayland-${_lc_comp}")
+    set(Wayland_${_comp}_lib "wayland-${_lc_comp}")
+    set(Wayland_${_comp}_header "wayland-${_lc_comp}.h")
+endforeach()
+set(Wayland_Egl_component_deps Client)
+
+ecm_find_package_parse_components(Wayland
+    RESULT_VAR Wayland_components
+    KNOWN_COMPONENTS ${Wayland_known_components}
+)
+ecm_find_package_handle_library_components(Wayland
+    COMPONENTS ${Wayland_components}
+)
+
+# If pkg-config didn't provide us with version information,
+# try to extract it from wayland-version.h
+# (Note that the version from wayland-egl.pc will probably be
+# the Mesa version, rather than the Wayland version, but that
+# version will be ignored as we always find wayland-client.pc
+# first).
+if(NOT Wayland_VERSION)
+    find_file(Wayland_VERSION_HEADER
+        NAMES wayland-version.h
+        HINTS ${Wayland_INCLUDE_DIRS}
+    )
+    mark_as_advanced(Wayland_VERSION_HEADER)
+    if(Wayland_VERSION_HEADER)
+        file(READ ${Wayland_VERSION_HEADER} _wayland_version_header_contents)
+        string(REGEX REPLACE
+            "^.*[ \t]+WAYLAND_VERSION[ \t]+\"([0-9.]*)\".*$"
+            "\\1"
+            Wayland_VERSION
+            "${_wayland_version_header_contents}"
+        )
+        unset(_wayland_version_header_contents)
+    endif()
+endif()
+
+find_package_handle_standard_args(Wayland
+    FOUND_VAR
+        Wayland_FOUND
+    REQUIRED_VARS
+        Wayland_LIBRARIES
+    VERSION_VAR
+        Wayland_VERSION
+    HANDLE_COMPONENTS
+)
+
+include(FeatureSummary)
+set_package_properties(Wayland PROPERTIES
+    URL "http://wayland.freedesktop.org"
+    DESCRIPTION "C library implementation of the Wayland protocol: a protocol for a compositor to talk to its clients"
+)
diff --git a/cmake/3rdparty/extra-cmake-modules/find-modules/FindWaylandScanner.cmake b/cmake/3rdparty/extra-cmake-modules/find-modules/FindWaylandScanner.cmake
new file mode 100644
index 0000000000..13291afcda
--- /dev/null
+++ b/cmake/3rdparty/extra-cmake-modules/find-modules/FindWaylandScanner.cmake
@@ -0,0 +1,173 @@
+#.rst:
+# FindWaylandScanner
+# ------------------
+#
+# Try to find wayland-scanner.
+#
+# If the wayland-scanner executable is not in your PATH, you can provide
+# an alternative name or full path location with the ``WaylandScanner_EXECUTABLE``
+# variable.
+#
+# This will define the following variables:
+#
+# ``WaylandScanner_FOUND``
+#     True if wayland-scanner is available.
+#
+# ``WaylandScanner_EXECUTABLE``
+#     The wayland-scanner executable.
+#
+# If ``WaylandScanner_FOUND`` is TRUE, it will also define the following imported
+# target:
+#
+# ``Wayland::Scanner``
+#     The wayland-scanner executable.
+#
+# This module provides the following functions to generate C protocol
+# implementations:
+#
+#   - ``ecm_add_wayland_client_protocol``
+#   - ``ecm_add_wayland_server_protocol``
+#
+# ::
+#
+#   ecm_add_wayland_client_protocol(<source_files_var>
+#                                   PROTOCOL <xmlfile>
+#                                   BASENAME <basename>)
+#
+# Generate Wayland client protocol files from ``<xmlfile>`` XML
+# definition for the ``<basename>`` interface and append those files
+# to ``<source_files_var>``.
+#
+# ::
+#
+#   ecm_add_wayland_server_protocol(<source_files_var>
+#                                   PROTOCOL <xmlfile>
+#                                   BASENAME <basename>)
+#
+# Generate Wayland server protocol files from ``<xmlfile>`` XML
+# definition for the ``<basename>`` interface and append those files
+# to ``<source_files_var>``.
+#
+# Since 1.4.0.
+
+#=============================================================================
+# Copyright 2012-2014 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+# 3. The name of the author may not be used to endorse or promote products
+#    derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#=============================================================================
+
+include(${CMAKE_CURRENT_LIST_DIR}/ECMFindModuleHelpersStub.cmake)
+
+ecm_find_package_version_check(WaylandScanner)
+
+# Find wayland-scanner
+find_program(WaylandScanner_EXECUTABLE NAMES wayland-scanner)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(WaylandScanner
+    FOUND_VAR
+        WaylandScanner_FOUND
+    REQUIRED_VARS
+        WaylandScanner_EXECUTABLE
+)
+
+mark_as_advanced(WaylandScanner_EXECUTABLE)
+
+if(NOT TARGET Wayland::Scanner AND WaylandScanner_FOUND)
+    add_executable(Wayland::Scanner IMPORTED)
+    set_target_properties(Wayland::Scanner PROPERTIES
+        IMPORTED_LOCATION "${WaylandScanner_EXECUTABLE}"
+    )
+endif()
+
+include(FeatureSummary)
+set_package_properties(WaylandScanner PROPERTIES
+    URL "https://wayland.freedesktop.org/"
+    DESCRIPTION "Executable that converts XML protocol files to C code"
+)
+
+
+include(CMakeParseArguments)
+
+function(ecm_add_wayland_client_protocol out_var)
+    # Parse arguments
+    set(oneValueArgs PROTOCOL BASENAME)
+    cmake_parse_arguments(ARGS "" "${oneValueArgs}" "" ${ARGN})
+
+    if(ARGS_UNPARSED_ARGUMENTS)
+        message(FATAL_ERROR "Unknown keywords given to ecm_add_wayland_client_protocol(): \"${ARGS_UNPARSED_ARGUMENTS}\"")
+    endif()
+
+    get_filename_component(_infile ${ARGS_PROTOCOL} ABSOLUTE)
+    set(_client_header "${CMAKE_CURRENT_BINARY_DIR}/wayland-${ARGS_BASENAME}-client-protocol.h")
+    set(_code "${CMAKE_CURRENT_BINARY_DIR}/wayland-${ARGS_BASENAME}-protocol.c")
+
+    set_source_files_properties(${_client_header} GENERATED)
+    set_source_files_properties(${_code} GENERATED)
+    set_property(SOURCE ${_client_header} PROPERTY SKIP_AUTOMOC ON)
+
+    add_custom_command(OUTPUT "${_client_header}"
+        COMMAND ${WaylandScanner_EXECUTABLE} client-header ${_infile} ${_client_header}
+        DEPENDS ${WaylandScanner_EXECUTABLE} ${_infile}
+        VERBATIM
+    )
+
+    add_custom_command(OUTPUT "${_code}"
+        COMMAND ${WaylandScanner_EXECUTABLE} code ${_infile} ${_code}
+        DEPENDS ${WaylandScanner_EXECUTABLE} ${_infile} ${_client_header}
+        VERBATIM
+    )
+
+    list(APPEND ${out_var} "${_client_header}" "${_code}")
+    set(${out_var} ${${out_var}} PARENT_SCOPE)
+endfunction()
+
+
+function(ecm_add_wayland_server_protocol out_var)
+    # Parse arguments
+    set(oneValueArgs PROTOCOL BASENAME)
+    cmake_parse_arguments(ARGS "" "${oneValueArgs}" "" ${ARGN})
+
+    if(ARGS_UNPARSED_ARGUMENTS)
+        message(FATAL_ERROR "Unknown keywords given to ecm_add_wayland_server_protocol(): \"${ARGS_UNPARSED_ARGUMENTS}\"")
+    endif()
+
+    ecm_add_wayland_client_protocol(${out_var}
+                                    PROTOCOL ${ARGS_PROTOCOL}
+                                    BASENAME ${ARGS_BASENAME})
+
+    get_filename_component(_infile ${ARGS_PROTOCOL} ABSOLUTE)
+    set(_server_header "${CMAKE_CURRENT_BINARY_DIR}/wayland-${ARGS_BASENAME}-server-protocol.h")
+    set_property(SOURCE ${_server_header} PROPERTY SKIP_AUTOMOC ON)
+    set_source_files_properties(${_server_header} GENERATED)
+
+    add_custom_command(OUTPUT "${_server_header}"
+        COMMAND ${WaylandScanner_EXECUTABLE} server-header ${_infile} ${_server_header}
+        DEPENDS ${WaylandScanner_EXECUTABLE} ${_infile}
+        VERBATIM
+   )
+
+    list(APPEND ${out_var} "${_server_header}")
+    set(${out_var} ${${out_var}} PARENT_SCOPE)
+endfunction()
diff --git a/cmake/3rdparty/extra-cmake-modules/find-modules/FindX11_XCB.cmake b/cmake/3rdparty/extra-cmake-modules/find-modules/FindX11_XCB.cmake
new file mode 100644
index 0000000000..dd55fd7b30
--- /dev/null
+++ b/cmake/3rdparty/extra-cmake-modules/find-modules/FindX11_XCB.cmake
@@ -0,0 +1,118 @@
+#.rst:
+# FindX11_XCB
+# -----------
+#
+# Try to find the X11 XCB compatibility library.
+#
+# This will define the following variables:
+#
+# ``X11_XCB_FOUND``
+#     True if (the requested version of) libX11-xcb is available
+# ``X11_XCB_VERSION``
+#     The version of libX11-xcb (this is not guaranteed to be set even when
+#     X11_XCB_FOUND is true)
+# ``X11_XCB_LIBRARIES``
+#     This can be passed to target_link_libraries() instead of the ``EGL::EGL``
+#     target
+# ``X11_XCB_INCLUDE_DIR``
+#     This should be passed to target_include_directories() if the target is not
+#     used for linking
+# ``X11_XCB_DEFINITIONS``
+#     This should be passed to target_compile_options() if the target is not
+#     used for linking
+#
+# If ``X11_XCB_FOUND`` is TRUE, it will also define the following imported
+# target:
+#
+# ``X11::XCB``
+#     The X11 XCB compatibility library
+#
+# In general we recommend using the imported target, as it is easier to use.
+# Bear in mind, however, that if the target is in the link interface of an
+# exported library, it must be made available by the package config file.
+#
+# Since pre-1.0.0.
+
+#=============================================================================
+# Copyright 2014 Alex Merry <alex.merry@kde.org>
+# Copyright 2011 Fredrik Höglund <fredrik@kde.org>
+# Copyright 2008 Helio Chissini de Castro <helio@kde.org>
+# Copyright 2007 Matthias Kretz <kretz@kde.org>
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+# 3. The name of the author may not be used to endorse or promote products
+#    derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#=============================================================================
+
+include(${CMAKE_CURRENT_LIST_DIR}/ECMFindModuleHelpersStub.cmake)
+
+ecm_find_package_version_check(X11_XCB)
+
+# use pkg-config to get the directories and then use these values
+# in the FIND_PATH() and FIND_LIBRARY() calls
+find_package(PkgConfig)
+pkg_check_modules(PKG_X11_XCB QUIET x11-xcb)
+
+set(X11_XCB_DEFINITIONS ${PKG_X11_XCB_CFLAGS_OTHER})
+set(X11_XCB_VERSION ${PKG_X11_XCB_VERSION})
+
+find_path(X11_XCB_INCLUDE_DIR
+    NAMES X11/Xlib-xcb.h
+    HINTS ${PKG_X11_XCB_INCLUDE_DIRS}
+)
+find_library(X11_XCB_LIBRARY
+    NAMES X11-xcb
+    HINTS ${PKG_X11_XCB_LIBRARY_DIRS}
+)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(X11_XCB
+    FOUND_VAR
+        X11_XCB_FOUND
+    REQUIRED_VARS
+        X11_XCB_LIBRARY
+        X11_XCB_INCLUDE_DIR
+    VERSION_VAR
+        X11_XCB_VERSION
+)
+
+if(X11_XCB_FOUND AND NOT TARGET X11::XCB)
+    add_library(X11::XCB UNKNOWN IMPORTED)
+    set_target_properties(X11::XCB PROPERTIES
+        IMPORTED_LOCATION "${X11_XCB_LIBRARY}"
+        INTERFACE_COMPILE_OPTIONS "${X11_XCB_DEFINITIONS}"
+        INTERFACE_INCLUDE_DIRECTORIES "${X11_XCB_INCLUDE_DIR}"
+    )
+endif()
+
+mark_as_advanced(X11_XCB_INCLUDE_DIR X11_XCB_LIBRARY)
+
+# compatibility variables
+set(X11_XCB_LIBRARIES ${X11_XCB_LIBRARY})
+set(X11_XCB_INCLUDE_DIRS ${X11_XCB_INCLUDE_DIR})
+set(X11_XCB_VERSION_STRING ${X11_XCB_VERSION})
+
+include(FeatureSummary)
+set_package_properties(X11_XCB PROPERTIES
+    URL "http://xorg.freedesktop.org/"
+    DESCRIPTION "A compatibility library for code that translates Xlib API calls into XCB calls"
+)
diff --git a/cmake/3rdparty/extra-cmake-modules/find-modules/FindXCB.cmake b/cmake/3rdparty/extra-cmake-modules/find-modules/FindXCB.cmake
new file mode 100644
index 0000000000..d530d2d7f4
--- /dev/null
+++ b/cmake/3rdparty/extra-cmake-modules/find-modules/FindXCB.cmake
@@ -0,0 +1,201 @@
+#.rst:
+# FindXCB
+# -------
+#
+# Try to find XCB.
+#
+# This is a component-based find module, which makes use of the COMPONENTS and
+# OPTIONAL_COMPONENTS arguments to find_module.  The following components are
+# available::
+#
+#   XCB
+#   ATOM         AUX          COMPOSITE    CURSOR       DAMAGE
+#   DPMS         DRI2         DRI3         EVENT        EWMH
+#   GLX          ICCCM        IMAGE        KEYSYMS      PRESENT
+#   RANDR        RECORD       RENDER       RENDERUTIL   RES
+#   SCREENSAVER  SHAPE        SHM          SYNC         UTIL
+#   XEVIE        XF86DRI      XFIXES       XINERAMA     XINPUT
+#   XKB          XPRINT       XTEST        XV           XVMC
+#
+# If no components are specified, this module will act as though all components
+# except XINPUT (which is considered unstable) were passed to
+# OPTIONAL_COMPONENTS.
+#
+# This module will define the following variables, independently of the
+# components searched for or found:
+#
+# ``XCB_FOUND``
+#     True if (the requestion version of) xcb is available
+# ``XCB_VERSION``
+#     Found xcb version
+# ``XCB_TARGETS``
+#     A list of all targets imported by this module (note that there may be more
+#     than the components that were requested)
+# ``XCB_LIBRARIES``
+#     This can be passed to target_link_libraries() instead of the imported
+#     targets
+# ``XCB_INCLUDE_DIRS``
+#     This should be passed to target_include_directories() if the targets are
+#     not used for linking
+# ``XCB_DEFINITIONS``
+#     This should be passed to target_compile_options() if the targets are not
+#     used for linking
+#
+# For each searched-for components, ``XCB_<component>_FOUND`` will be set to
+# true if the corresponding xcb library was found, and false otherwise.  If
+# ``XCB_<component>_FOUND`` is true, the imported target ``XCB::<component>``
+# will be defined.  This module will also attempt to determine
+# ``XCB_*_VERSION`` variables for each imported target, although
+# ``XCB_VERSION`` should normally be sufficient.
+#
+# In general we recommend using the imported targets, as they are easier to use
+# and provide more control.  Bear in mind, however, that if any target is in the
+# link interface of an exported library, it must be made available by the
+# package config file.
+#
+# Since pre-1.0.0.
+
+#=============================================================================
+# Copyright 2011 Fredrik Höglund <fredrik@kde.org>
+# Copyright 2013 Martin Gräßlin <mgraesslin@kde.org>
+# Copyright 2014-2015 Alex Merry <alex.merry@kde.org>
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+# 3. The name of the author may not be used to endorse or promote products
+#    derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#=============================================================================
+
+include(${CMAKE_CURRENT_LIST_DIR}/ECMFindModuleHelpersStub.cmake)
+
+ecm_find_package_version_check(XCB)
+
+# Note that this list needs to be ordered such that any component
+# appears after its dependencies
+set(XCB_known_components
+    XCB
+    RENDER
+    SHAPE
+    XFIXES
+    SHM
+    ATOM
+    AUX
+    COMPOSITE
+    CURSOR
+    DAMAGE
+    DPMS
+    DRI2
+    DRI3
+    EVENT
+    EWMH
+    GLX
+    ICCCM
+    IMAGE
+    KEYSYMS
+    PRESENT
+    RANDR
+    RECORD
+    RENDERUTIL
+    RES
+    SCREENSAVER
+    SYNC
+    UTIL
+    XEVIE
+    XF86DRI
+    XINERAMA
+    XINPUT
+    XKB
+    XPRINT
+    XTEST
+    XV
+    XVMC
+)
+
+# XINPUT is unstable; do not include it by default
+set(XCB_default_components ${XCB_known_components})
+list(REMOVE_ITEM XCB_default_components "XINPUT")
+
+# default component info: xcb components have fairly predictable
+# header files, library names and pkg-config names
+foreach(_comp ${XCB_known_components})
+    string(TOLOWER "${_comp}" _lc_comp)
+    set(XCB_${_comp}_component_deps XCB)
+    set(XCB_${_comp}_pkg_config "xcb-${_lc_comp}")
+    set(XCB_${_comp}_lib "xcb-${_lc_comp}")
+    set(XCB_${_comp}_header "xcb/${_lc_comp}.h")
+endforeach()
+# exceptions
+set(XCB_XCB_component_deps)
+set(XCB_COMPOSITE_component_deps XCB XFIXES)
+set(XCB_DAMAGE_component_deps XCB XFIXES)
+set(XCB_IMAGE_component_deps XCB SHM)
+set(XCB_RENDERUTIL_component_deps XCB RENDER)
+set(XCB_XFIXES_component_deps XCB RENDER SHAPE)
+set(XCB_XVMC_component_deps XCB XV)
+set(XCB_XV_component_deps XCB SHM)
+set(XCB_XCB_pkg_config "xcb")
+set(XCB_XCB_lib "xcb")
+set(XCB_ATOM_header "xcb/xcb_atom.h")
+set(XCB_ATOM_lib "xcb-util")
+set(XCB_AUX_header "xcb/xcb_aux.h")
+set(XCB_AUX_lib "xcb-util")
+set(XCB_CURSOR_header "xcb/xcb_cursor.h")
+set(XCB_EVENT_header "xcb/xcb_event.h")
+set(XCB_EVENT_lib "xcb-util")
+set(XCB_EWMH_header "xcb/xcb_ewmh.h")
+set(XCB_ICCCM_header "xcb/xcb_icccm.h")
+set(XCB_IMAGE_header "xcb/xcb_image.h")
+set(XCB_KEYSYMS_header "xcb/xcb_keysyms.h")
+set(XCB_PIXEL_header "xcb/xcb_pixel.h")
+set(XCB_RENDERUTIL_header "xcb/xcb_renderutil.h")
+set(XCB_RENDERUTIL_lib "xcb-render-util")
+set(XCB_UTIL_header "xcb/xcb_util.h")
+
+ecm_find_package_parse_components(XCB
+    RESULT_VAR XCB_components
+    KNOWN_COMPONENTS ${XCB_known_components}
+    DEFAULT_COMPONENTS ${XCB_default_components}
+)
+
+list(FIND XCB_components "XINPUT" _XCB_XINPUT_index)
+if (NOT _XCB_XINPUT_index EQUAL -1)
+    message(AUTHOR_WARNING "XINPUT from XCB was requested: this is EXPERIMENTAL and is likely to unavailable on many systems!")
+endif()
+
+ecm_find_package_handle_library_components(XCB
+    COMPONENTS ${XCB_components}
+)
+
+find_package_handle_standard_args(XCB
+    FOUND_VAR
+        XCB_FOUND
+    REQUIRED_VARS
+        XCB_LIBRARIES
+    VERSION_VAR
+        XCB_VERSION
+    HANDLE_COMPONENTS
+)
+
+include(FeatureSummary)
+set_package_properties(XCB PROPERTIES
+    URL "http://xcb.freedesktop.org"
+    DESCRIPTION "X protocol C-language Binding"
+)
diff --git a/cmake/3rdparty/extra-cmake-modules/modules/ECMEnableSanitizers.cmake b/cmake/3rdparty/extra-cmake-modules/modules/ECMEnableSanitizers.cmake
new file mode 100644
index 0000000000..06cc0b66d8
--- /dev/null
+++ b/cmake/3rdparty/extra-cmake-modules/modules/ECMEnableSanitizers.cmake
@@ -0,0 +1,173 @@
+#.rst:
+# ECMEnableSanitizers
+# -------------------
+#
+# Enable compiler sanitizer flags.
+#
+# The following sanitizers are supported:
+#
+# - Address Sanitizer
+# - Memory Sanitizer
+# - Thread Sanitizer
+# - Leak Sanitizer
+# - Undefined Behaviour Sanitizer
+#
+# All of them are implemented in Clang, depending on your version, and
+# there is an work in progress in GCC, where some of them are currently
+# implemented.
+#
+# This module will check your current compiler version to see if it
+# supports the sanitizers that you want to enable
+#
+# Usage
+# =====
+#
+# Simply add::
+#
+#    include(ECMEnableSanitizers)
+#
+# to your ``CMakeLists.txt``. Note that this module is included in
+# KDECompilerSettings, so projects using that module do not need to also
+# include this one.
+#
+# The sanitizers are not enabled by default. Instead, you must set
+# ``ECM_ENABLE_SANITIZERS`` (either in your ``CMakeLists.txt`` or on the
+# command line) to a semicolon-separated list of sanitizers you wish to enable.
+# The options are:
+#
+# - address
+# - memory
+# - thread
+# - leak
+# - undefined
+#
+# The sanitizers "address", "memory" and "thread" are mutually exclusive.  You
+# cannot enable two of them in the same build.
+#
+# "leak" requires the  "address" sanitizer.
+#
+# .. note::
+#
+#   To reduce the overhead induced by the instrumentation of the sanitizers, it
+#   is advised to enable compiler optimizations (``-O1`` or higher).
+#
+# Example
+# =======
+#
+# This is an example of usage::
+#
+#   mkdir build
+#   cd build
+#   cmake -DECM_ENABLE_SANITIZERS='address;leak;undefined' ..
+#
+# .. note::
+#
+#   Most of the sanitizers will require Clang. To enable it, use::
+#
+#     -DCMAKE_CXX_COMPILER=clang++
+#
+# Since 1.3.0.
+
+#=============================================================================
+# Copyright 2014 Mathieu Tarral <mathieu.tarral@gmail.com>
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+# 3. The name of the author may not be used to endorse or promote products
+#    derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+# MACRO check_compiler_version
+#-----------------------------
+macro (check_compiler_version gcc_required_version clang_required_version)
+    if (
+        (
+            CMAKE_CXX_COMPILER_ID MATCHES "GNU"
+            AND
+            CMAKE_CXX_COMPILER_VERSION VERSION_LESS ${gcc_required_version}
+        )
+        OR
+        (
+            CMAKE_CXX_COMPILER_ID MATCHES "Clang"
+            AND
+            CMAKE_CXX_COMPILER_VERSION VERSION_LESS ${clang_required_version}
+        )
+    )
+        # error !
+        message(FATAL_ERROR "You ask to enable the sanitizer ${CUR_SANITIZER},
+        but your compiler ${CMAKE_CXX_COMPILER_ID} version ${CMAKE_CXX_COMPILER_VERSION}
+        does not support it !
+        You should use at least GCC ${gcc_required_version} or Clang ${clang_required_version}
+        (99.99 means not implemented yet)")
+    endif ()
+endmacro ()
+
+# MACRO check_compiler_support
+#------------------------------
+macro (enable_sanitizer_flags sanitize_option)
+    if (${sanitize_option} MATCHES "address")
+        check_compiler_version("4.8" "3.1")
+        set(XSAN_COMPILE_FLAGS "-fsanitize=address -fno-omit-frame-pointer -fno-optimize-sibling-calls")
+        set(XSAN_LINKER_FLAGS "asan")
+    elseif (${sanitize_option} MATCHES "thread")
+        check_compiler_version("4.8" "3.1")
+        set(XSAN_COMPILE_FLAGS "-fsanitize=thread")
+        set(XSAN_LINKER_FLAGS "tsan")
+    elseif (${sanitize_option} MATCHES "memory")
+        check_compiler_version("99.99" "3.1")
+        set(XSAN_COMPILE_FLAGS "-fsanitize=memory")
+    elseif (${sanitize_option} MATCHES "leak")
+        check_compiler_version("4.9" "3.4")
+        set(XSAN_COMPILE_FLAGS "-fsanitize=leak")
+        set(XSAN_LINKER_FLAGS "lsan")
+    elseif (${sanitize_option} MATCHES "undefined")
+        check_compiler_version("4.9" "3.1")
+        set(XSAN_COMPILE_FLAGS "-fsanitize=undefined -fno-omit-frame-pointer -fno-optimize-sibling-calls")
+    else ()
+        message(FATAL_ERROR "Compiler sanitizer option \"${sanitize_option}\" not supported.")
+    endif ()
+endmacro ()
+
+if (ECM_ENABLE_SANITIZERS)
+    if (CMAKE_CXX_COMPILER_ID MATCHES "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+        # for each element of the ECM_ENABLE_SANITIZERS list
+        foreach ( CUR_SANITIZER ${ECM_ENABLE_SANITIZERS} )
+            # lowercase filter
+            string(TOLOWER ${CUR_SANITIZER} CUR_SANITIZER)
+            # check option and enable appropriate flags
+            enable_sanitizer_flags ( ${CUR_SANITIZER} )
+            # TODO: GCC will not link pthread library if enabled ASan
+            if(CMAKE_C_COMPILER_ID MATCHES "Clang")
+              set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${XSAN_COMPILE_FLAGS}" )
+            endif()
+            set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${XSAN_COMPILE_FLAGS}" )
+            if(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
+              link_libraries(${XSAN_LINKER_FLAGS})
+            endif()
+            if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+                string(REPLACE "-Wl,--no-undefined" "" CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS}")
+                string(REPLACE "-Wl,--no-undefined" "" CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS}")
+            endif ()
+        endforeach()
+    else()
+        message(STATUS "Tried to enable sanitizers (-DECM_ENABLE_SANITIZERS=${ECM_ENABLE_SANITIZERS}), \
+but compiler (${CMAKE_CXX_COMPILER_ID}) does not have sanitizer support")
+    endif()
+endif()
diff --git a/cmake/3rdparty/extra-cmake-modules/modules/ECMFindModuleHelpers.cmake b/cmake/3rdparty/extra-cmake-modules/modules/ECMFindModuleHelpers.cmake
new file mode 100644
index 0000000000..f2e32f959e
--- /dev/null
+++ b/cmake/3rdparty/extra-cmake-modules/modules/ECMFindModuleHelpers.cmake
@@ -0,0 +1,297 @@
+#.rst:
+# ECMFindModuleHelpers
+# --------------------
+#
+# Helper macros for find modules: ecm_find_package_version_check(),
+# ecm_find_package_parse_components() and
+# ecm_find_package_handle_library_components().
+#
+# ::
+#
+#   ecm_find_package_version_check(<name>)
+#
+# Prints warnings if the CMake version or the project's required CMake version
+# is older than that required by extra-cmake-modules.
+#
+# ::
+#
+#   ecm_find_package_parse_components(<name>
+#       RESULT_VAR <variable>
+#       KNOWN_COMPONENTS <component1> [<component2> [...]]
+#       [SKIP_DEPENDENCY_HANDLING])
+#
+# This macro will populate <variable> with a list of components found in
+# <name>_FIND_COMPONENTS, after checking that all those components are in the
+# list of KNOWN_COMPONENTS; if there are any unknown components, it will print
+# an error or warning (depending on the value of <name>_FIND_REQUIRED) and call
+# return().
+#
+# The order of components in <variable> is guaranteed to match the order they
+# are listed in the KNOWN_COMPONENTS argument.
+#
+# If SKIP_DEPENDENCY_HANDLING is not set, for each component the variable
+# <name>_<component>_component_deps will be checked for dependent components.
+# If <component> is listed in <name>_FIND_COMPONENTS, then all its (transitive)
+# dependencies will also be added to <variable>.
+#
+# ::
+#
+#   ecm_find_package_handle_library_components(<name>
+#       COMPONENTS <component> [<component> [...]]
+#       [SKIP_DEPENDENCY_HANDLING])
+#       [SKIP_PKG_CONFIG])
+#
+# Creates an imported library target for each component.  The operation of this
+# macro depends on the presence of a number of CMake variables.
+#
+# The <name>_<component>_lib variable should contain the name of this library,
+# and <name>_<component>_header variable should contain the name of a header
+# file associated with it (whatever relative path is normally passed to
+# '#include'). <name>_<component>_header_subdir variable can be used to specify
+# which subdirectory of the include path the headers will be found in.
+# ecm_find_package_components() will then search for the library
+# and include directory (creating appropriate cache variables) and create an
+# imported library target named <name>::<component>.
+#
+# Additional variables can be used to provide additional information:
+#
+# If SKIP_PKG_CONFIG, the <name>_<component>_pkg_config variable is set, and
+# pkg-config is found, the pkg-config module given by
+# <name>_<component>_pkg_config will be searched for and used to help locate the
+# library and header file.  It will also be used to set
+# <name>_<component>_VERSION.
+#
+# Note that if version information is found via pkg-config,
+# <name>_<component>_FIND_VERSION can be set to require a particular version
+# for each component.
+#
+# If SKIP_DEPENDENCY_HANDLING is not set, the INTERFACE_LINK_LIBRARIES property
+# of the imported target for <component> will be set to contain the imported
+# targets for the components listed in <name>_<component>_component_deps.
+# <component>_FOUND will also be set to false if any of the compoments in
+# <name>_<component>_component_deps are not found.  This requires the components
+# in <name>_<component>_component_deps to be listed before <component> in the
+# COMPONENTS argument.
+#
+# The following variables will be set:
+#
+# ``<name>_TARGETS``
+#   the imported targets
+# ``<name>_LIBRARIES``
+#   the found libraries
+# ``<name>_INCLUDE_DIRS``
+#   the combined required include directories for the components
+# ``<name>_DEFINITIONS``
+#   the "other" CFLAGS provided by pkg-config, if any
+# ``<name>_VERSION``
+#   the value of ``<name>_<component>_VERSION`` for the first component that
+#   has this variable set (note that components are searched for in the order
+#   they are passed to the macro), although if it is already set, it will not
+#   be altered
+#
+# Note that these variables are never cleared, so if
+# ecm_find_package_handle_library_components() is called multiple times with
+# different components (typically because of multiple find_package() calls) then
+# ``<name>_TARGETS``, for example, will contain all the targets found in any
+# call (although no duplicates).
+#
+# Since pre-1.0.0.
+
+#=============================================================================
+# Copyright 2014 Alex Merry <alex.merry@kde.org>
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+# 3. The name of the author may not be used to endorse or promote products
+#    derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+include(CMakeParseArguments)
+
+macro(ecm_find_package_version_check module_name)
+    if(CMAKE_VERSION VERSION_LESS 2.8.12)
+        message(FATAL_ERROR "CMake 2.8.12 is required by Find${module_name}.cmake")
+    endif()
+    if(CMAKE_MINIMUM_REQUIRED_VERSION VERSION_LESS 2.8.12)
+        message(AUTHOR_WARNING "Your project should require at least CMake 2.8.12 to use Find${module_name}.cmake")
+    endif()
+endmacro()
+
+macro(ecm_find_package_parse_components module_name)
+    set(ecm_fppc_options SKIP_DEPENDENCY_HANDLING)
+    set(ecm_fppc_oneValueArgs RESULT_VAR)
+    set(ecm_fppc_multiValueArgs KNOWN_COMPONENTS DEFAULT_COMPONENTS)
+    cmake_parse_arguments(ECM_FPPC "${ecm_fppc_options}" "${ecm_fppc_oneValueArgs}" "${ecm_fppc_multiValueArgs}" ${ARGN})
+
+    if(ECM_FPPC_UNPARSED_ARGUMENTS)
+        message(FATAL_ERROR "Unexpected arguments to ecm_find_package_parse_components: ${ECM_FPPC_UNPARSED_ARGUMENTS}")
+    endif()
+    if(NOT ECM_FPPC_RESULT_VAR)
+        message(FATAL_ERROR "Missing RESULT_VAR argument to ecm_find_package_parse_components")
+    endif()
+    if(NOT ECM_FPPC_KNOWN_COMPONENTS)
+        message(FATAL_ERROR "Missing KNOWN_COMPONENTS argument to ecm_find_package_parse_components")
+    endif()
+    if(NOT ECM_FPPC_DEFAULT_COMPONENTS)
+        set(ECM_FPPC_DEFAULT_COMPONENTS ${ECM_FPPC_KNOWN_COMPONENTS})
+    endif()
+
+    if(${module_name}_FIND_COMPONENTS)
+        set(ecm_fppc_requestedComps ${${module_name}_FIND_COMPONENTS})
+
+        if(NOT ECM_FPPC_SKIP_DEPENDENCY_HANDLING)
+            # Make sure deps are included
+            foreach(ecm_fppc_comp ${ecm_fppc_requestedComps})
+                foreach(ecm_fppc_dep_comp ${${module_name}_${ecm_fppc_comp}_component_deps})
+                    list(FIND ecm_fppc_requestedComps "${ecm_fppc_dep_comp}" ecm_fppc_index)
+                    if("${ecm_fppc_index}" STREQUAL "-1")
+                        if(NOT ${module_name}_FIND_QUIETLY)
+                            message(STATUS "${module_name}: ${ecm_fppc_comp} requires ${${module_name}_${ecm_fppc_comp}_component_deps}")
+                        endif()
+                        list(APPEND ecm_fppc_requestedComps "${ecm_fppc_dep_comp}")
+                    endif()
+                endforeach()
+            endforeach()
+        else()
+            message(STATUS "Skipping dependency handling for ${module_name}")
+        endif()
+        list(REMOVE_DUPLICATES ecm_fppc_requestedComps)
+
+        # This makes sure components are listed in the same order as
+        # KNOWN_COMPONENTS (potentially important for inter-dependencies)
+        set(${ECM_FPPC_RESULT_VAR})
+        foreach(ecm_fppc_comp ${ECM_FPPC_KNOWN_COMPONENTS})
+            list(FIND ecm_fppc_requestedComps "${ecm_fppc_comp}" ecm_fppc_index)
+            if(NOT "${ecm_fppc_index}" STREQUAL "-1")
+                list(APPEND ${ECM_FPPC_RESULT_VAR} "${ecm_fppc_comp}")
+                list(REMOVE_AT ecm_fppc_requestedComps ${ecm_fppc_index})
+            endif()
+        endforeach()
+        # if there are any left, they are unknown components
+        if(ecm_fppc_requestedComps)
+            set(ecm_fppc_msgType STATUS)
+            if(${module_name}_FIND_REQUIRED)
+                set(ecm_fppc_msgType FATAL_ERROR)
+            endif()
+            if(NOT ${module_name}_FIND_QUIETLY)
+                message(${ecm_fppc_msgType} "${module_name}: requested unknown components ${ecm_fppc_requestedComps}")
+            endif()
+            return()
+        endif()
+    else()
+        set(${ECM_FPPC_RESULT_VAR} ${ECM_FPPC_DEFAULT_COMPONENTS})
+    endif()
+endmacro()
+
+macro(ecm_find_package_handle_library_components module_name)
+    set(ecm_fpwc_options SKIP_PKG_CONFIG SKIP_DEPENDENCY_HANDLING)
+    set(ecm_fpwc_oneValueArgs)
+    set(ecm_fpwc_multiValueArgs COMPONENTS)
+    cmake_parse_arguments(ECM_FPWC "${ecm_fpwc_options}" "${ecm_fpwc_oneValueArgs}" "${ecm_fpwc_multiValueArgs}" ${ARGN})
+
+    if(ECM_FPWC_UNPARSED_ARGUMENTS)
+        message(FATAL_ERROR "Unexpected arguments to ecm_find_package_handle_components: ${ECM_FPWC_UNPARSED_ARGUMENTS}")
+    endif()
+    if(NOT ECM_FPWC_COMPONENTS)
+        message(FATAL_ERROR "Missing COMPONENTS argument to ecm_find_package_handle_components")
+    endif()
+
+    include(FindPackageHandleStandardArgs)
+    find_package(PkgConfig)
+    foreach(ecm_fpwc_comp ${ECM_FPWC_COMPONENTS})
+        set(ecm_fpwc_dep_vars)
+        set(ecm_fpwc_dep_targets)
+        if(NOT SKIP_DEPENDENCY_HANDLING)
+            foreach(ecm_fpwc_dep ${${module_name}_${ecm_fpwc_comp}_component_deps})
+                list(APPEND ecm_fpwc_dep_vars "${module_name}_${ecm_fpwc_dep}_FOUND")
+                list(APPEND ecm_fpwc_dep_targets "${module_name}::${ecm_fpwc_dep}")
+            endforeach()
+        endif()
+
+        if(NOT ECM_FPWC_SKIP_PKG_CONFIG AND ${module_name}_${ecm_fpwc_comp}_pkg_config)
+            pkg_check_modules(PKG_${module_name}_${ecm_fpwc_comp} QUIET
+                              ${${module_name}_${ecm_fpwc_comp}_pkg_config})
+        endif()
+
+        find_path(${module_name}_${ecm_fpwc_comp}_INCLUDE_DIR
+            NAMES ${${module_name}_${ecm_fpwc_comp}_header}
+            HINTS ${PKG_${module_name}_${ecm_fpwc_comp}_INCLUDE_DIRS}
+            PATH_SUFFIXES ${${module_name}_${ecm_fpwc_comp}_header_subdir}
+        )
+        find_library(${module_name}_${ecm_fpwc_comp}_LIBRARY
+            NAMES ${${module_name}_${ecm_fpwc_comp}_lib}
+            HINTS ${PKG_${module_name}_${ecm_fpwc_comp}_LIBRARY_DIRS}
+        )
+
+        set(${module_name}_${ecm_fpwc_comp}_VERSION "${PKG_${module_name}_${ecm_fpwc_comp}_VERSION}")
+        if(NOT ${module_name}_VERSION)
+            set(${module_name}_VERSION ${${module_name}_${ecm_fpwc_comp}_VERSION})
+        endif()
+
+        find_package_handle_standard_args(${module_name}_${ecm_fpwc_comp}
+            FOUND_VAR
+                ${module_name}_${ecm_fpwc_comp}_FOUND
+            REQUIRED_VARS
+                ${module_name}_${ecm_fpwc_comp}_LIBRARY
+                ${module_name}_${ecm_fpwc_comp}_INCLUDE_DIR
+                ${ecm_fpwc_dep_vars}
+            VERSION_VAR
+                ${module_name}_${ecm_fpwc_comp}_VERSION
+            )
+
+        mark_as_advanced(
+            ${module_name}_${ecm_fpwc_comp}_LIBRARY
+            ${module_name}_${ecm_fpwc_comp}_INCLUDE_DIR
+        )
+
+        if(${module_name}_${ecm_fpwc_comp}_FOUND)
+            list(APPEND ${module_name}_LIBRARIES
+                        "${${module_name}_${ecm_fpwc_comp}_LIBRARY}")
+            list(APPEND ${module_name}_INCLUDE_DIRS
+                        "${${module_name}_${ecm_fpwc_comp}_INCLUDE_DIR}")
+            set(${module_name}_DEFINITIONS
+                    ${${module_name}_DEFINITIONS}
+                    ${PKG_${module_name}_${ecm_fpwc_comp}_DEFINITIONS})
+            if(NOT TARGET ${module_name}::${ecm_fpwc_comp})
+                add_library(${module_name}::${ecm_fpwc_comp} UNKNOWN IMPORTED)
+                set_target_properties(${module_name}::${ecm_fpwc_comp} PROPERTIES
+                    IMPORTED_LOCATION "${${module_name}_${ecm_fpwc_comp}_LIBRARY}"
+                    INTERFACE_COMPILE_OPTIONS "${PKG_${module_name}_${ecm_fpwc_comp}_DEFINITIONS}"
+                    INTERFACE_INCLUDE_DIRECTORIES "${${module_name}_${ecm_fpwc_comp}_INCLUDE_DIR}"
+                    INTERFACE_LINK_LIBRARIES "${ecm_fpwc_dep_targets}"
+                )
+            endif()
+            list(APPEND ${module_name}_TARGETS
+                        "${module_name}::${ecm_fpwc_comp}")
+        endif()
+    endforeach()
+    if(${module_name}_LIBRARIES)
+        list(REMOVE_DUPLICATES ${module_name}_LIBRARIES)
+    endif()
+    if(${module_name}_INCLUDE_DIRS)
+        list(REMOVE_DUPLICATES ${module_name}_INCLUDE_DIRS)
+    endif()
+    if(${module_name}_DEFINITIONS)
+        list(REMOVE_DUPLICATES ${module_name}_DEFINITIONS)
+    endif()
+    if(${module_name}_TARGETS)
+        list(REMOVE_DUPLICATES ${module_name}_TARGETS)
+    endif()
+endmacro()
diff --git a/cmake/3rdparty/extra-cmake-modules/qt_attribution.json b/cmake/3rdparty/extra-cmake-modules/qt_attribution.json
new file mode 100644
index 0000000000..cebebf82eb
--- /dev/null
+++ b/cmake/3rdparty/extra-cmake-modules/qt_attribution.json
@@ -0,0 +1,15 @@
+{
+    "Id": "extra-cmake-modules",
+    "Name": "extra-cmake-modules",
+    "QDocModule": "qtcore",
+    "QtUsage": "Used as part of the build system.",
+
+    "Description": "Additional CMake modules.",
+    "Homepage": "https://api.kde.org/ecm/",
+    "Version": "5.50.0",
+
+    "License": "BSD-3-Clause",
+    "LicenseId": "BSD 3-Clause License",
+    "LicenseFile": "COPYING-CMAKE-SCRIPTS",
+    "Copyright": "Copyright © 2011-2018 The KDE community"
+}
diff --git a/cmake/3rdparty/kwin/COPYING-CMAKE-SCRIPTS b/cmake/3rdparty/kwin/COPYING-CMAKE-SCRIPTS
new file mode 100644
index 0000000000..4b417765f3
--- /dev/null
+++ b/cmake/3rdparty/kwin/COPYING-CMAKE-SCRIPTS
@@ -0,0 +1,22 @@
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the copyright
+   notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+3. The name of the author may not be used to endorse or promote products 
+   derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/cmake/3rdparty/kwin/FindLibdrm.cmake b/cmake/3rdparty/kwin/FindLibdrm.cmake
new file mode 100644
index 0000000000..10822e693a
--- /dev/null
+++ b/cmake/3rdparty/kwin/FindLibdrm.cmake
@@ -0,0 +1,132 @@
+#.rst:
+# FindLibdrm
+# -------
+#
+# Try to find libdrm on a Unix system.
+#
+# This will define the following variables:
+#
+# ``Libdrm_FOUND``
+#     True if (the requested version of) libdrm is available
+# ``Libdrm_VERSION``
+#     The version of libdrm
+# ``Libdrm_LIBRARIES``
+#     This can be passed to target_link_libraries() instead of the ``Libdrm::Libdrm``
+#     target
+# ``Libdrm_INCLUDE_DIRS``
+#     This should be passed to target_include_directories() if the target is not
+#     used for linking
+# ``Libdrm_DEFINITIONS``
+#     This should be passed to target_compile_options() if the target is not
+#     used for linking
+#
+# If ``Libdrm_FOUND`` is TRUE, it will also define the following imported target:
+#
+# ``Libdrm::Libdrm``
+#     The libdrm library
+#
+# In general we recommend using the imported target, as it is easier to use.
+# Bear in mind, however, that if the target is in the link interface of an
+# exported library, it must be made available by the package config file.
+
+#=============================================================================
+# Copyright 2014 Alex Merry <alex.merry@kde.org>
+# Copyright 2014 Martin Gräßlin <mgraesslin@kde.org>
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+# 3. The name of the author may not be used to endorse or promote products
+#    derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#=============================================================================
+
+if(CMAKE_VERSION VERSION_LESS 2.8.12)
+    message(FATAL_ERROR "CMake 2.8.12 is required by FindLibdrm.cmake")
+endif()
+if(CMAKE_MINIMUM_REQUIRED_VERSION VERSION_LESS 2.8.12)
+    message(AUTHOR_WARNING "Your project should require at least CMake 2.8.12 to use FindLibdrm.cmake")
+endif()
+
+if(NOT WIN32)
+    # Use pkg-config to get the directories and then use these values
+    # in the FIND_PATH() and FIND_LIBRARY() calls
+    find_package(PkgConfig)
+    pkg_check_modules(PKG_Libdrm QUIET libdrm)
+
+    set(Libdrm_DEFINITIONS ${PKG_Libdrm_CFLAGS_OTHER})
+    set(Libdrm_VERSION ${PKG_Libdrm_VERSION})
+
+    find_path(Libdrm_INCLUDE_DIR
+        NAMES
+            xf86drm.h
+        HINTS
+            ${PKG_Libdrm_INCLUDE_DIRS}
+    )
+    find_library(Libdrm_LIBRARY
+        NAMES
+            drm
+        HINTS
+            ${PKG_Libdrm_LIBRARY_DIRS}
+    )
+
+    include(FindPackageHandleStandardArgs)
+    find_package_handle_standard_args(Libdrm
+        FOUND_VAR
+            Libdrm_FOUND
+        REQUIRED_VARS
+            Libdrm_LIBRARY
+            Libdrm_INCLUDE_DIR
+        VERSION_VAR
+            Libdrm_VERSION
+    )
+
+    if(Libdrm_FOUND AND NOT TARGET Libdrm::Libdrm)
+        add_library(Libdrm::Libdrm UNKNOWN IMPORTED)
+        set_target_properties(Libdrm::Libdrm PROPERTIES
+            IMPORTED_LOCATION "${Libdrm_LIBRARY}"
+            INTERFACE_COMPILE_OPTIONS "${Libdrm_DEFINITIONS}"
+            INTERFACE_INCLUDE_DIRECTORIES "${Libdrm_INCLUDE_DIR}"
+            INTERFACE_INCLUDE_DIRECTORIES "${Libdrm_INCLUDE_DIR}/libdrm"
+        )
+        if(EXISTS "${Libdrm_INCLUDE_DIR}/drm")
+            set_property(TARGET Libdrm::Libdrm APPEND PROPERTY
+                INTERFACE_INCLUDE_DIRECTORIES "${Libdrm_INCLUDE_DIR}/drm"
+            )
+        endif()
+
+    endif()
+
+    mark_as_advanced(Libdrm_LIBRARY Libdrm_INCLUDE_DIR)
+
+    # compatibility variables
+    set(Libdrm_LIBRARIES ${Libdrm_LIBRARY})
+    set(Libdrm_INCLUDE_DIRS ${Libdrm_INCLUDE_DIR} "${Libdrm_INCLUDE_DIR}/libdrm" "${Libdrm_INCLUDE_DIR}/drm")
+    set(Libdrm_VERSION_STRING ${Libdrm_VERSION})
+
+else()
+    message(STATUS "FindLibdrm.cmake cannot find libdrm on Windows systems.")
+    set(Libdrm_FOUND FALSE)
+endif()
+
+include(FeatureSummary)
+set_package_properties(Libdrm PROPERTIES
+    URL "https://wiki.freedesktop.org/dri/"
+    DESCRIPTION "Userspace interface to kernel DRM services."
+)
diff --git a/cmake/3rdparty/kwin/FindLibinput.cmake b/cmake/3rdparty/kwin/FindLibinput.cmake
new file mode 100644
index 0000000000..b856e0bbcb
--- /dev/null
+++ b/cmake/3rdparty/kwin/FindLibinput.cmake
@@ -0,0 +1,125 @@
+#.rst:
+# FindLibinput
+# -------
+#
+# Try to find libinput on a Unix system.
+#
+# This will define the following variables:
+#
+# ``Libinput_FOUND``
+#     True if (the requested version of) libinput is available
+# ``Libinput_VERSION``
+#     The version of libinput
+# ``Libinput_LIBRARIES``
+#     This can be passed to target_link_libraries() instead of the ``Libinput::Libinput``
+#     target
+# ``Libinput_INCLUDE_DIRS``
+#     This should be passed to target_include_directories() if the target is not
+#     used for linking
+# ``Libinput_DEFINITIONS``
+#     This should be passed to target_compile_options() if the target is not
+#     used for linking
+#
+# If ``Libinput_FOUND`` is TRUE, it will also define the following imported target:
+#
+# ``Libinput::Libinput``
+#     The libinput library
+#
+# In general we recommend using the imported target, as it is easier to use.
+# Bear in mind, however, that if the target is in the link interface of an
+# exported library, it must be made available by the package config file.
+
+#=============================================================================
+# Copyright 2014 Alex Merry <alex.merry@kde.org>
+# Copyright 2014 Martin Gräßlin <mgraesslin@kde.org>
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+# 3. The name of the author may not be used to endorse or promote products
+#    derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#=============================================================================
+
+if(CMAKE_VERSION VERSION_LESS 2.8.12)
+    message(FATAL_ERROR "CMake 2.8.12 is required by FindLibinput.cmake")
+endif()
+if(CMAKE_MINIMUM_REQUIRED_VERSION VERSION_LESS 2.8.12)
+    message(AUTHOR_WARNING "Your project should require at least CMake 2.8.12 to use FindLibinput.cmake")
+endif()
+
+if(NOT WIN32)
+    # Use pkg-config to get the directories and then use these values
+    # in the FIND_PATH() and FIND_LIBRARY() calls
+    find_package(PkgConfig)
+    pkg_check_modules(PKG_Libinput QUIET libinput)
+
+    set(Libinput_DEFINITIONS ${PKG_Libinput_CFLAGS_OTHER})
+    set(Libinput_VERSION ${PKG_Libinput_VERSION})
+
+    find_path(Libinput_INCLUDE_DIR
+        NAMES
+            libinput.h
+        HINTS
+            ${PKG_Libinput_INCLUDE_DIRS}
+    )
+    find_library(Libinput_LIBRARY
+        NAMES
+            input
+        HINTS
+            ${PKG_Libinput_LIBRARY_DIRS}
+    )
+
+    include(FindPackageHandleStandardArgs)
+    find_package_handle_standard_args(Libinput
+        FOUND_VAR
+            Libinput_FOUND
+        REQUIRED_VARS
+            Libinput_LIBRARY
+            Libinput_INCLUDE_DIR
+        VERSION_VAR
+            Libinput_VERSION
+    )
+
+    if(Libinput_FOUND AND NOT TARGET Libinput::Libinput)
+        add_library(Libinput::Libinput UNKNOWN IMPORTED)
+        set_target_properties(Libinput::Libinput PROPERTIES
+            IMPORTED_LOCATION "${Libinput_LIBRARY}"
+            INTERFACE_COMPILE_OPTIONS "${Libinput_DEFINITIONS}"
+            INTERFACE_INCLUDE_DIRECTORIES "${Libinput_INCLUDE_DIR}"
+        )
+    endif()
+
+    mark_as_advanced(Libinput_LIBRARY Libinput_INCLUDE_DIR)
+
+    # compatibility variables
+    set(Libinput_LIBRARIES ${Libinput_LIBRARY})
+    set(Libinput_INCLUDE_DIRS ${Libinput_INCLUDE_DIR})
+    set(Libinput_VERSION_STRING ${Libinput_VERSION})
+
+else()
+    message(STATUS "FindLibinput.cmake cannot find libinput on Windows systems.")
+    set(Libinput_FOUND FALSE)
+endif()
+
+include(FeatureSummary)
+set_package_properties(Libinput PROPERTIES
+    URL "http://www.freedesktop.org/wiki/Software/libinput/"
+    DESCRIPTION "Library to handle input devices in Wayland compositors and to provide a generic X.Org input driver."
+)
diff --git a/cmake/3rdparty/kwin/FindXKB.cmake b/cmake/3rdparty/kwin/FindXKB.cmake
new file mode 100644
index 0000000000..0d599df0fd
--- /dev/null
+++ b/cmake/3rdparty/kwin/FindXKB.cmake
@@ -0,0 +1,101 @@
+# Try to find xkbcommon on a Unix system
+#
+# This will define:
+#
+#   XKB_FOUND        - True if XKB is available
+#   XKB_LIBRARIES    - Link these to use XKB
+#   XKB_INCLUDE_DIRS - Include directory for XKB
+#   XKB_DEFINITIONS  - Compiler flags for using XKB
+#
+# Additionally, the following imported targets will be defined:
+#
+#   XKB::XKB
+#
+# Copyright (c) 2014 Martin Gräßlin <mgraesslin@kde.org>
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+# 3. Neither the name of the University nor the names of its contributors
+#    may be used to endorse or promote products derived from this software
+#    without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+
+if(CMAKE_VERSION VERSION_LESS 2.8.12)
+    message(FATAL_ERROR "CMake 2.8.12 is required by FindXKB.cmake")
+endif()
+if(CMAKE_MINIMUM_REQUIRED_VERSION VERSION_LESS 2.8.12)
+    message(AUTHOR_WARNING "Your project should require at least CMake 2.8.12 to use FindXKB.cmake")
+endif()
+
+if(NOT WIN32)
+    # Use pkg-config to get the directories and then use these values
+    # in the FIND_PATH() and FIND_LIBRARY() calls
+    find_package(PkgConfig)
+    pkg_check_modules(PKG_XKB QUIET xkbcommon)
+
+    set(XKB_DEFINITIONS ${PKG_XKB_CFLAGS_OTHER})
+
+    find_path(XKB_INCLUDE_DIR
+        NAMES
+            xkbcommon/xkbcommon.h
+        HINTS
+            ${PKG_XKB_INCLUDE_DIRS}
+    )
+    find_library(XKB_LIBRARY
+        NAMES
+            xkbcommon
+        HINTS
+            ${PKG_XKB_LIBRARY_DIRS}
+    )
+
+    set(XKB_LIBRARIES ${XKB_LIBRARY})
+    set(XKB_INCLUDE_DIRS ${XKB_INCLUDE_DIR})
+    set(XKB_VERSION ${PKG_XKB_VERSION})
+
+    include(FindPackageHandleStandardArgs)
+    find_package_handle_standard_args(XKB
+        FOUND_VAR
+            XKB_FOUND
+        REQUIRED_VARS
+            XKB_LIBRARY
+            XKB_INCLUDE_DIR
+        VERSION_VAR
+            XKB_VERSION
+    )
+
+    if(XKB_FOUND AND NOT TARGET XKB::XKB)
+        add_library(XKB::XKB UNKNOWN IMPORTED)
+        set_target_properties(XKB::XKB PROPERTIES
+            IMPORTED_LOCATION "${XKB_LIBRARY}"
+            INTERFACE_COMPILE_OPTIONS "${XKB_DEFINITIONS}"
+            INTERFACE_INCLUDE_DIRECTORIES "${XKB_INCLUDE_DIR}"
+        )
+    endif()
+
+else()
+    message(STATUS "FindXKB.cmake cannot find XKB on Windows systems.")
+    set(XKB_FOUND FALSE)
+endif()
+
+include(FeatureSummary)
+set_package_properties(XKB PROPERTIES
+    URL "http://xkbcommon.org"
+    DESCRIPTION "XKB API common to servers and clients."
+)
diff --git a/cmake/3rdparty/kwin/Findgbm.cmake b/cmake/3rdparty/kwin/Findgbm.cmake
new file mode 100644
index 0000000000..6dfc895daa
--- /dev/null
+++ b/cmake/3rdparty/kwin/Findgbm.cmake
@@ -0,0 +1,125 @@
+#.rst:
+# Findgbm
+# -------
+#
+# Try to find gbm on a Unix system.
+#
+# This will define the following variables:
+#
+# ``gbm_FOUND``
+#     True if (the requested version of) gbm is available
+# ``gbm_VERSION``
+#     The version of gbm
+# ``gbm_LIBRARIES``
+#     This can be passed to target_link_libraries() instead of the ``gbm::gbm``
+#     target
+# ``gbm_INCLUDE_DIRS``
+#     This should be passed to target_include_directories() if the target is not
+#     used for linking
+# ``gbm_DEFINITIONS``
+#     This should be passed to target_compile_options() if the target is not
+#     used for linking
+#
+# If ``gbm_FOUND`` is TRUE, it will also define the following imported target:
+#
+# ``gbm::gbm``
+#     The gbm library
+#
+# In general we recommend using the imported target, as it is easier to use.
+# Bear in mind, however, that if the target is in the link interface of an
+# exported library, it must be made available by the package config file.
+
+#=============================================================================
+# Copyright 2014 Alex Merry <alex.merry@kde.org>
+# Copyright 2014 Martin Gräßlin <mgraesslin@kde.org>
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+# 3. The name of the author may not be used to endorse or promote products
+#    derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#=============================================================================
+
+if(CMAKE_VERSION VERSION_LESS 2.8.12)
+    message(FATAL_ERROR "CMake 2.8.12 is required by Findgbm.cmake")
+endif()
+if(CMAKE_MINIMUM_REQUIRED_VERSION VERSION_LESS 2.8.12)
+    message(AUTHOR_WARNING "Your project should require at least CMake 2.8.12 to use Findgbm.cmake")
+endif()
+
+if(NOT WIN32)
+    # Use pkg-config to get the directories and then use these values
+    # in the FIND_PATH() and FIND_LIBRARY() calls
+    find_package(PkgConfig)
+    pkg_check_modules(PKG_gbm QUIET gbm)
+
+    set(gbm_DEFINITIONS ${PKG_gbm_CFLAGS_OTHER})
+    set(gbm_VERSION ${PKG_gbm_VERSION})
+
+    find_path(gbm_INCLUDE_DIR
+        NAMES
+            gbm.h
+        HINTS
+            ${PKG_gbm_INCLUDE_DIRS}
+    )
+    find_library(gbm_LIBRARY
+        NAMES
+            gbm
+        HINTS
+            ${PKG_gbm_LIBRARY_DIRS}
+    )
+
+    include(FindPackageHandleStandardArgs)
+    find_package_handle_standard_args(gbm
+        FOUND_VAR
+            gbm_FOUND
+        REQUIRED_VARS
+            gbm_LIBRARY
+            gbm_INCLUDE_DIR
+        VERSION_VAR
+            gbm_VERSION
+    )
+
+    if(gbm_FOUND AND NOT TARGET gbm::gbm)
+        add_library(gbm::gbm UNKNOWN IMPORTED)
+        set_target_properties(gbm::gbm PROPERTIES
+            IMPORTED_LOCATION "${gbm_LIBRARY}"
+            INTERFACE_COMPILE_OPTIONS "${gbm_DEFINITIONS}"
+            INTERFACE_INCLUDE_DIRECTORIES "${gbm_INCLUDE_DIR}"
+        )
+    endif()
+
+    mark_as_advanced(gbm_LIBRARY gbm_INCLUDE_DIR)
+
+    # compatibility variables
+    set(gbm_LIBRARIES ${gbm_LIBRARY})
+    set(gbm_INCLUDE_DIRS ${gbm_INCLUDE_DIR})
+    set(gbm_VERSION_STRING ${gbm_VERSION})
+
+else()
+    message(STATUS "Findgbm.cmake cannot find gbm on Windows systems.")
+    set(gbm_FOUND FALSE)
+endif()
+
+include(FeatureSummary)
+set_package_properties(gbm PROPERTIES
+    URL "http://www.mesa3d.org"
+    DESCRIPTION "Mesa gbm library."
+)
diff --git a/cmake/3rdparty/kwin/qt_attribution.json b/cmake/3rdparty/kwin/qt_attribution.json
new file mode 100644
index 0000000000..5c22641132
--- /dev/null
+++ b/cmake/3rdparty/kwin/qt_attribution.json
@@ -0,0 +1,17 @@
+{
+    "Id": "kwin",
+    "Name": "KWin",
+    "QDocModule": "qtcore",
+    "QtUsage": "Used as part of the build system.",
+
+    "Description": "Additional CMake modules for graphics system dependencies.",
+    "Homepage": "https://www.kde.org/",
+    "Version": "5.13.4",
+
+    "License": "BSD-3-Clause",
+    "LicenseId": "BSD 3-Clause License",
+    "LicenseFile": "COPYING-CMAKE-SCRIPTS",
+    "Copyright": "Copyright 2014 Alex Merry <alex.merry@kde.org>
+Copyright 2014 Martin Gräßlin <mgraesslin@kde.org>,
+Copyright (c) 2006,2007 Laurent Montel, <montel@kde.org>"
+}
diff --git a/cmake/3rdpartyConfig.cmake.in b/cmake/3rdpartyConfig.cmake.in
new file mode 100644
index 0000000000..6af3792333
--- /dev/null
+++ b/cmake/3rdpartyConfig.cmake.in
@@ -0,0 +1,15 @@
+@PACKAGE_INIT@
+
+get_filename_component(_import_prefix "${CMAKE_CURRENT_LIST_FILE}" PATH)
+get_filename_component(_import_prefix "${_import_prefix}" REALPATH)
+
+set(old_CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH}")
+set(CMAKE_MODULE_PATH "${_import_prefix}" ${CMAKE_MODULE_PATH} )
+
+@3RDPARTY_ADDITIONAL_SETUP_CODE@
+
+set(CMAKE_MODULE_PATH "${old_CMAKE_MODULE_PATH}")
+
+if (NOT QT_NO_CREATE_TARGETS)
+    include("${CMAKE_CURRENT_LIST_DIR}/@target@Targets.cmake")
+endif()
diff --git a/cmake/FindATSPI2.cmake b/cmake/FindATSPI2.cmake
new file mode 100644
index 0000000000..ca0045635b
--- /dev/null
+++ b/cmake/FindATSPI2.cmake
@@ -0,0 +1,7 @@
+include(FindPkgConfig)
+
+pkg_check_modules(ATSPI2 atspi-2 IMPORTED_TARGET)
+
+if (NOT TARGET PkgConfig::ATSPI2)
+    set(ATSPI2_FOUND 0)
+endif()
diff --git a/cmake/FindAtomic.cmake b/cmake/FindAtomic.cmake
new file mode 100644
index 0000000000..91cee62046
--- /dev/null
+++ b/cmake/FindAtomic.cmake
@@ -0,0 +1,44 @@
+# We can't create the same interface imported target multiple times, CMake will complain if we do
+# that. This can happen if the find_package call is done in multiple different subdirectories.
+if(TARGET Atomic)
+    set(Atomic_FOUND ON)
+    return()
+endif()
+
+include(CheckCXXSourceCompiles)
+
+set (atomic_test_sources "#include <atomic>
+#include <cstdint>
+
+void test(volatile std::atomic<std::int64_t> &a)
+{
+    std::int64_t v = a.load(std::memory_order_acquire);
+    while (!a.compare_exchange_strong(v, v + 1,
+                                      std::memory_order_acq_rel,
+                                      std::memory_order_acquire)) {
+        v = a.exchange(v - 1);
+    }
+    a.store(v + 1, std::memory_order_release);
+}
+
+int main(int, char **)
+{
+    void *ptr = (void*)0xffffffc0; // any random pointer
+    test(*reinterpret_cast<std::atomic<std::int64_t> *>(ptr));
+    return 0;
+}")
+
+check_cxx_source_compiles("${atomic_test_sources}" HAVE_STDATOMIC)
+if(NOT HAVE_STDATOMIC)
+    set(_req_libraries "${CMAKE_REQUIRE_LIBRARIES}")
+    set(CMAKE_REQUIRE_LIBRARIES "atomic")
+    check_cxx_source_compiles("${atomic_test_sources}" HAVE_STDATOMIC_WITH_LIB)
+    set(CMAKE_REQUIRE_LIBRARIES "${_req_libraries}")
+endif()
+
+add_library(Atomic INTERFACE IMPORTED)
+if(HAVE_STDATOMIC_WITH_LIB)
+    target_link_libraries(Atomic INTERFACE atomic)
+endif()
+
+set(Atomic_FOUND 1)
diff --git a/cmake/FindCups.cmake b/cmake/FindCups.cmake
new file mode 100644
index 0000000000..7a78100aae
--- /dev/null
+++ b/cmake/FindCups.cmake
@@ -0,0 +1,98 @@
+# Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
+# file Copyright.txt or https://cmake.org/licensing for details.
+
+#[=======================================================================[.rst:
+FindCups
+--------
+
+Find the CUPS printing system.
+
+Set CUPS_REQUIRE_IPP_DELETE_ATTRIBUTE to TRUE if you need a version which
+features this function (i.e. at least 1.1.19)
+
+Imported targets
+^^^^^^^^^^^^^^^^
+
+This module defines :prop_tgt:`IMPORTED` target ``Cups::Cups``, if Cups has
+been found.
+
+Result variables
+^^^^^^^^^^^^^^^^
+
+This module will set the following variables in your project:
+
+``CUPS_FOUND``
+  true if CUPS headers and libraries were found
+``CUPS_INCLUDE_DIRS``
+  the directory containing the Cups headers
+``CUPS_LIBRARIES``
+  the libraries to link against to use CUPS.
+``CUPS_VERSION_STRING``
+  the version of CUPS found (since CMake 2.8.8)
+
+Cache variables
+^^^^^^^^^^^^^^^
+
+The following cache variables may also be set:
+
+``CUPS_INCLUDE_DIR``
+  the directory containing the Cups headers
+#]=======================================================================]
+
+find_path(CUPS_INCLUDE_DIR cups/cups.h )
+
+find_library(CUPS_LIBRARIES NAMES cups )
+
+if (CUPS_INCLUDE_DIR AND CUPS_LIBRARIES AND CUPS_REQUIRE_IPP_DELETE_ATTRIBUTE)
+    include(${CMAKE_CURRENT_LIST_DIR}/CheckLibraryExists.cmake)
+    include(${CMAKE_CURRENT_LIST_DIR}/CMakePushCheckState.cmake)
+    cmake_push_check_state()
+    set(CMAKE_REQUIRED_QUIET ${Cups_FIND_QUIETLY})
+
+    # ippDeleteAttribute is new in cups-1.1.19 (and used by kdeprint)
+    CHECK_LIBRARY_EXISTS(cups ippDeleteAttribute "" CUPS_HAS_IPP_DELETE_ATTRIBUTE)
+    cmake_pop_check_state()
+endif ()
+
+if (CUPS_INCLUDE_DIR AND EXISTS "${CUPS_INCLUDE_DIR}/cups/cups.h")
+    file(STRINGS "${CUPS_INCLUDE_DIR}/cups/cups.h" cups_version_str
+         REGEX "^#[\t ]*define[\t ]+CUPS_VERSION_(MAJOR|MINOR|PATCH)[\t ]+[0-9]+$")
+
+    unset(CUPS_VERSION_STRING)
+    foreach(VPART MAJOR MINOR PATCH)
+        foreach(VLINE ${cups_version_str})
+            if(VLINE MATCHES "^#[\t ]*define[\t ]+CUPS_VERSION_${VPART}[\t ]+([0-9]+)$")
+                set(CUPS_VERSION_PART "${CMAKE_MATCH_1}")
+                if(CUPS_VERSION_STRING)
+                    string(APPEND CUPS_VERSION_STRING ".${CUPS_VERSION_PART}")
+                else()
+                    set(CUPS_VERSION_STRING "${CUPS_VERSION_PART}")
+                endif()
+            endif()
+        endforeach()
+    endforeach()
+endif ()
+
+include(FindPackageHandleStandardArgs)
+
+if (CUPS_REQUIRE_IPP_DELETE_ATTRIBUTE)
+    FIND_PACKAGE_HANDLE_STANDARD_ARGS(Cups
+                                      REQUIRED_VARS CUPS_LIBRARIES CUPS_INCLUDE_DIR CUPS_HAS_IPP_DELETE_ATTRIBUTE
+                                      VERSION_VAR CUPS_VERSION_STRING)
+else ()
+    FIND_PACKAGE_HANDLE_STANDARD_ARGS(Cups
+                                      REQUIRED_VARS CUPS_LIBRARIES CUPS_INCLUDE_DIR
+                                      VERSION_VAR CUPS_VERSION_STRING)
+endif ()
+
+mark_as_advanced(CUPS_INCLUDE_DIR CUPS_LIBRARIES)
+
+if (CUPS_FOUND)
+    set(CUPS_INCLUDE_DIRS "${CUPS_INCLUDE_DIR}")
+    if (NOT TARGET Cups::Cups)
+        add_library(Cups::Cups INTERFACE IMPORTED)
+        set_target_properties(Cups::Cups PROPERTIES
+            INTERFACE_LINK_LIBRARIES      "${CUPS_LIBRARIES}"
+            INTERFACE_INCLUDE_DIRECTORIES "${CUPS_INCLUDE_DIR}")
+    endif ()
+endif ()
diff --git a/cmake/FindDB2.cmake b/cmake/FindDB2.cmake
new file mode 100644
index 0000000000..59eadab7d5
--- /dev/null
+++ b/cmake/FindDB2.cmake
@@ -0,0 +1,59 @@
+#.rst:
+# FindDB2
+# ---------
+#
+# Try to locate the db2 client library.
+# If found, this will define the following variables:
+#
+# ``DB2_FOUND``
+#     True if the db2 library is available
+# ``DB2_INCLUDE_DIRS``
+#     The db2 include directories
+# ``DB2_LIBRARIES``
+#     The db2 libraries for linking
+#
+# If ``DB2_FOUND`` is TRUE, it will also define the following
+# imported target:
+#
+# ``DB2::DB2``
+#     The db2 client library
+
+if (NOT DEFINED DB2_INCLUDE_DIR)
+  find_path(DB2_INCLUDE_DIRS
+    NAMES sqlcli1.h
+    HINTS ENV DB2_HOME
+    PATH_SUFFIXES include)
+else()
+  find_path(DB2_INCLUDE_DIRS
+    NAMES sqlcli1.h
+    HINTS ${DB2_INCLUDE_DIR})
+endif()
+
+if (NOT DEFINED DB2_LIBRARY_DIR)
+  find_library(DB2_LIBRARIES
+    NAMES db2
+    HINTS ENV DB2LIB)
+else()
+  find_library(DB2_LIBRARIES
+    NAMES db2
+    HINTS ${DB2_LIBRARY_DIR})
+endif()
+
+if (NOT DB2_INCLUDE_DIRS STREQUAL "DB2_INCLUDE_DIRS-NOTFOUND" AND NOT DB2_LIBRARIES STREQUAL "DB2_LIBRARIES-NOTFOUND")
+  set(DB2_FOUND ON)
+endif()
+
+if(DB2_FOUND AND NOT TARGET DB2::DB2)
+  add_library(DB2::DB2 UNKNOWN IMPORTED)
+  set_target_properties(DB2::DB2 PROPERTIES
+                        IMPORTED_LOCATION "${DB2_LIBRARIES}"
+                        INTERFACE_INCLUDE_DIRECTORIES "${DB2_INCLUDE_DIRS}")
+endif()
+
+mark_as_advanced(DB2_INCLUDE_DIRS DB2_LIBRARIES)
+
+include(FeatureSummary)
+set_package_properties(DB2 PROPERTIES
+  URL "https://www.ibm.com"
+  DESCRIPTION "IBM DB2 client library")
+
diff --git a/cmake/FindDirectFB.cmake b/cmake/FindDirectFB.cmake
new file mode 100644
index 0000000000..4446018587
--- /dev/null
+++ b/cmake/FindDirectFB.cmake
@@ -0,0 +1,7 @@
+find_package(PkgConfig)
+
+pkg_check_modules(DirectFB directfb IMPORTED_TARGET)
+
+if (NOT TARGET PkgConfig::DirectFB)
+    set(DirectFB_FOUND 0)
+endif()
diff --git a/cmake/FindGLESv2.cmake b/cmake/FindGLESv2.cmake
new file mode 100644
index 0000000000..49e757ef55
--- /dev/null
+++ b/cmake/FindGLESv2.cmake
@@ -0,0 +1,72 @@
+include(CheckCXXSourceCompiles)
+
+# No library linkage is necessary to use GLESv2 with Emscripten. The headers are also
+# system headers, so we don't need to search for them.
+if(EMSCRIPTEN)
+    set(HAVE_GLESv2 ON)
+else()
+    find_library(GLESv2_LIBRARY NAMES GLESv2 OpenGLES)
+    find_path(GLESv2_INCLUDE_DIR NAMES "GLES2/gl2.h" "OpenGLES/ES2/gl.h" DOC "The OpenGLES 2 include path")
+    set(_libraries "${CMAKE_REQUIRED_LIBRARIES}")
+    list(APPEND CMAKE_REQUIRED_LIBRARIES "${GLESv2_LIBRARY}")
+    set(_includes "${CMAKE_REQUIRED_INCLUDES}")
+    list(APPEND CMAKE_REQUIRED_INCLUDES "${GLESv2_INCLUDE_DIR}")
+
+    check_cxx_source_compiles("
+#ifdef __APPLE__
+#  include <OpenGLES/ES2/gl.h>
+#else
+#  define GL_GLEXT_PROTOTYPES
+#  include <GLES2/gl2.h>
+#endif
+
+int main(int argc, char *argv[]) {
+    glUniform1f(1, GLfloat(1.0));
+    glClear(GL_COLOR_BUFFER_BIT);
+}" HAVE_GLESv2)
+
+    set(CMAKE_REQUIRED_LIBRARY "${_libraries}")
+    unset(_libraries)
+    set(CMAKE_REQUIRED_INCLUDES "${_includes}")
+    unset(_includes)
+    set(package_args GLESv2_INCLUDE_DIR GLESv2_LIBRARY HAVE_GLESv2)
+endif()
+
+# Framework handling partially inspired by FindGLUT.cmake.
+if(GLESv2_LIBRARY MATCHES "/([^/]+)\\.framework$")
+    # TODO: Might need to handle non .tbd suffixes, but didn't find an
+    # example like that.
+    # TODO: Might need to handle INTERFACE_INCLUDE_DIRECTORIES differently.
+    set(_library_imported_location "${GLESv2_LIBRARY}/${CMAKE_MATCH_1}.tbd")
+    if(NOT EXISTS "${_library_imported_location}")
+        set(_library_imported_location "")
+    endif()
+else()
+    set(_library_imported_location "${GLESv2_LIBRARY}")
+endif()
+set(GLESv2_LIBRARY "${_library_imported_location}")
+
+list(APPEND package_args HAVE_GLESv2)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(GLESv2 DEFAULT_MSG ${package_args})
+
+mark_as_advanced(${package_args})
+
+if(GLESv2_FOUND AND NOT TARGET GLESv2::GLESv2)
+    if(EMSCRIPTEN OR APPLE_UIKIT)
+        add_library(GLESv2::GLESv2 INTERFACE IMPORTED)
+        if(APPLE_UIKIT)
+            # For simulator_and_device builds we can't specify the full library path, because
+            # it's specific to either the device or the simulator. Resort to passing a link
+            # flag instead.
+            set_target_properties(GLESv2::GLESv2 PROPERTIES
+                INTERFACE_LINK_LIBRARIES "-framework OpenGLES")
+        endif()
+    else()
+        add_library(GLESv2::GLESv2 UNKNOWN IMPORTED)
+        set_target_properties(GLESv2::GLESv2 PROPERTIES
+            IMPORTED_LOCATION "${GLESv2_LIBRARY}"
+            INTERFACE_INCLUDE_DIRECTORIES "${GLESv2_INCLUDE_DIR}")
+    endif()
+endif()
diff --git a/cmake/FindGSSAPI.cmake b/cmake/FindGSSAPI.cmake
new file mode 100644
index 0000000000..6f22929b6c
--- /dev/null
+++ b/cmake/FindGSSAPI.cmake
@@ -0,0 +1,39 @@
+find_package(PkgConfig)
+pkg_check_modules(PC_GSSAPI QUIET krb5-gssapi)
+
+find_path(GSSAPI_INCLUDE_DIRS
+          NAMES gssapi/gssapi.h
+          HINTS ${PC_GSSAPI_INCLUDEDIR}
+          PATH_SUFFIXES gssapi)
+
+find_library(GSSAPI_LIBRARIES
+             NAMES
+             GSS # framework
+             gssapi_krb5
+             HINTS ${PC_GSSAPILIBDIR}
+)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(GSSAPI DEFAULT_MSG GSSAPI_LIBRARIES GSSAPI_INCLUDE_DIRS)
+
+if(GSSAPI_FOUND AND NOT TARGET GSSAPI::GSSAPI)
+    if(GSSAPI_LIBRARIES MATCHES "/([^/]+)\\.framework$")
+        add_library(GSSAPI::GSSAPI INTERFACE IMPORTED)
+        set_target_properties(GSSAPI::GSSAPI PROPERTIES
+                              INTERFACE_LINK_LIBRARIES "${GSSAPI_LIBRARIES}")
+    else()
+      add_library(GSSAPI::GSSAPI UNKNOWN IMPORTED)
+      set_target_properties(GSSAPI::GSSAPI PROPERTIES
+                            IMPORTED_LOCATION "${GSSAPI_LIBRARIES}")
+    endif()
+
+    set_target_properties(GSSAPI::GSSAPI PROPERTIES
+                          INTERFACE_INCLUDE_DIRECTORIES "${GSSAPI_INCLUDE_DIRS}")
+endif()
+
+mark_as_advanced(GSSAPI_INCLUDE_DIRS GSSAPI_LIBRARIES)
+
+include(FeatureSummary)
+set_package_properties(GSSAPI PROPERTIES
+  DESCRIPTION "Generic Security Services Application Program Interface")
+
diff --git a/cmake/FindGTK3.cmake b/cmake/FindGTK3.cmake
new file mode 100644
index 0000000000..9423eb4b9b
--- /dev/null
+++ b/cmake/FindGTK3.cmake
@@ -0,0 +1,7 @@
+include(FindPkgConfig)
+
+pkg_check_modules(GTK3 "gtk+-3.0 >= 3.6" IMPORTED_TARGET)
+
+if (NOT TARGET PkgConfig::GTK3)
+    set(GTK3_FOUND 0)
+endif()
diff --git a/cmake/FindLibproxy.cmake b/cmake/FindLibproxy.cmake
new file mode 100644
index 0000000000..95d86d1617
--- /dev/null
+++ b/cmake/FindLibproxy.cmake
@@ -0,0 +1,7 @@
+find_package(PkgConfig)
+
+pkg_check_modules(Libproxy libproxy-1.0 IMPORTED_TARGET)
+
+if (NOT TARGET PkgConfig::Libproxy)
+    set(Libproxy_FOUND 0)
+endif()
diff --git a/cmake/FindLibsystemd.cmake b/cmake/FindLibsystemd.cmake
new file mode 100644
index 0000000000..9b480700f9
--- /dev/null
+++ b/cmake/FindLibsystemd.cmake
@@ -0,0 +1,7 @@
+find_package(PkgConfig)
+
+pkg_check_modules(Libsystemd libsystemd IMPORTED_TARGET)
+
+if (NOT TARGET PkgConfig::Libsystemd)
+    set(Libsystemd_FOUND 0)
+endif()
diff --git a/cmake/FindLibudev.cmake b/cmake/FindLibudev.cmake
new file mode 100644
index 0000000000..637c7c6d88
--- /dev/null
+++ b/cmake/FindLibudev.cmake
@@ -0,0 +1,7 @@
+find_package(PkgConfig)
+
+pkg_check_modules(Libudev libudev IMPORTED_TARGET)
+
+if (NOT TARGET PkgConfig::Libudev)
+    set(Libudev_FOUND 0)
+endif()
diff --git a/cmake/FindMtdev.cmake b/cmake/FindMtdev.cmake
new file mode 100644
index 0000000000..6184fe9b3c
--- /dev/null
+++ b/cmake/FindMtdev.cmake
@@ -0,0 +1,7 @@
+find_package(PkgConfig)
+
+pkg_check_modules(Mtdev mtdev IMPORTED_TARGET)
+
+if (NOT TARGET PkgConfig::Mtdev)
+    set(Mtdev_FOUND 0)
+endif()
diff --git a/cmake/FindMySQL.cmake b/cmake/FindMySQL.cmake
new file mode 100644
index 0000000000..0cc5cb6368
--- /dev/null
+++ b/cmake/FindMySQL.cmake
@@ -0,0 +1,50 @@
+#.rst:
+# FindMySQL
+# ---------
+#
+# Try to locate the mysql client library.
+# If found, this will define the following variables:
+#
+# ``MySQL_FOUND``
+#     True if the mysql library is available
+# ``MySQL_INCLUDE_DIRS``
+#     The mysql include directories
+# ``MySQL_LIBRARIES``
+#     The mysql libraries for linking
+#
+# If ``MySQL_FOUND`` is TRUE, it will also define the following
+# imported target:
+#
+# ``MySQL::MySQL``
+#     The mysql client library
+
+find_package(PkgConfig)
+pkg_check_modules(PC_MySQL QUIET mysqlclient)
+
+find_path(MySQL_INCLUDE_DIRS
+          NAMES mysql.h
+          HINTS ${PC_MySQL_INCLUDEDIR}
+          PATH_SUFFIXES mysql)
+
+find_library(MySQL_LIBRARIES
+             NAMES mysqlclient
+             HINTS ${PC_MySQL_LIBDIR}
+)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(MySQL DEFAULT_MSG MySQL_LIBRARIES MySQL_INCLUDE_DIRS)
+
+if(MySQL_FOUND AND NOT TARGET MySQL::MySQL)
+  add_library(MySQL::MySQL UNKNOWN IMPORTED)
+  set_target_properties(MySQL::MySQL PROPERTIES
+                        IMPORTED_LOCATION "${MySQL_LIBRARIES}"
+                        INTERFACE_INCLUDE_DIRECTORIES "${MySQL_INCLUDE_DIRS}")
+endif()
+
+mark_as_advanced(MySQL_INCLUDE_DIRS MySQL_LIBRARIES)
+
+include(FeatureSummary)
+set_package_properties(MySQL PROPERTIES
+  URL "https://www.mysql.com"
+  DESCRIPTION "MySQL client library")
+
diff --git a/cmake/FindOracle.cmake b/cmake/FindOracle.cmake
new file mode 100644
index 0000000000..58e787e362
--- /dev/null
+++ b/cmake/FindOracle.cmake
@@ -0,0 +1,48 @@
+#.rst:
+# FindOracle
+# ---------
+#
+# Try to locate the oracle client library.
+# If found, this will define the following variables:
+#
+# ``Oracle_FOUND``
+#     True if the oracle library is available
+# ``Oracle_INCLUDE_DIRS``
+#     The oracle include directories
+# ``Oracle_LIBRARIES``
+#     The oracle libraries for linking
+#
+# If ``Oracle_FOUND`` is TRUE, it will also define the following
+# imported target:
+#
+# ``Oracle::Oracle``
+#     The oracle instant client library
+
+find_path(Oracle_INCLUDE_DIRS
+  NAMES oci.h
+  HINTS ${Oracle_INCLUDE_DIR})
+
+set(ORACLE_OCI_NAMES clntsh ociei oraociei12)
+
+find_library(Oracle_LIBRARIES
+  NAMES NAMES ${ORACLE_OCI_NAMES}
+  HINTS ${Oracle_LIBRARY_DIR})
+
+if (NOT Oracle_INCLUDE_DIRS STREQUAL "Oracle_INCLUDE_DIRS-NOTFOUND" AND NOT Oracle_LIBRARIES STREQUAL "Oracle_LIBRARIES-NOTFOUND")
+  set(Oracle_FOUND ON)
+endif()
+
+if(Oracle_FOUND AND NOT TARGET Oracle::OCI)
+  add_library(Oracle::OCI UNKNOWN IMPORTED)
+  set_target_properties(Oracle::OCI PROPERTIES
+                        IMPORTED_LOCATION "${Oracle_LIBRARIES}"
+                        INTERFACE_INCLUDE_DIRECTORIES "${Oracle_INCLUDE_DIRS}")
+endif()
+
+mark_as_advanced(Oracle_INCLUDE_DIRS Oracle_LIBRARIES)
+
+include(FeatureSummary)
+set_package_properties(Oracle PROPERTIES
+  URL "https://www.oracle.com"
+  DESCRIPTION "Oracle client library")
+
diff --git a/cmake/FindPPS.cmake b/cmake/FindPPS.cmake
new file mode 100644
index 0000000000..c3360fa82c
--- /dev/null
+++ b/cmake/FindPPS.cmake
@@ -0,0 +1,19 @@
+# Find the PPS library
+
+# Will make the target PPS::PPS available when found.
+
+find_library(PPS_LIBRARY NAMES "pps")
+find_path(PPS_INCLUDE_DIR NAMES "sys/pps.h" DOC "The PPS Include path")
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(PPS DEFAULT_MSG PPS_INCLUDE_DIR PPS_LIBRARY)
+
+mark_as_advanced(PPS_INCLUDE_DIR PPS_LIBRARY)
+
+if(PPS_FOUND)
+    add_library(__PPS INTERFACE IMPORTED)
+    target_link_libraries(__PPS INTERFACE ${PPS_LIBRARY})
+    target_include_directories(__PPS INTERFACE ${PPS_INCLUDE_DIR})
+
+    add_library(PPS::PPS ALIAS __PPS)
+endif()
diff --git a/cmake/FindSlog2.cmake b/cmake/FindSlog2.cmake
new file mode 100644
index 0000000000..dfb6635a39
--- /dev/null
+++ b/cmake/FindSlog2.cmake
@@ -0,0 +1,19 @@
+# Find the Slog2 library
+
+# Will make the target Slog2::Slog2 available when found.
+
+find_library(Slog2_LIBRARY NAMES "slog2")
+find_path(Slog2_INCLUDE_DIR NAMES "sys/slog2.h" DOC "The Slog2 Include path")
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(Slog2 DEFAULT_MSG Slog2_INCLUDE_DIR Slog2_LIBRARY)
+
+mark_as_advanced(Slog2_INCLUDE_DIR Slog2_LIBRARY)
+
+if(Slog2_FOUND)
+    add_library(__Slog2 INTERFACE IMPORTED)
+    target_link_libraries(__Slog2 INTERFACE ${Slog2_LIBRARY})
+    target_include_directories(__Slog2 INTERFACE ${Slog2_INCLUDE_DIR})
+
+    add_library(Slog2::Slog2 ALIAS __Slog2)
+endif()
diff --git a/cmake/FindTslib.cmake b/cmake/FindTslib.cmake
new file mode 100644
index 0000000000..3c50116d0a
--- /dev/null
+++ b/cmake/FindTslib.cmake
@@ -0,0 +1,7 @@
+find_package(PkgConfig)
+
+pkg_check_modules(Tslib tslib IMPORTED_TARGET)
+
+if (NOT TARGET PkgConfig::Tslib)
+    set(Tslib_FOUND 0)
+endif()
diff --git a/cmake/FindWrapDBus1.cmake b/cmake/FindWrapDBus1.cmake
new file mode 100644
index 0000000000..55f9757c45
--- /dev/null
+++ b/cmake/FindWrapDBus1.cmake
@@ -0,0 +1,39 @@
+# DBus1 is buggy and breaks PKG_CONFIG environment.
+# Work around that:-/
+# See https://gitlab.freedesktop.org/dbus/dbus/issues/267 for more information
+
+if(DBus1_FOUND OR WrapDBus1_FOUND)
+    return()
+endif()
+
+if(DEFINED ENV{PKG_CONFIG_DIR})
+    set(__qt_dbus_pcd "$ENV{PKG_CONFIG_DIR}")
+endif()
+if(DEFINED ENV{PKG_CONFIG_PATH})
+    set(__qt_dbus_pcp "$ENV{PKG_CONFIG_PATH}")
+endif()
+if(DEFINED ENV{PKG_CONFIG_LIBDIR})
+    set(__qt_dbus_pcl "$ENV{PKG_CONFIG_LIBDIR}")
+endif()
+
+find_package(DBus1)
+
+if(DEFINED __qt_dbus_pcd)
+    set(ENV{PKG_CONFIG_DIR} "${__qt_dbus_pcd}")
+else()
+    unset(ENV{PKG_CONFIG_DIR})
+endif()
+if(DEFINED __qt_dbus_pcp)
+    set(ENV{PKG_CONFIG_PATH} "${__qt_dbus_pcp}")
+else()
+    unset(ENV{PKG_CONFIG_PATH})
+endif()
+if(DEFINED __qt_dbus_pcl)
+    set(ENV{PKG_CONFIG_LIBDIR} "${__qt_dbus_pcl}")
+else()
+    unset(ENV{PKG_CONFIG_LIBDIR})
+endif()
+
+if(DBus1_FOUND)
+    set(WrapDBus1_FOUND 1)
+endif()
diff --git a/cmake/FindWrapDoubleConversion.cmake b/cmake/FindWrapDoubleConversion.cmake
new file mode 100644
index 0000000000..9c804a3eec
--- /dev/null
+++ b/cmake/FindWrapDoubleConversion.cmake
@@ -0,0 +1,61 @@
+# We can't create the same interface imported target multiple times, CMake will complain if we do
+# that. This can happen if the find_package call is done in multiple different subdirectories.
+if(TARGET WrapDoubleConversion::WrapDoubleConversion)
+    set(WrapDoubleConversion_FOUND ON)
+    return()
+endif()
+
+add_library(WrapDoubleConversion::WrapDoubleConversion INTERFACE IMPORTED)
+
+find_package(double-conversion)
+if (double-conversion_FOUND)
+    include(FeatureSummary)
+    set_package_properties(double-conversion PROPERTIES TYPE REQUIRED)
+    target_link_libraries(WrapDoubleConversion::WrapDoubleConversion
+                          INTERFACE double-conversion::double-conversion)
+    set(WrapDoubleConversion_FOUND 1)
+    return()
+endif()
+
+include(CheckCXXSourceCompiles)
+
+check_cxx_source_compiles("
+#include <stdio.h>
+#include <locale.h>
+
+int main(int argc, char *argv[]) {
+    _locale_t invalidLocale = NULL;
+    double a = 3.14;
+    const char *format = \"invalid format\";
+    _sscanf_l(argv[0], invalidLocale, format, &a, &argc);
+    _snprintf_l(argv[0], 1, invalidLocale, format, a);
+}" HAVE__SPRINTF_L)
+
+check_cxx_source_compiles("
+#include <stdio.h>
+#include <xlocale.h>
+
+int main(int argc, char *argv[]) {
+    locale_t invalidLocale = NULL;
+    double a = 3.14;
+    const char *format = \"invalid format\";
+    snprintf_l(argv[0], 1, invalidLocale, format, a);
+    sscanf_l(argv[0], invalidLocale, format, &a, &argc);
+    return 0;
+}" HAVE_SPRINTF_L)
+
+# In a static build, we need to find the package to bring the target into scope.
+find_package(QtDoubleConversion QUIET)
+
+if (HAVE__SPRINTF_L OR HAVE_SPRINTF_L)
+    target_compile_definitions(WrapDoubleConversion::WrapDoubleConversion
+                               INTERFACE QT_NO_DOUBLECONVERSION)
+    set(WrapDoubleConversion_FOUND 1)
+elseif(TARGET QtDoubleConversion)
+    # If a Config package wasn't found, and the C++ library doesn't contain the necessary functions,
+    # use the library bundled with Qt.
+    target_link_libraries(WrapDoubleConversion::WrapDoubleConversion INTERFACE QtDoubleConversion)
+    set(WrapDoubleConversion_FOUND 1)
+else()
+    set(WrapDoubleConversion_FOUND 0)
+endif()
diff --git a/cmake/FindWrapFreetype.cmake b/cmake/FindWrapFreetype.cmake
new file mode 100644
index 0000000000..3f8317be69
--- /dev/null
+++ b/cmake/FindWrapFreetype.cmake
@@ -0,0 +1,17 @@
+include(QtFindWrapHelper NO_POLICY_SCOPE)
+
+set(_qt_wrap_use_bundled FALSE)
+if(QT_FEATURE_freetype AND NOT QT_FEATURE_system_freetype)
+    set(_qt_wrap_use_bundled TRUE)
+endif()
+
+qt_find_package_system_or_bundled(wrap_freetype
+    FRIENDLY_PACKAGE_NAME "Freetype"
+    WRAP_PACKAGE_TARGET "WrapFreetype::WrapFreetype"
+    WRAP_PACKAGE_FOUND_VAR_NAME "WrapFreetype_FOUND"
+    BUNDLED_PACKAGE_NAME "Qt6BundledFreetype"
+    BUNDLED_PACKAGE_TARGET "Qt6::BundledFreetype"
+    SYSTEM_PACKAGE_NAME "WrapSystemFreetype"
+    SYSTEM_PACKAGE_TARGET "WrapSystemFreetype::WrapSystemFreetype"
+    USE_BUNDLED_PACKAGE "${_qt_wrap_use_bundled}"
+)
diff --git a/cmake/FindWrapHarfbuzz.cmake b/cmake/FindWrapHarfbuzz.cmake
new file mode 100644
index 0000000000..eac95b669d
--- /dev/null
+++ b/cmake/FindWrapHarfbuzz.cmake
@@ -0,0 +1,17 @@
+include(QtFindWrapHelper NO_POLICY_SCOPE)
+
+set(_qt_wrap_use_bundled FALSE)
+if(QT_FEATURE_harfbuzz AND NOT QT_FEATURE_system_harfbuzz)
+    set(_qt_wrap_use_bundled TRUE)
+endif()
+
+qt_find_package_system_or_bundled(wrap_harfbuzz
+    FRIENDLY_PACKAGE_NAME "Harfbuzz"
+    WRAP_PACKAGE_TARGET "WrapHarfbuzz::WrapHarfbuzz"
+    WRAP_PACKAGE_FOUND_VAR_NAME "WrapHarfbuzz_FOUND"
+    BUNDLED_PACKAGE_NAME "Qt6BundledHarfbuzz"
+    BUNDLED_PACKAGE_TARGET "Qt6::BundledHarfbuzz"
+    SYSTEM_PACKAGE_NAME "WrapSystemHarfbuzz"
+    SYSTEM_PACKAGE_TARGET "WrapSystemHarfbuzz::WrapSystemHarfbuzz"
+    USE_BUNDLED_PACKAGE "${_qt_wrap_use_bundled}"
+)
diff --git a/cmake/FindWrapPCRE2.cmake b/cmake/FindWrapPCRE2.cmake
new file mode 100644
index 0000000000..fec46f36b0
--- /dev/null
+++ b/cmake/FindWrapPCRE2.cmake
@@ -0,0 +1,17 @@
+include(QtFindWrapHelper NO_POLICY_SCOPE)
+
+set(_qt_wrap_use_bundled FALSE)
+if(QT_FEATURE_pcre2 AND NOT QT_FEATURE_system_pcre2)
+    set(_qt_wrap_use_bundled TRUE)
+endif()
+
+qt_find_package_system_or_bundled(wrap_pcre2
+    FRIENDLY_PACKAGE_NAME "PCRE2"
+    WRAP_PACKAGE_TARGET "WrapPCRE2::WrapPCRE2"
+    WRAP_PACKAGE_FOUND_VAR_NAME "WrapPCRE2_FOUND"
+    BUNDLED_PACKAGE_NAME "Qt6BundledPcre2"
+    BUNDLED_PACKAGE_TARGET "Qt6::BundledPcre2"
+    SYSTEM_PACKAGE_NAME "WrapSystemPCRE2"
+    SYSTEM_PACKAGE_TARGET "WrapSystemPCRE2::WrapSystemPCRE2"
+    USE_BUNDLED_PACKAGE "${_qt_wrap_use_bundled}"
+)
diff --git a/cmake/FindWrapPNG.cmake b/cmake/FindWrapPNG.cmake
new file mode 100644
index 0000000000..d9e7aa539b
--- /dev/null
+++ b/cmake/FindWrapPNG.cmake
@@ -0,0 +1,17 @@
+include(QtFindWrapHelper NO_POLICY_SCOPE)
+
+set(_qt_wrap_use_bundled FALSE)
+if(QT_FEATURE_png AND NOT QT_FEATURE_system_png)
+    set(_qt_wrap_use_bundled TRUE)
+endif()
+
+qt_find_package_system_or_bundled(wrap_png
+    FRIENDLY_PACKAGE_NAME "PNG"
+    WRAP_PACKAGE_TARGET "WrapPNG::WrapPNG"
+    WRAP_PACKAGE_FOUND_VAR_NAME "WrapPNG_FOUND"
+    BUNDLED_PACKAGE_NAME "Qt6BundledLibpng"
+    BUNDLED_PACKAGE_TARGET "Qt6::BundledLibpng"
+    SYSTEM_PACKAGE_NAME "WrapSystemPNG"
+    SYSTEM_PACKAGE_TARGET "WrapSystemPNG::WrapSystemPNG"
+    USE_BUNDLED_PACKAGE "${_qt_wrap_use_bundled}"
+)
diff --git a/cmake/FindWrapRt.cmake b/cmake/FindWrapRt.cmake
new file mode 100644
index 0000000000..0e57cadef5
--- /dev/null
+++ b/cmake/FindWrapRt.cmake
@@ -0,0 +1,37 @@
+# We can't create the same interface imported target multiple times, CMake will complain if we do
+# that. This can happen if the find_package call is done in multiple different subdirectories.
+if(TARGET WrapRt)
+    set(WrapRt_FOUND ON)
+    return()
+endif()
+
+set(WrapRt_FOUND OFF)
+
+include(CheckCXXSourceCompiles)
+include(CMakePushCheckState)
+
+find_library(LIBRT rt)
+
+cmake_push_check_state()
+if(LIBRT_FOUND)
+    list(APPEND CMAKE_REQUIRED_LIBRARIES "${LIBRT}")
+endif()
+
+check_cxx_source_compiles("
+#include <unistd.h>
+#include <time.h>
+
+int main(int argc, char *argv[]) {
+    timespec ts; clock_gettime(CLOCK_REALTIME, &ts);
+}" HAVE_GETTIME)
+
+cmake_pop_check_state()
+
+
+if(HAVE_GETTIME)
+    set(WrapRt_FOUND ON)
+    add_library(WrapRt INTERFACE IMPORTED)
+    if (LIBRT_FOUND)
+        target_link_libraries(WrapRt INTERFACE "${LIBRT}")
+    endif()
+endif()
diff --git a/cmake/FindWrapSystemFreetype.cmake b/cmake/FindWrapSystemFreetype.cmake
new file mode 100644
index 0000000000..d41906f949
--- /dev/null
+++ b/cmake/FindWrapSystemFreetype.cmake
@@ -0,0 +1,35 @@
+# We can't create the same interface imported target multiple times, CMake will complain if we do
+# that. This can happen if the find_package call is done in multiple different subdirectories.
+if(TARGET WrapSystemFreetype::WrapSystemFreetype)
+    set(WrapSystemFreetype_FOUND ON)
+    return()
+endif()
+
+set(WrapSystemFreetype_FOUND OFF)
+
+# Hunter has the package named freetype, but exports the Freetype::Freetype target as upstream
+# First try the CONFIG package, and afterwards the MODULE if not found
+
+find_package(Freetype CONFIG NAMES Freetype freetype QUIET)
+if(NOT Freetype_FOUND)
+    find_package(Freetype MODULE)
+endif()
+
+if(Freetype_FOUND)
+    # vcpkg defines a lower case target name, while upstream Find module defines a prefixed
+    # upper case name.
+    set(potential_target_names Freetype::Freetype freetype)
+    foreach(target_name ${potential_target_names})
+        if(TARGET ${target_name})
+            set(WrapSystemFreetype_FOUND ON)
+            set(final_target_name ${target_name})
+
+            add_library(WrapSystemFreetype::WrapSystemFreetype INTERFACE IMPORTED)
+            target_link_libraries(WrapSystemFreetype::WrapSystemFreetype INTERFACE
+                                  ${final_target_name})
+
+            break()
+        endif()
+    endforeach()
+endif()
+
diff --git a/cmake/FindWrapSystemHarfbuzz.cmake b/cmake/FindWrapSystemHarfbuzz.cmake
new file mode 100644
index 0000000000..6829dc1430
--- /dev/null
+++ b/cmake/FindWrapSystemHarfbuzz.cmake
@@ -0,0 +1,45 @@
+# We can't create the same interface imported target multiple times, CMake will complain if we do
+# that. This can happen if the find_package call is done in multiple different subdirectories.
+if(TARGET WrapSystemHarfbuzz::WrapSystemHarfbuzz)
+    set(WrapSystemHarfbuzz_FOUND ON)
+    return()
+endif()
+
+set(WrapSystemHarfbuzz_FOUND OFF)
+
+find_package(harfbuzz)
+
+# Gentoo has some buggy version of a harfbuzz Config file. Check if include paths are valid.
+set(__harfbuzz_target_name "harfbuzz::harfbuzz")
+if(harfbuzz_FOUND AND TARGET "${__harfbuzz_target_name}")
+    get_property(__harfbuzz_include_paths TARGET "${__harfbuzz_target_name}"
+                                          PROPERTY INTERFACE_INCLUDE_DIRECTORIES)
+    foreach(__harfbuzz_include_dir ${__harfbuzz_include_paths})
+        if(NOT EXISTS "${__harfbuzz_include_dir}")
+            # Must be the broken Gentoo harfbuzzConfig.cmake file. Try to use pkg-config instead.
+            set(__harfbuzz_broken_config_file TRUE)
+            break()
+        endif()
+    endforeach()
+endif()
+
+if(__harfbuzz_broken_config_file)
+    find_package(PkgConfig)
+
+    pkg_check_modules(harfbuzz harfbuzz IMPORTED_TARGET)
+    set(__harfbuzz_target_name "PkgConfig::harfbuzz")
+
+    if (NOT TARGET "${__harfbuzz_target_name}")
+        set(harfbuzz_FOUND 0)
+    endif()
+endif()
+
+if(TARGET "${__harfbuzz_target_name}")
+    set(WrapSystemHarfbuzz_FOUND ON)
+
+    add_library(WrapSystemHarfbuzz::WrapSystemHarfbuzz INTERFACE IMPORTED)
+    target_link_libraries(WrapSystemHarfbuzz::WrapSystemHarfbuzz INTERFACE ${__harfbuzz_target_name})
+endif()
+unset(__harfbuzz_target_name)
+unset(__harfbuzz_include_dir)
+unset(__harfbuzz_broken_config_file)
diff --git a/cmake/FindWrapSystemPCRE2.cmake b/cmake/FindWrapSystemPCRE2.cmake
new file mode 100644
index 0000000000..31379ecc63
--- /dev/null
+++ b/cmake/FindWrapSystemPCRE2.cmake
@@ -0,0 +1,23 @@
+if(TARGET WrapSystemPCRE2::WrapSystemPCRE2)
+    set(WrapSystemPCRE2_FOUND TRUE)
+    return()
+endif()
+
+find_package(PCRE2 CONFIG QUIET)
+
+if(PCRE2_FOUND AND TARGET PCRE2::pcre2-16)
+  # Hunter case.
+  add_library(WrapSystemPCRE2::WrapSystemPCRE2 INTERFACE IMPORTED)
+  target_link_libraries(WrapSystemPCRE2::WrapSystemPCRE2 INTERFACE PCRE2::pcre2-16)
+  set(WrapSystemPCRE2_FOUND TRUE)
+else()
+  find_library(PCRE2_LIBRARIES NAMES pcre2-16)
+  find_path(PCRE2_INCLUDE_DIRS pcre2.h)
+
+  if (PCRE2_LIBRARIES AND PCRE2_INCLUDE_DIRS)
+      add_library(WrapSystemPCRE2::WrapSystemPCRE2 INTERFACE IMPORTED)
+      target_link_libraries(WrapSystemPCRE2::WrapSystemPCRE2 INTERFACE ${PCRE2_LIBRARIES})
+      target_include_directories(WrapSystemPCRE2::WrapSystemPCRE2 INTERFACE ${PCRE2_INCLUDE_DIRS})
+      set(WrapSystemPCRE2_FOUND TRUE)
+  endif()
+endif()
diff --git a/cmake/FindWrapSystemPNG.cmake b/cmake/FindWrapSystemPNG.cmake
new file mode 100644
index 0000000000..cff160ad04
--- /dev/null
+++ b/cmake/FindWrapSystemPNG.cmake
@@ -0,0 +1,27 @@
+# We can't create the same interface imported target multiple times, CMake will complain if we do
+# that. This can happen if the find_package call is done in multiple different subdirectories.
+if(TARGET WrapSystemPNG::WrapSystemPNG)
+    set(WrapSystemPNG_FOUND ON)
+    return()
+endif()
+
+set(WrapSystemPNG_FOUND OFF)
+
+find_package(PNG QUIET)
+
+if(PNG_FOUND)
+    set(potential_target_names PNG::PNG)
+    foreach(target_name ${potential_target_names})
+        if(TARGET ${target_name})
+            set(WrapSystemPNG_FOUND ON)
+            set(final_target_name ${target_name})
+
+            add_library(WrapSystemPNG::WrapSystemPNG INTERFACE IMPORTED)
+            target_link_libraries(WrapSystemPNG::WrapSystemPNG INTERFACE
+                                  ${final_target_name})
+
+            break()
+        endif()
+    endforeach()
+endif()
+
diff --git a/cmake/FindXKB_COMMON_X11.cmake b/cmake/FindXKB_COMMON_X11.cmake
new file mode 100644
index 0000000000..61b4ba82e7
--- /dev/null
+++ b/cmake/FindXKB_COMMON_X11.cmake
@@ -0,0 +1,7 @@
+include(FindPkgConfig)
+
+pkg_check_modules(XKB_COMMON_X11 "xkbcommon-x11>=0.4.1" IMPORTED_TARGET)
+
+if (NOT TARGET PkgConfig::XKB_COMMON_X11)
+    set(XKB_COMMON_X11_FOUND 0)
+endif()
diff --git a/cmake/FindXRender.cmake b/cmake/FindXRender.cmake
new file mode 100644
index 0000000000..246a47e18c
--- /dev/null
+++ b/cmake/FindXRender.cmake
@@ -0,0 +1,11 @@
+include(FindPkgConfig)
+
+if(NOT TARGET PkgConfig::XRender)
+    pkg_check_modules(XRender xrender IMPORTED_TARGET)
+
+    if (NOT TARGET PkgConfig::XRender)
+        set(XRender_FOUND 0)
+    endif()
+else()
+    set(XRender_FOUND 1)
+endif()
diff --git a/cmake/FindZSTD.cmake b/cmake/FindZSTD.cmake
new file mode 100644
index 0000000000..90d667dc29
--- /dev/null
+++ b/cmake/FindZSTD.cmake
@@ -0,0 +1,50 @@
+#.rst:
+# FindZstd
+# ---------
+#
+# Try to locate the Zstd library.
+# If found, this will define the following variables:
+#
+# ``ZSTD_FOUND``
+#     True if the zstd library is available
+# ``ZSTD_INCLUDE_DIRS``
+#     The zstd include directories
+# ``ZSTD_LIBRARIES``
+#     The zstd libraries for linking
+#
+# If ``ZSTD_FOUND`` is TRUE, it will also define the following
+# imported target:
+#
+# ``ZSTD::ZSTD``
+#     The zstd library
+
+find_package(PkgConfig)
+pkg_check_modules(PC_ZSTD QUIET libzstd)
+
+find_path(ZSTD_INCLUDE_DIRS
+          NAMES zstd.h
+          HINTS ${PC_ZSTD_INCLUDEDIR}
+          PATH_SUFFIXES zstd)
+
+find_library(ZSTD_LIBRARIES
+             NAMES zstd zstd_static
+             HINTS ${PC_ZSTD_LIBDIR}
+)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(ZSTD DEFAULT_MSG ZSTD_LIBRARIES ZSTD_INCLUDE_DIRS)
+
+if(ZSTD_FOUND AND NOT TARGET ZSTD::ZSTD)
+  add_library(ZSTD::ZSTD UNKNOWN IMPORTED)
+  set_target_properties(ZSTD::ZSTD PROPERTIES
+                        IMPORTED_LOCATION "${ZSTD_LIBRARIES}"
+                        INTERFACE_INCLUDE_DIRECTORIES "${ZSTD_INCLUDE_DIRS}")
+endif()
+
+mark_as_advanced(ZSTD_INCLUDE_DIRS ZSTD_LIBRARIES)
+
+include(FeatureSummary)
+set_package_properties(ZSTD PROPERTIES
+  URL "https://github.com/facebook/zstd"
+  DESCRIPTION "ZSTD compression library")
+
diff --git a/cmake/Finddouble-conversion.cmake b/cmake/Finddouble-conversion.cmake
new file mode 100644
index 0000000000..43d2076289
--- /dev/null
+++ b/cmake/Finddouble-conversion.cmake
@@ -0,0 +1,32 @@
+# Fallback find module for double-conversion
+# if double-conversion is built with CMake it'll install a config module, which we prefer
+# if it's built with Scons (their default), we search ourselves
+
+find_package(double-conversion CONFIG)
+if (double-conversion_FOUND)
+    if(TARGET double-conversion::double-conversion)
+        return()
+    endif()
+endif()
+
+find_path(DOUBLE_CONVERSION_INCLUDE_DIR
+    NAMES
+        double-conversion.h
+    PATH_SUFFIXES
+        double-conversion
+)
+find_library(DOUBLE_CONVERSION_LIBRARY NAMES double-conversion)
+
+include(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(
+    double-conversion DEFAULT_MSG
+    DOUBLE_CONVERSION_LIBRARY DOUBLE_CONVERSION_INCLUDE_DIR)
+
+if(double-conversion_FOUND AND NOT TARGET double-conversion::double-conversion)
+    add_library(double-conversion::double-conversion UNKNOWN IMPORTED)
+    set_target_properties(double-conversion::double-conversion PROPERTIES
+        IMPORTED_LOCATION "${DOUBLE_CONVERSION_LIBRARY}"
+        INTERFACE_INCLUDE_DIRECTORIES "${DOUBLE_CONVERSION_INCLUDE_DIR}")
+endif()
+
+mark_as_advanced(DOUBLE_CONVERSION_INCLUDE_DIR DOUBLE_CONVERSION_LIBRARY)
diff --git a/cmake/ModuleDescription.json.in b/cmake/ModuleDescription.json.in
new file mode 100644
index 0000000000..e29f3f176d
--- /dev/null
+++ b/cmake/ModuleDescription.json.in
@@ -0,0 +1,11 @@
+{
+    "module_name": "${target}",
+    "version": "${CMAKE_PROJECT_VERSION}",
+    "built_with": {
+        "compiler_id": "${CMAKE_CXX_COMPILER_ID}",
+        "compiler_target": "${CMAKE_CXX_COMPILER_TARGET}",
+        "compiler_version": "${CMAKE_CXX_COMPILER_VERSION}",
+        "cross_compiled": ${cross_compilation},
+        "target_system": "${CMAKE_SYSTEM_NAME}"
+    }
+}
diff --git a/cmake/Qt3rdPartyLibraryConfig.cmake.in b/cmake/Qt3rdPartyLibraryConfig.cmake.in
new file mode 100644
index 0000000000..0facce906f
--- /dev/null
+++ b/cmake/Qt3rdPartyLibraryConfig.cmake.in
@@ -0,0 +1,26 @@
+@PACKAGE_INIT@
+
+include(CMakeFindDependencyMacro)
+
+get_filename_component(_import_prefix "${CMAKE_CURRENT_LIST_FILE}" PATH)
+get_filename_component(_import_prefix "${_import_prefix}" REALPATH)
+
+# Extra cmake code begin
+@extra_cmake_code@
+# Extra cmake code end
+
+# Find required dependencies, if any.
+if(EXISTS "${CMAKE_CURRENT_LIST_DIR}/@INSTALL_CMAKE_NAMESPACE@@target@Dependencies.cmake")
+    include("${CMAKE_CURRENT_LIST_DIR}/@INSTALL_CMAKE_NAMESPACE@@target@Dependencies.cmake")
+endif()
+
+if (NOT QT_NO_CREATE_TARGETS)
+    include("${CMAKE_CURRENT_LIST_DIR}/@INSTALL_CMAKE_NAMESPACE@@target@Targets.cmake")
+    if(NOT QT_NO_CREATE_VERSIONLESS_TARGETS)
+        include("${CMAKE_CURRENT_LIST_DIR}/@INSTALL_CMAKE_NAMESPACE@@target@VersionlessTargets.cmake")
+    endif()
+endif()
+
+foreach(extra_cmake_include @extra_cmake_includes@)
+    include("${CMAKE_CURRENT_LIST_DIR}/${extra_cmake_include}")
+endforeach()
diff --git a/cmake/QtAutoDetect.cmake b/cmake/QtAutoDetect.cmake
new file mode 100644
index 0000000000..936d9fdfa8
--- /dev/null
+++ b/cmake/QtAutoDetect.cmake
@@ -0,0 +1,195 @@
+#
+# Collection of auto dection routines to improve the user eperience when
+# building Qt from source.
+#
+# Make sure to not run detection when building standalone tests, because the detection was already
+# done when initially configuring qtbase.
+
+function(qt_auto_detect_android)
+    if(DEFINED CMAKE_TOOLCHAIN_FILE AND NOT DEFINED QT_AUTODETECT_ANDROID
+            AND NOT QT_BUILD_STANDALONE_TESTS)
+
+        file(READ ${CMAKE_TOOLCHAIN_FILE} toolchain_file_content OFFSET 0 LIMIT 80)
+        string(FIND ${toolchain_file_content} "The Android Open Source Project" find_result REVERSE)
+        if (NOT ${find_result} EQUAL -1)
+            set(android_detected TRUE)
+        else()
+            set(android_detected FALSE)
+        endif()
+
+        if(android_detected)
+            message(STATUS "Android toolchain file detected, checking configuration defaults...")
+            if(NOT DEFINED ANDROID_NATIVE_API_LEVEL)
+                message(STATUS "ANDROID_NATIVE_API_LEVEL was not specified, using API level 21 as default")
+                set(ANDROID_NATIVE_API_LEVEL 21 CACHE STRING "")
+            endif()
+            if(NOT DEFINED ANDROID_STL)
+                set(ANDROID_STL "c++_shared" CACHE STRING "")
+            endif()
+        endif()
+        set(QT_AUTODETECT_ANDROID ${android_detected} CACHE STRING "")
+    elseif (QT_AUTODETECT_ANDROID)
+        message(STATUS "Android toolchain file detected")
+    endif()
+endfunction()
+
+function(qt_auto_detect_vpckg)
+    if(DEFINED ENV{VCPKG_ROOT} AND NOT QT_BUILD_STANDALONE_TESTS)
+        set(vcpkg_toolchain_file "$ENV{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake")
+        get_filename_component(vcpkg_toolchain_file "${vcpkg_toolchain_file}" ABSOLUTE)
+
+        if(DEFINED CMAKE_TOOLCHAIN_FILE)
+            get_filename_component(supplied_toolchain_file "${CMAKE_TOOLCHAIN_FILE}" ABSOLUTE)
+            if(NOT supplied_toolchain_file STREQUAL vcpkg_toolchain_file)
+                set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${CMAKE_TOOLCHAIN_FILE}" CACHE STRING "")
+            endif()
+            unset(supplied_toolchain_file)
+        endif()
+        set(CMAKE_TOOLCHAIN_FILE "${vcpkg_toolchain_file}" CACHE STRING "" FORCE)
+        message(STATUS "Using vcpkg from $ENV{VCPKG_ROOT}")
+        if(DEFINED ENV{VCPKG_DEFAULT_TRIPLET} AND NOT DEFINED VCPKG_TARGET_TRIPLET)
+            set(VCPKG_TARGET_TRIPLET "$ENV{VCPKG_DEFAULT_TRIPLET}" CACHE STRING "")
+            message(STATUS "Using vcpkg triplet ${VCPKG_TARGET_TRIPLET}")
+        endif()
+        unset(vcpkg_toolchain_file)
+        message(STATUS "CMAKE_TOOLCHAIN_FILE is: ${CMAKE_TOOLCHAIN_FILE}")
+        if(DEFINED VCPKG_CHAINLOAD_TOOLCHAIN_FILE)
+            message(STATUS "VCPKG_CHAINLOAD_TOOLCHAIN_FILE is: ${VCPKG_CHAINLOAD_TOOLCHAIN_FILE}")
+        endif()
+    endif()
+endfunction()
+
+function(qt_auto_detect_ios)
+    if(CMAKE_SYSTEM_NAME STREQUAL iOS
+            OR CMAKE_SYSTEM_NAME STREQUAL watchOS
+            OR CMAKE_SYSTEM_NAME STREQUAL tvOS)
+        message(STATUS "Using internal CMake ${CMAKE_SYSTEM_NAME} toolchain file.")
+
+        # The QT_UIKIT_SDK check simulates the input.sdk condition for simulator_and_device in
+        # configure.json.
+        # If the variable is explicitly provided, assume simulator_and_device to be off.
+        if(QT_UIKIT_SDK)
+            set(simulator_and_device OFF)
+        elseif(QT_FORCE_SIMULATOR_AND_DEVICE)
+            # TODO: Once we get simulator_and_device support in upstream CMake, only then allow
+            # usage of simulator_and_device without forcing.
+            set(simulator_and_device ON)
+        else()
+            # If QT_UIKIT_SDK is not provided, default to simulator.
+            set(simulator_and_device OFF)
+            set(QT_UIKIT_SDK "iphonesimulator" CACHE "STRING" "Chosen uikit SDK.")
+        endif()
+
+        message(STATUS "simulator_and_device set to: \"${simulator_and_device}\".")
+
+        # Choose relevant architectures.
+        # Using a non xcode generator requires explicit setting of the
+        # architectures, otherwise compilation fails with unknown defines.
+        if(CMAKE_SYSTEM_NAME STREQUAL iOS)
+            if(simulator_and_device)
+                set(osx_architectures "arm64;x86_64")
+            elseif(QT_UIKIT_SDK STREQUAL "iphoneos")
+                set(osx_architectures "arm64")
+            elseif(QT_UIKIT_SDK STREQUAL "iphonesimulator")
+                set(osx_architectures "x86_64")
+            else()
+                if(NOT DEFINED QT_UIKIT_SDK)
+                    message(FATAL_ERROR "Please proviude a value for -DQT_UIKIT_SDK."
+                        " Possible values: iphoneos, iphonesimulator.")
+                else()
+                    message(FATAL_ERROR
+                            "Unknown SDK argument given to QT_UIKIT_SDK: ${QT_UIKIT_SDK}.")
+                endif()
+            endif()
+        elseif(CMAKE_SYSTEM_NAME STREQUAL tvOS)
+            if(simulator_and_device)
+                set(osx_architectures "arm64;x86_64")
+            elseif(QT_UIKIT_SDK STREQUAL "appletvos")
+                set(osx_architectures "arm64")
+            elseif(QT_UIKIT_SDK STREQUAL "appletvsimulator")
+                set(osx_architectures "x86_64")
+            else()
+                if(NOT DEFINED QT_UIKIT_SDK)
+                    message(FATAL_ERROR "Please proviude a value for -DQT_UIKIT_SDK."
+                        " Possible values: appletvos, appletvsimulator.")
+                else()
+                    message(FATAL_ERROR
+                            "Unknown SDK argument given to QT_UIKIT_SDK: ${QT_UIKIT_SDK}.")
+                endif()
+            endif()
+        elseif(CMAKE_SYSTEM_NAME STREQUAL watchOS)
+            if(simulator_and_device)
+                set(osx_architectures "armv7k;i386")
+            elseif(QT_UIKIT_SDK STREQUAL "watchos")
+                set(osx_architectures "armv7k")
+            elseif(QT_UIKIT_SDK STREQUAL "watchsimulator")
+                set(osx_architectures "i386")
+            else()
+                if(NOT DEFINED QT_UIKIT_SDK)
+                    message(FATAL_ERROR "Please proviude a value for -DQT_UIKIT_SDK."
+                        " Possible values: watchos, watchsimulator.")
+                else()
+                    message(FATAL_ERROR
+                            "Unknown SDK argument given to QT_UIKIT_SDK: ${QT_UIKIT_SDK}.")
+                endif()
+            endif()
+        endif()
+
+        # For non simulator_and_device builds, we need to explicitly set the SYSROOT aka the sdk
+        # value.
+        if(QT_UIKIT_SDK)
+            set(CMAKE_OSX_SYSROOT "${QT_UIKIT_SDK}" CACHE STRING "")
+        endif()
+        message(STATUS "CMAKE_OSX_SYSROOT set to: \"${CMAKE_OSX_SYSROOT}\".")
+
+        message(STATUS "CMAKE_OSX_ARCHITECTURES set to: \"${osx_architectures}\".")
+        set(CMAKE_OSX_ARCHITECTURES "${osx_architectures}" CACHE STRING "")
+
+        if(NOT DEFINED BUILD_SHARED_LIBS)
+            set(BUILD_SHARED_LIBS OFF CACHE BOOL "Build Qt statically or dynamically" FORCE)
+        endif()
+
+        if(BUILD_SHARED_LIBS)
+            message(FATAL_ERROR
+                "Building Qt for ${CMAKE_SYSTEM_NAME} as shared libraries is not supported.")
+        endif()
+    endif()
+endfunction()
+
+function(qt_auto_detect_cmake_config)
+    if(CMAKE_CONFIGURATION_TYPES)
+        # Allow users to specify this option.
+        if(NOT QT_MULTI_CONFIG_FIRST_CONFIG)
+            list(GET CMAKE_CONFIGURATION_TYPES 0 first_config_type)
+            set(QT_MULTI_CONFIG_FIRST_CONFIG "${first_config_type}")
+            set(QT_MULTI_CONFIG_FIRST_CONFIG "${first_config_type}" PARENT_SCOPE)
+        endif()
+
+        set(CMAKE_TRY_COMPILE_CONFIGURATION "${QT_MULTI_CONFIG_FIRST_CONFIG}" PARENT_SCOPE)
+        if(CMAKE_GENERATOR STREQUAL "Ninja Multi-Config")
+            set(CMAKE_NINJA_MULTI_CROSS_CONFIG_ENABLE ON PARENT_SCOPE)
+            set(CMAKE_NINJA_MULTI_DEFAULT_BUILD_TYPE "${QT_MULTI_CONFIG_FIRST_CONFIG}" PARENT_SCOPE)
+        endif()
+    endif()
+endfunction()
+
+function(qt_auto_detect_darwin)
+    if(APPLE)
+        # If no CMAKE_OSX_DEPLOYMENT_TARGET is provided, default
+        # to a value that we choose. This replicates the behavior
+        # in mkspecs/common/macx.conf where
+        # QMAKE_MACOSX_DEPLOYMENT_TARGET is set.
+        # Currently only set for macOS, and not the mobile platforms.
+        if(NOT CMAKE_OSX_DEPLOYMENT_TARGET AND NOT CMAKE_SYSTEM_NAME)
+            set(CMAKE_OSX_DEPLOYMENT_TARGET "10.14" CACHE STRING
+                "Minimum OS X version to target for deployment (at runtime); newer APIs weak linked. Set to empty string for default value.")
+        endif()
+        message(STATUS "CMAKE_OSX_DEPLOYMENT_TARGET set to: \"${CMAKE_OSX_DEPLOYMENT_TARGET}\".")
+    endif()
+endfunction()
+
+qt_auto_detect_cmake_config()
+qt_auto_detect_darwin()
+qt_auto_detect_ios()
+qt_auto_detect_android()
+qt_auto_detect_vpckg()
diff --git a/cmake/QtBaseCMakeTesting.cmake b/cmake/QtBaseCMakeTesting.cmake
new file mode 100644
index 0000000000..662ac8f498
--- /dev/null
+++ b/cmake/QtBaseCMakeTesting.cmake
@@ -0,0 +1,9 @@
+## Test the cmake build system:
+option(BUILD_CMAKE_TESTING "Build tests for the Qt build system" OFF)
+mark_as_advanced(BUILD_CMAKE_TESTING)
+
+if(BUILD_CMAKE_TESTING)
+    add_subdirectory("${PROJECT_SOURCE_DIR}/cmake/tests")
+endif()
+
+
diff --git a/cmake/QtBaseConfigureTests.cmake b/cmake/QtBaseConfigureTests.cmake
new file mode 100644
index 0000000000..0d6bb1407b
--- /dev/null
+++ b/cmake/QtBaseConfigureTests.cmake
@@ -0,0 +1,198 @@
+include(CheckCXXSourceCompiles)
+
+function(qt_run_config_test_architecture)
+    set(QT_BASE_CONFIGURE_TESTS_VARS_TO_EXPORT
+        "" CACHE INTERNAL "Test variables that should be exported" FORCE)
+
+    # Compile test to find the target architecture and sub-architectures.
+    set(flags "")
+    qt_get_platform_try_compile_vars(platform_try_compile_vars)
+    list(APPEND flags ${platform_try_compile_vars})
+
+    try_compile(
+        _arch_result
+        "${CMAKE_CURRENT_BINARY_DIR}/config.tests/arch"
+        "${CMAKE_CURRENT_SOURCE_DIR}/config.tests/arch"
+        arch
+        CMAKE_FLAGS ${flags}
+        )
+
+    if (NOT _arch_result)
+        message(FATAL_ERROR "Failed to compile architecture detection file.")
+    endif()
+
+    set(_arch_file_suffix "${CMAKE_EXECUTABLE_SUFFIX}")
+    # With emscripten the application entry point is a .js file (to be run with node for example),
+    # but the real "data" is in the .wasm file, so that's where we need to look for the ABI, etc.
+    # information.
+    if (EMSCRIPTEN)
+        set(_arch_file_suffix ".wasm")
+    endif()
+
+    set(arch_test_location "config.tests/arch")
+    if(QT_MULTI_CONFIG_FIRST_CONFIG)
+        string(APPEND arch_test_location "/${QT_MULTI_CONFIG_FIRST_CONFIG}")
+    endif()
+
+    set(_arch_file
+        "${CMAKE_CURRENT_BINARY_DIR}/${arch_test_location}/architecture_test${_arch_file_suffix}")
+    if (NOT EXISTS "${_arch_file}")
+        message(FATAL_ERROR
+                "Failed to find compiled architecture detection executable at ${_arch_file}.")
+    endif()
+    message(STATUS "Extracting architecture info from ${_arch_file}.")
+
+    file(STRINGS "${_arch_file}" _arch_lines LENGTH_MINIMUM 16 LENGTH_MAXIMUM 1024 ENCODING UTF-8)
+
+    foreach (_line ${_arch_lines})
+        string(LENGTH "${_line}" lineLength)
+        string(FIND "${_line}" "==Qt=magic=Qt== Architecture:" _pos)
+        if (_pos GREATER -1)
+            math(EXPR _pos "${_pos}+29")
+            string(SUBSTRING "${_line}" ${_pos} -1 _architecture)
+        endif()
+        string(FIND "${_line}" "==Qt=magic=Qt== Sub-architecture:" _pos)
+        if (_pos GREATER -1 AND ${lineLength} GREATER 33)
+            math(EXPR _pos "${_pos}+34")
+            string(SUBSTRING "${_line}" ${_pos} -1 _sub_architecture)
+            string(REPLACE " " ";" _sub_architecture "${_sub_architecture}")
+        endif()
+        string(FIND "${_line}" "==Qt=magic=Qt== Build-ABI:" _pos)
+        if (_pos GREATER -1)
+            math(EXPR _pos "${_pos}+26")
+            string(SUBSTRING "${_line}" ${_pos} -1 _build_abi)
+        endif()
+    endforeach()
+
+    if (NOT _architecture OR NOT _build_abi)
+        message(FATAL_ERROR "Failed to extract architecture data from file.")
+    endif()
+
+    set(TEST_architecture 1 CACHE INTERNAL "Ran the architecture test")
+    set(TEST_architecture_arch "${_architecture}" CACHE INTERNAL "Target machine architecture")
+    list(APPEND QT_BASE_CONFIGURE_TESTS_VARS_TO_EXPORT TEST_architecture_arch)
+    set(TEST_subarch 1 CACHE INTERNAL "Ran machine subArchitecture test")
+    foreach(it ${_sub_architecture})
+        # Equivalent to qmake's QT_CPU_FEATURES.$arch.
+        set(TEST_arch_${TEST_architecture_arch}_subarch_${it} 1 CACHE INTERNAL "Target sub architecture result")
+        list(APPEND QT_BASE_CONFIGURE_TESTS_VARS_TO_EXPORT TEST_arch_${TEST_architecture_arch}_subarch_${it})
+    endforeach()
+    set(TEST_buildAbi "${_build_abi}" CACHE INTERNAL "Target machine buildAbi")
+    list(APPEND QT_BASE_CONFIGURE_TESTS_VARS_TO_EXPORT TEST_buildAbi)
+    set(QT_BASE_CONFIGURE_TESTS_VARS_TO_EXPORT ${QT_BASE_CONFIGURE_TESTS_VARS_TO_EXPORT} CACHE INTERNAL "Test variables that should be exported")
+
+    list(JOIN _sub_architecture " " subarch_summary)
+    message(STATUS "Building for: ${QT_QMAKE_TARGET_MKSPEC} (${TEST_architecture_arch}, CPU features: ${subarch_summary})")
+endfunction()
+
+
+function(qt_run_config_test_posix_iconv)
+    set(source "#include <iconv.h>
+
+int main(int, char **)
+{
+    iconv_t x = iconv_open(\"\", \"\");
+
+    char *inp;
+    char *outp;
+    size_t inbytes, outbytes;
+    iconv(x, &inp, &inbytes, &outp, &outbytes);
+
+    iconv_close(x);
+
+    return 0;
+}")
+    check_cxx_source_compiles("${source}" HAVE_POSIX_ICONV)
+
+    if(NOT HAVE_POSIX_ICONV)
+        set(_req_libraries "${CMAKE_REQUIRE_LIBRARIES}")
+        set(CMAKE_REQUIRE_LIBRARIES "iconv")
+        check_cxx_source_compiles("${source}" HAVE_POSIX_ICONV)
+        set(CMAKE_REQUIRE_LIBRARIES "${_req_libraries}")
+        if(HAVE_POSIX_ICONV)
+            set(TEST_iconv_needlib 1 CACHE INTERNAL "Need to link against libiconv")
+        endif()
+    endif()
+
+    set(TEST_posix_iconv "${HAVE_POSIX_ICONV}" CACHE INTERNAL "POSIX iconv")
+endfunction()
+
+
+function(qt_run_config_test_sun_iconv)
+    set(source "#include <iconv.h>
+
+int main(int, char **)
+{
+    iconv_t x = iconv_open(\"\", \"\");
+
+    const char *inp;
+    char *outp;
+    size_t inbytes, outbytes;
+    iconv(x, &inp, &inbytes, &outp, &outbytes);
+
+    iconv_close(x);
+
+    return 0;
+}")
+    if(DARWIN)
+        # as per !config.darwin in configure.json
+        set(HAVE_SUN_ICONV OFF)
+    else()
+        check_cxx_source_compiles("${source}" HAVE_SUN_ICONV)
+    endif()
+
+    set(TEST_sun_iconv "${HAVE_SUN_ICONV}" CACHE INTERNAL "SUN libiconv")
+endfunction()
+
+function(qt_run_linker_version_script_support)
+    file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/version_flag.map" "VERS_1 { global: sym; };
+VERS_2 { global: sym; }
+VERS_1;
+")
+    if(DEFINED CMAKE_REQUIRED_FLAGS)
+        set(CMAKE_REQUIRED_FLAGS_SAVE ${CMAKE_REQUIRED_FLAGS})
+    else()
+        set(CMAKE_REQUIRED_FLAGS "")
+    endif()
+    set(CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS} "-Wl,--version-script=\"${CMAKE_CURRENT_BINARY_DIR}/version_flag.map\"")
+    check_cxx_source_compiles("int main(void){return 0;}" HAVE_LD_VERSION_SCRIPT)
+    if(DEFINED CMAKE_REQUIRED_FLAGS_SAVE)
+        set(CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS_SAVE})
+    endif()
+    file(REMOVE "${CMAKE_CURRENT_BINARY_DIR}/conftest.map")
+
+    # For some reason the linker command line written by the XCode generator, which is
+    # subsequently executed by xcodebuild, ignores the linker flag, and thus the test
+    # seemingly succeeds. Explicitly disable the version script test on darwin platforms.
+    if(APPLE)
+        set(HAVE_LD_VERSION_SCRIPT OFF)
+    endif()
+
+    set(TEST_ld_version_script "${HAVE_LD_VERSION_SCRIPT}" CACHE INTERNAL "linker version script support")
+endfunction()
+
+function(qt_run_qtbase_config_tests)
+    qt_run_config_test_posix_iconv()
+
+    add_library(Iconv INTERFACE)
+    if(TEST_iconv_needlib)
+       target_link_libraries(Iconv PUBLIC iconv)
+    endif()
+
+    if(NOT TEST_posix_iconv)
+        qt_run_config_test_sun_iconv()
+    endif()
+    qt_run_config_test_architecture()
+    qt_run_linker_version_script_support()
+endfunction()
+
+# The qmake build of android does not perform the right architecture tests and
+# forcefully disables sse4 on android x86. We have to mimic this behavior
+# for now
+if (CMAKE_ANDROID_ARCH_ABI STREQUAL x86)
+    set(QT_FEATURE_sse4_1 OFF CACHE BOOL INTERNAL FORCE)
+    set(QT_FEATURE_sse4_2 OFF CACHE BOOL INTERNAL FORCE)
+    set(TEST_subarch_sse4_1 FALSE CACHE BOOL INTERNAL FORCE)
+    set(TEST_subarch_sse4_2 FALSE CACHE BOOL INTERNAL FORCE)
+endif()
+qt_run_qtbase_config_tests()
diff --git a/cmake/QtBaseGlobalTargets.cmake b/cmake/QtBaseGlobalTargets.cmake
new file mode 100644
index 0000000000..31e0512732
--- /dev/null
+++ b/cmake/QtBaseGlobalTargets.cmake
@@ -0,0 +1,290 @@
+## QtPlatform Target:
+add_library(Platform INTERFACE)
+add_library(Qt::Platform ALIAS Platform)
+target_include_directories(Platform
+    INTERFACE
+    $<BUILD_INTERFACE:${QT_PLATFORM_DEFINITION_DIR_ABSOLUTE}>
+    $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/${INSTALL_INCLUDEDIR}>
+    $<INSTALL_INTERFACE:${QT_PLATFORM_DEFINITION_DIR}>
+    $<INSTALL_INTERFACE:${INSTALL_INCLUDEDIR}>
+    )
+target_compile_definitions(Platform INTERFACE ${QT_PLATFORM_DEFINITIONS})
+
+# When building on android we need to link against the logging library
+# in order to satisfy linker dependencies. Both of these libraries are part of
+# the NDK.
+if (ANDROID)
+    target_link_libraries(Platform INTERFACE log)
+endif()
+
+qt_enable_msvc_cplusplus_define(Platform INTERFACE)
+
+set(__GlobalConfig_path_suffix "${INSTALL_CMAKE_NAMESPACE}")
+qt_path_join(__GlobalConfig_build_dir ${QT_CONFIG_BUILD_DIR} ${__GlobalConfig_path_suffix})
+qt_path_join(__GlobalConfig_install_dir ${QT_CONFIG_INSTALL_DIR} ${__GlobalConfig_path_suffix})
+set(__GlobalConfig_install_dir_absolute "${__GlobalConfig_install_dir}")
+if(QT_WILL_INSTALL)
+    # Need to prepend the install prefix when doing prefix builds, because the config install dir
+    # is relative then.
+    qt_path_join(__GlobalConfig_install_dir_absolute
+                 ${CMAKE_INSTALL_PREFIX} ${__GlobalConfig_install_dir_absolute})
+endif()
+
+# Generate and install Qt6 config file.
+configure_package_config_file(
+    "${PROJECT_SOURCE_DIR}/cmake/QtConfig.cmake.in"
+    "${__GlobalConfig_build_dir}/${INSTALL_CMAKE_NAMESPACE}Config.cmake"
+    INSTALL_DESTINATION "${__GlobalConfig_install_dir}"
+)
+
+write_basic_package_version_file(
+    ${__GlobalConfig_build_dir}/${INSTALL_CMAKE_NAMESPACE}ConfigVersion.cmake
+    VERSION ${PROJECT_VERSION}
+    COMPATIBILITY AnyNewerVersion
+)
+
+# Generate and install Qt6Tools config file.
+configure_package_config_file(
+    "${PROJECT_SOURCE_DIR}/cmake/QtToolsConfig.cmake.in"
+    "${__GlobalConfig_build_dir}/${INSTALL_CMAKE_NAMESPACE}ToolsConfig.cmake"
+    INSTALL_DESTINATION "${__GlobalConfig_install_dir}"
+)
+write_basic_package_version_file(
+    ${__GlobalConfig_build_dir}/${INSTALL_CMAKE_NAMESPACE}ToolsConfigVersion.cmake
+    VERSION ${PROJECT_VERSION}
+    COMPATIBILITY AnyNewerVersion
+)
+
+qt_install(FILES
+    "${__GlobalConfig_build_dir}/${INSTALL_CMAKE_NAMESPACE}Config.cmake"
+    "${__GlobalConfig_build_dir}/${INSTALL_CMAKE_NAMESPACE}ConfigVersion.cmake"
+    DESTINATION "${__GlobalConfig_install_dir}"
+    COMPONENT Devel
+)
+
+qt_install(FILES
+    "${__GlobalConfig_build_dir}/${INSTALL_CMAKE_NAMESPACE}ToolsConfig.cmake"
+    "${__GlobalConfig_build_dir}/${INSTALL_CMAKE_NAMESPACE}ToolsConfigVersion.cmake"
+    DESTINATION "${__GlobalConfig_install_dir}Tools"
+    COMPONENT Devel
+)
+
+# Generate toolchain file for convenience
+if(QT_HOST_PATH)
+    get_filename_component(init_qt_host_path "${QT_HOST_PATH}" ABSOLUTE)
+    set(init_qt_host_path "set(QT_HOST_PATH \"${init_qt_host_path}\" CACHE PATH \"\" FORCE)")
+endif()
+
+if(CMAKE_TOOLCHAIN_FILE)
+    set(init_original_toolchain_file "set(qt_chainload_toolchain_file \"${CMAKE_TOOLCHAIN_FILE}\")")
+endif()
+
+if(VCPKG_CHAINLOAD_TOOLCHAIN_FILE)
+    list(APPEND init_vcpkg "set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE \"${VCPKG_CHAINLOAD_TOOLCHAIN_FILE}\")")
+endif()
+
+if(VCPKG_TARGET_TRIPLET)
+    list(APPEND init_vcpkg "set(VCPKG_TARGET_TRIPLET \"${VCPKG_TARGET_TRIPLET}\" CACHE STRING \"\")")
+endif()
+
+# On Windows compilers aren't easily mixed. Avoid that qtbase is built using cl.exe for example and then for another
+# build gcc is picked up from %PATH%. The same goes when using a custom compiler on other platforms, such as ICC.
+list(APPEND init_platform "set(CMAKE_CXX_COMPILER \"${CMAKE_CXX_COMPILER}\" CACHE STRING \"\")")
+list(APPEND init_platform "set(CMAKE_C_COMPILER \"${CMAKE_C_COMPILER}\" CACHE STRING \"\")")
+
+if(APPLE)
+    # For simulator_and_device build, we should not explicitly set the sysroot.
+    list(LENGTH CMAKE_OSX_ARCHITECTURES _qt_osx_architectures_count)
+    if(CMAKE_OSX_SYSROOT AND NOT _qt_osx_architectures_count GREATER 1 AND APPLE_UIKIT)
+        list(APPEND init_platform "set(CMAKE_OSX_SYSROOT \"${CMAKE_OSX_SYSROOT}\" CACHE PATH \"\")")
+    endif()
+    unset(_qt_osx_architectures_count)
+
+    if(CMAKE_OSX_DEPLOYMENT_TARGET)
+        list(APPEND init_platform
+            "set(CMAKE_OSX_DEPLOYMENT_TARGET \"${CMAKE_OSX_DEPLOYMENT_TARGET}\" CACHE STRING \"\")")
+    endif()
+
+    if(APPLE_UIKIT)
+        list(APPEND init_platform
+            "set(CMAKE_SYSTEM_NAME \"${CMAKE_SYSTEM_NAME}\" CACHE STRING \"\")")
+        set(_qt_osx_architectures_escaped "${CMAKE_OSX_ARCHITECTURES}")
+        string(REPLACE ";" "LITERAL_SEMICOLON"
+            _qt_osx_architectures_escaped "${_qt_osx_architectures_escaped}")
+        list(APPEND init_platform
+            "set(CMAKE_OSX_ARCHITECTURES \"${_qt_osx_architectures_escaped}\" CACHE STRING \"\")")
+        unset(_qt_osx_architectures_escaped)
+    endif()
+elseif(ANDROID)
+    list(APPEND init_platform "set(ANDROID_NATIVE_API_LEVEL \"${ANDROID_NATIVE_API_LEVEL}\" CACHE STRING \"\")")
+    list(APPEND init_platform "set(ANDROID_STL \"${ANDROID_STL}\" CACHE STRING \"\")")
+    list(APPEND init_platform "set(ANDROID_ABI \"${ANDROID_ABI}\" CACHE STRING \"\")")
+    list(APPEND init_platform "if (NOT DEFINED ANDROID_SDK_ROOT)")
+    list(APPEND init_platform "    set(ANDROID_SDK_ROOT \"${ANDROID_SDK_ROOT}\" CACHE STRING \"\")")
+    list(APPEND init_platform "endif()")
+endif()
+
+string(REPLACE ";" "\n" init_vcpkg "${init_vcpkg}")
+string(REPLACE ";" "\n" init_platform "${init_platform}")
+string(REPLACE "LITERAL_SEMICOLON" ";" init_platform "${init_platform}")
+configure_file("${CMAKE_CURRENT_SOURCE_DIR}/cmake/qt.toolchain.cmake.in" "${__GlobalConfig_build_dir}/qt.toolchain.cmake" @ONLY)
+qt_install(FILES "${__GlobalConfig_build_dir}/qt.toolchain.cmake" DESTINATION "${__GlobalConfig_install_dir}" COMPONENT Devel)
+
+# Also provide a convenience cmake wrapper
+if(UNIX)
+    configure_file("${CMAKE_CURRENT_SOURCE_DIR}/bin/qt-cmake.in" "${QT_BUILD_DIR}/${INSTALL_BINDIR}/qt-cmake" @ONLY)
+    qt_install(PROGRAMS "${QT_BUILD_DIR}/${INSTALL_BINDIR}/qt-cmake" DESTINATION "${INSTALL_BINDIR}")
+else()
+    configure_file("${CMAKE_CURRENT_SOURCE_DIR}/bin/qt-cmake.bat.in" "${QT_BUILD_DIR}/${INSTALL_BINDIR}/qt-cmake.bat" @ONLY)
+    qt_install(PROGRAMS "${QT_BUILD_DIR}/${INSTALL_BINDIR}/qt-cmake.bat" DESTINATION "${INSTALL_BINDIR}")
+endif()
+
+# Provide a private convenience wrapper with options which should not be propagated via the public
+# qt-cmake wrapper e.g. CMAKE_GENERATOR.
+# These options can not be set in a toolchain file, but only on the command line.
+# These options should not be in the public wrapper, because a consumer of Qt might want to build
+# their CMake app with the Unix Makefiles generator, while Qt should be built with the Ninja
+# generator.
+# The private wrapper is more conveient for building Qt itself, because a developer doesn't need
+# to specify the same options for each qt module built.
+set(__qt_cmake_extra "-G\"${CMAKE_GENERATOR}\"")
+if(UNIX)
+    configure_file("${CMAKE_CURRENT_SOURCE_DIR}/bin/qt-cmake.in"
+        "${QT_BUILD_DIR}/${INSTALL_BINDIR}/qt-cmake-private" @ONLY)
+qt_install(PROGRAMS "${QT_BUILD_DIR}/${INSTALL_BINDIR}/qt-cmake-private" DESTINATION "${INSTALL_BINDIR}")
+else()
+    configure_file("${CMAKE_CURRENT_SOURCE_DIR}/bin/qt-cmake.bat.in"
+        "${QT_BUILD_DIR}/${INSTALL_BINDIR}/qt-cmake-private.bat" @ONLY)
+qt_install(PROGRAMS "${QT_BUILD_DIR}/${INSTALL_BINDIR}/qt-cmake-private.bat" DESTINATION "${INSTALL_BINDIR}")
+endif()
+unset(__qt_cmake_extra)
+
+## Library to hold global features:
+## These features are stored and accessed via Qt::GlobalConfig, but the
+## files always lived in Qt::Core, so we keep it that way
+add_library(GlobalConfig INTERFACE)
+target_include_directories(GlobalConfig INTERFACE
+    $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/include>
+    $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/include/QtCore>
+    $<INSTALL_INTERFACE:include>
+    $<INSTALL_INTERFACE:include/QtCore>
+)
+qt_feature_module_begin(NO_MODULE
+    PUBLIC_FILE src/corelib/global/qconfig.h
+    PRIVATE_FILE src/corelib/global/qconfig_p.h
+)
+include("${CMAKE_CURRENT_SOURCE_DIR}/configure.cmake")
+
+# Do what mkspecs/features/uikit/default_pre.prf does, aka enable sse2 for
+# simulator_and_device_builds.
+if(APPLE_UIKIT AND NOT QT_UIKIT_SDK)
+    set(__QtFeature_custom_enabled_cache_variables
+        TEST_subarch_sse2
+        FEATURE_sse2
+        QT_FEATURE_sse2)
+endif()
+
+qt_feature_module_end(GlobalConfig OUT_VAR_PREFIX "__GlobalConfig_")
+
+qt_generate_global_config_pri_file()
+
+add_library(Qt::GlobalConfig ALIAS GlobalConfig)
+
+add_library(GlobalConfigPrivate INTERFACE)
+target_link_libraries(GlobalConfigPrivate INTERFACE GlobalConfig)
+target_include_directories(GlobalConfigPrivate INTERFACE
+    $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/include/QtCore/${PROJECT_VERSION}>
+    $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/include/QtCore/${PROJECT_VERSION}/QtCore>
+    $<INSTALL_INTERFACE:include/QtCore/${PROJECT_VERSION}>
+    $<INSTALL_INTERFACE:include/QtCore/${PROJECT_VERSION}/QtCore>
+)
+add_library(Qt::GlobalConfigPrivate ALIAS GlobalConfigPrivate)
+
+# defines PlatformCommonInternal PlatformModuleInternal PlatformPluginInternal PlatformToolInternal
+include(QtInternalTargets)
+
+set(__export_targets Platform
+                     GlobalConfig
+                     GlobalConfigPrivate
+                     PlatformCommonInternal
+                     PlatformModuleInternal
+                     PlatformPluginInternal
+                     PlatformToolInternal)
+set(__export_name "${INSTALL_CMAKE_NAMESPACE}Targets")
+qt_install(TARGETS ${__export_targets} EXPORT "${__export_name}")
+qt_install(EXPORT ${__export_name}
+           NAMESPACE ${QT_CMAKE_EXPORT_NAMESPACE}::
+           DESTINATION "${__GlobalConfig_install_dir}")
+
+qt_internal_export_modern_cmake_config_targets_file(TARGETS ${__export_targets}
+                                                    EXPORT_NAME_PREFIX ${INSTALL_CMAKE_NAMESPACE}
+                                                    CONFIG_INSTALL_DIR
+                                                    ${__GlobalConfig_install_dir})
+
+## Install some QtBase specific CMake files:
+qt_copy_or_install(FILES
+                   cmake/ModuleDescription.json.in
+                   cmake/QtBuild.cmake
+                   cmake/QtBuildInformation.cmake
+                   cmake/QtCompilerFlags.cmake
+                   cmake/QtCompilerOptimization.cmake
+                   cmake/QtFeature.cmake
+                   cmake/QtFindWrapHelper.cmake
+                   cmake/QtPlatformSupport.cmake
+                   cmake/QtPlatformAndroid.cmake
+                   cmake/QtPostProcess.cmake
+                   cmake/QtSetup.cmake
+                   cmake/QtModuleConfig.cmake.in
+                   cmake/QtModuleDependencies.cmake.in
+                   cmake/QtModuleToolsDependencies.cmake.in
+                   cmake/QtModuleToolsConfig.cmake.in
+                   cmake/QtModuleToolsVersionlessTargets.cmake.in
+                   cmake/QtStandaloneTestsConfig.cmake.in
+                   cmake/QtPlugins.cmake.in
+                   cmake/QtPluginConfig.cmake.in
+                   cmake/QtPluginDependencies.cmake.in
+    DESTINATION "${__GlobalConfig_install_dir}"
+)
+
+file(COPY cmake/QtFeature.cmake DESTINATION "${__GlobalConfig_build_dir}")
+
+# TODO: Check whether this is the right place to install these
+qt_copy_or_install(DIRECTORY cmake/3rdparty DESTINATION "${__GlobalConfig_install_dir}")
+
+# Install our custom Find modules, which will be used by the find_dependency() calls
+# inside the generated ModuleDependencies cmake files.
+qt_copy_or_install(DIRECTORY cmake/
+    DESTINATION "${__GlobalConfig_install_dir}"
+    FILES_MATCHING PATTERN "Find*.cmake"
+    PATTERN "tests" EXCLUDE
+    PATTERN "3rdparty" EXCLUDE
+)
+
+# Configure and install the QtBuildInternals package.
+set(__build_internals_path_suffix "${INSTALL_CMAKE_NAMESPACE}BuildInternals")
+qt_path_join(__build_internals_build_dir ${QT_CONFIG_BUILD_DIR} ${__build_internals_path_suffix})
+qt_path_join(__build_internals_install_dir ${QT_CONFIG_INSTALL_DIR}
+                                           ${__build_internals_path_suffix})
+configure_file(
+    "${CMAKE_CURRENT_SOURCE_DIR}/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake"
+    "${__build_internals_build_dir}/${INSTALL_CMAKE_NAMESPACE}BuildInternalsConfig.cmake"
+    @ONLY
+    )
+
+qt_install(FILES
+    "${__build_internals_build_dir}/${INSTALL_CMAKE_NAMESPACE}BuildInternalsConfig.cmake"
+    "${__build_internals_build_dir}/QtBuildInternalsExtra.cmake"
+    "${CMAKE_CURRENT_SOURCE_DIR}/cmake/QtBuildInternals/QtBuildInternalsAndroid.cmake"
+    DESTINATION "${__build_internals_install_dir}"
+    COMPONENT Devel
+)
+
+# Generate the new resource API
+set(QT_CORE_RESOURCE_GENERATED_FILE_NAME "${INSTALL_CMAKE_NAMESPACE}CoreResource.cmake" CACHE INTERNAL "")
+set(QT_CORE_RESOURCE_GENERATED_FILE_PATH "${CMAKE_CURRENT_BINARY_DIR}/${QT_CORE_RESOURCE_GENERATED_FILE_NAME}" CACHE INTERNAL "")
+configure_file(
+    "${CMAKE_CURRENT_SOURCE_DIR}/cmake/QtResource.cmake.in"
+    "${QT_CORE_RESOURCE_GENERATED_FILE_PATH}"
+    @ONLY
+)
+include(${QT_CORE_RESOURCE_GENERATED_FILE_PATH})
diff --git a/cmake/QtBuild.cmake b/cmake/QtBuild.cmake
new file mode 100644
index 0000000000..90306a44c8
--- /dev/null
+++ b/cmake/QtBuild.cmake
@@ -0,0 +1,4165 @@
+include(CMakePackageConfigHelpers)
+
+# Install locations:
+set(INSTALL_BINDIR "bin" CACHE STRING "Executables [PREFIX/bin]")
+set(INSTALL_INCLUDEDIR "include" CACHE STRING "Header files [PREFIX/include]")
+set(INSTALL_LIBDIR "lib" CACHE STRING "Libraries [PREFIX/lib]")
+set(INSTALL_MKSPECSDIR "mkspecs" CACHE STRING "Mkspecs files [PREFIX/mkspecs]")
+set(INSTALL_ARCHDATADIR "." CACHE STRING "Arch-dependent data [PREFIX]")
+set(INSTALL_PLUGINSDIR "${INSTALL_ARCHDATADIR}/plugins" CACHE STRING
+    "Plugins [ARCHDATADIR/plugins]")
+
+set(INSTALL_TARGETS_DEFAULT_ARGS
+    RUNTIME DESTINATION "${INSTALL_BINDIR}"
+    LIBRARY DESTINATION "${INSTALL_LIBDIR}"
+    ARCHIVE DESTINATION "${INSTALL_LIBDIR}" COMPONENT Devel
+    INCLUDES DESTINATION "${INSTALL_INCLUDEDIR}"
+)
+
+if (WIN32)
+    set(_default_libexec "${INSTALL_ARCHDATADIR}/bin")
+else()
+    set(_default_libexec "${INSTALL_ARCHDATADIR}/libexec")
+endif()
+
+set(INSTALL_LIBEXECDIR "${_default_libexec}" CACHE STRING
+    "Helper programs [ARCHDATADIR/bin on Windows, ARCHDATADIR/libexec otherwise]")
+set(INSTALL_QMLDIR "${INSTALL_ARCHDATADIR}/qml" CACHE STRING
+    "QML2 imports [ARCHDATADIR/qml]")
+set(INSTALL_DATADIR "." CACHE STRING  "Arch-independent data [PREFIX]")
+set(INSTALL_DOCDIR "${INSTALL_DATADIR}/doc" CACHE STRING "Documentation [DATADIR/doc]")
+set(INSTALL_TRANSLATIONSDIR "${INSTALL_DATADIR}/translations" CACHE STRING
+    "Translations [DATADIR/translations]")
+set(INSTALL_SYSCONFDIR "etc/xdg" CACHE STRING
+    "Settings used by Qt programs [PREFIX/etc/xdg]")
+set(INSTALL_EXAMPLESDIR "examples" CACHE STRING "Examples [PREFIX/examples]")
+set(INSTALL_TESTSDIR "tests" CACHE STRING "Tests [PREFIX/tests]")
+set(INSTALL_DESCRIPTIONSDIR "${INSTALL_DATADIR}/modules" CACHE STRING
+    "Module description files directory")
+
+# The variables might have already been set in QtBuildInternalsExtra.cmake if the file is included
+# while building a new module and not QtBase. In that case, stop overriding the value.
+if(NOT INSTALL_CMAKE_NAMESPACE)
+    set(INSTALL_CMAKE_NAMESPACE "Qt${PROJECT_VERSION_MAJOR}"
+        CACHE STRING "CMake namespace [Qt${PROJECT_VERSION_MAJOR}]")
+endif()
+if(NOT QT_CMAKE_EXPORT_NAMESPACE)
+    set(QT_CMAKE_EXPORT_NAMESPACE "Qt${PROJECT_VERSION_MAJOR}"
+        CACHE STRING "CMake namespace used when exporting targets [Qt${PROJECT_VERSION_MAJOR}]")
+endif()
+
+set(QT_CMAKE_DIR "${CMAKE_CURRENT_LIST_DIR}")
+
+# Find the path to mkspecs/, depending on whether we are building as part of a standard qtbuild,
+# or a module against an already installed version of qt.
+if(NOT QT_MKSPECS_DIR)
+    if("${QT_BUILD_INTERNALS_PATH}" STREQUAL "")
+      get_filename_component(QT_MKSPECS_DIR "${CMAKE_CURRENT_LIST_DIR}/../mkspecs" ABSOLUTE)
+    else()
+      # We can rely on CMAKE_INSTALL_PREFIX being set by QtBuildInternalsExtra.cmake
+      get_filename_component(QT_MKSPECS_DIR "${CMAKE_INSTALL_PREFIX}/${INSTALL_MKSPECSDIR}" ABSOLUTE)
+    endif()
+    set(QT_MKSPECS_DIR "${QT_MKSPECS_DIR}" CACHE INTERNAL "")
+endif()
+
+# the default RPATH to be used when installing, but only if it's not a system directory
+LIST(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${CMAKE_INSTALL_PREFIX}/${INSTALL_LIBDIR}" isSystemDir)
+IF("${isSystemDir}" STREQUAL "-1")
+   SET(_default_install_rpath "${CMAKE_INSTALL_PREFIX}/${INSTALL_LIBDIR}")
+ENDIF("${isSystemDir}" STREQUAL "-1")
+
+# Default rpath settings: Use rpath for build tree as well as a full path for the installed binaries.
+# For origin builds, one needs to override CMAKE_INSTALL_RPATH for example with $ORIGIN/../lib
+SET(CMAKE_INSTALL_RPATH "${_default_install_rpath}" CACHE PATH "RPATH for installed binaries")
+
+# add the automatically determined parts of the RPATH
+# which point to directories outside the build tree to the install RPATH
+SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
+
+# Generate a module description file based on the template in ModuleDescription.json.in
+function(qt_describe_module target)
+    set(path_suffix "${INSTALL_DESCRIPTIONSDIR}")
+    qt_path_join(build_dir ${QT_BUILD_DIR} ${path_suffix})
+    qt_path_join(install_dir ${QT_INSTALL_DIR} ${path_suffix})
+
+    set(descfile_in "${QT_CMAKE_DIR}/ModuleDescription.json.in")
+    set(descfile_out "${build_dir}/${target}.json")
+    set(cross_compilation "false")
+    if(CMAKE_CROSSCOMPILE)
+        set(cross_compilation "true")
+    endif()
+    configure_file("${descfile_in}" "${descfile_out}")
+
+    qt_install(FILES "${descfile_out}" DESTINATION "${install_dir}")
+endfunction()
+
+function(qt_setup_tool_path_command)
+    if(NOT WIN32)
+        return()
+    endif()
+    set(bindir "${CMAKE_INSTALL_PREFIX}/${INSTALL_BINDIR}")
+    file(TO_NATIVE_PATH "${bindir}" bindir)
+    list(APPEND command COMMAND)
+    list(APPEND command set PATH=${bindir}$<SEMICOLON>%PATH%)
+    set(QT_TOOL_PATH_SETUP_COMMAND "${command}" CACHE INTERNAL "internal command prefix for tool invocations" FORCE)
+endfunction()
+qt_setup_tool_path_command()
+
+# Platform define path, etc.
+set(QT_QMAKE_TARGET_MKSPEC "")
+if(WIN32)
+    set(QT_DEFAULT_PLATFORM_DEFINITIONS UNICODE _UNICODE WIN32 _ENABLE_EXTENDED_ALIGNED_STORAGE)
+    if(CMAKE_SIZEOF_VOID_P EQUAL 8)
+        list(APPEND QT_DEFAULT_PLATFORM_DEFINITIONS WIN64 _WIN64)
+    endif()
+    if(MSVC)
+        set(QT_QMAKE_TARGET_MKSPEC win32-msvc)
+    elseif(CLANG AND MINGW)
+        set(QT_QMAKE_TARGET_MKSPEC win32-clang-g++)
+    elseif(MINGW)
+        set(QT_QMAKE_TARGET_MKSPEC win32-g++)
+    endif()
+
+    if (MINGW)
+        list(APPEND QT_DEFAULT_PLATFORM_DEFINITIONS _WIN32_WINNT=0x0601)
+    endif()
+elseif(LINUX)
+    if(GCC)
+        set(QT_QMAKE_TARGET_MKSPEC linux-g++)
+    elseif(CLANG)
+        set(QT_QMAKE_TARGET_MKSPEC linux-clang)
+    elseif(ICC)
+        set(QT_QMAKE_TARGET_MKSPEC linux-icc-64)
+    endif()
+elseif(ANDROID)
+    if(GCC)
+        set(QT_QMAKE_TARGET_MKSPEC android-g++)
+    elseif(CLANG)
+        set(QT_QMAKE_TARGET_MKSPEC android-clang)
+    endif()
+elseif(APPLE)
+    set(QT_QMAKE_TARGET_MKSPEC macx-clang)
+elseif(EMSCRIPTEN)
+    set(QT_QMAKE_TARGET_MKSPEC wasm-emscripten)
+endif()
+
+# TODO: Fixme to be correct.
+set(QT_QMAKE_HOST_MKSPEC "${QT_QMAKE_TARGET_MKSPEC}")
+
+# Platform definition dir provided by user on command line.
+# Derive the absolute one relative to the current source dir.
+if(QT_PLATFORM_DEFINITION_DIR)
+    set(QT_DEFAULT_PLATFORM_DEFINITION_DIR "${QT_PLATFORM_DEFINITION_DIR}")
+    get_filename_component(
+        QT_DEFAULT_PLATFORM_DEFINITION_DIR_ABSOLUTE
+        "${QT_PLATFORM_DEFINITION_DIR}"
+        ABSOLUTE)
+elseif(QT_QMAKE_TARGET_MKSPEC)
+    # Used by consumers of prefix builds via INSTALL_INTERFACE (relative path).
+    set(QT_DEFAULT_PLATFORM_DEFINITION_DIR "${INSTALL_MKSPECSDIR}/${QT_QMAKE_TARGET_MKSPEC}")
+    # Used by qtbase itself and consumers of non-prefix builds via BUILD_INTERFACE (absolute path).
+    set(QT_DEFAULT_PLATFORM_DEFINITION_DIR_ABSOLUTE "${QT_MKSPECS_DIR}/${QT_QMAKE_TARGET_MKSPEC}")
+endif()
+
+if(NOT DEFINED QT_DEFAULT_PLATFORM_DEFINITIONS)
+    set(QT_DEFAULT_PLATFORM_DEFINITIONS "")
+endif()
+
+set(QT_PLATFORM_DEFINITIONS ${QT_DEFAULT_PLATFORM_DEFINITIONS}
+    CACHE STRING "Qt platform specific pre-processor defines")
+set(QT_PLATFORM_DEFINITION_DIR "${QT_DEFAULT_PLATFORM_DEFINITION_DIR}"
+    CACHE PATH "Path to directory that contains qplatformdefs.h")
+set(QT_PLATFORM_DEFINITION_DIR_ABSOLUTE "${QT_DEFAULT_PLATFORM_DEFINITION_DIR_ABSOLUTE}"
+    CACHE INTERNAL "Path to directory that contains qplatformdefs.h")
+set(QT_NAMESPACE "" CACHE STRING "Qt Namespace")
+if(QT_NAMESPACE STREQUAL "")
+    set(QT_HAS_NAMESPACE OFF)
+else()
+    set(QT_HAS_NAMESPACE ON)
+endif()
+
+
+function(qt_internal_clear_qt_repo_known_modules)
+    set(QT_REPO_KNOWN_MODULES "" CACHE INTERNAL "Known current repo Qt modules" FORCE)
+endfunction()
+
+function(qt_internal_add_qt_repo_known_module)
+    set(QT_REPO_KNOWN_MODULES ${QT_REPO_KNOWN_MODULES} ${ARGN}
+        CACHE INTERNAL "Known current repo Qt modules" FORCE)
+endfunction()
+
+function(qt_internal_get_qt_repo_known_modules out_var)
+    set("${out_var}" "${QT_REPO_KNOWN_MODULES}" PARENT_SCOPE)
+endfunction()
+
+# Gets the list of all known Qt modules both found and that were built as part of the
+# current project.
+function(qt_internal_get_qt_all_known_modules out_var)
+    qt_internal_get_qt_repo_known_modules(repo_known_modules)
+    set(known_modules ${QT_ALL_MODULES_FOUND_VIA_FIND_PACKAGE} ${repo_known_modules})
+    list(REMOVE_DUPLICATES known_modules)
+    set("${out_var}" "${known_modules}" PARENT_SCOPE)
+endfunction()
+
+macro(qt_internal_set_qt_known_plugins)
+    set(QT_KNOWN_PLUGINS ${ARGN} CACHE INTERNAL "Known Qt plugins" FORCE)
+endmacro()
+
+### Global plug-in types handling ###
+# QT_REPO_KNOWN_PLUGIN_TYPES and QT_ALL_PLUGIN_TYPES_FOUND_VIA_FIND_PACKAGE
+# hold a list of plug-in types (e.G. "imageformats;bearer")
+function(qt_internal_clear_qt_repo_known_plugin_types)
+    set(QT_REPO_KNOWN_PLUGIN_TYPES "" CACHE INTERNAL "Known current repo Qt plug-in types" FORCE)
+endfunction()
+
+function(qt_internal_add_qt_repo_known_plugin_types)
+    set(QT_REPO_KNOWN_PLUGIN_TYPES ${QT_REPO_KNOWN_PLUGIN_TYPES} ${ARGN}
+        CACHE INTERNAL "Known current repo Qt plug-in types" FORCE)
+endfunction()
+
+function(qt_internal_get_qt_repo_known_plugin_types out_var)
+    set("${out_var}" "${QT_REPO_KNOWN_PLUGIN_TYPES}" PARENT_SCOPE)
+endfunction()
+
+function(qt_internal_get_qt_all_known_plugin_types out_var)
+    qt_internal_get_qt_repo_known_plugin_types(repo_known_plugin_types)
+    set(known ${QT_ALL_PLUGIN_TYPES_FOUND_VIA_FIND_PACKAGE} ${repo_known_plugin_types})
+    list(REMOVE_DUPLICATES known)
+    set("${out_var}" "${known}" PARENT_SCOPE)
+endfunction()
+
+# Reset:
+qt_internal_clear_qt_repo_known_modules()
+qt_internal_clear_qt_repo_known_plugin_types()
+qt_internal_set_qt_known_plugins("")
+
+set(QT_KNOWN_MODULES_WITH_TOOLS "" CACHE INTERNAL "Known Qt modules with tools" FORCE)
+macro(qt_internal_append_known_modules_with_tools module)
+    if(NOT ${module} IN_LIST QT_KNOWN_MODULES_WITH_TOOLS)
+        set(QT_KNOWN_MODULES_WITH_TOOLS "${QT_KNOWN_MODULES_WITH_TOOLS};${module}"
+            CACHE INTERNAL "Known Qt modules with tools" FORCE)
+        set(QT_KNOWN_MODULE_${module}_TOOLS ""
+            CACHE INTERNAL "Known Qt module ${module} tools" FORCE)
+    endif()
+endmacro()
+
+macro(qt_internal_append_known_module_tool module tool)
+    if(NOT ${tool} IN_LIST QT_KNOWN_MODULE_${module}_TOOLS)
+        list(APPEND QT_KNOWN_MODULE_${module}_TOOLS "${tool}")
+        set(QT_KNOWN_MODULE_${module}_TOOLS "${QT_KNOWN_MODULE_${module}_TOOLS}"
+            CACHE INTERNAL "Known Qt module ${module} tools" FORCE)
+    endif()
+endmacro()
+
+# Reset syncqt cache variable, to make sure it gets recomputed on reconfiguration, otherwise
+# it might not get installed.
+unset(QT_SYNCQT CACHE)
+
+# For adjusting variables when running tests, we need to know what
+# the correct variable is for separating entries in PATH-alike
+# variables.
+if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows")
+    set(QT_PATH_SEPARATOR "\\;")
+else()
+    set(QT_PATH_SEPARATOR ":")
+endif()
+
+# Compute the values of QT_BUILD_DIR, QT_INSTALL_DIR, QT_CONFIG_BUILD_DIR, QT_CONFIG_INSTALL_DIR
+# taking into account whether the current build is a prefix build or a non-prefix build,
+# and whether it is a superbuild or non-superbuild.
+#
+# These values should be prepended to file paths in commands or properties,
+# in order to correctly place generated Config files, generated Targets files,
+# excutables / libraries, when copying / installing files, etc.
+#
+# The build dir variables will always be absolute paths.
+# The QT_INSTALL_DIR variable will have a relative path in a prefix build,
+# which means that it can be empty, so use qt_join_path to prevent accidental absolute paths.
+if(QT_SUPERBUILD)
+    # In this case, we always copy all the build products in qtbase/{bin,lib,...}
+    if(QT_WILL_INSTALL)
+        set(QT_BUILD_DIR "${QtBase_BINARY_DIR}")
+        set(QT_INSTALL_DIR "")
+    else()
+        set(QT_BUILD_DIR "${QtBase_BINARY_DIR}")
+        set(QT_INSTALL_DIR "${QtBase_BINARY_DIR}")
+    endif()
+else()
+    if(QT_WILL_INSTALL)
+        # In the usual prefix build case, the build dir is the current module build dir,
+        # and the install dir is the prefix, so we don't set it.
+        set(QT_BUILD_DIR "${CMAKE_BINARY_DIR}")
+        set(QT_INSTALL_DIR "")
+    else()
+        # When doing a non-prefix build, both the build dir and install dir are the same,
+        # pointing to the qtbase build dir.
+        set(QT_BUILD_DIR "${CMAKE_INSTALL_PREFIX}")
+        set(QT_INSTALL_DIR "${QT_BUILD_DIR}")
+    endif()
+endif()
+
+set(__config_path_part "${INSTALL_LIBDIR}/cmake")
+set(QT_CONFIG_BUILD_DIR "${QT_BUILD_DIR}/${__config_path_part}")
+set(QT_CONFIG_INSTALL_DIR "${QT_INSTALL_DIR}")
+if(QT_CONFIG_INSTALL_DIR)
+    string(APPEND QT_CONFIG_INSTALL_DIR "/")
+endif()
+string(APPEND QT_CONFIG_INSTALL_DIR ${__config_path_part})
+unset(__config_path_part)
+
+# This is used to hold extra cmake code that should be put into QtBuildInternalsExtra.cmake file
+# at the QtPostProcess stage.
+set(QT_BUILD_INTERNALS_EXTRA_CMAKE_CODE "")
+
+# Save the value of the current first project source dir.
+# This will be /path/to/qtbase for qtbase both in a super-build and a non super-build.
+# This will be /path/to/qtbase/tests when building standalone tests.
+set(QT_TOP_LEVEL_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}")
+
+# Prevent warnings about object files without any symbols. This is a common
+# thing in Qt as we tend to build files unconditionally, and then use ifdefs
+# to compile out parts that are not relevant.
+if(CMAKE_HOST_APPLE AND APPLE)
+    foreach(lang ASM C CXX)
+        # We have to tell 'ar' to not run ranlib by itself, by passing the 'S' option
+        set(CMAKE_${lang}_ARCHIVE_CREATE "<CMAKE_AR> qcS <TARGET> <LINK_FLAGS> <OBJECTS>")
+        set(CMAKE_${lang}_ARCHIVE_APPEND "<CMAKE_AR> qS <TARGET> <LINK_FLAGS> <OBJECTS>")
+        set(CMAKE_${lang}_ARCHIVE_FINISH "<CMAKE_RANLIB> -no_warning_for_no_symbols <TARGET>")
+    endforeach()
+endif()
+
+# Functions and macros:
+
+# qt_remove_args can remove arguments from an existing list of function
+# arguments in order to pass a filtered list of arguments to a different function.
+# Parameters:
+#   out_var: result of remove all arguments specified by ARGS_TO_REMOVE from ALL_ARGS
+#   ARGS_TO_REMOVE: Arguments to remove.
+#   ALL_ARGS: All arguments supplied to cmake_parse_arguments or
+#   qt_parse_all_arguments
+#   from which ARGS_TO_REMOVE should be removed from. We require all the
+#   arguments or we can't properly identify the range of the arguments detailed
+#   in ARGS_TO_REMOVE.
+#   ARGS: Arguments passed into the function, usually ${ARGV}
+#
+#   E.g.:
+#   We want to forward all arguments from foo to bar, execpt ZZZ since it will
+#   trigger an error in bar.
+#
+#   foo(target BAR .... ZZZ .... WWW ...)
+#   bar(target BAR.... WWW...)
+#
+#   function(foo target)
+#       qt_parse_all_arguments(arg "" "" "BAR;ZZZ;WWW ${ARGV})
+#       qt_remove_args(forward_args
+#           ARGS_TO_REMOVE ${target} ZZZ
+#           ALL_ARGS ${target} BAR ZZZ WWW
+#           ARGS ${ARGV}
+#       )
+#       bar(${target} ${forward_args})
+#   endfunction()
+#
+function(qt_remove_args out_var)
+    cmake_parse_arguments(arg "" "" "ARGS_TO_REMOVE;ALL_ARGS;ARGS" ${ARGN})
+    set(result ${arg_ARGS})
+    foreach(arg IN LISTS arg_ARGS_TO_REMOVE)
+        # find arg
+        list(FIND result ${arg} find_result)
+        if (NOT find_result EQUAL -1)
+            # remove arg
+            list(REMOVE_AT result ${find_result})
+            list(LENGTH result result_len)
+            list(GET result ${find_result} arg_current)
+            # remove values until we hit another arg
+            while(NOT ${arg_current} IN_LIST arg_ALL_ARGS AND find_result LESS result_len)
+                list(REMOVE_AT result ${find_result})
+                list(GET result ${find_result} arg_current)
+                list(LENGTH result result_len)
+            endwhile()
+        endif()
+    endforeach()
+    set(${out_var} "${result}" PARENT_SCOPE)
+endfunction()
+# Wraps install() command. In a prefix build, simply passes along arguments to install().
+# In a non-prefix build, handles association of targets to export names, and also calls export().
+function(qt_install)
+    set(flags)
+    set(options EXPORT DESTINATION NAMESPACE)
+    set(multiopts TARGETS)
+    cmake_parse_arguments(arg "${flags}" "${options}" "${multiopts}" ${ARGN})
+
+    if(arg_TARGETS)
+        set(is_install_targets TRUE)
+    endif()
+
+    # In a prefix build, always invoke install() without modification.
+    # In a non-prefix build, pass install(TARGETS) commands to allow
+    # association of targets to export names, so we can later use the export names
+    # in export() commands.
+    if(QT_WILL_INSTALL OR is_install_targets)
+        install(${ARGV})
+    endif()
+
+    # Exit early if this is a prefix build.
+    if(QT_WILL_INSTALL)
+        return()
+    endif()
+
+    # In a non-prefix build, when install(EXPORT) is called,
+    # also call export(EXPORT) to generate build tree target files.
+    if(NOT is_install_targets AND arg_EXPORT)
+        set(namespace_option "")
+        if(arg_NAMESPACE)
+            set(namespace_option NAMESPACE ${arg_NAMESPACE})
+        endif()
+        export(EXPORT ${arg_EXPORT}
+               ${namespace_option}
+               FILE "${arg_DESTINATION}/${arg_EXPORT}.cmake")
+    endif()
+endfunction()
+
+# Copies files using file(COPY) signature in non-prefix builds.
+function(qt_non_prefix_copy)
+    if(NOT QT_WILL_INSTALL)
+        file(${ARGV})
+    endif()
+endfunction()
+
+# Use case is installing files in a prefix build, or copying them to the correct build dir
+# in a non-prefix build.
+# Pass along arguments as you would pass them to install().
+# Only supports FILES, PROGRAMS and DIRECTORY signature, and without fancy things
+# like OPTIONAL or RENAME or COMPONENT.
+function(qt_copy_or_install)
+    set(flags FILES PROGRAMS DIRECTORY)
+    set(options)
+    set(multiopts)
+    cmake_parse_arguments(arg "${flags}" "${options}" "${multiopts}" ${ARGN})
+
+    # Remember which option has to be passed to the install command.
+    set(argv_copy ${ARGV})
+    if(arg_FILES)
+        set(install_option "FILES")
+    elseif(arg_PROGRAMS)
+        set(install_option "PROGRAMS")
+    elseif(arg_DIRECTORY)
+        set(install_option "DIRECTORY")
+    endif()
+
+    list(REMOVE_AT argv_copy 0)
+    qt_install(${install_option} ${argv_copy})
+    qt_non_prefix_copy(COPY ${argv_copy})
+endfunction()
+
+# Hacky way to remove the install target in non-prefix builds.
+# We need to associate targets with export names, and that is only possible to do with the
+# install(TARGETS) command. But in a non-prefix build, we don't want to install anything.
+# To make sure that developers don't accidentally run make install, replace the generated
+# cmake_install.cmake file with an empty file. To do this, always create a new temporary file
+# at CMake configuration step, and use it as an input to a custom command that replaces the
+# cmake_install.cmake file with an empty one. This means we will always replace the file on
+# every reconfiguration, but not when doing null builds.
+function(qt_remove_install_target)
+    # On superbuilds we only do this for qtbase - it will correctly remove the
+    # cmake_install.cmake at the root of the repository.
+    if(QT_SUPERBUILD)
+      if(NOT (PROJECT_NAME STREQUAL "QtBase"))
+        return()
+      endif()
+    endif()
+
+    set(file_in "${CMAKE_BINARY_DIR}/.remove_cmake_install_in.txt")
+    set(file_generated "${CMAKE_BINARY_DIR}/.remove_cmake_install_generated.txt")
+    set(cmake_install_file "${CMAKE_BINARY_DIR}/cmake_install.cmake")
+    file(WRITE ${file_in} "")
+
+    add_custom_command(OUTPUT ${file_generated}
+        COMMAND ${CMAKE_COMMAND} -E copy ${file_in} ${file_generated}
+        COMMAND ${CMAKE_COMMAND} -E remove ${cmake_install_file}
+        COMMAND ${CMAKE_COMMAND} -E touch ${cmake_install_file}
+        COMMENT "Removing cmake_install.cmake"
+        MAIN_DEPENDENCY ${file_in})
+
+    add_custom_target(remove_cmake_install ALL DEPENDS ${file_generated})
+endfunction()
+
+function(qt_set_up_nonprefix_build)
+    if(NOT QT_WILL_INSTALL)
+        qt_remove_install_target()
+    endif()
+endfunction()
+
+function(qt_is_imported_target target out_var)
+    if(NOT TARGET "${target}")
+        set(target "${QT_CMAKE_EXPORT_NAMESPACE}::${target}")
+    endif()
+    if(NOT TARGET "${target}")
+        message(FATAL_ERROR "Invalid target given to qt_is_imported_target: ${target}")
+    endif()
+    get_target_property(is_imported "${target}" IMPORTED)
+    set(${out_var} "${is_imported}" PARENT_SCOPE)
+endfunction()
+
+# Generates module .pri files for consumption by qmake
+function(qt_generate_module_pri_file target target_path pri_files_var)
+    set(flags INTERNAL_MODULE HEADER_MODULE)
+    set(options)
+    set(multiopts QMAKE_MODULE_CONFIG)
+    cmake_parse_arguments(arg "${flags}" "${options}" "${multiopts}" ${ARGN})
+
+    qt_internal_module_info(module "${target}")
+    set(pri_files)
+
+    set(property_prefix)
+    if(arg_HEADER_MODULE)
+        set(property_prefix "interface_")
+    endif()
+
+    get_target_property(enabled_features "${target}"
+                        "${property_prefix}QT_ENABLED_PUBLIC_FEATURES")
+    get_target_property(disabled_features "${target}"
+                        "${property_prefix}QT_DISABLED_PUBLIC_FEATURES")
+    get_target_property(enabled_private_features "${target}"
+                        "${property_prefix}QT_ENABLED_PRIVATE_FEATURES")
+    get_target_property(disabled_private_features "${target}"
+                        "${property_prefix}QT_DISABLED_PRIVATE_FEATURES")
+
+    foreach(var enabled_features disabled_features enabled_private_features disabled_private_features)
+        if(${var} STREQUAL "${var}-NOTFOUND")
+            set(${var} "")
+        else()
+            string (REPLACE ";" " " ${var} "${${var}}")
+        endif()
+    endforeach()
+
+    if(arg_QMAKE_MODULE_CONFIG)
+        string(REPLACE ";" " " module_config "${arg_QMAKE_MODULE_CONFIG}")
+        set(module_config "\nQT.${module_lower}.CONFIG = ${module_config}")
+    else()
+        set(module_config "")
+    endif()
+
+    if (NOT ${arg_INTERNAL_MODULE})
+        qt_path_join(pri_file_name "${target_path}" "qt_lib_${module_lower}.pri")
+        list(APPEND pri_files "${pri_file_name}")
+
+        file(GENERATE
+            OUTPUT "${pri_file_name}"
+            CONTENT
+        "QT.${module_lower}.VERSION = ${PROJECT_VERSION}
+QT.${module_lower}.name = ${module}
+QT.${module_lower}.module = ${module_versioned}
+QT.${module_lower}.libs = $$QT_MODULE_LIB_BASE
+QT.${module_lower}.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/${module}
+QT.${module_lower}.frameworks =
+QT.${module_lower}.bins = $$QT_MODULE_BIN_BASE
+QT.${module_lower}.depends =
+QT.${module_lower}.uses =
+QT.${module_lower}.module_config = v2
+QT.${module_lower}.DEFINES = QT_${module_define}_LIB
+QT.${module_lower}.enabled_features = ${enabled_features}
+QT.${module_lower}.disabled_features = ${disabled_features}${module_config}
+QT_MODULES += ${module_lower}
+"
+        )
+    endif()
+
+    qt_path_join(private_pri_file "${target_path}" "qt_lib_${module_lower}_private.pri")
+    list(APPEND pri_files "${private_pri_file}")
+
+    file(GENERATE
+        OUTPUT "${private_pri_file}"
+        CONTENT
+        "QT.${module_lower}_private.VERSION = ${PROJECT_VERSION}
+QT.${module_lower}_private.name = ${module}
+QT.${module_lower}_private.module =
+QT.${module_lower}_private.libs = $$QT_MODULE_LIB_BASE
+QT.${module_lower}_private.includes = $$QT_MODULE_INCLUDE_BASE/${module}/${PROJECT_VERSION} $$QT_MODULE_INCLUDE_BASE/${module}/${PROJECT_VERSION}/${module}
+QT.${module_lower}_private.frameworks =
+QT.${module_lower}_private.depends = ${module_lower}
+QT.${module_lower}_private.uses =
+QT.${module_lower}_private.module_config = v2
+QT.${module_lower}_private.enabled_features = ${enabled_private_features}
+QT.${module_lower}_private.disabled_features = ${disabled_private_features}
+"
+    )
+
+    set("${pri_files_var}" "${pri_files}" PARENT_SCOPE)
+endfunction()
+
+function(qt_generate_global_config_pri_file)
+    qt_path_join(qconfig_pri_target_path ${PROJECT_BINARY_DIR} ${INSTALL_MKSPECSDIR})
+    qt_path_join(qconfig_pri_target_path "${qconfig_pri_target_path}" "qconfig.pri")
+
+    get_target_property(enabled_features GlobalConfig INTERFACE_QT_ENABLED_PUBLIC_FEATURES)
+    get_target_property(disabled_features GlobalConfig INTERFACE_QT_DISABLED_PUBLIC_FEATURES)
+
+    # configure2cmake skips the "static" feature, so emulate it here for qmake support:
+    if(QT_BUILD_SHARED_LIBS OR BUILD_SHARED_LIBS)
+        list(APPEND enabled_features shared)
+        list(APPEND disabled_features static)
+        set(qt_build_config_type "shared")
+    else()
+        list(APPEND enabled_features static)
+        list(APPEND disabled_features shared)
+        set(qt_build_config_type "static")
+    endif()
+
+    # configure2cmake skips the "rpath" feature, so emulate it here for qmake support:
+    if(CMAKE_SKIP_RPATH)
+        list(APPEND disabled_features rpath)
+    elseif(LINUX OR APPLE)
+        list(APPEND enabled_features rpath)
+    endif()
+
+    string (REPLACE ";" " " enabled_features "${enabled_features}")
+    string (REPLACE ";" " " disabled_features "${disabled_features}")
+
+    # Add some required CONFIG entries.
+    set(config_entries "")
+    if(CMAKE_BUILD_TYPE STREQUAL Debug)
+        list(APPEND config_entries "debug")
+    elseif(CMAKE_BUILD_TYPE STREQUAL Release)
+        list(APPEND config_entries "release")
+    endif()
+    list(APPEND config_entries "${qt_build_config_type}")
+    string (REPLACE ";" " " config_entries "${config_entries}")
+
+    file(GENERATE
+        OUTPUT "${qconfig_pri_target_path}"
+        CONTENT
+        "QT_ARCH = ${TEST_architecture_arch}
+QT_BUILDABI = ${TEST_buildAbi}
+QT.global.enabled_features = ${enabled_features}
+QT.global.disabled_features = ${disabled_features}
+QT_VERSION = ${PROJECT_VERSION}
+QT_MAJOR_VERSION = ${PROJECT_VERSION_MAJOR}
+QT_MINOR_VERSION = ${PROJECT_VERSION_MINOR}
+QT_PATCH_VERSION = ${PROJECT_VERSION_PATCH}
+CONFIG -= link_prl # we do not create prl files right now
+CONFIG += ${config_entries}
+"
+    )
+    qt_install(FILES "${qconfig_pri_target_path}" DESTINATION ${INSTALL_MKSPECSDIR})
+endfunction()
+
+# Takes a list of path components and joins them into one path separated by forward slashes "/",
+# and saves the path in out_var.
+function(qt_path_join out_var)
+    # Remove output variable.
+    set(argv ${ARGV})
+    list(REMOVE_AT argv 0)
+
+    # Join the path components.
+    string(JOIN "/" path ${argv})
+    set(${out_var} ${path} PARENT_SCOPE)
+endfunction()
+
+function(qt_internal_export_modern_cmake_config_targets_file)
+    cmake_parse_arguments(__arg "" "EXPORT_NAME_PREFIX;CONFIG_INSTALL_DIR" "TARGETS" ${ARGN})
+
+    set(export_name "${__arg_EXPORT_NAME_PREFIX}VersionlessTargets")
+    foreach(target ${__arg_TARGETS})
+        if (TARGET "${target}Versionless")
+            continue()
+        endif()
+
+        add_library("${target}Versionless" INTERFACE)
+        target_link_libraries("${target}Versionless" INTERFACE "${target}")
+        set_target_properties("${target}Versionless" PROPERTIES EXPORT_NAME "${target}")
+        qt_install(TARGETS "${target}Versionless" EXPORT ${export_name})
+    endforeach()
+    qt_install(EXPORT ${export_name} NAMESPACE Qt:: DESTINATION "${__arg_CONFIG_INSTALL_DIR}")
+endfunction()
+
+# Print all variables defined in the current scope.
+macro(qt_debug_print_variables)
+    cmake_parse_arguments(__arg "DEDUP" "" "MATCH;IGNORE" ${ARGN})
+    message("Known Variables:")
+    get_cmake_property(__variableNames VARIABLES)
+    list (SORT __variableNames)
+    if (__arg_DEDUP)
+        list(REMOVE_DUPLICATES __variableNames)
+    endif()
+
+    foreach(__var ${__variableNames})
+        set(__ignore OFF)
+        foreach(__i ${__arg_IGNORE})
+            if(__var MATCHES "${__i}")
+                set(__ignore ON)
+                break()
+            endif()
+        endforeach()
+
+        if (__ignore)
+            continue()
+        endif()
+
+        set(__show OFF)
+        foreach(__i ${__arg_MATCH})
+            if(__var MATCHES "${__i}")
+                set(__show ON)
+                break()
+            endif()
+        endforeach()
+
+        if (__show)
+            message("    ${__var}=${${__var}}.")
+        endif()
+    endforeach()
+endmacro()
+
+
+macro(assert)
+    if (${ARGN})
+    else()
+        message(FATAL_ERROR "ASSERT: ${ARGN}.")
+    endif()
+endmacro()
+
+
+function(qt_create_nolink_target target dependee_target)
+    if(NOT TARGET "${target}")
+        message(FATAL_ERROR "${target} does not exist when trying to build a nolink target.")
+    endif()
+    get_target_property(type "${target}" TYPE)
+    if(type STREQUAL EXECUTABLE)
+        message(FATAL_ERROR "${target} must be a library of some kind.")
+    endif()
+    if(type STREQUAL OBJECT_LIBRARY)
+        message(FATAL_ERROR "${target} must not be an object library.")
+    endif()
+
+    # Strip off the namespace prefix, so from Vulkan::Vulkan to Vulkan, and then append _nolink.
+    string(REGEX REPLACE "^.*::" "" non_prefixed_target ${target})
+    set(nolink_target "${non_prefixed_target}_nolink")
+
+    # Create the nolink interface target, assign the properties from the original target,
+    # associate the nolink target with the same export which contains
+    # the target that uses the _nolink target.
+    # Also create a namespaced alias of the form ${target}::${target}_nolink which is used by
+    # our modules.
+    # Also create a Qt namespaced alias target, because when exporting via install(EXPORT)
+    # Vulkan::Vulkan_nolink transforms into Qt6::Vulkan_nolink, and the latter needs to be an
+    # accessible alias for standalone tests.
+    if(NOT TARGET "${nolink_target}")
+        add_library("${nolink_target}" INTERFACE)
+        set(prefixed_nolink_target "${target}_nolink")
+        set_target_properties("${nolink_target}" PROPERTIES
+                              INTERFACE_INCLUDE_DIRECTORIES
+                              $<TARGET_PROPERTY:${target},INTERFACE_INCLUDE_DIRECTORIES>
+                              INTERFACE_SYSTEM_INCLUDE_DIRECTORIES
+                              $<TARGET_PROPERTY:${target},INTERFACE_SYSTEM_INCLUDE_DIRECTORIES>
+                              INTERFACE_COMPILE_DEFINITIONS
+                              $<TARGET_PROPERTY:${target},INTERFACE_COMPILE_DEFINITIONS>
+                              INTERFACE_COMPILE_OPTIONS
+                              $<TARGET_PROPERTY:${target},INTERFACE_COMPILE_OPTIONS>
+                              INTERFACE_COMPILE_FEATURES
+                              $<TARGET_PROPERTY:${target},INTERFACE_COMPILE_FEATURES>)
+
+        add_library(${prefixed_nolink_target} ALIAS ${nolink_target})
+        add_library("${INSTALL_CMAKE_NAMESPACE}::${nolink_target}" ALIAS ${nolink_target})
+
+        set(export_name "${INSTALL_CMAKE_NAMESPACE}${dependee_target}Targets")
+        qt_install(TARGETS ${nolink_target} EXPORT ${export_name})
+    endif()
+endfunction()
+
+function(qt_ensure_perl)
+    if(DEFINED HOST_PERL)
+        return()
+    endif()
+    find_program(HOST_PERL "perl" DOC "Perl binary")
+    if (NOT HOST_PERL)
+        message(FATAL_ERROR "Perl needs to be available to build Qt.")
+    endif()
+endfunction()
+
+
+function(qt_ensure_sync_qt)
+    qt_ensure_perl()
+    if(DEFINED QT_SYNCQT)
+        return()
+    endif()
+
+    # When building qtbase, use the source syncqt, otherwise use the installed one.
+    set(SYNCQT_FROM_SOURCE "${QtBase_SOURCE_DIR}/bin/syncqt.pl")
+    if(NOT ("${QtBase_SOURCE_DIR}" STREQUAL "") AND EXISTS "${SYNCQT_FROM_SOURCE}")
+        set(QT_SYNCQT "${SYNCQT_FROM_SOURCE}" CACHE FILEPATH "syncqt script")
+        message(STATUS "Using source syncqt found at: ${QT_SYNCQT}")
+
+        qt_path_join(syncqt_install_dir ${QT_INSTALL_DIR} ${INSTALL_LIBEXECDIR})
+        qt_copy_or_install(PROGRAMS "${SYNCQT_FROM_SOURCE}"
+                           DESTINATION "${syncqt_install_dir}")
+    elseif(QT_HOST_PATH)
+        get_filename_component(syncqt_absolute_path
+                               "${QT_HOST_PATH}/${INSTALL_LIBEXECDIR}/syncqt.pl"
+                               ABSOLUTE)
+        set(QT_SYNCQT "${syncqt_absolute_path}" CACHE FILEPATH "syncqt script")
+        message(STATUS "Using host syncqt found at: ${QT_SYNCQT}")
+    else()
+        get_filename_component(syncqt_absolute_path
+                               "${CMAKE_INSTALL_PREFIX}/${INSTALL_LIBEXECDIR}/syncqt.pl"
+                               ABSOLUTE)
+        set(QT_SYNCQT "${syncqt_absolute_path}" CACHE FILEPATH "syncqt script")
+        message(STATUS "Using installed syncqt found at: ${QT_SYNCQT}")
+    endif()
+endfunction()
+
+# A version of cmake_parse_arguments that makes sure all arguments are processed and errors out
+# with a message about ${type} having received unknown arguments.
+macro(qt_parse_all_arguments result type flags options multiopts)
+    cmake_parse_arguments(${result} "${flags}" "${options}" "${multiopts}" ${ARGN})
+    if(DEFINED ${result}_UNPARSED_ARGUMENTS)
+        message(FATAL_ERROR "Unknown arguments were passed to ${type} (${${result}_UNPARSED_ARGUMENTS}).")
+    endif()
+endmacro()
+
+include(CheckCXXSourceCompiles)
+
+function(qt_internal_add_link_flags_no_undefined target)
+    if (NOT QT_BUILD_SHARED_LIBS)
+        return()
+    endif()
+    if (GCC OR CLANG)
+        set(previous_CMAKE_REQUIRED_LINK_OPTIONS ${CMAKE_REQUIRED_LINK_OPTIONS})
+
+        set(CMAKE_REQUIRED_LINK_OPTIONS "-Wl,-undefined,error")
+        check_cxx_source_compiles("int main() {}" HAVE_DASH_UNDEFINED_ERROR)
+        if(HAVE_DASH_UNDEFINED_ERROR)
+            set(no_undefined_flag "-Wl,-undefined,error")
+        endif()
+
+        set(CMAKE_REQUIRED_LINK_OPTIONS "-Wl,--no-undefined")
+        check_cxx_source_compiles("int main() {}" HAVE_DASH_DASH_NO_UNDEFINED)
+        if(HAVE_DASH_DASH_NO_UNDEFINED)
+            set(no_undefined_flag "-Wl,--no-undefined")
+        endif()
+
+        set(CMAKE_REQUIRED_LINK_OPTIONS ${previous_CMAKE_REQUIRED_LINK_OPTIONS})
+
+        if (NOT HAVE_DASH_UNDEFINED_ERROR AND NOT HAVE_DASH_DASH_NO_UNDEFINED)
+            message(FATAL_ERROR "Platform linker doesn't support erroring upon encountering undefined symbols. Target:\"${target}\".")
+        endif()
+        target_link_options("${target}" PRIVATE "${no_undefined_flag}")
+    endif()
+endfunction()
+
+function(qt_internal_add_link_flags_gc_sections target visibility)
+    set(possible_visibilities PRIVATE INTERFACE PUBLIC)
+    list(FIND possible_visibilities "${visibility}" known_visibility)
+    if (known_visibility EQUAL "-1")
+        message(FATAL_ERROR "Visibitily setting must be one of PRIVATE, INTERFACE or PUBLIC.")
+    endif()
+
+    if ((GCC OR CLANG) AND NOT EMSCRIPTEN)
+        if(APPLE)
+            set(gc_sections_flag "-Wl,-dead_strip")
+        elseif(LINUX OR BSD OR SOLARIS OR WIN32 OR ANDROID)
+            set(gc_sections_flag "-Wl,--gc-sections")
+        else()
+            message(FATAL_ERROR "Platform linker doesn't support gc sections. Target:\"${target}\".")
+        endif()
+        target_link_options("${target}" ${visibility} "${gc_sections_flag}")
+    endif()
+endfunction()
+
+function(qt_internal_add_linker_version_script target)
+    qt_parse_all_arguments(arg "qt_internal_add_linker" "INTERNAL" "" "PRIVATE_HEADERS" ${ARGN})
+
+    if (TEST_ld_version_script)
+        if (arg_INTERNAL)
+            set(contents "Qt_${PROJECT_VERSION_MAJOR}_PRIVATE_API { *; };")
+        else()
+            set(contents "Qt_${PROJECT_VERSION_MAJOR}_PRIVATE_API {\n    qt_private_api_tag*;\n")
+            foreach(ph ${arg_PRIVATE_HEADERS})
+                string(APPEND contents "    @FILE:${ph}@\n")
+            endforeach()
+            string(APPEND contents "};\n")
+            set(current "Qt_${PROJECT_VERSION_MAJOR}")
+            if (QT_NAMESPACE STREQUAL "")
+                set(tag_symbol "qt_version_tag")
+            else()
+                set(tag_symbol "qt_version_tag_${QT_NAMESPACE}")
+            endif()
+            string(APPEND contents "${current} { *; };\n")
+
+            foreach(minor_version RANGE ${PROJECT_VERSION_MINOR})
+                set(previous "${current}")
+                set(current "Qt_${PROJECT_VERSION_MAJOR}.${minor_version}")
+                if (minor_version EQUAL ${PROJECT_VERSION_MINOR})
+                   string(APPEND contents "${current} { ${tag_symbol}; } ${previous};\n")
+                else()
+                   string(APPEND contents "${current} {} ${previous};\n")
+                endif()
+            endforeach()
+
+            set(infile "${CMAKE_CURRENT_BINARY_DIR}/${target}.version.in")
+            set(outfile "${CMAKE_CURRENT_BINARY_DIR}/${target}.version")
+
+            file(GENERATE OUTPUT "${infile}" CONTENT "${contents}")
+
+            qt_ensure_perl()
+
+            add_custom_command(TARGET "${target}" PRE_LINK
+                COMMAND "${HOST_PERL}" "${QT_MKSPECS_DIR}/features/data/unix/findclasslist.pl" < "${infile}" > "${outfile}"
+                BYPRODUCTS "${outfile}" DEPENDS "${infile}"
+                WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
+                COMMENT "Generating version linker script"
+            )
+            target_link_options("${target}" PRIVATE "-Wl,--version-script,${outfile}")
+        endif()
+    endif()
+endfunction()
+
+
+# Get a set of Qt module related values based on the target name.
+# When doing qt_internal_module_info(foo Core) this method will set
+# the following variables in the caller's scope:
+#  * foo with the value "QtCore"
+#  * foo_versioned with the value "Qt6Core" (based on major Qt version)
+#  * foo_upper with the value "CORE"
+#  * foo_lower with the value "core"
+#  * foo_repo_include_dir with the module's include directory
+#    e.g for QtQuick it would be qtdeclarative_build_dir/include for a prefix build or
+#                                qtbase_build_dir/include for a non-prefix build
+#  * foo_include_dir with the module's include directory
+#    e.g for QtQuick it would be qtdeclarative_build_dir/include/QtQuick for a prefix build or
+#                                qtbase_build_dir/include/QtQuick for a non-prefix build
+#  * foo_define same as foo_uper but with - replaced as _
+function(qt_internal_module_info result target)
+    set(module "Qt${target}")
+    set("${result}" "${module}" PARENT_SCOPE)
+    set("${result}_versioned" "Qt${PROJECT_VERSION_MAJOR}${target}" PARENT_SCOPE)
+    string(TOUPPER "${target}" upper)
+    string(TOLOWER "${target}" lower)#  * foo_upper with the value "CORE"
+    string(REPLACE "-" "_" define "${upper}")
+    string(REPLACE "." "_" define "${define}")
+    set("${result}_upper" "${upper}" PARENT_SCOPE)
+    set("${result}_lower" "${lower}" PARENT_SCOPE)
+    set("${result}_repo_include_dir" "${QT_BUILD_DIR}/${INSTALL_INCLUDEDIR}" PARENT_SCOPE)
+    set("${result}_include_dir" "${QT_BUILD_DIR}/${INSTALL_INCLUDEDIR}/${module}" PARENT_SCOPE)
+    set("${result}_define" "${define}" PARENT_SCOPE)
+endfunction()
+
+
+set(__default_private_args "SOURCES;LIBRARIES;INCLUDE_DIRECTORIES;DEFINES;DBUS_ADAPTOR_BASENAME;DBUS_ADAPTOR_FLAGS;DBUS_ADAPTOR_SOURCES;DBUS_INTERFACE_BASENAME;DBUS_INTERFACE_FLAGS;DBUS_INTERFACE_SOURCES;FEATURE_DEPENDENCIES;COMPILE_OPTIONS;LINK_OPTIONS;MOC_OPTIONS;DISABLE_AUTOGEN_TOOLS;ENABLE_AUTOGEN_TOOLS;PLUGIN_TYPES")
+
+set(__default_public_args "PUBLIC_LIBRARIES;PUBLIC_INCLUDE_DIRECTORIES;PUBLIC_DEFINES;PUBLIC_COMPILE_OPTIONS;PUBLIC_LINK_OPTIONS")
+set(__default_private_module_args "PRIVATE_MODULE_INTERFACE")
+
+option(QT_CMAKE_DEBUG_EXTEND_TARGET "Debug extend_target calls in Qt's build system" OFF)
+
+# Initial autogen setup for a target to specify certain CMake properties which are common
+# to all autogen tools. Also enable AUTOMOC by default.
+function(qt_autogen_tools_initial_setup target)
+    set_property(TARGET "${target}" PROPERTY INTERFACE_QT_MAJOR_VERSION ${PROJECT_VERSION_MAJOR})
+    set_property(TARGET "${target}" APPEND PROPERTY COMPATIBLE_INTERFACE_STRING QT_MAJOR_VERSION)
+
+    set_directory_properties(PROPERTIES
+        QT_VERSION_MAJOR ${PROJECT_VERSION_MAJOR}
+        QT_VERSION_MINOR ${PROJECT_VERSION_MINOR}
+        QT_VERSION_PATCH ${PROJECT_VERSION_PATCH}
+    )
+
+    qt_enable_autogen_tool(${target} "moc" ON)
+endfunction()
+
+# Enables or disables an autogen tool like moc, uic or rcc on ${target}.
+function(qt_enable_autogen_tool target tool enable)
+    string(TOUPPER "${tool}" captitalAutogenTool)
+
+    get_target_property(tool_enabled ${target} AUTO${captitalAutogenTool})
+    get_target_property(autogen_target_depends ${target} AUTOGEN_TARGET_DEPENDS)
+
+    if(NOT autogen_target_depends)
+        set(autogen_target_depends "")
+    endif()
+    set(tool_executable "$<TARGET_FILE:${QT_CMAKE_EXPORT_NAMESPACE}::${tool}>")
+    set(tool_target_name ${QT_CMAKE_EXPORT_NAMESPACE}::${tool})
+
+    if(enable)
+        list(APPEND autogen_target_depends ${tool_target_name})
+    else()
+        list(REMOVE_ITEM autogen_target_depends ${tool_target_name})
+    endif()
+
+    # f66c1db16c050c9d685a44a38ad7c5cf9f6fcc96 in qtbase introduced a new macro
+    # that the moc scanner has to look for. Inform the CMake moc scanner about it.
+    if(tool STREQUAL "moc" AND enable)
+        set_target_properties("${target}" PROPERTIES
+            AUTOMOC_MACRO_NAMES "Q_OBJECT;Q_GADGET;Q_NAMESPACE;Q_NAMESPACE_EXPORT;Q_ENUM_NS")
+    endif()
+
+    set_target_properties("${target}"
+                          PROPERTIES
+                          AUTO${captitalAutogenTool} "${enable}"
+                          AUTO${captitalAutogenTool}_EXECUTABLE "${tool_executable}"
+                          AUTOGEN_TARGET_DEPENDS "${autogen_target_depends}"
+                          )
+endfunction()
+
+# This function adds or removes additional AUTOGEN tools to a target: AUTOMOC/UIC/RCC
+function(qt_autogen_tools target)
+    qt_parse_all_arguments(arg "qt_autogen_tools" "" "" "${__default_private_args}" ${ARGN})
+
+    if (arg_ENABLE_AUTOGEN_TOOLS)
+        foreach(tool ${arg_ENABLE_AUTOGEN_TOOLS})
+            qt_enable_autogen_tool(${target} ${tool} ON)
+        endforeach()
+    endif()
+
+  if (arg_DISABLE_AUTOGEN_TOOLS)
+      foreach(tool ${arg_DISABLE_AUTOGEN_TOOLS})
+          qt_enable_autogen_tool(${target} ${tool} OFF)
+      endforeach()
+  endif()
+endfunction()
+
+# This function stores the list of Qt modules a library depend on,
+# along with their version info, for usage in ${target}Depends.cmake file
+function(qt_register_target_dependencies target public_libs private_libs)
+    get_target_property(target_deps "${target}" _qt_target_deps)
+    if(NOT target_deps)
+        set(target_deps "")
+    endif()
+
+    # Only process private dependencies if target is a static library
+    get_target_property(target_type ${target} TYPE)
+    set(lib_list ${public_libs})
+    if (target_type STREQUAL "STATIC_LIBRARY")
+        list(APPEND lib_list ${private_libs})
+    endif()
+
+    foreach(lib IN LISTS lib_list)
+        if ("${lib}" MATCHES "^Qt::(.*)")
+            set(lib "${CMAKE_MATCH_1}")
+            if (lib STREQUAL Platform
+                    OR lib STREQUAL GlobalConfig
+                    OR lib STREQUAL GlobalConfigPrivate
+                    OR lib STREQUAL PlatformModuleInternal
+                    OR lib STREQUAL PlatformPluginInternal
+                    OR lib STREQUAL PlatformToolInternal)
+                list(APPEND target_deps "Qt6\;${PROJECT_VERSION}")
+            elseif ("${lib}" MATCHES "(.*)Private")
+                list(APPEND target_deps "${INSTALL_CMAKE_NAMESPACE}${CMAKE_MATCH_1}\;${PROJECT_VERSION}")
+            else()
+                list(APPEND target_deps "${INSTALL_CMAKE_NAMESPACE}${lib}\;${PROJECT_VERSION}")
+            endif()
+        endif()
+    endforeach()
+
+    set_target_properties("${target}" PROPERTIES _qt_target_deps "${target_deps}")
+endfunction()
+
+function(qt_update_precompiled_header target precompiled_header)
+    if (precompiled_header AND BUILD_WITH_PCH)
+        set_property(TARGET "${target}" APPEND PROPERTY "PRECOMPILE_HEADERS" "$<$<COMPILE_LANGUAGE:CXX>:${precompiled_header}>")
+    endif()
+endfunction()
+
+function(qt_update_precompiled_header_with_library target library)
+    if (TARGET "${library}")
+        get_target_property(TARGET_TYPE "${library}" TYPE)
+        if (NOT TARGET_TYPE STREQUAL "INTERFACE_LIBRARY")
+            get_target_property(HEADER "${library}" MODULE_HEADER)
+            qt_update_precompiled_header("${target}" "${HEADER}")
+        endif()
+    endif()
+endfunction()
+
+function(qt_update_ignore_pch_source target sources)
+    if (sources)
+        set_source_files_properties(${sources} PROPERTIES SKIP_PRECOMPILE_HEADERS ON)
+    endif()
+endfunction()
+
+function(qt_ignore_pch_obj_c_sources target sources)
+    list(FILTER sources INCLUDE REGEX "\\.mm$")
+    qt_update_ignore_pch_source("${target}" "${sources}")
+endfunction()
+
+# This function can be used to add sources/libraries/etc. to the specified CMake target
+# if the provided CONDITION evaluates to true.
+function(qt_extend_target target)
+    # Don't try to extend_target when cross compiling an imported host target (like a tool).
+    qt_is_imported_target("${target}" is_imported)
+    if(is_imported)
+        return()
+    endif()
+
+    if (NOT TARGET "${target}")
+        message(FATAL_ERROR "Trying to extend non-existing target \"${target}\".")
+    endif()
+    qt_parse_all_arguments(arg "qt_extend_target" "HEADER_MODULE" "PRECOMPILED_HEADER"
+        "CONDITION;${__default_public_args};${__default_private_args};${__default_private_module_args};COMPILE_FLAGS;NO_PCH_SOURCES" ${ARGN})
+    if ("x${arg_CONDITION}" STREQUAL x)
+        set(arg_CONDITION ON)
+    endif()
+
+    qt_evaluate_config_expression(result ${arg_CONDITION})
+    if (${result})
+        if(QT_CMAKE_DEBUG_EXTEND_TARGET)
+            message("qt_extend_target(${target} CONDITION ${arg_CONDITION} ...): Evaluated")
+        endif()
+        set(dbus_sources "")
+        foreach(adaptor ${arg_DBUS_ADAPTOR_SOURCES})
+            qt_create_qdbusxml2cpp_command("${target}" "${adaptor}" ADAPTOR BASENAME "${arg_DBUS_ADAPTOR_BASENAME}" FLAGS "${arg_DBUS_ADAPTOR_FLAGS}")
+            list(APPEND dbus_sources "${sources}")
+        endforeach()
+
+        foreach(interface ${arg_DBUS_INTERFACE_SOURCES})
+            qt_create_qdbusxml2cpp_command("${target}" "${interface}" INTERFACE BASENAME "${arg_DBUS_INTERFACE_BASENAME}" FLAGS "${arg_DBUS_INTERFACE_FLAGS}")
+            list(APPEND dbus_sources "${sources}")
+        endforeach()
+
+        get_target_property(target_type ${target} TYPE)
+        set(is_library FALSE)
+        if (${target_type} STREQUAL "STATIC_LIBRARY" OR ${target_type} STREQUAL "SHARED_LIBRARY")
+            set(is_library TRUE)
+        endif()
+        foreach(lib ${arg_PUBLIC_LIBRARIES} ${arg_LIBRARIES})
+            # Automatically generate PCH for 'target' using dependencies
+            # if 'target' is a library/module!
+            if (${is_library})
+                qt_update_precompiled_header_with_library("${target}" "${lib}")
+            endif()
+
+            string(REGEX REPLACE "_nolink$" "" base_lib "${lib}")
+            if(NOT base_lib STREQUAL lib)
+                qt_create_nolink_target("${base_lib}" ${target})
+            endif()
+        endforeach()
+
+        # Find dependencies to internal libraries
+        get_target_property(target_deps "${target}" _qt_target_deps)
+        if(NOT target_deps)
+            set(target_deps "")
+        endif()
+
+        foreach(lib ${arg_LIBRARIES})
+            if (TARGET "${lib}")
+                get_target_property(_is_exported "${lib}" INTERFACE_QT_EXPORTED_LIBRARY)
+                if("${_is_exported}")
+                    list(APPEND target_deps "${lib}\;${PROJECT_VERSION}")
+                endif()
+            endif()
+        endforeach()
+        # Set-up the target
+        target_sources("${target}" PRIVATE ${arg_SOURCES} ${dbus_sources})
+        if (arg_COMPILE_FLAGS)
+            set_source_files_properties(${arg_SOURCES} PROPERTIES COMPILE_FLAGS "${arg_COMPILE_FLAGS}")
+        endif()
+
+        set(public_visibility_option "PUBLIC")
+        set(private_visibility_option "PRIVATE")
+        if(arg_HEADER_MODULE)
+            set(public_visibility_option "INTERFACE")
+            set(private_visibility_option "INTERFACE")
+        endif()
+        target_include_directories("${target}"
+                                   ${public_visibility_option} ${arg_PUBLIC_INCLUDE_DIRECTORIES}
+                                   ${private_visibility_option} ${arg_INCLUDE_DIRECTORIES})
+        target_compile_definitions("${target}"
+                                    ${public_visibility_option} ${arg_PUBLIC_DEFINES}
+                                    ${private_visibility_option} ${arg_DEFINES})
+        target_link_libraries("${target}"
+                              ${public_visibility_option} ${arg_PUBLIC_LIBRARIES}
+                              ${private_visibility_option} ${arg_LIBRARIES})
+        target_compile_options("${target}"
+                               ${public_visibility_option} ${arg_PUBLIC_COMPILE_OPTIONS}
+                               ${private_visibility_option} ${arg_COMPILE_OPTIONS})
+        target_link_options("${target}"
+                            ${public_visibility_option} ${arg_PUBLIC_LINK_OPTIONS}
+                            ${private_visibility_option} ${arg_LINK_OPTIONS})
+
+        if(NOT arg_HEADER_MODULE)
+            set_property (TARGET "${target}" APPEND PROPERTY
+                AUTOMOC_MOC_OPTIONS "${arg_MOC_OPTIONS}"
+            )
+            set_property(TARGET "${target}" PROPERTY
+                _qt_target_deps "${target_deps}"
+           )
+        endif()
+
+        # When computing the private library dependencies, we need to check not only the known
+        # modules added by this repo's qt_build_repo(), but also all module dependencies that
+        # were found via find_package().
+        qt_internal_get_qt_all_known_modules(known_modules)
+
+        # When a public module depends on a private module (Gui on CorePrivate)
+        # make its private module depend on the other private module (GuiPrivate will depend on
+        # CorePrivate).
+        set(qt_libs_private "")
+        foreach(it ${known_modules})
+            list(FIND arg_LIBRARIES "Qt::${it}Private" pos)
+            if(pos GREATER -1)
+                list(APPEND qt_libs_private "Qt::${it}Private")
+            endif()
+        endforeach()
+
+        set(target_private "${target}Private")
+        if(TARGET "${target_private}")
+          target_link_libraries("${target_private}"
+                                INTERFACE "${target}" ${arg_PRIVATE_MODULE_INTERFACE})
+        endif()
+        qt_register_target_dependencies("${target}"
+                                        "${arg_PUBLIC_LIBRARIES}"
+                                        "${qt_libs_private};${arg_LIBRARIES}")
+
+
+        qt_autogen_tools(${target}
+                         ENABLE_AUTOGEN_TOOLS ${arg_ENABLE_AUTOGEN_TOOLS}
+                         DISABLE_AUTOGEN_TOOLS ${arg_DISABLE_AUTOGEN_TOOLS})
+
+        qt_update_precompiled_header("${target}" "${arg_PRECOMPILED_HEADER}")
+        qt_update_ignore_pch_source("${target}" "${arg_NO_PCH_SOURCES}")
+        ## Ignore objective-c files for PCH (not supported atm)
+        qt_ignore_pch_obj_c_sources("${target}" "${arg_SOURCES}")
+
+    else()
+        if(QT_CMAKE_DEBUG_EXTEND_TARGET)
+            message("qt_extend_target(${target} CONDITION ${arg_CONDITION} ...): Skipped")
+        endif()
+    endif()
+endfunction()
+
+
+function(qt_internal_library_deprecation_level result)
+    if(WIN32)
+        # On Windows, due to the way DLLs work, we need to export all functions,
+        # including the inlines
+        list(APPEND deprecations "QT_DISABLE_DEPRECATED_BEFORE=0x040800")
+    else()
+        # On other platforms, Qt's own compilation goes needs to compile the Qt 5.0 API
+        list(APPEND deprecations "QT_DISABLE_DEPRECATED_BEFORE=0x050000")
+    endif()
+    list(APPEND deprecations "QT_DEPRECATED_WARNINGS_SINCE=0x060000")
+    set("${result}" deprecations PARENT_SCOPE)
+endfunction()
+
+
+function(qt_install_injections target build_dir install_dir)
+    set(injections ${ARGN})
+    set(module "Qt${target}")
+    get_target_property(target_type ${target} TYPE)
+    if (target_type STREQUAL "INTERFACE_LIBRARY")
+        set(is_framework FALSE)
+    else()
+        get_target_property(is_framework ${target} FRAMEWORK)
+    endif()
+    # examples:
+    #  SYNCQT.INJECTIONS = src/corelib/global/qconfig.h:qconfig.h:QtConfig src/corelib/global/qconfig_p.h:5.12.0/QtCore/private/qconfig_p.h
+    #  SYNCQT.INJECTIONS = src/gui/vulkan/qvulkanfunctions.h:^qvulkanfunctions.h:QVulkanFunctions:QVulkanDeviceFunctions src/gui/vulkan/qvulkanfunctions_p.h:^5.12.0/QtGui/private/qvulkanfunctions_p.h
+    # The are 3 parts to the assignment, divded by colons ':'.
+    # The first part contains a path to a generated file in a build folder.
+    # The second part contains the file name that the forwarding header should have, which points
+    # to the file in the first part.
+    # The third part contains multiple UpperCaseFileNames that should be forwarding headers to the
+    # header specified in the second part.
+    separate_arguments(injections UNIX_COMMAND "${injections}")
+    foreach(injection ${injections})
+        string(REPLACE ":" ";" injection ${injection})
+        # Part 1.
+        list(GET injection 0 file)
+        # Part 2.
+        list(GET injection 1 destination)
+        string(REGEX REPLACE "^\\^" "" destination "${destination}")
+        list(REMOVE_AT injection 0 1)
+        # Part 3.
+        set(fwd_hdrs ${injection})
+        get_filename_component(destinationdir ${destination} DIRECTORY)
+        get_filename_component(destinationname ${destination} NAME)
+        get_filename_component(original_file_name ${file} NAME)
+
+        # This describes a concrete example for easier comprehension:
+        # A file 'qtqml-config.h' is generated by qt_internal_feature_write_file into
+        # ${qtdeclarative_build_dir}/src/{module}/qtqml-config.h (part 1).
+        #
+        # Generate a lower case forwarding header (part 2) 'qtqml-config.h' at the following
+        # location:
+        # ${some_prefix}/include/${module}/qtqml-config.h.
+        #
+        # Inside this file, we #include the originally generated file,
+        # ${qtdeclarative_build_dir}/src/{module}/qtqml-config.h.
+        #
+        # ${some_prefix}'s value depends on the build type.
+        # If doing a prefix build, it should point to
+        # ${current_repo_build_dir} which is ${qtdeclarative_build_dir}.
+        # If doing a non-prefix build, it should point to
+        # ${qtbase_build_dir}.
+        #
+        # In the code below, ${some_prefix} == ${build_dir}.
+        set(lower_case_forwarding_header_path "${build_dir}/${INSTALL_INCLUDEDIR}/${module}")
+        if(destinationdir)
+            string(APPEND lower_case_forwarding_header_path "/${destinationdir}")
+        endif()
+        set(current_repo_build_dir "${PROJECT_BINARY_DIR}")
+
+        file(RELATIVE_PATH relpath
+                           "${lower_case_forwarding_header_path}"
+                           "${current_repo_build_dir}/${file}")
+        set(main_contents "#include \"${relpath}\"")
+        file(GENERATE OUTPUT "${lower_case_forwarding_header_path}/${original_file_name}"
+             CONTENT "${main_contents}")
+
+        if(is_framework)
+            if(file MATCHES "_p\\.h$")
+                set(header_type PRIVATE)
+            else()
+                set(header_type PUBLIC)
+            endif()
+            qt_copy_framework_headers(${target} ${header_type}
+                ${current_repo_build_dir}/${file})
+        else()
+            # Copy the actual injected (generated) header file (not the just created forwarding one)
+            # to its install location when doing a prefix build. In an non-prefix build, the qt_install
+            # will be a no-op.
+            qt_path_join(install_destination
+                        ${install_dir} ${INSTALL_INCLUDEDIR} ${module} ${destinationdir})
+            qt_install(FILES ${current_repo_build_dir}/${file}
+                    DESTINATION ${install_destination}
+                    RENAME ${destinationname} OPTIONAL)
+        endif()
+
+        # Generate UpperCaseNamed forwarding headers (part 3).
+        foreach(fwd_hdr ${fwd_hdrs})
+            set(upper_case_forwarding_header_path "${INSTALL_INCLUDEDIR}/${module}")
+            if(destinationdir)
+                string(APPEND upper_case_forwarding_header_path "/${destinationdir}")
+            endif()
+
+            # Generate upper case forwarding header like QVulkanFunctions or QtConfig.
+            file(GENERATE OUTPUT "${build_dir}/${upper_case_forwarding_header_path}/${fwd_hdr}"
+                 CONTENT "#include \"${destinationname}\"\n")
+
+            if(is_framework)
+                # Copy the forwarding header to the framework's Headers directory.
+                qt_copy_framework_headers(${target} PUBLIC
+                    "${build_dir}/${upper_case_forwarding_header_path}/${fwd_hdr}")
+            else()
+                # Install the forwarding header.
+                qt_path_join(install_destination
+                            ${install_dir} ${upper_case_forwarding_header_path})
+                qt_install(FILES "${build_dir}/${upper_case_forwarding_header_path}/${fwd_hdr}"
+                        DESTINATION ${install_destination} OPTIONAL)
+            endif()
+        endforeach()
+    endforeach()
+endfunction()
+
+
+function(qt_read_headers_pri target resultVarPrefix)
+    qt_internal_module_info(module "${target}")
+    file(STRINGS "${module_include_dir}/headers.pri" headers_pri_contents)
+    foreach(line ${headers_pri_contents})
+        if("${line}" MATCHES "SYNCQT.HEADER_FILES = (.*)")
+            set(public_module_headers "${CMAKE_MATCH_1}")
+            separate_arguments(public_module_headers UNIX_COMMAND "${public_module_headers}")
+        elseif("${line}" MATCHES "SYNCQT.PRIVATE_HEADER_FILES = (.*)")
+            set(private_module_headers "${CMAKE_MATCH_1}")
+            separate_arguments(private_module_headers UNIX_COMMAND "${private_module_headers}")
+        elseif("${line}" MATCHES "SYNCQT.GENERATED_HEADER_FILES = (.*)")
+            set(generated_module_headers "${CMAKE_MATCH_1}")
+            separate_arguments(generated_module_headers UNIX_COMMAND "${generated_module_headers}")
+            foreach(generated_header ${generated_module_headers})
+                list(APPEND public_module_headers "${module_include_dir}/${generated_header}")
+            endforeach()
+        elseif("${line}" MATCHES "SYNCQT.INJECTIONS = (.*)")
+            set(injections "${CMAKE_MATCH_1}")
+        elseif("${line}" MATCHES "SYNCQT.([A-Z_]+)_HEADER_FILES = (.+)")
+            set(prefix "${CMAKE_MATCH_1}")
+            string(TOLOWER "${prefix}" prefix)
+            set(entries "${CMAKE_MATCH_2}")
+            separate_arguments(entries UNIX_COMMAND "${entries}")
+            set("${resultVarPrefix}_${prefix}" "${entries}" PARENT_SCOPE)
+        endif()
+    endforeach()
+    set(${resultVarPrefix}_public "${public_module_headers}" PARENT_SCOPE)
+    set(${resultVarPrefix}_private "${private_module_headers}" PARENT_SCOPE)
+    set(${resultVarPrefix}_injections "${injections}" PARENT_SCOPE)
+endfunction()
+
+
+# Add Qt::target and Qt6::target as aliases for the target
+function(qt_internal_add_target_aliases target)
+    get_target_property(type "${target}" TYPE)
+    if (type STREQUAL EXECUTABLE)
+        add_executable("Qt::${target}" ALIAS "${target}")
+        add_executable("Qt${PROJECT_VERSION_MAJOR}::${target}" ALIAS "${target}")
+    else()
+        add_library("Qt::${target}" ALIAS "${target}")
+        add_library("Qt${PROJECT_VERSION_MAJOR}::${target}" ALIAS "${target}")
+    endif()
+endfunction()
+
+# Sets the exceptions flags for the given target
+function(qt_internal_set_no_exceptions_flags target)
+    target_compile_definitions("${target}" PRIVATE "QT_NO_EXCEPTIONS")
+    if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
+        target_compile_options("${target}" PRIVATE "/wd4530" "/wd4577")
+    elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
+        target_compile_options("${target}" PRIVATE "-fno-exceptions")
+    elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "AppleClang")
+        target_compile_options("${target}" PRIVATE "-fno-exceptions")
+    elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+        target_compile_options("${target}" PRIVATE "-fno-exceptions")
+    elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel")
+        target_compile_options("${target}" PRIVATE "-fno-exceptions")
+    endif()
+endfunction()
+
+function(qt_skip_warnings_are_errors target)
+    get_target_property(target_type "${target}" TYPE)
+    if(target_type STREQUAL "INTERFACE_LIBRARY")
+        return()
+    endif()
+    set_target_properties("${target}" PROPERTIES QT_SKIP_WARNINGS_ARE_ERRORS ON)
+endfunction()
+
+function(qt_skip_warnings_are_errors_when_repo_unclean target)
+    if(QT_REPO_NOT_WARNINGS_CLEAN)
+        qt_skip_warnings_are_errors("${target}")
+    endif()
+endfunction()
+
+function(qt_disable_warnings target)
+    get_target_property(target_type "${target}" TYPE)
+    if(target_type STREQUAL "INTERFACE_LIBRARY")
+        return()
+    endif()
+    set_target_properties("${target}" PROPERTIES QT_COMPILE_OPTIONS_DISABLE_WARNINGS ON)
+endfunction()
+
+function(qt_set_symbol_visibility_preset target value)
+    get_target_property(target_type "${target}" TYPE)
+    if(target_type STREQUAL "INTERFACE_LIBRARY")
+        return()
+    endif()
+
+    set_target_properties("${target}" PROPERTIES C_VISIBILITY_PRESET "${value}")
+    set_target_properties("${target}" PROPERTIES CXX_VISIBILITY_PRESET "${value}")
+endfunction()
+
+function(qt_set_symbol_visibility_hidden target)
+    qt_set_symbol_visibility_preset("${target}" "hidden")
+endfunction()
+
+function(qt_get_sanitized_plugin_type plugin_type out_var)
+    # Used to handle some edge cases such as platforms/darwin
+    string(REGEX REPLACE "[-/]" "_" plugin_type "${plugin_type}")
+    set("${out_var}" "${plugin_type}" PARENT_SCOPE)
+endfunction()
+
+# Copy header files to QtXYZ.framework/Versions/6/Headers/
+# Use this function for header files that
+#   - are not added as source files to the target
+#   - are not marked as PUBLIC_HEADER
+#   - or are private and supposed to end up in the 6.7.8/QtXYZ/private subdir.
+function(qt_copy_framework_headers target)
+    get_target_property(is_fw ${target} FRAMEWORK)
+    if(NOT "${is_fw}")
+        return()
+    endif()
+
+    set(options PUBLIC PRIVATE QPA)
+    set(oneValueArgs)
+    set(multiValueArgs)
+    cmake_parse_arguments(ARG "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
+
+    get_target_property(fw_version ${target} FRAMEWORK_VERSION)
+    get_target_property(fw_bundle_version ${target} MACOSX_FRAMEWORK_BUNDLE_VERSION)
+    get_target_property(fw_dir ${target} LIBRARY_OUTPUT_DIRECTORY)
+    get_target_property(fw_name ${target} OUTPUT_NAME)
+    set(fw_headers_dir ${fw_dir}/${fw_name}.framework/Versions/${fw_version}/Headers/)
+    if(ARG_PRIVATE)
+        string(APPEND fw_headers_dir "${fw_bundle_version}/Qt${target}/private/")
+    elseif(ARG_QPA)
+        string(APPEND fw_headers_dir "${fw_bundle_version}/Qt${target}/qpa/")
+    endif()
+
+    set(out_files)
+    foreach(hdr IN LISTS ARG_UNPARSED_ARGUMENTS)
+        get_filename_component(in_file_path ${hdr} ABSOLUTE)
+        get_filename_component(in_file_name ${hdr} NAME)
+        set(out_file_path ${fw_headers_dir}${in_file_name})
+        add_custom_command(
+            OUTPUT ${out_file_path}
+            DEPENDS ${in_file_path}
+            COMMAND ${CMAKE_COMMAND} -E make_directory "${fw_headers_dir}"
+            COMMAND ${CMAKE_COMMAND} -E copy "${in_file_path}" "${fw_headers_dir}")
+        list(APPEND out_files ${out_file_path})
+    endforeach()
+
+    get_target_property(fw_copied_headers ${target} QT_COPIED_FRAMEWORK_HEADERS)
+    if(NOT fw_copied_headers)
+        set(fw_copied_headers "")
+    endif()
+    list(APPEND fw_copied_headers ${out_files})
+    set_target_properties(${target} PROPERTIES QT_COPIED_FRAMEWORK_HEADERS "${fw_copied_headers}")
+endfunction()
+
+function(qt_finalize_framework_headers_copy target)
+    get_target_property(target_type ${target} TYPE)
+    if(${target_type} STREQUAL "INTERFACE_LIBRARY")
+        return()
+    endif()
+    get_target_property(is_fw ${target} FRAMEWORK)
+    if(NOT "${is_fw}")
+        return()
+    endif()
+    get_target_property(headers ${target} QT_COPIED_FRAMEWORK_HEADERS)
+    if(headers)
+        # Hack to create the "Headers" symlink in the framework:
+        # Create a fake header file and copy it into the framework by marking it as PUBLIC_HEADER.
+        # CMake now takes care of creating the symlink.
+        set(fake_header ${target}_fake_header.h)
+        qt_get_main_cmake_configuration(main_config)
+        file(GENERATE OUTPUT ${fake_header} CONTENT "// ignore this file\n"
+             CONDITION "$<CONFIG:${main_config}>")
+        string(PREPEND fake_header "${CMAKE_CURRENT_BINARY_DIR}/")
+        target_sources(${target} PRIVATE ${fake_header})
+        set_source_files_properties(${fake_header} PROPERTIES GENERATED ON)
+        set_property(TARGET ${target} APPEND PROPERTY PUBLIC_HEADER ${fake_header})
+
+        # Add a target, e.g. Core_framework_headers, that triggers the header copy.
+        add_custom_target(${target}_framework_headers DEPENDS ${headers})
+        add_dependencies(${target} ${target}_framework_headers)
+    endif()
+endfunction()
+
+function(qt_clone_property_for_configs target property configs)
+    get_target_property(value "${target}" "${property}")
+    foreach(config ${configs})
+        string(TOUPPER "${config}" upper_config)
+        set_property(TARGET "${target}" PROPERTY "${property}_${upper_config}" "${value}")
+    endforeach()
+endfunction()
+
+function(qt_handle_multi_config_output_dirs target)
+    set(possible_configs "${CMAKE_BUILD_TYPE}")
+    if(CMAKE_CONFIGURATION_TYPES)
+        set(possible_configs "${CMAKE_CONFIGURATION_TYPES}")
+    endif()
+    qt_clone_property_for_configs(${target} LIBRARY_OUTPUT_DIRECTORY "${possible_configs}")
+    qt_clone_property_for_configs(${target} RUNTIME_OUTPUT_DIRECTORY "${possible_configs}")
+    qt_clone_property_for_configs(${target} ARCHIVE_OUTPUT_DIRECTORY "${possible_configs}")
+endfunction()
+
+# This is the main entry function for creating a Qt module, that typically
+# consists of a library, public header files, private header files and configurable
+# features.
+#
+# A CMake target with the specified target parameter is created. If the current source
+# directory has a configure.cmake file, then that is also processed for feature definition
+# and testing. Any features defined as well as any features coming from dependencies to
+# this module are imported into the scope of the calling feature.
+#
+# Target is without leading "Qt". So e.g. the "QtCore" module has the target "Core".
+function(qt_add_module target)
+    qt_internal_module_info(module "${target}")
+
+    # Process arguments:
+    qt_parse_all_arguments(arg "qt_add_module"
+        "NO_MODULE_HEADERS;STATIC;DISABLE_TOOLS_EXPORT;EXCEPTIONS;INTERNAL_MODULE;NO_SYNC_QT;NO_PRIVATE_MODULE;HEADER_MODULE;GENERATE_METATYPES;NO_CONFIG_HEADER_FILE"
+        "CONFIG_MODULE_NAME;PRECOMPILED_HEADER"
+        "${__default_private_args};${__default_public_args};${__default_private_module_args};QMAKE_MODULE_CONFIG;EXTRA_CMAKE_FILES;EXTRA_CMAKE_INCLUDES;NO_PCH_SOURCES" ${ARGN})
+
+    if(NOT DEFINED arg_CONFIG_MODULE_NAME)
+        set(arg_CONFIG_MODULE_NAME "${module_lower}")
+    endif()
+
+    qt_internal_add_qt_repo_known_module("${target}")
+
+    ### Define Targets:
+    set(is_interface_lib 0)
+    set(is_shared_lib 0)
+    if(${arg_HEADER_MODULE})
+        add_library("${target}" INTERFACE)
+        set(is_interface_lib 1)
+    elseif(${arg_STATIC})
+        add_library("${target}" STATIC)
+    elseif(${QT_BUILD_SHARED_LIBS})
+        add_library("${target}" SHARED)
+        set(is_shared_lib 1)
+    else()
+        add_library("${target}" STATIC)
+    endif()
+
+    set(is_framework 0)
+    if(QT_FEATURE_framework AND NOT ${arg_HEADER_MODULE} AND NOT ${arg_STATIC})
+        set(is_framework 1)
+        set_target_properties(${target} PROPERTIES
+            FRAMEWORK TRUE
+            FRAMEWORK_VERSION ${PROJECT_VERSION_MAJOR}
+            MACOSX_FRAMEWORK_IDENTIFIER org.qt-project.Qt${target}
+            MACOSX_FRAMEWORK_BUNDLE_VERSION ${PROJECT_VERSION}
+            MACOSX_FRAMEWORK_SHORT_VERSION_STRING ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}
+        )
+    endif()
+
+    if(QT_FEATURE_reduce_relocations AND UNIX AND NOT is_interface_lib)
+        # On x86 and x86-64 systems with ELF binaries (especially Linux), due to
+        # a new optimization in GCC 5.x in combination with a recent version of
+        # GNU binutils, compiling Qt applications with -fPIE is no longer
+        # enough.
+        # Applications now need to be compiled with the -fPIC option if the Qt option
+        # \"reduce relocations\" is active.
+        target_compile_options(${target} INTERFACE -fPIC)
+        if(GCC AND is_shared_lib)
+            target_link_options(${target} PRIVATE LINKER:-Bsymbolic-functions)
+        endif()
+    endif()
+
+    if (ANDROID)
+        qt_android_apply_arch_suffix("${target}")
+    endif()
+    qt_internal_add_target_aliases("${target}")
+    qt_skip_warnings_are_errors_when_repo_unclean("${target}")
+
+    # Add _private target to link against the private headers:
+    if(NOT ${arg_NO_PRIVATE_MODULE})
+        set(target_private "${target}Private")
+        add_library("${target_private}" INTERFACE)
+        qt_internal_add_target_aliases("${target_private}")
+    endif()
+
+    if(NOT arg_HEADER_MODULE)
+        set_target_properties(${target} PROPERTIES
+            LIBRARY_OUTPUT_DIRECTORY "${QT_BUILD_DIR}/${INSTALL_LIBDIR}"
+            RUNTIME_OUTPUT_DIRECTORY "${QT_BUILD_DIR}/${INSTALL_BINDIR}"
+            ARCHIVE_OUTPUT_DIRECTORY "${QT_BUILD_DIR}/${INSTALL_LIBDIR}"
+            VERSION ${PROJECT_VERSION}
+            SOVERSION ${PROJECT_VERSION_MAJOR}
+            QT_TARGET_VERSION "${PROJECT_VERSION}.0"
+            QT_TARGET_COMPANY_NAME "The Qt Company Ltd."
+            QT_TARGET_DESCRIPTION "C++ Application Development Framework"
+            QT_TARGET_COPYRIGHT "Copyright (C) 2020 The Qt Company Ltd."
+            QT_TARGET_PRODUCT_NAME "Qt6"
+        )
+        qt_handle_multi_config_output_dirs("${target}")
+
+        if(is_framework)
+            set_target_properties(${target} PROPERTIES
+                OUTPUT_NAME Qt${target}
+            )
+        else()
+            set_target_properties(${target} PROPERTIES
+                OUTPUT_NAME "${INSTALL_CMAKE_NAMESPACE}${target}"
+            )
+        endif()
+
+        if (WIN32 AND BUILD_SHARED_LIBS)
+            qt6_generate_win32_rc_file(${target})
+        endif()
+    endif()
+
+    # Module headers:
+    if(${arg_NO_MODULE_HEADERS} OR ${arg_NO_SYNC_QT})
+        set_target_properties("${target}" PROPERTIES INTERFACE_MODULE_HAS_HEADERS OFF)
+    else()
+        # Use QT_BUILD_DIR for the syncqt call.
+        # So we either write the generated files into the qtbase non-prefix build root, or the
+        # module specific build root.
+        qt_ensure_sync_qt()
+        set(syncqt_full_command "${HOST_PERL}" -w "${QT_SYNCQT}"
+                                 -quiet
+                                 -check-includes
+                                 -module "${module}"
+                                 -version "${PROJECT_VERSION}"
+                                 -outdir "${QT_BUILD_DIR}"
+                                 -builddir "${PROJECT_BINARY_DIR}"
+                                 "${PROJECT_SOURCE_DIR}")
+        execute_process(COMMAND ${syncqt_full_command})
+
+        set_target_properties("${target}" PROPERTIES INTERFACE_MODULE_HAS_HEADERS ON)
+
+        ### FIXME: Can we replace headers.pri?
+        qt_read_headers_pri("${target}" "module_headers")
+        set(module_depends_header "${module_include_dir}/${module}Depends")
+        if(is_framework)
+            if(NOT is_interface_lib)
+                set(public_headers_to_copy "${module_headers_public}" "${module_depends_header}")
+                qt_copy_framework_headers(${target} PUBLIC "${public_headers_to_copy}")
+                qt_copy_framework_headers(${target} PRIVATE "${module_headers_private}")
+            endif()
+        else()
+            set_property(TARGET ${target} APPEND PROPERTY PUBLIC_HEADER "${module_headers_public}")
+            set_property(TARGET ${target} APPEND PROPERTY PUBLIC_HEADER ${module_depends_header})
+            set_property(TARGET ${target} APPEND PROPERTY PRIVATE_HEADER "${module_headers_private}")
+        endif()
+        if (NOT ${arg_HEADER_MODULE})
+            set_property(TARGET "${target}" PROPERTY MODULE_HEADER "${module_include_dir}/${module}")
+        endif()
+
+        if(module_headers_qpa)
+            if(is_framework)
+                qt_copy_framework_headers(${target} QPA "${module_headers_qpa}")
+            else()
+                qt_install(
+                    FILES ${module_headers_qpa}
+                    DESTINATION ${INSTALL_INCLUDEDIR}/${module}/${PROJECT_VERSION}/${module}/qpa)
+            endif()
+        endif()
+    endif()
+
+    if(NOT arg_HEADER_MODULE)
+        # This property is used for super builds with static libraries. We use
+        # it in QtPlugins.cmake.in to avoid "polluting" the dependency chain
+        # for the target in it's project directory.
+        # E.g: When we process find_package(Qt6 ... Gui) in QtDeclarative, the
+        # rules in QtPugins.cmake add all the known Gui plugins as interface
+        # dependencies. This in turn causes circular dependencies on every
+        # plugin which links against Gui. Plugin A -> GUI -> Plugin A ....
+
+        set_target_properties(${target} PROPERTIES QT_BUILD_PROJECT_NAME ${PROJECT_NAME})
+        # Plugin types associated to a module
+        if(NOT "x${arg_PLUGIN_TYPES}" STREQUAL "x")
+            # Reset the variable containing the list of plugins for the given plugin type
+            foreach(plugin_type ${arg_PLUGIN_TYPES})
+                qt_get_sanitized_plugin_type("${plugin_type}" plugin_type)
+                set_property(TARGET "${target}" APPEND PROPERTY MODULE_PLUGIN_TYPES "${plugin_type}")
+                qt_internal_add_qt_repo_known_plugin_types("${plugin_type}")
+            endforeach()
+        endif()
+    endif()
+
+    qt_internal_library_deprecation_level(deprecation_define)
+
+    if(NOT arg_HEADER_MODULE)
+        qt_autogen_tools_initial_setup(${target})
+    endif()
+
+    set(private_includes
+        "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>"
+        "$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>"
+         ${arg_INCLUDE_DIRECTORIES}
+    )
+
+    set(public_includes "")
+    set(public_headers_list "public_includes")
+    if(is_framework)
+        set(public_headers_list "private_includes")
+        set(fw_bundle_subdir "${INSTALL_LIBDIR}/Qt${target}.framework")
+        set(fw_headers_subdir "Versions/${PROJECT_VERSION_MAJOR}/Headers")
+        list(APPEND public_includes
+            # Add the lib/Foo.framework dir as include path to let CMake generate
+            # the -F compiler flag.
+            "$<BUILD_INTERFACE:${QT_BUILD_DIR}/${fw_bundle_subdir}>"
+            "$<INSTALL_INTERFACE:${fw_bundle_subdir}>"
+
+            # Add the fully resolved Headers subdir, because the Headers symlink might
+            # not be there yet.
+            "$<BUILD_INTERFACE:${QT_BUILD_DIR}/${fw_bundle_subdir}/${fw_headers_subdir}>"
+
+            # After installing, the Headers symlink is guaranteed to exist.
+            "$<INSTALL_INTERFACE:${fw_bundle_subdir}/Headers>"
+            )
+    endif()
+
+    # Handle cases like QmlDevTools which do not have their own headers, but rather borrow them
+    # from another module.
+    if(NOT arg_NO_SYNC_QT AND NOT arg_NO_MODULE_HEADERS)
+        # Don't include private headers unless they exist, aka syncqt created them.
+        if(module_headers_private)
+            list(APPEND private_includes
+                        "$<BUILD_INTERFACE:${module_include_dir}/${PROJECT_VERSION}>"
+                        "$<BUILD_INTERFACE:${module_include_dir}/${PROJECT_VERSION}/${module}>")
+        endif()
+
+        list(APPEND ${public_headers_list}
+                    # For the syncqt headers
+                    "$<BUILD_INTERFACE:${module_repo_include_dir}>"
+                    "$<BUILD_INTERFACE:${module_include_dir}>")
+    endif()
+
+    if(NOT arg_NO_MODULE_HEADERS AND NOT arg_NO_SYNC_QT)
+        # For the syncqt headers
+        list(APPEND ${public_headers_list} "$<INSTALL_INTERFACE:${INSTALL_INCLUDEDIR}/${module}>")
+    endif()
+    list(APPEND ${public_headers_list} ${arg_PUBLIC_INCLUDE_DIRECTORIES})
+
+    set(header_module)
+    if(arg_HEADER_MODULE)
+        set(header_module "HEADER_MODULE")
+    endif()
+
+    qt_extend_target("${target}"
+        ${header_module}
+        SOURCES ${arg_SOURCES}
+        INCLUDE_DIRECTORIES
+            ${private_includes}
+        PUBLIC_INCLUDE_DIRECTORIES
+            ${public_includes}
+        PUBLIC_DEFINES
+            ${arg_PUBLIC_DEFINES}
+            QT_${module_define}_LIB
+        DEFINES
+            ${arg_DEFINES}
+            QT_NO_CAST_TO_ASCII QT_ASCII_CAST_WARNINGS
+            QT_MOC_COMPAT #we don't need warnings from calling moc code in our generated code
+            QT_USE_QSTRINGBUILDER
+            QT_DEPRECATED_WARNINGS
+            QT_BUILDING_QT
+            QT_BUILD_${module_define}_LIB ### FIXME: use QT_BUILD_ADDON for Add-ons or remove if we don't have add-ons anymore
+            "${deprecation_define}"
+        PUBLIC_LIBRARIES ${arg_PUBLIC_LIBRARIES}
+        LIBRARIES ${arg_LIBRARIES} Qt::PlatformModuleInternal
+        PRIVATE_MODULE_INTERFACE ${arg_PRIVATE_MODULE_INTERFACE}
+        FEATURE_DEPENDENCIES ${arg_FEATURE_DEPENDENCIES}
+        DBUS_ADAPTOR_SOURCES ${arg_DBUS_ADAPTOR_SOURCES}
+        DBUS_ADAPTOR_FLAGS ${arg_DBUS_ADAPTOR_FLAGS}
+        DBUS_INTERFACE_SOURCES ${arg_DBUS_INTERFACE_SOURCES}
+        DBUS_INTERFACE_FLAGS ${arg_DBUS_INTERFACE_FLAGS}
+        COMPILE_OPTIONS ${arg_COMPILE_OPTIONS}
+        PUBLIC_COMPILE_OPTIONS ${arg_PUBLIC_COMPILE_OPTIONS}
+        LINK_OPTIONS ${arg_LINK_OPTIONS}
+        PUBLIC_LINK_OPTIONS ${arg_PUBLIC_LINK_OPTIONS}
+        MOC_OPTIONS ${arg_MOC_OPTIONS}
+        ENABLE_AUTOGEN_TOOLS ${arg_ENABLE_AUTOGEN_TOOLS}
+        DISABLE_AUTOGEN_TOOLS ${arg_DISABLE_AUTOGEN_TOOLS}
+        PRECOMPILED_HEADER ${arg_PRECOMPILED_HEADER}
+        NO_PCH_SOURCES ${arg_NO_PCH_SOURCES}
+    )
+
+    if(NOT ${arg_EXCEPTIONS} AND NOT ${arg_HEADER_MODULE})
+        qt_internal_set_no_exceptions_flags("${target}")
+    endif()
+
+    set(configureFile "${CMAKE_CURRENT_SOURCE_DIR}/configure.cmake")
+    if(EXISTS "${configureFile}" AND NOT arg_NO_CONFIG_HEADER_FILE)
+        qt_feature_module_begin(
+            LIBRARY "${target}"
+            PUBLIC_FILE "qt${arg_CONFIG_MODULE_NAME}-config.h"
+            PRIVATE_FILE "qt${arg_CONFIG_MODULE_NAME}-config_p.h"
+            PUBLIC_DEPENDENCIES ${arg_FEATURE_DEPENDENCIES}
+            PRIVATE_DEPENDENCIES ${arg_FEATURE_DEPENDENCIES}
+        )
+        include(${configureFile})
+        qt_feature_module_end("${target}")
+
+        set_property(TARGET "${target}" APPEND PROPERTY PUBLIC_HEADER "${CMAKE_CURRENT_BINARY_DIR}/qt${arg_CONFIG_MODULE_NAME}-config.h")
+        set_property(TARGET "${target}" APPEND PROPERTY PRIVATE_HEADER "${CMAKE_CURRENT_BINARY_DIR}/qt${arg_CONFIG_MODULE_NAME}-config_p.h")
+    endif()
+
+    if(NOT arg_HEADER_MODULE)
+        if(DEFINED module_headers_private)
+            qt_internal_add_linker_version_script("${target}" PRIVATE_HEADERS ${module_headers_private} ${module_headers_qpa})
+        else()
+            qt_internal_add_linker_version_script("${target}")
+        endif()
+    endif()
+
+    # Handle injections. Aka create forwarding headers for certain headers that have been
+    # automatically generated in the build dir (for example qconfig.h, qtcore-config.h,
+    # qvulkanfunctions.h, etc)
+    # module_headers_injections come from the qt_read_headers_pri() call.
+    # extra_library_injections come from the qt_feature_module_end() call.
+    set(final_injections "")
+    if(module_headers_injections)
+        string(APPEND final_injections "${module_headers_injections} ")
+    endif()
+    if(extra_library_injections)
+        string(APPEND final_injections "${extra_library_injections} ")
+    endif()
+
+    if(final_injections)
+        qt_install_injections(${target} "${QT_BUILD_DIR}" "${QT_INSTALL_DIR}" ${final_injections})
+    endif()
+
+    # Handle creation of cmake files for consumers of find_package().
+    set(path_suffix "${INSTALL_CMAKE_NAMESPACE}${target}")
+    qt_path_join(config_build_dir ${QT_CONFIG_BUILD_DIR} ${path_suffix})
+    qt_path_join(config_install_dir ${QT_CONFIG_INSTALL_DIR} ${path_suffix})
+
+    set(extra_cmake_files)
+    set(extra_cmake_includes)
+    if (EXISTS "${CMAKE_CURRENT_LIST_DIR}/${INSTALL_CMAKE_NAMESPACE}${target}Macros.cmake")
+        list(APPEND extra_cmake_files "${CMAKE_CURRENT_LIST_DIR}/${INSTALL_CMAKE_NAMESPACE}${target}Macros.cmake")
+        list(APPEND extra_cmake_includes "${INSTALL_CMAKE_NAMESPACE}${target}Macros.cmake")
+    endif()
+    if (EXISTS "${CMAKE_CURRENT_LIST_DIR}/${INSTALL_CMAKE_NAMESPACE}${target}ConfigExtras.cmake.in")
+        configure_file("${CMAKE_CURRENT_LIST_DIR}/${INSTALL_CMAKE_NAMESPACE}${target}ConfigExtras.cmake.in"
+            "${config_build_dir}/${INSTALL_CMAKE_NAMESPACE}${target}ConfigExtras.cmake"
+            @ONLY)
+        list(APPEND extra_cmake_files "${config_build_dir}/${INSTALL_CMAKE_NAMESPACE}${target}ConfigExtras.cmake")
+        list(APPEND extra_cmake_includes "${INSTALL_CMAKE_NAMESPACE}${target}ConfigExtras.cmake")
+    endif()
+
+    foreach(cmake_file IN LISTS arg_EXTRA_CMAKE_FILES)
+        get_filename_component(basename ${cmake_file} NAME)
+        file(COPY ${cmake_file} DESTINATION ${config_build_dir})
+        list(APPEND extra_cmake_files "${config_build_dir}/${basename}")
+    endforeach()
+    list(APPEND extra_cmake_includes ${arg_EXTRA_CMAKE_INCLUDES})
+
+    set(extra_cmake_code "")
+
+    if(target STREQUAL Core)
+        # Propagate non-build related variables that are needed for consuming Qt packages.
+        # Do this in CoreConfig instead of Qt6Config, so that consumers can also use
+        # find_package(Qt6Core) instead of find_package(Qt6 COMPONENTS Core)
+        string(APPEND extra_cmake_code "
+set(QT_CMAKE_EXPORT_NAMESPACE ${QT_CMAKE_EXPORT_NAMESPACE})")
+    endif()
+
+    # Generate metatypes
+    set(QT_MODULE_HAS_META_TYPES_FILE FALSE)
+    if (${arg_GENERATE_METATYPES})
+        set(QT_MODULE_HAS_META_TYPES_FILE TRUE)
+        set(metatypes_install_dir ${INSTALL_LIBDIR}/metatypes)
+        set(args)
+        if (NOT QT_WILL_INSTALL)
+            set(args COPY_OVER_INSTALL INSTALL_DIR "${QT_BUILD_DIR}/${metatypes_install_dir}")
+        else()
+            set(args INSTALL_DIR "${metatypes_install_dir}")
+        endif()
+        qt6_generate_meta_types_json_file(${target} ${args})
+    endif()
+    configure_package_config_file(
+        "${QT_CMAKE_DIR}/QtModuleConfig.cmake.in"
+        "${config_build_dir}/${INSTALL_CMAKE_NAMESPACE}${target}Config.cmake"
+        INSTALL_DESTINATION "${config_install_dir}"
+    )
+
+    if (EXISTS "${CMAKE_CURRENT_LIST_DIR}/${INSTALL_CMAKE_NAMESPACE}${target}BuildInternals.cmake")
+        configure_file("${CMAKE_CURRENT_LIST_DIR}/${INSTALL_CMAKE_NAMESPACE}${target}BuildInternals.cmake"
+            "${config_build_dir}/${INSTALL_CMAKE_NAMESPACE}${target}BuildInternals.cmake"
+            @ONLY)
+        list(APPEND extra_cmake_files "${config_build_dir}/${INSTALL_CMAKE_NAMESPACE}${target}BuildInternals.cmake")
+    endif()
+
+    write_basic_package_version_file(
+        "${config_build_dir}/${INSTALL_CMAKE_NAMESPACE}${target}ConfigVersion.cmake"
+        VERSION ${PROJECT_VERSION}
+        COMPATIBILITY AnyNewerVersion
+    )
+    qt_install(FILES
+        "${config_build_dir}/${INSTALL_CMAKE_NAMESPACE}${target}Config.cmake"
+        "${config_build_dir}/${INSTALL_CMAKE_NAMESPACE}${target}ConfigVersion.cmake"
+        ${extra_cmake_files}
+        DESTINATION "${config_install_dir}"
+        COMPONENT Devel
+    )
+
+    file(COPY ${extra_cmake_files} DESTINATION "${config_build_dir}")
+    set(exported_targets ${target})
+    if(NOT ${arg_NO_PRIVATE_MODULE})
+        list(APPEND exported_targets ${target_private})
+    endif()
+    set(export_name "${INSTALL_CMAKE_NAMESPACE}${target}Targets")
+    qt_install(TARGETS ${exported_targets}
+        EXPORT ${export_name}
+        RUNTIME DESTINATION ${INSTALL_BINDIR}
+        LIBRARY DESTINATION ${INSTALL_LIBDIR}
+        ARCHIVE DESTINATION ${INSTALL_LIBDIR}
+        FRAMEWORK DESTINATION ${INSTALL_LIBDIR}
+        PUBLIC_HEADER DESTINATION ${INSTALL_INCLUDEDIR}/${module}
+        PRIVATE_HEADER DESTINATION ${INSTALL_INCLUDEDIR}/${module}/${PROJECT_VERSION}/${module}/private
+        )
+
+    if (ANDROID AND NOT arg_HEADER_MODULE)
+        # Record install library location so it can be accessed by
+        # qt_android_dependencies without having to specify it again.
+        set_target_properties(${target} PROPERTIES
+            QT_ANDROID_MODULE_INSTALL_DIR ${INSTALL_LIBDIR})
+    endif()
+
+    qt_install(EXPORT ${export_name}
+               NAMESPACE ${QT_CMAKE_EXPORT_NAMESPACE}::
+               DESTINATION ${config_install_dir})
+
+    qt_internal_export_modern_cmake_config_targets_file(
+        TARGETS ${exported_targets}
+        EXPORT_NAME_PREFIX ${INSTALL_CMAKE_NAMESPACE}${target}
+        CONFIG_INSTALL_DIR "${config_install_dir}")
+
+    if (${arg_INTERNAL_MODULE})
+        set(arg_INTERNAL_MODULE "INTERNAL_MODULE")
+    else()
+        unset(arg_INTERNAL_MODULE)
+    endif()
+
+    qt_path_join(pri_target_path ${PROJECT_BINARY_DIR} ${INSTALL_MKSPECSDIR}/modules)
+    qt_generate_module_pri_file("${target}" "${pri_target_path}" module_pri_files
+        ${arg_INTERNAL_MODULE}
+        ${header_module}
+        QMAKE_MODULE_CONFIG
+            ${arg_QMAKE_MODULE_CONFIG}
+        )
+    qt_install(FILES "${module_pri_files}" DESTINATION ${INSTALL_MKSPECSDIR}/modules)
+
+    ### fixme: cmake is missing a built-in variable for this. We want to apply it only to modules and plugins
+    # that belong to Qt.
+    if(NOT arg_HEADER_MODULE)
+        qt_internal_add_link_flags_no_undefined("${target}")
+    endif()
+
+    set(interface_includes "")
+
+    # Handle cases like QmlDevTools which do not have their own headers, but rather borrow them
+    # from another module.
+    if(NOT arg_NO_SYNC_QT)
+        list(APPEND interface_includes "$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>")
+
+        # syncqt.pl does not create a private header directory like 'include/6.0/QtFoo' unless
+        # the module has foo_p.h header files. For QtZlib, there are no such private headers, so we
+        # need to make sure not to add such include paths unless the directory exists, otherwise
+        # consumers of the module will fail at CMake generation time stating that
+        # INTERFACE_INCLUDE_DIRECTORIES contains a non-existent path.
+        if(NOT arg_NO_MODULE_HEADERS
+                AND EXISTS "${module_include_dir}/${PROJECT_VERSION}/${module}")
+            list(APPEND interface_includes
+                        "$<BUILD_INTERFACE:${module_include_dir}/${PROJECT_VERSION}>"
+                        "$<BUILD_INTERFACE:${module_include_dir}/${PROJECT_VERSION}/${module}>")
+
+            if(is_framework)
+                set(fw_headers_dir
+                    "${INSTALL_LIBDIR}/${module}.framework/Headers/")
+                list(APPEND interface_includes
+                            "$<INSTALL_INTERFACE:${fw_headers_dir}${PROJECT_VERSION}>"
+                            "$<INSTALL_INTERFACE:${fw_headers_dir}${PROJECT_VERSION}/${module}>")
+            else()
+                list(APPEND interface_includes
+                            "$<INSTALL_INTERFACE:${INSTALL_INCLUDEDIR}/${module}/${PROJECT_VERSION}>"
+                            "$<INSTALL_INTERFACE:${INSTALL_INCLUDEDIR}/${module}/${PROJECT_VERSION}/${module}>")
+            endif()
+        endif()
+    endif()
+
+    if(NOT ${arg_NO_PRIVATE_MODULE})
+        target_include_directories("${target_private}" INTERFACE ${interface_includes})
+    endif()
+
+    if(is_framework AND NOT is_interface_lib)
+        qt_finalize_framework_headers_copy(${target})
+    endif()
+
+    qt_describe_module(${target})
+
+endfunction()
+
+function(qt_export_tools module_name)
+    # If no tools were defined belonging to this module, don't create a config and targets file.
+    # Guards against the case when doing a cross-build.
+
+    if(NOT "${module_name}" IN_LIST QT_KNOWN_MODULES_WITH_TOOLS OR CMAKE_CROSSCOMPILING)
+        return()
+    endif()
+
+    # The tools target name. For example: CoreTools
+    set(target "${module_name}Tools")
+
+    set(path_suffix "${INSTALL_CMAKE_NAMESPACE}${target}")
+    qt_path_join(config_build_dir ${QT_CONFIG_BUILD_DIR} ${path_suffix})
+    qt_path_join(config_install_dir ${QT_CONFIG_INSTALL_DIR} ${path_suffix})
+
+    # Add the extra cmake statements to make the tool targets global, so it doesn't matter where
+    # find_package is called.
+    # Also assemble a list of tool targets to expose in the config file for informational purposes.
+    set(extra_cmake_statements "")
+    set(tool_targets "")
+    set(tool_targets_non_prefixed "")
+
+    # List of package dependencies that need be find_package'd when using the Tools package.
+    set(package_deps "")
+
+    foreach(tool_name ${QT_KNOWN_MODULE_${module_name}_TOOLS})
+        # Specific tools can have package dependencies.
+        # e.g. qtwaylandscanner depends on WaylandScanner (non-qt package).
+        get_target_property(extra_packages "${tool_name}" QT_EXTRA_PACKAGE_DEPENDENCIES)
+        if(extra_packages)
+            list(APPEND package_deps "${extra_packages}")
+        endif()
+
+        set(extra_cmake_statements "${extra_cmake_statements}
+if (NOT QT_NO_CREATE_TARGETS)
+    get_property(is_global TARGET ${INSTALL_CMAKE_NAMESPACE}::${tool_name} PROPERTY IMPORTED_GLOBAL)
+    if(NOT is_global)
+        set_property(TARGET ${INSTALL_CMAKE_NAMESPACE}::${tool_name} PROPERTY IMPORTED_GLOBAL TRUE)
+    endif()
+endif()
+")
+        list(APPEND tool_targets "${QT_CMAKE_EXPORT_NAMESPACE}::${tool_name}")
+        list(APPEND tool_targets_non_prefixed "${tool_name}")
+    endforeach()
+
+    string(APPEND extra_cmake_statements
+"set(${QT_CMAKE_EXPORT_NAMESPACE}${module_name}Tools_TARGETS \"${tool_targets}\")")
+
+    # Extract package dependencies that were determined in QtPostProcess, but only if ${module_name}
+    # is an actual target.
+    # module_name can be a non-existent target, if the tool doesn't have an existing associated
+    # module, e.g. qtwaylandscanner.
+    if(TARGET "${module_name}")
+        get_target_property(module_package_deps "${module_name}" _qt_tools_package_deps)
+        if(module_package_deps)
+            list(APPEND package_deps "${module_package_deps}")
+        endif()
+    endif()
+
+    # Configure and install dependencies file for the ${module_name}Tools package.
+    configure_file(
+        "${QT_CMAKE_DIR}/QtModuleToolsDependencies.cmake.in"
+        "${config_build_dir}/${INSTALL_CMAKE_NAMESPACE}${target}Dependencies.cmake"
+        @ONLY
+    )
+
+    qt_install(FILES
+        "${config_build_dir}/${INSTALL_CMAKE_NAMESPACE}${target}Dependencies.cmake"
+        DESTINATION "${config_install_dir}"
+        COMPONENT Devel
+    )
+
+    # Configure and install the ${module_name}Tools package Config file.
+    configure_package_config_file(
+        "${QT_CMAKE_DIR}/QtModuleToolsConfig.cmake.in"
+        "${config_build_dir}/${INSTALL_CMAKE_NAMESPACE}${target}Config.cmake"
+        INSTALL_DESTINATION "${config_install_dir}"
+    )
+    write_basic_package_version_file(
+        "${config_build_dir}/${INSTALL_CMAKE_NAMESPACE}${target}ConfigVersion.cmake"
+        VERSION ${PROJECT_VERSION}
+        COMPATIBILITY AnyNewerVersion
+    )
+
+    qt_install(FILES
+        "${config_build_dir}/${INSTALL_CMAKE_NAMESPACE}${target}Config.cmake"
+        "${config_build_dir}/${INSTALL_CMAKE_NAMESPACE}${target}ConfigVersion.cmake"
+        DESTINATION "${config_install_dir}"
+        COMPONENT Devel
+    )
+
+    set(export_name "${INSTALL_CMAKE_NAMESPACE}${target}Targets")
+    qt_install(EXPORT "${export_name}"
+               NAMESPACE "${QT_CMAKE_EXPORT_NAMESPACE}::"
+               DESTINATION "${config_install_dir}")
+
+
+    # Create versionless targets file.
+    configure_file(
+        "${QT_CMAKE_DIR}/QtModuleToolsVersionlessTargets.cmake.in"
+        "${config_build_dir}/${INSTALL_CMAKE_NAMESPACE}${target}VersionlessTargets.cmake"
+        @ONLY
+    )
+
+    qt_install(FILES
+        "${config_build_dir}/${INSTALL_CMAKE_NAMESPACE}${target}VersionlessTargets.cmake"
+        DESTINATION "${config_install_dir}"
+        COMPONENT Devel
+    )
+endfunction()
+
+# This function records a dependency between ${target_name} and ${dep_package_name}.
+# at the CMake package level.
+# E.g. The Tools package that provides the qtwaylandscanner target
+# needs to call find_package(WaylandScanner) (non-qt-package).
+# main_target_name = qtwaylandscanner
+# dep_package_name = WaylandScanner
+function(qt_record_extra_package_dependency main_target_name dep_package_name dep_package_version)
+    get_target_property(extra_packages "${main_target_name}" QT_EXTRA_PACKAGE_DEPENDENCIES)
+    if(NOT extra_packages)
+        set(extra_packages "")
+    endif()
+
+    list(APPEND extra_packages "${dep_package_name}\;${dep_package_version}")
+    set_target_properties("${main_target_name}" PROPERTIES QT_EXTRA_PACKAGE_DEPENDENCIES
+                                                           "${extra_packages}")
+endfunction()
+
+# This function records a dependency between ${main_target_name} and ${dep_target_name}
+# at the CMake package level.
+# E.g. Qt6CoreConfig.cmake needs to find_package(Qt6WinMain).
+# main_target_name = Core
+# dep_target_name = WinMain
+# This is just a convenience function that deals with Qt targets and their associated packages
+# instead of raw package names.
+function(qt_record_extra_qt_package_dependency main_target_name dep_target_name
+                                                                dep_package_version)
+    # WinMain -> Qt6WinMain.
+    qt_internal_module_info(qtfied_target_name "${dep_target_name}")
+    qt_record_extra_package_dependency("${main_target_name}" "${qtfied_target_name_versioned}"
+                                                             "${dep_package_version}")
+endfunction()
+
+function(qt_internal_check_directory_or_type name dir type default result_var)
+    if ("x${dir}" STREQUAL x)
+        if("x${type}" STREQUAL x)
+            message(FATAL_ERROR "qt_add_plugin called without setting either TYPE or ${name}.")
+        endif()
+        set(${result_var} "${default}" PARENT_SCOPE)
+    else()
+        set(${result_var} "${dir}" PARENT_SCOPE)
+    endif()
+endfunction()
+
+# Utility function to find the module to which a plug-in belongs.
+# This will set the QT_MODULE target property on the plug-in - e.g. "Gui", "Sql"...
+function(qt_get_module_for_plugin target target_type)
+    qt_internal_get_qt_all_known_modules(known_modules)
+
+    qt_get_sanitized_plugin_type("${target_type}" target_type)
+    foreach(qt_module ${known_modules})
+        get_target_property(module_type "${QT_CMAKE_EXPORT_NAMESPACE}::${qt_module}" TYPE)
+        # Assuming interface libraries can't have plugins. Otherwise we'll need to fix the property
+        # name, because the current one would be invalid for interface libraries.
+        if(module_type STREQUAL "INTERFACE_LIBRARY")
+            continue()
+        endif()
+
+        get_target_property(plugin_types
+                           "${QT_CMAKE_EXPORT_NAMESPACE}::${qt_module}"
+                            MODULE_PLUGIN_TYPES)
+        if(plugin_types)
+            foreach(plugin_type ${plugin_types})
+                if("${target_type}" STREQUAL "${plugin_type}")
+                    set_target_properties("${target}" PROPERTIES QT_MODULE "${qt_module}")
+                    return()
+                endif()
+            endforeach()
+        endif()
+    endforeach()
+    message(AUTHOR_WARNING "The plug-in '${target}' does not belong to any Qt module.")
+endfunction()
+
+
+# Collection of qt_add_plugin arguments so they can be shared across different
+# plugin type wrappers
+set(__qt_add_plugin_optional_args
+    "STATIC;EXCEPTIONS;ALLOW_UNDEFINED_SYMBOLS"
+)
+set(__qt_add_plugin_single_args
+    "TYPE;CLASS_NAME;OUTPUT_DIRECTORY;INSTALL_DIRECTORY;ARCHIVE_INSTALL_DIRECTORY;QML_TARGET_PATH;OUTPUT_NAME"
+)
+set(__qt_add_plugin_multi_args
+    "${__default_private_args};${__default_public_args};DEFAULT_IF"
+)
+# This is the main entry point for defining Qt plugins.
+# A CMake target is created with the given target. The TYPE parameter is needed to place the
+# plugin into the correct plugins/ sub-directory.
+function(qt_add_plugin target)
+    qt_internal_module_info(module "${target}")
+
+    qt_internal_set_qt_known_plugins("${QT_KNOWN_PLUGINS}" "${target}")
+
+    qt_parse_all_arguments(arg "qt_add_plugin"
+        "${__qt_add_plugin_optional_args};SKIP_INSTALL"
+        "${__qt_add_plugin_single_args}"
+        "${__qt_add_plugin_multi_args}"
+        "${ARGN}"
+    )
+
+    qt_get_sanitized_plugin_type("${arg_TYPE}" arg_TYPE)
+
+    set(output_directory_default "${QT_BUILD_DIR}/${INSTALL_PLUGINSDIR}/${arg_TYPE}")
+    set(install_directory_default "${INSTALL_PLUGINSDIR}/${arg_TYPE}")
+    set(archive_install_directory_default "${INSTALL_LIBDIR}/${arg_TYPE}")
+
+    if (arg_QML_TARGET_PATH)
+        set(target_path "${arg_QML_TARGET_PATH}")
+        set(output_directory_default "${QT_BUILD_DIR}/${INSTALL_QMLDIR}/${target_path}")
+        set(install_directory_default "${INSTALL_QMLDIR}/${target_path}")
+        set(archive_install_directory_default "${INSTALL_QMLDIR}/${target_path}")
+    endif()
+
+    # Derive the class name from the target name if it's not explicitly specified.
+    # Don't set it for qml plugins though.
+    set(plugin_class_name "")
+    if (NOT arg_CLASS_NAME AND NOT "${arg_TYPE}" STREQUAL "qml_plugin")
+        set(plugin_class_name "${target}")
+    endif()
+
+    qt_internal_check_directory_or_type(OUTPUT_DIRECTORY "${arg_OUTPUT_DIRECTORY}" "${arg_TYPE}"
+        "${output_directory_default}" output_directory)
+    if (NOT arg_SKIP_INSTALL)
+        qt_internal_check_directory_or_type(INSTALL_DIRECTORY "${arg_INSTALL_DIRECTORY}" "${arg_TYPE}"
+            "${install_directory_default}" install_directory)
+        if (NOT arg_ARCHIVE_INSTALL_DIRECTORY AND arg_INSTALL_DIRECTORY)
+            set(arg_ARCHIVE_INSTALL_DIRECTORY "${arg_INSTALL_DIRECTORY}")
+        endif()
+    endif()
+
+    if(arg_STATIC OR NOT BUILD_SHARED_LIBS)
+        add_library("${target}" STATIC)
+    else()
+        add_library("${target}" MODULE)
+        if(APPLE)
+            # CMake defaults to using .so extensions for loadable modules, aka plugins,
+            # but Qt plugins are actually suffixed with .dylib.
+            set_property(TARGET "${target}" PROPERTY SUFFIX ".dylib")
+        endif()
+    endif()
+
+    # Make sure the Qt6 plugin library names are like they were in Qt5 qmake land.
+    # Whereas the Qt6 CMake target names are like the Qt5 CMake target names.
+    set(output_name "${target}")
+    if(arg_OUTPUT_NAME)
+        set(output_name "${arg_OUTPUT_NAME}")
+    endif()
+    set_property(TARGET "${target}" PROPERTY OUTPUT_NAME "${output_name}")
+
+    # Add a custom target with the Qt5 qmake name for a more user friendly ninja experience.
+    if(arg_OUTPUT_NAME AND NOT TARGET "${output_name}")
+        add_custom_target("${output_name}")
+        add_dependencies("${output_name}" "${target}")
+    endif()
+
+    if (ANDROID)
+        qt_android_apply_arch_suffix("${target}")
+        set_target_properties(${target}
+            PROPERTIES
+            LIBRARY_OUTPUT_NAME "plugins_${arg_TYPE}_${output_name}"
+        )
+    endif()
+    qt_internal_add_target_aliases("${target}")
+    qt_skip_warnings_are_errors_when_repo_unclean("${target}")
+
+    # Disable linking of plugins against other plugins during static regular and
+    # super builds. The latter causes cyclic dependencies otherwise.
+    set_target_properties(${target} PROPERTIES QT_DEFAULT_PLUGINS 0)
+
+    set_target_properties("${target}" PROPERTIES
+        LIBRARY_OUTPUT_DIRECTORY "${output_directory}"
+        RUNTIME_OUTPUT_DIRECTORY "${output_directory}"
+        ARCHIVE_OUTPUT_DIRECTORY "${output_directory}"
+        QT_PLUGIN_CLASS_NAME "${plugin_class_name}")
+        qt_handle_multi_config_output_dirs("${target}")
+
+    qt_internal_library_deprecation_level(deprecation_define)
+
+    qt_autogen_tools_initial_setup(${target})
+
+    set(static_plugin_define "")
+    if (arg_STATIC OR NOT QT_BUILD_SHARED_LIBS)
+        set(static_plugin_define "QT_STATICPLUGIN")
+    endif()
+
+    # Save the Qt module in the plug-in's properties
+    if(NOT arg_TYPE STREQUAL "qml_plugin")
+        qt_get_module_for_plugin("${target}" "${arg_TYPE}")
+        get_target_property(qt_module "${target}" QT_MODULE)
+    endif()
+
+    # Add the plug-in to the list of plug-ins of this module
+    if(TARGET "${qt_module}")
+        set_property(TARGET "${qt_module}" APPEND PROPERTY QT_PLUGINS "${target}")
+    endif()
+
+    set(_default_plugin 1)
+    if (DEFINED arg_DEFAULT_IF)
+      if (NOT ${arg_DEFAULT_IF})
+          set(_default_plugin 0)
+      endif()
+    endif()
+
+    set_property(TARGET "${target}" PROPERTY QT_DEFAULT_PLUGIN "${_default_plugin}")
+    set_property(TARGET "${target}" APPEND PROPERTY EXPORT_PROPERTIES "QT_PLUGIN_CLASS_NAME;QT_PLUGIN_TYPE;QT_MODULE;QT_DEFAULT_PLUGIN")
+
+    set(private_includes
+        "${CMAKE_CURRENT_SOURCE_DIR}"
+        "${CMAKE_CURRENT_BINARY_DIR}"
+         # For the syncqt headers
+        "$<BUILD_INTERFACE:${module_repo_include_dir}>"
+         ${arg_INCLUDE_DIRECTORIES}
+    )
+
+    set(public_includes
+        ${arg_PUBLIC_INCLUDE_DIRECTORIES}
+    )
+
+    qt_extend_target("${target}"
+        SOURCES ${arg_SOURCES}
+        INCLUDE_DIRECTORIES
+            ${private_includes}
+        PUBLIC_INCLUDE_DIRECTORIES
+            ${public_includes}
+        LIBRARIES ${arg_LIBRARIES} Qt::PlatformPluginInternal
+        PUBLIC_LIBRARIES ${arg_PUBLIC_LIBRARIES}
+        DEFINES
+            ${arg_DEFINES}
+            QT_DEPRECATED_WARNINGS
+            "${deprecation_define}"
+            "${static_plugin_define}"
+            QT_PLUGIN
+        PUBLIC_DEFINES
+            QT_${module_define}_LIB
+            ${arg_PUBLIC_DEFINES}
+        FEATURE_DEPENDENCIES ${arg_FEATURE_DEPENDENCIES}
+        DBUS_ADAPTOR_SOURCES "${arg_DBUS_ADAPTOR_SOURCES}"
+        DBUS_ADAPTOR_FLAGS "${arg_DBUS_ADAPTOR_FLAGS}"
+        DBUS_INTERFACE_SOURCES "${arg_DBUS_INTERFACE_SOURCES}"
+        DBUS_INTERFACE_FLAGS "${arg_DBUS_INTERFACE_FLAGS}"
+        COMPILE_OPTIONS ${arg_COMPILE_OPTIONS}
+        PUBLIC_COMPILE_OPTIONS ${arg_PUBLIC_COMPILE_OPTIONS}
+        LINK_OPTIONS ${arg_LINK_OPTIONS}
+        PUBLIC_LINK_OPTIONS ${arg_PUBLIC_LINK_OPTIONS}
+        MOC_OPTIONS ${arg_MOC_OPTIONS}
+        ENABLE_AUTOGEN_TOOLS ${arg_ENABLE_AUTOGEN_TOOLS}
+        DISABLE_AUTOGEN_TOOLS ${arg_DISABLE_AUTOGEN_TOOLS}
+    )
+    if(NOT ${arg_EXCEPTIONS})
+        qt_internal_set_no_exceptions_flags("${target}")
+    endif()
+
+
+    set(qt_libs_private "")
+    qt_internal_get_qt_all_known_modules(known_modules)
+    foreach(it ${known_modules})
+        list(FIND arg_LIBRARIES "Qt::${it}Private" pos)
+        if(pos GREATER -1)
+            list(APPEND qt_libs_private "Qt::${it}Private")
+        endif()
+    endforeach()
+
+    qt_register_target_dependencies("${target}" "${arg_PUBLIC_LIBRARIES}" "${qt_libs_private}")
+
+    if (NOT arg_SKIP_INSTALL)
+        # Handle creation of cmake files for consumers of find_package().
+        # If we are part of a Qt module, the plugin cmake files are installed as part of that module.
+        if(qt_module)
+            set(path_suffix "${INSTALL_CMAKE_NAMESPACE}${qt_module}")
+        else()
+            set(path_suffix "${INSTALL_CMAKE_NAMESPACE}${target}")
+        endif()
+
+        qt_path_join(config_build_dir ${QT_CONFIG_BUILD_DIR} ${path_suffix})
+        qt_path_join(config_install_dir ${QT_CONFIG_INSTALL_DIR} ${path_suffix})
+
+        configure_package_config_file(
+            "${QT_CMAKE_DIR}/QtPluginConfig.cmake.in"
+            "${config_build_dir}/${target}Config.cmake"
+            INSTALL_DESTINATION "${config_install_dir}"
+        )
+        write_basic_package_version_file(
+            "${config_build_dir}/${target}ConfigVersion.cmake"
+            VERSION ${PROJECT_VERSION}
+            COMPATIBILITY AnyNewerVersion
+        )
+
+        qt_install(FILES
+            "${config_build_dir}/${target}Config.cmake"
+            "${config_build_dir}/${target}ConfigVersion.cmake"
+            DESTINATION "${config_install_dir}"
+            COMPONENT Devel
+        )
+
+        # Make the export name of plugins be consistent with modules, so that
+        # qt_add_resource adds its additional targets to the same export set in a static Qt build.
+        set(export_name "${INSTALL_CMAKE_NAMESPACE}${target}Targets")
+        qt_install(TARGETS "${target}"
+                   EXPORT ${export_name}
+                   RUNTIME DESTINATION "${install_directory}"
+                   LIBRARY DESTINATION "${install_directory}"
+                   ARCHIVE DESTINATION "${archive_install_directory}"
+        )
+        qt_install(EXPORT ${export_name}
+                   NAMESPACE ${QT_CMAKE_EXPORT_NAMESPACE}::
+                   DESTINATION "${config_install_dir}"
+        )
+    endif()
+
+    # Store the plug-in type in the target property
+    set_property(TARGET "${target}" PROPERTY QT_PLUGIN_TYPE "${arg_TYPE}")
+
+    if (NOT arg_ALLOW_UNDEFINED_SYMBOLS)
+        ### fixme: cmake is missing a built-in variable for this. We want to apply it only to
+        # modules and plugins that belong to Qt.
+        qt_internal_add_link_flags_no_undefined("${target}")
+    endif()
+
+    qt_internal_add_linker_version_script(${target})
+endfunction()
+
+function(qt_install_qml_files target)
+
+    qt_parse_all_arguments(arg "qt_install_qml_files"
+        "" "" "FILES" ${ARGN}
+    )
+
+    if (NOT arg_FILES)
+        message(FATAL_ERROR "No files specified for qt_install_qml_files. Please specify them using the FILES parameter.")
+    endif()
+
+    get_target_property(target_path ${target} QT_QML_MODULE_TARGET_PATH)
+    if (NOT target_path)
+        message(FATAL_ERROR "Target ${target} is not a qml module.")
+    endif()
+
+    qt_path_join(qml_module_install_dir ${QT_INSTALL_DIR} "${INSTALL_QMLDIR}/${target_path}")
+    qt_copy_or_install(FILES ${arg_FILES}
+        DESTINATION ${qml_module_install_dir}
+    )
+
+endfunction()
+
+
+function(qt_add_resource target resourceName)
+    # Don't try to add resources when cross compiling, and the target is actually a host target
+    # (like a tool).
+    qt_is_imported_target("${target}" is_imported)
+    if(is_imported)
+        return()
+    endif()
+
+    qt_parse_all_arguments(arg "qt_add_resource" "" "PREFIX;LANG;BASE" "FILES" ${ARGN})
+
+    QT6_PROCESS_RESOURCE(${target} ${resourceName}
+        PREFIX "${arg_PREFIX}"
+        LANG "${arg_LANG}"
+        BASE "${arg_BASE}"
+        FILES ${arg_FILES}
+        OUTPUT_TARGETS out_targets
+   )
+
+   if (out_targets)
+        qt_install(TARGETS ${out_targets}
+            EXPORT "${INSTALL_CMAKE_NAMESPACE}${target}Targets"
+            DESTINATION ${INSTALL_LIBDIR}
+        )
+   endif()
+
+endfunction()
+
+# Collection of qt_add_executable arguments so they can be shared across qt_add_executable
+# and qt_add_test_helper.
+set(__qt_add_executable_optional_args
+    "GUI;BOOTSTRAP;NO_QT;NO_INSTALL;EXCEPTIONS"
+)
+set(__qt_add_executable_single_args
+    "OUTPUT_DIRECTORY;INSTALL_DIRECTORY;VERSION"
+)
+set(__qt_add_executable_multi_args
+    "EXE_FLAGS;${__default_private_args};${__default_public_args}"
+)
+
+# This function creates a CMake target for a generic console or GUI binary.
+# Please consider to use a more specific version target like the one created
+# by qt_add_test or qt_add_tool below.
+function(qt_add_executable name)
+    qt_parse_all_arguments(arg "qt_add_executable"
+        "${__qt_add_executable_optional_args}"
+        "${__qt_add_executable_single_args}"
+        "${__qt_add_executable_multi_args}"
+        ${ARGN})
+
+    if ("x${arg_OUTPUT_DIRECTORY}" STREQUAL "x")
+        set(arg_OUTPUT_DIRECTORY "${QT_BUILD_DIR}/${INSTALL_BINDIR}")
+    endif()
+
+    get_filename_component(arg_OUTPUT_DIRECTORY "${arg_OUTPUT_DIRECTORY}"
+        ABSOLUTE BASE_DIR "${QT_BUILD_DIR}")
+
+    if ("x${arg_INSTALL_DIRECTORY}" STREQUAL "x")
+        set(arg_INSTALL_DIRECTORY "${INSTALL_BINDIR}")
+    endif()
+
+    if (ANDROID)
+        add_library("${name}" MODULE)
+        qt_android_apply_arch_suffix("${name}")
+        qt_android_generate_deployment_settings("${name}")
+        qt_android_add_apk_target("${name}")
+        # On our qmake builds we don't compile the executables with
+        # visibility=hidden. Not having this flag set will cause the
+        # executable to have main() hidden and can then no longer be loaded
+        # through dlopen()
+        set_property(TARGET ${name} PROPERTY C_VISIBILITY_PRESET default)
+        set_property(TARGET ${name} PROPERTY CXX_VISIBILITY_PRESET default)
+    else()
+        add_executable("${name}" ${arg_EXE_FLAGS})
+    endif()
+
+    if (arg_VERSION)
+
+        if(arg_VERSION MATCHES "[0-9]+\\.[0-9]+\\.[0-9]+\\.[0-9]+")
+            # nothing to do
+        elseif(arg_VERSION MATCHES "[0-9]+\\.[0-9]+\\.[0-9]+")
+            set(arg_VERSION "${arg_VERSION}.0")
+        elseif(arg_VERSION MATCHES "[0-9]+\\.[0-9]+")
+            set(arg_VERSION "${arg_VERSION}.0.0")
+        elseif (arg_VERSION MATCHES "[0-9]+")
+            set(arg_VERSION "${arg_VERSION}.0.0.0")
+        else()
+            message(FATAL_ERROR "Invalid version format")
+        endif()
+
+        set_target_properties(${name} PROPERTIES QT_TARGET_VERSION "${arg_VERSION}")
+    endif()
+
+    if (WIN32)
+        qt6_generate_win32_rc_file(${name})
+    endif()
+
+    qt_autogen_tools_initial_setup(${name})
+    qt_skip_warnings_are_errors_when_repo_unclean("${name}")
+
+    set(extra_libraries "")
+    if(NOT arg_BOOTSTRAP AND NOT arg_NO_QT)
+        set(extra_libraries "Qt::Core")
+    endif()
+
+    set(private_includes
+        "${CMAKE_CURRENT_SOURCE_DIR}"
+        "${CMAKE_CURRENT_BINARY_DIR}"
+         ${arg_INCLUDE_DIRECTORIES}
+    )
+
+    qt_extend_target("${name}"
+        SOURCES ${arg_SOURCES}
+        INCLUDE_DIRECTORIES ${private_includes}
+        DEFINES ${arg_DEFINES}
+        LIBRARIES ${arg_LIBRARIES} Qt::PlatformCommonInternal
+        PUBLIC_LIBRARIES ${extra_libraries} ${arg_PUBLIC_LIBRARIES}
+        DBUS_ADAPTOR_SOURCES "${arg_DBUS_ADAPTOR_SOURCES}"
+        DBUS_ADAPTOR_FLAGS "${arg_DBUS_ADAPTOR_FLAGS}"
+        DBUS_INTERFACE_SOURCES "${arg_DBUS_INTERFACE_SOURCES}"
+        DBUS_INTERFACE_FLAGS "${arg_DBUS_INTERFACE_FLAGS}"
+        COMPILE_OPTIONS ${arg_COMPILE_OPTIONS}
+        LINK_OPTIONS ${arg_LINK_OPTIONS}
+        MOC_OPTIONS ${arg_MOC_OPTIONS}
+        ENABLE_AUTOGEN_TOOLS ${arg_ENABLE_AUTOGEN_TOOLS}
+        DISABLE_AUTOGEN_TOOLS ${arg_DISABLE_AUTOGEN_TOOLS}
+    )
+    set_target_properties("${name}" PROPERTIES
+        RUNTIME_OUTPUT_DIRECTORY "${arg_OUTPUT_DIRECTORY}"
+        LIBRARY_OUTPUT_DIRECTORY "${arg_OUTPUT_DIRECTORY}"
+        WIN32_EXECUTABLE "${arg_GUI}"
+        MACOSX_BUNDLE "${arg_GUI}"
+    )
+    if(NOT ${arg_EXCEPTIONS})
+        qt_internal_set_no_exceptions_flags("${name}")
+    endif()
+
+
+    if(NOT arg_NO_INSTALL)
+        qt_install(TARGETS "${name}"
+            RUNTIME DESTINATION "${arg_INSTALL_DIRECTORY}"
+            LIBRARY DESTINATION "${arg_INSTALL_DIRECTORY}"
+            BUNDLE DESTINATION "${arg_INSTALL_DIRECTORY}")
+    endif()
+endfunction()
+
+# Simple wrapper around qt_add_executable for benchmarks which insure that
+# the binary is built under ${CMAKE_CURRENT_BINARY_DIR} and never installed.
+# See qt_add_executable() for more details.
+function(qt_add_benchmark target)
+
+    qt_parse_all_arguments(arg "qt_add_benchmark"
+        "${__qt_add_executable_optional_args}"
+        "${__qt_add_executable_single_args}"
+        "${__qt_add_executable_multi_args}"
+        ${ARGN}
+    )
+
+    qt_remove_args(exec_args
+        ARGS_TO_REMOVE
+            ${target}
+            OUTPUT_DIRECTORY
+            INSTALL_DIRECTORY
+        ALL_ARGS
+            "${__qt_add_executable_optional_args}"
+            "${__qt_add_executable_single_args}"
+            "${__qt_add_executable_multi_args}"
+        ARGS
+            ${ARGV}
+    )
+
+    qt_add_executable(${target}
+        NO_INSTALL # we don't install benchmarks
+        OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}" # avoid polluting bin directory
+        ${exec_args}
+    )
+
+endfunction()
+
+# Simple wrapper around qt_add_executable for manual tests which insure that
+# the binary is built under ${CMAKE_CURRENT_BINARY_DIR} and never installed.
+# See qt_add_executable() for more details.
+function(qt_add_manual_test target)
+
+    qt_parse_all_arguments(arg "qt_add_manual_test"
+        "${__qt_add_executable_optional_args}"
+        "${__qt_add_executable_single_args}"
+        "${__qt_add_executable_multi_args}"
+        ${ARGN}
+    )
+
+    qt_remove_args(exec_args
+        ARGS_TO_REMOVE
+            ${target}
+            OUTPUT_DIRECTORY
+            INSTALL_DIRECTORY
+        ALL_ARGS
+            "${__qt_add_executable_optional_args}"
+            "${__qt_add_executable_single_args}"
+            "${__qt_add_executable_multi_args}"
+        ARGS
+            ${ARGV}
+    )
+
+    qt_add_executable(${target}
+        NO_INSTALL # we don't install benchmarks
+        OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}" # avoid polluting bin directory
+        ${exec_args}
+    )
+
+endfunction()
+
+
+# This function creates a CMake test target with the specified name for use with CTest.
+function(qt_add_test name)
+    qt_parse_all_arguments(arg "qt_add_test"
+        "RUN_SERIAL;EXCEPTIONS;GUI;QMLTEST"
+        "OUTPUT_DIRECTORY;WORKING_DIRECTORY;TIMEOUT;VERSION"
+        "QML_IMPORTPATH;TESTDATA;${__default_private_args};${__default_public_args}" ${ARGN}
+    )
+
+    if (NOT arg_OUTPUT_DIRECTORY)
+        set(arg_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}")
+    endif()
+
+    if (${arg_EXCEPTIONS})
+        set(exceptions_text "EXCEPTIONS")
+    endif()
+
+    if (${arg_GUI})
+        set(gui_text "GUI")
+    endif()
+
+    if (arg_VERSION)
+        set(version_arg VERSION "${arg_VERSION}")
+    endif()
+
+    # Handle cases where we have a qml test without source files
+    if (arg_SOURCES)
+        set(private_includes
+            "${CMAKE_CURRENT_SOURCE_DIR}"
+            "${CMAKE_CURRENT_BINARY_DIR}"
+            "$<BUILD_INTERFACE:${QT_BUILD_DIR}/${INSTALL_INCLUDEDIR}>"
+             ${arg_INCLUDE_DIRECTORIES}
+        )
+
+        qt_add_executable("${name}"
+            ${exceptions_text}
+            ${gui_text}
+            ${version_arg}
+            NO_INSTALL
+            OUTPUT_DIRECTORY "${arg_OUTPUT_DIRECTORY}"
+            SOURCES "${arg_SOURCES}"
+            INCLUDE_DIRECTORIES
+                ${private_includes}
+            DEFINES
+                QT_TESTCASE_BUILDDIR="${CMAKE_CURRENT_BINARY_DIR}"
+                QT_TESTCASE_SOURCEDIR="${CMAKE_CURRENT_SOURCE_DIR}"
+                ${arg_DEFINES}
+            PUBLIC_LIBRARIES ${QT_CMAKE_EXPORT_NAMESPACE}::Core ${QT_CMAKE_EXPORT_NAMESPACE}::Test ${arg_PUBLIC_LIBRARIES}
+            LIBRARIES ${arg_LIBRARIES}
+            COMPILE_OPTIONS ${arg_COMPILE_OPTIONS}
+            LINK_OPTIONS ${arg_LINK_OPTIONS}
+            MOC_OPTIONS ${arg_MOC_OPTIONS}
+            ENABLE_AUTOGEN_TOOLS ${arg_ENABLE_AUTOGEN_TOOLS}
+            DISABLE_AUTOGEN_TOOLS ${arg_DISABLE_AUTOGEN_TOOLS}
+        )
+
+        # Tests should not be bundles on macOS even if arg_GUI is true, because some tests make
+        # assumptions about the location of helper processes, and those paths would be different
+        # if a test is built as a bundle.
+        set_property(TARGET "${name}" PROPERTY MACOSX_BUNDLE FALSE)
+        # The same goes for WIN32_EXECUTABLE, but because it will detach from the console window
+        # and not print anything.
+        set_property(TARGET "${name}" PROPERTY WIN32_EXECUTABLE FALSE)
+
+        # QMLTest specifics
+
+        qt_extend_target("${name}" CONDITION arg_QMLTEST
+            PUBLIC_LIBRARIES ${QT_CMAKE_EXPORT_NAMESPACE}::QuickTest
+        )
+
+        qt_extend_target("${name}" CONDITION arg_QMLTEST AND NOT ANDROID
+            DEFINES
+                QUICK_TEST_SOURCE_DIR="${CMAKE_CURRENT_SOURCE_DIR}"
+        )
+
+        qt_extend_target("${name}" CONDITION arg_QMLTEST AND ANDROID
+            DEFINES
+                QUICK_TEST_SOURCE_DIR=":/"
+        )
+    endif()
+
+    foreach(path IN LISTS arg_QML_IMPORTPATH)
+        list(APPEND extra_test_args "-import" "${path}")
+    endforeach()
+
+    # Generate a label in the form tests/auto/foo/bar/tst_baz
+    # and use it also for XML output
+    file(RELATIVE_PATH label "${PROJECT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/${name}")
+
+    if (ANDROID)
+        qt_android_add_test("${name}")
+    else()
+        if(arg_QMLTEST AND NOT arg_SOURCES)
+            set(test_working_dir "${CMAKE_CURRENT_SOURCE_DIR}")
+            set(test_executable ${QT_CMAKE_EXPORT_NAMESPACE}::qmltestrunner)
+        else()
+            if (arg_WORKING_DIRECTORY)
+                set(test_working_dir "${arg_WORKING_DIRECTORY}")
+            elseif(arg_OUTPUT_DIRECTORY)
+                set(test_working_dir "${arg_OUTPUT_DIRECTORY}")
+            else()
+                set(test_working_dir "${CMAKE_CURRENT_BINARY_DIR}")
+            endif()
+            set(test_executable "${name}")
+        endif()
+
+        add_test(NAME "${name}" COMMAND ${test_executable} ${extra_test_args} -o ${name}.xml,xml -o -,txt  WORKING_DIRECTORY "${test_working_dir}")
+    endif()
+    set_tests_properties("${name}" PROPERTIES RUN_SERIAL "${arg_RUN_SERIAL}" LABELS "${label}")
+    if (arg_TIMEOUT)
+        set_tests_properties(${name} PROPERTIES TIMEOUT ${arg_TIMEOUT})
+    endif()
+    # Get path to qtbase/bin, then prepend this path containing the shared libraries to PATH
+    set(INSTALL_PREFIX_BIN "${CMAKE_INSTALL_PREFIX}/${INSTALL_BINDIR}")
+    set(test_env_path "PATH=${CMAKE_CURRENT_BINARY_DIR}${QT_PATH_SEPARATOR}${INSTALL_PREFIX_BIN}${QT_PATH_SEPARATOR}$ENV{PATH}")
+    string(REPLACE ";" "\;" test_env_path "${test_env_path}")
+    set_property(TEST "${name}" APPEND PROPERTY ENVIRONMENT "${test_env_path}")
+    set_property(TEST "${name}" APPEND PROPERTY ENVIRONMENT "QT_TEST_RUNNING_IN_CTEST=1")
+
+    # Add the install prefix to list of plugin paths when doing a prefix build
+    if(NOT QT_INSTALL_DIR)
+        list(APPEND plugin_paths "${CMAKE_INSTALL_PREFIX}/${INSTALL_PLUGINSDIR}")
+    endif()
+    #TODO: Collect all paths from known repositories when performing a super
+    # build.
+    list(APPEND plugin_paths "${PROJECT_BINARY_DIR}/${INSTALL_PLUGINSDIR}")
+    list(JOIN plugin_paths "${QT_PATH_SEPARATOR}" plugin_paths_joined)
+    set_property(TEST "${name}" APPEND PROPERTY ENVIRONMENT "QT_PLUGIN_PATH=${plugin_paths_joined}")
+
+    if(ANDROID OR IOS OR WINRT)
+        set(builtin_testdata TRUE)
+    endif()
+
+    if(builtin_testdata)
+        # Safe guard against qml only tests, no source files == no target
+        if (TARGET "${name}")
+            target_compile_definitions("${name}" PRIVATE BUILTIN_TESTDATA)
+
+            foreach(testdata IN LISTS arg_TESTDATA)
+                list(APPEND builtin_files ${testdata})
+            endforeach()
+
+            set(blacklist_path "BLACKLIST")
+            if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${blacklist_path}")
+                list(APPEND builtin_files ${blacklist_path})
+            endif()
+
+            list(REMOVE_DUPLICATES builtin_files)
+
+            # Skip Qt quick compiler when embedding test resources
+            foreach(file IN LISTS builtin_files)
+                set_source_files_properties(${file}
+                    PROPERTIES QT_SKIP_QUICKCOMPILER TRUE
+                )
+            endforeach()
+
+            if (builtin_files)
+                qt_add_resource(${name} "${name}_testdata_builtin"
+                    PREFIX "/"
+                    FILES ${builtin_files}
+                    BASE ${CMAKE_CURRENT_SOURCE_DIR})
+            endif()
+        endif()
+    else()
+        # Install test data
+        file(RELATIVE_PATH relative_path_to_test_project
+            "${QT_TOP_LEVEL_SOURCE_DIR}"
+            "${CMAKE_CURRENT_SOURCE_DIR}")
+        qt_path_join(testdata_install_dir ${QT_INSTALL_DIR}
+                     "${relative_path_to_test_project}")
+        foreach(testdata IN LISTS arg_TESTDATA)
+            set(testdata "${CMAKE_CURRENT_SOURCE_DIR}/${testdata}")
+            if (IS_DIRECTORY "${testdata}")
+                qt_install(
+                    DIRECTORY "${testdata}"
+                    DESTINATION "${testdata_install_dir}")
+            else()
+                qt_install(
+                    FILES "${testdata}"
+                    DESTINATION "${testdata_install_dir}")
+            endif()
+        endforeach()
+    endif()
+
+endfunction()
+
+
+# This function creates an executable for use as a helper program with tests. Some
+# tests launch separate programs to test certain input/output behavior.
+# Specify OVERRIDE_OUTPUT_DIRECTORY if you dont' want to place the helper in the parent directory,
+# in which case you should specify OUTPUT_DIRECTORY "/foo/bar" manually.
+function(qt_add_test_helper name)
+
+    set(qt_add_test_helper_optional_args
+        "OVERRIDE_OUTPUT_DIRECTORY"
+    )
+
+    qt_parse_all_arguments(arg "qt_add_test_helper"
+        "${qt_add_test_helper_optional_args};${__qt_add_executable_optional_args}"
+        "${__qt_add_executable_single_args}"
+        "${__qt_add_executable_multi_args}"
+         ${ARGN})
+
+    qt_remove_args(forward_args
+        ARGS_TO_REMOVE
+            "${name}"
+            ${qt_add_test_helper_optional_args}
+        ALL_ARGS
+            ${qt_add_test_helper_optional_args}
+            ${__qt_add_executable_optional_args}
+            ${__qt_add_executable_single_args}
+            ${__qt_add_executable_multi_args}
+        ARGS
+            ${ARGV}
+    )
+
+    set(extra_args_to_pass)
+    if(NOT arg_OVERRIDE_OUTPUT_DIRECTORY)
+        set(extra_args_to_pass OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/..")
+    endif()
+
+    qt_add_executable("${name}" NO_INSTALL ${extra_args_to_pass} ${forward_args})
+endfunction()
+
+# Sets QT_WILL_BUILD_TOOLS if tools will be built.
+function(qt_check_if_tools_will_be_built)
+    if(NOT CMAKE_CROSSCOMPILING AND NOT QT_FORCE_FIND_TOOLS)
+        set(will_build_tools TRUE)
+    else()
+        set(will_build_tools FALSE)
+    endif()
+    set(QT_WILL_BUILD_TOOLS ${will_build_tools} CACHE INTERNAL "Are tools going to be built" FORCE)
+endfunction()
+
+# Wrapper function to create a regular cmake target and forward all the
+# arguments collected by the conversion script. This is only meant for tests!
+function(qt_add_cmake_library target)
+    # Process arguments:
+    qt_parse_all_arguments(arg "qt_add_cmake_library"
+        "SHARED;MODULE;STATIC;INTERFACE"
+        "OUTPUT_DIRECTORY;ARCHIVE_INSTALL_DIRECTORY;INSTALL_DIRECTORY"
+        "${__default_private_args};${__default_public_args}"
+        ${ARGN}
+    )
+
+    ### Define Targets:
+    if(${arg_INTERFACE})
+        add_library("${target}" INTERFACE)
+    elseif(${arg_STATIC} OR (${arg_MODULE} AND NOT BUILD_SHARED_LIBS))
+        add_library("${target}" STATIC)
+    elseif(${arg_SHARED})
+        add_library("${target}" SHARED)
+    elseif(${arg_MODULE})
+        add_library("${target}" MODULE)
+        set_property(TARGET ${name} PROPERTY C_VISIBILITY_PRESET default)
+        set_property(TARGET ${name} PROPERTY CXX_VISIBILITY_PRESET default)
+
+        if(APPLE)
+            # CMake defaults to using .so extensions for loadable modules, aka plugins,
+            # but Qt plugins are actually suffixed with .dylib.
+            set_property(TARGET "${target}" PROPERTY SUFFIX ".dylib")
+        endif()
+    else()
+        add_library("${target}")
+    endif()
+
+    if (NOT arg_ARCHIVE_INSTALL_DIRECTORY AND arg_INSTALL_DIRECTORY)
+        set(arg_ARCHIVE_INSTALL_DIRECTORY "${arg_INSTALL_DIRECTORY}")
+    endif()
+
+    if (ANDROID)
+        qt_android_apply_arch_suffix("${target}")
+    endif()
+    qt_skip_warnings_are_errors_when_repo_unclean("${target}")
+
+    if (arg_INSTALL_DIRECTORY)
+        set(install_arguments
+            ARCHIVE_INSTALL_DIRECTORY ${arg_ARCHIVE_INSTALL_DIRECTORY}
+            INSTALL_DIRECTORY ${arg_INSTALL_DIRECTORY}
+        )
+    endif()
+
+    if (arg_OUTPUT_DIRECTORY)
+        set_target_properties(${target} PROPERTIES
+            ARCHIVE_OUTPUT_DIRECTORY ${arg_OUTPUT_DIRECTORY}
+            RUNTIME_OUTPUT_DIRECTORY ${arg_OUTPUT_DIRECTORY}
+            LIBRARY_OUTPUT_DIRECTORY ${arg_OUTPUT_DIRECTORY}
+        )
+    endif()
+
+    qt_extend_target("${target}"
+        SOURCES ${arg_SOURCES}
+        INCLUDE_DIRECTORIES
+            ${arg_INCLUDE_DIRECTORIES}
+        PUBLIC_INCLUDE_DIRECTORIES
+            ${arg_PUBLIC_INCLUDE_DIRECTORIES}
+        PUBLIC_DEFINES
+            ${arg_PUBLIC_DEFINES}
+        DEFINES
+            ${arg_DEFINES}
+        PUBLIC_LIBRARIES ${arg_PUBLIC_LIBRARIES}
+        LIBRARIES ${arg_LIBRARIES} Qt::PlatformModuleInternal
+        COMPILE_OPTIONS ${arg_COMPILE_OPTIONS}
+        PUBLIC_COMPILE_OPTIONS ${arg_PUBLIC_COMPILE_OPTIONS}
+        LINK_OPTIONS ${arg_LINK_OPTIONS}
+        PUBLIC_LINK_OPTIONS ${arg_PUBLIC_LINK_OPTIONS}
+        MOC_OPTIONS ${arg_MOC_OPTIONS}
+        ENABLE_AUTOGEN_TOOLS ${arg_ENABLE_AUTOGEN_TOOLS}
+        DISABLE_AUTOGEN_TOOLS ${arg_DISABLE_AUTOGEN_TOOLS}
+        ${install_arguments}
+    )
+
+endfunction()
+
+#
+# This function replaces qmake's qt_helper_lib feature. It is intended to
+# compile 3rdparty libraries as part of the build.
+#
+function(qt_add_3rdparty_library target)
+    # Process arguments:
+    qt_parse_all_arguments(arg "qt_add_3rdparty_library"
+        "SHARED;MODULE;STATIC;INTERFACE;EXCEPTIONS;INSTALL"
+        "OUTPUT_DIRECTORY"
+        "${__default_private_args};${__default_public_args}"
+        ${ARGN}
+    )
+
+    ### Define Targets:
+    if(${arg_INTERFACE})
+        add_library("${target}" INTERFACE)
+    elseif(${arg_STATIC} OR (${arg_MODULE} AND NOT BUILD_SHARED_LIBS))
+        add_library("${target}" STATIC)
+    elseif(${arg_SHARED})
+        add_library("${target}" SHARED)
+    elseif(${arg_MODULE})
+        add_library("${target}" MODULE)
+        set_property(TARGET ${name} PROPERTY C_VISIBILITY_PRESET default)
+        set_property(TARGET ${name} PROPERTY CXX_VISIBILITY_PRESET default)
+
+        if(APPLE)
+            # CMake defaults to using .so extensions for loadable modules, aka plugins,
+            # but Qt plugins are actually suffixed with .dylib.
+            set_property(TARGET "${target}" PROPERTY SUFFIX ".dylib")
+        endif()
+    else()
+        add_library("${target}")
+    endif()
+
+    if (NOT arg_ARCHIVE_INSTALL_DIRECTORY AND arg_INSTALL_DIRECTORY)
+        set(arg_ARCHIVE_INSTALL_DIRECTORY "${arg_INSTALL_DIRECTORY}")
+    endif()
+
+    qt_internal_add_qt_repo_known_module(${target})
+    qt_internal_add_target_aliases(${target})
+
+    if (ANDROID)
+        qt_android_apply_arch_suffix("${target}")
+    endif()
+
+    qt_skip_warnings_are_errors_when_repo_unclean("${target}")
+
+    if(NOT arg_HEADER_MODULE)
+        set_target_properties(${target} PROPERTIES
+            LIBRARY_OUTPUT_DIRECTORY "${QT_BUILD_DIR}/${INSTALL_LIBDIR}"
+            RUNTIME_OUTPUT_DIRECTORY "${QT_BUILD_DIR}/${INSTALL_BINDIR}"
+            ARCHIVE_OUTPUT_DIRECTORY "${QT_BUILD_DIR}/${INSTALL_LIBDIR}"
+            VERSION ${PROJECT_VERSION}
+            SOVERSION ${PROJECT_VERSION_MAJOR}
+            QT_MODULE_IS_3RDPARTY_LIBRARY TRUE
+        )
+        qt_handle_multi_config_output_dirs("${target}")
+
+        set_target_properties(${target} PROPERTIES
+            OUTPUT_NAME "${INSTALL_CMAKE_NAMESPACE}${target}"
+        )
+    endif()
+
+    if(NOT arg_INTERFACE)
+        # This property is used for super builds with static libraries. We use
+        # it in QtPlugins.cmake.in to avoid "polluting" the dependency chain
+        # for the target in it's project directory.
+        # E.g: When we process find_package(Qt6 ... Gui) in QtDeclarative, the
+        # rules in QtPugins.cmake add all the known Gui plugins as interface
+        # dependencies. This in turn causes circular dependencies on every
+        # plugin which links against Gui. Plugin A -> GUI -> Plugin A ....
+        set_target_properties(${target} PROPERTIES QT_BUILD_PROJECT_NAME ${PROJECT_NAME})
+    endif()
+
+    if(NOT arg_EXCEPTIONS AND NOT arg_INTERFACE)
+        qt_internal_set_no_exceptions_flags("${target}")
+    endif()
+
+    qt_extend_target("${target}"
+        SOURCES ${arg_SOURCES}
+        INCLUDE_DIRECTORIES
+            ${arg_INCLUDE_DIRECTORIES}
+        PUBLIC_INCLUDE_DIRECTORIES
+            ${arg_PUBLIC_INCLUDE_DIRECTORIES}
+        PUBLIC_DEFINES
+            ${arg_PUBLIC_DEFINES}
+        DEFINES
+            ${arg_DEFINES}
+        PUBLIC_LIBRARIES ${arg_PUBLIC_LIBRARIES}
+        LIBRARIES ${arg_LIBRARIES}
+        COMPILE_OPTIONS ${arg_COMPILE_OPTIONS}
+        PUBLIC_COMPILE_OPTIONS ${arg_PUBLIC_COMPILE_OPTIONS}
+        LINK_OPTIONS ${arg_LINK_OPTIONS}
+        PUBLIC_LINK_OPTIONS ${arg_PUBLIC_LINK_OPTIONS}
+        MOC_OPTIONS ${arg_MOC_OPTIONS}
+        ENABLE_AUTOGEN_TOOLS ${arg_ENABLE_AUTOGEN_TOOLS}
+        DISABLE_AUTOGEN_TOOLS ${arg_DISABLE_AUTOGEN_TOOLS}
+        ${install_arguments}
+    )
+
+    if(NOT BUILD_SHARED_LIBS OR arg_INSTALL)
+        set(path_suffix "${INSTALL_CMAKE_NAMESPACE}${target}")
+        qt_path_join(config_build_dir ${QT_CONFIG_BUILD_DIR} ${path_suffix})
+        qt_path_join(config_install_dir ${QT_CONFIG_INSTALL_DIR} ${path_suffix})
+        set(export_name "${INSTALL_CMAKE_NAMESPACE}${target}Targets")
+
+        configure_package_config_file(
+            "${QT_CMAKE_DIR}/Qt3rdPartyLibraryConfig.cmake.in"
+            "${config_build_dir}/${INSTALL_CMAKE_NAMESPACE}${target}Config.cmake"
+            INSTALL_DESTINATION "${config_install_dir}"
+        )
+
+        write_basic_package_version_file(
+            "${config_build_dir}/${INSTALL_CMAKE_NAMESPACE}${target}ConfigVersion.cmake"
+            VERSION ${PROJECT_VERSION}
+            COMPATIBILITY AnyNewerVersion
+        )
+
+        qt_install(FILES
+            "${config_build_dir}/${INSTALL_CMAKE_NAMESPACE}${target}Config.cmake"
+            "${config_build_dir}/${INSTALL_CMAKE_NAMESPACE}${target}ConfigVersion.cmake"
+            DESTINATION "${config_install_dir}"
+            COMPONENT Devel
+        )
+
+        qt_install(TARGETS ${target}
+            EXPORT "${export_name}"
+            RUNTIME DESTINATION ${INSTALL_BINDIR}
+            LIBRARY DESTINATION ${INSTALL_LIBDIR}
+            ARCHIVE DESTINATION ${INSTALL_LIBDIR}
+        )
+
+        qt_install(EXPORT ${export_name}
+            NAMESPACE "${QT_CMAKE_EXPORT_NAMESPACE}::"
+            DESTINATION "${config_install_dir}"
+        )
+
+        qt_internal_export_modern_cmake_config_targets_file(
+            TARGETS ${target}
+            EXPORT_NAME_PREFIX ${INSTALL_CMAKE_NAMESPACE}${target}
+            CONFIG_INSTALL_DIR "${config_install_dir}"
+        )
+    endif()
+endfunction()
+
+function(qt_get_tool_cmake_configuration out_var)
+    qt_get_main_cmake_configuration("${out_var}")
+    string(TOUPPER "${${out_var}}" upper_config)
+    set("${out_var}" "${upper_config}" PARENT_SCOPE)
+endfunction()
+
+function(qt_get_main_cmake_configuration out_var)
+    if(CMAKE_BUILD_TYPE)
+        set(config "${CMAKE_BUILD_TYPE}")
+    elseif(QT_MULTI_CONFIG_FIRST_CONFIG)
+        set(config "${QT_MULTI_CONFIG_FIRST_CONFIG}")
+    endif()
+    set("${out_var}" "${config}" PARENT_SCOPE)
+endfunction()
+
+# This function is used to define a "Qt tool", such as moc, uic or rcc.
+# The BOOTSTRAP option allows building it as standalone program, otherwise
+# it will be linked against QtCore.
+function(qt_add_tool name)
+    qt_parse_all_arguments(arg "qt_add_tool" "BOOTSTRAP;NO_QT;NO_INSTALL" "TOOLS_TARGET"
+                               "${__default_private_args}" ${ARGN})
+
+    # Handle case when a tool does not belong to a module and it can't be built either (like
+    # during a cross-compile).
+    if(NOT arg_TOOLS_TARGET AND NOT QT_WILL_BUILD_TOOLS)
+        message(FATAL_ERROR "The tool \"${name}\" has not been assigned to a module via"
+                            " TOOLS_TARGET (so it can't be found) and it can't be built"
+                            " (QT_WILL_BUILD_TOOLS is ${QT_WILL_BUILD_TOOLS}).")
+    endif()
+
+    set(full_name "${QT_CMAKE_EXPORT_NAMESPACE}::${name}")
+    if(TARGET ${full_name})
+        get_property(path TARGET ${full_name} PROPERTY LOCATION)
+        message(STATUS "Tool '${full_name}' was found at ${path}.")
+        return()
+    endif()
+
+    if(arg_TOOLS_TARGET AND NOT QT_WILL_BUILD_TOOLS)
+        set(tools_package_name "Qt6${arg_TOOLS_TARGET}Tools")
+        message(STATUS "Searching for tool '${full_name}' in package ${tools_package_name}.")
+
+        # Only search in path provided by QT_HOST_PATH. We need to do it with CMAKE_PREFIX_PATH
+        # instead of PATHS option, because any find_dependency call inside a Tools package would
+        # not get the proper prefix when using PATHS.
+        set(BACKUP_CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH})
+        set(CMAKE_PREFIX_PATH "${QT_HOST_PATH}")
+
+        # Search both with sysroots prepended as well as in the host system. When cross compiling
+        # the mode_package might be set to ONLY only, and the Qt6 tools packages are actually
+        # in the host system.
+        set(BACKUP_CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ${CMAKE_FIND_ROOT_PATH_MODE_PACKAGE})
+        set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE "BOTH")
+        set(BACKUP_CMAKE_SIZEOF_VOID_P "${CMAKE_SIZEOF_VOID_P}")
+        set(CMAKE_SIZEOF_VOID_P "")
+        find_package(
+            ${tools_package_name}
+            ${PROJECT_VERSION}
+            NO_PACKAGE_ROOT_PATH
+            NO_CMAKE_ENVIRONMENT_PATH
+            NO_SYSTEM_ENVIRONMENT_PATH
+            NO_CMAKE_PACKAGE_REGISTRY
+            NO_CMAKE_SYSTEM_PATH
+            NO_CMAKE_SYSTEM_PACKAGE_REGISTRY)
+        set(CMAKE_SIZEOF_VOID_P "${BACKUP_CMAKE_SIZEOF_VOID_P}")
+        set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE "${BACKUP_CMAKE_FIND_ROOT_PATH_MODE_PACKAGE}")
+        set(CMAKE_PREFIX_PATH "${BACKUP_CMAKE_PREFIX_PATH}")
+
+        if(${${tools_package_name}_FOUND} AND TARGET ${full_name})
+            # Even if the tool is already visible, make sure that our modules remain associated
+            # with the tools.
+            qt_internal_append_known_modules_with_tools("${arg_TOOLS_TARGET}")
+            get_property(path TARGET ${full_name} PROPERTY LOCATION)
+            message(STATUS "${full_name} was found at ${path} using package ${tools_package_name}.")
+            return()
+        endif()
+    endif()
+
+    if(NOT QT_WILL_BUILD_TOOLS)
+        message(FATAL_ERROR "The tool \"${full_name}\" was not found in the "
+                           "${tools_package_name} package. "
+                           "Package found: ${${tools_package_name}_FOUND}")
+    else()
+        message(STATUS "Tool '${full_name}' will be built from source.")
+    endif()
+
+    set(disable_autogen_tools "${arg_DISABLE_AUTOGEN_TOOLS}")
+    if (arg_NO_QT)
+        # FIXME: Remove NO_QT again once qmake can use a "normal" Qt!
+        if (arg_BOOTSTRAP)
+            message(FATAL_ERROR "Tool can not be NO_QT and BOOTSTRAP at the same time!")
+        endif()
+        set(corelib "")
+    else()
+        if (arg_BOOTSTRAP)
+            set(corelib ${QT_CMAKE_EXPORT_NAMESPACE}::Bootstrap)
+            list(APPEND disable_autogen_tools "uic" "moc" "rcc")
+        else()
+            set(corelib ${QT_CMAKE_EXPORT_NAMESPACE}::Core)
+        endif()
+    endif()
+
+    set(bootstrap "")
+    if(arg_BOOTSTRAP)
+        set(bootstrap BOOTSTRAP)
+    endif()
+
+    set(no_qt "")
+    if(arg_NO_QT)
+        set(no_qt NO_QT)
+    endif()
+
+    set(no_install "")
+    if(arg_NO_INSTALL)
+        set(no_install NO_INSTALL)
+    endif()
+
+    qt_add_executable("${name}" OUTPUT_DIRECTORY "${QT_BUILD_DIR}/${INSTALL_BINDIR}"
+        ${bootstrap}
+        ${no_qt}
+        ${no_install}
+        SOURCES ${arg_SOURCES}
+        INCLUDE_DIRECTORIES
+            ${arg_INCLUDE_DIRECTORIES}
+        DEFINES ${arg_DEFINES}
+        PUBLIC_LIBRARIES ${corelib}
+        LIBRARIES ${arg_LIBRARIES} Qt::PlatformToolInternal
+        COMPILE_OPTIONS ${arg_COMPILE_OPTIONS}
+        LINK_OPTIONS ${arg_LINK_OPTIONS}
+        MOC_OPTIONS ${arg_MOC_OPTIONS}
+        DISABLE_AUTOGEN_TOOLS ${disable_autogen_tools}
+    )
+    qt_internal_add_target_aliases("${name}")
+
+    # If building with a multi-config configuration, the main configuration tool will be placed in
+    # ./bin, while the rest will be in <CONFIG> specific subdirectories.
+    qt_get_tool_cmake_configuration(tool_cmake_configuration)
+    set_target_properties("${name}" PROPERTIES
+        RUNTIME_OUTPUT_DIRECTORY_${tool_cmake_configuration} "${QT_BUILD_DIR}/${INSTALL_BINDIR}"
+    )
+
+    if(NOT arg_NO_INSTALL AND arg_TOOLS_TARGET)
+        # Assign a tool to an export set, and mark the module to which the tool belongs.
+        qt_internal_append_known_modules_with_tools("${arg_TOOLS_TARGET}")
+
+        # Also append the tool to the module list.
+        qt_internal_append_known_module_tool("${arg_TOOLS_TARGET}" "${name}")
+
+        qt_install(TARGETS "${name}"
+                   EXPORT "${INSTALL_CMAKE_NAMESPACE}${arg_TOOLS_TARGET}ToolsTargets"
+                   DESTINATION ${INSTALL_TARGETS_DEFAULT_ARGS})
+    endif()
+endfunction()
+
+function(qt_create_tracepoints name tracePointsFile)
+    #### TODO
+    string(TOLOWER "${name}" name)
+
+    file(GENERATE OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/qt${name}_tracepoints_p.h" CONTENT
+        "#include <private/qtrace_p.h>")
+endfunction()
+
+# Handle files that need special SIMD-related flags.
+# This creates an object library and makes target link
+# to it (privately).
+function(qt_add_simd_part target)
+    qt_parse_all_arguments(arg "qt_add_simd_part" "" ""
+       "NAME;SIMD;${__default_private_args};COMPILE_FLAGS" ${ARGN})
+    if ("x${arg_SIMD}" STREQUAL x)
+        message(FATAL_ERROR "qt_add_simd_part needs a SIMD type to be set.")
+    endif()
+
+    set(condition "QT_FEATURE_${arg_SIMD}")
+    if("${arg_SIMD}" STREQUAL arch_haswell)
+        set(condition "TEST_subarch_avx2 AND TEST_subarch_bmi AND TEST_subarch_bmi2 AND TEST_subarch_f16c AND TEST_subarch_fma AND TEST_subarch_lzcnt AND TEST_subarch_popcnt")
+    elseif("${arg_SIMD}" STREQUAL avx512common)
+        set(condition "TEST_subarch_avx512cd")
+    elseif("${arg_SIMD}" STREQUAL avx512core)
+        set(condition "TEST_subarch_avx512cd AND TEST_subarch_avx512bw AND TEST_subarch_avx512dq AND TEST_subarch_avx512vl")
+    endif()
+
+    set(name "${arg_NAME}")
+    if("x${name}" STREQUAL x)
+        set(name "${target}_simd_${arg_SIMD}")
+    endif()
+
+    qt_evaluate_config_expression(result ${condition})
+    if(${result})
+        if(QT_CMAKE_DEBUG_EXTEND_TARGET)
+            message("qt_add_simd_part(${target} SIMD ${arg_SIMD} ...): Evaluated")
+        endif()
+        string(TOUPPER "QT_CFLAGS_${arg_SIMD}" simd_flags)
+
+        if (NOT TARGET "${name}")
+            add_library("${name}" OBJECT)
+        endif()
+        target_sources("${name}" PRIVATE ${arg_SOURCES})
+        target_include_directories("${name}" PRIVATE
+            ${arg_INCLUDE_DIRECTORIES}
+            $<TARGET_PROPERTY:${target},INCLUDE_DIRECTORIES>)
+        target_compile_options("${name}" PRIVATE
+            ${${simd_flags}}
+            ${arg_COMPILE_FLAGS}
+            $<TARGET_PROPERTY:${target},COMPILE_OPTIONS>)
+            target_compile_definitions("${name}" PRIVATE
+            $<TARGET_PROPERTY:${target},COMPILE_DEFINITIONS>)
+
+        target_link_libraries("${target}" PRIVATE "${name}")
+
+        # Add a link-only dependency on the parent library, to force copying of framework headers
+        # before trying to compile a source file.
+        target_link_libraries("${name}" PRIVATE
+              $<FILTER:$<TARGET_PROPERTY:${target},LINK_LIBRARIES>,EXCLUDE,^${target}_simd_>)
+
+        if(NOT BUILD_SHARED_LIBS)
+            qt_install(
+              TARGETS ${name}
+              EXPORT "${INSTALL_CMAKE_NAMESPACE}Targets"
+            )
+        endif()
+    else()
+        if(QT_CMAKE_DEBUG_EXTEND_TARGET)
+            message("qt_add_simd_part(${target} SIMD ${arg_SIMD} ...): Skipped")
+        endif()
+    endif()
+endfunction()
+
+# From Qt6CoreMacros
+# Function used to create the names of output files preserving relative dirs
+function(qt_make_output_file infile prefix suffix source_dir binary_dir result)
+    get_filename_component(outfilename "${infile}" NAME_WE)
+
+    set(base_dir "${source_dir}")
+    string(FIND "${infile}" "${binary_dir}/" in_binary)
+    if (in_binary EQUAL 0)
+        set(base_dir "${binary_dir}")
+    endif()
+
+    get_filename_component(abs_infile "${infile}" ABSOLUTE BASE_DIR "${base_dir}")
+    file(RELATIVE_PATH rel_infile "${base_dir}" "${abs_infile}")
+    string(REPLACE "../" "__/" mapped_infile "${rel_infile}")
+
+    get_filename_component(abs_mapped_infile "${mapped_infile}" ABSOLUTE BASE_DIR "${binary_dir}")
+    get_filename_component(outpath "${abs_mapped_infile}" PATH)
+
+    file(MAKE_DIRECTORY "${outpath}")
+    set("${result}" "${outpath}/${prefix}${outfilename}${suffix}" PARENT_SCOPE)
+endfunction()
+
+
+# Complete manual moc invocation with full control.
+# Use AUTOMOC whenever possible.
+function(qt_manual_moc result)
+    cmake_parse_arguments(arg "" "OUTPUT_MOC_JSON_FILES" "FLAGS" ${ARGN})
+    set(moc_files)
+    set(metatypes_json_list)
+    foreach(infile ${arg_UNPARSED_ARGUMENTS})
+        qt_make_output_file("${infile}" "moc_" ".cpp"
+            "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_BINARY_DIR}" outfile)
+        list(APPEND moc_files "${outfile}")
+
+        set(moc_parameters_file "${outfile}_parameters$<$<BOOL:$<CONFIGURATION>>:_$<CONFIGURATION>>")
+        set(moc_parameters ${arg_FLAGS} -o "${outfile}" "${infile}")
+
+        set(metatypes_byproducts)
+        if (arg_OUTPUT_MOC_JSON_FILES)
+            set(moc_json_file "${outfile}.json")
+            list(APPEND moc_parameters --output-json)
+            list(APPEND metatypes_json_list "${outfile}.json")
+            set(metatypes_byproducts "${outfile}.json")
+        endif()
+
+        string (REPLACE ";" "\n" moc_parameters "${moc_parameters}")
+
+        file(GENERATE OUTPUT "${moc_parameters_file}" CONTENT "${moc_parameters}\n")
+
+        add_custom_command(OUTPUT "${outfile}" ${metatypes_byproducts}
+                           COMMAND ${QT_CMAKE_EXPORT_NAMESPACE}::moc "@${moc_parameters_file}"
+                           DEPENDS "${infile}" ${moc_depends} ${QT_CMAKE_EXPORT_NAMESPACE}::moc
+                           WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" VERBATIM)
+    endforeach()
+    set("${result}" ${moc_files} PARENT_SCOPE)
+
+    # Register generated json files
+    if (arg_OUTPUT_MOC_JSON_FILES)
+        set(${arg_OUTPUT_MOC_JSON_FILES} "${metatypes_json_list}" PARENT_SCOPE)
+    endif()
+endfunction()
+
+
+# helper to set up a qdbusxml2cpp rule
+function(qt_create_qdbusxml2cpp_command target infile)
+    qt_parse_all_arguments(arg "qt_create_qdbusxml2cpp_command" "ADAPTOR;INTERFACE" "BASENAME" "FLAGS" ${ARGN})
+    if((arg_ADAPTOR AND arg_INTERFACE) OR (NOT arg_ADAPTOR AND NOT arg_INTERFACE))
+        message(FATAL_ERROR "qt_create_dbusxml2cpp_command needs either ADAPTOR or INTERFACE.")
+    endif()
+
+    set(option "-a")
+    set(type "adaptor")
+    if (arg_INTERFACE)
+        set(option "-p")
+        set(type "interface")
+    endif()
+
+    if ("${arg_BASENAME}" STREQUAL "")
+        get_filename_component(file_dir "${infile}" DIRECTORY)
+        get_filename_component(file_name "${infile}" NAME_WLE)
+        get_filename_component(file_ext "${infile}" LAST_EXT)
+
+        if("${file_ext}" STREQUAL ".xml")
+        else()
+            message(FATAL_ERROR "DBUS ${type} input file is not xml.")
+        endif()
+
+        # use last part of io.qt.something.xml!
+        get_filename_component(file_ext "${file_name}" LAST_EXT)
+        if("x${file_ext}" STREQUAL "x")
+        else()
+            string(SUBSTRING "${file_ext}" 1 -1 file_name) # cut of leading '.'
+        endif()
+
+        string(TOLOWER "${file_name}" file_name)
+        set(file_name "${file_name}_${type}")
+    else()
+        set(file_name ${arg_BASENAME})
+    endif()
+
+    # Use absolute file path for the source file and set the current working directory to the
+    # current binary directory, because setting an absolute path for the header:source combo option
+    # does not work. Splitting on ":" breaks inside the dbus tool when running on Windows
+    # due to ":" being contained in the drive path (e.g C:\foo.h:C:\foo.cpp).
+    get_filename_component(absolute_in_file_path "${infile}" ABSOLUTE)
+
+    set(header_file "${file_name}.h")
+    set(source_file "${file_name}.cpp")
+
+    add_custom_command(OUTPUT "${header_file}" "${source_file}"
+                       COMMAND ${QT_CMAKE_EXPORT_NAMESPACE}::qdbusxml2cpp ${arg_FLAGS} "${option}"
+                               "${header_file}:${source_file}" "${absolute_in_file_path}"
+                       DEPENDS "${absolute_in_file_path}" ${QT_CMAKE_EXPORT_NAMESPACE}::qdbusxml2cpp
+                       WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
+                       VERBATIM)
+
+    target_sources("${target}" PRIVATE "${header_file}" "${source_file}")
+endfunction()
+
+function(qt_compute_injection_forwarding_header target)
+    qt_parse_all_arguments(arg "qt_compute_injection_forwarding_header"
+                           "PRIVATE" "SOURCE;OUT_VAR" "" ${ARGN})
+    qt_internal_module_info(module "${target}")
+    get_filename_component(file_name "${arg_SOURCE}" NAME)
+
+    set(source_absolute_path "${CMAKE_CURRENT_BINARY_DIR}/${arg_SOURCE}")
+    file(RELATIVE_PATH relpath "${PROJECT_BINARY_DIR}" "${source_absolute_path}")
+
+    if (arg_PRIVATE)
+        set(fwd "${PROJECT_VERSION}/${module}/private/${file_name}")
+    else()
+        set(fwd "${file_name}")
+    endif()
+
+    string(APPEND ${arg_OUT_VAR} " ${relpath}:${fwd}")
+    set(${arg_OUT_VAR} ${${arg_OUT_VAR}} PARENT_SCOPE)
+endfunction()
+
+
+function(qt_add_docs)
+    if(${ARGC} EQUAL 1)
+        # Function called from old generated CMakeLists.txt that was missing the target parameter
+        return()
+    endif()
+    if(NOT ${ARGC} EQUAL 2)
+        message(FATAL_ERROR "qt_add_docs called with the wrong number of arguments. Should be qt_add_docs(target path_to_project.qdocconf).")
+        return()
+    endif()
+    set(target ${ARGV0})
+    set(doc_project ${ARGV1})
+
+    if (NOT QT_SUPERBUILD OR QT_WILL_INSTALL)
+        set(qdoc_bin "${CMAKE_INSTALL_PREFIX}/${INSTALL_BINDIR}/qdoc")
+        set(qtattributionsscanner_bin "${CMAKE_INSTALL_PREFIX}/${INSTALL_BINDIR}/qtattributionsscanner")
+        set(qhelpgenerator_bin "${CMAKE_INSTALL_PREFIX}/${INSTALL_BINDIR}/qhelpgenerator")
+    else()
+        set(qdoc_bin "${CMAKE_INSTALL_PREFIX}/qtbase/${INSTALL_BINDIR}/qdoc")
+        set(qtattributionsscanner_bin "${CMAKE_INSTALL_PREFIX}/qtbase/${INSTALL_BINDIR}/qtattributionsscanner")
+        set(qhelpgenerator_bin "${CMAKE_INSTALL_PREFIX}/qtbase/${INSTALL_BINDIR}/qhelpgenerator")
+    endif()
+
+    get_target_property(target_type ${target} TYPE)
+    if (NOT target_type STREQUAL "INTERFACE_LIBRARY")
+        get_target_property(target_bin_dir ${target} BINARY_DIR)
+        get_target_property(target_source_dir ${target} SOURCE_DIR)
+    else()
+        set(target_bin_dir ${CMAKE_CURRENT_BINARY_DIR})
+        set(target_source_dir ${CMAKE_CURRENT_SOURCE_DIR})
+    endif()
+    set(doc_ouput_dir "${target_bin_dir}/.doc")
+
+
+    # Generate include dir list
+    set(target_include_dirs_file "${doc_ouput_dir}/$<CONFIG>/includes.txt")
+
+    set(include_paths_property "$<TARGET_PROPERTY:${target},INCLUDE_DIRECTORIES>")
+    if (NOT target_type STREQUAL "INTERFACE_LIBRARY")
+        file(GENERATE
+            OUTPUT ${target_include_dirs_file}
+            CONTENT "-I$<JOIN:${include_paths_property},\n-I>"
+        )
+        set(include_path_args "@${target_include_dirs_file}")
+    else()
+        set(include_path_args "")
+    endif()
+
+    get_filename_component(doc_target "${doc_project}" NAME_WLE)
+    if (QT_WILL_INSTALL)
+        set(qdoc_output_dir "${CMAKE_BINARY_DIR}/${INSTALL_DOCDIR}/${doc_target}")
+        set(index_dir "${CMAKE_BINARY_DIR}/${INSTALL_DOCDIR}")
+    elseif (QT_SUPERBUILD)
+        set(qdoc_output_dir "${CMAKE_INSTALL_PREFIX}/qtbase/${INSTALL_DOCDIR}/${doc_target}")
+        set(index_dir "${CMAKE_INSTALL_PREFIX}/qtbase/${INSTALL_DOCDIR}")
+    else()
+        set(qdoc_output_dir "${CMAKE_INSTALL_PREFIX}/${INSTALL_DOCDIR}/${doc_target}")
+        set(index_dir "${CMAKE_INSTALL_PREFIX}/${INSTALL_DOCDIR}")
+    endif()
+
+    # qtattributionsscanner
+    add_custom_target(qattributionsscanner_${target}
+        DEPENDS ${qattributionsscanner_bin}
+        COMMAND ${qtattributionsscanner_bin}
+        ${PROJECT_SOURCE_DIR}
+        --filter "QDocModule=${qdoc_target}"
+        -o "${target_bin_dir}/codeattributions.qdoc"
+    )
+
+    # prepare docs target
+    set(prepare_qdoc_args
+        -outputdir "${qdoc_output_dir}"
+        -installdir "${QT_INSTALL_DIR}/${INSTALL_DOCDIR}"
+        "${target_source_dir}/${doc_project}"
+        -prepare
+        -indexdir "${index_dir}"
+        -no-link-errors
+        "${include_path_args}"
+    )
+
+    if (QT_SUPERBUILD AND NOT QT_WILL_INSTALL)
+        set(qt_install_docs_env "${CMAKE_INSTALL_PREFIX}/qtbase/${INSTALL_DOCDIR}")
+    else()
+        set(qt_install_docs_env "${CMAKE_INSTALL_PREFIX}/${INSTALL_DOCDIR}")
+    endif()
+
+    set(qdoc_env_args
+        "QT_INSTALL_DOCS=\"${qt_install_docs_env}\""
+        "QT_VERSION=${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}"
+        "QT_VER=${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}"
+        "QT_VERSION_TAG=${PROJECT_VERSION_MAJOR}${PROJECT_VERSION_MINOR}${PROJECT_VERSION_PATCH}"
+        "BUILDDIR=${target_bin_dir}"
+    )
+
+    add_custom_target(prepare_docs_${target}
+        DEPENDS ${qdoc_bin}
+        COMMAND ${CMAKE_COMMAND} -E env ${qdoc_env_args}
+        ${qdoc_bin}
+        ${prepare_qdoc_args}
+    )
+
+    add_dependencies(prepare_docs_${target} qattributionsscanner_${target})
+
+    # generate docs target
+    set(generate_qdocs_args
+        -outputdir "${qdoc_output_dir}"
+        -installdir "${INSTALL_DOCDIR}"
+        "${target_source_dir}/${doc_project}"
+        -generate
+        -indexdir "${index_dir}"
+        "${include_path_args}"
+    )
+
+    add_custom_target(generate_docs_${target}
+        DEPENDS ${qdoc_bin}
+        COMMAND ${CMAKE_COMMAND} -E env ${qdoc_env_args}
+        ${qdoc_bin}
+        ${generate_qdocs_args}
+    )
+
+    add_dependencies(generate_docs_${target} prepare_docs_${target})
+
+    # generate html
+    set(html_qdocs_args
+        -outputdir "${qdoc_output_dir}"
+        -installdir "${INSTALL_DOCDIR}"
+        "${target_source_dir}/${doc_project}"
+        -indexdir "${index_dir}"
+        "${include_path_args}"
+    )
+
+    add_custom_target(html_docs_${target}
+        DEPENDS ${qdoc_bin}
+        COMMAND ${CMAKE_COMMAND} -E env ${qdoc_env_args}
+        ${qdoc_bin}
+        ${html_qdocs_args}
+    )
+
+    add_dependencies(html_docs_${target} generate_docs_${target})
+
+    # generate .qch
+    set(qch_file_name ${doc_target}.qch)
+    set(qch_file_path ${qdoc_output_dir}/${qch_file_name})
+
+    add_custom_target(qch_docs_${target}
+        DEPENDS ${qhelpgenerator_bin}
+        COMMAND ${qhelpgenerator_bin}
+           "${qdoc_output_dir}/${doc_target}.qhp"
+           -o "${qch_file_path}"
+    )
+    add_dependencies(qch_docs_${target} generate_docs_${target})
+
+    if (QT_WILL_INSTALL)
+        add_custom_target(install_html_docs_${target}
+            COMMAND ${CMAKE_COMMAND} -E copy_directory
+                "${qdoc_output_dir}"
+                "${CMAKE_INSTALL_PREFIX}/${INSTALL_DOCDIR}/${doc_target}"
+            COMMENT "Installing html docs for target ${target}"
+        )
+
+        add_custom_target(install_qch_docs_${target}
+            COMMAND ${CMAKE_COMMAND} -E copy_if_different
+                "${qch_file_path}"
+                "${CMAKE_INSTALL_PREFIX}/${INSTALL_DOCDIR}/${qch_file_name}"
+            COMMENT "Installing qch docs for target ${target}"
+       )
+    else()
+        # Don't need to do anything when not installing
+        add_custom_target(install_html_docs_${target})
+        add_custom_target(install_qch_docs_${target})
+    endif()
+
+    add_dependencies(install_html_docs_${target} html_docs_${target})
+    add_dependencies(install_qch_docs_${target} qch_docs_${target})
+
+    add_custom_target(install_docs_${target})
+    add_dependencies(install_docs_${target} install_html_docs_${target} install_qch_docs_${target})
+
+    add_dependencies(${qt_docs_prepare_target_name} prepare_docs_${target})
+    add_dependencies(${qt_docs_generate_target_name} generate_docs_${target})
+    add_dependencies(${qt_docs_html_target_name} html_docs_${target})
+    add_dependencies(${qt_docs_qch_target_name} qch_docs_${target})
+    add_dependencies(${qt_docs_install_html_target_name} install_html_docs_${target})
+    add_dependencies(${qt_docs_install_qch_target_name} install_qch_docs_${target})
+    add_dependencies(${qt_docs_install_target_name} install_docs_${target})
+
+endfunction()
+
+macro(qt_find_package)
+    # Get the target names we expect to be provided by the package.
+    set(options CONFIG NO_MODULE MODULE REQUIRED)
+    set(oneValueArgs)
+    set(multiValueArgs PROVIDED_TARGETS COMPONENTS)
+    cmake_parse_arguments(arg "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
+
+    # If some Qt internal project calls qt_find_package(WrapFreeType), but WrapFreeType was already
+    # found as part of a find_dependency() call from a ModuleDependencies.cmake file (or similar),
+    # and the provided target is also found, that means this might have been an unnecessary
+    # qt_find_package() call, because the dependency was already found via some other transitive
+    # dependency. Return early, so that CMake doesn't fail wiht an error with trying to promote the
+    # targets to be global. This behavior is not enabled by default, because there are cases
+    # when a regular find_package() (non qt_) can find a package (Freetype -> PNG), and a subsequent
+    # qt_find_package(PNG PROVIDED_TARGET PNG::PNG) still needs to succeed and register the provided
+    # targets. To enable the debugging behavior, set QT_DEBUG_QT_FIND_PACKAGE to 1.
+    set(_qt_find_package_skip_find_package FALSE)
+    if(QT_DEBUG_QT_FIND_PACKAGE AND ${ARGV0}_FOUND AND arg_PROVIDED_TARGETS)
+        set(_qt_find_package_skip_find_package TRUE)
+        foreach(qt_find_package_target_name ${arg_PROVIDED_TARGETS})
+            if(NOT TARGET ${qt_find_package_target_name})
+                set(_qt_find_package_skip_find_package FALSE)
+            endif()
+        endforeach()
+
+        if(_qt_find_package_skip_find_package)
+            message(AUTHOR_WARNING "qt_find_package(${ARGV0}) called even though the package "
+                   "was already found. Consider removing the call.")
+        endif()
+    endif()
+
+    # Get the version if specified.
+    set(package_version "")
+    if(${ARGC} GREATER_EQUAL 2)
+        if(${ARGV1} MATCHES "^[0-9\.]+$")
+            set(package_version "${ARGV1}")
+        endif()
+    endif()
+
+    if(arg_COMPONENTS)
+        # Re-append components to forward them.
+        list(APPEND arg_UNPARSED_ARGUMENTS "COMPONENTS;${arg_COMPONENTS}")
+    endif()
+
+    if(NOT (arg_CONFIG OR arg_NO_MODULE OR arg_MODULE) AND NOT _qt_find_package_skip_find_package)
+        # Try to find a config package first in quiet mode
+        set(config_package_arg ${arg_UNPARSED_ARGUMENTS})
+        list(APPEND config_package_arg "CONFIG;QUIET")
+        find_package(${config_package_arg})
+
+        # Double check that in config mode the targets become visible. Sometimes
+        # only the module mode creates the targets. For example with vcpkg, the sqlite
+        # package provides sqlite3-config.cmake, which offers multi-config targets but
+        # in their own way. CMake has FindSQLite3.cmake and with the original
+        # qt_find_package(SQLite3) call it is our intention to use the cmake package
+        # in module mode.
+        if (${ARGV0}_FOUND AND arg_PROVIDED_TARGETS)
+            unset(any_target_found)
+            foreach(expected_target ${arg_PROVIDED_TARGETS})
+                if (TARGET ${expected_target})
+                    set(any_target_found TRUE)
+                    break()
+                endif()
+            endforeach()
+            if(NOT any_target_found)
+                unset(${ARGV0}_FOUND)
+            endif()
+        endif()
+    endif()
+
+    # Ensure the options are back in the original unparsed arguments
+    foreach(opt IN LISTS options)
+        if(arg_${opt})
+            list(APPEND arg_UNPARSED_ARGUMENTS ${opt})
+        endif()
+    endforeach()
+
+    if (NOT ${ARGV0}_FOUND AND NOT _qt_find_package_skip_find_package)
+        # Unset the NOTFOUND ${package}_DIR var that might have been set by the previous
+        # find_package call, to get rid of "not found" messagees in the feature summary
+        # if the package is found by the next find_package call.
+        if(DEFINED CACHE{${ARGV0}_DIR} AND NOT ${ARGV0}_DIR)
+            unset(${ARGV0}_DIR CACHE)
+        endif()
+
+        # Call original function without our custom arguments.
+        find_package(${arg_UNPARSED_ARGUMENTS})
+    endif()
+
+    if(${ARGV0}_FOUND AND arg_PROVIDED_TARGETS AND NOT _qt_find_package_skip_find_package)
+        # If package was found, associate each target with its package name. This will be used
+        # later when creating Config files for Qt libraries, to generate correct find_dependency()
+        # calls. Also make the provided targets global, so that the properties can be read in
+        # all scopes.
+        foreach(qt_find_package_target_name ${arg_PROVIDED_TARGETS})
+            if(TARGET ${qt_find_package_target_name})
+                # Allow usage of aliased targets by setting properties on the actual target
+                get_target_property(aliased_target ${qt_find_package_target_name} ALIASED_TARGET)
+                if(aliased_target)
+                    set(qt_find_package_target_name ${aliased_target})
+                endif()
+
+                set_target_properties(${qt_find_package_target_name}
+                                      PROPERTIES INTERFACE_QT_PACKAGE_NAME ${ARGV0})
+                if(package_version)
+                    set_target_properties(${qt_find_package_target_name}
+                                          PROPERTIES INTERFACE_QT_PACKAGE_VERSION ${ARGV1})
+                endif()
+
+                if(arg_COMPONENTS)
+                    string(REPLACE ";" " " components_as_string "${arg_COMPONENTS}")
+                    set_property(TARGET ${qt_find_package_target_name}
+                                 PROPERTY INTERFACE_QT_PACKAGE_COMPONENTS ${components_as_string})
+                endif()
+
+                get_property(is_global TARGET ${qt_find_package_target_name} PROPERTY
+                                                                             IMPORTED_GLOBAL)
+                if(NOT is_global)
+                    set_property(TARGET ${qt_find_package_target_name} PROPERTY
+                                                                       IMPORTED_GLOBAL TRUE)
+                endif()
+            endif()
+
+        endforeach()
+    endif()
+endmacro()
+
+# Creates a simple export set for the various Find* dependencies
+# which are needed when creating a static build of Qt.
+# This introduces a custom target property: INTERFACE_QT_EXPORTED_LIBRARY
+# This target property indicates that Qt modules / plugins using this 3rd party library
+# must add it to their list of dependencies when creating their own ${qtmodule}Config.cmake
+function(qt_install_static_target_export target)
+    if(BUILD_SHARED_LIBS)
+        return()
+    endif()
+
+    qt_parse_all_arguments(arg "qt_install_3rdparty_config_files" "" "EXPORT" "" ${ARGN})
+    # TODO mark EXPORT as required
+
+    set_target_properties(${target}
+        PROPERTIES
+            INTERFACE_QT_EXPORTED_LIBRARY 1)
+
+    qt_path_join(config_install_dir ${QT_CONFIG_INSTALL_DIR} ${arg_EXPORT})
+
+    set(export_name "${arg_EXPORT}Targets")
+    qt_install(
+        TARGETS ${target}
+        EXPORT ${export_name}
+        LIBRARY DESTINATION ${INSTALL_LIBDIR}
+        ARCHIVE DESTINATION ${INSTALL_LIBDIR})
+
+    qt_install(
+        EXPORT ${export_name}
+        DESTINATION "${config_install_dir}"
+    )
+endfunction()
+
+# Create a set of ${target}Config.cmake and ${target}Version.cmake for a
+# third-party library so that it can be found by client code linking statically.
+function(qt_install_3rdparty_config_files target)
+    if(BUILD_SHARED_LIBS)
+       return()
+    endif()
+
+    qt_parse_all_arguments(arg "qt_install_3rdparty_config_files" "" "EXPORT" "PACKAGES;ADDITIONAL_FILES" ${ARGN})
+    # TODO mark EXPORT as required
+
+    set(3RDPARTY_ADDITIONAL_SETUP_CODE)
+    foreach(package ${arg_PACKAGES})
+      list(APPEND 3RDPARTY_ADDITIONAL_SETUP_CODE "find_package(${package})\n")
+    endforeach()
+
+    set(path_suffix "${arg_EXPORT}")
+    qt_path_join(config_build_dir ${QT_CONFIG_BUILD_DIR} ${path_suffix})
+    qt_path_join(config_install_dir ${QT_CONFIG_INSTALL_DIR} ${path_suffix})
+
+    configure_package_config_file(
+        "${PROJECT_SOURCE_DIR}/cmake/3rdpartyConfig.cmake.in"
+        "${config_build_dir}/${target}Config.cmake"
+        INSTALL_DESTINATION "${config_install_dir}"
+    )
+
+    write_basic_package_version_file(
+        "${config_build_dir}/${target}ConfigVersion.cmake"
+        VERSION ${PROJECT_VERSION}
+        COMPATIBILITY AnyNewerVersion
+    )
+
+    qt_install(FILES
+        "${config_build_dir}/${target}Config.cmake"
+        "${config_build_dir}/${target}ConfigVersion.cmake"
+        ${arg_ADDITIONAL_FILES}
+        DESTINATION "${config_install_dir}"
+        COMPONENT Devel
+    )
+endfunction()
+
+# Call this function in 3rdparty find modules that ought to be installed alongside
+# Qt modules and must be found when linking statically.
+function(qt_install_3rdparty_library target)
+    qt_install_static_target_export(${target} EXPORT ${target})
+    qt_install_3rdparty_config_files(${target} EXPORT ${target} ${ARGN})
+endfunction()
+
+macro(qt_find_apple_system_frameworks)
+    if(APPLE)
+        find_library(FWAppKit AppKit)
+        find_library(FWAssetsLibrary AssetsLibrary)
+        find_library(FWAudioToolbox AudioToolbox)
+        find_library(FWApplicationServices ApplicationServices)
+        find_library(FWCarbon Carbon)
+        find_library(FWCoreFoundation CoreFoundation)
+        find_library(FWCoreServices CoreServices)
+        find_library(FWCoreGraphics CoreGraphics)
+        find_library(FWCoreText CoreText)
+        find_library(FWCoreVideo CoreVideo)
+        find_library(FWcups cups)
+        find_library(FWDiskArbitration DiskArbitration)
+        find_library(FWFoundation Foundation)
+        find_library(FWIOBluetooth IOBluetooth)
+        find_library(FWIOKit IOKit)
+        find_library(FWIOSurface IOSurface)
+        find_library(FWImageIO ImageIO)
+        find_library(FWMetal Metal)
+        find_library(FWMobileCoreServices MobileCoreServices)
+        find_library(FWQuartzCore QuartzCore)
+        find_library(FWSecurity Security)
+        find_library(FWSystemConfiguration SystemConfiguration)
+        find_library(FWUIKit UIKit)
+        find_library(FWWatchKit WatchKit)
+        find_library(FWGameController GameController)
+    endif()
+endmacro()
+
+# Match the pattern 'regex' in 'input_line', replace the match with 'replacement'
+# and set that result in 'out_var' in the parent scope.
+function(qt_regex_match_and_get input_line regex replacement out_var)
+    string(REGEX MATCH "${regex}" match "${input_line}")
+    if(match)
+        string(REGEX REPLACE "${regex}" "${replacement}" match "${input_line}")
+        string(STRIP ${match} match)
+        set(${out_var} "${match}" PARENT_SCOPE)
+    endif()
+endfunction()
+
+# Match 'regex' in a list of lines. When found, set the value to 'out_var' and break early.
+function(qt_qlalr_find_option_in_list input_list regex out_var)
+    foreach(line ${input_list})
+        qt_regex_match_and_get("${line}" "${regex}" "\\1" option)
+        if(option)
+            string(TOLOWER ${option} option)
+            set(${out_var} "${option}" PARENT_SCOPE)
+            return()
+        endif()
+    endforeach()
+    message(FATAL_ERROR "qt_qlalr_find_option_in_list: Could not extract ${out_var}")
+endfunction()
+
+# Generate a few output files using qlalr, and assign those to 'consuming_target'.
+# 'input_file_list' is a list of 'foo.g' file paths.
+# 'flags' are extra flags to be passed to qlalr.
+function(qt_process_qlalr consuming_target input_file_list flags)
+    foreach(input_file ${input_file_list})
+        file(STRINGS ${input_file} input_file_lines)
+        qt_qlalr_find_option_in_list("${input_file_lines}" "^%parser(.+)" "parser")
+        qt_qlalr_find_option_in_list("${input_file_lines}" "^%decl(.+)" "decl")
+        qt_qlalr_find_option_in_list("${input_file_lines}" "^%impl(.+)" "impl")
+        get_filename_component(base_file_name ${input_file} NAME_WE)
+
+        set(cpp_file "${parser}.cpp")
+        set(private_file "${parser}_p.h")
+        set(decl_file "${decl}")
+        set(impl_file "${impl}")
+        add_custom_command(
+            OUTPUT ${cpp_file} ${private_file} ${decl_file} ${impl_file}
+            COMMAND ${QT_CMAKE_EXPORT_NAMESPACE}::qlalr ${flags} ${input_file}
+            DEPENDS ${QT_CMAKE_EXPORT_NAMESPACE}::qlalr
+            MAIN_DEPENDENCY ${input_file}
+        )
+        target_sources(${consuming_target} PRIVATE ${cpp_file} ${impl_file})
+    endforeach()
+endfunction()
+
+macro(qt_add_string_to_qconfig_cpp str)
+    string(LENGTH "${str}" length)
+    string(APPEND QT_CONFIG_STRS "    \"${str}\\0\"\n")
+    string(APPEND QT_CONFIG_STR_OFFSETS "    ${QT_CONFIG_STR_OFFSET},\n")
+    math(EXPR QT_CONFIG_STR_OFFSET "${QT_CONFIG_STR_OFFSET}+${length}+1")
+endmacro()
+
+function(qt_generate_qconfig_cpp)
+    set(QT_CONFIG_STR_OFFSET "0")
+    set(QT_CONFIG_STR_OFFSETS "")
+    set(QT_CONFIG_STRS "")
+
+    # Start first part.
+    qt_add_string_to_qconfig_cpp("doc")
+    qt_add_string_to_qconfig_cpp("include")
+    qt_add_string_to_qconfig_cpp("lib")
+    qt_add_string_to_qconfig_cpp("libexec")
+    qt_add_string_to_qconfig_cpp("bin")
+    qt_add_string_to_qconfig_cpp("plugins")
+    qt_add_string_to_qconfig_cpp("qml")
+    qt_add_string_to_qconfig_cpp(".")
+    qt_add_string_to_qconfig_cpp(".")
+    qt_add_string_to_qconfig_cpp("translations")
+    qt_add_string_to_qconfig_cpp("examples")
+    qt_add_string_to_qconfig_cpp("tests")
+
+    # Save first part.
+    set(QT_CONFIG_STR_OFFSETS_FIRST "${QT_CONFIG_STR_OFFSETS}")
+    set(QT_CONFIG_STRS_FIRST "${QT_CONFIG_STRS}")
+
+    # Start second part.
+    set(QT_CONFIG_STR_OFFSETS "")
+    set(QT_CONFIG_STRS "")
+
+    qt_add_string_to_qconfig_cpp("")
+    qt_add_string_to_qconfig_cpp("false")
+    qt_add_string_to_qconfig_cpp("bin")
+    qt_add_string_to_qconfig_cpp("lib")
+    qt_add_string_to_qconfig_cpp(".")
+    qt_add_string_to_qconfig_cpp("${QT_QMAKE_TARGET_MKSPEC}")
+    qt_add_string_to_qconfig_cpp("${QT_QMAKE_HOST_MKSPEC}")
+
+    # Save second part.
+    set(QT_CONFIG_STR_OFFSETS_SECOND "${QT_CONFIG_STR_OFFSETS}")
+    set(QT_CONFIG_STRS_SECOND "${QT_CONFIG_STRS}")
+
+    # Settings path / sysconf dir.
+    if(APPLE)
+        set(QT_DEFAULT_SYS_CONF_DIR "/Library/Preferences/Qt")
+    else()
+        set(QT_DEFAULT_SYS_CONF_DIR "etc/xdg")
+    endif()
+
+    # Compute and set relocation prefixes.
+    # TODO: Clean this up, there's a bunch of unrealistic assumptions here.
+    # See qtConfOutput_preparePaths in qtbase/configure.pri.
+    if(WIN32)
+        set(lib_location_absolute_path "${CMAKE_INSTALL_PREFIX}/${INSTALL_BINDIR}")
+    else()
+        set(lib_location_absolute_path "${CMAKE_INSTALL_PREFIX}/${INSTALL_LIBDIR}")
+    endif()
+    file(RELATIVE_PATH from_lib_location_to_prefix
+         "${lib_location_absolute_path}" "${CMAKE_INSTALL_PREFIX}")
+
+    if(QT_HOST_PATH)
+        set(host_prefix "${QT_HOST_PATH}")
+        set(host_bin_dir_absolute_path "${QT_HOST_PATH}/${INSTALL_BINDIR}")
+    else()
+        set(host_prefix "${CMAKE_INSTALL_PREFIX}")
+        set(host_bin_dir_absolute_path "${CMAKE_INSTALL_PREFIX}/${INSTALL_BINDIR}")
+    endif()
+
+    file(RELATIVE_PATH from_host_bin_dir_to_host_prefix
+         "${host_bin_dir_absolute_path}" "${host_prefix}")
+
+    # TODO: Fix this to use the equivalent of extprefix on CMake (CMAKE_STAGING_PREFIX?)
+    # For now just assume ext prefix is same as regular prefix.
+    file(RELATIVE_PATH from_host_bin_dir_to_ext_prefix
+         "${host_bin_dir_absolute_path}" "${CMAKE_INSTALL_PREFIX}")
+
+
+    set(QT_CONFIGURE_LIBLOCATION_TO_PREFIX_PATH "${from_lib_location_to_prefix}")
+    set(QT_CONFIGURE_HOSTBINDIR_TO_HOSTPREFIX_PATH "${from_host_bin_dir_to_host_prefix}")
+    set(QT_CONFIGURE_HOSTBINDIR_TO_EXTPREFIX_PATH "${from_host_bin_dir_to_ext_prefix}")
+
+    configure_file(global/qconfig.cpp.in global/qconfig.cpp @ONLY)
+endfunction()
+
+function(qt_set_language_standards)
+    ## Use the latest standard the compiler supports (same as qt_common.prf)
+    if (QT_FEATURE_cxx2a)
+        set(CMAKE_CXX_STANDARD 20 PARENT_SCOPE)
+    else()
+        set(CMAKE_CXX_STANDARD 17 PARENT_SCOPE)
+    endif()
+
+    if (c_std_11 IN_LIST CMAKE_C_COMPILE_FEATURES)
+        set(CMAKE_C_STANDARD 11 PARENT_SCOPE)
+    elseif (c_std_99 IN_LIST CMAKE_C_COMPILE_FEATURES)
+        set(CMAKE_C_STANDARD 99 PARENT_SCOPE)
+    endif()
+endfunction()
+
+function(qt_enable_msvc_cplusplus_define target visibility)
+    # For MSVC we need to explicitly pass -Zc:__cplusplus to get correct __cplusplus.
+    # Check qt_config_compile_test for more info.
+    if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC" AND MSVC_VERSION GREATER_EQUAL 1913)
+        target_compile_options("${target}" ${visibility} "-Zc:__cplusplus")
+    endif()
+endfunction()
+
+# Compatibility macros that should be removed once all their usages are removed.
+function(extend_target)
+    qt_extend_target(${ARGV})
+endfunction()
+
+function(add_qt_module)
+    qt_add_module(${ARGV})
+endfunction()
+
+function(add_qt_plugin)
+    qt_add_plugin(${ARGV})
+endfunction()
+
+function(add_qt_tool)
+    qt_add_tool(${ARGV})
+endfunction()
+
+function(add_qt_test)
+    qt_add_test(${ARGV})
+endfunction()
+
+function(add_qt_test_helper)
+    qt_add_test_helper(${ARGV})
+endfunction()
+
+function(add_qt_manual_test)
+    qt_add_manual_test(${ARGV})
+endfunction()
+
+function(add_qt_benchmark)
+    qt_add_benchmark(${ARGV})
+endfunction()
+
+function(add_qt_executable)
+    qt_add_executable(${ARGV})
+endfunction()
+
+function(add_qt_simd_part)
+    qt_add_simd_part(${ARGV})
+endfunction()
+
+function(add_qt_docs)
+    qt_add_docs(${ARGV})
+endfunction()
+
+function(add_qt_resource)
+    qt_add_resource(${ARGV})
+endfunction()
+
+function(add_cmake_library)
+    qt_add_cmake_library(${ARGV})
+endfunction()
diff --git a/cmake/QtBuildInformation.cmake b/cmake/QtBuildInformation.cmake
new file mode 100644
index 0000000000..097192b2ab
--- /dev/null
+++ b/cmake/QtBuildInformation.cmake
@@ -0,0 +1,35 @@
+function(qt_print_feature_summary)
+    include(FeatureSummary)
+    feature_summary(WHAT PACKAGES_FOUND
+                         REQUIRED_PACKAGES_NOT_FOUND
+                         RECOMMENDED_PACKAGES_NOT_FOUND
+                         OPTIONAL_PACKAGES_NOT_FOUND
+                         RUNTIME_PACKAGES_NOT_FOUND
+                         FATAL_ON_MISSING_REQUIRED_PACKAGES)
+endfunction()
+
+function(qt_print_build_instructions)
+    if((NOT PROJECT_NAME STREQUAL "QtBase" AND
+        NOT PROJECT_NAME STREQUAL "Qt") OR
+       QT_BUILD_STANDALONE_TESTS)
+
+        return()
+    endif()
+
+    set(build_command "cmake --build . --parallel")
+    set(install_command "cmake --install .")
+
+    message("Qt is now configured for building. Just run '${build_command}'.")
+    if(QT_WILL_INSTALL)
+        message("Once everything is built, you must run '${install_command}'.")
+        message("Qt will be installed into '${CMAKE_INSTALL_PREFIX}'")
+    else()
+        message("Once everything is built, Qt is installed.")
+        message("You should NOT run '${install_command}'")
+        message("Note that this build cannot be deployed to other machines or devices.")
+    endif()
+    message("To configure and build other modules, you can use the following convenience script:
+        ${CMAKE_INSTALL_PREFIX}/${INSTALL_BINDIR}/qt-cmake")
+    message("\nIf reconfiguration fails for some reason, try to remove 'CMakeCache.txt' \
+from the build directory \n")
+endfunction()
diff --git a/cmake/QtBuildInternals/QtBuildInternalsAndroid.cmake b/cmake/QtBuildInternals/QtBuildInternalsAndroid.cmake
new file mode 100644
index 0000000000..51645f48d5
--- /dev/null
+++ b/cmake/QtBuildInternals/QtBuildInternalsAndroid.cmake
@@ -0,0 +1,217 @@
+#
+# Android specific functions/macros/properties required for building Qt Modules
+#
+
+define_property(TARGET
+    PROPERTY
+        QT_ANDROID_MODULE_INSTALL_DIR
+    BRIEF_DOCS
+        "Recorded install location for a Qt Module."
+    FULL_DOCS
+        "Recorded install location for a Qt Module. Used by qt_android_dependencies()."
+)
+
+
+define_property(TARGET
+    PROPERTY
+        QT_ANDROID_JAR_DEPENDENCIES
+    BRIEF_DOCS
+        "Qt Module Jar dependencies list."
+    FULL_DOCS
+        "Qt Module Jar dependencies list."
+)
+
+define_property(TARGET
+    PROPERTY
+        QT_ANDROID_BUNDLED_JAR_DEPENDENCIES
+    BRIEF_DOCS
+        "Qt Module Jars that should be bundled with it during packing."
+    FULL_DOCS
+        "Qt Module Jars that should be bundled with it during packing."
+)
+
+define_property(TARGET
+    PROPERTY
+        QT_ANDROID_LIB_DEPENDENCIES
+    BRIEF_DOCS
+        "Qt Module C++ libraries that should be bundled with it during packing."
+    FULL_DOCS
+        "Qt Module C++ libraries that should be bundled with it during packing."
+)
+
+define_property(TARGET
+    PROPERTY
+        QT_ANDROID_LIB_DEPENDENCY_REPLACEMENTS
+    BRIEF_DOCS
+        "Qt Module C++ libraries that can replace libraries declared with the QT_ANDROID_LIB_DEPENDENCIES property."
+    FULL_DOCS
+        "Qt Module C++ libraries that can replace libraries declared with the QT_ANDROID_LIB_DEPENDENCIES property."
+)
+
+define_property(TARGET
+    PROPERTY
+        QT_ANDROID_BUNDLED_FILES
+    BRIEF_DOCS
+        "Qt Module files that need to be bundled during packing."
+    FULL_DOCS
+        "Qt Module files that need to be bundled during packing."
+)
+
+define_property(TARGET
+    PROPERTY
+        QT_ANDROID_PERMISSIONS
+    BRIEF_DOCS
+        "Qt Module android permission list."
+    FULL_DOCS
+        "Qt Module android permission list."
+)
+# Generate Qt Module -android-dependencies.xml required by the
+# androiddeploytoolqt to successfully copy all the plugins and other dependent
+# items into tha APK
+function(qt_android_dependencies target)
+    get_target_property(target_type "${target}" TYPE)
+    if(target_type STREQUAL "INTERFACE_LIBRARY")
+        return()
+    endif()
+
+    get_target_property(arg_JAR_DEPENDENCIES ${target} QT_ANDROID_JAR_DEPENDENCIES)
+    get_target_property(arg_BUNDLED_JAR_DEPENDENCIES ${target} QT_ANDROID_BUNDLED_JAR_DEPENDENCIES)
+    get_target_property(arg_LIB_DEPENDENCIES ${target} QT_ANDROID_LIB_DEPENDENCIES)
+    get_target_property(arg_LIB_DEPENDENCY_REPLACEMENTS ${target} QT_ANDROID_LIB_DEPENDENCY_REPLACEMENTS)
+    get_target_property(arg_BUNDLED_FILES ${target} QT_ANDROID_BUNDLED_FILES)
+    get_target_property(arg_PERMISSIONS ${target} QT_ANDROID_PERMISSIONS)
+    get_target_property(module_plugins ${target} MODULE_PLUGIN_TYPES)
+
+    if ((NOT module_plugins)
+        AND (NOT arg_JAR_DEPENDENCIES)
+        AND (NOT arg_LIB_DEPENDENCY_REPLACEMENTS)
+        AND (NOT arg_LIB_DEPENDENCIES)
+        AND (NOT arg_BUNDLED_JAR_DEPENDENCIES)
+        AND (NOT arg_PERMISSIONS)
+        AND (NOT arg_BUNDLED_FILES))
+        # None of the values were set, so there's nothing to do
+        return()
+    endif()
+
+
+    get_target_property(target_output_name ${target} OUTPUT_NAME)
+    if (NOT target_output_name)
+        set(target_name ${target})
+    else()
+        set(target_name ${target_output_name})
+    endif()
+
+    # mimic qmake's section and string splitting from
+    # mkspecs/feature/qt_android_deps.prf
+    macro(section string delimiter first second)
+        string(FIND ${string} ${delimiter} delimiter_location)
+        if (NOT ${delimiter_location} EQUAL -1)
+            string(SUBSTRING ${string} 0 ${delimiter_location} ${first})
+            math(EXPR delimiter_location "${delimiter_location} + 1")
+            string(SUBSTRING ${string} ${delimiter_location} -1 ${second})
+        else()
+            set(${first} ${string})
+            set(${second} "")
+        endif()
+    endmacro()
+
+    get_target_property(target_bin_dir ${target} BINARY_DIR)
+    set(dependency_file "${target_bin_dir}/${target_name}_${CMAKE_ANDROID_ARCH_ABI}-android-dependencies.xml")
+
+    set(file_contents "<rules><dependencies>\n")
+    string(APPEND file_contents "<lib name=\"${target_name}_${CMAKE_ANDROID_ARCH_ABI}\"><depends>\n")
+
+    # Jar Dependencies
+    if(arg_JAR_DEPENDENCIES)
+        foreach(jar_dependency IN LISTS arg_JAR_DEPENDENCIES)
+            section(${jar_dependency} ":" jar_file init_class)
+            if (init_class)
+                set(init_class "initClass=\"${init_class}\"")
+            endif()
+            file(TO_NATIVE_PATH ${jar_file} jar_file_native)
+            string(APPEND file_contents "<jar file=\"${jar_file_native}\" ${init_class} />\n")
+        endforeach()
+    endif()
+
+    # Bundled Jar Dependencies
+    if(arg_BUNDLED_JAR_DEPENDENCIES)
+        foreach(jar_bundle IN LISTS arg_BUNDLED_JAR_DEPENDENCIES)
+            section(${jar_bundle} ":" bundle_file init_calss)
+            if (init_class)
+                set(init_class "initClass=\"${init_class}\"")
+            endif()
+            file(TO_NATIVE_PATH ${jar_bundle} jar_bundle_native)
+            string(APPEND file_contents "<jar bundling=\"1\" file=\"${jar_bundle_native}\" ${init_class} />\n")
+        endforeach()
+    endif()
+
+    # Lib Dependencies
+    if(arg_LIB_DEPENDENCIES)
+        foreach(lib IN LISTS arg_LIB_DEPENDENCIES)
+            string(REPLACE ".so" "_${CMAKE_ANDROID_ARCH_ABI}.so" lib ${lib})
+            section(${lib} ":" lib_file lib_extends)
+            if (lib_extends)
+                set(lib_extends "extends=\"${lib_extends}\"")
+            endif()
+            file(TO_NATIVE_PATH ${lib_file} lib_file_native)
+            string(APPEND file_contents "<lib file=\"${lib_file_native}\" ${lib_extends} />\n")
+        endforeach()
+    endif()
+
+    # Lib Dependencies Replacements
+    if(arg_LIB_DEPENDENCY_REPLACEMENTS)
+        foreach(lib IN LISTS arg_LIB_DEPENDENCY_REPLACEMENTS)
+            string(REPLACE ".so" "_${CMAKE_ANDROID_ARCH_ABI}.so" lib ${lib})
+            section(${lib} ":" lib_file lib_replacement)
+            if (lib_replacement)
+                file(TO_NATIVE_PATH ${lib_replacement} lib_replacement_native)
+                set(lib_replacement "replaces=\"${lib_replacement_native}\"")
+            endif()
+            file(TO_NATIVE_PATH ${lib_file} lib_file_native)
+            string(APPEND file_contents "<lib file=\"${lib_file_native}\" ${lib_replacement} />\n")
+        endforeach()
+    endif()
+
+
+    # Bundled files
+    if(arg_BUNDLED_FILES)
+        foreach(file IN LISTS arg_BUNDLED_FILES)
+            file(TO_NATIVE_PATH ${lib_file} file_native)
+            string(APPEND file_contents "<bundled file=\"${file_native}\" />\n")
+        endforeach()
+    endif()
+
+    # Module plugins
+    if(module_plugins)
+        foreach(plugin IN LISTS module_plugins)
+            string(APPEND file_contents "<bundled file=\"plugins/${plugin}\" />\n")
+        endforeach()
+    endif()
+
+    # Android Permissions
+    if(arg_PERMISSIONS)
+        foreach(permission IN LISTS arg_PERMISSIONS)
+            string(APPEND file_contents "<permission name=\"${permission}\" />\n")
+        endforeach()
+    endif()
+
+    string(APPEND file_contents "</depends></lib>")
+    string(APPEND file_contents "</dependencies></rules>\n")
+    file(WRITE ${dependency_file} ${file_contents})
+
+    get_target_property(target_install_dir ${target} QT_ANDROID_MODULE_INSTALL_DIR)
+    if (NOT target_install_dir)
+        message(SEND_ERROR "qt_android_dependencies: Target ${target} is either not a Qt Module or has no recorded install location")
+        return()
+    endif()
+
+    # Copy file into install directory, required by the androiddeployqt tool.
+    qt_install(FILES
+        ${dependency_file}
+        DESTINATION
+            ${target_install_dir}
+        COMPONENT
+            Devel)
+endfunction()
+
+
diff --git a/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake b/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake
new file mode 100644
index 0000000000..b44ec7f435
--- /dev/null
+++ b/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake
@@ -0,0 +1,242 @@
+if (CMAKE_VERSION VERSION_LESS 3.1.0)
+    message(FATAL_ERROR "Qt requires at least CMake version 3.1.0")
+endif()
+
+######################################
+#
+#       Macros for building Qt modules
+#
+######################################
+
+if(EXISTS "${CMAKE_CURRENT_LIST_DIR}/QtBuildInternalsExtra.cmake")
+    include(${CMAKE_CURRENT_LIST_DIR}/QtBuildInternalsExtra.cmake)
+endif()
+
+macro(qt_set_up_build_internals_paths)
+    # Set up the paths for the cmake modules located in the prefix dir. Prepend, so the paths are
+    # least important compared to the source dir ones, but more important than command line
+    # provided ones.
+    set(QT_CMAKE_MODULE_PATH "${QT_BUILD_INTERNALS_PATH}/../${QT_CMAKE_EXPORT_NAMESPACE}")
+    list(PREPEND CMAKE_MODULE_PATH "${QT_CMAKE_MODULE_PATH}")
+
+    # Prepend the qtbase source cmake directory to CMAKE_MODULE_PATH,
+    # so that if a change is done in cmake/QtBuild.cmake, it gets automatically picked up when
+    # building qtdeclarative, rather than having to build qtbase first (which will copy
+    # QtBuild.cmake to the build dir). This is similar to qmake non-prefix builds, where the
+    # source qtbase/mkspecs directory is used.
+    if(EXISTS "${QT_SOURCE_TREE}/cmake")
+        list(PREPEND CMAKE_MODULE_PATH "${QT_SOURCE_TREE}/cmake")
+    endif()
+
+    # If the repo has its own cmake modules, include those in the module path.
+    if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
+        list(PREPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
+    endif()
+
+    # Find the cmake files when doing a standalone tests build.
+    if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/../cmake")
+        list(PREPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../cmake")
+    endif()
+endmacro()
+
+# Set up the build internal paths unless explicitly requested not to.
+if(NOT QT_BUILD_INTERNALS_SKIP_CMAKE_MODULE_PATH_ADDITION)
+    qt_set_up_build_internals_paths()
+endif()
+
+# Define some constants to check for certain platforms, etc.
+# Needs to be loaded before qt_repo_build() to handle require() clauses before even starting a repo
+# build.
+include(QtPlatformSupport)
+
+macro(qt_build_repo_begin)
+    # Qt specific setup common for all modules:
+    include(QtSetup)
+    include(FeatureSummary)
+
+    # Optionally include a repo specific Setup module.
+    include(${PROJECT_NAME}Setup OPTIONAL)
+    include(QtRepoSetup OPTIONAL)
+
+    # Find Apple frameworks if needed.
+    qt_find_apple_system_frameworks()
+
+    # Decide whether tools will be built.
+    qt_check_if_tools_will_be_built()
+
+
+    string(TOLOWER ${PROJECT_NAME} project_name_lower)
+
+    set(qt_docs_target_name docs_${project_name_lower})
+    set(qt_docs_prepare_target_name prepare_docs_${project_name_lower})
+    set(qt_docs_generate_target_name generate_docs_${project_name_lower})
+    set(qt_docs_html_target_name html_docs_${project_name_lower})
+    set(qt_docs_qch_target_name qch_docs_${project_name_lower})
+    set(qt_docs_install_html_target_name install_html_docs_${project_name_lower})
+    set(qt_docs_install_qch_target_name install_qch_docs_${project_name_lower})
+    set(qt_docs_install_target_name install_docs_${project_name_lower})
+
+    add_custom_target(${qt_docs_target_name})
+    add_custom_target(${qt_docs_prepare_target_name})
+    add_custom_target(${qt_docs_generate_target_name})
+    add_custom_target(${qt_docs_qch_target_name})
+    add_custom_target(${qt_docs_html_target_name})
+    add_custom_target(${qt_docs_install_html_target_name})
+    add_custom_target(${qt_docs_install_qch_target_name})
+    add_custom_target(${qt_docs_install_target_name})
+
+    add_dependencies(${qt_docs_generate_target_name} ${qt_docs_prepare_target_name})
+    add_dependencies(${qt_docs_html_target_name} ${qt_docs_generate_target_name})
+    add_dependencies(${qt_docs_target_name} ${qt_docs_html_target_name} ${qt_docs_qch_target_name})
+    add_dependencies(${qt_docs_install_html_target_name} ${qt_docs_html_target_name})
+    add_dependencies(${qt_docs_install_qch_target_name} ${qt_docs_qch_target_name})
+    add_dependencies(${qt_docs_install_target_name} ${qt_docs_install_html_target_name} ${qt_docs_install_qch_target_name})
+endmacro()
+
+macro(qt_build_repo_end)
+    include(QtBuildInformation)
+
+    if(NOT QT_BUILD_STANDALONE_TESTS)
+        # Delayed actions on some of the Qt targets:
+        include(QtPostProcess)
+
+        # Install the repo-specific cmake find modules.
+        qt_path_join(__qt_repo_install_dir ${QT_CONFIG_INSTALL_DIR} ${INSTALL_CMAKE_NAMESPACE})
+
+        if(NOT PROJECT_NAME STREQUAL "QtBase")
+            if (EXISTS cmake)
+                qt_copy_or_install(DIRECTORY cmake/
+                    DESTINATION "${__qt_repo_install_dir}"
+                    FILES_MATCHING PATTERN "Find*.cmake"
+                )
+            endif()
+        endif()
+
+        if(NOT QT_SUPERBUILD)
+            qt_print_feature_summary()
+        endif()
+    endif()
+
+    if(NOT QT_SUPERBUILD)
+        qt_print_build_instructions()
+    endif()
+endmacro()
+
+macro(qt_build_repo)
+    qt_build_repo_begin(${ARGN})
+
+    # If testing is enabled, try to find the qtbase Test package.
+    # Do this before adding src, because there might be test related conditions
+    # in source.
+    if (BUILD_TESTING AND NOT QT_BUILD_STANDALONE_TESTS)
+        find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS Test)
+    endif()
+
+    if(NOT QT_BUILD_STANDALONE_TESTS)
+        if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/src/CMakeLists.txt")
+            add_subdirectory(src)
+        endif()
+
+        if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/tools/CMakeLists.txt")
+            add_subdirectory(tools)
+        endif()
+    endif()
+
+    if (BUILD_TESTING AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/tests/CMakeLists.txt")
+        add_subdirectory(tests)
+        if(QT_NO_MAKE_TESTS)
+            set_property(DIRECTORY tests PROPERTY EXCLUDE_FROM_ALL TRUE)
+        endif()
+    endif()
+
+    qt_build_repo_end()
+
+    if (BUILD_EXAMPLES AND BUILD_SHARED_LIBS
+            AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/examples/CMakeLists.txt"
+            AND NOT QT_BUILD_STANDALONE_TESTS)
+        add_subdirectory(examples)
+        if(QT_NO_MAKE_EXAMPLES)
+            set_property(DIRECTORY examples PROPERTY EXCLUDE_FROM_ALL TRUE)
+        endif()
+    endif()
+endmacro()
+
+macro(qt_set_up_standalone_tests_build)
+    # Remove this macro once all usages of it have been removed.
+    # Standalone tests are not handled via the main repo project and qt_build_tests.
+endmacro()
+
+macro(qt_build_tests)
+    if(QT_BUILD_STANDALONE_TESTS)
+        # Find location of TestsConfig.cmake. These contain the modules that need to be
+        # find_package'd when testing.
+        set(_qt_build_tests_install_prefix
+            "${QT_CONFIG_INSTALL_DIR}/${INSTALL_CMAKE_NAMESPACE}BuildInternals/StandaloneTests")
+        if(QT_WILL_INSTALL)
+            qt_path_join(_qt_build_tests_install_prefix
+                         ${CMAKE_INSTALL_PREFIX} ${_qt_build_tests_install_prefix})
+        endif()
+        include("${_qt_build_tests_install_prefix}/${PROJECT_NAME}TestsConfig.cmake" OPTIONAL)
+
+        # Of course we always need the test module as well.
+        find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS Test)
+
+        # Set language standards after finding Core, because that's when the relevant
+        # feature variables are available, and the call in QtSetup is too early when building
+        # standalone tests, because Core was not find_package()'d yet.
+        qt_set_language_standards()
+    endif()
+
+    if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/auto/CMakeLists.txt")
+        add_subdirectory(auto)
+    endif()
+    if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/benchmarks/CMakeLists.txt" AND QT_BUILD_BENCHMARKS)
+        add_subdirectory(benchmarks)
+    endif()
+    if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/manual/CMakeLists.txt")
+        # add_subdirectory(manual) don't build manual tests for now, because qmake doesn't.
+    endif()
+endmacro()
+
+macro(qt_examples_build_begin)
+    # Examples that are built as part of the Qt build need to use the CMake config files from the
+    # build dir, because they are not installed yet in a prefix build.
+    # Appending to CMAKE_PREFIX_PATH helps find the initial Qt6Config.cmake.
+    # Appending to QT_EXAMPLES_CMAKE_PREFIX_PATH helps find components of Qt6, because those
+    # find_package calls use NO_DEFAULT_PATH, and thus CMAKE_PREFIX_PATH is ignored.
+    list(APPEND CMAKE_PREFIX_PATH "${QT_BUILD_DIR}")
+    list(APPEND QT_EXAMPLES_CMAKE_PREFIX_PATH "${QT_BUILD_DIR}")
+    # Also make sure the CMake config files do not recreate the already-existing targets
+    set(QT_NO_CREATE_TARGETS TRUE)
+    set(BACKUP_CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ${CMAKE_FIND_ROOT_PATH_MODE_PACKAGE})
+    set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE "BOTH")
+endmacro()
+
+macro(qt_examples_build_end)
+    # We use AUTOMOC/UIC/RCC in the examples. Make sure to not fail on a fresh Qt build, that e.g. the moc binary does not exist yet.
+
+    # This function gets all targets below this directory
+    function(get_all_targets _result _dir)
+        get_property(_subdirs DIRECTORY "${_dir}" PROPERTY SUBDIRECTORIES)
+        foreach(_subdir IN LISTS _subdirs)
+            get_all_targets(${_result} "${_subdir}")
+        endforeach()
+        get_property(_sub_targets DIRECTORY "${_dir}" PROPERTY BUILDSYSTEM_TARGETS)
+        set(${_result} ${${_result}} ${_sub_targets} PARENT_SCOPE)
+    endfunction()
+
+    get_all_targets(targets "${CMAKE_CURRENT_SOURCE_DIR}")
+
+    foreach(target ${targets})
+        qt_autogen_tools(${target} ENABLE_AUTOGEN_TOOLS "moc" "rcc")
+        if(TARGET Qt::Widgets)
+            qt_autogen_tools(${target} ENABLE_AUTOGEN_TOOLS "uic")
+        endif()
+    endforeach()
+
+    set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ${BACKUP_CMAKE_FIND_ROOT_PATH_MODE_PACKAGE})
+endmacro()
+
+if (ANDROID)
+    include(${CMAKE_CURRENT_LIST_DIR}/QtBuildInternalsAndroid.cmake)
+endif()
diff --git a/cmake/QtBuildInternalsExtra.cmake.in b/cmake/QtBuildInternalsExtra.cmake.in
new file mode 100644
index 0000000000..5278890337
--- /dev/null
+++ b/cmake/QtBuildInternalsExtra.cmake.in
@@ -0,0 +1,37 @@
+# Propagate common variables via BuildInternals package.
+set(QT_BUILD_SHARED_LIBS @BUILD_SHARED_LIBS@)
+option(BUILD_SHARED_LIBS "Build Qt statically or dynamically" @BUILD_SHARED_LIBS@)
+set(QT_CMAKE_EXPORT_NAMESPACE @QT_CMAKE_EXPORT_NAMESPACE@)
+set(INSTALL_CMAKE_NAMESPACE @INSTALL_CMAKE_NAMESPACE@)
+set(QT_BUILD_INTERNALS_PATH "${CMAKE_CURRENT_LIST_DIR}")
+
+# Propagate the original install prefix, so that a developer building a child module can
+# specify CMAKE_PREFIX_PATH for finding the Qt modules instead of CMAKE_INSTALL_PREFIX.
+set(CMAKE_INSTALL_PREFIX @CMAKE_INSTALL_PREFIX@ CACHE PATH
+    "Install path prefix, prepended onto install directories." FORCE)
+
+# Propagate developer builds to other modules via BuildInternals package.
+if(@FEATURE_developer_build@)
+    set(FEATURE_developer_build ON CACHE BOOL "Developer build." FORCE)
+endif()
+
+# Propagate non-prefix builds.
+set(QT_WILL_INSTALL @QT_WILL_INSTALL@ CACHE BOOL
+    "Boolean indicating if doing a Qt prefix build (vs non-prefix build)." FORCE)
+
+set(QT_SOURCE_TREE "@QT_SOURCE_TREE@" CACHE PATH
+"A path to the source tree of the previously configured QtBase project." FORCE)
+
+# Propagate decision of building tests and examples to other repositories.
+set(BUILD_TESTING @BUILD_TESTING@ CACHE BOOL "Build the testing tree.")
+set(BUILD_EXAMPLES @BUILD_EXAMPLES@ CACHE BOOL "Build Qt examples")
+set(QT_NO_MAKE_TESTS @QT_NO_MAKE_TESTS@ CACHE BOOL
+    "Should tests be built as part of the default 'all' target.")
+set(QT_NO_MAKE_EXAMPLES @QT_NO_MAKE_EXAMPLES@ CACHE BOOL
+    "Should examples be built as part of the default 'all' target.")
+
+# Propagate usage of ccache.
+set(QT_USE_CCACHE @QT_USE_CCACHE@ CACHE BOOL "Enable the use of ccache")
+
+# Extra set of exported variables
+@QT_EXTRA_BUILD_INTERNALS_VARS@
diff --git a/cmake/QtCompilerFlags.cmake b/cmake/QtCompilerFlags.cmake
new file mode 100644
index 0000000000..a376ac0097
--- /dev/null
+++ b/cmake/QtCompilerFlags.cmake
@@ -0,0 +1,25 @@
+# Set warnings. All compilers except MSVC support -Wall -Wextra
+# Allow opting out by setting a QT_COMPILE_WARNINGS_OFF property on targets. This would be the
+# equivalent of qmake's CONFIG += warn_off.
+
+set(_qt_compiler_warning_flags_on "")
+set(_qt_compiler_warning_flags_off "")
+
+if (MSVC)
+    list(APPEND _qt_compiler_warning_flags_on /W3)
+    list(APPEND _qt_compiler_warning_flags_off -W0)
+else()
+    list(APPEND _qt_compiler_warning_flags_on -Wall -Wextra)
+    list(APPEND _qt_compiler_warning_flags_off -w)
+endif()
+
+set(_qt_compiler_warning_flags_condition
+    "$<BOOL:$<TARGET_PROPERTY:QT_COMPILE_OPTIONS_DISABLE_WARNINGS>>")
+set(_qt_compiler_warning_flags_genex
+    "$<IF:${_qt_compiler_warning_flags_condition},${_qt_compiler_warning_flags_off},${_qt_compiler_warning_flags_on}>")
+
+# Need to replace semicolons so that the list is not wrongly expanded in the add_compile_options
+# call.
+string(REPLACE ";" "$<SEMICOLON>"
+       _qt_compiler_warning_flags_genex "${_qt_compiler_warning_flags_genex}")
+add_compile_options(${_qt_compiler_warning_flags_genex})
diff --git a/cmake/QtCompilerOptimization.cmake b/cmake/QtCompilerOptimization.cmake
new file mode 100644
index 0000000000..1f50044a6f
--- /dev/null
+++ b/cmake/QtCompilerOptimization.cmake
@@ -0,0 +1,123 @@
+if (QCC)
+    set(QT_CFLAGS_SSE2      "-msse2")
+    set(QT_CFLAGS_SSE3      "-msse3")
+    set(QT_CFLAGS_SSSE3     "-mssse3")
+    set(QT_CFLAGS_SSE4_1    "-msse4.1")
+    set(QT_CFLAGS_SSE4_2    "-msse4.2")
+    set(QT_CFLAGS_AVX       "-mavx")
+    set(QT_CFLAGS_AVX2      "-mavx2")
+    set(QT_CFLAGS_AESNI     "-maes")
+    set(QT_CFLAGS_SHANI     "-msha")
+endif()
+
+if (MSVC)
+    if (QT_64BIT)
+        # SSE2 is mandatory on 64-bit mode, so skip the option. It triggers:
+        # cl : Command line warning D9002 : ignoring unknown option '-arch:SSE2'
+        set(QT_CFLAGS_SSE2   "")
+    else()
+        set(QT_CFLAGS_SSE2   "-arch:SSE2")
+    endif()
+    set(QT_CFLAGS_SSE3       "${QT_CFLAGS_SSE2}")
+    set(QT_CFLAGS_SSSE3      "${QT_CFLAGS_SSE2}")
+    set(QT_CFLAGS_SSE4_1     "${QT_CFLAGS_SSE2}")
+    set(QT_CFLAGS_SSE4_2     "${QT_CFLAGS_SSE2}")
+    set(QT_CFLAGS_AESNI      "${QT_CFLAGS_SSE2}")
+    set(QT_CFLAGS_SHANI      "${QT_CFLAGS_SSE2}")
+
+    # FIXME to be Visual Studio version specific, like in mkspecs/common/msvc-version.conf
+    set(QT_CFLAGS_AVX     "-arch:AVX")
+    set(QT_CFLAGS_AVX2    "-arch:AVX2")
+    set(QT_CFLAGS_F16C    "-arch:AVX")
+    set(QT_CFLAGS_RDRND   "")
+    set(QT_CFLAGS_AVX512F "-arch:AVX512")
+    set(QT_CFLAGS_AVX512ER "-arch:AVX512")
+    set(QT_CFLAGS_AVX512CD "-arch:AVX512")
+    set(QT_CFLAGS_AVX512PF "-arch:AVX512")
+    set(QT_CFLAGS_AVX512DQ "-arch:AVX512")
+    set(QT_CFLAGS_AVX512BW "-arch:AVX512")
+    set(QT_CFLAGS_AVX512VL "-arch:AVX512")
+    set(QT_CFLAGS_AVX512IFMA "-arch:AVX512")
+    set(QT_CFLAGS_AVX512VBMI "-arch:AVX512")
+endif()
+
+if(GCC OR CLANG)
+    set(QT_CFLAGS_SSE2       "-msse2")
+    set(QT_CFLAGS_SSE3       "-msse3")
+    set(QT_CFLAGS_SSSE3      "-mssse3")
+    set(QT_CFLAGS_SSE4_1     "-msse4.1")
+    set(QT_CFLAGS_SSE4_2     "-msse4.2")
+    set(QT_CFLAGS_F16C       "-mf16c")
+    set(QT_CFLAGS_RDRND      "-mrdrnd")
+    set(QT_CFLAGS_AVX        "-mavx")
+    set(QT_CFLAGS_AVX2       "-mavx2")
+    set(QT_CFLAGS_AVX512F    "-mavx512f")
+    set(QT_CFLAGS_AVX512ER   "-mavx512er")
+    set(QT_CFLAGS_AVX512CD   "-mavx512cd")
+    set(QT_CFLAGS_AVX512PF   "-mavx512pf")
+    set(QT_CFLAGS_AVX512DQ   "-mavx512dq")
+    set(QT_CFLAGS_AVX512BW   "-mavx512bw")
+    set(QT_CFLAGS_AVX512VL   "-mavx512vl")
+    set(QT_CFLAGS_AVX512IFMA "-mavx512ifma")
+    set(QT_CFLAGS_AVX512VBMI "-mavx512vbmi")
+    set(QT_CFLAGS_AESNI      "-maes")
+    set(QT_CFLAGS_SHANI      "-msha")
+    if(NOT APPLE_UIKIT AND NOT QT_64BIT)
+        set(QT_CFLAGS_NEON   "-mfpu=neon")
+    endif()
+    set(QT_CFLAGS_MIPS_DSP   "-mdsp")
+    set(QT_CFLAGS_MIPS_DSPR2 "-mdspr2")
+endif()
+
+if (winrt) # FIXME: Correct variable
+    set(QT_CFLAGS_SSE2       "-arch:SSE2")
+    set(QT_CFLAGS_SSE3       "-arch:SSE2")
+    set(QT_CFLAGS_SSSE3      "-arch:SSE2")
+    set(QT_CFLAGS_SSE4_1     "-arch:SSE2")
+    set(QT_CFLAGS_SSE4_2     "-arch:SSE2")
+    set(QT_CFLAGS_AVX        "-arch:AVX")
+    set(QT_CFLAGS_AVX2       "-arch:AVX")
+    set(QT_CFLAGS_AESNI      "-arch:SSE2")
+    set(QT_CFLAGS_SHANI      "-arch:SSE2")
+endif()
+
+if (ICC)
+    if (MSVC)
+        set(QT_CFLAGS_SSE2       "-QxSSE2")
+        set(QT_CFLAGS_SSE3       "-QxSSE3")
+        set(QT_CFLAGS_SSSE3      "-QxSSSE3")
+        set(QT_CFLAGS_SSE4_1     "-QxSSE4.1")
+        set(QT_CFLAGS_SSE4_2     "-QxSSE4.2")
+        set(QT_CFLAGS_AVX        "-QxAVX")
+        set(QT_CFLAGS_AVX2       "-QxCORE-AVX2")
+        set(QT_CFLAGS_AVX512F    "-QxCOMMON-AVX512")
+        set(QT_CFLAGS_AVX512CD   "-QxCOMMON-AVX512")
+        set(QT_CFLAGS_AVX512ER   "-QxMIC-AVX512")
+        set(QT_CFLAGS_AVX512PF   "-QxMIC-AVX512")
+        set(QT_CFLAGS_AVX512DQ   "-QxCORE-AVX512")
+        set(QT_CFLAGS_AVX512BW   "-QxCORE-AVX512")
+        set(QT_CFLAGS_AVX512VL   "-QxCORE-AVX512")
+        set(QT_CFLAGS_F16C       "${QT_CFLAGS_AVX2}")
+        set(QT_CFLAGS_AESNI      "-QxSSE2")
+        set(QT_CFLAGS_SHANI      "-QxSSE4.2")
+    else()
+        set(QT_CFLAGS_SSE2      "-msse2")
+        set(QT_CFLAGS_SSE3      "-msse3")
+        set(QT_CFLAGS_SSSE3     "-mssse3")
+        set(QT_CFLAGS_SSE4_1    "-msse4.1")
+        set(QT_CFLAGS_SSE4_2    "-msse4.2")
+        set(QT_CFLAGS_AVX       "-march=core-avx")
+        set(QT_CFLAGS_AVX2      "-march=core-avx2")
+        set(QT_CFLAGS_AVX512F   "-march=broadwell -xCOMMON-AVX512")
+        set(QT_CFLAGS_AVX512CD  "-march=broadwell -xCOMMON-AVX512")
+        set(QT_CFLAGS_AVX512ER  "-march=knl")
+        set(QT_CFLAGS_AVX512PF  "-march=knl")
+        set(QT_CFLAGS_AVX512DQ  "-march=skylake-avx512")
+        set(QT_CFLAGS_AVX512BW  "-march=skylake-avx512")
+        set(QT_CFLAGS_AVX512VL  "-march=skylake-avx512")
+        set(QT_CFLAGS_AESNI     "-maes")
+        set(QT_CFLAGS_F16C      "${QT_CFLAGS_AVX2}")
+        set(QT_CFLAGS_RDRND     "-mrdrnd")
+        set(QT_CFLAGS_SHANI     "-msha")
+    endif()
+endif()
diff --git a/cmake/QtConfig.cmake.in b/cmake/QtConfig.cmake.in
new file mode 100644
index 0000000000..6d69c1f90e
--- /dev/null
+++ b/cmake/QtConfig.cmake.in
@@ -0,0 +1,59 @@
+@PACKAGE_INIT@
+
+# Slightly amended version of ./src/corelib/Qt6Config.cmake.in
+if (CMAKE_VERSION VERSION_LESS 3.1.0)
+    message(FATAL_ERROR "Qt requires at least CMake version 3.1.0")
+endif()
+
+get_filename_component(_qt_cmake_dir "${CMAKE_CURRENT_LIST_DIR}/.." ABSOLUTE)
+set(_qt_@PROJECT_VERSION_MAJOR@_config_cmake_dir "${CMAKE_CURRENT_LIST_DIR}")
+
+if (NOT QT_NO_CREATE_TARGETS)
+    include("${CMAKE_CURRENT_LIST_DIR}/@INSTALL_CMAKE_NAMESPACE@Targets.cmake")
+    if(NOT QT_NO_CREATE_VERSIONLESS_TARGETS)
+        include("${CMAKE_CURRENT_LIST_DIR}/@INSTALL_CMAKE_NAMESPACE@VersionlessTargets.cmake")
+    endif()
+else()
+    # For examples using `find_package(...)` inside their CMakeLists.txt files:
+    # Make CMake's AUTOGEN detect this Qt version properly
+    set_directory_properties(PROPERTIES
+                             QT_VERSION_MAJOR @PROJECT_VERSION_MAJOR@
+                             QT_VERSION_MINOR @PROJECT_VERSION_MINOR@
+                             QT_VERSION_PATCH @PROJECT_VERSION_PATCH@)
+endif()
+
+# if (NOT @INSTALL_CMAKE_NAMESPACE@_FIND_COMPONENTS)
+#     set(@INSTALL_CMAKE_NAMESPACE@_NOT_FOUND_MESSAGE "The Qt package requires at least one component")
+#     set(@INSTALL_CMAKE_NAMESPACE@_FOUND False)
+#     return()
+# endif()
+
+get_filename_component(_qt_import_prefix "${CMAKE_CURRENT_LIST_FILE}" PATH)
+get_filename_component(_qt_import_prefix "${_qt_import_prefix}" REALPATH)
+list(APPEND CMAKE_MODULE_PATH "${_qt_import_prefix}")
+list(APPEND CMAKE_MODULE_PATH "${_qt_import_prefix}/3rdparty/extra-cmake-modules/find-modules")
+list(APPEND CMAKE_MODULE_PATH "${_qt_import_prefix}/3rdparty/kwin")
+
+foreach(module ${@INSTALL_CMAKE_NAMESPACE@_FIND_COMPONENTS})
+    find_package(@INSTALL_CMAKE_NAMESPACE@${module}
+        ${_@INSTALL_CMAKE_NAMESPACE@_FIND_PARTS_QUIET}
+        ${_@INSTALL_CMAKE_NAMESPACE@_FIND_PARTS_REQUIRED}
+        PATHS ${_qt_cmake_dir} ${QT_EXAMPLES_CMAKE_PREFIX_PATH} NO_DEFAULT_PATH
+    )
+    if (NOT @INSTALL_CMAKE_NAMESPACE@${module}_FOUND)
+        string(CONFIGURE ${_qt5_module_location_template} _expected_module_location @ONLY)
+
+        if (@INSTALL_CMAKE_NAMESPACE@_FIND_REQUIRED_${module})
+            set(_Qt_NOTFOUND_MESSAGE "${_Qt_NOTFOUND_MESSAGE}Failed to find Qt component \"${module}\" config file at                                       \"${_expected_module_location}\"\n")
+        elseif(NOT @INSTALL_CMAKE_NAMESPACE@_FIND_QUIETLY)
+            message(WARNING "Failed to find Qt component \"${module}\" config file at \"${_expected_module_location}\"")
+        endif()
+
+        unset(_expected_module_location)
+    endif()
+endforeach()
+
+if (_Qt_NOTFOUND_MESSAGE)
+    set(@INSTALL_CMAKE_NAMESPACE@_NOT_FOUND_MESSAGE "${_Qt_NOTFOUND_MESSAGE}")
+    set(@INSTALL_CMAKE_NAMESPACE@_FOUND False)
+endif()
diff --git a/cmake/QtFeature.cmake b/cmake/QtFeature.cmake
new file mode 100644
index 0000000000..bb77ca6ffa
--- /dev/null
+++ b/cmake/QtFeature.cmake
@@ -0,0 +1,791 @@
+function(qt_feature_module_begin)
+    qt_parse_all_arguments(arg "qt_feature_module_begin"
+        "NO_MODULE;ONLY_EVALUATE_FEATURES"
+        "LIBRARY;PRIVATE_FILE;PUBLIC_FILE" "PUBLIC_DEPENDENCIES;PRIVATE_DEPENDENCIES" ${ARGN})
+
+    if(NOT arg_ONLY_EVALUATE_FEATURES)
+        if ("${arg_LIBRARY}" STREQUAL "" AND (NOT ${arg_NO_MODULE}))
+            message(FATAL_ERROR
+                    "qt_feature_begin_module needs a LIBRARY name! (or specify NO_MODULE)")
+        endif()
+        if ("${arg_PUBLIC_FILE}" STREQUAL "")
+            message(FATAL_ERROR "qt_feature_begin_module needs a PUBLIC_FILE name!")
+        endif()
+        if ("${arg_PRIVATE_FILE}" STREQUAL "")
+            message(FATAL_ERROR "qt_feature_begin_module needs a PRIVATE_FILE name!")
+        endif()
+    endif()
+
+    set(__QtFeature_library "${arg_LIBRARY}" PARENT_SCOPE)
+    set(__QtFeature_public_features "" PARENT_SCOPE)
+    set(__QtFeature_private_features "" PARENT_SCOPE)
+    set(__QtFeature_internal_features "" PARENT_SCOPE)
+
+    set(__QtFeature_private_file "${arg_PRIVATE_FILE}" PARENT_SCOPE)
+    set(__QtFeature_public_file "${arg_PUBLIC_FILE}" PARENT_SCOPE)
+
+    set(__QtFeature_private_extra "" PARENT_SCOPE)
+    set(__QtFeature_public_extra "" PARENT_SCOPE)
+
+    set(__QtFeature_config_definitions "" PARENT_SCOPE)
+
+    set(__QtFeature_define_definitions "" PARENT_SCOPE)
+endfunction()
+
+function(qt_feature_normalize_name name out_var)
+    # Normalize the feature name to something CMake can deal with.
+    if(name MATCHES "c\\+\\+")
+        string(REGEX REPLACE "[^a-zA-Z0-9_]" "x" name "${name}")
+    else()
+        string(REGEX REPLACE "[^a-zA-Z0-9_]" "_" name "${name}")
+    endif()
+    set(${out_var} "${name}" PARENT_SCOPE)
+endfunction()
+
+function(qt_feature feature)
+    set(original_name "${feature}")
+    qt_feature_normalize_name("${feature}" feature)
+    set_property(GLOBAL PROPERTY QT_FEATURE_ORIGINAL_NAME_${feature} "${original_name}")
+
+    qt_parse_all_arguments(arg "qt_feature"
+        "PRIVATE;PUBLIC"
+        "LABEL;PURPOSE;SECTION;" "AUTODETECT;CONDITION;ENABLE;DISABLE;EMIT_IF" ${ARGN})
+
+    set(_QT_FEATURE_DEFINITION_${feature} ${ARGN} PARENT_SCOPE)
+
+    # Register feature for future use:
+    if (arg_PUBLIC)
+        list(APPEND __QtFeature_public_features "${feature}")
+    endif()
+    if (arg_PRIVATE)
+        list(APPEND __QtFeature_private_features "${feature}")
+    endif()
+    if (NOT arg_PUBLIC AND NOT arg_PRIVATE)
+        list(APPEND __QtFeature_internal_features "${feature}")
+    endif()
+
+
+    set(__QtFeature_public_features ${__QtFeature_public_features} PARENT_SCOPE)
+    set(__QtFeature_private_features ${__QtFeature_private_features} PARENT_SCOPE)
+    set(__QtFeature_internal_features ${__QtFeature_internal_features} PARENT_SCOPE)
+endfunction()
+
+function(qt_evaluate_to_boolean expressionVar)
+    if(${${expressionVar}})
+        set(${expressionVar} ON PARENT_SCOPE)
+    else()
+        set(${expressionVar} OFF PARENT_SCOPE)
+    endif()
+endfunction()
+
+function(qt_evaluate_config_expression resultVar)
+    set(result "")
+    set(nestingLevel 0)
+    set(skipNext OFF)
+    set(expression "${ARGN}")
+    list(LENGTH expression length)
+
+    math(EXPR length "${length}-1")
+    foreach(memberIdx RANGE ${length})
+        if(${skipNext})
+            set(skipNext OFF)
+            continue()
+        endif()
+
+        list(GET expression ${memberIdx} member)
+
+        if("${member}" STREQUAL "(")
+            if(${nestingLevel} GREATER 0)
+                list(APPEND result ${member})
+            endif()
+            math(EXPR nestingLevel "${nestingLevel} + 1")
+            continue()
+        elseif("${member}" STREQUAL ")")
+            math(EXPR nestingLevel "${nestingLevel} - 1")
+            if(nestingLevel LESS 0)
+                break()
+            endif()
+            if(${nestingLevel} EQUAL 0)
+                qt_evaluate_config_expression(result ${result})
+            else()
+                list(APPEND result ${member})
+            endif()
+            continue()
+        elseif(${nestingLevel} GREATER 0)
+            list(APPEND result ${member})
+            continue()
+        elseif("${member}" STREQUAL "NOT")
+            list(APPEND result ${member})
+            continue()
+        elseif("${member}" STREQUAL "AND")
+            qt_evaluate_to_boolean(result)
+            if(NOT ${result})
+                break()
+            endif()
+            set(result "")
+        elseif("${member}" STREQUAL "OR")
+            qt_evaluate_to_boolean(result)
+            if(${result})
+                break()
+            endif()
+            set(result "")
+        elseif("${member}" STREQUAL "STREQUAL" AND memberIdx LESS ${length})
+            # Unfortunately the semantics for STREQUAL in if() are broken when the
+            # RHS is an empty string and the parameters to if are coming through a variable.
+            # So we expect people to write the empty string with single quotes and then we
+            # do the comparison manually here.
+            list(LENGTH result lhsIndex)
+            math(EXPR lhsIndex "${lhsIndex}-1")
+            list(GET result ${lhsIndex} lhs)
+            list(REMOVE_AT result ${lhsIndex})
+            set(lhs "${${lhs}}")
+
+            math(EXPR rhsIndex "${memberIdx}+1")
+            set(skipNext ON)
+
+            list(GET expression ${rhsIndex} rhs)
+            # We can't pass through an empty string with double quotes through various
+            # stages of substitution, so instead it is represented using single quotes
+            # and resolve here.
+            string(REGEX REPLACE "'(.*)'" "\\1" rhs "${rhs}")
+
+            string(COMPARE EQUAL "${lhs}" "${rhs}" stringCompareResult)
+            list(APPEND result ${stringCompareResult})
+        else()
+            string(FIND "${member}" "QT_FEATURE_" idx)
+            if(idx EQUAL 0)
+                # Remove the QT_FEATURE_ prefix
+                string(SUBSTRING "${member}" 11 -1 feature)
+                qt_evaluate_feature(${feature})
+            endif()
+
+            list(APPEND result ${member})
+        endif()
+    endforeach()
+    # The 'TARGET Gui' case is handled by qt_evaluate_to_boolean, by passing those tokens verbatim
+    # to if().
+
+    if("${result}" STREQUAL "")
+        set(result ON)
+    else()
+        qt_evaluate_to_boolean(result)
+    endif()
+
+    set(${resultVar} ${result} PARENT_SCOPE)
+endfunction()
+
+function(qt_feature_set_cache_value resultVar feature emit_if calculated label)
+    if (DEFINED "FEATURE_${feature}")
+        # Must set up the cache
+        if (NOT (emit_if))
+            message(FATAL_ERROR "Sanity check failed: FEATURE_${feature} that was not emitted was found in the CMakeCache.")
+        endif()
+
+        # Revisit value:
+        set(cache "${FEATURE_${feature}}")
+        set(booly_values OFF NO FALSE N ON YES TRUE Y)
+        if ((cache IN_LIST booly_values) OR (cache GREATER_EQUAL 0))
+            set(result "${cache}")
+        else()
+            message(FATAL_ERROR "Sanity check failed: FEATURE_${feature} has invalid value \"${cache}\"!")
+        endif()
+        # Fix-up user-provided values
+        set("FEATURE_${feature}" "${cache}" CACHE BOOL "${label}")
+    else()
+        # Initial setup:
+        if (emit_if)
+            set("FEATURE_${feature}" "${calculated}" CACHE BOOL "${label}")
+            set(result "${calculated}")
+        else()
+            set(result OFF)
+        endif()
+    endif()
+
+    set("${resultVar}" "${result}" PARENT_SCOPE)
+endfunction()
+
+macro(qt_feature_set_value feature cache emit_if condition label)
+    set(result "${cache}")
+
+    if (NOT (condition) AND (cache))
+        message(SEND_ERROR "Feature \"${feature}\": Forcing to \"${cache}\" breaks its condition.")
+    endif()
+
+    if (DEFINED "QT_FEATURE_${feature}")
+        message(FATAL_ERROR "Feature ${feature} is already defined when evaluating configure.cmake features for ${target}.")
+    endif()
+    set(QT_FEATURE_${feature} "${result}" CACHE INTERNAL "Qt feature: ${feature}")
+endmacro()
+
+function(qt_evaluate_feature feature)
+    # If the feature was set explicitly by the user to be on or off, in the cache, then
+    # there's nothing for us to do.
+    if(DEFINED "QT_FEATURE_${feature}")
+        return()
+    endif()
+
+    if(NOT DEFINED _QT_FEATURE_DEFINITION_${feature})
+        qt_debug_print_variables(DEDUP MATCH "^QT_FEATURE")
+        message(FATAL_ERROR "Attempting to evaluate feature ${feature} but its definition is missing. Either the feature does not exist or a dependency to the module that defines it is missing")
+    endif()
+
+    cmake_parse_arguments(arg
+        "PRIVATE;PUBLIC"
+        "LABEL;PURPOSE;SECTION;" "AUTODETECT;CONDITION;ENABLE;DISABLE;EMIT_IF" ${_QT_FEATURE_DEFINITION_${feature}})
+
+    if(DEFINED QT_FEATURE_${feature})
+        return()
+    endif()
+
+    if("${arg_ENABLE}" STREQUAL "")
+        set(arg_ENABLE OFF)
+    endif()
+
+    if("${arg_DISABLE}" STREQUAL "")
+        set(arg_DISABLE OFF)
+    endif()
+
+    if("${arg_AUTODETECT}" STREQUAL "")
+        set(arg_AUTODETECT ON)
+    endif()
+
+    if("${arg_CONDITION}" STREQUAL "")
+        set(condition ON)
+    else()
+        qt_evaluate_config_expression(condition ${arg_CONDITION})
+    endif()
+
+    qt_evaluate_config_expression(disable_result ${arg_DISABLE})
+    qt_evaluate_config_expression(enable_result ${arg_ENABLE})
+    if(${disable_result})
+        set(result OFF)
+    elseif((${enable_result}) OR (${arg_AUTODETECT}))
+        set(result ${condition})
+    else()
+        # feature not auto-detected and not explicitly enabled
+        set(result OFF)
+    endif()
+
+    if("${arg_EMIT_IF}" STREQUAL "")
+        set(emit_if ON)
+    else()
+        qt_evaluate_config_expression(emit_if ${arg_EMIT_IF})
+    endif()
+
+    if (NOT (condition) AND (calculated))
+        message(FATAL_ERROR "Sanity check failed: Feature ${feature} is enabled but condition does not hold true.")
+    endif()
+
+    qt_feature_set_cache_value(cache "${feature}" "${emit_if}" "${result}" "${arg_LABEL}")
+    qt_feature_set_value("${feature}" "${cache}" "${emit_if}" "${condition}" "${arg_LABEL}")
+endfunction()
+
+function(qt_feature_config feature config_var_name)
+    qt_feature_normalize_name("${feature}" feature)
+    qt_parse_all_arguments(arg "qt_feature_config" "NEGATE" "NAME" "" ${ARGN})
+
+    # Store all the config related info in a unique variable key.
+    set(key_name "_QT_FEATURE_CONFIG_DEFINITION_${feature}_${config_var_name}")
+    set(${key_name} "FEATURE;${feature};CONFIG_VAR_NAME;${config_var_name};${ARGN}" PARENT_SCOPE)
+
+    # Store the key for later evaluation.
+    list(APPEND __QtFeature_config_definitions "${key_name}")
+
+    set(__QtFeature_config_definitions ${__QtFeature_config_definitions} PARENT_SCOPE)
+endfunction()
+
+function(qt_evaluate_qmake_config_values key)
+    if(NOT DEFINED ${key})
+        qt_debug_print_variables(DEDUP MATCH "^_QT_FEATURE_CONFIG_DEFINITION")
+        message(FATAL_ERROR
+                "Attempting to evaluate feature config ${key} but its definition is missing. ")
+    endif()
+
+    cmake_parse_arguments(arg
+        "NEGATE"
+        "FEATURE;NAME;CONFIG_VAR_NAME"
+        "" ${${key}})
+
+    set(expected "NOT")
+    if (arg_NEGATE)
+        set(expected "")
+    endif()
+
+    # If no custom name is specified, then the config value is the same as the feature name.
+    if(NOT arg_NAME)
+        set(arg_NAME "${arg_FEATURE}")
+    endif()
+
+    # The feature condition is false, there is no need to export any config values.
+    if(${expected} ${QT_FEATURE_${arg_FEATURE}})
+        return()
+    endif()
+
+    if(arg_CONFIG_VAR_NAME STREQUAL "QMAKE_PUBLIC_CONFIG")
+        list(APPEND __QtFeature_qmake_public_config "${arg_NAME}")
+        set(__QtFeature_qmake_public_config "${__QtFeature_qmake_public_config}" PARENT_SCOPE)
+    endif()
+    if(arg_CONFIG_VAR_NAME STREQUAL "QMAKE_PRIVATE_CONFIG")
+        list(APPEND __QtFeature_qmake_private_config "${arg_NAME}")
+        set(__QtFeature_qmake_private_config "${__QtFeature_qmake_private_config}" PARENT_SCOPE)
+    endif()
+    if(arg_CONFIG_VAR_NAME STREQUAL "QMAKE_PUBLIC_QT_CONFIG")
+        list(APPEND __QtFeature_qmake_public_qt_config "${arg_NAME}")
+        set(__QtFeature_qmake_public_qt_config "${__QtFeature_qmake_public_qt_config}" PARENT_SCOPE)
+    endif()
+endfunction()
+
+function(qt_feature_definition feature name)
+    qt_feature_normalize_name("${feature}" feature)
+    qt_parse_all_arguments(arg "qt_feature_definition" "NEGATE" "VALUE" "" ${ARGN})
+
+    # Store all the define related info in a unique variable key.
+    set(key_name "_QT_FEATURE_DEFINE_DEFINITION_${feature}_${name}")
+    set(${key_name} "FEATURE;${feature};NAME;${name};${ARGN}" PARENT_SCOPE)
+
+    # Store the key for later evaluation and subsequent define generation:
+    list(APPEND __QtFeature_define_definitions "${key_name}")
+
+    set(__QtFeature_define_definitions ${__QtFeature_define_definitions} PARENT_SCOPE)
+endfunction()
+
+function(qt_evaluate_feature_definition key)
+    if(NOT DEFINED ${key})
+        qt_debug_print_variables(DEDUP MATCH "^_QT_FEATURE_DEFINE_DEFINITION")
+        message(FATAL_ERROR "Attempting to evaluate feature define ${key} but its definition is missing. ")
+    endif()
+
+    cmake_parse_arguments(arg
+        "NEGATE;"
+        "FEATURE;NAME;VALUE;" "" ${${key}})
+
+    set(expected ON)
+    if (arg_NEGATE)
+        set(expected OFF)
+    endif()
+
+    set(msg "")
+
+    if(QT_FEATURE_${arg_FEATURE} STREQUAL expected)
+        if (arg_VALUE)
+            string(APPEND msg "#define ${arg_NAME} ${arg_VALUE}\n")
+        else()
+            string(APPEND msg "#define ${arg_NAME}\n")
+        endif()
+
+        string(APPEND __QtFeature_public_extra "${msg}")
+    endif()
+
+    set(__QtFeature_public_extra ${__QtFeature_public_extra} PARENT_SCOPE)
+endfunction()
+
+function(qt_extra_definition name value)
+    qt_parse_all_arguments(arg "qt_extra_definition" "PUBLIC;PRIVATE" "" "" ${ARGN})
+
+    if (arg_PUBLIC)
+        string(APPEND __QtFeature_public_extra "\n#define ${name} ${value}\n")
+    elseif(arg_PRIVATE)
+        string(APPEND __QtFeature_private_extra "\n#define ${name} ${value}\n")
+    endif()
+
+    set(__QtFeature_public_extra ${__QtFeature_public_extra} PARENT_SCOPE)
+    set(__QtFeature_private_extra ${__QtFeature_private_extra} PARENT_SCOPE)
+endfunction()
+
+function(qt_internal_generate_feature_line line feature)
+    if (QT_FEATURE_${feature} STREQUAL "ON")
+        set(line "#define QT_FEATURE_${feature} 1\n\n" PARENT_SCOPE)
+    elseif(QT_FEATURE_${feature} STREQUAL "OFF")
+        set(line "#define QT_FEATURE_${feature} -1\n\n" PARENT_SCOPE)
+    elseif(QT_FEATURE_${feature} STREQUAL "UNSET")
+        set(line "#define QT_FEATURE_${feature} 0\n\n" PARENT_SCOPE)
+    else()
+        message(FATAL_ERROR "${feature} has unexpected value \"${QT_FEATURE_${feature}}\"!")
+    endif()
+endfunction()
+
+function(qt_internal_feature_write_file file features extra)
+    message("Generating file ${file}.")
+    set(contents "")
+    foreach(it ${features})
+        qt_internal_generate_feature_line(line "${it}")
+        string(APPEND contents "${line}")
+    endforeach()
+    string(APPEND contents "${extra}")
+
+    file(GENERATE OUTPUT "${file}" CONTENT "${contents}")
+endfunction()
+
+# Helper function which evaluates features from a given list of configure.cmake paths
+# and creates the feature cache entries.
+# Should not be used directly, unless features need to be available in a directory scope before the
+# associated module evaluates the features.
+# E.g. qtbase/src.pro needs access to Core features before src/corelib/CMakeLists.txt is parsed.
+function(qt_feature_evaluate_features list_of_paths)
+    qt_feature_module_begin(ONLY_EVALUATE_FEATURES)
+    foreach(path ${list_of_paths})
+        include("${path}")
+    endforeach()
+    qt_feature_module_end(ONLY_EVALUATE_FEATURES)
+endfunction()
+
+function(qt_feature_module_end)
+    set(flags ONLY_EVALUATE_FEATURES)
+    set(options OUT_VAR_PREFIX)
+    set(multiopts)
+    cmake_parse_arguments(arg "${flags}" "${options}" "${multiopts}" ${ARGN})
+    set(target ${arg_UNPARSED_ARGUMENTS})
+
+    # The value of OUT_VAR_PREFIX is used as a prefix for output variables that should be
+    # set in the parent scope.
+    if(NOT arg_OUT_VAR_PREFIX)
+        set(arg_OUT_VAR_PREFIX "")
+    endif()
+
+    set(all_features ${__QtFeature_public_features} ${__QtFeature_private_features} ${__QtFeature_internal_features})
+    list(REMOVE_DUPLICATES all_features)
+
+    foreach(feature ${all_features})
+        qt_evaluate_feature(${feature})
+    endforeach()
+
+    # Evaluate custom cache assignments.
+    foreach(cache_var_name ${__QtFeature_custom_enabled_cache_variables})
+        set(${cache_var_name} ON CACHE BOOL "Force enabled by platform." FORCE)
+    endforeach()
+    foreach(cache_var_name ${__QtFeature_custom_disabled_cache_variables})
+        set(${cache_var_name} OFF CACHE BOOL "Force disabled by platform." FORCE)
+    endforeach()
+
+    set(enabled_public_features "")
+    set(disabled_public_features "")
+    set(enabled_private_features "")
+    set(disabled_private_features "")
+
+    foreach(feature ${__QtFeature_public_features})
+       if(QT_FEATURE_${feature})
+          list(APPEND enabled_public_features ${feature})
+       else()
+          list(APPEND disabled_public_features ${feature})
+       endif()
+    endforeach()
+
+    foreach(feature ${__QtFeature_private_features})
+       if(QT_FEATURE_${feature})
+          list(APPEND enabled_private_features ${feature})
+       else()
+          list(APPEND disabled_private_features ${feature})
+       endif()
+    endforeach()
+
+    foreach(key ${__QtFeature_config_definitions})
+        qt_evaluate_qmake_config_values(${key})
+        unset(${key} PARENT_SCOPE)
+    endforeach()
+
+    foreach(key ${__QtFeature_define_definitions})
+        qt_evaluate_feature_definition(${key})
+        unset(${key} PARENT_SCOPE)
+    endforeach()
+
+    foreach(feature ${all_features})
+        unset(_QT_FEATURE_DEFINITION_${feature} PARENT_SCOPE)
+    endforeach()
+
+    if(NOT arg_ONLY_EVALUATE_FEATURES)
+        qt_internal_feature_write_file("${CMAKE_CURRENT_BINARY_DIR}/${__QtFeature_private_file}"
+            "${__QtFeature_private_features}" "${__QtFeature_private_extra}"
+        )
+
+        qt_internal_feature_write_file("${CMAKE_CURRENT_BINARY_DIR}/${__QtFeature_public_file}"
+            "${__QtFeature_public_features}" "${__QtFeature_public_extra}"
+        )
+    endif()
+
+    # Extra header injections which have to have forwarding headers created by
+    # qt_install_injections.
+    # Skip creating forwarding headers if qt_feature_module_begin was called with NO_MODULE, aka
+    # there is no include/<module_name> so there's no place to put the forwarding headers.
+    if(__QtFeature_library)
+        set(injections "")
+        qt_compute_injection_forwarding_header("${__QtFeature_library}"
+                                                 SOURCE "${__QtFeature_public_file}"
+                                                 OUT_VAR injections)
+        qt_compute_injection_forwarding_header("${__QtFeature_library}"
+                                                SOURCE "${__QtFeature_private_file}" PRIVATE
+                                                OUT_VAR injections)
+
+        set(${arg_OUT_VAR_PREFIX}extra_library_injections ${injections} PARENT_SCOPE)
+    endif()
+
+    if (NOT ("${target}" STREQUAL "NO_MODULE") AND NOT arg_ONLY_EVALUATE_FEATURES)
+        get_target_property(targetType "${target}" TYPE)
+        if("${targetType}" STREQUAL "INTERFACE_LIBRARY")
+            set(propertyPrefix "INTERFACE_")
+        else()
+            set(propertyPrefix "")
+            set_target_properties("${target}" PROPERTIES EXPORT_PROPERTIES "QT_ENABLED_PUBLIC_FEATURES;QT_DISABLED_PUBLIC_FEATURES;QT_ENABLED_PRIVATE_FEATURES;QT_DISABLED_PRIVATE_FEATURES;MODULE_PLUGIN_TYPES;QT_PLUGINS;QT_QMAKE_PUBLIC_CONFIG;QT_QMAKE_PRIVATE_CONFIG;QT_QMAKE_PUBLIC_QT_CONFIG")
+        endif()
+        foreach(visibility public private)
+            string(TOUPPER "${visibility}" capitalVisibility)
+            foreach(state enabled disabled)
+                string(TOUPPER "${state}" capitalState)
+
+                set_property(TARGET "${target}" PROPERTY ${propertyPrefix}QT_${capitalState}_${capitalVisibility}_FEATURES "${${state}_${visibility}_features}")
+            endforeach()
+        endforeach()
+
+        set_property(TARGET "${target}"
+                    PROPERTY ${propertyPrefix}QT_QMAKE_PUBLIC_CONFIG
+                    "${__QtFeature_qmake_public_config}")
+        set_property(TARGET "${target}"
+                     PROPERTY ${propertyPrefix}QT_QMAKE_PRIVATE_CONFIG
+                     "${__QtFeature_qmake_private_config}")
+        set_property(TARGET "${target}"
+                     PROPERTY ${propertyPrefix}QT_QMAKE_PUBLIC_QT_CONFIG
+                     "${__QtFeature_qmake_public_qt_config}")
+
+        # Config values were the old-school features before actual configure.json features were
+        # implemented. Therefore "CONFIG+=foo" values should be considered features as well,
+        # so that CMake can find them when building qtmultimedia for example.
+        if(__QtFeature_qmake_public_config)
+            set_property(TARGET "${target}"
+                         APPEND PROPERTY ${propertyPrefix}QT_ENABLED_PUBLIC_FEATURES
+                         ${__QtFeature_qmake_public_config})
+        endif()
+        if(__QtFeature_qmake_private_config)
+            set_property(TARGET "${target}"
+                         APPEND PROPERTY ${propertyPrefix}QT_ENABLED_PRIVATE_FEATURES
+                         ${__QtFeature_qmake_private_config})
+        endif()
+        if(__QtFeature_qmake_public_qt_config)
+            set_property(TARGET "${target}"
+                         APPEND PROPERTY ${propertyPrefix}QT_ENABLED_PUBLIC_FEATURES
+                         ${__QtFeature_qmake_public_qt_config})
+        endif()
+
+        qt_feature_copy_global_config_features_to_core(${target})
+    endif()
+
+    unset(__QtFeature_library PARENT_SCOPE)
+    unset(__QtFeature_public_features PARENT_SCOPE)
+    unset(__QtFeature_private_features PARENT_SCOPE)
+    unset(__QtFeature_internal_features PARENT_SCOPE)
+
+    unset(__QtFeature_private_file PARENT_SCOPE)
+    unset(__QtFeature_public_file PARENT_SCOPE)
+
+    unset(__QtFeature_private_extra PARENT_SCOPE)
+    unset(__QtFeature_public_extra PARENT_SCOPE)
+
+    unset(__QtFeature_define_definitions PARENT_SCOPE)
+    unset(__QtFeature_custom_enabled_features PARENT_SCOPE)
+    unset(__QtFeature_custom_disabled_features PARENT_SCOPE)
+endfunction()
+
+function(qt_feature_copy_global_config_features_to_core target)
+    # CMake doesn't support setting custom properties on exported INTERFACE libraries
+    # See https://gitlab.kitware.com/cmake/cmake/issues/19261.
+    # To circumvent that, copy the properties from GlobalConfig to Core target.
+    # This way the global features actually get set in the generated CoreTargets.cmake file.
+    if(target STREQUAL Core)
+        foreach(visibility public private)
+            string(TOUPPER "${visibility}" capitalVisibility)
+            foreach(state enabled disabled)
+                string(TOUPPER "${state}" capitalState)
+
+                set(core_property_name "QT_${capitalState}_${capitalVisibility}_FEATURES")
+                set(global_property_name "INTERFACE_${core_property_name}")
+
+                get_property(core_values TARGET Core PROPERTY ${core_property_name})
+                get_property(global_values TARGET GlobalConfig PROPERTY ${global_property_name})
+
+                set(total_values ${core_values} ${global_values})
+                set_property(TARGET Core PROPERTY ${core_property_name} ${total_values})
+            endforeach()
+        endforeach()
+
+        set(config_property_names
+            QT_QMAKE_PUBLIC_CONFIG QT_QMAKE_PRIVATE_CONFIG QT_QMAKE_PUBLIC_QT_CONFIG )
+        foreach(property_name ${config_property_names})
+            set(core_property_name "${property_name}")
+            set(global_property_name "INTERFACE_${core_property_name}")
+
+            get_property(core_values TARGET Core PROPERTY ${core_property_name})
+            get_property(global_values TARGET GlobalConfig PROPERTY ${global_property_name})
+
+            set(total_values ${core_values} ${global_values})
+            set_property(TARGET Core PROPERTY ${core_property_name} ${total_values})
+        endforeach()
+    endif()
+endfunction()
+
+function(qt_config_compile_test name)
+    if(DEFINED "TEST_${name}")
+        return()
+    endif()
+
+    cmake_parse_arguments(arg "" "LABEL;PROJECT_PATH;C_STANDARD;CXX_STANDARD" "LIBRARIES;CODE" ${ARGN})
+
+    if(arg_PROJECT_PATH)
+        message(STATUS "Performing Test ${arg_LABEL}")
+        try_compile(HAVE_${name} "${CMAKE_BINARY_DIR}/config.tests/${name}" "${arg_PROJECT_PATH}"
+                    "${name}")
+
+        if(${HAVE_${name}})
+            set(status_label "Success")
+        else()
+            set(status_label "Failed")
+        endif()
+        message(STATUS "Performing Test ${arg_LABEL} - ${status_label}")
+    else()
+        foreach(library IN ITEMS ${arg_LIBRARIES})
+            if(NOT TARGET "${library}")
+                # If the dependency looks like a cmake target, then make this compile test
+                # fail instead of cmake abort later via CMAKE_REQUIRED_LIBRARIES.
+                string(FIND "${library}" "::" cmake_target_namespace_separator)
+                if(NOT cmake_target_namespace_separator EQUAL -1)
+                    set(HAVE_${name} FALSE)
+                    break()
+                endif()
+            endif()
+        endforeach()
+
+        if(NOT DEFINED HAVE_${name})
+            set(_save_CMAKE_C_STANDARD "${CMAKE_C_STANDARD}")
+            set(_save_CMAKE_CXX_STANDARD "${CMAKE_CXX_STANDARD}")
+            set(_save_CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS}")
+
+            if(arg_C_STANDARD)
+               set(CMAKE_C_STANDARD "${arg_C_STANDARD}")
+            endif()
+
+            if(arg_CXX_STANDARD)
+               set(CMAKE_CXX_STANDARD "${arg_CXX_STANDARD}")
+            endif()
+
+            # For MSVC we need to explicitly pass -Zc:__cplusplus to get correct __cplusplus
+            # define values. According to common/msvc-version.conf the flag is supported starting
+            # with 1913.
+            # https://developercommunity.visualstudio.com/content/problem/139261/msvc-incorrectly-defines-cplusplus.html
+            # No support for the flag in upstream CMake as of 3.17.
+            # https://gitlab.kitware.com/cmake/cmake/issues/18837
+            if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC" AND MSVC_VERSION GREATER_EQUAL 1913)
+                set(CMAKE_REQUIRED_FLAGS "-Zc:__cplusplus")
+            endif()
+
+            set(_save_CMAKE_REQUIRED_LIBRARIES "${CMAKE_REQUIRED_LIBRARIES}")
+            set(CMAKE_REQUIRED_LIBRARIES "${arg_LIBRARIES}")
+            check_cxx_source_compiles("${arg_UNPARSED_ARGUMENTS} ${arg_CODE}" HAVE_${name})
+            set(CMAKE_REQUIRED_LIBRARIES "${_save_CMAKE_REQUIRED_LIBRARIES}")
+
+            set(CMAKE_C_STANDARD "${_save_CMAKE_C_STANDARD}")
+            set(CMAKE_CXX_STANDARD "${_save_CMAKE_CXX_STANDARD}")
+            set(CMAKE_REQUIRED_FLAGS "${_save_CMAKE_REQUIRED_FLAGS}")
+        endif()
+    endif()
+
+    set(TEST_${name} "${HAVE_${name}}" CACHE INTERNAL "${arg_LABEL}")
+endfunction()
+
+# This function should be used for passing required try compile platform variables to the
+# project-based try_compile() call.
+# out_var will be a list of -Dfoo=bar strings, suitable to pass to CMAKE_FLAGS.
+function(qt_get_platform_try_compile_vars out_var)
+    # Use the regular variables that are used for source-based try_compile() calls.
+    set(flags "${CMAKE_TRY_COMPILE_PLATFORM_VARIABLES}")
+
+    # Pass toolchain files.
+    if(CMAKE_TOOLCHAIN_FILE)
+        list(APPEND flags "CMAKE_TOOLCHAIN_FILE")
+    endif()
+    if(VCPKG_CHAINLOAD_TOOLCHAIN_FILE)
+        list(APPEND flags "VCPKG_CHAINLOAD_TOOLCHAIN_FILE")
+    endif()
+
+    # Assemble the list with regular options.
+    set(flags_cmd_line "")
+    foreach(flag ${flags})
+        if(${flag})
+            list(APPEND flags_cmd_line "-D${flag}=${${flag}}")
+        endif()
+    endforeach()
+
+    # Pass darwin specific options.
+    if(APPLE_UIKIT)
+        if(CMAKE_OSX_ARCHITECTURES)
+            list(GET CMAKE_OSX_ARCHITECTURES 0 osx_first_arch)
+
+            # Do what qmake does, aka when doing a simulator_and_device build, build the
+            # target architecture test only with the first given architecture, which should be the
+            # device architecture, aka some variation of "arm" (armv7, arm64).
+            list(APPEND flags_cmd_line "-DCMAKE_OSX_ARCHITECTURES:STRING=${osx_first_arch}")
+        endif()
+        # Also specify the sysroot, but only if not doing a simulator_and_device build.
+        # So keep the sysroot empty for simulator_and_device builds.
+        if(QT_UIKIT_SDK)
+            list(APPEND flags_cmd_line "-DCMAKE_OSX_SYSROOT:STRING=${QT_UIKIT_SDK}")
+        endif()
+    endif()
+
+    set("${out_var}" "${flags_cmd_line}" PARENT_SCOPE)
+endfunction()
+
+function(qt_config_compile_test_x86simd extension label)
+    if (DEFINED TEST_X86SIMD_${extension})
+        return()
+    endif()
+
+    set(flags "-DSIMD:string=${extension}")
+
+    qt_get_platform_try_compile_vars(platform_try_compile_vars)
+    list(APPEND flags ${platform_try_compile_vars})
+
+    message(STATUS "Performing SIMD Test ${label}")
+    try_compile("TEST_X86SIMD_${extension}"
+        "${CMAKE_CURRENT_BINARY_DIR}/config.tests/x86_simd_${extension}"
+        "${CMAKE_CURRENT_SOURCE_DIR}/config.tests/x86_simd"
+        x86_simd
+        CMAKE_FLAGS ${flags})
+    if(${TEST_X86SIMD_${extension}})
+        set(status_label "Success")
+    else()
+        set(status_label "Failed")
+    endif()
+    message(STATUS "Performing SIMD Test ${label} - ${status_label}")
+    set(TEST_subarch_${extension} "${TEST_X86SIMD_${extension}}" CACHE INTERNAL "${label}")
+endfunction()
+
+function(qt_make_features_available target)
+    if(NOT "${target}" MATCHES "^${QT_CMAKE_EXPORT_NAMESPACE}::[a-zA-Z][a-zA-Z0-9_-]*$")
+        message(FATAL_ERROR "${target} does not match ${QT_CMAKE_EXPORT_NAMESPACE}::[a-zA-Z][a-zA-Z0-9_-]*. INVALID NAME.")
+    endif()
+    if(NOT TARGET ${target})
+        message(FATAL_ERROR "${target} not found.")
+    endif()
+
+    get_target_property(target_type "${target}" TYPE)
+    if("${target_type}" STREQUAL "INTERFACE_LIBRARY")
+        set(property_prefix "INTERFACE_")
+    else()
+        set(property_prefix "")
+    endif()
+    foreach(visibility IN ITEMS PUBLIC PRIVATE)
+        set(value ON)
+        foreach(state IN ITEMS ENABLED DISABLED)
+            get_target_property(features "${target}" ${property_prefix}QT_${state}_${visibility}_FEATURES)
+            if("${features}" STREQUAL "features-NOTFOUND")
+                continue()
+            endif()
+            foreach(feature IN ITEMS ${features})
+                if (DEFINED "QT_FEATURE_${feature}" AND NOT "${QT_FEATURE_${feature}}" STREQUAL "${value}")
+                    message(FATAL_ERROR "Feature ${feature} is already defined and has a different value when importing features from ${target}.")
+                endif()
+                set(QT_FEATURE_${feature} "${value}" CACHE INTERNAL "Qt feature: ${feature} (from target ${target})")
+            endforeach()
+            set(value OFF)
+        endforeach()
+    endforeach()
+endfunction()
+
+
diff --git a/cmake/QtFindWrapHelper.cmake b/cmake/QtFindWrapHelper.cmake
new file mode 100644
index 0000000000..cb6d19600b
--- /dev/null
+++ b/cmake/QtFindWrapHelper.cmake
@@ -0,0 +1,74 @@
+# Creates an imported wrapper target that links against either a Qt bundled package
+# or a system package.
+#
+# Used for consuming 3rd party libraries in Qt.
+#
+# Example: Creates WrapFreetype::WrapFreetype linking against either
+#          Qt6::BundledFreetype or WrapSystemFreetype::WrapSystemFreetype.
+#
+# The implementation has to use a unique prefix in each variable, otherwise when WrapFreetype
+# find_package()s WrapPNG, the nested call would override the parent call variables, due to macros
+# using the same scope.
+macro(qt_find_package_system_or_bundled _unique_prefix)
+    set(_flags "")
+    set(_options
+        FRIENDLY_PACKAGE_NAME
+        WRAP_PACKAGE_TARGET
+        WRAP_PACKAGE_FOUND_VAR_NAME
+        BUNDLED_PACKAGE_NAME
+        BUNDLED_PACKAGE_TARGET
+        SYSTEM_PACKAGE_NAME
+        SYSTEM_PACKAGE_TARGET
+        USE_BUNDLED_PACKAGE
+        )
+    set(_multioptions "")
+
+    cmake_parse_arguments("_qfwrap_${_unique_prefix}"
+        "${_flags}" "${_options}" "${_multioptions}" ${ARGN})
+
+    # We can't create the same interface imported target multiple times, CMake will complain if we
+    # do that. This can happen if the find_package call is done in multiple different
+    # subdirectories.
+    if(TARGET "${_qfwrap_${_unique_prefix}_WRAP_PACKAGE_TARGET}")
+        set(${_qfwrap_${_unique_prefix}_WRAP_PACKAGE_FOUND_VAR_NAME} ON)
+        return()
+    endif()
+
+    set(${_qfwrap_${_unique_prefix}_WRAP_PACKAGE_FOUND_VAR_NAME} OFF)
+
+    if(_qfwrap_${_unique_prefix}_USE_BUNDLED_PACKAGE)
+        set(${_unique_prefix}_qt_package_name_to_use
+            "${_qfwrap_${_unique_prefix}_BUNDLED_PACKAGE_NAME}")
+        set(${_unique_prefix}_qt_package_target_to_use
+            "${_qfwrap_${_unique_prefix}_BUNDLED_PACKAGE_TARGET}")
+        set(${_unique_prefix}_qt_package_success_message
+            "Using Qt bundled ${_qfwrap_${_unique_prefix}_FRIENDLY_PACKAGE_NAME}.")
+        set(${_unique_prefix}_qt_package_type "bundled")
+    else()
+        set(${_unique_prefix}_qt_package_name_to_use
+            "${_qfwrap_${_unique_prefix}_SYSTEM_PACKAGE_NAME}")
+        set(${_unique_prefix}_qt_package_target_to_use
+            "${_qfwrap_${_unique_prefix}_SYSTEM_PACKAGE_TARGET}")
+        set(${_unique_prefix}_qt_package_success_message
+            "Using system ${_qfwrap_${_unique_prefix}_FRIENDLY_PACKAGE_NAME}.")
+        set(${_unique_prefix}_qt_package_type "system")
+    endif()
+
+    if(NOT TARGET "${${_unique_prefix}_qt_package_target_to_use}")
+        find_package("${${_unique_prefix}_qt_package_name_to_use}")
+    endif()
+
+    if(TARGET "${${_unique_prefix}_qt_package_target_to_use}")
+        set(${_qfwrap_${_unique_prefix}_WRAP_PACKAGE_FOUND_VAR_NAME} ON)
+        message(STATUS "${${_unique_prefix}_qt_package_success_message}")
+        add_library("${_qfwrap_${_unique_prefix}_WRAP_PACKAGE_TARGET}" INTERFACE IMPORTED)
+        target_link_libraries("${_qfwrap_${_unique_prefix}_WRAP_PACKAGE_TARGET}"
+                              INTERFACE
+                              ${${_unique_prefix}_qt_package_target_to_use})
+        set_target_properties("${_qfwrap_${_unique_prefix}_WRAP_PACKAGE_TARGET}" PROPERTIES
+                              INTERFACE_QT_3RD_PARTY_PACKAGE_TYPE
+                              "${${_unique_prefix}_qt_package_type}")
+    elseif(${_unique_prefix}_qt_package_type STREQUAL "bundled")
+        message(FATAL_ERROR "Can't find ${_qfwrap_${_unique_prefix}_BUNDLED_PACKAGE_TARGET}.")
+    endif()
+endmacro()
diff --git a/cmake/QtInternalTargets.cmake b/cmake/QtInternalTargets.cmake
new file mode 100644
index 0000000000..909ca63c79
--- /dev/null
+++ b/cmake/QtInternalTargets.cmake
@@ -0,0 +1,142 @@
+
+function(qt_internal_set_warnings_are_errors_flags target)
+    set(flags "")
+    if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+        # Regular clang 3.0+
+        if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL "3.0.0")
+            list(APPEND flags -Werror -Wno-error=\#warnings -Wno-error=deprecated-declarations)
+        endif()
+    elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "AppleClang")
+        # using AppleClang
+        # Apple clang 4.0+
+        if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL "4.0.0" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS_EQUAL "9.2")
+            list(APPEND flags -Werror -Wno-error=\#warnings -Wno-error=deprecated-declarations)
+        endif()
+    elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
+        # using GCC
+        list(APPEND flags -Werror -Wno-error=cpp -Wno-error=deprecated-declarations)
+
+        # GCC prints this bogus warning, after it has inlined a lot of code
+        # error: assuming signed overflow does not occur when assuming that (X + c) < X is always false
+        list(APPEND flags -Wno-error=strict-overflow)
+
+        # GCC 7 includes -Wimplicit-fallthrough in -Wextra, but Qt is not yet free of implicit fallthroughs.
+        if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL "7.0.0")
+            list(APPEND flags -Wno-error=implicit-fallthrough)
+        endif()
+
+        if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL "9.0.0")
+            # GCC 9 introduced these but we are not clean for it.
+            list(APPEND flags -Wno-error=deprecated-copy -Wno-error=redundant-move -Wno-error=init-list-lifetime)
+        endif()
+
+        # Work-around for bug https://code.google.com/p/android/issues/detail?id=58135
+        if (ANDROID)
+            list(APPEND flags -Wno-error=literal-suffix)
+        endif()
+    elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel")
+        # Intel CC 13.0 +, on Linux only
+        if (LINUX)
+            if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL "13.0.0")
+                # 177: function "entity" was declared but never referenced
+                #      (too aggressive; ICC reports even for functions created due to template instantiation)
+                # 1224: #warning directive
+                # 1478: function "entity" (declared at line N) was declared deprecated
+                # 1786: function "entity" (declared at line N of "file") was declared deprecated ("message")
+                # 1881: argument must be a constant null pointer value
+                #      (NULL in C++ is usually a literal 0)
+                list(APPEND flags -Werror -ww177,1224,1478,1786,1881)
+            endif()
+        endif()
+    elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
+        # In qmake land, currently warnings as errors are only enabled for
+        # MSVC 2012, 2013, 2015.
+        # Respectively MSVC_VERRSIONs are: 1700-1799, 1800-1899, 1900-1909.
+        if(MSVC_VERSION GREATER_EQUAL 1700 AND MSVC_VERSION LESS_EQUAL 1909)
+            list(APPEND flags /WX)
+        endif()
+    endif()
+    set(add_flags "$<NOT:$<BOOL:$<TARGET_PROPERTY:QT_SKIP_WARNINGS_ARE_ERRORS>>>")
+    set(flags_generator_expression "$<${add_flags}:${flags}>")
+    target_compile_options("${target}" INTERFACE "${flags_generator_expression}")
+endfunction()
+
+add_library(PlatformCommonInternal INTERFACE)
+add_library(Qt::PlatformCommonInternal ALIAS PlatformCommonInternal)
+
+add_library(PlatformModuleInternal INTERFACE)
+add_library(Qt::PlatformModuleInternal ALIAS PlatformModuleInternal)
+target_link_libraries(PlatformModuleInternal INTERFACE PlatformCommonInternal)
+
+add_library(PlatformPluginInternal INTERFACE)
+add_library(Qt::PlatformPluginInternal ALIAS PlatformPluginInternal)
+target_link_libraries(PlatformPluginInternal INTERFACE PlatformCommonInternal)
+
+add_library(PlatformToolInternal INTERFACE)
+add_library(Qt::PlatformToolInternal ALIAS PlatformToolInternal)
+target_link_libraries(PlatformToolInternal INTERFACE PlatformCommonInternal)
+
+if(WARNINGS_ARE_ERRORS)
+    qt_internal_set_warnings_are_errors_flags(PlatformModuleInternal)
+    qt_internal_set_warnings_are_errors_flags(PlatformPluginInternal)
+    qt_internal_set_warnings_are_errors_flags(PlatformToolInternal)
+endif()
+if(WIN32)
+    # Needed for M_PI define. Same as mkspecs/features/qt_module.prf.
+    # It's set for every module being built, but it's not propagated to user apps.
+    target_compile_definitions(PlatformModuleInternal INTERFACE _USE_MATH_DEFINES)
+endif()
+if(FEATURE_largefile AND UNIX)
+    target_compile_definitions(PlatformModuleInternal
+                               INTERFACE "_LARGEFILE64_SOURCE;_LARGEFILE_SOURCE")
+endif()
+
+# We can't use the gold linker on android with the NDK, which is the default
+# linker. To build our own target we will use the lld linker.
+if (ANDROID)
+    target_link_options(PlatformModuleInternal INTERFACE -fuse-ld=lld)
+endif()
+
+target_compile_definitions(PlatformCommonInternal INTERFACE $<$<NOT:$<CONFIG:Debug>>:QT_NO_DEBUG>)
+
+if(APPLE_UIKIT)
+    # Do what mkspecs/features/uikit/default_pre.prf does, aka enable sse2 for
+    # simulator_and_device_builds.
+    if(FEATURE_simulator_and_device)
+        # Setting the definition on PlatformCommonInternal behaves slightly differently from what
+        # is done in qmake land. This way the define is not propagated to tests, examples, or
+        # user projects built with qmake, but only modules, plugins and tools.
+        # TODO: Figure out if this ok or not (sounds ok to me).
+        target_compile_definitions(PlatformCommonInternal INTERFACE QT_COMPILER_SUPPORTS_SSE2)
+    endif()
+endif()
+
+# Taken from mkspecs/common/msvc-version.conf and mkspecs/common/msvc-desktop.conf
+if (MSVC)
+    if (MSVC_VERSION GREATER_EQUAL 1799)
+        target_compile_options(PlatformCommonInternal INTERFACE
+            -FS
+            -Zc:rvalueCast
+            -Zc:inline
+    )
+    endif()
+    if (MSVC_VERSION GREATER_EQUAL 1899)
+        target_compile_options(PlatformCommonInternal INTERFACE
+            -Zc:strictStrings
+            -Zc:throwingNew
+        )
+    endif()
+    if (MSVC_VERSION GREATER_EQUAL 1909)
+        target_compile_options(PlatformCommonInternal INTERFACE
+            -Zc:referenceBinding
+        )
+    endif()
+
+    target_compile_options(PlatformCommonInternal INTERFACE -Zc:wchar_t -utf-8)
+
+    target_link_options(PlatformCommonInternal INTERFACE
+        -DYNAMICBASE -NXCOMPAT
+        $<$<CONFIG:Release>:-OPT:REF>
+        $<$<CONFIG:RelWithDebInfo>:-OPT:REF>
+    )
+endif()
diff --git a/cmake/QtModuleConfig.cmake.in b/cmake/QtModuleConfig.cmake.in
new file mode 100644
index 0000000000..b2e1511870
--- /dev/null
+++ b/cmake/QtModuleConfig.cmake.in
@@ -0,0 +1,53 @@
+@PACKAGE_INIT@
+
+include(CMakeFindDependencyMacro)
+
+get_filename_component(_import_prefix "${CMAKE_CURRENT_LIST_FILE}" PATH)
+get_filename_component(_import_prefix "${_import_prefix}" REALPATH)
+
+# Extra cmake code begin
+@extra_cmake_code@
+# Extra cmake code end
+
+# Find required dependencies, if any.
+if(EXISTS "${CMAKE_CURRENT_LIST_DIR}/@INSTALL_CMAKE_NAMESPACE@@target@Dependencies.cmake")
+    include("${CMAKE_CURRENT_LIST_DIR}/@INSTALL_CMAKE_NAMESPACE@@target@Dependencies.cmake")
+endif()
+
+if (NOT QT_NO_CREATE_TARGETS)
+    include("${CMAKE_CURRENT_LIST_DIR}/@INSTALL_CMAKE_NAMESPACE@@target@Targets.cmake")
+    if(NOT QT_NO_CREATE_VERSIONLESS_TARGETS)
+        include("${CMAKE_CURRENT_LIST_DIR}/@INSTALL_CMAKE_NAMESPACE@@target@VersionlessTargets.cmake")
+    endif()
+endif()
+
+foreach(extra_cmake_include @extra_cmake_includes@)
+    include("${CMAKE_CURRENT_LIST_DIR}/${extra_cmake_include}")
+endforeach()
+
+include(${_qt_@PROJECT_VERSION_MAJOR@_config_cmake_dir}/QtFeature.cmake)
+
+qt_make_features_available(@QT_CMAKE_EXPORT_NAMESPACE@::@target@)
+
+set("@INSTALL_CMAKE_NAMESPACE@@target@_FOUND" TRUE)
+if(EXISTS "${CMAKE_CURRENT_LIST_DIR}/@INSTALL_CMAKE_NAMESPACE@@target@Plugins.cmake")
+    include("${CMAKE_CURRENT_LIST_DIR}/@INSTALL_CMAKE_NAMESPACE@@target@Plugins.cmake")
+endif()
+
+list(APPEND QT_ALL_MODULES_FOUND_VIA_FIND_PACKAGE "@target@")
+
+get_target_property(_qt_module_target_type "@INSTALL_CMAKE_NAMESPACE@::@target@" TYPE)
+if(NOT _qt_module_target_type STREQUAL "INTERFACE_LIBRARY")
+    get_target_property(_qt_module_plugin_types
+                        @INSTALL_CMAKE_NAMESPACE@::@target@ MODULE_PLUGIN_TYPES)
+    if(_qt_module_plugin_types)
+        list(APPEND QT_ALL_PLUGIN_TYPES_FOUND_VIA_FIND_PACKAGE "${_qt_module_plugin_types}")
+    endif()
+endif()
+
+
+# Load Module's BuildIntenals should any exist
+if (@INSTALL_CMAKE_NAMESPACE@BuildInternals_DIR AND
+        EXISTS "${CMAKE_CURRENT_LIST_DIR}/@INSTALL_CMAKE_NAMESPACE@@target@BuildInternals.cmake")
+    include("${CMAKE_CURRENT_LIST_DIR}/@INSTALL_CMAKE_NAMESPACE@@target@BuildInternals.cmake")
+endif()
diff --git a/cmake/QtModuleDependencies.cmake.in b/cmake/QtModuleDependencies.cmake.in
new file mode 100644
index 0000000000..ffb9e8a5d3
--- /dev/null
+++ b/cmake/QtModuleDependencies.cmake.in
@@ -0,0 +1,66 @@
+# note: _third_party_deps example: "ICU\\;1.0\\;i18n uc data;ZLIB\\;\\;"
+set(_third_party_deps "@third_party_deps@")
+
+foreach(_target_dep ${_third_party_deps})
+    list(GET _target_dep 0 pkg)
+    list(GET _target_dep 1 version)
+    list(GET _target_dep 2 components)
+    set(find_package_args "${pkg}")
+    if(version)
+        list(APPEND find_package_args "${version}")
+    endif()
+
+    if(components)
+        string(REPLACE " " ";" components "${components}")
+        find_dependency(${find_package_args} COMPONENTS ${components})
+    else()
+        find_dependency(${find_package_args})
+    endif()
+
+    if (NOT ${pkg}_FOUND)
+        set(@INSTALL_CMAKE_NAMESPACE@@target@_FOUND FALSE)
+        return()
+    endif()
+endforeach()
+
+# Find Qt tool package.
+set(_tool_deps "@main_module_tool_deps@")
+
+# The tools do not provide linkage targets but executables, where a mismatch
+# between 32-bit target and 64-bit host does not matter.
+set(BACKUP_CMAKE_SIZEOF_VOID_P "${CMAKE_SIZEOF_VOID_P}")
+set(CMAKE_SIZEOF_VOID_P "")
+
+foreach(_target_dep ${_tool_deps})
+    list(GET _target_dep 0 pkg)
+    list(GET _target_dep 1 version)
+
+    find_dependency(${pkg} ${version})
+
+    if (NOT ${pkg}_FOUND)
+        set(@INSTALL_CMAKE_NAMESPACE@@target@_FOUND FALSE)
+        set(CMAKE_SIZEOF_VOID_P "${BACKUP_CMAKE_SIZEOF_VOID_P}")
+        return()
+    endif()
+endforeach()
+set(CMAKE_SIZEOF_VOID_P "${BACKUP_CMAKE_SIZEOF_VOID_P}")
+
+# note: target_deps example: "Qt6Core\;5.12.0;Qt6Gui\;5.12.0"
+set(_target_deps "@target_deps@")
+foreach(_target_dep ${_target_deps})
+    list(GET _target_dep 0 pkg)
+    list(GET _target_dep 1 version)
+
+    if (NOT ${pkg}_FOUND)
+        find_dependency(${pkg} ${version}
+            PATHS "${CMAKE_CURRENT_LIST_DIR}/.." ${QT_EXAMPLES_CMAKE_PREFIX_PATH} NO_DEFAULT_PATH
+        )
+    endif()
+
+    if (NOT ${pkg}_FOUND)
+        set(@INSTALL_CMAKE_NAMESPACE@@target@_FOUND FALSE)
+        return()
+    endif()
+endforeach()
+
+
diff --git a/cmake/QtModuleToolsConfig.cmake.in b/cmake/QtModuleToolsConfig.cmake.in
new file mode 100644
index 0000000000..79ca620c13
--- /dev/null
+++ b/cmake/QtModuleToolsConfig.cmake.in
@@ -0,0 +1,17 @@
+@PACKAGE_INIT@
+
+include(CMakeFindDependencyMacro)
+
+if (NOT QT_NO_CREATE_TARGETS)
+    # Find required dependencies, if any.
+    if(EXISTS "${CMAKE_CURRENT_LIST_DIR}/@INSTALL_CMAKE_NAMESPACE@@target@Dependencies.cmake")
+        include("${CMAKE_CURRENT_LIST_DIR}/@INSTALL_CMAKE_NAMESPACE@@target@Dependencies.cmake")
+    endif()
+
+    include("${CMAKE_CURRENT_LIST_DIR}/@INSTALL_CMAKE_NAMESPACE@@target@Targets.cmake")
+    if(NOT QT_NO_CREATE_VERSIONLESS_TARGETS)
+        include("${CMAKE_CURRENT_LIST_DIR}/@INSTALL_CMAKE_NAMESPACE@@target@VersionlessTargets.cmake")
+    endif()
+endif()
+
+@extra_cmake_statements@
diff --git a/cmake/QtModuleToolsDependencies.cmake.in b/cmake/QtModuleToolsDependencies.cmake.in
new file mode 100644
index 0000000000..46c60b8484
--- /dev/null
+++ b/cmake/QtModuleToolsDependencies.cmake.in
@@ -0,0 +1,16 @@
+# Find "ModuleTools" dependencies, which are other ModuleTools packages.
+set(_tool_deps "@package_deps@")
+foreach(_target_dep ${_tool_deps})
+    list(GET _target_dep 0 pkg)
+    list(GET _target_dep 1 version)
+
+    if (NOT ${pkg}_FOUND)
+        find_dependency(${pkg} ${version})
+    endif()
+
+    if (NOT ${pkg}_FOUND)
+        set(@INSTALL_CMAKE_NAMESPACE@@target@_FOUND FALSE)
+        return()
+    endif()
+endforeach()
+
diff --git a/cmake/QtModuleToolsVersionlessTargets.cmake.in b/cmake/QtModuleToolsVersionlessTargets.cmake.in
new file mode 100644
index 0000000000..6d0f57e039
--- /dev/null
+++ b/cmake/QtModuleToolsVersionlessTargets.cmake.in
@@ -0,0 +1,23 @@
+foreach(__qt_tool @tool_targets_non_prefixed@)
+    if(NOT TARGET Qt::${__qt_tool} AND TARGET Qt6::${__qt_tool})
+        add_executable(Qt::${__qt_tool} IMPORTED)
+
+        # Check all the usual imported location properties to find one that contains a path.
+        foreach(__qt_imported_location_config
+                IMPORTED_LOCATION
+                IMPORTED_LOCATION_RELEASE
+                IMPORTED_LOCATION_RELWITHDEBINFO
+                IMPORTED_LOCATION_MINSIZEREL
+                IMPORTED_LOCATION_DEBUG)
+
+            get_target_property(__qt_imported_location
+                                Qt6::${__qt_tool} ${__qt_imported_location_config})
+            if(__qt_imported_location AND EXISTS "${__qt_imported_location}")
+                break()
+            endif()
+        endforeach()
+
+        set_target_properties(Qt::${__qt_tool}
+                              PROPERTIES IMPORTED_LOCATION "${__qt_imported_location}")
+    endif()
+endforeach()
diff --git a/cmake/QtPlatformAndroid.cmake b/cmake/QtPlatformAndroid.cmake
new file mode 100644
index 0000000000..4b5bf6ff13
--- /dev/null
+++ b/cmake/QtPlatformAndroid.cmake
@@ -0,0 +1,378 @@
+#
+# Self contained Platform Settings for Android
+#
+# Note: This file is used both by the internal and public builds.
+#
+
+#
+# Public variables:
+#   QT_ANDROID_JAR
+#       Location of the adroid sdk jar for java code
+#   QT_ANDROID_APIVERSION
+#       Android API version
+#   QT_ANDROID_SDK_BUILD_TOOLS_VERSION
+#       Detected Android sdk build tools version
+#
+# Public functions:
+#
+#   qt_android_generate_deployment_settings()
+#       Generate the deployment settings json file for a cmake target.
+#
+
+if (NOT DEFINED ANDROID_SDK_ROOT)
+    message(FATAL_ERROR "Please provide the location of the Android SDK directory via -DANDROID_SDK_ROOT=<path to Adndroid SDK>")
+endif()
+
+if (NOT IS_DIRECTORY "${ANDROID_SDK_ROOT}")
+    message(FATAL_ERROR "Could not find ANDROID_SDK_ROOT or path is not a directory: ${ANDROID_SDK_ROOT}")
+endif()
+
+# Get the Android SDK jar for an API version other than the one specified with
+# QT_ANDROID_API_VERSION.
+function(qt_get_android_sdk_jar_for_api api out_jar_location)
+    set(jar_location "${ANDROID_SDK_ROOT}/platforms/${api}/android.jar")
+    if (NOT EXISTS "${jar_location}")
+        message(WARNING "Could not locate Android SDK jar for api '${api}', defaulting to ${QT_ANDROID_API_VERSION}")
+        set(${out_jar_location} ${QT_ANDROID_JAR} PARENT_SCOPE)
+    else()
+        set(${out_jar_location} ${jar_location} PARENT_SCOPE)
+    endif()
+endfunction()
+
+# Minimum recommend android SDK api version
+set(QT_ANDROID_API_VERSION "android-21")
+
+# Locate android.jar
+set(QT_ANDROID_JAR "${ANDROID_SDK_ROOT}/platforms/${QT_ANDROID_API_VERSION}/android.jar")
+if(NOT EXISTS "${QT_ANDROID_JAR}")
+    # Locate the highest available platform
+    file(GLOB android_platforms
+        LIST_DIRECTORIES true
+        RELATIVE "${ANDROID_SDK_ROOT}/platforms"
+        "${ANDROID_SDK_ROOT}/platforms/*")
+    # If list is not empty
+    if(android_platforms)
+        list(SORT android_platforms)
+        list(REVERSE android_platforms)
+        list(GET android_platforms 0 android_platform_latest)
+        set(QT_ANDROID_API_VERSION ${android_platform_latest})
+        set(QT_ANDROID_JAR "${ANDROID_SDK_ROOT}/platforms/${QT_ANDROID_API_VERSION}/android.jar")
+    endif()
+endif()
+
+if(NOT EXISTS "${QT_ANDROID_JAR}")
+    message(FATAL_ERROR "No suitable Android SDK platform found. Minimum version is ${QT_ANDROID_API_VERSION}")
+endif()
+
+message(STATUS "Using Android SDK API ${QT_ANDROID_API_VERSION} from ${ANDROID_SDK_ROOT}/platforms")
+
+# Locate Java
+include(UseJava)
+
+# Find JDK 8.0
+find_package(Java 1.8 COMPONENTS Development REQUIRED)
+
+# Locate newest android sdk build tools
+if (NOT QT_ANDROID_SDK_BUILD_TOOLS_VERSION)
+    file(GLOB android_build_tools
+        LIST_DIRECTORIES true
+        RELATIVE "${ANDROID_SDK_ROOT}/build-tools"
+        "${ANDROID_SDK_ROOT}/build-tools/*")
+    if (NOT android_build_tools)
+        message(FATAL_ERROR "Could not locate Android SDK build tools under \"${ANDROID_SDK}/build-tools\"")
+    endif()
+    list(SORT android_build_tools)
+    list(REVERSE android_build_tools)
+    list(GET android_build_tools 0 android_build_tools_latest)
+    set(QT_ANDROID_SDK_BUILD_TOOLS_VERSION ${android_build_tools_latest})
+endif()
+
+# Ensure we are using the shared version of libc++
+if(NOT ANDROID_STL STREQUAL c++_shared)
+    message(FATAL_ERROR "The Qt libraries on Android only supports the shared library configuration of stl. Please use -DANDROID_STL=\"c++_shared\" as configuration argument.")
+endif()
+
+# Target properties required for android deploy tool
+define_property(TARGET
+    PROPERTY
+        QT_ANDROID_DEPLOYMENT_DEPENDENCIES
+    BRIEF_DOCS
+        "Specify additional plugins that need to be deployed with the current android application"
+    FULL_DOCS
+        "By default, androiddeployqt will detect the dependencies of your application. But since run-time usage of plugins cannot be detected, there could be false positives, as your application will depend on any plugins that are potential dependencies. If you want to minimize the size of your APK, it's possible to override the automatic detection using the ANDROID_DEPLOYMENT_DEPENDENCIES variable. This should contain a list of all Qt files which need to be included, with paths relative to the Qt install root. Note that only the Qt files specified here will be included. Failing to include the correct files can result in crashes. It's also important to make sure the files are listed in the correct loading order. This variable provides a way to override the automatic detection entirely, so if a library is listed before its dependencies, it will fail to load on some devices."
+)
+
+define_property(TARGET
+    PROPERTY
+        QT_ANDROID_EXTRA_LIBS
+    BRIEF_DOCS
+        "A list of external libraries that will be copied into your application's library folder and loaded on start-up."
+    FULL_DOCS
+    "A list of external libraries that will be copied into your application's library folder and loaded on start-up. This can be used, for instance, to enable OpenSSL in your application. Simply set the paths to the required libssl.so and libcrypto.so libraries here and OpenSSL should be enabled automatically."
+)
+
+define_property(TARGET
+    PROPERTY
+        QT_ANDROID_EXTRA_PLUGINS
+    BRIEF_DOCS
+        "This variable can be used to specify different resources that your project has to bundle but cannot be delivered through the assets system, such as qml plugins."
+    FULL_DOCS
+        "This variable can be used to specify different resources that your project has to bundle but cannot be delivered through the assets system, such as qml plugins. When using this variable, androiddeployqt will make sure everything is packaged and deployed properly."
+)
+
+define_property(TARGET
+    PROPERTY
+        QT_ANDROID_PACKAGE_SOURCE_DIR
+    BRIEF_DOCS
+        "This variable can be used to specify a directory where additions and modifications can be made to the default Android package template."
+    FULL_DOCS
+        "This variable can be used to specify a directory where additions and modifications can be made to the default Android package template. The androiddeployqt tool will copy the application template from Qt into the build directory, and then it will copy the contents of the ANDROID_PACKAGE_SOURCE_DIR on top of this, overwriting any existing files. The update step where parts of the source files are modified automatically to reflect your other settings is then run on the resulting merged package. If you, for instance, want to make a custom AndroidManifest.xml for your application, then place this directly into the folder specified in this variable. You can also add custom Java files in ANDROID_PACKAGE_SOURCE_DIR/src."
+)
+
+define_property(TARGET
+    PROPERTY
+        QT_ANDROID_DEPLOYMENT_SETTINGS_FILE
+    BRIEF_DOCS
+        " "
+    FULL_DOCS
+        " "
+)
+
+# Generate deployment tool json
+function(qt_android_generate_deployment_settings target)
+    # Information extracted from mkspecs/features/android/android_deployment_settings.prf
+    if (NOT TARGET ${target})
+        message(SEND_ERROR "${target} is not a cmake target")
+        return()
+    endif()
+
+    get_target_property(target_type ${target} TYPE)
+
+    if (NOT "${target_type}" STREQUAL "MODULE_LIBRARY")
+        message(SEND_ERROR "QT_ANDROID_GENERATE_DEPLOYMENT_SETTINGS only works on Module targets")
+        return()
+    endif()
+
+    get_target_property(target_source_dir ${target} SOURCE_DIR)
+    get_target_property(target_binary_dir ${target} BINARY_DIR)
+    get_target_property(target_output_name ${target} OUTPUT_NAME)
+    if (NOT target_output_name)
+        set(target_output_name ${target})
+    endif()
+    set(deploy_file "${target_binary_dir}/android-lib${target_output_name}.so-deployment-settings.json")
+
+    set(file_contents "{\n")
+    # content begin
+    string(APPEND file_contents
+        "   \"description\": \"This file is generated by cmake to be read by androiddeployqt and should not be modified by hand.\",\n")
+
+    # Host Qt Android  install path
+    if (NOT QT_BUILDING_QT)
+        set(file_check "${Qt6_DIR}/plugins/platforms/android/libqtforandroid_${CMAKE_ANDROID_ARCH_ABI}.so")
+        if (NOT EXISTS ${file_check})
+            message(SEND_ERROR "Detected Qt installation does not contain libqtforandroid.so. This is most likely due to the installation not being a build of Qt for Android. Please update your settings.")
+            return()
+        endif()
+        set(qt_android_install_dir ${Qt6_Dir})
+    else()
+        # Building from source, use the same install prefix
+        set(qt_android_install_dir ${CMAKE_INSTALL_PREFIX})
+    endif()
+
+    file(TO_NATIVE_PATH "${qt_android_install_dir}" qt_android_install_dir_native)
+    string(APPEND file_contents
+        "   \"qt\": \"${qt_android_install_dir_native}\",\n")
+
+    # Android SDK path
+    file(TO_NATIVE_PATH "${ANDROID_SDK_ROOT}" android_sdk_root_native)
+    string(APPEND file_contents
+        "   \"sdk\": \"${android_sdk_root_native}\",\n")
+
+    # Android SDK Build Tools Revision
+    string(APPEND file_contents
+        "   \"sdkBuildToolsRevision\": \"${QT_ANDROID_SDK_BUILD_TOOLS_VERSION}\",\n")
+
+    # Android NDK
+    file(TO_NATIVE_PATH "${ANDROID_NDK}" android_ndk_root_native)
+    string(APPEND file_contents
+        "   \"ndk\": \"${android_ndk_root_native}\",\n")
+
+    # Setup LLVM toolchain
+    string(APPEND file_contents
+        "   \"toolchain-prefix\": \"llvm\",\n")
+    string(APPEND file_contents
+        "   \"tool-prefix\": \"llvm\",\n")
+    string(APPEND file_contents
+        "   \"useLLVM\": true,\n")
+
+    # NDK Toolchain Version
+    string(APPEND file_contents
+        "   \"toolchain-version\": \"${CMAKE_ANDROID_NDK_TOOLCHAIN_VERSION}\",\n")
+
+    # NDK Host
+    string(APPEND file_contents
+        "   \"ndk-host\": \"${ANDROID_NDK_HOST_SYSTEM_NAME}\",\n")
+
+    if (CMAKE_ANDROID_ARCH_ABI STREQUAL "x86")
+        set(arch_value "i686-linux-android")
+    elseif (CMAKE_ANDROID_ARCH_ABI STREQUAL "x86_64")
+        set(arch_value "x86_64-linux-android")
+    elseif (CMAKE_ANDROID_ARCH_ABI STREQUAL "armv64-v8a")
+        set(arch_value "aarch64-linux-android")
+    else()
+        set(arch_value "arm-linux-androideabi")
+    endif()
+
+    # Architecture
+    string(APPEND file_contents
+        "   \"architectures\": { \"${CMAKE_ANDROID_ARCH_ABI}\" : \"${arch_value}\" },\n")
+
+    # deployment dependencies
+    get_target_property(android_deployment_dependencies
+        ${target} QT_ANDROID_DEPLOYMENT_DEPENDENCIES)
+    if (android_deployment_dependencies)
+        list(JOIN android_deployment_dependencies "," android_deployment_dependencies)
+        string(APPEND file_contents
+            "   \"deployment-dependencies\": \"${android_deployment_dependencies}\",\n")
+    endif()
+
+    # Extra plugins
+    get_target_property(android_extra_plugins
+        ${target} QT_ANDROID_EXTRA_PLUGINS)
+    if (android_extra_plugins)
+        list(JOIN android_extra_plugins "," android_extra_plugins)
+        string(APPEND file_contents
+            "   \"android-extra-plugins\": \"${android_extra_plugins}\",\n")
+    endif()
+
+    # Extra libs
+    get_target_property(android_extra_libs
+        ${target} QT_ANDROID_EXTRA_LIBS)
+    if (android_extra_libs)
+        list(JOIN android_extra_libs "," android_extra_libs)
+        string(APPEND file_contents
+            "   \"android-extra-libs\": \"${android_extra_libs}\",\n")
+    endif()
+
+    # package source dir
+    get_target_property(android_package_source_dir
+        ${target} QT_ANDROID_PACKAGE_SOURCE_DIR)
+    if (android_package_source_dir)
+        file(TO_NATIVE_PATH "${android_package_source_dir}" android_package_source_dir_native)
+        string(APPEND file_contents
+            "   \"android-package-source-directory\": \"${android_package_source_dir_native}\",\n")
+endif()
+
+    #TODO: ANDROID_VERSION_NAME, doesn't seem to be used?
+
+    #TODO: ANDROID_VERSION_CODE, doesn't seem to be used?
+
+    get_target_property(qml_import_path ${target} QT_QML_IMPORT_PATH)
+    if (qml_import_path)
+        file(TO_NATIVE_PATH "${qml_import_path}" qml_import_path_native)
+        string(APPEND file_contents
+            "   \"qml-import-path\": \"${qml_import_path_native}\",\n")
+    endif()
+
+    get_target_property(qml_root_path ${target} QT_QML_ROOT_PATH)
+    if(NOT qml_root_path)
+        set(qml_root_path "${target_source_dir}")
+    endif()
+    file(TO_NATIVE_PATH "${qml_root_path}" qml_root_path_native)
+    string(APPEND file_contents
+        "   \"qml-root-path\": \"${qml_root_path_native}\",\n")
+
+    # App binary
+    string(APPEND file_contents
+        "   \"application-binary\": \"${target_output_name}\",\n")
+
+    # Override qmlimportscanner binary path
+    set(qml_importscanner_binary_path "${QT_HOST_PATH}/bin/qmlimportscanner")
+    if (WIN32)
+        string(APPEND qml_importscanner_binary_path ".exe")
+    endif()
+    file(TO_NATIVE_PATH "${qml_importscanner_binary_path}" qml_importscanner_binary_path_native)
+    string(APPEND file_contents
+        "   \"qml-importscanner-binary\" : \"${qml_importscanner_binary_path_native}\",\n")
+
+    # Last item in json file
+
+    # base location of stdlibc++, will be suffixed by androiddeploy qt
+    set(android_ndk_stdlib_base_path
+        "${ANDROID_NDK}/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/"
+    )
+    string(APPEND file_contents
+        "   \"stdcpp-path\": \"${android_ndk_stdlib_base_path}\"\n")
+
+    # content end
+    string(APPEND file_contents "}\n")
+
+    file(WRITE ${deploy_file} ${file_contents})
+
+    set_target_properties(${target}
+        PROPERTIES
+            QT_ANDROID_DEPLOYMENT_SETTINGS_FILE ${deploy_file}
+    )
+endfunction()
+
+function(qt_android_apply_arch_suffix target)
+    get_target_property(target_type ${target} TYPE)
+    if (target_type STREQUAL "SHARED_LIBRARY" OR target_type STREQUAL "MODULE_LIBRARY")
+        set_property(TARGET "${target}" PROPERTY SUFFIX "_${CMAKE_ANDROID_ARCH_ABI}.so")
+    elseif (target_type STREQUAL "STATIC_LIBRARY")
+        set_property(TARGET "${target}" PROPERTY SUFFIX "_${CMAKE_ANDROID_ARCH_ABI}.a")
+    endif()
+endfunction()
+
+# Add custom target to package the APK
+function(qt_android_add_apk_target target)
+    get_target_property(deployment_file ${target} QT_ANDROID_DEPLOYMENT_SETTINGS_FILE)
+    if (NOT deployment_file)
+        message(FATAL_ERROR "Target ${target} is not a valid android executable target\n")
+    endif()
+
+    set(deployment_tool "${QT_HOST_PATH}/bin/androiddeployqt")
+    set(apk_dir "$<TARGET_PROPERTY:${target},BINARY_DIR>/android-build")
+    add_custom_target(${target}_prepare_apk_dir
+        DEPENDS ${target}
+        COMMAND ${CMAKE_COMMAND}
+            -E copy $<TARGET_FILE:${target}>
+            "${apk_dir}/libs/${CMAKE_ANDROID_ARCH_ABI}/$<TARGET_FILE_NAME:${target}>"
+        COMMENT "Copying ${target} binarty to apk folder"
+    )
+
+    add_custom_target(${target}_make_apk
+        DEPENDS ${target}_prepare_apk_dir
+        COMMAND  ${deployment_tool}
+            --input ${deployment_file}
+            --output ${apk_dir}
+        COMMENT "Creating APK for ${target}"
+    )
+endfunction()
+
+
+# Add a test for Android which will be run by the android test runner tool
+function(qt_android_add_test target)
+
+    set(deployment_tool "${QT_HOST_PATH}/bin/androiddeployqt")
+    set(test_runner "${QT_HOST_PATH}/bin/androidtestrunner")
+
+    get_target_property(deployment_file ${target} QT_ANDROID_DEPLOYMENT_SETTINGS_FILE)
+    if (NOT deployment_file)
+        message(FATAL_ERROR "Target ${target} is not a valid android executable target\n")
+    endif()
+
+    set(target_binary_dir "$<TARGET_PROPERTY:${target},BINARY_DIR>")
+    set(apk_dir "${target_binary_dir}/android-build")
+
+    add_test(NAME "${target}"
+        COMMAND "${test_runner}"
+            --androiddeployqt "${deployment_tool} --input ${deployment_file}"
+            --adb "${ANDROID_SDK_ROOT}/platform-tools/adb"
+            --path "${apk_dir}"
+            --skip-install-root
+            --make "${CMAKE_COMMAND} --build ${CMAKE_BINARY_DIR} --target ${target}_make_apk"
+            --apk "${apk_dir}/${target}.apk"
+            --verbose
+    )
+endfunction()
diff --git a/cmake/QtPlatformSupport.cmake b/cmake/QtPlatformSupport.cmake
new file mode 100644
index 0000000000..b54d52eba4
--- /dev/null
+++ b/cmake/QtPlatformSupport.cmake
@@ -0,0 +1,81 @@
+function(qt_set01 result)
+    if (${ARGN})
+        set("${result}" 1 PARENT_SCOPE)
+    else()
+        set("${result}" 0 PARENT_SCOPE)
+    endif()
+endfunction()
+
+qt_set01(LINUX CMAKE_SYSTEM_NAME STREQUAL "Linux")
+qt_set01(HPUX CMAKE_SYSTEM_NAME STREQUAL "HPUX")
+qt_set01(ANDROID CMAKE_SYSTEM_NAME STREQUAL "Android")  # FIXME: How to identify this?
+qt_set01(NACL CMAKE_SYSTEM_NAME STREQUAL "NaCl") # FIXME: How to identify this?
+qt_set01(INTEGRITY CMAKE_SYSTEM_NAME STREQUAL "Integrity") # FIXME: How to identify this?
+qt_set01(VXWORKS CMAKE_SYSTEM_NAME STREQUAL "VxWorks") # FIXME: How to identify this?
+qt_set01(QNX CMAKE_SYSTEM_NAME STREQUAL "QNX") # FIXME: How to identify this?
+qt_set01(OPENBSD CMAKE_SYSTEM_NAME STREQUAL "OpenBSD") # FIXME: How to identify this?
+qt_set01(FREEBSD CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") # FIXME: How to identify this?
+qt_set01(NETBSD CMAKE_SYSTEM_NAME STREQUAL "NetBSD") # FIXME: How to identify this?
+qt_set01(WASM CMAKE_SYSTEM_NAME STREQUAL "Emscripten")
+
+qt_set01(BSD APPLE OR OPENBSD OR FREEBSD OR NETBSD)
+
+qt_set01(WINRT WIN32 AND CMAKE_VS_PLATFORM_TOOSLET STREQUAL "winrt") # FIXME: How to identify this?
+
+qt_set01(APPLE_IOS APPLE AND CMAKE_SYSTEM_NAME STREQUAL "iOS")
+qt_set01(APPLE_TVOS APPLE AND CMAKE_SYSTEM_NAME STREQUAL "tvOS")
+qt_set01(APPLE_WATCHOS APPLE AND CMAKE_SYSTEM_NAME STREQUAL "watchOS")
+qt_set01(APPLE_UIKIT APPLE AND (APPLE_IOS OR APPLE_TVOS OR APPLE_WATCHOS))
+qt_set01(APPLE_OSX APPLE AND NOT APPLE_UIKIT)
+
+qt_set01(GCC CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+qt_set01(CLANG CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+qt_set01(ICC CMAKE_C_COMPILER MATCHES "icc|icl")
+qt_set01(QCC CMAKE_C_COMPILER MATCHES "qcc") # FIXME: How to identify this?
+
+if(CMAKE_SIZEOF_VOID_P EQUAL 8)
+    set(QT_64BIT TRUE)
+elseif(CMAKE_SIZEOF_VOID_P EQUAL 4)
+    set(QT_32BIT TRUE)
+endif()
+
+# Parses a version string like "xx.yy.zz" and sets the major, minor and patch variables.
+function(qt_parse_version_string version_string out_var_prefix)
+    string(REPLACE "." ";" version_list ${version_string})
+    list(LENGTH version_list length)
+
+    set(out_var "${out_var_prefix}_MAJOR")
+    set(value "")
+    if(length GREATER 0)
+        list(GET version_list 0 value)
+        list(REMOVE_AT version_list 0)
+        math(EXPR length "${length}-1")
+    endif()
+    set(${out_var} "${value}" PARENT_SCOPE)
+
+    set(out_var "${out_var_prefix}_MINOR")
+    set(value "")
+    if(length GREATER 0)
+        list(GET version_list 0 value)
+        set(${out_var} "${value}" PARENT_SCOPE)
+        list(REMOVE_AT version_list 0)
+        math(EXPR length "${length}-1")
+    endif()
+    set(${out_var} "${value}" PARENT_SCOPE)
+
+    set(out_var "${out_var_prefix}_PATCH")
+    set(value "")
+    if(length GREATER 0)
+        list(GET version_list 0 value)
+        set(${out_var} "${value}" PARENT_SCOPE)
+        list(REMOVE_AT version_list 0)
+        math(EXPR length "${length}-1")
+    endif()
+    set(${out_var} "${value}" PARENT_SCOPE)
+endfunction()
+
+# Set up the separate version components for the compiler version, to allow mapping of qmake
+# conditions like 'equals(QT_GCC_MAJOR_VERSION,5)'.
+if(CMAKE_CXX_COMPILER_VERSION)
+    qt_parse_version_string("${CMAKE_CXX_COMPILER_VERSION}" "QT_COMPILER_VERSION")
+endif()
diff --git a/cmake/QtPluginConfig.cmake.in b/cmake/QtPluginConfig.cmake.in
new file mode 100644
index 0000000000..5fde0bc511
--- /dev/null
+++ b/cmake/QtPluginConfig.cmake.in
@@ -0,0 +1,17 @@
+include_guard(DIRECTORY)
+
+@PACKAGE_INIT@
+
+include(CMakeFindDependencyMacro)
+
+get_filename_component(_import_prefix "${CMAKE_CURRENT_LIST_FILE}" PATH)
+get_filename_component(_import_prefix "${_import_prefix}" REALPATH)
+
+if (NOT QT_NO_CREATE_TARGETS)
+    # Find required dependencies, if any.
+    if(EXISTS "${CMAKE_CURRENT_LIST_DIR}/@target@Dependencies.cmake")
+        include("${CMAKE_CURRENT_LIST_DIR}/@target@Dependencies.cmake")
+    endif()
+
+    include("${CMAKE_CURRENT_LIST_DIR}/@INSTALL_CMAKE_NAMESPACE@@target@Targets.cmake")
+endif()
diff --git a/cmake/QtPluginDependencies.cmake.in b/cmake/QtPluginDependencies.cmake.in
new file mode 100644
index 0000000000..f25d0bed43
--- /dev/null
+++ b/cmake/QtPluginDependencies.cmake.in
@@ -0,0 +1,42 @@
+# note: _third_party_deps example: "ICU\\;1.0\\;i18n uc data;ZLIB\\;\\;"
+set(_third_party_deps "@third_party_deps@")
+
+foreach(_target_dep ${_third_party_deps})
+    list(GET _target_dep 0 pkg)
+    list(GET _target_dep 1 version)
+    list(GET _target_dep 2 components)
+    set(find_package_args "${pkg}")
+    if(version)
+        list(APPEND find_package_args "${version}")
+    endif()
+
+        if(components)
+            string(REPLACE " " ";" components "${components}")
+            find_dependency(${find_package_args} COMPONENTS ${components})
+        else()
+            find_dependency(${find_package_args})
+        endif()
+
+    if (NOT ${pkg}_FOUND)
+        set(@target@_FOUND FALSE)
+        return()
+    endif()
+endforeach()
+
+# note: target_deps example: "Qt6Core\;5.12.0;Qt6Gui\;5.12.0"
+set(_target_deps "@target_deps@")
+foreach(_target_dep ${_target_deps})
+    list(GET _target_dep 0 pkg)
+    list(GET _target_dep 1 version)
+
+    if (NOT ${pkg}_FOUND)
+        find_dependency(${pkg} ${version}
+            PATHS "${CMAKE_CURRENT_LIST_DIR}/.." ${QT_EXAMPLES_CMAKE_PREFIX_PATH} NO_DEFAULT_PATH
+        )
+    endif()
+
+    if (NOT ${pkg}_FOUND)
+        set(@target@_FOUND FALSE)
+        return()
+    endif()
+endforeach()
diff --git a/cmake/QtPlugins.cmake.in b/cmake/QtPlugins.cmake.in
new file mode 100644
index 0000000000..91884302c6
--- /dev/null
+++ b/cmake/QtPlugins.cmake.in
@@ -0,0 +1,131 @@
+include_guard(DIRECTORY)
+
+@QT_MODULE_PLUGIN_INCLUDES@
+
+if(NOT @BUILD_SHARED_LIBS@)
+    set(_module_target "@INSTALL_CMAKE_NAMESPACE@::@QT_MODULE@")
+    # Properties can't be set on aliased targets, so make sure to unalias the target. This is needed
+    # when Qt examples are built as part of the Qt build itself.
+    get_target_property(_aliased_target ${_module_target} ALIASED_TARGET)
+    if(_aliased_target)
+        set(_module_target ${_aliased_target})
+    endif()
+    unset(_aliased_target)
+
+    set(_default_plugins_are_enabled "$<NOT:$<STREQUAL:$<GENEX_EVAL:$<TARGET_PROPERTY:QT_DEFAULT_PLUGINS>>,0>>")
+    # Make sure to boolify the result of the expression, in case if the returned property value
+    # is empty.
+    set(_default_plugins_are_enabled_wrapped "$<BOOL:${_default_plugins_are_enabled}>")
+    set(_manual_plugins_genex "$<GENEX_EVAL:$<TARGET_PROPERTY:QT_PLUGINS>>")
+    set(_no_plugins_genex "$<GENEX_EVAL:$<TARGET_PROPERTY:QT_NO_PLUGINS>>")
+
+    # In super builds the rules below pollute the dependency rule for the
+    # plugin target when it's being build, causing cyclic dependencies.
+    # to overcome this, we check if the current target where this rule evaluates
+    # has a QT_BUILD_PROJECT_NAME equal to the current PROJECT_NAME.
+    # If so we disable the injection of plugin link rules to avoid cyclic
+    # dependencies.
+    if (@QT_SUPERBUILD@)
+        set(_build_allow_plugin_link_rules_genex "$<NOT:$<STREQUAL:$<TARGET_PROPERTY:QT_BUILD_PROJECT_NAME>,@PROJECT_NAME@>>")
+    else()
+        set(_build_allow_plugin_link_rules_genex 1)
+    endif()
+
+    # The code in here uses the properties defined in qt_import_plugins (Qt6CoreMacros.cmake)
+    foreach(target @qt_plugins@)
+        set(_plugin_target "@INSTALL_CMAKE_NAMESPACE@::${target}")
+        set(_plugin_target_versionless "Qt::${target}")
+        get_target_property(_classname "${_plugin_target}" QT_PLUGIN_CLASS_NAME)
+        if(NOT _classname)
+          message("Warning: plugin ${_plugin_target} has no class name, skipping.")
+          continue()
+        endif()
+
+        get_target_property(_plugin_type "${_plugin_target}" QT_PLUGIN_TYPE)
+        if(NOT _plugin_type)
+          message("Warning: plugin ${_plugin_target} has no type ('${_plugin_type}'), skipping.")
+          continue()
+        endif()
+
+        list(APPEND "QT_ALL_PLUGINS_FOUND_BY_FIND_PACKAGE_${_plugin_type}" "${target}")
+
+        set(_plugin_is_default "$<TARGET_PROPERTY:${_plugin_target},QT_DEFAULT_PLUGIN>")
+
+        # INCLUDE
+        set(_plugin_is_whitelisted "$<IN_LIST:${_plugin_target},${_manual_plugins_genex}>")
+        set(_plugin_versionless_is_whitelisted
+            "$<IN_LIST:${_plugin_target_versionless},${_manual_plugins_genex}>")
+
+        # Note: qt_import_plugins sets the QT_PLUGINS_${_plugin_type} to "-"
+        # when excluding it with EXCLUDE_BY_TYPE,
+        # which ensures that no plug-in will be supported unless explicitly re-added afterwards.
+        string(CONCAT _plugin_is_not_blacklisted
+            "$<AND:"
+                "$<NOT:" # EXCLUDE
+                    "$<IN_LIST:${_plugin_target},${_no_plugins_genex}>"
+                ">,"
+                "$<NOT:"
+                    "$<IN_LIST:${_plugin_target_versionless},${_no_plugins_genex}>"
+                ">,"
+                # Excludes both plugins targeted by EXCLUDE_BY_TYPE and not included in
+                # INCLUDE_BY_TYPE.
+                "$<STREQUAL:,$<GENEX_EVAL:$<TARGET_PROPERTY:QT_PLUGINS_${_plugin_type}>>>"
+            ">"
+        )
+
+        # Support INCLUDE_BY_TYPE
+        string(CONCAT _plugin_is_in_type_whitelist
+            "$<IN_LIST:"
+                "${_plugin_target},"
+                "$<GENEX_EVAL:"
+                    "$<TARGET_PROPERTY:QT_PLUGINS_${_plugin_type}>"
+                ">"
+            ">"
+        )
+        string(CONCAT _plugin_versionless_is_in_type_whitelist
+            "$<IN_LIST:"
+                "${_plugin_target_versionless},"
+                "$<GENEX_EVAL:"
+                    "$<TARGET_PROPERTY:QT_PLUGINS_${_plugin_type}>"
+                ">"
+            ">"
+        )
+
+        # Complete condition that defines whether a static plugin is linked
+        string(CONCAT _plugin_condition
+            "$<BOOL:$<AND:"
+                "${_build_allow_plugin_link_rules_genex},"
+                "$<OR:"
+                    "${_plugin_is_whitelisted},"
+                    "${_plugin_versionless_is_whitelisted},"
+                    "${_plugin_is_in_type_whitelist},"
+                    "${_plugin_versionless_is_in_type_whitelist},"
+                    "$<AND:"
+                        "${_default_plugins_are_enabled_wrapped},"
+                        "${_plugin_is_default},"
+                        "${_plugin_is_not_blacklisted}"
+                    ">"
+                ">"
+            ">>"
+        )
+
+        # If this condition is true, we link against the plug-in
+        set(_plugin_genex "$<${_plugin_condition}:${_plugin_target}>")
+        target_link_libraries(${_module_target} INTERFACE "${_plugin_genex}")
+
+        set(_generated_qt_plugin_file_name
+            "${CMAKE_CURRENT_BINARY_DIR}/qt_@QT_MODULE@_${target}.cpp")
+        set(_generated_qt_plugin_file_name_template "${_generated_qt_plugin_file_name}.in")
+        set(_generated_qt_plugin_file_content "#include <QtPlugin>\nQ_IMPORT_PLUGIN(${_classname})")
+
+        # Generate a source file to import that plug-in. Has to be done with configure_file,
+        # because file(GENERATE) and target_sources has issues with scopes.
+        file(WRITE "${_generated_qt_plugin_file_name_template}"
+                   "${_generated_qt_plugin_file_content}")
+        configure_file("${_generated_qt_plugin_file_name_template}"
+                       "${_generated_qt_plugin_file_name}")
+
+        target_sources(${_module_target} INTERFACE
+                       "$<${_plugin_condition}:${_generated_qt_plugin_file_name}>")
+    endforeach()
+endif()
diff --git a/cmake/QtPostProcess.cmake b/cmake/QtPostProcess.cmake
new file mode 100644
index 0000000000..e8e6c2b3aa
--- /dev/null
+++ b/cmake/QtPostProcess.cmake
@@ -0,0 +1,428 @@
+function(qt_internal_write_depends_file target)
+    set(module Qt${target})
+    set(outfile "${QT_BUILD_DIR}/${INSTALL_INCLUDEDIR}/${module}/${module}Depends")
+    message("Generate ${outfile}...")
+    set(contents "/* This file was generated by cmake with the info from ${module} target. */\n")
+    string(APPEND contents "#ifdef __cplusplus /* create empty PCH in C mode */\n")
+    foreach (m ${ARGN})
+        string(APPEND contents "#  include <Qt${m}/Qt${m}>\n")
+    endforeach()
+    string(APPEND contents "#endif\n")
+
+    file(GENERATE OUTPUT "${outfile}" CONTENT "${contents}")
+endfunction()
+
+macro(qt_collect_third_party_deps target)
+    set(_target_is_static OFF)
+    get_target_property(_target_type ${target} TYPE)
+    if (${_target_type} STREQUAL "STATIC_LIBRARY")
+        set(_target_is_static ON)
+    endif()
+    unset(_target_type)
+    # If we are doing a non-static Qt build, we only want to propagate public dependencies.
+    # If we are doing a static Qt build, we need to propagate all dependencies.
+    set(depends_var "public_depends")
+    if(_target_is_static)
+        set(depends_var "depends")
+    endif()
+    unset(_target_is_static)
+
+    foreach(dep ${${depends_var}})
+        # Gather third party packages that should be found when using the Qt module.
+        # Also handle nolink target dependencies.
+        string(REGEX REPLACE "_nolink$" "" base_dep "${dep}")
+        if(NOT base_dep STREQUAL dep)
+            # Resets target name like Vulkan_nolink to Vulkan, because we need to call
+            # find_package(Vulkan).
+            set(dep ${base_dep})
+        endif()
+
+        if(TARGET ${dep})
+            list(FIND third_party_deps_seen ${dep} dep_seen)
+
+            get_target_property(package_name ${dep} INTERFACE_QT_PACKAGE_NAME)
+            if(dep_seen EQUAL -1 AND package_name)
+                list(APPEND third_party_deps_seen ${dep})
+                get_target_property(package_version ${dep} INTERFACE_QT_PACKAGE_VERSION)
+                if(NOT package_version)
+                    set(package_version "")
+                endif()
+
+                get_target_property(package_components ${dep} INTERFACE_QT_PACKAGE_COMPONENTS)
+                if(NOT package_components)
+                    set(package_components "")
+                endif()
+
+                list(APPEND third_party_deps
+                            "${package_name}\;${package_version}\;${package_components}")
+            endif()
+        endif()
+    endforeach()
+endmacro()
+
+function(qt_internal_create_module_depends_file target)
+    get_target_property(target_type "${target}" TYPE)
+    if(target_type STREQUAL "INTERFACE_LIBRARY")
+        set(arg_HEADER_MODULE ON)
+    else()
+        set(arg_HEADER_MODULE OFF)
+    endif()
+
+    set(depends "")
+    if(target_type STREQUAL "STATIC_LIBRARY" AND NOT arg_HEADER_MODULE)
+        get_target_property(depends "${target}" LINK_LIBRARIES)
+    endif()
+
+    get_target_property(public_depends "${target}" INTERFACE_LINK_LIBRARIES)
+
+    # Used for collecting Qt module dependencies that should be find_package()'d in
+    # ModuleDependencies.cmake.
+    get_target_property(target_deps "${target}" _qt_target_deps)
+    set(target_deps_seen "")
+
+    if(NOT arg_HEADER_MODULE)
+        get_target_property(extra_depends "${target}" QT_EXTRA_PACKAGE_DEPENDENCIES)
+    endif()
+    if(NOT extra_depends STREQUAL "${extra_depends}-NOTFOUND")
+        list(APPEND target_deps "${extra_depends}")
+    endif()
+
+    # Used for assembling the content of an include/Module/ModuleDepends.h header.
+    set(qtdeps "")
+
+    # Used for collecting third party dependencies that should be find_package()'d in
+    # ModuleDependencies.cmake.
+    set(third_party_deps "")
+    set(third_party_deps_seen "")
+
+    # Used for collecting Qt tool dependencies that should be find_package()'d in
+    # ModuleToolsDependencies.cmake.
+    set(tool_deps "")
+    set(tool_deps_seen "")
+
+    # Used for collecting Qt tool dependencies that should be find_package()'d in
+    # ModuleDependencies.cmake.
+    set(main_module_tool_deps "")
+
+    qt_internal_get_qt_all_known_modules(known_modules)
+
+    set(all_depends ${depends} ${public_depends})
+    foreach (dep ${all_depends})
+        # Normalize module by stripping leading "Qt::" and trailing "Private"
+        if (dep MATCHES "Qt::(.*)")
+            set(dep "${CMAKE_MATCH_1}")
+        endif()
+        if (dep MATCHES "(.*)Private")
+            set(dep "${CMAKE_MATCH_1}")
+        endif()
+
+        list(FIND known_modules "${dep}" _pos)
+        if (_pos GREATER -1)
+            list(APPEND qtdeps "${dep}")
+
+            # Make the ModuleTool package depend on dep's ModuleTool package.
+            list(FIND tool_deps_seen ${dep} dep_seen)
+            if(dep_seen EQUAL -1 AND ${dep} IN_LIST QT_KNOWN_MODULES_WITH_TOOLS)
+                list(APPEND tool_deps_seen ${dep})
+                list(APPEND tool_deps
+                            "${INSTALL_CMAKE_NAMESPACE}${dep}Tools\;${PROJECT_VERSION}")
+            endif()
+        endif()
+    endforeach()
+
+    qt_collect_third_party_deps(${target})
+
+    # Add dependency to the main ModuleTool package to ModuleDependencies file.
+    if(${target} IN_LIST QT_KNOWN_MODULES_WITH_TOOLS)
+        set(main_module_tool_deps
+            "${INSTALL_CMAKE_NAMESPACE}${target}Tools\;${PROJECT_VERSION}")
+    endif()
+
+    # Dirty hack because https://gitlab.kitware.com/cmake/cmake/issues/19200
+    foreach(dep ${target_deps})
+        if(dep)
+            list(FIND target_deps_seen "${dep}" dep_seen)
+            if(dep_seen EQUAL -1)
+                list(LENGTH dep len)
+                if(NOT (len EQUAL 2))
+                    message(FATAL_ERROR "List '${dep}' should look like QtFoo;version")
+                endif()
+                list(GET dep 0 dep_name)
+                list(GET dep 1 dep_ver)
+
+                list(APPEND target_deps_seen "${dep_name}\;${dep_ver}")
+            endif()
+        endif()
+    endforeach()
+    set(target_deps "${target_deps_seen}")
+
+    if (DEFINED qtdeps)
+        list(REMOVE_DUPLICATES qtdeps)
+    endif()
+
+    get_target_property(hasModuleHeaders "${target}" INTERFACE_MODULE_HAS_HEADERS)
+    if (${hasModuleHeaders})
+        qt_internal_write_depends_file("${target}" ${qtdeps})
+    endif()
+
+    if(third_party_deps OR main_module_tool_deps OR target_deps)
+        set(path_suffix "${INSTALL_CMAKE_NAMESPACE}${target}")
+        qt_path_join(config_build_dir ${QT_CONFIG_BUILD_DIR} ${path_suffix})
+        qt_path_join(config_install_dir ${QT_CONFIG_INSTALL_DIR} ${path_suffix})
+
+        # Configure and install ModuleDependencies file.
+        configure_file(
+            "${QT_CMAKE_DIR}/QtModuleDependencies.cmake.in"
+            "${config_build_dir}/${INSTALL_CMAKE_NAMESPACE}${target}Dependencies.cmake"
+            @ONLY
+        )
+
+        qt_install(FILES
+            "${config_build_dir}/${INSTALL_CMAKE_NAMESPACE}${target}Dependencies.cmake"
+            DESTINATION "${config_install_dir}"
+            COMPONENT Devel
+        )
+
+    endif()
+    if(tool_deps)
+        # The value of the property will be used by qt_export_tools.
+        set_property(TARGET "${target}" PROPERTY _qt_tools_package_deps "${tool_deps}")
+    endif()
+endfunction()
+
+function(qt_internal_create_plugin_depends_file target)
+    get_target_property(qt_module "${target}" QT_MODULE)
+    get_target_property(depends "${target}" LINK_LIBRARIES)
+    get_target_property(public_depends "${target}" INTERFACE_LINK_LIBRARIES)
+    get_target_property(target_deps "${target}" _qt_target_deps)
+    set(target_deps_seen "")
+
+    qt_collect_third_party_deps(${target})
+
+    # Dirty hack because https://gitlab.kitware.com/cmake/cmake/issues/19200
+    foreach(dep ${target_deps})
+        if(dep)
+            list(FIND target_deps_seen "${dep}" dep_seen)
+            if(dep_seen EQUAL -1)
+                list(LENGTH dep len)
+                if(NOT (len EQUAL 2))
+                    message(FATAL_ERROR "List '${dep}' should look like QtFoo;version")
+                endif()
+                list(GET dep 0 dep_name)
+                list(GET dep 1 dep_ver)
+
+                list(APPEND target_deps_seen "${dep_name}\;${dep_ver}")
+            endif()
+        endif()
+    endforeach()
+    set(target_deps "${target_deps_seen}")
+
+    if(third_party_deps OR target_deps)
+        # Setup build and install paths
+        if(qt_module)
+            set(path_suffix "${INSTALL_CMAKE_NAMESPACE}${qt_module}")
+        else()
+            set(path_suffix "${INSTALL_CMAKE_NAMESPACE}${target}")
+        endif()
+
+        qt_path_join(config_build_dir ${QT_CONFIG_BUILD_DIR} ${path_suffix})
+        qt_path_join(config_install_dir ${QT_CONFIG_INSTALL_DIR} ${path_suffix})
+
+        # Configure and install ModuleDependencies file.
+        configure_file(
+            "${QT_CMAKE_DIR}/QtPluginDependencies.cmake.in"
+            "${config_build_dir}/${target}Dependencies.cmake"
+            @ONLY
+        )
+
+        qt_install(FILES
+            "${config_build_dir}/${target}Dependencies.cmake"
+            DESTINATION "${config_install_dir}"
+            COMPONENT Devel
+        )
+    endif()
+endfunction()
+
+# Create Depends.cmake & Depends.h files for all modules and plug-ins.
+function(qt_internal_create_depends_files)
+    qt_internal_get_qt_repo_known_modules(repo_known_modules)
+
+    message("Generating ModuleDepends files and CMake ModuleDependencies files for ${repo_known_modules}...")
+    foreach (target ${repo_known_modules})
+        qt_internal_create_module_depends_file(${target})
+    endforeach()
+
+    message("Generating CMake PluginDependencies files for ${QT_KNOWN_PLUGINS}...")
+    foreach (target ${QT_KNOWN_PLUGINS})
+        qt_internal_create_plugin_depends_file(${target})
+    endforeach()
+endfunction()
+
+# This function creates the Qt<Module>Plugins.cmake used to list all
+# the plug-in target files.
+function(qt_internal_create_plugins_files)
+    # The plugins cmake configuration is only needed for static builds. Dynamic builds don't need
+    # the application to link against plugins at build time.
+    if(QT_BUILD_SHARED_LIBS)
+        return()
+    endif()
+    qt_internal_get_qt_repo_known_modules(repo_known_modules)
+
+    message("Generating Plugins files for ${repo_known_modules}...")
+    foreach (QT_MODULE ${repo_known_modules})
+        get_target_property(target_type "${QT_MODULE}" TYPE)
+        if(target_type STREQUAL "INTERFACE_LIBRARY")
+            # No plugins are provided by a header only module.
+            continue()
+        endif()
+        qt_path_join(config_build_dir ${QT_CONFIG_BUILD_DIR} ${INSTALL_CMAKE_NAMESPACE}${QT_MODULE})
+        qt_path_join(config_install_dir ${QT_CONFIG_INSTALL_DIR} ${INSTALL_CMAKE_NAMESPACE}${QT_MODULE})
+        set(QT_MODULE_PLUGIN_INCLUDES "")
+
+        get_target_property(qt_plugins "${QT_MODULE}" QT_PLUGINS)
+        if(qt_plugins)
+            foreach (pluginTarget ${qt_plugins})
+                set(QT_MODULE_PLUGIN_INCLUDES "${QT_MODULE_PLUGIN_INCLUDES}include(\"\${CMAKE_CURRENT_LIST_DIR}/${pluginTarget}Config.cmake\")\n")
+            endforeach()
+            configure_file(
+                "${QT_CMAKE_DIR}/QtPlugins.cmake.in"
+                "${config_build_dir}/${INSTALL_CMAKE_NAMESPACE}${QT_MODULE}Plugins.cmake"
+                @ONLY
+            )
+            qt_install(FILES
+                "${config_build_dir}/${INSTALL_CMAKE_NAMESPACE}${QT_MODULE}Plugins.cmake"
+                DESTINATION "${config_install_dir}"
+                COMPONENT Devel
+            )
+        endif()
+    endforeach()
+endfunction()
+
+function(qt_generate_build_internals_extra_cmake_code)
+    if(PROJECT_NAME STREQUAL "QtBase")
+        foreach(var IN LISTS QT_BASE_CONFIGURE_TESTS_VARS_TO_EXPORT)
+            string(APPEND QT_EXTRA_BUILD_INTERNALS_VARS "set(${var} \"${${var}}\" CACHE INTERNAL \"\")\n")
+        endforeach()
+
+        set(QT_SOURCE_TREE "${QtBase_SOURCE_DIR}")
+        qt_path_join(extra_file_path
+                     ${QT_CONFIG_BUILD_DIR}
+                     ${INSTALL_CMAKE_NAMESPACE}BuildInternals/QtBuildInternalsExtra.cmake)
+
+        if(CMAKE_BUILD_TYPE)
+            # Need to force set, because CMake itself initializes a value for CMAKE_BUILD_TYPE
+            # at the start of project configuration (with an empty value),
+            # so we need to force override it.
+            string(APPEND QT_EXTRA_BUILD_INTERNALS_VARS
+                "set(CMAKE_BUILD_TYPE \"${CMAKE_BUILD_TYPE}\" CACHE STRING \"Choose the type of build.\" FORCE)\n")
+
+        endif()
+        if(CMAKE_CONFIGURATION_TYPES)
+            string(APPEND QT_EXTRA_BUILD_INTERNALS_VARS
+                "set(CMAKE_CONFIGURATION_TYPES \"${CMAKE_CONFIGURATION_TYPES}\")\n")
+        endif()
+        if(CMAKE_TRY_COMPILE_CONFIGURATION)
+            string(APPEND QT_EXTRA_BUILD_INTERNALS_VARS
+                "set(CMAKE_TRY_COMPILE_CONFIGURATION \"${CMAKE_TRY_COMPILE_CONFIGURATION}\")\n")
+        endif()
+        if(QT_MULTI_CONFIG_FIRST_CONFIG)
+            string(APPEND QT_EXTRA_BUILD_INTERNALS_VARS
+                "set(QT_MULTI_CONFIG_FIRST_CONFIG \"${QT_MULTI_CONFIG_FIRST_CONFIG}\")\n")
+        endif()
+        if(CMAKE_NINJA_MULTI_CROSS_CONFIG_ENABLE)
+            string(APPEND QT_EXTRA_BUILD_INTERNALS_VARS
+                "set(CMAKE_NINJA_MULTI_CROSS_CONFIG_ENABLE \"${CMAKE_NINJA_MULTI_CROSS_CONFIG_ENABLE}\")\n")
+        endif()
+        if(CMAKE_NINJA_MULTI_DEFAULT_BUILD_TYPE)
+            string(APPEND QT_EXTRA_BUILD_INTERNALS_VARS
+                "set(CMAKE_NINJA_MULTI_DEFAULT_BUILD_TYPE \"${CMAKE_NINJA_MULTI_DEFAULT_BUILD_TYPE}\")\n")
+        endif()
+
+        configure_file(
+            "${CMAKE_CURRENT_LIST_DIR}/QtBuildInternalsExtra.cmake.in"
+            "${extra_file_path}"
+            @ONLY
+        )
+    endif()
+endfunction()
+
+# For every Qt module check if there any android dependencies that require
+# processing.
+function(qt_modules_process_android_dependencies)
+    qt_internal_get_qt_repo_known_modules(repo_known_modules)
+    foreach (target ${repo_known_modules})
+        qt_android_dependencies(${target})
+    endforeach()
+endfunction()
+
+function(qt_create_tools_config_files)
+    # Create packages like Qt6CoreTools/Qt6CoreToolsConfig.cmake.
+    foreach(module_name ${QT_KNOWN_MODULES_WITH_TOOLS})
+        qt_export_tools("${module_name}")
+    endforeach()
+endfunction()
+
+function(qt_internal_create_config_file_for_standalone_tests)
+    set(standalone_tests_config_dir "StandaloneTests")
+    qt_path_join(config_build_dir
+                 ${QT_CONFIG_BUILD_DIR}
+                 "${INSTALL_CMAKE_NAMESPACE}BuildInternals" "${standalone_tests_config_dir}")
+    qt_path_join(config_install_dir
+                 ${QT_CONFIG_INSTALL_DIR}
+                 "${INSTALL_CMAKE_NAMESPACE}BuildInternals" "${standalone_tests_config_dir}")
+
+    # Filter out bundled system libraries. Otherwise when looking for their dependencies
+    # (like PNG for Freetype) FindWrapPNG is searched for during configuration of
+    # standalone tests, and it can happen that Core or Gui features are not
+    # imported early enough, which means FindWrapPNG will try to find a system PNG library instead
+    # of the bundled one.
+    set(modules)
+    foreach(m ${QT_REPO_KNOWN_MODULES})
+        get_target_property(target_type "${m}" TYPE)
+
+        # Interface libraries are never bundled system libraries (hopefully).
+        if(target_type STREQUAL "INTERFACE_LIBRARY")
+            list(APPEND modules "${m}")
+            continue()
+        endif()
+
+        get_target_property(is_3rd_party "${m}" QT_MODULE_IS_3RDPARTY_LIBRARY)
+        if(NOT is_3rd_party)
+            list(APPEND modules "${m}")
+        endif()
+    endforeach()
+
+    list(JOIN modules " " QT_REPO_KNOWN_MODULES_STRING)
+    string(STRIP "${QT_REPO_KNOWN_MODULES_STRING}" QT_REPO_KNOWN_MODULES_STRING)
+
+    # Skip generating and installing file if no modules were built. This make sure not to install
+    # anything when build qtx11extras on macOS for example.
+    if(NOT QT_REPO_KNOWN_MODULES_STRING)
+        return()
+    endif()
+
+    # Ceate a Config file that calls find_package on the modules that were built as part
+    # of the current repo. This is used for standalone tests.
+    configure_file(
+        "${QT_CMAKE_DIR}/QtStandaloneTestsConfig.cmake.in"
+        "${config_build_dir}/${PROJECT_NAME}TestsConfig.cmake"
+        @ONLY
+    )
+    qt_install(FILES
+        "${config_build_dir}/${PROJECT_NAME}TestsConfig.cmake"
+        DESTINATION "${config_install_dir}"
+        COMPONENT Devel
+    )
+endfunction()
+
+qt_internal_create_depends_files()
+qt_generate_build_internals_extra_cmake_code()
+qt_internal_create_plugins_files()
+qt_internal_create_config_file_for_standalone_tests()
+
+# Needs to run after qt_internal_create_depends_files.
+qt_create_tools_config_files()
+
+if (ANDROID)
+    qt_modules_process_android_dependencies()
+endif()
diff --git a/cmake/QtProperties.cmake b/cmake/QtProperties.cmake
new file mode 100644
index 0000000000..a12fa53252
--- /dev/null
+++ b/cmake/QtProperties.cmake
@@ -0,0 +1,107 @@
+define_property(TARGET
+    PROPERTY
+        QT_PLUGINS
+    BRIEF_DOCS
+        "List of Qt plug-ins associated with a given Qt module."
+    FULL_DOCS
+        "This is a property on Qt modules.
+        For instance, sqlite;odbc for Sql"
+)
+
+define_property(TARGET
+    PROPERTY
+        MODULE_PLUGIN_TYPES
+    BRIEF_DOCS
+        "List of plugin categories associated to the Qt module"
+    FULL_DOCS
+        "This is a property on Qt modules.
+        For instance, sqldrivers for Sql."
+)
+
+define_property(TARGET
+    PROPERTY
+        QT_PLUGIN_CLASS_NAME
+    BRIEF_DOCS
+        "Class name of the Qt plug-in"
+    FULL_DOCS
+        "This is a property on Qt plug-ins.
+        For instance, QICOPlugin for the qico plug-in"
+)
+
+define_property(TARGET
+    PROPERTY
+        QT_PLUGIN_TYPE
+    BRIEF_DOCS
+        "Type of the Qt plug-in"
+    FULL_DOCS
+        "This is a property on Qt plug-ins.
+        For example, the value of the QT_PLUGIN_TYPE property on the qico plugin is \"imageformats\""
+)
+
+define_property(TARGET
+    PROPERTY
+        QT_MODULE
+    BRIEF_DOCS
+        "Qt module associated with a plug-in."
+    FULL_DOCS
+        "This is a property on Qt plug-ins.
+        For instance, Sql for qsqlite"
+)
+
+define_property(TARGET
+    PROPERTY
+        QT_DEFAULT_PLUGIN
+    BRIEF_DOCS
+        "Indicates whether a plug-in is added by default."
+    FULL_DOCS
+        "This is a property on Qt plug-ins.
+        It is mainly used to indicate if a plug-in should be added
+        to the default set of plug-ins when building a static app -
+        for instance, which QPA should be linked."
+)
+
+define_property(GLOBAL
+    PROPERTY
+        QT_KNOWN_PLUGINS
+    BRIEF_DOCS
+        ""
+    FULL_DOCS
+        ""
+)
+
+define_property(TARGET
+    PROPERTY
+        QT_QML_MODULE_TARGET_PATH
+    BRIEF_DOCS
+        "Specifies the target path for a qml module"
+    FULL_DOCS
+        "Specifies the target path for a qml module"
+)
+
+define_property(TARGET
+    PROPERTY
+        QT_QML_MODULE_URI
+    BRIEF_DOCS
+        "Specifies the URI for a qml module"
+    FULL_DOCS
+        "Specifies the URI for a qml module"
+)
+
+define_property(TARGET
+    PROPERTY
+        QT_RESOURCE_PREFIX
+    BRIEF_DOCS
+        "Specifies the default Qt resource prefix."
+    FULL_DOCS
+        "When using qt_add_resource() without a PREFIX, then prefix of this target property
+        will be used."
+)
+
+define_property(TARGET
+    PROPERTY
+        QT_QML_MODULE_VERSION
+    BRIEF_DOCS
+        "Specifies the qml module's version."
+    FULL_DOCS
+        "Specifies the qml module's version."
+)
diff --git a/cmake/QtResource.cmake.in b/cmake/QtResource.cmake.in
new file mode 100644
index 0000000000..bef47707ea
--- /dev/null
+++ b/cmake/QtResource.cmake.in
@@ -0,0 +1,299 @@
+#
+# All things resource related
+#
+
+function(__qt_get_relative_resource_path_for_file output_alias file)
+    get_property(alias SOURCE ${file} PROPERTY QT_RESOURCE_ALIAS)
+    if (NOT alias)
+        set(alias "${file}")
+    endif()
+    set(${output_alias} ${alias} PARENT_SCOPE)
+endfunction()
+
+function(__qt_propagate_generated_resource target resource_name generated_source_code output_generated_target)
+    get_target_property(type ${target} TYPE)
+    if(type STREQUAL STATIC_LIBRARY)
+        set(resource_target "${target}_resources_${resourceName}")
+        add_library("${resource_target}" OBJECT "${generated_source_code}")
+
+        # Use TARGET_NAME genex to map to the correct prefixed target name when it is exported
+        # via qt_install(EXPORT), so that the consumers of the target can find the object library
+        # as well.
+        target_link_libraries(${target} INTERFACE
+                              "$<TARGET_OBJECTS:$<TARGET_NAME:${resource_target}>>")
+        set(${output_generated_target} "${resource_target}" PARENT_SCOPE)
+    else()
+        set(${output_generated_target} "" PARENT_SCOPE)
+        target_sources(${target} PRIVATE ${generated_source_code})
+    endif()
+endfunction()
+
+# Inspect all files passed to a call to qt_add_resource. If there are any
+# files present, invoke the quick compiler and return the remaining resource
+# files that have not been processed in OUTPUT_REMAINING_RESOURCES as well as the new
+# name for the resource in OUTPUT_RESOURCE_NAME.
+function(__qt_quick_compiler_process_resources target resource_name)
+
+    cmake_parse_arguments(arg
+        "" "PREFIX;OUTPUT_REMAINING_RESOURCES;OUTPUT_RESOURCE_NAME;OUTPUT_GENERATED_TARGET" "FILES" ${ARGN}
+    )
+
+    set(qml_files)
+    set(resource_files)
+    # scan for qml files
+    foreach(file IN LISTS arg_FILES)
+        # check whether this resource should not be processed by the qt quick
+        # compiler
+        get_source_file_property(skip_compiler_check ${file} QT_SKIP_QUICKCOMPILER)
+        if (skip_compiler_check)
+            list(APPEND resource_files ${file})
+            continue()
+        endif()
+
+        if (${file} MATCHES "\.js$"
+                OR ${file} MATCHES "\.mjs$"
+                OR ${file} MATCHES "\.qml$")
+            list(APPEND qml_files ${file})
+        endif()
+        list(APPEND resource_files ${file})
+    endforeach()
+    if (NOT TARGET @QT_CMAKE_EXPORT_NAMESPACE@::qmlcachegen AND qml_files)
+        message(WARNING "QT@PROJECT_VERSION_MAJOR@_PROCESS_RESOURCE: Qml files were detected but the qmlcachgen target is not defined. Consider adding QmlTools to your find_package command.")
+    endif()
+
+    if (TARGET @QT_CMAKE_EXPORT_NAMESPACE@::qmlcachegen AND qml_files)
+        # Enable qt quick compiler support
+        set(qml_resource_file "${CMAKE_CURRENT_BINARY_DIR}/.rcc/${resource_name}.qrc")
+        if (resource_files)
+            set(chained_resource_name "${resource_name}_qmlcache")
+        endif()
+
+        foreach(file IN LISTS qml_files)
+            get_filename_component(file_absolute ${file} ABSOLUTE)
+            file(RELATIVE_PATH file_relative ${CMAKE_CURRENT_SOURCE_DIR} ${file_absolute})
+            __qt_get_relative_resource_path_for_file(file_resource_path ${file})
+            if (arg_PREFIX STREQUAL "/")
+                # TO_CMAKE_PATH does not clean up cases such as //Foo
+                set(file_resource_path "/${file_resource_path}")
+            else()
+                set(file_resource_path "${arg_PREFIX}/${file_resource_path}")
+            endif()
+            file(TO_CMAKE_PATH ${file_resource_path} file_resource_path)
+            list(APPEND file_resource_paths ${file_resource_path})
+            string(REGEX REPLACE "\.js$" "_js" compiled_file ${file_relative})
+            string(REGEX REPLACE "\.mjs$" "_mjs" compiled_file ${compiled_file})
+            string(REGEX REPLACE "\.qml$" "_qml" compiled_file ${compiled_file})
+            string(REGEX REPLACE "[\$#\?]+" "_" compiled_file ${compiled_file})
+            set(compiled_file "${CMAKE_CURRENT_BINARY_DIR}/.rcc/qmlcache/${resource_name}/${compiled_file}.cpp")
+            get_filename_component(out_dir ${compiled_file} DIRECTORY)
+            if(NOT EXISTS ${out_dir})
+                file(MAKE_DIRECTORY ${out_dir})
+            endif()
+            add_custom_command(
+                OUTPUT ${compiled_file}
+                ${QT_TOOL_PATH_SETUP_COMMAND}
+                COMMAND
+                    @QT_CMAKE_EXPORT_NAMESPACE@::qmlcachegen
+                    --resource-path "${file_resource_path}"
+                    -o "${compiled_file}"
+                    "${file_absolute}"
+                DEPENDS
+                    $<TARGET_FILE:@QT_CMAKE_EXPORT_NAMESPACE@::qmlcachegen>
+                    "${file_absolute}"
+            )
+            target_sources(${target} PRIVATE ${compiled_file})
+        endforeach()
+
+        set(qmlcache_loader_list "${CMAKE_CURRENT_BINARY_DIR}/.rcc/qmlcache/${resource_name}/qml_loader_file_list.rsp")
+        file(GENERATE
+            OUTPUT ${qmlcache_loader_list}
+            CONTENT "$<JOIN:${file_resource_paths},\n>"
+        )
+
+        set(qmlcache_loader_file "${CMAKE_CURRENT_BINARY_DIR}/.rcc/qmlcache/${resource_name}/qmlcache_loader.cpp")
+        set(resource_name_arg "${resource_name}.qrc")
+        if (chained_resource_name)
+            set(resource_name_arg "${resource_name_arg}=${chained_resource_name}")
+        endif()
+
+        add_custom_command(
+            OUTPUT ${qmlcache_loader_file}
+            ${QT_TOOL_PATH_SETUP_COMMAND}
+            COMMAND
+                @QT_CMAKE_EXPORT_NAMESPACE@::qmlcachegen
+                --resource-name "${resource_name_arg}"
+                -o "${qmlcache_loader_file}"
+                "@${qmlcache_loader_list}"
+            DEPENDS
+                $<TARGET_FILE:@QT_CMAKE_EXPORT_NAMESPACE@::qmlcachegen>
+                "${qmlcache_loader_list}"
+        )
+
+        __qt_propagate_generated_resource(${target}
+            ${resource_name}
+            ${qmlcache_loader_file}
+            output_target)
+
+        set(${arg_OUTPUT_GENERATED_TARGET} "${output_target}" PARENT_SCOPE)
+
+        if (resource_files)
+            set(resource_name ${chained_resource_name})
+        endif()
+
+        # The generated qmlcache_loader source file uses private headers of Qml, so make sure
+        # if the object library was created, it depends on the Qml target. If there's no target,
+        # that means the target is a shared library and the sources are directly added to the target
+        # via target_sources, so add dependency in that case as well.
+        set(chosen_target "target") # shared library case
+        if(output_target)
+            set(chosen_target "output_target") # static library case.
+        endif()
+        target_link_libraries(${${chosen_target}} PRIVATE @QT_CMAKE_EXPORT_NAMESPACE@::Qml)
+    else()
+        set(resource_files ${arg_FILES})
+    endif()
+
+    set(${arg_OUTPUT_REMAINING_RESOURCES} ${resource_files} PARENT_SCOPE)
+    set(${arg_OUTPUT_RESOURCE_NAME} ${resource_name} PARENT_SCOPE)
+endfunction()
+
+#
+# Process resources via file path instead of QRC files. Behind the
+# scnenes, it will generate a qrc file and apply post processing steps
+# when applicable. (e.g.: QtQuickCompiler)
+#
+# The QRC Prefix is set via the PREFIX parameter.
+#
+# Alias settings for files need to be set via the QT_RESOURCE_ALIAS property
+# via the set_soure_files_properties() command.
+#
+# When using this command with static libraries, one or more special targets
+# will be generated. Should you wish to perform additional processing on these
+# targets pass a value to the OUTPUT_TARGETS parameter.
+#
+function(QT@PROJECT_VERSION_MAJOR@_PROCESS_RESOURCE target resourceName)
+
+    cmake_parse_arguments(rcc "" "PREFIX;LANG;BASE;OUTPUT_TARGETS" "FILES;OPTIONS" ${ARGN})
+
+    string(REPLACE "/" "_" resourceName ${resourceName})
+    string(REPLACE "." "_" resourceName ${resourceName})
+
+    set(output_targets "")
+    # Apply base to all files
+    if (rcc_BASE)
+        foreach(file IN LISTS rcc_FILES)
+            set(resource_file "${rcc_BASE}/${file}")
+            __qt_get_relative_resource_path_for_file(alias ${resource_file})
+            # Handle case where resources were generated from a directory
+            # different than the one where the main .pro file resides.
+            # Unless otherwise specified, we should use the original file path
+            # as alias.
+            if (alias STREQUAL resource_file)
+                set_source_files_properties(${resource_file} PROPERTIES QT_RESOURCE_ALIAS ${file})
+            endif()
+            file(TO_CMAKE_PATH ${resource_file} resource_file)
+            list(APPEND resource_files ${resource_file})
+        endforeach()
+    else()
+        set(resource_files ${rcc_FILES})
+    endif()
+
+    if(NOT rcc_PREFIX)
+        get_target_property(rcc_PREFIX ${target} QT_RESOURCE_PREFIX)
+        if (NOT rcc_PREFIX)
+            message(FATAL_ERROR "QT@PROJECT_VERSION_MAJOR@_PROCESS_RESOURCE() was called without a PREFIX and the target does not provide QT_RESOURCE_PREFIX. Please either add a PREFIX or make the target ${target} provide a default.")
+        endif()
+    endif()
+
+    # Apply quick compiler pass
+    __qt_quick_compiler_process_resources(${target} ${resourceName}
+        FILES ${resource_files}
+        PREFIX ${rcc_PREFIX}
+        OUTPUT_REMAINING_RESOURCES resources
+        OUTPUT_RESOURCE_NAME newResourceName
+        OUTPUT_GENERATED_TARGET output_target_quick
+    )
+
+    if (NOT resources)
+        if (rcc_OUTPUT_TARGETS)
+            set(${rcc_OUTPUT_TARGETS} "${output_target_quick}" PARENT_SCOPE)
+        endif()
+        return()
+    endif()
+    list(APPEND output_targets ${output_target_quick})
+    set(generatedResourceFile "${CMAKE_CURRENT_BINARY_DIR}/.rcc/generated_${newResourceName}.qrc")
+    set(generatedSourceCode "${CMAKE_CURRENT_BINARY_DIR}/.rcc/qrc_${newResourceName}.cpp")
+
+    # Generate .qrc file:
+
+    # <RCC><qresource ...>
+    set(qrcContents "<RCC>\n  <qresource")
+    if (rcc_PREFIX)
+        string(APPEND qrcContents " prefix=\"${rcc_PREFIX}\"")
+    endif()
+    if (rcc_LANG)
+        string(APPEND qrcContents " lang=\"${rcc_LANG}\"")
+    endif()
+    string(APPEND qrcContents ">\n")
+
+    set(resource_dependencies)
+    foreach(file IN LISTS resources)
+        __qt_get_relative_resource_path_for_file(file_resource_path ${file})
+
+        if (NOT IS_ABSOLUTE ${file})
+            set(file "${CMAKE_CURRENT_SOURCE_DIR}/${file}")
+        endif()
+
+        ### FIXME: escape file paths to be XML conform
+        # <file ...>...</file>
+        string(APPEND qrcContents "    <file alias=\"${file_resource_path}\">")
+        string(APPEND qrcContents "${file}</file>\n")
+        list(APPEND files "${file}")
+
+        get_source_file_property(target_dependency ${file} QT_RESOURCE_TARGET_DEPENDENCY)
+        if (NOT target_dependency)
+            list(APPEND resource_dependencies ${file})
+        else()
+            if (NOT TARGET ${target_dependency})
+                message(FATAL_ERROR "Target dependency on resource file ${file} is not a cmake target.")
+            endif()
+            list(APPEND resource_dependencies ${target_dependency})
+        endif()
+    endforeach()
+
+    # </qresource></RCC>
+    string(APPEND qrcContents "  </qresource>\n</RCC>\n")
+
+    file(GENERATE OUTPUT "${generatedResourceFile}" CONTENT "${qrcContents}")
+
+    set(rccArgs --name "${newResourceName}"
+        --output "${generatedSourceCode}" "${generatedResourceFile}")
+    if(rcc_OPTIONS)
+        list(APPEND rccArgs ${rcc_OPTIONS})
+    endif()
+
+    # Process .qrc file:
+    add_custom_command(OUTPUT "${generatedSourceCode}"
+                       COMMAND "@QT_CMAKE_EXPORT_NAMESPACE@::rcc"
+                       ARGS ${rccArgs}
+                       DEPENDS
+                        ${resource_dependencies}
+                        ${generatedResourceFile}
+                        "@QT_CMAKE_EXPORT_NAMESPACE@::rcc"
+                       COMMENT "RCC ${newResourceName}"
+                       VERBATIM)
+
+    get_target_property(type "${target}" TYPE)
+    # Only do this if newResourceName is the same as resourceName, since
+    # the resource will be chainloaded by the qt quickcompiler
+    # qml cache loader
+    if(newResourceName STREQUAL resourceName)
+        __qt_propagate_generated_resource(${target} ${resourceName} "${generatedSourceCode}" output_target)
+        list(APPEND output_targets ${output_target})
+    else()
+        target_sources(${target} PRIVATE "${generatedSourceCode}")
+    endif()
+    if (rcc_OUTPUT_TARGETS)
+        set(${rcc_OUTPUT_TARGETS} "${output_targets}" PARENT_SCOPE)
+    endif()
+endfunction()
diff --git a/cmake/QtSetup.cmake b/cmake/QtSetup.cmake
new file mode 100644
index 0000000000..90588c99b3
--- /dev/null
+++ b/cmake/QtSetup.cmake
@@ -0,0 +1,176 @@
+## Set a default build type if none was specified
+
+# Set the QT_IS_BUILDING_QT variable so we can verify whether we are building
+# Qt from source
+set(QT_BUILDING_QT TRUE CACHE
+    TYPE STRING "When this is present and set to true, it signals that we are building Qt from source.")
+
+set(_default_build_type "Release")
+if(EXISTS "${CMAKE_SOURCE_DIR}/.git")
+    set(_default_build_type "Debug")
+endif()
+
+# Reset content of extra build internal vars for each inclusion of QtSetup.
+unset(QT_EXTRA_BUILD_INTERNALS_VARS)
+
+if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
+  message(STATUS "Setting build type to '${_default_build_type}' as none was specified.")
+  set(CMAKE_BUILD_TYPE "${_default_build_type}" CACHE STRING "Choose the type of build." FORCE)
+  set_property(CACHE CMAKE_BUILD_TYPE
+      PROPERTY STRINGS
+      "Debug" "Release" "MinSizeRel" "RelWithDebInfo") # Set the possible values for cmake-gui.
+elseif(CMAKE_CONFIGURATION_TYPES)
+    message(STATUS "Building for multiple configurations: ${CMAKE_CONFIGURATION_TYPES}.")
+    message(STATUS "Main configuration is: ${QT_MULTI_CONFIG_FIRST_CONFIG}.")
+    if(CMAKE_NINJA_MULTI_DEFAULT_BUILD_TYPE)
+        message(STATUS
+            "Default build configuration set to '${CMAKE_NINJA_MULTI_DEFAULT_BUILD_TYPE}'.")
+    endif()
+endif()
+
+# Appends a 'debug postfix' to library targets (not executables)
+# e.g. lib/libQt6DBus_debug.5.12.0.dylib
+if(WIN32)
+    set(CMAKE_DEBUG_POSTFIX "d")
+elseif(APPLE)
+    set(CMAKE_DEBUG_POSTFIX "_debug")
+endif()
+
+## Position independent code:
+set(CMAKE_POSITION_INDEPENDENT_CODE ON)
+
+# Do not relink dependent libraries when no header has changed:
+set(CMAKE_LINK_DEPENDS_NO_SHARED ON)
+
+# Default to hidden visibility for symbols:
+set(CMAKE_C_VISIBILITY_PRESET hidden)
+set(CMAKE_CXX_VISIBILITY_PRESET hidden)
+set(CMAKE_VISIBILITY_INLINES_HIDDEN 1)
+
+# Detect non-prefix builds, either when the install prefix is set to the binary dir
+# or when enabling developer builds and no prefix is specified.
+# This detection only happens when building qtbase, and later is propagated via the generated
+# QtBuildInternalsExtra.cmake file.
+if (PROJECT_NAME STREQUAL "QtBase" AND NOT QT_BUILD_STANDALONE_TESTS)
+    if((CMAKE_INSTALL_PREFIX STREQUAL CMAKE_BINARY_DIR) OR
+        (CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT AND FEATURE_developer_build))
+
+        set(__qt_will_install_value OFF)
+        # Handle non-prefix builds by setting the CMake install prefix to point to qtbase's build
+        # dir.
+        # While building another repo (like qtsvg), the CMAKE_INSTALL_PREFIX or CMAKE_PREFIX_PATH
+        # (either work) should be set on the command line to point to the qtbase build dir.
+        set(CMAKE_INSTALL_PREFIX ${CMAKE_BINARY_DIR} CACHE PATH
+            "Install path prefix, prepended onto install directories." FORCE)
+    else()
+        set(__qt_will_install_value ON)
+    endif()
+    set(QT_WILL_INSTALL ${__qt_will_install_value} CACHE BOOL
+        "Boolean indicating if doing a Qt prefix build (vs non-prefix build)." FORCE)
+    unset(__qt_will_install_value)
+endif()
+
+# Specify the QT_SOURCE_TREE only when building qtbase. Needed by some tests when the tests are
+# built as part of the project, and not standalone. For standalone tests, the value is set in
+# QtBuildInternalsExtra.cmake.
+if(PROJECT_NAME STREQUAL "QtBase")
+    set(QT_SOURCE_TREE "${QtBase_SOURCE_DIR}" CACHE PATH
+        "A path to the source tree of the previously configured QtBase project." FORCE)
+endif()
+
+if(FEATURE_developer_build)
+    if(DEFINED QT_CMAKE_EXPORT_COMPILE_COMMANDS)
+        set(CMAKE_EXPORT_COMPILE_COMMANDS ${QT_CMAKE_EXPORT_COMPILE_COMMANDS})
+    else()
+        set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
+    endif()
+    set(QT_BUILD_TESTING ON)
+    set(__build_benchmarks ON)
+
+    # Tests are not built by default with qmake for iOS and friends, and thus the overall build
+    # tends to fail. Disable them by default when targeting uikit.
+    if(APPLE_UIKIT)
+        set(QT_BUILD_TESTING OFF)
+    endif()
+
+    # Disable benchmarks for single configuration generators which do not build
+    # with release configuration.
+    if (CMAKE_BUILD_TYPE AND NOT CMAKE_BUILD_TYPE STREQUAL Release)
+        set(__build_benchmarks OFF)
+    endif()
+else()
+    set(QT_BUILD_TESTING OFF)
+    set(__build_benchmarks OFF)
+endif()
+
+## Set up testing
+option(BUILD_TESTING "Build the testing tree." ${QT_BUILD_TESTING})
+if(QT_BUILD_STANDALONE_TESTS)
+    set(QT_BUILD_TESTING ON)
+
+    # BuildInternals might have set it to OFF on initial configuration. So force it to ON when
+    # building standalone tests.
+    set(BUILD_TESTING ON CACHE BOOL "Build the testing tree." FORCE)
+
+    # Also force the tests to be built as part of the default build target.
+    set(QT_NO_MAKE_TESTS OFF CACHE BOOL
+        "Should examples be built as part of the default 'all' target." FORCE)
+endif()
+option(QT_NO_MAKE_TESTS "Should tests be built as part of the default 'all' target." OFF)
+
+include(CTest)
+enable_testing()
+
+# Set up building of examples.
+set(QT_BUILD_EXAMPLES ON)
+# Examples are not built by default with qmake for iOS and friends, and thus the overall build
+# tends to fail. Disable them by default when targeting uikit.
+if(APPLE_UIKIT)
+    set(QT_BUILD_EXAMPLES OFF)
+endif()
+
+option(BUILD_EXAMPLES "Build Qt examples" ${QT_BUILD_EXAMPLES})
+option(QT_NO_MAKE_EXAMPLES "Should examples be built as part of the default 'all' target." OFF)
+
+# Build Benchmarks
+option(QT_BUILD_BENCHMARKS "Build Qt Benchmarks" ${__build_benchmarks})
+
+## Android platform settings
+if(ANDROID)
+    include(QtPlatformAndroid)
+endif()
+
+## qt_add_module and co.:
+include(QtBuild)
+
+## Qt Feature support:
+include(QtFeature)
+
+## Compiler optimization flags:
+include(QtCompilerOptimization)
+
+## Compiler flags:
+include(QtCompilerFlags)
+
+## Set up non-prefix build:
+qt_set_up_nonprefix_build()
+
+qt_set_language_standards()
+
+## Find host tools (if non native):
+set(QT_HOST_PATH "" CACHE PATH "Installed Qt host directory path, used for cross compiling.")
+
+if (CMAKE_CROSSCOMPILING AND NOT IS_DIRECTORY ${QT_HOST_PATH})
+    message(FATAL_ERROR "You need to set QT_HOST_PATH to cross compile Qt.")
+endif()
+
+## Enable support for sanitizers:
+include(${CMAKE_CURRENT_LIST_DIR}/3rdparty/extra-cmake-modules/modules/ECMEnableSanitizers.cmake)
+
+option(QT_USE_CCACHE "Enable the use of ccache")
+if(QT_USE_CCACHE)
+    find_program(CCACHE_PROGRAM ccache)
+    set(CMAKE_C_COMPILER_LAUNCHER "${CCACHE_PROGRAM}")
+    set(CMAKE_CXX_COMPILER_LAUNCHER "${CCACHE_PROGRAM}")
+    set(CMAKE_OBJC_COMPILER_LAUNCHER "${CCACHE_PROGRAM}")
+endif()
diff --git a/cmake/QtStandaloneTestsConfig.cmake.in b/cmake/QtStandaloneTestsConfig.cmake.in
new file mode 100644
index 0000000000..3d08ae0c12
--- /dev/null
+++ b/cmake/QtStandaloneTestsConfig.cmake.in
@@ -0,0 +1,2 @@
+find_package(@INSTALL_CMAKE_NAMESPACE@ @PROJECT_VERSION@
+             REQUIRED COMPONENTS @QT_REPO_KNOWN_MODULES_STRING@)
diff --git a/cmake/QtToolsConfig.cmake.in b/cmake/QtToolsConfig.cmake.in
new file mode 100644
index 0000000000..7b2fa1de74
--- /dev/null
+++ b/cmake/QtToolsConfig.cmake.in
@@ -0,0 +1,35 @@
+@PACKAGE_INIT@
+
+get_filename_component(_qt_tools_cmake_dir "${CMAKE_CURRENT_LIST_DIR}/.." ABSOLUTE)
+
+ if (NOT @INSTALL_CMAKE_NAMESPACE@Tools_FIND_COMPONENTS)
+     set(@INSTALL_CMAKE_NAMESPACE@Tools_NOT_FOUND_MESSAGE
+         "The Qt tools package requires at least one component.")
+     set(@INSTALL_CMAKE_NAMESPACE@Tools_FOUND False)
+     return()
+ endif()
+
+foreach(module ${@INSTALL_CMAKE_NAMESPACE@Tools_FIND_COMPONENTS})
+    find_package(@INSTALL_CMAKE_NAMESPACE@${module}Tools
+        ${_@INSTALL_CMAKE_NAMESPACE@Tools_FIND_PARTS_QUIET}
+        ${_@INSTALL_CMAKE_NAMESPACE@Tools_FIND_PARTS_REQUIRED}
+        PATHS ${_qt_tools_cmake_dir} NO_DEFAULT_PATH
+    )
+    if (NOT @INSTALL_CMAKE_NAMESPACE@${module}Tools_FOUND)
+        string(CONFIGURE ${_qt5_module_location_template} _expected_module_location @ONLY)
+
+        if (@INSTALL_CMAKE_NAMESPACE@_FIND_REQUIRED_${module})
+            set(_Qt_NOTFOUND_MESSAGE
+                "${_Qt_NOTFOUND_MESSAGE}Failed to find Qt component \"${module}\" config file.")
+        elseif(NOT Qt_FIND_QUIETLY)
+            message(WARNING "Failed to find Qt component \"${module}\" config file.")
+        endif()
+
+        unset(_expected_module_location)
+    endif()
+endforeach()
+
+if (_Qt_NOTFOUND_MESSAGE)
+    set(@INSTALL_CMAKE_NAMESPACE@Tools_NOT_FOUND_MESSAGE "${_Qt_NOTFOUND_MESSAGE}")
+    set(@INSTALL_CMAKE_NAMESPACE@Tools_FOUND False)
+endif()
diff --git a/cmake/README.md b/cmake/README.md
new file mode 100644
index 0000000000..6b65f0e69a
--- /dev/null
+++ b/cmake/README.md
@@ -0,0 +1,308 @@
+# Status
+
+Initial port is on-going. Some modules of QtBase are ported, incl. some of the platform modules.
+Many libraries, tests and examples are still missing.
+
+Basic functionality is there (moc, uic, etc.), but documentation, translations, etc. are missing.
+
+NOTE: YOU NEED CMAKE 3.15 or later.
+
+# Intro
+
+The CMake update offers an opportunity to revisit some topics that came up during the last few
+years.
+
+* The Qt build system does not support building host tools during a cross-compilation run. You need
+  to build a Qt for your host machine first and then use the platform tools from that version. The
+  decision to do this was reached independent of cmake: This does save resources on build machines
+  as the host tools will only get built once.
+
+* 3rd-party dependencies are no longer built as part of Qt. zlib, libpng, etc. from src/3rdparty
+  need to be supplied from the outside to the build now. You may find apt-get/brew/etc. useful for
+  this. Otherwise you may consider using vcpkg as in the next section. The decision to remove 3rd
+  party dependencies from Qt repositories was reached independent of the decision to use cmake, we
+  just use the opportunity to implement this decision.
+
+* There is less need for bootstrapping. Only moc and rcc (plus the lesser known tracegen and
+  qfloat16-tables) are linking against the bootstrap Qt library. Everything else can link against
+  the full QtCore. This will include qmake, which is currently missing from a cmake build. This will
+  change: Qmake is supported as a build system for applications *using* Qt going forward and will
+  not go away anytime soon.
+
+* For the time being we try to keep qmake working so that we do not interfere too much with ongoing
+  development.
+
+
+# Building against VCPKG on Windows
+
+You may use vcpkg to install dependencies needed to build QtBase.
+
+  * ```git clone -b qt https://github.com/tronical/vcpkg```
+  * Run ```bootstrap-vcpkg.bat``` or ```bootstrap-vcpkg.sh```
+  * Set the ``VCPKG_DEFAULT_TRIPLET`` environment variable to ``qt-x64-windows-static`` or
+    ``qt-x86-windows-static``
+  * Set the ``VCPKG_ROOT`` environment variable to the path where you cloned vcpkg
+  * Build Qt dependencies:  ``vcpkg install @qt-packages-windows.txt``
+  * When running cmake in qtbase, support for vcpkg will be picked up automatically when the
+    VCPKG_ROOT/VCPKG_DEFAULT_TRIPLET environment variable is set.
+
+# Building against homebrew on macOS
+
+You may use brew to install dependencies needed to build QtBase.
+
+  * Install homebrew:
+    ```/usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"```
+  * Build Qt dependencies:  ``brew install pcre2 harfbuzz freetype``
+  * Install cmake:  ``brew install cmake``
+  * When running cmake in qtbase, pass ``-DCMAKE_PREFIX_PATH=/usr/local``
+
+# Building
+
+The basic way of building with cmake is as follows:
+
+```
+    cd {build directory}
+    cmake -DCMAKE_INSTALL_PREFIX=/path/where/to/install {path to source directory}
+    cmake --build .
+    cmake --install .
+```
+
+You need one build directory per Qt module. The build directory can be a sub-directory inside the
+module ``qtbase/build`` or an independent directory ``qtbase_build``. The installation prefix is
+chosen when running cmake by passing ``-DCMAKE_INSTALL_PREFIX``. To build more than one Qt module,
+make sure to pass the same install prefix.
+
+``cmake --build`` and ``cmake --install`` are simple wrappers around the basic build tool that CMake
+generated a build system for. It works with any supported build backend supported by cmake, but you
+can also use the backend build tool directly, e.g. by running ``make``.
+
+CMake has a ninja backend that works quite well and is noticeably faster than make, so you may want
+to use that:
+
+```
+    cd {build directory}
+    cmake -GNinja -DCMAKE_INSTALL_PREFIX=/path/where/to/install {path to source directory}
+    cmake --build .
+    cmake --install .
+```
+
+You can look into the generated ``build.ninja`` file if you're curious and you can also build
+targets directory such as ``ninja lib/libQt6Core.so``.
+
+Make sure to remove CMakeCache.txt if you forgot to set the CMAKE_INSTALL_PREFIX on the first
+configuration, otherwise a second re-configuration will not pick up the new install prefix.
+
+You can use ``cmake-gui {path to build directory}`` or ``ccmake {path to build directory}`` to
+configure the values of individual cmake variables or Qt features. After changing a value, you need
+to choose the *configure* step (usually several times:-/), followed by the *generate* step (to
+generate makefiles/ninja files).
+
+## Developer Build
+
+When working on Qt itself, it can be tedious to wait for the install step. In that case you want to
+use the developer build option, to get as many auto tests enabled and no longer be required to make
+install:
+
+```
+    cd {build directory}
+    cmake -GNinja -DCMAKE_INSTALL_PREFIX=/path/to/qtbase_build -DFEATURE_developer_build=ON {path to source directory}
+    cmake --build .
+    # do NOT make install
+```
+
+## Specifying configure.json features on the command line
+
+QMake defines most features in configure.json files, like -developer-build or -no-opengl.
+
+In CMake land, we currently generate configure.cmake files from the configure.json files into
+the source directory next to them using the helper script
+``path_to_qtbase_source/util/cmake/configurejson2cmake.py``. They are checked into the repository.
+If the feature in configure.json has the name "dlopen", you can specify whether to enable or disable that
+feature in CMake with a -D flag on the CMake command line. So for example -DFEATURE_dlopen=ON or
+-DFEATURE_sql_mysql=OFF. At the moment, if you change a FEATURE flag's value, you have to remove the
+CMakeCache.txt file and reconfigure with CMake. And even then you might stumble on some issues when
+reusing an existing build, because of an automoc bug in upstream CMake.
+
+## Ninja reconfiguration bug
+
+If you use the Ninja generator, there's a bug that after the first CMake configuration, if you run
+ninja, it will do the reconfiguration step again. This is quite annoying and time consuming.
+
+There is an open pull request that fixes the issue at
+https://github.com/ninja-build/ninja/pull/1527. You can build your own Ninja executable until the
+request is merged.
+
+```
+    cd {some directory}
+    git clone https://github.com/ninja-build/ninja.git
+    cd ninja && mkdir build && cd build
+    git remote add fix git@github.com:mathstuf/ninja.git && git fetch --all
+    git cherry-pick 29a565f18e01ce83ca14801f4684cd2acaf00d4c
+    ../configure.py --bootstrap
+    cp ninja /usr/local/bin/ninja
+```
+
+## Building with CCache
+
+You can pass ``-DQT_USE_CCACHE=ON`` to make the build system look for ``ccache`` in your ``PATH``
+and prepend it to all C/C++/Objective-C compiler calls. At the moment this is only supported for the
+Ninja and the Makefile generators.
+
+## Cross Compiling
+
+Compiling for a target architecture that's different than the host requires one build of Qt for the
+host. This "host build" is needed because the process of building Qt involves the compilation of
+intermediate code generator tools, that in turn are called to produce source code that needs to be
+compiled into the final libraries. These tools are built using Qt itself and they need to run on the
+machine you're building on, regardless of the architecure you are targeting.
+
+Build Qt regularly for your host system and install it into a directory of your choice using the
+``CMAKE_INSTALL_PREFIX`` variable. You are free to disable the build of tests and examples by
+passing ``-DBUILD_EXAMPLES=OFF`` and ``-DBUILD_TESTING=OFF``.
+
+With this installation of Qt in place, which contains all tools needed, we can proceed to create a
+new build of Qt that is cross-compiled to the target architecture of choice. You may proceed by
+setting up your environment. The CMake wiki has further information how to do that at
+
+<https://gitlab.kitware.com/cmake/community/wikis/doc/cmake/CrossCompiling>
+
+Yocto based device SDKs come with an environment setup script that needs to be sourced in your shell
+and takes care of setting up environment variables and a cmake alias with a toolchain file, so that
+you can call cmake as you always do.
+
+In order to make sure that Qt picks up the code generator tools from the host build, you need to
+pass an extra parameter to cmake:
+
+```
+    -DQT_HOST_PATH=/path/to/your/host_build
+```
+
+The specified path needs to point to a directory that contains an installed host build of Qt.
+
+### Cross Compiling for Android
+
+In order to cross-compile Qt to Android, you need a host build (see instructions above) and an
+Android build. In addition, it is necessary to install the Android NDK as well as vcpkg. Vcpkg is
+needed to supply third-party libraries that Qt requires but that are not part of the Android NDK.
+
+Vcpkg for Android can be set up using the following steps:
+
+  * ```git clone -b qt https://github.com/tronical/vcpkg```
+  * Run ```bootstrap-vcpkg.bat``` or ```bootstrap-vcpkg.sh```
+  * Set the ``VCPKG_DEFAULT_TRIPLET`` environment variable to one of the following values:
+    * ``arm-android`` (armeabi-v7a)
+    * ``arm64-android`` (arm64v8)
+    * ``x86-android`` (x86)
+    * ``x64-android`` (x86_64)
+  * Set the ``VCPKG_ROOT`` environment variable to the path where you cloned vcpkg
+  * Set the ``ANDROID_NDK_HOME`` environment variable to the path where you have installed the Android NDK.
+  * Set the ``ANDROID_SDK_HOME`` environment variable to the path where you have installed the Android SDK.
+  * Build Qt dependencies:  ``vcpkg install @qt-packages-android.txt``
+
+When running cmake in qtbase, pass
+``-DCMAKE_TOOLCHAIN_FILE=$ANDROID_NDK_HOME/build/cmake/android.toolchain.cmake -DQT_HOST_PATH=/path/to/your/host/build -DANDROID_SDK_ROOT=$ANDROID_SDK_HOME -DCMAKE_INSTALL_PREFIX=$INSTALL_PATH``
+
+If you don't supply the configuration argument ``-DANDROID_ABI=...``, it will default to
+``armeabi-v7a``. To target other architectures, use one of the following values:
+  * arm64: ``-DANDROID_ABI=arm64-v8``
+  * x86: ``-DANDROID_ABI=x86``
+  * x86_64: ``-DANDROID_ABI=x86_64``
+
+By default we set the android API level to 21. Should you need to change this supply the following
+configuration argument to the above CMake call: ``-DANDROID_NATIVE_API_LEVEL=${API_LEVEL}``
+
+### Cross compiling for iOS
+
+In order to cross-compile Qt to iOS, you need a host macOS build.
+In addition, it is necessary to install a custom version of vcpkg. Vcpkg is
+needed to supply third-party libraries that Qt requires, but that are not part of the iOS SDK.
+
+Vcpkg for iOS can be set up using the following steps:
+
+  * ```git clone -b qt https://github.com/alcroito/vcpkg```
+  * Run ```bootstrap-vcpkg.sh```
+  * Set the ``VCPKG_DEFAULT_TRIPLET`` environment variable to one of the following values:
+    * ``x64-ios``   (simulator x86_64)
+    * ``x86-ios``   (simulator i386)
+    * ``arm64-ios`` (device arm64)
+    * ``arm-ios``   (device armv7)
+    * ``fat-ios``   (simulator_and_device x86_64 and arm64* - special considedrations)
+  * Set the ``VCPKG_ROOT`` environment variable to the path where you cloned vcpkg
+  * Build Qt dependencies:  ``vcpkg install @qt-packages-ios.txt``
+
+When running cmake in qtbase, pass
+``-DCMAKE_SYSTEM_NAME=iOS -DQT_HOST_PATH=/path/to/your/host/build -DCMAKE_INSTALL_PREFIX=$INSTALL_PATH``
+
+If you don't supply the configuration argument ``-DQT_UIKIT_SDK=...``, it will default to
+``iphonesimulator``. To target another SDK / device type, use one of the following values:
+  * iphonesimulator: ``-DQT_UIKIT_SDK=iphonesimulator``
+  * iphoneos: ``-DQT_UIKIT_SDK=iphoneos``
+  * simulator_and_device: ``-DQT_FORCE_SIMULATOR_AND_DEVICE=ON -DQT_UIKIT_SDK=``
+
+Depending on what value you pass to ``-DQT_UIKIT_SDK=`` a list of target architectures is chosen
+by default:
+  * iphonesimulator: ``x86_64``
+  * iphoneos: ``arm64``
+  * simulator_and_device: ``arm64;x86_64``
+
+You can try choosing a different list of architectures by passing
+``-DCMAKE_OSX_ARCHITECTURES=x86_64;i386``.
+Note that if you choose different architectures compared to the default ones, the build might fail.
+Only do it if you know what you are doing.
+
+####  simulator_and_device special considerations
+To do a simulator_and_device build, a custom version of CMake is required in addition to the vcpkg
+fork. The merge request can be found here:
+https://gitlab.kitware.com/cmake/cmake/merge_requests/3617
+
+After you build your own copy of CMake using this merge request, you need to use it for both
+vcpkg and Qt.
+
+Note that vcpkg prefers its own version of CMake when building packages.
+Make sure to put your custom built CMake in PATH, and force vcpkg to use this CMake by running
+``export VCPKG_FORCE_SYSTEM_BINARIES=1`` in your shell.
+
+# Debugging CMake files
+
+CMake allows specifying the ``--trace`` and ``--trace-expand`` options, which work like
+``qmake -d -d``: As the cmake code is evaluated, the values of parameters and variables is shown.
+This can be a lot of output, so you may want to redirect it to a file.
+
+# Porting Help
+
+We have some python scripts to help with the conversion from qmake to cmake. These scripts can be
+found in ``utils/cmake``.
+
+## configurejson2cmake.py
+
+This script converts all ``configure.json`` in the Qt repository to ``configure.cmake`` files for
+use with CMake. We want to generate configure.cmake files for the foreseeable future, so if you need
+to tweak the generated configure.cmake files, please tweak the generation script instead.
+
+``configurejson2cmake.py`` is run like this: ``util/cmake/configurejson2cmake.py .`` in the
+top-level source directory of a Qt repository.
+
+
+## pro2cmake.py
+
+``pro2cmake.py`` generates a skeleton CMakeLists.txt file from a .pro-file. You will need to polish
+the resulting CMakeLists.txt file, but e.g. the list of files, etc. should be extracted for you.
+
+``pro2cmake.py`` is run like this: ``path_to_qtbase_source/util/cmake/pro2cmake.py some.pro``.
+
+
+## run_pro2cmake.py
+
+`` A small helper script to run pro2cmake.py on all .pro-files in a directory. Very useful to e.g.
+convert all the unit tests for a Qt module over to cmake;-)
+
+``run_pro2cmake.py`` is run like this: ``path_to_qtbase_source/util/cmake/run_pro2cmake.py some_dir``.
+
+
+## How to convert certain constructs
+
+| qmake                 | CMake                   |
+| ------                | ------                  |
+| ``qtHaveModule(foo)`` | ``if(TARGET Qt::foo)``  |
+| ``qtConfig(foo)``     | ``if (QT_FEATURE_foo)`` |
+
diff --git a/cmake/qt.toolchain.cmake.in b/cmake/qt.toolchain.cmake.in
new file mode 100644
index 0000000000..63e5ee3d59
--- /dev/null
+++ b/cmake/qt.toolchain.cmake.in
@@ -0,0 +1,20 @@
+@init_platform@
+
+@init_qt_host_path@
+
+@init_original_toolchain_file@
+
+@init_vcpkg@
+
+if(qt_chainload_toolchain_file)
+    include("${qt_chainload_toolchain_file}")
+    unset(qt_chainload_toolchain_file)
+endif()
+
+list(PREPEND CMAKE_PREFIX_PATH "@CMAKE_INSTALL_PREFIX@")
+list(PREPEND CMAKE_FIND_ROOT_PATH "@CMAKE_INSTALL_PREFIX@")
+
+if(QT_HOST_PATH)
+    list(APPEND CMAKE_PREFIX_PATH "${QT_HOST_PATH}")
+    list(APPEND CMAKE_FIND_ROOT_PATH "${QT_HOST_PATH}")
+endif()
diff --git a/cmake/tests/CMakeLists.txt b/cmake/tests/CMakeLists.txt
new file mode 100644
index 0000000000..6b53c9703d
--- /dev/null
+++ b/cmake/tests/CMakeLists.txt
@@ -0,0 +1,48 @@
+# These macros are inspired by ECM:
+
+# a macro for tests that have a simple format where the name matches the
+# directory and project
+
+# The following macros will produce tests that generate the build
+# system for the test project, build it and then run its tests.
+macro(add_cmake_test_generate_build_run_variant name base command)
+    string(REPLACE "." "/" src_dir "${base}")
+    string(REPLACE "." "/" build_dir "${name}")
+    string(REGEX REPLACE "[^.]*\\." "" proj "${name}")
+    add_test(NAME "cmake_${name}"
+        COMMAND ${CMAKE_CTEST_COMMAND}
+            --build-and-test
+                "${CMAKE_CURRENT_SOURCE_DIR}/${src_dir}"
+                "${CMAKE_CURRENT_BINARY_DIR}/${build_dir}"
+            --build-two-config
+            --build-generator ${CMAKE_GENERATOR}
+            --build-makeprogram ${CMAKE_MAKE_PROGRAM}
+            --build-project ${proj}
+            ${${name}_EXTRA_OPTIONS}
+            --test-command ${command} ${ARGN})
+endmacro()
+
+macro(add_cmake_test_generate_build_run name)
+    add_cmake_test_generate_build_run_variant("${name}" "${name}" ${ARGN})
+endmacro()
+
+# The following macros will produce tests that just run cmake
+# to generate the build system for the test project.
+macro(add_cmake_test_generate_variant name base)
+    string(REPLACE "." "/" src_dir "${base}")
+    string(REPLACE "." "/" build_dir "${name}")
+    file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/${build_dir}")
+    add_test(NAME "cmake_${name}"
+        COMMAND "${CMAKE_COMMAND}" "-G${CMAKE_GENERATOR}"
+            "-DCMAKE_MAKE_PROGRAM=${CMAKE_MAKE_PROGRAM}"
+            ${${name}_EXTRA_OPTIONS}
+            "${CMAKE_CURRENT_SOURCE_DIR}/${src_dir}"
+        WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/${build_dir}")
+endmacro()
+
+macro(add_cmake_test_generate name)
+    add_cmake_test_generate_variant("${name}" "${name}")
+endmacro()
+
+add_cmake_test_generate(features)
+add_cmake_test_generate(qt_make_output_file)
diff --git a/tests/auto/corelib/io/qfileselector/platforms/+mac/test b/cmake/tests/empty.cpp
index e69de29bb2..e69de29bb2 100644
--- a/tests/auto/corelib/io/qfileselector/platforms/+mac/test
+++ b/cmake/tests/empty.cpp
diff --git a/cmake/tests/features/CMakeLists.txt b/cmake/tests/features/CMakeLists.txt
new file mode 100644
index 0000000000..0fff2b8be9
--- /dev/null
+++ b/cmake/tests/features/CMakeLists.txt
@@ -0,0 +1,42 @@
+cmake_minimum_required(VERSION 3.12.0)
+
+project(FeaturesTest
+    VERSION 1.0.0
+    DESCRIPTION "QtFeature test"
+    HOMEPAGE_URL "https://qt.io/"
+    LANGUAGES CXX C
+)
+
+## Add some paths to check for cmake modules:
+list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../;${CMAKE_CURRENT_SOURCE_DIR}/../../3rdparty/extra-cmake-modules/find-modules;${CMAKE_CURRENT_SOURCE_DIR}/../../3rdparty/kwin")
+
+## Qt specific setup common for all modules:
+include(QtSetup)
+
+## Library to hold global features:
+add_library(GlobalConfig INTERFACE)
+
+qt_feature_module_begin(LIBRARY GlobalConfig
+    PUBLIC_FILE src/corelib/global/qconfig.h
+    PRIVATE_FILE src/corelib/global/qconfig_p.h
+)
+include("${CMAKE_CURRENT_SOURCE_DIR}/configure.cmake")
+qt_feature_module_end(GlobalConfig)
+
+assert(QT_FEATURE_top_a STREQUAL "ON")
+assert(QT_FEATURE_top_b STREQUAL "OFF")
+assert(QT_FEATURE_top_enabled STREQUAL "ON")
+assert(QT_FEATURE_top_disabled STREQUAL "OFF")
+assert(QT_FEATURE_top_disabled_enabled STREQUAL "OFF")
+assert(QT_FEATURE_top_not_emitted STREQUAL "OFF")
+
+## Enable feature summary at the end of the configure run:
+include(FeatureSummary)
+
+add_subdirectory(src)
+
+## Delayed actions on some of the Qt targets:
+include(QtPostProcess)
+
+## Print a feature summary:
+feature_summary(WHAT PACKAGES_FOUND PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES)
diff --git a/cmake/tests/features/configure.cmake b/cmake/tests/features/configure.cmake
new file mode 100644
index 0000000000..ace2b62450
--- /dev/null
+++ b/cmake/tests/features/configure.cmake
@@ -0,0 +1,35 @@
+#### Features
+
+# This belongs into gui, but the license check needs it here already.
+qt_feature("top_a" PRIVATE
+    LABEL "top_a"
+    CONDITION ON
+)
+qt_feature("top_b" PUBLIC PRIVATE
+    LABEL "top_b"
+    AUTODETECT OFF
+)
+qt_feature_definition("top_a" "top_defa")
+
+qt_feature("top_enabled" PRIVATE
+    LABEL "top_enabled"
+    ENABLE ON
+)
+
+qt_feature("top_disabled" PRIVATE
+    LABEL "top_enabled"
+    DISABLE ON
+)
+
+qt_feature("top_disabled_enabled" PRIVATE
+    LABEL "top_enabled_enabled"
+    DISABLE ON
+    ENABLE ON
+)
+
+qt_feature("top_not_emitted" PRIVATE
+    LABEL "top_not_emitted"
+    EMIT_IF OFF
+)
+
+qt_extra_definition("top_extra" "PUBLIC_FOO" PUBLIC)
diff --git a/cmake/tests/features/src/CMakeLists.txt b/cmake/tests/features/src/CMakeLists.txt
new file mode 100644
index 0000000000..bfb02be07d
--- /dev/null
+++ b/cmake/tests/features/src/CMakeLists.txt
@@ -0,0 +1,7 @@
+## Features from parent scope were inherited:
+assert(QT_FEATURE_top_a STREQUAL "ON")
+assert(QT_FEATURE_top_b STREQUAL "OFF")
+assert(QT_FEATURE_top_enabled STREQUAL "ON")
+assert(QT_FEATURE_top_disabled STREQUAL "OFF")
+assert(QT_FEATURE_top_disabled_enabled STREQUAL "OFF")
+assert(QT_FEATURE_top_not_emitted STREQUAL "OFF")
diff --git a/cmake/tests/main.cpp b/cmake/tests/main.cpp
new file mode 100644
index 0000000000..a9b8738990
--- /dev/null
+++ b/cmake/tests/main.cpp
@@ -0,0 +1 @@
+int main(int argc, char** argv) { return 0; }
diff --git a/cmake/tests/qt_make_output_file/CMakeLists.txt b/cmake/tests/qt_make_output_file/CMakeLists.txt
new file mode 100644
index 0000000000..3620909494
--- /dev/null
+++ b/cmake/tests/qt_make_output_file/CMakeLists.txt
@@ -0,0 +1,22 @@
+cmake_minimum_required(VERSION 3.12.0)
+
+project(QtMakeOutputFileTest
+    VERSION 1.0.0
+    DESCRIPTION "qt_make_output_file test"
+    HOMEPAGE_URL "https://qt.io/"
+    LANGUAGES CXX C
+)
+
+## Add some paths to check for cmake modules:
+list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../;${CMAKE_CURRENT_SOURCE_DIR}/../../3rdparty/extra-cmake-modules/find-modules;${CMAKE_CURRENT_SOURCE_DIR}/../../3rdparty/kwin")
+
+include(QtBuild)
+
+qt_make_output_file("foo.cpp" "" ".mapped" "/tmp/foo" "/tmp/bar" outfile)
+assert(outfile STREQUAL "/tmp/bar/foo.mapped")
+
+qt_make_output_file("../foo.cpp" "prefix_" ".cpp" "/tmp/foo" "/tmp/bar" outfile)
+assert(outfile STREQUAL "/tmp/bar/__/prefix_foo.cpp")
+
+qt_make_output_file("/tmp/bar/foo.cpp" "prefix_" ".cpp" "/tmp/foo" "/tmp/bar" outfile)
+assert(outfile STREQUAL "/tmp/bar/prefix_foo.cpp")
diff --git a/cmake/tests/test.cmake b/cmake/tests/test.cmake
new file mode 100644
index 0000000000..099f490c94
--- /dev/null
+++ b/cmake/tests/test.cmake
@@ -0,0 +1,54 @@
+# FAKE moc-ing:
+set(QT_MOCSCANNER /usr/bin/true)
+
+# Fake mocscanner run.
+# The files passed in after MOC will be reported to be in need of moc-ing,
+# but will not be built.
+# The files passed in after MOC_AND_BUILD will be reported to be in need
+# of moc-ing and should also be built by the target.
+function(fake_moc_results)
+    cmake_parse_arguments(arg "" "" "MOC;MOC_AND_BUILD" ${ARGN})
+
+    string(REPLACE ";" "\n" arg_MOC "${arg_MOC}")
+    string(REPLACE ";" "\n" arg_MOC_AND_BUILD "${arg_MOC_AND_BUILD}")
+
+    file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/moc_files_included.txt" "${arg_MOC}")
+    file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/moc_files_to_build.txt" "${arg_MOC_AND_BUILD}")
+endfunction()
+
+# Test whether a target has a file listed in its sources.
+# Tests with the BUILD flag set will require this file to be built,
+# while those without will require the file to not be built by
+# the target.
+function(test_source_file target file)
+    cmake_parse_arguments(arg "BUILD" "" "" ${ARGN})
+
+    get_target_property(sources "${target}" SOURCES)
+    list(FIND sources "${file}" source_pos)
+    assert(NOT source_pos STREQUAL "-1")
+
+    get_source_file_property(prop "${file}" HEADER_FILE_ONLY)
+    if (arg_BUILD)
+        assert(NOT prop)
+    else()
+        assert(prop)
+    endif()
+endfunction()
+
+# Test whether or not a target uses a header path
+# The test passes when the path is in the list of include directories.
+# Passing 'UNKNOWN' to this function reverses the test result.
+function(test_include_directory target path)
+    cmake_parse_arguments(arg "UNKNOWN" "" "" ${ARGN})
+    get_target_property(includes "${target}" INCLUDE_DIRECTORIES)
+    list(FIND includes "${path}" include_pos)
+    if(arg_UNKNOWN)
+        assert(include_pos STREQUAL "-1")
+    else()
+        assert(NOT include_pos STREQUAL "-1")
+    endif()
+endfunction()
+
+# Add Core and Qt::Core libraries:
+add_library(Core SHARED "${CMAKE_CURRENT_LIST_DIR}/empty.cpp")
+add_library(Qt::Core ALIAS Core)
diff --git a/coin/instructions/call_cmake.yaml b/coin/instructions/call_cmake.yaml
new file mode 100644
index 0000000000..bbebd6af33
--- /dev/null
+++ b/coin/instructions/call_cmake.yaml
@@ -0,0 +1,24 @@
+type: Group
+instructions:
+  - type: ExecuteCommand
+    command: "{{.Env.ENV_PREFIX}} {{.InstallDir}}\\bin\\qt-cmake {{.Env.COIN_CMAKE_ARGS}}"
+    executeCommandArgumentSplitingBehavior: SplitAfterVariableSubstitution
+    maxTimeInSeconds: 6000
+    maxTimeBetweenOutput: 1200
+    userMessageOnFailure: >
+      Failed to call cmake.
+    enable_if:
+      condition: property
+      property: host.os
+      equals_value: Windows
+  - type: ExecuteCommand
+    command: "{{.InstallDir}}/bin/qt-cmake {{.Env.COIN_CMAKE_ARGS}}"
+    executeCommandArgumentSplitingBehavior: SplitAfterVariableSubstitution
+    maxTimeInSeconds: 6000
+    maxTimeBetweenOutput: 1200
+    userMessageOnFailure: >
+      Failed to call cmake.
+    disable_if:
+      condition: property
+      property: host.os
+      equals_value: Windows
diff --git a/coin/instructions/call_host_cmake.yaml b/coin/instructions/call_host_cmake.yaml
new file mode 100644
index 0000000000..f2056966b0
--- /dev/null
+++ b/coin/instructions/call_host_cmake.yaml
@@ -0,0 +1,24 @@
+type: Group
+instructions:
+  - type: ExecuteCommand
+    command: "{{.Env.ENV_PREFIX}} {{.InstallDir}}\\host\\bin\\qt-cmake {{.Env.COIN_CMAKE_ARGS}}"
+    executeCommandArgumentSplitingBehavior: SplitAfterVariableSubstitution
+    maxTimeInSeconds: 6000
+    maxTimeBetweenOutput: 1200
+    userMessageOnFailure: >
+      Failed to call cmake.
+    enable_if:
+      condition: property
+      property: host.os
+      equals_value: Windows
+  - type: ExecuteCommand
+    command: "{{.InstallDir}}/host/bin/qt-cmake {{.Env.COIN_CMAKE_ARGS}}"
+    executeCommandArgumentSplitingBehavior: SplitAfterVariableSubstitution
+    maxTimeInSeconds: 6000
+    maxTimeBetweenOutput: 1200
+    userMessageOnFailure: >
+      Failed to call cmake.
+    disable_if:
+      condition: property
+      property: host.os
+      equals_value: Windows
diff --git a/coin/instructions/call_target_cmake.yaml b/coin/instructions/call_target_cmake.yaml
new file mode 100644
index 0000000000..41ed435efb
--- /dev/null
+++ b/coin/instructions/call_target_cmake.yaml
@@ -0,0 +1,24 @@
+type: Group
+instructions:
+  - type: ExecuteCommand
+    command: "{{.Env.ENV_PREFIX}} {{.InstallDir}}\\target\\bin\\qt-cmake {{.Env.COIN_CMAKE_ARGS}}"
+    executeCommandArgumentSplitingBehavior: SplitAfterVariableSubstitution
+    maxTimeInSeconds: 6000
+    maxTimeBetweenOutput: 1200
+    userMessageOnFailure: >
+      Failed to call cmake.
+    enable_if:
+      condition: property
+      property: host.os
+      equals_value: Windows
+  - type: ExecuteCommand
+    command: "{{.InstallDir}}/target/bin/qt-cmake {{.Env.COIN_CMAKE_ARGS}}"
+    executeCommandArgumentSplitingBehavior: SplitAfterVariableSubstitution
+    maxTimeInSeconds: 6000
+    maxTimeBetweenOutput: 1200
+    userMessageOnFailure: >
+      Failed to call cmake.
+    disable_if:
+      condition: property
+      property: host.os
+      equals_value: Windows
diff --git a/coin/instructions/cmake_build_and_upload_test_artifacts.yaml b/coin/instructions/cmake_build_and_upload_test_artifacts.yaml
new file mode 100644
index 0000000000..c818d60373
--- /dev/null
+++ b/coin/instructions/cmake_build_and_upload_test_artifacts.yaml
@@ -0,0 +1,29 @@
+type: Group
+instructions:
+  - type: ChangeDirectory
+    directory: "{{.SourceDir}}"
+  - type: MakeDirectory
+    directory: "standalone_tests"
+  - type: SetBuildDirectory
+    directory: "{{.SourceDir}}/standalone_tests"
+  - type: ChangeDirectory
+    directory: "{{.BuildDir}}"
+  - type: EnvironmentVariable
+    variableName: COIN_CMAKE_ARGS
+    variableValue: "-DQT_BUILD_STANDALONE_TESTS=ON -S {{.SourceDir}} -B ."
+  - !include "{{qt/qtbase}}/call_cmake.yaml"
+  - type: ExecuteCommand
+    command: "{{.Env.ENV_PREFIX}} cmake --build . --parallel"
+    maxTimeInSeconds: 6000
+    maxTimeBetweenOutput: 1200
+    userMessageOnFailure: >
+      Failed to build sources. In the current state bug can be everywhere.
+  - type: UploadTestArtifact
+    transferType: UploadModuleTestsArtifact
+    archiveDirectory: "{{.BuildDir}}"
+    maxTimeInSeconds: 1200
+    maxTimeBetweenOutput: 1200
+disable_if:
+  condition: property
+  property: configureArgs
+  contains_value: "-DBUILD_SHARED_LIBS=OFF"
diff --git a/coin/instructions/cmake_cross_compilation_module_build_instructions.yaml b/coin/instructions/cmake_cross_compilation_module_build_instructions.yaml
new file mode 100644
index 0000000000..c852737494
--- /dev/null
+++ b/coin/instructions/cmake_cross_compilation_module_build_instructions.yaml
@@ -0,0 +1,81 @@
+type: Group
+instructions:
+  - type: MakeDirectory
+    directory: .git
+  - type: MakeDirectory
+    directory: build
+  - type: ChangeDirectory
+    directory: "{{.BuildDir}}/build"
+  - type: MakeDirectory
+    directory: host
+  - type: MakeDirectory
+    directory: target
+  - type: SetBuildDirectory
+    directory: "{{.SourceDir}}/build/host"
+  - type: ChangeDirectory
+    directory: "{{.BuildDir}}"
+  - type: EnvironmentVariable
+    variableName: COIN_CMAKE_ARGS
+    variableValue: "-DBUILD_TESTING=OFF {{.SourceDir}}"
+  - !include "{{qt/qtbase}}/call_host_cmake.yaml"
+  - type: ExecuteCommand
+    command: "{{.Env.ENV_PREFIX}} cmake --build . --parallel"
+    maxTimeInSeconds: 6000
+    maxTimeBetweenOutput: 1200
+    userMessageOnFailure: >
+      Failed to build sources. In the current state bug can be everywhere.
+  - type: ExecuteCommand
+    command: "{{.Env.ENV_PREFIX}} cmake --install ."
+    maxTimeInSeconds: 6000
+    maxTimeBetweenOutput: 1200
+    userMessageOnFailure: >
+      Failed to install package.
+  - type: EnvironmentVariable
+    variableName: DESTDIR
+    variableValue: "{{.InstallRoot}}"
+  - type: ExecuteCommand
+    command: "{{.Env.ENV_PREFIX}} cmake --install ."
+    maxTimeInSeconds: 6000
+    maxTimeBetweenOutput: 1200
+    userMessageOnFailure: >
+      Failed to install package for archiving.
+  - type: EnvironmentVariable
+    variableName: DESTDIR
+    variableValue: ""
+  - type: SetBuildDirectory
+    directory: "{{.SourceDir}}/build/target"
+  - type: ChangeDirectory
+    directory: "{{.BuildDir}}"
+  - type: EnvironmentVariable
+    variableName: COIN_CMAKE_ARGS
+    variableValue: "-DBUILD_TESTING=OFF {{.SourceDir}}"
+  - !include "{{qt/qtbase}}/call_target_cmake.yaml"
+  - type: ExecuteCommand
+    command: "{{.Env.ENV_PREFIX}} cmake --build . --parallel"
+    maxTimeInSeconds: 6000
+    maxTimeBetweenOutput: 1200
+    userMessageOnFailure: >
+      Failed to build sources. In the current state bug can be everywhere.
+  - type: ExecuteCommand
+    command: "{{.Env.ENV_PREFIX}} cmake --install ."
+    maxTimeInSeconds: 6000
+    maxTimeBetweenOutput: 1200
+    userMessageOnFailure: >
+      Failed to install package.
+  - type: EnvironmentVariable
+    variableName: DESTDIR
+    variableValue: "{{.InstallRoot}}"
+  - type: ExecuteCommand
+    command: "{{.Env.ENV_PREFIX}} cmake --install ."
+    maxTimeInSeconds: 6000
+    maxTimeBetweenOutput: 1200
+    userMessageOnFailure: >
+      Failed to install package for archiving.
+  - type: EnvironmentVariable
+    variableName: DESTDIR
+    variableValue: ""
+  - type: UploadArtifact
+    archiveDirectory: "{{.InstallRoot}}/{{.AgentWorkingDir}}"
+    transferType: UploadModuleBuildArtifact
+    maxTimeInSeconds: 1200
+    maxTimeBetweenOutput: 1200
diff --git a/coin/instructions/cmake_cross_compilation_qtbase_build_instructions.yaml b/coin/instructions/cmake_cross_compilation_qtbase_build_instructions.yaml
new file mode 100644
index 0000000000..c4dda05c8b
--- /dev/null
+++ b/coin/instructions/cmake_cross_compilation_qtbase_build_instructions.yaml
@@ -0,0 +1,87 @@
+type: Group
+instructions:
+  - type: MakeDirectory
+    directory: .git
+  - type: MakeDirectory
+    directory: build
+  - type: ChangeDirectory
+    directory: "{{.BuildDir}}/build"
+  - type: MakeDirectory
+    directory: host
+  - type: MakeDirectory
+    directory: target
+  - type: SetBuildDirectory
+    directory: "{{.SourceDir}}/build/host"
+  - type: ChangeDirectory
+    directory: "{{.BuildDir}}"
+  - type: ExecuteCommand
+    command: "{{.Env.ENV_PREFIX}} cmake {{.Env.CONFIGURE_ARGS}} -DCMAKE_INSTALL_PREFIX:PATH={{.InstallDir}}/host -DBUILD_TESTING=OFF {{.SourceDir}}"
+    executeCommandArgumentSplitingBehavior: SplitAfterVariableSubstitution
+    maxTimeInSeconds: 6000
+    maxTimeBetweenOutput: 1200
+    userMessageOnFailure: >
+      Failed to call cmake.
+  - type: ExecuteCommand
+    command: "{{.Env.ENV_PREFIX}} cmake --build . --parallel"
+    maxTimeInSeconds: 6000
+    maxTimeBetweenOutput: 1200
+    userMessageOnFailure: >
+      Failed to build sources. In the current state bug can be everywhere.
+  - type: ExecuteCommand
+    command: "{{.Env.ENV_PREFIX}} cmake --install ."
+    maxTimeInSeconds: 6000
+    maxTimeBetweenOutput: 1200
+    userMessageOnFailure: >
+      Failed to install package.
+  - type: EnvironmentVariable
+    variableName: DESTDIR
+    variableValue: "{{.InstallRoot}}"
+  - type: ExecuteCommand
+    command: "{{.Env.ENV_PREFIX}} cmake --install ."
+    maxTimeInSeconds: 6000
+    maxTimeBetweenOutput: 1200
+    userMessageOnFailure: >
+      Failed to install package for archiving.
+  - type: EnvironmentVariable
+    variableName: DESTDIR
+    variableValue: ""
+  - type: SetBuildDirectory
+    directory: "{{.SourceDir}}/build/target"
+  - type: ChangeDirectory
+    directory: "{{.BuildDir}}"
+  - type: ExecuteCommand
+    command: "{{.Env.ENV_PREFIX}} cmake {{.Env.TARGET_CONFIGURE_ARGS}} -DQT_HOST_PATH={{.InstallDir}}/host -DCMAKE_INSTALL_PREFIX:PATH={{.InstallDir}}/target -DBUILD_TESTING=OFF {{.SourceDir}}"
+    executeCommandArgumentSplitingBehavior: SplitAfterVariableSubstitution
+    maxTimeInSeconds: 6000
+    maxTimeBetweenOutput: 1200
+    userMessageOnFailure: >
+      Failed to call cmake.
+  - type: ExecuteCommand
+    command: "{{.Env.ENV_PREFIX}} cmake --build . --parallel"
+    maxTimeInSeconds: 6000
+    maxTimeBetweenOutput: 1200
+    userMessageOnFailure: >
+      Failed to build sources. In the current state bug can be everywhere.
+  - type: ExecuteCommand
+    command: "{{.Env.ENV_PREFIX}} cmake --install ."
+    maxTimeInSeconds: 6000
+    maxTimeBetweenOutput: 1200
+    userMessageOnFailure: >
+      Failed to install package.
+  - type: EnvironmentVariable
+    variableName: DESTDIR
+    variableValue: "{{.InstallRoot}}"
+  - type: ExecuteCommand
+    command: "{{.Env.ENV_PREFIX}} cmake --install ."
+    maxTimeInSeconds: 6000
+    maxTimeBetweenOutput: 1200
+    userMessageOnFailure: >
+      Failed to install package for archiving.
+  - type: EnvironmentVariable
+    variableName: DESTDIR
+    variableValue: ""
+  - type: UploadArtifact
+    archiveDirectory: "{{.InstallRoot}}/{{.AgentWorkingDir}}"
+    transferType: UploadModuleBuildArtifact
+    maxTimeInSeconds: 1200
+    maxTimeBetweenOutput: 1200
diff --git a/coin/instructions/cmake_module_build_instructions.yaml b/coin/instructions/cmake_module_build_instructions.yaml
new file mode 100644
index 0000000000..7d8172cd53
--- /dev/null
+++ b/coin/instructions/cmake_module_build_instructions.yaml
@@ -0,0 +1,46 @@
+type: Group
+instructions:
+  - type: MakeDirectory
+    directory: .git
+  - type: SetBuildDirectory
+    directory: "{{.SourceDir}}"
+  - type: ChangeDirectory
+    directory: "{{.BuildDir}}"
+  - type: EnvironmentVariable
+    variableName: COIN_CMAKE_ARGS
+    variableValue: "-DBUILD_TESTING=OFF {{.SourceDir}}"
+  - !include "{{qt/qtbase}}/call_cmake.yaml"
+  - type: ExecuteCommand
+    command: "{{.Env.ENV_PREFIX}} cmake --build . --parallel"
+    maxTimeInSeconds: 6000
+    maxTimeBetweenOutput: 1200
+    userMessageOnFailure: >
+      Failed to build sources. In the current state bug can be everywhere.
+  - type: ExecuteCommand
+    command: "{{.Env.ENV_PREFIX}} cmake --install ."
+    maxTimeInSeconds: 6000
+    maxTimeBetweenOutput: 1200
+    userMessageOnFailure: >
+      Failed to install package.
+  - type: EnvironmentVariable
+    variableName: DESTDIR
+    variableValue: "{{.InstallRoot}}"
+  - type: ExecuteCommand
+    command: "{{.Env.ENV_PREFIX}} cmake --install ."
+    maxTimeInSeconds: 6000
+    maxTimeBetweenOutput: 1200
+    userMessageOnFailure: >
+      Failed to install package for archiving.
+  - type: SignPackage
+    enable_if:
+      condition: property
+      property: host.os
+      equals_value: Windows
+    directory: "{{.InstallRoot}}/{{.AgentWorkingDir}}"
+    maxTimeInSeconds: 1200
+    maxTimeBetweenOutput: 1200
+  - type: UploadArtifact
+    archiveDirectory: "{{.InstallRoot}}/{{.AgentWorkingDir}}"
+    transferType: UploadModuleBuildArtifact
+    maxTimeInSeconds: 1200
+    maxTimeBetweenOutput: 1200
diff --git a/coin/instructions/cmake_qtbase_build_instructions.yaml b/coin/instructions/cmake_qtbase_build_instructions.yaml
new file mode 100644
index 0000000000..a8ab72d336
--- /dev/null
+++ b/coin/instructions/cmake_qtbase_build_instructions.yaml
@@ -0,0 +1,49 @@
+type: Group
+instructions:
+  - type: MakeDirectory
+    directory: .git
+  - type: SetBuildDirectory
+    directory: "{{.SourceDir}}"
+  - type: ChangeDirectory
+    directory: "{{.BuildDir}}"
+  - type: ExecuteCommand
+    command: "{{.Env.ENV_PREFIX}} cmake {{.Env.CONFIGURE_ARGS}} -DCMAKE_INSTALL_PREFIX:PATH={{.InstallDir}} -DBUILD_TESTING=OFF {{.SourceDir}}"
+    executeCommandArgumentSplitingBehavior: SplitAfterVariableSubstitution
+    maxTimeInSeconds: 6000
+    maxTimeBetweenOutput: 1200
+    userMessageOnFailure: >
+      Failed to call cmake.
+  - type: ExecuteCommand
+    command: "{{.Env.ENV_PREFIX}} cmake --build . --parallel"
+    maxTimeInSeconds: 6000
+    maxTimeBetweenOutput: 1200
+    userMessageOnFailure: >
+      Failed to build sources. In the current state bug can be everywhere.
+  - type: ExecuteCommand
+    command: "{{.Env.ENV_PREFIX}} cmake --install ."
+    maxTimeInSeconds: 6000
+    maxTimeBetweenOutput: 1200
+    userMessageOnFailure: >
+      Failed to install package.
+  - type: EnvironmentVariable
+    variableName: DESTDIR
+    variableValue: "{{.InstallRoot}}"
+  - type: ExecuteCommand
+    command: "{{.Env.ENV_PREFIX}} cmake --install ."
+    maxTimeInSeconds: 6000
+    maxTimeBetweenOutput: 1200
+    userMessageOnFailure: >
+      Failed to install package for archiving.
+  - type: SignPackage
+    enable_if:
+      condition: property
+      property: host.os
+      equals_value: Windows
+    directory: "{{.InstallRoot}}/{{.AgentWorkingDir}}"
+    maxTimeInSeconds: 1200
+    maxTimeBetweenOutput: 1200
+  - type: UploadArtifact
+    archiveDirectory: "{{.InstallRoot}}/{{.AgentWorkingDir}}"
+    transferType: UploadModuleBuildArtifact
+    maxTimeInSeconds: 1200
+    maxTimeBetweenOutput: 1200
diff --git a/coin/instructions/cmake_regular_test_instructions.yaml b/coin/instructions/cmake_regular_test_instructions.yaml
new file mode 100644
index 0000000000..6974b293dd
--- /dev/null
+++ b/coin/instructions/cmake_regular_test_instructions.yaml
@@ -0,0 +1,26 @@
+type: Group
+instructions:
+  - type: ChangeDirectory
+    directory: "{{.SourceDir}}"
+  - type: MakeDirectory
+    directory: "standalone_tests"
+  - type: InstallTestBinaryArchive
+    relativeStoragePath: "{{.Env.MODULE_ARTIFACTS_RELATIVE_STORAGE_PATH}}/tests.tar.gz"
+    directory: "{{.SourceDir}}/standalone_tests"
+    maxTimeInSeconds: 1200
+    maxTimeBetweenOutput: 1200
+    userMessageOnFailure: >
+      Failed to install tests archive.
+  - type: ChangeDirectory
+    directory: "{{.SourceDir}}/standalone_tests"
+  - type: ExecuteCommand
+    command: "ctest -V --rerun-failed"
+    ignoreExitCode: true
+    maxTimeInSeconds: 7200
+    maxTimeBetweenOutput: 900
+    userMessageOnFailure: >
+      Failed to run tests.
+disable_if:
+  condition: property
+  property: configureArgs
+  contains_value: "-DBUILD_SHARED_LIBS=OFF"
diff --git a/coin/instructions/coin_module_build_template_v2.yaml b/coin/instructions/coin_module_build_template_v2.yaml
new file mode 100644
index 0000000000..a05b4ba915
--- /dev/null
+++ b/coin/instructions/coin_module_build_template_v2.yaml
@@ -0,0 +1,18 @@
+type: Group
+instructions:
+  - !include "{{qt/qtbase}}/prepare_building_env.yaml"
+  - type: Group
+    instructions:
+      - !include "{{qt/qtbase}}/cmake_module_build_instructions.yaml"
+      - !include "{{qt/qtbase}}/cmake_build_and_upload_test_artifacts.yaml"
+    enable_if:
+      condition: property
+      property: host.os
+      equals_property: target.os
+  - type: Group
+    instructions:
+      - !include "{{qt/qtbase}}/cmake_cross_compilation_module_build_instructions.yaml"
+    disable_if:
+      condition: property
+      property: host.os
+      equals_property: target.os
diff --git a/coin/instructions/coin_module_test_template_v2.yaml b/coin/instructions/coin_module_test_template_v2.yaml
new file mode 100644
index 0000000000..a94ed9fd84
--- /dev/null
+++ b/coin/instructions/coin_module_test_template_v2.yaml
@@ -0,0 +1,16 @@
+type: Group
+instructions:
+  - type: Group
+    instructions:
+      - !include "{{qt/qtbase}}/cmake_regular_test_instructions.yaml"
+    enable_if:
+      condition: property
+      property: host.os
+      equals_property: target.os
+  - type: EnvironmentVariable
+    variableName: Dummy
+    variableValue: dummy
+    disable_if:
+      condition: property
+      property: host.os
+      equals_property: target.os
diff --git a/coin/instructions/coin_qtbase_build_template_v2.yaml b/coin/instructions/coin_qtbase_build_template_v2.yaml
new file mode 100644
index 0000000000..de7a5b8e11
--- /dev/null
+++ b/coin/instructions/coin_qtbase_build_template_v2.yaml
@@ -0,0 +1,18 @@
+type: Group
+instructions:
+  - !include "{{qt/qtbase}}/prepare_building_env.yaml"
+  - type: Group
+    instructions:
+      - !include "{{qt/qtbase}}/cmake_qtbase_build_instructions.yaml"
+      - !include "{{qt/qtbase}}/cmake_build_and_upload_test_artifacts.yaml"
+    enable_if:
+      condition: property
+      property: host.os
+      equals_property: target.os
+  - type: Group
+    instructions:
+      - !include "{{qt/qtbase}}/cmake_cross_compilation_qtbase_build_instructions.yaml"
+    disable_if:
+      condition: property
+      property: host.os
+      equals_property: target.os
diff --git a/coin/instructions/prepare_building_env.yaml b/coin/instructions/prepare_building_env.yaml
new file mode 100644
index 0000000000..f862459ba3
--- /dev/null
+++ b/coin/instructions/prepare_building_env.yaml
@@ -0,0 +1,202 @@
+# Prepares environment for building Qt module. It sets all important environment variables in particular
+# configures the right compiler and cmake generator
+type: Group
+instructions:
+
+  # Set default cmake generator, it may be overwritten later
+  - type: EnvironmentVariable
+    variableName: CMAKE_GENERATOR
+    variableValue: Ninja
+
+
+  # Export ICC specific env. variables
+  - type: Group
+    instructions:
+      - type: EnvironmentVariable
+        variableName: LD_LIBRARY_PATH
+        variableValue: "{{.Env.ICC64_18_LDLP}}"
+      - type: PrependToEnvironmentVariable
+        variableName: PATH
+        variableValue: "{{.Env.ICC64_18_PATH}}"
+    enable_if:
+      condition: property
+      property: host.compiler
+      equals_value: ICC_18
+
+
+  # Set CMAKE_C[XX]_COMPILER otherwise cmake may prioritize a wrong compiler
+  - type: Group
+    instructions:
+      - type: PrependToEnvironmentVariable
+        variableName: CONFIGURE_ARGS
+        variableValue: "-DCMAKE_C_COMPILER=icc -DCMAKE_CXX_COMPILER=icpc "
+        enable_if:
+          condition: property
+          property: host.compiler
+          contains_value: ICC
+      - type: PrependToEnvironmentVariable
+        variableName: CONFIGURE_ARGS
+        variableValue: "-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ "
+        enable_if:
+          condition: property
+          property: host.compiler
+          contains_value: GCC
+      - type: PrependToEnvironmentVariable
+        variableName: CONFIGURE_ARGS
+        variableValue: "-DCMAKE_C_COMPILER=cl.exe -DCMAKE_CXX_COMPILER=cl.exe "
+        enable_if:
+          condition: property
+          property: host.compiler
+          contains_value: MSVC
+      - type: PrependToEnvironmentVariable
+        variableName: CONFIGURE_ARGS
+        variableValue: "-DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ "
+        enable_if:
+          condition: property
+          property: host.compiler
+          contains_value: Clang
+
+
+  # Export TARGET_ARCHITECTURE and WINDOWS_SDK_VERSION for MSVC cross compilation
+  - type: Group
+    enable_if:
+      condition: property
+      property: host.os
+      equals_value: Windows
+    instructions:
+      - type: EnvironmentVariable
+        variableName: TARGET_ARCHITECTURE
+        variableValue: amd64 # TODO add something like "{{toLower .Config host.arch}}"
+        disable_if:
+          condition: property
+          property: host.arch
+          not_equals_property: target.arch
+      - type: EnvironmentVariable
+        variableName: TARGET_ARCHITECTURE
+        variableValue: amd64_x86
+        enable_if:
+          condition: and
+          conditions:
+            - condition: property
+              property: target.arch
+              equals_property: X86
+            - condition: property
+              property: host.arch
+              equals_property: X86_64
+      - type: EnvironmentVariable
+        # HACK. Overwrite TARGET_ARCHITECTURE as we do not use standard MSVC cross
+        # compilation targets here. The target architecture will be detected by Qt.
+        variableName: TARGET_ARCHITECTURE
+        variableValue: x86
+        enable_if:
+          condition: property
+          property: target.os
+          in_values: ["WINRT", "WINPHONE", "WINCE"]
+      - type: EnvironmentVariable
+        variableName: WINDOWS_SDK_VERSION
+        variableValue: "10.0.14393.0"
+        enable_if:
+          condition: property
+          property: target.os
+          equals_value: WINRT
+      - type: EnvironmentVariable
+        variableName: WINDOWS_SDK_VERSION
+        variableValue: ""
+        disable_if:
+          condition: property
+          property: host.os
+          equals_value: WINRT  # TODO set windows sdk version for desktop windows as well
+
+
+  # MSVC is installed in somehow arbitrary places. To reduce amount of combinations we need to make a variable.
+  # This seems inverted, but on 64 bit hosts VS is installed into the x86 path, otherwise the regular one
+  # TODO cleanup, that step could be removed if we have same installation paths or we read the path from registry
+  # or we use compiler specific generator (probably superior solution as it allows to get rid of ENV_PREFIX).
+  - type: Group
+    enable_if:
+      condition: property
+      property: host.os
+      equals_value: Windows
+    instructions:
+      # Try to pick one of many coexistent MSVC installation to use
+      # TODO cleanup, that could be much simpler if all tools are installed to similar paths, so it would
+      # be enough to substitute compiler name.
+      - type: EnvironmentVariable
+        variableName: VC_SCRIPT
+        variableValue: "%VS90COMNTOOLS%\\vsvars32.bat"
+        enable_if:
+          condition: property
+          property: host.compiler
+          equals_value: MSVC2008
+      - type: EnvironmentVariable
+        variableName: VC_SCRIPT
+        variableValue: "%VS100COMNTOOLS%\\vsvars32.bat"
+        enable_if:
+          condition: property
+          property: host.compiler
+          equals_value: MSVC2010
+      - type: EnvironmentVariable
+        variableName: VC_SCRIPT
+        variableValue: "%ProgramFiles(x86)%\\Microsoft Visual Studio 11.0\\VC\\vcvarsall.bat"
+        enable_if:
+          condition: property
+          property: host.compiler
+          equals_value: MSVC2012
+      - type: EnvironmentVariable
+        variableName: VC_SCRIPT
+        variableValue: "%ProgramFiles(x86)%\\Microsoft Visual Studio 12.0\\VC\\vcvarsall.bat"
+        enable_if:
+          condition: property
+          property: host.compiler
+          equals_value: MSVC2013
+      - type: EnvironmentVariable
+        variableName: VC_SCRIPT
+        variableValue: "%ProgramFiles(x86)%\\Microsoft Visual Studio 14.0\\VC\\vcvarsall.bat"
+        enable_if:
+          condition: property
+          property: host.compiler
+          equals_value: MSVC2015
+      - type: EnvironmentVariable
+        variableName: VC_SCRIPT
+        variableValue: "%ProgramFiles(x86)%\\Microsoft Visual Studio\\2017\\Professional\\VC\\Auxiliary\\Build\\vcvarsall.bat"
+        enable_if:
+          condition: property
+          property: host.compiler
+          equals_value: MSVC2017
+      - type: EnvironmentVariable
+        variableName: VC_SCRIPT
+        variableValue: "%ProgramFiles(x86)%\\Microsoft Visual Studio\\2019\\Professional\\VC\\Auxiliary\\Build\\vcvarsall.bat"
+        enable_if:
+          condition: property
+          property: host.compiler
+          equals_value: MSVC2019
+
+
+  # With MSVC we need setup the environment before every subprocess call, the group below creates a script that
+  # does it. It is enough to prepand it to every call (it is safe to add it even on other OSes)
+  - type: Group
+    instructions:
+    - type: WriteFile
+      fileContents: "call \"{{.Env.VC_SCRIPT}}\" {{.Env.TARGET_ARCHITECTURE}} {{.Env.WINDOWS_SDK_VERSION}}\r\ncmd /c %*"
+      filename: c:\\users\\qt\\prefix.bat
+      fileMode: 420
+      maxTimeInSeconds: 20
+      maxTimeBetweenOutput: 20
+      enable_if:
+        condition: property
+        property: host.os
+        equals_value: Windows
+    - type: EnvironmentVariable
+      variableName: ENV_PREFIX
+      variableValue: "c:\\users\\qt\\prefix.bat"
+      enable_if:
+        condition: property
+        property: host.os
+        equals_value: Windows
+    - type: EnvironmentVariable
+      variableName: ENV_PREFIX
+      variableValue: ""
+      disable_if:
+        condition: property
+        property: host.os
+        equals_value: Windows
diff --git a/coin/module_config.yaml b/coin/module_config.yaml
new file mode 100644
index 0000000000..5d50c02afe
--- /dev/null
+++ b/coin/module_config.yaml
@@ -0,0 +1,12 @@
+version: 2
+accept_configuration:
+  condition: property
+  property: features
+  not_contains_value: Disable
+
+instructions:
+  Build:
+    - !include "{{qt/qtbase}}/coin_qtbase_build_template_v2.yaml"
+
+  Test:
+    - !include "{{qt/qtbase}}/coin_module_test_template_v2.yaml"
diff --git a/config.tests/arch/CMakeLists.txt b/config.tests/arch/CMakeLists.txt
new file mode 100644
index 0000000000..c0873a984f
--- /dev/null
+++ b/config.tests/arch/CMakeLists.txt
@@ -0,0 +1,6 @@
+cmake_minimum_required(VERSION 3.15.0)
+project(arch LANGUAGES CXX)
+
+add_executable(architecture_test)
+set_property(TARGET architecture_test PROPERTY MACOSX_BUNDLE FALSE)
+target_sources(architecture_test PRIVATE arch.cpp)
diff --git a/config.tests/x86_simd/CMakeLists.txt b/config.tests/x86_simd/CMakeLists.txt
new file mode 100644
index 0000000000..b624b7bc95
--- /dev/null
+++ b/config.tests/x86_simd/CMakeLists.txt
@@ -0,0 +1,23 @@
+cmake_minimum_required(VERSION 3.14.0)
+project(x86_simd LANGUAGES CXX)
+
+include(../../cmake/QtPlatformSupport.cmake)
+include(../../cmake/QtCompilerOptimization.cmake)
+
+# FIXME: Make the this project handle a list of SIMD entries.
+# FIXME: Make this project handle appending of the cflags (similar to the qmake project).
+# This is needed for the x86SimdAlways configure test (
+# aka we test to see if setting no SIMD (-msse2) cflags at all, will result in their implicit
+# addition by the compiler).
+string(TOUPPER "${SIMD}" upper_simd)
+
+if(NOT DEFINED "QT_CFLAGS_${upper_simd}")
+    # Don't use CMake error() because a configure error also fails the try_compile() call.
+    # Instead use a compile flag that doesn't exist to force a compiler error.
+    set(QT_CFLAGS_${upper_simd} "--qt-cflags-not-found")
+endif()
+
+add_executable("SimdTest${SIMD}")
+target_sources("SimdTest${SIMD}" PRIVATE main.cpp)
+target_compile_options("SimdTest${SIMD}" PRIVATE ${QT_CFLAGS_${upper_simd}})
+target_compile_definitions("SimdTest${SIMD}" PRIVATE QT_COMPILER_SUPPORTS_${upper_simd})
diff --git a/config_help.txt b/config_help.txt
index d9ff8e598e..3d3ddb803c 100644
--- a/config_help.txt
+++ b/config_help.txt
@@ -38,8 +38,7 @@ except -sysconfdir should be located under -prefix/-hostprefix:
   -plugindir <dir> ...... Plugins [ARCHDATADIR/plugins]
   -libexecdir <dir> ..... Helper programs [ARCHDATADIR/bin on Windows,
                           ARCHDATADIR/libexec otherwise]
-  -importdir <dir> ...... QML1 imports [ARCHDATADIR/imports]
-  -qmldir <dir> ......... QML2 imports [ARCHDATADIR/qml]
+  -qmldir <dir> ......... QML imports [ARCHDATADIR/qml]
   -datadir <dir> ........ Arch-independent data [PREFIX]
   -docdir <dir> ......... Documentation [DATADIR/doc]
   -translationdir <dir> . Translations [DATADIR/translations]
@@ -321,6 +320,6 @@ Gui, printing, widget options:
 Database options:
 
   -sql-<driver> ........ Enable SQL <driver> plugin. Supported drivers:
-                         db2 ibase mysql oci odbc psql sqlite2 sqlite tds
+                         db2 ibase mysql oci odbc psql sqlite
                          [all auto]
-  -sqlite .............. Select used sqlite3 [system/qt]
+  -sqlite .............. Select used sqlite [system/qt]
diff --git a/configure b/configure
index 6657870e4b..34312cbcf8 100755
--- a/configure
+++ b/configure
@@ -42,18 +42,27 @@ outpath=`/bin/pwd`
 
 WHICH="which"
 
+PERL=
+findPerl()
+{
 PERL=`$WHICH perl 2>/dev/null`
+}
 
 # find out which awk we want to use, prefer gawk, then nawk, then regular awk
 AWK=
+findAwk()
+{
 for e in gawk nawk awk; do
     if "$WHICH" $e >/dev/null 2>&1 && ( $e -f /dev/null /dev/null ) >/dev/null 2>&1; then
         AWK=$e
         break
     fi
 done
+}
 
 # find a make command
+findMake()
+{
 if [ -z "$MAKE" ]; then
     MAKE=
     for mk in gmake make; do
@@ -70,39 +79,112 @@ if [ -z "$MAKE" ]; then
     # export MAKE, we need it later in the config.tests
     export MAKE
 fi
+}
 
 # make sure qmake is not confused by these. recursion via Makefiles would
 # be still affected, so just unsetting them here is not an option.
+checkQMakeEnv()
+{
 if [ -n "$QMAKESPEC" ] || [ -n "$XQMAKESPEC" ] || \
         [ -n "$QMAKEPATH" ] || [ -n "$QMAKEFEATURES" ]; then
     echo >&2 "Please make sure to unset the QMAKESPEC, XQMAKESPEC, QMAKEPATH,"
     echo >&2 "and QMAKEFEATURES environment variables prior to building Qt."
     exit 1
 fi
+}
 
 # do this early so we don't store it in config.status
 CFG_TOPLEVEL=
-relpathMangled=$relpath
 outpathPrefix=
-if [ x"$1" = x"-top-level" ]; then
-    CFG_TOPLEVEL=yes
-    relpathMangled=`dirname "$relpath"`
-    outpathPrefix=../
-    shift
-else
-    if [ -f ../.qmake.super ]; then
-        echo >&2 "ERROR: You cannot configure qtbase separately within a top-level build."
-        exit 1
+
+checkTopLevelBuild()
+{
+    relpathMangled=$relpath
+    if [ x"$1" = x"-top-level" ]; then
+        CFG_TOPLEVEL=yes
+        relpathMangled=`dirname "$relpath"`
+        outpathPrefix=../
+    else
+        if [ -f ../.qmake.super ]; then
+            echo >&2 "ERROR: You cannot configure qtbase separately within a top-level build."
+            exit 1
+        fi
     fi
+}
+
+CMAKE_CMDLINE=
+getCMakeCmdLine()
+{
+PASSTHRU=
+set -f  # suppress globbing in for loop
+SAVED_IFS=$IFS
+IFS='
+'
+
+if [ "$CFG_DEV" = "yes" ]; then
+    CMAKE_CMDLINE="$CMAKE_CMDLINE
+-DFEATURE_developer_build=ON"
+    CMAKE_CMDLINE="$CMAKE_CMDLINE
+-DBUILD_TESTING=ON"
+    CMAKE_CMDLINE="$CMAKE_CMDLINE
+-DBUILD_EXAMPLES=ON"
+fi
+
+if [ "$CMAKE_MAKEFILES" = "no" ]; then
+       CMAKE_CMDLINE="$CMAKE_CMDLINE
+-G Ninja"
 fi
 
+for i in "$@"; do
+    if [ "$PASSTHRU" = "yes" ]; then
+        CMAKE_CMDLINE="$CMAKE_CMDLINE
+$i"
+    else
+        case $i in
+            -feature-*)
+                VAR=`echo $i | sed 's,^-feature-\(.*\),\1,'`
+                CMAKE_CMDLINE="$CMAKE_CMDLINE
+-DQT_FEATURE_${VAR}=ON"
+                ;;
+            -no-feature-*)
+                VAR=`echo $i | sed 's,^-no-feature-\(.*\),\1,'`
+                CMAKE_CMDLINE="$CMAKE_CMDLINE
+-DQT_FEATURE_${VAR}=OFF"
+                ;;
+            --no-*)
+                VAR=`echo $i | sed 's,^--no-\(.*\),\1,'`
+                CMAKE_CMDLINE="$CMAKE_CMDLINE
+-DFEATURE_${VAR}=OFF"
+                ;;
+            -no-*)
+                VAR=`echo $i | sed 's,^-no-\(.*\),\1,'`
+                CMAKE_CMDLINE="$CMAKE_CMDLINE
+-DFEATURE_${VAR}=OFF"
+                ;;
+            --)
+                PASSTHRU=yes
+                ;;
+            *)
+                ;;
+        esac
+    fi
+done
+set +f
+IFS=$SAVED_IFS
+}
+
 OPT_CMDLINE=  # expanded version for the script
 QMAKE_CMDLINE=  # verbatim version for qmake call
+getOptAndQMakeCmdLines()
+{
 set -f  # suppress globbing in for loop
 SAVED_IFS=$IFS
 IFS='
 '
 for i in "$@"; do
+    if [ x"$i" = x"-top-level" ]; then
+        continue
+    fi
     case $i in
         -redo|--redo)
             optfile=${outpathPrefix}config.opt
@@ -132,6 +214,7 @@ for i in $OPT_CMDLINE; do
 done
 set +f
 IFS=$SAVED_IFS
+}
 
 #-------------------------------------------------------------------------------
 # utility functions
@@ -298,7 +381,8 @@ getQMakeConf()
 #-------------------------------------------------------------------------------
 # operating system detection
 #-------------------------------------------------------------------------------
-
+detectOperatingSystem()
+{
 # need that throughout the script
 UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
 UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
@@ -312,11 +396,12 @@ if [ "$OSTYPE" = "msys" ]; then
     relpath=`(cd "$relpath"; pwd -W)`
     outpath=`pwd -W`
 fi
-
+}
 #-------------------------------------------------------------------------------
 # Verify Xcode installation on Mac OS
 #-------------------------------------------------------------------------------
-
+maybeVerifyXcode()
+{
 if [ "$BUILD_ON_MAC" = "yes" ]; then
     if ! /usr/bin/xcode-select --print-path >/dev/null 2>&1; then
         echo >&2
@@ -339,7 +424,7 @@ if [ "$BUILD_ON_MAC" = "yes" ]; then
         fi
     fi
 fi
-
+}
 #-----------------------------------------------------------------------------
 # Qt version detection
 #-----------------------------------------------------------------------------
@@ -347,6 +432,8 @@ QT_VERSION=
 QT_MAJOR_VERSION=
 QT_MINOR_VERSION=0
 QT_PATCH_VERSION=0
+detectQtVersion()
+{
 eval `sed -n -e 's/^MODULE_VERSION = \(\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*\)$/QT_VERSION=\1\
     QT_MAJOR_VERSION=\2\
     QT_MINOR_VERSION=\3\
@@ -356,7 +443,7 @@ if [ -z "$QT_MAJOR_VERSION" ]; then
    echo "Cannot proceed."
    exit 1
 fi
-
+}
 #-------------------------------------------------------------------------------
 # initialize variables
 #-------------------------------------------------------------------------------
@@ -372,11 +459,14 @@ OPT_VERBOSE=no
 OPT_HELP=
 CFG_SILENT=no
 CFG_DEV=no
+BUILD_WITH_CMAKE=no
+CMAKE_MAKEFILES=no
 
 #-------------------------------------------------------------------------------
 # parse command line arguments
 #-------------------------------------------------------------------------------
-
+parseCommandline()
+{
 # parse the arguments, setting things to "yes" or "no"
 while [ "$#" -gt 0 ]; do
     CURRENT_OPT="$1"
@@ -417,7 +507,6 @@ while [ "$#" -gt 0 ]; do
     -docdir| \
     -headerdir| \
     -plugindir| \
-    -importdir| \
     -qmldir| \
     -archdatadir| \
     -datadir| \
@@ -522,6 +611,13 @@ while [ "$#" -gt 0 ]; do
         # need to keep this here, to ensure qmake is built silently
         CFG_SILENT="$VAL"
         ;;
+    cmake)
+        BUILD_WITH_CMAKE=yes
+        ;;
+    cmake-makefiles)
+        BUILD_WITH_CMAKE=yes
+        CMAKE_MAKEFILES=yes
+        ;;
     *)
         ;;
     esac
@@ -531,11 +627,12 @@ while [ "$#" -gt 0 ]; do
     fi
 done
 [ "x$ERROR" = "xyes" ] && exit 1
-
+}
 #-------------------------------------------------------------------------------
 # help - interactive parts of the script _after_ this section please
 #-------------------------------------------------------------------------------
-
+handleHelp()
+{
 if [ "$OPT_HELP" = "yes" ]; then
     cat $relpath/config_help.txt
     if [ -n "$CFG_TOPLEVEL" ]; then
@@ -550,12 +647,13 @@ if [ "$OPT_HELP" = "yes" ]; then
     fi
     exit 0
 fi
-
+}
 #-------------------------------------------------------------------------------
 # platform detection
 #-------------------------------------------------------------------------------
-
 PLATFORM_NOTES=
+detectPlatform()
+{
 if [ -z "$PLATFORM" ]; then
     case "$UNAME_SYSTEM:$UNAME_RELEASE" in
      Darwin:*)
@@ -621,11 +719,13 @@ if [ -z "$PLATFORM" ]; then
     esac
 fi
 echo "$PLATFORM_NOTES" > "${outpathPrefix}.config.notes"
+}
 
 #-------------------------------------------------------------------------------
 # command line and environment validation
 #-------------------------------------------------------------------------------
-
+validateEnv()
+{
 if [ -d "$PLATFORM" ]; then
   QMAKESPEC="$PLATFORM"
 else
@@ -655,11 +755,12 @@ if [ '!' -d "$QMAKESPEC" ]; then
     echo
     exit 2
 fi
-
+}
 #-------------------------------------------------------------------------------
 # build tree initialization
 #-------------------------------------------------------------------------------
-
+initBuildTree()
+{
 # is this a shadow build?
 if [ "$OPT_SHADOW" = "maybe" ]; then
     OPT_SHADOW=no
@@ -687,11 +788,24 @@ if [ "$OPT_SHADOW" = "yes" ]; then
 
     mkdir -p "$outpath/mkspecs"
 fi
+}
+
+# $1: input variable name (awk regexp)
+# $2: optional output variable name
+# $3: optional value transformation (sed command)
+# relies on $QMAKESPEC, $COMPILER_CONF and $mkfile being set correctly, as the latter
+# is where the resulting variable is written to
+setBootstrapVariable()
+{
+    getQMakeConf "$1" | echo ${2-$1} = `if [ -n "$3" ]; then sed "$3"; else cat; fi` >> "$mkfile"
+}
 
 # -----------------------------------------------------------------------------
 # build qmake
 # -----------------------------------------------------------------------------
 
+buildQMake()
+{
 # symlink includes
 if [ -e "$relpath/.git" ]; then
     if [ -z "$PERL" ]; then
@@ -703,17 +817,6 @@ if [ -e "$relpath/.git" ]; then
 
     "$relpath/bin/syncqt.pl" -version $QT_VERSION -minimal -module QtCore "$relpath" || exit 1
 fi
-
-# $1: input variable name (awk regexp)
-# $2: optional output variable name
-# $3: optional value transformation (sed command)
-# relies on $QMAKESPEC, $COMPILER_CONF and $mkfile being set correctly, as the latter
-# is where the resulting variable is written to
-setBootstrapVariable()
-{
-    getQMakeConf "$1" | echo ${2-$1} = `if [ -n "$3" ]; then sed "$3"; else cat; fi` >> "$mkfile"
-}
-
 # build qmake
     echo "Creating qmake..."
     mkdir -p "$outpath/qmake" || exit
@@ -728,14 +831,14 @@ setBootstrapVariable()
         echo "########################################################################" > "$mkfile"
         echo "## This file was autogenerated by configure, all changes will be lost ##" >> "$mkfile"
         echo "########################################################################" >> "$mkfile"
-        EXTRA_CXXFLAGS="\$(QMAKE_CXXFLAGS) \$(QMAKE_CXXFLAGS_CXX11) \$(QMAKE_CXXFLAGS_SPLIT_SECTIONS)"
+        EXTRA_CXXFLAGS="\$(QMAKE_CXXFLAGS) \$(QMAKE_CXXFLAGS_CXX1Z) \$(QMAKE_CXXFLAGS_SPLIT_SECTIONS)"
         EXTRA_LFLAGS="\$(QMAKE_LFLAGS) \$(QMAKE_LFLAGS_GCSECTIONS)"
 
         [ "$CFG_SILENT" = "yes" ] && CC_TRANSFORM='s,^,\@,' || CC_TRANSFORM=
         setBootstrapVariable QMAKE_CC CC "$CC_TRANSFORM"
         setBootstrapVariable QMAKE_CXX CXX "$CC_TRANSFORM"
         setBootstrapVariable QMAKE_CXXFLAGS
-        setBootstrapVariable QMAKE_CXXFLAGS_CXX11
+        setBootstrapVariable QMAKE_CXXFLAGS_CXX1Z
         setBootstrapVariable QMAKE_CXXFLAGS_SPLIT_SECTIONS
         setBootstrapVariable QMAKE_LFLAGS
         setBootstrapVariable QMAKE_LFLAGS_GCSECTIONS
@@ -812,11 +915,14 @@ setBootstrapVariable()
         fi
         echo "Done."
     fi
+}
 
 #-------------------------------------------------------------------------------
 # create a qt.conf for the Qt build tree itself
 #-------------------------------------------------------------------------------
 
+createQtConf()
+{
 # Note that this file is just sufficient to boot configure, by which it is
 # replaced in-place with a version which is suitable for building all of Qt.
 QTCONFFILE="$outpath/bin/qt.conf"
@@ -833,11 +939,13 @@ if [ x"$relpath" != x"$outpath" ]; then
 Prefix=$relpath
 EOF
 fi
+}
 
 #-------------------------------------------------------------------------------
 # configure and build top-level makefile
 #-------------------------------------------------------------------------------
-
+createToplevelMakefile()
+{
 # recreate command line for qmake
 set -f
 SAVED_IFS=$IFS
@@ -858,3 +966,42 @@ if [ -n "$CFG_HOST_QT_TOOLS_PATH" ]; then
 else
     "$outpath/bin/qmake" "$relpathMangled" -- "$@"
 fi
+}
+
+runCMake()
+{
+# recreate command line for cmake
+set -f
+SAVED_IFS=$IFS
+IFS='
+'
+for i in $CMAKE_CMDLINE; do
+    set -- $* "$i"
+done
+set +f
+IFS=$SAVED_IFS
+cmake $* "$relpath"
+}
+
+parseCommandline "$@"
+handleHelp
+if [ "$BUILD_WITH_CMAKE" = "yes" ]; then
+    getCMakeCmdLine $@
+    runCMake
+else
+    findPerl
+    findAwk
+    findMake
+    checkQMakeEnv
+    checkTopLevelBuild "$@"
+    getOptAndQMakeCmdLines "$@"
+    detectOperatingSystem
+    maybeVerifyXcode
+    detectQtVersion
+    detectPlatform
+    validateEnv
+    initBuildTree
+    buildQMake
+    createQtConf
+    createToplevelMakefile
+fi
diff --git a/configure.bat b/configure.bat
index b34e146f5f..163e296874 100644
--- a/configure.bat
+++ b/configure.bat
@@ -261,7 +261,7 @@ if "%tmpl%" == "win32" (
     echo QMAKESPEC = %PLATFORM%>> Makefile
 ) else (
     echo QMAKESPEC = $^(SOURCE_PATH^)/mkspecs/%PLATFORM%>> Makefile
-    echo CONFIG_CXXFLAGS = -std=c++11 -ffunction-sections>> Makefile
+    echo CONFIG_CXXFLAGS = -std=c++17 -ffunction-sections>> Makefile
     echo CONFIG_LFLAGS = -Wl,--gc-sections>> Makefile
     type "%QTSRC%\qmake\Makefile.unix.win32" >> Makefile
     type "%QTSRC%\qmake\Makefile.unix.mingw" >> Makefile
diff --git a/configure.cmake b/configure.cmake
new file mode 100644
index 0000000000..cfb1d58604
--- /dev/null
+++ b/configure.cmake
@@ -0,0 +1,716 @@
+
+
+#### Inputs
+
+
+
+#### Libraries
+
+qt_find_package(ZLIB PROVIDED_TARGETS ZLIB::ZLIB)
+qt_find_package(ZSTD PROVIDED_TARGETS ZSTD::ZSTD)
+qt_find_package(WrapDBus1 PROVIDED_TARGETS dbus-1)
+qt_find_package(Libudev PROVIDED_TARGETS PkgConfig::Libudev)
+
+
+#### Tests
+
+# cxx14
+qt_config_compile_test(cxx14
+    LABEL "C++14 support"
+    CODE
+"#if __cplusplus > 201103L
+// Compiler claims to support C++14, trust it
+#else
+#  error __cplusplus must be > 201103L (the value of C++11)
+#endif
+
+
+int main(int argc, char **argv)
+{
+    (void)argc; (void)argv;
+    /* BEGIN TEST: */
+
+    /* END TEST: */
+    return 0;
+}
+"
+    CXX_STANDARD 14
+)
+
+# cxx17
+qt_config_compile_test(cxx17
+    LABEL "C++17 support"
+    CODE
+"#if __cplusplus > 201402L
+// Compiler claims to support C++17, trust it
+#else
+#  error __cplusplus must be > 201402L (the value for C++14)
+#endif
+#include <map>  // https://bugs.llvm.org//show_bug.cgi?id=33117
+#include <variant>
+
+
+int main(int argc, char **argv)
+{
+    (void)argc; (void)argv;
+    /* BEGIN TEST: */
+std::variant<int> v(42);
+int i = std::get<int>(v);
+std::visit([](const auto &) { return 1; }, v);
+    /* END TEST: */
+    return 0;
+}
+"
+    CXX_STANDARD 17
+)
+
+# cxx2a
+qt_config_compile_test(cxx2a
+    LABEL "C++2a support"
+    CODE
+"#if __cplusplus > 201703L
+// Compiler claims to support experimental C++2a, trust it
+#else
+#  error __cplusplus must be > 201703L (the value for C++17)
+#endif
+
+
+int main(int argc, char **argv)
+{
+    (void)argc; (void)argv;
+    /* BEGIN TEST: */
+
+    /* END TEST: */
+    return 0;
+}
+"
+    CXX_STANDARD 20
+)
+
+# precompile_header
+qt_config_compile_test(precompile_header
+    LABEL "precompiled header support"
+    CODE
+"
+
+#ifndef HEADER_H
+#error no go
+#endif
+int main(int argc, char **argv)
+{
+    (void)argc; (void)argv;
+    /* BEGIN TEST: */
+
+    /* END TEST: */
+    return 0;
+}
+"# FIXME: qmake: ['CONFIG += precompile_header', 'PRECOMPILED_DIR = .pch', 'PRECOMPILED_HEADER = header.h']
+)
+
+# reduce_relocations
+qt_config_compile_test(reduce_relocations
+    LABEL "-Bsymbolic-functions support"
+    CODE
+"#if !(defined(__i386) || defined(__i386__) || defined(__x86_64) || defined(__x86_64__) || defined(__amd64))
+#  error Symbolic function binding on this architecture may be broken, disabling it (see QTBUG-36129).
+#endif
+
+
+int main(int argc, char **argv)
+{
+    (void)argc; (void)argv;
+    /* BEGIN TEST: */
+
+    /* END TEST: */
+    return 0;
+}
+"# FIXME: qmake: ['TEMPLATE = lib', 'CONFIG += dll bsymbolic_functions', 'isEmpty(QMAKE_LFLAGS_BSYMBOLIC_FUNC): error("Nope")']
+)
+
+# signaling_nan
+qt_config_compile_test(signaling_nan
+    LABEL "Signaling NaN for doubles"
+    CODE
+"#include <limits>
+
+
+int main(int argc, char **argv)
+{
+    (void)argc; (void)argv;
+    /* BEGIN TEST: */
+using B = std::numeric_limits<double>;
+static_assert(B::has_signaling_NaN, \"System lacks signaling NaN\");
+    /* END TEST: */
+    return 0;
+}
+")
+
+# sse2
+qt_config_compile_test_x86simd(sse2 "SSE2 instructions")
+
+# sse3
+qt_config_compile_test_x86simd(sse3 "SSE3 instructions")
+
+# ssse3
+qt_config_compile_test_x86simd(ssse3 "SSSE3 instructions")
+
+# sse4_1
+qt_config_compile_test_x86simd(sse4_1 "SSE4.1 instructions")
+
+# sse4_2
+qt_config_compile_test_x86simd(sse4_2 "SSE4.2 instructions")
+
+# aesni
+qt_config_compile_test_x86simd(aesni "AES new instructions")
+
+# f16c
+qt_config_compile_test_x86simd(f16c "F16C instructions")
+
+# rdrnd
+qt_config_compile_test_x86simd(rdrnd "RDRAND instruction")
+
+# rdseed
+qt_config_compile_test_x86simd(rdseed "RDSEED instruction")
+
+# shani
+qt_config_compile_test_x86simd(shani "SHA new instructions")
+
+# avx
+qt_config_compile_test_x86simd(avx "AVX instructions")
+
+# avx2
+qt_config_compile_test_x86simd(avx2 "AVX2 instructions")
+
+# avx512f
+qt_config_compile_test_x86simd(avx512f "AVX512 F instructions")
+
+# avx512er
+qt_config_compile_test_x86simd(avx512er "AVX512 ER instructions")
+
+# avx512cd
+qt_config_compile_test_x86simd(avx512cd "AVX512 CD instructions")
+
+# avx512pf
+qt_config_compile_test_x86simd(avx512pf "AVX512 PF instructions")
+
+# avx512dq
+qt_config_compile_test_x86simd(avx512dq "AVX512 DQ instructions")
+
+# avx512bw
+qt_config_compile_test_x86simd(avx512bw "AVX512 BW instructions")
+
+# avx512vl
+qt_config_compile_test_x86simd(avx512vl "AVX512 VL instructions")
+
+# avx512ifma
+qt_config_compile_test_x86simd(avx512ifma "AVX512 IFMA instructions")
+
+# avx512vbmi
+qt_config_compile_test_x86simd(avx512vbmi "AVX512 VBMI instructions")
+
+# posix_fallocate
+qt_config_compile_test(posix_fallocate
+    LABEL "POSIX fallocate()"
+    CODE
+"
+#include <fcntl.h>
+#include <unistd.h>
+
+int main(int argc, char **argv)
+{
+    (void)argc; (void)argv;
+    /* BEGIN TEST: */
+(void) posix_fallocate(0, 0, 0);
+    /* END TEST: */
+    return 0;
+}
+")
+
+# alloca_stdlib_h
+qt_config_compile_test(alloca_stdlib_h
+    LABEL "alloca() in stdlib.h"
+    CODE
+"
+#include <stdlib.h>
+
+int main(int argc, char **argv)
+{
+    (void)argc; (void)argv;
+    /* BEGIN TEST: */
+alloca(1);
+    /* END TEST: */
+    return 0;
+}
+")
+
+# alloca_h
+qt_config_compile_test(alloca_h
+    LABEL "alloca() in alloca.h"
+    CODE
+"
+#include <alloca.h>
+#ifdef __QNXNTO__
+// extra include needed in QNX7 to define NULL for the alloca() macro
+#  include <stddef.h>
+#endif
+int main(int argc, char **argv)
+{
+    (void)argc; (void)argv;
+    /* BEGIN TEST: */
+alloca(1);
+    /* END TEST: */
+    return 0;
+}
+")
+
+# alloca_malloc_h
+qt_config_compile_test(alloca_malloc_h
+    LABEL "alloca() in malloc.h"
+    CODE
+"
+#include <malloc.h>
+
+int main(int argc, char **argv)
+{
+    (void)argc; (void)argv;
+    /* BEGIN TEST: */
+alloca(1);
+    /* END TEST: */
+    return 0;
+}
+")
+
+# stack_protector
+qt_config_compile_test(stack_protector
+    LABEL "stack protection"
+    CODE
+"#ifdef __QNXNTO__
+#  include <sys/neutrino.h>
+#  if _NTO_VERSION < 700
+#    error stack-protector not used (by default) before QNX 7.0.0.
+#  endif
+#endif
+
+
+int main(int argc, char **argv)
+{
+    (void)argc; (void)argv;
+    /* BEGIN TEST: */
+
+    /* END TEST: */
+    return 0;
+}
+"# FIXME: qmake: QMAKE_CXXFLAGS += -fstack-protector-strong
+)
+
+
+
+#### Features
+
+# This belongs into gui, but the license check needs it here already.
+qt_feature("android-style-assets" PRIVATE
+    LABEL "Android Style Assets"
+    CONDITION ANDROID
+)
+qt_feature("use_bfd_linker"
+    LABEL "bfd"
+    AUTODETECT false
+    CONDITION NOT WIN32 AND NOT INTEGRITY AND NOT WASM AND tests.use_bfd_linker OR FIXME
+    ENABLE INPUT_linker STREQUAL 'bfd'
+    DISABLE INPUT_linker STREQUAL 'gold' OR INPUT_linker STREQUAL 'lld'
+)
+qt_feature_config("use_bfd_linker" QMAKE_PRIVATE_CONFIG)
+qt_feature("use_gold_linker_alias"
+    AUTODETECT false
+    CONDITION NOT WIN32 AND NOT INTEGRITY AND NOT WASM AND tests.use_gold_linker OR FIXME
+)
+qt_feature("use_lld_linker"
+    LABEL "lld"
+    AUTODETECT false
+    CONDITION NOT WIN32 AND NOT INTEGRITY AND NOT WASM AND tests.use_lld_linker OR FIXME
+    ENABLE INPUT_linker STREQUAL 'lld'
+    DISABLE INPUT_linker STREQUAL 'bfd' OR INPUT_linker STREQUAL 'gold'
+)
+qt_feature_config("use_lld_linker" QMAKE_PRIVATE_CONFIG)
+qt_feature("developer-build"
+    LABEL "Developer build"
+    AUTODETECT OFF
+)
+qt_feature("private_tests" PRIVATE
+    LABEL "Developer build: private_tests"
+    CONDITION QT_FEATURE_developer_build
+)
+qt_feature_definition("developer-build" "QT_BUILD_INTERNAL")
+qt_feature_config("developer-build" QMAKE_PUBLIC_QT_CONFIG
+    NAME "private_tests"
+)
+qt_feature("appstore-compliant" PUBLIC
+    LABEL "App store compliance"
+    PURPOSE "Disables code that is not allowed in platform app stores"
+    AUTODETECT APPLE_UIKIT OR ANDROID OR WINRT
+)
+qt_feature("simulator_and_device" PUBLIC
+    LABEL "Build for both simulator and device"
+    CONDITION APPLE_UIKIT AND NOT QT_UIKIT_SDK
+)
+qt_feature_config("simulator_and_device" QMAKE_PUBLIC_QT_CONFIG)
+qt_feature("force_asserts" PUBLIC
+    LABEL "Force assertions"
+    AUTODETECT OFF
+)
+qt_feature("headersclean"
+    LABEL "Check for clean headers"
+    AUTODETECT QT_FEATURE_developer_build
+    CONDITION NOT WASM
+)
+qt_feature_config("headersclean" QMAKE_PRIVATE_CONFIG)
+qt_feature("framework" PUBLIC
+    LABEL "Build Apple Frameworks"
+    CONDITION APPLE AND BUILD_SHARED_LIBS
+)
+qt_feature_definition("framework" "QT_MAC_FRAMEWORK_BUILD")
+qt_feature_config("framework" QMAKE_PUBLIC_QT_CONFIG
+    NAME "qt_framework"
+)
+qt_feature_config("framework" QMAKE_PUBLIC_CONFIG
+    NAME "qt_framework"
+)
+qt_feature("largefile"
+    LABEL "Large file support"
+    CONDITION NOT ANDROID AND NOT INTEGRITY AND NOT WINRT AND NOT rtems
+)
+qt_feature_definition("largefile" "QT_LARGEFILE_SUPPORT" VALUE "64")
+qt_feature_config("largefile" QMAKE_PRIVATE_CONFIG)
+qt_feature("testcocoon"
+    LABEL "Testcocoon support"
+    AUTODETECT OFF
+)
+qt_feature_config("testcocoon" QMAKE_PUBLIC_CONFIG)
+qt_feature("sanitize_fuzzer_no_link"
+    LABEL "Fuzzer (instrumentation only)"
+    PURPOSE "Adds instrumentation for fuzzing to the binaries but links to the usual main function instead of a fuzzer's."
+    AUTODETECT OFF
+)
+qt_feature_config("sanitize_fuzzer_no_link" QMAKE_PUBLIC_CONFIG)
+qt_feature("coverage_trace_pc_guard"
+    LABEL "trace-pc-guard"
+    AUTODETECT OFF
+)
+qt_feature_config("coverage_trace_pc_guard" QMAKE_PUBLIC_CONFIG)
+qt_feature("coverage_source_based"
+    LABEL "source-based"
+    AUTODETECT OFF
+)
+qt_feature_config("coverage_source_based" QMAKE_PUBLIC_CONFIG)
+qt_feature("coverage"
+    LABEL "Code Coverage Instrumentation"
+    CONDITION QT_FEATURE_coverage_trace_pc_guard OR QT_FEATURE_coverage_source_based
+)
+qt_feature_config("coverage" QMAKE_PUBLIC_CONFIG)
+qt_feature("plugin-manifests"
+    LABEL "Embed manifests in plugins"
+    AUTODETECT OFF
+    EMIT_IF WIN32
+)
+qt_feature_config("plugin-manifests" QMAKE_PUBLIC_CONFIG
+    NEGATE
+    NAME "no_plugin_manifest"
+)
+qt_feature("c++11" PUBLIC
+    LABEL "C++11"
+)
+qt_feature_config("c++11" QMAKE_PUBLIC_QT_CONFIG)
+qt_feature("c++14" PUBLIC
+    LABEL "C++14"
+    CONDITION QT_FEATURE_cxx11 AND TEST_cxx14
+)
+qt_feature_config("c++14" QMAKE_PUBLIC_QT_CONFIG)
+qt_feature("c++17" PUBLIC
+    LABEL "C++17"
+    CONDITION QT_FEATURE_cxx14 AND TEST_cxx17
+)
+qt_feature_config("c++17" QMAKE_PUBLIC_QT_CONFIG)
+qt_feature("c++1z" PUBLIC
+    LABEL "C++17"
+    CONDITION QT_FEATURE_cxx17
+)
+qt_feature_config("c++1z" QMAKE_PUBLIC_QT_CONFIG)
+qt_feature("c++2a" PUBLIC
+    LABEL "C++2a"
+    AUTODETECT OFF
+    CONDITION QT_FEATURE_cxx17 AND TEST_cxx2a
+)
+qt_feature_config("c++2a" QMAKE_PUBLIC_QT_CONFIG)
+qt_feature("reduce_exports" PRIVATE
+    LABEL "Reduce amount of exported symbols"
+    CONDITION NOT WIN32 AND CMAKE_CXX_COMPILE_OPTIONS_VISIBILITY
+)
+qt_feature_definition("reduce_exports" "QT_VISIBILITY_AVAILABLE")
+qt_feature_config("reduce_exports" QMAKE_PUBLIC_QT_CONFIG)
+qt_feature("reduce_relocations" PRIVATE
+    LABEL "Reduce amount of relocations"
+    CONDITION NOT WIN32 AND TEST_reduce_relocations
+)
+qt_feature_definition("reduce_relocations" "QT_REDUCE_RELOCATIONS")
+qt_feature_config("reduce_relocations" QMAKE_PUBLIC_QT_CONFIG)
+qt_feature("signaling_nan" PUBLIC
+    LABEL "Signaling NaN"
+    CONDITION TEST_signaling_nan
+)
+qt_feature("sse2" PRIVATE
+    LABEL "SSE2"
+    CONDITION ( ( TEST_architecture_arch STREQUAL i386 ) OR ( TEST_architecture_arch STREQUAL x86_64 ) ) AND TEST_subarch_sse2
+)
+qt_feature_definition("sse2" "QT_COMPILER_SUPPORTS_SSE2" VALUE "1")
+qt_feature_config("sse2" QMAKE_PRIVATE_CONFIG)
+qt_feature("sse3"
+    LABEL "SSE3"
+    CONDITION QT_FEATURE_sse2 AND TEST_subarch_sse3
+)
+qt_feature_definition("sse3" "QT_COMPILER_SUPPORTS_SSE3" VALUE "1")
+qt_feature_config("sse3" QMAKE_PRIVATE_CONFIG)
+qt_feature("ssse3"
+    LABEL "SSSE3"
+    CONDITION QT_FEATURE_sse3 AND TEST_subarch_ssse3
+)
+qt_feature_definition("ssse3" "QT_COMPILER_SUPPORTS_SSSE3" VALUE "1")
+qt_feature_config("ssse3" QMAKE_PRIVATE_CONFIG)
+qt_feature("sse4_1"
+    LABEL "SSE4.1"
+    CONDITION QT_FEATURE_ssse3 AND TEST_subarch_sse4_1
+)
+qt_feature_definition("sse4_1" "QT_COMPILER_SUPPORTS_SSE4_1" VALUE "1")
+qt_feature_config("sse4_1" QMAKE_PRIVATE_CONFIG)
+qt_feature("sse4_2"
+    LABEL "SSE4.2"
+    CONDITION QT_FEATURE_sse4_1 AND TEST_subarch_sse4_2
+)
+qt_feature_definition("sse4_2" "QT_COMPILER_SUPPORTS_SSE4_2" VALUE "1")
+qt_feature_config("sse4_2" QMAKE_PRIVATE_CONFIG)
+qt_feature("avx"
+    LABEL "AVX"
+    CONDITION QT_FEATURE_sse4_2 AND TEST_subarch_avx
+)
+qt_feature_definition("avx" "QT_COMPILER_SUPPORTS_AVX" VALUE "1")
+qt_feature_config("avx" QMAKE_PRIVATE_CONFIG)
+qt_feature("f16c"
+    LABEL "F16C"
+    CONDITION QT_FEATURE_avx AND TEST_subarch_f16c
+)
+qt_feature_definition("f16c" "QT_COMPILER_SUPPORTS_F16C" VALUE "1")
+qt_feature_config("f16c" QMAKE_PRIVATE_CONFIG)
+qt_feature("avx2" PRIVATE
+    LABEL "AVX2"
+    CONDITION QT_FEATURE_avx AND TEST_subarch_avx2
+)
+qt_feature_definition("avx2" "QT_COMPILER_SUPPORTS_AVX2" VALUE "1")
+qt_feature_config("avx2" QMAKE_PRIVATE_CONFIG)
+qt_feature("avx512f"
+    LABEL "F"
+    CONDITION QT_FEATURE_avx2 AND TEST_subarch_avx512f
+)
+qt_feature_definition("avx512f" "QT_COMPILER_SUPPORTS_AVX512F" VALUE "1")
+qt_feature_config("avx512f" QMAKE_PRIVATE_CONFIG)
+qt_feature("avx512er"
+    LABEL "ER"
+    CONDITION QT_FEATURE_avx512f AND TEST_subarch_avx512er
+)
+qt_feature_definition("avx512er" "QT_COMPILER_SUPPORTS_AVX512ER" VALUE "1")
+qt_feature_config("avx512er" QMAKE_PRIVATE_CONFIG)
+qt_feature("avx512cd"
+    LABEL "CD"
+    CONDITION QT_FEATURE_avx512f AND TEST_subarch_avx512cd
+)
+qt_feature_definition("avx512cd" "QT_COMPILER_SUPPORTS_AVX512CD" VALUE "1")
+qt_feature_config("avx512cd" QMAKE_PRIVATE_CONFIG)
+qt_feature("avx512pf"
+    LABEL "PF"
+    CONDITION QT_FEATURE_avx512f AND TEST_subarch_avx512pf
+)
+qt_feature_definition("avx512pf" "QT_COMPILER_SUPPORTS_AVX512PF" VALUE "1")
+qt_feature_config("avx512pf" QMAKE_PRIVATE_CONFIG)
+qt_feature("avx512dq"
+    LABEL "DQ"
+    CONDITION QT_FEATURE_avx512f AND TEST_subarch_avx512dq
+)
+qt_feature_definition("avx512dq" "QT_COMPILER_SUPPORTS_AVX512DQ" VALUE "1")
+qt_feature_config("avx512dq" QMAKE_PRIVATE_CONFIG)
+qt_feature("avx512bw"
+    LABEL "BW"
+    CONDITION QT_FEATURE_avx512f AND TEST_subarch_avx512bw
+)
+qt_feature_definition("avx512bw" "QT_COMPILER_SUPPORTS_AVX512BW" VALUE "1")
+qt_feature_config("avx512bw" QMAKE_PRIVATE_CONFIG)
+qt_feature("avx512vl"
+    LABEL "VL"
+    CONDITION QT_FEATURE_avx512f AND TEST_subarch_avx512vl
+)
+qt_feature_definition("avx512vl" "QT_COMPILER_SUPPORTS_AVX512VL" VALUE "1")
+qt_feature_config("avx512vl" QMAKE_PRIVATE_CONFIG)
+qt_feature("avx512ifma"
+    LABEL "IFMA"
+    CONDITION QT_FEATURE_avx512f AND TEST_subarch_avx512ifma
+)
+qt_feature_definition("avx512ifma" "QT_COMPILER_SUPPORTS_AVX512IFMA" VALUE "1")
+qt_feature_config("avx512ifma" QMAKE_PRIVATE_CONFIG)
+qt_feature("avx512vbmi"
+    LABEL "VBMI"
+    CONDITION QT_FEATURE_avx512f AND TEST_subarch_avx512vbmi
+)
+qt_feature_definition("avx512vbmi" "QT_COMPILER_SUPPORTS_AVX512VBMI" VALUE "1")
+qt_feature_config("avx512vbmi" QMAKE_PRIVATE_CONFIG)
+qt_feature("aesni"
+    LABEL "AES"
+    CONDITION QT_FEATURE_sse2 AND TEST_subarch_aes
+)
+qt_feature_definition("aesni" "QT_COMPILER_SUPPORTS_AES" VALUE "1")
+qt_feature_config("aesni" QMAKE_PRIVATE_CONFIG)
+qt_feature("rdrnd"
+    LABEL "RDRAND"
+    CONDITION TEST_subarch_rdseed
+)
+qt_feature_definition("rdrnd" "QT_COMPILER_SUPPORTS_RDRND" VALUE "1")
+qt_feature_config("rdrnd" QMAKE_PRIVATE_CONFIG)
+qt_feature("rdseed"
+    LABEL "RDSEED"
+    CONDITION TEST_subarch_rdseed
+)
+qt_feature_definition("rdseed" "QT_COMPILER_SUPPORTS_RDSEED" VALUE "1")
+qt_feature_config("rdseed" QMAKE_PRIVATE_CONFIG)
+qt_feature("shani"
+    LABEL "SHA"
+    CONDITION QT_FEATURE_sse2 AND TEST_subarch_sha
+)
+qt_feature_definition("shani" "QT_COMPILER_SUPPORTS_SHA" VALUE "1")
+qt_feature_config("shani" QMAKE_PRIVATE_CONFIG)
+qt_feature("x86SimdAlways"
+    LABEL "Intrinsics without -mXXX option"
+    CONDITION ( ( TEST_architecture_arch STREQUAL i386 ) OR ( TEST_architecture_arch STREQUAL x86_64 ) ) AND ON
+)
+qt_feature_definition("x86SimdAlways" "QT_COMPILER_SUPPORTS_SIMD_ALWAYS" VALUE "1")
+qt_feature_config("x86SimdAlways" QMAKE_PRIVATE_CONFIG)
+qt_feature("mips_dsp"
+    LABEL "DSP"
+    CONDITION ( TEST_architecture_arch STREQUAL mips ) AND TEST_arch_${TEST_architecture_arch}_subarch_dsp
+)
+qt_feature_definition("mips_dsp" "QT_COMPILER_SUPPORTS_MIPS_DSP" VALUE "1")
+qt_feature_config("mips_dsp" QMAKE_PRIVATE_CONFIG)
+qt_feature("mips_dspr2"
+    LABEL "DSPr2"
+    CONDITION ( TEST_architecture_arch STREQUAL mips ) AND TEST_arch_${TEST_architecture_arch}_subarch_dspr2
+)
+qt_feature_definition("mips_dspr2" "QT_COMPILER_SUPPORTS_MIPS_DSPR2" VALUE "1")
+qt_feature_config("mips_dspr2" QMAKE_PRIVATE_CONFIG)
+qt_feature("neon"
+    LABEL "NEON"
+    CONDITION ( ( TEST_architecture_arch STREQUAL arm ) OR ( TEST_architecture_arch STREQUAL arm64 ) ) AND TEST_arch_${TEST_architecture_arch}_subarch_neon
+)
+qt_feature_definition("neon" "QT_COMPILER_SUPPORTS_NEON" VALUE "1")
+qt_feature_config("neon" QMAKE_PRIVATE_CONFIG)
+qt_feature("alloca_h" PRIVATE
+    LABEL "alloca.h"
+    CONDITION TEST_alloca_h
+)
+qt_feature("alloca_malloc_h" PRIVATE
+    LABEL "alloca() in malloc.h"
+    CONDITION NOT QT_FEATURE_alloca_h AND TEST_alloca_malloc_h
+)
+qt_feature("alloca" PRIVATE
+    LABEL "alloca()"
+    CONDITION QT_FEATURE_alloca_h OR QT_FEATURE_alloca_malloc_h OR TEST_alloca_stdlib_h
+)
+qt_feature("system-zlib" PRIVATE
+    LABEL "Using system zlib"
+    CONDITION ZLIB_FOUND
+)
+qt_feature("zstd" PRIVATE
+    LABEL "Zstandard support"
+    CONDITION ZSTD_FOUND
+)
+qt_feature("thread" PUBLIC
+    SECTION "Kernel"
+    LABEL "Thread support"
+    PURPOSE "Provides QThread and related classes."
+    AUTODETECT NOT WASM
+)
+qt_feature("future" PUBLIC
+    SECTION "Kernel"
+    LABEL "QFuture"
+    PURPOSE "Provides QFuture and related classes."
+    CONDITION QT_FEATURE_thread
+)
+qt_feature("concurrent" PUBLIC
+    SECTION "Kernel"
+    LABEL "Qt Concurrent"
+    PURPOSE "Provides a high-level multi-threading API."
+    CONDITION QT_FEATURE_future
+)
+qt_feature_definition("concurrent" "QT_NO_CONCURRENT" NEGATE VALUE "1")
+qt_feature("dbus" PUBLIC PRIVATE
+    LABEL "Qt D-Bus"
+    AUTODETECT NOT APPLE_UIKIT AND NOT ANDROID AND NOT WINRT
+    CONDITION QT_FEATURE_thread
+)
+qt_feature_definition("dbus" "QT_NO_DBUS" NEGATE VALUE "1")
+qt_feature("dbus-linked" PRIVATE
+    LABEL "Qt D-Bus directly linked to libdbus"
+    CONDITION QT_FEATURE_dbus AND DBus1_FOUND
+    ENABLE INPUT_dbus STREQUAL 'linked'
+    DISABLE INPUT_dbus STREQUAL 'runtime'
+)
+qt_feature("gui" PRIVATE
+    LABEL "Qt Gui"
+)
+qt_feature_config("gui" QMAKE_PUBLIC_QT_CONFIG
+    NEGATE)
+qt_feature("network" PRIVATE
+    LABEL "Qt Network"
+)
+qt_feature("sql" PRIVATE
+    LABEL "Qt Sql"
+    CONDITION QT_FEATURE_thread
+)
+qt_feature("testlib" PRIVATE
+    LABEL "Qt Testlib"
+)
+qt_feature("widgets" PRIVATE
+    LABEL "Qt Widgets"
+    AUTODETECT NOT APPLE_TVOS AND NOT APPLE_WATCHOS
+    CONDITION QT_FEATURE_gui
+)
+qt_feature_definition("widgets" "QT_NO_WIDGETS" NEGATE)
+qt_feature_config("widgets" QMAKE_PUBLIC_QT_CONFIG
+    NEGATE)
+qt_feature("xml" PRIVATE
+    LABEL "Qt Xml"
+)
+qt_feature("libudev" PRIVATE
+    LABEL "udev"
+    CONDITION Libudev_FOUND
+)
+qt_feature("qt_libinfix_plugins"
+    LABEL "Use QT_LIBINFIX for Plugins"
+    AUTODETECT OFF
+    ENABLE ( NOT INPUT_qt_libinfix STREQUAL '' AND INPUT_qt_libinfix_plugins STREQUAL 'yes' )
+)
+qt_feature_config("qt_libinfix_plugins" QMAKE_PRIVATE_CONFIG)
+qt_feature("compile_examples"
+    LABEL "Compile examples"
+    AUTODETECT NOT WASM
+)
+qt_feature_config("compile_examples" QMAKE_PRIVATE_CONFIG)
+qt_feature("dlopen" PRIVATE
+    LABEL "dlopen()"
+    CONDITION UNIX
+)
+qt_feature("relocatable" PRIVATE
+    LABEL "Relocatable"
+    PURPOSE "Enable the Qt installation to be relocated."
+    AUTODETECT QT_FEATURE_shared
+    CONDITION QT_FEATURE_dlopen OR WIN32 OR NOT QT_FEATURE_shared
+)
+
+qt_extra_definition("QT_VERSION_STR" "\"${PROJECT_VERSION}\"" PUBLIC)
+qt_extra_definition("QT_VERSION_MAJOR" ${PROJECT_VERSION_MAJOR} PUBLIC)
+qt_extra_definition("QT_VERSION_MINOR" ${PROJECT_VERSION_MINOR} PUBLIC)
+qt_extra_definition("QT_VERSION_PATCH" ${PROJECT_VERSION_PATCH} PUBLIC)
diff --git a/configure.json b/configure.json
index d1eb1d8102..cf123602c2 100644
--- a/configure.json
+++ b/configure.json
@@ -40,7 +40,6 @@
             "hostbindir": "string",
             "hostdatadir": "string",
             "hostlibdir": "string",
-            "importdir": "string",
             "libdir": "string",
             "libexecdir": "string",
             "plugindir": "string",
@@ -899,7 +898,7 @@
             "label": "Fuzzer (instrumentation only)",
             "autoDetect": false,
             "output": [ "publicConfig" ],
-            "purpose": [ "Adds instrumentation for fuzzing to the binaries but links to the usual main function instead of a fuzzer's." ]
+            "purpose": "Adds instrumentation for fuzzing to the binaries but links to the usual main function instead of a fuzzer's."
         },
         "sanitize_undefined": {
             "label": "Undefined",
@@ -1433,9 +1432,7 @@
         {
             "type": "warning",
             "condition": "input.debug_and_release == 'yes' && !config.darwin && !config.win32",
-            "message": "-debug-and-release is only supported on Darwin and Windows platforms.
-Qt can be built in release mode with separate debug information, so
--debug-and-release is no longer necessary."
+            "message": "-debug-and-release is only supported on Darwin and Windows platforms.  Qt can be built in release mode with separate debug information, so -debug-and-release is no longer necessary."
         },
         {
             "type": "error",
@@ -1468,9 +1465,7 @@ Qt can be built in release mode with separate debug information, so
         {
             "type": "note",
             "condition": "!features.shared",
-            "message": "Using static linking will disable the use of dynamically
-loaded plugins. Make sure to import all needed static plugins,
-or compile needed modules into the library."
+            "message": "Using static linking will disable the use of dynamically loaded plugins. Make sure to import all needed static plugins, or compile needed modules into the library."
         },
         {
             "type": "note",
@@ -1480,8 +1475,7 @@ or compile needed modules into the library."
         {
             "type": "note",
             "condition": "input.qreal == 'double' && arch.arm",
-            "message": "Qt is using double for qreal on this system. This is binary-incompatible against Qt 5.1.
-Configure with '-qreal float' to create a build that is binary-compatible with 5.1."
+            "message": "Qt is using double for qreal on this system. This is binary-incompatible against Qt 5.1.  Configure with '-qreal float' to create a build that is binary-compatible with 5.1."
         },
         {
             "type": "error",
diff --git a/configure.pri b/configure.pri
index e775bf046e..582d80ef91 100644
--- a/configure.pri
+++ b/configure.pri
@@ -706,7 +706,6 @@ defineReplace(printInstallPaths) {
         $$printInstallPath(LibraryExecutables, libexecdir, $$DEFAULT_LIBEXEC) \
         $$printInstallPath(Binaries, bindir, bin) \
         $$printInstallPath(Plugins, plugindir, plugins) \
-        $$printInstallPath(Imports, importdir, imports) \
         $$printInstallPath(Qml2Imports, qmldir, qml) \
         $$printInstallPath(ArchData, archdatadir, .) \
         $$printInstallPath(Data, datadir, .) \
@@ -807,7 +806,6 @@ defineTest(qtConfOutput_preparePaths) {
         archdata_pfx = $$config.rel_input.archdatadir/
     processQtPath("", libexecdir, $${archdata_pfx}$$DEFAULT_LIBEXEC)
     processQtPath("", plugindir, $${archdata_pfx}plugins)
-    processQtPath("", importdir, $${archdata_pfx}imports)
     processQtPath("", qmldir, $${archdata_pfx}qml)
     processQtPath("", sysconfdir, $$DEFAULT_SYSCONFDIR)
     $$have_hostprefix {
@@ -853,7 +851,6 @@ defineTest(qtConfOutput_preparePaths) {
     addConfStr($$config.rel_input.libexecdir)
     addConfStr($$config.rel_input.bindir)
     addConfStr($$config.rel_input.plugindir)
-    addConfStr($$config.rel_input.importdir)
     addConfStr($$config.rel_input.qmldir)
     addConfStr($$config.rel_input.archdatadir)
     addConfStr($$config.rel_input.datadir)
diff --git a/dependencies.yaml b/dependencies.yaml
new file mode 100644
index 0000000000..c093387ce0
--- /dev/null
+++ b/dependencies.yaml
@@ -0,0 +1 @@
+dependencies: {}
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
new file mode 100644
index 0000000000..81f1017dde
--- /dev/null
+++ b/doc/CMakeLists.txt
@@ -0,0 +1,8 @@
+# special case skip regeneration
+#
+# Copy/Install doc configuration files to the build/install directory
+#
+qt_path_join(doc_install_dir ${QT_INSTALL_DIR} ${INSTALL_DOCDIR})
+qt_copy_or_install(DIRECTORY global DESTINATION ${doc_install_dir})
+qt_copy_or_install(DIRECTORY config DESTINATION ${doc_install_dir})
+
diff --git a/doc/global/macros.qdocconf b/doc/global/macros.qdocconf
index f553cd8e14..3a525224c1 100644
--- a/doc/global/macros.qdocconf
+++ b/doc/global/macros.qdocconf
@@ -18,6 +18,7 @@ macro.nullptr             = "\\c{nullptr}"
 macro.QA                  = "\\e{Qt Assistant}"
 macro.QD                  = "\\e{Qt Designer}"
 macro.QL                  = "\\e{Qt Linguist}"
+macro.Q_OBJECT            = "Q_OBJECT"
 macro.QQV                 = "\\e{Qt QML Viewer}"
 macro.QtVersion           = "$QT_VERSION"
 macro.QtVer               = "$QT_VER"
diff --git a/doc/src/portingguide-5-to-6.qdoc b/doc/src/portingguide-5-to-6.qdoc
new file mode 100644
index 0000000000..8a6ea34b56
--- /dev/null
+++ b/doc/src/portingguide-5-to-6.qdoc
@@ -0,0 +1,54 @@
+/****************************************************************************
+**
+** Copyright (C) 2019 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:FDL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Free Documentation License Usage
+** Alternatively, this file may be used under the terms of the GNU Free
+** Documentation License version 1.3 as published by the Free Software
+** Foundation and appearing in the file included in the packaging of
+** this file. Please review the following information to ensure
+** the GNU Free Documentation License version 1.3 requirements
+** will be met: https://www.gnu.org/licenses/fdl-1.3.html.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+\page portingguide.html
+\title Porting Qt5 to Qt6 Guide
+\brief Provides guidance to migrate your Qt 5 application to Qt 6.
+
+Qt 6 is a result of the conscious effort to make this C++ framework more
+efficient and easy to use. This release replaces quite a few legacy APIs with
+more meaningful ones, such as the newer version of Qt Quick.
+
+We try to maintain binary and source compatibility for all the public APIs in
+each release, but some changes were inevitable in an effort to make Qt a
+better framework. In this topic, we try to summarize those changes and
+provide guidance to handle them.
+
+The following list summarizes the changes in Qt 6:
+\list
+   \li The major version number.
+\endlist
+
+\section1 Related Topics
+\list
+\li \l {C++ API Changes}
+\li \l {Porting C++ Applications to Qt 6}
+\li \l {Porting QML Applications to Qt 6}
+\li \l {Porting QML Applications to Qt 6 Example}
+\endlist
+*/
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
new file mode 100644
index 0000000000..b473828415
--- /dev/null
+++ b/examples/CMakeLists.txt
@@ -0,0 +1,54 @@
+# special case begin
+qt_examples_build_begin()
+
+# special case end
+
+# Generated from examples.pro.
+
+add_subdirectory(corelib)
+add_subdirectory(embedded)
+add_subdirectory(qpa)
+
+if(TARGET Qt::DBus)
+    add_subdirectory(dbus)
+endif()
+
+if(TARGET Qt::Network)
+    add_subdirectory(network)
+endif()
+
+if(TARGET Qt::Test)
+    add_subdirectory(qtestlib)
+endif()
+
+if(TARGET Qt::Concurrent)
+    add_subdirectory(qtconcurrent)
+endif()
+
+if(TARGET Qt::Sql)
+    add_subdirectory(sql)
+endif()
+
+if(TARGET Qt::Widgets)
+    add_subdirectory(widgets)
+endif()
+
+if(TARGET Qt::Xml)
+    add_subdirectory(xml)
+endif()
+
+if(TARGET Qt::Gui)
+    add_subdirectory(gui)
+
+    if(QT_FEATURE_opengl)
+        add_subdirectory(opengl)
+    endif()
+
+    if(QT_FEATURE_vulkan)
+        add_subdirectory(vulkan)
+    endif()
+endif()
+
+# special case begin
+qt_examples_build_end()
+# special case end
diff --git a/examples/corelib/CMakeLists.txt b/examples/corelib/CMakeLists.txt
new file mode 100644
index 0000000000..5e24def251
--- /dev/null
+++ b/examples/corelib/CMakeLists.txt
@@ -0,0 +1,10 @@
+# Generated from corelib.pro.
+
+add_subdirectory(ipc)
+add_subdirectory(mimetypes)
+add_subdirectory(serialization)
+add_subdirectory(tools)
+
+if(QT_FEATURE_thread)
+    add_subdirectory(threads)
+endif()
diff --git a/examples/corelib/ipc/CMakeLists.txt b/examples/corelib/ipc/CMakeLists.txt
new file mode 100644
index 0000000000..b134a3aa17
--- /dev/null
+++ b/examples/corelib/ipc/CMakeLists.txt
@@ -0,0 +1,14 @@
+# Generated from ipc.pro.
+
+
+if(QT_FEATURE_sharedmemory)
+    add_subdirectory(sharedmemory)
+endif()
+
+if(TARGET Qt::Network)
+
+    if(QT_FEATURE_localserver)
+        add_subdirectory(localfortuneserver)
+        add_subdirectory(localfortuneclient)
+    endif()
+endif()
diff --git a/examples/corelib/ipc/localfortuneclient/CMakeLists.txt b/examples/corelib/ipc/localfortuneclient/CMakeLists.txt
new file mode 100644
index 0000000000..4c011e751b
--- /dev/null
+++ b/examples/corelib/ipc/localfortuneclient/CMakeLists.txt
@@ -0,0 +1,34 @@
+# Generated from localfortuneclient.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(localfortuneclient LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/corelib/ipc/localfortuneclient")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Network)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(localfortuneclient
+    client.cpp client.h
+    main.cpp
+)
+target_link_libraries(localfortuneclient PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Network
+    Qt::Widgets
+)
+
+install(TARGETS localfortuneclient
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/corelib/ipc/localfortuneserver/CMakeLists.txt b/examples/corelib/ipc/localfortuneserver/CMakeLists.txt
new file mode 100644
index 0000000000..014df19185
--- /dev/null
+++ b/examples/corelib/ipc/localfortuneserver/CMakeLists.txt
@@ -0,0 +1,34 @@
+# Generated from localfortuneserver.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(localfortuneserver LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/corelib/ipc/localfortuneserver")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Network)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(localfortuneserver
+    main.cpp
+    server.cpp server.h
+)
+target_link_libraries(localfortuneserver PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Network
+    Qt::Widgets
+)
+
+install(TARGETS localfortuneserver
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/corelib/ipc/sharedmemory/CMakeLists.txt b/examples/corelib/ipc/sharedmemory/CMakeLists.txt
new file mode 100644
index 0000000000..6db5ea1a3b
--- /dev/null
+++ b/examples/corelib/ipc/sharedmemory/CMakeLists.txt
@@ -0,0 +1,32 @@
+# Generated from sharedmemory.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(sharedmemory LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/corelib/ipc/sharedmemory")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(sharedmemory
+    dialog.cpp dialog.h dialog.ui
+    main.cpp
+)
+target_link_libraries(sharedmemory PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+install(TARGETS sharedmemory
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/corelib/mimetypes/CMakeLists.txt b/examples/corelib/mimetypes/CMakeLists.txt
new file mode 100644
index 0000000000..0b31e0db69
--- /dev/null
+++ b/examples/corelib/mimetypes/CMakeLists.txt
@@ -0,0 +1,6 @@
+# Generated from mimetypes.pro.
+
+
+if(TARGET Qt::Widgets)
+    add_subdirectory(mimetypebrowser)
+endif()
diff --git a/examples/corelib/mimetypes/mimetypebrowser/CMakeLists.txt b/examples/corelib/mimetypes/mimetypebrowser/CMakeLists.txt
new file mode 100644
index 0000000000..b62df6dd1e
--- /dev/null
+++ b/examples/corelib/mimetypes/mimetypebrowser/CMakeLists.txt
@@ -0,0 +1,33 @@
+# Generated from mimetypebrowser.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(mimetypebrowser LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/corelib/mimetypes/mimetypebrowser")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_executable(mimetypebrowser
+    main.cpp
+    mainwindow.cpp mainwindow.h
+    mimetypemodel.cpp mimetypemodel.h
+)
+target_link_libraries(mimetypebrowser PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+install(TARGETS mimetypebrowser
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/corelib/serialization/CMakeLists.txt b/examples/corelib/serialization/CMakeLists.txt
new file mode 100644
index 0000000000..a64b5130d2
--- /dev/null
+++ b/examples/corelib/serialization/CMakeLists.txt
@@ -0,0 +1,5 @@
+# Generated from serialization.pro.
+
+add_subdirectory(cbordump)
+add_subdirectory(convert)
+add_subdirectory(savegame)
diff --git a/examples/corelib/serialization/cbordump/CMakeLists.txt b/examples/corelib/serialization/cbordump/CMakeLists.txt
new file mode 100644
index 0000000000..98b5044b4a
--- /dev/null
+++ b/examples/corelib/serialization/cbordump/CMakeLists.txt
@@ -0,0 +1,27 @@
+# Generated from cbordump.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(cbordump LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/corelib/serialization/cbordump")
+
+find_package(Qt6 COMPONENTS Core)
+
+add_executable(cbordump
+    main.cpp
+)
+target_link_libraries(cbordump PUBLIC
+    Qt::Core
+)
+
+install(TARGETS cbordump
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/corelib/serialization/convert/CMakeLists.txt b/examples/corelib/serialization/convert/CMakeLists.txt
new file mode 100644
index 0000000000..98d4a943d6
--- /dev/null
+++ b/examples/corelib/serialization/convert/CMakeLists.txt
@@ -0,0 +1,34 @@
+# Generated from convert.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(convert LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/corelib/serialization/convert")
+
+find_package(Qt6 COMPONENTS Core)
+
+add_executable(convert
+    cborconverter.cpp cborconverter.h
+    converter.h
+    datastreamconverter.cpp datastreamconverter.h
+    jsonconverter.cpp jsonconverter.h
+    main.cpp
+    nullconverter.cpp nullconverter.h
+    textconverter.cpp textconverter.h
+    xmlconverter.cpp xmlconverter.h
+)
+target_link_libraries(convert PUBLIC
+    Qt::Core
+)
+
+install(TARGETS convert
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/corelib/serialization/savegame/CMakeLists.txt b/examples/corelib/serialization/savegame/CMakeLists.txt
new file mode 100644
index 0000000000..10851d55fd
--- /dev/null
+++ b/examples/corelib/serialization/savegame/CMakeLists.txt
@@ -0,0 +1,30 @@
+# Generated from savegame.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(savegame LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/corelib/serialization/savegame")
+
+find_package(Qt6 COMPONENTS Core)
+
+add_executable(savegame
+    character.cpp character.h
+    game.cpp game.h
+    level.cpp level.h
+    main.cpp
+)
+target_link_libraries(savegame PUBLIC
+    Qt::Core
+)
+
+install(TARGETS savegame
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/corelib/threads/CMakeLists.txt b/examples/corelib/threads/CMakeLists.txt
new file mode 100644
index 0000000000..b13dd16d93
--- /dev/null
+++ b/examples/corelib/threads/CMakeLists.txt
@@ -0,0 +1,9 @@
+# Generated from threads.pro.
+
+add_subdirectory(semaphores)
+add_subdirectory(waitconditions)
+
+if(TARGET Qt::Widgets)
+    add_subdirectory(mandelbrot)
+    add_subdirectory(queuedcustomtype)
+endif()
diff --git a/examples/corelib/threads/mandelbrot/CMakeLists.txt b/examples/corelib/threads/mandelbrot/CMakeLists.txt
new file mode 100644
index 0000000000..515eb3ed93
--- /dev/null
+++ b/examples/corelib/threads/mandelbrot/CMakeLists.txt
@@ -0,0 +1,39 @@
+# Generated from mandelbrot.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(mandelbrot LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/corelib/threads/mandelbrot")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(mandelbrot
+    main.cpp
+    mandelbrotwidget.cpp mandelbrotwidget.h
+    renderthread.cpp renderthread.h
+)
+target_link_libraries(mandelbrot PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+if(UNIX AND NOT APPLE AND NOT HAIKU AND NOT INTEGRITY AND NOT VXWORKS)
+    target_link_libraries(mandelbrot PUBLIC
+        m
+    )
+endif()
+
+install(TARGETS mandelbrot
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/corelib/threads/queuedcustomtype/CMakeLists.txt b/examples/corelib/threads/queuedcustomtype/CMakeLists.txt
new file mode 100644
index 0000000000..cc4ff1bd4a
--- /dev/null
+++ b/examples/corelib/threads/queuedcustomtype/CMakeLists.txt
@@ -0,0 +1,34 @@
+# Generated from queuedcustomtype.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(queuedcustomtype LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/corelib/threads/queuedcustomtype")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(queuedcustomtype
+    block.cpp block.h
+    main.cpp
+    renderthread.cpp renderthread.h
+    window.cpp window.h
+)
+target_link_libraries(queuedcustomtype PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+install(TARGETS queuedcustomtype
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/corelib/threads/semaphores/CMakeLists.txt b/examples/corelib/threads/semaphores/CMakeLists.txt
new file mode 100644
index 0000000000..15b5dc56b9
--- /dev/null
+++ b/examples/corelib/threads/semaphores/CMakeLists.txt
@@ -0,0 +1,27 @@
+# Generated from semaphores.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(semaphores LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/corelib/threads/semaphores")
+
+find_package(Qt6 COMPONENTS Core)
+
+add_executable(semaphores
+    semaphores.cpp
+)
+target_link_libraries(semaphores PUBLIC
+    Qt::Core
+)
+
+install(TARGETS semaphores
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/corelib/threads/waitconditions/CMakeLists.txt b/examples/corelib/threads/waitconditions/CMakeLists.txt
new file mode 100644
index 0000000000..0b6d889d77
--- /dev/null
+++ b/examples/corelib/threads/waitconditions/CMakeLists.txt
@@ -0,0 +1,27 @@
+# Generated from waitconditions.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(waitconditions LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/corelib/threads/waitconditions")
+
+find_package(Qt6 COMPONENTS Core)
+
+add_executable(waitconditions
+    waitconditions.cpp
+)
+target_link_libraries(waitconditions PUBLIC
+    Qt::Core
+)
+
+install(TARGETS waitconditions
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/corelib/tools/CMakeLists.txt b/examples/corelib/tools/CMakeLists.txt
new file mode 100644
index 0000000000..d25014ee3c
--- /dev/null
+++ b/examples/corelib/tools/CMakeLists.txt
@@ -0,0 +1,5 @@
+# Generated from tools.pro.
+
+add_subdirectory(contiguouscache)
+add_subdirectory(customtype)
+add_subdirectory(customtypesending)
diff --git a/examples/corelib/tools/contiguouscache/CMakeLists.txt b/examples/corelib/tools/contiguouscache/CMakeLists.txt
new file mode 100644
index 0000000000..1e7a3350c2
--- /dev/null
+++ b/examples/corelib/tools/contiguouscache/CMakeLists.txt
@@ -0,0 +1,32 @@
+# Generated from contiguouscache.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(contiguouscache LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/corelib/tools/contiguouscache")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(contiguouscache
+    main.cpp
+    randomlistmodel.cpp randomlistmodel.h
+)
+target_link_libraries(contiguouscache PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+install(TARGETS contiguouscache
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/corelib/tools/customtype/CMakeLists.txt b/examples/corelib/tools/customtype/CMakeLists.txt
new file mode 100644
index 0000000000..74969ed2ea
--- /dev/null
+++ b/examples/corelib/tools/customtype/CMakeLists.txt
@@ -0,0 +1,32 @@
+# Generated from customtype.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(customtype LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/corelib/tools/customtype")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(customtype
+    main.cpp
+    message.cpp message.h
+)
+target_link_libraries(customtype PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+install(TARGETS customtype
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/corelib/tools/customtypesending/CMakeLists.txt b/examples/corelib/tools/customtypesending/CMakeLists.txt
new file mode 100644
index 0000000000..1456eaf5dc
--- /dev/null
+++ b/examples/corelib/tools/customtypesending/CMakeLists.txt
@@ -0,0 +1,33 @@
+# Generated from customtypesending.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(customtypesending LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/corelib/tools/customtypesending")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(customtypesending
+    main.cpp
+    message.cpp message.h
+    window.cpp window.h
+)
+target_link_libraries(customtypesending PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+install(TARGETS customtypesending
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/dbus/CMakeLists.txt b/examples/dbus/CMakeLists.txt
new file mode 100644
index 0000000000..42a3df658a
--- /dev/null
+++ b/examples/dbus/CMakeLists.txt
@@ -0,0 +1,13 @@
+# Generated from dbus.pro.
+
+add_subdirectory(listnames)
+add_subdirectory(pingpong)
+
+if(QT_FEATURE_process)
+    add_subdirectory(complexpingpong)
+endif()
+
+if(TARGET Qt::Widgets)
+    add_subdirectory(chat)
+    add_subdirectory(remotecontrolledcar)
+endif()
diff --git a/examples/dbus/chat/.prev_CMakeLists.txt b/examples/dbus/chat/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..7889868753
--- /dev/null
+++ b/examples/dbus/chat/.prev_CMakeLists.txt
@@ -0,0 +1,35 @@
+# Generated from chat.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(chat LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/dbus/chat")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS DBus)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(chat
+    chat.cpp chat.h
+    chatmainwindow.ui
+    chatsetnickname.ui
+)
+target_link_libraries(chat PUBLIC
+    Qt::Core
+    Qt::DBus
+    Qt::Gui
+    Qt::Widgets
+)
+
+install(TARGETS chat
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/dbus/chat/CMakeLists.txt b/examples/dbus/chat/CMakeLists.txt
new file mode 100644
index 0000000000..f2fb0a55f8
--- /dev/null
+++ b/examples/dbus/chat/CMakeLists.txt
@@ -0,0 +1,49 @@
+# Generated from chat.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(chat LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/dbus/chat")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS DBus)
+find_package(Qt6 COMPONENTS Widgets)
+
+# special case begin
+set(chat_SRCS)
+qt6_add_dbus_interface(chat_SRCS
+    org.example.chat.xml
+    chat_interface
+)
+qt6_add_dbus_adaptor(chat_SRCS
+    org.example.chat.xml
+    qobject.h
+    QObject
+    chat_adaptor
+)
+# special case end
+add_qt_gui_executable(chat
+    chat.cpp chat.h
+    chatmainwindow.ui
+    chatsetnickname.ui
+    ${chat_SRCS} # special case
+)
+target_link_libraries(chat PUBLIC
+    Qt::Core
+    Qt::DBus
+    Qt::Gui
+    Qt::Widgets
+)
+
+install(TARGETS chat
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/dbus/complexpingpong/CMakeLists.txt b/examples/dbus/complexpingpong/CMakeLists.txt
new file mode 100644
index 0000000000..01a824e5e7
--- /dev/null
+++ b/examples/dbus/complexpingpong/CMakeLists.txt
@@ -0,0 +1,27 @@
+# Generated from complexpong.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(complexpong LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples")
+
+find_package(Qt6 COMPONENTS DBus)
+
+add_qt_gui_executable(complexpong
+    complexpong.cpp complexpong.h
+)
+target_link_libraries(complexpong PUBLIC
+    # Remove: gui
+    Qt::DBus
+)
+install(TARGETS complexpong
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/dbus/listnames/CMakeLists.txt b/examples/dbus/listnames/CMakeLists.txt
new file mode 100644
index 0000000000..acc1db632c
--- /dev/null
+++ b/examples/dbus/listnames/CMakeLists.txt
@@ -0,0 +1,29 @@
+# Generated from listnames.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(listnames LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/dbus/listnames")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS DBus)
+
+add_qt_gui_executable(listnames
+    listnames.cpp
+)
+target_link_libraries(listnames PUBLIC
+    Qt::Core
+    Qt::DBus
+)
+
+install(TARGETS listnames
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/dbus/pingpong/CMakeLists.txt b/examples/dbus/pingpong/CMakeLists.txt
new file mode 100644
index 0000000000..6a2a84e974
--- /dev/null
+++ b/examples/dbus/pingpong/CMakeLists.txt
@@ -0,0 +1,28 @@
+# Generated from pong.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(pong LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples")
+
+find_package(Qt6 COMPONENTS DBus)
+
+add_qt_gui_executable(pong
+    ping-common.h
+    pong.cpp pong.h
+)
+target_link_libraries(pong PUBLIC
+    # Remove: gui
+    Qt::DBus
+)
+install(TARGETS pong
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/dbus/remotecontrolledcar/CMakeLists.txt b/examples/dbus/remotecontrolledcar/CMakeLists.txt
new file mode 100644
index 0000000000..4d41919962
--- /dev/null
+++ b/examples/dbus/remotecontrolledcar/CMakeLists.txt
@@ -0,0 +1,4 @@
+# Generated from remotecontrolledcar.pro.
+
+add_subdirectory(car)
+add_subdirectory(controller)
diff --git a/examples/dbus/remotecontrolledcar/car/.prev_CMakeLists.txt b/examples/dbus/remotecontrolledcar/car/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..a028cbcb43
--- /dev/null
+++ b/examples/dbus/remotecontrolledcar/car/.prev_CMakeLists.txt
@@ -0,0 +1,34 @@
+# Generated from car.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(car LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/dbus/remotecontrolledcar/car")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS DBus)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(car
+    car.cpp car.h
+    main.cpp
+)
+target_link_libraries(car PUBLIC
+    Qt::Core
+    Qt::DBus
+    Qt::Gui
+    Qt::Widgets
+)
+
+install(TARGETS car
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/dbus/remotecontrolledcar/car/CMakeLists.txt b/examples/dbus/remotecontrolledcar/car/CMakeLists.txt
new file mode 100644
index 0000000000..8be7f9ebd1
--- /dev/null
+++ b/examples/dbus/remotecontrolledcar/car/CMakeLists.txt
@@ -0,0 +1,44 @@
+# Generated from car.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(car LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/dbus/remotecontrolledcar/car")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS DBus)
+find_package(Qt6 COMPONENTS Widgets)
+
+# special case begin
+set(car_SRCS)
+qt6_add_dbus_adaptor(car_SRCS
+    car.xml
+    car.h
+    Car
+    car_adaptor
+)
+# special case end
+add_qt_gui_executable(car
+    car.cpp car.h
+    main.cpp
+    ${car_SRCS} # special case
+)
+target_link_libraries(car PUBLIC
+    Qt::Core
+    Qt::DBus
+    Qt::Gui
+    Qt::Widgets
+)
+
+install(TARGETS car
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/dbus/remotecontrolledcar/controller/.prev_CMakeLists.txt b/examples/dbus/remotecontrolledcar/controller/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..65c32e7c07
--- /dev/null
+++ b/examples/dbus/remotecontrolledcar/controller/.prev_CMakeLists.txt
@@ -0,0 +1,34 @@
+# Generated from controller.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(controller LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/dbus/remotecontrolledcar/controller")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS DBus)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(controller
+    controller.cpp controller.h controller.ui
+    main.cpp
+)
+target_link_libraries(controller PUBLIC
+    Qt::Core
+    Qt::DBus
+    Qt::Gui
+    Qt::Widgets
+)
+
+install(TARGETS controller
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/dbus/remotecontrolledcar/controller/CMakeLists.txt b/examples/dbus/remotecontrolledcar/controller/CMakeLists.txt
new file mode 100644
index 0000000000..5ad9d2e51d
--- /dev/null
+++ b/examples/dbus/remotecontrolledcar/controller/CMakeLists.txt
@@ -0,0 +1,42 @@
+# Generated from controller.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(controller LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/dbus/remotecontrolledcar/controller")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS DBus)
+find_package(Qt6 COMPONENTS Widgets)
+
+# special case begin
+set(controller_SRCS)
+qt6_add_dbus_interface(controller_SRCS
+    car.xml
+    car_interface
+)
+# special case end
+add_qt_gui_executable(controller
+    controller.cpp controller.h controller.ui
+    main.cpp
+    ${controller_SRCS} # special case
+)
+target_link_libraries(controller PUBLIC
+    Qt::Core
+    Qt::DBus
+    Qt::Gui
+    Qt::Widgets
+)
+
+install(TARGETS controller
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/embedded/CMakeLists.txt b/examples/embedded/CMakeLists.txt
new file mode 100644
index 0000000000..bd7720809a
--- /dev/null
+++ b/examples/embedded/CMakeLists.txt
@@ -0,0 +1,8 @@
+# Generated from embedded.pro.
+
+add_subdirectory(styleexample)
+add_subdirectory(raycasting)
+add_subdirectory(flickable)
+add_subdirectory(digiflip)
+add_subdirectory(lightmaps)
+add_subdirectory(flightinfo)
diff --git a/examples/embedded/digiflip/CMakeLists.txt b/examples/embedded/digiflip/CMakeLists.txt
new file mode 100644
index 0000000000..cfad2a7c7b
--- /dev/null
+++ b/examples/embedded/digiflip/CMakeLists.txt
@@ -0,0 +1,31 @@
+# Generated from digiflip.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(digiflip LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/embedded/digiflip")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(digiflip
+    digiflip.cpp
+)
+target_link_libraries(digiflip PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+install(TARGETS digiflip
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/embedded/flickable/CMakeLists.txt b/examples/embedded/flickable/CMakeLists.txt
new file mode 100644
index 0000000000..bae3146723
--- /dev/null
+++ b/examples/embedded/flickable/CMakeLists.txt
@@ -0,0 +1,32 @@
+# Generated from flickable.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(flickable LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/embedded/flickable")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(flickable
+    flickable.cpp flickable.h
+    main.cpp
+)
+target_link_libraries(flickable PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+install(TARGETS flickable
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/embedded/flightinfo/.prev_CMakeLists.txt b/examples/embedded/flightinfo/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..f7898e8ed8
--- /dev/null
+++ b/examples/embedded/flightinfo/.prev_CMakeLists.txt
@@ -0,0 +1,47 @@
+# Generated from flightinfo.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(flightinfo LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/embedded/flightinfo")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Network)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(flightinfo
+    flightinfo.cpp
+    form.ui
+)
+target_link_libraries(flightinfo PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Network
+    Qt::Widgets
+)
+
+
+# Resources:
+set(flightinfo_resource_files
+    "aircraft.png"
+)
+
+qt6_add_resources(flightinfo "flightinfo"
+    PREFIX
+        "/"
+    FILES
+        ${flightinfo_resource_files}
+)
+
+install(TARGETS flightinfo
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/embedded/flightinfo/CMakeLists.txt b/examples/embedded/flightinfo/CMakeLists.txt
new file mode 100644
index 0000000000..f7898e8ed8
--- /dev/null
+++ b/examples/embedded/flightinfo/CMakeLists.txt
@@ -0,0 +1,47 @@
+# Generated from flightinfo.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(flightinfo LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/embedded/flightinfo")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Network)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(flightinfo
+    flightinfo.cpp
+    form.ui
+)
+target_link_libraries(flightinfo PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Network
+    Qt::Widgets
+)
+
+
+# Resources:
+set(flightinfo_resource_files
+    "aircraft.png"
+)
+
+qt6_add_resources(flightinfo "flightinfo"
+    PREFIX
+        "/"
+    FILES
+        ${flightinfo_resource_files}
+)
+
+install(TARGETS flightinfo
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/embedded/lightmaps/CMakeLists.txt b/examples/embedded/lightmaps/CMakeLists.txt
new file mode 100644
index 0000000000..641f75c3c8
--- /dev/null
+++ b/examples/embedded/lightmaps/CMakeLists.txt
@@ -0,0 +1,36 @@
+# Generated from lightmaps.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(lightmaps LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/embedded/lightmaps")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Network)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(lightmaps
+    lightmaps.cpp lightmaps.h
+    main.cpp
+    mapzoom.cpp mapzoom.h
+    slippymap.cpp slippymap.h
+)
+target_link_libraries(lightmaps PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Network
+    Qt::Widgets
+)
+
+install(TARGETS lightmaps
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/embedded/raycasting/CMakeLists.txt b/examples/embedded/raycasting/CMakeLists.txt
new file mode 100644
index 0000000000..86a3042f86
--- /dev/null
+++ b/examples/embedded/raycasting/CMakeLists.txt
@@ -0,0 +1,44 @@
+# Generated from raycasting.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(raycasting LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/embedded/raycasting")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(raycasting
+    raycasting.cpp
+)
+target_link_libraries(raycasting PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+
+# Resources:
+set(raycasting_resource_files
+    "textures.png"
+)
+
+qt6_add_resources(raycasting "raycasting"
+    PREFIX
+        "/"
+    FILES
+        ${raycasting_resource_files}
+)
+
+install(TARGETS raycasting
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/embedded/styleexample/.prev_CMakeLists.txt b/examples/embedded/styleexample/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..ac03e58346
--- /dev/null
+++ b/examples/embedded/styleexample/.prev_CMakeLists.txt
@@ -0,0 +1,52 @@
+# Generated from styleexample.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(styleexample LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/embedded/styleexample")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(styleexample
+    main.cpp
+    stylewidget.cpp stylewidget.h stylewidget.ui
+)
+target_link_libraries(styleexample PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+
+# Resources:
+set(styleexample_resource_files
+    "files/add.png"
+    "files/application.qss"
+    "files/blue.qss"
+    "files/khaki.qss"
+    "files/nature_1.jpg"
+    "files/nostyle.qss"
+    "files/remove.png"
+    "files/transparent.qss"
+)
+
+qt6_add_resources(styleexample "styleexample"
+    PREFIX
+        "/"
+    FILES
+        ${styleexample_resource_files}
+)
+
+install(TARGETS styleexample
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/embedded/styleexample/CMakeLists.txt b/examples/embedded/styleexample/CMakeLists.txt
new file mode 100644
index 0000000000..ac03e58346
--- /dev/null
+++ b/examples/embedded/styleexample/CMakeLists.txt
@@ -0,0 +1,52 @@
+# Generated from styleexample.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(styleexample LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/embedded/styleexample")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(styleexample
+    main.cpp
+    stylewidget.cpp stylewidget.h stylewidget.ui
+)
+target_link_libraries(styleexample PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+
+# Resources:
+set(styleexample_resource_files
+    "files/add.png"
+    "files/application.qss"
+    "files/blue.qss"
+    "files/khaki.qss"
+    "files/nature_1.jpg"
+    "files/nostyle.qss"
+    "files/remove.png"
+    "files/transparent.qss"
+)
+
+qt6_add_resources(styleexample "styleexample"
+    PREFIX
+        "/"
+    FILES
+        ${styleexample_resource_files}
+)
+
+install(TARGETS styleexample
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/gui/CMakeLists.txt b/examples/gui/CMakeLists.txt
new file mode 100644
index 0000000000..7631777ef4
--- /dev/null
+++ b/examples/gui/CMakeLists.txt
@@ -0,0 +1,7 @@
+# Generated from gui.pro.
+
+if(NOT TARGET Qt::Gui)
+    return()
+endif()
+add_subdirectory(analogclock)
+add_subdirectory(rasterwindow)
diff --git a/examples/gui/analogclock/.prev_CMakeLists.txt b/examples/gui/analogclock/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..b71892d1b8
--- /dev/null
+++ b/examples/gui/analogclock/.prev_CMakeLists.txt
@@ -0,0 +1,34 @@
+# Generated from analogclock.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(analogclock LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/gui/analogclock")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+
+add_qt_gui_executable(analogclock
+    ../rasterwindow/rasterwindow.cpp ../rasterwindow/rasterwindow.h
+    main.cpp
+)
+target_include_directories(analogclock PUBLIC
+    ../rasterwindow
+)
+
+target_link_libraries(analogclock PUBLIC
+    Qt::Core
+    Qt::Gui
+)
+
+install(TARGETS analogclock
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/gui/analogclock/CMakeLists.txt b/examples/gui/analogclock/CMakeLists.txt
new file mode 100644
index 0000000000..d5605ab8ba
--- /dev/null
+++ b/examples/gui/analogclock/CMakeLists.txt
@@ -0,0 +1,41 @@
+# Generated from analogclock.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(analogclock LANGUAGES CXX)
+
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/gui/gui_analogclock") # special case
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets) # special case: add
+
+add_qt_gui_executable(gui_analogclock # special case: renamed target
+    ../rasterwindow/rasterwindow.cpp ../rasterwindow/rasterwindow.h
+    main.cpp
+)
+target_include_directories(gui_analogclock PUBLIC # special case
+    ../rasterwindow
+)
+# special case begin
+target_link_libraries(gui_analogclock PUBLIC # special case
+    Qt::Gui
+)
+# special case end
+
+target_link_libraries(gui_analogclock PUBLIC # special case
+    Qt::Core
+    Qt::Gui
+)
+
+install(TARGETS gui_analogclock # special case
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/gui/gui.pro b/examples/gui/gui.pro
index b8080c2075..275adc804d 100644
--- a/examples/gui/gui.pro
+++ b/examples/gui/gui.pro
@@ -6,5 +6,3 @@ CONFIG += no_docs_target
 
 SUBDIRS += analogclock
 SUBDIRS += rasterwindow
-qtHaveModule(gui):qtConfig(opengl): \
-    SUBDIRS += openglwindow
diff --git a/examples/gui/openglwindow/openglwindow.pri b/examples/gui/openglwindow/openglwindow.pri
deleted file mode 100644
index 45b0b0cd29..0000000000
--- a/examples/gui/openglwindow/openglwindow.pri
+++ /dev/null
@@ -1,3 +0,0 @@
-INCLUDEPATH += $$PWD
-SOURCES += $$PWD/openglwindow.cpp
-HEADERS += $$PWD/openglwindow.h
diff --git a/examples/gui/openglwindow/openglwindow.pro b/examples/gui/openglwindow/openglwindow.pro
deleted file mode 100644
index 93f18f3d3f..0000000000
--- a/examples/gui/openglwindow/openglwindow.pro
+++ /dev/null
@@ -1,7 +0,0 @@
-include(openglwindow.pri)
-
-SOURCES += \
-    main.cpp
-
-target.path = $$[QT_INSTALL_EXAMPLES]/gui/openglwindow
-INSTALLS += target
diff --git a/examples/gui/rasterwindow/.prev_CMakeLists.txt b/examples/gui/rasterwindow/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..3f27ea597c
--- /dev/null
+++ b/examples/gui/rasterwindow/.prev_CMakeLists.txt
@@ -0,0 +1,34 @@
+# Generated from rasterwindow.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(rasterwindow LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/gui/rasterwindow")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+
+add_qt_gui_executable(rasterwindow
+    main.cpp
+    rasterwindow.cpp rasterwindow.h
+)
+target_include_directories(rasterwindow PUBLIC
+    ${CMAKE_CURRENT_SOURCE_DIR}
+)
+
+target_link_libraries(rasterwindow PUBLIC
+    Qt::Core
+    Qt::Gui
+)
+
+install(TARGETS rasterwindow
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/gui/rasterwindow/CMakeLists.txt b/examples/gui/rasterwindow/CMakeLists.txt
new file mode 100644
index 0000000000..555578725e
--- /dev/null
+++ b/examples/gui/rasterwindow/CMakeLists.txt
@@ -0,0 +1,35 @@
+# Generated from rasterwindow.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(rasterwindow LANGUAGES CXX)
+
+find_package(Qt6 COMPONENTS Widgets) # special case: add
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/gui/rasterwindow")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+
+add_qt_gui_executable(rasterwindow
+    main.cpp
+    rasterwindow.cpp rasterwindow.h
+)
+target_include_directories(rasterwindow PUBLIC
+    ${CMAKE_CURRENT_SOURCE_DIR}
+)
+target_link_libraries(rasterwindow PUBLIC
+    Qt::Core
+    Qt::Gui
+)
+
+install(TARGETS rasterwindow
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/network/CMakeLists.txt b/examples/network/CMakeLists.txt
new file mode 100644
index 0000000000..919310df9a
--- /dev/null
+++ b/examples/network/CMakeLists.txt
@@ -0,0 +1,44 @@
+# Generated from network.pro.
+
+add_subdirectory(download)
+add_subdirectory(downloadmanager)
+
+if(NOT INTEGRITY)
+    add_subdirectory(dnslookup)
+endif()
+
+if(TARGET Qt::Widgets)
+    add_subdirectory(blockingfortuneclient)
+    add_subdirectory(broadcastreceiver)
+    add_subdirectory(broadcastsender)
+    add_subdirectory(http)
+    add_subdirectory(loopback)
+    add_subdirectory(threadedfortuneserver)
+    add_subdirectory(googlesuggest)
+    # add_subdirectory(torrent) FIXME: This does not find its ui file:-/
+    add_subdirectory(multicastreceiver)
+    add_subdirectory(multicastsender)
+
+    if(QT_FEATURE_bearermanagement)
+        add_subdirectory(fortuneclient)
+        add_subdirectory(fortuneserver)
+
+        if(QT_FEATURE_processenvironment)
+            add_subdirectory(network-chat)
+        endif()
+    endif()
+
+    if(QT_FEATURE_openssl)
+        add_subdirectory(securesocketclient)
+    endif()
+
+    if(QT_FEATURE_dtls)
+        add_subdirectory(secureudpserver)
+        add_subdirectory(secureudpclient)
+    endif()
+
+    if(QT_FEATURE_sctp)
+        add_subdirectory(multistreamserver)
+        add_subdirectory(multistreamclient)
+    endif()
+endif()
diff --git a/examples/network/blockingfortuneclient/CMakeLists.txt b/examples/network/blockingfortuneclient/CMakeLists.txt
new file mode 100644
index 0000000000..d2c79bbcd2
--- /dev/null
+++ b/examples/network/blockingfortuneclient/CMakeLists.txt
@@ -0,0 +1,35 @@
+# Generated from blockingfortuneclient.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(blockingfortuneclient LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/network/blockingfortuneclient")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Network)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(blockingfortuneclient
+    blockingclient.cpp blockingclient.h
+    fortunethread.cpp fortunethread.h
+    main.cpp
+)
+target_link_libraries(blockingfortuneclient PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Network
+    Qt::Widgets
+)
+
+install(TARGETS blockingfortuneclient
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/network/broadcastreceiver/CMakeLists.txt b/examples/network/broadcastreceiver/CMakeLists.txt
new file mode 100644
index 0000000000..ea057a647b
--- /dev/null
+++ b/examples/network/broadcastreceiver/CMakeLists.txt
@@ -0,0 +1,34 @@
+# Generated from broadcastreceiver.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(broadcastreceiver LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/network/broadcastreceiver")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Network)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(broadcastreceiver
+    main.cpp
+    receiver.cpp receiver.h
+)
+target_link_libraries(broadcastreceiver PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Network
+    Qt::Widgets
+)
+
+install(TARGETS broadcastreceiver
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/network/broadcastsender/CMakeLists.txt b/examples/network/broadcastsender/CMakeLists.txt
new file mode 100644
index 0000000000..0a1885cfbb
--- /dev/null
+++ b/examples/network/broadcastsender/CMakeLists.txt
@@ -0,0 +1,34 @@
+# Generated from broadcastsender.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(broadcastsender LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/network/broadcastsender")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Network)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(broadcastsender
+    main.cpp
+    sender.cpp sender.h
+)
+target_link_libraries(broadcastsender PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Network
+    Qt::Widgets
+)
+
+install(TARGETS broadcastsender
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/network/dnslookup/CMakeLists.txt b/examples/network/dnslookup/CMakeLists.txt
new file mode 100644
index 0000000000..721d89179f
--- /dev/null
+++ b/examples/network/dnslookup/CMakeLists.txt
@@ -0,0 +1,29 @@
+# Generated from dnslookup.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(dnslookup LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/network/dnslookup")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Network)
+
+add_executable(dnslookup
+    dnslookup.cpp dnslookup.h
+)
+target_link_libraries(dnslookup PUBLIC
+    Qt::Core
+    Qt::Network
+)
+
+install(TARGETS dnslookup
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/network/download/CMakeLists.txt b/examples/network/download/CMakeLists.txt
new file mode 100644
index 0000000000..b4124fc8a3
--- /dev/null
+++ b/examples/network/download/CMakeLists.txt
@@ -0,0 +1,29 @@
+# Generated from download.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(download LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/network/download")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Network)
+
+add_executable(download
+    main.cpp
+)
+target_link_libraries(download PUBLIC
+    Qt::Core
+    Qt::Network
+)
+
+install(TARGETS download
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/network/downloadmanager/CMakeLists.txt b/examples/network/downloadmanager/CMakeLists.txt
new file mode 100644
index 0000000000..8fc16bedb5
--- /dev/null
+++ b/examples/network/downloadmanager/CMakeLists.txt
@@ -0,0 +1,31 @@
+# Generated from downloadmanager.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(downloadmanager LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/network/downloadmanager")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Network)
+
+add_executable(downloadmanager
+    downloadmanager.cpp downloadmanager.h
+    main.cpp
+    textprogressbar.cpp textprogressbar.h
+)
+target_link_libraries(downloadmanager PUBLIC
+    Qt::Core
+    Qt::Network
+)
+
+install(TARGETS downloadmanager
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/network/fortuneclient/CMakeLists.txt b/examples/network/fortuneclient/CMakeLists.txt
new file mode 100644
index 0000000000..d44e75b0ff
--- /dev/null
+++ b/examples/network/fortuneclient/CMakeLists.txt
@@ -0,0 +1,34 @@
+# Generated from fortuneclient.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(fortuneclient LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/network/fortuneclient")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Network)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(fortuneclient
+    client.cpp client.h
+    main.cpp
+)
+target_link_libraries(fortuneclient PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Network
+    Qt::Widgets
+)
+
+install(TARGETS fortuneclient
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/network/fortuneserver/CMakeLists.txt b/examples/network/fortuneserver/CMakeLists.txt
new file mode 100644
index 0000000000..2bcb9f076a
--- /dev/null
+++ b/examples/network/fortuneserver/CMakeLists.txt
@@ -0,0 +1,34 @@
+# Generated from fortuneserver.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(fortuneserver LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/network/fortuneserver")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Network)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(fortuneserver
+    main.cpp
+    server.cpp server.h
+)
+target_link_libraries(fortuneserver PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Network
+    Qt::Widgets
+)
+
+install(TARGETS fortuneserver
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/network/googlesuggest/CMakeLists.txt b/examples/network/googlesuggest/CMakeLists.txt
new file mode 100644
index 0000000000..247980601f
--- /dev/null
+++ b/examples/network/googlesuggest/CMakeLists.txt
@@ -0,0 +1,35 @@
+# Generated from googlesuggest.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(googlesuggest LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/network/googlesuggest")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Network)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(googlesuggest
+    googlesuggest.cpp googlesuggest.h
+    main.cpp
+    searchbox.cpp searchbox.h
+)
+target_link_libraries(googlesuggest PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Network
+    Qt::Widgets
+)
+
+install(TARGETS googlesuggest
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/network/http/CMakeLists.txt b/examples/network/http/CMakeLists.txt
new file mode 100644
index 0000000000..d9f50f5c9d
--- /dev/null
+++ b/examples/network/http/CMakeLists.txt
@@ -0,0 +1,45 @@
+# Generated from http.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(http LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/network/http")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Network)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(http
+    authenticationdialog.ui
+    httpwindow.cpp httpwindow.h
+    main.cpp
+)
+target_link_libraries(http PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Network
+    Qt::Widgets
+)
+
+if(ANDROID AND TARGET Qt::AndroidExtras)
+    target_compile_definitions(http PUBLIC
+        REQUEST_PERMISSIONS_ON_ANDROID
+    )
+
+    target_link_libraries(http PUBLIC
+        Qt::AndroidExtras
+    )
+endif()
+
+install(TARGETS http
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/network/loopback/CMakeLists.txt b/examples/network/loopback/CMakeLists.txt
new file mode 100644
index 0000000000..8d42284914
--- /dev/null
+++ b/examples/network/loopback/CMakeLists.txt
@@ -0,0 +1,34 @@
+# Generated from loopback.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(loopback LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/network/loopback")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Network)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(loopback
+    dialog.cpp dialog.h
+    main.cpp
+)
+target_link_libraries(loopback PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Network
+    Qt::Widgets
+)
+
+install(TARGETS loopback
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/network/multicastreceiver/CMakeLists.txt b/examples/network/multicastreceiver/CMakeLists.txt
new file mode 100644
index 0000000000..f45b1b0db2
--- /dev/null
+++ b/examples/network/multicastreceiver/CMakeLists.txt
@@ -0,0 +1,34 @@
+# Generated from multicastreceiver.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(multicastreceiver LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/network/multicastreceiver")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Network)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(multicastreceiver
+    main.cpp
+    receiver.cpp receiver.h
+)
+target_link_libraries(multicastreceiver PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Network
+    Qt::Widgets
+)
+
+install(TARGETS multicastreceiver
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/network/multicastsender/CMakeLists.txt b/examples/network/multicastsender/CMakeLists.txt
new file mode 100644
index 0000000000..5ebd7cb767
--- /dev/null
+++ b/examples/network/multicastsender/CMakeLists.txt
@@ -0,0 +1,34 @@
+# Generated from multicastsender.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(multicastsender LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/network/multicastsender")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Network)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(multicastsender
+    main.cpp
+    sender.cpp sender.h
+)
+target_link_libraries(multicastsender PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Network
+    Qt::Widgets
+)
+
+install(TARGETS multicastsender
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/network/multicastsender/sender.cpp b/examples/network/multicastsender/sender.cpp
index a542a2528f..a995bd7331 100644
--- a/examples/network/multicastsender/sender.cpp
+++ b/examples/network/multicastsender/sender.cpp
@@ -81,7 +81,7 @@ Sender::Sender(QWidget *parent)
     buttonBox->addButton(startButton, QDialogButtonBox::ActionRole);
     buttonBox->addButton(quitButton, QDialogButtonBox::RejectRole);
 
-    connect(ttlSpinBox, QOverload<int>::of(&QSpinBox::valueChanged), this, &Sender::ttlChanged);
+    connect(ttlSpinBox, &QSpinBox::valueChanged, this, &Sender::ttlChanged);
     connect(startButton, &QPushButton::clicked, this, &Sender::startSending);
     connect(quitButton, &QPushButton::clicked, this, &Sender::close);
     connect(&timer, &QTimer::timeout, this, &Sender::sendDatagram);
diff --git a/examples/network/multistreamclient/CMakeLists.txt b/examples/network/multistreamclient/CMakeLists.txt
new file mode 100644
index 0000000000..a4a4be05df
--- /dev/null
+++ b/examples/network/multistreamclient/CMakeLists.txt
@@ -0,0 +1,38 @@
+# Generated from multistreamclient.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(multistreamclient LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/network/multistreamclient")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Network)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(multistreamclient
+    chatconsumer.cpp chatconsumer.h
+    client.cpp client.h
+    consumer.h
+    main.cpp
+    movieconsumer.cpp movieconsumer.h
+    timeconsumer.cpp timeconsumer.h
+)
+target_link_libraries(multistreamclient PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Network
+    Qt::Widgets
+)
+
+install(TARGETS multistreamclient
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/network/multistreamserver/CMakeLists.txt b/examples/network/multistreamserver/CMakeLists.txt
new file mode 100644
index 0000000000..ee871d06fa
--- /dev/null
+++ b/examples/network/multistreamserver/CMakeLists.txt
@@ -0,0 +1,38 @@
+# Generated from multistreamserver.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(multistreamserver LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/network/multistreamserver")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Network)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(multistreamserver
+    chatprovider.cpp chatprovider.h
+    main.cpp
+    movieprovider.cpp movieprovider.h
+    provider.h
+    server.cpp server.h
+    timeprovider.cpp timeprovider.h
+)
+target_link_libraries(multistreamserver PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Network
+    Qt::Widgets
+)
+
+install(TARGETS multistreamserver
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/network/network-chat/CMakeLists.txt b/examples/network/network-chat/CMakeLists.txt
new file mode 100644
index 0000000000..4bd4879beb
--- /dev/null
+++ b/examples/network/network-chat/CMakeLists.txt
@@ -0,0 +1,38 @@
+# Generated from network-chat.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(network-chat LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/network/network-chat")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Network)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(network-chat
+    chatdialog.cpp chatdialog.h chatdialog.ui
+    client.cpp client.h
+    connection.cpp connection.h
+    main.cpp
+    peermanager.cpp peermanager.h
+    server.cpp server.h
+)
+target_link_libraries(network-chat PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Network
+    Qt::Widgets
+)
+
+install(TARGETS network-chat
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/network/securesocketclient/CMakeLists.txt b/examples/network/securesocketclient/CMakeLists.txt
new file mode 100644
index 0000000000..13cdeba66d
--- /dev/null
+++ b/examples/network/securesocketclient/CMakeLists.txt
@@ -0,0 +1,49 @@
+# Generated from securesocketclient.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(securesocketclient LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/network/securesocketclient")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Network)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(securesocketclient
+    certificateinfo.cpp certificateinfo.h certificateinfo.ui
+    main.cpp
+    sslclient.cpp sslclient.h sslclient.ui
+    sslerrors.ui
+)
+target_link_libraries(securesocketclient PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Network
+    Qt::Widgets
+)
+
+
+# Resources:
+set(securesocketclient_resource_files
+    "encrypted.png"
+)
+
+qt6_add_resources(securesocketclient "securesocketclient"
+    PREFIX
+        "/"
+    FILES
+        ${securesocketclient_resource_files}
+)
+
+install(TARGETS securesocketclient
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/network/securesocketclient/certificateinfo.cpp b/examples/network/securesocketclient/certificateinfo.cpp
index 81429fc655..9d0a674efe 100644
--- a/examples/network/securesocketclient/certificateinfo.cpp
+++ b/examples/network/securesocketclient/certificateinfo.cpp
@@ -57,7 +57,7 @@ CertificateInfo::CertificateInfo(QWidget *parent)
     form = new Ui_CertificateInfo;
     form->setupUi(this);
 
-    connect(form->certificationPathView, QOverload<int>::of(&QComboBox::currentIndexChanged),
+    connect(form->certificationPathView, &QComboBox::currentIndexChanged,
             this, &CertificateInfo::updateCertificateInfo);
 }
 
diff --git a/examples/network/secureudpclient/CMakeLists.txt b/examples/network/secureudpclient/CMakeLists.txt
new file mode 100644
index 0000000000..936d93524b
--- /dev/null
+++ b/examples/network/secureudpclient/CMakeLists.txt
@@ -0,0 +1,36 @@
+# Generated from secureudpclient.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(secureudpclient LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/network/secureudpclient")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+find_package(Qt6 COMPONENTS Network)
+
+add_qt_gui_executable(secureudpclient
+    addressdialog.cpp addressdialog.h addressdialog.ui
+    association.cpp association.h
+    main.cpp
+    mainwindow.cpp mainwindow.h mainwindow.ui
+)
+target_link_libraries(secureudpclient PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Network
+    Qt::Widgets
+)
+
+install(TARGETS secureudpclient
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/network/secureudpserver/CMakeLists.txt b/examples/network/secureudpserver/CMakeLists.txt
new file mode 100644
index 0000000000..70816aea6b
--- /dev/null
+++ b/examples/network/secureudpserver/CMakeLists.txt
@@ -0,0 +1,36 @@
+# Generated from secureudpserver.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(secureudpserver LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/network/secureudpserver")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+find_package(Qt6 COMPONENTS Network)
+
+add_qt_gui_executable(secureudpserver
+    main.cpp
+    mainwindow.cpp mainwindow.h mainwindow.ui
+    nicselector.cpp nicselector.h nicselector.ui
+    server.cpp server.h
+)
+target_link_libraries(secureudpserver PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Network
+    Qt::Widgets
+)
+
+install(TARGETS secureudpserver
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/network/threadedfortuneserver/CMakeLists.txt b/examples/network/threadedfortuneserver/CMakeLists.txt
new file mode 100644
index 0000000000..20463b1417
--- /dev/null
+++ b/examples/network/threadedfortuneserver/CMakeLists.txt
@@ -0,0 +1,36 @@
+# Generated from threadedfortuneserver.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(threadedfortuneserver LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/network/threadedfortuneserver")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Network)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(threadedfortuneserver
+    dialog.cpp dialog.h
+    fortuneserver.cpp fortuneserver.h
+    fortunethread.cpp fortunethread.h
+    main.cpp
+)
+target_link_libraries(threadedfortuneserver PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Network
+    Qt::Widgets
+)
+
+install(TARGETS threadedfortuneserver
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/network/torrent/.prev_CMakeLists.txt b/examples/network/torrent/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..b3ff66a4b3
--- /dev/null
+++ b/examples/network/torrent/.prev_CMakeLists.txt
@@ -0,0 +1,65 @@
+# Generated from torrent.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(torrent LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/network/torrent")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Network)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(torrent
+    addtorrentdialog.cpp addtorrentdialog.h
+    bencodeparser.cpp bencodeparser.h
+    connectionmanager.cpp connectionmanager.h
+    filemanager.cpp filemanager.h
+    forms/addtorrentform.ui
+    main.cpp
+    mainwindow.cpp mainwindow.h
+    metainfo.cpp metainfo.h
+    peerwireclient.cpp peerwireclient.h
+    ratecontroller.cpp ratecontroller.h
+    torrentclient.cpp torrentclient.h
+    torrentserver.cpp torrentserver.h
+    trackerclient.cpp trackerclient.h
+)
+target_link_libraries(torrent PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Network
+    Qt::Widgets
+)
+
+
+# Resources:
+set(icons_resource_files
+    "icons/1downarrow.png"
+    "icons/1uparrow.png"
+    "icons/bottom.png"
+    "icons/exit.png"
+    "icons/peertopeer.png"
+    "icons/player_pause.png"
+    "icons/player_play.png"
+    "icons/player_stop.png"
+)
+
+qt6_add_resources(torrent "icons"
+    PREFIX
+        "/"
+    FILES
+        ${icons_resource_files}
+)
+
+install(TARGETS torrent
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/network/torrent/CMakeLists.txt b/examples/network/torrent/CMakeLists.txt
new file mode 100644
index 0000000000..34df6e0c63
--- /dev/null
+++ b/examples/network/torrent/CMakeLists.txt
@@ -0,0 +1,66 @@
+# Generated from torrent.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(torrent LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/network/torrent")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Network)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(torrent
+    addtorrentdialog.cpp addtorrentdialog.h
+    bencodeparser.cpp bencodeparser.h
+    connectionmanager.cpp connectionmanager.h
+    filemanager.cpp filemanager.h
+    forms/addtorrentform.ui
+    main.cpp
+    mainwindow.cpp mainwindow.h
+    metainfo.cpp metainfo.h
+    peerwireclient.cpp peerwireclient.h
+    ratecontroller.cpp ratecontroller.h
+    torrentclient.cpp torrentclient.h
+    torrentserver.cpp torrentserver.h
+    trackerclient.cpp trackerclient.h
+)
+target_include_directories(torrent PUBLIC forms) # special case
+target_link_libraries(torrent PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Network
+    Qt::Widgets
+)
+
+
+# Resources:
+set(icons_resource_files
+    "icons/1downarrow.png"
+    "icons/1uparrow.png"
+    "icons/bottom.png"
+    "icons/exit.png"
+    "icons/peertopeer.png"
+    "icons/player_pause.png"
+    "icons/player_play.png"
+    "icons/player_stop.png"
+)
+
+qt6_add_resources(torrent "icons"
+    PREFIX
+        "/"
+    FILES
+        ${icons_resource_files}
+)
+
+install(TARGETS torrent
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/opengl/2dpainting/2dpainting.pro b/examples/opengl/2dpainting/2dpainting.pro
index b9611f5b40..751c2022fd 100644
--- a/examples/opengl/2dpainting/2dpainting.pro
+++ b/examples/opengl/2dpainting/2dpainting.pro
@@ -1,4 +1,4 @@
-QT          += widgets
+QT += widgets opengl openglwidgets
 
 HEADERS     = glwidget.h \
               helper.h \
diff --git a/examples/opengl/2dpainting/CMakeLists.txt b/examples/opengl/2dpainting/CMakeLists.txt
new file mode 100644
index 0000000000..31f8005a19
--- /dev/null
+++ b/examples/opengl/2dpainting/CMakeLists.txt
@@ -0,0 +1,39 @@
+# Generated from 2dpainting.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(2dpainting LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/opengl/2dpainting")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+find_package(Qt6 COMPONENTS OpenGL)
+find_package(Qt6 COMPONENTS OpenGLWidgets)
+
+add_qt_gui_executable(2dpainting
+    glwidget.cpp glwidget.h
+    helper.cpp helper.h
+    main.cpp
+    widget.cpp widget.h
+    window.cpp window.h
+)
+target_link_libraries(2dpainting PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::OpenGL
+    Qt::OpenGLWidgets
+    Qt::Widgets
+)
+
+install(TARGETS 2dpainting
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/opengl/CMakeLists.txt b/examples/opengl/CMakeLists.txt
new file mode 100644
index 0000000000..3d5b055b1a
--- /dev/null
+++ b/examples/opengl/CMakeLists.txt
@@ -0,0 +1,17 @@
+# Generated from opengl.pro.
+
+add_subdirectory(hellowindow)
+add_subdirectory(paintedwindow)
+add_subdirectory(openglwindow)
+add_subdirectory(qopenglwindow)
+if(TARGET Qt::Widgets)
+    add_subdirectory(contextinfo)
+    add_subdirectory(threadedqopenglwidget)
+    add_subdirectory(2dpainting)
+    add_subdirectory(hellogl2)
+    add_subdirectory(qopenglwidget)
+    add_subdirectory(cube)
+    add_subdirectory(textures)
+    add_subdirectory(hellogles3)
+    add_subdirectory(computegles31)
+endif()
diff --git a/examples/opengl/computegles31/CMakeLists.txt b/examples/opengl/computegles31/CMakeLists.txt
new file mode 100644
index 0000000000..2012fca361
--- /dev/null
+++ b/examples/opengl/computegles31/CMakeLists.txt
@@ -0,0 +1,45 @@
+# Generated from computegles31.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(computegles31 LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/opengl/computegles31")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS OpenGL)
+
+add_qt_gui_executable(computegles31
+    glwindow.cpp glwindow.h
+    main.cpp
+)
+target_link_libraries(computegles31 PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::OpenGL
+)
+
+
+# Resources:
+set(computegles31_resource_files
+    "Qt-logo-medium.png"
+)
+
+qt6_add_resources(computegles31 "computegles31"
+    PREFIX
+        "/"
+    FILES
+        ${computegles31_resource_files}
+)
+
+install(TARGETS computegles31
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/opengl/computegles31/computegles31.pro b/examples/opengl/computegles31/computegles31.pro
index 5b9d7e4387..8d9b00ba83 100644
--- a/examples/opengl/computegles31/computegles31.pro
+++ b/examples/opengl/computegles31/computegles31.pro
@@ -1,3 +1,5 @@
+QT += opengl
+
 HEADERS = $$PWD/glwindow.h
 
 SOURCES = $$PWD/glwindow.cpp \
diff --git a/examples/opengl/contextinfo/CMakeLists.txt b/examples/opengl/contextinfo/CMakeLists.txt
new file mode 100644
index 0000000000..124dfd4b52
--- /dev/null
+++ b/examples/opengl/contextinfo/CMakeLists.txt
@@ -0,0 +1,35 @@
+# Generated from contextinfo.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(contextinfo LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/opengl/contextinfo")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+find_package(Qt6 COMPONENTS OpenGL)
+
+add_qt_gui_executable(contextinfo
+    main.cpp
+    renderwindow.cpp renderwindow.h
+    widget.cpp widget.h
+)
+target_link_libraries(contextinfo PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::OpenGL
+    Qt::Widgets
+)
+
+install(TARGETS contextinfo
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/opengl/contextinfo/contextinfo.pro b/examples/opengl/contextinfo/contextinfo.pro
index 3d948dd282..ae8f4067b6 100644
--- a/examples/opengl/contextinfo/contextinfo.pro
+++ b/examples/opengl/contextinfo/contextinfo.pro
@@ -1,5 +1,5 @@
 TEMPLATE = app
-QT += widgets
+QT += widgets opengl
 requires(qtConfig(filedialog))
 
 SOURCES += main.cpp \
diff --git a/examples/opengl/contextinfo/renderwindow.cpp b/examples/opengl/contextinfo/renderwindow.cpp
index ea9a7a24cb..b778fd1d89 100644
--- a/examples/opengl/contextinfo/renderwindow.cpp
+++ b/examples/opengl/contextinfo/renderwindow.cpp
@@ -52,7 +52,7 @@
 #include <QTimer>
 #include <QMatrix4x4>
 #include <QOpenGLContext>
-#include <QOpenGLShaderProgram>
+#include <QtOpenGL/QOpenGLShaderProgram>
 #include <QOpenGLFunctions>
 
 RenderWindow::RenderWindow(const QSurfaceFormat &format)
diff --git a/examples/opengl/cube/CMakeLists.txt b/examples/opengl/cube/CMakeLists.txt
new file mode 100644
index 0000000000..2d0d0f7887
--- /dev/null
+++ b/examples/opengl/cube/CMakeLists.txt
@@ -0,0 +1,61 @@
+# Generated from cube.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(cube LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/opengl/cube")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+find_package(Qt6 COMPONENTS OpenGL)
+find_package(Qt6 COMPONENTS OpenGLWidgets)
+
+add_qt_gui_executable(cube
+    geometryengine.cpp geometryengine.h
+    main.cpp
+    mainwidget.cpp mainwidget.h
+)
+target_link_libraries(cube PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::OpenGL
+    Qt::OpenGLWidgets
+    Qt::Widgets
+)
+
+
+# Resources:
+set(shaders_resource_files
+    "fshader.glsl"
+    "vshader.glsl"
+)
+
+qt6_add_resources(cube "shaders"
+    PREFIX
+        "/"
+    FILES
+        ${shaders_resource_files}
+)
+set(textures_resource_files
+    "cube.png"
+)
+
+qt6_add_resources(cube "textures"
+    PREFIX
+        "/"
+    FILES
+        ${textures_resource_files}
+)
+
+install(TARGETS cube
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/opengl/cube/cube.pro b/examples/opengl/cube/cube.pro
index b9416f1a9d..95a411322a 100644
--- a/examples/opengl/cube/cube.pro
+++ b/examples/opengl/cube/cube.pro
@@ -1,4 +1,4 @@
-QT       += core gui widgets
+QT += core gui widgets opengl openglwidgets
 
 TARGET = cube
 TEMPLATE = app
diff --git a/examples/opengl/doc/src/2dpainting.qdoc b/examples/opengl/doc/src/2dpainting.qdoc
index e6b33e2a14..32b332fa8a 100644
--- a/examples/opengl/doc/src/2dpainting.qdoc
+++ b/examples/opengl/doc/src/2dpainting.qdoc
@@ -30,8 +30,8 @@
     \title 2D Painting Example
     \ingroup examples-widgets-opengl
 
-    \brief The 2D Painting example shows how QPainter and QGLWidget can be used
-    together to display accelerated 2D graphics on supported hardware.
+    \brief The 2D Painting example shows how QPainter and QOpenGLWidget can be
+    used together to display accelerated 2D graphics on supported hardware.
 
     \image 2dpainting-example.png
 
@@ -39,23 +39,23 @@
     paint devices provided by QPaintDevice subclasses, such as QWidget
     and QImage.
 
-    Since QGLWidget is a subclass of QWidget, it is possible
+    Since QOpenGLWidget is a subclass of QWidget, it is possible
     to reimplement its \l{QWidget::paintEvent()}{paintEvent()} and use
     QPainter to draw on the device, just as you would with a QWidget.
     The only difference is that the painting operations will be accelerated
     in hardware if it is supported by your system's OpenGL drivers.
 
     In this example, we perform the same painting operations on a
-    QWidget and a QGLWidget. The QWidget is shown with anti-aliasing
-    enabled, and the QGLWidget will also use anti-aliasing if the
+    QWidget and a QOpenGLWidget. The QWidget is shown with anti-aliasing
+    enabled, and the QOpenGLWidget will also use anti-aliasing if the
     required extensions are supported by your system's OpenGL driver.
 
     \section1 Overview
 
-    To be able to compare the results of painting onto a QGLWidget subclass
+    To be able to compare the results of painting onto a QOpenGLWidget subclass
     with native drawing in a QWidget subclass, we want to show both kinds
     of widget side by side. To do this, we derive subclasses of QWidget and
-    QGLWidget, using a separate \c Helper class to perform the same painting
+    QOpenGLWidget, using a separate \c Helper class to perform the same painting
     operations for each, and lay them out in a top-level widget, itself
     provided a the \c Window class.
 
@@ -63,7 +63,7 @@
 
     In this example, the painting operations are performed by a helper class.
     We do this because we want the same painting operations to be performed
-    for both our QWidget subclass and the QGLWidget subclass.
+    for both our QWidget subclass and the QOpenGLWidget subclass.
 
     The \c Helper class is minimal:
 
@@ -81,7 +81,7 @@
 
     The actual painting is performed in the \c paint() function. This takes
     a QPainter that has already been set up to paint onto a paint device
-    (either a QWidget or a QGLWidget), a QPaintEvent that provides information
+    (either a QWidget or a QOpenGLWidget), a QPaintEvent that provides information
     about the region to be painted, and a measure of the elapsed time (in
     milliseconds) since the paint device was last updated.
 
@@ -148,7 +148,7 @@
     \section1 GLWidget Class Definition
 
     The \c GLWidget class definition is basically the same as the \c Widget
-    class except that it is derived from QGLWidget.
+    class except that it is derived from QOpenGLWidget.
 
     \snippet 2dpainting/glwidget.h 0
 
@@ -161,11 +161,8 @@
 
     \snippet 2dpainting/glwidget.cpp 0
 
-    As well as initializing the \c elapsed member variable and storing the
-    \c Helper object used to paint the widget, the base class's constructor
-    is called with the format that specifies the \l QGL::SampleBuffers flag.
-    This enables anti-aliasing if it is supported by your system's OpenGL
-    driver.
+    The \c elapsed member variable is initialized and the \c Helper object used
+    to paint the widget is stored.
 
     The \c animate() slot is exactly the same as that provided by the \c Widget
     class:
diff --git a/examples/opengl/doc/src/cube.qdoc b/examples/opengl/doc/src/cube.qdoc
index 1fdfe0c6ec..4f5b6bda90 100644
--- a/examples/opengl/doc/src/cube.qdoc
+++ b/examples/opengl/doc/src/cube.qdoc
@@ -47,7 +47,7 @@
     The example consist of two classes:
 
     \list
-    \li \c MainWidget extends QGLWidget and contains OpenGL ES 2.0
+    \li \c MainWidget extends QOpenGLWidget and contains OpenGL ES 2.0
         initialization and drawing and mouse and timer event handling
     \li \c GeometryEngine handles polygon geometries. Transfers polygon geometry
         to vertex buffer objects and draws geometries from vertex buffer objects.
@@ -81,7 +81,7 @@
 
     \snippet cube/fshader.glsl 0
 
-    Using \c QGLShaderProgram we can compile, link and bind shader code to
+    Using QOpenGLShaderProgram we can compile, link and bind shader code to
     graphics pipeline. This code uses Qt Resource files to access shader source code.
 
     \snippet cube/mainwidget.cpp 3
@@ -92,9 +92,9 @@
 
     \section1 Loading Textures from Qt Resource Files
 
-    \c QGLWidget interface implements methods for loading textures from QImage to GL
-    texture memory. We still need to use OpenGL provided functions for specifying
-    the GL texture unit and configuring texture filtering options.
+    The \c QOpenGLWidget interface implements methods for loading textures from QImage
+    to OpenGL texture memory. We still need to use OpenGL provided functions for
+    specifying the OpenGL texture unit and configuring texture filtering options.
 
     \snippet cube/mainwidget.cpp 4
 
diff --git a/examples/opengl/hellogl2/CMakeLists.txt b/examples/opengl/hellogl2/CMakeLists.txt
new file mode 100644
index 0000000000..798a83594e
--- /dev/null
+++ b/examples/opengl/hellogl2/CMakeLists.txt
@@ -0,0 +1,39 @@
+# Generated from hellogl2.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(hellogl2 LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/opengl/hellogl2")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+find_package(Qt6 COMPONENTS OpenGL)
+find_package(Qt6 COMPONENTS OpenGLWidgets)
+
+add_qt_gui_executable(hellogl2
+    glwidget.cpp glwidget.h
+    logo.cpp logo.h
+    main.cpp
+    mainwindow.cpp mainwindow.h
+    window.cpp window.h
+)
+target_link_libraries(hellogl2 PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::OpenGL
+    Qt::OpenGLWidgets
+    Qt::Widgets
+)
+
+install(TARGETS hellogl2
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/opengl/hellogl2/hellogl2.pro b/examples/opengl/hellogl2/hellogl2.pro
index 3a52e04d74..d7cd38de53 100644
--- a/examples/opengl/hellogl2/hellogl2.pro
+++ b/examples/opengl/hellogl2/hellogl2.pro
@@ -8,7 +8,7 @@ SOURCES       = glwidget.cpp \
                 mainwindow.cpp \
                 logo.cpp
 
-QT           += widgets
+QT += widgets opengl openglwidgets
 
 # install
 target.path = $$[QT_INSTALL_EXAMPLES]/opengl/hellogl2
diff --git a/examples/opengl/hellogles3/CMakeLists.txt b/examples/opengl/hellogles3/CMakeLists.txt
new file mode 100644
index 0000000000..7e8a5e57a7
--- /dev/null
+++ b/examples/opengl/hellogles3/CMakeLists.txt
@@ -0,0 +1,46 @@
+# Generated from hellogles3.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(hellogles3 LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/opengl/hellogles3")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS OpenGL)
+
+add_qt_gui_executable(hellogles3
+    ../hellogl2/logo.cpp ../hellogl2/logo.h
+    glwindow.cpp glwindow.h
+    main.cpp
+)
+target_link_libraries(hellogles3 PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::OpenGL
+)
+
+
+# Resources:
+set(hellogles3_resource_files
+    "qtlogo.png"
+)
+
+qt6_add_resources(hellogles3 "hellogles3"
+    PREFIX
+        "/"
+    FILES
+        ${hellogles3_resource_files}
+)
+
+install(TARGETS hellogles3
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/opengl/hellogles3/hellogles3.pro b/examples/opengl/hellogles3/hellogles3.pro
index e0d4c25ca6..8d9fbe25ca 100644
--- a/examples/opengl/hellogles3/hellogles3.pro
+++ b/examples/opengl/hellogles3/hellogles3.pro
@@ -1,3 +1,5 @@
+QT += opengl
+
 HEADERS = $$PWD/glwindow.h \
           $$PWD/../hellogl2/logo.h
 
diff --git a/examples/opengl/hellowindow/CMakeLists.txt b/examples/opengl/hellowindow/CMakeLists.txt
new file mode 100644
index 0000000000..876c282fbe
--- /dev/null
+++ b/examples/opengl/hellowindow/CMakeLists.txt
@@ -0,0 +1,34 @@
+# Generated from hellowindow.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(hellowindow LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/opengl/hellowindow")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS OpenGL)
+
+add_qt_gui_executable(hellowindow
+    hellowindow.cpp hellowindow.h
+    main.cpp
+)
+target_link_libraries(hellowindow PUBLIC
+    Qt::Core
+    Qt::CorePrivate
+    Qt::Gui
+    Qt::GuiPrivate
+    Qt::OpenGL
+)
+
+install(TARGETS hellowindow
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/opengl/hellowindow/hellowindow.h b/examples/opengl/hellowindow/hellowindow.h
index e6d7970cfc..938c6409a4 100644
--- a/examples/opengl/hellowindow/hellowindow.h
+++ b/examples/opengl/hellowindow/hellowindow.h
@@ -52,7 +52,7 @@
 
 #include <QColor>
 #include <QMutex>
-#include <QOpenGLShaderProgram>
+#include <QtOpenGL/QOpenGLShaderProgram>
 #include <QOpenGLBuffer>
 #include <QSharedPointer>
 #include <QTimer>
diff --git a/examples/opengl/hellowindow/hellowindow.pro b/examples/opengl/hellowindow/hellowindow.pro
index cc220fd344..27c274a378 100644
--- a/examples/opengl/hellowindow/hellowindow.pro
+++ b/examples/opengl/hellowindow/hellowindow.pro
@@ -1,4 +1,4 @@
-QT += gui-private core-private
+QT += gui-private core-private opengl
 
 HEADERS += hellowindow.h
 SOURCES += hellowindow.cpp main.cpp
diff --git a/examples/opengl/legacy/README b/examples/opengl/legacy/README
deleted file mode 100644
index 8d6cbdef2a..0000000000
--- a/examples/opengl/legacy/README
+++ /dev/null
@@ -1,4 +0,0 @@
-This directory contains legacy examples that use the fixed pipeline
-and thus are not compatible with OpenGL ES 2.0+ and the core profile of
-OpenGL 3.0+. They also rely on the Qt OpenGL module (e.g. QGLWidget) which
-is not advisable in new application.
diff --git a/examples/opengl/legacy/framebufferobject2/cubelogo.png b/examples/opengl/legacy/framebufferobject2/cubelogo.png
deleted file mode 100644
index 2ccbede774..0000000000
--- a/examples/opengl/legacy/framebufferobject2/cubelogo.png
+++ /dev/null
diff --git a/examples/opengl/legacy/framebufferobject2/framebufferobject2.pro b/examples/opengl/legacy/framebufferobject2/framebufferobject2.pro
deleted file mode 100644
index 3f2578bc1f..0000000000
--- a/examples/opengl/legacy/framebufferobject2/framebufferobject2.pro
+++ /dev/null
@@ -1,11 +0,0 @@
-HEADERS += glwidget.h
-SOURCES += glwidget.cpp main.cpp
-RESOURCES += framebufferobject2.qrc
-
-QT += opengl widgets
-
-# install
-target.path = $$[QT_INSTALL_EXAMPLES]/opengl/legacy/framebufferobject2
-INSTALLS += target
-
-qtConfig(opengles.|angle|dynamicgl): error("This example requires Qt to be configured with -opengl desktop")
diff --git a/examples/opengl/legacy/framebufferobject2/framebufferobject2.qrc b/examples/opengl/legacy/framebufferobject2/framebufferobject2.qrc
deleted file mode 100644
index 9fc1a56a1a..0000000000
--- a/examples/opengl/legacy/framebufferobject2/framebufferobject2.qrc
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE RCC><RCC version="1.0">
-<qresource prefix="/res">
-   <file>cubelogo.png</file>
-</qresource>
-</RCC>
diff --git a/examples/opengl/legacy/framebufferobject2/glwidget.cpp b/examples/opengl/legacy/framebufferobject2/glwidget.cpp
deleted file mode 100644
index f14d31aff6..0000000000
--- a/examples/opengl/legacy/framebufferobject2/glwidget.cpp
+++ /dev/null
@@ -1,257 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, you may use this file under the terms of the BSD license
-** as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "glwidget.h"
-#include <QtGui/QImage>
-#include <qmath.h>
-
-static GLint cubeArray[][3] = {
-    {0, 0, 0}, {0, 1, 0}, {1, 1, 0}, {1, 0, 0},
-    {0, 0, 1}, {1, 0, 1}, {1, 1, 1}, {0, 1, 1},
-    {0, 0, 0}, {1, 0, 0}, {1, 0, 1}, {0, 0, 1},
-    {0, 1, 0}, {0, 1, 1}, {1, 1, 1}, {1, 1, 0},
-    {0, 1, 0}, {0, 0, 0}, {0, 0, 1}, {0, 1, 1},
-    {1, 0, 0}, {1, 1, 0}, {1, 1, 1}, {1, 0, 1}
-};
-
-static GLint cubeTextureArray[][2] = {
-    {0, 0}, {1, 0}, {1, 1}, {0, 1},
-    {0, 0}, {0, 1}, {1, 1}, {1, 0},
-    {0, 0}, {1, 0}, {1, 1}, {0, 1},
-    {1, 0}, {0, 0}, {0, 1}, {1, 1},
-    {0, 0}, {1, 0}, {1, 1}, {0, 1},
-    {1, 0}, {0, 0}, {0, 1}, {1, 1}
-};
-
-static GLint faceArray[][2] = {
-    {1, -1}, {1, 1}, {-1, 1}, {-1, -1}
-};
-
-static GLubyte colorArray[][4] = {
-    {102, 176, 54, 255},
-    {81, 141, 41, 255},
-    {62, 108, 32, 255},
-    {45, 79, 23, 255}
-};
-
-GLWidget::GLWidget(QWidget *parent)
-  : QGLWidget(QGLFormat(QGL::SampleBuffers), parent)
-{
-    // create the framebuffer object - make sure to have a current
-    // context before creating it
-    makeCurrent();
-    fbo = new QGLFramebufferObject(512, 512);
-    timerId = startTimer(20);
-    setWindowTitle(tr("OpenGL framebuffer objects 2"));
-}
-
-GLWidget::~GLWidget()
-{
-    glDeleteLists(pbufferList, 1);
-    delete fbo;
-}
-
-void GLWidget::initializeGL()
-{
-    glMatrixMode(GL_MODELVIEW);
-
-    glEnable(GL_CULL_FACE);
-
-    glEnableClientState(GL_VERTEX_ARRAY);
-    glEnableClientState(GL_TEXTURE_COORD_ARRAY);
-    glVertexPointer(3, GL_INT, 0, cubeArray);
-    glTexCoordPointer(2, GL_INT, 0, cubeTextureArray);
-    glColorPointer(4, GL_UNSIGNED_BYTE, 0, colorArray);
-
-    glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-    glEnable(GL_BLEND);
-    glEnable(GL_TEXTURE_2D);
-    glEnable(GL_DEPTH_TEST);
-
-    glClearColor(1.0f, 1.0f, 1.0f, 1.0f);
-    pbufferList = glGenLists(1);
-    glNewList(pbufferList, GL_COMPILE);
-    {
-        glClear(GL_DEPTH_BUFFER_BIT | GL_COLOR_BUFFER_BIT);
-
-        // draw cube background
-        glPushMatrix();
-        glLoadIdentity();
-        glTranslatef(0.5f, 0.5f, -2.0f);
-        glDisable(GL_TEXTURE_2D);
-        glEnableClientState(GL_COLOR_ARRAY);
-        glVertexPointer(2, GL_INT, 0, faceArray);
-        glDrawArrays(GL_QUADS, 0, 4);
-        glVertexPointer(3, GL_INT, 0, cubeArray);
-        glDisableClientState(GL_COLOR_ARRAY);
-        glEnable(GL_TEXTURE_2D);
-        glPopMatrix();
-
-        // draw cube
-        glTranslatef(0.5f, 0.5f, 0.5f);
-        glRotatef(3.0f, 1.0f, 1.0f, 1.0f);
-        glTranslatef(-0.5f, -0.5f, -0.5f);
-        glColor4f(0.9f, 0.9f, 0.9f, 1.0f);
-        glDrawArrays(GL_QUADS, 0, 24);
-
-        glPushMatrix(); // this state is popped back in the paintGL() function
-    }
-    glEndList();
-
-    for (int i = 0; i < 3; ++i) {
-        yOffs[i] = 0.0f;
-        xInc[i] = 0.005f;
-        rot[i] = 0.0f;
-    }
-    xOffs[0]= 0.0f;
-    xOffs[1]= 0.5f;
-    xOffs[2]= 1.0f;
-
-    cubeTexture = bindTexture(QImage(":res/cubelogo.png"));
-
-    glPushMatrix(); // push to avoid stack underflow in the first paintGL() call
-}
-
-void GLWidget::resizeGL(int w, int h)
-{
-    glViewport(0, 0, w, h);
-    glMatrixMode(GL_PROJECTION);
-    glLoadIdentity();
-    float aspect = w/(float)(h ? h : 1);
-    glFrustum(-aspect, aspect, -1, 1, 10, 100);
-    glTranslatef(-0.5f, -0.5f, -0.5f);
-    glTranslatef(0.0f, 0.0f, -15.0f);
-}
-
-void GLWidget::paintGL()
-{
-    glPopMatrix(); // pop the matrix pushed in the pbuffer list
-
-    // push the projection matrix and the entire GL state before
-    // doing any rendering into our framebuffer object
-    glPushAttrib(GL_ALL_ATTRIB_BITS);
-    glMatrixMode(GL_PROJECTION);
-    glPushMatrix();
-
-    glViewport(0, 0, fbo->size().width(), fbo->size().height());
-    glMatrixMode(GL_PROJECTION);
-    glLoadIdentity();
-    glOrtho(-1, 1, -1, 1, -99, 99);
-    glTranslatef(-0.5f, -0.5f, 0.0f);
-    glMatrixMode(GL_MODELVIEW);
-
-    // render to the framebuffer object
-    fbo->bind();
-    glBindTexture(GL_TEXTURE_2D, cubeTexture);
-    glCallList(pbufferList);
-    fbo->release();
-
-    // pop the projection matrix and GL state back for rendering
-    // to the actual widget
-    glPopAttrib();
-    glMatrixMode(GL_PROJECTION);
-    glPopMatrix();
-
-    glBindTexture(GL_TEXTURE_2D, fbo->texture());
-    glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-
-    // draw the background
-    glMatrixMode(GL_MODELVIEW);
-    glPushMatrix();
-    glLoadIdentity();
-    glMatrixMode(GL_PROJECTION);
-    glPushMatrix();
-    glLoadIdentity();
-
-    glVertexPointer(2, GL_INT, 0, faceArray);
-    glTranslatef(-1.2f, -0.8f, 0.0f);
-    glScalef(0.2f, 0.2f, 0.2f);
-    for (int y = 0; y < 5; ++y) {
-        for (int x = 0; x < 5; ++x) {
-            glTranslatef(2.0f, 0, 0);
-            glColor4f(0.8f, 0.8f, 0.8f, 1.0f);
-            glDrawArrays(GL_QUADS, 0, 4);
-        }
-        glTranslatef(-10.0f, 2.0f, 0);
-    }
-    glVertexPointer(3, GL_INT, 0, cubeArray);
-
-    glPopMatrix();
-    glMatrixMode(GL_MODELVIEW);
-
-    // draw the bouncing cubes
-    drawCube(0, 0.0f, 1.5f, 2.5f, 1.5f);
-    drawCube(1, 1.0f, 2.0f, 2.5f, 2.0f);
-    drawCube(2, 2.0f, 3.5f, 2.5f, 2.5f);
-    glPopMatrix();
-}
-
-void GLWidget::drawCube(int i, GLfloat z, GLfloat rotation, GLfloat jmp, GLfloat amp)
-{
-    glMatrixMode(GL_MODELVIEW);
-    glLoadIdentity();
-    glTranslatef(xOffs[i], yOffs[i], z);
-    glTranslatef(0.5f, 0.5f, 0.5f);
-    GLfloat scale = 0.75 + i*(0.25f/2);
-    glScalef(scale, scale, scale);
-    glRotatef(rot[i], 1.0f, 1.0f, 1.0f);
-    glTranslatef(-0.5f, -0.5f, -0.5f);
-
-    glColor4f(1.0f, 1.0f, 1.0f, 0.8f);
-    glDrawArrays(GL_QUADS, 0, 24);
-
-    if (xOffs[i] > 1.0f || xOffs[i] < -1.0f) {
-        xInc[i] = -xInc[i];
-        xOffs[i] = xOffs[i] > 1.0f ? 1.0f : -1.0f;
-    }
-    xOffs[i] += xInc[i];
-    yOffs[i] = qAbs(cos((-GLfloat(M_PI) * jmp) * xOffs[i]) * amp) - 1;
-    rot[i] += rotation;
-}
diff --git a/examples/opengl/legacy/framebufferobject2/glwidget.h b/examples/opengl/legacy/framebufferobject2/glwidget.h
deleted file mode 100644
index d3e4aa5af5..0000000000
--- a/examples/opengl/legacy/framebufferobject2/glwidget.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, you may use this file under the terms of the BSD license
-** as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <QtOpenGL>
-
-class GLWidget : public QGLWidget
-{
-public:
-    GLWidget(QWidget *parent);
-    ~GLWidget();
-    void initializeGL() override;
-    void resizeGL(int w, int h) override;
-    void paintGL() override;
-    void timerEvent(QTimerEvent *) override { update(); }
-    void mousePressEvent(QMouseEvent *) override { killTimer(timerId); }
-    void mouseReleaseEvent(QMouseEvent *) override { timerId = startTimer(20); }
-
-    void drawCube(int i, GLfloat z, GLfloat ri, GLfloat jmp, GLfloat amp);
-
-private:
-    GLfloat rot[3], xOffs[3], yOffs[3], xInc[3];
-    GLuint pbufferList;
-    GLuint cubeTexture;
-    int timerId;
-
-    QGLFramebufferObject *fbo;
-};
-
diff --git a/examples/opengl/legacy/framebufferobject2/main.cpp b/examples/opengl/legacy/framebufferobject2/main.cpp
deleted file mode 100644
index ae7447c2a5..0000000000
--- a/examples/opengl/legacy/framebufferobject2/main.cpp
+++ /dev/null
@@ -1,71 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, you may use this file under the terms of the BSD license
-** as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <QtWidgets/QApplication>
-#include <QtWidgets/QMessageBox>
-#include "glwidget.h"
-
-int main(int argc, char **argv)
-{
-    Q_INIT_RESOURCE(framebufferobject2);
-
-    QApplication a(argc, argv);
-    if (!QGLFormat::hasOpenGL() || !QGLFramebufferObject::hasOpenGLFramebufferObjects()) {
-        QMessageBox::information(0, "OpenGL framebuffer objects 2",
-                                 "This system does not support OpenGL/framebuffer objects.");
-        return -1;
-    }
-
-    GLWidget widget(0);
-    widget.resize(640, 480);
-    widget.show();
-    return a.exec();
-}
-
diff --git a/examples/opengl/legacy/grabber/glwidget.cpp b/examples/opengl/legacy/grabber/glwidget.cpp
deleted file mode 100644
index 6be4d30597..0000000000
--- a/examples/opengl/legacy/grabber/glwidget.cpp
+++ /dev/null
@@ -1,286 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, you may use this file under the terms of the BSD license
-** as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "glwidget.h"
-
-#include <QMouseEvent>
-#include <QTimer>
-#include <qmath.h>
-
-GLWidget::GLWidget(QWidget *parent)
-    : QGLWidget(parent)
-{
-    gear1 = 0;
-    gear2 = 0;
-    gear3 = 0;
-    xRot = 0;
-    yRot = 0;
-    zRot = 0;
-    gear1Rot = 0;
-
-    QTimer *timer = new QTimer(this);
-    connect(timer, SIGNAL(timeout()), this, SLOT(advanceGears()));
-    timer->start(20);
-}
-
-GLWidget::~GLWidget()
-{
-    makeCurrent();
-    glDeleteLists(gear1, 1);
-    glDeleteLists(gear2, 1);
-    glDeleteLists(gear3, 1);
-}
-
-void GLWidget::setXRotation(int angle)
-{
-    normalizeAngle(&angle);
-    if (angle != xRot) {
-        xRot = angle;
-        emit xRotationChanged(angle);
-        updateGL();
-    }
-}
-
-void GLWidget::setYRotation(int angle)
-{
-    normalizeAngle(&angle);
-    if (angle != yRot) {
-        yRot = angle;
-        emit yRotationChanged(angle);
-        updateGL();
-    }
-}
-
-void GLWidget::setZRotation(int angle)
-{
-    normalizeAngle(&angle);
-    if (angle != zRot) {
-        zRot = angle;
-        emit zRotationChanged(angle);
-        updateGL();
-    }
-}
-
-void GLWidget::initializeGL()
-{
-    static const GLfloat lightPos[4] = { 5.0f, 5.0f, 10.0f, 1.0f };
-    static const GLfloat reflectance1[4] = { 0.8f, 0.1f, 0.0f, 1.0f };
-    static const GLfloat reflectance2[4] = { 0.0f, 0.8f, 0.2f, 1.0f };
-    static const GLfloat reflectance3[4] = { 0.2f, 0.2f, 1.0f, 1.0f };
-
-    glLightfv(GL_LIGHT0, GL_POSITION, lightPos);
-    glEnable(GL_LIGHTING);
-    glEnable(GL_LIGHT0);
-    glEnable(GL_DEPTH_TEST);
-
-    gear1 = makeGear(reflectance1, 1.0, 4.0, 1.0, 0.7, 20);
-    gear2 = makeGear(reflectance2, 0.5, 2.0, 2.0, 0.7, 10);
-    gear3 = makeGear(reflectance3, 1.3, 2.0, 0.5, 0.7, 10);
-
-    glEnable(GL_NORMALIZE);
-    glClearColor(0.0f, 0.0f, 0.0f, 1.0f);
-}
-
-void GLWidget::paintGL()
-{
-    glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-
-    glPushMatrix();
-    glRotated(xRot / 16.0, 1.0, 0.0, 0.0);
-    glRotated(yRot / 16.0, 0.0, 1.0, 0.0);
-    glRotated(zRot / 16.0, 0.0, 0.0, 1.0);
-
-    drawGear(gear1, -3.0, -2.0, 0.0, gear1Rot / 16.0);
-    drawGear(gear2, +3.1, -2.0, 0.0, -2.0 * (gear1Rot / 16.0) - 9.0);
-
-    glRotated(+90.0, 1.0, 0.0, 0.0);
-    drawGear(gear3, -3.1, -1.8, -2.2, +2.0 * (gear1Rot / 16.0) - 2.0);
-
-    glPopMatrix();
-}
-
-void GLWidget::resizeGL(int width, int height)
-{
-    int side = qMin(width, height);
-    glViewport((width - side) / 2, (height - side) / 2, side, side);
-
-    glMatrixMode(GL_PROJECTION);
-    glLoadIdentity();
-    glFrustum(-1.0, +1.0, -1.0, 1.0, 5.0, 60.0);
-    glMatrixMode(GL_MODELVIEW);
-    glLoadIdentity();
-    glTranslated(0.0, 0.0, -40.0);
-}
-
-void GLWidget::mousePressEvent(QMouseEvent *event)
-{
-    lastPos = event->pos();
-}
-
-void GLWidget::mouseMoveEvent(QMouseEvent *event)
-{
-    int dx = event->x() - lastPos.x();
-    int dy = event->y() - lastPos.y();
-
-    if (event->buttons() & Qt::LeftButton) {
-        setXRotation(xRot + 8 * dy);
-        setYRotation(yRot + 8 * dx);
-    } else if (event->buttons() & Qt::RightButton) {
-        setXRotation(xRot + 8 * dy);
-        setZRotation(zRot + 8 * dx);
-    }
-    lastPos = event->pos();
-}
-
-void GLWidget::advanceGears()
-{
-    gear1Rot += 2 * 16;
-    updateGL();
-}
-
-GLuint GLWidget::makeGear(const GLfloat *reflectance, GLdouble innerRadius,
-                          GLdouble outerRadius, GLdouble thickness,
-                          GLdouble toothSize, GLint toothCount)
-{
-    GLuint list = glGenLists(1);
-    glNewList(list, GL_COMPILE);
-    glMaterialfv(GL_FRONT, GL_AMBIENT_AND_DIFFUSE, reflectance);
-
-    GLdouble r0 = innerRadius;
-    GLdouble r1 = outerRadius - toothSize / 2.0;
-    GLdouble r2 = outerRadius + toothSize / 2.0;
-    GLdouble toothAngle = 2 * M_PI / toothCount;
-    GLdouble delta = toothAngle / 4.0;
-    GLdouble z = thickness / 2.0;
-
-    glShadeModel(GL_FLAT);
-
-    for (int i = 0; i < 2; ++i) {
-        GLdouble sign = (i == 0) ? +1.0 : -1.0;
-
-        glNormal3d(0.0, 0.0, sign);
-
-        glBegin(GL_QUAD_STRIP);
-        for (int j = 0; j <= toothCount; ++j) {
-            GLdouble angle = j * toothAngle;
-            glVertex3d(r0 * cos(angle), r0 * sin(angle), sign * z);
-            glVertex3d(r1 * cos(angle), r1 * sin(angle), sign * z);
-            glVertex3d(r0 * cos(angle), r0 * sin(angle), sign * z);
-            glVertex3d(r1 * cos(angle + 3 * delta), r1 * sin(angle + 3 * delta), sign * z);
-        }
-        glEnd();
-
-        glBegin(GL_QUADS);
-        for (int j = 0; j < toothCount; ++j) {
-            GLdouble angle = j * toothAngle;
-            glVertex3d(r1 * cos(angle), r1 * sin(angle), sign * z);
-            glVertex3d(r2 * cos(angle + delta), r2 * sin(angle + delta), sign * z);
-            glVertex3d(r2 * cos(angle + 2 * delta), r2 * sin(angle + 2 * delta), sign * z);
-            glVertex3d(r1 * cos(angle + 3 * delta), r1 * sin(angle + 3 * delta), sign * z);
-        }
-        glEnd();
-    }
-
-    glBegin(GL_QUAD_STRIP);
-    for (int i = 0; i < toothCount; ++i) {
-        for (int j = 0; j < 2; ++j) {
-            GLdouble angle = (i + j / 2.0) * toothAngle;
-            GLdouble s1 = r1;
-            GLdouble s2 = r2;
-            if (j == 1)
-                qSwap(s1, s2);
-
-            glNormal3d(cos(angle), sin(angle), 0.0);
-            glVertex3d(s1 * cos(angle), s1 * sin(angle), +z);
-            glVertex3d(s1 * cos(angle), s1 * sin(angle), -z);
-
-            glNormal3d(s2 * sin(angle + delta) - s1 * sin(angle),
-                       s1 * cos(angle) - s2 * cos(angle + delta), 0.0);
-            glVertex3d(s2 * cos(angle + delta), s2 * sin(angle + delta), +z);
-            glVertex3d(s2 * cos(angle + delta), s2 * sin(angle + delta), -z);
-        }
-    }
-    glVertex3d(r1, 0.0, +z);
-    glVertex3d(r1, 0.0, -z);
-    glEnd();
-
-    glShadeModel(GL_SMOOTH);
-
-    glBegin(GL_QUAD_STRIP);
-    for (int i = 0; i <= toothCount; ++i) {
-        GLdouble angle = i * toothAngle;
-        glNormal3d(-cos(angle), -sin(angle), 0.0);
-        glVertex3d(r0 * cos(angle), r0 * sin(angle), +z);
-        glVertex3d(r0 * cos(angle), r0 * sin(angle), -z);
-    }
-    glEnd();
-
-    glEndList();
-
-    return list;
-}
-
-void GLWidget::drawGear(GLuint gear, GLdouble dx, GLdouble dy, GLdouble dz,
-                        GLdouble angle)
-{
-    glPushMatrix();
-    glTranslated(dx, dy, dz);
-    glRotated(angle, 0.0, 0.0, 1.0);
-    glCallList(gear);
-    glPopMatrix();
-}
-
-void GLWidget::normalizeAngle(int *angle)
-{
-    while (*angle < 0)
-        *angle += 360 * 16;
-    while (*angle > 360 * 16)
-        *angle -= 360 * 16;
-}
diff --git a/examples/opengl/legacy/grabber/glwidget.h b/examples/opengl/legacy/grabber/glwidget.h
deleted file mode 100644
index 67020b0ada..0000000000
--- a/examples/opengl/legacy/grabber/glwidget.h
+++ /dev/null
@@ -1,107 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, you may use this file under the terms of the BSD license
-** as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef GLWIDGET_H
-#define GLWIDGET_H
-
-#include <QGLWidget>
-
-class GLWidget : public QGLWidget
-{
-    Q_OBJECT
-
-public:
-    GLWidget(QWidget *parent = 0);
-    ~GLWidget();
-
-    int xRotation() const { return xRot; }
-    int yRotation() const { return yRot; }
-    int zRotation() const { return zRot; }
-
-public slots:
-    void setXRotation(int angle);
-    void setYRotation(int angle);
-    void setZRotation(int angle);
-
-signals:
-    void xRotationChanged(int angle);
-    void yRotationChanged(int angle);
-    void zRotationChanged(int angle);
-
-protected:
-    void initializeGL() override;
-    void paintGL() override;
-    void resizeGL(int width, int height) override;
-    void mousePressEvent(QMouseEvent *event) override;
-    void mouseMoveEvent(QMouseEvent *event) override;
-
-private slots:
-    void advanceGears();
-
-private:
-    GLuint makeGear(const GLfloat *reflectance, GLdouble innerRadius,
-                    GLdouble outerRadius, GLdouble thickness,
-                    GLdouble toothSize, GLint toothCount);
-    void drawGear(GLuint gear, GLdouble dx, GLdouble dy, GLdouble dz,
-                  GLdouble angle);
-    void normalizeAngle(int *angle);
-
-    GLuint gear1;
-    GLuint gear2;
-    GLuint gear3;
-    int xRot;
-    int yRot;
-    int zRot;
-    int gear1Rot;
-
-    QPoint lastPos;
-};
-
-#endif // GLWIDGET_H
diff --git a/examples/opengl/legacy/grabber/grabber.pro b/examples/opengl/legacy/grabber/grabber.pro
deleted file mode 100644
index 88c03f1c5e..0000000000
--- a/examples/opengl/legacy/grabber/grabber.pro
+++ /dev/null
@@ -1,12 +0,0 @@
-HEADERS       = glwidget.h \
-                mainwindow.h
-SOURCES       = glwidget.cpp \
-                main.cpp \
-                mainwindow.cpp
-QT           += opengl widgets
-
-# install
-target.path = $$[QT_INSTALL_EXAMPLES]/opengl/legacy/grabber
-INSTALLS += target
-
-qtConfig(opengles.|angle|dynamicgl): error("This example requires Qt to be configured with -opengl desktop")
diff --git a/examples/opengl/legacy/grabber/main.cpp b/examples/opengl/legacy/grabber/main.cpp
deleted file mode 100644
index e02118b078..0000000000
--- a/examples/opengl/legacy/grabber/main.cpp
+++ /dev/null
@@ -1,61 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, you may use this file under the terms of the BSD license
-** as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "mainwindow.h"
-
-#include <QApplication>
-
-int main(int argc, char *argv[])
-{
-    QApplication app(argc, argv);
-    MainWindow window;
-    window.show();
-    return app.exec();
-}
diff --git a/examples/opengl/legacy/grabber/mainwindow.cpp b/examples/opengl/legacy/grabber/mainwindow.cpp
deleted file mode 100644
index 6ea6a28051..0000000000
--- a/examples/opengl/legacy/grabber/mainwindow.cpp
+++ /dev/null
@@ -1,216 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, you may use this file under the terms of the BSD license
-** as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "glwidget.h"
-#include "mainwindow.h"
-
-#include <QtWidgets>
-
-MainWindow::MainWindow()
-{
-    centralWidget = new QWidget;
-    setCentralWidget(centralWidget);
-
-    glWidget = new GLWidget;
-    pixmapLabel = new QLabel;
-
-    glWidgetArea = new QScrollArea;
-    glWidgetArea->setWidget(glWidget);
-    glWidgetArea->setWidgetResizable(true);
-    glWidgetArea->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
-    glWidgetArea->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
-    glWidgetArea->setSizePolicy(QSizePolicy::Ignored, QSizePolicy::Ignored);
-    glWidgetArea->setMinimumSize(50, 50);
-
-    pixmapLabelArea = new QScrollArea;
-    pixmapLabelArea->setWidget(pixmapLabel);
-    pixmapLabelArea->setSizePolicy(QSizePolicy::Ignored, QSizePolicy::Ignored);
-    pixmapLabelArea->setMinimumSize(50, 50);
-
-    xSlider = createSlider(SIGNAL(xRotationChanged(int)),
-                           SLOT(setXRotation(int)));
-    ySlider = createSlider(SIGNAL(yRotationChanged(int)),
-                           SLOT(setYRotation(int)));
-    zSlider = createSlider(SIGNAL(zRotationChanged(int)),
-                           SLOT(setZRotation(int)));
-
-    createActions();
-    createMenus();
-
-    QGridLayout *centralLayout = new QGridLayout;
-    centralLayout->addWidget(glWidgetArea, 0, 0);
-    centralLayout->addWidget(pixmapLabelArea, 0, 1);
-    centralLayout->addWidget(xSlider, 1, 0, 1, 2);
-    centralLayout->addWidget(ySlider, 2, 0, 1, 2);
-    centralLayout->addWidget(zSlider, 3, 0, 1, 2);
-    centralWidget->setLayout(centralLayout);
-
-    xSlider->setValue(15 * 16);
-    ySlider->setValue(345 * 16);
-    zSlider->setValue(0 * 16);
-
-    setWindowTitle(tr("Grabber"));
-    resize(400, 300);
-}
-
-void MainWindow::renderIntoPixmap()
-{
-    QSize size = getSize();
-    if (size.isValid()) {
-        QPixmap pixmap = glWidget->renderPixmap(size.width(), size.height());
-        setPixmap(pixmap);
-    }
-}
-
-void MainWindow::grabFrameBuffer()
-{
-    QImage image = glWidget->grabFrameBuffer();
-    setPixmap(QPixmap::fromImage(image));
-}
-
-void MainWindow::clearPixmap()
-{
-    setPixmap(QPixmap());
-}
-
-void MainWindow::about()
-{
-    QMessageBox::about(this, tr("About Grabber"),
-            tr("The <b>Grabber</b> example demonstrates two approaches for "
-               "rendering OpenGL into a Qt pixmap."));
-}
-
-void MainWindow::createActions()
-{
-    renderIntoPixmapAct = new QAction(tr("&Render into Pixmap..."), this);
-    renderIntoPixmapAct->setShortcut(tr("Ctrl+R"));
-    connect(renderIntoPixmapAct, SIGNAL(triggered()),
-            this, SLOT(renderIntoPixmap()));
-
-    grabFrameBufferAct = new QAction(tr("&Grab Frame Buffer"), this);
-    grabFrameBufferAct->setShortcut(tr("Ctrl+G"));
-    connect(grabFrameBufferAct, SIGNAL(triggered()),
-            this, SLOT(grabFrameBuffer()));
-
-    clearPixmapAct = new QAction(tr("&Clear Pixmap"), this);
-    clearPixmapAct->setShortcut(tr("Ctrl+L"));
-    connect(clearPixmapAct, SIGNAL(triggered()), this, SLOT(clearPixmap()));
-
-    exitAct = new QAction(tr("E&xit"), this);
-    exitAct->setShortcuts(QKeySequence::Quit);
-    connect(exitAct, SIGNAL(triggered()), this, SLOT(close()));
-
-    aboutAct = new QAction(tr("&About"), this);
-    connect(aboutAct, SIGNAL(triggered()), this, SLOT(about()));
-
-    aboutQtAct = new QAction(tr("About &Qt"), this);
-    connect(aboutQtAct, SIGNAL(triggered()), qApp, SLOT(aboutQt()));
-}
-
-void MainWindow::createMenus()
-{
-    fileMenu = menuBar()->addMenu(tr("&File"));
-    fileMenu->addAction(renderIntoPixmapAct);
-    fileMenu->addAction(grabFrameBufferAct);
-    fileMenu->addAction(clearPixmapAct);
-    fileMenu->addSeparator();
-    fileMenu->addAction(exitAct);
-
-    helpMenu = menuBar()->addMenu(tr("&Help"));
-    helpMenu->addAction(aboutAct);
-    helpMenu->addAction(aboutQtAct);
-}
-
-QSlider *MainWindow::createSlider(const char *changedSignal,
-                                  const char *setterSlot)
-{
-    QSlider *slider = new QSlider(Qt::Horizontal);
-    slider->setRange(0, 360 * 16);
-    slider->setSingleStep(16);
-    slider->setPageStep(15 * 16);
-    slider->setTickInterval(15 * 16);
-    slider->setTickPosition(QSlider::TicksRight);
-    connect(slider, SIGNAL(valueChanged(int)), glWidget, setterSlot);
-    connect(glWidget, changedSignal, slider, SLOT(setValue(int)));
-    return slider;
-}
-
-void MainWindow::setPixmap(const QPixmap &pixmap)
-{
-    pixmapLabel->setPixmap(pixmap);
-    QSize size = pixmap.size() / pixmap.devicePixelRatio();
-    if (size - QSize(1, 0) == pixmapLabelArea->maximumViewportSize())
-        size -= QSize(1, 0);
-    pixmapLabel->resize(size);
-}
-
-QSize MainWindow::getSize()
-{
-    bool ok;
-    QString text = QInputDialog::getText(this, tr("Grabber"),
-                                         tr("Enter pixmap size:"),
-                                         QLineEdit::Normal,
-                                         tr("%1 x %2").arg(glWidget->width())
-                                                      .arg(glWidget->height()),
-                                         &ok);
-    if (!ok)
-        return QSize();
-
-    QRegularExpression regExp(tr("^([0-9]+) *x *([0-9]+)$"));
-    QRegularExpressionMatch match = regExp.match(text);
-    if (match.hasMatch()) {
-        int width = match.captured(1).toInt();
-        int height = match.captured(2).toInt();
-        if (width > 0 && width < 2048 && height > 0 && height < 2048)
-            return QSize(width, height);
-    }
-
-    return glWidget->size();
-}
diff --git a/examples/opengl/legacy/grabber/mainwindow.h b/examples/opengl/legacy/grabber/mainwindow.h
deleted file mode 100644
index 2d699784dd..0000000000
--- a/examples/opengl/legacy/grabber/mainwindow.h
+++ /dev/null
@@ -1,104 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, you may use this file under the terms of the BSD license
-** as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef MAINWINDOW_H
-#define MAINWINDOW_H
-
-#include <QMainWindow>
-
-QT_BEGIN_NAMESPACE
-class QLabel;
-class QMenu;
-class QScrollArea;
-class QSlider;
-QT_END_NAMESPACE
-
-class GLWidget;
-
-class MainWindow : public QMainWindow
-{
-    Q_OBJECT
-
-public:
-    MainWindow();
-
-private slots:
-    void renderIntoPixmap();
-    void grabFrameBuffer();
-    void clearPixmap();
-    void about();
-
-private:
-    void createActions();
-    void createMenus();
-    QSlider *createSlider(const char *changedSignal, const char *setterSlot);
-    void setPixmap(const QPixmap &pixmap);
-    QSize getSize();
-
-    QWidget *centralWidget;
-    QScrollArea *glWidgetArea;
-    QScrollArea *pixmapLabelArea;
-    GLWidget *glWidget;
-    QLabel *pixmapLabel;
-    QSlider *xSlider;
-    QSlider *ySlider;
-    QSlider *zSlider;
-
-    QMenu *fileMenu;
-    QMenu *helpMenu;
-    QAction *grabFrameBufferAct;
-    QAction *renderIntoPixmapAct;
-    QAction *clearPixmapAct;
-    QAction *exitAct;
-    QAction *aboutAct;
-    QAction *aboutQtAct;
-};
-
-#endif // MAINWINDOW_H
diff --git a/examples/opengl/legacy/hellogl/glwidget.cpp b/examples/opengl/legacy/hellogl/glwidget.cpp
deleted file mode 100644
index 059a9bb96d..0000000000
--- a/examples/opengl/legacy/hellogl/glwidget.cpp
+++ /dev/null
@@ -1,207 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, you may use this file under the terms of the BSD license
-** as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <QtWidgets>
-#include <QtOpenGL>
-
-#include <math.h>
-
-#include "glwidget.h"
-#include "qtlogo.h"
-
-#ifndef GL_MULTISAMPLE
-#define GL_MULTISAMPLE  0x809D
-#endif
-
-//! [0]
-GLWidget::GLWidget(QWidget *parent)
-    : QGLWidget(QGLFormat(QGL::SampleBuffers), parent)
-{
-    logo = 0;
-    xRot = 0;
-    yRot = 0;
-    zRot = 0;
-
-    qtGreen = QColor::fromCmykF(0.40, 0.0, 1.0, 0.0);
-    qtPurple = QColor::fromCmykF(0.39, 0.39, 0.0, 0.0);
-}
-//! [0]
-
-//! [1]
-GLWidget::~GLWidget()
-{
-}
-//! [1]
-
-//! [2]
-QSize GLWidget::minimumSizeHint() const
-{
-    return QSize(50, 50);
-}
-//! [2]
-
-//! [3]
-QSize GLWidget::sizeHint() const
-//! [3] //! [4]
-{
-    return QSize(400, 400);
-}
-//! [4]
-
-static void qNormalizeAngle(int &angle)
-{
-    while (angle < 0)
-        angle += 360 * 16;
-    while (angle > 360 * 16)
-        angle -= 360 * 16;
-}
-
-//! [5]
-void GLWidget::setXRotation(int angle)
-{
-    qNormalizeAngle(angle);
-    if (angle != xRot) {
-        xRot = angle;
-        emit xRotationChanged(angle);
-        update();
-    }
-}
-//! [5]
-
-void GLWidget::setYRotation(int angle)
-{
-    qNormalizeAngle(angle);
-    if (angle != yRot) {
-        yRot = angle;
-        emit yRotationChanged(angle);
-        update();
-    }
-}
-
-void GLWidget::setZRotation(int angle)
-{
-    qNormalizeAngle(angle);
-    if (angle != zRot) {
-        zRot = angle;
-        emit zRotationChanged(angle);
-        update();
-    }
-}
-
-//! [6]
-void GLWidget::initializeGL()
-{
-    initializeOpenGLFunctions();
-
-    qglClearColor(qtPurple.darker());
-
-    logo = new QtLogo(this, 64);
-    logo->setColor(qtGreen.darker());
-
-    glEnable(GL_DEPTH_TEST);
-    glEnable(GL_CULL_FACE);
-    glShadeModel(GL_SMOOTH);
-    glEnable(GL_LIGHTING);
-    glEnable(GL_LIGHT0);
-    glEnable(GL_MULTISAMPLE);
-    static GLfloat lightPosition[4] = { 0.5, 5.0, 7.0, 1.0 };
-    glLightfv(GL_LIGHT0, GL_POSITION, lightPosition);
-}
-//! [6]
-
-//! [7]
-void GLWidget::paintGL()
-{
-    glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-    glLoadIdentity();
-    glTranslatef(0.0, 0.0, -10.0);
-    glRotatef(xRot / 16.0, 1.0, 0.0, 0.0);
-    glRotatef(yRot / 16.0, 0.0, 1.0, 0.0);
-    glRotatef(zRot / 16.0, 0.0, 0.0, 1.0);
-    logo->draw(static_cast<QOpenGLFunctions_1_1 *>(this));
-}
-//! [7]
-
-//! [8]
-void GLWidget::resizeGL(int width, int height)
-{
-    int side = qMin(width, height);
-    glViewport((width - side) / 2, (height - side) / 2, side, side);
-
-    glMatrixMode(GL_PROJECTION);
-    glLoadIdentity();
-    glOrtho(-0.5, +0.5, -0.5, +0.5, 4.0, 15.0);
-    glMatrixMode(GL_MODELVIEW);
-}
-//! [8]
-
-//! [9]
-void GLWidget::mousePressEvent(QMouseEvent *event)
-{
-    lastPos = event->pos();
-}
-//! [9]
-
-//! [10]
-void GLWidget::mouseMoveEvent(QMouseEvent *event)
-{
-    int dx = event->x() - lastPos.x();
-    int dy = event->y() - lastPos.y();
-
-    if (event->buttons() & Qt::LeftButton) {
-        setXRotation(xRot + 8 * dy);
-        setYRotation(yRot + 8 * dx);
-    } else if (event->buttons() & Qt::RightButton) {
-        setXRotation(xRot + 8 * dy);
-        setZRotation(zRot + 8 * dx);
-    }
-    lastPos = event->pos();
-}
-//! [10]
diff --git a/examples/opengl/legacy/hellogl/glwidget.h b/examples/opengl/legacy/hellogl/glwidget.h
deleted file mode 100644
index 8154d7405c..0000000000
--- a/examples/opengl/legacy/hellogl/glwidget.h
+++ /dev/null
@@ -1,105 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, you may use this file under the terms of the BSD license
-** as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef GLWIDGET_H
-#define GLWIDGET_H
-
-#include <QGLWidget>
-#include <QOpenGLFunctions_1_1>
-
-class QtLogo;
-
-//! [0]
-class GLWidget : public QGLWidget, public QOpenGLFunctions_1_1
-{
-    Q_OBJECT
-
-public:
-    GLWidget(QWidget *parent = 0);
-    ~GLWidget();
-
-    QSize minimumSizeHint() const override;
-    QSize sizeHint() const override;
-//! [0]
-
-//! [1]
-public slots:
-    void setXRotation(int angle);
-    void setYRotation(int angle);
-    void setZRotation(int angle);
-
-signals:
-    void xRotationChanged(int angle);
-    void yRotationChanged(int angle);
-    void zRotationChanged(int angle);
-//! [1]
-
-//! [2]
-protected:
-    void initializeGL() override;
-    void paintGL() override;
-    void resizeGL(int width, int height) override;
-    void mousePressEvent(QMouseEvent *event) override;
-    void mouseMoveEvent(QMouseEvent *event) override;
-//! [2]
-
-//! [3]
-private:
-    QtLogo *logo;
-    int xRot;
-    int yRot;
-    int zRot;
-    QPoint lastPos;
-    QColor qtGreen;
-    QColor qtPurple;
-};
-//! [3]
-
-#endif
diff --git a/examples/opengl/legacy/hellogl/hellogl.pro b/examples/opengl/legacy/hellogl/hellogl.pro
deleted file mode 100644
index c6e926c245..0000000000
--- a/examples/opengl/legacy/hellogl/hellogl.pro
+++ /dev/null
@@ -1,17 +0,0 @@
-VPATH += ../shared
-INCLUDEPATH += ../shared
-
-HEADERS       = glwidget.h \
-                window.h \
-                qtlogo.h
-SOURCES       = glwidget.cpp \
-                main.cpp \
-                window.cpp \
-                qtlogo.cpp
-QT           += opengl widgets
-
-# install
-target.path = $$[QT_INSTALL_EXAMPLES]/opengl/legacy/hellogl
-INSTALLS += target
-
-qtConfig(opengles.|angle): error("This example requires Qt to be configured with -opengl desktop")
diff --git a/examples/opengl/legacy/hellogl/main.cpp b/examples/opengl/legacy/hellogl/main.cpp
deleted file mode 100644
index 13581c8fb2..0000000000
--- a/examples/opengl/legacy/hellogl/main.cpp
+++ /dev/null
@@ -1,69 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, you may use this file under the terms of the BSD license
-** as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <QApplication>
-#include <QDesktopWidget>
-
-#include "window.h"
-
-int main(int argc, char *argv[])
-{
-    QApplication app(argc, argv);
-    Window window;
-    window.resize(window.sizeHint());
-    int desktopArea = QApplication::desktop()->width() *
-                     QApplication::desktop()->height();
-    int widgetArea = window.width() * window.height();
-    if (((float)widgetArea / (float)desktopArea) < 0.75f)
-        window.show();
-    else
-        window.showMaximized();
-    return app.exec();
-}
diff --git a/examples/opengl/legacy/hellogl/window.cpp b/examples/opengl/legacy/hellogl/window.cpp
deleted file mode 100644
index 58863909e0..0000000000
--- a/examples/opengl/legacy/hellogl/window.cpp
+++ /dev/null
@@ -1,107 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, you may use this file under the terms of the BSD license
-** as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <QtWidgets>
-
-#include "glwidget.h"
-#include "window.h"
-
-//! [0]
-Window::Window()
-{
-    glWidget = new GLWidget;
-
-    xSlider = createSlider();
-    ySlider = createSlider();
-    zSlider = createSlider();
-
-    connect(xSlider, SIGNAL(valueChanged(int)), glWidget, SLOT(setXRotation(int)));
-    connect(glWidget, SIGNAL(xRotationChanged(int)), xSlider, SLOT(setValue(int)));
-    connect(ySlider, SIGNAL(valueChanged(int)), glWidget, SLOT(setYRotation(int)));
-    connect(glWidget, SIGNAL(yRotationChanged(int)), ySlider, SLOT(setValue(int)));
-    connect(zSlider, SIGNAL(valueChanged(int)), glWidget, SLOT(setZRotation(int)));
-    connect(glWidget, SIGNAL(zRotationChanged(int)), zSlider, SLOT(setValue(int)));
-//! [0]
-
-//! [1]
-    QHBoxLayout *mainLayout = new QHBoxLayout;
-    mainLayout->addWidget(glWidget);
-    mainLayout->addWidget(xSlider);
-    mainLayout->addWidget(ySlider);
-    mainLayout->addWidget(zSlider);
-    setLayout(mainLayout);
-
-    xSlider->setValue(15 * 16);
-    ySlider->setValue(345 * 16);
-    zSlider->setValue(0 * 16);
-    setWindowTitle(tr("Hello GL"));
-}
-//! [1]
-
-//! [2]
-QSlider *Window::createSlider()
-{
-    QSlider *slider = new QSlider(Qt::Vertical);
-    slider->setRange(0, 360 * 16);
-    slider->setSingleStep(16);
-    slider->setPageStep(15 * 16);
-    slider->setTickInterval(15 * 16);
-    slider->setTickPosition(QSlider::TicksRight);
-    return slider;
-}
-//! [2]
-
-void Window::keyPressEvent(QKeyEvent *e)
-{
-    if (e->key() == Qt::Key_Escape)
-        close();
-    else
-        QWidget::keyPressEvent(e);
-}
diff --git a/examples/opengl/legacy/hellogl/window.h b/examples/opengl/legacy/hellogl/window.h
deleted file mode 100644
index 04e83694a4..0000000000
--- a/examples/opengl/legacy/hellogl/window.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, you may use this file under the terms of the BSD license
-** as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef WINDOW_H
-#define WINDOW_H
-
-#include <QWidget>
-
-QT_BEGIN_NAMESPACE
-class QSlider;
-QT_END_NAMESPACE
-//! [0]
-class GLWidget;
-
-class Window : public QWidget
-{
-    Q_OBJECT
-
-public:
-    Window();
-
-protected:
-    void keyPressEvent(QKeyEvent *event) override;
-
-private:
-    QSlider *createSlider();
-
-    GLWidget *glWidget;
-    QSlider *xSlider;
-    QSlider *ySlider;
-    QSlider *zSlider;
-};
-//! [0]
-
-#endif
diff --git a/examples/opengl/legacy/legacy.pro b/examples/opengl/legacy/legacy.pro
deleted file mode 100644
index 1398332c11..0000000000
--- a/examples/opengl/legacy/legacy.pro
+++ /dev/null
@@ -1,16 +0,0 @@
-requires(qtHaveModule(opengl))
-
-TEMPLATE      = subdirs
-
-!qtConfig(dynamicgl):!qtConfig(opengles2) {
-    # legacy desktop-only examples, no dynamic GL support
-    SUBDIRS   = \
-                grabber \
-                hellogl \
-                overpainting \
-                pbuffers \
-                framebufferobject2 \
-                samplebuffers
-}
-
-EXAMPLE_FILES = shared
diff --git a/examples/opengl/legacy/overpainting/bubble.cpp b/examples/opengl/legacy/overpainting/bubble.cpp
deleted file mode 100644
index 352e359cf9..0000000000
--- a/examples/opengl/legacy/overpainting/bubble.cpp
+++ /dev/null
@@ -1,122 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, you may use this file under the terms of the BSD license
-** as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "bubble.h"
-
-#include <QRandomGenerator>
-
-Bubble::Bubble(const QPointF &position, qreal radius, const QPointF &velocity)
-    : position(position), vel(velocity), radius(radius)
-{
-    innerColor = randomColor();
-    outerColor = randomColor();
-    updateBrush();
-}
-
-void Bubble::updateBrush()
-{
-    QRadialGradient gradient(QPointF(radius, radius), radius,
-                             QPointF(radius*0.5, radius*0.5));
-
-    gradient.setColorAt(0, QColor(255, 255, 255, 255));
-    gradient.setColorAt(0.25, innerColor);
-    gradient.setColorAt(1, outerColor);
-    brush = QBrush(gradient);
-}
-
-void Bubble::drawBubble(QPainter *painter)
-{
-    painter->save();
-    painter->translate(position.x() - radius, position.y() - radius);
-    painter->setBrush(brush);
-    painter->drawEllipse(0, 0, int(2*radius), int(2*radius));
-    painter->restore();
-}
-
-QColor Bubble::randomColor()
-{
-    int red = int(205 + QRandomGenerator::global()->bounded(50));
-    int green = int(205 + QRandomGenerator::global()->bounded(50));
-    int blue = int(205 + QRandomGenerator::global()->bounded(50));
-    int alpha = int(91 + QRandomGenerator::global()->bounded(100));
-
-    return QColor(red, green, blue, alpha);
-}
-
-void Bubble::move(const QRect &bbox)
-{
-    position += vel;
-    qreal leftOverflow = position.x() - radius - bbox.left();
-    qreal rightOverflow = position.x() + radius - bbox.right();
-    qreal topOverflow = position.y() - radius - bbox.top();
-    qreal bottomOverflow = position.y() + radius - bbox.bottom();
-
-    if (leftOverflow < 0.0) {
-        position.setX(position.x() - 2 * leftOverflow);
-        vel.setX(-vel.x());
-    } else if (rightOverflow > 0.0) {
-        position.setX(position.x() - 2 * rightOverflow);
-        vel.setX(-vel.x());
-    }
-
-    if (topOverflow < 0.0) {
-        position.setY(position.y() - 2 * topOverflow);
-        vel.setY(-vel.y());
-    } else if (bottomOverflow > 0.0) {
-        position.setY(position.y() - 2 * bottomOverflow);
-        vel.setY(-vel.y());
-    }
-}
-
-QRectF Bubble::rect()
-{
-    return QRectF(position.x() - radius, position.y() - radius,
-                  2 * radius, 2 * radius);
-}
diff --git a/examples/opengl/legacy/overpainting/bubble.h b/examples/opengl/legacy/overpainting/bubble.h
deleted file mode 100644
index bd63e0437f..0000000000
--- a/examples/opengl/legacy/overpainting/bubble.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, you may use this file under the terms of the BSD license
-** as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef BUBBLE_H
-#define BUBBLE_H
-
-#include <QPainter>
-
-class Bubble
-{
-public:
-    Bubble(const QPointF &position, qreal radius, const QPointF &velocity);
-
-    void drawBubble(QPainter *painter);
-    void updateBrush();
-    void move(const QRect &bbox);
-    QRectF rect();
-
-private:
-    QColor randomColor();
-
-    QBrush brush;
-    QPointF position;
-    QPointF vel;
-    qreal radius;
-    QColor innerColor;
-    QColor outerColor;
-};
-
-#endif // BUBBLE_H
diff --git a/examples/opengl/legacy/overpainting/glwidget.cpp b/examples/opengl/legacy/overpainting/glwidget.cpp
deleted file mode 100644
index c4558ce785..0000000000
--- a/examples/opengl/legacy/overpainting/glwidget.cpp
+++ /dev/null
@@ -1,293 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, you may use this file under the terms of the BSD license
-** as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "bubble.h"
-#include "qtlogo.h"
-#include "glwidget.h"
-
-#include <QMouseEvent>
-#include <QRandomGenerator>
-#include <QTime>
-
-#include <math.h>
-#include <stdlib.h>
-
-#ifndef GL_MULTISAMPLE
-#define GL_MULTISAMPLE  0x809D
-#endif
-
-//! [0]
-GLWidget::GLWidget(QWidget *parent)
-    : QGLWidget(QGLFormat(QGL::SampleBuffers), parent)
-{
-    QTime midnight(0, 0, 0);
-
-    logo = 0;
-    xRot = 0;
-    yRot = 0;
-    zRot = 0;
-
-    qtGreen = QColor::fromCmykF(0.40, 0.0, 1.0, 0.0);
-    qtPurple = QColor::fromCmykF(0.39, 0.39, 0.0, 0.0);
-
-    animationTimer.setSingleShot(false);
-    connect(&animationTimer, SIGNAL(timeout()), this, SLOT(animate()));
-    animationTimer.start(25);
-
-    setAutoFillBackground(false);
-    setMinimumSize(200, 200);
-    setWindowTitle(tr("Overpainting a Scene"));
-}
-//! [0]
-
-//! [1]
-GLWidget::~GLWidget()
-{
-}
-//! [1]
-
-static void qNormalizeAngle(int &angle)
-{
-    while (angle < 0)
-        angle += 360 * 16;
-    while (angle > 360 * 16)
-        angle -= 360 * 16;
-}
-
-void GLWidget::setXRotation(int angle)
-{
-    qNormalizeAngle(angle);
-    if (angle != xRot)
-        xRot = angle;
-}
-
-void GLWidget::setYRotation(int angle)
-{
-    qNormalizeAngle(angle);
-    if (angle != yRot)
-        yRot = angle;
-}
-
-void GLWidget::setZRotation(int angle)
-{
-    qNormalizeAngle(angle);
-    if (angle != zRot)
-        zRot = angle;
-}
-
-//! [2]
-void GLWidget::initializeGL()
-{
-    initializeOpenGLFunctions();
-
-    glEnable(GL_MULTISAMPLE);
-
-    logo = new QtLogo(this);
-    logo->setColor(qtGreen.darker());
-}
-//! [2]
-
-void GLWidget::mousePressEvent(QMouseEvent *event)
-{
-    lastPos = event->pos();
-}
-
-void GLWidget::mouseMoveEvent(QMouseEvent *event)
-{
-    int dx = event->x() - lastPos.x();
-    int dy = event->y() - lastPos.y();
-
-    if (event->buttons() & Qt::LeftButton) {
-        setXRotation(xRot + 8 * dy);
-        setYRotation(yRot + 8 * dx);
-    } else if (event->buttons() & Qt::RightButton) {
-        setXRotation(xRot + 8 * dy);
-        setZRotation(zRot + 8 * dx);
-    }
-    lastPos = event->pos();
-}
-
-void GLWidget::paintEvent(QPaintEvent *event)
-{
-    makeCurrent();
-//! [4]
-    glMatrixMode(GL_MODELVIEW);
-    glPushMatrix();
-//! [4]
-
-//! [6]
-    qglClearColor(qtPurple.darker());
-    glShadeModel(GL_SMOOTH);
-    glEnable(GL_DEPTH_TEST);
-    glEnable(GL_CULL_FACE);
-    glEnable(GL_LIGHTING);
-    glEnable(GL_LIGHT0);
-    glEnable(GL_MULTISAMPLE);
-    static GLfloat lightPosition[4] = { 0.5, 5.0, 7.0, 1.0 };
-    glLightfv(GL_LIGHT0, GL_POSITION, lightPosition);
-
-    qreal pixelRatio = devicePixelRatio();
-    setupViewport(width() * pixelRatio, height() * pixelRatio);
-//! [6]
-
-//! [7]
-    glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-    glLoadIdentity();
-    glTranslatef(0.0, 0.0, -10.0);
-    glRotatef(xRot / 16.0, 1.0, 0.0, 0.0);
-    glRotatef(yRot / 16.0, 0.0, 1.0, 0.0);
-    glRotatef(zRot / 16.0, 0.0, 0.0, 1.0);
-
-    logo->draw(static_cast<QOpenGLFunctions_1_1 *>(this));
-//! [7]
-
-//! [8]
-    glShadeModel(GL_FLAT);
-    glDisable(GL_CULL_FACE);
-    glDisable(GL_DEPTH_TEST);
-    glDisable(GL_LIGHTING);
-
-    glMatrixMode(GL_MODELVIEW);
-    glPopMatrix();
-//! [8]
-
-//! [10]
-    QPainter painter(this);
-    painter.setRenderHint(QPainter::Antialiasing);
-    for (Bubble *bubble : qAsConst(bubbles)) {
-        if (bubble->rect().intersects(event->rect()))
-            bubble->drawBubble(&painter);
-    }
-    drawInstructions(&painter);
-    painter.end();
-}
-//! [10]
-
-//! [11]
-void GLWidget::resizeGL(int width, int height)
-{
-    qreal pixelRatio = devicePixelRatio();
-    setupViewport(width*pixelRatio, height*pixelRatio);
-}
-//! [11]
-
-//! [12]
-void GLWidget::showEvent(QShowEvent *event)
-{
-    Q_UNUSED(event);
-    createBubbles(20 - bubbles.count());
-}
-//! [12]
-
-QSize GLWidget::sizeHint() const
-{
-    return QSize(400, 400);
-}
-
-void GLWidget::createBubbles(int number)
-{
-    for (int i = 0; i < number; ++i) {
-        QPointF position(width()*(0.1 + QRandomGenerator::global()->bounded(0.8)),
-                        height()*(0.1 + QRandomGenerator::global()->bounded(0.8)));
-        qreal radius = qMin(width(), height())*(0.0125 + QRandomGenerator::global()->bounded(0.0875));
-        QPointF velocity(width()*0.0125*(-0.5 + QRandomGenerator::global()->bounded(1.0)),
-                        height()*0.0125*(-0.5 + QRandomGenerator::global()->bounded(1.0)));
-
-        bubbles.append(new Bubble(position, radius, velocity));
-    }
-}
-
-//! [13]
-void GLWidget::animate()
-{
-    for (Bubble *bubble : qAsConst(bubbles))
-        bubble->move(rect());
-    update();
-}
-//! [13]
-
-//! [14]
-void GLWidget::setupViewport(int width, int height)
-{
-    int side = qMin(width, height);
-    glViewport((width - side) / 2, (height - side) / 2, side, side);
-
-    glMatrixMode(GL_PROJECTION);
-    glLoadIdentity();
-#ifdef QT_OPENGL_ES
-    glOrthof(-0.5, +0.5, -0.5, 0.5, 4.0, 15.0);
-#else
-    glOrtho(-0.5, +0.5, -0.5, 0.5, 4.0, 15.0);
-#endif
-    glMatrixMode(GL_MODELVIEW);
-}
-//! [14]
-
-//! [15]
-void GLWidget::drawInstructions(QPainter *painter)
-{
-    QString text = tr("Click and drag with the left mouse button "
-                      "to rotate the Qt logo.");
-    QFontMetrics metrics = QFontMetrics(font());
-    int border = qMax(4, metrics.leading());
-
-    QRect rect = metrics.boundingRect(0, 0, width() - 2*border, int(height()*0.125),
-                                      Qt::AlignCenter | Qt::TextWordWrap, text);
-    painter->setRenderHint(QPainter::TextAntialiasing);
-    painter->fillRect(QRect(0, 0, width(), rect.height() + 2*border),
-                     QColor(0, 0, 0, 127));
-    painter->setPen(Qt::white);
-    painter->fillRect(QRect(0, 0, width(), rect.height() + 2*border),
-                      QColor(0, 0, 0, 127));
-    painter->drawText((width() - rect.width())/2, border,
-                      rect.width(), rect.height(),
-                      Qt::AlignCenter | Qt::TextWordWrap, text);
-}
-//! [15]
diff --git a/examples/opengl/legacy/overpainting/glwidget.h b/examples/opengl/legacy/overpainting/glwidget.h
deleted file mode 100644
index e5ea539f6d..0000000000
--- a/examples/opengl/legacy/overpainting/glwidget.h
+++ /dev/null
@@ -1,114 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, you may use this file under the terms of the BSD license
-** as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef GLWIDGET_H
-#define GLWIDGET_H
-
-#include <QGLWidget>
-#include <QOpenGLFunctions_1_1>
-#include <QTimer>
-
-class Bubble;
-class QtLogo;
-
-//! [0]
-class GLWidget : public QGLWidget, public QOpenGLFunctions_1_1
-{
-    Q_OBJECT
-
-public:
-    GLWidget(QWidget *parent = 0);
-    ~GLWidget();
-//! [0]
-
-    QSize sizeHint() const override;
-    int xRotation() const { return xRot; }
-    int yRotation() const { return yRot; }
-    int zRotation() const { return zRot; }
-
-public slots:
-    void setXRotation(int angle);
-    void setYRotation(int angle);
-    void setZRotation(int angle);
-
-//! [1]
-protected:
-    void initializeGL() override;
-    void paintEvent(QPaintEvent *event) override;
-    void resizeGL(int width, int height) override;
-    void mousePressEvent(QMouseEvent *event) override;
-    void mouseMoveEvent(QMouseEvent *event) override;
-    void showEvent(QShowEvent *event) override;
-
-private slots:
-    void animate();
-
-private:
-    void createBubbles(int number);
-    void drawInstructions(QPainter *painter);
-//! [1]
-    void setupViewport(int width, int height);
-
-    QColor qtGreen;
-    QColor qtPurple;
-
-    GLuint object;
-    int xRot;
-    int yRot;
-    int zRot;
-    QPoint lastPos;
-//! [4]
-    QtLogo *logo;
-    QList<Bubble*> bubbles;
-    QTimer animationTimer;
-//! [4]
-};
-
-#endif // GLWIDGET_H
diff --git a/examples/opengl/legacy/overpainting/main.cpp b/examples/opengl/legacy/overpainting/main.cpp
deleted file mode 100644
index c5f0f2e3f7..0000000000
--- a/examples/opengl/legacy/overpainting/main.cpp
+++ /dev/null
@@ -1,61 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, you may use this file under the terms of the BSD license
-** as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "glwidget.h"
-
-#include <QApplication>
-
-int main(int argc, char *argv[])
-{
-    QApplication app(argc, argv);
-    GLWidget window;
-    window.show();
-    return app.exec();
-}
diff --git a/examples/opengl/legacy/overpainting/overpainting.pro b/examples/opengl/legacy/overpainting/overpainting.pro
deleted file mode 100644
index 17213a6079..0000000000
--- a/examples/opengl/legacy/overpainting/overpainting.pro
+++ /dev/null
@@ -1,19 +0,0 @@
-QT += opengl widgets
-
-VPATH += ../shared
-INCLUDEPATH += ../shared
-
-HEADERS = bubble.h \
-    glwidget.h \
-    qtlogo.h
-
-SOURCES = bubble.cpp \
-    glwidget.cpp \
-    main.cpp \
-    qtlogo.cpp
-
-# install
-target.path = $$[QT_INSTALL_EXAMPLES]/opengl/legacy/overpainting
-INSTALLS += target
-
-qtConfig(opengles.|angle): error("This example requires Qt to be configured with -opengl desktop")
diff --git a/examples/opengl/legacy/pbuffers/cube.cpp b/examples/opengl/legacy/pbuffers/cube.cpp
deleted file mode 100644
index f598741ec3..0000000000
--- a/examples/opengl/legacy/pbuffers/cube.cpp
+++ /dev/null
@@ -1,338 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, you may use this file under the terms of the BSD license
-** as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "cube.h"
-#include "glwidget.h"
-
-#include <QtGui/QImage>
-#include <QtCore/QPropertyAnimation>
-
-static const qreal speeds[] = { 3.8f, 4.4f, 5.6f };
-static const qreal amplitudes[] = { 2.0f, 2.5f, 3.0f };
-
-static inline void qSetColor(float colorVec[], QColor c)
-{
-    colorVec[0] = c.redF();
-    colorVec[1] = c.greenF();
-    colorVec[2] = c.blueF();
-    colorVec[3] = c.alphaF();
-}
-
-int Geometry::append(const QVector3D &a, const QVector3D &n, const QVector2D &t)
-{
-    int v = vertices.count();
-    vertices.append(a);
-    normals.append(n);
-    texCoords.append(t);
-    faces.append(v);
-    colors.append(QVector4D(0.6f, 0.6f, 0.6f, 1.0f));
-    return v;
-}
-
-void Geometry::addQuad(const QVector3D &a, const QVector3D &b,
-                           const QVector3D &c, const QVector3D &d,
-                           const QVector<QVector2D> &tex)
-{
-    QVector3D norm = QVector3D::normal(a, b, c);
-    // append first triangle
-    int aref = append(a, norm, tex[0]);
-    append(b, norm, tex[1]);
-    int cref = append(c, norm, tex[2]);
-    // append second triangle
-    faces.append(aref);
-    faces.append(cref);
-    append(d, norm, tex[3]);
-}
-
-void Geometry::loadArrays() const
-{
-    glEnableClientState(GL_VERTEX_ARRAY);
-    glEnableClientState(GL_NORMAL_ARRAY);
-    glEnableClientState(GL_TEXTURE_COORD_ARRAY);
-    glEnableClientState(GL_COLOR_ARRAY);
-    glVertexPointer(3, GL_FLOAT, 0, vertices.constData());
-    glNormalPointer(GL_FLOAT, 0, normals.constData());
-    glTexCoordPointer(2, GL_FLOAT, 0, texCoords.constData());
-    glColorPointer(4, GL_FLOAT, 0, colors.constData());
-}
-
-void Geometry::setColors(int start, GLfloat colorArray[4][4])
-{
-    int off = faces[start];
-    for (int i = 0; i < 4; ++i)
-        colors[i + off] = QVector4D(colorArray[i][0],
-                                      colorArray[i][1],
-                                      colorArray[i][2],
-                                      colorArray[i][3]);
-}
-
-Tile::Tile(const QVector3D &loc)
-    : location(loc)
-    , start(0)
-    , count(0)
-    , useFlatColor(false)
-    , geom(0)
-{
-    qSetColor(faceColor, QColor(Qt::darkGray));
-}
-
-void Tile::setColors(GLfloat colorArray[4][4])
-{
-    useFlatColor = true;
-    geom->setColors(start, colorArray);
-}
-
-void Tile::draw() const
-{
-    QMatrix4x4 mat;
-    mat.translate(location);
-    mat.rotate(orientation);
-    glMatrixMode(GL_MODELVIEW);
-    glPushMatrix();
-    glMultMatrixf(mat.constData());
-    glMaterialfv(GL_FRONT_AND_BACK, GL_AMBIENT_AND_DIFFUSE, faceColor);
-    glDrawElements(GL_TRIANGLES, count, GL_UNSIGNED_SHORT, geom->indices() + start);
-    glPopMatrix();
-}
-
-TileBuilder::TileBuilder(Geometry *g, qreal depth, qreal size)
-    : verts(4)
-    , tex(4)
-    , start(g->count())
-    , count(0)
-    , geom(g)
-{
-    // front face - make a square with bottom-left at origin
-    verts[br].setX(size);
-    verts[tr].setX(size);
-    verts[tr].setY(size);
-    verts[tl].setY(size);
-
-    // these vert numbers are good for the tex-coords
-    for (int i = 0; i < 4; ++i)
-        tex[i] = verts[i].toVector2D();
-
-    // now move verts half cube width across so cube is centered on origin
-    for (int i = 0; i < 4; ++i)
-        verts[i] -= QVector3D(size / 2.0f, size / 2.0f, -depth);
-
-    // add the front face
-    g->addQuad(verts[bl], verts[br], verts[tr], verts[tl], tex);
-
-    count = g->count() - start;
-}
-
-void TileBuilder::initialize(Tile *tile) const
-{
-    tile->start = start;
-    tile->count = count;
-    tile->geom = geom;
-    qSetColor(tile->faceColor, color);
-}
-
-Tile *TileBuilder::newTile(const QVector3D &loc) const
-{
-    Tile *tile = new Tile(loc);
-    initialize(tile);
-    return tile;
-}
-
-Cube::Cube(const QVector3D &loc)
-    : Tile(loc)
-    , rot(0.0f)
-    , r(0)
-    , animGroup(0)
-{
-}
-
-Cube::~Cube()
-{
-}
-
-void Cube::setAltitude(qreal a)
-{
-    if (location.y() != a)
-    {
-        location.setY(a);
-        emit changed();
-    }
-}
-
-void Cube::setRange(qreal r)
-{
-    if (location.x() != r)
-    {
-        location.setX(r);
-        emit changed();
-    }
-}
-
-void Cube::setRotation(qreal r)
-{
-    if (r != rot)
-    {
-        orientation = QQuaternion::fromAxisAndAngle(QVector3D(1.0f, 1.0f, 1.0f), r);
-        emit changed();
-    }
-}
-
-void Cube::removeBounce()
-{
-    delete animGroup;
-    animGroup = 0;
-    delete r;
-    r = 0;
-}
-
-void Cube::startAnimation()
-{
-    if (r)
-    {
-        r->start();
-        r->setCurrentTime(startx);
-    }
-    if (animGroup)
-        animGroup->start();
-    if (rtn)
-        rtn->start();
-}
-
-void Cube::setAnimationPaused(bool paused)
-{
-    if (paused)
-    {
-        if (r)
-            r->pause();
-        if (animGroup)
-            animGroup->pause();
-        if (rtn)
-            rtn->pause();
-    }
-    else
-    {
-        if (r)
-            r->resume();
-        if (animGroup)
-            animGroup->resume();
-        if (rtn)
-            rtn->resume();
-    }
-}
-
-CubeBuilder::CubeBuilder(Geometry *g, qreal depth, qreal size)
-    : TileBuilder(g, depth)
-    , ix(0)
-{
-    for (int i = 0; i < 4; ++i)
-        verts[i].setZ(size / 2.0f);
-    // back face - "extrude" verts down
-    QVector<QVector3D> back(verts);
-    for (int i = 0; i < 4; ++i)
-        back[i].setZ(-size / 2.0f);
-
-    // add the back face
-    g->addQuad(back[br], back[bl], back[tl], back[tr], tex);
-
-    // add the sides
-    g->addQuad(back[bl], back[br], verts[br], verts[bl], tex);
-    g->addQuad(back[br], back[tr], verts[tr], verts[br], tex);
-    g->addQuad(back[tr], back[tl], verts[tl], verts[tr], tex);
-    g->addQuad(back[tl], back[bl], verts[bl], verts[tl], tex);
-
-    count = g->count() - start;
-}
-
-Cube *CubeBuilder::newCube(const QVector3D &loc) const
-{
-    Cube *c = new Cube(loc);
-    initialize(c);
-    qreal d = 4000.0f;
-    qreal d3 = d / 3.0f;
-    // Animate movement from left to right
-    c->r = new QPropertyAnimation(c, "range");
-    c->r->setStartValue(-1.3f);
-    c->r->setEndValue(1.3f);
-    c->startx = ix * d3 * 3.0f;
-    c->r->setDuration(d * 4.0f);
-    c->r->setLoopCount(-1);
-    c->r->setEasingCurve(QEasingCurve(QEasingCurve::CosineCurve));
-
-    c->animGroup = new QSequentialAnimationGroup(c);
-
-    // Animate movement from bottom to top
-    QPropertyAnimation *a_up = new QPropertyAnimation(c, "altitude", c->animGroup);
-    a_up->setEndValue(loc.y());
-    a_up->setStartValue(loc.y() + amplitudes[ix]);
-    a_up->setDuration(d / speeds[ix]);
-    a_up->setLoopCount(1);
-    a_up->setEasingCurve(QEasingCurve(QEasingCurve::InQuad));
-
-    // Animate movement from top to bottom
-    QPropertyAnimation *a_down = new QPropertyAnimation(c, "altitude", c->animGroup);
-    a_down->setEndValue(loc.y() + amplitudes[ix]);
-    a_down->setStartValue(loc.y());
-    a_down->setDuration(d / speeds[ix]);
-    a_down->setLoopCount(1);
-    a_down->setEasingCurve(QEasingCurve(QEasingCurve::OutQuad));
-
-    c->animGroup->addAnimation(a_up);
-    c->animGroup->addAnimation(a_down);
-    c->animGroup->setLoopCount(-1);
-
-    // Animate rotation
-    c->rtn = new QPropertyAnimation(c, "rotation");
-    c->rtn->setStartValue(c->rot);
-    c->rtn->setEndValue(359.0f);
-    c->rtn->setDuration(d * 2.0f);
-    c->rtn->setLoopCount(-1);
-    c->rtn->setDuration(d / 2);
-    ix = (ix + 1) % 3;
-    return c;
-}
diff --git a/examples/opengl/legacy/pbuffers/cube.h b/examples/opengl/legacy/pbuffers/cube.h
deleted file mode 100644
index 17cac2decd..0000000000
--- a/examples/opengl/legacy/pbuffers/cube.h
+++ /dev/null
@@ -1,159 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, you may use this file under the terms of the BSD license
-** as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef CUBE_H
-#define CUBE_H
-
-#include <QtOpenGL/qgl.h>
-#include <QtCore/qvector.h>
-#include <QtCore/qsequentialanimationgroup.h>
-#include <QtGui/qmatrix4x4.h>
-#include <QtGui/qvector3d.h>
-#include <QtGui/qvector2d.h>
-
-QT_BEGIN_NAMESPACE
-class QPropertyAnimation;
-QT_END_NAMESPACE
-
-class Geometry
-{
-public:
-    void loadArrays() const;
-    void addQuad(const QVector3D &a, const QVector3D &b,
-                 const QVector3D &c, const QVector3D &d,
-                 const QVector<QVector2D> &tex);
-    void setColors(int start, GLfloat colors[4][4]);
-    const GLushort *indices() const { return faces.constData(); }
-    int count() const { return faces.count(); }
-private:
-    QVector<GLushort> faces;
-    QVector<QVector3D> vertices;
-    QVector<QVector3D> normals;
-    QVector<QVector2D> texCoords;
-    QVector<QVector4D> colors;
-    int append(const QVector3D &a, const QVector3D &n, const QVector2D &t);
-    void addTri(const QVector3D &a, const QVector3D &b, const QVector3D &c, const QVector3D &n);
-    friend class Tile;
-};
-
-class Tile
-{
-public:
-    void draw() const;
-    void setColors(GLfloat[4][4]);
-protected:
-    Tile(const QVector3D &loc = QVector3D());
-    QVector3D location;
-    QQuaternion orientation;
-private:
-    int start;
-    int count;
-    bool useFlatColor;
-    GLfloat faceColor[4];
-    Geometry *geom;
-    friend class TileBuilder;
-};
-
-class TileBuilder
-{
-public:
-    enum { bl, br, tr, tl };
-    explicit TileBuilder(Geometry *, qreal depth = 0.0f, qreal size = 1.0f);
-    Tile *newTile(const QVector3D &loc = QVector3D()) const;
-    void setColor(QColor c) { color = c; }
-protected:
-    void initialize(Tile *) const;
-    QVector<QVector3D> verts;
-    QVector<QVector2D> tex;
-    int start;
-    int count;
-    Geometry *geom;
-    QColor color;
-};
-
-class Cube : public QObject, public Tile
-{
-    Q_OBJECT
-    Q_PROPERTY(qreal range READ range WRITE setRange)
-    Q_PROPERTY(qreal altitude READ altitude WRITE setAltitude)
-    Q_PROPERTY(qreal rotation READ rotation WRITE setRotation)
-public:
-    Cube(const QVector3D &loc = QVector3D());
-    ~Cube();
-    qreal range() { return location.x(); }
-    void setRange(qreal r);
-    qreal altitude() { return location.y(); }
-    void setAltitude(qreal a);
-    qreal rotation() { return rot; }
-    void setRotation(qreal r);
-    void removeBounce();
-    void startAnimation();
-    void setAnimationPaused(bool paused);
-signals:
-    void changed();
-private:
-    qreal rot;
-    QPropertyAnimation *r;
-    QPropertyAnimation *rtn;
-    QSequentialAnimationGroup *animGroup;
-    qreal startx;
-    friend class CubeBuilder;
-};
-
-class CubeBuilder : public TileBuilder
-{
-public:
-    explicit CubeBuilder(Geometry *, qreal depth = 0.0f, qreal size = 1.0f);
-    Cube *newCube(const QVector3D &loc = QVector3D()) const;
-private:
-    mutable int ix;
-};
-
-#endif // CUBE_H
diff --git a/examples/opengl/legacy/pbuffers/cubelogo.png b/examples/opengl/legacy/pbuffers/cubelogo.png
deleted file mode 100644
index 2ccbede774..0000000000
--- a/examples/opengl/legacy/pbuffers/cubelogo.png
+++ /dev/null
diff --git a/examples/opengl/legacy/pbuffers/glwidget.cpp b/examples/opengl/legacy/pbuffers/glwidget.cpp
deleted file mode 100644
index 5763436d5e..0000000000
--- a/examples/opengl/legacy/pbuffers/glwidget.cpp
+++ /dev/null
@@ -1,256 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, you may use this file under the terms of the BSD license
-** as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "glwidget.h"
-#include <math.h>
-
-#include "cube.h"
-
-#include <QGLPixelBuffer>
-
-#ifndef GL_MULTISAMPLE
-#define GL_MULTISAMPLE  0x809D
-#endif
-
-static GLfloat colorArray[][4] = {
-    {0.243f, 0.423f, 0.125f, 1.0f},
-    {0.176f, 0.31f, 0.09f, 1.0f},
-    {0.4f, 0.69f, 0.212f, 1.0f},
-    {0.317f, 0.553f, 0.161f, 1.0f}
-};
-
-GLWidget::GLWidget(QWidget *parent)
-    : QGLWidget(QGLFormat(QGL::SampleBuffers), parent)
-    , geom(0)
-    , cube(0)
-{
-    // create the pbuffer
-    QGLFormat pbufferFormat = format();
-    pbufferFormat.setSampleBuffers(false);
-    pbuffer = new QGLPixelBuffer(QSize(512, 512), pbufferFormat, this);
-    setWindowTitle(tr("OpenGL pbuffers"));
-    initializeGeometry();
-}
-
-GLWidget::~GLWidget()
-{
-    pbuffer->releaseFromDynamicTexture();
-    glDeleteTextures(1, &dynamicTexture);
-    delete pbuffer;
-
-    qDeleteAll(cubes);
-    qDeleteAll(tiles);
-    delete cube;
-}
-
-void GLWidget::initializeGL()
-{
-    initCommon();
-    glShadeModel(GL_SMOOTH);
-    glEnable(GL_LIGHTING);
-    glEnable(GL_LIGHT0);
-    static GLfloat lightPosition[4] = { 0.5, 5.0, 7.0, 1.0 };
-    glLightfv(GL_LIGHT0, GL_POSITION, lightPosition);
-    initPbuffer();
-    cube->startAnimation();
-    connect(cube, SIGNAL(changed()), this, SLOT(update()));
-    for (int i = 0; i < 3; ++i)
-    {
-        cubes[i]->startAnimation();
-        connect(cubes[i], SIGNAL(changed()), this, SLOT(update()));
-    }
-}
-
-void GLWidget::paintGL()
-{
-    pbuffer->makeCurrent();
-    drawPbuffer();
-    // On direct render platforms, drawing onto the pbuffer context above
-    // automatically updates the dynamic texture.  For cases where rendering
-    // directly to a texture is not supported, explicitly copy.
-    if (!hasDynamicTextureUpdate)
-        pbuffer->updateDynamicTexture(dynamicTexture);
-    makeCurrent();
-
-    // Use the pbuffer as a texture to render the scene
-    glBindTexture(GL_TEXTURE_2D, dynamicTexture);
-
-    // set up to render the scene
-    glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-    glLoadIdentity();
-    glTranslatef(0.0f, 0.0f, -10.0f);
-
-    // draw the background
-    glPushMatrix();
-    glScalef(aspect, 1.0f, 1.0f);
-    for (int i = 0; i < tiles.count(); ++i)
-        tiles[i]->draw();
-    glPopMatrix();
-
-    // draw the bouncing cubes
-    for (int i = 0; i < cubes.count(); ++i)
-        cubes[i]->draw();
-}
-
-void GLWidget::initializeGeometry()
-{
-    geom = new Geometry();
-    CubeBuilder cBuilder(geom, 0.5);
-    cBuilder.setColor(QColor(255, 255, 255, 212));
-    // build the 3 bouncing, spinning cubes
-    for (int i = 3; i > 0; --i)
-        cubes.append(cBuilder.newCube(QVector3D((float)(i-1), -1.5f, 5 - i)));
-
-    // build the spinning cube which goes in the dynamic texture
-    cube = cBuilder.newCube();
-    cube->removeBounce();
-
-    // build the background tiles
-    TileBuilder tBuilder(geom);
-    tBuilder.setColor(QColor(Qt::white));
-    for (int c = -2; c <= +2; ++c)
-        for (int r = -2; r <= +2; ++r)
-            tiles.append(tBuilder.newTile(QVector3D(c, r, 0)));
-
-    // graded backdrop for the pbuffer scene
-    TileBuilder bBuilder(geom, 0.0f, 2.0f);
-    bBuilder.setColor(QColor(102, 176, 54, 210));
-    backdrop = bBuilder.newTile(QVector3D(0.0f, 0.0f, -1.5f));
-    backdrop->setColors(colorArray);
-}
-
-void GLWidget::initCommon()
-{
-    qglClearColor(QColor(Qt::darkGray));
-
-    glEnable(GL_DEPTH_TEST);
-    glEnable(GL_CULL_FACE);
-    glEnable(GL_MULTISAMPLE);
-
-    glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-    glEnable(GL_BLEND);
-
-    glEnable(GL_TEXTURE_2D);
-
-    geom->loadArrays();
-}
-
-void GLWidget::perspectiveProjection()
-{
-    glMatrixMode(GL_PROJECTION);
-    glLoadIdentity();
-#ifdef QT_OPENGL_ES
-    glFrustumf(-aspect, +aspect, -1.0, +1.0, 4.0, 15.0);
-#else
-    glFrustum(-aspect, +aspect, -1.0, +1.0, 4.0, 15.0);
-#endif
-    glMatrixMode(GL_MODELVIEW);
-}
-
-void GLWidget::orthographicProjection()
-{
-    glMatrixMode(GL_PROJECTION);
-    glLoadIdentity();
-#ifdef QT_OPENGL_ES
-    glOrthof(-1.0, +1.0, -1.0, +1.0, -90.0, +90.0);
-#else
-    glOrtho(-1.0, +1.0, -1.0, +1.0, -90.0, +90.0);
-#endif
-    glMatrixMode(GL_MODELVIEW);
-}
-
-void GLWidget::resizeGL(int width, int height)
-{
-    glViewport(0, 0, width * devicePixelRatio(), height * devicePixelRatio());
-    aspect = (qreal)width / (qreal)(height ? height : 1);
-    perspectiveProjection();
-}
-
-void GLWidget::drawPbuffer()
-{
-    orthographicProjection();
-
-    glClearColor(0.0f, 0.0f, 0.0f, 1.0f);
-    glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-
-    glDisable(GL_TEXTURE_2D);
-    backdrop->draw();
-    glEnable(GL_TEXTURE_2D);
-
-    glBindTexture(GL_TEXTURE_2D, cubeTexture);
-    glDisable(GL_CULL_FACE);
-    cube->draw();
-    glEnable(GL_CULL_FACE);
-
-    glFlush();
-}
-
-void GLWidget::initPbuffer()
-{
-    pbuffer->makeCurrent();
-
-    cubeTexture = bindTexture(QImage(":res/cubelogo.png"));
-
-    initCommon();
-
-    // generate a texture that has the same size/format as the pbuffer
-    dynamicTexture = pbuffer->generateDynamicTexture();
-
-    // bind the dynamic texture to the pbuffer - this is a no-op under X11
-    hasDynamicTextureUpdate = pbuffer->bindToDynamicTexture(dynamicTexture);
-    makeCurrent();
-}
-
-void GLWidget::setAnimationPaused(bool enable)
-{
-    cube->setAnimationPaused(enable);
-    for (int i = 0; i < 3; ++i)
-        cubes[i]->setAnimationPaused(enable);
-}
diff --git a/examples/opengl/legacy/pbuffers/glwidget.h b/examples/opengl/legacy/pbuffers/glwidget.h
deleted file mode 100644
index 397329c428..0000000000
--- a/examples/opengl/legacy/pbuffers/glwidget.h
+++ /dev/null
@@ -1,99 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, you may use this file under the terms of the BSD license
-** as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef GLWIDGET_H
-#define GLWIDGET_H
-
-#include <QGLWidget>
-
-class Geometry;
-class Cube;
-class Tile;
-QT_BEGIN_NAMESPACE
-class QGLPixelBuffer;
-QT_END_NAMESPACE
-
-class GLWidget : public QGLWidget
-{
-public:
-    GLWidget(QWidget *parent = 0);
-    ~GLWidget();
-
-protected:
-    void initializeGL() override;
-    void paintGL() override;
-    void resizeGL(int width, int height) override;
-    void mousePressEvent(QMouseEvent *) override { setAnimationPaused(true); }
-    void mouseReleaseEvent(QMouseEvent *) override { setAnimationPaused(false); }
-
-private:
-    void initializeGeometry();
-    void initPbuffer();
-    void initCommon();
-    void perspectiveProjection();
-    void orthographicProjection();
-    void drawPbuffer();
-    void setAnimationPaused(bool enable);
-
-    qreal aspect;
-    GLuint dynamicTexture;
-    GLuint cubeTexture;
-    bool hasDynamicTextureUpdate;
-    QGLPixelBuffer *pbuffer;
-    Geometry *geom;
-    Cube *cube;
-    Tile *backdrop;
-    QList<Cube *> cubes;
-    QList<Tile *> tiles;
-
-};
-//! [3]
-
-#endif
diff --git a/examples/opengl/legacy/pbuffers/main.cpp b/examples/opengl/legacy/pbuffers/main.cpp
deleted file mode 100644
index 157f450b75..0000000000
--- a/examples/opengl/legacy/pbuffers/main.cpp
+++ /dev/null
@@ -1,75 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, you may use this file under the terms of the BSD license
-** as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <QtWidgets/QApplication>
-#include <QtWidgets/QMessageBox>
-#include <QtOpenGL/QGLPixelBuffer>
-
-#include "glwidget.h"
-
-int main(int argc, char **argv)
-{
-    Q_INIT_RESOURCE(pbuffers);
-
-    QApplication a(argc, argv);
-    GLWidget widget(0);
-    widget.resize(640, 480);
-    widget.makeCurrent();
-
-    if (!QGLFormat::hasOpenGL() || !QGLPixelBuffer::hasOpenGLPbuffers()) {
-        QMessageBox::information(0, "OpenGL pbuffers",
-                                 "This system does not support OpenGL/pbuffers.");
-        return -1;
-    }
-
-    widget.show();
-    return a.exec();
-}
-
diff --git a/examples/opengl/legacy/pbuffers/pbuffers.pro b/examples/opengl/legacy/pbuffers/pbuffers.pro
deleted file mode 100644
index 7572ba3583..0000000000
--- a/examples/opengl/legacy/pbuffers/pbuffers.pro
+++ /dev/null
@@ -1,13 +0,0 @@
-HEADERS += glwidget.h \
-    cube.h
-SOURCES += glwidget.cpp \
-    main.cpp \
-    cube.cpp
-RESOURCES += pbuffers.qrc
-QT += opengl widgets
-
-# install
-target.path = $$[QT_INSTALL_EXAMPLES]/opengl/legacy/pbuffers
-INSTALLS += target
-
-qtConfig(opengles.|angle|dynamicgl): error("This example requires Qt to be configured with -opengl desktop")
diff --git a/examples/opengl/legacy/pbuffers/pbuffers.qrc b/examples/opengl/legacy/pbuffers/pbuffers.qrc
deleted file mode 100644
index 9fc1a56a1a..0000000000
--- a/examples/opengl/legacy/pbuffers/pbuffers.qrc
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE RCC><RCC version="1.0">
-<qresource prefix="/res">
-   <file>cubelogo.png</file>
-</qresource>
-</RCC>
diff --git a/examples/opengl/legacy/pbuffers2/bubbles.svg b/examples/opengl/legacy/pbuffers2/bubbles.svg
deleted file mode 100644
index 51730124a2..0000000000
--- a/examples/opengl/legacy/pbuffers2/bubbles.svg
+++ /dev/null
@@ -1,215 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
-<svg width="20cm" height="15cm" viewBox="0 0 800 600"
-    xmlns="http://www.w3.org/2000/svg"
-    xmlns:xlink="http://www.w3.org/1999/xlink/"
-    baseProfile="tiny" version="1.2">
-  <title>Spheres</title>
-  <desc>Semi-transparent bubbles on a colored background.</desc>
-    <defs>
-      <!-- Create radial gradients for each bubble. -->
-      <radialGradient id="blueBubble" gradientUnits="userSpaceOnUse"
-                      cx="0" cy="0" r="100" fx="-50" fy="-50">
-        <stop offset="0%" stop-color="white" stop-opacity="1" />
-        <stop offset="25%" stop-color="#cdcdff" stop-opacity=".65" />
-        <stop offset="100%" stop-color="#cdaacd" stop-opacity=".75" />
-      </radialGradient>
-      <radialGradient id="redBubble" gradientUnits="userSpaceOnUse"
-                      cx="0" cy="0" r="100" fx="-50" fy="-50">
-        <stop offset="0%" stop-color="white" stop-opacity="1" />
-        <stop offset="25%" stop-color="#ffcdcd" stop-opacity=".65" />
-        <stop offset="100%" stop-color="#bbbb99" stop-opacity=".75" />
-      </radialGradient>
-      <radialGradient id="greenBubble" gradientUnits="userSpaceOnUse"
-                      cx="0" cy="0" r="100" fx="-50" fy="-50">
-        <stop offset="0%" stop-color="white" stop-opacity="1" />
-        <stop offset="25%" stop-color="#cdffcd" stop-opacity=".65" />
-        <stop offset="100%" stop-color="#99aaaa" stop-opacity=".75" />
-      </radialGradient>
-      <radialGradient id="yellowBubble" gradientUnits="userSpaceOnUse"
-                      cx="0" cy="0" r="100" fx="-50" fy="-50">
-        <stop offset="0%" stop-color="white" stop-opacity="1" />
-        <stop offset="25%" stop-color="#ffffcd" stop-opacity=".65" />
-        <stop offset="100%" stop-color="#bbbbaa" stop-opacity=".75" />
-      </radialGradient>
-      <radialGradient id="background" gradientUnits="userSpaceOnUse"
-                      cx="0" cy="0" r="400" fx="250" fy="250">
-        <stop offset="0%" stop-color="#ffffee" />
-        <stop offset="100%" stop-color="#ccccaa" />
-      </radialGradient>
-      <linearGradient id="surface" gradientUnits="userSpaceOnUse"
-                      x1="-100" y1="200" x2="400" y2="200">
-        <stop offset="0%" stop-color="#ffffcc" />
-        <stop offset="100%" stop-color="#bbbb88" />
-      </linearGradient>
-
-      <!-- Create radial gradients for each circle to make them look like
-           spheres. -->
-      <radialGradient id="blueSphere" gradientUnits="userSpaceOnUse"
-                      cx="0" cy="0" r="100" fx="-50" fy="-50">
-        <stop offset="0%" stop-color="white" />
-        <stop offset="75%" stop-color="blue" />
-        <stop offset="100%" stop-color="#222244" />
-      </radialGradient>
-      <radialGradient id="redSphere" gradientUnits="userSpaceOnUse"
-                      cx="0" cy="0" r="100" fx="-50" fy="-50">
-        <stop offset="0%" stop-color="white" />
-        <stop offset="75%" stop-color="red" />
-        <stop offset="100%" stop-color="#442222" />
-      </radialGradient>
-      <radialGradient id="greenSphere" gradientUnits="userSpaceOnUse"
-                      cx="0" cy="0" r="100" fx="-50" fy="-50">
-        <stop offset="0%" stop-color="white" />
-        <stop offset="75%" stop-color="green" />
-        <stop offset="100%" stop-color="#113311" />
-      </radialGradient>
-      <radialGradient id="yellowSphere" gradientUnits="userSpaceOnUse"
-                      cx="0" cy="0" r="100" fx="-50" fy="-50">
-        <stop offset="0%" stop-color="white" />
-        <stop offset="75%" stop-color="yellow" />
-        <stop offset="100%" stop-color="#444422" />
-      </radialGradient>
-      <radialGradient id="shadowGrad" gradientUnits="userSpaceOnUse"
-                      cx="0" cy="0" r="100" fx="-50" fy="50">
-        <stop offset="0%" stop-color="black" stop-opacity="1.0" />
-        <stop offset="100%" stop-color="black" stop-opacity="0.0" />
-      </radialGradient>
-
-      <!-- Define a shadow for each sphere. -->
-      <circle id="shadow" fill="url(#shadowGrad)" cx="0" cy="0" r="100" />
-      <g id="bubble">
-        <circle fill="black" cx="0" cy="0" r="50" />
-        <circle fill="#a6ce39" cx="0" cy="0" r="33" />
-        <path fill="black" d="M 37,50 L 50,37 L 12,-1 L 22,-11 L 10,-24 L -24,10
-                              L -11,22 L -1,12 Z" />
-        <circle cx="0" cy="0" r="100" />
-      </g>
-    </defs>
-  <g>
-    <rect fill="url(#background)" x="0" y="0" width="800" height="600" />
-  </g>
-
-  <g transform="translate(200,700)">
-    <use xlink:href="#bubble" fill="url(#blueBubble)" />
-    <animateTransform attributeName="transform" type="translate" additive="sum"
-        values="0,0; 0,-800" begin="1s" dur="10s" fill="freeze" repeatCount="indefinite" />
-  </g>
-  <g transform="translate(315,700)">
-    <g transform="scale(0.5,0.5)">
-      <use xlink:href="#bubble" fill="url(#redBubble)" />
-    </g>
-    <animateTransform attributeName="transform" type="translate" additive="sum"
-        values="0,0; 0,-800" begin="3s" dur="7s" fill="freeze" repeatCount="indefinite" />
-  </g>
-  <g transform="translate(80,700)">
-    <g transform="scale(0.65,0.65)">
-      <use xlink:href="#bubble" fill="url(#greenBubble)" />
-    </g>
-    <animateTransform attributeName="transform" type="translate" additive="sum"
-        values="0,0; 0,-800" begin="5s" dur="9s" fill="freeze" repeatCount="indefinite" />
-  </g>
-  <g transform="translate(255,700)">
-    <g transform="scale(0.3,0.3)">
-      <use xlink:href="#bubble" fill="url(#yellowBubble)" />
-    </g>
-    <animateTransform attributeName="transform" type="translate" additive="sum"
-        values="0,0; 0,-800" begin="2s" dur="6s" fill="freeze" repeatCount="indefinite" />
-  </g>
-  <g transform="translate(565,700)">
-    <g transform="scale(0.4,0.4)">
-      <use xlink:href="#bubble" fill="url(#blueBubble)" />
-    </g>
-    <animateTransform attributeName="transform" type="translate" additive="sum"
-        values="0,0; 0,-800" begin="4s" dur="8s" fill="freeze" repeatCount="indefinite" />
-  </g>
-  <g transform="translate(715,700)">
-    <g transform="scale(0.6,0.6)">
-      <use xlink:href="#bubble" fill="url(#redBubble)" />
-    </g>
-    <animateTransform attributeName="transform" type="translate" additive="sum"
-        values="0,0; 0,-800" begin="1s" dur="4s" fill="freeze" repeatCount="indefinite" />
-  </g>
-  <g transform="translate(645,700)">
-    <g transform="scale(0.375,0.375)">
-      <use xlink:href="#bubble" fill="url(#greenBubble)" />
-    </g>
-    <animateTransform attributeName="transform" type="translate" additive="sum"
-        values="0,0; 0,-800" begin="0s" dur="11s" fill="freeze" repeatCount="indefinite" />
-  </g>
-  <g transform="translate(555,700)">
-    <g transform="scale(0.9,0.9)">
-      <use xlink:href="#bubble" fill="url(#yellowBubble)" />
-    </g>
-    <animateTransform attributeName="transform" type="translate" additive="sum"
-        values="0,0; 0,-800" begin="3s" dur="7.5s" fill="freeze" repeatCount="indefinite" />
-  </g>
-
-  <g transform="translate(360,700)">
-    <g transform="scale(0.5,0.5)">
-      <use xlink:href="#bubble" fill="url(#blueBubble)" />
-    </g>
-    <animateTransform attributeName="transform" type="translate" additive="sum"
-        values="0,0; 0,-800" begin="3s" dur="6s" fill="freeze" repeatCount="indefinite" />
-  </g>
-  <g transform="translate(215,700)">
-    <g transform="scale(0.45,0.45)">
-      <use xlink:href="#bubble" fill="url(#redBubble)" />
-    </g>
-    <animateTransform attributeName="transform" type="translate" additive="sum"
-        values="0,0; 0,-800" begin="5.5s" dur="7s" fill="freeze" repeatCount="indefinite" />
-  </g>
-  <g transform="translate(420,700)">
-    <g transform="scale(0.75,0.75)">
-      <use xlink:href="#bubble" fill="url(#greenBubble)" />
-    </g>
-    <animateTransform attributeName="transform" type="translate" additive="sum"
-        values="0,0; 0,-800" begin="1s" dur="9s" fill="freeze" repeatCount="indefinite" />
-  </g>
-  <g transform="translate(815,700)">
-    <g transform="scale(0.6,0.6)">
-      <use xlink:href="#bubble" fill="url(#yellowBubble)" />
-    </g>
-    <animateTransform attributeName="transform" type="translate" additive="sum"
-        values="0,0; 0,-800" begin="2s" dur="9.5s" fill="freeze" repeatCount="indefinite" />
-  </g>
-
-  <g transform="translate(225,375)" >
-    <g transform="scale(1.0,0.5)" >
-      <path d="M 0 0 L 350 0 L 450 450 L -100 450 z"
-            fill="url(#surface)" stroke="none" />
-    </g>
-  </g>
-    <g transform="translate(200,0)" >
-    <g transform="translate(200,490) scale(2.0,1.0) rotate(45)" >
-      <rect fill="#a6ce39" x="-69" y="-69" width="138" height="138" />
-      <circle fill="black" cx="0" cy="0" r="50" />
-      <circle fill="#a6ce39" cx="0" cy="0" r="33" />
-      <path fill="black" d="M 37,50 L 50,37 L 12,-1 L 22,-11 L 10,-24 L -24,10
-                            L -11,22 L -1,12 Z" />
-      <animateTransform attributeName="transform"  type="rotate" additive="sum" values="0; 360"
-	         begin="0s" dur="10s" fill="freeze" repeatCount="indefinite" />
-    </g>
-    <g transform="translate(200,375)">
-      <use xlink:href="#shadow" transform="translate(25,55) scale(1.0,0.5)" />
-      <circle fill="url(#blueSphere)" cx="0" cy="0" r="100" />
-    </g>
-    <g transform="translate(315,440)">
-      <g transform="scale(0.5,0.5)">
-        <use xlink:href="#shadow" transform="translate(25,55) scale(1.0,0.5)" />
-        <circle fill="url(#redSphere)" cx="0" cy="0" r="100" />
-      </g>
-    </g>
-    <g transform="translate(80,475)">
-      <g transform="scale(0.65,0.65)">
-        <use xlink:href="#shadow" transform="translate(25,55) scale(1.0,0.5)" />
-        <circle fill="url(#greenSphere)" cx="0" cy="0" r="100" />
-      </g>
-    </g>
-    <g transform="translate(255,525)">
-      <g transform="scale(0.3,0.3)">
-        <use xlink:href="#shadow" transform="translate(25,55) scale(1.0,0.5)" />
-        <circle fill="url(#yellowSphere)" cx="0" cy="0" r="100" />
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/examples/opengl/legacy/pbuffers2/designer.png b/examples/opengl/legacy/pbuffers2/designer.png
deleted file mode 100644
index 4f32d57496..0000000000
--- a/examples/opengl/legacy/pbuffers2/designer.png
+++ /dev/null
diff --git a/examples/opengl/legacy/pbuffers2/glwidget.cpp b/examples/opengl/legacy/pbuffers2/glwidget.cpp
deleted file mode 100644
index c710d03cab..0000000000
--- a/examples/opengl/legacy/pbuffers2/glwidget.cpp
+++ /dev/null
@@ -1,328 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, you may use this file under the terms of the BSD license
-** as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <QtGui/QImage>
-#include <qmath.h>
-#include "glwidget.h"
-
-#ifndef GL_MULTISAMPLE
-#define GL_MULTISAMPLE  0x809D
-#endif
-
-GLWidget::GLWidget(QWidget *parent)
-    : QGLWidget(QGLFormat(QGL::SampleBuffers), parent)
-{
-    setWindowTitle(tr("OpenGL pbuffers 2"));
-
-    pbuffer = new QGLPixelBuffer(1024, 1024, format(), this);
-
-    rot_x = rot_y = rot_z = 0.0f;
-    scale = 0.1f;
-    anim = new QTimeLine(750, this);
-    anim->setUpdateInterval(20);
-    connect(anim, SIGNAL(valueChanged(qreal)), SLOT(animate(qreal)));
-    connect(anim, SIGNAL(finished()), SLOT(animFinished()));
-
-    svg_renderer = new QSvgRenderer(QLatin1String(":/res/bubbles.svg"), this);
-    connect(svg_renderer, SIGNAL(repaintNeeded()), this, SLOT(draw()));
-
-    logo = QImage(":/res/designer.png");
-    logo = logo.convertToFormat(QImage::Format_ARGB32);
-
-    makeCurrent(); // need a current context to create the display list
-    tile_list = glGenLists(1);
-    glNewList(tile_list, GL_COMPILE);
-    glBegin(GL_QUADS);
-    {
-        glTexCoord2f(0.0f, 0.0f); glVertex3f(-1.0f, -1.0f,  1.0f);
-        glTexCoord2f(1.0f, 0.0f); glVertex3f( 1.0f, -1.0f,  1.0f);
-        glTexCoord2f(1.0f, 1.0f); glVertex3f( 1.0f,  1.0f,  1.0f);
-        glTexCoord2f(0.0f, 1.0f); glVertex3f(-1.0f,  1.0f,  1.0f);
-
-        glTexCoord2f(1.0f, 0.0f); glVertex3f(-1.0f, -1.0f, -1.0f);
-        glTexCoord2f(1.0f, 1.0f); glVertex3f(-1.0f,  1.0f, -1.0f);
-        glTexCoord2f(0.0f, 1.0f); glVertex3f( 1.0f,  1.0f, -1.0f);
-        glTexCoord2f(0.0f, 0.0f); glVertex3f( 1.0f, -1.0f, -1.0f);
-
-        glTexCoord2f(0.0f, 1.0f); glVertex3f(-1.0f,  1.0f, -1.0f);
-        glTexCoord2f(0.0f, 0.0f); glVertex3f(-1.0f,  1.0f,  1.0f);
-        glTexCoord2f(1.0f, 0.0f); glVertex3f( 1.0f,  1.0f,  1.0f);
-        glTexCoord2f(1.0f, 1.0f); glVertex3f( 1.0f,  1.0f, -1.0f);
-
-        glTexCoord2f(1.0f, 1.0f); glVertex3f(-1.0f, -1.0f, -1.0f);
-        glTexCoord2f(0.0f, 1.0f); glVertex3f( 1.0f, -1.0f, -1.0f);
-        glTexCoord2f(0.0f, 0.0f); glVertex3f( 1.0f, -1.0f,  1.0f);
-        glTexCoord2f(1.0f, 0.0f); glVertex3f(-1.0f, -1.0f,  1.0f);
-
-        glTexCoord2f(1.0f, 0.0f); glVertex3f( 1.0f, -1.0f, -1.0f);
-        glTexCoord2f(1.0f, 1.0f); glVertex3f( 1.0f,  1.0f, -1.0f);
-        glTexCoord2f(0.0f, 1.0f); glVertex3f( 1.0f,  1.0f,  1.0f);
-        glTexCoord2f(0.0f, 0.0f); glVertex3f( 1.0f, -1.0f,  1.0f);
-
-        glTexCoord2f(0.0f, 0.0f); glVertex3f(-1.0f, -1.0f, -1.0f);
-        glTexCoord2f(1.0f, 0.0f); glVertex3f(-1.0f, -1.0f,  1.0f);
-        glTexCoord2f(1.0f, 1.0f); glVertex3f(-1.0f,  1.0f,  1.0f);
-        glTexCoord2f(0.0f, 1.0f); glVertex3f(-1.0f,  1.0f, -1.0f);
-}
-    glEnd();
-    glEndList();
-
-    wave = new GLfloat[logo.width()*logo.height()];
-    memset(wave, 0, logo.width()*logo.height());
-    startTimer(30); // wave timer
-
-    pbuffer->makeCurrent();
-    dynamicTexture = pbuffer->generateDynamicTexture();
-
-    // bind the dynamic texture to the pbuffer - this is a no-op under X11
-    hasDynamicTextureUpdate = pbuffer->bindToDynamicTexture(dynamicTexture);
-}
-
-GLWidget::~GLWidget()
-{
-    delete[] wave;
-    glDeleteLists(tile_list, 1);
-    pbuffer->releaseFromDynamicTexture();
-    glDeleteTextures(1, &dynamicTexture);
-    delete pbuffer;
-}
-
-void GLWidget::paintEvent(QPaintEvent *)
-{
-    draw();
-}
-
-void GLWidget::draw()
-{
-    QPainter p(this); // used for text overlay
-
-    // save the GL state set for QPainter
-    p.beginNativePainting();
-    saveGLState();
-
-    // render the 'bubbles.svg' file into our pbuffer
-    QPainter pbuffer_painter(pbuffer);
-    svg_renderer->render(&pbuffer_painter);
-    pbuffer_painter.end();
-    glFlush();
-
-    if (!hasDynamicTextureUpdate)
-        pbuffer->updateDynamicTexture(dynamicTexture);
-
-    makeCurrent();
-    // draw into the GL widget
-    glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-    glMatrixMode(GL_PROJECTION);
-    glLoadIdentity();
-    glFrustum(-1, 1, -1, 1, 10, 100);
-    glTranslatef(0.0f, 0.0f, -15.0f);
-    glMatrixMode(GL_MODELVIEW);
-    glLoadIdentity();
-    glViewport(0, 0, width() * devicePixelRatio(), height() * devicePixelRatio());
-
-    glBindTexture(GL_TEXTURE_2D, dynamicTexture);
-    glEnable(GL_TEXTURE_2D);
-    glEnable(GL_MULTISAMPLE);
-    glEnable(GL_CULL_FACE);
-    glEnable(GL_BLEND);
-    glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-
-    // draw background
-    glPushMatrix();
-    glScalef(1.7f, 1.7f, 1.7f);
-    glColor4f(1.0f, 1.0f, 1.0f, 1.0f);
-    glCallList(tile_list);
-    glPopMatrix();
-
-    const int w = logo.width();
-    const int h = logo.height();
-
-    glRotatef(rot_x, 1.0f, 0.0f, 0.0f);
-    glRotatef(rot_y, 0.0f, 1.0f, 0.0f);
-    glRotatef(rot_z, 0.0f, 0.0f, 1.0f);
-    glScalef(scale/w, scale/w, scale/w);
-
-    glDepthFunc(GL_LESS);
-    glEnable(GL_DEPTH_TEST);
-
-    // draw the Qt icon
-    glTranslatef(-w+1, -h+1, 0.0f);
-    for (int y=h-1; y>=0; --y) {
-        uint *p = (uint*) logo.scanLine(y);
-        uint *end = p + w;
-        int  x = 0;
-        while (p < end) {
-            glColor4ub(qRed(*p), qGreen(*p), qBlue(*p), uchar(qAlpha(*p)*.9));
-            glTranslatef(0.0f, 0.0f, wave[y*w+x]);
-            if (qAlpha(*p) > 128)
-                glCallList(tile_list);
-            glTranslatef(0.0f, 0.0f, -wave[y*w+x]);
-            glTranslatef(2.0f, 0.0f, 0.0f);
-            ++x;
-            ++p;
-        }
-        glTranslatef(-w*2.0f, 2.0f, 0.0f);
-    }
-
-    // restore the GL state that QPainter expects
-    restoreGLState();
-    p.endNativePainting();
-
-    // draw the overlayed text using QPainter
-    p.setPen(QColor(197, 197, 197, 157));
-    p.setBrush(QColor(197, 197, 197, 127));
-    p.drawRect(QRect(0, 0, width(), 50));
-    p.setPen(Qt::black);
-    p.setBrush(Qt::NoBrush);
-    const QString str1(tr("A simple OpenGL pbuffer example."));
-    const QString str2(tr("Use the mouse wheel to zoom, press buttons and move mouse to rotate, double-click to flip."));
-    QFontMetrics fm(p.font());
-    p.drawText(width()/2 - fm.width(str1)/2, 20, str1);
-    p.drawText(width()/2 - fm.width(str2)/2, 20 + fm.lineSpacing(), str2);
-}
-
-void GLWidget::mousePressEvent(QMouseEvent *e)
-{
-    anchor = e->pos();
-}
-
-void GLWidget::mouseMoveEvent(QMouseEvent *e)
-{
-    QPoint diff = e->pos() - anchor;
-    if (e->buttons() & Qt::LeftButton) {
-        rot_x += diff.y()/5.0f;
-        rot_y += diff.x()/5.0f;
-    } else if (e->buttons() & Qt::RightButton) {
-        rot_z += diff.x()/5.0f;
-    }
-
-    anchor = e->pos();
-    draw();
-}
-
-void GLWidget::wheelEvent(QWheelEvent *e)
-{
-    e->delta() > 0 ? scale += scale*0.1f : scale -= scale*0.1f;
-    draw();
-}
-
-void GLWidget::mouseDoubleClickEvent(QMouseEvent *)
-{
-    anim->start();
-}
-
-void GLWidget::animate(qreal val)
-{
-    rot_y = val * 180;
-    draw();
-}
-
-void GLWidget::animFinished()
-{
-    if (anim->direction() == QTimeLine::Forward)
-        anim->setDirection(QTimeLine::Backward);
-    else
-        anim->setDirection(QTimeLine::Forward);
-}
-
-void GLWidget::saveGLState()
-{
-    glPushAttrib(GL_ALL_ATTRIB_BITS);
-    glMatrixMode(GL_PROJECTION);
-    glPushMatrix();
-    glMatrixMode(GL_MODELVIEW);
-    glPushMatrix();
-}
-
-void GLWidget::restoreGLState()
-{
-    glMatrixMode(GL_PROJECTION);
-    glPopMatrix();
-    glMatrixMode(GL_MODELVIEW);
-    glPopMatrix();
-    glPopAttrib();
-}
-
-void GLWidget::timerEvent(QTimerEvent *)
-{
-    if (QApplication::mouseButtons() != 0)
-        return;
-
-    static bool scale_in = true;
-
-    if (scale_in && scale > 35.0f)
-        scale_in = false;
-    else if (!scale_in && scale < .5f)
-        scale_in = true;
-
-    scale *= scale_in ? 1.01f : 0.99f;
-    rot_z += 0.3f;
-    rot_x += 0.1f;
-
-    static float wt = 0.0;
-    wt += 0.1f;
-
-    const int width = logo.width();
-    const int dx = width >> 1, dy = dx; // disturbance point
-    const float v = -4; // wave speed
-    const float W = .3f;
-    const int AMP = 5;
-
-    for (int i = 0; i < width; ++i) {
-        for (int j = 0; j < width; ++j) {
-            const float s = hypot(j - dx, i - dy);
-            const double raw = AMP * sin(2 * M_PI * W * (wt + s / v));
-            if (s != 0)
-                wave[i * width + j] = raw / (0.2 * (s + 2));
-            else
-                wave[i * width + j] = raw;
-        }
-    }
-}
diff --git a/examples/opengl/legacy/pbuffers2/glwidget.h b/examples/opengl/legacy/pbuffers2/glwidget.h
deleted file mode 100644
index 2889754ce4..0000000000
--- a/examples/opengl/legacy/pbuffers2/glwidget.h
+++ /dev/null
@@ -1,94 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, you may use this file under the terms of the BSD license
-** as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <QtOpenGL>
-#include <QImage>
-#include <QTimeLine>
-#include <QSvgRenderer>
-
-class GLWidget : public QGLWidget
-{
-    Q_OBJECT
-
-public:
-    GLWidget(QWidget *parent);
-    ~GLWidget();
-
-    void saveGLState();
-    void restoreGLState();
-
-    void paintEvent(QPaintEvent *);
-    void mousePressEvent(QMouseEvent *);
-    void mouseDoubleClickEvent(QMouseEvent *);
-    void mouseMoveEvent(QMouseEvent *);
-    void timerEvent(QTimerEvent *);
-    void wheelEvent(QWheelEvent *);
-
-public slots:
-    void animate(qreal);
-    void animFinished();
-    void draw();
-
-private:
-    QPoint anchor;
-    float scale;
-    float rot_x, rot_y, rot_z;
-    GLuint tile_list;
-    GLfloat *wave;
-    bool hasDynamicTextureUpdate;
-
-    QImage logo;
-    QTimeLine *anim;
-    QSvgRenderer *svg_renderer;
-
-    GLuint dynamicTexture;
-    QGLPixelBuffer *pbuffer;
-};
-
diff --git a/examples/opengl/legacy/pbuffers2/main.cpp b/examples/opengl/legacy/pbuffers2/main.cpp
deleted file mode 100644
index 03da7ab545..0000000000
--- a/examples/opengl/legacy/pbuffers2/main.cpp
+++ /dev/null
@@ -1,71 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, you may use this file under the terms of the BSD license
-** as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <QtWidgets/QApplication>
-#include <QtWidgets/QMessageBox>
-#include "glwidget.h"
-
-int main(int argc, char **argv)
-{
-    Q_INIT_RESOURCE(pbuffers2);
-
-    QApplication a(argc, argv);
-    GLWidget widget(0);
-    widget.resize(640, 480);
-    widget.makeCurrent();
-    if (!QGLFormat::hasOpenGL() || !QGLPixelBuffer::hasOpenGLPbuffers()) {
-        QMessageBox::information(0, "OpenGL pbuffers 2",
-                                 "This system does not support OpenGL/pbuffers.");
-        return -1;
-    }
-    widget.show();
-    return a.exec();
-}
-
diff --git a/examples/opengl/legacy/pbuffers2/pbuffers2.pro b/examples/opengl/legacy/pbuffers2/pbuffers2.pro
deleted file mode 100644
index f1baae3931..0000000000
--- a/examples/opengl/legacy/pbuffers2/pbuffers2.pro
+++ /dev/null
@@ -1,11 +0,0 @@
-QT += opengl svg widgets
-
-HEADERS += glwidget.h
-SOURCES += glwidget.cpp main.cpp
-RESOURCES += pbuffers2.qrc
-
-# install
-target.path = $$[QT_INSTALL_EXAMPLES]/opengl/legacy/pbuffers2
-INSTALLS += target
-
-qtConfig(opengles.|angle|dynamicgl): error("This example requires Qt to be configured with -opengl desktop")
diff --git a/examples/opengl/legacy/pbuffers2/pbuffers2.qrc b/examples/opengl/legacy/pbuffers2/pbuffers2.qrc
deleted file mode 100644
index 986f1ca385..0000000000
--- a/examples/opengl/legacy/pbuffers2/pbuffers2.qrc
+++ /dev/null
@@ -1,6 +0,0 @@
-<!DOCTYPE RCC><RCC version="1.0">
-<qresource prefix="/res">
-   <file>bubbles.svg</file>
-   <file>designer.png</file>
-</qresource>
-</RCC>
diff --git a/examples/opengl/legacy/samplebuffers/glwidget.cpp b/examples/opengl/legacy/samplebuffers/glwidget.cpp
deleted file mode 100644
index da30de4d55..0000000000
--- a/examples/opengl/legacy/samplebuffers/glwidget.cpp
+++ /dev/null
@@ -1,174 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, you may use this file under the terms of the BSD license
-** as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "glwidget.h"
-#include <qmath.h>
-
-#ifndef GL_MULTISAMPLE
-#define GL_MULTISAMPLE  0x809D
-#endif
-
-GLWidget::GLWidget(QWidget *parent)
-    : QGLWidget(QGLFormat(QGL::SampleBuffers), parent)
-{
-    startTimer(40);
-    setWindowTitle(tr("Sample Buffers"));
-}
-
-void GLWidget::initializeGL()
-{
-    glMatrixMode(GL_PROJECTION);
-    glLoadIdentity();
-    glOrtho(-.5, .5, .5, -.5, -1000, 1000);
-    glMatrixMode(GL_MODELVIEW);
-    glLoadIdentity();
-    glClearColor(1.0f, 1.0f, 1.0f, 1.0f);
-
-    makeObject();
-}
-
-void GLWidget::resizeGL(int w, int h)
-{
-    glViewport(0, 0, w, h);
-}
-
-void GLWidget::paintGL()
-{
-    static float rot = 0.0;
-    glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-
-    glMatrixMode(GL_MODELVIEW);
-    glPushMatrix();
-    glEnable(GL_MULTISAMPLE);
-    glTranslatef(-0.25f, -0.10f, 0.0f);
-    glScalef(0.75f, 1.15f, 0.0f);
-    glRotatef(rot, 0.0f, 0.f, 1.0f);
-    glCallList(list);
-    glPopMatrix();
-
-    glPushMatrix();
-    glDisable(GL_MULTISAMPLE);
-    glTranslatef(0.25f, -0.10f, 0.0f);
-    glScalef(0.75f, 1.15f, 0.0f);
-    glRotatef(rot, 0.0f, 0.0f, 1.0f);
-    glCallList(list);
-    glPopMatrix();
-
-    rot += 0.2f;
-
-    qglColor(Qt::black);
-    renderText(-0.35, 0.4, 0.0, "Multisampling enabled");
-    renderText(0.15, 0.4, 0.0, "Multisampling disabled");
-}
-
-void GLWidget::timerEvent(QTimerEvent *)
-{
-    update();
-}
-
-void GLWidget::makeObject()
-{
-    QColor qtGreen(QColor::fromCmykF(0.40, 0.0, 1.0, 0.0));
-    const int NumSectors = 15;
-    GLdouble x1 = +0.06;
-    GLdouble y1 = -0.14;
-    GLdouble x2 = +0.14;
-    GLdouble y2 = -0.06;
-    GLdouble x3 = +0.08;
-    GLdouble y3 = +0.00;
-    GLdouble x4 = +0.30;
-    GLdouble y4 = +0.22;
-
-    list = glGenLists(1);
-    glNewList(list, GL_COMPILE);
-    {
-        const double sectorAngle = 2 * M_PI / NumSectors;
-        for (int i = 0; i < NumSectors; ++i) {
-            double angle = i * sectorAngle;
-            GLdouble x5 = 0.30 * sin(angle);
-            GLdouble y5 = 0.30 * cos(angle);
-            GLdouble x6 = 0.20 * sin(angle);
-            GLdouble y6 = 0.20 * cos(angle);
-
-            angle += sectorAngle;
-            GLdouble x7 = 0.20 * sin(angle);
-            GLdouble y7 = 0.20 * cos(angle);
-            GLdouble x8 = 0.30 * sin(angle);
-            GLdouble y8 = 0.30 * cos(angle);
-
-            qglColor(qtGreen);
-            quad(GL_QUADS, x5, y5, x6, y6, x7, y7, x8, y8);
-            qglColor(Qt::black);
-            quad(GL_LINE_LOOP, x5, y5, x6, y6, x7, y7, x8, y8);
-        }
-
-        qglColor(qtGreen);
-        quad(GL_QUADS, x1, y1, x2, y2, y2, x2, y1, x1);
-        quad(GL_QUADS, x3, y3, x4, y4, y4, x4, y3, x3);
-
-        qglColor(Qt::black);
-        quad(GL_LINE_LOOP, x1, y1, x2, y2, y2, x2, y1, x1);
-        quad(GL_LINE_LOOP, x3, y3, x4, y4, y4, x4, y3, x3);
-    }
-    glEndList();
-}
-
-void GLWidget::quad(GLenum primitive, GLdouble x1, GLdouble y1, GLdouble x2, GLdouble y2,
-                    GLdouble x3, GLdouble y3, GLdouble x4, GLdouble y4)
-{
-    glBegin(primitive);
-    {
-        glVertex2d(x1, y1);
-        glVertex2d(x2, y2);
-        glVertex2d(x3, y3);
-        glVertex2d(x4, y4);
-    }
-    glEnd();
-}
diff --git a/examples/opengl/legacy/samplebuffers/glwidget.h b/examples/opengl/legacy/samplebuffers/glwidget.h
deleted file mode 100644
index f02f0835ef..0000000000
--- a/examples/opengl/legacy/samplebuffers/glwidget.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, you may use this file under the terms of the BSD license
-** as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <QtOpenGL>
-
-class GLWidget : public QGLWidget
-{
-public:
-    GLWidget(QWidget *parent);
-
-protected:
-    void initializeGL() override;
-    void resizeGL(int w, int h) override;
-    void paintGL() override;
-    void timerEvent(QTimerEvent *) override;
-
-    void makeObject();
-    void quad(GLenum primitive, GLdouble x1, GLdouble y1, GLdouble x2, GLdouble y2,
-              GLdouble x3, GLdouble y3, GLdouble x4, GLdouble y4);
-
-private:
-    GLuint list;
-};
-
diff --git a/examples/opengl/legacy/samplebuffers/main.cpp b/examples/opengl/legacy/samplebuffers/main.cpp
deleted file mode 100644
index 216dff1fda..0000000000
--- a/examples/opengl/legacy/samplebuffers/main.cpp
+++ /dev/null
@@ -1,81 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, you may use this file under the terms of the BSD license
-** as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <QtWidgets/QApplication>
-#include <QtWidgets/QMessageBox>
-#include "glwidget.h"
-
-int main(int argc, char **argv)
-{
-    QApplication a(argc, argv);
-
-    QGLFormat f = QGLFormat::defaultFormat();
-    f.setSampleBuffers(true);
-    QGLFormat::setDefaultFormat(f);
-    if (!QGLFormat::hasOpenGL()) {
-        QMessageBox::information(0, "OpenGL samplebuffers",
-                                 "This system does not support OpenGL.");
-        return 0;
-    }
-
-    GLWidget widget(0);
-
-    if (!widget.format().sampleBuffers()) {
-        QMessageBox::information(0, "OpenGL samplebuffers",
-                                 "This system does not have sample buffer support.");
-        return 0;
-    }
-
-    widget.resize(640, 480);
-    widget.show();
-
-    return a.exec();
-}
-
diff --git a/examples/opengl/legacy/samplebuffers/samplebuffers.pro b/examples/opengl/legacy/samplebuffers/samplebuffers.pro
deleted file mode 100644
index aca56f8df8..0000000000
--- a/examples/opengl/legacy/samplebuffers/samplebuffers.pro
+++ /dev/null
@@ -1,10 +0,0 @@
-HEADERS += glwidget.h
-SOURCES += glwidget.cpp main.cpp
-
-QT += opengl widgets
-
-# install
-target.path = $$[QT_INSTALL_EXAMPLES]/opengl/legacy/samplebuffers
-INSTALLS += target
-
-qtConfig(opengles.|angle|dynamicgl): error("This example requires Qt to be configured with -opengl desktop")
diff --git a/examples/opengl/legacy/shared/qtlogo.cpp b/examples/opengl/legacy/shared/qtlogo.cpp
deleted file mode 100644
index 9ad274ce09..0000000000
--- a/examples/opengl/legacy/shared/qtlogo.cpp
+++ /dev/null
@@ -1,398 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, you may use this file under the terms of the BSD license
-** as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qtlogo.h"
-
-#include <QGLWidget>
-#include <QMatrix4x4>
-#include <QVector3D>
-#include <QOpenGLFunctions_1_1>
-
-#include <qmath.h>
-
-static const qreal tee_height = 0.311126;
-static const qreal cross_width = 0.25;
-static const qreal bar_thickness = 0.113137;
-static const qreal logo_depth = 0.10;
-
-//! [0]
-struct Geometry
-{
-    QVector<GLushort> faces;
-    QVector<QVector3D> vertices;
-    QVector<QVector3D> normals;
-    void appendSmooth(const QVector3D &a, const QVector3D &n, int from);
-    void appendFaceted(const QVector3D &a, const QVector3D &n);
-    void finalize();
-    void loadArrays(QOpenGLFunctions_1_1 *functions) const;
-};
-//! [0]
-
-//! [1]
-class Patch
-{
-public:
-    enum Smoothing { Faceted, Smooth };
-    Patch(Geometry *);
-    void setSmoothing(Smoothing s) { sm = s; }
-    void translate(const QVector3D &t);
-    void rotate(qreal deg, QVector3D axis);
-    void draw(QOpenGLFunctions_1_1 *functions) const;
-    void addTri(const QVector3D &a, const QVector3D &b, const QVector3D &c, const QVector3D &n);
-    void addQuad(const QVector3D &a, const QVector3D &b,  const QVector3D &c, const QVector3D &d);
-
-    GLushort start;
-    GLushort count;
-    GLushort initv;
-
-    GLfloat faceColor[4];
-    QMatrix4x4 mat;
-    Smoothing sm;
-    Geometry *geom;
-};
-//! [1]
-
-static inline void qSetColor(float colorVec[], QColor c)
-{
-    colorVec[0] = c.redF();
-    colorVec[1] = c.greenF();
-    colorVec[2] = c.blueF();
-    colorVec[3] = c.alphaF();
-}
-
-void Geometry::loadArrays(QOpenGLFunctions_1_1 *functions) const
-{
-    functions->glVertexPointer(3, GL_FLOAT, 0, vertices.constData());
-    functions->glNormalPointer(GL_FLOAT, 0, normals.constData());
-}
-
-void Geometry::finalize()
-{
-    // TODO: add vertex buffer uploading here
-
-    // Finish smoothing normals by ensuring accumulated normals are returned
-    // to length 1.0.
-    for (int i = 0; i < normals.count(); ++i)
-        normals[i].normalize();
-}
-
-void Geometry::appendSmooth(const QVector3D &a, const QVector3D &n, int from)
-{
-    // Smooth normals are achieved by averaging the normals for faces meeting
-    // at a point.  First find the point in geometry already generated
-    // (working backwards, since most often the points shared are between faces
-    // recently added).
-    int v = vertices.count() - 1;
-    for ( ; v >= from; --v)
-        if (qFuzzyCompare(vertices[v], a))
-            break;
-
-    if (v < from) {
-        // The vertex was not found so add it as a new one, and initialize
-        // its corresponding normal
-        v = vertices.count();
-        vertices.append(a);
-        normals.append(n);
-    } else {
-        // Vert found, accumulate normals into corresponding normal slot.
-        // Must call finalize once finished accumulating normals
-        normals[v] += n;
-    }
-
-    // In both cases (found or not) reference the vertex via its index
-    faces.append(v);
-}
-
-void Geometry::appendFaceted(const QVector3D &a, const QVector3D &n)
-{
-    // Faceted normals are achieved by duplicating the vertex for every
-    // normal, so that faces meeting at a vertex get a sharp edge.
-    int v = vertices.count();
-    vertices.append(a);
-    normals.append(n);
-    faces.append(v);
-}
-
-Patch::Patch(Geometry *g)
-   : start(g->faces.count())
-   , count(0)
-   , initv(g->vertices.count())
-   , sm(Patch::Smooth)
-   , geom(g)
-{
-    qSetColor(faceColor, QColor(Qt::darkGray));
-}
-
-void Patch::rotate(qreal deg, QVector3D axis)
-{
-    mat.rotate(deg, axis);
-}
-
-void Patch::translate(const QVector3D &t)
-{
-    mat.translate(t);
-}
-
-//! [2]
-void Patch::draw(QOpenGLFunctions_1_1 *functions) const
-{
-    functions->glPushMatrix();
-    functions->glMultMatrixf(mat.constData());
-    functions->glMaterialfv(GL_FRONT_AND_BACK, GL_AMBIENT_AND_DIFFUSE, faceColor);
-
-    const GLushort *indices = geom->faces.constData();
-    functions->glDrawElements(GL_TRIANGLES, count, GL_UNSIGNED_SHORT, indices + start);
-    functions->glPopMatrix();
-}
-//! [2]
-
-void Patch::addTri(const QVector3D &a, const QVector3D &b, const QVector3D &c, const QVector3D &n)
-{
-    QVector3D norm = n.isNull() ? QVector3D::normal(a, b, c) : n;
-
-    if (sm == Smooth) {
-        geom->appendSmooth(a, norm, initv);
-        geom->appendSmooth(b, norm, initv);
-        geom->appendSmooth(c, norm, initv);
-    } else {
-        geom->appendFaceted(a, norm);
-        geom->appendFaceted(b, norm);
-        geom->appendFaceted(c, norm);
-    }
-
-    count += 3;
-}
-
-void Patch::addQuad(const QVector3D &a, const QVector3D &b,  const QVector3D &c, const QVector3D &d)
-{
-    QVector3D norm = QVector3D::normal(a, b, c);
-
-    if (sm == Smooth) {
-        addTri(a, b, c, norm);
-        addTri(a, c, d, norm);
-    } else {
-        // If faceted share the two common vertices
-        addTri(a, b, c, norm);
-        int k = geom->vertices.count();
-        geom->appendSmooth(a, norm, k);
-        geom->appendSmooth(c, norm, k);
-        geom->appendFaceted(d, norm);
-        count += 3;
-    }
-}
-
-static inline QVector<QVector3D> extrude(const QVector<QVector3D> &vertices, qreal depth)
-{
-    QVector<QVector3D> extr = vertices;
-    for (int v = 0; v < extr.count(); ++v)
-        extr[v].setZ(extr[v].z() - depth);
-    return extr;
-}
-
-class Rectoid
-{
-public:
-    void translate(const QVector3D &t)
-    {
-        for (int i = 0; i < parts.count(); ++i)
-            parts[i]->translate(t);
-    }
-
-    void rotate(qreal deg, QVector3D axis)
-    {
-        for (int i = 0; i < parts.count(); ++i)
-            parts[i]->rotate(deg, axis);
-    }
-
-    // No special Rectoid destructor - the parts are fetched out of this member
-    // variable, and destroyed by the new owner
-    QList<Patch *> parts;
-};
-
-class RectPrism : public Rectoid
-{
-public:
-    RectPrism(Geometry *g, qreal width, qreal height, qreal depth);
-};
-
-RectPrism::RectPrism(Geometry *g, qreal width, qreal height, qreal depth)
-{
-    enum { bl, br, tr, tl };
-    Patch *fb = new Patch(g);
-    fb->setSmoothing(Patch::Faceted);
-
-    // front face
-    QVector<QVector3D> r(4);
-    r[br].setX(width);
-    r[tr].setX(width);
-    r[tr].setY(height);
-    r[tl].setY(height);
-    QVector3D adjToCenter(-width / 2.0, -height / 2.0, depth / 2.0);
-    for (int i = 0; i < 4; ++i)
-        r[i] += adjToCenter;
-    fb->addQuad(r[bl], r[br], r[tr], r[tl]);
-
-    // back face
-    QVector<QVector3D> s = extrude(r, depth);
-    fb->addQuad(s[tl], s[tr], s[br], s[bl]);
-
-    // side faces
-    Patch *sides = new Patch(g);
-    sides->setSmoothing(Patch::Faceted);
-    sides->addQuad(s[bl], s[br], r[br], r[bl]);
-    sides->addQuad(s[br], s[tr], r[tr], r[br]);
-    sides->addQuad(s[tr], s[tl], r[tl], r[tr]);
-    sides->addQuad(s[tl], s[bl], r[bl], r[tl]);
-
-    parts << fb << sides;
-}
-
-class RectTorus : public Rectoid
-{
-public:
-    RectTorus(Geometry *g, qreal iRad, qreal oRad, qreal depth, int numSectors);
-};
-
-RectTorus::RectTorus(Geometry *g, qreal iRad, qreal oRad, qreal depth, int k)
-{
-    QVector<QVector3D> inside;
-    QVector<QVector3D> outside;
-    for (int i = 0; i < k; ++i) {
-        qreal angle = (i * 2 * M_PI) / k;
-        inside << QVector3D(iRad * qSin(angle), iRad * qCos(angle), depth / 2.0);
-        outside << QVector3D(oRad * qSin(angle), oRad * qCos(angle), depth / 2.0);
-    }
-    inside << QVector3D(0.0, iRad, 0.0);
-    outside << QVector3D(0.0, oRad, 0.0);
-    QVector<QVector3D> in_back = extrude(inside, depth);
-    QVector<QVector3D> out_back = extrude(outside, depth);
-
-    // Create front, back and sides as separate patches so that smooth normals
-    // are generated for the curving sides, but a faceted edge is created between
-    // sides and front/back
-    Patch *front = new Patch(g);
-    for (int i = 0; i < k; ++i)
-        front->addQuad(outside[i], inside[i],
-                       inside[(i + 1) % k], outside[(i + 1) % k]);
-    Patch *back = new Patch(g);
-    for (int i = 0; i < k; ++i)
-        back->addQuad(in_back[i], out_back[i],
-                      out_back[(i + 1) % k], in_back[(i + 1) % k]);
-    Patch *is = new Patch(g);
-    for (int i = 0; i < k; ++i)
-        is->addQuad(in_back[i], in_back[(i + 1) % k],
-                    inside[(i + 1) % k], inside[i]);
-    Patch *os = new Patch(g);
-    for (int i = 0; i < k; ++i)
-        os->addQuad(out_back[(i + 1) % k], out_back[i],
-                    outside[i], outside[(i + 1) % k]);
-    parts << front << back << is << os;
-}
-
-QtLogo::QtLogo(QObject *parent, int divisions, qreal scale)
-    : QObject(parent)
-    , geom(new Geometry())
-{
-    buildGeometry(divisions, scale);
-}
-
-QtLogo::~QtLogo()
-{
-    qDeleteAll(parts);
-    delete geom;
-}
-
-void QtLogo::setColor(QColor c)
-{
-    for (int i = 0; i < parts.count(); ++i)
-        qSetColor(parts[i]->faceColor, c);
-}
-
-//! [3]
-void QtLogo::buildGeometry(int divisions, qreal scale)
-{
-    qreal cw = cross_width * scale;
-    qreal bt = bar_thickness * scale;
-    qreal ld = logo_depth * scale;
-    qreal th = tee_height *scale;
-
-    RectPrism cross(geom, cw, bt, ld);
-    RectPrism stem(geom, bt, th, ld);
-
-    QVector3D z(0.0, 0.0, 1.0);
-    cross.rotate(45.0, z);
-    stem.rotate(45.0, z);
-
-    qreal stem_downshift = (th + bt) / 2.0;
-    stem.translate(QVector3D(0.0, -stem_downshift, 0.0));
-
-    RectTorus body(geom, 0.20, 0.30, 0.1, divisions);
-
-    parts << stem.parts << cross.parts << body.parts;
-
-    geom->finalize();
-}
-//! [3]
-
-//! [4]
-void QtLogo::draw(QOpenGLFunctions_1_1 *functions) const
-{
-    geom->loadArrays(functions);
-
-    functions->glEnableClientState(GL_VERTEX_ARRAY);
-    functions->glEnableClientState(GL_NORMAL_ARRAY);
-
-    for (int i = 0; i < parts.count(); ++i)
-        parts[i]->draw(functions);
-
-    functions->glDisableClientState(GL_VERTEX_ARRAY);
-    functions->glDisableClientState(GL_NORMAL_ARRAY);
-}
-//! [4]
diff --git a/examples/opengl/legacy/shared/qtlogo.h b/examples/opengl/legacy/shared/qtlogo.h
deleted file mode 100644
index ed2d7d750d..0000000000
--- a/examples/opengl/legacy/shared/qtlogo.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, you may use this file under the terms of the BSD license
-** as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QTLOGO_H
-#define QTLOGO_H
-
-#include <QObject>
-#include <QColor>
-
-QT_FORWARD_DECLARE_CLASS(QOpenGLFunctions_1_1)
-
-class Patch;
-struct Geometry;
-
-//! [0]
-class QtLogo : public QObject
-{
-public:
-    explicit QtLogo(QObject *parent, int d = 64, qreal s = 1.0);
-    ~QtLogo();
-    void setColor(QColor c);
-    void draw(QOpenGLFunctions_1_1 *functions) const;
-private:
-    void buildGeometry(int d, qreal s);
-
-    QList<Patch *> parts;
-    Geometry *geom;
-};
-//! [0]
-
-#endif // QTLOGO_H
diff --git a/examples/opengl/opengl.pro b/examples/opengl/opengl.pro
index 89b3e1d86e..907930d7ac 100644
--- a/examples/opengl/opengl.pro
+++ b/examples/opengl/opengl.pro
@@ -2,6 +2,7 @@ TEMPLATE      = subdirs
 
 SUBDIRS = hellowindow \
           paintedwindow \
+          openglwindow \
           qopenglwindow
 
 qtHaveModule(widgets) {
@@ -15,6 +16,3 @@ qtHaveModule(widgets) {
                hellogles3 \
                computegles31
 }
-
-EXAMPLE_FILES += \
-    legacy
diff --git a/examples/opengl/openglwindow/.prev_CMakeLists.txt b/examples/opengl/openglwindow/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..9780e18c7f
--- /dev/null
+++ b/examples/opengl/openglwindow/.prev_CMakeLists.txt
@@ -0,0 +1,36 @@
+# Generated from openglwindow.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(openglwindow LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/opengl/openglwindow")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS OpenGL)
+
+add_qt_gui_executable(openglwindow
+    main.cpp
+    openglwindow.cpp openglwindow.h
+)
+target_include_directories(openglwindow PUBLIC
+    ${CMAKE_CURRENT_SOURCE_DIR}
+)
+
+target_link_libraries(openglwindow PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::OpenGL
+)
+
+install(TARGETS openglwindow
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/opengl/openglwindow/CMakeLists.txt b/examples/opengl/openglwindow/CMakeLists.txt
new file mode 100644
index 0000000000..9780e18c7f
--- /dev/null
+++ b/examples/opengl/openglwindow/CMakeLists.txt
@@ -0,0 +1,36 @@
+# Generated from openglwindow.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(openglwindow LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/opengl/openglwindow")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS OpenGL)
+
+add_qt_gui_executable(openglwindow
+    main.cpp
+    openglwindow.cpp openglwindow.h
+)
+target_include_directories(openglwindow PUBLIC
+    ${CMAKE_CURRENT_SOURCE_DIR}
+)
+
+target_link_libraries(openglwindow PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::OpenGL
+)
+
+install(TARGETS openglwindow
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/gui/openglwindow/main.cpp b/examples/opengl/openglwindow/main.cpp
index 03a6ece06f..03a6ece06f 100644
--- a/examples/gui/openglwindow/main.cpp
+++ b/examples/opengl/openglwindow/main.cpp
diff --git a/examples/gui/openglwindow/openglwindow.cpp b/examples/opengl/openglwindow/openglwindow.cpp
index bac887dca0..bac887dca0 100644
--- a/examples/gui/openglwindow/openglwindow.cpp
+++ b/examples/opengl/openglwindow/openglwindow.cpp
diff --git a/examples/gui/openglwindow/openglwindow.h b/examples/opengl/openglwindow/openglwindow.h
index 8db943ddde..8db943ddde 100644
--- a/examples/gui/openglwindow/openglwindow.h
+++ b/examples/opengl/openglwindow/openglwindow.h
diff --git a/examples/opengl/openglwindow/openglwindow.pri b/examples/opengl/openglwindow/openglwindow.pri
new file mode 100644
index 0000000000..30320df3b7
--- /dev/null
+++ b/examples/opengl/openglwindow/openglwindow.pri
@@ -0,0 +1,4 @@
+QT += opengl
+INCLUDEPATH += $$PWD
+SOURCES += $$PWD/openglwindow.cpp
+HEADERS += $$PWD/openglwindow.h
diff --git a/examples/opengl/openglwindow/openglwindow.pro b/examples/opengl/openglwindow/openglwindow.pro
new file mode 100644
index 0000000000..8b1ae71c14
--- /dev/null
+++ b/examples/opengl/openglwindow/openglwindow.pro
@@ -0,0 +1,7 @@
+include(openglwindow.pri)
+
+SOURCES += \
+    main.cpp
+
+target.path = $$[QT_INSTALL_EXAMPLES]/opengl/openglwindow
+INSTALLS += target
diff --git a/examples/opengl/paintedwindow/CMakeLists.txt b/examples/opengl/paintedwindow/CMakeLists.txt
new file mode 100644
index 0000000000..2711bdc45b
--- /dev/null
+++ b/examples/opengl/paintedwindow/CMakeLists.txt
@@ -0,0 +1,32 @@
+# Generated from paintedwindow.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(paintedwindow LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/opengl/paintedwindow")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS OpenGL)
+
+add_qt_gui_executable(paintedwindow
+    main.cpp
+    paintedwindow.cpp paintedwindow.h
+)
+target_link_libraries(paintedwindow PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::OpenGL
+)
+
+install(TARGETS paintedwindow
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/opengl/paintedwindow/paintedwindow.h b/examples/opengl/paintedwindow/paintedwindow.h
index 7281451924..972d8d10bd 100644
--- a/examples/opengl/paintedwindow/paintedwindow.h
+++ b/examples/opengl/paintedwindow/paintedwindow.h
@@ -51,8 +51,8 @@
 #include <QWindow>
 
 #include <QtGui/qopengl.h>
-#include <QtGui/qopenglshaderprogram.h>
-#include <QtGui/qopenglframebufferobject.h>
+#include <QtOpenGL/qopenglshaderprogram.h>
+#include <QtOpenGL/qopenglframebufferobject.h>
 
 #include <QPropertyAnimation>
 
diff --git a/examples/opengl/paintedwindow/paintedwindow.pro b/examples/opengl/paintedwindow/paintedwindow.pro
index 1846aa4049..569eebe674 100644
--- a/examples/opengl/paintedwindow/paintedwindow.pro
+++ b/examples/opengl/paintedwindow/paintedwindow.pro
@@ -1,3 +1,5 @@
+QT += opengl
+
 HEADERS += paintedwindow.h
 SOURCES += paintedwindow.cpp main.cpp
 
diff --git a/examples/opengl/qopenglwidget/CMakeLists.txt b/examples/opengl/qopenglwidget/CMakeLists.txt
new file mode 100644
index 0000000000..10b30f9461
--- /dev/null
+++ b/examples/opengl/qopenglwidget/CMakeLists.txt
@@ -0,0 +1,51 @@
+# Generated from qopenglwidget.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(qopenglwidget LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/opengl/qopenglwidget")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+find_package(Qt6 COMPONENTS OpenGL)
+find_package(Qt6 COMPONENTS OpenGLWidgets)
+
+add_qt_gui_executable(qopenglwidget
+    bubble.cpp bubble.h
+    glwidget.cpp glwidget.h
+    main.cpp
+    mainwindow.cpp mainwindow.h
+)
+target_link_libraries(qopenglwidget PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::OpenGL
+    Qt::OpenGLWidgets
+    Qt::Widgets
+)
+
+
+# Resources:
+set(texture_resource_files
+    "qt.png"
+)
+
+qt6_add_resources(qopenglwidget "texture"
+    PREFIX
+        "/"
+    FILES
+        ${texture_resource_files}
+)
+
+install(TARGETS qopenglwidget
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/opengl/qopenglwidget/mainwindow.cpp b/examples/opengl/qopenglwidget/mainwindow.cpp
index 6fab3df79e..eb34f87cb7 100644
--- a/examples/opengl/qopenglwidget/mainwindow.cpp
+++ b/examples/opengl/qopenglwidget/mainwindow.cpp
@@ -134,7 +134,7 @@ MainWindow::MainWindow()
 
     connect(slider, &QAbstractSlider::valueChanged, glwidget, &GLWidget::setScaling);
     connect(transparent, &QCheckBox::toggled, glwidget, &GLWidget::setTransparent);
-    connect(updateInterval, QOverload<int>::of(&QSpinBox::valueChanged),
+    connect(updateInterval, &QSpinBox::valueChanged,
             this, &MainWindow::updateIntervalChanged);
     connect(timerBased, &QCheckBox::toggled, this, &MainWindow::timerUsageChanged);
     connect(timerBased, &QCheckBox::toggled, updateInterval, &QWidget::setEnabled);
diff --git a/examples/opengl/qopenglwidget/qopenglwidget.pro b/examples/opengl/qopenglwidget/qopenglwidget.pro
index 0165285c02..7ac546d7ce 100644
--- a/examples/opengl/qopenglwidget/qopenglwidget.pro
+++ b/examples/opengl/qopenglwidget/qopenglwidget.pro
@@ -1,4 +1,4 @@
-QT += widgets
+QT += widgets opengl openglwidgets
 
 SOURCES += main.cpp \
            glwidget.cpp \
diff --git a/examples/opengl/qopenglwindow/CMakeLists.txt b/examples/opengl/qopenglwindow/CMakeLists.txt
new file mode 100644
index 0000000000..9d354d376b
--- /dev/null
+++ b/examples/opengl/qopenglwindow/CMakeLists.txt
@@ -0,0 +1,49 @@
+# Generated from qopenglwindow.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(qopenglwindow LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/opengl/qopenglwindow")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS OpenGL)
+
+add_qt_gui_executable(qopenglwindow
+    background_renderer.cpp background_renderer.h
+    main.cpp
+)
+target_include_directories(qopenglwindow PUBLIC
+    .
+)
+
+target_link_libraries(qopenglwindow PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::OpenGL
+)
+
+
+# Resources:
+set(shaders_resource_files
+    "background.frag"
+)
+
+qt6_add_resources(qopenglwindow "shaders"
+    PREFIX
+        "/"
+    FILES
+        ${shaders_resource_files}
+)
+
+install(TARGETS qopenglwindow
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/opengl/qopenglwindow/qopenglwindow.pro b/examples/opengl/qopenglwindow/qopenglwindow.pro
index dad4b58158..e7073a324b 100644
--- a/examples/opengl/qopenglwindow/qopenglwindow.pro
+++ b/examples/opengl/qopenglwindow/qopenglwindow.pro
@@ -1,6 +1,7 @@
 TEMPLATE = app
 TARGET = qopenglwindow
 INCLUDEPATH += .
+QT += opengl
 
 RESOURCES += shaders.qrc
 
diff --git a/examples/opengl/textures/CMakeLists.txt b/examples/opengl/textures/CMakeLists.txt
new file mode 100644
index 0000000000..1bb4ae6240
--- /dev/null
+++ b/examples/opengl/textures/CMakeLists.txt
@@ -0,0 +1,55 @@
+# Generated from textures.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(textures LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/opengl/textures")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+find_package(Qt6 COMPONENTS OpenGL)
+find_package(Qt6 COMPONENTS OpenGLWidgets)
+
+add_qt_gui_executable(textures
+    glwidget.cpp glwidget.h
+    main.cpp
+    window.cpp window.h
+)
+target_link_libraries(textures PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::OpenGL
+    Qt::OpenGLWidgets
+    Qt::Widgets
+)
+
+
+# Resources:
+set(textures_resource_files
+    "images/side1.png"
+    "images/side2.png"
+    "images/side3.png"
+    "images/side4.png"
+    "images/side5.png"
+    "images/side6.png"
+)
+
+qt6_add_resources(textures "textures"
+    PREFIX
+        "/"
+    FILES
+        ${textures_resource_files}
+)
+
+install(TARGETS textures
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/opengl/textures/textures.pro b/examples/opengl/textures/textures.pro
index 7a7d19bee6..d2a6506cb8 100644
--- a/examples/opengl/textures/textures.pro
+++ b/examples/opengl/textures/textures.pro
@@ -6,7 +6,7 @@ SOURCES       = glwidget.cpp \
 
 RESOURCES     = textures.qrc
 
-QT           += widgets
+QT += widgets opengl openglwidgets
 
 # install
 target.path = $$[QT_INSTALL_EXAMPLES]/opengl/textures
diff --git a/examples/opengl/threadedqopenglwidget/CMakeLists.txt b/examples/opengl/threadedqopenglwidget/CMakeLists.txt
new file mode 100644
index 0000000000..f5368f89ef
--- /dev/null
+++ b/examples/opengl/threadedqopenglwidget/CMakeLists.txt
@@ -0,0 +1,37 @@
+# Generated from threadedqopenglwidget.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(threadedqopenglwidget LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/opengl/threadedqopenglwidget")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+find_package(Qt6 COMPONENTS OpenGL)
+find_package(Qt6 COMPONENTS OpenGLWidgets)
+
+add_qt_gui_executable(threadedqopenglwidget
+    glwidget.cpp glwidget.h
+    main.cpp
+    mainwindow.cpp mainwindow.h
+)
+target_link_libraries(threadedqopenglwidget PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::OpenGL
+    Qt::OpenGLWidgets
+    Qt::Widgets
+)
+
+install(TARGETS threadedqopenglwidget
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/opengl/threadedqopenglwidget/threadedqopenglwidget.pro b/examples/opengl/threadedqopenglwidget/threadedqopenglwidget.pro
index 4e941b28c4..a62fbeb9c2 100644
--- a/examples/opengl/threadedqopenglwidget/threadedqopenglwidget.pro
+++ b/examples/opengl/threadedqopenglwidget/threadedqopenglwidget.pro
@@ -1,4 +1,4 @@
-QT += widgets
+QT += widgets opengl openglwidgets
 
 SOURCES += main.cpp \
            glwidget.cpp \
diff --git a/examples/qpa/CMakeLists.txt b/examples/qpa/CMakeLists.txt
new file mode 100644
index 0000000000..0ae7f61e57
--- /dev/null
+++ b/examples/qpa/CMakeLists.txt
@@ -0,0 +1,4 @@
+# Generated from qpa.pro.
+
+add_subdirectory(windows)
+add_subdirectory(qrasterwindow)
diff --git a/examples/qpa/qrasterwindow/.prev_CMakeLists.txt b/examples/qpa/qrasterwindow/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..8fd75f1079
--- /dev/null
+++ b/examples/qpa/qrasterwindow/.prev_CMakeLists.txt
@@ -0,0 +1,29 @@
+# Generated from qrasterwindow.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(qrasterwindow LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/qpa/qrasterwindow")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+
+add_qt_gui_executable(qrasterwindow
+    main.cpp
+)
+target_link_libraries(qrasterwindow PUBLIC
+    Qt::Core
+    Qt::Gui
+)
+
+install(TARGETS qrasterwindow
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/qpa/qrasterwindow/CMakeLists.txt b/examples/qpa/qrasterwindow/CMakeLists.txt
new file mode 100644
index 0000000000..8fd75f1079
--- /dev/null
+++ b/examples/qpa/qrasterwindow/CMakeLists.txt
@@ -0,0 +1,29 @@
+# Generated from qrasterwindow.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(qrasterwindow LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/qpa/qrasterwindow")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+
+add_qt_gui_executable(qrasterwindow
+    main.cpp
+)
+target_link_libraries(qrasterwindow PUBLIC
+    Qt::Core
+    Qt::Gui
+)
+
+install(TARGETS qrasterwindow
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/qpa/windows/CMakeLists.txt b/examples/qpa/windows/CMakeLists.txt
new file mode 100644
index 0000000000..4eeab0e3bc
--- /dev/null
+++ b/examples/qpa/windows/CMakeLists.txt
@@ -0,0 +1,32 @@
+# Generated from windows.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(windows LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/qpa/windows")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+
+add_executable(windows
+    main.cpp
+    window.cpp window.h
+)
+target_link_libraries(windows PUBLIC
+    Qt::Core
+    Qt::CorePrivate
+    Qt::Gui
+    Qt::GuiPrivate
+)
+
+install(TARGETS windows
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/qtconcurrent/CMakeLists.txt b/examples/qtconcurrent/CMakeLists.txt
new file mode 100644
index 0000000000..13cfed8773
--- /dev/null
+++ b/examples/qtconcurrent/CMakeLists.txt
@@ -0,0 +1,9 @@
+if(TARGET Qt::Gui)
+    add_subdirectory(map)
+endif()
+if(TARGET Qt::Widgets)
+    add_subdirectory(imagescaling)
+    add_subdirectory(progressdialog)
+    add_subdirectory(runfunction)
+    add_subdirectory(wordcount)
+endif()
diff --git a/examples/qtconcurrent/imagescaling/CMakeLists.txt b/examples/qtconcurrent/imagescaling/CMakeLists.txt
new file mode 100644
index 0000000000..8585ed89a0
--- /dev/null
+++ b/examples/qtconcurrent/imagescaling/CMakeLists.txt
@@ -0,0 +1,34 @@
+# Generated from imagescaling.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(imagescaling LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/qtconcurrent/imagescaling")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Concurrent)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(imagescaling
+    imagescaling.cpp imagescaling.h
+    main.cpp
+)
+target_link_libraries(imagescaling PUBLIC
+    Qt::Concurrent
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+install(TARGETS imagescaling
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/qtconcurrent/map/.prev_CMakeLists.txt b/examples/qtconcurrent/map/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..8e158b2397
--- /dev/null
+++ b/examples/qtconcurrent/map/.prev_CMakeLists.txt
@@ -0,0 +1,31 @@
+# Generated from map.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(mapdemo LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/qtconcurrent/map")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Concurrent)
+
+add_executable(mapdemo
+    main.cpp
+)
+target_link_libraries(mapdemo PUBLIC
+    Qt::Concurrent
+    Qt::Core
+    Qt::Gui
+)
+
+install(TARGETS mapdemo
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/qtconcurrent/map/CMakeLists.txt b/examples/qtconcurrent/map/CMakeLists.txt
new file mode 100644
index 0000000000..e5a3ba1c66
--- /dev/null
+++ b/examples/qtconcurrent/map/CMakeLists.txt
@@ -0,0 +1,30 @@
+# Generated from map.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(mapdemo LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/qtconcurrent/map")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Concurrent)
+
+add_executable(mapdemo
+    main.cpp
+)
+target_link_libraries(mapdemo PUBLIC
+    Qt::Concurrent
+    Qt::Core
+    Qt::Gui
+)
+install(TARGETS mapdemo
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/qtconcurrent/progressdialog/CMakeLists.txt b/examples/qtconcurrent/progressdialog/CMakeLists.txt
new file mode 100644
index 0000000000..912490bd65
--- /dev/null
+++ b/examples/qtconcurrent/progressdialog/CMakeLists.txt
@@ -0,0 +1,33 @@
+# Generated from progressdialog.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(progressdialog LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/qtconcurrent/progressdialog")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Concurrent)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_executable(progressdialog
+    main.cpp
+)
+target_link_libraries(progressdialog PUBLIC
+    Qt::Concurrent
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+install(TARGETS progressdialog
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/qtconcurrent/runfunction/CMakeLists.txt b/examples/qtconcurrent/runfunction/CMakeLists.txt
new file mode 100644
index 0000000000..a8cb3de4d4
--- /dev/null
+++ b/examples/qtconcurrent/runfunction/CMakeLists.txt
@@ -0,0 +1,33 @@
+# Generated from runfunction.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(runfunction LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/qtconcurrent/runfunction")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Concurrent)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_executable(runfunction
+    main.cpp
+)
+target_link_libraries(runfunction PUBLIC
+    Qt::Concurrent
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+install(TARGETS runfunction
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/qtconcurrent/wordcount/CMakeLists.txt b/examples/qtconcurrent/wordcount/CMakeLists.txt
new file mode 100644
index 0000000000..22d78c3877
--- /dev/null
+++ b/examples/qtconcurrent/wordcount/CMakeLists.txt
@@ -0,0 +1,33 @@
+# Generated from wordcount.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(wordcount LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/qtconcurrent/wordcount")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Concurrent)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_executable(wordcount
+    main.cpp
+)
+target_link_libraries(wordcount PUBLIC
+    Qt::Concurrent
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+install(TARGETS wordcount
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/qtestlib/CMakeLists.txt b/examples/qtestlib/CMakeLists.txt
new file mode 100644
index 0000000000..83e7df5768
--- /dev/null
+++ b/examples/qtestlib/CMakeLists.txt
@@ -0,0 +1,7 @@
+# Generated from qtestlib.pro.
+
+add_subdirectory(tutorial1)
+add_subdirectory(tutorial2)
+add_subdirectory(tutorial3)
+add_subdirectory(tutorial4)
+add_subdirectory(tutorial5)
diff --git a/examples/qtestlib/tutorial1/CMakeLists.txt b/examples/qtestlib/tutorial1/CMakeLists.txt
new file mode 100644
index 0000000000..27b5d886b5
--- /dev/null
+++ b/examples/qtestlib/tutorial1/CMakeLists.txt
@@ -0,0 +1,33 @@
+# Generated from tutorial1.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(tutorial1 LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/qtestlib/tutorial1")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+find_package(Qt6 COMPONENTS Test)
+
+add_executable(tutorial1
+    testqstring.cpp
+)
+target_link_libraries(tutorial1 PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Test
+    Qt::Widgets
+)
+
+install(TARGETS tutorial1
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/qtestlib/tutorial2/CMakeLists.txt b/examples/qtestlib/tutorial2/CMakeLists.txt
new file mode 100644
index 0000000000..2a3a53ad34
--- /dev/null
+++ b/examples/qtestlib/tutorial2/CMakeLists.txt
@@ -0,0 +1,33 @@
+# Generated from tutorial2.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(tutorial2 LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/qtestlib/tutorial2")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+find_package(Qt6 COMPONENTS Test)
+
+add_executable(tutorial2
+    testqstring.cpp
+)
+target_link_libraries(tutorial2 PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Test
+    Qt::Widgets
+)
+
+install(TARGETS tutorial2
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/qtestlib/tutorial3/CMakeLists.txt b/examples/qtestlib/tutorial3/CMakeLists.txt
new file mode 100644
index 0000000000..f7a76b3b4f
--- /dev/null
+++ b/examples/qtestlib/tutorial3/CMakeLists.txt
@@ -0,0 +1,33 @@
+# Generated from tutorial3.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(tutorial3 LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/qtestlib/tutorial3")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+find_package(Qt6 COMPONENTS Test)
+
+add_executable(tutorial3
+    testgui.cpp
+)
+target_link_libraries(tutorial3 PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Test
+    Qt::Widgets
+)
+
+install(TARGETS tutorial3
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/qtestlib/tutorial4/CMakeLists.txt b/examples/qtestlib/tutorial4/CMakeLists.txt
new file mode 100644
index 0000000000..40a6f4b9e2
--- /dev/null
+++ b/examples/qtestlib/tutorial4/CMakeLists.txt
@@ -0,0 +1,33 @@
+# Generated from tutorial4.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(tutorial4 LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/qtestlib/tutorial4")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+find_package(Qt6 COMPONENTS Test)
+
+add_executable(tutorial4
+    testgui.cpp
+)
+target_link_libraries(tutorial4 PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Test
+    Qt::Widgets
+)
+
+install(TARGETS tutorial4
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/qtestlib/tutorial5/CMakeLists.txt b/examples/qtestlib/tutorial5/CMakeLists.txt
new file mode 100644
index 0000000000..88f5efb995
--- /dev/null
+++ b/examples/qtestlib/tutorial5/CMakeLists.txt
@@ -0,0 +1,33 @@
+# Generated from tutorial5.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(tutorial5 LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/qtestlib/tutorial5")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+find_package(Qt6 COMPONENTS Test)
+
+add_executable(tutorial5
+    benchmarking.cpp
+)
+target_link_libraries(tutorial5 PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Test
+    Qt::Widgets
+)
+
+install(TARGETS tutorial5
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/sql/CMakeLists.txt b/examples/sql/CMakeLists.txt
new file mode 100644
index 0000000000..ca15f22baf
--- /dev/null
+++ b/examples/sql/CMakeLists.txt
@@ -0,0 +1,17 @@
+# Generated from sql.pro.
+
+add_subdirectory(books)
+add_subdirectory(drilldown)
+add_subdirectory(cachedtable)
+add_subdirectory(querymodel)
+add_subdirectory(relationaltablemodel)
+add_subdirectory(sqlwidgetmapper)
+add_subdirectory(tablemodel)
+
+if(TARGET Qt::Xml)
+    add_subdirectory(masterdetail)
+endif()
+
+if(NOT CMAKE_CROSSCOMPILING) # special case
+    add_subdirectory(sqlbrowser)
+endif()
diff --git a/examples/sql/books/CMakeLists.txt b/examples/sql/books/CMakeLists.txt
new file mode 100644
index 0000000000..870d90bf14
--- /dev/null
+++ b/examples/sql/books/CMakeLists.txt
@@ -0,0 +1,53 @@
+# Generated from books.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(books LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/sql/books")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Sql)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(books
+    bookdelegate.cpp bookdelegate.h
+    bookwindow.cpp bookwindow.h bookwindow.ui
+    initdb.h
+    main.cpp
+)
+target_include_directories(books PUBLIC
+    .
+)
+
+target_link_libraries(books PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Sql
+    Qt::Widgets
+)
+
+
+# Resources:
+set(books_resource_files
+    "images/star.png"
+)
+
+qt6_add_resources(books "books"
+    PREFIX
+        "/"
+    FILES
+        ${books_resource_files}
+)
+
+install(TARGETS books
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/sql/cachedtable/CMakeLists.txt b/examples/sql/cachedtable/CMakeLists.txt
new file mode 100644
index 0000000000..872c462fdd
--- /dev/null
+++ b/examples/sql/cachedtable/CMakeLists.txt
@@ -0,0 +1,35 @@
+# Generated from cachedtable.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(cachedtable LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/sql/cachedtable")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Sql)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(cachedtable
+    ../connection.h
+    main.cpp
+    tableeditor.cpp tableeditor.h
+)
+target_link_libraries(cachedtable PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Sql
+    Qt::Widgets
+)
+
+install(TARGETS cachedtable
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/sql/drilldown/CMakeLists.txt b/examples/sql/drilldown/CMakeLists.txt
new file mode 100644
index 0000000000..5b6bea0423
--- /dev/null
+++ b/examples/sql/drilldown/CMakeLists.txt
@@ -0,0 +1,53 @@
+# Generated from drilldown.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(drilldown LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/sql/drilldown")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Sql)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(drilldown
+    ../connection.h
+    imageitem.cpp imageitem.h
+    informationwindow.cpp informationwindow.h
+    main.cpp
+    view.cpp view.h
+)
+target_link_libraries(drilldown PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Sql
+    Qt::Widgets
+)
+
+
+# Resources:
+set(drilldown_resource_files
+    "images/qt-creator.png"
+    "images/qt-logo.png"
+    "images/qt-project.png"
+    "images/qt-quick.png"
+)
+
+qt6_add_resources(drilldown "drilldown"
+    PREFIX
+        "/"
+    FILES
+        ${drilldown_resource_files}
+)
+
+install(TARGETS drilldown
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/sql/drilldown/informationwindow.cpp b/examples/sql/drilldown/informationwindow.cpp
index 0007432672..349416b553 100644
--- a/examples/sql/drilldown/informationwindow.cpp
+++ b/examples/sql/drilldown/informationwindow.cpp
@@ -87,7 +87,7 @@ InformationWindow::InformationWindow(int id, QSqlRelationalTableModel *items,
     connect(descriptionEditor, &QTextEdit::textChanged, [=]() {
         enableButtons();
     });
-    connect(imageFileEditor, QOverload<int>::of(&QComboBox::currentIndexChanged), [=]() {
+    connect(imageFileEditor, &QComboBox::currentIndexChanged, [=]() {
         enableButtons();
     });
 
diff --git a/examples/sql/masterdetail/CMakeLists.txt b/examples/sql/masterdetail/CMakeLists.txt
new file mode 100644
index 0000000000..7052461601
--- /dev/null
+++ b/examples/sql/masterdetail/CMakeLists.txt
@@ -0,0 +1,52 @@
+# Generated from masterdetail.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(masterdetail LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/sql/masterdetail")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Sql)
+find_package(Qt6 COMPONENTS Widgets)
+find_package(Qt6 COMPONENTS Xml)
+
+add_qt_gui_executable(masterdetail
+    database.h
+    dialog.cpp dialog.h
+    main.cpp
+    mainwindow.cpp mainwindow.h
+)
+target_link_libraries(masterdetail PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Sql
+    Qt::Widgets
+    Qt::Xml
+)
+
+
+# Resources:
+set(masterdetail_resource_files
+    "images/icon.png"
+    "images/image.png"
+)
+
+qt6_add_resources(masterdetail "masterdetail"
+    PREFIX
+        "/"
+    FILES
+        ${masterdetail_resource_files}
+)
+
+install(TARGETS masterdetail
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/sql/masterdetail/mainwindow.cpp b/examples/sql/masterdetail/mainwindow.cpp
index 2ff9a10d91..11f123372c 100644
--- a/examples/sql/masterdetail/mainwindow.cpp
+++ b/examples/sql/masterdetail/mainwindow.cpp
@@ -283,7 +283,7 @@ QGroupBox* MainWindow::createArtistGroupBox()
     artistView->setModel(model->relationModel(2));
     artistView->setModelColumn(1);
 
-    connect(artistView, QOverload<int>::of(&QComboBox::currentIndexChanged),
+    connect(artistView, &QComboBox::currentIndexChanged,
             this, &MainWindow::changeArtist);
 
     QGroupBox *box = new QGroupBox(tr("Artist"));
diff --git a/examples/sql/querymodel/CMakeLists.txt b/examples/sql/querymodel/CMakeLists.txt
new file mode 100644
index 0000000000..e4127baeef
--- /dev/null
+++ b/examples/sql/querymodel/CMakeLists.txt
@@ -0,0 +1,36 @@
+# Generated from querymodel.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(querymodel LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/sql/querymodel")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Sql)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(querymodel
+    ../connection.h
+    customsqlmodel.cpp customsqlmodel.h
+    editablesqlmodel.cpp editablesqlmodel.h
+    main.cpp
+)
+target_link_libraries(querymodel PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Sql
+    Qt::Widgets
+)
+
+install(TARGETS querymodel
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/sql/relationaltablemodel/CMakeLists.txt b/examples/sql/relationaltablemodel/CMakeLists.txt
new file mode 100644
index 0000000000..c758f3c32d
--- /dev/null
+++ b/examples/sql/relationaltablemodel/CMakeLists.txt
@@ -0,0 +1,34 @@
+# Generated from relationaltablemodel.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(relationaltablemodel LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/sql/relationaltablemodel")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Sql)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(relationaltablemodel
+    ../connection.h
+    relationaltablemodel.cpp
+)
+target_link_libraries(relationaltablemodel PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Sql
+    Qt::Widgets
+)
+
+install(TARGETS relationaltablemodel
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/sql/sqlbrowser/CMakeLists.txt b/examples/sql/sqlbrowser/CMakeLists.txt
new file mode 100644
index 0000000000..833b57f1a1
--- /dev/null
+++ b/examples/sql/sqlbrowser/CMakeLists.txt
@@ -0,0 +1,37 @@
+# Generated from sqlbrowser.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(sqlbrowser LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/sql/sqlbrowser")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Sql)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(sqlbrowser
+    browser.cpp browser.h
+    browserwidget.ui
+    connectionwidget.cpp connectionwidget.h
+    main.cpp
+    qsqlconnectiondialog.cpp qsqlconnectiondialog.h qsqlconnectiondialog.ui
+)
+target_link_libraries(sqlbrowser PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Sql
+    Qt::Widgets
+)
+
+install(TARGETS sqlbrowser
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/sql/sqlbrowser/qsqlconnectiondialog.cpp b/examples/sql/sqlbrowser/qsqlconnectiondialog.cpp
index 0d4a1bde77..482048ab98 100644
--- a/examples/sql/sqlbrowser/qsqlconnectiondialog.cpp
+++ b/examples/sql/sqlbrowser/qsqlconnectiondialog.cpp
@@ -60,13 +60,6 @@ QSqlConnectionDialog::QSqlConnectionDialog(QWidget *parent)
 
     QStringList drivers = QSqlDatabase::drivers();
 
-    // remove compat names
-    drivers.removeAll("QMYSQL3");
-    drivers.removeAll("QOCI8");
-    drivers.removeAll("QODBC3");
-    drivers.removeAll("QPSQL7");
-    drivers.removeAll("QTDS7");
-
     if (!drivers.contains("QSQLITE"))
         ui.dbCheckBox->setEnabled(false);
 
diff --git a/examples/sql/sqlwidgetmapper/CMakeLists.txt b/examples/sql/sqlwidgetmapper/CMakeLists.txt
new file mode 100644
index 0000000000..8d8a1a82ed
--- /dev/null
+++ b/examples/sql/sqlwidgetmapper/CMakeLists.txt
@@ -0,0 +1,34 @@
+# Generated from sqlwidgetmapper.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(sqlwidgetmapper LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/sql/sqlwidgetmapper")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Sql)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(sqlwidgetmapper
+    main.cpp
+    window.cpp window.h
+)
+target_link_libraries(sqlwidgetmapper PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Sql
+    Qt::Widgets
+)
+
+install(TARGETS sqlwidgetmapper
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/sql/tablemodel/CMakeLists.txt b/examples/sql/tablemodel/CMakeLists.txt
new file mode 100644
index 0000000000..85e1bd9167
--- /dev/null
+++ b/examples/sql/tablemodel/CMakeLists.txt
@@ -0,0 +1,34 @@
+# Generated from tablemodel.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(tablemodel LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/sql/tablemodel")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Sql)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(tablemodel
+    ../connection.h
+    tablemodel.cpp
+)
+target_link_libraries(tablemodel PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Sql
+    Qt::Widgets
+)
+
+install(TARGETS tablemodel
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/vulkan/CMakeLists.txt b/examples/vulkan/CMakeLists.txt
new file mode 100644
index 0000000000..b00a40447a
--- /dev/null
+++ b/examples/vulkan/CMakeLists.txt
@@ -0,0 +1,11 @@
+# Generated from vulkan.pro.
+
+add_subdirectory(hellovulkanwindow)
+add_subdirectory(hellovulkantriangle)
+add_subdirectory(hellovulkantexture)
+if(TARGET Qt::Widgets)
+    add_subdirectory(hellovulkanwidget)
+endif()
+if(TARGET Qt::Concurrent AND TARGET Qt::Widgets)
+    add_subdirectory(hellovulkancubes)
+endif()
diff --git a/examples/vulkan/hellovulkancubes/CMakeLists.txt b/examples/vulkan/hellovulkancubes/CMakeLists.txt
new file mode 100644
index 0000000000..94feac6401
--- /dev/null
+++ b/examples/vulkan/hellovulkancubes/CMakeLists.txt
@@ -0,0 +1,63 @@
+# Generated from hellovulkancubes.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(hellovulkancubes LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/vulkan/hellovulkancubes")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+find_package(Qt6 COMPONENTS Concurrent)
+
+add_qt_gui_executable(hellovulkancubes
+    camera.cpp camera.h
+    main.cpp
+    mainwindow.cpp mainwindow.h
+    mesh.cpp mesh.h
+    renderer.cpp renderer.h
+    shader.cpp shader.h
+    vulkanwindow.cpp vulkanwindow.h
+)
+target_link_libraries(hellovulkancubes PUBLIC
+    Qt::Concurrent
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+
+# Resources:
+set_source_files_properties("../shared/block.buf"
+    PROPERTIES QT_RESOURCE_ALIAS "block.buf"
+)
+set_source_files_properties("../shared/qt_logo.buf"
+    PROPERTIES QT_RESOURCE_ALIAS "qt_logo.buf"
+)
+set(hellovulkancubes_resource_files
+    "../shared/block.buf"
+    "../shared/qt_logo.buf"
+    "color_frag.spv"
+    "color_phong_frag.spv"
+    "color_phong_vert.spv"
+    "color_vert.spv"
+)
+
+qt6_add_resources(hellovulkancubes "hellovulkancubes"
+    PREFIX
+        "/"
+    FILES
+        ${hellovulkancubes_resource_files}
+)
+
+install(TARGETS hellovulkancubes
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/vulkan/hellovulkantexture/CMakeLists.txt b/examples/vulkan/hellovulkantexture/CMakeLists.txt
new file mode 100644
index 0000000000..59e019998c
--- /dev/null
+++ b/examples/vulkan/hellovulkantexture/CMakeLists.txt
@@ -0,0 +1,45 @@
+# Generated from hellovulkantexture.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(hellovulkantexture LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/vulkan/hellovulkantexture")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+
+add_qt_gui_executable(hellovulkantexture
+    hellovulkantexture.cpp hellovulkantexture.h
+    main.cpp
+)
+target_link_libraries(hellovulkantexture PUBLIC
+    Qt::Core
+    Qt::Gui
+)
+
+
+# Resources:
+set(hellovulkantexture_resource_files
+    "qt256.png"
+    "texture_frag.spv"
+    "texture_vert.spv"
+)
+
+qt6_add_resources(hellovulkantexture "hellovulkantexture"
+    PREFIX
+        "/"
+    FILES
+        ${hellovulkantexture_resource_files}
+)
+
+install(TARGETS hellovulkantexture
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/vulkan/hellovulkantriangle/CMakeLists.txt b/examples/vulkan/hellovulkantriangle/CMakeLists.txt
new file mode 100644
index 0000000000..dae891ea07
--- /dev/null
+++ b/examples/vulkan/hellovulkantriangle/CMakeLists.txt
@@ -0,0 +1,50 @@
+# Generated from hellovulkantriangle.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(hellovulkantriangle LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/vulkan/hellovulkantriangle")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+
+add_qt_gui_executable(hellovulkantriangle
+    ../shared/trianglerenderer.cpp ../shared/trianglerenderer.h
+    main.cpp
+)
+target_link_libraries(hellovulkantriangle PUBLIC
+    Qt::Core
+    Qt::Gui
+)
+
+
+# Resources:
+set_source_files_properties("../shared/color_frag.spv"
+    PROPERTIES QT_RESOURCE_ALIAS "color_frag.spv"
+)
+set_source_files_properties("../shared/color_vert.spv"
+    PROPERTIES QT_RESOURCE_ALIAS "color_vert.spv"
+)
+set(hellovulkantriangle_resource_files
+    "../shared/color_frag.spv"
+    "../shared/color_vert.spv"
+)
+
+qt6_add_resources(hellovulkantriangle "hellovulkantriangle"
+    PREFIX
+        "/"
+    FILES
+        ${hellovulkantriangle_resource_files}
+)
+
+install(TARGETS hellovulkantriangle
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/vulkan/hellovulkanwidget/CMakeLists.txt b/examples/vulkan/hellovulkanwidget/CMakeLists.txt
new file mode 100644
index 0000000000..6dde273e94
--- /dev/null
+++ b/examples/vulkan/hellovulkanwidget/CMakeLists.txt
@@ -0,0 +1,53 @@
+# Generated from hellovulkanwidget.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(hellovulkanwidget LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/vulkan/hellovulkanwidget")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(hellovulkanwidget
+    ../shared/trianglerenderer.cpp ../shared/trianglerenderer.h
+    hellovulkanwidget.cpp hellovulkanwidget.h
+    main.cpp
+)
+target_link_libraries(hellovulkanwidget PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+
+# Resources:
+set_source_files_properties("../shared/color_frag.spv"
+    PROPERTIES QT_RESOURCE_ALIAS "color_frag.spv"
+)
+set_source_files_properties("../shared/color_vert.spv"
+    PROPERTIES QT_RESOURCE_ALIAS "color_vert.spv"
+)
+set(hellovulkanwidget_resource_files
+    "../shared/color_frag.spv"
+    "../shared/color_vert.spv"
+)
+
+qt6_add_resources(hellovulkanwidget "hellovulkanwidget"
+    PREFIX
+        "/"
+    FILES
+        ${hellovulkanwidget_resource_files}
+)
+
+install(TARGETS hellovulkanwidget
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/vulkan/hellovulkanwindow/CMakeLists.txt b/examples/vulkan/hellovulkanwindow/CMakeLists.txt
new file mode 100644
index 0000000000..3a20345899
--- /dev/null
+++ b/examples/vulkan/hellovulkanwindow/CMakeLists.txt
@@ -0,0 +1,30 @@
+# Generated from hellovulkanwindow.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(hellovulkanwindow LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/vulkan/hellovulkanwindow")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+
+add_qt_gui_executable(hellovulkanwindow
+    hellovulkanwindow.cpp hellovulkanwindow.h
+    main.cpp
+)
+target_link_libraries(hellovulkanwindow PUBLIC
+    Qt::Core
+    Qt::Gui
+)
+
+install(TARGETS hellovulkanwindow
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/CMakeLists.txt b/examples/widgets/CMakeLists.txt
new file mode 100644
index 0000000000..1b18fc8622
--- /dev/null
+++ b/examples/widgets/CMakeLists.txt
@@ -0,0 +1,33 @@
+# Generated from widgets.pro.
+
+add_subdirectory(animation)
+add_subdirectory(desktop)
+add_subdirectory(dialogs)
+if(QT_FEATURE_draganddrop) # special case
+   add_subdirectory(draganddrop)
+endif()
+add_subdirectory(effects)
+add_subdirectory(gestures)
+add_subdirectory(graphicsview)
+add_subdirectory(itemviews)
+add_subdirectory(layouts)
+add_subdirectory(painting)
+add_subdirectory(richtext)
+add_subdirectory(scroller)
+add_subdirectory(statemachine)
+add_subdirectory(tools)
+add_subdirectory(touch)
+add_subdirectory(tutorials)
+add_subdirectory(widgets)
+
+if(TARGET Qt::Gui AND QT_FEATURE_opengl)
+    add_subdirectory(windowcontainer)
+endif()
+
+if(QT_FEATURE_cursor) # special case
+    add_subdirectory(mainwindows)
+endif()
+
+if(APPLE_OSX)
+    add_subdirectory(mac)
+endif()
diff --git a/examples/widgets/animation/CMakeLists.txt b/examples/widgets/animation/CMakeLists.txt
new file mode 100644
index 0000000000..15f62728da
--- /dev/null
+++ b/examples/widgets/animation/CMakeLists.txt
@@ -0,0 +1,8 @@
+# Generated from animation.pro.
+
+add_subdirectory(animatedtiles)
+add_subdirectory(easing)
+add_subdirectory(moveblocks)
+add_subdirectory(states)
+add_subdirectory(stickman)
+add_subdirectory(sub-attaq)
diff --git a/examples/widgets/animation/animatedtiles/CMakeLists.txt b/examples/widgets/animation/animatedtiles/CMakeLists.txt
new file mode 100644
index 0000000000..b8755a3321
--- /dev/null
+++ b/examples/widgets/animation/animatedtiles/CMakeLists.txt
@@ -0,0 +1,50 @@
+# Generated from animatedtiles.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(animatedtiles LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/animation/animatedtiles")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(animatedtiles
+    main.cpp
+)
+target_link_libraries(animatedtiles PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+
+# Resources:
+set(animatedtiles_resource_files
+    "images/Time-For-Lunch-2.jpg"
+    "images/centered.png"
+    "images/ellipse.png"
+    "images/figure8.png"
+    "images/kinetic.png"
+    "images/random.png"
+    "images/tile.png"
+)
+
+qt6_add_resources(animatedtiles "animatedtiles"
+    PREFIX
+        "/"
+    FILES
+        ${animatedtiles_resource_files}
+)
+
+install(TARGETS animatedtiles
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/animation/easing/CMakeLists.txt b/examples/widgets/animation/easing/CMakeLists.txt
new file mode 100644
index 0000000000..6b09e45cff
--- /dev/null
+++ b/examples/widgets/animation/easing/CMakeLists.txt
@@ -0,0 +1,47 @@
+# Generated from easing.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(easing LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/animation/easing")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(easing
+    animation.h
+    form.ui
+    main.cpp
+    window.cpp window.h
+)
+target_link_libraries(easing PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+
+# Resources:
+set(easing_resource_files
+    "images/qt-logo.png"
+)
+
+qt6_add_resources(easing "easing"
+    PREFIX
+        "/"
+    FILES
+        ${easing_resource_files}
+)
+
+install(TARGETS easing
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/animation/easing/window.cpp b/examples/widgets/animation/easing/window.cpp
index 378af07535..7b4fe1d912 100644
--- a/examples/widgets/animation/easing/window.cpp
+++ b/examples/widgets/animation/easing/window.cpp
@@ -67,13 +67,13 @@ Window::Window(QWidget *parent)
 
     connect(m_ui.easingCurvePicker, &QListWidget::currentRowChanged,
             this, &Window::curveChanged);
-    connect(m_ui.buttonGroup, QOverload<QAbstractButton *>::of(&QButtonGroup::buttonClicked),
+    connect(m_ui.buttonGroup, &QButtonGroup::buttonClicked,
             this, &Window::pathChanged);
-    connect(m_ui.periodSpinBox, QOverload<double>::of(&QDoubleSpinBox::valueChanged),
+    connect(m_ui.periodSpinBox, &QDoubleSpinBox::valueChanged,
             this, &Window::periodChanged);
-    connect(m_ui.amplitudeSpinBox, QOverload<double>::of(&QDoubleSpinBox::valueChanged),
+    connect(m_ui.amplitudeSpinBox, &QDoubleSpinBox::valueChanged,
             this, &Window::amplitudeChanged);
-    connect(m_ui.overshootSpinBox, QOverload<double>::of(&QDoubleSpinBox::valueChanged),
+    connect(m_ui.overshootSpinBox, &QDoubleSpinBox::valueChanged,
             this, &Window::overshootChanged);
     createCurveIcons();
 
diff --git a/examples/widgets/animation/moveblocks/CMakeLists.txt b/examples/widgets/animation/moveblocks/CMakeLists.txt
new file mode 100644
index 0000000000..c5219c9e6a
--- /dev/null
+++ b/examples/widgets/animation/moveblocks/CMakeLists.txt
@@ -0,0 +1,31 @@
+# Generated from moveblocks.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(moveblocks LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/animation/moveblocks")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(moveblocks
+    main.cpp
+)
+target_link_libraries(moveblocks PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+install(TARGETS moveblocks
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/animation/states/CMakeLists.txt b/examples/widgets/animation/states/CMakeLists.txt
new file mode 100644
index 0000000000..cddcc6a7a3
--- /dev/null
+++ b/examples/widgets/animation/states/CMakeLists.txt
@@ -0,0 +1,49 @@
+# Generated from states.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(states LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/animation/states")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(states
+    main.cpp
+)
+target_link_libraries(states PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+
+# Resources:
+set(states_resource_files
+    "accessories-dictionary.png"
+    "akregator.png"
+    "digikam.png"
+    "help-browser.png"
+    "k3b.png"
+    "kchart.png"
+)
+
+qt6_add_resources(states "states"
+    PREFIX
+        "/"
+    FILES
+        ${states_resource_files}
+)
+
+install(TARGETS states
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/animation/stickman/CMakeLists.txt b/examples/widgets/animation/stickman/CMakeLists.txt
new file mode 100644
index 0000000000..791e685fc2
--- /dev/null
+++ b/examples/widgets/animation/stickman/CMakeLists.txt
@@ -0,0 +1,53 @@
+# Generated from stickman.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(stickman LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/animation/stickman")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(stickman
+    animation.cpp animation.h
+    graphicsview.cpp graphicsview.h
+    lifecycle.cpp lifecycle.h
+    main.cpp
+    node.cpp node.h
+    rectbutton.cpp rectbutton.h
+    stickman.cpp stickman.h
+)
+target_link_libraries(stickman PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+
+# Resources:
+set(stickman_resource_files
+    "animations/chilling.bin"
+    "animations/dancing.bin"
+    "animations/dead.bin"
+    "animations/jumping.bin"
+)
+
+qt6_add_resources(stickman "stickman"
+    PREFIX
+        "/"
+    FILES
+        ${stickman_resource_files}
+)
+
+install(TARGETS stickman
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/animation/sub-attaq/.prev_CMakeLists.txt b/examples/widgets/animation/sub-attaq/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..74f095f4f6
--- /dev/null
+++ b/examples/widgets/animation/sub-attaq/.prev_CMakeLists.txt
@@ -0,0 +1,192 @@
+# Generated from sub-attaq.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(sub-attaq LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/animation/sub-attaq")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(sub-attaq
+    animationmanager.cpp animationmanager.h
+    boat.cpp boat.h boat_p.h
+    bomb.cpp bomb.h
+    graphicsscene.cpp graphicsscene.h
+    main.cpp
+    mainwindow.cpp mainwindow.h
+    pixmapitem.cpp pixmapitem.h
+    progressitem.cpp progressitem.h
+    qanimationstate.cpp qanimationstate.h
+    states.cpp states.h
+    submarine.cpp submarine.h submarine_p.h
+    textinformationitem.cpp textinformationitem.h
+    torpedo.cpp torpedo.h
+)
+target_link_libraries(sub-attaq PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+
+# Resources:
+set_source_files_properties("pics/big/background.png"
+    PROPERTIES QT_RESOURCE_ALIAS "big/background"
+)
+set_source_files_properties("pics/big/boat.png"
+    PROPERTIES QT_RESOURCE_ALIAS "big/boat"
+)
+set_source_files_properties("pics/big/bomb.png"
+    PROPERTIES QT_RESOURCE_ALIAS "big/bomb"
+)
+set_source_files_properties("pics/big/explosion/boat/step1.png"
+    PROPERTIES QT_RESOURCE_ALIAS "big/explosion/boat/step1"
+)
+set_source_files_properties("pics/big/explosion/boat/step2.png"
+    PROPERTIES QT_RESOURCE_ALIAS "big/explosion/boat/step2"
+)
+set_source_files_properties("pics/big/explosion/boat/step3.png"
+    PROPERTIES QT_RESOURCE_ALIAS "big/explosion/boat/step3"
+)
+set_source_files_properties("pics/big/explosion/boat/step4.png"
+    PROPERTIES QT_RESOURCE_ALIAS "big/explosion/boat/step4"
+)
+set_source_files_properties("pics/big/explosion/submarine/step1.png"
+    PROPERTIES QT_RESOURCE_ALIAS "big/explosion/submarine/step1"
+)
+set_source_files_properties("pics/big/explosion/submarine/step2.png"
+    PROPERTIES QT_RESOURCE_ALIAS "big/explosion/submarine/step2"
+)
+set_source_files_properties("pics/big/explosion/submarine/step3.png"
+    PROPERTIES QT_RESOURCE_ALIAS "big/explosion/submarine/step3"
+)
+set_source_files_properties("pics/big/explosion/submarine/step4.png"
+    PROPERTIES QT_RESOURCE_ALIAS "big/explosion/submarine/step4"
+)
+set_source_files_properties("pics/big/submarine.png"
+    PROPERTIES QT_RESOURCE_ALIAS "big/submarine"
+)
+set_source_files_properties("pics/big/surface.png"
+    PROPERTIES QT_RESOURCE_ALIAS "big/surface"
+)
+set_source_files_properties("pics/big/torpedo.png"
+    PROPERTIES QT_RESOURCE_ALIAS "big/torpedo"
+)
+set_source_files_properties("pics/scalable/boat.svg"
+    PROPERTIES QT_RESOURCE_ALIAS "boat"
+)
+set_source_files_properties("pics/scalable/sub-attaq.svg"
+    PROPERTIES QT_RESOURCE_ALIAS "all"
+)
+set_source_files_properties("pics/scalable/submarine.svg"
+    PROPERTIES QT_RESOURCE_ALIAS "submarine"
+)
+set_source_files_properties("pics/scalable/torpedo.svg"
+    PROPERTIES QT_RESOURCE_ALIAS "torpedo"
+)
+set_source_files_properties("pics/small/background.png"
+    PROPERTIES QT_RESOURCE_ALIAS "small/background"
+)
+set_source_files_properties("pics/small/boat.png"
+    PROPERTIES QT_RESOURCE_ALIAS "small/boat"
+)
+set_source_files_properties("pics/small/bomb.png"
+    PROPERTIES QT_RESOURCE_ALIAS "small/bomb"
+)
+set_source_files_properties("pics/small/submarine.png"
+    PROPERTIES QT_RESOURCE_ALIAS "small/submarine"
+)
+set_source_files_properties("pics/small/surface.png"
+    PROPERTIES QT_RESOURCE_ALIAS "small/surface"
+)
+set_source_files_properties("pics/small/torpedo.png"
+    PROPERTIES QT_RESOURCE_ALIAS "small/torpedo"
+)
+set_source_files_properties("pics/welcome/logo-a.png"
+    PROPERTIES QT_RESOURCE_ALIAS "logo-a"
+)
+set_source_files_properties("pics/welcome/logo-a2.png"
+    PROPERTIES QT_RESOURCE_ALIAS "logo-a2"
+)
+set_source_files_properties("pics/welcome/logo-b.png"
+    PROPERTIES QT_RESOURCE_ALIAS "logo-b"
+)
+set_source_files_properties("pics/welcome/logo-dash.png"
+    PROPERTIES QT_RESOURCE_ALIAS "logo-dash"
+)
+set_source_files_properties("pics/welcome/logo-excl.png"
+    PROPERTIES QT_RESOURCE_ALIAS "logo-excl"
+)
+set_source_files_properties("pics/welcome/logo-q.png"
+    PROPERTIES QT_RESOURCE_ALIAS "logo-q"
+)
+set_source_files_properties("pics/welcome/logo-s.png"
+    PROPERTIES QT_RESOURCE_ALIAS "logo-s"
+)
+set_source_files_properties("pics/welcome/logo-t.png"
+    PROPERTIES QT_RESOURCE_ALIAS "logo-t"
+)
+set_source_files_properties("pics/welcome/logo-t2.png"
+    PROPERTIES QT_RESOURCE_ALIAS "logo-t2"
+)
+set_source_files_properties("pics/welcome/logo-u.png"
+    PROPERTIES QT_RESOURCE_ALIAS "logo-u"
+)
+set(subattaq_resource_files
+    "data.xml"
+    "pics/big/background.png"
+    "pics/big/boat.png"
+    "pics/big/bomb.png"
+    "pics/big/explosion/boat/step1.png"
+    "pics/big/explosion/boat/step2.png"
+    "pics/big/explosion/boat/step3.png"
+    "pics/big/explosion/boat/step4.png"
+    "pics/big/explosion/submarine/step1.png"
+    "pics/big/explosion/submarine/step2.png"
+    "pics/big/explosion/submarine/step3.png"
+    "pics/big/explosion/submarine/step4.png"
+    "pics/big/submarine.png"
+    "pics/big/surface.png"
+    "pics/big/torpedo.png"
+    "pics/scalable/boat.svg"
+    "pics/scalable/sub-attaq.svg"
+    "pics/scalable/submarine.svg"
+    "pics/scalable/torpedo.svg"
+    "pics/small/background.png"
+    "pics/small/boat.png"
+    "pics/small/bomb.png"
+    "pics/small/submarine.png"
+    "pics/small/surface.png"
+    "pics/small/torpedo.png"
+    "pics/welcome/logo-a.png"
+    "pics/welcome/logo-a2.png"
+    "pics/welcome/logo-b.png"
+    "pics/welcome/logo-dash.png"
+    "pics/welcome/logo-excl.png"
+    "pics/welcome/logo-q.png"
+    "pics/welcome/logo-s.png"
+    "pics/welcome/logo-t.png"
+    "pics/welcome/logo-t2.png"
+    "pics/welcome/logo-u.png"
+)
+
+qt6_add_resources(sub-attaq "subattaq"
+    PREFIX
+        "/"
+    FILES
+        ${subattaq_resource_files}
+)
+
+install(TARGETS sub-attaq
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/animation/sub-attaq/CMakeLists.txt b/examples/widgets/animation/sub-attaq/CMakeLists.txt
new file mode 100644
index 0000000000..2e4e455b34
--- /dev/null
+++ b/examples/widgets/animation/sub-attaq/CMakeLists.txt
@@ -0,0 +1,193 @@
+# Generated from sub-attaq.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(sub-attaq LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/animation/sub-attaq")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+find_package(Qt6 COMPONENTS OpenGL) # special case
+
+add_qt_gui_executable(sub-attaq
+    animationmanager.cpp animationmanager.h
+    boat.cpp boat.h boat_p.h
+    bomb.cpp bomb.h
+    graphicsscene.cpp graphicsscene.h
+    main.cpp
+    mainwindow.cpp mainwindow.h
+    pixmapitem.cpp pixmapitem.h
+    progressitem.cpp progressitem.h
+    qanimationstate.cpp qanimationstate.h
+    states.cpp states.h
+    submarine.cpp submarine.h submarine_p.h
+    textinformationitem.cpp textinformationitem.h
+    torpedo.cpp torpedo.h
+)
+target_link_libraries(sub-attaq PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+
+# Resources:
+set_source_files_properties("pics/big/background.png"
+    PROPERTIES QT_RESOURCE_ALIAS "big/background"
+)
+set_source_files_properties("pics/big/boat.png"
+    PROPERTIES QT_RESOURCE_ALIAS "big/boat"
+)
+set_source_files_properties("pics/big/bomb.png"
+    PROPERTIES QT_RESOURCE_ALIAS "big/bomb"
+)
+set_source_files_properties("pics/big/explosion/boat/step1.png"
+    PROPERTIES QT_RESOURCE_ALIAS "big/explosion/boat/step1"
+)
+set_source_files_properties("pics/big/explosion/boat/step2.png"
+    PROPERTIES QT_RESOURCE_ALIAS "big/explosion/boat/step2"
+)
+set_source_files_properties("pics/big/explosion/boat/step3.png"
+    PROPERTIES QT_RESOURCE_ALIAS "big/explosion/boat/step3"
+)
+set_source_files_properties("pics/big/explosion/boat/step4.png"
+    PROPERTIES QT_RESOURCE_ALIAS "big/explosion/boat/step4"
+)
+set_source_files_properties("pics/big/explosion/submarine/step1.png"
+    PROPERTIES QT_RESOURCE_ALIAS "big/explosion/submarine/step1"
+)
+set_source_files_properties("pics/big/explosion/submarine/step2.png"
+    PROPERTIES QT_RESOURCE_ALIAS "big/explosion/submarine/step2"
+)
+set_source_files_properties("pics/big/explosion/submarine/step3.png"
+    PROPERTIES QT_RESOURCE_ALIAS "big/explosion/submarine/step3"
+)
+set_source_files_properties("pics/big/explosion/submarine/step4.png"
+    PROPERTIES QT_RESOURCE_ALIAS "big/explosion/submarine/step4"
+)
+set_source_files_properties("pics/big/submarine.png"
+    PROPERTIES QT_RESOURCE_ALIAS "big/submarine"
+)
+set_source_files_properties("pics/big/surface.png"
+    PROPERTIES QT_RESOURCE_ALIAS "big/surface"
+)
+set_source_files_properties("pics/big/torpedo.png"
+    PROPERTIES QT_RESOURCE_ALIAS "big/torpedo"
+)
+set_source_files_properties("pics/scalable/boat.svg"
+    PROPERTIES QT_RESOURCE_ALIAS "boat"
+)
+set_source_files_properties("pics/scalable/sub-attaq.svg"
+    PROPERTIES QT_RESOURCE_ALIAS "all"
+)
+set_source_files_properties("pics/scalable/submarine.svg"
+    PROPERTIES QT_RESOURCE_ALIAS "submarine"
+)
+set_source_files_properties("pics/scalable/torpedo.svg"
+    PROPERTIES QT_RESOURCE_ALIAS "torpedo"
+)
+set_source_files_properties("pics/small/background.png"
+    PROPERTIES QT_RESOURCE_ALIAS "small/background"
+)
+set_source_files_properties("pics/small/boat.png"
+    PROPERTIES QT_RESOURCE_ALIAS "small/boat"
+)
+set_source_files_properties("pics/small/bomb.png"
+    PROPERTIES QT_RESOURCE_ALIAS "small/bomb"
+)
+set_source_files_properties("pics/small/submarine.png"
+    PROPERTIES QT_RESOURCE_ALIAS "small/submarine"
+)
+set_source_files_properties("pics/small/surface.png"
+    PROPERTIES QT_RESOURCE_ALIAS "small/surface"
+)
+set_source_files_properties("pics/small/torpedo.png"
+    PROPERTIES QT_RESOURCE_ALIAS "small/torpedo"
+)
+set_source_files_properties("pics/welcome/logo-a.png"
+    PROPERTIES QT_RESOURCE_ALIAS "logo-a"
+)
+set_source_files_properties("pics/welcome/logo-a2.png"
+    PROPERTIES QT_RESOURCE_ALIAS "logo-a2"
+)
+set_source_files_properties("pics/welcome/logo-b.png"
+    PROPERTIES QT_RESOURCE_ALIAS "logo-b"
+)
+set_source_files_properties("pics/welcome/logo-dash.png"
+    PROPERTIES QT_RESOURCE_ALIAS "logo-dash"
+)
+set_source_files_properties("pics/welcome/logo-excl.png"
+    PROPERTIES QT_RESOURCE_ALIAS "logo-excl"
+)
+set_source_files_properties("pics/welcome/logo-q.png"
+    PROPERTIES QT_RESOURCE_ALIAS "logo-q"
+)
+set_source_files_properties("pics/welcome/logo-s.png"
+    PROPERTIES QT_RESOURCE_ALIAS "logo-s"
+)
+set_source_files_properties("pics/welcome/logo-t.png"
+    PROPERTIES QT_RESOURCE_ALIAS "logo-t"
+)
+set_source_files_properties("pics/welcome/logo-t2.png"
+    PROPERTIES QT_RESOURCE_ALIAS "logo-t2"
+)
+set_source_files_properties("pics/welcome/logo-u.png"
+    PROPERTIES QT_RESOURCE_ALIAS "logo-u"
+)
+set(subattaq_resource_files
+    "data.xml"
+    "pics/big/background.png"
+    "pics/big/boat.png"
+    "pics/big/bomb.png"
+    "pics/big/explosion/boat/step1.png"
+    "pics/big/explosion/boat/step2.png"
+    "pics/big/explosion/boat/step3.png"
+    "pics/big/explosion/boat/step4.png"
+    "pics/big/explosion/submarine/step1.png"
+    "pics/big/explosion/submarine/step2.png"
+    "pics/big/explosion/submarine/step3.png"
+    "pics/big/explosion/submarine/step4.png"
+    "pics/big/submarine.png"
+    "pics/big/surface.png"
+    "pics/big/torpedo.png"
+    "pics/scalable/boat.svg"
+    "pics/scalable/sub-attaq.svg"
+    "pics/scalable/submarine.svg"
+    "pics/scalable/torpedo.svg"
+    "pics/small/background.png"
+    "pics/small/boat.png"
+    "pics/small/bomb.png"
+    "pics/small/submarine.png"
+    "pics/small/surface.png"
+    "pics/small/torpedo.png"
+    "pics/welcome/logo-a.png"
+    "pics/welcome/logo-a2.png"
+    "pics/welcome/logo-b.png"
+    "pics/welcome/logo-dash.png"
+    "pics/welcome/logo-excl.png"
+    "pics/welcome/logo-q.png"
+    "pics/welcome/logo-s.png"
+    "pics/welcome/logo-t.png"
+    "pics/welcome/logo-t2.png"
+    "pics/welcome/logo-u.png"
+)
+
+qt6_add_resources(sub-attaq "subattaq"
+    PREFIX
+        "/"
+    FILES
+        ${subattaq_resource_files}
+)
+
+install(TARGETS sub-attaq
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/animation/sub-attaq/mainwindow.cpp b/examples/widgets/animation/sub-attaq/mainwindow.cpp
index f9617a22eb..0c152c9180 100644
--- a/examples/widgets/animation/sub-attaq/mainwindow.cpp
+++ b/examples/widgets/animation/sub-attaq/mainwindow.cpp
@@ -59,10 +59,6 @@
 #include <QMenuBar>
 #include <QLayout>
 
-#ifndef QT_NO_OPENGL
-# include <QtOpenGL>
-#endif
-
 MainWindow::MainWindow(QWidget *parent)
     : QMainWindow(parent)
 {
@@ -84,14 +80,5 @@ MainWindow::MainWindow(QWidget *parent)
     view = new QGraphicsView(scene, this);
     view->setAlignment(Qt::AlignLeft | Qt::AlignTop);
     scene->setupScene(newAction, quitAction);
-#ifndef QT_NO_OPENGL
-    QGLWidget *glWidget = new QGLWidget(QGLFormat(QGL::SampleBuffers));
-    if (glWidget->context()->isValid()) {
-        view->setViewport(glWidget);
-    } else {
-        qWarning("Unable to create an Open GL context with sample buffers, not using Open GL.");
-        delete glWidget;
-    }
-#endif
     setCentralWidget(view);
 }
diff --git a/examples/widgets/animation/sub-attaq/sub-attaq.pro b/examples/widgets/animation/sub-attaq/sub-attaq.pro
index ac79fd4249..ea44253fa1 100644
--- a/examples/widgets/animation/sub-attaq/sub-attaq.pro
+++ b/examples/widgets/animation/sub-attaq/sub-attaq.pro
@@ -1,5 +1,4 @@
 QT += widgets
-qtHaveModule(opengl): QT += opengl
 HEADERS += boat.h \
     bomb.h \
     mainwindow.h \
diff --git a/examples/widgets/desktop/CMakeLists.txt b/examples/widgets/desktop/CMakeLists.txt
new file mode 100644
index 0000000000..a50d3c2f0a
--- /dev/null
+++ b/examples/widgets/desktop/CMakeLists.txt
@@ -0,0 +1,4 @@
+# Generated from desktop.pro.
+
+add_subdirectory(screenshot)
+add_subdirectory(systray)
diff --git a/examples/widgets/desktop/screenshot/CMakeLists.txt b/examples/widgets/desktop/screenshot/CMakeLists.txt
new file mode 100644
index 0000000000..3145dd41e5
--- /dev/null
+++ b/examples/widgets/desktop/screenshot/CMakeLists.txt
@@ -0,0 +1,32 @@
+# Generated from screenshot.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(screenshot LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/desktop/screenshot")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(screenshot
+    main.cpp
+    screenshot.cpp screenshot.h
+)
+target_link_libraries(screenshot PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+install(TARGETS screenshot
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/desktop/screenshot/screenshot.cpp b/examples/widgets/desktop/screenshot/screenshot.cpp
index d0a849e0b8..af344db1d2 100644
--- a/examples/widgets/desktop/screenshot/screenshot.cpp
+++ b/examples/widgets/desktop/screenshot/screenshot.cpp
@@ -70,7 +70,7 @@ Screenshot::Screenshot()
     delaySpinBox->setSuffix(tr(" s"));
     delaySpinBox->setMaximum(60);
 
-    connect(delaySpinBox, QOverload<int>::of(&QSpinBox::valueChanged),
+    connect(delaySpinBox, &QSpinBox::valueChanged,
             this, &Screenshot::updateCheckBox);
 
     hideThisWindowCheckBox = new QCheckBox(tr("Hide This Window"), optionsGroupBox);
diff --git a/examples/widgets/desktop/systray/CMakeLists.txt b/examples/widgets/desktop/systray/CMakeLists.txt
new file mode 100644
index 0000000000..16af7808d7
--- /dev/null
+++ b/examples/widgets/desktop/systray/CMakeLists.txt
@@ -0,0 +1,47 @@
+# Generated from systray.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(systray LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/desktop/systray")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(systray
+    main.cpp
+    window.cpp window.h
+)
+target_link_libraries(systray PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+
+# Resources:
+set(systray_resource_files
+    "images/bad.png"
+    "images/heart.png"
+    "images/trash.png"
+)
+
+qt6_add_resources(systray "systray"
+    PREFIX
+        "/"
+    FILES
+        ${systray_resource_files}
+)
+
+install(TARGETS systray
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/desktop/systray/window.cpp b/examples/widgets/desktop/systray/window.cpp
index e30166beac..3238e3bf31 100644
--- a/examples/widgets/desktop/systray/window.cpp
+++ b/examples/widgets/desktop/systray/window.cpp
@@ -80,7 +80,7 @@ Window::Window()
 
     connect(showMessageButton, &QAbstractButton::clicked, this, &Window::showMessage);
     connect(showIconCheckBox, &QAbstractButton::toggled, trayIcon, &QSystemTrayIcon::setVisible);
-    connect(iconComboBox, QOverload<int>::of(&QComboBox::currentIndexChanged),
+    connect(iconComboBox, &QComboBox::currentIndexChanged,
             this, &Window::setIcon);
     connect(trayIcon, &QSystemTrayIcon::messageClicked, this, &Window::messageClicked);
     connect(trayIcon, &QSystemTrayIcon::activated, this, &Window::iconActivated);
diff --git a/examples/widgets/dialogs/CMakeLists.txt b/examples/widgets/dialogs/CMakeLists.txt
new file mode 100644
index 0000000000..c9d6823adc
--- /dev/null
+++ b/examples/widgets/dialogs/CMakeLists.txt
@@ -0,0 +1,14 @@
+# Generated from dialogs.pro.
+
+add_subdirectory(extension)
+add_subdirectory(findfiles)
+if(TARGET Qt::PrintSupport AND QT_FEATURE_wizard) # special case
+    add_subdirectory(licensewizard)
+endif()
+add_subdirectory(standarddialogs)
+add_subdirectory(tabdialog)
+
+if(QT_FEATURE_wizard) # special case
+    add_subdirectory(classwizard)
+    add_subdirectory(trivialwizard)
+endif()
diff --git a/examples/widgets/dialogs/classwizard/CMakeLists.txt b/examples/widgets/dialogs/classwizard/CMakeLists.txt
new file mode 100644
index 0000000000..0a85f02b21
--- /dev/null
+++ b/examples/widgets/dialogs/classwizard/CMakeLists.txt
@@ -0,0 +1,51 @@
+# Generated from classwizard.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(classwizard LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/dialogs/classwizard")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(classwizard
+    classwizard.cpp classwizard.h
+    main.cpp
+)
+target_link_libraries(classwizard PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+
+# Resources:
+set(classwizard_resource_files
+    "images/background.png"
+    "images/banner.png"
+    "images/logo1.png"
+    "images/logo2.png"
+    "images/logo3.png"
+    "images/watermark1.png"
+    "images/watermark2.png"
+)
+
+qt6_add_resources(classwizard "classwizard"
+    PREFIX
+        "/"
+    FILES
+        ${classwizard_resource_files}
+)
+
+install(TARGETS classwizard
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/dialogs/extension/CMakeLists.txt b/examples/widgets/dialogs/extension/CMakeLists.txt
new file mode 100644
index 0000000000..dfac53a3f6
--- /dev/null
+++ b/examples/widgets/dialogs/extension/CMakeLists.txt
@@ -0,0 +1,32 @@
+# Generated from extension.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(extension LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/dialogs/extension")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(extension
+    finddialog.cpp finddialog.h
+    main.cpp
+)
+target_link_libraries(extension PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+install(TARGETS extension
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/dialogs/findfiles/CMakeLists.txt b/examples/widgets/dialogs/findfiles/CMakeLists.txt
new file mode 100644
index 0000000000..42681ca424
--- /dev/null
+++ b/examples/widgets/dialogs/findfiles/CMakeLists.txt
@@ -0,0 +1,32 @@
+# Generated from findfiles.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(findfiles LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/dialogs/findfiles")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(findfiles
+    main.cpp
+    window.cpp window.h
+)
+target_link_libraries(findfiles PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+install(TARGETS findfiles
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/dialogs/licensewizard/CMakeLists.txt b/examples/widgets/dialogs/licensewizard/CMakeLists.txt
new file mode 100644
index 0000000000..20b4b7d799
--- /dev/null
+++ b/examples/widgets/dialogs/licensewizard/CMakeLists.txt
@@ -0,0 +1,48 @@
+# Generated from licensewizard.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(licensewizard LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/dialogs/licensewizard")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+find_package(Qt6 COMPONENTS PrintSupport)
+
+add_qt_gui_executable(licensewizard
+    licensewizard.cpp licensewizard.h
+    main.cpp
+)
+target_link_libraries(licensewizard PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::PrintSupport
+    Qt::Widgets
+)
+
+
+# Resources:
+set(licensewizard_resource_files
+    "images/logo.png"
+    "images/watermark.png"
+)
+
+qt6_add_resources(licensewizard "licensewizard"
+    PREFIX
+        "/"
+    FILES
+        ${licensewizard_resource_files}
+)
+
+install(TARGETS licensewizard
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/dialogs/standarddialogs/CMakeLists.txt b/examples/widgets/dialogs/standarddialogs/CMakeLists.txt
new file mode 100644
index 0000000000..ed4c11b041
--- /dev/null
+++ b/examples/widgets/dialogs/standarddialogs/CMakeLists.txt
@@ -0,0 +1,32 @@
+# Generated from standarddialogs.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(standarddialogs LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/dialogs/standarddialogs")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(standarddialogs
+    dialog.cpp dialog.h
+    main.cpp
+)
+target_link_libraries(standarddialogs PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+install(TARGETS standarddialogs
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/dialogs/tabdialog/CMakeLists.txt b/examples/widgets/dialogs/tabdialog/CMakeLists.txt
new file mode 100644
index 0000000000..0df1238e56
--- /dev/null
+++ b/examples/widgets/dialogs/tabdialog/CMakeLists.txt
@@ -0,0 +1,32 @@
+# Generated from tabdialog.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(tabdialog LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/dialogs/tabdialog")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(tabdialog
+    main.cpp
+    tabdialog.cpp tabdialog.h
+)
+target_link_libraries(tabdialog PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+install(TARGETS tabdialog
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/dialogs/trivialwizard/CMakeLists.txt b/examples/widgets/dialogs/trivialwizard/CMakeLists.txt
new file mode 100644
index 0000000000..759483ab8f
--- /dev/null
+++ b/examples/widgets/dialogs/trivialwizard/CMakeLists.txt
@@ -0,0 +1,31 @@
+# Generated from trivialwizard.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(trivialwizard LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/dialogs/trivialwizard")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(trivialwizard
+    trivialwizard.cpp
+)
+target_link_libraries(trivialwizard PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+install(TARGETS trivialwizard
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/doc/src/padnavigator.qdoc b/examples/widgets/doc/src/padnavigator.qdoc
index d8e83978cf..31440b650f 100644
--- a/examples/widgets/doc/src/padnavigator.qdoc
+++ b/examples/widgets/doc/src/padnavigator.qdoc
@@ -545,7 +545,7 @@
     with OpenGL, but without OpenGL it avoids unnecessary re-scaling of the
     background pixmap.
     \li It sets render hints that increase rendering quality.
-    \li If OpenGL is supported, a QGLWidget viewport is assigned to the view.
+    \li If OpenGL is supported, a QOpenGLWidget viewport is assigned to the view.
     \endlist
 
     Finally, we start the state engine.
diff --git a/examples/widgets/draganddrop/CMakeLists.txt b/examples/widgets/draganddrop/CMakeLists.txt
new file mode 100644
index 0000000000..fbad523a73
--- /dev/null
+++ b/examples/widgets/draganddrop/CMakeLists.txt
@@ -0,0 +1,7 @@
+# Generated from draganddrop.pro.
+
+add_subdirectory(draggableicons)
+add_subdirectory(draggabletext)
+add_subdirectory(dropsite)
+add_subdirectory(fridgemagnets)
+add_subdirectory(puzzle)
diff --git a/examples/widgets/draganddrop/draggableicons/CMakeLists.txt b/examples/widgets/draganddrop/draggableicons/CMakeLists.txt
new file mode 100644
index 0000000000..5695657792
--- /dev/null
+++ b/examples/widgets/draganddrop/draggableicons/CMakeLists.txt
@@ -0,0 +1,47 @@
+# Generated from draggableicons.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(draggableicons LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/draganddrop/draggableicons")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(draggableicons
+    dragwidget.cpp dragwidget.h
+    main.cpp
+)
+target_link_libraries(draggableicons PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+
+# Resources:
+set(draggableicons_resource_files
+    "images/boat.png"
+    "images/car.png"
+    "images/house.png"
+)
+
+qt6_add_resources(draggableicons "draggableicons"
+    PREFIX
+        "/"
+    FILES
+        ${draggableicons_resource_files}
+)
+
+install(TARGETS draggableicons
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/draganddrop/draggabletext/CMakeLists.txt b/examples/widgets/draganddrop/draggabletext/CMakeLists.txt
new file mode 100644
index 0000000000..d3dfc125b2
--- /dev/null
+++ b/examples/widgets/draganddrop/draggabletext/CMakeLists.txt
@@ -0,0 +1,45 @@
+# Generated from draggabletext.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(draggabletext LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/draganddrop/draggabletext")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(draggabletext
+    dragwidget.cpp dragwidget.h
+    main.cpp
+)
+target_link_libraries(draggabletext PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+
+# Resources:
+set(draggabletext_resource_files
+    "words.txt"
+)
+
+qt6_add_resources(draggabletext "draggabletext"
+    PREFIX
+        "/dictionary"
+    FILES
+        ${draggabletext_resource_files}
+)
+
+install(TARGETS draggabletext
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/draganddrop/dropsite/CMakeLists.txt b/examples/widgets/draganddrop/dropsite/CMakeLists.txt
new file mode 100644
index 0000000000..7d6ce02b4b
--- /dev/null
+++ b/examples/widgets/draganddrop/dropsite/CMakeLists.txt
@@ -0,0 +1,33 @@
+# Generated from dropsite.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(dropsite LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/draganddrop/dropsite")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(dropsite
+    droparea.cpp droparea.h
+    dropsitewindow.cpp dropsitewindow.h
+    main.cpp
+)
+target_link_libraries(dropsite PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+install(TARGETS dropsite
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/draganddrop/fridgemagnets/CMakeLists.txt b/examples/widgets/draganddrop/fridgemagnets/CMakeLists.txt
new file mode 100644
index 0000000000..31441ab7cb
--- /dev/null
+++ b/examples/widgets/draganddrop/fridgemagnets/CMakeLists.txt
@@ -0,0 +1,46 @@
+# Generated from fridgemagnets.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(fridgemagnets LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/draganddrop/fridgemagnets")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(fridgemagnets
+    draglabel.cpp draglabel.h
+    dragwidget.cpp dragwidget.h
+    main.cpp
+)
+target_link_libraries(fridgemagnets PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+
+# Resources:
+set(fridgemagnets_resource_files
+    "words.txt"
+)
+
+qt6_add_resources(fridgemagnets "fridgemagnets"
+    PREFIX
+        "/dictionary"
+    FILES
+        ${fridgemagnets_resource_files}
+)
+
+install(TARGETS fridgemagnets
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/draganddrop/puzzle/.prev_CMakeLists.txt b/examples/widgets/draganddrop/puzzle/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..148f386115
--- /dev/null
+++ b/examples/widgets/draganddrop/puzzle/.prev_CMakeLists.txt
@@ -0,0 +1,47 @@
+# Generated from puzzle.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(puzzle LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/draganddrop/puzzle")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(puzzle
+    main.cpp
+    mainwindow.cpp mainwindow.h
+    pieceslist.cpp pieceslist.h
+    puzzlewidget.cpp puzzlewidget.h
+)
+target_link_libraries(puzzle PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+
+# Resources:
+set(puzzle_resource_files
+    "example.jpg"
+)
+
+qt6_add_resources(puzzle "puzzle"
+    PREFIX
+        "/images"
+    FILES
+        ${puzzle_resource_files}
+)
+
+install(TARGETS puzzle
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/draganddrop/puzzle/CMakeLists.txt b/examples/widgets/draganddrop/puzzle/CMakeLists.txt
new file mode 100644
index 0000000000..b181efd090
--- /dev/null
+++ b/examples/widgets/draganddrop/puzzle/CMakeLists.txt
@@ -0,0 +1,47 @@
+# Generated from puzzle.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(puzzle LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/draganddrop/draganddrop_puzzle") # special case
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(draganddrop_puzzle # special case: renamed puzzle
+    main.cpp
+    mainwindow.cpp mainwindow.h
+    pieceslist.cpp pieceslist.h
+    puzzlewidget.cpp puzzlewidget.h
+)
+target_link_libraries(draganddrop_puzzle PUBLIC # special case
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+
+# Resources:
+set(puzzle_resource_files
+    "example.jpg"
+)
+
+qt6_add_resources(draganddrop_puzzle "puzzle" # special case
+    PREFIX
+        "/images"
+    FILES
+        ${puzzle_resource_files}
+)
+
+install(TARGETS draganddrop_puzzle # special case: renamed puzzle
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/effects/CMakeLists.txt b/examples/widgets/effects/CMakeLists.txt
new file mode 100644
index 0000000000..6e8a892de1
--- /dev/null
+++ b/examples/widgets/effects/CMakeLists.txt
@@ -0,0 +1,4 @@
+# Generated from effects.pro.
+
+add_subdirectory(blurpicker)
+add_subdirectory(fademessage)
diff --git a/examples/widgets/effects/blurpicker/CMakeLists.txt b/examples/widgets/effects/blurpicker/CMakeLists.txt
new file mode 100644
index 0000000000..3f9fa69797
--- /dev/null
+++ b/examples/widgets/effects/blurpicker/CMakeLists.txt
@@ -0,0 +1,54 @@
+# Generated from blurpicker.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(blurpicker LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/effects/blurpicker")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(blurpicker
+    blureffect.cpp blureffect.h
+    blurpicker.cpp blurpicker.h
+    main.cpp
+)
+target_link_libraries(blurpicker PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+
+# Resources:
+set(blurpicker_resource_files
+    "images/accessories-calculator.png"
+    "images/accessories-text-editor.png"
+    "images/background.jpg"
+    "images/help-browser.png"
+    "images/internet-group-chat.png"
+    "images/internet-mail.png"
+    "images/internet-web-browser.png"
+    "images/office-calendar.png"
+    "images/system-users.png"
+)
+
+qt6_add_resources(blurpicker "blurpicker"
+    PREFIX
+        "/"
+    FILES
+        ${blurpicker_resource_files}
+)
+
+install(TARGETS blurpicker
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/effects/fademessage/CMakeLists.txt b/examples/widgets/effects/fademessage/CMakeLists.txt
new file mode 100644
index 0000000000..b84985a886
--- /dev/null
+++ b/examples/widgets/effects/fademessage/CMakeLists.txt
@@ -0,0 +1,45 @@
+# Generated from fademessage.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(fademessage LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/effects/fademessage")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(fademessage
+    fademessage.cpp fademessage.h
+    main.cpp
+)
+target_link_libraries(fademessage PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+
+# Resources:
+set(fademessage_resource_files
+    "background.jpg"
+)
+
+qt6_add_resources(fademessage "fademessage"
+    PREFIX
+        "/"
+    FILES
+        ${fademessage_resource_files}
+)
+
+install(TARGETS fademessage
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/gestures/CMakeLists.txt b/examples/widgets/gestures/CMakeLists.txt
new file mode 100644
index 0000000000..0f9f95b72f
--- /dev/null
+++ b/examples/widgets/gestures/CMakeLists.txt
@@ -0,0 +1,3 @@
+# Generated from gestures.pro.
+
+add_subdirectory(imagegestures)
diff --git a/examples/widgets/gestures/imagegestures/CMakeLists.txt b/examples/widgets/gestures/imagegestures/CMakeLists.txt
new file mode 100644
index 0000000000..9676089ff9
--- /dev/null
+++ b/examples/widgets/gestures/imagegestures/CMakeLists.txt
@@ -0,0 +1,33 @@
+# Generated from imagegestures.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(imagegestures LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/gestures/imagegestures")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(imagegestures
+    imagewidget.cpp imagewidget.h
+    main.cpp
+    mainwidget.cpp mainwidget.h
+)
+target_link_libraries(imagegestures PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+install(TARGETS imagegestures
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/graphicsview/CMakeLists.txt b/examples/widgets/graphicsview/CMakeLists.txt
new file mode 100644
index 0000000000..d7ef0fd0dc
--- /dev/null
+++ b/examples/widgets/graphicsview/CMakeLists.txt
@@ -0,0 +1,16 @@
+# Generated from graphicsview.pro.
+
+add_subdirectory(chip)
+add_subdirectory(elasticnodes)
+add_subdirectory(embeddeddialogs)
+add_subdirectory(collidingmice)
+add_subdirectory(padnavigator)
+add_subdirectory(basicgraphicslayouts)
+add_subdirectory(diagramscene)
+if(QT_FEATURE_cursor AND QT_FEATURE_draganddrop)
+    add_subdirectory(dragdroprobot)
+endif()
+add_subdirectory(flowlayout)
+add_subdirectory(anchorlayout)
+add_subdirectory(simpleanchorlayout)
+add_subdirectory(weatheranchorlayout)
diff --git a/examples/widgets/graphicsview/anchorlayout/CMakeLists.txt b/examples/widgets/graphicsview/anchorlayout/CMakeLists.txt
new file mode 100644
index 0000000000..c04890d613
--- /dev/null
+++ b/examples/widgets/graphicsview/anchorlayout/CMakeLists.txt
@@ -0,0 +1,31 @@
+# Generated from anchorlayout.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(anchorlayout LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/graphicsview/anchorlayout")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(anchorlayout
+    main.cpp
+)
+target_link_libraries(anchorlayout PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+install(TARGETS anchorlayout
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/graphicsview/basicgraphicslayouts/CMakeLists.txt b/examples/widgets/graphicsview/basicgraphicslayouts/CMakeLists.txt
new file mode 100644
index 0000000000..18c35e6a3e
--- /dev/null
+++ b/examples/widgets/graphicsview/basicgraphicslayouts/CMakeLists.txt
@@ -0,0 +1,46 @@
+# Generated from basicgraphicslayouts.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(basicgraphicslayouts LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/graphicsview/basicgraphicslayouts")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(basicgraphicslayouts
+    layoutitem.cpp layoutitem.h
+    main.cpp
+    window.cpp window.h
+)
+target_link_libraries(basicgraphicslayouts PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+
+# Resources:
+set(basicgraphicslayouts_resource_files
+    "images/block.png"
+)
+
+qt6_add_resources(basicgraphicslayouts "basicgraphicslayouts"
+    PREFIX
+        "/"
+    FILES
+        ${basicgraphicslayouts_resource_files}
+)
+
+install(TARGETS basicgraphicslayouts
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/graphicsview/boxes/3rdparty/fbm.c b/examples/widgets/graphicsview/boxes/3rdparty/fbm.c
deleted file mode 100644
index 3eebaabfba..0000000000
--- a/examples/widgets/graphicsview/boxes/3rdparty/fbm.c
+++ /dev/null
@@ -1,207 +0,0 @@
-/*****************************************************************
-
-  Implementation of the fractional Brownian motion algorithm. These
-  functions were originally the work of F. Kenton Musgrave.
-  For documentation of the different functions please refer to the
-  book: 
-  "Texturing and modeling: a procedural approach"
-  by David S. Ebert et. al.
-
-******************************************************************/
-
-#if defined (_MSC_VER)
-#include <qglobal.h>
-#endif
-
-#include <time.h>
-#include <stdlib.h>
-#include "fbm.h"
-
-#if defined(Q_CC_MSVC)
-#pragma warning(disable:4244)
-#endif
-
-/* Definitions used by the noise2() functions */
-
-//#define B 0x100
-//#define BM 0xff
-#define B 0x20
-#define BM 0x1f
-
-#define N 0x1000
-#define NP 12   /* 2^N */
-#define NM 0xfff
-
-static int   p[B + B + 2];
-static float g3[B + B + 2][3];
-static float g2[B + B + 2][2];
-static float g1[B + B + 2];
-static int   start = 1;
-
-static void init(void);
-
-#define s_curve(t) ( t * t * (3. - 2. * t) )
-
-#define lerp(t, a, b) ( a + t * (b - a) )
-
-#define setup(i,b0,b1,r0,r1)\
-	t = vec[i] + N;\
-	b0 = ((int)t) & BM;\
-	b1 = (b0+1) & BM;\
-	r0 = t - (int)t;\
-	r1 = r0 - 1.;
-#define at3(rx,ry,rz) ( rx * q[0] + ry * q[1] + rz * q[2] )
-
-/* Fractional Brownian Motion function */
-
-double fBm( Vector point, double H, double lacunarity, double octaves,
-	    int init )
-{
-
-    double            value, frequency, remainder;
-    int               i;
-    static double     exponent_array[10];
-    float             vec[3];
-
-    /* precompute and store spectral weights */
-    if ( init ) {
-	start = 1;
-	srand( time(0) );
-	/* seize required memory for exponent_array */
-	frequency = 1.0;
-	for (i=0; i<=octaves; i++) {
-	    /* compute weight for each frequency */
-	    exponent_array[i] = pow( frequency, -H );
-	    frequency *= lacunarity;
-	}
-    }
-
-    value = 0.0;            /* initialize vars to proper values */
-    frequency = 1.0;
-    vec[0]=point.x;
-    vec[1]=point.y;
-    vec[2]=point.z;
-
-
-    /* inner loop of spectral construction */
-    for (i=0; i<octaves; i++) {
-	/* value += noise3( vec ) * exponent_array[i];*/
-	value += noise3( vec ) * exponent_array[i];
-	vec[0] *= lacunarity;
-	vec[1] *= lacunarity;
-	vec[2] *= lacunarity;
-    } /* for */
-
-    remainder = octaves - (int)octaves;
-    if ( remainder )      /* add in ``octaves''  remainder */
-	/* ``i''  and spatial freq. are preset in loop above */
-	value += remainder * noise3( vec ) * exponent_array[i];
-
-    return( value );
-
-} /* fBm() */
-
-
-float noise3(float vec[3])
-{
-    int bx0, bx1, by0, by1, bz0, bz1, b00, b10, b01, b11;
-    float rx0, rx1, ry0, ry1, rz0, rz1, *q, sy, sz, a, b, c, d, t, u, v;
-    int i, j;
-
-    if (start) {
-	start = 0;
-	init();
-    }
-
-    setup(0, bx0,bx1, rx0,rx1);
-    setup(1, by0,by1, ry0,ry1);
-    setup(2, bz0,bz1, rz0,rz1);
-
-    i = p[ bx0 ];
-    j = p[ bx1 ];
-
-    b00 = p[ i + by0 ];
-    b10 = p[ j + by0 ];
-    b01 = p[ i + by1 ];
-    b11 = p[ j + by1 ];
-
-    t  = s_curve(rx0);
-    sy = s_curve(ry0);
-    sz = s_curve(rz0);
-
-
-    q = g3[ b00 + bz0 ] ; u = at3(rx0,ry0,rz0);
-    q = g3[ b10 + bz0 ] ; v = at3(rx1,ry0,rz0);
-    a = lerp(t, u, v);
-
-    q = g3[ b01 + bz0 ] ; u = at3(rx0,ry1,rz0);
-    q = g3[ b11 + bz0 ] ; v = at3(rx1,ry1,rz0);
-    b = lerp(t, u, v);
-
-    c = lerp(sy, a, b);
-
-    q = g3[ b00 + bz1 ] ; u = at3(rx0,ry0,rz1);
-    q = g3[ b10 + bz1 ] ; v = at3(rx1,ry0,rz1);
-    a = lerp(t, u, v);
-
-    q = g3[ b01 + bz1 ] ; u = at3(rx0,ry1,rz1);
-    q = g3[ b11 + bz1 ] ; v = at3(rx1,ry1,rz1);
-    b = lerp(t, u, v);
-
-    d = lerp(sy, a, b);
-
-    return lerp(sz, c, d);
-}
-
-static void normalize2(float v[2])
-{
-    float s;
-
-    s = sqrt(v[0] * v[0] + v[1] * v[1]);
-    v[0] = v[0] / s;
-    v[1] = v[1] / s;
-}
-
-static void normalize3(float v[3])
-{
-    float s;
-
-    s = sqrt(v[0] * v[0] + v[1] * v[1] + v[2] * v[2]);
-    v[0] = v[0] / s;
-    v[1] = v[1] / s;
-    v[2] = v[2] / s;
-}
-
-static void init(void)
-{
-    int i, j, k;
-    
-    for (i = 0 ; i < B ; i++) {
-	p[i] = i;
-
-	g1[i] = (float)((rand() % (B + B)) - B) / B;
-
-	for (j = 0 ; j < 2 ; j++)
-	    g2[i][j] = (float)((rand() % (B + B)) - B) / B;
-	normalize2(g2[i]);
-
-	for (j = 0 ; j < 3 ; j++)
-	    g3[i][j] = (float)((rand() % (B + B)) - B) / B;
-	normalize3(g3[i]);
-    }
-
-    while (--i) {
-	k = p[i];
-	p[i] = p[j = rand() % B];
-	p[j] = k;
-    }
-
-    for (i = 0 ; i < B + 2 ; i++) {
-	p[B + i] = p[i];
-	g1[B + i] = g1[i];
-	for (j = 0 ; j < 2 ; j++)
-	    g2[B + i][j] = g2[i][j];
-	for (j = 0 ; j < 3 ; j++)
-	    g3[B + i][j] = g3[i][j];
-    }
-}
diff --git a/examples/widgets/graphicsview/boxes/3rdparty/fbm.h b/examples/widgets/graphicsview/boxes/3rdparty/fbm.h
deleted file mode 100644
index b8a4a99ae4..0000000000
--- a/examples/widgets/graphicsview/boxes/3rdparty/fbm.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*****************************************************************
-
-  Prototypes for the fractional Brownian motion algorithm. These
-  functions were originally the work of F. Kenton Musgrave.  For
-  documentation of the different functions please refer to the book:
-  "Texturing and modeling: a procedural approach"
-  by David S. Ebert et. al.
-  
-******************************************************************/
-
-#ifndef _fbm_h
-#define _fbm_h
-
-#include  <math.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-//#define TRUE    1
-//#define FALSE   0
-
-typedef struct {
-    double x;
-    double y;
-    double z;
-} Vector;
-    
-float noise3(float vec[]);
-double fBm( Vector point, double H, double lacunarity, double octaves, 
-	    int init );
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-
-
-
diff --git a/examples/widgets/graphicsview/boxes/basic.fsh b/examples/widgets/graphicsview/boxes/basic.fsh
deleted file mode 100644
index 327daeef54..0000000000
--- a/examples/widgets/graphicsview/boxes/basic.fsh
+++ /dev/null
@@ -1,82 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the demonstration applications of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, you may use this file under the terms of the BSD license
-** as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-varying vec3 position, normal;
-varying vec4 specular, ambient, diffuse, lightDirection;
-
-uniform sampler2D tex;
-uniform vec4 basicColor;
-
-void main()
-{
-    vec3 N = normalize(normal);
-    // assume directional light
-
-    gl_MaterialParameters M = gl_FrontMaterial;
-
-    float NdotL = dot(N, lightDirection.xyz);
-    float RdotL = dot(reflect(normalize(position), N), lightDirection.xyz);
-
-    vec3 absN = abs(gl_TexCoord[1].xyz);
-    vec3 texCoord;
-    if (absN.x > absN.y && absN.x > absN.z)
-        texCoord = gl_TexCoord[1].yzx;
-    else if (absN.y > absN.z)
-        texCoord = gl_TexCoord[1].zxy;
-    else
-        texCoord = gl_TexCoord[1].xyz;
-    texCoord.y *= -sign(texCoord.z);
-    texCoord += 0.5;
-
-    vec4 texColor = texture2D(tex, texCoord.xy);
-    vec4 unlitColor = gl_Color * mix(basicColor, vec4(texColor.xyz, 1.0), texColor.w);
-    gl_FragColor = (ambient + diffuse * max(NdotL, 0.0)) * unlitColor +
-                    M.specular * specular * pow(max(RdotL, 0.0), M.shininess);
-}
diff --git a/examples/widgets/graphicsview/boxes/basic.vsh b/examples/widgets/graphicsview/boxes/basic.vsh
deleted file mode 100644
index 454e0bd903..0000000000
--- a/examples/widgets/graphicsview/boxes/basic.vsh
+++ /dev/null
@@ -1,70 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the demonstration applications of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, you may use this file under the terms of the BSD license
-** as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-varying vec3 position, normal;
-varying vec4 specular, ambient, diffuse, lightDirection;
-
-uniform mat4 view;
-
-void main()
-{	
-    gl_TexCoord[0] = gl_MultiTexCoord0;
-    gl_TexCoord[1] = gl_Vertex;
-    specular = gl_LightSource[0].specular;
-    ambient = gl_LightSource[0].ambient;
-    diffuse = gl_LightSource[0].diffuse;
-    lightDirection = view * gl_LightSource[0].position;
-
-    normal = gl_NormalMatrix * gl_Normal;
-    position = (gl_ModelViewMatrix * gl_Vertex).xyz;
-
-    gl_FrontColor = gl_Color;
-    gl_Position = ftransform();
-}
diff --git a/examples/widgets/graphicsview/boxes/boxes.pro b/examples/widgets/graphicsview/boxes/boxes.pro
deleted file mode 100644
index 601edd6883..0000000000
--- a/examples/widgets/graphicsview/boxes/boxes.pro
+++ /dev/null
@@ -1,27 +0,0 @@
-QT += opengl widgets
-requires(qtConfig(combobox))
-
-qtConfig(opengles.|angle|dynamicgl): error("This example requires Qt to be configured with -opengl desktop")
-
-HEADERS += 3rdparty/fbm.h \
-           glbuffers.h \
-           glextensions.h \
-           gltrianglemesh.h \
-           qtbox.h \
-           roundedbox.h \
-           scene.h \
-           trackball.h
-SOURCES += 3rdparty/fbm.c \
-           glbuffers.cpp \
-           glextensions.cpp \
-           main.cpp \
-           qtbox.cpp \
-           roundedbox.cpp \
-           scene.cpp \
-           trackball.cpp
-
-RESOURCES += boxes.qrc
-
-# install
-target.path = $$[QT_INSTALL_EXAMPLES]/widgets/graphicsview/boxes
-INSTALLS += target
diff --git a/examples/widgets/graphicsview/boxes/boxes.qrc b/examples/widgets/graphicsview/boxes/boxes.qrc
deleted file mode 100644
index d27506dc5a..0000000000
--- a/examples/widgets/graphicsview/boxes/boxes.qrc
+++ /dev/null
@@ -1,25 +0,0 @@
-<!DOCTYPE RCC><RCC version="1.0">
-<qresource prefix="/res/boxes">
-    <file>cubemap_negx.jpg</file>
-    <file>cubemap_negy.jpg</file>
-    <file>cubemap_negz.jpg</file>
-    <file>cubemap_posx.jpg</file>
-    <file>cubemap_posy.jpg</file>
-    <file>cubemap_posz.jpg</file>
-    <file>square.jpg</file>
-    <file>basic.vsh</file>
-    <file>basic.fsh</file>
-    <file>dotted.fsh</file>
-    <file>fresnel.fsh</file>
-    <file>glass.fsh</file>
-    <file>granite.fsh</file>
-    <file>marble.fsh</file>
-    <file>reflection.fsh</file>
-    <file>refraction.fsh</file>
-    <file>wood.fsh</file>
-    <file>parameters.par</file>
-    <file>qt-logo.png</file>
-    <file>smiley.png</file>
-    <file>qt-logo.jpg</file>
-</qresource>
-</RCC>
diff --git a/examples/widgets/graphicsview/boxes/cubemap_negx.jpg b/examples/widgets/graphicsview/boxes/cubemap_negx.jpg
deleted file mode 100644
index 07c282eab9..0000000000
--- a/examples/widgets/graphicsview/boxes/cubemap_negx.jpg
+++ /dev/null
diff --git a/examples/widgets/graphicsview/boxes/cubemap_negy.jpg b/examples/widgets/graphicsview/boxes/cubemap_negy.jpg
deleted file mode 100644
index 46cd2f9cf3..0000000000
--- a/examples/widgets/graphicsview/boxes/cubemap_negy.jpg
+++ /dev/null
diff --git a/examples/widgets/graphicsview/boxes/cubemap_negz.jpg b/examples/widgets/graphicsview/boxes/cubemap_negz.jpg
deleted file mode 100644
index 40c01ddff3..0000000000
--- a/examples/widgets/graphicsview/boxes/cubemap_negz.jpg
+++ /dev/null
diff --git a/examples/widgets/graphicsview/boxes/cubemap_posx.jpg b/examples/widgets/graphicsview/boxes/cubemap_posx.jpg
deleted file mode 100644
index 0b42e8a1b1..0000000000
--- a/examples/widgets/graphicsview/boxes/cubemap_posx.jpg
+++ /dev/null
diff --git a/examples/widgets/graphicsview/boxes/cubemap_posy.jpg b/examples/widgets/graphicsview/boxes/cubemap_posy.jpg
deleted file mode 100644
index 2aca9b1e98..0000000000
--- a/examples/widgets/graphicsview/boxes/cubemap_posy.jpg
+++ /dev/null
diff --git a/examples/widgets/graphicsview/boxes/cubemap_posz.jpg b/examples/widgets/graphicsview/boxes/cubemap_posz.jpg
deleted file mode 100644
index 2e49173848..0000000000
--- a/examples/widgets/graphicsview/boxes/cubemap_posz.jpg
+++ /dev/null
diff --git a/examples/widgets/graphicsview/boxes/dotted.fsh b/examples/widgets/graphicsview/boxes/dotted.fsh
deleted file mode 100644
index 5cbf590e21..0000000000
--- a/examples/widgets/graphicsview/boxes/dotted.fsh
+++ /dev/null
@@ -1,75 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the demonstration applications of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, you may use this file under the terms of the BSD license
-** as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-varying vec3 position, normal;
-varying vec4 specular, ambient, diffuse, lightDirection;
-
-uniform sampler2D tex;
-
-void main()
-{
-    vec3 N = normalize(normal);
-
-    gl_MaterialParameters M = gl_FrontMaterial;
-
-    // assume directional light
-    float NdotL = dot(N, lightDirection.xyz);
-    float RdotL = dot(reflect(normalize(position), N), lightDirection.xyz);
-
-    float r1 = length(fract(7.0 * gl_TexCoord[1].xyz) - 0.5);
-    float r2 = length(fract(5.0 * gl_TexCoord[1].xyz + 0.2) - 0.5);
-    float r3 = length(fract(11.0 * gl_TexCoord[1].xyz + 0.7) - 0.5);
-    vec4 rs = vec4(r1, r2, r3, 0.0);
-
-    vec4 unlitColor = gl_Color * (0.8 - clamp(10.0 * (0.4 - rs), 0.0, 0.2));
-    unlitColor.w = 1.0;
-    gl_FragColor = (ambient + diffuse * max(NdotL, 0.0)) * unlitColor +
-                    M.specular * specular * pow(max(RdotL, 0.0), M.shininess);
-}
diff --git a/examples/widgets/graphicsview/boxes/fresnel.fsh b/examples/widgets/graphicsview/boxes/fresnel.fsh
deleted file mode 100644
index 6758ad5770..0000000000
--- a/examples/widgets/graphicsview/boxes/fresnel.fsh
+++ /dev/null
@@ -1,88 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the demonstration applications of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, you may use this file under the terms of the BSD license
-** as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-varying vec3 position, normal;
-varying vec4 specular, ambient, diffuse, lightDirection;
-
-uniform sampler2D tex;
-uniform samplerCube env;
-uniform mat4 view;
-uniform vec4 basicColor;
-
-void main()
-{
-    vec3 N = normalize(normal);
-    // assume directional light
-
-    gl_MaterialParameters M = gl_FrontMaterial;
-
-    float NdotL = dot(N, lightDirection.xyz);
-    float RdotL = dot(reflect(normalize(position), N), lightDirection.xyz);
-
-    vec3 absN = abs(gl_TexCoord[1].xyz);
-    vec3 texCoord;
-    if (absN.x > absN.y && absN.x > absN.z)
-        texCoord = gl_TexCoord[1].yzx;
-    else if (absN.y > absN.z)
-        texCoord = gl_TexCoord[1].zxy;
-    else
-        texCoord = gl_TexCoord[1].xyz;
-    texCoord.y *= -sign(texCoord.z);
-    texCoord += 0.5;
-
-    vec4 texColor = texture2D(tex, texCoord.xy);
-    vec4 unlitColor = gl_Color * mix(basicColor, vec4(texColor.xyz, 1.0), texColor.w);
-    vec4 litColor = (ambient + diffuse * max(NdotL, 0.0)) * unlitColor +
-                     M.specular * specular * pow(max(RdotL, 0.0), M.shininess);
-
-    vec3 R = 2.0 * dot(-position, N) * N + position;
-    vec4 reflectedColor = textureCube(env, R * mat3(view[0].xyz, view[1].xyz, view[2].xyz));
-    gl_FragColor = mix(litColor, reflectedColor, 0.2 + 0.8 * pow(1.0 + dot(N, normalize(position)), 2.0));
-}
diff --git a/examples/widgets/graphicsview/boxes/glass.fsh b/examples/widgets/graphicsview/boxes/glass.fsh
deleted file mode 100644
index 528d04e4d3..0000000000
--- a/examples/widgets/graphicsview/boxes/glass.fsh
+++ /dev/null
@@ -1,85 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the demonstration applications of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, you may use this file under the terms of the BSD license
-** as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-varying vec3 position, normal;
-varying vec4 specular, ambient, diffuse, lightDirection;
-
-uniform sampler2D tex;
-uniform samplerCube env;
-uniform mat4 view;
-
-// Some arbitrary values
-// Arrays don't work here on glsl < 120, apparently.
-//const float coeffs[6] = float[6](1.0/4.0, 1.0/4.1, 1.0/4.2, 1.0/4.3, 1.0/4.4, 1.0/4.5);
-float coeffs(int i)
-{
-	return 1.0 / (3.0 + 0.1 * float(i));
-}
-
-void main()
-{
-    vec3 N = normalize(normal);
-    vec3 I = -normalize(position);
-    mat3 V = mat3(view[0].xyz, view[1].xyz, view[2].xyz);
-    float IdotN = dot(I, N);
-    float scales[6];
-    vec3 C[6];
-    for (int i = 0; i < 6; ++i) {
-        scales[i] = (IdotN - sqrt(1.0 - coeffs(i) + coeffs(i) * (IdotN * IdotN)));
-        C[i] = textureCube(env, (-I + coeffs(i) * N) * V).xyz;
-    }
-    vec4 refractedColor = 0.25 * vec4(C[5].x + 2.0*C[0].x + C[1].x, C[1].y + 2.0*C[2].y + C[3].y,
-                          C[3].z + 2.0*C[4].z + C[5].z, 4.0);
-
-    vec3 R = 2.0 * dot(-position, N) * N + position;
-    vec4 reflectedColor = textureCube(env, R * V);
-
-    gl_FragColor = mix(refractedColor, reflectedColor, 0.4 + 0.6 * pow(1.0 - IdotN, 2.0));
-}
diff --git a/examples/widgets/graphicsview/boxes/glbuffers.cpp b/examples/widgets/graphicsview/boxes/glbuffers.cpp
deleted file mode 100644
index 91de336af3..0000000000
--- a/examples/widgets/graphicsview/boxes/glbuffers.cpp
+++ /dev/null
@@ -1,406 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the demonstration applications of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, you may use this file under the terms of the BSD license
-** as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "glbuffers.h"
-
-void qgluPerspective(GLdouble fovy, GLdouble aspect, GLdouble zNear, GLdouble zFar)
-{
-    const GLdouble ymax = zNear * tan(qDegreesToRadians(fovy) / 2.0);
-    const GLdouble ymin = -ymax;
-    const GLdouble xmin = ymin * aspect;
-    const GLdouble xmax = ymax * aspect;
-    glFrustum(xmin, xmax, ymin, ymax, zNear, zFar);
-}
-
-//============================================================================//
-//                                  GLTexture                                 //
-//============================================================================//
-
-GLTexture::GLTexture()
-{
-    glGenTextures(1, &m_texture);
-}
-
-GLTexture::~GLTexture()
-{
-    glDeleteTextures(1, &m_texture);
-}
-
-//============================================================================//
-//                                 GLTexture2D                                //
-//============================================================================//
-
-GLTexture2D::GLTexture2D(int width, int height)
-{
-    glBindTexture(GL_TEXTURE_2D, m_texture);
-    glTexImage2D(GL_TEXTURE_2D, 0, 4, width, height, 0,
-        GL_BGRA, GL_UNSIGNED_BYTE, nullptr);
-
-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-    //glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR);
-    //glTexParameteri(GL_TEXTURE_2D, GL_GENERATE_MIPMAP, GL_TRUE);
-    glBindTexture(GL_TEXTURE_2D, 0);
-}
-
-
-GLTexture2D::GLTexture2D(const QString &fileName, int width, int height)
-{
-    // TODO: Add error handling.
-    QImage image(fileName);
-
-    if (image.isNull()) {
-        m_failed = true;
-        return;
-    }
-
-    image = image.convertToFormat(QImage::Format_ARGB32);
-
-    //qDebug() << "Image size:" << image.width() << "x" << image.height();
-    if (width <= 0)
-        width = image.width();
-    if (height <= 0)
-        height = image.height();
-    if (width != image.width() || height != image.height())
-        image = image.scaled(width, height, Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
-
-    glBindTexture(GL_TEXTURE_2D, m_texture);
-
-    // Works on x86, so probably works on all little-endian systems.
-    // Does it work on big-endian systems?
-    glTexImage2D(GL_TEXTURE_2D, 0, 4, image.width(), image.height(), 0,
-        GL_BGRA, GL_UNSIGNED_BYTE, image.bits());
-
-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-    //glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR);
-    //glTexParameteri(GL_TEXTURE_2D, GL_GENERATE_MIPMAP, GL_TRUE);
-    glBindTexture(GL_TEXTURE_2D, 0);
-}
-
-void GLTexture2D::load(int width, int height, QRgb *data)
-{
-    glBindTexture(GL_TEXTURE_2D, m_texture);
-    glTexImage2D(GL_TEXTURE_2D, 0, 4, width, height, 0,
-        GL_BGRA, GL_UNSIGNED_BYTE, data);
-    glBindTexture(GL_TEXTURE_2D, 0);
-}
-
-void GLTexture2D::bind()
-{
-    glBindTexture(GL_TEXTURE_2D, m_texture);
-    glEnable(GL_TEXTURE_2D);
-}
-
-void GLTexture2D::unbind()
-{
-    glBindTexture(GL_TEXTURE_2D, 0);
-    glDisable(GL_TEXTURE_2D);
-}
-
-
-//============================================================================//
-//                                 GLTexture3D                                //
-//============================================================================//
-
-GLTexture3D::GLTexture3D(int width, int height, int depth)
-{
-    GLBUFFERS_ASSERT_OPENGL("GLTexture3D::GLTexture3D", glTexImage3D, return)
-
-    glBindTexture(GL_TEXTURE_3D, m_texture);
-    glTexImage3D(GL_TEXTURE_3D, 0, 4, width, height, depth, 0,
-        GL_BGRA, GL_UNSIGNED_BYTE, nullptr);
-
-    glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_WRAP_S, GL_REPEAT);
-    glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_WRAP_T, GL_REPEAT);
-    glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_WRAP_R, GL_REPEAT);
-    glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-    glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-    //glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR);
-    //glTexParameteri(GL_TEXTURE_3D, GL_GENERATE_MIPMAP, GL_TRUE);
-    glBindTexture(GL_TEXTURE_3D, 0);
-}
-
-void GLTexture3D::load(int width, int height, int depth, QRgb *data)
-{
-    GLBUFFERS_ASSERT_OPENGL("GLTexture3D::load", glTexImage3D, return)
-
-    glBindTexture(GL_TEXTURE_3D, m_texture);
-    glTexImage3D(GL_TEXTURE_3D, 0, 4, width, height, depth, 0,
-        GL_BGRA, GL_UNSIGNED_BYTE, data);
-    glBindTexture(GL_TEXTURE_3D, 0);
-}
-
-void GLTexture3D::bind()
-{
-    glBindTexture(GL_TEXTURE_3D, m_texture);
-    glEnable(GL_TEXTURE_3D);
-}
-
-void GLTexture3D::unbind()
-{
-    glBindTexture(GL_TEXTURE_3D, 0);
-    glDisable(GL_TEXTURE_3D);
-}
-
-//============================================================================//
-//                                GLTextureCube                               //
-//============================================================================//
-
-GLTextureCube::GLTextureCube(int size)
-{
-    glBindTexture(GL_TEXTURE_CUBE_MAP, m_texture);
-
-    for (int i = 0; i < 6; ++i)
-        glTexImage2D(GL_TEXTURE_CUBE_MAP_POSITIVE_X + i, 0, 4, size, size, 0,
-            GL_BGRA, GL_UNSIGNED_BYTE, nullptr);
-
-    glTexParameteri(GL_TEXTURE_CUBE_MAP, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-    glTexParameteri(GL_TEXTURE_CUBE_MAP, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-    glTexParameteri(GL_TEXTURE_CUBE_MAP, GL_TEXTURE_WRAP_R, GL_CLAMP_TO_EDGE);
-    glTexParameteri(GL_TEXTURE_CUBE_MAP, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-    glTexParameteri(GL_TEXTURE_CUBE_MAP, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-    //glTexParameteri(GL_TEXTURE_CUBE_MAP, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR);
-    //glTexParameteri(GL_TEXTURE_CUBE_MAP, GL_GENERATE_MIPMAP, GL_TRUE);
-    glBindTexture(GL_TEXTURE_CUBE_MAP, 0);
-}
-
-GLTextureCube::GLTextureCube(const QStringList &fileNames, int size)
-{
-    // TODO: Add error handling.
-
-    glBindTexture(GL_TEXTURE_CUBE_MAP, m_texture);
-
-    int index = 0;
-    for (const QString &file : fileNames) {
-        QImage image(file);
-        if (image.isNull()) {
-            m_failed = true;
-            break;
-        }
-
-        image = image.convertToFormat(QImage::Format_ARGB32);
-
-        //qDebug() << "Image size:" << image.width() << "x" << image.height();
-        if (size <= 0)
-            size = image.width();
-        if (size != image.width() || size != image.height())
-            image = image.scaled(size, size, Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
-
-        // Works on x86, so probably works on all little-endian systems.
-        // Does it work on big-endian systems?
-        glTexImage2D(GL_TEXTURE_CUBE_MAP_POSITIVE_X + index, 0, 4, image.width(), image.height(), 0,
-            GL_BGRA, GL_UNSIGNED_BYTE, image.bits());
-
-        if (++index == 6)
-            break;
-    }
-
-    // Clear remaining faces.
-    while (index < 6) {
-        glTexImage2D(GL_TEXTURE_CUBE_MAP_POSITIVE_X + index, 0, 4, size, size, 0,
-            GL_BGRA, GL_UNSIGNED_BYTE, nullptr);
-        ++index;
-    }
-
-    glTexParameteri(GL_TEXTURE_CUBE_MAP, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-    glTexParameteri(GL_TEXTURE_CUBE_MAP, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-    glTexParameteri(GL_TEXTURE_CUBE_MAP, GL_TEXTURE_WRAP_R, GL_CLAMP_TO_EDGE);
-    glTexParameteri(GL_TEXTURE_CUBE_MAP, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-    glTexParameteri(GL_TEXTURE_CUBE_MAP, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-    //glTexParameteri(GL_TEXTURE_CUBE_MAP, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR);
-    //glTexParameteri(GL_TEXTURE_CUBE_MAP, GL_GENERATE_MIPMAP, GL_TRUE);
-    glBindTexture(GL_TEXTURE_CUBE_MAP, 0);
-}
-
-void GLTextureCube::load(int size, int face, QRgb *data)
-{
-    glBindTexture(GL_TEXTURE_CUBE_MAP, m_texture);
-        glTexImage2D(GL_TEXTURE_CUBE_MAP_POSITIVE_X + face, 0, 4, size, size, 0,
-            GL_BGRA, GL_UNSIGNED_BYTE, data);
-    glBindTexture(GL_TEXTURE_CUBE_MAP, 0);
-}
-
-void GLTextureCube::bind()
-{
-    glBindTexture(GL_TEXTURE_CUBE_MAP, m_texture);
-    glEnable(GL_TEXTURE_CUBE_MAP);
-}
-
-void GLTextureCube::unbind()
-{
-    glBindTexture(GL_TEXTURE_CUBE_MAP, 0);
-    glDisable(GL_TEXTURE_CUBE_MAP);
-}
-
-//============================================================================//
-//                            GLFrameBufferObject                             //
-//============================================================================//
-
-GLFrameBufferObject::GLFrameBufferObject(int width, int height)
-    : m_width(width)
-    , m_height(height)
-{
-    GLBUFFERS_ASSERT_OPENGL("GLFrameBufferObject::GLFrameBufferObject",
-        glGenFramebuffersEXT && glGenRenderbuffersEXT && glBindRenderbufferEXT && glRenderbufferStorageEXT, return)
-
-    // TODO: share depth buffers of same size
-    glGenFramebuffersEXT(1, &m_fbo);
-    //glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, m_fbo);
-    glGenRenderbuffersEXT(1, &m_depthBuffer);
-    glBindRenderbufferEXT(GL_RENDERBUFFER_EXT, m_depthBuffer);
-    glRenderbufferStorageEXT(GL_RENDERBUFFER_EXT, GL_DEPTH_COMPONENT, m_width, m_height);
-    //glFramebufferRenderbufferEXT(GL_FRAMEBUFFER_EXT, GL_DEPTH_ATTACHMENT_EXT, GL_RENDERBUFFER_EXT, m_depthBuffer);
-    //glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0);
-}
-
-GLFrameBufferObject::~GLFrameBufferObject()
-{
-    GLBUFFERS_ASSERT_OPENGL("GLFrameBufferObject::~GLFrameBufferObject",
-        glDeleteFramebuffersEXT && glDeleteRenderbuffersEXT, return)
-
-    glDeleteFramebuffersEXT(1, &m_fbo);
-    glDeleteRenderbuffersEXT(1, &m_depthBuffer);
-}
-
-void GLFrameBufferObject::setAsRenderTarget(bool state)
-{
-    GLBUFFERS_ASSERT_OPENGL("GLFrameBufferObject::setAsRenderTarget", glBindFramebufferEXT, return)
-
-    if (state) {
-        glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, m_fbo);
-        glPushAttrib(GL_VIEWPORT_BIT);
-        glViewport(0, 0, m_width, m_height);
-    } else {
-        glPopAttrib();
-        glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0);
-    }
-}
-
-bool GLFrameBufferObject::isComplete()
-{
-    GLBUFFERS_ASSERT_OPENGL("GLFrameBufferObject::isComplete", glCheckFramebufferStatusEXT, return false)
-
-    return GL_FRAMEBUFFER_COMPLETE_EXT == glCheckFramebufferStatusEXT(GL_FRAMEBUFFER_EXT);
-}
-
-//============================================================================//
-//                             GLRenderTargetCube                             //
-//============================================================================//
-
-GLRenderTargetCube::GLRenderTargetCube(int size)
-    : GLTextureCube(size)
-    , m_fbo(size, size)
-{
-}
-
-void GLRenderTargetCube::begin(int face)
-{
-    GLBUFFERS_ASSERT_OPENGL("GLRenderTargetCube::begin",
-        glFramebufferTexture2DEXT && glFramebufferRenderbufferEXT, return)
-
-    m_fbo.setAsRenderTarget(true);
-    glFramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT,
-        GL_TEXTURE_CUBE_MAP_POSITIVE_X + face, m_texture, 0);
-    glFramebufferRenderbufferEXT(GL_FRAMEBUFFER_EXT, GL_DEPTH_ATTACHMENT_EXT, GL_RENDERBUFFER_EXT, m_fbo.m_depthBuffer);
-}
-
-void GLRenderTargetCube::end()
-{
-    m_fbo.setAsRenderTarget(false);
-}
-
-void GLRenderTargetCube::getViewMatrix(QMatrix4x4& mat, int face)
-{
-    if (face < 0 || face >= 6) {
-        qWarning("GLRenderTargetCube::getViewMatrix: 'face' must be in the range [0, 6). (face == %d)", face);
-        return;
-    }
-
-    static constexpr int perm[6][3] = {
-        {2, 1, 0},
-        {2, 1, 0},
-        {0, 2, 1},
-        {0, 2, 1},
-        {0, 1, 2},
-        {0, 1, 2},
-    };
-
-    static constexpr float signs[6][3] = {
-        {-1.0f, -1.0f, -1.0f},
-        {+1.0f, -1.0f, +1.0f},
-        {+1.0f, +1.0f, -1.0f},
-        {+1.0f, -1.0f, +1.0f},
-        {+1.0f, -1.0f, -1.0f},
-        {-1.0f, -1.0f, +1.0f},
-    };
-
-    mat.fill(0.0f);
-    for (int i = 0; i < 3; ++i)
-        mat(i, perm[face][i]) = signs[face][i];
-    mat(3, 3) = 1.0f;
-}
-
-void GLRenderTargetCube::getProjectionMatrix(QMatrix4x4& mat, float nearZ, float farZ)
-{
-    static const QMatrix4x4 reference(
-            1.0f, 0.0f, 0.0f, 0.0f,
-            0.0f, 1.0f, 0.0f, 0.0f,
-            0.0f, 0.0f, 0.0f, 0.0f,
-            0.0f, 0.0f, -1.0f, 0.0f);
-
-    mat = reference;
-    mat(2, 2) = (nearZ+farZ)/(nearZ-farZ);
-    mat(2, 3) = 2.0f*nearZ*farZ/(nearZ-farZ);
-}
diff --git a/examples/widgets/graphicsview/boxes/glbuffers.h b/examples/widgets/graphicsview/boxes/glbuffers.h
deleted file mode 100644
index 4318e8ac24..0000000000
--- a/examples/widgets/graphicsview/boxes/glbuffers.h
+++ /dev/null
@@ -1,372 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the demonstration applications of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, you may use this file under the terms of the BSD license
-** as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef GLBUFFERS_H
-#define GLBUFFERS_H
-
-//#include <GL/glew.h>
-#include "glextensions.h"
-
-#include <QtWidgets>
-#include <QtOpenGL>
-
-#define BUFFER_OFFSET(i) ((char*)0 + (i))
-#define SIZE_OF_MEMBER(cls, member) sizeof(static_cast<cls *>(nullptr)->member)
-
-#define GLBUFFERS_ASSERT_OPENGL(prefix, assertion, returnStatement)                         \
-if (m_failed || !(assertion)) {                                                             \
-    if (!m_failed) qCritical(prefix ": The necessary OpenGL functions are not available."); \
-    m_failed = true;                                                                        \
-    returnStatement;                                                                        \
-}
-
-void qgluPerspective(GLdouble fovy, GLdouble aspect, GLdouble zNear, GLdouble zFar);
-
-QT_BEGIN_NAMESPACE
-class QMatrix4x4;
-QT_END_NAMESPACE
-
-class GLTexture
-{
-public:
-    GLTexture();
-    virtual ~GLTexture();
-    virtual void bind() = 0;
-    virtual void unbind() = 0;
-    virtual bool failed() const {return m_failed;}
-protected:
-    GLuint m_texture = 0;
-    bool m_failed = false;
-};
-
-class GLFrameBufferObject
-{
-public:
-    friend class GLRenderTargetCube;
-    // friend class GLRenderTarget2D;
-
-    GLFrameBufferObject(int width, int height);
-    virtual ~GLFrameBufferObject();
-    bool isComplete();
-    virtual bool failed() const {return m_failed;}
-protected:
-    void setAsRenderTarget(bool state = true);
-    GLuint m_fbo = 0;
-    GLuint m_depthBuffer = 0;
-    int m_width, m_height;
-    bool m_failed = false;
-};
-
-class GLTexture2D : public GLTexture
-{
-public:
-    GLTexture2D(int width, int height);
-    explicit GLTexture2D(const QString &fileName, int width = 0, int height = 0);
-    void load(int width, int height, QRgb *data);
-    void bind() override;
-    void unbind() override;
-};
-
-class GLTexture3D : public GLTexture
-{
-public:
-    GLTexture3D(int width, int height, int depth);
-    // TODO: Implement function below
-    //GLTexture3D(const QString& fileName, int width = 0, int height = 0);
-    void load(int width, int height, int depth, QRgb *data);
-    void bind() override;
-    void unbind() override;
-};
-
-class GLTextureCube : public GLTexture
-{
-public:
-    GLTextureCube(int size);
-    explicit GLTextureCube(const QStringList &fileNames, int size = 0);
-    void load(int size, int face, QRgb *data);
-    void bind() override;
-    void unbind() override;
-};
-
-// TODO: Define and implement class below
-//class GLRenderTarget2D : public GLTexture2D
-
-class GLRenderTargetCube : public GLTextureCube
-{
-public:
-    GLRenderTargetCube(int size);
-    // begin rendering to one of the cube's faces. 0 <= face < 6
-    void begin(int face);
-    // end rendering
-    void end();
-    bool failed() const override { return m_failed || m_fbo.failed(); }
-
-    static void getViewMatrix(QMatrix4x4& mat, int face);
-    static void getProjectionMatrix(QMatrix4x4& mat, float nearZ, float farZ);
-private:
-    GLFrameBufferObject m_fbo;
-};
-
-struct VertexDescription
-{
-    enum
-    {
-        Null = 0, // Terminates a VertexDescription array
-        Position,
-        TexCoord,
-        Normal,
-        Color,
-    };
-    int field; // Position, TexCoord, Normal, Color
-    int type; // GL_FLOAT, GL_UNSIGNED_BYTE
-    int count; // number of elements
-    int offset; // field's offset into vertex struct
-    int index; // 0 (unused at the moment)
-};
-
-// Implementation of interleaved buffers.
-// 'T' is a struct which must include a null-terminated static array
-// 'VertexDescription* description'.
-// Example:
-/*
-struct Vertex
-{
-    GLfloat position[3];
-    GLfloat texCoord[2];
-    GLfloat normal[3];
-    GLbyte color[4];
-    static VertexDescription description[];
-};
-
-VertexDescription Vertex::description[] = {
-    {VertexDescription::Position, GL_FLOAT, SIZE_OF_MEMBER(Vertex, position) / sizeof(GLfloat), offsetof(Vertex, position), 0},
-    {VertexDescription::TexCoord, GL_FLOAT, SIZE_OF_MEMBER(Vertex, texCoord) / sizeof(GLfloat), offsetof(Vertex, texCoord), 0},
-    {VertexDescription::Normal, GL_FLOAT, SIZE_OF_MEMBER(Vertex, normal) / sizeof(GLfloat), offsetof(Vertex, normal), 0},
-    {VertexDescription::Color, GL_BYTE, SIZE_OF_MEMBER(Vertex, color) / sizeof(GLbyte), offsetof(Vertex, color), 0},
-    {VertexDescription::Null, 0, 0, 0, 0},
-};
-*/
-template<class T>
-class GLVertexBuffer
-{
-public:
-    GLVertexBuffer(int length, const T *data = nullptr, int mode = GL_STATIC_DRAW)
-    {
-        GLBUFFERS_ASSERT_OPENGL("GLVertexBuffer::GLVertexBuffer", glGenBuffers && glBindBuffer && glBufferData, return)
-
-        glGenBuffers(1, &m_buffer);
-        glBindBuffer(GL_ARRAY_BUFFER, m_buffer);
-        glBufferData(GL_ARRAY_BUFFER, (m_length = length) * sizeof(T), data, mode);
-    }
-
-    ~GLVertexBuffer()
-    {
-        GLBUFFERS_ASSERT_OPENGL("GLVertexBuffer::~GLVertexBuffer", glDeleteBuffers, return)
-
-        glDeleteBuffers(1, &m_buffer);
-    }
-
-    void bind()
-    {
-        GLBUFFERS_ASSERT_OPENGL("GLVertexBuffer::bind", glBindBuffer, return)
-
-        glBindBuffer(GL_ARRAY_BUFFER, m_buffer);
-        for (VertexDescription *desc = T::description; desc->field != VertexDescription::Null; ++desc) {
-            switch (desc->field) {
-            case VertexDescription::Position:
-                glVertexPointer(desc->count, desc->type, sizeof(T), BUFFER_OFFSET(desc->offset));
-                glEnableClientState(GL_VERTEX_ARRAY);
-                break;
-            case VertexDescription::TexCoord:
-                glTexCoordPointer(desc->count, desc->type, sizeof(T), BUFFER_OFFSET(desc->offset));
-                glEnableClientState(GL_TEXTURE_COORD_ARRAY);
-                break;
-            case VertexDescription::Normal:
-                glNormalPointer(desc->type, sizeof(T), BUFFER_OFFSET(desc->offset));
-                glEnableClientState(GL_NORMAL_ARRAY);
-                break;
-            case VertexDescription::Color:
-                glColorPointer(desc->count, desc->type, sizeof(T), BUFFER_OFFSET(desc->offset));
-                glEnableClientState(GL_COLOR_ARRAY);
-                break;
-            default:
-                break;
-            }
-        }
-    }
-
-    void unbind()
-    {
-        GLBUFFERS_ASSERT_OPENGL("GLVertexBuffer::unbind", glBindBuffer, return)
-
-        glBindBuffer(GL_ARRAY_BUFFER, 0);
-        for (VertexDescription *desc = T::description; desc->field != VertexDescription::Null; ++desc) {
-            switch (desc->field) {
-            case VertexDescription::Position:
-                glDisableClientState(GL_VERTEX_ARRAY);
-                break;
-            case VertexDescription::TexCoord:
-                glDisableClientState(GL_TEXTURE_COORD_ARRAY);
-                break;
-            case VertexDescription::Normal:
-                glDisableClientState(GL_NORMAL_ARRAY);
-                break;
-            case VertexDescription::Color:
-                glDisableClientState(GL_COLOR_ARRAY);
-                break;
-            default:
-                break;
-            }
-        }
-    }
-
-    int length() const {return m_length;}
-
-    T *lock()
-    {
-        GLBUFFERS_ASSERT_OPENGL("GLVertexBuffer::lock", glBindBuffer && glMapBuffer, return nullptr)
-
-        glBindBuffer(GL_ARRAY_BUFFER, m_buffer);
-        //glBufferData(GL_ARRAY_BUFFER, m_length, NULL, m_mode);
-        GLvoid* buffer = glMapBuffer(GL_ARRAY_BUFFER, GL_READ_WRITE);
-        m_failed = (buffer == nullptr);
-        return reinterpret_cast<T *>(buffer);
-    }
-
-    void unlock()
-    {
-        GLBUFFERS_ASSERT_OPENGL("GLVertexBuffer::unlock", glBindBuffer && glUnmapBuffer, return)
-
-        glBindBuffer(GL_ARRAY_BUFFER, m_buffer);
-        glUnmapBuffer(GL_ARRAY_BUFFER);
-    }
-
-    bool failed()
-    {
-        return m_failed;
-    }
-
-private:
-    int m_length = 0;
-    int m_mode = 0;
-    GLuint m_buffer = 0;
-    bool m_failed = false;
-};
-
-template<class T>
-class GLIndexBuffer
-{
-public:
-    GLIndexBuffer(int length, const T *data = nullptr, int mode = GL_STATIC_DRAW)
-        : m_length(0)
-        , m_mode(mode)
-        , m_buffer(0)
-        , m_failed(false)
-    {
-        GLBUFFERS_ASSERT_OPENGL("GLIndexBuffer::GLIndexBuffer", glGenBuffers && glBindBuffer && glBufferData, return)
-
-        glGenBuffers(1, &m_buffer);
-        glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, m_buffer);
-        glBufferData(GL_ELEMENT_ARRAY_BUFFER, (m_length = length) * sizeof(T), data, mode);
-    }
-
-    ~GLIndexBuffer()
-    {
-        GLBUFFERS_ASSERT_OPENGL("GLIndexBuffer::~GLIndexBuffer", glDeleteBuffers, return)
-
-        glDeleteBuffers(1, &m_buffer);
-    }
-
-    void bind()
-    {
-        GLBUFFERS_ASSERT_OPENGL("GLIndexBuffer::bind", glBindBuffer, return)
-
-        glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, m_buffer);
-    }
-
-    void unbind()
-    {
-        GLBUFFERS_ASSERT_OPENGL("GLIndexBuffer::unbind", glBindBuffer, return)
-
-        glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0);
-    }
-
-    int length() const {return m_length;}
-
-    T *lock()
-    {
-        GLBUFFERS_ASSERT_OPENGL("GLIndexBuffer::lock", glBindBuffer && glMapBuffer, return nullptr)
-
-        glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, m_buffer);
-        GLvoid* buffer = glMapBuffer(GL_ELEMENT_ARRAY_BUFFER, GL_READ_WRITE);
-        m_failed = (buffer == nullptr);
-        return reinterpret_cast<T *>(buffer);
-    }
-
-    void unlock()
-    {
-        GLBUFFERS_ASSERT_OPENGL("GLIndexBuffer::unlock", glBindBuffer && glUnmapBuffer, return)
-
-        glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, m_buffer);
-        glUnmapBuffer(GL_ELEMENT_ARRAY_BUFFER);
-    }
-
-    bool failed()
-    {
-        return m_failed;
-    }
-
-private:
-    int m_length, m_mode;
-    GLuint m_buffer;
-    bool m_failed;
-};
-
-#endif
diff --git a/examples/widgets/graphicsview/boxes/glextensions.cpp b/examples/widgets/graphicsview/boxes/glextensions.cpp
deleted file mode 100644
index ac89911046..0000000000
--- a/examples/widgets/graphicsview/boxes/glextensions.cpp
+++ /dev/null
@@ -1,107 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the demonstration applications of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, you may use this file under the terms of the BSD license
-** as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "glextensions.h"
-
-#define RESOLVE_GL_FUNC(f) ok &= bool((f = (_gl##f) context->getProcAddress(QLatin1String("gl" #f))));
-
-bool GLExtensionFunctions::resolve(const QGLContext *context)
-{
-    bool ok = true;
-
-    RESOLVE_GL_FUNC(GenFramebuffersEXT)
-    RESOLVE_GL_FUNC(GenRenderbuffersEXT)
-    RESOLVE_GL_FUNC(BindRenderbufferEXT)
-    RESOLVE_GL_FUNC(RenderbufferStorageEXT)
-    RESOLVE_GL_FUNC(DeleteFramebuffersEXT)
-    RESOLVE_GL_FUNC(DeleteRenderbuffersEXT)
-    RESOLVE_GL_FUNC(BindFramebufferEXT)
-    RESOLVE_GL_FUNC(FramebufferTexture2DEXT)
-    RESOLVE_GL_FUNC(FramebufferRenderbufferEXT)
-    RESOLVE_GL_FUNC(CheckFramebufferStatusEXT)
-
-    RESOLVE_GL_FUNC(ActiveTexture)
-    RESOLVE_GL_FUNC(TexImage3D)
-
-    RESOLVE_GL_FUNC(GenBuffers)
-    RESOLVE_GL_FUNC(BindBuffer)
-    RESOLVE_GL_FUNC(BufferData)
-    RESOLVE_GL_FUNC(DeleteBuffers)
-    RESOLVE_GL_FUNC(MapBuffer)
-    RESOLVE_GL_FUNC(UnmapBuffer)
-
-    return ok;
-}
-
-bool GLExtensionFunctions::fboSupported() {
-    return GenFramebuffersEXT
-            && GenRenderbuffersEXT
-            && BindRenderbufferEXT
-            && RenderbufferStorageEXT
-            && DeleteFramebuffersEXT
-            && DeleteRenderbuffersEXT
-            && BindFramebufferEXT
-            && FramebufferTexture2DEXT
-            && FramebufferRenderbufferEXT
-            && CheckFramebufferStatusEXT;
-}
-
-bool GLExtensionFunctions::openGL15Supported() {
-    return ActiveTexture
-            && TexImage3D
-            && GenBuffers
-            && BindBuffer
-            && BufferData
-            && DeleteBuffers
-            && MapBuffer
-            && UnmapBuffer;
-}
-
-#undef RESOLVE_GL_FUNC
diff --git a/examples/widgets/graphicsview/boxes/glextensions.h b/examples/widgets/graphicsview/boxes/glextensions.h
deleted file mode 100644
index 685700d866..0000000000
--- a/examples/widgets/graphicsview/boxes/glextensions.h
+++ /dev/null
@@ -1,204 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the demonstration applications of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, you may use this file under the terms of the BSD license
-** as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef GLEXTENSIONS_H
-#define GLEXTENSIONS_H
-
-#include <QtOpenGL>
-
-/*
-Functions resolved:
-
-glGenFramebuffersEXT
-glGenRenderbuffersEXT
-glBindRenderbufferEXT
-glRenderbufferStorageEXT
-glDeleteFramebuffersEXT
-glDeleteRenderbuffersEXT
-glBindFramebufferEXT
-glFramebufferTexture2DEXT
-glFramebufferRenderbufferEXT
-glCheckFramebufferStatusEXT
-
-glActiveTexture
-glTexImage3D
-
-glGenBuffers
-glBindBuffer
-glBufferData
-glDeleteBuffers
-glMapBuffer
-glUnmapBuffer
-*/
-
-#ifndef APIENTRY
-# define APIENTRY
-#endif
-#ifndef APIENTRYP
-# define APIENTRYP APIENTRY *
-#endif
-
-#ifndef GL_VERSION_1_2
-#define GL_TEXTURE_3D 0x806F
-#define GL_TEXTURE_WRAP_R 0x8072
-#define GL_CLAMP_TO_EDGE 0x812F
-#define GL_BGRA 0x80E1
-#endif
-
-#ifndef GL_VERSION_1_3
-#define GL_TEXTURE0 0x84C0
-#define GL_TEXTURE1 0x84C1
-#define GL_TEXTURE2 0x84C2
-#define GL_TEXTURE_CUBE_MAP 0x8513
-#define GL_TEXTURE_CUBE_MAP_POSITIVE_X 0x8515
-//#define GL_TEXTURE_CUBE_MAP_NEGATIVE_X 0x8516
-//#define GL_TEXTURE_CUBE_MAP_POSITIVE_Y 0x8517
-//#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y 0x8518
-//#define GL_TEXTURE_CUBE_MAP_POSITIVE_Z 0x8519
-//#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z 0x851A
-#endif
-
-#ifndef GL_ARB_vertex_buffer_object
-typedef ptrdiff_t GLsizeiptrARB;
-#endif
-
-#ifndef GL_VERSION_1_5
-#define GL_ARRAY_BUFFER 0x8892
-#define GL_ELEMENT_ARRAY_BUFFER 0x8893
-#define GL_READ_WRITE 0x88BA
-#define GL_STATIC_DRAW 0x88E4
-#endif
-
-#ifndef GL_EXT_framebuffer_object
-#define GL_RENDERBUFFER_EXT 0x8D41
-#define GL_FRAMEBUFFER_EXT 0x8D40
-#define GL_FRAMEBUFFER_COMPLETE_EXT 0x8CD5
-#define GL_COLOR_ATTACHMENT0_EXT 0x8CE0
-#define GL_DEPTH_ATTACHMENT_EXT 0x8D00
-#endif
-
-typedef void (APIENTRY *_glGenFramebuffersEXT) (GLsizei, GLuint *);
-typedef void (APIENTRY *_glGenRenderbuffersEXT) (GLsizei, GLuint *);
-typedef void (APIENTRY *_glBindRenderbufferEXT) (GLenum, GLuint);
-typedef void (APIENTRY *_glRenderbufferStorageEXT) (GLenum, GLenum, GLsizei, GLsizei);
-typedef void (APIENTRY *_glDeleteFramebuffersEXT) (GLsizei, const GLuint*);
-typedef void (APIENTRY *_glDeleteRenderbuffersEXT) (GLsizei, const GLuint*);
-typedef void (APIENTRY *_glBindFramebufferEXT) (GLenum, GLuint);
-typedef void (APIENTRY *_glFramebufferTexture2DEXT) (GLenum, GLenum, GLenum, GLuint, GLint);
-typedef void (APIENTRY *_glFramebufferRenderbufferEXT) (GLenum, GLenum, GLenum, GLuint);
-typedef GLenum (APIENTRY *_glCheckFramebufferStatusEXT) (GLenum);
-
-typedef void (APIENTRY *_glActiveTexture) (GLenum);
-typedef void (APIENTRY *_glTexImage3D) (GLenum, GLint, GLenum, GLsizei, GLsizei, GLsizei, GLint, GLenum, GLenum, const GLvoid *);
-
-typedef void (APIENTRY *_glGenBuffers) (GLsizei, GLuint *);
-typedef void (APIENTRY *_glBindBuffer) (GLenum, GLuint);
-typedef void (APIENTRY *_glBufferData) (GLenum, GLsizeiptrARB, const GLvoid *, GLenum);
-typedef void (APIENTRY *_glDeleteBuffers) (GLsizei, const GLuint *);
-typedef void *(APIENTRY *_glMapBuffer) (GLenum, GLenum);
-typedef GLboolean (APIENTRY *_glUnmapBuffer) (GLenum);
-
-struct GLExtensionFunctions
-{
-    bool resolve(const QGLContext *context);
-
-    bool fboSupported();
-    bool openGL15Supported(); // the rest: multi-texture, 3D-texture, vertex buffer objects
-
-    _glGenFramebuffersEXT GenFramebuffersEXT;
-    _glGenRenderbuffersEXT GenRenderbuffersEXT;
-    _glBindRenderbufferEXT BindRenderbufferEXT;
-    _glRenderbufferStorageEXT RenderbufferStorageEXT;
-    _glDeleteFramebuffersEXT DeleteFramebuffersEXT;
-    _glDeleteRenderbuffersEXT DeleteRenderbuffersEXT;
-    _glBindFramebufferEXT BindFramebufferEXT;
-    _glFramebufferTexture2DEXT FramebufferTexture2DEXT;
-    _glFramebufferRenderbufferEXT FramebufferRenderbufferEXT;
-    _glCheckFramebufferStatusEXT CheckFramebufferStatusEXT;
-
-    _glActiveTexture ActiveTexture;
-    _glTexImage3D TexImage3D;
-
-    _glGenBuffers GenBuffers;
-    _glBindBuffer BindBuffer;
-    _glBufferData BufferData;
-    _glDeleteBuffers DeleteBuffers;
-    _glMapBuffer MapBuffer;
-    _glUnmapBuffer UnmapBuffer;
-};
-
-inline GLExtensionFunctions &getGLExtensionFunctions()
-{
-    static GLExtensionFunctions funcs;
-    return funcs;
-}
-
-#define glGenFramebuffersEXT getGLExtensionFunctions().GenFramebuffersEXT
-#define glGenRenderbuffersEXT getGLExtensionFunctions().GenRenderbuffersEXT
-#define glBindRenderbufferEXT getGLExtensionFunctions().BindRenderbufferEXT
-#define glRenderbufferStorageEXT getGLExtensionFunctions().RenderbufferStorageEXT
-#define glDeleteFramebuffersEXT getGLExtensionFunctions().DeleteFramebuffersEXT
-#define glDeleteRenderbuffersEXT getGLExtensionFunctions().DeleteRenderbuffersEXT
-#define glBindFramebufferEXT getGLExtensionFunctions().BindFramebufferEXT
-#define glFramebufferTexture2DEXT getGLExtensionFunctions().FramebufferTexture2DEXT
-#define glFramebufferRenderbufferEXT getGLExtensionFunctions().FramebufferRenderbufferEXT
-#define glCheckFramebufferStatusEXT getGLExtensionFunctions().CheckFramebufferStatusEXT
-
-#define glActiveTexture getGLExtensionFunctions().ActiveTexture
-#define glTexImage3D getGLExtensionFunctions().TexImage3D
-
-#define glGenBuffers getGLExtensionFunctions().GenBuffers
-#define glBindBuffer getGLExtensionFunctions().BindBuffer
-#define glBufferData getGLExtensionFunctions().BufferData
-#define glDeleteBuffers getGLExtensionFunctions().DeleteBuffers
-#define glMapBuffer getGLExtensionFunctions().MapBuffer
-#define glUnmapBuffer getGLExtensionFunctions().UnmapBuffer
-
-#endif
diff --git a/examples/widgets/graphicsview/boxes/gltrianglemesh.h b/examples/widgets/graphicsview/boxes/gltrianglemesh.h
deleted file mode 100644
index e5c4f51514..0000000000
--- a/examples/widgets/graphicsview/boxes/gltrianglemesh.h
+++ /dev/null
@@ -1,99 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the demonstration applications of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, you may use this file under the terms of the BSD license
-** as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef GLTRIANGLEMESH_H
-#define GLTRIANGLEMESH_H
-
-#include "glbuffers.h"
-#include "glextensions.h"
-
-#include <QtWidgets>
-#include <QtOpenGL>
-
-
-template<class TVertex, class TIndex>
-class GLTriangleMesh
-{
-public:
-    GLTriangleMesh(int vertexCount, int indexCount) : m_vb(vertexCount), m_ib(indexCount)
-    {
-    }
-
-    virtual ~GLTriangleMesh()
-    {
-    }
-
-    virtual void draw()
-    {
-        if (failed())
-            return;
-
-        int type = GL_UNSIGNED_INT;
-        if (sizeof(TIndex) == sizeof(char)) type = GL_UNSIGNED_BYTE;
-        if (sizeof(TIndex) == sizeof(short)) type = GL_UNSIGNED_SHORT;
-
-        m_vb.bind();
-        m_ib.bind();
-        glDrawElements(GL_TRIANGLES, m_ib.length(), type, BUFFER_OFFSET(0));
-        m_vb.unbind();
-        m_ib.unbind();
-    }
-
-    bool failed()
-    {
-        return m_vb.failed() || m_ib.failed();
-    }
-protected:
-    GLVertexBuffer<TVertex> m_vb;
-    GLIndexBuffer<TIndex> m_ib;
-};
-
-
-#endif
diff --git a/examples/widgets/graphicsview/boxes/granite.fsh b/examples/widgets/graphicsview/boxes/granite.fsh
deleted file mode 100644
index 5dcde5d2b1..0000000000
--- a/examples/widgets/graphicsview/boxes/granite.fsh
+++ /dev/null
@@ -1,85 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the demonstration applications of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, you may use this file under the terms of the BSD license
-** as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-varying vec3 position, normal;
-varying vec4 specular, ambient, diffuse, lightDirection;
-
-uniform sampler2D tex;
-uniform sampler3D noise;
-
-//const vec4 graniteColors[3] = {vec4(0.0, 0.0, 0.0, 1), vec4(0.30, 0.15, 0.10, 1), vec4(0.80, 0.70, 0.75, 1)};
-uniform vec4 graniteColors[3];
-
-float steep(float x)
-{
-    return clamp(5.0 * x - 2.0, 0.0, 1.0);
-}
-
-void main()
-{
-    vec2 turbulence = vec2(0, 0);
-    float scale = 1.0;
-    for (int i = 0; i < 4; ++i) {
-        turbulence += scale * (texture3D(noise, gl_TexCoord[1].xyz / scale).xy - 0.5);
-        scale *= 0.5;
-    }
-
-    vec3 N = normalize(normal);
-    // assume directional light
-
-    gl_MaterialParameters M = gl_FrontMaterial;
-
-    float NdotL = dot(N, lightDirection.xyz);
-    float RdotL = dot(reflect(normalize(position), N), lightDirection.xyz);
-
-    vec4 unlitColor = mix(graniteColors[1], mix(graniteColors[0], graniteColors[2], steep(0.5 + turbulence.y)), 4.0 * abs(turbulence.x));
-    gl_FragColor = (ambient + diffuse * max(NdotL, 0.0)) * unlitColor +
-                    M.specular * specular * pow(max(RdotL, 0.0), M.shininess);
-}
diff --git a/examples/widgets/graphicsview/boxes/main.cpp b/examples/widgets/graphicsview/boxes/main.cpp
deleted file mode 100644
index 2b3e6d3389..0000000000
--- a/examples/widgets/graphicsview/boxes/main.cpp
+++ /dev/null
@@ -1,157 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the demonstration applications of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, you may use this file under the terms of the BSD license
-** as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "glextensions.h"
-#include "scene.h"
-
-#include <QGLWidget>
-#include <QtWidgets>
-
-class GraphicsView : public QGraphicsView
-{
-public:
-    GraphicsView()
-    {
-        setWindowTitle(tr("Boxes"));
-        setRenderHints(QPainter::Antialiasing | QPainter::SmoothPixmapTransform);
-        //setRenderHints(QPainter::SmoothPixmapTransform);
-    }
-
-protected:
-    void resizeEvent(QResizeEvent *event) override {
-        if (scene())
-            scene()->setSceneRect(QRect(QPoint(0, 0), event->size()));
-        QGraphicsView::resizeEvent(event);
-    }
-};
-
-inline bool matchString(const char *extensionString, const char *subString)
-{
-    int subStringLength = strlen(subString);
-    return (strncmp(extensionString, subString, subStringLength) == 0)
-        && ((extensionString[subStringLength] == ' ') || (extensionString[subStringLength] == '\0'));
-}
-
-bool necessaryExtensionsSupported()
-{
-    const char *extensionString = reinterpret_cast<const char *>(glGetString(GL_EXTENSIONS));
-    const char *p = extensionString;
-
-    const int GL_EXT_FBO = 1;
-    const int GL_ARB_VS = 2;
-    const int GL_ARB_FS = 4;
-    const int GL_ARB_SO = 8;
-    int extensions = 0;
-
-    while (*p) {
-        if (matchString(p, "GL_EXT_framebuffer_object"))
-            extensions |= GL_EXT_FBO;
-        else if (matchString(p, "GL_ARB_vertex_shader"))
-            extensions |= GL_ARB_VS;
-        else if (matchString(p, "GL_ARB_fragment_shader"))
-            extensions |= GL_ARB_FS;
-        else if (matchString(p, "GL_ARB_shader_objects"))
-            extensions |= GL_ARB_SO;
-        while ((*p != ' ') && (*p != '\0'))
-            ++p;
-        if (*p == ' ')
-            ++p;
-    }
-    return (extensions == 15);
-}
-
-int main(int argc, char **argv)
-{
-    QApplication app(argc, argv);
-
-    if ((QGLFormat::openGLVersionFlags() & QGLFormat::OpenGL_Version_1_5) == 0) {
-        QMessageBox::critical(nullptr, "OpenGL features missing",
-            "OpenGL version 1.5 or higher is required to run this demo.\n"
-            "The program will now exit.");
-        return -1;
-    }
-
-    int maxTextureSize = 1024;
-    QGLWidget *widget = new QGLWidget(QGLFormat(QGL::SampleBuffers));
-    widget->makeCurrent();
-
-    if (!necessaryExtensionsSupported()) {
-        QMessageBox::critical(nullptr, "OpenGL features missing",
-            "The OpenGL extensions required to run this demo are missing.\n"
-            "The program will now exit.");
-        delete widget;
-        return -2;
-    }
-
-    // Check if all the necessary functions are resolved.
-    if (!getGLExtensionFunctions().resolve(widget->context())) {
-        QMessageBox::critical(nullptr, "OpenGL features missing",
-            "Failed to resolve OpenGL functions required to run this demo.\n"
-            "The program will now exit.");
-        delete widget;
-        return -3;
-    }
-
-    // TODO: Make conditional for final release
-    QMessageBox::information(nullptr, "For your information",
-        "This demo can be GPU and CPU intensive and may\n"
-        "work poorly or not at all on your system.");
-
-    widget->makeCurrent(); // The current context must be set before calling Scene's constructor
-    Scene scene(1024, 768, maxTextureSize);
-    GraphicsView view;
-    view.setViewport(widget);
-    view.setViewportUpdateMode(QGraphicsView::FullViewportUpdate);
-    view.setScene(&scene);
-    view.show();
-
-    return app.exec();
-}
-
diff --git a/examples/widgets/graphicsview/boxes/marble.fsh b/examples/widgets/graphicsview/boxes/marble.fsh
deleted file mode 100644
index c0b1980a67..0000000000
--- a/examples/widgets/graphicsview/boxes/marble.fsh
+++ /dev/null
@@ -1,80 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the demonstration applications of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, you may use this file under the terms of the BSD license
-** as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-varying vec3 position, normal;
-varying vec4 specular, ambient, diffuse, lightDirection;
-
-uniform sampler2D tex;
-uniform sampler3D noise;
-
-//const vec4 marbleColors[2] = {vec4(0.9, 0.9, 0.9, 1), vec4(0.6, 0.5, 0.5, 1)};
-uniform vec4 marbleColors[2];
-
-void main()
-{
-    float turbulence = 0.0;
-    float scale = 1.0;
-    for (int i = 0; i < 4; ++i) {
-        turbulence += scale * (texture3D(noise, 0.125 * gl_TexCoord[1].xyz / scale).x - 0.5);
-        scale *= 0.5;
-    }
-
-    vec3 N = normalize(normal);
-    // assume directional light
-
-    gl_MaterialParameters M = gl_FrontMaterial;
-
-    float NdotL = dot(N, lightDirection.xyz);
-    float RdotL = dot(reflect(normalize(position), N), lightDirection.xyz);
-
-    vec4 unlitColor = mix(marbleColors[0], marbleColors[1], exp(-4.0 * abs(turbulence)));
-    gl_FragColor = (ambient + diffuse * max(NdotL, 0.0)) * unlitColor +
-                    M.specular * specular * pow(max(RdotL, 0.0), M.shininess);
-}
diff --git a/examples/widgets/graphicsview/boxes/parameters.par b/examples/widgets/graphicsview/boxes/parameters.par
deleted file mode 100644
index 50e20739b9..0000000000
--- a/examples/widgets/graphicsview/boxes/parameters.par
+++ /dev/null
@@ -1,5 +0,0 @@
-color basicColor ff0e3d0e
-color woodColors ff5e3d33 ffcc9966
-float woodTubulence 0.1
-color graniteColors ff000000 ff4d261a ffccb3bf
-color marbleColors ffe6e6e6 ff998080
diff --git a/examples/widgets/graphicsview/boxes/qt-logo.jpg b/examples/widgets/graphicsview/boxes/qt-logo.jpg
deleted file mode 100644
index 8d7fab052a..0000000000
--- a/examples/widgets/graphicsview/boxes/qt-logo.jpg
+++ /dev/null
diff --git a/examples/widgets/graphicsview/boxes/qt-logo.png b/examples/widgets/graphicsview/boxes/qt-logo.png
deleted file mode 100644
index 0b0b15480c..0000000000
--- a/examples/widgets/graphicsview/boxes/qt-logo.png
+++ /dev/null
diff --git a/examples/widgets/graphicsview/boxes/qtbox.cpp b/examples/widgets/graphicsview/boxes/qtbox.cpp
deleted file mode 100644
index 8713aac05d..0000000000
--- a/examples/widgets/graphicsview/boxes/qtbox.cpp
+++ /dev/null
@@ -1,470 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the demonstration applications of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, you may use this file under the terms of the BSD license
-** as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qtbox.h"
-
-constexpr qreal ROTATE_SPEED_X = 30.0 / 1000.0;
-constexpr qreal ROTATE_SPEED_Y = 20.0 / 1000.0;
-constexpr qreal ROTATE_SPEED_Z = 40.0 / 1000.0;
-constexpr int MAX_ITEM_SIZE = 512;
-constexpr int MIN_ITEM_SIZE = 16;
-
-//============================================================================//
-//                                  ItemBase                                  //
-//============================================================================//
-
-ItemBase::ItemBase(int size, int x, int y) : m_size(size), m_startTime(QTime::currentTime())
-{
-    setFlag(QGraphicsItem::ItemIsMovable, true);
-    setFlag(QGraphicsItem::ItemIsSelectable, true);
-    setFlag(QGraphicsItem::ItemIsFocusable, true);
-    setAcceptHoverEvents(true);
-    setPos(x, y);
-}
-
-QRectF ItemBase::boundingRect() const
-{
-    return QRectF(-m_size / 2, -m_size / 2, m_size, m_size);
-}
-
-void ItemBase::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *)
-{
-    if (option->state & QStyle::State_Selected) {
-        painter->setRenderHint(QPainter::Antialiasing, true);
-        if (option->state & QStyle::State_HasFocus)
-            painter->setPen(Qt::yellow);
-        else
-            painter->setPen(Qt::white);
-        painter->drawRect(boundingRect());
-
-        painter->drawLine(m_size / 2 - 9, m_size / 2, m_size / 2, m_size / 2 - 9);
-        painter->drawLine(m_size / 2 - 6, m_size / 2, m_size / 2, m_size / 2 - 6);
-        painter->drawLine(m_size / 2 - 3, m_size / 2, m_size / 2, m_size / 2 - 3);
-
-        painter->setRenderHint(QPainter::Antialiasing, false);
-    }
-}
-
-void ItemBase::contextMenuEvent(QGraphicsSceneContextMenuEvent *event)
-{
-    if (!isSelected() && scene()) {
-        scene()->clearSelection();
-        setSelected(true);
-    }
-
-    QMenu menu;
-    QAction *delAction = menu.addAction("Delete");
-    QAction *newAction = menu.addAction("New");
-    QAction *growAction = menu.addAction("Grow");
-    QAction *shrinkAction = menu.addAction("Shrink");
-
-    QAction *selectedAction = menu.exec(event->screenPos());
-
-    if (selectedAction == delAction)
-        deleteSelectedItems(scene());
-    else if (selectedAction == newAction)
-        duplicateSelectedItems(scene());
-    else if (selectedAction == growAction)
-        growSelectedItems(scene());
-    else if (selectedAction == shrinkAction)
-        shrinkSelectedItems(scene());
-}
-
-void ItemBase::duplicateSelectedItems(QGraphicsScene *scene)
-{
-    if (!scene)
-        return;
-
-    const QList<QGraphicsItem *> selected = scene->selectedItems();
-    for (QGraphicsItem *item : selected) {
-        ItemBase *itemBase = qgraphicsitem_cast<ItemBase *>(item);
-        if (itemBase)
-            scene->addItem(itemBase->createNew(itemBase->m_size, itemBase->pos().x() + itemBase->m_size, itemBase->pos().y()));
-    }
-}
-
-void ItemBase::deleteSelectedItems(QGraphicsScene *scene)
-{
-    if (!scene)
-        return;
-
-    const QList<QGraphicsItem *> selected = scene->selectedItems();
-    for (QGraphicsItem *item : selected) {
-        ItemBase *itemBase = qgraphicsitem_cast<ItemBase *>(item);
-        if (itemBase)
-            delete itemBase;
-    }
-}
-
-void ItemBase::growSelectedItems(QGraphicsScene *scene)
-{
-    if (!scene)
-        return;
-
-    const QList<QGraphicsItem *> selected = scene->selectedItems();
-    for (QGraphicsItem *item : selected) {
-        ItemBase *itemBase = qgraphicsitem_cast<ItemBase *>(item);
-        if (itemBase) {
-            itemBase->prepareGeometryChange();
-            itemBase->m_size *= 2;
-            if (itemBase->m_size > MAX_ITEM_SIZE)
-                itemBase->m_size = MAX_ITEM_SIZE;
-        }
-    }
-}
-
-void ItemBase::shrinkSelectedItems(QGraphicsScene *scene)
-{
-    if (!scene)
-        return;
-
-    const QList<QGraphicsItem *> selected = scene->selectedItems();
-    for (QGraphicsItem *item : selected) {
-        ItemBase *itemBase = qgraphicsitem_cast<ItemBase *>(item);
-        if (itemBase) {
-            itemBase->prepareGeometryChange();
-            itemBase->m_size /= 2;
-            if (itemBase->m_size < MIN_ITEM_SIZE)
-                itemBase->m_size = MIN_ITEM_SIZE;
-        }
-    }
-}
-
-void ItemBase::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
-{
-    if (m_isResizing) {
-        int dx = int(2.0 * event->pos().x());
-        int dy = int(2.0 * event->pos().y());
-        prepareGeometryChange();
-        m_size = (dx > dy ? dx : dy);
-        if (m_size < MIN_ITEM_SIZE)
-            m_size = MIN_ITEM_SIZE;
-        else if (m_size > MAX_ITEM_SIZE)
-            m_size = MAX_ITEM_SIZE;
-    } else {
-        QGraphicsItem::mouseMoveEvent(event);
-    }
-}
-
-void ItemBase::hoverMoveEvent(QGraphicsSceneHoverEvent *event)
-{
-    if (m_isResizing || (isInResizeArea(event->pos()) && isSelected()))
-        setCursor(Qt::SizeFDiagCursor);
-    else
-        setCursor(Qt::ArrowCursor);
-    QGraphicsItem::hoverMoveEvent(event);
-}
-
-void ItemBase::mousePressEvent(QGraphicsSceneMouseEvent *event)
-{
-    static qreal z = 0.0;
-    setZValue(z += 1.0);
-    if (event->button() == Qt::LeftButton && isInResizeArea(event->pos())) {
-        m_isResizing = true;
-    } else {
-        QGraphicsItem::mousePressEvent(event);
-    }
-}
-
-void ItemBase::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
-{
-    if (event->button() == Qt::LeftButton && m_isResizing) {
-        m_isResizing = false;
-    } else {
-        QGraphicsItem::mouseReleaseEvent(event);
-    }
-}
-
-void ItemBase::keyPressEvent(QKeyEvent *event)
-{
-    switch (event->key()) {
-    case Qt::Key_Delete:
-        deleteSelectedItems(scene());
-        break;
-    case Qt::Key_Insert:
-        duplicateSelectedItems(scene());
-        break;
-    case Qt::Key_Plus:
-        growSelectedItems(scene());
-        break;
-    case Qt::Key_Minus:
-        shrinkSelectedItems(scene());
-        break;
-    default:
-        QGraphicsItem::keyPressEvent(event);
-        break;
-    }
-}
-
-void ItemBase::wheelEvent(QGraphicsSceneWheelEvent *event)
-{
-    prepareGeometryChange();
-    m_size = int(m_size * qExp(-event->delta() / 600.0));
-    m_size = qBound(MIN_ITEM_SIZE, m_size, MAX_ITEM_SIZE);
-}
-
-int ItemBase::type() const
-{
-    return Type;
-}
-
-
-bool ItemBase::isInResizeArea(const QPointF &pos)
-{
-    return (-pos.y() < pos.x() - m_size + 9);
-}
-
-//============================================================================//
-//                                    QtBox                                   //
-//============================================================================//
-
-QtBox::QtBox(int size, int x, int y) : ItemBase(size, x, y)
-{
-    for (int i = 0; i < 8; ++i) {
-        m_vertices[i].setX(i & 1 ? 0.5f : -0.5f);
-        m_vertices[i].setY(i & 2 ? 0.5f : -0.5f);
-        m_vertices[i].setZ(i & 4 ? 0.5f : -0.5f);
-    }
-    for (int i = 0; i < 4; ++i) {
-        m_texCoords[i].setX(i & 1 ? 1.0f : 0.0f);
-        m_texCoords[i].setY(i & 2 ? 1.0f : 0.0f);
-    }
-    m_normals[0] = QVector3D(-1.0f, 0.0f, 0.0f);
-    m_normals[1] = QVector3D(1.0f, 0.0f, 0.0f);
-    m_normals[2] = QVector3D(0.0f, -1.0f, 0.0f);
-    m_normals[3] = QVector3D(0.0f, 1.0f, 0.0f);
-    m_normals[4] = QVector3D(0.0f, 0.0f, -1.0f);
-    m_normals[5] = QVector3D(0.0f, 0.0f, 1.0f);
-}
-
-QtBox::~QtBox()
-{
-    delete m_texture;
-}
-
-ItemBase *QtBox::createNew(int size, int x, int y)
-{
-    return new QtBox(size, x, y);
-}
-
-void QtBox::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
-{
-    QRectF rect = boundingRect().translated(pos());
-    float width = float(painter->device()->width());
-    float height = float(painter->device()->height());
-
-    float left = 2.0f * float(rect.left()) / width - 1.0f;
-    float right = 2.0f * float(rect.right()) / width - 1.0f;
-    float top = 1.0f - 2.0f * float(rect.top()) / height;
-    float bottom = 1.0f - 2.0f * float(rect.bottom()) / height;
-    float moveToRectMatrix[] = {
-        0.5f * (right - left), 0.0f, 0.0f, 0.0f,
-        0.0f, 0.5f * (bottom - top), 0.0f, 0.0f,
-        0.0f, 0.0f, 1.0f, 0.0f,
-        0.5f * (right + left), 0.5f * (bottom + top), 0.0f, 1.0f
-    };
-
-    painter->beginNativePainting();
-
-    glMatrixMode(GL_PROJECTION);
-    glPushMatrix();
-    glLoadMatrixf(moveToRectMatrix);
-    qgluPerspective(60.0, 1.0, 0.01, 10.0);
-
-    glMatrixMode(GL_MODELVIEW);
-    glPushMatrix();
-    glLoadIdentity();
-
-    //glEnable(GL_DEPTH_TEST);
-    glEnable(GL_CULL_FACE);
-    glEnable(GL_LIGHTING);
-    glEnable(GL_COLOR_MATERIAL);
-    glEnable(GL_NORMALIZE);
-
-    if (m_texture == nullptr)
-        m_texture = new GLTexture2D(":/res/boxes/qt-logo.jpg", 64, 64);
-    m_texture->bind();
-    glEnable(GL_TEXTURE_2D);
-
-    glColorMaterial(GL_FRONT_AND_BACK, GL_AMBIENT_AND_DIFFUSE);
-    float lightColour[] = {1.0f, 1.0f, 1.0f, 1.0f};
-    float lightDir[] = {0.0f, 0.0f, 1.0f, 0.0f};
-    glLightfv(GL_LIGHT0, GL_DIFFUSE, lightColour);
-    glLightfv(GL_LIGHT0, GL_POSITION, lightDir);
-    glEnable(GL_LIGHT0);
-
-    glTranslatef(0.0f, 0.0f, -1.5f);
-    glRotatef(ROTATE_SPEED_X * m_startTime.msecsTo(QTime::currentTime()), 1.0f, 0.0f, 0.0f);
-    glRotatef(ROTATE_SPEED_Y * m_startTime.msecsTo(QTime::currentTime()), 0.0f, 1.0f, 0.0f);
-    glRotatef(ROTATE_SPEED_Z * m_startTime.msecsTo(QTime::currentTime()), 0.0f, 0.0f, 1.0f);
-    int dt = m_startTime.msecsTo(QTime::currentTime());
-    if (dt < 500)
-        glScalef(dt / 500.0f, dt / 500.0f, dt / 500.0f);
-
-    for (int dir = 0; dir < 3; ++dir) {
-        glColor4f(1.0f, 1.0f, 1.0f, 1.0);
-
-        glBegin(GL_TRIANGLE_STRIP);
-        glNormal3fv(reinterpret_cast<float *>(&m_normals[2 * dir + 0]));
-        for (int i = 0; i < 2; ++i) {
-            for (int j = 0; j < 2; ++j) {
-                glTexCoord2fv(reinterpret_cast<float *>(&m_texCoords[(j << 1) | i]));
-                glVertex3fv(reinterpret_cast<float *>(&m_vertices[(i << ((dir + 2) % 3)) | (j << ((dir + 1) % 3))]));
-            }
-        }
-        glEnd();
-
-        glBegin(GL_TRIANGLE_STRIP);
-        glNormal3fv(reinterpret_cast<float *>(&m_normals[2 * dir + 1]));
-        for (int i = 0; i < 2; ++i) {
-            for (int j = 0; j < 2; ++j) {
-                glTexCoord2fv(reinterpret_cast<float *>(&m_texCoords[(j << 1) | i]));
-                glVertex3fv(reinterpret_cast<float *>(&m_vertices[(1 << dir) | (i << ((dir + 1) % 3)) | (j << ((dir + 2) % 3))]));
-            }
-        }
-        glEnd();
-    }
-    m_texture->unbind();
-
-    //glDisable(GL_DEPTH_TEST);
-    glDisable(GL_CULL_FACE);
-    glDisable(GL_LIGHTING);
-    glDisable(GL_COLOR_MATERIAL);
-    glDisable(GL_TEXTURE_2D);
-    glDisable(GL_LIGHT0);
-    glDisable(GL_NORMALIZE);
-
-    glPopMatrix();
-
-    glMatrixMode(GL_PROJECTION);
-    glPopMatrix();
-
-    painter->endNativePainting();
-
-    ItemBase::paint(painter, option, widget);
-}
-
-//============================================================================//
-//                                 CircleItem                                 //
-//============================================================================//
-
-CircleItem::CircleItem(int size, int x, int y) : ItemBase(size, x, y)
-    , m_color(QColor::fromHsv(QRandomGenerator::global()->bounded(360), 255, 255))
-{}
-
-void CircleItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
-{
-    int dt = m_startTime.msecsTo(QTime::currentTime());
-
-    qreal r0 = 0.5 * m_size * (1.0 - qExp(-0.001 * ((dt + 3800) % 4000)));
-    qreal r1 = 0.5 * m_size * (1.0 - qExp(-0.001 * ((dt + 0) % 4000)));
-    qreal r2 = 0.5 * m_size * (1.0 - qExp(-0.001 * ((dt + 1800) % 4000)));
-    qreal r3 = 0.5 * m_size * (1.0 - qExp(-0.001 * ((dt + 2000) % 4000)));
-
-    if (r0 > r1)
-        r0 = 0.0;
-    if (r2 > r3)
-        r2 = 0.0;
-
-    QPainterPath path;
-    path.moveTo(r1, 0.0);
-    path.arcTo(-r1, -r1, 2 * r1, 2 * r1, 0.0, 360.0);
-    path.lineTo(r0, 0.0);
-    path.arcTo(-r0, -r0, 2 * r0, 2 * r0, 0.0, -360.0);
-    path.closeSubpath();
-    path.moveTo(r3, 0.0);
-    path.arcTo(-r3, -r3, 2 * r3, 2 * r3, 0.0, 360.0);
-    path.lineTo(r0, 0.0);
-    path.arcTo(-r2, -r2, 2 * r2, 2 * r2, 0.0, -360.0);
-    path.closeSubpath();
-    painter->setRenderHint(QPainter::Antialiasing, true);
-    painter->setBrush(QBrush(m_color));
-    painter->setPen(Qt::NoPen);
-    painter->drawPath(path);
-    painter->setBrush(Qt::NoBrush);
-    painter->setPen(Qt::SolidLine);
-    painter->setRenderHint(QPainter::Antialiasing, false);
-
-    ItemBase::paint(painter, option, widget);
-}
-
-ItemBase *CircleItem::createNew(int size, int x, int y)
-{
-    return new CircleItem(size, x, y);
-}
-
-//============================================================================//
-//                                 SquareItem                                 //
-//============================================================================//
-
-SquareItem::SquareItem(int size, int x, int y) : ItemBase(size, x, y)
-    , m_image(QPixmap(":/res/boxes/square.jpg"))
-{}
-
-void SquareItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
-{
-    int dt = m_startTime.msecsTo(QTime::currentTime());
-    QTransform oldTransform = painter->worldTransform();
-    int dtMod = dt % 2000;
-    qreal amp = 0.002 * (dtMod < 1000 ? dtMod : 2000 - dtMod) - 1.0;
-
-    qreal scale = 0.6 + 0.2 * amp * amp;
-    painter->setWorldTransform(QTransform().rotate(15.0 * amp).scale(scale, scale), true);
-
-    painter->drawPixmap(-m_size / 2, -m_size / 2, m_size, m_size, m_image);
-
-    painter->setWorldTransform(oldTransform, false);
-    ItemBase::paint(painter, option, widget);
-}
-
-ItemBase *SquareItem::createNew(int size, int x, int y)
-{
-    return new SquareItem(size, x, y);
-}
diff --git a/examples/widgets/graphicsview/boxes/qtbox.h b/examples/widgets/graphicsview/boxes/qtbox.h
deleted file mode 100644
index 84c8cb1d93..0000000000
--- a/examples/widgets/graphicsview/boxes/qtbox.h
+++ /dev/null
@@ -1,126 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the demonstration applications of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, you may use this file under the terms of the BSD license
-** as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QTBOX_H
-#define QTBOX_H
-
-#include "glbuffers.h"
-
-#include <QtWidgets>
-#include <QVector3D>
-
-class ItemBase : public QGraphicsItem
-{
-public:
-    enum { Type = UserType + 1 };
-
-    ItemBase(int size, int x, int y);
-    QRectF boundingRect() const override;
-    void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;
-protected:
-    virtual ItemBase *createNew(int size, int x, int y) = 0;
-    void contextMenuEvent(QGraphicsSceneContextMenuEvent *event) override;
-    void mouseMoveEvent(QGraphicsSceneMouseEvent *event) override;
-    void hoverMoveEvent(QGraphicsSceneHoverEvent *event) override;
-    void mousePressEvent(QGraphicsSceneMouseEvent *event) override;
-    void mouseReleaseEvent(QGraphicsSceneMouseEvent *event) override;
-    void keyPressEvent(QKeyEvent *event) override;
-    void wheelEvent(QGraphicsSceneWheelEvent *event) override;
-    int type() const override;
-    bool isInResizeArea(const QPointF &pos);
-
-    static void duplicateSelectedItems(QGraphicsScene *scene);
-    static void deleteSelectedItems(QGraphicsScene *scene);
-    static void growSelectedItems(QGraphicsScene *scene);
-    static void shrinkSelectedItems(QGraphicsScene *scene);
-
-    int m_size;
-    QTime m_startTime;
-    bool m_isResizing = false;
-};
-
-class QtBox : public ItemBase
-{
-public:
-    QtBox(int size, int x, int y);
-    virtual ~QtBox();
-    void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;
-protected:
-    ItemBase *createNew(int size, int x, int y) override;
-private:
-    QVector3D m_vertices[8];
-    QVector3D m_texCoords[4];
-    QVector3D m_normals[6];
-    GLTexture *m_texture = nullptr;
-};
-
-class CircleItem : public ItemBase
-{
-public:
-    CircleItem(int size, int x, int y);
-    void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;
-protected:
-    ItemBase *createNew(int size, int x, int y) override;
-
-    QColor m_color;
-};
-
-class SquareItem : public ItemBase
-{
-public:
-    SquareItem(int size, int x, int y);
-    void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;
-protected:
-    ItemBase *createNew(int size, int x, int y) override;
-
-    QPixmap m_image;
-};
-
-#endif
diff --git a/examples/widgets/graphicsview/boxes/reflection.fsh b/examples/widgets/graphicsview/boxes/reflection.fsh
deleted file mode 100644
index 0f0a26476f..0000000000
--- a/examples/widgets/graphicsview/boxes/reflection.fsh
+++ /dev/null
@@ -1,63 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the demonstration applications of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, you may use this file under the terms of the BSD license
-** as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-varying vec3 position, normal;
-varying vec4 specular, ambient, diffuse, lightDirection;
-
-uniform sampler2D tex;
-uniform samplerCube env;
-uniform mat4 view;
-
-void main()
-{
-    vec3 N = normalize(normal);
-    vec3 R = 2.0 * dot(-position, N) * N + position;
-    gl_FragColor = textureCube(env, R * mat3(view[0].xyz, view[1].xyz, view[2].xyz));
-}
diff --git a/examples/widgets/graphicsview/boxes/refraction.fsh b/examples/widgets/graphicsview/boxes/refraction.fsh
deleted file mode 100644
index 8ba2d36329..0000000000
--- a/examples/widgets/graphicsview/boxes/refraction.fsh
+++ /dev/null
@@ -1,79 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the demonstration applications of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, you may use this file under the terms of the BSD license
-** as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-varying vec3 position, normal;
-varying vec4 specular, ambient, diffuse, lightDirection;
-
-uniform sampler2D tex;
-uniform samplerCube env;
-uniform mat4 view;
-
-// Arrays don't work here on glsl < 120, apparently.
-//const float coeffs[6] = float[6](1.0/2.0, 1.0/2.1, 1.0/2.2, 1.0/2.3, 1.0/2.4, 1.0/2.5);
-float coeffs(int i)
-{
-	return 1.0 / (2.0 + 0.1 * float(i));
-}
-
-void main()
-{
-    vec3 N = normalize(normal);
-    vec3 I = -normalize(position);
-    float IdotN = dot(I, N);
-    float scales[6];
-    vec3 C[6];
-    for (int i = 0; i < 6; ++i) {
-        scales[i] = (IdotN - sqrt(1.0 - coeffs(i) + coeffs(i) * (IdotN * IdotN)));
-        C[i] = textureCube(env, (-I + coeffs(i) * N) * mat3(view[0].xyz, view[1].xyz, view[2].xyz)).xyz;
-    }
-
-    gl_FragColor = 0.25 * vec4(C[5].x + 2.0*C[0].x + C[1].x, C[1].y + 2.0*C[2].y + C[3].y,
-                   C[3].z + 2.0*C[4].z + C[5].z, 4.0);
-}
diff --git a/examples/widgets/graphicsview/boxes/roundedbox.cpp b/examples/widgets/graphicsview/boxes/roundedbox.cpp
deleted file mode 100644
index be96223b9f..0000000000
--- a/examples/widgets/graphicsview/boxes/roundedbox.cpp
+++ /dev/null
@@ -1,170 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the demonstration applications of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, you may use this file under the terms of the BSD license
-** as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "roundedbox.h"
-
-//============================================================================//
-//                                P3T2N3Vertex                                //
-//============================================================================//
-
-VertexDescription P3T2N3Vertex::description[] = {
-    {VertexDescription::Position, GL_FLOAT, SIZE_OF_MEMBER(P3T2N3Vertex, position) / sizeof(float), 0, 0},
-    {VertexDescription::TexCoord, GL_FLOAT, SIZE_OF_MEMBER(P3T2N3Vertex, texCoord) / sizeof(float), sizeof(QVector3D), 0},
-    {VertexDescription::Normal, GL_FLOAT, SIZE_OF_MEMBER(P3T2N3Vertex, normal) / sizeof(float), sizeof(QVector3D) + sizeof(QVector2D), 0},
-
-    {VertexDescription::Null, 0, 0, 0, 0},
-};
-
-//============================================================================//
-//                                GLRoundedBox                                //
-//============================================================================//
-
-float lerp(float a, float b, float t)
-{
-    return a * (1.0f - t) + b * t;
-}
-
-GLRoundedBox::GLRoundedBox(float r, float scale, int n)
-    : GLTriangleMesh<P3T2N3Vertex, unsigned short>((n+2)*(n+3)*4, (n+1)*(n+1)*24+36+72*(n+1))
-{
-    int vidx = 0, iidx = 0;
-    int vertexCountPerCorner = (n + 2) * (n + 3) / 2;
-
-    P3T2N3Vertex *vp = m_vb.lock();
-    unsigned short *ip = m_ib.lock();
-
-    if (!vp || !ip) {
-        qWarning("GLRoundedBox::GLRoundedBox: Failed to lock vertex buffer and/or index buffer.");
-        m_ib.unlock();
-        m_vb.unlock();
-        return;
-    }
-
-    for (int corner = 0; corner < 8; ++corner) {
-        QVector3D centre(corner & 1 ? 1.0f : -1.0f,
-                corner & 2 ? 1.0f : -1.0f,
-                corner & 4 ? 1.0f : -1.0f);
-        int winding = (corner & 1) ^ ((corner >> 1) & 1) ^ (corner >> 2);
-        int offsX = ((corner ^ 1) - corner) * vertexCountPerCorner;
-        int offsY = ((corner ^ 2) - corner) * vertexCountPerCorner;
-        int offsZ = ((corner ^ 4) - corner) * vertexCountPerCorner;
-
-        // Face polygons
-        if (winding) {
-            ip[iidx++] = vidx;
-            ip[iidx++] = vidx + offsX;
-            ip[iidx++] = vidx + offsY;
-
-            ip[iidx++] = vidx + vertexCountPerCorner - n - 2;
-            ip[iidx++] = vidx + vertexCountPerCorner - n - 2 + offsY;
-            ip[iidx++] = vidx + vertexCountPerCorner - n - 2 + offsZ;
-
-            ip[iidx++] = vidx + vertexCountPerCorner - 1;
-            ip[iidx++] = vidx + vertexCountPerCorner - 1 + offsZ;
-            ip[iidx++] = vidx + vertexCountPerCorner - 1 + offsX;
-        }
-
-        for (int i = 0; i < n + 2; ++i) {
-
-            // Edge polygons
-            if (winding && i < n + 1) {
-                ip[iidx++] = vidx + i + 1;
-                ip[iidx++] = vidx;
-                ip[iidx++] = vidx + offsY + i + 1;
-                ip[iidx++] = vidx + offsY;
-                ip[iidx++] = vidx + offsY + i + 1;
-                ip[iidx++] = vidx;
-
-                ip[iidx++] = vidx + i;
-                ip[iidx++] = vidx + 2 * i + 2;
-                ip[iidx++] = vidx + i + offsX;
-                ip[iidx++] = vidx + 2 * i + offsX + 2;
-                ip[iidx++] = vidx + i + offsX;
-                ip[iidx++] = vidx + 2 * i + 2;
-
-                ip[iidx++] = (corner + 1) * vertexCountPerCorner - 1 - i;
-                ip[iidx++] = (corner + 1) * vertexCountPerCorner - 2 - i;
-                ip[iidx++] = (corner + 1) * vertexCountPerCorner - 1 - i + offsZ;
-                ip[iidx++] = (corner + 1) * vertexCountPerCorner - 2 - i + offsZ;
-                ip[iidx++] = (corner + 1) * vertexCountPerCorner - 1 - i + offsZ;
-                ip[iidx++] = (corner + 1) * vertexCountPerCorner - 2 - i;
-            }
-
-            for (int j = 0; j <= i; ++j) {
-                QVector3D normal = QVector3D(i - j, j, n + 1 - i).normalized();
-                QVector3D offset(0.5f - r, 0.5f - r, 0.5f - r);
-                QVector3D pos = centre * (offset + r * normal);
-
-                vp[vidx].position = scale * pos;
-                vp[vidx].normal = centre * normal;
-                vp[vidx].texCoord = QVector2D(pos.x() + 0.5f, pos.y() + 0.5f);
-
-                // Corner polygons
-                if (i < n + 1) {
-                    ip[iidx++] = vidx;
-                    ip[iidx++] = vidx + i + 2 - winding;
-                    ip[iidx++] = vidx + i + 1 + winding;
-                }
-                if (i < n) {
-                    ip[iidx++] = vidx + i + 1 + winding;
-                    ip[iidx++] = vidx + i + 2 - winding;
-                    ip[iidx++] = vidx + 2 * i + 4;
-                }
-
-                ++vidx;
-            }
-        }
-
-    }
-
-    m_ib.unlock();
-    m_vb.unlock();
-}
-
diff --git a/examples/widgets/graphicsview/boxes/roundedbox.h b/examples/widgets/graphicsview/boxes/roundedbox.h
deleted file mode 100644
index a1f15cd631..0000000000
--- a/examples/widgets/graphicsview/boxes/roundedbox.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the demonstration applications of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, you may use this file under the terms of the BSD license
-** as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef ROUNDEDBOX_H
-#define ROUNDEDBOX_H
-
-#include "glbuffers.h"
-#include "glextensions.h"
-#include "gltrianglemesh.h"
-
-#include <QVector2D>
-#include <QVector3D>
-
-struct P3T2N3Vertex
-{
-    QVector3D position;
-    QVector2D texCoord;
-    QVector3D normal;
-    static VertexDescription description[];
-};
-
-class GLRoundedBox : public GLTriangleMesh<P3T2N3Vertex, unsigned short>
-{
-public:
-    // 0 < r < 0.5, 0 <= n <= 125
-    explicit GLRoundedBox(float r = 0.25f, float scale = 1.0f, int n = 10);
-};
-
-
-#endif
diff --git a/examples/widgets/graphicsview/boxes/scene.cpp b/examples/widgets/graphicsview/boxes/scene.cpp
deleted file mode 100644
index b344f65561..0000000000
--- a/examples/widgets/graphicsview/boxes/scene.cpp
+++ /dev/null
@@ -1,1028 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the demonstration applications of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, you may use this file under the terms of the BSD license
-** as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "scene.h"
-
-#include <QMatrix4x4>
-#include <QRandomGenerator>
-#include <QVector3D>
-#include <qmath.h>
-
-#include "3rdparty/fbm.h"
-
-//============================================================================//
-//                                  ColorEdit                                 //
-//============================================================================//
-
-ColorEdit::ColorEdit(QRgb initialColor, int id)
-    : m_color(initialColor), m_id(id)
-{
-    QHBoxLayout *layout = new QHBoxLayout;
-    setLayout(layout);
-    layout->setContentsMargins(0, 0, 0, 0);
-
-    m_lineEdit = new QLineEdit(QString::number(m_color, 16));
-    layout->addWidget(m_lineEdit);
-
-    m_button = new QFrame;
-    QPalette palette = m_button->palette();
-    palette.setColor(QPalette::Window, QColor(m_color));
-    m_button->setPalette(palette);
-    m_button->setAutoFillBackground(true);
-    m_button->setMinimumSize(32, 0);
-    m_button->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Preferred);
-    m_button->setFrameStyle(QFrame::StyledPanel | QFrame::Sunken);
-    layout->addWidget(m_button);
-
-    connect(m_lineEdit, &QLineEdit::editingFinished, this, &ColorEdit::editDone);
-}
-
-void ColorEdit::editDone()
-{
-    bool ok;
-    QRgb newColor = m_lineEdit->text().toUInt(&ok, 16);
-    if (ok)
-        setColor(newColor);
-}
-
-void ColorEdit::mousePressEvent(QMouseEvent *event)
-{
-    if (event->button() == Qt::LeftButton) {
-        QColor color(m_color);
-        QColorDialog dialog(color, nullptr);
-        dialog.setOption(QColorDialog::ShowAlphaChannel, true);
-        dialog.move(280, 120);
-        if (dialog.exec() == QDialog::Rejected)
-            return;
-        QRgb newColor = dialog.selectedColor().rgba();
-        if (newColor == m_color)
-            return;
-        setColor(newColor);
-    }
-}
-
-void ColorEdit::setColor(QRgb color)
-{
-    m_color = color;
-    m_lineEdit->setText(QString::number(m_color, 16)); // "Clean up" text
-    QPalette palette = m_button->palette();
-    palette.setColor(QPalette::Window, QColor(m_color));
-    m_button->setPalette(palette);
-    emit colorChanged(m_color, m_id);
-}
-
-//============================================================================//
-//                                  FloatEdit                                 //
-//============================================================================//
-
-FloatEdit::FloatEdit(float initialValue, int id)
-    : m_value(initialValue), m_id(id)
-{
-    QHBoxLayout *layout = new QHBoxLayout;
-    setLayout(layout);
-    layout->setContentsMargins(0, 0, 0, 0);
-
-    m_lineEdit = new QLineEdit(QString::number(m_value));
-    layout->addWidget(m_lineEdit);
-
-    connect(m_lineEdit, &QLineEdit::editingFinished, this, &FloatEdit::editDone);
-}
-
-void FloatEdit::editDone()
-{
-    bool ok;
-    float newValue = m_lineEdit->text().toFloat(&ok);
-    if (ok) {
-        m_value = newValue;
-        m_lineEdit->setText(QString::number(m_value)); // "Clean up" text
-        emit valueChanged(m_value, m_id);
-    }
-}
-
-//============================================================================//
-//                           TwoSidedGraphicsWidget                           //
-//============================================================================//
-void TwoSidedGraphicsWidget::setWidget(int index, QWidget *widget)
-{
-    if (index < 0 || index >= 2)
-    {
-        qWarning("TwoSidedGraphicsWidget::setWidget: Index out of bounds, index == %d", index);
-        return;
-    }
-
-    GraphicsWidget *proxy = new GraphicsWidget;
-    proxy->setWidget(widget);
-
-    delete m_proxyWidgets[index];
-    m_proxyWidgets[index] = proxy;
-
-    proxy->setCacheMode(QGraphicsItem::ItemCoordinateCache);
-    proxy->setZValue(1e30); // Make sure the dialog is drawn on top of all other (OpenGL) items
-
-    if (index != m_current)
-        proxy->setVisible(false);
-
-    qobject_cast<QGraphicsScene *>(parent())->addItem(proxy);
-}
-
-QWidget *TwoSidedGraphicsWidget::widget(int index)
-{
-    if (index < 0 || index >= 2)
-    {
-        qWarning("TwoSidedGraphicsWidget::widget: Index out of bounds, index == %d", index);
-        return nullptr;
-    }
-    return m_proxyWidgets[index]->widget();
-}
-
-void TwoSidedGraphicsWidget::flip()
-{
-    m_delta = (m_current == 0 ? 9 : -9);
-    animateFlip();
-}
-
-void TwoSidedGraphicsWidget::animateFlip()
-{
-    m_angle += m_delta;
-    if (m_angle == 90) {
-        int old = m_current;
-        m_current ^= 1;
-        m_proxyWidgets[old]->setVisible(false);
-        m_proxyWidgets[m_current]->setVisible(true);
-        m_proxyWidgets[m_current]->setGeometry(m_proxyWidgets[old]->geometry());
-    }
-
-    QRectF r = m_proxyWidgets[m_current]->boundingRect();
-    m_proxyWidgets[m_current]->setTransform(QTransform()
-        .translate(r.width() / 2, r.height() / 2)
-        .rotate(m_angle - 180 * m_current, Qt::YAxis)
-        .translate(-r.width() / 2, -r.height() / 2));
-
-    if ((m_current == 0 && m_angle > 0) || (m_current == 1 && m_angle < 180))
-        QTimer::singleShot(25, this, &TwoSidedGraphicsWidget::animateFlip);
-}
-
-QVariant GraphicsWidget::itemChange(GraphicsItemChange change, const QVariant &value)
-{
-    if (change == ItemPositionChange && scene()) {
-        QRectF rect = boundingRect();
-        QPointF pos = value.toPointF();
-        QRectF sceneRect = scene()->sceneRect();
-        if (pos.x() + rect.left() < sceneRect.left())
-            pos.setX(sceneRect.left() - rect.left());
-        else if (pos.x() + rect.right() >= sceneRect.right())
-            pos.setX(sceneRect.right() - rect.right());
-        if (pos.y() + rect.top() < sceneRect.top())
-            pos.setY(sceneRect.top() - rect.top());
-        else if (pos.y() + rect.bottom() >= sceneRect.bottom())
-            pos.setY(sceneRect.bottom() - rect.bottom());
-        return pos;
-    }
-    return QGraphicsProxyWidget::itemChange(change, value);
-}
-
-void GraphicsWidget::resizeEvent(QGraphicsSceneResizeEvent *event)
-{
-    setCacheMode(QGraphicsItem::NoCache);
-    setCacheMode(QGraphicsItem::ItemCoordinateCache);
-    QGraphicsProxyWidget::resizeEvent(event);
-}
-
-void GraphicsWidget::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
-{
-    painter->setRenderHint(QPainter::Antialiasing, false);
-    QGraphicsProxyWidget::paint(painter, option, widget);
-    //painter->setRenderHint(QPainter::Antialiasing, true);
-}
-
-//============================================================================//
-//                             RenderOptionsDialog                            //
-//============================================================================//
-
-RenderOptionsDialog::RenderOptionsDialog()
-    : QDialog(nullptr, Qt::CustomizeWindowHint | Qt::WindowTitleHint)
-{
-    setWindowOpacity(0.75);
-    setWindowTitle(tr("Options (double click to flip)"));
-    QGridLayout *layout = new QGridLayout;
-    setLayout(layout);
-    layout->setColumnStretch(1, 1);
-
-    int row = 0;
-
-    QCheckBox *check = new QCheckBox(tr("Dynamic cube map"));
-    check->setCheckState(Qt::Unchecked);
-    // Dynamic cube maps are only enabled when multi-texturing and render to texture are available.
-    check->setEnabled(glActiveTexture && glGenFramebuffersEXT);
-    connect(check, &QCheckBox::stateChanged, this, &RenderOptionsDialog::dynamicCubemapToggled);
-    layout->addWidget(check, 0, 0, 1, 2);
-    ++row;
-
-    // Load all .par files
-    // .par files have a simple syntax for specifying user adjustable uniform variables.
-    const QList<QFileInfo> files = QDir(QStringLiteral(":/res/boxes/"))
-            .entryInfoList({ QStringLiteral("*.par") },
-                           QDir::Files | QDir::Readable);
-
-    for (const QFileInfo &fileInfo : files) {
-        QFile file(fileInfo.absoluteFilePath());
-        if (file.open(QIODevice::ReadOnly)) {
-            while (!file.atEnd()) {
-                QList<QByteArray> tokens = file.readLine().simplified().split(' ');
-                QList<QByteArray>::const_iterator it = tokens.begin();
-                if (it == tokens.end())
-                    continue;
-                QByteArray type = *it;
-                if (++it == tokens.end())
-                    continue;
-                QByteArray name = *it;
-                bool singleElement = (tokens.size() == 3); // type, name and one value
-                char counter[10] = "000000000";
-                int counterPos = 8; // position of last digit
-                while (++it != tokens.end()) {
-                    m_parameterNames << name;
-                    if (!singleElement) {
-                        m_parameterNames.back() += '[';
-                        m_parameterNames.back() += counter + counterPos;
-                        m_parameterNames.back() += ']';
-                        int j = 8; // position of last digit
-                        ++counter[j];
-                        while (j > 0 && counter[j] > '9') {
-                            counter[j] = '0';
-                            ++counter[--j];
-                        }
-                        if (j < counterPos)
-                            counterPos = j;
-                    }
-
-                    if (type == "color") {
-                        layout->addWidget(new QLabel(m_parameterNames.back()));
-                        bool ok;
-                        ColorEdit *colorEdit = new ColorEdit(it->toUInt(&ok, 16), m_parameterNames.size() - 1);
-                        m_parameterEdits << colorEdit;
-                        layout->addWidget(colorEdit);
-                        connect(colorEdit, &ColorEdit::colorChanged, this, &RenderOptionsDialog::setColorParameter);
-                        ++row;
-                    } else if (type == "float") {
-                        layout->addWidget(new QLabel(m_parameterNames.back()));
-                        bool ok;
-                        FloatEdit *floatEdit = new FloatEdit(it->toFloat(&ok), m_parameterNames.size() - 1);
-                        m_parameterEdits << floatEdit;
-                        layout->addWidget(floatEdit);
-                        connect(floatEdit, &FloatEdit::valueChanged, this, &RenderOptionsDialog::setFloatParameter);
-                        ++row;
-                    }
-                }
-            }
-            file.close();
-        }
-    }
-
-    layout->addWidget(new QLabel(tr("Texture:")));
-    m_textureCombo = new QComboBox;
-    connect(m_textureCombo, QOverload<int>::of(&QComboBox::currentIndexChanged),
-            this, &RenderOptionsDialog::textureChanged);
-    layout->addWidget(m_textureCombo);
-    ++row;
-
-    layout->addWidget(new QLabel(tr("Shader:")));
-    m_shaderCombo = new QComboBox;
-    connect(m_shaderCombo, QOverload<int>::of(&QComboBox::currentIndexChanged),
-            this, &RenderOptionsDialog::shaderChanged);
-    layout->addWidget(m_shaderCombo);
-    ++row;
-
-    layout->setRowStretch(row, 1);
-}
-
-int RenderOptionsDialog::addTexture(const QString &name)
-{
-    m_textureCombo->addItem(name);
-    return m_textureCombo->count() - 1;
-}
-
-int RenderOptionsDialog::addShader(const QString &name)
-{
-    m_shaderCombo->addItem(name);
-    return m_shaderCombo->count() - 1;
-}
-
-void RenderOptionsDialog::emitParameterChanged()
-{
-    for (ParameterEdit *edit : qAsConst(m_parameterEdits))
-        edit->emitChange();
-}
-
-void RenderOptionsDialog::setColorParameter(QRgb color, int id)
-{
-    emit colorParameterChanged(m_parameterNames[id], color);
-}
-
-void RenderOptionsDialog::setFloatParameter(float value, int id)
-{
-    emit floatParameterChanged(m_parameterNames[id], value);
-}
-
-void RenderOptionsDialog::mouseDoubleClickEvent(QMouseEvent *event)
-{
-    if (event->button() == Qt::LeftButton)
-        emit doubleClicked();
-}
-
-//============================================================================//
-//                                 ItemDialog                                 //
-//============================================================================//
-
-ItemDialog::ItemDialog()
-    : QDialog(nullptr, Qt::CustomizeWindowHint | Qt::WindowTitleHint)
-{
-    setWindowTitle(tr("Items (double click to flip)"));
-    setWindowOpacity(0.75);
-    resize(160, 100);
-
-    QVBoxLayout *layout = new QVBoxLayout;
-    setLayout(layout);
-    QPushButton *button;
-
-    button = new QPushButton(tr("Add Qt box"));
-    layout->addWidget(button);
-    connect(button, &QAbstractButton::clicked, this, &ItemDialog::triggerNewQtBox);
-
-    button = new QPushButton(tr("Add circle"));
-    layout->addWidget(button);
-    connect(button, &QAbstractButton::clicked, this, &ItemDialog::triggerNewCircleItem);
-
-    button = new QPushButton(tr("Add square"));
-    layout->addWidget(button);
-    connect(button, &QAbstractButton::clicked, this, &ItemDialog::triggerNewSquareItem);
-
-    layout->addStretch(1);
-}
-
-void ItemDialog::triggerNewQtBox()
-{
-    emit newItemTriggered(QtBoxItem);
-}
-
-void ItemDialog::triggerNewCircleItem()
-{
-    emit newItemTriggered(CircleItem);
-}
-
-void ItemDialog::triggerNewSquareItem()
-{
-    emit newItemTriggered(SquareItem);
-}
-
-void ItemDialog::mouseDoubleClickEvent(QMouseEvent *event)
-{
-    if (event->button() == Qt::LeftButton)
-        emit doubleClicked();
-}
-
-//============================================================================//
-//                                    Scene                                   //
-//============================================================================//
-
-const static char environmentShaderText[] =
-    "uniform samplerCube env;"
-    "void main() {"
-        "gl_FragColor = textureCube(env, gl_TexCoord[1].xyz);"
-    "}";
-
-Scene::Scene(int width, int height, int maxTextureSize)
-    : m_distExp(600)
-    , m_frame(0)
-    , m_maxTextureSize(maxTextureSize)
-    , m_currentShader(0)
-    , m_currentTexture(0)
-    , m_dynamicCubemap(false)
-    , m_updateAllCubemaps(true)
-    , m_box(nullptr)
-    , m_vertexShader(nullptr)
-    , m_environmentShader(nullptr)
-    , m_environmentProgram(nullptr)
-{
-    setSceneRect(0, 0, width, height);
-
-    m_trackBalls[0] = TrackBall(0.05f, QVector3D(0, 1, 0), TrackBall::Sphere);
-    m_trackBalls[1] = TrackBall(0.005f, QVector3D(0, 0, 1), TrackBall::Sphere);
-    m_trackBalls[2] = TrackBall(0.0f, QVector3D(0, 1, 0), TrackBall::Plane);
-
-    m_renderOptions = new RenderOptionsDialog;
-    m_renderOptions->move(20, 120);
-    m_renderOptions->resize(m_renderOptions->sizeHint());
-
-    connect(m_renderOptions, &RenderOptionsDialog::dynamicCubemapToggled, this, &Scene::toggleDynamicCubemap);
-    connect(m_renderOptions, &RenderOptionsDialog::colorParameterChanged, this, &Scene::setColorParameter);
-    connect(m_renderOptions, &RenderOptionsDialog::floatParameterChanged, this, &Scene::setFloatParameter);
-    connect(m_renderOptions, &RenderOptionsDialog::textureChanged, this, &Scene::setTexture);
-    connect(m_renderOptions, &RenderOptionsDialog::shaderChanged, this, &Scene::setShader);
-
-    m_itemDialog = new ItemDialog;
-    connect(m_itemDialog, &ItemDialog::newItemTriggered, this, &Scene::newItem);
-
-    TwoSidedGraphicsWidget *twoSided = new TwoSidedGraphicsWidget(this);
-    twoSided->setWidget(0, m_renderOptions);
-    twoSided->setWidget(1, m_itemDialog);
-
-    connect(m_renderOptions, &RenderOptionsDialog::doubleClicked, twoSided, &TwoSidedGraphicsWidget::flip);
-    connect(m_itemDialog, &ItemDialog::doubleClicked, twoSided, &TwoSidedGraphicsWidget::flip);
-
-    addItem(new QtBox(64, width - 64, height - 64));
-    addItem(new QtBox(64, width - 64, 64));
-    addItem(new QtBox(64, 64, height - 64));
-    addItem(new QtBox(64, 64, 64));
-
-    initGL();
-
-    m_timer = new QTimer(this);
-    m_timer->setInterval(20);
-    connect(m_timer, &QTimer::timeout, this, [this](){ update(); });
-    m_timer->start();
-}
-
-Scene::~Scene()
-{
-    delete m_box;
-    qDeleteAll(m_textures);
-    delete m_mainCubemap;
-    qDeleteAll(m_programs);
-    delete m_vertexShader;
-    qDeleteAll(m_fragmentShaders);
-    qDeleteAll(m_cubemaps);
-    delete m_environmentShader;
-    delete m_environmentProgram;
-}
-
-void Scene::initGL()
-{
-    m_box = new GLRoundedBox(0.25f, 1.0f, 10);
-
-    m_vertexShader = new QGLShader(QGLShader::Vertex);
-    m_vertexShader->compileSourceFile(QLatin1String(":/res/boxes/basic.vsh"));
-
-    QStringList list;
-    list << ":/res/boxes/cubemap_posx.jpg" << ":/res/boxes/cubemap_negx.jpg" << ":/res/boxes/cubemap_posy.jpg"
-         << ":/res/boxes/cubemap_negy.jpg" << ":/res/boxes/cubemap_posz.jpg" << ":/res/boxes/cubemap_negz.jpg";
-    m_environment = new GLTextureCube(list, qMin(1024, m_maxTextureSize));
-    m_environmentShader = new QGLShader(QGLShader::Fragment);
-    m_environmentShader->compileSourceCode(environmentShaderText);
-    m_environmentProgram = new QGLShaderProgram;
-    m_environmentProgram->addShader(m_vertexShader);
-    m_environmentProgram->addShader(m_environmentShader);
-    m_environmentProgram->link();
-
-    const int NOISE_SIZE = 128; // for a different size, B and BM in fbm.c must also be changed
-    m_noise = new GLTexture3D(NOISE_SIZE, NOISE_SIZE, NOISE_SIZE);
-    QVector<QRgb> data(NOISE_SIZE * NOISE_SIZE * NOISE_SIZE, QRgb(0));
-    QRgb *p = data.data();
-    float pos[3];
-    for (int k = 0; k < NOISE_SIZE; ++k) {
-        pos[2] = k * (0x20 / (float)NOISE_SIZE);
-        for (int j = 0; j < NOISE_SIZE; ++j) {
-            for (int i = 0; i < NOISE_SIZE; ++i) {
-                for (int byte = 0; byte < 4; ++byte) {
-                    pos[0] = (i + (byte & 1) * 16) * (0x20 / (float)NOISE_SIZE);
-                    pos[1] = (j + (byte & 2) * 8) * (0x20 / (float)NOISE_SIZE);
-                    *p |= (int)(128.0f * (noise3(pos) + 1.0f)) << (byte * 8);
-                }
-                ++p;
-            }
-        }
-    }
-    m_noise->load(NOISE_SIZE, NOISE_SIZE, NOISE_SIZE, data.data());
-
-    m_mainCubemap = new GLRenderTargetCube(512);
-
-    QList<QFileInfo> files;
-
-    // Load all .png files as textures
-    m_currentTexture = 0;
-    files = QDir(":/res/boxes/").entryInfoList({ QStringLiteral("*.png") }, QDir::Files | QDir::Readable);
-
-    for (const QFileInfo &file : qAsConst(files)) {
-        GLTexture *texture = new GLTexture2D(file.absoluteFilePath(), qMin(256, m_maxTextureSize), qMin(256, m_maxTextureSize));
-        if (texture->failed()) {
-            delete texture;
-            continue;
-        }
-        m_textures << texture;
-        m_renderOptions->addTexture(file.baseName());
-    }
-
-    if (m_textures.size() == 0)
-        m_textures << new GLTexture2D(qMin(64, m_maxTextureSize), qMin(64, m_maxTextureSize));
-
-    // Load all .fsh files as fragment shaders
-    m_currentShader = 0;
-    files = QDir(":/res/boxes/").entryInfoList({ QStringLiteral("*.fsh") }, QDir::Files | QDir::Readable);
-    for (const QFileInfo &file : qAsConst(files)) {
-        QGLShaderProgram *program = new QGLShaderProgram;
-        QGLShader* shader = new QGLShader(QGLShader::Fragment);
-        shader->compileSourceFile(file.absoluteFilePath());
-        // The program does not take ownership over the shaders, so store them in a vector so they can be deleted afterwards.
-        program->addShader(m_vertexShader);
-        program->addShader(shader);
-        if (!program->link()) {
-            qWarning("Failed to compile and link shader program");
-            qWarning("Vertex shader log:");
-            qWarning() << m_vertexShader->log();
-            qWarning() << "Fragment shader log ( file =" << file.absoluteFilePath() << "):";
-            qWarning() << shader->log();
-            qWarning("Shader program log:");
-            qWarning() << program->log();
-
-            delete shader;
-            delete program;
-            continue;
-        }
-
-        m_fragmentShaders << shader;
-        m_programs << program;
-        m_renderOptions->addShader(file.baseName());
-
-        program->bind();
-        m_cubemaps << ((program->uniformLocation("env") != -1) ? new GLRenderTargetCube(qMin(256, m_maxTextureSize)) : nullptr);
-        program->release();
-    }
-
-    if (m_programs.size() == 0)
-        m_programs << new QGLShaderProgram;
-
-    m_renderOptions->emitParameterChanged();
-}
-
-static void loadMatrix(const QMatrix4x4 &m)
-{
-    // static to prevent glLoadMatrixf to fail on certain drivers
-    static GLfloat mat[16];
-    const float *data = m.constData();
-    for (int index = 0; index < 16; ++index)
-        mat[index] = data[index];
-    glLoadMatrixf(mat);
-}
-
-// If one of the boxes should not be rendered, set excludeBox to its index.
-// If the main box should not be rendered, set excludeBox to -1.
-void Scene::renderBoxes(const QMatrix4x4 &view, int excludeBox)
-{
-    QMatrix4x4 invView = view.inverted();
-
-    // If multi-texturing is supported, use three saplers.
-    if (glActiveTexture) {
-        glActiveTexture(GL_TEXTURE0);
-        m_textures[m_currentTexture]->bind();
-        glActiveTexture(GL_TEXTURE2);
-        m_noise->bind();
-        glActiveTexture(GL_TEXTURE1);
-    } else {
-        m_textures[m_currentTexture]->bind();
-    }
-
-    glDisable(GL_LIGHTING);
-    glDisable(GL_CULL_FACE);
-
-    QMatrix4x4 viewRotation(view);
-    viewRotation(3, 0) = viewRotation(3, 1) = viewRotation(3, 2) = 0.0f;
-    viewRotation(0, 3) = viewRotation(1, 3) = viewRotation(2, 3) = 0.0f;
-    viewRotation(3, 3) = 1.0f;
-    loadMatrix(viewRotation);
-    glScalef(20.0f, 20.0f, 20.0f);
-
-    // Don't render the environment if the environment texture can't be set for the correct sampler.
-    if (glActiveTexture) {
-        m_environment->bind();
-        m_environmentProgram->bind();
-        m_environmentProgram->setUniformValue("tex", GLint(0));
-        m_environmentProgram->setUniformValue("env", GLint(1));
-        m_environmentProgram->setUniformValue("noise", GLint(2));
-        m_box->draw();
-        m_environmentProgram->release();
-        m_environment->unbind();
-    }
-
-    loadMatrix(view);
-
-    glEnable(GL_CULL_FACE);
-    glEnable(GL_LIGHTING);
-
-    for (int i = 0; i < m_programs.size(); ++i) {
-        if (i == excludeBox)
-            continue;
-
-        glPushMatrix();
-        QMatrix4x4 m;
-        m.rotate(m_trackBalls[1].rotation());
-        glMultMatrixf(m.constData());
-
-        glRotatef(360.0f * i / m_programs.size(), 0.0f, 0.0f, 1.0f);
-        glTranslatef(2.0f, 0.0f, 0.0f);
-        glScalef(0.3f, 0.6f, 0.6f);
-
-        if (glActiveTexture) {
-            if (m_dynamicCubemap && m_cubemaps[i])
-                m_cubemaps[i]->bind();
-            else
-                m_environment->bind();
-        }
-        m_programs[i]->bind();
-        m_programs[i]->setUniformValue("tex", GLint(0));
-        m_programs[i]->setUniformValue("env", GLint(1));
-        m_programs[i]->setUniformValue("noise", GLint(2));
-        m_programs[i]->setUniformValue("view", view);
-        m_programs[i]->setUniformValue("invView", invView);
-        m_box->draw();
-        m_programs[i]->release();
-
-        if (glActiveTexture) {
-            if (m_dynamicCubemap && m_cubemaps[i])
-                m_cubemaps[i]->unbind();
-            else
-                m_environment->unbind();
-        }
-        glPopMatrix();
-    }
-
-    if (-1 != excludeBox) {
-        QMatrix4x4 m;
-        m.rotate(m_trackBalls[0].rotation());
-        glMultMatrixf(m.constData());
-
-        if (glActiveTexture) {
-            if (m_dynamicCubemap)
-                m_mainCubemap->bind();
-            else
-                m_environment->bind();
-        }
-
-        m_programs[m_currentShader]->bind();
-        m_programs[m_currentShader]->setUniformValue("tex", GLint(0));
-        m_programs[m_currentShader]->setUniformValue("env", GLint(1));
-        m_programs[m_currentShader]->setUniformValue("noise", GLint(2));
-        m_programs[m_currentShader]->setUniformValue("view", view);
-        m_programs[m_currentShader]->setUniformValue("invView", invView);
-        m_box->draw();
-        m_programs[m_currentShader]->release();
-
-        if (glActiveTexture) {
-            if (m_dynamicCubemap)
-                m_mainCubemap->unbind();
-            else
-                m_environment->unbind();
-        }
-    }
-
-    if (glActiveTexture) {
-        glActiveTexture(GL_TEXTURE2);
-        m_noise->unbind();
-        glActiveTexture(GL_TEXTURE0);
-    }
-    m_textures[m_currentTexture]->unbind();
-}
-
-void Scene::setStates()
-{
-    //glClearColor(0.25f, 0.25f, 0.5f, 1.0f);
-
-    glEnable(GL_DEPTH_TEST);
-    glEnable(GL_CULL_FACE);
-    glEnable(GL_LIGHTING);
-    //glEnable(GL_COLOR_MATERIAL);
-    glEnable(GL_TEXTURE_2D);
-    glEnable(GL_NORMALIZE);
-
-    glMatrixMode(GL_PROJECTION);
-    glPushMatrix();
-    glLoadIdentity();
-
-    glMatrixMode(GL_MODELVIEW);
-    glPushMatrix();
-    glLoadIdentity();
-
-    setLights();
-
-    float materialSpecular[] = {0.5f, 0.5f, 0.5f, 1.0f};
-    glMaterialfv(GL_FRONT_AND_BACK, GL_SPECULAR, materialSpecular);
-    glMaterialf(GL_FRONT_AND_BACK, GL_SHININESS, 32.0f);
-}
-
-void Scene::setLights()
-{
-    glColorMaterial(GL_FRONT_AND_BACK, GL_AMBIENT_AND_DIFFUSE);
-    //float lightColour[] = {1.0f, 1.0f, 1.0f, 1.0f};
-    float lightDir[] = {0.0f, 0.0f, 1.0f, 0.0f};
-    //glLightfv(GL_LIGHT0, GL_DIFFUSE, lightColour);
-    //glLightfv(GL_LIGHT0, GL_SPECULAR, lightColour);
-    glLightfv(GL_LIGHT0, GL_POSITION, lightDir);
-    glLightModelf(GL_LIGHT_MODEL_LOCAL_VIEWER, 1.0f);
-    glEnable(GL_LIGHT0);
-}
-
-void Scene::defaultStates()
-{
-    //glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
-
-    glDisable(GL_DEPTH_TEST);
-    glDisable(GL_CULL_FACE);
-    glDisable(GL_LIGHTING);
-    //glDisable(GL_COLOR_MATERIAL);
-    glDisable(GL_TEXTURE_2D);
-    glDisable(GL_LIGHT0);
-    glDisable(GL_NORMALIZE);
-
-    glMatrixMode(GL_MODELVIEW);
-    glPopMatrix();
-
-    glMatrixMode(GL_PROJECTION);
-    glPopMatrix();
-
-    glLightModelf(GL_LIGHT_MODEL_LOCAL_VIEWER, 0.0f);
-    float defaultMaterialSpecular[] = {0.0f, 0.0f, 0.0f, 1.0f};
-    glMaterialfv(GL_FRONT_AND_BACK, GL_SPECULAR, defaultMaterialSpecular);
-    glMaterialf(GL_FRONT_AND_BACK, GL_SHININESS, 0.0f);
-}
-
-void Scene::renderCubemaps()
-{
-    // To speed things up, only update the cubemaps for the small cubes every N frames.
-    const int N = (m_updateAllCubemaps ? 1 : 3);
-
-    QMatrix4x4 mat;
-    GLRenderTargetCube::getProjectionMatrix(mat, 0.1f, 100.0f);
-
-    glMatrixMode(GL_PROJECTION);
-    glPushMatrix();
-    loadMatrix(mat);
-
-    glMatrixMode(GL_MODELVIEW);
-    glPushMatrix();
-
-    QVector3D center;
-
-    const float eachAngle = 2 * M_PI / m_cubemaps.size();
-    for (int i = m_frame % N; i < m_cubemaps.size(); i += N) {
-        if (0 == m_cubemaps[i])
-            continue;
-
-        float angle = i * eachAngle;
-
-        center = m_trackBalls[1].rotation().rotatedVector(QVector3D(std::cos(angle), std::sin(angle), 0.0f));
-
-        for (int face = 0; face < 6; ++face) {
-            m_cubemaps[i]->begin(face);
-
-            GLRenderTargetCube::getViewMatrix(mat, face);
-            QVector4D v = QVector4D(-center.x(), -center.y(), -center.z(), 1.0);
-            mat.setColumn(3, mat * v);
-
-            glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-            renderBoxes(mat, i);
-
-            m_cubemaps[i]->end();
-        }
-    }
-
-    for (int face = 0; face < 6; ++face) {
-        m_mainCubemap->begin(face);
-        GLRenderTargetCube::getViewMatrix(mat, face);
-
-        glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-        renderBoxes(mat, -1);
-
-        m_mainCubemap->end();
-    }
-
-    glPopMatrix();
-
-    glMatrixMode(GL_PROJECTION);
-    glPopMatrix();
-
-    m_updateAllCubemaps = false;
-}
-
-void Scene::drawBackground(QPainter *painter, const QRectF &)
-{
-    float width = float(painter->device()->width());
-    float height = float(painter->device()->height());
-
-    painter->beginNativePainting();
-    setStates();
-
-    if (m_dynamicCubemap)
-        renderCubemaps();
-
-    glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-
-    glMatrixMode(GL_PROJECTION);
-    qgluPerspective(60.0, width / height, 0.01, 15.0);
-
-    glMatrixMode(GL_MODELVIEW);
-
-    QMatrix4x4 view;
-    view.rotate(m_trackBalls[2].rotation());
-    view(2, 3) -= 2.0f * std::exp(m_distExp / 1200.0f);
-    renderBoxes(view);
-
-    defaultStates();
-    ++m_frame;
-
-    painter->endNativePainting();
-}
-
-QPointF Scene::pixelPosToViewPos(const QPointF& p)
-{
-    return QPointF(2.0 * float(p.x()) / width() - 1.0,
-                   1.0 - 2.0 * float(p.y()) / height());
-}
-
-void Scene::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
-{
-    QGraphicsScene::mouseMoveEvent(event);
-    if (event->isAccepted())
-        return;
-
-    if (event->buttons() & Qt::LeftButton) {
-        m_trackBalls[0].move(pixelPosToViewPos(event->scenePos()), m_trackBalls[2].rotation().conjugated());
-        event->accept();
-    } else {
-        m_trackBalls[0].release(pixelPosToViewPos(event->scenePos()), m_trackBalls[2].rotation().conjugated());
-    }
-
-    if (event->buttons() & Qt::RightButton) {
-        m_trackBalls[1].move(pixelPosToViewPos(event->scenePos()), m_trackBalls[2].rotation().conjugated());
-        event->accept();
-    } else {
-        m_trackBalls[1].release(pixelPosToViewPos(event->scenePos()), m_trackBalls[2].rotation().conjugated());
-    }
-
-    if (event->buttons() & Qt::MidButton) {
-        m_trackBalls[2].move(pixelPosToViewPos(event->scenePos()), QQuaternion());
-        event->accept();
-    } else {
-        m_trackBalls[2].release(pixelPosToViewPos(event->scenePos()), QQuaternion());
-    }
-}
-
-void Scene::mousePressEvent(QGraphicsSceneMouseEvent *event)
-{
-    QGraphicsScene::mousePressEvent(event);
-    if (event->isAccepted())
-        return;
-
-    if (event->buttons() & Qt::LeftButton) {
-        m_trackBalls[0].push(pixelPosToViewPos(event->scenePos()), m_trackBalls[2].rotation().conjugated());
-        event->accept();
-    }
-
-    if (event->buttons() & Qt::RightButton) {
-        m_trackBalls[1].push(pixelPosToViewPos(event->scenePos()), m_trackBalls[2].rotation().conjugated());
-        event->accept();
-    }
-
-    if (event->buttons() & Qt::MidButton) {
-        m_trackBalls[2].push(pixelPosToViewPos(event->scenePos()), QQuaternion());
-        event->accept();
-    }
-}
-
-void Scene::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
-{
-    QGraphicsScene::mouseReleaseEvent(event);
-    if (event->isAccepted())
-        return;
-
-    if (event->button() == Qt::LeftButton) {
-        m_trackBalls[0].release(pixelPosToViewPos(event->scenePos()), m_trackBalls[2].rotation().conjugated());
-        event->accept();
-    }
-
-    if (event->button() == Qt::RightButton) {
-        m_trackBalls[1].release(pixelPosToViewPos(event->scenePos()), m_trackBalls[2].rotation().conjugated());
-        event->accept();
-    }
-
-    if (event->button() == Qt::MidButton) {
-        m_trackBalls[2].release(pixelPosToViewPos(event->scenePos()), QQuaternion());
-        event->accept();
-    }
-}
-
-void Scene::wheelEvent(QGraphicsSceneWheelEvent * event)
-{
-    QGraphicsScene::wheelEvent(event);
-    if (!event->isAccepted()) {
-        m_distExp += event->delta();
-        if (m_distExp < -8 * 120)
-            m_distExp = -8 * 120;
-        if (m_distExp > 10 * 120)
-            m_distExp = 10 * 120;
-        event->accept();
-    }
-}
-
-void Scene::setShader(int index)
-{
-    if (index >= 0 && index < m_fragmentShaders.size())
-        m_currentShader = index;
-}
-
-void Scene::setTexture(int index)
-{
-    if (index >= 0 && index < m_textures.size())
-        m_currentTexture = index;
-}
-
-void Scene::toggleDynamicCubemap(int state)
-{
-    if ((m_dynamicCubemap = (state == Qt::Checked)))
-        m_updateAllCubemaps = true;
-}
-
-void Scene::setColorParameter(const QString &name, QRgb color)
-{
-    // set the color in all programs
-    for (QGLShaderProgram *program : qAsConst(m_programs)) {
-        program->bind();
-        program->setUniformValue(program->uniformLocation(name), QColor(color));
-        program->release();
-    }
-}
-
-void Scene::setFloatParameter(const QString &name, float value)
-{
-    // set the color in all programs
-    for (QGLShaderProgram *program : qAsConst(m_programs)) {
-        program->bind();
-        program->setUniformValue(program->uniformLocation(name), value);
-        program->release();
-    }
-}
-
-void Scene::newItem(ItemDialog::ItemType type)
-{
-    QSize size = sceneRect().size().toSize();
-    switch (type) {
-    case ItemDialog::QtBoxItem:
-        addItem(new QtBox(64, QRandomGenerator::global()->bounded(size.width() - 64) + 32,
-                          QRandomGenerator::global()->bounded(size.height() - 64) + 32));
-        break;
-    case ItemDialog::CircleItem:
-        addItem(new CircleItem(64, QRandomGenerator::global()->bounded(size.width() - 64) + 32,
-                               QRandomGenerator::global()->bounded(size.height() - 64) + 32));
-        break;
-    case ItemDialog::SquareItem:
-        addItem(new SquareItem(64, QRandomGenerator::global()->bounded(size.width() - 64) + 32,
-                               QRandomGenerator::global()->bounded(size.height() - 64) + 32));
-        break;
-    default:
-        break;
-    }
-}
diff --git a/examples/widgets/graphicsview/boxes/scene.h b/examples/widgets/graphicsview/boxes/scene.h
deleted file mode 100644
index 31bc3d7b66..0000000000
--- a/examples/widgets/graphicsview/boxes/scene.h
+++ /dev/null
@@ -1,246 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the demonstration applications of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, you may use this file under the terms of the BSD license
-** as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef SCENE_H
-#define SCENE_H
-
-#include "glbuffers.h"
-#include "glextensions.h"
-#include "gltrianglemesh.h"
-#include "qtbox.h"
-#include "roundedbox.h"
-#include "trackball.h"
-
-QT_BEGIN_NAMESPACE
-class QMatrix4x4;
-QT_END_NAMESPACE
-
-class ParameterEdit : public QWidget
-{
-public:
-    virtual void emitChange() = 0;
-};
-
-class ColorEdit : public ParameterEdit
-{
-    Q_OBJECT
-public:
-    ColorEdit(QRgb initialColor, int id);
-    QRgb color() const {return m_color;}
-    void emitChange() override { emit colorChanged(m_color, m_id); }
-public slots:
-    void editDone();
-signals:
-    void colorChanged(QRgb color, int id);
-protected:
-    void mousePressEvent(QMouseEvent *event) override;
-    void setColor(QRgb color); // also emits colorChanged()
-private:
-    QGraphicsScene *m_dialogParentScene;
-    QLineEdit *m_lineEdit;
-    QFrame *m_button;
-    QRgb m_color;
-    int m_id;
-};
-
-class FloatEdit : public ParameterEdit
-{
-    Q_OBJECT
-public:
-    FloatEdit(float initialValue, int id);
-    float value() const {return m_value;}
-    void emitChange() override { emit valueChanged(m_value, m_id); }
-public slots:
-    void editDone();
-signals:
-    void valueChanged(float value, int id);
-private:
-    QGraphicsScene *m_dialogParentScene;
-    QLineEdit *m_lineEdit;
-    float m_value;
-    int m_id;
-};
-
-class GraphicsWidget : public QGraphicsProxyWidget
-{
-public:
-    GraphicsWidget() : QGraphicsProxyWidget(nullptr, Qt::Window) {}
-protected:
-    QVariant itemChange(GraphicsItemChange change, const QVariant &value) override;
-    void resizeEvent(QGraphicsSceneResizeEvent *event) override;
-    void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;
-};
-
-class TwoSidedGraphicsWidget : public QObject
-{
-    Q_OBJECT
-public:
-    using QObject::QObject;
-    void setWidget(int index, QWidget *widget);
-    QWidget *widget(int index);
-public slots:
-    void flip();
-protected slots:
-    void animateFlip();
-private:
-    GraphicsWidget *m_proxyWidgets[2] = {nullptr, nullptr};
-    int m_current = 0;
-    int m_angle = 0; // angle in degrees
-    int m_delta = 0;
-};
-
-class RenderOptionsDialog : public QDialog
-{
-    Q_OBJECT
-public:
-    RenderOptionsDialog();
-    int addTexture(const QString &name);
-    int addShader(const QString &name);
-    void emitParameterChanged();
-protected slots:
-    void setColorParameter(QRgb color, int id);
-    void setFloatParameter(float value, int id);
-signals:
-    void dynamicCubemapToggled(int);
-    void colorParameterChanged(const QString &, QRgb);
-    void floatParameterChanged(const QString &, float);
-    void textureChanged(int);
-    void shaderChanged(int);
-    void doubleClicked();
-protected:
-    void mouseDoubleClickEvent(QMouseEvent *event) override;
-
-    QVector<QByteArray> m_parameterNames;
-    QComboBox *m_textureCombo;
-    QComboBox *m_shaderCombo;
-    QVector<ParameterEdit *> m_parameterEdits;
-};
-
-class ItemDialog : public QDialog
-{
-    Q_OBJECT
-public:
-    enum ItemType {
-        QtBoxItem,
-        CircleItem,
-        SquareItem,
-    };
-
-    ItemDialog();
-public slots:
-    void triggerNewQtBox();
-    void triggerNewCircleItem();
-    void triggerNewSquareItem();
-signals:
-    void doubleClicked();
-    void newItemTriggered(ItemDialog::ItemType type);
-protected:
-    void mouseDoubleClickEvent(QMouseEvent *event) override;
-};
-
-class Scene : public QGraphicsScene
-{
-    Q_OBJECT
-public:
-    Scene(int width, int height, int maxTextureSize);
-    ~Scene();
-    void drawBackground(QPainter *painter, const QRectF &rect) override;
-
-public slots:
-    void setShader(int index);
-    void setTexture(int index);
-    void toggleDynamicCubemap(int state);
-    void setColorParameter(const QString &name, QRgb color);
-    void setFloatParameter(const QString &name, float value);
-    void newItem(ItemDialog::ItemType type);
-protected:
-    void renderBoxes(const QMatrix4x4 &view, int excludeBox = -2);
-    void setStates();
-    void setLights();
-    void defaultStates();
-    void renderCubemaps();
-
-    void mousePressEvent(QGraphicsSceneMouseEvent *event) override;
-    void mouseReleaseEvent(QGraphicsSceneMouseEvent *event) override;
-    void mouseMoveEvent(QGraphicsSceneMouseEvent *event) override;
-    void wheelEvent(QGraphicsSceneWheelEvent * event) override;
-private:
-    void initGL();
-    QPointF pixelPosToViewPos(const QPointF& p);
-
-    int m_lastTime;
-    int m_mouseEventTime;
-    int m_distExp;
-    int m_frame;
-    int m_maxTextureSize;
-
-    int m_currentShader;
-    int m_currentTexture;
-    bool m_dynamicCubemap;
-    bool m_updateAllCubemaps;
-
-    RenderOptionsDialog *m_renderOptions;
-    ItemDialog *m_itemDialog;
-    QTimer *m_timer;
-    GLRoundedBox *m_box;
-    TrackBall m_trackBalls[3];
-    QVector<GLTexture *> m_textures;
-    GLTextureCube *m_environment;
-    GLTexture3D *m_noise;
-    GLRenderTargetCube *m_mainCubemap;
-    QVector<GLRenderTargetCube *> m_cubemaps;
-    QVector<QGLShaderProgram *> m_programs;
-    QGLShader *m_vertexShader;
-    QVector<QGLShader *> m_fragmentShaders;
-    QGLShader *m_environmentShader;
-    QGLShaderProgram *m_environmentProgram;
-};
-
-#endif
diff --git a/examples/widgets/graphicsview/boxes/smiley.png b/examples/widgets/graphicsview/boxes/smiley.png
deleted file mode 100644
index 41cfda6b23..0000000000
--- a/examples/widgets/graphicsview/boxes/smiley.png
+++ /dev/null
diff --git a/examples/widgets/graphicsview/boxes/square.jpg b/examples/widgets/graphicsview/boxes/square.jpg
deleted file mode 100644
index 03f53bd530..0000000000
--- a/examples/widgets/graphicsview/boxes/square.jpg
+++ /dev/null
diff --git a/examples/widgets/graphicsview/boxes/trackball.cpp b/examples/widgets/graphicsview/boxes/trackball.cpp
deleted file mode 100644
index b9dfc1fc7f..0000000000
--- a/examples/widgets/graphicsview/boxes/trackball.cpp
+++ /dev/null
@@ -1,159 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the demonstration applications of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, you may use this file under the terms of the BSD license
-** as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "trackball.h"
-#include "scene.h"
-
-//============================================================================//
-//                                  TrackBall                                 //
-//============================================================================//
-
-TrackBall::TrackBall(TrackMode mode)
-    : TrackBall(0, QVector3D(0, 1, 0), mode)
-{
-}
-
-TrackBall::TrackBall(float angularVelocity, const QVector3D& axis, TrackMode mode)
-    : m_axis(axis)
-    , m_angularVelocity(angularVelocity)
-    , m_mode(mode)
-{}
-
-void TrackBall::push(const QPointF& p, const QQuaternion &)
-{
-    m_rotation = rotation();
-    m_pressed = true;
-    m_lastTime = QTime::currentTime();
-    m_lastPos = p;
-    m_angularVelocity = 0.0f;
-}
-
-void TrackBall::move(const QPointF& p, const QQuaternion &transformation)
-{
-    if (!m_pressed)
-        return;
-
-    QTime currentTime = QTime::currentTime();
-    int msecs = m_lastTime.msecsTo(currentTime);
-    if (msecs <= 20)
-        return;
-
-    switch (m_mode) {
-    case Plane:
-        {
-            QLineF delta(m_lastPos, p);
-            const float angleDelta = qRadiansToDegrees(float(delta.length()));
-            m_angularVelocity = angleDelta / msecs;
-            m_axis = QVector3D(-delta.dy(), delta.dx(), 0.0f).normalized();
-            m_axis = transformation.rotatedVector(m_axis);
-            m_rotation = QQuaternion::fromAxisAndAngle(m_axis, angleDelta) * m_rotation;
-        }
-        break;
-    case Sphere:
-        {
-            QVector3D lastPos3D = QVector3D(m_lastPos.x(), m_lastPos.y(), 0.0f);
-            float sqrZ = 1 - QVector3D::dotProduct(lastPos3D, lastPos3D);
-            if (sqrZ > 0)
-                lastPos3D.setZ(std::sqrt(sqrZ));
-            else
-                lastPos3D.normalize();
-
-            QVector3D currentPos3D = QVector3D(p.x(), p.y(), 0.0f);
-            sqrZ = 1 - QVector3D::dotProduct(currentPos3D, currentPos3D);
-            if (sqrZ > 0)
-                currentPos3D.setZ(std::sqrt(sqrZ));
-            else
-                currentPos3D.normalize();
-
-            m_axis = QVector3D::crossProduct(lastPos3D, currentPos3D);
-            float angle = qRadiansToDegrees(std::asin(m_axis.length()));
-
-            m_angularVelocity = angle / msecs;
-            m_axis.normalize();
-            m_axis = transformation.rotatedVector(m_axis);
-            m_rotation = QQuaternion::fromAxisAndAngle(m_axis, angle) * m_rotation;
-        }
-        break;
-    }
-
-
-    m_lastPos = p;
-    m_lastTime = currentTime;
-}
-
-void TrackBall::release(const QPointF& p, const QQuaternion &transformation)
-{
-    // Calling move() caused the rotation to stop if the framerate was too low.
-    move(p, transformation);
-    m_pressed = false;
-}
-
-void TrackBall::start()
-{
-    m_lastTime = QTime::currentTime();
-    m_paused = false;
-}
-
-void TrackBall::stop()
-{
-    m_rotation = rotation();
-    m_paused = true;
-}
-
-QQuaternion TrackBall::rotation() const
-{
-    if (m_paused || m_pressed)
-        return m_rotation;
-
-    QTime currentTime = QTime::currentTime();
-    float angle = m_angularVelocity * m_lastTime.msecsTo(currentTime);
-    return QQuaternion::fromAxisAndAngle(m_axis, angle) * m_rotation;
-}
-
diff --git a/examples/widgets/graphicsview/boxes/trackball.h b/examples/widgets/graphicsview/boxes/trackball.h
deleted file mode 100644
index af90e4d842..0000000000
--- a/examples/widgets/graphicsview/boxes/trackball.h
+++ /dev/null
@@ -1,87 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the demonstration applications of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, you may use this file under the terms of the BSD license
-** as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef TRACKBALL_H
-#define TRACKBALL_H
-
-#include <QQuaternion>
-#include <QTime>
-#include <QVector3D>
-
-class TrackBall
-{
-public:
-    enum TrackMode
-    {
-        Plane,
-        Sphere,
-    };
-    TrackBall(TrackMode mode = Sphere);
-    TrackBall(float angularVelocity, const QVector3D &axis, TrackMode mode = Sphere);
-    // coordinates in [-1,1]x[-1,1]
-    void push(const QPointF &p, const QQuaternion &transformation);
-    void move(const QPointF &p, const QQuaternion &transformation);
-    void release(const QPointF &p, const QQuaternion &transformation);
-    void start(); // starts clock
-    void stop(); // stops clock
-    QQuaternion rotation() const;
-private:
-    QQuaternion m_rotation;
-    QVector3D m_axis = QVector3D(0, 1, 0);
-    float m_angularVelocity = 0;
-
-    QPointF m_lastPos;
-    QTime m_lastTime = QTime::currentTime();
-    TrackMode m_mode;
-    bool m_paused = false;
-    bool m_pressed = false;
-};
-
-#endif
diff --git a/examples/widgets/graphicsview/boxes/wood.fsh b/examples/widgets/graphicsview/boxes/wood.fsh
deleted file mode 100644
index fbb5195f3a..0000000000
--- a/examples/widgets/graphicsview/boxes/wood.fsh
+++ /dev/null
@@ -1,79 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the demonstration applications of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, you may use this file under the terms of the BSD license
-** as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-varying vec3 position, normal;
-varying vec4 specular, ambient, diffuse, lightDirection;
-
-uniform sampler2D tex;
-uniform sampler3D noise;
-
-//const vec4 woodColors[2] = {vec4(0.37,0.24,0.20,1), vec4(0.8,0.6,0.4,1)};
-uniform vec4 woodColors[2];
-//const float woodTubulence = 0.1;
-uniform float woodTubulence;
-
-void main()
-{
-    float r = length(gl_TexCoord[1].yz);
-    r += woodTubulence * texture3D(noise, 0.25 * gl_TexCoord[1].xyz).x;
-
-    vec3 N = normalize(normal);
-    // assume directional light
-
-    gl_MaterialParameters M = gl_FrontMaterial;
-
-    float NdotL = dot(N, lightDirection.xyz);
-    float RdotL = dot(reflect(normalize(position), N), lightDirection.xyz);
-
-    float f = fract(16.0 * r);
-    vec4 unlitColor = mix(woodColors[0], woodColors[1], min(1.25 * f, 5.0 - 5.0 * f));
-    gl_FragColor = (ambient + diffuse * max(NdotL, 0.0)) * unlitColor +
-                    M.specular * specular * pow(max(RdotL, 0.0), M.shininess);
-}
diff --git a/examples/widgets/graphicsview/chip/.prev_CMakeLists.txt b/examples/widgets/graphicsview/chip/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..b82c3eced8
--- /dev/null
+++ b/examples/widgets/graphicsview/chip/.prev_CMakeLists.txt
@@ -0,0 +1,58 @@
+# Generated from chip.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(chip LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/graphicsview/chip")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(chip
+    chip.cpp chip.h
+    main.cpp
+    mainwindow.cpp mainwindow.h
+    view.cpp view.h
+)
+target_link_libraries(chip PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+
+# Resources:
+set(images_resource_files
+    "fileprint.png"
+    "qt4logo.png"
+    "rotateleft.png"
+    "rotateright.png"
+    "zoomin.png"
+    "zoomout.png"
+)
+
+qt6_add_resources(chip "images"
+    PREFIX
+        "/"
+    FILES
+        ${images_resource_files}
+)
+
+if(TARGET Qt::PrintSupport)
+    target_link_libraries(chip PUBLIC
+        Qt::PrintSupport
+    )
+endif()
+
+install(TARGETS chip
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/graphicsview/chip/CMakeLists.txt b/examples/widgets/graphicsview/chip/CMakeLists.txt
new file mode 100644
index 0000000000..41af2553ee
--- /dev/null
+++ b/examples/widgets/graphicsview/chip/CMakeLists.txt
@@ -0,0 +1,60 @@
+# Generated from chip.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(chip LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/graphicsview/chip")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+find_package(Qt6 COMPONENTS OpenGL) # special case
+find_package(Qt6 COMPONENTS PrintSupport) # special case
+
+add_qt_gui_executable(chip
+    chip.cpp chip.h
+    main.cpp
+    mainwindow.cpp mainwindow.h
+    view.cpp view.h
+)
+target_link_libraries(chip PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+
+# Resources:
+set(images_resource_files
+    "fileprint.png"
+    "qt4logo.png"
+    "rotateleft.png"
+    "rotateright.png"
+    "zoomin.png"
+    "zoomout.png"
+)
+
+qt6_add_resources(chip "images"
+    PREFIX
+        "/"
+    FILES
+        ${images_resource_files}
+)
+
+if(TARGET Qt::PrintSupport)
+    target_link_libraries(chip PUBLIC
+        Qt::PrintSupport
+    )
+endif()
+
+install(TARGETS chip
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/graphicsview/chip/chip.pro b/examples/widgets/graphicsview/chip/chip.pro
index a46f07ce35..508928d026 100644
--- a/examples/widgets/graphicsview/chip/chip.pro
+++ b/examples/widgets/graphicsview/chip/chip.pro
@@ -6,7 +6,6 @@ SOURCES += mainwindow.cpp view.cpp chip.cpp
 
 QT += widgets
 qtHaveModule(printsupport): QT += printsupport
-qtHaveModule(opengl): QT += opengl
 
 build_all:!build_pass {
     CONFIG -= build_all
diff --git a/examples/widgets/graphicsview/chip/view.cpp b/examples/widgets/graphicsview/chip/view.cpp
index 3b1718bdbd..186b24655b 100644
--- a/examples/widgets/graphicsview/chip/view.cpp
+++ b/examples/widgets/graphicsview/chip/view.cpp
@@ -57,11 +57,7 @@
 #include <QPrintDialog>
 #endif
 #endif
-#ifndef QT_NO_OPENGL
-#include <QtOpenGL>
-#else
 #include <QtWidgets>
-#endif
 #include <QtMath>
 
 #if QT_CONFIG(wheelevent)
@@ -156,14 +152,6 @@ View::View(const QString &name, QWidget *parent)
     antialiasButton->setText(tr("Antialiasing"));
     antialiasButton->setCheckable(true);
     antialiasButton->setChecked(false);
-    openGlButton = new QToolButton;
-    openGlButton->setText(tr("OpenGL"));
-    openGlButton->setCheckable(true);
-#ifndef QT_NO_OPENGL
-    openGlButton->setEnabled(QGLFormat::hasOpenGL());
-#else
-    openGlButton->setEnabled(false);
-#endif
     printButton = new QToolButton;
     printButton->setIcon(QIcon(QPixmap(":/fileprint.png")));
 
@@ -179,7 +167,6 @@ View::View(const QString &name, QWidget *parent)
     labelLayout->addWidget(dragModeButton);
     labelLayout->addStretch();
     labelLayout->addWidget(antialiasButton);
-    labelLayout->addWidget(openGlButton);
     labelLayout->addWidget(printButton);
 
     QGridLayout *topLayout = new QGridLayout;
@@ -200,7 +187,6 @@ View::View(const QString &name, QWidget *parent)
     connect(selectModeButton, &QAbstractButton::toggled, this, &View::togglePointerMode);
     connect(dragModeButton, &QAbstractButton::toggled, this, &View::togglePointerMode);
     connect(antialiasButton, &QAbstractButton::toggled, this, &View::toggleAntialiasing);
-    connect(openGlButton, &QAbstractButton::toggled, this, &View::toggleOpenGL);
     connect(rotateLeftIcon, &QAbstractButton::clicked, this, &View::rotateLeft);
     connect(rotateRightIcon, &QAbstractButton::clicked, this, &View::rotateRight);
     connect(zoomInIcon, &QAbstractButton::clicked, this, &View::zoomIn);
@@ -250,13 +236,6 @@ void View::togglePointerMode()
     graphicsView->setInteractive(selectModeButton->isChecked());
 }
 
-void View::toggleOpenGL()
-{
-#ifndef QT_NO_OPENGL
-    graphicsView->setViewport(openGlButton->isChecked() ? new QGLWidget(QGLFormat(QGL::SampleBuffers)) : new QWidget);
-#endif
-}
-
 void View::toggleAntialiasing()
 {
     graphicsView->setRenderHint(QPainter::Antialiasing, antialiasButton->isChecked());
diff --git a/examples/widgets/graphicsview/chip/view.h b/examples/widgets/graphicsview/chip/view.h
index ea7bd414f5..b780702c34 100644
--- a/examples/widgets/graphicsview/chip/view.h
+++ b/examples/widgets/graphicsview/chip/view.h
@@ -94,7 +94,6 @@ private slots:
     void setResetButtonEnabled();
     void setupMatrix();
     void togglePointerMode();
-    void toggleOpenGL();
     void toggleAntialiasing();
     void print();
     void rotateLeft();
@@ -106,7 +105,6 @@ private:
     QLabel *label2;
     QToolButton *selectModeButton;
     QToolButton *dragModeButton;
-    QToolButton *openGlButton;
     QToolButton *antialiasButton;
     QToolButton *printButton;
     QToolButton *resetButton;
diff --git a/examples/widgets/graphicsview/collidingmice/CMakeLists.txt b/examples/widgets/graphicsview/collidingmice/CMakeLists.txt
new file mode 100644
index 0000000000..c2b0479e76
--- /dev/null
+++ b/examples/widgets/graphicsview/collidingmice/CMakeLists.txt
@@ -0,0 +1,45 @@
+# Generated from collidingmice.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(collidingmice LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/graphicsview/collidingmice")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(collidingmice
+    main.cpp
+    mouse.cpp mouse.h
+)
+target_link_libraries(collidingmice PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+
+# Resources:
+set(mice_resource_files
+    "images/cheese.jpg"
+)
+
+qt6_add_resources(collidingmice "mice"
+    PREFIX
+        "/"
+    FILES
+        ${mice_resource_files}
+)
+
+install(TARGETS collidingmice
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/graphicsview/diagramscene/CMakeLists.txt b/examples/widgets/graphicsview/diagramscene/CMakeLists.txt
new file mode 100644
index 0000000000..26afe90016
--- /dev/null
+++ b/examples/widgets/graphicsview/diagramscene/CMakeLists.txt
@@ -0,0 +1,63 @@
+# Generated from diagramscene.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(diagramscene LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/graphicsview/diagramscene")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(diagramscene
+    arrow.cpp arrow.h
+    diagramitem.cpp diagramitem.h
+    diagramscene.cpp diagramscene.h
+    diagramtextitem.cpp diagramtextitem.h
+    main.cpp
+    mainwindow.cpp mainwindow.h
+)
+target_link_libraries(diagramscene PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+
+# Resources:
+set(diagramscene_resource_files
+    "images/background1.png"
+    "images/background2.png"
+    "images/background3.png"
+    "images/background4.png"
+    "images/bold.png"
+    "images/bringtofront.png"
+    "images/delete.png"
+    "images/floodfill.png"
+    "images/italic.png"
+    "images/linecolor.png"
+    "images/linepointer.png"
+    "images/pointer.png"
+    "images/sendtoback.png"
+    "images/textpointer.png"
+    "images/underline.png"
+)
+
+qt6_add_resources(diagramscene "diagramscene"
+    PREFIX
+        "/"
+    FILES
+        ${diagramscene_resource_files}
+)
+
+install(TARGETS diagramscene
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/graphicsview/dragdroprobot/CMakeLists.txt b/examples/widgets/graphicsview/dragdroprobot/CMakeLists.txt
new file mode 100644
index 0000000000..db6c34065e
--- /dev/null
+++ b/examples/widgets/graphicsview/dragdroprobot/CMakeLists.txt
@@ -0,0 +1,46 @@
+# Generated from dragdroprobot.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(dragdroprobot LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/graphicsview/dragdroprobot")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(dragdroprobot
+    coloritem.cpp coloritem.h
+    main.cpp
+    robot.cpp robot.h
+)
+target_link_libraries(dragdroprobot PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+
+# Resources:
+set(robot_resource_files
+    "images/head.png"
+)
+
+qt6_add_resources(dragdroprobot "robot"
+    PREFIX
+        "/"
+    FILES
+        ${robot_resource_files}
+)
+
+install(TARGETS dragdroprobot
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/graphicsview/elasticnodes/CMakeLists.txt b/examples/widgets/graphicsview/elasticnodes/CMakeLists.txt
new file mode 100644
index 0000000000..5dc52c9755
--- /dev/null
+++ b/examples/widgets/graphicsview/elasticnodes/CMakeLists.txt
@@ -0,0 +1,34 @@
+# Generated from elasticnodes.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(elasticnodes LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/graphicsview/elasticnodes")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(elasticnodes
+    edge.cpp edge.h
+    graphwidget.cpp graphwidget.h
+    main.cpp
+    node.cpp node.h
+)
+target_link_libraries(elasticnodes PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+install(TARGETS elasticnodes
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/graphicsview/embeddeddialogs/CMakeLists.txt b/examples/widgets/graphicsview/embeddeddialogs/CMakeLists.txt
new file mode 100644
index 0000000000..0b9df4b4d6
--- /dev/null
+++ b/examples/widgets/graphicsview/embeddeddialogs/CMakeLists.txt
@@ -0,0 +1,46 @@
+# Generated from embeddeddialogs.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(embeddeddialogs LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/graphicsview/embeddeddialogs")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(embeddeddialogs
+    customproxy.cpp customproxy.h
+    embeddeddialog.cpp embeddeddialog.h embeddeddialog.ui
+    main.cpp
+)
+target_link_libraries(embeddeddialogs PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+
+# Resources:
+set(embeddeddialogs_resource_files
+    "No-Ones-Laughing-3.jpg"
+)
+
+qt6_add_resources(embeddeddialogs "embeddeddialogs"
+    PREFIX
+        "/"
+    FILES
+        ${embeddeddialogs_resource_files}
+)
+
+install(TARGETS embeddeddialogs
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/graphicsview/embeddeddialogs/embeddeddialog.cpp b/examples/widgets/graphicsview/embeddeddialogs/embeddeddialog.cpp
index 9fa24fcd17..2f1d9a330c 100644
--- a/examples/widgets/graphicsview/embeddeddialogs/embeddeddialog.cpp
+++ b/examples/widgets/graphicsview/embeddeddialogs/embeddeddialog.cpp
@@ -67,7 +67,7 @@ EmbeddedDialog::EmbeddedDialog(QWidget *parent)
             ui->style->setCurrentIndex(ui->style->count() - 1);
     }
 
-    connect(ui->layoutDirection, QOverload<int>::of(&QComboBox::activated),
+    connect(ui->layoutDirection, &QComboBox::activated,
             this, &EmbeddedDialog::layoutDirectionChanged);
     connect(ui->spacing, &QSlider::valueChanged,
             this, &EmbeddedDialog::spacingChanged);
diff --git a/examples/widgets/graphicsview/flowlayout/.prev_CMakeLists.txt b/examples/widgets/graphicsview/flowlayout/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..ce24a9fcb2
--- /dev/null
+++ b/examples/widgets/graphicsview/flowlayout/.prev_CMakeLists.txt
@@ -0,0 +1,33 @@
+# Generated from flowlayout.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(flowlayout LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/graphicsview/flowlayout")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(flowlayout
+    flowlayout.cpp flowlayout.h
+    main.cpp
+    window.cpp window.h
+)
+target_link_libraries(flowlayout PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+install(TARGETS flowlayout
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/graphicsview/flowlayout/CMakeLists.txt b/examples/widgets/graphicsview/flowlayout/CMakeLists.txt
new file mode 100644
index 0000000000..50f41f7782
--- /dev/null
+++ b/examples/widgets/graphicsview/flowlayout/CMakeLists.txt
@@ -0,0 +1,33 @@
+# Generated from flowlayout.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(flowlayout LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/graphicsview/graphicsview_flowlayout") # special case
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(graphicsview_flowlayout # special case: renamed flowlayout
+    flowlayout.cpp flowlayout.h
+    main.cpp
+    window.cpp window.h
+)
+target_link_libraries(graphicsview_flowlayout PUBLIC # special case
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+install(TARGETS graphicsview_flowlayout # special case: renamed flowlayout
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/graphicsview/graphicsview.pro b/examples/widgets/graphicsview/graphicsview.pro
index b9bef70a0e..d591450559 100644
--- a/examples/widgets/graphicsview/graphicsview.pro
+++ b/examples/widgets/graphicsview/graphicsview.pro
@@ -14,7 +14,3 @@ SUBDIRS       = \
               weatheranchorlayout
 
 contains(DEFINES, QT_NO_CURSOR)|!qtConfig(draganddrop): SUBDIRS -= dragdroprobot
-
-qtHaveModule(opengl):!qtConfig(opengles.):!qtConfig(dynamicgl) {
-    SUBDIRS += boxes
-}
diff --git a/examples/widgets/graphicsview/padnavigator/.prev_CMakeLists.txt b/examples/widgets/graphicsview/padnavigator/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..6514f07a5a
--- /dev/null
+++ b/examples/widgets/graphicsview/padnavigator/.prev_CMakeLists.txt
@@ -0,0 +1,64 @@
+# Generated from padnavigator.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(padnavigator LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/graphicsview/padnavigator")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_executable(padnavigator
+    flippablepad.cpp flippablepad.h
+    form.ui
+    main.cpp
+    padnavigator.cpp padnavigator.h
+    roundrectitem.cpp roundrectitem.h
+    splashitem.cpp splashitem.h
+)
+target_link_libraries(padnavigator PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+
+# Resources:
+set(padnavigator_resource_files
+    "images/artsfftscope.png"
+    "images/blue_angle_swirl.jpg"
+    "images/kontact_contacts.png"
+    "images/kontact_journal.png"
+    "images/kontact_mail.png"
+    "images/kontact_notes.png"
+    "images/kopeteavailable.png"
+    "images/metacontact_online.png"
+    "images/minitools.png"
+)
+
+qt6_add_resources(padnavigator "padnavigator"
+    PREFIX
+        "/"
+    FILES
+        ${padnavigator_resource_files}
+)
+
+if(TARGET Qt::OpenGL)
+    target_link_libraries(padnavigator PUBLIC
+        Qt::OpenGL
+        Qt::OpenGLWidgets
+    )
+endif()
+
+install(TARGETS padnavigator
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/graphicsview/padnavigator/CMakeLists.txt b/examples/widgets/graphicsview/padnavigator/CMakeLists.txt
new file mode 100644
index 0000000000..a84d3f08d1
--- /dev/null
+++ b/examples/widgets/graphicsview/padnavigator/CMakeLists.txt
@@ -0,0 +1,65 @@
+# Generated from padnavigator.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(padnavigator LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/graphicsview/padnavigator")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+find_package(Qt6 COMPONENTS OpenGL) # special case
+
+add_executable(padnavigator
+    flippablepad.cpp flippablepad.h
+    form.ui
+    main.cpp
+    padnavigator.cpp padnavigator.h
+    roundrectitem.cpp roundrectitem.h
+    splashitem.cpp splashitem.h
+)
+target_link_libraries(padnavigator PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+
+# Resources:
+set(padnavigator_resource_files
+    "images/artsfftscope.png"
+    "images/blue_angle_swirl.jpg"
+    "images/kontact_contacts.png"
+    "images/kontact_journal.png"
+    "images/kontact_mail.png"
+    "images/kontact_notes.png"
+    "images/kopeteavailable.png"
+    "images/metacontact_online.png"
+    "images/minitools.png"
+)
+
+qt6_add_resources(padnavigator "padnavigator"
+    PREFIX
+        "/"
+    FILES
+        ${padnavigator_resource_files}
+)
+
+if(TARGET Qt::OpenGL)
+    target_link_libraries(padnavigator PUBLIC
+        Qt::OpenGL
+        Qt::OpenGLWidgets
+    )
+endif()
+
+install(TARGETS padnavigator
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/graphicsview/padnavigator/padnavigator.pro b/examples/widgets/graphicsview/padnavigator/padnavigator.pro
index 53a57c85d7..d957be4593 100644
--- a/examples/widgets/graphicsview/padnavigator/padnavigator.pro
+++ b/examples/widgets/graphicsview/padnavigator/padnavigator.pro
@@ -18,7 +18,7 @@ FORMS += \
 
 QT += widgets
 requires(qtConfig(treewidget))
-qtHaveModule(opengl): QT += opengl
+qtHaveModule(opengl): QT += opengl openglwidgets
 
 # install
 target.path = $$[QT_INSTALL_EXAMPLES]/widgets/graphicsview/padnavigator
diff --git a/examples/widgets/graphicsview/simpleanchorlayout/CMakeLists.txt b/examples/widgets/graphicsview/simpleanchorlayout/CMakeLists.txt
new file mode 100644
index 0000000000..c7ea760ede
--- /dev/null
+++ b/examples/widgets/graphicsview/simpleanchorlayout/CMakeLists.txt
@@ -0,0 +1,31 @@
+# Generated from simpleanchorlayout.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(simpleanchorlayout LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/graphicsview/simpleanchorlayout")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(simpleanchorlayout
+    main.cpp
+)
+target_link_libraries(simpleanchorlayout PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+install(TARGETS simpleanchorlayout
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/graphicsview/weatheranchorlayout/CMakeLists.txt b/examples/widgets/graphicsview/weatheranchorlayout/CMakeLists.txt
new file mode 100644
index 0000000000..d6ca46ab22
--- /dev/null
+++ b/examples/widgets/graphicsview/weatheranchorlayout/CMakeLists.txt
@@ -0,0 +1,49 @@
+# Generated from weatheranchorlayout.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(weatheranchorlayout LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/graphicsview/weatheranchorlayout")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(weatheranchorlayout
+    main.cpp
+)
+target_link_libraries(weatheranchorlayout PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+
+# Resources:
+set(weatheranchorlayout_resource_files
+    "images/5days.jpg"
+    "images/details.jpg"
+    "images/place.jpg"
+    "images/tabbar.jpg"
+    "images/title.jpg"
+    "images/weather-few-clouds.png"
+)
+
+qt6_add_resources(weatheranchorlayout "weatheranchorlayout"
+    PREFIX
+        "/"
+    FILES
+        ${weatheranchorlayout_resource_files}
+)
+
+install(TARGETS weatheranchorlayout
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/itemviews/CMakeLists.txt b/examples/widgets/itemviews/CMakeLists.txt
new file mode 100644
index 0000000000..a1bd0c4dca
--- /dev/null
+++ b/examples/widgets/itemviews/CMakeLists.txt
@@ -0,0 +1,27 @@
+# Generated from itemviews.pro.
+
+add_subdirectory(addressbook)
+add_subdirectory(basicsortfiltermodel)
+add_subdirectory(chart)
+add_subdirectory(coloreditorfactory)
+add_subdirectory(combowidgetmapper)
+add_subdirectory(customsortfiltermodel)
+add_subdirectory(dirview)
+add_subdirectory(editabletreemodel)
+add_subdirectory(fetchmore)
+add_subdirectory(flattreeview)
+add_subdirectory(frozencolumn)
+add_subdirectory(interview)
+add_subdirectory(pixelator)
+if(QT_FEATURE_draganddrop) # special case
+    add_subdirectory(puzzle)
+endif()
+if(TARGET Qt::Xml) # special case
+    add_subdirectory(simpledommodel)
+endif()
+add_subdirectory(simpletreemodel)
+add_subdirectory(simplewidgetmapper)
+add_subdirectory(spinboxdelegate)
+add_subdirectory(spreadsheet)
+add_subdirectory(stardelegate)
+add_subdirectory(storageview)
diff --git a/examples/widgets/itemviews/addressbook/CMakeLists.txt b/examples/widgets/itemviews/addressbook/CMakeLists.txt
new file mode 100644
index 0000000000..5c14da9ac5
--- /dev/null
+++ b/examples/widgets/itemviews/addressbook/CMakeLists.txt
@@ -0,0 +1,36 @@
+# Generated from addressbook.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(addressbook LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/itemviews/addressbook")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(addressbook
+    adddialog.cpp adddialog.h
+    addresswidget.cpp addresswidget.h
+    main.cpp
+    mainwindow.cpp mainwindow.h
+    newaddresstab.cpp newaddresstab.h
+    tablemodel.cpp tablemodel.h
+)
+target_link_libraries(addressbook PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+install(TARGETS addressbook
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/itemviews/basicsortfiltermodel/CMakeLists.txt b/examples/widgets/itemviews/basicsortfiltermodel/CMakeLists.txt
new file mode 100644
index 0000000000..90862ac0b0
--- /dev/null
+++ b/examples/widgets/itemviews/basicsortfiltermodel/CMakeLists.txt
@@ -0,0 +1,32 @@
+# Generated from basicsortfiltermodel.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(basicsortfiltermodel LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/itemviews/basicsortfiltermodel")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(basicsortfiltermodel
+    main.cpp
+    window.cpp window.h
+)
+target_link_libraries(basicsortfiltermodel PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+install(TARGETS basicsortfiltermodel
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/itemviews/basicsortfiltermodel/window.cpp b/examples/widgets/itemviews/basicsortfiltermodel/window.cpp
index b45ee47ee2..bfc9044724 100644
--- a/examples/widgets/itemviews/basicsortfiltermodel/window.cpp
+++ b/examples/widgets/itemviews/basicsortfiltermodel/window.cpp
@@ -89,9 +89,9 @@ Window::Window()
 
     connect(filterPatternLineEdit, &QLineEdit::textChanged,
             this, &Window::filterRegExpChanged);
-    connect(filterSyntaxComboBox, QOverload<int>::of(&QComboBox::currentIndexChanged),
+    connect(filterSyntaxComboBox, &QComboBox::currentIndexChanged,
             this, &Window::filterRegExpChanged);
-    connect(filterColumnComboBox, QOverload<int>::of(&QComboBox::currentIndexChanged),
+    connect(filterColumnComboBox, &QComboBox::currentIndexChanged,
             this, &Window::filterColumnChanged);
     connect(filterCaseSensitivityCheckBox, &QAbstractButton::toggled,
             this, &Window::filterRegExpChanged);
diff --git a/examples/widgets/itemviews/chart/CMakeLists.txt b/examples/widgets/itemviews/chart/CMakeLists.txt
new file mode 100644
index 0000000000..5788215de6
--- /dev/null
+++ b/examples/widgets/itemviews/chart/CMakeLists.txt
@@ -0,0 +1,52 @@
+# Generated from chart.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(chart LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/itemviews/chart")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(chart
+    main.cpp
+    mainwindow.cpp mainwindow.h
+    pieview.cpp pieview.h
+)
+target_link_libraries(chart PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+
+# Resources:
+set(chart_resource_files
+    "qtdata.cht"
+)
+
+qt6_add_resources(chart "chart"
+    PREFIX
+        "/Charts"
+    FILES
+        ${chart_resource_files}
+)
+
+if(UNIX AND NOT APPLE AND NOT HAIKU AND NOT INTEGRITY AND NOT VXWORKS)
+    target_link_libraries(chart PUBLIC
+        m
+    )
+endif()
+
+install(TARGETS chart
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/itemviews/coloreditorfactory/CMakeLists.txt b/examples/widgets/itemviews/coloreditorfactory/CMakeLists.txt
new file mode 100644
index 0000000000..3ec96a2fc4
--- /dev/null
+++ b/examples/widgets/itemviews/coloreditorfactory/CMakeLists.txt
@@ -0,0 +1,33 @@
+# Generated from coloreditorfactory.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(coloreditorfactory LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/itemviews/coloreditorfactory")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(coloreditorfactory
+    colorlisteditor.cpp colorlisteditor.h
+    main.cpp
+    window.cpp window.h
+)
+target_link_libraries(coloreditorfactory PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+install(TARGETS coloreditorfactory
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/itemviews/combowidgetmapper/CMakeLists.txt b/examples/widgets/itemviews/combowidgetmapper/CMakeLists.txt
new file mode 100644
index 0000000000..c8a0bc1438
--- /dev/null
+++ b/examples/widgets/itemviews/combowidgetmapper/CMakeLists.txt
@@ -0,0 +1,32 @@
+# Generated from combowidgetmapper.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(combowidgetmapper LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/itemviews/combowidgetmapper")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(combowidgetmapper
+    main.cpp
+    window.cpp window.h
+)
+target_link_libraries(combowidgetmapper PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+install(TARGETS combowidgetmapper
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/itemviews/customsortfiltermodel/CMakeLists.txt b/examples/widgets/itemviews/customsortfiltermodel/CMakeLists.txt
new file mode 100644
index 0000000000..859b88a397
--- /dev/null
+++ b/examples/widgets/itemviews/customsortfiltermodel/CMakeLists.txt
@@ -0,0 +1,47 @@
+# Generated from customsortfiltermodel.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(customsortfiltermodel LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/itemviews/customsortfiltermodel")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(customsortfiltermodel
+    filterwidget.cpp filterwidget.h
+    main.cpp
+    mysortfilterproxymodel.cpp mysortfilterproxymodel.h
+    window.cpp window.h
+)
+target_link_libraries(customsortfiltermodel PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+
+# Resources:
+set(customsortfiltermodel_resource_files
+    "images/find.png"
+)
+
+qt6_add_resources(customsortfiltermodel "customsortfiltermodel"
+    PREFIX
+        "/"
+    FILES
+        ${customsortfiltermodel_resource_files}
+)
+
+install(TARGETS customsortfiltermodel
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/itemviews/dirview/CMakeLists.txt b/examples/widgets/itemviews/dirview/CMakeLists.txt
new file mode 100644
index 0000000000..6cb902c092
--- /dev/null
+++ b/examples/widgets/itemviews/dirview/CMakeLists.txt
@@ -0,0 +1,31 @@
+# Generated from dirview.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(dirview LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/itemviews/dirview")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(dirview
+    main.cpp
+)
+target_link_libraries(dirview PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+install(TARGETS dirview
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/itemviews/editabletreemodel/CMakeLists.txt b/examples/widgets/itemviews/editabletreemodel/CMakeLists.txt
new file mode 100644
index 0000000000..faae8e1a80
--- /dev/null
+++ b/examples/widgets/itemviews/editabletreemodel/CMakeLists.txt
@@ -0,0 +1,47 @@
+# Generated from editabletreemodel.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(editabletreemodel LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/itemviews/editabletreemodel")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(editabletreemodel
+    main.cpp
+    mainwindow.cpp mainwindow.h mainwindow.ui
+    treeitem.cpp treeitem.h
+    treemodel.cpp treemodel.h
+)
+target_link_libraries(editabletreemodel PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+
+# Resources:
+set(editabletreemodel_resource_files
+    "default.txt"
+)
+
+qt6_add_resources(editabletreemodel "editabletreemodel"
+    PREFIX
+        "/"
+    FILES
+        ${editabletreemodel_resource_files}
+)
+
+install(TARGETS editabletreemodel
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/itemviews/fetchmore/CMakeLists.txt b/examples/widgets/itemviews/fetchmore/CMakeLists.txt
new file mode 100644
index 0000000000..fea985d049
--- /dev/null
+++ b/examples/widgets/itemviews/fetchmore/CMakeLists.txt
@@ -0,0 +1,33 @@
+# Generated from fetchmore.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(fetchmore LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/itemviews/fetchmore")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(fetchmore
+    filelistmodel.cpp filelistmodel.h
+    main.cpp
+    window.cpp window.h
+)
+target_link_libraries(fetchmore PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+install(TARGETS fetchmore
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/itemviews/flattreeview/CMakeLists.txt b/examples/widgets/itemviews/flattreeview/CMakeLists.txt
new file mode 100644
index 0000000000..c0c4ef6146
--- /dev/null
+++ b/examples/widgets/itemviews/flattreeview/CMakeLists.txt
@@ -0,0 +1,31 @@
+# Generated from flattreeview.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(flattreeview LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/itemviews/flattreeview")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(flattreeview
+    main.cpp
+)
+target_link_libraries(flattreeview PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+install(TARGETS flattreeview
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/itemviews/frozencolumn/CMakeLists.txt b/examples/widgets/itemviews/frozencolumn/CMakeLists.txt
new file mode 100644
index 0000000000..dab2e0a153
--- /dev/null
+++ b/examples/widgets/itemviews/frozencolumn/CMakeLists.txt
@@ -0,0 +1,45 @@
+# Generated from frozencolumn.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(frozencolumn LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/itemviews/frozencolumn")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(frozencolumn
+    freezetablewidget.cpp freezetablewidget.h
+    main.cpp
+)
+target_link_libraries(frozencolumn PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+
+# Resources:
+set(grades_resource_files
+    "grades.txt"
+)
+
+qt6_add_resources(frozencolumn "grades"
+    PREFIX
+        "/"
+    FILES
+        ${grades_resource_files}
+)
+
+install(TARGETS frozencolumn
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/itemviews/interview/CMakeLists.txt b/examples/widgets/itemviews/interview/CMakeLists.txt
new file mode 100644
index 0000000000..c27018ffa4
--- /dev/null
+++ b/examples/widgets/itemviews/interview/CMakeLists.txt
@@ -0,0 +1,47 @@
+# Generated from interview.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(interview LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/itemviews/interview")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(interview
+    main.cpp
+    model.cpp model.h
+)
+target_link_libraries(interview PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+
+# Resources:
+set(interview_resource_files
+    "images/folder.png"
+    "images/interview.png"
+    "images/services.png"
+)
+
+qt6_add_resources(interview "interview"
+    PREFIX
+        "/"
+    FILES
+        ${interview_resource_files}
+)
+
+install(TARGETS interview
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/itemviews/pixelator/.prev_CMakeLists.txt b/examples/widgets/itemviews/pixelator/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..1c8ccc6f81
--- /dev/null
+++ b/examples/widgets/itemviews/pixelator/.prev_CMakeLists.txt
@@ -0,0 +1,53 @@
+# Generated from pixelator.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(pixelator LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/itemviews/pixelator")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(pixelator
+    imagemodel.cpp imagemodel.h
+    main.cpp
+    mainwindow.cpp mainwindow.h
+    pixeldelegate.cpp pixeldelegate.h
+)
+target_link_libraries(pixelator PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+
+# Resources:
+set(images_resource_files
+    "images/qt.png"
+)
+
+qt6_add_resources(pixelator "images"
+    PREFIX
+        "/"
+    FILES
+        ${images_resource_files}
+)
+
+if(TARGET Qt::PrintSupport)
+    target_link_libraries(pixelator PUBLIC
+        Qt::PrintSupport
+    )
+endif()
+
+install(TARGETS pixelator
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/itemviews/pixelator/CMakeLists.txt b/examples/widgets/itemviews/pixelator/CMakeLists.txt
new file mode 100644
index 0000000000..aba494c31a
--- /dev/null
+++ b/examples/widgets/itemviews/pixelator/CMakeLists.txt
@@ -0,0 +1,54 @@
+# Generated from pixelator.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(pixelator LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/itemviews/pixelator")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+find_package(Qt6 COMPONENTS PrintSupport) # special case
+
+add_qt_gui_executable(pixelator
+    imagemodel.cpp imagemodel.h
+    main.cpp
+    mainwindow.cpp mainwindow.h
+    pixeldelegate.cpp pixeldelegate.h
+)
+target_link_libraries(pixelator PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+
+# Resources:
+set(images_resource_files
+    "images/qt.png"
+)
+
+qt6_add_resources(pixelator "images"
+    PREFIX
+        "/"
+    FILES
+        ${images_resource_files}
+)
+
+if(TARGET Qt::PrintSupport)
+    target_link_libraries(pixelator PUBLIC
+        Qt::PrintSupport
+    )
+endif()
+
+install(TARGETS pixelator
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/itemviews/pixelator/mainwindow.cpp b/examples/widgets/itemviews/pixelator/mainwindow.cpp
index abd4a8b1ab..e590a1397b 100644
--- a/examples/widgets/itemviews/pixelator/mainwindow.cpp
+++ b/examples/widgets/itemviews/pixelator/mainwindow.cpp
@@ -116,9 +116,9 @@ MainWindow::MainWindow()
     connect(quitAction, &QAction::triggered, qApp, &QCoreApplication::quit);
     connect(aboutAction, &QAction::triggered, this, &MainWindow::showAboutBox);
 //! [4]
-    connect(pixelSizeSpinBox, QOverload<int>::of(&QSpinBox::valueChanged),
+    connect(pixelSizeSpinBox, &QSpinBox::valueChanged,
             delegate, &PixelDelegate::setPixelSize);
-    connect(pixelSizeSpinBox, QOverload<int>::of(&QSpinBox::valueChanged),
+    connect(pixelSizeSpinBox, &QSpinBox::valueChanged,
             this, &MainWindow::updateView);
 //! [4]
 
diff --git a/examples/widgets/itemviews/puzzle/.prev_CMakeLists.txt b/examples/widgets/itemviews/puzzle/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..17765e9d47
--- /dev/null
+++ b/examples/widgets/itemviews/puzzle/.prev_CMakeLists.txt
@@ -0,0 +1,47 @@
+# Generated from puzzle.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(puzzle LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/itemviews/puzzle")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(puzzle
+    main.cpp
+    mainwindow.cpp mainwindow.h
+    piecesmodel.cpp piecesmodel.h
+    puzzlewidget.cpp puzzlewidget.h
+)
+target_link_libraries(puzzle PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+
+# Resources:
+set(puzzle_resource_files
+    "example.jpg"
+)
+
+qt6_add_resources(puzzle "puzzle"
+    PREFIX
+        "/images"
+    FILES
+        ${puzzle_resource_files}
+)
+
+install(TARGETS puzzle
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/itemviews/puzzle/CMakeLists.txt b/examples/widgets/itemviews/puzzle/CMakeLists.txt
new file mode 100644
index 0000000000..53494d37f1
--- /dev/null
+++ b/examples/widgets/itemviews/puzzle/CMakeLists.txt
@@ -0,0 +1,47 @@
+# Generated from puzzle.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(puzzle LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/itemviews/puzzle")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(itemviews_puzzle # special case: renamed puzzle
+    main.cpp
+    mainwindow.cpp mainwindow.h
+    piecesmodel.cpp piecesmodel.h
+    puzzlewidget.cpp puzzlewidget.h
+)
+target_link_libraries(itemviews_puzzle PUBLIC # special case
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+
+# Resources:
+set(puzzle_resource_files
+    "example.jpg"
+)
+
+qt6_add_resources(itemviews_puzzle "puzzle"
+    PREFIX
+        "/images"
+    FILES
+        ${puzzle_resource_files}
+)
+
+install(TARGETS itemviews_puzzle # special case: renamed puzzle
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/itemviews/simpledommodel/CMakeLists.txt b/examples/widgets/itemviews/simpledommodel/CMakeLists.txt
new file mode 100644
index 0000000000..e22e3fe1ad
--- /dev/null
+++ b/examples/widgets/itemviews/simpledommodel/CMakeLists.txt
@@ -0,0 +1,36 @@
+# Generated from simpledommodel.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(simpledommodel LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/itemviews/simpledommodel")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Xml)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(simpledommodel
+    domitem.cpp domitem.h
+    dommodel.cpp dommodel.h
+    main.cpp
+    mainwindow.cpp mainwindow.h
+)
+target_link_libraries(simpledommodel PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+    Qt::Xml
+)
+
+install(TARGETS simpledommodel
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/itemviews/simpletreemodel/CMakeLists.txt b/examples/widgets/itemviews/simpletreemodel/CMakeLists.txt
new file mode 100644
index 0000000000..8a6607e584
--- /dev/null
+++ b/examples/widgets/itemviews/simpletreemodel/CMakeLists.txt
@@ -0,0 +1,46 @@
+# Generated from simpletreemodel.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(simpletreemodel LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/itemviews/simpletreemodel")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(simpletreemodel
+    main.cpp
+    treeitem.cpp treeitem.h
+    treemodel.cpp treemodel.h
+)
+target_link_libraries(simpletreemodel PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+
+# Resources:
+set(simpletreemodel_resource_files
+    "default.txt"
+)
+
+qt6_add_resources(simpletreemodel "simpletreemodel"
+    PREFIX
+        "/"
+    FILES
+        ${simpletreemodel_resource_files}
+)
+
+install(TARGETS simpletreemodel
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/itemviews/simplewidgetmapper/CMakeLists.txt b/examples/widgets/itemviews/simplewidgetmapper/CMakeLists.txt
new file mode 100644
index 0000000000..163dc98e2c
--- /dev/null
+++ b/examples/widgets/itemviews/simplewidgetmapper/CMakeLists.txt
@@ -0,0 +1,32 @@
+# Generated from simplewidgetmapper.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(simplewidgetmapper LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/itemviews/simplewidgetmapper")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(simplewidgetmapper
+    main.cpp
+    window.cpp window.h
+)
+target_link_libraries(simplewidgetmapper PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+install(TARGETS simplewidgetmapper
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/itemviews/spinboxdelegate/CMakeLists.txt b/examples/widgets/itemviews/spinboxdelegate/CMakeLists.txt
new file mode 100644
index 0000000000..b73158cd5a
--- /dev/null
+++ b/examples/widgets/itemviews/spinboxdelegate/CMakeLists.txt
@@ -0,0 +1,32 @@
+# Generated from spinboxdelegate.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(spinboxdelegate LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/itemviews/spinboxdelegate")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(spinboxdelegate
+    delegate.cpp delegate.h
+    main.cpp
+)
+target_link_libraries(spinboxdelegate PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+install(TARGETS spinboxdelegate
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/itemviews/spreadsheet/.prev_CMakeLists.txt b/examples/widgets/itemviews/spreadsheet/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..acf5f187fe
--- /dev/null
+++ b/examples/widgets/itemviews/spreadsheet/.prev_CMakeLists.txt
@@ -0,0 +1,54 @@
+# Generated from spreadsheet.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(spreadsheet LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/itemviews/spreadsheet")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(spreadsheet
+    main.cpp
+    printview.cpp printview.h
+    spreadsheet.cpp spreadsheet.h
+    spreadsheetdelegate.cpp spreadsheetdelegate.h
+    spreadsheetitem.cpp spreadsheetitem.h
+)
+target_link_libraries(spreadsheet PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+
+# Resources:
+set(spreadsheet_resource_files
+    "images/interview.png"
+)
+
+qt6_add_resources(spreadsheet "spreadsheet"
+    PREFIX
+        "/"
+    FILES
+        ${spreadsheet_resource_files}
+)
+
+if(TARGET Qt::PrintSupport)
+    target_link_libraries(spreadsheet PUBLIC
+        Qt::PrintSupport
+    )
+endif()
+
+install(TARGETS spreadsheet
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/itemviews/spreadsheet/CMakeLists.txt b/examples/widgets/itemviews/spreadsheet/CMakeLists.txt
new file mode 100644
index 0000000000..b1fc6ff01a
--- /dev/null
+++ b/examples/widgets/itemviews/spreadsheet/CMakeLists.txt
@@ -0,0 +1,60 @@
+# Generated from spreadsheet.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(spreadsheet LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/itemviews/spreadsheet")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+find_package(Qt6 COMPONENTS PrintSupport) # special case
+
+add_qt_gui_executable(spreadsheet
+    main.cpp
+    printview.cpp printview.h
+    spreadsheet.cpp spreadsheet.h
+    spreadsheetdelegate.cpp spreadsheetdelegate.h
+    spreadsheetitem.cpp spreadsheetitem.h
+)
+target_link_libraries(spreadsheet PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+# special case begin
+if (TARGET Qt::PrintSupport)
+    target_link_libraries(spreadsheet PUBLIC Qt::PrintSupport)
+endif()
+# special case end
+
+
+# Resources:
+set(spreadsheet_resource_files
+    "images/interview.png"
+)
+
+qt6_add_resources(spreadsheet "spreadsheet"
+    PREFIX
+        "/"
+    FILES
+        ${spreadsheet_resource_files}
+)
+
+if(TARGET Qt::PrintSupport)
+    target_link_libraries(spreadsheet PUBLIC
+        Qt::PrintSupport
+    )
+endif()
+
+install(TARGETS spreadsheet
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/itemviews/stardelegate/CMakeLists.txt b/examples/widgets/itemviews/stardelegate/CMakeLists.txt
new file mode 100644
index 0000000000..5f6f660488
--- /dev/null
+++ b/examples/widgets/itemviews/stardelegate/CMakeLists.txt
@@ -0,0 +1,34 @@
+# Generated from stardelegate.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(stardelegate LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/itemviews/stardelegate")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(stardelegate
+    main.cpp
+    stardelegate.cpp stardelegate.h
+    stareditor.cpp stareditor.h
+    starrating.cpp starrating.h
+)
+target_link_libraries(stardelegate PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+install(TARGETS stardelegate
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/itemviews/storageview/CMakeLists.txt b/examples/widgets/itemviews/storageview/CMakeLists.txt
new file mode 100644
index 0000000000..99b4f13861
--- /dev/null
+++ b/examples/widgets/itemviews/storageview/CMakeLists.txt
@@ -0,0 +1,32 @@
+# Generated from storageview.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(storageview LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/itemviews/storageview")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(storageview
+    main.cpp
+    storagemodel.cpp storagemodel.h
+)
+target_link_libraries(storageview PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+install(TARGETS storageview
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/layouts/CMakeLists.txt b/examples/widgets/layouts/CMakeLists.txt
new file mode 100644
index 0000000000..eaca669248
--- /dev/null
+++ b/examples/widgets/layouts/CMakeLists.txt
@@ -0,0 +1,6 @@
+# Generated from layouts.pro.
+
+add_subdirectory(basiclayouts)
+add_subdirectory(borderlayout)
+add_subdirectory(dynamiclayouts)
+add_subdirectory(flowlayout)
diff --git a/examples/widgets/layouts/basiclayouts/CMakeLists.txt b/examples/widgets/layouts/basiclayouts/CMakeLists.txt
new file mode 100644
index 0000000000..beb8a0ca90
--- /dev/null
+++ b/examples/widgets/layouts/basiclayouts/CMakeLists.txt
@@ -0,0 +1,32 @@
+# Generated from basiclayouts.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(basiclayouts LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/layouts/basiclayouts")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(basiclayouts
+    dialog.cpp dialog.h
+    main.cpp
+)
+target_link_libraries(basiclayouts PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+install(TARGETS basiclayouts
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/layouts/borderlayout/CMakeLists.txt b/examples/widgets/layouts/borderlayout/CMakeLists.txt
new file mode 100644
index 0000000000..f4e51d2fab
--- /dev/null
+++ b/examples/widgets/layouts/borderlayout/CMakeLists.txt
@@ -0,0 +1,33 @@
+# Generated from borderlayout.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(borderlayout LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/layouts/borderlayout")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(borderlayout
+    borderlayout.cpp borderlayout.h
+    main.cpp
+    window.cpp window.h
+)
+target_link_libraries(borderlayout PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+install(TARGETS borderlayout
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/layouts/dynamiclayouts/CMakeLists.txt b/examples/widgets/layouts/dynamiclayouts/CMakeLists.txt
new file mode 100644
index 0000000000..c2bcd050d5
--- /dev/null
+++ b/examples/widgets/layouts/dynamiclayouts/CMakeLists.txt
@@ -0,0 +1,32 @@
+# Generated from dynamiclayouts.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(dynamiclayouts LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/layouts/dynamiclayouts")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(dynamiclayouts
+    dialog.cpp dialog.h
+    main.cpp
+)
+target_link_libraries(dynamiclayouts PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+install(TARGETS dynamiclayouts
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/layouts/dynamiclayouts/dialog.cpp b/examples/widgets/layouts/dynamiclayouts/dialog.cpp
index baf3b4cf1e..bd9baa9faf 100644
--- a/examples/widgets/layouts/dynamiclayouts/dialog.cpp
+++ b/examples/widgets/layouts/dynamiclayouts/dialog.cpp
@@ -155,7 +155,7 @@ void Dialog::createOptionsGroupBox()
     buttonsOrientationComboBox->addItem(tr("Vertical"), Qt::Vertical);
 
     connect(buttonsOrientationComboBox,
-            QOverload<int>::of(&QComboBox::currentIndexChanged),
+            &QComboBox::currentIndexChanged,
             this,
             &Dialog::buttonsOrientationChanged);
 
diff --git a/examples/widgets/layouts/flowlayout/CMakeLists.txt b/examples/widgets/layouts/flowlayout/CMakeLists.txt
new file mode 100644
index 0000000000..85104eb3eb
--- /dev/null
+++ b/examples/widgets/layouts/flowlayout/CMakeLists.txt
@@ -0,0 +1,33 @@
+# Generated from flowlayout.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(flowlayout LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/layouts/flowlayout")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(flowlayout
+    flowlayout.cpp flowlayout.h
+    main.cpp
+    window.cpp window.h
+)
+target_link_libraries(flowlayout PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+install(TARGETS flowlayout
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/mac/CMakeLists.txt b/examples/widgets/mac/CMakeLists.txt
new file mode 100644
index 0000000000..82038acfae
--- /dev/null
+++ b/examples/widgets/mac/CMakeLists.txt
@@ -0,0 +1,7 @@
+# Generated from mac.pro.
+
+
+if(APPLE_OSX)
+    add_subdirectory(qmaccocoaviewcontainer)
+    add_subdirectory(qmacnativewidget)
+endif()
diff --git a/examples/widgets/mac/qmaccocoaviewcontainer/CMakeLists.txt b/examples/widgets/mac/qmaccocoaviewcontainer/CMakeLists.txt
new file mode 100644
index 0000000000..158ddc3adf
--- /dev/null
+++ b/examples/widgets/mac/qmaccocoaviewcontainer/CMakeLists.txt
@@ -0,0 +1,32 @@
+# Generated from qmaccocoaviewcontainer.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(qmaccocoaviewcontainer LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/mac/qmaccocoaviewcontainer")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(qmaccocoaviewcontainer
+    main.mm
+)
+target_link_libraries(qmaccocoaviewcontainer PUBLIC
+    "-framework AppKit"
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+install(TARGETS qmaccocoaviewcontainer
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/mac/qmacnativewidget/CMakeLists.txt b/examples/widgets/mac/qmacnativewidget/CMakeLists.txt
new file mode 100644
index 0000000000..5ed3e0f4cc
--- /dev/null
+++ b/examples/widgets/mac/qmacnativewidget/CMakeLists.txt
@@ -0,0 +1,32 @@
+# Generated from qmacnativewidget.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(qmacnativewidget LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/mac/qmacnativewidget")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(qmacnativewidget
+    main.mm
+)
+target_link_libraries(qmacnativewidget PUBLIC
+    "-framework AppKit"
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+install(TARGETS qmacnativewidget
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/mainwindows/CMakeLists.txt b/examples/widgets/mainwindows/CMakeLists.txt
new file mode 100644
index 0000000000..8bb5f52f92
--- /dev/null
+++ b/examples/widgets/mainwindows/CMakeLists.txt
@@ -0,0 +1,8 @@
+# Generated from mainwindows.pro.
+
+add_subdirectory(application)
+add_subdirectory(dockwidgets)
+add_subdirectory(mainwindow)
+add_subdirectory(mdi)
+add_subdirectory(menus)
+add_subdirectory(sdi)
diff --git a/examples/widgets/mainwindows/application/CMakeLists.txt b/examples/widgets/mainwindows/application/CMakeLists.txt
new file mode 100644
index 0000000000..d66c2ff38a
--- /dev/null
+++ b/examples/widgets/mainwindows/application/CMakeLists.txt
@@ -0,0 +1,50 @@
+# Generated from application.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(application LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/mainwindows/application")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(application
+    main.cpp
+    mainwindow.cpp mainwindow.h
+)
+target_link_libraries(application PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+
+# Resources:
+set(application_resource_files
+    "images/copy.png"
+    "images/cut.png"
+    "images/new.png"
+    "images/open.png"
+    "images/paste.png"
+    "images/save.png"
+)
+
+qt6_add_resources(application "application"
+    PREFIX
+        "/"
+    FILES
+        ${application_resource_files}
+)
+
+install(TARGETS application
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/mainwindows/dockwidgets/.prev_CMakeLists.txt b/examples/widgets/mainwindows/dockwidgets/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..7bd57f1439
--- /dev/null
+++ b/examples/widgets/mainwindows/dockwidgets/.prev_CMakeLists.txt
@@ -0,0 +1,54 @@
+# Generated from dockwidgets.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(dockwidgets LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/mainwindows/dockwidgets")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(dockwidgets
+    main.cpp
+    mainwindow.cpp mainwindow.h
+)
+target_link_libraries(dockwidgets PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+
+# Resources:
+set(dockwidgets_resource_files
+    "images/new.png"
+    "images/print.png"
+    "images/save.png"
+    "images/undo.png"
+)
+
+qt6_add_resources(dockwidgets "dockwidgets"
+    PREFIX
+        "/"
+    FILES
+        ${dockwidgets_resource_files}
+)
+
+if(TARGET Qt::PrintSupport)
+    target_link_libraries(dockwidgets PUBLIC
+        Qt::PrintSupport
+    )
+endif()
+
+install(TARGETS dockwidgets
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/mainwindows/dockwidgets/CMakeLists.txt b/examples/widgets/mainwindows/dockwidgets/CMakeLists.txt
new file mode 100644
index 0000000000..b811094658
--- /dev/null
+++ b/examples/widgets/mainwindows/dockwidgets/CMakeLists.txt
@@ -0,0 +1,60 @@
+# Generated from dockwidgets.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(dockwidgets LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/mainwindows/dockwidgets")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+find_package(Qt6 COMPONENTS PrintSupport) # special case
+
+add_qt_gui_executable(dockwidgets
+    main.cpp
+    mainwindow.cpp mainwindow.h
+)
+target_link_libraries(dockwidgets PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+# special case begin
+if (TARGET Qt::PrintSupport)
+    target_link_libraries(dockwidgets PUBLIC Qt::PrintSupport)
+endif()
+# special case end
+
+
+# Resources:
+set(dockwidgets_resource_files
+    "images/new.png"
+    "images/print.png"
+    "images/save.png"
+    "images/undo.png"
+)
+
+qt6_add_resources(dockwidgets "dockwidgets"
+    PREFIX
+        "/"
+    FILES
+        ${dockwidgets_resource_files}
+)
+
+if(TARGET Qt::PrintSupport)
+    target_link_libraries(dockwidgets PUBLIC
+        Qt::PrintSupport
+    )
+endif()
+
+install(TARGETS dockwidgets
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/mainwindows/mainwindow/CMakeLists.txt b/examples/widgets/mainwindows/mainwindow/CMakeLists.txt
new file mode 100644
index 0000000000..3152fb0904
--- /dev/null
+++ b/examples/widgets/mainwindows/mainwindow/CMakeLists.txt
@@ -0,0 +1,50 @@
+# Generated from mainwindow.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(mainwindow LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/mainwindows/mainwindow")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(mainwindow
+    colorswatch.cpp colorswatch.h
+    main.cpp
+    mainwindow.cpp mainwindow.h
+    toolbar.cpp toolbar.h
+)
+target_link_libraries(mainwindow PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+
+# Resources:
+set(mainwindow_resource_files
+    "qt.png"
+    "titlebarCenter.png"
+    "titlebarLeft.png"
+    "titlebarRight.png"
+)
+
+qt6_add_resources(mainwindow "mainwindow"
+    PREFIX
+        "/res"
+    FILES
+        ${mainwindow_resource_files}
+)
+
+install(TARGETS mainwindow
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/mainwindows/mdi/CMakeLists.txt b/examples/widgets/mainwindows/mdi/CMakeLists.txt
new file mode 100644
index 0000000000..c75049285d
--- /dev/null
+++ b/examples/widgets/mainwindows/mdi/CMakeLists.txt
@@ -0,0 +1,51 @@
+# Generated from mdi.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(mdi LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/mainwindows/mdi")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(mdi
+    main.cpp
+    mainwindow.cpp mainwindow.h
+    mdichild.cpp mdichild.h
+)
+target_link_libraries(mdi PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+
+# Resources:
+set(mdi_resource_files
+    "images/copy.png"
+    "images/cut.png"
+    "images/new.png"
+    "images/open.png"
+    "images/paste.png"
+    "images/save.png"
+)
+
+qt6_add_resources(mdi "mdi"
+    PREFIX
+        "/"
+    FILES
+        ${mdi_resource_files}
+)
+
+install(TARGETS mdi
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/mainwindows/menus/CMakeLists.txt b/examples/widgets/mainwindows/menus/CMakeLists.txt
new file mode 100644
index 0000000000..0e76c3a447
--- /dev/null
+++ b/examples/widgets/mainwindows/menus/CMakeLists.txt
@@ -0,0 +1,32 @@
+# Generated from menus.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(menus LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/mainwindows/menus")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(menus
+    main.cpp
+    mainwindow.cpp mainwindow.h
+)
+target_link_libraries(menus PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+install(TARGETS menus
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/mainwindows/sdi/CMakeLists.txt b/examples/widgets/mainwindows/sdi/CMakeLists.txt
new file mode 100644
index 0000000000..f9d7d5ff3f
--- /dev/null
+++ b/examples/widgets/mainwindows/sdi/CMakeLists.txt
@@ -0,0 +1,50 @@
+# Generated from sdi.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(sdi LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/mainwindows/sdi")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(sdi
+    main.cpp
+    mainwindow.cpp mainwindow.h
+)
+target_link_libraries(sdi PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+
+# Resources:
+set(sdi_resource_files
+    "images/copy.png"
+    "images/cut.png"
+    "images/new.png"
+    "images/open.png"
+    "images/paste.png"
+    "images/save.png"
+)
+
+qt6_add_resources(sdi "sdi"
+    PREFIX
+        "/"
+    FILES
+        ${sdi_resource_files}
+)
+
+install(TARGETS sdi
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/painting/CMakeLists.txt b/examples/widgets/painting/CMakeLists.txt
new file mode 100644
index 0000000000..e7d612da3b
--- /dev/null
+++ b/examples/widgets/painting/CMakeLists.txt
@@ -0,0 +1,14 @@
+# Generated from painting.pro.
+
+add_subdirectory(shared) # special case
+add_subdirectory(basicdrawing)
+add_subdirectory(concentriccircles)
+add_subdirectory(affine)
+# add_subdirectory(composition) # FIXME: Seems buggy wrt. usesOpenGL function
+add_subdirectory(deform)
+add_subdirectory(gradients)
+add_subdirectory(pathstroke)
+add_subdirectory(imagecomposition)
+add_subdirectory(painterpaths)
+add_subdirectory(transformations)
+add_subdirectory(fontsampler)
diff --git a/examples/widgets/painting/affine/.prev_CMakeLists.txt b/examples/widgets/painting/affine/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..948456d821
--- /dev/null
+++ b/examples/widgets/painting/affine/.prev_CMakeLists.txt
@@ -0,0 +1,215 @@
+# Generated from affine.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(affine LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/painting/affine")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(affine
+    ../shared/arthurstyle.cpp ../shared/arthurstyle.h
+    ../shared/arthurwidgets.cpp ../shared/arthurwidgets.h
+    ../shared/hoverpoints.cpp ../shared/hoverpoints.h
+    main.cpp
+    xform.cpp xform.h
+)
+target_include_directories(affine PUBLIC
+    ../shared
+)
+
+target_link_libraries(affine PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+
+# Resources:
+set_source_files_properties("../shared/images/button_normal_cap_left.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/button_normal_cap_left.png"
+)
+set_source_files_properties("../shared/images/button_normal_cap_right.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/button_normal_cap_right.png"
+)
+set_source_files_properties("../shared/images/button_normal_stretch.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/button_normal_stretch.png"
+)
+set_source_files_properties("../shared/images/button_pressed_cap_left.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/button_pressed_cap_left.png"
+)
+set_source_files_properties("../shared/images/button_pressed_cap_right.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/button_pressed_cap_right.png"
+)
+set_source_files_properties("../shared/images/button_pressed_stretch.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/button_pressed_stretch.png"
+)
+set_source_files_properties("../shared/images/frame_bottom.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/frame_bottom.png"
+)
+set_source_files_properties("../shared/images/frame_bottomleft.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/frame_bottomleft.png"
+)
+set_source_files_properties("../shared/images/frame_bottomright.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/frame_bottomright.png"
+)
+set_source_files_properties("../shared/images/frame_left.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/frame_left.png"
+)
+set_source_files_properties("../shared/images/frame_right.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/frame_right.png"
+)
+set_source_files_properties("../shared/images/frame_top.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/frame_top.png"
+)
+set_source_files_properties("../shared/images/frame_topleft.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/frame_topleft.png"
+)
+set_source_files_properties("../shared/images/frame_topright.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/frame_topright.png"
+)
+set_source_files_properties("../shared/images/groupframe_bottom_left.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_bottom_left.png"
+)
+set_source_files_properties("../shared/images/groupframe_bottom_right.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_bottom_right.png"
+)
+set_source_files_properties("../shared/images/groupframe_bottom_stretch.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_bottom_stretch.png"
+)
+set_source_files_properties("../shared/images/groupframe_left_stretch.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_left_stretch.png"
+)
+set_source_files_properties("../shared/images/groupframe_right_stretch.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_right_stretch.png"
+)
+set_source_files_properties("../shared/images/groupframe_top_stretch.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_top_stretch.png"
+)
+set_source_files_properties("../shared/images/groupframe_topleft.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_topleft.png"
+)
+set_source_files_properties("../shared/images/groupframe_topright.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_topright.png"
+)
+set_source_files_properties("../shared/images/line_dash_dot.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/line_dash_dot.png"
+)
+set_source_files_properties("../shared/images/line_dash_dot_dot.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/line_dash_dot_dot.png"
+)
+set_source_files_properties("../shared/images/line_dashed.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/line_dashed.png"
+)
+set_source_files_properties("../shared/images/line_dotted.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/line_dotted.png"
+)
+set_source_files_properties("../shared/images/line_solid.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/line_solid.png"
+)
+set_source_files_properties("../shared/images/radiobutton-on.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/radiobutton-on.png"
+)
+set_source_files_properties("../shared/images/radiobutton_off.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/radiobutton_off.png"
+)
+set_source_files_properties("../shared/images/radiobutton_on.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/radiobutton_on.png"
+)
+set_source_files_properties("../shared/images/slider_bar.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/slider_bar.png"
+)
+set_source_files_properties("../shared/images/slider_thumb_on.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/slider_thumb_on.png"
+)
+set_source_files_properties("../shared/images/title_cap_left.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/title_cap_left.png"
+)
+set_source_files_properties("../shared/images/title_cap_right.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/title_cap_right.png"
+)
+set_source_files_properties("../shared/images/title_stretch.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/title_stretch.png"
+)
+set(shared_resource_files
+    "images/button_normal_cap_left.png"
+    "images/button_normal_cap_right.png"
+    "images/button_normal_stretch.png"
+    "images/button_pressed_cap_left.png"
+    "images/button_pressed_cap_right.png"
+    "images/button_pressed_stretch.png"
+    "images/frame_bottom.png"
+    "images/frame_bottomleft.png"
+    "images/frame_bottomright.png"
+    "images/frame_left.png"
+    "images/frame_right.png"
+    "images/frame_top.png"
+    "images/frame_topleft.png"
+    "images/frame_topright.png"
+    "images/groupframe_bottom_left.png"
+    "images/groupframe_bottom_right.png"
+    "images/groupframe_bottom_stretch.png"
+    "images/groupframe_left_stretch.png"
+    "images/groupframe_right_stretch.png"
+    "images/groupframe_top_stretch.png"
+    "images/groupframe_topleft.png"
+    "images/groupframe_topright.png"
+    "images/line_dash_dot.png"
+    "images/line_dash_dot_dot.png"
+    "images/line_dashed.png"
+    "images/line_dotted.png"
+    "images/line_solid.png"
+    "images/radiobutton-on.png"
+    "images/radiobutton_off.png"
+    "images/radiobutton_on.png"
+    "images/slider_bar.png"
+    "images/slider_thumb_on.png"
+    "images/title_cap_left.png"
+    "images/title_cap_right.png"
+    "images/title_stretch.png"
+)
+
+qt6_add_resources(affine "shared"
+    PREFIX
+        "/res"
+    BASE
+        "../shared"
+    FILES
+        ${shared_resource_files}
+)
+set(affine_resource_files
+    "bg1.jpg"
+    "xform.cpp"
+    "xform.html"
+)
+
+qt6_add_resources(affine "affine"
+    PREFIX
+        "/res/affine"
+    FILES
+        ${affine_resource_files}
+)
+
+if(QT_FEATURE_opengl)
+    target_sources(affine PUBLIC
+        ../shared/fbopaintdevice.cpp ../shared/fbopaintdevice.h
+    )
+
+    target_link_libraries(affine PUBLIC
+        Qt::OpenGL
+    )
+endif()
+
+install(TARGETS affine
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/painting/affine/CMakeLists.txt b/examples/widgets/painting/affine/CMakeLists.txt
new file mode 100644
index 0000000000..56e862d20f
--- /dev/null
+++ b/examples/widgets/painting/affine/CMakeLists.txt
@@ -0,0 +1,214 @@
+# Generated from affine.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(affine LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/painting/affine")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(affine
+    # special case: remove files from ../shared
+    main.cpp
+    xform.cpp xform.h
+)
+target_include_directories(affine PUBLIC
+    ../shared
+)
+
+target_link_libraries(affine PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+    painting_shared # special case
+)
+
+
+# Resources:
+set_source_files_properties("../shared/images/button_normal_cap_left.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/button_normal_cap_left.png"
+)
+set_source_files_properties("../shared/images/button_normal_cap_right.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/button_normal_cap_right.png"
+)
+set_source_files_properties("../shared/images/button_normal_stretch.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/button_normal_stretch.png"
+)
+set_source_files_properties("../shared/images/button_pressed_cap_left.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/button_pressed_cap_left.png"
+)
+set_source_files_properties("../shared/images/button_pressed_cap_right.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/button_pressed_cap_right.png"
+)
+set_source_files_properties("../shared/images/button_pressed_stretch.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/button_pressed_stretch.png"
+)
+set_source_files_properties("../shared/images/frame_bottom.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/frame_bottom.png"
+)
+set_source_files_properties("../shared/images/frame_bottomleft.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/frame_bottomleft.png"
+)
+set_source_files_properties("../shared/images/frame_bottomright.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/frame_bottomright.png"
+)
+set_source_files_properties("../shared/images/frame_left.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/frame_left.png"
+)
+set_source_files_properties("../shared/images/frame_right.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/frame_right.png"
+)
+set_source_files_properties("../shared/images/frame_top.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/frame_top.png"
+)
+set_source_files_properties("../shared/images/frame_topleft.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/frame_topleft.png"
+)
+set_source_files_properties("../shared/images/frame_topright.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/frame_topright.png"
+)
+set_source_files_properties("../shared/images/groupframe_bottom_left.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_bottom_left.png"
+)
+set_source_files_properties("../shared/images/groupframe_bottom_right.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_bottom_right.png"
+)
+set_source_files_properties("../shared/images/groupframe_bottom_stretch.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_bottom_stretch.png"
+)
+set_source_files_properties("../shared/images/groupframe_left_stretch.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_left_stretch.png"
+)
+set_source_files_properties("../shared/images/groupframe_right_stretch.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_right_stretch.png"
+)
+set_source_files_properties("../shared/images/groupframe_top_stretch.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_top_stretch.png"
+)
+set_source_files_properties("../shared/images/groupframe_topleft.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_topleft.png"
+)
+set_source_files_properties("../shared/images/groupframe_topright.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_topright.png"
+)
+set_source_files_properties("../shared/images/line_dash_dot.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/line_dash_dot.png"
+)
+set_source_files_properties("../shared/images/line_dash_dot_dot.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/line_dash_dot_dot.png"
+)
+set_source_files_properties("../shared/images/line_dashed.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/line_dashed.png"
+)
+set_source_files_properties("../shared/images/line_dotted.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/line_dotted.png"
+)
+set_source_files_properties("../shared/images/line_solid.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/line_solid.png"
+)
+set_source_files_properties("../shared/images/radiobutton-on.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/radiobutton-on.png"
+)
+set_source_files_properties("../shared/images/radiobutton_off.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/radiobutton_off.png"
+)
+set_source_files_properties("../shared/images/radiobutton_on.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/radiobutton_on.png"
+)
+set_source_files_properties("../shared/images/slider_bar.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/slider_bar.png"
+)
+set_source_files_properties("../shared/images/slider_thumb_on.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/slider_thumb_on.png"
+)
+set_source_files_properties("../shared/images/title_cap_left.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/title_cap_left.png"
+)
+set_source_files_properties("../shared/images/title_cap_right.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/title_cap_right.png"
+)
+set_source_files_properties("../shared/images/title_stretch.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/title_stretch.png"
+)
+set(shared_resource_files
+    "images/button_normal_cap_left.png"
+    "images/button_normal_cap_right.png"
+    "images/button_normal_stretch.png"
+    "images/button_pressed_cap_left.png"
+    "images/button_pressed_cap_right.png"
+    "images/button_pressed_stretch.png"
+    "images/frame_bottom.png"
+    "images/frame_bottomleft.png"
+    "images/frame_bottomright.png"
+    "images/frame_left.png"
+    "images/frame_right.png"
+    "images/frame_top.png"
+    "images/frame_topleft.png"
+    "images/frame_topright.png"
+    "images/groupframe_bottom_left.png"
+    "images/groupframe_bottom_right.png"
+    "images/groupframe_bottom_stretch.png"
+    "images/groupframe_left_stretch.png"
+    "images/groupframe_right_stretch.png"
+    "images/groupframe_top_stretch.png"
+    "images/groupframe_topleft.png"
+    "images/groupframe_topright.png"
+    "images/line_dash_dot.png"
+    "images/line_dash_dot_dot.png"
+    "images/line_dashed.png"
+    "images/line_dotted.png"
+    "images/line_solid.png"
+    "images/radiobutton-on.png"
+    "images/radiobutton_off.png"
+    "images/radiobutton_on.png"
+    "images/slider_bar.png"
+    "images/slider_thumb_on.png"
+    "images/title_cap_left.png"
+    "images/title_cap_right.png"
+    "images/title_stretch.png"
+)
+
+qt6_add_resources(affine "shared"
+    PREFIX
+        "/res"
+    BASE
+        "../shared"
+    FILES
+        ${shared_resource_files}
+)
+set(affine_resource_files
+    "bg1.jpg"
+    "xform.cpp"
+    "xform.html"
+)
+
+qt6_add_resources(affine "affine"
+    PREFIX
+        "/res/affine"
+    FILES
+        ${affine_resource_files}
+)
+
+if(QT_FEATURE_opengl)
+    target_sources(affine PUBLIC
+        ../shared/fbopaintdevice.cpp ../shared/fbopaintdevice.h
+    )
+
+    target_link_libraries(affine PUBLIC
+        Qt::OpenGL
+    )
+endif()
+
+install(TARGETS affine
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/painting/basicdrawing/CMakeLists.txt b/examples/widgets/painting/basicdrawing/CMakeLists.txt
new file mode 100644
index 0000000000..b7d4f0a24a
--- /dev/null
+++ b/examples/widgets/painting/basicdrawing/CMakeLists.txt
@@ -0,0 +1,47 @@
+# Generated from basicdrawing.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(basicdrawing LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/painting/basicdrawing")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(basicdrawing
+    main.cpp
+    renderarea.cpp renderarea.h
+    window.cpp window.h
+)
+target_link_libraries(basicdrawing PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+
+# Resources:
+set(basicdrawing_resource_files
+    "images/brick.png"
+    "images/qt-logo.png"
+)
+
+qt6_add_resources(basicdrawing "basicdrawing"
+    PREFIX
+        "/"
+    FILES
+        ${basicdrawing_resource_files}
+)
+
+install(TARGETS basicdrawing
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/painting/basicdrawing/window.cpp b/examples/widgets/painting/basicdrawing/window.cpp
index 65f6971d13..0a035cc299 100644
--- a/examples/widgets/painting/basicdrawing/window.cpp
+++ b/examples/widgets/painting/basicdrawing/window.cpp
@@ -157,17 +157,17 @@ Window::Window()
 //! [7]
 
 //! [8]
-    connect(shapeComboBox, QOverload<int>::of(&QComboBox::activated),
+    connect(shapeComboBox, &QComboBox::activated,
             this, &Window::shapeChanged);
-    connect(penWidthSpinBox, QOverload<int>::of(&QSpinBox::valueChanged),
+    connect(penWidthSpinBox, &QSpinBox::valueChanged,
             this, &Window::penChanged);
-    connect(penStyleComboBox, QOverload<int>::of(&QComboBox::activated),
+    connect(penStyleComboBox, &QComboBox::activated,
             this, &Window::penChanged);
-    connect(penCapComboBox, QOverload<int>::of(&QComboBox::activated),
+    connect(penCapComboBox, &QComboBox::activated,
             this, &Window::penChanged);
-    connect(penJoinComboBox, QOverload<int>::of(&QComboBox::activated),
+    connect(penJoinComboBox, &QComboBox::activated,
             this, &Window::penChanged);
-    connect(brushStyleComboBox, QOverload<int>::of(&QComboBox::activated),
+    connect(brushStyleComboBox, &QComboBox::activated,
             this, &Window::brushChanged);
     connect(antialiasingCheckBox, &QAbstractButton::toggled,
             renderArea, &RenderArea::setAntialiased);
diff --git a/examples/widgets/painting/composition/.prev_CMakeLists.txt b/examples/widgets/painting/composition/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..c5b1d12e4a
--- /dev/null
+++ b/examples/widgets/painting/composition/.prev_CMakeLists.txt
@@ -0,0 +1,216 @@
+# Generated from composition.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(composition LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/painting/composition")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(composition
+    ../shared/arthurstyle.cpp ../shared/arthurstyle.h
+    ../shared/arthurwidgets.cpp ../shared/arthurwidgets.h
+    ../shared/hoverpoints.cpp ../shared/hoverpoints.h
+    composition.cpp composition.h
+    main.cpp
+)
+target_include_directories(composition PUBLIC
+    ../shared
+)
+
+target_link_libraries(composition PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+
+# Resources:
+set_source_files_properties("../shared/images/button_normal_cap_left.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/button_normal_cap_left.png"
+)
+set_source_files_properties("../shared/images/button_normal_cap_right.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/button_normal_cap_right.png"
+)
+set_source_files_properties("../shared/images/button_normal_stretch.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/button_normal_stretch.png"
+)
+set_source_files_properties("../shared/images/button_pressed_cap_left.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/button_pressed_cap_left.png"
+)
+set_source_files_properties("../shared/images/button_pressed_cap_right.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/button_pressed_cap_right.png"
+)
+set_source_files_properties("../shared/images/button_pressed_stretch.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/button_pressed_stretch.png"
+)
+set_source_files_properties("../shared/images/frame_bottom.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/frame_bottom.png"
+)
+set_source_files_properties("../shared/images/frame_bottomleft.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/frame_bottomleft.png"
+)
+set_source_files_properties("../shared/images/frame_bottomright.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/frame_bottomright.png"
+)
+set_source_files_properties("../shared/images/frame_left.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/frame_left.png"
+)
+set_source_files_properties("../shared/images/frame_right.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/frame_right.png"
+)
+set_source_files_properties("../shared/images/frame_top.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/frame_top.png"
+)
+set_source_files_properties("../shared/images/frame_topleft.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/frame_topleft.png"
+)
+set_source_files_properties("../shared/images/frame_topright.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/frame_topright.png"
+)
+set_source_files_properties("../shared/images/groupframe_bottom_left.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_bottom_left.png"
+)
+set_source_files_properties("../shared/images/groupframe_bottom_right.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_bottom_right.png"
+)
+set_source_files_properties("../shared/images/groupframe_bottom_stretch.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_bottom_stretch.png"
+)
+set_source_files_properties("../shared/images/groupframe_left_stretch.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_left_stretch.png"
+)
+set_source_files_properties("../shared/images/groupframe_right_stretch.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_right_stretch.png"
+)
+set_source_files_properties("../shared/images/groupframe_top_stretch.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_top_stretch.png"
+)
+set_source_files_properties("../shared/images/groupframe_topleft.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_topleft.png"
+)
+set_source_files_properties("../shared/images/groupframe_topright.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_topright.png"
+)
+set_source_files_properties("../shared/images/line_dash_dot.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/line_dash_dot.png"
+)
+set_source_files_properties("../shared/images/line_dash_dot_dot.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/line_dash_dot_dot.png"
+)
+set_source_files_properties("../shared/images/line_dashed.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/line_dashed.png"
+)
+set_source_files_properties("../shared/images/line_dotted.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/line_dotted.png"
+)
+set_source_files_properties("../shared/images/line_solid.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/line_solid.png"
+)
+set_source_files_properties("../shared/images/radiobutton-on.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/radiobutton-on.png"
+)
+set_source_files_properties("../shared/images/radiobutton_off.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/radiobutton_off.png"
+)
+set_source_files_properties("../shared/images/radiobutton_on.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/radiobutton_on.png"
+)
+set_source_files_properties("../shared/images/slider_bar.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/slider_bar.png"
+)
+set_source_files_properties("../shared/images/slider_thumb_on.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/slider_thumb_on.png"
+)
+set_source_files_properties("../shared/images/title_cap_left.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/title_cap_left.png"
+)
+set_source_files_properties("../shared/images/title_cap_right.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/title_cap_right.png"
+)
+set_source_files_properties("../shared/images/title_stretch.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/title_stretch.png"
+)
+set(shared_resource_files
+    "images/button_normal_cap_left.png"
+    "images/button_normal_cap_right.png"
+    "images/button_normal_stretch.png"
+    "images/button_pressed_cap_left.png"
+    "images/button_pressed_cap_right.png"
+    "images/button_pressed_stretch.png"
+    "images/frame_bottom.png"
+    "images/frame_bottomleft.png"
+    "images/frame_bottomright.png"
+    "images/frame_left.png"
+    "images/frame_right.png"
+    "images/frame_top.png"
+    "images/frame_topleft.png"
+    "images/frame_topright.png"
+    "images/groupframe_bottom_left.png"
+    "images/groupframe_bottom_right.png"
+    "images/groupframe_bottom_stretch.png"
+    "images/groupframe_left_stretch.png"
+    "images/groupframe_right_stretch.png"
+    "images/groupframe_top_stretch.png"
+    "images/groupframe_topleft.png"
+    "images/groupframe_topright.png"
+    "images/line_dash_dot.png"
+    "images/line_dash_dot_dot.png"
+    "images/line_dashed.png"
+    "images/line_dotted.png"
+    "images/line_solid.png"
+    "images/radiobutton-on.png"
+    "images/radiobutton_off.png"
+    "images/radiobutton_on.png"
+    "images/slider_bar.png"
+    "images/slider_thumb_on.png"
+    "images/title_cap_left.png"
+    "images/title_cap_right.png"
+    "images/title_stretch.png"
+)
+
+qt6_add_resources(composition "shared"
+    PREFIX
+        "/res"
+    BASE
+        "../shared"
+    FILES
+        ${shared_resource_files}
+)
+set(composition_resource_files
+    "composition.cpp"
+    "composition.html"
+    "flower.jpg"
+    "flower_alpha.jpg"
+)
+
+qt6_add_resources(composition "composition"
+    PREFIX
+        "/res/composition"
+    FILES
+        ${composition_resource_files}
+)
+
+if(QT_FEATURE_opengl)
+    target_sources(composition PUBLIC
+        ../shared/fbopaintdevice.cpp ../shared/fbopaintdevice.h
+    )
+
+    target_link_libraries(composition PUBLIC
+        Qt::OpenGL
+    )
+endif()
+
+install(TARGETS composition
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/painting/composition/CMakeLists.txt b/examples/widgets/painting/composition/CMakeLists.txt
new file mode 100644
index 0000000000..89e356b7ae
--- /dev/null
+++ b/examples/widgets/painting/composition/CMakeLists.txt
@@ -0,0 +1,215 @@
+# Generated from composition.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(composition LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/painting/composition")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(composition
+    # special case: remove files from ../shared
+    composition.cpp composition.h
+    main.cpp
+)
+target_include_directories(composition PUBLIC
+    ../shared
+)
+
+target_link_libraries(composition PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+    painting_shared # special case
+)
+
+
+# Resources:
+set_source_files_properties("../shared/images/button_normal_cap_left.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/button_normal_cap_left.png"
+)
+set_source_files_properties("../shared/images/button_normal_cap_right.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/button_normal_cap_right.png"
+)
+set_source_files_properties("../shared/images/button_normal_stretch.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/button_normal_stretch.png"
+)
+set_source_files_properties("../shared/images/button_pressed_cap_left.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/button_pressed_cap_left.png"
+)
+set_source_files_properties("../shared/images/button_pressed_cap_right.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/button_pressed_cap_right.png"
+)
+set_source_files_properties("../shared/images/button_pressed_stretch.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/button_pressed_stretch.png"
+)
+set_source_files_properties("../shared/images/frame_bottom.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/frame_bottom.png"
+)
+set_source_files_properties("../shared/images/frame_bottomleft.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/frame_bottomleft.png"
+)
+set_source_files_properties("../shared/images/frame_bottomright.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/frame_bottomright.png"
+)
+set_source_files_properties("../shared/images/frame_left.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/frame_left.png"
+)
+set_source_files_properties("../shared/images/frame_right.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/frame_right.png"
+)
+set_source_files_properties("../shared/images/frame_top.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/frame_top.png"
+)
+set_source_files_properties("../shared/images/frame_topleft.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/frame_topleft.png"
+)
+set_source_files_properties("../shared/images/frame_topright.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/frame_topright.png"
+)
+set_source_files_properties("../shared/images/groupframe_bottom_left.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_bottom_left.png"
+)
+set_source_files_properties("../shared/images/groupframe_bottom_right.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_bottom_right.png"
+)
+set_source_files_properties("../shared/images/groupframe_bottom_stretch.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_bottom_stretch.png"
+)
+set_source_files_properties("../shared/images/groupframe_left_stretch.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_left_stretch.png"
+)
+set_source_files_properties("../shared/images/groupframe_right_stretch.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_right_stretch.png"
+)
+set_source_files_properties("../shared/images/groupframe_top_stretch.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_top_stretch.png"
+)
+set_source_files_properties("../shared/images/groupframe_topleft.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_topleft.png"
+)
+set_source_files_properties("../shared/images/groupframe_topright.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_topright.png"
+)
+set_source_files_properties("../shared/images/line_dash_dot.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/line_dash_dot.png"
+)
+set_source_files_properties("../shared/images/line_dash_dot_dot.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/line_dash_dot_dot.png"
+)
+set_source_files_properties("../shared/images/line_dashed.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/line_dashed.png"
+)
+set_source_files_properties("../shared/images/line_dotted.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/line_dotted.png"
+)
+set_source_files_properties("../shared/images/line_solid.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/line_solid.png"
+)
+set_source_files_properties("../shared/images/radiobutton-on.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/radiobutton-on.png"
+)
+set_source_files_properties("../shared/images/radiobutton_off.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/radiobutton_off.png"
+)
+set_source_files_properties("../shared/images/radiobutton_on.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/radiobutton_on.png"
+)
+set_source_files_properties("../shared/images/slider_bar.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/slider_bar.png"
+)
+set_source_files_properties("../shared/images/slider_thumb_on.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/slider_thumb_on.png"
+)
+set_source_files_properties("../shared/images/title_cap_left.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/title_cap_left.png"
+)
+set_source_files_properties("../shared/images/title_cap_right.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/title_cap_right.png"
+)
+set_source_files_properties("../shared/images/title_stretch.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/title_stretch.png"
+)
+set(shared_resource_files
+    "images/button_normal_cap_left.png"
+    "images/button_normal_cap_right.png"
+    "images/button_normal_stretch.png"
+    "images/button_pressed_cap_left.png"
+    "images/button_pressed_cap_right.png"
+    "images/button_pressed_stretch.png"
+    "images/frame_bottom.png"
+    "images/frame_bottomleft.png"
+    "images/frame_bottomright.png"
+    "images/frame_left.png"
+    "images/frame_right.png"
+    "images/frame_top.png"
+    "images/frame_topleft.png"
+    "images/frame_topright.png"
+    "images/groupframe_bottom_left.png"
+    "images/groupframe_bottom_right.png"
+    "images/groupframe_bottom_stretch.png"
+    "images/groupframe_left_stretch.png"
+    "images/groupframe_right_stretch.png"
+    "images/groupframe_top_stretch.png"
+    "images/groupframe_topleft.png"
+    "images/groupframe_topright.png"
+    "images/line_dash_dot.png"
+    "images/line_dash_dot_dot.png"
+    "images/line_dashed.png"
+    "images/line_dotted.png"
+    "images/line_solid.png"
+    "images/radiobutton-on.png"
+    "images/radiobutton_off.png"
+    "images/radiobutton_on.png"
+    "images/slider_bar.png"
+    "images/slider_thumb_on.png"
+    "images/title_cap_left.png"
+    "images/title_cap_right.png"
+    "images/title_stretch.png"
+)
+
+qt6_add_resources(composition "shared"
+    PREFIX
+        "/res"
+    BASE
+        "../shared"
+    FILES
+        ${shared_resource_files}
+)
+set(composition_resource_files
+    "composition.cpp"
+    "composition.html"
+    "flower.jpg"
+    "flower_alpha.jpg"
+)
+
+qt6_add_resources(composition "composition"
+    PREFIX
+        "/res/composition"
+    FILES
+        ${composition_resource_files}
+)
+
+if(QT_FEATURE_opengl)
+    target_sources(composition PUBLIC
+        ../shared/fbopaintdevice.cpp ../shared/fbopaintdevice.h
+    )
+
+    target_link_libraries(composition PUBLIC
+        Qt::OpenGL
+    )
+endif()
+
+install(TARGETS composition
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/painting/concentriccircles/CMakeLists.txt b/examples/widgets/painting/concentriccircles/CMakeLists.txt
new file mode 100644
index 0000000000..44d907f12f
--- /dev/null
+++ b/examples/widgets/painting/concentriccircles/CMakeLists.txt
@@ -0,0 +1,33 @@
+# Generated from concentriccircles.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(concentriccircles LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/painting/concentriccircles")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(concentriccircles
+    circlewidget.cpp circlewidget.h
+    main.cpp
+    window.cpp window.h
+)
+target_link_libraries(concentriccircles PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+install(TARGETS concentriccircles
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/painting/deform/.prev_CMakeLists.txt b/examples/widgets/painting/deform/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..4a223487ab
--- /dev/null
+++ b/examples/widgets/painting/deform/.prev_CMakeLists.txt
@@ -0,0 +1,214 @@
+# Generated from deform.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(deform LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/painting/deform")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(deform
+    ../shared/arthurstyle.cpp ../shared/arthurstyle.h
+    ../shared/arthurwidgets.cpp ../shared/arthurwidgets.h
+    ../shared/hoverpoints.cpp ../shared/hoverpoints.h
+    main.cpp
+    pathdeform.cpp pathdeform.h
+)
+target_include_directories(deform PUBLIC
+    ../shared
+)
+
+target_link_libraries(deform PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+
+# Resources:
+set_source_files_properties("../shared/images/button_normal_cap_left.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/button_normal_cap_left.png"
+)
+set_source_files_properties("../shared/images/button_normal_cap_right.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/button_normal_cap_right.png"
+)
+set_source_files_properties("../shared/images/button_normal_stretch.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/button_normal_stretch.png"
+)
+set_source_files_properties("../shared/images/button_pressed_cap_left.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/button_pressed_cap_left.png"
+)
+set_source_files_properties("../shared/images/button_pressed_cap_right.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/button_pressed_cap_right.png"
+)
+set_source_files_properties("../shared/images/button_pressed_stretch.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/button_pressed_stretch.png"
+)
+set_source_files_properties("../shared/images/frame_bottom.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/frame_bottom.png"
+)
+set_source_files_properties("../shared/images/frame_bottomleft.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/frame_bottomleft.png"
+)
+set_source_files_properties("../shared/images/frame_bottomright.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/frame_bottomright.png"
+)
+set_source_files_properties("../shared/images/frame_left.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/frame_left.png"
+)
+set_source_files_properties("../shared/images/frame_right.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/frame_right.png"
+)
+set_source_files_properties("../shared/images/frame_top.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/frame_top.png"
+)
+set_source_files_properties("../shared/images/frame_topleft.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/frame_topleft.png"
+)
+set_source_files_properties("../shared/images/frame_topright.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/frame_topright.png"
+)
+set_source_files_properties("../shared/images/groupframe_bottom_left.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_bottom_left.png"
+)
+set_source_files_properties("../shared/images/groupframe_bottom_right.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_bottom_right.png"
+)
+set_source_files_properties("../shared/images/groupframe_bottom_stretch.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_bottom_stretch.png"
+)
+set_source_files_properties("../shared/images/groupframe_left_stretch.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_left_stretch.png"
+)
+set_source_files_properties("../shared/images/groupframe_right_stretch.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_right_stretch.png"
+)
+set_source_files_properties("../shared/images/groupframe_top_stretch.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_top_stretch.png"
+)
+set_source_files_properties("../shared/images/groupframe_topleft.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_topleft.png"
+)
+set_source_files_properties("../shared/images/groupframe_topright.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_topright.png"
+)
+set_source_files_properties("../shared/images/line_dash_dot.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/line_dash_dot.png"
+)
+set_source_files_properties("../shared/images/line_dash_dot_dot.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/line_dash_dot_dot.png"
+)
+set_source_files_properties("../shared/images/line_dashed.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/line_dashed.png"
+)
+set_source_files_properties("../shared/images/line_dotted.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/line_dotted.png"
+)
+set_source_files_properties("../shared/images/line_solid.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/line_solid.png"
+)
+set_source_files_properties("../shared/images/radiobutton-on.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/radiobutton-on.png"
+)
+set_source_files_properties("../shared/images/radiobutton_off.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/radiobutton_off.png"
+)
+set_source_files_properties("../shared/images/radiobutton_on.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/radiobutton_on.png"
+)
+set_source_files_properties("../shared/images/slider_bar.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/slider_bar.png"
+)
+set_source_files_properties("../shared/images/slider_thumb_on.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/slider_thumb_on.png"
+)
+set_source_files_properties("../shared/images/title_cap_left.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/title_cap_left.png"
+)
+set_source_files_properties("../shared/images/title_cap_right.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/title_cap_right.png"
+)
+set_source_files_properties("../shared/images/title_stretch.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/title_stretch.png"
+)
+set(shared_resource_files
+    "images/button_normal_cap_left.png"
+    "images/button_normal_cap_right.png"
+    "images/button_normal_stretch.png"
+    "images/button_pressed_cap_left.png"
+    "images/button_pressed_cap_right.png"
+    "images/button_pressed_stretch.png"
+    "images/frame_bottom.png"
+    "images/frame_bottomleft.png"
+    "images/frame_bottomright.png"
+    "images/frame_left.png"
+    "images/frame_right.png"
+    "images/frame_top.png"
+    "images/frame_topleft.png"
+    "images/frame_topright.png"
+    "images/groupframe_bottom_left.png"
+    "images/groupframe_bottom_right.png"
+    "images/groupframe_bottom_stretch.png"
+    "images/groupframe_left_stretch.png"
+    "images/groupframe_right_stretch.png"
+    "images/groupframe_top_stretch.png"
+    "images/groupframe_topleft.png"
+    "images/groupframe_topright.png"
+    "images/line_dash_dot.png"
+    "images/line_dash_dot_dot.png"
+    "images/line_dashed.png"
+    "images/line_dotted.png"
+    "images/line_solid.png"
+    "images/radiobutton-on.png"
+    "images/radiobutton_off.png"
+    "images/radiobutton_on.png"
+    "images/slider_bar.png"
+    "images/slider_thumb_on.png"
+    "images/title_cap_left.png"
+    "images/title_cap_right.png"
+    "images/title_stretch.png"
+)
+
+qt6_add_resources(deform "shared"
+    PREFIX
+        "/res"
+    BASE
+        "../shared"
+    FILES
+        ${shared_resource_files}
+)
+set(deform_resource_files
+    "pathdeform.cpp"
+    "pathdeform.html"
+)
+
+qt6_add_resources(deform "deform"
+    PREFIX
+        "/res/deform"
+    FILES
+        ${deform_resource_files}
+)
+
+if(QT_FEATURE_opengl)
+    target_sources(deform PUBLIC
+        ../shared/fbopaintdevice.cpp ../shared/fbopaintdevice.h
+    )
+
+    target_link_libraries(deform PUBLIC
+        Qt::OpenGL
+    )
+endif()
+
+install(TARGETS deform
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/painting/deform/CMakeLists.txt b/examples/widgets/painting/deform/CMakeLists.txt
new file mode 100644
index 0000000000..79c14d2196
--- /dev/null
+++ b/examples/widgets/painting/deform/CMakeLists.txt
@@ -0,0 +1,213 @@
+# Generated from deform.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(deform LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/painting/deform")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(deform
+    # special case: remove files from ../shared
+    main.cpp
+    pathdeform.cpp pathdeform.h
+)
+target_include_directories(deform PUBLIC
+    ../shared
+)
+
+target_link_libraries(deform PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+    painting_shared # special case
+)
+
+
+# Resources:
+set_source_files_properties("../shared/images/button_normal_cap_left.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/button_normal_cap_left.png"
+)
+set_source_files_properties("../shared/images/button_normal_cap_right.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/button_normal_cap_right.png"
+)
+set_source_files_properties("../shared/images/button_normal_stretch.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/button_normal_stretch.png"
+)
+set_source_files_properties("../shared/images/button_pressed_cap_left.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/button_pressed_cap_left.png"
+)
+set_source_files_properties("../shared/images/button_pressed_cap_right.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/button_pressed_cap_right.png"
+)
+set_source_files_properties("../shared/images/button_pressed_stretch.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/button_pressed_stretch.png"
+)
+set_source_files_properties("../shared/images/frame_bottom.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/frame_bottom.png"
+)
+set_source_files_properties("../shared/images/frame_bottomleft.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/frame_bottomleft.png"
+)
+set_source_files_properties("../shared/images/frame_bottomright.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/frame_bottomright.png"
+)
+set_source_files_properties("../shared/images/frame_left.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/frame_left.png"
+)
+set_source_files_properties("../shared/images/frame_right.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/frame_right.png"
+)
+set_source_files_properties("../shared/images/frame_top.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/frame_top.png"
+)
+set_source_files_properties("../shared/images/frame_topleft.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/frame_topleft.png"
+)
+set_source_files_properties("../shared/images/frame_topright.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/frame_topright.png"
+)
+set_source_files_properties("../shared/images/groupframe_bottom_left.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_bottom_left.png"
+)
+set_source_files_properties("../shared/images/groupframe_bottom_right.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_bottom_right.png"
+)
+set_source_files_properties("../shared/images/groupframe_bottom_stretch.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_bottom_stretch.png"
+)
+set_source_files_properties("../shared/images/groupframe_left_stretch.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_left_stretch.png"
+)
+set_source_files_properties("../shared/images/groupframe_right_stretch.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_right_stretch.png"
+)
+set_source_files_properties("../shared/images/groupframe_top_stretch.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_top_stretch.png"
+)
+set_source_files_properties("../shared/images/groupframe_topleft.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_topleft.png"
+)
+set_source_files_properties("../shared/images/groupframe_topright.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_topright.png"
+)
+set_source_files_properties("../shared/images/line_dash_dot.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/line_dash_dot.png"
+)
+set_source_files_properties("../shared/images/line_dash_dot_dot.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/line_dash_dot_dot.png"
+)
+set_source_files_properties("../shared/images/line_dashed.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/line_dashed.png"
+)
+set_source_files_properties("../shared/images/line_dotted.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/line_dotted.png"
+)
+set_source_files_properties("../shared/images/line_solid.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/line_solid.png"
+)
+set_source_files_properties("../shared/images/radiobutton-on.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/radiobutton-on.png"
+)
+set_source_files_properties("../shared/images/radiobutton_off.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/radiobutton_off.png"
+)
+set_source_files_properties("../shared/images/radiobutton_on.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/radiobutton_on.png"
+)
+set_source_files_properties("../shared/images/slider_bar.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/slider_bar.png"
+)
+set_source_files_properties("../shared/images/slider_thumb_on.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/slider_thumb_on.png"
+)
+set_source_files_properties("../shared/images/title_cap_left.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/title_cap_left.png"
+)
+set_source_files_properties("../shared/images/title_cap_right.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/title_cap_right.png"
+)
+set_source_files_properties("../shared/images/title_stretch.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/title_stretch.png"
+)
+set(shared_resource_files
+    "images/button_normal_cap_left.png"
+    "images/button_normal_cap_right.png"
+    "images/button_normal_stretch.png"
+    "images/button_pressed_cap_left.png"
+    "images/button_pressed_cap_right.png"
+    "images/button_pressed_stretch.png"
+    "images/frame_bottom.png"
+    "images/frame_bottomleft.png"
+    "images/frame_bottomright.png"
+    "images/frame_left.png"
+    "images/frame_right.png"
+    "images/frame_top.png"
+    "images/frame_topleft.png"
+    "images/frame_topright.png"
+    "images/groupframe_bottom_left.png"
+    "images/groupframe_bottom_right.png"
+    "images/groupframe_bottom_stretch.png"
+    "images/groupframe_left_stretch.png"
+    "images/groupframe_right_stretch.png"
+    "images/groupframe_top_stretch.png"
+    "images/groupframe_topleft.png"
+    "images/groupframe_topright.png"
+    "images/line_dash_dot.png"
+    "images/line_dash_dot_dot.png"
+    "images/line_dashed.png"
+    "images/line_dotted.png"
+    "images/line_solid.png"
+    "images/radiobutton-on.png"
+    "images/radiobutton_off.png"
+    "images/radiobutton_on.png"
+    "images/slider_bar.png"
+    "images/slider_thumb_on.png"
+    "images/title_cap_left.png"
+    "images/title_cap_right.png"
+    "images/title_stretch.png"
+)
+
+qt6_add_resources(deform "shared"
+    PREFIX
+        "/res"
+    BASE
+        "../shared"
+    FILES
+        ${shared_resource_files}
+)
+set(deform_resource_files
+    "pathdeform.cpp"
+    "pathdeform.html"
+)
+
+qt6_add_resources(deform "deform"
+    PREFIX
+        "/res/deform"
+    FILES
+        ${deform_resource_files}
+)
+
+if(QT_FEATURE_opengl)
+    target_sources(deform PUBLIC
+        ../shared/fbopaintdevice.cpp ../shared/fbopaintdevice.h
+    )
+
+    target_link_libraries(deform PUBLIC
+        Qt::OpenGL
+    )
+endif()
+
+install(TARGETS deform
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/painting/fontsampler/CMakeLists.txt b/examples/widgets/painting/fontsampler/CMakeLists.txt
new file mode 100644
index 0000000000..11ad8a3242
--- /dev/null
+++ b/examples/widgets/painting/fontsampler/CMakeLists.txt
@@ -0,0 +1,39 @@
+# Generated from fontsampler.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(fontsampler LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/painting/fontsampler")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(fontsampler
+    main.cpp
+    mainwindow.cpp mainwindow.h
+    mainwindowbase.ui
+)
+target_link_libraries(fontsampler PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+if(TARGET Qt::PrintSupport)
+    target_link_libraries(fontsampler PUBLIC
+        Qt::PrintSupport
+    )
+endif()
+
+install(TARGETS fontsampler
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/painting/gradients/.prev_CMakeLists.txt b/examples/widgets/painting/gradients/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..f28694a96b
--- /dev/null
+++ b/examples/widgets/painting/gradients/.prev_CMakeLists.txt
@@ -0,0 +1,214 @@
+# Generated from gradients.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(gradients LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/painting/gradients")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(gradients
+    ../shared/arthurstyle.cpp ../shared/arthurstyle.h
+    ../shared/arthurwidgets.cpp ../shared/arthurwidgets.h
+    ../shared/hoverpoints.cpp ../shared/hoverpoints.h
+    gradients.cpp gradients.h
+    main.cpp
+)
+target_include_directories(gradients PUBLIC
+    ../shared
+)
+
+target_link_libraries(gradients PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+
+# Resources:
+set_source_files_properties("../shared/images/button_normal_cap_left.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/button_normal_cap_left.png"
+)
+set_source_files_properties("../shared/images/button_normal_cap_right.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/button_normal_cap_right.png"
+)
+set_source_files_properties("../shared/images/button_normal_stretch.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/button_normal_stretch.png"
+)
+set_source_files_properties("../shared/images/button_pressed_cap_left.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/button_pressed_cap_left.png"
+)
+set_source_files_properties("../shared/images/button_pressed_cap_right.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/button_pressed_cap_right.png"
+)
+set_source_files_properties("../shared/images/button_pressed_stretch.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/button_pressed_stretch.png"
+)
+set_source_files_properties("../shared/images/frame_bottom.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/frame_bottom.png"
+)
+set_source_files_properties("../shared/images/frame_bottomleft.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/frame_bottomleft.png"
+)
+set_source_files_properties("../shared/images/frame_bottomright.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/frame_bottomright.png"
+)
+set_source_files_properties("../shared/images/frame_left.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/frame_left.png"
+)
+set_source_files_properties("../shared/images/frame_right.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/frame_right.png"
+)
+set_source_files_properties("../shared/images/frame_top.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/frame_top.png"
+)
+set_source_files_properties("../shared/images/frame_topleft.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/frame_topleft.png"
+)
+set_source_files_properties("../shared/images/frame_topright.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/frame_topright.png"
+)
+set_source_files_properties("../shared/images/groupframe_bottom_left.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_bottom_left.png"
+)
+set_source_files_properties("../shared/images/groupframe_bottom_right.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_bottom_right.png"
+)
+set_source_files_properties("../shared/images/groupframe_bottom_stretch.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_bottom_stretch.png"
+)
+set_source_files_properties("../shared/images/groupframe_left_stretch.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_left_stretch.png"
+)
+set_source_files_properties("../shared/images/groupframe_right_stretch.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_right_stretch.png"
+)
+set_source_files_properties("../shared/images/groupframe_top_stretch.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_top_stretch.png"
+)
+set_source_files_properties("../shared/images/groupframe_topleft.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_topleft.png"
+)
+set_source_files_properties("../shared/images/groupframe_topright.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_topright.png"
+)
+set_source_files_properties("../shared/images/line_dash_dot.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/line_dash_dot.png"
+)
+set_source_files_properties("../shared/images/line_dash_dot_dot.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/line_dash_dot_dot.png"
+)
+set_source_files_properties("../shared/images/line_dashed.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/line_dashed.png"
+)
+set_source_files_properties("../shared/images/line_dotted.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/line_dotted.png"
+)
+set_source_files_properties("../shared/images/line_solid.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/line_solid.png"
+)
+set_source_files_properties("../shared/images/radiobutton-on.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/radiobutton-on.png"
+)
+set_source_files_properties("../shared/images/radiobutton_off.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/radiobutton_off.png"
+)
+set_source_files_properties("../shared/images/radiobutton_on.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/radiobutton_on.png"
+)
+set_source_files_properties("../shared/images/slider_bar.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/slider_bar.png"
+)
+set_source_files_properties("../shared/images/slider_thumb_on.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/slider_thumb_on.png"
+)
+set_source_files_properties("../shared/images/title_cap_left.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/title_cap_left.png"
+)
+set_source_files_properties("../shared/images/title_cap_right.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/title_cap_right.png"
+)
+set_source_files_properties("../shared/images/title_stretch.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/title_stretch.png"
+)
+set(shared_resource_files
+    "images/button_normal_cap_left.png"
+    "images/button_normal_cap_right.png"
+    "images/button_normal_stretch.png"
+    "images/button_pressed_cap_left.png"
+    "images/button_pressed_cap_right.png"
+    "images/button_pressed_stretch.png"
+    "images/frame_bottom.png"
+    "images/frame_bottomleft.png"
+    "images/frame_bottomright.png"
+    "images/frame_left.png"
+    "images/frame_right.png"
+    "images/frame_top.png"
+    "images/frame_topleft.png"
+    "images/frame_topright.png"
+    "images/groupframe_bottom_left.png"
+    "images/groupframe_bottom_right.png"
+    "images/groupframe_bottom_stretch.png"
+    "images/groupframe_left_stretch.png"
+    "images/groupframe_right_stretch.png"
+    "images/groupframe_top_stretch.png"
+    "images/groupframe_topleft.png"
+    "images/groupframe_topright.png"
+    "images/line_dash_dot.png"
+    "images/line_dash_dot_dot.png"
+    "images/line_dashed.png"
+    "images/line_dotted.png"
+    "images/line_solid.png"
+    "images/radiobutton-on.png"
+    "images/radiobutton_off.png"
+    "images/radiobutton_on.png"
+    "images/slider_bar.png"
+    "images/slider_thumb_on.png"
+    "images/title_cap_left.png"
+    "images/title_cap_right.png"
+    "images/title_stretch.png"
+)
+
+qt6_add_resources(gradients "shared"
+    PREFIX
+        "/res"
+    BASE
+        "../shared"
+    FILES
+        ${shared_resource_files}
+)
+set(gradients_resource_files
+    "gradients.cpp"
+    "gradients.html"
+)
+
+qt6_add_resources(gradients "gradients"
+    PREFIX
+        "/res/gradients"
+    FILES
+        ${gradients_resource_files}
+)
+
+if(QT_FEATURE_opengl)
+    target_sources(gradients PUBLIC
+        ../shared/fbopaintdevice.cpp ../shared/fbopaintdevice.h
+    )
+
+    target_link_libraries(gradients PUBLIC
+        Qt::OpenGL
+    )
+endif()
+
+install(TARGETS gradients
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/painting/gradients/CMakeLists.txt b/examples/widgets/painting/gradients/CMakeLists.txt
new file mode 100644
index 0000000000..0b6c06e5b9
--- /dev/null
+++ b/examples/widgets/painting/gradients/CMakeLists.txt
@@ -0,0 +1,213 @@
+# Generated from gradients.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(gradients LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/painting/gradients")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(gradients
+    # special case: remove files from ../shared
+    gradients.cpp gradients.h
+    main.cpp
+)
+target_include_directories(gradients PUBLIC
+    ../shared
+)
+
+target_link_libraries(gradients PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+    painting_shared # special case
+)
+
+
+# Resources:
+set_source_files_properties("../shared/images/button_normal_cap_left.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/button_normal_cap_left.png"
+)
+set_source_files_properties("../shared/images/button_normal_cap_right.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/button_normal_cap_right.png"
+)
+set_source_files_properties("../shared/images/button_normal_stretch.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/button_normal_stretch.png"
+)
+set_source_files_properties("../shared/images/button_pressed_cap_left.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/button_pressed_cap_left.png"
+)
+set_source_files_properties("../shared/images/button_pressed_cap_right.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/button_pressed_cap_right.png"
+)
+set_source_files_properties("../shared/images/button_pressed_stretch.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/button_pressed_stretch.png"
+)
+set_source_files_properties("../shared/images/frame_bottom.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/frame_bottom.png"
+)
+set_source_files_properties("../shared/images/frame_bottomleft.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/frame_bottomleft.png"
+)
+set_source_files_properties("../shared/images/frame_bottomright.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/frame_bottomright.png"
+)
+set_source_files_properties("../shared/images/frame_left.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/frame_left.png"
+)
+set_source_files_properties("../shared/images/frame_right.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/frame_right.png"
+)
+set_source_files_properties("../shared/images/frame_top.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/frame_top.png"
+)
+set_source_files_properties("../shared/images/frame_topleft.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/frame_topleft.png"
+)
+set_source_files_properties("../shared/images/frame_topright.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/frame_topright.png"
+)
+set_source_files_properties("../shared/images/groupframe_bottom_left.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_bottom_left.png"
+)
+set_source_files_properties("../shared/images/groupframe_bottom_right.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_bottom_right.png"
+)
+set_source_files_properties("../shared/images/groupframe_bottom_stretch.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_bottom_stretch.png"
+)
+set_source_files_properties("../shared/images/groupframe_left_stretch.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_left_stretch.png"
+)
+set_source_files_properties("../shared/images/groupframe_right_stretch.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_right_stretch.png"
+)
+set_source_files_properties("../shared/images/groupframe_top_stretch.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_top_stretch.png"
+)
+set_source_files_properties("../shared/images/groupframe_topleft.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_topleft.png"
+)
+set_source_files_properties("../shared/images/groupframe_topright.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_topright.png"
+)
+set_source_files_properties("../shared/images/line_dash_dot.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/line_dash_dot.png"
+)
+set_source_files_properties("../shared/images/line_dash_dot_dot.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/line_dash_dot_dot.png"
+)
+set_source_files_properties("../shared/images/line_dashed.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/line_dashed.png"
+)
+set_source_files_properties("../shared/images/line_dotted.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/line_dotted.png"
+)
+set_source_files_properties("../shared/images/line_solid.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/line_solid.png"
+)
+set_source_files_properties("../shared/images/radiobutton-on.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/radiobutton-on.png"
+)
+set_source_files_properties("../shared/images/radiobutton_off.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/radiobutton_off.png"
+)
+set_source_files_properties("../shared/images/radiobutton_on.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/radiobutton_on.png"
+)
+set_source_files_properties("../shared/images/slider_bar.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/slider_bar.png"
+)
+set_source_files_properties("../shared/images/slider_thumb_on.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/slider_thumb_on.png"
+)
+set_source_files_properties("../shared/images/title_cap_left.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/title_cap_left.png"
+)
+set_source_files_properties("../shared/images/title_cap_right.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/title_cap_right.png"
+)
+set_source_files_properties("../shared/images/title_stretch.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/title_stretch.png"
+)
+set(shared_resource_files
+    "images/button_normal_cap_left.png"
+    "images/button_normal_cap_right.png"
+    "images/button_normal_stretch.png"
+    "images/button_pressed_cap_left.png"
+    "images/button_pressed_cap_right.png"
+    "images/button_pressed_stretch.png"
+    "images/frame_bottom.png"
+    "images/frame_bottomleft.png"
+    "images/frame_bottomright.png"
+    "images/frame_left.png"
+    "images/frame_right.png"
+    "images/frame_top.png"
+    "images/frame_topleft.png"
+    "images/frame_topright.png"
+    "images/groupframe_bottom_left.png"
+    "images/groupframe_bottom_right.png"
+    "images/groupframe_bottom_stretch.png"
+    "images/groupframe_left_stretch.png"
+    "images/groupframe_right_stretch.png"
+    "images/groupframe_top_stretch.png"
+    "images/groupframe_topleft.png"
+    "images/groupframe_topright.png"
+    "images/line_dash_dot.png"
+    "images/line_dash_dot_dot.png"
+    "images/line_dashed.png"
+    "images/line_dotted.png"
+    "images/line_solid.png"
+    "images/radiobutton-on.png"
+    "images/radiobutton_off.png"
+    "images/radiobutton_on.png"
+    "images/slider_bar.png"
+    "images/slider_thumb_on.png"
+    "images/title_cap_left.png"
+    "images/title_cap_right.png"
+    "images/title_stretch.png"
+)
+
+qt6_add_resources(gradients "shared"
+    PREFIX
+        "/res"
+    BASE
+        "../shared"
+    FILES
+        ${shared_resource_files}
+)
+set(gradients_resource_files
+    "gradients.cpp"
+    "gradients.html"
+)
+
+qt6_add_resources(gradients "gradients"
+    PREFIX
+        "/res/gradients"
+    FILES
+        ${gradients_resource_files}
+)
+
+if(QT_FEATURE_opengl)
+    target_sources(gradients PUBLIC
+        ../shared/fbopaintdevice.cpp ../shared/fbopaintdevice.h
+    )
+
+    target_link_libraries(gradients PUBLIC
+        Qt::OpenGL
+    )
+endif()
+
+install(TARGETS gradients
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/painting/imagecomposition/CMakeLists.txt b/examples/widgets/painting/imagecomposition/CMakeLists.txt
new file mode 100644
index 0000000000..1b3d06da8f
--- /dev/null
+++ b/examples/widgets/painting/imagecomposition/CMakeLists.txt
@@ -0,0 +1,46 @@
+# Generated from imagecomposition.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(imagecomposition LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/painting/imagecomposition")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(imagecomposition
+    imagecomposer.cpp imagecomposer.h
+    main.cpp
+)
+target_link_libraries(imagecomposition PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+
+# Resources:
+set(imagecomposition_resource_files
+    "images/butterfly.png"
+    "images/checker.png"
+)
+
+qt6_add_resources(imagecomposition "imagecomposition"
+    PREFIX
+        "/"
+    FILES
+        ${imagecomposition_resource_files}
+)
+
+install(TARGETS imagecomposition
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/painting/imagecomposition/imagecomposer.cpp b/examples/widgets/painting/imagecomposition/imagecomposer.cpp
index ffdc8f433c..f0935147cf 100644
--- a/examples/widgets/painting/imagecomposition/imagecomposer.cpp
+++ b/examples/widgets/painting/imagecomposition/imagecomposer.cpp
@@ -102,7 +102,7 @@ ImageComposer::ImageComposer()
 //! [3]
     connect(sourceButton, &QAbstractButton::clicked,
             this, &ImageComposer::chooseSource);
-    connect(operatorComboBox, QOverload<int>::of(&QComboBox::activated),
+    connect(operatorComboBox, &QComboBox::activated,
             this, &ImageComposer::recalculateResult);
     connect(destinationButton, &QAbstractButton::clicked,
             this, &ImageComposer::chooseDestination);
diff --git a/examples/widgets/painting/painterpaths/CMakeLists.txt b/examples/widgets/painting/painterpaths/CMakeLists.txt
new file mode 100644
index 0000000000..7ae6f0a016
--- /dev/null
+++ b/examples/widgets/painting/painterpaths/CMakeLists.txt
@@ -0,0 +1,39 @@
+# Generated from painterpaths.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(painterpaths LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/painting/painterpaths")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(painterpaths
+    main.cpp
+    renderarea.cpp renderarea.h
+    window.cpp window.h
+)
+target_link_libraries(painterpaths PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+if(UNIX AND NOT APPLE AND NOT HAIKU AND NOT INTEGRITY AND NOT VXWORKS)
+    target_link_libraries(painterpaths PUBLIC
+        m
+    )
+endif()
+
+install(TARGETS painterpaths
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/painting/painterpaths/window.cpp b/examples/widgets/painting/painterpaths/window.cpp
index 6fb3218313..07d3c5aaa8 100644
--- a/examples/widgets/painting/painterpaths/window.cpp
+++ b/examples/widgets/painting/painterpaths/window.cpp
@@ -194,19 +194,19 @@ Window::Window()
 //! [12]
 
 //! [16]
-    connect(fillRuleComboBox, QOverload<int>::of(&QComboBox::activated),
+    connect(fillRuleComboBox, &QComboBox::activated,
             this, &Window::fillRuleChanged);
-    connect(fillColor1ComboBox, QOverload<int>::of(&QComboBox::activated),
+    connect(fillColor1ComboBox, &QComboBox::activated,
             this, &Window::fillGradientChanged);
-    connect(fillColor2ComboBox, QOverload<int>::of(&QComboBox::activated),
+    connect(fillColor2ComboBox, &QComboBox::activated,
             this, &Window::fillGradientChanged);
-    connect(penColorComboBox, QOverload<int>::of(&QComboBox::activated),
+    connect(penColorComboBox, &QComboBox::activated,
             this, &Window::penColorChanged);
 
     for (RenderArea *area : qAsConst(renderAreas)) {
-        connect(penWidthSpinBox, QOverload<int>::of(&QSpinBox::valueChanged),
+        connect(penWidthSpinBox, &QSpinBox::valueChanged,
                 area, &RenderArea::setPenWidth);
-        connect(rotationAngleSpinBox, QOverload<int>::of(&QSpinBox::valueChanged),
+        connect(rotationAngleSpinBox, &QSpinBox::valueChanged,
                 area, &RenderArea::setRotationAngle);
     }
 
diff --git a/examples/widgets/painting/pathstroke/CMakeLists.txt b/examples/widgets/painting/pathstroke/CMakeLists.txt
new file mode 100644
index 0000000000..9f5c24fe88
--- /dev/null
+++ b/examples/widgets/painting/pathstroke/CMakeLists.txt
@@ -0,0 +1,214 @@
+# Generated from pathstroke.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(pathstroke LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/painting/pathstroke")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(pathstroke
+    ../shared/arthurstyle.cpp ../shared/arthurstyle.h
+    ../shared/arthurwidgets.cpp ../shared/arthurwidgets.h
+    ../shared/hoverpoints.cpp ../shared/hoverpoints.h
+    main.cpp
+    pathstroke.cpp pathstroke.h
+)
+target_include_directories(pathstroke PUBLIC
+    ../shared
+)
+
+target_link_libraries(pathstroke PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+
+# Resources:
+set_source_files_properties("../shared/images/button_normal_cap_left.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/button_normal_cap_left.png"
+)
+set_source_files_properties("../shared/images/button_normal_cap_right.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/button_normal_cap_right.png"
+)
+set_source_files_properties("../shared/images/button_normal_stretch.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/button_normal_stretch.png"
+)
+set_source_files_properties("../shared/images/button_pressed_cap_left.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/button_pressed_cap_left.png"
+)
+set_source_files_properties("../shared/images/button_pressed_cap_right.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/button_pressed_cap_right.png"
+)
+set_source_files_properties("../shared/images/button_pressed_stretch.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/button_pressed_stretch.png"
+)
+set_source_files_properties("../shared/images/frame_bottom.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/frame_bottom.png"
+)
+set_source_files_properties("../shared/images/frame_bottomleft.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/frame_bottomleft.png"
+)
+set_source_files_properties("../shared/images/frame_bottomright.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/frame_bottomright.png"
+)
+set_source_files_properties("../shared/images/frame_left.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/frame_left.png"
+)
+set_source_files_properties("../shared/images/frame_right.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/frame_right.png"
+)
+set_source_files_properties("../shared/images/frame_top.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/frame_top.png"
+)
+set_source_files_properties("../shared/images/frame_topleft.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/frame_topleft.png"
+)
+set_source_files_properties("../shared/images/frame_topright.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/frame_topright.png"
+)
+set_source_files_properties("../shared/images/groupframe_bottom_left.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_bottom_left.png"
+)
+set_source_files_properties("../shared/images/groupframe_bottom_right.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_bottom_right.png"
+)
+set_source_files_properties("../shared/images/groupframe_bottom_stretch.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_bottom_stretch.png"
+)
+set_source_files_properties("../shared/images/groupframe_left_stretch.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_left_stretch.png"
+)
+set_source_files_properties("../shared/images/groupframe_right_stretch.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_right_stretch.png"
+)
+set_source_files_properties("../shared/images/groupframe_top_stretch.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_top_stretch.png"
+)
+set_source_files_properties("../shared/images/groupframe_topleft.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_topleft.png"
+)
+set_source_files_properties("../shared/images/groupframe_topright.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/groupframe_topright.png"
+)
+set_source_files_properties("../shared/images/line_dash_dot.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/line_dash_dot.png"
+)
+set_source_files_properties("../shared/images/line_dash_dot_dot.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/line_dash_dot_dot.png"
+)
+set_source_files_properties("../shared/images/line_dashed.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/line_dashed.png"
+)
+set_source_files_properties("../shared/images/line_dotted.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/line_dotted.png"
+)
+set_source_files_properties("../shared/images/line_solid.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/line_solid.png"
+)
+set_source_files_properties("../shared/images/radiobutton-on.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/radiobutton-on.png"
+)
+set_source_files_properties("../shared/images/radiobutton_off.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/radiobutton_off.png"
+)
+set_source_files_properties("../shared/images/radiobutton_on.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/radiobutton_on.png"
+)
+set_source_files_properties("../shared/images/slider_bar.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/slider_bar.png"
+)
+set_source_files_properties("../shared/images/slider_thumb_on.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/slider_thumb_on.png"
+)
+set_source_files_properties("../shared/images/title_cap_left.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/title_cap_left.png"
+)
+set_source_files_properties("../shared/images/title_cap_right.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/title_cap_right.png"
+)
+set_source_files_properties("../shared/images/title_stretch.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/title_stretch.png"
+)
+set(shared_resource_files
+    "images/button_normal_cap_left.png"
+    "images/button_normal_cap_right.png"
+    "images/button_normal_stretch.png"
+    "images/button_pressed_cap_left.png"
+    "images/button_pressed_cap_right.png"
+    "images/button_pressed_stretch.png"
+    "images/frame_bottom.png"
+    "images/frame_bottomleft.png"
+    "images/frame_bottomright.png"
+    "images/frame_left.png"
+    "images/frame_right.png"
+    "images/frame_top.png"
+    "images/frame_topleft.png"
+    "images/frame_topright.png"
+    "images/groupframe_bottom_left.png"
+    "images/groupframe_bottom_right.png"
+    "images/groupframe_bottom_stretch.png"
+    "images/groupframe_left_stretch.png"
+    "images/groupframe_right_stretch.png"
+    "images/groupframe_top_stretch.png"
+    "images/groupframe_topleft.png"
+    "images/groupframe_topright.png"
+    "images/line_dash_dot.png"
+    "images/line_dash_dot_dot.png"
+    "images/line_dashed.png"
+    "images/line_dotted.png"
+    "images/line_solid.png"
+    "images/radiobutton-on.png"
+    "images/radiobutton_off.png"
+    "images/radiobutton_on.png"
+    "images/slider_bar.png"
+    "images/slider_thumb_on.png"
+    "images/title_cap_left.png"
+    "images/title_cap_right.png"
+    "images/title_stretch.png"
+)
+
+qt6_add_resources(pathstroke "shared"
+    PREFIX
+        "/res"
+    BASE
+        "../shared"
+    FILES
+        ${shared_resource_files}
+)
+set(pathstroke_resource_files
+    "pathstroke.cpp"
+    "pathstroke.html"
+)
+
+qt6_add_resources(pathstroke "pathstroke"
+    PREFIX
+        "/res/pathstroke"
+    FILES
+        ${pathstroke_resource_files}
+)
+
+if(QT_FEATURE_opengl)
+    target_sources(pathstroke PUBLIC
+        ../shared/fbopaintdevice.cpp ../shared/fbopaintdevice.h
+    )
+
+    target_link_libraries(pathstroke PUBLIC
+        Qt::OpenGL
+    )
+endif()
+
+install(TARGETS pathstroke
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/painting/shared/CMakeLists.txt b/examples/widgets/painting/shared/CMakeLists.txt
new file mode 100644
index 0000000000..4c7049e01d
--- /dev/null
+++ b/examples/widgets/painting/shared/CMakeLists.txt
@@ -0,0 +1,24 @@
+# special case: Entire file!
+
+# special case:
+add_library(painting_shared OBJECT)
+qt6_wrap_cpp(moc_files arthurwidgets.h hoverpoints.h) # no automoc for OBJECT libs:-/
+target_sources(painting_shared PRIVATE
+    arthurstyle.cpp arthurstyle.h
+    arthurwidgets.cpp arthurwidgets.h
+    hoverpoints.cpp hoverpoints.h
+    ${moc_files}
+)
+target_link_libraries(painting_shared PUBLIC Qt::Widgets)
+target_include_directories(painting_shared PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}")
+
+## Scopes:
+#####################################################################
+
+if (TARGET Qt::OpenGL OR QT_FEATURE_opengles2)
+    target_compile_definitions(painting_shared PRIVATE QT_OPENGL_SUPPORT)
+    target_link_libraries(painting_shared PRIVATE
+        Qt::OpenGL
+        Qt::Widgets
+    )
+endif()
diff --git a/examples/widgets/painting/shared/arthurwidgets.cpp b/examples/widgets/painting/shared/arthurwidgets.cpp
index 40d712c9e3..e24130e464 100644
--- a/examples/widgets/painting/shared/arthurwidgets.cpp
+++ b/examples/widgets/painting/shared/arthurwidgets.cpp
@@ -62,8 +62,10 @@
 #include <QRegularExpression>
 #include <QOffscreenSurface>
 #include <QOpenGLContext>
-#include <QOpenGLPaintDevice>
-#include <QOpenGLWindow>
+#if QT_CONFIG(opengl)
+#include <QtOpenGL/QOpenGLPaintDevice>
+#include <QtOpenGL/QOpenGLWindow>
+#endif
 
 extern QPixmap cached(const QString &img);
 
diff --git a/examples/widgets/painting/shared/hoverpoints.cpp b/examples/widgets/painting/shared/hoverpoints.cpp
index 2bf3963e9e..f834f315f9 100644
--- a/examples/widgets/painting/shared/hoverpoints.cpp
+++ b/examples/widgets/painting/shared/hoverpoints.cpp
@@ -53,6 +53,10 @@
 
 #include <algorithm>
 
+#if QT_CONFIG(opengl)
+#include <QtOpenGL/QOpenGLWindow>
+#endif
+
 #define printf
 
 HoverPoints::HoverPoints(QWidget *widget, PointShape shape)
diff --git a/examples/widgets/painting/shared/shared.pri b/examples/widgets/painting/shared/shared.pri
index cb08b00348..7e2b4df8cb 100644
--- a/examples/widgets/painting/shared/shared.pri
+++ b/examples/widgets/painting/shared/shared.pri
@@ -1,6 +1,7 @@
 INCLUDEPATH += $$PWD
 
 qtConfig(opengl) {
+    QT += opengl
     SOURCES += $$PWD/fbopaintdevice.cpp
     HEADERS += $$PWD/fbopaintdevice.h
 }
diff --git a/examples/widgets/painting/transformations/CMakeLists.txt b/examples/widgets/painting/transformations/CMakeLists.txt
new file mode 100644
index 0000000000..b5725967ea
--- /dev/null
+++ b/examples/widgets/painting/transformations/CMakeLists.txt
@@ -0,0 +1,33 @@
+# Generated from transformations.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(transformations LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/painting/transformations")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(transformations
+    main.cpp
+    renderarea.cpp renderarea.h
+    window.cpp window.h
+)
+target_link_libraries(transformations PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+install(TARGETS transformations
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/painting/transformations/window.cpp b/examples/widgets/painting/transformations/window.cpp
index 8261c4e12e..a07e4dd5d1 100644
--- a/examples/widgets/painting/transformations/window.cpp
+++ b/examples/widgets/painting/transformations/window.cpp
@@ -79,7 +79,7 @@ Window::Window()
         operationComboBoxes[i]->addItem(tr("Scale to 75%"));
         operationComboBoxes[i]->addItem(tr("Translate by (50, 50)"));
 
-        connect(operationComboBoxes[i], QOverload<int>::of(&QComboBox::activated),
+        connect(operationComboBoxes[i], &QComboBox::activated,
                 this, &Window::operationChanged);
 
         layout->addWidget(transformedRenderAreas[i], 0, i + 1);
@@ -159,7 +159,7 @@ void Window::setupShapes()
     shapes.append(text);
     shapes.append(truck);
 
-    connect(shapeComboBox, QOverload<int>::of(&QComboBox::activated),
+    connect(shapeComboBox, &QComboBox::activated,
             this, &Window::shapeSelected);
 }
 //! [7]
diff --git a/examples/widgets/richtext/CMakeLists.txt b/examples/widgets/richtext/CMakeLists.txt
new file mode 100644
index 0000000000..adb98e38f9
--- /dev/null
+++ b/examples/widgets/richtext/CMakeLists.txt
@@ -0,0 +1,6 @@
+# Generated from richtext.pro.
+
+add_subdirectory(calendar)
+add_subdirectory(orderform)
+add_subdirectory(syntaxhighlighter)
+add_subdirectory(textedit)
diff --git a/examples/widgets/richtext/calendar/CMakeLists.txt b/examples/widgets/richtext/calendar/CMakeLists.txt
new file mode 100644
index 0000000000..9cfc150a0e
--- /dev/null
+++ b/examples/widgets/richtext/calendar/CMakeLists.txt
@@ -0,0 +1,32 @@
+# Generated from calendar.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(calendar LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/richtext/calendar")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(calendar
+    main.cpp
+    mainwindow.cpp mainwindow.h
+)
+target_link_libraries(calendar PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+install(TARGETS calendar
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/richtext/calendar/mainwindow.cpp b/examples/widgets/richtext/calendar/mainwindow.cpp
index 3ddb1cf7ad..8ac5a8cdce 100644
--- a/examples/widgets/richtext/calendar/mainwindow.cpp
+++ b/examples/widgets/richtext/calendar/mainwindow.cpp
@@ -86,11 +86,11 @@ MainWindow::MainWindow()
 //! [2]
 
 //! [3]
-    connect(monthCombo, QOverload<int>::of(&QComboBox::activated),
+    connect(monthCombo, &QComboBox::activated,
             this, &MainWindow::setMonth);
     connect(yearEdit, &QDateTimeEdit::dateChanged,
             this, &MainWindow::setYear);
-    connect(fontSizeSpinBox, QOverload<int>::of(&QSpinBox::valueChanged),
+    connect(fontSizeSpinBox, &QSpinBox::valueChanged,
             this, &MainWindow::setFontSize);
 //! [3]
 
diff --git a/examples/widgets/richtext/orderform/CMakeLists.txt b/examples/widgets/richtext/orderform/CMakeLists.txt
new file mode 100644
index 0000000000..fc92c60c30
--- /dev/null
+++ b/examples/widgets/richtext/orderform/CMakeLists.txt
@@ -0,0 +1,39 @@
+# Generated from orderform.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(orderform LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/richtext/orderform")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(orderform
+    detailsdialog.cpp detailsdialog.h
+    main.cpp
+    mainwindow.cpp mainwindow.h
+)
+target_link_libraries(orderform PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+if(TARGET Qt::PrintSupport)
+    target_link_libraries(orderform PUBLIC
+        Qt::PrintSupport
+    )
+endif()
+
+install(TARGETS orderform
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/richtext/syntaxhighlighter/CMakeLists.txt b/examples/widgets/richtext/syntaxhighlighter/CMakeLists.txt
new file mode 100644
index 0000000000..ec98b1af4f
--- /dev/null
+++ b/examples/widgets/richtext/syntaxhighlighter/CMakeLists.txt
@@ -0,0 +1,33 @@
+# Generated from syntaxhighlighter.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(syntaxhighlighter LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/richtext/syntaxhighlighter")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(syntaxhighlighter
+    highlighter.cpp highlighter.h
+    main.cpp
+    mainwindow.cpp mainwindow.h
+)
+target_link_libraries(syntaxhighlighter PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+install(TARGETS syntaxhighlighter
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/richtext/textedit/.prev_CMakeLists.txt b/examples/widgets/richtext/textedit/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..dcb2b628ef
--- /dev/null
+++ b/examples/widgets/richtext/textedit/.prev_CMakeLists.txt
@@ -0,0 +1,98 @@
+# Generated from textedit.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(textedit LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/richtext/textedit")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(textedit
+    main.cpp
+    textedit.cpp textedit.h
+)
+target_link_libraries(textedit PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+
+# Resources:
+set(textedit_resource_files
+    "example.html"
+    "images/logo32.png"
+    "images/mac/checkbox-checked.png"
+    "images/mac/checkbox.png"
+    "images/mac/editcopy.png"
+    "images/mac/editcut.png"
+    "images/mac/editpaste.png"
+    "images/mac/editredo.png"
+    "images/mac/editundo.png"
+    "images/mac/exportpdf.png"
+    "images/mac/filenew.png"
+    "images/mac/fileopen.png"
+    "images/mac/fileprint.png"
+    "images/mac/filesave.png"
+    "images/mac/format-indent-less.png"
+    "images/mac/format-indent-more.png"
+    "images/mac/textbold.png"
+    "images/mac/textcenter.png"
+    "images/mac/textitalic.png"
+    "images/mac/textjustify.png"
+    "images/mac/textleft.png"
+    "images/mac/textright.png"
+    "images/mac/textunder.png"
+    "images/mac/zoomin.png"
+    "images/mac/zoomout.png"
+    "images/win/checkbox-checked.png"
+    "images/win/checkbox.png"
+    "images/win/editcopy.png"
+    "images/win/editcut.png"
+    "images/win/editpaste.png"
+    "images/win/editredo.png"
+    "images/win/editundo.png"
+    "images/win/exportpdf.png"
+    "images/win/filenew.png"
+    "images/win/fileopen.png"
+    "images/win/fileprint.png"
+    "images/win/filesave.png"
+    "images/win/format-indent-less.png"
+    "images/win/format-indent-more.png"
+    "images/win/textbold.png"
+    "images/win/textcenter.png"
+    "images/win/textitalic.png"
+    "images/win/textjustify.png"
+    "images/win/textleft.png"
+    "images/win/textright.png"
+    "images/win/textunder.png"
+    "images/win/zoomin.png"
+    "images/win/zoomout.png"
+)
+
+qt6_add_resources(textedit "textedit"
+    PREFIX
+        "/"
+    FILES
+        ${textedit_resource_files}
+)
+
+if(TARGET Qt::PrintSupport)
+    target_link_libraries(textedit PUBLIC
+        Qt::PrintSupport
+    )
+endif()
+
+install(TARGETS textedit
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/richtext/textedit/CMakeLists.txt b/examples/widgets/richtext/textedit/CMakeLists.txt
new file mode 100644
index 0000000000..8aa4e016fe
--- /dev/null
+++ b/examples/widgets/richtext/textedit/CMakeLists.txt
@@ -0,0 +1,104 @@
+# Generated from textedit.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(textedit LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/richtext/textedit")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+find_package(Qt6 COMPONENTS PrintSupport) # special case
+
+add_qt_gui_executable(textedit
+    main.cpp
+    textedit.cpp textedit.h
+)
+target_link_libraries(textedit PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+# special case begin
+if (TARGET Qt::PrintSupport)
+    target_link_libraries(textedit PUBLIC Qt::PrintSupport)
+endif()
+# special case end
+
+
+# Resources:
+set(textedit_resource_files
+    "example.html"
+    "images/logo32.png"
+    "images/mac/checkbox-checked.png"
+    "images/mac/checkbox.png"
+    "images/mac/editcopy.png"
+    "images/mac/editcut.png"
+    "images/mac/editpaste.png"
+    "images/mac/editredo.png"
+    "images/mac/editundo.png"
+    "images/mac/exportpdf.png"
+    "images/mac/filenew.png"
+    "images/mac/fileopen.png"
+    "images/mac/fileprint.png"
+    "images/mac/filesave.png"
+    "images/mac/format-indent-less.png"
+    "images/mac/format-indent-more.png"
+    "images/mac/textbold.png"
+    "images/mac/textcenter.png"
+    "images/mac/textitalic.png"
+    "images/mac/textjustify.png"
+    "images/mac/textleft.png"
+    "images/mac/textright.png"
+    "images/mac/textunder.png"
+    "images/mac/zoomin.png"
+    "images/mac/zoomout.png"
+    "images/win/checkbox-checked.png"
+    "images/win/checkbox.png"
+    "images/win/editcopy.png"
+    "images/win/editcut.png"
+    "images/win/editpaste.png"
+    "images/win/editredo.png"
+    "images/win/editundo.png"
+    "images/win/exportpdf.png"
+    "images/win/filenew.png"
+    "images/win/fileopen.png"
+    "images/win/fileprint.png"
+    "images/win/filesave.png"
+    "images/win/format-indent-less.png"
+    "images/win/format-indent-more.png"
+    "images/win/textbold.png"
+    "images/win/textcenter.png"
+    "images/win/textitalic.png"
+    "images/win/textjustify.png"
+    "images/win/textleft.png"
+    "images/win/textright.png"
+    "images/win/textunder.png"
+    "images/win/zoomin.png"
+    "images/win/zoomout.png"
+)
+
+qt6_add_resources(textedit "textedit"
+    PREFIX
+        "/"
+    FILES
+        ${textedit_resource_files}
+)
+
+if(TARGET Qt::PrintSupport)
+    target_link_libraries(textedit PUBLIC
+        Qt::PrintSupport
+    )
+endif()
+
+install(TARGETS textedit
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/richtext/textedit/textedit.cpp b/examples/widgets/richtext/textedit/textedit.cpp
index 7708b25a24..5d27e7df0c 100644
--- a/examples/widgets/richtext/textedit/textedit.cpp
+++ b/examples/widgets/richtext/textedit/textedit.cpp
@@ -389,7 +389,7 @@ void TextEdit::setupTextActions()
     comboStyle->addItem("Heading 5");
     comboStyle->addItem("Heading 6");
 
-    connect(comboStyle, QOverload<int>::of(&QComboBox::activated), this, &TextEdit::textStyle);
+    connect(comboStyle, &QComboBox::activated, this, &TextEdit::textStyle);
 
     comboFont = new QFontComboBox(tb);
     tb->addWidget(comboFont);
diff --git a/examples/widgets/scroller/CMakeLists.txt b/examples/widgets/scroller/CMakeLists.txt
new file mode 100644
index 0000000000..f663cd9890
--- /dev/null
+++ b/examples/widgets/scroller/CMakeLists.txt
@@ -0,0 +1,3 @@
+# Generated from scroller.pro.
+
+add_subdirectory(graphicsview)
diff --git a/examples/widgets/scroller/graphicsview/CMakeLists.txt b/examples/widgets/scroller/graphicsview/CMakeLists.txt
new file mode 100644
index 0000000000..6e389956e9
--- /dev/null
+++ b/examples/widgets/scroller/graphicsview/CMakeLists.txt
@@ -0,0 +1,31 @@
+# Generated from graphicsview.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(graphicsview LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/scroller/graphicsview")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(graphicsview
+    main.cpp
+)
+target_link_libraries(graphicsview PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+install(TARGETS graphicsview
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/statemachine/CMakeLists.txt b/examples/widgets/statemachine/CMakeLists.txt
new file mode 100644
index 0000000000..8527fcbc69
--- /dev/null
+++ b/examples/widgets/statemachine/CMakeLists.txt
@@ -0,0 +1,11 @@
+# Generated from statemachine.pro.
+
+add_subdirectory(factorial)
+add_subdirectory(pingpong)
+
+if(TARGET Qt::Widgets)
+    add_subdirectory(eventtransitions)
+    add_subdirectory(rogue)
+    add_subdirectory(trafficlight)
+    add_subdirectory(twowaybutton)
+endif()
diff --git a/examples/widgets/statemachine/eventtransitions/CMakeLists.txt b/examples/widgets/statemachine/eventtransitions/CMakeLists.txt
new file mode 100644
index 0000000000..c011eb1e0f
--- /dev/null
+++ b/examples/widgets/statemachine/eventtransitions/CMakeLists.txt
@@ -0,0 +1,31 @@
+# Generated from eventtransitions.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(eventtransitions LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/statemachine/eventtransitions")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(eventtransitions
+    main.cpp
+)
+target_link_libraries(eventtransitions PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+install(TARGETS eventtransitions
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/statemachine/factorial/CMakeLists.txt b/examples/widgets/statemachine/factorial/CMakeLists.txt
new file mode 100644
index 0000000000..e4c5ddc92d
--- /dev/null
+++ b/examples/widgets/statemachine/factorial/CMakeLists.txt
@@ -0,0 +1,27 @@
+# Generated from factorial.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(factorial LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/statemachine/factorial")
+
+find_package(Qt6 COMPONENTS Core)
+
+add_executable(factorial
+    main.cpp
+)
+target_link_libraries(factorial PUBLIC
+    Qt::Core
+)
+
+install(TARGETS factorial
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/statemachine/pingpong/CMakeLists.txt b/examples/widgets/statemachine/pingpong/CMakeLists.txt
new file mode 100644
index 0000000000..e194afb59e
--- /dev/null
+++ b/examples/widgets/statemachine/pingpong/CMakeLists.txt
@@ -0,0 +1,27 @@
+# Generated from pingpong.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(pingpong LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/statemachine/pingpong")
+
+find_package(Qt6 COMPONENTS Core)
+
+add_executable(pingpong
+    main.cpp
+)
+target_link_libraries(pingpong PUBLIC
+    Qt::Core
+)
+
+install(TARGETS pingpong
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/statemachine/rogue/CMakeLists.txt b/examples/widgets/statemachine/rogue/CMakeLists.txt
new file mode 100644
index 0000000000..0142f60f63
--- /dev/null
+++ b/examples/widgets/statemachine/rogue/CMakeLists.txt
@@ -0,0 +1,33 @@
+# Generated from rogue.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(rogue LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/statemachine/rogue")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(rogue
+    main.cpp
+    movementtransition.h
+    window.cpp window.h
+)
+target_link_libraries(rogue PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+install(TARGETS rogue
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/statemachine/trafficlight/CMakeLists.txt b/examples/widgets/statemachine/trafficlight/CMakeLists.txt
new file mode 100644
index 0000000000..4069f601ef
--- /dev/null
+++ b/examples/widgets/statemachine/trafficlight/CMakeLists.txt
@@ -0,0 +1,31 @@
+# Generated from trafficlight.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(trafficlight LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/statemachine/trafficlight")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(trafficlight
+    main.cpp
+)
+target_link_libraries(trafficlight PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+install(TARGETS trafficlight
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/statemachine/twowaybutton/CMakeLists.txt b/examples/widgets/statemachine/twowaybutton/CMakeLists.txt
new file mode 100644
index 0000000000..05a8b87004
--- /dev/null
+++ b/examples/widgets/statemachine/twowaybutton/CMakeLists.txt
@@ -0,0 +1,31 @@
+# Generated from twowaybutton.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(twowaybutton LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/statemachine/twowaybutton")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(twowaybutton
+    main.cpp
+)
+target_link_libraries(twowaybutton PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+install(TARGETS twowaybutton
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/tools/CMakeLists.txt b/examples/widgets/tools/CMakeLists.txt
new file mode 100644
index 0000000000..042f751b0f
--- /dev/null
+++ b/examples/widgets/tools/CMakeLists.txt
@@ -0,0 +1,22 @@
+# Generated from tools.pro.
+
+add_subdirectory(codecs)
+add_subdirectory(completer)
+add_subdirectory(customcompleter)
+if(QT_FEATURE_translation) # special case
+    add_subdirectory(i18n)
+endif()
+add_subdirectory(regexp)
+add_subdirectory(regularexpression)
+add_subdirectory(settingseditor)
+add_subdirectory(styleplugin)
+add_subdirectory(treemodelcompleter)
+add_subdirectory(undo)
+add_subdirectory(undoframework)
+
+if(QT_FEATURE_library) # special case
+    add_subdirectory(echoplugin)
+    # FIXME: Currently broken # special case
+    # Fails to link (ld: error: undefined symbol: qt_static_plugin_BasicToolsPlugin()) # special case
+    #add_subdirectory(plugandpaint) # special case
+endif()
diff --git a/examples/widgets/tools/codecs/CMakeLists.txt b/examples/widgets/tools/codecs/CMakeLists.txt
new file mode 100644
index 0000000000..7e2714fc4b
--- /dev/null
+++ b/examples/widgets/tools/codecs/CMakeLists.txt
@@ -0,0 +1,47 @@
+# Generated from codecs.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(codecs LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/tools/codecs")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(codecs
+    encodingdialog.cpp encodingdialog.h
+    main.cpp
+    mainwindow.cpp mainwindow.h
+    previewform.cpp previewform.h
+)
+target_link_libraries(codecs PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+
+# Resources:
+set(codecs_resource_files
+    "images/editcopy.png"
+)
+
+qt6_add_resources(codecs "codecs"
+    PREFIX
+        "/"
+    FILES
+        ${codecs_resource_files}
+)
+
+install(TARGETS codecs
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/tools/codecs/previewform.cpp b/examples/widgets/tools/codecs/previewform.cpp
index f48651335a..80a99bf271 100644
--- a/examples/widgets/tools/codecs/previewform.cpp
+++ b/examples/widgets/tools/codecs/previewform.cpp
@@ -167,7 +167,7 @@ PreviewForm::PreviewForm(QWidget *parent)
         new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel);
     okButton = buttonBox->button(QDialogButtonBox::Ok);
 
-    connect(encodingComboBox, QOverload<int>::of(&QComboBox::activated),
+    connect(encodingComboBox, &QComboBox::activated,
             this, &PreviewForm::updateTextEdit);
     connect(buttonBox, &QDialogButtonBox::accepted, this, &QDialog::accept);
     connect(buttonBox, &QDialogButtonBox::rejected, this, &QDialog::reject);
diff --git a/examples/widgets/tools/completer/CMakeLists.txt b/examples/widgets/tools/completer/CMakeLists.txt
new file mode 100644
index 0000000000..b60d38cfdc
--- /dev/null
+++ b/examples/widgets/tools/completer/CMakeLists.txt
@@ -0,0 +1,47 @@
+# Generated from completer.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(completer LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/tools/completer")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(completer
+    fsmodel.cpp fsmodel.h
+    main.cpp
+    mainwindow.cpp mainwindow.h
+)
+target_link_libraries(completer PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+
+# Resources:
+set(completer_resource_files
+    "resources/countries.txt"
+    "resources/wordlist.txt"
+)
+
+qt6_add_resources(completer "completer"
+    PREFIX
+        "/"
+    FILES
+        ${completer_resource_files}
+)
+
+install(TARGETS completer
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/tools/completer/mainwindow.cpp b/examples/widgets/tools/completer/mainwindow.cpp
index b50e0a5456..8e9c0e0615 100644
--- a/examples/widgets/tools/completer/mainwindow.cpp
+++ b/examples/widgets/tools/completer/mainwindow.cpp
@@ -117,13 +117,13 @@ MainWindow::MainWindow(QWidget *parent)
     contentsLabel = new QLabel;
     contentsLabel->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
 
-    connect(modelCombo, QOverload<int>::of(&QComboBox::activated),
+    connect(modelCombo, &QComboBox::activated,
             this, &MainWindow::changeModel);
-    connect(modeCombo, QOverload<int>::of(&QComboBox::activated),
+    connect(modeCombo, &QComboBox::activated,
             this, &MainWindow::changeMode);
-    connect(caseCombo, QOverload<int>::of(&QComboBox::activated),
+    connect(caseCombo, &QComboBox::activated,
             this, &MainWindow::changeCase);
-    connect(maxVisibleSpinBox, QOverload<int>::of(&QSpinBox::valueChanged),
+    connect(maxVisibleSpinBox, &QSpinBox::valueChanged,
             this, &MainWindow::changeMaxVisible);
 //! [2]
 
diff --git a/examples/widgets/tools/customcompleter/CMakeLists.txt b/examples/widgets/tools/customcompleter/CMakeLists.txt
new file mode 100644
index 0000000000..a1b1deee12
--- /dev/null
+++ b/examples/widgets/tools/customcompleter/CMakeLists.txt
@@ -0,0 +1,46 @@
+# Generated from customcompleter.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(customcompleter LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/tools/customcompleter")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(customcompleter
+    main.cpp
+    mainwindow.cpp mainwindow.h
+    textedit.cpp textedit.h
+)
+target_link_libraries(customcompleter PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+
+# Resources:
+set(customcompleter_resource_files
+    "resources/wordlist.txt"
+)
+
+qt6_add_resources(customcompleter "customcompleter"
+    PREFIX
+        "/"
+    FILES
+        ${customcompleter_resource_files}
+)
+
+install(TARGETS customcompleter
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/tools/echoplugin/CMakeLists.txt b/examples/widgets/tools/echoplugin/CMakeLists.txt
new file mode 100644
index 0000000000..b848e08e72
--- /dev/null
+++ b/examples/widgets/tools/echoplugin/CMakeLists.txt
@@ -0,0 +1,4 @@
+# Generated from echoplugin.pro.
+
+add_subdirectory(echowindow)
+add_subdirectory(plugin)
diff --git a/examples/widgets/tools/echoplugin/echowindow/.prev_CMakeLists.txt b/examples/widgets/tools/echoplugin/echowindow/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..cd116482d8
--- /dev/null
+++ b/examples/widgets/tools/echoplugin/echowindow/.prev_CMakeLists.txt
@@ -0,0 +1,33 @@
+# Generated from echowindow.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(echoplugin LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/tools/echoplugin")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(echoplugin
+    echointerface.h
+    echowindow.cpp echowindow.h
+    main.cpp
+)
+target_link_libraries(echoplugin PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+install(TARGETS echoplugin
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/tools/echoplugin/echowindow/CMakeLists.txt b/examples/widgets/tools/echoplugin/echowindow/CMakeLists.txt
new file mode 100644
index 0000000000..5ca9e75073
--- /dev/null
+++ b/examples/widgets/tools/echoplugin/echowindow/CMakeLists.txt
@@ -0,0 +1,33 @@
+# Generated from echowindow.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(echoplugin LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/tools/echoplugin")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(echopluginwindow # special case: renamed target
+    echointerface.h
+    echowindow.cpp echowindow.h
+    main.cpp
+)
+target_link_libraries(echopluginwindow PUBLIC # special case
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+install(TARGETS echopluginwindow # special case: renamed target
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/tools/echoplugin/plugin/.prev_CMakeLists.txt b/examples/widgets/tools/echoplugin/plugin/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..9f3a93b3bd
--- /dev/null
+++ b/examples/widgets/tools/echoplugin/plugin/.prev_CMakeLists.txt
@@ -0,0 +1,35 @@
+# Generated from plugin.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(echoplugin LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/tools/echoplugin/plugins")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_library(echoplugin MODULE
+    echoplugin.cpp echoplugin.h
+)
+target_include_directories(echoplugin PUBLIC
+    ../echowindow
+)
+
+target_link_libraries(echoplugin PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+install(TARGETS echoplugin
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/tools/echoplugin/plugin/CMakeLists.txt b/examples/widgets/tools/echoplugin/plugin/CMakeLists.txt
new file mode 100644
index 0000000000..9f3a93b3bd
--- /dev/null
+++ b/examples/widgets/tools/echoplugin/plugin/CMakeLists.txt
@@ -0,0 +1,35 @@
+# Generated from plugin.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(echoplugin LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/tools/echoplugin/plugins")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_library(echoplugin MODULE
+    echoplugin.cpp echoplugin.h
+)
+target_include_directories(echoplugin PUBLIC
+    ../echowindow
+)
+
+target_link_libraries(echoplugin PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+install(TARGETS echoplugin
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/tools/i18n/CMakeLists.txt b/examples/widgets/tools/i18n/CMakeLists.txt
new file mode 100644
index 0000000000..783829fe10
--- /dev/null
+++ b/examples/widgets/tools/i18n/CMakeLists.txt
@@ -0,0 +1,59 @@
+# Generated from i18n.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(i18n LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/tools/i18n")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(i18n
+    languagechooser.cpp languagechooser.h
+    main.cpp
+    mainwindow.cpp mainwindow.h
+)
+target_link_libraries(i18n PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+
+# Resources:
+set(i18n_resource_files
+    "translations/i18n_ar.qm"
+    "translations/i18n_cs.qm"
+    "translations/i18n_de.qm"
+    "translations/i18n_el.qm"
+    "translations/i18n_en.qm"
+    "translations/i18n_eo.qm"
+    "translations/i18n_fr.qm"
+    "translations/i18n_it.qm"
+    "translations/i18n_jp.qm"
+    "translations/i18n_ko.qm"
+    "translations/i18n_no.qm"
+    "translations/i18n_ru.qm"
+    "translations/i18n_sv.qm"
+    "translations/i18n_zh.qm"
+)
+
+qt6_add_resources(i18n "i18n"
+    PREFIX
+        "/"
+    FILES
+        ${i18n_resource_files}
+)
+
+install(TARGETS i18n
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/tools/plugandpaint/CMakeLists.txt b/examples/widgets/tools/plugandpaint/CMakeLists.txt
new file mode 100644
index 0000000000..2bde4718b2
--- /dev/null
+++ b/examples/widgets/tools/plugandpaint/CMakeLists.txt
@@ -0,0 +1,4 @@
+# Generated from plugandpaint.pro.
+
+add_subdirectory(plugins)
+add_subdirectory(app)
diff --git a/examples/widgets/tools/plugandpaint/app/.prev_CMakeLists.txt b/examples/widgets/tools/plugandpaint/app/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..0a7a7155ad
--- /dev/null
+++ b/examples/widgets/tools/plugandpaint/app/.prev_CMakeLists.txt
@@ -0,0 +1,66 @@
+# Generated from app.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(plugandpaint LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/tools/plugandpaint")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(plugandpaint
+    interfaces.h
+    main.cpp
+    mainwindow.cpp mainwindow.h
+    paintarea.cpp paintarea.h
+    plugindialog.cpp plugindialog.h
+)
+target_link_libraries(plugandpaint PUBLIC
+    # Remove: L../plugins
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+if(macx-xcode)
+    target_link_libraries(plugandpaint PUBLIC
+        (
+        )
+        pnp_basictools$
+    )
+endif()
+
+if(NOT macx-xcode)
+    target_link_libraries(plugandpaint PUBLIC
+        pnp_basictools
+    )
+endif()
+
+if(((NOT (macx-xcode)) AND (( NOT debug_and_release OR build_pass ) AND CONFIG(debug,debug OR release))) AND (APPLE))
+    target_link_libraries(plugandpaint PUBLIC
+        (LIBS, 0)
+        (LIBS, 1)
+        _debug
+    )
+endif()
+
+if(((NOT (macx-xcode)) AND (( NOT debug_and_release OR build_pass ) AND CONFIG(debug,debug OR release))) AND (WIN32))
+    target_link_libraries(plugandpaint PUBLIC
+        (LIBS, 0)
+        (LIBS, 1)
+        d
+    )
+endif()
+
+install(TARGETS plugandpaint
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/tools/plugandpaint/app/CMakeLists.txt b/examples/widgets/tools/plugandpaint/app/CMakeLists.txt
new file mode 100644
index 0000000000..5548074446
--- /dev/null
+++ b/examples/widgets/tools/plugandpaint/app/CMakeLists.txt
@@ -0,0 +1,68 @@
+# Generated from app.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(plugandpaint LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/tools/plugandpaint")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(plugandpaint
+    interfaces.h
+    main.cpp
+    mainwindow.cpp mainwindow.h
+    paintarea.cpp paintarea.h
+    plugindialog.cpp plugindialog.h
+)
+target_link_libraries(plugandpaint PUBLIC
+    # Remove: L../plugins
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+    pnp_basictools # special case
+)
+target_link_libraries(plugandpaint PUBLIC pnp_basictools) # special case
+
+if(macx-xcode)
+    target_link_libraries(plugandpaint PUBLIC
+        (
+        )
+        pnp_basictools$
+    )
+endif()
+
+if(NOT macx-xcode)
+    target_link_libraries(plugandpaint PUBLIC
+        pnp_basictools
+    )
+endif()
+
+if(((NOT (macx-xcode)) AND (( NOT debug_and_release OR build_pass ) AND CONFIG(debug,debug OR release))) AND (APPLE))
+    target_link_libraries(plugandpaint PUBLIC
+        (LIBS, 0)
+        (LIBS, 1)
+        _debug
+    )
+endif()
+
+if(((NOT (macx-xcode)) AND (( NOT debug_and_release OR build_pass ) AND CONFIG(debug,debug OR release))) AND (WIN32))
+    target_link_libraries(plugandpaint PUBLIC
+        (LIBS, 0)
+        (LIBS, 1)
+        d
+    )
+endif()
+
+install(TARGETS plugandpaint
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/tools/plugandpaint/plugins/CMakeLists.txt b/examples/widgets/tools/plugandpaint/plugins/CMakeLists.txt
new file mode 100644
index 0000000000..1e63da97ca
--- /dev/null
+++ b/examples/widgets/tools/plugandpaint/plugins/CMakeLists.txt
@@ -0,0 +1,4 @@
+# Generated from plugins.pro.
+
+add_subdirectory(basictools)
+add_subdirectory(extrafilters)
diff --git a/examples/widgets/tools/plugandpaint/plugins/basictools/.prev_CMakeLists.txt b/examples/widgets/tools/plugandpaint/plugins/basictools/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..fefa30e2a4
--- /dev/null
+++ b/examples/widgets/tools/plugandpaint/plugins/basictools/.prev_CMakeLists.txt
@@ -0,0 +1,35 @@
+# Generated from basictools.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(pnp_basictools LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/tools/plugandpaint/plugins")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_library(pnp_basictools MODULE
+    basictoolsplugin.cpp basictoolsplugin.h
+)
+target_include_directories(pnp_basictools PUBLIC
+    ../../app
+)
+
+target_link_libraries(pnp_basictools PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+install(TARGETS pnp_basictools
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/tools/plugandpaint/plugins/basictools/CMakeLists.txt b/examples/widgets/tools/plugandpaint/plugins/basictools/CMakeLists.txt
new file mode 100644
index 0000000000..fefa30e2a4
--- /dev/null
+++ b/examples/widgets/tools/plugandpaint/plugins/basictools/CMakeLists.txt
@@ -0,0 +1,35 @@
+# Generated from basictools.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(pnp_basictools LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/tools/plugandpaint/plugins")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_library(pnp_basictools MODULE
+    basictoolsplugin.cpp basictoolsplugin.h
+)
+target_include_directories(pnp_basictools PUBLIC
+    ../../app
+)
+
+target_link_libraries(pnp_basictools PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+install(TARGETS pnp_basictools
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/tools/plugandpaint/plugins/extrafilters/.prev_CMakeLists.txt b/examples/widgets/tools/plugandpaint/plugins/extrafilters/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..2f689893bb
--- /dev/null
+++ b/examples/widgets/tools/plugandpaint/plugins/extrafilters/.prev_CMakeLists.txt
@@ -0,0 +1,35 @@
+# Generated from extrafilters.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(pnp_extrafilters LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/tools/plugandpaint/plugins")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_library(pnp_extrafilters MODULE
+    extrafiltersplugin.cpp extrafiltersplugin.h
+)
+target_include_directories(pnp_extrafilters PUBLIC
+    ../../app
+)
+
+target_link_libraries(pnp_extrafilters PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+install(TARGETS pnp_extrafilters
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/tools/plugandpaint/plugins/extrafilters/CMakeLists.txt b/examples/widgets/tools/plugandpaint/plugins/extrafilters/CMakeLists.txt
new file mode 100644
index 0000000000..2f689893bb
--- /dev/null
+++ b/examples/widgets/tools/plugandpaint/plugins/extrafilters/CMakeLists.txt
@@ -0,0 +1,35 @@
+# Generated from extrafilters.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(pnp_extrafilters LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/tools/plugandpaint/plugins")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_library(pnp_extrafilters MODULE
+    extrafiltersplugin.cpp extrafiltersplugin.h
+)
+target_include_directories(pnp_extrafilters PUBLIC
+    ../../app
+)
+
+target_link_libraries(pnp_extrafilters PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+install(TARGETS pnp_extrafilters
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/tools/regexp/CMakeLists.txt b/examples/widgets/tools/regexp/CMakeLists.txt
new file mode 100644
index 0000000000..7c0ca31c39
--- /dev/null
+++ b/examples/widgets/tools/regexp/CMakeLists.txt
@@ -0,0 +1,32 @@
+# Generated from regexp.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(regexp LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/tools/regexp")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(regexp
+    main.cpp
+    regexpdialog.cpp regexpdialog.h
+)
+target_link_libraries(regexp PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+install(TARGETS regexp
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/tools/regexp/regexpdialog.cpp b/examples/widgets/tools/regexp/regexpdialog.cpp
index bf61d09974..e70bb7a530 100644
--- a/examples/widgets/tools/regexp/regexpdialog.cpp
+++ b/examples/widgets/tools/regexp/regexpdialog.cpp
@@ -142,7 +142,7 @@ RegExpDialog::RegExpDialog(QWidget *parent)
     connect(caseSensitiveCheckBox, &QAbstractButton::toggled,
             this, &RegExpDialog::refresh);
     connect(minimalCheckBox, &QAbstractButton::toggled, this, &RegExpDialog::refresh);
-    connect(syntaxComboBox, QOverload<int>::of(&QComboBox::currentIndexChanged),
+    connect(syntaxComboBox, &QComboBox::currentIndexChanged,
             this, &RegExpDialog::refresh);
 
     patternComboBox->addItem(tr("[A-Za-z_]+([A-Za-z_0-9]*)"));
diff --git a/examples/widgets/tools/regularexpression/CMakeLists.txt b/examples/widgets/tools/regularexpression/CMakeLists.txt
new file mode 100644
index 0000000000..be8fb60a44
--- /dev/null
+++ b/examples/widgets/tools/regularexpression/CMakeLists.txt
@@ -0,0 +1,45 @@
+# Generated from regularexpression.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(regularexpression LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/tools/regularexpression")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(regularexpression
+    main.cpp
+    regularexpressiondialog.cpp regularexpressiondialog.h
+)
+target_link_libraries(regularexpression PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+
+# Resources:
+set(regularexpression_resource_files
+    "images/copy.png"
+)
+
+qt6_add_resources(regularexpression "regularexpression"
+    PREFIX
+        "/"
+    FILES
+        ${regularexpression_resource_files}
+)
+
+install(TARGETS regularexpression
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/tools/regularexpression/regularexpressiondialog.cpp b/examples/widgets/tools/regularexpression/regularexpressiondialog.cpp
index 6398098eee..ff83193152 100644
--- a/examples/widgets/tools/regularexpression/regularexpressiondialog.cpp
+++ b/examples/widgets/tools/regularexpression/regularexpressiondialog.cpp
@@ -222,10 +222,10 @@ RegularExpressionDialog::RegularExpressionDialog(QWidget *parent)
     connect(optimizeOnFirstUsageOptionCheckBox, &QCheckBox::toggled, this, &RegularExpressionDialog::refresh);
     connect(dontAutomaticallyOptimizeOptionCheckBox, &QCheckBox::toggled, this, &RegularExpressionDialog::refresh);
 
-    connect(offsetSpinBox, QOverload<int>::of(&QSpinBox::valueChanged),
+    connect(offsetSpinBox, &QSpinBox::valueChanged,
             this, &RegularExpressionDialog::refresh);
 
-    connect(matchTypeComboBox, QOverload<int>::of(&QComboBox::currentIndexChanged),
+    connect(matchTypeComboBox, &QComboBox::currentIndexChanged,
             this, &RegularExpressionDialog::refresh);
 
     connect(anchoredMatchOptionCheckBox, &QCheckBox::toggled, this, &RegularExpressionDialog::refresh);
diff --git a/examples/widgets/tools/settingseditor/CMakeLists.txt b/examples/widgets/tools/settingseditor/CMakeLists.txt
new file mode 100644
index 0000000000..3ded759084
--- /dev/null
+++ b/examples/widgets/tools/settingseditor/CMakeLists.txt
@@ -0,0 +1,35 @@
+# Generated from settingseditor.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(settingseditor LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/tools/settingseditor")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(settingseditor
+    locationdialog.cpp locationdialog.h
+    main.cpp
+    mainwindow.cpp mainwindow.h
+    settingstree.cpp settingstree.h
+    variantdelegate.cpp variantdelegate.h
+)
+target_link_libraries(settingseditor PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+install(TARGETS settingseditor
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/tools/settingseditor/locationdialog.cpp b/examples/widgets/tools/settingseditor/locationdialog.cpp
index 99c9834a63..86119a1afd 100644
--- a/examples/widgets/tools/settingseditor/locationdialog.cpp
+++ b/examples/widgets/tools/settingseditor/locationdialog.cpp
@@ -115,9 +115,9 @@ LocationDialog::LocationDialog(QWidget *parent)
 
     buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel);
 
-    connect(formatComboBox, QOverload<int>::of(&QComboBox::activated),
+    connect(formatComboBox, &QComboBox::activated,
             this, &LocationDialog::updateLocationsTable);
-    connect(scopeComboBox, QOverload<int>::of(&QComboBox::activated),
+    connect(scopeComboBox, &QComboBox::activated,
             this, &LocationDialog::updateLocationsTable);
     connect(organizationComboBox->lineEdit(),
             &QLineEdit::editingFinished,
@@ -125,7 +125,7 @@ LocationDialog::LocationDialog(QWidget *parent)
     connect(applicationComboBox->lineEdit(),
             &QLineEdit::editingFinished,
             this, &LocationDialog::updateLocationsTable);
-    connect(applicationComboBox, QOverload<int>::of(&QComboBox::activated),
+    connect(applicationComboBox, &QComboBox::activated,
             this, &LocationDialog::updateLocationsTable);
     connect(buttonBox, &QDialogButtonBox::accepted, this, &QDialog::accept);
     connect(buttonBox, &QDialogButtonBox::rejected, this, &QDialog::reject);
diff --git a/examples/widgets/tools/styleplugin/CMakeLists.txt b/examples/widgets/tools/styleplugin/CMakeLists.txt
new file mode 100644
index 0000000000..af10d38700
--- /dev/null
+++ b/examples/widgets/tools/styleplugin/CMakeLists.txt
@@ -0,0 +1,19 @@
+# Generated from styleplugin.pro.
+
+# special case begin
+cmake_minimum_required(VERSION 3.14)
+project(styleplugin LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples")
+
+find_package(Qt6 COMPONENTS Widgets)
+# special case end
+
+add_subdirectory(stylewindow)
+add_subdirectory(plugin)
diff --git a/examples/widgets/tools/styleplugin/plugin/.prev_CMakeLists.txt b/examples/widgets/tools/styleplugin/plugin/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..c1be706fde
--- /dev/null
+++ b/examples/widgets/tools/styleplugin/plugin/.prev_CMakeLists.txt
@@ -0,0 +1,32 @@
+# Generated from plugin.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(simplestyleplugin LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/tools/styleplugin/styles")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_library(simplestyleplugin MODULE
+    simplestyle.cpp simplestyle.h
+    simplestyleplugin.cpp simplestyleplugin.h
+)
+target_link_libraries(simplestyleplugin PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+install(TARGETS simplestyleplugin
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/tools/styleplugin/plugin/CMakeLists.txt b/examples/widgets/tools/styleplugin/plugin/CMakeLists.txt
new file mode 100644
index 0000000000..c1be706fde
--- /dev/null
+++ b/examples/widgets/tools/styleplugin/plugin/CMakeLists.txt
@@ -0,0 +1,32 @@
+# Generated from plugin.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(simplestyleplugin LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/tools/styleplugin/styles")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_library(simplestyleplugin MODULE
+    simplestyle.cpp simplestyle.h
+    simplestyleplugin.cpp simplestyleplugin.h
+)
+target_link_libraries(simplestyleplugin PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+install(TARGETS simplestyleplugin
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/tools/styleplugin/stylewindow/CMakeLists.txt b/examples/widgets/tools/styleplugin/stylewindow/CMakeLists.txt
new file mode 100644
index 0000000000..06ae198b42
--- /dev/null
+++ b/examples/widgets/tools/styleplugin/stylewindow/CMakeLists.txt
@@ -0,0 +1,32 @@
+# Generated from stylewindow.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(styleplugin LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/tools/styleplugin")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(styleplugin
+    main.cpp
+    stylewindow.cpp stylewindow.h
+)
+target_link_libraries(styleplugin PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+install(TARGETS styleplugin
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/tools/treemodelcompleter/CMakeLists.txt b/examples/widgets/tools/treemodelcompleter/CMakeLists.txt
new file mode 100644
index 0000000000..71528b14b9
--- /dev/null
+++ b/examples/widgets/tools/treemodelcompleter/CMakeLists.txt
@@ -0,0 +1,46 @@
+# Generated from treemodelcompleter.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(treemodelcompleter LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/tools/treemodelcompleter")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(treemodelcompleter
+    main.cpp
+    mainwindow.cpp mainwindow.h
+    treemodelcompleter.cpp treemodelcompleter.h
+)
+target_link_libraries(treemodelcompleter PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+
+# Resources:
+set(treemodelcompleter_resource_files
+    "resources/treemodel.txt"
+)
+
+qt6_add_resources(treemodelcompleter "treemodelcompleter"
+    PREFIX
+        "/"
+    FILES
+        ${treemodelcompleter_resource_files}
+)
+
+install(TARGETS treemodelcompleter
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/tools/treemodelcompleter/mainwindow.cpp b/examples/widgets/tools/treemodelcompleter/mainwindow.cpp
index 302ccc436c..3305ac9032 100644
--- a/examples/widgets/tools/treemodelcompleter/mainwindow.cpp
+++ b/examples/widgets/tools/treemodelcompleter/mainwindow.cpp
@@ -126,9 +126,9 @@ MainWindow::MainWindow(QWidget *parent)
 //! [1]
 
 //! [2]
-    connect(modeCombo, QOverload<int>::of(&QComboBox::activated),
+    connect(modeCombo, &QComboBox::activated,
             this, &MainWindow::changeMode);
-    connect(caseCombo, QOverload<int>::of(&QComboBox::activated),
+    connect(caseCombo, &QComboBox::activated,
             this, &MainWindow::changeMode);
 
     lineEdit = new QLineEdit;
diff --git a/examples/widgets/tools/undo/CMakeLists.txt b/examples/widgets/tools/undo/CMakeLists.txt
new file mode 100644
index 0000000000..34bcac326c
--- /dev/null
+++ b/examples/widgets/tools/undo/CMakeLists.txt
@@ -0,0 +1,62 @@
+# Generated from undo.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(undo LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/tools/undo")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(undo
+    commands.cpp commands.h
+    document.cpp document.h
+    main.cpp
+    mainwindow.cpp mainwindow.h mainwindow.ui
+)
+target_link_libraries(undo PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+
+# Resources:
+set(undo_resource_files
+    "icons/background.png"
+    "icons/blue.png"
+    "icons/circle.png"
+    "icons/exit.png"
+    "icons/fileclose.png"
+    "icons/filenew.png"
+    "icons/fileopen.png"
+    "icons/filesave.png"
+    "icons/green.png"
+    "icons/ok.png"
+    "icons/rectangle.png"
+    "icons/red.png"
+    "icons/redo.png"
+    "icons/remove.png"
+    "icons/triangle.png"
+    "icons/undo.png"
+)
+
+qt6_add_resources(undo "undo"
+    PREFIX
+        "/"
+    FILES
+        ${undo_resource_files}
+)
+
+install(TARGETS undo
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/tools/undo/mainwindow.cpp b/examples/widgets/tools/undo/mainwindow.cpp
index 9d83e3067a..5623a09ad2 100644
--- a/examples/widgets/tools/undo/mainwindow.cpp
+++ b/examples/widgets/tools/undo/mainwindow.cpp
@@ -86,7 +86,7 @@ MainWindow::MainWindow(QWidget *parent)
     connect(actionAbout, &QAction::triggered, this, &MainWindow::about);
     connect(actionAboutQt, &QAction::triggered, this, &MainWindow::aboutQt);
 
-    connect(undoLimit, QOverload<int>::of(&QSpinBox::valueChanged), this, &MainWindow::updateActions);
+    connect(undoLimit, &QSpinBox::valueChanged, this, &MainWindow::updateActions);
     connect(documentTabs, &QTabWidget::currentChanged, this, &MainWindow::updateActions);
 
     actionOpen->setShortcut(QString("Ctrl+O"));
diff --git a/examples/widgets/tools/undoframework/CMakeLists.txt b/examples/widgets/tools/undoframework/CMakeLists.txt
new file mode 100644
index 0000000000..33b315d4e5
--- /dev/null
+++ b/examples/widgets/tools/undoframework/CMakeLists.txt
@@ -0,0 +1,48 @@
+# Generated from undoframework.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(undoframework LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/tools/undoframework")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(undoframework
+    commands.cpp commands.h
+    diagramitem.cpp diagramitem.h
+    diagramscene.cpp diagramscene.h
+    main.cpp
+    mainwindow.cpp mainwindow.h
+)
+target_link_libraries(undoframework PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+
+# Resources:
+set(undoframework_resource_files
+    "images/cross.png"
+)
+
+qt6_add_resources(undoframework "undoframework"
+    PREFIX
+        "/"
+    FILES
+        ${undoframework_resource_files}
+)
+
+install(TARGETS undoframework
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/touch/CMakeLists.txt b/examples/widgets/touch/CMakeLists.txt
new file mode 100644
index 0000000000..06b72cada7
--- /dev/null
+++ b/examples/widgets/touch/CMakeLists.txt
@@ -0,0 +1,6 @@
+# Generated from touch.pro.
+
+add_subdirectory(pinchzoom)
+add_subdirectory(fingerpaint)
+add_subdirectory(knobs)
+add_subdirectory(dials)
diff --git a/examples/widgets/touch/dials/CMakeLists.txt b/examples/widgets/touch/dials/CMakeLists.txt
new file mode 100644
index 0000000000..cad784f9ec
--- /dev/null
+++ b/examples/widgets/touch/dials/CMakeLists.txt
@@ -0,0 +1,32 @@
+# Generated from dials.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(dials LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/touch/dials")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(dials
+    dials.ui
+    main.cpp
+)
+target_link_libraries(dials PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+install(TARGETS dials
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/touch/fingerpaint/.prev_CMakeLists.txt b/examples/widgets/touch/fingerpaint/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..f66e866cab
--- /dev/null
+++ b/examples/widgets/touch/fingerpaint/.prev_CMakeLists.txt
@@ -0,0 +1,39 @@
+# Generated from fingerpaint.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(fingerpaint LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/touch/fingerpaint")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(fingerpaint
+    main.cpp
+    mainwindow.cpp mainwindow.h
+    scribblearea.cpp scribblearea.h
+)
+target_link_libraries(fingerpaint PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+if(TARGET Qt::PrintSupport)
+    target_link_libraries(fingerpaint PUBLIC
+        Qt::PrintSupport
+    )
+endif()
+
+install(TARGETS fingerpaint
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/touch/fingerpaint/CMakeLists.txt b/examples/widgets/touch/fingerpaint/CMakeLists.txt
new file mode 100644
index 0000000000..cc2c8caacf
--- /dev/null
+++ b/examples/widgets/touch/fingerpaint/CMakeLists.txt
@@ -0,0 +1,45 @@
+# Generated from fingerpaint.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(fingerpaint LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/touch/fingerpaint")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+find_package(Qt6 COMPONENTS PrintSupport) # special case
+
+add_qt_gui_executable(fingerpaint
+    main.cpp
+    mainwindow.cpp mainwindow.h
+    scribblearea.cpp scribblearea.h
+)
+target_link_libraries(fingerpaint PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+# special case begin
+if (TARGET Qt::PrintSupport)
+    target_link_libraries(fingerpaint PUBLIC Qt::PrintSupport)
+endif()
+# special case end
+
+if(TARGET Qt::PrintSupport)
+    target_link_libraries(fingerpaint PUBLIC
+        Qt::PrintSupport
+    )
+endif()
+
+install(TARGETS fingerpaint
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/touch/knobs/CMakeLists.txt b/examples/widgets/touch/knobs/CMakeLists.txt
new file mode 100644
index 0000000000..a3d44bf650
--- /dev/null
+++ b/examples/widgets/touch/knobs/CMakeLists.txt
@@ -0,0 +1,32 @@
+# Generated from knobs.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(knobs LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/touch/knobs")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(knobs
+    knob.cpp knob.h
+    main.cpp
+)
+target_link_libraries(knobs PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+install(TARGETS knobs
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/touch/pinchzoom/CMakeLists.txt b/examples/widgets/touch/pinchzoom/CMakeLists.txt
new file mode 100644
index 0000000000..08663b75af
--- /dev/null
+++ b/examples/widgets/touch/pinchzoom/CMakeLists.txt
@@ -0,0 +1,46 @@
+# Generated from pinchzoom.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(pinchzoom LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/touch/pinchzoom")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(pinchzoom
+    graphicsview.cpp graphicsview.h
+    main.cpp
+    mouse.cpp mouse.h
+)
+target_link_libraries(pinchzoom PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+
+# Resources:
+set(mice_resource_files
+    "images/cheese.jpg"
+)
+
+qt6_add_resources(pinchzoom "mice"
+    PREFIX
+        "/"
+    FILES
+        ${mice_resource_files}
+)
+
+install(TARGETS pinchzoom
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/tutorials/CMakeLists.txt b/examples/widgets/tutorials/CMakeLists.txt
new file mode 100644
index 0000000000..c2fa4a81d7
--- /dev/null
+++ b/examples/widgets/tutorials/CMakeLists.txt
@@ -0,0 +1,7 @@
+# Generated from tutorials.pro.
+
+add_subdirectory(addressbook)
+add_subdirectory(widgets)
+add_subdirectory(modelview)
+add_subdirectory(gettingStarted)
+add_subdirectory(notepad)
diff --git a/examples/widgets/tutorials/addressbook/CMakeLists.txt b/examples/widgets/tutorials/addressbook/CMakeLists.txt
new file mode 100644
index 0000000000..a8823d059a
--- /dev/null
+++ b/examples/widgets/tutorials/addressbook/CMakeLists.txt
@@ -0,0 +1,9 @@
+# Generated from addressbook.pro.
+
+add_subdirectory(part1)
+add_subdirectory(part2)
+add_subdirectory(part3)
+add_subdirectory(part4)
+add_subdirectory(part5)
+add_subdirectory(part6)
+add_subdirectory(part7)
diff --git a/examples/widgets/tutorials/addressbook/part1/CMakeLists.txt b/examples/widgets/tutorials/addressbook/part1/CMakeLists.txt
new file mode 100644
index 0000000000..f07c38f508
--- /dev/null
+++ b/examples/widgets/tutorials/addressbook/part1/CMakeLists.txt
@@ -0,0 +1,32 @@
+# Generated from part1.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(part1 LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/tutorials/addressbook/part1")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(part1
+    addressbook.cpp addressbook.h
+    main.cpp
+)
+target_link_libraries(part1 PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+install(TARGETS part1
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/tutorials/addressbook/part2/CMakeLists.txt b/examples/widgets/tutorials/addressbook/part2/CMakeLists.txt
new file mode 100644
index 0000000000..07fb93d02f
--- /dev/null
+++ b/examples/widgets/tutorials/addressbook/part2/CMakeLists.txt
@@ -0,0 +1,32 @@
+# Generated from part2.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(part2 LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/tutorials/addressbook/part2")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(part2
+    addressbook.cpp addressbook.h
+    main.cpp
+)
+target_link_libraries(part2 PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+install(TARGETS part2
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/tutorials/addressbook/part3/CMakeLists.txt b/examples/widgets/tutorials/addressbook/part3/CMakeLists.txt
new file mode 100644
index 0000000000..89d76cc9ee
--- /dev/null
+++ b/examples/widgets/tutorials/addressbook/part3/CMakeLists.txt
@@ -0,0 +1,32 @@
+# Generated from part3.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(part3 LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/tutorials/addressbook/part3")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(part3
+    addressbook.cpp addressbook.h
+    main.cpp
+)
+target_link_libraries(part3 PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+install(TARGETS part3
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/tutorials/addressbook/part4/CMakeLists.txt b/examples/widgets/tutorials/addressbook/part4/CMakeLists.txt
new file mode 100644
index 0000000000..325490517b
--- /dev/null
+++ b/examples/widgets/tutorials/addressbook/part4/CMakeLists.txt
@@ -0,0 +1,32 @@
+# Generated from part4.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(part4 LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/tutorials/addressbook/part4")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(part4
+    addressbook.cpp addressbook.h
+    main.cpp
+)
+target_link_libraries(part4 PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+install(TARGETS part4
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/tutorials/addressbook/part5/CMakeLists.txt b/examples/widgets/tutorials/addressbook/part5/CMakeLists.txt
new file mode 100644
index 0000000000..d2ac0f18d8
--- /dev/null
+++ b/examples/widgets/tutorials/addressbook/part5/CMakeLists.txt
@@ -0,0 +1,33 @@
+# Generated from part5.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(part5 LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/tutorials/addressbook/part5")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(part5
+    addressbook.cpp addressbook.h
+    finddialog.cpp finddialog.h
+    main.cpp
+)
+target_link_libraries(part5 PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+install(TARGETS part5
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/tutorials/addressbook/part6/CMakeLists.txt b/examples/widgets/tutorials/addressbook/part6/CMakeLists.txt
new file mode 100644
index 0000000000..a9375d8913
--- /dev/null
+++ b/examples/widgets/tutorials/addressbook/part6/CMakeLists.txt
@@ -0,0 +1,33 @@
+# Generated from part6.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(part6 LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/tutorials/addressbook/part6")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(part6
+    addressbook.cpp addressbook.h
+    finddialog.cpp finddialog.h
+    main.cpp
+)
+target_link_libraries(part6 PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+install(TARGETS part6
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/tutorials/addressbook/part7/CMakeLists.txt b/examples/widgets/tutorials/addressbook/part7/CMakeLists.txt
new file mode 100644
index 0000000000..16cc1391e5
--- /dev/null
+++ b/examples/widgets/tutorials/addressbook/part7/CMakeLists.txt
@@ -0,0 +1,33 @@
+# Generated from part7.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(part7 LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/tutorials/addressbook/part7")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(part7
+    addressbook.cpp addressbook.h
+    finddialog.cpp finddialog.h
+    main.cpp
+)
+target_link_libraries(part7 PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+install(TARGETS part7
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/tutorials/gettingStarted/CMakeLists.txt b/examples/widgets/tutorials/gettingStarted/CMakeLists.txt
new file mode 100644
index 0000000000..2aa8163029
--- /dev/null
+++ b/examples/widgets/tutorials/gettingStarted/CMakeLists.txt
@@ -0,0 +1,2 @@
+# Generated from gettingStarted.pro.
+
diff --git a/examples/widgets/tutorials/gettingStarted/gsQt/CMakeLists.txt b/examples/widgets/tutorials/gettingStarted/gsQt/CMakeLists.txt
new file mode 100644
index 0000000000..7a9ade8511
--- /dev/null
+++ b/examples/widgets/tutorials/gettingStarted/gsQt/CMakeLists.txt
@@ -0,0 +1,7 @@
+# Generated from gsqt.pro.
+
+add_subdirectory(part1)
+add_subdirectory(part2)
+add_subdirectory(part3)
+add_subdirectory(part4)
+add_subdirectory(part5)
diff --git a/examples/widgets/tutorials/gettingStarted/gsQt/part1/CMakeLists.txt b/examples/widgets/tutorials/gettingStarted/gsQt/part1/CMakeLists.txt
new file mode 100644
index 0000000000..4cf9a49d1e
--- /dev/null
+++ b/examples/widgets/tutorials/gettingStarted/gsQt/part1/CMakeLists.txt
@@ -0,0 +1,31 @@
+# Generated from part1.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(part1 LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/tutorials/gettingStarted/gsQt/part1")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(part1
+    main.cpp
+)
+target_link_libraries(part1 PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+install(TARGETS part1
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/tutorials/gettingStarted/gsQt/part2/CMakeLists.txt b/examples/widgets/tutorials/gettingStarted/gsQt/part2/CMakeLists.txt
new file mode 100644
index 0000000000..f5ab1d10d1
--- /dev/null
+++ b/examples/widgets/tutorials/gettingStarted/gsQt/part2/CMakeLists.txt
@@ -0,0 +1,31 @@
+# Generated from part2.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(part2 LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/tutorials/gettingStarted/gsQt/part2")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(part2
+    main.cpp
+)
+target_link_libraries(part2 PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+install(TARGETS part2
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/tutorials/gettingStarted/gsQt/part3/CMakeLists.txt b/examples/widgets/tutorials/gettingStarted/gsQt/part3/CMakeLists.txt
new file mode 100644
index 0000000000..c152c765e2
--- /dev/null
+++ b/examples/widgets/tutorials/gettingStarted/gsQt/part3/CMakeLists.txt
@@ -0,0 +1,31 @@
+# Generated from part3.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(part3 LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/tutorials/gettingStarted/gsQt/part3")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(part3
+    main.cpp
+)
+target_link_libraries(part3 PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+install(TARGETS part3
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/tutorials/gettingStarted/gsQt/part4/CMakeLists.txt b/examples/widgets/tutorials/gettingStarted/gsQt/part4/CMakeLists.txt
new file mode 100644
index 0000000000..770d9590b7
--- /dev/null
+++ b/examples/widgets/tutorials/gettingStarted/gsQt/part4/CMakeLists.txt
@@ -0,0 +1,31 @@
+# Generated from part4.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(part4 LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/tutorials/gettingStarted/gsQt/part4")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(part4
+    main.cpp
+)
+target_link_libraries(part4 PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+install(TARGETS part4
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/tutorials/gettingStarted/gsQt/part5/CMakeLists.txt b/examples/widgets/tutorials/gettingStarted/gsQt/part5/CMakeLists.txt
new file mode 100644
index 0000000000..3369838e95
--- /dev/null
+++ b/examples/widgets/tutorials/gettingStarted/gsQt/part5/CMakeLists.txt
@@ -0,0 +1,31 @@
+# Generated from part5.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(part5 LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/tutorials/gettingStarted/gsQt/part5")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(part5
+    main.cpp
+)
+target_link_libraries(part5 PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+install(TARGETS part5
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/tutorials/modelview/1_readonly/CMakeLists.txt b/examples/widgets/tutorials/modelview/1_readonly/CMakeLists.txt
new file mode 100644
index 0000000000..cc34842bcf
--- /dev/null
+++ b/examples/widgets/tutorials/modelview/1_readonly/CMakeLists.txt
@@ -0,0 +1,32 @@
+# Generated from 1_readonly.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(mv_readonly LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/tutorials/modelview/1_readonly")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(mv_readonly
+    main.cpp
+    mymodel.cpp mymodel.h
+)
+target_link_libraries(mv_readonly PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+install(TARGETS mv_readonly
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/tutorials/modelview/2_formatting/CMakeLists.txt b/examples/widgets/tutorials/modelview/2_formatting/CMakeLists.txt
new file mode 100644
index 0000000000..7f8d68b6f8
--- /dev/null
+++ b/examples/widgets/tutorials/modelview/2_formatting/CMakeLists.txt
@@ -0,0 +1,32 @@
+# Generated from 2_formatting.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(mv_formatting LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/tutorials/modelview/2_formatting")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(mv_formatting
+    main.cpp
+    mymodel.cpp mymodel.h
+)
+target_link_libraries(mv_formatting PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+install(TARGETS mv_formatting
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/tutorials/modelview/3_changingmodel/CMakeLists.txt b/examples/widgets/tutorials/modelview/3_changingmodel/CMakeLists.txt
new file mode 100644
index 0000000000..aace87e2ab
--- /dev/null
+++ b/examples/widgets/tutorials/modelview/3_changingmodel/CMakeLists.txt
@@ -0,0 +1,32 @@
+# Generated from 3_changingmodel.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(mv_changingmodel LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/tutorials/modelview/3_changingmodel")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(mv_changingmodel
+    main.cpp
+    mymodel.cpp mymodel.h
+)
+target_link_libraries(mv_changingmodel PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+install(TARGETS mv_changingmodel
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/tutorials/modelview/4_headers/CMakeLists.txt b/examples/widgets/tutorials/modelview/4_headers/CMakeLists.txt
new file mode 100644
index 0000000000..9d2f9cd7e8
--- /dev/null
+++ b/examples/widgets/tutorials/modelview/4_headers/CMakeLists.txt
@@ -0,0 +1,32 @@
+# Generated from 4_headers.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(mv_headers LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/tutorials/modelview/4_headers")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(mv_headers
+    main.cpp
+    mymodel.cpp mymodel.h
+)
+target_link_libraries(mv_headers PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+install(TARGETS mv_headers
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/tutorials/modelview/5_edit/CMakeLists.txt b/examples/widgets/tutorials/modelview/5_edit/CMakeLists.txt
new file mode 100644
index 0000000000..50af3c39a4
--- /dev/null
+++ b/examples/widgets/tutorials/modelview/5_edit/CMakeLists.txt
@@ -0,0 +1,33 @@
+# Generated from 5_edit.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(mv_edit LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/tutorials/modelview/5_edit")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(mv_edit
+    main.cpp
+    mainwindow.cpp mainwindow.h
+    mymodel.cpp mymodel.h
+)
+target_link_libraries(mv_edit PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+install(TARGETS mv_edit
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/tutorials/modelview/6_treeview/CMakeLists.txt b/examples/widgets/tutorials/modelview/6_treeview/CMakeLists.txt
new file mode 100644
index 0000000000..435ff71c0f
--- /dev/null
+++ b/examples/widgets/tutorials/modelview/6_treeview/CMakeLists.txt
@@ -0,0 +1,32 @@
+# Generated from 6_treeview.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(mv_tree LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/tutorials/modelview/6_treeview")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(mv_tree
+    main.cpp
+    mainwindow.cpp mainwindow.h
+)
+target_link_libraries(mv_tree PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+install(TARGETS mv_tree
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/tutorials/modelview/7_selections/CMakeLists.txt b/examples/widgets/tutorials/modelview/7_selections/CMakeLists.txt
new file mode 100644
index 0000000000..e0d591ab29
--- /dev/null
+++ b/examples/widgets/tutorials/modelview/7_selections/CMakeLists.txt
@@ -0,0 +1,32 @@
+# Generated from 7_selections.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(mv_selections LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/tutorials/modelview/7_selections")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(mv_selections
+    main.cpp
+    mainwindow.cpp mainwindow.h
+)
+target_link_libraries(mv_selections PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+install(TARGETS mv_selections
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/tutorials/modelview/CMakeLists.txt b/examples/widgets/tutorials/modelview/CMakeLists.txt
new file mode 100644
index 0000000000..10f2cf6ecf
--- /dev/null
+++ b/examples/widgets/tutorials/modelview/CMakeLists.txt
@@ -0,0 +1,9 @@
+# Generated from modelview.pro.
+
+add_subdirectory(1_readonly)
+add_subdirectory(2_formatting)
+add_subdirectory(3_changingmodel)
+add_subdirectory(4_headers)
+add_subdirectory(5_edit)
+add_subdirectory(6_treeview)
+add_subdirectory(7_selections)
diff --git a/examples/widgets/tutorials/notepad/.prev_CMakeLists.txt b/examples/widgets/tutorials/notepad/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..32df7ad615
--- /dev/null
+++ b/examples/widgets/tutorials/notepad/.prev_CMakeLists.txt
@@ -0,0 +1,66 @@
+# Generated from notepad.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(notepad LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/tutorials/notepad")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+
+add_qt_gui_executable(notepad
+    main.cpp
+    notepad.cpp notepad.h notepad.ui
+)
+target_link_libraries(notepad PUBLIC
+    Qt::Core
+    Qt::Gui
+)
+
+
+# Resources:
+set(notepad_resource_files
+    "images/bold.png"
+    "images/copy.png"
+    "images/create.png"
+    "images/cut.png"
+    "images/edit_redo.png"
+    "images/edit_undo.png"
+    "images/exit.png"
+    "images/font.png"
+    "images/info.png"
+    "images/italic.png"
+    "images/new.png"
+    "images/open.png"
+    "images/paste.png"
+    "images/pencil.png"
+    "images/print.png"
+    "images/save.png"
+    "images/save_as.png"
+    "images/underline.png"
+)
+
+qt6_add_resources(notepad "notepad"
+    PREFIX
+        "/"
+    FILES
+        ${notepad_resource_files}
+)
+
+if(TARGET Qt::PrintSupport)
+    target_link_libraries(notepad PUBLIC
+        Qt::PrintSupport
+    )
+endif()
+
+install(TARGETS notepad
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/tutorials/notepad/CMakeLists.txt b/examples/widgets/tutorials/notepad/CMakeLists.txt
new file mode 100644
index 0000000000..2a277efb26
--- /dev/null
+++ b/examples/widgets/tutorials/notepad/CMakeLists.txt
@@ -0,0 +1,67 @@
+# Generated from notepad.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(notepad LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/tutorials/notepad")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS PrintSupport) # special case: add
+
+add_qt_gui_executable(notepad
+    main.cpp
+    notepad.cpp notepad.h notepad.ui
+)
+target_link_libraries(notepad PUBLIC
+    Qt::Core
+    Qt::Gui
+)
+
+
+# Resources:
+set(notepad_resource_files
+    "images/bold.png"
+    "images/copy.png"
+    "images/create.png"
+    "images/cut.png"
+    "images/edit_redo.png"
+    "images/edit_undo.png"
+    "images/exit.png"
+    "images/font.png"
+    "images/info.png"
+    "images/italic.png"
+    "images/new.png"
+    "images/open.png"
+    "images/paste.png"
+    "images/pencil.png"
+    "images/print.png"
+    "images/save.png"
+    "images/save_as.png"
+    "images/underline.png"
+)
+
+qt6_add_resources(notepad "notepad"
+    PREFIX
+        "/"
+    FILES
+        ${notepad_resource_files}
+)
+
+if(TARGET Qt::PrintSupport)
+    target_link_libraries(notepad PUBLIC
+        Qt::PrintSupport
+    )
+endif()
+
+install(TARGETS notepad
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/tutorials/widgets/CMakeLists.txt b/examples/widgets/tutorials/widgets/CMakeLists.txt
new file mode 100644
index 0000000000..1f4afee780
--- /dev/null
+++ b/examples/widgets/tutorials/widgets/CMakeLists.txt
@@ -0,0 +1,6 @@
+# Generated from widgets.pro.
+
+add_subdirectory(toplevel)
+add_subdirectory(childwidget)
+add_subdirectory(windowlayout)
+add_subdirectory(nestedlayouts)
diff --git a/examples/widgets/tutorials/widgets/childwidget/CMakeLists.txt b/examples/widgets/tutorials/widgets/childwidget/CMakeLists.txt
new file mode 100644
index 0000000000..4119f69fd5
--- /dev/null
+++ b/examples/widgets/tutorials/widgets/childwidget/CMakeLists.txt
@@ -0,0 +1,31 @@
+# Generated from childwidget.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(childwidget LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/tutorials/widgets/childwidget")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(childwidget
+    main.cpp
+)
+target_link_libraries(childwidget PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+install(TARGETS childwidget
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/tutorials/widgets/nestedlayouts/CMakeLists.txt b/examples/widgets/tutorials/widgets/nestedlayouts/CMakeLists.txt
new file mode 100644
index 0000000000..75387bd9e5
--- /dev/null
+++ b/examples/widgets/tutorials/widgets/nestedlayouts/CMakeLists.txt
@@ -0,0 +1,31 @@
+# Generated from nestedlayouts.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(nestedlayouts LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/tutorials/widgets/nestedlayouts")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(nestedlayouts
+    main.cpp
+)
+target_link_libraries(nestedlayouts PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+install(TARGETS nestedlayouts
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/tutorials/widgets/toplevel/CMakeLists.txt b/examples/widgets/tutorials/widgets/toplevel/CMakeLists.txt
new file mode 100644
index 0000000000..6d2bdb5ba5
--- /dev/null
+++ b/examples/widgets/tutorials/widgets/toplevel/CMakeLists.txt
@@ -0,0 +1,31 @@
+# Generated from toplevel.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(toplevel LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/tutorials/widgets/toplevel")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(toplevel
+    main.cpp
+)
+target_link_libraries(toplevel PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+install(TARGETS toplevel
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/tutorials/widgets/windowlayout/CMakeLists.txt b/examples/widgets/tutorials/widgets/windowlayout/CMakeLists.txt
new file mode 100644
index 0000000000..07b50185f3
--- /dev/null
+++ b/examples/widgets/tutorials/widgets/windowlayout/CMakeLists.txt
@@ -0,0 +1,31 @@
+# Generated from windowlayout.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(windowlayout LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/tutorials/widgets/windowlayout")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(windowlayout
+    main.cpp
+)
+target_link_libraries(windowlayout PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+install(TARGETS windowlayout
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/widgets/CMakeLists.txt b/examples/widgets/widgets/CMakeLists.txt
new file mode 100644
index 0000000000..8daf6a69ae
--- /dev/null
+++ b/examples/widgets/widgets/CMakeLists.txt
@@ -0,0 +1,27 @@
+# Generated from widgets.pro.
+
+add_subdirectory(analogclock)
+add_subdirectory(calculator)
+add_subdirectory(calendarwidget)
+add_subdirectory(charactermap)
+add_subdirectory(codeeditor)
+add_subdirectory(digitalclock)
+add_subdirectory(elidedlabel)
+add_subdirectory(groupbox)
+add_subdirectory(icons)
+add_subdirectory(imageviewer)
+add_subdirectory(lineedits)
+add_subdirectory(movie)
+add_subdirectory(mousebuttons)
+add_subdirectory(scribble)
+add_subdirectory(shapedclock)
+add_subdirectory(sliders)
+add_subdirectory(spinboxes)
+add_subdirectory(styles)
+add_subdirectory(stylesheet)
+add_subdirectory(tablet)
+add_subdirectory(tetrix)
+add_subdirectory(tooltips)
+add_subdirectory(validators)
+add_subdirectory(wiggly)
+add_subdirectory(windowflags)
diff --git a/examples/widgets/widgets/analogclock/CMakeLists.txt b/examples/widgets/widgets/analogclock/CMakeLists.txt
new file mode 100644
index 0000000000..8f7639df70
--- /dev/null
+++ b/examples/widgets/widgets/analogclock/CMakeLists.txt
@@ -0,0 +1,32 @@
+# Generated from analogclock.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(analogclock LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/widgets/analogclock")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(analogclock
+    analogclock.cpp analogclock.h
+    main.cpp
+)
+target_link_libraries(analogclock PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+install(TARGETS analogclock
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/widgets/calculator/CMakeLists.txt b/examples/widgets/widgets/calculator/CMakeLists.txt
new file mode 100644
index 0000000000..89ee6e9ccb
--- /dev/null
+++ b/examples/widgets/widgets/calculator/CMakeLists.txt
@@ -0,0 +1,33 @@
+# Generated from calculator.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(calculator LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/widgets/calculator")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(calculator
+    button.cpp button.h
+    calculator.cpp calculator.h
+    main.cpp
+)
+target_link_libraries(calculator PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+install(TARGETS calculator
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/widgets/calendarwidget/CMakeLists.txt b/examples/widgets/widgets/calendarwidget/CMakeLists.txt
new file mode 100644
index 0000000000..00c1b8154a
--- /dev/null
+++ b/examples/widgets/widgets/calendarwidget/CMakeLists.txt
@@ -0,0 +1,32 @@
+# Generated from calendarwidget.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(calendarwidget LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/widgets/calendarwidget")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(calendarwidget
+    main.cpp
+    window.cpp window.h
+)
+target_link_libraries(calendarwidget PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+install(TARGETS calendarwidget
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/widgets/calendarwidget/window.cpp b/examples/widgets/widgets/calendarwidget/window.cpp
index ae10223dd4..23010a6e1a 100644
--- a/examples/widgets/widgets/calendarwidget/window.cpp
+++ b/examples/widgets/widgets/calendarwidget/window.cpp
@@ -313,19 +313,19 @@ void Window::createGeneralOptionsGroupBox()
     verticalHeaderLabel->setBuddy(verticalHeaderCombo);
 
 //! [11]
-    connect(localeCombo, QOverload<int>::of(&QComboBox::currentIndexChanged),
+    connect(localeCombo, &QComboBox::currentIndexChanged,
             this, &Window::localeChanged);
-    connect(firstDayCombo, QOverload<int>::of(&QComboBox::currentIndexChanged),
+    connect(firstDayCombo, &QComboBox::currentIndexChanged,
             this, &Window::firstDayChanged);
-    connect(selectionModeCombo, QOverload<int>::of(&QComboBox::currentIndexChanged),
+    connect(selectionModeCombo, &QComboBox::currentIndexChanged,
             this, &Window::selectionModeChanged);
     connect(gridCheckBox, &QCheckBox::toggled,
             calendar, &QCalendarWidget::setGridVisible);
     connect(navigationCheckBox, &QCheckBox::toggled,
             calendar, &QCalendarWidget::setNavigationBarVisible);
-    connect(horizontalHeaderCombo, QOverload<int>::of(&QComboBox::currentIndexChanged),
+    connect(horizontalHeaderCombo, &QComboBox::currentIndexChanged,
             this, &Window::horizontalHeaderChanged);
-    connect(verticalHeaderCombo, QOverload<int>::of(&QComboBox::currentIndexChanged),
+    connect(verticalHeaderCombo, &QComboBox::currentIndexChanged,
             this, &Window::verticalHeaderChanged);
 //! [11]
 
@@ -446,15 +446,15 @@ void Window::createTextFormatsGroupBox()
     mayFirstCheckBox = new QCheckBox(tr("May &1 in red"));
 
 //! [17] //! [18]
-    connect(weekdayColorCombo, QOverload<int>::of(&QComboBox::currentIndexChanged),
+    connect(weekdayColorCombo, &QComboBox::currentIndexChanged,
             this, &Window::weekdayFormatChanged);
-    connect(weekdayColorCombo, QOverload<int>::of(&QComboBox::currentIndexChanged),
+    connect(weekdayColorCombo, &QComboBox::currentIndexChanged,
             this, &Window::reformatCalendarPage);
-    connect(weekendColorCombo, QOverload<int>::of(&QComboBox::currentIndexChanged),
+    connect(weekendColorCombo, &QComboBox::currentIndexChanged,
             this, &Window::weekendFormatChanged);
-    connect(weekendColorCombo, QOverload<int>::of(&QComboBox::currentIndexChanged),
+    connect(weekendColorCombo, &QComboBox::currentIndexChanged,
             this, &Window::reformatCalendarPage);
-    connect(headerTextFormatCombo, QOverload<int>::of(&QComboBox::currentIndexChanged),
+    connect(headerTextFormatCombo, &QComboBox::currentIndexChanged,
             this, &Window::reformatHeaders);
     connect(firstFridayCheckBox, &QCheckBox::toggled,
             this, &Window::reformatCalendarPage);
diff --git a/examples/widgets/widgets/charactermap/CMakeLists.txt b/examples/widgets/widgets/charactermap/CMakeLists.txt
new file mode 100644
index 0000000000..8ecaf5af20
--- /dev/null
+++ b/examples/widgets/widgets/charactermap/CMakeLists.txt
@@ -0,0 +1,33 @@
+# Generated from charactermap.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(charactermap LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/widgets/charactermap")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(charactermap
+    characterwidget.cpp characterwidget.h
+    main.cpp
+    mainwindow.cpp mainwindow.h
+)
+target_link_libraries(charactermap PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+install(TARGETS charactermap
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/widgets/charactermap/mainwindow.cpp b/examples/widgets/widgets/charactermap/mainwindow.cpp
index 702b50156b..47f7001a34 100644
--- a/examples/widgets/widgets/charactermap/mainwindow.cpp
+++ b/examples/widgets/widgets/charactermap/mainwindow.cpp
@@ -90,7 +90,7 @@ MainWindow::MainWindow(QWidget *parent)
     filterCombo->addItem(tr("Monospaced"), QVariant::fromValue(QFontComboBox::MonospacedFonts));
     filterCombo->addItem(tr("Proportional"), QVariant::fromValue(QFontComboBox::ProportionalFonts));
     filterCombo->setCurrentIndex(0);
-    connect(filterCombo, QOverload<int>::of(&QComboBox::currentIndexChanged),
+    connect(filterCombo, &QComboBox::currentIndexChanged,
             this, &MainWindow::filterChanged);
 
     QLabel *fontLabel = new QLabel(tr("Font:"));
diff --git a/examples/widgets/widgets/codeeditor/CMakeLists.txt b/examples/widgets/widgets/codeeditor/CMakeLists.txt
new file mode 100644
index 0000000000..790b9bc103
--- /dev/null
+++ b/examples/widgets/widgets/codeeditor/CMakeLists.txt
@@ -0,0 +1,32 @@
+# Generated from codeeditor.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(codeeditor LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/widgets/codeeditor")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(codeeditor
+    codeeditor.cpp codeeditor.h
+    main.cpp
+)
+target_link_libraries(codeeditor PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+install(TARGETS codeeditor
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/widgets/digitalclock/CMakeLists.txt b/examples/widgets/widgets/digitalclock/CMakeLists.txt
new file mode 100644
index 0000000000..904c53890d
--- /dev/null
+++ b/examples/widgets/widgets/digitalclock/CMakeLists.txt
@@ -0,0 +1,32 @@
+# Generated from digitalclock.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(digitalclock LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/widgets/digitalclock")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(digitalclock
+    digitalclock.cpp digitalclock.h
+    main.cpp
+)
+target_link_libraries(digitalclock PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+install(TARGETS digitalclock
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/widgets/elidedlabel/CMakeLists.txt b/examples/widgets/widgets/elidedlabel/CMakeLists.txt
new file mode 100644
index 0000000000..b9841c00f1
--- /dev/null
+++ b/examples/widgets/widgets/elidedlabel/CMakeLists.txt
@@ -0,0 +1,33 @@
+# Generated from elidedlabel.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(elidedlabel LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/widgets/elidedlabel")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(elidedlabel
+    elidedlabel.cpp elidedlabel.h
+    main.cpp
+    testwidget.cpp testwidget.h
+)
+target_link_libraries(elidedlabel PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+install(TARGETS elidedlabel
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/widgets/groupbox/CMakeLists.txt b/examples/widgets/widgets/groupbox/CMakeLists.txt
new file mode 100644
index 0000000000..dbccf0b222
--- /dev/null
+++ b/examples/widgets/widgets/groupbox/CMakeLists.txt
@@ -0,0 +1,32 @@
+# Generated from groupbox.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(groupbox LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/widgets/groupbox")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(groupbox
+    main.cpp
+    window.cpp window.h
+)
+target_link_libraries(groupbox PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+install(TARGETS groupbox
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/widgets/icons/.prev_CMakeLists.txt b/examples/widgets/widgets/icons/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..01cc94abdb
--- /dev/null
+++ b/examples/widgets/widgets/icons/.prev_CMakeLists.txt
@@ -0,0 +1,39 @@
+# Generated from icons.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(icons LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/widgets/icons")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(icons
+    iconpreviewarea.cpp iconpreviewarea.h
+    iconsizespinbox.cpp iconsizespinbox.h
+    imagedelegate.cpp imagedelegate.h
+    main.cpp
+    mainwindow.cpp mainwindow.h
+)
+target_compile_definitions(icons PUBLIC
+    SRCDIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/\\\"
+)
+
+target_link_libraries(icons PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+install(TARGETS icons
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/widgets/icons/CMakeLists.txt b/examples/widgets/widgets/icons/CMakeLists.txt
new file mode 100644
index 0000000000..f154c534f9
--- /dev/null
+++ b/examples/widgets/widgets/icons/CMakeLists.txt
@@ -0,0 +1,39 @@
+# Generated from icons.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(icons LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/widgets/icons")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(icons
+    iconpreviewarea.cpp iconpreviewarea.h
+    iconsizespinbox.cpp iconsizespinbox.h
+    imagedelegate.cpp imagedelegate.h
+    main.cpp
+    mainwindow.cpp mainwindow.h
+)
+target_compile_definitions(icons PUBLIC
+    SRCDIR="${CMAKE_CURRENT_SOURCE_DIR}" # special case
+)
+
+target_link_libraries(icons PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+install(TARGETS icons
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/widgets/icons/imagedelegate.cpp b/examples/widgets/widgets/icons/imagedelegate.cpp
index 4fd251aa1b..9f1e19c9eb 100644
--- a/examples/widgets/widgets/icons/imagedelegate.cpp
+++ b/examples/widgets/widgets/icons/imagedelegate.cpp
@@ -70,7 +70,7 @@ QWidget *ImageDelegate::createEditor(QWidget *parent,
     else if (index.column() == 2)
         comboBox->addItems(IconPreviewArea::iconStateNames());
 
-    connect(comboBox, QOverload<int>::of(&QComboBox::activated),
+    connect(comboBox, &QComboBox::activated,
             this, &ImageDelegate::emitCommitData);
 
     return comboBox;
diff --git a/examples/widgets/widgets/icons/mainwindow.cpp b/examples/widgets/widgets/icons/mainwindow.cpp
index 4f990f7320..be92f83c75 100644
--- a/examples/widgets/widgets/icons/mainwindow.cpp
+++ b/examples/widgets/widgets/icons/mainwindow.cpp
@@ -172,15 +172,16 @@ void MainWindow::changeStyle(bool checked)
 //! [4]
 
 //! [5]
-void MainWindow::changeSize(int id, bool checked)
+void MainWindow::changeSize(QAbstractButton *button, bool checked)
 {
     if (!checked)
         return;
 
-    const bool other = id == int(OtherSize);
+    const int index = sizeButtonGroup->id(button);
+    const bool other = index == int(OtherSize);
     const int extent = other
         ? otherSpinBox->value()
-        : QApplication::style()->pixelMetric(static_cast<QStyle::PixelMetric>(id));
+        : QApplication::style()->pixelMetric(static_cast<QStyle::PixelMetric>(index));
 
     previewArea->setSize(QSize(extent, extent));
     otherSpinBox->setEnabled(other);
@@ -188,7 +189,7 @@ void MainWindow::changeSize(int id, bool checked)
 
 void MainWindow::triggerChangeSize()
 {
-    changeSize(sizeButtonGroup->checkedId(), true);
+    changeSize(sizeButtonGroup->checkedButton(), true);
 }
 //! [5]
 
@@ -372,7 +373,7 @@ QWidget *MainWindow::createIconSizeGroupBox()
     sizeButtonGroup = new QButtonGroup(this);
     sizeButtonGroup->setExclusive(true);
 
-    connect(sizeButtonGroup, QOverload<int, bool>::of(&QButtonGroup::buttonToggled),
+    connect(sizeButtonGroup, &QButtonGroup::buttonToggled,
             this, &MainWindow::changeSize);
 
     QRadioButton *smallRadioButton = new QRadioButton;
@@ -400,7 +401,7 @@ QWidget *MainWindow::createIconSizeGroupBox()
 //! [26]
 
 //! [27]
-    connect(otherSpinBox, QOverload<int>::of(&QSpinBox::valueChanged),
+    connect(otherSpinBox, &QSpinBox::valueChanged,
             this, &MainWindow::triggerChangeSize);
 
     QHBoxLayout *otherSizeLayout = new QHBoxLayout;
diff --git a/examples/widgets/widgets/icons/mainwindow.h b/examples/widgets/widgets/icons/mainwindow.h
index c67d828cab..9250711ecc 100644
--- a/examples/widgets/widgets/icons/mainwindow.h
+++ b/examples/widgets/widgets/icons/mainwindow.h
@@ -62,6 +62,7 @@ class QActionGroup;
 class QLabel;
 class QButtonGroup;
 class QTableWidget;
+class QAbstractButton;
 QT_END_NAMESPACE
 class IconPreviewArea;
 class IconSizeSpinBox;
@@ -81,7 +82,7 @@ public:
 private slots:
     void about();
     void changeStyle(bool checked);
-    void changeSize(int, bool);
+    void changeSize(QAbstractButton *button, bool);
     void triggerChangeSize();
     void changeIcon();
     void addSampleImages();
diff --git a/examples/widgets/widgets/imageviewer/.prev_CMakeLists.txt b/examples/widgets/widgets/imageviewer/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..d5911d117f
--- /dev/null
+++ b/examples/widgets/widgets/imageviewer/.prev_CMakeLists.txt
@@ -0,0 +1,38 @@
+# Generated from imageviewer.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(imageviewer LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/widgets/imageviewer")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(imageviewer
+    imageviewer.cpp imageviewer.h
+    main.cpp
+)
+target_link_libraries(imageviewer PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+if(TARGET Qt::PrintSupport)
+    target_link_libraries(imageviewer PUBLIC
+        Qt::PrintSupport
+    )
+endif()
+
+install(TARGETS imageviewer
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/widgets/imageviewer/CMakeLists.txt b/examples/widgets/widgets/imageviewer/CMakeLists.txt
new file mode 100644
index 0000000000..fefccbbd1b
--- /dev/null
+++ b/examples/widgets/widgets/imageviewer/CMakeLists.txt
@@ -0,0 +1,44 @@
+# Generated from imageviewer.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(imageviewer LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/widgets/imageviewer")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+find_package(Qt6 COMPONENTS PrintSupport) # special case
+
+add_qt_gui_executable(imageviewer
+    imageviewer.cpp imageviewer.h
+    main.cpp
+)
+target_link_libraries(imageviewer PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+# special case begin
+if (TARGET Qt::PrintSupport)
+    target_link_libraries(imageviewer PUBLIC Qt::PrintSupport)
+endif()
+# special case end
+
+if(TARGET Qt::PrintSupport)
+    target_link_libraries(imageviewer PUBLIC
+        Qt::PrintSupport
+    )
+endif()
+
+install(TARGETS imageviewer
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/widgets/lineedits/CMakeLists.txt b/examples/widgets/widgets/lineedits/CMakeLists.txt
new file mode 100644
index 0000000000..ca9393c323
--- /dev/null
+++ b/examples/widgets/widgets/lineedits/CMakeLists.txt
@@ -0,0 +1,32 @@
+# Generated from lineedits.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(lineedits LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/widgets/lineedits")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(lineedits
+    main.cpp
+    window.cpp window.h
+)
+target_link_libraries(lineedits PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+install(TARGETS lineedits
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/widgets/lineedits/window.cpp b/examples/widgets/widgets/lineedits/window.cpp
index bb9396411a..765f867deb 100644
--- a/examples/widgets/widgets/lineedits/window.cpp
+++ b/examples/widgets/widgets/lineedits/window.cpp
@@ -127,15 +127,15 @@ Window::Window(QWidget *parent)
 //! [4]
 
 //! [5]
-    connect(echoComboBox, QOverload<int>::of(&QComboBox::activated),
+    connect(echoComboBox, &QComboBox::activated,
             this, &Window::echoChanged);
-    connect(validatorComboBox, QOverload<int>::of(&QComboBox::activated),
+    connect(validatorComboBox, &QComboBox::activated,
             this, &Window::validatorChanged);
-    connect(alignmentComboBox, QOverload<int>::of(&QComboBox::activated),
+    connect(alignmentComboBox, &QComboBox::activated,
             this, &Window::alignmentChanged);
-    connect(inputMaskComboBox, QOverload<int>::of(&QComboBox::activated),
+    connect(inputMaskComboBox, &QComboBox::activated,
             this, &Window::inputMaskChanged);
-    connect(accessComboBox, QOverload<int>::of(&QComboBox::activated),
+    connect(accessComboBox, &QComboBox::activated,
             this, &Window::accessChanged);
 //! [5]
 
diff --git a/examples/widgets/widgets/mousebuttons/CMakeLists.txt b/examples/widgets/widgets/mousebuttons/CMakeLists.txt
new file mode 100644
index 0000000000..625e068cc0
--- /dev/null
+++ b/examples/widgets/widgets/mousebuttons/CMakeLists.txt
@@ -0,0 +1,32 @@
+# Generated from mousebuttons.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(mousebuttons LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/widgets/mousebuttons")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(mousebuttons
+    buttontester.cpp buttontester.h
+    main.cpp
+)
+target_link_libraries(mousebuttons PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+install(TARGETS mousebuttons
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/widgets/movie/CMakeLists.txt b/examples/widgets/widgets/movie/CMakeLists.txt
new file mode 100644
index 0000000000..140fff2cc8
--- /dev/null
+++ b/examples/widgets/widgets/movie/CMakeLists.txt
@@ -0,0 +1,32 @@
+# Generated from movie.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(movie LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/widgets/movie")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(movie
+    main.cpp
+    movieplayer.cpp movieplayer.h
+)
+target_link_libraries(movie PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+install(TARGETS movie
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/widgets/movie/movieplayer.cpp b/examples/widgets/widgets/movie/movieplayer.cpp
index 41cd7923ee..76849268ab 100644
--- a/examples/widgets/widgets/movie/movieplayer.cpp
+++ b/examples/widgets/widgets/movie/movieplayer.cpp
@@ -81,7 +81,7 @@ MoviePlayer::MoviePlayer(QWidget *parent)
     connect(movie, &QMovie::stateChanged, this, &MoviePlayer::updateButtons);
     connect(fitCheckBox, &QCheckBox::clicked, this, &MoviePlayer::fitToWindow);
     connect(frameSlider, &QSlider::valueChanged, this, &MoviePlayer::goToFrame);
-    connect(speedSpinBox, QOverload<int>::of(&QSpinBox::valueChanged),
+    connect(speedSpinBox, &QSpinBox::valueChanged,
             movie, &QMovie::setSpeed);
 
     mainLayout = new QVBoxLayout;
diff --git a/examples/widgets/widgets/scribble/.prev_CMakeLists.txt b/examples/widgets/widgets/scribble/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..dff1bccec7
--- /dev/null
+++ b/examples/widgets/widgets/scribble/.prev_CMakeLists.txt
@@ -0,0 +1,39 @@
+# Generated from scribble.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(scribble LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/widgets/scribble")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(scribble
+    main.cpp
+    mainwindow.cpp mainwindow.h
+    scribblearea.cpp scribblearea.h
+)
+target_link_libraries(scribble PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+if(TARGET Qt::PrintSupport)
+    target_link_libraries(scribble PUBLIC
+        Qt::PrintSupport
+    )
+endif()
+
+install(TARGETS scribble
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/widgets/scribble/CMakeLists.txt b/examples/widgets/widgets/scribble/CMakeLists.txt
new file mode 100644
index 0000000000..ca2f7b590e
--- /dev/null
+++ b/examples/widgets/widgets/scribble/CMakeLists.txt
@@ -0,0 +1,45 @@
+# Generated from scribble.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(scribble LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/widgets/scribble")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+find_package(Qt6 COMPONENTS PrintSupport) # special case
+
+add_qt_gui_executable(scribble
+    main.cpp
+    mainwindow.cpp mainwindow.h
+    scribblearea.cpp scribblearea.h
+)
+target_link_libraries(scribble PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+# special case begin
+if (TARGET Qt::PrintSupport)
+    target_link_libraries(scribble PUBLIC Qt::PrintSupport)
+endif()
+# special case end
+
+if(TARGET Qt::PrintSupport)
+    target_link_libraries(scribble PUBLIC
+        Qt::PrintSupport
+    )
+endif()
+
+install(TARGETS scribble
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/widgets/shapedclock/CMakeLists.txt b/examples/widgets/widgets/shapedclock/CMakeLists.txt
new file mode 100644
index 0000000000..211c0cc432
--- /dev/null
+++ b/examples/widgets/widgets/shapedclock/CMakeLists.txt
@@ -0,0 +1,32 @@
+# Generated from shapedclock.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(shapedclock LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/widgets/shapedclock")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(shapedclock
+    main.cpp
+    shapedclock.cpp shapedclock.h
+)
+target_link_libraries(shapedclock PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+install(TARGETS shapedclock
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/widgets/sliders/CMakeLists.txt b/examples/widgets/widgets/sliders/CMakeLists.txt
new file mode 100644
index 0000000000..a47ada2d48
--- /dev/null
+++ b/examples/widgets/widgets/sliders/CMakeLists.txt
@@ -0,0 +1,33 @@
+# Generated from sliders.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(sliders LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/widgets/sliders")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(sliders
+    main.cpp
+    slidersgroup.cpp slidersgroup.h
+    window.cpp window.h
+)
+target_link_libraries(sliders PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+install(TARGETS sliders
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/widgets/sliders/window.cpp b/examples/widgets/widgets/sliders/window.cpp
index 4a28a61f3d..916f206379 100644
--- a/examples/widgets/widgets/sliders/window.cpp
+++ b/examples/widgets/widgets/sliders/window.cpp
@@ -78,7 +78,7 @@ Window::Window(QWidget *parent)
             verticalSliders, &SlidersGroup::setValue);
     connect(verticalSliders, &SlidersGroup::valueChanged,
             valueSpinBox, &QSpinBox::setValue);
-    connect(valueSpinBox, QOverload<int>::of(&QSpinBox::valueChanged),
+    connect(valueSpinBox, &QSpinBox::valueChanged,
             horizontalSliders, &SlidersGroup::setValue);
 
     QHBoxLayout *layout = new QHBoxLayout;
@@ -126,16 +126,16 @@ void Window::createControls(const QString &title)
     orientationCombo->addItem(tr("Vertical slider-like widgets"));
 
 //! [6] //! [7]
-    connect(orientationCombo, QOverload<int>::of(&QComboBox::activated),
+    connect(orientationCombo, &QComboBox::activated,
 //! [7] //! [8]
             stackedWidget, &QStackedWidget::setCurrentIndex);
-    connect(minimumSpinBox, QOverload<int>::of(&QSpinBox::valueChanged),
+    connect(minimumSpinBox, &QSpinBox::valueChanged,
             horizontalSliders, &SlidersGroup::setMinimum);
-    connect(minimumSpinBox, QOverload<int>::of(&QSpinBox::valueChanged),
+    connect(minimumSpinBox, &QSpinBox::valueChanged,
             verticalSliders, &SlidersGroup::setMinimum);
-    connect(maximumSpinBox, QOverload<int>::of(&QSpinBox::valueChanged),
+    connect(maximumSpinBox, &QSpinBox::valueChanged,
             horizontalSliders, &SlidersGroup::setMaximum);
-    connect(maximumSpinBox, QOverload<int>::of(&QSpinBox::valueChanged),
+    connect(maximumSpinBox, &QSpinBox::valueChanged,
             verticalSliders, &SlidersGroup::setMaximum);
     connect(invertedAppearance, &QCheckBox::toggled,
             horizontalSliders, &SlidersGroup::invertAppearance);
diff --git a/examples/widgets/widgets/spinboxes/CMakeLists.txt b/examples/widgets/widgets/spinboxes/CMakeLists.txt
new file mode 100644
index 0000000000..050c4a8866
--- /dev/null
+++ b/examples/widgets/widgets/spinboxes/CMakeLists.txt
@@ -0,0 +1,32 @@
+# Generated from spinboxes.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(spinboxes LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/widgets/spinboxes")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(spinboxes
+    main.cpp
+    window.cpp window.h
+)
+target_link_libraries(spinboxes PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+install(TARGETS spinboxes
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/widgets/spinboxes/window.cpp b/examples/widgets/widgets/spinboxes/window.cpp
index 40c02aba70..6aeb5a8f69 100644
--- a/examples/widgets/widgets/spinboxes/window.cpp
+++ b/examples/widgets/widgets/spinboxes/window.cpp
@@ -262,7 +262,7 @@ void Window::createDoubleSpinBoxes()
     priceSpinBox->setPrefix("$");
     priceSpinBox->setValue(99.99);
 
-    connect(precisionSpinBox, QOverload<int>::of(&QSpinBox::valueChanged),
+    connect(precisionSpinBox, &QSpinBox::valueChanged,
 //! [17]
             this, &Window::changePrecision);
 
diff --git a/examples/widgets/widgets/styles/CMakeLists.txt b/examples/widgets/widgets/styles/CMakeLists.txt
new file mode 100644
index 0000000000..fc48780487
--- /dev/null
+++ b/examples/widgets/widgets/styles/CMakeLists.txt
@@ -0,0 +1,47 @@
+# Generated from styles.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(styles LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/widgets/styles")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(styles
+    main.cpp
+    norwegianwoodstyle.cpp norwegianwoodstyle.h
+    widgetgallery.cpp widgetgallery.h
+)
+target_link_libraries(styles PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+
+# Resources:
+set(styles_resource_files
+    "images/woodbackground.png"
+    "images/woodbutton.png"
+)
+
+qt6_add_resources(styles "styles"
+    PREFIX
+        "/"
+    FILES
+        ${styles_resource_files}
+)
+
+install(TARGETS styles
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/widgets/stylesheet/CMakeLists.txt b/examples/widgets/widgets/stylesheet/CMakeLists.txt
new file mode 100644
index 0000000000..1cdf8ff8dd
--- /dev/null
+++ b/examples/widgets/widgets/stylesheet/CMakeLists.txt
@@ -0,0 +1,80 @@
+# Generated from stylesheet.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(stylesheet LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/widgets/stylesheet")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(stylesheet
+    main.cpp
+    mainwindow.cpp mainwindow.h mainwindow.ui
+    stylesheeteditor.cpp stylesheeteditor.h stylesheeteditor.ui
+)
+target_link_libraries(stylesheet PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+
+# Resources:
+set(stylesheet_resource_files
+    "images/checkbox_checked.png"
+    "images/checkbox_checked_hover.png"
+    "images/checkbox_checked_pressed.png"
+    "images/checkbox_unchecked.png"
+    "images/checkbox_unchecked_hover.png"
+    "images/checkbox_unchecked_pressed.png"
+    "images/down_arrow.png"
+    "images/down_arrow_disabled.png"
+    "images/frame.png"
+    "images/pagefold.png"
+    "images/pushbutton.png"
+    "images/pushbutton_hover.png"
+    "images/pushbutton_pressed.png"
+    "images/radiobutton_checked.png"
+    "images/radiobutton_checked_hover.png"
+    "images/radiobutton_checked_pressed.png"
+    "images/radiobutton_unchecked.png"
+    "images/radiobutton_unchecked_hover.png"
+    "images/radiobutton_unchecked_pressed.png"
+    "images/sizegrip.png"
+    "images/spindown.png"
+    "images/spindown_hover.png"
+    "images/spindown_off.png"
+    "images/spindown_pressed.png"
+    "images/spinup.png"
+    "images/spinup_hover.png"
+    "images/spinup_off.png"
+    "images/spinup_pressed.png"
+    "images/up_arrow.png"
+    "images/up_arrow_disabled.png"
+    "layouts/default.ui"
+    "layouts/pagefold.ui"
+    "qss/coffee.qss"
+    "qss/default.qss"
+    "qss/pagefold.qss"
+)
+
+qt6_add_resources(stylesheet "stylesheet"
+    PREFIX
+        "/"
+    FILES
+        ${stylesheet_resource_files}
+)
+
+install(TARGETS stylesheet
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/widgets/tablet/CMakeLists.txt b/examples/widgets/widgets/tablet/CMakeLists.txt
new file mode 100644
index 0000000000..3de5d16523
--- /dev/null
+++ b/examples/widgets/widgets/tablet/CMakeLists.txt
@@ -0,0 +1,50 @@
+# Generated from tablet.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(qttablet LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/widgets/tablet")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(qttablet
+    main.cpp
+    mainwindow.cpp mainwindow.h
+    tabletapplication.cpp tabletapplication.h
+    tabletcanvas.cpp tabletcanvas.h
+)
+target_link_libraries(qttablet PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+
+# Resources:
+set(images_resource_files
+    "images/cursor-airbrush.png"
+    "images/cursor-eraser.png"
+    "images/cursor-felt-marker.png"
+    "images/cursor-pencil.png"
+)
+
+qt6_add_resources(qttablet "images"
+    PREFIX
+        "/"
+    FILES
+        ${images_resource_files}
+)
+
+install(TARGETS qttablet
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/widgets/tetrix/CMakeLists.txt b/examples/widgets/widgets/tetrix/CMakeLists.txt
new file mode 100644
index 0000000000..d36b82b90b
--- /dev/null
+++ b/examples/widgets/widgets/tetrix/CMakeLists.txt
@@ -0,0 +1,34 @@
+# Generated from tetrix.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(tetrix LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/widgets/tetrix")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(tetrix
+    main.cpp
+    tetrixboard.cpp tetrixboard.h
+    tetrixpiece.cpp tetrixpiece.h
+    tetrixwindow.cpp tetrixwindow.h
+)
+target_link_libraries(tetrix PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+install(TARGETS tetrix
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/widgets/tooltips/CMakeLists.txt b/examples/widgets/widgets/tooltips/CMakeLists.txt
new file mode 100644
index 0000000000..9543bef5da
--- /dev/null
+++ b/examples/widgets/widgets/tooltips/CMakeLists.txt
@@ -0,0 +1,48 @@
+# Generated from tooltips.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(tooltips LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/widgets/tooltips")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(tooltips
+    main.cpp
+    shapeitem.cpp shapeitem.h
+    sortingbox.cpp sortingbox.h
+)
+target_link_libraries(tooltips PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+
+# Resources:
+set(tooltips_resource_files
+    "images/circle.png"
+    "images/square.png"
+    "images/triangle.png"
+)
+
+qt6_add_resources(tooltips "tooltips"
+    PREFIX
+        "/"
+    FILES
+        ${tooltips_resource_files}
+)
+
+install(TARGETS tooltips
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/widgets/validators/CMakeLists.txt b/examples/widgets/widgets/validators/CMakeLists.txt
new file mode 100644
index 0000000000..085eac4e66
--- /dev/null
+++ b/examples/widgets/widgets/validators/CMakeLists.txt
@@ -0,0 +1,49 @@
+# Generated from validators.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(validators LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/widgets/validators")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(validators
+    ledwidget.cpp ledwidget.h
+    localeselector.cpp localeselector.h
+    main.cpp
+    validators.ui
+    validatorwidget.cpp validatorwidget.h
+)
+target_link_libraries(validators PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+
+# Resources:
+set(validators_resource_files
+    "ledoff.png"
+    "ledon.png"
+)
+
+qt6_add_resources(validators "validators"
+    PREFIX
+        "/"
+    FILES
+        ${validators_resource_files}
+)
+
+install(TARGETS validators
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/widgets/validators/validatorwidget.cpp b/examples/widgets/widgets/validators/validatorwidget.cpp
index 9ddd640924..504eec4fe7 100644
--- a/examples/widgets/widgets/validators/validatorwidget.cpp
+++ b/examples/widgets/widgets/validators/validatorwidget.cpp
@@ -75,9 +75,9 @@ ValidatorWidget::ValidatorWidget(QWidget *parent)
             this, &ValidatorWidget::updateDoubleValidator);
     connect(doubleMinVal, &QDoubleSpinBox::editingFinished,
             this, &ValidatorWidget::updateDoubleValidator);
-    connect(doubleDecimals, QOverload<int>::of(&QSpinBox::valueChanged),
+    connect(doubleDecimals, &QSpinBox::valueChanged,
             this, &ValidatorWidget::updateDoubleValidator);
-    connect(doubleFormat, QOverload<int>::of(&QComboBox::activated),
+    connect(doubleFormat, &QComboBox::activated,
             this, &ValidatorWidget::updateDoubleValidator);
     connect(doubleEditor, &QLineEdit::editingFinished,
             doubleLedWidget, &LEDWidget::flash);
diff --git a/examples/widgets/widgets/wiggly/CMakeLists.txt b/examples/widgets/widgets/wiggly/CMakeLists.txt
new file mode 100644
index 0000000000..3d00965a34
--- /dev/null
+++ b/examples/widgets/widgets/wiggly/CMakeLists.txt
@@ -0,0 +1,33 @@
+# Generated from wiggly.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(wiggly LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/widgets/wiggly")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(wiggly
+    dialog.cpp dialog.h
+    main.cpp
+    wigglywidget.cpp wigglywidget.h
+)
+target_link_libraries(wiggly PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+install(TARGETS wiggly
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/widgets/windowflags/CMakeLists.txt b/examples/widgets/widgets/windowflags/CMakeLists.txt
new file mode 100644
index 0000000000..0c2cb2b95b
--- /dev/null
+++ b/examples/widgets/widgets/windowflags/CMakeLists.txt
@@ -0,0 +1,33 @@
+# Generated from windowflags.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(windowflags LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/widgets/windowflags")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(windowflags
+    controllerwindow.cpp controllerwindow.h
+    main.cpp
+    previewwindow.cpp previewwindow.h
+)
+target_link_libraries(windowflags PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+install(TARGETS windowflags
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/windowcontainer/CMakeLists.txt b/examples/widgets/windowcontainer/CMakeLists.txt
new file mode 100644
index 0000000000..399cade1c5
--- /dev/null
+++ b/examples/widgets/windowcontainer/CMakeLists.txt
@@ -0,0 +1,38 @@
+# Generated from windowcontainer.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(windowcontainer LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/windowcontainer")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+find_package(Qt6 COMPONENTS OpenGL)
+
+add_qt_gui_executable(windowcontainer
+    ../../opengl/openglwindow/openglwindow.cpp ../../opengl/openglwindow/openglwindow.h
+    windowcontainer.cpp
+)
+target_include_directories(windowcontainer PUBLIC
+    ../../opengl/openglwindow
+)
+
+target_link_libraries(windowcontainer PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::OpenGL
+    Qt::Widgets
+)
+
+install(TARGETS windowcontainer
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/windowcontainer/windowcontainer.cpp b/examples/widgets/windowcontainer/windowcontainer.cpp
index b920c85420..f7c146e2a9 100644
--- a/examples/widgets/windowcontainer/windowcontainer.cpp
+++ b/examples/widgets/windowcontainer/windowcontainer.cpp
@@ -60,7 +60,7 @@
 #include <QWidget>
 
 
-// Making use of the class from the opengl example in gui.
+// Making use of the class from the openglwindow example
 class Window : public OpenGLWindow
 {
     Q_OBJECT
diff --git a/examples/widgets/windowcontainer/windowcontainer.pro b/examples/widgets/windowcontainer/windowcontainer.pro
index 9ac7e4a5ab..664ac938a2 100644
--- a/examples/widgets/windowcontainer/windowcontainer.pro
+++ b/examples/widgets/windowcontainer/windowcontainer.pro
@@ -6,4 +6,4 @@ QT += widgets
 target.path = $$[QT_INSTALL_EXAMPLES]/widgets/windowcontainer
 INSTALLS += target
 
-include(../../gui/openglwindow/openglwindow.pri)
+include(../../opengl/openglwindow/openglwindow.pri)
diff --git a/examples/xml/CMakeLists.txt b/examples/xml/CMakeLists.txt
new file mode 100644
index 0000000000..9291c191e0
--- /dev/null
+++ b/examples/xml/CMakeLists.txt
@@ -0,0 +1,13 @@
+# Generated from xml.pro.
+
+add_subdirectory(htmlinfo)
+add_subdirectory(xmlstreamlint)
+
+if(TARGET Qt::Widgets)
+    add_subdirectory(dombookmarks)
+    add_subdirectory(streambookmarks)
+
+    if(TARGET Qt::Network)
+        add_subdirectory(rsslisting)
+    endif()
+endif()
diff --git a/examples/xml/dombookmarks/CMakeLists.txt b/examples/xml/dombookmarks/CMakeLists.txt
new file mode 100644
index 0000000000..24d34443de
--- /dev/null
+++ b/examples/xml/dombookmarks/CMakeLists.txt
@@ -0,0 +1,35 @@
+# Generated from dombookmarks.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(dombookmarks LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/xml/dombookmarks")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Xml)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(dombookmarks
+    main.cpp
+    mainwindow.cpp mainwindow.h
+    xbeltree.cpp xbeltree.h
+)
+target_link_libraries(dombookmarks PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+    Qt::Xml
+)
+
+install(TARGETS dombookmarks
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/xml/htmlinfo/.prev_CMakeLists.txt b/examples/xml/htmlinfo/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..77fa423eff
--- /dev/null
+++ b/examples/xml/htmlinfo/.prev_CMakeLists.txt
@@ -0,0 +1,44 @@
+# Generated from htmlinfo.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(htmlinfo LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/xml/htmlinfo")
+
+find_package(Qt6 COMPONENTS Core)
+
+add_executable(htmlinfo
+    main.cpp
+)
+target_link_libraries(htmlinfo PUBLIC
+    Qt::Core
+)
+
+
+# Resources:
+set(resources_resource_files
+    "apache_org.html"
+    "simpleexample.html"
+    "trolltech_com.html"
+    "w3c_org.html"
+    "youtube_com.html"
+)
+
+qt6_add_resources(htmlinfo "resources"
+    PREFIX
+        "/"
+    FILES
+        ${resources_resource_files}
+)
+
+install(TARGETS htmlinfo
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/xml/htmlinfo/CMakeLists.txt b/examples/xml/htmlinfo/CMakeLists.txt
new file mode 100644
index 0000000000..77fa423eff
--- /dev/null
+++ b/examples/xml/htmlinfo/CMakeLists.txt
@@ -0,0 +1,44 @@
+# Generated from htmlinfo.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(htmlinfo LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/xml/htmlinfo")
+
+find_package(Qt6 COMPONENTS Core)
+
+add_executable(htmlinfo
+    main.cpp
+)
+target_link_libraries(htmlinfo PUBLIC
+    Qt::Core
+)
+
+
+# Resources:
+set(resources_resource_files
+    "apache_org.html"
+    "simpleexample.html"
+    "trolltech_com.html"
+    "w3c_org.html"
+    "youtube_com.html"
+)
+
+qt6_add_resources(htmlinfo "resources"
+    PREFIX
+        "/"
+    FILES
+        ${resources_resource_files}
+)
+
+install(TARGETS htmlinfo
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/xml/rsslisting/CMakeLists.txt b/examples/xml/rsslisting/CMakeLists.txt
new file mode 100644
index 0000000000..96f79d2043
--- /dev/null
+++ b/examples/xml/rsslisting/CMakeLists.txt
@@ -0,0 +1,36 @@
+# Generated from rsslisting.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(rsslisting LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/xml/rsslisting")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Network)
+find_package(Qt6 COMPONENTS Xml)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(rsslisting
+    main.cpp
+    rsslisting.cpp rsslisting.h
+)
+target_link_libraries(rsslisting PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Network
+    Qt::Widgets
+    Qt::Xml
+)
+
+install(TARGETS rsslisting
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/xml/streambookmarks/CMakeLists.txt b/examples/xml/streambookmarks/CMakeLists.txt
new file mode 100644
index 0000000000..22ba383558
--- /dev/null
+++ b/examples/xml/streambookmarks/CMakeLists.txt
@@ -0,0 +1,36 @@
+# Generated from streambookmarks.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(streambookmarks LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/xml/streambookmarks")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Xml)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(streambookmarks
+    main.cpp
+    mainwindow.cpp mainwindow.h
+    xbelreader.cpp xbelreader.h
+    xbelwriter.cpp xbelwriter.h
+)
+target_link_libraries(streambookmarks PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+    Qt::Xml
+)
+
+install(TARGETS streambookmarks
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/xml/xmlstreamlint/.prev_CMakeLists.txt b/examples/xml/xmlstreamlint/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..bb5cad16da
--- /dev/null
+++ b/examples/xml/xmlstreamlint/.prev_CMakeLists.txt
@@ -0,0 +1,27 @@
+# Generated from xmlstreamlint.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(xmlstreamlint LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/xml/xmlstreamlint")
+
+find_package(Qt6 COMPONENTS Core)
+
+add_executable(xmlstreamlint
+    main.cpp
+)
+target_link_libraries(xmlstreamlint PUBLIC
+    Qt::Core
+)
+
+install(TARGETS xmlstreamlint
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/xml/xmlstreamlint/CMakeLists.txt b/examples/xml/xmlstreamlint/CMakeLists.txt
new file mode 100644
index 0000000000..b100943537
--- /dev/null
+++ b/examples/xml/xmlstreamlint/CMakeLists.txt
@@ -0,0 +1,28 @@
+# Generated from xmlstreamlint.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(xmlstreamlint LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/xml/xmlstreamlint")
+
+find_package(Qt6 COMPONENTS Core Xml) # special case
+
+add_executable(xmlstreamlint
+    main.cpp
+)
+target_link_libraries(xmlstreamlint PUBLIC
+    Qt::Core
+    Qt::Xml # special case: add
+)
+
+install(TARGETS xmlstreamlint
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/mkspecs/common/icc-base-unix.conf b/mkspecs/common/icc-base-unix.conf
index 5b4b71ac0d..e6cf54eea3 100644
--- a/mkspecs/common/icc-base-unix.conf
+++ b/mkspecs/common/icc-base-unix.conf
@@ -75,7 +75,7 @@ QMAKE_CXXFLAGS_SPLIT_SECTIONS = $$QMAKE_CFLAGS_SPLIT_SECTIONS
 QMAKE_CXXFLAGS_EXCEPTIONS_OFF = -fno-exceptions
 QMAKE_CXXFLAGS_CXX11    = -std=c++11
 QMAKE_CXXFLAGS_CXX14    = -std=c++1y
-QMAKE_CXXFLAGS_CXX1Z    = -std=c++1z
+QMAKE_CXXFLAGS_CXX1Z    = -std=c++17
 QMAKE_CXXFLAGS_GNUCXX11 = -std=gnu++11
 QMAKE_CXXFLAGS_GNUCXX14 = -std=gnu++1y
 QMAKE_CXXFLAGS_GNUCXX1Z = -std=gnu++1z
diff --git a/mkspecs/common/macx.conf b/mkspecs/common/macx.conf
index d16b77acb8..6a1b076d7d 100644
--- a/mkspecs/common/macx.conf
+++ b/mkspecs/common/macx.conf
@@ -5,7 +5,7 @@
 QMAKE_PLATFORM         += macos osx macx
 QMAKE_MAC_SDK           = macosx
 
-QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.13
+QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.14
 QMAKE_APPLE_DEVICE_ARCHS = x86_64
 
 # Should be 10.15, but as long as the CI builds with
diff --git a/mkspecs/common/qcc-base-qnx.conf b/mkspecs/common/qcc-base-qnx.conf
index 4725371c29..dce6d8ea2c 100644
--- a/mkspecs/common/qcc-base-qnx.conf
+++ b/mkspecs/common/qcc-base-qnx.conf
@@ -46,7 +46,7 @@ QMAKE_RPATHLINKDIR_POST += $${QNX_DIR}/$${QNX_CPUDIR}/lib $${QNX_DIR}/$${QNX_CPU
 
 QMAKE_CXXFLAGS_CXX11    =
 QMAKE_CXXFLAGS_CXX14    =
-QMAKE_CXXFLAGS_CXX1Z    =
+QMAKE_CXXFLAGS_CXX1Z    = -Wc,-std=gnu++1z
 
 QMAKE_CXXFLAGS_GNUCXX11 = -Wc,-std=gnu++11
 QMAKE_CXXFLAGS_GNUCXX14 = -Wc,-std=gnu++1y
diff --git a/mkspecs/features/default_post.prf b/mkspecs/features/default_post.prf
index 1d79f5c958..9c73eeef69 100644
--- a/mkspecs/features/default_post.prf
+++ b/mkspecs/features/default_post.prf
@@ -124,22 +124,20 @@ breakpad {
 c++17: CONFIG += c++1z
 c++latest: CONFIG *= c++2a c++1z c++14 c++11
 
-!c++11:!c++14:!c++1z:!c++2a {
-    # Qt requires C++11 since 5.7, check if we need to force a compiler option
+!c++1z:!c++2a {
+    # Qt requires C++17
     QT_COMPILER_STDCXX_no_L = $$replace(QT_COMPILER_STDCXX, "L$", "")
-    !greaterThan(QT_COMPILER_STDCXX_no_L, 199711): CONFIG += c++11
+    !greaterThan(QT_COMPILER_STDCXX_no_L, 201402): CONFIG += c++1z
 }
-c++11|c++14|c++1z|c++2a {
+c++1z|c++2a {
     # Disable special compiler flags for host builds
     !host_build|!cross_compile {
         c++2a:       cxxstd = CXX2A
-        else: c++1z: cxxstd = CXX1Z
-        else: c++14: cxxstd = CXX14
-        else:        cxxstd = CXX11
+        else:        cxxstd = CXX1Z
     } else {
-        # Fall back to c++11, because since 5.7 c++11 is required everywhere,
+        # Fall back to c++17, because C++17 is required everywhere,
         # including host builds
-        cxxstd = CXX11
+        cxxstd = CXX1Z
     }
 
     # Check if we should disable compiler extensions or not
diff --git a/mkspecs/features/java.prf b/mkspecs/features/java.prf
index f1f5e4c10c..1d52f05e52 100644
--- a/mkspecs/features/java.prf
+++ b/mkspecs/features/java.prf
@@ -20,7 +20,7 @@ CONFIG += plugin no_plugin_name_prefix
 javac.input = JAVASOURCES
 javac.output = $$CLASS_DIR
 javac.CONFIG += combine
-javac.commands = javac -source 6 -target 6 -Xlint:unchecked -bootclasspath $$ANDROID_JAR_FILE -cp $$shell_quote($$system_path($$join(JAVACLASSPATH, $$DIRLIST_SEPARATOR))) -d $$shell_quote($$CLASS_DIR) ${QMAKE_FILE_IN}
+javac.commands = javac -source 7 -target 7 -Xlint:unchecked -bootclasspath $$ANDROID_JAR_FILE -cp $$shell_quote($$system_path($$join(JAVACLASSPATH, $$DIRLIST_SEPARATOR))) -d $$shell_quote($$CLASS_DIR) ${QMAKE_FILE_IN}
 # Force rebuild every time, because we don't know the paths of the destination files
 # as they depend on the code.
 javac.depends = FORCE
diff --git a/mkspecs/features/qml_plugin.prf b/mkspecs/features/qml_plugin.prf
index 1b67435787..74ab932f80 100644
--- a/mkspecs/features/qml_plugin.prf
+++ b/mkspecs/features/qml_plugin.prf
@@ -87,12 +87,13 @@ load(qt_common)
     # against concurrent wrapper creation by omitting it during build passes.
     # However, creating the actual targets is reserved to the build passes.
     build_pass|!debug_and_release {
-        isEmpty(IMPORT_VERSION) {
+        isEmpty(QML_IMPORT_VERSION):!isEmpty(IMPORT_VERSION): QML_IMPORT_VERSION = $$IMPORT_VERSION
+        isEmpty(QML_IMPORT_VERSION) {
             no_cxx_module {
-                IMPORT_VERSION = $$section(MODULE_VERSION, ., 0, 1)
-                isEmpty(IMPORT_VERSION): error("Must set IMPORT_VERSION")
+                QML_IMPORT_VERSION = $$section(MODULE_VERSION, ., 0, 1)
+                isEmpty(QML_IMPORT_VERSION): error("Must set QML_IMPORT_VERSION")
             } else {
-                IMPORT_VERSION = $$section(QT.$${CXX_MODULE}.VERSION, ., 0, 1)
+                QML_IMPORT_VERSION = $$section(QT.$${CXX_MODULE}.VERSION, ., 0, 1)
             }
         }
 
@@ -107,7 +108,7 @@ load(qt_common)
         }
 
         qmltypes.target = qmltypes
-        qmltypes.commands = $$QMLPLUGINDUMP -nonrelocatable $$QMAKE_QMLPLUGINDUMP_FLAGS $$replace(IMPORT_NAME, /, .) $$IMPORT_VERSION > $$QMLTYPEFILE
+        qmltypes.commands = $$QMLPLUGINDUMP -nonrelocatable $$QMAKE_QMLPLUGINDUMP_FLAGS $$replace(IMPORT_NAME, /, .) $$QML_IMPORT_VERSION > $$QMLTYPEFILE
         qmltypes.depends = $$QMAKE_RESOLVED_TARGET
     } else {
         qmltypes.CONFIG += recursive
diff --git a/mkspecs/features/qt_build_config.prf b/mkspecs/features/qt_build_config.prf
index 511b158b91..7ca9943c32 100644
--- a/mkspecs/features/qt_build_config.prf
+++ b/mkspecs/features/qt_build_config.prf
@@ -114,10 +114,6 @@ macos: CONFIG += testcase_no_bundle
 # Override MinGW's definition in _mingw.h
 mingw: DEFINES += WINVER=0x0601 _WIN32_WINNT=0x0601
 
-# By default, the following features should not be used in Qt's own
-# implementation, so declare them invisible to Qt modules.
-DEFINES += QT_NO_LINKED_LIST # QLinkedList
-
 defineTest(qtBuildPart) {
     bp = $$eval($$upper($$section(_QMAKE_CONF_, /, -2, -2))_BUILD_PARTS)
     isEmpty(bp): bp = $$QT_BUILD_PARTS
diff --git a/qmake/.prev_CMakeLists.txt b/qmake/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..3f30387fd4
--- /dev/null
+++ b/qmake/.prev_CMakeLists.txt
@@ -0,0 +1,188 @@
+# Generated from qmake.pro.
+
+#####################################################################
+## qmake Binary:
+#####################################################################
+
+qt_add_executable(qmake
+    SOURCES
+        ../src/corelib/codecs/qutfcodec.cpp ../src/corelib/codecs/qutfcodec_p.h
+        ../src/corelib/global/qglobal.cpp ../src/corelib/global/qglobal.h
+        ../src/corelib/global/qlibraryinfo.cpp
+        ../src/corelib/global/qlogging.cpp
+        ../src/corelib/global/qmalloc.cpp
+        ../src/corelib/global/qnumeric.cpp ../src/corelib/global/qnumeric.h
+        ../src/corelib/io/qabstractfileengine.cpp ../src/corelib/io/qabstractfileengine_p.h
+        ../src/corelib/io/qbuffer.cpp ../src/corelib/io/qbuffer.h
+        ../src/corelib/io/qdir.cpp ../src/corelib/io/qdir.h ../src/corelib/io/qdir_p.h
+        ../src/corelib/io/qdiriterator.cpp ../src/corelib/io/qdiriterator.h
+        ../src/corelib/io/qfile.cpp ../src/corelib/io/qfile.h
+        ../src/corelib/io/qfiledevice.cpp
+        ../src/corelib/io/qfileinfo.cpp ../src/corelib/io/qfileinfo.h
+        ../src/corelib/io/qfilesystemengine.cpp
+        ../src/corelib/io/qfilesystementry.cpp
+        ../src/corelib/io/qfsfileengine.cpp
+        ../src/corelib/io/qfsfileengine_iterator.cpp
+        ../src/corelib/io/qiodevice.cpp ../src/corelib/io/qiodevice.h
+        ../src/corelib/io/qsettings.cpp
+        ../src/corelib/io/qtemporaryfile.cpp ../src/corelib/io/qtemporaryfile.h
+        ../src/corelib/kernel/qmetatype.cpp ../src/corelib/kernel/qmetatype.h
+        ../src/corelib/kernel/qsystemerror.cpp ../src/corelib/kernel/qsystemerror_p.h
+        ../src/corelib/kernel/qvariant.cpp
+        ../src/corelib/plugin/quuid.cpp ../src/corelib/plugin/quuid.h
+        ../src/corelib/serialization/qcborstreamwriter.cpp ../src/corelib/serialization/qcborstreamwriter.h
+        ../src/corelib/serialization/qcborvalue.cpp ../src/corelib/serialization/qcborvalue.h ../src/corelib/serialization/qcborvalue_p.h
+        ../src/corelib/serialization/qjson_p.h
+        ../src/corelib/serialization/qjsonarray.cpp ../src/corelib/serialization/qjsonarray.h
+        ../src/corelib/serialization/qjsoncbor.cpp
+        ../src/corelib/serialization/qjsondocument.cpp ../src/corelib/serialization/qjsondocument.h
+        ../src/corelib/serialization/qjsonobject.cpp ../src/corelib/serialization/qjsonobject.h
+        ../src/corelib/serialization/qjsonparser.cpp ../src/corelib/serialization/qjsonparser_p.h
+        ../src/corelib/serialization/qjsonvalue.cpp ../src/corelib/serialization/qjsonvalue.h
+        ../src/corelib/serialization/qjsonwriter_p.h
+        ../src/corelib/serialization/qtextstream.cpp ../src/corelib/serialization/qtextstream.h
+        ../src/corelib/serialization/qxmlstream.cpp ../src/corelib/serialization/qxmlstream.h
+        ../src/corelib/serialization/qxmlutils.cpp ../src/corelib/serialization/qxmlutils_p.h
+        ../src/corelib/tools/qarraydata.cpp ../src/corelib/tools/qarraydata.h
+        ../src/corelib/tools/qarraydataops.h
+        ../src/corelib/tools/qarraydatapointer.h
+        ../src/corelib/tools/qbitarray.cpp ../src/corelib/tools/qbitarray.h
+        ../src/corelib/tools/qcryptographichash.cpp ../src/corelib/tools/qcryptographichash.h
+        ../src/corelib/tools/qhash.cpp ../src/corelib/tools/qhash.h
+        ../src/corelib/tools/qlist.cpp ../src/corelib/tools/qlist.h
+        ../src/corelib/tools/qmap.cpp ../src/corelib/tools/qmap.h
+        ../src/corelib/tools/qvector.h
+        ../src/corelib/tools/qversionnumber.cpp ../src/corelib/tools/qversionnumber.h
+        cachekeys.h
+        generators/mac/pbuilder_pbx.cpp generators/mac/pbuilder_pbx.h
+        generators/makefile.cpp generators/makefile.h
+        generators/makefiledeps.cpp generators/makefiledeps.h
+        generators/metamakefile.cpp generators/metamakefile.h
+        generators/projectgenerator.cpp generators/projectgenerator.h
+        generators/unix/unixmake.cpp generators/unix/unixmake.h
+        generators/unix/unixmake2.cpp
+        generators/win32/mingw_make.cpp generators/win32/mingw_make.h
+        generators/win32/msbuild_objectmodel.cpp generators/win32/msbuild_objectmodel.h
+        generators/win32/msvc_nmake.cpp generators/win32/msvc_nmake.h
+        generators/win32/msvc_objectmodel.cpp generators/win32/msvc_objectmodel.h
+        generators/win32/msvc_vcproj.cpp generators/win32/msvc_vcproj.h
+        generators/win32/msvc_vcxproj.cpp generators/win32/msvc_vcxproj.h
+        generators/win32/winmakefile.cpp generators/win32/winmakefile.h
+        generators/xmloutput.cpp generators/xmloutput.h
+        library/ioutils.cpp library/ioutils.h
+        library/proitems.cpp library/proitems.h
+        library/qmake_global.h
+        library/qmakebuiltins.cpp
+        library/qmakeevaluator.cpp library/qmakeevaluator.h library/qmakeevaluator_p.h
+        library/qmakeglobals.cpp library/qmakeglobals.h
+        library/qmakeparser.cpp library/qmakeparser.h
+        library/qmakevfs.cpp library/qmakevfs.h
+        main.cpp
+        meta.cpp meta.h
+        option.cpp option.h
+        project.cpp project.h
+        property.cpp property.h
+        qbytearray.cpp-NOTFOUND qbytearray.h-NOTFOUND
+        qbytearraymatcher.cpp-NOTFOUND qbytearraymatcher.h-NOTFOUND
+        qcalendar.cpp-NOTFOUND qcalendar.h-NOTFOUND
+        qcalendarbackend_p.h-NOTFOUND
+        qcalendarmath_p.h-NOTFOUND
+        qchar.h-NOTFOUND
+        qdatetime.cpp-NOTFOUND qdatetime.h-NOTFOUND qdatetime_p.h-NOTFOUND
+        qgregoriancalendar.cpp-NOTFOUND qgregoriancalendar_p.h-NOTFOUND
+        qlocale.cpp-NOTFOUND qlocale.h-NOTFOUND
+        qlocale_tools.cpp-NOTFOUND qlocale_tools_p.h-NOTFOUND
+        qregexp.cpp-NOTFOUND qregexp.h-NOTFOUND
+        qromancalendar.cpp-NOTFOUND qromancalendar_p.h-NOTFOUND
+        qstring.cpp-NOTFOUND qstring.h-NOTFOUND
+        qstringlist.cpp-NOTFOUND qstringlist.h-NOTFOUND
+        qstringmatcher.h-NOTFOUND
+        qvsnprintf.cpp-NOTFOUND
+    DEFINES
+        (QT_VERSION_STR=\"\")
+        PROEVALUATOR_FULL
+        QT_BOOTSTRAPPED
+        QT_BUILD_QMAKE
+        QT_NO_FOREACH
+        QT_VERSION_MAJOR=
+        QT_VERSION_MINOR=
+        QT_VERSION_PATCH=
+    INCLUDE_DIRECTORIES
+        (..)/include
+        (..)/include/QtCore (..)/include/QtCore
+        (..)/include/QtCore//QtCore
+        (..)/src/corelib/global
+        .
+        ../src/3rdparty/tinycbor/src
+        generators
+        generators/mac
+        generators/unix
+        generators/win32
+        library
+    PUBLIC_LIBRARIES
+        Qt::Gui
+    PRECOMPILED_HEADER
+        "qmake_pch.h"
+)
+
+#### Keys ignored in scope 1:.:.:qmake.pro:<TRUE>:
+# _OPTION = "host_build"
+
+## Scopes:
+#####################################################################
+
+qt_extend_target(qmake CONDITION WIN32
+    SOURCES
+        ../src/corelib/global/qoperatingsystemversion_win.cpp
+        ../src/corelib/io/qfilesystemengine_win.cpp
+        ../src/corelib/io/qfilesystemiterator_win.cpp
+        ../src/corelib/io/qfsfileengine_win.cpp
+        ../src/corelib/io/qsettings_win.cpp
+        ../src/corelib/plugin/qsystemlibrary.cpp
+        qlocale_win.cpp-NOTFOUND
+        registry.cpp-NOTFOUND
+    DEFINES
+        UNICODE
+        _CRT_SECURE_NO_WARNINGS
+        _ENABLE_EXTENDED_ALIGNED_STORAGE
+        _SCL_SECURE_NO_WARNINGS
+    PUBLIC_LIBRARIES
+        advapi32
+        kernel32
+        netapi32
+        ole32
+)
+
+qt_extend_target(qmake CONDITION UNIX
+    SOURCES
+        ../src/corelib/io/qfilesystemengine_unix.cpp
+        ../src/corelib/io/qfilesystemiterator_unix.cpp
+        ../src/corelib/io/qfsfileengine_unix.cpp
+        ../src/corelib/kernel/qcore_unix.cpp
+        qlocale_unix.cpp-NOTFOUND
+)
+
+qt_extend_target(qmake CONDITION APPLE_OSX
+    SOURCES
+        qcore_foundation.mm
+        qcore_mac.cpp
+        qoperatingsystemversion_darwin.mm
+        qsettings_mac.cpp
+    PUBLIC_LIBRARIES
+        ${FWApplicationServices}
+        ${FWCoreServices}
+        ${FWFoundation}
+    COMPILE_OPTIONS
+        -fconstant-cfstrings
+)
+
+qt_extend_target(qmake CONDITION WIN32 AND mingw
+    PUBLIC_LIBRARIES
+        uuid
+)
+
+qt_extend_target(qmake CONDITION CLANG AND WIN32
+    COMPILE_OPTIONS
+        -Wno-microsoft-enum-value
+        -fms-compatibility-version=19.00.23506
+)
diff --git a/qmake/CMakeLists.txt b/qmake/CMakeLists.txt
new file mode 100644
index 0000000000..fb370eda4a
--- /dev/null
+++ b/qmake/CMakeLists.txt
@@ -0,0 +1,220 @@
+# Generated from qmake.pro.
+
+#####################################################################
+## qmake Binary:
+#####################################################################
+
+qt_add_tool(qmake # special case
+    NO_QT # special case
+    TOOLS_TARGET Core # special case
+    # GUI # special case: remove this
+    SOURCES
+        ../src/corelib/codecs/qutfcodec.cpp ../src/corelib/codecs/qutfcodec_p.h
+        ../src/corelib/global/qendian.cpp # special case
+        ../src/corelib/global/qglobal.cpp ../src/corelib/global/qglobal.h
+        ../src/corelib/global/qlibraryinfo.cpp
+        ../src/corelib/global/qlogging.cpp
+        ../src/corelib/global/qmalloc.cpp
+        ../src/corelib/global/qnumeric.cpp ../src/corelib/global/qnumeric.h
+        ../src/corelib/global/qoperatingsystemversion.cpp # special case
+        ../src/corelib/global/qrandom.cpp # special case
+        ../src/corelib/io/qabstractfileengine.cpp ../src/corelib/io/qabstractfileengine_p.h
+        ../src/corelib/io/qbuffer.cpp ../src/corelib/io/qbuffer.h
+        ../src/corelib/io/qdebug.cpp # special case
+        ../src/corelib/io/qdir.cpp ../src/corelib/io/qdir.h ../src/corelib/io/qdir_p.h
+        ../src/corelib/io/qdiriterator.cpp ../src/corelib/io/qdiriterator.h
+        ../src/corelib/io/qfile.cpp ../src/corelib/io/qfile.h
+        ../src/corelib/io/qfiledevice.cpp
+        ../src/corelib/io/qfileinfo.cpp ../src/corelib/io/qfileinfo.h
+        ../src/corelib/io/qfilesystemengine.cpp
+        ../src/corelib/io/qfilesystementry.cpp
+        ../src/corelib/io/qfsfileengine.cpp
+        ../src/corelib/io/qfsfileengine_iterator.cpp
+        ../src/corelib/io/qiodevice.cpp ../src/corelib/io/qiodevice.h
+        ../src/corelib/io/qsettings.cpp
+        ../src/corelib/io/qtemporaryfile.cpp ../src/corelib/io/qtemporaryfile.h
+        ../src/corelib/kernel/qmetatype.cpp ../src/corelib/kernel/qmetatype.h
+        ../src/corelib/kernel/qsystemerror.cpp ../src/corelib/kernel/qsystemerror_p.h
+        ../src/corelib/kernel/qvariant.cpp
+        ../src/corelib/plugin/quuid.cpp ../src/corelib/plugin/quuid.h
+        ../src/corelib/serialization/qcborstreamwriter.cpp ../src/corelib/serialization/qcborstreamwriter.h
+        ../src/corelib/serialization/qcborvalue.cpp ../src/corelib/serialization/qcborvalue.h ../src/corelib/serialization/qcborvalue_p.h
+        ../src/corelib/serialization/qjson_p.h
+        ../src/corelib/serialization/qjsonarray.cpp ../src/corelib/serialization/qjsonarray.h
+        ../src/corelib/serialization/qjsoncbor.cpp
+        ../src/corelib/serialization/qjsondocument.cpp ../src/corelib/serialization/qjsondocument.h
+        ../src/corelib/serialization/qjsonobject.cpp ../src/corelib/serialization/qjsonobject.h
+        ../src/corelib/serialization/qjsonparser.cpp ../src/corelib/serialization/qjsonparser_p.h
+        ../src/corelib/serialization/qjsonvalue.cpp ../src/corelib/serialization/qjsonvalue.h
+        ../src/corelib/serialization/qjsonwriter_p.h
+        ../src/corelib/serialization/qtextstream.cpp ../src/corelib/serialization/qtextstream.h
+        ../src/corelib/serialization/qxmlstream.cpp ../src/corelib/serialization/qxmlstream.h
+        ../src/corelib/serialization/qxmlutils.cpp ../src/corelib/serialization/qxmlutils_p.h
+        ../src/corelib/tools/qarraydata.cpp ../src/corelib/tools/qarraydata.h
+        ../src/corelib/tools/qarraydataops.h
+        ../src/corelib/tools/qarraydatapointer.h
+        ../src/corelib/tools/qbitarray.cpp ../src/corelib/tools/qbitarray.h
+        ../src/corelib/text/qbytearray.cpp ../src/corelib/text/qbytearray.h
+        ../src/corelib/text/qbytearraylist.cpp ../src/corelib/text/qbytearraylist.h # special case
+        ../src/corelib/text/qbytearraymatcher.cpp ../src/corelib/text/qbytearraymatcher.h
+        ../src/corelib/text/qchar.h
+        ../src/corelib/tools/qcryptographichash.cpp ../src/corelib/tools/qcryptographichash.h
+        ../src/corelib/time/qcalendar.cpp ../src/corelib/time/qcalendar.h # special case
+        ../src/corelib/time/qcalendarbackend_p.h ../src/corelib/time/qcalendarmath_p.h # special case
+        ../src/corelib/time/qgregoriancalendar.cpp ../src/corelib/time/qgregoriancalendar_p.h # special case
+        ../src/corelib/time/qromancalendar.cpp ../src/corelib/time/qromancalendar_p.h # special case
+        ../src/corelib/time/qdatetime.cpp ../src/corelib/time/qdatetime.h ../src/corelib/time/qdatetime_p.h # special case
+        ../src/corelib/tools/qhash.cpp ../src/corelib/tools/qhash.h
+        ../src/corelib/tools/qlist.cpp ../src/corelib/tools/qlist.h
+        ../src/corelib/text/qlocale.cpp ../src/corelib/text/qlocale.h
+        ../src/corelib/text/qlocale_tools.cpp ../src/corelib/text/qlocale_tools_p.h
+        ../src/corelib/tools/qmap.cpp ../src/corelib/tools/qmap.h
+        ../src/corelib/text/qregexp.cpp ../src/corelib/text/qregexp.h
+        ../src/corelib/tools/qringbuffer.cpp # special case
+        ../src/corelib/text/qstring.cpp ../src/corelib/text/qstring.h
+        ../src/corelib/text/qstringlist.cpp ../src/corelib/text/qstringlist.h
+        ../src/corelib/text/qstringmatcher.h
+        ../src/corelib/tools/qvector.h
+        ../src/corelib/tools/qversionnumber.cpp ../src/corelib/tools/qversionnumber.h
+        ../src/corelib/text/qvsnprintf.cpp
+        cachekeys.h
+        generators/mac/pbuilder_pbx.cpp generators/mac/pbuilder_pbx.h
+        generators/makefile.cpp generators/makefile.h
+        generators/makefiledeps.cpp generators/makefiledeps.h
+        generators/metamakefile.cpp generators/metamakefile.h
+        generators/projectgenerator.cpp generators/projectgenerator.h
+        generators/unix/unixmake.cpp generators/unix/unixmake.h
+        generators/unix/unixmake2.cpp
+        generators/win32/mingw_make.cpp generators/win32/mingw_make.h
+        generators/win32/msbuild_objectmodel.cpp generators/win32/msbuild_objectmodel.h
+        generators/win32/msvc_nmake.cpp generators/win32/msvc_nmake.h
+        generators/win32/msvc_objectmodel.cpp generators/win32/msvc_objectmodel.h
+        generators/win32/msvc_vcproj.cpp generators/win32/msvc_vcproj.h
+        generators/win32/msvc_vcxproj.cpp generators/win32/msvc_vcxproj.h
+        generators/win32/winmakefile.cpp generators/win32/winmakefile.h
+        generators/xmloutput.cpp generators/xmloutput.h
+        library/ioutils.cpp library/ioutils.h
+        library/proitems.cpp library/proitems.h
+        library/qmake_global.h
+        library/qmakebuiltins.cpp
+        library/qmakeevaluator.cpp library/qmakeevaluator.h library/qmakeevaluator_p.h
+        library/qmakeglobals.cpp library/qmakeglobals.h
+        library/qmakeparser.cpp library/qmakeparser.h
+        library/qmakevfs.cpp library/qmakevfs.h
+        main.cpp
+        meta.cpp meta.h
+        option.cpp option.h
+        project.cpp project.h
+        property.cpp property.h
+    DEFINES
+        PROEVALUATOR_FULL
+        QT_BOOTSTRAPPED
+        QT_BUILD_QMAKE
+        QT_NO_FOREACH
+        QT_VERSION_STR="${PROJECT_VERSION}" # special case
+        QT_VERSION_MAJOR=${PROJECT_VERSION_MAJOR} # special case
+        QT_VERSION_MINOR=${PROJECT_VERSION_MINOR} # special case
+        QT_VERSION_PATCH=${PROJECT_VERSION_PATCH} # special case
+    INCLUDE_DIRECTORIES
+        # . # special case remove
+        generators
+        generators/mac
+        generators/unix
+        generators/win32
+        library
+        $<TARGET_PROPERTY:Qt::Core,INCLUDE_DIRECTORIES> # special case
+        "${PROJECT_BINARY_DIR}/src/corelib/global" # special case: for qconfig.cpp
+    PRECOMPILED_HEADER
+        "qmake_pch.h"
+)
+
+#### Keys ignored in scope 1:.:.:qmake.pro:<TRUE>:
+# _OPTION = "host_build"
+
+## Scopes:
+#####################################################################
+
+qt_extend_target(qmake CONDITION WIN32
+    SOURCES
+        ../src/corelib/global/qoperatingsystemversion_win.cpp
+        ../src/corelib/io/qfilesystemengine_win.cpp
+        ../src/corelib/io/qfilesystemiterator_win.cpp
+        ../src/corelib/io/qfsfileengine_win.cpp
+        ../src/corelib/io/qsettings_win.cpp
+        ../src/corelib/plugin/qsystemlibrary.cpp
+        ../src/corelib/text/qlocale_win.cpp # special case
+        library/registry.cpp # special case
+    DEFINES
+        UNICODE
+        _CRT_SECURE_NO_WARNINGS
+        _ENABLE_EXTENDED_ALIGNED_STORAGE
+        _SCL_SECURE_NO_WARNINGS
+    PUBLIC_LIBRARIES
+        advapi32
+        kernel32
+        netapi32
+        ole32
+)
+
+qt_extend_target(qmake CONDITION UNIX
+    SOURCES
+        ../src/corelib/io/qfilesystemengine_unix.cpp
+        ../src/corelib/io/qfilesystemiterator_unix.cpp
+        ../src/corelib/io/qfsfileengine_unix.cpp
+        ../src/corelib/kernel/qcore_unix.cpp
+        ../src/corelib/text/qlocale_unix.cpp
+)
+
+qt_extend_target(qmake CONDITION APPLE_OSX
+    SOURCES
+        ../src/corelib/kernel/qcore_foundation.mm # special case
+        ../src/corelib/kernel/qcore_mac.cpp # special case
+        ../src/corelib/global/qoperatingsystemversion_darwin.mm # special case
+        ../src/corelib/io/qsettings_mac.cpp # special case
+    PUBLIC_LIBRARIES
+        ${FWApplicationServices}
+        ${FWCoreServices}
+        ${FWFoundation}
+    COMPILE_OPTIONS
+        "-fconstant-cfstrings"
+)
+
+# special case big
+extend_target(qmake CONDITION WIN32
+    SOURCES
+        ../src/corelib/io/qfilesystemengine_win.cpp
+        ../src/corelib/io/qfilesystemiterator_win.cpp
+        ../src/corelib/io/qfsfileengine_win.cpp
+        ../src/corelib/text/qlocale_win.cpp
+        ../src/corelib/io/qsettings_win.cpp
+        # ../src/corelib/global/qoperatingsystemversion.cpp special case: remove this
+        ../src/corelib/plugin/qsystemlibrary.cpp
+        library/registry.cpp
+    DEFINES
+        UNICODE _ENABLE_EXTENDED_ALIGNED_STORAGE _CRT_SECURE_NO_WARNINGS _SCL_SECURE_NO_WARNINGS
+    LIBRARIES
+        ole32 advapi32 kernel32 netapi32
+)
+
+qt_extend_target(qmake CONDITION WIN32 AND mingw
+    PUBLIC_LIBRARIES
+        uuid
+)
+
+qt_extend_target(qmake CONDITION CLANG AND WIN32
+    COMPILE_OPTIONS
+        "-fms-compatibility-version=19.00.23506"
+        "-Wno-microsoft-enum-value"
+)
+
+# special case:
+set_target_properties(qmake PROPERTIES
+    AUTOMOC OFF
+    AUTORCC OFF
+    AUTOUIC OFF
+)
+
+qt_internal_add_link_flags_gc_sections(qmake PRIVATE) # special case
+
+qt_enable_msvc_cplusplus_define(qmake PUBLIC) # special case
+
diff --git a/qmake/Makefile.unix b/qmake/Makefile.unix
index 325a8548cf..4024231b70 100644
--- a/qmake/Makefile.unix
+++ b/qmake/Makefile.unix
@@ -30,7 +30,7 @@ QOBJS = \
 	quuid.o \
 	qarraydata.o qbitarray.o qbytearray.o qbytearraylist.o qbytearraymatcher.o \
 	qcalendar.o qgregoriancalendar.o qromancalendar.o \
-	qcryptographichash.o qdatetime.o qhash.o qlist.o \
+        qcryptographichash.o qdatetime.o qhash.o \
 	qlocale.o qlocale_tools.o qmap.o qregexp.o qringbuffer.o \
 	qstringbuilder.o qstring.o qstringlist.o qversionnumber.o \
 	qvsnprintf.o qxmlstream.o qxmlutils.o \
@@ -127,7 +127,6 @@ DEPEND_SRC = \
 	   $(SOURCE_PATH)/src/corelib/tools/qbitarray.cpp \
 	   $(SOURCE_PATH)/src/corelib/tools/qcryptographichash.cpp \
 	   $(SOURCE_PATH)/src/corelib/tools/qhash.cpp \
-	   $(SOURCE_PATH)/src/corelib/tools/qlist.cpp \
 	   $(SOURCE_PATH)/src/corelib/tools/qmap.cpp \
 	   $(SOURCE_PATH)/src/corelib/tools/qringbuffer.cpp \
 	   $(SOURCE_PATH)/src/corelib/tools/qversionnumber.cpp \
@@ -374,9 +373,6 @@ qversionnumber.o: $(SOURCE_PATH)/src/corelib/tools/qversionnumber.cpp
 qbuffer.o: $(SOURCE_PATH)/src/corelib/io/qbuffer.cpp
 	$(CXX) -c -o $@ $(CXXFLAGS) $<
 
-qlist.o: $(SOURCE_PATH)/src/corelib/tools/qlist.cpp
-	$(CXX) -c -o $@ $(CXXFLAGS) $<
-
 qfile.o: $(SOURCE_PATH)/src/corelib/io/qfile.cpp
 	$(CXX) -c -o $@ $(CXXFLAGS) $<
 
diff --git a/qmake/Makefile.win32 b/qmake/Makefile.win32
index 6c8d5ec922..20644595d2 100644
--- a/qmake/Makefile.win32
+++ b/qmake/Makefile.win32
@@ -28,7 +28,7 @@ CFLAGS_PCH        = -Yuqmake_pch.h -FIqmake_pch.h -Fpqmake_pch.pch
 PCH_OBJECT        = qmake_pch.obj
 
 CFLAGS_BARE = -c -Fo./ -Fdqmake.pdb \
-              -W2 -nologo -O2 \
+              -W2 -nologo -O2 -std:c++17 -Zc:__cplusplus \
               $(CFLAGS_EXTRA) \
               -I$(QMKSRC) -I$(QMKSRC)\library -I$(QMKSRC)\generators -I$(QMKSRC)\generators\unix -I$(QMKSRC)\generators\win32 -I$(QMKSRC)\generators\mac \
               -I$(SOURCE_PATH)/src/3rdparty/tinycbor/src \
@@ -91,7 +91,6 @@ QTOBJS= \
 	qiodevice.obj \
 	qringbuffer.obj \
 	qdebug.obj \
-	qlist.obj \
 	qlocale.obj \
 	qlocale_tools.obj \
 	qlocale_win.obj \
diff --git a/qmake/generators/makefiledeps.cpp b/qmake/generators/makefiledeps.cpp
index d68539814e..0ff64c4fbc 100644
--- a/qmake/generators/makefiledeps.cpp
+++ b/qmake/generators/makefiledeps.cpp
@@ -60,19 +60,14 @@ QT_BEGIN_NAMESPACE
 inline bool qmake_endOfLine(const char &c) { return (c == '\r' || c == '\n'); }
 #endif
 
-QMakeLocalFileName::QMakeLocalFileName(const QString &name) : is_null(name.isNull())
+QMakeLocalFileName::QMakeLocalFileName(const QString &name)
+    : real_name(name)
 {
-    if(!name.isEmpty()) {
-        if(name.at(0) == QLatin1Char('"') && name.at(name.length()-2) == QLatin1Char('"'))
-            real_name = name.mid(1, name.length()-2);
-        else
-            real_name = name;
-    }
 }
 const QString
 &QMakeLocalFileName::local() const
 {
-    if(!is_null && local_name.isNull())
+    if (!isNull() && local_name.isNull())
         local_name = Option::normalizePath(real_name);
     return local_name;
 }
@@ -251,7 +246,7 @@ bool QMakeSourceFileInfo::mocable(const QString &file)
     return false;
 }
 
-QMakeSourceFileInfo::QMakeSourceFileInfo(const QString &cf)
+QMakeSourceFileInfo::QMakeSourceFileInfo()
 {
     //dep_mode
     dep_mode = Recursive;
diff --git a/qmake/generators/makefiledeps.h b/qmake/generators/makefiledeps.h
index 66b87bf470..b97ace42a6 100644
--- a/qmake/generators/makefiledeps.h
+++ b/qmake/generators/makefiledeps.h
@@ -41,14 +41,14 @@ struct SourceFile;
 struct SourceDependChildren;
 class SourceFiles;
 
-class QMakeLocalFileName {
-    bool is_null;
+class QMakeLocalFileName
+{
     QString real_name;
     mutable QString local_name;
 public:
-    QMakeLocalFileName() : is_null(true) {}
+    QMakeLocalFileName() = default;
     QMakeLocalFileName(const QString &);
-    bool isNull() const { return is_null; }
+    bool isNull() const { return real_name.isNull(); }
     inline const QString &real() const { return real_name; }
     const QString &local() const;
 
@@ -86,7 +86,7 @@ protected:
 
 public:
 
-    QMakeSourceFileInfo(const QString &cachefile="");
+    QMakeSourceFileInfo();
     virtual ~QMakeSourceFileInfo();
 
     QVector<QMakeLocalFileName> dependencyPaths() const { return depdirs; }
diff --git a/qmake/library/proitems.h b/qmake/library/proitems.h
index 4569d7c3ff..01370959c7 100644
--- a/qmake/library/proitems.h
+++ b/qmake/library/proitems.h
@@ -35,6 +35,7 @@
 #include <qstring.h>
 #include <qvector.h>
 #include <qhash.h>
+#include <qmap.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -316,7 +317,7 @@ Q_DECLARE_TYPEINFO(ProStringList, Q_MOVABLE_TYPE);
 inline ProStringList operator+(const ProStringList &one, const ProStringList &two)
     { ProStringList ret = one; ret += two; return ret; }
 
-typedef QHash<ProKey, ProStringList> ProValueMap;
+typedef QMap<ProKey, ProStringList> ProValueMap;
 
 // These token definitions affect both ProFileEvaluator and ProWriter
 enum ProToken {
diff --git a/qmake/main.cpp b/qmake/main.cpp
index 86f91031df..c0e6088d80 100644
--- a/qmake/main.cpp
+++ b/qmake/main.cpp
@@ -265,6 +265,8 @@ static bool copyFileTimes(QFile &targetFile, const QString &sourceFilePath,
                 return false;
         }
     }
+#else
+    Q_UNUSED(mustEnsureWritability);
 #endif
     if (!IoUtils::touchFile(targetFile.fileName(), sourceFilePath, errorString))
         return false;
diff --git a/qmake/property.cpp b/qmake/property.cpp
index 432ff55664..31d6cdc9d6 100644
--- a/qmake/property.cpp
+++ b/qmake/property.cpp
@@ -54,7 +54,6 @@ static const struct {
     { "QT_INSTALL_BINS", QLibraryInfo::BinariesPath, false, false },
     { "QT_INSTALL_TESTS", QLibraryInfo::TestsPath, false, false },
     { "QT_INSTALL_PLUGINS", QLibraryInfo::PluginsPath, false, false },
-    { "QT_INSTALL_IMPORTS", QLibraryInfo::ImportsPath, false, false },
     { "QT_INSTALL_QML", QLibraryInfo::Qml2ImportsPath, false, false },
     { "QT_INSTALL_TRANSLATIONS", QLibraryInfo::TranslationsPath, false, false },
     { "QT_INSTALL_CONFIGURATION", QLibraryInfo::SettingsPath, false, false },
diff --git a/src/3rdparty/CMakeLists.txt b/src/3rdparty/CMakeLists.txt
new file mode 100644
index 0000000000..f9a6e7c68b
--- /dev/null
+++ b/src/3rdparty/CMakeLists.txt
@@ -0,0 +1,24 @@
+# special case skip regeneration
+# The file is maintained manually
+add_subdirectory(harfbuzz)
+add_subdirectory(double-conversion)
+
+if(QT_FEATURE_png AND NOT QT_FEATURE_system_png)
+    add_subdirectory(libpng)
+endif()
+
+if(QT_FEATURE_freetype AND NOT QT_FEATURE_system_freetype)
+    add_subdirectory(freetype)
+endif()
+
+if(QT_FEATURE_harfbuzz AND NOT QT_FEATURE_system_harfbuzz)
+    add_subdirectory(harfbuzz-ng)
+endif()
+
+if(QT_FEATURE_regularexpression AND NOT QT_FEATURE_system_pcre2)
+    add_subdirectory(pcre2)
+endif()
+
+if (ANDROID)
+    add_subdirectory(gradle)
+endif()
diff --git a/src/3rdparty/double-conversion/CMakeLists.txt b/src/3rdparty/double-conversion/CMakeLists.txt
new file mode 100644
index 0000000000..7450bc48ec
--- /dev/null
+++ b/src/3rdparty/double-conversion/CMakeLists.txt
@@ -0,0 +1,21 @@
+# special case begin
+
+add_library(QtDoubleConversion STATIC
+    ${CMAKE_CURRENT_SOURCE_DIR}/bignum.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/bignum-dtoa.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/cached-powers.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/diy-fp.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/double-conversion.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/fast-dtoa.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/fixed-dtoa.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/strtod.cc
+    )
+
+target_include_directories(QtDoubleConversion PUBLIC
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/..>
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include/double-conversion>
+    )
+
+qt_install_3rdparty_library(QtDoubleConversion)
+# special case end
diff --git a/src/3rdparty/freetype/CMakeLists.txt b/src/3rdparty/freetype/CMakeLists.txt
new file mode 100644
index 0000000000..622b488c34
--- /dev/null
+++ b/src/3rdparty/freetype/CMakeLists.txt
@@ -0,0 +1,101 @@
+# Generated from freetype.pro.
+
+#####################################################################
+## BundledFreetype Generic Library:
+#####################################################################
+
+qt_add_3rdparty_library(BundledFreetype
+    STATIC
+    INSTALL
+    SOURCES
+        src/autofit/afdummy.c
+        src/autofit/afhints.c
+        src/autofit/aflatin.c
+        src/autofit/autofit.c
+        src/base/ftbase.c
+        src/base/ftbbox.c
+        src/base/ftbitmap.c
+        src/base/ftdebug.c
+        src/base/ftfntfmt.c
+        src/base/ftglyph.c
+        src/base/ftinit.c
+        src/base/ftlcdfil.c
+        src/base/ftmm.c
+        src/base/ftsynth.c
+        src/base/fttype1.c
+        src/bdf/bdf.c
+        src/cache/ftcache.c
+        src/cff/cff.c
+        src/cid/type1cid.c
+        src/gzip/ftgzip.c
+        src/lzw/ftlzw.c
+        src/otvalid/otvalid.c
+        src/otvalid/otvbase.c
+        src/otvalid/otvcommn.c
+        src/otvalid/otvgdef.c
+        src/otvalid/otvgpos.c
+        src/otvalid/otvgsub.c
+        src/otvalid/otvjstf.c
+        src/otvalid/otvmod.c
+        src/pcf/pcf.c
+        src/pfr/pfr.c
+        src/psaux/psaux.c
+        src/pshinter/pshinter.c
+        src/psnames/psmodule.c
+        src/raster/raster.c
+        src/sfnt/sfnt.c
+        src/smooth/smooth.c
+        src/truetype/truetype.c
+        src/type1/type1.c
+        src/type42/type42.c
+        src/winfonts/winfnt.c
+    DEFINES
+        FT2_BUILD_LIBRARY
+        FT_CONFIG_OPTION_SYSTEM_ZLIB
+        TT_CONFIG_OPTION_SUBPIXEL_HINTING
+    PUBLIC_INCLUDE_DIRECTORIES
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
+)
+qt_disable_warnings(BundledFreetype)
+qt_set_symbol_visibility_hidden(BundledFreetype)
+
+#### Keys ignored in scope 1:.:.:freetype.pro:<TRUE>:
+# OTHER_FILES = "$$PWD/src/autofit/afangles.c" "$$PWD/src/autofit/afglobal.c" "$$PWD/src/autofit/afloader.c" "$$PWD/src/autofit/afmodule.c"
+# QT_FOR_CONFIG = "gui-private"
+
+## Scopes:
+#####################################################################
+
+qt_extend_target(BundledFreetype CONDITION WIN32
+    SOURCES
+        src/base/ftsystem.c
+)
+
+qt_extend_target(BundledFreetype CONDITION UNIX
+    SOURCES
+        builds/unix/ftsystem.c
+    INCLUDE_DIRECTORIES
+        builds/unix
+)
+
+qt_extend_target(BundledFreetype CONDITION QT_FEATURE_png
+    DEFINES
+        FT_CONFIG_OPTION_USE_PNG
+    LIBRARIES
+        WrapPNG::WrapPNG
+)
+
+qt_extend_target(BundledFreetype CONDITION QT_FEATURE_system_zlib
+    LIBRARIES
+        ZLIB::ZLIB
+)
+
+qt_extend_target(BundledFreetype CONDITION NOT QT_FEATURE_system_zlib
+    INCLUDE_DIRECTORIES
+        ../zlib/src
+)
+
+qt_extend_target(BundledFreetype CONDITION NOT QT_FEATURE_system_zlib AND NOT no_core_dep
+    LIBRARIES
+        Qt::Core
+)
diff --git a/src/3rdparty/freetype/freetype.pro b/src/3rdparty/freetype/freetype.pro
index 4034815158..0665de521b 100644
--- a/src/3rdparty/freetype/freetype.pro
+++ b/src/3rdparty/freetype/freetype.pro
@@ -11,13 +11,9 @@ MODULE_INCLUDEPATH += $$PWD/include
 load(qt_helper_lib)
 
 SOURCES += \
-    $$PWD/src/autofit/afangles.c \
     $$PWD/src/autofit/afdummy.c \
-    $$PWD/src/autofit/afglobal.c \
     $$PWD/src/autofit/afhints.c \
     $$PWD/src/autofit/aflatin.c \
-    $$PWD/src/autofit/afloader.c \
-    $$PWD/src/autofit/afmodule.c \
     $$PWD/src/autofit/autofit.c \
     $$PWD/src/base/ftbase.c \
     $$PWD/src/base/ftbitmap.c \
@@ -57,6 +53,14 @@ SOURCES += \
     $$PWD/src/type42/type42.c \
     $$PWD/src/winfonts/winfnt.c
 
+# These source files are included by one of the sources above
+# which means they should not be compiled as separate object files.
+OTHER_FILES += \
+    $$PWD/src/autofit/afangles.c \
+    $$PWD/src/autofit/afglobal.c \
+    $$PWD/src/autofit/afloader.c \
+    $$PWD/src/autofit/afmodule.c
+
 win32 {
     SOURCES += $$PWD/src/base/ftsystem.c
 } else {
diff --git a/src/3rdparty/gradle/CMakeLists.txt b/src/3rdparty/gradle/CMakeLists.txt
new file mode 100644
index 0000000000..d4eaa60838
--- /dev/null
+++ b/src/3rdparty/gradle/CMakeLists.txt
@@ -0,0 +1,21 @@
+# special case begin
+# special case skip regeneration
+
+install(
+    FILES
+        gradlew
+        gradlew.bat
+    DESTINATION
+        src/3rdparty/gradle
+    COMPONENT
+        Devel)
+
+install(
+    DIRECTORY
+        gradle
+    DESTINATION
+        src/3rdparty/gradle
+    COMPONENT
+        Devel)
+
+# special case end
diff --git a/src/3rdparty/harfbuzz-ng/.prev_CMakeLists.txt b/src/3rdparty/harfbuzz-ng/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..23e3689fe0
--- /dev/null
+++ b/src/3rdparty/harfbuzz-ng/.prev_CMakeLists.txt
@@ -0,0 +1,179 @@
+# Generated from harfbuzz-ng.pro.
+
+#####################################################################
+## BundledHarfbuzz Generic Library:
+#####################################################################
+
+qt_add_3rdparty_library(BundledHarfbuzz
+    STATIC
+    SOURCES
+        src/hb.h
+        src/hb-atomic-private.hh
+        src/hb-blob.cc src/hb-blob.h
+        src/hb-buffer.cc src/hb-buffer.h
+        src/hb-buffer-deserialize-json.hh
+        src/hb-buffer-deserialize-text.hh
+        src/hb-buffer-private.hh
+        src/hb-buffer-serialize.cc
+        src/hb-cache-private.hh
+        src/hb-common.cc src/hb-common.h
+        src/hb-debug.hh
+        src/hb-deprecated.h
+        src/hb-dsalgs.hh
+        src/hb-face.cc src/hb-face.h
+        src/hb-face-private.hh
+        src/hb-font.cc src/hb-font.h
+        src/hb-font-private.hh
+        src/hb-mutex-private.hh
+        src/hb-object-private.hh
+        src/hb-open-file-private.hh
+        src/hb-open-type-private.hh
+        src/hb-ot-cbdt-table.hh
+        src/hb-ot-cmap-table.hh
+        src/hb-ot-glyf-table.hh
+        src/hb-ot-head-table.hh
+        src/hb-ot-hhea-table.hh
+        src/hb-ot-hmtx-table.hh
+        src/hb-ot-maxp-table.hh
+        src/hb-ot-name-table.hh
+        src/hb-ot-os2-table.hh
+        src/hb-ot-post-table.hh
+        src/hb-ot-tag.cc
+        src/hb-private.hh
+        src/hb-set.cc src/hb-set.h
+        src/hb-set-digest-private.hh
+        src/hb-set-private.hh
+        src/hb-shape.cc src/hb-shape.h
+        src/hb-shape-plan.cc src/hb-shape-plan.h
+        src/hb-shape-plan-private.hh
+        src/hb-shaper.cc
+        src/hb-shaper-impl-private.hh
+        src/hb-shaper-list.hh
+        src/hb-shaper-private.hh
+        src/hb-string-array.hh
+        src/hb-unicode.cc src/hb-unicode.h
+        src/hb-unicode-private.hh
+        src/hb-utf-private.hh
+        src/hb-version.h
+        src/hb-warning.cc
+    DEFINES
+        HAVE_ATEXIT
+        HAVE_CONFIG_H
+        HB_DISABLE_DEPRECATED
+        HB_EXTERN=
+        HB_NDEBUG
+        HB_NO_UNICODE_FUNCS
+        QT_NO_VERSION_TAGGING
+    INCLUDE_DIRECTORIES
+        .core.includes
+    PUBLIC_INCLUDE_DIRECTORIES
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
+)
+qt_disable_warnings(BundledHarfbuzz)
+qt_set_symbol_visibility_hidden(BundledHarfbuzz)
+
+#### Keys ignored in scope 1:.:.:harfbuzz-ng.pro:<TRUE>:
+# SHAPERS = "opentype"
+
+## Scopes:
+#####################################################################
+
+qt_extend_target(BundledHarfbuzz CONDITION APPLE
+    SOURCES
+        src/hb-coretext.cc src/hb-coretext.h
+    DEFINES
+        HAVE_CORETEXT
+)
+
+#### Keys ignored in scope 2:.:.:harfbuzz-ng.pro:APPLE:
+# SHAPERS = "coretext"
+
+qt_extend_target(BundledHarfbuzz CONDITION UNIX
+    DEFINES
+        HAVE_PTHREAD
+        HAVE_SCHED_H
+        HAVE_SCHED_YIELD
+)
+
+qt_extend_target(BundledHarfbuzz CONDITION WIN32
+    DEFINES
+        HB_NO_WIN1256
+)
+
+qt_extend_target(BundledHarfbuzz CONDITION ANDROID
+    DEFINES
+        _POSIX_C_SOURCE=200112L
+)
+
+qt_extend_target(BundledHarfbuzz CONDITION SHAPERS___contains___opentype
+    SOURCES
+        src/hb-ot.h
+        src/hb-ot-font.cc src/hb-ot-font.h
+        src/hb-ot-kern-table.hh
+        src/hb-ot-layout.cc src/hb-ot-layout.h
+        src/hb-ot-layout-common-private.hh
+        src/hb-ot-layout-gdef-table.hh
+        src/hb-ot-layout-gpos-table.hh
+        src/hb-ot-layout-gsub-table.hh
+        src/hb-ot-layout-gsubgpos-private.hh
+        src/hb-ot-layout-jstf-table.hh
+        src/hb-ot-layout-math-table.hh
+        src/hb-ot-layout-private.hh
+        src/hb-ot-map.cc
+        src/hb-ot-map-private.hh
+        src/hb-ot-math.cc src/hb-ot-math.h
+        src/hb-ot-math-table.hh
+        src/hb-ot-post-macroman.hh
+        src/hb-ot-shape.cc src/hb-ot-shape.h
+        src/hb-ot-shape-complex-arabic.cc
+        src/hb-ot-shape-complex-arabic-fallback.hh
+        src/hb-ot-shape-complex-arabic-private.hh
+        src/hb-ot-shape-complex-arabic-table.hh
+        src/hb-ot-shape-complex-default.cc
+        src/hb-ot-shape-complex-hangul.cc
+        src/hb-ot-shape-complex-hebrew.cc
+        src/hb-ot-shape-complex-indic.cc
+        src/hb-ot-shape-complex-indic-machine.hh
+        src/hb-ot-shape-complex-indic-private.hh
+        src/hb-ot-shape-complex-indic-table.cc
+        src/hb-ot-shape-complex-myanmar.cc
+        src/hb-ot-shape-complex-myanmar-machine.hh
+        src/hb-ot-shape-complex-private.hh
+        src/hb-ot-shape-complex-thai.cc
+        src/hb-ot-shape-complex-tibetan.cc
+        src/hb-ot-shape-complex-use.cc
+        src/hb-ot-shape-complex-use-machine.hh
+        src/hb-ot-shape-complex-use-private.hh
+        src/hb-ot-shape-complex-use-table.cc
+        src/hb-ot-shape-fallback.cc
+        src/hb-ot-shape-fallback-private.hh
+        src/hb-ot-shape-normalize.cc
+        src/hb-ot-shape-normalize-private.hh
+        src/hb-ot-shape-private.hh
+        src/hb-ot-tag.h
+        src/hb-ot-var.cc src/hb-ot-var.h
+        src/hb-ot-var-avar-table.hh
+        src/hb-ot-var-fvar-table.hh
+        src/hb-ot-var-hvar-table.hh
+        src/hb-ot-var-mvar-table.hh
+    DEFINES
+        HAVE_OT
+)
+
+qt_extend_target(BundledHarfbuzz CONDITION APPLE_UIKIT
+    LIBRARIES
+        ${FWCoreGraphics}
+        ${FWCoreText}
+)
+
+qt_extend_target(BundledHarfbuzz CONDITION APPLE AND NOT APPLE_UIKIT
+    LIBRARIES
+        ${FWApplicationServices}
+)
+
+qt_extend_target(BundledHarfbuzz CONDITION SHAPERS_ISEMPTY OR SHAPERS___contains___fallback
+    SOURCES
+        src/hb-fallback-shape.cc
+    DEFINES
+        HAVE_FALLBACK
+)
diff --git a/src/3rdparty/harfbuzz-ng/CMakeLists.txt b/src/3rdparty/harfbuzz-ng/CMakeLists.txt
new file mode 100644
index 0000000000..21ea01144a
--- /dev/null
+++ b/src/3rdparty/harfbuzz-ng/CMakeLists.txt
@@ -0,0 +1,180 @@
+# Generated from harfbuzz-ng.pro.
+
+#####################################################################
+## BundledHarfbuzz Generic Library:
+#####################################################################
+
+qt_add_3rdparty_library(BundledHarfbuzz
+    STATIC
+    SOURCES
+        src/hb.h
+        src/hb-atomic-private.hh
+        src/hb-blob.cc src/hb-blob.h
+        src/hb-buffer.cc src/hb-buffer.h
+        src/hb-buffer-deserialize-json.hh
+        src/hb-buffer-deserialize-text.hh
+        src/hb-buffer-private.hh
+        src/hb-buffer-serialize.cc
+        src/hb-cache-private.hh
+        src/hb-common.cc src/hb-common.h
+        src/hb-debug.hh
+        src/hb-deprecated.h
+        src/hb-dsalgs.hh
+        src/hb-face.cc src/hb-face.h
+        src/hb-face-private.hh
+        src/hb-font.cc src/hb-font.h
+        src/hb-font-private.hh
+        src/hb-mutex-private.hh
+        src/hb-object-private.hh
+        src/hb-open-file-private.hh
+        src/hb-open-type-private.hh
+        src/hb-ot-cbdt-table.hh
+        src/hb-ot-cmap-table.hh
+        src/hb-ot-glyf-table.hh
+        src/hb-ot-head-table.hh
+        src/hb-ot-hhea-table.hh
+        src/hb-ot-hmtx-table.hh
+        src/hb-ot-maxp-table.hh
+        src/hb-ot-name-table.hh
+        src/hb-ot-os2-table.hh
+        src/hb-ot-post-table.hh
+        src/hb-ot-tag.cc
+        src/hb-private.hh
+        src/hb-set.cc src/hb-set.h
+        src/hb-set-digest-private.hh
+        src/hb-set-private.hh
+        src/hb-shape.cc src/hb-shape.h
+        src/hb-shape-plan.cc src/hb-shape-plan.h
+        src/hb-shape-plan-private.hh
+        src/hb-shaper.cc
+        src/hb-shaper-impl-private.hh
+        src/hb-shaper-list.hh
+        src/hb-shaper-private.hh
+        src/hb-string-array.hh
+        src/hb-unicode.cc src/hb-unicode.h
+        src/hb-unicode-private.hh
+        src/hb-utf-private.hh
+        src/hb-version.h
+        src/hb-warning.cc
+    DEFINES
+        HAVE_ATEXIT
+        HAVE_CONFIG_H
+        HB_DISABLE_DEPRECATED
+        HB_EXTERN=
+        HB_NDEBUG
+        HB_NO_UNICODE_FUNCS
+        QT_NO_VERSION_TAGGING
+    INCLUDE_DIRECTORIES
+        $<TARGET_PROPERTY:Core,INCLUDE_DIRECTORIES> # special case
+        "${CMAKE_CURRENT_SOURCE_DIR}" # special case
+    PUBLIC_INCLUDE_DIRECTORIES
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
+)
+qt_disable_warnings(BundledHarfbuzz)
+qt_set_symbol_visibility_hidden(BundledHarfbuzz)
+
+#### Keys ignored in scope 1:.:.:harfbuzz-ng.pro:<TRUE>:
+# SHAPERS = "opentype"
+
+## Scopes:
+#####################################################################
+
+qt_extend_target(BundledHarfbuzz CONDITION APPLE
+    SOURCES
+        src/hb-coretext.cc src/hb-coretext.h
+    DEFINES
+        HAVE_CORETEXT
+)
+
+#### Keys ignored in scope 2:.:.:harfbuzz-ng.pro:APPLE:
+# SHAPERS = "coretext"
+
+qt_extend_target(BundledHarfbuzz CONDITION UNIX
+    DEFINES
+        HAVE_PTHREAD
+        HAVE_SCHED_H
+        HAVE_SCHED_YIELD
+)
+
+qt_extend_target(BundledHarfbuzz CONDITION WIN32
+    DEFINES
+        HB_NO_WIN1256
+)
+
+qt_extend_target(BundledHarfbuzz CONDITION ANDROID
+    DEFINES
+        _POSIX_C_SOURCE=200112L
+)
+
+qt_extend_target(BundledHarfbuzz CONDITION TRUE # special case
+    SOURCES
+        src/hb-ot.h
+        src/hb-ot-font.cc src/hb-ot-font.h
+        src/hb-ot-kern-table.hh
+        src/hb-ot-layout.cc src/hb-ot-layout.h
+        src/hb-ot-layout-common-private.hh
+        src/hb-ot-layout-gdef-table.hh
+        src/hb-ot-layout-gpos-table.hh
+        src/hb-ot-layout-gsub-table.hh
+        src/hb-ot-layout-gsubgpos-private.hh
+        src/hb-ot-layout-jstf-table.hh
+        src/hb-ot-layout-math-table.hh
+        src/hb-ot-layout-private.hh
+        src/hb-ot-map.cc
+        src/hb-ot-map-private.hh
+        src/hb-ot-math.cc src/hb-ot-math.h
+        src/hb-ot-math-table.hh
+        src/hb-ot-post-macroman.hh
+        src/hb-ot-shape.cc src/hb-ot-shape.h
+        src/hb-ot-shape-complex-arabic.cc
+        src/hb-ot-shape-complex-arabic-fallback.hh
+        src/hb-ot-shape-complex-arabic-private.hh
+        src/hb-ot-shape-complex-arabic-table.hh
+        src/hb-ot-shape-complex-default.cc
+        src/hb-ot-shape-complex-hangul.cc
+        src/hb-ot-shape-complex-hebrew.cc
+        src/hb-ot-shape-complex-indic.cc
+        src/hb-ot-shape-complex-indic-machine.hh
+        src/hb-ot-shape-complex-indic-private.hh
+        src/hb-ot-shape-complex-indic-table.cc
+        src/hb-ot-shape-complex-myanmar.cc
+        src/hb-ot-shape-complex-myanmar-machine.hh
+        src/hb-ot-shape-complex-private.hh
+        src/hb-ot-shape-complex-thai.cc
+        src/hb-ot-shape-complex-tibetan.cc
+        src/hb-ot-shape-complex-use.cc
+        src/hb-ot-shape-complex-use-machine.hh
+        src/hb-ot-shape-complex-use-private.hh
+        src/hb-ot-shape-complex-use-table.cc
+        src/hb-ot-shape-fallback.cc
+        src/hb-ot-shape-fallback-private.hh
+        src/hb-ot-shape-normalize.cc
+        src/hb-ot-shape-normalize-private.hh
+        src/hb-ot-shape-private.hh
+        src/hb-ot-tag.h
+        src/hb-ot-var.cc src/hb-ot-var.h
+        src/hb-ot-var-avar-table.hh
+        src/hb-ot-var-fvar-table.hh
+        src/hb-ot-var-hvar-table.hh
+        src/hb-ot-var-mvar-table.hh
+    DEFINES
+        HAVE_OT
+)
+
+qt_extend_target(BundledHarfbuzz CONDITION APPLE_UIKIT
+    LIBRARIES
+        ${FWCoreGraphics}
+        ${FWCoreText}
+)
+
+qt_extend_target(BundledHarfbuzz CONDITION APPLE AND NOT APPLE_UIKIT
+    LIBRARIES
+        ${FWApplicationServices}
+)
+
+qt_extend_target(BundledHarfbuzz CONDITION SHAPERS_ISEMPTY OR SHAPERS___contains___fallback
+    SOURCES
+        src/hb-fallback-shape.cc
+    DEFINES
+        HAVE_FALLBACK
+)
diff --git a/src/3rdparty/harfbuzz-ng/harfbuzz-ng.pro b/src/3rdparty/harfbuzz-ng/harfbuzz-ng.pro
index ad40b98753..54060e20ff 100644
--- a/src/3rdparty/harfbuzz-ng/harfbuzz-ng.pro
+++ b/src/3rdparty/harfbuzz-ng/harfbuzz-ng.pro
@@ -164,7 +164,7 @@ contains(SHAPERS, opentype) {
         $$PWD/src/hb-ot-var.h
 }
 
-contains(SHAPERS, coretext) {
+darwin {
     DEFINES += HAVE_CORETEXT
 
     SOURCES += \
@@ -173,13 +173,14 @@ contains(SHAPERS, coretext) {
     HEADERS += \
         $$PWD/src/hb-coretext.h
 
-    uikit: \
+    uikit {
         # On iOS/tvOS/watchOS CoreText and CoreGraphics are stand-alone frameworks
         LIBS_PRIVATE += -framework CoreText -framework CoreGraphics
-    else: \
+    } else {
         # On Mac OS they are part of the ApplicationServices umbrella framework,
         # even in 10.8 where they were also made available stand-alone.
         LIBS_PRIVATE += -framework ApplicationServices
+    }
 
     CONFIG += watchos_coretext
 }
diff --git a/src/3rdparty/harfbuzz/CMakeLists.txt b/src/3rdparty/harfbuzz/CMakeLists.txt
new file mode 100644
index 0000000000..3eaddbb2db
--- /dev/null
+++ b/src/3rdparty/harfbuzz/CMakeLists.txt
@@ -0,0 +1,14 @@
+add_library(QtHarfBuzz STATIC
+    src/harfbuzz-shaper-all.cpp
+    src/harfbuzz-buffer.c
+    src/harfbuzz-gdef.c
+    src/harfbuzz-gsub.c
+    src/harfbuzz-gpos.c
+    src/harfbuzz-impl.c
+    src/harfbuzz-open.c
+    src/harfbuzz-stream.c
+    )
+target_include_directories(QtHarfBuzz PUBLIC
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src>)
+
+qt_install_3rdparty_library(QtHarfBuzz)
diff --git a/src/3rdparty/libpng/CMakeLists.txt b/src/3rdparty/libpng/CMakeLists.txt
new file mode 100644
index 0000000000..d1c5cea164
--- /dev/null
+++ b/src/3rdparty/libpng/CMakeLists.txt
@@ -0,0 +1,54 @@
+# Generated from libpng.pro.
+
+#####################################################################
+## BundledLibpng Generic Library:
+#####################################################################
+
+qt_add_3rdparty_library(BundledLibpng
+    STATIC
+    INSTALL
+    SOURCES
+        png.c
+        pngerror.c
+        pngget.c
+        pngmem.c
+        pngpread.c
+        pngread.c
+        pngrio.c
+        pngrtran.c
+        pngrutil.c
+        pngset.c
+        pngtrans.c
+        pngwio.c
+        pngwrite.c
+        pngwtran.c
+        pngwutil.c
+    DEFINES
+        PNG_ARM_NEON_OPT=0
+        PNG_POWERPC_VSX_OPT=0
+    PUBLIC_INCLUDE_DIRECTORIES
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+)
+qt_disable_warnings(BundledLibpng)
+qt_set_symbol_visibility_hidden(BundledLibpng)
+
+#### Keys ignored in scope 1:.:.:libpng.pro:<TRUE>:
+# TR_EXCLUDE = "$$PWD/*"
+
+## Scopes:
+#####################################################################
+
+qt_extend_target(BundledLibpng CONDITION QT_FEATURE_system_zlib
+    LIBRARIES
+        ZLIB::ZLIB
+)
+
+qt_extend_target(BundledLibpng CONDITION NOT QT_FEATURE_system_zlib
+    INCLUDE_DIRECTORIES
+        ../zlib/src
+)
+
+qt_extend_target(BundledLibpng CONDITION NOT QT_FEATURE_system_zlib AND NOT no_core_dep
+    LIBRARIES
+        Qt::Core
+)
diff --git a/src/3rdparty/pcre2/CMakeLists.txt b/src/3rdparty/pcre2/CMakeLists.txt
new file mode 100644
index 0000000000..76cddc83bc
--- /dev/null
+++ b/src/3rdparty/pcre2/CMakeLists.txt
@@ -0,0 +1,72 @@
+# Generated from pcre2.pro.
+
+#####################################################################
+## BundledPcre2 Generic Library:
+#####################################################################
+
+qt_add_3rdparty_library(BundledPcre2
+    STATIC
+    SOURCES
+        src/config.h
+        src/pcre2.h
+        src/pcre2_auto_possess.c
+        src/pcre2_chartables.c
+        src/pcre2_compile.c
+        src/pcre2_config.c
+        src/pcre2_context.c
+        src/pcre2_dfa_match.c
+        src/pcre2_error.c
+        src/pcre2_extuni.c
+        src/pcre2_find_bracket.c
+        src/pcre2_internal.h
+        src/pcre2_intmodedep.h
+        src/pcre2_jit_compile.c
+        src/pcre2_maketables.c
+        src/pcre2_match.c
+        src/pcre2_match_data.c
+        src/pcre2_newline.c
+        src/pcre2_ord2utf.c
+        src/pcre2_pattern_info.c
+        src/pcre2_script_run.c
+        src/pcre2_serialize.c
+        src/pcre2_string_utils.c
+        src/pcre2_study.c
+        src/pcre2_substitute.c
+        src/pcre2_substring.c
+        src/pcre2_tables.c
+        src/pcre2_ucd.c
+        src/pcre2_ucp.h
+        src/pcre2_valid_utf.c
+        src/pcre2_xclass.c
+    DEFINES
+        HAVE_CONFIG_H
+    PUBLIC_DEFINES
+        PCRE2_CODE_UNIT_WIDTH=16
+    PUBLIC_INCLUDE_DIRECTORIES
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src>
+)
+qt_disable_warnings(BundledPcre2)
+qt_set_symbol_visibility_hidden(BundledPcre2)
+
+## Scopes:
+#####################################################################
+
+qt_extend_target(BundledPcre2 CONDITION WIN32
+    PUBLIC_DEFINES
+        PCRE2_STATIC
+)
+
+qt_extend_target(BundledPcre2 CONDITION APPLE_UIKIT OR QNX OR WINRT
+    DEFINES
+        PCRE2_DISABLE_JIT
+)
+
+qt_extend_target(BundledPcre2 CONDITION (TEST_architecture_arch STREQUAL "arm") AND WIN32
+    DEFINES
+        PCRE2_DISABLE_JIT
+)
+
+qt_extend_target(BundledPcre2 CONDITION (TEST_architecture_arch STREQUAL "arm64") AND WIN32
+    DEFINES
+        PCRE2_DISABLE_JIT
+)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
new file mode 100644
index 0000000000..00c2f05b29
--- /dev/null
+++ b/src/CMakeLists.txt
@@ -0,0 +1,81 @@
+# special case skip regeneration
+
+# Temporary fix for OpenSSL feature detection until we can provide a
+# proper implementation of additional compile tests for library dependencies
+# in configure.json
+
+find_package(OpenSSL)
+if (NOT OPENSSL_FOUND OR NOT OPENSSL_VERSION VERSION_GREATER_EQUAL "1.1.0")
+    set(QT_FEATURE_openssl_runtime OFF CACHE BOOL "" FORCE)
+    set(QT_FEATURE_openssl_linked OFF CACHE BOOL "" FORCE)
+    set(QT_FEATURE_openssl OFF CACHE BOOL "" FORCE)
+endif()
+
+# We need to include the features of a few modules before they are actually declared.
+# The feature values are used as conditions for deciding whether bundled 3rd party libraries
+# should be built.
+# The order of evaluation matters.
+qt_feature_evaluate_features("${CMAKE_CURRENT_SOURCE_DIR}/corelib/configure.cmake")
+qt_feature_evaluate_features("${CMAKE_CURRENT_SOURCE_DIR}/network/configure.cmake")
+qt_feature_evaluate_features("${CMAKE_CURRENT_SOURCE_DIR}/gui/configure.cmake")
+
+add_subdirectory(3rdparty)
+
+function(find_or_build_bootstrap_names)
+    if (QT_WILL_BUILD_TOOLS)
+        add_subdirectory(tools/bootstrap)  # bootstrap library
+    endif()
+    add_subdirectory(tools/moc)
+    add_subdirectory(tools/rcc)
+    add_subdirectory(tools/tracegen)
+    add_subdirectory(tools/cmake_automoc_parser)
+endfunction()
+
+find_or_build_bootstrap_names()
+
+add_subdirectory(corelib)
+if (QT_FEATURE_concurrent)
+    add_subdirectory(concurrent)
+endif()
+if (QT_FEATURE_sql)
+    add_subdirectory(sql)
+endif()
+if (QT_FEATURE_network)
+    add_subdirectory(network)
+endif()
+if (QT_FEATURE_xml)
+    add_subdirectory(xml)
+endif()
+add_subdirectory(tools)
+
+if (QT_FEATURE_dbus)
+    add_subdirectory(dbus)
+endif()
+if(QT_FEATURE_gui)
+    add_subdirectory(gui)
+
+    if(QT_FEATURE_opengl)
+        add_subdirectory(opengl)
+        add_subdirectory(openglextensions)
+    endif()
+
+    if(QT_FEATURE_widgets)
+        add_subdirectory(widgets)
+        if(QT_FEATURE_opengl)
+            add_subdirectory(openglwidgets)
+        endif()
+    endif()
+    add_subdirectory(platformsupport)
+    add_subdirectory(platformheaders)
+endif()
+if (QT_FEATURE_testlib)
+    add_subdirectory(testlib)
+endif()
+if(QT_FEATURE_gui AND QT_FEATURE_widgets)
+   add_subdirectory(printsupport)
+endif()
+add_subdirectory(plugins)
+
+add_subdirectory(winmain)
+
+add_subdirectory(android)
diff --git a/src/android/CMakeLists.txt b/src/android/CMakeLists.txt
new file mode 100644
index 0000000000..a821cee44b
--- /dev/null
+++ b/src/android/CMakeLists.txt
@@ -0,0 +1,14 @@
+# Generated from android.pro.
+
+# special case skip regeneration
+# special case begin
+# Only build jars during Android build and install the templates for the
+# androiddeployqt tool.
+# android
+if (ANDROID)
+    add_subdirectory(jar)
+    add_subdirectory(java)
+    add_subdirectory(templates)
+endif()
+# special case end
+
diff --git a/src/android/jar/.prev_CMakeLists.txt b/src/android/jar/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..f4c807c33a
--- /dev/null
+++ b/src/android/jar/.prev_CMakeLists.txt
@@ -0,0 +1,30 @@
+# Generated from jar.pro.
+
+set(java_sources
+    src/org/qtproject/qt5/android//accessibility/QtAccessibilityDelegate.java
+    src/org/qtproject/qt5/android//accessibility/QtNativeAccessibility.java
+    src/org/qtproject/qt5/android//CursorHandle.java
+    src/org/qtproject/qt5/android//EditContextView.java
+    src/org/qtproject/qt5/android//EditPopupMenu.java
+    src/org/qtproject/qt5/android//ExtractStyle.java
+    src/org/qtproject/qt5/android//QtActivityDelegate.java
+    src/org/qtproject/qt5/android//QtEditText.java
+    src/org/qtproject/qt5/android//QtInputConnection.java
+    src/org/qtproject/qt5/android//QtLayout.java
+    src/org/qtproject/qt5/android//QtMessageDialogHelper.java
+    src/org/qtproject/qt5/android//QtNative.java
+    src/org/qtproject/qt5/android//QtNativeLibrariesDir.java
+    src/org/qtproject/qt5/android//QtSurface.java
+    src/org/qtproject/qt5/android//QtThread.java
+)
+
+add_jar(QtAndroid
+    INCLUDE_JARS ${QT_ANDROID_JAR}
+    SOURCES ${java_sources}
+)
+
+install_jar(QtAndroid
+    DESTINATION jar
+    COMPONENT Devel
+)
+
diff --git a/src/android/jar/CMakeLists.txt b/src/android/jar/CMakeLists.txt
new file mode 100644
index 0000000000..61af168a67
--- /dev/null
+++ b/src/android/jar/CMakeLists.txt
@@ -0,0 +1,31 @@
+# Generated from jar.pro.
+
+set(java_sources
+    src/org/qtproject/qt5/android/accessibility/QtAccessibilityDelegate.java
+    src/org/qtproject/qt5/android/accessibility/QtNativeAccessibility.java
+    src/org/qtproject/qt5/android/CursorHandle.java
+    src/org/qtproject/qt5/android/EditContextView.java
+    src/org/qtproject/qt5/android/EditPopupMenu.java
+    src/org/qtproject/qt5/android/ExtractStyle.java
+    src/org/qtproject/qt5/android/QtActivityDelegate.java
+    src/org/qtproject/qt5/android/QtEditText.java
+    src/org/qtproject/qt5/android/QtInputConnection.java
+    src/org/qtproject/qt5/android/QtLayout.java
+    src/org/qtproject/qt5/android/QtMessageDialogHelper.java
+    src/org/qtproject/qt5/android/QtNative.java
+    src/org/qtproject/qt5/android/QtNativeLibrariesDir.java
+    src/org/qtproject/qt5/android/QtSurface.java
+    src/org/qtproject/qt5/android/QtThread.java
+    src/org/qtproject/qt5/android/QtServiceDelegate.java # special case
+)
+
+add_jar(QtAndroid
+    INCLUDE_JARS ${QT_ANDROID_JAR}
+    SOURCES ${java_sources}
+)
+
+install_jar(QtAndroid
+    DESTINATION jar
+    COMPONENT Devel
+)
+
diff --git a/src/android/java/CMakeLists.txt b/src/android/java/CMakeLists.txt
new file mode 100644
index 0000000000..1c24bd5e82
--- /dev/null
+++ b/src/android/java/CMakeLists.txt
@@ -0,0 +1,12 @@
+# Android Java Resource files
+
+# special case skip regeneration
+# special case begin
+set(resource_directories
+    res
+    src)
+
+qt_install(DIRECTORY ${resource_directories}
+    DESTINATION src/android/java
+    COMPONENT Devel)
+# special case end
diff --git a/src/android/templates/CMakeLists.txt b/src/android/templates/CMakeLists.txt
new file mode 100644
index 0000000000..8e007b7215
--- /dev/null
+++ b/src/android/templates/CMakeLists.txt
@@ -0,0 +1,19 @@
+# Android template files
+
+# special case skip regeneration
+# special case begin
+set(template_files
+    AndroidManifest.xml
+    build.gradle)
+
+set(template_directories
+    res)
+
+qt_install(FILES ${template_files}
+    DESTINATION src/android/templates
+    COMPONENT Devel)
+
+qt_install(DIRECTORY ${template_directories}
+    DESTINATION src/android/templates
+    COMPONENT Devel)
+# special case end
diff --git a/src/concurrent/CMakeLists.txt b/src/concurrent/CMakeLists.txt
new file mode 100644
index 0000000000..f46261f3b2
--- /dev/null
+++ b/src/concurrent/CMakeLists.txt
@@ -0,0 +1,48 @@
+# Generated from concurrent.pro.
+
+#####################################################################
+## Concurrent Module:
+#####################################################################
+
+qt_add_module(Concurrent
+    EXCEPTIONS
+    SOURCES
+        qtconcurrent_global.h
+        qtconcurrentcompilertest.h
+        qtconcurrentexception.h
+        qtconcurrentfilter.cpp qtconcurrentfilter.h
+        qtconcurrentfilterkernel.h
+        qtconcurrentfunctionwrappers.h
+        qtconcurrentiteratekernel.cpp qtconcurrentiteratekernel.h
+        qtconcurrentmap.cpp qtconcurrentmap.h
+        qtconcurrentmapkernel.h
+        qtconcurrentmedian.h
+        qtconcurrentreducekernel.h
+        qtconcurrentrun.cpp qtconcurrentrun.h
+        qtconcurrentrunbase.h
+        qtconcurrentstoredfunctioncall.h
+        qtconcurrentthreadengine.cpp qtconcurrentthreadengine.h
+    DEFINES
+        QT_NO_FOREACH
+        QT_NO_USING_NAMESPACE
+    LIBRARIES
+        Qt::CorePrivate
+    PUBLIC_LIBRARIES
+        Qt::Core
+    PRIVATE_MODULE_INTERFACE
+        Qt::CorePrivate
+    PRECOMPILED_HEADER
+        "../corelib/global/qt_pch.h"
+)
+
+## Scopes:
+#####################################################################
+
+qt_extend_target(Concurrent CONDITION MSVC AND (TEST_architecture_arch STREQUAL "i386")
+    LINK_OPTIONS
+        "/BASE:0x66000000"
+)
+qt_add_docs(Concurrent
+    doc/qtconcurrent.qdocconf
+)
+
diff --git a/src/concurrent/doc/src/qtconcurrent-index.qdoc b/src/concurrent/doc/src/qtconcurrent-index.qdoc
index 3e4aa791f1..eb5cd334dd 100644
--- a/src/concurrent/doc/src/qtconcurrent-index.qdoc
+++ b/src/concurrent/doc/src/qtconcurrent-index.qdoc
@@ -115,7 +115,7 @@
         \li Supported
     \row
         \li Bidirectional Iterator
-        \li QLinkedList, std::list
+        \li std::list
         \li Supported
     \row
         \li Random Access Iterator
diff --git a/src/corelib/.prev_CMakeLists.txt b/src/corelib/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..51885497bf
--- /dev/null
+++ b/src/corelib/.prev_CMakeLists.txt
@@ -0,0 +1,1107 @@
+# Generated from corelib.pro.
+
+#####################################################################
+## Core Module:
+#####################################################################
+
+qt_add_module(Core
+    GENERATE_METATYPES
+    QMAKE_MODULE_CONFIG moc resources
+    EXCEPTIONS
+    SOURCES
+        ../3rdparty/harfbuzz/src/harfbuzz.h
+        ../3rdparty/harfbuzz/src/harfbuzz-buffer.c
+        ../3rdparty/harfbuzz/src/harfbuzz-gdef.c
+        ../3rdparty/harfbuzz/src/harfbuzz-gpos.c
+        ../3rdparty/harfbuzz/src/harfbuzz-gsub.c
+        ../3rdparty/harfbuzz/src/harfbuzz-impl.c
+        ../3rdparty/harfbuzz/src/harfbuzz-open.c
+        ../3rdparty/harfbuzz/src/harfbuzz-shaper-all.cpp
+        ../3rdparty/harfbuzz/src/harfbuzz-stream.c
+        codecs/qtextcodec_p.h
+        codecs/qutfcodec.cpp codecs/qutfcodec_p.h
+        global/archdetect.cpp
+        global/qcompilerdetection.h
+        global/qendian.cpp global/qendian.h global/qendian_p.h
+        global/qflags.h
+        global/qfloat16.cpp global/qfloat16.h
+        global/qglobal.cpp global/qglobal.h
+        global/qglobalstatic.h
+        global/qhooks.cpp global/qhooks_p.h
+        global/qisenum.h
+        global/qlibraryinfo.cpp global/qlibraryinfo.h
+        global/qlogging.cpp global/qlogging.h
+        global/qmalloc.cpp
+        global/qmemory_p.h
+        global/qnamespace.h
+        global/qnumeric.cpp global/qnumeric.h global/qnumeric_p.h
+        global/qoperatingsystemversion.cpp global/qoperatingsystemversion.h global/qoperatingsystemversion_p.h
+        global/qprocessordetection.h
+        global/qrandom.cpp global/qrandom.h global/qrandom_p.h
+        global/qsysinfo.h
+        global/qsystemdetection.h
+        global/qtypeinfo.h
+        global/qtypetraits.h
+        global/qversiontagging.h
+        io/qabstractfileengine.cpp io/qabstractfileengine_p.h
+        io/qbuffer.cpp io/qbuffer.h
+        io/qdataurl.cpp io/qdataurl_p.h
+        io/qdebug.cpp io/qdebug.h io/qdebug_p.h
+        io/qdir.cpp io/qdir.h io/qdir_p.h
+        io/qdiriterator.cpp io/qdiriterator.h
+        io/qfile.cpp io/qfile.h
+        io/qfiledevice.cpp io/qfiledevice.h io/qfiledevice_p.h
+        io/qfileinfo.cpp io/qfileinfo.h io/qfileinfo_p.h
+        io/qfileselector.cpp io/qfileselector.h io/qfileselector_p.h
+        io/qfilesystemengine.cpp io/qfilesystemengine_p.h
+        io/qfilesystementry.cpp io/qfilesystementry_p.h
+        io/qfilesystemiterator_p.h
+        io/qfilesystemmetadata_p.h
+        io/qfsfileengine.cpp io/qfsfileengine_p.h
+        io/qfsfileengine_iterator.cpp io/qfsfileengine_iterator_p.h
+        io/qiodevice.cpp io/qiodevice.h io/qiodevice_p.h
+        io/qipaddress.cpp io/qipaddress_p.h
+        io/qlockfile.cpp io/qlockfile.h io/qlockfile_p.h
+        io/qloggingcategory.cpp io/qloggingcategory.h
+        io/qloggingregistry.cpp io/qloggingregistry_p.h
+        io/qnoncontiguousbytedevice.cpp io/qnoncontiguousbytedevice_p.h
+        io/qresource.cpp io/qresource_p.h
+        io/qresource_iterator.cpp io/qresource_iterator_p.h
+        io/qsavefile.cpp io/qsavefile.h
+        io/qstandardpaths.cpp io/qstandardpaths.h
+        io/qstorageinfo.cpp io/qstorageinfo.h io/qstorageinfo_p.h
+        io/qtemporarydir.cpp io/qtemporarydir.h
+        io/qtemporaryfile.cpp io/qtemporaryfile.h io/qtemporaryfile_p.h
+        io/qurl.cpp io/qurl.h io/qurl_p.h
+        io/qurlidna.cpp
+        io/qurlquery.cpp io/qurlquery.h
+        io/qurlrecode.cpp
+        itemmodels/qabstractitemmodel.cpp itemmodels/qabstractitemmodel.h itemmodels/qabstractitemmodel_p.h
+        itemmodels/qitemselectionmodel.cpp itemmodels/qitemselectionmodel.h itemmodels/qitemselectionmodel_p.h
+        kernel/qabstracteventdispatcher.cpp kernel/qabstracteventdispatcher.h kernel/qabstracteventdispatcher_p.h
+        kernel/qabstractnativeeventfilter.cpp kernel/qabstractnativeeventfilter.h
+        kernel/qbasictimer.cpp kernel/qbasictimer.h
+        kernel/qcoreapplication.cpp kernel/qcoreapplication.h kernel/qcoreapplication_p.h
+        kernel/qcorecmdlineargs_p.h
+        kernel/qcoreevent.cpp kernel/qcoreevent.h
+        kernel/qcoreglobaldata.cpp kernel/qcoreglobaldata_p.h
+        kernel/qdeadlinetimer.cpp kernel/qdeadlinetimer.h kernel/qdeadlinetimer_p.h
+        kernel/qelapsedtimer.cpp kernel/qelapsedtimer.h
+        kernel/qeventloop.cpp kernel/qeventloop.h
+        kernel/qfunctions_p.h
+        kernel/qmath.cpp kernel/qmath.h
+        kernel/qmetaobject.cpp kernel/qmetaobject.h kernel/qmetaobject_p.h
+        kernel/qmetaobject_moc_p.h
+        kernel/qmetaobjectbuilder.cpp kernel/qmetaobjectbuilder_p.h
+        kernel/qmetatype.cpp kernel/qmetatype.h kernel/qmetatype_p.h
+        kernel/qmetatypeswitcher_p.h
+        kernel/qmimedata.cpp kernel/qmimedata.h
+        kernel/qobject.cpp kernel/qobject.h kernel/qobject_p.h
+        kernel/qobject_impl.h
+        kernel/qobjectcleanuphandler.cpp kernel/qobjectcleanuphandler.h
+        kernel/qobjectdefs.h
+        kernel/qobjectdefs_impl.h
+        kernel/qpointer.cpp kernel/qpointer.h
+        kernel/qsharedmemory.cpp kernel/qsharedmemory.h kernel/qsharedmemory_p.h
+        kernel/qsignalmapper.cpp kernel/qsignalmapper.h
+        kernel/qsocketnotifier.cpp kernel/qsocketnotifier.h
+        kernel/qsystemerror.cpp kernel/qsystemerror_p.h
+        kernel/qsystemsemaphore.cpp kernel/qsystemsemaphore.h kernel/qsystemsemaphore_p.h
+        kernel/qtestsupport_core.cpp kernel/qtestsupport_core.h
+        kernel/qtimer.cpp kernel/qtimer.h
+        kernel/qtranslator.cpp kernel/qtranslator.h kernel/qtranslator_p.h
+        kernel/qvariant.cpp kernel/qvariant.h kernel/qvariant_p.h
+        plugin/qfactoryinterface.cpp plugin/qfactoryinterface.h
+        plugin/qfactoryloader.cpp plugin/qfactoryloader_p.h
+        plugin/qplugin.h plugin/qplugin_p.h
+        plugin/qpluginloader.cpp plugin/qpluginloader.h
+        plugin/quuid.cpp plugin/quuid.h
+        serialization/qcborarray.h
+        serialization/qcborcommon.cpp serialization/qcborcommon.h serialization/qcborcommon_p.h
+        serialization/qcbordiagnostic.cpp
+        serialization/qcbormap.h
+        serialization/qcborstream.h
+        serialization/qcborvalue.cpp serialization/qcborvalue.h serialization/qcborvalue_p.h
+        serialization/qdatastream.cpp serialization/qdatastream.h serialization/qdatastream_p.h
+        serialization/qjson_p.h
+        serialization/qjsonarray.cpp serialization/qjsonarray.h
+        serialization/qjsoncbor.cpp
+        serialization/qjsondocument.cpp serialization/qjsondocument.h
+        serialization/qjsonobject.cpp serialization/qjsonobject.h
+        serialization/qjsonparser.cpp serialization/qjsonparser_p.h
+        serialization/qjsonvalue.cpp serialization/qjsonvalue.h
+        serialization/qjsonwriter.cpp serialization/qjsonwriter_p.h
+        serialization/qtextstream.cpp serialization/qtextstream.h serialization/qtextstream_p.h
+        serialization/qxmlstream.cpp serialization/qxmlstream.h serialization/qxmlstream_p.h
+        serialization/qxmlutils.cpp serialization/qxmlutils_p.h
+        statemachine/qabstractstate.cpp statemachine/qabstractstate.h statemachine/qabstractstate_p.h
+        statemachine/qabstracttransition.cpp statemachine/qabstracttransition.h statemachine/qabstracttransition_p.h
+        statemachine/qfinalstate.cpp statemachine/qfinalstate.h statemachine/qfinalstate_p.h
+        statemachine/qhistorystate.cpp statemachine/qhistorystate.h statemachine/qhistorystate_p.h
+        statemachine/qsignaleventgenerator_p.h
+        statemachine/qsignaltransition.cpp statemachine/qsignaltransition.h statemachine/qsignaltransition_p.h
+        statemachine/qstate.cpp statemachine/qstate.h statemachine/qstate_p.h
+        statemachine/qstatemachine.cpp statemachine/qstatemachine.h statemachine/qstatemachine_p.h
+        text/qbytearray.cpp text/qbytearray.h text/qbytearray_p.h
+        text/qbytearraylist.cpp text/qbytearraylist.h
+        text/qbytearraymatcher.cpp text/qbytearraymatcher.h
+        text/qbytedata_p.h
+        text/qchar.h
+        text/qcollator.cpp text/qcollator.h text/qcollator_p.h
+        text/qdoublescanprint_p.h
+        text/qharfbuzz.cpp text/qharfbuzz_p.h
+        text/qlocale.cpp text/qlocale.h text/qlocale_p.h
+        text/qlocale_data_p.h
+        text/qlocale_tools.cpp text/qlocale_tools_p.h
+        text/qregexp.cpp text/qregexp.h
+        text/qstring.cpp text/qstring.h
+        text/qstring_compat.cpp
+        text/qstringalgorithms.h text/qstringalgorithms_p.h
+        text/qstringbuilder.cpp text/qstringbuilder.h
+        text/qstringiterator_p.h
+        text/qstringlist.cpp text/qstringlist.h
+        text/qstringliteral.h
+        text/qstringmatcher.h
+        text/qstringview.cpp text/qstringview.h
+        text/qtextboundaryfinder.cpp text/qtextboundaryfinder.h
+        text/qunicodetables_p.h
+        text/qunicodetools.cpp text/qunicodetools_p.h
+        text/qvsnprintf.cpp
+        thread/qmutex.h
+        thread/qreadwritelock.h
+        thread/qrunnable.cpp thread/qrunnable.h
+        thread/qthread.cpp thread/qthread.h
+        thread/qthreadstorage.h
+        thread/qwaitcondition.h thread/qwaitcondition_p.h
+        time/qcalendar.cpp time/qcalendar.h
+        time/qcalendarbackend_p.h
+        time/qcalendarmath_p.h
+        time/qdatetime.cpp time/qdatetime.h time/qdatetime_p.h
+        time/qgregoriancalendar.cpp time/qgregoriancalendar_p.h
+        time/qjuliancalendar.cpp time/qjuliancalendar_p.h
+        time/qmilankoviccalendar.cpp time/qmilankoviccalendar_p.h
+        time/qromancalendar.cpp time/qromancalendar_p.h
+        time/qromancalendar_data_p.h
+        tools/qalgorithms.h
+        tools/qarraydata.cpp tools/qarraydata.h
+        tools/qarraydataops.h
+        tools/qarraydatapointer.h
+        tools/qbitarray.cpp tools/qbitarray.h
+        tools/qcache.h
+        tools/qcontainerfwd.h
+        tools/qcontainertools_impl.h
+        tools/qcontiguouscache.cpp tools/qcontiguouscache.h
+        tools/qcryptographichash.cpp tools/qcryptographichash.h
+        tools/qduplicatetracker_p.h
+        tools/qflatmap_p.h
+        tools/qfreelist.cpp tools/qfreelist_p.h
+        tools/qhash.cpp tools/qhash.h
+        tools/qhashfunctions.h
+        tools/qiterator.h
+        tools/qline.cpp tools/qline.h
+        tools/qlist.cpp tools/qlist.h
+        tools/qmakearray_p.h
+        tools/qmap.cpp tools/qmap.h
+        tools/qmargins.cpp tools/qmargins.h
+        tools/qmessageauthenticationcode.cpp tools/qmessageauthenticationcode.h
+        tools/qoffsetstringarray_p.h
+        tools/qpair.h
+        tools/qpoint.cpp tools/qpoint.h
+        tools/qqueue.h
+        tools/qrect.cpp tools/qrect.h
+        tools/qrefcount.cpp tools/qrefcount.h
+        tools/qringbuffer.cpp tools/qringbuffer_p.h
+        tools/qscopedpointer.h tools/qscopedpointer_p.h
+        tools/qscopedvaluerollback.h
+        tools/qscopeguard.h
+        tools/qset.h
+        tools/qshareddata.cpp tools/qshareddata.h
+        tools/qsharedpointer.cpp tools/qsharedpointer.h
+        tools/qsharedpointer_impl.h
+        tools/qsimd.cpp tools/qsimd_p.h
+        tools/qsize.cpp tools/qsize.h
+        tools/qstack.h
+        tools/qtools_p.h
+        tools/qvarlengtharray.h
+        tools/qvector.h
+        tools/qversionnumber.cpp tools/qversionnumber.h
+    DEFINES
+        QT_NO_FOREACH
+        QT_NO_USING_NAMESPACE
+    INCLUDE_DIRECTORIES
+        ${PROJECT_BINARY_DIR}/src/corelib/global
+        ../3rdparty/harfbuzz/src
+        ../3rdparty/md4
+        ../3rdparty/md5
+        ../3rdparty/sha3
+        ../3rdparty/tinycbor/src
+    LIBRARIES
+        doubleconversion
+    PRECOMPILED_HEADER
+        "global/qt_pch.h"
+    NO_PCH_SOURCES
+        "text/qstring_compat.cpp"
+)
+
+
+qt_add_simd_part(Core SIMD mips_dsp
+    SOURCES
+        ../gui/painting/qt_mips_asm_dsp_p.h
+        text/qstring_mips_dsp_asm.S
+)
+
+if(QT_FEATURE_reduce_relocations AND UNIX AND GCC)
+    target_link_options(Core PRIVATE
+                        "LINKER:--dynamic-list=${CMAKE_CURRENT_LIST_DIR}/QtCore.dynlist")
+endif()
+
+if(ANDROID)
+    set_property(TARGET Core APPEND PROPERTY QT_ANDROID_BUNDLED_JAR_DEPENDENCIES
+        jar/QtAndroid.jar
+    )
+    set_property(TARGET Core APPEND PROPERTY QT_ANDROID_LIB_DEPENDENCIES
+        plugins/platforms/libplugins_platforms_qtforandroid.so
+    )
+    set_property(TARGET Core APPEND PROPERTY QT_ANDROID_PERMISSIONS
+        android.permission.INTERNET android.permission.WRITE_EXTERNAL_STORAGE
+    )
+endif()
+
+#### Keys ignored in scope 1:.:.:corelib.pro:<TRUE>:
+# CMAKE_DISABLED_FEATURES = "$$join(QT_DISABLED_FEATURES, "$$escape_expand(\\n)    ")"
+# CMAKE_HOST_DATA_DIR = "$$cmakeRelativePath($$[QT_HOST_DATA/src], $$[QT_INSTALL_PREFIX])"
+# CMAKE_INSTALL_DATA_DIR = "$$cmakeRelativePath($$[QT_HOST_DATA], $$[QT_INSTALL_PREFIX])"
+# HOST_BINS = "$$[QT_HOST_BINS]"
+# INSTALLS = "ctest_qt5_module_files" "cmake_qt5_umbrella_module_files"
+# MODULE = "core"
+# MODULE_CONFIG = "moc" "resources"
+# QMAKE_DSYM_DEBUG_SCRIPT = "$$PWD/debug_script.py"
+# QMAKE_PKGCONFIG_VARIABLES = "host_bins" "qt_conf"
+# QMAKE_SUBSTITUTES = "ctest_macros_file" "cmake_umbrella_config_file" "cmake_umbrella_config_module_location" "cmake_umbrella_config_module_location_for_install" "cmake_umbrella_config_version_file" "cmake_extras_mkspec_dir" "cmake_extras_mkspec_dir_for_install"
+# cmake_extras_mkspec_dir.input = "$$PWD/Qt5CoreConfigExtrasMkspecDir.cmake.in"
+# cmake_extras_mkspec_dir.output = "$$DESTDIR/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake"
+# cmake_extras_mkspec_dir_for_install.input = "$$PWD/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in"
+# cmake_extras_mkspec_dir_for_install.output = "$$DESTDIR/cmake/install/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake"
+# cmake_qt5_umbrella_module_files.files = "$$cmake_umbrella_config_file.output" "$$cmake_umbrella_config_version_file.output" "$$cmake_umbrella_config_module_location_for_install.output"
+# cmake_qt5_umbrella_module_files.path = "$$[QT_INSTALL_LIBS]/cmake/Qt5"
+# cmake_umbrella_config_file.input = "$$PWD/Qt5Config.cmake.in"
+# cmake_umbrella_config_file.output = "$$DESTDIR/cmake/Qt5/Qt5Config.cmake"
+# cmake_umbrella_config_module_location.input = "$$PWD/Qt5ModuleLocation.cmake.in"
+# cmake_umbrella_config_module_location.output = "$$DESTDIR/cmake/Qt5/Qt5ModuleLocation.cmake"
+# cmake_umbrella_config_module_location_for_install.input = "$$PWD/Qt5ModuleLocationForInstall.cmake.in"
+# cmake_umbrella_config_module_location_for_install.output = "$$DESTDIR/cmake/install/Qt5/Qt5ModuleLocation.cmake"
+# cmake_umbrella_config_version_file.input = "$$PWD/../../mkspecs/features/data/cmake/Qt5ConfigVersion.cmake.in"
+# cmake_umbrella_config_version_file.output = "$$DESTDIR/cmake/Qt5/Qt5ConfigVersion.cmake"
+# ctest_macros_file.CONFIG = "verbatim"
+# ctest_macros_file.input = "$$PWD/Qt5CTestMacros.cmake"
+# ctest_macros_file.output = "$$DESTDIR/cmake/Qt5Core/Qt5CTestMacros.cmake"
+# ctest_qt5_module_files.files = "$$ctest_macros_file.output" "$$cmake_extras_mkspec_dir_for_install.output"
+# ctest_qt5_module_files.path = "$$[QT_INSTALL_LIBS]/cmake/Qt5Core"
+# host_bins.name = "host_bins"
+# host_bins.variable = "HOST_BINS"
+# qt_conf.name = "qt_config"
+# qt_conf.variable = "QT_CONFIG"
+
+## Scopes:
+#####################################################################
+
+#### Keys ignored in scope 2:.:.:corelib.pro:QT_FEATURE_gc_binaries:
+# MODULE_CONFIG = "gc_binaries"
+
+qt_extend_target(Core CONDITION NOT QT_NAMESPACE_ISEMPTY
+    PUBLIC_DEFINES
+        QT_NAMESPACE=
+)
+
+qt_extend_target(Core CONDITION ANDROID
+    SOURCES
+        kernel/qsharedmemory_android.cpp
+        kernel/qsystemsemaphore_android.cpp
+    DEFINES
+        LIBS_SUFFIX='\\"_${CMAKE_SYSTEM_PROCESSOR}.so\\"'
+)
+
+qt_extend_target(Core CONDITION MSVC AND (TEST_architecture_arch STREQUAL "i386")
+    LINK_OPTIONS
+        "/BASE:0x67000000"
+)
+
+#### Keys ignored in scope 6:.:.:corelib.pro:FREEBSD OR OPENBSD:
+# QMAKE_LFLAGS_NOUNDEF = <EMPTY>
+
+qt_extend_target(Core CONDITION QT_FEATURE_animation
+    SOURCES
+        animation/qabstractanimation.cpp animation/qabstractanimation.h animation/qabstractanimation_p.h
+        animation/qanimationgroup.cpp animation/qanimationgroup.h animation/qanimationgroup_p.h
+        animation/qparallelanimationgroup.cpp animation/qparallelanimationgroup.h animation/qparallelanimationgroup_p.h
+        animation/qpauseanimation.cpp animation/qpauseanimation.h
+        animation/qpropertyanimation.cpp animation/qpropertyanimation.h animation/qpropertyanimation_p.h
+        animation/qsequentialanimationgroup.cpp animation/qsequentialanimationgroup.h animation/qsequentialanimationgroup_p.h
+        animation/qvariantanimation.cpp animation/qvariantanimation.h animation/qvariantanimation_p.h
+)
+
+qt_extend_target(Core CONDITION WIN32
+    SOURCES
+        global/qoperatingsystemversion_win.cpp global/qoperatingsystemversion_win_p.h
+        io/qfilesystemengine_win.cpp
+        io/qfsfileengine_win.cpp
+        io/qlockfile_win.cpp
+        kernel/qcoreapplication_win.cpp
+        kernel/qelapsedtimer_win.cpp
+        kernel/qsharedmemory_win.cpp
+        kernel/qsystemsemaphore_win.cpp
+        kernel/qwineventnotifier.cpp kernel/qwineventnotifier.h kernel/qwineventnotifier_p.h
+        plugin/qsystemlibrary.cpp plugin/qsystemlibrary_p.h
+        thread/qatomic_msvc.h
+        thread/qthread_win.cpp
+    DEFINES
+        -QT_NO_CAST_TO_ASCII
+    LIBRARIES
+        ws2_32
+)
+
+qt_extend_target(Core CONDITION WIN32 AND NOT WINRT
+    SOURCES
+        io/qstandardpaths_win.cpp
+        io/qstorageinfo_win.cpp
+        io/qwindowspipereader.cpp io/qwindowspipereader_p.h
+        io/qwindowspipewriter.cpp io/qwindowspipewriter_p.h
+        kernel/qeventdispatcher_win.cpp kernel/qeventdispatcher_win_p.h
+        kernel/qwinregistry.cpp kernel/qwinregistry_p.h
+    LIBRARIES
+        advapi32
+        kernel32
+        netapi32
+        ole32
+        shell32
+        user32
+        uuid
+        version
+        winmm
+    PUBLIC_LIBRARIES
+        mpr
+        userenv
+)
+
+qt_extend_target(Core CONDITION APPLE
+    SOURCES
+        global/qoperatingsystemversion_darwin.mm
+        io/qfilesystemengine_mac.mm
+        io/qstandardpaths_mac.mm
+        io/qstorageinfo_mac.cpp
+        kernel/qcfsocketnotifier.cpp kernel/qcfsocketnotifier_p.h
+        kernel/qcore_foundation.mm
+        kernel/qcore_mac.cpp kernel/qcore_mac_p.h
+        kernel/qcore_mac_objc.mm
+        kernel/qcoreapplication_mac.cpp
+        kernel/qeventdispatcher_cf.mm kernel/qeventdispatcher_cf_p.h
+    LIBRARIES
+        ${FWCoreFoundation}
+        ${FWFoundation}
+)
+
+qt_extend_target(Core CONDITION APPLE_OSX
+    LIBRARIES
+        ${FWAppKit}
+        ${FWApplicationServices}
+        ${FWCoreServices}
+        ${FWSecurity}
+    PUBLIC_LIBRARIES
+        ${FWDiskArbitration}
+        ${FWIOKit}
+)
+
+qt_extend_target(Core CONDITION INTEGRITY
+    LIBRARIES
+        ivfs
+        net
+        posix
+        shm_client
+        socket
+    COMPILE_OPTIONS
+        --pending_instantiations=128
+)
+
+#### Keys ignored in scope 15:.:.:corelib.pro:pathIsAbsolute(_ss_CMAKE_HOST_DATA_DIR):
+# CMAKE_HOST_DATA_DIR = "$$[QT_HOST_DATA/src]/"
+# CMAKE_HOST_DATA_DIR_IS_ABSOLUTE = "True"
+
+#### Keys ignored in scope 16:.:.:corelib.pro:pathIsAbsolute(_ss_CMAKE_INSTALL_DATA_DIR):
+# CMAKE_INSTALL_DATA_DIR = "$$[QT_HOST_DATA]/"
+# CMAKE_INSTALL_DATA_DIR_IS_ABSOLUTE = "True"
+
+#### Keys ignored in scope 21:.:global:global/global.pri:QT_CPU_FEATURES__ss_QT_ARCH___contains___f16c:
+# f16c_cxx = "true"
+
+#### Keys ignored in scope 23:.:global:global/global.pri:CLANG OR intel_icl OR ICC:
+# f16c_cxx = "false"
+
+#### Keys ignored in scope 25:.:global:global/global.pri:GCC AND f16c AND x86SimdAlways:
+# f16c_cxx = "true"
+
+#### Keys ignored in scope 27:.:global:global/global.pri:MSVC AND QT_CPU_FEATURES__ss_QT_ARCH___contains___avx:
+# f16c_cxx = "true"
+
+#### Keys ignored in scope 28:.:global:global/global.pri:else:
+# f16c_cxx = "false"
+
+qt_extend_target(Core CONDITION _ss_f16c_cxx
+    DEFINES
+        QFLOAT16_INCLUDE_FAST
+)
+
+if(NOT _ss_f16c_cxx)
+    qt_add_simd_part(Core SIMD f16c
+        SOURCES
+            global/qfloat16_f16c.c
+    )
+endif()
+
+qt_extend_target(Core CONDITION NOT CMAKE_CROSSCOMPILING AND NOT _x_-armcc_x_ AND NOT static AND (hurd_x_ OR linux_x_)
+    DEFINES
+        ELF_INTERPRETER=\\\"=Creadelf-l/bin/ls|perl-n-e\'['quote', ['if', ['/program', 'interpreter:', ['.*'], ']/'], '{', 'print', '$1;', '}']]\'\\\"
+    LINK_OPTIONS
+        "-Wl,-e,qt_core_boilerplate"
+)
+
+qt_extend_target(Core CONDITION LINUX AND NOT static
+    SOURCES
+        global/minimum-linux_p.h
+)
+
+#### Keys ignored in scope 35:.:global:global/global.pri:precompile_header:
+# NO_PCH_ASM = "global/minimum-linux.S"
+# QMAKE_EXTRA_COMPILERS = "no_pch_assembler"
+# no_pch_assembler.commands = "$$QMAKE_CC" "-c" "$(CFLAGS)" "$(INCPATH)" "${QMAKE_FILE_IN}" "-o" "${QMAKE_FILE_OUT}"
+# no_pch_assembler.dependency_type = "TYPE_C"
+# no_pch_assembler.input = "NO_PCH_ASM"
+# no_pch_assembler.name = "compiling[no_pch]" "${QMAKE_FILE_IN}"
+# no_pch_assembler.output = "${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}$${firstQMAKE_EXT_OBJ}"
+
+#### Keys ignored in scope 36:.:global:global/global.pri:silent:
+# no_pch_assembler.commands = "@echo" "compiling[no_pch]" "${QMAKE_FILE_IN}" "&&"
+
+qt_extend_target(Core CONDITION LINUX AND NOT precompile_header AND NOT static
+    SOURCES
+        global/minimum-linux.S
+)
+
+qt_extend_target(Core CONDITION QT_FEATURE_slog2
+    LIBRARIES
+        Slog2::Slog2
+)
+
+qt_extend_target(Core CONDITION QT_FEATURE_journald
+    LIBRARIES
+        PkgConfig::Libsystemd
+)
+
+#### Keys ignored in scope 40:.:global:global/global.pri:GCC AND ltcg:
+# QMAKE_EXTRA_COMPILERS = "versiontagging_compiler"
+# versiontagging_compiler.commands = "$$QMAKE_CXX" "-c" "$(CXXFLAGS)" "$(INCPATH)" "-fno-lto" "-o" "${QMAKE_FILE_OUT}" "${QMAKE_FILE_IN}"
+# versiontagging_compiler.dependency_type = "TYPE_C"
+# versiontagging_compiler.input = "VERSIONTAGGING_SOURCES"
+# versiontagging_compiler.name = "compiling[versiontagging]" "${QMAKE_FILE_IN}"
+# versiontagging_compiler.output = "${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}$${firstQMAKE_EXT_OBJ}"
+# versiontagging_compiler.variable_out = "OBJECTS"
+
+#### Keys ignored in scope 41:.:global:global/global.pri:silent:
+# versiontagging_compiler.commands = "@echo" "compiling[versiontagging]" "${QMAKE_FILE_IN}" "&&"
+
+qt_extend_target(Core CONDITION NOT GCC OR NOT ltcg
+    SOURCES
+        global/qversiontagging.cpp
+)
+
+qt_extend_target(Core CONDITION UNIX
+    SOURCES
+        io/qfilesystemengine_unix.cpp
+        io/qfilesystemiterator_unix.cpp
+        io/qfsfileengine_unix.cpp
+        io/qlockfile_unix.cpp
+        kernel/qcore_unix.cpp kernel/qcore_unix_p.h
+        kernel/qeventdispatcher_unix.cpp kernel/qeventdispatcher_unix_p.h
+        kernel/qpoll_p.h
+        kernel/qtimerinfo_unix.cpp kernel/qtimerinfo_unix_p.h
+        thread/qthread_unix.cpp
+)
+
+qt_extend_target(Core CONDITION QT_FEATURE_thread
+    SOURCES
+        thread/qatomic.cpp thread/qatomic.h
+        thread/qatomic_bootstrap.h
+        thread/qatomic_cxx11.h
+        thread/qbasicatomic.h
+        thread/qfutex_p.h
+        thread/qgenericatomic.h
+        thread/qlocking_p.h
+        thread/qmutex.cpp thread/qmutex_p.h
+        thread/qorderedmutexlocker_p.h
+        thread/qreadwritelock.cpp thread/qreadwritelock_p.h
+        thread/qsemaphore.cpp thread/qsemaphore.h
+        thread/qthread_p.h
+        thread/qthreadpool.cpp thread/qthreadpool.h thread/qthreadpool_p.h
+        thread/qthreadstorage.cpp
+)
+
+qt_extend_target(Core CONDITION QT_FEATURE_thread AND WIN32
+    SOURCES
+        thread/qmutex_win.cpp
+        thread/qwaitcondition_win.cpp
+)
+
+qt_extend_target(Core CONDITION QT_FEATURE_thread AND UNIX
+    SOURCES
+        thread/qwaitcondition_unix.cpp
+)
+
+qt_extend_target(Core CONDITION APPLE AND QT_FEATURE_thread
+    SOURCES
+        thread/qmutex_mac.cpp
+)
+
+qt_extend_target(Core CONDITION LINUX AND QT_FEATURE_thread
+    SOURCES
+        thread/qmutex_linux.cpp
+)
+
+qt_extend_target(Core CONDITION QT_FEATURE_thread AND UNIX AND NOT APPLE AND NOT LINUX
+    SOURCES
+        thread/qmutex_unix.cpp
+)
+
+qt_extend_target(Core CONDITION QT_FEATURE_future
+    SOURCES
+        thread/qexception.cpp thread/qexception.h
+        thread/qfuture.h
+        thread/qfutureinterface.cpp thread/qfutureinterface.h thread/qfutureinterface_p.h
+        thread/qfuturesynchronizer.h
+        thread/qfuturewatcher.cpp thread/qfuturewatcher.h thread/qfuturewatcher_p.h
+        thread/qresultstore.cpp thread/qresultstore.h
+)
+
+qt_extend_target(Core CONDITION QT_FEATURE_std_atomic64
+    PUBLIC_LIBRARIES
+        Atomic
+)
+
+qt_extend_target(Core CONDITION ICC
+    COMPILE_OPTIONS
+        -fp-model
+        strict
+)
+
+qt_extend_target(Core CONDITION MSVC
+    SOURCES
+        tools/qvector_msvc.cpp
+    NO_PCH_SOURCES
+        "tools/qvector_msvc.cpp"
+)
+
+qt_extend_target(Core CONDITION QT_FEATURE_system_zlib
+    LIBRARIES
+        ZLIB::ZLIB
+)
+
+qt_extend_target(Core CONDITION NOT QT_FEATURE_system_zlib
+    SOURCES
+        ../3rdparty/zlib/src/adler32.c
+        ../3rdparty/zlib/src/compress.c
+        ../3rdparty/zlib/src/crc32.c
+        ../3rdparty/zlib/src/deflate.c
+        ../3rdparty/zlib/src/gzclose.c
+        ../3rdparty/zlib/src/gzlib.c
+        ../3rdparty/zlib/src/gzread.c
+        ../3rdparty/zlib/src/gzwrite.c
+        ../3rdparty/zlib/src/infback.c
+        ../3rdparty/zlib/src/inffast.c
+        ../3rdparty/zlib/src/inflate.c
+        ../3rdparty/zlib/src/inftrees.c
+        ../3rdparty/zlib/src/trees.c
+        ../3rdparty/zlib/src/uncompr.c
+        ../3rdparty/zlib/src/zutil.c
+    INCLUDE_DIRECTORIES
+        ../3rdparty/zlib/src
+)
+
+qt_extend_target(Core CONDITION QT_FEATURE_commandlineparser
+    SOURCES
+        tools/qcommandlineoption.cpp tools/qcommandlineoption.h
+        tools/qcommandlineparser.cpp tools/qcommandlineparser.h
+)
+
+qt_extend_target(Core CONDITION QT_FEATURE_easingcurve
+    SOURCES
+        tools/qeasingcurve.cpp tools/qeasingcurve.h
+        tools/qtimeline.cpp tools/qtimeline.h
+)
+
+qt_extend_target(Core CONDITION UNIX AND NOT HAIKU AND NOT INTEGRITY AND NOT VXWORKS AND NOT WASM AND (NOT APPLE_OSX OR NOT ICC)
+    LIBRARIES
+        m
+)
+
+qt_extend_target(Core CONDITION APPLE AND NOT NACL
+    SOURCES
+        kernel/qelapsedtimer_mac.cpp
+        text/qlocale_mac.mm
+)
+
+qt_extend_target(Core CONDITION UNIX AND (NACL OR NOT APPLE)
+    SOURCES
+        text/qlocale_unix.cpp
+)
+
+qt_extend_target(Core CONDITION WIN32 AND (NACL OR NOT APPLE)
+    SOURCES
+        text/qlocale_win.cpp
+)
+
+qt_extend_target(Core CONDITION QT_FEATURE_icu
+    SOURCES
+        text/qcollator_icu.cpp
+        text/qlocale_icu.cpp
+    LIBRARIES
+        ICU::i18n ICU::uc ICU::data
+)
+
+qt_extend_target(Core CONDITION WIN32 AND NOT QT_FEATURE_icu
+    SOURCES
+        text/qcollator_win.cpp
+)
+
+qt_extend_target(Core CONDITION APPLE_OSX AND NOT QT_FEATURE_icu
+    SOURCES
+        text/qcollator_macx.cpp
+)
+
+qt_extend_target(Core CONDITION UNIX AND NOT APPLE_OSX AND NOT QT_FEATURE_icu
+    SOURCES
+        text/qcollator_posix.cpp
+)
+
+qt_extend_target(Core CONDITION QT_FEATURE_regularexpression
+    SOURCES
+        text/qregularexpression.cpp text/qregularexpression.h
+    LIBRARIES
+        WrapPCRE2::WrapPCRE2
+)
+
+qt_extend_target(Core CONDITION QT_FEATURE_hijricalendar
+    SOURCES
+        time/qhijricalendar.cpp time/qhijricalendar_p.h
+        time/qhijricalendar_data_p.h
+)
+
+qt_extend_target(Core CONDITION QT_FEATURE_islamiccivilcalendar
+    SOURCES
+        time/qislamiccivilcalendar.cpp time/qislamiccivilcalendar_p.h
+)
+
+qt_extend_target(Core CONDITION QT_FEATURE_jalalicalendar
+    SOURCES
+        time/qjalalicalendar.cpp time/qjalalicalendar_p.h
+        time/qjalalicalendar_data_p.h
+)
+
+qt_extend_target(Core CONDITION QT_FEATURE_timezone
+    SOURCES
+        time/qtimezone.cpp time/qtimezone.h
+        time/qtimezoneprivate.cpp time/qtimezoneprivate_p.h
+        time/qtimezoneprivate_data_p.h
+)
+
+qt_extend_target(Core CONDITION APPLE AND QT_FEATURE_timezone AND NOT NACL
+    SOURCES
+        time/qtimezoneprivate_mac.mm
+)
+
+qt_extend_target(Core CONDITION ANDROID AND QT_FEATURE_timezone AND NOT ANDROID_EMBEDDED AND (NACL OR NOT APPLE)
+    SOURCES
+        time/qtimezoneprivate_android.cpp
+)
+
+qt_extend_target(Core CONDITION QT_FEATURE_timezone AND UNIX AND (ANDROID_EMBEDDED OR NOT ANDROID) AND (NACL OR NOT APPLE)
+    SOURCES
+        time/qtimezoneprivate_tz.cpp
+)
+
+qt_extend_target(Core CONDITION QT_FEATURE_icu AND QT_FEATURE_timezone AND UNIX AND (ANDROID_EMBEDDED OR NOT ANDROID) AND (NACL OR NOT APPLE)
+    SOURCES
+        time/qtimezoneprivate_icu.cpp
+)
+
+qt_extend_target(Core CONDITION QT_FEATURE_icu AND QT_FEATURE_timezone AND WIN32 AND (ANDROID_EMBEDDED OR NOT ANDROID) AND (NACL OR NOT APPLE)
+    SOURCES
+        time/qtimezoneprivate_icu.cpp
+)
+
+qt_extend_target(Core CONDITION QT_FEATURE_timezone AND WIN32 AND NOT QT_FEATURE_icu AND (ANDROID_EMBEDDED OR NOT ANDROID) AND (NACL OR NOT APPLE)
+    SOURCES
+        time/qtimezoneprivate_win.cpp
+)
+
+qt_extend_target(Core CONDITION QT_FEATURE_datetimeparser
+    SOURCES
+        time/qdatetimeparser.cpp time/qdatetimeparser_p.h
+)
+
+qt_extend_target(Core CONDITION QT_FEATURE_zstd
+    LIBRARIES
+        ZSTD::ZSTD
+)
+
+qt_extend_target(Core CONDITION QT_FEATURE_filesystemwatcher
+    SOURCES
+        io/qfilesystemwatcher.cpp io/qfilesystemwatcher.h io/qfilesystemwatcher_p.h
+        io/qfilesystemwatcher_polling.cpp io/qfilesystemwatcher_polling_p.h
+)
+
+qt_extend_target(Core CONDITION QT_FEATURE_filesystemwatcher AND WIN32
+    SOURCES
+        io/qfilesystemwatcher_win.cpp io/qfilesystemwatcher_win_p.h
+)
+
+qt_extend_target(Core CONDITION APPLE_OSX AND QT_FEATURE_filesystemwatcher
+    SOURCES
+        io/qfilesystemwatcher_fsevents.mm io/qfilesystemwatcher_fsevents_p.h
+)
+
+qt_extend_target(Core CONDITION QT_FEATURE_filesystemwatcher AND QT_FEATURE_inotify AND UNIX AND NOT APPLE_OSX
+    SOURCES
+        io/qfilesystemwatcher_inotify.cpp io/qfilesystemwatcher_inotify_p.h
+)
+
+qt_extend_target(Core CONDITION QT_FEATURE_filesystemwatcher AND UNIX AND NOT APPLE_OSX AND NOT QT_FEATURE_inotify AND (APPLE OR FREEBSD OR NETBSD OR OPENBSD)
+    SOURCES
+        io/qfilesystemwatcher_kqueue.cpp io/qfilesystemwatcher_kqueue_p.h
+)
+
+qt_extend_target(Core CONDITION QT_FEATURE_processenvironment
+    SOURCES
+        io/qprocess.cpp io/qprocess.h io/qprocess_p.h
+)
+
+qt_extend_target(Core CONDITION QT_FEATURE_processenvironment AND WIN32 AND NOT WINRT
+    SOURCES
+        io/qprocess_win.cpp
+)
+
+qt_extend_target(Core CONDITION QT_FEATURE_processenvironment AND UNIX
+    SOURCES
+        io/qprocess_unix.cpp
+)
+
+qt_extend_target(Core CONDITION QT_FEATURE_settings
+    SOURCES
+        io/qsettings.cpp io/qsettings.h io/qsettings_p.h
+)
+
+qt_extend_target(Core CONDITION QT_FEATURE_settings AND WIN32 AND NOT WINRT
+    SOURCES
+        io/qsettings_win.cpp
+)
+
+qt_extend_target(Core CONDITION QT_FEATURE_settings AND WINRT
+    SOURCES
+        io/qsettings_winrt.cpp
+)
+
+qt_extend_target(Core CONDITION APPLE AND QT_FEATURE_settings AND NOT NACL
+    SOURCES
+        io/qsettings_mac.cpp
+)
+
+qt_extend_target(Core CONDITION QT_FEATURE_settings AND WASM
+    SOURCES
+        io/qsettings_wasm.cpp
+)
+
+qt_extend_target(Core CONDITION QT_FEATURE_filesystemiterator AND WIN32
+    SOURCES
+        io/qfilesystemiterator_win.cpp
+)
+
+qt_extend_target(Core CONDITION WINRT
+    SOURCES
+        io/qstandardpaths_winrt.cpp
+        io/qstorageinfo_stub.cpp
+        kernel/qeventdispatcher_winrt.cpp kernel/qeventdispatcher_winrt_p.h
+        kernel/qfunctions_fake_env_p.h
+        kernel/qfunctions_winrt.cpp kernel/qfunctions_winrt.h
+)
+
+qt_extend_target(Core CONDITION QT_FEATURE_process AND UNIX
+    SOURCES
+        ../3rdparty/forkfd/forkfd.h
+        io/forkfd_qt.cpp
+    INCLUDE_DIRECTORIES
+        ../3rdparty/forkfd
+)
+
+qt_extend_target(Core CONDITION APPLE AND QT_FEATURE_processenvironment
+    SOURCES
+        io/qprocess_darwin.mm
+)
+
+qt_extend_target(Core CONDITION APPLE AND NOT APPLE_OSX
+    PUBLIC_LIBRARIES
+        ${FWMobileCoreServices}
+)
+
+qt_extend_target(Core CONDITION ANDROID AND NOT ANDROID_EMBEDDED
+    SOURCES
+        io/qstandardpaths_android.cpp
+        io/qstorageinfo_unix.cpp
+        kernel/qjni.cpp kernel/qjni_p.h
+        kernel/qjnihelpers.cpp kernel/qjnihelpers_p.h
+        kernel/qjnionload.cpp
+)
+
+qt_extend_target(Core CONDITION HAIKU AND (ANDROID_EMBEDDED OR NOT ANDROID)
+    SOURCES
+        io/qstandardpaths_haiku.cpp
+        io/qstorageinfo_unix.cpp
+    PUBLIC_LIBRARIES
+        be
+)
+
+qt_extend_target(Core CONDITION UNIX AND NOT APPLE AND NOT HAIKU AND (ANDROID_EMBEDDED OR NOT ANDROID)
+    SOURCES
+        io/qstandardpaths_unix.cpp
+        io/qstorageinfo_unix.cpp
+)
+
+qt_extend_target(Core CONDITION QT_FEATURE_proxymodel
+    SOURCES
+        itemmodels/qabstractproxymodel.cpp itemmodels/qabstractproxymodel.h itemmodels/qabstractproxymodel_p.h
+)
+
+qt_extend_target(Core CONDITION QT_FEATURE_concatenatetablesproxymodel AND QT_FEATURE_proxymodel
+    SOURCES
+        itemmodels/qconcatenatetablesproxymodel.cpp itemmodels/qconcatenatetablesproxymodel.h
+)
+
+qt_extend_target(Core CONDITION QT_FEATURE_identityproxymodel AND QT_FEATURE_proxymodel
+    SOURCES
+        itemmodels/qidentityproxymodel.cpp itemmodels/qidentityproxymodel.h
+)
+
+qt_extend_target(Core CONDITION QT_FEATURE_proxymodel AND QT_FEATURE_sortfilterproxymodel
+    SOURCES
+        itemmodels/qsortfilterproxymodel.cpp itemmodels/qsortfilterproxymodel.h
+)
+
+qt_extend_target(Core CONDITION QT_FEATURE_proxymodel AND QT_FEATURE_transposeproxymodel
+    SOURCES
+        itemmodels/qtransposeproxymodel.cpp itemmodels/qtransposeproxymodel.h itemmodels/qtransposeproxymodel_p.h
+)
+
+qt_extend_target(Core CONDITION QT_FEATURE_stringlistmodel
+    SOURCES
+        itemmodels/qstringlistmodel.cpp itemmodels/qstringlistmodel.h
+)
+
+qt_extend_target(Core CONDITION QT_FEATURE_library
+    SOURCES
+        plugin/qelfparser_p.cpp plugin/qelfparser_p.h
+        plugin/qlibrary.cpp plugin/qlibrary.h plugin/qlibrary_p.h
+        plugin/qmachparser.cpp plugin/qmachparser_p.h
+)
+
+qt_extend_target(Core CONDITION QT_FEATURE_library AND UNIX
+    SOURCES
+        plugin/qlibrary_unix.cpp
+)
+
+qt_extend_target(Core CONDITION QT_FEATURE_library AND WIN32
+    SOURCES
+        plugin/qlibrary_win.cpp
+)
+
+qt_extend_target(Core CONDITION QT_FEATURE_dlopen AND QT_FEATURE_library
+    LIBRARIES
+        ${CMAKE_DL_LIBS}
+)
+
+qt_extend_target(Core CONDITION APPLE AND (APPLE_IOS OR APPLE_TVOS)
+    LIBRARIES
+        ${FWUIKit}
+)
+
+qt_extend_target(Core CONDITION APPLE_WATCHOS
+    LIBRARIES
+        ${FWWatchKit}
+)
+
+qt_extend_target(Core CONDITION NACL
+    SOURCES
+        kernel/qfunctions_nacl.cpp kernel/qfunctions_nacl.h
+)
+
+qt_extend_target(Core CONDITION INTEGRITY OR (NACL AND UNIX) OR (UNIX AND NOT APPLE)
+    SOURCES
+        kernel/qelapsedtimer_unix.cpp
+)
+
+qt_extend_target(Core CONDITION QT_FEATURE_poll_select AND UNIX
+    SOURCES
+        kernel/qpoll.cpp
+)
+
+qt_extend_target(Core CONDITION QT_FEATURE_glib AND UNIX
+    SOURCES
+        kernel/qeventdispatcher_glib.cpp kernel/qeventdispatcher_glib_p.h
+    LIBRARIES
+        GLIB2::GLIB2
+)
+
+qt_extend_target(Core CONDITION QT_FEATURE_clock_gettime AND UNIX
+    LIBRARIES
+        WrapRt
+)
+
+qt_extend_target(Core CONDITION UNIX AND NOT ANDROID
+    SOURCES
+        kernel/qsharedmemory_posix.cpp
+        kernel/qsharedmemory_systemv.cpp
+        kernel/qsharedmemory_unix.cpp
+        kernel/qsystemsemaphore_posix.cpp
+        kernel/qsystemsemaphore_systemv.cpp
+        kernel/qsystemsemaphore_unix.cpp
+)
+
+qt_extend_target(Core CONDITION VXWORKS
+    SOURCES
+        kernel/qfunctions_vxworks.cpp kernel/qfunctions_vxworks.h
+)
+
+qt_extend_target(Core CONDITION QNX AND QT_FEATURE_qqnx_pps
+    SOURCES
+        kernel/qppsattribute.cpp kernel/qppsattribute_p.h
+        kernel/qppsattributeprivate_p.h
+        kernel/qppsobject.cpp kernel/qppsobject_p.h
+        kernel/qppsobjectprivate_p.h
+    LIBRARIES
+        PPS::PPS
+)
+
+qt_extend_target(Core CONDITION QT_FEATURE_textcodec
+    SOURCES
+        codecs/qlatincodec.cpp codecs/qlatincodec_p.h
+        codecs/qsimplecodec.cpp codecs/qsimplecodec_p.h
+        codecs/qtextcodec.cpp codecs/qtextcodec.h
+)
+
+qt_extend_target(Core CONDITION QT_FEATURE_codecs AND QT_FEATURE_textcodec
+    SOURCES
+        codecs/qisciicodec.cpp codecs/qisciicodec_p.h
+        codecs/qtsciicodec.cpp codecs/qtsciicodec_p.h
+)
+
+qt_extend_target(Core CONDITION QT_FEATURE_icu AND QT_FEATURE_textcodec
+    SOURCES
+        codecs/qicucodec.cpp codecs/qicucodec_p.h
+)
+
+qt_extend_target(Core CONDITION QT_FEATURE_big_codecs AND QT_FEATURE_textcodec AND NOT QT_FEATURE_icu
+    SOURCES
+        codecs/qbig5codec.cpp codecs/qbig5codec_p.h
+        codecs/qeucjpcodec.cpp codecs/qeucjpcodec_p.h
+        codecs/qeuckrcodec.cpp codecs/qeuckrcodec_p.h
+        codecs/qgb18030codec.cpp codecs/qgb18030codec_p.h
+        codecs/qjiscodec.cpp codecs/qjiscodec_p.h
+        codecs/qjpunicode.cpp
+        codecs/qsjiscodec.cpp codecs/qsjiscodec_p.h
+)
+
+qt_extend_target(Core CONDITION QT_FEATURE_iconv AND QT_FEATURE_textcodec AND NOT QT_FEATURE_icu
+    SOURCES
+        codecs/qiconvcodec.cpp codecs/qiconvcodec_p.h
+    LIBRARIES
+        iconv
+)
+
+qt_extend_target(Core CONDITION QT_FEATURE_textcodec AND WIN32 AND NOT QT_FEATURE_icu
+    SOURCES
+        codecs/qwindowscodec.cpp codecs/qwindowscodec_p.h
+)
+
+qt_extend_target(Core CONDITION QT_FEATURE_cborstreamreader
+    SOURCES
+        serialization/qcborstreamreader.cpp serialization/qcborstreamreader.h
+)
+
+qt_extend_target(Core CONDITION QT_FEATURE_cborstreamwriter
+    SOURCES
+        serialization/qcborstreamwriter.cpp serialization/qcborstreamwriter.h
+)
+
+qt_extend_target(Core CONDITION QT_FEATURE_binaryjson
+    SOURCES
+        serialization/qbinaryjson.cpp serialization/qbinaryjson_p.h
+        serialization/qbinaryjsonarray.cpp serialization/qbinaryjsonarray_p.h
+        serialization/qbinaryjsonobject.cpp serialization/qbinaryjsonobject_p.h
+        serialization/qbinaryjsonvalue.cpp serialization/qbinaryjsonvalue_p.h
+)
+
+qt_extend_target(Core CONDITION QT_FEATURE_qeventtransition
+    SOURCES
+        statemachine/qeventtransition.cpp statemachine/qeventtransition.h statemachine/qeventtransition_p.h
+)
+
+qt_extend_target(Core CONDITION QT_FEATURE_mimetype
+    SOURCES
+        mimetypes/qmimedatabase.cpp mimetypes/qmimedatabase.h mimetypes/qmimedatabase_p.h
+        mimetypes/qmimeglobpattern.cpp mimetypes/qmimeglobpattern_p.h
+        mimetypes/qmimemagicrule.cpp mimetypes/qmimemagicrule_p.h
+        mimetypes/qmimemagicrulematcher.cpp mimetypes/qmimemagicrulematcher_p.h
+        mimetypes/qmimeprovider.cpp mimetypes/qmimeprovider_p.h
+        mimetypes/qmimetype.cpp mimetypes/qmimetype.h mimetypes/qmimetype_p.h
+        mimetypes/qmimetypeparser.cpp mimetypes/qmimetypeparser_p.h
+)
+
+#### Keys ignored in scope 197:.:mimetypes:mimetypes/mimetypes.pri:QT_FEATURE_mimetype:
+# MIME_DATABASE = "mimetypes/mime/packages/freedesktop.org.xml"
+# OTHER_FILES = "$$MIME_DATABASE"
+
+qt_extend_target(Core CONDITION QT_FEATURE_mimetype AND QT_FEATURE_mimetype_database
+    INCLUDE_DIRECTORIES
+        .rcc
+)
+
+#### Keys ignored in scope 198:.:mimetypes:mimetypes/mimetypes.pri:QT_FEATURE_mimetype_database:
+# QMAKE_EXTRA_COMPILERS = "mimedb"
+# mimedb.commands = "${QMAKE_FILE_IN}" ">" "${QMAKE_FILE_OUT}"
+# mimedb.depends = "$$PWD/mime/generate.pl"
+# mimedb.input = "MIME_DATABASE"
+# mimedb.output = "$$outpath/qmimeprovider_database.cpp"
+# mimedb.variable_out = "INCLUDED_SOURCES"
+
+#### Keys ignored in scope 200:.:mimetypes:mimetypes/mimetypes.pri:(CMAKE_BUILD_TYPE STREQUAL Debug):
+# outpath = ".rcc/debug"
+
+#### Keys ignored in scope 201:.:mimetypes:mimetypes/mimetypes.pri:else:
+# outpath = ".rcc/release"
+
+#### Keys ignored in scope 202:.:mimetypes:mimetypes/mimetypes.pri:MAKEFILE_GENERATOR___equals___MSVC.NET OR MAKEFILE_GENERATOR___equals___MSBUILD OR QMAKE_SH_ISEMPTY:
+# mimedb.commands = "cmd" "/c" "$$shell_path($$PWD/mime/generate.bat)"
+# mimedb.depends = "$$PWD/mime/generate.bat" "$$PWD/mime/hexdump.ps1"
+
+#### Keys ignored in scope 203:.:mimetypes:mimetypes/mimetypes.pri:else:
+# mimedb.commands = "perl" "$${mimedb.depends}"
+
+#### Keys ignored in scope 204:.:mimetypes:mimetypes/mimetypes.pri:QT_FEATURE_zstd:
+# mimedb.commands = "--zstd"
+
+qt_extend_target(Core CONDITION WASM
+    SOURCES
+        platform/wasm/qstdweb.cpp platform/wasm/qstdweb_p.h
+)
+
+
+qt_create_tracepoints(Core qtcore.tracepoints)
+qt_add_docs(Core
+    doc/qtcore.qdocconf
+)
+
diff --git a/src/corelib/CMakeLists.txt b/src/corelib/CMakeLists.txt
new file mode 100644
index 0000000000..b62ce89f4d
--- /dev/null
+++ b/src/corelib/CMakeLists.txt
@@ -0,0 +1,1304 @@
+# Generated from corelib.pro.
+
+# special case begin
+qt_find_package(Threads PROVIDED_TARGETS Threads::Threads)
+qt_find_package(WrapDoubleConversion REQUIRED
+                                     PROVIDED_TARGETS WrapDoubleConversion::WrapDoubleConversion)
+qt_find_package(WrapPCRE2 PROVIDED_TARGETS WrapPCRE2::WrapPCRE2)
+
+if (NOT WrapDoubleConversion_FOUND)
+    message(FATAL_ERROR "Your C library does not provide \
+                         sscanf_l/snprintf_l _snprintf_l/_sscanf_l. \
+                         You need to use libdouble-conversion for double/string conversion.")
+endif()
+
+# compute the reverse relative path from QtCoreConfigExtras to the install prefix
+# this is used in QtCoreConfigExtras to make its install paths relocatable
+if(QT_WILL_INSTALL)
+    get_filename_component(_clean_prefix "${CMAKE_INSTALL_PREFIX}/${QT_CONFIG_INSTALL_DIR}" ABSOLUTE)
+else()
+    get_filename_component(_clean_prefix "${QT_CONFIG_BUILD_DIR}" ABSOLUTE)
+endif()
+file(RELATIVE_PATH QT_INVERSE_CONFIG_INSTALL_DIR ${_clean_prefix} ${CMAKE_INSTALL_PREFIX})
+
+# special case end
+
+#####################################################################
+## Core Module:
+#####################################################################
+
+# special case begin
+add_library(Core_qobject OBJECT)
+# special case end
+
+qt_add_module(Core
+    GENERATE_METATYPES
+    QMAKE_MODULE_CONFIG moc resources
+    EXCEPTIONS
+    SOURCES
+        # special case: remove ../3rdparty/harfbuzz
+        codecs/qtextcodec_p.h
+        codecs/qutfcodec.cpp codecs/qutfcodec_p.h
+        global/archdetect.cpp
+        global/qcompilerdetection.h
+        global/qendian.cpp global/qendian.h global/qendian_p.h
+        global/qflags.h
+        global/qfloat16.cpp global/qfloat16.h
+        global/qglobal.cpp global/qglobal.h
+        global/qglobalstatic.h
+        global/qhooks.cpp global/qhooks_p.h
+        global/qisenum.h
+        global/qlibraryinfo.cpp global/qlibraryinfo.h
+        global/qlogging.cpp global/qlogging.h
+        global/qmalloc.cpp
+        global/qmemory_p.h
+        # global/qnamespace.h  # special case
+        global/qnumeric.cpp global/qnumeric.h global/qnumeric_p.h
+        global/qoperatingsystemversion.cpp global/qoperatingsystemversion.h global/qoperatingsystemversion_p.h
+        global/qprocessordetection.h
+        global/qrandom.cpp global/qrandom.h global/qrandom_p.h
+        global/qsysinfo.h
+        global/qsystemdetection.h
+        global/qtypeinfo.h
+        global/qtypetraits.h
+        global/qversiontagging.cpp global/qversiontagging.h  # special case
+        io/qabstractfileengine.cpp io/qabstractfileengine_p.h
+        io/qbuffer.cpp io/qbuffer.h
+        io/qdataurl.cpp io/qdataurl_p.h
+        io/qdebug.cpp io/qdebug.h io/qdebug_p.h
+        io/qdir.cpp io/qdir.h io/qdir_p.h
+        io/qdiriterator.cpp io/qdiriterator.h
+        io/qfile.cpp io/qfile.h
+        io/qfiledevice.cpp io/qfiledevice.h io/qfiledevice_p.h
+        io/qfileinfo.cpp io/qfileinfo.h io/qfileinfo_p.h
+        io/qfileselector.cpp io/qfileselector.h io/qfileselector_p.h
+        io/qfilesystemengine.cpp io/qfilesystemengine_p.h
+        io/qfilesystementry.cpp io/qfilesystementry_p.h
+        io/qfilesystemiterator_p.h
+        io/qfilesystemmetadata_p.h
+        io/qfsfileengine.cpp io/qfsfileengine_p.h
+        io/qfsfileengine_iterator.cpp io/qfsfileengine_iterator_p.h
+        io/qiodevice.cpp io/qiodevice.h io/qiodevice_p.h
+        io/qipaddress.cpp io/qipaddress_p.h
+        io/qlockfile.cpp io/qlockfile.h io/qlockfile_p.h
+        io/qloggingcategory.cpp io/qloggingcategory.h
+        io/qloggingregistry.cpp io/qloggingregistry_p.h
+        io/qnoncontiguousbytedevice.cpp io/qnoncontiguousbytedevice_p.h
+        io/qresource.cpp io/qresource_p.h
+        io/qresource_iterator.cpp io/qresource_iterator_p.h
+        io/qsavefile.cpp io/qsavefile.h
+        io/qstandardpaths.cpp io/qstandardpaths.h
+        io/qstorageinfo.cpp io/qstorageinfo.h io/qstorageinfo_p.h
+        io/qtemporarydir.cpp io/qtemporarydir.h
+        io/qtemporaryfile.cpp io/qtemporaryfile.h io/qtemporaryfile_p.h
+        io/qurl.cpp io/qurl.h io/qurl_p.h
+        io/qurlidna.cpp
+        io/qurlquery.cpp io/qurlquery.h
+        io/qurlrecode.cpp
+        itemmodels/qabstractitemmodel.cpp itemmodels/qabstractitemmodel.h itemmodels/qabstractitemmodel_p.h
+        itemmodels/qitemselectionmodel.cpp itemmodels/qitemselectionmodel.h itemmodels/qitemselectionmodel_p.h
+        kernel/qabstracteventdispatcher.cpp kernel/qabstracteventdispatcher.h kernel/qabstracteventdispatcher_p.h
+        kernel/qabstractnativeeventfilter.cpp kernel/qabstractnativeeventfilter.h
+        kernel/qbasictimer.cpp kernel/qbasictimer.h
+        kernel/qcoreapplication.cpp kernel/qcoreapplication.h kernel/qcoreapplication_p.h
+        kernel/qcorecmdlineargs_p.h
+        kernel/qcoreevent.cpp kernel/qcoreevent.h
+        kernel/qcoreglobaldata.cpp kernel/qcoreglobaldata_p.h
+        kernel/qdeadlinetimer.cpp kernel/qdeadlinetimer.h kernel/qdeadlinetimer_p.h
+        kernel/qelapsedtimer.cpp kernel/qelapsedtimer.h
+        kernel/qeventloop.cpp kernel/qeventloop.h
+        kernel/qfunctions_p.h
+        kernel/qmath.cpp kernel/qmath.h
+        kernel/qmetaobject.cpp kernel/qmetaobject.h kernel/qmetaobject_p.h
+        kernel/qmetaobject_moc_p.h
+        kernel/qmetaobjectbuilder.cpp kernel/qmetaobjectbuilder_p.h
+        kernel/qmetatype.cpp kernel/qmetatype.h kernel/qmetatype_p.h
+        kernel/qmetatypeswitcher_p.h
+        kernel/qmimedata.cpp kernel/qmimedata.h
+        # kernel/qobject.cpp kernel/qobject.h kernel/qobject_p.h # special case
+        kernel/qobject_impl.h
+        kernel/qobjectcleanuphandler.cpp kernel/qobjectcleanuphandler.h
+        kernel/qobjectdefs.h
+        kernel/qobjectdefs_impl.h
+        kernel/qpointer.cpp kernel/qpointer.h
+        kernel/qsharedmemory.cpp kernel/qsharedmemory.h kernel/qsharedmemory_p.h
+        kernel/qsignalmapper.cpp kernel/qsignalmapper.h
+        kernel/qsocketnotifier.cpp kernel/qsocketnotifier.h
+        kernel/qsystemerror.cpp kernel/qsystemerror_p.h
+        kernel/qsystemsemaphore.cpp kernel/qsystemsemaphore.h kernel/qsystemsemaphore_p.h
+        kernel/qtestsupport_core.cpp kernel/qtestsupport_core.h
+        kernel/qtimer.cpp kernel/qtimer.h
+        kernel/qtranslator.cpp kernel/qtranslator.h kernel/qtranslator_p.h
+        kernel/qvariant.cpp kernel/qvariant.h kernel/qvariant_p.h
+        plugin/qfactoryinterface.cpp plugin/qfactoryinterface.h
+        plugin/qfactoryloader.cpp plugin/qfactoryloader_p.h
+        plugin/qplugin.h plugin/qplugin_p.h
+        plugin/qpluginloader.cpp plugin/qpluginloader.h
+        plugin/quuid.cpp plugin/quuid.h
+        serialization/qcborarray.h
+        serialization/qcborcommon.cpp serialization/qcborcommon.h serialization/qcborcommon_p.h
+        serialization/qcbordiagnostic.cpp
+        serialization/qcbormap.h
+        serialization/qcborstream.h
+        serialization/qcborvalue.cpp serialization/qcborvalue.h serialization/qcborvalue_p.h
+        serialization/qdatastream.cpp serialization/qdatastream.h serialization/qdatastream_p.h
+        serialization/qjson_p.h
+        serialization/qjsonarray.cpp serialization/qjsonarray.h
+        serialization/qjsoncbor.cpp
+        serialization/qjsondocument.cpp serialization/qjsondocument.h
+        serialization/qjsonobject.cpp serialization/qjsonobject.h
+        serialization/qjsonparser.cpp serialization/qjsonparser_p.h
+        serialization/qjsonvalue.cpp serialization/qjsonvalue.h
+        serialization/qjsonwriter.cpp serialization/qjsonwriter_p.h
+        serialization/qtextstream.cpp serialization/qtextstream.h serialization/qtextstream_p.h
+        serialization/qxmlstream.cpp serialization/qxmlstream.h serialization/qxmlstream_p.h
+        serialization/qxmlutils.cpp serialization/qxmlutils_p.h
+        statemachine/qabstractstate.cpp statemachine/qabstractstate.h statemachine/qabstractstate_p.h
+        statemachine/qabstracttransition.cpp statemachine/qabstracttransition.h statemachine/qabstracttransition_p.h
+        statemachine/qfinalstate.cpp statemachine/qfinalstate.h statemachine/qfinalstate_p.h
+        statemachine/qhistorystate.cpp statemachine/qhistorystate.h statemachine/qhistorystate_p.h
+        statemachine/qsignaleventgenerator_p.h
+        statemachine/qsignaltransition.cpp statemachine/qsignaltransition.h statemachine/qsignaltransition_p.h
+        statemachine/qstate.cpp statemachine/qstate.h statemachine/qstate_p.h
+        statemachine/qstatemachine.cpp statemachine/qstatemachine.h statemachine/qstatemachine_p.h
+        text/qbytearray.cpp text/qbytearray.h text/qbytearray_p.h
+        text/qbytearraylist.cpp text/qbytearraylist.h
+        text/qbytearraymatcher.cpp text/qbytearraymatcher.h
+        text/qbytedata_p.h
+        text/qchar.h
+        text/qcollator.cpp text/qcollator.h text/qcollator_p.h
+        text/qdoublescanprint_p.h
+        text/qharfbuzz.cpp text/qharfbuzz_p.h
+        text/qlocale.cpp text/qlocale.h text/qlocale_p.h
+        text/qlocale_data_p.h
+        text/qlocale_tools.cpp text/qlocale_tools_p.h
+        text/qregexp.cpp text/qregexp.h
+        text/qstring.cpp text/qstring.h
+        text/qstring_compat.cpp
+        text/qstringalgorithms.h text/qstringalgorithms_p.h
+        text/qstringbuilder.cpp text/qstringbuilder.h
+        text/qstringiterator_p.h
+        text/qstringlist.cpp text/qstringlist.h
+        text/qstringliteral.h
+        text/qstringmatcher.h
+        text/qstringview.cpp text/qstringview.h
+        text/qtextboundaryfinder.cpp text/qtextboundaryfinder.h
+        text/qunicodetables_p.h
+        text/qunicodetools.cpp text/qunicodetools_p.h
+        text/qvsnprintf.cpp
+        thread/qmutex.h
+        thread/qreadwritelock.h
+        thread/qrunnable.cpp thread/qrunnable.h
+        thread/qthread.cpp thread/qthread.h
+        thread/qthreadstorage.h
+        thread/qwaitcondition.h thread/qwaitcondition_p.h
+        time/qcalendar.cpp time/qcalendar.h
+        time/qcalendarbackend_p.h
+        time/qcalendarmath_p.h
+        time/qdatetime.cpp time/qdatetime.h time/qdatetime_p.h
+        time/qgregoriancalendar.cpp time/qgregoriancalendar_p.h
+        time/qjuliancalendar.cpp time/qjuliancalendar_p.h
+        time/qmilankoviccalendar.cpp time/qmilankoviccalendar_p.h
+        time/qromancalendar.cpp time/qromancalendar_p.h
+        time/qromancalendar_data_p.h
+        tools/qalgorithms.h
+        tools/qarraydata.cpp tools/qarraydata.h
+        tools/qarraydataops.h
+        tools/qarraydatapointer.h
+        tools/qbitarray.cpp tools/qbitarray.h
+        tools/qcache.h
+        tools/qcontainerfwd.h
+        tools/qcontainertools_impl.h
+        tools/qcontiguouscache.cpp tools/qcontiguouscache.h
+        tools/qcryptographichash.cpp tools/qcryptographichash.h
+        tools/qduplicatetracker_p.h
+        tools/qflatmap_p.h
+        tools/qfreelist.cpp tools/qfreelist_p.h
+        tools/qhash.cpp tools/qhash.h
+        tools/qhashfunctions.h
+        tools/qiterator.h
+        tools/qline.cpp tools/qline.h
+        tools/qlist.cpp tools/qlist.h
+        tools/qmakearray_p.h
+        tools/qmap.cpp tools/qmap.h
+        tools/qmargins.cpp tools/qmargins.h
+        tools/qmessageauthenticationcode.cpp tools/qmessageauthenticationcode.h
+        tools/qoffsetstringarray_p.h
+        tools/qpair.h
+        tools/qpoint.cpp tools/qpoint.h
+        tools/qqueue.h
+        tools/qrect.cpp tools/qrect.h
+        tools/qrefcount.cpp tools/qrefcount.h
+        tools/qringbuffer.cpp tools/qringbuffer_p.h
+        tools/qscopedpointer.h tools/qscopedpointer_p.h
+        tools/qscopedvaluerollback.h
+        tools/qscopeguard.h
+        tools/qset.h
+        tools/qshareddata.cpp tools/qshareddata.h
+        tools/qsharedpointer.cpp tools/qsharedpointer.h
+        tools/qsharedpointer_impl.h
+        tools/qsimd.cpp tools/qsimd_p.h
+        tools/qsize.cpp tools/qsize.h
+        tools/qstack.h
+        tools/qtools_p.h
+        tools/qvarlengtharray.h
+        tools/qvector.h
+        tools/qversionnumber.cpp tools/qversionnumber.h
+    DEFINES
+        QT_NO_FOREACH
+        QT_NO_USING_NAMESPACE
+    INCLUDE_DIRECTORIES
+        "${CMAKE_CURRENT_BINARY_DIR}/global" # special case
+        ../3rdparty/tinycbor/src
+    PRECOMPILED_HEADER
+        global/qt_pch.h
+    NO_PCH_SOURCES
+        "text/qstring_compat.cpp"
+    LIBRARIES
+        # double-conversion # special case remove
+        Qt::GlobalConfigPrivate # special case
+        QtHarfBuzz # special case
+        Threads::Threads # special case
+        WrapDoubleConversion::WrapDoubleConversion # special case
+        Core_qobject
+    PUBLIC_LIBRARIES  # special case:
+        Qt::Platform # special case:
+    # special case begin
+    # Generated in QtBaseGlobalTargets
+    EXTRA_CMAKE_FILES ${QT_CORE_RESOURCE_GENERATED_FILE_PATH}
+    EXTRA_CMAKE_INCLUDES ${QT_CORE_RESOURCE_GENERATED_FILE_NAME}
+    # special case end
+)
+
+# special case begin
+add_dependencies(Core ${QT_CMAKE_EXPORT_NAMESPACE}::moc)
+add_dependencies(Core ${QT_CMAKE_EXPORT_NAMESPACE}::rcc)
+add_dependencies(CorePrivate ${QT_CMAKE_EXPORT_NAMESPACE}::moc)
+add_dependencies(CorePrivate ${QT_CMAKE_EXPORT_NAMESPACE}::rcc)
+
+if (QT_NAMESPACE STREQUAL "")
+else()
+    target_compile_definitions(Core PUBLIC "QT_NAMESPACE=${QT_NAMESPACE}")
+endif()
+
+qt_generate_qconfig_cpp()
+
+# Handle QObject: Automoc does not work for this as it would
+# require to spill internals into users:
+set_target_properties(Core_qobject PROPERTIES AUTOMOC OFF)
+qt_manual_moc(qobject_moc_files OUTPUT_MOC_JSON_FILES core_qobject_metatypes_json_list  kernel/qobject.h global/qnamespace.h)
+set_source_files_properties(${qobject_moc_files} PROPERTIES HEADER_FILE_ONLY ON)
+target_sources(Core_qobject PRIVATE
+    global/qnamespace.h
+    kernel/qobject.cpp kernel/qobject.h kernel/qobject_p.h ${qobject_moc_files})
+set_target_properties(Core_qobject PROPERTIES
+    COMPILE_OPTIONS $<TARGET_PROPERTY:Core,COMPILE_OPTIONS>
+    COMPILE_DEFINITIONS $<TARGET_PROPERTY:Core,COMPILE_DEFINITIONS>
+    INCLUDE_DIRECTORIES $<TARGET_PROPERTY:Core,INCLUDE_DIRECTORIES>
+)
+target_include_directories(Core_qobject PRIVATE "${CMAKE_CURRENT_BINARY_DIR}/kernel") # for moc_qobject.cpp
+target_link_libraries(Core_qobject PRIVATE Qt::Platform Qt::GlobalConfig)
+target_link_libraries(Core PRIVATE Core_qobject)
+
+set(core_qobject_metatypes_json_args)
+if (NOT QT_WILL_INSTALL)
+    set(core_qobject_metatypes_json_args INSTALL_DIR "${QT_BUILD_DIR}/${INSTALL_LIBDIR}/metatypes")
+endif()
+
+qt6_generate_meta_types_json_file(Core_qobject
+    MANUAL_MOC_JSON_FILES ${core_qobject_metatypes_json_list}
+    ${core_qobject_metatypes_json_args}
+)
+
+if(NOT BUILD_SHARED_LIBS)
+    install(
+      TARGETS Core_qobject
+      EXPORT "${INSTALL_CMAKE_NAMESPACE}Targets"
+    )
+endif()
+
+# Core_qobject is never exported so we need to duplicate the metatypes file
+# interface on Core
+get_target_property(core_qobject_metatypes_file_genex_build Core_qobject QT_MODULE_META_TYPES_FILE_GENEX_BUILD)
+get_target_property(core_qobject_metatypes_file_genex_install Core_qobject QT_MODULE_META_TYPES_FILE_GENEX_INSTALL)
+target_sources(Core INTERFACE
+    ${core_qobject_metatypes_file_genex_build}
+    ${core_qobject_metatypes_file_genex_install}
+)
+
+set_property(TARGET Core APPEND PROPERTY
+    PUBLIC_HEADER "${CMAKE_CURRENT_BINARY_DIR}/global/qconfig.h")
+set_property(TARGET Core APPEND PROPERTY
+    PRIVATE_HEADER "${CMAKE_CURRENT_BINARY_DIR}/global/qconfig_p.h")
+
+# Find ELF interpreter and define a macro for that:
+if (LINUX AND NOT CMAKE_CROSSCOMPILING AND BUILD_SHARED_LIBS)
+    if (NOT DEFINED ELF_INTERPRETER)
+        execute_process(COMMAND ${CMAKE_COMMAND} -E env LC_ALL=C readelf -l /bin/ls
+                        RESULT_VARIABLE readelf_ok
+                        OUTPUT_VARIABLE readelf_output
+                       )
+        if ("${readelf_ok}" STREQUAL "0"
+                AND "${readelf_output}" MATCHES "program interpreter: (.*)]")
+            set(ELF_INTERPRETER "${CMAKE_MATCH_1}" CACHE INTERNAL "ELF interpreter location")
+        else()
+            set(ELF_INTERPRETER "" CACHE INTERNAL "ELF interpreter location")
+        endif()
+    endif()
+    if (ELF_INTERPRETER)
+        target_link_options(Core PRIVATE "-Wl,-e,qt_core_boilerplate")
+        target_compile_definitions(Core PRIVATE ELF_INTERPRETER="${ELF_INTERPRETER}")
+    endif()
+endif()
+# special case end
+
+qt_add_simd_part(Core SIMD mips_dsp
+    SOURCES
+        ../gui/painting/qt_mips_asm_dsp_p.h
+        text/qstring_mips_dsp_asm.S
+)
+
+if(QT_FEATURE_reduce_relocations AND UNIX AND GCC)
+    target_link_options(Core PRIVATE
+                        "LINKER:--dynamic-list=${CMAKE_CURRENT_LIST_DIR}/QtCore.dynlist")
+endif()
+
+if(ANDROID)
+    set_property(TARGET Core APPEND PROPERTY QT_ANDROID_BUNDLED_JAR_DEPENDENCIES
+        jar/QtAndroid.jar
+    )
+    set_property(TARGET Core APPEND PROPERTY QT_ANDROID_LIB_DEPENDENCIES
+        plugins/platforms/libplugins_platforms_qtforandroid.so
+    )
+    set_property(TARGET Core APPEND PROPERTY QT_ANDROID_PERMISSIONS
+        android.permission.INTERNET android.permission.WRITE_EXTERNAL_STORAGE
+    )
+endif()
+
+#### Keys ignored in scope 1:.:.:corelib.pro:<TRUE>:
+# CMAKE_DISABLED_FEATURES = "$$join(QT_DISABLED_FEATURES, "$$escape_expand(\\n)    ")"
+# CMAKE_HOST_DATA_DIR = "$$cmakeRelativePath($$[QT_HOST_DATA/src], $$[QT_INSTALL_PREFIX])"
+# CMAKE_INSTALL_DATA_DIR = "$$cmakeRelativePath($$[QT_HOST_DATA], $$[QT_INSTALL_PREFIX])"
+# HOST_BINS = "$$[QT_HOST_BINS]"
+# INSTALLS = "ctest_qt5_module_files" "cmake_qt5_umbrella_module_files"
+# MODULE = "core"
+# MODULE_CONFIG = "moc" "resources"
+# QMAKE_DSYM_DEBUG_SCRIPT = "$$PWD/debug_script.py"
+# QMAKE_PKGCONFIG_VARIABLES = "host_bins" "qt_conf"
+# QMAKE_SUBSTITUTES = "ctest_macros_file" "cmake_umbrella_config_file" "cmake_umbrella_config_module_location" "cmake_umbrella_config_module_location_for_install" "cmake_umbrella_config_version_file" "cmake_extras_mkspec_dir" "cmake_extras_mkspec_dir_for_install"
+# cmake_extras_mkspec_dir.input = "$$PWD/Qt5CoreConfigExtrasMkspecDir.cmake.in"
+# cmake_extras_mkspec_dir.output = "$$DESTDIR/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake"
+# cmake_extras_mkspec_dir_for_install.input = "$$PWD/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in"
+# cmake_extras_mkspec_dir_for_install.output = "$$DESTDIR/cmake/install/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake"
+# cmake_qt5_umbrella_module_files.files = "$$cmake_umbrella_config_file.output" "$$cmake_umbrella_config_version_file.output" "$$cmake_umbrella_config_module_location_for_install.output"
+# cmake_qt5_umbrella_module_files.path = "$$[QT_INSTALL_LIBS]/cmake/Qt5"
+# cmake_umbrella_config_file.input = "$$PWD/Qt5Config.cmake.in"
+# cmake_umbrella_config_file.output = "$$DESTDIR/cmake/Qt5/Qt5Config.cmake"
+# cmake_umbrella_config_module_location.input = "$$PWD/Qt5ModuleLocation.cmake.in"
+# cmake_umbrella_config_module_location.output = "$$DESTDIR/cmake/Qt5/Qt5ModuleLocation.cmake"
+# cmake_umbrella_config_module_location_for_install.input = "$$PWD/Qt5ModuleLocationForInstall.cmake.in"
+# cmake_umbrella_config_module_location_for_install.output = "$$DESTDIR/cmake/install/Qt5/Qt5ModuleLocation.cmake"
+# cmake_umbrella_config_version_file.input = "$$PWD/../../mkspecs/features/data/cmake/Qt5ConfigVersion.cmake.in"
+# cmake_umbrella_config_version_file.output = "$$DESTDIR/cmake/Qt5/Qt5ConfigVersion.cmake"
+# ctest_macros_file.CONFIG = "verbatim"
+# ctest_macros_file.input = "$$PWD/Qt5CTestMacros.cmake"
+# ctest_macros_file.output = "$$DESTDIR/cmake/Qt5Core/Qt5CTestMacros.cmake"
+# ctest_qt5_module_files.files = "$$ctest_macros_file.output" "$$cmake_extras_mkspec_dir_for_install.output"
+# ctest_qt5_module_files.path = "$$[QT_INSTALL_LIBS]/cmake/Qt5Core"
+# host_bins.name = "host_bins"
+# host_bins.variable = "HOST_BINS"
+# qt_conf.name = "qt_config"
+# qt_conf.variable = "QT_CONFIG"
+
+## Scopes:
+#####################################################################
+
+#### Keys ignored in scope 2:.:.:corelib.pro:QT_FEATURE_gc_binaries:
+# MODULE_CONFIG = "gc_binaries"
+
+# special case begin
+# remove because it's handled manually
+#qt_extend_target(Core CONDITION NOT QT_NAMESPACE_ISEMPTY
+#    PUBLIC_DEFINES
+#        QT_NAMESPACE=
+#)
+# special case end
+
+qt_extend_target(Core CONDITION ANDROID
+    SOURCES
+        kernel/qsharedmemory_android.cpp
+        kernel/qsystemsemaphore_android.cpp
+    DEFINES
+        LIBS_SUFFIX="\\\\"_${CMAKE_SYSTEM_PROCESSOR}.so\\\\"" # special case
+)
+
+qt_extend_target(Core CONDITION MSVC AND (TEST_architecture_arch STREQUAL "i386")
+    LINK_OPTIONS
+        "/BASE:0x67000000"
+)
+
+#### Keys ignored in scope 6:.:.:corelib.pro:FREEBSD OR OPENBSD:
+# QMAKE_LFLAGS_NOUNDEF = <EMPTY>
+
+qt_extend_target(Core CONDITION QT_FEATURE_animation
+    SOURCES
+        animation/qabstractanimation.cpp animation/qabstractanimation.h animation/qabstractanimation_p.h
+        animation/qanimationgroup.cpp animation/qanimationgroup.h animation/qanimationgroup_p.h
+        animation/qparallelanimationgroup.cpp animation/qparallelanimationgroup.h animation/qparallelanimationgroup_p.h
+        animation/qpauseanimation.cpp animation/qpauseanimation.h
+        animation/qpropertyanimation.cpp animation/qpropertyanimation.h animation/qpropertyanimation_p.h
+        animation/qsequentialanimationgroup.cpp animation/qsequentialanimationgroup.h animation/qsequentialanimationgroup_p.h
+        animation/qvariantanimation.cpp animation/qvariantanimation.h animation/qvariantanimation_p.h
+)
+
+qt_extend_target(Core CONDITION WIN32
+    SOURCES
+        global/qoperatingsystemversion_win.cpp global/qoperatingsystemversion_win_p.h
+        io/qfilesystemengine_win.cpp
+        io/qfsfileengine_win.cpp
+        io/qlockfile_win.cpp
+        kernel/qcoreapplication_win.cpp
+        kernel/qelapsedtimer_win.cpp
+        kernel/qsharedmemory_win.cpp
+        kernel/qsystemsemaphore_win.cpp
+        kernel/qwineventnotifier.cpp kernel/qwineventnotifier.h kernel/qwineventnotifier_p.h
+        plugin/qsystemlibrary.cpp plugin/qsystemlibrary_p.h
+        thread/qatomic_msvc.h
+        thread/qthread_win.cpp
+    # DEFINES # special case: remove
+    LIBRARIES
+        ws2_32
+)
+
+qt_extend_target(Core CONDITION WIN32 AND NOT WINRT
+    SOURCES
+        io/qstandardpaths_win.cpp
+        io/qstorageinfo_win.cpp
+        io/qwindowspipereader.cpp io/qwindowspipereader_p.h
+        io/qwindowspipewriter.cpp io/qwindowspipewriter_p.h
+        kernel/qeventdispatcher_win.cpp kernel/qeventdispatcher_win_p.h
+        kernel/qwinregistry.cpp kernel/qwinregistry_p.h
+    LIBRARIES
+        advapi32
+        kernel32
+        netapi32
+        ole32
+        shell32
+        user32
+        uuid
+        version
+        winmm
+    PUBLIC_LIBRARIES
+        mpr
+        userenv
+)
+
+qt_extend_target(Core CONDITION APPLE
+    SOURCES
+        global/qoperatingsystemversion_darwin.mm
+        io/qfilesystemengine_mac.mm
+        io/qstandardpaths_mac.mm
+        io/qstorageinfo_mac.cpp
+        kernel/qcfsocketnotifier.cpp kernel/qcfsocketnotifier_p.h
+        kernel/qcore_foundation.mm
+        kernel/qcore_mac.cpp kernel/qcore_mac_p.h
+        kernel/qcore_mac_objc.mm
+        kernel/qcoreapplication_mac.cpp
+        kernel/qeventdispatcher_cf.mm kernel/qeventdispatcher_cf_p.h
+    LIBRARIES
+        ${FWCoreFoundation}
+        ${FWFoundation}
+)
+
+qt_extend_target(Core CONDITION APPLE_OSX
+    LIBRARIES
+        ${FWAppKit}
+        ${FWApplicationServices}
+        ${FWCoreServices}
+        ${FWSecurity}
+    PUBLIC_LIBRARIES
+        ${FWDiskArbitration}
+        ${FWIOKit}
+)
+
+qt_extend_target(Core CONDITION INTEGRITY
+    LIBRARIES
+        ivfs
+        net
+        posix
+        shm_client
+        socket
+    COMPILE_OPTIONS
+        --pending_instantiations=128
+)
+
+#### Keys ignored in scope 15:.:.:corelib.pro:pathIsAbsolute(_ss_CMAKE_HOST_DATA_DIR):
+# CMAKE_HOST_DATA_DIR = "$$[QT_HOST_DATA/src]/"
+# CMAKE_HOST_DATA_DIR_IS_ABSOLUTE = "True"
+
+#### Keys ignored in scope 16:.:.:corelib.pro:pathIsAbsolute(_ss_CMAKE_INSTALL_DATA_DIR):
+# CMAKE_INSTALL_DATA_DIR = "$$[QT_HOST_DATA]/"
+# CMAKE_INSTALL_DATA_DIR_IS_ABSOLUTE = "True"
+
+#### Keys ignored in scope 21:.:global:global/global.pri:QT_CPU_FEATURES__ss_QT_ARCH___contains___f16c:
+# f16c_cxx = "true"
+
+#### Keys ignored in scope 23:.:global:global/global.pri:CLANG OR intel_icl OR ICC:
+# f16c_cxx = "false"
+
+#### Keys ignored in scope 25:.:global:global/global.pri:GCC AND f16c AND x86SimdAlways:
+# f16c_cxx = "true"
+
+#### Keys ignored in scope 27:.:global:global/global.pri:MSVC AND QT_CPU_FEATURES__ss_QT_ARCH___contains___avx:
+# f16c_cxx = "true"
+
+#### Keys ignored in scope 28:.:global:global/global.pri:else:
+# f16c_cxx = "false"
+
+# extend_target(Core CONDITION _ss_f16c_cxx ... # special case remove: Handled manually
+
+# special case begin
+# Remove this because it's handled manually
+#extend_target(Core CONDITION NOT _x_-armcc_x_ AND NOT cross_compile AND NOT static AND (hurd_x_ OR linux_x_)
+#    DEFINES
+#        ELF_INTERPRETER=\\\"=Creadelf-l/bin/ls|perl-n-e\'['quote', ['if', ['/program', 'interpreter:', ['.*'], ']/'], '{', 'print', '$1;', '}']]\'\\\"
+#    LINK_OPTIONS
+#        "-Wl,-e,qt_core_boilerplate"
+#)
+# special case end
+
+qt_extend_target(Core CONDITION LINUX AND NOT static
+    SOURCES
+        global/minimum-linux_p.h
+)
+
+#### Keys ignored in scope 35:.:global:global/global.pri:precompile_header:
+# NO_PCH_ASM = "global/minimum-linux.S"
+# QMAKE_EXTRA_COMPILERS = "no_pch_assembler"
+# no_pch_assembler.commands = "$$QMAKE_CC" "-c" "$(CFLAGS)" "$(INCPATH)" "${QMAKE_FILE_IN}" "-o" "${QMAKE_FILE_OUT}"
+# no_pch_assembler.dependency_type = "TYPE_C"
+# no_pch_assembler.input = "NO_PCH_ASM"
+# no_pch_assembler.name = "compiling[no_pch]" "${QMAKE_FILE_IN}"
+# no_pch_assembler.output = "${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}$${firstQMAKE_EXT_OBJ}"
+
+#### Keys ignored in scope 36:.:global:global/global.pri:silent:
+# no_pch_assembler.commands = "@echo" "compiling[no_pch]" "${QMAKE_FILE_IN}" "&&"
+
+qt_extend_target(Core CONDITION LINUX AND NOT precompile_header AND NOT static
+    SOURCES
+        global/minimum-linux.S
+)
+
+qt_extend_target(Core CONDITION QT_FEATURE_slog2
+    LIBRARIES
+        Slog2::Slog2
+)
+
+qt_extend_target(Core CONDITION QT_FEATURE_journald
+    LIBRARIES
+        PkgConfig::Libsystemd
+)
+
+#### Keys ignored in scope 40:.:global:global/global.pri:GCC AND ltcg:
+# QMAKE_EXTRA_COMPILERS = "versiontagging_compiler"
+# versiontagging_compiler.commands = "$$QMAKE_CXX" "-c" "$(CXXFLAGS)" "$(INCPATH)" "-fno-lto" "-o" "${QMAKE_FILE_OUT}" "${QMAKE_FILE_IN}"
+# versiontagging_compiler.dependency_type = "TYPE_C"
+# versiontagging_compiler.input = "VERSIONTAGGING_SOURCES"
+# versiontagging_compiler.name = "compiling[versiontagging]" "${QMAKE_FILE_IN}"
+# versiontagging_compiler.output = "${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}$${firstQMAKE_EXT_OBJ}"
+# versiontagging_compiler.variable_out = "OBJECTS"
+
+#### Keys ignored in scope 41:.:global:global/global.pri:silent:
+# versiontagging_compiler.commands = "@echo" "compiling[versiontagging]" "${QMAKE_FILE_IN}" "&&"
+
+qt_extend_target(Core CONDITION NOT GCC OR NOT ltcg
+    SOURCES
+        global/qversiontagging.cpp
+)
+
+qt_extend_target(Core CONDITION UNIX
+    SOURCES
+        io/qfilesystemengine_unix.cpp
+        io/qfilesystemiterator_unix.cpp
+        io/qfsfileengine_unix.cpp
+        io/qlockfile_unix.cpp
+        kernel/qcore_unix.cpp kernel/qcore_unix_p.h
+        kernel/qeventdispatcher_unix.cpp kernel/qeventdispatcher_unix_p.h
+        kernel/qpoll_p.h
+        kernel/qtimerinfo_unix.cpp kernel/qtimerinfo_unix_p.h
+        thread/qthread_unix.cpp
+)
+
+qt_extend_target(Core CONDITION QT_FEATURE_thread
+    SOURCES
+        thread/qatomic.cpp thread/qatomic.h
+        thread/qatomic_bootstrap.h
+        thread/qatomic_cxx11.h
+        thread/qbasicatomic.h
+        thread/qfutex_p.h
+        thread/qgenericatomic.h
+        thread/qlocking_p.h
+        thread/qmutex.cpp thread/qmutex_p.h
+        thread/qorderedmutexlocker_p.h
+        thread/qreadwritelock.cpp thread/qreadwritelock_p.h
+        thread/qsemaphore.cpp thread/qsemaphore.h
+        thread/qthread_p.h
+        thread/qthreadpool.cpp thread/qthreadpool.h thread/qthreadpool_p.h
+        thread/qthreadstorage.cpp
+)
+
+qt_extend_target(Core CONDITION QT_FEATURE_thread AND WIN32
+    SOURCES
+        thread/qmutex_win.cpp
+        thread/qwaitcondition_win.cpp
+)
+
+qt_extend_target(Core CONDITION QT_FEATURE_thread AND UNIX
+    SOURCES
+        thread/qwaitcondition_unix.cpp
+)
+
+qt_extend_target(Core CONDITION APPLE AND QT_FEATURE_thread
+    SOURCES
+        thread/qmutex_mac.cpp
+)
+
+qt_extend_target(Core CONDITION LINUX AND QT_FEATURE_thread
+    SOURCES
+        thread/qmutex_linux.cpp
+)
+
+qt_extend_target(Core CONDITION QT_FEATURE_thread AND UNIX AND NOT APPLE AND NOT LINUX
+    SOURCES
+        thread/qmutex_unix.cpp
+)
+
+qt_extend_target(Core CONDITION QT_FEATURE_future
+    SOURCES
+        thread/qexception.cpp thread/qexception.h
+        thread/qfuture.h
+        thread/qfutureinterface.cpp thread/qfutureinterface.h thread/qfutureinterface_p.h
+        thread/qfuturesynchronizer.h
+        thread/qfuturewatcher.cpp thread/qfuturewatcher.h thread/qfuturewatcher_p.h
+        thread/qresultstore.cpp thread/qresultstore.h
+)
+
+qt_extend_target(Core CONDITION QT_FEATURE_std_atomic64
+    PUBLIC_LIBRARIES
+        Atomic
+)
+
+qt_extend_target(Core CONDITION ICC
+    COMPILE_OPTIONS
+        -fp-model
+        strict
+)
+
+qt_extend_target(Core CONDITION MSVC
+    SOURCES
+        tools/qvector_msvc.cpp
+    NO_PCH_SOURCES
+        "tools/qvector_msvc.cpp"
+)
+
+qt_extend_target(Core CONDITION QT_FEATURE_system_zlib
+    LIBRARIES
+        ZLIB::ZLIB
+)
+
+qt_extend_target(Core CONDITION NOT QT_FEATURE_system_zlib
+    SOURCES
+        ../3rdparty/zlib/src/adler32.c
+        ../3rdparty/zlib/src/compress.c
+        ../3rdparty/zlib/src/crc32.c
+        ../3rdparty/zlib/src/deflate.c
+        ../3rdparty/zlib/src/gzclose.c
+        ../3rdparty/zlib/src/gzlib.c
+        ../3rdparty/zlib/src/gzread.c
+        ../3rdparty/zlib/src/gzwrite.c
+        ../3rdparty/zlib/src/infback.c
+        ../3rdparty/zlib/src/inffast.c
+        ../3rdparty/zlib/src/inflate.c
+        ../3rdparty/zlib/src/inftrees.c
+        ../3rdparty/zlib/src/trees.c
+        ../3rdparty/zlib/src/uncompr.c
+        ../3rdparty/zlib/src/zutil.c
+    INCLUDE_DIRECTORIES
+        ../3rdparty/zlib/src
+)
+
+qt_extend_target(Core CONDITION QT_FEATURE_commandlineparser
+    SOURCES
+        tools/qcommandlineoption.cpp tools/qcommandlineoption.h
+        tools/qcommandlineparser.cpp tools/qcommandlineparser.h
+)
+
+qt_extend_target(Core CONDITION QT_FEATURE_easingcurve
+    SOURCES
+        tools/qeasingcurve.cpp tools/qeasingcurve.h
+        tools/qtimeline.cpp tools/qtimeline.h
+)
+
+qt_extend_target(Core CONDITION UNIX AND NOT HAIKU AND NOT INTEGRITY AND NOT VXWORKS AND NOT WASM AND (NOT APPLE_OSX OR NOT ICC)
+    LIBRARIES
+        m
+)
+
+qt_extend_target(Core CONDITION APPLE AND NOT NACL
+    SOURCES
+        kernel/qelapsedtimer_mac.cpp
+        text/qlocale_mac.mm
+)
+
+qt_extend_target(Core CONDITION UNIX AND (NACL OR NOT APPLE)
+    SOURCES
+        text/qlocale_unix.cpp
+)
+
+qt_extend_target(Core CONDITION WIN32 AND (NACL OR NOT APPLE)
+    SOURCES
+        text/qlocale_win.cpp
+)
+
+qt_extend_target(Core CONDITION QT_FEATURE_icu
+    SOURCES
+        text/qcollator_icu.cpp
+        text/qlocale_icu.cpp
+    LIBRARIES
+        ICU::i18n ICU::uc ICU::data
+)
+
+qt_extend_target(Core CONDITION WIN32 AND NOT QT_FEATURE_icu
+    SOURCES
+        text/qcollator_win.cpp
+)
+
+qt_extend_target(Core CONDITION APPLE_OSX AND NOT QT_FEATURE_icu
+    SOURCES
+        text/qcollator_macx.cpp
+)
+
+qt_extend_target(Core CONDITION UNIX AND NOT APPLE_OSX AND NOT QT_FEATURE_icu
+    SOURCES
+        text/qcollator_posix.cpp
+)
+
+qt_extend_target(Core CONDITION QT_FEATURE_regularexpression
+    SOURCES
+        text/qregularexpression.cpp text/qregularexpression.h
+    LIBRARIES
+        WrapPCRE2::WrapPCRE2
+)
+
+qt_extend_target(Core CONDITION QT_FEATURE_hijricalendar
+    SOURCES
+        time/qhijricalendar.cpp time/qhijricalendar_p.h
+        time/qhijricalendar_data_p.h
+)
+
+qt_extend_target(Core CONDITION QT_FEATURE_islamiccivilcalendar
+    SOURCES
+        time/qislamiccivilcalendar.cpp time/qislamiccivilcalendar_p.h
+)
+
+qt_extend_target(Core CONDITION QT_FEATURE_jalalicalendar
+    SOURCES
+        time/qjalalicalendar.cpp time/qjalalicalendar_p.h
+        time/qjalalicalendar_data_p.h
+)
+
+qt_extend_target(Core CONDITION QT_FEATURE_timezone
+    SOURCES
+        time/qtimezone.cpp time/qtimezone.h
+        time/qtimezoneprivate.cpp time/qtimezoneprivate_p.h
+        time/qtimezoneprivate_data_p.h
+)
+
+qt_extend_target(Core CONDITION APPLE AND QT_FEATURE_timezone AND NOT NACL
+    SOURCES
+        time/qtimezoneprivate_mac.mm
+)
+
+qt_extend_target(Core CONDITION ANDROID AND QT_FEATURE_timezone AND NOT ANDROID_EMBEDDED AND (NACL OR NOT APPLE)
+    SOURCES
+        time/qtimezoneprivate_android.cpp
+)
+
+qt_extend_target(Core CONDITION QT_FEATURE_timezone AND UNIX AND (ANDROID_EMBEDDED OR NOT ANDROID) AND (NACL OR NOT APPLE)
+    SOURCES
+        time/qtimezoneprivate_tz.cpp
+)
+
+qt_extend_target(Core CONDITION QT_FEATURE_icu AND QT_FEATURE_timezone AND UNIX AND (ANDROID_EMBEDDED OR NOT ANDROID) AND (NACL OR NOT APPLE)
+    SOURCES
+        time/qtimezoneprivate_icu.cpp
+)
+
+qt_extend_target(Core CONDITION QT_FEATURE_icu AND QT_FEATURE_timezone AND WIN32 AND (ANDROID_EMBEDDED OR NOT ANDROID) AND (NACL OR NOT APPLE)
+    SOURCES
+        time/qtimezoneprivate_icu.cpp
+)
+
+qt_extend_target(Core CONDITION QT_FEATURE_timezone AND WIN32 AND NOT QT_FEATURE_icu AND (ANDROID_EMBEDDED OR NOT ANDROID) AND (NACL OR NOT APPLE)
+    SOURCES
+        time/qtimezoneprivate_win.cpp
+)
+
+qt_extend_target(Core CONDITION QT_FEATURE_datetimeparser
+    SOURCES
+        time/qdatetimeparser.cpp time/qdatetimeparser_p.h
+)
+
+qt_extend_target(Core CONDITION QT_FEATURE_zstd
+    LIBRARIES
+        ZSTD::ZSTD
+)
+
+qt_extend_target(Core CONDITION QT_FEATURE_filesystemwatcher
+    SOURCES
+        io/qfilesystemwatcher.cpp io/qfilesystemwatcher.h io/qfilesystemwatcher_p.h
+        io/qfilesystemwatcher_polling.cpp io/qfilesystemwatcher_polling_p.h
+)
+
+qt_extend_target(Core CONDITION QT_FEATURE_filesystemwatcher AND WIN32
+    SOURCES
+        io/qfilesystemwatcher_win.cpp io/qfilesystemwatcher_win_p.h
+)
+
+qt_extend_target(Core CONDITION APPLE_OSX AND QT_FEATURE_filesystemwatcher
+    SOURCES
+        io/qfilesystemwatcher_fsevents.mm io/qfilesystemwatcher_fsevents_p.h
+)
+
+qt_extend_target(Core CONDITION QT_FEATURE_filesystemwatcher AND QT_FEATURE_inotify AND UNIX AND NOT APPLE_OSX
+    SOURCES
+        io/qfilesystemwatcher_inotify.cpp io/qfilesystemwatcher_inotify_p.h
+)
+
+qt_extend_target(Core CONDITION QT_FEATURE_filesystemwatcher AND UNIX AND NOT APPLE_OSX AND NOT QT_FEATURE_inotify AND (APPLE OR FREEBSD OR NETBSD OR OPENBSD)
+    SOURCES
+        io/qfilesystemwatcher_kqueue.cpp io/qfilesystemwatcher_kqueue_p.h
+)
+
+qt_extend_target(Core CONDITION QT_FEATURE_processenvironment
+    SOURCES
+        io/qprocess.cpp io/qprocess.h io/qprocess_p.h
+)
+
+qt_extend_target(Core CONDITION QT_FEATURE_processenvironment AND WIN32 AND NOT WINRT
+    SOURCES
+        io/qprocess_win.cpp
+)
+
+qt_extend_target(Core CONDITION QT_FEATURE_processenvironment AND UNIX
+    SOURCES
+        io/qprocess_unix.cpp
+)
+
+qt_extend_target(Core CONDITION QT_FEATURE_settings
+    SOURCES
+        io/qsettings.cpp io/qsettings.h io/qsettings_p.h
+)
+
+qt_extend_target(Core CONDITION QT_FEATURE_settings AND WIN32 AND NOT WINRT
+    SOURCES
+        io/qsettings_win.cpp
+)
+
+qt_extend_target(Core CONDITION QT_FEATURE_settings AND WINRT
+    SOURCES
+        io/qsettings_winrt.cpp
+)
+
+qt_extend_target(Core CONDITION APPLE AND QT_FEATURE_settings AND NOT NACL
+    SOURCES
+        io/qsettings_mac.cpp
+)
+
+qt_extend_target(Core CONDITION QT_FEATURE_settings AND WASM
+    SOURCES
+        io/qsettings_wasm.cpp
+)
+
+qt_extend_target(Core CONDITION QT_FEATURE_filesystemiterator AND WIN32
+    SOURCES
+        io/qfilesystemiterator_win.cpp
+)
+
+qt_extend_target(Core CONDITION WINRT
+    SOURCES
+        io/qstandardpaths_winrt.cpp
+        io/qstorageinfo_stub.cpp
+        kernel/qeventdispatcher_winrt.cpp kernel/qeventdispatcher_winrt_p.h
+        kernel/qfunctions_fake_env_p.h
+        kernel/qfunctions_winrt.cpp kernel/qfunctions_winrt.h
+)
+
+qt_extend_target(Core CONDITION QT_FEATURE_process AND UNIX
+    SOURCES
+        ../3rdparty/forkfd/forkfd.h
+        io/forkfd_qt.cpp
+    INCLUDE_DIRECTORIES
+        ../3rdparty/forkfd
+)
+
+qt_extend_target(Core CONDITION APPLE AND QT_FEATURE_processenvironment
+    SOURCES
+        io/qprocess_darwin.mm
+)
+
+qt_extend_target(Core CONDITION APPLE AND NOT APPLE_OSX
+    PUBLIC_LIBRARIES
+        ${FWMobileCoreServices}
+)
+
+qt_extend_target(Core CONDITION ANDROID AND NOT ANDROID_EMBEDDED
+    SOURCES
+        io/qstandardpaths_android.cpp
+        io/qstorageinfo_unix.cpp
+        kernel/qjni.cpp kernel/qjni_p.h
+        kernel/qjnihelpers.cpp kernel/qjnihelpers_p.h
+        kernel/qjnionload.cpp
+)
+
+qt_extend_target(Core CONDITION HAIKU AND (ANDROID_EMBEDDED OR NOT ANDROID)
+    SOURCES
+        io/qstandardpaths_haiku.cpp
+        io/qstorageinfo_unix.cpp
+    PUBLIC_LIBRARIES
+        be
+)
+
+qt_extend_target(Core CONDITION UNIX AND NOT APPLE AND NOT HAIKU AND (ANDROID_EMBEDDED OR NOT ANDROID)
+    SOURCES
+        io/qstandardpaths_unix.cpp
+        io/qstorageinfo_unix.cpp
+)
+
+qt_extend_target(Core CONDITION QT_FEATURE_proxymodel
+    SOURCES
+        itemmodels/qabstractproxymodel.cpp itemmodels/qabstractproxymodel.h itemmodels/qabstractproxymodel_p.h
+)
+
+qt_extend_target(Core CONDITION QT_FEATURE_concatenatetablesproxymodel AND QT_FEATURE_proxymodel
+    SOURCES
+        itemmodels/qconcatenatetablesproxymodel.cpp itemmodels/qconcatenatetablesproxymodel.h
+)
+
+qt_extend_target(Core CONDITION QT_FEATURE_identityproxymodel AND QT_FEATURE_proxymodel
+    SOURCES
+        itemmodels/qidentityproxymodel.cpp itemmodels/qidentityproxymodel.h
+)
+
+qt_extend_target(Core CONDITION QT_FEATURE_proxymodel AND QT_FEATURE_sortfilterproxymodel
+    SOURCES
+        itemmodels/qsortfilterproxymodel.cpp itemmodels/qsortfilterproxymodel.h
+)
+
+qt_extend_target(Core CONDITION QT_FEATURE_proxymodel AND QT_FEATURE_transposeproxymodel
+    SOURCES
+        itemmodels/qtransposeproxymodel.cpp itemmodels/qtransposeproxymodel.h itemmodels/qtransposeproxymodel_p.h
+)
+
+qt_extend_target(Core CONDITION QT_FEATURE_stringlistmodel
+    SOURCES
+        itemmodels/qstringlistmodel.cpp itemmodels/qstringlistmodel.h
+)
+
+qt_extend_target(Core CONDITION QT_FEATURE_library
+    SOURCES
+        plugin/qelfparser_p.cpp plugin/qelfparser_p.h
+        plugin/qlibrary.cpp plugin/qlibrary.h plugin/qlibrary_p.h
+        plugin/qmachparser.cpp plugin/qmachparser_p.h
+)
+
+qt_extend_target(Core CONDITION QT_FEATURE_library AND UNIX
+    SOURCES
+        plugin/qlibrary_unix.cpp
+)
+
+qt_extend_target(Core CONDITION QT_FEATURE_library AND WIN32
+    SOURCES
+        plugin/qlibrary_win.cpp
+)
+
+qt_extend_target(Core CONDITION QT_FEATURE_dlopen AND QT_FEATURE_library
+    LIBRARIES
+        ${CMAKE_DL_LIBS}
+)
+
+qt_extend_target(Core CONDITION APPLE AND (APPLE_IOS OR APPLE_TVOS)
+    LIBRARIES
+        ${FWUIKit}
+)
+
+qt_extend_target(Core CONDITION APPLE_WATCHOS
+    LIBRARIES
+        ${FWWatchKit}
+)
+
+qt_extend_target(Core CONDITION NACL
+    SOURCES
+        kernel/qfunctions_nacl.cpp kernel/qfunctions_nacl.h
+)
+
+qt_extend_target(Core CONDITION INTEGRITY OR (NACL AND UNIX) OR (UNIX AND NOT APPLE)
+    SOURCES
+        kernel/qelapsedtimer_unix.cpp
+)
+
+qt_extend_target(Core CONDITION QT_FEATURE_poll_select AND UNIX
+    SOURCES
+        kernel/qpoll.cpp
+)
+
+qt_extend_target(Core CONDITION QT_FEATURE_glib AND UNIX
+    SOURCES
+        kernel/qeventdispatcher_glib.cpp kernel/qeventdispatcher_glib_p.h
+    LIBRARIES
+        GLIB2::GLIB2
+)
+
+qt_extend_target(Core CONDITION QT_FEATURE_clock_gettime AND UNIX
+    LIBRARIES
+        WrapRt
+)
+
+qt_extend_target(Core CONDITION UNIX AND NOT ANDROID
+    SOURCES
+        kernel/qsharedmemory_posix.cpp
+        kernel/qsharedmemory_systemv.cpp
+        kernel/qsharedmemory_unix.cpp
+        kernel/qsystemsemaphore_posix.cpp
+        kernel/qsystemsemaphore_systemv.cpp
+        kernel/qsystemsemaphore_unix.cpp
+)
+
+qt_extend_target(Core CONDITION VXWORKS
+    SOURCES
+        kernel/qfunctions_vxworks.cpp kernel/qfunctions_vxworks.h
+)
+
+qt_extend_target(Core CONDITION QNX AND QT_FEATURE_qqnx_pps
+    SOURCES
+        kernel/qppsattribute.cpp kernel/qppsattribute_p.h
+        kernel/qppsattributeprivate_p.h
+        kernel/qppsobject.cpp kernel/qppsobject_p.h
+        kernel/qppsobjectprivate_p.h
+    LIBRARIES
+        PPS::PPS
+)
+
+qt_extend_target(Core CONDITION QT_FEATURE_textcodec
+    SOURCES
+        codecs/qlatincodec.cpp codecs/qlatincodec_p.h
+        codecs/qsimplecodec.cpp codecs/qsimplecodec_p.h
+        codecs/qtextcodec.cpp codecs/qtextcodec.h
+)
+
+qt_extend_target(Core CONDITION QT_FEATURE_codecs AND QT_FEATURE_textcodec
+    SOURCES
+        codecs/qisciicodec.cpp codecs/qisciicodec_p.h
+        codecs/qtsciicodec.cpp codecs/qtsciicodec_p.h
+)
+
+qt_extend_target(Core CONDITION QT_FEATURE_icu AND QT_FEATURE_textcodec
+    SOURCES
+        codecs/qicucodec.cpp codecs/qicucodec_p.h
+)
+
+qt_extend_target(Core CONDITION QT_FEATURE_big_codecs AND QT_FEATURE_textcodec AND NOT QT_FEATURE_icu
+    SOURCES
+        codecs/qbig5codec.cpp codecs/qbig5codec_p.h
+        codecs/qeucjpcodec.cpp codecs/qeucjpcodec_p.h
+        codecs/qeuckrcodec.cpp codecs/qeuckrcodec_p.h
+        codecs/qgb18030codec.cpp codecs/qgb18030codec_p.h
+        codecs/qjiscodec.cpp codecs/qjiscodec_p.h
+        codecs/qjpunicode.cpp
+        codecs/qsjiscodec.cpp codecs/qsjiscodec_p.h
+)
+
+qt_extend_target(Core CONDITION QT_FEATURE_iconv AND QT_FEATURE_textcodec AND NOT QT_FEATURE_icu
+    SOURCES
+        codecs/qiconvcodec.cpp codecs/qiconvcodec_p.h
+    LIBRARIES
+        iconv
+)
+
+qt_extend_target(Core CONDITION QT_FEATURE_textcodec AND WIN32 AND NOT QT_FEATURE_icu
+    SOURCES
+        codecs/qwindowscodec.cpp codecs/qwindowscodec_p.h
+)
+
+qt_extend_target(Core CONDITION QT_FEATURE_cborstreamreader
+    SOURCES
+        serialization/qcborstreamreader.cpp serialization/qcborstreamreader.h
+)
+
+qt_extend_target(Core CONDITION QT_FEATURE_cborstreamwriter
+    SOURCES
+        serialization/qcborstreamwriter.cpp serialization/qcborstreamwriter.h
+)
+
+qt_extend_target(Core CONDITION QT_FEATURE_binaryjson
+    SOURCES
+        serialization/qbinaryjson.cpp serialization/qbinaryjson_p.h
+        serialization/qbinaryjsonarray.cpp serialization/qbinaryjsonarray_p.h
+        serialization/qbinaryjsonobject.cpp serialization/qbinaryjsonobject_p.h
+        serialization/qbinaryjsonvalue.cpp serialization/qbinaryjsonvalue_p.h
+)
+
+qt_extend_target(Core CONDITION QT_FEATURE_qeventtransition
+    SOURCES
+        statemachine/qeventtransition.cpp statemachine/qeventtransition.h statemachine/qeventtransition_p.h
+)
+
+qt_extend_target(Core CONDITION QT_FEATURE_mimetype
+    SOURCES
+        mimetypes/qmimedatabase.cpp mimetypes/qmimedatabase.h mimetypes/qmimedatabase_p.h
+        mimetypes/qmimeglobpattern.cpp mimetypes/qmimeglobpattern_p.h
+        mimetypes/qmimemagicrule.cpp mimetypes/qmimemagicrule_p.h
+        mimetypes/qmimemagicrulematcher.cpp mimetypes/qmimemagicrulematcher_p.h
+        mimetypes/qmimeprovider.cpp mimetypes/qmimeprovider_p.h
+        mimetypes/qmimetype.cpp mimetypes/qmimetype.h mimetypes/qmimetype_p.h
+        mimetypes/qmimetypeparser.cpp mimetypes/qmimetypeparser_p.h
+)
+
+#### Keys ignored in scope 197:.:mimetypes:mimetypes/mimetypes.pri:QT_FEATURE_mimetype:
+# MIME_DATABASE = "mimetypes/mime/packages/freedesktop.org.xml"
+# OTHER_FILES = "$$MIME_DATABASE"
+
+# special case begin
+# qt_extend_target(Core CONDITION QT_FEATURE_mimetype AND QT_FEATURE_mimetype_database
+#        INCLUDE_DIRECTORIES
+#        .rcc
+#)
+# special case end
+
+#### Keys ignored in scope 198:.:mimetypes:mimetypes/mimetypes.pri:QT_FEATURE_mimetype_database:
+# QMAKE_EXTRA_COMPILERS = "mimedb"
+# mimedb.commands = "${QMAKE_FILE_IN}" ">" "${QMAKE_FILE_OUT}"
+# mimedb.depends = "$$PWD/mime/generate.pl"
+# mimedb.input = "MIME_DATABASE"
+# mimedb.output = "$$outpath/qmimeprovider_database.cpp"
+# mimedb.variable_out = "INCLUDED_SOURCES"
+
+#### Keys ignored in scope 200:.:mimetypes:mimetypes/mimetypes.pri:(CMAKE_BUILD_TYPE STREQUAL Debug):
+# outpath = ".rcc/debug"
+
+#### Keys ignored in scope 201:.:mimetypes:mimetypes/mimetypes.pri:else:
+# outpath = ".rcc/release"
+
+#### Keys ignored in scope 202:.:mimetypes:mimetypes/mimetypes.pri:MAKEFILE_GENERATOR___equals___MSVC.NET OR MAKEFILE_GENERATOR___equals___MSBUILD OR QMAKE_SH_ISEMPTY:
+# mimedb.commands = "cmd" "/c" "$$shell_path($$PWD/mime/generate.bat)"
+# mimedb.depends = "$$PWD/mime/generate.bat" "$$PWD/mime/hexdump.ps1"
+
+#### Keys ignored in scope 203:.:mimetypes:mimetypes/mimetypes.pri:else:
+# mimedb.commands = "perl" "$${mimedb.depends}"
+
+#### Keys ignored in scope 204:.:mimetypes:mimetypes/mimetypes.pri:QT_FEATURE_zstd:
+# mimedb.commands = "--zstd"
+# Resources:
+# special case begin
+# We can't specify the resources directly as we have unit tests that
+# depend on these as well and we no longer support the use of hand
+# edited qrc files.
+if(QT_FEATURE_mimetype AND QT_FEATURE_mimetype_database)
+    include(${CMAKE_CURRENT_SOURCE_DIR}/mimetypes/mimetypes_resources.cmake)
+    corelib_add_mimetypes_resources(Core)
+
+# Generate qmimeprovider_database.cpp
+    set(qmimeprovider_db_output "${CMAKE_CURRENT_BINARY_DIR}/.rcc/qmimeprovider_database.cpp")
+    set(command_args "")
+    set(mime_dir "${CMAKE_CURRENT_SOURCE_DIR}/mimetypes/mime")
+    set(command_depends "${mime_dir}/generate.pl" "${corelib_mimetypes_resource_file}")
+    if (MSVC)
+        list(APPEND command_args "${mime_dir}/generate.bat")
+        list(APPEND command_depends "${mime_dir}/generate.bat" "${mime_dir}/hexdump.ps1" )
+    else()
+        list(APPEND command_args perl "${mime_dir}/generate.pl" )
+    endif()
+
+    if (QT_FEATURE_zstd)
+        list(APPEND command_args "--zstd")
+    endif()
+
+    list(APPEND command_args "${corelib_mimetypes_resource_file}" ">" "${qmimeprovider_db_output}")
+
+    add_custom_command(OUTPUT "${qmimeprovider_db_output}"
+         DEPENDS ${command_depends}
+         COMMAND ${command_args}
+         COMMENT "Generating ${qmimeprovider_db_output}"
+    )
+
+    target_sources(Core PRIVATE ${qmimeprovider_db_output})
+    set_source_files_properties(${qmimeprovider_db_output} PROPERTIES HEADER_FILE_ONLY TRUE)
+    target_include_directories(Core PRIVATE "${CMAKE_CURRENT_BINARY_DIR}/.rcc")
+endif()
+
+# special case end
+
+qt_extend_target(Core CONDITION WASM
+    SOURCES
+        platform/wasm/qstdweb.cpp platform/wasm/qstdweb_p.h
+)
+
+# special case begin
+# needs refinement for the other compiler specific cases.
+if(TEST_arch_${TEST_architecture_arch}_subarch_f16c)
+    # Equivalent to contains(QT_CPU_FEATURES.$$QT_ARCH, f16c)
+    extend_target(Core
+        DEFINES
+            QFLOAT16_INCLUDE_FAST
+    )
+else()
+    qt_add_simd_part(Core SIMD f16c
+        SOURCES
+            global/qfloat16_f16c.c
+    )
+endif()
+
+set_source_files_properties(
+    thread/qmutex_linux.cpp
+    thread/qmutex_mac.cpp
+    thread/qmutex_unix.cpp
+    thread/qmutex_win.cpp
+    PROPERTIES HEADER_FILE_ONLY ON)  # special case: These files are included by qmutex.cpp!
+
+
+# Remove QT_NO_CAST_TO_ASCII to ensure that the symbols are included in the library.
+if(WIN32)
+    get_target_property(defines Core COMPILE_DEFINITIONS)
+    list(REMOVE_ITEM defines QT_NO_CAST_TO_ASCII)
+    set_target_properties(Core PROPERTIES COMPILE_DEFINITIONS "${defines}")
+endif()
+
+qt_internal_add_link_flags_gc_sections(Core PRIVATE)
+
+if(WIN32)
+    set(isExe $<STREQUAL:$<TARGET_PROPERTY:TYPE>,EXECUTABLE>)
+    set(isWin32 $<BOOL:$<TARGET_PROPERTY:WIN32_EXECUTABLE>>)
+    set(isNotExcluded $<NOT:$<BOOL:$<TARGET_PROPERTY:Qt5_NO_LINK_QTMAIN>>>)
+    set(isPolicyNEW $<TARGET_POLICY:CMP0020>)
+
+    target_link_libraries(Core INTERFACE $<$<AND:${isExe},${isWin32},${isNotExcluded},${isPolicyNEW}>:Qt::WinMain>)
+    qt_record_extra_qt_package_dependency(Core WinMain "${PROJECT_VERSION}")
+endif()
+# special case end
+
+qt_create_tracepoints(Core qtcore.tracepoints)
+qt_add_docs(Core
+    doc/qtcore.qdocconf
+)
+
+# special case begin
+# Handle qtzlib.pro to create headers for the
+# QtZlibPrivate target, equivalent to Qt += zlib-private
+if(NOT QT_FEATURE_system_zlib)
+    qt_add_module(Zlib
+        INTERNAL_MODULE
+        HEADER_MODULE
+        NO_CONFIG_HEADER_FILE
+    )
+endif()
+# special case end
diff --git a/src/corelib/Qt5CoreConfigExtras.cmake.in b/src/corelib/Qt5CoreConfigExtras.cmake.in
deleted file mode 100644
index 4c1c3a612b..0000000000
--- a/src/corelib/Qt5CoreConfigExtras.cmake.in
+++ /dev/null
@@ -1,203 +0,0 @@
-if(NOT DEFINED QT_DEFAULT_MAJOR_VERSION)
-    set(QT_DEFAULT_MAJOR_VERSION 5)
-endif()
-
-if (NOT TARGET Qt5::qmake)
-    add_executable(Qt5::qmake IMPORTED)
-
-!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
-    set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\")
-!!ELSE
-    set(imported_location \"$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\")
-!!ENDIF
-    _qt5_Core_check_file_exists(${imported_location})
-
-    set_target_properties(Qt5::qmake PROPERTIES
-        IMPORTED_LOCATION ${imported_location}
-    )
-endif()
-
-if (NOT TARGET Qt5::moc)
-    add_executable(Qt5::moc IMPORTED)
-
-!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
-    set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\")
-!!ELSE
-    set(imported_location \"$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\")
-!!ENDIF
-    _qt5_Core_check_file_exists(${imported_location})
-
-    set_target_properties(Qt5::moc PROPERTIES
-        IMPORTED_LOCATION ${imported_location}
-    )
-    # For CMake automoc feature
-    get_target_property(QT_MOC_EXECUTABLE Qt5::moc LOCATION)
-endif()
-
-if (NOT TARGET Qt5::rcc)
-    add_executable(Qt5::rcc IMPORTED)
-
-!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
-    set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\")
-!!ELSE
-    set(imported_location \"$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\")
-!!ENDIF
-    _qt5_Core_check_file_exists(${imported_location})
-
-    set_target_properties(Qt5::rcc PROPERTIES
-        IMPORTED_LOCATION ${imported_location}
-    )
-endif()
-
-set(CMAKE_AUTOMOC_MACRO_NAMES "Q_OBJECT" "Q_GADGET" "Q_NAMESPACE" "Q_NAMESPACE_EXPORT")
-
-set(Qt5Core_QMAKE_EXECUTABLE Qt5::qmake)
-set(Qt5Core_MOC_EXECUTABLE Qt5::moc)
-set(Qt5Core_RCC_EXECUTABLE Qt5::rcc)
-
-set_property(TARGET Qt5::Core PROPERTY INTERFACE_QT_MAJOR_VERSION 5)
-set_property(TARGET Qt5::Core PROPERTY INTERFACE_QT_COORD_TYPE $$QT_COORD_TYPE)
-set_property(TARGET Qt5::Core APPEND PROPERTY
-  COMPATIBLE_INTERFACE_STRING QT_MAJOR_VERSION QT_COORD_TYPE
-)
-
-include(\"${CMAKE_CURRENT_LIST_DIR}/Qt5CoreConfigExtrasMkspecDir.cmake\")
-
-foreach(_dir ${_qt5_corelib_extra_includes})
-    _qt5_Core_check_file_exists(${_dir})
-endforeach()
-
-list(APPEND Qt5Core_INCLUDE_DIRS ${_qt5_corelib_extra_includes})
-set_property(TARGET Qt5::Core APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${_qt5_corelib_extra_includes})
-set(_qt5_corelib_extra_includes)
-
-# Targets using Qt need to use the POSITION_INDEPENDENT_CODE property. The
-# Qt5_POSITION_INDEPENDENT_CODE variable is used in the # qt5_use_module
-# macro to add it.
-set(Qt5_POSITION_INDEPENDENT_CODE True)
-
-# On x86 and x86-64 systems with ELF binaries (especially Linux), due to
-# a new optimization in GCC 5.x in combination with a recent version of
-# GNU binutils, compiling Qt applications with -fPIE is no longer
-# enough.
-# Applications now need to be compiled with the -fPIC option if the Qt option
-# \"reduce relocations\" is active. For backward compatibility only, Qt accepts
-# the use of -fPIE for GCC 4.x versions.
-set_property(TARGET Qt5::Core APPEND PROPERTY INTERFACE_COMPILE_OPTIONS $$QMAKE_CXXFLAGS_APP)
-
-# TODO Qt6: Remove
-set(Qt5Core_EXECUTABLE_COMPILE_FLAGS \"\")
-
-!!IF !isEmpty(QT_NAMESPACE)
-list(APPEND Qt5Core_DEFINITIONS -DQT_NAMESPACE=$$QT_NAMESPACE)
-list(APPEND Qt5Core_COMPILE_DEFINITIONS QT_NAMESPACE=$$QT_NAMESPACE)
-set_property(TARGET Qt5::Core APPEND PROPERTY INTERFACE_COMPILE_DEFINITIONS QT_NAMESPACE=$$QT_NAMESPACE)
-!!ENDIF
-
-!!IF !isEmpty(CMAKE_DISABLED_FEATURES)
-set(Qt5_DISABLED_FEATURES
-    $$CMAKE_DISABLED_FEATURES
-)
-!!ENDIF
-
-set_property(TARGET Qt5::Core APPEND PROPERTY INTERFACE_COMPILE_DEFINITIONS $<$<NOT:$<CONFIG:Debug>>:QT_NO_DEBUG>)
-
-set_property(TARGET Qt5::Core PROPERTY INTERFACE_COMPILE_FEATURES cxx_decltype)
-
-!!IF qtConfig(reduce_exports)
-set(QT_VISIBILITY_AVAILABLE \"True\")
-!!ENDIF
-
-!!IF !isEmpty(QT_LIBINFIX)
-set(QT_LIBINFIX \"$${QT_LIBINFIX}\")
-!!ENDIF
-
-!!IF !isEmpty(CMAKE_WINDOWS_BUILD)
-set(Qt5Core_QTMAIN_LIBRARIES Qt5::WinMain)
-
-if (NOT TARGET Qt5::WinMain)
-    add_library(Qt5::WinMain STATIC IMPORTED)
-
-!!IF !isEmpty(CMAKE_RELEASE_TYPE)
-    set_property(TARGET Qt5::WinMain APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
-!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
-    set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_RELEASE}\")
-!!ELSE
-    set(imported_location \"$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_RELEASE}\")
-!!ENDIF
-
-    set_target_properties(Qt5::WinMain PROPERTIES
-        IMPORTED_LOCATION_RELEASE ${imported_location}
-    )
-!!ENDIF
-
-!!IF !isEmpty(CMAKE_DEBUG_TYPE)
-    set_property(TARGET Qt5::WinMain APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG)
-
-!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
-    set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\")
-!!ELSE
-    set(imported_location \"$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\")
-!!ENDIF
-
-    set_target_properties(Qt5::WinMain PROPERTIES
-        IMPORTED_LOCATION_DEBUG ${imported_location}
-    )
-!!ENDIF
-
-    if (NOT Qt5_NO_LINK_QTMAIN)
-        set(_isExe $<STREQUAL:$<TARGET_PROPERTY:TYPE>,EXECUTABLE>)
-        set(_isWin32 $<BOOL:$<TARGET_PROPERTY:WIN32_EXECUTABLE>>)
-        set(_isNotExcluded $<NOT:$<BOOL:$<TARGET_PROPERTY:Qt5_NO_LINK_QTMAIN>>>)
-        set(_isPolicyNEW $<TARGET_POLICY:CMP0020>)
-        get_target_property(_configs Qt5::Core IMPORTED_CONFIGURATIONS)
-        set_property(TARGET Qt5::Core APPEND PROPERTY
-            INTERFACE_LINK_LIBRARIES
-                $<$<AND:${_isExe},${_isWin32},${_isNotExcluded},${_isPolicyNEW}>:Qt5::WinMain>
-        )
-        # For backward compatibility with CMake < 2.8.12
-        foreach(_config ${_configs})
-            set_property(TARGET Qt5::Core APPEND PROPERTY
-                IMPORTED_LINK_INTERFACE_LIBRARIES_${_config}
-                    $<$<AND:${_isExe},${_isWin32},${_isNotExcluded},${_isPolicyNEW}>:Qt5::WinMain>
-            )
-        endforeach()
-        unset(_configs)
-        unset(_isExe)
-        unset(_isWin32)
-        unset(_isNotExcluded)
-        unset(_isPolicyNEW)
-    endif()
-endif()
-!!ENDIF
-
-get_filename_component(_Qt5CoreConfigDir ${CMAKE_CURRENT_LIST_FILE} PATH)
-
-set(_Qt5CTestMacros \"${_Qt5CoreConfigDir}/Qt5CTestMacros.cmake\")
-
-if (ANDROID_PLATFORM)
-    include(\"${CMAKE_CURRENT_LIST_DIR}/Qt5AndroidSupport.cmake\")
-endif()
-
-_qt5_Core_check_file_exists(${_Qt5CTestMacros})
-
-# Create versionless tool targets.
-foreach(__qt_tool qmake moc rcc)
-    if(NOT \"${QT_NO_CREATE_VERSIONLESS_TARGETS}\" AND NOT TARGET Qt::${__qt_tool}
-       AND TARGET Qt5::${__qt_tool})
-        add_executable(Qt::${__qt_tool} IMPORTED)
-        get_target_property(__qt_imported_location Qt5::${__qt_tool} IMPORTED_LOCATION)
-        set_target_properties(Qt::${__qt_tool}
-                              PROPERTIES IMPORTED_LOCATION \"${__qt_imported_location}\")
-    endif()
-endforeach()
-
-!!IF !isEmpty(CMAKE_WINDOWS_BUILD)
-# Add a versionless target for WinMain.
-if(NOT \"${QT_NO_CREATE_VERSIONLESS_TARGETS}\" AND NOT TARGET Qt::WinMain)
-    add_library(Qt::WinMain INTERFACE IMPORTED)
-    set_target_properties(Qt::WinMain PROPERTIES
-        INTERFACE_LINK_LIBRARIES \"Qt5::WinMain\"
-    )
-endif()
-!!ENDIF
diff --git a/src/corelib/Qt5CoreMacros.cmake b/src/corelib/Qt5CoreMacros.cmake
deleted file mode 100644
index f666c67ed9..0000000000
--- a/src/corelib/Qt5CoreMacros.cmake
+++ /dev/null
@@ -1,493 +0,0 @@
-#=============================================================================
-# Copyright 2005-2011 Kitware, Inc.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# * Redistributions of source code must retain the above copyright
-#   notice, this list of conditions and the following disclaimer.
-#
-# * Redistributions in binary form must reproduce the above copyright
-#   notice, this list of conditions and the following disclaimer in the
-#   documentation and/or other materials provided with the distribution.
-#
-# * Neither the name of Kitware, Inc. nor the names of its
-#   contributors may be used to endorse or promote products derived
-#   from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#=============================================================================
-
-######################################
-#
-#       Macros for building Qt files
-#
-######################################
-
-include(CMakeParseArguments)
-
-# macro used to create the names of output files preserving relative dirs
-macro(qt5_make_output_file infile prefix ext outfile )
-    string(LENGTH ${CMAKE_CURRENT_BINARY_DIR} _binlength)
-    string(LENGTH ${infile} _infileLength)
-    set(_checkinfile ${CMAKE_CURRENT_SOURCE_DIR})
-    if(_infileLength GREATER _binlength)
-        string(SUBSTRING "${infile}" 0 ${_binlength} _checkinfile)
-        if(_checkinfile STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
-            file(RELATIVE_PATH rel ${CMAKE_CURRENT_BINARY_DIR} ${infile})
-        else()
-            file(RELATIVE_PATH rel ${CMAKE_CURRENT_SOURCE_DIR} ${infile})
-        endif()
-    else()
-        file(RELATIVE_PATH rel ${CMAKE_CURRENT_SOURCE_DIR} ${infile})
-    endif()
-    if(WIN32 AND rel MATCHES "^([a-zA-Z]):(.*)$") # absolute path
-        set(rel "${CMAKE_MATCH_1}_${CMAKE_MATCH_2}")
-    endif()
-    set(_outfile "${CMAKE_CURRENT_BINARY_DIR}/${rel}")
-    string(REPLACE ".." "__" _outfile ${_outfile})
-    get_filename_component(outpath ${_outfile} PATH)
-    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()
-
-
-macro(qt5_get_moc_flags _moc_flags)
-    set(${_moc_flags})
-    get_directory_property(_inc_DIRS INCLUDE_DIRECTORIES)
-
-    if(CMAKE_INCLUDE_CURRENT_DIR)
-        list(APPEND _inc_DIRS ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
-    endif()
-
-    foreach(_current ${_inc_DIRS})
-        if("${_current}" MATCHES "\\.framework/?$")
-            string(REGEX REPLACE "/[^/]+\\.framework" "" framework_path "${_current}")
-            set(${_moc_flags} ${${_moc_flags}} "-F${framework_path}")
-        else()
-            set(${_moc_flags} ${${_moc_flags}} "-I${_current}")
-        endif()
-    endforeach()
-
-    get_directory_property(_defines COMPILE_DEFINITIONS)
-    foreach(_current ${_defines})
-        set(${_moc_flags} ${${_moc_flags}} "-D${_current}")
-    endforeach()
-
-    if(WIN32)
-        set(${_moc_flags} ${${_moc_flags}} -DWIN32)
-    endif()
-    if (MSVC)
-        set(${_moc_flags} ${${_moc_flags}} --compiler-flavor=msvc)
-    endif()
-endmacro()
-
-
-# helper macro to set up a moc rule
-function(qt5_create_moc_command infile outfile moc_flags moc_options moc_target moc_depends)
-    # Pass the parameters in a file.  Set the working directory to
-    # be that containing the parameters file and reference it by
-    # just the file name.  This is necessary because the moc tool on
-    # MinGW builds does not seem to handle spaces in the path to the
-    # file given with the @ syntax.
-    get_filename_component(_moc_outfile_name "${outfile}" NAME)
-    get_filename_component(_moc_outfile_dir "${outfile}" PATH)
-    if(_moc_outfile_dir)
-        set(_moc_working_dir WORKING_DIRECTORY ${_moc_outfile_dir})
-    endif()
-    set (_moc_parameters_file ${outfile}_parameters)
-    set (_moc_parameters ${moc_flags} ${moc_options} -o "${outfile}" "${infile}")
-    string (REPLACE ";" "\n" _moc_parameters "${_moc_parameters}")
-
-    if(moc_target)
-        set(_moc_parameters_file ${_moc_parameters_file}$<$<BOOL:$<CONFIGURATION>>:_$<CONFIGURATION>>)
-        set(targetincludes "$<TARGET_PROPERTY:${moc_target},INCLUDE_DIRECTORIES>")
-        set(targetdefines "$<TARGET_PROPERTY:${moc_target},COMPILE_DEFINITIONS>")
-
-        set(targetincludes "$<$<BOOL:${targetincludes}>:-I$<JOIN:${targetincludes},\n-I>\n>")
-        set(targetdefines "$<$<BOOL:${targetdefines}>:-D$<JOIN:${targetdefines},\n-D>\n>")
-
-        file (GENERATE
-            OUTPUT ${_moc_parameters_file}
-            CONTENT "${targetdefines}${targetincludes}${_moc_parameters}\n"
-        )
-
-        set(targetincludes)
-        set(targetdefines)
-    else()
-        file(WRITE ${_moc_parameters_file} "${_moc_parameters}\n")
-    endif()
-
-    set(_moc_extra_parameters_file @${_moc_parameters_file})
-    add_custom_command(OUTPUT ${outfile}
-                       COMMAND ${Qt5Core_MOC_EXECUTABLE} ${_moc_extra_parameters_file}
-                       DEPENDS ${infile} ${moc_depends}
-                       ${_moc_working_dir}
-                       VERBATIM)
-    set_source_files_properties(${infile} PROPERTIES SKIP_AUTOMOC ON)
-    set_source_files_properties(${outfile} PROPERTIES SKIP_AUTOMOC ON)
-    set_source_files_properties(${outfile} PROPERTIES SKIP_AUTOUIC ON)
-endfunction()
-
-
-function(qt5_generate_moc infile outfile )
-    # get include dirs and flags
-    qt5_get_moc_flags(moc_flags)
-    get_filename_component(abs_infile ${infile} ABSOLUTE)
-    set(_outfile "${outfile}")
-    if(NOT IS_ABSOLUTE "${outfile}")
-        set(_outfile "${CMAKE_CURRENT_BINARY_DIR}/${outfile}")
-    endif()
-    if ("x${ARGV2}" STREQUAL "xTARGET")
-        set(moc_target ${ARGV3})
-    endif()
-    qt5_create_moc_command(${abs_infile} ${_outfile} "${moc_flags}" "" "${moc_target}" "")
-endfunction()
-
-if(NOT QT_NO_CREATE_VERSIONLESS_FUNCTIONS)
-    function(qt_generate_moc)
-        if(QT_DEFAULT_MAJOR_VERSION EQUAL 5)
-            qt5_generate_moc(${ARGV})
-        elseif(QT_DEFAULT_MAJOR_VERSION EQUAL 6)
-            qt6_generate_moc(${ARGV})
-        endif()
-    endfunction()
-endif()
-
-
-# qt5_wrap_cpp(outfiles inputfile ... )
-
-function(qt5_wrap_cpp outfiles )
-    # get include dirs
-    qt5_get_moc_flags(moc_flags)
-
-    set(options)
-    set(oneValueArgs TARGET)
-    set(multiValueArgs OPTIONS DEPENDS)
-
-    cmake_parse_arguments(_WRAP_CPP "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
-
-    set(moc_files ${_WRAP_CPP_UNPARSED_ARGUMENTS})
-    set(moc_options ${_WRAP_CPP_OPTIONS})
-    set(moc_target ${_WRAP_CPP_TARGET})
-    set(moc_depends ${_WRAP_CPP_DEPENDS})
-
-    foreach(it ${moc_files})
-        get_filename_component(it ${it} ABSOLUTE)
-        qt5_make_output_file(${it} moc_ cpp outfile)
-        qt5_create_moc_command(${it} ${outfile} "${moc_flags}" "${moc_options}" "${moc_target}" "${moc_depends}")
-        list(APPEND ${outfiles} ${outfile})
-    endforeach()
-    set(${outfiles} ${${outfiles}} PARENT_SCOPE)
-endfunction()
-
-# This will override the CMake upstream command, because that one is for Qt 3.
-if(NOT QT_NO_CREATE_VERSIONLESS_FUNCTIONS)
-    function(qt_wrap_cpp outfiles)
-        if(QT_DEFAULT_MAJOR_VERSION EQUAL 5)
-            qt5_wrap_cpp("${outfiles}" ${ARGN})
-        elseif(QT_DEFAULT_MAJOR_VERSION EQUAL 6)
-            qt6_wrap_cpp("${outfiles}" ${ARGN})
-        endif()
-        set("${outfiles}" "${${outfiles}}" PARENT_SCOPE)
-    endfunction()
-endif()
-
-
-# _qt5_parse_qrc_file(infile _out_depends _rc_depends)
-# internal
-
-function(_qt5_parse_qrc_file infile _out_depends _rc_depends)
-    get_filename_component(rc_path ${infile} PATH)
-
-    if(EXISTS "${infile}")
-        #  parse file for dependencies
-        #  all files are absolute paths or relative to the location of the qrc file
-        file(READ "${infile}" RC_FILE_CONTENTS)
-        string(REGEX MATCHALL "<file[^<]+" RC_FILES "${RC_FILE_CONTENTS}")
-        foreach(RC_FILE ${RC_FILES})
-            string(REGEX REPLACE "^<file[^>]*>" "" RC_FILE "${RC_FILE}")
-            if(NOT IS_ABSOLUTE "${RC_FILE}")
-                set(RC_FILE "${rc_path}/${RC_FILE}")
-            endif()
-            set(RC_DEPENDS ${RC_DEPENDS} "${RC_FILE}")
-        endforeach()
-        # Since this cmake macro is doing the dependency scanning for these files,
-        # let's make a configured file and add it as a dependency so cmake is run
-        # again when dependencies need to be recomputed.
-        qt5_make_output_file("${infile}" "" "qrc.depends" out_depends)
-        configure_file("${infile}" "${out_depends}" COPYONLY)
-    else()
-        # The .qrc file does not exist (yet). Let's add a dependency and hope
-        # that it will be generated later
-        set(out_depends)
-    endif()
-
-    set(${_out_depends} ${out_depends} PARENT_SCOPE)
-    set(${_rc_depends} ${RC_DEPENDS} PARENT_SCOPE)
-endfunction()
-
-
-# qt5_add_binary_resources(target inputfiles ... )
-
-function(qt5_add_binary_resources target )
-
-    set(options)
-    set(oneValueArgs DESTINATION)
-    set(multiValueArgs OPTIONS)
-
-    cmake_parse_arguments(_RCC "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
-
-    set(rcc_files ${_RCC_UNPARSED_ARGUMENTS})
-    set(rcc_options ${_RCC_OPTIONS})
-    set(rcc_destination ${_RCC_DESTINATION})
-
-    if(NOT rcc_destination)
-        set(rcc_destination ${CMAKE_CURRENT_BINARY_DIR}/${target}.rcc)
-    endif()
-
-    foreach(it ${rcc_files})
-        get_filename_component(infile ${it} ABSOLUTE)
-
-        _qt5_parse_qrc_file(${infile} _out_depends _rc_depends)
-        set_source_files_properties(${infile} PROPERTIES SKIP_AUTORCC ON)
-        set(infiles ${infiles} ${infile})
-        set(out_depends ${out_depends} ${_out_depends})
-        set(rc_depends ${rc_depends} ${_rc_depends})
-    endforeach()
-
-    add_custom_command(OUTPUT ${rcc_destination}
-                       COMMAND ${Qt5Core_RCC_EXECUTABLE}
-                       ARGS ${rcc_options} --binary --name ${target} --output ${rcc_destination} ${infiles}
-                       DEPENDS ${rc_depends} ${out_depends} ${infiles} VERBATIM)
-    add_custom_target(${target} ALL DEPENDS ${rcc_destination})
-endfunction()
-
-if(NOT QT_NO_CREATE_VERSIONLESS_FUNCTIONS)
-    function(qt_add_binary_resources)
-        if(QT_DEFAULT_MAJOR_VERSION EQUAL 5)
-            qt5_add_binary_resources(${ARGV})
-        elseif(QT_DEFAULT_MAJOR_VERSION EQUAL 6)
-            qt6_add_binary_resources(${ARGV})
-        endif()
-    endfunction()
-endif()
-
-
-# qt5_add_resources(outfiles inputfile ... )
-
-function(qt5_add_resources outfiles )
-
-    set(options)
-    set(oneValueArgs)
-    set(multiValueArgs OPTIONS)
-
-    cmake_parse_arguments(_RCC "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
-
-    set(rcc_files ${_RCC_UNPARSED_ARGUMENTS})
-    set(rcc_options ${_RCC_OPTIONS})
-
-    if("${rcc_options}" MATCHES "-binary")
-        message(WARNING "Use qt5_add_binary_resources for binary option")
-    endif()
-
-    foreach(it ${rcc_files})
-        get_filename_component(outfilename ${it} NAME_WE)
-        get_filename_component(infile ${it} ABSOLUTE)
-        set(outfile ${CMAKE_CURRENT_BINARY_DIR}/qrc_${outfilename}.cpp)
-
-        _qt5_parse_qrc_file(${infile} _out_depends _rc_depends)
-        set_source_files_properties(${infile} PROPERTIES SKIP_AUTORCC ON)
-
-        add_custom_command(OUTPUT ${outfile}
-                           COMMAND ${Qt5Core_RCC_EXECUTABLE}
-                           ARGS ${rcc_options} --name ${outfilename} --output ${outfile} ${infile}
-                           MAIN_DEPENDENCY ${infile}
-                           DEPENDS ${_rc_depends} "${_out_depends}" VERBATIM)
-        set_source_files_properties(${outfile} PROPERTIES SKIP_AUTOMOC ON)
-        set_source_files_properties(${outfile} PROPERTIES SKIP_AUTOUIC ON)
-        list(APPEND ${outfiles} ${outfile})
-    endforeach()
-    set(${outfiles} ${${outfiles}} PARENT_SCOPE)
-endfunction()
-
-if(NOT QT_NO_CREATE_VERSIONLESS_FUNCTIONS)
-    function(qt_add_resources outfiles)
-        if(QT_DEFAULT_MAJOR_VERSION EQUAL 5)
-            qt5_add_resources("${outfiles}" ${ARGN})
-        elseif(QT_DEFAULT_MAJOR_VERSION EQUAL 6)
-            qt6_add_resources("${outfiles}" ${ARGN})
-        endif()
-        set("${outfiles}" "${${outfiles}}" PARENT_SCOPE)
-    endfunction()
-endif()
-
-
-# qt5_add_big_resources(outfiles inputfile ... )
-
-function(qt5_add_big_resources outfiles )
-    if (CMAKE_VERSION VERSION_LESS 3.9)
-        message(FATAL_ERROR, "qt5_add_big_resources requires CMake 3.9 or newer")
-    endif()
-
-    set(options)
-    set(oneValueArgs)
-    set(multiValueArgs OPTIONS)
-
-    cmake_parse_arguments(_RCC "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
-
-    set(rcc_files ${_RCC_UNPARSED_ARGUMENTS})
-    set(rcc_options ${_RCC_OPTIONS})
-
-    if("${rcc_options}" MATCHES "-binary")
-        message(WARNING "Use qt5_add_binary_resources for binary option")
-    endif()
-
-    foreach(it ${rcc_files})
-        get_filename_component(outfilename ${it} NAME_WE)
-        get_filename_component(infile ${it} ABSOLUTE)
-        set(tmpoutfile ${CMAKE_CURRENT_BINARY_DIR}/qrc_${outfilename}tmp.cpp)
-        set(outfile ${CMAKE_CURRENT_BINARY_DIR}/qrc_${outfilename}.o)
-
-        _qt5_parse_qrc_file(${infile} _out_depends _rc_depends)
-        set_source_files_properties(${infile} PROPERTIES SKIP_AUTORCC ON)
-        add_custom_command(OUTPUT ${tmpoutfile}
-                           COMMAND ${Qt5Core_RCC_EXECUTABLE} ${rcc_options} --name ${outfilename} --pass 1 --output ${tmpoutfile} ${infile}
-                           DEPENDS ${infile} ${_rc_depends} "${out_depends}" VERBATIM)
-        add_custom_target(big_resources_${outfilename} ALL DEPENDS ${tmpoutfile})
-        add_library(rcc_object_${outfilename} OBJECT ${tmpoutfile})
-        set_target_properties(rcc_object_${outfilename} PROPERTIES AUTOMOC OFF)
-        set_target_properties(rcc_object_${outfilename} PROPERTIES AUTOUIC OFF)
-        add_dependencies(rcc_object_${outfilename} big_resources_${outfilename})
-        # The modification of TARGET_OBJECTS needs the following change in cmake
-        # https://gitlab.kitware.com/cmake/cmake/commit/93c89bc75ceee599ba7c08b8fe1ac5104942054f
-        add_custom_command(OUTPUT ${outfile}
-                           COMMAND ${Qt5Core_RCC_EXECUTABLE}
-                           ARGS ${rcc_options} --name ${outfilename} --pass 2 --temp $<TARGET_OBJECTS:rcc_object_${outfilename}> --output ${outfile} ${infile}
-                           DEPENDS rcc_object_${outfilename}
-                           VERBATIM)
-       list(APPEND ${outfiles} ${outfile})
-    endforeach()
-    set(${outfiles} ${${outfiles}} PARENT_SCOPE)
-endfunction()
-
-if(NOT QT_NO_CREATE_VERSIONLESS_FUNCTIONS)
-    function(qt_add_big_resources outfiles)
-        if(QT_DEFAULT_MAJOR_VERSION EQUAL 5)
-            qt5_add_big_resources(${outfiles} ${ARGN})
-        elseif(QT_DEFAULT_MAJOR_VERSION EQUAL 6)
-            qt6_add_big_resources(${outfiles} ${ARGN})
-        endif()
-        set("${outfiles}" "${${outfiles}}" PARENT_SCOPE)
-    endfunction()
-endif()
-
-
-set(_Qt5_COMPONENT_PATH "${CMAKE_CURRENT_LIST_DIR}/..")
-
-macro(qt5_use_modules _target _link_type)
-    if(CMAKE_WARN_DEPRECATED)
-        set(messageType WARNING)
-    endif()
-    if(CMAKE_ERROR_DEPRECATED)
-        set(messageType FATAL_ERROR)
-    endif()
-    if(messageType)
-        message(${messageType} "The qt5_use_modules macro is obsolete. Use target_link_libraries with IMPORTED targets instead.")
-    endif()
-
-    if (NOT TARGET ${_target})
-        message(FATAL_ERROR "The first argument to qt5_use_modules must be an existing target.")
-    endif()
-    if ("${_link_type}" STREQUAL "LINK_PUBLIC" OR "${_link_type}" STREQUAL "LINK_PRIVATE" )
-        set(_qt5_modules ${ARGN})
-        set(_qt5_link_type ${_link_type})
-    else()
-        set(_qt5_modules ${_link_type} ${ARGN})
-    endif()
-
-    if ("${_qt5_modules}" STREQUAL "")
-        message(FATAL_ERROR "qt5_use_modules requires at least one Qt module to use.")
-    endif()
-
-    foreach(_module ${_qt5_modules})
-        if (NOT Qt5${_module}_FOUND)
-            find_package(Qt5${_module} PATHS "${_Qt5_COMPONENT_PATH}" NO_DEFAULT_PATH)
-            if (NOT Qt5${_module}_FOUND)
-                message(FATAL_ERROR "Cannot use \"${_module}\" module which has not yet been found.")
-            endif()
-        endif()
-        target_link_libraries(${_target} ${_qt5_link_type} ${Qt5${_module}_LIBRARIES})
-        set_property(TARGET ${_target} APPEND PROPERTY INCLUDE_DIRECTORIES ${Qt5${_module}_INCLUDE_DIRS})
-        set_property(TARGET ${_target} APPEND PROPERTY COMPILE_DEFINITIONS ${Qt5${_module}_COMPILE_DEFINITIONS})
-        set_property(TARGET ${_target} APPEND PROPERTY COMPILE_DEFINITIONS_RELEASE QT_NO_DEBUG)
-        set_property(TARGET ${_target} APPEND PROPERTY COMPILE_DEFINITIONS_RELWITHDEBINFO QT_NO_DEBUG)
-        set_property(TARGET ${_target} APPEND PROPERTY COMPILE_DEFINITIONS_MINSIZEREL QT_NO_DEBUG)
-        if (Qt5_POSITION_INDEPENDENT_CODE
-            AND (NOT CMAKE_CXX_COMPILER_ID STREQUAL "GNU"
-                OR CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.0))
-            set_property(TARGET ${_target} PROPERTY POSITION_INDEPENDENT_CODE ${Qt5_POSITION_INDEPENDENT_CODE})
-        endif()
-    endforeach()
-endmacro()
-
-function(qt5_import_plugins TARGET_NAME)
-    set(_doing "")
-    foreach(_arg ${ARGN})
-        if(_arg STREQUAL "INCLUDE")
-            set(_doing "INCLUDE")
-        elseif(_arg STREQUAL "EXCLUDE")
-            set(_doing "EXCLUDE")
-        elseif(_arg STREQUAL "INCLUDE_BY_TYPE")
-            set(_doing "INCLUDE_BY_TYPE")
-        elseif(_arg STREQUAL "EXCLUDE_BY_TYPE")
-            set(_doing "EXCLUDE_BY_TYPE")
-        else()
-            if(_doing STREQUAL "INCLUDE")
-                set_property(TARGET ${TARGET_NAME} APPEND PROPERTY QT_PLUGINS "${_arg}")
-            elseif(_doing STREQUAL "EXCLUDE")
-                set_property(TARGET ${TARGET_NAME} APPEND PROPERTY QT_NO_PLUGINS "${_arg}")
-            elseif(_doing STREQUAL "INCLUDE_BY_TYPE")
-                string(REGEX REPLACE "[-/]" "_" _plugin_type "${_arg}")
-                set(_doing "INCLUDE_BY_TYPE_PLUGINS")
-            elseif(_doing STREQUAL "INCLUDE_BY_TYPE_PLUGINS")
-                set_property(TARGET ${TARGET_NAME} APPEND PROPERTY "QT_PLUGINS_${_plugin_type}" "${_arg}")
-            elseif(_doing STREQUAL "EXCLUDE_BY_TYPE")
-                string(REGEX REPLACE "[-/]" "_" _plugin_type "${_arg}")
-                set_property(TARGET ${TARGET_NAME} PROPERTY "QT_PLUGINS_${_plugin_type}" -)
-            else()
-                message(FATAL_ERROR "Unexpected extra argument: \"${_arg}\"")
-            endif()
-        endif()
-    endforeach()
-endfunction()
-
-if(NOT QT_NO_CREATE_VERSIONLESS_FUNCTIONS)
-    function(qt_import_plugins)
-        if(QT_DEFAULT_MAJOR_VERSION EQUAL 5)
-            qt5_import_plugins(${ARGV})
-        elseif(QT_DEFAULT_MAJOR_VERSION EQUAL 6)
-            qt6_import_plugins(${ARGV})
-        endif()
-    endfunction()
-endif()
diff --git a/src/corelib/Qt5CTestMacros.cmake b/src/corelib/Qt6CTestMacros.cmake
index 962d49d6b2..962d49d6b2 100644
--- a/src/corelib/Qt5CTestMacros.cmake
+++ b/src/corelib/Qt6CTestMacros.cmake
diff --git a/src/corelib/Qt5Config.cmake.in b/src/corelib/Qt6Config.cmake.in
index 6b6544f932..6b6544f932 100644
--- a/src/corelib/Qt5Config.cmake.in
+++ b/src/corelib/Qt6Config.cmake.in
diff --git a/src/corelib/Qt6CoreConfigExtras.cmake.in b/src/corelib/Qt6CoreConfigExtras.cmake.in
new file mode 100644
index 0000000000..984980b5dc
--- /dev/null
+++ b/src/corelib/Qt6CoreConfigExtras.cmake.in
@@ -0,0 +1,44 @@
+if(NOT DEFINED QT_DEFAULT_MAJOR_VERSION)
+    set(QT_DEFAULT_MAJOR_VERSION 6)
+endif()
+
+# include(\"${CMAKE_CURRENT_LIST_DIR}/Qt5CoreConfigExtrasMkspecDir.cmake\")
+#
+# foreach(_dir ${_qt5_corelib_extra_includes})
+#     _qt5_Core_check_file_exists(${_dir})
+# endforeach()
+
+# list(APPEND Qt5Core_INCLUDE_DIRS ${_qt5_corelib_extra_includes})
+# set_property(TARGET @QT_CMAKE_EXPORT_NAMESPACE@::Core APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${_qt5_corelib_extra_includes})
+# set(_qt5_corelib_extra_includes)
+
+if (NOT QT_NO_CREATE_TARGETS)
+    set_property(TARGET @QT_CMAKE_EXPORT_NAMESPACE@::Core PROPERTY INTERFACE_QT_MAJOR_VERSION @PROJECT_VERSION_MAJOR@)
+    set_property(TARGET @QT_CMAKE_EXPORT_NAMESPACE@::Core PROPERTY INTERFACE_QT_COORD_TYPE @QT_COORD_TYPE@)
+    set_property(TARGET @QT_CMAKE_EXPORT_NAMESPACE@::Core APPEND PROPERTY
+      COMPATIBLE_INTERFACE_STRING QT_MAJOR_VERSION QT_COORD_TYPE
+    )
+    if (NOT "@QT_NAMESPACE@" STREQUAL "")
+        set_property(TARGET @QT_CMAKE_EXPORT_NAMESPACE@::Core APPEND PROPERTY INTERFACE_COMPILE_DEFINITIONS QT_NAMESPACE=@QT_NAMESPACE@)
+    endif()
+    set_property(TARGET @QT_CMAKE_EXPORT_NAMESPACE@::Core APPEND PROPERTY INTERFACE_COMPILE_DEFINITIONS $<$<NOT:$<CONFIG:Debug>>:QT_NO_DEBUG>)
+    set_property(TARGET @QT_CMAKE_EXPORT_NAMESPACE@::Core PROPERTY INTERFACE_COMPILE_FEATURES cxx_decltype)
+endif()
+
+set(CMAKE_AUTOMOC_MACRO_NAMES "Q_OBJECT" "Q_GADGET" "Q_NAMESPACE" "Q_NAMESPACE_EXPORT")
+
+# install layout information, following what qmake -query provides
+get_filename_component(QT@PROJECT_VERSION_MAJOR@_INSTALL_PREFIX ${CMAKE_CURRENT_LIST_DIR}/../@QT_INVERSE_CONFIG_INSTALL_DIR@ ABSOLUTE)
+set(QT@PROJECT_VERSION_MAJOR@_INSTALL_ARCHDATA ${QT@PROJECT_VERSION_MAJOR@_INSTALL_PREFIX}/@INSTALL_ARCHDATADIR@)
+set(QT@PROJECT_VERSION_MAJOR@_INSTALL_BINS ${QT@PROJECT_VERSION_MAJOR@_INSTALL_PREFIX}/@INSTALL_BINDIR@)
+set(QT@PROJECT_VERSION_MAJOR@_INSTALL_CONFIGURATION ${QT@PROJECT_VERSION_MAJOR@_INSTALL_PREFIX}/@INSTALL_SYSCONFDIR@)
+set(QT@PROJECT_VERSION_MAJOR@_INSTALL_DATA ${QT@PROJECT_VERSION_MAJOR@_INSTALL_PREFIX}/@INSTALL_DATADIR@)
+set(QT@PROJECT_VERSION_MAJOR@_INSTALL_DOCS ${QT@PROJECT_VERSION_MAJOR@_INSTALL_PREFIX}/@INSTALL_DOCDIR@)
+set(QT@PROJECT_VERSION_MAJOR@_INSTALL_EXAMPLES ${QT@PROJECT_VERSION_MAJOR@_INSTALL_PREFIX}/@INSTALL_EXAMPLESDIR@)
+set(QT@PROJECT_VERSION_MAJOR@_INSTALL_HEADERS ${QT@PROJECT_VERSION_MAJOR@_INSTALL_PREFIX}/@INSTALL_INCLUDEDIR@)
+set(QT@PROJECT_VERSION_MAJOR@_INSTALL_LIBS ${QT@PROJECT_VERSION_MAJOR@_INSTALL_PREFIX}/@INSTALL_LIBDIR@)
+set(QT@PROJECT_VERSION_MAJOR@_INSTALL_LIBEXECS ${QT@PROJECT_VERSION_MAJOR@_INSTALL_PREFIX}/@INSTALL_LIBEXECDIR@)
+set(QT@PROJECT_VERSION_MAJOR@_INSTALL_PLUGINS ${QT@PROJECT_VERSION_MAJOR@_INSTALL_PREFIX}/@INSTALL_PLUGINSDIR@)
+set(QT@PROJECT_VERSION_MAJOR@_INSTALL_QML ${QT@PROJECT_VERSION_MAJOR@_INSTALL_PREFIX}/@INSTALL_QMLDIR@)
+set(QT@PROJECT_VERSION_MAJOR@_INSTALL_TESTS ${QT@PROJECT_VERSION_MAJOR@_INSTALL_PREFIX}/@INSTALL_TESTSDIR@)
+set(QT@PROJECT_VERSION_MAJOR@_INSTALL_TRANSLATIONS ${QT@PROJECT_VERSION_MAJOR@_INSTALL_PREFIX}/@INSTALL_TRANSLATIONSDIR@)
diff --git a/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in b/src/corelib/Qt6CoreConfigExtrasMkspecDir.cmake.in
index c357237d0e..c357237d0e 100644
--- a/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in
+++ b/src/corelib/Qt6CoreConfigExtrasMkspecDir.cmake.in
diff --git a/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in b/src/corelib/Qt6CoreConfigExtrasMkspecDirForInstall.cmake.in
index 706304cf34..706304cf34 100644
--- a/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in
+++ b/src/corelib/Qt6CoreConfigExtrasMkspecDirForInstall.cmake.in
diff --git a/src/corelib/Qt6CoreMacros.cmake b/src/corelib/Qt6CoreMacros.cmake
new file mode 100644
index 0000000000..a2ebc6f9f6
--- /dev/null
+++ b/src/corelib/Qt6CoreMacros.cmake
@@ -0,0 +1,965 @@
+#=============================================================================
+# Copyright 2005-2011 Kitware, Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# * Redistributions of source code must retain the above copyright
+#   notice, this list of conditions and the following disclaimer.
+#
+# * Redistributions in binary form must reproduce the above copyright
+#   notice, this list of conditions and the following disclaimer in the
+#   documentation and/or other materials provided with the distribution.
+#
+# * Neither the name of Kitware, Inc. nor the names of its
+#   contributors may be used to endorse or promote products derived
+#   from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#=============================================================================
+
+######################################
+#
+#       Macros for building Qt files
+#
+######################################
+
+include(CMakeParseArguments)
+
+# macro used to create the names of output files preserving relative dirs
+macro(qt6_make_output_file infile prefix ext outfile )
+    string(LENGTH ${CMAKE_CURRENT_BINARY_DIR} _binlength)
+    string(LENGTH ${infile} _infileLength)
+    set(_checkinfile ${CMAKE_CURRENT_SOURCE_DIR})
+    if(_infileLength GREATER _binlength)
+        string(SUBSTRING "${infile}" 0 ${_binlength} _checkinfile)
+        if(_checkinfile STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
+            file(RELATIVE_PATH rel ${CMAKE_CURRENT_BINARY_DIR} ${infile})
+        else()
+            file(RELATIVE_PATH rel ${CMAKE_CURRENT_SOURCE_DIR} ${infile})
+        endif()
+    else()
+        file(RELATIVE_PATH rel ${CMAKE_CURRENT_SOURCE_DIR} ${infile})
+    endif()
+    if(WIN32 AND rel MATCHES "^([a-zA-Z]):(.*)$") # absolute path
+        set(rel "${CMAKE_MATCH_1}_${CMAKE_MATCH_2}")
+    endif()
+    set(_outfile "${CMAKE_CURRENT_BINARY_DIR}/${rel}")
+    string(REPLACE ".." "__" _outfile ${_outfile})
+    get_filename_component(outpath ${_outfile} PATH)
+    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()
+
+
+macro(qt6_get_moc_flags _moc_flags)
+    set(${_moc_flags})
+    get_directory_property(_inc_DIRS INCLUDE_DIRECTORIES)
+
+    if(CMAKE_INCLUDE_CURRENT_DIR)
+        list(APPEND _inc_DIRS ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
+    endif()
+
+    foreach(_current ${_inc_DIRS})
+        if("${_current}" MATCHES "\\.framework/?$")
+            string(REGEX REPLACE "/[^/]+\\.framework" "" framework_path "${_current}")
+            set(${_moc_flags} ${${_moc_flags}} "-F${framework_path}")
+        else()
+            set(${_moc_flags} ${${_moc_flags}} "-I${_current}")
+        endif()
+    endforeach()
+
+    get_directory_property(_defines COMPILE_DEFINITIONS)
+    foreach(_current ${_defines})
+        set(${_moc_flags} ${${_moc_flags}} "-D${_current}")
+    endforeach()
+
+    if(WIN32)
+        set(${_moc_flags} ${${_moc_flags}} -DWIN32)
+    endif()
+    if (MSVC)
+        set(${_moc_flags} ${${_moc_flags}} --compiler-flavor=msvc)
+    endif()
+endmacro()
+
+
+# helper macro to set up a moc rule
+function(qt6_create_moc_command infile outfile moc_flags moc_options moc_target moc_depends)
+    # Pass the parameters in a file.  Set the working directory to
+    # be that containing the parameters file and reference it by
+    # just the file name.  This is necessary because the moc tool on
+    # MinGW builds does not seem to handle spaces in the path to the
+    # file given with the @ syntax.
+    get_filename_component(_moc_outfile_name "${outfile}" NAME)
+    get_filename_component(_moc_outfile_dir "${outfile}" PATH)
+    if(_moc_outfile_dir)
+        set(_moc_working_dir WORKING_DIRECTORY ${_moc_outfile_dir})
+    endif()
+    set (_moc_parameters_file ${outfile}_parameters)
+    set (_moc_parameters ${moc_flags} ${moc_options} -o "${outfile}" "${infile}")
+    string (REPLACE ";" "\n" _moc_parameters "${_moc_parameters}")
+
+    if(moc_target)
+        set(_moc_parameters_file ${_moc_parameters_file}$<$<BOOL:$<CONFIGURATION>>:_$<CONFIGURATION>>)
+        set(targetincludes "$<TARGET_PROPERTY:${moc_target},INCLUDE_DIRECTORIES>")
+        set(targetdefines "$<TARGET_PROPERTY:${moc_target},COMPILE_DEFINITIONS>")
+
+        set(targetincludes "$<$<BOOL:${targetincludes}>:-I$<JOIN:${targetincludes},\n-I>\n>")
+        set(targetdefines "$<$<BOOL:${targetdefines}>:-D$<JOIN:${targetdefines},\n-D>\n>")
+
+        file (GENERATE
+            OUTPUT ${_moc_parameters_file}
+            CONTENT "${targetdefines}${targetincludes}${_moc_parameters}\n"
+        )
+
+        set(targetincludes)
+        set(targetdefines)
+    else()
+        file(WRITE ${_moc_parameters_file} "${_moc_parameters}\n")
+    endif()
+
+    set(_moc_extra_parameters_file @${_moc_parameters_file})
+    add_custom_command(OUTPUT ${outfile}
+                       COMMAND ${QT_CMAKE_EXPORT_NAMESPACE}::moc ${_moc_extra_parameters_file}
+                       DEPENDS ${infile} ${moc_depends}
+                       ${_moc_working_dir}
+                       VERBATIM)
+    set_source_files_properties(${infile} PROPERTIES SKIP_AUTOMOC ON)
+    set_source_files_properties(${outfile} PROPERTIES SKIP_AUTOMOC ON)
+    set_source_files_properties(${outfile} PROPERTIES SKIP_AUTOUIC ON)
+endfunction()
+
+
+function(qt6_generate_moc infile outfile )
+    # get include dirs and flags
+    qt6_get_moc_flags(moc_flags)
+    get_filename_component(abs_infile ${infile} ABSOLUTE)
+    set(_outfile "${outfile}")
+    if(NOT IS_ABSOLUTE "${outfile}")
+        set(_outfile "${CMAKE_CURRENT_BINARY_DIR}/${outfile}")
+    endif()
+    if ("x${ARGV2}" STREQUAL "xTARGET")
+        set(moc_target ${ARGV3})
+    endif()
+    qt6_create_moc_command(${abs_infile} ${_outfile} "${moc_flags}" "" "${moc_target}" "")
+endfunction()
+
+if(NOT QT_NO_CREATE_VERSIONLESS_FUNCTIONS)
+    function(qt_generate_moc)
+        if(QT_DEFAULT_MAJOR_VERSION EQUAL 5)
+            qt5_generate_moc(${ARGV})
+        elseif(QT_DEFAULT_MAJOR_VERSION EQUAL 6)
+            qt6_generate_moc(${ARGV})
+        endif()
+    endfunction()
+endif()
+
+
+# qt6_wrap_cpp(outfiles inputfile ... )
+
+function(qt6_wrap_cpp outfiles )
+    # get include dirs
+    qt6_get_moc_flags(moc_flags)
+
+    set(options)
+    set(oneValueArgs TARGET)
+    set(multiValueArgs OPTIONS DEPENDS)
+
+    cmake_parse_arguments(_WRAP_CPP "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
+
+    set(moc_files ${_WRAP_CPP_UNPARSED_ARGUMENTS})
+    set(moc_options ${_WRAP_CPP_OPTIONS})
+    set(moc_target ${_WRAP_CPP_TARGET})
+    set(moc_depends ${_WRAP_CPP_DEPENDS})
+
+    foreach(it ${moc_files})
+        get_filename_component(it ${it} ABSOLUTE)
+        qt6_make_output_file(${it} moc_ cpp outfile)
+        qt6_create_moc_command(${it} ${outfile} "${moc_flags}" "${moc_options}" "${moc_target}" "${moc_depends}")
+        list(APPEND ${outfiles} ${outfile})
+    endforeach()
+    set(${outfiles} ${${outfiles}} PARENT_SCOPE)
+endfunction()
+
+# This will override the CMake upstream command, because that one is for Qt 3.
+if(NOT QT_NO_CREATE_VERSIONLESS_FUNCTIONS)
+    function(qt_wrap_cpp outfiles)
+        if(QT_DEFAULT_MAJOR_VERSION EQUAL 5)
+            qt5_wrap_cpp("${outfiles}" ${ARGN})
+        elseif(QT_DEFAULT_MAJOR_VERSION EQUAL 6)
+            qt6_wrap_cpp("${outfiles}" ${ARGN})
+        endif()
+        set("${outfiles}" "${${outfiles}}" PARENT_SCOPE)
+    endfunction()
+endif()
+
+
+# _qt6_parse_qrc_file(infile _out_depends _rc_depends)
+# internal
+
+function(_qt6_parse_qrc_file infile _out_depends _rc_depends)
+    get_filename_component(rc_path ${infile} PATH)
+
+    if(EXISTS "${infile}")
+        #  parse file for dependencies
+        #  all files are absolute paths or relative to the location of the qrc file
+        file(READ "${infile}" RC_FILE_CONTENTS)
+        string(REGEX MATCHALL "<file[^<]+" RC_FILES "${RC_FILE_CONTENTS}")
+        foreach(RC_FILE ${RC_FILES})
+            string(REGEX REPLACE "^<file[^>]*>" "" RC_FILE "${RC_FILE}")
+            if(NOT IS_ABSOLUTE "${RC_FILE}")
+                set(RC_FILE "${rc_path}/${RC_FILE}")
+            endif()
+            set(RC_DEPENDS ${RC_DEPENDS} "${RC_FILE}")
+        endforeach()
+        # Since this cmake macro is doing the dependency scanning for these files,
+        # let's make a configured file and add it as a dependency so cmake is run
+        # again when dependencies need to be recomputed.
+        qt6_make_output_file("${infile}" "" "qrc.depends" out_depends)
+        configure_file("${infile}" "${out_depends}" COPYONLY)
+    else()
+        # The .qrc file does not exist (yet). Let's add a dependency and hope
+        # that it will be generated later
+        set(out_depends)
+    endif()
+
+    set(${_out_depends} ${out_depends} PARENT_SCOPE)
+    set(${_rc_depends} ${RC_DEPENDS} PARENT_SCOPE)
+endfunction()
+
+
+# qt6_add_binary_resources(target inputfiles ... )
+
+function(qt6_add_binary_resources target )
+
+    set(options)
+    set(oneValueArgs DESTINATION)
+    set(multiValueArgs OPTIONS)
+
+    cmake_parse_arguments(_RCC "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
+
+    set(rcc_files ${_RCC_UNPARSED_ARGUMENTS})
+    set(rcc_options ${_RCC_OPTIONS})
+    set(rcc_destination ${_RCC_DESTINATION})
+
+    if(NOT rcc_destination)
+        set(rcc_destination ${CMAKE_CURRENT_BINARY_DIR}/${target}.rcc)
+    endif()
+
+    foreach(it ${rcc_files})
+        get_filename_component(infile ${it} ABSOLUTE)
+
+        _qt6_parse_qrc_file(${infile} _out_depends _rc_depends)
+        set_source_files_properties(${infile} PROPERTIES SKIP_AUTORCC ON)
+        set(infiles ${infiles} ${infile})
+        set(out_depends ${out_depends} ${_out_depends})
+        set(rc_depends ${rc_depends} ${_rc_depends})
+    endforeach()
+
+    add_custom_command(OUTPUT ${rcc_destination}
+                       DEPENDS ${QT_CMAKE_EXPORT_NAMESPACE}::rcc
+                       COMMAND ${QT_CMAKE_EXPORT_NAMESPACE}::rcc
+                       ARGS ${rcc_options} --binary --name ${target} --output ${rcc_destination} ${infiles}
+                       DEPENDS
+                            ${QT_CMAKE_EXPORT_NAMESPACE}::rcc
+                            ${rc_depends}
+                            ${out_depends}
+                            ${infiles}
+                       VERBATIM)
+
+    add_custom_target(${target} ALL DEPENDS ${rcc_destination})
+endfunction()
+
+if(NOT QT_NO_CREATE_VERSIONLESS_FUNCTIONS)
+    function(qt_add_binary_resources)
+        if(QT_DEFAULT_MAJOR_VERSION EQUAL 5)
+            qt5_add_binary_resources(${ARGV})
+        elseif(QT_DEFAULT_MAJOR_VERSION EQUAL 6)
+            qt6_add_binary_resources(${ARGV})
+        endif()
+    endfunction()
+endif()
+
+
+# qt6_add_resources(target resourcename ...
+# or
+# qt6_add_resources(outfiles inputfile ... )
+
+function(qt6_add_resources outfiles )
+    if (TARGET ${outfiles})
+        cmake_parse_arguments(arg "" "OUTPUT_TARGETS" "" ${ARGN})
+        qt6_process_resource(${ARGV})
+        if (arg_OUTPUT_TARGETS)
+            set(${arg_OUTPUT_TARGETS} ${${arg_OUTPUT_TARGETS}} PARENT_SCOPE)
+        endif()
+    else()
+        set(options)
+        set(oneValueArgs)
+        set(multiValueArgs OPTIONS)
+
+        cmake_parse_arguments(_RCC "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
+
+        set(rcc_files ${_RCC_UNPARSED_ARGUMENTS})
+        set(rcc_options ${_RCC_OPTIONS})
+
+        if("${rcc_options}" MATCHES "-binary")
+            message(WARNING "Use qt6_add_binary_resources for binary option")
+        endif()
+
+        foreach(it ${rcc_files})
+            get_filename_component(outfilename ${it} NAME_WE)
+            get_filename_component(infile ${it} ABSOLUTE)
+            set(outfile ${CMAKE_CURRENT_BINARY_DIR}/qrc_${outfilename}.cpp)
+
+            _qt6_parse_qrc_file(${infile} _out_depends _rc_depends)
+            set_source_files_properties(${infile} PROPERTIES SKIP_AUTORCC ON)
+
+            add_custom_command(OUTPUT ${outfile}
+                               COMMAND ${QT_CMAKE_EXPORT_NAMESPACE}::rcc
+                               ARGS ${rcc_options} --name ${outfilename} --output ${outfile} ${infile}
+                               MAIN_DEPENDENCY ${infile}
+                               DEPENDS ${_rc_depends} "${_out_depends}" ${QT_CMAKE_EXPORT_NAMESPACE}::rcc
+                               VERBATIM)
+            set_source_files_properties(${outfile} PROPERTIES SKIP_AUTOMOC ON)
+            set_source_files_properties(${outfile} PROPERTIES SKIP_AUTOUIC ON)
+            list(APPEND ${outfiles} ${outfile})
+        endforeach()
+        set(${outfiles} ${${outfiles}} PARENT_SCOPE)
+    endif()
+endfunction()
+
+if(NOT QT_NO_CREATE_VERSIONLESS_FUNCTIONS)
+    function(qt_add_resources outfiles)
+        if(QT_DEFAULT_MAJOR_VERSION EQUAL 5)
+            qt5_add_resources("${outfiles}" ${ARGN})
+        elseif(QT_DEFAULT_MAJOR_VERSION EQUAL 6)
+            qt6_add_resources("${outfiles}" ${ARGN})
+        endif()
+        if(NOT TARGET ${outfiles})
+            set("${outfiles}" "${${outfiles}}" PARENT_SCOPE)
+        endif()
+    endfunction()
+endif()
+
+
+# qt6_add_big_resources(outfiles inputfile ... )
+
+function(qt6_add_big_resources outfiles )
+    if (CMAKE_VERSION VERSION_LESS 3.9)
+        message(FATAL_ERROR, "qt6_add_big_resources requires CMake 3.9 or newer")
+    endif()
+
+    set(options)
+    set(oneValueArgs)
+    set(multiValueArgs OPTIONS)
+
+    cmake_parse_arguments(_RCC "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
+
+    set(rcc_files ${_RCC_UNPARSED_ARGUMENTS})
+    set(rcc_options ${_RCC_OPTIONS})
+
+    if("${rcc_options}" MATCHES "-binary")
+        message(WARNING "Use qt6_add_binary_resources for binary option")
+    endif()
+
+    foreach(it ${rcc_files})
+        get_filename_component(outfilename ${it} NAME_WE)
+        get_filename_component(infile ${it} ABSOLUTE)
+        set(tmpoutfile ${CMAKE_CURRENT_BINARY_DIR}/qrc_${outfilename}tmp.cpp)
+        set(outfile ${CMAKE_CURRENT_BINARY_DIR}/qrc_${outfilename}.o)
+
+        _qt6_parse_qrc_file(${infile} _out_depends _rc_depends)
+        set_source_files_properties(${infile} PROPERTIES SKIP_AUTORCC ON)
+        add_custom_command(OUTPUT ${tmpoutfile}
+                           COMMAND ${QT_CMAKE_EXPORT_NAMESPACE}::rcc ${rcc_options} --name ${outfilename} --pass 1 --output ${tmpoutfile} ${infile}
+                           DEPENDS ${infile} ${_rc_depends} "${out_depends}" ${QT_CMAKE_EXPORT_NAMESPACE}::rcc
+                           VERBATIM)
+        add_custom_target(big_resources_${outfilename} ALL DEPENDS ${tmpoutfile})
+        add_library(rcc_object_${outfilename} OBJECT ${tmpoutfile})
+        set_target_properties(rcc_object_${outfilename} PROPERTIES AUTOMOC OFF)
+        set_target_properties(rcc_object_${outfilename} PROPERTIES AUTOUIC OFF)
+        add_dependencies(rcc_object_${outfilename} big_resources_${outfilename})
+        # The modification of TARGET_OBJECTS needs the following change in cmake
+        # https://gitlab.kitware.com/cmake/cmake/commit/93c89bc75ceee599ba7c08b8fe1ac5104942054f
+        add_custom_command(OUTPUT ${outfile}
+                           COMMAND ${QT_CMAKE_EXPORT_NAMESPACE}::rcc
+                           ARGS ${rcc_options} --name ${outfilename} --pass 2 --temp $<TARGET_OBJECTS:rcc_object_${outfilename}> --output ${outfile} ${infile}
+                           DEPENDS rcc_object_${outfilename} ${QT_CMAKE_EXPORT_NAMESPACE}::rcc
+                           VERBATIM)
+       list(APPEND ${outfiles} ${outfile})
+    endforeach()
+    set(${outfiles} ${${outfiles}} PARENT_SCOPE)
+endfunction()
+
+if(NOT QT_NO_CREATE_VERSIONLESS_FUNCTIONS)
+    function(qt_add_big_resources outfiles)
+        if(QT_DEFAULT_MAJOR_VERSION EQUAL 5)
+            qt5_add_big_resources(${outfiles} ${ARGN})
+        elseif(QT_DEFAULT_MAJOR_VERSION EQUAL 6)
+            qt6_add_big_resources(${outfiles} ${ARGN})
+        endif()
+        set("${outfiles}" "${${outfiles}}" PARENT_SCOPE)
+    endfunction()
+endif()
+
+set(_Qt6_COMPONENT_PATH "${CMAKE_CURRENT_LIST_DIR}/..")
+
+macro(qt6_use_modules _target _link_type)
+    if(CMAKE_WARN_DEPRECATED)
+        set(messageType WARNING)
+    endif()
+    if(CMAKE_ERROR_DEPRECATED)
+        set(messageType FATAL_ERROR)
+    endif()
+    if(messageType)
+        message(${messageType} "The qt6_use_modules macro is obsolete. Use target_link_libraries with IMPORTED targets instead.")
+    endif()
+
+    if (NOT TARGET ${_target})
+        message(FATAL_ERROR "The first argument to qt6_use_modules must be an existing target.")
+    endif()
+    if ("${_link_type}" STREQUAL "LINK_PUBLIC" OR "${_link_type}" STREQUAL "LINK_PRIVATE" )
+        set(_qt6_modules ${ARGN})
+        set(_qt6_link_type ${_link_type})
+    else()
+        set(_qt6_modules ${_link_type} ${ARGN})
+    endif()
+
+    if ("${_qt6_modules}" STREQUAL "")
+        message(FATAL_ERROR "qt6_use_modules requires at least one Qt module to use.")
+    endif()
+
+    foreach(_module ${_qt6_modules})
+        if (NOT Qt6${_module}_FOUND)
+            find_package(Qt6${_module} PATHS "${_Qt6_COMPONENT_PATH}" NO_DEFAULT_PATH)
+            if (NOT Qt6${_module}_FOUND)
+                message(FATAL_ERROR "Cannot use \"${_module}\" module which has not yet been found.")
+            endif()
+        endif()
+        target_link_libraries(${_target} ${_qt6_link_type} ${Qt6${_module}_LIBRARIES})
+        set_property(TARGET ${_target} APPEND PROPERTY INCLUDE_DIRECTORIES ${Qt6${_module}_INCLUDE_DIRS})
+        set_property(TARGET ${_target} APPEND PROPERTY COMPILE_DEFINITIONS ${Qt6${_module}_COMPILE_DEFINITIONS})
+        set_property(TARGET ${_target} APPEND PROPERTY COMPILE_DEFINITIONS_RELEASE QT_NO_DEBUG)
+        set_property(TARGET ${_target} APPEND PROPERTY COMPILE_DEFINITIONS_RELWITHDEBINFO QT_NO_DEBUG)
+        set_property(TARGET ${_target} APPEND PROPERTY COMPILE_DEFINITIONS_MINSIZEREL QT_NO_DEBUG)
+        if (Qt6_POSITION_INDEPENDENT_CODE
+                    AND (NOT CMAKE_CXX_COMPILER_ID STREQUAL "GNU"
+                    OR CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.0))
+            set_property(TARGET ${_target} PROPERTY POSITION_INDEPENDENT_CODE ${Qt6_POSITION_INDEPENDENT_CODE})
+        endif()
+    endforeach()
+endmacro()
+
+function(add_qt_gui_executable target)
+    if(ANDROID)
+        add_library("${target}" MODULE ${ARGN})
+        # On our qmake builds we do don't compile the executables with
+        # visibility=hidden. Not having this flag set will cause the
+        # executable to have main() hidden and can then no longer be loaded
+        # through dlopen()
+        set_property(TARGET "${target}" PROPERTY C_VISIBILITY_PRESET default)
+        set_property(TARGET "${target}" PROPERTY CXX_VISIBILITY_PRESET default)
+        qt_android_apply_arch_suffix("${target}")
+    else()
+        add_executable("${target}" WIN32 MACOSX_BUNDLE ${ARGN})
+    endif()
+    target_link_libraries("${target}" PRIVATE Qt::Core)
+    if(TARGET Qt::Gui)
+        target_link_libraries("${target}" PRIVATE Qt::Gui)
+    endif()
+
+    if (WIN32)
+        qt6_gerate_win32_rc_file(${target})
+    endif()
+
+    if(ANDROID)
+        qt_android_generate_deployment_settings("${target}")
+        qt_android_add_apk_target("${target}")
+    endif()
+endfunction()
+
+function(_qt_get_plugin_name_with_version target out_var)
+    string(REGEX REPLACE "^Qt::(.+)" "Qt${QT_DEFAULT_MAJOR_VERSION}::\\1"
+           qt_plugin_with_version "${target}")
+    if(TARGET "${qt_plugin_with_version}")
+        set("${out_var}" "${qt_plugin_with_version}" PARENT_SCOPE)
+    else()
+        set("${out_var}" "" PARENT_SCOPE)
+    endif()
+endfunction()
+
+macro(_qt_import_plugin target plugin)
+    set(_final_plugin_name "${plugin}")
+    if(NOT TARGET "${plugin}")
+        _qt_get_plugin_name_with_version("${plugin}" _qt_plugin_with_version_name)
+        if(TARGET "${_qt_plugin_with_version_name}")
+            set(_final_plugin_name "${_qt_plugin_with_version_name}")
+        endif()
+    endif()
+
+    if(NOT TARGET "${_final_plugin_name}")
+        message(
+            "Warning: plug-in ${_final_plugin_name} is not known to the current Qt installation.")
+    else()
+        get_target_property(_plugin_class_name "${_final_plugin_name}" QT_PLUGIN_CLASS_NAME)
+        if(_plugin_class_name)
+            set_property(TARGET "${target}" APPEND PROPERTY QT_PLUGINS "${plugin}")
+        endif()
+    endif()
+endmacro()
+
+# This function is used to indicate which plug-ins are going to be
+# used by a given target.
+# This allows static linking to a correct set of plugins.
+# Options :
+#    NO_DEFAULT: disable linking against any plug-in by default for that target, e.g. no platform plug-in.
+#    INCLUDE <list of additional plug-ins to be linked against>
+#    EXCLUDE <list of plug-ins to be removed from the default set>
+#    INCLUDE_BY_TYPE <type> <included plugins>
+#    EXCLUDE_BY_TYPE <type to be excluded>
+#
+# Example :
+# qt_import_plugins(myapp
+#     INCLUDE Qt::QCocoaIntegrationPlugin
+#     EXCLUDE Qt::QMinimalIntegrationPlugin
+#     INCLUDE_BY_TYPE imageformats Qt::QGifPlugin Qt::QJpegPlugin
+#     EXCLUDE_BY_TYPE sqldrivers
+# )
+
+# TODO : support qml plug-ins.
+function(qt6_import_plugins target)
+    cmake_parse_arguments(arg "NO_DEFAULT" "" "INCLUDE;EXCLUDE;INCLUDE_BY_TYPE;EXCLUDE_BY_TYPE" ${ARGN})
+
+    # Handle NO_DEFAULT
+    if(${arg_NO_DEFAULT})
+        set_target_properties(${target} PROPERTIES QT_DEFAULT_PLUGINS 0)
+    endif()
+
+    # Handle INCLUDE
+    foreach(plugin ${arg_INCLUDE})
+        _qt_import_plugin("${target}" "${plugin}")
+    endforeach()
+
+    # Handle EXCLUDE
+    foreach(plugin ${arg_EXCLUDE})
+        set_property(TARGET "${target}" APPEND PROPERTY QT_NO_PLUGINS "${plugin}")
+    endforeach()
+
+    # Handle INCLUDE_BY_TYPE
+    set(_current_type "")
+    foreach(_arg ${arg_INCLUDE_BY_TYPE})
+        string(REGEX REPLACE "[-/]" "_" _plugin_type "${_arg}")
+        list(FIND QT_ALL_PLUGIN_TYPES_FOUND_VIA_FIND_PACKAGE "${_plugin_type}" _has_plugin_type)
+
+        if(${_has_plugin_type} GREATER_EQUAL 0)
+           set(_current_type "${_plugin_type}")
+        else()
+            if("${_current_type}" STREQUAL "")
+                message(FATAL_ERROR "qt_import_plugins: invalid syntax for INCLUDE_BY_TYPE")
+            endif()
+
+            # Check if passed plugin target name is a version-less one, and make a version-full
+            # one.
+            _qt_get_plugin_name_with_version("${_arg}" qt_plugin_with_version)
+            if(TARGET "${_arg}" OR TARGET "${qt_plugin_with_version}")
+                set_property(TARGET "${target}" APPEND PROPERTY "QT_PLUGINS_${_current_type}" "${_arg}")
+            else()
+                message("Warning: plug-in ${_arg} is not known to the current Qt installation.")
+            endif()
+        endif()
+    endforeach()
+
+    # Handle EXCLUDE_BY_TYPE
+    foreach(_arg ${arg_EXCLUDE_BY_TYPE})
+        string(REGEX REPLACE "[-/]" "_" _plugin_type "${_arg}")
+        set_property(TARGET "${target}" PROPERTY "QT_PLUGINS_${_plugin_type}" "-")
+    endforeach()
+endfunction()
+
+if(NOT QT_NO_CREATE_VERSIONLESS_FUNCTIONS)
+    function(qt_import_plugins)
+        if(QT_DEFAULT_MAJOR_VERSION EQUAL 5)
+            qt5_import_plugins(${ARGV})
+        elseif(QT_DEFAULT_MAJOR_VERSION EQUAL 6)
+            qt6_import_plugins(${ARGV})
+        endif()
+    endfunction()
+endif()
+
+
+# Generate Qt metatypes.json for a target. By default we check whether AUTOMOC
+# has been enabled and we extract the information from that target. Should you
+# not wish to use automoc you need to pass in all the generated json files via the
+# MANUAL_MOC_JSON_FILES parameter. The latter can be obtained by running moc with
+# the --output-json parameter.
+# Params:
+#   INSTALL_DIR: Location where to install the metatypes file (Optional)
+#   COPY_OVER_INSTALL: When present will install the file via a post build step
+#   copy rather than using install
+function(qt6_generate_meta_types_json_file target)
+
+    get_target_property(existing_meta_types_file ${target} INTERFACE_QT_META_TYPES_BUILD_FILE)
+    if (existing_meta_types_file)
+        return()
+    endif()
+
+    cmake_parse_arguments(arg "COPY_OVER_INSTALL" "INSTALL_DIR" "MANUAL_MOC_JSON_FILES" ${ARGN})
+
+    if (NOT QT_BUILDING_QT)
+        if (NOT arg_INSTALL_DIR)
+            message(FATAL_ERROR "Please specify an install directory using INSTALL_DIR")
+        endif()
+    else()
+        # Automatically fill install args when building qt
+        set(metatypes_install_dir ${INSTALL_LIBDIR}/metatypes)
+        set(args)
+        if (NOT QT_WILL_INSTALL)
+            set(arg_COPY_OVER_INSTALL TRUE)
+        endif()
+        if (NOT arg_INSTALL_DIR)
+            set(arg_INSTALL_DIR "${metatypes_install_dir}")
+        endif()
+    endif()
+
+    get_target_property(target_type ${target} TYPE)
+    if (target_type STREQUAL "INTERFACE_LIBRARY")
+        message(FATAL_ERROR "Meta types generation does not work on interface libraries")
+        return()
+    endif()
+
+    if (CMAKE_VERSION VERSION_LESS "3.16.0")
+        message(FATAL_ERROR "Meta types generation requires CMake >= 3.16")
+        return()
+    endif()
+
+    get_target_property(target_binary_dir ${target} BINARY_DIR)
+    set(type_list_file "${target_binary_dir}/meta_types/${target}_json_file_list.txt")
+    set(type_list_file_manual "${target_binary_dir}/meta_types/${target}_json_file_list_manual.txt")
+
+    get_target_property(uses_automoc ${target} AUTOMOC)
+    set(automoc_args)
+    set(automoc_dependencies)
+    #Handle automoc generated data
+    if (uses_automoc)
+        # Tell automoc to output json files)
+        set_property(TARGET "${target}" APPEND PROPERTY
+            AUTOMOC_MOC_OPTIONS "--output-json"
+        )
+
+        if(CMAKE_BUILD_TYPE)
+            set(cmake_autogen_cache_file
+                "${target_binary_dir}/CMakeFiles/${target}_autogen.dir/ParseCache.txt")
+            set(mutli_config_args
+                --cmake-autogen-include-dir-path "${target_binary_dir}/${target}_autogen/include"
+            )
+        else()
+            set(cmake_autogen_cache_file
+                "${target_binary_dir}/CMakeFiles/${target}_autogen.dir/ParseCache_$<CONFIG>.txt")
+            set(mutli_config_args
+                --cmake-autogen-include-dir-path "${target_binary_dir}/${target}_autogen/include_$<CONFIG>"
+                "--cmake-multi-config")
+        endif()
+
+        set(cmake_autogen_info_file
+            "${target_binary_dir}/CMakeFiles/${target}_autogen.dir/AutogenInfo.json")
+
+        add_custom_target(${target}_automoc_json_extraction
+            DEPENDS ${QT_CMAKE_EXPORT_NAMESPACE}::cmake_automoc_parser
+            BYPRODUCTS ${type_list_file}
+            COMMAND
+                ${QT_CMAKE_EXPORT_NAMESPACE}::cmake_automoc_parser
+                --cmake-autogen-cache-file "${cmake_autogen_cache_file}"
+                --cmake-autogen-info-file "${cmake_autogen_info_file}"
+                --output-file-path "${type_list_file}"
+                ${mutli_config_args}
+            COMMENT "Running Automoc file extraction"
+            COMMAND_EXPAND_LISTS
+        )
+        add_dependencies(${target}_automoc_json_extraction ${target}_autogen)
+        set(automoc_args "@${type_list_file}")
+        set(automoc_dependencies "${type_list_file}")
+    endif()
+
+    set(manual_args)
+    set(manual_dependencies)
+    if(arg_MANUAL_MOC_JSON_FILES)
+        list(REMOVE_DUPLICATES arg_MANUAL_MOC_JSON_FILES)
+        file(GENERATE
+            OUTPUT ${type_list_file_manual}
+            CONTENT "$<JOIN:$<GENEX_EVAL:${arg_MANUAL_MOC_JSON_FILES}>,\n>"
+        )
+        list(APPEND manual_dependencies ${arg_MANUAL_MOC_JSON_FILES} ${type_list_file_manual})
+        set(manual_args "@${type_list_file_manual}")
+    endif()
+
+    if (NOT manual_args AND NOT automoc_args)
+        message(FATAL_ERROR "Metatype generation requires either the use of AUTOMOC or a manual list of generated json files")
+    endif()
+
+    if (CMAKE_BUILD_TYPE)
+        string(TOLOWER ${target}_${CMAKE_BUILD_TYPE} target_lowercase)
+    else()
+        string(TOLOWER ${target} target_lowercase)
+    endif()
+
+    set(metatypes_file_name "qt6${target_lowercase}_metatypes.json")
+    set(metatypes_file "${target_binary_dir}/meta_types/${metatypes_file_name}")
+    set(metatypes_file_gen "${target_binary_dir}/meta_types/${metatypes_file_name}.gen")
+
+    set(metatypes_dep_file_name "qt6${target_lowercase}_metatypes_dep.txt")
+    set(metatypes_dep_file "${target_binary_dir}/meta_types/${metatypes_dep_file_name}")
+
+    # Due to generated source file dependency rules being tied to the directory
+    # scope in which they are created it is not possible for other targets which
+    # are defined in a separate scope to see these rules. This leads to failures
+    # in locating the generated source files.
+    # To work around this we write a dummy file to disk to make sure targets
+    # which link against the current target do not produce the error. This dummy
+    # file is then replaced with the contents of the generated file during
+    # build.
+    if (NOT EXISTS ${metatypes_file})
+        file(MAKE_DIRECTORY "${target_binary_dir}/meta_types")
+        file(TOUCH ${metatypes_file})
+    endif()
+    if (arg_COPY_OVER_INSTALL AND NOT EXISTS ${arg_INSTALL_DIR}/${metatypes_file_name})
+        file(MAKE_DIRECTORY "${arg_INSTALL_DIR}")
+        file(TOUCH "${arg_INSTALL_DIR}/${metatypes_file_name}")
+    endif()
+    add_custom_command(OUTPUT ${metatypes_file_gen} ${metatypes_file}
+        DEPENDS ${QT_CMAKE_EXPORT_NAMESPACE}::moc ${automoc_dependencies} ${manual_dependencies}
+        COMMAND ${QT_CMAKE_EXPORT_NAMESPACE}::moc
+            -o ${metatypes_file_gen}
+            --collect-json ${automoc_args} ${manual_args}
+        COMMAND ${CMAKE_COMMAND} -E copy_if_different
+            ${metatypes_file_gen}
+            ${metatypes_file}
+        COMMENT "Runing automoc with --collect-json"
+    )
+
+    # We still need to add this file as a source of Core, otherwise the file
+    # rule above is not triggered. INTERFACE_SOURCES do not properly register
+    # as dependencies to build the current target.
+    target_sources(${target} PRIVATE ${metatypes_file_gen})
+    set(metatypes_file_genex_build)
+    set(metatypes_file_genex_install)
+    if (arg_COPY_OVER_INSTALL)
+        set(metatypes_file_genex_build
+            "$<BUILD_INTERFACE:$<$<BOOL:$<TARGET_PROPERTY:QT_CONSUMES_METATYPES>>:${arg_INSTALL_DIR}/${metatypes_file_name}>>"
+        )
+    else()
+        set(metatypes_file_genex_build
+            "$<BUILD_INTERFACE:$<$<BOOL:$<TARGET_PROPERTY:QT_CONSUMES_METATYPES>>:${metatypes_file}>>"
+        )
+        set(metatypes_file_genex_install
+            "$<INSTALL_INTERFACE:$<$<BOOL:$<TARGET_PROPERTY:QT_CONSUMES_METATYPES>>:$<INSTALL_PREFIX>/${arg_INSTALL_DIR}/${metatypes_file_name}>>"
+        )
+    endif()
+    set_source_files_properties(${metatypes_file} PROPERTIES HEADER_FILE_ONLY TRUE)
+
+    set_target_properties(${target} PROPERTIES
+        INTERFACE_QT_MODULE_HAS_META_TYPES YES
+        INTERFACE_QT_MODULE_META_TYPES_FROM_BUILD YES
+        INTERFACE_QT_META_TYPES_BUILD_FILE ${metatypes_file}
+        QT_MODULE_META_TYPES_FILE_GENEX_BUILD "${metatypes_file_genex_build}"
+        QT_MODULE_META_TYPES_FILE_GENEX_INSTALL "${metatypes_file_genex_install}"
+    )
+    target_sources(${target} INTERFACE ${metatypes_file_genex_build} ${metatypes_file_genex_install})
+
+    if (arg_COPY_OVER_INSTALL)
+        get_target_property(target_type ${target} TYPE)
+        set(command_args
+            COMMAND ${CMAKE_COMMAND} -E copy_if_different
+                "${metatypes_file}"
+                "${arg_INSTALL_DIR}/${metatypes_file_name}"
+        )
+        if (target_type STREQUAL "OBJECT_LIBRARY")
+            add_custom_target(${target}_metatypes_copy
+                DEPENDS "${metatypes_file}"
+                ${command_args}
+            )
+            add_dependencies(${target} ${target}_metatypes_copy)
+        else()
+            add_custom_command(TARGET ${target} POST_BUILD
+                ${command_args}
+            )
+        endif()
+    else()
+        install(FILES "${metatypes_file}"
+            DESTINATION "${arg_INSTALL_DIR}"
+        )
+    endif()
+endfunction()
+
+if(NOT QT_NO_CREATE_VERSIONLESS_FUNCTIONS)
+    function(qt_generate_meta_types_json_file)
+        qt6_generate_meta_types_json_file(${ARGV})
+    endfunction()
+endif()
+
+# Generate Win32 RC files for a target. All entries in the RC file are generated
+# from target prorties:
+#
+# QT_TARGET_COMPANY_NAME: RC Company name
+# QT_TARGET_DESCRIPTION: RC File Description
+# QT_TARGET_VERSION: RC File and Product Version
+# QT_TARGET_COPYRIGHT: RC LegalCopyright
+# QT_TARGET_PRODUCT_NAME: RC ProductName
+# QT_TARGET_RC_ICONS: List of paths to icon files
+#
+# If you don not wish to auto-generate rc files, it's possible to provide your
+# own RC file by setting the property QT_TARGET_WINDOWS_RC_FILE with a path to
+# an existing rc file.
+#
+function(qt6_generate_win32_rc_file target)
+
+    get_target_property(target_type ${target} TYPE)
+    if (target_type STREQUAL "INTERFACE_LIBRARY")
+        return()
+    endif()
+
+    get_target_property(target_binary_dir ${target} BINARY_DIR)
+
+    get_target_property(target_rc_file ${target} QT_TARGET_WINDOWS_RC_FILE)
+    get_target_property(target_version ${target} QT_TARGET_VERSION)
+
+    if (NOT target_rc_file AND NOT target_version)
+        return()
+    endif()
+
+    if (NOT target_rc_file)
+        # Generate RC File
+        set(rc_file_output "${target_binary_dir}/${target}_resource.rc")
+        set(target_rc_file "${rc_file_output}")
+
+        set(company_name "")
+        get_target_property(target_company_name ${target} QT_TARGET_COMPANY_NAME)
+        if (target_company_name)
+            set(company_name "${target_company_name}")
+        endif()
+
+        set(file_description "")
+        get_target_property(target_description ${target} QT_TARGET_DESCRIPTION)
+        if (target_description)
+            set(file_description "${target_description}")
+        endif()
+
+        set(legal_copyright "")
+        get_target_property(target_copyright ${target} QT_TARGET_COPYRIGHT)
+        if (target_copyright)
+            set(legal_copyright "${target_copyright}")
+        endif()
+
+        set(product_name "")
+        get_target_property(target_product_name ${target} QT_TARGET_PRODUCT_NAME)
+        if (target_product_name)
+            set(product_name "${target_product_name}")
+        else()
+            set(product_name "${target}")
+        endif()
+
+        set(product_version "")
+        if (target_version)
+            if(target_version MATCHES "[0-9]+\\.[0-9]+\\.[0-9]+\\.[0-9]+")
+                # nothing to do
+            elseif(target_version MATCHES "[0-9]+\\.[0-9]+\\.[0-9]+")
+                set(target_version "${target_version}.0")
+            elseif(target_version MATCHES "[0-9]+\\.[0-9]+")
+                set(target_version "${target_version}.0.0")
+            elseif (target_version MATCHES "[0-9]+")
+                set(target_version "${target_version}.0.0.0")
+            else()
+                message(FATAL_ERROR "Invalid version format")
+            endif()
+            set(product_version "${target_version}")
+        else()
+            set(product_version "0.0.0.0")
+        endif()
+
+        set(file_version "${product_version}")
+        set(original_file_name "$<TARGET_FILE_NAME:${target}>")
+        string(REPLACE "." "," version_comma ${product_version})
+
+        set(icons "")
+        get_target_property(target_icons ${target} QT_TARGET_RC_ICONS)
+        if (target_icons)
+            set(index 1)
+            foreach( icon IN LISTS target_icons)
+                string(APPEND icons "IDI_ICON${index}    ICON    DISCARDABLE   \"${icon}\"\n")
+                math(EXPR index "${index} +1")
+            endforeach()
+        endif()
+
+        set(contents "#include <windows.h>
+${incons}
+VS_VERSION_INFO VERSIONINFO
+FILEVERSION ${version_comma}
+PRODUCTVERSION ${version_comma}
+FILEFLAGSMASK 0x3fL
+#ifdef _DEBUG
+    FILEFLAGS VS_FF_DEBUG
+#else
+    FILEFLAGS 0x0L
+#endif
+FILEOS VOS__WINDOWS32
+FILETYPE VFT_DLL
+FILESUBTYPE 0x0L
+BEGIN
+    BLOCK \"StringFileInfo\"
+    BEGIN
+        BLOCK \"040904b0\"
+        BEGIN
+            VALUE \"CompanyName\", \"${company_name}\"
+            VALUE \"FileDescription\", \"${file_description}\"
+            VALUE \"FileVersion\", \"${file_version}\"
+            VALUE \"LegalCopyright\", \"${legal_copyright}\"
+            VALUE \"OriginalFilename\", \"${original_file_name}\"
+            VALUE \"ProductName\", \"${product_name}\"
+            VALUE \"ProductVersion\", \"${product_version}\"
+        END
+    END
+    BLOCK \"VarFileInfo\"
+    BEGIN
+        VALUE \"Translation\", 0x0409, 1200
+    END
+END
+/* End of Version info */\n"
+        )
+
+        # We can't use the output of file generate as source so we work around
+        # this by generating the file under a different name and then copying
+        # the file in place using add custom command.
+        file(GENERATE OUTPUT "${rc_file_output}.tmp"
+            CONTENT "${contents}"
+        )
+
+        add_custom_command(OUTPUT "${target_rc_file}"
+            DEPENDS "${rc_file_output}.tmp"
+            COMMAND ${CMAKE_COMMAND} -E copy_if_different
+                "${target_rc_file}.tmp"
+                "${target_rc_file}"
+        )
+    endif()
+
+    target_sources(${target} PRIVATE ${target_rc_file})
+
+endfunction()
diff --git a/src/corelib/Qt5ModuleLocation.cmake.in b/src/corelib/Qt6ModuleLocation.cmake.in
index cf70f6bc0e..cf70f6bc0e 100644
--- a/src/corelib/Qt5ModuleLocation.cmake.in
+++ b/src/corelib/Qt6ModuleLocation.cmake.in
diff --git a/src/corelib/Qt5ModuleLocationForInstall.cmake.in b/src/corelib/Qt6ModuleLocationForInstall.cmake.in
index 8751e4acbc..8751e4acbc 100644
--- a/src/corelib/Qt5ModuleLocationForInstall.cmake.in
+++ b/src/corelib/Qt6ModuleLocationForInstall.cmake.in
diff --git a/src/corelib/configure.cmake b/src/corelib/configure.cmake
new file mode 100644
index 0000000000..d2b310b58d
--- /dev/null
+++ b/src/corelib/configure.cmake
@@ -0,0 +1,982 @@
+
+
+#### Inputs
+
+# input iconv
+set(INPUT_iconv "undefined" CACHE STRING "")
+set_property(CACHE INPUT_iconv PROPERTY STRINGS undefined no yes posix sun gnu)
+
+
+
+#### Libraries
+
+qt_find_package(GLIB2 PROVIDED_TARGETS GLIB2::GLIB2)
+qt_find_package(ICU COMPONENTS i18n uc data PROVIDED_TARGETS ICU::i18n ICU::uc ICU::data)
+qt_find_package(Libsystemd PROVIDED_TARGETS PkgConfig::Libsystemd)
+qt_find_package(Atomic PROVIDED_TARGETS Atomic)
+qt_find_package(WrapRt PROVIDED_TARGETS WrapRt)
+qt_find_package(LTTngUST PROVIDED_TARGETS LTTng::UST)
+qt_find_package(WrapSystemPCRE2 PROVIDED_TARGETS WrapSystemPCRE2::WrapSystemPCRE2)
+set_package_properties(WrapPCRE2 PROPERTIES TYPE REQUIRED)
+if((QNX) OR QT_FIND_ALL_PACKAGES_ALWAYS)
+    qt_find_package(PPS PROVIDED_TARGETS PPS::PPS)
+endif()
+qt_find_package(Slog2 PROVIDED_TARGETS Slog2::Slog2)
+
+
+#### Tests
+
+# atomicfptr
+qt_config_compile_test(atomicfptr
+    LABEL "working std::atomic for function pointers"
+    CODE
+"
+#include <atomic>
+typedef void (*fptr)(int);
+typedef std::atomic<fptr> atomicfptr;
+void testfunction(int) { }
+void test(volatile atomicfptr &a)
+{
+    fptr v = a.load(std::memory_order_acquire);
+    while (!a.compare_exchange_strong(v, &testfunction,
+                                      std::memory_order_acq_rel,
+                                      std::memory_order_acquire)) {
+        v = a.exchange(&testfunction);
+    }
+    a.store(&testfunction, std::memory_order_release);
+}
+int main(int argc, char **argv)
+{
+    (void)argc; (void)argv;
+    /* BEGIN TEST: */
+atomicfptr fptr(testfunction);
+test(fptr);
+    /* END TEST: */
+    return 0;
+}
+")
+
+# clock-monotonic
+qt_config_compile_test(clock_monotonic
+    LABEL "POSIX monotonic clock"
+    LIBRARIES
+        WrapRt
+    CODE
+"
+#include <unistd.h>
+#include <time.h>
+
+int main(int argc, char **argv)
+{
+    (void)argc; (void)argv;
+    /* BEGIN TEST: */
+#if defined(_POSIX_MONOTONIC_CLOCK) && (_POSIX_MONOTONIC_CLOCK-0 >= 0)
+timespec ts;
+clock_gettime(CLOCK_MONOTONIC, &ts);
+#else
+#  error Feature _POSIX_MONOTONIC_CLOCK not available
+#endif
+    /* END TEST: */
+    return 0;
+}
+")
+
+# cloexec
+qt_config_compile_test(cloexec
+    LABEL "O_CLOEXEC"
+    CODE
+"#define _GNU_SOURCE 1
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <fcntl.h>
+#include <unistd.h>
+
+int main(int argc, char **argv)
+{
+    (void)argc; (void)argv;
+    /* BEGIN TEST: */
+int pipes[2];
+(void) pipe2(pipes, O_CLOEXEC | O_NONBLOCK);
+(void) fcntl(0, F_DUPFD_CLOEXEC, 0);
+(void) dup3(0, 3, O_CLOEXEC);
+#if defined(__NetBSD__)
+(void) paccept(0, 0, 0, NULL, SOCK_CLOEXEC | SOCK_NONBLOCK);
+#else
+(void) accept4(0, 0, 0, SOCK_CLOEXEC | SOCK_NONBLOCK);
+#endif
+    /* END TEST: */
+    return 0;
+}
+")
+
+# cxx11_future
+if (UNIX)
+    set(cxx11_future_TEST_LIBRARIES pthread)
+endif()
+qt_config_compile_test(cxx11_future
+    LABEL "C++11 <future>"
+    LIBRARIES
+     "${cxx11_future_TEST_LIBRARIES}"
+    CODE
+"
+#include <future>
+
+int main(int argc, char **argv)
+{
+    (void)argc; (void)argv;
+    /* BEGIN TEST: */
+std::future<int> f = std::async([]() { return 42; });
+(void)f.get();
+    /* END TEST: */
+    return 0;
+}
+")
+
+# cxx11_random
+qt_config_compile_test(cxx11_random
+    LABEL "C++11 <random>"
+    CODE
+"
+#include <random>
+
+int main(int argc, char **argv)
+{
+    (void)argc; (void)argv;
+    /* BEGIN TEST: */
+std::mt19937 mt(0);
+    /* END TEST: */
+    return 0;
+}
+")
+
+# cxx17_filesystem
+qt_config_compile_test(cxx17_filesystem
+    LABEL "C++17 <filesystem>"
+    CODE
+"
+#include <filesystem>
+
+int main(int argc, char **argv)
+{
+    (void)argc; (void)argv;
+    /* BEGIN TEST: */
+std::filesystem::path p(\"./file\");
+    /* END TEST: */
+    return 0;
+}
+"# FIXME: qmake: CONFIG += c++17
+)
+
+# eventfd
+qt_config_compile_test(eventfd
+    LABEL "eventfd"
+    CODE
+"
+#include <sys/eventfd.h>
+
+int main(int argc, char **argv)
+{
+    (void)argc; (void)argv;
+    /* BEGIN TEST: */
+eventfd_t value;
+int fd = eventfd(0, EFD_CLOEXEC);
+eventfd_read(fd, &value);
+eventfd_write(fd, value);
+    /* END TEST: */
+    return 0;
+}
+")
+
+# futimens
+qt_config_compile_test(futimens
+    LABEL "futimens()"
+    CODE
+"
+#include <sys/stat.h>
+
+int main(int argc, char **argv)
+{
+    (void)argc; (void)argv;
+    /* BEGIN TEST: */
+futimens(-1, 0);
+    /* END TEST: */
+    return 0;
+}
+"# FIXME: qmake: ["# Block futimens() on Apple platforms unless it's available on ALL", '# deployment targets. This simplifies the logic at the call site', "# dramatically, as it isn't strictly needed compared to futimes().", 'darwin: QMAKE_CXXFLAGS += -Werror=unguarded-availability']
+)
+
+# futimes
+qt_config_compile_test(futimes
+    LABEL "futimes()"
+    CODE
+"
+#include <sys/time.h>
+
+int main(int argc, char **argv)
+{
+    (void)argc; (void)argv;
+    /* BEGIN TEST: */
+futimes(-1, 0);
+    /* END TEST: */
+    return 0;
+}
+")
+
+# getauxval
+qt_config_compile_test(getauxval
+    LABEL "getauxval()"
+    CODE
+"
+#include <sys/auxv.h>
+
+int main(int argc, char **argv)
+{
+    (void)argc; (void)argv;
+    /* BEGIN TEST: */
+(void) getauxval(AT_NULL);
+    /* END TEST: */
+    return 0;
+}
+")
+
+# getentropy
+qt_config_compile_test(getentropy
+    LABEL "getentropy()"
+    CODE
+"
+#include <unistd.h>
+
+int main(int argc, char **argv)
+{
+    (void)argc; (void)argv;
+    /* BEGIN TEST: */
+char buf[32];
+(void) getentropy(buf, sizeof(buf));
+    /* END TEST: */
+    return 0;
+}
+")
+
+# glibc
+qt_config_compile_test(glibc
+    LABEL "GNU libc"
+    CODE
+"
+#include <stdlib.h>
+
+int main(int argc, char **argv)
+{
+    (void)argc; (void)argv;
+    /* BEGIN TEST: */
+return __GLIBC__;
+    /* END TEST: */
+    return 0;
+}
+")
+
+# inotify
+qt_config_compile_test(inotify
+    LABEL "inotify"
+    CODE
+"
+#include <sys/inotify.h>
+
+int main(int argc, char **argv)
+{
+    (void)argc; (void)argv;
+    /* BEGIN TEST: */
+inotify_init();
+inotify_add_watch(0, \"foobar\", IN_ACCESS);
+inotify_rm_watch(0, 1);
+    /* END TEST: */
+    return 0;
+}
+")
+
+# ipc_sysv
+qt_config_compile_test(ipc_sysv
+    LABEL "SysV IPC"
+    CODE
+"
+#include <sys/types.h>
+#include <sys/ipc.h>
+#include <sys/sem.h>
+#include <sys/shm.h>
+#include <fcntl.h>
+
+int main(int argc, char **argv)
+{
+    (void)argc; (void)argv;
+    /* BEGIN TEST: */
+key_t unix_key = ftok(\"test\", 'Q');
+semctl(semget(unix_key, 1, 0666 | IPC_CREAT | IPC_EXCL), 0, IPC_RMID, 0);
+shmget(unix_key, 0, 0666 | IPC_CREAT | IPC_EXCL);
+shmctl(0, 0, (struct shmid_ds *)(0));
+    /* END TEST: */
+    return 0;
+}
+")
+
+# ipc_posix
+if (LINUX)
+    set(ipc_posix_TEST_LIBRARIES pthread rt)
+endif()
+qt_config_compile_test(ipc_posix
+    LABEL "POSIX IPC"
+    LIBRARIES
+     "${ipc_posix_TEST_LIBRARIES}"
+    CODE
+"
+#include <sys/types.h>
+#include <sys/mman.h>
+#include <semaphore.h>
+#include <fcntl.h>
+
+int main(int argc, char **argv)
+{
+    (void)argc; (void)argv;
+    /* BEGIN TEST: */
+sem_close(sem_open(\"test\", O_CREAT | O_EXCL, 0666, 0));
+shm_open(\"test\", O_RDWR | O_CREAT | O_EXCL, 0666);
+shm_unlink(\"test\");
+    /* END TEST: */
+    return 0;
+}
+")
+
+# linkat
+qt_config_compile_test(linkat
+    LABEL "linkat()"
+    CODE
+"#define _ATFILE_SOURCE 1
+#include <fcntl.h>
+#include <unistd.h>
+
+int main(int argc, char **argv)
+{
+    (void)argc; (void)argv;
+    /* BEGIN TEST: */
+linkat(AT_FDCWD, \"foo\", AT_FDCWD, \"bar\", AT_SYMLINK_FOLLOW);
+    /* END TEST: */
+    return 0;
+}
+")
+
+# ppoll
+qt_config_compile_test(ppoll
+    LABEL "ppoll()"
+    CODE
+"
+#include <signal.h>
+#include <poll.h>
+
+int main(int argc, char **argv)
+{
+    (void)argc; (void)argv;
+    /* BEGIN TEST: */
+struct pollfd pfd;
+struct timespec ts;
+sigset_t sig;
+ppoll(&pfd, 1, &ts, &sig);
+    /* END TEST: */
+    return 0;
+}
+")
+
+# pollts
+qt_config_compile_test(pollts
+    LABEL "pollts()"
+    CODE
+"
+#include <poll.h>
+#include <signal.h>
+#include <time.h>
+
+int main(int argc, char **argv)
+{
+    (void)argc; (void)argv;
+    /* BEGIN TEST: */
+struct pollfd pfd;
+struct timespec ts;
+sigset_t sig;
+pollts(&pfd, 1, &ts, &sig);
+    /* END TEST: */
+    return 0;
+}
+")
+
+# poll
+qt_config_compile_test(poll
+    LABEL "poll()"
+    CODE
+"
+#include <poll.h>
+
+int main(int argc, char **argv)
+{
+    (void)argc; (void)argv;
+    /* BEGIN TEST: */
+struct pollfd pfd;
+poll(&pfd, 1, 0);
+    /* END TEST: */
+    return 0;
+}
+")
+
+# renameat2
+qt_config_compile_test(renameat2
+    LABEL "renameat2()"
+    CODE
+"#define _ATFILE_SOURCE 1
+#include <fcntl.h>
+#include <stdio.h>
+
+int main(int argc, char **argv)
+{
+    (void)argc; (void)argv;
+    /* BEGIN TEST: */
+renameat2(AT_FDCWD, argv[1], AT_FDCWD, argv[2], RENAME_NOREPLACE | RENAME_WHITEOUT);
+    /* END TEST: */
+    return 0;
+}
+")
+
+# statx
+qt_config_compile_test(statx
+    LABEL "statx() in libc"
+    CODE
+"#define _ATFILE_SOURCE 1
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
+#include <fcntl.h>
+
+int main(int argc, char **argv)
+{
+    (void)argc; (void)argv;
+    /* BEGIN TEST: */
+struct statx statxbuf;
+unsigned int mask = STATX_BASIC_STATS;
+return statx(AT_FDCWD, \"\", AT_STATX_SYNC_AS_STAT, mask, &statxbuf);
+    /* END TEST: */
+    return 0;
+}
+")
+
+# syslog
+qt_config_compile_test(syslog
+    LABEL "syslog"
+    CODE
+"
+#include <syslog.h>
+
+int main(int argc, char **argv)
+{
+    (void)argc; (void)argv;
+    /* BEGIN TEST: */
+openlog(\"qt\", 0, LOG_USER);
+syslog(LOG_INFO, \"configure\");
+closelog();
+    /* END TEST: */
+    return 0;
+}
+")
+
+# xlocalescanprint
+qt_config_compile_test(xlocalescanprint
+    LABEL "xlocale.h (or equivalents)"
+    CODE
+"
+
+#define QT_BEGIN_NAMESPACE
+#define QT_END_NAMESPACE
+
+#ifdef _MSVC_VER
+#define Q_CC_MSVC _MSVC_VER
+#endif
+
+#define QT_NO_DOUBLECONVERSION
+
+#include QDSP_P_H
+int main(int argc, char **argv)
+{
+    (void)argc; (void)argv;
+    /* BEGIN TEST: */
+#ifdef _MSVC_VER
+_locale_t invalidLocale = NULL;
+#else
+locale_t invalidLocale = NULL;
+#endif
+double a = 3.4;
+qDoubleSnprintf(argv[0], 1, invalidLocale, \"invalid format\", a);
+qDoubleSscanf(argv[0], invalidLocale, \"invalid format\", &a, &argc);
+    /* END TEST: */
+    return 0;
+}
+"# FIXME: qmake: DEFINES += QDSP_P_H=$$shell_quote(\"@PWD@/text/qdoublescanprint_p.h\")
+)
+
+
+
+#### Features
+
+qt_feature("clock-gettime" PRIVATE
+    LABEL "clock_gettime()"
+    CONDITION UNIX AND WrapRt_FOUND
+)
+qt_feature("clock-monotonic" PUBLIC
+    LABEL "POSIX monotonic clock"
+    CONDITION QT_FEATURE_clock_gettime AND TEST_clock_monotonic
+)
+qt_feature_definition("clock-monotonic" "QT_NO_CLOCK_MONOTONIC" NEGATE VALUE "1")
+qt_feature("cxx11_future" PUBLIC
+    LABEL "C++11 <future>"
+    CONDITION TEST_cxx11_future
+)
+qt_feature("cxx17_filesystem" PUBLIC
+    LABEL "C++17 <filesystem>"
+    CONDITION TEST_cxx17_filesystem
+)
+qt_feature("eventfd" PUBLIC
+    LABEL "eventfd"
+    CONDITION NOT WASM AND TEST_eventfd
+)
+qt_feature_definition("eventfd" "QT_NO_EVENTFD" NEGATE VALUE "1")
+qt_feature("futimens" PRIVATE
+    LABEL "futimens()"
+    CONDITION NOT WIN32 AND TEST_futimens
+)
+qt_feature("futimes" PRIVATE
+    LABEL "futimes()"
+    CONDITION NOT WIN32 AND NOT QT_FEATURE_futimens AND TEST_futimes
+)
+qt_feature("getauxval" PRIVATE
+    LABEL "getauxval()"
+    CONDITION LINUX AND TEST_getauxval
+)
+qt_feature("getentropy" PRIVATE
+    LABEL "getentropy()"
+    CONDITION UNIX AND TEST_getentropy
+)
+qt_feature("glib" PUBLIC PRIVATE
+    LABEL "GLib"
+    AUTODETECT NOT WIN32
+    CONDITION GLIB2_FOUND
+)
+qt_feature_definition("glib" "QT_NO_GLIB" NEGATE VALUE "1")
+qt_feature("glibc" PRIVATE
+    LABEL "GNU libc"
+    AUTODETECT LINUX
+    CONDITION TEST_glibc
+)
+qt_feature("iconv" PUBLIC PRIVATE
+    SECTION "Internationalization"
+    LABEL "iconv"
+    PURPOSE "Provides internationalization on Unix."
+    CONDITION NOT QT_FEATURE_icu AND QT_FEATURE_textcodec AND ( TEST_posix_iconv OR TEST_sun_iconv )
+)
+qt_feature_definition("iconv" "QT_NO_ICONV" NEGATE VALUE "1")
+qt_feature("posix-libiconv" PRIVATE
+    LABEL "POSIX iconv"
+    CONDITION NOT WIN32 AND NOT QNX AND NOT ANDROID AND NOT APPLE AND TEST_posix_iconv AND TEST_iconv_needlib
+    ENABLE TEST_posix_iconv AND TEST_iconv_needlib
+    DISABLE NOT TEST_posix_iconv OR NOT TEST_iconv_needlib
+)
+qt_feature("sun-libiconv"
+    LABEL "SUN iconv"
+    CONDITION NOT WIN32 AND NOT QNX AND NOT ANDROID AND NOT APPLE AND TEST_sun_iconv
+    ENABLE TEST_sun_iconv
+    DISABLE NOT TEST_sun_iconv
+)
+qt_feature("gnu-libiconv" PRIVATE
+    LABEL "GNU iconv"
+    CONDITION NOT WIN32 AND NOT QNX AND NOT ANDROID AND NOT APPLE AND TEST_posix_iconv AND NOT TEST_iconv_needlib
+    ENABLE TEST_posix_iconv AND NOT TEST_iconv_needlib
+    DISABLE NOT TEST_posix_iconv OR TEST_iconv_needlib
+)
+qt_feature("icu" PRIVATE
+    LABEL "ICU"
+    AUTODETECT NOT WIN32
+    CONDITION ICU_FOUND
+)
+qt_feature("inotify" PUBLIC PRIVATE
+    LABEL "inotify"
+    CONDITION TEST_inotify
+)
+qt_feature_definition("inotify" "QT_NO_INOTIFY" NEGATE VALUE "1")
+qt_feature("ipc_posix"
+    LABEL "Using POSIX IPC"
+    AUTODETECT NOT WIN32
+    CONDITION NOT TEST_ipc_sysv AND TEST_ipc_posix
+)
+qt_feature_definition("ipc_posix" "QT_POSIX_IPC")
+qt_feature("journald" PRIVATE
+    LABEL "journald"
+    AUTODETECT OFF
+    CONDITION Libsystemd_FOUND
+)
+# Currently only used by QTemporaryFile; linkat() exists on Android, but hardlink creation fails due to security rules
+qt_feature("linkat" PRIVATE
+    LABEL "linkat()"
+    AUTODETECT LINUX AND NOT ANDROID
+    CONDITION TEST_linkat
+)
+qt_feature("std-atomic64" PUBLIC
+    LABEL "64 bit atomic operations"
+    CONDITION Atomic_FOUND
+)
+qt_feature("mimetype" PUBLIC
+    SECTION "Utilities"
+    LABEL "Mimetype handling"
+    PURPOSE "Provides MIME type handling."
+    CONDITION QT_FEATURE_textcodec
+)
+qt_feature_definition("mimetype" "QT_NO_MIMETYPE" NEGATE VALUE "1")
+qt_feature("mimetype-database" PRIVATE
+    LABEL "Built-in copy of the MIME database"
+    CONDITION QT_FEATURE_mimetype
+)
+qt_feature("pcre2"
+    LABEL "PCRE2"
+    ENABLE INPUT_pcre STREQUAL 'qt'
+    DISABLE INPUT_pcre STREQUAL 'no' OR INPUT_pcre STREQUAL 'system'
+)
+qt_feature_config("pcre2" QMAKE_PRIVATE_CONFIG)
+qt_feature("system-pcre2" PRIVATE
+    LABEL "  Using system PCRE2"
+    CONDITION WrapSystemPCRE2_FOUND
+    ENABLE INPUT_pcre STREQUAL 'system'
+    DISABLE INPUT_pcre STREQUAL 'no' OR INPUT_pcre STREQUAL 'qt'
+)
+qt_feature("poll_ppoll" PRIVATE
+    LABEL "Native ppoll()"
+    CONDITION NOT WASM AND TEST_ppoll
+    EMIT_IF NOT WIN32
+)
+qt_feature("poll_pollts" PRIVATE
+    LABEL "Native pollts()"
+    CONDITION NOT QT_FEATURE_poll_ppoll AND TEST_pollts
+    EMIT_IF NOT WIN32
+)
+qt_feature("poll_poll" PRIVATE
+    LABEL "Native poll()"
+    CONDITION NOT QT_FEATURE_poll_ppoll AND NOT QT_FEATURE_poll_pollts AND TEST_poll
+    EMIT_IF NOT WIN32
+)
+qt_feature("poll_select" PRIVATE
+    LABEL "Emulated poll()"
+    CONDITION NOT QT_FEATURE_poll_ppoll AND NOT QT_FEATURE_poll_pollts AND NOT QT_FEATURE_poll_poll
+    EMIT_IF NOT WIN32
+)
+qt_feature_definition("poll_select" "QT_NO_NATIVE_POLL")
+qt_feature("qqnx_pps" PRIVATE
+    LABEL "PPS"
+    CONDITION PPS_FOUND
+    EMIT_IF QNX
+)
+qt_feature("renameat2" PRIVATE
+    LABEL "renameat2()"
+    CONDITION LINUX AND TEST_renameat2
+)
+qt_feature("slog2" PRIVATE
+    LABEL "slog2"
+    CONDITION Slog2_FOUND
+)
+qt_feature("statx" PRIVATE
+    LABEL "statx() in libc"
+    CONDITION LINUX AND TEST_statx
+)
+qt_feature("syslog" PRIVATE
+    LABEL "syslog"
+    AUTODETECT OFF
+    CONDITION TEST_syslog
+)
+qt_feature("threadsafe-cloexec"
+    LABEL "Threadsafe pipe creation"
+    CONDITION TEST_cloexec
+)
+qt_feature_definition("threadsafe-cloexec" "QT_THREADSAFE_CLOEXEC" VALUE "1")
+qt_feature_config("threadsafe-cloexec" QMAKE_PUBLIC_QT_CONFIG)
+qt_feature("properties" PUBLIC
+    SECTION "Kernel"
+    LABEL "Properties"
+    PURPOSE "Supports scripting Qt-based applications."
+)
+qt_feature_definition("properties" "QT_NO_PROPERTIES" NEGATE VALUE "1")
+qt_feature("regularexpression" PUBLIC
+    SECTION "Kernel"
+    LABEL "QRegularExpression"
+    PURPOSE "Provides an API to Perl-compatible regular expressions."
+    CONDITION QT_FEATURE_system_pcre2 OR QT_FEATURE_pcre2
+)
+qt_feature_definition("regularexpression" "QT_NO_REGULAREXPRESSION" NEGATE VALUE "1")
+qt_feature("sharedmemory" PUBLIC
+    SECTION "Kernel"
+    LABEL "QSharedMemory"
+    PURPOSE "Provides access to a shared memory segment."
+    CONDITION ( ANDROID OR WIN32 OR ( NOT VXWORKS AND ( TEST_ipc_sysv OR TEST_ipc_posix ) ) )
+)
+qt_feature_definition("sharedmemory" "QT_NO_SHAREDMEMORY" NEGATE VALUE "1")
+qt_feature("shortcut" PUBLIC
+    SECTION "Kernel"
+    LABEL "QShortcut"
+    PURPOSE "Provides keyboard accelerators and shortcuts."
+)
+qt_feature_definition("shortcut" "QT_NO_SHORTCUT" NEGATE VALUE "1")
+qt_feature("systemsemaphore" PUBLIC
+    SECTION "Kernel"
+    LABEL "QSystemSemaphore"
+    PURPOSE "Provides a general counting system semaphore."
+    CONDITION ( NOT INTEGRITY AND NOT VXWORKS AND NOT rtems ) AND ( ANDROID OR WIN32 OR TEST_ipc_sysv OR TEST_ipc_posix )
+)
+qt_feature_definition("systemsemaphore" "QT_NO_SYSTEMSEMAPHORE" NEGATE VALUE "1")
+qt_feature("xmlstream" PUBLIC
+    SECTION "Kernel"
+    LABEL "XML Streaming APIs"
+    PURPOSE "Provides a simple streaming API for XML."
+)
+qt_feature_definition("xmlstream" "QT_NO_XMLSTREAM" NEGATE VALUE "1")
+qt_feature("xmlstreamreader" PUBLIC
+    SECTION "Kernel"
+    LABEL "QXmlStreamReader"
+    PURPOSE "Provides a well-formed XML parser with a simple streaming API."
+    CONDITION QT_FEATURE_xmlstream
+)
+qt_feature_definition("xmlstreamreader" "QT_NO_XMLSTREAMREADER" NEGATE VALUE "1")
+qt_feature("xmlstreamwriter" PUBLIC
+    SECTION "Kernel"
+    LABEL "QXmlStreamWriter"
+    PURPOSE "Provides a XML writer with a simple streaming API."
+    CONDITION QT_FEATURE_xmlstream
+)
+qt_feature_definition("xmlstreamwriter" "QT_NO_XMLSTREAMWRITER" NEGATE VALUE "1")
+qt_feature("textdate" PUBLIC
+    SECTION "Data structures"
+    LABEL "Text Date"
+    PURPOSE "Supports month and day names in dates."
+)
+qt_feature_definition("textdate" "QT_NO_TEXTDATE" NEGATE VALUE "1")
+qt_feature("datestring" PUBLIC
+    SECTION "Data structures"
+    LABEL "QDate/QTime/QDateTime"
+    PURPOSE "Provides conversion between dates and strings."
+    CONDITION QT_FEATURE_textdate
+)
+qt_feature_definition("datestring" "QT_NO_DATESTRING" NEGATE VALUE "1")
+qt_feature("process" PUBLIC
+    SECTION "File I/O"
+    LABEL "QProcess"
+    PURPOSE "Supports external process invocation."
+    CONDITION QT_FEATURE_processenvironment AND ( QT_FEATURE_thread OR NOT UNIX ) AND NOT WINRT AND NOT APPLE_UIKIT AND NOT INTEGRITY AND NOT VXWORKS AND NOT rtems
+)
+qt_feature_definition("process" "QT_NO_PROCESS" NEGATE VALUE "1")
+qt_feature("processenvironment" PUBLIC
+    SECTION "File I/O"
+    LABEL "QProcessEnvironment"
+    PURPOSE "Provides a higher-level abstraction of environment variables."
+    CONDITION NOT WINRT AND NOT INTEGRITY AND NOT rtems
+)
+qt_feature("temporaryfile" PUBLIC
+    SECTION "File I/O"
+    LABEL "QTemporaryFile"
+    PURPOSE "Provides an I/O device that operates on temporary files."
+)
+qt_feature_definition("temporaryfile" "QT_NO_TEMPORARYFILE" NEGATE VALUE "1")
+qt_feature("library" PUBLIC
+    SECTION "File I/O"
+    LABEL "QLibrary"
+    PURPOSE "Provides a wrapper for dynamically loaded libraries."
+    CONDITION WIN32 OR HPUX OR ( NOT NACL AND QT_FEATURE_dlopen )
+)
+qt_feature_definition("library" "QT_NO_LIBRARY" NEGATE VALUE "1")
+qt_feature("settings" PUBLIC
+    SECTION "File I/O"
+    LABEL "QSettings"
+    PURPOSE "Provides persistent application settings."
+)
+qt_feature_definition("settings" "QT_NO_SETTINGS" NEGATE VALUE "1")
+qt_feature("filesystemwatcher" PUBLIC
+    SECTION "File I/O"
+    LABEL "QFileSystemWatcher"
+    PURPOSE "Provides an interface for monitoring files and directories for modifications."
+    CONDITION NOT WINRT
+)
+qt_feature_definition("filesystemwatcher" "QT_NO_FILESYSTEMWATCHER" NEGATE VALUE "1")
+qt_feature("filesystemiterator" PUBLIC
+    SECTION "File I/O"
+    LABEL "QFileSystemIterator"
+    PURPOSE "Provides fast file system iteration."
+)
+qt_feature_definition("filesystemiterator" "QT_NO_FILESYSTEMITERATOR" NEGATE VALUE "1")
+qt_feature("itemmodel" PUBLIC
+    SECTION "ItemViews"
+    LABEL "Qt Item Model"
+    PURPOSE "Provides the item model for item views"
+)
+qt_feature_definition("itemmodel" "QT_NO_ITEMMODEL" NEGATE VALUE "1")
+qt_feature("proxymodel" PUBLIC
+    SECTION "ItemViews"
+    LABEL "QAbstractProxyModel"
+    PURPOSE "Supports processing of data passed between another model and a view."
+    CONDITION QT_FEATURE_itemmodel
+)
+qt_feature_definition("proxymodel" "QT_NO_PROXYMODEL" NEGATE VALUE "1")
+qt_feature("sortfilterproxymodel" PUBLIC
+    SECTION "ItemViews"
+    LABEL "QSortFilterProxyModel"
+    PURPOSE "Supports sorting and filtering of data passed between another model and a view."
+    CONDITION QT_FEATURE_proxymodel
+)
+qt_feature_definition("sortfilterproxymodel" "QT_NO_SORTFILTERPROXYMODEL" NEGATE VALUE "1")
+qt_feature("identityproxymodel" PUBLIC
+    SECTION "ItemViews"
+    LABEL "QIdentityProxyModel"
+    PURPOSE "Supports proxying a source model unmodified."
+    CONDITION QT_FEATURE_proxymodel
+)
+qt_feature_definition("identityproxymodel" "QT_NO_IDENTITYPROXYMODEL" NEGATE VALUE "1")
+qt_feature("transposeproxymodel" PUBLIC
+    SECTION "ItemViews"
+    LABEL "QTransposeProxyModel"
+    PURPOSE "Provides a proxy to swap rows and columns of a model."
+    CONDITION QT_FEATURE_proxymodel
+)
+qt_feature_definition("transposeproxymodel" "QT_NO_TRANSPOSEPROXYMODEL" NEGATE VALUE "1")
+qt_feature("concatenatetablesproxymodel" PUBLIC
+    SECTION "ItemViews"
+    LABEL "QConcatenateTablesProxyModel"
+    PURPOSE "Supports concatenating source models."
+    CONDITION QT_FEATURE_proxymodel
+)
+qt_feature_definition("concatenatetablesproxymodel" "QT_NO_CONCATENATETABLESPROXYMODEL" NEGATE VALUE "1")
+qt_feature("stringlistmodel" PUBLIC
+    SECTION "ItemViews"
+    LABEL "QStringListModel"
+    PURPOSE "Provides a model that supplies strings to views."
+    CONDITION QT_FEATURE_itemmodel
+)
+qt_feature_definition("stringlistmodel" "QT_NO_STRINGLISTMODEL" NEGATE VALUE "1")
+qt_feature("translation" PUBLIC
+    SECTION "Internationalization"
+    LABEL "Translation"
+    PURPOSE "Supports translations using QObject::tr()."
+)
+qt_feature_definition("translation" "QT_NO_TRANSLATION" NEGATE VALUE "1")
+qt_feature("textcodec" PUBLIC
+    SECTION "Internationalization"
+    LABEL "QTextCodec"
+    PURPOSE "Supports conversions between text encodings."
+)
+qt_feature_definition("textcodec" "QT_NO_TEXTCODEC" NEGATE VALUE "1")
+qt_feature("codecs" PUBLIC
+    SECTION "Internationalization"
+    LABEL "Codecs"
+    PURPOSE "Supports non-unicode text conversions."
+    CONDITION QT_FEATURE_textcodec
+)
+qt_feature_definition("codecs" "QT_NO_CODECS" NEGATE VALUE "1")
+qt_feature("big_codecs" PUBLIC
+    SECTION "Internationalization"
+    LABEL "Big Codecs"
+    PURPOSE "Supports big codecs, e.g. CJK."
+    CONDITION QT_FEATURE_textcodec
+)
+qt_feature_definition("big_codecs" "QT_NO_BIG_CODECS" NEGATE VALUE "1")
+qt_feature("easingcurve" PUBLIC
+    SECTION "Utilities"
+    LABEL "Easing curve"
+    PURPOSE "Provides easing curve."
+)
+qt_feature("animation" PUBLIC
+    SECTION "Utilities"
+    LABEL "Animation"
+    PURPOSE "Provides a framework for animations."
+    CONDITION QT_FEATURE_properties AND QT_FEATURE_easingcurve
+)
+qt_feature_definition("animation" "QT_NO_ANIMATION" NEGATE VALUE "1")
+qt_feature("statemachine" PUBLIC
+    SECTION "Utilities"
+    LABEL "State machine"
+    PURPOSE "Provides hierarchical finite state machines."
+    CONDITION QT_FEATURE_properties
+)
+qt_feature_definition("statemachine" "QT_NO_STATEMACHINE" NEGATE VALUE "1")
+qt_feature("qeventtransition" PUBLIC
+    LABEL "QEventTransition class"
+    CONDITION QT_FEATURE_statemachine
+)
+qt_feature("gestures" PUBLIC
+    SECTION "Utilities"
+    LABEL "Gesture"
+    PURPOSE "Provides a framework for gestures."
+)
+qt_feature_definition("gestures" "QT_NO_GESTURES" NEGATE VALUE "1")
+qt_feature("sha3-fast" PRIVATE
+    SECTION "Utilities"
+    LABEL "Speed optimized SHA3"
+    PURPOSE "Optimizes SHA3 for speed instead of size."
+)
+qt_feature("jalalicalendar" PUBLIC
+    SECTION "Utilities"
+    LABEL "QJalaliCalendar"
+    PURPOSE "Support the Jalali (Persian) calendar"
+)
+qt_feature("hijricalendar" PRIVATE
+    SECTION "Utilities"
+    LABEL "QHijriCalendar"
+    PURPOSE "Generic basis for Islamic calendars, providing shared locale data"
+)
+qt_feature("islamiccivilcalendar" PUBLIC
+    SECTION "Utilities"
+    LABEL "QIslamicCivilCalendar"
+    PURPOSE "Support the Islamic Civil calendar"
+    CONDITION QT_FEATURE_hijricalendar
+)
+qt_feature("timezone" PUBLIC
+    SECTION "Utilities"
+    LABEL "QTimeZone"
+    PURPOSE "Provides support for time-zone handling."
+)
+qt_feature("datetimeparser" PRIVATE
+    SECTION "Utilities"
+    LABEL "QDateTimeParser"
+    PURPOSE "Provides support for parsing date-time texts."
+)
+qt_feature("commandlineparser" PUBLIC
+    SECTION "Utilities"
+    LABEL "QCommandlineParser"
+    PURPOSE "Provides support for command line parsing."
+)
+qt_feature("lttng" PRIVATE
+    LABEL "LTTNG"
+    AUTODETECT OFF
+    CONDITION LINUX AND LTTNGUST_FOUND
+    ENABLE INPUT_trace STREQUAL 'lttng' OR ( INPUT_trace STREQUAL 'yes' AND LINUX )
+    DISABLE INPUT_trace STREQUAL 'etw' OR INPUT_trace STREQUAL 'no'
+)
+qt_feature("etw" PRIVATE
+    LABEL "ETW"
+    AUTODETECT OFF
+    CONDITION WIN32
+    ENABLE INPUT_trace STREQUAL 'etw' OR ( INPUT_trace STREQUAL 'yes' AND WIN32 )
+    DISABLE INPUT_trace STREQUAL 'lttng' OR INPUT_trace STREQUAL 'no'
+)
+qt_feature("win32_system_libs"
+    LABEL "Windows System Libraries"
+    CONDITION WIN32 AND libs.advapi32 AND libs.gdi32 AND libs.kernel32 AND libs.netapi32 AND libs.ole32 AND libs.shell32 AND libs.uuid AND libs.user32 AND libs.winmm AND libs.ws2_32 OR FIXME
+)
+qt_feature("cborstreamreader" PUBLIC
+    SECTION "Utilities"
+    LABEL "CBOR stream reading"
+    PURPOSE "Provides support for reading the CBOR binary format.  Note that this is required for plugin loading. Qt GUI needs QPA plugins for basic operation."
+)
+qt_feature("cborstreamwriter" PUBLIC
+    SECTION "Utilities"
+    LABEL "CBOR stream writing"
+    PURPOSE "Provides support for writing the CBOR binary format."
+)
+qt_feature("binaryjson" PUBLIC
+    SECTION "Utilities"
+    LABEL "Binary JSON (deprecated)"
+    PURPOSE "Provides support for the deprecated binary JSON format."
+)
diff --git a/src/corelib/configure.json b/src/corelib/configure.json
index eb60ad213c..a8efaa509c 100644
--- a/src/corelib/configure.json
+++ b/src/corelib/configure.json
@@ -366,6 +366,15 @@
                 "main": "std::mt19937 mt(0);"
             }
         },
+        "cxx17_filesystem": {
+            "label": "C++17 <filesystem>",
+            "type": "compile",
+            "test": {
+                "include": "filesystem",
+                "main": "std::filesystem::path p(\"./file\");",
+                "qmake": "CONFIG += c++17"
+            }
+        },
         "eventfd": {
             "label": "eventfd",
             "type": "compile",
@@ -613,6 +622,13 @@
             "condition": "tests.cxx11_future",
             "output": [ "publicFeature" ]
         },
+        "cxx17_filesystem": {
+            "label": "C++17 <filesystem>",
+            "condition": "tests.cxx17_filesystem",
+            "output": [
+                "publicFeature"
+            ]
+        },
         "eventfd": {
             "label": "eventfd",
             "condition": "!config.wasm && tests.eventfd",
@@ -770,11 +786,6 @@
             "condition": "libs.pps",
             "output": [ "privateFeature" ]
         },
-        "qeventtransition": {
-            "label": "QEventTransition class",
-            "condition": "features.statemachine",
-            "output": [ "publicFeature" ]
-        },
         "renameat2": {
             "label": "renameat2()",
             "condition": "config.linux && tests.renameat2",
@@ -826,6 +837,12 @@
             ],
             "output": [ "publicFeature", "feature" ]
         },
+        "shortcut": {
+            "label": "QShortcut",
+            "purpose": "Provides keyboard accelerators and shortcuts.",
+            "section": "Kernel",
+            "output": [ "publicFeature", "feature" ]
+        },
         "systemsemaphore": {
             "label": "QSystemSemaphore",
             "purpose": "Provides a general counting system semaphore.",
@@ -873,7 +890,7 @@
             "label": "QProcess",
             "purpose": "Supports external process invocation.",
             "section": "File I/O",
-            "condition": "features.processenvironment && !config.winrt && !config.uikit && !config.integrity && !config.vxworks && !config.rtems",
+            "condition": "features.processenvironment && (features.thread || !config.unix) && !config.winrt && !config.uikit && !config.integrity && !config.vxworks && !config.rtems",
             "output": [ "publicFeature", "feature" ]
         },
         "processenvironment": {
@@ -1009,6 +1026,11 @@
             "condition": "features.properties",
             "output": [ "publicFeature", "feature" ]
         },
+        "qeventtransition": {
+            "label": "QEventTransition class",
+            "condition": "features.statemachine",
+            "output": [ "publicFeature" ]
+        },
         "gestures": {
             "label": "Gesture",
             "purpose": "Provides a framework for gestures.",
@@ -1074,15 +1096,6 @@
             "condition": "config.win32",
             "output": [ "privateFeature" ]
         },
-        "topleveldomain": {
-            "label": "QUrl::topLevelDomain()",
-            "purpose": "Provides support for extracting the top level domain from URLs.
-
-If enabled, a binary dump of the Public Suffix List (http://www.publicsuffix.org,
-Mozilla License) is included. The data is then also used in QNetworkCookieJar::validateCookie.",
-            "section": "Utilities",
-            "output": [ "publicFeature" ]
-        },
         "win32_system_libs": {
             "label": "Windows System Libraries",
             "condition": "config.win32 && libs.advapi32 && libs.gdi32 && libs.kernel32 && libs.netapi32 && libs.ole32 && libs.shell32 && libs.uuid && libs.user32 && libs.winmm && libs.ws2_32"
@@ -1113,10 +1126,7 @@ Note that this is required for plugin loading. Qt GUI needs QPA plugins for basi
         {
             "type": "note",
             "condition": "features.journald || features.syslog || (config.qnx && features.slog2)",
-            "message": "journald, syslog or slog2 integration is enabled.
-If your users intend to develop applications against this build,
-ensure that the IDEs they use either set QT_FORCE_STDERR_LOGGING to 1
-or are able to read the logged output from journald, syslog or slog2."
+            "message": "journald, syslog or slog2 integration is enabled.  If your users intend to develop applications against this build, ensure that the IDEs they use either set QT_FORCE_STDERR_LOGGING to 1 or are able to read the logged output from journald, syslog or slog2."
         },
         {
             "type": "error",
@@ -1126,15 +1136,12 @@ or are able to read the logged output from journald, syslog or slog2."
         {
             "type": "error",
             "condition": "input.doubleconversion == 'no' && !tests.xlocalescanprint",
-            "message": "Your C library does not provide sscanf_l or snprintf_l.
-You need to use libdouble-conversion for double/string conversion."
+            "message": "Your C library does not provide sscanf_l or snprintf_l.  You need to use libdouble-conversion for double/string conversion."
         },
         {
             "type": "error",
             "condition": "!tests.atomicfptr",
-            "message": "detected a std::atomic implementation that fails for function pointers.
-Please apply the patch corresponding to your Standard Library vendor, found in
-  qtbase/config.tests/atomicfptr"
+            "message": "detected a std::atomic implementation that fails for function pointers.  Please apply the patch corresponding to your Standard Library vendor, found in qtbase/config.tests/atomicfptr"
         },
         {
             "type": "error",
diff --git a/src/corelib/doc/snippets/code/doc_src_containers.cpp b/src/corelib/doc/snippets/code/doc_src_containers.cpp
index 84935580c9..9b23a9056c 100644
--- a/src/corelib/doc/snippets/code/doc_src_containers.cpp
+++ b/src/corelib/doc/snippets/code/doc_src_containers.cpp
@@ -205,35 +205,35 @@ for (i = splitter->sizes().begin();
 
 
 //! [15]
-QLinkedList<QString> list;
+QVector<QString> values;
 ...
 QString str;
-foreach (str, list)
+foreach (str, values)
     qDebug() << str;
 //! [15]
 
 
 //! [16]
-QLinkedList<QString> list;
+QVector<QString> values;
 ...
-QLinkedListIterator<QString> i(list);
+QVectorIterator<QString> i(values);
 while (i.hasNext())
     qDebug() << i.next();
 //! [16]
 
 
 //! [17]
-QLinkedList<QString> list;
+QVector<QString> values;
 ...
-foreach (const QString &str, list)
+foreach (const QString &str, values)
     qDebug() << str;
 //! [17]
 
 
 //! [18]
-QLinkedList<QString> list;
+QVector<QString> values;
 ...
-foreach (const QString &str, list) {
+foreach (const QString &str, values) {
     if (str.isEmpty())
         break;
     qDebug() << str;
diff --git a/src/corelib/doc/snippets/code/doc_src_properties.cpp b/src/corelib/doc/snippets/code/doc_src_properties.cpp
index a67945bbcf..e026a47e23 100644
--- a/src/corelib/doc/snippets/code/doc_src_properties.cpp
+++ b/src/corelib/doc/snippets/code/doc_src_properties.cpp
@@ -54,7 +54,7 @@ Q_PROPERTY(type name
             MEMBER memberName [(READ getFunction | WRITE setFunction)])
            [RESET resetFunction]
            [NOTIFY notifySignal]
-           [REVISION int]
+           [REVISION int | REVISION(int[, int])]
            [DESIGNABLE bool]
            [SCRIPTABLE bool]
            [STORED bool]
diff --git a/src/corelib/doc/snippets/code/doc_src_qiterator.cpp b/src/corelib/doc/snippets/code/doc_src_qiterator.cpp
index 58f4166c3e..0d0b864a83 100644
--- a/src/corelib/doc/snippets/code/doc_src_qiterator.cpp
+++ b/src/corelib/doc/snippets/code/doc_src_qiterator.cpp
@@ -64,24 +64,6 @@ while (i.hasPrevious())
     qDebug() << i.previous();
 //! [1]
 
-
-//! [2]
-QLinkedList<float> list;
-...
-QLinkedListIterator<float> i(list);
-while (i.hasNext())
-    qDebug() << i.next();
-//! [2]
-
-
-//! [3]
-QLinkedListIterator<float> i(list);
-i.toBack();
-while (i.hasPrevious())
-    qDebug() << i.previous();
-//! [3]
-
-
 //! [4]
 QVector<float> vector;
 ...
@@ -145,37 +127,6 @@ while (i.hasNext()) {
 }
 //! [10]
 
-
-//! [11]
-QLinkedList<float> list;
-...
-QMutableLinkedListIterator<float> i(list);
-while (i.hasNext())
-    qDebug() << i.next();
-//! [11]
-
-
-//! [12]
-QMutableLinkedListIterator<float> i(list);
-i.toBack();
-while (i.hasPrevious())
-    qDebug() << i.previous();
-//! [12]
-
-
-//! [13]
-QMutableLinkedListIterator<int> i(list);
-while (i.hasNext()) {
-    int val = i.next();
-    if (val < 0) {
-        i.setValue(-val);
-    } else if (val == 0) {
-        i.remove();
-    }
-}
-//! [13]
-
-
 //! [14]
 QVector<float> vector;
 ...
@@ -184,7 +135,6 @@ while (i.hasNext())
     qDebug() << i.next();
 //! [14]
 
-
 //! [15]
 QMutableVectorIterator<float> i(vector);
 i.toBack();
@@ -232,17 +182,6 @@ while (i.hasNext()) {
 }
 //! [19]
 
-
-//! [20]
-QMutableLinkedListIterator<int> i(list);
-while (i.hasNext()) {
-    int val = i.next();
-    if (val < -32768 || val > 32767)
-        i.remove();
-}
-//! [20]
-
-
 //! [21]
 QMutableVectorIterator<int> i(vector);
 while (i.hasNext()) {
@@ -271,16 +210,6 @@ while (i.hasNext()) {
 }
 //! [23]
 
-
-//! [24]
-QMutableLinkedListIterator<double> i(list);
-while (i.hasNext()) {
-    double val = i.next();
-    i.setValue(std::sqrt(val));
-}
-//! [24]
-
-
 //! [25]
 QMutableVectorIterator<double> i(list);
 while (i.hasNext()) {
diff --git a/src/corelib/doc/snippets/code/src_corelib_io_qdebug.cpp b/src/corelib/doc/snippets/code/src_corelib_io_qdebug.cpp
index 14e72e99dd..5154dc5d68 100644
--- a/src/corelib/doc/snippets/code/src_corelib_io_qdebug.cpp
+++ b/src/corelib/doc/snippets/code/src_corelib_io_qdebug.cpp
@@ -93,3 +93,8 @@
     ba = QByteArray("a\0b", 3);
     qDebug() << ba               // prints: "\a\x00""b"
 //! [1]
+
+//! [toString]
+    QTRY_VERIFY2(list.isEmpty(), qPrintable(QString::fromLatin1(
+        "Expected list to be empty, but it has the following items: %1")).arg(QDebug::toString(list)));
+//! [toString]
diff --git a/src/corelib/doc/snippets/code/src_corelib_serialization_qcborstream.cpp b/src/corelib/doc/snippets/code/src_corelib_serialization_qcborstream.cpp
index 6ddb5a9365..973ae75847 100644
--- a/src/corelib/doc/snippets/code/src_corelib_serialization_qcborstream.cpp
+++ b/src/corelib/doc/snippets/code/src_corelib_serialization_qcborstream.cpp
@@ -208,10 +208,10 @@
 //! [19]
 
 //! [20]
-   void appendList(QCborStreamWriter &writer, const QLinkedList<QString> &list)
+   void appendList(QCborStreamWriter &writer, const QVector<QString> &values)
    {
        writer.startArray();
-       for (const QString &s : list)
+       for (const QString &s : values)
            writer.append(s);
        writer.endArray();
    }
@@ -228,10 +228,10 @@
 //! [21]
 
 //! [22]
-   void appendMap(QCborStreamWriter &writer, const QLinkedList<QPair<int, QString>> &list)
+   void appendMap(QCborStreamWriter &writer, const QVector<QPair<int, QString>> &values)
    {
        writer.startMap();
-       for (const auto pair : list) {
+       for (const auto pair : values) {
            writer.append(pair.first)
            writer.append(pair.second);
        }
diff --git a/src/corelib/doc/snippets/code/src_corelib_tools_qbytearray.cpp b/src/corelib/doc/snippets/code/src_corelib_tools_qbytearray.cpp
index 01f620cf08..9c07a2e92c 100644
--- a/src/corelib/doc/snippets/code/src_corelib_tools_qbytearray.cpp
+++ b/src/corelib/doc/snippets/code/src_corelib_tools_qbytearray.cpp
@@ -372,16 +372,13 @@ a = str.toFloat(&ok);              // a == 0, ok == false
 //! [39]
 QByteArray text("Qt is great!");
 text.toBase64();        // returns "UXQgaXMgZ3JlYXQh"
-//! [39]
 
-//! [39bis]
 QByteArray text("<p>Hello?</p>");
 text.toBase64(QByteArray::Base64Encoding | QByteArray::OmitTrailingEquals);      // returns "PHA+SGVsbG8/PC9wPg"
 text.toBase64(QByteArray::Base64Encoding);                                       // returns "PHA+SGVsbG8/PC9wPg=="
 text.toBase64(QByteArray::Base64UrlEncoding);                                    // returns "PHA-SGVsbG8_PC9wPg=="
 text.toBase64(QByteArray::Base64UrlEncoding | QByteArray::OmitTrailingEquals);   // returns "PHA-SGVsbG8_PC9wPg"
-//! [39bis]
-
+//! [39]
 
 //! [40]
 QByteArray ba;
@@ -422,9 +419,7 @@ QDataStream in(&data, QIODevice::ReadOnly);
 //! [44]
 QByteArray text = QByteArray::fromBase64("UXQgaXMgZ3JlYXQh");
 text.data();            // returns "Qt is great!"
-//! [44]
 
-//! [44bis]
 QByteArray::fromBase64("PHA+SGVsbG8/PC9wPg==", QByteArray::Base64Encoding); // returns "<p>Hello?</p>"
 QByteArray::fromBase64("PHA-SGVsbG8_PC9wPg==", QByteArray::Base64UrlEncoding); // returns "<p>Hello?</p>"
 //! [44bis]
@@ -442,7 +437,6 @@ if (result.decodingStatus == QByteArray::Base64DecodingStatus::Ok)
     process(result.decoded);
 //! [44quater]
 
-
 //! [45]
 QByteArray text = QByteArray::fromHex("517420697320677265617421");
 text.data();            // returns "Qt is great!"
diff --git a/src/corelib/doc/snippets/code/src_corelib_tools_qlinkedlist.cpp b/src/corelib/doc/snippets/code/src_corelib_tools_qlinkedlist.cpp
deleted file mode 100644
index e8754a5f34..0000000000
--- a/src/corelib/doc/snippets/code/src_corelib_tools_qlinkedlist.cpp
+++ /dev/null
@@ -1,214 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, you may use this file under the terms of the BSD license
-** as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-//! [0]
-QLinkedList<int> integerList;
-QLinkedList<QTime> timeList;
-//! [0]
-
-
-//! [1]
-QLinkedList<QString> list;
-list << "one" << "two" << "three";
-// list: ["one", "two", "three"]
-//! [1]
-
-
-//! [2]
-QLinkedList<QWidget *> list;
-...
-while (!list.isEmpty())
-    delete list.takeFirst();
-//! [2]
-
-
-//! [3]
-QLinkedList<QString> list;
-list.append("one");
-list.append("two");
-list.append("three");
-// list: ["one", "two", "three"]
-//! [3]
-
-
-//! [4]
-QLinkedList<QString> list;
-list.prepend("one");
-list.prepend("two");
-list.prepend("three");
-// list: ["three", "two", "one"]
-//! [4]
-
-
-//! [5]
-QList<QString> list;
-list << "sun" << "cloud" << "sun" << "rain";
-list.removeAll("sun");
-// list: ["cloud", "rain"]
-//! [5]
-
-
-//! [6]
-QList<QString> list;
-list << "sun" << "cloud" << "sun" << "rain";
-list.removeOne("sun");
-// list: ["cloud", "sun", "rain"]
-//! [6]
-
-
-//! [7]
-QLinkedList<QString> list;
-list.append("January");
-list.append("February");
-...
-list.append("December");
-
-QLinkedList<QString>::iterator i;
-for (i = list.begin(); i != list.end(); ++i)
-    cout << *i << Qt::endl;
-//! [7]
-
-
-//! [8]
-QLinkedList<QString> list;
-...
-QLinkedList<QString>::iterator it = std::find(list.begin(),
-                                              list.end(), "Joel");
-if (it != list.end())
-    cout << "Found Joel" << Qt::endl;
-//! [8]
-
-
-//! [9]
-QLinkedList<int>::iterator i;
-for (i = list.begin(); i != list.end(); ++i)
-    *i += 2;
-//! [9]
-
-
-//! [10]
-QLinkedList<QString> list;
-...
-QLinkedList<QString>::iterator i = list.begin();
-while (i != list.end()) {
-    if ((*i).startsWith('_'))
-        i = list.erase(i);
-    else
-        ++i;
-}
-//! [10]
-
-
-//! [11]
-QLinkedList<QString>::iterator i = list.begin();
-while (i != list.end()) {
-    QLinkedList<QString>::iterator previous = i;
-    ++i;
-    if ((*previous).startsWith('_'))
-        list.erase(previous);
-}
-//! [11]
-
-
-//! [12]
-// WRONG
-while (i != list.end()) {
-    if ((*i).startsWith('_'))
-        list.erase(i);
-    ++i;
-}
-//! [12]
-
-
-//! [13]
-if (*it == "Hello")
-    *it = "Bonjour";
-//! [13]
-
-
-//! [14]
-QLinkedList<QString> list;
-list.append("January");
-list.append("February");
-...
-list.append("December");
-
-QLinkedList<QString>::const_iterator i;
-for (i = list.constBegin(); i != list.constEnd(); ++i)
-    cout << *i << Qt::endl;
-//! [14]
-
-
-//! [15]
-QLinkedList<QString> list;
-...
-QLinkedList<QString>::const_iterator it = std::find(list.constBegin(),
-                                                    list.constEnd(), "Joel");
-if (it != list.constEnd())
-    cout << "Found Joel" << Qt::endl;
-//! [15]
-
-
-//! [16]
-std::list<double> stdlist;
-list.push_back(1.2);
-list.push_back(0.5);
-list.push_back(3.14);
-
-QLinkedList<double> list = QLinkedList<double>::fromStdList(stdlist);
-//! [16]
-
-
-//! [17]
-QLinkedList<double> list;
-list << 1.2 << 0.5 << 3.14;
-
-std::list<double> stdlist = list.toStdList();
-//! [17]
diff --git a/src/corelib/doc/snippets/code/src_corelib_tools_qvector.cpp b/src/corelib/doc/snippets/code/src_corelib_tools_qvector.cpp
index a05233049f..76a8d68f64 100644
--- a/src/corelib/doc/snippets/code/src_corelib_tools_qvector.cpp
+++ b/src/corelib/doc/snippets/code/src_corelib_tools_qvector.cpp
@@ -115,6 +115,29 @@ vector.append(std::move(three));
 //! [move-append]
 
 
+//! [emplace]
+QVector<QString> vector{"a", "ccc"};
+vector.emplace(1, 2, 'b');
+// vector: ["a", "bb", "ccc"]
+//! [emplace]
+
+
+//! [emplace-back]
+QVector<QString> vector{"one", "two"};
+vector.emplaceBack(3, 'a');
+qDebug() << vector;
+// vector: ["one", "two", "aaa"]
+//! [emplace-back]
+
+
+//! [emplace-back-ref]
+QVector<QString> vector;
+auto &ref = vector.emplaceBack();
+ref = "one";
+// vector: ["one"]
+//! [emplace-back-ref]
+
+
 //! [8]
 QVector<QString> vector;
 vector.prepend("one");
diff --git a/src/corelib/doc/snippets/qmetaobject-revision/window.h b/src/corelib/doc/snippets/qmetaobject-revision/window.h
index f93d253b6b..f519a6f2dc 100644
--- a/src/corelib/doc/snippets/qmetaobject-revision/window.h
+++ b/src/corelib/doc/snippets/qmetaobject-revision/window.h
@@ -58,7 +58,7 @@ class Window : public QWidget
 {
     Q_OBJECT
     Q_PROPERTY(int normalProperty READ normalProperty)
-    Q_PROPERTY(int newProperty READ newProperty REVISION 1)
+    Q_PROPERTY(int newProperty READ newProperty REVISION(2, 1))
 
 public:
     Window();
@@ -66,7 +66,7 @@ public:
     int newProperty();
 public slots:
     void normalMethod();
-    Q_REVISION(1) void newMethod();
+    Q_REVISION(2, 1) void newMethod();
 };
 //! [Window class with revision]
 
diff --git a/src/corelib/doc/snippets/qstring/main.cpp b/src/corelib/doc/snippets/qstring/main.cpp
index 58d68d9375..271b6d7afc 100644
--- a/src/corelib/doc/snippets/qstring/main.cpp
+++ b/src/corelib/doc/snippets/qstring/main.cpp
@@ -433,14 +433,12 @@ void Widget::firstIndexOfFunction()
     //! [93]
     QString str = "the minimum";
     str.indexOf(QRegularExpression("m[aeiou]"), 0);       // returns 4
-    //! [93]
 
-    //! [99]
     QString str = "the minimum";
     QRegularExpressionMatch match;
     str.indexOf(QRegularExpression("m[aeiou]"), 0, &match);       // returns 4
     // match.captured() == mi
-    //! [99]
+    //! [93]
 }
 
 void Widget::insertFunction()
@@ -490,14 +488,12 @@ void Widget::lastIndexOfFunction()
     //! [94]
     QString str = "the minimum";
     str.lastIndexOf(QRegularExpression("m[aeiou]"));      // returns 8
-    //! [94]
 
-    //! [100]
     QString str = "the minimum";
     QRegularExpressionMatch match;
     str.lastIndexOf(QRegularExpression("m[aeiou]"), -1, &match);      // returns 8
     // match.captured() == mu
-    //! [100]
+    //! [94]
 }
 
 void Widget::leftFunction()
diff --git a/src/corelib/doc/src/containers.qdoc b/src/corelib/doc/src/containers.qdoc
index d0bb251e81..61bce214be 100644
--- a/src/corelib/doc/src/containers.qdoc
+++ b/src/corelib/doc/src/containers.qdoc
@@ -74,12 +74,10 @@
 
     \section1 The Container Classes
 
-    Qt provides the following sequential containers: QList,
-    QLinkedList, QVector, QStack, and QQueue. For most
-    applications, QList is the best type to use. Although it is
-    implemented as an array-list, it provides very fast prepends and
-    appends. If you really need a linked-list, use QLinkedList; if you
-    want your items to occupy consecutive memory locations, use QVector.
+    Qt provides the following sequential containers: QVector,
+    QStack, and QQueue. For most
+    applications, QVector is the best type to use. It provides very fast
+    appends. If you really need a linked-list, use std::list.
     QStack and QQueue are convenience classes that provide LIFO and
     FIFO semantics.
 
@@ -95,30 +93,11 @@
     \table
     \header \li Class \li Summary
 
-    \row \li \l{QList}<T>
+    \row \li \l{QVector}<T>
     \li This is by far the most commonly used container class. It
     stores a list of values of a given type (T) that can be accessed
-    by index. Internally, the QList is implemented using an array,
-    ensuring that index-based access is very fast.
-
-    Items can be added at either end of the list using
-    QList::append() and QList::prepend(), or they can be inserted in
-    the middle using QList::insert(). More than any other container
-    class, QList is highly optimized to expand to as little code as
-    possible in the executable. QStringList inherits from
-    QList<QString>.
-
-    \row \li \l{QLinkedList}<T>
-    \li This is similar to QList, except that it uses
-    iterators rather than integer indexes to access items. It also
-    provides better performance than QList when inserting in the
-    middle of a huge list, and it has nicer iterator semantics.
-    (Iterators pointing to an item in a QLinkedList remain valid as
-    long as the item exists, whereas iterators to a QList can become
-    invalid after any insertion or removal.)
-
-    \row \li \l{QVector}<T>
-    \li This stores an array of values of a given type at adjacent
+    by index. Internally, it stores an array of values of a
+    given type at adjacent
     positions in memory. Inserting at the front or in the middle of
     a vector can be quite slow, because it can lead to large numbers
     of items having to be moved by one position in memory.
@@ -131,9 +110,9 @@
     and \l{QStack::top()}{top()}.
 
     \row \li \l{QQueue}<T>
-    \li This is a convenience subclass of QList that provides
+    \li This is a convenience subclass of QVector that provides
     "first in, first out" (FIFO) semantics. It adds the following
-    functions to those already present in QList:
+    functions to those already present in QQVector:
     \l{QQueue::enqueue()}{enqueue()},
     \l{QQueue::dequeue()}{dequeue()}, and \l{QQueue::head()}{head()}.
 
@@ -164,11 +143,11 @@
     \endtable
 
     Containers can be nested. For example, it is perfectly possible
-    to use a QMap<QString, QList<int>>, where the key type is
-    QString and the value type QList<int>.
+    to use a QMap<QString, QVector<int>>, where the key type is
+    QString and the value type QVector<int>.
 
     The containers are defined in individual header files with the
-    same name as the container (e.g., \c <QLinkedList>). For
+    same name as the container (e.g., \c <QVector>). For
     convenience, the containers are forward declared in \c
     <QtContainerFwd>.
 
@@ -184,10 +163,10 @@
     double, pointer types, and Qt data types such as QString, QDate,
     and QTime, but it doesn't cover QObject or any QObject subclass
     (QWidget, QDialog, QTimer, etc.). If you attempt to instantiate a
-    QList<QWidget>, the compiler will complain that QWidget's copy
+    QVector<QWidget>, the compiler will complain that QWidget's copy
     constructor and assignment operators are disabled. If you want to
     store these kinds of objects in a container, store them as
-    pointers, for example as QList<QWidget *>.
+    pointers, for example as QVector<QWidget *>.
 
     Here's an example custom data type that meets the requirement of
     an assignable data type:
@@ -260,11 +239,8 @@
     \table
     \header \li Containers                         \li Read-only iterator
                                                   \li Read-write iterator
-    \row    \li QList<T>, QQueue<T>                \li QListIterator<T>
                                                   \li QMutableListIterator<T>
-    \row    \li QLinkedList<T>                     \li QLinkedListIterator<T>
-                                                  \li QMutableLinkedListIterator<T>
-    \row    \li QVector<T>, QStack<T>              \li QVectorIterator<T>
+    \row    \li QVector<T>, QStack<T>, QQueue<T>   \li QVectorIterator<T>
                                                   \li QMutableVectorIterator<T>
     \row    \li QSet<T>                            \li QSetIterator<T>
                                                   \li QMutableSetIterator<T>
@@ -274,9 +250,9 @@
                                                   \li QMutableHashIterator<Key, T>
     \endtable
 
-    In this discussion, we will concentrate on QList and QMap. The
-    iterator types for QLinkedList, QVector, and QSet have exactly
-    the same interface as QList's iterators; similarly, the iterator
+    In this discussion, we will concentrate on QVector and QMap. The
+    iterator types for QSet have exactly
+    the same interface as QVector's iterators; similarly, the iterator
     types for QHash have the same interface as QMap's iterators.
 
     Unlike STL-style iterators (covered \l{STL-style
@@ -291,59 +267,59 @@
     \image javaiterators1.png
 
     Here's a typical loop for iterating through all the elements of a
-    QList<QString> in order and printing them to the console:
+    QVector<QString> in order and printing them to the console:
 
     \snippet code/doc_src_containers.cpp 1
 
-    It works as follows: The QList to iterate over is passed to the
-    QListIterator constructor. At that point, the iterator is located
+    It works as follows: The QVector to iterate over is passed to the
+    QVectorIterator constructor. At that point, the iterator is located
     just in front of the first item in the list (before item "A").
-    Then we call \l{QListIterator::hasNext()}{hasNext()} to
+    Then we call \l{QVectorIterator::hasNext()}{hasNext()} to
     check whether there is an item after the iterator. If there is, we
-    call \l{QListIterator::next()}{next()} to jump over that
+    call \l{QVectorIterator::next()}{next()} to jump over that
     item. The next() function returns the item that it jumps over. For
-    a QList<QString>, that item is of type QString.
+    a QVector<QString>, that item is of type QString.
 
-    Here's how to iterate backward in a QList:
+    Here's how to iterate backward in a QVector:
 
     \snippet code/doc_src_containers.cpp 2
 
     The code is symmetric with iterating forward, except that we
-    start by calling \l{QListIterator::toBack()}{toBack()}
+    start by calling \l{QVectorIterator::toBack()}{toBack()}
     to move the iterator after the last item in the list.
 
     The diagram below illustrates the effect of calling
-    \l{QListIterator::next()}{next()} and
-    \l{QListIterator::previous()}{previous()} on an iterator:
+    \l{QVectorIterator::next()}{next()} and
+    \l{QVectorIterator::previous()}{previous()} on an iterator:
 
     \image javaiterators2.png
 
-    The following table summarizes the QListIterator API:
+    The following table summarizes the QVectorIterator API:
 
     \table
     \header \li Function \li Behavior
-    \row    \li \l{QListIterator::toFront()}{toFront()}
+    \row    \li \l{QVectorIterator::toFront()}{toFront()}
             \li Moves the iterator to the front of the list (before the first item)
-    \row    \li \l{QListIterator::toBack()}{toBack()}
+    \row    \li \l{QVectorIterator::toBack()}{toBack()}
             \li Moves the iterator to the back of the list (after the last item)
-    \row    \li \l{QListIterator::hasNext()}{hasNext()}
+    \row    \li \l{QVectorIterator::hasNext()}{hasNext()}
             \li Returns \c true if the iterator isn't at the back of the list
-    \row    \li \l{QListIterator::next()}{next()}
+    \row    \li \l{QVectorIterator::next()}{next()}
             \li Returns the next item and advances the iterator by one position
-    \row    \li \l{QListIterator::peekNext()}{peekNext()}
+    \row    \li \l{QVectorIterator::peekNext()}{peekNext()}
             \li Returns the next item without moving the iterator
-    \row    \li \l{QListIterator::hasPrevious()}{hasPrevious()}
+    \row    \li \l{QVectorIterator::hasPrevious()}{hasPrevious()}
             \li Returns \c true if the iterator isn't at the front of the list
-    \row    \li \l{QListIterator::previous()}{previous()}
+    \row    \li \l{QVectorIterator::previous()}{previous()}
             \li Returns the previous item and moves the iterator back by one position
-    \row    \li \l{QListIterator::peekPrevious()}{peekPrevious()}
+    \row    \li \l{QVectorIterator::peekPrevious()}{peekPrevious()}
             \li Returns the previous item without moving the iterator
     \endtable
 
-    QListIterator provides no functions to insert or remove items
+    QVectorIterator provides no functions to insert or remove items
     from the list as we iterate. To accomplish this, you must use
     QMutableListIterator. Here's an example where we remove all
-    odd numbers from a QList<int> using QMutableListIterator:
+    odd numbers from a QVector<int> using QMutableListIterator:
 
     \snippet code/doc_src_containers.cpp 3
 
@@ -376,12 +352,12 @@
 
     \snippet code/doc_src_containers.cpp 6
 
-    As mentioned above, QLinkedList's, QVector's, and QSet's iterator
-    classes have exactly the same API as QList's. We will now turn to
+    As mentioned above QSet's iterator
+    classes have exactly the same API as QVector's. We will now turn to
     QMapIterator, which is somewhat different because it iterates on
     (key, value) pairs.
 
-    Like QListIterator, QMapIterator provides
+    Like QVectorIterator, QMapIterator provides
     \l{QMapIterator::toFront()}{toFront()},
     \l{QMapIterator::toBack()}{toBack()},
     \l{QMapIterator::hasNext()}{hasNext()},
@@ -429,11 +405,7 @@
     \table
     \header \li Containers                         \li Read-only iterator
                                                   \li Read-write iterator
-    \row    \li QList<T>, QQueue<T>                \li QList<T>::const_iterator
-                                                  \li QList<T>::iterator
-    \row    \li QLinkedList<T>                     \li QLinkedList<T>::const_iterator
-                                                  \li QLinkedList<T>::iterator
-    \row    \li QVector<T>, QStack<T>              \li QVector<T>::const_iterator
+    \row    \li QVector<T>, QStack<T>, QQueue<T>   \li QVector<T>::const_iterator
                                                   \li QVector<T>::iterator
     \row    \li QSet<T>                            \li QSet<T>::const_iterator
                                                   \li QSet<T>::iterator
@@ -452,24 +424,24 @@
     and the \l{QVector::iterator}{const_iterator} type is
     just a typedef for \c{const T *}.
 
-    In this discussion, we will concentrate on QList and QMap. The
-    iterator types for QLinkedList, QVector, and QSet have exactly
-    the same interface as QList's iterators; similarly, the iterator
+    In this discussion, we will concentrate on QVector and QMap. The
+    iterator types for QSet have exactly
+    the same interface as QVector's iterators; similarly, the iterator
     types for QHash have the same interface as QMap's iterators.
 
     Here's a typical loop for iterating through all the elements of a
-    QList<QString> in order and converting them to lowercase:
+    QVector<QString> in order and converting them to lowercase:
 
     \snippet code/doc_src_containers.cpp 10
 
     Unlike \l{Java-style iterators}, STL-style iterators point
-    directly at items. The \l{QList::begin()}{begin()} function of a container returns an
+    directly at items. The \l{QVector::begin()}{begin()} function of a container returns an
     iterator that points to the first item in the container. The
-    \l{QList::end()}{end()} function of a container returns an iterator to the
+    \l{QVector::end()}{end()} function of a container returns an iterator to the
     imaginary item one position past the last item in the container.
-    \l {QList::end()}{end()} marks an invalid position; it must never be dereferenced.
+    \l {QVector::end()}{end()} marks an invalid position; it must never be dereferenced.
     It is typically used in a loop's break condition. If the list is
-    empty, \l{QList::begin}{begin()} equals \l{QList::end()}{end()}, so we never execute the loop.
+    empty, \l{QVector::begin}{begin()} equals \l{QVector::end()}{end()}, so we never execute the loop.
 
     The diagram below shows the valid iterator positions as red
     arrows for a vector containing four items:
@@ -486,8 +458,8 @@
     compilers also allow us to write \c{i->toLower()}, but some
     don't.
 
-    For read-only access, you can use const_iterator, \l{QList::constBegin}{constBegin()},
-    and \l{QList::constEnd()}{constEnd()}. For example:
+    For read-only access, you can use const_iterator, \l{QVector::constBegin}{constBegin()},
+    and \l{QVector::constEnd()}{constEnd()}. For example:
 
     \snippet code/doc_src_containers.cpp 12
 
@@ -525,7 +497,7 @@
 
     Thanks to \l{implicit sharing}, it is very inexpensive for a
     function to return a container per value. The Qt API contains
-    dozens of functions that return a QList or QStringList per value
+    dozens of functions that return a QVector or QStringList per value
     (e.g., QSplitter::sizes()). If you want to iterate over these
     using an STL iterator, you should always take a copy of the
     container and iterate over the copy. For example:
@@ -558,7 +530,7 @@
 
     Its syntax is: \c foreach (\e variable, \e container) \e
     statement. For example, here's how to use \c foreach to iterate
-    over a QLinkedList<QString>:
+    over a QVector<QString>:
 
     \snippet code/doc_src_containers.cpp 15
 
@@ -647,9 +619,9 @@
 
     Algorithmic complexity is concerned about how fast (or slow) each
     function is as the number of items in the container grow. For
-    example, inserting an item in the middle of a QLinkedList is an
+    example, inserting an item in the middle of a std::list is an
     extremely fast operation, irrespective of the number of items
-    stored in the QLinkedList. On the other hand, inserting an item
+    stored in the list. On the other hand, inserting an item
     in the middle of a QVector is potentially very expensive if the
     QVector contains many items, since half of the items must be
     moved one position in memory.
@@ -667,7 +639,7 @@
     \li \b{Constant time:} O(1). A function is said to run in constant
        time if it requires the same amount of time no matter how many
        items are present in the container. One example is
-       QLinkedList::insert().
+       QVector::push_back().
 
     \li \b{Logarithmic time:} O(log \e n). A function that runs in
        logarithmic time is a function whose running time is
@@ -689,13 +661,11 @@
        number of items stored in the container.
     \endlist
 
-    The following table summarizes the algorithmic complexity of Qt's
-    sequential container classes:
+    The following table summarizes the algorithmic complexity of the sequential
+    container QVector<T>:
 
     \table
     \header \li                \li Index lookup \li Insertion \li Prepending         \li Appending
-    \row    \li QLinkedList<T> \li O(\e n)      \li O(1)      \li O(1)               \li O(1)
-    \row    \li QList<T>       \li O(1)         \li O(n)      \li Amort. O(1)        \li Amort. O(1)
     \row    \li QVector<T>     \li O(1)         \li O(n)      \li O(n)               \li Amort. O(1)
     \endtable
 
@@ -726,11 +696,8 @@
     \section1 Growth Strategies
 
     QVector<T>, QString, and QByteArray store their items
-    contiguously in memory; QList<T> maintains an array of pointers
-    to the items it stores to provide fast index-based access (unless
-    T is a pointer type or a basic type of the size of a pointer, in
-    which case the value itself is stored in the array); QHash<Key,
-    T> keeps a hash table whose size is proportional to the number
+    contiguously in memory; QHash<Key, T> keeps a
+    hash table whose size is proportional to the number
     of items in the hash. To avoid reallocating the data every single
     time an item is added at the end of the container, these classes
     typically allocate more memory than necessary.
@@ -764,7 +731,7 @@
        on the first and last pages actually needs to be copied.
     \endlist
 
-    QByteArray and QList<T> use more or less the same algorithm as
+    QByteArray uses more or less the same algorithm as
     QString.
 
     QVector<T> also uses that algorithm for data types that can be
diff --git a/src/corelib/doc/src/datastreamformat.qdoc b/src/corelib/doc/src/datastreamformat.qdoc
index d6b60f10ce..b813612eec 100644
--- a/src/corelib/doc/src/datastreamformat.qdoc
+++ b/src/corelib/doc/src/datastreamformat.qdoc
@@ -66,8 +66,6 @@
     \li QIcon
     \li QImage
     \li QKeySequence
-    \li QLinkedList<T>
-    \li QList<T>
     \li QMap<Key, T>
     \li QMargins
     \li QMatrix4x4
diff --git a/src/corelib/doc/src/dontdocument.qdoc b/src/corelib/doc/src/dontdocument.qdoc
index ff0aa98709..b1af82fbe2 100644
--- a/src/corelib/doc/src/dontdocument.qdoc
+++ b/src/corelib/doc/src/dontdocument.qdoc
@@ -29,13 +29,13 @@
   \dontdocument (QMacAutoReleasePool QIncompatibleFlag QGenericAtomicOps QAtomicTraits
                  QAtomicOps QBasicAtomicInteger QBasicAtomicPointer QBasicMutex QInternal
                  QArgument QReturnArgument QArrayData QTypedArrayData QStaticByteArrayData
-                 QByteRef QStaticStringData QListSpecialMethods QListData QScopedPointerDeleter
+                 QStaticStringData QListSpecialMethods QListData QScopedPointerDeleter
                  QScopedPointerArrayDeleter QScopedPointerPodDeleter QScopedPointerObjectDeleteLater
                  QMetaTypeId2 QObjectData QObjectUserData QMapNodeBase QMapNode QMapDataBase
                  QMapData QHashData QHashNode QArrayDataPointer QTextStreamManipulator
                  QContiguousCacheData QContiguousCacheTypedData QNoDebug QUrlTwoFlags
                  QCborValueRef qfloat16 QDeferredDeleteEvent QSpecialInteger QLittleEndianStorageType
                  QBigEndianStorageType QFactoryInterface QFutureWatcherBase QJsonValuePtr
-                 QJsonValueRefPtr QLinkedListNode QAbstractConcatenable QStringBuilderCommon
+                 QJsonValueRefPtr QAbstractConcatenable QStringBuilderCommon
                  QTextCodec::ConverterState QThreadStorageData QTextStreamManipulator)
 */
diff --git a/src/corelib/doc/src/includes/qdebug-toString.qdocinc b/src/corelib/doc/src/includes/qdebug-toString.qdocinc
new file mode 100644
index 0000000000..db1e1ab453
--- /dev/null
+++ b/src/corelib/doc/src/includes/qdebug-toString.qdocinc
@@ -0,0 +1,9 @@
+Streams \a object into a QDebug instance that operates on a string,
+and then returns that string.
+
+This function is useful for cases where you need the textual representation
+of an object for debugging, but cannot use \c {operator<<}. For example:
+
+\snippet code/src_corelib_io_qdebug.cpp toString
+
+The string is streamed using \l nospace().
diff --git a/src/corelib/doc/src/objectmodel/properties.qdoc b/src/corelib/doc/src/objectmodel/properties.qdoc
index 680e5598f0..abeb9b7a54 100644
--- a/src/corelib/doc/src/objectmodel/properties.qdoc
+++ b/src/corelib/doc/src/objectmodel/properties.qdoc
@@ -102,8 +102,8 @@
     re-evaluated in QML, for example. Qt emits automatically that signal when
     needed for MEMBER properties that do not have an explicit setter.
 
-    \li A \c REVISION number is optional. If included, it defines
-    the property and its notifier signal to be used in a particular
+    \li A \c REVISION number or \c REVISION() macro is optional. If included,
+    it defines the property and its notifier signal to be used in a particular
     revision of the API (usually for exposure to QML). If not included, it
     defaults to 0.
 
diff --git a/src/corelib/global/qcompilerdetection.h b/src/corelib/global/qcompilerdetection.h
index aa38ef18c0..99a30e941b 100644
--- a/src/corelib/global/qcompilerdetection.h
+++ b/src/corelib/global/qcompilerdetection.h
@@ -91,8 +91,6 @@
 #  define Q_OUTOFLINE_TEMPLATE inline
 #  define Q_COMPILER_MANGLES_RETURN_TYPE
 #  define Q_FUNC_INFO __FUNCSIG__
-#  define Q_ALIGNOF(type) __alignof(type)
-#  define Q_DECL_ALIGN(n) __declspec(align(n))
 #  define Q_ASSUME_IMPL(expr) __assume(expr)
 #  define Q_UNREACHABLE_IMPL() __assume(0)
 #  define Q_NORETURN __declspec(noreturn)
@@ -222,10 +220,8 @@
 #  endif
 
 #  define Q_FUNC_INFO       __PRETTY_FUNCTION__
-#  define Q_ALIGNOF(type)   __alignof__(type)
 #  define Q_TYPEOF(expr)    __typeof__(expr)
 #  define Q_DECL_DEPRECATED __attribute__ ((__deprecated__))
-#  define Q_DECL_ALIGN(n)   __attribute__((__aligned__(n)))
 #  define Q_DECL_UNUSED     __attribute__((__unused__))
 #  define Q_LIKELY(expr)    __builtin_expect(!!(expr), true)
 #  define Q_UNLIKELY(expr)  __builtin_expect(!!(expr), false)
@@ -272,9 +268,7 @@
 #  if __xlC__ < 0x400
 #    error "Compiler not supported"
 #  elif __xlC__ >= 0x0600
-#    define Q_ALIGNOF(type)     __alignof__(type)
 #    define Q_TYPEOF(expr)      __typeof__(expr)
-#    define Q_DECL_ALIGN(n)     __attribute__((__aligned__(n)))
 #    define Q_PACKED            __attribute__((__packed__))
 #  endif
 
@@ -352,7 +346,6 @@
 #    define Q_PACKED __attribute__ ((__packed__))
 #    define Q_FUNC_INFO       __PRETTY_FUNCTION__
 #    define Q_TYPEOF(expr)      __typeof__(expr)
-#    define Q_ALIGNOF(type)     __alignof__(type)
 #    define Q_UNREACHABLE_IMPL()
 #    if defined(__cplusplus)
 #      define Q_COMPILER_AUTO_TYPE
@@ -449,9 +442,7 @@
 #    define QT_NO_TEMPLATE_TEMPLATE_PARAMETERS
    /* see http://developers.sun.com/sunstudio/support/Ccompare.html */
 #    if __SUNPRO_CC >= 0x590
-#      define Q_ALIGNOF(type)   __alignof__(type)
 #      define Q_TYPEOF(expr)    __typeof__(expr)
-#      define Q_DECL_ALIGN(n)   __attribute__((__aligned__(n)))
 #    endif
 #    if __SUNPRO_CC >= 0x550
 #      define Q_DECL_EXPORT     __global
@@ -488,9 +479,6 @@
 #      define Q_DECL_EXPORT     __declspec(dllexport)
 #      define Q_DECL_IMPORT     __declspec(dllimport)
 #    endif
-#    if __HP_aCC-0 >= 061200
-#      define Q_DECL_ALIGN(n) __attribute__((aligned(n)))
-#    endif
 #    if __HP_aCC-0 >= 062000
 #      define Q_DECL_EXPORT     __attribute__((visibility("default")))
 #      define Q_DECL_HIDDEN     __attribute__((visibility("hidden")))
@@ -1133,14 +1121,12 @@
 #endif
 #define Q_DECL_NOTHROW Q_DECL_NOEXCEPT
 
-#if defined(Q_COMPILER_ALIGNOF)
-#  undef Q_ALIGNOF
-#  define Q_ALIGNOF(x)  alignof(x)
+#ifndef Q_ALIGNOF
+# define Q_ALIGNOF(x)  alignof(x)
 #endif
 
-#if defined(Q_COMPILER_ALIGNAS)
-#  undef Q_DECL_ALIGN
-#  define Q_DECL_ALIGN(n)   alignas(n)
+#ifndef Q_DECL_ALIGN
+# define Q_DECL_ALIGN(n)   alignas(n)
 #endif
 
 #if __has_cpp_attribute(nodiscard) && !defined(Q_CC_CLANG)         // P0188R1
diff --git a/src/corelib/global/qconfig-bootstrapped.h b/src/corelib/global/qconfig-bootstrapped.h
index b3daf43c04..5733864459 100644
--- a/src/corelib/global/qconfig-bootstrapped.h
+++ b/src/corelib/global/qconfig-bootstrapped.h
@@ -79,6 +79,7 @@
 #define QT_FEATURE_cborstreamwriter 1
 #define QT_CRYPTOGRAPHICHASH_ONLY_SHA1
 #define QT_FEATURE_cxx11_random (__has_include(<random>) ? 1 : -1)
+#define QT_FEATURE_cxx17_filesystem -1
 #define QT_NO_DATASTREAM
 #define QT_FEATURE_datestring 1
 #define QT_FEATURE_datetimeparser -1
@@ -112,6 +113,7 @@
 # define QT_FEATURE_renameat2 -1
 #endif
 #define QT_FEATURE_sharedmemory -1
+#define QT_FEATURE_shortcut -1
 #define QT_FEATURE_signaling_nan -1
 #define QT_FEATURE_slog2 -1
 #ifdef __GLIBC_PREREQ
diff --git a/src/corelib/global/qconfig.cpp.in b/src/corelib/global/qconfig.cpp.in
new file mode 100644
index 0000000000..7fa21bcfed
--- /dev/null
+++ b/src/corelib/global/qconfig.cpp.in
@@ -0,0 +1,32 @@
+/* Installation date */
+static const char qt_configure_installation     [12+11]  = "qt_instdate=2012-12-20";
+/* Installation Info */
+static const char qt_configure_prefix_path_str  [12+256] = "qt_prfxpath=@CMAKE_INSTALL_PREFIX@";
+#ifdef QT_BUILD_QMAKE
+static const char qt_configure_ext_prefix_path_str   [12+256] = "qt_epfxpath=@CMAKE_INSTALL_PREFIX@";
+static const char qt_configure_host_prefix_path_str  [12+256] = "qt_hpfxpath=@CMAKE_INSTALL_PREFIX@";
+#endif
+static const short qt_configure_str_offsets[] = {
+@QT_CONFIG_STR_OFFSETS_FIRST@
+#ifdef QT_BUILD_QMAKE
+@QT_CONFIG_STR_OFFSETS_SECOND@
+#endif
+};
+static const char qt_configure_strs[] =
+@QT_CONFIG_STRS_FIRST@
+#ifdef QT_BUILD_QMAKE
+@QT_CONFIG_STRS_SECOND@
+#endif
+;
+#define QT_CONFIGURE_SETTINGS_PATH "@QT_DEFAULT_SYS_CONF_DIR@"
+#define QT_CONFIGURE_LIBLOCATION_TO_PREFIX_PATH "@QT_CONFIGURE_LIBLOCATION_TO_PREFIX_PATH@"
+#define QT_CONFIGURE_HOSTBINDIR_TO_EXTPREFIX_PATH "@QT_CONFIGURE_HOSTBINDIR_TO_EXTPREFIX_PATH@"
+#define QT_CONFIGURE_HOSTBINDIR_TO_HOSTPREFIX_PATH "@QT_CONFIGURE_HOSTBINDIR_TO_HOSTPREFIX_PATH@"
+#ifdef QT_BUILD_QMAKE
+# define QT_CONFIGURE_SYSROOTIFY_PREFIX false
+#endif
+#define QT_CONFIGURE_PREFIX_PATH qt_configure_prefix_path_str + 12
+#ifdef QT_BUILD_QMAKE
+# define QT_CONFIGURE_EXT_PREFIX_PATH qt_configure_ext_prefix_path_str + 12
+# define QT_CONFIGURE_HOST_PREFIX_PATH qt_configure_host_prefix_path_str + 12
+#endif
diff --git a/src/corelib/global/qendian.cpp b/src/corelib/global/qendian.cpp
index eb08b2f848..c69572cccf 100644
--- a/src/corelib/global/qendian.cpp
+++ b/src/corelib/global/qendian.cpp
@@ -764,7 +764,7 @@ QT_BEGIN_NAMESPACE
 
 #if defined(__SSSE3__)
 using ShuffleMask = uchar[16];
-Q_DECL_ALIGN(16) static const ShuffleMask shuffleMasks[3] = {
+alignas(16) static const ShuffleMask shuffleMasks[3] = {
     // 16-bit
     {1, 0, 3, 2,  5, 4, 7, 6,  9, 8, 11, 10,  13, 12, 15, 14},
     // 32-bit
diff --git a/src/corelib/global/qglobal.cpp b/src/corelib/global/qglobal.cpp
index 0f7ba8580e..c9e155555c 100644
--- a/src/corelib/global/qglobal.cpp
+++ b/src/corelib/global/qglobal.cpp
@@ -1215,11 +1215,14 @@ bool qSharedBuild() noexcept
            the application is compiled (32 or 64).
 */
 
+#if QT_DEPRECATED_SINCE(5, 9)
 /*!
     \deprecated
     \variable QSysInfo::WindowsVersion
     \brief the version of the Windows operating system on which the
            application is run.
+
+    Use QOperatingSystemVersion::current() instead.
 */
 
 /*!
@@ -1227,6 +1230,8 @@ bool qSharedBuild() noexcept
     \fn QSysInfo::WindowsVersion QSysInfo::windowsVersion()
     \since 4.4
 
+    Use QOperatingSystemVersion::current() instead.
+
     Returns the version of the Windows operating system on which the
     application is run, or WV_None if the operating system is not
     Windows.
@@ -1237,16 +1242,21 @@ bool qSharedBuild() noexcept
     \variable QSysInfo::MacintoshVersion
     \brief the version of the Macintosh operating system on which
            the application is run.
+
+    Use QOperatingSystemVersion::current() instead.
 */
 
 /*!
     \deprecated
     \fn QSysInfo::MacVersion QSysInfo::macVersion()
 
+    Use QOperatingSystemVersion::current() instead.
+
     Returns the version of Darwin (\macos or iOS) on which the
     application is run, or MV_None if the operating system
     is not a version of Darwin.
 */
+#endif
 
 /*!
     \enum QSysInfo::Endian
@@ -1257,10 +1267,13 @@ bool qSharedBuild() noexcept
                       the platform's byte order.
 */
 
+#if QT_DEPRECATED_SINCE(5, 9)
 /*!
     \deprecated
     \enum QSysInfo::WinVersion
 
+    Use the versions defined in QOperatingSystemVersion instead.
+
     This enum provides symbolic names for the various versions of the
     Windows operating system. On Windows, the
     QSysInfo::WindowsVersion variable gives the version of the system
@@ -1318,6 +1331,8 @@ bool qSharedBuild() noexcept
     \deprecated
     \enum QSysInfo::MacVersion
 
+    Use the versions defined in QOperatingSystemVersion instead.
+
     This enum provides symbolic names for the various versions of the
     Darwin operating system, covering both \macos and iOS. The
     QSysInfo::MacintoshVersion variable gives the version of the
@@ -1388,6 +1403,7 @@ bool qSharedBuild() noexcept
 
     \sa WinVersion
 */
+#endif
 
 /*!
     \macro Q_OS_DARWIN
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h
index 35c0482768..c1fcc12cfb 100644
--- a/src/corelib/global/qglobal.h
+++ b/src/corelib/global/qglobal.h
@@ -86,14 +86,9 @@
 #define QT_CONFIG(feature) (1/QT_FEATURE_##feature == 1)
 #define QT_REQUIRE_CONFIG(feature) Q_STATIC_ASSERT_X(QT_FEATURE_##feature == 1, "Required feature " #feature " for file " __FILE__ " not available.")
 
-#if QT_VERSION >= QT_VERSION_CHECK(6,0,0)
-#  define QT_NO_UNSHARABLE_CONTAINERS
-#  define QT6_VIRTUAL virtual
-#  define QT6_NOT_VIRTUAL
-#else
-#  define QT6_VIRTUAL
-#  define QT6_NOT_VIRTUAL virtual
-#endif
+// ### Clean those up, once all code is adjusted
+#define QT6_VIRTUAL virtual
+#define QT6_NOT_VIRTUAL
 
 /* These two macros makes it possible to turn the builtin line expander into a
  * string literal. */
@@ -498,53 +493,6 @@ Q_CORE_EXPORT Q_DECL_CONST_FUNCTION const char *qVersion(void) Q_DECL_NOEXCEPT;
 # define Q_DESTRUCTOR_FUNCTION(AFUNC) Q_DESTRUCTOR_FUNCTION0(AFUNC)
 #endif
 
-namespace QtPrivate {
-    template <class T>
-    struct AlignOfHelper
-    {
-        char c;
-        T type;
-
-        AlignOfHelper();
-        ~AlignOfHelper();
-    };
-
-    template <class T>
-    struct AlignOf_Default
-    {
-        enum { Value = sizeof(AlignOfHelper<T>) - sizeof(T) };
-    };
-
-    template <class T> struct AlignOf : AlignOf_Default<T> { };
-    template <class T> struct AlignOf<T &> : AlignOf<T> {};
-    template <class T> struct AlignOf<T &&> : AlignOf<T> {};
-    template <size_t N, class T> struct AlignOf<T[N]> : AlignOf<T> {};
-
-#if defined(Q_PROCESSOR_X86_32) && !defined(Q_OS_WIN)
-    template <class T> struct AlignOf_WorkaroundForI386Abi { enum { Value = sizeof(T) }; };
-
-    // x86 ABI weirdness
-    // Alignment of naked type is 8, but inside struct has alignment 4.
-    template <> struct AlignOf<double>  : AlignOf_WorkaroundForI386Abi<double> {};
-    template <> struct AlignOf<qint64>  : AlignOf_WorkaroundForI386Abi<qint64> {};
-    template <> struct AlignOf<quint64> : AlignOf_WorkaroundForI386Abi<quint64> {};
-#ifdef Q_CC_CLANG
-    // GCC and Clang seem to disagree wrt to alignment of arrays
-    template <size_t N> struct AlignOf<double[N]>   : AlignOf_Default<double> {};
-    template <size_t N> struct AlignOf<qint64[N]>   : AlignOf_Default<qint64> {};
-    template <size_t N> struct AlignOf<quint64[N]>  : AlignOf_Default<quint64> {};
-#endif
-#endif
-} // namespace QtPrivate
-
-#define QT_EMULATED_ALIGNOF(T) \
-    (size_t(QT_PREPEND_NAMESPACE(QtPrivate)::AlignOf<T>::Value))
-
-#ifndef Q_ALIGNOF
-#define Q_ALIGNOF(T) QT_EMULATED_ALIGNOF(T)
-#endif
-
-
 /*
   quintptr and qptrdiff is guaranteed to be the same size as a pointer, i.e.
 
diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp
index 835fea0c77..c8c7c0bf9b 100644
--- a/src/corelib/global/qlibraryinfo.cpp
+++ b/src/corelib/global/qlibraryinfo.cpp
@@ -419,7 +419,6 @@ static const struct {
 #endif
     { "Binaries", "bin" },
     { "Plugins", "plugins" }, // should be ${ArchData}/plugins
-    { "Imports", "imports" }, // should be ${ArchData}/imports
     { "Qml2Imports", "qml" }, // should be ${ArchData}/qml
     { "ArchData", "." },
     { "Data", "." },
@@ -671,6 +670,8 @@ static const char *getPrefix(
 #  if QT_CONFIGURE_CROSSBUILD
     if (group == QLibraryInfo::DevicePaths)
         return QT_CONFIGURE_PREFIX_PATH;
+#  else
+    Q_UNUSED(group);
 #  endif
     static QByteArray extPrefixPath = getExtPrefixFromHostBinDir().toLatin1();
     return extPrefixPath.constData();
@@ -903,7 +904,6 @@ QStringList QLibraryInfo::platformPluginArguments(const QString &platformName)
     \value LibraryExecutablesPath The location of installed executables required by libraries at runtime.
     \value BinariesPath The location of installed Qt binaries (tools and applications).
     \value PluginsPath The location of installed Qt plugins.
-    \value ImportsPath The location of installed QML extensions to import (QML 1.x).
     \value Qml2ImportsPath The location of installed QML extensions to import (QML 2.x).
     \value ArchDataPath The location of general architecture-dependent Qt data.
     \value DataPath The location of general architecture-independent Qt data.
diff --git a/src/corelib/global/qlibraryinfo.h b/src/corelib/global/qlibraryinfo.h
index ed60b170a5..031dfe37e2 100644
--- a/src/corelib/global/qlibraryinfo.h
+++ b/src/corelib/global/qlibraryinfo.h
@@ -79,7 +79,6 @@ public:
         LibraryExecutablesPath,
         BinariesPath,
         PluginsPath,
-        ImportsPath,
         Qml2ImportsPath,
         ArchDataPath,
         DataPath,
diff --git a/src/corelib/global/qlogging.cpp b/src/corelib/global/qlogging.cpp
index 89f49324c0..123cc88ad6 100644
--- a/src/corelib/global/qlogging.cpp
+++ b/src/corelib/global/qlogging.cpp
@@ -1307,7 +1307,7 @@ static QStringList backtraceFramesForLogMessage(int frameCount)
                 QString function = m.captured(2);
 
                 // skip the trace from QtCore that are because of the qDebug itself
-                if (!numberPrinted && library.contains(QLatin1String("Qt5Core"))
+                if (!numberPrinted && library.contains(QLatin1String("Qt6Core"))
                         && (function.isEmpty() || function.contains(QLatin1String("Message"), Qt::CaseInsensitive)
                             || function.contains(QLatin1String("QDebug")))) {
                     continue;
diff --git a/src/corelib/global/qnamespace.h b/src/corelib/global/qnamespace.h
index b745d0de7e..8851e08d4f 100644
--- a/src/corelib/global/qnamespace.h
+++ b/src/corelib/global/qnamespace.h
@@ -41,6 +41,7 @@
 #define QNAMESPACE_H
 
 #include <QtCore/qglobal.h>
+#include <QtCore/qtmetamacros.h>
 
 #if defined(__OBJC__) && !defined(__cplusplus)
 #  warning "File built in Objective-C mode (.m), but using Qt requires Objective-C++ (.mm)"
@@ -48,29 +49,10 @@
 
 QT_BEGIN_NAMESPACE
 
-#if !defined(Q_QDOC) && !defined(Q_MOC_RUN)
 struct QMetaObject;
-const QMetaObject *qt_getQtMetaObject() noexcept; // defined in qobject.h (which can't be included here)
-#define QT_Q_ENUM(ENUM) \
-    inline const QMetaObject *qt_getEnumMetaObject(ENUM) noexcept { return qt_getQtMetaObject(); } \
-    inline Q_DECL_CONSTEXPR const char *qt_getEnumName(ENUM) noexcept { return #ENUM; }
-#define QT_Q_FLAG(ENUM) QT_Q_ENUM(ENUM)
-#else
-#define QT_Q_ENUM Q_ENUM
-#define QT_Q_FLAG Q_FLAG
-#endif
-
-#ifndef Q_MOC_RUN
-namespace
-#else
-class Q_CORE_EXPORT
-#endif
-Qt {
 
-#if defined(Q_MOC_RUN)
-    Q_OBJECT
-public:
-#endif
+namespace Qt {
+    Q_NAMESPACE_EXPORT(Q_CORE_EXPORT)
 
     enum GlobalColor {
         color0,
@@ -1773,102 +1755,96 @@ public:
     enum ReturnByValueConstant { ReturnByValue }; // ### Qt 7: Remove me
 
 #ifndef Q_QDOC
-    // NOTE: Generally, do not add QT_Q_ENUM if a corresponding Q_Q_FLAG exists.
-    QT_Q_ENUM(ScrollBarPolicy)
-    QT_Q_ENUM(FocusPolicy)
-    QT_Q_ENUM(ContextMenuPolicy)
-    QT_Q_ENUM(ArrowType)
-    QT_Q_ENUM(ToolButtonStyle)
-    QT_Q_ENUM(PenStyle)
-    QT_Q_ENUM(PenCapStyle)
-    QT_Q_ENUM(PenJoinStyle)
-    QT_Q_ENUM(BrushStyle)
-    QT_Q_ENUM(FillRule)
-    QT_Q_ENUM(MaskMode)
-    QT_Q_ENUM(BGMode)
-    QT_Q_ENUM(ClipOperation)
-    QT_Q_ENUM(SizeMode)
-    QT_Q_ENUM(Axis)
-    QT_Q_ENUM(Corner)
-    QT_Q_ENUM(Edge)
-    QT_Q_ENUM(LayoutDirection)
-    QT_Q_ENUM(SizeHint)
-    QT_Q_ENUM(Orientation)
-    QT_Q_ENUM(DropAction)
-    QT_Q_FLAG(Alignment)
-    QT_Q_ENUM(TextFlag)
-    QT_Q_FLAG(Orientations)
-    QT_Q_FLAG(SplitBehavior)
-    QT_Q_FLAG(DropActions)
-    QT_Q_FLAG(Edges)
-    QT_Q_FLAG(DockWidgetAreas)
-    QT_Q_FLAG(ToolBarAreas)
-    QT_Q_ENUM(DockWidgetArea)
-    QT_Q_ENUM(ToolBarArea)
-    QT_Q_ENUM(TextFormat)
-    QT_Q_ENUM(TextElideMode)
-    QT_Q_ENUM(DateFormat)
-    QT_Q_ENUM(TimeSpec)
-    QT_Q_ENUM(DayOfWeek)
-    QT_Q_ENUM(CursorShape)
-    QT_Q_ENUM(GlobalColor)
-    QT_Q_ENUM(AspectRatioMode)
-    QT_Q_ENUM(TransformationMode)
-    QT_Q_FLAG(ImageConversionFlags)
-    QT_Q_ENUM(Key)
-    QT_Q_ENUM(ShortcutContext)
-    QT_Q_ENUM(TextInteractionFlag)
-    QT_Q_FLAG(TextInteractionFlags)
-    QT_Q_ENUM(ItemSelectionMode)
-    QT_Q_ENUM(ItemSelectionOperation)
-    QT_Q_FLAG(ItemFlags)
-    QT_Q_ENUM(CheckState)
-    QT_Q_ENUM(ItemDataRole)
-    QT_Q_ENUM(SortOrder)
-    QT_Q_ENUM(CaseSensitivity)
-    QT_Q_FLAG(MatchFlags)
-    QT_Q_FLAG(KeyboardModifiers)
-    QT_Q_FLAG(MouseButtons)
-    QT_Q_ENUM(WindowType)
-    QT_Q_ENUM(WindowState)
-    QT_Q_ENUM(WindowModality)
-    QT_Q_ENUM(WidgetAttribute)
-    QT_Q_ENUM(ApplicationAttribute)
-    QT_Q_FLAG(WindowFlags)
-    QT_Q_FLAG(WindowStates)
-    QT_Q_ENUM(FocusReason)
-    QT_Q_ENUM(InputMethodHint)
-    QT_Q_ENUM(InputMethodQuery)
-    QT_Q_FLAG(InputMethodHints)
-    QT_Q_ENUM(EnterKeyType)
-    QT_Q_FLAG(InputMethodQueries)
-    QT_Q_FLAG(TouchPointStates)
-    QT_Q_ENUM(ScreenOrientation)
-    QT_Q_FLAG(ScreenOrientations)
-    QT_Q_ENUM(ConnectionType)
-    QT_Q_ENUM(ApplicationState)
+    // NOTE: Generally, do not add Q_ENUM_NS if a corresponding Q_FLAG_NS exists.
+    Q_ENUM_NS(ScrollBarPolicy)
+    Q_ENUM_NS(FocusPolicy)
+    Q_ENUM_NS(ContextMenuPolicy)
+    Q_ENUM_NS(ArrowType)
+    Q_ENUM_NS(ToolButtonStyle)
+    Q_ENUM_NS(PenStyle)
+    Q_ENUM_NS(PenCapStyle)
+    Q_ENUM_NS(PenJoinStyle)
+    Q_ENUM_NS(BrushStyle)
+    Q_ENUM_NS(FillRule)
+    Q_ENUM_NS(MaskMode)
+    Q_ENUM_NS(BGMode)
+    Q_ENUM_NS(ClipOperation)
+    Q_ENUM_NS(SizeMode)
+    Q_ENUM_NS(Axis)
+    Q_ENUM_NS(Corner)
+    Q_ENUM_NS(Edge)
+    Q_ENUM_NS(LayoutDirection)
+    Q_ENUM_NS(SizeHint)
+    Q_ENUM_NS(Orientation)
+    Q_ENUM_NS(DropAction)
+    Q_FLAG_NS(Alignment)
+    Q_ENUM_NS(TextFlag)
+    Q_FLAG_NS(Orientations)
+    Q_FLAG_NS(SplitBehavior)
+    Q_FLAG_NS(DropActions)
+    Q_FLAG_NS(Edges)
+    Q_FLAG_NS(DockWidgetAreas)
+    Q_FLAG_NS(ToolBarAreas)
+    Q_ENUM_NS(DockWidgetArea)
+    Q_ENUM_NS(ToolBarArea)
+    Q_ENUM_NS(TextFormat)
+    Q_ENUM_NS(TextElideMode)
+    Q_ENUM_NS(DateFormat)
+    Q_ENUM_NS(TimeSpec)
+    Q_ENUM_NS(DayOfWeek)
+    Q_ENUM_NS(CursorShape)
+    Q_ENUM_NS(GlobalColor)
+    Q_ENUM_NS(AspectRatioMode)
+    Q_ENUM_NS(TransformationMode)
+    Q_FLAG_NS(ImageConversionFlags)
+    Q_ENUM_NS(Key)
+    Q_ENUM_NS(ShortcutContext)
+    Q_ENUM_NS(TextInteractionFlag)
+    Q_FLAG_NS(TextInteractionFlags)
+    Q_ENUM_NS(ItemSelectionMode)
+    Q_ENUM_NS(ItemSelectionOperation)
+    Q_FLAG_NS(ItemFlags)
+    Q_ENUM_NS(CheckState)
+    Q_ENUM_NS(ItemDataRole)
+    Q_ENUM_NS(SortOrder)
+    Q_ENUM_NS(CaseSensitivity)
+    Q_FLAG_NS(MatchFlags)
+    Q_FLAG_NS(KeyboardModifiers)
+    Q_FLAG_NS(MouseButtons)
+    Q_ENUM_NS(WindowType)
+    Q_ENUM_NS(WindowState)
+    Q_ENUM_NS(WindowModality)
+    Q_ENUM_NS(WidgetAttribute)
+    Q_ENUM_NS(ApplicationAttribute)
+    Q_FLAG_NS(WindowFlags)
+    Q_FLAG_NS(WindowStates)
+    Q_ENUM_NS(FocusReason)
+    Q_ENUM_NS(InputMethodHint)
+    Q_ENUM_NS(InputMethodQuery)
+    Q_FLAG_NS(InputMethodHints)
+    Q_ENUM_NS(EnterKeyType)
+    Q_FLAG_NS(InputMethodQueries)
+    Q_FLAG_NS(TouchPointStates)
+    Q_ENUM_NS(ScreenOrientation)
+    Q_FLAG_NS(ScreenOrientations)
+    Q_ENUM_NS(ConnectionType)
+    Q_ENUM_NS(ApplicationState)
 #ifndef QT_NO_GESTURES
-    QT_Q_ENUM(GestureState)
-    QT_Q_ENUM(GestureType)
-    QT_Q_ENUM(NativeGestureType)
+    Q_ENUM_NS(GestureState)
+    Q_ENUM_NS(GestureType)
+    Q_ENUM_NS(NativeGestureType)
 #endif
-    QT_Q_ENUM(CursorMoveStyle)
-    QT_Q_ENUM(TimerType)
-    QT_Q_ENUM(ScrollPhase)
-    QT_Q_ENUM(MouseEventSource)
-    QT_Q_FLAG(MouseEventFlag)
-    QT_Q_ENUM(ChecksumType)
-    QT_Q_ENUM(HighDpiScaleFactorRoundingPolicy)
-    QT_Q_ENUM(TabFocusBehavior)
+    Q_ENUM_NS(CursorMoveStyle)
+    Q_ENUM_NS(TimerType)
+    Q_ENUM_NS(ScrollPhase)
+    Q_ENUM_NS(MouseEventSource)
+    Q_FLAG_NS(MouseEventFlag)
+    Q_ENUM_NS(ChecksumType)
+    Q_ENUM_NS(HighDpiScaleFactorRoundingPolicy)
+    Q_ENUM_NS(TabFocusBehavior)
 #endif // Q_DOC
 
 }
-#ifdef Q_MOC_RUN
- ;
-#endif
-
-#undef QT_Q_ENUM
-#undef QT_Q_FLAG
 
 typedef bool (*qInternalCallback)(void **);
 
diff --git a/src/corelib/global/qnumeric_p.h b/src/corelib/global/qnumeric_p.h
index 7418579fe0..7a03e32699 100644
--- a/src/corelib/global/qnumeric_p.h
+++ b/src/corelib/global/qnumeric_p.h
@@ -202,7 +202,7 @@ namespace {
     This function works for v containing infinities, but not NaN. It's the
     caller's responsibility to exclude that possibility before calling it.
 */
-template <typename T> static inline bool convertDoubleTo(double v, T *value)
+template <typename T> static inline bool convertDoubleTo(double v, T *value, bool allow_precision_upgrade = true)
 {
     Q_STATIC_ASSERT(std::numeric_limits<T>::is_integer);
 
@@ -227,6 +227,10 @@ template <typename T> static inline bool convertDoubleTo(double v, T *value)
         supremum = -2.0 * std::numeric_limits<ST>::min();   // -2 * (-2^63) = 2^64, exact (for T = quint64)
         v = fabs(v);
     }
+    if (std::is_integral<T>::value && sizeof(T) > 4 && !allow_precision_upgrade) {
+        if (v > double(Q_INT64_C(1)<<53) || v < double(-((Q_INT64_C(1)<<53) + 1)))
+            return false;
+    }
 
     *value = std::numeric_limits<T>::max();
     if (v >= supremum)
diff --git a/src/corelib/global/qrandom.cpp b/src/corelib/global/qrandom.cpp
index 10672c1f92..3dc024e301 100644
--- a/src/corelib/global/qrandom.cpp
+++ b/src/corelib/global/qrandom.cpp
@@ -355,7 +355,7 @@ struct QRandomGenerator::SystemAndGlobalGenerators
     //    the state in case another thread tries to lock the mutex. It's not
     //    a common scenario, but since sizeof(QRandomGenerator) >= 2560, the
     //    overhead is actually acceptable.
-    // 2) We use both Q_DECL_ALIGN and std::aligned_storage<..., 64> because
+    // 2) We use both alignas and std::aligned_storage<..., 64> because
     //    some implementations of std::aligned_storage can't align to more
     //    than a primitive type's alignment.
     // 3) We don't store the entire system QRandomGenerator, only the space
@@ -364,7 +364,7 @@ struct QRandomGenerator::SystemAndGlobalGenerators
     QBasicMutex globalPRNGMutex;
     struct ShortenedSystem { uint type; } system_;
     SystemGenerator sys;
-    Q_DECL_ALIGN(64) std::aligned_storage<sizeof(QRandomGenerator64), 64>::type global_;
+    alignas(64) std::aligned_storage<sizeof(QRandomGenerator64), 64>::type global_;
 
 #ifdef Q_COMPILER_CONSTEXPR
     constexpr SystemAndGlobalGenerators()
diff --git a/src/corelib/global/qrandom.h b/src/corelib/global/qrandom.h
index 445b520c76..e1494ab523 100644
--- a/src/corelib/global/qrandom.h
+++ b/src/corelib/global/qrandom.h
@@ -196,7 +196,7 @@ private:
         RandomEngine &engine() { return twister; }
         const RandomEngine &engine() const { return twister; }
 #else
-        std::aligned_storage<sizeof(RandomEngine), Q_ALIGNOF(RandomEngine)>::type buffer;
+        std::aligned_storage<sizeof(RandomEngine), alignof(RandomEngine)>::type buffer;
         RandomEngine &engine() { return reinterpret_cast<RandomEngine &>(buffer); }
         const RandomEngine &engine() const { return reinterpret_cast<const RandomEngine &>(buffer); }
 #endif
diff --git a/src/corelib/global/qtypeinfo.h b/src/corelib/global/qtypeinfo.h
index 30be47296e..34cf1de4f5 100644
--- a/src/corelib/global/qtypeinfo.h
+++ b/src/corelib/global/qtypeinfo.h
@@ -209,7 +209,6 @@ public: \
     }; \
 }
 
-Q_DECLARE_MOVABLE_CONTAINER(QList);
 Q_DECLARE_MOVABLE_CONTAINER(QVector);
 Q_DECLARE_MOVABLE_CONTAINER(QQueue);
 Q_DECLARE_MOVABLE_CONTAINER(QStack);
diff --git a/src/corelib/io/io.pri b/src/corelib/io/io.pri
index a33ffe75f2..97b7f3970c 100644
--- a/src/corelib/io/io.pri
+++ b/src/corelib/io/io.pri
@@ -32,8 +32,6 @@ HEADERS +=  \
         io/qurl.h \
         io/qurl_p.h \
         io/qurlquery.h \
-        io/qurltlds_p.h \
-        io/qtldurl_p.h \
         io/qfsfileengine_p.h \
         io/qfsfileengine_iterator_p.h \
         io/qfilesystementry_p.h \
@@ -49,7 +47,6 @@ SOURCES += \
         io/qabstractfileengine.cpp \
         io/qbuffer.cpp \
         io/qdataurl.cpp \
-        io/qtldurl.cpp \
         io/qdebug.cpp \
         io/qdir.cpp \
         io/qdiriterator.cpp \
@@ -173,7 +170,7 @@ win32 {
                 io/qlockfile_unix.cpp \
                 io/qfilesystemiterator_unix.cpp
 
-        !integrity:!uikit:!rtems {
+        qtConfig(process) {
             SOURCES += io/forkfd_qt.cpp
             HEADERS += \
                      ../3rdparty/forkfd/forkfd.h
diff --git a/src/corelib/io/qdebug.cpp b/src/corelib/io/qdebug.cpp
index d13e94e096..11f2b9f3c9 100644
--- a/src/corelib/io/qdebug.cpp
+++ b/src/corelib/io/qdebug.cpp
@@ -714,6 +714,20 @@ QDebug &QDebug::resetFormat()
 */
 
 /*!
+    \fn template <class T> QString QDebug::toString(const T &object)
+    \since 6.0
+
+    \include qdebug-toString.qdocinc
+*/
+
+/*!
+    \fn template <class T> QString QDebug::toString(const T *object)
+    \since 6.0
+
+    \include qdebug-toString.qdocinc
+*/
+
+/*!
     \fn template <class T> QDebug operator<<(QDebug debug, const QList<T> &list)
     \relates QDebug
 
diff --git a/src/corelib/io/qdebug.h b/src/corelib/io/qdebug.h
index 421c5d933b..e14d31f38a 100644
--- a/src/corelib/io/qdebug.h
+++ b/src/corelib/io/qdebug.h
@@ -111,10 +111,10 @@ class Q_CORE_EXPORT QDebug
     void putString(const QChar *begin, size_t length);
     void putByteArray(const char *begin, size_t length, Latin1Content content);
 public:
-    inline QDebug(QIODevice *device) : stream(new Stream(device)) {}
-    inline QDebug(QString *string) : stream(new Stream(string)) {}
-    inline QDebug(QtMsgType t) : stream(new Stream(t)) {}
-    inline QDebug(const QDebug &o):stream(o.stream) { ++stream->ref; }
+    explicit QDebug(QIODevice *device) : stream(new Stream(device)) {}
+    explicit QDebug(QString *string) : stream(new Stream(string)) {}
+    explicit QDebug(QtMsgType t) : stream(new Stream(t)) {}
+    QDebug(const QDebug &o) : stream(o.stream) { ++stream->ref; }
     QDebug(QDebug &&other) noexcept : stream{qExchange(other.stream, nullptr)} {}
     inline QDebug &operator=(const QDebug &other);
     QDebug &operator=(QDebug &&other) noexcept
@@ -173,6 +173,24 @@ public:
 
     inline QDebug &operator<<(QTextStreamManipulator m)
     { stream->ts << m; return *this; }
+
+    template <typename T>
+    static QString toString(const T &object)
+    {
+        QString buffer;
+        QDebug stream(&buffer);
+        stream.nospace() << object;
+        return buffer;
+    }
+
+    template <typename T>
+    static QString toString(const T *object)
+    {
+        QString buffer;
+        QDebug stream(&buffer);
+        stream.nospace() << object;
+        return buffer;
+    }
 };
 
 Q_DECLARE_SHARED(QDebug)
@@ -234,12 +252,6 @@ inline QDebug printSequentialContainer(QDebug debug, const char *which, const Se
 
 } // namespace QtPrivate
 
-template <class T>
-inline QDebug operator<<(QDebug debug, const QList<T> &list)
-{
-    return QtPrivate::printSequentialContainer(debug, "" /*for historical reasons*/, list);
-}
-
 template <typename T>
 inline QDebug operator<<(QDebug debug, const QVector<T> &vec)
 {
diff --git a/src/corelib/io/qfileselector.cpp b/src/corelib/io/qfileselector.cpp
index ee378f6434..0c42a98b37 100644
--- a/src/corelib/io/qfileselector.cpp
+++ b/src/corelib/io/qfileselector.cpp
@@ -342,7 +342,6 @@ void QFileSelectorPrivate::updateSelectors()
 QStringList QFileSelectorPrivate::platformSelectors()
 {
     // similar, but not identical to QSysInfo::osType
-    // ### Qt6: remove macOS fallbacks to "mac" and the future compatibility
     QStringList ret;
 #if defined(Q_OS_WIN)
     ret << QStringLiteral("windows");
@@ -355,16 +354,10 @@ QStringList QFileSelectorPrivate::platformSelectors()
 #  if !defined(Q_OS_ANDROID) && !defined(Q_OS_QNX)
     // we don't want "linux" for Android or two instances of "qnx" for QNX
     ret << QSysInfo::kernelType();
-#     ifdef Q_OS_MAC
-    ret << QStringLiteral("mac"); // compatibility, since kernelType() is "darwin"
-#     endif
 #  endif
     QString productName = QSysInfo::productType();
     if (productName != QLatin1String("unknown"))
         ret << productName; // "opensuse", "fedora", "osx", "ios", "android"
-#  if defined(Q_OS_MACOS)
-    ret << QStringLiteral("macos"); // future compatibility
-#  endif
 #endif
     return ret;
 }
diff --git a/src/corelib/io/qfilesystemiterator_unix.cpp b/src/corelib/io/qfilesystemiterator_unix.cpp
index 74b7e820d9..ceea3a467c 100644
--- a/src/corelib/io/qfilesystemiterator_unix.cpp
+++ b/src/corelib/io/qfilesystemiterator_unix.cpp
@@ -85,7 +85,11 @@ static bool checkNameDecodable(const char *d_name, qsizetype len)
     codec->toUnicode(d_name, len, &cs);
     return cs.invalidChars == 0 && cs.remainingChars == 0;
 #else
+    Q_UNUSED(d_name);
+    Q_UNUSED(len);
     // if we have no text codecs, then QString::fromLocal8Bit is fromLatin1
+    Q_UNUSED(d_name)
+    Q_UNUSED(len)
     return true;
 #endif
 }
diff --git a/src/corelib/io/qfilesystemwatcher_win.cpp b/src/corelib/io/qfilesystemwatcher_win.cpp
index 3b67dd61c7..f955e3b53a 100644
--- a/src/corelib/io/qfilesystemwatcher_win.cpp
+++ b/src/corelib/io/qfilesystemwatcher_win.cpp
@@ -81,7 +81,7 @@ static Qt::HANDLE createChangeNotification(const QString &path, uint flags)
         nativePath.append(QLatin1Char('\\'));
     const HANDLE result = FindFirstChangeNotification(reinterpret_cast<const wchar_t *>(nativePath.utf16()),
                                                       FALSE, flags);
-    DEBUG() << __FUNCTION__ << nativePath << Qt::hex <<showbase << flags << "returns" << result;
+    DEBUG() << __FUNCTION__ << nativePath << Qt::hex << Qt::showbase << flags << "returns" << result;
     return result;
 }
 
diff --git a/src/corelib/io/qipaddress.cpp b/src/corelib/io/qipaddress.cpp
index ddc5b6607f..15f759156d 100644
--- a/src/corelib/io/qipaddress.cpp
+++ b/src/corelib/io/qipaddress.cpp
@@ -47,7 +47,7 @@ namespace QIPAddressUtils {
 
 static QString number(quint8 val, int base = 10)
 {
-    QChar zero(0x30);
+    QString zero = QStringLiteral("0");
     return val ? qulltoa(val, base, zero) : zero;
 }
 
diff --git a/src/corelib/io/qprocess.cpp b/src/corelib/io/qprocess.cpp
index df8b306a8d..73e192fa3e 100644
--- a/src/corelib/io/qprocess.cpp
+++ b/src/corelib/io/qprocess.cpp
@@ -810,16 +810,6 @@ void QProcessPrivate::Channel::clear()
     \a newState argument is the state QProcess changed to.
 */
 
-#if QT_DEPRECATED_SINCE(5, 13)
-/*!
-    \fn void QProcess::finished(int exitCode)
-    \obsolete
-    \overload
-
-    Use finished(int exitCode, QProcess::ExitStatus status) instead.
-*/
-#endif
-
 /*!
     \fn void QProcess::finished(int exitCode, QProcess::ExitStatus exitStatus)
 
@@ -1175,12 +1165,6 @@ bool QProcessPrivate::_q_processDied()
         //emit q->standardOutputClosed();
         //emit q->standardErrorClosed();
 
-#if QT_DEPRECATED_SINCE(5, 13)
-QT_WARNING_PUSH
-QT_WARNING_DISABLE_DEPRECATED
-        emit q->finished(exitCode);
-QT_WARNING_POP
-#endif
         emit q->finished(exitCode, exitStatus);
     }
 #if defined QPROCESS_DEBUG
diff --git a/src/corelib/io/qprocess.h b/src/corelib/io/qprocess.h
index 8c55080252..fe11aa2ec6 100644
--- a/src/corelib/io/qprocess.h
+++ b/src/corelib/io/qprocess.h
@@ -290,11 +290,7 @@ public Q_SLOTS:
 
 Q_SIGNALS:
     void started(QPrivateSignal);
-#if QT_DEPRECATED_SINCE(5, 13)
-    QT_DEPRECATED_X("Use QProcess::finished(int, QProcess::ExitStatus) instead")
-    void finished(int exitCode); // ### Qt 6: merge the two signals with a default value
-#endif
-    void finished(int exitCode, QProcess::ExitStatus exitStatus);
+    void finished(int exitCode, QProcess::ExitStatus exitStatus = NormalExit);
 #if QT_DEPRECATED_SINCE(5, 6)
     QT_DEPRECATED_X("Use QProcess::errorOccurred(QProcess::ProcessError) instead")
     void error(QProcess::ProcessError error);
diff --git a/src/corelib/io/qresource.cpp b/src/corelib/io/qresource.cpp
index 225ee0a769..e636712e57 100644
--- a/src/corelib/io/qresource.cpp
+++ b/src/corelib/io/qresource.cpp
@@ -1241,14 +1241,8 @@ bool QDynamicFileResourceRoot::registerSelf(const QString &f)
     uchar *data = nullptr;
     qsizetype data_len = 0;
 
-#ifdef QT_USE_MMAP
-    int fd = QT_OPEN(QFile::encodeName(f), O_RDONLY,
-#if defined(Q_OS_WIN)
-                     _S_IREAD | _S_IWRITE
-#else
-                     0666
-#endif
-                     );
+#if defined(QT_USE_MMAP)
+    int fd = QT_OPEN(QFile::encodeName(f), O_RDONLY, 0666);
     if (fd >= 0) {
         QT_STATBUF st;
         if (!QT_FSTAT(fd, &st) && st.st_size <= std::numeric_limits<qsizetype>::max()) {
diff --git a/src/corelib/io/qsettings.cpp b/src/corelib/io/qsettings.cpp
index b191397e7e..6c66d1097d 100644
--- a/src/corelib/io/qsettings.cpp
+++ b/src/corelib/io/qsettings.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2020 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtCore module of the Qt Toolkit.
@@ -409,14 +409,16 @@ QString QSettingsPrivate::variantToString(const QVariant &v)
             break;
         }
 
+#if QT_CONFIG(shortcut)
+        case QMetaType::QKeySequence:
+#endif
         case QMetaType::QString:
         case QMetaType::LongLong:
         case QMetaType::ULongLong:
         case QMetaType::Int:
         case QMetaType::UInt:
         case QMetaType::Bool:
-        case QMetaType::Double:
-        case QMetaType::QKeySequence: {
+        case QMetaType::Double: {
             result = v.toString();
             if (result.contains(QChar::Null))
                 result = QLatin1String("@String(") + result + QLatin1Char(')');
diff --git a/src/corelib/io/qstandardpaths.cpp b/src/corelib/io/qstandardpaths.cpp
index 04aff3d11b..d95c9015cc 100644
--- a/src/corelib/io/qstandardpaths.cpp
+++ b/src/corelib/io/qstandardpaths.cpp
@@ -348,6 +348,8 @@ QT_BEGIN_NAMESPACE
     \note On Android 6.0 (API 23) or higher, the "WRITE_EXTERNAL_STORAGE" permission must be
         requested at runtime when using QStandardPaths::writableLocation or QStandardPaths::standardLocations.
 
+    \note On Android, reading/writing to GenericDataLocation needs the READ_EXTERNAL_STORAGE/WRITE_EXTERNAL_STORAGE permission granted.
+
     \note On iOS, if you do pass \c {QStandardPaths::standardLocations(QStandardPaths::PicturesLocation).last()}
         as argument to \l{QFileDialog::setDirectory()},
         a native image picker dialog will be used for accessing the user's photo album.
diff --git a/src/corelib/io/qtldurl.cpp b/src/corelib/io/qtldurl.cpp
deleted file mode 100644
index 3301a76011..0000000000
--- a/src/corelib/io/qtldurl.cpp
+++ /dev/null
@@ -1,137 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtCore module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <qglobal.h>
-
-#if QT_CONFIG(topleveldomain)
-
-#include "qplatformdefs.h"
-#include "qurl.h"
-#include "private/qurltlds_p.h"
-#include "private/qtldurl_p.h"
-#include "QtCore/qstring.h"
-#include "QtCore/qvector.h"
-
-QT_BEGIN_NAMESPACE
-
-enum TLDMatchType {
-    ExactMatch,
-    SuffixMatch,
-    ExceptionMatch,
-};
-
-static bool containsTLDEntry(QStringView entry, TLDMatchType match)
-{
-    const QStringView matchSymbols[] = {
-        u"",
-        u"*",
-        u"!",
-    };
-    const auto symbol = matchSymbols[match];
-    int index = qt_hash(entry, qt_hash(symbol)) % tldCount;
-
-    // select the right chunk from the big table
-    short chunk = 0;
-    uint chunkIndex = tldIndices[index], offset = 0;
-    while (chunk < tldChunkCount && tldIndices[index] >= tldChunks[chunk]) {
-        chunkIndex -= tldChunks[chunk];
-        offset += tldChunks[chunk];
-        chunk++;
-    }
-
-    // check all the entries from the given index
-    while (chunkIndex < tldIndices[index+1] - offset) {
-        const auto utf8 = tldData[chunk] + chunkIndex;
-        if ((symbol.isEmpty() || QLatin1Char(*utf8) == symbol) && entry == QString::fromUtf8(utf8 + symbol.size()))
-            return true;
-        chunkIndex += qstrlen(utf8) + 1; // +1 for the ending \0
-    }
-    return false;
-}
-
-/*!
-    \internal
-
-    Return the top-level-domain per Qt's copy of the Mozilla public suffix list of
-    \a domain.
-*/
-
-Q_CORE_EXPORT QString qTopLevelDomain(const QString &domain)
-{
-    const QString domainLower = domain.toLower();
-    QVector<QStringRef> sections = domainLower.splitRef(QLatin1Char('.'), Qt::SkipEmptyParts);
-    if (sections.isEmpty())
-        return QString();
-
-    QString level, tld;
-    for (int j = sections.count() - 1; j >= 0; --j) {
-        level.prepend(QLatin1Char('.') + sections.at(j));
-        if (qIsEffectiveTLD(level.rightRef(level.size() - 1)))
-            tld = level;
-    }
-    return tld;
-}
-
-/*!
-    \internal
-
-    Return true if \a domain is a top-level-domain per Qt's copy of the Mozilla public suffix list.
-*/
-
-Q_CORE_EXPORT bool qIsEffectiveTLD(const QStringRef &domain)
-{
-    // for domain 'foo.bar.com':
-    // 1. return if TLD table contains 'foo.bar.com'
-    // 2. else if table contains '*.bar.com',
-    // 3. test that table does not contain '!foo.bar.com'
-
-    if (containsTLDEntry(domain, ExactMatch)) // 1
-        return true;
-
-    const int dot = domain.indexOf(QLatin1Char('.'));
-    if (dot < 0) // Actual TLD: may be effective if the subject of a wildcard rule:
-        return containsTLDEntry(QString(QLatin1Char('.') + domain), SuffixMatch);
-    if (containsTLDEntry(domain.mid(dot), SuffixMatch))   // 2
-        return !containsTLDEntry(domain, ExceptionMatch); // 3
-    return false;
-}
-
-QT_END_NAMESPACE
-
-#endif
diff --git a/src/corelib/io/qtldurl_p.h b/src/corelib/io/qtldurl_p.h
deleted file mode 100644
index 4636f18874..0000000000
--- a/src/corelib/io/qtldurl_p.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtCore module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QTLDURL_P_H
-#define QTLDURL_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists for the convenience
-// of qDecodeDataUrl. This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include <QtCore/private/qglobal_p.h>
-#include "QtCore/qurl.h"
-#include "QtCore/qstring.h"
-
-QT_REQUIRE_CONFIG(topleveldomain);
-
-QT_BEGIN_NAMESPACE
-
-Q_CORE_EXPORT QString qTopLevelDomain(const QString &domain);
-Q_CORE_EXPORT bool qIsEffectiveTLD(const QStringRef &domain);
-inline bool qIsEffectiveTLD(const QString &domain)
-{
-    return qIsEffectiveTLD(QStringRef(&domain));
-}
-
-QT_END_NAMESPACE
-
-#endif // QDATAURL_P_H
diff --git a/src/corelib/io/qurl.cpp b/src/corelib/io/qurl.cpp
index 104161bc33..3e7d8e113c 100644
--- a/src/corelib/io/qurl.cpp
+++ b/src/corelib/io/qurl.cpp
@@ -415,9 +415,6 @@
 #include "qhash.h"
 #include "qdir.h"         // for QDir::fromNativeSeparators
 #include "qdatastream.h"
-#if QT_CONFIG(topleveldomain) // ### Qt6: Remove section
-#include "qtldurl_p.h"
-#endif
 #include "private/qipaddress_p.h"
 #include "qurlquery.h"
 #include "private/qdir_p.h"
@@ -979,7 +976,7 @@ inline bool QUrlPrivate::setScheme(const QString &value, int len, bool doSetErro
 
     // validate it:
     int needsLowercasing = -1;
-    const ushort *p = reinterpret_cast<const ushort *>(value.constData());
+    const ushort *p = value.utf16();
     for (int i = 0; i < len; ++i) {
         if (p[i] >= 'a' && p[i] <= 'z')
             continue;
@@ -3149,46 +3146,6 @@ bool QUrl::hasFragment() const
     return d->hasFragment();
 }
 
-#if QT_DEPRECATED_SINCE(5, 15)
-#if QT_CONFIG(topleveldomain)
-/*!
-    \since 4.8
-
-    \deprecated
-
-    Returns the TLD (Top-Level Domain) of the URL, (e.g. .co.uk, .net).
-    Note that the return value is prefixed with a '.' unless the
-    URL does not contain a valid TLD, in which case the function returns
-    an empty string.
-
-    Note that this function considers a TLD to be any domain that allows users
-    to register subdomains under, including many home, dynamic DNS websites and
-    blogging providers. This is useful for determining whether two websites
-    belong to the same infrastructure and communication should be allowed, such
-    as browser cookies: two domains should be considered part of the same
-    website if they share at least one label in addition to the value
-    returned by this function.
-
-    \list
-      \li \c{foo.co.uk} and \c{foo.com} do not share a top-level domain
-      \li \c{foo.co.uk} and \c{bar.co.uk} share the \c{.co.uk} domain, but the next label is different
-      \li \c{www.foo.co.uk} and \c{ftp.foo.co.uk} share the same top-level domain and one more label,
-          so they are considered part of the same site
-    \endlist
-
-    If \a options includes EncodeUnicode, the returned string will be in
-    ASCII Compatible Encoding.
-*/
-QString QUrl::topLevelDomain(ComponentFormattingOptions options) const
-{
-    QString tld = qTopLevelDomain(host());
-    if (options & EncodeUnicode) {
-        return qt_ACE_do(tld, ToAceOnly, AllowLeadingDot);
-    }
-    return tld;
-}
-#endif
-#endif // QT_DEPRECATED_SINCE(5, 15)
 /*!
     Returns the result of the merge of this URL with \a relative. This
     URL is used as a base to convert \a relative to an absolute URL.
diff --git a/src/corelib/io/qurl.h b/src/corelib/io/qurl.h
index eb7fb8087c..edf5ee42d7 100644
--- a/src/corelib/io/qurl.h
+++ b/src/corelib/io/qurl.h
@@ -233,11 +233,6 @@ public:
 
     void setHost(const QString &host, ParsingMode mode = DecodedMode);
     QString host(ComponentFormattingOptions = FullyDecoded) const;
-#if QT_DEPRECATED_SINCE(5, 15)
-#if QT_CONFIG(topleveldomain)
-    QT_DEPRECATED QString topLevelDomain(ComponentFormattingOptions options = FullyDecoded) const;
-#endif
-#endif // QT_DEPRECATED_SINCE(5, 15)
 
     void setPort(int port);
     int port(int defaultPort = -1) const;
diff --git a/src/corelib/io/qurltlds_p.h b/src/corelib/io/qurltlds_p.h
deleted file mode 100644
index 9ff688decb..0000000000
--- a/src/corelib/io/qurltlds_p.h
+++ /dev/null
@@ -1,14363 +0,0 @@
-// License: MPL 2.0/GPL 2.0/LGPL 3
-//
-// The contents of this file are subject to the Mozilla Public License Version
-// 2.0 (the "License"); you may not use this file except in compliance with
-// the License. You may obtain a copy of the License at
-// http://www.mozilla.org/MPL/
-//
-// Software distributed under the License is distributed on an "AS IS" basis,
-// WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-// for the specific language governing rights and limitations under the
-// License.
-//
-// The Original Code is the Public Suffix List.
-//
-// The Initial Developer of the Original Code is
-// Jo Hermans <jo.hermans@gmail.com>.
-// Portions created by the Initial Developer are Copyright (C) 2007
-// the Initial Developer. All Rights Reserved.
-//
-// Contributor(s):
-//   Ruben Arakelyan <ruben@wackomenace.co.uk>
-//   Gervase Markham <gerv@gerv.net>
-//   Pamela Greene <pamg.bugs@gmail.com>
-//   David Triendl <david@triendl.name>
-//   Jothan Frakes <jothan@gmail.com>
-//   The kind representatives of many TLD registries
-//
-// Alternatively, the contents of this file may be used under the terms of
-// either the GNU General Public License Version 2 or later (the "GPL"), or
-// the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-// in which case the provisions of the GPL or the LGPL are applicable instead
-// of those above. If you wish to allow use of your version of this file only
-// under the terms of either the GPL or the LGPL, and not to allow others to
-// use your version of this file under the terms of the MPL, indicate your
-// decision by deleting the provisions above and replace them with the notice
-// and other provisions required by the GPL or the LGPL. If you do not delete
-// the provisions above, a recipient may use your version of this file under
-// the terms of any one of the MPL, the GPL or the LGPL.
-//
-
-#ifndef QURLTLD_P_H
-#define QURLTLD_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists for the convenience
-// of the Network Access and Core framework.  This header file may change from
-// version to version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include <QtCore/private/qglobal_p.h>
-
-QT_BEGIN_NAMESPACE
-
-// note to maintainer:
-// this file should be updated before each release ->
-// for instructions see the program at
-// util/corelib/qurl-generateTLDs/
-
-static const quint16 tldCount = 8799;
-static const quint32 tldIndices[] = {
-0,
-29,
-29,
-36,
-36,
-69,
-83,
-97,
-116,
-123,
-133,
-140,
-171,
-186,
-193,
-200,
-200,
-200,
-200,
-225,
-263,
-272,
-305,
-332,
-332,
-378,
-388,
-395,
-425,
-444,
-449,
-449,
-459,
-459,
-459,
-459,
-484,
-513,
-538,
-538,
-538,
-563,
-563,
-580,
-599,
-618,
-618,
-660,
-670,
-670,
-670,
-670,
-682,
-712,
-718,
-750,
-790,
-790,
-812,
-834,
-851,
-869,
-912,
-937,
-977,
-977,
-977,
-977,
-977,
-987,
-987,
-1002,
-1015,
-1024,
-1030,
-1051,
-1051,
-1061,
-1070,
-1076,
-1076,
-1076,
-1094,
-1129,
-1158,
-1195,
-1195,
-1195,
-1215,
-1234,
-1234,
-1245,
-1245,
-1245,
-1245,
-1245,
-1268,
-1276,
-1291,
-1297,
-1304,
-1316,
-1337,
-1379,
-1397,
-1408,
-1413,
-1429,
-1429,
-1429,
-1429,
-1444,
-1467,
-1476,
-1476,
-1505,
-1505,
-1505,
-1523,
-1523,
-1547,
-1547,
-1566,
-1590,
-1590,
-1600,
-1612,
-1612,
-1612,
-1612,
-1631,
-1674,
-1712,
-1712,
-1722,
-1730,
-1751,
-1751,
-1769,
-1769,
-1769,
-1784,
-1784,
-1817,
-1817,
-1817,
-1817,
-1817,
-1817,
-1837,
-1837,
-1850,
-1850,
-1850,
-1850,
-1871,
-1914,
-1914,
-1932,
-1960,
-1960,
-1967,
-1977,
-1977,
-1977,
-1977,
-2015,
-2038,
-2071,
-2090,
-2090,
-2105,
-2121,
-2136,
-2157,
-2157,
-2209,
-2216,
-2231,
-2231,
-2231,
-2231,
-2231,
-2238,
-2238,
-2247,
-2271,
-2318,
-2331,
-2346,
-2359,
-2368,
-2368,
-2368,
-2377,
-2377,
-2377,
-2377,
-2386,
-2391,
-2391,
-2391,
-2398,
-2398,
-2405,
-2461,
-2485,
-2513,
-2513,
-2543,
-2550,
-2550,
-2579,
-2579,
-2579,
-2579,
-2590,
-2630,
-2630,
-2673,
-2673,
-2673,
-2673,
-2673,
-2700,
-2700,
-2700,
-2706,
-2706,
-2767,
-2786,
-2794,
-2818,
-2818,
-2824,
-2835,
-2850,
-2850,
-2868,
-2868,
-2868,
-2875,
-2875,
-2894,
-2912,
-2928,
-2928,
-2928,
-2946,
-2946,
-2956,
-2956,
-2956,
-2956,
-2956,
-2956,
-2974,
-2974,
-2995,
-2995,
-2995,
-3008,
-3014,
-3022,
-3060,
-3060,
-3073,
-3120,
-3127,
-3135,
-3145,
-3200,
-3210,
-3210,
-3210,
-3210,
-3210,
-3210,
-3210,
-3227,
-3244,
-3255,
-3276,
-3285,
-3285,
-3293,
-3293,
-3293,
-3293,
-3332,
-3377,
-3377,
-3384,
-3402,
-3416,
-3416,
-3442,
-3442,
-3442,
-3442,
-3461,
-3461,
-3461,
-3474,
-3474,
-3499,
-3529,
-3540,
-3591,
-3602,
-3602,
-3602,
-3602,
-3624,
-3661,
-3661,
-3668,
-3668,
-3700,
-3733,
-3737,
-3753,
-3799,
-3817,
-3839,
-3839,
-3839,
-3863,
-3894,
-3910,
-3920,
-3920,
-3936,
-3936,
-3947,
-3981,
-3993,
-3993,
-4019,
-4019,
-4023,
-4030,
-4038,
-4038,
-4038,
-4038,
-4038,
-4038,
-4038,
-4038,
-4038,
-4054,
-4054,
-4069,
-4082,
-4088,
-4116,
-4116,
-4120,
-4146,
-4160,
-4177,
-4177,
-4195,
-4204,
-4204,
-4204,
-4214,
-4214,
-4214,
-4229,
-4229,
-4229,
-4229,
-4244,
-4257,
-4265,
-4265,
-4279,
-4290,
-4329,
-4385,
-4385,
-4385,
-4385,
-4396,
-4400,
-4447,
-4465,
-4465,
-4471,
-4492,
-4507,
-4513,
-4513,
-4525,
-4531,
-4531,
-4558,
-4575,
-4591,
-4617,
-4653,
-4658,
-4658,
-4666,
-4712,
-4712,
-4718,
-4718,
-4735,
-4745,
-4745,
-4751,
-4751,
-4772,
-4812,
-4835,
-4835,
-4842,
-4864,
-4864,
-4881,
-4881,
-4897,
-4908,
-4917,
-4933,
-4948,
-4968,
-4968,
-4968,
-4968,
-4974,
-4998,
-5031,
-5038,
-5053,
-5067,
-5083,
-5116,
-5126,
-5133,
-5155,
-5155,
-5155,
-5155,
-5155,
-5155,
-5155,
-5168,
-5173,
-5173,
-5177,
-5188,
-5226,
-5226,
-5271,
-5271,
-5282,
-5282,
-5296,
-5313,
-5313,
-5313,
-5333,
-5333,
-5333,
-5342,
-5358,
-5358,
-5370,
-5374,
-5396,
-5396,
-5396,
-5413,
-5413,
-5413,
-5413,
-5413,
-5413,
-5413,
-5417,
-5417,
-5467,
-5473,
-5473,
-5524,
-5539,
-5578,
-5585,
-5585,
-5585,
-5600,
-5600,
-5600,
-5600,
-5631,
-5642,
-5642,
-5642,
-5642,
-5669,
-5676,
-5683,
-5690,
-5708,
-5721,
-5721,
-5734,
-5743,
-5758,
-5799,
-5817,
-5835,
-5835,
-5835,
-5841,
-5841,
-5872,
-5872,
-5888,
-5904,
-5917,
-5952,
-5952,
-5997,
-6010,
-6044,
-6054,
-6078,
-6078,
-6116,
-6128,
-6128,
-6128,
-6137,
-6137,
-6143,
-6143,
-6143,
-6155,
-6160,
-6160,
-6160,
-6160,
-6160,
-6173,
-6173,
-6173,
-6189,
-6189,
-6189,
-6205,
-6237,
-6237,
-6252,
-6252,
-6263,
-6263,
-6296,
-6321,
-6321,
-6321,
-6328,
-6343,
-6343,
-6373,
-6391,
-6391,
-6426,
-6426,
-6436,
-6475,
-6489,
-6507,
-6511,
-6511,
-6515,
-6530,
-6530,
-6548,
-6548,
-6552,
-6552,
-6572,
-6572,
-6622,
-6651,
-6651,
-6668,
-6668,
-6693,
-6731,
-6731,
-6746,
-6775,
-6787,
-6787,
-6787,
-6787,
-6787,
-6787,
-6787,
-6787,
-6787,
-6802,
-6806,
-6810,
-6823,
-6823,
-6834,
-6870,
-6874,
-6933,
-6954,
-6966,
-6966,
-6966,
-6966,
-6982,
-6982,
-6982,
-6988,
-6998,
-7028,
-7037,
-7037,
-7070,
-7070,
-7098,
-7098,
-7098,
-7127,
-7153,
-7153,
-7164,
-7164,
-7174,
-7174,
-7174,
-7205,
-7205,
-7224,
-7224,
-7240,
-7240,
-7284,
-7284,
-7284,
-7284,
-7284,
-7284,
-7301,
-7318,
-7364,
-7364,
-7374,
-7401,
-7424,
-7424,
-7443,
-7448,
-7448,
-7448,
-7448,
-7448,
-7462,
-7462,
-7462,
-7462,
-7462,
-7462,
-7462,
-7466,
-7466,
-7488,
-7488,
-7498,
-7502,
-7520,
-7530,
-7530,
-7530,
-7534,
-7540,
-7540,
-7540,
-7547,
-7547,
-7547,
-7561,
-7571,
-7571,
-7571,
-7582,
-7582,
-7603,
-7603,
-7617,
-7628,
-7647,
-7666,
-7666,
-7666,
-7694,
-7707,
-7738,
-7750,
-7768,
-7825,
-7864,
-7880,
-7880,
-7880,
-7880,
-7880,
-7893,
-7893,
-7893,
-7898,
-7911,
-7917,
-7944,
-7944,
-7989,
-7989,
-7989,
-7989,
-7989,
-7989,
-8006,
-8037,
-8037,
-8037,
-8063,
-8074,
-8091,
-8113,
-8135,
-8148,
-8148,
-8162,
-8162,
-8169,
-8169,
-8176,
-8197,
-8197,
-8197,
-8216,
-8216,
-8216,
-8230,
-8230,
-8240,
-8240,
-8246,
-8257,
-8262,
-8279,
-8279,
-8286,
-8286,
-8296,
-8313,
-8313,
-8334,
-8339,
-8339,
-8353,
-8353,
-8363,
-8363,
-8370,
-8370,
-8384,
-8384,
-8430,
-8458,
-8458,
-8492,
-8511,
-8511,
-8518,
-8565,
-8565,
-8565,
-8565,
-8565,
-8637,
-8665,
-8675,
-8701,
-8708,
-8708,
-8744,
-8754,
-8754,
-8766,
-8814,
-8826,
-8838,
-8865,
-8865,
-8882,
-8892,
-8892,
-8899,
-8899,
-8905,
-8918,
-8928,
-8935,
-8962,
-8975,
-8975,
-8986,
-9019,
-9019,
-9063,
-9071,
-9077,
-9089,
-9111,
-9118,
-9118,
-9118,
-9118,
-9139,
-9165,
-9202,
-9212,
-9225,
-9237,
-9267,
-9291,
-9291,
-9291,
-9322,
-9322,
-9330,
-9330,
-9330,
-9338,
-9355,
-9423,
-9423,
-9429,
-9447,
-9468,
-9480,
-9480,
-9480,
-9545,
-9600,
-9606,
-9615,
-9615,
-9640,
-9671,
-9671,
-9671,
-9744,
-9744,
-9783,
-9783,
-9783,
-9796,
-9814,
-9833,
-9838,
-9857,
-9857,
-9864,
-9902,
-9922,
-9944,
-9944,
-9976,
-9976,
-10001,
-10006,
-10023,
-10023,
-10029,
-10037,
-10054,
-10054,
-10054,
-10072,
-10072,
-10072,
-10094,
-10112,
-10144,
-10158,
-10174,
-10196,
-10213,
-10213,
-10235,
-10254,
-10279,
-10291,
-10311,
-10326,
-10366,
-10383,
-10393,
-10399,
-10399,
-10399,
-10431,
-10431,
-10431,
-10431,
-10431,
-10440,
-10459,
-10472,
-10472,
-10495,
-10507,
-10537,
-10582,
-10598,
-10612,
-10626,
-10666,
-10684,
-10690,
-10710,
-10725,
-10765,
-10783,
-10783,
-10802,
-10825,
-10825,
-10843,
-10853,
-10865,
-10902,
-10902,
-10953,
-10953,
-10984,
-10990,
-10990,
-10990,
-10990,
-11027,
-11036,
-11036,
-11036,
-11036,
-11057,
-11073,
-11073,
-11073,
-11082,
-11082,
-11082,
-11137,
-11142,
-11152,
-11168,
-11181,
-11181,
-11181,
-11181,
-11199,
-11199,
-11212,
-11226,
-11253,
-11271,
-11287,
-11311,
-11322,
-11340,
-11356,
-11380,
-11380,
-11401,
-11407,
-11420,
-11475,
-11514,
-11523,
-11529,
-11529,
-11547,
-11572,
-11572,
-11588,
-11588,
-11588,
-11602,
-11602,
-11602,
-11608,
-11625,
-11641,
-11676,
-11683,
-11683,
-11683,
-11699,
-11706,
-11706,
-11706,
-11723,
-11729,
-11729,
-11761,
-11767,
-11767,
-11767,
-11799,
-11810,
-11810,
-11810,
-11810,
-11810,
-11810,
-11810,
-11810,
-11810,
-11810,
-11810,
-11823,
-11838,
-11838,
-11846,
-11852,
-11871,
-11887,
-11905,
-11920,
-11936,
-11968,
-11968,
-11981,
-11981,
-11987,
-12004,
-12004,
-12030,
-12043,
-12059,
-12066,
-12066,
-12066,
-12096,
-12096,
-12096,
-12105,
-12136,
-12159,
-12159,
-12159,
-12174,
-12196,
-12232,
-12237,
-12237,
-12253,
-12269,
-12269,
-12269,
-12282,
-12289,
-12289,
-12306,
-12323,
-12333,
-12333,
-12349,
-12349,
-12384,
-12422,
-12440,
-12455,
-12472,
-12472,
-12472,
-12472,
-12491,
-12505,
-12511,
-12546,
-12569,
-12569,
-12573,
-12573,
-12595,
-12595,
-12605,
-12605,
-12605,
-12612,
-12636,
-12654,
-12691,
-12691,
-12713,
-12728,
-12744,
-12754,
-12772,
-12784,
-12810,
-12849,
-12849,
-12873,
-12887,
-12887,
-12887,
-12887,
-12887,
-12910,
-12930,
-12973,
-13002,
-13015,
-13058,
-13058,
-13069,
-13080,
-13080,
-13080,
-13080,
-13086,
-13086,
-13096,
-13114,
-13138,
-13160,
-13160,
-13160,
-13160,
-13160,
-13160,
-13160,
-13178,
-13188,
-13204,
-13224,
-13224,
-13224,
-13224,
-13234,
-13243,
-13260,
-13260,
-13260,
-13260,
-13266,
-13281,
-13315,
-13315,
-13340,
-13347,
-13347,
-13347,
-13378,
-13378,
-13378,
-13378,
-13404,
-13414,
-13430,
-13450,
-13471,
-13475,
-13479,
-13479,
-13494,
-13494,
-13494,
-13494,
-13494,
-13494,
-13494,
-13494,
-13513,
-13513,
-13513,
-13542,
-13551,
-13551,
-13551,
-13551,
-13551,
-13551,
-13560,
-13569,
-13569,
-13569,
-13569,
-13599,
-13599,
-13610,
-13623,
-13668,
-13676,
-13676,
-13683,
-13702,
-13702,
-13716,
-13716,
-13733,
-13733,
-13744,
-13766,
-13775,
-13775,
-13775,
-13790,
-13815,
-13822,
-13827,
-13827,
-13844,
-13844,
-13859,
-13875,
-13875,
-13919,
-13951,
-13972,
-14006,
-14006,
-14006,
-14015,
-14023,
-14039,
-14051,
-14079,
-14079,
-14092,
-14128,
-14143,
-14153,
-14153,
-14153,
-14153,
-14173,
-14188,
-14198,
-14198,
-14213,
-14246,
-14281,
-14287,
-14304,
-14304,
-14311,
-14321,
-14328,
-14338,
-14338,
-14370,
-14404,
-14448,
-14448,
-14473,
-14495,
-14502,
-14502,
-14539,
-14552,
-14559,
-14559,
-14576,
-14576,
-14576,
-14590,
-14590,
-14590,
-14590,
-14590,
-14590,
-14590,
-14590,
-14623,
-14641,
-14648,
-14655,
-14704,
-14742,
-14742,
-14742,
-14759,
-14780,
-14780,
-14780,
-14798,
-14798,
-14803,
-14821,
-14821,
-14861,
-14861,
-14870,
-14880,
-14880,
-14915,
-14934,
-14951,
-14976,
-14976,
-14976,
-14976,
-15005,
-15042,
-15057,
-15057,
-15057,
-15105,
-15131,
-15138,
-15149,
-15149,
-15173,
-15173,
-15183,
-15225,
-15241,
-15272,
-15278,
-15278,
-15312,
-15333,
-15354,
-15354,
-15354,
-15354,
-15354,
-15354,
-15354,
-15365,
-15365,
-15365,
-15391,
-15391,
-15391,
-15391,
-15391,
-15391,
-15406,
-15414,
-15414,
-15414,
-15414,
-15430,
-15450,
-15501,
-15501,
-15501,
-15501,
-15501,
-15515,
-15520,
-15520,
-15520,
-15520,
-15546,
-15546,
-15546,
-15546,
-15546,
-15576,
-15608,
-15630,
-15650,
-15650,
-15675,
-15675,
-15695,
-15706,
-15716,
-15716,
-15716,
-15716,
-15733,
-15741,
-15752,
-15752,
-15752,
-15752,
-15764,
-15764,
-15778,
-15778,
-15786,
-15817,
-15817,
-15833,
-15833,
-15852,
-15852,
-15867,
-15885,
-15935,
-15941,
-15961,
-15961,
-15977,
-15981,
-15988,
-15994,
-16015,
-16015,
-16054,
-16054,
-16054,
-16087,
-16113,
-16122,
-16122,
-16157,
-16188,
-16188,
-16212,
-16212,
-16212,
-16212,
-16230,
-16230,
-16246,
-16276,
-16287,
-16300,
-16316,
-16334,
-16353,
-16378,
-16401,
-16401,
-16421,
-16421,
-16421,
-16425,
-16450,
-16450,
-16450,
-16456,
-16465,
-16475,
-16491,
-16509,
-16509,
-16518,
-16530,
-16562,
-16562,
-16562,
-16571,
-16571,
-16571,
-16595,
-16595,
-16595,
-16610,
-16610,
-16610,
-16634,
-16661,
-16678,
-16684,
-16684,
-16691,
-16691,
-16706,
-16763,
-16792,
-16807,
-16827,
-16847,
-16847,
-16847,
-16859,
-16859,
-16859,
-16880,
-16902,
-16902,
-16922,
-16922,
-16922,
-16942,
-16949,
-16959,
-16974,
-16974,
-16980,
-16980,
-16993,
-17024,
-17037,
-17037,
-17044,
-17097,
-17097,
-17112,
-17112,
-17135,
-17150,
-17150,
-17155,
-17162,
-17190,
-17190,
-17210,
-17219,
-17219,
-17232,
-17232,
-17241,
-17254,
-17269,
-17292,
-17302,
-17302,
-17314,
-17314,
-17314,
-17314,
-17353,
-17371,
-17400,
-17418,
-17418,
-17444,
-17444,
-17466,
-17466,
-17466,
-17466,
-17466,
-17466,
-17466,
-17466,
-17466,
-17488,
-17488,
-17498,
-17498,
-17506,
-17506,
-17527,
-17552,
-17552,
-17562,
-17569,
-17587,
-17603,
-17603,
-17619,
-17628,
-17667,
-17674,
-17698,
-17706,
-17742,
-17795,
-17813,
-17813,
-17834,
-17844,
-17844,
-17844,
-17844,
-17866,
-17886,
-17917,
-17953,
-17953,
-17953,
-17984,
-17984,
-17984,
-17984,
-17984,
-18024,
-18024,
-18045,
-18077,
-18096,
-18102,
-18114,
-18114,
-18114,
-18136,
-18146,
-18170,
-18170,
-18170,
-18193,
-18193,
-18193,
-18211,
-18246,
-18253,
-18303,
-18303,
-18303,
-18324,
-18324,
-18344,
-18344,
-18344,
-18350,
-18373,
-18393,
-18401,
-18401,
-18421,
-18435,
-18469,
-18491,
-18491,
-18523,
-18546,
-18566,
-18566,
-18589,
-18610,
-18622,
-18646,
-18674,
-18689,
-18697,
-18721,
-18730,
-18730,
-18751,
-18765,
-18789,
-18805,
-18826,
-18842,
-18842,
-18846,
-18846,
-18856,
-18863,
-18881,
-18903,
-18928,
-18947,
-18950,
-18964,
-18967,
-18979,
-18987,
-19007,
-19026,
-19026,
-19029,
-19029,
-19044,
-19077,
-19107,
-19110,
-19131,
-19134,
-19140,
-19156,
-19179,
-19204,
-19222,
-19222,
-19236,
-19239,
-19251,
-19284,
-19299,
-19302,
-19318,
-19328,
-19332,
-19360,
-19389,
-19392,
-19419,
-19432,
-19442,
-19451,
-19463,
-19466,
-19469,
-19480,
-19507,
-19510,
-19543,
-19543,
-19554,
-19557,
-19578,
-19581,
-19584,
-19608,
-19611,
-19623,
-19644,
-19654,
-19673,
-19682,
-19682,
-19682,
-19685,
-19707,
-19710,
-19710,
-19727,
-19727,
-19733,
-19736,
-19736,
-19736,
-19736,
-19749,
-19749,
-19754,
-19777,
-19808,
-19811,
-19814,
-19817,
-19835,
-19860,
-19860,
-19863,
-19863,
-19863,
-19863,
-19872,
-19872,
-19906,
-19906,
-19916,
-19922,
-19936,
-19939,
-19942,
-19958,
-19968,
-19978,
-20000,
-20019,
-20019,
-20049,
-20065,
-20090,
-20090,
-20113,
-20148,
-20158,
-20196,
-20239,
-20255,
-20278,
-20310,
-20322,
-20331,
-20366,
-20369,
-20376,
-20389,
-20392,
-20392,
-20412,
-20438,
-20451,
-20451,
-20511,
-20517,
-20552,
-20570,
-20586,
-20593,
-20593,
-20605,
-20608,
-20621,
-20624,
-20627,
-20663,
-20666,
-20705,
-20720,
-20759,
-20762,
-20762,
-20762,
-20802,
-20809,
-20825,
-20830,
-20830,
-20830,
-20830,
-20854,
-20857,
-20857,
-20864,
-20917,
-20927,
-20930,
-20964,
-20967,
-20974,
-21013,
-21057,
-21057,
-21091,
-21119,
-21122,
-21141,
-21156,
-21176,
-21193,
-21196,
-21196,
-21196,
-21229,
-21245,
-21245,
-21251,
-21265,
-21290,
-21290,
-21290,
-21290,
-21314,
-21314,
-21317,
-21320,
-21326,
-21365,
-21371,
-21384,
-21387,
-21406,
-21409,
-21409,
-21417,
-21425,
-21440,
-21448,
-21451,
-21454,
-21467,
-21482,
-21492,
-21524,
-21530,
-21536,
-21546,
-21560,
-21615,
-21639,
-21639,
-21642,
-21660,
-21669,
-21672,
-21672,
-21689,
-21698,
-21705,
-21752,
-21769,
-21793,
-21793,
-21803,
-21803,
-21824,
-21831,
-21854,
-21857,
-21864,
-21897,
-21918,
-21939,
-21939,
-21939,
-21963,
-21973,
-21976,
-21976,
-22031,
-22031,
-22031,
-22046,
-22070,
-22080,
-22110,
-22139,
-22163,
-22166,
-22198,
-22213,
-22232,
-22240,
-22280,
-22315,
-22315,
-22332,
-22357,
-22357,
-22357,
-22357,
-22357,
-22401,
-22412,
-22424,
-22455,
-22466,
-22466,
-22469,
-22477,
-22485,
-22508,
-22530,
-22537,
-22546,
-22551,
-22562,
-22571,
-22574,
-22599,
-22627,
-22630,
-22643,
-22663,
-22699,
-22699,
-22705,
-22708,
-22721,
-22724,
-22738,
-22768,
-22771,
-22774,
-22789,
-22807,
-22819,
-22870,
-22886,
-22892,
-22903,
-22932,
-22944,
-22973,
-22976,
-22992,
-22995,
-23006,
-23029,
-23042,
-23058,
-23101,
-23121,
-23138,
-23138,
-23141,
-23161,
-23164,
-23188,
-23188,
-23188,
-23201,
-23231,
-23231,
-23231,
-23231,
-23241,
-23241,
-23244,
-23262,
-23320,
-23320,
-23356,
-23402,
-23405,
-23405,
-23440,
-23443,
-23452,
-23462,
-23471,
-23474,
-23474,
-23474,
-23485,
-23485,
-23500,
-23522,
-23546,
-23584,
-23591,
-23591,
-23591,
-23639,
-23639,
-23644,
-23644,
-23683,
-23683,
-23694,
-23712,
-23712,
-23740,
-23752,
-23775,
-23791,
-23791,
-23821,
-23844,
-23849,
-23872,
-23872,
-23879,
-23879,
-23939,
-23945,
-23959,
-23959,
-23959,
-24004,
-24010,
-24026,
-24042,
-24050,
-24067,
-24067,
-24098,
-24108,
-24108,
-24108,
-24108,
-24125,
-24144,
-24144,
-24160,
-24163,
-24163,
-24173,
-24177,
-24177,
-24188,
-24203,
-24203,
-24203,
-24206,
-24224,
-24253,
-24253,
-24253,
-24294,
-24294,
-24326,
-24341,
-24341,
-24354,
-24382,
-24401,
-24401,
-24419,
-24431,
-24442,
-24442,
-24457,
-24473,
-24473,
-24481,
-24512,
-24532,
-24532,
-24543,
-24550,
-24568,
-24607,
-24607,
-24628,
-24628,
-24634,
-24641,
-24662,
-24697,
-24712,
-24735,
-24745,
-24755,
-24769,
-24769,
-24786,
-24786,
-24786,
-24801,
-24809,
-24821,
-24835,
-24835,
-24835,
-24853,
-24872,
-24872,
-24872,
-24883,
-24901,
-24901,
-24905,
-24918,
-24918,
-24949,
-24949,
-24970,
-24970,
-24970,
-24981,
-24981,
-24981,
-24993,
-24993,
-24993,
-25005,
-25043,
-25050,
-25070,
-25099,
-25099,
-25110,
-25110,
-25110,
-25110,
-25115,
-25134,
-25134,
-25134,
-25141,
-25160,
-25167,
-25167,
-25179,
-25179,
-25179,
-25192,
-25238,
-25238,
-25282,
-25306,
-25316,
-25327,
-25339,
-25374,
-25374,
-25384,
-25384,
-25384,
-25384,
-25388,
-25388,
-25388,
-25388,
-25416,
-25453,
-25463,
-25463,
-25480,
-25536,
-25536,
-25536,
-25536,
-25536,
-25551,
-25567,
-25571,
-25591,
-25618,
-25631,
-25631,
-25650,
-25650,
-25650,
-25690,
-25707,
-25718,
-25743,
-25753,
-25753,
-25765,
-25765,
-25778,
-25802,
-25823,
-25823,
-25823,
-25840,
-25840,
-25840,
-25840,
-25870,
-25876,
-25897,
-25897,
-25897,
-25907,
-25907,
-25907,
-25907,
-25928,
-25928,
-25928,
-25961,
-25961,
-25961,
-25965,
-25965,
-25965,
-25975,
-26006,
-26006,
-26006,
-26006,
-26020,
-26020,
-26028,
-26028,
-26043,
-26075,
-26115,
-26124,
-26145,
-26145,
-26145,
-26145,
-26145,
-26145,
-26161,
-26161,
-26215,
-26234,
-26234,
-26234,
-26234,
-26254,
-26254,
-26259,
-26285,
-26299,
-26299,
-26316,
-26328,
-26381,
-26381,
-26381,
-26381,
-26402,
-26420,
-26438,
-26469,
-26469,
-26469,
-26481,
-26494,
-26502,
-26502,
-26502,
-26502,
-26502,
-26522,
-26522,
-26522,
-26535,
-26535,
-26556,
-26563,
-26563,
-26582,
-26604,
-26604,
-26614,
-26614,
-26619,
-26619,
-26619,
-26619,
-26644,
-26644,
-26644,
-26651,
-26667,
-26667,
-26667,
-26675,
-26675,
-26682,
-26682,
-26682,
-26693,
-26693,
-26693,
-26693,
-26699,
-26699,
-26715,
-26763,
-26772,
-26793,
-26793,
-26804,
-26804,
-26813,
-26813,
-26813,
-26840,
-26855,
-26865,
-26865,
-26882,
-26928,
-26938,
-26938,
-26938,
-26979,
-26979,
-27008,
-27008,
-27008,
-27008,
-27021,
-27037,
-27049,
-27060,
-27064,
-27085,
-27121,
-27121,
-27169,
-27169,
-27221,
-27253,
-27276,
-27294,
-27294,
-27342,
-27353,
-27353,
-27353,
-27371,
-27371,
-27375,
-27390,
-27390,
-27390,
-27395,
-27419,
-27426,
-27451,
-27471,
-27493,
-27493,
-27510,
-27510,
-27517,
-27529,
-27529,
-27542,
-27548,
-27548,
-27548,
-27576,
-27581,
-27597,
-27639,
-27653,
-27699,
-27716,
-27716,
-27742,
-27766,
-27785,
-27794,
-27794,
-27812,
-27812,
-27812,
-27812,
-27832,
-27832,
-27832,
-27832,
-27861,
-27861,
-27861,
-27867,
-27922,
-27922,
-27922,
-27922,
-27960,
-27960,
-27985,
-28026,
-28063,
-28063,
-28083,
-28090,
-28090,
-28104,
-28131,
-28177,
-28192,
-28196,
-28196,
-28196,
-28196,
-28228,
-28240,
-28271,
-28305,
-28305,
-28305,
-28322,
-28328,
-28341,
-28349,
-28388,
-28388,
-28388,
-28407,
-28411,
-28411,
-28411,
-28417,
-28427,
-28449,
-28463,
-28475,
-28516,
-28516,
-28525,
-28553,
-28553,
-28553,
-28578,
-28585,
-28626,
-28626,
-28663,
-28663,
-28669,
-28669,
-28690,
-28713,
-28713,
-28728,
-28728,
-28728,
-28734,
-28734,
-28751,
-28761,
-28775,
-28788,
-28794,
-28794,
-28812,
-28812,
-28823,
-28823,
-28834,
-28875,
-28928,
-28928,
-28928,
-28953,
-28983,
-28995,
-29012,
-29012,
-29012,
-29025,
-29056,
-29056,
-29080,
-29080,
-29092,
-29092,
-29092,
-29104,
-29104,
-29104,
-29104,
-29121,
-29121,
-29121,
-29121,
-29157,
-29157,
-29167,
-29186,
-29186,
-29186,
-29186,
-29186,
-29186,
-29195,
-29226,
-29241,
-29241,
-29257,
-29257,
-29270,
-29270,
-29270,
-29276,
-29276,
-29276,
-29276,
-29276,
-29282,
-29327,
-29327,
-29337,
-29349,
-29381,
-29381,
-29388,
-29388,
-29401,
-29401,
-29401,
-29411,
-29444,
-29483,
-29483,
-29529,
-29536,
-29549,
-29549,
-29549,
-29549,
-29549,
-29605,
-29605,
-29622,
-29622,
-29661,
-29661,
-29682,
-29691,
-29691,
-29691,
-29743,
-29743,
-29764,
-29764,
-29764,
-29764,
-29781,
-29796,
-29808,
-29819,
-29850,
-29863,
-29863,
-29876,
-29876,
-29876,
-29876,
-29885,
-29885,
-29897,
-29897,
-29934,
-29942,
-29942,
-29962,
-29976,
-29976,
-29976,
-29994,
-29994,
-29994,
-29994,
-29994,
-30010,
-30010,
-30025,
-30025,
-30025,
-30025,
-30035,
-30035,
-30042,
-30042,
-30055,
-30055,
-30055,
-30065,
-30082,
-30092,
-30101,
-30101,
-30123,
-30123,
-30134,
-30147,
-30147,
-30157,
-30176,
-30176,
-30193,
-30209,
-30217,
-30217,
-30259,
-30271,
-30277,
-30293,
-30328,
-30345,
-30378,
-30399,
-30425,
-30431,
-30431,
-30442,
-30453,
-30463,
-30469,
-30479,
-30493,
-30508,
-30518,
-30518,
-30533,
-30546,
-30546,
-30570,
-30589,
-30627,
-30648,
-30648,
-30673,
-30696,
-30708,
-30708,
-30708,
-30708,
-30708,
-30714,
-30714,
-30726,
-30736,
-30736,
-30754,
-30788,
-30788,
-30788,
-30814,
-30814,
-30814,
-30814,
-30814,
-30814,
-30814,
-30814,
-30820,
-30836,
-30836,
-30836,
-30836,
-30836,
-30836,
-30836,
-30836,
-30836,
-30855,
-30873,
-30886,
-30911,
-30921,
-30932,
-30932,
-30951,
-30957,
-31001,
-31007,
-31007,
-31022,
-31048,
-31055,
-31062,
-31079,
-31079,
-31118,
-31128,
-31128,
-31128,
-31146,
-31146,
-31146,
-31146,
-31162,
-31162,
-31177,
-31177,
-31195,
-31211,
-31282,
-31282,
-31290,
-31300,
-31363,
-31389,
-31406,
-31419,
-31439,
-31439,
-31439,
-31439,
-31443,
-31473,
-31481,
-31481,
-31508,
-31523,
-31569,
-31599,
-31621,
-31671,
-31680,
-31700,
-31741,
-31754,
-31775,
-31804,
-31804,
-31816,
-31825,
-31825,
-31850,
-31850,
-31850,
-31850,
-31866,
-31876,
-31876,
-31901,
-31911,
-31940,
-31950,
-31950,
-31957,
-31957,
-31957,
-31957,
-31976,
-31989,
-31996,
-31996,
-32010,
-32040,
-32061,
-32061,
-32080,
-32080,
-32080,
-32080,
-32093,
-32093,
-32093,
-32093,
-32115,
-32119,
-32119,
-32152,
-32152,
-32152,
-32164,
-32164,
-32174,
-32174,
-32174,
-32174,
-32237,
-32251,
-32287,
-32287,
-32295,
-32295,
-32310,
-32333,
-32342,
-32360,
-32360,
-32387,
-32409,
-32431,
-32431,
-32431,
-32448,
-32473,
-32523,
-32523,
-32541,
-32541,
-32563,
-32563,
-32575,
-32581,
-32581,
-32581,
-32581,
-32602,
-32622,
-32622,
-32676,
-32676,
-32676,
-32676,
-32676,
-32692,
-32711,
-32711,
-32711,
-32711,
-32752,
-32767,
-32797,
-32819,
-32846,
-32864,
-32864,
-32870,
-32887,
-32887,
-32898,
-32898,
-32898,
-32898,
-32898,
-32933,
-32997,
-32997,
-33007,
-33007,
-33007,
-33007,
-33024,
-33035,
-33035,
-33066,
-33090,
-33090,
-33090,
-33110,
-33110,
-33130,
-33150,
-33169,
-33169,
-33169,
-33207,
-33207,
-33207,
-33227,
-33251,
-33258,
-33258,
-33275,
-33285,
-33285,
-33285,
-33294,
-33310,
-33310,
-33323,
-33323,
-33323,
-33354,
-33361,
-33361,
-33361,
-33361,
-33368,
-33380,
-33403,
-33403,
-33419,
-33428,
-33428,
-33428,
-33444,
-33451,
-33451,
-33451,
-33476,
-33476,
-33483,
-33496,
-33496,
-33523,
-33558,
-33567,
-33567,
-33579,
-33592,
-33607,
-33615,
-33615,
-33615,
-33650,
-33650,
-33650,
-33650,
-33650,
-33720,
-33742,
-33742,
-33750,
-33758,
-33758,
-33769,
-33769,
-33779,
-33809,
-33809,
-33823,
-33823,
-33849,
-33857,
-33857,
-33857,
-33857,
-33857,
-33874,
-33874,
-33899,
-33910,
-33916,
-33916,
-33950,
-33957,
-33964,
-33970,
-33970,
-33970,
-33970,
-33993,
-34050,
-34050,
-34050,
-34071,
-34071,
-34108,
-34162,
-34162,
-34162,
-34162,
-34173,
-34173,
-34208,
-34225,
-34233,
-34264,
-34283,
-34291,
-34291,
-34291,
-34298,
-34307,
-34314,
-34338,
-34338,
-34378,
-34384,
-34402,
-34414,
-34414,
-34414,
-34423,
-34459,
-34459,
-34478,
-34494,
-34516,
-34528,
-34544,
-34544,
-34554,
-34566,
-34566,
-34583,
-34632,
-34640,
-34640,
-34654,
-34668,
-34668,
-34674,
-34674,
-34685,
-34685,
-34685,
-34701,
-34711,
-34711,
-34723,
-34734,
-34734,
-34751,
-34751,
-34751,
-34764,
-34786,
-34795,
-34795,
-34795,
-34795,
-34795,
-34826,
-34826,
-34826,
-34826,
-34826,
-34826,
-34826,
-34839,
-34839,
-34884,
-34884,
-34897,
-34897,
-34897,
-34930,
-34939,
-34939,
-34946,
-34989,
-35026,
-35038,
-35038,
-35038,
-35049,
-35049,
-35103,
-35103,
-35103,
-35103,
-35103,
-35103,
-35103,
-35103,
-35118,
-35118,
-35118,
-35135,
-35135,
-35163,
-35163,
-35163,
-35163,
-35191,
-35191,
-35213,
-35228,
-35234,
-35274,
-35284,
-35284,
-35284,
-35284,
-35290,
-35290,
-35300,
-35322,
-35353,
-35353,
-35353,
-35374,
-35387,
-35387,
-35393,
-35393,
-35448,
-35448,
-35460,
-35479,
-35479,
-35479,
-35501,
-35501,
-35531,
-35587,
-35593,
-35615,
-35615,
-35615,
-35615,
-35642,
-35653,
-35661,
-35680,
-35680,
-35680,
-35680,
-35680,
-35680,
-35688,
-35712,
-35712,
-35712,
-35718,
-35718,
-35724,
-35724,
-35724,
-35747,
-35747,
-35747,
-35753,
-35764,
-35764,
-35782,
-35802,
-35812,
-35832,
-35846,
-35867,
-35909,
-35909,
-35925,
-35935,
-35935,
-35935,
-35935,
-35935,
-35935,
-35976,
-35997,
-36014,
-36048,
-36048,
-36073,
-36106,
-36106,
-36112,
-36124,
-36124,
-36124,
-36148,
-36158,
-36158,
-36170,
-36170,
-36190,
-36190,
-36190,
-36194,
-36203,
-36221,
-36244,
-36269,
-36269,
-36285,
-36297,
-36321,
-36328,
-36328,
-36350,
-36378,
-36395,
-36405,
-36405,
-36412,
-36412,
-36425,
-36425,
-36425,
-36425,
-36444,
-36444,
-36444,
-36470,
-36492,
-36524,
-36541,
-36558,
-36558,
-36576,
-36614,
-36614,
-36638,
-36638,
-36660,
-36660,
-36664,
-36670,
-36717,
-36722,
-36741,
-36765,
-36765,
-36783,
-36783,
-36783,
-36783,
-36801,
-36811,
-36811,
-36825,
-36825,
-36856,
-36856,
-36868,
-36868,
-36868,
-36868,
-36868,
-36920,
-36920,
-36920,
-36932,
-36953,
-36953,
-36972,
-36988,
-36995,
-37007,
-37027,
-37033,
-37072,
-37089,
-37089,
-37089,
-37107,
-37137,
-37154,
-37154,
-37161,
-37167,
-37187,
-37187,
-37187,
-37187,
-37193,
-37199,
-37207,
-37231,
-37231,
-37231,
-37241,
-37241,
-37258,
-37280,
-37299,
-37299,
-37324,
-37338,
-37351,
-37351,
-37365,
-37371,
-37414,
-37420,
-37432,
-37451,
-37451,
-37457,
-37457,
-37488,
-37516,
-37516,
-37529,
-37538,
-37558,
-37580,
-37580,
-37614,
-37636,
-37650,
-37650,
-37662,
-37678,
-37710,
-37755,
-37762,
-37762,
-37771,
-37782,
-37816,
-37816,
-37838,
-37851,
-37889,
-37894,
-37894,
-37905,
-37914,
-37921,
-37921,
-37930,
-37957,
-37984,
-38029,
-38045,
-38061,
-38061,
-38061,
-38074,
-38082,
-38101,
-38108,
-38108,
-38115,
-38122,
-38122,
-38187,
-38187,
-38187,
-38210,
-38210,
-38214,
-38214,
-38241,
-38252,
-38274,
-38274,
-38274,
-38274,
-38284,
-38291,
-38291,
-38302,
-38313,
-38333,
-38333,
-38354,
-38354,
-38429,
-38429,
-38429,
-38429,
-38429,
-38464,
-38473,
-38503,
-38516,
-38555,
-38569,
-38569,
-38583,
-38603,
-38610,
-38619,
-38628,
-38638,
-38651,
-38656,
-38656,
-38662,
-38674,
-38704,
-38704,
-38739,
-38739,
-38739,
-38757,
-38757,
-38799,
-38833,
-38833,
-38855,
-38859,
-38893,
-38931,
-38931,
-38959,
-38977,
-38977,
-39000,
-39011,
-39011,
-39025,
-39060,
-39060,
-39070,
-39083,
-39089,
-39089,
-39093,
-39093,
-39100,
-39100,
-39123,
-39123,
-39123,
-39123,
-39123,
-39123,
-39150,
-39150,
-39168,
-39168,
-39168,
-39168,
-39198,
-39198,
-39198,
-39223,
-39246,
-39270,
-39280,
-39292,
-39292,
-39308,
-39308,
-39326,
-39326,
-39341,
-39341,
-39341,
-39341,
-39352,
-39365,
-39365,
-39372,
-39385,
-39405,
-39419,
-39436,
-39436,
-39436,
-39471,
-39489,
-39496,
-39523,
-39530,
-39530,
-39530,
-39544,
-39557,
-39564,
-39564,
-39605,
-39612,
-39629,
-39650,
-39679,
-39679,
-39679,
-39689,
-39699,
-39699,
-39706,
-39715,
-39734,
-39734,
-39734,
-39754,
-39789,
-39789,
-39806,
-39820,
-39879,
-39893,
-39904,
-39945,
-39945,
-39945,
-39945,
-39945,
-39945,
-39957,
-40010,
-40034,
-40074,
-40104,
-40104,
-40104,
-40104,
-40104,
-40111,
-40118,
-40138,
-40152,
-40182,
-40198,
-40198,
-40198,
-40198,
-40232,
-40236,
-40251,
-40251,
-40272,
-40279,
-40296,
-40327,
-40336,
-40336,
-40398,
-40405,
-40423,
-40474,
-40484,
-40501,
-40519,
-40519,
-40580,
-40631,
-40680,
-40720,
-40727,
-40727,
-40727,
-40734,
-40734,
-40734,
-40741,
-40761,
-40805,
-40825,
-40846,
-40864,
-40894,
-40906,
-40906,
-40906,
-40944,
-40951,
-40971,
-40980,
-40999,
-40999,
-41015,
-41029,
-41042,
-41042,
-41059,
-41093,
-41105,
-41125,
-41163,
-41163,
-41172,
-41183,
-41183,
-41183,
-41183,
-41183,
-41192,
-41207,
-41222,
-41222,
-41222,
-41228,
-41235,
-41241,
-41241,
-41260,
-41267,
-41267,
-41287,
-41294,
-41314,
-41319,
-41319,
-41326,
-41332,
-41346,
-41346,
-41346,
-41354,
-41361,
-41361,
-41368,
-41368,
-41387,
-41416,
-41426,
-41433,
-41462,
-41496,
-41496,
-41528,
-41528,
-41553,
-41558,
-41558,
-41565,
-41586,
-41586,
-41586,
-41603,
-41610,
-41610,
-41636,
-41656,
-41656,
-41675,
-41675,
-41728,
-41752,
-41752,
-41760,
-41760,
-41791,
-41791,
-41805,
-41840,
-41852,
-41869,
-41894,
-41894,
-41894,
-41907,
-41917,
-41917,
-41917,
-41926,
-41933,
-41933,
-41946,
-41946,
-41951,
-41951,
-41980,
-41996,
-41996,
-42017,
-42036,
-42052,
-42089,
-42114,
-42114,
-42121,
-42121,
-42145,
-42145,
-42157,
-42157,
-42157,
-42165,
-42183,
-42183,
-42214,
-42235,
-42262,
-42262,
-42276,
-42276,
-42276,
-42296,
-42327,
-42327,
-42327,
-42327,
-42327,
-42327,
-42327,
-42327,
-42327,
-42327,
-42327,
-42327,
-42362,
-42362,
-42369,
-42404,
-42411,
-42435,
-42463,
-42487,
-42513,
-42526,
-42555,
-42583,
-42583,
-42596,
-42612,
-42623,
-42634,
-42639,
-42670,
-42704,
-42704,
-42704,
-42727,
-42727,
-42734,
-42748,
-42772,
-42804,
-42804,
-42808,
-42821,
-42843,
-42892,
-42899,
-42909,
-42916,
-42956,
-42978,
-42987,
-42987,
-43012,
-43030,
-43037,
-43059,
-43075,
-43075,
-43089,
-43096,
-43123,
-43154,
-43168,
-43168,
-43168,
-43181,
-43205,
-43205,
-43212,
-43218,
-43250,
-43250,
-43257,
-43257,
-43264,
-43264,
-43271,
-43284,
-43304,
-43304,
-43318,
-43348,
-43355,
-43373,
-43394,
-43394,
-43419,
-43426,
-43430,
-43430,
-43443,
-43461,
-43478,
-43490,
-43490,
-43490,
-43537,
-43556,
-43556,
-43578,
-43604,
-43640,
-43640,
-43640,
-43645,
-43679,
-43705,
-43747,
-43769,
-43769,
-43769,
-43775,
-43803,
-43803,
-43810,
-43810,
-43844,
-43865,
-43872,
-43880,
-43886,
-43921,
-43921,
-43928,
-43928,
-43935,
-43985,
-43992,
-43992,
-44009,
-44022,
-44022,
-44038,
-44042,
-44049,
-44049,
-44056,
-44100,
-44100,
-44107,
-44121,
-44121,
-44121,
-44137,
-44197,
-44204,
-44236,
-44254,
-44286,
-44286,
-44307,
-44319,
-44329,
-44336,
-44343,
-44361,
-44361,
-44361,
-44377,
-44396,
-44423,
-44423,
-44449,
-44471,
-44471,
-44480,
-44480,
-44500,
-44514,
-44537,
-44560,
-44573,
-44606,
-44619,
-44642,
-44705,
-44705,
-44705,
-44711,
-44746,
-44753,
-44753,
-44765,
-44765,
-44765,
-44787,
-44794,
-44801,
-44851,
-44865,
-44884,
-44891,
-44915,
-44924,
-44924,
-44924,
-44960,
-44960,
-44967,
-45006,
-45013,
-45029,
-45036,
-45042,
-45042,
-45053,
-45060,
-45076,
-45108,
-45108,
-45131,
-45138,
-45161,
-45184,
-45261,
-45275,
-45288,
-45305,
-45352,
-45359,
-45403,
-45429,
-45457,
-45484,
-45497,
-45543,
-45574,
-45598,
-45625,
-45665,
-45679,
-45686,
-45691,
-45691,
-45717,
-45722,
-45737,
-45744,
-45744,
-45770,
-45770,
-45774,
-45774,
-45781,
-45815,
-45832,
-45839,
-45856,
-45863,
-45863,
-45896,
-45915,
-45950,
-45950,
-45967,
-45967,
-46016,
-46016,
-46023,
-46038,
-46038,
-46063,
-46063,
-46074,
-46087,
-46117,
-46117,
-46153,
-46153,
-46163,
-46195,
-46202,
-46275,
-46302,
-46320,
-46327,
-46343,
-46343,
-46360,
-46402,
-46402,
-46430,
-46441,
-46445,
-46445,
-46445,
-46461,
-46461,
-46461,
-46478,
-46478,
-46538,
-46538,
-46538,
-46552,
-46569,
-46569,
-46577,
-46585,
-46585,
-46602,
-46610,
-46649,
-46656,
-46670,
-46715,
-46734,
-46734,
-46760,
-46767,
-46767,
-46781,
-46781,
-46795,
-46813,
-46828,
-46835,
-46858,
-46858,
-46858,
-46884,
-46918,
-46930,
-46973,
-46984,
-46998,
-47009,
-47032,
-47038,
-47038,
-47064,
-47113,
-47133,
-47149,
-47156,
-47163,
-47178,
-47215,
-47224,
-47236,
-47263,
-47263,
-47287,
-47295,
-47333,
-47333,
-47343,
-47343,
-47365,
-47404,
-47433,
-47441,
-47448,
-47469,
-47508,
-47526,
-47532,
-47545,
-47584,
-47610,
-47610,
-47627,
-47627,
-47644,
-47644,
-47644,
-47649,
-47680,
-47699,
-47699,
-47721,
-47721,
-47721,
-47721,
-47749,
-47749,
-47785,
-47785,
-47785,
-47785,
-47785,
-47785,
-47824,
-47824,
-47839,
-47861,
-47906,
-47924,
-47924,
-47942,
-47946,
-47946,
-47980,
-47991,
-48009,
-48014,
-48035,
-48065,
-48075,
-48101,
-48112,
-48126,
-48148,
-48148,
-48148,
-48156,
-48239,
-48239,
-48244,
-48244,
-48281,
-48281,
-48291,
-48291,
-48306,
-48324,
-48340,
-48353,
-48366,
-48366,
-48366,
-48378,
-48378,
-48396,
-48396,
-48414,
-48421,
-48435,
-48435,
-48458,
-48522,
-48522,
-48534,
-48534,
-48548,
-48556,
-48571,
-48585,
-48593,
-48593,
-48611,
-48611,
-48616,
-48616,
-48629,
-48629,
-48629,
-48642,
-48654,
-48692,
-48700,
-48700,
-48700,
-48700,
-48700,
-48713,
-48713,
-48713,
-48730,
-48741,
-48741,
-48760,
-48760,
-48765,
-48765,
-48765,
-48777,
-48777,
-48777,
-48788,
-48809,
-48827,
-48827,
-48827,
-48827,
-48854,
-48888,
-48905,
-48919,
-48935,
-48935,
-48947,
-48960,
-48960,
-48982,
-49004,
-49020,
-49020,
-49043,
-49060,
-49060,
-49060,
-49074,
-49090,
-49096,
-49125,
-49146,
-49166,
-49191,
-49191,
-49191,
-49191,
-49191,
-49203,
-49213,
-49219,
-49245,
-49280,
-49288,
-49300,
-49307,
-49322,
-49329,
-49342,
-49367,
-49384,
-49391,
-49391,
-49414,
-49426,
-49446,
-49460,
-49460,
-49460,
-49489,
-49503,
-49503,
-49532,
-49539,
-49539,
-49539,
-49546,
-49546,
-49567,
-49567,
-49582,
-49589,
-49596,
-49603,
-49609,
-49609,
-49653,
-49660,
-49667,
-49692,
-49710,
-49736,
-49752,
-49777,
-49802,
-49808,
-49819,
-49826,
-49845,
-49861,
-49905,
-49905,
-49916,
-49916,
-49916,
-49938,
-49938,
-49962,
-49962,
-49969,
-49976,
-50026,
-50026,
-50088,
-50088,
-50110,
-50157,
-50191,
-50234,
-50261,
-50261,
-50278,
-50278,
-50285,
-50285,
-50289,
-50314,
-50324,
-50324,
-50324,
-50324,
-50324,
-50337,
-50337,
-50337,
-50351,
-50358,
-50358,
-50358,
-50358,
-50375,
-50375,
-50375,
-50383,
-50383,
-50383,
-50396,
-50432,
-50432,
-50432,
-50432,
-50432,
-50432,
-50439,
-50439,
-50446,
-50519,
-50533,
-50537,
-50548,
-50555,
-50581,
-50588,
-50599,
-50620,
-50647,
-50654,
-50665,
-50672,
-50688,
-50688,
-50699,
-50719,
-50742,
-50742,
-50749,
-50804,
-50810,
-50827,
-50849,
-50849,
-50849,
-50849,
-50887,
-50901,
-50910,
-50910,
-50933,
-50950,
-50950,
-50962,
-50962,
-51006,
-51013,
-51028,
-51028,
-51028,
-51035,
-51068,
-51075,
-51075,
-51082,
-51089,
-51089,
-51109,
-51125,
-51153,
-51160,
-51160,
-51179,
-51204,
-51211,
-51211,
-51228,
-51228,
-51241,
-51241,
-51241,
-51241,
-51248,
-51248,
-51276,
-51288,
-51302,
-51334,
-51342,
-51349,
-51349,
-51364,
-51394,
-51401,
-51426,
-51426,
-51426,
-51446,
-51453,
-51453,
-51479,
-51494,
-51526,
-51526,
-51536,
-51558,
-51567,
-51589,
-51639,
-51646,
-51661,
-51661,
-51678,
-51685,
-51685,
-51693,
-51715,
-51715,
-51722,
-51729,
-51739,
-51747,
-51754,
-51754,
-51777,
-51777,
-51784,
-51791,
-51826,
-51847,
-51868,
-51892,
-51912,
-51937,
-51968,
-51989,
-51989,
-51989,
-51989,
-51989,
-51997,
-52004,
-52020,
-52031,
-52031,
-52031,
-52047,
-52058,
-52066,
-52073,
-52093,
-52093,
-52113,
-52113,
-52113,
-52113,
-52134,
-52153,
-52163,
-52163,
-52178,
-52195,
-52208,
-52215,
-52215,
-52215,
-52227,
-52270,
-52285,
-52302,
-52311,
-52311,
-52362,
-52378,
-52416,
-52433,
-52458,
-52468,
-52468,
-52468,
-52491,
-52491,
-52504,
-52504,
-52513,
-52518,
-52518,
-52518,
-52534,
-52534,
-52542,
-52542,
-52559,
-52581,
-52610,
-52644,
-52657,
-52662,
-52685,
-52685,
-52690,
-52690,
-52708,
-52728,
-52747,
-52774,
-52788,
-52830,
-52837,
-52837,
-52876,
-52883,
-52911,
-52911,
-52921,
-52943,
-52943,
-52943,
-52967,
-52967,
-52981,
-53000,
-53014,
-53050,
-53050,
-53061,
-53061,
-53075,
-53082,
-53129,
-53129,
-53129,
-53145,
-53152,
-53159,
-53159,
-53179,
-53186,
-53192,
-53199,
-53199,
-53199,
-53234,
-53257,
-53262,
-53279,
-53298,
-53317,
-53341,
-53361,
-53361,
-53361,
-53372,
-53372,
-53411,
-53433,
-53444,
-53455,
-53476,
-53490,
-53504,
-53531,
-53531,
-53531,
-53545,
-53552,
-53568,
-53568,
-53568,
-53580,
-53580,
-53613,
-53635,
-53667,
-53677,
-53706,
-53706,
-53706,
-53726,
-53767,
-53774,
-53792,
-53805,
-53816,
-53824,
-53851,
-53869,
-53869,
-53869,
-53869,
-53869,
-53879,
-53893,
-53893,
-53903,
-53903,
-53912,
-53912,
-53912,
-53912,
-53912,
-53912,
-53924,
-53924,
-53931,
-53931,
-53950,
-53960,
-53960,
-53965,
-53986,
-53986,
-54018,
-54028,
-54036,
-54054,
-54061,
-54061,
-54080,
-54090,
-54098,
-54102,
-54106,
-54106,
-54122,
-54143,
-54143,
-54158,
-54165,
-54165,
-54175,
-54175,
-54175,
-54192,
-54204,
-54220,
-54265,
-54265,
-54265,
-54271,
-54271,
-54271,
-54271,
-54276,
-54276,
-54300,
-54306,
-54306,
-54315,
-54324,
-54329,
-54343,
-54365,
-54381,
-54381,
-54381,
-54381,
-54381,
-54381,
-54403,
-54403,
-54403,
-54429,
-54445,
-54445,
-54445,
-54458,
-54458,
-54471,
-54495,
-54495,
-54507,
-54514,
-54519,
-54526,
-54554,
-54571,
-54600,
-54607,
-54622,
-54622,
-54638,
-54656,
-54656,
-54665,
-54682,
-54682,
-54682,
-54703,
-54709,
-54709,
-54725,
-54749,
-54780,
-54780,
-54794,
-54799,
-54799,
-54799,
-54799,
-54804,
-54817,
-54840,
-54858,
-54858,
-54858,
-54858,
-54878,
-54890,
-54896,
-54904,
-54904,
-54911,
-54911,
-54924,
-54924,
-54924,
-54924,
-54924,
-54924,
-54924,
-54938,
-54946,
-54966,
-54984,
-54984,
-54984,
-54984,
-54984,
-54995,
-55002,
-55017,
-55017,
-55026,
-55051,
-55083,
-55083,
-55083,
-55083,
-55083,
-55100,
-55100,
-55100,
-55108,
-55116,
-55126,
-55126,
-55126,
-55126,
-55133,
-55137,
-55137,
-55137,
-55168,
-55168,
-55168,
-55168,
-55173,
-55173,
-55177,
-55177,
-55177,
-55205,
-55217,
-55241,
-55255,
-55287,
-55291,
-55324,
-55328,
-55336,
-55343,
-55361,
-55376,
-55376,
-55381,
-55409,
-55409,
-55409,
-55409,
-55409,
-55424,
-55424,
-55441,
-55441,
-55452,
-55470,
-55470,
-55515,
-55515,
-55533,
-55543,
-55543,
-55543,
-55543,
-55543,
-55543,
-55577,
-55577,
-55588,
-55603,
-55634,
-55634,
-55634,
-55645,
-55665,
-55665,
-55676,
-55693,
-55693,
-55701,
-55716,
-55734,
-55762,
-55772,
-55791,
-55791,
-55795,
-55795,
-55812,
-55812,
-55816,
-55820,
-55837,
-55837,
-55837,
-55837,
-55837,
-55850,
-55850,
-55850,
-55850,
-55878,
-55878,
-55883,
-55887,
-55887,
-55887,
-55908,
-55908,
-55932,
-55932,
-55945,
-55945,
-55958,
-55958,
-55969,
-56008,
-56029,
-56029,
-56045,
-56056,
-56086,
-56086,
-56120,
-56120,
-56149,
-56177,
-56177,
-56188,
-56188,
-56194,
-56194,
-56202,
-56202,
-56222,
-56222,
-56254,
-56254,
-56293,
-56313,
-56338,
-56338,
-56353,
-56378,
-56393,
-56393,
-56410,
-56410,
-56410,
-56410,
-56444,
-56444,
-56490,
-56490,
-56490,
-56511,
-56511,
-56525,
-56525,
-56537,
-56558,
-56578,
-56588,
-56588,
-56596,
-56604,
-56604,
-56604,
-56604,
-56604,
-56604,
-56604,
-56608,
-56634,
-56644,
-56644,
-56644,
-56663,
-56663,
-56671,
-56671,
-56671,
-56671,
-56697,
-56718,
-56718,
-56718,
-56748,
-56752,
-56752,
-56768,
-56810,
-56810,
-56810,
-56836,
-56882,
-56882,
-56882,
-56893,
-56893,
-56917,
-56917,
-56937,
-56967,
-56976,
-56996,
-56996,
-57031,
-57049,
-57071,
-57103,
-57103,
-57103,
-57121,
-57133,
-57151,
-57151,
-57165,
-57165,
-57165,
-57170,
-57185,
-57185,
-57185,
-57204,
-57214,
-57241,
-57286,
-57336,
-57336,
-57377,
-57397,
-57409,
-57439,
-57451,
-57451,
-57472,
-57486,
-57532,
-57556,
-57556,
-57562,
-57575,
-57590,
-57621,
-57654,
-57675,
-57675,
-57675,
-57689,
-57689,
-57695,
-57699,
-57716,
-57739,
-57748,
-57788,
-57806,
-57822,
-57828,
-57828,
-57838,
-57861,
-57894,
-57924,
-57924,
-57930,
-57930,
-57930,
-57941,
-57941,
-57966,
-57997,
-58022,
-58030,
-58050,
-58070,
-58107,
-58115,
-58158,
-58185,
-58217,
-58235,
-58266,
-58272,
-58298,
-58309,
-58349,
-58381,
-58381,
-58418,
-58432,
-58456,
-58468,
-58468,
-58489,
-58517,
-58517,
-58535,
-58561,
-58581,
-58618,
-58655,
-58655,
-58674,
-58680,
-58696,
-58701,
-58701,
-58701,
-58717,
-58717,
-58727,
-58739,
-58753,
-58762,
-58762,
-58762,
-58797,
-58809,
-58832,
-58847,
-58868,
-58868,
-58868,
-58880,
-58880,
-58880,
-58885,
-58885,
-58885,
-58885,
-58885,
-58885,
-58885,
-58912,
-58931,
-58931,
-58931,
-58951,
-58963,
-58985,
-58985,
-59003,
-59008,
-59017,
-59017,
-59027,
-59052,
-59058,
-59058,
-59058,
-59096,
-59130,
-59153,
-59153,
-59153,
-59153,
-59153,
-59153,
-59153,
-59153,
-59162,
-59162,
-59162,
-59162,
-59179,
-59225,
-59242,
-59248,
-59270,
-59318,
-59323,
-59340,
-59346,
-59360,
-59366,
-59382,
-59416,
-59445,
-59471,
-59495,
-59495,
-59513,
-59513,
-59541,
-59547,
-59553,
-59559,
-59583,
-59595,
-59607,
-59631,
-59631,
-59643,
-59649,
-59661,
-59714,
-59737,
-59737,
-59758,
-59758,
-59775,
-59784,
-59796,
-59815,
-59821,
-59821,
-59849,
-59856,
-59868,
-59881,
-59900,
-59907,
-59928,
-59940,
-59940,
-59955,
-59955,
-60014,
-60014,
-60045,
-60057,
-60057,
-60063,
-60075,
-60075,
-60079,
-60079,
-60096,
-60111,
-60111,
-60111,
-60156,
-60171,
-60183,
-60197,
-60223,
-60223,
-60229,
-60253,
-60259,
-60259,
-60274,
-60315,
-60342,
-60342,
-60386,
-60396,
-60406,
-60406,
-60433,
-60433,
-60433,
-60457,
-60474,
-60474,
-60492,
-60502,
-60508,
-60508,
-60514,
-60527,
-60545,
-60551,
-60588,
-60621,
-60645,
-60645,
-60663,
-60685,
-60711,
-60758,
-60758,
-60769,
-60781,
-60823,
-60842,
-60842,
-60842,
-60848,
-60848,
-60860,
-60866,
-60880,
-60880,
-60880,
-60898,
-60949,
-60975,
-60975,
-60997,
-60997,
-61059,
-61083,
-61083,
-61107,
-61107,
-61113,
-61117,
-61123,
-61140,
-61152,
-61174,
-61183,
-61183,
-61183,
-61235,
-61262,
-61268,
-61268,
-61268,
-61276,
-61289,
-61297,
-61297,
-61312,
-61327,
-61336,
-61350,
-61375,
-61383,
-61409,
-61422,
-61422,
-61457,
-61497,
-61497,
-61554,
-61594,
-61606,
-61606,
-61624,
-61624,
-61624,
-61633,
-61633,
-61658,
-61674,
-61682,
-61682,
-61696,
-61696,
-61696,
-61696,
-61706,
-61747,
-61768,
-61768,
-61768,
-61777,
-61777,
-61777,
-61781,
-61787,
-61800,
-61815,
-61820,
-61826,
-61834,
-61865,
-61871,
-61876,
-61889,
-61912,
-61912,
-61912,
-61918,
-61918,
-61946,
-61985,
-61985,
-61985,
-62004,
-62015,
-62015,
-62029,
-62044,
-62050,
-62064,
-62064,
-62087,
-62099,
-62099,
-62110,
-62116,
-62129,
-62142,
-62167,
-62179,
-62191,
-62212,
-62218,
-62218,
-62256,
-62256,
-62283,
-62304,
-62304,
-62329,
-62329,
-62351,
-62351,
-62351,
-62351,
-62368,
-62368,
-62386,
-62404,
-62442,
-62449,
-62449,
-62449,
-62469,
-62473,
-62488,
-62488,
-62502,
-62530,
-62549,
-62569,
-62569,
-62569,
-62600,
-62600,
-62609,
-62622,
-62639,
-62639,
-62639,
-62657,
-62657,
-62681,
-62681,
-62681,
-62688,
-62716,
-62716,
-62724,
-62724,
-62735,
-62743,
-62757,
-62769,
-62789,
-62809,
-62809,
-62815,
-62836,
-62853,
-62853,
-62863,
-62863,
-62863,
-62863,
-62863,
-62872,
-62885,
-62885,
-62914,
-62914,
-62914,
-62952,
-62952,
-62964,
-63000,
-63000,
-63000,
-63010,
-63016,
-63016,
-63016,
-63032,
-63039,
-63049,
-63063,
-63063,
-63099,
-63111,
-63119,
-63125,
-63145,
-63176,
-63188,
-63225,
-63231,
-63244,
-63244,
-63255,
-63255,
-63273,
-63273,
-63285,
-63285,
-63338,
-63352,
-63399,
-63399,
-63423,
-63423,
-63435,
-63449,
-63449,
-63457,
-63491,
-63491,
-63518,
-63518,
-63547,
-63565,
-63576,
-63594,
-63594,
-63594,
-63594,
-63600,
-63600,
-63616,
-63616,
-63642,
-63671,
-63671,
-63671,
-63677,
-63677,
-63691,
-63706,
-63720,
-63733,
-63755,
-63762,
-63779,
-63779,
-63795,
-63795,
-63795,
-63847,
-63879,
-63905,
-63921,
-63927,
-63965,
-63986,
-63986,
-64007,
-64007,
-64052,
-64052,
-64066,
-64079,
-64079,
-64134,
-64134,
-64140,
-64150,
-64150,
-64167,
-64192,
-64192,
-64192,
-64208,
-64224,
-64232,
-64243,
-64243,
-64278,
-64295,
-64314,
-64314,
-64314,
-64314,
-64314,
-64314,
-64314,
-64331,
-64360,
-64377,
-64395,
-64395,
-64395,
-64420,
-64463,
-64470,
-64486,
-64496,
-64509,
-64509,
-64519,
-64531,
-64548,
-64570,
-64597,
-64631,
-64631,
-64661,
-64671,
-64710,
-64710,
-64710,
-64751,
-64751,
-64761,
-64772,
-64772,
-64772,
-64772,
-64772,
-64792,
-64834,
-64846,
-64846,
-64862,
-64881,
-64893,
-64893,
-64911,
-64920,
-64937,
-64937,
-64954,
-64954,
-64954,
-64970,
-64970,
-64980,
-64980,
-64980,
-65004,
-65013,
-65013,
-65022,
-65022,
-65022,
-65047,
-65047,
-65054,
-65054,
-65061,
-65061,
-65061,
-65069,
-65081,
-65127,
-65136,
-65158,
-65158,
-65158,
-65188,
-65188,
-65188,
-65209,
-65227,
-65227,
-65227,
-65242,
-65246,
-65263,
-65289,
-65297,
-65314,
-65314,
-65347,
-65347,
-65347,
-65390,
-65390,
-65405,
-65412,
-65432,
-65432,
-65445,
-65445,
-65460,
-65460,
-65497,
-65497,
-65497,
-65497,
-65517,
-65526,
-65526,
-65547,
-65547,
-65553,
-65553,
-65569,
-65576,
-65576,
-65576,
-65586,
-65586,
-65586,
-65586,
-65603,
-65628,
-65628,
-65647,
-65647,
-65667,
-65677,
-65695,
-65704,
-65715,
-65715,
-65743,
-65743,
-65782,
-65802,
-65809,
-65818,
-65837,
-65837,
-65852,
-65856,
-65871,
-65875,
-65918,
-65918,
-65918,
-65944,
-65944,
-65951,
-65958,
-65980,
-65980,
-66007,
-66007,
-66007,
-66036,
-66059,
-66059,
-66059,
-66082,
-66082,
-66082,
-66082,
-66121,
-66121,
-66128,
-66128,
-66168,
-66168,
-66188,
-66203,
-66218,
-66251,
-66251,
-66270,
-66270,
-66270,
-66270,
-66296,
-66301,
-66328,
-66361,
-66387,
-66387,
-66416,
-66434,
-66448,
-66448,
-66448,
-66467,
-66467,
-66476,
-66476,
-66476,
-66493,
-66505,
-66505,
-66505,
-66513,
-66513,
-66513,
-66513,
-66528,
-66549,
-66549,
-66549,
-66566,
-66571,
-66593,
-66623,
-66623,
-66623,
-66623,
-66623,
-66623,
-66623,
-66623,
-66623,
-66646,
-66657,
-66681,
-66697,
-66727,
-66747,
-66754,
-66773,
-66795,
-66821,
-66833,
-66840,
-66861,
-66861,
-66861,
-66861,
-66861,
-66874,
-66874,
-66874,
-66880,
-66880,
-66880,
-66890,
-66903,
-66903,
-66918,
-66946,
-67028,
-67028,
-67035,
-67050,
-67050,
-67062,
-67077,
-67077,
-67091,
-67091,
-67108,
-67108,
-67136,
-67136,
-67136,
-67152,
-67173,
-67202,
-67221,
-67245,
-67245,
-67251,
-67260,
-67277,
-67277,
-67277,
-67277,
-67284,
-67311,
-67311,
-67311,
-67332,
-67332,
-67332,
-67353,
-67395,
-67421,
-67421,
-67446,
-67497,
-67519,
-67524,
-67549,
-67549,
-67565,
-67575,
-67593,
-67607,
-67612,
-67612,
-67612,
-67625,
-67675,
-67685,
-67694,
-67705,
-67705,
-67705,
-67725,
-67725,
-67772,
-67782,
-67782,
-67782,
-67782,
-67782,
-67811,
-67827,
-67827,
-67827,
-67835,
-67852,
-67857,
-67900,
-67900,
-67900,
-67904,
-67904,
-67904,
-67904,
-67921,
-67941,
-67952,
-67952,
-67969,
-67969,
-67969,
-67983,
-67983,
-68008,
-68008,
-68016,
-68035,
-68035,
-68035,
-68035,
-68035,
-68056,
-68076,
-68083,
-68104,
-68104,
-68104,
-68104,
-68122,
-68143,
-68167,
-68185,
-68185,
-68185,
-68202,
-68229,
-68238,
-68251,
-68274,
-68295,
-68300,
-68300,
-68338,
-68370,
-68392,
-68416,
-68416,
-68416,
-68416,
-68436,
-68458,
-68485,
-68508,
-68542,
-68542,
-68549,
-68549,
-68549,
-68549,
-68555,
-68555,
-68563,
-68575,
-68587,
-68606,
-68606,
-68606,
-68606,
-68606,
-68611,
-68611,
-68611,
-68630,
-68636,
-68673,
-68673,
-68686,
-68686,
-68686,
-68697,
-68706,
-68716,
-68728,
-68749,
-68754,
-68779,
-68784,
-68784,
-68784,
-68784,
-68794,
-68794,
-68799,
-68813,
-68813,
-68840,
-68840,
-68858,
-68858,
-68858,
-68880,
-68880,
-68902,
-68908,
-68908,
-68908,
-68908,
-68908,
-68934,
-68934,
-68941,
-68968,
-68968,
-68984,
-68984,
-69000,
-69000,
-69000,
-69000,
-69000,
-69000,
-69000,
-69018,
-69045,
-69083,
-69083,
-69083,
-69083,
-69100,
-69104,
-69104,
-69104,
-69167,
-69167,
-69181,
-69192,
-69192,
-69192,
-69203,
-69203,
-69203,
-69203,
-69203,
-69203,
-69203,
-69203,
-69203,
-69208,
-69230,
-69242,
-69242,
-69249,
-69249,
-69249,
-69249,
-69259,
-69266,
-69266,
-69266,
-69331,
-69331,
-69331,
-69358,
-69369,
-69408,
-69414,
-69433,
-69433,
-69441,
-69456,
-69482,
-69482,
-69492,
-69527,
-69536,
-69549,
-69549,
-69566,
-69566,
-69570,
-69570,
-69587,
-69592,
-69592,
-69635,
-69642,
-69642,
-69654,
-69654,
-69654,
-69670,
-69677,
-69689,
-69689,
-69689,
-69705,
-69724,
-69724,
-69744,
-69750,
-69762,
-69779,
-69798,
-69806,
-69806,
-69814,
-69814,
-69844,
-69858,
-69868,
-69877,
-69911,
-69925,
-69925,
-69948,
-69955,
-69964,
-69987,
-70016,
-70030,
-70030,
-70047,
-70052,
-70052,
-70052,
-70052,
-70057,
-70070,
-70070,
-70070,
-70070,
-70083,
-70089,
-70089,
-70099,
-70111,
-70125,
-70140,
-70140,
-70144,
-70144,
-70144,
-70170,
-70176,
-70188,
-70200,
-70200,
-70215,
-70233,
-70233,
-70238,
-70270,
-70292,
-70302,
-70302,
-70320,
-70320,
-70328,
-70362,
-70362,
-70379,
-70435,
-70445,
-70476,
-70483,
-70483,
-70483,
-70494,
-70521,
-70533,
-70533,
-70533,
-70533,
-70544,
-70544,
-70582,
-70598,
-70615,
-70615,
-70636,
-70684,
-70684,
-70704,
-70704,
-70704,
-70716,
-70744,
-70772,
-70772,
-70816,
-70831,
-70831,
-70865,
-70865,
-70876,
-70892,
-70907,
-70925,
-70925,
-70925,
-70934,
-70934,
-70934,
-70973,
-71002,
-71044,
-71044,
-71044,
-71044,
-71056,
-71073,
-71073,
-71097,
-71097,
-71108,
-71108,
-71113,
-71113,
-71132,
-71146,
-71146,
-71153,
-71160,
-71160,
-71179,
-71198,
-71212,
-71223,
-71230,
-71230,
-71244,
-71274,
-71286,
-71286,
-71304,
-71304,
-71304,
-71320,
-71320,
-71325,
-71325,
-71325,
-71359,
-71388,
-71388,
-71411,
-71416,
-71416,
-71438,
-71464,
-71464,
-71464,
-71471,
-71485,
-71505,
-71519,
-71526,
-71541,
-71563,
-71563,
-71583,
-71605,
-71612,
-71631,
-71663,
-71682,
-71682,
-71700,
-71714,
-71721,
-71721,
-71749,
-71774,
-71783,
-71790,
-71797,
-71804,
-71830,
-71830,
-71863,
-71882,
-71882,
-71882,
-71917,
-71924,
-71944,
-71985,
-71985,
-71985,
-71985,
-72004,
-72023,
-72037,
-72037,
-72049,
-72090,
-72119,
-72152,
-72152,
-72152,
-72152,
-72177,
-72194,
-72229,
-72229,
-72229,
-72246,
-72253,
-72279,
-72286,
-72291,
-72319,
-72332,
-72339,
-72339,
-72372,
-72379,
-72417,
-72417,
-72442,
-72442,
-72457,
-72466,
-72498,
-72505,
-72529,
-72538,
-72538,
-72555,
-72584,
-72584,
-72603,
-72603,
-72603,
-72635,
-72635,
-72635,
-72635,
-72635,
-72635,
-72652,
-72652,
-72652,
-72652,
-72682,
-72689,
-72696,
-72696,
-72725,
-72732,
-72732,
-72781,
-72781,
-72813,
-72820,
-72847,
-72854,
-72867,
-72867,
-72894,
-72901,
-72918,
-72953,
-72953,
-72995,
-73002,
-73002,
-73014,
-73014,
-73014,
-73048,
-73103,
-73135,
-73142,
-73149,
-73160,
-73160,
-73169,
-73169,
-73169,
-73200,
-73208,
-73262,
-73285,
-73296,
-73309,
-73317,
-73331,
-73331,
-73338,
-73354,
-73354,
-73379,
-73401,
-73421,
-73428,
-73435,
-73469,
-73487,
-73494,
-73494,
-73494,
-73494,
-73522,
-73522,
-73529,
-73545,
-73545,
-73551,
-73604,
-73612,
-73612,
-73619,
-73644,
-73655,
-73655,
-73655,
-73662,
-73684,
-73730,
-73745,
-73769,
-73769,
-73791,
-73798,
-73798,
-73805,
-73823,
-73830,
-73844,
-73844,
-73885,
-73902,
-73937,
-73961,
-73968,
-74012,
-74038,
-74038,
-74038,
-74054,
-74080,
-74095,
-74124,
-74150,
-74174,
-74181,
-74195,
-74202,
-74241,
-74241,
-74264,
-74284,
-74291,
-74298,
-74329,
-74349,
-74387,
-74408,
-74415,
-74422,
-74429,
-74429,
-74451,
-74458,
-74490,
-74490,
-74497,
-74504,
-74504,
-74511,
-74547,
-74566,
-74566,
-74586,
-74586,
-74610,
-74634,
-74634,
-74663,
-74667,
-74691,
-74691,
-74691,
-74706,
-74738,
-74738,
-74745,
-74745,
-74791,
-74791,
-74804,
-74823,
-74830,
-74856,
-74856,
-74875,
-74882,
-74893,
-74902,
-74909,
-74916,
-74976,
-74976,
-74983,
-75010,
-75017,
-75029,
-75036,
-75043,
-75060,
-75067,
-75067,
-75067,
-75106,
-75113,
-75129,
-75129,
-75129,
-75129,
-75129,
-75149,
-75163,
-75195,
-75222,
-75259,
-75259,
-75259,
-75280,
-75280,
-75280,
-75301,
-75319,
-75360,
-75360,
-75367,
-75379,
-75379,
-75397,
-75428,
-75466,
-75486,
-75510,
-75536,
-75552,
-75573,
-75603,
-75620,
-75643,
-75659,
-75694,
-75694,
-75711,
-75718,
-75718,
-75718,
-75734,
-75741,
-75763,
-75805,
-75805,
-75823,
-75837,
-75844,
-75851,
-75858,
-75899,
-75906,
-75931,
-75958,
-75958,
-76002,
-76009,
-76009,
-76016,
-76023,
-76065,
-76092,
-76140,
-76140,
-76147,
-76177,
-76187,
-76187,
-76224,
-76224,
-76230,
-76265,
-76265,
-76291,
-76291,
-76316,
-76354,
-76361,
-76361,
-76375,
-76382,
-76399,
-76399,
-76399,
-76425,
-76425,
-76425,
-76425,
-76435,
-76451,
-76451,
-76490,
-76490,
-76490,
-76506,
-76506,
-76506,
-76516,
-76516,
-76516,
-76540,
-76579,
-76579,
-76586,
-76599,
-76606,
-76606,
-76606,
-76641,
-76641,
-76666,
-76676,
-76676,
-76676,
-76683,
-76683,
-76700,
-76700,
-76700,
-76700,
-76717,
-76717,
-76737,
-76737,
-76737,
-76737,
-76737,
-76737,
-76737,
-76737,
-76771,
-76771,
-76782,
-76789,
-76799,
-76828,
-76845,
-76845,
-76893,
-76893,
-76908,
-76930,
-76930,
-76973,
-76980,
-76980,
-76980,
-77005,
-77005,
-77020,
-77032,
-77051,
-77060,
-77086,
-77086,
-77086,
-77086,
-77150,
-77150,
-77167,
-77172,
-77172,
-77176,
-77176,
-77191,
-77191,
-77218,
-77218,
-77218,
-77218,
-77227,
-77237,
-77253,
-77273,
-77294,
-77321,
-77337,
-77352,
-77380,
-77380,
-77404,
-77422,
-77422,
-77428,
-77428,
-77444,
-77485,
-77485,
-77499,
-77499,
-77520,
-77545,
-77550,
-77560,
-77567,
-77596,
-77615,
-77615,
-77615,
-77653,
-77653,
-77653,
-77674,
-77674,
-77674,
-77686,
-77686,
-77706,
-77719,
-77719,
-77727,
-77736,
-77767,
-77773,
-77802,
-77821,
-77837,
-77847,
-77870,
-77877,
-77877,
-77877,
-77877,
-77888,
-77903,
-77926,
-77946,
-77957,
-77961,
-77967,
-77967,
-77967,
-77983,
-78017,
-78035,
-78035,
-78035,
-78040,
-78040,
-78040,
-78050,
-78063,
-78099,
-78104,
-78110,
-78110,
-78110,
-78138,
-78198,
-78218,
-78231,
-78295,
-78306,
-78335,
-78335,
-78364,
-78364,
-78364,
-78377,
-78417,
-78427,
-78427,
-78459,
-78459,
-78466,
-78466,
-78473,
-78499,
-78499,
-78509,
-78509,
-78536,
-78587,
-78609,
-78609,
-78616,
-78616,
-78640,
-78653,
-78653,
-78653,
-78653,
-78660,
-78679,
-78689,
-78703,
-78703,
-78728,
-78741,
-78756,
-78765,
-78783,
-78814,
-78839,
-78839,
-78839,
-78839,
-78849,
-78854,
-78864,
-78894,
-78894,
-78914,
-78914,
-78914,
-78932,
-78932,
-78971,
-78989,
-78989,
-78989,
-78997,
-78997,
-78997,
-78997,
-78997,
-78997,
-78997,
-78997,
-79009,
-79009,
-79033,
-79033,
-79049,
-79049,
-79049,
-79049,
-79061,
-79066,
-79081,
-79086,
-79093,
-79098,
-79098,
-79098,
-79124,
-79124,
-79124,
-79134,
-79150,
-79163,
-79163,
-79163,
-79193,
-79209,
-79218,
-79224,
-79235,
-79235,
-79247,
-79247,
-79247,
-79247,
-79247,
-79253,
-79274,
-79289,
-79289,
-79320,
-79320,
-79320,
-79337,
-79337,
-79354,
-79360,
-79388,
-79400,
-79400,
-79436,
-79436,
-79444,
-79460,
-79483,
-79483,
-79517,
-79517,
-79535,
-79543,
-79543,
-79543,
-79543,
-79562,
-79562,
-79562,
-79591,
-79591,
-79607,
-79617,
-79617,
-79626,
-79641,
-79641,
-79662,
-79662,
-79678,
-79678,
-79704,
-79717,
-79738,
-79738,
-79756,
-79756,
-79763,
-79770,
-79791,
-79791,
-79798,
-79798,
-79798,
-79815,
-79815,
-79876,
-79876,
-79876,
-79894,
-79919,
-79924,
-79943,
-79943,
-79958,
-79958,
-79979,
-79979,
-79996,
-79996,
-79996,
-79996,
-79996,
-79996,
-80004,
-80023,
-80023,
-80023,
-80023,
-80023,
-80023,
-80023,
-80023,
-80023,
-80023,
-80023,
-80023,
-80023,
-80049,
-80060,
-80060,
-80060,
-80091,
-80091,
-80091,
-80098,
-80123,
-80123,
-80123,
-80163,
-80163,
-80199,
-80199,
-80199,
-80199,
-80199,
-80225,
-80225,
-80240,
-80240,
-80240,
-80268,
-80287,
-80287,
-80298,
-80298,
-80339,
-80387,
-80402,
-80411,
-80422,
-80422,
-80434,
-80458,
-80466,
-80471,
-80481,
-80527,
-80565,
-80571,
-80606,
-80606,
-80618,
-80618,
-80655,
-80669,
-80677,
-80677,
-80723,
-80735,
-80735,
-80757,
-80757,
-80770,
-80800,
-80810,
-80810,
-80810,
-80820,
-80843,
-80843,
-80843,
-80879,
-80879,
-80879,
-80919,
-80919,
-80928,
-80956,
-80973,
-80973,
-80990,
-80990,
-80990,
-80990,
-81000,
-81000,
-81010,
-81028,
-81028,
-81028,
-81028,
-81034,
-81034,
-81034,
-81034,
-81034,
-81034,
-81034,
-81050,
-81070,
-81070,
-81118,
-81135,
-81135,
-81145,
-81158,
-81158,
-81195,
-81222,
-81233,
-81271,
-81284,
-81319,
-81327,
-81327,
-81345,
-81345,
-81345,
-81358,
-81392,
-81392,
-81422,
-81437,
-81471,
-81471,
-81471,
-81471,
-81471,
-81471,
-81494,
-81494,
-81494,
-81494,
-81494,
-81494,
-81521,
-81536,
-81564,
-81564,
-81591,
-81591,
-81612,
-81623,
-81654,
-81654,
-81654,
-81673,
-81673,
-81673,
-81673,
-81716,
-81716,
-81728,
-81757,
-81757,
-81757,
-81757,
-81757,
-81767,
-81784,
-81784,
-81784,
-81803,
-81815,
-81836,
-81836,
-81865,
-81920,
-81929,
-81945,
-81945,
-81945,
-81945,
-81966,
-81966,
-81987,
-81992,
-82010,
-82019,
-82019,
-82088,
-82088,
-82088,
-82123,
-82123,
-82123,
-82134,
-82144,
-82144,
-82164,
-82179,
-82197,
-82248,
-82266,
-82266,
-82266,
-82301,
-82318,
-82352,
-82378,
-82378,
-82384,
-82384,
-82384,
-82402,
-82410,
-82410,
-82426,
-82426,
-82426,
-82426,
-82426,
-82437,
-82471,
-82489,
-82489,
-82515,
-82523,
-82544,
-82544,
-82544,
-82544,
-82544,
-82559,
-82559,
-82576,
-82591,
-82624,
-82634,
-82650,
-82650,
-82668,
-82668,
-82675,
-82703,
-82703,
-82719,
-82730,
-82755,
-82755,
-82755,
-82755,
-82755,
-82755,
-82755,
-82765,
-82765,
-82776,
-82791,
-82807,
-82833,
-82848,
-82848,
-82869,
-82869,
-82884,
-82884,
-82884,
-82927,
-82927,
-82946,
-82964,
-82975,
-82975,
-82975,
-82983,
-83005,
-83045,
-83045,
-83045,
-83045,
-83045,
-83065,
-83065,
-83065,
-83065,
-83089,
-83120,
-83120,
-83120,
-83158,
-83158,
-83187,
-83208,
-83230,
-83243,
-83243,
-83243,
-83243,
-83265,
-83265,
-83265,
-83265,
-83265,
-83284,
-83307,
-83307,
-83307,
-83312,
-83331,
-83331,
-83331,
-83331,
-83354,
-83393,
-83400,
-83400,
-83400,
-83438,
-83448,
-83448,
-83485,
-83485,
-83485,
-83485,
-83485,
-83485,
-83485,
-83485,
-83508,
-83524,
-83536,
-83536,
-83572,
-83572,
-83572,
-83581,
-83581,
-83648,
-83648,
-83663,
-83676,
-83711,
-83722,
-83731,
-83731,
-83731,
-83753,
-83772,
-83772,
-83785,
-83785,
-83795,
-83810,
-83818,
-83845,
-83870,
-83870,
-83870,
-83880,
-83880,
-83904,
-83904,
-83904,
-83916,
-83916,
-83945,
-83996,
-83996,
-84020,
-84020,
-84030,
-84030,
-84030,
-84030,
-84063,
-84063,
-84094,
-84107,
-84130,
-84130,
-84149,
-84149,
-84155,
-84180,
-84215,
-84235,
-84273,
-84273,
-84291,
-84297,
-84307,
-84313,
-84334,
-84350,
-84350,
-84350,
-84392,
-84392,
-84403,
-84403,
-84436,
-84448,
-84470,
-84470,
-84470,
-84470,
-84470,
-84506,
-84534,
-84587,
-84599,
-84617,
-84617,
-84630,
-84646,
-84646,
-84682,
-84682,
-84682,
-84691,
-84714,
-84731,
-84763,
-84763,
-84773,
-84809,
-84818,
-84818,
-84829,
-84874,
-84874,
-84908,
-84928,
-84928,
-84942,
-84959,
-84959,
-84968,
-84968,
-84977,
-85020,
-85040,
-85040,
-85053,
-85085,
-85085,
-85095,
-85100,
-85111,
-85111,
-85119,
-85119,
-85151,
-85173,
-85173,
-85173,
-85186,
-85186,
-85191,
-85219,
-85219,
-85226,
-85245,
-85245,
-85262,
-85269,
-85285,
-85298,
-85298,
-85311,
-85324,
-85341,
-85341,
-85356,
-85356,
-85363,
-85405,
-85452,
-85476,
-85483,
-85483,
-85506,
-85546,
-85562,
-85618,
-85618,
-85618,
-85641,
-85648,
-85668,
-85711,
-85711,
-85731,
-85738,
-85745,
-85776,
-85776,
-85776,
-85781,
-85795,
-85802,
-85802,
-85830,
-85864,
-85911,
-85925,
-85925,
-85925,
-85947,
-85996,
-86032,
-86071,
-86081,
-86088,
-86107,
-86121,
-86121,
-86141,
-86141,
-86163,
-86192,
-86199,
-86199,
-86199,
-86199,
-86224,
-86256,
-86292,
-86292,
-86312,
-86312,
-86341,
-86362,
-86372,
-86372,
-86372,
-86372,
-86381,
-86399,
-86409,
-86428,
-86442,
-86449,
-86487,
-86487,
-86503,
-86515,
-86515,
-86515,
-86515,
-86515,
-86526,
-86545,
-86545,
-86545,
-86545,
-86571,
-86571,
-86571,
-86618,
-86626,
-86673,
-86704,
-86730,
-86748,
-86760,
-86767,
-86767,
-86784,
-86784,
-86807,
-86825,
-86832,
-86856,
-86885,
-86917,
-86936,
-86936,
-86964,
-86971,
-86971,
-87009,
-87031,
-87031,
-87066,
-87096,
-87096,
-87096,
-87116,
-87116,
-87123,
-87150,
-87165,
-87192,
-87198,
-87198,
-87198,
-87224,
-87236,
-87263,
-87263,
-87270,
-87285,
-87297,
-87335,
-87395,
-87395,
-87395,
-87414,
-87423,
-87433,
-87433,
-87443,
-87455,
-87474,
-87490,
-87505,
-87512,
-87523,
-87539,
-87539,
-87539,
-87556,
-87556,
-87613,
-87669,
-87669,
-87676,
-87689,
-87709,
-87709,
-87716,
-87734,
-87771,
-87796,
-87803,
-87826,
-87833,
-87833,
-87861,
-87871,
-87895,
-87929,
-87936,
-87943,
-87980,
-87989,
-88003,
-88003,
-88013,
-88013,
-88020,
-88050,
-88066,
-88066,
-88088,
-88095,
-88152,
-88162,
-88169,
-88169,
-88197,
-88214,
-88237,
-88254,
-88267,
-88267,
-88274,
-88293,
-88326,
-88333,
-88358,
-88379,
-88393,
-88400,
-88414,
-88432,
-88450,
-88489,
-88497,
-88515,
-88521,
-88521,
-88521,
-88560,
-88560,
-88566,
-88574,
-88574,
-88595,
-88595,
-88595,
-88700,
-88700,
-88705,
-88718,
-88718,
-88732,
-88732,
-88745,
-88745,
-88758,
-88773,
-88780,
-88793,
-88822,
-88846,
-88846,
-88846,
-88860,
-88873,
-88873,
-88908,
-88908,
-88918,
-88925,
-88960,
-88998,
-89005,
-89005,
-89014,
-89014,
-89014,
-89038,
-89045,
-89066,
-89080,
-89080,
-89080,
-89080,
-89096,
-89096,
-89107,
-89107,
-89126,
-89143,
-89159,
-89181,
-89192,
-89231,
-89231,
-89248,
-89268,
-89297,
-89331,
-89338,
-89356,
-89363,
-89380,
-89387,
-89394,
-89408,
-89408,
-89426,
-89433,
-89433,
-89433,
-89453,
-89471,
-89477,
-89510,
-89517,
-89517,
-89517,
-89547,
-89573,
-89605,
-89639,
-89676,
-89676,
-89676,
-89683,
-89727,
-89781,
-89799,
-89806,
-89820,
-89853,
-89860,
-89873,
-89896,
-89901,
-89908,
-89908,
-89931,
-89976,
-90001,
-90034,
-90034,
-90056,
-90056,
-90080,
-90109,
-90109,
-90121,
-90131,
-90143,
-90178,
-90197,
-90204,
-90204,
-90214,
-90222,
-90236,
-90291,
-90304,
-90304,
-90321,
-90328,
-90328,
-90328,
-90343,
-90343,
-90358,
-90358,
-90365,
-90383,
-90383,
-90383,
-90389,
-90402,
-90402,
-90402,
-90418,
-90436,
-90436,
-90450,
-90462,
-90462,
-90469,
-90479,
-90488,
-90505,
-90518,
-90525,
-90525,
-90525,
-90543,
-90543,
-90550,
-90550,
-90550,
-90558,
-90570,
-90570,
-90570,
-90605,
-90631,
-90663,
-90680,
-90699,
-90705,
-90718,
-90727,
-90727,
-90727,
-90742,
-90761,
-90768,
-90789,
-90817,
-90837,
-90847,
-90847,
-90862,
-90862,
-90869,
-90869,
-90869,
-90869,
-90875,
-90882,
-90905,
-90945,
-90973,
-90973,
-90973,
-90986,
-90986,
-90991,
-91006,
-91060,
-91060,
-91060,
-91060,
-91060,
-91060,
-91090,
-91107,
-91107,
-91107,
-91107,
-91107,
-91127,
-91160,
-91170,
-91186,
-91186,
-91234,
-91234,
-91245,
-91245,
-91245,
-91289,
-91302,
-91302,
-91302,
-91340,
-91347,
-91347,
-91359,
-91376,
-91384,
-91384,
-91398,
-91412,
-91412,
-91431,
-91431,
-91431,
-91431,
-91431,
-91431,
-91451,
-91464,
-91472,
-91472,
-91490,
-91490,
-91502,
-91517,
-91534,
-91560,
-91569,
-91587,
-91603,
-91623,
-91663,
-91663,
-91681,
-91698,
-91698,
-91708,
-91720,
-91751,
-91751,
-91763,
-91779,
-91786,
-91786,
-91786,
-91786,
-91812,
-91812,
-91834,
-91859,
-91877,
-91886,
-91886,
-91908,
-91922,
-91951,
-91963,
-92005,
-92010,
-92059,
-92069,
-92100,
-92113,
-92132,
-92153,
-92176,
-92176,
-92193,
-92193,
-92211,
-92211,
-92220,
-92220,
-92220,
-92220,
-92220,
-92220,
-92220,
-92220,
-92220,
-92241,
-92283,
-92309,
-92316,
-92329,
-92329,
-92334,
-92350,
-92350,
-92372,
-92379,
-92379,
-92379,
-92398,
-92398,
-92398,
-92398,
-92406,
-92423,
-92436,
-92450,
-92499,
-92508,
-92544,
-92559,
-92571,
-92571,
-92571,
-92571,
-92571,
-92579,
-92579,
-92585,
-92585,
-92602,
-92613,
-92613,
-92637,
-92651,
-92651,
-92657,
-92657,
-92657,
-92657,
-92680,
-92680,
-92680,
-92680,
-92719,
-92734,
-92750,
-92750,
-92786,
-92786,
-92818,
-92828,
-92828,
-92828,
-92838,
-92838,
-92838,
-92838,
-92838,
-92845,
-92854,
-92854,
-92866,
-92875,
-92875,
-92898,
-92924,
-92924,
-92942,
-92942,
-92951,
-92951,
-92970,
-93007,
-93027,
-93027,
-93043,
-93080,
-93080,
-93093,
-93093,
-93093,
-93093,
-93125,
-93125,
-93142,
-93158,
-93180,
-93199,
-93199,
-93216,
-93216,
-93231,
-93241,
-93241,
-93241,
-93250,
-93250,
-93250,
-93278,
-93278,
-93278,
-93302,
-93314,
-93314,
-93314,
-93334,
-93334,
-93334,
-93352,
-93366,
-93389,
-93429,
-93448,
-93448,
-93457,
-93457,
-93457,
-93469,
-93469,
-93469,
-93493,
-93493,
-93570,
-93570,
-93570,
-93570,
-93578,
-93578,
-93606,
-93630,
-93642,
-93649,
-93649,
-93682,
-93710,
-93710,
-93710,
-93717,
-93732,
-93738,
-93738,
-93754,
-93754,
-93771,
-93771,
-93771,
-93787,
-93793,
-93793,
-93801,
-93812,
-93812,
-93812,
-93829,
-93829,
-93829,
-93870,
-93890,
-93890,
-93890,
-93917,
-93926,
-93926,
-93942,
-93960,
-93967,
-93974,
-93998,
-93998,
-94015,
-94021,
-94021,
-94021,
-94027,
-94027,
-94027,
-94027,
-94042,
-94061,
-94061,
-94061,
-94081,
-94081,
-94104,
-94118,
-94135,
-94153,
-94153,
-94171,
-94192,
-94202,
-94218,
-94218,
-94218,
-94218,
-94218,
-94251,
-94257,
-94257,
-94276,
-94276,
-94276,
-94282,
-94300,
-94300,
-94318,
-94318,
-94335,
-94349,
-94349,
-94349,
-94349,
-94361,
-94377,
-94377,
-94377,
-94397,
-94432,
-94432,
-94432,
-94452,
-94460,
-94460,
-94471,
-94471,
-94479,
-94496,
-94496,
-94496,
-94550,
-94612,
-94622,
-94640,
-94670,
-94670,
-94670,
-94682,
-94682,
-94682,
-94700,
-94720,
-94720,
-94735,
-94735,
-94735,
-94746,
-94757,
-94773,
-94773,
-94773,
-94773,
-94773,
-94785,
-94792,
-94792,
-94792,
-94808,
-94859,
-94859,
-94867,
-94883,
-94892,
-94892,
-94928,
-94938,
-94938,
-94938,
-94944,
-94969,
-94975,
-95013,
-95069,
-95069,
-95069,
-95084,
-95118,
-95131,
-95157,
-95169,
-95183,
-95252,
-95268,
-95294,
-95301,
-95317,
-95323,
-95340,
-95340,
-95358,
-95358,
-95364,
-95396,
-95396,
-95413,
-95423,
-95449,
-95449,
-95504,
-95550,
-95550,
-95566,
-95588,
-95588,
-95615,
-95654,
-95667,
-95667,
-95667,
-95667,
-95667,
-95694,
-95707,
-95721,
-95721,
-95764,
-95770,
-95770,
-95775,
-95789,
-95789,
-95789,
-95800,
-95800,
-95800,
-95800,
-95805,
-95811,
-95811,
-95811,
-95833,
-95833,
-95857,
-95889,
-95889,
-95889,
-95889,
-95889,
-95889,
-95895,
-95895,
-95926,
-95946,
-95957,
-95957,
-95974,
-95986,
-96002,
-96002,
-96034,
-96048,
-96066,
-96111,
-96111,
-96135,
-96149,
-96149,
-96149,
-96149,
-96156,
-96179,
-96179,
-96197,
-96197,
-96210,
-96226,
-96231,
-96264,
-96264,
-96281,
-96288,
-96288,
-96288,
-96322,
-96353,
-96368,
-96385,
-96404,
-96404,
-96415,
-96415,
-96415,
-96415,
-96415,
-96424,
-96472,
-96472,
-96472,
-96492,
-96511,
-96518,
-96524,
-96534,
-96549,
-96549,
-96571,
-96571,
-96571,
-96571,
-96571,
-96571,
-96590,
-96605,
-96605,
-96624,
-96624,
-96639,
-96639,
-96639,
-96654,
-96683,
-96683,
-96683,
-96683,
-96692,
-96692,
-96701,
-96701,
-96701,
-96701,
-96701,
-96701,
-96701,
-96711,
-96725,
-96732,
-96785,
-96795,
-96795,
-96832,
-96853,
-96853,
-96853,
-96853,
-96859,
-96888,
-96888,
-96888,
-96888,
-96894,
-96924,
-96931,
-96931,
-96945,
-97025,
-97049,
-97070,
-97070,
-97095,
-97095,
-97095,
-97095,
-97132,
-97132,
-97167,
-97178,
-97178,
-97178,
-97195,
-97195,
-97201,
-97201,
-97212,
-97212,
-97245,
-97254,
-97254,
-97264,
-97308,
-97322,
-97322,
-97322,
-97336,
-97371,
-97371,
-97371,
-97387,
-97399,
-97419,
-97435,
-97435,
-97459,
-97459,
-97459,
-97482,
-97523,
-97523,
-97533,
-97540,
-97540,
-97540,
-97559,
-97597,
-97606,
-97621,
-97627,
-97627,
-97674,
-97674,
-97674,
-97694,
-97694,
-97713,
-97730,
-97730,
-97730,
-97730,
-97737,
-97737,
-97737,
-97737,
-97753,
-97782,
-97782,
-97802,
-97842,
-97861,
-97861,
-97868,
-97878,
-97945,
-97945,
-97961,
-97971,
-97971,
-97971,
-97999,
-97999,
-97999,
-98016,
-98016,
-98029,
-98029,
-98029,
-98044,
-98059,
-98059,
-98077,
-98077,
-98077,
-98077,
-98077,
-98077,
-98077,
-98107,
-98117,
-98122,
-98130,
-98138,
-98138,
-98156,
-98156,
-98165,
-98185,
-98209,
-98249,
-98262,
-98281,
-98281,
-98296,
-98296,
-98309,
-98323,
-98323,
-98323,
-98323,
-98336,
-98336,
-98356,
-98356,
-98356,
-98356,
-98377,
-98389,
-98398,
-98398,
-98404,
-98422,
-98422,
-98422,
-98422,
-98427,
-98433,
-98433,
-98450,
-98450,
-98487,
-98500,
-98558,
-98577,
-98591,
-98603,
-98624,
-98624,
-98624,
-98624,
-98624,
-98641,
-98659,
-98659,
-98669,
-98669,
-98669,
-98669,
-98686,
-98707,
-98707,
-98729,
-98729,
-98745,
-98752,
-98752,
-98786,
-98786,
-98793,
-98793,
-98793,
-98793,
-98793,
-98793,
-98793,
-98803,
-98803,
-98809,
-98816,
-98816,
-98816,
-98816,
-98822,
-98822,
-98828,
-98850,
-98869,
-98869,
-98885,
-98906,
-98913,
-98925,
-98925,
-98935,
-98956,
-98956,
-98973,
-98982,
-98982,
-99001,
-99001,
-99013,
-99013,
-99026,
-99026,
-99045,
-99061,
-99070,
-99092,
-99099,
-99123,
-99134,
-99161,
-99161,
-99161,
-99161,
-99211,
-99242,
-99283,
-99283,
-99302,
-99315,
-99321,
-99328,
-99355,
-99367,
-99390,
-99450,
-99460,
-99460,
-99467,
-99492,
-99509,
-99509,
-99532,
-99548,
-99555,
-99575,
-99591,
-99599,
-99606,
-99613,
-99620,
-99620,
-99620,
-99620,
-99638,
-99645,
-99652,
-99689,
-99689,
-99689,
-99706,
-99713,
-99730,
-99776,
-99796,
-99796,
-99796,
-99803,
-99819,
-99826,
-99826,
-99838,
-99855,
-99884,
-99908,
-99928,
-99947,
-99973,
-99979,
-99988,
-99988,
-100017,
-100017,
-100024,
-100024,
-100031,
-100031,
-100031,
-100072,
-100079,
-100079,
-100079,
-100079,
-100095,
-100095,
-100095,
-100100,
-100107,
-100127,
-100127,
-100138,
-100138,
-100138,
-100148,
-100154,
-100154,
-100154,
-100154,
-100154,
-100154,
-100159,
-100172,
-100211,
-100243,
-100255,
-100281,
-100281,
-100309,
-100316,
-100343,
-100369,
-100374,
-100381,
-100409,
-100424,
-100424,
-100444,
-100444,
-100465,
-100498,
-100545,
-100552,
-100552,
-100552,
-100552,
-100559,
-100559,
-100574,
-100606,
-100611,
-100618,
-100618,
-100618,
-100633,
-100633,
-100652,
-100670,
-100691,
-100731,
-100731,
-100731,
-100744,
-100765,
-100765,
-100800,
-100828,
-100835,
-100835,
-100835,
-100842,
-100842,
-100854,
-100881,
-100898,
-100911,
-100911,
-100911,
-100911,
-100932,
-100948,
-100948,
-100948,
-100948,
-100977,
-100977,
-100977,
-100983,
-100992,
-100992,
-101016,
-101041,
-101063,
-101071,
-101088,
-101088,
-101088,
-101088,
-101113,
-101133,
-101133,
-101148,
-101170,
-101177,
-101206,
-101206,
-101214,
-101251,
-101273,
-101303,
-101345,
-101352,
-101359,
-101359,
-101359,
-101376,
-101387,
-101387,
-101405,
-101412,
-101419,
-101419,
-101426,
-101449,
-101456,
-101456,
-101463,
-101463,
-101470,
-101489,
-101497,
-101504,
-101511,
-101511,
-101516,
-101516,
-101523,
-101543,
-101543,
-101557,
-101586,
-101593,
-101607,
-101625,
-101635,
-101669,
-101689,
-101716,
-101728,
-101739,
-101746,
-101772,
-101772,
-101847,
-101847,
-101847,
-101853,
-101861,
-101888,
-101888,
-101940,
-101980,
-101987,
-102010,
-102021,
-102032,
-102055,
-102062,
-102062,
-102072,
-102079,
-102097,
-102111,
-102118,
-102118,
-102118,
-102146,
-102153,
-102171,
-102178,
-102178,
-102225,
-102244,
-102290,
-102313,
-102320,
-102331,
-102331,
-102331,
-102331,
-102362,
-102367,
-102382,
-102397,
-102438,
-102473,
-102473,
-102499,
-102508,
-102520,
-102538,
-102557,
-102571,
-102602,
-102629,
-102629,
-102629,
-102649,
-102649,
-102649,
-102661,
-102678,
-102717,
-102734,
-102753,
-102778,
-102792,
-102825,
-102832,
-102868,
-102888,
-102899,
-102930,
-102930,
-102930,
-102954,
-102954,
-102988,
-102995,
-102995,
-102995,
-103003,
-103010,
-103017,
-103025,
-103050,
-103050,
-103050,
-103057,
-103072,
-103082,
-103082,
-103095,
-103106,
-103138,
-103171,
-103198,
-103217,
-103265,
-103315,
-103339,
-103345,
-103352,
-103379,
-103379,
-103395
-};
-
-static const char *tldData[] = {
-"samegawa.fukushima.jp\0dupont\0"
-"alstom\0"
-"mashiki.kumamoto.jp\0neues.museum\0"
-"herokussl.com\0"
-"karate.museum\0"
-"vall\xc3\xa9""e-d-aoste.it\0"
-"edu.vc\0"
-"nz.eu.org\0"
-"edu.ve\0"
-"hirokawa.fukuoka.jp\0midsund.no\0"
-"bronnoysund.no\0"
-"gon.pk\0"
-"edu.uy\0"
-"ayabe.kyoto.jp\0\xe9\xa3\x9e\xe5\x88\xa9\xe6\xb5\xa6\0"
-"massacarrara.it\0edu.vn\0virtualuser.de\0"
-"bardu.no\0"
-"stateofdelaware.museum\0richardli\0"
-"k12.va.us\0is-a-blogger.com\0"
-"kitakami.iwate.jp\0botany.museum\0l\xc3\xb8renskog.no\0"
-"v\xc3\xa5g\xc3\xa5.no\0"
-"edu.vu\0"
-"chiropractic.museum\0powiat.pl\0"
-"kawazu.shizuoka.jp\0"
-"gbiz\0"
-"cyon.link\0"
-"tjmaxx\0a.prod.fastly.net\0"
-"mihama.fukui.jp\0myeffect.net\0"
-"yasu.shiga.jp\0tran\xc3\xb8y.no\0"
-"cc.ms.us\0cc.nc.us\0edu.ws\0"
-"australia.museum\0"
-"balsan-sudtirol.it\0"
-"shinonsen.hyogo.jp\0"
-"furukawa.miyagi.jp\0uscountryestate.museum\0"
-"k12.co.us\0"
-"unj\xc3\xa1rga.no\0"
-"seto.aichi.jp\0is-a-hunter.com\0"
-"sv.it\0"
-"kushiro.hokkaido.jp\0naustdal.no\0"
-"egersund.no\0boleslawiec.pl\0h\xc3\xa4kkinen.fi\0"
-"comunica\xc3\xa7\xc3\xb5""es.museum\0"
-"user.party.eus\0za.net\0"
-"vibo-valentia.it\0"
-"abr.it\0dvrdns.org\0"
-"kasuga.fukuoka.jp\0namegawa.saitama.jp\0spot\0"
-"wpdevcloud.com\0jambyl.su\0"
-"\xe7\xbb\x84\xe7\xbb\x87.hk\0mb.it\0kamikoani.akita.jp\0mini\0"
-"police.uk\0"
-"edu.za\0domains\0"
-"\xd8\xa7\xd9\x84\xd9\x85\xd8\xba\xd8\xb1\xd8\xa8\0"
-"software\0"
-"en.it\0"
-"wa.au\0\xe9\x9d\x99\xe5\xb2\xa1.jp\0mint\0"
-"recht.pro\0"
-"opole.pl\0"
-"at.it\0"
-"mima.tokushima.jp\0"
-"takahagi.ibaraki.jp\0bokn.no\0edu.zm\0"
-"hiraya.nagano.jp\0eaton.mi.us\0"
-"mibu.tochigi.jp\0newspaper.museum\0aaa\0"
-"field.museum\0jp.net\0"
-"f.bg\0loginline.dev\0"
-"pup.gov.pl\0"
-"youth.museum\0voagat.no\0"
-"mobi.gp\0"
-"baghdad.museum\0"
-"cc.ua\0"
-"abc.br\0"
-"honefoss.no\0"
-"arboretum.museum\0abb\0"
-"nabari.mie.jp\0abc\0diamonds\0simple-url.com\0"
-"us-4.evennode.com\0"
-"act.edu.au\0"
-"ieee\0"
-"kyonan.chiba.jp\0"
-"mus.br\0asso.re\0"
-"yamatsuri.fukushima.jp\0"
-"czest.pl\0"
-"friuli-vegiulia.it\0lib.ut.us\0"
-"katsuura.chiba.jp\0"
-"hi.cn\0manchester.museum\0"
-"tenei.fukushima.jp\0"
-"\xe3\x82\xb0\xe3\x83\xbc\xe3\x82\xb0\xe3\x83\xab\0selfip.biz\0"
-"lib.oh.us\0"
-"politica.bo\0"
-"iwaki.fukushima.jp\0"
-"akita.jp\0asahikawa.hokkaido.jp\0aco\0fashion\0"
-"s3-website.eu-central-1.amazonaws.com\0"
-"\xe3\x82\xb9\xe3\x83\x88\xe3\x82\xa2\0"
-"kiwi.nz\0"
-"takanabe.miyazaki.jp\0"
-"melbourne\0schwarz\0"
-"aoki.nagano.jp\0"
-"indian.museum\0travelersinsurance\0"
-"kunimi.fukushima.jp\0"
-"ads\0\xd9\x85\xd9\x88\xd9\x82\xd8\xb9\0"
-"yura.wakayama.jp\0aeg\0"
-"nsw.edu.au\0ciencia.bo\0nishihara.okinawa.jp\0"
-"sande.vestfold.no\0"
-"misugi.mie.jp\0\xe7\xb6\xb2\xe7\xb5\xa1.\xe9\xa6\x99\xe6\xb8\xaf\0"
-"jaguar\0"
-"lublin.pl\0"
-"nishiazai.shiga.jp\0\xe7\xbd\x91\xe5\xba\x97\0from-ks.com\0"
-"hizen.saga.jp\0risor.no\0"
-"vossevangen.no\0us-3.evennode.com\0"
-"siracusa.it\0fhs.no\0"
-"bergbau.museum\0"
-"sandnessjoen.no\0"
-"sld.do\0asso.nc\0"
-"takikawa.hokkaido.jp\0"
-"sodegaura.chiba.jp\0\xe0\xb8\x98\xe0\xb8\xb8\xe0\xb8\xa3\xe0\xb8\x81\xe0\xb8\xb4\xe0\xb8\x88.\xe0\xb9\x84\xe0\xb8\x97\xe0\xb8\xa2\0afl\0"
-"dental\0"
-"is-a-llama.com\0"
-"gda.pl\0"
-"deloitte\0"
-"inawashiro.fukushima.jp\0"
-"savannahga.museum\0kerryproperties\0\xe5\xa4\xa7\xe4\xbc\x97\xe6\xb1\xbd\xe8\xbd\xa6\0"
-"embaixada.st\0"
-"readthedocs.io\0"
-"sk\xc3\xa5nland.no\0"
-"frana.no\0"
-"cc.md.us\0"
-"selbu.no\0"
-"ollo\0"
-"biz.bb\0"
-"biz.at\0"
-"kinko.kagoshima.jp\0kushima.miyazaki.jp\0southwest.museum\0"
-"shiojiri.nagano.jp\0u.se\0"
-"ono.fukushima.jp\0ostroda.pl\0"
-"ce.gov.br\0orland.no\0snoasa.no\0"
-"biz.az\0"
-"charter.aero\0bunkyo.tokyo.jp\0"
-"shimane.jp\0"
-"maceio.br\0lc.it\0umaji.kochi.jp\0budapest\0"
-"higashi.okinawa.jp\0shimoda.shizuoka.jp\0aig\0"
-"higashi.fukushima.jp\0bd.se\0"
-"email\0"
-"shibata.niigata.jp\0kusatsu.shiga.jp\0columbia.museum\0vanguard\0"
-"trentinsudtirol.it\0"
-"and.mom\0"
-"pl.ua\0us-2.evennode.com\0"
-"nexus\0"
-"rennebu.no\0"
-"webspace.rocks\0"
-"maniwa.okayama.jp\0"
-"biz.cy\0"
-"taki.mie.jp\0biz.dk\0"
-"fujisawa.iwate.jp\0"
-"yosemite.museum\0"
-"datsun\0cloud66.ws\0"
-"half.host\0"
-"eniwa.hokkaido.jp\0"
-"circle\0worse-than.tv\0"
-"talk\0for.men\0"
-"cards\0"
-"asso.km\0"
-"izumi.kagoshima.jp\0kotoura.tottori.jp\0"
-"scholarships\0"
-"fujimino.saitama.jp\0jeonbuk.kr\0brussels.museum\0"
-"biz.et\0"
-"compare\0"
-"raholt.no\0"
-"usa.museum\0ap-southeast-1.elasticbeanstalk.com\0ng.city\0"
-"melhus.no\0"
-"coupons\0dynu.net\0"
-"kashiwa.chiba.jp\0"
-"bnpparibas\0"
-"moseushi.hokkaido.jp\0"
-"padua.it\0"
-"asso.mc\0"
-"bulsan-suedtirol.it\0rivne.ua\0my-wan.de\0"
-"historicalsociety.museum\0is-a-linux-user.org\0"
-"biz.gl\0"
-"hasuda.saitama.jp\0"
-"is-a-chef.org\0"
-"courses\0us-1.evennode.com\0"
-"shinjo.yamagata.jp\0"
-"stadt.museum\0"
-"trani-barletta-andria.it\0"
-"trader.aero\0cloudapps.digital\0"
-"mywire.org\0"
-"mashike.hokkaido.jp\0yamagata.ibaraki.jp\0unjarga.no\0"
-"sicilia.it\0"
-"morimachi.shizuoka.jp\0"
-"s3.dualstack.eu-west-2.amazonaws.com\0"
-"biz.id\0"
-"imageandsound.museum\0anz\0credit\0"
-"historical.museum\0jewelry.museum\0"
-"aol\0"
-"manno.kagawa.jp\0"
-"newyork.museum\0pubol.museum\0h\xc3\xa1mm\xc3\xa1rfeasta.no\0"
-"seihi.nagasaki.jp\0"
-"and.museum\0sdn.gov.pl\0"
-"bievat.no\0karasjohka.no\0"
-"us-east-2.elasticbeanstalk.com\0"
-"home.dyndns.org\0"
-"mt.eu.org\0"
-"government.aero\0"
-"selfip.com\0"
-"mitoyo.kagawa.jp\0kameoka.kyoto.jp\0"
-"vercelli.it\0"
-"geekgalaxy.com\0ptplus.fit\0"
-"app\0"
-"design\0"
-"tickets\0"
-"rodoy.no\0sld.pa\0"
-"biz.ki\0company\0"
-"kunst.museum\0"
-"vb.it\0"
-"higashimatsuyama.saitama.jp\0"
-"bar\0"
-"bizen.okayama.jp\0f.se\0bbc\0"
-"kirovograd.ua\0"
-"kaizuka.osaka.jp\0"
-"*.bzz.dapps.earth\0"
-"askoy.no\0"
-"rollag.no\0"
-"hara.nagano.jp\0"
-"aostavalley.it\0"
-"vinnytsia.ua\0"
-"art\0bbt\0"
-"j\xc3\xb8rpeland.no\0"
-"biz.ls\0bcg\0"
-"joinville.br\0dabur\0phone\0is-a-chef.com\0"
-"yahaba.iwate.jp\0isahaya.nagasaki.jp\0kitamoto.saitama.jp\0"
-"001www.com\0"
-"bcn\0"
-"tsukuba.ibaraki.jp\0akrehamn.no\0\xe0\xa4\xad\xe0\xa4\xbe\xe0\xa4\xb0\xe0\xa5\x8b\xe0\xa4\xa4\0"
-"yasugi.shimane.jp\0"
-"ks.ua\0"
-"ninomiya.kanagawa.jp\0"
-"ulsan.kr\0salon\0"
-"wa.us\0"
-"from-de.com\0"
-"audio\0"
-"yoshinogari.saga.jp\0biz.mv\0"
-"bulsan.it\0biz.mw\0"
-"freiburg.museum\0"
-"yusui.kagoshima.jp\0biz.ni\0"
-"s3-website.ap-south-1.amazonaws.com\0"
-"bofa\0"
-"2038.io\0"
-"boavista.br\0batsfjord.no\0from-ri.com\0ddns.net\0"
-"ks.us\0"
-"biz.nr\0marshalls\0"
-"crew.aero\0"
-"hi.us\0"
-"services.aero\0\xe8\xb4\xad\xe7\x89\xa9\0"
-"mo.cn\0yamato.kanagawa.jp\0masoy.no\0watch\0"
-"financial\0arvo.network\0"
-"agency\0"
-"myactivedirectory.com\0"
-"iide.yamagata.jp\0"
-"bet\0netlify.com\0"
-"tourism.tn\0"
-"cnpy.gdn\0"
-"pharmacy.museum\0"
-"nedre-eiker.no\0"
-"yugawa.fukushima.jp\0"
-"coach\0"
-"ujiie.tochigi.jp\0\xe4\xbc\x81\xe4\xb8\x9a\0"
-"nishinoomote.kagoshima.jp\0biz.pk\0"
-"biz.pl\0"
-"mobi.tt\0reisen\0"
-"tamaki.mie.jp\0"
-"okaya.nagano.jp\0"
-"okoppe.hokkaido.jp\0arita.saga.jp\0"
-"\xe5\xa4\xa7\xe9\x98\xaa.jp\0"
-"biz.pr\0"
-"living.museum\0mobi.tz\0"
-"dattoweb.com\0"
-"taxi\0"
-"axa\0"
-"dscloud.me\0"
-"owani.aomori.jp\0setagaya.tokyo.jp\0aws\0"
-"kaita.hiroshima.jp\0village.museum\0fuossko.no\0"
-"jfk.museum\0"
-"toei.aichi.jp\0"
-"maintenance.aero\0"
-"hatoyama.saitama.jp\0"
-"donna.no\0"
-"michigan.museum\0"
-"hjartdal.no\0"
-"bid\0"
-"gildeskal.no\0gulen.no\0"
-"tonami.toyama.jp\0"
-"bio\0"
-"sagamihara.kanagawa.jp\0tainai.niigata.jp\0cc.ut.us\0"
-"photo\0"
-"tokyo.jp\0marugame.kagawa.jp\0servecounterstrike.com\0"
-"bitballoon.com\0"
-"nishihara.kumamoto.jp\0voting\0my.eu.org\0"
-"biz.ss\0"
-"biz\0hasura.app\0"
-"ullensvang.no\0vard\xc3\xb8.no\0biz.tj\0"
-"okinawa.jp\0"
-"shimosuwa.nagano.jp\0madrid\0"
-"ven.it\0"
-"biz.ua\0"
-"biz.tr\0"
-"shiroishi.saga.jp\0"
-"ts.it\0biz.tt\0"
-"ricoh\0za.org\0"
-"trana.no\0"
-"on-aptible.com\0"
-"kakegawa.shizuoka.jp\0is-a-landscaper.com\0"
-"mobi.na\0lardal.no\0"
-"masuda.shimane.jp\0"
-"mo.it\0"
-"mobi.ng\0hammerfest.no\0stord.no\0"
-"database.museum\0"
-"aosta-valley.it\0"
-"is-a-cpa.com\0"
-"sakai.ibaraki.jp\0nakamura.kochi.jp\0"
-"tadotsu.kagawa.jp\0ethnology.museum\0ng.school\0"
-"aparecida.br\0"
-"go.gov.br\0emiliaromagna.it\0plc.ly\0"
-"bergen.no\0"
-"dyroy.no\0\xc3\xb8vre-eiker.no\0"
-"ca.it\0indianapolis.museum\0eidfjord.no\0"
-"biz.vn\0bond\0"
-"training\0"
-"oz.au\0"
-"mazowsze.pl\0"
-"s.bg\0"
-"9.bg\0for.mom\0"
-"bms\0scrysec.com\0"
-"misconfused.org\0"
-"asahi.toyama.jp\0bmw\0from-ga.com\0"
-"e164.arpa\0book\0"
-"\xc3\xb8ksnes.no\0"
-"volkenkunde.museum\0dynathome.net\0"
-"bergamo.it\0meeres.museum\0"
-"ngo.lk\0"
-"medical.museum\0"
-"mer\xc3\xa5ker.no\0\xc3\xb8rland.no\0\xe6\x9c\xba\xe6\x9e\x84\0"
-"lib.wi.us\0run.app\0"
-"tatebayashi.gunma.jp\0hjelmeland.no\0"
-"b\xc3\xb8mlo.no\0"
-"yabu.hyogo.jp\0gs.fm.no\0lib.sc.us\0trade\0"
-"mining.museum\0"
-"toride.ibaraki.jp\0"
-"bom\0"
-"boo\0"
-"birdart.museum\0"
-"of.work\0zapto.xyz\0"
-"bot\0"
-"nl.eu.org\0ybo.faith\0"
-"notogawa.shiga.jp\0denmark.museum\0bydgoszcz.pl\0box\0"
-"otofuke.hokkaido.jp\0dovre.no\0"
-"hemne.no\0abogado\0"
-"motobu.okinawa.jp\0gol.no\0"
-"toki.gifu.jp\0chattanooga.museum\0ca.na\0"
-"loseyourip.com\0"
-"iwamizawa.hokkaido.jp\0biz.zm\0"
-"mobi.ke\0cab\0"
-"fineart.museum\0"
-"cal\0"
-"cam\0"
-"samnanger.no\0"
-"commune.am\0"
-"lombardia.it\0cba\0*.quipelements.com\0"
-"car\0"
-"kitaaiki.nagano.jp\0nebraska.museum\0tourism.pl\0aetna\0co.com\0"
-"cat\0kitahata.saga.jp\0"
-"from-nj.com\0"
-"kyuragi.saga.jp\0"
-"apple\0"
-"ancona.it\0"
-"glas.museum\0ngo.ph\0cbn\0qc.com\0"
-"discount\0"
-"trentinos\xc3\xbc""d-tirol.it\0h\xc3\xa1pmir.no\0"
-"kokonoe.oita.jp\0amli.no\0cbs\0"
-"wada.nagano.jp\0dontexist.net\0"
-"versailles.museum\0latrobe\0"
-"kafjord.no\0"
-"\xe5\xb2\xa1\xe5\xb1\xb1.jp\0"
-"horonobe.hokkaido.jp\0lerdal.no\0"
-"kumakogen.ehime.jp\0"
-"r\xc3\xa5holt.no\0\xd0\xb1\xd0\xb3\0"
-"eq.edu.au\0contagem.br\0shimotsuke.tochigi.jp\0"
-"takagi.nagano.jp\0"
-"k12.de.us\0ar.com\0"
-"kitakata.miyazaki.jp\0telekommunikation.museum\0"
-"allfinanz\0"
-"sekikawa.niigata.jp\0plc.uk\0"
-"la-spezia.it\0k12.ak.us\0"
-"ceb\0mckinsey\0sling\0"
-"qpon\0"
-"hazu.aichi.jp\0"
-"ceo\0"
-"kawanishi.nara.jp\0cfa\0"
-"tromsa.no\0"
-"cfd\0"
-"kyowa.hokkaido.jp\0"
-"ng.eu.org\0"
-"buy\0"
-"ar.it\0"
-"mol.it\0"
-"leclerc\0skype\0"
-"sp.leg.br\0"
-"ac.ae\0d.bg\0"
-"*.bd\0kanzaki.saga.jp\0"
-"software.aero\0"
-"kartuzy.pl\0"
-"app.banzaicloud.io\0"
-"toyotsu.fukuoka.jp\0"
-"miyazaki.jp\0lima-city.rocks\0"
-"music.museum\0"
-"s3-us-gov-west-1.amazonaws.com\0"
-"mo.us\0vegas\0"
-"router.management\0"
-"ac.at\0ikeda.gifu.jp\0shobara.hiroshima.jp\0yamazoe.nara.jp\0"
-"ac.be\0naturalsciences.museum\0fairwinds\0"
-"ozu.kumamoto.jp\0"
-"baths.museum\0"
-"*.ck\0"
-"\xe0\xac\xad\xe0\xac\xbe\xe0\xac\xb0\xe0\xac\xa4\0"
-"cymru\0"
-"fukagawa.hokkaido.jp\0ca.us\0"
-"communications.museum\0berlevag.no\0int.eu.org\0"
-"ac.ci\0bolzano.it\0"
-"yakage.okayama.jp\0sarpsborg.no\0"
-"trentins\xc3\xbc""dtirol.it\0st.no\0"
-"ac.cn\0\xd0\xb5\xd1\x8e\0"
-"biella.it\0latino\0"
-"monster\0is-a-chef.net\0"
-"m\xc3\xa1latvuopmi.no\0ubank\0"
-"srv.br\0ac.cr\0"
-"tama.tokyo.jp\0"
-"aramco\0"
-"\xe5\xae\xb6\xe9\x9b\xbb\0"
-"ac.cy\0g\xc3\xa1ls\xc3\xa1.no\0bzh\0"
-"komagane.nagano.jp\0"
-"freeboxos.com\0"
-"\xe5\x95\x86\xe6\xa5\xad.tw\0"
-"sucks\0"
-"ybo.review\0"
-"*.er\0"
-"fujioka.gunma.jp\0"
-"leg.br\0"
-"algard.no\0"
-"suzu.ishikawa.jp\0"
-"*.fj\0sado.niigata.jp\0"
-"*.fk\0"
-"loginline.app\0"
-"napoli.it\0"
-"norton\0"
-"luzern.museum\0"
-"kitadaito.okinawa.jp\0ngo.za\0dyndns-office.com\0"
-"automotive.museum\0uw.gov.pl\0"
-"minowa.nagano.jp\0valer.hedmark.no\0"
-"takatsuki.shiga.jp\0"
-"casino\0"
-"kagoshima.kagoshima.jp\0vindafjord.no\0ntdll.top\0"
-"gs.oslo.no\0tvedestrand.no\0ap-south-1.elasticbeanstalk.com\0mein-vigor.de\0"
-"\xe5\xb1\xb1\xe5\xbd\xa2.jp\0uonuma.niigata.jp\0"
-"k12.mn.us\0"
-"oum.gov.pl\0kerrylogistics\0"
-"abarth\0"
-"education.tas.edu.au\0asahi.chiba.jp\0"
-"apigee.io\0"
-"uzhgorod.ua\0"
-"ac.gn\0enterprises\0sandvik\0health-carereform.com\0"
-"dsmynas.com\0"
-"from-ny.net\0"
-"ehime.jp\0tokoname.aichi.jp\0"
-"seiro.niigata.jp\0"
-"oksnes.no\0"
-"\xe3\x82\xb3\xe3\x83\xa0\0"
-"tools\0"
-"isa.us\0cloud\0"
-"s.se\0raid\0"
-"fam.pk\0"
-"lanbib.se\0kiwi\0*.dweb.link\0"
-"ako.hyogo.jp\0"
-"gwangju.kr\0"
-"aomori.aomori.jp\0wallonie.museum\0"
-"andria-barletta-trani.it\0ass.km\0sorreisa.no\0"
-"arna.no\0"
-"ac.id\0"
-"dagestan.ru\0"
-"futtsu.chiba.jp\0shell\0"
-"gr.com\0"
-"shikokuchuo.ehime.jp\0"
-"ac.il\0aibetsu.hokkaido.jp\0"
-"ac.im\0eu-west-2.elasticbeanstalk.com\0"
-"com\0ac.in\0"
-"money.museum\0"
-"art.br\0*.jm\0"
-"virtuel.museum\0vipsinaapp.com\0"
-"ac.ir\0\xd8\xa7\xdb\x8c\xd8\xb1\xd8\xa7\xd9\x86.ir\0cpa\0"
-"izumisano.osaka.jp\0dagestan.su\0"
-"como.it\0"
-"pisa.it\0"
-"*.kh\0from-fl.com\0"
-"trentino-suedtirol.it\0bauern.museum\0leitungsen.de\0*.ex.futurecms.at\0"
-"if.ua\0"
-"hiranai.aomori.jp\0"
-"ac.jp\0omachi.saga.jp\0"
-"holtalen.no\0"
-"xz.cn\0friuli-vgiulia.it\0mamurogawa.yamagata.jp\0artgallery.museum\0"
-"minamiuonuma.niigata.jp\0meguro.tokyo.jp\0ac.ke\0dad\0fund\0"
-"nl.ca\0"
-"etisalat\0"
-"namegata.ibaraki.jp\0star\0"
-"ikeda.osaka.jp\0is-an-actor.com\0"
-"art.do\0missoula.museum\0larvik.no\0us-east-1.amazonaws.com\0stuff-4-sale.us\0"
-"news.hu\0monza-brianza.it\0studio\0eu.com\0"
-"udi.br\0ac.kr\0"
-"taiji.wakayama.jp\0"
-"shimane.shimane.jp\0"
-"gent\0"
-"marumori.miyagi.jp\0"
-"art.dz\0"
-"toyoake.aichi.jp\0yokosuka.kanagawa.jp\0"
-"ar.us\0aquarelle\0day\0"
-"ac.lk\0fundacio.museum\0"
-"indiana.museum\0fr\xc3\xb8ya.no\0hiphop\0"
-"h\xc3\xa6gebostad.no\0warmia.pl\0"
-"*.mm\0"
-"trieste.it\0ac.ma\0"
-"ac.ls\0"
-"crs\0csc\0"
-"firenze.it\0ac.me\0"
-"misaki.okayama.jp\0"
-"\xe5\xb1\xb1\xe5\x8f\xa3.jp\0murmansk.su\0"
-"ikeda.hokkaido.jp\0"
-"ogawara.miyagi.jp\0koryo.nara.jp\0"
-"cloudeity.net\0"
-"olbia-tempio.it\0"
-"air-surveillance.aero\0"
-"koya.wakayama.jp\0"
-"kurotaki.nara.jp\0*.np\0"
-"\xd1\x80\xd1\x84\0xen.prgmr.com\0"
-"macapa.br\0ac.mu\0tjome.no\0"
-"now-dns.top\0"
-"ac.mw\0spjelkavik.no\0"
-"sologne.museum\0"
-"tokorozawa.saitama.jp\0ac.ni\0from-ne.com\0"
-"ac.mz\0meraker.no\0"
-"vagsoy.no\0"
-"loans\0"
-"yoshioka.gunma.jp\0prochowice.pl\0"
-"cafe\0dds\0"
-"schoenbrunn.museum\0"
-"kongsberg.no\0"
-"matsumoto.kagoshima.jp\0"
-"gets-it.net\0"
-"hioki.kagoshima.jp\0ac.nz\0*.pg\0"
-"padova.it\0kawasaki.miyagi.jp\0ohira.miyagi.jp\0"
-"mozilla-iot.org\0"
-"kita.osaka.jp\0"
-"cal.it\0lancia\0"
-"s3-website-ap-southeast-2.amazonaws.com\0"
-"tohma.hokkaido.jp\0"
-"ac.pa\0"
-"art.ht\0cyber.museum\0"
-"himi.toyama.jp\0"
-"s3.dualstack.ca-central-1.amazonaws.com\0"
-"unazuki.toyama.jp\0"
-"chita.aichi.jp\0dev\0"
-"omasvuotna.no\0cc.wa.us\0"
-"yuzawa.niigata.jp\0"
-"utsira.no\0"
-"definima.io\0"
-"iwanai.hokkaido.jp\0iwaizumi.iwate.jp\0"
-"fujikawa.yamanashi.jp\0koshu.yamanashi.jp\0k12.me.us\0"
-"kuokgroup\0from-nv.com\0navoi.su\0"
-"ac.pr\0"
-"eastcoast.museum\0is-a-republican.com\0"
-"cc.ks.us\0"
-"kitagawa.miyazaki.jp\0"
-"cc.hi.us\0reg.dk\0"
-"bozen.it\0"
-"hatogaya.saitama.jp\0us-gov-west-1.elasticbeanstalk.com\0"
-"d.se\0"
-"\xe6\x96\xb0\xe6\xbd\x9f.jp\0"
-"helsinki.museum\0"
-"saga.saga.jp\0"
-"club.tw\0accenture\0"
-"crafting.xyz\0"
-"\xe7\x86\x8a\xe6\x9c\xac.jp\0dhl\0"
-"aeroport.fr\0asago.hyogo.jp\0"
-"hofu.yamaguchi.jp\0"
-"monmouth.museum\0"
-"isernia.it\0glass.museum\0"
-"ski.museum\0"
-"kids.museum\0ac.rs\0"
-"toho.fukuoka.jp\0"
-"ac.ru\0ac.se\0certmgr.org\0"
-"ac.rw\0afamilycompany\0"
-"cn.it\0"
-"plaza.museum\0"
-"murakami.niigata.jp\0inami.toyama.jp\0fr\xc3\xa6na.no\0yokohama\0"
-"mishima.fukushima.jp\0abira.hokkaido.jp\0"
-"bod\xc3\xb8.no\0"
-"macys\0"
-"ichikawa.chiba.jp\0"
-"valleaosta.it\0salerno.it\0"
-"taishi.hyogo.jp\0"
-"iveco\0zuerich\0"
-"ac.th\0"
-"omigawa.chiba.jp\0"
-"ac.sz\0ac.tj\0diy\0"
-"tsuwano.shimane.jp\0\xc4\x8d\xc3\xa1hcesuolo.no\0"
-"warman\0"
-"palmas.br\0ok.us\0"
-"gub.uy\0"
-"linkitools.space\0"
-"la.us\0"
-"s3-ap-northeast-2.amazonaws.com\0"
-"ac.ug\0"
-"uji.kyoto.jp\0ando.nara.jp\0ac.tz\0"
-"ac.uk\0call\0"
-"bialystok.pl\0"
-"test.tj\0google\0"
-"for.one\0"
-"fi.cr\0"
-"shimamoto.osaka.jp\0"
-"barsycenter.com\0"
-"hyuga.miyazaki.jp\0"
-"video.hu\0ac.vn\0"
-"floripa.br\0camp\0"
-"hirono.iwate.jp\0internet-dns.de\0"
-"ino.kochi.jp\0"
-"nl.no\0"
-"lib.fl.us\0fin.ci\0"
-"ohira.tochigi.jp\0tokke.no\0"
-"porsanger.no\0"
-"kashiba.nara.jp\0"
-"art.pl\0"
-"leasing.aero\0veneto.it\0olayan\0"
-"giske.no\0"
-"seljord.no\0dev-myqnapcloud.com\0"
-"sport\0azure-mobile.net\0"
-"weatherchannel\0"
-"\xe6\x95\x99\xe8\x82\xb2.\xe9\xa6\x99\xe6\xb8\xaf\0booking\0"
-"nango.fukushima.jp\0sandnessj\xc3\xb8""en.no\0"
-"*.ye\0"
-"cadaques.museum\0"
-"idv.hk\0pharmacy\0"
-"gehirn.ne.jp\0"
-"fin.ec\0"
-"sykkylven.no\0dnp\0"
-"fermo.it\0test.ru\0"
-"myftp.org\0"
-"valle-daosta.it\0"
-"harima.hyogo.jp\0miyoshi.saitama.jp\0"
-"recreation.aero\0reggiocalabria.it\0dog\0"
-"katsuragi.nara.jp\0"
-"judaica.museum\0"
-"yuu.yamaguchi.jp\0"
-"kunitachi.tokyo.jp\0"
-"myravendb.com\0"
-"ac.za\0"
-"yorkshire.museum\0mel\xc3\xb8y.no\0qa2.com\0"
-"hornindal.no\0k12.or.us\0"
-"dot\0"
-"aviation.museum\0bosch\0"
-"um.gov.pl\0"
-"art.sn\0"
-"tagami.niigata.jp\0ac.zm\0"
-"oketo.hokkaido.jp\0"
-"yokoshibahikari.chiba.jp\0syncloud.it\0"
-"is-a-photographer.com\0"
-"filegear-au.me\0"
-"bolivia.bo\0open\0"
-"care\0team\0"
-"eastafrica.museum\0"
-"vennesla.no\0"
-"k12.az.us\0ac.zw\0analytics\0"
-"arts.co\0game-server.cc\0dyndns.ddnss.de\0"
-"jetzt\0swidnik.pl\0hk.com\0"
-"ueno.gunma.jp\0"
-"shari.hokkaido.jp\0casa\0"
-"localhistory.museum\0"
-"trentino-altoadige.it\0miyazu.kyoto.jp\0cars\0"
-"control.aero\0shoo.okayama.jp\0"
-"sola.no\0case\0"
-"shintoku.hokkaido.jp\0zoological.museum\0eat\0"
-"is.it\0cash\0"
-"fetsund.no\0"
-"fi.it\0"
-"rimini.it\0"
-"tech\0dyn.ddnss.de\0"
-"minamitane.kagoshima.jp\0"
-"bo.it\0is-a-soxfan.org\0"
-"investments\0lexus\0"
-"fuel.aero\0"
-"\xe0\xa6\xac\xe0\xa6\xbe\xe0\xa6\x82\xe0\xa6\xb2\xe0\xa6\xbe\0"
-"q.bg\0valledaosta.it\0"
-"vacations\0"
-"7.bg\0eco\0"
-"id.au\0barsy.menu\0"
-"cn.ua\0"
-"kawaue.gifu.jp\0"
-"aland.fi\0app.os.fedoraproject.org\0"
-"r\xc3\xb8st.no\0us.gov.pl\0study\0"
-"mie.jp\0"
-"student.aero\0journalism.museum\0"
-"\xe5\xb3\xb6\xe6\xa0\xb9.jp\0ohda.shimane.jp\0"
-"to.leg.br\0"
-"undersea.museum\0"
-"takarazuka.hyogo.jp\0"
-"ln.cn\0betainabox.com\0"
-"edu\0"
-"dtv\0"
-"\xd8\xa7\xd9\x84\xd8\xac\xd8\xb2\xd8\xa7\xd8\xa6\xd8\xb1\0"
-"planetarium.museum\0"
-"medio-campidano.it\0lib.ky.us\0"
-"forde.no\0"
-"partners\0"
-"cipriani\0"
-"saka.hiroshima.jp\0olayangroup\0"
-"donetsk.ua\0"
-"dvr\0nodum.co\0"
-"furniture.museum\0s3-ap-south-1.amazonaws.com\0"
-"time.no\0"
-"voyage\0"
-"bozen-suedtirol.it\0"
-"dontexist.org\0"
-"matta-varjjat.no\0"
-"volkswagen\0"
-"hayakawa.yamanashi.jp\0"
-"turen.tn\0"
-"arkhangelsk.su\0"
-"matsudo.chiba.jp\0kids.us\0"
-"kep.tr\0"
-"ggee\0"
-"toyooka.hyogo.jp\0"
-"insurance.aero\0"
-"susaki.kochi.jp\0"
-"accident-investigation.aero\0dev.static.land\0"
-"daegu.kr\0faith\0is-into-cars.com\0"
-"kakamigahara.gifu.jp\0"
-"steiermark.museum\0fet.no\0airforce\0"
-"nodum.io\0"
-"hs.zone\0"
-"bounty-full.com\0"
-"sortland.no\0"
-"suzaka.nagano.jp\0bajddar.no\0"
-"codes\0garden\0"
-"himeshima.oita.jp\0resistance.museum\0"
-"withgoogle.com\0"
-"k12.ny.us\0"
-"minamiboso.chiba.jp\0"
-"malatvuopmi.no\0"
-"wa.gov.au\0"
-"cc.mo.us\0actor\0"
-"mincom.tn\0chernivtsi.ua\0bradesco\0"
-"fukuchi.fukuoka.jp\0muenster.museum\0"
-"ua.rs\0"
-"cim.br\0ic.gov.pl\0"
-"\xe6\x97\xb6\xe5\xb0\x9a\0"
-"k12.dc.us\0"
-"mobile\0"
-"lur\xc3\xb8y.no\0"
-"chizu.tottori.jp\0buyshouses.net\0"
-"omuta.fukuoka.jp\0toyama.toyama.jp\0"
-"barlettatraniandria.it\0sr.it\0alabama.museum\0"
-"kuki.saitama.jp\0cc.ca.us\0"
-"sarufutsu.hokkaido.jp\0"
-"inf.br\0"
-"mizuho.tokyo.jp\0exeter.museum\0idv.tw\0"
-"rennes\xc3\xb8y.no\0"
-"unicom\0"
-"bando.ibaraki.jp\0"
-"id.ir\0arts.ve\0"
-"s\xc3\xb8r-varanger.no\0barsyonline.com\0"
-"miyama.fukuoka.jp\0"
-"inf.cu\0"
-"nsw.au\0"
-"profesional.bo\0ap.it\0imakane.hokkaido.jp\0windows\0"
-"wroclaw.pl\0duck\0solutions\0ybo.science\0"
-"minamiise.mie.jp\0"
-"ogliastra.it\0sula.no\0"
-"tonosho.kagawa.jp\0"
-"b.bg\0"
-"koebenhavn.museum\0"
-"kamakura.kanagawa.jp\0kuroiso.tochigi.jp\0"
-"zgora.pl\0"
-"daplie.me\0"
-"narita.chiba.jp\0otake.hiroshima.jp\0"
-"katashina.gunma.jp\0"
-"hachijo.tokyo.jp\0"
-"b.br\0gs.st.no\0harstad.no\0"
-"oster\xc3\xb8y.no\0fedorapeople.org\0"
-"sc.cn\0friuli-v-giulia.it\0from-sc.com\0"
-"gs.svalbard.no\0"
-"circus.museum\0dallas.museum\0ballangen.no\0author\0"
-"ichikai.tochigi.jp\0realty\0"
-"fin.tn\0"
-"nesseby.no\0"
-"prof.pr\0backplaneapp.io\0"
-"\xe5\x8d\x83\xe8\x91\x89.jp\0"
-"kaneyama.yamagata.jp\0mysecuritycamera.com\0"
-"settlers.museum\0"
-"id.lv\0\xd0\xbe\xd0\xbd\xd0\xbb\xd0\xb0\xd0\xb9\xd0\xbd\0balashov.su\0"
-"he.cn\0"
-"laz.it\0yonezawa.yamagata.jp\0id.ly\0"
-"sondre-land.no\0movie\0"
-"takaharu.miyazaki.jp\0"
-"mragowo.pl\0"
-"towada.aomori.jp\0uni5.net\0"
-"dyn.cosidns.de\0"
-"arts.ro\0"
-"bellevue.museum\0"
-"trentino-a-adige.it\0"
-"kumenan.okayama.jp\0coldwar.museum\0ushistory.museum\0"
-"ostrowwlkp.pl\0"
-"cbre\0"
-"forsand.no\0dattolocal.com\0"
-"zachpomor.pl\0cherkasy.ua\0surf\0"
-"svizzera.museum\0knowsitall.info\0"
-"ooshika.nagano.jp\0fan\0"
-"uchihara.ibaraki.jp\0"
-"tksat.bo\0forli-cesena.it\0"
-"chikuhoku.nagano.jp\0"
-"consulting\0"
-"tr.eu.org\0"
-"page\0asso.eu.org\0"
-"noip.us\0"
-"finn\xc3\xb8y.no\0"
-"flesberg.no\0"
-"tarui.gifu.jp\0"
-"fujitsu\0"
-"matsuura.nagasaki.jp\0k12.mt.us\0"
-"selje.no\0hs.run\0"
-"eating-organic.net\0"
-"itami.hyogo.jp\0"
-"kumatori.osaka.jp\0"
-"kameyama.mie.jp\0mobi\0slattum.no\0eu-4.evennode.com\0"
-"toray\0"
-"arts.nf\0from-ma.com\0"
-"masaki.ehime.jp\0"
-"esq\0"
-"\xe6\xb8\xb8\xe6\x88\x8f\0"
-"drive\0"
-"atlanta.museum\0ox.rs\0"
-"trentino-s-tirol.it\0mitou.yamaguchi.jp\0"
-"ecologia.bo\0firewall-gateway.net\0"
-"hokkaido.jp\0fuso.aichi.jp\0"
-"cc.ar.us\0"
-"es.gov.br\0tsuiki.fukuoka.jp\0\xd5\xb0\xd5\xa1\xd5\xb5\0"
-"us-west-1.elasticbeanstalk.com\0"
-"management\0freeboxos.fr\0"
-"moda\0ddnslive.com\0"
-"cesena-forli.it\0"
-"teva\0altervista.org\0spdns.org\0"
-"mitsubishi\0"
-"express.aero\0"
-"sc.ke\0twmail.cc\0"
-"dyndns-remote.com\0"
-"dyndns-at-work.com\0"
-"inf.mk\0losangeles.museum\0"
-"higashinaruse.akita.jp\0"
-"bandai.fukushima.jp\0"
-"eus\0"
-"chirurgiens-dentistes.fr\0"
-"sc.kr\0"
-"hotel.tz\0"
-"*.lcl.dev\0"
-"sayama.osaka.jp\0"
-"takayama.gunma.jp\0"
-"*.nom.br\0"
-"is-leet.com\0"
-"azumino.nagano.jp\0torino.museum\0"
-"radio.br\0"
-"kamiamakusa.kumamoto.jp\0"
-"sc.ls\0pictures\0"
-"nationalheritage.museum\0"
-"\xc3\xb8yer.no\0eu-3.evennode.com\0"
-"flynnhosting.net\0"
-"id.us\0"
-"webcam\0"
-"ina.saitama.jp\0"
-"tomakomai.hokkaido.jp\0finland.museum\0museumcenter.museum\0"
-"murata.miyagi.jp\0jevnaker.no\0"
-"groks-the.info\0"
-"owariasahi.aichi.jp\0"
-"tobetsu.hokkaido.jp\0"
-"skierv\xc3\xa1.no\0"
-"etne.no\0cloudapp.net\0"
-"linz.museum\0averoy.no\0"
-"lib.nm.us\0df.leg.br\0"
-"contemporary.museum\0"
-"teo.br\0"
-"\xe7\x9f\xb3\xe5\xb7\x9d.jp\0"
-"iida.nagano.jp\0"
-"poker\0"
-"oppeg\xc3\xa5rd.no\0"
-"b\xc3\xa1id\xc3\xa1r.no\0dyndns-at-home.com\0"
-"kusu.oita.jp\0"
-"tienda\0"
-"yazu.tottori.jp\0scienceandindustry.museum\0v\xc3\xa6r\xc3\xb8y.no\0"
-"kanna.gunma.jp\0"
-"emb.kw\0khmelnitskiy.ua\0"
-"nyc.museum\0fit\0"
-"dvag\0"
-"airtel\0"
-"chuo.yamanashi.jp\0evenes.no\0"
-"leksvik.no\0\xd8\xb4\xd8\xa8\xd9\x83\xd8\xa9\0"
-"lecco.it\0"
-"aa.no\0\xe9\x80\x9a\xe8\xb2\xa9\0"
-"balat.no\0"
-"servep2p.com\0"
-"filegear-sg.me\0"
-"turystyka.pl\0cyon.site\0"
-"flor\xc3\xb8.no\0"
-"chungnam.kr\0"
-"ashiya.fukuoka.jp\0fujikawa.shizuoka.jp\0"
-"naka.hiroshima.jp\0"
-"locus\0statefarm\0thruhere.net\0"
-"eu-2.evennode.com\0"
-"adachi.tokyo.jp\0k12.wy.us\0"
-"rieti.it\0godo.gifu.jp\0"
-"shimabara.nagasaki.jp\0"
-"\xe3\x82\xbb\xe3\x83\xbc\xe3\x83\xab\0"
-"juniper\0"
-"omotego.fukushima.jp\0"
-"asmatart.museum\0cc.ok.us\0"
-"k12.ia.us\0"
-"inf.ua\0"
-"kosai.shizuoka.jp\0"
-"cc.la.us\0viking\0"
-"\xd0\xb8\xd0\xba\xd0\xbe\xd0\xbc.museum\0"
-"fjell.no\0"
-"hotel.lk\0topology.museum\0tr\xc3\xa6na.no\0fly\0"
-"psc.br\0"
-"mihama.mie.jp\0aseral.no\0"
-"noip.me\0"
-"ap-northeast-2.elasticbeanstalk.com\0"
-"experts-comptables.fr\0minamiizu.shizuoka.jp\0loten.no\0"
-"minakami.gunma.jp\0"
-"airguard.museum\0b.se\0"
-"fauske.no\0"
-"taiwa.miyagi.jp\0seven\0"
-"pars\0\xd8\xa7\xd9\x84\xd8\xb9\xd9\x84\xd9\x8a\xd8\xa7\xd9\x86\0"
-"inzai.chiba.jp\0mulhouse.museum\0"
-"oyamazaki.kyoto.jp\0futurehosting.at\0"
-"pordenone.it\0gj\xc3\xb8vik.no\0\xe5\x81\xa5\xe5\xba\xb7\0"
-"reggio-emilia.it\0childrensgarden.museum\0"
-"niteroi.br\0pulawy.pl\0"
-"zama.kanagawa.jp\0jamison.museum\0"
-"kawakami.nagano.jp\0"
-"cl.it\0"
-"uk0.bigv.io\0"
-"sciencecenters.museum\0"
-"glogow.pl\0"
-"sc.ug\0eu-1.evennode.com\0"
-"sc.tz\0\xd8\xa7\xd9\x85\xd8\xa7\xd8\xb1\xd8\xa7\xd8\xaa\0foo\0"
-"grong.no\0modum.no\0"
-"morotsuka.miyazaki.jp\0for-more.biz\0"
-"nym.by\0"
-"shinto.gunma.jp\0s3-eu-west-2.amazonaws.com\0nym.bz\0"
-"gjesdal.no\0sc.us\0fox\0"
-"\xe5\x85\xac\xe5\x8f\xb8.cn\0\xe6\xb2\x96\xe7\xb8\x84.jp\0"
-"ny.us\0"
-"\xe0\xb9\x80\xe0\xb8\x99\xe0\xb9\x87\xe0\xb8\x95.\xe0\xb9\x84\xe0\xb8\x97\xe0\xb8\xa2\0"
-"shimizu.hokkaido.jp\0"
-"de.cool\0"
-"sasaguri.fukuoka.jp\0"
-"hawaii.museum\0"
-"shiriuchi.hokkaido.jp\0c.cdn77.org\0"
-"soni.nara.jp\0gs.nl.no\0"
-"\xe5\x85\xac\xe5\x8f\xb8.hk\0toyota.aichi.jp\0gu.us\0"
-"trentino-sued-tirol.it\0"
-"bungotakada.oita.jp\0"
-"england.museum\0x443.pw\0"
-"camera\0gal\0iserv.dev\0"
-"york.museum\0"
-"rochester.museum\0nym.ec\0"
-"ashiya.hyogo.jp\0sinaapp.com\0"
-"gangwon.kr\0gap\0"
-"bestbuy\0"
-"americanantiques.museum\0"
-"hotel.hu\0"
-"uchinada.ishikawa.jp\0"
-"dyndns-ip.com\0"
-"makurazaki.kagoshima.jp\0"
-"scotland.museum\0"
-"ogori.fukuoka.jp\0gay\0"
-"yoshino.nara.jp\0"
-"frl\0"
-"lib.id.us\0"
-"oracle\0"
-"ac\0\xe7\xa7\xbb\xe5\x8a\xa8\0to.work\0"
-"ad\0serveminecraft.net\0"
-"ae\0hamamatsu.shizuoka.jp\0"
-"af\0cesenaforl\xc3\xac.it\0"
-"ag\0"
-"rsc.cdn77.org\0"
-"ai\0"
-"williamhill\0"
-"berg.no\0"
-"al\0racing\0logoip.de\0"
-"am\0himeji.hyogo.jp\0"
-"ao\0"
-"aq\0ba\0romsa.no\0"
-"ar\0bb\0satsumasendai.kagoshima.jp\0"
-"passenger-association.aero\0as\0"
-"at\0"
-"au\0be\0phoenix.museum\0"
-"bf\0"
-"aw\0bg\0"
-"ax\0bh\0uk.eu.org\0"
-"bi\0cloudcontrolled.com\0"
-"az\0bj\0chikujo.fukuoka.jp\0"
-"moriya.ibaraki.jp\0"
-"bm\0medecin.km\0"
-"bn\0"
-"bo\0tunk.org\0"
-"computer.museum\0microsoft\0nym.gr\0"
-"ca\0aero.tt\0gdn\0"
-"br\0"
-"bs\0cc\0onred.one\0"
-"bt\0cd\0gea\0"
-"ftr\0"
-"bv\0cf\0casadelamoneda.museum\0"
-"bw\0cg\0yokawa.hyogo.jp\0nym.gy\0"
-"ch\0"
-"by\0ci\0panama.museum\0nym.hk\0"
-"bz\0k12.vt.us\0"
-"dnsfor.me\0"
-"cl\0delta\0"
-"cm\0valle.no\0"
-"cn\0"
-"co\0"
-"properties\0"
-"rakkestad.no\0fun\0enonic.io\0"
-"cr\0"
-"workinggroup.aero\0aero.mv\0nym.ie\0"
-"cu\0de\0moto\0"
-"cv\0"
-"cw\0sherbrooke.museum\0"
-"cx\0"
-"cy\0"
-"cz\0dj\0hachioji.tokyo.jp\0"
-"dk\0"
-"bas.it\0read\0"
-"dm\0hemsedal.no\0bingo\0"
-"k12.il.us\0"
-"do\0chosei.chiba.jp\0"
-"bykle.no\0"
-"ec\0"
-"hitachiota.ibaraki.jp\0"
-"ee\0"
-"eg\0go.dyndns.org\0"
-"to.it\0"
-"dz\0"
-"pu.it\0uwu.ai\0"
-"aarp\0"
-"lucania.it\0from-wi.com\0"
-"!www.ck\0oceanographique.museum\0"
-"es\0"
-"et\0"
-"eu\0"
-"usr.cloud.muni.cz\0"
-"iraq.museum\0nordreisa.no\0"
-"fi\0"
-"fm\0fg.it\0"
-"fo\0tomi.nagano.jp\0ventures\0nym.la\0"
-"ga\0nym.lc\0"
-"fr\0gb\0"
-"jdevcloud.com\0"
-"gd\0"
-"ge\0"
-"gf\0hyllestad.no\0"
-"gg\0nym.li\0"
-"gh\0nym.kz\0"
-"gi\0narashino.chiba.jp\0"
-"kitami.hokkaido.jp\0"
-"o.bg\0gl\0molde.no\0r\xc3\xa5""de.no\0fyi\0"
-"gm\0tjeldsund.no\0"
-"gn\0tondabayashi.osaka.jp\0"
-"gp\0tateshina.nagano.jp\0"
-"5.bg\0gq\0embetsu.hokkaido.jp\0imamat\0"
-"gr\0nym.lt\0"
-"gs\0kudoyama.wakayama.jp\0nym.lu\0nym.me\0"
-"gt\0showa.fukushima.jp\0botanicgarden.museum\0"
-"gu\0amber.museum\0"
-"wa.edu.au\0ringerike.no\0"
-"gw\0sex.hu\0sakaki.nagano.jp\0gift\0"
-"coal.museum\0"
-"gy\0nj.us\0"
-"misato.wakayama.jp\0muenchen.museum\0"
-"hk\0"
-"nym.mn\0"
-"hm\0marker.no\0"
-"hn\0"
-"naganohara.gunma.jp\0"
-"tamano.okayama.jp\0ivgu.no\0"
-"hr\0mosvik.no\0"
-"ht\0id\0otoineppu.hokkaido.jp\0nordkapp.no\0slupsk.pl\0rj.leg.br\0"
-"hu\0ie\0"
-"prd.fr\0mombetsu.hokkaido.jp\0nym.mx\0"
-"sannohe.aomori.jp\0"
-"*.kitakyushu.jp\0"
-"iki.fi\0"
-"ogi.saga.jp\0"
-"il\0"
-"im\0\xe6\x84\x9b\xe7\x9f\xa5.jp\0"
-"in\0"
-"io\0"
-"aip.ee\0ranzan.saitama.jp\0karm\xc3\xb8y.no\0"
-"iq\0"
-"ir\0jaworzno.pl\0marketing\0mayfirst.info\0"
-"is\0kvafjord.no\0"
-"it\0kuriyama.hokkaido.jp\0wafflecell.com\0"
-"je\0"
-"\xe5\xb1\xb1\xe6\xa2\xa8.jp\0shimofusa.chiba.jp\0gle\0nym.nz\0"
-"alipay\0"
-"lib.gu.us\0black\0"
-"visa\0"
-"jo\0lib.co.us\0tatamotors\0"
-"jp\0"
-"select\0"
-"ama.shimane.jp\0katsushika.tokyo.jp\0saltdal.no\0nym.pe\0"
-"namsos.no\0"
-"ke\0"
-"swiss\0googlecode.com\0temp-dns.com\0"
-"kg\0"
-"coffee\0"
-"hitachiomiya.ibaraki.jp\0ki\0r\xc3\xb8yrvik.no\0"
-"\xe5\xbe\xb3\xe5\xb3\xb6.jp\0tonaki.okinawa.jp\0corvette.museum\0"
-"bozen-s\xc3\xbc""dtirol.it\0*.uberspace.de\0"
-"km\0naturhistorisches.museum\0"
-"kn\0"
-"sassari.it\0bentley\0"
-"kp\0from-az.net\0"
-"iheya.okinawa.jp\0la\0"
-"kr\0lb\0gmo\0nym.pt\0"
-"lc\0"
-"shiksha\0ciscofreak.com\0mypsx.net\0"
-"kw\0is-found.org\0"
-"ky\0li\0"
-"bologna.it\0kz\0"
-"kamisu.ibaraki.jp\0lk\0gmx\0"
-"minamioguni.kumamoto.jp\0"
-"ma\0"
-"lr\0"
-"ls\0mc\0"
-"anpachi.gifu.jp\0lt\0md\0ambulance.museum\0"
-"lu\0me\0"
-"lv\0beardu.no\0"
-"mg\0"
-"kosaka.akita.jp\0mh\0"
-"ly\0"
-"mk\0viva\0"
-"ml\0reit\0"
-"mail.pl\0nym.ro\0"
-"mn\0pccw\0"
-"mo\0"
-"mp\0"
-"prd.km\0mq\0na\0"
-"bolt.hu\0mr\0goo\0"
-"ms\0nc\0gop\0"
-"hakuba.nagano.jp\0mt\0from-oh.com\0"
-"mu\0ne\0"
-"mv\0nf\0"
-"mw\0ng\0got\0"
-"barreau.bj\0mx\0"
-"gov\0trentinoalto-adige.it\0my\0ni\0folldal.no\0vivo\0nym.sk\0"
-"fujishiro.ibaraki.jp\0mz\0"
-"nl\0"
-"technology.museum\0"
-"kyoto.jp\0"
-"no\0"
-"jefferson.museum\0"
-"sp.it\0nr\0"
-"nym.su\0"
-"naturbruksgymn.se\0app.os.stg.fedoraproject.org\0"
-"skaun.no\0nu\0able\0"
-"ind.br\0latina.it\0nym.sx\0"
-"olecko.pl\0"
-"aurskog-holand.no\0nz\0"
-"prd.mg\0"
-"sakaiminato.tottori.jp\0"
-"om\0"
-"sex.pl\0"
-"kunstunddesign.museum\0gotdns.org\0"
-"shizuoka.shizuoka.jp\0"
-"motegi.tochigi.jp\0pa\0"
-"nationalfirearms.museum\0"
-"pe\0nym.tw\0"
-"pf\0"
-"kariya.aichi.jp\0sasebo.nagasaki.jp\0ph\0fastpanel.direct\0"
-"og.ao\0an.it\0pk\0"
-"sa.au\0kawai.iwate.jp\0pl\0"
-"pm\0report\0"
-"iwade.wakayama.jp\0pn\0\xd1\x81\xd0\xb0\xd0\xb9\xd1\x82\0"
-"onion\0direct.quickconnect.to\0"
-"urasoe.okinawa.jp\0mk.ua\0"
-"qa\0"
-"kuzumaki.iwate.jp\0pr\0hbo\0rogers\0"
-"ps\0wy.us\0total\0"
-"chiryu.aichi.jp\0pt\0"
-"bugatti\0"
-"nakatombetsu.hokkaido.jp\0toga.toyama.jp\0"
-"ishikari.hokkaido.jp\0mup.gov.pl\0pw\0"
-"jewish.museum\0py\0"
-"piw.gov.pl\0onthewifi.com\0"
-"catering.aero\0lorenskog.no\0is-certified.com\0"
-"lavagis.no\0"
-"cloudns.biz\0"
-"preservation.museum\0sunndal.no\0"
-"r\xc3\xb8""d\xc3\xb8y.no\0"
-"re\0"
-"shop.ht\0"
-"shop.hu\0"
-"minamiminowa.nagano.jp\0"
-"sa.cr\0virginia.museum\0"
-"sic.it\0"
-"lubin.pl\0"
-"rent\0"
-"mad.museum\0"
-"jpmorgan\0"
-"ro\0"
-"logistics.aero\0kalisz.pl\0"
-"kamisunagawa.hokkaido.jp\0sa\0"
-"sb\0"
-"tmp.br\0rs\0sc\0"
-"gs.cn\0stavern.no\0sd\0"
-"catanzaro.it\0gotsu.shimane.jp\0ru\0se\0"
-"rw\0sg\0"
-"sh\0"
-"si\0lib.mn.us\0"
-"sj\0"
-"goiania.br\0sk\0"
-"nakano.nagano.jp\0sm\xc3\xb8la.no\0sl\0"
-"sm\0"
-"sn\0"
-"so\0from-mn.com\0"
-"midtre-gauldal.no\0"
-"kumamoto.jp\0"
-"wiki.bo\0sr\0s3-website-ap-northeast-1.amazonaws.com\0"
-"ss\0tc\0\xe0\xb9\x84\xe0\xb8\x97\xe0\xb8\xa2\0"
-"st\0td\0"
-"wiki.br\0su\0"
-"nishiaizu.fukushima.jp\0sv\0tf\0"
-"tg\0builders\0"
-"ind.gt\0iki.nagasaki.jp\0sx\0th\0"
-"sy\0"
-"school.na\0sz\0tj\0"
-"tk\0"
-"tl\0surgery\0"
-"shimada.shizuoka.jp\0tm\0"
-"\xe4\xb8\x89\xe9\x87\x8d.jp\0tn\0"
-"to\0soc.srcf.net\0"
-"sweden.museum\0leirfjord.no\0doesntexist.com\0"
-"newjersey.museum\0ua\0"
-"oxford.museum\0tr\0"
-"tt\0"
-"kitaura.miyazaki.jp\0"
-"tv\0"
-"humanities.museum\0tw\0ug\0"
-"stokke.no\0tz\0"
-"stockholm.museum\0uk\0\xe3\x81\xbf\xe3\x82\x93\xe3\x81\xaa\0"
-"\xe9\xa6\x99\xe5\xb7\x9d.jp\0"
-"va\0"
-"medecin.fr\0ind.in\0"
-"yugawara.kanagawa.jp\0kamiizumi.saitama.jp\0school.nz\0us\0vc\0"
-"sakyo.kyoto.jp\0kanuma.tochigi.jp\0ve\0"
-"suwa.nagano.jp\0ogimi.okinawa.jp\0kvam.no\0gifts\0"
-"vg\0"
-"trentin-s\xc3\xbc""d-tirol.it\0uy\0vi\0gb.net\0"
-"uz\0"
-"iwate.jp\0"
-"k12.tn.us\0"
-"business\0"
-"vn\0"
-"pomorze.pl\0"
-"\xd0\xba\xd0\xb0\xd1\x82\xd0\xbe\xd0\xbb\xd0\xb8\xd0\xba\0"
-"arezzo.it\0narviika.no\0"
-"kunitomi.miyazaki.jp\0vu\0"
-"toyotomi.hokkaido.jp\0ochi.kochi.jp\0wf\0"
-"toyota\0"
-"\xe4\xb8\xad\xe6\x96\x87\xe7\xbd\x91\0is-with-theband.com\0azurewebsites.net\0"
-"rest\0"
-"shichikashuku.miyagi.jp\0redirectme.net\0"
-"ibestad.no\0"
-"home-webserver.de\0"
-"cc.id.us\0ws\0*.vps.myjino.ru\0"
-"from-vt.com\0"
-"citadel\0filegear-de.me\0"
-"honjyo.akita.jp\0"
-"nomi.ishikawa.jp\0haugesund.no\0"
-"kitaakita.akita.jp\0hiv\0"
-"o.se\0"
-"sa.it\0\xe5\xa4\xa7\xe5\x88\x86.jp\0ind.kw\0"
-"expert\0"
-"tomisato.chiba.jp\0kariwa.niigata.jp\0\xd9\x85\xd9\x84\xd9\x8a\xd8\xb3\xd9\x8a\xd8\xa7\0logoip.com\0"
-"og.it\0"
-"chuo.osaka.jp\0"
-"yamashina.kyoto.jp\0histoire.museum\0rr.leg.br\0"
-"zt.ua\0"
-"\xc3\xb8stre-toten.no\0"
-"midori.chiba.jp\0"
-"16-b.it\0"
-"*.ex.ortsinfo.at\0"
-"otama.fukushima.jp\0\xd0\xb0\xd0\xba.\xd1\x81\xd1\x80\xd0\xb1\0"
-"plc.co.im\0"
-"ibaraki.osaka.jp\0"
-"museet.museum\0zone\0"
-"sumida.tokyo.jp\0"
-"yt\0"
-"\xe0\xa4\x95\xe0\xa5\x89\xe0\xa4\xae\0"
-"hkt\0"
-"boxfuse.io\0"
-"tele.amune.org\0"
-"zm\0"
-"tatsuno.nagano.jp\0"
-"agr.br\0coastaldefence.museum\0"
-"ozora.hokkaido.jp\0salat.no\0dontexist.com\0"
-"progressive\0rs.leg.br\0sc.leg.br\0"
-"ostre-toten.no\0"
-"zw\0myftp.biz\0"
-"takaishi.osaka.jp\0hareid.no\0"
-"hasami.nagasaki.jp\0"
-"dyndns-server.com\0"
-"badaddja.no\0"
-"group.aero\0"
-"station.museum\0"
-"onga.fukuoka.jp\0"
-"auction\0"
-"economia.bo\0tachikawa.tokyo.jp\0"
-"stpetersburg.museum\0"
-"gloppen.no\0"
-"hol.no\0"
-"iizuka.fukuoka.jp\0"
-"geometre-expert.fr\0chijiwa.nagasaki.jp\0"
-"name\0\xe0\xa4\xb8\xe0\xa4\x82\xe0\xa4\x97\xe0\xa4\xa0\xe0\xa4\xa8\0"
-"gd.cn\0"
-"tas.au\0"
-"iwakuni.yamaguchi.jp\0"
-"s3-website-us-east-1.amazonaws.com\0"
-"point2this.com\0"
-"cinema.museum\0gs.aa.no\0"
-"ba.leg.br\0"
-"lenvik.no\0"
-"isteingeek.de\0"
-"gobo.wakayama.jp\0"
-"flekkefjord.no\0"
-"country\0"
-"agents.aero\0"
-"center.museum\0"
-"nanao.ishikawa.jp\0"
-"is-a-therapist.com\0"
-"nationwide\0"
-"barsyonline.co.uk\0"
-"hot\0"
-"shiftedit.io\0"
-"desa.id\0kizu.kyoto.jp\0how\0tiaa\0"
-"yamagata.yamagata.jp\0"
-"mantova.it\0"
-"fyresdal.no\0"
-"tysfjord.no\0"
-"guernsey.museum\0mandal.no\0imdb\0cbg.ru\0"
-"direct\0"
-"tabuse.yamaguchi.jp\0"
-"jewishart.museum\0zhytomyr.ua\0"
-"poltava.ua\0"
-"cern\0"
-"lodi.it\0uklugs.org\0"
-"rec.br\0"
-"molise.it\0zarow.pl\0"
-"br.com\0"
-"from-ok.com\0"
-"kv\xc3\xa6""fjord.no\0"
-"chihayaakasaka.osaka.jp\0alpha-myqnapcloud.com\0"
-"shikabe.hokkaido.jp\0mitsue.nara.jp\0cc.sc.us\0"
-"higashikagawa.kagawa.jp\0"
-"k12.mi.us\0"
-"rec.co\0ibm\0"
-"indigena.bo\0"
-"ind.tn\0cc.ny.us\0is-a-candidate.org\0"
-"rn.leg.br\0"
-"ice\0"
-"bihoro.hokkaido.jp\0cc.gu.us\0"
-"s3.dualstack.us-east-2.amazonaws.com\0"
-"k12.as.us\0"
-"is-a-painter.com\0"
-"cremona.it\0kuchinotsu.nagasaki.jp\0h\xc3\xb8ylandet.no\0neustar\0"
-"est.pr\0noho.st\0"
-"aquarium.museum\0"
-"icu\0"
-"balsan-s\xc3\xbc""dtirol.it\0"
-"nanbu.yamanashi.jp\0limited\0"
-"wloclawek.pl\0"
-"trentinos-tirol.it\0"
-"nachikatsuura.wakayama.jp\0gwiddle.co.uk\0"
-"is-a-caterer.com\0"
-"loginto.me\0"
-"kadoma.osaka.jp\0agric.za\0"
-"ro.leg.br\0"
-"mydatto.com\0"
-"bz.it\0\xe5\x95\x86\xe5\x9f\x8e\0"
-"kr\xc3\xa5""anghke.no\0dynv6.net\0"
-"kiyokawa.kanagawa.jp\0"
-"pagefrontapp.com\0"
-"alfaromeo\0cloudcontrolapp.com\0"
-"km.ua\0"
-"adac\0pantheonsite.io\0"
-"homedepot\0"
-"qc.ca\0trolley.museum\0"
-"tsushima.nagasaki.jp\0satx.museum\0"
-"ifm\0"
-"am.leg.br\0"
-"izena.okinawa.jp\0pilots.museum\0"
-"komono.mie.jp\0"
-"shop.th\0"
-"society.museum\0"
-"tm.cy\0miki.hyogo.jp\0glug.org.uk\0"
-"kembuchi.hokkaido.jp\0nakagawa.nagano.jp\0"
-"goodyear\0"
-"is-a-hard-worker.com\0"
-"mx.na\0lib.or.us\0"
-"minamiyamashiro.kyoto.jp\0aguni.okinawa.jp\0iron.museum\0"
-"gokase.miyazaki.jp\0"
-"kibichuo.okayama.jp\0"
-"navy\0"
-"higashikagura.hokkaido.jp\0"
-"dyn-berlin.de\0"
-"yasaka.nagano.jp\0"
-"from-ar.com\0"
-"s3-website.ap-northeast-2.amazonaws.com\0ddnsfree.com\0"
-"slz.br\0hellas.museum\0"
-"aure.no\0lib.az.us\0"
-"tsuno.miyazaki.jp\0"
-"niikappu.hokkaido.jp\0m\xc4\x81ori.nz\0"
-"from-wv.com\0"
-"jorpeland.no\0"
-"shop.ro\0"
-"tm.fr\0wzmiuw.gov.pl\0"
-"git-repos.de\0"
-"andoy.no\0buzz\0\xe5\x9c\xa8\xe7\xba\xbf\0"
-"ecn.br\0"
-"mimata.miyazaki.jp\0"
-"githubusercontent.com\0"
-"ma.gov.br\0"
-"immo\0"
-"vestnes.no\0style\0ddns.me\0"
-"\xe5\xb9\xbf\xe4\xb8\x9c\0"
-"dyndns-home.com\0"
-"shop.pl\0"
-"def.br\0"
-"air.museum\0"
-"quest\0"
-"tm.hu\0\xe7\xa6\x8f\xe5\xb3\xb6.jp\0"
-"g12.br\0achi.nagano.jp\0r\xc3\xa1isa.no\0myqnapcloud.com\0"
-"cc.nj.us\0"
-"louvre.museum\0\xe5\xa8\xb1\xe4\xb9\x90\0"
-"newholland\0"
-"sauda.no\0"
-"shiki.saitama.jp\0ap.leg.br\0"
-"cancerresearch\0"
-"\xe5\xae\xae\xe5\xb4\x8e.jp\0"
-"marche.it\0rec.nf\0"
-"oshu.iwate.jp\0hannan.osaka.jp\0bearalv\xc3\xa1hki.no\0"
-"\xe6\xbb\x8b\xe8\xb3\x80.jp\0"
-"\xe9\xb9\xbf\xe5\x85\x90\xe5\xb3\xb6.jp\0kuroishi.aomori.jp\0maori.nz\0"
-"aogashima.tokyo.jp\0orkdal.no\0"
-"mi.it\0luxury\0"
-"misaki.osaka.jp\0"
-"from-il.com\0"
-"sand\xc3\xb8y.no\0"
-"inc\0"
-"ee.eu.org\0mypep.link\0"
-"rotorcraft.aero\0north-kazakhstan.su\0"
-"ing\0eu-west-3.elasticbeanstalk.com\0*.advisor.ws\0"
-"fe.it\0bushey.museum\0blogsite.xyz\0enterprisecloud.nu\0"
-"sites.static.land\0user.srcf.net\0"
-"ink\0is-a-nascarfan.com\0"
-"is-very-sweet.org\0"
-"ohtawara.tochigi.jp\0tm.km\0\xd7\x99\xd7\xa8\xd7\x95\xd7\xa9\xd7\x9c\xd7\x99\xd7\x9d.museum\0"
-"homeip.net\0"
-"maebashi.gunma.jp\0"
-"int\0"
-"ritto.shiga.jp\0"
-"m.bg\0"
-"lebesby.no\0randaberg.no\0"
-"ntr.br\0"
-"nakasatsunai.hokkaido.jp\0"
-"taketomi.okinawa.jp\0"
-"3.bg\0gosen.niigata.jp\0"
-"nankoku.kochi.jp\0"
-"grp.lk\0"
-"wakayama.jp\0"
-"tm.mc\0hughes\0"
-"nh.us\0"
-"sn.cn\0yatomi.aichi.jp\0tm.mg\0"
-"tips\0"
-"zaporizhzhia.ua\0"
-"copenhagen.museum\0palace.museum\0lpages.co\0"
-"vaporcloud.io\0"
-"qld.edu.au\0chiyoda.gunma.jp\0erimo.hokkaido.jp\0"
-"santacruz.museum\0"
-"\xe8\x8c\xa8\xe5\x9f\x8e.jp\0toda.saitama.jp\0"
-"cloudera.site\0se.leg.br\0"
-"reggio-calabria.it\0"
-"feedback\0"
-"eu.int\0barsy.mobi\0"
-"inashiki.ibaraki.jp\0"
-"exchange.aero\0rec.ro\0philips\0"
-"tm.no\0"
-"kagawa.jp\0hino.tottori.jp\0\xe0\xb8\xad\xe0\xb8\x87\xe0\xb8\x84\xe0\xb9\x8c\xe0\xb8\x81\xe0\xb8\xa3.\xe0\xb9\x84\xe0\xb8\x97\xe0\xb8\xa2\0"
-"entertainment.aero\0ujitawara.kyoto.jp\0"
-"gyeongnam.kr\0orkanger.no\0"
-"shijonawate.osaka.jp\0applicationcloud.io\0"
-"takashima.shiga.jp\0verm\xc3\xb6gensberater\0"
-"franziskaner.museum\0"
-"us.org\0"
-"nsupdate.info\0"
-"capital\0fuettertdasnetz.de\0"
-"sanuki.kagawa.jp\0niigata.niigata.jp\0lib.ak.us\0"
-"filegear-jp.me\0"
-"jcb\0"
-"steam.museum\0kaufen\0chimkent.su\0"
-"moskenes.no\0"
-"numazu.shizuoka.jp\0engineering\0"
-"odate.akita.jp\0kazimierz-dolny.pl\0"
-"kimitsu.chiba.jp\0"
-"tm.pl\0"
-"vevelstad.no\0"
-"recipes\0"
-"info\0funagata.yamagata.jp\0asnes.no\0jcp\0"
-"judygarland.museum\0"
-"ist\0"
-"tours\0"
-"loabat.no\0"
-"uwajima.ehime.jp\0kpmg\0"
-"usuki.oita.jp\0"
-"flakstad.no\0"
-"futaba.fukushima.jp\0beeldengeluid.museum\0"
-"*.sch.uk\0"
-"shirakawa.gifu.jp\0k12.vi.us\0"
-"cc.wy.us\0forgot.her.name\0"
-"rec.ve\0"
-"monzaedellabrianza.it\0mifune.kumamoto.jp\0"
-"vibovalentia.it\0soeda.fukuoka.jp\0itv\0"
-"nokia\0"
-"est-mon-blogueur.com\0"
-"nakamichi.yamanashi.jp\0"
-"uozu.toyama.jp\0"
-"tm.ro\0"
-"is-a-teacher.com\0"
-"k12.ga.us\0"
-"kota.aichi.jp\0"
-"ome.tokyo.jp\0"
-"tm.se\0"
-"kanonji.kagawa.jp\0"
-"messina.it\0"
-"media.aero\0"
-"s3-us-east-2.amazonaws.com\0mein-iserv.de\0"
-"beppu.oita.jp\0ito.shizuoka.jp\0portal.museum\0vardo.no\0"
-"barrel-of-knowledge.info\0"
-"kashiwara.osaka.jp\0royrvik.no\0"
-"ot.it\0pd.it\0"
-"honjo.saitama.jp\0"
-"asahi.mie.jp\0"
-"tanabe.wakayama.jp\0rhcloud.com\0"
-"\xe5\x85\xb5\xe5\xba\xab.jp\0spreadbetting\0"
-"ribeirao.br\0"
-"of.football\0"
-"m\xc3\xa5s\xc3\xb8y.no\0mi.th\0"
-"al.it\0ragusa.it\0nanporo.hokkaido.jp\0"
-"\xc3\xb8rsta.no\0"
-"numata.hokkaido.jp\0"
-"jampa.br\0"
-"matsuda.kanagawa.jp\0sandnes.no\0"
-"santafe.museum\0"
-"toyone.aichi.jp\0"
-"mytuleap.com\0"
-"nu.ca\0"
-"mi.us\0"
-"higashiyoshino.nara.jp\0jio\0linkyard-cloud.ch\0"
-"\xe5\x80\x8b\xe4\xba\xba.hk\0"
-"katowice.pl\0"
-"hiratsuka.kanagawa.jp\0royken.no\0"
-"\xe5\x8f\xb0\xe6\xb9\xbe\0"
-"tara.saga.jp\0"
-"termez.su\0"
-"writesthisblog.com\0barsy.support\0"
-"kasai.hyogo.jp\0*.compute.amazonaws.com\0"
-"shichinohe.aomori.jp\0sande.more-og-romsdal.no\0"
-"insure\0"
-"ha.cn\0vgs.no\0"
-"varese.it\0incheon.kr\0archaeological.museum\0kinghost.net\0"
-"yokkaichi.mie.jp\0"
-"nakagyo.kyoto.jp\0skjervoy.no\0fhapp.xyz\0"
-"holt\xc3\xa5len.no\0krym.ua\0"
-"woodside\0"
-"mutsu.aomori.jp\0academy.museum\0farmequipment.museum\0"
-"piedmont.it\0movistar\0"
-"\xe5\x98\x89\xe9\x87\x8c\0ro.eu.org\0"
-"ikata.ehime.jp\0"
-"creditunion\0"
-"realestate\0"
-"lajolla.museum\0ann-arbor.mi.us\0"
-"kppsp.gov.pl\0"
-"chiba.jp\0jll\0"
-"rauma.no\0"
-"al.no\0tm.za\0"
-"shimodate.ibaraki.jp\0\xe0\xb4\xad\xe0\xb4\xbe\xe0\xb4\xb0\xe0\xb4\xa4\xe0\xb4\x82\0"
-"enna.it\0"
-"ichinomiya.aichi.jp\0"
-"sango.nara.jp\0"
-"iwanuma.miyagi.jp\0"
-"jmp\0hashbang.sh\0"
-"swinoujscie.pl\0"
-"siljan.no\0"
-"office\0"
-"\xd8\xb9\xd9\x85\xd8\xa7\xd9\x86\0jnj\0"
-"suldal.no\0"
-"starnberg.museum\0"
-"s\xc3\xb8rum.no\0"
-"engineer\0"
-"sorocaba.br\0k12.nh.us\0"
-"skedsmo.no\0"
-"\xe9\x9b\xbb\xe8\xa8\x8a\xe7\x9b\x88\xe7\xa7\x91\0"
-"k12.in.us\0"
-"arakawa.saitama.jp\0"
-"nagano.nagano.jp\0"
-"divtasvuodna.no\0"
-"mex.com\0"
-"ginowan.okinawa.jp\0tarnobrzeg.pl\0sochi.su\0"
-"piacenza.it\0"
-"ro.im\0"
-"cologne\0shriram\0"
-"vi.it\0sabae.fukui.jp\0g\xc3\xa1ivuotna.no\0"
-"childrens.museum\0"
-"fujiidera.osaka.jp\0jot\0cn.eu.org\0"
-"kharkov.ua\0si.eu.org\0"
-"taishin.fukushima.jp\0m.se\0"
-"ro.it\0"
-"\xd0\xb1\xd0\xb5\xd0\xbb\0joy\0"
-"gorizia.it\0"
-"9guacu.br\0"
-"nu.it\0"
-"goldpoint\0"
-"crafts.museum\0"
-"lillehammer.no\0"
-"verran.no\0"
-"manaus.br\0chat\0"
-"industria.bo\0"
-"gratangen.no\0lug.org.uk\0"
-"her\xc3\xb8y.nordland.no\0"
-"hembygdsforbund.museum\0ushuaia.museum\0"
-"omaezaki.shizuoka.jp\0"
-"epilepsy.museum\0asker.no\0"
-"\xe5\x92\x8c\xe6\xad\x8c\xe5\xb1\xb1.jp\0poznan.pl\0"
-"blockbuster\0"
-"osaka\0"
-"dnsdojo.com\0"
-"kl\xc3\xa6""bu.no\0"
-"kyotamba.kyoto.jp\0"
-"school.za\0homelinux.com\0kozow.com\0"
-"midori.gunma.jp\0presse.km\0"
-"nf.ca\0"
-"is-uberleet.com\0"
-"okegawa.saitama.jp\0"
-"ichikawa.hyogo.jp\0"
-"co.financial\0"
-"laquila.it\0russia.museum\0"
-"odessa.ua\0"
-"jolster.no\0"
-"yamato.kumamoto.jp\0"
-"jl.cn\0"
-"interactive.museum\0newport.museum\0sk.eu.org\0"
-"al.us\0"
-"kanan.osaka.jp\0"
-"kazo.saitama.jp\0presse.ml\0"
-"co.krd\0"
-"ru.com\0"
-"a.ssl.fastly.net\0"
-"cesenaforli.it\0lib.ma.us\0myasustor.com\0"
-"andebu.no\0"
-"hemnes.no\0rade.no\0"
-"siellak.no\0land\0"
-"gmbh\0lancaster\0"
-"thingdustdata.com\0"
-"instantcloud.cn\0"
-"county.museum\0aurskog-h\xc3\xb8land.no\0s3.dualstack.ap-south-1.amazonaws.com\0"
-"hamburg\0"
-"\xe7\xae\x87\xe4\xba\xba.hk\0"
-"otaki.nagano.jp\0praxi\0*.cryptonomic.net\0boldlygoingnowhere.org\0"
-"nagato.yamaguchi.jp\0ha.no\0"
-"miyota.nagano.jp\0"
-"hoylandet.no\0"
-"savona.it\0cy.eu.org\0"
-"kfh\0"
-"kochi.jp\0miyoshi.hiroshima.jp\0"
-"conf.au\0"
-"kitagata.gifu.jp\0trysil.no\0"
-"honai.ehime.jp\0"
-"mg.gov.br\0vallee-d-aoste.it\0*.in.futurecms.at\0"
-"s3.eu-central-1.amazonaws.com\0"
-"nishimera.miyazaki.jp\0"
-"hanawa.fukushima.jp\0s3-ca-central-1.amazonaws.com\0"
-"kepno.pl\0"
-"hisayama.fukuoka.jp\0"
-"minamata.kumamoto.jp\0rep.kp\0neat-url.com\0"
-"\xe9\xa6\x99\xe6\xa0\xbc\xe9\x87\x8c\xe6\x8b\x89\0"
-"trentinsued-tirol.it\0"
-"trentinsuedtirol.it\0volda.no\0"
-"film.museum\0"
-"vikna.no\0"
-"aero\0friuli-ve-giulia.it\0"
-"soka.saitama.jp\0"
-"furniture\0"
-"prato.it\0akashi.hyogo.jp\0"
-"cz.eu.org\0"
-"baseball\0ru.eu.org\0se.eu.org\0"
-"k12.pa.us\0"
-"cri.br\0"
-"yachiyo.ibaraki.jp\0"
-"rich\0myds.me\0"
-"eid.no\0"
-"pro.az\0sci.eg\0"
-"frogn.no\0contact\0kia\0ddnss.de\0"
-"norfolk.museum\0rehab\0"
-"kounosu.saitama.jp\0"
-"pro.br\0dubai\0"
-"kawanehon.shizuoka.jp\0"
-"kim\0"
-"s\xc3\xbc""dtirol.it\0mj\xc3\xb8ndalen.no\0smart\0"
-"macerata.it\0"
-"dk.eu.org\0"
-"chikushino.fukuoka.jp\0inatsuki.fukuoka.jp\0oceanographic.museum\0"
-"servepics.com\0"
-"certification.aero\0tsuruga.fukui.jp\0"
-"d.gv.vc\0"
-"map.fastly.net\0"
-"pro.cy\0fr.it\0\xc3\xa1lt\xc3\xa1.no\0"
-"sampa.br\0"
-"dnepropetrovsk.ua\0"
-"s3.eu-west-3.amazonaws.com\0"
-"ch.it\0nesna.no\0gratis\0"
-"nativeamerican.museum\0"
-"clothing\0digital\0"
-"pro.ec\0eidskog.no\0\xe1\x83\x92\xe1\x83\x94\0"
-"nagara.chiba.jp\0ostrowiec.pl\0co.network\0ownip.net\0"
-"ternopil.ua\0baidu\0"
-"z.bg\0*.cns.joyent.com\0"
-"kvalsund.no\0"
-"vi.us\0"
-"kawaguchi.saitama.jp\0"
-"tomika.gifu.jp\0kred\0"
-"trentino-sudtirol.it\0nantan.kyoto.jp\0b\xc3\xa1hccavuotna.no\0"
-"toyono.osaka.jp\0"
-"kotohira.kagawa.jp\0"
-"carboniaiglesias.it\0fastly-terrarium.com\0"
-"kanie.aichi.jp\0"
-"entomology.museum\0rendalen.no\0"
-"reggioemilia.it\0xerox\0"
-"takamori.nagano.jp\0eng.pro\0"
-"nanae.hokkaido.jp\0"
-"lupin\0"
-"isa.kagoshima.jp\0"
-"boomla.net\0"
-"itoman.okinawa.jp\0broadcast.museum\0"
-"tranibarlettaandria.it\0berlin\0ca-central-1.elasticbeanstalk.com\0"
-"de.eu.org\0"
-"watari.miyagi.jp\0"
-"uber.space\0"
-"genova.it\0redumbrella\0\xd0\xb4\xd0\xb5\xd1\x82\xd0\xb8\0"
-"ninohe.iwate.jp\0govt.nz\0"
-"yanagawa.fukuoka.jp\0"
-"localhost.daplie.me\0"
-"civilization.museum\0"
-"campidano-medio.it\0"
-"americana.museum\0scjohnson\0technology\0"
-"chikuzen.fukuoka.jp\0"
-"pro.ht\0frankfurt.museum\0"
-"\xe5\x85\xab\xe5\x8d\xa6\0"
-"kusatsu.gunma.jp\0"
-"mypets.ws\0"
-"softbank\0"
-"osaki.miyagi.jp\0"
-"kani.gifu.jp\0"
-"oshino.yamanashi.jp\0varggat.no\0"
-"gsm.pl\0"
-"gos.pk\0"
-"chungbuk.kr\0"
-"matsuyama.ehime.jp\0kpn\0"
-"salzburg.museum\0"
-"froya.no\0"
-"eun.eg\0exnet.su\0"
-"bir.ru\0"
-"r\xc3\xb8mskog.no\0pomorskie.pl\0"
-"\xeb\x8b\xb7\xec\xbb\xb4\0"
-"fastlylb.net\0"
-"championship.aero\0klepp.no\0"
-"ina.ibaraki.jp\0takamatsu.kagawa.jp\0"
-"wlocl.pl\0"
-"v\xc3\xa5gs\xc3\xb8y.no\0"
-"chambagri.fr\0"
-"pharmaciens.km\0"
-"krd\0lat\0"
-"shinichi.hiroshima.jp\0cc.nh.us\0law\0"
-"wanouchi.gifu.jp\0hanamaki.iwate.jp\0s3-website-us-west-2.amazonaws.com\0"
-"feira.br\0siteleaf.net\0"
-"moss.no\0"
-"hotmail\0"
-"gleeze.com\0"
-"ooguy.com\0"
-"bsb.br\0hita.oita.jp\0in-vpn.de\0"
-"toyo.kochi.jp\0"
-"sk\xc3\xa1nit.no\0apps.fbsbx.com\0"
-"gallery\0"
-"toya.hokkaido.jp\0"
-"traeumtgerade.de\0tuva.su\0"
-"drammen.no\0"
-"im.it\0"
-"omihachiman.shiga.jp\0for-some.biz\0"
-"uk.com\0"
-"pro.na\0"
-"fc.it\0"
-"nasu.tochigi.jp\0pro.mv\0"
-"pb.ao\0bi.it\0wodzislaw.pl\0loginline.services\0ddnsking.com\0"
-"vald-aosta.it\0cri.nz\0"
-"or.at\0toon.ehime.jp\0futuremailing.at\0"
-"vall\xc3\xa9""eaoste.it\0arao.kumamoto.jp\0lds\0map.fastlylb.net\0"
-"k.bg\0or.bi\0"
-"kasahara.gifu.jp\0cartoonart.museum\0"
-"eisenbahn.museum\0"
-"bodo.no\0"
-"ed.ao\0""1.bg\0trentinosudtirol.it\0"
-"hosting-cluster.nl\0"
-"organic\0"
-"yandex\0"
-"gs.tm.no\0"
-"pro.om\0"
-"kobierzyce.pl\0ca.eu.org\0"
-"shunan.yamaguchi.jp\0es.kr\0hasura-app.io\0"
-"or.ci\0"
-"kasama.ibaraki.jp\0"
-"getmyip.com\0"
-"plumbing\0"
-"hidaka.kochi.jp\0br\xc3\xb8nn\xc3\xb8y.no\0\xec\x82\xbc\xec\x84\xb1\0"
-"amagasaki.hyogo.jp\0"
-"or.cr\0ce.leg.br\0"
-"lib.va.us\0mydrobo.com\0"
-"skanland.no\0"
-"misato.akita.jp\0"
-"nombre.bo\0"
-"ed.ci\0hn.cn\0"
-"halden.no\0pro.pr\0"
-"sardegna.it\0oshima.yamaguchi.jp\0myshopblocks.com\0"
-"conf.se\0"
-"sor-aurdal.no\0"
-"tosa.kochi.jp\0"
-"ed.cr\0"
-"dr\xc3\xb8""bak.no\0"
-"\xe5\x98\x89\xe9\x87\x8c\xe5\xa4\xa7\xe9\x85\x92\xe5\xba\x97\0"
-"lib.hi.us\0"
-"webhop.info\0"
-"barsy.info\0"
-"lib.dc.us\0\xe5\x8f\xb0\xe7\x81\xa3\0"
-"andasuolo.no\0"
-"vega.no\0homelinux.net\0"
-"lomza.pl\0"
-"nakama.fukuoka.jp\0langev\xc3\xa5g.no\0"
-"trainer.aero\0"
-"trentinos\xc3\xbc""dtirol.it\0\xe5\x85\xac\xe5\x8f\xb8\0wpcomstaging.com\0"
-"bible.museum\0"
-"environmentalconservation.museum\0"
-"bargains\0"
-"\xe6\xbe\xb3\xe9\x96\x80\0"
-"presse.ci\0fukuyama.hiroshima.jp\0muos\xc3\xa1t.no\0"
-"higashimurayama.tokyo.jp\0hokksund.no\0"
-"j\xc3\xb8lster.no\0"
-"cloudns.eu\0"
-"seaport.museum\0\xc3\xa5krehamn.no\0*.compute-1.amazonaws.com\0"
-"western.museum\0"
-"jor.br\0k12.ok.us\0"
-"sunagawa.hokkaido.jp\0pro.tt\0"
-"mod.gi\0rankoshi.hokkaido.jp\0"
-"cc.mi.us\0familyds.com\0"
-"hobby-site.com\0"
-"or.id\0"
-"obihiro.hokkaido.jp\0minato.osaka.jp\0llc\0"
-"cd.eu.org\0"
-"vv.it\0"
-"\xe7\xbe\xa4\xe9\xa6\xac.jp\0"
-"obanazawa.yamagata.jp\0"
-"z.se\0filegear-gb.me\0in-dsl.org\0"
-"namerikawa.toyama.jp\0"
-"llp\0verisign\0"
-"or.it\0"
-"gushikami.okinawa.jp\0her\xc3\xb8y.m\xc3\xb8re-og-romsdal.no\0pro.vn\0"
-"grimstad.no\0"
-"educational.museum\0"
-"kaneyama.fukushima.jp\0"
-"chikuho.fukuoka.jp\0lolipop.io\0"
-"yoshimi.saitama.jp\0sakata.yamagata.jp\0radio\0from-tn.com\0"
-"or.jp\0"
-"urn.arpa\0house.museum\0"
-"takazaki.miyazaki.jp\0or.ke\0"
-"cloudns.in\0"
-"cruises\0"
-"trentinoa-adige.it\0"
-"bpl.biz\0"
-"ed.jp\0minano.saitama.jp\0"
-"or.kr\0"
-"za.bz\0"
-"\xe0\xb8\x97\xe0\xb8\xab\xe0\xb8\xb2\xe0\xb8\xa3.\xe0\xb9\x84\xe0\xb8\x97\xe0\xb8\xa2\0"
-"ns.ca\0"
-"cloudns.cc\0"
-"fukaya.saitama.jp\0"
-"sakurai.nara.jp\0lol\0"
-"\xe7\xb6\xb2\xe8\xb7\xaf.tw\0"
-"nagaokakyo.kyoto.jp\0"
-"lifeinsurance\0"
-"nishiizu.shizuoka.jp\0"
-"s3.dualstack.ap-northeast-1.amazonaws.com\0"
-"nakano.tokyo.jp\0"
-"\xc3\xa5rdal.no\0"
-"go.ci\0kamo.kyoto.jp\0lib.tn.us\0basketball\0"
-"americanfamily\0dance\0"
-"lpl\0dnsalias.net\0"
-"kashima.ibaraki.jp\0\xe6\xbe\xb3\xe9\x97\xa8\0avianca\0"
-"namie.fukushima.jp\0or.na\0"
-"kwpsp.gov.pl\0\xe5\x85\xac\xe7\x9b\x8a\0\xd0\xbc\xd0\xbe\xd1\x81\xd0\xba\xd0\xb2\xd0\xb0\0"
-"green\0"
-"go.cr\0or.mu\0"
-"higashikawa.hokkaido.jp\0"
-"habmer.no\0"
-"psse.gov.pl\0"
-"conf.lv\0lavangen.no\0"
-"man\0"
-"press.cy\0"
-"quebec.museum\0map\0"
-"esp.br\0roma.museum\0mba\0"
-"ikeda.nagano.jp\0stryn.no\0"
-"military.museum\0"
-"levanger.no\0"
-"\xe7\xb5\x84\xe7\xb9\x94.tw\0accesscam.org\0"
-"yachts\0"
-"historichouses.museum\0"
-"plurinacional.bo\0beskidy.pl\0"
-"valer.ostfold.no\0"
-"dnsup.net\0"
-"pfizer\0"
-"meiwa.mie.jp\0"
-"association.museum\0"
-"kunneppu.hokkaido.jp\0citi\0"
-"nakaniikawa.toyama.jp\0"
-"skanit.no\0boehringer\0georgia.su\0"
-"nisshin.aichi.jp\0"
-"is-a-patsfan.org\0"
-"asahi.yamagata.jp\0"
-"aizubange.fukushima.jp\0project.museum\0"
-"columbus.museum\0tana.no\0"
-"mallorca.museum\0amfam\0"
-"ltd\0"
-"or.pw\0"
-"yashiro.hyogo.jp\0zoology.museum\0kongsvinger.no\0"
-"city\0"
-"is.gov.pl\0democrat\0"
-"misato.miyagi.jp\0market\0"
-"yonago.tottori.jp\0"
-"trentinostirol.it\0"
-"gitlab.io\0"
-"\xed\x95\x9c\xea\xb5\xad\0hermes\0"
-"ed.pw\0med\0issmarterthanyou.com\0"
-"salvador.br\0"
-"miyashiro.saitama.jp\0hokuto.yamanashi.jp\0gliwice.pl\0"
-"nysa.pl\0men\0"
-"kanazawa.ishikawa.jp\0"
-"tsukiyono.gunma.jp\0"
-"utazu.kagawa.jp\0"
-"sos.pl\0"
-"bahn.museum\0"
-"go.id\0k.se\0hospital\0"
-"rm.it\0"
-"assabu.hokkaido.jp\0kakinoki.shimane.jp\0"
-"cc.al.us\0audible\0"
-"rebun.hokkaido.jp\0"
-"modern.museum\0research.museum\0"
-"nic.in\0crimea.ua\0"
-"virgin\0"
-"zp.ua\0"
-"seki.gifu.jp\0nowruz\0"
-"go.it\0"
-"or.th\0"
-"netbank\0"
-"aizumisato.fukushima.jp\0"
-"sigdal.no\0"
-"hanno.saitama.jp\0"
-"t\xc3\xb8nsberg.no\0everbank\0"
-"nishiwaki.hyogo.jp\0"
-"go.jp\0sko.gov.pl\0fishing\0"
-"act.au\0suzuki\0"
-"labor.museum\0"
-"or.ug\0markets\0"
-"go.ke\0"
-"andria-trani-barletta.it\0hirakata.osaka.jp\0"
-"or.tz\0"
-"bern.museum\0"
-"photography.museum\0"
-"shoes\0"
-"kiwa.mie.jp\0ryokami.saitama.jp\0"
-"mil.ac\0trento.it\0moareke.no\0"
-"mil.ae\0or.us\0"
-"vefsn.no\0"
-"go.kr\0*.telebit.xyz\0"
-"tires\0diskstation.org\0"
-"lom.it\0tomigusuku.okinawa.jp\0news\0"
-"nirasaki.yamanashi.jp\0"
-"mil.al\0\xd2\x9b\xd0\xb0\xd0\xb7\0"
-"wuoz.gov.pl\0"
-"taira.toyama.jp\0"
-"mil\0s3-external-1.amazonaws.com\0"
-"mil.ba\0s3-website.ca-central-1.amazonaws.com\0"
-"mil.ar\0"
-"hdfcbank\0"
-"modalen.no\0"
-"noheji.aomori.jp\0isleofman.museum\0"
-"stange.no\0exposed\0mit\0"
-"dolls.museum\0"
-"mil.az\0lombardy.it\0mutsuzawa.chiba.jp\0"
-"next\0"
-"cloudns.us\0"
-"hyogo.jp\0"
-"mil.bo\0"
-"loppa.no\0"
-"mil.br\0ichinomiya.chiba.jp\0"
-"hamura.tokyo.jp\0malbork.pl\0"
-"frei.no\0krasnodar.su\0mangyshlak.su\0go.leg.br\0"
-"usui.fukuoka.jp\0"
-"baseball.museum\0"
-"mil.by\0reise\0"
-"grocery\0"
-"toyako.hokkaido.jp\0"
-"mil.cl\0"
-"mil.cn\0"
-"mil.co\0"
-"trentinosued-tirol.it\0ainan.ehime.jp\0iizuna.nagano.jp\0wsa.gov.pl\0"
-"jeju.kr\0georgia.museum\0"
-"mlb\0"
-"cultural.museum\0karacol.su\0"
-"dnsking.ch\0"
-"higashitsuno.kochi.jp\0"
-"tj\xc3\xb8me.no\0"
-"mil.do\0"
-"viterbo.it\0"
-"obninsk.su\0"
-"mil.ec\0drayddns.com\0"
-"mma\0s3.amazonaws.com\0"
-"mil.eg\0kikuchi.kumamoto.jp\0mihama.wakayama.jp\0skole.museum\0kirkenes.no\0mls\0"
-"kristiansand.no\0\xe5\xa4\xa7\xe6\x8b\xbf\0from-nh.com\0"
-"\xc3\xa5mot.no\0"
-"warszawa.pl\0servehalflife.com\0"
-"sosnowiec.pl\0"
-"obuse.nagano.jp\0vote\0cloudycluster.net\0"
-"kvinnherad.no\0"
-"keymachine.de\0"
-"naruto.tokushima.jp\0"
-"lom.no\0"
-"graphics\0"
-"cc.vi.us\0"
-"barcelona\0"
-"cloudns.club\0"
-"voto\0"
-"go.pw\0"
-"brasilia.me\0"
-"kakogawa.hyogo.jp\0podzone.net\0"
-"takaoka.toyama.jp\0skjak.no\0lacaixa\0"
-"opencraft.hosting\0"
-"mil.ge\0sue.fukuoka.jp\0wellbeingzone.co.uk\0"
-"trentino.it\0jessheim.no\0leczna.pl\0"
-"mil.gh\0matera.it\0gold\0"
-"moe\0"
-"dlugoleka.pl\0golf\0doesntexist.org\0"
-"iz.hr\0toyosato.shiga.jp\0lutsk.ua\0pics\0"
-"contractors\0moi\0ravendb.run\0"
-"is-a-democrat.com\0"
-"nord-fron.no\0\xe6\x96\xb0\xe5\x8a\xa0\xe5\x9d\xa1\0"
-"mom\0now.sh\0"
-"servegame.com\0"
-"mil.gt\0matsue.shimane.jp\0rybnik.pl\0"
-"byen.site\0"
-"\xc3\xb8ygarden.no\0"
-"mt.it\0"
-"mov\0"
-"col.ng\0"
-"mil.hn\0nerima.tokyo.jp\0"
-"mil.id\0shiraoi.hokkaido.jp\0"
-"nab\0kicks-ass.net\0"
-"higashihiroshima.hiroshima.jp\0"
-"go.th\0nic.tj\0mydatto.net\0"
-"mil.in\0heritage.museum\0"
-"gob.ar\0go.tj\0dyndns1.de\0"
-"dynns.com\0"
-"x.bg\0mil.iq\0"
-"starachowice.pl\0"
-"nba\0game-host.org\0"
-"resindevice.io\0"
-"goog\0weber\0"
-"gob.bo\0go.ug\0"
-"nhs.uk\0"
-"mil.jo\0go.tz\0"
-"gotemba.shizuoka.jp\0"
-"rost.no\0tirol\0"
-"abu.yamaguchi.jp\0"
-"!city.yokohama.jp\0komoro.nagano.jp\0"
-"stathelle.no\0java\0"
-"mil.kg\0"
-"shinjo.nara.jp\0express\0msd\0"
-"gob.cl\0"
-"santamaria.br\0"
-"mil.km\0de.us\0"
-"fst.br\0"
-"wassamu.hokkaido.jp\0kamikitayama.nara.jp\0"
-"\xe8\xb0\xb7\xe6\xad\x8c\0"
-"mil.kr\0on-web.fr\0"
-"foz.br\0cahcesuolo.no\0"
-"fujikawaguchiko.yamanashi.jp\0"
-"dd-dns.de\0"
-"ch.eu.org\0"
-"mil.kz\0"
-"greta.fr\0"
-"gob.do\0oygarden.no\0"
-"ulm.museum\0press.se\0"
-"gob.ec\0yorii.saitama.jp\0square7.de\0"
-"s\xc3\xb8r-odal.no\0mtn\0"
-"viking.museum\0"
-"friulivenezia-giulia.it\0taka.hyogo.jp\0browsersafetymark.io\0"
-"homelinux.org\0"
-"mil.lv\0mtr\0"
-"far.br\0mil.mg\0state.museum\0jondal.no\0nec\0"
-"nerdpol.ovh\0"
-"\xe7\xb5\x84\xe7\xb9\x94.hk\0hitachi.ibaraki.jp\0finearts.museum\0nctu.me\0"
-"bibai.hokkaido.jp\0irish\0"
-"gob.es\0shirahama.wakayama.jp\0biev\xc3\xa1t.no\0"
-"atsuma.hokkaido.jp\0cloudns.pw\0"
-"mil.mv\0"
-"mil.ng\0"
-"aya.miyazaki.jp\0net\0"
-"mil.my\0mil.ni\0"
-"coloradoplateau.museum\0mil.mz\0"
-"new\0does-it.net\0"
-"hachinohe.aomori.jp\0mil.no\0church\0"
-"nfl\0"
-"scientist.aero\0"
-"countryestate.museum\0"
-"nic.za\0"
-"biei.hokkaido.jp\0"
-"cn-north-1.eb.amazonaws.com.cn\0"
-"floro.no\0"
-"oizumi.gunma.jp\0yamanouchi.nagano.jp\0health.museum\0net.eu.org\0"
-"mil.nz\0"
-"sera.hiroshima.jp\0"
-"a\xc3\xa9roport.ci\0shiroishi.miyagi.jp\0mango\0from-ut.com\0"
-"vads\xc3\xb8.no\0"
-"urayasu.chiba.jp\0"
-"isen.kagoshima.jp\0"
-"gob.gt\0fuchu.toyama.jp\0\xe0\xb8\x84\xe0\xb8\xad\xe0\xb8\xa1\0s3.ap-south-1.amazonaws.com\0"
-"barueri.br\0murayama.yamagata.jp\0dynamisches-dns.de\0"
-"intelligence.museum\0ngo\0square7.ch\0nh-serv.co.uk\0"
-"hirado.nagasaki.jp\0kikugawa.shizuoka.jp\0"
-"mil.pe\0"
-"mil.ph\0"
-"gob.hn\0"
-"skjerv\xc3\xb8y.no\0mil.pl\0"
-"alto-adige.it\0shiogama.miyagi.jp\0in-dsl.net\0"
-"aizumi.tokushima.jp\0"
-"nhk\0is-very-good.org\0"
-"halsa.no\0yombo.me\0"
-"campobasso.it\0mil.qa\0lenug.su\0"
-"zakopane.pl\0"
-"yurihonjo.akita.jp\0tsukui.kanagawa.jp\0"
-"ryukyu\0"
-"oishida.yamagata.jp\0"
-"skien.no\0"
-"mil.py\0from-ia.com\0"
-"numata.gunma.jp\0"
-"po.it\0grue.no\0"
-"vegarshei.no\0"
-"ping\0potager.org\0"
-"onagawa.miyagi.jp\0sweetpepper.org\0"
-"lu.it\0me.it\0"
-"knightpoint.systems\0"
-"haebaru.okinawa.jp\0pink\0*.webhare.dev\0"
-"carrd.co\0"
-"\xd8\xa7\xd9\x84\xd9\x8a\xd9\x85\xd9\x86\0"
-"press.ma\0"
-"knx-server.net\0"
-"chtr.k12.ma.us\0"
-"bg.it\0"
-"js.org\0"
-"me.ke\0"
-"tateyama.toyama.jp\0"
-"mil.ru\0"
-"frosinone.it\0mil.rw\0"
-"mil.sh\0"
-"trentin-sudtirol.it\0"
-"i.bg\0"
-"doctor\0"
-"tx.us\0"
-"namsskogan.no\0"
-"systems\0"
-"ath.cx\0"
-"mil.st\0"
-"chikugo.fukuoka.jp\0"
-"mt.us\0nd.us\0cloudaccess.host\0"
-"at.eu.org\0"
-"mil.sy\0"
-"tempioolbia.it\0mil.tj\0\xd8\xb9\xd8\xb1\xd8\xa8\0"
-"kaas.gg\0cust.testing.thingdust.io\0"
-"basel.museum\0lodingen.no\0mil.tm\0"
-"brindisi.it\0ws.na\0mil.to\0"
-"aigo\0"
-"mil.tr\0"
-"townnews-staging.com\0"
-"kitagata.saga.jp\0"
-"mil.tw\0"
-"hl.cn\0rishiri.hokkaido.jp\0"
-"aki.kochi.jp\0mil.tz\0"
-"*.on-rancher.cloud\0"
-"noto.ishikawa.jp\0asahi.nagano.jp\0kumagaya.saitama.jp\0"
-"uki.kumamoto.jp\0lund.no\0"
-"muni.il\0"
-"ah.cn\0ris\xc3\xb8r.no\0mil.vc\0frogans\0"
-"gob.mx\0mil.ve\0"
-"nishitosa.kochi.jp\0gob.ni\0brand.se\0"
-"oji.nara.jp\0"
-"uryu.hokkaido.jp\0"
-"coop.ht\0r\xc3\xb8ros.no\0mil.uy\0"
-"stj\xc3\xb8rdal.no\0"
-"lib.de.us\0"
-"galsa.no\0"
-"slg.br\0"
-"\xe0\xa6\xad\xe0\xa6\xbe\xe0\xa6\xb0\xe0\xa6\xa4\0"
-"lego\0"
-"sayo.hyogo.jp\0for-better.biz\0"
-"katori.chiba.jp\0"
-"trentin-s\xc3\xbc""dtirol.it\0"
-"skierva.no\0hosting\0"
-"stalowa-wola.pl\0"
-"lel.br\0settsu.osaka.jp\0anthro.museum\0"
-"tsushima.aichi.jp\0gob.pa\0"
-"ltd.cy\0"
-"r\xc3\xa1hkker\xc3\xa1vju.no\0gob.pe\0"
-"stargard.pl\0"
-"coop.br\0"
-"gob.pk\0\xd8\xa7\xd9\x8a\xd8\xb1\xd8\xa7\xd9\x86\0"
-"kumamoto.kumamoto.jp\0edunet.tn\0"
-"satte.saitama.jp\0now\0"
-"ip6.arpa\0takahama.fukui.jp\0"
-"os.hedmark.no\0"
-"historisches.museum\0"
-"kanra.gunma.jp\0ownprovider.com\0"
-"zhitomir.ua\0press\0fantasyleague.cc\0"
-"rocher\0"
-"schweiz.museum\0mil.za\0togliatti.su\0"
-"org.ac\0"
-"nodebalancer.linode.com\0"
-"org.ae\0nishinomiya.hyogo.jp\0"
-"org.af\0nra\0cloudns.info\0"
-"org.ag\0\xe0\xa4\xad\xe0\xa4\xbe\xe0\xa4\xb0\xe0\xa4\xa4\xe0\xa4\xae\xe0\xa5\x8d\0"
-"gujo.gifu.jp\0"
-"org.ai\0teshikaga.hokkaido.jp\0"
-"hamar.no\0sells-for-less.com\0"
-"org.al\0vt.it\0"
-"org.am\0barefoot\0"
-"mil.zm\0obi\0"
-"brescia.it\0"
-"x.se\0"
-"org.ba\0ltd.gi\0geelvinck.museum\0"
-"org.ar\0org.bb\0name.hr\0bale.museum\0"
-"org.au\0togane.chiba.jp\0"
-"london\0"
-"org.bh\0mil.zw\0"
-"org.bi\0matsusaka.mie.jp\0"
-"org.az\0snasa.no\0vestre-toten.no\0"
-"nrw\0"
-"org.bm\0me.so\0"
-"org.bn\0mitake.gifu.jp\0"
-"org.bo\0seiyo.ehime.jp\0minamiashigara.kanagawa.jp\0"
-"msk.ru\0"
-"shangrila\0"
-"org.br\0"
-"org.bs\0tadaoka.osaka.jp\0lighting\0ltd.hk\0"
-"org.bt\0name.et\0gob.sv\0"
-"catholic\0"
-"org.bw\0yakumo.shimane.jp\0"
-"yusuhara.kochi.jp\0"
-"org.ci\0"
-"org.bz\0culture.museum\0"
-"chonan.chiba.jp\0"
-"ouchi.saga.jp\0"
-"org.cn\0"
-"org.co\0mihara.hiroshima.jp\0"
-"philadelphiaarea.museum\0msk.su\0"
-"fhv.se\0shouji\0"
-"dnsalias.org\0"
-"org.cu\0divttasvuotna.no\0"
-"org.cw\0"
-"me.tz\0"
-"org.cy\0even\xc3\xa1\xc5\xa1\xc5\xa1i.no\0me.uk\0ntt\0"
-"alsace\0"
-"org.dm\0"
-"org.do\0"
-"ostroleka.pl\0"
-"otsu.shiga.jp\0me.us\0"
-"org.ec\0gob.ve\0"
-"ozu.ehime.jp\0maison\0ybo.party\0"
-"org.ee\0"
-"california.museum\0"
-"org.eg\0tuxfamily.org\0"
-"name.cy\0publishproxy.com\0"
-"org.dz\0"
-"off\0"
-"zgorzelec.pl\0"
-"kashihara.nara.jp\0"
-"starostwo.gov.pl\0"
-"svalbard.no\0"
-"org.es\0s3-us-west-2.amazonaws.com\0leadpages.co\0"
-"org.et\0grosseto.it\0"
-"cosenza.it\0\xd9\x87\xd9\x85\xd8\xb1\xd8\xa7\xd9\x87\0"
-"name.eg\0ushiku.ibaraki.jp\0"
-"kozaki.chiba.jp\0lib.mt.us\0lib.nd.us\0"
-"i.ng\0"
-"biratori.hokkaido.jp\0kolobrzeg.pl\0"
-"egyptian.museum\0lib.in.us\0"
-"s3.dualstack.ap-southeast-2.amazonaws.com\0"
-"onomichi.hiroshima.jp\0"
-"dr.na\0"
-"tahara.aichi.jp\0ltd.lk\0wang\0"
-"org.ge\0"
-"org.gg\0williamsburg.museum\0piaget\0"
-"org.gh\0is-a-guru.com\0"
-"org.gi\0"
-"name.az\0"
-"hl.no\0"
-"org.gl\0berkeley.museum\0homeftp.org\0"
-"org.gn\0"
-"org.gp\0"
-"trentinsud-tirol.it\0minobu.yamanashi.jp\0equipment\0"
-"org.gr\0"
-"org.gt\0szkola.pl\0"
-"org.gu\0ah.no\0"
-"takino.hyogo.jp\0"
-"nyc\0"
-"org.gy\0"
-"org.hk\0"
-"takahashi.okayama.jp\0i.ph\0*.platformsh.site\0"
-"org.hn\0"
-"fla.no\0ltd.ng\0"
-"valleedaoste.it\0"
-"mizumaki.fukuoka.jp\0ogaki.gifu.jp\0\xc3\xa5lesund.no\0*.dapps.earth\0"
-"org.ht\0"
-"org.hu\0tagajo.miyagi.jp\0science\0"
-"hakui.ishikawa.jp\0"
-"yaese.okinawa.jp\0lincoln.museum\0"
-"tochigi.jp\0ask\xc3\xb8y.no\0"
-"sandcats.io\0"
-"k12.tx.us\0"
-"org.il\0"
-"org.im\0"
-"org.in\0pointto.us\0"
-"org.iq\0busan.kr\0"
-"org.ir\0podzone.org\0"
-"pa.gov.br\0org.is\0barsy.net\0"
-"org.je\0\xd9\x85\xd9\x88\xd8\xb1\xd9\x8a\xd8\xaa\xd8\xa7\xd9\x86\xd9\x8a\xd8\xa7\0"
-"kawamata.fukushima.jp\0"
-"cc.or.us\0"
-"n\xc3\xa5\xc3\xa5mesjevuemie.no\0"
-"kita.tokyo.jp\0"
-"higashikurume.tokyo.jp\0"
-"space.museum\0bloomberg\0"
-"flynnhub.com\0"
-"org.jo\0exhibition.museum\0fusa.no\0"
-"ftpaccess.cc\0"
-"botanicalgarden.museum\0"
-"shingu.hyogo.jp\0eu-central-1.elasticbeanstalk.com\0app.lmpm.com\0"
-"ve.it\0"
-"doshi.yamanashi.jp\0antiques.museum\0"
-"org.kg\0"
-"org.ki\0i.se\0"
-"kimobetsu.hokkaido.jp\0"
-"org.km\0"
-"org.kn\0"
-"ohkura.yamagata.jp\0us-west-2.elasticbeanstalk.com\0"
-"org.kp\0target\0"
-"org.la\0notteroy.no\0"
-"org.lb\0"
-"pb.gov.br\0org.lc\0sakura\0"
-"commbank\0"
-"kisofukushima.nagano.jp\0org.kw\0hair\0"
-"org.ky\0"
-"hamada.shimane.jp\0org.kz\0kicks-ass.org\0"
-"org.lk\0"
-"tv.bb\0gdansk.pl\0"
-"sec.ps\0"
-"cs.it\0"
-"sn\xc3\xa5""ase.no\0"
-"org.ma\0"
-"org.lr\0brussels\0"
-"org.ls\0westfalen.museum\0sund.no\0"
-"org.me\0dyndns-pics.com\0"
-"org.lv\0"
-"tone.ibaraki.jp\0org.mg\0"
-"agano.niigata.jp\0kv.ua\0"
-"tv.bo\0nishi.osaka.jp\0moroyama.saitama.jp\0org.ly\0odesa.ua\0au.eu.org\0be.eu.org\0"
-"one\0\xe5\xa4\xa9\xe4\xb8\xbb\xe6\x95\x99\0"
-"org.mk\0vt.us\0"
-"tv.br\0org.ml\0ong\0"
-"\xe4\xba\xac\xe9\x83\xbd.jp\0castle.museum\0computerhistory.museum\0"
-"org.mn\0"
-"org.mo\0bielawa.pl\0boutique\0servesarcasm.com\0"
-"kumano.mie.jp\0shacknet.nu\0"
-"matsuno.ehime.jp\0org.na\0onl\0"
-"tsubetsu.hokkaido.jp\0kg.kr\0"
-"org.ms\0dr.tr\0"
-"yukuhashi.fukuoka.jp\0org.mt\0settlement.museum\0"
-"nb.ca\0org.mu\0is-an-actress.com\0"
-"goto.nagasaki.jp\0org.mv\0"
-"kagoshima.jp\0org.mw\0org.ng\0"
-"org.mx\0heroy.nordland.no\0lancome\0soccer\0"
-"org.my\0org.ni\0"
-"org.mz\0"
-"itau\0"
-"valleeaoste.it\0iveland.no\0"
-"rmit\0"
-"chicago.museum\0"
-"pvt.ge\0"
-"hongo.hiroshima.jp\0org.nr\0"
-"ooo\0"
-"hof.no\0"
-"okuma.fukushima.jp\0farmers.museum\0"
-"stuttgart.museum\0"
-"ltd.ua\0"
-"org.nz\0pramerica\0"
-"rel.ht\0"
-"org.om\0coop.rw\0virtueeldomein.nl\0"
-"academia.bo\0\xc3\xa5l.no\0"
-"kamogawa.chiba.jp\0b.ssl.fastly.net\0"
-"org.pa\0lib.me.us\0"
-"shikatsu.aichi.jp\0nordre-land.no\0ltd.uk\0uconnect\0"
-"org.pe\0"
-"bari.it\0org.pf\0"
-"fujimi.saitama.jp\0org.ph\0"
-"q-a.eu.org\0"
-"org.pk\0glade\0"
-"minamiechizen.fukui.jp\0org.pl\0"
-"tabayama.yamanashi.jp\0org.pn\0xihuan\0"
-"lib.as.us\0"
-"theater.museum\0narvik.no\0org.qa\0"
-"org.pr\0"
-"kurobe.toyama.jp\0juedisches.museum\0gamvik.no\0org.ps\0\xe5\x95\x86\xe5\xba\x97\0cdn77-ssl.net\0"
-"kagamino.okayama.jp\0org.pt\0"
-"anan.tokushima.jp\0"
-"alt.za\0"
-"yawata.kyoto.jp\0"
-"org.py\0bg.eu.org\0"
-"maringa.br\0coop.tt\0apartments\0vapor.cloud\0"
-"aoste.it\0science.museum\0org\0"
-"bukhara.su\0"
-"pay\0"
-"taishi.osaka.jp\0"
-"wielun.pl\0health\0"
-"basilicata.it\0higashiizumo.shimane.jp\0narusawa.yamanashi.jp\0"
-"lebtimnetz.de\0"
-"naie.hokkaido.jp\0"
-"coop.mv\0"
-"coop.mw\0"
-"org.ro\0k12.wa.us\0"
-"oslo.no\0"
-"medicina.bo\0tysv\xc3\xa6r.no\0org.sa\0frontier\0"
-"org.sb\0"
-"org.rs\0org.sc\0"
-"itayanagi.aomori.jp\0wakasa.tottori.jp\0org.sd\0"
-"org.se\0club\0org.ru\0"
-"org.rw\0org.sg\0bloxcms.com\0"
-"org.sh\0"
-"\xe6\x94\xbf\xe5\xba\x9c.\xe9\xa6\x99\xe6\xb8\xaf\0"
-"org.sl\0tkmaxx\0"
-"eu.org\0barsy.club\0"
-"org.sn\0name.vn\0"
-"org.so\0"
-"altoadige.it\0dyr\xc3\xb8y.no\0"
-"corporation.museum\0org.ss\0"
-"oyabe.toyama.jp\0org.st\0dnshome.de\0"
-"shizuoka.jp\0"
-"takinoue.hokkaido.jp\0org.sv\0googleapis.com\0"
-"tv.im\0nico\0"
-"on-the-web.tv\0"
-"org.sy\0ott\0"
-"org.sz\0org.tj\0stcgroup\0"
-"amica\0"
-"naoshima.kagawa.jp\0org.tm\0"
-"tv.it\0org.tn\0ap-northeast-1.elasticbeanstalk.com\0"
-"gaivuotna.no\0org.to\0"
-"poa.br\0cc.de.us\0"
-"org.ua\0"
-"org.tr\0"
-"emergency.aero\0"
-"morena.br\0funahashi.toyama.jp\0org.tt\0"
-"\xd8\xaa\xd9\x88\xd9\x86\xd8\xb3\0"
-"oristano.it\0"
-"eigersund.no\0org.tw\0org.ug\0"
-"aichi.jp\0cuisinella\0pet\0"
-"name.tj\0"
-"shonai.fukuoka.jp\0org.uk\0blogsite.org\0"
-"lease\0ovh\0"
-"gangaviika.no\0coop.py\0"
-"foundation.museum\0tromso.no\0telebit.io\0"
-"semboku.akita.jp\0tree.museum\0"
-"name.tr\0"
-"org.vc\0"
-"name.tt\0ddnsgeek.com\0"
-"hachirogata.akita.jp\0tcm.museum\0org.ve\0"
-"kamaishi.iwate.jp\0"
-"bt.it\0"
-"karaganda.su\0"
-"shikaoi.hokkaido.jp\0org.uy\0org.vi\0town\0"
-"okayama.okayama.jp\0org.uz\0"
-"iruma.saitama.jp\0"
-"org.vn\0barsy.pro\0"
-"v.bg\0"
-"codespot.com\0git-pages.rit.edu\0"
-"gjerstad.no\0rel.pl\0"
-"kiyama.saga.jp\0org.vu\0"
-"chuo.chiba.jp\0phd\0hr.eu.org\0"
-"asuke.aichi.jp\0communication.museum\0"
-"nagi.okayama.jp\0athleta\0dnsiskinky.com\0"
-"coop.km\0org.ws\0"
-"podlasie.pl\0of.london\0"
-"club.aero\0uto.kumamoto.jp\0yoshida.saitama.jp\0"
-"otobe.hokkaido.jp\0"
-"shima.mie.jp\0haus\0"
-"pid\0"
-"ichihara.chiba.jp\0tv.na\0lib.vt.us\0"
-"leirvik.no\0"
-"notodden.no\0dc.us\0"
-"toys\0"
-"kouyama.kagoshima.jp\0"
-"vik.no\0akdn\0is-a-designer.com\0"
-"barsy.pub\0"
-"kitashiobara.fukushima.jp\0"
-"pin\0search\0"
-"aeroclub.aero\0"
-"horokanai.hokkaido.jp\0"
-"port.fr\0"
-"miyawaka.fukuoka.jp\0yatsushiro.kumamoto.jp\0yamatokoriyama.nara.jp\0koganei.tokyo.jp\0"
-"lgbt\0"
-"sakuragawa.ibaraki.jp\0usercontent.jp\0"
-"lib.il.us\0"
-"name.qa\0org.za\0"
-"luster.no\0name.pr\0"
-"pi.gov.br\0mr.no\0"
-"chernigov.ua\0"
-"sells-it.net\0"
-"from-in.com\0"
-"fujisato.akita.jp\0"
-"ichinohe.iwate.jp\0"
-"org.zm\0"
-"davvesiida.no\0"
-"horten.no\0kviteseid.no\0"
-"broker.aero\0saitama.jp\0kitanakagusuku.okinawa.jp\0name.na\0\xeb\x8b\xb7\xeb\x84\xb7\0"
-"troandin.no\0"
-"bialowieza.pl\0"
-"name.mv\0"
-"name.ng\0org.zw\0"
-"koka.shiga.jp\0"
-"name.my\0"
-"tagawa.fukuoka.jp\0"
-"nike\0"
-"yamanashi.jp\0"
-"serveftp.net\0"
-"riopreto.br\0"
-"tochigi.tochigi.jp\0oregontrail.museum\0"
-"intl.tn\0"
-"walbrzych.pl\0"
-"noshiro.akita.jp\0"
-"prvcy.page\0"
-"reklam.hu\0cc.tx.us\0"
-"play\0"
-"\xd0\xbf\xd1\x80.\xd1\x81\xd1\x80\xd0\xb1\0"
-"abbott\0pnc\0"
-"nishigo.fukushima.jp\0"
-"cc.mt.us\0cc.nd.us\0"
-"tosashimizu.kochi.jp\0tv.sd\0"
-"saigawa.fukuoka.jp\0detroit.museum\0"
-"workisboring.com\0"
-"anjo.aichi.jp\0"
-"\xe0\xb0\xad\xe0\xb0\xbe\xe0\xb0\xb0\xe0\xb0\xa4\xe0\xb1\x8d\0"
-"sauherad.no\0"
-"lindesnes.no\0"
-"dynalias.com\0""4lima.de\0"
-"shimamaki.hokkaido.jp\0"
-"ibigawa.gifu.jp\0"
-"aisho.shiga.jp\0name.mk\0"
-"botanical.museum\0"
-"garden.museum\0"
-"nes.akershus.no\0"
-"mc.it\0"
-"homebuilt.aero\0freesite.host\0"
-"yamatotakada.nara.jp\0"
-"nagatoro.saitama.jp\0"
-"workshop.museum\0radoy.no\0"
-"time.museum\0"
-"\xe7\xbb\x84\xe7\xb9\x94.hk\0"
-"tv.tr\0"
-"verbania.it\0servegame.org\0"
-"yoita.niigata.jp\0tamayu.shimane.jp\0"
-"name.jo\0"
-"dynserv.org\0"
-"net.ac\0"
-"hamburg.museum\0"
-"net.ae\0"
-"net.af\0tv.tz\0"
-"net.ag\0campidanomedio.it\0"
-"free.hr\0""4lima.at\0"
-"net.ai\0"
-"sakahogi.gifu.jp\0glass\0"
-"net.al\0g.bg\0"
-"net.am\0salem.museum\0"
-"malopolska.pl\0"
-"net.ba\0is-a-conservative.com\0"
-"net.ar\0net.bb\0"
-"on.ca\0kashiwazaki.niigata.jp\0"
-"net.au\0"
-"net.bh\0"
-"net.az\0sydney.museum\0"
-"sh.cn\0""4lima.ch\0"
-"net.bm\0"
-"net.bn\0"
-"net.bo\0"
-"place\0"
-"net.br\0toyonaka.osaka.jp\0members.linode.com\0"
-"net.bs\0"
-"net.bt\0"
-"pe.gov.br\0otaki.chiba.jp\0"
-"pro\0likes-pie.com\0"
-"hichiso.gifu.jp\0es.leg.br\0"
-"industries\0jeep\0"
-"net.ci\0toyokawa.aichi.jp\0"
-"net.bz\0hidaka.saitama.jp\0"
-"gz.cn\0"
-"events\0pru\0"
-"net.cm\0"
-"net.cn\0dray-dns.de\0"
-"net.co\0osaka.jp\0"
-"chesapeakebay.museum\0consulado.st\0lib.ny.us\0"
-"wolomin.pl\0"
-"net.cu\0daito.osaka.jp\0"
-"net.cw\0tsuga.tochigi.jp\0"
-"net.cy\0"
-"hk.org\0"
-"hinode.tokyo.jp\0kawanishi.yamagata.jp\0homeftp.net\0"
-"net.dm\0s3-website.us-east-2.amazonaws.com\0*.hosting.myjino.ru\0"
-"net.do\0service.gov.uk\0"
-"nichinan.tottori.jp\0naamesjevuemie.no\0samsclub\0"
-"kaminoyama.yamagata.jp\0on.fashion\0"
-"minami-alps.yamanashi.jp\0sellsyourhome.org\0"
-"net.ec\0outsystemscloud.com\0"
-"akiruno.tokyo.jp\0"
-"net.eg\0"
-"pub\0"
-"net.dz\0trycloudflare.com\0"
-"ladbrokes\0"
-"pixolino.com\0"
-"austin.museum\0"
-"net.et\0"
-"daigo.ibaraki.jp\0"
-"64-b.it\0"
-"mydobiss.com\0"
-"hashima.gifu.jp\0homesecuritymac.com\0"
-"net.ge\0"
-"net.gg\0"
-"shinyoshitomi.fukuoka.jp\0k12.ri.us\0dst.mi.us\0locker\0bryansk.su\0barsy.org\0"
-"miyama.mie.jp\0"
-"pwc\0"
-"norddal.no\0"
-"net.gl\0"
-"k12.mo.us\0lcube-server.de\0"
-"net.gn\0"
-"qld.gov.au\0"
-"net.gp\0gildesk\xc3\xa5l.no\0"
-"council.aero\0mo-siemens.io\0"
-"net.gr\0"
-"extraspace\0"
-"net.gt\0"
-"net.gu\0cc.me.us\0"
-"budejju.no\0"
-"kannami.shizuoka.jp\0"
-"net.gy\0ascolipiceno.it\0"
-"net.hk\0"
-"shingu.fukuoka.jp\0k12.ca.us\0*.compute.amazonaws.com.cn\0"
-"vr.it\0"
-"osasco.br\0net.hn\0"
-"pa.gov.pl\0blackfriday\0"
-"forum.hu\0hiji.oita.jp\0presidio.museum\0"
-"net.ht\0net.id\0"
-"\xda\x80\xd8\xa7\xd8\xb1\xd8\xaa\0"
-"kasumigaura.ibaraki.jp\0"
-"ookuwa.nagano.jp\0"
-"synology.me\0"
-"net.il\0mobara.chiba.jp\0koshigaya.saitama.jp\0"
-"net.im\0"
-"net.in\0""12hp.de\0"
-"net.iq\0"
-"net.ir\0delaware.museum\0myvnc.com\0"
-"net.is\0"
-"net.je\0"
-"career\0"
-"asakuchi.okayama.jp\0"
-"miho.ibaraki.jp\0"
-"ogawa.ibaraki.jp\0storj.farm\0"
-"vix.br\0"
-"ashoro.hokkaido.jp\0"
-"shingo.aomori.jp\0fitness\0"
-"net.jo\0"
-"unnan.shimane.jp\0"
-"hida.gifu.jp\0"
-"net.kg\0"
-"trentinosuedtirol.it\0net.ki\0"
-"upow.gov.pl\0"
-"taifun-dns.de\0"
-"yamakita.kanagawa.jp\0pubtls.org\0"
-"12hp.at\0"
-"net.kn\0"
-"media.hu\0gripe\0"
-"shinanomachi.nagano.jp\0net.la\0"
-"net.lb\0"
-"tra.kp\0net.lc\0grajewo.pl\0"
-"amakusa.kumamoto.jp\0"
-"net.kw\0"
-"satosho.okayama.jp\0net.ky\0"
-"net.kz\0metlife\0"
-"net.lk\0il.eu.org\0basicserver.io\0"
-"bedzin.pl\0"
-"firm.ht\0valley.museum\0"
-"gs.hl.no\0"
-"aridagawa.wakayama.jp\0"
-"hiroo.hokkaido.jp\0karumai.iwate.jp\0net.ma\0""12hp.ch\0"
-"net.lr\0"
-"net.ls\0reviews\0"
-"pr.gov.br\0net.me\0"
-"net.lv\0"
-"firm.in\0"
-"cq.cn\0net.ly\0gs.ah.no\0"
-"net.mk\0"
-"net.ml\0"
-"lahppi.no\0"
-"agro.bo\0"
-"net.mo\0"
-"miyakonojo.miyazaki.jp\0"
-"net.ms\0"
-"net.mt\0"
-"kozagawa.wakayama.jp\0net.mu\0clinic\0"
-"net.mv\0net.nf\0orange\0"
-"net.mw\0net.ng\0www.ro\0"
-"morioka.iwate.jp\0net.mx\0"
-"net.my\0net.ni\0nikon\0"
-"net.mz\0office-on-the.net\0"
-"r\xc3\xb8yken.no\0hu.eu.org\0ie.eu.org\0"
-"coupon\0moonscale.net\0"
-"kyiv.ua\0"
-"net.nr\0"
-"!city.sendai.jp\0"
-"lyngdal.no\0"
-"nes.buskerud.no\0"
-"tsu.mie.jp\0"
-"firm.co\0"
-"net.nz\0"
-"kanoya.kagoshima.jp\0"
-"naval.museum\0net.om\0"
-"togo.aichi.jp\0net.pa\0"
-"civilaviation.aero\0"
-"utazas.hu\0"
-"net.pe\0firm.dk\0"
-"dielddanuorri.no\0"
-"blogspot.com\0"
-"net.ph\0"
-"net.pk\0fage\0"
-"jus.br\0net.pl\0africa\0dyn.home-webserver.de\0"
-"likescandy.com\0"
-"net.pn\0dyndns.tv\0"
-"cc.vt.us\0"
-"haboro.hokkaido.jp\0saintlouis.museum\0net.qa\0bostik\0"
-"uri.arpa\0net.pr\0"
-"kawanishi.hyogo.jp\0szczecin.pl\0net.ps\0"
-"hvaler.no\0net.pt\0"
-"bo.nordland.no\0gov.nc.tr\0"
-"k12.nj.us\0"
-"joso.ibaraki.jp\0net.py\0"
-"gorge.museum\0"
-"lesja.no\0"
-"plus\0"
-"children.museum\0"
-"caravan\0"
-"yamada.toyama.jp\0"
-"vc.it\0lea\xc5\x8bgaviika.no\0"
-"ebina.kanagawa.jp\0bus.museum\0"
-"itakura.gunma.jp\0mesaverde.museum\0"
-"suedtirol.it\0"
-"g.se\0"
-"ri.it\0education.museum\0"
-"ally\0"
-"emilia-romagna.it\0"
-"no.it\0babia-gora.pl\0"
-"net.sa\0static.land\0"
-"fudai.iwate.jp\0net.sb\0fail\0"
-"net.sc\0secure\0"
-"net.sd\0s3-website-sa-east-1.amazonaws.com\0"
-"net.ru\0"
-"komaki.aichi.jp\0media.pl\0net.rw\0net.sg\0"
-"net.sh\0"
-"gen.in\0kunstsammlung.museum\0"
-"dyndns.ws\0"
-"fussa.tokyo.jp\0net.sl\0"
-"yaita.tochigi.jp\0net.so\0"
-"chernovtsy.ua\0"
-"tawaramoto.nara.jp\0"
-"net.ss\0taipei\0"
-"net.st\0serveblog.net\0api.stdlib.com\0"
-"crotone.it\0"
-"net.th\0physio\0"
-"net.sy\0"
-"trentinoaltoadige.it\0eidsvoll.no\0net.tj\0monash\0"
-"sorum.no\0net.tm\0"
-"net.tn\0"
-"net.to\0"
-"net.ua\0chernihiv.ua\0"
-"net.tr\0"
-"dp.ua\0"
-"net.tt\0"
-"mp.br\0bomlo.no\0net.tw\0my-router.de\0"
-"\xc3\xa5""fjord.no\0duckdns.org\0"
-"room\0"
-"machida.tokyo.jp\0"
-"net.uk\0red\0theater\0"
-"furano.hokkaido.jp\0"
-"design.aero\0silk.museum\0"
-"hikari.yamaguchi.jp\0"
-"healthcare\0"
-"us.na\0lib.wy.us\0net.vc\0dyndns-wiki.com\0"
-"szczytno.pl\0krakow.pl\0"
-"net.ve\0ren\0"
-"erotika.hu\0"
-"shintomi.miyazaki.jp\0"
-"chuo.tokyo.jp\0"
-"net.uy\0net.vi\0"
-"kagami.kochi.jp\0net.uz\0qvc\0"
-"pyatigorsk.ru\0"
-"net.vn\0"
-"wildlife.museum\0"
-"augustow.pl\0"
-"tozawa.yamagata.jp\0boston\0sa.com\0"
-"net.vu\0linkyard.cloud\0"
-"watarai.mie.jp\0teaches-yoga.com\0"
-"lib.ia.us\0"
-"farm.museum\0newmexico.museum\0"
-"odawara.kanagawa.jp\0"
-"takasu.hokkaido.jp\0nakatane.kagoshima.jp\0"
-"mat.br\0"
-"lpusercontent.com\0"
-"stavanger.no\0"
-"bjarkoy.no\0"
-"saga.jp\0"
-"toyota.yamaguchi.jp\0gen.ng\0"
-"wif.gov.pl\0net.ws\0"
-"gen.mi.us\0"
-"belau.pw\0fans\0"
-"gr.eu.org\0"
-"lecce.it\0"
-"from-nm.com\0"
-"gen.nz\0"
-"shimoji.okinawa.jp\0"
-"passagens\0"
-"hdfc\0"
-"matsumae.hokkaido.jp\0"
-"\xe3\x83\x9d\xe3\x82\xa4\xe3\x83\xb3\xe3\x83\x88\0here-for-more.info\0"
-"miasta.pl\0"
-"firm.ve\0"
-"fukusaki.hyogo.jp\0"
-"net.za\0"
-"ontario.museum\0ril\0"
-"avocat.fr\0"
-"szex.hu\0"
-"rio\0"
-"rip\0"
-"sandiego.museum\0"
-"assassination.museum\0"
-"b\xc3\xa5""d\xc3\xa5""ddj\xc3\xa5.no\0"
-"net.zm\0"
-"k12.la.us\0"
-"in-brb.de\0n4t.co\0"
-"autos\0prime\0"
-"cuiaba.br\0works\0"
-"ebetsu.hokkaido.jp\0minami.tokushima.jp\0world\0"
-"tt.im\0"
-"amex\0"
-"tsurugashima.saitama.jp\0"
-"ud.it\0"
-"cc.dc.us\0"
-"store.nf\0"
-"farm\0"
-"pz.it\0winners\0"
-"iwama.ibaraki.jp\0lidl\0"
-"azimuth.network\0"
-"\xd8\xa8\xd8\xa7\xd8\xb1\xd8\xaa\0khakassia.su\0"
-"hammarfeasta.no\0po.gov.pl\0"
-"kouhoku.saga.jp\0"
-"u2.xnbay.com\0"
-"\xe0\xaa\xad\xe0\xaa\xbe\xe0\xaa\xb0\xe0\xaa\xa4\0"
-"nishio.aichi.jp\0kitchen\0"
-"br.it\0cb.it\0"
-"tos.it\0"
-"fast\0"
-"ng.ink\0"
-"akagi.shimane.jp\0edugit.org\0"
-"urbino-pesaro.it\0"
-"fukuoka.jp\0life\0homelink.one\0"
-"pri.ee\0"
-"dyndns-web.com\0"
-"t.bg\0empresa.bo\0"
-"isa-hockeynut.com\0"
-"monza.it\0"
-"friulivgiulia.it\0"
-"repbody.aero\0firm.ro\0"
-"ri.us\0"
-"bahccavuotna.no\0"
-"soo.kagoshima.jp\0gen.tr\0"
-"namdalseid.no\0durban\0kurgan.su\0"
-"is-a-geek.com\0"
-"cool\0"
-"coop\0"
-"\xe0\xa6\xad\xe0\xa6\xbe\xe0\xa7\xb0\xe0\xa6\xa4\0"
-"gs.mr.no\0aktyubinsk.su\0"
-"zushi.kanagawa.jp\0"
-"okuizumo.shimane.jp\0"
-"karasjok.no\0"
-"bc.ca\0"
-"jpn.com\0"
-"emerck\0"
-"\xe0\xb6\xbd\xe0\xb6\x82\xe0\xb6\x9a\xe0\xb7\x8f\0"
-"nose.osaka.jp\0"
-"roan.no\0"
-"hashikami.aomori.jp\0"
-"homeoffice.gov.uk\0"
-"ketrzyn.pl\0"
-"walter\0"
-"olbiatempio.it\0"
-"\xd8\xa8\xd9\x8a\xd8\xaa\xd9\x83\0"
-"usa.oita.jp\0serveftp.org\0"
-"caxias.br\0taxi.br\0imari.saga.jp\0"
-"paragliding.aero\0"
-"firm.nf\0"
-"firm.ng\0"
-"firestone\0"
-"\xe6\x94\xbf\xe5\x8a\xa1\0"
-"sap\0"
-"yamagata.gifu.jp\0skj\xc3\xa5k.no\0sas\0"
-"like\0"
-"sbi\0"
-"nakanoto.ishikawa.jp\0viajes\0"
-"gyeonggi.kr\0"
-"amot.no\0solar\0co.events\0"
-"theworkpc.com\0"
-"higashisumiyoshi.osaka.jp\0smile\0"
-"sca\0"
-"shimogo.fukushima.jp\0cpa.pro\0scb\0"
-"sbs\0"
-"agro.pl\0"
-"qsl.br\0"
-"kurogi.fukuoka.jp\0"
-"shopitsite.com\0"
-"weir\0"
-"environment.museum\0store.ve\0"
-"servequake.com\0"
-"fortworth.museum\0"
-"alesund.no\0"
-"trading\0pony.club\0"
-"miyoshi.tokushima.jp\0principe.st\0from-me.org\0"
-"is-a-musician.com\0"
-"alvdal.no\0"
-"\xe7\xbd\x91\xe7\xb5\xa1.hk\0matsushige.tokushima.jp\0"
-"te.it\0limo\0"
-"cooperativa.bo\0"
-"kochi.kochi.jp\0b\xc3\xb8.telemark.no\0"
-"ravendb.me\0"
-"paleo.museum\0mutual\0"
-"kommune.no\0"
-"johana.toyama.jp\0"
-"jur.pro\0"
-"novara.it\0link\0"
-"run\0""1337.pictures\0"
-"forl\xc3\xac-cesena.it\0sokndal.no\0"
-"fujixerox\0"
-"toyohashi.aichi.jp\0"
-"ses\0"
-"takayama.gifu.jp\0"
-"sew\0"
-"sex\0"
-"okutama.tokyo.jp\0"
-"omaha.museum\0"
-"kodaira.tokyo.jp\0kinder\0sfr\0"
-"e.bg\0"
-"rwe\0"
-"kasuga.hyogo.jp\0erni\0"
-"zj.cn\0cheltenham.museum\0"
-"gyeongbuk.kr\0"
-"polkowice.pl\0"
-"dyndns.biz\0"
-"mill.museum\0ivano-frankivsk.ua\0network\0"
-"kawatana.nagasaki.jp\0"
-"store.ro\0nyc.mn\0"
-"kvitsoy.no\0"
-"omachi.nagano.jp\0isa-geek.org\0"
-"makinohara.shizuoka.jp\0hamaroy.no\0"
-"tecnologia.bo\0giessen.museum\0"
-"izunokuni.shizuoka.jp\0fl.us\0"
-"pilot.aero\0"
-"stada\0"
-"hyundai\0"
-"gx.cn\0is-a-geek.org\0"
-"shiranuka.hokkaido.jp\0vestby.no\0"
-"mito.ibaraki.jp\0theatre\0app.render.com\0"
-"aquila.it\0lib.ok.us\0"
-"store.st\0ens.tn\0spdns.eu\0"
-"missile.museum\0"
-"barletta-trani-andria.it\0"
-"jobs.tt\0\xe6\x9b\xb8\xe7\xb1\x8d\0"
-"misawa.aomori.jp\0"
-"ibaraki.ibaraki.jp\0oi.kanagawa.jp\0"
-"eti.br\0oirase.aomori.jp\0paroch.k12.ma.us\0guge\0"
-"shirosato.ibaraki.jp\0"
-"pharmacien.fr\0"
-"blogspot.vn\0"
-"furubira.hokkaido.jp\0"
-"santabarbara.museum\0"
-"mielec.pl\0"
-"aaa.pro\0"
-"jewelry\0"
-"ski\0"
-"\xe6\x9d\xb1\xe4\xba\xac.jp\0avocat.pro\0safe\0"
-"travelers\0"
-"kamiichi.toyama.jp\0"
-"info.gu\0"
-"kitahiroshima.hokkaido.jp\0"
-"hakodate.hokkaido.jp\0"
-"mw.gov.pl\0nadex\0dnsupdater.de\0"
-"sky\0"
-"kiyose.tokyo.jp\0"
-"seranishi.hiroshima.jp\0freemasonry.museum\0"
-"info.ht\0university.museum\0"
-"info.hu\0griw.gov.pl\0\xe0\xb8\xa8\xe0\xb8\xb6\xe0\xb8\x81\xe0\xb8\xa9\xe0\xb8\xb2.\xe0\xb9\x84\xe0\xb8\x97\xe0\xb8\xa2\0"
-"works.aero\0"
-"lib.ee\0k12.ne.us\0kindle\0"
-"stor-elvdal.no\0live\0"
-"konyvelo.hu\0drobak.no\0beep.pl\0"
-"istanbul\0"
-"sanfrancisco.museum\0"
-"kuji.iwate.jp\0hayashima.okayama.jp\0"
-"miura.kanagawa.jp\0"
-"suzuka.mie.jp\0mine.nu\0"
-"info.et\0koga.fukuoka.jp\0singles\0"
-"mattel\0vistaprint\0"
-"blogspot.re\0"
-"mizusawa.iwate.jp\0"
-"vda.it\0bnr.la\0"
-"t.se\0"
-"alessandria.it\0"
-"hotels\0blogspot.ro\0"
-"ms.gov.br\0"
-"gamo.shiga.jp\0onrender.com\0"
-"minamiawaji.hyogo.jp\0*.triton.zone\0pgfog.com\0"
-"sor-varanger.no\0is-an-entertainer.com\0blogspot.rs\0"
-"maizuru.kyoto.jp\0blogspot.ru\0blogspot.se\0"
-"kr.it\0ovre-eiker.no\0"
-"blogspot.sg\0"
-"trentino-sud-tirol.it\0netflix\0"
-"blogspot.si\0"
-"blogspot.sk\0spdns.de\0"
-"*.transurl.be\0"
-"\xe5\xa5\x88\xe8\x89\xaf.jp\0yaotsu.gifu.jp\0flatanger.no\0schmidt\0"
-"skiptvet.no\0blogspot.sn\0"
-"te.ua\0"
-"shell.museum\0"
-"help\0kaluga.su\0"
-"palermo.it\0portland.museum\0spa\0"
-"hirogawa.wakayama.jp\0blogspot.td\0"
-"hiroshima.jp\0info.cx\0"
-"yk.ca\0web.app\0"
-"co.ae\0"
-"soy\0"
-"co.ag\0aver\xc3\xb8y.no\0"
-"higashiizu.shizuoka.jp\0"
-"download\0"
-"urawa.saitama.jp\0doomdns.org\0krasnik.pl\0"
-"mt.gov.br\0info.ec\0"
-"\xe7\xb6\xb2\xe7\xb5\xa1.cn\0ad.jp\0"
-"co.am\0"
-"co.ao\0tab\0"
-"adm.br\0freedesktop.org\0"
-"chigasaki.kanagawa.jp\0cieszyn.pl\0"
-"co.bb\0blogspot.tw\0blogspot.ug\0"
-"co.at\0"
-"ma.us\0sale\0"
-"co.bi\0sekigahara.gifu.jp\0"
-"info.bb\0fukushima.fukushima.jp\0"
-"higashiyodogawa.osaka.jp\0"
-"info.at\0"
-"info.au\0blogspot.mr\0"
-"joyo.kyoto.jp\0co.bn\0"
-"nm.cn\0os.hordaland.no\0alwaysdata.net\0"
-"temasek\0"
-"nrw.museum\0sande.m\xc3\xb8re-og-romsdal.no\0co.ca\0"
-"info.az\0moriyoshi.akita.jp\0"
-"togitsu.nagasaki.jp\0blogspot.mx\0"
-"js.cn\0blogspot.my\0"
-"nagoya\0tax\0is-a-celticsfan.org\0"
-"as.us\0"
-"info.bo\0co.bw\0blogspot.nl\0"
-"webhop.biz\0"
-"co.ci\0belluno.it\0shiiba.miyazaki.jp\0srl\0"
-"kawajima.saitama.jp\0blogspot.no\0"
-"co.cl\0agrar.hu\0naturalhistory.museum\0"
-"co.cm\0assn.lk\0"
-"lib.nh.us\0\xd0\xbe\xd1\x80\xd0\xb3.\xd1\x81\xd1\x80\xd0\xb1\0"
-"from-mo.com\0"
-"vall\xc3\xa9""edaoste.it\0srt\0"
-"co.cr\0sf.no\0b\xc3\xa1hcavuotna.no\0"
-"scrapper-site.net\0"
-"kihoku.ehime.jp\0s\xc3\xb8gne.no\0"
-"tajiri.osaka.jp\0tci\0"
-"info.co\0ol.no\0marriott\0*.transurl.eu\0"
-"yuki.ibaraki.jp\0endoftheinternet.org\0"
-"drangedal.no\0co.cz\0"
-"co.dk\0"
-"wakasa.fukui.jp\0"
-"pohl\0"
-"stc\0blogspot.pe\0"
-"us.eu.org\0"
-"barclaycard\0"
-"herokuapp.com\0"
-"hitra.no\0"
-"carrier.museum\0tdk\0dyndns-free.com\0"
-"axis.museum\0"
-"ac.gov.br\0pimienta.org\0"
-"kawagoe.mie.jp\0"
-"clinique\0blogspot.qa\0"
-"blogspot.pt\0"
-"here\0"
-"\xe7\xb6\xb2\xe7\xb5\xa1.hk\0tel\0isa-geek.com\0"
-"cam.it\0workers.dev\0"
-"groundhandling.aero\0"
-"blogspot.is\0"
-"wnext.app\0blogspot.it\0"
-"marylhurst.museum\0"
-"guru\0"
-"bjugn.no\0"
-"pueblo.bo\0"
-"gallery.museum\0k12.pr.us\0"
-"co.gg\0"
-"yokote.akita.jp\0soundandvision.museum\0"
-"blogspot.jp\0cust.dev.thingdust.io\0"
-"co.gl\0farmstead.museum\0"
-"store.bb\0"
-"is-a-student.com\0"
-"co.gy\0toyama.jp\0n\xc3\xa1vuotna.no\0nore-og-uvdal.no\0"
-"hadsel.no\0supply\0"
-"va.it\0"
-"culturalcenter.museum\0"
-"hatsukaichi.hiroshima.jp\0restaurant\0blogspot.kr\0"
-"sarl\0"
-"e.se\0from-mi.com\0"
-"rg.it\0"
-"thd\0fr.eu.org\0"
-"ninja\0"
-"kristiansund.no\0"
-"co.id\0blogspot.li\0development.run\0"
-"co.hu\0pagespeedmobilizer.com\0"
-"bmd.br\0b\xc3\xa6rum.no\0maserati\0"
-"off.ai\0cranbrook.museum\0"
-"date.fukushima.jp\0"
-"bhz.br\0nishikata.tochigi.jp\0"
-"co.il\0"
-"co.im\0"
-"co.in\0"
-"blogspot.lt\0blogspot.md\0"
-"blogspot.lu\0"
-"bridgestone\0"
-"co.ir\0nakanojo.gunma.jp\0"
-"co.it\0rv.ua\0"
-"co.je\0"
-"blogspot.mk\0"
-"shinshinotsu.hokkaido.jp\0travel\0\xd0\xba\xd0\xbe\xd0\xbc\0cleverapps.io\0"
-"kamifurano.hokkaido.jp\0"
-"kamikawa.hokkaido.jp\0"
-"pesaro-urbino.it\0"
-"store.dk\0"
-"it.ao\0kr.ua\0"
-"hole.no\0czeladz.pl\0"
-"co.jp\0"
-"laspezia.it\0sakae.nagano.jp\0"
-"tennis\0"
-"blogspot.fi\0"
-"pol.dz\0co.ke\0"
-"shinshiro.aichi.jp\0"
-"gru.br\0"
-"artdeco.museum\0dn.ua\0"
-"oppegard.no\0"
-"\xd9\x83\xd8\xa7\xd8\xab\xd9\x88\xd9\x84\xd9\x8a\xd9\x83\0"
-"kurume.fukuoka.jp\0creation.museum\0homeunix.net\0blogspot.fr\0"
-"!city.nagoya.jp\0mansion.museum\0"
-"uppo.gov.pl\0"
-"co.kr\0"
-"qh.cn\0co.lc\0"
-"tjx\0"
-"rzgw.gov.pl\0save\0"
-"suita.osaka.jp\0"
-"kudamatsu.yamaguchi.jp\0global.ssl.fastly.net\0"
-"vestv\xc3\xa5g\xc3\xb8y.no\0"
-"blogspot.gr\0"
-"*.transurl.nl\0"
-"sanjo.niigata.jp\0guardian\0"
-"co.ma\0"
-"fj.cn\0endofinternet.net\0"
-"co.ls\0"
-"co.me\0barsy.me\0"
-"watch-and-clock.museum\0va.no\0blogspot.hk\0"
-"co.mg\0granvin.no\0lib.mi.us\0"
-"union.aero\0hakone.kanagawa.jp\0co.technology\0"
-"rovigo.it\0"
-"hasvik.no\0"
-"taito.tokyo.jp\0blogspot.hr\0"
-"blogspot.hu\0blogspot.ie\0"
-"vic.gov.au\0co.na\0"
-"omura.nagasaki.jp\0"
-"elblag.pl\0"
-"co.mu\0"
-"co.mw\0"
-"lima-city.de\0"
-"co.ni\0blogspot.in\0"
-"co.mz\0"
-"yamanakako.yamanashi.jp\0in-berlin.de\0"
-"saku.nagano.jp\0co.nl\0blogspot.ba\0"
-"hattfjelldal.no\0info.ve\0"
-"pol.ht\0porn\0co.no\0"
-"insurance\0blogspot.be\0"
-"research.aero\0saxo\0swatch\0"
-"aosta.it\0rifu.miyagi.jp\0\xd8\xa8\xda\xbe\xd8\xa7\xd8\xb1\xd8\xaa\0blogspot.bg\0"
-"okayama.jp\0"
-"blogspot.bj\0"
-"transporte.bo\0info.vn\0*.magentosite.cloud\0"
-"kawagoe.saitama.jp\0"
-"co.nz\0"
-"blogspot.ca\0"
-"co.om\0"
-"vantaa.museum\0"
-"weibo\0blogspot.cf\0"
-"fujiyoshida.yamanashi.jp\0nishikatsura.yamanashi.jp\0"
-"kuwana.mie.jp\0blogspot.ch\0"
-"monzaebrianza.it\0post\0"
-"rishirifuji.hokkaido.jp\0yufu.oita.jp\0blogspot.cl\0lima-city.at\0"
-"monzabrianza.it\0repl.co\0"
-"avellino.it\0b\xc3\xa1jddar.no\0"
-"co.pl\0"
-"top\0"
-"co.pn\0"
-"shirako.chiba.jp\0"
-"blogspot.de\0"
-"panasonic\0blogspot.cv\0"
-"cc.ri.us\0"
-"wakkanai.hokkaido.jp\0omitama.ibaraki.jp\0blogspot.cz\0"
-"cng.br\0info.tn\0blogspot.dk\0"
-"co.pw\0"
-"info.tr\0"
-"lima-city.ch\0"
-"info.tt\0"
-"shiga.jp\0dodge\0"
-"konan.aichi.jp\0"
-"symantec\0"
-"elburg.museum\0"
-"nanmoku.gunma.jp\0info.tz\0"
-"i234.me\0"
-"tr.it\0!city.kitakyushu.jp\0"
-"kraanghke.no\0"
-"nasushiobara.tochigi.jp\0university\0"
-"jinsekikogen.hiroshima.jp\0broadway\0tube\0"
-"takatori.nara.jp\0yahiko.niigata.jp\0okinoshima.shimane.jp\0"
-"fujisawa.kanagawa.jp\0cloudfunctions.net\0"
-"curitiba.br\0"
-"mn.it\0filegear.me\0"
-"chrysler\0"
-"yomitan.okinawa.jp\0co.rs\0"
-"sells-for-u.com\0"
-"vang.no\0"
-"info.ro\0co.rw\0"
-"fresenius\0"
-"filatelia.museum\0olsztyn.pl\0info.sd\0data\0"
-"snaase.no\0nhlfan.net\0"
-"date\0ubs\0"
-"trv\0"
-"co.st\0"
-"barsy.online\0"
-"inagi.tokyo.jp\0"
-"r.bg\0"
-"co.th\0"
-"dentist\0"
-"co.sz\0co.tj\0va.us\0cloud66.zone\0"
-"tc.br\0"
-"8.bg\0"
-"iwi.nz\0co.tm\0"
-"mansions.museum\0lefrak\0"
-"co.ua\0"
-"hobol.no\0info.pk\0\xd8\xa8\xd8\xa7\xd8\xb2\xd8\xa7\xd8\xb1\0"
-"mar.it\0info.pl\0co.tt\0nm.us\0pcloud.host\0"
-"balsfjord.no\0co.ug\0"
-"abruzzo.it\0"
-"info.pr\0co.tz\0"
-"co.uk\0barsy.uk\0"
-"legal\0"
-"is-a-geek.net\0"
-"maritimo.museum\0living\0"
-"blogspot.ae\0"
-"protection\0"
-"co.us\0"
-"\xe7\xa5\x9e\xe5\xa5\x88\xe5\xb7\x9d.jp\0"
-"cci.fr\0co.ve\0"
-"yamanobe.yamagata.jp\0tui\0"
-"blogspot.al\0"
-"blogspot.am\0"
-"fot.br\0info.na\0co.vi\0"
-"co.uz\0"
-"is-a-anarchist.com\0fastvps-server.com\0"
-"ddr.museum\0info.mv\0info.nf\0"
-"aerodrome.aero\0tr.no\0"
-"info.ni\0is-very-nice.org\0"
-"\xe6\x95\x99\xe8\x82\xb2.hk\0ralingen.no\0"
-"ogano.saitama.jp\0"
-"dh.bytemark.co.uk\0"
-"al.gov.br\0info.nr\0"
-"omiya.saitama.jp\0yoshikawa.saitama.jp\0"
-"zlg.br\0"
-"chichibu.saitama.jp\0"
-"tvs\0"
-"ae.org\0goip.de\0"
-"veg\xc3\xa5rshei.no\0"
-"artsandcrafts.museum\0bayern\0"
-"vagan.no\0education\0"
-"is-a-bookkeeper.com\0"
-"friuliveneziagiulia.it\0info.la\0"
-"other.nf\0"
-"folkebibl.no\0"
-"niimi.okayama.jp\0"
-"ayase.kanagawa.jp\0"
-"minamisanriku.miyagi.jp\0"
-"gok.pk\0"
-"daejeon.kr\0is-very-evil.org\0"
-"xfinity\0"
-"gorlice.pl\0"
-"info.ls\0"
-"mydissent.net\0"
-"myphotos.cc\0"
-"nakatsugawa.gifu.jp\0"
-"\xe7\x8f\xa0\xe5\xae\x9d\0is-slick.com\0"
-"co.za\0"
-"bolzano-altoadige.it\0"
-"gonohe.aomori.jp\0"
-"d\xc3\xb8nna.no\0"
-"lakas.hu\0"
-"ui.nabu.casa\0"
-"arte.bo\0gifu.jp\0pol.tr\0co.zm\0"
-"kui.hiroshima.jp\0travelchannel\0hu.com\0"
-"from-md.com\0"
-"yasuda.kochi.jp\0kvanangen.no\0global\0"
-"cog.mi.us\0"
-"co.zw\0"
-"cc.fl.us\0social\0"
-"uy.com\0"
-"k12.al.us\0"
-"ss.it\0info.ke\0"
-"furudono.fukushima.jp\0se.net\0ru.net\0"
-"rennesoy.no\0"
-"info.ki\0"
-"pi.it\0"
-"yoshida.shizuoka.jp\0"
-"boston.museum\0tynset.no\0gallup\0"
-"calabria.it\0"
-"tokushima.tokushima.jp\0niepce.museum\0"
-"lo.it\0"
-"clock.museum\0"
-"l\xc3\xa6rdal.no\0"
-"misato.shimane.jp\0"
-"frog.museum\0"
-"sakura.tochigi.jp\0\xe0\xae\x87\xe0\xae\xa8\xe0\xaf\x8d\xe0\xae\xa4\xe0\xae\xbf\xe0\xae\xaf\xe0\xae\xbe\0isa-geek.net\0"
-"kita.kyoto.jp\0"
-"togakushi.nagano.jp\0hamatama.saga.jp\0tranoy.no\0"
-"kagamiishi.fukushima.jp\0"
-"aq.it\0ba.it\0"
-"brunel.museum\0"
-"whoswho\0"
-"skodje.no\0ipifony.net\0my-vigor.de\0"
-"saijo.ehime.jp\0dali.museum\0"
-"collection.museum\0gotdns.com\0"
-"minami.fukuoka.jp\0"
-"gv.ao\0c.bg\0"
-"campinas.br\0oy.lc\0"
-"gv.at\0"
-"tsk.tr\0capetown\0"
-"shisui.chiba.jp\0\xe6\xb7\xa1\xe9\xa9\xac\xe9\x94\xa1\0"
-"privatizehealthinsurance.net\0"
-"mn.us\0"
-"usarts.museum\0"
-"sd.cn\0*.s5y.io\0"
-"servehttp.com\0"
-"trading.aero\0"
-"l\xc3\xb8ten.no\0*.on-rio.io\0"
-"emr.it\0"
-"baltimore.museum\0"
-"mitaka.tokyo.jp\0"
-"asaminami.hiroshima.jp\0lib.vi.us\0u2-local.xnbay.com\0"
-"b\xc3\xa5tsfjord.no\0vm.bytemark.co.uk\0"
-"ab.ca\0sumita.iwate.jp\0uno\0"
-"olkusz.pl\0archi\0"
-"yahoo\0"
-"sar.it\0haga.tochigi.jp\0castres.museum\0"
-"is-into-cartoons.com\0"
-"trentins\xc3\xbc""d-tirol.it\0"
-"belem.br\0otoyo.kochi.jp\0salangen.no\0hopto.me\0"
-"yoka.hyogo.jp\0"
-"l\xc3\xb8""dingen.no\0"
-"kawahara.tottori.jp\0embroidery.museum\0marnardal.no\0uol\0"
-"omega\0"
-"lierne.no\0"
-"lib.ga.us\0tec.ve\0"
-"friuli-venezia-giulia.it\0"
-"karatsu.saga.jp\0"
-"pesarourbino.it\0"
-"isla.pr\0"
-"b\xc3\xa1l\xc3\xa1t.no\0"
-"otaki.saitama.jp\0elvendrell.museum\0"
-"tokai.ibaraki.jp\0"
-"wajima.ishikawa.jp\0"
-"ups\0co.education\0"
-"shimokitayama.nara.jp\0abo.pa\0"
-"transport.museum\0"
-"est-le-patron.com\0"
-"family.museum\0eurovision\0"
-"giehtavuoatna.no\0bci.dnstrace.pro\0barsy.bg\0"
-"cn.com\0"
-"jelenia-gora.pl\0"
-"sirdal.no\0"
-"ringsaker.no\0"
-"\xe5\xae\xae\xe5\x9f\x8e.jp\0"
-"abkhazia.su\0"
-"ascoli-piceno.it\0"
-"rio.br\0\xd9\xbe\xd8\xa7\xda\xa9\xd8\xb3\xd8\xaa\xd8\xa7\xd9\x86\0"
-"pmn.it\0jeonnam.kr\0barsy.ca\0"
-"educator.aero\0higashiomi.shiga.jp\0"
-"asahi.ibaraki.jp\0ota.tokyo.jp\0"
-"\xe5\xaf\x8c\xe5\xb1\xb1.jp\0"
-"tempio-olbia.it\0security\0meteorapp.com\0"
-"hagi.yamaguchi.jp\0debian.net\0dnsdojo.org\0"
-"s\xc3\xa1lat.no\0"
-"lezajsk.pl\0"
-"k12.ms.us\0k12.nc.us\0"
-"higashichichibu.saitama.jp\0bahcavuotna.no\0"
-"poivron.org\0"
-"sel.no\0barsy.de\0"
-"verona.it\0vadso.no\0"
-"from-al.com\0"
-"roros.no\0cc.ma.us\0"
-"herad.no\0"
-"parachuting.aero\0"
-"semine.miyagi.jp\0"
-"tsukumi.oita.jp\0"
-"mc.eu.org\0"
-"jab.br\0r.se\0blogdns.org\0"
-"lukow.pl\0"
-"cc.as.us\0"
-"yamagata.nagano.jp\0lilly\0"
-"web.bo\0"
-"\xd0\xbc\xd0\xba\xd0\xb4\0"
-"publ.pt\0"
-"kiho.mie.jp\0"
-"andriabarlettatrani.it\0livorno.it\0scor\0\xe9\xa3\x9f\xe5\x93\x81\0"
-"barsy.eu\0"
-"scot\0official.academy\0"
-"philadelphia.museum\0strand.no\0"
-"ong.br\0parliament.nz\0"
-"web.co\0askvoll.no\0"
-"convent.museum\0"
-"vet\0"
-"\xe4\xbd\x9b\xe5\xb1\xb1\0lt.eu.org\0"
-"serveftp.com\0xs4all.space\0"
-"gran.no\0"
-"yuza.yamagata.jp\0"
-"telefonica\0square7.net\0lima.zone\0"
-"association.aero\0tachiarai.fukuoka.jp\0c.la\0"
-"tajimi.gifu.jp\0"
-"web.do\0"
-"*.landing.myjino.ru\0"
-"homeunix.org\0"
-"adult\0observer\0"
-"ukiha.fukuoka.jp\0gs.sf.no\0enebakk.no\0"
-"yamato.fukushima.jp\0"
-"gs.ol.no\0",
-
-"is-a-libertarian.com\0"
-"boats\0"
-"guam.gu\0charity\0"
-"ing.pa\0"
-"baby\0hgtv\0"
-"suifu.ibaraki.jp\0"
-"journal.aero\0wiih.gov.pl\0"
-"fjaler.no\0tolga.no\0"
-"anamizu.ishikawa.jp\0"
-"lib.nj.us\0"
-"fidelity\0barsy.in\0"
-"barsy.io\0"
-"froland.no\0"
-"juif.museum\0mymailer.com.tw\0"
-"nikaho.akita.jp\0kayabe.hokkaido.jp\0vig\0"
-"yonabaru.okinawa.jp\0"
-"waw.pl\0"
-"barclays\0"
-"cagliari.it\0\xd0\xbc\xd0\xbe\xd0\xbd\0"
-"*.futurecms.at\0"
-"vin\0"
-"tselinograd.su\0"
-"vip\0"
-"tanabe.kyoto.jp\0naumburg.museum\0loab\xc3\xa1t.no\0"
-"es.eu.org\0servehumour.com\0"
-"web.gu\0"
-"pub.sa\0"
-"santoandre.br\0info.zm\0"
-"kanegasaki.iwate.jp\0claims\0"
-"takanezawa.tochigi.jp\0uk.net\0"
-"sowa.ibaraki.jp\0aid.pl\0"
-"higashiyamato.tokyo.jp\0"
-"web.id\0fortmissoula.museum\0manx.museum\0"
-"sanofi\0"
-"saobernardo.br\0casino.hu\0foggia.it\0dclk\0"
-"indianmarket.museum\0"
-"rahkkeravju.no\0"
-"shiwa.iwate.jp\0"
-"mochizuki.nagano.jp\0servebbs.net\0"
-"nagaoka.niigata.jp\0"
-"songdalen.no\0storfjord.no\0"
-"rsvp\0"
-"s3.us-east-2.amazonaws.com\0"
-"decorativearts.museum\0ufcfan.org\0"
-"samsung\0is-into-games.com\0"
-"astronomy.museum\0dyn-ip24.de\0"
-"iwata.shizuoka.jp\0"
-"koto.shiga.jp\0"
-"cnt.br\0vanylven.no\0"
-"slask.pl\0"
-"tuscany.it\0build\0"
-"sor-odal.no\0"
-"ebiz.tw\0"
-"handson.museum\0"
-"meiwa.gunma.jp\0homes\0"
-"ogawa.saitama.jp\0"
-"c.se\0"
-"re.it\0nogi.tochigi.jp\0"
-"honbetsu.hokkaido.jp\0mortgage\0"
-"kamo.niigata.jp\0web.lk\0"
-"elverum.no\0"
-"synology-diskstation.de\0"
-"mihara.kochi.jp\0"
-"tsubata.ishikawa.jp\0ma.leg.br\0"
-"stjohn.museum\0vn.ua\0"
-"cruise\0"
-"stjordalshalsen.no\0"
-"tokuyama.yamaguchi.jp\0"
-"nakayama.yamagata.jp\0wien\0"
-"nfshost.com\0"
-"museum\0"
-"sakegawa.yamagata.jp\0"
-"valdaosta.it\0"
-"re.kr\0"
-"sytes.net\0"
-"nara.nara.jp\0"
-"miniserver.com\0"
-"trentin-suedtirol.it\0web.nf\0"
-"trentino-s\xc3\xbc""d-tirol.it\0public.museum\0gausdal.no\0sd.us\0endofinternet.org\0github.io\0"
-"web.ni\0"
-"xj.cn\0gs.va.no\0"
-"nowaruda.pl\0"
-"pacific.museum\0"
-"\xc3\xa1laheadju.no\0"
-"mizunami.gifu.jp\0"
-"fortal.br\0sugito.saitama.jp\0"
-"mazury.pl\0gv.vc\0"
-"aukra.no\0from-pa.com\0"
-"zao.miyagi.jp\0fuchu.tokyo.jp\0"
-"funabashi.chiba.jp\0"
-"revista.bo\0lillesand.no\0"
-"nowtv\0"
-"ngrok.io\0"
-"jerusalem.museum\0"
-"safety\0"
-"and\xc3\xb8y.no\0lib.pa.us\0abbvie\0"
-"yamaxun\0familyds.net\0"
-"tokamachi.niigata.jp\0"
-"chuo.fukuoka.jp\0anan.nagano.jp\0agrinet.tn\0"
-"safety.aero\0web.pk\0plo.ps\0"
-"shimonoseki.yamaguchi.jp\0"
-"motoyama.kochi.jp\0blackbaudcdn.net\0is-a-techie.com\0"
-"alaheadju.no\0ipiranga\0"
-"band\0"
-"konskowola.pl\0vpnplus.to\0"
-"figueres.museum\0"
-"nesset.no\0"
-"lancashire.museum\0"
-"mymediapc.net\0"
-"bank\0"
-"vestvagoy.no\0"
-"sjc.br\0chintai\0in-dsl.de\0dvrcam.info\0rackmaze.com\0"
-"mus.mi.us\0"
-"sanok.pl\0"
-"defense.tn\0"
-"ishikawa.okinawa.jp\0"
-"*.kobe.jp\0otsuchi.iwate.jp\0ishigaki.okinawa.jp\0"
-"mk.eu.org\0"
-"bieszczady.pl\0hobby-site.org\0"
-"kunohe.iwate.jp\0"
-"tcp4.me\0"
-"dynamic-dns.info\0"
-"wiki\0"
-"s\xc3\xb8rfold.no\0ugim.gov.pl\0balena-devices.com\0"
-"wed\0"
-"niki.hokkaido.jp\0"
-"fitjar.no\0gotdns.ch\0"
-"lelux.site\0"
-"kakuda.miyagi.jp\0"
-"cc.va.us\0arab\0"
-"landes.museum\0associates\0"
-"ferrari\0"
-"lucca.it\0fi.eu.org\0"
-"florence.it\0cc.nm.us\0"
-"int.ar\0trust.museum\0"
-"web.tj\0"
-"iglesias-carbonia.it\0"
-"birthplace.museum\0"
-"southcarolina.museum\0"
-"hanggliding.aero\0int.az\0"
-"web.tr\0nflfan.org\0"
-"tp.it\0psp.gov.pl\0"
-"int.bo\0yabuki.fukushima.jp\0"
-"cc.co.us\0"
-"riik.ee\0seat\0"
-"uslivinghistory.museum\0"
-"pv.it\0ericsson\0gallo\0"
-"wine\0"
-"nagahama.shiga.jp\0austrheim.no\0bbs.tr\0"
-"shimoichi.nara.jp\0realestate.pl\0"
-"higashine.yamagata.jp\0"
-"int.ci\0oarai.ibaraki.jp\0"
-"lu.eu.org\0me.eu.org\0"
-"web.ve\0blogspot.co.at\0"
-"int.co\0lasalle\0ashgabad.su\0"
-"shirakawa.fukushima.jp\0"
-"kahoku.ishikawa.jp\0synology-ds.de\0"
-"ato.br\0"
-"bn.it\0"
-"vaga.no\0"
-"swidnica.pl\0"
-"gives\0vodka\0"
-"uchinomi.kagawa.jp\0"
-"p.bg\0"
-"verm\xc3\xb6gensberatung\0"
-"lotte\0"
-"6.bg\0saitama.saitama.jp\0abudhabi\0win\0"
-"l\xc3\xa4ns.museum\0"
-"deporte.bo\0"
-"gs.tr.no\0"
-"lv.eu.org\0"
-"evenassi.no\0"
-"minoh.osaka.jp\0lotto\0"
-"prod\0"
-"london.cloudapps.digital\0"
-"prof\0"
-"idrett.no\0"
-"seek\0"
-"ggf.br\0juegos\0"
-"s3.eu-west-2.amazonaws.com\0"
-"tochio.niigata.jp\0"
-"lib.sd.us\0*.stolos.io\0"
-"journalist.aero\0linde\0"
-"honda\0"
-"kamioka.akita.jp\0co.place\0"
-"web.za\0"
-"s3-eu-west-1.amazonaws.com\0"
-"fribourg.museum\0"
-"ballooning.aero\0"
-"yaizu.shizuoka.jp\0"
-"natuurwetenschappen.museum\0"
-"ishikawa.fukushima.jp\0hikone.shiga.jp\0"
-"emp.br\0\xe6\x95\x8e\xe8\x82\xb2.hk\0"
-"wme\0"
-"rokunohe.aomori.jp\0north.museum\0*.statics.cloud\0loginline.site\0"
-"muncie.museum\0"
-"potenza.it\0"
-"inderoy.no\0"
-"ruhr\0"
-"parti.se\0\xe5\xb7\xa5\xe8\xa1\x8c\0dy.fi\0"
-"dnsdojo.net\0"
-"int.is\0"
-"hapmir.no\0"
-"qld.au\0"
-"idf.il\0inami.wakayama.jp\0colonialwilliamsburg.museum\0graz.museum\0"
-"wios.gov.pl\0blogspot.co.id\0"
-"skoczow.pl\0"
-"riobranco.br\0barrell-of-knowledge.info\0"
-"trust\0"
-"yakumo.hokkaido.jp\0"
-"storage\0"
-"taketa.oita.jp\0"
-"swiftcover\0blogspot.co.il\0"
-"\xe7\xa7\x8b\xe7\x94\xb0.jp\0"
-"sondrio.it\0isshiki.aichi.jp\0kosher\0"
-"cc.mn.us\0"
-"overhalla.no\0"
-"ham-radio-op.net\0"
-"wow\0"
-"int.la\0k12.ct.us\0"
-"deal\0"
-"zaporizhzhe.ua\0giize.com\0flt.cloud.muni.cz\0"
-"airbus\0"
-"ta.it\0games\0"
-"maritime.museum\0"
-"int.lk\0"
-"pg.it\0group\0"
-"is-a-knight.org\0"
-"midatlantic.museum\0"
-"kutchan.hokkaido.jp\0"
-"fh.se\0"
-"barsy.co.uk\0"
-"nishi.fukuoka.jp\0"
-"dazaifu.fukuoka.jp\0"
-"from.hr\0"
-"lapy.pl\0"
-"mosjoen.no\0tysnes.no\0lundbeck\0"
-"my-gateway.de\0"
-"kr.eu.org\0"
-"sport.hu\0"
-"takatsuki.osaka.jp\0bananarepublic\0"
-"ao.it\0oldnavy\0"
-"andriatranibarletta.it\0"
-"\xe9\xa4\x90\xe5\x8e\x85\0"
-"ustka.pl\0"
-"*.elb.amazonaws.com.cn\0"
-"parliament.cy\0asti.it\0int.mv\0"
-"int.mw\0\xd9\x82\xd8\xb7\xd8\xb1\0"
-"naples.it\0int.ni\0"
-"a.bg\0"
-"army\0"
-"h\xc3\xb8yanger.no\0"
-"tokushima.jp\0"
-"hs.kr\0"
-"chieti.it\0"
-"from-co.net\0"
-"fylkesbibl.no\0"
-"saarland\0space\0"
-"wtc\0"
-"koriyama.fukushima.jp\0wtf\0"
-"nx.cn\0"
-"now-dns.net\0"
-"dyndns.info\0"
-"amusement.aero\0"
-"pittsburgh.museum\0"
-"arpa\0"
-"karuizawa.nagano.jp\0porsangu.no\0"
-"matsuzaki.shizuoka.jp\0"
-"recife.br\0"
-"azurecontainer.io\0"
-"walmart\0"
-"navigation.aero\0lib.mo.us\0politie\0"
-"shibuya.tokyo.jp\0"
-"nagareyama.chiba.jp\0higashishirakawa.gifu.jp\0kwp.gov.pl\0"
-"gaular.no\0"
-"\xd8\xa7\xd9\x8a\xd8\xb1\xd8\xa7\xd9\x86.ir\0annefrank.museum\0"
-"int.pt\0"
-"svelvik.no\0"
-"aizuwakamatsu.fukushima.jp\0"
-"forumz.info\0"
-"cargo.aero\0"
-"wake.okayama.jp\0railway.museum\0rnu.tn\0"
-"minato.tokyo.jp\0"
-"wakuya.miyagi.jp\0"
-"watchandclock.museum\0"
-"kami.miyagi.jp\0f\xc3\xb8rde.no\0karlsoy.no\0merseine.nu\0"
-"fukuroi.shizuoka.jp\0"
-"tingvoll.no\0"
-"oharu.aichi.jp\0mo-i-rana.no\0"
-"m\xc3\xa1tta-v\xc3\xa1rjjat.no\0demon.nl\0"
-"yono.saitama.jp\0online.museum\0\xe5\x85\xac\xe5\x8f\xb8.\xe9\xa6\x99\xe6\xb8\xaf\0"
-"bearalvahki.no\0"
-"movimiento.bo\0kumejima.okinawa.jp\0"
-"vaksdal.no\0"
-"dyndns-work.com\0"
-"komae.tokyo.jp\0"
-"int.ru\0camdvr.org\0"
-"dedyn.io\0"
-"tokigawa.saitama.jp\0nyny.museum\0quebec\0"
-"imperia.it\0kujukuri.chiba.jp\0"
-"noda.iwate.jp\0blogdns.net\0webredirect.org\0"
-"accountants\0"
-"!city.sapporo.jp\0"
-"kamishihoro.hokkaido.jp\0"
-"asda\0gucci\0"
-"loan\0"
-"int.tj\0arte\0flickr\0"
-"moscow.museum\0"
-"beauty\0"
-"online\0"
-"takayama.nagano.jp\0"
-"kasaoka.okayama.jp\0"
-"oyodo.nara.jp\0"
-"treviso.it\0"
-"int.tt\0"
-"\xe7\xa6\x8f\xe5\xb2\xa1.jp\0xin\0"
-"noticias.bo\0ilovecollege.info\0"
-"kustanai.ru\0"
-"taiki.hokkaido.jp\0"
-"ppg.br\0clan.rip\0"
-"p.se\0"
-"umi.fukuoka.jp\0*.sensiosite.cloud\0"
-"tendo.yamagata.jp\0in-vpn.org\0"
-"soja.okayama.jp\0int.ve\0"
-"bbva\0"
-"kustanai.su\0mg.leg.br\0"
-"kyotanabe.kyoto.jp\0\xd0\xbe\xd1\x80\xd0\xb3\0"
-"nom.ad\0"
-"gov.ac\0nom.ae\0"
-"int.vn\0promo\0nom.af\0"
-"gov.ae\0nom.ag\0"
-"gov.af\0"
-"android\0nom.ai\0"
-"usculture.museum\0dell\0"
-"fvg.it\0cz.it\0nom.al\0"
-"arq.br\0blogspot.co.uk\0"
-"gov.al\0"
-"okagaki.fukuoka.jp\0"
-"airport.aero\0lewismiller.museum\0"
-"yatsuka.shimane.jp\0"
-"gov.ba\0trapani.it\0"
-"gov.ar\0gov.bb\0"
-"gov.as\0"
-"gov.au\0nakadomari.aomori.jp\0"
-"gov.bf\0television.museum\0"
-"games.hu\0"
-"gov.bh\0"
-"\xe6\x96\xb0\xe9\x97\xbb\0"
-"gov.az\0"
-"koga.ibaraki.jp\0aejrie.no\0"
-"gov.bm\0haibara.shizuoka.jp\0tatar\0"
-"gov.bn\0from-ct.com\0"
-"nesoddtangen.no\0is-a-socialist.com\0"
-"gov.br\0"
-"airline.aero\0gov.bs\0"
-"gov.bt\0gov.cd\0bungoono.oita.jp\0a.run.app\0"
-"kommunalforbund.se\0"
-"gov.by\0sardinia.it\0"
-"gov.bz\0nom.cl\0"
-"asia\0gov.cl\0"
-"gov.cm\0nom.co\0valled-aosta.it\0sogndal.no\0"
-"gov.cn\0sciencehistory.museum\0"
-"author.aero\0gov.co\0saiki.oita.jp\0"
-"lib.tx.us\0is-a-green.com\0"
-"lans.museum\0loft\0"
-"gov.cu\0onjuku.chiba.jp\0\xc3\xa5lg\xc3\xa5rd.no\0"
-"gov.cx\0lib.pr.us\0"
-"gov.cy\0"
-"saikai.nagasaki.jp\0\xc3\xa5s.no\0"
-"fnd.br\0"
-"sexy\0"
-"gov.dm\0miners.museum\0za.com\0"
-"in-butter.de\0"
-"gov.do\0"
-"res.in\0paderborn.museum\0scapp.io\0"
-"c66.me\0"
-"gov.ec\0aga.niigata.jp\0naha.okinawa.jp\0"
-"gov.ee\0hakata.fukuoka.jp\0"
-"gov.eg\0med.pro\0"
-"klabu.no\0"
-"!city.kobe.jp\0dominic.ua\0fed.us\0"
-"gov.dz\0"
-"noboribetsu.hokkaido.jp\0"
-"catering\0"
-"\xd8\xa7\xd9\x84\xd8\xb3\xd8\xb9\xd9\x88\xd8\xaf\xd9\x8a\xd9\x87\0"
-"federation.aero\0servebbs.org\0"
-"nom.es\0from-wy.com\0"
-"gov.et\0cincinnati.museum\0\xe9\xa6\x99\xe6\xb8\xaf\0"
-"oystre-slidre.no\0"
-"s3-eu-central-1.amazonaws.com\0"
-"villas\0"
-"nom.fr\0"
-"shirataka.yamagata.jp\0nom.gd\0"
-"nom.ge\0"
-"gov.ge\0lviv.ua\0blogspot.co.ke\0homesecuritypc.com\0"
-"plants.museum\0vlaanderen.museum\0"
-"gov.gh\0"
-"gov.gi\0securitytactics.com\0"
-"nom.gl\0"
-"remotewd.com\0"
-"brussel.museum\0moma.museum\0"
-"gov.gn\0"
-"bruxelles.museum\0"
-"vicenza.it\0\xd8\xa7\xd9\x84\xd8\xb3\xd8\xb9\xd9\x88\xd8\xaf\xd9\x8a\xd8\xa9\0degree\0"
-"gov.gr\0naklo.pl\0customer.enonic.io\0nom.gt\0"
-"sydney\0"
-"gov.gu\0desi\0"
-"badajoz.museum\0cc.sd.us\0no-ip.org\0"
-"gov.gy\0oseto.nagasaki.jp\0uruma.okinawa.jp\0nord-odal.no\0"
-"k12.md.us\0stackhero-network.com\0"
-"gov.hk\0"
-"nom.hn\0"
-"arendal.no\0"
-"services\0"
-"huissier-justice.fr\0bronnoy.no\0"
-"banamex\0"
-"my.id\0akabira.hokkaido.jp\0showa.yamanashi.jp\0merckmsd\0"
-"gov.ie\0cloudaccess.net\0"
-"kherson.ua\0"
-"oita.oita.jp\0"
-"auspost\0"
-"snillfjord.no\0"
-"nom.im\0"
-"gov.il\0pavia.it\0"
-"gov.in\0a.se\0scrapping.cc\0"
-"rc.it\0choshi.chiba.jp\0"
-"fukumitsu.toyama.jp\0"
-"gov.iq\0"
-"gov.ir\0"
-"gov.is\0sagae.yamagata.jp\0\xd8\xb9\xd8\xb1\xd8\xa7\xd9\x82\0"
-"gov.it\0edu.eu.org\0"
-"\xe9\x9b\x86\xe5\x9b\xa2\0"
-"higashiyama.kyoto.jp\0mormon\0"
-"vic.au\0"
-"is-a-doctor.com\0"
-"ge.it\0"
-"gov.jo\0niihama.ehime.jp\0\xe0\xb8\xa3\xe0\xb8\xb1\xe0\xb8\x90\xe0\xb8\x9a\xe0\xb8\xb2\xe0\xb8\xa5.\xe0\xb9\x84\xe0\xb8\x97\xe0\xb8\xa2\0"
-"academy\0"
-"\xe4\xb8\xad\xe4\xbf\xa1\0"
-"ingatlan.hu\0sb.ua\0nom.ke\0"
-"saotome.st\0"
-"gov.kg\0"
-"honjo.akita.jp\0stream\0"
-"koto.tokyo.jp\0musashimurayama.tokyo.jp\0gov.ki\0"
-"blogspot.co.nz\0"
-"asaka.saitama.jp\0nom.km\0"
-"gov.km\0british.museum\0"
-"gov.kn\0"
-"gov.kp\0"
-"gov.la\0vaapste.no\0"
-"gov.lb\0"
-"gov.lc\0broker\0"
-"kamijima.ehime.jp\0sibenik.museum\0agakhan\0"
-"tatsuno.hyogo.jp\0"
-"gov.kw\0hagebostad.no\0nat.tn\0nom.li\0"
-"capitalone\0familyds.org\0"
-"gov.ky\0"
-"gyokuto.kumamoto.jp\0gov.kz\0oh.us\0syno-ds.de\0"
-"gov.lk\0freetls.fastly.net\0"
-"konsulat.gov.pl\0"
-"harvestcelebration.museum\0"
-"sanda.hyogo.jp\0"
-"gov.ma\0alpha.bounty-full.com\0"
-"itano.tokushima.jp\0gov.lr\0"
-"gov.ls\0br\xc3\xb8nn\xc3\xb8ysund.no\0"
-"gov.lt\0"
-"gov.me\0nom.mg\0"
-"gov.lv\0"
-"mishima.shizuoka.jp\0gov.mg\0aarborte.no\0"
-"gov.ly\0turek.pl\0nom.mk\0"
-"urakawa.hokkaido.jp\0"
-"gov.mk\0"
-"gov.ml\0"
-"gifu.gifu.jp\0shioya.tochigi.jp\0"
-"gov.mn\0spydeberg.no\0"
-"ono.hyogo.jp\0saito.miyazaki.jp\0gov.mo\0"
-"museum.tt\0ivanovo.su\0"
-"nom.nc\0"
-"gov.mr\0"
-"gov.ms\0"
-"tome.miyagi.jp\0gov.mu\0"
-"gov.mv\0"
-"gov.mw\0gov.ng\0nom.ni\0nalchik.ru\0"
-"gov.my\0"
-"gov.mz\0"
-"\xe5\x95\x86\xe6\xa0\x87\0"
-"otaru.hokkaido.jp\0tomobe.ibaraki.jp\0"
-"udine.it\0ybo.trade\0"
-"iglesiascarbonia.it\0"
-"okawa.fukuoka.jp\0gov.nr\0"
-"ube.yamaguchi.jp\0nom.nu\0"
-"tarama.okinawa.jp\0draydns.de\0"
-"xxx\0"
-"nalchik.su\0applinzi.com\0"
-"pisz.pl\0dating\0"
-"trentinosud-tirol.it\0utwente.io\0"
-"gov.om\0"
-"skydiving.aero\0berlin.museum\0s\xc3\xb8mna.no\0nom.pa\0"
-"rackmaze.net\0"
-"fuchu.hiroshima.jp\0"
-"nom.pe\0"
-"yamamoto.miyagi.jp\0\xe6\x89\x8b\xe8\xa1\xa8\0"
-"musashino.tokyo.jp\0"
-"eco.br\0"
-"gov.ph\0xyz\0"
-"milan.it\0"
-"nom.pl\0"
-"gov.pk\0"
-"rome.it\0nishiokoppe.hokkaido.jp\0matsushima.miyagi.jp\0gov.pl\0"
-"gov.pn\0"
-"isehara.kanagawa.jp\0nom.qa\0"
-"dni.us\0"
-"gov.qa\0fiat\0"
-"gov.pr\0"
-"gov.ps\0"
-"gov.pt\0k12.wi.us\0"
-"nom.pw\0"
-"sukagawa.fukushima.jp\0niiza.saitama.jp\0"
-"gov.py\0"
-"memorial.museum\0"
-"stj\xc3\xb8rdalshalsen.no\0"
-"magazine.aero\0"
-"brasil.museum\0luxembourg.museum\0"
-"livinghistory.museum\0kyoto\0"
-"newhampshire.museum\0nom.re\0k12.ks.us\0"
-"fedorainfracloud.org\0"
-"asakawa.fukushima.jp\0"
-"zamami.okinawa.jp\0"
-"ine.kyoto.jp\0higashimatsushima.miyagi.jp\0"
-"nom.ro\0"
-"pinb.gov.pl\0"
-"sayama.saitama.jp\0"
-"fukui.jp\0oyer.no\0gov.sa\0nom.rs\0"
-"\xe7\xa6\x8f\xe4\xba\x95.jp\0kinokawa.wakayama.jp\0gov.sb\0"
-"tn.it\0gov.rs\0gov.sc\0"
-"vao.it\0torino.it\0gov.sd\0"
-"ullensaker.no\0gov.ru\0love\0"
-"kanmaki.nara.jp\0"
-"gov.rw\0gov.sg\0nom.si\0"
-"pt.it\0chocolate.museum\0gov.sh\0"
-"miyoshi.aichi.jp\0"
-"rikuzentakata.iwate.jp\0"
-"american.museum\0"
-"yoro.gifu.jp\0gov.sl\0fido\0institute\0"
-"eiheiji.fukui.jp\0"
-"gov.so\0"
-"meloy.no\0nom.st\0"
-"gov.ss\0"
-"gov.st\0readmyblog.org\0"
-"nagasaki.nagasaki.jp\0cloud.metacentrum.cz\0"
-"\xc3\xb8ystre-slidre.no\0"
-"gov.sx\0nom.tj\0"
-"gov.sy\0"
-"gov.tj\0"
-"nom.tm\0"
-"ambulance.aero\0bl.it\0mino.gifu.jp\0gov.tl\0"
-"gov.tm\0"
-"atami.shizuoka.jp\0gov.tn\0"
-"hirata.fukushima.jp\0gov.to\0"
-"schools.nsw.edu.au\0katagami.akita.jp\0gov.ua\0"
-"gov.tr\0"
-"gov.tt\0"
-"nom.ug\0"
-"n.bg\0s3.dualstack.us-east-1.amazonaws.com\0"
-"kamisato.saitama.jp\0gov.tw\0"
-"hakusan.ishikawa.jp\0naturalhistorymuseum.museum\0"
-"tur.ar\0"
-"4.bg\0wiw.gov.pl\0gov.uk\0cya.gg\0"
-"orskog.no\0"
-"pe.ca\0versicherung\0trafficplex.cloud\0"
-"ck.ua\0"
-"cloudns.asia\0blogspot.co.za\0nom.vc\0"
-"kyowa.akita.jp\0gov.vc\0you\0"
-"gov.ve\0webhop.org\0nom.vg\0"
-"ishinomaki.miyagi.jp\0myhome-server.de\0"
-"nom.uy\0"
-"*.yokohama.jp\0"
-"tur.br\0"
-"hekinan.aichi.jp\0"
-"shibukawa.gunma.jp\0gov.vn\0"
-"museum.mv\0"
-"am.br\0museum.mw\0"
-"nyuzen.toyama.jp\0estate\0freebox-os.com\0"
-"catholic.edu.au\0"
-"museum.no\0"
-"misato.saitama.jp\0rugby\0"
-"kamitonda.wakayama.jp\0community.museum\0"
-"pictet\0"
-"serveirc.com\0"
-"gov.ws\0"
-"minami.kyoto.jp\0timekeeping.museum\0"
-"carrara-massa.it\0florist\0"
-"museum.om\0"
-"intuit\0"
-"maibara.shiga.jp\0"
-"\xe5\xb2\x90\xe9\x98\x9c.jp\0red.sv\0"
-"kumano.hiroshima.jp\0"
-"paris.museum\0sciencecenter.museum\0"
-"can.museum\0"
-"nom.za\0"
-"\xe4\xb8\xaa\xe4\xba\xba.hk\0"
-"gjovik.no\0gov.za\0from-ca.com\0"
-"tomiya.miyagi.jp\0"
-"hokuto.hokkaido.jp\0sukumo.kochi.jp\0\xd8\xa7\xd8\xa8\xd9\x88\xd8\xb8\xd8\xa8\xd9\x8a\0"
-"kiryu.gunma.jp\0"
-"custom.metacentrum.cz\0"
-"nago.okinawa.jp\0shinjuku.tokyo.jp\0sopot.pl\0"
-"dealer\0"
-"k12.ut.us\0gov.zm\0drud.io\0"
-"collegefan.org\0"
-"tonsberg.no\0"
-"navuotna.no\0\xd9\x83\xd9\x88\xd9\x85\0"
-"reliance\0"
-"capebreton.museum\0alibaba\0"
-"hamatonbetsu.hokkaido.jp\0osoyro.no\0k12.oh.us\0gov.zw\0from-ky.com\0"
-"nanjo.okinawa.jp\0"
-"film\0"
-"yun\0"
-"trustee.museum\0"
-"nt.edu.au\0muika.niigata.jp\0"
-"memorial\0"
-"homesense\0"
-"shiroi.chiba.jp\0"
-"yamagata.jp\0brother\0"
-"wakayama.wakayama.jp\0"
-"ltd.co.im\0myoko.niigata.jp\0"
-"dinosaur.museum\0"
-"izumi.osaka.jp\0"
-"so.it\0nakagawa.tokushima.jp\0"
-"kr\xc3\xb8""dsherad.no\0ulvik.no\0"
-"vic.edu.au\0bel.tr\0"
-"pe.it\0"
-"nanto.toyama.jp\0"
-"asn.au\0miyako.fukuoka.jp\0sennan.osaka.jp\0"
-"tenri.nara.jp\0"
-"shibetsu.hokkaido.jp\0"
-"volyn.ua\0is-a-player.com\0"
-"shaw\0"
-"gdynia.pl\0"
-"giving\0"
-"shitara.aichi.jp\0sor-fron.no\0"
-"\xe3\x83\x95\xe3\x82\xa1\xe3\x83\x83\xe3\x82\xb7\xe3\x83\xa7\xe3\x83\xb3\0"
-"yamaga.kumamoto.jp\0evje-og-hornnes.no\0"
-"samukawa.kanagawa.jp\0"
-"is-lost.org\0"
-"edu.krd\0now-dns.org\0"
-"\xe0\xb2\xad\xe0\xb2\xbe\xe0\xb2\xb0\xe0\xb2\xa4\0"
-"okinawa\0"
-"luroy.no\0"
-"nobeoka.miyazaki.jp\0armenia.su\0"
-"pe.kr\0"
-"washtenaw.mi.us\0lplfinancial\0"
-"matsubara.osaka.jp\0"
-"tn.us\0homegoods\0"
-"christmas\0"
-"audi\0\xe6\x8b\x9b\xe8\x81\x98\0mmafan.biz\0"
-"adv.br\0"
-"ferrara.it\0"
-"fedje.no\0today\0"
-"contemporaryart.museum\0"
-"kira.aichi.jp\0tmall\0"
-"africa.com\0"
-"zip\0"
-"of.by\0"
-"aogaki.hyogo.jp\0"
-"kumiyama.kyoto.jp\0ureshino.mie.jp\0"
-"friuliv-giulia.it\0"
-"yoga\0"
-"\xe9\x9d\x92\xe6\xa3\xae.jp\0"
-"poniatowa.pl\0"
-"ap-southeast-2.elasticbeanstalk.com\0"
-"beer\0"
-"hb.cn\0"
-"\xe9\x95\xb7\xe5\xb4\x8e.jp\0hikimi.shimane.jp\0"
-"akishima.tokyo.jp\0fire\0s3.dualstack.eu-west-3.amazonaws.com\0"
-"krodsherad.no\0miami\0"
-"porsgrunn.no\0"
-"posts-and-telecommunications.museum\0salvadordali.museum\0genting\0"
-"h\xc3\xa1""bmer.no\0"
-"pasadena.museum\0loginline.io\0"
-"mukawa.hokkaido.jp\0solund.no\0"
-"h\xc3\xa5.no\0lipsy\0"
-"konan.shiga.jp\0force.museum\0wskr.gov.pl\0"
-"\xc3\xa5snes.no\0"
-"etc.br\0inagawa.hyogo.jp\0sumy.ua\0"
-"atm.pl\0"
-"rns.tn\0"
-"nonoichi.ishikawa.jp\0fish\0"
-"bamble.no\0"
-"bulsan-s\xc3\xbc""dtirol.it\0inc.hk\0"
-"erotica.hu\0trentino-aadige.it\0kadogawa.miyazaki.jp\0"
-"kushimoto.wakayama.jp\0"
-"de.com\0"
-"from-mt.com\0from-nd.com\0"
-"kvinesdal.no\0"
-"school\0"
-"\xe6\x89\x8b\xe6\x9c\xba\0myfritz.net\0"
-"hopto.org\0"
-"design.museum\0"
-"monza-e-della-brianza.it\0"
-"ohi.fukui.jp\0"
-"dattolocal.net\0"
-"redstone\0"
-"futsu.nagasaki.jp\0"
-"shimizu.shizuoka.jp\0twmail.net\0"
-"scienceandhistory.museum\0"
-"jp.eu.org\0"
-"shia\0"
-"no-ip.net\0"
-"nayoro.hokkaido.jp\0in-vpn.net\0"
-"jogasz.hu\0afjord.no\0"
-"sp.gov.br\0rnrt.tn\0"
-"tsuchiura.ibaraki.jp\0agdenes.no\0\xd1\x80\xd1\x83\xd1\x81\0"
-"spy.museum\0\xe4\xb8\x96\xe7\x95\x8c\0"
-"alta.no\0"
-"ena.gifu.jp\0"
-"gouv.fr\0forl\xc3\xac""cesena.it\0"
-"kisosaki.mie.jp\0"
-"lamborghini\0"
-"jobs\0"
-"\xd8\xa7\xd8\xaa\xd8\xb5\xd8\xa7\xd9\x84\xd8\xa7\xd8\xaa\0"
-"n.se\0"
-"tattoo\0"
-"maif\0"
-"taranto.it\0abeno.osaka.jp\0"
-"finnoy.no\0"
-"siena.it\0\xd9\x85\xd8\xb5\xd8\xb1\0"
-"ota.gunma.jp\0"
-"utsunomiya.tochigi.jp\0drud.us\0"
-"imizu.toyama.jp\0"
-"askim.no\0"
-"gr.it\0"
-"rzeszow.pl\0"
-"v-info.info\0"
-"koeln\0"
-"gouv.ht\0mjondalen.no\0"
-"s\xc3\xb8r-aurdal.no\0"
-"gr.jp\0naka.ibaraki.jp\0fbxos.fr\0"
-"date.hokkaido.jp\0"
-"asn.lv\0so.gov.pl\0"
-"wi.us\0"
-"cable-modem.org\0spacekit.io\0"
-"kvits\xc3\xb8y.no\0"
-"koori.fukushima.jp\0edogawa.tokyo.jp\0"
-"farmers\0"
-"sakura.chiba.jp\0"
-"sanagochi.tokushima.jp\0"
-"handa.aichi.jp\0esashi.hokkaido.jp\0"
-"torahime.shiga.jp\0"
-"gouv.bj\0"
-"kimino.wakayama.jp\0"
-"gc.ca\0imabari.ehime.jp\0ia.us\0"
-"vallee-aoste.it\0"
-"health.nz\0"
-"delivery\0"
-"damnserver.com\0"
-"gouv.ci\0ide.kyoto.jp\0"
-"daisen.akita.jp\0"
-"aerobatic.aero\0adygeya.su\0"
-"homeunix.com\0"
-"takamori.kumamoto.jp\0"
-"plantation.museum\0"
-"4u.com\0"
-"adv.mz\0"
-"kv\xc3\xa6nangen.no\0\xe6\x85\x88\xe5\x96\x84\0"
-"kr.com\0"
-"flight.aero\0shop\0"
-"civilisation.museum\0of.no\0s3-website-eu-west-1.amazonaws.com\0"
-"usantiques.museum\0"
-"uvic.museum\0apps.lair.io\0"
-"show\0"
-"hadano.kanagawa.jp\0"
-"tinn.no\0\xe8\x87\xba\xe7\x81\xa3\0"
-"fukuchiyama.kyoto.jp\0"
-"kunisaki.oita.jp\0"
-"ferrero\0"
-"aikawa.kanagawa.jp\0"
-"tado.mie.jp\0london.museum\0"
-"adygeya.ru\0"
-"s3.cn-north-1.amazonaws.com.cn\0"
-"natura\0"
-"\xe6\xa0\x83\xe6\x9c\xa8.jp\0oki.fukuoka.jp\0"
-"s3.dualstack.eu-central-1.amazonaws.com\0"
-"joetsu.niigata.jp\0hinohara.tokyo.jp\0"
-"patria.bo\0my-firewall.org\0"
-"lucerne.museum\0"
-"adult.ht\0cc.oh.us\0yodobashi\0"
-"sogne.no\0in.london\0"
-"best\0cisco\0"
-"akune.kagoshima.jp\0gmina.pl\0\xd8\xa7\xd9\x84\xd8\xa7\xd8\xb1\xd8\xaf\xd9\x86\0"
-"conference.aero\0nozawaonsen.nagano.jp\0\xe0\xa4\xa8\xe0\xa5\x87\xe0\xa4\x9f\0"
-"dyn-o-saur.com\0"
-"hurum.no\0"
-"pescara.it\0"
-"from-wa.com\0"
-"surrey.museum\0statebank\0"
-"watches\0"
-"auto\0"
-"tec.mi.us\0"
-"utashinai.hokkaido.jp\0ariake.saga.jp\0is-by.us\0"
-"ryugasaki.ibaraki.jp\0fukudomi.saga.jp\0"
-"ra.it\0"
-"campinagrande.br\0portlligat.museum\0"
-"cechire.com\0"
-"tanagura.fukushima.jp\0hasama.oita.jp\0"
-"madrid.museum\0"
-"wroc.pl\0"
-"mihama.aichi.jp\0miyake.nara.jp\0clinton.museum\0"
-"m\xc3\xa5lselv.no\0"
-"muko.kyoto.jp\0hitachi\0"
-"feste-ip.net\0"
-"uz.ua\0\xd1\x81\xd1\x80\xd0\xb1\0law.za\0landrover\0"
-"zp.gov.pl\0"
-"health.vn\0"
-"ci.it\0echizen.fukui.jp\0"
-"air-traffic-control.aero\0toscana.it\0"
-"venezia.it\0hidaka.hokkaido.jp\0community\0"
-"salud.bo\0"
-"civilwar.museum\0trogstad.no\0"
-"tomioka.gunma.jp\0"
-"philately.museum\0"
-"tranby.no\0"
-"travel.pl\0"
-"sr.gov.pl\0bauhaus\0"
-"nv.us\0"
-"maryland.museum\0"
-"yokaichiba.chiba.jp\0"
-"carraramassa.it\0s3-ap-southeast-2.amazonaws.com\0"
-"kamimine.saga.jp\0"
-"lib.wa.us\0"
-"inabe.mie.jp\0"
-"komatsu.ishikawa.jp\0discovery.museum\0"
-"webhosting.be\0blogsyte.com\0"
-"schaeffler\0"
-"ekloges.cy\0buzen.fukuoka.jp\0zapto.org\0"
-"bremanger.no\0"
-"press.aero\0museumvereniging.museum\0"
-"staples\0"
-"static-access.net\0"
-"bjerkreim.no\0"
-"bj.cn\0sobetsu.hokkaido.jp\0ismaili\0"
-"sumoto.kumamoto.jp\0stordal.no\0"
-"fredrikstad.no\0"
-"ami.ibaraki.jp\0shingu.wakayama.jp\0"
-"oamishirasato.chiba.jp\0"
-"kikonai.hokkaido.jp\0repair\0"
-"nord-aurdal.no\0"
-"okazaki.aichi.jp\0grondar.za\0"
-"s3-sa-east-1.amazonaws.com\0"
-"couchpotatofries.org\0"
-"no-ip.info\0"
-"vestre-slidre.no\0\xe5\x80\x8b\xe4\xba\xba.\xe9\xa6\x99\xe6\xb8\xaf\0"
-"kishiwada.osaka.jp\0"
-"airtraffic.aero\0nagano.jp\0inuyama.aichi.jp\0"
-"dsmynas.org\0"
-"amsterdam.museum\0hoyanger.no\0"
-"travel.tt\0"
-"ogose.saitama.jp\0"
-"higashi.fukuoka.jp\0"
-"for-the.biz\0"
-"surnadal.no\0bytom.pl\0"
-"winb.gov.pl\0wellbeingzone.eu\0"
-"zentsuji.kagawa.jp\0minamidaito.okinawa.jp\0trondheim.no\0"
-"res.aero\0"
-"urbinopesaro.it\0"
-"etajima.hiroshima.jp\0"
-"gjemnes.no\0glitch.me\0"
-"silk\0"
-"kisarazu.chiba.jp\0"
-"esurance\0"
-"austevoll.no\0k12.ky.us\0sa-east-1.elasticbeanstalk.com\0better-than.tv\0"
-"higashiagatsuma.gunma.jp\0ug.gov.pl\0"
-"fuoisku.no\0"
-"fbx-os.fr\0"
-"fujieda.shizuoka.jp\0"
-"openair.museum\0"
-"suginami.tokyo.jp\0"
-"kawaba.gunma.jp\0takasaki.gunma.jp\0stage.nodeart.io\0"
-"warabi.saitama.jp\0"
-"chirurgiens-dentistes-en-france.fr\0"
-"virtualserver.io\0"
-"sakae.chiba.jp\0kawai.nara.jp\0sina\0"
-"oguni.yamagata.jp\0voss.no\0"
-"pr.it\0"
-"kitagawa.kochi.jp\0"
-"odda.no\0"
-"site.builder.nu\0"
-"webhop.net\0"
-"moka.tochigi.jp\0lincoln\0is.eu.org\0"
-"pippu.hokkaido.jp\0"
-"sciencesnaturelles.museum\0"
-"gouv.sn\0"
-"shibecha.hokkaido.jp\0"
-"college\0url.tw\0"
-"massa-carrara.it\0"
-"diet\0*.otap.co\0"
-"yashio.saitama.jp\0chofu.tokyo.jp\0"
-"\xe8\xaf\xba\xe5\x9f\xba\xe4\xba\x9a\0"
-"miasa.nagano.jp\0"
-"l.bg\0servebbs.com\0"
-"family\0"
-"ichikawamisato.yamanashi.jp\0"
-"2.bg\0\xd8\xb3\xd9\x88\xd8\xaf\xd8\xa7\xd9\x86\0"
-"komforb.se\0"
-"customer.speedpartner.de\0"
-"it.eu.org\0"
-"caserta.it\0"
-"tamba.hyogo.jp\0"
-"miyako.iwate.jp\0"
-"\xe7\xbd\x91\xe5\x9d\x80\0bmoattachments.org\0"
-"kosei.shiga.jp\0"
-"shakotan.hokkaido.jp\0"
-"larsson.museum\0"
-"tel.tr\0cherkassy.ua\0is-a-cubicle-slave.com\0"
-"zappos\0lubartow.pl\0"
-"oguni.kumamoto.jp\0"
-"os\xc3\xb8yro.no\0"
-"support\0"
-"koshimizu.hokkaido.jp\0"
-"film.hu\0assisi.museum\0hockey\0cistron.nl\0"
-"nature.museum\0in.na\0"
-"ardal.no\0cookingchannel\0"
-"consulting.aero\0burghof.museum\0"
-"shiraoka.saitama.jp\0in.ni\0vladimir.su\0"
-"toba.mie.jp\0minnesota.museum\0"
-"tsuruoka.yamagata.jp\0"
-"caa.aero\0freight.aero\0"
-"freeddns.org\0"
-"oga.akita.jp\0no-ip.ca\0"
-"umig.gov.pl\0nissan\0"
-"\xc3\xb8rskog.no\0bplaced.com\0"
-"site\0"
-"tottori.tottori.jp\0"
-"muroto.kochi.jp\0review\0"
-"kamikawa.hyogo.jp\0karmoy.no\0go-vip.net\0"
-"nissay\0"
-"yawara.ibaraki.jp\0riodejaneiro.museum\0"
-"in.eu.org\0"
-"uchiko.ehime.jp\0yao.osaka.jp\0auto.pl\0"
-"horse\0is-a-liberal.com\0"
-"voorloper.cloud\0"
-"freeddns.us\0"
-"nishinoshima.shimane.jp\0limanowa.pl\0"
-"cc.tn.us\0"
-"minokamo.gifu.jp\0estate.museum\0k12.nv.us\0\xd1\x83\xd0\xbf\xd1\x80.\xd1\x81\xd1\x80\xd0\xb1\0vladimir.ru\0"
-"bristol.museum\0"
-"steinkjer.no\0"
-"heimatunduhren.museum\0koeln.museum\0"
-"golffan.us\0"
-"targi.pl\0"
-"fukushima.hokkaido.jp\0"
-"fosnes.no\0showtime\0"
-"essex.museum\0"
-"hicam.net\0"
-"ikawa.akita.jp\0"
-"gouv.km\0"
-"medizinhistorisches.museum\0"
-"happou.akita.jp\0ilawa.pl\0"
-"to.gov.br\0"
-"chippubetsu.hokkaido.jp\0"
-"pc.it\0in.rs\0"
-"dell-ogliastra.it\0suwalki.pl\0"
-"itoigawa.niigata.jp\0toshima.tokyo.jp\0wolterskluwer\0"
-"li.it\0namikata.ehime.jp\0"
-"ddnss.org\0"
-"fukushima.jp\0muroran.hokkaido.jp\0"
-"eu-west-1.elasticbeanstalk.com\0"
-"ama.aichi.jp\0"
-"geek.nz\0quicksytes.com\0"
-"agriculture.museum\0"
-"citic\0"
-"chase\0wales\0dscloud.mobi\0"
-"fuefuki.yamanashi.jp\0gouv.ml\0in.th\0"
-"iwatsuki.saitama.jp\0"
-"chiyoda.tokyo.jp\0is-not-certified.com\0"
-"seirou.niigata.jp\0"
-"nt.au\0"
-"meldal.no\0"
-"wv.us\0"
-"shizukuishi.iwate.jp\0"
-"in.ua\0pa.leg.br\0"
-"texas.museum\0univ.sn\0cyou\0virtual-user.de\0"
-"vlaanderen\0"
-"law.pro\0cust.disrec.thingdust.io\0"
-"nt.ca\0pr.us\0"
-"nakagusuku.okinawa.jp\0"
-"togura.nagano.jp\0okinawa.okinawa.jp\0"
-"\xc3\xa1k\xc5\x8boluokta.no\0k\xc3\xa5""fjord.no\0"
-"tottori.jp\0ikeda.fukui.jp\0onna.okinawa.jp\0republican\0"
-"rightathome\0"
-"town.museum\0in.us\0"
-"city.hu\0jprs\0"
-"flanders.museum\0"
-"ditchyourip.com\0firewall-gateway.de\0"
-"olawa.pl\0"
-"veterinaire.km\0youtube\0"
-"sorfold.no\0az.us\0"
-"sakai.fukui.jp\0arai.shizuoka.jp\0"
-"lib.ri.us\0"
-"is-a-financialadvisor.com\0pb.leg.br\0"
-"dyn53.io\0"
-"troitsk.su\0"
-"friulivegiulia.it\0lib.ms.us\0lib.nc.us\0futbol\0"
-"\xe9\xab\x98\xe7\x9f\xa5.jp\0frosta.no\0servebeer.com\0"
-"suli.hu\0from-pr.com\0"
-"ina.nagano.jp\0"
-"nosegawa.nara.jp\0"
-"genoa.it\0"
-"shopping\0"
-"parma.it\0misasa.tottori.jp\0firebaseapp.com\0"
-"nakagawa.fukuoka.jp\0"
-"in-addr.arpa\0"
-"lib.ca.us\0twmail.org\0memset.net\0"
-"komvux.se\0"
-"dish\0"
-"legnica.pl\0"
-"oita.jp\0"
-"perugia.it\0kamoenai.hokkaido.jp\0"
-"kobayashi.miyazaki.jp\0"
-"wales.museum\0"
-"flir\0"
-"joboji.iwate.jp\0foodnetwork\0"
-"com.ac\0"
-"teramo.it\0terni.it\0"
-"com.af\0\xe6\x84\x9b\xe5\xaa\x9b.jp\0"
-"com.ag\0"
-"bato.tochigi.jp\0"
-"com.ai\0pc.pl\0"
-"paris.eu.org\0"
-"com.al\0intel\0"
-"com.am\0hurdal.no\0"
-"veterinaire.fr\0"
-"com.ba\0"
-"com.ar\0com.bb\0genkai.saga.jp\0myddns.rocks\0"
-"fujinomiya.shizuoka.jp\0lyngen.no\0n\xc3\xb8tter\xc3\xb8y.no\0"
-"loyalist.museum\0wedding\0"
-"com.au\0"
-"com.aw\0forgot.his.name\0"
-"com.bh\0piemonte.it\0tokashiki.okinawa.jp\0"
-"com.bi\0cc.wi.us\0"
-"com.az\0ueda.nagano.jp\0kofu.yamanashi.jp\0building.museum\0"
-"com.bm\0\xe5\x9f\xbc\xe7\x8e\x89.jp\0fedex\0"
-"com.bn\0"
-"com.bo\0taku.saga.jp\0"
-"carbonia-iglesias.it\0k12.nm.us\0is-gone.com\0"
-"com.br\0soundcast.me\0"
-"com.bs\0"
-"com.bt\0"
-"friulive-giulia.it\0notaires.km\0"
-"zara\0"
-"com.by\0com.ci\0"
-"com.bz\0"
-"oguchi.aichi.jp\0wmflabs.org\0"
-"com.cm\0cc.ia.us\0\xd1\x83\xd0\xba\xd1\x80\0prudential\0"
-"production.aero\0com.cn\0showa.gunma.jp\0iobb.net\0"
-"jdf.br\0com.co\0"
-"takehara.hiroshima.jp\0"
-"tsukigata.hokkaido.jp\0s3-eu-west-3.amazonaws.com\0"
-"ishikawa.jp\0urausu.hokkaido.jp\0l.se\0"
-"com.cu\0rn.it\0americanart.museum\0com.de\0"
-"hisamitsu\0"
-"com.cw\0"
-"\xce\xb5\xce\xbb\0hb.cldmail.ru\0"
-"imb.br\0com.cy\0"
-"washingtondc.museum\0"
-"com.dm\0mycd.eu\0nid.io\0"
-"encyclopedic.museum\0penza.su\0"
-"com.do\0"
-"com.ec\0hirara.okinawa.jp\0"
-"*.sendai.jp\0kosuge.yamanashi.jp\0"
-"com.ee\0mikawa.yamagata.jp\0stockholm\0"
-"com.eg\0tosu.saga.jp\0"
-"izumizaki.fukushima.jp\0sm.ua\0"
-"com.dz\0balestrand.no\0"
-"avoues.fr\0"
-"infiniti\0"
-"hikawa.shimane.jp\0"
-"aomori.jp\0"
-"saroma.hokkaido.jp\0"
-"vet.br\0com.es\0"
-"com.et\0"
-"hokuryu.hokkaido.jp\0staging.onred.one\0"
-"nahari.kochi.jp\0"
-"londrina.br\0"
-"pgafan.net\0"
-"is-a-bruinsfan.org\0"
-"com.fr\0tobishima.aichi.jp\0"
-"com.ge\0otago.museum\0rygge.no\0ky.us\0co.business\0"
-"cooking\0"
-"sasayama.hyogo.jp\0skedsmokorset.no\0no-ip.co.uk\0"
-"com.gh\0valle-aosta.it\0gs.of.no\0"
-"com.gi\0tomari.hokkaido.jp\0"
-"v\xc3\xa5ler.hedmark.no\0"
-"mordovia.su\0"
-"com.gl\0"
-"com.gn\0lindas.no\0"
-"com.gp\0dyndns-blog.com\0"
-"trentinoaadige.it\0"
-"com.gr\0"
-"goshiki.hyogo.jp\0\xe7\xbd\x91\xe7\xab\x99\0"
-"com.gt\0ak.us\0americanexpress\0"
-"com.gu\0taiki.mie.jp\0productions\0"
-"forsale\0*.0emm.com\0"
-"ssl.origin.cdn77-secure.org\0"
-"com.gy\0"
-"com.hk\0agrigento.it\0kamigori.hyogo.jp\0"
-"sch.ae\0oe.yamagata.jp\0"
-"com.hn\0bjark\xc3\xb8y.no\0dyndns-mail.com\0"
-"pistoia.it\0holdings\0*.stg.dev\0"
-"com.hr\0nome.pt\0ltda\0"
-"com.ht\0"
-"nt.no\0\xd0\xbe\xd0\xb1\xd1\x80.\xd1\x81\xd1\x80\xd0\xb1\0comsec\0"
-"kiso.nagano.jp\0"
-"\xe7\xb5\x84\xe7\xb9\x94.\xe9\xa6\x99\xe6\xb8\xaf\0dynalias.net\0"
-"tunes\0"
-"r\xc3\xa6lingen.no\0hepforge.org\0"
-"tank.museum\0"
-"com.im\0wajiki.tokushima.jp\0"
-"com.io\0"
-"iwate.iwate.jp\0"
-"com.iq\0work\0"
-"catania.it\0shibata.miyagi.jp\0seoul.kr\0"
-"com.is\0kasuya.fukuoka.jp\0gemological.museum\0groks-this.info\0"
-"press.museum\0rocks\0"
-"orsta.no\0"
-"iris.arpa\0"
-"malvik.no\0"
-"mordovia.ru\0"
-"tsuyama.okayama.jp\0"
-"s\xc3\xb8ndre-land.no\0"
-"schokokeks.net\0"
-"com.jo\0"
-"lugansk.ua\0"
-"kazuno.akita.jp\0"
-"eu.meteorapp.com\0"
-"ibara.okayama.jp\0sklep.pl\0nis.za\0cloud.fedoraproject.org\0"
-"com.kg\0\xd7\xa7\xd7\x95\xd7\x9d\0s3.dualstack.ap-southeast-1.amazonaws.com\0"
-"com.ki\0"
-"jan-mayen.no\0"
-"kunigami.okinawa.jp\0"
-"com.km\0"
-"tsumagoi.gunma.jp\0"
-"usdecorativearts.museum\0leikanger.no\0"
-"obira.hokkaido.jp\0com.kp\0"
-"com.la\0"
-"com.lb\0*.alces.network\0"
-"com.lc\0"
-"artanddesign.museum\0osen.no\0"
-"sn\xc3\xa5sa.no\0"
-"com.kw\0dreamhosters.com\0"
-"tamakawa.fukushima.jp\0mykolaiv.ua\0"
-"com.ky\0"
-"com.kz\0"
-"com.lk\0freebox-os.fr\0withyoutube.com\0"
-"cc.nv.us\0"
-"aknoluokta.no\0"
-"pi.leg.br\0"
-"pvh.br\0"
-"tsunan.niigata.jp\0com.lr\0skin\0"
-"k12.fl.us\0pizza\0"
-"kashima.saga.jp\0nt.ro\0"
-"com.lv\0"
-"cuneo.it\0kainan.tokushima.jp\0com.mg\0*.kunden.ortsinfo.at\0"
-"k12.ar.us\0"
-"com.ly\0"
-"com.mk\0discover\0from-id.com\0"
-"com.ml\0tysvar.no\0"
-"n\xc3\xa6r\xc3\xb8y.no\0bplaced.net\0"
-"kai.yamanashi.jp\0"
-"com.mo\0globo\0"
-"com.na\0"
-"bifuka.hokkaido.jp\0"
-"com.ms\0lunner.no\0qualifioapp.com\0"
-"com.mt\0"
-"obama.nagasaki.jp\0com.mu\0"
-"com.mv\0com.nf\0vuelos\0"
-"com.mw\0com.ng\0"
-"com.mx\0"
-"com.my\0com.ni\0"
-"kamagaya.chiba.jp\0"
-"df.gov.br\0komatsu\0"
-"channelsdvr.net\0global.prod.fastly.net\0"
-"nara.jp\0"
-"mo\xc3\xa5reke.no\0bible\0"
-"ne.jp\0"
-"uenohara.yamanashi.jp\0bindal.no\0com.nr\0"
-"ne.ke\0"
-"tula.su\0"
-"costume.museum\0od.ua\0"
-"bulsan-sudtirol.it\0soma.fukushima.jp\0osakikamijima.hiroshima.jp\0nishikawa.yamagata.jp\0user.aseinet.ne.jp\0"
-"y.bg\0"
-"pp.az\0com.om\0"
-"bilbao.museum\0"
-"ne.kr\0com.pa\0"
-"definima.net\0"
-"cloudfront.net\0"
-"com.pe\0"
-"com.pf\0cv.ua\0"
-"kitayama.wakayama.jp\0lier.no\0"
-"com.ph\0at-band-camp.net\0"
-"sch.id\0com.pk\0"
-"tj.cn\0com.pl\0"
-"shimotsuma.ibaraki.jp\0\xe0\xa4\xad\xe0\xa4\xbe\xe0\xa4\xb0\xe0\xa4\xa4\0"
-"ruovat.no\0"
-"com.qa\0"
-"kamitsue.oita.jp\0com.pr\0mlbfan.org\0"
-"\xe4\xbd\x90\xe8\xb3\x80.jp\0bill.museum\0com.ps\0exchange\0"
-"com.pt\0"
-"jgora.pl\0"
-"sch.ir\0com.py\0go-vip.co\0"
-"center\0"
-"elasticbeanstalk.com\0"
-"pvt.k12.ma.us\0"
-"otsuki.kochi.jp\0"
-"nextdirect\0"
-"the.br\0dsmynas.net\0"
-"com.re\0lib.la.us\0"
-"natal.br\0sch.jo\0"
-"karasuyama.tochigi.jp\0"
-"ravenna.it\0"
-"matsubushi.saitama.jp\0deals\0vpndns.net\0"
-"med.br\0meland.no\0"
-"perso.ht\0ringebu.no\0"
-"ikoma.nara.jp\0sakai.osaka.jp\0"
-"anthropology.museum\0durham.museum\0"
-"com.ro\0"
-"weather\0myjino.ru\0"
-"com.sa\0"
-"dgca.aero\0com.sb\0"
-"com.sc\0"
-"com.sd\0"
-"com.se\0com.ru\0"
-"ibaraki.jp\0com.sg\0"
-"com.sh\0"
-"matsumoto.nagano.jp\0"
-"niigata.jp\0com.sl\0"
-"video\0"
-"art.museum\0virtual.museum\0com.sn\0"
-"com.so\0"
-"itako.ibaraki.jp\0sch.lk\0rodeo\0"
-"com.ss\0northwesternmutual\0"
-"ogata.akita.jp\0com.st\0pt.eu.org\0"
-"opoczno.pl\0podhale.pl\0lugs.org.uk\0"
-"arteducation.museum\0com.sv\0xnbay.com\0"
-"com.sy\0"
-"correios-e-telecomunica\xc3\xa7\xc3\xb5""es.museum\0com.tj\0"
-"milano.it\0roma.it\0s3-fips-us-gov-west-1.amazonaws.com\0"
-"med.ec\0*.awdev.ca\0"
-"com.tm\0"
-"med.ee\0com.tn\0"
-"com.to\0pe.leg.br\0yandexcloud.net\0"
-"sch.ly\0"
-"com.ua\0paris\0"
-"com.tr\0discourse.group\0"
-"host\0"
-"com.tt\0"
-"francaise.museum\0ne.pw\0"
-"com.tw\0com.ug\0us-east-1.elasticbeanstalk.com\0"
-"modelling.aero\0k12.sc.us\0"
-"katsuragi.wakayama.jp\0klodzko.pl\0"
-"rad\xc3\xb8y.no\0from-la.net\0"
-"nishiawakura.okayama.jp\0"
-"sch.ng\0online.th\0from-ak.com\0"
-"utah.museum\0"
-"v\xc3\xa5gan.no\0"
-"nagasaki.jp\0"
-"ogasawara.tokyo.jp\0varoy.no\0com.vc\0"
-"v\xc3\xa5ler.\xc3\xb8stfold.no\0"
-"com.ve\0"
-"k12.gu.us\0"
-"priv.hu\0"
-"com.uy\0com.vi\0"
-"trani-andria-barletta.it\0kawaminami.miyazaki.jp\0com.uz\0"
-"tr\xc3\xb8gstad.no\0"
-"iijima.nagano.jp\0"
-"com.vn\0"
-"isumi.chiba.jp\0"
-"*.moonscale.io\0"
-"com.vu\0"
-"tohnosho.chiba.jp\0"
-"guide\0"
-"yolasite.com\0"
-"is-a-lawyer.com\0"
-"mugi.tokushima.jp\0"
-"democracia.bo\0"
-"*.nagoya.jp\0"
-"com.ws\0"
-"lifestyle\0"
-"helsinki\0"
-"miyada.nagano.jp\0"
-"\xd8\xa7\xd8\xb1\xd8\xa7\xd9\x85\xd9\x83\xd9\x88\0"
-"sch.qa\0"
-"akaiwa.okayama.jp\0"
-"med.ht\0"
-"flog.br\0"
-"from-tx.com\0"
-"s3-website.eu-west-3.amazonaws.com\0"
-"j.bg\0okawa.kochi.jp\0we.bs\0"
-"brumunddal.no\0pruszkow.pl\0ne.ug\0"
-"odo.br\0ponpes.id\0"
-"sk.ca\0*.sapporo.jp\0"
-"ne.tz\0"
-"0.bg\0corsica\0"
-"grane.no\0"
-"motosu.gifu.jp\0"
-"\xe0\xae\x87\xe0\xae\xb2\xe0\xae\x99\xe0\xaf\x8d\xe0\xae\x95\xe0\xaf\x88\0"
-"taa.it\0"
-"minamiaiki.nagano.jp\0"
-"lowicz.pl\0ne.us\0cloudns.pro\0"
-"surgeonshall.museum\0"
-"sandoy.no\0"
-"textile.museum\0"
-"sch.sa\0"
-"ga.us\0"
-"com.zm\0"
-"trd.br\0ogawa.nagano.jp\0"
-"trentino-stirol.it\0wegrow.pl\0selfip.net\0"
-"vlog.br\0est-a-la-masion.com\0"
-"obu.aichi.jp\0"
-"meet\0"
-"fhsk.se\0sch.so\0"
-"kasugai.aichi.jp\0stuff-4-sale.org\0kalmykia.su\0priv.at\0"
-"architecture.museum\0\xe6\x88\x91\xe7\x88\xb1\xe4\xbd\xa0\0"
-"nagiso.nagano.jp\0"
-"balsan-suedtirol.it\0"
-"romskog.no\0grozny.su\0telebit.app\0"
-"beiarn.no\0"
-"koge.tottori.jp\0"
-"takata.fukuoka.jp\0iwafune.tochigi.jp\0aremark.no\0"
-"of.fashion\0"
-"iiyama.nagano.jp\0cambridge.museum\0lib.al.us\0"
-"ouda.nara.jp\0"
-"trentin-sud-tirol.it\0kawakami.nara.jp\0"
-"med.ly\0"
-"wedeploy.sh\0"
-"kijo.miyazaki.jp\0"
-"fl\xc3\xa5.no\0"
-"tono.iwate.jp\0"
-"masfjorden.no\0"
-"yoichi.hokkaido.jp\0"
-"gateway.museum\0bike\0"
-"h\xc3\xb8nefoss.no\0"
-"rexroth\0"
-"kure.hiroshima.jp\0"
-"kalmykia.ru\0"
-"tsuno.kochi.jp\0"
-"nagawa.nagano.jp\0"
-"engineer.aero\0notaires.fr\0"
-"flora.no\0"
-"moriyama.shiga.jp\0"
-"izu.shizuoka.jp\0"
-"kouzushima.tokyo.jp\0"
-"cc.wv.us\0azure\0is-a-nurse.com\0pr.leg.br\0"
-"gamagori.aichi.jp\0"
-"fuji.shizuoka.jp\0"
-"grozny.ru\0"
-"engerdal.no\0"
-"yame.fukuoka.jp\0med.om\0liaison\0"
-"tashkent.su\0"
-"cc.pr.us\0\xe6\x94\xbf\xe5\xba\x9c\0"
-"med.pa\0"
-"s\xc3\xb8rreisa.no\0bashkiria.ru\0"
-"shimokawa.hokkaido.jp\0"
-"archaeology.museum\0parts\0"
-"sveio.no\0cityeats\0"
-"cc.in.us\0"
-"florida.museum\0med.pl\0"
-"canada.museum\0"
-"party\0homedns.org\0dyn-vpn.de\0"
-"pp.se\0pp.ru\0"
-"shimonita.gunma.jp\0kawachinagano.osaka.jp\0"
-"y.se\0"
-"tsugaru.aomori.jp\0nesodden.no\0is-an-engineer.com\0"
-"rj.gov.br\0"
-"usgarden.museum\0cc.az.us\0click\0"
-"bashkiria.su\0"
-"agematsu.nagano.jp\0"
-"pa.it\0obama.fukui.jp\0"
-"umb.it\0railroad.museum\0"
-"nikolaev.ua\0bing\0"
-"yokoze.saitama.jp\0"
-"repl.run\0"
-"firewall-gateway.com\0"
-"lg.jp\0holmestrand.no\0bar.pro\0broke-it.net\0"
-"kasamatsu.gifu.jp\0channel\0"
-"taobao\0"
-"sch.zm\0pp.ua\0"
-"meme\0"
-"b\xc3\xb8.nordland.no\0"
-"sumoto.hyogo.jp\0lv.ua\0"
-"med.sa\0"
-"langevag.no\0med.sd\0"
-"careers\0"
-"onojo.fukuoka.jp\0"
-"crown\0moscow\0"
-"alaska.museum\0"
-"anani.br\0susono.shizuoka.jp\0mysecuritycamera.net\0"
-"radom.pl\0"
-"takko.aomori.jp\0matsukawa.nagano.jp\0"
-"dattorelay.com\0"
-"calvinklein\0"
-"aca.pro\0"
-"il.us\0"
-"oyama.tochigi.jp\0"
-"bplaced.de\0"
-"lig.it\0condos\0dynvpn.de\0"
-"tydal.no\0menu\0"
-"jx.cn\0"
-"tokai.aichi.jp\0stat.no\0"
-"toyoura.hokkaido.jp\0shinagawa.tokyo.jp\0"
-"geology.museum\0"
-"lib.ne.us\0forex\0"
-"kitakata.fukushima.jp\0labour.museum\0"
-"oregon.museum\0perso.sn\0supplies\0"
-"oppdal.no\0"
-"mielno.pl\0"
-"photos\0"
-"lazio.it\0"
-"inder\xc3\xb8y.no\0"
-"naroy.no\0"
-"nikko.tochigi.jp\0hm.no\0"
-"dellogliastra.it\0perso.tn\0"
-"ayagawa.kagawa.jp\0"
-"barum.no\0"
-"nagasu.kumamoto.jp\0"
-"nakai.kanagawa.jp\0ikano\0l-o-g-i-n.de\0"
-"setouchi.okayama.jp\0"
-"tenkawa.nara.jp\0"
-"is-a-personaltrainer.com\0wedeploy.me\0"
-"uhren.museum\0"
-"hitachinaka.ibaraki.jp\0rissa.no\0"
-"nieruchomosci.pl\0"
-"gs.jan-mayen.no\0"
-"trentin-sued-tirol.it\0"
-"tsuru.yamanashi.jp\0"
-"ofunato.iwate.jp\0"
-"oto.fukuoka.jp\0"
-"b-data.io\0"
-"cleaning\0"
-"birkenes.no\0laakesvuemie.no\0"
-"war.museum\0appchizi.com\0"
-"eidsberg.no\0"
-"sevastopol.ua\0house\0"
-"tateyama.chiba.jp\0"
-"swiebodzin.pl\0"
-"shishikui.tokushima.jp\0"
-"kanagawa.jp\0palmsprings.museum\0yalta.ua\0"
-"mashiko.tochigi.jp\0"
-"cc.ky.us\0"
-"cloudns.org\0"
-"historyofscience.museum\0"
-"yanaizu.fukushima.jp\0akkeshi.hokkaido.jp\0ap-northeast-3.elasticbeanstalk.com\0"
-"hangout\0"
-"izumo.shimane.jp\0farsund.no\0"
-"per.la\0cc.ak.us\0flights\0"
-"stjordal.no\0"
-"its.me\0"
-"mitsuke.niigata.jp\0hino.tokyo.jp\0"
-"horology.museum\0pokrovsk.su\0"
-"vision\0"
-"bio.br\0pioneer\0"
-"cheap\0"
-"annaka.gunma.jp\0"
-"vall\xc3\xa9""e-aoste.it\0"
-"sandvikcoromant\0"
-"ct.it\0"
-"website\0"
-"uzs.gov.pl\0"
-"*.compute.estate\0"
-"tsurugi.ishikawa.jp\0minamimaki.nagano.jp\0"
-"square.museum\0lg.ua\0"
-"abiko.chiba.jp\0kerryhotels\0"
-"tychy.pl\0"
-"sannan.hyogo.jp\0"
-"kurate.fukuoka.jp\0"
-"spb.ru\0"
-"per.nf\0"
-"uda.nara.jp\0arts.museum\0"
-"oiso.kanagawa.jp\0"
-"pa.us\0"
-"tw.cn\0"
-"directory\0luxe\0"
-"gs.nt.no\0amsterdam\0"
-"dynalias.org\0spb.su\0"
-"dyndns.org\0from-sd.com\0"
-"*.kawasaki.jp\0"
-"ojiya.niigata.jp\0"
-"sa.gov.au\0priv.pl\0"
-"mediocampidano.it\0"
-"kawakita.ishikawa.jp\0"
-"tozsde.hu\0"
-"consultant.aero\0"
-"choyo.kumamoto.jp\0lanxess\0hu.net\0"
-"vf.no\0"
-"kokubunji.tokyo.jp\0"
-"rl.no\0"
-"halloffame.museum\0"
-"ginoza.okinawa.jp\0"
-"valle-d-aosta.it\0"
-"suisse.museum\0"
-"soc.lk\0kddi\0"
-"national.museum\0"
-"*.elb.amazonaws.com\0"
-"hirono.fukushima.jp\0""3utilities.com\0"
-"yonaguni.okinawa.jp\0"
-"priv.no\0"
-"vinnica.ua\0"
-"clubmed\0"
-"creditcard\0money\0"
-"deatnu.no\0\xd9\xbe\xd8\xa7\xd9\x83\xd8\xb3\xd8\xaa\xd8\xa7\xd9\x86\0is-into-anime.com\0cloud.goog\0"
-"s3-us-west-1.amazonaws.com\0s3-website-us-west-1.amazonaws.com\0"
-"rr.gov.br\0"
-"tamamura.gunma.jp\0"
-"s3.ca-central-1.amazonaws.com\0"
-"bonn.museum\0"
-"keisen.fukuoka.jp\0"
-"est-a-la-maison.com\0"
-"bo.telemark.no\0"
-"ise.mie.jp\0"
-"accountant\0"
-"\xc3\xa5mli.no\0per.sg\0"
-"campania.it\0"
-"ski.no\0"
-"blogspot.com.cy\0"
-"tanohata.iwate.jp\0ashikaga.tochigi.jp\0bounceme.net\0"
-"priv.me\0"
-"mitane.akita.jp\0"
-"sejny.pl\0"
-"rs.gov.br\0sc.gov.br\0wazuka.kyoto.jp\0"
-"k12.id.us\0"
-"volvo\0"
-"turin.it\0blogspot.com.ee\0"
-"lamer\0"
-"tarumizu.kagoshima.jp\0blogspot.com.eg\0"
-"s3.dualstack.eu-west-1.amazonaws.com\0east-kazakhstan.su\0"
-"awaji.hyogo.jp\0"
-"umbria.it\0fujimi.nagano.jp\0nov.ru\0"
-"s\xc3\xb8r-fron.no\0"
-"ebino.miyazaki.jp\0orx.biz\0"
-"wedeploy.io\0"
-"school.museum\0"
-"onyourside\0s3-website-ap-southeast-1.amazonaws.com\0xenapponazure.com\0"
-"blogspot.com.ar\0"
-"chikuma.nagano.jp\0toshiba\0"
-"us.com\0"
-"blogspot.com.au\0"
-"ms.it\0"
-"elk.pl\0nohost.me\0"
-"sakado.saitama.jp\0"
-"forum\0"
-"shinkamigoto.nagasaki.jp\0nov.su\0"
-"guovdageaidnu.no\0"
-"ba.gov.br\0"
-"\xd8\xb3\xd9\x88\xd8\xb1\xd9\x8a\xd8\xa7\0firmdale\0gmail\0"
-"\xd0\xbe\xd0\xb4.\xd1\x81\xd1\x80\xd0\xb1\0\xd8\xb3\xd9\x88\xd8\xb1\xd9\x8a\xd8\xa9\0is-very-bad.org\0blogspot.com.br\0"
-"kadena.okinawa.jp\0\xe4\xb8\xad\xe5\x9b\xbd\0*.spectrum.myjino.ru\0"
-"ce.it\0rindal.no\0"
-"noda.chiba.jp\0hoteles\0"
-"kopervik.no\0myfirewall.org\0"
-"traniandriabarletta.it\0blogspot.com.by\0"
-"cymru.museum\0"
-"w.bg\0kh.ua\0blogspot.com.co\0"
-"alstahaug.no\0"
-"\xe4\xb8\xad\xe5\x9c\x8b\0gb.com\0"
-"komatsushima.tokushima.jp\0arakawa.tokyo.jp\0"
-"ms.kr\0"
-"food\0"
-"sandefjord.no\0"
-"stranda.no\0"
-"sncf\0"
-"sx.cn\0"
-"kawanabe.kagoshima.jp\0"
-"md.ci\0serveexchange.com\0"
-"s3.ap-northeast-2.amazonaws.com\0"
-"ct.us\0"
-"whaling.museum\0rana.no\0game.tw\0"
-"yotsukaido.chiba.jp\0"
-"osteroy.no\0"
-"caltanissetta.it\0"
-"schule\0xbox\0"
-"blogspot.com.es\0"
-"higashiura.aichi.jp\0casacam.net\0"
-"iamallama.com\0"
-"nagai.yamagata.jp\0"
-"kaisei.kanagawa.jp\0lib.ks.us\0stufftoread.com\0"
-"website.yandexcloud.net\0"
-"aioi.hyogo.jp\0"
-"ras.ru\0"
-"rn.gov.br\0udono.mie.jp\0"
-"\xe7\xb5\x84\xe7\xbb\x87.hk\0origins\0"
-"kuju.oita.jp\0"
-"football\0lawyer\0"
-"ford\0"
-"ikaruga.nara.jp\0nanbu.tottori.jp\0"
-"modena.it\0\xe8\x81\x94\xe9\x80\x9a\0"
-"eng.br\0"
-"\xe0\xae\x9a\xe0\xae\xbf\xe0\xae\x99\xe0\xaf\x8d\xe0\xae\x95\xe0\xae\xaa\xe0\xaf\x8d\xe0\xae\xaa\xe0\xaf\x82\xe0\xae\xb0\xe0\xaf\x8d\0"
-"otari.nagano.jp\0kin.okinawa.jp\0"
-"shiso.hyogo.jp\0"
-"bu.no\0cupcake.is\0"
-"hirosaki.aomori.jp\0"
-"\xd8\xa7\xdb\x8c\xd8\xb1\xd8\xa7\xd9\x86\0"
-"computer\0"
-"\xe6\x94\xbf\xe5\xba\x9c.hk\0liguria.it\0hanamigawa.chiba.jp\0chrome\0"
-"is-an-anarchist.com\0"
-"tananger.no\0gop.pk\0"
-"fie.ee\0"
-"canon\0"
-"ro.gov.br\0"
-"diskstation.me\0"
-"aircraft.aero\0realtor\0"
-"kahoku.yamagata.jp\0"
-"ryuoh.shiga.jp\0"
-"gunma.jp\0lebork.pl\0"
-"aisai.aichi.jp\0"
-"diskstation.eu\0"
-"motorcycle.museum\0karpacz.pl\0"
-"attorney\0"
-"cc.ne.us\0"
-"am.gov.br\0"
-"international\0"
-"2ix.at\0"
-"britishcolumbia.museum\0sebastopol.ua\0cc.ga.us\0\xe7\x82\xb9\xe7\x9c\x8b\0"
-"frontdoor\0"
-"s3.dualstack.sa-east-1.amazonaws.com\0"
-"osakasayama.osaka.jp\0"
-"pn.it\0"
-"yawatahama.ehime.jp\0somna.no\0"
-"lt.it\0"
-"nanyo.yamagata.jp\0nissedal.no\0"
-"dep.no\0"
-"*.platform.sh\0"
-"forlicesena.it\0donostia.museum\0s3.dualstack.ap-northeast-2.amazonaws.com\0no.com\0"
-"\xd8\xa7\xd9\x84\xd8\xb3\xd8\xb9\xd9\x88\xd8\xaf\xdb\x8c\xd8\xa9\0""2ix.ch\0"
-"kurashiki.okayama.jp\0"
-"rentals\0is-an-artist.com\0"
-"minamifurano.hokkaido.jp\0motorcycles\0"
-"puglia.it\0av.it\0delmenhorst.museum\0"
-"kragero.no\0"
-"venice.it\0""2ix.de\0"
-"nc.tr\0"
-"selfip.org\0"
-"h.bg\0from-dc.com\0in-the-band.net\0"
-"haram.no\0"
-"khplay.nl\0"
-"selfip.info\0karelia.su\0mysecuritycamera.org\0"
-"test-iserv.de\0"
-"pors\xc3\xa1\xc5\x8bgu.no\0"
-"takasago.hyogo.jp\0artcenter.museum\0"
-"blogspot.com.mt\0"
-"ms.us\0nc.us\0"
-"chitose.hokkaido.jp\0"
-"blogspot.com.ng\0"
-"val-d-aosta.it\0raisa.no\0"
-"tamatsukuri.ibaraki.jp\0"
-"friuli-veneziagiulia.it\0yachiyo.chiba.jp\0"
-"musica.ar\0"
-"in.net\0"
-"nuoro.it\0ms.leg.br\0"
-"kuromatsunai.hokkaido.jp\0przeworsk.pl\0"
-"smola.no\0"
-"equipment.aero\0"
-"hk.cn\0"
-"itabashi.tokyo.jp\0stalbans.museum\0nannestad.no\0"
-"musica.bo\0lib.nv.us\0"
-"schokoladen.museum\0"
-"esan.hokkaido.jp\0"
-"own.pm\0"
-"k12.ec\0realm.cz\0"
-"chino.nagano.jp\0mayfirst.org\0"
-"ichiba.tokushima.jp\0"
-"bryne.no\0lib.ct.us\0is-an-accountant.com\0"
-"iyo.ehime.jp\0sener\0"
-"george\0"
-"ap.gov.br\0"
-"nishiarita.saga.jp\0takahata.yamagata.jp\0krokstadelva.no\0barsy.shop\0"
-"blogspot.com.tr\0"
-"mt.leg.br\0"
-"hsbc\0icbc\0unusualperson.com\0"
-"natori.miyagi.jp\0"
-"gose.nara.jp\0"
-"bharti\0flowers\0"
-"pug.it\0pila.pl\0"
-"kyotango.kyoto.jp\0"
-"iitate.fukushima.jp\0pl.eu.org\0"
-"ap.gov.pl\0"
-"zero\0"
-"cartier\0"
-"cricket\0"
-"baidar.no\0tiffany\0"
-"konin.pl\0"
-"illustration.museum\0"
-"brandywinevalley.museum\0"
-"munakata.fukuoka.jp\0leka.no\0from-va.com\0"
-"touch.museum\0"
-"is-a-bulls-fan.com\0"
-"leangaviika.no\0"
-"t3l3p0rt.net\0"
-"tobe.ehime.jp\0"
-"berlev\xc3\xa5g.no\0"
-"godaddy\0blogdns.com\0"
-"miyazaki.miyazaki.jp\0"
-"krager\xc3\xb8.no\0"
-"cc.il.us\0"
-"earth\0"
-"vs.it\0playstation\0"
-"w.se\0"
-"si.it\0"
-"se.gov.br\0k12.il\0"
-"nakagawa.hokkaido.jp\0edeka\0ac.leg.br\0"
-"ono.fukui.jp\0"
-"kiyosato.hokkaido.jp\0shika.ishikawa.jp\0atsugi.kanagawa.jp\0"
-"mikasa.hokkaido.jp\0"
-"tako.chiba.jp\0"
-"appspot.com\0"
-"le.it\0seika.kyoto.jp\0"
-"barcelona.museum\0"
-"space-to-rent.com\0"
-"verdal.no\0"
-"inazawa.aichi.jp\0"
-"heguri.nara.jp\0epson\0"
-"microlight.aero\0ag.it\0"
-"blogspot.com.uy\0"
-"\xe7\xbd\x91\xe7\xbb\x9c\0"
-"katano.osaka.jp\0mosj\xc3\xb8""en.no\0lt.ua\0"
-"e12.ve\0"
-"\xe7\xbd\x91\xe7\xbb\x9c.cn\0"
-"yn.cn\0"
-"not.br\0"
-"av.tr\0"
-"md.us\0"
-"christiansburg.museum\0"
-"hiraizumi.iwate.jp\0"
-"montreal.museum\0"
-"nichinan.miyazaki.jp\0"
-"makeup\0"
-"doomdns.com\0"
-"al.eu.org\0"
-"saves-the-whales.com\0"
-"hanyu.saitama.jp\0"
-"gs.hm.no\0"
-"kainan.wakayama.jp\0"
-"protonet.io\0"
-"construction\0"
-"katsuyama.fukui.jp\0"
-"kaho.fukuoka.jp\0"
-"acct.pro\0"
-"\xc3\xa5seral.no\0kaszuby.pl\0"
-"edu.ac\0"
-"isesaki.gunma.jp\0caseih\0"
-"l\xc3\xa1hppi.no\0"
-"edu.af\0vana\0operaunite.com\0"
-"neyagawa.osaka.jp\0saskatchewan.museum\0photography\0"
-"ginan.gifu.jp\0\xd8\xa7\xd9\x84\xd8\xb3\xd8\xb9\xd9\x88\xd8\xaf\xdb\x8c\xdb\x83\0"
-"edu.al\0davvenj\xc3\xa1rga.no\0is-a-rockstar.com\0"
-"hidaka.wakayama.jp\0"
-"audnedaln.no\0"
-"mopar\0"
-"edu.ba\0"
-"edu.ar\0edu.bb\0\xd9\x81\xd9\x84\xd8\xb3\xd8\xb7\xd9\x8a\xd9\x86\0"
-"cody.museum\0"
-"khmelnytskyi.ua\0\xe5\xbe\xae\xe5\x8d\x9a\0"
-"edu.au\0nogata.fukuoka.jp\0ashibetsu.hokkaido.jp\0\xe7\xbb\x84\xe7\xbb\x87\xe6\x9c\xba\xe6\x9e\x84\0"
-"sa.gov.pl\0"
-"edu.bh\0"
-"gliding.aero\0edu.bi\0sohu\0"
-"edu.az\0miyagi.jp\0"
-"science-fiction.museum\0"
-"edu.bm\0allstate\0"
-"edu.bn\0"
-"edu.bo\0v\xc3\xa1rgg\xc3\xa1t.no\0"
-"yamada.iwate.jp\0"
-"wanggou\0"
-"edu.br\0"
-"edu.bs\0"
-"edu.bt\0"
-"arida.wakayama.jp\0"
-"edu.ci\0"
-"edu.bz\0"
-"tsubame.niigata.jp\0habikino.osaka.jp\0"
-"edu.cn\0\xe7\xbd\x91\xe7\xbb\x9c.hk\0"
-"edu.co\0"
-"\xe9\x95\xb7\xe9\x87\x8e.jp\0hzc.io\0"
-"sa.edu.au\0aso.kumamoto.jp\0kasukabe.saitama.jp\0"
-"kamikawa.saitama.jp\0"
-"edu.cu\0"
-"geisei.kochi.jp\0"
-"edu.cw\0"
-"saogonca.br\0"
-"beauxarts.museum\0"
-"izumiotsu.osaka.jp\0no-ip.biz\0"
-"karikatur.museum\0anquan\0"
-"edu.dm\0\xe0\xa8\xad\xe0\xa8\xbe\xe0\xa8\xb0\xe0\xa8\xa4\0"
-"k12.ma.us\0grainger\0"
-"edu.do\0nakijin.okinawa.jp\0"
-"lixil\0"
-"cc.pa.us\0"
-"edu.ec\0higashiosaka.osaka.jp\0"
-"edu.ee\0"
-"edu.eg\0"
-"edu.dz\0val-daosta.it\0chikusei.ibaraki.jp\0"
-"psi.br\0"
-"gotpantheon.com\0"
-"h.se\0"
-"edu.es\0"
-"edu.et\0myiphost.com\0"
-"istmein.de\0"
-"balsan.it\0"
-"media\0"
-"docs\0"
-"ora.gunma.jp\0"
-"rockart.museum\0\xe3\x82\xaf\xe3\x83\xa9\xe3\x82\xa6\xe3\x83\x89\0barsy.site\0"
-"s3-ap-southeast-1.amazonaws.com\0"
-"witd.gov.pl\0"
-"edu.ge\0nemuro.hokkaido.jp\0"
-"trentino-s\xc3\xbc""dtirol.it\0cr.it\0"
-"edu.gh\0"
-"edu.gi\0miharu.fukushima.jp\0"
-"cesena-forl\xc3\xac.it\0property\0"
-"song\0"
-"edu.gl\0"
-"sakawa.kochi.jp\0oirm.gov.pl\0"
-"edu.gn\0holiday\0"
-"edu.gp\0benevento.it\0"
-"aju.br\0edu.gr\0k12.tr\0"
-"hashimoto.wakayama.jp\0blog\0final\0"
-"show.aero\0edu.gt\0trentino-alto-adige.it\0chanel\0"
-"edu.gu\0"
-"edu.gy\0"
-"edu.hk\0""2000.hu\0"
-"gs.vf.no\0cust.prod.thingdust.io\0"
-"sony\0"
-"edu.hn\0"
-"gs.rl.no\0hyatt\0"
-"yachimata.chiba.jp\0"
-"edu.ht\0gniezno.pl\0"
-"izumozaki.niigata.jp\0"
-"asso.fr\0tsuruta.aomori.jp\0celtic.museum\0"
-"fm.br\0k12.vi\0"
-"beats\0net-freaks.com\0"
-"cn-northwest-1.eb.amazonaws.com.cn\0"
-"\xe5\xba\x83\xe5\xb3\xb6.jp\0takahama.aichi.jp\0"
-"edu.in\0"
-"edu.iq\0"
-"edu.is\0game\0"
-"asso.gp\0edu.it\0dscloud.biz\0"
-"k\xc3\xa1r\xc3\xa1\xc5\xa1johka.no\0"
-"depot.museum\0"
-"natural.bo\0lib.md.us\0"
-"sano.tochigi.jp\0"
-"edu.jo\0kaminokawa.tochigi.jp\0"
-"store\0"
-"zagan.pl\0"
-"kmpsp.gov.pl\0vologda.su\0"
-"accident-prevention.aero\0"
-"edu.kg\0land-4-sale.us\0"
-"asso.ht\0"
-"edu.ki\0lib.ar.us\0"
-"unzen.nagasaki.jp\0edu.km\0"
-"edu.kn\0is-saved.org\0"
-"edu.kp\0comcast\0"
-"akita.akita.jp\0edu.la\0"
-"edu.lb\0"
-"rikubetsu.hokkaido.jp\0edu.lc\0"
-"finance\0"
-"daiwa.hiroshima.jp\0s\xc3\xa1l\xc3\xa1t.no\0dunlop\0"
-"edu.kw\0history.museum\0"
-"niyodogawa.kochi.jp\0""1kapp.com\0"
-"shonai.yamagata.jp\0edu.ky\0sciences.museum\0"
-"edu.kz\0"
-"edu.lk\0"
-"asso.bj\0for.sale\0"
-"aurland.no\0"
-"foundation\0otsuka\0"
-"edu.lr\0"
-"edu.ls\0"
-"edu.me\0"
-"mihama.chiba.jp\0edu.lv\0"
-"edu.mg\0"
-"edu.ly\0"
-"edu.mk\0"
-"edu.ml\0nittedal.no\0"
-"asso.ci\0"
-"edu.mn\0"
-"edu.mo\0"
-"blue\0"
-"edu.ms\0"
-"edu.mt\0dnsalias.com\0"
-"edu.mv\0lab.ms\0"
-"marburg.museum\0edu.mw\0edu.ng\0"
-"edu.mx\0"
-"edu.my\0edu.ni\0"
-"tas.edu.au\0edu.mz\0"
-"muosat.no\0"
-"amami.kagoshima.jp\0omi.niigata.jp\0"
-"etnedal.no\0kutno.pl\0"
-"\xe5\xb2\xa9\xe6\x89\x8b.jp\0energy\0al.leg.br\0"
-"from-hi.com\0"
-"kharkiv.ua\0"
-"crd.co\0"
-"\xe9\xb3\xa5\xe5\x8f\x96.jp\0edu.nr\0mytis.ru\0"
-"sicily.it\0ichinoseki.iwate.jp\0s3-website.eu-west-2.amazonaws.com\0webhop.me\0"
-"sharp\0"
-"kiev.ua\0"
-"yuasa.wakayama.jp\0cc.ct.us\0"
-"schlesisches.museum\0marine.ru\0filegear-ie.me\0caa.li\0"
-"!city.kawasaki.jp\0azerbaijan.su\0""32-b.it\0"
-"edu.om\0"
-"asso.dz\0read-books.org\0"
-"troms\xc3\xb8.no\0"
-"immobilien\0"
-"na.it\0hob\xc3\xb8l.no\0edu.pa\0"
-"\xe4\xbf\xa1\xe6\x81\xaf\0"
-"no.eu.org\0"
-"edu.pe\0"
-"steigen.no\0edu.pf\0"
-"kautokeino.no\0"
-"edu.ph\0"
-"fm.it\0edu.pk\0vladikavkaz.ru\0"
-"edu.pl\0"
-"dnipropetrovsk.ua\0"
-"edu.pn\0"
-"bs.it\0abashiri.hokkaido.jp\0otsuki.yamanashi.jp\0"
-"gjerdrum.no\0edu.qa\0"
-"gojome.akita.jp\0yamanashi.yamanashi.jp\0edu.pr\0"
-"oshima.tokyo.jp\0edu.ps\0"
-"edu.pt\0"
-"lind\xc3\xa5s.no\0"
-"edu.py\0devices.resinstaging.io\0"
-"u.bg\0"
-"vladikavkaz.su\0"
-"davvenjarga.no\0"
-"yamada.fukuoka.jp\0sakuho.nagano.jp\0ut.us\0"
-"koza.wakayama.jp\0ravendb.community\0"
-"moriguchi.osaka.jp\0nsn.us\0"
-"tgory.pl\0"
-"engine.aero\0"
-"media.museum\0free\0"
-"cr.ua\0svn-repos.de\0"
-"sosa.chiba.jp\0"
-"joburg\0storage.yandexcloud.net\0"
-"mb.ca\0beta.bounty-full.com\0"
-"omi.nagano.jp\0tushu\0"
-"from-or.com\0"
-"iwakura.aichi.jp\0"
-"\xe5\x8c\x97\xe6\xb5\xb7\xe9\x81\x93.jp\0yasuoka.nagano.jp\0guitars\0"
-"oumu.hokkaido.jp\0"
-"rawa-maz.pl\0edu.sa\0"
-"shinjo.okayama.jp\0edu.sb\0"
-"edu.rs\0edu.sc\0"
-"fukui.fukui.jp\0torsken.no\0edu.sd\0"
-"edu.ru\0"
-"ikusaka.nagano.jp\0monticello.museum\0"
-"edu.sg\0for-our.info\0"
-"tas.gov.au\0"
-"historisch.museum\0servemp3.com\0"
-"kaga.ishikawa.jp\0edu.sl\0"
-"shikama.miyagi.jp\0gs.bu.no\0edu.sn\0"
-"edu.so\0"
-"blog.bo\0"
-"edu.ss\0"
-"edu.st\0"
-"blog.br\0"
-"bozen-sudtirol.it\0edu.sv\0"
-"edu.sy\0"
-"edu.tj\0mypi.co\0"
-"\xe7\xb6\xb2\xe7\xbb\x9c.hk\0"
-"cc.na\0edu.tm\0"
-"bygland.no\0"
-"grandrapids.museum\0edu.to\0e4.cz\0"
-"yamaguchi.jp\0malselv.no\0rovno.ua\0"
-"kami.kochi.jp\0edu.ua\0tokyo\0"
-"edu.tr\0r.cdn77.net\0"
-"g\xc3\xa1\xc5\x8bgaviika.no\0s3-ap-northeast-1.amazonaws.com\0"
-"kawara.fukuoka.jp\0heroy.more-og-romsdal.no\0edu.tt\0"
-"from-ms.com\0from-nc.com\0"
-"fm.no\0"
-"edu.tw\0"
-"windmill.museum\0bss.design\0"
-"kiyosu.aichi.jp\0"
-};
-
-static const quint16 tldChunkCount = 2;
-static const quint32 tldChunks[] = {65526, 103395};
-
-QT_END_NAMESPACE
-
-#endif // QURLTLD_P_H
diff --git a/src/corelib/itemmodels/qabstractitemmodel.cpp b/src/corelib/itemmodels/qabstractitemmodel.cpp
index d88960ba0c..a5df17e386 100644
--- a/src/corelib/itemmodels/qabstractitemmodel.cpp
+++ b/src/corelib/itemmodels/qabstractitemmodel.cpp
@@ -63,7 +63,7 @@ QPersistentModelIndexData *QPersistentModelIndexData::create(const QModelIndex &
     Q_ASSERT(index.isValid()); // we will _never_ insert an invalid index in the list
     QPersistentModelIndexData *d = nullptr;
     QAbstractItemModel *model = const_cast<QAbstractItemModel *>(index.model());
-    QHash<QModelIndex, QPersistentModelIndexData *> &indexes = model->d_func()->persistent.indexes;
+    QMultiHash<QModelIndex, QPersistentModelIndexData *> &indexes = model->d_func()->persistent.indexes;
     const auto it = indexes.constFind(index);
     if (it != indexes.cend()) {
         d = (*it);
@@ -665,8 +665,7 @@ void QAbstractItemModelPrivate::rowsAboutToBeInserted(const QModelIndex &parent,
     Q_UNUSED(last);
     QVector<QPersistentModelIndexData *> persistent_moved;
     if (first < q->rowCount(parent)) {
-        for (QHash<QModelIndex, QPersistentModelIndexData *>::const_iterator it = persistent.indexes.constBegin();
-             it != persistent.indexes.constEnd(); ++it) {
+        for (auto it = persistent.indexes.constBegin(); it != persistent.indexes.constEnd(); ++it) {
             QPersistentModelIndexData *data = *it;
             const QModelIndex &index = data->index;
             if (index.row() >= first && index.isValid() && index.parent() == parent) {
@@ -702,14 +701,13 @@ void QAbstractItemModelPrivate::itemsAboutToBeMoved(const QModelIndex &srcParent
     QVector<QPersistentModelIndexData *> persistent_moved_in_source;
     QVector<QPersistentModelIndexData *> persistent_moved_in_destination;
 
-    QHash<QModelIndex, QPersistentModelIndexData *>::const_iterator it;
-    const QHash<QModelIndex, QPersistentModelIndexData *>::const_iterator begin = persistent.indexes.constBegin();
-    const QHash<QModelIndex, QPersistentModelIndexData *>::const_iterator end = persistent.indexes.constEnd();
+    const auto begin = persistent.indexes.constBegin();
+    const auto end = persistent.indexes.constEnd();
 
     const bool sameParent = (srcParent == destinationParent);
     const bool movingUp = (srcFirst > destinationChild);
 
-    for ( it = begin; it != end; ++it) {
+    for (auto it = begin; it != end; ++it) {
         QPersistentModelIndexData *data = *it;
         const QModelIndex &index = data->index;
         const QModelIndex &parent = index.parent();
@@ -814,8 +812,7 @@ void QAbstractItemModelPrivate::rowsAboutToBeRemoved(const QModelIndex &parent,
     QVector<QPersistentModelIndexData *>  persistent_invalidated;
     // find the persistent indexes that are affected by the change, either by being in the removed subtree
     // or by being on the same level and below the removed rows
-    for (QHash<QModelIndex, QPersistentModelIndexData *>::const_iterator it = persistent.indexes.constBegin();
-         it != persistent.indexes.constEnd(); ++it) {
+    for (auto it = persistent.indexes.constBegin(); it != persistent.indexes.constEnd(); ++it) {
         QPersistentModelIndexData *data = *it;
         bool level_changed = false;
         QModelIndex current = data->index;
@@ -858,7 +855,9 @@ void QAbstractItemModelPrivate::rowsRemoved(const QModelIndex &parent,
     for (QVector<QPersistentModelIndexData *>::const_iterator it = persistent_invalidated.constBegin();
          it != persistent_invalidated.constEnd(); ++it) {
         QPersistentModelIndexData *data = *it;
-        persistent.indexes.erase(persistent.indexes.constFind(data->index));
+        auto pit = persistent.indexes.constFind(data->index);
+        if (pit != persistent.indexes.cend())
+            persistent.indexes.erase(pit);
         data->index = QModelIndex();
     }
 }
@@ -870,8 +869,7 @@ void QAbstractItemModelPrivate::columnsAboutToBeInserted(const QModelIndex &pare
     Q_UNUSED(last);
     QVector<QPersistentModelIndexData *> persistent_moved;
     if (first < q->columnCount(parent)) {
-        for (QHash<QModelIndex, QPersistentModelIndexData *>::const_iterator it = persistent.indexes.constBegin();
-             it != persistent.indexes.constEnd(); ++it) {
+        for (auto it = persistent.indexes.constBegin(); it != persistent.indexes.constEnd(); ++it) {
             QPersistentModelIndexData *data = *it;
             const QModelIndex &index = data->index;
             if (index.column() >= first && index.isValid() && index.parent() == parent)
@@ -907,8 +905,7 @@ void QAbstractItemModelPrivate::columnsAboutToBeRemoved(const QModelIndex &paren
     QVector<QPersistentModelIndexData *> persistent_invalidated;
     // find the persistent indexes that are affected by the change, either by being in the removed subtree
     // or by being on the same level and to the right of the removed columns
-    for (QHash<QModelIndex, QPersistentModelIndexData *>::const_iterator it = persistent.indexes.constBegin();
-         it != persistent.indexes.constEnd(); ++it) {
+    for (auto it = persistent.indexes.constBegin(); it != persistent.indexes.constEnd(); ++it) {
         QPersistentModelIndexData *data = *it;
         bool level_changed = false;
         QModelIndex current = data->index;
@@ -3297,7 +3294,11 @@ void QAbstractItemModel::endResetModel()
 {
     Q_D(QAbstractItemModel);
     d->invalidatePersistentIndexes();
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+    resetInternalData();
+#else
     QMetaObject::invokeMethod(this, "resetInternalData");
+#endif
     emit modelReset(QPrivateSignal());
 }
 
@@ -3375,8 +3376,7 @@ QModelIndexList QAbstractItemModel::persistentIndexList() const
     Q_D(const QAbstractItemModel);
     QModelIndexList result;
     result.reserve(d->persistent.indexes.count());
-    for (QHash<QModelIndex, QPersistentModelIndexData *>::const_iterator it = d->persistent.indexes.constBegin();
-         it != d->persistent.indexes.constEnd(); ++it) {
+    for (auto it = d->persistent.indexes.constBegin(); it != d->persistent.indexes.constEnd(); ++it) {
         QPersistentModelIndexData *data = *it;
         result.append(data->index);
     }
@@ -3994,8 +3994,8 @@ bool QAbstractListModel::dropMimeData(const QMimeData *data, Qt::DropAction acti
  */
 void QAbstractItemModelPrivate::Persistent::insertMultiAtEnd(const QModelIndex& key, QPersistentModelIndexData *data)
 {
-    QHash<QModelIndex,QPersistentModelIndexData *>::iterator newIt = indexes.insert(key, data);
-    QHash<QModelIndex,QPersistentModelIndexData *>::iterator it = newIt;
+    auto newIt = indexes.insert(key, data);
+    auto it = newIt;
     ++it;
     while (it != indexes.end() && it.key() == key) {
         qSwap(*newIt,*it);
diff --git a/src/corelib/itemmodels/qabstractitemmodel.h b/src/corelib/itemmodels/qabstractitemmodel.h
index 43649cf79b..2cc1bd8ce6 100644
--- a/src/corelib/itemmodels/qabstractitemmodel.h
+++ b/src/corelib/itemmodels/qabstractitemmodel.h
@@ -156,7 +156,6 @@ inline uint qHash(const QPersistentModelIndex &index, uint seed) noexcept
 Q_CORE_EXPORT QDebug operator<<(QDebug, const QPersistentModelIndex &);
 #endif
 
-template<typename T> class QList;
 typedef QList<QModelIndex> QModelIndexList;
 
 class QMimeData;
diff --git a/src/corelib/itemmodels/qabstractproxymodel.h b/src/corelib/itemmodels/qabstractproxymodel.h
index c9a73b6a31..f6f6e45c1a 100644
--- a/src/corelib/itemmodels/qabstractproxymodel.h
+++ b/src/corelib/itemmodels/qabstractproxymodel.h
@@ -103,7 +103,11 @@ Q_SIGNALS:
     void sourceModelChanged(QPrivateSignal);
 
 protected Q_SLOTS:
-    void resetInternalData();
+    void resetInternalData()
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+    override
+#endif
+    ;
 
 protected:
     QAbstractProxyModel(QAbstractProxyModelPrivate &, QObject *parent);
diff --git a/src/corelib/itemmodels/qitemselectionmodel.h b/src/corelib/itemmodels/qitemselectionmodel.h
index 5820695592..5421eb2afa 100644
--- a/src/corelib/itemmodels/qitemselectionmodel.h
+++ b/src/corelib/itemmodels/qitemselectionmodel.h
@@ -241,7 +241,7 @@ inline uint qHash(const QItemSelectionRange &) { return 0; }
 #   define Q_TEMPLATE_EXTERN extern
 #  endif
 # endif
-Q_TEMPLATE_EXTERN template class Q_CORE_EXPORT QList<QItemSelectionRange>;
+Q_TEMPLATE_EXTERN template class Q_CORE_EXPORT QVector<QItemSelectionRange>;
 #endif // Q_CC_MSVC
 
 class Q_CORE_EXPORT QItemSelection : public QList<QItemSelectionRange>
diff --git a/src/corelib/itemmodels/qsortfilterproxymodel.cpp b/src/corelib/itemmodels/qsortfilterproxymodel.cpp
index 61d37d5062..e0506b12db 100644
--- a/src/corelib/itemmodels/qsortfilterproxymodel.cpp
+++ b/src/corelib/itemmodels/qsortfilterproxymodel.cpp
@@ -280,7 +280,7 @@ public:
         QVector<int> proxy_rows;
         QVector<int> proxy_columns;
         QVector<QModelIndex> mapped_children;
-        QHash<QModelIndex, Mapping *>::const_iterator map_iter;
+        QModelIndex source_parent;
     };
 
     mutable QHash<QModelIndex, Mapping*> source_index_mapping;
@@ -321,7 +321,7 @@ public:
         const void *p = proxy_index.internalPointer();
         Q_ASSERT(p);
         QHash<QModelIndex, Mapping *>::const_iterator it =
-            static_cast<const Mapping*>(p)->map_iter;
+                source_index_mapping.constFind(static_cast<const Mapping*>(p)->source_parent);
         Q_ASSERT(it != source_index_mapping.constEnd());
         Q_ASSERT(it.value());
         return it;
@@ -517,8 +517,7 @@ IndexMap::const_iterator QSortFilterProxyModelPrivate::create_mapping(
     m->proxy_columns.resize(source_cols);
     build_source_to_proxy_mapping(m->source_columns, m->proxy_columns);
 
-    it = IndexMap::const_iterator(source_index_mapping.insert(source_parent, m));
-    m->map_iter = it;
+    m->source_parent = source_parent;
 
     if (source_parent.isValid()) {
         QModelIndex source_grand_parent = source_parent.parent();
@@ -527,6 +526,7 @@ IndexMap::const_iterator QSortFilterProxyModelPrivate::create_mapping(
         it2.value()->mapped_children.append(source_parent);
     }
 
+    it = IndexMap::const_iterator(source_index_mapping.insert(source_parent, m));
     Q_ASSERT(it != source_index_mapping.constEnd());
     Q_ASSERT(it.value());
 
@@ -1169,7 +1169,8 @@ void QSortFilterProxyModelPrivate::updateChildrenMapping(const QModelIndex &sour
     // reinsert moved, mapped indexes
     QVector<QPair<QModelIndex, Mapping*> >::iterator it = moved_source_index_mappings.begin();
     for (; it != moved_source_index_mappings.end(); ++it) {
-        (*it).second->map_iter = QHash<QModelIndex, Mapping *>::const_iterator(source_index_mapping.insert((*it).first, (*it).second));
+        it->second->source_parent = it->first;
+        source_index_mapping.insert(it->first, it->second);
     }
 }
 
diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp
index 5fdcc9b914..09d2e194ba 100644
--- a/src/corelib/kernel/qcoreapplication.cpp
+++ b/src/corelib/kernel/qcoreapplication.cpp
@@ -138,10 +138,10 @@ QT_BEGIN_NAMESPACE
 extern QString qAppFileName();
 #endif
 
-#if QT_VERSION >= 0x060000
-# error "Bump QCoreApplicatoinPrivate::app_compile_version to 0x060000"
+#if QT_VERSION >= 0x070000
+# error "Bump QCoreApplicatoinPrivate::app_compile_version to 0x070000"
 #endif
-int QCoreApplicationPrivate::app_compile_version = 0x050000; //we don't know exactly, but it's at least 5.0.0
+int QCoreApplicationPrivate::app_compile_version = 0x060000; //we don't know exactly, but it's at least 6.0.0
 
 bool QCoreApplicationPrivate::setuidAllowed = false;
 
diff --git a/src/corelib/kernel/qcoreapplication_win.cpp b/src/corelib/kernel/qcoreapplication_win.cpp
index 765f129758..824c0535ed 100644
--- a/src/corelib/kernel/qcoreapplication_win.cpp
+++ b/src/corelib/kernel/qcoreapplication_win.cpp
@@ -772,7 +772,7 @@ QString decodeMSG(const MSG& msg)
             auto rect = reinterpret_cast<const RECT *>(lParam);
             QTextStream(&parameters) << "DPI: " << HIWORD(wParam) << ','
                 << LOWORD(wParam) << ' ' << (rect->right - rect->left) << 'x'
-                << (rect->bottom - rect->top) << forcesign << rect->left << rect->top;
+                << (rect->bottom - rect->top) << Qt::forcesign << rect->left << rect->top;
             }
             break;
         case WM_IME_NOTIFY:
diff --git a/src/corelib/kernel/qmetaobject.cpp b/src/corelib/kernel/qmetaobject.cpp
index 1661520b78..9be99d8c6a 100644
--- a/src/corelib/kernel/qmetaobject.cpp
+++ b/src/corelib/kernel/qmetaobject.cpp
@@ -154,20 +154,29 @@ QT_BEGIN_NAMESPACE
 static inline const QMetaObjectPrivate *priv(const uint* data)
 { return reinterpret_cast<const QMetaObjectPrivate*>(data); }
 
+static inline const char *rawStringData(const QMetaObject *mo, int index)
+{
+    Q_ASSERT(priv(mo->d.data)->revision >= 7);
+    uint offset = mo->d.stringdata[2*index];
+    return reinterpret_cast<const char *>(mo->d.stringdata) + offset;
+}
+
 static inline const QByteArray stringData(const QMetaObject *mo, int index)
 {
     Q_ASSERT(priv(mo->d.data)->revision >= 7);
-    const QByteArrayDataPtr data = { const_cast<QByteArrayData*>(&mo->d.stringdata[index]) };
-    Q_ASSERT(data.ptr->ref.isStatic());
-    Q_ASSERT(data.ptr->alloc == 0);
-    Q_ASSERT(data.ptr->capacityReserved == 0);
-    Q_ASSERT(data.ptr->size >= 0);
-    return data;
+    uint offset = mo->d.stringdata[2*index];
+    uint length = mo->d.stringdata[2*index + 1];
+    const char *string = reinterpret_cast<const char *>(mo->d.stringdata) + offset;
+    return QByteArray::fromRawData(string, length);
 }
 
-static inline const char *rawStringData(const QMetaObject *mo, int index)
+static inline const char *rawTypeNameFromTypeInfo(const QMetaObject *mo, uint typeInfo)
 {
-    return stringData(mo, index).data();
+    if (typeInfo & IsUnresolvedType) {
+        return rawStringData(mo, typeInfo & TypeNameIndexMask);
+    } else {
+        return QMetaType::typeName(typeInfo);
+    }
 }
 
 static inline QByteArray typeNameFromTypeInfo(const QMetaObject *mo, uint typeInfo)
@@ -181,16 +190,11 @@ static inline QByteArray typeNameFromTypeInfo(const QMetaObject *mo, uint typeIn
     }
 }
 
-static inline const char *rawTypeNameFromTypeInfo(const QMetaObject *mo, uint typeInfo)
-{
-    return typeNameFromTypeInfo(mo, typeInfo).constData();
-}
-
 static inline int typeFromTypeInfo(const QMetaObject *mo, uint typeInfo)
 {
     if (!(typeInfo & IsUnresolvedType))
         return typeInfo;
-    return QMetaType::type(stringData(mo, typeInfo & TypeNameIndexMask));
+    return QMetaType::type(rawStringData(mo, typeInfo & TypeNameIndexMask));
 }
 
 class QMetaMethodPrivate : public QMetaMethod
@@ -577,7 +581,7 @@ static bool methodMatch(const QMetaObject *m, int handle,
     if (int(m->d.data[handle + 1]) != argc)
         return false;
 
-    if (stringData(m, m->d.data[handle]) != name)
+    if (rawStringData(m, m->d.data[handle]) != name)
         return false;
 
     int paramsIndex = m->d.data[handle + 2] + 1;
@@ -682,7 +686,9 @@ static void argumentTypesFromString(const char *str, const char *end,
                 --level;
             ++str;
         }
-        types += QArgumentType(QByteArray(begin, str - begin));
+        QByteArray argType(begin, str - begin);
+        argType.replace("QList<", "QVector<");
+        types += QArgumentType(std::move(argType));
     }
 }
 
@@ -1161,7 +1167,7 @@ QMetaProperty QMetaObject::property(int index) const
 
                 const QMetaObject *scope = nullptr;
                 if (qstrcmp(scope_name, "Qt") == 0)
-                    scope = &QObject::staticQtMetaObject;
+                    scope = &Qt::staticMetaObject;
                 else
                     scope = QMetaObject_findMetaObject(this, scope_name);
                 if (scope)
@@ -1309,17 +1315,7 @@ static char *qNormalizeType(char *d, int &templdepth, QByteArray &result)
  */
 QByteArray QMetaObject::normalizedType(const char *type)
 {
-    QByteArray result;
-
-    if (!type || !*type)
-        return result;
-
-    QVarLengthArray<char> stackbuf(qstrlen(type) + 1);
-    qRemoveWhitespace(type, stackbuf.data());
-    int templdepth = 0;
-    qNormalizeType(stackbuf.data(), templdepth, result);
-
-    return result;
+    return normalizeTypeInternal(type, type + qstrlen(type));
 }
 
 /*!
@@ -2837,10 +2833,6 @@ QByteArray QMetaEnum::valueToKeys(int value) const
     The enum needs to be declared with Q_ENUM.
 */
 
-static QByteArray qualifiedName(const QMetaEnum &e)
-{
-    return QByteArray(e.scope()) + "::" + e.name();
-}
 
 /*!
     \class QMetaProperty
@@ -2931,65 +2923,45 @@ const char *QMetaProperty::typeName() const
     Returns this property's type. The return value is one
     of the values of the QVariant::Type enumeration.
 
-    \sa userType(), typeName(), name()
+    \sa userType(), typeName(), name(), metaType()
 */
 QVariant::Type QMetaProperty::type() const
 {
-    if (!mobj)
-        return QVariant::Invalid;
-    int handle = priv(mobj->d.data)->propertyData + 3*idx;
-
-    Q_ASSERT(priv(mobj->d.data)->revision >= 7);
-    uint type = typeFromTypeInfo(mobj, mobj->d.data[handle + 1]);
+    uint type = userType();
     if (type >= QMetaType::User)
         return QVariant::UserType;
-    if (type != QMetaType::UnknownType)
-        return QVariant::Type(type);
-    if (isEnumType()) {
-        int enumMetaTypeId = QMetaType::type(qualifiedName(menum));
-        if (enumMetaTypeId == QMetaType::UnknownType)
-            return QVariant::Int;
-    }
-#ifdef QT_COORD_TYPE
-    // qreal metatype must be resolved at runtime.
-    if (strcmp(typeName(), "qreal") == 0)
-        return QVariant::Type(qMetaTypeId<qreal>());
-#endif
-
-    return QVariant::UserType;
+    return QVariant::Type(type);
 }
 
 /*!
     \since 4.2
 
     Returns this property's user type. The return value is one
-    of the values that are registered with QMetaType, or QMetaType::UnknownType if
-    the type is not registered.
+    of the values that are registered with QMetaType.
+
+    This is equivalent to metaType().id()
 
-    \sa type(), QMetaType, typeName()
+    \sa type(), QMetaType, typeName(), metaType()
  */
 int QMetaProperty::userType() const
 {
     if (!mobj)
         return QMetaType::UnknownType;
-    Q_ASSERT(priv(mobj->d.data)->revision >= 7);
-    int handle = priv(mobj->d.data)->propertyData + 3*idx;
-    int type = typeFromTypeInfo(mobj, mobj->d.data[handle + 1]);
-    if (type != QMetaType::UnknownType)
-        return type;
-    if (isEnumType()) {
-        type = QMetaType::type(qualifiedName(menum));
-        if (type == QMetaType::UnknownType) {
-            type = registerPropertyType();
-            if (type == QMetaType::UnknownType)
-                return QMetaType::Int; // Match behavior of QMetaType::type()
-        }
-        return type;
-    }
-    type = QMetaType::type(typeName());
-    if (type != QMetaType::UnknownType)
-        return type;
-    return registerPropertyType();
+    return QMetaType(mobj->d.metaTypes[idx]).id();
+}
+
+/*!
+    \since 6.0
+
+    Returns this property's QMetaType.
+
+    \sa QMetaType
+ */
+QMetaType QMetaProperty::metaType() const
+{
+    if (!mobj)
+        return {};
+    return QMetaType(mobj->d.metaTypes[idx]);
 }
 
 /*!
@@ -3100,37 +3072,6 @@ QVariant QMetaProperty::read(const QObject *object) const
     if (!object || !mobj)
         return QVariant();
 
-    uint t = QMetaType::Int;
-    if (isEnumType()) {
-        /*
-          try to create a QVariant that can be converted to this enum
-          type (only works if the enum has already been registered
-          with QMetaType)
-        */
-        int enumMetaTypeId = QMetaType::type(qualifiedName(menum));
-        if (enumMetaTypeId != QMetaType::UnknownType)
-            t = enumMetaTypeId;
-    } else {
-        int handle = priv(mobj->d.data)->propertyData + 3*idx;
-        const char *typeName = nullptr;
-        Q_ASSERT(priv(mobj->d.data)->revision >= 7);
-        uint typeInfo = mobj->d.data[handle + 1];
-        if (!(typeInfo & IsUnresolvedType))
-            t = typeInfo;
-        else {
-            typeName = rawStringData(mobj, typeInfo & TypeNameIndexMask);
-            t = QMetaType::type(typeName);
-        }
-        if (t == QMetaType::UnknownType) {
-            // Try to register the type and try again before reporting an error.
-            t = registerPropertyType();
-            if (t == QMetaType::UnknownType) {
-                qWarning("QMetaProperty::read: Unable to handle unregistered datatype '%s' for property '%s::%s'", typeName, mobj->className(), name());
-                return QVariant();
-            }
-        }
-    }
-
     // the status variable is changed by qt_metacall to indicate what it did
     // this feature is currently only used by Qt D-Bus and should not be depended
     // upon. Don't change it without looking into QDBusAbstractInterface first
@@ -3139,10 +3080,11 @@ QVariant QMetaProperty::read(const QObject *object) const
     int status = -1;
     QVariant value;
     void *argv[] = { nullptr, &value, &status };
-    if (t == QMetaType::QVariant) {
+    QMetaType t(mobj->d.metaTypes[idx]);
+    if (t == QMetaType::fromType<QVariant>()) {
         argv[0] = &value;
     } else {
-        value = QVariant(t, (void*)nullptr);
+        value = QVariant(t, nullptr);
         argv[0] = value.data();
     }
     if (priv(mobj->d.data)->flags & PropertyAccessInStaticMetaCall && mobj->d.static_metacall) {
@@ -3154,9 +3096,9 @@ QVariant QMetaProperty::read(const QObject *object) const
 
     if (status != -1)
         return value;
-    if (t != QMetaType::QVariant && argv[0] != value.data())
+    if (t != QMetaType::fromType<QVariant>() && argv[0] != value.data())
         // pointer or reference
-        return QVariant((QVariant::Type)t, argv[0]);
+        return QVariant(t, argv[0]);
     return value;
 }
 
@@ -3177,9 +3119,10 @@ bool QMetaProperty::write(QObject *object, const QVariant &value) const
         return false;
 
     QVariant v = value;
-    uint t = QMetaType::UnknownType;
-    if (isEnumType()) {
-        if (v.userType() == QMetaType::QString) {
+    QMetaType t(mobj->d.metaTypes[idx]);
+    if (t != QMetaType::fromType<QVariant>() && t != v.metaType()) {
+        if (isEnumType() && !t.metaObject() && v.userType() == QMetaType::QString) {
+            // Assigning a string to a property of type Q_ENUMS (instead of Q_ENUM)
             bool ok;
             if (isFlagType())
                 v = QVariant(menum.keysToValue(value.toByteArray(), &ok));
@@ -3187,39 +3130,14 @@ bool QMetaProperty::write(QObject *object, const QVariant &value) const
                 v = QVariant(menum.keyToValue(value.toByteArray(), &ok));
             if (!ok)
                 return false;
-        } else if (v.userType() != QMetaType::Int && v.userType() != QMetaType::UInt) {
-            int enumMetaTypeId = QMetaType::type(qualifiedName(menum));
-            if ((enumMetaTypeId == QMetaType::UnknownType) || (v.userType() != enumMetaTypeId) || !v.constData())
-                return false;
-            v = QVariant(*reinterpret_cast<const int *>(v.constData()));
-        }
-        v.convert(QMetaType::Int);
-    } else {
-        int handle = priv(mobj->d.data)->propertyData + 3*idx;
-        const char *typeName = nullptr;
-        Q_ASSERT(priv(mobj->d.data)->revision >= 7);
-        uint typeInfo = mobj->d.data[handle + 1];
-        if (!(typeInfo & IsUnresolvedType))
-            t = typeInfo;
-        else {
-            typeName = rawStringData(mobj, typeInfo & TypeNameIndexMask);
-            t = QMetaType::type(typeName);
-            if (t == QMetaType::UnknownType)
-                t = registerPropertyType();
-            if (t == QMetaType::UnknownType)
-                return false;
-        }
-        if (t != QMetaType::QVariant && int(t) != value.userType()) {
-            if (!value.isValid()) {
-                if (isResettable())
-                    return reset(object);
-                v = QVariant(t, nullptr);
-            } else if (!v.convert(t)) {
-                return false;
-            }
+        } else if (!value.isValid()) {
+            if (isResettable())
+                return reset(object);
+            v = QVariant(t, nullptr);
+        } else if (!v.convert(t.id())) {
+            return false;
         }
     }
-
     // the status variable is changed by qt_metacall to indicate what it did
     // this feature is currently only used by Qt D-Bus and should not be depended
     // upon. Don't change it without looking into QDBusAbstractInterface first
@@ -3230,7 +3148,7 @@ bool QMetaProperty::write(QObject *object, const QVariant &value) const
     // interception of property writes.
     int flags = 0;
     void *argv[] = { nullptr, &v, &status, &flags };
-    if (t == QMetaType::QVariant)
+    if (t == QMetaType::fromType<QVariant>())
         argv[0] = &v;
     else
         argv[0] = v.data();
@@ -3670,6 +3588,21 @@ const char* QMetaClassInfo::value() const
 }
 
 /*!
+    \class QMethodRawArguments
+    \internal
+
+    A wrapper class for the void ** arguments array used by the meta
+    object system. If a slot uses a single argument of this type,
+    the meta object system will pass the raw arguments array directly
+    to the slot and set the arguments count in the slot description to
+    zero, so that any signal can connect to it.
+
+    This is used internally to implement signal relay functionality in
+    our state machine and dbus.
+*/
+
+
+/*!
     \macro QGenericArgument Q_ARG(Type, const Type &value)
     \relates QMetaObject
 
diff --git a/src/corelib/kernel/qmetaobject.h b/src/corelib/kernel/qmetaobject.h
index beb85becae..08adc495e0 100644
--- a/src/corelib/kernel/qmetaobject.h
+++ b/src/corelib/kernel/qmetaobject.h
@@ -46,9 +46,6 @@
 
 QT_BEGIN_NAMESPACE
 
-
-template <typename T> class QList;
-
 #define Q_METAMETHOD_INVOKE_MAX_ARGS 10
 
 class Q_CORE_EXPORT QMetaMethod
@@ -253,6 +250,7 @@ public:
     const char *typeName() const;
     QVariant::Type type() const;
     int userType() const;
+    QMetaType metaType() const;
     int propertyIndex() const;
     int relativePropertyIndex() const;
 
diff --git a/src/corelib/kernel/qmetaobject_moc_p.h b/src/corelib/kernel/qmetaobject_moc_p.h
index 8c7900767b..9770d9c576 100644
--- a/src/corelib/kernel/qmetaobject_moc_p.h
+++ b/src/corelib/kernel/qmetaobject_moc_p.h
@@ -52,167 +52,19 @@
 // We mean it.
 //
 
-#include <QtCore/private/qglobal_p.h>
+#include <QtCore/qbytearray.h>
 
 QT_BEGIN_NAMESPACE
 
 // This function is shared with moc.cpp. This file should be included where needed.
-static QByteArray normalizeTypeInternal(const char *t, const char *e, bool fixScope = false, bool adjustConst = true)
+static QByteArray normalizeTypeInternal(const char *t, const char *e)
 {
-    int len = e - t;
-    /*
-      Convert 'char const *' into 'const char *'. Start at index 1,
-      not 0, because 'const char *' is already OK.
-    */
-    QByteArray constbuf;
-    for (int i = 1; i < len; i++) {
-        if ( t[i] == 'c'
-             && strncmp(t + i + 1, "onst", 4) == 0
-             && (i + 5 >= len || !is_ident_char(t[i + 5]))
-             && !is_ident_char(t[i-1])
-             ) {
-            constbuf = QByteArray(t, len);
-            if (is_space(t[i-1]))
-                constbuf.remove(i-1, 6);
-            else
-                constbuf.remove(i, 5);
-            constbuf.prepend("const ");
-            t = constbuf.data();
-            e = constbuf.data() + constbuf.length();
-            break;
-        }
-        /*
-          We mustn't convert 'char * const *' into 'const char **'
-          and we must beware of 'Bar<const Bla>'.
-        */
-        if (t[i] == '&' || t[i] == '*' ||t[i] == '<')
-            break;
-    }
-    if (adjustConst && e > t + 6 && strncmp("const ", t, 6) == 0) {
-        if (*(e-1) == '&') { // treat const reference as value
-            t += 6;
-            --e;
-        } else if (is_ident_char(*(e-1)) || *(e-1) == '>') { // treat const value as value
-            t += 6;
-        }
-    }
-    QByteArray result;
-    result.reserve(len);
-
-#if 1
-    // consume initial 'const '
-    if (strncmp("const ", t, 6) == 0) {
-        t+= 6;
-        result += "const ";
-    }
-#endif
-
-    // some type substitutions for 'unsigned x'
-    if (strncmp("unsigned", t, 8) == 0) {
-        // make sure "unsigned" is an isolated word before making substitutions
-        if (!t[8] || !is_ident_char(t[8])) {
-            if (strncmp(" int", t+8, 4) == 0) {
-                t += 8+4;
-                result += "uint";
-            } else if (strncmp(" long", t+8, 5) == 0) {
-                if ((strlen(t + 8 + 5) < 4 || strncmp(t + 8 + 5, " int", 4) != 0) // preserve '[unsigned] long int'
-                    && (strlen(t + 8 + 5) < 5 || strncmp(t + 8 + 5, " long", 5) != 0) // preserve '[unsigned] long long'
-                   ) {
-                    t += 8+5;
-                    result += "ulong";
-                }
-            } else if (strncmp(" short", t+8, 6) != 0  // preserve unsigned short
-                && strncmp(" char", t+8, 5) != 0) {    // preserve unsigned char
-                //  treat rest (unsigned) as uint
-                t += 8;
-                result += "uint";
-            }
-        }
-    } else {
-        // discard 'struct', 'class', and 'enum'; they are optional
-        // and we don't want them in the normalized signature
-        struct {
-            const char *keyword;
-            int len;
-        } optional[] = {
-            { "struct ", 7 },
-            { "class ", 6 },
-            { "enum ", 5 },
-            { nullptr, 0 }
-        };
-        int i = 0;
-        do {
-            if (strncmp(optional[i].keyword, t, optional[i].len) == 0) {
-                t += optional[i].len;
-                break;
-            }
-        } while (optional[++i].keyword != nullptr);
-    }
-
-    bool star = false;
-    while (t != e) {
-        char c = *t++;
-        if (fixScope && c == ':' && *t == ':' ) {
-            ++t;
-            c = *t++;
-            int i = result.size() - 1;
-            while (i >= 0 && is_ident_char(result.at(i)))
-                --i;
-            result.resize(i + 1);
-        }
-        star = star || c == '*';
-        result += c;
-        if (c == '<') {
-            //template recursion
-            const char* tt = t;
-            int templdepth = 1;
-            int scopeDepth = 0;
-            while (t != e) {
-                c = *t++;
-                if (c == '{' || c == '(' || c == '[')
-                    ++scopeDepth;
-                if (c == '}' || c == ')' || c == ']')
-                    --scopeDepth;
-                if (scopeDepth == 0) {
-                    if (c == '<')
-                        ++templdepth;
-                    if (c == '>')
-                        --templdepth;
-                    if (templdepth == 0 || (templdepth == 1 && c == ',')) {
-                        result += normalizeTypeInternal(tt, t-1, fixScope, false);
-                        result += c;
-                        if (templdepth == 0) {
-                            if (*t == '>')
-                                result += ' '; // avoid >>
-                            break;
-                        }
-                        tt = t;
-                    }
-                }
-            }
-        }
-
-        // cv qualifers can appear after the type as well
-        if (!is_ident_char(c) && t != e && (e - t >= 5 && strncmp("const", t, 5) == 0)
-            && (e - t == 5 || !is_ident_char(t[5]))) {
-            t += 5;
-            while (t != e && is_space(*t))
-                ++t;
-            if (adjustConst && t != e && *t == '&') {
-                // treat const ref as value
-                ++t;
-            } else if (adjustConst && !star) {
-                // treat const as value
-            } else if (!star) {
-                // move const to the front (but not if const comes after a *)
-                result.prepend("const ");
-            } else {
-                // keep const after a *
-                result += "const";
-            }
-        }
-    }
-
+    int len = QtPrivate::qNormalizeType(t, e, nullptr);
+    if (len == 0)
+        return QByteArray();
+    QByteArray result(len, Qt::Uninitialized);
+    len = QtPrivate::qNormalizeType(t, e, result.data());
+    Q_ASSERT(len == result.size());
     return result;
 }
 
diff --git a/src/corelib/kernel/qmetaobjectbuilder.cpp b/src/corelib/kernel/qmetaobjectbuilder.cpp
index 4ecc340787..cd5caad0a7 100644
--- a/src/corelib/kernel/qmetaobjectbuilder.cpp
+++ b/src/corelib/kernel/qmetaobjectbuilder.cpp
@@ -1103,13 +1103,13 @@ int QMetaStringTable::enter(const QByteArray &value)
 
 int QMetaStringTable::preferredAlignment()
 {
-    return Q_ALIGNOF(QByteArrayData);
+    return alignof(uint);
 }
 
 // Returns the size (in bytes) required for serializing this string table.
 int QMetaStringTable::blobSize() const
 {
-    int size = m_entries.size() * sizeof(QByteArrayData);
+    int size = m_entries.size() * 2*sizeof(uint);
     Entries::const_iterator it;
     for (it = m_entries.constBegin(); it != m_entries.constEnd(); ++it)
         size += it.key().size() + 1;
@@ -1120,14 +1120,12 @@ static void writeString(char *out, int i, const QByteArray &str,
                         const int offsetOfStringdataMember, int &stringdataOffset)
 {
     int size = str.size();
-    qptrdiff offset = offsetOfStringdataMember + stringdataOffset
-            - i * sizeof(QByteArrayData);
-    const QByteArrayData data =
-        Q_STATIC_BYTE_ARRAY_DATA_HEADER_INITIALIZER_WITH_OFFSET(size, offset);
+    int offset = offsetOfStringdataMember + stringdataOffset;
+    uint offsetLen[2] = { uint(offset), uint(size) };
 
-    memcpy(out + i * sizeof(QByteArrayData), &data, sizeof(QByteArrayData));
+    memcpy(out + 2 * i * sizeof(uint), &offsetLen, 2*sizeof(uint));
 
-    memcpy(out + offsetOfStringdataMember + stringdataOffset, str.constData(), size);
+    memcpy(out + offset, str.constData(), size);
     out[offsetOfStringdataMember + stringdataOffset + size] = '\0';
 
     stringdataOffset += size + 1;
@@ -1141,7 +1139,7 @@ void QMetaStringTable::writeBlob(char *out) const
 {
     Q_ASSERT(!(reinterpret_cast<quintptr>(out) & (preferredAlignment()-1)));
 
-    int offsetOfStringdataMember = m_entries.size() * sizeof(QByteArrayData);
+    int offsetOfStringdataMember = m_entries.size() * 2*sizeof(uint);
     int stringdataOffset = 0;
 
     // qt_metacast expects the first string in the string table to be the class name.
@@ -1198,6 +1196,7 @@ static int buildMetaObject(QMetaObjectBuilderPrivate *d, char *buf,
         if (!relocatable) meta->d.superdata = d->superClass;
         meta->d.relatedMetaObjects = nullptr;
         meta->d.extradata = nullptr;
+        meta->d.metaTypes = nullptr;
         meta->d.static_metacall = d->staticMetacallFunction;
     }
 
@@ -1282,10 +1281,10 @@ static int buildMetaObject(QMetaObjectBuilderPrivate *d, char *buf,
     char *str = reinterpret_cast<char *>(buf + size);
     if (buf) {
         if (relocatable) {
-            meta->d.stringdata = reinterpret_cast<const QByteArrayData *>((quintptr)size);
+            meta->d.stringdata = reinterpret_cast<const uint *>((quintptr)size);
             meta->d.data = reinterpret_cast<uint *>((quintptr)pmetaSize);
         } else {
-            meta->d.stringdata = reinterpret_cast<const QByteArrayData *>(str);
+            meta->d.stringdata = reinterpret_cast<const uint *>(str);
             meta->d.data = reinterpret_cast<uint *>(data);
         }
     }
@@ -1476,6 +1475,20 @@ static int buildMetaObject(QMetaObjectBuilderPrivate *d, char *buf,
         size += sizeof(SuperData) * (d->relatedMetaObjects.size() + 1);
     }
 
+    if (d->properties.size() > 0) {
+        ALIGN(size, QtPrivate::QMetaTypeInterface *);
+        auto types = reinterpret_cast<QtPrivate::QMetaTypeInterface **>(buf + size);
+        if (buf) {
+            meta->d.metaTypes = types;
+            for (const auto &prop : d->properties) {
+                QMetaType mt(QMetaType::type(prop.type));
+                *types = reinterpret_cast<QtPrivate::QMetaTypeInterface *&>(mt);
+                types++;
+            }
+        }
+        size += sizeof(QMetaType) * d->properties.size();
+    }
+
     // Align the final size and return it.
     ALIGN(size, void *);
     Q_ASSERT(!buf || size == expectedSize);
@@ -1553,7 +1566,7 @@ void QMetaObjectBuilder::fromRelocatableData(QMetaObject *output,
     quintptr dataOffset = (quintptr)dataMo->d.data;
 
     output->d.superdata = superclass;
-    output->d.stringdata = reinterpret_cast<const QByteArrayData *>(buf + stringdataOffset);
+    output->d.stringdata = reinterpret_cast<const uint *>(buf + stringdataOffset);
     output->d.data = reinterpret_cast<const uint *>(buf + dataOffset);
     output->d.extradata = nullptr;
     output->d.relatedMetaObjects = nullptr;
diff --git a/src/corelib/kernel/qmetatype.cpp b/src/corelib/kernel/qmetatype.cpp
index 662283f737..c81f958e74 100644
--- a/src/corelib/kernel/qmetatype.cpp
+++ b/src/corelib/kernel/qmetatype.cpp
@@ -85,6 +85,9 @@
 # include "qline.h"
 #endif
 
+#include <bitset>
+#include <new>
+
 QT_BEGIN_NAMESPACE
 
 #define NS(x) QT_PREPEND_NAMESPACE(x)
@@ -97,6 +100,88 @@ struct DefinedTypesFilter {
         static const bool IsAccepted = QtMetaTypePrivate::TypeDefinition<T>::IsAvailable && QModulesPrivate::QTypeModuleInfo<T>::IsCore;
     };
 };
+
+struct QMetaTypeCustomRegistery
+{
+    QReadWriteLock lock;
+    QVector<QtPrivate::QMetaTypeInterface *> registry;
+    QHash<QByteArray, QtPrivate::QMetaTypeInterface *> aliases;
+#ifndef QT_NO_DATASTREAM
+    struct DataStreamOps
+    {
+        QMetaType::SaveOperator saveOp;
+        QMetaType::LoadOperator loadOp;
+    };
+    QHash<int, DataStreamOps> dataStreamOp;
+#endif
+    // index of first empty (unregistered) type in registry, if any.
+    int firstEmpty = 0;
+
+    int registerCustomType(QtPrivate::QMetaTypeInterface *ti)
+    {
+        {
+            QWriteLocker l(&lock);
+            if (ti->typeId)
+                return ti->typeId;
+            QByteArray name =
+#ifndef QT_NO_QOBJECT
+                    QMetaObject::normalizedType
+#endif
+                    (ti->name);
+            if (auto ti2 = aliases.value(name)) {
+                ti->typeId.storeRelaxed(ti2->typeId.loadRelaxed());
+                return ti2->typeId;
+            }
+            aliases[name] = ti;
+            int size = registry.size();
+            while (firstEmpty < size && registry[firstEmpty])
+                ++firstEmpty;
+            if (firstEmpty < size) {
+                registry[firstEmpty] = ti;
+                ++firstEmpty;
+            } else {
+                registry.append(ti);
+                firstEmpty = registry.size();
+            }
+            ti->typeId = firstEmpty + QMetaType::User;
+        }
+        if (ti->legacyRegisterOp)
+            ti->legacyRegisterOp();
+        return ti->typeId;
+    };
+
+    void unregisterDynamicType(int id)
+    {
+        if (!id)
+            return;
+        Q_ASSERT(id > QMetaType::User);
+        QWriteLocker l(&lock);
+        int idx = id - QMetaType::User - 1;
+        auto &ti = registry[idx];
+
+        // We must unregister all names.
+        auto it = aliases.begin();
+        while (it != aliases.end()) {
+            if (it.value() == ti)
+                it = aliases.erase(it);
+            else
+                ++it;
+        }
+
+        ti = nullptr;
+
+        firstEmpty = std::min(firstEmpty, idx);
+    }
+
+    QtPrivate::QMetaTypeInterface *getCustomType(int id)
+    {
+        QReadLocker l(&lock);
+        return registry.value(id - QMetaType::User - 1);
+    }
+};
+
+Q_GLOBAL_STATIC(QMetaTypeCustomRegistery, customTypeRegistery)
+
 } // namespace
 
 /*!
@@ -153,7 +238,7 @@ struct DefinedTypesFilter {
 
     \list
     \li Pointers to classes derived from QObject
-    \li QList<T>, QVector<T>, QQueue<T>, QStack<T>, QSet<T> or QLinkedList<T>
+    \li QList<T>, QVector<T>, QQueue<T>, QStack<T> or QSet<T>
         where T is a registered meta type
     \li QHash<T1, T2>, QMap<T1, T2> or QPair<T1, T2> where T1 and T2 are
         registered meta types
@@ -282,7 +367,6 @@ struct DefinedTypesFilter {
     \value QPixmap QPixmap
     \value QLocale QLocale
     \value QBitmap QBitmap
-    \value QMatrix QMatrix
     \value QTransform QTransform
     \value QMatrix4x4 QMatrix4x4
     \value QVector2D QVector2D
@@ -371,6 +455,10 @@ struct DefinedTypesFilter {
     Returns \c true if this QMetaType object contains valid
     information about a type, false otherwise.
 */
+bool QMetaType::isValid() const
+{
+    return d_ptr;
+}
 
 /*!
     \fn bool QMetaType::isRegistered() const
@@ -379,6 +467,10 @@ struct DefinedTypesFilter {
     Returns \c true if this QMetaType object contains valid
     information about a type, false otherwise.
 */
+bool QMetaType::isRegistered() const
+{
+    return d_ptr;
+}
 
 /*!
     \fn int QMetaType::id() const
@@ -386,6 +478,18 @@ struct DefinedTypesFilter {
 
     Returns id type hold by this QMetatype instance.
 */
+int QMetaType::id() const
+{
+    if (d_ptr) {
+        if (d_ptr->typeId)
+            return d_ptr->typeId;
+        auto reg = customTypeRegistery();
+        if (reg) {
+            return reg->registerCustomType(d_ptr);
+        }
+    }
+    return 0;
+}
 
 /*!
     \fn bool QMetaType::sizeOf() const
@@ -400,6 +504,12 @@ struct DefinedTypesFilter {
 
     \sa QMetaType::construct(), QMetaType::sizeOf()
 */
+int QMetaType::sizeOf() const
+{
+    if (d_ptr)
+        return d_ptr->size;
+    return 0;
+}
 
 /*!
     \fn TypeFlags QMetaType::flags() const
@@ -409,6 +519,12 @@ struct DefinedTypesFilter {
 
     \sa QMetaType::TypeFlags, QMetaType::typeFlags()
 */
+QMetaType::TypeFlags QMetaType::flags() const
+{
+    if (d_ptr)
+        return TypeFlags(d_ptr->flags);
+    return {};
+}
 
 /*!
     \fn const QMetaObject *QMetaType::metaObject() const
@@ -430,6 +546,10 @@ struct DefinedTypesFilter {
 
     \sa QMetaType::metaObjectForType(), QMetaType::flags()
 */
+const QMetaObject *QMetaType::metaObject() const
+{
+    return d_ptr ? d_ptr->metaObject : nullptr;
+}
 
 /*!
     \fn void *QMetaType::create(const void *copy = 0) const
@@ -441,6 +561,19 @@ struct DefinedTypesFilter {
 
     \sa QMetaType::destroy()
 */
+void *QMetaType::create(const void *copy) const
+{
+    if (d_ptr) {
+        void *where =
+#ifdef __STDCPP_DEFAULT_NEW_ALIGNMENT__
+            d_ptr->alignment > __STDCPP_DEFAULT_NEW_ALIGNMENT__ ?
+                operator new(d_ptr->size, std::align_val_t(d_ptr->alignment)) :
+#endif
+                operator new(d_ptr->size);
+        return construct(where, copy);
+    }
+    return nullptr;
+}
 
 /*!
     \fn void QMetaType::destroy(void *data) const
@@ -451,18 +584,19 @@ struct DefinedTypesFilter {
 
     \sa QMetaType::create()
 */
+void QMetaType::destroy(void *data) const
+{
+    if (d_ptr && d_ptr->dtor) {
+        d_ptr->dtor(d_ptr, data);
+        if (d_ptr->alignment > __STDCPP_DEFAULT_NEW_ALIGNMENT__) {
+            operator delete(data, std::align_val_t(d_ptr->alignment));
+        } else {
+            operator delete(data);
+        }
+    }
+}
 
 /*!
-    \fn void *QMetaType::construct(int type, const void *copy)
-    \deprecated
-
-    Constructs a value of the given type which is a copy of \a copy.
-    The default value for \a copy is \nullptr.
-
-    Deprecated, use the static function QMetaType::create(int type,
-    const void *copy) instead.
-*/
-/*!
     \fn void *QMetaType::construct(void *where, const void *copy = 0) const
     \since 5.0
 
@@ -488,6 +622,21 @@ struct DefinedTypesFilter {
     special hardware instructions (e.g., aligned SSE loads and stores
     on x86).
 */
+void *QMetaType::construct(void *where, const void *copy) const
+{
+    if (!where)
+        return nullptr;
+    if (d_ptr) {
+        if (copy && d_ptr->copyCtr) {
+            d_ptr->copyCtr(d_ptr, where, copy);
+            return where;
+        } else if (!copy && d_ptr->defaultCtr) {
+            d_ptr->defaultCtr(d_ptr, where);
+            return where;
+        }
+    }
+    return nullptr;
+}
 
 /*!
     \fn void QMetaType::destruct(void *data) const
@@ -500,12 +649,53 @@ struct DefinedTypesFilter {
     destructor, it doesn't invoke the delete operator.
     \sa QMetaType::construct()
 */
+void QMetaType::destruct(void *data) const
+{
+    if (!data)
+        return;
+    if (d_ptr && d_ptr->dtor) {
+        d_ptr->dtor(d_ptr, data);
+        return;
+    }
+}
+
+void QtMetaTypePrivate::derefAndDestroy(QtPrivate::QMetaTypeInterface *d_ptr)
+{
+    if (d_ptr && !d_ptr->ref.deref()) {
+        if (auto reg = customTypeRegistery())
+            reg->unregisterDynamicType(d_ptr->typeId.loadRelaxed());
+        Q_ASSERT(d_ptr->deleteSelf);
+        d_ptr->deleteSelf(d_ptr);
+    }
+}
 
 /*!
     \fn QMetaType::~QMetaType()
 
     Destructs this object.
 */
+QMetaType::~QMetaType()
+{
+    QtMetaTypePrivate::derefAndDestroy(d_ptr);
+}
+
+QMetaType::QMetaType(QtPrivate::QMetaTypeInterface *d) : d_ptr(d)
+{
+    if (d_ptr)
+        d_ptr->ref.ref();
+}
+
+QMetaType::QMetaType() : d_ptr(nullptr) {}
+
+QMetaType::QMetaType(const QMetaType &other) : QMetaType(other.d_ptr) {}
+QMetaType &QMetaType::operator=(const QMetaType &other)
+{
+    if (d_ptr != other.d_ptr) {
+        this->~QMetaType();
+        new (this) QMetaType(other.d_ptr);
+    }
+    return *this;
+}
 
 /*!
     \fn template<typename T> QMetaType QMetaType::fromType()
@@ -538,32 +728,26 @@ struct DefinedTypesFilter {
 #define QT_ADD_STATIC_METATYPE_ALIASES_ITER(MetaTypeName, MetaTypeId, AliasingName, RealNameStr) \
     { RealNameStr, sizeof(RealNameStr) - 1, QMetaType::MetaTypeName },
 
-#define QT_ADD_STATIC_METATYPE_HACKS_ITER(MetaTypeName, TypeId, Name) \
-    QT_ADD_STATIC_METATYPE(MetaTypeName, MetaTypeName, Name)
+
 
 static const struct { const char * typeName; int typeNameLength; int type; } types[] = {
     QT_FOR_EACH_STATIC_TYPE(QT_ADD_STATIC_METATYPE)
     QT_FOR_EACH_STATIC_ALIAS_TYPE(QT_ADD_STATIC_METATYPE_ALIASES_ITER)
-    QT_FOR_EACH_STATIC_HACKS_TYPE(QT_ADD_STATIC_METATYPE_HACKS_ITER)
+    QT_ADD_STATIC_METATYPE(_, QMetaTypeId2<qreal>::MetaType, qreal)
     {nullptr, 0, QMetaType::UnknownType}
 };
 
-Q_CORE_EXPORT const QMetaTypeInterface *qMetaTypeGuiHelper = nullptr;
-Q_CORE_EXPORT const QMetaTypeInterface *qMetaTypeWidgetsHelper = nullptr;
-Q_CORE_EXPORT const QMetaObject *qMetaObjectWidgetsHelper = nullptr;
+Q_CORE_EXPORT const QMetaTypeModuleHelper *qMetaTypeGuiHelper = nullptr;
+Q_CORE_EXPORT const QMetaTypeModuleHelper *qMetaTypeWidgetsHelper = nullptr;
 
-class QCustomTypeInfo : public QMetaTypeInterface
+static const QMetaTypeModuleHelper *qModuleHelperForType(int type)
 {
-public:
-    QCustomTypeInfo()
-        : alias(-1)
-    {
-        QMetaTypeInterface empty = QT_METATYPE_INTERFACE_INIT(void);
-        *static_cast<QMetaTypeInterface*>(this) = empty;
-    }
-    QByteArray typeName;
-    int alias;
-};
+    if (type >= QMetaType::FirstGuiType && type <= QMetaType::LastGuiType)
+        return qMetaTypeGuiHelper;
+    else if (type >= QMetaType::FirstWidgetsType && type <= QMetaType::LastWidgetsType)
+        return qMetaTypeWidgetsHelper;
+    return nullptr;
+}
 
 template<typename T, typename Key>
 class QMetaTypeFunctionRegistry
@@ -615,11 +799,6 @@ QMetaTypeComparatorRegistry;
 typedef QMetaTypeFunctionRegistry<QtPrivate::AbstractDebugStreamFunction,int>
 QMetaTypeDebugStreamRegistry;
 
-Q_STATIC_ASSERT(std::is_pod<QMetaTypeInterface>::value);
-
-Q_DECLARE_TYPEINFO(QCustomTypeInfo, Q_MOVABLE_TYPE);
-Q_GLOBAL_STATIC(QVector<QCustomTypeInfo>, customTypes)
-Q_GLOBAL_STATIC(QReadWriteLock, customTypesLock)
 Q_GLOBAL_STATIC(QMetaTypeConverterRegistry, customTypesConversionRegistry)
 Q_GLOBAL_STATIC(QMetaTypeComparatorRegistry, customTypesComparatorRegistry)
 Q_GLOBAL_STATIC(QMetaTypeDebugStreamRegistry, customTypesDebugStreamRegistry)
@@ -862,13 +1041,11 @@ void QMetaType::registerStreamOperators(int idx, SaveOperator saveOp,
 {
     if (idx < User)
         return; //builtin types should not be registered;
-    QVector<QCustomTypeInfo> *ct = customTypes();
-    if (!ct)
-        return;
-    QWriteLocker locker(customTypesLock());
-    QCustomTypeInfo &inf = (*ct)[idx - User];
-    inf.saveOp = saveOp;
-    inf.loadOp = loadOp;
+
+    if (auto reg = customTypeRegistery()) {
+        QWriteLocker locker(&reg->lock);
+        reg->dataStreamOp[idx] = { saveOp, loadOp };
+    }
 }
 #endif // QT_NO_DATASTREAM
 
@@ -967,13 +1144,11 @@ const char *QMetaType::typeName(int typeId)
         return nullptr; // It can happen when someone cast int to QVariant::Type, we should not crash...
     }
 
-    const QVector<QCustomTypeInfo> * const ct = customTypes();
-    QReadLocker locker(customTypesLock());
-    return ct && uint(ct->count()) > type - QMetaType::User && !ct->at(type - QMetaType::User).typeName.isEmpty()
-            ? ct->at(type - QMetaType::User).typeName.constData()
-            : nullptr;
-
-#undef QT_METATYPE_TYPEID_TYPENAME_CONVERTER
+    if (auto reg = customTypeRegistery()) {
+        if (auto ti = reg->getCustomType(typeId))
+            return ti->name;
+    }
+    return nullptr;
 }
 
 /*!
@@ -987,7 +1162,7 @@ const char *QMetaType::typeName(int typeId)
 */
 QByteArray QMetaType::name() const
 {
-    return QMetaType::typeName(m_typeId);
+    return d_ptr ? d_ptr->name : nullptr;
 }
 
 /*
@@ -1006,338 +1181,40 @@ static inline int qMetaTypeStaticType(const char *typeName, int length)
 /*
     Similar to QMetaType::type(), but only looks in the custom set of
     types, and doesn't lock the mutex.
-    The extra \a firstInvalidIndex parameter is an easy way to avoid
-    iterating over customTypes() a second time in registerNormalizedType().
-*/
-static int qMetaTypeCustomType_unlocked(const char *typeName, int length, int *firstInvalidIndex = nullptr)
-{
-    const QVector<QCustomTypeInfo> * const ct = customTypes();
-    if (!ct)
-        return QMetaType::UnknownType;
-
-    if (firstInvalidIndex)
-        *firstInvalidIndex = -1;
-    for (int v = 0; v < ct->count(); ++v) {
-        const QCustomTypeInfo &customInfo = ct->at(v);
-        if ((length == customInfo.typeName.size())
-            && !memcmp(typeName, customInfo.typeName.constData(), length)) {
-            if (customInfo.alias >= 0)
-                return customInfo.alias;
-            return v + QMetaType::User;
-        }
-        if (firstInvalidIndex && (*firstInvalidIndex < 0) && customInfo.typeName.isEmpty())
-            *firstInvalidIndex = v;
-    }
-    return QMetaType::UnknownType;
-}
-
-/*!
-    \internal
-
-    This function is needed until existing code outside of qtbase
-    has been changed to call the new version of registerType().
- */
-int QMetaType::registerType(const char *typeName, Deleter deleter,
-                            Creator creator)
-{
-    return registerType(typeName, deleter, creator,
-                        QtMetaTypePrivate::QMetaTypeFunctionHelper<void>::Destruct,
-                        QtMetaTypePrivate::QMetaTypeFunctionHelper<void>::Construct, 0, TypeFlags(), nullptr);
-}
-
-/*!
-    \internal
-    \since 5.5
-
-    Unregisters the user type with the given \a typeId and all its aliases.
-    Returns \c true if the type was unregistered or \c false otherwise.
-
-    This function was added for QML to be able to deregister types after
-    they are unloaded to prevent an infinite increase in custom types for
-    applications that are unloading/reloading components often.
- */
-bool QMetaType::unregisterType(int type)
-{
-    QWriteLocker locker(customTypesLock());
-    QVector<QCustomTypeInfo> *ct = customTypes();
-
-    // check if user type
-    if ((type < User) || ((type - User) >= ct->size()))
-        return false;
-
-    // only types without Q_DECLARE_METATYPE can be unregistered
-    if (ct->data()[type - User].flags & WasDeclaredAsMetaType)
-        return false;
-
-    // invalidate type and all its alias entries
-    for (int v = 0; v < ct->count(); ++v) {
-        if (((v + User) == type) || (ct->at(v).alias == type))
-            ct->data()[v].typeName.clear();
-    }
-    return true;
-}
-
-
-/*!
-    \internal
-    \since 5.0
-
-    Registers a user type for marshalling, with \a typeName, a \a
-    deleter, a \a creator, a \a destructor, a \a constructor, and
-    a \a size. Returns the type's handle, or -1 if the type could
-    not be registered.
- */
-int QMetaType::registerType(const char *typeName, Deleter deleter,
-                            Creator creator,
-                            Destructor destructor,
-                            Constructor constructor,
-                            int size, TypeFlags flags, const QMetaObject *metaObject)
-{
-#ifdef QT_NO_QOBJECT
-    NS(QByteArray) normalizedTypeName = typeName;
-#else
-    NS(QByteArray) normalizedTypeName = QMetaObject::normalizedType(typeName);
-#endif
-
-    return registerNormalizedType(normalizedTypeName, deleter, creator, destructor, constructor, size, flags, metaObject);
-}
-
-/*!
-    \internal
-    \since 5.12
-
-    Registers a user type for marshalling, with \a typeName, a
-    \a destructor, a \a constructor, and a \a size. Returns the
-    type's handle, or -1 if the type could not be registered.
- */
-int QMetaType::registerType(const char *typeName,
-                            TypedDestructor destructor,
-                            TypedConstructor constructor,
-                            int size,
-                            TypeFlags flags,
-                            const QMetaObject *metaObject)
-{
-#ifdef QT_NO_QOBJECT
-    NS(QByteArray) normalizedTypeName = typeName;
-#else
-    NS(QByteArray) normalizedTypeName = QMetaObject::normalizedType(typeName);
-#endif
-
-    return registerNormalizedType(normalizedTypeName, destructor, constructor, size, flags, metaObject);
-}
 
-
-static int registerNormalizedType(const NS(QByteArray) &normalizedTypeName,
-                                  QMetaType::Destructor destructor,
-                                  QMetaType::Constructor constructor,
-                                  QMetaType::TypedDestructor typedDestructor,
-                                  QMetaType::TypedConstructor typedConstructor,
-                                  int size, QMetaType::TypeFlags flags, const QMetaObject *metaObject)
+*/
+static int qMetaTypeCustomType_unlocked(const char *typeName, int length)
 {
-    QVector<QCustomTypeInfo> *ct = customTypes();
-    if (!ct || normalizedTypeName.isEmpty() || (!destructor && !typedDestructor) || (!constructor && !typedConstructor))
-        return -1;
-
-    int idx = qMetaTypeStaticType(normalizedTypeName.constData(),
-                                  normalizedTypeName.size());
-
-    int previousSize = 0;
-    QMetaType::TypeFlags::Int previousFlags = 0;
-    if (idx == QMetaType::UnknownType) {
-        QWriteLocker locker(customTypesLock());
-        int posInVector = -1;
-        idx = qMetaTypeCustomType_unlocked(normalizedTypeName.constData(),
-                                           normalizedTypeName.size(),
-                                           &posInVector);
-        if (idx == QMetaType::UnknownType) {
-            QCustomTypeInfo inf;
-            inf.typeName = normalizedTypeName;
-#ifndef QT_NO_DATASTREAM
-            inf.loadOp = nullptr;
-            inf.saveOp = nullptr;
+    if (auto reg = customTypeRegistery()) {
+#if QT_CONFIG(thread)
+        Q_ASSERT(!reg->lock.tryLockForWrite());
 #endif
-            inf.alias = -1;
-            inf.typedConstructor = typedConstructor;
-            inf.typedDestructor = typedDestructor;
-            inf.constructor = constructor;
-            inf.destructor = destructor;
-            inf.size = size;
-            inf.flags = flags;
-            inf.metaObject = metaObject;
-            if (posInVector == -1) {
-                idx = ct->size() + QMetaType::User;
-                ct->append(inf);
-            } else {
-                idx = posInVector + QMetaType::User;
-                ct->data()[posInVector] = inf;
-            }
-            return idx;
+        if (auto ti = reg->aliases.value(QByteArray(typeName, length), nullptr)) {
+            return ti->typeId;
         }
-
-        if (idx >= QMetaType::User) {
-            previousSize = ct->at(idx - QMetaType::User).size;
-            previousFlags = ct->at(idx - QMetaType::User).flags;
-
-            // Set new/additional flags in case of old library/app.
-            // Ensures that older code works in conjunction with new Qt releases
-            // requiring the new flags.
-            if (flags != previousFlags) {
-                QCustomTypeInfo &inf = ct->data()[idx - QMetaType::User];
-                inf.flags |= flags;
-                if (metaObject)
-                    inf.metaObject = metaObject;
-            }
-        }
-    }
-
-    if (idx < QMetaType::User) {
-        previousSize = QMetaType::sizeOf(idx);
-        previousFlags = QMetaType::typeFlags(idx);
-    }
-
-    if (Q_UNLIKELY(previousSize != size)) {
-        qFatal("QMetaType::registerType: Binary compatibility break "
-            "-- Size mismatch for type '%s' [%i]. Previously registered "
-            "size %i, now registering size %i.",
-            normalizedTypeName.constData(), idx, previousSize, size);
     }
-
-    // these flags cannot change in a binary compatible way:
-    const int binaryCompatibilityFlag = QMetaType::PointerToQObject | QMetaType::IsEnumeration | QMetaType::SharedPointerToQObject
-                                                | QMetaType::WeakPointerToQObject | QMetaType::TrackingPointerToQObject;
-    if (Q_UNLIKELY((previousFlags ^ flags) & binaryCompatibilityFlag)) {
-
-        const char *msg = "QMetaType::registerType: Binary compatibility break. "
-                "\nType flags for type '%s' [%i] don't match. Previously "
-                "registered TypeFlags(0x%x), now registering TypeFlags(0x%x). ";
-
-        qFatal(msg, normalizedTypeName.constData(), idx, previousFlags, int(flags));
-    }
-
-    return idx;
-}
-
-/*!
-  \internal
-  \since 5.0
-  \overload
-  Don't use, kept for binary compatibility
-
-  ### TODO Qt6: remove me
-*/
-int QMetaType::registerNormalizedType(const NS(QByteArray) &normalizedTypeName, Deleter deleter,
-                            Creator creator,
-                            Destructor destructor,
-                            Constructor constructor,
-                            int size, TypeFlags flags, const QMetaObject *metaObject)
-{
-    Q_UNUSED(deleter);
-    Q_UNUSED(creator);
-    return registerNormalizedType(normalizedTypeName, destructor, constructor, size, flags, metaObject);
-}
-
-
-/*!
-    \internal
-    \since 5.5
-
-    Registers a user type for marshalling, with \a normalizedTypeName,
-    a \a destructor, a \a constructor, and a \a size. Returns the type's
-    handle, or -1 if the type could not be registered.
-
-    \note normalizedTypeName is not checked for conformance with
-    Qt's normalized format, so it must already conform.
-
-    ### TODO Qt6: remove me
- */
-int QMetaType::registerNormalizedType(const NS(QByteArray) &normalizedTypeName,
-                            Destructor destructor,
-                            Constructor constructor,
-                            int size, TypeFlags flags, const QMetaObject *metaObject)
-{
-    return NS(registerNormalizedType)(normalizedTypeName, destructor, constructor, nullptr, nullptr, size, flags, metaObject);
-}
-
-/*!
-    \internal
-    \since 5.12
-
-    Registers a user type for marshalling, with \a normalizedTypeName,
-    a \a destructor, a \a constructor, and a \a size. Returns the type's
-    handle, or -1 if the type could not be registered.
-
-    \note normalizedTypeName is not checked for conformance with
-    Qt's normalized format, so it must already conform.
- */
-int QMetaType::registerNormalizedType(const NS(QByteArray) &normalizedTypeName,
-                            TypedDestructor destructor,
-                            TypedConstructor constructor,
-                            int size, TypeFlags flags, const QMetaObject *metaObject)
-{
-    return NS(registerNormalizedType)(normalizedTypeName, nullptr, nullptr, destructor, constructor, size, flags, metaObject);
-}
-
-/*!
-    \internal
-    \since 4.7
-
-    Registers a user type for marshalling, as an alias of another type (typedef)
-*/
-int QMetaType::registerTypedef(const char* typeName, int aliasId)
-{
-#ifdef QT_NO_QOBJECT
-    NS(QByteArray) normalizedTypeName = typeName;
-#else
-    NS(QByteArray) normalizedTypeName = QMetaObject::normalizedType(typeName);
-#endif
-
-    return registerNormalizedTypedef(normalizedTypeName, aliasId);
+    return QMetaType::UnknownType;
 }
 
 /*!
     \internal
-    \since 5.0
 
     Registers a user type for marshalling, as an alias of another type (typedef).
     Note that normalizedTypeName is not checked for conformance with Qt's normalized format,
     so it must already conform.
 */
-int QMetaType::registerNormalizedTypedef(const NS(QByteArray) &normalizedTypeName, int aliasId)
+void QMetaType::registerNormalizedTypedef(const NS(QByteArray) & normalizedTypeName,
+                                          QMetaType metaType)
 {
-    QVector<QCustomTypeInfo> *ct = customTypes();
-    if (!ct || normalizedTypeName.isEmpty())
-        return -1;
-
-    int idx = qMetaTypeStaticType(normalizedTypeName.constData(),
-                                  normalizedTypeName.size());
-
-    if (idx == UnknownType) {
-        QWriteLocker locker(customTypesLock());
-        int posInVector = -1;
-        idx = qMetaTypeCustomType_unlocked(normalizedTypeName.constData(),
-                                               normalizedTypeName.size(),
-                                               &posInVector);
-
-        if (idx == UnknownType) {
-            QCustomTypeInfo inf;
-            inf.typeName = normalizedTypeName;
-            inf.alias = aliasId;
-            if (posInVector == -1)
-                ct->append(inf);
-            else
-                ct->data()[posInVector] = inf;
-            return aliasId;
-        }
-    }
-
-    if (idx != aliasId) {
-        qWarning("QMetaType::registerTypedef: "
-                 "-- Type name '%s' previously registered as typedef of '%s' [%i], "
-                 "now registering as typedef of '%s' [%i].",
-                 normalizedTypeName.constData(), QMetaType::typeName(idx), idx,
-                 QMetaType::typeName(aliasId), aliasId);
+    if (!metaType.isValid())
+        return;
+    if (auto reg = customTypeRegistery()) {
+        QWriteLocker lock(&reg->lock);
+        auto &al = reg->aliases[normalizedTypeName];
+        if (al)
+            return;
+        al = metaType.d_ptr;
     }
-    return idx;
 }
 
 /*!
@@ -1348,16 +1225,7 @@ int QMetaType::registerNormalizedTypedef(const NS(QByteArray) &normalizedTypeNam
 */
 bool QMetaType::isRegistered(int type)
 {
-    // predefined type
-    if ((type >= FirstCoreType && type <= LastCoreType)
-        || (type >= FirstGuiType && type <= LastGuiType)
-        || (type >= FirstWidgetsType && type <= LastWidgetsType)) {
-        return true;
-    }
-
-    QReadLocker locker(customTypesLock());
-    const QVector<QCustomTypeInfo> * const ct = customTypes();
-    return ((type >= User) && (ct && ct->count() > type - User) && !ct->at(type - User).typeName.isEmpty());
+    return QMetaType(type).isRegistered();
 }
 
 template <bool tryNormalizedType>
@@ -1367,7 +1235,7 @@ static inline int qMetaTypeTypeImpl(const char *typeName, int length)
         return QMetaType::UnknownType;
     int type = qMetaTypeStaticType(typeName, length);
     if (type == QMetaType::UnknownType) {
-        QReadLocker locker(customTypesLock());
+        QReadLocker locker(&customTypeRegistery()->lock);
         type = qMetaTypeCustomType_unlocked(typeName, length);
 #ifndef QT_NO_QOBJECT
         if ((type == QMetaType::UnknownType) && tryNormalizedType) {
@@ -1422,7 +1290,6 @@ int QMetaType::type(const QT_PREPEND_NAMESPACE(QByteArray) &typeName)
 }
 
 #ifndef QT_NO_DATASTREAM
-
 namespace
 {
 
@@ -1466,30 +1333,29 @@ struct FilteredOperatorSwitch
         return true;
     }
 };
+
 template<typename T>
 struct FilteredOperatorSwitch<T, /* IsAcceptedType = */ false>
 {
-    static const QMetaTypeInterface* getMetaTypeInterface(int type)
+    static const QMetaTypeModuleHelper *getMetaTypeInterface()
     {
-        if (QModulesPrivate::QTypeModuleInfo<T>::IsGui && qMetaTypeGuiHelper)
-            return &qMetaTypeGuiHelper[type - QMetaType::FirstGuiType];
-        else if (QModulesPrivate::QTypeModuleInfo<T>::IsWidget && qMetaTypeWidgetsHelper)
-            return &qMetaTypeWidgetsHelper[type - QMetaType::FirstWidgetsType];
+        if (QModulesPrivate::QTypeModuleInfo<T>::IsGui)
+            return qMetaTypeGuiHelper;
+        else if (QModulesPrivate::QTypeModuleInfo<T>::IsWidget)
+            return qMetaTypeWidgetsHelper;
         return nullptr;
     }
     static bool save(QDataStream &stream, const T *data, int type)
     {
-        if (auto interface = getMetaTypeInterface(type)) {
-            interface->saveOp(stream, data);
-            return true;
+        if (auto interface = getMetaTypeInterface()) {
+            return interface->save(stream, type, data);
         }
         return false;
     }
     static bool load(QDataStream &stream, T *data, int type)
     {
-        if (auto interface = getMetaTypeInterface(type)) {
-            interface->loadOp(stream, data);
-            return true;
+        if (auto interface = getMetaTypeInterface()) {
+            return interface->load(stream, type, data);
         }
         return false;
     }
@@ -1524,17 +1390,17 @@ public:
     }
     bool delegate(const QMetaTypeSwitcher::NotBuiltinType *data)
     {
-        const QVector<QCustomTypeInfo> * const ct = customTypes();
+        auto ct = customTypeRegistery();
         if (!ct)
             return false;
-        QMetaType::SaveOperator saveOp = nullptr;
+        QMetaType::SaveOperator op = nullptr;
         {
-            QReadLocker locker(customTypesLock());
-            saveOp = ct->at(m_type - QMetaType::User).saveOp;
+            QReadLocker lock(&ct->lock);
+            op = ct->dataStreamOp.value(m_type).saveOp;
         }
-        if (!saveOp)
+        if (!op)
             return false;
-        saveOp(stream, data);
+        op(stream, data);
         return true;
     }
     bool delegate(const void*) { return false; }
@@ -1575,17 +1441,17 @@ public:
     }
     bool delegate(const QMetaTypeSwitcher::NotBuiltinType *data)
     {
-        const QVector<QCustomTypeInfo> * const ct = customTypes();
+        auto ct = customTypeRegistery();
         if (!ct)
             return false;
-        QMetaType::LoadOperator loadOp = nullptr;
+        QMetaType::LoadOperator op = nullptr;
         {
-            QReadLocker locker(customTypesLock());
-            loadOp = ct->at(m_type - QMetaType::User).loadOp;
+            QReadLocker lock(&ct->lock);
+            op = ct->dataStreamOp.value(m_type).loadOp;
         }
-        if (!loadOp)
+        if (!op)
             return false;
-        loadOp(stream, const_cast<QMetaTypeSwitcher::NotBuiltinType*>(data));
+        op(stream, const_cast<QMetaTypeSwitcher::NotBuiltinType *>(data));
         return true;
     }
     bool delegate(const void*) { return false; }
@@ -1646,10 +1512,7 @@ bool QMetaType::load(QDataStream &stream, int type, void *data)
 */
 void *QMetaType::create(int type, const void *copy)
 {
-    QMetaType info(type);
-    if (int size = info.sizeOf())
-        return info.construct(operator new(size), copy);
-    return nullptr;
+    return QMetaType(type).create(copy);
 }
 
 /*!
@@ -1659,73 +1522,9 @@ void *QMetaType::create(int type, const void *copy)
 */
 void QMetaType::destroy(int type, void *data)
 {
-    QMetaType info(type);
-    info.destruct(data);
-    operator delete(data);
+    QMetaType(type).destroy(data);
 }
 
-namespace {
-class TypeConstructor {
-    template<typename T, bool IsAcceptedType = DefinedTypesFilter::Acceptor<T>::IsAccepted>
-    struct ConstructorImpl {
-        static void *Construct(const int /*type*/, void *where, const void *copy) { return QtMetaTypePrivate::QMetaTypeFunctionHelper<T>::Construct(where, copy); }
-    };
-    template<typename T>
-    struct ConstructorImpl<T, /* IsAcceptedType = */ false> {
-        static void *Construct(const int type, void *where, const void *copy)
-        {
-            if (QModulesPrivate::QTypeModuleInfo<T>::IsGui)
-                return Q_LIKELY(qMetaTypeGuiHelper)
-                    ? qMetaTypeGuiHelper[type - QMetaType::FirstGuiType].constructor(where, copy)
-                    : nullptr;
-
-            if (QModulesPrivate::QTypeModuleInfo<T>::IsWidget)
-                return Q_LIKELY(qMetaTypeWidgetsHelper)
-                    ? qMetaTypeWidgetsHelper[type - QMetaType::FirstWidgetsType].constructor(where, copy)
-                    : nullptr;
-
-            // This point can be reached only for known types that definition is not available, for example
-            // in bootstrap mode. We have no other choice then ignore it.
-            return nullptr;
-        }
-    };
-public:
-    TypeConstructor(const int type, void *where)
-        : m_type(type)
-        , m_where(where)
-    {}
-
-    template<typename T>
-    void *delegate(const T *copy) { return ConstructorImpl<T>::Construct(m_type, m_where, copy); }
-    void *delegate(const void *) { return m_where; }
-    void *delegate(const QMetaTypeSwitcher::UnknownType*) { return m_where; }
-    void *delegate(const QMetaTypeSwitcher::NotBuiltinType *copy) { return customTypeConstructor(m_type, m_where, copy); }
-
-private:
-    static void *customTypeConstructor(const int type, void *where, const void *copy)
-    {
-        QMetaType::Constructor ctor;
-        QMetaType::TypedConstructor tctor;
-        const QVector<QCustomTypeInfo> * const ct = customTypes();
-        {
-            QReadLocker locker(customTypesLock());
-            if (Q_UNLIKELY(type < QMetaType::User || !ct || ct->count() <= type - QMetaType::User))
-                return nullptr;
-            const auto &typeInfo = ct->at(type - QMetaType::User);
-            ctor = typeInfo.constructor;
-            tctor = typeInfo.typedConstructor;
-        }
-        Q_ASSERT_X((ctor || tctor) , "void *QMetaType::construct(int type, void *where, const void *copy)", "The type was not properly registered");
-        if (Q_UNLIKELY(tctor))
-            return tctor(type, where, copy);
-        return ctor(where, copy);
-    }
-
-    const int m_type;
-    void *m_where;
-};
-} // namespace
-
 /*!
     \since 5.0
 
@@ -1754,75 +1553,10 @@ private:
 */
 void *QMetaType::construct(int type, void *where, const void *copy)
 {
-    if (!where)
-        return nullptr;
-    TypeConstructor constructor(type, where);
-    return QMetaTypeSwitcher::switcher<void*>(constructor, type, copy);
+    return QMetaType(type).construct(where, copy);
 }
 
 
-namespace {
-class TypeDestructor {
-    template<typename T, bool IsAcceptedType = DefinedTypesFilter::Acceptor<T>::IsAccepted>
-    struct DestructorImpl {
-        static void Destruct(const int /* type */, void *where) { QtMetaTypePrivate::QMetaTypeFunctionHelper<T>::Destruct(where); }
-    };
-    template<typename T>
-    struct DestructorImpl<T, /* IsAcceptedType = */ false> {
-        static void Destruct(const int type, void *where)
-        {
-            if (QModulesPrivate::QTypeModuleInfo<T>::IsGui) {
-                if (Q_LIKELY(qMetaTypeGuiHelper))
-                    qMetaTypeGuiHelper[type - QMetaType::FirstGuiType].destructor(where);
-                return;
-            }
-            if (QModulesPrivate::QTypeModuleInfo<T>::IsWidget) {
-                if (Q_LIKELY(qMetaTypeWidgetsHelper))
-                    qMetaTypeWidgetsHelper[type - QMetaType::FirstWidgetsType].destructor(where);
-                return;
-            }
-            // This point can be reached only for known types that definition is not available, for example
-            // in bootstrap mode. We have no other choice then ignore it.
-        }
-    };
-public:
-    TypeDestructor(const int type)
-        : m_type(type)
-    {}
-
-    template<typename T>
-    void delegate(const T *where) { DestructorImpl<T>::Destruct(m_type, const_cast<T*>(where)); }
-    // MSVC2013 and earlier can not const_cast a std::nullptr_t pointer.
-    void delegate(const std::nullptr_t *) {}
-    void delegate(const void *) {}
-    void delegate(const QMetaTypeSwitcher::UnknownType*) {}
-    void delegate(const QMetaTypeSwitcher::NotBuiltinType *where)
-    { customTypeDestructor(m_type, const_cast<void *>(static_cast<const void *>(where))); }
-
-private:
-    static void customTypeDestructor(const int type, void *where)
-    {
-        QMetaType::Destructor dtor;
-        QMetaType::TypedDestructor tdtor;
-        const QVector<QCustomTypeInfo> * const ct = customTypes();
-        {
-            QReadLocker locker(customTypesLock());
-            if (Q_UNLIKELY(type < QMetaType::User || !ct || ct->count() <= type - QMetaType::User))
-                return;
-            const auto &typeInfo = ct->at(type - QMetaType::User);
-            dtor = typeInfo.destructor;
-            tdtor = typeInfo.typedDestructor;
-        }
-        Q_ASSERT_X((dtor || tdtor), "void QMetaType::destruct(int type, void *where)", "The type was not properly registered");
-        if (Q_UNLIKELY(tdtor))
-            return tdtor(type, where);
-        dtor(where);
-    }
-
-    const int m_type;
-};
-} // namespace
-
 /*!
     \since 5.0
 
@@ -1835,58 +1569,9 @@ private:
 */
 void QMetaType::destruct(int type, void *where)
 {
-    if (!where)
-        return;
-    TypeDestructor destructor(type);
-    QMetaTypeSwitcher::switcher<void>(destructor, type, where);
+    return QMetaType(type).destruct(where);
 }
 
-
-namespace {
-class SizeOf {
-    template<typename T, bool IsAcceptedType = DefinedTypesFilter::Acceptor<T>::IsAccepted>
-    struct SizeOfImpl {
-        static int Size(const int) { return QTypeInfo<T>::sizeOf; }
-    };
-    template<typename T>
-    struct SizeOfImpl<T, /* IsAcceptedType = */ false> {
-        static int Size(const int type)
-        {
-            if (QModulesPrivate::QTypeModuleInfo<T>::IsGui)
-                return Q_LIKELY(qMetaTypeGuiHelper) ? qMetaTypeGuiHelper[type - QMetaType::FirstGuiType].size : 0;
-
-            if (QModulesPrivate::QTypeModuleInfo<T>::IsWidget)
-                return Q_LIKELY(qMetaTypeWidgetsHelper) ? qMetaTypeWidgetsHelper[type - QMetaType::FirstWidgetsType].size : 0;
-
-            // This point can be reached only for known types that definition is not available, for example
-            // in bootstrap mode. We have no other choice then ignore it.
-            return 0;
-        }
-    };
-
-public:
-    SizeOf(int type)
-        : m_type(type)
-    {}
-
-    template<typename T>
-    int delegate(const T*) { return SizeOfImpl<T>::Size(m_type); }
-    int delegate(const QMetaTypeSwitcher::UnknownType*) { return 0; }
-    int delegate(const QMetaTypeSwitcher::NotBuiltinType*) { return customTypeSizeOf(m_type); }
-private:
-    static int customTypeSizeOf(const int type)
-    {
-        const QVector<QCustomTypeInfo> * const ct = customTypes();
-        QReadLocker locker(customTypesLock());
-        if (Q_UNLIKELY(type < QMetaType::User || !ct || ct->count() <= type - QMetaType::User))
-            return 0;
-        return ct->at(type - QMetaType::User).size;
-    }
-
-    const int m_type;
-};
-} // namespace
-
 /*!
     \since 5.0
 
@@ -1900,61 +1585,9 @@ private:
 */
 int QMetaType::sizeOf(int type)
 {
-    SizeOf sizeOf(type);
-    return QMetaTypeSwitcher::switcher<int>(sizeOf, type);
+    return QMetaType(type).sizeOf();
 }
 
-namespace {
-class Flags
-{
-    template<typename T, bool IsAcceptedType = DefinedTypesFilter::Acceptor<T>::IsAccepted>
-    struct FlagsImpl
-    {
-        static quint32 Flags(const int /* type */)
-        {
-            return QtPrivate::QMetaTypeTypeFlags<T>::Flags;
-        }
-    };
-    template<typename T>
-    struct FlagsImpl<T, /* IsAcceptedType = */ false>
-    {
-        static quint32 Flags(const int type)
-        {
-            if (QModulesPrivate::QTypeModuleInfo<T>::IsGui)
-                return Q_LIKELY(qMetaTypeGuiHelper) ? qMetaTypeGuiHelper[type - QMetaType::FirstGuiType].flags : 0;
-
-            if (QModulesPrivate::QTypeModuleInfo<T>::IsWidget)
-                return Q_LIKELY(qMetaTypeWidgetsHelper) ? qMetaTypeWidgetsHelper[type - QMetaType::FirstWidgetsType].flags : 0;
-
-            // This point can be reached only for known types that definition is not available, for example
-            // in bootstrap mode. We have no other choice then ignore it.
-            return 0;
-        }
-    };
-public:
-    Flags(const int type)
-        : m_type(type)
-    {}
-    template<typename T>
-    quint32 delegate(const T*) { return FlagsImpl<T>::Flags(m_type); }
-    quint32 delegate(const void*) { return 0; }
-    quint32 delegate(const QMetaTypeSwitcher::UnknownType*) { return 0; }
-    quint32 delegate(const QMetaTypeSwitcher::NotBuiltinType*) { return customTypeFlags(m_type); }
-private:
-    const int m_type;
-    static quint32 customTypeFlags(const int type)
-    {
-        const QVector<QCustomTypeInfo> * const ct = customTypes();
-        if (Q_UNLIKELY(!ct || type < QMetaType::User))
-            return 0;
-        QReadLocker locker(customTypesLock());
-        if (Q_UNLIKELY(ct->count() <= type - QMetaType::User))
-            return 0;
-        return ct->at(type - QMetaType::User).flags;
-    }
-};
-}  // namespace
-
 /*!
     \since 5.0
 
@@ -1964,61 +1597,9 @@ private:
 */
 QMetaType::TypeFlags QMetaType::typeFlags(int type)
 {
-    Flags flags(type);
-    return static_cast<QMetaType::TypeFlags>(QMetaTypeSwitcher::switcher<quint32>(flags, type));
+    return QMetaType(type).flags();
 }
 
-#ifndef QT_BOOTSTRAPPED
-namespace {
-class MetaObject
-{
-public:
-    MetaObject(const int type)
-        : m_type(type)
-    {}
-
-    template<typename T, bool IsAcceptedType = DefinedTypesFilter::Acceptor<T>::IsAccepted>
-    struct MetaObjectImpl
-    {
-        static const QMetaObject *MetaObject(int /*type*/)
-        { return QtPrivate::MetaObjectForType<T>::value(); }
-    };
-    template<typename T>
-    struct MetaObjectImpl<T, /* IsAcceptedType = */ false>
-    {
-        static const QMetaObject *MetaObject(int type) {
-            if (QModulesPrivate::QTypeModuleInfo<T>::IsGui)
-                return Q_LIKELY(qMetaTypeGuiHelper)
-                    ? qMetaTypeGuiHelper[type - QMetaType::FirstGuiType].metaObject
-                    : nullptr;
-            if (QModulesPrivate::QTypeModuleInfo<T>::IsWidget)
-                return Q_LIKELY(qMetaTypeWidgetsHelper)
-                    ? qMetaTypeWidgetsHelper[type - QMetaType::FirstWidgetsType].metaObject
-                    : nullptr;
-            return nullptr;
-        }
-    };
-
-    template <typename T>
-    const QMetaObject *delegate(const T *) { return MetaObjectImpl<T>::MetaObject(m_type); }
-    const QMetaObject *delegate(const void*) { return nullptr; }
-    const QMetaObject *delegate(const QMetaTypeSwitcher::UnknownType*) { return nullptr; }
-    const QMetaObject *delegate(const QMetaTypeSwitcher::NotBuiltinType*) { return customMetaObject(m_type); }
-private:
-    const int m_type;
-    static const QMetaObject *customMetaObject(const int type)
-    {
-        const QVector<QCustomTypeInfo> * const ct = customTypes();
-        if (Q_UNLIKELY(!ct || type < QMetaType::User))
-            return nullptr;
-        QReadLocker locker(customTypesLock());
-        if (Q_UNLIKELY(ct->count() <= type - QMetaType::User))
-            return nullptr;
-        return ct->at(type - QMetaType::User).metaObject;
-    }
-};
-}  // namespace
-#endif
 
 /*!
     \since 5.0
@@ -2029,13 +1610,7 @@ private:
 */
 const QMetaObject *QMetaType::metaObjectForType(int type)
 {
-#ifndef QT_BOOTSTRAPPED
-    MetaObject mo(type);
-    return QMetaTypeSwitcher::switcher<const QMetaObject*>(mo, type);
-#else
-    Q_UNUSED(type);
-    return nullptr;
-#endif
+    return QMetaType(type).metaObject();
 }
 
 /*!
@@ -2093,25 +1668,6 @@ const QMetaObject *QMetaType::metaObjectForType(int type)
     \sa qRegisterMetaType(), QMetaType::isRegistered(), Q_DECLARE_METATYPE()
 */
 
-/*! \typedef QMetaType::Deleter
-    \internal
-*/
-/*! \typedef QMetaType::Creator
-    \internal
-*/
-/*! \typedef QMetaType::SaveOperator
-    \internal
-*/
-/*! \typedef QMetaType::LoadOperator
-    \internal
-*/
-/*! \typedef QMetaType::Destructor
-    \internal
-*/
-/*! \typedef QMetaType::Constructor
-    \internal
-*/
-
 /*!
     \fn int qRegisterMetaType()
     \relates QMetaType
@@ -2168,85 +1724,24 @@ const QMetaObject *QMetaType::metaObjectForType(int type)
     \sa Q_DECLARE_METATYPE(), QMetaType::type()
 */
 
-namespace {
-class TypeInfo {
-    template<typename T, bool IsAcceptedType = DefinedTypesFilter::Acceptor<T>::IsAccepted>
-    struct TypeInfoImpl
-    {
-        TypeInfoImpl(const uint /* type */, QMetaTypeInterface &info)
-        {
-            QMetaTypeInterface tmp = QT_METATYPE_INTERFACE_INIT_NO_DATASTREAM(T);
-            info = tmp;
-        }
-    };
-
-    template<typename T>
-    struct TypeInfoImpl<T, /* IsAcceptedType = */ false>
-    {
-        TypeInfoImpl(const uint type, QMetaTypeInterface &info)
-        {
-            if (QModulesPrivate::QTypeModuleInfo<T>::IsGui) {
-                if (Q_LIKELY(qMetaTypeGuiHelper))
-                    info = qMetaTypeGuiHelper[type - QMetaType::FirstGuiType];
-                return;
-            }
-            if (QModulesPrivate::QTypeModuleInfo<T>::IsWidget) {
-                if (Q_LIKELY(qMetaTypeWidgetsHelper))
-                    info = qMetaTypeWidgetsHelper[type - QMetaType::FirstWidgetsType];
-                return;
-            }
-        }
-    };
-public:
-    QMetaTypeInterface info;
-    TypeInfo(const uint type)
-        : m_type(type)
-    {
-        QMetaTypeInterface tmp = QT_METATYPE_INTERFACE_INIT_EMPTY();
-        info = tmp;
+static QtPrivate::QMetaTypeInterface *interfaceForType(int typeId)
+{
+    if (typeId >= QMetaType::User) {
+        if (auto reg = customTypeRegistery())
+            return reg->getCustomType(typeId);
     }
-    template<typename T>
-    void delegate(const T*) { TypeInfoImpl<T>(m_type, info); }
-    void delegate(const QMetaTypeSwitcher::UnknownType*) {}
-    void delegate(const QMetaTypeSwitcher::NotBuiltinType*) { customTypeInfo(m_type); }
-private:
-    void customTypeInfo(const uint type)
-    {
-        const QVector<QCustomTypeInfo> * const ct = customTypes();
-        if (Q_UNLIKELY(!ct))
-            return;
-        QReadLocker locker(customTypesLock());
-        if (Q_LIKELY(uint(ct->count()) > type - QMetaType::User))
-            info = ct->at(type - QMetaType::User);
+    if (auto moduleHelper = qModuleHelperForType(typeId))
+        return moduleHelper->interfaceForType(typeId);
+
+    switch (typeId) {
+        QT_FOR_EACH_STATIC_PRIMITIVE_TYPE(QT_METATYPE_CONVERT_ID_TO_TYPE)
+        QT_FOR_EACH_STATIC_PRIMITIVE_POINTER(QT_METATYPE_CONVERT_ID_TO_TYPE)
+        QT_FOR_EACH_STATIC_CORE_CLASS(QT_METATYPE_CONVERT_ID_TO_TYPE)
+        QT_FOR_EACH_STATIC_CORE_POINTER(QT_METATYPE_CONVERT_ID_TO_TYPE)
+        QT_FOR_EACH_STATIC_CORE_TEMPLATE(QT_METATYPE_CONVERT_ID_TO_TYPE)
+    default:
+        return nullptr;
     }
-
-    const uint m_type;
-};
-} // namespace
-
-/*!
-    \fn QMetaType QMetaType::typeInfo(const int type)
-    \internal
-*/
-QMetaType QMetaType::typeInfo(const int type)
-{
-    TypeInfo typeInfo(type);
-    QMetaTypeSwitcher::switcher<void>(typeInfo, type);
-    return (typeInfo.info.constructor || typeInfo.info.typedConstructor)
-                ? QMetaType(static_cast<ExtensionFlag>(QMetaType::CreateEx | QMetaType::DestroyEx |
-                                                       (typeInfo.info.typedConstructor ? QMetaType::ConstructEx | QMetaType::DestructEx : 0))
-                                 , static_cast<const QMetaTypeInterface *>(nullptr) // typeInfo::info is a temporary variable, we can't return address of it.
-                                 , typeInfo.info.typedConstructor
-                                 , typeInfo.info.typedDestructor
-                                 , typeInfo.info.saveOp
-                                 , typeInfo.info.loadOp
-                                 , typeInfo.info.constructor
-                                 , typeInfo.info.destructor
-                                 , typeInfo.info.size
-                                 , typeInfo.info.flags
-                                 , type
-                                 , typeInfo.info.metaObject)
-                : QMetaType(UnknownType);
 }
 
 /*!
@@ -2257,212 +1752,24 @@ QMetaType QMetaType::typeInfo(const int type)
 
      \note The default parameter was added in Qt 5.15.
 */
-QMetaType::QMetaType(const int typeId)
-    : m_typeId(typeId)
-{
-    if (Q_UNLIKELY(typeId == UnknownType)) {
-        // Constructs invalid QMetaType instance.
-        m_extensionFlags = 0xffffffff;
-        Q_ASSERT(!isValid());
-    } else {
-        // TODO it can be better.
-        *this = QMetaType::typeInfo(typeId);
-        if (m_typeId == UnknownType)
-            m_extensionFlags = 0xffffffff;
-        else if (m_typeId == QMetaType::Void)
-            m_extensionFlags = CreateEx | DestroyEx | ConstructEx | DestructEx;
-    }
-}
-
-/*!
-     \fn QMetaType::QMetaType(const QMetaType &other)
-     \since 5.0
-
-     Copy constructs a QMetaType object.
-*/
-QMetaType::QMetaType(const QMetaType &other)
-    : m_typedConstructor(other.m_typedConstructor)
-    , m_typedDestructor(other.m_typedDestructor)
-    , m_saveOp(other.m_saveOp)
-    , m_loadOp(other.m_loadOp)
-    , m_constructor(other.m_constructor)
-    , m_destructor(other.m_destructor)
-    , m_extension(other.m_extension) // space reserved for future use
-    , m_size(other.m_size)
-    , m_typeFlags(other.m_typeFlags)
-    , m_extensionFlags(other.m_extensionFlags)
-    , m_typeId(other.m_typeId)
-    , m_metaObject(other.m_metaObject)
-{}
-
-QMetaType &QMetaType::operator =(const QMetaType &other)
-{
-    m_typedConstructor = other.m_typedConstructor;
-    m_typedDestructor = other.m_typedDestructor;
-    m_saveOp = other.m_saveOp;
-    m_loadOp = other.m_loadOp;
-    m_constructor = other.m_constructor;
-    m_destructor = other.m_destructor;
-    m_size = other.m_size;
-    m_typeFlags = other.m_typeFlags;
-    m_extensionFlags = other.m_extensionFlags;
-    m_extension = other.m_extension; // space reserved for future use
-    m_typeId = other.m_typeId;
-    m_metaObject = other.m_metaObject;
-    return *this;
-}
-
-/*!
-    \fn void QMetaType::ctor(const QMetaTypeInterface *info)
-    \internal
-
-    Method used for future binary compatible extensions.  The function may be
-    called from within QMetaType's constructor to force a library call from
-    inlined code.
-*/
-void QMetaType::ctor(const QMetaTypeInterface *info)
-{
-    // Special case for Void type, the type is valid but not constructible.
-    // In future we may consider to remove this assert and extend this function to initialize
-    // differently m_extensionFlags for different types. Currently it is not needed.
-    Q_ASSERT(m_typeId == QMetaType::Void);
-    Q_UNUSED(info);
-    m_extensionFlags = CreateEx | DestroyEx | ConstructEx | DestructEx;
-}
-
-/*!
-    \fn void QMetaType::dtor()
-    \internal
-
-    Method used for future binary compatible extensions.  The function may be
-    called from within QMetaType's destructor to force a library call from
-    inlined code.
-*/
-void QMetaType::dtor()
-{}
-
-/*!
-    \fn void *QMetaType::createExtended(const void *copy) const
-    \internal
-
-    Method used for future binary compatible extensions. The function may be called
-    during QMetaType::create to force library call from inlined code.
-
-    ### TODO Qt6 remove the extension
-*/
-void *QMetaType::createExtended(const void *copy) const
-{
-    if (m_typeId == QMetaType::UnknownType)
-        return nullptr;
-    if (Q_UNLIKELY(m_typedConstructor && !m_constructor))
-        return m_typedConstructor(m_typeId, operator new(m_size), copy);
-    return m_constructor(operator new(m_size), copy);
-}
-
-/*!
-    \fn void QMetaType::destroyExtended(void *data) const
-    \internal
-
-    Method used for future binary compatible extensions. The function may be called
-    during QMetaType::destroy to force library call from inlined code.
-
-    ### TODO Qt6 remove the extension
-*/
-void QMetaType::destroyExtended(void *data) const
-{
-    if (m_typeId == QMetaType::UnknownType)
-        return;
-    if (Q_UNLIKELY(m_typedDestructor && !m_destructor))
-        m_typedDestructor(m_typeId, data);
-    else
-        m_destructor(data);
-    operator delete(data);
-}
-
-/*!
-    \fn void *QMetaType::constructExtended(void *where, const void *copy) const
-    \internal
-
-    Method used for future binary compatible extensions. The function may be called
-    during QMetaType::construct to force library call from inlined code.
-*/
-void *QMetaType::constructExtended(void *where, const void *copy) const
-{
-    if (m_typeId == QMetaType::UnknownType)
-        return nullptr;
-    if (m_typedConstructor && !m_constructor)
-        return m_typedConstructor(m_typeId, where, copy);
-    return nullptr;
-}
-
-/*!
-    \fn void QMetaType::destructExtended(void *data) const
-    \internal
-
-    Method used for future binary compatible extensions. The function may be called
-    during QMetaType::destruct to force library call from inlined code.
-*/
-void QMetaType::destructExtended(void *data) const
-{
-    if (m_typeId == QMetaType::UnknownType)
-        return;
-    if (m_typedDestructor && !m_destructor)
-        m_typedDestructor(m_typeId, data);
-}
-
-/*!
-    \fn uint QMetaType::sizeExtended() const
-    \internal
-
-    Method used for future binary compatible extensions. The function may be
-    called from within QMetaType::size to force a library call from
-    inlined code.
-*/
-uint QMetaType::sizeExtended() const
-{
-    return 0;
-}
-
-/*!
-    \fn QMetaType::TypeFlags QMetaType::flagsExtended() const
-    \internal
-
-    Method used for future binary compatible extensions.  The function may be
-    called from within QMetaType::flags to force a library call from
-    inlined code.
-*/
-QMetaType::TypeFlags QMetaType::flagsExtended() const
-{
-    return { };
-}
-
-/*!
-    \brief QMetaType::metaObjectExtended
-    \internal
-
-    Method used for future binary compatible extensions. The function may be
-    called from within QMetaType::metaObject to force a library call from
-    inlined code.
-*/
-const QMetaObject *QMetaType::metaObjectExtended() const
-{
-    return nullptr;
-}
-
-
-namespace QtPrivate
-{
-const QMetaObject *metaObjectForQWidget()
-{
-    if (!qMetaTypeWidgetsHelper)
-        return nullptr;
-    return qMetaObjectWidgetsHelper;
-}
-}
+QMetaType::QMetaType(int typeId) : QMetaType(interfaceForType(typeId)) {}
 
 namespace QtMetaTypePrivate {
 const bool VectorBoolElements::true_element = true;
 const bool VectorBoolElements::false_element = false;
 }
 
+namespace QtPrivate {
+#ifndef QT_BOOTSTRAPPED
+// Explicit instantiation definition
+#define QT_METATYPE_DECLARE_TEMPLATE_ITER(TypeName, Id, Name) template class QMetaTypeForType<Name>;
+QT_FOR_EACH_STATIC_PRIMITIVE_TYPE(QT_METATYPE_DECLARE_TEMPLATE_ITER)
+QT_FOR_EACH_STATIC_PRIMITIVE_POINTER(QT_METATYPE_DECLARE_TEMPLATE_ITER)
+QT_FOR_EACH_STATIC_CORE_CLASS(QT_METATYPE_DECLARE_TEMPLATE_ITER)
+QT_FOR_EACH_STATIC_CORE_POINTER(QT_METATYPE_DECLARE_TEMPLATE_ITER)
+QT_FOR_EACH_STATIC_CORE_TEMPLATE(QT_METATYPE_DECLARE_TEMPLATE_ITER)
+#undef QT_METATYPE_DECLARE_TEMPLATE_ITER
+#endif
+}
+
 QT_END_NAMESPACE
diff --git a/src/corelib/kernel/qmetatype.h b/src/corelib/kernel/qmetatype.h
index 59ec8de0e9..b9ab0cbca6 100644
--- a/src/corelib/kernel/qmetatype.h
+++ b/src/corelib/kernel/qmetatype.h
@@ -46,11 +46,13 @@
 #include <QtCore/qatomic.h>
 #include <QtCore/qbytearray.h>
 #include <QtCore/qvarlengtharray.h>
+#include <QtCore/qrefcount.h>
 #ifndef QT_NO_QOBJECT
 #include <QtCore/qobjectdefs.h>
 #endif
-#include <new>
 
+#include <array>
+#include <new>
 #include <vector>
 #include <list>
 #include <map>
@@ -151,6 +153,13 @@ inline Q_DECL_CONSTEXPR int qMetaTypeId();
     F(QVariantHash, 28, QVariantHash) \
     F(QByteArrayList, 49, QByteArrayList) \
 
+#if QT_CONFIG(shortcut)
+#define QT_FOR_EACH_STATIC_KEYSEQUENCE_CLASS(F)\
+    F(QKeySequence, 75, QKeySequence)
+#else
+#define QT_FOR_EACH_STATIC_KEYSEQUENCE_CLASS(F)
+#endif
+
 #define QT_FOR_EACH_STATIC_GUI_CLASS(F)\
     F(QFont, 64, QFont) \
     F(QPixmap, 65, QPixmap) \
@@ -163,11 +172,10 @@ inline Q_DECL_CONSTEXPR int qMetaTypeId();
     F(QRegion, 72, QRegion) \
     F(QBitmap, 73, QBitmap) \
     F(QCursor, 74, QCursor) \
-    F(QKeySequence, 75, QKeySequence) \
+    QT_FOR_EACH_STATIC_KEYSEQUENCE_CLASS(F) \
     F(QPen, 76, QPen) \
     F(QTextLength, 77, QTextLength) \
     F(QTextFormat, 78, QTextFormat) \
-    F(QMatrix, 79, QMatrix) \
     F(QTransform, 80, QTransform) \
     F(QMatrix4x4, 81, QMatrix4x4) \
     F(QVector2D, 82, QVector2D) \
@@ -181,10 +189,6 @@ inline Q_DECL_CONSTEXPR int qMetaTypeId();
 #define QT_FOR_EACH_STATIC_WIDGETS_CLASS(F)\
     F(QSizePolicy, 121, QSizePolicy) \
 
-// ### FIXME kill that set
-#define QT_FOR_EACH_STATIC_HACKS_TYPE(F)\
-    F(QMetaTypeId2<qreal>::MetaType, -1, qreal)
-
 // F is a tuple: (QMetaType::TypeName, QMetaType::TypeNameID, AliasingType, "RealType")
 #define QT_FOR_EACH_STATIC_ALIAS_TYPE(F)\
     F(ULong, -1, ulong, "unsigned long") \
@@ -201,10 +205,11 @@ inline Q_DECL_CONSTEXPR int qMetaTypeId();
     F(UInt, -1, uint, "quint32") \
     F(LongLong, -1, qlonglong, "qint64") \
     F(ULongLong, -1, qulonglong, "quint64") \
+    F(QVariantList, -1, QVariantList, "QVector<QVariant>") \
     F(QVariantList, -1, QVariantList, "QList<QVariant>") \
     F(QVariantMap, -1, QVariantMap, "QMap<QString,QVariant>") \
     F(QVariantHash, -1, QVariantHash, "QHash<QString,QVariant>") \
-    F(QByteArrayList, -1, QByteArrayList, "QList<QByteArray>") \
+    F(QByteArrayList, -1, QByteArrayList, "QVector<QByteArray>") \
 
 #define QT_FOR_EACH_STATIC_TYPE(F)\
     QT_FOR_EACH_STATIC_PRIMITIVE_TYPE(F)\
@@ -219,7 +224,6 @@ inline Q_DECL_CONSTEXPR int qMetaTypeId();
     TypeName = Id,
 
 #define QT_FOR_EACH_AUTOMATIC_TEMPLATE_1ARG(F) \
-    F(QList) \
     F(QVector) \
     F(QQueue) \
     F(QStack) \
@@ -242,6 +246,9 @@ struct QMetaObject;
 
 namespace QtPrivate
 {
+
+class QMetaTypeInterface;
+
 /*!
     This template is used for implicit conversion from type From to type To.
     \internal
@@ -421,13 +428,6 @@ struct ConverterFunctor : public AbstractConverterFunction
 }
 
 class Q_CORE_EXPORT QMetaType {
-    enum ExtensionFlag { NoExtensionFlags,
-                         CreateEx = 0x1, DestroyEx = 0x2,
-                         ConstructEx = 0x4, DestructEx = 0x8,
-                         NameEx = 0x10, SizeEx = 0x20,
-                         CtorEx = 0x40, DtorEx = 0x80,
-                         FlagsEx = 0x100, MetaObjectEx = 0x200
-                       };
 public:
 #ifndef Q_CLANG_QDOC
     // The code that actually gets compiled.
@@ -472,7 +472,7 @@ public:
         QFont = 64, QPixmap = 65, QBrush = 66, QColor = 67, QPalette = 68,
         QIcon = 69, QImage = 70, QPolygon = 71, QRegion = 72, QBitmap = 73,
         QCursor = 74, QKeySequence = 75, QPen = 76, QTextLength = 77, QTextFormat = 78,
-        QMatrix = 79, QTransform = 80, QMatrix4x4 = 81, QVector2D = 82,
+        QTransform = 80, QMatrix4x4 = 81, QVector2D = 82,
         QVector3D = 83, QVector4D = 84, QQuaternion = 85, QPolygonF = 86, QColorSpace = 87,
 
         // Widget types
@@ -494,20 +494,11 @@ public:
         TrackingPointerToQObject = 0x80,
         WasDeclaredAsMetaType = 0x100,
         IsGadget = 0x200,
-        PointerToGadget = 0x400
+        PointerToGadget = 0x400,
+        IsPointer = 0x800,
     };
     Q_DECLARE_FLAGS(TypeFlags, TypeFlag)
 
-    typedef void (*Deleter)(void *);
-    typedef void *(*Creator)(const void *);
-
-#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
-    typedef void (*Destructor)(void *);
-    typedef void *(*Constructor)(void *, const void *); // TODO Qt6: remove me
-#endif
-    typedef void (*TypedDestructor)(int, void *);
-    typedef void *(*TypedConstructor)(int, void *, const void *);
-
     typedef void (*SaveOperator)(QDataStream &, const void *);
     typedef void (*LoadOperator)(QDataStream &, void *);
 #ifndef QT_NO_DATASTREAM
@@ -516,41 +507,8 @@ public:
     static void registerStreamOperators(int type, SaveOperator saveOp,
                                         LoadOperator loadOp);
 #endif
-    static int registerType(const char *typeName, Deleter deleter,
-                            Creator creator);
-    static int registerType(const char *typeName, Deleter deleter,
-                            Creator creator,
-                            Destructor destructor,
-                            Constructor constructor,
-                            int size,
-                            QMetaType::TypeFlags flags,
-                            const QMetaObject *metaObject);
-    static int registerType(const char *typeName,
-                            TypedDestructor destructor,
-                            TypedConstructor constructor,
-                            int size,
-                            QMetaType::TypeFlags flags,
-                            const QMetaObject *metaObject);
-    static bool unregisterType(int type);
-    static int registerNormalizedType(const QT_PREPEND_NAMESPACE(QByteArray) &normalizedTypeName, Deleter deleter,
-                            Creator creator,
-                            Destructor destructor,
-                            Constructor constructor,
-                            int size,
-                            QMetaType::TypeFlags flags,
-                            const QMetaObject *metaObject);
-    static int registerNormalizedType(const QT_PREPEND_NAMESPACE(QByteArray) &normalizedTypeName, Destructor destructor,
-                            Constructor constructor,
-                            int size,
-                            QMetaType::TypeFlags flags,
-                            const QMetaObject *metaObject);
-    static int registerNormalizedType(const QT_PREPEND_NAMESPACE(QByteArray) &normalizedTypeName, TypedDestructor destructor,
-                            TypedConstructor constructor,
-                            int size,
-                            QMetaType::TypeFlags flags,
-                            const QMetaObject *metaObject);
-    static int registerTypedef(const char *typeName, int aliasId);
-    static int registerNormalizedTypedef(const QT_PREPEND_NAMESPACE(QByteArray) &normalizedTypeName, int aliasId);
+    static void registerNormalizedTypedef(const QT_PREPEND_NAMESPACE(QByteArray) &normalizedTypeName, QMetaType type);
+
     static int type(const char *typeName);
 
     static int type(const QT_PREPEND_NAMESPACE(QByteArray) &typeName);
@@ -560,10 +518,6 @@ public:
     static const QMetaObject *metaObjectForType(int type);
     static bool isRegistered(int type);
     static void *create(int type, const void *copy = nullptr);
-#if QT_DEPRECATED_SINCE(5, 0)
-    QT_DEPRECATED static void *construct(int type, const void *copy = nullptr)
-    { return create(type, copy); }
-#endif
     static void destroy(int type, void *data);
     static void *construct(int type, void *where, const void *copy);
     static void destruct(int type, void *where);
@@ -573,32 +527,37 @@ public:
     static bool load(QDataStream &stream, int type, void *data);
 #endif
 
-    explicit QMetaType(const int type = QMetaType::UnknownType); // ### Qt6: drop const
-    inline ~QMetaType();
+    explicit QMetaType(int type);
+    explicit QMetaType(QtPrivate::QMetaTypeInterface *d);
+    QMetaType();
+    ~QMetaType();
+    QMetaType(const QMetaType &other);
+    QMetaType &operator=(const QMetaType &);
+    QMetaType(QMetaType &&other) : d_ptr(other.d_ptr) { other.d_ptr = nullptr; }
+    QMetaType &operator=(QMetaType &&other)
+    {
+        qSwap(d_ptr, other.d_ptr);
+        return *this;
+    }
 
-    inline bool isValid() const;
-    inline bool isRegistered() const;
-    inline int id() const;
-    inline int sizeOf() const;
-    inline TypeFlags flags() const;
-    inline const QMetaObject *metaObject() const;
+    bool isValid() const;
+    bool isRegistered() const;
+    int id() const;
+    int sizeOf() const;
+    TypeFlags flags() const;
+    const QMetaObject *metaObject() const;
     QT_PREPEND_NAMESPACE(QByteArray) name() const;
 
-    inline void *create(const void *copy = nullptr) const;
-    inline void destroy(void *data) const;
-    inline void *construct(void *where, const void *copy = nullptr) const;
-    inline void destruct(void *data) const;
+    void *create(const void *copy = nullptr) const;
+    void destroy(void *data) const;
+    void *construct(void *where, const void *copy = nullptr) const;
+    void destruct(void *data) const;
 
     template<typename T>
-    static QMetaType fromType()
-    { return QMetaType(qMetaTypeId<T>()); }
-
-    friend bool operator==(const QMetaType &a, const QMetaType &b)
-    { return a.m_typeId == b.m_typeId; }
-
-    friend bool operator!=(const QMetaType &a, const QMetaType &b)
-    { return a.m_typeId != b.m_typeId; }
+    static QMetaType fromType();
 
+    friend bool operator==(const QMetaType &a, const QMetaType &b) { return a.id() == b.id(); }
+    friend bool operator!=(const QMetaType &a, const QMetaType &b) { return !(a == b); }
 
 public:
     template<typename T>
@@ -716,41 +675,11 @@ public:
 
     static bool hasRegisteredConverterFunction(int fromTypeId, int toTypeId);
 
-private:
-    static QMetaType typeInfo(const int type);
-    inline QMetaType(const ExtensionFlag extensionFlags, const QMetaTypeInterface *info,
-                     TypedConstructor creator,
-                     TypedDestructor deleter,
-                     SaveOperator saveOp,
-                     LoadOperator loadOp,
-                     Constructor constructor,
-                     Destructor destructor,
-                     uint sizeOf,
-                     uint theTypeFlags,
-                     int typeId,
-                     const QMetaObject *metaObject);
-    QMetaType(const QMetaType &other);
-    QMetaType &operator =(const QMetaType &);
-    inline bool isExtended(const ExtensionFlag flag) const { return m_extensionFlags & flag; }
-
-    // Methods used for future binary compatible extensions
-    void ctor(const QMetaTypeInterface *info);
-    void dtor();
-    uint sizeExtended() const;
-    QMetaType::TypeFlags flagsExtended() const;
-    const QMetaObject *metaObjectExtended() const;
-    void *createExtended(const void *copy = nullptr) const;
-    void destroyExtended(void *data) const;
-    void *constructExtended(void *where, const void *copy = nullptr) const;
-    void destructExtended(void *data) const;
-
     static bool registerComparatorFunction(const QtPrivate::AbstractComparatorFunction *f, int type);
 #ifndef QT_NO_DEBUG_STREAM
     static bool registerDebugStreamOperatorFunction(const QtPrivate::AbstractDebugStreamFunction *f, int type);
 #endif
 
-// ### Qt6: FIXME: Remove the special Q_CC_MSVC handling, it was introduced to maintain BC.
-#if !defined(Q_NO_TEMPLATE_FRIENDS) && !defined(Q_CC_MSVC)
 #ifndef Q_CLANG_QDOC
     template<typename, bool> friend struct QtPrivate::ValueTypeIsMetaType;
     template<typename, typename> friend struct QtPrivate::ConverterMemberFunction;
@@ -760,25 +689,11 @@ private:
     template<typename, bool> friend struct QtPrivate::IsMetaTypePair;
     template<typename, typename> friend struct QtPrivate::MetaTypeSmartPointerHelper;
 #endif
-#else
-public:
-#endif
     static bool registerConverterFunction(const QtPrivate::AbstractConverterFunction *f, int from, int to);
     static void unregisterConverterFunction(int from, int to);
 private:
-
-    TypedConstructor m_typedConstructor;
-    TypedDestructor m_typedDestructor;
-    SaveOperator m_saveOp;
-    LoadOperator m_loadOp;
-    Constructor m_constructor;
-    Destructor m_destructor;
-    void *m_extension; // space reserved for future use
-    uint m_size;
-    uint m_typeFlags;
-    uint m_extensionFlags;
-    int m_typeId;
-    const QMetaObject *m_metaObject;
+    friend class QVariant;
+    QtPrivate::QMetaTypeInterface *d_ptr = nullptr;
 };
 
 #undef QT_DEFINE_METATYPE_ID
@@ -1034,10 +949,6 @@ struct ContainerAPI : CapabilitiesImpl<T>
 };
 
 template<typename T>
-struct ContainerAPI<QList<T> > : CapabilitiesImpl<QList<T> >
-{ static int size(const QList<T> *t) { return t->size(); } };
-
-template<typename T>
 struct ContainerAPI<QVector<T> > : CapabilitiesImpl<QVector<T> >
 { static int size(const QVector<T> *t) { return t->size(); } };
 
@@ -1559,33 +1470,38 @@ namespace QtPrivate
     template<typename T, typename Enable = void>
     struct MetaObjectForType
     {
-        static inline const QMetaObject *value() { return nullptr; }
+        static constexpr inline const QMetaObject *value() { return nullptr; }
     };
+#ifndef QT_NO_QOBJECT
     template<>
     struct MetaObjectForType<void>
     {
-        static inline const QMetaObject *value() { return nullptr; }
+        static constexpr inline const QMetaObject *value() { return nullptr; }
     };
     template<typename T>
     struct MetaObjectForType<T*, typename std::enable_if<IsPointerToTypeDerivedFromQObject<T*>::Value>::type>
     {
-        static inline const QMetaObject *value() { return &T::staticMetaObject; }
+        static constexpr inline const QMetaObject *value() { return &T::staticMetaObject; }
     };
     template<typename T>
     struct MetaObjectForType<T, typename std::enable_if<IsGadgetHelper<T>::IsGadgetOrDerivedFrom>::type>
     {
-        static inline const QMetaObject *value() { return &T::staticMetaObject; }
+        static constexpr inline const QMetaObject *value() { return &T::staticMetaObject; }
     };
     template<typename T>
     struct MetaObjectForType<T, typename std::enable_if<IsPointerToGadgetHelper<T>::IsGadgetOrDerivedFrom>::type>
     {
-        static inline const QMetaObject *value() { return &IsPointerToGadgetHelper<T>::BaseType::staticMetaObject; }
+        static constexpr inline const QMetaObject *value()
+        {
+            return &IsPointerToGadgetHelper<T>::BaseType::staticMetaObject;
+        }
     };
     template<typename T>
     struct MetaObjectForType<T, typename std::enable_if<IsQEnumHelper<T>::Value>::type >
     {
-        static inline const QMetaObject *value() { return qt_getEnumMetaObject(T()); }
+        static constexpr inline const QMetaObject *value() { return qt_getEnumMetaObject(T()); }
     };
+#endif
 
     template<typename T>
     struct IsSharedPointerToTypeDerivedFromQObject
@@ -1731,6 +1647,7 @@ namespace QtPrivate
         static bool registerConverter(int) { return false; }
     };
 
+    template<class T>
     Q_CORE_EXPORT bool isBuiltinType(const QByteArray &type);
 } // namespace QtPrivate
 
@@ -1792,6 +1709,7 @@ namespace QtPrivate {
                      | (std::is_enum<T>::value ? QMetaType::IsEnumeration : 0)
                      | (IsGadgetHelper<T>::IsGadgetOrDerivedFrom ? QMetaType::IsGadget : 0)
                      | (IsPointerToGadgetHelper<T>::IsGadgetOrDerivedFrom ? QMetaType::PointerToGadget : 0)
+                     | (QTypeInfo<T>::isPointer ? QMetaType::IsPointer : 0)
              };
     };
 
@@ -1828,31 +1746,20 @@ namespace QtPrivate {
 template <typename T>
 int qRegisterNormalizedMetaType(const QT_PREPEND_NAMESPACE(QByteArray) &normalizedTypeName
 #ifndef Q_CLANG_QDOC
-    , T * dummy = 0
-    , typename QtPrivate::MetaTypeDefinedHelper<T, QMetaTypeId2<T>::Defined && !QMetaTypeId2<T>::IsBuiltIn>::DefinedType defined = QtPrivate::MetaTypeDefinedHelper<T, QMetaTypeId2<T>::Defined && !QMetaTypeId2<T>::IsBuiltIn>::Defined
+    , T * = 0
+    , typename QtPrivate::MetaTypeDefinedHelper<T, QMetaTypeId2<T>::Defined && !QMetaTypeId2<T>::IsBuiltIn>::DefinedType  = QtPrivate::MetaTypeDefinedHelper<T, QMetaTypeId2<T>::Defined && !QMetaTypeId2<T>::IsBuiltIn>::Defined
 #endif
 )
 {
 #ifndef QT_NO_QOBJECT
     Q_ASSERT_X(normalizedTypeName == QMetaObject::normalizedType(normalizedTypeName.constData()), "qRegisterNormalizedMetaType", "qRegisterNormalizedMetaType was called with a not normalized type name, please call qRegisterMetaType instead.");
 #endif
-    const int typedefOf = dummy ? -1 : QtPrivate::QMetaTypeIdHelper<T>::qt_metatype_id();
-    if (typedefOf != -1)
-        return QMetaType::registerNormalizedTypedef(normalizedTypeName, typedefOf);
-
-    QMetaType::TypeFlags flags(QtPrivate::QMetaTypeTypeFlags<T>::Flags);
-
-    if (defined)
-        flags |= QMetaType::WasDeclaredAsMetaType;
 
-    const int id = QMetaType::registerNormalizedType(normalizedTypeName,
-                                   QtMetaTypePrivate::QMetaTypeFunctionHelper<T>::Destruct,
-                                   QtMetaTypePrivate::QMetaTypeFunctionHelper<T>::Construct,
-                                   int(sizeof(T)),
-                                   flags,
-                                   QtPrivate::MetaObjectForType<T>::value());
+    const QMetaType metaType = QMetaType::fromType<T>();
+    const int id = metaType.id();
 
     if (id > 0) {
+        QMetaType::registerNormalizedTypedef(normalizedTypeName, metaType);
         QtPrivate::SequentialContainerConverterHelper<T>::registerConverter(id);
         QtPrivate::AssociativeContainerConverterHelper<T>::registerConverter(id);
         QtPrivate::MetaTypePairHelper<T>::registerConverter(id);
@@ -1895,8 +1802,11 @@ void qRegisterMetaTypeStreamOperators(const char *typeName
 template <typename T>
 inline Q_DECL_CONSTEXPR int qMetaTypeId()
 {
-    Q_STATIC_ASSERT_X(QMetaTypeId2<T>::Defined, "Type is not registered, please use the Q_DECLARE_METATYPE macro to make it known to Qt's meta-object system");
-    return QMetaTypeId2<T>::qt_metatype_id();
+    if constexpr (bool(QMetaTypeId2<T>::IsBuiltIn)) {
+        return QMetaTypeId2<T>::MetaType;
+    } else {
+        return QMetaType::fromType<T>().id();
+    }
 }
 
 template <typename T>
@@ -2062,6 +1972,7 @@ inline int qRegisterMetaTypeStreamOperators()
     { \
         enum { Defined = 1, IsBuiltIn = true, MetaType = METATYPEID };   \
         static inline Q_DECL_CONSTEXPR int qt_metatype_id() { return METATYPEID; } \
+        static constexpr const char * const name = #NAME; \
     }; \
     QT_END_NAMESPACE
 
@@ -2080,7 +1991,7 @@ typedef QHash<QString, QVariant> QVariantHash;
 #ifdef Q_CLANG_QDOC
 class QByteArrayList;
 #else
-typedef QList<QByteArray> QByteArrayList;
+typedef QVector<QByteArray> QByteArrayList;
 #endif
 
 #define Q_DECLARE_METATYPE_TEMPLATE_1ARG(SINGLE_ARG_TEMPLATE) \
@@ -2103,8 +2014,6 @@ struct QMetaTypeId< SINGLE_ARG_TEMPLATE<T> > \
         typeName.reserve(int(sizeof(#SINGLE_ARG_TEMPLATE)) + 1 + tNameLen + 1 + 1); \
         typeName.append(#SINGLE_ARG_TEMPLATE, int(sizeof(#SINGLE_ARG_TEMPLATE)) - 1) \
             .append('<').append(tName, tNameLen); \
-        if (typeName.endsWith('>')) \
-            typeName.append(' '); \
         typeName.append('>'); \
         const int newId = qRegisterNormalizedMetaType< SINGLE_ARG_TEMPLATE<T> >( \
                         typeName, \
@@ -2145,8 +2054,6 @@ struct QMetaTypeId< DOUBLE_ARG_TEMPLATE<T, U> > \
         typeName.reserve(int(sizeof(#DOUBLE_ARG_TEMPLATE)) + 1 + tNameLen + 1 + uNameLen + 1 + 1); \
         typeName.append(#DOUBLE_ARG_TEMPLATE, int(sizeof(#DOUBLE_ARG_TEMPLATE)) - 1) \
             .append('<').append(tName, tNameLen).append(',').append(uName, uNameLen); \
-        if (typeName.endsWith('>')) \
-            typeName.append(' '); \
         typeName.append('>'); \
         const int newId = qRegisterNormalizedMetaType< DOUBLE_ARG_TEMPLATE<T, U> >(\
                         typeName, \
@@ -2280,104 +2187,6 @@ QT_BEGIN_NAMESPACE
 
 #undef Q_DECLARE_METATYPE_TEMPLATE_SMART_POINTER_ITER
 
-inline QMetaType::QMetaType(const ExtensionFlag extensionFlags, const QMetaTypeInterface *info,
-                            TypedConstructor creator,
-                            TypedDestructor deleter,
-                            SaveOperator saveOp,
-                            LoadOperator loadOp,
-                            Constructor constructor,
-                            Destructor destructor,
-                            uint size,
-                            uint theTypeFlags,
-                            int typeId,
-                            const QMetaObject *_metaObject)
-    : m_typedConstructor(creator)
-    , m_typedDestructor(deleter)
-    , m_saveOp(saveOp)
-    , m_loadOp(loadOp)
-    , m_constructor(constructor)
-    , m_destructor(destructor)
-    , m_extension(nullptr)
-    , m_size(size)
-    , m_typeFlags(theTypeFlags)
-    , m_extensionFlags(extensionFlags)
-    , m_typeId(typeId)
-    , m_metaObject(_metaObject)
-{
-    if (Q_UNLIKELY(isExtended(CtorEx) || typeId == QMetaType::Void))
-        ctor(info);
-}
-
-inline QMetaType::~QMetaType()
-{
-    if (Q_UNLIKELY(isExtended(DtorEx)))
-        dtor();
-}
-
-inline bool QMetaType::isValid() const
-{
-    return m_typeId != UnknownType;
-}
-
-inline bool QMetaType::isRegistered() const
-{
-    return isValid();
-}
-
-inline int QMetaType::id() const
-{
-    return m_typeId;
-}
-
-inline void *QMetaType::create(const void *copy) const
-{
-    // ### TODO Qt6 remove the extension
-    return createExtended(copy);
-}
-
-inline void QMetaType::destroy(void *data) const
-{
-    // ### TODO Qt6 remove the extension
-    destroyExtended(data);
-}
-
-inline void *QMetaType::construct(void *where, const void *copy) const
-{
-    if (Q_UNLIKELY(isExtended(ConstructEx)))
-        return constructExtended(where, copy);
-    return m_constructor(where, copy);
-}
-
-inline void QMetaType::destruct(void *data) const
-{
-    if (Q_UNLIKELY(isExtended(DestructEx)))
-        return destructExtended(data);
-    if (Q_UNLIKELY(!data))
-        return;
-    m_destructor(data);
-}
-
-inline int QMetaType::sizeOf() const
-{
-    if (Q_UNLIKELY(isExtended(SizeEx)))
-        return sizeExtended();
-    return m_size;
-}
-
-inline QMetaType::TypeFlags QMetaType::flags() const
-{
-    if (Q_UNLIKELY(isExtended(FlagsEx)))
-        return flagsExtended();
-    return QMetaType::TypeFlags(m_typeFlags);
-}
-
-inline const QMetaObject *QMetaType::metaObject() const
-{
-    if (Q_UNLIKELY(isExtended(MetaObjectEx)))
-        return metaObjectExtended();
-    return m_metaObject;
-}
-
 QT_END_NAMESPACE
 
 
@@ -2439,6 +2248,526 @@ namespace QtPrivate {
     };
 }
 
+namespace QtPrivate {
+
+class QMetaTypeInterface
+{
+public:
+    uint revision; // 0 in Qt 6.0. Can increase if new field are added
+    uint size;
+    uint alignment;
+    uint flags;
+    const QMetaObject *metaObject;
+    const char *name;
+
+    QBasicAtomicInt typeId;
+    QtPrivate::RefCount ref;
+
+    // Called when the type is unregistered, to delete this
+    using DeleteSelf = void (*)(QMetaTypeInterface *);
+    DeleteSelf deleteSelf;
+
+    using DefaultCtrFn = void (*)(const QMetaTypeInterface *, void *);
+    DefaultCtrFn defaultCtr;
+    using CopyCtrFn = void (*)(const QMetaTypeInterface *, void *, const void *);
+    CopyCtrFn copyCtr;
+    using MoveCtrFn = void (*)(const QMetaTypeInterface *, void *, void *);
+    MoveCtrFn moveCtr;
+    using DtorFn = void (*)(const QMetaTypeInterface *, void *);
+    DtorFn dtor;
+
+    using LegacyRegisterOp = void (*)();
+    LegacyRegisterOp legacyRegisterOp;
+};
+
+struct QTypeNormalizer
+{
+    char *output;
+    int len = 0;
+    char last = 0;
+
+private:
+    static constexpr bool is_ident_char(char s)
+    {
+        return ((s >= 'a' && s <= 'z') || (s >= 'A' && s <= 'Z') || (s >= '0' && s <= '9')
+                || s == '_');
+    }
+    static constexpr bool is_space(char s) { return (s == ' ' || s == '\t' || s == '\n'); }
+    static constexpr bool is_number(char s) { return s >= '0' && s <= '9'; };
+    static constexpr bool starts_with_token(const char *b, const char *e, const char *token,
+                                            bool msvcKw = false)
+    {
+        while (b != e && *token && *b == *token) {
+            b++;
+            token++;
+        }
+        if (*token)
+            return false;
+#ifdef Q_CC_MSVC
+        /// On MSVC, keywords like class or struct are not separated with spaces in constexpr
+        /// context
+        if (msvcKw)
+            return true;
+#endif
+        Q_UNUSED(msvcKw);
+        return b == e || !is_ident_char(*b);
+    }
+    static constexpr bool skipToken(const char *&x, const char *e, const char *token,
+                                    bool msvcKw = false)
+    {
+        if (!starts_with_token(x, e, token, msvcKw))
+            return false;
+        while (*token++)
+            x++;
+        while (x != e && is_space(*x))
+            x++;
+        return true;
+    }
+    static constexpr const char *skipString(const char *x, const char *e)
+    {
+        char delim = *x;
+        x++;
+        while (x != e && *x != delim) {
+            if (*x == '\\') {
+                x++;
+                if (x == e)
+                    return e;
+            }
+            x++;
+        }
+        if (x != e)
+            x++;
+        return x;
+    };
+    static constexpr const char *skipTemplate(const char *x, const char *e, bool stopAtComa = false)
+    {
+        int scopeDepth = 0;
+        int templateDepth = 0;
+        while (x != e) {
+            switch (*x) {
+            case '<':
+                if (!scopeDepth)
+                    templateDepth++;
+                break;
+            case ',':
+                if (stopAtComa && !scopeDepth && !templateDepth)
+                    return x;
+                break;
+            case '>':
+                if (!scopeDepth)
+                    if (--templateDepth < 0)
+                        return x;
+                break;
+            case '(':
+            case '[':
+            case '{':
+                scopeDepth++;
+                break;
+            case '}':
+            case ']':
+            case ')':
+                scopeDepth--;
+                break;
+            case '\'':
+                if (is_number(x[-1]))
+                    break;
+                Q_FALLTHROUGH();
+            case '\"':
+                x = skipString(x, e);
+                continue;
+            }
+            x++;
+        }
+        return x;
+    };
+
+    constexpr void append(char x)
+    {
+        last = x;
+        len++;
+        if (output)
+            *output++ = x;
+    }
+
+    constexpr void appendStr(const char *x)
+    {
+        while (*x)
+            append(*x++);
+    };
+
+public:
+    constexpr int normalizeType(const char *begin, const char *end, bool adjustConst = true)
+    {
+        // Trim spaces
+        while (begin != end && is_space(*begin))
+            begin++;
+        while (begin != end && is_space(*(end - 1)))
+            end--;
+
+        // Convert 'char const *' into 'const char *'. Start at index 1,
+        // not 0, because 'const char *' is already OK.
+        const char *cst = begin + 1;
+        if (*begin == '\'' || *begin == '"')
+            cst = skipString(begin, end);
+        bool seenStar = false;
+        bool hasMiddleConst = false;
+        while (cst < end) {
+            if (*cst == '\"' || (*cst == '\'' && !is_number(cst[-1]))) {
+                cst = skipString(cst, end);
+                if (cst == end)
+                    break;
+            }
+
+            // We mustn't convert 'char * const *' into 'const char **'
+            // and we must beware of 'Bar<const Bla>'.
+            if (*cst == '&' || *cst == '*' || *cst == '[') {
+                seenStar = *cst != '&' || cst != (end - 1);
+                break;
+            }
+            if (*cst == '<') {
+                cst = skipTemplate(cst + 1, end);
+                if (cst == end)
+                    break;
+            }
+            cst++;
+            const char *skipedCst = cst;
+            if (!is_ident_char(*(cst - 1)) && skipToken(skipedCst, end, "const")) {
+                const char *testEnd = end;
+                while (skipedCst < testEnd--) {
+                    if (*testEnd == '*' || *testEnd == '['
+                        || (*testEnd == '&' && testEnd != (end - 1))) {
+                        seenStar = true;
+                        break;
+                    }
+                    if (*testEnd == '>')
+                        break;
+                }
+                if (adjustConst && !seenStar) {
+                    if (*(end - 1) == '&')
+                        end--;
+                } else {
+                    appendStr("const ");
+                }
+                normalizeType(begin, cst, false);
+                begin = skipedCst;
+                hasMiddleConst = true;
+                break;
+            }
+        }
+        if (skipToken(begin, end, "const")) {
+            if (adjustConst && !seenStar) {
+                if (*(end - 1) == '&')
+                    end--;
+            } else {
+                appendStr("const ");
+            }
+        }
+        if (seenStar && adjustConst) {
+            const char *e = end;
+            if (*(end - 1) == '&' && *(end - 2) != '&')
+                e--;
+            while (begin != e && is_space(*(e - 1)))
+                e--;
+            const char *token = "tsnoc"; // 'const' reverse, to check if it ends with const
+            while (*token && begin != e && *(--e) == *token++)
+                ;
+            if (!*token && begin != e && !is_ident_char(*(e - 1))) {
+                while (begin != e && is_space(*(e - 1)))
+                    e--;
+                end = e;
+            }
+        }
+
+        // discard 'struct', 'class', and 'enum'; they are optional
+        // and we don't want them in the normalized signature
+        skipToken(begin, end, "struct", true) || skipToken(begin, end, "class", true)
+                || skipToken(begin, end, "enum", true);
+
+#ifdef QT_NAMESPACE
+        const char *nsbeg = begin;
+        if (skipToken(nsbeg, end, QT_STRINGIFY(QT_NAMESPACE)) && nsbeg + 2 < end && nsbeg[0] == ':'
+            && nsbeg[1] == ':') {
+            begin = nsbeg + 2;
+            while (begin != end && is_space(*begin))
+                begin++;
+        }
+#endif
+
+        if (skipToken(begin, end, "QList")) {
+            // Replace QList by QVector
+            appendStr("QVector");
+        }
+        if (!hasMiddleConst) {
+            // Normalize the integer types
+            int numLong = 0;
+            int numSigned = 0;
+            int numUnsigned = 0;
+            int numInt = 0;
+            int numShort = 0;
+            int numChar = 0;
+            while (begin < end) {
+                if (skipToken(begin, end, "long")) {
+                    numLong++;
+                    continue;
+                }
+                if (skipToken(begin, end, "int")) {
+                    numInt++;
+                    continue;
+                }
+                if (skipToken(begin, end, "short")) {
+                    numShort++;
+                    continue;
+                }
+                if (skipToken(begin, end, "unsigned")) {
+                    numUnsigned++;
+                    continue;
+                }
+                if (skipToken(begin, end, "signed")) {
+                    numSigned++;
+                    continue;
+                }
+                if (skipToken(begin, end, "char")) {
+                    numChar++;
+                    continue;
+                }
+                break;
+            }
+            if (numChar || numShort) {
+                if (numSigned && numChar)
+                    appendStr("signed ");
+                if (numUnsigned)
+                    appendStr("unsigned ");
+                if (numChar)
+                    appendStr("char");
+                else
+                    appendStr("short");
+            } else if (numLong) {
+                if (numLong == 1) {
+                    if (numUnsigned)
+                        append('u');
+                    appendStr("long");
+                } else {
+                    if (numUnsigned)
+                        appendStr("unsigned ");
+                    appendStr("long long");
+                }
+            } else if (numUnsigned || numSigned || numInt) {
+                if (numUnsigned)
+                    append('u');
+                appendStr("int");
+            }
+        }
+
+        bool spaceSkiped = true;
+        while (begin != end) {
+            char c = *begin++;
+            if (is_space(c)) {
+                spaceSkiped = true;
+            } else if ((c == '\'' && !is_number(last)) || c == '\"') {
+                begin--;
+                auto x = skipString(begin, end);
+                while (begin < x)
+                    append(*begin++);
+            } else {
+                if (spaceSkiped && is_ident_char(last) && is_ident_char(c))
+                    append(' ');
+                append(c);
+                spaceSkiped = false;
+                if (c == '<') {
+                    do {
+                        // template recursion
+                        const char *tpl = skipTemplate(begin, end, true);
+                        normalizeType(begin, tpl, false);
+                        if (tpl == end)
+                            return len;
+                        append(*tpl);
+                        begin = tpl;
+                    } while (*begin++ == ',');
+                }
+            }
+        }
+        return len;
+    }
+};
+
+// Normalize the type between begin and end, and store the data in the output. Returns the length.
+// The idea is to first run this function with nullptr as output to allocate the output with the
+// size
+constexpr int qNormalizeType(const char *begin, const char *end, char *output)
+{
+    return QTypeNormalizer { output }.normalizeType(begin, end);
+}
+
+template<typename T>
+constexpr auto typenameHelper()
+{
+    constexpr auto prefix = sizeof(
+#ifdef QT_NAMESPACE
+        QT_STRINGIFY(QT_NAMESPACE) "::"
+#endif
+#ifdef Q_CC_MSVC
+        "auto __cdecl QtPrivate::typenameHelper<"
+#elif defined(Q_CC_CLANG)
+        "auto QtPrivate::typenameHelper() [T = "
+#else
+        "constexpr auto QtPrivate::typenameHelper() [with T = "
+#endif
+        ) - 1;
+#ifdef Q_CC_MSVC
+    constexpr int suffix = sizeof(">(void)");
+#else
+    constexpr int suffix = sizeof("]");
+#endif
+
+#if !(defined(Q_CC_GNU) && !defined(Q_CC_INTEL) && !defined(Q_CC_CLANG))
+    constexpr auto func = Q_FUNC_INFO;
+    constexpr const char *begin = func + prefix;
+    constexpr const char *end = func + sizeof(Q_FUNC_INFO) - suffix;
+    constexpr int len = qNormalizeType(begin, end, nullptr);
+#else // GCC < 8.1 did not have Q_FUNC_INFO as constexpr, and GCC 9 has a precompiled header bug
+    auto func = Q_FUNC_INFO;
+    const char *begin = func + prefix;
+    const char *end = func + sizeof(Q_FUNC_INFO) - suffix;
+    // This is an upper bound of the size since the normalized signature should always be smaller
+    // (Unless there is a QList -> QVector change, but that should not happen)
+    constexpr int len = sizeof(Q_FUNC_INFO) - suffix - prefix;
+#endif
+    std::array<char, len + 1> result {};
+    qNormalizeType(begin, end, result.data());
+    return result;
+}
+
+template<typename T, typename = void>
+struct BuiltinMetaType : std::integral_constant<int, 0>
+{
+};
+template<typename T>
+struct BuiltinMetaType<T, std::enable_if_t<QMetaTypeId2<T>::IsBuiltIn>>
+    : std::integral_constant<int, QMetaTypeId2<T>::MetaType>
+{
+};
+
+template<typename T>
+class QMetaTypeForType
+{
+    static const decltype(typenameHelper<T>()) name;
+
+public:
+    static QMetaTypeInterface metaType;
+};
+
+#ifdef Q_CC_CLANG
+// Workaround for https://bugs.llvm.org/show_bug.cgi?id=44554 : Every lambda used for initializing
+// static members need a different signature for explicit instentiation
+#define QT_METATYPE_CONSTEXPRLAMDA(...) [](std::integral_constant<int, __COUNTER__> = {}) constexpr __VA_ARGS__ ()
+#elif defined(Q_CC_MSVC)
+// Workaround a bug with 'if constexpr' not working in lambda that are not generic in MSVC
+#define QT_METATYPE_CONSTEXPRLAMDA(...) [](auto) constexpr __VA_ARGS__ (0)
+#else
+#define QT_METATYPE_CONSTEXPRLAMDA(...) []() constexpr __VA_ARGS__ ()
+#endif
+
+template<typename T>
+QMetaTypeInterface QMetaTypeForType<T>::metaType = {
+    /*.revision=*/ 0,
+    /*.size=*/ sizeof(T),
+    /*.alignment=*/ alignof(T),
+    /*.flags=*/ QMetaTypeTypeFlags<T>::Flags,
+    /*.metaObject=*/ MetaObjectForType<T>::value(),
+    /*.name=*/ QT_METATYPE_CONSTEXPRLAMDA( -> const char * {
+        if constexpr (bool(QMetaTypeId2<T>::IsBuiltIn)) {
+            return QMetaTypeId2<T>::name;
+        } else {
+            return name.data();
+        }
+    }),
+    /*.typeId=*/ BuiltinMetaType<T>::value,
+    /*.ref=*/ Q_REFCOUNT_INITIALIZE_STATIC,
+    /*.deleteSelf=*/ nullptr,
+    /*.defaultCtr=*/ QT_METATYPE_CONSTEXPRLAMDA( -> QMetaTypeInterface::DefaultCtrFn {
+        if constexpr (std::is_default_constructible_v<T>) {
+            return [](const QMetaTypeInterface *, void *addr) { new (addr) T(); };
+        } else {
+            return nullptr;
+        }
+    }),
+    /*.copyCtr=*/ QT_METATYPE_CONSTEXPRLAMDA( -> QMetaTypeInterface::CopyCtrFn {
+        if (std::is_copy_constructible_v<T>) {
+            return [](const QMetaTypeInterface *, void *addr, const void *other) {
+                new (addr) T(*reinterpret_cast<const T *>(other));
+            };
+        } else {
+            return nullptr;
+        }
+    }),
+    /*.moveCtr=*/ QT_METATYPE_CONSTEXPRLAMDA( -> QMetaTypeInterface::MoveCtrFn {
+        if constexpr (std::is_move_constructible_v<T>) {
+            return [](const QMetaTypeInterface *, void *addr, void *other) {
+                new (addr) T(std::move(*reinterpret_cast<T *>(other)));
+            };
+        } else {
+            return nullptr;
+        }
+    }),
+    /*.dtor=*/ QT_METATYPE_CONSTEXPRLAMDA( -> QMetaTypeInterface::DtorFn {
+        return [](const QMetaTypeInterface *, void *addr) { reinterpret_cast<T *>(addr)->~T(); };
+    }),
+    /*.legacyRegisterOp=*/ QT_METATYPE_CONSTEXPRLAMDA( -> QMetaTypeInterface::LegacyRegisterOp {
+        if constexpr (QMetaTypeId2<T>::Defined && !QMetaTypeId2<T>::IsBuiltIn) {
+            return []() { QMetaTypeId2<T>::qt_metatype_id(); };
+        } else {
+            return nullptr;
+        }
+    })
+};
+#undef QT_METATYPE_CONSTEXPRLAMDA
+
+template<typename T>
+constexpr const decltype(typenameHelper<T>()) QMetaTypeForType<T>::name = typenameHelper<T>();
+
+template<>
+class QMetaTypeForType<void>
+{
+};
+
+#ifndef QT_BOOTSTRAPPED
+#define QT_METATYPE_DECLARE_EXTERN_TEMPLATE_ITER(TypeName, Id, Name)                               \
+    extern template class Q_CORE_EXPORT QMetaTypeForType<Name>;
+QT_WARNING_PUSH
+QT_WARNING_DISABLE_GCC("-Wattributes") // false positive because of QMetaTypeForType<void>
+QT_FOR_EACH_STATIC_PRIMITIVE_TYPE(QT_METATYPE_DECLARE_EXTERN_TEMPLATE_ITER)
+QT_WARNING_POP
+QT_FOR_EACH_STATIC_PRIMITIVE_POINTER(QT_METATYPE_DECLARE_EXTERN_TEMPLATE_ITER)
+QT_FOR_EACH_STATIC_CORE_CLASS(QT_METATYPE_DECLARE_EXTERN_TEMPLATE_ITER)
+QT_FOR_EACH_STATIC_CORE_POINTER(QT_METATYPE_DECLARE_EXTERN_TEMPLATE_ITER)
+QT_FOR_EACH_STATIC_CORE_TEMPLATE(QT_METATYPE_DECLARE_EXTERN_TEMPLATE_ITER)
+#undef QT_METATYPE_DECLARE_EXTERN_TEMPLATE_ITER
+#endif
+
+template<typename T>
+constexpr QMetaTypeInterface *qMetaTypeIntefaceForType()
+{
+    using Ty = std::remove_cv_t<std::remove_reference_t<T>>;
+    if constexpr (std::is_same_v<Ty, void>) {
+        return nullptr;
+    } else {
+        return &QMetaTypeForType<Ty>::metaType;
+    }
+}
+
+} // namespace QtPrivate
+
+template<typename T>
+QMetaType QMetaType::fromType()
+{
+    return QMetaType(QtPrivate::qMetaTypeIntefaceForType<T>());
+}
+
+template<typename... T>
+QtPrivate::QMetaTypeInterface *const qt_metaTypeArray[] = {
+    QtPrivate::qMetaTypeIntefaceForType<T>()...
+};
+
 QT_END_NAMESPACE
 
 #endif // QMETATYPE_H
diff --git a/src/corelib/kernel/qmetatype_p.h b/src/corelib/kernel/qmetatype_p.h
index d743d5a5c7..00d57a7e68 100644
--- a/src/corelib/kernel/qmetatype_p.h
+++ b/src/corelib/kernel/qmetatype_p.h
@@ -121,77 +121,15 @@ QT_FOR_EACH_STATIC_WIDGETS_CLASS(QT_DECLARE_WIDGETS_MODULE_TYPES_ITER)
 #undef QT_DECLARE_GUI_MODULE_TYPES_ITER
 #undef QT_DECLARE_WIDGETS_MODULE_TYPES_ITER
 
-class QMetaTypeInterface
+class QMetaTypeModuleHelper
 {
 public:
-    QMetaType::SaveOperator saveOp;
-    QMetaType::LoadOperator loadOp;
-    QMetaType::Constructor constructor; // TODO Qt6: remove me
-    QMetaType::Destructor destructor;
-    int size;
-    QMetaType::TypeFlags::Int flags;
-    const QMetaObject *metaObject;
-    QMetaType::TypedConstructor typedConstructor;
-    QMetaType::TypedDestructor typedDestructor;
-};
-
+    virtual QtPrivate::QMetaTypeInterface *interfaceForType(int) const = 0;
 #ifndef QT_NO_DATASTREAM
-#  define QT_METATYPE_INTERFACE_INIT_DATASTREAM_IMPL(Type) \
-    /*saveOp*/(QtMetaTypePrivate::QMetaTypeFunctionHelper<Type, QtMetaTypePrivate::TypeDefinition<Type>::IsAvailable>::Save), \
-    /*loadOp*/(QtMetaTypePrivate::QMetaTypeFunctionHelper<Type, QtMetaTypePrivate::TypeDefinition<Type>::IsAvailable>::Load),
-#  define QT_METATYPE_INTERFACE_INIT_EMPTY_DATASTREAM_IMPL(Type) \
-    /*saveOp*/ nullptr, \
-    /*loadOp*/ nullptr,
-#else
-#  define QT_METATYPE_INTERFACE_INIT_EMPTY_DATASTREAM_IMPL(Type) \
-    /*saveOp*/ nullptr, \
-    /*loadOp*/ nullptr,
-#  define QT_METATYPE_INTERFACE_INIT_DATASTREAM_IMPL(Type) \
-    QT_METATYPE_INTERFACE_INIT_EMPTY_DATASTREAM_IMPL(Type)
-#endif
-
-#ifndef QT_BOOTSTRAPPED
-#define METAOBJECT_DELEGATE(Type) (QtPrivate::MetaObjectForType<Type>::value())
-#else
-#define METAOBJECT_DELEGATE(Type) nullptr
+    virtual bool save(QDataStream &stream, int type, const void *data) const = 0;
+    virtual bool load(QDataStream &stream, int type, void *data) const = 0;
 #endif
-
-#define QT_METATYPE_INTERFACE_INIT_IMPL(Type, DATASTREAM_DELEGATE) \
-{ \
-    DATASTREAM_DELEGATE(Type) \
-    /*constructor*/(QtMetaTypePrivate::QMetaTypeFunctionHelper<Type, QtMetaTypePrivate::TypeDefinition<Type>::IsAvailable>::Construct), \
-    /*destructor*/(QtMetaTypePrivate::QMetaTypeFunctionHelper<Type, QtMetaTypePrivate::TypeDefinition<Type>::IsAvailable>::Destruct), \
-    /*size*/(QTypeInfo<Type>::sizeOf), \
-    /*flags*/QtPrivate::QMetaTypeTypeFlags<Type>::Flags, \
-    /*metaObject*/METAOBJECT_DELEGATE(Type), \
-    /*typedConstructor*/ nullptr, \
-    /*typedDestructor*/ nullptr \
-}
-
-
-/* These  QT_METATYPE_INTERFACE_INIT* macros are used to initialize QMetaTypeInterface instance.
-
- - QT_METATYPE_INTERFACE_INIT(Type) -> It takes Type argument and creates all necessary wrapper functions for the Type,
-   it detects if QT_NO_DATASTREAM was defined. Probably it is the macro that you want to use.
-
- - QT_METATYPE_INTERFACE_INIT_EMPTY() -> It initializes an empty QMetaTypeInterface instance.
-
- - QT_METATYPE_INTERFACE_INIT_NO_DATASTREAM(Type) -> Temporary workaround for missing auto-detection of data stream
-   operators. It creates same instance as QT_METATYPE_INTERFACE_INIT(Type) but with null stream operators callbacks.
- */
-#define QT_METATYPE_INTERFACE_INIT(Type) QT_METATYPE_INTERFACE_INIT_IMPL(Type, QT_METATYPE_INTERFACE_INIT_DATASTREAM_IMPL)
-#define QT_METATYPE_INTERFACE_INIT_NO_DATASTREAM(Type) QT_METATYPE_INTERFACE_INIT_IMPL(Type, QT_METATYPE_INTERFACE_INIT_EMPTY_DATASTREAM_IMPL)
-#define QT_METATYPE_INTERFACE_INIT_EMPTY() \
-{ \
-    QT_METATYPE_INTERFACE_INIT_EMPTY_DATASTREAM_IMPL(void) \
-    /*constructor*/ nullptr, \
-    /*destructor*/ nullptr, \
-    /*size*/ 0, \
-    /*flags*/ 0, \
-    /*metaObject*/ nullptr , \
-    /*typedConstructor*/ nullptr, \
-    /*typedDestructor*/ nullptr \
-}
+};
 
 namespace QtMetaTypePrivate {
 template<typename T>
@@ -232,9 +170,6 @@ template<> struct TypeDefinition<QRegExp> { static const bool IsAvailable = fals
 #if !QT_CONFIG(regularexpression)
 template<> struct TypeDefinition<QRegularExpression> { static const bool IsAvailable = false; };
 #endif
-#ifdef QT_NO_SHORTCUT
-template<> struct TypeDefinition<QKeySequence> { static const bool IsAvailable = false; };
-#endif
 #ifdef QT_NO_CURSOR
 template<> struct TypeDefinition<QCursor> { static const bool IsAvailable = false; };
 #endif
@@ -256,6 +191,34 @@ template<> struct TypeDefinition<QQuaternion> { static const bool IsAvailable =
 #ifdef QT_NO_ICON
 template<> struct TypeDefinition<QIcon> { static const bool IsAvailable = false; };
 #endif
+
+template<typename T>
+static QtPrivate::QMetaTypeInterface *getInterfaceFromType()
+{
+    if constexpr (std::is_same_v<T, void>) {
+        return nullptr;
+    } else if constexpr (QtMetaTypePrivate::TypeDefinition<T>::IsAvailable) {
+        return &QtPrivate::QMetaTypeForType<T>::metaType;
+    }
+    return nullptr;
+}
+
+#define QT_METATYPE_CONVERT_ID_TO_TYPE(MetaTypeName, MetaTypeId, RealName)                         \
+    case QMetaType::MetaTypeName:                                                                  \
+        return QtMetaTypePrivate::getInterfaceFromType<RealName>();
+
+#define QT_METATYPE_DATASTREAM_SAVE(MetaTypeName, MetaTypeId, RealName) \
+    case QMetaType::MetaTypeName: \
+        QtMetaTypePrivate::QMetaTypeFunctionHelper<RealName, QtMetaTypePrivate::TypeDefinition<RealName>::IsAvailable>::Save(stream, data); \
+        return true;
+
+#define QT_METATYPE_DATASTREAM_LOAD(MetaTypeName, MetaTypeId, RealName) \
+    case QMetaType::MetaTypeName: \
+        QtMetaTypePrivate::QMetaTypeFunctionHelper<RealName, QtMetaTypePrivate::TypeDefinition<RealName>::IsAvailable>::Load(stream, data); \
+        return true;
+
+void derefAndDestroy(QtPrivate::QMetaTypeInterface *d_ptr);
+
 } //namespace QtMetaTypePrivate
 
 QT_END_NAMESPACE
diff --git a/src/corelib/kernel/qobject.cpp b/src/corelib/kernel/qobject.cpp
index 8be10ed601..2fdf94c38b 100644
--- a/src/corelib/kernel/qobject.cpp
+++ b/src/corelib/kernel/qobject.cpp
@@ -164,7 +164,6 @@ extern "C" Q_CORE_EXPORT void qt_removeObject(QObject *)
 #endif
 
 void (*QAbstractDeclarativeData::destroyed)(QAbstractDeclarativeData *, QObject *) = nullptr;
-void (*QAbstractDeclarativeData::destroyed_qml1)(QAbstractDeclarativeData *, QObject *) = nullptr;
 void (*QAbstractDeclarativeData::parentChanged)(QAbstractDeclarativeData *, QObject *, QObject *) = nullptr;
 void (*QAbstractDeclarativeData::signalEmitted)(QAbstractDeclarativeData *, QObject *, int, void **) = nullptr;
 int  (*QAbstractDeclarativeData::receivers)(QAbstractDeclarativeData *, const QObject *, int) = nullptr;
@@ -229,10 +228,6 @@ QObjectPrivate::~QObjectPrivate()
 
     if (metaObject) metaObject->objectDestroyed(q_ptr);
 
-#ifndef QT_NO_USERDATA
-    if (extraData)
-        qDeleteAll(extraData->userData);
-#endif
     delete extraData;
 }
 
@@ -992,15 +987,8 @@ QObject::~QObject()
         emit destroyed(this);
     }
 
-    if (d->declarativeData) {
-        if (static_cast<QAbstractDeclarativeDataImpl*>(d->declarativeData)->ownedByQml1) {
-            if (QAbstractDeclarativeData::destroyed_qml1)
-                QAbstractDeclarativeData::destroyed_qml1(d->declarativeData, this);
-        } else {
-            if (QAbstractDeclarativeData::destroyed)
-                QAbstractDeclarativeData::destroyed(d->declarativeData, this);
-        }
-    }
+    if (d->declarativeData && QAbstractDeclarativeData::destroyed)
+        QAbstractDeclarativeData::destroyed(d->declarativeData, this);
 
     QObjectPrivate::ConnectionData *cd = d->connections.loadRelaxed();
     if (cd) {
@@ -4277,58 +4265,6 @@ void QObject::dumpObjectInfo() const
     }
 }
 
-#ifndef QT_NO_USERDATA
-static QBasicAtomicInteger<uint> user_data_registration = Q_BASIC_ATOMIC_INITIALIZER(0);
-
-/*!
-    \internal
- */
-uint QObject::registerUserData()
-{
-    return user_data_registration.fetchAndAddRelaxed(1);
-}
-
-/*!
-    \fn QObjectUserData::QObjectUserData()
-    \internal
- */
-
-/*!
-    \internal
- */
-QObjectUserData::~QObjectUserData()
-{
-}
-
-/*!
-    \internal
- */
-void QObject::setUserData(uint id, QObjectUserData* data)
-{
-    Q_D(QObject);
-    if (!d->extraData)
-        d->extraData = new QObjectPrivate::ExtraData;
-
-    if (d->extraData->userData.size() <= (int) id)
-        d->extraData->userData.resize((int) id + 1);
-    d->extraData->userData[id] = data;
-}
-
-/*!
-    \internal
- */
-QObjectUserData* QObject::userData(uint id) const
-{
-    Q_D(const QObject);
-    if (!d->extraData)
-        return nullptr;
-    if ((int)id < d->extraData->userData.size())
-        return d->extraData->userData.at(id);
-    return nullptr;
-}
-
-#endif // QT_NO_USERDATA
-
 
 #ifndef QT_NO_DEBUG_STREAM
 QDebug operator<<(QDebug dbg, const QObject *o)
@@ -4635,6 +4571,23 @@ QDebug operator<<(QDebug dbg, const QObject *o)
 */
 
 /*!
+    \macro Q_MOC_INCLUDE
+    \relates QObject
+    \since 6.0
+
+    The Q_MOC_INCLUDE macro can be used within or outside a class, and tell the
+    \l{moc}{Meta Object Compiler} to add an include.
+
+    \code
+        // Put this in your code and the generated code will include this header.
+        Q_MOC_INCLUDE("myheader.h")
+    \endcode
+
+    This is useful if the types you use as properties or signal/slots arguments
+    are forward declared.
+*/
+
+/*!
     \macro Q_SIGNALS
     \relates QObject
 
@@ -4749,10 +4702,15 @@ QDebug operator<<(QDebug dbg, const QObject *o)
 
     Using the same Window class as the previous example, the newProperty and
     newMethod would only be exposed in this code when the expected version is
-    1 or greater.
+    \c{2.1} or greater.
+
+    Since all methods are considered to be in revision \c{0} if untagged, a tag
+    of \c{Q_REVISION(0)} or \c{Q_REVISION(0, 0)} is invalid and ignored.
 
-    Since all methods are considered to be in revision 0 if untagged, a tag
-    of Q_REVISION(0) is invalid and ignored.
+    You can pass one or two integer parameters to \c{Q_REVISION}. If you pass
+    one parameter, it denotes the minor version only. This means that the major
+    version is unspecified. If you pass two, the first parameter is the major
+    version and the second parameter is the minor version.
 
     This tag is not used by the meta-object system itself. Currently this is only
     used by the QtQml module.
diff --git a/src/corelib/kernel/qobject.h b/src/corelib/kernel/qobject.h
index f5d7c22e3a..8d9cc3ab83 100644
--- a/src/corelib/kernel/qobject.h
+++ b/src/corelib/kernel/qobject.h
@@ -78,12 +78,6 @@ class QRegExp;
 #if QT_CONFIG(regularexpression)
 class QRegularExpression;
 #endif
-#if !QT_DEPRECATED_SINCE(5, 14) || QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
-# define QT_NO_USERDATA
-#endif
-#ifndef QT_NO_USERDATA
-class QObjectUserData;
-#endif
 struct QDynamicMetaObjectData;
 
 typedef QList<QObject*> QObjectList;
@@ -408,15 +402,6 @@ public:
     QList<QByteArray> dynamicPropertyNames() const;
 #endif // QT_NO_PROPERTIES
 
-#ifndef QT_NO_USERDATA
-    QT_DEPRECATED_VERSION_5_14
-    static uint registerUserData();
-    QT_DEPRECATED_VERSION_X_5_14("Use setProperty()")
-    void setUserData(uint id, QObjectUserData* data);
-    QT_DEPRECATED_VERSION_X_5_14("Use property()")
-    QObjectUserData* userData(uint id) const;
-#endif // QT_NO_USERDATA
-
 Q_SIGNALS:
     void destroyed(QObject * = nullptr);
     void objectNameChanged(const QString &objectName, QPrivateSignal);
@@ -449,9 +434,6 @@ protected:
 protected:
     QScopedPointer<QObjectData> d_ptr;
 
-    static const QMetaObject staticQtMetaObject;
-    friend inline const QMetaObject *qt_getQtMetaObject() noexcept;
-
     friend struct QMetaObject;
     friend struct QMetaObjectPrivate;
     friend class QMetaCallEvent;
@@ -482,18 +464,6 @@ inline QMetaObject::Connection QObject::connect(const QObject *asender, const ch
                                             const char *amember, Qt::ConnectionType atype) const
 { return connect(asender, asignal, this, amember, atype); }
 
-inline const QMetaObject *qt_getQtMetaObject() noexcept
-{ return &QObject::staticQtMetaObject; }
-
-#ifndef QT_NO_USERDATA
-class Q_CORE_EXPORT QObjectUserData {
-    Q_DISABLE_COPY(QObjectUserData)
-public:
-    QObjectUserData() = default;
-    virtual ~QObjectUserData();
-};
-#endif
-
 #if QT_DEPRECATED_SINCE(5, 0)
 template<typename T>
 inline QT_DEPRECATED T qFindChild(const QObject *o, const QString &name = QString())
diff --git a/src/corelib/kernel/qobject_p.h b/src/corelib/kernel/qobject_p.h
index 34b7447d5d..97b492360c 100644
--- a/src/corelib/kernel/qobject_p.h
+++ b/src/corelib/kernel/qobject_p.h
@@ -89,7 +89,6 @@ class Q_CORE_EXPORT QAbstractDeclarativeData
 {
 public:
     static void (*destroyed)(QAbstractDeclarativeData *, QObject *);
-    static void (*destroyed_qml1)(QAbstractDeclarativeData *, QObject *);
     static void (*parentChanged)(QAbstractDeclarativeData *, QObject *, QObject *);
     static void (*signalEmitted)(QAbstractDeclarativeData *, QObject *, int, void **);
     static int  (*receivers)(QAbstractDeclarativeData *, const QObject *, int);
@@ -97,14 +96,6 @@ public:
     static void (*setWidgetParent)(QObject *, QObject *); // Used by the QML engine to specify parents for widgets. Set by QtWidgets.
 };
 
-// This is an implementation of QAbstractDeclarativeData that is identical with
-// the implementation in QtDeclarative and QtQml for the first bit
-struct QAbstractDeclarativeDataImpl : public QAbstractDeclarativeData
-{
-    quint32 ownedByQml1:1;
-    quint32 unused: 31;
-};
-
 class Q_CORE_EXPORT QObjectPrivate : public QObjectData
 {
     Q_DECLARE_PUBLIC(QObject)
@@ -113,9 +104,6 @@ public:
     struct ExtraData
     {
         ExtraData() {}
-    #ifndef QT_NO_USERDATA
-        QVector<QObjectUserData *> userData;
-    #endif
         QList<QByteArray> propertyNames;
         QVector<QVariant> propertyValues;
         QVector<int> runningTimers;
diff --git a/src/corelib/kernel/qobjectdefs.h b/src/corelib/kernel/qobjectdefs.h
index becbb90a61..fd7c081e88 100644
--- a/src/corelib/kernel/qobjectdefs.h
+++ b/src/corelib/kernel/qobjectdefs.h
@@ -46,199 +46,15 @@
 #endif
 
 #include <QtCore/qnamespace.h>
-
 #include <QtCore/qobjectdefs_impl.h>
+#include <QtCore/qtmetamacros.h>
 
 QT_BEGIN_NAMESPACE
 
-
 class QByteArray;
 struct QArrayData;
-typedef QArrayData QByteArrayData;
 
 class QString;
-#ifndef Q_MOC_OUTPUT_REVISION
-#define Q_MOC_OUTPUT_REVISION 67
-#endif
-
-// The following macros can be defined by tools that understand Qt
-// to have the information from the macro.
-#ifndef QT_ANNOTATE_CLASS
-# define QT_ANNOTATE_CLASS(type, ...)
-#endif
-#ifndef QT_ANNOTATE_CLASS2
-# define QT_ANNOTATE_CLASS2(type, a1, a2)
-#endif
-#ifndef QT_ANNOTATE_FUNCTION
-# define QT_ANNOTATE_FUNCTION(x)
-#endif
-#ifndef QT_ANNOTATE_ACCESS_SPECIFIER
-# define QT_ANNOTATE_ACCESS_SPECIFIER(x)
-#endif
-
-// The following macros are our "extensions" to C++
-// They are used, strictly speaking, only by the moc.
-
-#ifndef Q_MOC_RUN
-#ifndef QT_NO_META_MACROS
-# if defined(QT_NO_KEYWORDS)
-#  define QT_NO_EMIT
-# else
-#   ifndef QT_NO_SIGNALS_SLOTS_KEYWORDS
-#     define slots Q_SLOTS
-#     define signals Q_SIGNALS
-#   endif
-# endif
-# define Q_SLOTS QT_ANNOTATE_ACCESS_SPECIFIER(qt_slot)
-# define Q_SIGNALS public QT_ANNOTATE_ACCESS_SPECIFIER(qt_signal)
-# define Q_PRIVATE_SLOT(d, signature) QT_ANNOTATE_CLASS2(qt_private_slot, d, signature)
-# define Q_EMIT
-#ifndef QT_NO_EMIT
-# define emit
-#endif
-#ifndef Q_CLASSINFO
-# define Q_CLASSINFO(name, value)
-#endif
-#define Q_PLUGIN_METADATA(x) QT_ANNOTATE_CLASS(qt_plugin_metadata, x)
-#define Q_INTERFACES(x) QT_ANNOTATE_CLASS(qt_interfaces, x)
-#define Q_PROPERTY(...) QT_ANNOTATE_CLASS(qt_property, __VA_ARGS__)
-#define Q_PRIVATE_PROPERTY(d, text) QT_ANNOTATE_CLASS2(qt_private_property, d, text)
-#ifndef Q_REVISION
-# define Q_REVISION(v)
-#endif
-#define Q_OVERRIDE(text) QT_ANNOTATE_CLASS(qt_override, text)
-#define QDOC_PROPERTY(text) QT_ANNOTATE_CLASS(qt_qdoc_property, text)
-#define Q_ENUMS(x) QT_ANNOTATE_CLASS(qt_enums, x)
-#define Q_FLAGS(x) QT_ANNOTATE_CLASS(qt_enums, x)
-#define Q_ENUM_IMPL(ENUM) \
-    friend Q_DECL_CONSTEXPR const QMetaObject *qt_getEnumMetaObject(ENUM) noexcept { return &staticMetaObject; } \
-    friend Q_DECL_CONSTEXPR const char *qt_getEnumName(ENUM) noexcept { return #ENUM; }
-#define Q_ENUM(x) Q_ENUMS(x) Q_ENUM_IMPL(x)
-#define Q_FLAG(x) Q_FLAGS(x) Q_ENUM_IMPL(x)
-#define Q_ENUM_NS_IMPL(ENUM) \
-    inline Q_DECL_CONSTEXPR const QMetaObject *qt_getEnumMetaObject(ENUM) noexcept { return &staticMetaObject; } \
-    inline Q_DECL_CONSTEXPR const char *qt_getEnumName(ENUM) noexcept { return #ENUM; }
-#define Q_ENUM_NS(x) Q_ENUMS(x) Q_ENUM_NS_IMPL(x)
-#define Q_FLAG_NS(x) Q_FLAGS(x) Q_ENUM_NS_IMPL(x)
-#define Q_SCRIPTABLE QT_ANNOTATE_FUNCTION(qt_scriptable)
-#define Q_INVOKABLE  QT_ANNOTATE_FUNCTION(qt_invokable)
-#define Q_SIGNAL QT_ANNOTATE_FUNCTION(qt_signal)
-#define Q_SLOT QT_ANNOTATE_FUNCTION(qt_slot)
-#endif // QT_NO_META_MACROS
-
-#ifndef QT_NO_TRANSLATION
-// full set of tr functions
-#  define QT_TR_FUNCTIONS \
-    static inline QString tr(const char *s, const char *c = nullptr, int n = -1) \
-        { return staticMetaObject.tr(s, c, n); } \
-    QT_DEPRECATED static inline QString trUtf8(const char *s, const char *c = nullptr, int n = -1) \
-        { return staticMetaObject.tr(s, c, n); }
-#else
-// inherit the ones from QObject
-# define QT_TR_FUNCTIONS
-#endif
-
-#ifdef Q_CLANG_QDOC
-#define QT_TR_FUNCTIONS
-#endif
-
-// ### Qt6: remove
-#define Q_OBJECT_CHECK  /* empty, unused since Qt 5.2 */
-
-#if defined(Q_CC_INTEL)
-// Cannot redefine the visibility of a method in an exported class
-# define Q_DECL_HIDDEN_STATIC_METACALL
-#else
-# define Q_DECL_HIDDEN_STATIC_METACALL Q_DECL_HIDDEN
-#endif
-
-#if defined(Q_CC_CLANG) && Q_CC_CLANG >= 306
-#  define Q_OBJECT_NO_OVERRIDE_WARNING      QT_WARNING_DISABLE_CLANG("-Winconsistent-missing-override")
-#elif defined(Q_CC_GNU) && !defined(Q_CC_INTEL) && Q_CC_GNU >= 501
-#  define Q_OBJECT_NO_OVERRIDE_WARNING      QT_WARNING_DISABLE_GCC("-Wsuggest-override")
-#else
-#  define Q_OBJECT_NO_OVERRIDE_WARNING
-#endif
-
-#if defined(Q_CC_GNU) && !defined(Q_CC_INTEL) && Q_CC_GNU >= 600
-#  define Q_OBJECT_NO_ATTRIBUTES_WARNING    QT_WARNING_DISABLE_GCC("-Wattributes")
-#else
-#  define Q_OBJECT_NO_ATTRIBUTES_WARNING
-#endif
-
-/* qmake ignore Q_OBJECT */
-#define Q_OBJECT \
-public: \
-    QT_WARNING_PUSH \
-    Q_OBJECT_NO_OVERRIDE_WARNING \
-    static const QMetaObject staticMetaObject; \
-    virtual const QMetaObject *metaObject() const; \
-    virtual void *qt_metacast(const char *); \
-    virtual int qt_metacall(QMetaObject::Call, int, void **); \
-    QT_TR_FUNCTIONS \
-private: \
-    Q_OBJECT_NO_ATTRIBUTES_WARNING \
-    Q_DECL_HIDDEN_STATIC_METACALL static void qt_static_metacall(QObject *, QMetaObject::Call, int, void **); \
-    QT_WARNING_POP \
-    struct QPrivateSignal {}; \
-    QT_ANNOTATE_CLASS(qt_qobject, "")
-
-/* qmake ignore Q_OBJECT */
-#define Q_OBJECT_FAKE Q_OBJECT QT_ANNOTATE_CLASS(qt_fake, "")
-
-#ifndef QT_NO_META_MACROS
-/* qmake ignore Q_GADGET */
-#define Q_GADGET \
-public: \
-    static const QMetaObject staticMetaObject; \
-    void qt_check_for_QGADGET_macro(); \
-    typedef void QtGadgetHelper; \
-private: \
-    QT_WARNING_PUSH \
-    Q_OBJECT_NO_ATTRIBUTES_WARNING \
-    Q_DECL_HIDDEN_STATIC_METACALL static void qt_static_metacall(QObject *, QMetaObject::Call, int, void **); \
-    QT_WARNING_POP \
-    QT_ANNOTATE_CLASS(qt_qgadget, "") \
-    /*end*/
-
-/* qmake ignore Q_NAMESPACE_EXPORT */
-#define Q_NAMESPACE_EXPORT(...) \
-    extern __VA_ARGS__ const QMetaObject staticMetaObject; \
-    QT_ANNOTATE_CLASS(qt_qnamespace, "") \
-    /*end*/
-
-/* qmake ignore Q_NAMESPACE */
-#define Q_NAMESPACE Q_NAMESPACE_EXPORT() \
-    /*end*/
-
-#endif // QT_NO_META_MACROS
-
-#else // Q_MOC_RUN
-#define slots slots
-#define signals signals
-#define Q_SLOTS Q_SLOTS
-#define Q_SIGNALS Q_SIGNALS
-#define Q_CLASSINFO(name, value) Q_CLASSINFO(name, value)
-#define Q_INTERFACES(x) Q_INTERFACES(x)
-#define Q_PROPERTY(text) Q_PROPERTY(text)
-#define Q_PRIVATE_PROPERTY(d, text) Q_PRIVATE_PROPERTY(d, text)
-#define Q_REVISION(v) Q_REVISION(v)
-#define Q_OVERRIDE(text) Q_OVERRIDE(text)
-#define Q_ENUMS(x) Q_ENUMS(x)
-#define Q_FLAGS(x) Q_FLAGS(x)
-#define Q_ENUM(x) Q_ENUM(x)
-#define Q_FLAGS(x) Q_FLAGS(x)
- /* qmake ignore Q_OBJECT */
-#define Q_OBJECT Q_OBJECT
- /* qmake ignore Q_OBJECT */
-#define Q_OBJECT_FAKE Q_OBJECT_FAKE
- /* qmake ignore Q_GADGET */
-#define Q_GADGET Q_GADGET
-#define Q_SCRIPTABLE Q_SCRIPTABLE
-#define Q_INVOKABLE Q_INVOKABLE
-#define Q_SIGNAL Q_SIGNAL
-#define Q_SLOT Q_SLOT
-#endif //Q_MOC_RUN
 
 #ifndef QT_NO_META_MACROS
 // macro for onaming members
@@ -285,6 +101,14 @@ class QMetaEnum;
 class QMetaProperty;
 class QMetaClassInfo;
 
+namespace QtPrivate {
+class QMetaTypeInterface;
+}
+
+struct QMethodRawArguments
+{
+    void **arguments;
+};
 
 class Q_CORE_EXPORT QGenericArgument
 {
@@ -603,11 +427,12 @@ struct Q_CORE_EXPORT QMetaObject
 
     struct { // private data
         SuperData superdata;
-        const QByteArrayData *stringdata;
+        const uint *stringdata;
         const uint *data;
         typedef void (*StaticMetacallFunction)(QObject *, QMetaObject::Call, int, void **);
         StaticMetacallFunction static_metacall;
         const SuperData *relatedMetaObjects;
+        QtPrivate::QMetaTypeInterface *const *metaTypes;
         void *extradata; //reserved for future use
     } d;
 
diff --git a/src/corelib/kernel/qsignalmapper.cpp b/src/corelib/kernel/qsignalmapper.cpp
index dc0dfe8f40..0dc9666df6 100644
--- a/src/corelib/kernel/qsignalmapper.cpp
+++ b/src/corelib/kernel/qsignalmapper.cpp
@@ -60,15 +60,8 @@ public:
         Q_Q(QSignalMapper);
 
         auto it = mappedValues.find(sender);
-        if (it != mappedValues.end()) {
-#if QT_DEPRECATED_SINCE(5, 15)
-QT_WARNING_PUSH
-QT_WARNING_DISABLE_DEPRECATED
-            Q_EMIT q->mapped(*it);
-QT_WARNING_POP
-#endif
+        if (it != mappedValues.end())
             Q_EMIT (q->*signal)(*it);
-        }
     }
 
     void emitMappedValues(QObject *sender)
@@ -288,56 +281,6 @@ void QSignalMapper::map(QObject *sender)
     d_func()->emitMappedValues(sender);
 }
 
-#if QT_DEPRECATED_SINCE(5, 15)
-/*!
-    \fn void QSignalMapper::mapped(int i)
-    \obsolete
-    \overload
-
-    This signal is emitted when map() is signalled from an object that
-    has an integer mapping set. The object's mapped integer is passed
-    in \a i.
-
-    \sa setMapping()
-*/
-
-/*!
-    \fn void QSignalMapper::mapped(const QString &text)
-    \obsolete
-    \overload
-
-    This signal is emitted when map() is signalled from an object that
-    has a string mapping set. The object's mapped string is passed in
-    \a text.
-
-    \sa setMapping()
-*/
-
-/*!
-    \fn void QSignalMapper::mapped(QWidget *widget)
-    \obsolete
-    \overload
-
-    This signal is emitted when map() is signalled from an object that
-    has a widget mapping set. The object's mapped widget is passed in
-    \a widget.
-
-    \sa setMapping()
-*/
-
-/*!
-    \fn void QSignalMapper::mapped(QObject *object)
-    \obsolete
-    \overload
-
-    This signal is emitted when map() is signalled from an object that
-    has an object mapping set. The object provided by the map is passed in
-    \a object.
-
-    \sa setMapping()
-*/
-#endif
-
 /*!
     \fn void QSignalMapper::mappedInt(int i)
     \since 5.15
diff --git a/src/corelib/kernel/qsignalmapper.h b/src/corelib/kernel/qsignalmapper.h
index 592986e6a5..bd100a2467 100644
--- a/src/corelib/kernel/qsignalmapper.h
+++ b/src/corelib/kernel/qsignalmapper.h
@@ -66,16 +66,6 @@ public:
     QObject *mapping(QObject *object) const;
 
 Q_SIGNALS:
-#if QT_DEPRECATED_SINCE(5, 15)
-    QT_DEPRECATED_VERSION_X_5_15("Use QSignalMapper::mappedInt(int) instead")
-    void mapped(int);
-    QT_DEPRECATED_VERSION_X_5_15("Use QSignalMapper::mappedString(const QString&) instead")
-    void mapped(const QString &);
-    QT_DEPRECATED_VERSION_X_5_15("Use QSignalMapper::mappedWidget(QWidget *) instead")
-    void mapped(QWidget *);
-    QT_DEPRECATED_VERSION_X_5_15("Use QSignalMapper::mappedObject(QObject *) instead")
-    void mapped(QObject *);
-#endif
     void mappedInt(int);
     void mappedString(const QString &);
     void mappedWidget(QWidget *);
diff --git a/src/corelib/kernel/qtmetamacros.h b/src/corelib/kernel/qtmetamacros.h
new file mode 100644
index 0000000000..2dcd6948aa
--- /dev/null
+++ b/src/corelib/kernel/qtmetamacros.h
@@ -0,0 +1,234 @@
+/****************************************************************************
+**
+** Copyright (C) 2019 The Qt Company Ltd.
+** Copyright (C) 2019 Olivier Goffart <ogoffart@woboq.com>
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtCore module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QTMETAMACROS_H
+#define QTMETAMACROS_H
+
+#include <QtCore/qglobal.h>
+
+QT_BEGIN_NAMESPACE
+
+#ifndef Q_MOC_OUTPUT_REVISION
+#define Q_MOC_OUTPUT_REVISION 67
+#endif
+
+// The following macros can be defined by tools that understand Qt
+// to have the information from the macro.
+#ifndef QT_ANNOTATE_CLASS
+# define QT_ANNOTATE_CLASS(type, ...)
+#endif
+#ifndef QT_ANNOTATE_CLASS2
+# define QT_ANNOTATE_CLASS2(type, a1, a2)
+#endif
+#ifndef QT_ANNOTATE_FUNCTION
+# define QT_ANNOTATE_FUNCTION(x)
+#endif
+#ifndef QT_ANNOTATE_ACCESS_SPECIFIER
+# define QT_ANNOTATE_ACCESS_SPECIFIER(x)
+#endif
+
+// The following macros are our "extensions" to C++
+// They are used, strictly speaking, only by the moc.
+
+#ifndef Q_MOC_RUN
+#ifndef QT_NO_META_MACROS
+# if defined(QT_NO_KEYWORDS)
+#  define QT_NO_EMIT
+# else
+#   ifndef QT_NO_SIGNALS_SLOTS_KEYWORDS
+#     define slots Q_SLOTS
+#     define signals Q_SIGNALS
+#   endif
+# endif
+# define Q_SLOTS QT_ANNOTATE_ACCESS_SPECIFIER(qt_slot)
+# define Q_SIGNALS public QT_ANNOTATE_ACCESS_SPECIFIER(qt_signal)
+# define Q_PRIVATE_SLOT(d, signature) QT_ANNOTATE_CLASS2(qt_private_slot, d, signature)
+# define Q_EMIT
+#ifndef QT_NO_EMIT
+# define emit
+#endif
+#ifndef Q_CLASSINFO
+# define Q_CLASSINFO(name, value)
+#endif
+#define Q_PLUGIN_METADATA(x) QT_ANNOTATE_CLASS(qt_plugin_metadata, x)
+#define Q_INTERFACES(x) QT_ANNOTATE_CLASS(qt_interfaces, x)
+#define Q_PROPERTY(...) QT_ANNOTATE_CLASS(qt_property, __VA_ARGS__)
+#define Q_PRIVATE_PROPERTY(d, text) QT_ANNOTATE_CLASS2(qt_private_property, d, text)
+#ifndef Q_REVISION
+# define Q_REVISION(...)
+#endif
+#define Q_OVERRIDE(text) QT_ANNOTATE_CLASS(qt_override, text)
+#define QDOC_PROPERTY(text) QT_ANNOTATE_CLASS(qt_qdoc_property, text)
+#define Q_ENUMS(x) QT_ANNOTATE_CLASS(qt_enums, x)
+#define Q_FLAGS(x) QT_ANNOTATE_CLASS(qt_enums, x)
+#define Q_ENUM_IMPL(ENUM) \
+    friend Q_DECL_CONSTEXPR const QMetaObject *qt_getEnumMetaObject(ENUM) noexcept { return &staticMetaObject; } \
+    friend Q_DECL_CONSTEXPR const char *qt_getEnumName(ENUM) noexcept { return #ENUM; }
+#define Q_ENUM(x) Q_ENUMS(x) Q_ENUM_IMPL(x)
+#define Q_FLAG(x) Q_FLAGS(x) Q_ENUM_IMPL(x)
+#define Q_ENUM_NS_IMPL(ENUM) \
+    inline Q_DECL_CONSTEXPR const QMetaObject *qt_getEnumMetaObject(ENUM) noexcept { return &staticMetaObject; } \
+    inline Q_DECL_CONSTEXPR const char *qt_getEnumName(ENUM) noexcept { return #ENUM; }
+#define Q_ENUM_NS(x) Q_ENUMS(x) Q_ENUM_NS_IMPL(x)
+#define Q_FLAG_NS(x) Q_FLAGS(x) Q_ENUM_NS_IMPL(x)
+#define Q_SCRIPTABLE QT_ANNOTATE_FUNCTION(qt_scriptable)
+#define Q_INVOKABLE  QT_ANNOTATE_FUNCTION(qt_invokable)
+#define Q_SIGNAL QT_ANNOTATE_FUNCTION(qt_signal)
+#define Q_SLOT QT_ANNOTATE_FUNCTION(qt_slot)
+#define Q_MOC_INCLUDE(...) QT_ANNOTATE_CLASS(qt_moc_include, __VA_ARGS__)
+#endif // QT_NO_META_MACROS
+
+#ifndef QT_NO_TRANSLATION
+// full set of tr functions
+#  define QT_TR_FUNCTIONS \
+    static inline QString tr(const char *s, const char *c = nullptr, int n = -1) \
+        { return staticMetaObject.tr(s, c, n); } \
+    QT_DEPRECATED static inline QString trUtf8(const char *s, const char *c = nullptr, int n = -1) \
+        { return staticMetaObject.tr(s, c, n); }
+#else
+// inherit the ones from QObject
+# define QT_TR_FUNCTIONS
+#endif
+
+#ifdef Q_CLANG_QDOC
+#define QT_TR_FUNCTIONS
+#endif
+
+// ### Qt6: remove
+#define Q_OBJECT_CHECK  /* empty, unused since Qt 5.2 */
+
+#if defined(Q_CC_INTEL)
+// Cannot redefine the visibility of a method in an exported class
+# define Q_DECL_HIDDEN_STATIC_METACALL
+#else
+# define Q_DECL_HIDDEN_STATIC_METACALL Q_DECL_HIDDEN
+#endif
+
+#if defined(Q_CC_CLANG) && Q_CC_CLANG >= 306
+#  define Q_OBJECT_NO_OVERRIDE_WARNING      QT_WARNING_DISABLE_CLANG("-Winconsistent-missing-override")
+#elif defined(Q_CC_GNU) && !defined(Q_CC_INTEL) && Q_CC_GNU >= 501
+#  define Q_OBJECT_NO_OVERRIDE_WARNING      QT_WARNING_DISABLE_GCC("-Wsuggest-override")
+#else
+#  define Q_OBJECT_NO_OVERRIDE_WARNING
+#endif
+
+#if defined(Q_CC_GNU) && !defined(Q_CC_INTEL) && Q_CC_GNU >= 600
+#  define Q_OBJECT_NO_ATTRIBUTES_WARNING    QT_WARNING_DISABLE_GCC("-Wattributes")
+#else
+#  define Q_OBJECT_NO_ATTRIBUTES_WARNING
+#endif
+
+/* qmake ignore Q_OBJECT */
+#define Q_OBJECT \
+public: \
+    QT_WARNING_PUSH \
+    Q_OBJECT_NO_OVERRIDE_WARNING \
+    static const QMetaObject staticMetaObject; \
+    virtual const QMetaObject *metaObject() const; \
+    virtual void *qt_metacast(const char *); \
+    virtual int qt_metacall(QMetaObject::Call, int, void **); \
+    QT_TR_FUNCTIONS \
+private: \
+    Q_OBJECT_NO_ATTRIBUTES_WARNING \
+    Q_DECL_HIDDEN_STATIC_METACALL static void qt_static_metacall(QObject *, QMetaObject::Call, int, void **); \
+    QT_WARNING_POP \
+    struct QPrivateSignal {}; \
+    QT_ANNOTATE_CLASS(qt_qobject, "")
+
+/* qmake ignore Q_OBJECT */
+#define Q_OBJECT_FAKE Q_OBJECT QT_ANNOTATE_CLASS(qt_fake, "")
+
+#ifndef QT_NO_META_MACROS
+/* qmake ignore Q_GADGET */
+#define Q_GADGET \
+public: \
+    static const QMetaObject staticMetaObject; \
+    void qt_check_for_QGADGET_macro(); \
+    typedef void QtGadgetHelper; \
+private: \
+    QT_WARNING_PUSH \
+    Q_OBJECT_NO_ATTRIBUTES_WARNING \
+    Q_DECL_HIDDEN_STATIC_METACALL static void qt_static_metacall(QObject *, QMetaObject::Call, int, void **); \
+    QT_WARNING_POP \
+    QT_ANNOTATE_CLASS(qt_qgadget, "") \
+    /*end*/
+
+/* qmake ignore Q_NAMESPACE_EXPORT */
+#define Q_NAMESPACE_EXPORT(...) \
+    extern __VA_ARGS__ const QMetaObject staticMetaObject; \
+    QT_ANNOTATE_CLASS(qt_qnamespace, "") \
+    /*end*/
+
+/* qmake ignore Q_NAMESPACE */
+#define Q_NAMESPACE Q_NAMESPACE_EXPORT() \
+    /*end*/
+
+#endif // QT_NO_META_MACROS
+
+#else // Q_MOC_RUN
+#define slots slots
+#define signals signals
+#define Q_SLOTS Q_SLOTS
+#define Q_SIGNALS Q_SIGNALS
+#define Q_CLASSINFO(name, value) Q_CLASSINFO(name, value)
+#define Q_INTERFACES(x) Q_INTERFACES(x)
+#define Q_PROPERTY(text) Q_PROPERTY(text)
+#define Q_PRIVATE_PROPERTY(d, text) Q_PRIVATE_PROPERTY(d, text)
+#define Q_REVISION(...) Q_REVISION(__VA_ARGS__)
+#define Q_OVERRIDE(text) Q_OVERRIDE(text)
+#define Q_ENUMS(x) Q_ENUMS(x)
+#define Q_FLAGS(x) Q_FLAGS(x)
+#define Q_ENUM(x) Q_ENUM(x)
+#define Q_FLAGS(x) Q_FLAGS(x)
+ /* qmake ignore Q_OBJECT */
+#define Q_OBJECT Q_OBJECT
+ /* qmake ignore Q_OBJECT */
+#define Q_OBJECT_FAKE Q_OBJECT_FAKE
+ /* qmake ignore Q_GADGET */
+#define Q_GADGET Q_GADGET
+#define Q_SCRIPTABLE Q_SCRIPTABLE
+#define Q_INVOKABLE Q_INVOKABLE
+#define Q_SIGNAL Q_SIGNAL
+#define Q_SLOT Q_SLOT
+#endif //Q_MOC_RUN
+
+QT_END_NAMESPACE
+
+#endif // QTMETAMACROS_H
diff --git a/src/corelib/kernel/qtranslator.cpp b/src/corelib/kernel/qtranslator.cpp
index 2205366696..5767d52f6a 100644
--- a/src/corelib/kernel/qtranslator.cpp
+++ b/src/corelib/kernel/qtranslator.cpp
@@ -58,11 +58,11 @@
 #include "qendian.h"
 #include "qresource.h"
 
-#if defined(Q_OS_UNIX) && !defined(Q_OS_INTEGRITY)
-#define QT_USE_MMAP
-#include "private/qcore_unix_p.h"
+#if defined(Q_OS_UNIX) && !defined(Q_OS_NACL) && !defined(Q_OS_INTEGRITY)
+#  define QT_USE_MMAP
+#  include "private/qcore_unix_p.h"
 // for mmap
-#include <sys/mman.h>
+#  include <sys/mman.h>
 #endif
 
 #include <stdlib.h>
diff --git a/src/corelib/kernel/qvariant.cpp b/src/corelib/kernel/qvariant.cpp
index 3be9a02248..7d93dde022 100644
--- a/src/corelib/kernel/qvariant.cpp
+++ b/src/corelib/kernel/qvariant.cpp
@@ -118,22 +118,10 @@ struct CoreTypesFilter {
 
 namespace { // annonymous used to hide QVariant handlers
 
-static void construct(QVariant::Private *x, const void *copy)
-{
-    QVariantConstructor<CoreTypesFilter> constructor(x, copy);
-    QMetaTypeSwitcher::switcher<void>(constructor, x->type);
-}
-
-static void clear(QVariant::Private *d)
-{
-    QVariantDestructor<CoreTypesFilter> cleaner(d);
-    QMetaTypeSwitcher::switcher<void>(cleaner, d->type);
-}
-
 static bool isNull(const QVariant::Private *d)
 {
     QVariantIsNull<CoreTypesFilter> isNull(d);
-    return QMetaTypeSwitcher::switcher<bool>(isNull, d->type);
+    return QMetaTypeSwitcher::switcher<bool>(isNull, d->type().id());
 }
 
 /*!
@@ -145,7 +133,7 @@ static bool isNull(const QVariant::Private *d)
 static bool compare(const QVariant::Private *a, const QVariant::Private *b)
 {
     QVariantComparator<CoreTypesFilter> comparator(a, b);
-    return QMetaTypeSwitcher::switcher<bool>(comparator, a->type);
+    return QMetaTypeSwitcher::switcher<bool>(comparator, a->type().id());
 }
 
 /*!
@@ -153,7 +141,7 @@ static bool compare(const QVariant::Private *a, const QVariant::Private *b)
  */
 static qlonglong qMetaTypeNumber(const QVariant::Private *d)
 {
-    switch (d->type) {
+    switch (d->type().id()) {
     case QMetaType::Int:
         return d->data.i;
     case QMetaType::LongLong:
@@ -183,7 +171,7 @@ static qlonglong qMetaTypeNumber(const QVariant::Private *d)
 
 static qulonglong qMetaTypeUNumber(const QVariant::Private *d)
 {
-    switch (d->type) {
+    switch (d->type().id()) {
     case QMetaType::UInt:
         return d->data.u;
     case QMetaType::ULongLong:
@@ -203,7 +191,7 @@ static qlonglong qConvertToNumber(const QVariant::Private *d, bool *ok)
 {
     *ok = true;
 
-    switch (uint(d->type)) {
+    switch (uint(d->type().id())) {
     case QMetaType::QString:
         return v_cast<QString>(d)->toLongLong(ok);
     case QMetaType::QChar:
@@ -240,8 +228,9 @@ static qlonglong qConvertToNumber(const QVariant::Private *d, bool *ok)
         return qlonglong(qMetaTypeUNumber(d));
     }
 
-    QMetaType typeInfo(d->type);
-    if (typeInfo.flags() & QMetaType::IsEnumeration || d->type == QMetaType::QCborSimpleType) {
+    QMetaType typeInfo = d->type();
+    if (typeInfo.flags() & QMetaType::IsEnumeration
+        || d->type().id() == QMetaType::QCborSimpleType) {
         switch (typeInfo.sizeOf()) {
         case 1:
             return d->is_shared ? *reinterpret_cast<signed char *>(d->data.shared->ptr) : d->data.sc;
@@ -261,7 +250,7 @@ static qlonglong qConvertToNumber(const QVariant::Private *d, bool *ok)
 static qreal qConvertToRealNumber(const QVariant::Private *d, bool *ok)
 {
     *ok = true;
-    switch (uint(d->type)) {
+    switch (uint(d->type().id())) {
     case QMetaType::Double:
         return qreal(d->data.d);
     case QMetaType::Float:
@@ -288,7 +277,7 @@ static qulonglong qConvertToUnsignedNumber(const QVariant::Private *d, bool *ok)
 {
     *ok = true;
 
-    switch (uint(d->type)) {
+    switch (uint(d->type().id())) {
     case QMetaType::QString:
         return v_cast<QString>(d)->toULongLong(ok);
     case QMetaType::QChar:
@@ -326,7 +315,7 @@ static qulonglong qConvertToUnsignedNumber(const QVariant::Private *d, bool *ok)
         return qMetaTypeUNumber(d);
     }
 
-    QMetaType typeInfo(d->type);
+    QMetaType typeInfo = d->type();
     if (typeInfo.flags() & QMetaType::IsEnumeration) {
         switch (typeInfo.sizeOf()) {
         case 1:
@@ -366,16 +355,14 @@ static const void *constData(const QVariant::Private &d)
   \internal
   returns a QMetaEnum for a given meta tape type id if possible
 */
-static QMetaEnum metaEnumFromType(int type)
+static QMetaEnum metaEnumFromType(QMetaType t)
 {
-    QMetaType t(type);
     if (t.flags() & QMetaType::IsEnumeration) {
         if (const QMetaObject *metaObject = t.metaObject()) {
-            const char *enumName = QMetaType::typeName(type);
+            const QByteArray enumName = t.name();
             const char *lastColon = std::strrchr(enumName, ':');
-            if (lastColon)
-                enumName = lastColon + 1;
-            return metaObject->enumerator(metaObject->indexOfEnumerator(enumName));
+            return metaObject->enumerator(metaObject->indexOfEnumerator(
+                    lastColon ? lastColon + 1 : enumName.constData()));
         }
     }
     return QMetaEnum();
@@ -389,11 +376,11 @@ static QMetaEnum metaEnumFromType(int type)
  */
 static bool convert(const QVariant::Private *d, int t, void *result, bool *ok)
 {
-    Q_ASSERT(d->type != uint(t));
+    Q_ASSERT(d->type().id() != t);
     Q_ASSERT(result);
 
-    if (d->type >= QMetaType::User || t >= QMetaType::User) {
-        const bool isOk = QMetaType::convert(constData(*d), d->type, result, t);
+    if (d->type().id() >= QMetaType::User || t >= QMetaType::User) {
+        const bool isOk = QMetaType::convert(constData(*d), d->type().id(), result, t);
         if (ok)
             *ok = isOk;
         if (isOk)
@@ -407,7 +394,7 @@ static bool convert(const QVariant::Private *d, int t, void *result, bool *ok)
     switch (uint(t)) {
 #ifndef QT_BOOTSTRAPPED
     case QMetaType::QUrl:
-        switch (d->type) {
+        switch (d->type().id()) {
         case QMetaType::QString:
             *static_cast<QUrl *>(result) = QUrl(*v_cast<QString>(d));
             break;
@@ -424,7 +411,7 @@ static bool convert(const QVariant::Private *d, int t, void *result, bool *ok)
 #endif // QT_BOOTSTRAPPED
 #if QT_CONFIG(itemmodel)
     case QMetaType::QModelIndex:
-        switch (d->type) {
+        switch (d->type().id()) {
         case QMetaType::QPersistentModelIndex:
             *static_cast<QModelIndex *>(result) = QModelIndex(*v_cast<QPersistentModelIndex>(d));
             break;
@@ -433,7 +420,7 @@ static bool convert(const QVariant::Private *d, int t, void *result, bool *ok)
         }
         break;
     case QMetaType::QPersistentModelIndex:
-        switch (d->type) {
+        switch (d->type().id()) {
         case QMetaType::QModelIndex:
             *static_cast<QPersistentModelIndex *>(result) = QPersistentModelIndex(*v_cast<QModelIndex>(d));
             break;
@@ -444,7 +431,7 @@ static bool convert(const QVariant::Private *d, int t, void *result, bool *ok)
 #endif // QT_CONFIG(itemmodel)
     case QMetaType::QString: {
         QString *str = static_cast<QString *>(result);
-        switch (d->type) {
+        switch (d->type().id()) {
         case QMetaType::QChar:
             *str = *v_cast<QChar>(d);
             break;
@@ -517,7 +504,7 @@ static bool convert(const QVariant::Private *d, int t, void *result, bool *ok)
         default:
 #ifndef QT_NO_QOBJECT
             {
-                QMetaEnum en = metaEnumFromType(d->type);
+                QMetaEnum en = metaEnumFromType(d->type());
                 if (en.isValid()) {
                     *str = QString::fromUtf8(en.valueToKey(qConvertToNumber(d, ok)));
                     return *ok;
@@ -530,7 +517,7 @@ static bool convert(const QVariant::Private *d, int t, void *result, bool *ok)
     }
     case QMetaType::QChar: {
         QChar *c = static_cast<QChar *>(result);
-        switch (d->type) {
+        switch (d->type().id()) {
         case QMetaType::Int:
         case QMetaType::LongLong:
         case QMetaType::Char:
@@ -555,7 +542,7 @@ static bool convert(const QVariant::Private *d, int t, void *result, bool *ok)
 #ifndef QT_NO_GEOM_VARIANT
     case QMetaType::QSize: {
         QSize *s = static_cast<QSize *>(result);
-        switch (d->type) {
+        switch (d->type().id()) {
         case QMetaType::QSizeF:
             *s = v_cast<QSizeF>(d)->toSize();
             break;
@@ -567,7 +554,7 @@ static bool convert(const QVariant::Private *d, int t, void *result, bool *ok)
 
     case QMetaType::QSizeF: {
         QSizeF *s = static_cast<QSizeF *>(result);
-        switch (d->type) {
+        switch (d->type().id()) {
         case QMetaType::QSize:
             *s = QSizeF(*(v_cast<QSize>(d)));
             break;
@@ -579,7 +566,7 @@ static bool convert(const QVariant::Private *d, int t, void *result, bool *ok)
 
     case QMetaType::QLine: {
         QLine *s = static_cast<QLine *>(result);
-        switch (d->type) {
+        switch (d->type().id()) {
         case QMetaType::QLineF:
             *s = v_cast<QLineF>(d)->toLine();
             break;
@@ -591,7 +578,7 @@ static bool convert(const QVariant::Private *d, int t, void *result, bool *ok)
 
     case QMetaType::QLineF: {
         QLineF *s = static_cast<QLineF *>(result);
-        switch (d->type) {
+        switch (d->type().id()) {
         case QMetaType::QLine:
             *s = QLineF(*(v_cast<QLine>(d)));
             break;
@@ -602,14 +589,14 @@ static bool convert(const QVariant::Private *d, int t, void *result, bool *ok)
     }
 #endif
     case QMetaType::QStringList:
-        if (d->type == QMetaType::QVariantList) {
+        if (d->type().id() == QMetaType::QVariantList) {
             QStringList *slst = static_cast<QStringList *>(result);
             const QVariantList *list = v_cast<QVariantList >(d);
             const int size = list->size();
             slst->reserve(size);
             for (int i = 0; i < size; ++i)
                 slst->append(list->at(i).toString());
-        } else if (d->type == QMetaType::QString) {
+        } else if (d->type().id() == QMetaType::QString) {
             QStringList *slst = static_cast<QStringList *>(result);
             *slst = QStringList(*v_cast<QString>(d));
         } else {
@@ -618,10 +605,10 @@ static bool convert(const QVariant::Private *d, int t, void *result, bool *ok)
         break;
     case QMetaType::QDate: {
         QDate *dt = static_cast<QDate *>(result);
-        if (d->type == QMetaType::QDateTime)
+        if (d->type().id() == QMetaType::QDateTime)
             *dt = v_cast<QDateTime>(d)->date();
 #if QT_CONFIG(datestring)
-        else if (d->type == QMetaType::QString)
+        else if (d->type().id() == QMetaType::QString)
             *dt = QDate::fromString(*v_cast<QString>(d), Qt::ISODate);
 #endif
         else
@@ -631,7 +618,7 @@ static bool convert(const QVariant::Private *d, int t, void *result, bool *ok)
     }
     case QMetaType::QTime: {
         QTime *t = static_cast<QTime *>(result);
-        switch (d->type) {
+        switch (d->type().id()) {
         case QMetaType::QDateTime:
             *t = v_cast<QDateTime>(d)->time();
             break;
@@ -647,7 +634,7 @@ static bool convert(const QVariant::Private *d, int t, void *result, bool *ok)
     }
     case QMetaType::QDateTime: {
         QDateTime *dt = static_cast<QDateTime *>(result);
-        switch (d->type) {
+        switch (d->type().id()) {
 #if QT_CONFIG(datestring)
         case QMetaType::QString:
             *dt = QDateTime::fromString(*v_cast<QString>(d), Qt::ISODate);
@@ -671,7 +658,7 @@ static bool convert(const QVariant::Private *d, int t, void *result, bool *ok)
     }
     case QMetaType::QByteArray: {
         QByteArray *ba = static_cast<QByteArray *>(result);
-        switch (d->type) {
+        switch (d->type().id()) {
         case QMetaType::QString:
             *ba = v_cast<QString>(d)->toUtf8();
             break;
@@ -718,7 +705,7 @@ static bool convert(const QVariant::Private *d, int t, void *result, bool *ok)
         default:
 #ifndef QT_NO_QOBJECT
             {
-                QMetaEnum en = metaEnumFromType(d->type);
+                QMetaEnum en = metaEnumFromType(d->type());
                 if (en.isValid()) {
                     *ba = en.valueToKey(qConvertToNumber(d, ok));
                     return *ok;
@@ -765,7 +752,7 @@ static bool convert(const QVariant::Private *d, int t, void *result, bool *ok)
     }
     case QMetaType::Bool: {
         bool *b = static_cast<bool *>(result);
-        switch(d->type) {
+        switch (d->type().id()) {
         case QMetaType::QByteArray:
             *b = qt_convertToBool<QByteArray, const char*>(d);
             break;
@@ -812,7 +799,7 @@ static bool convert(const QVariant::Private *d, int t, void *result, bool *ok)
     }
     case QMetaType::Double: {
         double *f = static_cast<double *>(result);
-        switch (d->type) {
+        switch (d->type().id()) {
         case QMetaType::QString:
             *f = v_cast<QString>(d)->toDouble(ok);
             break;
@@ -860,7 +847,7 @@ static bool convert(const QVariant::Private *d, int t, void *result, bool *ok)
     }
     case QMetaType::Float: {
         float *f = static_cast<float *>(result);
-        switch (d->type) {
+        switch (d->type().id()) {
         case QMetaType::QString:
             *f = v_cast<QString>(d)->toFloat(ok);
             break;
@@ -907,28 +894,25 @@ static bool convert(const QVariant::Private *d, int t, void *result, bool *ok)
         break;
     }
     case QMetaType::QVariantList:
-        if (d->type == QMetaType::QStringList) {
+        if (d->type().id() == QMetaType::QStringList) {
             QVariantList *lst = static_cast<QVariantList *>(result);
             const QStringList *slist = v_cast<QStringList>(d);
             const int size = slist->size();
             lst->reserve(size);
             for (int i = 0; i < size; ++i)
                 lst->append(QVariant(slist->at(i)));
-        } else if (qstrcmp(QMetaType::typeName(d->type), "QList<QVariant>") == 0) {
-            *static_cast<QVariantList *>(result) =
-                *static_cast<QList<QVariant> *>(d->data.shared->ptr);
 #ifndef QT_BOOTSTRAPPED
-        } else if (d->type == QMetaType::QCborValue) {
+        } else if (d->type().id() == QMetaType::QCborValue) {
             if (!v_cast<QCborValue>(d)->isArray())
                 return false;
             *static_cast<QVariantList *>(result) = v_cast<QCborValue>(d)->toArray().toVariantList();
-        } else if (d->type == QMetaType::QCborArray) {
+        } else if (d->type().id() == QMetaType::QCborArray) {
             *static_cast<QVariantList *>(result) = v_cast<QCborArray>(d)->toVariantList();
-        } else if (d->type == QMetaType::QJsonValue) {
+        } else if (d->type().id() == QMetaType::QJsonValue) {
             if (!v_cast<QJsonValue>(d)->isArray())
                 return false;
             *static_cast<QVariantList *>(result) = v_cast<QJsonValue>(d)->toArray().toVariantList();
-        } else if (d->type == QMetaType::QJsonArray) {
+        } else if (d->type().id() == QMetaType::QJsonArray) {
             *static_cast<QVariantList *>(result) = v_cast<QJsonArray>(d)->toVariantList();
 #endif
         } else {
@@ -936,27 +920,24 @@ static bool convert(const QVariant::Private *d, int t, void *result, bool *ok)
         }
         break;
     case QMetaType::QVariantMap:
-        if (qstrcmp(QMetaType::typeName(d->type), "QMap<QString, QVariant>") == 0) {
-            *static_cast<QVariantMap *>(result) =
-                *static_cast<QMap<QString, QVariant> *>(d->data.shared->ptr);
-        } else if (d->type == QMetaType::QVariantHash) {
+        if (d->type().id() == QMetaType::QVariantHash) {
             QVariantMap *map = static_cast<QVariantMap *>(result);
             const QVariantHash *hash = v_cast<QVariantHash>(d);
             const auto end = hash->end();
             for (auto it = hash->begin(); it != end; ++it)
                 static_cast<QMultiMap<QString, QVariant> *>(map)->insert(it.key(), it.value());
 #ifndef QT_BOOTSTRAPPED
-        } else if (d->type == QMetaType::QCborValue) {
+        } else if (d->type().id() == QMetaType::QCborValue) {
             if (!v_cast<QCborValue>(d)->isMap())
                 return false;
             *static_cast<QVariantMap *>(result) = v_cast<QCborValue>(d)->toMap().toVariantMap();
-        } else if (d->type == QMetaType::QCborMap) {
+        } else if (d->type().id() == QMetaType::QCborMap) {
             *static_cast<QVariantMap *>(result) = v_cast<QCborMap>(d)->toVariantMap();
-        } else if (d->type == QMetaType::QJsonValue) {
+        } else if (d->type().id() == QMetaType::QJsonValue) {
             if (!v_cast<QJsonValue>(d)->isObject())
                 return false;
             *static_cast<QVariantMap *>(result) = v_cast<QJsonValue>(d)->toObject().toVariantMap();
-        } else if (d->type == QMetaType::QJsonObject) {
+        } else if (d->type().id() == QMetaType::QJsonObject) {
             *static_cast<QVariantMap *>(result) = v_cast<QJsonObject>(d)->toVariantMap();
 #endif
         } else {
@@ -964,27 +945,24 @@ static bool convert(const QVariant::Private *d, int t, void *result, bool *ok)
         }
         break;
     case QMetaType::QVariantHash:
-        if (qstrcmp(QMetaType::typeName(d->type), "QHash<QString, QVariant>") == 0) {
-            *static_cast<QVariantHash *>(result) =
-                *static_cast<QHash<QString, QVariant> *>(d->data.shared->ptr);
-        } else if (d->type == QMetaType::QVariantMap) {
+        if (d->type().id() == QMetaType::QVariantMap) {
             QVariantHash *hash = static_cast<QVariantHash *>(result);
             const QVariantMap *map = v_cast<QVariantMap>(d);
             const auto end = map->end();
             for (auto it = map->begin(); it != end; ++it)
-                static_cast<QMultiHash<QString, QVariant> *>(hash)->insert(it.key(), it.value());
+                hash->insert(it.key(), it.value());
 #ifndef QT_BOOTSTRAPPED
-        } else if (d->type == QMetaType::QCborValue) {
+        } else if (d->type().id() == QMetaType::QCborValue) {
             if (!v_cast<QCborValue>(d)->isMap())
                 return false;
             *static_cast<QVariantHash *>(result) = v_cast<QCborValue>(d)->toMap().toVariantHash();
-        } else if (d->type == QMetaType::QCborMap) {
+        } else if (d->type().id() == QMetaType::QCborMap) {
             *static_cast<QVariantHash *>(result) = v_cast<QCborMap>(d)->toVariantHash();
-        } else if (d->type == QMetaType::QJsonValue) {
+        } else if (d->type().id() == QMetaType::QJsonValue) {
             if (!v_cast<QJsonValue>(d)->isObject())
                 return false;
             *static_cast<QVariantHash *>(result) = v_cast<QJsonValue>(d)->toObject().toVariantHash();
-        } else if (d->type == QMetaType::QJsonObject) {
+        } else if (d->type().id() == QMetaType::QJsonObject) {
             *static_cast<QVariantHash *>(result) = v_cast<QJsonObject>(d)->toVariantHash();
 #endif
         } else {
@@ -993,25 +971,25 @@ static bool convert(const QVariant::Private *d, int t, void *result, bool *ok)
         break;
 #ifndef QT_NO_GEOM_VARIANT
     case QMetaType::QRect:
-        if (d->type == QMetaType::QRectF)
+        if (d->type().id() == QMetaType::QRectF)
             *static_cast<QRect *>(result) = (v_cast<QRectF>(d))->toRect();
         else
             return false;
         break;
     case QMetaType::QRectF:
-        if (d->type == QMetaType::QRect)
+        if (d->type().id() == QMetaType::QRect)
             *static_cast<QRectF *>(result) = *v_cast<QRect>(d);
         else
             return false;
         break;
     case QMetaType::QPointF:
-        if (d->type == QMetaType::QPoint)
+        if (d->type().id() == QMetaType::QPoint)
             *static_cast<QPointF *>(result) = *v_cast<QPoint>(d);
         else
             return false;
         break;
     case QMetaType::QPoint:
-        if (d->type == QMetaType::QPointF)
+        if (d->type().id() == QMetaType::QPointF)
             *static_cast<QPoint *>(result) = (v_cast<QPointF>(d))->toPoint();
         else
             return false;
@@ -1023,7 +1001,7 @@ static bool convert(const QVariant::Private *d, int t, void *result, bool *ok)
     }
 #endif
     case QMetaType::QUuid:
-        switch (d->type) {
+        switch (d->type().id()) {
         case QMetaType::QString:
             *static_cast<QUuid *>(result) = QUuid(*v_cast<QString>(d));
             break;
@@ -1044,12 +1022,12 @@ static bool convert(const QVariant::Private *d, int t, void *result, bool *ok)
     case QMetaType::Nullptr:
         *static_cast<std::nullptr_t *>(result) = nullptr;
         if (QMetaType::typeFlags(t) & (QMetaType::PointerToGadget | QMetaType::PointerToQObject)
-                || d->type == QMetaType::VoidStar) {
+            || d->type().id() == QMetaType::VoidStar) {
             if (v_cast<const void *>(d) == nullptr)
                 break;
         }
 #ifndef QT_BOOTSTRAPPED
-        if (d->type == QMetaType::QCborValue && v_cast<QCborValue>(d)->isNull())
+        if (d->type().id() == QMetaType::QCborValue && v_cast<QCborValue>(d)->isNull())
             break;
 #endif
         return false;
@@ -1057,13 +1035,14 @@ static bool convert(const QVariant::Private *d, int t, void *result, bool *ok)
 #ifndef QT_BOOTSTRAPPED
 #if QT_CONFIG(regularexpression)
     case QMetaType::QRegularExpression:
-        if (d->type != QMetaType::QCborValue || !v_cast<QCborValue>(d)->isRegularExpression())
+        if (d->type().id() != QMetaType::QCborValue
+            || !v_cast<QCborValue>(d)->isRegularExpression())
             return false;
         *static_cast<QRegularExpression *>(result) = v_cast<QCborValue>(d)->toRegularExpression();
         break;
 #endif
     case QMetaType::QJsonValue:
-        switch (d->type) {
+        switch (d->type().id()) {
         case QMetaType::Nullptr:
             *static_cast<QJsonValue *>(result) = QJsonValue(QJsonValue::Null);
             break;
@@ -1127,7 +1106,7 @@ static bool convert(const QVariant::Private *d, int t, void *result, bool *ok)
         }
         break;
     case QMetaType::QJsonArray:
-        switch (d->type) {
+        switch (d->type().id()) {
         case QMetaType::QStringList:
             *static_cast<QJsonArray *>(result) = QJsonArray::fromStringList(*v_cast<QStringList>(d));
             break;
@@ -1157,7 +1136,7 @@ static bool convert(const QVariant::Private *d, int t, void *result, bool *ok)
         }
         break;
     case QMetaType::QJsonObject:
-        switch (d->type) {
+        switch (d->type().id()) {
         case QMetaType::QVariantMap:
             *static_cast<QJsonObject *>(result) = QJsonObject::fromVariantMap(*v_cast<QVariantMap>(d));
             break;
@@ -1187,13 +1166,13 @@ static bool convert(const QVariant::Private *d, int t, void *result, bool *ok)
         }
         break;
     case QMetaType::QCborSimpleType:
-        if (d->type == QMetaType::QCborValue && v_cast<QCborValue>(d)->isSimpleType()) {
+        if (d->type().id() == QMetaType::QCborValue && v_cast<QCborValue>(d)->isSimpleType()) {
             *static_cast<QCborSimpleType *>(result) = v_cast<QCborValue>(d)->toSimpleType();
             break;
         }
         return false;
     case QMetaType::QCborValue:
-        switch (d->type) {
+        switch (d->type().id()) {
         case QMetaType::Nullptr:
             *static_cast<QCborValue *>(result) = QCborValue(QCborValue::Null);
             break;
@@ -1286,7 +1265,7 @@ static bool convert(const QVariant::Private *d, int t, void *result, bool *ok)
         }
         break;
     case QMetaType::QCborArray:
-        switch (d->type) {
+        switch (d->type().id()) {
         case QMetaType::QStringList:
             *static_cast<QCborArray *>(result) = QCborArray::fromStringList(*v_cast<QStringList>(d));
             break;
@@ -1316,7 +1295,7 @@ static bool convert(const QVariant::Private *d, int t, void *result, bool *ok)
         }
         break;
     case QMetaType::QCborMap:
-        switch (d->type) {
+        switch (d->type().id()) {
         case QMetaType::QVariantMap:
             *static_cast<QCborMap *>(result) = QCborMap::fromVariantMap(*v_cast<QVariantMap>(d));
             break;
@@ -1349,10 +1328,12 @@ static bool convert(const QVariant::Private *d, int t, void *result, bool *ok)
 
     default:
 #ifndef QT_NO_QOBJECT
-        if (d->type == QMetaType::QString || d->type == QMetaType::QByteArray) {
-            QMetaEnum en = metaEnumFromType(t);
+        if (d->type().id() == QMetaType::QString || d->type().id() == QMetaType::QByteArray) {
+            QMetaEnum en = metaEnumFromType(QMetaType(t));
             if (en.isValid()) {
-                QByteArray keys = (d->type == QMetaType::QString) ? v_cast<QString>(d)->toUtf8() : *v_cast<QByteArray>(d);
+                QByteArray keys = (d->type().id() == QMetaType::QString)
+                        ? v_cast<QString>(d)->toUtf8()
+                        : *v_cast<QByteArray>(d);
                 int value = en.keysToValue(keys.constData(), ok);
                 if (*ok) {
                     switch (QMetaType::sizeOf(t)) {
@@ -1373,7 +1354,8 @@ static bool convert(const QVariant::Private *d, int t, void *result, bool *ok)
             }
         }
 #endif
-        if (QMetaType::typeFlags(t) & QMetaType::IsEnumeration || d->type == QMetaType::QCborSimpleType) {
+        if (QMetaType::typeFlags(t) & QMetaType::IsEnumeration
+            || d->type().id() == QMetaType::QCborSimpleType) {
             qlonglong value = qConvertToNumber(d, ok);
             if (*ok) {
                 switch (QMetaType::sizeOf(t)) {
@@ -1403,13 +1385,11 @@ static void streamDebug(QDebug dbg, const QVariant &v)
 {
     QVariant::Private *d = const_cast<QVariant::Private *>(&v.data_ptr());
     QVariantDebugStream<CoreTypesFilter> stream(dbg, d);
-    QMetaTypeSwitcher::switcher<void>(stream, d->type);
+    QMetaTypeSwitcher::switcher<void>(stream, d->type().id());
 }
 #endif
 
 const QVariant::Handler qt_kernel_variant_handler = {
-    construct,
-    clear,
     isNull,
 #ifndef QT_NO_DATASTREAM
     nullptr,
@@ -1425,8 +1405,6 @@ const QVariant::Handler qt_kernel_variant_handler = {
 #endif
 };
 
-static void dummyConstruct(QVariant::Private *, const void *) { Q_ASSERT_X(false, "QVariant", "Trying to construct an unknown type"); }
-static void dummyClear(QVariant::Private *) { Q_ASSERT_X(false, "QVariant", "Trying to clear an unknown type"); }
 static bool dummyIsNull(const QVariant::Private *d) { Q_ASSERT_X(false, "QVariant::isNull", "Trying to call isNull on an unknown type"); return d->is_null; }
 static bool dummyCompare(const QVariant::Private *, const QVariant::Private *) { Q_ASSERT_X(false, "QVariant", "Trying to compare an unknown types"); return false; }
 static bool dummyConvert(const QVariant::Private *, int, void *, bool *) { Q_ASSERT_X(false, "QVariant", "Trying to convert an unknown type"); return false; }
@@ -1434,8 +1412,6 @@ static bool dummyConvert(const QVariant::Private *, int, void *, bool *) { Q_ASS
 static void dummyStreamDebug(QDebug, const QVariant &) { Q_ASSERT_X(false, "QVariant", "Trying to convert an unknown type"); }
 #endif
 const QVariant::Handler qt_dummy_variant_handler = {
-    dummyConstruct,
-    dummyClear,
     dummyIsNull,
 #ifndef QT_NO_DATASTREAM
     nullptr,
@@ -1451,43 +1427,42 @@ const QVariant::Handler qt_dummy_variant_handler = {
 #endif
 };
 
+// the type of d has already been set, but other field are not set
 static void customConstruct(QVariant::Private *d, const void *copy)
 {
-    const QMetaType type(d->type);
+    const QMetaType type = d->type();
     const uint size = type.sizeOf();
     if (!size) {
-        qWarning("Trying to construct an instance of an invalid type, type id: %i", d->type);
-        d->type = QMetaType::UnknownType;
+        *d = QVariant::Private();
         return;
     }
 
     // this logic should match with QVariantIntegrator::CanUseInternalSpace
     if (size <= sizeof(QVariant::Private::Data)
             && (type.flags() & (QMetaType::MovableType | QMetaType::IsEnumeration))) {
-        type.construct(&d->data.ptr, copy);
-        d->is_null = d->data.ptr == nullptr;
+        type.construct(&d->data, copy);
         d->is_shared = false;
     } else {
         // Private::Data contains long long, and long double is the biggest standard type.
         const size_t maxAlignment =
-            qMax(Q_ALIGNOF(QVariant::Private::Data), Q_ALIGNOF(long double));
+            qMax(alignof(QVariant::Private::Data), alignof(long double));
         const size_t s = sizeof(QVariant::PrivateShared);
         const size_t offset = s + ((s * maxAlignment - s) % maxAlignment);
         void *data = operator new(offset + size);
         void *ptr = static_cast<char *>(data) + offset;
         type.construct(ptr, copy);
-        d->is_null = ptr == nullptr;
         d->is_shared = true;
         d->data.shared = new (data) QVariant::PrivateShared(ptr);
     }
+    d->is_null = !copy;
 }
 
 static void customClear(QVariant::Private *d)
 {
     if (!d->is_shared) {
-        QMetaType::destruct(d->type, &d->data.ptr);
+        d->type().destruct(&d->data);
     } else {
-        QMetaType::destruct(d->type, d->data.shared->ptr);
+        d->type().destruct(d->data.shared->ptr);
         d->data.shared->~PrivateShared();
         operator delete(d->data.shared);
     }
@@ -1497,12 +1472,8 @@ static bool customIsNull(const QVariant::Private *d)
 {
     if (d->is_null)
         return true;
-    const char *const typeName = QMetaType::typeName(d->type);
-    if (Q_UNLIKELY(!typeName) && Q_LIKELY(!QMetaType::isRegistered(d->type)))
-        qFatal("QVariant::isNull: type %d unknown to QVariant.", d->type);
-    uint typeNameLen = qstrlen(typeName);
-    if (typeNameLen > 0 && typeName[typeNameLen - 1] == '*') {
-        const void *d_ptr = d->is_shared ? d->data.shared->ptr : &(d->data.ptr);
+    if (d->type().flags() & QMetaType::IsPointer) {
+        const void *d_ptr = d->is_shared ? d->data.shared->ptr : &(d->data);
         return *static_cast<void *const *>(d_ptr) == nullptr;
     }
     return false;
@@ -1510,27 +1481,19 @@ static bool customIsNull(const QVariant::Private *d)
 
 static bool customCompare(const QVariant::Private *a, const QVariant::Private *b)
 {
-    const char *const typeName = QMetaType::typeName(a->type);
-    if (Q_UNLIKELY(!typeName) && Q_LIKELY(!QMetaType::isRegistered(a->type)))
-        qFatal("QVariant::compare: type %d unknown to QVariant.", a->type);
-
-    const void *a_ptr = a->is_shared ? a->data.shared->ptr : &(a->data.ptr);
-    const void *b_ptr = b->is_shared ? b->data.shared->ptr : &(b->data.ptr);
-
-    uint typeNameLen = qstrlen(typeName);
-    if (typeNameLen > 0 && typeName[typeNameLen - 1] == '*')
-        return *static_cast<void *const *>(a_ptr) == *static_cast<void *const *>(b_ptr);
+    const void *a_ptr = a->is_shared ? a->data.shared->ptr : &(a->data);
+    const void *b_ptr = b->is_shared ? b->data.shared->ptr : &(b->data);
 
     if (a->is_null && b->is_null)
         return true;
 
-    return !memcmp(a_ptr, b_ptr, QMetaType::sizeOf(a->type));
+    return !memcmp(a_ptr, b_ptr, a->type().sizeOf());
 }
 
 static bool customConvert(const QVariant::Private *d, int t, void *result, bool *ok)
 {
-    if (d->type >= QMetaType::User || t >= QMetaType::User) {
-        if (QMetaType::convert(constData(*d), d->type, result, t)) {
+    if (d->type().id() >= QMetaType::User || t >= QMetaType::User) {
+        if (QMetaType::convert(constData(*d), d->type().id(), result, t)) {
             if (ok)
                 *ok = true;
             return true;
@@ -1553,8 +1516,6 @@ static void customStreamDebug(QDebug dbg, const QVariant &variant) {
 #endif
 
 const QVariant::Handler qt_custom_variant_handler = {
-    customConstruct,
-    customClear,
     customIsNull,
 #ifndef QT_NO_DATASTREAM
     nullptr,
@@ -1573,6 +1534,7 @@ const QVariant::Handler qt_custom_variant_handler = {
 } // annonymous used to hide QVariant handlers
 
 static HandlersManager handlerManager;
+
 Q_STATIC_ASSERT_X(!QModulesPrivate::Core, "Initialization assumes that ModulesNames::Core is 0");
 const QVariant::Handler *HandlersManager::Handlers[QModulesPrivate::ModulesCount]
                                         = { &qt_kernel_variant_handler, &qt_dummy_variant_handler,
@@ -1707,7 +1669,6 @@ Q_CORE_EXPORT void QVariantPrivate::registerHandler(const int /* Modules::Names
     \value Locale  a QLocale
     \value LongLong a \l qlonglong
     \value Map  a QVariantMap
-    \value Matrix  a QMatrix
     \value Transform  a QTransform
     \value Matrix4x4  a QMatrix4x4
     \value Palette  a QPalette
@@ -1807,8 +1768,11 @@ Q_CORE_EXPORT void QVariantPrivate::registerHandler(const int /* Modules::Names
 
 void QVariant::create(int type, const void *copy)
 {
-    d.type = type;
-    handlerManager[type]->construct(&d, copy);
+    d = Private(QMetaType(type));
+    if (Q_UNLIKELY(type && !d.type().isValid())) {
+        qWarning("Trying to construct an instance of an invalid type, type id: %i", type);
+    }
+    customConstruct(&d, copy);
 }
 
 /*!
@@ -1824,8 +1788,8 @@ void QVariant::create(int type, const void *copy)
 
 QVariant::~QVariant()
 {
-    if ((d.is_shared && !d.data.shared->ref.deref()) || (!d.is_shared && d.type > Char))
-        handlerManager[d.type]->clear(&d);
+    if ((d.is_shared && !d.data.shared->ref.deref()) || (!d.is_shared))
+        customClear(&d);
 }
 
 /*!
@@ -1840,8 +1804,8 @@ QVariant::QVariant(const QVariant &p)
 {
     if (d.is_shared) {
         d.data.shared->ref.ref();
-    } else if (p.d.type > Char) {
-        handlerManager[d.type]->construct(&d, p.constData());
+    } else if (d.type().isValid()) {
+        customConstruct(&d, p.constData());
         d.is_null = p.d.is_null;
     }
 }
@@ -1911,13 +1875,13 @@ QVariant::QVariant(const char *val)
 */
 
 /*!
-  \fn QVariant::QVariant(const QDate &val)
+  \fn QVariant::QVariant(QDate val)
 
     Constructs a new variant with a date value, \a val.
 */
 
 /*!
-  \fn QVariant::QVariant(const QTime &val)
+  \fn QVariant::QVariant(QTime val)
 
     Constructs a new variant with a time value, \a val.
 */
@@ -2128,8 +2092,6 @@ QVariant::QVariant(const char *val)
 
 QVariant::QVariant(Type type)
 { create(type, nullptr); }
-QVariant::QVariant(int typeId, const void *copy)
-{ create(typeId, copy); d.is_null = false; }
 
 /*!
     \internal
@@ -2138,7 +2100,7 @@ QVariant::QVariant(int typeId, const void *copy)
 QVariant::QVariant(int typeId, const void *copy, uint flags)
 {
     if (flags) { //type is a pointer type
-        d.type = typeId;
+        d = Private(QMetaType(typeId));
         d.data.ptr = *reinterpret_cast<void *const*>(copy);
     } else {
         create(typeId, copy);
@@ -2146,6 +2108,16 @@ QVariant::QVariant(int typeId, const void *copy, uint flags)
     d.is_null = false;
 }
 
+/*!
+    \internal
+    flags is true if it is a pointer type
+ */
+QVariant::QVariant(QMetaType type, const void *copy) : d(type)
+{
+    customConstruct(&d, copy);
+    d.is_null = false;
+}
+
 QVariant::QVariant(int val)
     : d(Int)
 { d.data.i = val; }
@@ -2187,10 +2159,10 @@ QVariant::QVariant(const QStringList &val)
     : d(StringList)
 { v_construct<QStringList>(&d, val); }
 
-QVariant::QVariant(const QDate &val)
+QVariant::QVariant(QDate val)
     : d(Date)
 { v_construct<QDate>(&d, val); }
-QVariant::QVariant(const QTime &val)
+QVariant::QVariant(QTime val)
     : d(Time)
 { v_construct<QTime>(&d, val); }
 QVariant::QVariant(const QDateTime &val)
@@ -2310,23 +2282,31 @@ QVariant::QVariant(const QPersistentModelIndex &modelIndex)
     To test whether an instance of QVariant contains a data type that
     is compatible with the data type you are interested in, use
     canConvert().
-*/
 
+    \sa userType(), metaType()
+*/
 QVariant::Type QVariant::type() const
 {
-    return d.type >= QMetaType::User ? UserType : static_cast<Type>(d.type);
+    int type = d.type().id();
+    return type >= QMetaType::User ? UserType : static_cast<Type>(type);
 }
-
 /*!
     Returns the storage type of the value stored in the variant. For
     non-user types, this is the same as type().
 
-    \sa type()
+    \sa type(), metaType()
 */
-
 int QVariant::userType() const
 {
-    return d.type;
+    return d.type().id();
+}
+
+/*!
+    Returns the QMetaType of the value stored in the variant.
+*/
+QMetaType QVariant::metaType() const
+{
+    return d.type();
 }
 
 /*!
@@ -2341,12 +2321,10 @@ QVariant& QVariant::operator=(const QVariant &variant)
     if (variant.d.is_shared) {
         variant.d.data.shared->ref.ref();
         d = variant.d;
-    } else if (variant.d.type > Char) {
-        d.type = variant.d.type;
-        handlerManager[d.type]->construct(&d, variant.constData());
-        d.is_null = variant.d.is_null;
     } else {
         d = variant.d;
+        customConstruct(&d, reinterpret_cast<const void *>(&variant.d.data));
+        d.is_null = variant.d.is_null;
     }
 
     return *this;
@@ -2371,11 +2349,10 @@ void QVariant::detach()
     if (!d.is_shared || d.data.shared->ref.loadRelaxed() == 1)
         return;
 
-    Private dd;
-    dd.type = d.type;
-    handlerManager[d.type]->construct(&dd, constData());
+    Private dd(d.type());
+    customConstruct(&dd, constData());
     if (!d.data.shared->ref.deref())
-        handlerManager[d.type]->clear(&d);
+        customClear(&d);
     d.data.shared = dd.data.shared;
 }
 
@@ -2393,7 +2370,8 @@ void QVariant::detach()
 */
 const char *QVariant::typeName() const
 {
-    return QMetaType::typeName(d.type);
+    // Cannot use d.type().name because we must return a char*
+    return QMetaType::typeName(d.type().id());
 }
 
 /*!
@@ -2402,11 +2380,9 @@ const char *QVariant::typeName() const
 */
 void QVariant::clear()
 {
-    if ((d.is_shared && !d.data.shared->ref.deref()) || (!d.is_shared && d.type > Char))
-        handlerManager[d.type]->clear(&d);
-    d.type = Invalid;
-    d.is_null = true;
-    d.is_shared = false;
+    if ((d.is_shared && !d.data.shared->ref.deref()) || (!d.is_shared))
+        customClear(&d);
+    d = {};
 }
 
 /*!
@@ -2469,7 +2445,11 @@ static const ushort mapIdFromQt3ToCurrent[MapFromThreeCount] =
     QMetaType::QDateTime,
     QMetaType::QByteArray,
     QMetaType::QBitArray,
+#if QT_CONFIG(shortcut)
     QMetaType::QKeySequence,
+#else
+    0, // QKeySequence
+#endif
     QMetaType::QPen,
     QMetaType::LongLong,
     QMetaType::ULongLong,
@@ -2505,7 +2485,7 @@ void QVariant::load(QDataStream &s)
             typeId = QMetaType::QSizePolicy;
         } else if (typeId > 75 && typeId <= 86) {
             // and as a result these types received lower ids too
-            // QKeySequence QPen QTextLength QTextFormat QMatrix QTransform QMatrix4x4 QVector2D QVector3D QVector4D QQuaternion
+            // QKeySequence QPen QTextLength QTextFormat QTransform QMatrix4x4 QVector2D QVector3D QVector4D QQuaternion
             typeId -=1;
         }
     }
@@ -2537,9 +2517,9 @@ void QVariant::load(QDataStream &s)
     }
 
     // const cast is safe since we operate on a newly constructed variant
-    if (!QMetaType::load(s, d.type, const_cast<void *>(constData()))) {
+    if (!QMetaType::load(s, d.type().id(), const_cast<void *>(constData()))) {
         s.setStatus(QDataStream::ReadCorruptData);
-        qWarning("QVariant::load: unable to load type %d.", d.type);
+        qWarning("QVariant::load: unable to load type %d.", d.type().id());
     }
 }
 
@@ -2551,7 +2531,9 @@ void QVariant::load(QDataStream &s)
 */
 void QVariant::save(QDataStream &s) const
 {
-    quint32 typeId = d.type >= QMetaType::User ? QMetaType::User : userType();
+    quint32 typeId = d.type().id();
+    if (typeId >= QMetaType::User)
+        typeId = QMetaType::User;
     bool fakeUserType = false;
     if (s.version() < QDataStream::Qt_4_0) {
         int i;
@@ -2574,7 +2556,11 @@ void QVariant::save(QDataStream &s) const
             typeId += 97;
         } else if (typeId == QMetaType::QSizePolicy) {
             typeId = 75;
+#if QT_CONFIG(shortcut)
         } else if (typeId >= QMetaType::QKeySequence && typeId <= QMetaType::QQuaternion) {
+#else
+        } else if (typeId >= QMetaType::QPen && typeId <= QMetaType::QQuaternion) {
+#endif
             // and as a result these types received lower ids too
             typeId +=1;
         } else if (typeId == QMetaType::QPolygonF || typeId == QMetaType::QUuid) {
@@ -2586,7 +2572,7 @@ void QVariant::save(QDataStream &s) const
     s << typeId;
     if (s.version() >= QDataStream::Qt_4_2)
         s << qint8(d.is_null);
-    if (d.type >= QVariant::UserType || fakeUserType) {
+    if (d.type().id() >= int(QVariant::UserType) || fakeUserType) {
         s << QMetaType::typeName(userType());
     }
 
@@ -2596,8 +2582,9 @@ void QVariant::save(QDataStream &s) const
         return;
     }
 
-    if (!QMetaType::save(s, d.type, constData())) {
-        qWarning("QVariant::save: unable to save type '%s' (type id: %d).\n", QMetaType::typeName(d.type), d.type);
+    if (!QMetaType::save(s, d.type().id(), constData())) {
+        qWarning("QVariant::save: unable to save type '%s' (type id: %d).\n",
+                 QMetaType::typeName(d.type().id()), d.type().id());
         Q_ASSERT_X(false, "QVariant::save", "Invalid type to save");
     }
 }
@@ -2657,21 +2644,21 @@ QDataStream& operator<<(QDataStream &s, const QVariant::Type p)
     QMetaType::UnknownType; otherwise returns \c false.
 */
 
-template <typename T>
-inline T qVariantToHelper(const QVariant::Private &d, const HandlersManager &handlerManager)
+template<typename T>
+inline T qVariantToHelper(const QVariant::Private &d, HandlersManager &)
 {
-    const uint targetType = qMetaTypeId<T>();
-    if (d.type == targetType)
+    QMetaType targetType = QMetaType::fromType<T>();
+    if (d.type() == targetType)
         return *v_cast<T>(&d);
 
     T ret;
-    if (d.type >= QMetaType::User || targetType >= QMetaType::User) {
+    if (d.type().id() >= QMetaType::User || targetType.id() >= QMetaType::User) {
         const void * const from = constData(d);
-        if (QMetaType::convert(from, d.type, &ret, targetType))
+        if (QMetaType::convert(from, d.type().id(), &ret, targetType.id()))
             return ret;
     }
 
-    handlerManager[d.type]->convert(&d, targetType, &ret, nullptr);
+    handlerManager[d.type().id()]->convert(&d, targetType.id(), &ret, nullptr);
     return ret;
 }
 
@@ -3112,15 +3099,15 @@ inline T qNumVariantToHelper(const QVariant::Private &d,
     if (ok)
         *ok = true;
 
-    if (d.type == t)
+    if (d.type().id() == t)
         return val;
 
     T ret = 0;
-    if ((d.type >= QMetaType::User || t >= QMetaType::User)
-        && QMetaType::convert(constData(d), d.type, &ret, t))
+    if ((d.type().id() >= QMetaType::User || t >= QMetaType::User)
+        && QMetaType::convert(constData(d), d.type().id(), &ret, t))
         return ret;
 
-    if (!handlerManager[d.type]->convert(&d, t, &ret, ok) && ok)
+    if (!handlerManager[d.type().id()]->convert(&d, t, &ret, ok) && ok)
         *ok = false;
     return ret;
 }
@@ -3217,11 +3204,11 @@ qulonglong QVariant::toULongLong(bool *ok) const
 */
 bool QVariant::toBool() const
 {
-    if (d.type == Bool)
+    if (d.type() == QMetaType::fromType<bool>())
         return d.data.b;
 
     bool res = false;
-    handlerManager[d.type]->convert(&d, Bool, &res, nullptr);
+    handlerManager[d.type().id()]->convert(&d, Bool, &res, nullptr);
 
     return res;
 }
@@ -3496,45 +3483,45 @@ static bool canConvertMetaObject(int fromId, int toId, QObject *fromObject)
 */
 bool QVariant::canConvert(int targetTypeId) const
 {
-    if (d.type == targetTypeId)
+    if (d.type().id() == targetTypeId)
         return true;
 
 #if QT_CONFIG(itemmodel)
-    if ((targetTypeId == QMetaType::QModelIndex && d.type == QMetaType::QPersistentModelIndex)
-        || (targetTypeId == QMetaType::QPersistentModelIndex && d.type == QMetaType::QModelIndex))
+    if ((targetTypeId == QMetaType::QModelIndex
+         && d.type().id() == QMetaType::QPersistentModelIndex)
+        || (targetTypeId == QMetaType::QPersistentModelIndex
+            && d.type().id() == QMetaType::QModelIndex))
         return true;
 #endif
 
     if (targetTypeId == QMetaType::QVariantList
-            && (d.type == QMetaType::QVariantList
-              || d.type == QMetaType::QStringList
-              || d.type == QMetaType::QByteArrayList
-              || QMetaType::hasRegisteredConverterFunction(d.type,
-                    qMetaTypeId<QtMetaTypePrivate::QSequentialIterableImpl>()))) {
+        && (d.type().id() == QMetaType::QVariantList || d.type().id() == QMetaType::QStringList
+            || d.type().id() == QMetaType::QByteArrayList
+            || QMetaType::hasRegisteredConverterFunction(
+                    d.type().id(), qMetaTypeId<QtMetaTypePrivate::QSequentialIterableImpl>()))) {
         return true;
     }
 
     if ((targetTypeId == QMetaType::QVariantHash || targetTypeId == QMetaType::QVariantMap)
-            && (d.type == QMetaType::QVariantMap
-              || d.type == QMetaType::QVariantHash
-              || QMetaType::hasRegisteredConverterFunction(d.type,
-                    qMetaTypeId<QtMetaTypePrivate::QAssociativeIterableImpl>()))) {
+        && (d.type().id() == QMetaType::QVariantMap || d.type().id() == QMetaType::QVariantHash
+            || QMetaType::hasRegisteredConverterFunction(
+                    d.type().id(), qMetaTypeId<QtMetaTypePrivate::QAssociativeIterableImpl>()))) {
         return true;
     }
 
-    if (targetTypeId == qMetaTypeId<QPair<QVariant, QVariant> >() &&
-              QMetaType::hasRegisteredConverterFunction(d.type,
-                    qMetaTypeId<QtMetaTypePrivate::QPairVariantInterfaceImpl>())) {
+    if (targetTypeId == qMetaTypeId<QPair<QVariant, QVariant>>()
+        && QMetaType::hasRegisteredConverterFunction(
+                d.type().id(), qMetaTypeId<QtMetaTypePrivate::QPairVariantInterfaceImpl>())) {
         return true;
     }
 
-    if ((d.type >= QMetaType::User || targetTypeId >= QMetaType::User)
-        && QMetaType::hasRegisteredConverterFunction(d.type, targetTypeId)) {
+    if ((d.type().id() >= QMetaType::User || targetTypeId >= QMetaType::User)
+        && QMetaType::hasRegisteredConverterFunction(d.type().id(), targetTypeId)) {
         return true;
     }
 
     // TODO Reimplement this function, currently it works but it is a historical mess.
-    uint currentType = d.type;
+    uint currentType = d.type().id();
     if (currentType == QMetaType::SChar || currentType == QMetaType::Char)
         currentType = QMetaType::UInt;
     if (targetTypeId == QMetaType::SChar || currentType == QMetaType::Char)
@@ -3647,9 +3634,11 @@ bool QVariant::canConvert(int targetTypeId) const
     if (currentType > int(QMetaType::QUuid) || targetTypeId > int(QMetaType::QUuid)) {
         switch (uint(targetTypeId)) {
         case QVariant::Int:
+#if QT_CONFIG(shortcut)
             if (currentType == QVariant::KeySequence)
                 return true;
             Q_FALLTHROUGH();
+#endif
         case QVariant::UInt:
         case QVariant::LongLong:
         case QVariant::ULongLong:
@@ -3672,11 +3661,16 @@ bool QVariant::canConvert(int targetTypeId) const
             return currentType == QVariant::Color || currentType == QMetaType::Nullptr
                               || ((QMetaType::typeFlags(currentType) & QMetaType::IsEnumeration) && QMetaType::metaObjectForType(currentType));
         case QVariant::String:
-            return currentType == QVariant::KeySequence || currentType == QVariant::Font
-                              || currentType == QVariant::Color || currentType == QMetaType::Nullptr
-                              || ((QMetaType::typeFlags(currentType) & QMetaType::IsEnumeration) && QMetaType::metaObjectForType(currentType));
+            return currentType == QVariant::Font
+                   || currentType == QVariant::Color || currentType == QMetaType::Nullptr
+#if QT_CONFIG(shortcut)
+                   || currentType == QVariant::KeySequence
+#endif
+                   || ((QMetaType::typeFlags(currentType) & QMetaType::IsEnumeration) && QMetaType::metaObjectForType(currentType));
+#if QT_CONFIG(shortcut)
         case QVariant::KeySequence:
             return currentType == QVariant::String || currentType == QVariant::Int;
+#endif
         case QVariant::Font:
             return currentType == QVariant::String;
         case QVariant::Color:
@@ -3730,7 +3724,7 @@ bool QVariant::canConvert(int targetTypeId) const
 
 bool QVariant::convert(int targetTypeId)
 {
-    if (d.type == uint(targetTypeId))
+    if (d.type().id() == targetTypeId)
         return true;
 
     QVariant oldValue = *this;
@@ -3741,7 +3735,7 @@ bool QVariant::convert(int targetTypeId)
 
     create(targetTypeId, nullptr);
     // Fail if the value is not initialized or was forced null by a previous failed convert.
-    if (oldValue.d.is_null && oldValue.d.type != QMetaType::Nullptr)
+    if (oldValue.d.is_null && oldValue.d.type().id() != QMetaType::Nullptr)
         return false;
 
     if ((QMetaType::typeFlags(oldValue.userType()) & QMetaType::PointerToQObject) && (QMetaType::typeFlags(targetTypeId) & QMetaType::PointerToQObject)) {
@@ -3827,72 +3821,6 @@ bool QVariant::convert(const int type, void *ptr) const
     QMetaType::registerComparators().
 */
 
-/*!
-    \fn bool QVariant::operator<(const QVariant &v) const
-    \obsolete
-
-    Compares this QVariant with \a v and returns \c true if this is less than \a v.
-
-    \note Comparability might not be availabe for the type stored in this QVariant
-    or in \a v.
-
-    \warning To make this function work with a custom type registered with
-    qRegisterMetaType(), its comparison operator must be registered using
-    QMetaType::registerComparators().
-
-    This operator is deprecated as it cannot establish a total order required
-    for most use of this operator, which is the reason you cannot use QVariant
-    as the key of a QMap.
-*/
-
-/*!
-    \fn bool QVariant::operator<=(const QVariant &v) const
-    \obsolete
-
-    Compares this QVariant with \a v and returns \c true if this is less or equal than \a v.
-
-    \note Comparability might not be available for the type stored in this QVariant
-    or in \a v.
-
-    \warning To make this function work with a custom type registered with
-    qRegisterMetaType(), its comparison operator must be registered using
-    QMetaType::registerComparators().
-
-    This operator is deprecated as it cannot establish a total order.
-*/
-
-/*!
-    \fn bool QVariant::operator>(const QVariant &v) const
-    \obsolete
-
-    Compares this QVariant with \a v and returns \c true if this is larger than \a v.
-
-    \note Comparability might not be available for the type stored in this QVariant
-    or in \a v.
-
-    \warning To make this function work with a custom type registered with
-    qRegisterMetaType(), its comparison operator must be registered using
-    QMetaType::registerComparators().
-
-    This operator is deprecated as it cannot establish a total order.
-*/
-
-/*!
-    \fn bool QVariant::operator>=(const QVariant &v) const
-    \obsolete
-
-    Compares this QVariant with \a v and returns \c true if this is larger or equal than \a v.
-
-    \note Comparability might not be available for the type stored in this QVariant
-    or in \a v.
-
-    \warning To make this function work with a custom type registered with
-    qRegisterMetaType(), its comparison operator must be registered using
-    QMetaType::registerComparators().
-
-    This operator is deprecated as it cannot establish a total order.
-*/
-
 static bool qIsNumericType(uint tp)
 {
     static const qulonglong numericTypeBits =
@@ -4009,7 +3937,7 @@ static int integralCompare(uint promotedType, const QVariant::Private *d1, const
 
 static int numericCompare(const QVariant::Private *d1, const QVariant::Private *d2)
 {
-    uint promotedType = numericTypePromotion(d1->type, d2->type);
+    uint promotedType = numericTypePromotion(d1->type().id(), d2->type().id());
     if (promotedType != QMetaType::QReal)
         return integralCompare(promotedType, d1, d2);
 
@@ -4038,33 +3966,33 @@ static int numericCompare(const QVariant::Private *d1, const QVariant::Private *
  */
 bool QVariant::cmp(const QVariant &v) const
 {
-    auto cmp_helper = [] (const QVariant::Private &d1, const QVariant::Private &d2)
-    {
-        Q_ASSERT(d1.type == d2.type);
-        if (d1.type >= QMetaType::User) {
+    auto cmp_helper = [](const QVariant::Private &d1, const QVariant::Private &d2) {
+        Q_ASSERT(d1.type() == d2.type());
+        if (d1.type().id() >= QMetaType::User) {
             int result;
-            if (QMetaType::equals(QT_PREPEND_NAMESPACE(constData(d1)), QT_PREPEND_NAMESPACE(constData(d2)), d1.type, &result))
+            if (QMetaType::equals(QT_PREPEND_NAMESPACE(constData(d1)),
+                                  QT_PREPEND_NAMESPACE(constData(d2)), d1.type().id(), &result))
                 return result == 0;
         }
-        return handlerManager[d1.type]->compare(&d1, &d2);
+        return handlerManager[d1.type().id()]->compare(&d1, &d2);
     };
 
     // try numerics first, with C++ type promotion rules (no conversion)
-    if (qIsNumericType(d.type) && qIsNumericType(v.d.type))
+    if (qIsNumericType(d.type().id()) && qIsNumericType(v.d.type().id()))
         return numericCompare(&d, &v.d) == 0;
 
-    if (d.type == v.d.type)
+    if (d.type() == v.d.type())
         return cmp_helper(d, v.d);
 
     QVariant v1 = *this;
     QVariant v2 = v;
-    if (v2.canConvert(v1.d.type)) {
-        if (!v2.convert(v1.d.type))
+    if (v2.canConvert(v1.d.type().id())) {
+        if (!v2.convert(v1.d.type().id()))
             return false;
     } else {
         // try the opposite conversion, it might work
         qSwap(v1, v2);
-        if (!v2.convert(v1.d.type))
+        if (!v2.convert(v1.d.type().id()))
             return false;
     }
     return cmp_helper(v1.d, v2.d);
@@ -4073,77 +4001,10 @@ bool QVariant::cmp(const QVariant &v) const
 /*!
     \internal
  */
-int QVariant::compare(const QVariant &v) const
-{
-    // try numerics first, with C++ type promotion rules (no conversion)
-    if (qIsNumericType(d.type) && qIsNumericType(v.d.type))
-        return numericCompare(&d, &v.d);
-
-    // check for equality next, as more types implement operator== than operator<
-    if (cmp(v))
-        return 0;
-
-    const QVariant *v1 = this;
-    const QVariant *v2 = &v;
-    QVariant converted1;
-    QVariant converted2;
-
-    if (d.type != v.d.type) {
-        // if both types differ, try to convert
-        if (v2->canConvert(v1->d.type)) {
-            converted2 = *v2;
-            if (converted2.convert(v1->d.type))
-                v2 = &converted2;
-        }
-        if (v1->d.type != v2->d.type && v1->canConvert(v2->d.type)) {
-            converted1 = *v1;
-            if (converted1.convert(v2->d.type))
-                v1 = &converted1;
-        }
-        if (v1->d.type != v2->d.type) {
-            // if conversion fails, default to toString
-            int r = v1->toString().compare(v2->toString(), Qt::CaseInsensitive);
-            if (r == 0) {
-                // cmp(v) returned false, so we should try to agree with it.
-                return (v1->d.type < v2->d.type) ? -1 : 1;
-            }
-            return r;
-        }
-
-        // did we end up with two numerics? If so, restart
-        if (qIsNumericType(v1->d.type) && qIsNumericType(v2->d.type))
-            return v1->compare(*v2);
-    }
-    if (v1->d.type >= QMetaType::User) {
-        int result;
-        if (QMetaType::compare(QT_PREPEND_NAMESPACE(constData(d)), QT_PREPEND_NAMESPACE(constData(v2->d)), d.type, &result))
-            return result;
-    }
-    switch (v1->d.type) {
-    case QVariant::Date:
-        return v1->toDate() < v2->toDate() ? -1 : 1;
-    case QVariant::Time:
-        return v1->toTime() < v2->toTime() ? -1 : 1;
-    case QVariant::DateTime:
-        return v1->toDateTime() < v2->toDateTime() ? -1 : 1;
-    case QVariant::StringList:
-        return v1->toStringList() < v2->toStringList() ? -1 : 1;
-    }
-    int r = v1->toString().compare(v2->toString(), Qt::CaseInsensitive);
-    if (r == 0) {
-        // cmp(v) returned false, so we should try to agree with it.
-        return (d.type < v.d.type) ? -1 : 1;
-    }
-    return r;
-}
-
-/*!
-    \internal
- */
 
 const void *QVariant::constData() const
 {
-    return d.is_shared ? d.data.shared->ptr : reinterpret_cast<const void *>(&d.data.ptr);
+    return d.is_shared ? d.data.shared->ptr : reinterpret_cast<const void *>(&d.data);
 }
 
 /*!
@@ -4176,14 +4037,14 @@ void* QVariant::data()
 */
 bool QVariant::isNull() const
 {
-    return handlerManager[d.type]->isNull(&d);
+    return handlerManager[d.type().id()]->isNull(&d);
 }
 
 #ifndef QT_NO_DEBUG_STREAM
 QDebug operator<<(QDebug dbg, const QVariant &v)
 {
     QDebugStateSaver saver(dbg);
-    const uint typeId = v.d.type;
+    const uint typeId = v.d.type().id();
     dbg.nospace() << "QVariant(";
     if (typeId != QMetaType::UnknownType) {
         dbg << QMetaType::typeName(typeId) << ", ";
@@ -4246,8 +4107,8 @@ QDebug operator<<(QDebug dbg, const QVariant::Type p)
     If the QVariant contains a pointer to a type derived from QObject then
     \c{T} may be any QObject type. If the pointer stored in the QVariant can be
     qobject_cast to T, then that result is returned. Otherwise \nullptr is
-    returned. Note that this only works for QObject subclasses which use the
-    Q_OBJECT macro.
+    returned. Note that this only works for QObject subclasses which use
+    the Q_OBJECT macro.
 
     If the QVariant contains a sequential container and \c{T} is QVariantList, the
     elements of the container will be converted into \l {QVariant}s and returned as a QVariantList.
@@ -5110,4 +4971,10 @@ QAssociativeIterable::const_iterator QAssociativeIterable::const_iterator::opera
     return const_iterator(impl, new QAtomicInt(0));
 }
 
+QVariant::Private::~Private()
+{
+    QtMetaTypePrivate::derefAndDestroy(
+            reinterpret_cast<QtPrivate::QMetaTypeInterface *>(packedType << 2));
+}
+
 QT_END_NAMESPACE
diff --git a/src/corelib/kernel/qvariant.h b/src/corelib/kernel/qvariant.h
index 24657818c5..cf95f12689 100644
--- a/src/corelib/kernel/qvariant.h
+++ b/src/corelib/kernel/qvariant.h
@@ -72,7 +72,6 @@ class QEasingCurve;
 class QLine;
 class QLineF;
 class QLocale;
-class QMatrix;
 class QTransform;
 class QStringList;
 class QTime;
@@ -184,11 +183,12 @@ class Q_CORE_EXPORT QVariant
         Region = QMetaType::QRegion,
         Bitmap = QMetaType::QBitmap,
         Cursor = QMetaType::QCursor,
+#if QT_CONFIG(shortcut)
         KeySequence = QMetaType::QKeySequence,
+#endif
         Pen = QMetaType::QPen,
         TextLength = QMetaType::QTextLength,
         TextFormat = QMetaType::QTextFormat,
-        Matrix = QMetaType::QMatrix,
         Transform = QMetaType::QTransform,
         Matrix4x4 = QMetaType::QMatrix4x4,
         Vector2D = QMetaType::QVector2D,
@@ -208,8 +208,8 @@ class Q_CORE_EXPORT QVariant
     QVariant() noexcept : d() {}
     ~QVariant();
     QVariant(Type type);
-    QVariant(int typeId, const void *copy);
-    QVariant(int typeId, const void *copy, uint flags);
+    QVariant(int typeId, const void *copy, uint flags = 0); // ### Qt6 TODO deprecate
+    explicit QVariant(QMetaType type, const void *copy);
     QVariant(const QVariant &other);
 
 #ifndef QT_NO_DATASTREAM
@@ -233,8 +233,8 @@ class Q_CORE_EXPORT QVariant
     QVariant(QLatin1String string);
     QVariant(const QStringList &stringlist);
     QVariant(QChar qchar);
-    QVariant(const QDate &date);
-    QVariant(const QTime &time);
+    QVariant(QDate date);
+    QVariant(QTime time);
     QVariant(const QDateTime &datetime);
     QVariant(const QList<QVariant> &list);
     QVariant(const QMap<QString,QVariant> &map);
@@ -283,6 +283,7 @@ class Q_CORE_EXPORT QVariant
     Type type() const;
     int userType() const;
     const char *typeName() const;
+    QMetaType metaType() const;
 
     bool canConvert(int targetTypeId) const;
     bool convert(int targetTypeId);
@@ -368,7 +369,9 @@ class Q_CORE_EXPORT QVariant
 
     template<typename T>
     static inline QVariant fromValue(const T &value)
-    { return QVariant(qMetaTypeId<T>(), &value, QTypeInfo<T>::isPointer); }
+    {
+        return QVariant(QMetaType::fromType<T>(), &value);
+    }
 
 #if (__has_include(<variant>) && __cplusplus >= 201703L) || defined(Q_CLANG_QDOC)
     template<typename... Types>
@@ -393,23 +396,35 @@ class Q_CORE_EXPORT QVariant
     };
     struct Private
     {
-        inline Private() noexcept : type(Invalid), is_shared(false), is_null(true)
-        { data.ptr = nullptr; }
-
-        // Internal constructor for initialized variants.
-        explicit inline Private(uint variantType) noexcept
-            : type(variantType), is_shared(false), is_null(false)
-        {}
+        Private() noexcept : packedType(0), is_shared(false), is_null(true) {}
+        explicit Private(const QMetaType &type) noexcept : is_shared(false), is_null(false)
+        {
+            if (type.d_ptr)
+                type.d_ptr->ref.ref();
+            quintptr mt = quintptr(type.d_ptr);
+            Q_ASSERT((mt & 0x3) == 0);
+            packedType = mt >> 2;
+        }
+        explicit Private(int type) noexcept : Private(QMetaType(type)) {}
+        Private(const Private &other) : Private(other.type())
+        {
+            data = other.data;
+            is_shared = other.is_shared;
+            is_null = other.is_null;
+        }
+        Private &operator=(const Private &other)
+        {
+            if (&other != this) {
+                this->~Private();
+                new (this) Private(other);
+            }
+            return *this;
+        }
+        Q_CORE_EXPORT ~Private();
 
-#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
-        Private(const Private &other) noexcept
-            : data(other.data), type(other.type),
-              is_shared(other.is_shared), is_null(other.is_null)
-        {}
-        Private &operator=(const Private &other) noexcept = default;
-#endif
         union Data
         {
+            void *threeptr[3] = { nullptr, nullptr, nullptr };
             char c;
             uchar uc;
             short s;
@@ -429,13 +444,15 @@ class Q_CORE_EXPORT QVariant
             void *ptr;
             PrivateShared *shared;
         } data;
-        uint type : 30;
-        uint is_shared : 1;
-        uint is_null : 1;
+        quintptr packedType : sizeof(QMetaType) * 8 - 2;
+        quintptr is_shared : 1;
+        quintptr is_null : 1;
+        inline QMetaType type() const
+        {
+            return QMetaType(reinterpret_cast<QtPrivate::QMetaTypeInterface *>(packedType << 2));
+        }
     };
  public:
-    typedef void (*f_construct)(Private *, const void *);
-    typedef void (*f_clear)(Private *);
     typedef bool (*f_null)(const Private *);
 #ifndef QT_NO_DATASTREAM
     typedef void (*f_load)(Private *, QDataStream &);
@@ -446,8 +463,6 @@ class Q_CORE_EXPORT QVariant
     typedef bool (*f_canConvert)(const QVariant::Private *d, int t);
     typedef void (*f_debugStream)(QDebug, const QVariant &);
     struct Handler {
-        f_construct construct;
-        f_clear clear;
         f_null isNull;
 #ifndef QT_NO_DATASTREAM
         f_load load;
@@ -463,16 +478,6 @@ class Q_CORE_EXPORT QVariant
     { return cmp(v); }
     inline bool operator!=(const QVariant &v) const
     { return !cmp(v); }
-#if QT_DEPRECATED_SINCE(5, 15)
-    QT_DEPRECATED inline bool operator<(const QVariant &v) const
-    { return compare(v) < 0; }
-    QT_DEPRECATED inline bool operator<=(const QVariant &v) const
-    { return compare(v) <= 0; }
-    QT_DEPRECATED inline bool operator>(const QVariant &v) const
-    { return compare(v) > 0; }
-    QT_DEPRECATED inline bool operator>=(const QVariant &v) const
-    { return compare(v) >= 0; }
-#endif
 
 protected:
     friend inline bool operator==(const QVariant &, const QVariantComparisonHelper &);
@@ -491,7 +496,6 @@ public:
     Private d;
     void create(int type, const void *copy);
     bool cmp(const QVariant &other) const;
-    int compare(const QVariant &other) const;
     bool convert(const int t, void *ptr) const; // ### Qt6: drop const
 
 private:
@@ -554,22 +558,20 @@ inline QVariant QVariant::fromValue(const std::monostate &)
 }
 #endif
 
-inline bool QVariant::isValid() const { return d.type != Invalid; }
+inline bool QVariant::isValid() const
+{
+    return d.type().isValid();
+}
 
 template<typename T>
 inline void QVariant::setValue(const T &avalue)
 {
+    QMetaType metaType = QMetaType::fromType<T>();
     // If possible we reuse the current QVariant private.
-    const uint type = qMetaTypeId<T>();
-    if (isDetached() && (type == d.type || (type <= uint(QVariant::Char) && d.type <= uint(QVariant::Char)))) {
-        d.type = type;
-        d.is_null = false;
-        T *old = reinterpret_cast<T*>(d.is_shared ? d.data.shared->ptr : &d.data.ptr);
-        if (QTypeInfo<T>::isComplex)
-            old->~T();
-        new (old) T(avalue); // call the copy constructor
+    if (isDetached() && d.type() == metaType) {
+        *reinterpret_cast<T *>(data()) = avalue;
     } else {
-        *this = QVariant(type, &avalue, QTypeInfo<T>::isPointer);
+        *this = QVariant::fromValue<T>(avalue);
     }
 }
 
@@ -826,7 +828,7 @@ namespace QtPrivate {
                 QVariantHash l;
                 l.reserve(iter.size());
                 for (QAssociativeIterable::const_iterator it = iter.begin(), end = iter.end(); it != end; ++it)
-                    static_cast<QMultiHash<QString, QVariant> &>(l).insert(it.key().toString(), it.value());
+                    l.insert(it.key().toString(), it.value());
                 return l;
             }
             return QVariantValueHelper<QVariantHash>::invoke(v);
diff --git a/src/corelib/kernel/qvariant_p.h b/src/corelib/kernel/qvariant_p.h
index 94781a9957..aa89d42092 100644
--- a/src/corelib/kernel/qvariant_p.h
+++ b/src/corelib/kernel/qvariant_p.h
@@ -234,7 +234,7 @@ public:
     QVariantComparator(const QVariant::Private *a, const QVariant::Private *b)
         : m_a(a), m_b(b)
     {
-        Q_ASSERT(a->type == b->type);
+        Q_ASSERT(a->type() == b->type());
     }
 
     template<typename T>
@@ -346,113 +346,6 @@ protected:
     const QVariant::Private *m_d;
 };
 
-template<class Filter>
-class QVariantConstructor
-{
-    template<typename T, bool IsAcceptedType = Filter::template Acceptor<T>::IsAccepted>
-    struct FilteredConstructor {
-        FilteredConstructor(const QVariantConstructor &tc)
-        {
-            v_construct<T>(tc.m_x, tc.m_copy);
-            tc.m_x->is_null = !tc.m_copy;
-        }
-    };
-    template<typename T>
-    struct FilteredConstructor<T, /* IsAcceptedType = */ false> {
-        FilteredConstructor(const QVariantConstructor &tc)
-        {
-            // ignore types that lives outside of the current library
-            tc.m_x->type = QMetaType::UnknownType;
-        }
-    };
-public:
-    QVariantConstructor(QVariant::Private *x, const void *copy)
-        : m_x(x)
-        , m_copy(copy)
-    {}
-
-    template<typename T>
-    void delegate(const T*)
-    {
-        FilteredConstructor<T>(*this);
-    }
-
-    void delegate(const QMetaTypeSwitcher::NotBuiltinType*)
-    {
-        // QVariantConstructor is used only for built-in types.
-        Q_ASSERT(false);
-    }
-
-    void delegate(const void*)
-    {
-        qWarning("Trying to create a QVariant instance of QMetaType::Void type, an invalid QVariant will be constructed instead");
-        m_x->type = QMetaType::UnknownType;
-        m_x->is_shared = false;
-        m_x->is_null = !m_copy;
-    }
-
-    void delegate(const QMetaTypeSwitcher::UnknownType*)
-    {
-        if (m_x->type != QMetaType::UnknownType) {
-            qWarning("Trying to construct an instance of an invalid type, type id: %i", m_x->type);
-            m_x->type = QMetaType::UnknownType;
-        }
-        m_x->is_shared = false;
-        m_x->is_null = !m_copy;
-    }
-private:
-    QVariant::Private *m_x;
-    const void *m_copy;
-};
-
-template<class Filter>
-class QVariantDestructor
-{
-    template<typename T, bool IsAcceptedType = Filter::template Acceptor<T>::IsAccepted>
-    struct FilteredDestructor {
-        FilteredDestructor(QVariant::Private *d)
-        {
-            v_clear<T>(d);
-        }
-    };
-    template<typename T>
-    struct FilteredDestructor<T, /* IsAcceptedType = */ false> {
-        FilteredDestructor(QVariant::Private *)
-        {
-            // It is not possible to create not accepted type
-            Q_ASSERT(false);
-        }
-    };
-
-public:
-    QVariantDestructor(QVariant::Private *d)
-        : m_d(d)
-    {}
-    ~QVariantDestructor()
-    {
-        m_d->type = QMetaType::UnknownType;
-        m_d->is_null = true;
-        m_d->is_shared = false;
-    }
-
-    template<typename T>
-    void delegate(const T*)
-    {
-        FilteredDestructor<T> cleaner(m_d);
-    }
-
-    void delegate(const QMetaTypeSwitcher::NotBuiltinType*)
-    {
-        // QVariantDestructor class is used only for a built-in type
-        Q_ASSERT(false);
-    }
-    // Ignore nonconstructible type
-    void delegate(const QMetaTypeSwitcher::UnknownType*) {}
-    void delegate(const void*) { Q_ASSERT(false); }
-private:
-    QVariant::Private *m_d;
-};
-
 namespace QVariantPrivate {
 Q_CORE_EXPORT void registerHandler(const int /* Modules::Names */ name, const QVariant::Handler *handler);
 }
diff --git a/src/corelib/mimetypes/mimetypes_resources.cmake b/src/corelib/mimetypes/mimetypes_resources.cmake
new file mode 100644
index 0000000000..a91d25cc2c
--- /dev/null
+++ b/src/corelib/mimetypes/mimetypes_resources.cmake
@@ -0,0 +1,21 @@
+# List of files that need to be packaged as resources.
+# This file exists solely because of unit tests that need access to this
+# information as well. This was previosly handled by referrencing a qrc
+# file with the same information
+
+set(corelib_mimetypes_resource_file
+    "${CMAKE_CURRENT_LIST_DIR}/mime/packages/freedesktop.org.xml"
+)
+
+function(corelib_add_mimetypes_resources target)
+    set(source_file "${corelib_mimetypes_resource_file}")
+    set_source_files_properties("${source_file}"
+        PROPERTIES QT_RESOURCE_ALIAS "freedesktop.org.xml"
+    )
+    qt_add_resource(${target} "mimetypes"
+        PREFIX
+            "/qt-project.org/qmime/packages"
+        FILES
+            "${source_file}"
+    )
+endfunction()
diff --git a/src/corelib/mimetypes/qmimedatabase.cpp b/src/corelib/mimetypes/qmimedatabase.cpp
index 10b2190966..f1d0dc859e 100644
--- a/src/corelib/mimetypes/qmimedatabase.cpp
+++ b/src/corelib/mimetypes/qmimedatabase.cpp
@@ -91,8 +91,8 @@ bool QMimeDatabasePrivate::shouldCheck()
     return true;
 }
 
-#if defined(Q_OS_UNIX) && !defined(Q_OS_INTEGRITY)
-#define QT_USE_MMAP
+#if defined(Q_OS_UNIX) && !defined(Q_OS_NACL) && !defined(Q_OS_INTEGRITY)
+#  define QT_USE_MMAP
 #endif
 
 void QMimeDatabasePrivate::loadProviders()
diff --git a/src/corelib/mimetypes/qmimedatabase_p.h b/src/corelib/mimetypes/qmimedatabase_p.h
index d9cf446d44..831390de1f 100644
--- a/src/corelib/mimetypes/qmimedatabase_p.h
+++ b/src/corelib/mimetypes/qmimedatabase_p.h
@@ -63,6 +63,7 @@ QT_REQUIRE_CONFIG(mimetype);
 #include <QtCore/qmutex.h>
 #include <QtCore/qvector.h>
 
+#include <vector>
 #include <memory>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/corelib/plugin/qfactoryinterface.cpp b/src/corelib/plugin/qfactoryinterface.cpp
index 353c2478f4..b503c245c5 100644
--- a/src/corelib/plugin/qfactoryinterface.cpp
+++ b/src/corelib/plugin/qfactoryinterface.cpp
@@ -43,7 +43,6 @@ QT_BEGIN_NAMESPACE
 
 QFactoryInterface::~QFactoryInterface()
 {
-    // must be empty until ### Qt 6
 }
 
 QT_END_NAMESPACE
diff --git a/src/corelib/plugin/qlibrary.cpp b/src/corelib/plugin/qlibrary.cpp
index b3a95d4f26..406a83c7dd 100644
--- a/src/corelib/plugin/qlibrary.cpp
+++ b/src/corelib/plugin/qlibrary.cpp
@@ -692,7 +692,7 @@ static bool qt_get_metadata(QLibraryPrivate *priv, QString *errMsg)
     };
 #else
     auto getMetaData = [](QFunctionPointer fptr) {
-        auto f = reinterpret_cast<QPair<const char *, size_t> (*)()>(fptr);
+        auto f = reinterpret_cast<QPluginMetaData (*)()>(fptr);
         return f();
     };
 #endif
@@ -702,7 +702,7 @@ static bool qt_get_metadata(QLibraryPrivate *priv, QString *errMsg)
         return false;
 
     auto metaData = getMetaData(pfn);
-    QJsonDocument doc = qJsonFromRawLibraryMetaData(metaData.first, metaData.second, errMsg);
+    QJsonDocument doc = qJsonFromRawLibraryMetaData(reinterpret_cast<const char *>(metaData.data), metaData.size, errMsg);
     if (doc.isNull())
         return false;
     priv->metaData = doc.object();
diff --git a/src/corelib/serialization/qbinaryjsonvalue.cpp b/src/corelib/serialization/qbinaryjsonvalue.cpp
index 5e3a01ad38..7d0bc3d366 100644
--- a/src/corelib/serialization/qbinaryjsonvalue.cpp
+++ b/src/corelib/serialization/qbinaryjsonvalue.cpp
@@ -63,12 +63,9 @@ QBinaryJsonValue::QBinaryJsonValue(QBinaryJsonPrivate::MutableData *data,
     case QJsonValue::Double:
         dbl = v.toDouble(parent);
         break;
-    case QJsonValue::String: {
-        QString s = v.toString(parent);
-        stringData = s.data_ptr();
-        stringData->ref.ref();
+    case QJsonValue::String:
+        stringData = v.toString(parent);
         break;
-    }
     case QJsonValue::Array:
     case QJsonValue::Object:
         d = data;
@@ -80,9 +77,9 @@ QBinaryJsonValue::QBinaryJsonValue(QBinaryJsonPrivate::MutableData *data,
 }
 
 QBinaryJsonValue::QBinaryJsonValue(QString string)
-    : stringData(*reinterpret_cast<QStringData **>(&string)), t(QJsonValue::String)
+    : d(nullptr), t(QJsonValue::String)
 {
-    stringData->ref.ref();
+    stringData = std::move(string);
 }
 
 QBinaryJsonValue::QBinaryJsonValue(const QBinaryJsonArray &a)
@@ -101,9 +98,6 @@ QBinaryJsonValue::QBinaryJsonValue(const QBinaryJsonObject &o)
 
 QBinaryJsonValue::~QBinaryJsonValue()
 {
-    if (t == QJsonValue::String && stringData && !stringData->ref.deref())
-        free(stringData);
-
     if (d && !d->ref.deref())
         delete d;
 }
@@ -134,9 +128,7 @@ QString QBinaryJsonValue::toString() const
 {
     if (t != QJsonValue::String)
         return QString();
-    stringData->ref.ref(); // the constructor below doesn't add a ref.
-    QStringDataPtr holder = { stringData };
-    return QString(holder);
+    return stringData;
 }
 
 void QBinaryJsonValue::detach()
diff --git a/src/corelib/serialization/qbinaryjsonvalue_p.h b/src/corelib/serialization/qbinaryjsonvalue_p.h
index 498fc62ecd..c3b943250c 100644
--- a/src/corelib/serialization/qbinaryjsonvalue_p.h
+++ b/src/corelib/serialization/qbinaryjsonvalue_p.h
@@ -86,6 +86,7 @@ public:
 
     QBinaryJsonValue(QBinaryJsonValue &&other) noexcept
         : ui(other.ui),
+          stringData(std::move(other.stringData)),
           d(other.d),
           t(other.t)
     {
@@ -96,6 +97,7 @@ public:
 
     QBinaryJsonValue &operator =(QBinaryJsonValue &&other) noexcept
     {
+        qSwap(stringData, other.stringData);
         qSwap(ui, other.ui);
         qSwap(d, other.d);
         qSwap(t, other.t);
@@ -122,9 +124,9 @@ private:
         quint64 ui;
         bool b;
         double dbl;
-        QStringData *stringData;
         const QBinaryJsonPrivate::Base *base;
     };
+    QString stringData;
     QBinaryJsonPrivate::MutableData *d = nullptr; // needed for Objects and Arrays
     QJsonValue::Type t = QJsonValue::Null;
 };
diff --git a/src/corelib/serialization/qcborstreamwriter.cpp b/src/corelib/serialization/qcborstreamwriter.cpp
index 9d78785416..c73c17aed1 100644
--- a/src/corelib/serialization/qcborstreamwriter.cpp
+++ b/src/corelib/serialization/qcborstreamwriter.cpp
@@ -729,7 +729,7 @@ void QCborStreamWriter::appendTextString(const char *utf8, qsizetype len)
    length is implied by the elements contained in it. Note, however, that use
    of indeterminate-length arrays is not compliant with canonical CBOR encoding.
 
-   The following example appends elements from the linked list of strings
+   The following example appends elements from the vector of strings
    passed as input:
 
    \snippet code/src_corelib_serialization_qcborstream.cpp 20
@@ -802,7 +802,7 @@ bool QCborStreamWriter::endArray()
    indeterminate-length maps is not compliant with canonical CBOR encoding
    (canonical encoding also requires keys to be unique and in sorted order).
 
-   The following example appends elements from the linked list of int and
+   The following example appends elements from the vector of int and
    string pairs passed as input:
 
    \snippet code/src_corelib_serialization_qcborstream.cpp 22
diff --git a/src/corelib/serialization/qcborvalue_p.h b/src/corelib/serialization/qcborvalue_p.h
index 48818e4c63..53ba81fa18 100644
--- a/src/corelib/serialization/qcborvalue_p.h
+++ b/src/corelib/serialization/qcborvalue_p.h
@@ -147,8 +147,8 @@ public:
         qptrdiff offset = data.size();
 
         // align offset
-        offset += Q_ALIGNOF(QtCbor::ByteData) - 1;
-        offset &= ~(Q_ALIGNOF(QtCbor::ByteData) - 1);
+        offset += alignof(QtCbor::ByteData) - 1;
+        offset &= ~(alignof(QtCbor::ByteData) - 1);
 
         qptrdiff increment = qptrdiff(sizeof(QtCbor::ByteData)) + len;
 
@@ -170,7 +170,7 @@ public:
             return nullptr;
 
         size_t offset = size_t(e.value);
-        Q_ASSERT((offset % Q_ALIGNOF(QtCbor::ByteData)) == 0);
+        Q_ASSERT((offset % alignof(QtCbor::ByteData)) == 0);
         Q_ASSERT(offset + sizeof(QtCbor::ByteData) <= size_t(data.size()));
 
         auto b = reinterpret_cast<const QtCbor::ByteData *>(data.constData() + offset);
@@ -214,7 +214,7 @@ public:
     }
     void insertAt(qsizetype idx, const QCborValue &value, ContainerDisposition disp = CopyContainer)
     {
-        replaceAt_internal(*elements.insert(elements.begin() + idx, {}), value, disp);
+        replaceAt_internal(*elements.insert(elements.begin() + int(idx), {}), value, disp);
     }
 
     void append(QtCbor::Undefined)
@@ -235,6 +235,15 @@ public:
         elements.append(QtCbor::Element(addByteData(data, len), type,
                                         QtCbor::Element::HasByteData | extraFlags));
     }
+    void appendAsciiString(const QString &s);
+    void appendAsciiString(const char *str, qsizetype len)
+    {
+        appendByteData(str, len, QCborValue::String, QtCbor::Element::StringIsAscii);
+    }
+    void appendUtf8String(const char *str, qsizetype len)
+    {
+        appendByteData(str, len, QCborValue::String);
+    }
     void append(QLatin1String s)
     {
         if (!QtPrivate::isAscii(s))
diff --git a/src/corelib/serialization/qdatastream.cpp b/src/corelib/serialization/qdatastream.cpp
index 5082a8cb0d..df286085bc 100644
--- a/src/corelib/serialization/qdatastream.cpp
+++ b/src/corelib/serialization/qdatastream.cpp
@@ -163,7 +163,7 @@ QT_BEGIN_NAMESPACE
     \section1 Reading and Writing Qt Collection Classes
 
     The Qt container classes can also be serialized to a QDataStream.
-    These include QList, QLinkedList, QVector, QSet, QHash, and QMap.
+    These include QList, QVector, QSet, QHash, and QMap.
     The stream operators are declared as non-members of the classes.
 
     \target Serializing Qt Classes
diff --git a/src/corelib/serialization/qdatastream.h b/src/corelib/serialization/qdatastream.h
index 4d827772c8..c7b0008039 100644
--- a/src/corelib/serialization/qdatastream.h
+++ b/src/corelib/serialization/qdatastream.h
@@ -43,6 +43,7 @@
 #include <QtCore/qscopedpointer.h>
 #include <QtCore/qiodevice.h>
 #include <QtCore/qpair.h>
+#include <QtCore/qcontainerfwd.h>
 
 #ifdef Status
 #error qdatastream.h must be included before any header file that defines Status
@@ -54,12 +55,6 @@ class qfloat16;
 class QByteArray;
 class QIODevice;
 
-template <typename T> class QList;
-template <typename T> class QVector;
-template <typename T> class QSet;
-template <class Key, class T> class QHash;
-template <class Key, class T> class QMap;
-
 #if !defined(QT_NO_DATASTREAM) || defined(QT_BOOTSTRAPPED)
 class QDataStreamPrivate;
 namespace QtPrivate {
@@ -100,15 +95,9 @@ public:
         Qt_5_12 = 18,
         Qt_5_13 = 19,
         Qt_5_14 = Qt_5_13,
-#if QT_VERSION >= 0x050f00
         Qt_5_15 = Qt_5_14,
-        Qt_DefaultCompiledVersion = Qt_5_15
-#elif QT_VERSION >= 0x060000
-        Qt_6_0 = Qt_5_15,
+        Qt_6_0 = 20,
         Qt_DefaultCompiledVersion = Qt_6_0
-#else
-        Qt_DefaultCompiledVersion = Qt_5_14
-#endif
 #if QT_VERSION >= 0x060100
 #error Add the datastream version for this Qt version and update Qt_DefaultCompiledVersion
 #endif
@@ -301,10 +290,7 @@ QDataStream &readAssociativeContainer(QDataStream &s, Container &c)
             c.clear();
             break;
         }
-QT_WARNING_PUSH
-QT_WARNING_DISABLE_DEPRECATED
-        c.insertMulti(k, t);
-QT_WARNING_POP
+        c.insert(k, t);
     }
 
     return s;
@@ -324,19 +310,20 @@ template <typename Container>
 QDataStream &writeAssociativeContainer(QDataStream &s, const Container &c)
 {
     s << quint32(c.size());
-#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) && QT_DEPRECATED_SINCE(5, 15)
-    // Deserialization should occur in the reverse order.
-    // Otherwise, value() will return the least recently inserted
-    // value instead of the most recently inserted one.
-    auto it = c.constEnd();
-    auto begin = c.constBegin();
-    while (it != begin) {
-        QT_WARNING_PUSH
-        QT_WARNING_DISABLE_DEPRECATED
-        --it;
-        QT_WARNING_POP
+    auto it = c.constBegin();
+    auto end = c.constEnd();
+    while (it != end) {
         s << it.key() << it.value();
-#else
+        ++it;
+    }
+
+    return s;
+}
+
+template <typename Container>
+QDataStream &writeAssociativeMultiContainer(QDataStream &s, const Container &c)
+{
+    s << quint32(c.size());
     auto it = c.constBegin();
     auto end = c.constEnd();
     while (it != end) {
@@ -348,7 +335,6 @@ QDataStream &writeAssociativeContainer(QDataStream &s, const Container &c)
             auto next = std::next(rangeStart, i);
             s << next.key() << next.value();
         }
-#endif
     }
 
     return s;
@@ -414,18 +400,6 @@ typename std::enable_if<std::is_enum<T>::value, QDataStream &>::type&
 operator>>(QDataStream &s, T &t)
 { return s >> reinterpret_cast<typename std::underlying_type<T>::type &>(t); }
 
-template <typename T>
-inline QDataStream &operator>>(QDataStream &s, QList<T> &l)
-{
-    return QtPrivate::readArrayBasedContainer(s, l);
-}
-
-template <typename T>
-inline QDataStream &operator<<(QDataStream &s, const QList<T> &l)
-{
-    return QtPrivate::writeSequentialContainer(s, l);
-}
-
 template<typename T>
 inline QDataStream &operator>>(QDataStream &s, QVector<T> &v)
 {
@@ -457,12 +431,25 @@ inline QDataStream &operator>>(QDataStream &s, QHash<Key, T> &hash)
 }
 
 template <class Key, class T>
+
 inline QDataStream &operator<<(QDataStream &s, const QHash<Key, T> &hash)
 {
     return QtPrivate::writeAssociativeContainer(s, hash);
 }
 
 template <class Key, class T>
+inline QDataStream &operator>>(QDataStream &s, QMultiHash<Key, T> &hash)
+{
+    return QtPrivate::readAssociativeContainer(s, hash);
+}
+
+template <class Key, class T>
+inline QDataStream &operator<<(QDataStream &s, const QMultiHash<Key, T> &hash)
+{
+    return QtPrivate::writeAssociativeMultiContainer(s, hash);
+}
+
+template <class Key, class T>
 inline QDataStream &operator>>(QDataStream &s, QMap<Key, T> &map)
 {
     return QtPrivate::readAssociativeContainer(s, map);
@@ -474,6 +461,18 @@ inline QDataStream &operator<<(QDataStream &s, const QMap<Key, T> &map)
     return QtPrivate::writeAssociativeContainer(s, map);
 }
 
+template <class Key, class T>
+inline QDataStream &operator>>(QDataStream &s, QMultiMap<Key, T> &map)
+{
+    return QtPrivate::readAssociativeContainer(s, map);
+}
+
+template <class Key, class T>
+inline QDataStream &operator<<(QDataStream &s, const QMultiMap<Key, T> &map)
+{
+    return QtPrivate::writeAssociativeMultiContainer(s, map);
+}
+
 #ifndef QT_NO_DATASTREAM
 template <class T1, class T2>
 inline QDataStream& operator>>(QDataStream& s, QPair<T1, T2>& p)
diff --git a/src/corelib/serialization/qjsonarray.h b/src/corelib/serialization/qjsonarray.h
index 22aa996a3e..9b7e10766f 100644
--- a/src/corelib/serialization/qjsonarray.h
+++ b/src/corelib/serialization/qjsonarray.h
@@ -49,7 +49,6 @@ QT_BEGIN_NAMESPACE
 
 class QDebug;
 class QStringList;
-template <typename T> class QList;
 typedef QList<QVariant> QVariantList;
 
 class Q_CORE_EXPORT QJsonArray
diff --git a/src/corelib/serialization/qjsoncbor.cpp b/src/corelib/serialization/qjsoncbor.cpp
index ee4dd90416..000008db50 100644
--- a/src/corelib/serialization/qjsoncbor.cpp
+++ b/src/corelib/serialization/qjsoncbor.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2019 Intel Corporation.
+** Copyright (C) 2020 Intel Corporation.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtCore module of the Qt Toolkit.
@@ -262,8 +262,7 @@ QJsonValue qt_convertToJson(QCborContainerPrivate *d, qsizetype idx)
     const auto &e = d->elements.at(idx);
     switch (e.type) {
     case QCborValue::Integer:
-        return QJsonPrivate::Value::fromTrustedCbor(e.value);
-
+        return QJsonValue(e.value);
     case QCborValue::ByteArray:
     case QCborValue::String:
     case QCborValue::SimpleType:
@@ -370,7 +369,7 @@ QJsonValue QCborValue::toJsonValue() const
         return false;
 
     case Integer:
-        return QJsonPrivate::Value::fromTrustedCbor(n);
+        return QJsonPrivate::Value::fromTrustedCbor(*this);
 
     case True:
         return true;
@@ -615,11 +614,9 @@ QCborValue QCborValue::fromJsonValue(const QJsonValue &v)
     case QJsonValue::Bool:
         return v.toBool();
     case QJsonValue::Double: {
-        qint64 i;
-        const double dbl = v.toDouble();
-        if (convertDoubleTo(dbl, &i))
-            return i;
-        return dbl;
+        if (v.t == Integer)
+            return v.toInteger();
+        return v.toDouble();
     }
     case QJsonValue::String:
         return v.toString();
@@ -667,9 +664,7 @@ static void appendVariant(QCborContainerPrivate *d, const QVariant &variant)
       \row  \li \c bool                     \li Bool
       \row  \li \c std::nullptr_t           \li Null
       \row  \li \c short, \c ushort, \c int, \c uint, \l qint64  \li Integer
-      \row  \li \l quint64                  \li Integer, but they are cast to \c qint64 first so
-                                                values higher than 2\sup{63}-1 (\c INT64_MAX) will
-                                                be wrapped to negative
+      \row  \li \l quint64                  \li Integer, or Double if outside the range of qint64
       \row  \li \c float, \c double         \li Double
       \row  \li \l QByteArray               \li ByteArray
       \row  \li \l QDateTime                \li DateTime
@@ -713,9 +708,12 @@ QCborValue QCborValue::fromVariant(const QVariant &variant)
     case QMetaType::UShort:
     case QMetaType::Int:
     case QMetaType::LongLong:
-    case QMetaType::ULongLong:
     case QMetaType::UInt:
         return variant.toLongLong();
+    case QMetaType::ULongLong:
+        if (variant.toULongLong() <= static_cast<uint64_t>(std::numeric_limits<qint64>::max()))
+            return variant.toLongLong();
+        Q_FALLTHROUGH();
     case QMetaType::Float:
     case QMetaType::Double:
         return variant.toDouble();
diff --git a/src/corelib/serialization/qjsonparser.cpp b/src/corelib/serialization/qjsonparser.cpp
index 6d0a92e094..d7ce702ff7 100644
--- a/src/corelib/serialization/qjsonparser.cpp
+++ b/src/corelib/serialization/qjsonparser.cpp
@@ -709,10 +709,11 @@ bool Parser::parseNumber()
 
     // frac = decimal-point 1*DIGIT
     if (json < end && *json == '.') {
-        isInt = false;
         ++json;
-        while (json < end && *json >= '0' && *json <= '9')
+        while (json < end && *json >= '0' && *json <= '9') {
+            isInt = isInt && *json == '0';
             ++json;
+        }
     }
 
     // exp = e [ minus / plus ] 1*DIGIT
@@ -893,9 +894,10 @@ bool Parser::parseString()
 
     // no escape sequences, we are done
     if (isUtf8) {
-        container->appendByteData(start, json - start - 1, QCborValue::String,
-                                  isAscii ? QtCbor::Element::StringIsAscii
-                                          : QtCbor::Element::ValueFlags {});
+        if (isAscii)
+            container->appendAsciiString(start, json - start - 1);
+        else
+            container->appendUtf8String(start, json - start - 1);
         END;
         return true;
     }
diff --git a/src/corelib/serialization/qjsonvalue.cpp b/src/corelib/serialization/qjsonvalue.cpp
index caf81c79ef..e9ba176d7f 100644
--- a/src/corelib/serialization/qjsonvalue.cpp
+++ b/src/corelib/serialization/qjsonvalue.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2020 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtCore module of the Qt Toolkit.
@@ -154,7 +154,9 @@ QJsonValue::QJsonValue(bool b)
 QJsonValue::QJsonValue(double v)
     : d(nullptr)
 {
-    if (convertDoubleTo(v, &n)) {
+    // Convert to integer if the number is an integer and changing wouldn't
+    // introduce additional digit precision not present in the double.
+    if (convertDoubleTo<qint64>(v, &n, false /* allow_precision_upgrade */)) {
         t = QCborValue::Integer;
     } else {
         memcpy(&n, &v, sizeof(n));
@@ -449,12 +451,18 @@ QJsonValue QJsonValue::fromVariant(const QVariant &variant)
         return QJsonValue(Null);
     case QMetaType::Bool:
         return QJsonValue(variant.toBool());
+    case QMetaType::Short:
+    case QMetaType::UShort:
     case QMetaType::Int:
-    case QMetaType::Float:
-    case QMetaType::Double:
+    case QMetaType::UInt:
     case QMetaType::LongLong:
+        return QJsonValue(variant.toLongLong());
     case QMetaType::ULongLong:
-    case QMetaType::UInt:
+        if (variant.toULongLong() <= static_cast<uint64_t>(std::numeric_limits<qint64>::max()))
+            return QJsonValue(variant.toLongLong());
+        Q_FALLTHROUGH();
+    case QMetaType::Float:
+    case QMetaType::Double:
         return QJsonValue(variant.toDouble());
     case QMetaType::QString:
         return QJsonValue(variant.toString());
@@ -504,7 +512,7 @@ QJsonValue QJsonValue::fromVariant(const QVariant &variant)
 
     \value Null     QMetaType::Nullptr
     \value Bool     QMetaType::Bool
-    \value Double   QMetaType::Double
+    \value Double   QMetaType::Double or QMetaType::LongLong
     \value String   QString
     \value Array    QVariantList
     \value Object   QVariantMap
@@ -520,6 +528,7 @@ QVariant QJsonValue::toVariant() const
     case QCborValue::False:
         return false;
     case QCborValue::Integer:
+        return toInteger();
     case QCborValue::Double:
         return toDouble();
     case QCborValue::String:
@@ -548,7 +557,8 @@ QVariant QJsonValue::toVariant() const
 
     \value Null     A Null value
     \value Bool     A boolean value. Use toBool() to convert to a bool.
-    \value Double   A double. Use toDouble() to convert to a double.
+    \value Double   A number value. Use toDouble() to convert to a double,
+                    or toInteger() to convert to a qint64.
     \value String   A string. Use toString() to convert to a QString.
     \value Array    An array. Use toArray() to convert to a QJsonArray.
     \value Object   An object. Use toObject() to convert to a QJsonObject.
@@ -613,18 +623,43 @@ int QJsonValue::toInt(int defaultValue) const
 {
     switch (t) {
     case QCborValue::Double: {
-        const double dbl = toDouble();
         int dblInt;
-        convertDoubleTo<int>(dbl, &dblInt);
-        return dbl == dblInt ? dblInt : defaultValue;
+        if (convertDoubleTo<int>(toDouble(), &dblInt))
+            return dblInt;
+        break;
     }
     case QCborValue::Integer:
-        return (n <= qint64(std::numeric_limits<int>::max())
-                && n >= qint64(std::numeric_limits<int>::min()))
-                ? n : defaultValue;
+        if (qint64(int(n)) == n)
+            return int(n);
+        break;
     default:
-        return defaultValue;
+        break;
     }
+    return defaultValue;
+}
+
+/*!
+    \since 6.0
+    Converts the value to an integer and returns it.
+
+    If type() is not Double or the value is not a whole number
+    representable as qint64, the \a defaultValue will be returned.
+ */
+qint64 QJsonValue::toInteger(qint64 defaultValue) const
+{
+    switch (t) {
+    case QCborValue::Integer:
+        return n;
+    case QCborValue::Double: {
+        qint64 dblInt;
+        if (convertDoubleTo<qint64>(toDouble(), &dblInt))
+            return dblInt;
+        break;
+    }
+    default:
+        break;
+    }
+    return defaultValue;
 }
 
 /*!
@@ -641,7 +676,7 @@ double QJsonValue::toDouble(double defaultValue) const
         return d;
     }
     case QCborValue::Integer:
-        return n;
+        return double(n);
     default:
         return defaultValue;
     }
@@ -787,8 +822,13 @@ const QJsonValue QJsonValue::operator[](int i) const
  */
 bool QJsonValue::operator==(const QJsonValue &other) const
 {
-    if (t != other.t)
+    if (t != other.t) {
+        if (isDouble() && other.isDouble()) {
+            // One value Cbor integer, one Cbor double, should interact as doubles.
+            return toDouble() == other.toDouble();
+        }
         return false;
+    }
 
     switch (t) {
     case QCborValue::Undefined:
@@ -929,32 +969,38 @@ uint qHash(const QJsonValue &value, uint seed)
 QDebug operator<<(QDebug dbg, const QJsonValue &o)
 {
     QDebugStateSaver saver(dbg);
-    switch (o.type()) {
-    case QJsonValue::Undefined:
+    switch (o.t) {
+    case QCborValue::Undefined:
         dbg << "QJsonValue(undefined)";
         break;
-    case QJsonValue::Null:
+    case QCborValue::Null:
         dbg << "QJsonValue(null)";
         break;
-    case QJsonValue::Bool:
+    case QCborValue::True:
+    case QCborValue::False:
         dbg.nospace() << "QJsonValue(bool, " << o.toBool() << ')';
         break;
-    case QJsonValue::Double:
+    case QCborValue::Integer:
+        dbg.nospace() << "QJsonValue(double, " << o.toInteger() << ')';
+        break;
+    case QCborValue::Double:
         dbg.nospace() << "QJsonValue(double, " << o.toDouble() << ')';
         break;
-    case QJsonValue::String:
+    case QCborValue::String:
         dbg.nospace() << "QJsonValue(string, " << o.toString() << ')';
         break;
-    case QJsonValue::Array:
+    case QCborValue::Array:
         dbg.nospace() << "QJsonValue(array, ";
         dbg << o.toArray();
         dbg << ')';
         break;
-    case QJsonValue::Object:
+    case QCborValue::Map:
         dbg.nospace() << "QJsonValue(object, ";
         dbg << o.toObject();
         dbg << ')';
         break;
+    default:
+        Q_UNREACHABLE();
     }
     return dbg;
 }
diff --git a/src/corelib/serialization/qjsonvalue.h b/src/corelib/serialization/qjsonvalue.h
index 5adcd64176..bd8bf14baf 100644
--- a/src/corelib/serialization/qjsonvalue.h
+++ b/src/corelib/serialization/qjsonvalue.h
@@ -112,6 +112,7 @@ public:
 
     bool toBool(bool defaultValue = false) const;
     int toInt(int defaultValue = 0) const;
+    qint64 toInteger(qint64 defaultValue = 0) const;
     double toDouble(double defaultValue = 0) const;
     QString toString() const;
     QString toString(const QString &defaultValue) const;
diff --git a/src/corelib/serialization/qjsonwriter.cpp b/src/corelib/serialization/qjsonwriter.cpp
index 627d1bbd62..590b59f09c 100644
--- a/src/corelib/serialization/qjsonwriter.cpp
+++ b/src/corelib/serialization/qjsonwriter.cpp
@@ -60,7 +60,8 @@ static inline uchar hexdig(uint u)
 
 static QByteArray escapedString(const QString &s)
 {
-    QByteArray ba(s.length(), Qt::Uninitialized);
+    // give it a minimum size to ensure the resize() below always adds enough space
+    QByteArray ba(qMax(s.length(), 16), Qt::Uninitialized);
 
     uchar *cursor = reinterpret_cast<uchar *>(const_cast<char *>(ba.constData()));
     const uchar *ba_end = cursor + ba.length();
@@ -138,15 +139,14 @@ static void valueToJson(const QCborValue &v, QByteArray &json, int indent, bool
         json += "false";
         break;
     case QCborValue::Integer:
+        json += QByteArray::number(v.toInteger());
+        break;
     case QCborValue::Double: {
         const double d = v.toDouble();
-        if (qIsFinite(d)) {
-            quint64 absInt;
-            json += QByteArray::number(d, convertDoubleTo(std::abs(d), &absInt) ? 'f' : 'g',
-                                       QLocale::FloatingPointShortest);
-        } else {
+        if (qIsFinite(d))
+            json += QByteArray::number(d, 'g', QLocale::FloatingPointShortest);
+        else
             json += "null"; // +INF || -INF || NaN (see RFC4627#section2.4)
-        }
         break;
     }
     case QCborValue::String:
diff --git a/src/corelib/statemachine/qabstracttransition.h b/src/corelib/statemachine/qabstracttransition.h
index 18e12d3eb6..357e829b6a 100644
--- a/src/corelib/statemachine/qabstracttransition.h
+++ b/src/corelib/statemachine/qabstracttransition.h
@@ -64,7 +64,7 @@ class Q_CORE_EXPORT QAbstractTransition : public QObject
     Q_PROPERTY(QState* sourceState READ sourceState)
     Q_PROPERTY(QAbstractState* targetState READ targetState WRITE setTargetState NOTIFY targetStateChanged)
     Q_PROPERTY(QList<QAbstractState*> targetStates READ targetStates WRITE setTargetStates NOTIFY targetStatesChanged)
-    Q_PROPERTY(TransitionType transitionType READ transitionType WRITE setTransitionType REVISION 1)
+    Q_PROPERTY(TransitionType transitionType READ transitionType WRITE setTransitionType REVISION(1, 1))
 public:
     enum TransitionType {
         ExternalTransition,
diff --git a/src/corelib/statemachine/qsignaleventgenerator_p.h b/src/corelib/statemachine/qsignaleventgenerator_p.h
index 72592b8731..a9d5b96920 100644
--- a/src/corelib/statemachine/qsignaleventgenerator_p.h
+++ b/src/corelib/statemachine/qsignaleventgenerator_p.h
@@ -62,13 +62,12 @@ class QStateMachine;
 
 class QSignalEventGenerator : public QObject
 {
-    Q_OBJECT_FAKE
+    Q_OBJECT
 public:
     QSignalEventGenerator(QStateMachine *parent);
 
-private:
-// slots
-    void execute(void **_a);
+private Q_SLOTS:
+    void execute(QMethodRawArguments a);
 
 private:
     Q_DISABLE_COPY_MOVE(QSignalEventGenerator)
diff --git a/src/corelib/statemachine/qstatemachine.cpp b/src/corelib/statemachine/qstatemachine.cpp
index a257cbc306..c1fa700959 100644
--- a/src/corelib/statemachine/qstatemachine.cpp
+++ b/src/corelib/statemachine/qstatemachine.cpp
@@ -3045,102 +3045,14 @@ void QStateMachine::removeDefaultAnimation(QAbstractAnimation *animation)
 
 #endif // animation
 
-
-// Begin moc-generated code -- modify carefully (check "HAND EDIT" parts)!
-struct qt_meta_stringdata_QSignalEventGenerator_t {
-    QByteArrayData data[3];
-    char stringdata[32];
-};
-#define QT_MOC_LITERAL(idx, ofs, len) \
-    Q_STATIC_BYTE_ARRAY_DATA_HEADER_INITIALIZER_WITH_OFFSET(len, \
-        offsetof(qt_meta_stringdata_QSignalEventGenerator_t, stringdata) + ofs \
-        - idx * sizeof(QByteArrayData) \
-    )
-static const qt_meta_stringdata_QSignalEventGenerator_t qt_meta_stringdata_QSignalEventGenerator = {
-    {
-QT_MOC_LITERAL(0, 0, 21),
-QT_MOC_LITERAL(1, 22, 7),
-QT_MOC_LITERAL(2, 30, 0)
-    },
-    "QSignalEventGenerator\0execute\0\0"
-};
-#undef QT_MOC_LITERAL
-
-static const uint qt_meta_data_QSignalEventGenerator[] = {
-
- // content:
-       7,       // revision
-       0,       // classname
-       0,    0, // classinfo
-       1,   14, // methods
-       0,    0, // properties
-       0,    0, // enums/sets
-       0,    0, // constructors
-       0,       // flags
-       0,       // signalCount
-
- // slots: name, argc, parameters, tag, flags
-       1,    0,   19,    2, 0x0a,
-
- // slots: parameters
-    QMetaType::Void,
-
-       0        // eod
-};
-
-void QSignalEventGenerator::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a)
-{
-    if (_c == QMetaObject::InvokeMetaMethod) {
-        Q_ASSERT(staticMetaObject.cast(_o));
-        QSignalEventGenerator *_t = static_cast<QSignalEventGenerator *>(_o);
-        switch (_id) {
-        case 0: _t->execute(_a); break; // HAND EDIT: add the _a parameter
-        default: ;
-        }
-    }
-    Q_UNUSED(_a);
-}
-
-const QMetaObject QSignalEventGenerator::staticMetaObject = {
-    { &QObject::staticMetaObject, qt_meta_stringdata_QSignalEventGenerator.data,
-      qt_meta_data_QSignalEventGenerator, qt_static_metacall, nullptr, nullptr }
-};
-
-const QMetaObject *QSignalEventGenerator::metaObject() const
-{
-    return &staticMetaObject;
-}
-
-void *QSignalEventGenerator::qt_metacast(const char *_clname)
-{
-    if (!_clname) return nullptr;
-    if (!strcmp(_clname, qt_meta_stringdata_QSignalEventGenerator.stringdata))
-        return static_cast<void*>(const_cast< QSignalEventGenerator*>(this));
-    return QObject::qt_metacast(_clname);
-}
-
-int QSignalEventGenerator::qt_metacall(QMetaObject::Call _c, int _id, void **_a)
-{
-    _id = QObject::qt_metacall(_c, _id, _a);
-    if (_id < 0)
-        return _id;
-    if (_c == QMetaObject::InvokeMetaMethod) {
-        if (_id < 1)
-            qt_static_metacall(this, _c, _id, _a);
-        _id -= 1;
-    }
-    return _id;
-}
-// End moc-generated code
-
-void QSignalEventGenerator::execute(void **_a)
+void QSignalEventGenerator::execute(QMethodRawArguments a)
 {
     auto machinePrivate = QStateMachinePrivate::get(qobject_cast<QStateMachine*>(parent()));
     if (machinePrivate->state != QStateMachinePrivate::Running)
         return;
     int signalIndex = senderSignalIndex();
     Q_ASSERT(signalIndex != -1);
-    machinePrivate->handleTransitionSignal(sender(), signalIndex, _a);
+    machinePrivate->handleTransitionSignal(sender(), signalIndex, a.arguments);
 }
 
 QSignalEventGenerator::QSignalEventGenerator(QStateMachine *parent)
diff --git a/src/corelib/text/qbytearray.cpp b/src/corelib/text/qbytearray.cpp
index f0c903737f..52bde98b62 100644
--- a/src/corelib/text/qbytearray.cpp
+++ b/src/corelib/text/qbytearray.cpp
@@ -65,7 +65,7 @@
 #include <string.h>
 #include <stdlib.h>
 
-#define IS_RAW_DATA(d) ((d)->offset != sizeof(QByteArrayData))
+#define IS_RAW_DATA(d) ((d)->flags() & QArrayData::RawDataType)
 
 QT_BEGIN_NAMESPACE
 
@@ -558,28 +558,13 @@ static const quint16 crc_tbl[16] = {
 
 /*!
     \relates QByteArray
-
-    Returns the CRC-16 checksum of the first \a len bytes of \a data.
-
-    The checksum is independent of the byte order (endianness) and will be
-    calculated accorded to the algorithm published in ISO 3309 (Qt::ChecksumIso3309).
-
-    \note This function is a 16-bit cache conserving (16 entry table)
-    implementation of the CRC-16-CCITT algorithm.
-*/
-quint16 qChecksum(const char *data, uint len)
-{
-    return qChecksum(data, len, Qt::ChecksumIso3309);
-}
-
-/*!
-    \relates QByteArray
     \since 5.9
 
     Returns the CRC-16 checksum of the first \a len bytes of \a data.
 
     The checksum is independent of the byte order (endianness) and will
     be calculated accorded to the algorithm published in \a standard.
+    By default the algorithm published in ISO 3309 (Qt::ChecksumIso3309) is used.
 
     \note This function is a 16-bit cache conserving (16 entry table)
     implementation of the CRC-16-CCITT algorithm.
@@ -748,27 +733,25 @@ QByteArray qUncompress(const uchar* data, int nbytes)
         return invalidCompressedData();
     }
 
-    QScopedPointer<QByteArray::Data, QByteArrayDataDeleter> d(QByteArray::Data::allocate(expectedSize + 1));
+    QPair<QByteArray::Data *, char *> pair = QByteArray::Data::allocate(expectedSize + 1);
+    QScopedPointer<QByteArray::Data, QByteArrayDataDeleter> d(pair.first);
     if (Q_UNLIKELY(d.data() == nullptr))
         return invalidCompressedData();
 
-    d->size = expectedSize;
     forever {
         ulong alloc = len;
 
-        int res = ::uncompress((uchar*)d->data(), &len,
+        int res = ::uncompress((uchar*)pair.second, &len,
                                data+4, nbytes-4);
 
         switch (res) {
-        case Z_OK:
+        case Z_OK: {
             Q_ASSERT(len <= alloc);
             Q_UNUSED(alloc);
-            d->size = len;
-            d->data()[len] = 0;
-            {
-                QByteArrayDataPtr dataPtr = { d.take() };
-                return QByteArray(dataPtr);
-            }
+            QByteArray::DataPointer dataPtr = { d.take(), pair.second, uint(len) };
+            pair.second[len] = '\0';
+            return QByteArray(dataPtr);
+        }
 
         case Z_MEM_ERROR:
             qWarning("qUncompress: Z_MEM_ERROR: Not enough memory");
@@ -781,11 +764,12 @@ QByteArray qUncompress(const uchar* data, int nbytes)
                 return invalidCompressedData();
             } else {
                 // grow the block
-                QByteArray::Data *p = QByteArray::Data::reallocateUnaligned(d.data(), len + 1);
-                if (Q_UNLIKELY(p == nullptr))
+                pair = QByteArray::Data::reallocateUnaligned(d.data(), pair.second, len + 1);
+                Q_CHECK_PTR(pair.first);
+                if (Q_UNLIKELY(pair.first == nullptr))
                     return invalidCompressedData();
                 d.take();   // don't free
-                d.reset(p);
+                d.reset(pair.first);
             }
             continue;
 
@@ -1211,9 +1195,6 @@ QByteArray qUncompress(const uchar* data, int nbytes)
 */
 QByteArray &QByteArray::operator=(const QByteArray & other) noexcept
 {
-    other.d->ref.ref();
-    if (!d->ref.deref())
-        Data::deallocate(d);
     d = other.d;
     return *this;
 }
@@ -1227,25 +1208,23 @@ QByteArray &QByteArray::operator=(const QByteArray & other) noexcept
 
 QByteArray &QByteArray::operator=(const char *str)
 {
-    Data *x;
-    if (!str) {
-        x = Data::sharedNull();
-    } else if (!*str) {
-        x = Data::allocate(0);
+    if (!str || !*str) {
+        QPair<Data *, char *> pair;
+        if (!str) {
+            pair = qMakePair(Data::sharedNull(), Data::sharedNullData());
+        } else {
+            pair = Data::allocate(0);
+        }
+        d = QByteArrayData(pair.first, pair.second, 0);
     } else {
         const int len = int(strlen(str));
-        const uint fullLen = len + 1;
-        if (d->ref.isShared() || fullLen > d->alloc
-                || (len < d->size && fullLen < uint(d->alloc >> 1)))
+        const uint fullLen = uint(len) + 1;
+        if (d->needsDetach() || fullLen > d->allocatedCapacity()
+                || (len < size() && fullLen < (d->allocatedCapacity() >> 1)))
             reallocData(fullLen, d->detachFlags());
-        x = d;
-        memcpy(x->data(), str, fullLen); // include null terminator
-        x->size = len;
+        memcpy(d.data(), str, fullLen); // include null terminator
+        d.size = len;
     }
-    x->ref.ref();
-    if (!d->ref.deref())
-         Data::deallocate(d);
-    d = x;
     return *this;
 }
 
@@ -1448,7 +1427,7 @@ QByteArray &QByteArray::operator=(const char *str)
     \sa operator[]()
 */
 
-/*! \fn QByteRef QByteArray::operator[](int i)
+/*! \fn char &QByteArray::operator[](int i)
 
     Returns the byte at index position \a i as a modifiable reference.
 
@@ -1459,21 +1438,6 @@ QByteArray &QByteArray::operator=(const char *str)
     Example:
     \snippet code/src_corelib_tools_qbytearray.cpp 9
 
-    The return value is of type QByteRef, a helper class for
-    QByteArray. When you get an object of type QByteRef, you can use
-    it as if it were a char &. If you assign to it, the assignment
-    will apply to the character in the QByteArray from which you got
-    the reference.
-
-    \note Before Qt 5.14 it was possible to use this operator to access
-    a character at an out-of-bounds position in the byte array, and
-    then assign to such a position, causing the byte array to be
-    automatically resized. Furthermore, assigning a value to the
-    returned QByteRef would cause a detach of the byte array, even if the
-    byte array has been copied in the meanwhile (and the QByteRef kept
-    alive while the copy was taken). These behaviors are deprecated,
-    and will be changed in a future version of Qt.
-
     \sa at()
 */
 
@@ -1484,16 +1448,6 @@ QByteArray &QByteArray::operator=(const char *str)
     Same as at(\a i).
 */
 
-/*! \fn QByteRef QByteArray::operator[](uint i)
-
-    \overload
-*/
-
-/*! \fn char QByteArray::operator[](uint i) const
-
-    \overload
-*/
-
 /*!
     \fn char QByteArray::front() const
     \since 5.10
@@ -1525,7 +1479,7 @@ QByteArray &QByteArray::operator=(const char *str)
 */
 
 /*!
-    \fn QByteRef QByteArray::front()
+    \fn char &QByteArray::front()
     \since 5.10
 
     Returns a reference to the first character in the byte array.
@@ -1540,7 +1494,7 @@ QByteArray &QByteArray::operator=(const char *str)
 */
 
 /*!
-    \fn QByteRef QByteArray::back()
+    \fn char &QByteArray::back()
     \since 5.10
 
     Returns a reference to the last character in the byte array.
@@ -1591,7 +1545,7 @@ QByteArray &QByteArray::operator=(const char *str)
 */
 void QByteArray::truncate(int pos)
 {
-    if (pos < d->size)
+    if (pos < size())
         resize(pos);
 }
 
@@ -1611,7 +1565,7 @@ void QByteArray::truncate(int pos)
 void QByteArray::chop(int n)
 {
     if (n > 0)
-        resize(d->size - n);
+        resize(size() - n);
 }
 
 
@@ -1715,19 +1669,13 @@ void QByteArray::chop(int n)
 QByteArray::QByteArray(const char *data, int size)
 {
     if (!data) {
-        d = Data::sharedNull();
+        d = DataPointer();
     } else {
         if (size < 0)
             size = int(strlen(data));
-        if (!size) {
-            d = Data::allocate(0);
-        } else {
-            d = Data::allocate(uint(size) + 1u);
-            Q_CHECK_PTR(d);
-            d->size = size;
-            memcpy(d->data(), data, size);
-            d->data()[size] = '\0';
-        }
+        d = DataPointer(Data::allocate(uint(size) + 1u), size);
+        memcpy(d.data(), data, size);
+        d.data()[size] = '\0';
     }
 }
 
@@ -1741,13 +1689,11 @@ QByteArray::QByteArray(const char *data, int size)
 QByteArray::QByteArray(int size, char ch)
 {
     if (size <= 0) {
-        d = Data::allocate(0);
+        d = DataPointer(Data::allocate(0), 0);
     } else {
-        d = Data::allocate(uint(size) + 1u);
-        Q_CHECK_PTR(d);
-        d->size = size;
-        memset(d->data(), ch, size);
-        d->data()[size] = '\0';
+        d = DataPointer(Data::allocate(uint(size) + 1u), size);
+        memset(d.data(), ch, size);
+        d.data()[size] = '\0';
     }
 }
 
@@ -1759,10 +1705,8 @@ QByteArray::QByteArray(int size, char ch)
 
 QByteArray::QByteArray(int size, Qt::Initialization)
 {
-    d = Data::allocate(uint(size) + 1u);
-    Q_CHECK_PTR(d);
-    d->size = size;
-    d->data()[size] = '\0';
+    d = DataPointer(Data::allocate(uint(size) + 1u), size);
+    d.data()[size] = '\0';
 }
 
 /*!
@@ -1782,31 +1726,21 @@ void QByteArray::resize(int size)
     if (size < 0)
         size = 0;
 
-    if (IS_RAW_DATA(d) && !d->ref.isShared() && size < d->size) {
-        d->size = size;
+    if (!d->isShared() && !d->isMutable() && size < int(d.size)) {
+        d.size = size;
         return;
     }
 
-    if (d->size == 0 && d->ref.isStatic()) {
-        //
-        // Optimize the idiom:
-        //    QByteArray a;
-        //    a.resize(sz);
-        //    ...
-        // which is used in place of the Qt 3 idiom:
-        //    QByteArray a(sz);
-        //
-        Data *x = Data::allocate(uint(size) + 1u);
-        Q_CHECK_PTR(x);
-        x->size = size;
-        x->data()[size] = '\0';
-        d = x;
+    if (size == 0 && !(d->flags() & Data::CapacityReserved)) {
+        d = DataPointer(Data::allocate(0), 0);
     } else {
-        if (d->ref.isShared() || uint(size) + 1u > d->alloc)
-            reallocData(uint(size) + 1u, d->detachFlags() | Data::Grow);
-        if (d->alloc) {
-            d->size = size;
-            d->data()[size] = '\0';
+        if (d->needsDetach() || size > capacity()
+                || (!(d->flags() & Data::CapacityReserved) && size < int(d.size)
+                    && size < (capacity() >> 1)))
+            reallocData(uint(size) + 1u, d->detachFlags() | Data::GrowsForward);
+        d.size = size;
+        if (d->isMutable()) {
+            d.data()[size] = '\0';
         }
     }
 }
@@ -1824,33 +1758,27 @@ void QByteArray::resize(int size)
 
 QByteArray &QByteArray::fill(char ch, int size)
 {
-    resize(size < 0 ? d->size : size);
-    if (d->size)
-        memset(d->data(), ch, d->size);
+    resize(size < 0 ? this->size() : size);
+    if (this->size())
+        memset(d.data(), ch, this->size());
     return *this;
 }
 
-void QByteArray::reallocData(uint alloc, Data::AllocationOptions options)
+void QByteArray::reallocData(uint alloc, Data::ArrayOptions options)
 {
-    if (d->ref.isShared() || IS_RAW_DATA(d)) {
-        Data *x = Data::allocate(alloc, options);
-        Q_CHECK_PTR(x);
-        x->size = qMin(int(alloc) - 1, d->size);
-        ::memcpy(x->data(), d->data(), x->size);
-        x->data()[x->size] = '\0';
-        if (!d->ref.deref())
-            Data::deallocate(d);
-        d = x;
+    if (d->needsDetach()) {
+        DataPointer dd(Data::allocate(alloc, options), qMin(int(alloc) - 1, d.size));
+        ::memcpy(dd.data(), d.data(), dd.size);
+        dd.data()[dd.size] = 0;
+        d = dd;
     } else {
-        Data *x = Data::reallocateUnaligned(d, alloc, options);
-        Q_CHECK_PTR(x);
-        d = x;
+        d.reallocate(alloc, options);
     }
 }
 
 void QByteArray::expand(int i)
 {
-    resize(qMax(i + 1, d->size));
+    resize(qMax(i + 1, size()));
 }
 
 /*!
@@ -1896,9 +1824,9 @@ QByteArray QByteArray::nulTerminated() const
 
 QByteArray &QByteArray::prepend(const QByteArray &ba)
 {
-    if (d->size == 0 && d->ref.isStatic() && !IS_RAW_DATA(ba.d)) {
+    if (size() == 0 && d->isStatic() && !IS_RAW_DATA(ba.d)) {
         *this = ba;
-    } else if (ba.d->size != 0) {
+    } else if (ba.size() != 0) {
         QByteArray tmp = *this;
         *this = ba;
         append(tmp);
@@ -1927,12 +1855,12 @@ QByteArray &QByteArray::prepend(const char *str)
 QByteArray &QByteArray::prepend(const char *str, int len)
 {
     if (str) {
-        if (d->ref.isShared() || uint(d->size + len) + 1u > d->alloc)
-            reallocData(uint(d->size + len) + 1u, d->detachFlags() | Data::Grow);
-        memmove(d->data()+len, d->data(), d->size);
-        memcpy(d->data(), str, len);
-        d->size += len;
-        d->data()[d->size] = '\0';
+        if (d->needsDetach() || size() + len > capacity())
+            reallocData(uint(size() + len) + 1u, d->detachFlags() | Data::GrowsForward);
+        memmove(d.data()+len, d.data(), d.size);
+        memcpy(d.data(), str, len);
+        d.size += len;
+        d.data()[d.size] = '\0';
     }
     return *this;
 }
@@ -1953,12 +1881,12 @@ QByteArray &QByteArray::prepend(const char *str, int len)
 
 QByteArray &QByteArray::prepend(char ch)
 {
-    if (d->ref.isShared() || uint(d->size) + 2u > d->alloc)
-        reallocData(uint(d->size) + 2u, d->detachFlags() | Data::Grow);
-    memmove(d->data()+1, d->data(), d->size);
-    d->data()[0] = ch;
-    ++d->size;
-    d->data()[d->size] = '\0';
+    if (d->needsDetach() || size() + 1 > capacity())
+        reallocData(uint(size()) + 2u, d->detachFlags() | Data::GrowsForward);
+    memmove(d.data()+1, d.data(), d.size);
+    d.data()[0] = ch;
+    ++d.size;
+    d.data()[d.size] = '\0';
     return *this;
 }
 
@@ -1988,14 +1916,14 @@ QByteArray &QByteArray::prepend(char ch)
 
 QByteArray &QByteArray::append(const QByteArray &ba)
 {
-    if (d->size == 0 && d->ref.isStatic() && !IS_RAW_DATA(ba.d)) {
+    if (size() == 0 && d->isStatic() && !IS_RAW_DATA(ba.d)) {
         *this = ba;
-    } else if (ba.d->size != 0) {
-        if (d->ref.isShared() || uint(d->size + ba.d->size) + 1u > d->alloc)
-            reallocData(uint(d->size + ba.d->size) + 1u, d->detachFlags() | Data::Grow);
-        memcpy(d->data() + d->size, ba.d->data(), ba.d->size);
-        d->size += ba.d->size;
-        d->data()[d->size] = '\0';
+    } else if (ba.size() != 0) {
+        if (d->needsDetach() || size() + ba.size() > capacity())
+            reallocData(uint(size() + ba.size()) + 1u, d->detachFlags() | Data::GrowsForward);
+        memcpy(d.data() + d.size, ba.data(), ba.size());
+        d.size += ba.size();
+        d.data()[d.size] = '\0';
     }
     return *this;
 }
@@ -2023,10 +1951,10 @@ QByteArray& QByteArray::append(const char *str)
 {
     if (str) {
         const int len = int(strlen(str));
-        if (d->ref.isShared() || uint(d->size + len) + 1u > d->alloc)
-            reallocData(uint(d->size + len) + 1u, d->detachFlags() | Data::Grow);
-        memcpy(d->data() + d->size, str, len + 1); // include null terminator
-        d->size += len;
+        if (d->needsDetach() || size() + len > capacity())
+            reallocData(uint(size() + len) + 1u, d->detachFlags() | Data::GrowsForward);
+        memcpy(d.data() + d.size, str, len + 1); // include null terminator
+        d.size += len;
     }
     return *this;
 }
@@ -2048,11 +1976,11 @@ QByteArray &QByteArray::append(const char *str, int len)
     if (len < 0)
         len = qstrlen(str);
     if (str && len) {
-        if (d->ref.isShared() || uint(d->size + len) + 1u > d->alloc)
-            reallocData(uint(d->size + len) + 1u, d->detachFlags() | Data::Grow);
-        memcpy(d->data() + d->size, str, len); // include null terminator
-        d->size += len;
-        d->data()[d->size] = '\0';
+        if (d->needsDetach() || size() + len > capacity())
+            reallocData(uint(size() + len) + 1u, d->detachFlags() | Data::GrowsForward);
+        memcpy(d.data() + d.size, str, len);
+        d.size += len;
+        d.data()[d.size] = '\0';
     }
     return *this;
 }
@@ -2076,10 +2004,10 @@ QByteArray &QByteArray::append(const char *str, int len)
 
 QByteArray& QByteArray::append(char ch)
 {
-    if (d->ref.isShared() || uint(d->size) + 2u > d->alloc)
-        reallocData(uint(d->size) + 2u, d->detachFlags() | Data::Grow);
-    d->data()[d->size++] = ch;
-    d->data()[d->size] = '\0';
+    if (d->needsDetach() || size() + 1 > capacity())
+        reallocData(uint(size()) + 2u, d->detachFlags() | Data::GrowsForward);
+    d.data()[d.size++] = ch;
+    d.data()[d.size] = '\0';
     return *this;
 }
 
@@ -2120,7 +2048,7 @@ static inline QByteArray &qbytearray_insert(QByteArray *ba,
 QByteArray &QByteArray::insert(int i, const QByteArray &ba)
 {
     QByteArray copy(ba);
-    return qbytearray_insert(this, i, copy.d->data(), copy.d->size);
+    return qbytearray_insert(this, i, copy.constData(), copy.size());
 }
 
 /*!
@@ -2202,7 +2130,7 @@ QByteArray &QByteArray::insert(int i, int count, char ch)
 
     int oldsize = size();
     resize(qMax(i, oldsize) + count);
-    char *dst = d->data();
+    char *dst = d.data();
     if (i > oldsize)
         ::memset(dst + oldsize, 0x20, i - oldsize);
     else if (i < oldsize)
@@ -2227,14 +2155,14 @@ QByteArray &QByteArray::insert(int i, int count, char ch)
 
 QByteArray &QByteArray::remove(int pos, int len)
 {
-    if (len <= 0  || uint(pos) >= uint(d->size))
+    if (len <= 0  || uint(pos) >= uint(size()))
         return *this;
     detach();
-    if (len >= d->size - pos) {
+    if (len >= size() - pos) {
         resize(pos);
     } else {
-        memmove(d->data() + pos, d->data() + pos + len, d->size - pos - len);
-        resize(d->size - len);
+        memmove(d.data() + pos, d.data() + pos + len, size() - pos - len);
+        resize(size() - len);
     }
     return *this;
 }
@@ -2251,9 +2179,9 @@ QByteArray &QByteArray::remove(int pos, int len)
 
 QByteArray &QByteArray::replace(int pos, int len, const QByteArray &after)
 {
-    if (len == after.d->size && (pos + len <= d->size)) {
+    if (len == after.size() && (pos + len <= size())) {
         detach();
-        memmove(d->data() + pos, after.d->data(), len*sizeof(char));
+        memmove(d.data() + pos, after.data(), len*sizeof(char));
         return *this;
     } else {
         QByteArray copy(after);
@@ -2288,9 +2216,9 @@ QByteArray &QByteArray::replace(int pos, int len, const char *after)
 */
 QByteArray &QByteArray::replace(int pos, int len, const char *after, int alen)
 {
-    if (len == alen && (pos + len <= d->size)) {
+    if (len == alen && (pos + len <= size())) {
         detach();
-        memcpy(d->data() + pos, after, len*sizeof(char));
+        memcpy(d.data() + pos, after, len*sizeof(char));
         return *this;
     } else {
         remove(pos, len);
@@ -2313,14 +2241,7 @@ QByteArray &QByteArray::replace(int pos, int len, const char *after, int alen)
 
 QByteArray &QByteArray::replace(const QByteArray &before, const QByteArray &after)
 {
-    if (isNull() || before.d == after.d)
-        return *this;
-
-    QByteArray aft = after;
-    if (after.d == d)
-        aft.detach();
-
-    return replace(before.constData(), before.size(), aft.constData(), aft.size());
+    return replace(before.constData(), before.size(), after.constData(), after.size());
 }
 
 /*!
@@ -2333,11 +2254,7 @@ QByteArray &QByteArray::replace(const QByteArray &before, const QByteArray &afte
 
 QByteArray &QByteArray::replace(const char *c, const QByteArray &after)
 {
-    QByteArray aft = after;
-    if (after.d == d)
-        aft.detach();
-
-    return replace(c, qstrlen(c), aft.constData(), aft.size());
+    return replace(c, qstrlen(c), after.constData(), after.size());
 }
 
 /*!
@@ -2357,13 +2274,13 @@ QByteArray &QByteArray::replace(const char *before, int bsize, const char *after
     // protect against before or after being part of this
     const char *a = after;
     const char *b = before;
-    if (after >= d->data() && after < d->data() + d->size) {
+    if (after >= constBegin() && after < constEnd()) {
         char *copy = (char *)malloc(asize);
         Q_CHECK_PTR(copy);
         memcpy(copy, after, asize);
         a = copy;
     }
-    if (before >= d->data() && before < d->data() + d->size) {
+    if (before >= constBegin() && before < constEnd()) {
         char *copy = (char *)malloc(bsize);
         Q_CHECK_PTR(copy);
         memcpy(copy, before, bsize);
@@ -2372,13 +2289,13 @@ QByteArray &QByteArray::replace(const char *before, int bsize, const char *after
 
     QByteArrayMatcher matcher(before, bsize);
     int index = 0;
-    int len = d->size;
-    char *d = data();
+    int len = size();
+    char *d = data(); // detaches
 
     if (bsize == asize) {
         if (bsize) {
             while ((index = matcher.indexIn(*this, index)) != -1) {
-                memcpy(d + index, after, asize);
+                memcpy(d + index, a, asize);
                 index += bsize;
             }
         }
@@ -2397,7 +2314,7 @@ QByteArray &QByteArray::replace(const char *before, int bsize, const char *after
                 to = index;
             }
             if (asize) {
-                memcpy(d + to, after, asize);
+                memcpy(d + to, a, asize);
                 to += asize;
             }
             index += bsize;
@@ -2440,7 +2357,7 @@ QByteArray &QByteArray::replace(const char *before, int bsize, const char *after
                 resize(newlen);
                 len = newlen;
             }
-            d = this->d->data();
+            d = this->d.data(); // data(), without the detach() check
 
             while(pos) {
                 pos--;
@@ -2449,7 +2366,7 @@ QByteArray &QByteArray::replace(const char *before, int bsize, const char *after
                 int moveto = insertstart + asize;
                 memmove(d + moveto, d + movestart, (moveend - movestart));
                 if (asize)
-                    memcpy(d + insertstart, after, asize);
+                    memcpy(d + insertstart, a, asize);
                 moveend = movestart - bsize;
             }
         }
@@ -2512,8 +2429,7 @@ QByteArray &QByteArray::replace(const char *before, int bsize, const char *after
 QByteArray &QByteArray::replace(char before, const QByteArray &after)
 {
     char b[2] = { before, '\0' };
-    QByteArray cb = fromRawData(b, 1);
-    return replace(cb, after);
+    return replace(b, 1, after.constData(), after.size());
 }
 
 /*! \fn QByteArray &QByteArray::replace(char before, const QString &after)
@@ -2547,9 +2463,9 @@ QByteArray &QByteArray::replace(char before, const QByteArray &after)
 
 QByteArray &QByteArray::replace(char before, char after)
 {
-    if (d->size) {
+    if (!isEmpty()) {
         char *i = data();
-        char *e = i + d->size;
+        char *e = i + size();
         for (; i != e; ++i)
             if (*i == before)
                 * i = after;
@@ -2590,7 +2506,7 @@ QList<QByteArray> QByteArray::split(char sep) const
 */
 QByteArray QByteArray::repeated(int times) const
 {
-    if (d->size == 0)
+    if (isEmpty())
         return *this;
 
     if (times <= 1) {
@@ -2599,27 +2515,27 @@ QByteArray QByteArray::repeated(int times) const
         return QByteArray();
     }
 
-    const int resultSize = times * d->size;
+    const int resultSize = times * size();
 
     QByteArray result;
     result.reserve(resultSize);
-    if (result.d->alloc != uint(resultSize) + 1u)
+    if (result.capacity() != resultSize)
         return QByteArray(); // not enough memory
 
-    memcpy(result.d->data(), d->data(), d->size);
+    memcpy(result.d.data(), data(), size());
 
-    int sizeSoFar = d->size;
-    char *end = result.d->data() + sizeSoFar;
+    int sizeSoFar = size();
+    char *end = result.d.data() + sizeSoFar;
 
     const int halfResultSize = resultSize >> 1;
     while (sizeSoFar <= halfResultSize) {
-        memcpy(end, result.d->data(), sizeSoFar);
+        memcpy(end, result.d.data(), sizeSoFar);
         end += sizeSoFar;
         sizeSoFar <<= 1;
     }
-    memcpy(end, result.d->data(), resultSize - sizeSoFar);
-    result.d->data()[resultSize] = '\0';
-    result.d->size = resultSize;
+    memcpy(end, result.d.data(), resultSize - sizeSoFar);
+    result.d.data()[resultSize] = '\0';
+    result.d.size = resultSize;
     return result;
 }
 
@@ -2641,17 +2557,17 @@ QByteArray QByteArray::repeated(int times) const
 
 int QByteArray::indexOf(const QByteArray &ba, int from) const
 {
-    const int ol = ba.d->size;
+    const int ol = ba.size();
     if (ol == 0)
         return from;
     if (ol == 1)
-        return indexOf(*ba.d->data(), from);
+        return indexOf(ba[0], from);
 
-    const int l = d->size;
-    if (from > d->size || ol + from > l)
+    const int l = size();
+    if (from > l || ol + from > l)
         return -1;
 
-    return qFindByteArray(d->data(), d->size, from, ba.d->data(), ol);
+    return qFindByteArray(data(), size(), from, ba.data(), ol);
 }
 
 /*! \fn int QByteArray::indexOf(const QString &str, int from) const
@@ -2685,13 +2601,13 @@ int QByteArray::indexOf(const char *c, int from) const
     if (ol == 1)
         return indexOf(*c, from);
 
-    const int l = d->size;
-    if (from > d->size || ol + from > l)
+    const int l = size();
+    if (from > l || ol + from > l)
         return -1;
     if (ol == 0)
         return from;
 
-    return qFindByteArray(d->data(), d->size, from, c, ol);
+    return qFindByteArray(data(), size(), from, c, ol);
 }
 
 /*!
@@ -2710,13 +2626,13 @@ int QByteArray::indexOf(const char *c, int from) const
 int QByteArray::indexOf(char ch, int from) const
 {
     if (from < 0)
-        from = qMax(from + d->size, 0);
-    if (from < d->size) {
-        const char *n = d->data() + from - 1;
-        const char *e = d->data() + d->size;
+        from = qMax(from + size(), 0);
+    if (from < size()) {
+        const char *n = data() + from - 1;
+        const char *e = end();
         while (++n != e)
         if (*n == ch)
-            return  n - d->data();
+            return  n - data();
     }
     return -1;
 }
@@ -2771,11 +2687,11 @@ static int lastIndexOfHelper(const char *haystack, int l, const char *needle, in
 
 int QByteArray::lastIndexOf(const QByteArray &ba, int from) const
 {
-    const int ol = ba.d->size;
+    const int ol = ba.size();
     if (ol == 1)
-        return lastIndexOf(*ba.d->data(), from);
+        return lastIndexOf(ba[0], from);
 
-    return lastIndexOfHelper(d->data(), d->size, ba.d->data(), ol, from);
+    return lastIndexOfHelper(data(), size(), ba.data(), ol, from);
 }
 
 /*! \fn int QByteArray::lastIndexOf(const QString &str, int from) const
@@ -2810,7 +2726,7 @@ int QByteArray::lastIndexOf(const char *str, int from) const
     if (ol == 1)
         return lastIndexOf(*str, from);
 
-    return lastIndexOfHelper(d->data(), d->size, str, ol, from);
+    return lastIndexOfHelper(data(), size(), str, ol, from);
 }
 
 /*!
@@ -2830,12 +2746,12 @@ int QByteArray::lastIndexOf(const char *str, int from) const
 int QByteArray::lastIndexOf(char ch, int from) const
 {
     if (from < 0)
-        from += d->size;
-    else if (from > d->size)
-        from = d->size-1;
+        from += size();
+    else if (from > size())
+        from = size()-1;
     if (from >= 0) {
-        const char *b = d->data();
-        const char *n = d->data() + from + 1;
+        const char *b = data();
+        const char *n = b + from + 1;
         while (n-- != b)
             if (*n == ch)
                 return  n - b;
@@ -2854,7 +2770,7 @@ int QByteArray::count(const QByteArray &ba) const
 {
     int num = 0;
     int i = -1;
-    if (d->size > 500 && ba.d->size > 5) {
+    if (size() > 500 && ba.size() > 5) {
         QByteArrayMatcher matcher(ba);
         while ((i = matcher.indexIn(*this, i + 1)) != -1)
             ++num;
@@ -2889,8 +2805,8 @@ int QByteArray::count(const char *str) const
 int QByteArray::count(char ch) const
 {
     int num = 0;
-    const char *i = d->data() + d->size;
-    const char *b = d->data();
+    const char *i = end();
+    const char *b = begin();
     while (i != b)
         if (*--i == ch)
             ++num;
@@ -2940,11 +2856,11 @@ int QByteArray::count(char ch) const
 */
 bool QByteArray::startsWith(const QByteArray &ba) const
 {
-    if (d == ba.d || ba.d->size == 0)
-        return true;
-    if (d->size < ba.d->size)
+    if (size() < ba.size())
         return false;
-    return memcmp(d->data(), ba.d->data(), ba.d->size) == 0;
+    if (data() == ba.data() || ba.size() == 0)
+        return true;
+    return memcmp(data(), ba.data(), ba.size()) == 0;
 }
 
 /*! \overload
@@ -2957,9 +2873,9 @@ bool QByteArray::startsWith(const char *str) const
     if (!str || !*str)
         return true;
     const int len = int(strlen(str));
-    if (d->size < len)
+    if (size() < len)
         return false;
-    return qstrncmp(d->data(), str, len) == 0;
+    return qstrncmp(data(), str, len) == 0;
 }
 
 /*! \overload
@@ -2969,9 +2885,9 @@ bool QByteArray::startsWith(const char *str) const
 */
 bool QByteArray::startsWith(char ch) const
 {
-    if (d->size == 0)
+    if (size() == 0)
         return false;
-    return d->data()[0] == ch;
+    return data()[0] == ch;
 }
 
 /*!
@@ -2985,11 +2901,11 @@ bool QByteArray::startsWith(char ch) const
 */
 bool QByteArray::endsWith(const QByteArray &ba) const
 {
-    if (d == ba.d || ba.d->size == 0)
-        return true;
-    if (d->size < ba.d->size)
+    if (size() < ba.size())
         return false;
-    return memcmp(d->data() + d->size - ba.d->size, ba.d->data(), ba.d->size) == 0;
+    if (end() == ba.end() || ba.size() == 0)
+        return true;
+    return memcmp(end() - ba.size(), ba.data(), ba.size()) == 0;
 }
 
 /*! \overload
@@ -3002,9 +2918,9 @@ bool QByteArray::endsWith(const char *str) const
     if (!str || !*str)
         return true;
     const int len = int(strlen(str));
-    if (d->size < len)
+    if (size() < len)
         return false;
-    return qstrncmp(d->data() + d->size - len, str, len) == 0;
+    return qstrncmp(end() - len, str, len) == 0;
 }
 
 /*
@@ -3086,9 +3002,9 @@ bool QByteArray::isLower() const
 */
 bool QByteArray::endsWith(char ch) const
 {
-    if (d->size == 0)
+    if (size() == 0)
         return false;
-    return d->data()[d->size - 1] == ch;
+    return data()[size() - 1] == ch;
 }
 
 /*!
@@ -3106,11 +3022,11 @@ bool QByteArray::endsWith(char ch) const
 
 QByteArray QByteArray::left(int len)  const
 {
-    if (len >= d->size)
+    if (len >= size())
         return *this;
     if (len < 0)
         len = 0;
-    return QByteArray(d->data(), len);
+    return QByteArray(data(), len);
 }
 
 /*!
@@ -3128,11 +3044,11 @@ QByteArray QByteArray::left(int len)  const
 
 QByteArray QByteArray::right(int len) const
 {
-    if (len >= d->size)
+    if (len >= size())
         return *this;
     if (len < 0)
         len = 0;
-    return QByteArray(d->data() + d->size - len, len);
+    return QByteArray(end() - len, len);
 }
 
 /*!
@@ -3157,13 +3073,14 @@ QByteArray QByteArray::mid(int pos, int len) const
         return QByteArray();
     case QContainerImplHelper::Empty:
     {
-        QByteArrayDataPtr empty = { Data::allocate(0) };
+        auto alloc = Data::allocate(0);
+        QByteArray::DataPointer empty = { alloc.first, alloc.second, 0 };
         return QByteArray(empty);
     }
     case QContainerImplHelper::Full:
         return *this;
     case QContainerImplHelper::Subset:
-        return QByteArray(d->data() + pos, len);
+        return QByteArray(d.data() + pos, len);
     }
     Q_UNREACHABLE();
     return QByteArray();
@@ -3266,9 +3183,7 @@ QByteArray QByteArray::toUpper_helper(QByteArray &a)
 
 void QByteArray::clear()
 {
-    if (!d->ref.deref())
-        Data::deallocate(d);
-    d = Data::sharedNull();
+    d.clear();
 }
 
 #if !defined(QT_NO_DATASTREAM) || (defined(QT_BOOTSTRAPPED) && !defined(QT_BUILD_QMAKE))
@@ -3745,13 +3660,13 @@ QByteArray QByteArray::trimmed_helper(QByteArray &a)
 QByteArray QByteArray::leftJustified(int width, char fill, bool truncate) const
 {
     QByteArray result;
-    int len = d->size;
+    int len = size();
     int padlen = width - len;
     if (padlen > 0) {
         result.resize(len+padlen);
         if (len)
-            memcpy(result.d->data(), d->data(), len);
-        memset(result.d->data()+len, fill, padlen);
+            memcpy(result.d.data(), data(), len);
+        memset(result.d.data()+len, fill, padlen);
     } else {
         if (truncate)
             result = left(width);
@@ -3782,13 +3697,13 @@ QByteArray QByteArray::leftJustified(int width, char fill, bool truncate) const
 QByteArray QByteArray::rightJustified(int width, char fill, bool truncate) const
 {
     QByteArray result;
-    int len = d->size;
+    int len = size();
     int padlen = width - len;
     if (padlen > 0) {
         result.resize(len+padlen);
         if (len)
-            memcpy(result.d->data()+padlen, data(), len);
-        memset(result.d->data(), fill, padlen);
+            memcpy(result.d.data()+padlen, data(), len);
+        memset(result.d.data(), fill, padlen);
     } else {
         if (truncate)
             result = left(width);
@@ -3798,7 +3713,10 @@ QByteArray QByteArray::rightJustified(int width, char fill, bool truncate) const
     return result;
 }
 
-bool QByteArray::isNull() const { return d == QArrayData::sharedNull(); }
+bool QByteArray::isNull() const
+{
+    return d->isNull();
+}
 
 static qlonglong toIntegral_helper(const char *data, bool *ok, int base, qlonglong)
 {
@@ -4105,26 +4023,11 @@ float QByteArray::toFloat(bool *ok) const
 }
 
 /*!
-    Returns a copy of the byte array, encoded as Base64.
-
-    \snippet code/src_corelib_tools_qbytearray.cpp 39
-
-    The algorithm used to encode Base64-encoded data is defined in \l{RFC 4648}.
-
-    \sa fromBase64()
-*/
-QByteArray QByteArray::toBase64() const
-{
-    return toBase64(Base64Encoding);
-}
-
-/*!
     \since 5.2
-    \overload
 
     Returns a copy of the byte array, encoded using the options \a options.
 
-    \snippet code/src_corelib_tools_qbytearray.cpp 39bis
+    \snippet code/src_corelib_tools_qbytearray.cpp 39
 
     The algorithm used to encode Base64-encoded data is defined in \l{RFC 4648}.
 
@@ -4140,19 +4043,19 @@ QByteArray QByteArray::toBase64(Base64Options options) const
     const char padchar = '=';
     int padlen = 0;
 
-    QByteArray tmp((d->size + 2) / 3 * 4, Qt::Uninitialized);
+    QByteArray tmp((size() + 2) / 3 * 4, Qt::Uninitialized);
 
     int i = 0;
     char *out = tmp.data();
-    while (i < d->size) {
+    while (i < size()) {
         // encode 3 bytes at a time
         int chunk = 0;
-        chunk |= int(uchar(d->data()[i++])) << 16;
-        if (i == d->size) {
+        chunk |= int(uchar(data()[i++])) << 16;
+        if (i == size()) {
             padlen = 2;
         } else {
-            chunk |= int(uchar(d->data()[i++])) << 8;
-            if (i == d->size)
+            chunk |= int(uchar(data()[i++])) << 8;
+            if (i == size())
                 padlen = 1;
             else
                 chunk |= int(uchar(data()[i++]));
@@ -4482,17 +4385,14 @@ QByteArray QByteArray::number(double n, char f, int prec)
 
 QByteArray QByteArray::fromRawData(const char *data, int size)
 {
-    Data *x;
+    QByteArray::DataPointer x;
     if (!data) {
-        x = Data::sharedNull();
     } else if (!size) {
-        x = Data::allocate(0);
+        x = DataPointer(Data::allocate(0), 0);
     } else {
         x = Data::fromRawData(data, size);
-        Q_CHECK_PTR(x);
     }
-    QByteArrayDataPtr dataPtr = { x };
-    return QByteArray(dataPtr);
+    return QByteArray(x);
 }
 
 /*!
@@ -4511,17 +4411,15 @@ QByteArray QByteArray::fromRawData(const char *data, int size)
 */
 QByteArray &QByteArray::setRawData(const char *data, uint size)
 {
-    if (d->ref.isShared() || d->alloc) {
-        *this = fromRawData(data, size);
-    } else {
-        if (data) {
-            d->size = size;
-            d->offset = data - reinterpret_cast<char *>(d);
-        } else {
-            d->offset = sizeof(QByteArrayData);
-            d->size = 0;
-        }
+    if (!data || !size) {
+        clear();
     }
+//    else if (d->isShared() || (d->flags() & Data::RawDataType) == 0) {
+        *this = fromRawData(data, size);
+//    } else {
+//        d.size = size;
+//        d.data() = const_cast<char *>(data);
+//    }
     return *this;
 }
 
@@ -4657,32 +4555,7 @@ QByteArray::FromBase64Result QByteArray::fromBase64Encoding(const QByteArray &ba
 }
 
 /*!
-    \overload
-
-    Returns a decoded copy of the Base64 array \a base64. Input is not checked
-    for validity; invalid characters in the input are skipped, enabling the
-    decoding process to continue with subsequent characters.
-
-    For example:
-
-    \snippet code/src_corelib_tools_qbytearray.cpp 44
-
-    The algorithm used to decode Base64-encoded data is defined in \l{RFC 4648}.
-
-    \note The fromBase64Encoding() function is recommended in new code.
-
-    \sa toBase64(), fromBase64Encoding()
-*/
-QByteArray QByteArray::fromBase64(const QByteArray &base64)
-{
-    if (auto result = fromBase64Encoding(base64, Base64Encoding))
-        return std::move(result.decoded);
-    return QByteArray();
-}
-
-/*!
     \since 5.2
-    \overload
 
     Returns a decoded copy of the Base64 array \a base64, using the options
     defined by \a options. If \a options contains \c{IgnoreBase64DecodingErrors}
@@ -4694,7 +4567,7 @@ QByteArray QByteArray::fromBase64(const QByteArray &base64)
 
     For example:
 
-    \snippet code/src_corelib_tools_qbytearray.cpp 44bis
+    \snippet code/src_corelib_tools_qbytearray.cpp 44
 
     The algorithm used to decode Base64-encoded data is defined in \l{RFC 4648}.
 
@@ -4748,21 +4621,7 @@ QByteArray QByteArray::fromHex(const QByteArray &hexEncoded)
     return res;
 }
 
-/*!
-    Returns a hex encoded copy of the byte array. The hex encoding uses the numbers 0-9 and
-    the letters a-f.
-
-    \sa fromHex()
-*/
-QByteArray QByteArray::toHex() const
-{
-    return toHex('\0');
-}
-
-/*! \overload
-    \since 5.9
-
-    Returns a hex encoded copy of the byte array. The hex encoding uses the numbers 0-9 and
+/*! Returns a hex encoded copy of the byte array. The hex encoding uses the numbers 0-9 and
     the letters a-f.
 
     If \a separator is not '\0', the separator character is inserted between the hex bytes.
@@ -4770,18 +4629,19 @@ QByteArray QByteArray::toHex() const
     Example:
     \snippet code/src_corelib_tools_qbytearray.cpp 50
 
+    \since 5.9
     \sa fromHex()
 */
 QByteArray QByteArray::toHex(char separator) const
 {
-    if (!d->size)
+    if (isEmpty())
         return QByteArray();
 
-    const int length = separator ? (d->size * 3 - 1) : (d->size * 2);
+    const int length = separator ? (size() * 3 - 1) : (size() * 2);
     QByteArray hex(length, Qt::Uninitialized);
     char *hexData = hex.data();
-    const uchar *data = (const uchar *)d->data();
-    for (int i = 0, o = 0; i < d->size; ++i) {
+    const uchar *data = (const uchar *)this->data();
+    for (int i = 0, o = 0; i < size(); ++i) {
         hexData[o++] = QtMiscUtils::toHexLower(data[i] >> 4);
         hexData[o++] = QtMiscUtils::toHexLower(data[i] & 0xf);
 
@@ -5093,42 +4953,6 @@ QByteArray QByteArray::toPercentEncoding(const QByteArray &exclude, const QByteA
     \sa QStringLiteral
 */
 
-namespace QtPrivate {
-namespace DeprecatedRefClassBehavior {
-void warn(WarningType w, EmittingClass c)
-{
-    static const char deprecatedBehaviorString[] =
-            "The corresponding behavior is deprecated, and will be changed"
-             " in a future version of Qt.";
-
-    const char *emittingClassName = nullptr;
-    const char *containerClassName = nullptr;
-
-    switch (c) {
-    case EmittingClass::QByteRef:
-        emittingClassName = "QByteRef";
-        containerClassName = "QByteArray";
-        break;
-    case EmittingClass::QCharRef:
-        emittingClassName = "QCharRef";
-        containerClassName = "QString";
-        break;
-    }
-
-    switch (w) {
-    case WarningType::OutOfRange:
-        qWarning("Using %s with an index pointing outside the valid range of a %s. %s",
-                 emittingClassName, containerClassName, deprecatedBehaviorString);
-        break;
-    case WarningType::DelayedDetach:
-        qWarning("Using %s with on a %s that is not already detached. %s",
-                 emittingClassName, containerClassName, deprecatedBehaviorString);
-        break;
-    }
-}
-} // namespace DeprecatedRefClassBehavior
-} // namespace QtPrivate
-
 /*!
     \class QByteArray::FromBase64Result
     \inmodule QtCore
diff --git a/src/corelib/text/qbytearray.h b/src/corelib/text/qbytearray.h
index 36cf580cd9..e3fec1e62c 100644
--- a/src/corelib/text/qbytearray.h
+++ b/src/corelib/text/qbytearray.h
@@ -44,6 +44,8 @@
 #include <QtCore/qrefcount.h>
 #include <QtCore/qnamespace.h>
 #include <QtCore/qarraydata.h>
+#include <QtCore/qarraydatapointer.h>
+#include <QtCore/qcontainerfwd.h>
 
 #include <stdlib.h>
 #include <string.h>
@@ -106,48 +108,23 @@ Q_CORE_EXPORT int qvsnprintf(char *str, size_t n, const char *fmt, va_list ap);
 Q_CORE_EXPORT int qsnprintf(char *str, size_t n, const char *fmt, ...);
 
 // qChecksum: Internet checksum
-Q_CORE_EXPORT quint16 qChecksum(const char *s, uint len);                            // ### Qt 6: Remove
-Q_CORE_EXPORT quint16 qChecksum(const char *s, uint len, Qt::ChecksumType standard); // ### Qt 6: Use Qt::ChecksumType standard = Qt::ChecksumIso3309
+Q_CORE_EXPORT quint16 qChecksum(const char *s, uint len,
+                                Qt::ChecksumType standard = Qt::ChecksumIso3309);
 
-class QByteRef;
 class QString;
 class QDataStream;
-template <typename T> class QList;
 
-typedef QArrayData QByteArrayData;
-
-template<int N> struct QStaticByteArrayData
-{
-    QByteArrayData ba;
-    char data[N + 1];
-
-    QByteArrayData *data_ptr() const
-    {
-        Q_ASSERT(ba.ref.isStatic());
-        return const_cast<QByteArrayData *>(&ba);
-    }
-};
-
-struct QByteArrayDataPtr
-{
-    QByteArrayData *ptr;
-};
-
-#define Q_STATIC_BYTE_ARRAY_DATA_HEADER_INITIALIZER_WITH_OFFSET(size, offset) \
-    Q_STATIC_ARRAY_DATA_HEADER_INITIALIZER_WITH_OFFSET(size, offset)
-    /**/
-
-#define Q_STATIC_BYTE_ARRAY_DATA_HEADER_INITIALIZER(size) \
-    Q_STATIC_BYTE_ARRAY_DATA_HEADER_INITIALIZER_WITH_OFFSET(size, sizeof(QByteArrayData)) \
-    /**/
+using QByteArrayData = QArrayDataPointer<char>;
 
 #  define QByteArrayLiteral(str) \
     ([]() -> QByteArray { \
         enum { Size = sizeof(str) - 1 }; \
-        static const QStaticByteArrayData<Size> qbytearray_literal = { \
-            Q_STATIC_BYTE_ARRAY_DATA_HEADER_INITIALIZER(Size), \
-            str }; \
-        QByteArrayDataPtr holder = { qbytearray_literal.data_ptr() }; \
+        static const QArrayData qbytearray_literal = { \
+            Q_BASIC_ATOMIC_INITIALIZER(-1), QArrayData::StaticDataFlags, 0 }; \
+        QByteArrayData holder = { \
+            static_cast<QTypedArrayData<char> *>(const_cast<QArrayData *>(&qbytearray_literal)), \
+            const_cast<char *>(str), \
+            Size }; \
         const QByteArray ba(holder); \
         return ba; \
     }()) \
@@ -155,10 +132,14 @@ struct QByteArrayDataPtr
 
 class Q_CORE_EXPORT QByteArray
 {
+public:
+    using DataPointer = QByteArrayData;
 private:
     typedef QTypedArrayData<char> Data;
 
+    DataPointer d;
 public:
+
     enum Base64Option {
         Base64Encoding = 0,
         Base64UrlEncoding = 1,
@@ -187,14 +168,13 @@ public:
 
     QByteArray &operator=(const QByteArray &) noexcept;
     QByteArray &operator=(const char *str);
-    inline QByteArray(QByteArray && other) noexcept : d(other.d) { other.d = Data::sharedNull(); }
+    inline QByteArray(QByteArray && other) noexcept
+    { qSwap(d, other.d); }
     inline QByteArray &operator=(QByteArray &&other) noexcept
     { qSwap(d, other.d); return *this; }
-
     inline void swap(QByteArray &other) noexcept
     { qSwap(d, other.d); }
 
-    inline int size() const;
     inline bool isEmpty() const;
     void resize(int size);
 
@@ -213,18 +193,17 @@ public:
     inline const char *constData() const;
     inline void detach();
     inline bool isDetached() const;
-    inline bool isSharedWith(const QByteArray &other) const { return d == other.d; }
+    inline bool isSharedWith(const QByteArray &other) const
+    { return data() == other.data() && size() == other.size(); }
     void clear();
 
     inline char at(int i) const;
     inline char operator[](int i) const;
-    inline char operator[](uint i) const;
-    Q_REQUIRED_RESULT inline QByteRef operator[](int i);
-    Q_REQUIRED_RESULT inline QByteRef operator[](uint i);
+    Q_REQUIRED_RESULT inline char &operator[](int i);
     Q_REQUIRED_RESULT char front() const { return at(0); }
-    Q_REQUIRED_RESULT inline QByteRef front();
+    Q_REQUIRED_RESULT inline char &front();
     Q_REQUIRED_RESULT char back() const { return at(size() - 1); }
-    Q_REQUIRED_RESULT inline QByteRef back();
+    Q_REQUIRED_RESULT inline char &back();
 
     int indexOf(char c, int from = 0) const;
     int indexOf(const char *c, int from = 0) const;
@@ -365,10 +344,8 @@ public:
     qulonglong toULongLong(bool *ok = nullptr, int base = 10) const;
     float toFloat(bool *ok = nullptr) const;
     double toDouble(bool *ok = nullptr) const;
-    QByteArray toBase64(Base64Options options) const;
-    QByteArray toBase64() const; // ### Qt6 merge with previous
-    QByteArray toHex() const;
-    QByteArray toHex(char separator) const; // ### Qt6 merge with previous
+    QByteArray toBase64(Base64Options options = Base64Encoding) const;
+    QByteArray toHex(char separator = '\0') const;
     QByteArray toPercentEncoding(const QByteArray &exclude = QByteArray(),
                                  const QByteArray &include = QByteArray(),
                                  char percent = '%') const;
@@ -393,8 +370,7 @@ public:
     class FromBase64Result;
     Q_REQUIRED_RESULT static FromBase64Result fromBase64Encoding(QByteArray &&base64, Base64Options options = Base64Encoding);
     Q_REQUIRED_RESULT static FromBase64Result fromBase64Encoding(const QByteArray &base64, Base64Options options = Base64Encoding);
-    Q_REQUIRED_RESULT static QByteArray fromBase64(const QByteArray &base64, Base64Options options);
-    Q_REQUIRED_RESULT static QByteArray fromBase64(const QByteArray &base64); // ### Qt6 merge with previous
+    Q_REQUIRED_RESULT static QByteArray fromBase64(const QByteArray &base64, Base64Options options = Base64Encoding);
     Q_REQUIRED_RESULT static QByteArray fromHex(const QByteArray &hexEncoded);
     Q_REQUIRED_RESULT static QByteArray fromPercentEncoding(const QByteArray &pctEncoded, char percent = '%');
 
@@ -449,19 +425,20 @@ public:
     static inline QByteArray fromStdString(const std::string &s);
     inline std::string toStdString() const;
 
-    inline int count() const { return d->size; }
-    int length() const { return d->size; }
+    inline int size() const { return d->size; }
+    inline int count() const { return size(); }
+    inline int length() const { return size(); }
     bool isNull() const;
 
-    inline QByteArray(QByteArrayDataPtr dd)
-        : d(static_cast<Data *>(dd.ptr))
+    inline DataPointer &data_ptr() { return d; }
+    explicit inline QByteArray(const DataPointer &dd)
+        : d(dd)
     {
     }
 
 private:
     operator QNoImplicitBoolCast() const;
-    Data *d;
-    void reallocData(uint alloc, Data::AllocationOptions options);
+    void reallocData(uint alloc, Data::ArrayOptions options);
     void expand(int i);
     QByteArray nulTerminated() const;
 
@@ -474,171 +451,86 @@ private:
     static QByteArray simplified_helper(const QByteArray &a);
     static QByteArray simplified_helper(QByteArray &a);
 
-    friend class QByteRef;
     friend class QString;
     friend Q_CORE_EXPORT QByteArray qUncompress(const uchar *data, int nbytes);
-public:
-    typedef Data * DataPtr;
-    inline DataPtr &data_ptr() { return d; }
 };
 
 Q_DECLARE_OPERATORS_FOR_FLAGS(QByteArray::Base64Options)
 
-inline QByteArray::QByteArray() noexcept : d(Data::sharedNull()) { }
-inline QByteArray::~QByteArray() { if (!d->ref.deref()) Data::deallocate(d); }
-inline int QByteArray::size() const
-{ return d->size; }
+inline QByteArray::QByteArray() noexcept {}
+inline QByteArray::~QByteArray() {}
 
 inline char QByteArray::at(int i) const
-{ Q_ASSERT(uint(i) < uint(size())); return d->data()[i]; }
+{ Q_ASSERT(uint(i) < uint(size())); return d.data()[i]; }
 inline char QByteArray::operator[](int i) const
-{ Q_ASSERT(uint(i) < uint(size())); return d->data()[i]; }
-inline char QByteArray::operator[](uint i) const
-{ Q_ASSERT(i < uint(size())); return d->data()[i]; }
+{ Q_ASSERT(uint(i) < uint(size())); return d.data()[i]; }
 
 inline bool QByteArray::isEmpty() const
-{ return d->size == 0; }
+{ return size() == 0; }
 #ifndef QT_NO_CAST_FROM_BYTEARRAY
 inline QByteArray::operator const char *() const
-{ return d->data(); }
+{ return data(); }
 inline QByteArray::operator const void *() const
-{ return d->data(); }
+{ return data(); }
 #endif
 inline char *QByteArray::data()
-{ detach(); return d->data(); }
+{ detach(); return d.data(); }
 inline const char *QByteArray::data() const
-{ return d->data(); }
+{ return d.data(); }
 inline const char *QByteArray::constData() const
-{ return d->data(); }
+{ return d.data(); }
 inline void QByteArray::detach()
-{ if (d->ref.isShared() || (d->offset != sizeof(QByteArrayData))) reallocData(uint(d->size) + 1u, d->detachFlags()); }
+{ if (d->needsDetach()) reallocData(uint(size()) + 1u, d->detachFlags()); }
 inline bool QByteArray::isDetached() const
-{ return !d->ref.isShared(); }
+{ return !d->isShared(); }
 inline QByteArray::QByteArray(const QByteArray &a) noexcept : d(a.d)
-{ d->ref.ref(); }
+{}
 
 inline int QByteArray::capacity() const
-{ return d->alloc ? d->alloc - 1 : 0; }
+{ const auto realCapacity = d->constAllocatedCapacity(); return realCapacity ? int(realCapacity) - 1 : 0; }
 
 inline void QByteArray::reserve(int asize)
 {
-    if (d->ref.isShared() || uint(asize) + 1u > d->alloc) {
+    if (d->needsDetach() || asize > capacity()) {
         reallocData(qMax(uint(size()), uint(asize)) + 1u, d->detachFlags() | Data::CapacityReserved);
     } else {
-        // cannot set unconditionally, since d could be the shared_null or
-        // otherwise static
-        d->capacityReserved = true;
+        d->flags() |= Data::CapacityReserved;
     }
 }
 
 inline void QByteArray::squeeze()
 {
-    if (d->ref.isShared() || uint(d->size) + 1u < d->alloc) {
-        reallocData(uint(d->size) + 1u, d->detachFlags() & ~Data::CapacityReserved);
+    if ((d->flags() & Data::CapacityReserved) == 0)
+        return;
+    if (d->needsDetach() || size() < capacity()) {
+        reallocData(uint(size()) + 1u, d->detachFlags() & ~Data::CapacityReserved);
     } else {
-        // cannot set unconditionally, since d could be shared_null or
-        // otherwise static.
-        d->capacityReserved = false;
+        d->flags() &= uint(~Data::CapacityReserved);
     }
 }
 
-namespace QtPrivate {
-namespace DeprecatedRefClassBehavior {
-    enum class EmittingClass {
-        QByteRef,
-        QCharRef,
-    };
-
-    enum class WarningType {
-        OutOfRange,
-        DelayedDetach,
-    };
-
-    Q_CORE_EXPORT Q_DECL_COLD_FUNCTION void warn(WarningType w, EmittingClass c);
-} // namespace DeprecatedAssignmentOperatorBehavior
-} // namespace QtPrivate
-
-class
-#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
-Q_CORE_EXPORT
-#endif
-QByteRef {  // ### Qt 7: remove
-    QByteArray &a;
-    int i;
-    inline QByteRef(QByteArray &array, int idx)
-        : a(array),i(idx) {}
-    friend class QByteArray;
-public:
-    inline operator char() const
-    {
-        using namespace QtPrivate::DeprecatedRefClassBehavior;
-        if (Q_LIKELY(i < a.d->size))
-            return a.d->data()[i];
-#ifdef QT_DEBUG
-        warn(WarningType::OutOfRange, EmittingClass::QByteRef);
-#endif
-        return char(0);
-    }
-    inline QByteRef &operator=(char c)
-    {
-        using namespace QtPrivate::DeprecatedRefClassBehavior;
-        if (Q_UNLIKELY(i >= a.d->size)) {
-#ifdef QT_DEBUG
-            warn(WarningType::OutOfRange, EmittingClass::QByteRef);
-#endif
-            a.expand(i);
-        } else {
-#ifdef QT_DEBUG
-            if (Q_UNLIKELY(!a.isDetached()))
-                warn(WarningType::DelayedDetach, EmittingClass::QByteRef);
-#endif
-            a.detach();
-        }
-        a.d->data()[i] = c;
-        return *this;
-    }
-    inline QByteRef &operator=(const QByteRef &c)
-    {
-        return operator=(char(c));
-    }
-    inline bool operator==(char c) const
-    { return a.d->data()[i] == c; }
-    inline bool operator!=(char c) const
-    { return a.d->data()[i] != c; }
-    inline bool operator>(char c) const
-    { return a.d->data()[i] > c; }
-    inline bool operator>=(char c) const
-    { return a.d->data()[i] >= c; }
-    inline bool operator<(char c) const
-    { return a.d->data()[i] < c; }
-    inline bool operator<=(char c) const
-    { return a.d->data()[i] <= c; }
-};
-
-inline QByteRef QByteArray::operator[](int i)
-{ Q_ASSERT(i >= 0); detach(); return QByteRef(*this, i); }
-inline QByteRef QByteArray::operator[](uint i)
-{  detach(); return QByteRef(*this, i); }
-inline QByteRef QByteArray::front() { return operator[](0); }
-inline QByteRef QByteArray::back() { return operator[](size() - 1); }
+inline char &QByteArray::operator[](int i)
+{ Q_ASSERT(i >= 0 && i < size()); return data()[i]; }
+inline char &QByteArray::front() { return operator[](0); }
+inline char &QByteArray::back() { return operator[](size() - 1); }
 inline QByteArray::iterator QByteArray::begin()
-{ detach(); return d->data(); }
+{ return data(); }
 inline QByteArray::const_iterator QByteArray::begin() const
-{ return d->data(); }
+{ return data(); }
 inline QByteArray::const_iterator QByteArray::cbegin() const
-{ return d->data(); }
+{ return data(); }
 inline QByteArray::const_iterator QByteArray::constBegin() const
-{ return d->data(); }
+{ return data(); }
 inline QByteArray::iterator QByteArray::end()
-{ detach(); return d->data() + d->size; }
+{ return data() + size(); }
 inline QByteArray::const_iterator QByteArray::end() const
-{ return d->data() + d->size; }
+{ return data() + size(); }
 inline QByteArray::const_iterator QByteArray::cend() const
-{ return d->data() + d->size; }
+{ return data() + size(); }
 inline QByteArray::const_iterator QByteArray::constEnd() const
-{ return d->data() + d->size; }
+{ return data() + size(); }
 inline QByteArray &QByteArray::append(int n, char ch)
-{ return insert(d->size, n, ch); }
+{ return insert(size(), n, ch); }
 inline QByteArray &QByteArray::prepend(int n, char ch)
 { return insert(0, n, ch); }
 inline QByteArray &QByteArray::operator+=(char c)
diff --git a/src/corelib/text/qbytearray_p.h b/src/corelib/text/qbytearray_p.h
index 3c6257f786..d6a5e277b3 100644
--- a/src/corelib/text/qbytearray_p.h
+++ b/src/corelib/text/qbytearray_p.h
@@ -58,7 +58,7 @@ QT_BEGIN_NAMESPACE
 
 enum {
     // Define as enum to force inlining. Don't expose MaxAllocSize in a public header.
-    MaxByteArraySize = MaxAllocSize - sizeof(std::remove_pointer<QByteArray::DataPtr>::type)
+    MaxByteArraySize = MaxAllocSize - sizeof(std::remove_pointer<QByteArray::DataPointer>::type)
 };
 
 QT_END_NAMESPACE
diff --git a/src/corelib/text/qbytearraylist.h b/src/corelib/text/qbytearraylist.h
index 0250b649b8..d02fa6d20f 100644
--- a/src/corelib/text/qbytearraylist.h
+++ b/src/corelib/text/qbytearraylist.h
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include <QtCore/qlist.h>
+#include <QtCore/qvector.h>
 
 #ifndef QBYTEARRAYLIST_H
 #define QBYTEARRAYLIST_H
@@ -49,12 +49,12 @@
 QT_BEGIN_NAMESPACE
 
 #if !defined(QT_NO_JAVA_STYLE_ITERATORS)
-typedef QListIterator<QByteArray> QByteArrayListIterator;
-typedef QMutableListIterator<QByteArray> QMutableByteArrayListIterator;
+typedef QVectorIterator<QByteArray> QByteArrayListIterator;
+typedef QMutableVectorIterator<QByteArray> QMutableByteArrayListIterator;
 #endif
 
 #ifndef Q_CLANG_QDOC
-typedef QList<QByteArray> QByteArrayList;
+typedef QVector<QByteArray> QByteArrayList;
 
 namespace QtPrivate {
     QByteArray Q_CORE_EXPORT QByteArrayList_join(const QByteArrayList *that, const char *separator, int separatorLength);
@@ -63,14 +63,14 @@ namespace QtPrivate {
 #endif
 
 #ifdef Q_CLANG_QDOC
-class QByteArrayList : public QList<QByteArray>
+class QByteArrayList : public QVector<QByteArray>
 #else
-template <> struct QListSpecialMethods<QByteArray>
+template <> struct QVectorSpecialMethods<QByteArray>
 #endif
 {
 #ifndef Q_CLANG_QDOC
 protected:
-    ~QListSpecialMethods() = default;
+    ~QVectorSpecialMethods() = default;
 #endif
 public:
     inline QByteArray join() const
@@ -80,11 +80,8 @@ public:
     inline QByteArray join(char sep) const
     { return QtPrivate::QByteArrayList_join(self(), &sep, 1); }
 
-    inline int indexOf(const char *needle, int from = 0) const
-    { return QtPrivate::QByteArrayList_indexOf(self(), needle, from); }
-
 private:
-    typedef QList<QByteArray> Self;
+    typedef QVector<QByteArray> Self;
     Self *self() { return static_cast<Self *>(this); }
     const Self *self() const { return static_cast<const Self *>(this); }
 };
diff --git a/src/corelib/text/qbytearraymatcher.h b/src/corelib/text/qbytearraymatcher.h
index 0eedfc1d20..7cc5037095 100644
--- a/src/corelib/text/qbytearraymatcher.h
+++ b/src/corelib/text/qbytearraymatcher.h
@@ -85,7 +85,7 @@ private:
 
 class QStaticByteArrayMatcherBase
 {
-    Q_DECL_ALIGN(16)
+    alignas(16)
     struct Skiptable {
         uchar data[256];
     } m_skiptable;
diff --git a/src/corelib/text/qchar.h b/src/corelib/text/qchar.h
index a3d5d7a65e..9d0741af8b 100644
--- a/src/corelib/text/qchar.h
+++ b/src/corelib/text/qchar.h
@@ -439,7 +439,6 @@ public:
         Unicode_12_0,
         Unicode_12_1
     };
-    // ****** WHEN ADDING FUNCTIONS, CONSIDER ADDING TO QCharRef TOO
 
     inline Category category() const noexcept { return QChar::category(ucs); }
     inline Direction direction() const noexcept { return QChar::direction(ucs); }
diff --git a/src/corelib/text/qlocale.cpp b/src/corelib/text/qlocale.cpp
index 6e33e27276..9e3043046d 100644
--- a/src/corelib/text/qlocale.cpp
+++ b/src/corelib/text/qlocale.cpp
@@ -661,9 +661,8 @@ static QLocalePrivate *c_private()
 }
 
 static const QLocaleData *systemData();
-static QLocale::NumberOptions system_number_options = QLocale::DefaultNumberOptions;
 Q_GLOBAL_STATIC_WITH_ARGS(QExplicitlySharedDataPointer<QLocalePrivate>, systemLocalePrivate,
-                          (QLocalePrivate::create(systemData(), system_number_options)))
+                          (QLocalePrivate::create(systemData())))
 
 #ifndef QT_NO_SYSTEMLOCALE
 /******************************************************************************
@@ -724,14 +723,11 @@ static void updateSystemPrivate()
 
     // Populate global with fallback as basis:
     globalLocaleData = *sys_locale->fallbackUiLocaleData();
-    system_number_options = QLocale::DefaultNumberOptions;
 
     QVariant res = sys_locale->query(QSystemLocale::LanguageId, QVariant());
     if (!res.isNull()) {
         globalLocaleData.m_language_id = res.toInt();
         globalLocaleData.m_script_id = QLocale::AnyScript; // default for compatibility
-        if (globalLocaleData.m_language_id == QLocale::C)
-            system_number_options = QLocale::OmitGroupSeparator;
     }
     res = sys_locale->query(QSystemLocale::CountryId, QVariant());
     if (!res.isNull()) {
@@ -742,46 +738,7 @@ static void updateSystemPrivate()
     if (!res.isNull())
         globalLocaleData.m_script_id = res.toInt();
 
-    res = sys_locale->query(QSystemLocale::DecimalPoint, QVariant());
-    if (!res.isNull() && !res.toString().isEmpty())
-        globalLocaleData.m_decimal = res.toString().at(0).unicode();
-
-    // System may supply empty group separator to say we should omit grouping;
-    // and it makes no sense to use the same separator for decimal and grouping
-    // (which might happen by system supplying, as decimal, what CLDR has given
-    // us for grouping; or the other way round). Assume, at least, that each of
-    // system and CLDR has decimal != group, all the same.
-    res = sys_locale->query(QSystemLocale::GroupSeparator, QVariant());
-    if (res.isNull()) {
-        // The case where system over-rides decimal but not group, and its
-        // decimal clashes with CLDR's group.
-        if (globalLocaleData.m_group == globalLocaleData.m_decimal)
-            system_number_options |= QLocale::OmitGroupSeparator;
-    } else if (res.toString().isEmpty()) {
-        system_number_options |= QLocale::OmitGroupSeparator;
-    } else {
-        const ushort group = res.toString().at(0).unicode();
-        if (group != globalLocaleData.m_decimal)
-            globalLocaleData.m_group = group;
-        else if (group == globalLocaleData.m_group)
-            qWarning("System-supplied decimal and grouping character are both 0x%hx", group);
-    }
-
-    res = sys_locale->query(QSystemLocale::ZeroDigit, QVariant());
-    if (!res.isNull() && !res.toString().isEmpty())
-        globalLocaleData.m_zero = res.toString().at(0).unicode();
-
-    res = sys_locale->query(QSystemLocale::NegativeSign, QVariant());
-    if (!res.isNull() && !res.toString().isEmpty())
-        globalLocaleData.m_minus = res.toString().at(0).unicode();
-
-    res = sys_locale->query(QSystemLocale::PositiveSign, QVariant());
-    if (!res.isNull() && !res.toString().isEmpty())
-        globalLocaleData.m_plus = res.toString().at(0).unicode();
-
-    if (systemLocalePrivate.exists())
-        systemLocalePrivate->data()->m_numberOptions = system_number_options;
-    // else: system_number_options will be passed to create() when constructing.
+    // Should we replace Any values based on likely sub-tags ?
 }
 #endif // !QT_NO_SYSTEMLOCALE
 
@@ -821,28 +778,6 @@ const QLocaleData *QLocaleData::c()
     return c_data;
 }
 
-static inline QString getLocaleData(const ushort *data, int size)
-{
-    return size > 0 ? QString::fromRawData(reinterpret_cast<const QChar *>(data), size) : QString();
-}
-
-static QString getLocaleListData(const ushort *data, int size, int index)
-{
-    static const ushort separator = ';';
-    while (index && size > 0) {
-        while (*data != separator)
-            ++data, --size;
-        --index;
-        ++data;
-        --size;
-    }
-    const ushort *end = data;
-    while (size > 0 && *end != separator)
-        ++end, --size;
-    return getLocaleData(data, end - data);
-}
-
-
 #ifndef QT_NO_DATASTREAM
 QDataStream &operator<<(QDataStream &ds, const QLocale &l)
 {
@@ -897,6 +832,97 @@ static QLocalePrivate *findLocalePrivate(QLocale::Language language, QLocale::Sc
     return QLocalePrivate::create(data, offset, numberOptions);
 }
 
+QString QLocaleData::decimalPoint() const
+{
+#ifndef QT_NO_SYSTEMLOCALE
+    if (this == systemData()) {
+        QVariant res = systemLocale()->query(QSystemLocale::DecimalPoint, QVariant());
+        if (!res.isNull())
+            return res.toString();
+    }
+#endif
+    return decimalSeparator().getData(single_character_data);
+}
+
+QString QLocaleData::groupSeparator() const
+{
+#ifndef QT_NO_SYSTEMLOCALE
+    if (this == systemData()) {
+        QVariant res = systemLocale()->query(QSystemLocale::GroupSeparator, QVariant());
+        if (!res.isNull())
+            return res.toString();
+    }
+#endif
+    return groupDelim().getData(single_character_data);
+}
+
+QString QLocaleData::percentSign() const
+{
+    return percent().getData(single_character_data);
+}
+
+QString QLocaleData::listSeparator() const
+{
+    return listDelimit().getData(single_character_data);
+}
+
+QString QLocaleData::zeroDigit() const
+{
+#ifndef QT_NO_SYSTEMLOCALE
+    if (this == systemData()) {
+        QVariant res = systemLocale()->query(QSystemLocale::ZeroDigit, QVariant());
+        if (!res.isNull())
+            return res.toString();
+    }
+#endif
+    return zero().getData(single_character_data);
+}
+
+uint QLocaleData::zeroUcs() const
+{
+#ifndef QT_NO_SYSTEMLOCALE
+    if (this == systemData()) {
+        QVariant res = systemLocale()->query(QSystemLocale::ZeroDigit, QVariant());
+        if (!res.isNull()) {
+            const QString text = res.toString();
+            if (text.size() == 1 && !text.at(0).isSurrogate())
+                return text.at(0).unicode();
+            if (text.size() == 2 && text.at(0).isHighSurrogate())
+                return QChar::surrogateToUcs4(text.at(0), text.at(1));
+        }
+    }
+#endif
+    return zero().ucsFirst(single_character_data);
+}
+
+QString QLocaleData::negativeSign() const
+{
+#ifndef QT_NO_SYSTEMLOCALE
+    if (this == systemData()) {
+        QVariant res = systemLocale()->query(QSystemLocale::NegativeSign, QVariant());
+        if (!res.isNull())
+            return res.toString();
+    }
+#endif
+    return minus().getData(single_character_data);
+}
+
+QString QLocaleData::positiveSign() const
+{
+#ifndef QT_NO_SYSTEMLOCALE
+    if (this == systemData()) {
+        QVariant res = systemLocale()->query(QSystemLocale::PositiveSign, QVariant());
+        if (!res.isNull())
+            return res.toString();
+    }
+#endif
+    return plus().getData(single_character_data);
+}
+
+QString QLocaleData::exponentSeparator() const
+{
+    return exponential().getData(single_character_data);
+}
 
 /*!
  \internal
@@ -1132,11 +1158,16 @@ QString QLocale::quoteString(const QStringRef &str, QuotationStyle style) const
     }
 #endif
 
-    if (style == QLocale::StandardQuotation)
-        return QChar(d->m_data->m_quotation_start) % str % QChar(d->m_data->m_quotation_end);
+    QLocaleData::DataRange start, end;
+    if (style == QLocale::StandardQuotation) {
+        start = d->m_data->quoteStart();
+        end = d->m_data->quoteEnd();
+    } else {
+        start = d->m_data->quoteStartAlternate();
+        end = d->m_data->quoteEndAlternate();
+    }
 
-    return QChar(d->m_data->m_alternate_quotation_start)
-        % str % QChar(d->m_data->m_alternate_quotation_end);
+    return start.viewData(single_character_data) % str % end.viewData(single_character_data);
 }
 
 /*!
@@ -1158,31 +1189,24 @@ QString QLocale::createSeparatedList(const QStringList &list) const
 #endif
 
     const int size = list.size();
-    if (size == 1) {
+    if (size < 1)
+        return QString();
+
+    if (size == 1)
         return list.at(0);
-    } else if (size == 2) {
-        QString format = getLocaleData(
-            list_pattern_part_data + d->m_data->m_list_pattern_part_two_idx,
-            d->m_data->m_list_pattern_part_two_size);
-        return format.arg(list.at(0), list.at(1));
-    } else if (size > 2) {
-        QString formatStart = getLocaleData(
-            list_pattern_part_data + d->m_data->m_list_pattern_part_start_idx,
-            d->m_data->m_list_pattern_part_start_size);
-        QString formatMid = getLocaleData(
-            list_pattern_part_data + d->m_data->m_list_pattern_part_mid_idx,
-            d->m_data->m_list_pattern_part_mid_size);
-        QString formatEnd = getLocaleData(
-            list_pattern_part_data + d->m_data->m_list_pattern_part_end_idx,
-            d->m_data->m_list_pattern_part_end_size);
-        QString result = formatStart.arg(list.at(0), list.at(1));
-        for (int i = 2; i < size - 1; ++i)
-            result = formatMid.arg(result, list.at(i));
-        result = formatEnd.arg(result, list.at(size - 1));
-        return result;
-    }
 
-    return QString();
+    if (size == 2)
+        return d->m_data->pairListPattern().getData(
+            list_pattern_part_data).arg(list.at(0), list.at(1));
+
+    QStringView formatStart = d->m_data->startListPattern().viewData(list_pattern_part_data);
+    QStringView formatMid = d->m_data->midListPattern().viewData(list_pattern_part_data);
+    QStringView formatEnd = d->m_data->endListPattern().viewData(list_pattern_part_data);
+    QString result = formatStart.arg(list.at(0), list.at(1));
+    for (int i = 2; i < size - 1; ++i)
+        result = formatMid.arg(result, list.at(i));
+    result = formatEnd.arg(result, list.at(size - 1));
+    return result;
 }
 
 /*!
@@ -2030,7 +2054,7 @@ QString QLocale::toString(qulonglong i) const
     \sa QDate::toString()
 */
 
-QString QLocale::toString(const QDate &date, const QString &format) const
+QString QLocale::toString(QDate date, const QString &format) const
 {
     return QCalendar().dateTimeToString(format, QDateTime(), date, QTime(), *this);
 }
@@ -2045,7 +2069,7 @@ QString QLocale::toString(const QDate &date, const QString &format) const
 
     \sa QDate::toString()
 */
-QString QLocale::toString(const QDate &date, QStringView format) const
+QString QLocale::toString(QDate date, QStringView format) const
 {
     return QCalendar().dateTimeToString(format, QDateTime(), date, QTime(), *this);
 }
@@ -2058,7 +2082,7 @@ QString QLocale::toString(const QDate &date, QStringView format) const
     represent.
 */
 
-QString QLocale::toString(const QDate &date, FormatType format) const
+QString QLocale::toString(QDate date, FormatType format) const
 {
     if (!date.isValid())
         return QString();
@@ -2103,7 +2127,7 @@ static bool timeFormatContainsAP(QStringView format)
 
     \sa QTime::toString()
 */
-QString QLocale::toString(const QTime &time, const QString &format) const
+QString QLocale::toString(QTime time, const QString &format) const
 {
     return QCalendar().dateTimeToString(format, QDateTime(), QDate(), time, *this);
 }
@@ -2118,7 +2142,7 @@ QString QLocale::toString(const QTime &time, const QString &format) const
 
     \sa QTime::toString()
 */
-QString QLocale::toString(const QTime &time, QStringView format) const
+QString QLocale::toString(QTime time, QStringView format) const
 {
     return QCalendar().dateTimeToString(format, QDateTime(), QDate(), time, *this);
 }
@@ -2154,12 +2178,12 @@ QString QLocale::toString(const QDateTime &dateTime, QStringView format) const
     return QCalendar().dateTimeToString(format, dateTime, QDate(), QTime(), *this);
 }
 
-QString QLocale::toString(const QDate &date, QStringView format, QCalendar cal) const
+QString QLocale::toString(QDate date, QStringView format, QCalendar cal) const
 {
     return cal.dateTimeToString(format, QDateTime(), date, QTime(), *this);
 }
 
-QString QLocale::toString(const QDate &date, QLocale::FormatType format, QCalendar cal) const
+QString QLocale::toString(QDate date, QLocale::FormatType format, QCalendar cal) const
 {
     if (!date.isValid())
         return QString();
@@ -2241,7 +2265,7 @@ QString QLocale::toString(const QDateTime &dateTime, FormatType format) const
     specified \a format.
 */
 
-QString QLocale::toString(const QTime &time, FormatType format) const
+QString QLocale::toString(QTime time, FormatType format) const
 {
     if (!time.isValid())
         return QString();
@@ -2285,18 +2309,10 @@ QString QLocale::dateFormat(FormatType format) const
     }
 #endif
 
-    quint32 idx, size;
-    switch (format) {
-    case LongFormat:
-        idx = d->m_data->m_long_date_format_idx;
-        size = d->m_data->m_long_date_format_size;
-        break;
-    default:
-        idx = d->m_data->m_short_date_format_idx;
-        size = d->m_data->m_short_date_format_size;
-        break;
-    }
-    return getLocaleData(date_format_data + idx, size);
+    return (format == LongFormat
+            ? d->m_data->longDateFormat()
+            : d->m_data->shortDateFormat()
+           ).getData(date_format_data);
 }
 
 /*!
@@ -2323,18 +2339,10 @@ QString QLocale::timeFormat(FormatType format) const
     }
 #endif
 
-    quint32 idx, size;
-    switch (format) {
-    case LongFormat:
-        idx = d->m_data->m_long_time_format_idx;
-        size = d->m_data->m_long_time_format_size;
-        break;
-    default:
-        idx = d->m_data->m_short_time_format_idx;
-        size = d->m_data->m_short_time_format_size;
-        break;
-    }
-    return getLocaleData(time_format_data + idx, size);
+    return (format == LongFormat
+            ? d->m_data->longTimeFormat()
+            : d->m_data->shortTimeFormat()
+           ).getData(time_format_data);
 }
 
 /*!
@@ -2580,15 +2588,11 @@ QDateTime QLocale::toDateTime(const QString &string, const QString &format, QCal
 
     Returns the decimal point character of this locale.
 
-    \note This function shall change to return a QString instead of QChar in
-    Qt6. Callers are encouraged to exploit the QString(QChar) constructor to
-    convert early in preparation for this.
-
     \sa groupSeparator(), toString()
 */
-QChar QLocale::decimalPoint() const
+QString QLocale::decimalPoint() const
 {
-    return d->decimal();
+    return d->m_data->decimalPoint();
 }
 
 /*!
@@ -2596,15 +2600,11 @@ QChar QLocale::decimalPoint() const
 
     Returns the group separator character of this locale.
 
-    \note This function shall change to return a QString instead of QChar in
-    Qt6. Callers are encouraged to exploit the QString(QChar) constructor to
-    convert early in preparation for this.
-
     \sa decimalPoint(), toString()
 */
-QChar QLocale::groupSeparator() const
+QString QLocale::groupSeparator() const
 {
-    return d->group();
+    return d->m_data->groupSeparator();
 }
 
 /*!
@@ -2612,15 +2612,11 @@ QChar QLocale::groupSeparator() const
 
     Returns the percent character of this locale.
 
-    \note This function shall change to return a QString instead of QChar in
-    Qt6. Callers are encouraged to exploit the QString(QChar) constructor to
-    convert early in preparation for this.
-
     \sa toString()
 */
-QChar QLocale::percent() const
+QString QLocale::percent() const
 {
-    return d->percent();
+    return d->m_data->percentSign();
 }
 
 /*!
@@ -2628,15 +2624,11 @@ QChar QLocale::percent() const
 
     Returns the zero digit character of this locale.
 
-    \note This function shall change to return a QString instead of QChar in
-    Qt6. Callers are encouraged to exploit the QString(QChar) constructor to
-    convert early in preparation for this.
-
     \sa toString()
 */
-QChar QLocale::zeroDigit() const
+QString QLocale::zeroDigit() const
 {
-    return d->zero();
+    return d->m_data->zeroDigit();
 }
 
 /*!
@@ -2644,15 +2636,11 @@ QChar QLocale::zeroDigit() const
 
     Returns the negative sign character of this locale.
 
-    \note This function shall change to return a QString instead of QChar in
-    Qt6. Callers are encouraged to exploit the QString(QChar) constructor to
-    convert early in preparation for this.
-
     \sa positiveSign(), toString()
 */
-QChar QLocale::negativeSign() const
+QString QLocale::negativeSign() const
 {
-    return d->minus();
+    return d->m_data->negativeSign();
 }
 
 /*!
@@ -2660,15 +2648,11 @@ QChar QLocale::negativeSign() const
 
     Returns the positive sign character of this locale.
 
-    \note This function shall change to return a QString instead of QChar in
-    Qt6. Callers are encouraged to exploit the QString(QChar) constructor to
-    convert early in preparation for this.
-
     \sa negativeSign(), toString()
 */
-QChar QLocale::positiveSign() const
+QString QLocale::positiveSign() const
 {
-    return d->plus();
+    return d->m_data->positiveSign();
 }
 
 /*!
@@ -2677,15 +2661,11 @@ QChar QLocale::positiveSign() const
     Returns the exponential character of this locale, used to separate exponent
     from mantissa in some floating-point numeric representations.
 
-    \note This function shall change to return a QString instead of QChar in
-    Qt6. Callers are encouraged to exploit the QString(QChar) constructor to
-    convert early in preparation for this.
-
     \sa toString(double, char, int)
 */
-QChar QLocale::exponential() const
+QString QLocale::exponential() const
 {
-    return d->exponential();
+    return d->m_data->exponentSeparator();
 }
 
 static bool qIsUpper(char c)
@@ -2918,27 +2898,24 @@ QString QLocale::standaloneDayName(int day, FormatType type) const
  */
 
 static QString rawMonthName(const QCalendarLocale &localeData,
-                            const ushort *monthsData, int month,
+                            const char16_t *monthsData, int month,
                             QLocale::FormatType type)
 {
-    quint32 idx, size;
+    QLocaleData::DataRange range;
     switch (type) {
     case QLocale::LongFormat:
-       idx = localeData.m_long.index;
-       size = localeData.m_long.size;
-       break;
+        range = localeData.longMonth();
+        break;
     case QLocale::ShortFormat:
-       idx = localeData.m_short.index;
-       size = localeData.m_short.size;
-       break;
+        range = localeData.shortMonth();
+        break;
     case QLocale::NarrowFormat:
-       idx = localeData.m_narrow.index;
-       size = localeData.m_narrow.size;
-       break;
+        range = localeData.narrowMonth();
+        break;
     default:
-       return QString();
+        return QString();
     }
-    return getLocaleListData(monthsData + idx, size, month - 1);
+    return range.getListEntry(monthsData, month - 1);
 }
 
 /*!
@@ -2946,27 +2923,24 @@ static QString rawMonthName(const QCalendarLocale &localeData,
  */
 
 static QString rawStandaloneMonthName(const QCalendarLocale &localeData,
-                                      const ushort *monthsData, int month,
+                                      const char16_t *monthsData, int month,
                                       QLocale::FormatType type)
 {
-    quint32 idx, size;
+    QLocaleData::DataRange range;
     switch (type) {
     case QLocale::LongFormat:
-        idx = localeData.m_standalone_long.index;
-        size = localeData.m_standalone_long.size;
+        range = localeData.longMonthStandalone();
         break;
     case QLocale::ShortFormat:
-        idx = localeData.m_standalone_short.index;
-        size = localeData.m_standalone_short.size;
+        range = localeData.shortMonthStandalone();
         break;
     case QLocale::NarrowFormat:
-        idx = localeData.m_standalone_narrow.index;
-        size = localeData.m_standalone_narrow.size;
+        range = localeData.narrowMonthStandalone();
         break;
     default:
         return QString();
     }
-    QString name = getLocaleListData(monthsData + idx, size, month - 1);
+    QString name = range.getListEntry(monthsData, month - 1);
     return name.isEmpty() ? rawMonthName(localeData, monthsData, month, type) : name;
 }
 
@@ -2977,24 +2951,21 @@ static QString rawStandaloneMonthName(const QCalendarLocale &localeData,
 static QString rawWeekDayName(const QLocaleData *data, const int day,
                               QLocale::FormatType type)
 {
-    quint32 idx, size;
+    QLocaleData::DataRange range;
     switch (type) {
     case QLocale::LongFormat:
-        idx = data->m_long_day_names_idx;
-        size = data->m_long_day_names_size;
+        range = data->longDayNames();
         break;
     case QLocale::ShortFormat:
-        idx = data->m_short_day_names_idx;
-        size = data->m_short_day_names_size;
+        range = data->shortDayNames();
         break;
     case QLocale::NarrowFormat:
-        idx = data->m_narrow_day_names_idx;
-        size = data->m_narrow_day_names_size;
+        range = data->narrowDayNames();
         break;
     default:
         return QString();
     }
-    return getLocaleListData(days_data + idx, size, day == 7 ? 0 : day);
+    return range.getListEntry(days_data, day == 7 ? 0 : day);
 }
 
 /*!
@@ -3004,24 +2975,21 @@ static QString rawWeekDayName(const QLocaleData *data, const int day,
 static QString rawStandaloneWeekDayName(const QLocaleData *data, const int day,
                                         QLocale::FormatType type)
 {
-    quint32 idx, size;
+    QLocaleData::DataRange range;
     switch (type) {
     case QLocale::LongFormat:
-        idx = data->m_standalone_long_day_names_idx;
-        size = data->m_standalone_long_day_names_size;
+        range =data->longDayNamesStandalone();
         break;
     case QLocale::ShortFormat:
-        idx = data->m_standalone_short_day_names_idx;
-        size = data->m_standalone_short_day_names_size;
+        range = data->shortDayNamesStandalone();
         break;
     case QLocale::NarrowFormat:
-        idx = data->m_standalone_narrow_day_names_idx;
-        size = data->m_standalone_narrow_day_names_size;
+        range = data->narrowDayNamesStandalone();
         break;
     default:
         return QString();
     }
-    QString name = getLocaleListData(days_data + idx, size, day == 7 ? 0 : day);
+    QString name = range.getListEntry(days_data, day == 7 ? 0 : day);
     if (name.isEmpty())
         return rawWeekDayName(data, day, type);
     return name;
@@ -3305,7 +3273,7 @@ QString QLocale::amText() const
             return res.toString();
     }
 #endif
-    return getLocaleData(am_data + d->m_data->m_am_idx, d->m_data->m_am_size);
+    return d->m_data->anteMeridiem().getData(am_data);
 }
 
 /*!
@@ -3325,13 +3293,13 @@ QString QLocale::pmText() const
             return res.toString();
     }
 #endif
-    return getLocaleData(pm_data + d->m_data->m_pm_idx, d->m_data->m_pm_size);
+    return d->m_data->postMeridiem().getData(pm_data);
 }
 
 // Another intrusion from QCalendar, using some of the tools above:
 
 QString QCalendarBackend::dateTimeToString(QStringView format, const QDateTime &datetime,
-                                           const QDate &dateOnly, const QTime &timeOnly,
+                                           QDate dateOnly, QTime timeOnly,
                                            const QLocale &locale) const
 {
     QDate date;
@@ -3536,9 +3504,9 @@ QString QCalendarBackend::dateTimeToString(QStringView format, const QDateTime &
                 result.append(locale.d->m_data->longLongToString(time.msec(), -1, 10, 3,
                                                                  QLocaleData::ZeroPadded));
                 if (repeat == 1) {
-                    if (result.endsWith(locale.d->zero()))
+                    if (result.endsWith(locale.zeroDigit()))
                         result.chop(1);
-                    if (result.endsWith(locale.d->zero()))
+                    if (result.endsWith(locale.zeroDigit()))
                         result.chop(1);
                 }
                 break;
@@ -3568,12 +3536,14 @@ QString QCalendarBackend::dateTimeToString(QStringView format, const QDateTime &
 QString QLocaleData::doubleToString(double d, int precision, DoubleForm form,
                                     int width, unsigned flags) const
 {
-    return doubleToString(m_zero, m_plus, m_minus, m_exponential, m_group, m_decimal,
+    return doubleToString(zeroDigit(), positiveSign(), negativeSign(),
+                          exponentSeparator(), groupSeparator(), decimalPoint(),
                           d, precision, form, width, flags);
 }
 
-QString QLocaleData::doubleToString(const QChar _zero, const QChar plus, const QChar minus,
-                                    const QChar exponential, const QChar group, const QChar decimal,
+QString QLocaleData::doubleToString(const QString &zero, const QString &plus, const QString &minus,
+                                    const QString &exponential,
+                                    const QString &group, const QString &decimal,
                                     double d, int precision, DoubleForm form, int width,
                                     unsigned flags)
 {
@@ -3605,8 +3575,23 @@ QString QLocaleData::doubleToString(const QChar _zero, const QChar plus, const Q
     } else { // Handle normal numbers
         QString digits = QString::fromLatin1(buf.data(), length);
 
-        if (_zero.unicode() != '0') {
-            ushort z = _zero.unicode() - '0';
+        if (zero == u"0") {
+            // No need to convert digits.
+        } else if (zero.size() == 2 && zero.at(0).isHighSurrogate()) {
+            const uint zeroUcs4 = QChar::surrogateToUcs4(zero.at(0), zero.at(1));
+            QString converted;
+            converted.reserve(2 * digits.size());
+            for (int i = 0; i < digits.length(); ++i) {
+                const uint digit = zeroUcs4 - '0' + digits.at(i).unicode();
+                Q_ASSERT(QChar::requiresSurrogates(digit));
+                converted.append(QChar::highSurrogate(digit));
+                converted.append(QChar::lowSurrogate(digit));
+            }
+            digits = converted;
+        } else {
+            Q_ASSERT(zero.size() == 1);
+            Q_ASSERT(!zero.at(0).isSurrogate());
+            ushort z = zero.at(0).unicode() - '0';
             for (int i = 0; i < digits.length(); ++i)
                 reinterpret_cast<ushort *>(digits.data())[i] += z;
         }
@@ -3614,13 +3599,13 @@ QString QLocaleData::doubleToString(const QChar _zero, const QChar plus, const Q
         bool always_show_decpt = (flags & ForcePoint);
         switch (form) {
             case DFExponent: {
-                num_str = exponentForm(_zero, decimal, exponential, group, plus, minus,
+                num_str = exponentForm(zero, decimal, exponential, group, plus, minus,
                                        digits, decpt, precision, PMDecimalDigits,
                                        always_show_decpt, flags & ZeroPadExponent);
                 break;
             }
             case DFDecimal: {
-                num_str = decimalForm(_zero, decimal, group,
+                num_str = decimalForm(zero, decimal, group,
                                       digits, decpt, precision, PMDecimalDigits,
                                       always_show_decpt, flags & ThousandsGroup);
                 break;
@@ -3629,25 +3614,25 @@ QString QLocaleData::doubleToString(const QChar _zero, const QChar plus, const Q
                 PrecisionMode mode = (flags & AddTrailingZeroes) ?
                             PMSignificantDigits : PMChopTrailingZeros;
 
+                const auto digitWidth = zero.size();
                 int cutoff = precision < 0 ? 6 : precision;
                 // Find out which representation is shorter
                 if (precision == QLocale::FloatingPointShortest && decpt > 0) {
-                    cutoff = digits.length() + 4; // 'e', '+'/'-', one digit exponent
-                    if (decpt <= 10) {
+                    cutoff = digits.length() / digitWidth + 4; // 'e', '+'/'-', one digit exponent
+                    if (decpt <= 10)
                         ++cutoff;
-                    } else {
+                    else
                         cutoff += decpt > 100 ? 2 : 1;
-                    }
-                    if (!always_show_decpt && digits.length() > decpt)
+                    if (!always_show_decpt && digits.length() / digitWidth > decpt)
                         ++cutoff; // decpt shown in exponent form, but not in decimal form
                 }
 
-                if (decpt != digits.length() && (decpt <= -4 || decpt > cutoff))
-                    num_str = exponentForm(_zero, decimal, exponential, group, plus, minus,
+                if (decpt != digits.length() / digitWidth && (decpt <= -4 || decpt > cutoff))
+                    num_str = exponentForm(zero, decimal, exponential, group, plus, minus,
                                            digits, decpt, precision, mode,
                                            always_show_decpt, flags & ZeroPadExponent);
                 else
-                    num_str = decimalForm(_zero, decimal, group,
+                    num_str = decimalForm(zero, decimal, group,
                                           digits, decpt, precision, mode,
                                           always_show_decpt, flags & ThousandsGroup);
                 break;
@@ -3657,10 +3642,10 @@ QString QLocaleData::doubleToString(const QChar _zero, const QChar plus, const Q
         if (isZero(d))
             negative = false;
 
-        // pad with zeros. LeftAdjusted overrides this flag). Also, we don't
+        // pad with zeros. LeftAdjusted overrides this flag. Also, we don't
         // pad special numbers
         if (flags & QLocaleData::ZeroPadded && !(flags & QLocaleData::LeftAdjusted)) {
-            int num_pad_chars = width - num_str.length();
+            int num_pad_chars = width - num_str.length() / zero.length();
             // leave space for the sign
             if (negative
                     || flags & QLocaleData::AlwaysShowSign
@@ -3668,7 +3653,7 @@ QString QLocaleData::doubleToString(const QChar _zero, const QChar plus, const Q
                 --num_pad_chars;
 
             for (int i = 0; i < num_pad_chars; ++i)
-                num_str.prepend(_zero);
+                num_str.prepend(zero);
         }
     }
 
@@ -3687,18 +3672,16 @@ QString QLocaleData::doubleToString(const QChar _zero, const QChar plus, const Q
 }
 
 QString QLocaleData::longLongToString(qlonglong l, int precision,
-                                            int base, int width,
-                                            unsigned flags) const
+                                      int base, int width, unsigned flags) const
 {
-    return longLongToString(m_zero, m_group, m_plus, m_minus,
-                                            l, precision, base, width, flags);
+    return longLongToString(zeroDigit(), groupSeparator(), positiveSign(), negativeSign(),
+                            l, precision, base, width, flags);
 }
 
-QString QLocaleData::longLongToString(const QChar zero, const QChar group,
-                                         const QChar plus, const QChar minus,
-                                         qlonglong l, int precision,
-                                         int base, int width,
-                                         unsigned flags)
+QString QLocaleData::longLongToString(const QString &zero, const QString &group,
+                                      const QString &plus, const QString &minus,
+                                      qlonglong l, int precision,
+                                      int base, int width, unsigned flags)
 {
     bool precision_not_specified = false;
     if (precision == -1) {
@@ -3724,17 +3707,19 @@ QT_WARNING_DISABLE_MSVC(4146)
     QString num_str = qulltoa(negative ? -qulonglong(l) : qulonglong(l), base, zero);
 QT_WARNING_POP
 
+    const QString resultZero = base == 10 ? zero : QStringLiteral("0");
+    const auto digitWidth = resultZero.size();
     uint cnt_thousand_sep = 0;
-    if (base == 10){
+    if (base == 10) {
         if (flags & ThousandsGroup) {
-            for (int i = num_str.length() - 3; i > 0; i -= 3) {
+            for (int i = num_str.length() / digitWidth - 3; i > 0; i -= 3 * digitWidth) {
                 num_str.insert(i, group);
                 ++cnt_thousand_sep;
             }
         } else if (flags & IndianNumberGrouping) {
-            if (num_str.length() > 3)
-                num_str.insert(num_str.length() - 3 , group);
-            for (int i = num_str.length() - 6; i > 0; i -= 2) {
+            if (num_str.length() > 3 * digitWidth)
+                num_str.insert(num_str.length() - 3 * digitWidth , group);
+            for (int i = num_str.length() - 6 * digitWidth; i > 0; i -= 2 * digitWidth) {
                 num_str.insert(i, group);
                 ++cnt_thousand_sep;
             }
@@ -3742,7 +3727,7 @@ QT_WARNING_POP
     }
 
     for (int i = num_str.length()/* - cnt_thousand_sep*/; i < precision; ++i)
-        num_str.prepend(base == 10 ? zero : QChar::fromLatin1('0'));
+        num_str.prepend(resultZero);
 
     if ((flags & ShowBase)
             && base == 8
@@ -3756,7 +3741,7 @@ QT_WARNING_POP
                         && precision_not_specified;
 
     if (zero_padded) {
-        int num_pad_chars = width - num_str.length();
+        int num_pad_chars = width - num_str.length() / digitWidth;
 
         // leave space for the sign
         if (negative
@@ -3771,8 +3756,8 @@ QT_WARNING_POP
         else if (base == 2 && (flags & ShowBase))
             num_pad_chars -= 2;
 
-        for (int i = 0; i < num_pad_chars; ++i)
-            num_str.prepend(base == 10 ? zero : QChar::fromLatin1('0'));
+        while (num_pad_chars-- > 0)
+            num_str.prepend(resultZero);
     }
 
     if (flags & CapitalEorX)
@@ -3795,21 +3780,19 @@ QT_WARNING_POP
 }
 
 QString QLocaleData::unsLongLongToString(qulonglong l, int precision,
-                                            int base, int width,
-                                            unsigned flags) const
+                                         int base, int width, unsigned flags) const
 {
-    return unsLongLongToString(m_zero, m_group, m_plus,
-                                               l, precision, base, width, flags);
+    return unsLongLongToString(zeroDigit(), groupSeparator(), positiveSign(),
+                               l, precision, base, width, flags);
 }
 
-QString QLocaleData::unsLongLongToString(const QChar zero, const QChar group,
-                                            const QChar plus,
-                                            qulonglong l, int precision,
-                                            int base, int width,
-                                            unsigned flags)
+QString QLocaleData::unsLongLongToString(const QString &zero, const QString &group,
+                                         const QString &plus,
+                                         qulonglong l, int precision,
+                                         int base, int width, unsigned flags)
 {
-    const QChar resultZero = base == 10 ? zero : QChar(QLatin1Char('0'));
-    QString num_str = l ? qulltoa(l, base, zero) : QString(resultZero);
+    const QString resultZero = base == 10 ? zero : QStringLiteral("0");
+    QString num_str = l ? qulltoa(l, base, zero) : resultZero;
 
     bool precision_not_specified = false;
     if (precision == -1) {
@@ -3820,26 +3803,27 @@ QString QLocaleData::unsLongLongToString(const QChar zero, const QChar group,
         precision = 1;
     }
 
+    const auto digitWidth = resultZero.size();
     uint cnt_thousand_sep = 0;
     if (base == 10) {
         if (flags & ThousandsGroup) {
-            for (int i = num_str.length() - 3; i > 0; i -=3) {
+            for (int i = num_str.length() - 3 * digitWidth; i > 0; i -= 3 * digitWidth) {
                 num_str.insert(i, group);
                 ++cnt_thousand_sep;
             }
         } else if (flags & IndianNumberGrouping) {
-            if (num_str.length() > 3)
-                num_str.insert(num_str.length() - 3 , group);
-            for (int i = num_str.length() - 6; i > 0; i -= 2) {
+            if (num_str.length() > 3 * digitWidth)
+                num_str.insert(num_str.length() - 3 * digitWidth , group);
+            for (int i = num_str.length() - 6 * digitWidth; i > 0; i -= 2 * digitWidth) {
                 num_str.insert(i, group);
                 ++cnt_thousand_sep;
             }
         }
     }
 
-    const int zeroPadding = precision - num_str.length()/* + cnt_thousand_sep*/;
-    if (zeroPadding > 0)
-        num_str.prepend(QString(zeroPadding, resultZero));
+    int zeroPadding = precision - num_str.length() / digitWidth /* + cnt_thousand_sep*/;
+    while (zeroPadding-- > 0)
+        num_str.prepend(resultZero);
 
     if ((flags & ShowBase)
             && base == 8
@@ -3853,7 +3837,7 @@ QString QLocaleData::unsLongLongToString(const QChar zero, const QChar group,
                         && precision_not_specified;
 
     if (zero_padded) {
-        int num_pad_chars = width - num_str.length();
+        int num_pad_chars = width - num_str.length() / digitWidth;
 
         // leave space for optional '0x' in hex form
         if (base == 16 && flags & ShowBase)
@@ -3862,8 +3846,8 @@ QString QLocaleData::unsLongLongToString(const QChar zero, const QChar group,
         else if (base == 2 && flags & ShowBase)
             num_pad_chars -= 2;
 
-        if (num_pad_chars > 0)
-            num_str.prepend(QString(num_pad_chars, resultZero));
+        while (num_pad_chars-- > 0)
+            num_str.prepend(resultZero);
     }
 
     if (flags & CapitalEorX)
@@ -3894,21 +3878,13 @@ QString QLocaleData::unsLongLongToString(const QChar zero, const QChar group,
 bool QLocaleData::numberToCLocale(QStringView s, QLocale::NumberOptions number_options,
                                   CharBuff *result) const
 {
-    const QChar *uc = s.data();
-    auto l = s.size();
-    decltype(l) idx = 0;
-
-    // Skip whitespace
-    while (idx < l && uc[idx].isSpace())
-        ++idx;
-    if (idx == l)
+    s = s.trimmed();
+    if (s.size() < 1)
         return false;
 
-    // Check trailing whitespace
-    for (; idx < l; --l) {
-        if (!uc[l - 1].isSpace())
-            break;
-    }
+    const QChar *uc = s.data();
+    auto length = s.size();
+    decltype(length) idx = 0;
 
     int group_cnt = 0; // counts number of group chars
     int decpt_idx = -1;
@@ -3916,20 +3892,21 @@ bool QLocaleData::numberToCLocale(QStringView s, QLocale::NumberOptions number_o
     int start_of_digits_idx = -1;
     int exponent_idx = -1;
 
-    while (idx < l) {
-        const QChar in = uc[idx];
+    while (idx < length) {
+        const QStringView in = QStringView(uc + idx, uc[idx].isHighSurrogate() ? 2 : 1);
 
-        char out = digitToCLocale(in);
+        char out = numericToCLocale(in);
         if (out == 0) {
-            if (in == m_list)
+            const QChar simple(in.size() == 1 ? in.front() : QChar(0));
+            if (in == listSeparator())
                 out = ';';
-            else if (in == m_percent)
+            else if (in == percentSign())
                 out = '%';
             // for handling base-x numbers
-            else if (in.unicode() >= 'A' && in.unicode() <= 'Z')
-                out = in.toLower().toLatin1();
-            else if (in.unicode() >= 'a' && in.unicode() <= 'z')
-                out = in.toLatin1();
+            else if (simple.toLatin1() >= 'A' && simple.toLatin1() <= 'Z')
+                out = simple.toLower().toLatin1();
+            else if (simple.toLatin1() >= 'a' && simple.toLatin1() <= 'z')
+                out = simple.toLatin1();
             else
                 break;
         } else if (out == '.') {
@@ -3937,12 +3914,12 @@ bool QLocaleData::numberToCLocale(QStringView s, QLocale::NumberOptions number_o
             if (decpt_idx != -1 || exponent_idx != -1)
                 return false;
             decpt_idx = idx;
-        } else if (out == 'e' || out == 'E') {
+        } else if (out == 'e') {
             exponent_idx = idx;
         }
 
         if (number_options & QLocale::RejectLeadingZeroInExponent) {
-            if (exponent_idx != -1 && out == '0' && idx < l - 1) {
+            if (exponent_idx != -1 && out == '0' && idx < length - 1) {
                 // After the exponent there can only be '+', '-' or digits.
                 // If we find a '0' directly after some non-digit, then that is a leading zero.
                 if (result->last() < '0' || result->last() > '9')
@@ -3982,9 +3959,9 @@ bool QLocaleData::numberToCLocale(QStringView s, QLocale::NumberOptions number_o
                 ++group_cnt;
 
                 // don't add the group separator
-                ++idx;
+                idx += in.size();
                 continue;
-            } else if (out == '.' || out == 'e' || out == 'E') {
+            } else if (out == '.' || idx == exponent_idx) {
                 // check distance from the last separator
                 // ### FIXME: Some locales allow other groupings!
                 // See https://en.wikipedia.org/wiki/Thousands_separator
@@ -3997,8 +3974,7 @@ bool QLocaleData::numberToCLocale(QStringView s, QLocale::NumberOptions number_o
         }
 
         result->append(out);
-
-        ++idx;
+        idx += in.size();
     }
 
     if (!(number_options & QLocale::RejectGroupSeparator)) {
@@ -4018,7 +3994,7 @@ bool QLocaleData::numberToCLocale(QStringView s, QLocale::NumberOptions number_o
     }
 
     result->append('\0');
-    return idx == l;
+    return idx == length;
 }
 
 bool QLocaleData::validateChars(QStringView str, NumberMode numMode, QByteArray *buff,
@@ -4035,8 +4011,9 @@ bool QLocaleData::validateChars(QStringView str, NumberMode numMode, QByteArray
     bool dec = false;
     int decDigitCnt = 0;
 
-    for (qsizetype i = 0; i < str.size(); ++i) {
-        char c = digitToCLocale(str.at(i));
+    for (qsizetype i = 0; i < str.size();) {
+        const QStringView in = str.mid(i, str.at(i).isHighSurrogate() ? 2 : 1);
+        char c = numericToCLocale(in);
 
         if (c >= '0' && c <= '9') {
             if (numMode != IntegerMode) {
@@ -4118,6 +4095,8 @@ bool QLocaleData::validateChars(QStringView str, NumberMode numMode, QByteArray
         lastWasE = c == 'e';
         if (c != ',')
             buff->append(c);
+
+        i += in.size();
     }
 
     return true;
@@ -4267,23 +4246,16 @@ QString QLocale::currencySymbol(QLocale::CurrencySymbolFormat format) const
             return res.toString();
     }
 #endif
-    quint32 idx, size;
     switch (format) {
     case CurrencySymbol:
-        idx = d->m_data->m_currency_symbol_idx;
-        size = d->m_data->m_currency_symbol_size;
-        return getLocaleData(currency_symbol_data + idx, size);
+        return d->m_data->currencySymbol().getData(currency_symbol_data);
     case CurrencyDisplayName:
-        idx = d->m_data->m_currency_display_name_idx;
-        size = d->m_data->m_currency_display_name_size;
-        return getLocaleListData(currency_display_name_data + idx, size, 0);
+        return d->m_data->currencyDisplayName().getListEntry(currency_display_name_data, 0);
     case CurrencyIsoCode: {
-        int len = 0;
-        const QLocaleData *data = this->d->m_data;
-        for (; len < 3; ++len)
-            if (!data->m_currency_iso_code[len])
-                break;
-        return len ? QString::fromLatin1(data->m_currency_iso_code, len) : QString();
+        const char *code = d->m_data->m_currency_iso_code;
+        if (int len = qstrnlen(code, 3))
+            return QString::fromLatin1(code, len);
+        break;
     }
     }
     return QString();
@@ -4308,20 +4280,16 @@ QString QLocale::toCurrencyString(qlonglong value, const QString &symbol) const
             return res.toString();
     }
 #endif
-    const QLocalePrivate *d = this->d;
-    quint8 idx = d->m_data->m_currency_format_idx;
-    quint8 size = d->m_data->m_currency_format_size;
-    if (d->m_data->m_currency_negative_format_size && value < 0) {
-        idx = d->m_data->m_currency_negative_format_idx;
-        size = d->m_data->m_currency_negative_format_size;
+    QLocaleData::DataRange range = d->m_data->currencyFormatNegative();
+    if (!range.size || value >= 0)
+        range = d->m_data->currencyFormat();
+    else
         value = -value;
-    }
     QString str = toString(value);
     QString sym = symbol.isNull() ? currencySymbol() : symbol;
     if (sym.isEmpty())
         sym = currencySymbol(QLocale::CurrencyIsoCode);
-    QString format = getLocaleData(currency_format_data + idx, size);
-    return format.arg(str, sym);
+    return range.getData(currency_format_data).arg(str, sym);
 }
 
 /*!
@@ -4339,15 +4307,11 @@ QString QLocale::toCurrencyString(qulonglong value, const QString &symbol) const
             return res.toString();
     }
 #endif
-    const QLocaleData *data = this->d->m_data;
-    quint8 idx = data->m_currency_format_idx;
-    quint8 size = data->m_currency_format_size;
     QString str = toString(value);
     QString sym = symbol.isNull() ? currencySymbol() : symbol;
     if (sym.isEmpty())
         sym = currencySymbol(QLocale::CurrencyIsoCode);
-    QString format = getLocaleData(currency_format_data + idx, size);
-    return format.arg(str, sym);
+    return d->m_data->currencyFormat().getData(currency_format_data).arg(str, sym);
 }
 
 #if QT_VERSION < QT_VERSION_CHECK(6,0,0)
@@ -4382,20 +4346,16 @@ QString QLocale::toCurrencyString(double value, const QString &symbol, int preci
             return res.toString();
     }
 #endif
-    const QLocaleData *data = this->d->m_data;
-    quint8 idx = data->m_currency_format_idx;
-    quint8 size = data->m_currency_format_size;
-    if (data->m_currency_negative_format_size && value < 0) {
-        idx = data->m_currency_negative_format_idx;
-        size = data->m_currency_negative_format_size;
+    QLocaleData::DataRange range = d->m_data->currencyFormatNegative();
+    if (!range.size || value >= 0)
+        range = d->m_data->currencyFormat();
+    else
         value = -value;
-    }
     QString str = toString(value, 'f', precision == -1 ? d->m_data->m_currency_digits : precision);
     QString sym = symbol.isNull() ? currencySymbol() : symbol;
     if (sym.isEmpty())
         sym = currencySymbol(QLocale::CurrencyIsoCode);
-    QString format = getLocaleData(currency_format_data + idx, size);
-    return format.arg(str, sym);
+    return range.getData(currency_format_data).arg(str, sym);
 }
 
 /*!
@@ -4470,17 +4430,11 @@ QString QLocale::formattedDataSize(qint64 bytes, int precision, DataSizeFormats
     Q_ASSERT(power <= 6 && power >= 0);
     QString unit;
     if (power > 0) {
-        quint16 index, size;
-        if (format & DataSizeSIQuantifiers) {
-            index = d->m_data->m_byte_si_quantified_idx;
-            size = d->m_data->m_byte_si_quantified_size;
-        } else {
-            index = d->m_data->m_byte_iec_quantified_idx;
-            size = d->m_data->m_byte_iec_quantified_size;
-        }
-        unit = getLocaleListData(byte_unit_data + index, size, power - 1);
+        QLocaleData::DataRange range = (format & DataSizeSIQuantifiers)
+            ? d->m_data->byteAmountSI() : d->m_data->byteAmountIEC();
+        unit = range.getListEntry(byte_unit_data, power - 1);
     } else {
-        unit = getLocaleData(byte_unit_data + d->m_data->m_byte_idx, d->m_data->m_byte_size);
+        unit = d->m_data->byteCount().getData(byte_unit_data);
     }
 
     return number + QLatin1Char(' ') + unit;
@@ -4606,8 +4560,7 @@ QString QLocale::nativeLanguageName() const
             return res.toString();
     }
 #endif
-    return getLocaleData(endonyms_data + d->m_data->m_language_endonym_idx,
-                         d->m_data->m_language_endonym_size);
+    return d->m_data->endonymLanguage().getData(endonyms_data);
 }
 
 /*!
@@ -4627,8 +4580,7 @@ QString QLocale::nativeCountryName() const
             return res.toString();
     }
 #endif
-    return getLocaleData(endonyms_data + d->m_data->m_country_endonym_idx,
-                         d->m_data->m_country_endonym_size);
+    return d->m_data->endonymCountry().getData(endonyms_data);
 }
 
 #ifndef QT_NO_DEBUG_STREAM
diff --git a/src/corelib/text/qlocale.h b/src/corelib/text/qlocale.h
index 0dc9e1bd00..3f1a8f2679 100644
--- a/src/corelib/text/qlocale.h
+++ b/src/corelib/text/qlocale.h
@@ -614,6 +614,7 @@ public:
 
         LastScript = JamoScript
     };
+
     enum Country {
         AnyCountry = 0,
         Afghanistan = 1,
@@ -1006,22 +1007,22 @@ public:
     inline QString toString(float i, char f = 'g', int prec = 6) const;
 
 #if QT_STRINGVIEW_LEVEL < 2
-    QString toString(const QDate &date, const QString &formatStr) const;
-    QString toString(const QTime &time, const QString &formatStr) const;
+    QString toString(QDate date, const QString &formatStr) const;
+    QString toString(QTime time, const QString &formatStr) const;
     QString toString(const QDateTime &dateTime, const QString &format) const;
 #endif
-    QString toString(const QDate &date, QStringView formatStr) const;
-    QString toString(const QTime &time, QStringView formatStr) const;
+    QString toString(QDate date, QStringView formatStr) const;
+    QString toString(QTime time, QStringView formatStr) const;
     QString toString(const QDateTime &dateTime, QStringView format) const;
-    QString toString(const QDate &date, FormatType format = LongFormat) const;
-    QString toString(const QTime &time, FormatType format = LongFormat) const;
+    QString toString(QDate date, FormatType format = LongFormat) const;
+    QString toString(QTime time, FormatType format = LongFormat) const;
     QString toString(const QDateTime &dateTime, FormatType format = LongFormat) const;
     /* Removing default value for `format' is done intentionally,
      * after all tests we will remove non-calendar-aware version of these functions,
      * and add a default value for both calendar instance, and format
      */
-    QString toString(const QDate &date, QStringView formatStr, QCalendar cal) const;
-    QString toString(const QDate &date, FormatType format, QCalendar cal) const;
+    QString toString(QDate date, QStringView formatStr, QCalendar cal) const;
+    QString toString(QDate date, FormatType format, QCalendar cal) const;
     QString toString(const QDateTime &dateTime, FormatType format, QCalendar cal) const;
     QString toString(const QDateTime &dateTime, QStringView formatStr, QCalendar cal) const;
 
@@ -1048,15 +1049,13 @@ public:
 # endif // 5.15
 #endif
 
-    // ### Qt 6: We need to return QString from these function since
-    //           UTF-16 may need surrogate pairs to represent these fields.
-    QChar decimalPoint() const;
-    QChar groupSeparator() const;
-    QChar percent() const;
-    QChar zeroDigit() const;
-    QChar negativeSign() const;
-    QChar positiveSign() const;
-    QChar exponential() const;
+    QString decimalPoint() const;
+    QString groupSeparator() const;
+    QString percent() const;
+    QString zeroDigit() const;
+    QString negativeSign() const;
+    QString positiveSign() const;
+    QString exponential() const;
 
     QString monthName(int, FormatType format = LongFormat) const;
     QString standaloneMonthName(int, FormatType format = LongFormat) const;
diff --git a/src/corelib/text/qlocale_data_p.h b/src/corelib/text/qlocale_data_p.h
index 5f29a74d37..1a9ff67f5f 100644
--- a/src/corelib/text/qlocale_data_p.h
+++ b/src/corelib/text/qlocale_data_p.h
@@ -77,7 +77,7 @@ static const int ImperialMeasurementSystemsCount =
 // GENERATED PART STARTS HERE
 
 /*
-    This part of the file was generated on 2019-10-24 from the
+    This part of the file was generated on 2020-01-30 from the
     Common Locale Data Repository v36
 
     http://www.unicode.org/cldr/
@@ -1175,7 +1175,7 @@ static const quint16 locale_index[] = {
      0, // Buginese
      0, // Buhid
      0, // Carian
-     0, // Chakma
+   556, // Chakma
      0, // Classical Mandaic
      0, // Coptic
      0, // Dogri
@@ -1193,7 +1193,7 @@ static const quint16 locale_index[] = {
      0, // Lycian
      0, // Lydian
      0, // Mandingo
-   556, // Manipuri
+   558, // Manipuri
      0, // Meroitic
      0, // Northern Thai
      0, // Old Irish
@@ -1212,26 +1212,26 @@ static const quint16 locale_index[] = {
      0, // Sora
      0, // Sylheti
      0, // Tagbanwa
-   557, // Tai Dam
+   559, // Tai Dam
      0, // Tai Nua
      0, // Ugaritic
-   558, // Akoose
-   559, // Lakota
-   560, // Standard Moroccan Tamazight
-   561, // Mapuche
-   562, // Central Kurdish
-   564, // Lower Sorbian
-   565, // Upper Sorbian
-   566, // Kenyang
-   567, // Mohawk
-   568, // Nko
-   569, // Prussian
-   570, // Kiche
-   571, // Southern Sami
-   572, // Lule Sami
-   573, // Inari Sami
-   574, // Skolt Sami
-   575, // Warlpiri
+   560, // Akoose
+   561, // Lakota
+   562, // Standard Moroccan Tamazight
+   563, // Mapuche
+   564, // Central Kurdish
+   566, // Lower Sorbian
+   567, // Upper Sorbian
+   568, // Kenyang
+   569, // Mohawk
+   570, // Nko
+   571, // Prussian
+   572, // Kiche
+   573, // Southern Sami
+   574, // Lule Sami
+   575, // Inari Sami
+   576, // Skolt Sami
+   577, // Warlpiri
      0, // Manichaean Middle Persian
      0, // Mende
      0, // Ancient North Arabian
@@ -1249,10 +1249,10 @@ static const quint16 locale_index[] = {
      0, // Bhojpuri
      0, // Hieroglyphic Luwian
      0, // Literary Chinese
-   576, // Mazanderani
+   578, // Mazanderani
      0, // Mru
      0, // Newari
-   577, // Northern Luri
+   579, // Northern Luri
      0, // Palauan
      0, // Papiamento
      0, // Saraiki
@@ -1260,1996 +1260,1979 @@ static const quint16 locale_index[] = {
      0, // Tok Pisin
      0, // Tuvalu
      0, // Uncoded Languages
-   579, // Cantonese
-   581, // Osage
+   581, // Cantonese
+   583, // Osage
      0, // Tangut
-   582, // Ido
-   583, // Lojban
-   584, // Sicilian
-   585, // Southern Kurdish
-   586, // Western Balochi
-   587, // Cebuano
-   588, // Erzya
-   589, // Chickasaw
-   590, // Muscogee
-   591, // Silesian
+   584, // Ido
+   585, // Lojban
+   586, // Sicilian
+   587, // Southern Kurdish
+   588, // Western Balochi
+   589, // Cebuano
+   590, // Erzya
+   591, // Chickasaw
+   592, // Muscogee
+   593, // Silesian
      0 // trailing 0
 };
 
 static const QLocaleData locale_data[] = {
-   //  lang  script   terr   dec   group  list   prcnt   zero  minus  plus    exp   quotOpn  quotEnd altQtOpn altQtEnd   lpStart      lpMid       lpEnd       lpTwo       sDtFmt      lDtFmt      sTmFmt      lTmFmt      ssDays      slDays      snDays       sDays       lDays       nDays        am          pm       byte    siQuant iecQuant    currISO     currSym    currDsply    currFmt    currFmtNeg   endoLang    endoCntry curDgt curRnd dow1st  wknd+  wknd-
-    {      1,     0,     0,    46,    44,    59,    37,    48,    45,    43,   101,      34,      34,      39,      39,       0,6 ,       0,6 ,       0,6 ,       0,6 ,      0,10 ,     10,17 ,       0,8 ,      8,10 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     99,14 ,       0,2 ,       0,2 ,    0,5 ,   5,17 ,  22,23 ,    {0,0,0},        0,0 ,       0,7 ,       0,4 ,       4,0 ,       0,0 ,       0,0 ,     2,     1,     1,     6,     7 }, // C/AnyScript/AnyCountry
-    {      3,     7,    69,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,      27,8 ,     35,18 ,      18,7 ,     25,12 ,    113,28 ,    141,55 ,     85,14 ,    113,28 ,    141,55 ,     85,14 ,       2,2 ,       2,2 ,   45,4 ,   5,17 ,  22,23 , {69,84,66},        0,2 ,      7,24 ,       4,4 ,       4,0 ,       0,6 ,      6,10 ,     2,     1,     7,     6,     7 }, // Oromo/Latin/Ethiopia
-    {      3,     7,   111,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,      27,8 ,     35,18 ,      37,5 ,      8,10 ,    113,28 ,    141,55 ,    196,14 ,    113,28 ,    141,55 ,    196,14 ,       2,2 ,       2,2 ,   45,4 ,   5,17 ,  22,23 , {75,69,83},        2,3 ,       0,7 ,       4,4 ,       4,0 ,       0,6 ,      16,8 ,     2,     1,     7,     6,     7 }, // Oromo/Latin/Kenya
-    {      4,     7,    69,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {69,84,66},        0,0 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     2,     1,     7,     6,     7 }, // Afar/Latin/Ethiopia
-    {      5,     7,   195,    44,   160,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       6,8 ,       6,8 ,     53,10 ,     80,17 ,      37,5 ,      8,10 ,    210,28 ,    238,58 ,    296,14 ,    210,28 ,    238,58 ,    296,14 ,       4,3 ,       4,3 ,   49,5 ,   5,17 ,  22,23 , {90,65,82},        5,1 ,     31,67 ,       4,4 ,       4,0 ,      24,9 ,     33,11 ,     2,     1,     7,     6,     7 }, // Afrikaans/Latin/South Africa
-    {      5,     7,   148,    44,   160,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       6,8 ,       6,8 ,     53,10 ,     97,16 ,      18,7 ,     25,12 ,    210,28 ,    238,58 ,    296,14 ,    210,28 ,    238,58 ,    296,14 ,       4,3 ,       4,3 ,   49,5 ,   5,17 ,  22,23 , {78,65,68},        6,1 ,     98,55 ,       4,4 ,       4,0 ,      24,9 ,      44,7 ,     2,     1,     1,     6,     7 }, // Afrikaans/Latin/Namibia
-    {      6,     7,     2,    44,   160,    59,    37,    48,    45,    43,   101,     171,     187,    8220,    8221,       0,6 ,       0,6 ,      14,9 ,      14,9 ,     113,6 ,     10,17 ,      18,7 ,     42,13 ,    310,28 ,    338,58 ,    396,15 ,    411,28 ,    338,58 ,    396,15 ,      7,11 ,      7,10 ,   54,4 ,   5,17 ,  22,23 , {65,76,76},        7,4 ,    153,45 ,      13,5 ,       4,0 ,      51,5 ,      56,8 ,     0,     0,     1,     6,     7 }, // Albanian/Latin/Albania
-    {      6,     7,   127,    44,   160,    59,    37,    48,    45,    43,   101,     171,     187,    8220,    8221,       0,6 ,       0,6 ,      14,9 ,      14,9 ,     113,6 ,     10,17 ,      37,5 ,      8,10 ,    310,28 ,    338,58 ,    396,15 ,    411,28 ,    338,58 ,    396,15 ,      7,11 ,      7,10 ,   54,4 ,   5,17 ,  22,23 , {77,75,68},       11,3 ,    198,54 ,      13,5 ,       4,0 ,      51,5 ,     64,18 ,     2,     1,     1,     6,     7 }, // Albanian/Latin/Macedonia
-    {      6,     7,   257,    44,   160,    59,    37,    48,    45,    43,   101,     171,     187,    8220,    8221,       0,6 ,       0,6 ,      14,9 ,      14,9 ,     113,6 ,     10,17 ,      37,5 ,      8,10 ,    310,28 ,    338,58 ,    396,15 ,    411,28 ,    338,58 ,    396,15 ,      7,11 ,      7,10 ,   54,4 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,    252,21 ,      13,5 ,       4,0 ,      51,5 ,      82,6 ,     2,     1,     1,     6,     7 }, // Albanian/Latin/Kosovo
-    {      7,    14,    69,    46,    44,    59,    37,    48,    45,    43,   101,     171,     187,    8249,    8250,      23,6 ,      23,6 ,      29,9 ,      38,8 ,    119,10 ,     63,17 ,      18,7 ,     25,12 ,    439,27 ,    466,28 ,    494,14 ,    439,27 ,    466,28 ,    494,14 ,      18,3 ,      17,4 ,   58,3 ,  61,23 ,  22,23 , {69,84,66},       15,2 ,    273,34 ,       4,4 ,       4,0 ,      88,4 ,      92,5 ,     2,     1,     7,     6,     7 }, // Amharic/Ethiopic/Ethiopia
-    {      8,     1,    64,  1643,  1644,  1563,    37,  1632,    45,    43,   101,    8221,    8220,    8217,    8216,      46,6 ,      46,6 ,      46,6 ,      46,6 ,    129,10 ,    139,17 ,      18,7 ,     25,12 ,    508,52 ,    508,52 ,    560,14 ,    508,52 ,    508,52 ,    560,14 ,      21,1 ,      21,1 ,   84,4 ,  88,47 ,  22,23 , {69,71,80},       17,5 ,    307,81 ,      13,5 ,       4,0 ,      97,7 ,     104,3 ,     2,     1,     6,     5,     6 }, // Arabic/Arabic/Egypt
-    {      8,     1,     3,    44,    46,    59,    37,    48,    45,    43,   101,    8221,    8220,    8217,    8216,      46,6 ,      46,6 ,      46,6 ,      46,6 ,    129,10 ,    139,17 ,      18,7 ,     25,12 ,    508,52 ,    508,52 ,    560,14 ,    508,52 ,    508,52 ,    560,14 ,      21,1 ,      21,1 ,   84,4 ,  88,47 ,  22,23 , {68,90,68},       22,5 ,   388,102 ,      13,5 ,       4,0 ,      97,7 ,     107,7 ,     2,     1,     6,     5,     6 }, // Arabic/Arabic/Algeria
-    {      8,     1,    17,  1643,  1644,  1563,    37,  1632,    45,    43,   101,    8221,    8220,    8217,    8216,      46,6 ,      46,6 ,      46,6 ,      46,6 ,    129,10 ,    139,17 ,      18,7 ,     25,12 ,    508,52 ,    508,52 ,    560,14 ,    508,52 ,    508,52 ,    560,14 ,      21,1 ,      21,1 ,   84,4 ,  88,47 ,  22,23 , {66,72,68},       27,5 ,    490,91 ,      13,5 ,       4,0 ,      97,7 ,     114,7 ,     3,     0,     6,     5,     6 }, // Arabic/Arabic/Bahrain
-    {      8,     1,    42,  1643,  1644,  1563,    37,  1632,    45,    43,   101,    8221,    8220,    8217,    8216,      46,6 ,      46,6 ,      46,6 ,      46,6 ,    129,10 ,    139,17 ,      18,7 ,     25,12 ,    508,52 ,    508,52 ,    560,14 ,    508,52 ,    508,52 ,    560,14 ,      21,1 ,      21,1 ,   84,4 ,  88,47 ,  22,23 , {88,65,70},       32,4 ,   581,112 ,      13,5 ,       4,0 ,      97,7 ,     121,4 ,     0,     0,     1,     6,     7 }, // Arabic/Arabic/Chad
-    {      8,     1,    48,  1643,  1644,  1563,    37,  1632,    45,    43,   101,    8221,    8220,    8217,    8216,      46,6 ,      46,6 ,      46,6 ,      46,6 ,    129,10 ,    139,17 ,      37,5 ,      8,10 ,    508,52 ,    508,52 ,    560,14 ,    508,52 ,    508,52 ,    560,14 ,      21,1 ,      21,1 ,   84,4 ,  88,47 ,  22,23 , {75,77,70},       36,2 ,   693,105 ,      13,5 ,       4,0 ,      97,7 ,     125,9 ,     0,     0,     1,     6,     7 }, // Arabic/Arabic/Comoros
-    {      8,     1,    59,  1643,  1644,  1563,    37,  1632,    45,    43,   101,    8221,    8220,    8217,    8216,      46,6 ,      46,6 ,      46,6 ,      46,6 ,    129,10 ,    139,17 ,      18,7 ,     25,12 ,    508,52 ,    508,52 ,    560,14 ,    508,52 ,    508,52 ,    560,14 ,      21,1 ,      21,1 ,   84,4 ,  88,47 ,  22,23 , {68,74,70},       38,3 ,    798,84 ,      13,5 ,       4,0 ,      97,7 ,     134,6 ,     0,     0,     6,     6,     7 }, // Arabic/Arabic/Djibouti
-    {      8,     1,    67,  1643,  1644,  1563,    37,  1632,    45,    43,   101,    8221,    8220,    8217,    8216,      46,6 ,      46,6 ,      46,6 ,      46,6 ,    129,10 ,    139,17 ,      18,7 ,     25,12 ,    508,52 ,    508,52 ,    560,14 ,    508,52 ,    508,52 ,    560,14 ,      21,1 ,      21,1 ,   84,4 ,  88,47 ,  22,23 , {69,82,78},       41,3 ,    882,91 ,      13,5 ,       4,0 ,      97,7 ,     140,7 ,     2,     1,     1,     6,     7 }, // Arabic/Arabic/Eritrea
-    {      8,     1,   103,  1643,  1644,  1563,    37,  1632,    45,    43,   101,    8221,    8220,    8217,    8216,      46,6 ,      46,6 ,      46,6 ,      46,6 ,    129,10 ,    139,17 ,      18,7 ,     25,12 ,    508,52 ,    508,52 ,    560,14 ,    508,52 ,    508,52 ,    560,14 ,      21,1 ,      21,1 ,   84,4 ,  88,47 ,  22,23 , {73,81,68},       44,5 ,    973,84 ,      13,5 ,       4,0 ,      97,7 ,     147,6 ,     0,     0,     6,     5,     6 }, // Arabic/Arabic/Iraq
-    {      8,     1,   105,  1643,  1644,  1563,    37,  1632,    45,    43,   101,    8221,    8220,    8217,    8216,      46,6 ,      46,6 ,      46,6 ,      46,6 ,    129,10 ,    139,17 ,      55,4 ,      59,9 ,    508,52 ,    508,52 ,    560,14 ,    508,52 ,    508,52 ,    560,14 ,      21,1 ,      21,1 ,   84,4 ,  88,47 ,  22,23 , {73,76,83},       49,1 ,  1057,133 ,      13,5 ,       4,0 ,      97,7 ,     153,7 ,     2,     1,     7,     5,     6 }, // Arabic/Arabic/Israel
-    {      8,     1,   109,  1643,  1644,  1563,    37,  1632,    45,    43,   101,    8221,    8220,    8217,    8216,      46,6 ,      46,6 ,      46,6 ,      46,6 ,    129,10 ,    139,17 ,      18,7 ,     25,12 ,    508,52 ,    508,52 ,    560,14 ,    508,52 ,    508,52 ,    560,14 ,      21,1 ,      21,1 ,   84,4 ,  88,47 ,  22,23 , {74,79,68},       50,5 ,   1190,84 ,      13,5 ,       4,0 ,      97,7 ,     160,6 ,     3,     0,     6,     5,     6 }, // Arabic/Arabic/Jordan
-    {      8,     1,   115,  1643,  1644,  1563,    37,  1632,    45,    43,   101,    8221,    8220,    8217,    8216,      46,6 ,      46,6 ,      46,6 ,      46,6 ,    129,10 ,    139,17 ,      18,7 ,     25,12 ,    508,52 ,    508,52 ,    560,14 ,    508,52 ,    508,52 ,    560,14 ,      21,1 ,      21,1 ,   84,4 ,  88,47 ,  22,23 , {75,87,68},       55,5 ,   1274,84 ,      13,5 ,       4,0 ,      97,7 ,     166,6 ,     3,     0,     6,     5,     6 }, // Arabic/Arabic/Kuwait
-    {      8,     1,   119,  1643,  1644,  1563,    37,  1632,    45,    43,   101,    8221,    8220,    8217,    8216,      46,6 ,      46,6 ,      46,6 ,      46,6 ,    129,10 ,    139,17 ,      18,7 ,     25,12 ,    508,52 ,    508,52 ,    560,14 ,    508,52 ,    508,52 ,    560,14 ,      21,1 ,      21,1 ,   84,4 ,  88,47 ,  22,23 , {76,66,80},       60,5 ,   1358,84 ,      13,5 ,       4,0 ,      97,7 ,     172,5 ,     0,     0,     1,     6,     7 }, // Arabic/Arabic/Lebanon
-    {      8,     1,   122,    44,    46,    59,    37,    48,    45,    43,   101,    8221,    8220,    8217,    8216,      46,6 ,      46,6 ,      46,6 ,      46,6 ,    129,10 ,    139,17 ,      18,7 ,     25,12 ,    508,52 ,    508,52 ,    560,14 ,    508,52 ,    508,52 ,    560,14 ,      21,1 ,      21,1 ,   84,4 ,  88,47 ,  22,23 , {76,89,68},       65,5 ,   1442,88 ,      13,5 ,       4,0 ,      97,7 ,     177,5 ,     3,     0,     6,     5,     6 }, // Arabic/Arabic/Libya
-    {      8,     1,   136,  1643,  1644,  1563,    37,  1632,    45,    43,   101,    8221,    8220,    8217,    8216,      46,6 ,      46,6 ,      46,6 ,      46,6 ,    129,10 ,    139,17 ,      18,7 ,     25,12 ,    508,52 ,    508,52 ,    560,14 ,    508,52 ,    508,52 ,    560,14 ,      21,1 ,      21,1 ,   84,4 ,  88,47 ,  22,23 , {77,82,85},       70,4 ,  1530,112 ,      13,5 ,       4,0 ,      97,7 ,     182,9 ,     2,     1,     1,     6,     7 }, // Arabic/Arabic/Mauritania
-    {      8,     1,   145,    44,    46,    59,    37,    48,    45,    43,   101,    8221,    8220,    8217,    8216,      46,6 ,      46,6 ,      46,6 ,      46,6 ,    129,10 ,    139,17 ,      37,5 ,      8,10 ,    508,52 ,    508,52 ,    560,14 ,    508,52 ,    508,52 ,    560,14 ,      21,1 ,      21,1 ,   84,4 ,  88,47 ,  22,23 , {77,65,68},       74,5 ,   1642,87 ,      13,5 ,       4,0 ,      97,7 ,     191,6 ,     2,     1,     1,     6,     7 }, // Arabic/Arabic/Morocco
-    {      8,     1,   162,  1643,  1644,  1563,    37,  1632,    45,    43,   101,    8221,    8220,    8217,    8216,      46,6 ,      46,6 ,      46,6 ,      46,6 ,    129,10 ,    139,17 ,      18,7 ,     25,12 ,    508,52 ,    508,52 ,    560,14 ,    508,52 ,    508,52 ,    560,14 ,      21,1 ,      21,1 ,   84,4 ,  88,47 ,  22,23 , {79,77,82},       79,5 ,   1729,77 ,      13,5 ,       4,0 ,      97,7 ,     197,5 ,     3,     0,     6,     5,     6 }, // Arabic/Arabic/Oman
-    {      8,     1,   165,  1643,  1644,  1563,    37,  1632,    45,    43,   101,    8221,    8220,    8217,    8216,      46,6 ,      46,6 ,      46,6 ,      46,6 ,    129,10 ,    139,17 ,      18,7 ,     25,12 ,    508,52 ,    508,52 ,    560,14 ,    508,52 ,    508,52 ,    560,14 ,      21,1 ,      21,1 ,   84,4 ,  88,47 ,  22,23 , {73,76,83},       49,1 ,  1057,133 ,      13,5 ,       4,0 ,      97,7 ,    202,18 ,     2,     1,     1,     6,     7 }, // Arabic/Arabic/Palestinian Territories
-    {      8,     1,   175,  1643,  1644,  1563,    37,  1632,    45,    43,   101,    8221,    8220,    8217,    8216,      46,6 ,      46,6 ,      46,6 ,      46,6 ,    129,10 ,    139,17 ,      18,7 ,     25,12 ,    508,52 ,    508,52 ,    560,14 ,    508,52 ,    508,52 ,    560,14 ,      21,1 ,      21,1 ,   84,4 ,  88,47 ,  22,23 , {81,65,82},       84,5 ,   1806,70 ,      13,5 ,       4,0 ,      97,7 ,     220,3 ,     2,     1,     6,     5,     6 }, // Arabic/Arabic/Qatar
-    {      8,     1,   186,  1643,  1644,  1563,    37,  1632,    45,    43,   101,    8221,    8220,    8217,    8216,      46,6 ,      46,6 ,      46,6 ,      46,6 ,    129,10 ,    139,17 ,      18,7 ,     25,12 ,    508,52 ,    508,52 ,    560,14 ,    508,52 ,    508,52 ,    560,14 ,      21,1 ,      21,1 ,   84,4 ,  88,47 ,  22,23 , {83,65,82},       89,5 ,   1876,77 ,      13,5 ,       4,0 ,      97,7 ,    223,24 ,     2,     1,     7,     5,     6 }, // Arabic/Arabic/Saudi Arabia
-    {      8,     1,   194,  1643,  1644,  1563,    37,  1632,    45,    43,   101,    8221,    8220,    8217,    8216,      46,6 ,      46,6 ,      46,6 ,      46,6 ,    129,10 ,    139,17 ,      18,7 ,     25,12 ,    508,52 ,    508,52 ,    560,14 ,    508,52 ,    508,52 ,    560,14 ,      21,1 ,      21,1 ,   84,4 ,  88,47 ,  22,23 , {83,79,83},       94,1 ,   1953,77 ,      13,5 ,       4,0 ,      97,7 ,     247,7 ,     0,     0,     1,     6,     7 }, // Arabic/Arabic/Somalia
-    {      8,     1,   201,  1643,  1644,  1563,    37,  1632,    45,    43,   101,    8221,    8220,    8217,    8216,      46,6 ,      46,6 ,      46,6 ,      46,6 ,    129,10 ,    139,17 ,      18,7 ,     25,12 ,    508,52 ,    508,52 ,    560,14 ,    508,52 ,    508,52 ,    560,14 ,      21,1 ,      21,1 ,   84,4 ,  88,47 ,  22,23 , {83,68,71},       95,4 ,   2030,91 ,      13,5 ,       4,0 ,      97,7 ,     254,7 ,     2,     1,     6,     5,     6 }, // Arabic/Arabic/Sudan
-    {      8,     1,   207,  1643,  1644,  1563,    37,  1632,    45,    43,   101,    8221,    8220,    8217,    8216,      46,6 ,      46,6 ,      46,6 ,      46,6 ,    129,10 ,    139,17 ,      18,7 ,     25,12 ,    508,52 ,    508,52 ,    560,14 ,    508,52 ,    508,52 ,    560,14 ,      21,1 ,      21,1 ,   84,4 ,  88,47 ,  22,23 , {83,89,80},       99,5 ,   2121,77 ,      13,5 ,       4,0 ,      97,7 ,     261,5 ,     0,     0,     6,     5,     6 }, // Arabic/Arabic/Syria
-    {      8,     1,   216,    44,    46,    59,    37,    48,    45,    43,   101,    8221,    8220,    8217,    8216,      46,6 ,      46,6 ,      46,6 ,      46,6 ,    129,10 ,    139,17 ,      18,7 ,     25,12 ,    508,52 ,    508,52 ,    560,14 ,    508,52 ,    508,52 ,    560,14 ,      21,1 ,      21,1 ,   84,4 ,  88,47 ,  22,23 , {84,78,68},      104,5 ,   2198,95 ,      13,5 ,       4,0 ,      97,7 ,     266,4 ,     3,     0,     1,     6,     7 }, // Arabic/Arabic/Tunisia
-    {      8,     1,   223,  1643,  1644,  1563,    37,  1632,    45,    43,   101,    8221,    8220,    8217,    8216,      46,6 ,      46,6 ,      46,6 ,      46,6 ,    129,10 ,    139,17 ,      18,7 ,     25,12 ,    508,52 ,    508,52 ,    560,14 ,    508,52 ,    508,52 ,    560,14 ,      21,1 ,      21,1 ,   84,4 ,  88,47 ,  22,23 , {65,69,68},      109,5 ,   2293,91 ,      13,5 ,       4,0 ,      97,7 ,    270,24 ,     2,     1,     6,     5,     6 }, // Arabic/Arabic/United Arab Emirates
-    {      8,     1,   236,    46,    44,    59,    37,    48,    45,    43,   101,    8221,    8220,    8217,    8216,      46,6 ,      46,6 ,      46,6 ,      46,6 ,    129,10 ,    139,17 ,      18,7 ,     25,12 ,    508,52 ,    508,52 ,    560,14 ,    508,52 ,    508,52 ,    560,14 ,      21,1 ,      21,1 ,   84,4 ,  88,47 ,  22,23 , {77,65,68},       74,5 ,   1642,87 ,      13,5 ,       4,0 ,      97,7 ,    294,15 ,     2,     1,     1,     6,     7 }, // Arabic/Arabic/Western Sahara
-    {      8,     1,   237,  1643,  1644,  1563,    37,  1632,    45,    43,   101,    8221,    8220,    8217,    8216,      46,6 ,      46,6 ,      46,6 ,      46,6 ,    129,10 ,    139,17 ,      18,7 ,     25,12 ,    508,52 ,    508,52 ,    560,14 ,    508,52 ,    508,52 ,    560,14 ,      21,1 ,      21,1 ,   84,4 ,  88,47 ,  22,23 , {89,69,82},      114,5 ,   2384,70 ,      13,5 ,       4,0 ,      97,7 ,     309,5 ,     0,     0,     7,     5,     6 }, // Arabic/Arabic/Yemen
-    {      8,     1,   254,  1643,  1644,  1563,    37,  1632,    45,    43,   101,    8221,    8220,    8217,    8216,      46,6 ,      46,6 ,      46,6 ,      46,6 ,    129,10 ,    139,17 ,      18,7 ,     25,12 ,    508,52 ,    508,52 ,    560,14 ,    508,52 ,    508,52 ,    560,14 ,      21,1 ,      21,1 ,   84,4 ,  88,47 ,  22,23 , {83,83,80},      119,1 ,  2454,132 ,      13,5 ,       4,0 ,      97,7 ,    314,12 ,     2,     1,     1,     6,     7 }, // Arabic/Arabic/South Sudan
-    {      8,     1,   260,  1643,  1644,  1563,    37,  1632,    45,    43,   101,    8221,    8220,    8217,    8216,      46,6 ,      46,6 ,      46,6 ,      46,6 ,    129,10 ,    139,17 ,      18,7 ,     25,12 ,    508,52 ,    508,52 ,    560,14 ,    508,52 ,    508,52 ,    560,14 ,      21,1 ,      21,1 ,   84,4 ,  88,47 ,  22,23 ,    {0,0,0},        0,0 ,    2586,0 ,      13,5 ,       4,0 ,    326,22 ,     348,6 ,     2,     1,     1,     6,     7 }, // Arabic/Arabic/World
-    {      9,    10,    11,    44,   160,    59,    37,    48,    45,    43,   101,     171,     187,     171,     187,       0,6 ,       0,6 ,      52,7 ,      52,7 ,     156,8 ,    164,20 ,      37,5 ,      8,10 ,    574,28 ,    602,62 ,    664,14 ,    574,28 ,    602,62 ,    664,14 ,       0,2 ,       0,2 ,  135,6 , 141,17 ,  22,23 , {65,77,68},      120,1 ,   2586,46 ,      13,5 ,       4,0 ,     354,7 ,     361,8 ,     2,     0,     1,     6,     7 }, // Armenian/Armenian/Armenia
-    {     10,    11,   100,    46,    44,    59,    37,  2534,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,      59,9 ,      59,9 ,     184,8 ,    192,18 ,      68,7 ,     75,12 ,    678,32 ,    710,58 ,    768,14 ,    678,32 ,    710,58 ,    768,14 ,      22,9 ,      22,7 ,  158,4 , 162,37 ,  22,23 , {73,78,82},      121,1 ,   2632,43 ,       8,5 ,       4,0 ,     369,7 ,     376,4 ,     2,     1,     7,     7,     7 }, // Assamese/Bengali/India
-    {     12,     7,    15,    44,    46,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,      68,8 ,      68,8 ,     156,8 ,    210,17 ,      37,5 ,      8,10 ,    782,27 ,    809,67 ,     99,14 ,    876,27 ,    809,67 ,     99,14 ,       0,2 ,       0,2 ,  199,4 ,   5,17 ,  22,23 , {65,90,78},      122,1 ,   2675,58 ,      13,5 ,       4,0 ,    380,10 ,    390,10 ,     2,     1,     1,     6,     7 }, // Azerbaijani/Latin/Azerbaijan
-    {     12,     1,   102,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {73,82,82},        0,0 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     0,     0,     6,     5,     5 }, // Azerbaijani/Arabic/Iran
-    {     12,     2,    15,    44,    46,    59,    37,    48,    45,    43,   101,     171,     187,    8249,    8250,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     156,8 ,    210,17 ,      37,5 ,      8,10 ,    903,27 ,    930,67 ,     99,14 ,    903,27 ,    930,67 ,     99,14 ,      31,2 ,      29,2 ,   45,4 ,   5,17 ,  22,23 , {65,90,78},      122,1 ,   2733,12 ,      13,5 ,       4,0 ,    400,10 ,    410,10 ,     2,     1,     1,     6,     7 }, // Azerbaijani/Cyrillic/Azerbaijan
-    {     13,     2,   178,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {82,85,66},      123,1 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     2,     1,     1,     6,     7 }, // Bashkir/Cyrillic/Russia
-    {     14,     7,   197,    44,    46,    59,    37,    48,  8722,    43,   101,    8220,    8221,    8220,    8221,       0,6 ,       0,6 ,      76,9 ,      76,9 ,     227,6 ,    233,36 ,      37,5 ,     87,12 ,    997,28 ,   1025,68 ,   1093,14 ,    997,28 ,   1025,68 ,   1093,14 ,       0,2 ,       0,2 ,  203,7 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,   2745,20 ,      13,5 ,       4,0 ,     420,7 ,     427,8 ,     2,     1,     1,     6,     7 }, // Basque/Latin/Spain
-    {     15,    11,    18,    46,    44,    59,    37,  2534,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,      85,9 ,      85,9 ,     269,6 ,    192,18 ,      18,7 ,     25,12 ,   1107,37 ,   1144,58 ,   1202,18 ,   1107,37 ,   1144,58 ,   1202,18 ,       0,2 ,       0,2 ,  158,4 ,   5,17 ,  22,23 , {66,68,84},      124,1 ,   2765,49 ,       0,4 ,       4,0 ,     435,5 ,     440,8 ,     2,     1,     7,     6,     7 }, // Bengali/Bengali/Bangladesh
-    {     15,    11,   100,    46,    44,    59,    37,  2534,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,      85,9 ,      85,9 ,     269,6 ,    192,18 ,      18,7 ,     25,12 ,   1107,37 ,   1144,58 ,   1202,18 ,   1107,37 ,   1144,58 ,   1202,18 ,       0,2 ,       0,2 ,  158,4 ,   5,17 ,  22,23 , {73,78,82},      121,1 ,   2814,43 ,       0,4 ,       4,0 ,     435,5 ,     448,4 ,     2,     1,     7,     7,     7 }, // Bengali/Bengali/India
-    {     16,    31,    25,    46,    44,    59,    37,  3872,    45,    43,   101,    8220,    8221,    8216,    8217,      94,9 ,      94,9 ,      94,9 ,      94,9 ,     53,10 ,    275,30 ,     99,22 ,    121,27 ,   1220,34 ,   1254,79 ,   1333,27 ,   1220,34 ,   1254,79 ,   1333,27 ,      33,5 ,      31,6 ,   45,4 ,   5,17 ,  22,23 , {66,84,78},      125,3 ,   2857,15 ,       4,4 ,       4,0 ,     452,6 ,     458,5 ,     2,     1,     7,     6,     7 }, // Dzongkha/Tibetan/Bhutan
-    {     19,     7,    74,    44,   160,    59,    37,    48,    45,    43,   101,     171,     187,    8220,    8221,       0,6 ,       0,6 ,     103,8 ,     103,8 ,    119,10 ,     97,16 ,      37,5 ,      8,10 ,   1360,33 ,   1393,43 ,   1436,18 ,   1360,33 ,   1393,43 ,   1436,18 ,      38,4 ,      37,4 ,  210,7 , 217,17 , 234,23 , {69,85,82},       14,1 ,   2872,36 ,      13,5 ,       4,0 ,     463,9 ,     472,5 ,     2,     1,     1,     6,     7 }, // Breton/Latin/France
-    {     20,     2,    33,    44,   160,    59,    37,    48,    45,    43,   101,    8222,    8220,    8222,    8220,       0,6 ,       0,6 ,     111,7 ,     111,7 ,    305,12 ,    317,22 ,      55,4 ,      59,9 ,   1454,21 ,   1475,55 ,   1530,14 ,   1454,21 ,   1475,55 ,   1530,14 ,      42,6 ,      41,6 ,  257,7 ,   5,17 ,  22,23 , {66,71,78},      128,3 ,   2908,47 ,      13,5 ,       4,0 ,     477,9 ,     486,8 ,     2,     1,     1,     6,     7 }, // Bulgarian/Cyrillic/Bulgaria
-    {     21,    25,   147,    46,    44,  4170,    37,  4160,    45,    43,   101,    8220,    8221,    8216,    8217,     118,5 ,     118,5 ,    123,10 ,    123,10 ,     339,8 ,    347,18 ,     148,6 ,    154,10 ,   1544,54 ,   1544,54 ,   1598,14 ,   1544,54 ,   1544,54 ,   1598,14 ,      48,5 ,      47,3 ,  264,5 ,   5,17 ,  22,23 , {77,77,75},      131,1 ,   2955,29 ,      13,5 ,       4,0 ,     494,6 ,     494,6 ,     0,     0,     7,     6,     7 }, // Burmese/Myanmar/Myanmar
-    {     22,     2,    20,    44,   160,    59,    37,    48,    45,    43,   101,     171,     187,    8222,    8220,       0,6 ,       0,6 ,     133,7 ,     133,7 ,     365,7 ,    317,22 ,      37,5 ,    164,11 ,   1612,21 ,   1633,56 ,   1689,14 ,   1612,21 ,   1633,56 ,   1689,14 ,       0,2 ,       0,2 ,  269,5 , 274,17 ,  22,23 , {66,89,78},        0,2 ,   2984,89 ,      13,5 ,       4,0 ,    500,10 ,     510,8 ,     2,     0,     1,     6,     7 }, // Belarusian/Cyrillic/Belarus
-    {     23,    20,    36,    44,    46,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     140,9 ,     149,9 ,     269,6 ,     97,16 ,      18,7 ,     25,12 ,   1703,40 ,   1743,46 ,   1789,14 ,   1703,40 ,   1803,47 ,   1789,14 ,       0,2 ,       0,2 ,  291,2 ,   5,17 ,  22,23 , {75,72,82},      132,1 ,   3073,29 ,       0,4 ,       4,0 ,     518,5 ,     523,7 ,     2,     1,     7,     6,     7 }, // Khmer/Khmer/Cambodia
-    {     24,     7,   197,    44,    46,    59,    37,    48,    45,    43,   101,     171,     187,    8220,    8221,       0,6 ,       0,6 ,     158,7 ,     158,7 ,     269,6 ,    372,22 ,      55,4 ,      59,9 ,   1850,28 ,   1878,60 ,   1938,21 ,   1850,28 ,   1878,60 ,   1938,21 ,      53,5 ,      50,5 ,    0,5 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,   3102,20 ,      13,5 ,       4,0 ,     530,6 ,     536,7 ,     2,     1,     1,     6,     7 }, // Catalan/Latin/Spain
-    {     24,     7,     5,    44,    46,    59,    37,    48,    45,    43,   101,     171,     187,    8220,    8221,       0,6 ,       0,6 ,     158,7 ,     158,7 ,     269,6 ,    372,22 ,      55,4 ,      59,9 ,   1850,28 ,   1878,60 ,   1938,21 ,   1850,28 ,   1878,60 ,   1938,21 ,      53,5 ,      50,5 ,    0,5 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,   3102,20 ,      13,5 ,       4,0 ,     530,6 ,     543,7 ,     2,     1,     1,     6,     7 }, // Catalan/Latin/Andorra
-    {     24,     7,    74,    44,    46,    59,    37,    48,    45,    43,   101,     171,     187,    8220,    8221,       0,6 ,       0,6 ,     158,7 ,     158,7 ,     269,6 ,    372,22 ,      55,4 ,      59,9 ,   1850,28 ,   1878,60 ,   1938,21 ,   1850,28 ,   1878,60 ,   1938,21 ,      53,5 ,      50,5 ,    0,5 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,   3102,20 ,      13,5 ,       4,0 ,     530,6 ,     550,6 ,     2,     1,     1,     6,     7 }, // Catalan/Latin/France
-    {     24,     7,   106,    44,    46,    59,    37,    48,    45,    43,   101,     171,     187,    8220,    8221,       0,6 ,       0,6 ,     158,7 ,     158,7 ,     269,6 ,    372,22 ,      55,4 ,      59,9 ,   1850,28 ,   1878,60 ,   1938,21 ,   1850,28 ,   1878,60 ,   1938,21 ,      53,5 ,      50,5 ,    0,5 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,   3102,20 ,      13,5 ,       4,0 ,     530,6 ,     556,6 ,     2,     1,     1,     6,     7 }, // Catalan/Latin/Italy
-    {     25,     5,    44,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,     165,5 ,     165,5 ,     170,5 ,     170,5 ,     394,8 ,    402,13 ,     175,6 ,    181,11 ,   1959,21 ,   1980,28 ,   2008,14 ,   1959,21 ,   1980,28 ,   2008,14 ,      58,2 ,      55,2 ,  293,2 , 295,21 ,  22,23 , {67,78,89},      133,1 ,   3122,13 ,       4,4 ,       4,0 ,     562,4 ,     566,2 ,     2,     1,     7,     6,     7 }, // Chinese/Simplified Han/China
-    {     25,     5,    97,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,     165,5 ,     165,5 ,     170,5 ,     170,5 ,     269,6 ,    402,13 ,     175,6 ,    181,11 ,   1959,21 ,   1980,28 ,   2008,14 ,   1959,21 ,   1980,28 ,   2008,14 ,      58,2 ,      55,2 ,  293,2 , 295,21 ,  22,23 , {72,75,68},      134,3 ,   3135,11 ,       4,4 ,       4,0 ,     562,4 ,     568,9 ,     2,     1,     7,     6,     7 }, // Chinese/Simplified Han/Hong Kong
-    {     25,     5,   126,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,     165,5 ,     165,5 ,     170,5 ,     170,5 ,     269,6 ,    402,13 ,     175,6 ,    181,11 ,   1959,21 ,   1980,28 ,   2008,14 ,   1959,21 ,   1980,28 ,   2008,14 ,      58,2 ,      55,2 ,  293,2 , 295,21 ,  22,23 , {77,79,80},      137,4 ,   3146,13 ,       4,4 ,       4,0 ,     562,4 ,     577,9 ,     2,     1,     7,     6,     7 }, // Chinese/Simplified Han/Macau
-    {     25,     5,   190,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,     165,5 ,     165,5 ,     170,5 ,     170,5 ,      27,8 ,    402,13 ,     175,6 ,    181,11 ,   1959,21 ,   1980,28 ,   2008,14 ,   1959,21 ,   1980,28 ,   2008,14 ,      58,2 ,      55,2 ,  293,2 , 295,21 ,  22,23 , {83,71,68},        6,1 ,   3159,15 ,       4,4 ,       4,0 ,     562,4 ,     586,3 ,     2,     1,     7,     6,     7 }, // Chinese/Simplified Han/Singapore
-    {     25,     6,    97,    46,    44,    59,    37,    48,    45,    43,   101,   12300,   12301,   12302,   12303,     165,5 ,     165,5 ,     175,5 ,     175,5 ,     415,8 ,    402,13 ,     175,6 ,    192,13 ,   2022,21 ,   1980,28 ,   2008,14 ,   2022,21 ,   1980,28 ,   2008,14 ,      58,2 ,      55,2 ,  316,3 ,   5,17 ,  22,23 , {72,75,68},      134,3 ,   3135,11 ,      18,5 ,       4,0 ,     589,4 ,     593,9 ,     2,     1,     7,     6,     7 }, // Chinese/Traditional Han/Hong Kong
-    {     25,     6,   126,    46,    44,    59,    37,    48,    45,    43,   101,   12300,   12301,   12302,   12303,     165,5 ,     165,5 ,     175,5 ,     175,5 ,     415,8 ,    402,13 ,     175,6 ,    192,13 ,   2022,21 ,   1980,28 ,   2008,14 ,   2022,21 ,   1980,28 ,   2008,14 ,      58,2 ,      55,2 ,  316,3 ,   5,17 ,  22,23 , {77,79,80},      137,4 ,   3174,13 ,      18,5 ,       4,0 ,     589,4 ,     602,9 ,     2,     1,     7,     6,     7 }, // Chinese/Traditional Han/Macau
-    {     25,     6,   208,    46,    44,    59,    37,    48,    45,    43,   101,   12300,   12301,   12302,   12303,     165,5 ,     165,5 ,     170,5 ,     170,5 ,     394,8 ,    423,14 ,     175,6 ,    192,13 ,   2022,21 ,   1980,28 ,   2008,14 ,   2022,21 ,   1980,28 ,   2008,14 ,      58,2 ,      55,2 ,   45,4 ,   5,17 ,  22,23 , {84,87,68},        6,1 ,   3187,13 ,       4,4 ,       4,0 ,     589,4 ,     611,2 ,     2,     0,     7,     6,     7 }, // Chinese/Traditional Han/Taiwan
-    {     26,     7,    74,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     2,     1,     1,     6,     7 }, // Corsican/Latin/France
-    {     27,     7,    54,    44,    46,    59,    37,    48,    45,    43,   101,    8222,    8220,    8218,    8216,       0,6 ,       0,6 ,     158,7 ,     158,7 ,    437,13 ,    450,19 ,      37,5 ,     87,12 ,   2043,28 ,   2071,58 ,   2129,14 ,   2043,28 ,   2071,58 ,   2143,14 ,       0,2 ,       0,2 ,  319,7 ,   5,17 ,  22,23 , {72,82,75},      141,3 ,   3200,60 ,      13,5 ,       4,0 ,     613,8 ,     621,8 ,     2,     1,     1,     6,     7 }, // Croatian/Latin/Croatia
-    {     27,     7,    27,    44,    46,    59,    37,    48,    45,    43,   101,    8222,    8220,    8218,    8216,       0,6 ,       0,6 ,     158,7 ,     158,7 ,     469,9 ,    450,19 ,      37,5 ,     87,12 ,   2043,28 ,   2071,58 ,   2143,14 ,   2043,28 ,   2071,58 ,   2143,14 ,       0,2 ,       0,2 ,  319,7 ,   5,17 ,  22,23 , {66,65,77},      144,2 ,   3260,85 ,      13,5 ,       4,0 ,     613,8 ,    629,19 ,     2,     1,     1,     6,     7 }, // Croatian/Latin/Bosnia And Herzegowina
-    {     28,     7,    57,    44,   160,    59,    37,    48,    45,    43,   101,    8222,    8220,    8218,    8216,       0,6 ,       0,6 ,     180,7 ,     180,7 ,     156,8 ,    478,17 ,      55,4 ,      59,9 ,   2157,21 ,   2178,49 ,   2227,14 ,   2157,21 ,   2178,49 ,   2227,14 ,      60,4 ,      57,4 ,  326,5 ,   5,17 ,  22,23 , {67,90,75},      146,2 ,   3345,68 ,      13,5 ,       4,0 ,     648,7 ,     655,5 ,     2,     0,     1,     6,     7 }, // Czech/Latin/Czech Republic
-    {     29,     7,    58,    44,    46,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     187,8 ,     187,8 ,    495,10 ,    505,23 ,     205,5 ,    210,10 ,   2241,28 ,   2269,51 ,   2320,14 ,   2334,35 ,   2269,51 ,   2320,14 ,       0,2 ,       0,2 ,    0,5 ,   5,17 ,  22,23 , {68,75,75},      148,3 ,   3413,42 ,      13,5 ,       4,0 ,     660,5 ,     665,7 ,     2,     0,     1,     6,     7 }, // Danish/Latin/Denmark
-    {     29,     7,    86,    44,    46,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     187,8 ,     187,8 ,    495,10 ,    505,23 ,     205,5 ,    210,10 ,   2241,28 ,   2269,51 ,   2320,14 ,   2334,35 ,   2269,51 ,   2320,14 ,       0,2 ,       0,2 ,    0,5 ,   5,17 ,  22,23 , {68,75,75},      148,3 ,   3413,42 ,      13,5 ,       4,0 ,     660,5 ,     672,8 ,     2,     0,     1,     6,     7 }, // Danish/Latin/Greenland
-    {     30,     7,   151,    44,    46,    59,    37,    48,    45,    43,   101,    8216,    8217,    8220,    8221,       0,6 ,       0,6 ,       6,8 ,       6,8 ,    528,10 ,     97,16 ,      37,5 ,      8,10 ,   2369,21 ,   2390,59 ,   2449,14 ,   2369,21 ,   2390,59 ,   2449,14 ,      64,4 ,      61,4 ,   45,4 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,   3455,19 ,      13,5 ,       4,0 ,    680,10 ,     690,9 ,     2,     1,     1,     6,     7 }, // Dutch/Latin/Netherlands
-    {     30,     7,    12,    44,    46,    59,    37,    48,    45,    43,   101,    8216,    8217,    8220,    8221,       0,6 ,       0,6 ,       6,8 ,       6,8 ,    528,10 ,     97,16 ,      37,5 ,      8,10 ,   2369,21 ,   2390,59 ,   2449,14 ,   2369,21 ,   2390,59 ,   2449,14 ,      64,4 ,      61,4 ,   45,4 ,   5,17 ,  22,23 , {65,87,71},      151,4 ,   3474,55 ,      13,5 ,       4,0 ,    680,10 ,     699,5 ,     2,     1,     1,     6,     7 }, // Dutch/Latin/Aruba
-    {     30,     7,    21,    44,    46,    59,    37,    48,    45,    43,   101,    8216,    8217,    8220,    8221,       0,6 ,       0,6 ,       6,8 ,       6,8 ,     538,9 ,     97,16 ,      37,5 ,      8,10 ,   2369,21 ,   2390,59 ,   2449,14 ,   2369,21 ,   2390,59 ,   2449,14 ,      64,4 ,      61,4 ,   45,4 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,   3455,19 ,      13,5 ,       4,0 ,    680,10 ,     704,6 ,     2,     1,     1,     6,     7 }, // Dutch/Latin/Belgium
-    {     30,     7,   152,    44,    46,    59,    37,    48,    45,    43,   101,    8216,    8217,    8220,    8221,       0,6 ,       0,6 ,       6,8 ,       6,8 ,    528,10 ,     97,16 ,      37,5 ,      8,10 ,   2369,21 ,   2390,59 ,   2449,14 ,   2369,21 ,   2390,59 ,   2449,14 ,      64,4 ,      61,4 ,   45,4 ,   5,17 ,  22,23 , {65,78,71},      155,4 ,   3529,97 ,      13,5 ,       4,0 ,    680,10 ,     710,7 ,     2,     1,     1,     6,     7 }, // Dutch/Latin/Cura Sao
-    {     30,     7,   202,    44,    46,    59,    37,    48,    45,    43,   101,    8216,    8217,    8220,    8221,       0,6 ,       0,6 ,       6,8 ,       6,8 ,    528,10 ,     97,16 ,      37,5 ,      8,10 ,   2369,21 ,   2390,59 ,   2449,14 ,   2369,21 ,   2390,59 ,   2449,14 ,      64,4 ,      61,4 ,   45,4 ,   5,17 ,  22,23 , {83,82,68},        6,1 ,   3626,58 ,      13,5 ,       4,0 ,    680,10 ,     717,8 ,     2,     1,     1,     6,     7 }, // Dutch/Latin/Suriname
-    {     30,     7,   255,    44,    46,    59,    37,    48,    45,    43,   101,    8216,    8217,    8220,    8221,       0,6 ,       0,6 ,       6,8 ,       6,8 ,    528,10 ,     97,16 ,      37,5 ,      8,10 ,   2369,21 ,   2390,59 ,   2449,14 ,   2369,21 ,   2390,59 ,   2449,14 ,      64,4 ,      61,4 ,   45,4 ,   5,17 ,  22,23 , {85,83,68},        6,1 ,   3684,61 ,      13,5 ,       4,0 ,    680,10 ,    725,19 ,     2,     1,     1,     6,     7 }, // Dutch/Latin/Bonaire
-    {     30,     7,   256,    44,    46,    59,    37,    48,    45,    43,   101,    8216,    8217,    8220,    8221,       0,6 ,       0,6 ,       6,8 ,       6,8 ,    528,10 ,     97,16 ,      37,5 ,      8,10 ,   2369,21 ,   2390,59 ,   2449,14 ,   2369,21 ,   2390,59 ,   2449,14 ,      64,4 ,      61,4 ,   45,4 ,   5,17 ,  22,23 , {65,78,71},      155,4 ,   3529,97 ,      13,5 ,       4,0 ,    680,10 ,    744,12 ,     2,     1,     1,     6,     7 }, // Dutch/Latin/Sint Maarten
-    {     31,     7,   225,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    195,10 ,     205,9 ,     547,6 ,     35,18 ,      18,7 ,     25,12 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,       0,2 ,       0,2 ,    0,5 ,   5,17 ,  22,23 , {85,83,68},        6,1 ,   3745,35 ,       4,4 ,       4,0 ,    756,16 ,    772,13 ,     2,     1,     7,     6,     7 }, // English/Latin/United States
-    {     31,     3,   225,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {85,83,68},      159,3 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     2,     1,     7,     6,     7 }, // English/Deseret/United States
-    {     31,     7,     4,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    195,10 ,     205,9 ,     547,6 ,     35,18 ,      18,7 ,     25,12 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,       0,2 ,       0,2 ,    0,5 ,   5,17 ,  22,23 , {85,83,68},        6,1 ,   3745,35 ,       4,4 ,       4,0 ,     785,7 ,    792,14 ,     2,     1,     7,     6,     7 }, // English/Latin/American Samoa
-    {     31,     7,     7,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     205,9 ,     205,9 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {88,67,68},        6,1 ,   3780,71 ,       4,4 ,       4,0 ,     785,7 ,     806,8 ,     2,     1,     1,     6,     7 }, // English/Latin/Anguilla
-    {     31,     7,     9,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     205,9 ,     205,9 ,    119,10 ,     10,17 ,      18,7 ,     25,12 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {88,67,68},        6,1 ,   3780,71 ,       4,4 ,       4,0 ,     785,7 ,    814,17 ,     2,     1,     7,     6,     7 }, // English/Latin/Antigua And Barbuda
-    {     31,     7,    13,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     205,9 ,     205,9 ,     269,6 ,     10,17 ,      18,7 ,     25,12 ,      0,28 ,     28,57 ,   2463,25 ,      0,28 ,     28,57 ,   2463,25 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {65,85,68},        6,1 ,   3851,59 ,       4,4 ,       4,0 ,    831,18 ,     849,9 ,     2,     1,     7,     6,     7 }, // English/Latin/Australia
-    {     31,     7,    14,    44,    46,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     205,9 ,     205,9 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,   3910,20 ,       8,5 ,       4,0 ,     785,7 ,     858,7 ,     2,     1,     1,     6,     7 }, // English/Latin/Austria
-    {     31,     7,    16,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     205,9 ,     205,9 ,    119,10 ,     10,17 ,      18,7 ,     25,12 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {66,83,68},        6,1 ,   3930,53 ,       4,4 ,       4,0 ,     785,7 ,     865,7 ,     2,     1,     7,     6,     7 }, // English/Latin/Bahamas
-    {     31,     7,    19,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     205,9 ,     205,9 ,    119,10 ,     10,17 ,      18,7 ,     25,12 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {66,66,68},        6,1 ,   3983,56 ,       4,4 ,       4,0 ,     785,7 ,     872,8 ,     2,     1,     1,     6,     7 }, // English/Latin/Barbados
-    {     31,     7,    21,    44,    46,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     205,9 ,     205,9 ,      27,8 ,     10,17 ,      37,5 ,      8,10 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,   3910,20 ,      13,5 ,       4,0 ,     785,7 ,     880,7 ,     2,     1,     1,     6,     7 }, // English/Latin/Belgium
-    {     31,     7,    22,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     205,9 ,     205,9 ,      27,8 ,    553,18 ,      37,5 ,      8,10 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {66,90,68},        6,1 ,   4039,47 ,       4,4 ,       4,0 ,     785,7 ,     887,6 ,     2,     1,     7,     6,     7 }, // English/Latin/Belize
-    {     31,     7,    24,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     205,9 ,     205,9 ,    119,10 ,     10,17 ,      18,7 ,     25,12 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {66,77,68},        6,1 ,   4086,53 ,       4,4 ,       4,0 ,     785,7 ,     893,7 ,     2,     1,     1,     6,     7 }, // English/Latin/Bermuda
-    {     31,     7,    28,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     205,9 ,     205,9 ,      27,8 ,    553,18 ,      37,5 ,      8,10 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {66,87,80},      162,1 ,   4139,50 ,       4,4 ,       4,0 ,     785,7 ,     900,8 ,     2,     1,     7,     6,     7 }, // English/Latin/Botswana
-    {     31,     7,    31,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     205,9 ,     205,9 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {85,83,68},      159,3 ,   3745,35 ,       4,4 ,       4,0 ,     785,7 ,    908,30 ,     2,     1,     1,     6,     7 }, // English/Latin/British Indian Ocean Territory
-    {     31,     7,    35,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    195,10 ,     205,9 ,     547,6 ,     35,18 ,      37,5 ,      8,10 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,       0,2 ,       0,2 ,    0,5 ,   5,17 ,  22,23 , {66,73,70},      163,3 ,   4189,53 ,       4,4 ,       4,0 ,     785,7 ,     938,7 ,     0,     0,     1,     6,     7 }, // English/Latin/Burundi
-    {     31,     7,    37,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     205,9 ,     205,9 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {88,65,70},       32,4 ,   4242,83 ,       4,4 ,       4,0 ,     785,7 ,     945,8 ,     0,     0,     1,     6,     7 }, // English/Latin/Cameroon
-    {     31,     7,    38,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    195,10 ,     205,9 ,     53,10 ,     35,18 ,      18,7 ,     25,12 ,   2488,35 ,     28,57 ,     85,14 ,   2488,35 ,     28,57 ,     85,14 ,      64,4 ,      61,4 ,    0,5 ,   5,17 ,  22,23 , {67,65,68},        6,1 ,   4325,53 ,       4,4 ,       4,0 ,    953,16 ,     969,6 ,     2,     0,     7,     6,     7 }, // English/Latin/Canada
-    {     31,     7,    40,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     205,9 ,     205,9 ,    119,10 ,     10,17 ,      18,7 ,     25,12 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {75,89,68},        6,1 ,   4378,71 ,       4,4 ,       4,0 ,     785,7 ,    975,14 ,     2,     1,     1,     6,     7 }, // English/Latin/Cayman Islands
-    {     31,     7,    45,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     205,9 ,     205,9 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {65,85,68},        6,1 ,   3851,59 ,       4,4 ,       4,0 ,     785,7 ,    989,16 ,     2,     1,     1,     6,     7 }, // English/Latin/Christmas Island
-    {     31,     7,    46,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     205,9 ,     205,9 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {65,85,68},        6,1 ,   3851,59 ,       4,4 ,       4,0 ,     785,7 ,   1005,23 ,     2,     1,     1,     6,     7 }, // English/Latin/Cocos Islands
-    {     31,     7,    51,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     205,9 ,     205,9 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {78,90,68},        6,1 ,   4449,62 ,       4,4 ,       4,0 ,     785,7 ,   1028,12 ,     2,     1,     1,     6,     7 }, // English/Latin/Cook Islands
-    {     31,     7,    56,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     205,9 ,     205,9 ,    119,10 ,     10,17 ,      18,7 ,     25,12 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,   3910,20 ,       4,4 ,       4,0 ,     785,7 ,    1040,6 ,     2,     1,     1,     6,     7 }, // English/Latin/Cyprus
-    {     31,     7,    58,    44,    46,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     205,9 ,     205,9 ,    119,10 ,     10,17 ,     205,5 ,    210,10 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {68,75,75},      148,3 ,   4511,44 ,      13,5 ,       4,0 ,     785,7 ,    1046,7 ,     2,     0,     1,     6,     7 }, // English/Latin/Denmark
-    {     31,     7,    60,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     205,9 ,     205,9 ,    119,10 ,     10,17 ,      18,7 ,     25,12 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {88,67,68},        6,1 ,   3780,71 ,       4,4 ,       4,0 ,     785,7 ,    1053,8 ,     2,     1,     7,     6,     7 }, // English/Latin/Dominica
-    {     31,     7,    67,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     205,9 ,     205,9 ,    119,10 ,     10,17 ,      18,7 ,     25,12 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {69,82,78},       41,3 ,   4555,50 ,       4,4 ,       4,0 ,     785,7 ,    1061,7 ,     2,     1,     1,     6,     7 }, // English/Latin/Eritrea
-    {     31,     7,    70,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     205,9 ,     205,9 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {70,75,80},      119,1 ,   4605,74 ,       4,4 ,       4,0 ,     785,7 ,   1068,16 ,     2,     1,     1,     6,     7 }, // English/Latin/Falkland Islands
-    {     31,     7,    72,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     205,9 ,     205,9 ,    119,10 ,     10,17 ,      18,7 ,     25,12 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {70,74,68},        6,1 ,   4679,47 ,       4,4 ,       4,0 ,     785,7 ,    1084,4 ,     2,     1,     1,     6,     7 }, // English/Latin/Fiji
-    {     31,     7,    73,    44,   160,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     205,9 ,     205,9 ,    119,10 ,     10,17 ,     220,4 ,     224,9 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,   3910,20 ,      13,5 ,       4,0 ,     785,7 ,    1088,7 ,     2,     1,     1,     6,     7 }, // English/Latin/Finland
-    {     31,     7,    75,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     205,9 ,     205,9 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {71,66,80},      119,1 ,   4726,32 ,       4,4 ,       4,0 ,     785,7 ,    1095,8 ,     2,     1,     1,     6,     7 }, // English/Latin/Guernsey
-    {     31,     7,    80,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     205,9 ,     205,9 ,    119,10 ,     10,17 ,      18,7 ,     25,12 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {71,77,68},      166,1 ,   4758,50 ,       4,4 ,       4,0 ,     785,7 ,    1103,6 ,     2,     1,     1,     6,     7 }, // English/Latin/Gambia
-    {     31,     7,    82,    44,    46,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     205,9 ,     205,9 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,   3910,20 ,      13,5 ,       4,0 ,     785,7 ,    1109,7 ,     2,     1,     1,     6,     7 }, // English/Latin/Germany
-    {     31,     7,    83,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     205,9 ,     205,9 ,    119,10 ,     10,17 ,      18,7 ,     25,12 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {71,72,83},      167,3 ,   4808,47 ,       4,4 ,       4,0 ,     785,7 ,    1116,5 ,     2,     1,     1,     6,     7 }, // English/Latin/Ghana
-    {     31,     7,    84,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     205,9 ,     205,9 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {71,73,80},      119,1 ,   4855,53 ,       4,4 ,       4,0 ,     785,7 ,    1121,9 ,     2,     1,     1,     6,     7 }, // English/Latin/Gibraltar
-    {     31,     7,    87,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     205,9 ,     205,9 ,    119,10 ,     10,17 ,      18,7 ,     25,12 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {88,67,68},        6,1 ,   3780,71 ,       4,4 ,       4,0 ,     785,7 ,    1130,7 ,     2,     1,     1,     6,     7 }, // English/Latin/Grenada
-    {     31,     7,    89,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    195,10 ,     205,9 ,     547,6 ,     35,18 ,      18,7 ,     25,12 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,       0,2 ,       0,2 ,    0,5 ,   5,17 ,  22,23 , {85,83,68},        6,1 ,   3745,35 ,       4,4 ,       4,0 ,     785,7 ,    1137,4 ,     2,     1,     7,     6,     7 }, // English/Latin/Guam
-    {     31,     7,    93,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     205,9 ,     205,9 ,    119,10 ,     10,17 ,      18,7 ,     25,12 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {71,89,68},        6,1 ,   4908,56 ,       4,4 ,       4,0 ,     785,7 ,    1141,6 ,     2,     0,     1,     6,     7 }, // English/Latin/Guyana
-    {     31,     7,    97,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     205,9 ,     205,9 ,     415,8 ,     10,17 ,      18,7 ,     25,12 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {72,75,68},      134,3 ,   4964,56 ,       4,4 ,       4,0 ,     785,7 ,   1147,19 ,     2,     1,     7,     6,     7 }, // English/Latin/Hong Kong
-    {     31,     7,   100,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    195,10 ,     205,9 ,      27,8 ,    192,18 ,      18,7 ,     25,12 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {73,78,82},      121,1 ,   5020,44 ,       4,4 ,       4,0 ,     785,7 ,    1166,5 ,     2,     1,     7,     7,     7 }, // English/Latin/India
-    {     31,     7,   104,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     205,9 ,     205,9 ,    119,10 ,     97,16 ,      37,5 ,      8,10 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      64,4 ,      61,4 ,    0,5 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,   3910,20 ,       4,4 ,       4,0 ,     785,7 ,    1171,7 ,     2,     1,     1,     6,     7 }, // English/Latin/Ireland
-    {     31,     7,   105,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     205,9 ,     205,9 ,    119,10 ,     10,17 ,      55,4 ,      59,9 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {73,76,83},       49,1 ,   5064,62 ,       4,4 ,       4,0 ,     785,7 ,    1178,6 ,     2,     1,     7,     5,     6 }, // English/Latin/Israel
-    {     31,     7,   107,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     205,9 ,     205,9 ,     269,6 ,     10,17 ,      18,7 ,     25,12 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {74,77,68},        6,1 ,   5126,53 ,       4,4 ,       4,0 ,     785,7 ,    1184,7 ,     2,     1,     7,     6,     7 }, // English/Latin/Jamaica
-    {     31,     7,   111,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     205,9 ,     205,9 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {75,69,83},        2,3 ,   5179,53 ,       4,4 ,       4,0 ,     785,7 ,    1191,5 ,     2,     1,     7,     6,     7 }, // English/Latin/Kenya
-    {     31,     7,   112,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     205,9 ,     205,9 ,    119,10 ,     10,17 ,      18,7 ,     25,12 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {65,85,68},        6,1 ,   3851,59 ,       4,4 ,       4,0 ,     785,7 ,    1196,8 ,     2,     1,     1,     6,     7 }, // English/Latin/Kiribati
-    {     31,     7,   120,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     205,9 ,     205,9 ,    119,10 ,     10,17 ,      18,7 ,     25,12 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {90,65,82},        5,1 ,   5232,61 ,       4,4 ,       4,0 ,     785,7 ,    1204,7 ,     2,     1,     1,     6,     7 }, // English/Latin/Lesotho
-    {     31,     7,   121,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     205,9 ,     205,9 ,    119,10 ,     10,17 ,      18,7 ,     25,12 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {76,82,68},        6,1 ,   5293,53 ,       4,4 ,       4,0 ,     785,7 ,    1211,7 ,     2,     1,     1,     6,     7 }, // English/Latin/Liberia
-    {     31,     7,   126,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     205,9 ,     205,9 ,    119,10 ,     10,17 ,      18,7 ,     25,12 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {77,79,80},      137,4 ,   5346,53 ,       4,4 ,       4,0 ,     785,7 ,   1218,15 ,     2,     1,     7,     6,     7 }, // English/Latin/Macau
-    {     31,     7,   128,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     205,9 ,     205,9 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {77,71,65},      170,2 ,   5399,54 ,       4,4 ,       4,0 ,     785,7 ,   1233,10 ,     0,     0,     1,     6,     7 }, // English/Latin/Madagascar
-    {     31,     7,   129,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     205,9 ,     205,9 ,    119,10 ,     10,17 ,      18,7 ,     25,12 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {77,87,75},      172,2 ,   5453,53 ,       4,4 ,       4,0 ,     785,7 ,    1243,6 ,     2,     1,     1,     6,     7 }, // English/Latin/Malawi
-    {     31,     7,   130,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     205,9 ,     205,9 ,    119,10 ,     10,17 ,      18,7 ,     25,12 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {77,89,82},      174,2 ,   5506,59 ,       4,4 ,       4,0 ,     785,7 ,    1249,8 ,     2,     1,     1,     6,     7 }, // English/Latin/Malaysia
-    {     31,     7,   133,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     205,9 ,     205,9 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,   3910,20 ,       4,4 ,       4,0 ,     785,7 ,    1257,5 ,     2,     1,     7,     6,     7 }, // English/Latin/Malta
-    {     31,     7,   134,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    195,10 ,     205,9 ,     547,6 ,     35,18 ,      18,7 ,     25,12 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,       0,2 ,       0,2 ,    0,5 ,   5,17 ,  22,23 , {85,83,68},        6,1 ,   3745,35 ,       4,4 ,       4,0 ,     785,7 ,   1262,16 ,     2,     1,     7,     6,     7 }, // English/Latin/Marshall Islands
-    {     31,     7,   137,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     205,9 ,     205,9 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {77,85,82},      176,2 ,   5565,53 ,       4,4 ,       4,0 ,     785,7 ,    1278,9 ,     2,     0,     1,     6,     7 }, // English/Latin/Mauritius
-    {     31,     7,   140,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     205,9 ,     205,9 ,    119,10 ,     10,17 ,      18,7 ,     25,12 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {85,83,68},      159,3 ,   3745,35 ,       4,4 ,       4,0 ,     785,7 ,   1287,10 ,     2,     1,     1,     6,     7 }, // English/Latin/Micronesia
-    {     31,     7,   144,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     205,9 ,     205,9 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {88,67,68},        6,1 ,   3780,71 ,       4,4 ,       4,0 ,     785,7 ,   1297,10 ,     2,     1,     1,     6,     7 }, // English/Latin/Montserrat
-    {     31,     7,   148,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     205,9 ,     205,9 ,    119,10 ,     10,17 ,      18,7 ,     25,12 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {78,65,68},        6,1 ,   5618,53 ,       4,4 ,       4,0 ,     785,7 ,    1307,7 ,     2,     1,     1,     6,     7 }, // English/Latin/Namibia
-    {     31,     7,   149,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     205,9 ,     205,9 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {65,85,68},        6,1 ,   3851,59 ,       4,4 ,       4,0 ,     785,7 ,    1314,5 ,     2,     1,     1,     6,     7 }, // English/Latin/Nauru
-    {     31,     7,   151,    44,    46,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     205,9 ,     205,9 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,   3910,20 ,       8,5 ,      23,6 ,     785,7 ,   1319,11 ,     2,     1,     1,     6,     7 }, // English/Latin/Netherlands
-    {     31,     7,   154,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     205,9 ,     205,9 ,     571,7 ,     10,17 ,      18,7 ,     25,12 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {78,90,68},        6,1 ,   4449,62 ,       4,4 ,       4,0 ,     785,7 ,   1330,11 ,     2,     1,     1,     6,     7 }, // English/Latin/New Zealand
-    {     31,     7,   157,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     205,9 ,     205,9 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {78,71,78},      178,1 ,   5671,50 ,       4,4 ,       4,0 ,     785,7 ,    1341,7 ,     2,     1,     1,     6,     7 }, // English/Latin/Nigeria
-    {     31,     7,   158,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     205,9 ,     205,9 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {78,90,68},        6,1 ,   4449,62 ,       4,4 ,       4,0 ,     785,7 ,    1348,4 ,     2,     1,     1,     6,     7 }, // English/Latin/Niue
-    {     31,     7,   159,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     205,9 ,     205,9 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {65,85,68},        6,1 ,   3851,59 ,       4,4 ,       4,0 ,     785,7 ,   1352,14 ,     2,     1,     1,     6,     7 }, // English/Latin/Norfolk Island
-    {     31,     7,   160,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    195,10 ,     205,9 ,     547,6 ,     35,18 ,      18,7 ,     25,12 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,       0,2 ,       0,2 ,    0,5 ,   5,17 ,  22,23 , {85,83,68},        6,1 ,   3745,35 ,       4,4 ,       4,0 ,     785,7 ,   1366,24 ,     2,     1,     1,     6,     7 }, // English/Latin/Northern Mariana Islands
-    {     31,     7,   163,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     205,9 ,     205,9 ,    119,10 ,     10,17 ,      18,7 ,     25,12 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {80,75,82},      176,2 ,   5721,53 ,       4,4 ,       4,0 ,     785,7 ,    1390,8 ,     2,     0,     7,     6,     7 }, // English/Latin/Pakistan
-    {     31,     7,   164,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     205,9 ,     205,9 ,    119,10 ,     10,17 ,      18,7 ,     25,12 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {85,83,68},      159,3 ,   3745,35 ,       4,4 ,       4,0 ,     785,7 ,    1398,5 ,     2,     1,     1,     6,     7 }, // English/Latin/Palau
-    {     31,     7,   167,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     205,9 ,     205,9 ,    119,10 ,     10,17 ,      18,7 ,     25,12 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {80,71,75},      131,1 ,   5774,73 ,       4,4 ,       4,0 ,     785,7 ,   1403,16 ,     2,     1,     1,     6,     7 }, // English/Latin/Papua New Guinea
-    {     31,     7,   170,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     205,9 ,     205,9 ,    119,10 ,     10,17 ,      18,7 ,     25,12 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {80,72,80},      179,1 ,   5847,53 ,       4,4 ,       4,0 ,     785,7 ,   1419,11 ,     2,     1,     7,     6,     7 }, // English/Latin/Philippines
-    {     31,     7,   171,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     205,9 ,     205,9 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {78,90,68},        6,1 ,   4449,62 ,       4,4 ,       4,0 ,     785,7 ,   1430,16 ,     2,     1,     1,     6,     7 }, // English/Latin/Pitcairn
-    {     31,     7,   174,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    195,10 ,     205,9 ,     547,6 ,     35,18 ,      18,7 ,     25,12 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,       0,2 ,       0,2 ,    0,5 ,   5,17 ,  22,23 , {85,83,68},        6,1 ,   3745,35 ,       4,4 ,       4,0 ,     785,7 ,   1446,11 ,     2,     1,     7,     6,     7 }, // English/Latin/Puerto Rico
-    {     31,     7,   179,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     205,9 ,     205,9 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {82,87,70},      180,2 ,   5900,47 ,       4,4 ,       4,0 ,     785,7 ,    1457,6 ,     0,     0,     1,     6,     7 }, // English/Latin/Rwanda
-    {     31,     7,   180,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     205,9 ,     205,9 ,    119,10 ,     10,17 ,      18,7 ,     25,12 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {88,67,68},        6,1 ,   3780,71 ,       4,4 ,       4,0 ,     785,7 ,   1463,16 ,     2,     1,     1,     6,     7 }, // English/Latin/Saint Kitts And Nevis
-    {     31,     7,   181,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     205,9 ,     205,9 ,    119,10 ,     10,17 ,      18,7 ,     25,12 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {88,67,68},        6,1 ,   3780,71 ,       4,4 ,       4,0 ,     785,7 ,    1479,8 ,     2,     1,     1,     6,     7 }, // English/Latin/Saint Lucia
-    {     31,     7,   182,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     205,9 ,     205,9 ,    119,10 ,     10,17 ,      18,7 ,     25,12 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {88,67,68},        6,1 ,   3780,71 ,       4,4 ,       4,0 ,     785,7 ,   1487,23 ,     2,     1,     1,     6,     7 }, // English/Latin/Saint Vincent And The Grenadines
-    {     31,     7,   183,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     205,9 ,     205,9 ,    119,10 ,     10,17 ,      18,7 ,     25,12 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {87,83,84},      182,3 ,   5947,40 ,       4,4 ,       4,0 ,     785,7 ,    1510,5 ,     2,     1,     7,     6,     7 }, // English/Latin/Samoa
-    {     31,     7,   188,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     205,9 ,     205,9 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {83,67,82},      185,2 ,   5987,59 ,       4,4 ,       4,0 ,     785,7 ,   1515,10 ,     2,     1,     1,     6,     7 }, // English/Latin/Seychelles
-    {     31,     7,   189,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     205,9 ,     205,9 ,    119,10 ,     10,17 ,      18,7 ,     25,12 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {83,76,76},      187,2 ,   6046,68 ,       4,4 ,       4,0 ,     785,7 ,   1525,12 ,     0,     0,     1,     6,     7 }, // English/Latin/Sierra Leone
-    {     31,     7,   190,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     205,9 ,     205,9 ,     269,6 ,     10,17 ,      18,7 ,     25,12 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {83,71,68},        6,1 ,   6114,56 ,       4,4 ,       4,0 ,     785,7 ,    1537,9 ,     2,     1,     7,     6,     7 }, // English/Latin/Singapore
-    {     31,     7,   192,    44,    46,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     205,9 ,     205,9 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,   3910,20 ,      13,5 ,      29,7 ,     785,7 ,    1546,8 ,     2,     1,     1,     6,     7 }, // English/Latin/Slovenia
-    {     31,     7,   193,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     205,9 ,     205,9 ,    119,10 ,     10,17 ,      18,7 ,     25,12 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {83,66,68},        6,1 ,   6170,74 ,       4,4 ,       4,0 ,     785,7 ,   1554,15 ,     2,     1,     1,     6,     7 }, // English/Latin/Solomon Islands
-    {     31,     7,   195,    44,   160,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     205,9 ,     205,9 ,    578,10 ,    553,18 ,      37,5 ,      8,10 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {90,65,82},        5,1 ,   5232,61 ,       4,4 ,       4,0 ,     785,7 ,   1569,12 ,     2,     1,     7,     6,     7 }, // English/Latin/South Africa
-    {     31,     7,   199,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     205,9 ,     205,9 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {83,72,80},      119,1 ,   6244,53 ,       4,4 ,       4,0 ,     785,7 ,    1581,9 ,     2,     1,     1,     6,     7 }, // English/Latin/Saint Helena
-    {     31,     7,   201,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     205,9 ,     205,9 ,    119,10 ,     10,17 ,      18,7 ,     25,12 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {83,68,71},        0,0 ,   6297,50 ,       4,4 ,       4,0 ,     785,7 ,    1590,5 ,     2,     1,     6,     5,     6 }, // English/Latin/Sudan
-    {     31,     7,   204,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     205,9 ,     205,9 ,    119,10 ,     10,17 ,      18,7 ,     25,12 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {83,90,76},      189,1 ,   6347,53 ,       4,4 ,       4,0 ,     785,7 ,    1595,8 ,     2,     1,     1,     6,     7 }, // English/Latin/Swaziland
-    {     31,     7,   205,    44,   160,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     205,9 ,     205,9 ,     53,10 ,     10,17 ,      37,5 ,      8,10 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {83,69,75},      190,2 ,   6400,47 ,      13,5 ,       4,0 ,     785,7 ,    1603,6 ,     2,     0,     1,     6,     7 }, // English/Latin/Sweden
-    {     31,     7,   206,    46,  8217,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     205,9 ,     205,9 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {67,72,70},        0,0 ,   6447,41 ,       8,5 ,      36,5 ,     785,7 ,   1609,11 ,     2,     0,     1,     6,     7 }, // English/Latin/Switzerland
-    {     31,     7,   210,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     205,9 ,     205,9 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {84,90,83},      192,3 ,   6488,62 ,       4,4 ,       4,0 ,     785,7 ,    1620,8 ,     2,     0,     1,     6,     7 }, // English/Latin/Tanzania
-    {     31,     7,   213,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     205,9 ,     205,9 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {78,90,68},        6,1 ,   4449,62 ,       4,4 ,       4,0 ,     785,7 ,    1628,7 ,     2,     1,     1,     6,     7 }, // English/Latin/Tokelau
-    {     31,     7,   214,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     205,9 ,     205,9 ,    119,10 ,     10,17 ,      18,7 ,     25,12 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {84,79,80},      195,2 ,   6550,49 ,       4,4 ,       4,0 ,     785,7 ,    1635,5 ,     2,     1,     1,     6,     7 }, // English/Latin/Tonga
-    {     31,     7,   215,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     205,9 ,     205,9 ,    119,10 ,     10,17 ,      18,7 ,     25,12 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {84,84,68},        6,1 ,   6599,80 ,       4,4 ,       4,0 ,     785,7 ,   1640,17 ,     2,     1,     7,     6,     7 }, // English/Latin/Trinidad And Tobago
-    {     31,     7,   219,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     205,9 ,     205,9 ,    119,10 ,     10,17 ,      18,7 ,     25,12 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {85,83,68},      159,3 ,   3745,35 ,       4,4 ,       4,0 ,     785,7 ,   1657,22 ,     2,     1,     1,     6,     7 }, // English/Latin/Turks And Caicos Islands
-    {     31,     7,   220,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     205,9 ,     205,9 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {65,85,68},        6,1 ,   3851,59 ,       4,4 ,       4,0 ,     785,7 ,    1679,6 ,     2,     1,     1,     6,     7 }, // English/Latin/Tuvalu
-    {     31,     7,   221,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     205,9 ,     205,9 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {85,71,88},      197,3 ,   6679,56 ,       4,4 ,       4,0 ,     785,7 ,    1685,6 ,     0,     0,     1,     7,     7 }, // English/Latin/Uganda
-    {     31,     7,   223,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    195,10 ,     205,9 ,    119,10 ,     10,17 ,      18,7 ,     25,12 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,       0,2 ,       0,2 ,    0,5 ,   5,17 ,  22,23 , {65,69,68},      200,3 ,   6735,55 ,       4,4 ,       4,0 ,     785,7 ,   1691,20 ,     2,     1,     6,     5,     6 }, // English/Latin/United Arab Emirates
-    {     31,     7,   224,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     205,9 ,     205,9 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {71,66,80},      119,1 ,   6790,47 ,       4,4 ,       4,0 ,   1711,15 ,   1726,14 ,     2,     1,     1,     6,     7 }, // English/Latin/United Kingdom
-    {     31,     7,   226,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    195,10 ,     205,9 ,     547,6 ,     35,18 ,      18,7 ,     25,12 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,       0,2 ,       0,2 ,    0,5 ,   5,17 ,  22,23 , {85,83,68},        6,1 ,   3745,35 ,       4,4 ,       4,0 ,     785,7 ,   1740,21 ,     2,     1,     7,     6,     7 }, // English/Latin/United States Minor Outlying Islands
-    {     31,     7,   229,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     205,9 ,     205,9 ,    119,10 ,     10,17 ,      18,7 ,     25,12 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {86,85,86},      203,2 ,   6837,44 ,       4,4 ,       4,0 ,     785,7 ,    1761,7 ,     0,     0,     1,     6,     7 }, // English/Latin/Vanuatu
-    {     31,     7,   233,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     205,9 ,     205,9 ,    119,10 ,     10,17 ,      18,7 ,     25,12 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {85,83,68},      159,3 ,   3745,35 ,       4,4 ,       4,0 ,     785,7 ,   1768,22 ,     2,     1,     1,     6,     7 }, // English/Latin/British Virgin Islands
-    {     31,     7,   234,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    195,10 ,     205,9 ,     547,6 ,     35,18 ,      18,7 ,     25,12 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,       0,2 ,       0,2 ,    0,5 ,   5,17 ,  22,23 , {85,83,68},        6,1 ,   3745,35 ,       4,4 ,       4,0 ,     785,7 ,   1790,19 ,     2,     1,     7,     6,     7 }, // English/Latin/United States Virgin Islands
-    {     31,     7,   239,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     205,9 ,     205,9 ,    119,10 ,     10,17 ,      18,7 ,     25,12 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {90,77,87},      131,1 ,   6881,50 ,       4,4 ,       4,0 ,     785,7 ,    1809,6 ,     2,     1,     1,     6,     7 }, // English/Latin/Zambia
-    {     31,     7,   240,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     205,9 ,     205,9 ,     415,8 ,    553,18 ,      37,5 ,      8,10 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {85,83,68},      159,3 ,   3745,35 ,       4,4 ,       4,0 ,     785,7 ,    1815,8 ,     2,     1,     7,     6,     7 }, // English/Latin/Zimbabwe
-    {     31,     7,   249,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     205,9 ,     205,9 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {85,83,68},      159,3 ,   3745,35 ,       4,4 ,       4,0 ,     785,7 ,   1823,12 ,     2,     1,     1,     6,     7 }, // English/Latin/Diego Garcia
-    {     31,     7,   251,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     205,9 ,     205,9 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {71,66,80},      119,1 ,   4726,32 ,       4,4 ,       4,0 ,     785,7 ,   1835,11 ,     2,     1,     1,     6,     7 }, // English/Latin/Isle Of Man
-    {     31,     7,   252,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     205,9 ,     205,9 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {71,66,80},      119,1 ,   4726,32 ,       4,4 ,       4,0 ,     785,7 ,    1846,6 ,     2,     1,     1,     6,     7 }, // English/Latin/Jersey
-    {     31,     7,   254,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     205,9 ,     205,9 ,    119,10 ,     10,17 ,      18,7 ,     25,12 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {83,83,80},      119,1 ,   6931,68 ,       4,4 ,       4,0 ,     785,7 ,   1852,11 ,     2,     1,     1,     6,     7 }, // English/Latin/South Sudan
-    {     31,     7,   256,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     205,9 ,     205,9 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 , {65,78,71},      155,4 ,   6999,95 ,       4,4 ,       4,0 ,     785,7 ,   1863,12 ,     2,     1,     1,     6,     7 }, // English/Latin/Sint Maarten
-    {     31,     7,   260,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     205,9 ,     205,9 ,    119,10 ,     10,17 ,      18,7 ,     25,12 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 ,    {0,0,0},        0,0 ,    2586,0 ,       4,4 ,       4,0 ,     785,7 ,    1875,5 ,     2,     1,     1,     6,     7 }, // English/Latin/World
-    {     31,     7,   261,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     205,9 ,     205,9 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,      0,28 ,     28,57 ,     85,14 ,      0,28 ,     28,57 ,     85,14 ,      68,2 ,      65,2 ,    0,5 ,   5,17 ,  22,23 ,    {0,0,0},        0,0 ,    2586,0 ,      13,5 ,       4,0 ,     785,7 ,    1880,6 ,     2,     1,     1,     6,     7 }, // English/Latin/Europe
-    {     32,     7,   260,    44,   160,    59,    37,    48,  8722,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     214,9 ,     214,9 ,     588,8 ,    596,26 ,      37,5 ,    233,25 ,   2523,21 ,   2544,51 ,   2595,14 ,   2523,21 ,   2544,51 ,   2595,14 ,      70,3 ,      67,3 ,  331,6 ,   5,17 ,  22,23 ,    {0,0,0},        0,0 ,    2586,0 ,      41,6 ,       4,0 ,    1886,9 ,    1895,5 ,     2,     1,     1,     6,     7 }, // Esperanto/Latin/World
-    {     33,     7,    68,    44,   160,    59,    37,    48,  8722,    43,   101,    8222,    8220,    8218,    8216,       0,6 ,       0,6 ,     223,8 ,     223,8 ,     156,8 ,    622,18 ,      37,5 ,      8,10 ,   2609,14 ,   2623,63 ,   2609,14 ,   2609,14 ,   2623,63 ,   2609,14 ,       0,2 ,       0,2 ,  337,6 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,   7094,20 ,      13,5 ,       4,0 ,    1900,5 ,    1905,5 ,     2,     1,     1,     6,     7 }, // Estonian/Latin/Estonia
-    {     34,     7,    71,    44,    46,    59,    37,    48,  8722,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     187,8 ,     187,8 ,     156,8 ,    622,18 ,      37,5 ,      8,10 ,   2686,28 ,   2714,74 ,   2788,14 ,   2802,35 ,   2714,74 ,   2788,14 ,       0,2 ,       0,2 ,  343,3 ,   5,17 ,  22,23 , {68,75,75},      190,2 ,   7114,43 ,      13,5 ,       4,0 ,    1910,8 ,    1918,7 ,     2,     0,     1,     6,     7 }, // Faroese/Latin/Faroe Islands
-    {     34,     7,    58,    44,    46,    59,    37,    48,  8722,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     187,8 ,     187,8 ,     156,8 ,    622,18 ,      37,5 ,      8,10 ,   2686,28 ,   2714,74 ,   2788,14 ,   2802,35 ,   2714,74 ,   2788,14 ,       0,2 ,       0,2 ,  343,3 ,   5,17 ,  22,23 , {68,75,75},      148,3 ,   7114,43 ,      13,5 ,       4,0 ,    1910,8 ,     665,7 ,     2,     0,     1,     6,     7 }, // Faroese/Latin/Denmark
-    {     36,     7,    73,    44,   160,    59,    37,    48,  8722,    43,   101,    8221,    8221,    8217,    8217,       0,6 ,       0,6 ,     223,8 ,     223,8 ,     640,8 ,    478,17 ,     220,4 ,     224,9 ,   2837,21 ,   2858,67 ,   2925,14 ,   2837,21 ,   2939,81 ,   2925,14 ,      73,3 ,      70,3 ,  346,5 , 351,17 , 368,23 , {69,85,82},       14,1 ,   7157,20 ,      13,5 ,       4,0 ,    1925,5 ,    1930,5 ,     2,     1,     1,     6,     7 }, // Finnish/Latin/Finland
-    {     37,     7,    74,    44,  8239,    59,    37,    48,    45,    43,   101,     171,     187,     171,     187,       0,6 ,       0,6 ,     231,8 ,     231,8 ,    119,10 ,     97,16 ,      37,5 ,      8,10 ,   3020,35 ,   3055,52 ,   3107,14 ,   3020,35 ,   3055,52 ,   3107,14 ,       0,2 ,       0,2 ,  391,6 , 217,17 , 234,23 , {69,85,82},       14,1 ,   3102,20 ,      13,5 ,       4,0 ,    1935,8 ,    1943,6 ,     2,     1,     1,     6,     7 }, // French/Latin/France
-    {     37,     7,     3,    44,  8239,    59,    37,    48,    45,    43,   101,     171,     187,     171,     187,       0,6 ,       0,6 ,     231,8 ,     231,8 ,    119,10 ,     97,16 ,      18,7 ,     25,12 ,   3020,35 ,   3055,52 ,   3107,14 ,   3020,35 ,   3055,52 ,   3107,14 ,       0,2 ,       0,2 ,  391,6 , 217,17 , 234,23 , {68,90,68},      205,2 ,   7177,51 ,      13,5 ,       4,0 ,    1935,8 ,    1949,7 ,     2,     1,     6,     5,     6 }, // French/Latin/Algeria
-    {     37,     7,    21,    44,  8239,    59,    37,    48,    45,    43,   101,     171,     187,     171,     187,       0,6 ,       0,6 ,     231,8 ,     231,8 ,     571,7 ,     97,16 ,      37,5 ,    258,23 ,   3020,35 ,   3055,52 ,   3107,14 ,   3020,35 ,   3055,52 ,   3107,14 ,       0,2 ,       0,2 ,  391,6 , 217,17 , 234,23 , {69,85,82},       14,1 ,   3102,20 ,      13,5 ,       4,0 ,    1935,8 ,    1956,8 ,     2,     1,     1,     6,     7 }, // French/Latin/Belgium
-    {     37,     7,    23,    44,  8239,    59,    37,    48,    45,    43,   101,     171,     187,     171,     187,       0,6 ,       0,6 ,     231,8 ,     231,8 ,    119,10 ,     97,16 ,      37,5 ,      8,10 ,   3020,35 ,   3055,52 ,   3107,14 ,   3020,35 ,   3055,52 ,   3107,14 ,       0,2 ,       0,2 ,  391,6 , 217,17 , 234,23 , {88,79,70},      207,3 ,   7228,59 ,      13,5 ,       4,0 ,    1935,8 ,    1964,5 ,     0,     0,     1,     6,     7 }, // French/Latin/Benin
-    {     37,     7,    34,    44,  8239,    59,    37,    48,    45,    43,   101,     171,     187,     171,     187,       0,6 ,       0,6 ,     231,8 ,     231,8 ,    119,10 ,     97,16 ,      37,5 ,      8,10 ,   3020,35 ,   3055,52 ,   3107,14 ,   3020,35 ,   3055,52 ,   3107,14 ,       0,2 ,       0,2 ,  391,6 , 217,17 , 234,23 , {88,79,70},      207,3 ,   7228,59 ,      13,5 ,       4,0 ,    1935,8 ,   1969,12 ,     0,     0,     1,     6,     7 }, // French/Latin/Burkina Faso
-    {     37,     7,    35,    44,  8239,    59,    37,    48,    45,    43,   101,     171,     187,     171,     187,       0,6 ,       0,6 ,     231,8 ,     231,8 ,    119,10 ,     97,16 ,      37,5 ,      8,10 ,   3020,35 ,   3055,52 ,   3107,14 ,   3020,35 ,   3055,52 ,   3107,14 ,       0,2 ,       0,2 ,  391,6 , 217,17 , 234,23 , {66,73,70},      163,3 ,   7287,53 ,      13,5 ,       4,0 ,    1935,8 ,     938,7 ,     0,     0,     1,     6,     7 }, // French/Latin/Burundi
-    {     37,     7,    37,    44,  8239,    59,    37,    48,    45,    43,   101,     171,     187,     171,     187,       0,6 ,       0,6 ,     231,8 ,     231,8 ,    119,10 ,     97,16 ,      37,5 ,      8,10 ,   3020,35 ,   3055,52 ,   3107,14 ,   3020,35 ,   3055,52 ,   3107,14 ,      76,5 ,      73,4 ,  391,6 , 217,17 , 234,23 , {88,65,70},       32,4 ,   7340,56 ,      13,5 ,       4,0 ,    1935,8 ,    1981,8 ,     0,     0,     1,     6,     7 }, // French/Latin/Cameroon
-    {     37,     7,    38,    44,   160,    59,    37,    48,    45,    43,   101,     171,     187,    8221,    8220,       0,6 ,       0,6 ,     231,8 ,     231,8 ,     53,10 ,     97,16 ,     281,9 ,    290,24 ,   3020,35 ,   3055,52 ,   3107,14 ,   3020,35 ,   3055,52 ,   3107,14 ,      64,4 ,      61,4 ,  391,6 , 217,17 , 234,23 , {67,65,68},        6,1 ,   7396,54 ,      47,6 ,       4,0 ,   1989,17 ,     969,6 ,     2,     0,     7,     6,     7 }, // French/Latin/Canada
-    {     37,     7,    41,    44,  8239,    59,    37,    48,    45,    43,   101,     171,     187,     171,     187,       0,6 ,       0,6 ,     231,8 ,     231,8 ,    119,10 ,     97,16 ,      37,5 ,      8,10 ,   3020,35 ,   3055,52 ,   3107,14 ,   3020,35 ,   3055,52 ,   3107,14 ,       0,2 ,       0,2 ,  391,6 , 217,17 , 234,23 , {88,65,70},       32,4 ,   7340,56 ,      13,5 ,       4,0 ,    1935,8 ,   2006,25 ,     0,     0,     1,     6,     7 }, // French/Latin/Central African Republic
-    {     37,     7,    42,    44,  8239,    59,    37,    48,    45,    43,   101,     171,     187,     171,     187,       0,6 ,       0,6 ,     231,8 ,     231,8 ,    119,10 ,     97,16 ,      18,7 ,     25,12 ,   3020,35 ,   3055,52 ,   3107,14 ,   3020,35 ,   3055,52 ,   3107,14 ,       0,2 ,       0,2 ,  391,6 , 217,17 , 234,23 , {88,65,70},       32,4 ,   7340,56 ,      13,5 ,       4,0 ,    1935,8 ,    2031,5 ,     0,     0,     1,     6,     7 }, // French/Latin/Chad
-    {     37,     7,    48,    44,  8239,    59,    37,    48,    45,    43,   101,     171,     187,     171,     187,       0,6 ,       0,6 ,     231,8 ,     231,8 ,    119,10 ,     97,16 ,      37,5 ,      8,10 ,   3020,35 ,   3055,52 ,   3107,14 ,   3020,35 ,   3055,52 ,   3107,14 ,       0,2 ,       0,2 ,  391,6 , 217,17 , 234,23 , {75,77,70},       36,2 ,   7450,51 ,      13,5 ,       4,0 ,    1935,8 ,    2036,7 ,     0,     0,     1,     6,     7 }, // French/Latin/Comoros
-    {     37,     7,    49,    44,  8239,    59,    37,    48,    45,    43,   101,     171,     187,     171,     187,       0,6 ,       0,6 ,     231,8 ,     231,8 ,    119,10 ,     97,16 ,      37,5 ,      8,10 ,   3020,35 ,   3055,52 ,   3107,14 ,   3020,35 ,   3055,52 ,   3107,14 ,       0,2 ,       0,2 ,  391,6 , 217,17 , 234,23 , {67,68,70},      210,2 ,   7501,53 ,      13,5 ,       4,0 ,    1935,8 ,   2043,14 ,     2,     1,     1,     6,     7 }, // French/Latin/Congo Kinshasa
-    {     37,     7,    50,    44,  8239,    59,    37,    48,    45,    43,   101,     171,     187,     171,     187,       0,6 ,       0,6 ,     231,8 ,     231,8 ,    119,10 ,     97,16 ,      37,5 ,      8,10 ,   3020,35 ,   3055,52 ,   3107,14 ,   3020,35 ,   3055,52 ,   3107,14 ,       0,2 ,       0,2 ,  391,6 , 217,17 , 234,23 , {88,65,70},       32,4 ,   7340,56 ,      13,5 ,       4,0 ,    1935,8 ,   2057,17 ,     0,     0,     1,     6,     7 }, // French/Latin/Congo Brazzaville
-    {     37,     7,    53,    44,  8239,    59,    37,    48,    45,    43,   101,     171,     187,     171,     187,       0,6 ,       0,6 ,     231,8 ,     231,8 ,    119,10 ,     97,16 ,      37,5 ,      8,10 ,   3020,35 ,   3055,52 ,   3107,14 ,   3020,35 ,   3055,52 ,   3107,14 ,       0,2 ,       0,2 ,  391,6 , 217,17 , 234,23 , {88,79,70},      207,3 ,   7228,59 ,      13,5 ,       4,0 ,    1935,8 ,   2074,13 ,     0,     0,     1,     6,     7 }, // French/Latin/Ivory Coast
-    {     37,     7,    59,    44,  8239,    59,    37,    48,    45,    43,   101,     171,     187,     171,     187,       0,6 ,       0,6 ,     231,8 ,     231,8 ,    119,10 ,     97,16 ,      18,7 ,     25,12 ,   3020,35 ,   3055,52 ,   3107,14 ,   3020,35 ,   3055,52 ,   3107,14 ,       0,2 ,       0,2 ,  391,6 , 217,17 , 234,23 , {68,74,70},       38,3 ,   7554,57 ,      13,5 ,       4,0 ,    1935,8 ,    2087,8 ,     0,     0,     6,     6,     7 }, // French/Latin/Djibouti
-    {     37,     7,    66,    44,  8239,    59,    37,    48,    45,    43,   101,     171,     187,     171,     187,       0,6 ,       0,6 ,     231,8 ,     231,8 ,    119,10 ,     97,16 ,      37,5 ,      8,10 ,   3020,35 ,   3055,52 ,   3107,14 ,   3020,35 ,   3055,52 ,   3107,14 ,       0,2 ,       0,2 ,  391,6 , 217,17 , 234,23 , {88,65,70},       32,4 ,   7340,56 ,      13,5 ,       4,0 ,    1935,8 ,   2095,18 ,     0,     0,     1,     6,     7 }, // French/Latin/Equatorial Guinea
-    {     37,     7,    76,    44,  8239,    59,    37,    48,    45,    43,   101,     171,     187,     171,     187,       0,6 ,       0,6 ,     231,8 ,     231,8 ,    119,10 ,     97,16 ,      37,5 ,      8,10 ,   3020,35 ,   3055,52 ,   3107,14 ,   3020,35 ,   3055,52 ,   3107,14 ,       0,2 ,       0,2 ,  391,6 , 217,17 , 234,23 , {69,85,82},       14,1 ,   3102,20 ,      13,5 ,       4,0 ,    1935,8 ,   2113,16 ,     2,     1,     1,     6,     7 }, // French/Latin/French Guiana
-    {     37,     7,    77,    44,  8239,    59,    37,    48,    45,    43,   101,     171,     187,     171,     187,       0,6 ,       0,6 ,     231,8 ,     231,8 ,    119,10 ,     97,16 ,      37,5 ,      8,10 ,   3020,35 ,   3055,52 ,   3107,14 ,   3020,35 ,   3055,52 ,   3107,14 ,       0,2 ,       0,2 ,  391,6 , 217,17 , 234,23 , {88,80,70},      212,4 ,   7611,35 ,      13,5 ,       4,0 ,    1935,8 ,   2129,19 ,     0,     0,     1,     6,     7 }, // French/Latin/French Polynesia
-    {     37,     7,    79,    44,  8239,    59,    37,    48,    45,    43,   101,     171,     187,     171,     187,       0,6 ,       0,6 ,     231,8 ,     231,8 ,    119,10 ,     97,16 ,      37,5 ,      8,10 ,   3020,35 ,   3055,52 ,   3107,14 ,   3020,35 ,   3055,52 ,   3107,14 ,       0,2 ,       0,2 ,  391,6 , 217,17 , 234,23 , {88,65,70},       32,4 ,   7340,56 ,      13,5 ,       4,0 ,    1935,8 ,    2148,5 ,     0,     0,     1,     6,     7 }, // French/Latin/Gabon
-    {     37,     7,    88,    44,  8239,    59,    37,    48,    45,    43,   101,     171,     187,     171,     187,       0,6 ,       0,6 ,     231,8 ,     231,8 ,    119,10 ,     97,16 ,      37,5 ,      8,10 ,   3020,35 ,   3055,52 ,   3107,14 ,   3020,35 ,   3055,52 ,   3107,14 ,       0,2 ,       0,2 ,  391,6 , 217,17 , 234,23 , {69,85,82},       14,1 ,   3102,20 ,      13,5 ,       4,0 ,    1935,8 ,   2153,10 ,     2,     1,     1,     6,     7 }, // French/Latin/Guadeloupe
-    {     37,     7,    91,    44,  8239,    59,    37,    48,    45,    43,   101,     171,     187,     171,     187,       0,6 ,       0,6 ,     231,8 ,     231,8 ,    119,10 ,     97,16 ,      37,5 ,      8,10 ,   3020,35 ,   3055,52 ,   3107,14 ,   3020,35 ,   3055,52 ,   3107,14 ,       0,2 ,       0,2 ,  391,6 , 217,17 , 234,23 , {71,78,70},      216,2 ,   7646,48 ,      13,5 ,       4,0 ,    1935,8 ,    2163,6 ,     0,     0,     1,     6,     7 }, // French/Latin/Guinea
-    {     37,     7,    94,    44,  8239,    59,    37,    48,    45,    43,   101,     171,     187,     171,     187,       0,6 ,       0,6 ,     231,8 ,     231,8 ,    119,10 ,     97,16 ,      37,5 ,      8,10 ,   3020,35 ,   3055,52 ,   3107,14 ,   3020,35 ,   3055,52 ,   3107,14 ,       0,2 ,       0,2 ,  391,6 , 217,17 , 234,23 , {72,84,71},      218,1 ,   7694,57 ,      13,5 ,       4,0 ,    1935,8 ,    2169,5 ,     2,     1,     1,     6,     7 }, // French/Latin/Haiti
-    {     37,     7,   125,    44,    46,    59,    37,    48,    45,    43,   101,     171,     187,     171,     187,       0,6 ,       0,6 ,     231,8 ,     231,8 ,    119,10 ,     97,16 ,      37,5 ,      8,10 ,   3020,35 ,   3055,52 ,   3107,14 ,   3020,35 ,   3055,52 ,   3107,14 ,       0,2 ,       0,2 ,  391,6 , 217,17 , 234,23 , {69,85,82},       14,1 ,   3102,20 ,      13,5 ,       4,0 ,    1935,8 ,   2174,10 ,     2,     1,     1,     6,     7 }, // French/Latin/Luxembourg
-    {     37,     7,   128,    44,  8239,    59,    37,    48,    45,    43,   101,     171,     187,     171,     187,       0,6 ,       0,6 ,     231,8 ,     231,8 ,    119,10 ,     97,16 ,      37,5 ,      8,10 ,   3020,35 ,   3055,52 ,   3107,14 ,   3020,35 ,   3055,52 ,   3107,14 ,       0,2 ,       0,2 ,  391,6 , 217,17 , 234,23 , {77,71,65},      170,2 ,   7751,54 ,      13,5 ,       4,0 ,    1935,8 ,   1233,10 ,     0,     0,     1,     6,     7 }, // French/Latin/Madagascar
-    {     37,     7,   132,    44,  8239,    59,    37,    48,    45,    43,   101,     171,     187,     171,     187,       0,6 ,       0,6 ,     231,8 ,     231,8 ,    119,10 ,     97,16 ,      37,5 ,      8,10 ,   3020,35 ,   3055,52 ,   3107,14 ,   3020,35 ,   3055,52 ,   3107,14 ,       0,2 ,       0,2 ,  391,6 , 217,17 , 234,23 , {88,79,70},      207,3 ,   7228,59 ,      13,5 ,       4,0 ,    1935,8 ,    2184,4 ,     0,     0,     1,     6,     7 }, // French/Latin/Mali
-    {     37,     7,   135,    44,  8239,    59,    37,    48,    45,    43,   101,     171,     187,     171,     187,       0,6 ,       0,6 ,     231,8 ,     231,8 ,    119,10 ,     97,16 ,      37,5 ,      8,10 ,   3020,35 ,   3055,52 ,   3107,14 ,   3020,35 ,   3055,52 ,   3107,14 ,       0,2 ,       0,2 ,  391,6 , 217,17 , 234,23 , {69,85,82},       14,1 ,   3102,20 ,      13,5 ,       4,0 ,    1935,8 ,   2188,10 ,     2,     1,     1,     6,     7 }, // French/Latin/Martinique
-    {     37,     7,   136,    44,  8239,    59,    37,    48,    45,    43,   101,     171,     187,     171,     187,       0,6 ,       0,6 ,     231,8 ,     231,8 ,    119,10 ,     97,16 ,      18,7 ,     25,12 ,   3020,35 ,   3055,52 ,   3107,14 ,   3020,35 ,   3055,52 ,   3107,14 ,       0,2 ,       0,2 ,  391,6 , 217,17 , 234,23 , {77,82,85},      219,2 ,   7805,66 ,      13,5 ,       4,0 ,    1935,8 ,   2198,10 ,     2,     1,     1,     6,     7 }, // French/Latin/Mauritania
-    {     37,     7,   137,    44,  8239,    59,    37,    48,    45,    43,   101,     171,     187,     171,     187,       0,6 ,       0,6 ,     231,8 ,     231,8 ,    119,10 ,     97,16 ,      37,5 ,      8,10 ,   3020,35 ,   3055,52 ,   3107,14 ,   3020,35 ,   3055,52 ,   3107,14 ,       0,2 ,       0,2 ,  391,6 , 217,17 , 234,23 , {77,85,82},      176,2 ,   7871,63 ,      13,5 ,       4,0 ,    1935,8 ,    2208,7 ,     2,     0,     1,     6,     7 }, // French/Latin/Mauritius
-    {     37,     7,   138,    44,  8239,    59,    37,    48,    45,    43,   101,     171,     187,     171,     187,       0,6 ,       0,6 ,     231,8 ,     231,8 ,    119,10 ,     97,16 ,      37,5 ,      8,10 ,   3020,35 ,   3055,52 ,   3107,14 ,   3020,35 ,   3055,52 ,   3107,14 ,       0,2 ,       0,2 ,  391,6 , 217,17 , 234,23 , {69,85,82},       14,1 ,   3102,20 ,      13,5 ,       4,0 ,    1935,8 ,    2215,7 ,     2,     1,     1,     6,     7 }, // French/Latin/Mayotte
-    {     37,     7,   142,    44,  8239,    59,    37,    48,    45,    43,   101,     171,     187,     171,     187,       0,6 ,       0,6 ,     231,8 ,     231,8 ,    119,10 ,     97,16 ,      37,5 ,      8,10 ,   3020,35 ,   3055,52 ,   3107,14 ,   3020,35 ,   3055,52 ,   3107,14 ,       0,2 ,       0,2 ,  391,6 , 217,17 , 234,23 , {69,85,82},       14,1 ,   3102,20 ,      13,5 ,       4,0 ,    1935,8 ,    2222,6 ,     2,     1,     1,     6,     7 }, // French/Latin/Monaco
-    {     37,     7,   145,    44,    46,    59,    37,    48,    45,    43,   101,     171,     187,     171,     187,       0,6 ,       0,6 ,     231,8 ,     231,8 ,    119,10 ,     97,16 ,      37,5 ,      8,10 ,   3020,35 ,   3055,52 ,   3107,14 ,   3020,35 ,   3055,52 ,   3107,14 ,      64,4 ,      61,4 ,  391,6 , 217,17 , 234,23 , {77,65,68},      221,3 ,   7934,54 ,      13,5 ,       4,0 ,    1935,8 ,    2228,5 ,     2,     1,     1,     6,     7 }, // French/Latin/Morocco
-    {     37,     7,   153,    44,  8239,    59,    37,    48,    45,    43,   101,     171,     187,     171,     187,       0,6 ,       0,6 ,     231,8 ,     231,8 ,    119,10 ,     97,16 ,      37,5 ,      8,10 ,   3020,35 ,   3055,52 ,   3107,14 ,   3020,35 ,   3055,52 ,   3107,14 ,       0,2 ,       0,2 ,  391,6 , 217,17 , 234,23 , {88,80,70},      212,4 ,   7611,35 ,      13,5 ,       4,0 ,    1935,8 ,   2233,18 ,     0,     0,     1,     6,     7 }, // French/Latin/New Caledonia
-    {     37,     7,   156,    44,  8239,    59,    37,    48,    45,    43,   101,     171,     187,     171,     187,       0,6 ,       0,6 ,     231,8 ,     231,8 ,    119,10 ,     97,16 ,      37,5 ,      8,10 ,   3020,35 ,   3055,52 ,   3107,14 ,   3020,35 ,   3055,52 ,   3107,14 ,       0,2 ,       0,2 ,  391,6 , 217,17 , 234,23 , {88,79,70},      207,3 ,   7228,59 ,      13,5 ,       4,0 ,    1935,8 ,    2251,5 ,     0,     0,     1,     6,     7 }, // French/Latin/Niger
-    {     37,     7,   176,    44,  8239,    59,    37,    48,    45,    43,   101,     171,     187,     171,     187,       0,6 ,       0,6 ,     231,8 ,     231,8 ,    119,10 ,     97,16 ,      37,5 ,      8,10 ,   3020,35 ,   3055,52 ,   3107,14 ,   3020,35 ,   3055,52 ,   3107,14 ,       0,2 ,       0,2 ,  391,6 , 217,17 , 234,23 , {69,85,82},       14,1 ,   3102,20 ,      13,5 ,       4,0 ,    1935,8 ,   2256,10 ,     2,     1,     1,     6,     7 }, // French/Latin/Reunion
-    {     37,     7,   179,    44,  8239,    59,    37,    48,    45,    43,   101,     171,     187,     171,     187,       0,6 ,       0,6 ,     231,8 ,     231,8 ,    119,10 ,     97,16 ,      37,5 ,      8,10 ,   3020,35 ,   3055,52 ,   3107,14 ,   3020,35 ,   3055,52 ,   3107,14 ,       0,2 ,       0,2 ,  391,6 , 217,17 , 234,23 , {82,87,70},      180,2 ,   7988,50 ,      13,5 ,       4,0 ,    1935,8 ,    1457,6 ,     0,     0,     1,     6,     7 }, // French/Latin/Rwanda
-    {     37,     7,   187,    44,  8239,    59,    37,    48,    45,    43,   101,     171,     187,     171,     187,       0,6 ,       0,6 ,     231,8 ,     231,8 ,    119,10 ,     97,16 ,      37,5 ,      8,10 ,   3020,35 ,   3055,52 ,   3107,14 ,   3020,35 ,   3055,52 ,   3107,14 ,       0,2 ,       0,2 ,  391,6 , 217,17 , 234,23 , {88,79,70},      207,3 ,   7228,59 ,      13,5 ,       4,0 ,    1935,8 ,    2266,7 ,     0,     0,     1,     6,     7 }, // French/Latin/Senegal
-    {     37,     7,   188,    44,  8239,    59,    37,    48,    45,    43,   101,     171,     187,     171,     187,       0,6 ,       0,6 ,     231,8 ,     231,8 ,    119,10 ,     97,16 ,      37,5 ,      8,10 ,   3020,35 ,   3055,52 ,   3107,14 ,   3020,35 ,   3055,52 ,   3107,14 ,       0,2 ,       0,2 ,  391,6 , 217,17 , 234,23 , {83,67,82},      185,2 ,   8038,71 ,      13,5 ,       4,0 ,    1935,8 ,   1515,10 ,     2,     1,     1,     6,     7 }, // French/Latin/Seychelles
-    {     37,     7,   200,    44,  8239,    59,    37,    48,    45,    43,   101,     171,     187,     171,     187,       0,6 ,       0,6 ,     231,8 ,     231,8 ,    119,10 ,     97,16 ,      37,5 ,      8,10 ,   3020,35 ,   3055,52 ,   3107,14 ,   3020,35 ,   3055,52 ,   3107,14 ,       0,2 ,       0,2 ,  391,6 , 217,17 , 234,23 , {69,85,82},       14,1 ,   3102,20 ,      13,5 ,       4,0 ,    1935,8 ,   2273,24 ,     2,     1,     1,     6,     7 }, // French/Latin/Saint Pierre And Miquelon
-    {     37,     7,   206,    44,  8239,    59,    37,    48,    45,    43,   101,     171,     187,    8249,    8250,       0,6 ,       0,6 ,     231,8 ,     231,8 ,     156,8 ,     10,17 ,      37,5 ,    314,14 ,   3020,35 ,   3055,52 ,   3107,14 ,   3020,35 ,   3055,52 ,   3107,14 ,       0,2 ,       0,2 ,  391,6 , 217,17 , 234,23 , {67,72,70},      224,3 ,   8109,45 ,      13,5 ,       4,0 ,   2297,15 ,    2312,6 ,     2,     0,     1,     6,     7 }, // French/Latin/Switzerland
-    {     37,     7,   207,    44,  8239,    59,    37,    48,    45,    43,   101,     171,     187,     171,     187,       0,6 ,       0,6 ,     231,8 ,     231,8 ,    119,10 ,     97,16 ,      18,7 ,     25,12 ,   3020,35 ,   3055,52 ,   3107,14 ,   3020,35 ,   3055,52 ,   3107,14 ,       0,2 ,       0,2 ,  391,6 , 217,17 , 234,23 , {83,89,80},      227,2 ,   8154,51 ,      13,5 ,       4,0 ,    1935,8 ,    2318,5 ,     0,     0,     6,     5,     6 }, // French/Latin/Syria
-    {     37,     7,   212,    44,  8239,    59,    37,    48,    45,    43,   101,     171,     187,     171,     187,       0,6 ,       0,6 ,     231,8 ,     231,8 ,    119,10 ,     97,16 ,      37,5 ,      8,10 ,   3020,35 ,   3055,52 ,   3107,14 ,   3020,35 ,   3055,52 ,   3107,14 ,       0,2 ,       0,2 ,  391,6 , 217,17 , 234,23 , {88,79,70},      207,3 ,   7228,59 ,      13,5 ,       4,0 ,    1935,8 ,    2323,4 ,     0,     0,     1,     6,     7 }, // French/Latin/Togo
-    {     37,     7,   216,    44,  8239,    59,    37,    48,    45,    43,   101,     171,     187,     171,     187,       0,6 ,       0,6 ,     231,8 ,     231,8 ,    119,10 ,     97,16 ,      18,7 ,     25,12 ,   3020,35 ,   3055,52 ,   3107,14 ,   3020,35 ,   3055,52 ,   3107,14 ,       0,2 ,       0,2 ,  391,6 , 217,17 , 234,23 , {84,78,68},      229,2 ,   8205,51 ,      13,5 ,       4,0 ,    1935,8 ,    2327,7 ,     3,     0,     1,     6,     7 }, // French/Latin/Tunisia
-    {     37,     7,   229,    44,  8239,    59,    37,    48,    45,    43,   101,     171,     187,     171,     187,       0,6 ,       0,6 ,     231,8 ,     231,8 ,    119,10 ,     97,16 ,      18,7 ,     25,12 ,   3020,35 ,   3055,52 ,   3107,14 ,   3020,35 ,   3055,52 ,   3107,14 ,       0,2 ,       0,2 ,  391,6 , 217,17 , 234,23 , {86,85,86},      203,2 ,   8256,51 ,      13,5 ,       4,0 ,    1935,8 ,    1761,7 ,     0,     0,     1,     6,     7 }, // French/Latin/Vanuatu
-    {     37,     7,   235,    44,  8239,    59,    37,    48,    45,    43,   101,     171,     187,     171,     187,       0,6 ,       0,6 ,     231,8 ,     231,8 ,    119,10 ,     97,16 ,      37,5 ,      8,10 ,   3020,35 ,   3055,52 ,   3107,14 ,   3020,35 ,   3055,52 ,   3107,14 ,       0,2 ,       0,2 ,  391,6 , 217,17 , 234,23 , {88,80,70},      212,4 ,   7611,35 ,      13,5 ,       4,0 ,    1935,8 ,   2334,16 ,     0,     0,     1,     6,     7 }, // French/Latin/Wallis And Futuna Islands
-    {     37,     7,   244,    44,  8239,    59,    37,    48,    45,    43,   101,     171,     187,     171,     187,       0,6 ,       0,6 ,     231,8 ,     231,8 ,    119,10 ,     97,16 ,      37,5 ,      8,10 ,   3020,35 ,   3055,52 ,   3107,14 ,   3020,35 ,   3055,52 ,   3107,14 ,       0,2 ,       0,2 ,  391,6 , 217,17 , 234,23 , {69,85,82},       14,1 ,   3102,20 ,      13,5 ,       4,0 ,    1935,8 ,   2350,16 ,     2,     1,     1,     6,     7 }, // French/Latin/Saint Barthelemy
-    {     37,     7,   245,    44,  8239,    59,    37,    48,    45,    43,   101,     171,     187,     171,     187,       0,6 ,       0,6 ,     231,8 ,     231,8 ,    119,10 ,     97,16 ,      37,5 ,      8,10 ,   3020,35 ,   3055,52 ,   3107,14 ,   3020,35 ,   3055,52 ,   3107,14 ,       0,2 ,       0,2 ,  391,6 , 217,17 , 234,23 , {69,85,82},       14,1 ,   3102,20 ,      13,5 ,       4,0 ,    1935,8 ,   2366,12 ,     2,     1,     1,     6,     7 }, // French/Latin/Saint Martin
-    {     38,     7,   151,    44,    46,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       6,8 ,       6,8 ,     339,8 ,     97,16 ,      37,5 ,      8,10 ,   3121,21 ,   3142,54 ,     85,14 ,   3121,21 ,   3142,54 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,   3455,19 ,       8,5 ,      53,6 ,    2378,5 ,    2383,8 ,     2,     1,     1,     6,     7 }, // Western Frisian/Latin/Netherlands
-    {     39,     7,   224,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    239,10 ,    239,10 ,    119,10 ,    648,21 ,      37,5 ,      8,10 ,   3196,28 ,   3224,69 ,   3293,14 ,   3196,28 ,   3224,69 ,   3293,14 ,      81,1 ,      77,1 ,  397,6 ,   5,17 ,  22,23 , {71,66,80},      119,1 ,   8307,86 ,       4,4 ,       4,0 ,    2391,8 ,   2399,22 ,     2,     1,     1,     6,     7 }, // Gaelic/Latin/United Kingdom
-    {     40,     7,   197,    44,    46,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     249,7 ,     249,7 ,      27,8 ,    669,27 ,      37,5 ,      8,10 ,   3307,35 ,   3342,49 ,   3391,14 ,   3405,35 ,   3440,49 ,   3489,21 ,      64,4 ,      61,4 ,    0,5 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,   3102,20 ,      13,5 ,       4,0 ,    2421,6 ,    2427,6 ,     2,     1,     1,     6,     7 }, // Galician/Latin/Spain
-    {     41,    15,    81,    44,   160,    59,    37,    48,    45,    43,   101,    8222,    8220,     171,     187,       0,6 ,       0,6 ,     256,8 ,     256,8 ,     156,8 ,    696,19 ,      37,5 ,      8,10 ,   3510,28 ,   3538,62 ,   3600,14 ,   3510,28 ,   3538,62 ,   3600,14 ,       0,2 ,       0,2 ,  403,5 , 408,37 ,  22,23 , {71,69,76},      231,1 ,   8393,43 ,      13,5 ,       4,0 ,    2433,7 ,   2440,10 ,     2,     1,     1,     6,     7 }, // Georgian/Georgian/Georgia
-    {     42,     7,    82,    44,    46,    59,    37,    48,    45,    43,   101,    8222,    8220,    8218,    8216,       0,6 ,       0,6 ,     264,9 ,     264,9 ,     156,8 ,    622,18 ,      37,5 ,      8,10 ,   3614,21 ,   3635,60 ,   3695,14 ,   3709,28 ,   3635,60 ,   3695,14 ,       0,2 ,       0,2 ,  445,5 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,   8436,19 ,      13,5 ,       4,0 ,    2450,7 ,   2457,11 ,     2,     1,     1,     6,     7 }, // German/Latin/Germany
-    {     42,     7,    14,    44,   160,    59,    37,    48,    45,    43,   101,    8222,    8220,    8218,    8216,       0,6 ,       0,6 ,     264,9 ,     264,9 ,     156,8 ,    622,18 ,      37,5 ,      8,10 ,   3614,21 ,   3635,60 ,   3695,14 ,   3709,28 ,   3635,60 ,   3695,14 ,       0,2 ,       0,2 ,  445,5 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,   8436,19 ,       8,5 ,       4,0 ,   2468,24 ,   2492,10 ,     2,     1,     1,     6,     7 }, // German/Latin/Austria
-    {     42,     7,    21,    44,    46,    59,    37,    48,    45,    43,   101,    8222,    8220,    8218,    8216,       0,6 ,       0,6 ,     264,9 ,     264,9 ,     156,8 ,    622,18 ,      37,5 ,      8,10 ,   3614,21 ,   3635,60 ,   3695,14 ,   3709,28 ,   3635,60 ,   3695,14 ,       0,2 ,       0,2 ,  445,5 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,   8436,19 ,      13,5 ,       4,0 ,    2450,7 ,    2502,7 ,     2,     1,     1,     6,     7 }, // German/Latin/Belgium
-    {     42,     7,   106,    44,    46,    59,    37,    48,    45,    43,   101,    8222,    8220,    8218,    8216,       0,6 ,       0,6 ,     264,9 ,     264,9 ,     156,8 ,    622,18 ,      37,5 ,      8,10 ,   3614,21 ,   3635,60 ,   3695,14 ,   3709,28 ,   3635,60 ,   3695,14 ,       0,2 ,       0,2 ,  445,5 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,   8436,19 ,      13,5 ,       4,0 ,    2450,7 ,    2509,7 ,     2,     1,     1,     6,     7 }, // German/Latin/Italy
-    {     42,     7,   123,    46,  8217,    59,    37,    48,    45,    43,   101,    8222,    8220,    8218,    8216,       0,6 ,       0,6 ,     264,9 ,     264,9 ,     156,8 ,    622,18 ,      37,5 ,      8,10 ,   3614,21 ,   3635,60 ,   3695,14 ,   3709,28 ,   3635,60 ,   3695,14 ,       0,2 ,       0,2 ,  445,5 ,   5,17 ,  22,23 , {67,72,70},      224,3 ,   8455,58 ,       8,5 ,       4,0 ,    2450,7 ,   2516,13 ,     2,     0,     1,     6,     7 }, // German/Latin/Liechtenstein
-    {     42,     7,   125,    44,    46,    59,    37,    48,    45,    43,   101,    8222,    8220,    8218,    8216,       0,6 ,       0,6 ,     264,9 ,     264,9 ,     156,8 ,    622,18 ,      37,5 ,      8,10 ,   3614,21 ,   3635,60 ,   3695,14 ,   3709,28 ,   3635,60 ,   3695,14 ,       0,2 ,       0,2 ,  445,5 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,   8436,19 ,      13,5 ,       4,0 ,    2450,7 ,    2529,9 ,     2,     1,     1,     6,     7 }, // German/Latin/Luxembourg
-    {     42,     7,   206,    46,  8217,    59,    37,    48,    45,    43,   101,    8222,    8220,    8218,    8216,       0,6 ,       0,6 ,     264,9 ,     264,9 ,     156,8 ,    622,18 ,      37,5 ,      8,10 ,   3614,21 ,   3635,60 ,   3695,14 ,   3709,28 ,   3635,60 ,   3695,14 ,       0,2 ,       0,2 ,  445,5 ,   5,17 ,  22,23 , {67,72,70},      224,3 ,   8455,58 ,       8,5 ,      36,5 ,   2538,21 ,    2559,7 ,     2,     0,     1,     6,     7 }, // German/Latin/Switzerland
-    {     43,    16,    85,    44,    46,    59,    37,    48,    45,    43,   101,     171,     187,    8220,    8221,       0,6 ,       0,6 ,     273,9 ,     273,9 ,     269,6 ,     10,17 ,      18,7 ,     25,12 ,   3737,28 ,   3765,55 ,   3820,14 ,   3737,28 ,   3765,55 ,   3820,14 ,      82,4 ,      78,4 ,   45,4 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,   8513,19 ,      13,5 ,       4,0 ,    2566,8 ,    2574,6 ,     2,     1,     1,     6,     7 }, // Greek/Greek/Greece
-    {     43,    16,    56,    44,    46,    59,    37,    48,    45,    43,   101,     171,     187,    8220,    8221,       0,6 ,       0,6 ,     273,9 ,     273,9 ,     269,6 ,     10,17 ,      18,7 ,     25,12 ,   3737,28 ,   3765,55 ,   3820,14 ,   3737,28 ,   3765,55 ,   3820,14 ,      82,4 ,      78,4 ,   45,4 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,   8513,19 ,      13,5 ,       4,0 ,    2566,8 ,    2580,6 ,     2,     1,     1,     6,     7 }, // Greek/Greek/Cyprus
-    {     44,     7,    86,    44,    46,    59,    37,    48,  8722,    43,   101,     187,     171,    8250,    8249,       0,6 ,       0,6 ,    282,11 ,    282,11 ,     53,10 ,     80,17 ,     205,5 ,    210,10 ,   3834,28 ,   3862,98 ,   3960,14 ,   3834,28 ,   3862,98 ,   3960,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {68,75,75},      148,3 ,   8532,62 ,       4,4 ,      59,5 ,   2586,11 ,   2597,16 ,     2,     0,     1,     6,     7 }, // Greenlandic/Latin/Greenland
-    {     45,     7,   168,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {80,89,71},      232,1 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     0,     0,     7,     6,     7 }, // Guarani/Latin/Paraguay
-    {     46,    17,   100,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     293,9 ,     293,9 ,     269,6 ,    192,18 ,     328,8 ,    336,13 ,   3974,32 ,   4006,53 ,   4059,19 ,   3974,32 ,   4006,53 ,   4059,19 ,       0,2 ,       0,2 ,  450,4 , 454,19 ,  22,23 , {73,78,82},      121,1 ,   8594,46 ,       4,4 ,       4,0 ,    2613,7 ,    2620,4 ,     2,     1,     7,     7,     7 }, // Gujarati/Gujarati/India
-    {     47,     7,   157,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     302,8 ,     302,8 ,     269,6 ,    715,17 ,      37,5 ,      8,10 ,   4078,28 ,   4106,52 ,   4158,14 ,   4078,28 ,   4106,52 ,   4158,14 ,      86,6 ,      82,5 ,   45,4 ,   5,17 ,  22,23 , {78,71,78},      178,1 ,   8640,54 ,      64,6 ,       4,0 ,    2624,5 ,    2629,8 ,     2,     1,     1,     6,     7 }, // Hausa/Latin/Nigeria
-    {     47,     1,   157,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {78,71,78},      178,1 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     2,     1,     1,     6,     7 }, // Hausa/Arabic/Nigeria
-    {     47,     7,    83,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     302,8 ,     302,8 ,     269,6 ,    715,17 ,      18,7 ,     25,12 ,   4078,28 ,   4106,52 ,   4158,14 ,   4078,28 ,   4106,52 ,   4158,14 ,      86,6 ,      82,5 ,   45,4 ,   5,17 ,  22,23 , {71,72,83},      167,3 ,       0,7 ,      64,6 ,       4,0 ,    2624,5 ,    2637,4 ,     2,     1,     1,     6,     7 }, // Hausa/Latin/Ghana
-    {     47,     7,   156,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     302,8 ,     302,8 ,     269,6 ,    715,17 ,      37,5 ,      8,10 ,   4078,28 ,   4106,52 ,   4158,14 ,   4078,28 ,   4106,52 ,   4158,14 ,      86,6 ,      82,5 ,   45,4 ,   5,17 ,  22,23 , {88,79,70},      207,3 ,   8694,36 ,      64,6 ,       4,0 ,    2624,5 ,    2641,5 ,     0,     0,     1,     6,     7 }, // Hausa/Latin/Niger
-    {     48,    18,   105,    46,    44,    59,    37,    48,    45,    43,   101,    8221,    8221,    8217,    8217,       0,6 ,       0,6 ,     310,6 ,     310,6 ,     640,8 ,    732,18 ,      55,4 ,      59,9 ,   4172,46 ,   4218,65 ,   4283,21 ,   4172,46 ,   4218,65 ,   4283,21 ,      92,6 ,      87,5 ,  473,4 ,   5,17 ,  22,23 , {73,76,83},       49,1 ,   8730,54 ,      70,6 ,      76,8 ,    2646,5 ,    2651,5 ,     2,     1,     7,     5,     6 }, // Hebrew/Hebrew/Israel
-    {     49,    13,   100,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     316,9 ,     325,8 ,     269,6 ,     10,17 ,      18,7 ,     25,12 ,   4304,32 ,   4336,53 ,   4389,19 ,   4304,32 ,   4336,53 ,   4389,19 ,      68,2 ,      65,2 ,  477,4 ,   5,17 ,  22,23 , {73,78,82},      121,1 ,   8784,42 ,       4,4 ,       4,0 ,    2656,6 ,    2662,4 ,     2,     1,     7,     7,     7 }, // Hindi/Devanagari/India
-    {     50,     7,    98,    44,   160,    59,    37,    48,    45,    43,   101,    8222,    8221,     187,     171,       0,6 ,       0,6 ,     333,8 ,     333,8 ,    750,13 ,    763,19 ,      55,4 ,      59,9 ,   4408,19 ,   4427,52 ,   4479,17 ,   4408,19 ,   4427,52 ,   4479,17 ,      98,3 ,      92,3 ,  481,4 ,   5,17 ,  22,23 , {72,85,70},      233,2 ,   8826,46 ,      13,5 ,       4,0 ,    2666,6 ,   2672,12 ,     2,     0,     1,     6,     7 }, // Hungarian/Latin/Hungary
-    {     51,     7,    99,    44,    46,    59,    37,    48,    45,    43,   101,    8222,    8220,    8218,    8216,       0,6 ,       0,6 ,     187,8 ,     187,8 ,     640,8 ,    622,18 ,      37,5 ,      8,10 ,   4496,35 ,   4531,81 ,   4612,14 ,   4496,35 ,   4531,81 ,   4612,14 ,     101,4 ,      95,4 ,  485,4 ,   5,17 ,  22,23 , {73,83,75},      235,3 ,   8872,49 ,      13,5 ,       4,0 ,    2684,8 ,    2692,6 ,     0,     0,     1,     6,     7 }, // Icelandic/Latin/Iceland
-    {     52,     7,   101,    44,    46,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    341,10 ,     351,9 ,      27,8 ,    553,18 ,     205,5 ,    210,10 ,   4626,28 ,   4654,43 ,   4697,14 ,   4626,28 ,   4654,43 ,   4697,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {73,68,82},      238,2 ,   8921,39 ,       4,4 ,       4,0 ,    2698,9 ,    2698,9 ,     2,     0,     7,     6,     7 }, // Indonesian/Latin/Indonesia
-    {     53,     7,   260,    44,    46,    59,    37,    48,    45,    43,   101,    8216,    8217,    8220,    8221,       0,6 ,       0,6 ,     249,7 ,     249,7 ,    528,10 ,    782,26 ,      37,5 ,      8,10 ,   4711,28 ,   4739,57 ,   4796,14 ,   4711,28 ,   4739,57 ,   4796,14 ,       0,2 ,       0,2 ,    0,5 ,   5,17 ,  22,23 ,    {0,0,0},        0,0 ,    2586,0 ,       8,5 ,       4,0 ,   2707,11 ,    2718,5 ,     2,     1,     1,     6,     7 }, // Interlingua/Latin/World
-    {     55,    44,    38,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {67,65,68},      240,3 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     2,     0,     7,     6,     7 }, // Inuktitut/Canadian Aboriginal/Canada
-    {     55,     7,    38,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {67,65,68},      240,3 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     2,     0,     7,     6,     7 }, // Inuktitut/Latin/Canada
-    {     57,     7,   104,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    360,11 ,    239,10 ,    119,10 ,     97,16 ,      37,5 ,      8,10 ,   4810,37 ,   4847,75 ,   4922,14 ,   4810,37 ,   4847,75 ,   4922,14 ,     105,4 ,      99,4 ,  489,6 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,   8960,31 ,       4,4 ,       4,0 ,    2723,7 ,    2730,4 ,     2,     1,     1,     6,     7 }, // Irish/Latin/Ireland
-    {     57,     7,   224,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    360,11 ,    239,10 ,    119,10 ,     97,16 ,      37,5 ,      8,10 ,   4810,37 ,   4847,75 ,   4922,14 ,   4810,37 ,   4847,75 ,   4922,14 ,     105,4 ,      99,4 ,  489,6 ,   5,17 ,  22,23 , {71,66,80},      119,1 ,   8991,95 ,       4,4 ,       4,0 ,    2723,7 ,   2734,19 ,     2,     1,     1,     6,     7 }, // Irish/Latin/United Kingdom
-    {     58,     7,   106,    44,    46,    59,    37,    48,    45,    43,   101,     171,     187,    8220,    8221,       0,6 ,       0,6 ,     249,7 ,     249,7 ,      27,8 ,     97,16 ,      37,5 ,      8,10 ,   4936,28 ,   4964,57 ,   5021,14 ,   4936,28 ,   4964,57 ,   5021,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,   9086,19 ,      13,5 ,       4,0 ,    2753,8 ,    2761,6 ,     2,     1,     1,     6,     7 }, // Italian/Latin/Italy
-    {     58,     7,   184,    44,    46,    59,    37,    48,    45,    43,   101,     171,     187,    8220,    8221,       0,6 ,       0,6 ,     249,7 ,     249,7 ,      27,8 ,     97,16 ,      37,5 ,      8,10 ,   4936,28 ,   4964,57 ,   5021,14 ,   4936,28 ,   4964,57 ,   5021,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,   9086,19 ,      13,5 ,       4,0 ,    2753,8 ,   2767,10 ,     2,     1,     1,     6,     7 }, // Italian/Latin/San Marino
-    {     58,     7,   206,    46,  8217,    59,    37,    48,    45,    43,   101,     171,     187,    8249,    8250,       0,6 ,       0,6 ,     249,7 ,     249,7 ,     156,8 ,     10,17 ,      37,5 ,      8,10 ,   4936,28 ,   4964,57 ,   5021,14 ,   4936,28 ,   4964,57 ,   5021,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {67,72,70},        0,0 ,   9105,53 ,       8,5 ,      36,5 ,    2753,8 ,    2777,8 ,     2,     0,     1,     6,     7 }, // Italian/Latin/Switzerland
-    {     58,     7,   230,    44,    46,    59,    37,    48,    45,    43,   101,     171,     187,    8220,    8221,       0,6 ,       0,6 ,     249,7 ,     249,7 ,      27,8 ,     97,16 ,      37,5 ,      8,10 ,   4936,28 ,   4964,57 ,   5021,14 ,   4936,28 ,   4964,57 ,   5021,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,   9086,19 ,      13,5 ,       4,0 ,    2753,8 ,   2785,18 ,     2,     1,     1,     6,     7 }, // Italian/Latin/Vatican City State
-    {     59,    19,   108,    46,    44,    59,    37,    48,    45,    43,   101,   12300,   12301,   12302,   12303,     165,5 ,     165,5 ,     165,5 ,     165,5 ,    578,10 ,    402,13 ,      55,4 ,    349,10 ,   5035,14 ,   5049,28 ,   5035,14 ,   5035,14 ,   5049,28 ,   5035,14 ,     109,2 ,     103,2 ,  495,3 , 498,17 ,  22,23 , {74,80,89},      243,1 ,   9158,11 ,       4,4 ,       4,0 ,    2803,3 ,    2806,2 ,     0,     0,     7,     6,     7 }, // Japanese/Japanese/Japan
-    {     60,     7,   101,    44,    46,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    371,10 ,     381,9 ,    528,10 ,     10,17 ,      37,5 ,      8,10 ,   5077,29 ,   5106,41 ,   5147,14 ,   5077,29 ,   5106,41 ,   5147,14 ,     111,4 ,     105,5 ,  515,4 ,   5,17 ,  22,23 , {73,68,82},      238,2 ,   8921,39 ,       8,5 ,       4,0 ,    2808,4 ,    2812,9 ,     2,     0,     7,     6,     7 }, // Javanese/Latin/Indonesia
-    {     61,    21,   100,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    390,12 ,    402,11 ,     269,6 ,     35,18 ,     328,8 ,    336,13 ,   5161,33 ,   5194,54 ,   5248,20 ,   5161,33 ,   5194,54 ,   5248,20 ,     115,9 ,     110,7 ,  519,8 , 527,35 ,  22,23 , {73,78,82},      121,1 ,   9169,49 ,       4,4 ,       4,0 ,    2821,5 ,    2826,4 ,     2,     1,     7,     7,     7 }, // Kannada/Kannada/India
-    {     62,     1,   100,  1643,  1644,  1563,  1642,  1776,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     547,6 ,     35,18 ,      18,7 ,     25,12 ,   5268,50 ,   5318,52 ,   5370,14 ,   5268,50 ,   5318,52 ,   5370,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {73,78,82},      121,1 ,   9218,23 ,       8,5 ,       4,0 ,    2830,5 ,    2835,9 ,     2,     1,     7,     7,     7 }, // Kashmiri/Arabic/India
-    {     63,     2,   110,    44,   160,    59,    37,    48,    45,    43,   101,     171,     187,    8220,    8221,       0,6 ,       0,6 ,       0,6 ,    413,10 ,     156,8 ,    808,22 ,      37,5 ,      8,10 ,   5384,21 ,   5405,56 ,   5461,14 ,   5384,21 ,   5405,56 ,   5461,14 ,       0,2 ,       0,2 ,  562,4 , 566,17 , 583,23 , {75,90,84},      244,1 ,   9241,58 ,      13,5 ,       4,0 ,   2844,10 ,    2854,9 ,     2,     1,     1,     6,     7 }, // Kazakh/Cyrillic/Kazakhstan
-    {     64,     7,   179,    44,    46,    59,    37,    48,    45,    43,   101,     171,     187,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,   5475,35 ,   5510,84 ,     85,14 ,   5475,35 ,   5510,84 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {82,87,70},      180,2 ,       0,7 ,       8,5 ,       4,0 ,   2863,11 ,    2874,8 ,     0,     0,     1,     6,     7 }, // Kinyarwanda/Latin/Rwanda
-    {     65,     2,   116,    44,   160,    59,    37,    48,    45,    43,   101,     171,     187,    8222,    8220,       0,6 ,       0,6 ,    423,10 ,    423,10 ,     269,6 ,    830,23 ,      37,5 ,      8,10 ,   5594,38 ,   5632,57 ,   5689,14 ,   5594,38 ,   5632,57 ,   5689,14 ,     124,5 ,    117,14 ,  562,4 , 606,18 ,  22,23 , {75,71,83},      245,3 ,   9299,52 ,      13,5 ,       4,0 ,    2882,8 ,   2890,10 ,     2,     1,     1,     6,     7 }, // Kirghiz/Cyrillic/Kyrgyzstan
-    {     66,    22,   114,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     433,7 ,     433,7 ,     853,9 ,    862,16 ,     359,7 ,    366,13 ,   5703,14 ,   5717,28 ,   5703,14 ,   5703,14 ,   5717,28 ,   5703,14 ,     129,2 ,     131,2 ,  624,3 ,   5,17 ,  22,23 , {75,82,87},      248,1 ,   9351,19 ,       4,4 ,       4,0 ,    2900,3 ,    2903,4 ,     0,     0,     7,     6,     7 }, // Korean/Korean/South Korea
-    {     66,    22,   113,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     433,7 ,     433,7 ,     853,9 ,    862,16 ,     359,7 ,    366,13 ,   5703,14 ,   5717,28 ,   5703,14 ,   5703,14 ,   5717,28 ,   5703,14 ,     129,2 ,     131,2 ,  624,3 ,   5,17 ,  22,23 , {75,80,87},      249,3 ,   9370,39 ,       4,4 ,       4,0 ,    2900,3 ,   2907,11 ,     0,     0,     1,     6,     7 }, // Korean/Korean/North Korea
-    {     67,     7,   217,    44,    46,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     440,7 ,     440,7 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,   5745,20 ,   5765,42 ,   5807,14 ,   5745,20 ,   5765,42 ,   5807,14 ,     131,2 ,     133,2 ,   45,4 ,   5,17 ,  22,23 , {84,82,89},      252,1 ,       0,7 ,      13,5 ,       4,0 ,    2918,5 ,    2923,7 ,     2,     1,     1,     6,     7 }, // Kurdish/Latin/Turkey
-    {     68,     7,    35,    44,    46,    59,    37,    48,    45,    43,   101,    8221,    8221,    8217,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     415,8 ,     97,16 ,      37,5 ,      8,10 ,   5821,34 ,   5855,89 ,     85,14 ,   5821,34 ,   5855,89 ,     85,14 ,     133,5 ,     135,5 ,   45,4 ,   5,17 ,  22,23 , {66,73,70},      163,3 ,   9409,27 ,       0,4 ,       4,0 ,    2930,8 ,    2938,8 ,     0,     0,     1,     6,     7 }, // Rundi/Latin/Burundi
-    {     69,    23,   117,    44,    46,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,     447,9 ,     415,8 ,    878,19 ,      55,4 ,    379,24 ,   5944,36 ,   5980,57 ,   6037,17 ,   5944,36 ,   5980,57 ,   6037,17 ,     138,8 ,     140,8 ,   45,4 ,   5,17 ,  22,23 , {76,65,75},      253,1 ,   9436,21 ,       4,4 ,      36,5 ,    2946,3 ,    2946,3 ,     0,     0,     7,     6,     7 }, // Lao/Lao/Laos
-    {     71,     7,   118,    44,   160,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     456,8 ,     456,8 ,     156,8 ,    897,26 ,      37,5 ,      8,10 ,   6054,51 ,   6105,72 ,   6177,14 ,   6191,51 ,   6242,72 ,   6177,14 ,    146,14 ,    148,11 ,  627,5 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,   9457,23 ,      13,5 ,       4,0 ,    2949,8 ,    2957,7 ,     2,     1,     1,     6,     7 }, // Latvian/Latin/Latvia
-    {     72,     7,    49,    44,    46,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     464,9 ,     464,9 ,     415,8 ,     97,16 ,      37,5 ,      8,10 ,   6314,28 ,  6342,100 ,   6442,14 ,   6314,28 ,  6342,100 ,   6442,14 ,     160,8 ,     159,6 ,   45,4 ,   5,17 ,  22,23 , {67,68,70},      210,2 ,   9480,23 ,      13,5 ,       4,0 ,    2964,7 ,   2971,30 ,     2,     1,     1,     6,     7 }, // Lingala/Latin/Congo Kinshasa
-    {     72,     7,     6,    44,    46,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     464,9 ,     464,9 ,     415,8 ,     97,16 ,      37,5 ,      8,10 ,   6314,28 ,  6342,100 ,   6442,14 ,   6314,28 ,  6342,100 ,   6442,14 ,     160,8 ,     159,6 ,   45,4 ,   5,17 ,  22,23 , {65,79,65},      254,2 ,   9503,23 ,      13,5 ,       4,0 ,    2964,7 ,    3001,6 ,     2,     1,     1,     6,     7 }, // Lingala/Latin/Angola
-    {     72,     7,    41,    44,    46,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     464,9 ,     464,9 ,     415,8 ,     97,16 ,      37,5 ,      8,10 ,   6314,28 ,  6342,100 ,   6442,14 ,   6314,28 ,  6342,100 ,   6442,14 ,     160,8 ,     159,6 ,   45,4 ,   5,17 ,  22,23 , {88,65,70},       32,4 ,   9526,23 ,      13,5 ,       4,0 ,    2964,7 ,   3007,26 ,     0,     0,     1,     6,     7 }, // Lingala/Latin/Central African Republic
-    {     72,     7,    50,    44,    46,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     464,9 ,     464,9 ,     415,8 ,     97,16 ,      37,5 ,      8,10 ,   6314,28 ,  6342,100 ,   6442,14 ,   6314,28 ,  6342,100 ,   6442,14 ,     160,8 ,     159,6 ,   45,4 ,   5,17 ,  22,23 , {88,65,70},       32,4 ,   9526,23 ,      13,5 ,       4,0 ,    2964,7 ,    3033,5 ,     0,     0,     1,     6,     7 }, // Lingala/Latin/Congo Brazzaville
-    {     73,     7,   124,    44,   160,    59,    37,    48,  8722,    43,   101,    8222,    8220,    8222,    8220,       0,6 ,       0,6 ,     473,8 ,     473,8 ,     53,10 ,    923,27 ,      37,5 ,      8,10 ,   6456,21 ,   6477,89 ,   6566,14 ,   6456,21 ,   6477,89 ,   6566,14 ,     168,9 ,     165,6 ,  632,6 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,   9549,30 ,      13,5 ,       4,0 ,    3038,8 ,    3046,7 ,     2,     1,     1,     6,     7 }, // Lithuanian/Latin/Lithuania
-    {     74,     2,   127,    44,    46,    59,    37,    48,    45,    43,   101,    8222,    8220,    8218,    8216,       0,6 ,       0,6 ,     111,7 ,     111,7 ,     113,6 ,     10,17 ,      37,5 ,      8,10 ,   6580,35 ,   6615,54 ,   1530,14 ,   6669,34 ,   6615,54 ,   1530,14 ,    177,10 ,     171,8 ,  638,5 ,   5,17 ,  22,23 , {77,75,68},      256,4 ,   9579,56 ,      13,5 ,       4,0 ,   3053,10 ,   3063,18 ,     2,     1,     1,     6,     7 }, // Macedonian/Cyrillic/Macedonia
-    {     75,     7,   128,    46,    44,    59,    37,    48,    45,    43,   101,     171,     187,    8220,    8221,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     97,16 ,      37,5 ,      8,10 ,   6703,34 ,   6737,60 ,   6797,14 ,   6703,34 ,   6737,60 ,   6797,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {77,71,65},      170,2 ,   9635,13 ,       8,5 ,       4,0 ,    3081,8 ,   3089,12 ,     0,     0,     1,     6,     7 }, // Malagasy/Latin/Madagascar
-    {     76,     7,   130,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     351,9 ,     351,9 ,     571,7 ,     10,17 ,      18,7 ,     25,12 ,   6811,28 ,   6839,43 ,   6882,14 ,   6811,28 ,   6839,43 ,   6882,14 ,     187,2 ,     179,3 ,  643,4 ,   5,17 ,  22,23 , {77,89,82},      174,2 ,   9648,39 ,       4,4 ,       4,0 ,    3101,6 ,    1249,8 ,     2,     1,     1,     6,     7 }, // Malay/Latin/Malaysia
-    {     76,     1,   130,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {77,89,82},      174,2 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     2,     1,     1,     6,     7 }, // Malay/Arabic/Malaysia
-    {     76,     7,    32,    44,    46,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     351,9 ,     351,9 ,     571,7 ,    950,12 ,      18,7 ,     25,12 ,   6811,28 ,   6839,43 ,   6882,14 ,   6811,28 ,   6839,43 ,   6882,14 ,     187,2 ,     179,3 ,  643,4 ,   5,17 ,  22,23 , {66,78,68},        6,1 ,   9687,31 ,       8,5 ,       4,0 ,    3101,6 ,    3107,6 ,     2,     1,     1,     6,     7 }, // Malay/Latin/Brunei
-    {     76,     7,   190,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     351,9 ,     351,9 ,     571,7 ,     10,17 ,      18,7 ,     25,12 ,   6811,28 ,   6839,43 ,   6882,14 ,   6811,28 ,   6839,43 ,   6882,14 ,     187,2 ,     179,3 ,  643,4 ,   5,17 ,  22,23 , {83,71,68},        6,1 ,   9718,37 ,       4,4 ,       4,0 ,    3101,6 ,    3113,9 ,     2,     1,     7,     6,     7 }, // Malay/Latin/Singapore
-    {     77,    24,   100,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    481,13 ,    494,12 ,     269,6 ,    962,18 ,      18,7 ,     25,12 ,   6896,41 ,   6937,77 ,   7014,22 ,   6896,41 ,   7036,76 ,   7112,21 ,       0,2 ,       0,2 ,  647,6 , 653,27 ,  22,23 , {73,78,82},      121,1 ,   9755,40 ,       4,4 ,       4,0 ,    3122,6 ,    3128,6 ,     2,     1,     7,     7,     7 }, // Malayalam/Malayalam/India
-    {     78,     7,   133,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     506,8 ,     514,7 ,    119,10 ,    980,23 ,      37,5 ,      8,10 ,   7133,28 ,   7161,63 ,   7224,21 ,   7133,28 ,   7161,63 ,   7245,20 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,   9795,27 ,       4,4 ,       4,0 ,    3134,5 ,    1257,5 ,     2,     1,     7,     6,     7 }, // Maltese/Latin/Malta
-    {     79,     7,   154,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,    528,10 ,     10,17 ,      18,7 ,     25,12 ,   7265,27 ,   7292,47 ,   7339,14 ,   7265,27 ,   7292,47 ,   7339,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {78,90,68},        6,1 ,   9822,37 ,       8,5 ,       4,0 ,    3139,5 ,    3144,8 ,     2,     1,     1,     6,     7 }, // Maori/Latin/New Zealand
-    {     80,    13,   100,    46,    44,    59,    37,  2406,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     521,9 ,     521,9 ,     269,6 ,    192,18 ,      18,7 ,     25,12 ,   7353,32 ,   7385,53 ,   4389,19 ,   7353,32 ,   7385,53 ,   4389,19 ,     189,5 ,     182,4 ,  477,4 ,   5,17 ,  22,23 , {73,78,82},      121,1 ,   9859,43 ,       4,4 ,       4,0 ,    3152,5 ,    2662,4 ,     2,     1,     7,     7,     7 }, // Marathi/Devanagari/India
-    {     82,     2,   143,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,   1003,10 ,   1013,35 ,      37,5 ,     87,12 ,   7438,21 ,   7459,43 ,   7438,21 ,   7438,21 ,   7502,43 ,   7438,21 ,     194,4 ,     186,4 ,  562,4 , 680,17 ,  22,23 , {77,78,84},      260,1 ,   9902,46 ,       8,5 ,       4,0 ,    3157,6 ,    3163,6 ,     2,     0,     1,     6,     7 }, // Mongolian/Cyrillic/Mongolia
-    {     82,     8,    44,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {67,78,89},      261,3 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     2,     1,     7,     6,     7 }, // Mongolian/Mongolian/China
-    {     84,    13,   150,    46,    44,    59,    37,  2406,    45,    43,   101,    8220,    8221,    8216,    8217,     530,5 ,       0,6 ,     535,7 ,     535,7 ,     227,6 ,     63,17 ,      37,5 ,      8,10 ,   7545,33 ,   7578,54 ,   7632,18 ,   7545,33 ,   7578,54 ,   7632,18 ,     198,9 ,     190,7 ,  477,4 , 697,19 ,  22,23 , {78,80,82},      264,4 ,   9948,49 ,       8,5 ,       4,0 ,    3169,6 ,    3175,5 ,     2,     1,     7,     6,     7 }, // Nepali/Devanagari/Nepal
-    {     84,    13,   100,    46,    44,    59,    37,  2406,    45,    43,   101,    8220,    8221,    8216,    8217,     530,5 ,       0,6 ,     535,7 ,     535,7 ,     227,6 ,     63,17 ,      18,7 ,     25,12 ,   7545,33 ,   7578,54 ,   7632,18 ,   7545,33 ,   7578,54 ,   7632,18 ,     198,9 ,     190,7 ,  477,4 , 697,19 ,  22,23 , {73,78,82},      121,1 ,   9997,49 ,       8,5 ,       4,0 ,    3169,6 ,    2662,4 ,     2,     1,     7,     7,     7 }, // Nepali/Devanagari/India
-    {     85,     7,   161,    44,   160,    59,    37,    48,  8722,    43,   101,     171,     187,    8216,    8217,       0,6 ,       0,6 ,     187,8 ,     187,8 ,    495,10 ,    478,17 ,      37,5 ,      8,10 ,   2334,35 ,   2269,51 ,   2320,14 ,   2334,35 ,   2269,51 ,   2320,14 ,      64,4 ,      61,4 ,   45,4 ,   5,17 ,  22,23 , {78,79,75},      190,2 ,  10046,44 ,       8,5 ,       4,0 ,   3180,12 ,    3192,5 ,     2,     0,     1,     6,     7 }, // Norwegian Bokmal/Latin/Norway
-    {     85,     7,   203,    44,   160,    59,    37,    48,  8722,    43,   101,     171,     187,    8216,    8217,       0,6 ,       0,6 ,     187,8 ,     187,8 ,    495,10 ,    478,17 ,      37,5 ,      8,10 ,   2334,35 ,   2269,51 ,   2320,14 ,   2334,35 ,   2269,51 ,   2320,14 ,      64,4 ,      61,4 ,   45,4 ,   5,17 ,  22,23 , {78,79,75},      190,2 ,  10046,44 ,       8,5 ,       4,0 ,   3180,12 ,   3197,21 ,     2,     0,     1,     6,     7 }, // Norwegian Bokmal/Latin/Svalbard And Jan Mayen Islands
-    {     86,     7,    74,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     2,     1,     1,     6,     7 }, // Occitan/Latin/France
-    {     87,    26,   100,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     542,8 ,     550,7 ,     547,6 ,     35,18 ,      18,7 ,     25,12 ,   7650,33 ,   7683,54 ,   7737,18 ,   7650,33 ,   7683,54 ,   7737,18 ,       0,2 ,       0,2 ,  716,5 ,   5,17 ,  22,23 , {73,78,82},      121,1 ,  10090,43 ,       4,4 ,       4,0 ,    3218,5 ,    3223,4 ,     2,     1,     7,     7,     7 }, // Oriya/Oriya/India
-    {     88,     1,     1,  1643,  1644,  1563,  1642,  1776,    45,    43,   101,    8220,    8221,    8216,    8217,     557,6 ,     557,6 ,     563,9 ,     572,8 ,     394,8 ,   1048,20 ,      55,4 ,    403,11 ,   7755,39 ,   7755,39 ,     85,14 ,   7755,39 ,   7755,39 ,     85,14 ,     207,4 ,     197,4 ,  721,5 ,   5,17 ,  22,23 , {65,70,78},      268,1 ,  10133,25 ,      13,5 ,       4,0 ,    3227,4 ,    3231,9 ,     0,     0,     6,     4,     5 }, // Pashto/Arabic/Afghanistan
-    {     88,     1,   163,  1643,  1644,  1563,  1642,  1776,    45,    43,   101,    8220,    8221,    8216,    8217,     557,6 ,     557,6 ,     563,9 ,     572,8 ,     394,8 ,   1048,20 ,      18,7 ,     25,12 ,   7755,39 ,   7755,39 ,     85,14 ,   7755,39 ,   7755,39 ,     85,14 ,     207,4 ,     197,4 ,  721,5 ,   5,17 ,  22,23 , {80,75,82},      176,2 ,  10158,52 ,      13,5 ,       4,0 ,    3227,4 ,    3240,7 ,     2,     0,     7,     6,     7 }, // Pashto/Arabic/Pakistan
-    {     89,     1,   102,  1643,  1644,  1563,  1642,  1776,    45,    43,   101,     171,     187,    8249,    8250,     580,7 ,     580,7 ,     587,8 ,     595,7 ,     394,8 ,     97,16 ,      55,4 ,    403,11 ,   7794,49 ,   7794,49 ,   7843,14 ,   7794,49 ,   7794,49 ,   7843,14 ,     211,9 ,     201,8 ,  726,4 , 730,44 ,  22,23 , {73,82,82},      269,4 ,  10210,37 ,      84,5 ,       4,0 ,    3247,5 ,    3252,5 ,     0,     0,     6,     5,     5 }, // Persian/Arabic/Iran
-    {     89,     1,     1,  1643,  1644,  1563,  1642,  1776,    45,    43,   101,     171,     187,    8249,    8250,     580,7 ,     580,7 ,     587,8 ,     595,7 ,     394,8 ,     97,16 ,      55,4 ,    403,11 ,   7794,49 ,   7794,49 ,   7843,14 ,   7794,49 ,   7794,49 ,   7843,14 ,     211,9 ,     201,8 ,  726,4 , 730,44 ,  22,23 , {65,70,78},      268,1 ,  10247,55 ,       8,5 ,       4,0 ,    3257,3 ,    3231,9 ,     0,     0,     6,     4,     5 }, // Persian/Arabic/Afghanistan
-    {     90,     7,   172,    44,   160,    59,    37,    48,    45,    43,   101,    8222,    8221,     171,     187,       0,6 ,       0,6 ,     158,7 ,     158,7 ,    495,10 ,     10,17 ,      37,5 ,      8,10 ,   7857,34 ,   7891,59 ,   7950,14 ,   7857,34 ,   7891,59 ,   7964,14 ,       0,2 ,       0,2 ,  326,5 ,   5,17 ,  22,23 , {80,76,78},      273,2 ,  10302,77 ,      13,5 ,       4,0 ,    3260,6 ,    3266,6 ,     2,     1,     1,     6,     7 }, // Polish/Latin/Poland
-    {     91,     7,    30,    44,    46,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     249,7 ,     249,7 ,    119,10 ,    669,27 ,      37,5 ,      8,10 ,   7978,35 ,   8013,79 ,   8092,14 ,   7978,35 ,   8013,79 ,   8092,14 ,       0,2 ,       0,2 ,    0,5 ,   5,17 ,  22,23 , {66,82,76},      275,2 ,  10379,54 ,       8,5 ,       4,0 ,    3272,9 ,    3281,6 ,     2,     1,     7,     6,     7 }, // Portuguese/Latin/Brazil
-    {     91,     7,     6,    44,   160,    59,    37,    48,    45,    43,   101,     171,     187,    8220,    8221,       0,6 ,       0,6 ,     249,7 ,     249,7 ,      27,8 ,    669,27 ,      37,5 ,      8,10 ,   8106,49 ,   8013,79 ,   8092,14 ,   8106,49 ,   8013,79 ,   8092,14 ,     220,8 ,     209,8 ,    0,5 ,   5,17 ,  22,23 , {65,79,65},      254,2 ,  10433,54 ,      13,5 ,       4,0 ,    3272,9 ,    3287,6 ,     2,     1,     1,     6,     7 }, // Portuguese/Latin/Angola
-    {     91,     7,    39,    44,   160,    59,    37,    48,    45,    43,   101,     171,     187,    8220,    8221,       0,6 ,       0,6 ,     249,7 ,     249,7 ,      27,8 ,    669,27 ,      37,5 ,      8,10 ,   8106,49 ,   8013,79 ,   8092,14 ,   8106,49 ,   8013,79 ,   8092,14 ,     220,8 ,     209,8 ,    0,5 ,   5,17 ,  22,23 , {67,86,69},      277,1 ,  10487,69 ,      13,5 ,       4,0 ,    3272,9 ,   3293,10 ,     2,     1,     1,     6,     7 }, // Portuguese/Latin/Cape Verde
-    {     91,     7,    62,    44,   160,    59,    37,    48,    45,    43,   101,     171,     187,    8220,    8221,       0,6 ,       0,6 ,     249,7 ,     249,7 ,      27,8 ,    669,27 ,      37,5 ,      8,10 ,   8106,49 ,   8013,79 ,   8092,14 ,   8106,49 ,   8013,79 ,   8092,14 ,     220,8 ,     209,8 ,    0,5 ,   5,17 ,  22,23 , {85,83,68},      159,3 ,  10556,81 ,      13,5 ,       4,0 ,    3272,9 ,   3303,11 ,     2,     1,     1,     6,     7 }, // Portuguese/Latin/East Timor
-    {     91,     7,    66,    44,   160,    59,    37,    48,    45,    43,   101,     171,     187,    8220,    8221,       0,6 ,       0,6 ,     249,7 ,     249,7 ,      27,8 ,    669,27 ,      37,5 ,      8,10 ,   8106,49 ,   8013,79 ,   8092,14 ,   8106,49 ,   8013,79 ,   8092,14 ,     220,8 ,     209,8 ,    0,5 ,   5,17 ,  22,23 , {88,65,70},       32,4 ,  10637,59 ,      13,5 ,       4,0 ,    3272,9 ,   3314,16 ,     0,     0,     1,     6,     7 }, // Portuguese/Latin/Equatorial Guinea
-    {     91,     7,    92,    44,   160,    59,    37,    48,    45,    43,   101,     171,     187,    8220,    8221,       0,6 ,       0,6 ,     249,7 ,     249,7 ,      27,8 ,    669,27 ,      37,5 ,      8,10 ,   8106,49 ,   8013,79 ,   8092,14 ,   8106,49 ,   8013,79 ,   8092,14 ,     220,8 ,     209,8 ,    0,5 ,   5,17 ,  22,23 , {88,79,70},      207,3 ,  10696,62 ,      13,5 ,       4,0 ,    3272,9 ,   3330,12 ,     0,     0,     1,     6,     7 }, // Portuguese/Latin/Guinea Bissau
-    {     91,     7,   125,    44,   160,    59,    37,    48,    45,    43,   101,     171,     187,    8220,    8221,       0,6 ,       0,6 ,     249,7 ,     249,7 ,      27,8 ,    669,27 ,      37,5 ,      8,10 ,   8106,49 ,   8013,79 ,   8092,14 ,   8106,49 ,   8013,79 ,   8092,14 ,     220,8 ,     209,8 ,    0,5 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,   3102,20 ,      13,5 ,       4,0 ,    3272,9 ,   3342,10 ,     2,     1,     1,     6,     7 }, // Portuguese/Latin/Luxembourg
-    {     91,     7,   126,    44,   160,    59,    37,    48,    45,    43,   101,     171,     187,    8220,    8221,       0,6 ,       0,6 ,     249,7 ,     249,7 ,      27,8 ,    669,27 ,      18,7 ,     25,12 ,   8106,49 ,   8013,79 ,   8092,14 ,   8106,49 ,   8013,79 ,   8092,14 ,     220,8 ,     209,8 ,    0,5 ,   5,17 ,  22,23 , {77,79,80},      137,4 ,  10758,54 ,      13,5 ,       4,0 ,    3272,9 ,   3352,19 ,     2,     1,     7,     6,     7 }, // Portuguese/Latin/Macau
-    {     91,     7,   146,    44,   160,    59,    37,    48,    45,    43,   101,     171,     187,    8220,    8221,       0,6 ,       0,6 ,     249,7 ,     249,7 ,      27,8 ,    669,27 ,      37,5 ,      8,10 ,   8106,49 ,   8013,79 ,   8092,14 ,   8106,49 ,   8013,79 ,   8092,14 ,     220,8 ,     209,8 ,    0,5 ,   5,17 ,  22,23 , {77,90,78},      278,3 ,  10812,66 ,      13,5 ,       4,0 ,    3272,9 ,   3371,10 ,     2,     1,     7,     6,     7 }, // Portuguese/Latin/Mozambique
-    {     91,     7,   173,    44,   160,    59,    37,    48,    45,    43,   101,     171,     187,    8220,    8221,       0,6 ,       0,6 ,     249,7 ,     249,7 ,      27,8 ,    669,27 ,      37,5 ,      8,10 ,   8106,49 ,   8013,79 ,   8092,14 ,   8106,49 ,   8013,79 ,   8092,14 ,     220,8 ,     209,8 ,    0,5 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,   3102,20 ,      13,5 ,       4,0 ,   3381,17 ,    3398,8 ,     2,     1,     7,     6,     7 }, // Portuguese/Latin/Portugal
-    {     91,     7,   185,    44,   160,    59,    37,    48,    45,    43,   101,     171,     187,    8220,    8221,       0,6 ,       0,6 ,     249,7 ,     249,7 ,      27,8 ,    669,27 ,      37,5 ,      8,10 ,   8106,49 ,   8013,79 ,   8092,14 ,   8106,49 ,   8013,79 ,   8092,14 ,     220,8 ,     209,8 ,    0,5 ,   5,17 ,  22,23 , {83,84,78},      281,2 ,  10878,92 ,      13,5 ,       4,0 ,    3272,9 ,   3406,19 ,     2,     1,     1,     6,     7 }, // Portuguese/Latin/Sao Tome And Principe
-    {     91,     7,   206,    44,   160,    59,    37,    48,    45,    43,   101,     171,     187,    8220,    8221,       0,6 ,       0,6 ,     249,7 ,     249,7 ,      27,8 ,    669,27 ,      37,5 ,      8,10 ,   8106,49 ,   8013,79 ,   8092,14 ,   8106,49 ,   8013,79 ,   8092,14 ,     220,8 ,     209,8 ,    0,5 ,   5,17 ,  22,23 , {67,72,70},      224,3 ,  10970,45 ,      13,5 ,       4,0 ,    3272,9 ,    3425,5 ,     2,     0,     1,     6,     7 }, // Portuguese/Latin/Switzerland
-    {     92,     4,   100,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     602,9 ,     602,9 ,     269,6 ,     10,17 ,      18,7 ,     25,12 ,   8155,36 ,   8191,57 ,   8248,23 ,   8155,36 ,   8191,57 ,   8248,23 ,     228,6 ,     217,6 ,  774,4 ,   5,17 ,  22,23 , {73,78,82},      121,1 ,  11015,39 ,       4,4 ,       4,0 ,    3430,6 ,    3436,4 ,     2,     1,     7,     7,     7 }, // Punjabi/Gurmukhi/India
-    {     92,     1,   163,  1643,  1644,  1563,  1642,  1776,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,    119,10 ,    553,18 ,      18,7 ,     25,12 ,   8271,37 ,   8271,37 ,     85,14 ,   8271,37 ,   8271,37 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {80,75,82},      283,1 ,  11054,13 ,      41,6 ,       4,0 ,    3440,6 ,    3240,7 ,     2,     0,     7,     6,     7 }, // Punjabi/Arabic/Pakistan
-    {     93,     7,   169,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    611,11 ,    622,10 ,    119,10 ,    192,18 ,      37,5 ,      8,10 ,   8308,28 ,   8336,53 ,   8389,14 ,   8308,28 ,   8336,53 ,   8389,14 ,      64,4 ,      61,4 ,   45,4 ,   5,17 ,  22,23 , {80,69,78},      284,2 ,  11067,29 ,       8,5 ,       4,0 ,    3446,8 ,    3454,4 ,     2,     1,     7,     6,     7 }, // Quechua/Latin/Peru
-    {     93,     7,    26,    44,    46,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    611,11 ,    622,10 ,    119,10 ,    192,18 ,      37,5 ,      8,10 ,   8308,28 ,   8336,53 ,   8389,14 ,   8308,28 ,   8336,53 ,   8389,14 ,      64,4 ,      61,4 ,   45,4 ,   5,17 ,  22,23 , {66,79,66},      286,2 ,  11096,25 ,       8,5 ,       4,0 ,    3446,8 ,    3458,7 ,     2,     1,     1,     6,     7 }, // Quechua/Latin/Bolivia
-    {     93,     7,    63,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    611,11 ,    622,10 ,    119,10 ,    192,18 ,      37,5 ,      8,10 ,   8308,28 ,   8336,53 ,   8389,14 ,   8308,28 ,   8336,53 ,   8389,14 ,      64,4 ,      61,4 ,   45,4 ,   5,17 ,  22,23 , {85,83,68},        6,1 ,  11121,37 ,       8,5 ,       4,0 ,    3446,8 ,    3465,7 ,     2,     1,     1,     6,     7 }, // Quechua/Latin/Ecuador
-    {     94,     7,   206,    46,  8217,    59,    37,    48,  8722,    43,   101,     171,     187,    8249,    8250,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     339,8 ,   1068,23 ,      37,5 ,      8,10 ,   8403,23 ,   8426,56 ,   8482,14 ,   8403,23 ,   8426,56 ,   8482,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {67,72,70},      224,3 ,  11158,46 ,      13,5 ,       4,0 ,    3472,9 ,    3481,6 ,     2,     0,     1,     6,     7 }, // Romansh/Latin/Switzerland
-    {     95,     7,   177,    44,    46,    59,    37,    48,    45,    43,   101,    8222,    8221,     171,     187,       0,6 ,       0,6 ,     632,8 ,     632,8 ,    495,10 ,     10,17 ,      37,5 ,      8,10 ,   8496,34 ,   8530,48 ,   3107,14 ,   8496,34 ,   8530,48 ,   3107,14 ,      64,4 ,      61,4 ,  778,4 ,   5,17 ,  22,23 , {82,79,78},      288,3 ,  11204,57 ,      13,5 ,       4,0 ,    3487,6 ,    3493,7 ,     2,     1,     1,     6,     7 }, // Romanian/Latin/Romania
-    {     95,     7,   141,    44,    46,    59,    37,    48,    45,    43,   101,    8222,    8221,     171,     187,       0,6 ,       0,6 ,     632,8 ,     632,8 ,    495,10 ,     10,17 ,      37,5 ,      8,10 ,   8578,28 ,   8530,48 ,   8606,16 ,   8578,28 ,   8530,48 ,   8606,16 ,      64,4 ,      61,4 ,  778,4 ,   5,17 ,  22,23 , {77,68,76},      291,1 ,  11261,69 ,      13,5 ,       4,0 ,    3487,6 ,   3500,17 ,     2,     1,     1,     6,     7 }, // Romanian/Latin/Moldova
-    {     96,     2,   178,    44,   160,    59,    37,    48,    45,    43,   101,     171,     187,    8222,    8220,       0,6 ,       0,6 ,     111,7 ,     111,7 ,    495,10 ,    317,22 ,      37,5 ,      8,10 ,   8622,21 ,   8643,62 ,   8705,14 ,   8622,21 ,   8643,62 ,   8622,21 ,       0,2 ,       0,2 ,  269,5 , 680,17 ,  22,23 , {82,85,66},      123,1 ,  11330,89 ,      13,5 ,       4,0 ,    3517,7 ,    3524,6 ,     2,     1,     1,     6,     7 }, // Russian/Cyrillic/Russia
-    {     96,     2,    20,    44,   160,    59,    37,    48,    45,    43,   101,     171,     187,    8222,    8220,       0,6 ,       0,6 ,     111,7 ,     111,7 ,    495,10 ,    317,22 ,      37,5 ,      8,10 ,   8622,21 ,   8643,62 ,   8705,14 ,   8622,21 ,   8643,62 ,   8622,21 ,       0,2 ,       0,2 ,  269,5 , 680,17 ,  22,23 , {66,89,78},        0,2 ,  11419,94 ,      13,5 ,       4,0 ,    3517,7 ,     510,8 ,     2,     0,     1,     6,     7 }, // Russian/Cyrillic/Belarus
-    {     96,     2,   110,    44,   160,    59,    37,    48,    45,    43,   101,     171,     187,    8222,    8220,       0,6 ,       0,6 ,     111,7 ,     111,7 ,    495,10 ,    317,22 ,      37,5 ,      8,10 ,   8622,21 ,   8643,62 ,   8705,14 ,   8622,21 ,   8643,62 ,   8622,21 ,       0,2 ,       0,2 ,  269,5 , 680,17 ,  22,23 , {75,90,84},      244,1 ,  11513,83 ,      13,5 ,       4,0 ,    3517,7 ,    3530,9 ,     2,     1,     1,     6,     7 }, // Russian/Cyrillic/Kazakhstan
-    {     96,     2,   116,    44,   160,    59,    37,    48,    45,    43,   101,     171,     187,    8222,    8220,       0,6 ,       0,6 ,     111,7 ,     111,7 ,    495,10 ,    317,22 ,      37,5 ,      8,10 ,   8622,21 ,   8643,62 ,   8705,14 ,   8622,21 ,   8643,62 ,   8622,21 ,       0,2 ,       0,2 ,  269,5 , 680,17 ,  22,23 , {75,71,83},      245,3 ,  11596,82 ,      13,5 ,       4,0 ,    3517,7 ,    3539,8 ,     2,     1,     1,     6,     7 }, // Russian/Cyrillic/Kyrgyzstan
-    {     96,     2,   141,    44,   160,    59,    37,    48,    45,    43,   101,     171,     187,    8222,    8220,       0,6 ,       0,6 ,     111,7 ,     111,7 ,    495,10 ,    317,22 ,      37,5 ,      8,10 ,   8622,21 ,   8643,62 ,   8705,14 ,   8622,21 ,   8643,62 ,   8622,21 ,       0,2 ,       0,2 ,  269,5 , 680,17 ,  22,23 , {77,68,76},      291,1 ,  11678,79 ,      13,5 ,       4,0 ,    3517,7 ,    3547,7 ,     2,     1,     1,     6,     7 }, // Russian/Cyrillic/Moldova
-    {     96,     2,   222,    44,   160,    59,    37,    48,    45,    43,   101,     171,     187,    8222,    8220,       0,6 ,       0,6 ,     111,7 ,     111,7 ,    495,10 ,    317,22 ,      37,5 ,      8,10 ,   8622,21 ,   8643,62 ,   8705,14 ,   8622,21 ,   8643,62 ,   8622,21 ,       0,2 ,       0,2 ,  269,5 , 680,17 ,  22,23 , {85,65,72},      292,1 ,  11757,92 ,      13,5 ,       4,0 ,    3517,7 ,    3554,7 ,     2,     1,     1,     6,     7 }, // Russian/Cyrillic/Ukraine
-    {     98,     7,    41,    44,    46,    59,    37,    48,    45,    43,   101,     171,     187,    8220,    8221,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     415,8 ,     97,16 ,      37,5 ,      8,10 ,   8719,28 ,   8747,66 ,   8813,14 ,   8719,28 ,   8747,66 ,   8813,14 ,     234,2 ,     223,2 ,   45,4 ,   5,17 ,  22,23 , {88,65,70},       32,4 ,  11849,25 ,       4,4 ,      36,5 ,    3561,5 ,   3566,22 ,     0,     0,     1,     6,     7 }, // Sango/Latin/Central African Republic
-    {     99,    13,   100,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {73,78,82},      121,1 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     2,     1,     7,     7,     7 }, // Sanskrit/Devanagari/India
-    {    100,     2,   243,    44,    46,    59,    37,    48,    45,    43,   101,    8222,    8220,    8216,    8216,       0,6 ,       0,6 ,     111,7 ,     111,7 ,    1091,7 ,   1098,20 ,      37,5 ,      8,10 ,   8827,28 ,   8855,52 ,   8907,14 ,   8827,28 ,   8855,52 ,   8907,14 ,     236,9 ,     225,8 ,  782,7 ,   5,17 ,  22,23 , {82,83,68},      293,3 ,  11874,58 ,      13,5 ,       4,0 ,    3588,6 ,    3594,6 ,     0,     0,     1,     6,     7 }, // Serbian/Cyrillic/Serbia
-    {    100,     2,    27,    44,    46,    59,    37,    48,    45,    43,   101,    8222,    8220,    8216,    8216,       0,6 ,       0,6 ,     111,7 ,     111,7 ,    1091,7 ,   1098,20 ,      37,5 ,      8,10 ,   8921,26 ,   8947,55 ,   8907,14 ,   8921,26 ,   8947,55 ,   8907,14 ,    245,11 ,     225,8 ,  782,7 ,   5,17 ,  22,23 , {66,65,77},      296,2 , 11932,174 ,      13,5 ,       4,0 ,    3588,6 ,   3600,19 ,     2,     1,     1,     6,     7 }, // Serbian/Cyrillic/Bosnia And Herzegowina
-    {    100,     2,   242,    44,    46,    59,    37,    48,    45,    43,   101,    8222,    8220,    8216,    8216,       0,6 ,       0,6 ,     111,7 ,     111,7 ,    1091,7 ,   1098,20 ,      37,5 ,      8,10 ,   8827,28 ,   8947,55 ,   8907,14 ,   8827,28 ,   8947,55 ,   8907,14 ,    245,11 ,     225,8 ,  782,7 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,  12106,23 ,      13,5 ,       4,0 ,    3588,6 ,    3619,9 ,     2,     1,     1,     6,     7 }, // Serbian/Cyrillic/Montenegro
-    {    100,     2,   257,    44,    46,    59,    37,    48,    45,    43,   101,    8222,    8220,    8216,    8216,       0,6 ,       0,6 ,     111,7 ,     111,7 ,    1091,7 ,   1098,20 ,      37,5 ,      8,10 ,   8827,28 ,   8855,52 ,   8907,14 ,   8827,28 ,   8855,52 ,   8907,14 ,     236,9 ,     225,8 ,  782,7 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,  12106,23 ,      13,5 ,       4,0 ,    3588,6 ,    3628,6 ,     2,     1,     1,     6,     7 }, // Serbian/Cyrillic/Kosovo
-    {    100,     7,    27,    44,    46,    59,    37,    48,    45,    43,   101,    8222,    8220,    8216,    8216,       0,6 ,       0,6 ,     158,7 ,     158,7 ,    1091,7 ,   1098,20 ,      37,5 ,      8,10 ,   9002,26 ,   9028,57 ,   2129,14 ,   9002,26 ,   9028,57 ,   2129,14 ,    256,11 ,     233,8 ,  319,7 ,   5,17 ,  22,23 , {66,65,77},      144,2 , 12129,174 ,      13,5 ,       4,0 ,    3634,6 ,    629,19 ,     2,     1,     1,     6,     7 }, // Serbian/Latin/Bosnia And Herzegowina
-    {    100,     7,   242,    44,    46,    59,    37,    48,    45,    43,   101,    8222,    8220,    8216,    8216,       0,6 ,       0,6 ,     158,7 ,     158,7 ,    1091,7 ,   1098,20 ,      37,5 ,      8,10 ,   9085,28 ,   9028,57 ,   2129,14 ,   9085,28 ,   9028,57 ,   2129,14 ,    256,11 ,     233,8 ,  319,7 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,  12303,23 ,      13,5 ,       4,0 ,    3634,6 ,    3640,9 ,     2,     1,     1,     6,     7 }, // Serbian/Latin/Montenegro
-    {    100,     7,   243,    44,    46,    59,    37,    48,    45,    43,   101,    8222,    8220,    8216,    8216,       0,6 ,       0,6 ,     158,7 ,     158,7 ,    1091,7 ,   1098,20 ,      37,5 ,      8,10 ,   9085,28 ,   9113,54 ,   2129,14 ,   9085,28 ,   9113,54 ,   2129,14 ,     267,9 ,     233,8 ,  319,7 ,   5,17 ,  22,23 , {82,83,68},      293,3 ,  12326,58 ,      13,5 ,       4,0 ,    3634,6 ,    3649,6 ,     0,     0,     1,     6,     7 }, // Serbian/Latin/Serbia
-    {    100,     7,   257,    44,    46,    59,    37,    48,    45,    43,   101,    8222,    8220,    8216,    8216,       0,6 ,       0,6 ,     158,7 ,     158,7 ,    1091,7 ,   1098,20 ,      37,5 ,      8,10 ,   9085,28 ,   9113,54 ,   2129,14 ,   9085,28 ,   9113,54 ,   2129,14 ,     267,9 ,     233,8 ,  319,7 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,  12303,23 ,      13,5 ,       4,0 ,    3634,6 ,    3655,6 ,     2,     1,     1,     6,     7 }, // Serbian/Latin/Kosovo
-    {    101,     2,    81,    44,   160,    59,    37,    48,    45,    43,   101,     171,     187,    8222,    8220,       0,6 ,       0,6 ,     640,9 ,     640,9 ,     156,8 ,   1118,23 ,      37,5 ,      8,10 ,   9167,28 ,   9195,61 ,   9256,14 ,   9270,28 ,   9298,61 ,   9256,14 ,    276,15 ,    241,15 ,   45,4 ,   5,17 ,  22,23 , {71,69,76},      231,1 ,  12384,17 ,       8,5 ,       4,0 ,    3661,4 ,   3665,11 ,     2,     1,     1,     6,     7 }, // Ossetic/Cyrillic/Georgia
-    {    101,     2,   178,    44,   160,    59,    37,    48,    45,    43,   101,     171,     187,    8222,    8220,       0,6 ,       0,6 ,     640,9 ,     640,9 ,     156,8 ,   1118,23 ,      37,5 ,      8,10 ,   9167,28 ,   9195,61 ,   9256,14 ,   9270,28 ,   9298,61 ,   9256,14 ,    276,15 ,    241,15 ,   45,4 ,   5,17 ,  22,23 , {82,85,66},      123,1 ,  12401,17 ,       8,5 ,       4,0 ,    3661,4 ,    3676,6 ,     2,     1,     1,     6,     7 }, // Ossetic/Cyrillic/Russia
-    {    102,     7,   195,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {90,65,82},        5,1 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     2,     1,     7,     6,     7 }, // Southern Sotho/Latin/South Africa
-    {    103,     7,   195,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {90,65,82},        5,1 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     2,     1,     7,     6,     7 }, // Tswana/Latin/South Africa
-    {    104,     7,   240,    46,    44,    59,    37,    48,    45,    43,   101,    8221,    8221,    8217,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,   9359,28 ,   9387,55 ,   9442,14 ,   9359,28 ,   9387,55 ,   9442,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {85,83,68},      159,3 ,  12418,22 ,       4,4 ,       4,0 ,    3682,8 ,    1815,8 ,     2,     1,     7,     6,     7 }, // Shona/Latin/Zimbabwe
-    {    105,     1,   163,  1643,  1644,  1563,    37,  1632,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     649,8 ,     657,7 ,     53,10 ,     63,17 ,      18,7 ,     25,12 ,   9456,35 ,   9456,35 ,   9491,31 ,   9456,35 ,   9456,35 ,   9491,31 ,    291,11 ,    256,11 ,  789,6 , 795,61 ,  22,23 , {80,75,82},      176,2 ,  12440,43 ,       8,5 ,       4,0 ,    3690,4 ,    3694,7 ,     2,     0,     7,     6,     7 }, // Sindhi/Arabic/Pakistan
-    {    106,    32,   198,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     664,9 ,     673,8 ,     53,10 ,     63,17 ,     205,5 ,    210,10 ,   9522,39 ,   9561,62 ,   9623,19 ,   9522,39 ,   9561,62 ,   9623,19 ,     302,5 ,     267,4 ,  856,5 , 861,42 ,  22,23 , {76,75,82},      298,3 ,  12483,58 ,       4,4 ,       4,0 ,    3701,5 ,   3706,11 ,     2,     1,     1,     6,     7 }, // Sinhala/Sinhala/Sri Lanka
-    {    107,     7,   195,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {90,65,82},        5,1 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     2,     1,     7,     6,     7 }, // Swati/Latin/South Africa
-    {    108,     7,   191,    44,   160,    59,    37,    48,    45,    43,   101,    8222,    8220,    8218,    8216,       0,6 ,       0,6 ,     180,7 ,     681,7 ,   1141,10 ,    478,17 ,      55,4 ,      59,9 ,   9642,21 ,   9663,52 ,   9715,14 ,   9642,21 ,   9663,52 ,   9715,14 ,       0,2 ,       0,2 ,  326,5 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,  12541,26 ,      13,5 ,       4,0 ,   3717,10 ,    3727,9 ,     2,     1,     1,     6,     7 }, // Slovak/Latin/Slovakia
-    {    109,     7,   192,    44,    46,    59,    37,    48,  8722,    43,   101,    8222,    8220,    8218,    8216,       0,6 ,       0,6 ,     688,8 ,     688,8 ,    1151,9 ,   1160,19 ,      37,5 ,      8,10 ,   9729,35 ,   9764,52 ,   9816,14 ,   9729,35 ,   9764,52 ,   9816,14 ,      60,4 ,     271,4 ,   54,4 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,  12567,28 ,      13,5 ,       4,0 ,   3736,11 ,    3747,9 ,     2,     1,     1,     6,     7 }, // Slovenian/Latin/Slovenia
-    {    110,     7,   194,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     696,9 ,     696,9 ,      27,8 ,   1179,19 ,      18,7 ,     25,12 ,   9830,32 ,   9862,47 ,   9909,15 ,   9830,32 ,   9862,47 ,   9909,15 ,     307,2 ,     275,2 ,  903,6 , 909,17 ,  22,23 , {83,79,83},       94,1 ,  12595,27 ,       4,4 ,       4,0 ,    3756,8 ,   3764,10 ,     0,     0,     1,     6,     7 }, // Somali/Latin/Somalia
-    {    110,     7,    59,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     696,9 ,     696,9 ,      27,8 ,   1179,19 ,      18,7 ,     25,12 ,   9830,32 ,   9862,47 ,   9909,15 ,   9830,32 ,   9862,47 ,   9909,15 ,     307,2 ,     275,2 ,  903,6 , 909,17 ,  22,23 , {68,74,70},       38,3 ,  12622,50 ,       4,4 ,       4,0 ,    3756,8 ,    3774,7 ,     0,     0,     6,     6,     7 }, // Somali/Latin/Djibouti
-    {    110,     7,    69,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     696,9 ,     696,9 ,      27,8 ,   1179,19 ,      18,7 ,     25,12 ,   9830,32 ,   9862,47 ,   9909,15 ,   9830,32 ,   9862,47 ,   9909,15 ,     307,2 ,     275,2 ,  903,6 , 909,17 ,  22,23 , {69,84,66},        0,2 ,  12672,52 ,       4,4 ,       4,0 ,    3756,8 ,    3781,8 ,     2,     1,     7,     6,     7 }, // Somali/Latin/Ethiopia
-    {    110,     7,   111,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     696,9 ,     696,9 ,      27,8 ,   1179,19 ,      37,5 ,      8,10 ,   9830,32 ,   9862,47 ,   9909,15 ,   9830,32 ,   9862,47 ,   9909,15 ,     307,2 ,     275,2 ,  903,6 , 909,17 ,  22,23 , {75,69,83},        2,3 ,  12724,52 ,       4,4 ,       4,0 ,    3756,8 ,    1191,5 ,     2,     1,     7,     6,     7 }, // Somali/Latin/Kenya
-    {    111,     7,   197,    44,    46,    59,    37,    48,    45,    43,   101,     171,     187,    8220,    8221,       0,6 ,       0,6 ,     705,7 ,     705,7 ,     269,6 ,    669,27 ,      55,4 ,    403,11 ,   9924,35 ,   9959,53 ,   8389,14 ,   9924,35 ,   9959,53 ,   8389,14 ,      53,5 ,      50,5 ,    0,5 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,   3102,20 ,      13,5 ,       4,0 ,   3789,17 ,    2427,6 ,     2,     1,     1,     6,     7 }, // Spanish/Latin/Spain
-    {    111,     7,    10,    44,    46,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     705,7 ,     705,7 ,     269,6 ,    669,27 ,      37,5 ,      8,10 ,   9924,35 ,   9959,53 ,   3107,14 ,   9924,35 ,   9959,53 ,   3107,14 ,      53,5 ,      50,5 ,    0,5 ,   5,17 ,  22,23 , {65,82,83},        6,1 ,  12776,51 ,       8,5 ,       4,0 ,    3806,7 ,    3813,9 ,     2,     1,     1,     6,     7 }, // Spanish/Latin/Argentina
-    {    111,     7,    22,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     705,7 ,     705,7 ,     269,6 ,    669,27 ,      37,5 ,      8,10 ,   9924,35 ,   9959,53 ,   3107,14 ,   9924,35 ,   9959,53 ,   4796,14 ,      64,4 ,      61,4 ,    0,5 ,   5,17 ,  22,23 , {66,90,68},        6,1 ,  12827,52 ,       4,4 ,       4,0 ,    3806,7 ,    3822,6 ,     2,     1,     7,     6,     7 }, // Spanish/Latin/Belize
-    {    111,     7,    26,    44,    46,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     705,7 ,     705,7 ,     269,6 ,    669,27 ,      37,5 ,      8,10 ,   9924,35 ,   9959,53 ,   3107,14 ,   9924,35 ,   9959,53 ,   4796,14 ,      53,5 ,      50,5 ,    0,5 ,   5,17 ,  22,23 , {66,79,66},      286,2 ,  12879,35 ,       4,4 ,       4,0 ,    3806,7 ,    3458,7 ,     2,     1,     1,     6,     7 }, // Spanish/Latin/Bolivia
-    {    111,     7,    30,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     705,7 ,     705,7 ,     269,6 ,    669,27 ,      37,5 ,      8,10 ,   9924,35 ,   9959,53 ,   3107,14 ,   9924,35 ,   9959,53 ,   4796,14 ,      64,4 ,      61,4 ,    0,5 ,   5,17 ,  22,23 , {66,82,76},      275,2 ,  12914,52 ,       4,4 ,       4,0 ,    3806,7 ,    3281,6 ,     2,     1,     7,     6,     7 }, // Spanish/Latin/Brazil
-    {    111,     7,    43,    44,    46,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     705,7 ,     705,7 ,     339,8 ,    669,27 ,      37,5 ,      8,10 ,   9924,35 ,   9959,53 ,   3107,14 ,   9924,35 ,   9959,53 ,   4796,14 ,      53,5 ,      50,5 ,    0,5 ,   5,17 ,  22,23 , {67,76,80},        6,1 ,  12966,45 ,       4,4 ,      36,5 ,    3806,7 ,    3828,5 ,     0,     0,     1,     6,     7 }, // Spanish/Latin/Chile
-    {    111,     7,    47,    44,    46,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     705,7 ,     705,7 ,     571,7 ,    669,27 ,      18,7 ,     25,12 ,   9924,35 ,   9959,53 ,   4796,14 ,   9924,35 ,   9959,53 ,   3107,14 ,      53,5 ,      50,5 ,    0,5 ,   5,17 ,  22,23 , {67,79,80},        6,1 ,  13011,54 ,       8,5 ,       4,0 ,    3806,7 ,    3833,8 ,     2,     0,     7,     6,     7 }, // Spanish/Latin/Colombia
-    {    111,     7,    52,    44,   160,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     705,7 ,     705,7 ,     269,6 ,    669,27 ,      37,5 ,      8,10 ,   9924,35 ,   9959,53 ,   3107,14 ,   9924,35 ,   9959,53 ,   4796,14 ,      53,5 ,      50,5 ,    0,5 ,   5,17 ,  22,23 , {67,82,67},      301,1 ,  13065,67 ,       4,4 ,       4,0 ,    3806,7 ,   3841,10 ,     2,     0,     1,     6,     7 }, // Spanish/Latin/Costa Rica
-    {    111,     7,    55,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     705,7 ,     705,7 ,     269,6 ,    669,27 ,      37,5 ,      8,10 ,   9924,35 ,   9959,53 ,   3107,14 ,   9924,35 ,   9959,53 ,   4796,14 ,      64,4 ,      61,4 ,    0,5 ,   5,17 ,  22,23 , {67,85,80},        6,1 ,  13132,42 ,       4,4 ,       4,0 ,    3806,7 ,    3851,4 ,     2,     1,     1,     6,     7 }, // Spanish/Latin/Cuba
-    {    111,     7,    61,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     705,7 ,     705,7 ,     269,6 ,    669,27 ,      18,7 ,     25,12 ,   9924,35 ,   9959,53 ,   3107,14 ,   9924,35 ,   9959,53 ,   3107,14 ,      53,5 ,      50,5 ,    0,5 ,   5,17 ,  22,23 , {68,79,80},      302,3 ,  13174,54 ,       4,4 ,      89,6 ,    3806,7 ,   3855,20 ,     2,     1,     7,     6,     7 }, // Spanish/Latin/Dominican Republic
-    {    111,     7,    63,    44,    46,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     705,7 ,     705,7 ,     269,6 ,    669,27 ,      37,5 ,      8,10 ,   9924,35 ,   9959,53 ,   3107,14 ,   9924,35 ,   9959,53 ,   4796,14 ,      53,5 ,      50,5 ,    0,5 ,   5,17 ,  22,23 , {85,83,68},        6,1 ,  13228,70 ,       4,4 ,      36,5 ,    3806,7 ,    3465,7 ,     2,     1,     1,     6,     7 }, // Spanish/Latin/Ecuador
-    {    111,     7,    65,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     705,7 ,     705,7 ,     269,6 ,    669,27 ,      37,5 ,      8,10 ,   9924,35 ,   9959,53 ,   3107,14 ,   9924,35 ,   9959,53 ,   4796,14 ,      53,5 ,      50,5 ,    0,5 ,   5,17 ,  22,23 , {85,83,68},        6,1 ,  13228,70 ,       4,4 ,       4,0 ,    3806,7 ,   3875,11 ,     2,     1,     7,     6,     7 }, // Spanish/Latin/El Salvador
-    {    111,     7,    66,    44,    46,    59,    37,    48,    45,    43,   101,     171,     187,    8220,    8221,       0,6 ,       0,6 ,     705,7 ,     705,7 ,     269,6 ,    669,27 ,      55,4 ,    403,11 ,   9924,35 ,   9959,53 ,   8389,14 ,   9924,35 ,   9959,53 ,   8389,14 ,      53,5 ,      50,5 ,    0,5 ,   5,17 ,  22,23 , {88,65,70},       32,4 ,  13298,92 ,       4,4 ,       4,0 ,    3806,7 ,   3886,17 ,     0,     0,     1,     6,     7 }, // Spanish/Latin/Equatorial Guinea
-    {    111,     7,    90,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     705,7 ,     705,7 ,     571,7 ,    669,27 ,      37,5 ,      8,10 ,   9924,35 ,   9959,53 ,   3107,14 ,   9924,35 ,   9959,53 ,   4796,14 ,      53,5 ,      50,5 ,    0,5 ,   5,17 ,  22,23 , {71,84,81},      305,1 ,  13390,30 ,      18,5 ,       4,0 ,    3806,7 ,    3903,9 ,     2,     1,     7,     6,     7 }, // Spanish/Latin/Guatemala
-    {    111,     7,    96,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     705,7 ,     705,7 ,     269,6 ,   1198,27 ,      37,5 ,      8,10 ,   9924,35 ,   9959,53 ,   3107,14 ,   9924,35 ,   9959,53 ,   4796,14 ,      53,5 ,      50,5 ,    0,5 ,   5,17 ,  22,23 , {72,78,76},      291,1 ,  13420,60 ,       4,4 ,       4,0 ,    3806,7 ,    3912,8 ,     2,     1,     7,     6,     7 }, // Spanish/Latin/Honduras
-    {    111,     7,   139,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     705,7 ,     705,7 ,      27,8 ,    669,27 ,      55,4 ,      59,9 ,   9924,35 ,   9959,53 ,   3107,14 ,   9924,35 ,   9959,53 ,   3107,14 ,      53,5 ,      50,5 ,    0,5 ,   5,17 ,  22,23 , {77,88,78},        6,1 ,  13480,48 ,      47,6 ,       4,0 ,   3920,17 ,    3937,6 ,     2,     1,     7,     6,     7 }, // Spanish/Latin/Mexico
-    {    111,     7,   155,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     705,7 ,     705,7 ,     269,6 ,    669,27 ,      37,5 ,      8,10 ,   9924,35 ,   9959,53 ,   3107,14 ,   9924,35 ,   9959,53 ,   4796,14 ,      53,5 ,      50,5 ,    0,5 ,   5,17 ,  22,23 , {78,73,79},      306,2 ,  13528,69 ,       4,4 ,       4,0 ,    3806,7 ,    3943,9 ,     2,     1,     7,     6,     7 }, // Spanish/Latin/Nicaragua
-    {    111,     7,   166,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     705,7 ,     705,7 ,    1225,8 ,    669,27 ,      18,7 ,     25,12 ,   9924,35 ,   9959,53 ,   3107,14 ,   9924,35 ,   9959,53 ,   4796,14 ,      53,5 ,      50,5 ,    0,5 ,   5,17 ,  22,23 , {80,65,66},      308,3 ,  13597,54 ,       4,4 ,       4,0 ,    3806,7 ,    3952,6 ,     2,     1,     7,     6,     7 }, // Spanish/Latin/Panama
-    {    111,     7,   168,    44,    46,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     705,7 ,     705,7 ,     269,6 ,    669,27 ,      37,5 ,      8,10 ,   9924,35 ,   9959,53 ,   3107,14 ,   9924,35 ,   9959,53 ,   4796,14 ,      53,5 ,      50,5 ,    0,5 ,   5,17 ,  22,23 , {80,89,71},      311,3 ,  13651,61 ,       8,5 ,      23,6 ,    3806,7 ,    3958,8 ,     0,     0,     7,     6,     7 }, // Spanish/Latin/Paraguay
-    {    111,     7,   169,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     705,7 ,     705,7 ,     571,7 ,    669,27 ,      37,5 ,      8,10 ,   9924,35 ,   9959,53 ,   3107,14 ,   9924,35 ,   9959,53 ,   4796,14 ,      53,5 ,      50,5 ,    0,5 ,   5,17 ,  22,23 , {80,69,78},      284,2 ,  13712,43 ,       8,5 ,       4,0 ,    3806,7 ,    3454,4 ,     2,     1,     7,     6,     7 }, // Spanish/Latin/Peru
-    {    111,     7,   170,    44,    46,    59,    37,    48,    45,    43,   101,     171,     187,    8220,    8221,       0,6 ,       0,6 ,     705,7 ,     705,7 ,     269,6 ,    669,27 ,      18,7 ,     25,12 ,   9924,35 ,   9959,53 ,   8389,14 ,   9924,35 ,   9959,53 ,   8389,14 ,      53,5 ,      50,5 ,    0,5 ,   5,17 ,  22,23 , {80,72,80},      179,1 ,  13755,48 ,      13,5 ,       4,0 ,    3806,7 ,    3966,9 ,     2,     1,     7,     6,     7 }, // Spanish/Latin/Philippines
-    {    111,     7,   174,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     705,7 ,     705,7 ,    1225,8 ,    669,27 ,      18,7 ,     25,12 ,   9924,35 ,   9959,53 ,   3107,14 ,   9924,35 ,   9959,53 ,   4796,14 ,      53,5 ,      50,5 ,    0,5 ,   5,17 ,  22,23 , {85,83,68},        6,1 ,  13228,70 ,       4,4 ,       4,0 ,    3806,7 ,   1446,11 ,     2,     1,     7,     6,     7 }, // Spanish/Latin/Puerto Rico
-    {    111,     7,   225,    46,    44,    59,    37,    48,    45,    43,   101,     171,     187,    8220,    8221,       0,6 ,       0,6 ,     705,7 ,     705,7 ,     415,8 ,    669,27 ,      18,7 ,     25,12 ,   9924,35 ,   9959,53 ,   3107,14 ,   9924,35 ,   9959,53 ,   3107,14 ,      53,5 ,      50,5 ,    0,5 ,   5,17 ,  22,23 , {85,83,68},        6,1 ,  13228,70 ,      95,7 ,       4,0 ,    3806,7 ,   3975,14 ,     2,     1,     7,     6,     7 }, // Spanish/Latin/United States
-    {    111,     7,   227,    44,    46,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     705,7 ,     705,7 ,     269,6 ,    669,27 ,      37,5 ,      8,10 ,   9924,35 ,   9959,53 ,   3107,14 ,   9924,35 ,   9959,53 ,   4796,14 ,      53,5 ,      50,5 ,    0,5 ,   5,17 ,  22,23 , {85,89,85},        6,1 ,  13803,48 ,       8,5 ,       4,0 ,    3806,7 ,    3989,7 ,     2,     1,     1,     6,     7 }, // Spanish/Latin/Uruguay
-    {    111,     7,   231,    44,    46,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     705,7 ,     705,7 ,     269,6 ,    669,27 ,      18,7 ,     25,12 ,   9924,35 ,   9959,53 ,   3107,14 ,   9924,35 ,   9959,53 ,   4796,14 ,      53,5 ,      50,5 ,    0,5 ,   5,17 ,  22,23 , {86,69,83},      314,4 ,  13851,58 ,       4,4 ,      36,5 ,    3806,7 ,    3996,9 ,     2,     1,     7,     6,     7 }, // Spanish/Latin/Venezuela
-    {    111,     7,   238,    44,    46,    59,    37,    48,    45,    43,   101,     171,     187,    8220,    8221,       0,6 ,       0,6 ,     705,7 ,     705,7 ,     269,6 ,    669,27 ,      55,4 ,    403,11 ,   9924,35 ,   9959,53 ,   8389,14 ,   9924,35 ,   9959,53 ,   8389,14 ,      53,5 ,      50,5 ,    0,5 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,   3102,20 ,      13,5 ,       4,0 ,    3806,7 ,    4005,8 ,     2,     1,     1,     6,     7 }, // Spanish/Latin/Canary Islands
-    {    111,     7,   246,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     705,7 ,     705,7 ,     269,6 ,    669,27 ,      37,5 ,      8,10 ,   9924,35 ,   9959,53 ,   3107,14 ,   9924,35 ,   9959,53 ,   4796,14 ,      64,4 ,      61,4 ,    0,5 ,   5,17 ,  22,23 ,    {0,0,0},        0,0 ,    2586,0 ,       4,4 ,       4,0 ,   4013,23 ,   4036,13 ,     2,     1,     1,     6,     7 }, // Spanish/Latin/Latin America
-    {    111,     7,   250,    44,    46,    59,    37,    48,    45,    43,   101,     171,     187,    8220,    8221,       0,6 ,       0,6 ,     705,7 ,     705,7 ,     269,6 ,    669,27 ,      55,4 ,    403,11 ,   9924,35 ,   9959,53 ,   8389,14 ,   9924,35 ,   9959,53 ,   8389,14 ,      53,5 ,      50,5 ,    0,5 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,   3102,20 ,      13,5 ,       4,0 ,    3806,7 ,   4049,15 ,     2,     1,     1,     6,     7 }, // Spanish/Latin/Ceuta And Melilla
-    {    112,     7,   101,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {73,68,82},      238,2 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     2,     0,     7,     6,     7 }, // Sundanese/Latin/Indonesia
-    {    113,     7,   210,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     712,8 ,     712,8 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,  10012,60 ,  10012,60 ,     85,14 ,  10012,60 ,  10012,60 ,     85,14 ,       0,2 ,       0,2 ,  627,5 , 926,51 ,  22,23 , {84,90,83},      192,3 ,  13909,67 ,       8,5 ,       4,0 ,    4064,9 ,    1620,8 ,     2,     0,     1,     6,     7 }, // Swahili/Latin/Tanzania
-    {    113,     7,    49,    44,    46,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     712,8 ,     712,8 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,  10012,60 ,  10012,60 ,     85,14 ,  10012,60 ,  10012,60 ,     85,14 ,       0,2 ,       0,2 ,  627,5 , 926,51 ,  22,23 , {67,68,70},      210,2 ,  13976,55 ,       8,5 ,       4,0 ,    4064,9 ,   4073,32 ,     2,     1,     1,     6,     7 }, // Swahili/Latin/Congo Kinshasa
-    {    113,     7,   111,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     712,8 ,     712,8 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,  10012,60 ,  10012,60 ,     85,14 ,  10012,60 ,  10012,60 ,     85,14 ,       0,2 ,       0,2 ,  627,5 , 926,51 ,  22,23 , {75,69,83},        2,3 ,  14031,58 ,     102,6 ,     108,6 ,    4064,9 ,    1191,5 ,     2,     1,     7,     6,     7 }, // Swahili/Latin/Kenya
-    {    113,     7,   221,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     712,8 ,     712,8 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,  10012,60 ,  10012,60 ,     85,14 ,  10012,60 ,  10012,60 ,     85,14 ,       0,2 ,       0,2 ,  627,5 , 926,51 ,  22,23 , {85,71,88},      197,3 ,  14089,61 ,       8,5 ,       4,0 ,    4064,9 ,    1685,6 ,     0,     0,     1,     7,     7 }, // Swahili/Latin/Uganda
-    {    114,     7,   205,    44,   160,    59,    37,    48,  8722,    43,   101,    8221,    8221,    8217,    8217,       0,6 ,       0,6 ,     720,9 ,     720,9 ,     53,10 ,     97,16 ,      37,5 ,    414,16 ,  10072,29 ,  10101,50 ,   2320,14 ,  10072,29 ,  10101,50 ,   2320,14 ,     309,2 ,     277,2 ,   45,4 ,   5,17 ,  22,23 , {83,69,75},      190,2 ,  14150,45 ,      13,5 ,       4,0 ,    4105,7 ,    4112,7 ,     2,     0,     1,     6,     7 }, // Swedish/Latin/Sweden
-    {    114,     7,    73,    44,   160,    59,    37,    48,  8722,    43,   101,    8221,    8221,    8217,    8217,       0,6 ,       0,6 ,     720,9 ,     720,9 ,     53,10 ,     97,16 ,      37,5 ,    414,16 ,  10072,29 ,  10101,50 ,   2320,14 ,  10072,29 ,  10101,50 ,   2320,14 ,     309,2 ,     277,2 ,   45,4 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,   9086,19 ,      13,5 ,       4,0 ,    4105,7 ,    1088,7 ,     2,     1,     1,     6,     7 }, // Swedish/Latin/Finland
-    {    114,     7,   248,    44,   160,    59,    37,    48,  8722,    43,   101,    8221,    8221,    8217,    8217,       0,6 ,       0,6 ,     720,9 ,     720,9 ,     53,10 ,     97,16 ,      37,5 ,    414,16 ,  10072,29 ,  10101,50 ,   2320,14 ,  10072,29 ,  10101,50 ,   2320,14 ,     309,2 ,     277,2 ,   45,4 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,   9086,19 ,      13,5 ,       4,0 ,    4105,7 ,    4119,5 ,     2,     1,     1,     6,     7 }, // Swedish/Latin/Aland Islands
-    {    115,     7,   106,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     2,     1,     1,     6,     7 }, // Sardinian/Latin/Italy
-    {    116,     2,   209,    44,   160,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,      27,8 ,    553,18 ,      37,5 ,      8,10 ,  10151,28 ,  10179,55 ,  10234,14 ,  10151,28 ,  10179,55 ,  10234,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {84,74,83},      318,4 ,  14195,19 ,      13,5 ,       4,0 ,    4124,6 ,   4130,10 ,     2,     1,     1,     6,     7 }, // Tajik/Cyrillic/Tajikistan
-    {    117,    27,   100,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    729,13 ,    729,13 ,     269,6 ,    192,18 ,     359,7 ,    430,12 ,  10248,39 ,  10287,49 ,  10336,20 ,  10248,39 ,  10287,49 ,  10336,20 ,     311,8 ,     279,8 ,  977,7 ,   5,17 ,  22,23 , {73,78,82},      121,1 ,  14214,49 ,       8,5 ,       4,0 ,    4140,5 ,    4145,7 ,     2,     1,     7,     7,     7 }, // Tamil/Tamil/India
-    {    117,    27,   130,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    729,13 ,    729,13 ,     269,6 ,    192,18 ,     359,7 ,    430,12 ,  10248,39 ,  10287,49 ,  10336,20 ,  10248,39 ,  10287,49 ,  10336,20 ,     311,8 ,     279,8 ,  977,7 ,   5,17 ,  22,23 , {77,89,82},      174,2 ,  14263,61 ,       8,5 ,       4,0 ,    4140,5 ,    4152,7 ,     2,     1,     1,     6,     7 }, // Tamil/Tamil/Malaysia
-    {    117,    27,   190,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    729,13 ,    729,13 ,     269,6 ,    192,18 ,     359,7 ,    430,12 ,  10248,39 ,  10287,49 ,  10336,20 ,  10248,39 ,  10287,49 ,  10336,20 ,     311,8 ,     279,8 ,  977,7 ,   5,17 ,  22,23 , {83,71,68},        6,1 ,  14324,61 ,       8,5 ,       4,0 ,    4140,5 ,   4159,11 ,     2,     1,     7,     6,     7 }, // Tamil/Tamil/Singapore
-    {    117,    27,   198,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    729,13 ,    729,13 ,     269,6 ,    192,18 ,      37,5 ,      8,10 ,  10248,39 ,  10287,49 ,  10336,20 ,  10248,39 ,  10287,49 ,  10336,20 ,     311,8 ,     279,8 ,  977,7 ,   5,17 ,  22,23 , {76,75,82},      322,3 ,  14385,49 ,       8,5 ,       4,0 ,    4140,5 ,    4170,6 ,     2,     1,     1,     6,     7 }, // Tamil/Tamil/Sri Lanka
-    {    118,     2,   178,    44,   160,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     742,9 ,     742,9 ,    495,10 ,   1233,23 ,      55,4 ,      59,9 ,  10356,36 ,  10392,56 ,  10448,14 ,  10356,36 ,  10392,56 ,  10448,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {82,85,66},      123,1 ,  14434,21 ,       0,4 ,       4,0 ,    4176,5 ,    3524,6 ,     2,     1,     1,     6,     7 }, // Tatar/Cyrillic/Russia
-    {    119,    28,   100,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    751,11 ,    751,11 ,     339,8 ,   1256,18 ,      18,7 ,     25,12 ,  10462,32 ,  10494,60 ,  10554,18 ,  10462,32 ,  10494,60 ,  10554,18 ,       0,2 ,       0,2 ,  984,7 , 991,29 ,  22,23 , {73,78,82},      121,1 ,  14455,26 ,       4,4 ,       4,0 ,    4181,6 ,    4187,8 ,     2,     1,     7,     7,     7 }, // Telugu/Telugu/India
-    {    120,    30,   211,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,     118,5 ,     118,5 ,     762,8 ,     770,7 ,     269,6 ,   1274,19 ,      37,5 ,    442,28 ,  10572,23 ,  10595,68 ,  10663,16 ,  10572,23 ,  10595,68 ,  10663,16 ,    319,10 ,    287,10 , 1020,4 ,   5,17 ,  22,23 , {84,72,66},      325,1 ,  14481,16 ,       4,4 ,       4,0 ,    4195,3 ,    4195,3 ,     2,     1,     7,     6,     7 }, // Thai/Thai/Thailand
-    {    121,    31,    44,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,   1293,23 ,      18,7 ,     25,12 ,  10679,51 ,  10730,79 ,  10809,27 ,  10679,51 ,  10730,79 ,  10809,27 ,     329,7 ,     297,8 ,   45,4 ,   5,17 ,  22,23 , {67,78,89},      133,1 ,  14497,13 ,       8,5 ,       4,0 ,    4198,8 ,    4206,6 ,     2,     1,     7,     6,     7 }, // Tibetan/Tibetan/China
-    {    121,    31,   100,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,   1293,23 ,      18,7 ,     25,12 ,  10679,51 ,  10730,79 ,  10809,27 ,  10679,51 ,  10730,79 ,  10809,27 ,     329,7 ,     297,8 ,   45,4 ,   5,17 ,  22,23 , {73,78,82},      121,1 ,  14510,19 ,       8,5 ,       4,0 ,    4198,8 ,    4212,7 ,     2,     1,     7,     7,     7 }, // Tibetan/Tibetan/India
-    {    122,    14,    69,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,      27,8 ,   1316,23 ,      18,7 ,     25,12 ,  10836,21 ,  10857,29 ,  10886,14 ,  10836,21 ,  10857,29 ,  10900,14 ,     336,7 ,     305,7 ,   45,4 ,   5,17 ,  22,23 , {69,84,66},        0,2 ,  14529,16 ,       4,4 ,       4,0 ,    4219,4 ,      92,5 ,     2,     1,     7,     6,     7 }, // Tigrinya/Ethiopic/Ethiopia
-    {    122,    14,    67,    46,    44,    59,    37,    48,    45,    43,   101,    8216,    8217,    8220,    8221,       0,6 ,       0,6 ,       0,6 ,       0,6 ,      27,8 ,   1316,23 ,      18,7 ,     25,12 ,  10836,21 ,  10857,29 ,  10900,14 ,  10836,21 ,  10857,29 ,  10900,14 ,     336,7 ,     305,7 ,   45,4 ,   5,17 ,  22,23 , {69,82,78},       41,3 ,       0,7 ,       4,4 ,       4,0 ,    4219,4 ,    4223,4 ,     2,     1,     1,     6,     7 }, // Tigrinya/Ethiopic/Eritrea
-    {    123,     7,   214,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,     777,8 ,     777,8 ,     777,8 ,     777,8 ,     269,6 ,     97,16 ,      18,7 ,     25,12 ,  10914,29 ,  10943,60 ,  11003,14 ,  10914,29 ,  10943,60 ,  11003,14 ,    343,10 ,     312,6 , 1024,5 , 1029,59 , 1088,65 , {84,79,80},      195,2 ,  14545,41 ,      13,5 ,       4,0 ,   4227,13 ,    1635,5 ,     2,     1,     1,     6,     7 }, // Tongan/Latin/Tonga
-    {    124,     7,   195,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {90,65,82},        5,1 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     2,     1,     7,     6,     7 }, // Tsonga/Latin/South Africa
-    {    125,     7,   217,    44,    46,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     785,8 ,     785,8 ,    1339,9 ,   1348,16 ,      37,5 ,      8,10 ,  11017,28 ,  11045,54 ,  11099,14 ,  11017,28 ,  11045,54 ,  11099,14 ,     353,2 ,     318,2 ,  199,4 ,   5,17 ,  22,23 , {84,82,89},      252,1 ,  14586,40 ,       4,4 ,       4,0 ,    4240,6 ,    4246,7 ,     2,     1,     1,     6,     7 }, // Turkish/Latin/Turkey
-    {    125,     7,    56,    44,    46,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     785,8 ,     785,8 ,    1339,9 ,   1348,16 ,      18,7 ,     25,12 ,  11017,28 ,  11045,54 ,  11099,14 ,  11017,28 ,  11045,54 ,  11099,14 ,     353,2 ,     318,2 ,  199,4 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,   8436,19 ,       4,4 ,       4,0 ,    4240,6 ,    4253,6 ,     2,     1,     1,     6,     7 }, // Turkish/Latin/Cyprus
-    {    126,     7,   218,    44,   160,    59,    37,    48,    45,    43,   101,    8220,    8221,    8220,    8221,       0,6 ,       0,6 ,     793,8 ,     793,8 ,    495,10 ,   1348,16 ,      37,5 ,      8,10 ,  11113,28 ,  11141,54 ,  11195,14 ,  11209,28 ,  11237,54 ,  11195,14 ,    355,13 ,    320,14 , 1153,4 ,   5,17 ,  22,23 , {84,77,84},      326,3 ,  14626,49 ,      13,5 ,       4,0 ,   4259,12 ,   4271,12 ,     2,     1,     1,     6,     7 }, // Turkmen/Latin/Turkmenistan
-    {    128,     1,    44,    46,    44,    59,    37,    48,    45,    43,   101,     187,     171,    8250,    8249,       0,6 ,       0,6 ,    195,10 ,     205,9 ,     53,10 ,   1364,17 ,      18,7 ,     25,12 ,  11291,21 ,  11312,55 ,  11367,14 ,  11291,21 ,  11312,55 ,  11367,14 ,    368,12 ,    334,12 ,   45,4 ,   5,17 ,  22,23 , {67,78,89},      243,1 ,  14675,40 ,       4,4 ,       4,0 ,    4283,8 ,    4291,5 ,     2,     1,     7,     6,     7 }, // Uighur/Arabic/China
-    {    129,     2,   222,    44,   160,    59,    37,    48,    45,    43,  1077,     171,     187,    8222,    8220,       0,6 ,       0,6 ,     133,7 ,     133,7 ,     156,8 ,   1381,22 ,      37,5 ,      8,10 ,   1454,21 ,  11381,56 ,  11437,14 ,   1454,21 ,  11381,56 ,  11437,14 ,     380,2 ,     346,2 , 1157,5 , 680,17 ,  22,23 , {85,65,72},      292,1 ,  14715,49 ,      13,5 ,       4,0 ,   4296,10 ,    4306,7 ,     2,     1,     1,     6,     7 }, // Ukrainian/Cyrillic/Ukraine
-    {    130,     1,   163,    46,    44,    59,    37,    48,    45,    43,   101,    8221,    8220,    8217,    8216,     557,6 ,     557,6 ,    801,10 ,     811,9 ,     269,6 ,   1403,18 ,      18,7 ,     25,12 ,  11451,36 ,  11451,36 ,     85,14 ,  11451,36 ,  11451,36 ,     85,14 ,       0,2 ,       0,2 , 1162,4 , 1166,20 ,  22,23 , {80,75,82},      176,2 ,  14764,49 ,       4,4 ,       4,0 ,    4313,4 ,    3240,7 ,     2,     0,     7,     6,     7 }, // Urdu/Arabic/Pakistan
-    {    130,     1,   100,  1643,  1644,    59,    37,  1776,    45,    43,   101,    8221,    8220,    8217,    8216,     557,6 ,     557,6 ,     820,6 ,     820,6 ,     269,6 ,   1403,18 ,      18,7 ,     25,12 ,  11451,36 ,  11451,36 ,     85,14 ,  11451,36 ,  11451,36 ,     85,14 ,       0,2 ,       0,2 , 1162,4 , 1166,20 ,  22,23 , {73,78,82},      121,1 ,  14813,42 ,       8,5 ,       4,0 ,    4313,4 ,    4317,5 ,     2,     1,     7,     7,     7 }, // Urdu/Arabic/India
-    {    131,     7,   228,    44,   160,    59,    37,    48,    45,    43,   101,    8220,    8221,    8217,    8216,       0,6 ,       0,6 ,     826,8 ,     826,8 ,      27,8 ,   1421,18 ,      37,5 ,    403,11 ,  11487,32 ,  11519,61 ,  11580,14 ,  11487,32 ,  11519,61 ,  11580,14 ,     382,2 ,     348,2 ,  199,4 ,   5,17 ,  22,23 , {85,90,83},      329,4 ,  14855,58 ,      13,5 ,       4,0 ,    4322,6 ,   4328,11 ,     2,     0,     1,     6,     7 }, // Uzbek/Latin/Uzbekistan
-    {    131,     1,     1,  1643,  1644,  1563,  1642,  1776,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     394,8 ,   1439,33 ,      55,4 ,    403,11 ,  11594,21 ,   7794,49 ,     85,14 ,  11594,21 ,   7794,49 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {65,70,78},      268,1 ,  14913,13 ,      13,5 ,       4,0 ,    4339,6 ,    3231,9 ,     0,     0,     6,     4,     5 }, // Uzbek/Arabic/Afghanistan
-    {    131,     2,   228,    44,   160,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,      27,8 ,    696,19 ,      37,5 ,     87,12 ,  11615,28 ,  11643,53 ,  11696,14 ,  11615,28 ,  11643,53 ,  11696,14 ,     384,2 ,     350,2 ,   45,4 ,   5,17 ,  22,23 , {85,90,83},      333,3 ,  14926,49 ,      13,5 ,       4,0 ,    4345,7 ,   4352,10 ,     2,     0,     1,     6,     7 }, // Uzbek/Cyrillic/Uzbekistan
-    {    132,     7,   232,    44,    46,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     834,8 ,     834,8 ,    119,10 ,    192,18 ,      37,5 ,      8,10 ,  11710,33 ,  11743,55 ,  11798,21 ,  11710,33 ,  11743,55 ,  11798,21 ,     386,2 ,     352,2 ,   45,4 ,   5,17 ,  22,23 , {86,78,68},      336,1 ,  14975,33 ,      13,5 ,       4,0 ,   4362,10 ,    4372,8 ,     0,     0,     1,     6,     7 }, // Vietnamese/Latin/Vietnam
-    {    133,     7,   260,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,   1472,23 ,      37,5 ,      8,10 ,  11819,21 ,  11840,43 ,  11883,14 ,  11897,28 ,  11840,43 ,  11883,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 ,    {0,0,0},        0,0 ,    2586,0 ,       8,5 ,       4,0 ,    4380,7 ,       0,0 ,     2,     1,     1,     6,     7 }, // Volapuk/Latin/World
-    {    134,     7,   224,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    842,11 ,    853,10 ,      27,8 ,     10,17 ,      37,5 ,      8,10 ,  11925,29 ,  11954,77 ,  12031,15 ,  12046,30 ,  11954,77 ,  12031,15 ,     388,2 ,     354,2 , 1186,7 ,   5,17 ,  22,23 , {71,66,80},      119,1 ,  15008,91 ,       4,4 ,       4,0 ,    4387,7 ,   4394,16 ,     2,     1,     1,     6,     7 }, // Welsh/Latin/United Kingdom
-    {    135,     7,   187,    44,    46,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,    528,10 ,   1495,17 ,      37,5 ,      8,10 ,  12076,28 ,  12104,50 ,  12076,28 ,  12076,28 ,  12104,50 ,  12076,28 ,     390,3 ,     356,3 ,   45,4 ,   5,17 ,  22,23 , {88,79,70},      207,3 ,  15099,65 ,       8,5 ,       4,0 ,    4410,5 ,    4415,8 ,     0,     0,     1,     6,     7 }, // Wolof/Latin/Senegal
-    {    136,     7,   195,    46,   160,    59,    37,    48,    45,    43,   101,    8216,    8217,    8220,    8221,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,  12154,28 ,  12182,61 ,     85,14 ,  12154,28 ,  12182,61 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {90,65,82},        5,1 ,  15164,79 ,       4,4 ,       4,0 ,    4423,8 ,   4431,15 ,     2,     1,     7,     6,     7 }, // Xhosa/Latin/South Africa
-    {    137,    18,   260,    46,    44,    59,    37,    48,    45,    43,   101,    8221,    8221,    8217,    8217,       0,6 ,       0,6 ,     863,9 ,     863,9 ,      27,8 ,   1512,19 ,      37,5 ,      8,10 ,  12243,54 ,  12243,54 ,     85,14 ,  12243,54 ,  12243,54 ,     85,14 ,    393,11 ,    359,10 ,   45,4 ,   5,17 ,  22,23 ,    {0,0,0},        0,0 ,    2586,0 ,      41,6 ,       4,0 ,    4446,6 ,    4452,5 ,     2,     1,     1,     6,     7 }, // Yiddish/Hebrew/World
-    {    138,     7,   157,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     415,8 ,   1531,16 ,     470,3 ,      8,10 ,  12297,33 ,  12330,44 ,  12374,14 ,  12297,33 ,  12388,69 ,  12374,14 ,     404,5 ,     369,5 ,   45,4 ,   5,17 ,  22,23 , {78,71,78},      178,1 ,  15243,49 ,       4,4 ,       4,0 ,   4457,10 ,   4467,19 ,     2,     1,     1,     6,     7 }, // Yoruba/Latin/Nigeria
-    {    138,     7,    23,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     415,8 ,   1531,16 ,     470,3 ,      8,10 ,  12457,33 ,  12490,44 ,  12534,14 ,  12457,33 ,  12548,69 ,  12534,14 ,     409,5 ,     374,5 ,   45,4 ,   5,17 ,  22,23 , {88,79,70},      207,3 ,  15292,34 ,       4,4 ,       4,0 ,   4457,10 ,   4486,16 ,     0,     0,     1,     6,     7 }, // Yoruba/Latin/Benin
-    {    140,     7,   195,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     872,9 ,     881,8 ,     547,6 ,     35,18 ,      37,5 ,      8,10 ,  12617,28 ,  12645,74 ,  12719,14 ,  12617,28 ,  12645,74 ,  12719,14 ,       0,2 ,       0,2 ,    0,5 ,   5,17 ,  22,23 , {90,65,82},        5,1 ,  15326,67 ,       4,4 ,       4,0 ,    4502,7 ,   4509,17 ,     2,     1,     7,     6,     7 }, // Zulu/Latin/South Africa
-    {    141,     7,   161,    44,   160,    59,    37,    48,  8722,    43,   101,     171,     187,    8216,    8217,       0,6 ,       0,6 ,     187,8 ,     187,8 ,    495,10 ,    478,17 ,      37,5 ,    414,16 ,  12733,28 ,  12761,51 ,   2320,14 ,  12812,28 ,  12761,51 ,   2320,14 ,     414,9 ,    379,11 ,   45,4 ,   5,17 ,  22,23 , {78,79,75},      190,2 ,  10046,44 ,      13,5 ,       4,0 ,    4526,7 ,    4533,5 ,     2,     0,     1,     6,     7 }, // Norwegian Nynorsk/Latin/Norway
-    {    142,     7,    27,    44,    46,    59,    37,    48,    45,    43,   101,    8222,    8221,    8216,    8217,       0,6 ,       0,6 ,     158,7 ,     158,7 ,   1547,11 ,    450,19 ,      37,5 ,      8,10 ,   2043,28 ,   2071,58 ,   2129,14 ,   2043,28 ,   2071,58 ,   2143,14 ,    423,10 ,     390,7 ,  319,7 ,   5,17 ,  22,23 , {66,65,77},      144,2 , 15393,170 ,      13,5 ,       4,0 ,    4538,8 ,    629,19 ,     2,     1,     1,     6,     7 }, // Bosnian/Latin/Bosnia And Herzegowina
-    {    142,     2,    27,    44,    46,    59,    37,    48,    45,    43,   101,    8222,    8220,    8218,    8216,       0,6 ,       0,6 ,     111,7 ,     111,7 ,    1091,7 ,   1098,20 ,      37,5 ,      8,10 ,  12840,28 ,  12868,56 ,   8907,14 ,  12840,28 ,  12868,56 ,   8907,14 ,    245,11 ,    397,13 ,   45,4 ,   5,17 ,  22,23 , {66,65,77},      296,2 , 15563,152 ,      13,5 ,       4,0 ,    4546,8 ,   3600,19 ,     2,     1,     1,     6,     7 }, // Bosnian/Cyrillic/Bosnia And Herzegowina
-    {    143,    29,   131,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {77,86,82},        0,0 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     2,     1,     5,     6,     7 }, // Divehi/Thaana/Maldives
-    {    144,     7,   251,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,      27,8 ,     80,17 ,      37,5 ,      8,10 ,  12924,30 ,  12954,57 ,     85,14 ,  12924,30 ,  12954,57 ,     85,14 ,      64,4 ,      61,4 ,   45,4 ,   5,17 ,  22,23 , {71,66,80},      119,1 ,       0,7 ,       4,4 ,       4,0 ,    4554,5 ,   4559,12 ,     2,     1,     1,     6,     7 }, // Manx/Latin/Isle Of Man
-    {    145,     7,   224,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,    119,10 ,     97,16 ,      37,5 ,      8,10 ,  13011,28 ,  13039,61 ,     85,14 ,  13011,28 ,  13039,61 ,     85,14 ,      64,4 ,      61,4 ,   45,4 ,   5,17 ,  22,23 , {71,66,80},      119,1 ,       0,7 ,       4,4 ,       4,0 ,    4571,8 ,   4579,14 ,     2,     1,     1,     6,     7 }, // Cornish/Latin/United Kingdom
-    {    146,     7,    83,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,    1558,8 ,   1566,18 ,      18,7 ,     25,12 ,  13100,28 ,  13128,49 ,  13177,14 ,  13100,28 ,  13128,49 ,  13177,14 ,     433,2 ,     410,2 ,   45,4 ,   5,17 ,  22,23 , {71,72,83},      167,3 ,  15715,17 ,       4,4 ,       4,0 ,    4593,4 ,    4597,5 ,     2,     1,     1,     6,     7 }, // Akan/Latin/Ghana
-    {    147,    13,   100,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,    1584,6 ,     97,16 ,      18,7 ,     25,12 ,  13191,49 ,  13191,49 ,  13240,20 ,  13191,49 ,  13191,49 ,  13240,20 ,       0,2 ,       0,2 , 1193,4 ,   5,17 ,  22,23 , {73,78,82},      121,1 ,  15732,31 ,       4,4 ,       4,0 ,    4602,6 ,    2662,4 ,     2,     1,     7,     7,     7 }, // Konkani/Devanagari/India
-    {    148,     7,    83,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {71,72,83},        0,0 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     2,     1,     1,     6,     7 }, // Ga/Latin/Ghana
-    {    149,     7,   157,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     889,9 ,     712,8 ,     269,6 ,     10,17 ,      37,5 ,      8,10 ,  13260,29 ,  13289,54 ,     85,14 ,  13260,29 ,  13289,54 ,     85,14 ,     435,7 ,     412,7 ,   45,4 ,   5,17 ,  22,23 , {78,71,78},      178,1 ,  15763,12 ,       4,4 ,       4,0 ,   4608,10 ,    4618,8 ,     2,     1,     1,     6,     7 }, // Igbo/Latin/Nigeria
-    {    150,     7,   111,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,  13343,28 ,  13371,74 ,  13445,14 ,  13343,28 ,  13371,74 ,  13445,14 ,     442,9 ,     419,7 ,   45,4 ,   5,17 ,  22,23 , {75,69,83},        2,3 ,  15775,23 ,       4,4 ,       4,0 ,    4626,7 ,    1191,5 ,     2,     1,     7,     6,     7 }, // Kamba/Latin/Kenya
-    {    151,    33,   103,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {73,81,68},        0,0 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     0,     0,     6,     5,     6 }, // Syriac/Syriac/Iraq
-    {    152,    14,    67,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {69,82,78},        0,0 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     2,     1,     1,     6,     7 }, // Blin/Ethiopic/Eritrea
-    {    153,    14,    69,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {69,84,66},        0,0 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     2,     1,     7,     6,     7 }, // Geez/Ethiopic/Ethiopia
-    {    155,     7,    69,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {69,84,66},        0,0 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     2,     1,     7,     6,     7 }, // Sidamo/Latin/Ethiopia
-    {    156,     7,   157,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {78,71,78},      178,1 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     2,     1,     1,     6,     7 }, // Atsam/Latin/Nigeria
-    {    157,    14,    67,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {69,82,78},        0,0 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     2,     1,     1,     6,     7 }, // Tigre/Ethiopic/Eritrea
-    {    158,     7,   157,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {78,71,78},      178,1 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     2,     1,     1,     6,     7 }, // Jju/Latin/Nigeria
-    {    159,     7,   106,    44,    46,    59,    37,    48,    45,    43,   101,    8216,    8217,    8220,    8221,       0,6 ,       0,6 ,     249,7 ,     249,7 ,      27,8 ,   1590,27 ,      37,5 ,      8,10 ,  13459,28 ,  13487,50 ,   3107,14 ,  13459,28 ,  13487,50 ,   3107,14 ,     451,2 ,     426,2 ,   45,4 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,   3102,20 ,       8,5 ,       4,0 ,    4633,6 ,    4639,6 ,     2,     1,     1,     6,     7 }, // Friulian/Latin/Italy
-    {    160,     7,   195,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {90,65,82},        5,1 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     2,     1,     7,     6,     7 }, // Venda/Latin/South Africa
-    {    161,     7,    83,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    898,11 ,    909,10 ,     547,6 ,   1617,23 ,    473,12 ,    485,17 ,  13537,28 ,  13565,44 ,  13609,14 ,  13537,28 ,  13565,44 ,  13609,14 ,     453,3 ,     428,5 ,   45,4 ,   5,17 ,  22,23 , {71,72,83},      167,3 ,  15798,37 ,       4,4 ,       4,0 ,    4645,6 ,   4651,12 ,     2,     1,     1,     6,     7 }, // Ewe/Latin/Ghana
-    {    161,     7,   212,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,    898,11 ,    909,10 ,     547,6 ,   1617,23 ,      37,5 ,      8,10 ,  13537,28 ,  13565,44 ,  13609,14 ,  13537,28 ,  13565,44 ,  13609,14 ,     453,3 ,     428,5 ,   45,4 ,   5,17 ,  22,23 , {88,79,70},      207,3 , 15835,106 ,       4,4 ,       4,0 ,    4645,6 ,   4663,11 ,     0,     0,     1,     6,     7 }, // Ewe/Latin/Togo
-    {    162,    14,    69,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {69,84,66},        0,0 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     2,     1,     7,     6,     7 }, // Walamo/Ethiopic/Ethiopia
-    {    163,     7,   225,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     269,6 ,     10,17 ,      18,7 ,     25,12 ,  13623,21 ,  13644,57 ,     85,14 ,  13623,21 ,  13644,57 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {85,83,68},        6,1 ,       0,7 ,       4,4 ,       4,0 ,   4674,14 ,   4688,19 ,     2,     1,     7,     6,     7 }, // Hawaiian/Latin/United States
-    {    164,     7,   157,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {78,71,78},      178,1 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     2,     1,     1,     6,     7 }, // Tyap/Latin/Nigeria
-    {    165,     7,   129,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {77,87,75},        0,0 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     2,     1,     1,     6,     7 }, // Nyanja/Latin/Malawi
-    {    166,     7,   170,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     919,9 ,     928,8 ,     547,6 ,     35,18 ,      18,7 ,     25,12 ,  13701,28 ,  13729,55 ,  13701,28 ,  13701,28 ,  13729,55 ,  13701,28 ,       0,2 ,       0,2 ,    0,5 ,   5,17 ,  22,23 , {80,72,80},      179,1 ,  15941,58 ,       4,4 ,       4,0 ,    4707,8 ,    4715,9 ,     2,     1,     7,     6,     7 }, // Filipino/Latin/Philippines
-    {    167,     7,   206,    46,  8217,    59,    37,    48,  8722,    43,   101,     171,     187,    8249,    8250,       0,6 ,       0,6 ,     264,9 ,     264,9 ,     156,8 ,    622,18 ,      37,5 ,      8,10 ,  13784,28 ,  13812,63 ,   3695,14 ,  13784,28 ,  13812,63 ,   3695,14 ,    456,12 ,    433,11 ,   45,4 ,   5,17 ,  22,23 , {67,72,70},      224,3 ,  15999,55 ,      13,5 ,       4,0 ,   4724,16 ,    4740,7 ,     2,     0,     1,     6,     7 }, // Swiss German/Latin/Switzerland
-    {    167,     7,    74,    46,  8217,    59,    37,    48,  8722,    43,   101,     171,     187,    8249,    8250,       0,6 ,       0,6 ,     264,9 ,     264,9 ,     156,8 ,    622,18 ,      37,5 ,      8,10 ,  13784,28 ,  13812,63 ,   3695,14 ,  13784,28 ,  13812,63 ,   3695,14 ,    456,12 ,    433,11 ,   45,4 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,   8436,19 ,      13,5 ,       4,0 ,   4724,16 ,   4747,10 ,     2,     1,     1,     6,     7 }, // Swiss German/Latin/France
-    {    167,     7,   123,    46,  8217,    59,    37,    48,  8722,    43,   101,     171,     187,    8249,    8250,       0,6 ,       0,6 ,     264,9 ,     264,9 ,     156,8 ,    622,18 ,      37,5 ,      8,10 ,  13784,28 ,  13812,63 ,   3695,14 ,  13784,28 ,  13812,63 ,   3695,14 ,    456,12 ,    433,11 ,   45,4 ,   5,17 ,  22,23 , {67,72,70},      224,3 ,  15999,55 ,      13,5 ,       4,0 ,   4724,16 ,   4757,13 ,     2,     0,     1,     6,     7 }, // Swiss German/Latin/Liechtenstein
-    {    168,    34,    44,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      18,7 ,     25,12 ,  13875,21 ,  13896,28 ,  13924,14 ,  13875,21 ,  13896,28 ,  13924,14 ,     468,2 ,     444,2 ,   45,4 ,   5,17 ,  22,23 , {67,78,89},      133,1 ,       0,7 ,       8,5 ,       4,0 ,    4770,3 ,    4773,2 ,     2,     1,     7,     6,     7 }, // Sichuan Yi/Yi/China
-    {    169,     7,   121,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {76,82,68},        6,1 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     2,     1,     1,     6,     7 }, // Kpelle/Latin/Liberia
-    {    170,     7,    82,    44,    46,    59,    37,    48,    45,    43,   101,    8222,    8220,    8218,    8216,       0,6 ,       0,6 ,     456,8 ,     456,8 ,     365,7 ,   1640,23 ,    502,10 ,    512,19 ,  13938,28 ,  13966,65 ,   3695,14 ,  13938,28 ,  13966,65 ,   3695,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,  16054,15 ,      13,5 ,       4,0 ,   4775,14 ,   4789,11 ,     2,     1,     1,     6,     7 }, // Low German/Latin/Germany
-    {    170,     7,   151,    44,    46,    59,    37,    48,    45,    43,   101,    8222,    8220,    8218,    8216,       0,6 ,       0,6 ,     456,8 ,     456,8 ,     365,7 ,   1640,23 ,    502,10 ,    512,19 ,  13938,28 ,  13966,65 ,   3695,14 ,  13938,28 ,  13966,65 ,   3695,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,  16054,15 ,      13,5 ,       4,0 ,   4775,14 ,   4800,12 ,     2,     1,     1,     6,     7 }, // Low German/Latin/Netherlands
-    {    171,     7,   195,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {90,65,82},        5,1 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     2,     1,     7,     6,     7 }, // South Ndebele/Latin/South Africa
-    {    172,     7,   195,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {90,65,82},        5,1 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     2,     1,     7,     6,     7 }, // Northern Sotho/Latin/South Africa
-    {    173,     7,   161,    44,   160,    59,    37,    48,  8722,    43,   101,    8221,    8221,    8217,    8217,       0,6 ,       0,6 ,     223,8 ,     223,8 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,  14031,33 ,  14064,75 ,  14139,14 ,  14031,33 ,  14064,75 ,  14139,14 ,    470,11 ,    446,13 ,   45,4 ,   5,17 ,  22,23 , {78,79,75},      190,2 ,  16069,63 ,      13,5 ,       4,0 ,   4812,15 ,    4827,5 ,     2,     0,     1,     6,     7 }, // Northern Sami/Latin/Norway
-    {    173,     7,    73,    44,   160,    59,    37,    48,  8722,    43,   101,    8221,    8221,    8217,    8217,       0,6 ,       0,6 ,     223,8 ,     223,8 ,    495,10 ,     97,16 ,      37,5 ,      8,10 ,  14153,21 ,  14174,70 ,  14244,14 ,  14153,21 ,  14174,70 ,  14244,14 ,     481,2 ,     459,2 ,   45,4 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,  16132,23 ,      13,5 ,       4,0 ,   4812,15 ,    4832,6 ,     2,     1,     1,     6,     7 }, // Northern Sami/Latin/Finland
-    {    173,     7,   205,    44,   160,    59,    37,    48,  8722,    43,   101,    8221,    8221,    8217,    8217,       0,6 ,       0,6 ,     223,8 ,     223,8 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,  14031,33 ,  14064,75 ,  14139,14 ,  14031,33 ,  14064,75 ,  14139,14 ,    470,11 ,    446,13 ,   45,4 ,   5,17 ,  22,23 , {83,69,75},      190,2 ,  16155,63 ,      13,5 ,       4,0 ,   4812,15 ,    4838,6 ,     2,     0,     1,     6,     7 }, // Northern Sami/Latin/Sweden
-    {    174,     7,   208,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {84,87,68},      337,3 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     2,     0,     7,     6,     7 }, // Taroko/Latin/Taiwan
-    {    175,     7,   111,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,  14258,28 ,  14286,62 ,  14348,14 ,  14258,28 ,  14286,62 ,  14348,14 ,     483,6 ,     461,3 ,   45,4 ,   5,17 ,  22,23 , {75,69,83},        2,3 ,  16218,24 ,       4,4 ,       4,0 ,    4844,8 ,    1191,5 ,     2,     1,     7,     6,     7 }, // Gusii/Latin/Kenya
-    {    176,     7,   111,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,  14362,28 , 14390,105 ,  14495,14 ,  14362,28 , 14390,105 ,  14495,14 ,    489,10 ,    464,10 ,   45,4 ,   5,17 ,  22,23 , {75,69,83},        2,3 ,  16218,24 ,       4,4 ,       4,0 ,    4852,7 ,    1191,5 ,     2,     1,     7,     6,     7 }, // Taita/Latin/Kenya
-    {    177,     7,   187,    44,   160,    59,    37,    48,    45,    43,   101,    8222,    8221,    8218,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     415,8 ,     97,16 ,      37,5 ,      8,10 ,  14509,28 ,  14537,59 ,  14596,14 ,  14509,28 ,  14537,59 ,  14596,14 ,     499,6 ,     474,7 ,   45,4 ,   5,17 ,  22,23 , {88,79,70},      207,3 ,  16242,26 ,      13,5 ,       4,0 ,    4859,6 ,    4415,8 ,     0,     0,     1,     6,     7 }, // Fulah/Latin/Senegal
-    {    177,     7,    34,    44,   160,    59,    37,    48,    45,    43,   101,    8222,    8221,    8218,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     415,8 ,     97,16 ,      37,5 ,      8,10 ,  14509,28 ,  14537,59 ,  14596,14 ,  14509,28 ,  14537,59 ,  14596,14 ,     499,6 ,     474,7 ,   45,4 ,   5,17 ,  22,23 , {88,79,70},      207,3 ,  16242,26 ,      13,5 ,       4,0 ,    4859,6 ,   4865,14 ,     0,     0,     1,     6,     7 }, // Fulah/Latin/Burkina Faso
-    {    177,     7,    37,    44,   160,    59,    37,    48,    45,    43,   101,    8222,    8221,    8218,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     415,8 ,     97,16 ,      37,5 ,      8,10 ,  14509,28 ,  14537,59 ,  14596,14 ,  14509,28 ,  14537,59 ,  14596,14 ,     499,6 ,     474,7 ,   45,4 ,   5,17 ,  22,23 , {88,65,70},       32,4 ,  16268,25 ,      13,5 ,       4,0 ,    4859,6 ,    4879,8 ,     0,     0,     1,     6,     7 }, // Fulah/Latin/Cameroon
-    {    177,     7,    80,    44,   160,    59,    37,    48,    45,    43,   101,    8222,    8221,    8218,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     415,8 ,     97,16 ,      18,7 ,     25,12 ,  14509,28 ,  14537,59 ,  14596,14 ,  14509,28 ,  14537,59 ,  14596,14 ,     499,6 ,     474,7 ,   45,4 ,   5,17 ,  22,23 , {71,77,68},      166,1 ,  16293,20 ,      13,5 ,       4,0 ,    4859,6 ,    4887,6 ,     2,     1,     1,     6,     7 }, // Fulah/Latin/Gambia
-    {    177,     7,    83,    44,   160,    59,    37,    48,    45,    43,   101,    8222,    8221,    8218,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     415,8 ,     97,16 ,      18,7 ,     25,12 ,  14509,28 ,  14537,59 ,  14596,14 ,  14509,28 ,  14537,59 ,  14596,14 ,     499,6 ,     474,7 ,   45,4 ,   5,17 ,  22,23 , {71,72,83},      167,3 ,       0,7 ,      13,5 ,       4,0 ,    4859,6 ,    4893,5 ,     2,     1,     1,     6,     7 }, // Fulah/Latin/Ghana
-    {    177,     7,    91,    44,   160,    59,    37,    48,    45,    43,   101,    8222,    8221,    8218,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     415,8 ,     97,16 ,      37,5 ,      8,10 ,  14509,28 ,  14537,59 ,  14596,14 ,  14509,28 ,  14537,59 ,  14596,14 ,     499,6 ,     474,7 ,   45,4 ,   5,17 ,  22,23 , {71,78,70},      216,2 ,       0,7 ,      13,5 ,       4,0 ,    4859,6 ,    4898,4 ,     0,     0,     1,     6,     7 }, // Fulah/Latin/Guinea
-    {    177,     7,    92,    44,   160,    59,    37,    48,    45,    43,   101,    8222,    8221,    8218,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     415,8 ,     97,16 ,      37,5 ,      8,10 ,  14509,28 ,  14537,59 ,  14596,14 ,  14509,28 ,  14537,59 ,  14596,14 ,     499,6 ,     474,7 ,   45,4 ,   5,17 ,  22,23 , {88,79,70},      207,3 ,  16242,26 ,      13,5 ,       4,0 ,    4859,6 ,   4902,12 ,     0,     0,     1,     6,     7 }, // Fulah/Latin/Guinea Bissau
-    {    177,     7,   121,    44,   160,    59,    37,    48,    45,    43,   101,    8222,    8221,    8218,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     415,8 ,     97,16 ,      18,7 ,     25,12 ,  14509,28 ,  14537,59 ,  14596,14 ,  14509,28 ,  14537,59 ,  14596,14 ,     499,6 ,     474,7 ,   45,4 ,   5,17 ,  22,23 , {76,82,68},        6,1 ,  16313,23 ,      13,5 ,       4,0 ,    4859,6 ,    4914,9 ,     2,     1,     1,     6,     7 }, // Fulah/Latin/Liberia
-    {    177,     7,   136,    44,   160,    59,    37,    48,    45,    43,   101,    8222,    8221,    8218,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     415,8 ,     97,16 ,      18,7 ,     25,12 ,  14509,28 ,  14537,59 ,  14596,14 ,  14509,28 ,  14537,59 ,  14596,14 ,     499,6 ,     474,7 ,   45,4 ,   5,17 ,  22,23 , {77,82,85},      219,2 ,  16336,22 ,      13,5 ,       4,0 ,    4859,6 ,    4923,8 ,     2,     1,     1,     6,     7 }, // Fulah/Latin/Mauritania
-    {    177,     7,   156,    44,   160,    59,    37,    48,    45,    43,   101,    8222,    8221,    8218,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     415,8 ,     97,16 ,      37,5 ,      8,10 ,  14509,28 ,  14537,59 ,  14596,14 ,  14509,28 ,  14537,59 ,  14596,14 ,     499,6 ,     474,7 ,   45,4 ,   5,17 ,  22,23 , {88,79,70},      207,3 ,  16242,26 ,      13,5 ,       4,0 ,    4859,6 ,    4931,6 ,     0,     0,     1,     6,     7 }, // Fulah/Latin/Niger
-    {    177,     7,   157,    44,   160,    59,    37,    48,    45,    43,   101,    8222,    8221,    8218,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     415,8 ,     97,16 ,      37,5 ,      8,10 ,  14509,28 ,  14537,59 ,  14596,14 ,  14509,28 ,  14537,59 ,  14596,14 ,     499,6 ,     474,7 ,   45,4 ,   5,17 ,  22,23 , {78,71,78},      178,1 ,  16358,23 ,      13,5 ,       4,0 ,    4859,6 ,    4937,9 ,     2,     1,     1,     6,     7 }, // Fulah/Latin/Nigeria
-    {    177,     7,   189,    44,   160,    59,    37,    48,    45,    43,   101,    8222,    8221,    8218,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     415,8 ,     97,16 ,      18,7 ,     25,12 ,  14509,28 ,  14537,59 ,  14596,14 ,  14509,28 ,  14537,59 ,  14596,14 ,     499,6 ,     474,7 ,   45,4 ,   5,17 ,  22,23 , {83,76,76},      187,2 ,  16381,25 ,      13,5 ,       4,0 ,    4859,6 ,   4946,11 ,     0,     0,     1,     6,     7 }, // Fulah/Latin/Sierra Leone
-    {    177,   134,    91,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {71,78,70},      216,2 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     0,     0,     1,     6,     7 }, // Fulah/Adlam/Guinea
-    {    178,     7,   111,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,  14610,28 ,  14638,63 ,  14701,14 ,  14610,28 ,  14638,63 ,  14701,14 ,     505,6 ,     481,8 ,   45,4 ,   5,17 ,  22,23 , {75,69,83},        2,3 ,  16406,23 ,       4,4 ,       4,0 ,    4957,6 ,    1191,5 ,     2,     1,     7,     6,     7 }, // Kikuyu/Latin/Kenya
-    {    179,     7,   111,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,  14715,28 , 14743,105 ,  14848,14 ,  14715,28 , 14743,105 ,  14848,14 ,     511,7 ,     489,5 ,   45,4 ,   5,17 ,  22,23 , {75,69,83},        2,3 ,  16429,25 ,       4,4 ,       4,0 ,    4963,8 ,    1191,5 ,     2,     1,     7,     6,     7 }, // Samburu/Latin/Kenya
-    {    180,     7,   146,    44,    46,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     415,8 ,    669,27 ,      37,5 ,      8,10 ,  14862,28 ,  14890,55 ,  14945,14 ,  14862,28 ,  14890,55 ,  14945,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {77,90,78},      278,3 ,  16454,28 ,       0,4 ,       4,0 ,    4971,4 ,   3371,10 ,     2,     1,     7,     6,     7 }, // Sena/Latin/Mozambique
-    {    181,     7,   240,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,  14959,28 ,  14987,50 ,  15037,14 ,  14959,28 ,  14987,50 ,  15037,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {85,83,68},      159,3 ,  16482,24 ,       4,4 ,       4,0 ,   4975,10 ,    1815,8 ,     2,     1,     7,     6,     7 }, // North Ndebele/Latin/Zimbabwe
-    {    182,     7,   210,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,  15051,29 ,  15080,65 ,  15145,14 ,  15051,29 ,  15080,65 ,  15145,14 ,     518,8 ,     494,7 ,   45,4 ,   5,17 ,  22,23 , {84,90,83},      192,3 ,  16506,25 ,       4,4 ,       4,0 ,    4985,9 ,    1620,8 ,     2,     0,     1,     6,     7 }, // Rombo/Latin/Tanzania
-    {    183,     9,   145,    44,   160,    59,    37,    48,    45,    43,   101,     171,     187,    8222,    8221,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     415,8 ,     97,16 ,      37,5 ,      8,10 ,  15159,30 ,  15189,47 ,     85,14 ,  15159,30 ,  15189,47 ,     85,14 ,     526,6 ,     501,8 ,   45,4 ,   5,17 ,  22,23 , {77,65,68},        0,0 ,  16531,21 ,       0,4 ,       4,0 ,    4994,7 ,    5001,6 ,     2,     1,     1,     6,     7 }, // Tachelhit/Tifinagh/Morocco
-    {    183,     7,   145,    44,   160,    59,    37,    48,    45,    43,   101,     171,     187,    8222,    8221,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     415,8 ,     97,16 ,      37,5 ,      8,10 ,  15236,30 ,  15266,48 ,     85,14 ,  15236,30 ,  15266,48 ,     85,14 ,     532,6 ,     509,8 ,   45,4 ,   5,17 ,  22,23 , {77,65,68},        0,0 ,  16552,21 ,       0,4 ,       4,0 ,   5007,10 ,    5017,6 ,     2,     1,     1,     6,     7 }, // Tachelhit/Latin/Morocco
-    {    184,     7,     3,    44,   160,    59,    37,    48,    45,    43,   122,     171,     187,    8220,    8221,       0,6 ,       0,6 ,    936,12 ,    948,11 ,     415,8 ,     97,16 ,      18,7 ,     25,12 ,  15314,28 ,  15342,34 ,  15376,14 ,  15390,30 ,  15420,51 ,  15471,14 ,     538,7 ,     517,9 , 1197,7 , 1204,21 ,  22,23 , {68,90,68},      205,2 ,  16573,53 ,       0,4 ,       4,0 ,    5023,9 ,    5032,8 ,     2,     1,     6,     5,     6 }, // Kabyle/Latin/Algeria
-    {    185,     7,   221,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,  15485,28 ,  15513,74 ,  15587,14 ,  15485,28 ,  15513,74 ,  15587,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {85,71,88},      197,3 ,  16626,26 ,       4,4 ,       4,0 ,   5040,10 ,    1685,6 ,     0,     0,     1,     7,     7 }, // Nyankole/Latin/Uganda
-    {    186,     7,   210,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,  15601,28 ,  15629,82 ,  15711,14 ,  15601,28 ,  15629,82 ,  15711,14 ,     545,7 ,     526,7 ,   45,4 ,   5,17 ,  22,23 , {84,90,83},      192,3 ,  16652,29 ,       0,4 ,       4,0 ,    5050,6 ,   5056,10 ,     2,     0,     1,     6,     7 }, // Bena/Latin/Tanzania
-    {    187,     7,   210,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,  15725,28 ,  15753,62 ,  15815,14 ,  15725,28 ,  15753,62 ,  15815,14 ,     552,5 ,     533,9 ,   45,4 ,   5,17 ,  22,23 , {84,90,83},      192,3 ,  16681,27 ,       4,4 ,       4,0 ,    5066,8 ,    1620,8 ,     2,     0,     1,     6,     7 }, // Vunjo/Latin/Tanzania
-    {    188,     7,   132,    46,    44,    59,    37,    48,    45,    43,   101,     171,     187,    8220,    8221,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     415,8 ,     97,16 ,      37,5 ,      8,10 ,  15829,28 ,  15857,44 ,  15901,14 ,  15829,28 ,  15857,44 ,  15901,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {88,79,70},      207,3 ,  16708,24 ,       4,4 ,       4,0 ,    5074,9 ,    2184,4 ,     0,     0,     1,     6,     7 }, // Bambara/Latin/Mali
-    {    188,    75,   132,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {88,79,70},      207,3 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     0,     0,     1,     6,     7 }, // Bambara/Nko/Mali
-    {    189,     7,   111,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,  15915,28 ,  15943,64 ,  16007,14 ,  15915,28 ,  15943,64 ,  16007,14 ,     557,2 ,     542,2 ,   45,4 ,   5,17 ,  22,23 , {75,69,83},        2,3 ,  16218,24 ,       4,4 ,       4,0 ,    5083,6 ,    1191,5 ,     2,     1,     7,     6,     7 }, // Embu/Latin/Kenya
-    {    190,    12,   225,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     959,9 ,     968,8 ,     547,6 ,     35,18 ,      18,7 ,     25,12 ,  16021,28 ,  16049,49 ,  16098,14 ,  16021,28 ,  16049,49 ,  16098,14 ,     559,3 ,     544,6 , 1225,6 ,   5,17 ,  22,23 , {85,83,68},        6,1 ,  16732,25 ,       4,4 ,       4,0 ,    5089,3 ,   5092,15 ,     2,     1,     7,     6,     7 }, // Cherokee/Cherokee/United States
-    {    191,     7,   137,    46,   160,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     415,8 ,     97,16 ,      37,5 ,      8,10 ,  16112,27 ,  16139,48 ,  16187,14 ,  16112,27 ,  16139,48 ,  16187,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {77,85,82},      176,2 ,  16757,21 ,      41,6 ,       4,0 ,   5107,14 ,    5121,5 ,     2,     0,     1,     6,     7 }, // Morisyen/Latin/Mauritius
-    {    192,     7,   210,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,  16201,28 , 16229,133 ,  15145,14 ,  16201,28 , 16229,133 ,  15145,14 ,     562,4 ,     550,5 ,   45,4 ,   5,17 ,  22,23 , {84,90,83},      192,3 ,  16681,27 ,       4,4 ,       4,0 ,   5126,10 ,    1620,8 ,     2,     0,     1,     6,     7 }, // Makonde/Latin/Tanzania
-    {    193,     7,   210,    46,    44,    59,    37,    48,    45,    43,   101,    8221,    8221,    8217,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,  16362,36 ,  16398,63 ,  16461,14 ,  16362,36 ,  16398,63 ,  16461,14 ,     566,3 ,     555,3 ,   45,4 ,   5,17 ,  22,23 , {84,90,83},      192,3 ,  16778,29 ,      41,6 ,       4,0 ,    5136,8 ,    5144,9 ,     2,     0,     1,     6,     7 }, // Langi/Latin/Tanzania
-    {    194,     7,   221,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,  16475,28 ,  16503,66 ,  16569,14 ,  16475,28 ,  16503,66 ,  16569,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {85,71,88},      197,3 ,  16807,26 ,       0,4 ,       4,0 ,    5153,7 ,    5160,7 ,     0,     0,     1,     7,     7 }, // Ganda/Latin/Uganda
-    {    195,     7,   239,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,    119,10 ,     10,17 ,      18,7 ,     25,12 ,  16583,80 ,  16583,80 ,     85,14 ,  16583,80 ,  16583,80 ,     85,14 ,     569,8 ,     558,7 ,   45,4 ,   5,17 ,  22,23 , {90,77,87},      131,1 ,       0,7 ,       4,4 ,       4,0 ,    5167,9 ,    1809,6 ,     2,     1,     1,     6,     7 }, // Bemba/Latin/Zambia
-    {    196,     7,    39,    44,   160,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     158,7 ,     158,7 ,    119,10 ,   1663,27 ,      37,5 ,      8,10 ,  16663,28 ,  16691,73 ,  16764,14 ,  16663,28 ,  16778,73 ,  16764,14 ,      68,2 ,      65,2 ,   45,4 ,   5,17 ,  22,23 , {67,86,69},      277,1 ,  16833,43 ,      13,5 ,       4,0 ,   5176,12 ,   5188,10 ,     2,     1,     1,     6,     7 }, // Kabuverdianu/Latin/Cape Verde
-    {    197,     7,   111,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,  16851,28 ,  16879,51 ,  16930,14 ,  16851,28 ,  16879,51 ,  16930,14 ,     577,2 ,     565,2 ,   45,4 ,   5,17 ,  22,23 , {75,69,83},        2,3 ,  16218,24 ,       4,4 ,       4,0 ,    5198,6 ,    1191,5 ,     2,     1,     7,     6,     7 }, // Meru/Latin/Kenya
-    {    198,     7,   111,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,  16944,28 ,  16972,53 ,  17025,14 ,  16944,28 ,  16972,53 ,  17025,14 ,     579,6 ,    567,10 ,   45,4 ,   5,17 ,  22,23 , {75,69,83},        2,3 ,  16876,26 ,       4,4 ,       4,0 ,    5204,8 ,   5212,12 ,     2,     1,     7,     6,     7 }, // Kalenjin/Latin/Kenya
-    {    199,     7,   148,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,    119,10 ,     10,17 ,      18,7 ,     25,12 ,  17039,23 ,  17062,92 ,  17154,14 ,  17039,23 ,  17062,92 ,  17154,14 ,     585,7 ,     577,5 ,   45,4 ,   5,17 ,  22,23 , {78,65,68},        6,1 ,  16902,22 ,       4,4 ,       4,0 ,   5224,13 ,    5237,8 ,     2,     1,     1,     6,     7 }, // Nama/Latin/Namibia
-    {    200,     7,   210,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,  15725,28 ,  15753,62 ,  15815,14 ,  15725,28 ,  15753,62 ,  15815,14 ,     552,5 ,     533,9 ,   45,4 ,   5,17 ,  22,23 , {84,90,83},      192,3 ,  16681,27 ,       4,4 ,       4,0 ,    5245,9 ,    1620,8 ,     2,     0,     1,     6,     7 }, // Machame/Latin/Tanzania
-    {    201,     7,    82,    44,   160,    59,    37,    48,  8722,    43,   101,    8222,    8220,    8218,    8216,       0,6 ,       0,6 ,     456,8 ,     456,8 ,   1141,10 ,   1690,23 ,      37,5 ,      8,10 ,  17168,28 ,  17196,72 ,   3695,14 ,  17168,28 ,  17196,72 ,   3695,14 ,    592,16 ,    582,16 ,   45,4 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,  16924,11 ,      13,5 ,       4,0 ,    5254,6 ,   5260,11 ,     2,     1,     1,     6,     7 }, // Colognian/Latin/Germany
-    {    202,     7,   111,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,  15725,28 ,  17268,58 ,  15145,14 ,  15725,28 ,  17268,58 ,  15145,14 ,     608,9 ,     598,6 ,   45,4 ,   5,17 ,  22,23 , {75,69,83},        2,3 ,  16935,25 ,       4,4 ,       4,0 ,    5271,3 ,    1191,5 ,     2,     1,     7,     6,     7 }, // Masai/Latin/Kenya
-    {    202,     7,   210,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,  15725,28 ,  17268,58 ,  15145,14 ,  15725,28 ,  17268,58 ,  15145,14 ,     608,9 ,     598,6 ,   45,4 ,   5,17 ,  22,23 , {84,90,83},      192,3 ,  16960,28 ,       4,4 ,       4,0 ,    5271,3 ,    5274,8 ,     2,     0,     1,     6,     7 }, // Masai/Latin/Tanzania
-    {    203,     7,   221,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,  17326,35 ,  17361,65 ,  17426,14 ,  17326,35 ,  17361,65 ,  17426,14 ,     617,6 ,     604,6 ,   45,4 ,   5,17 ,  22,23 , {85,71,88},      197,3 ,  16807,26 ,      13,5 ,       4,0 ,    5282,7 ,    5160,7 ,     0,     0,     1,     7,     7 }, // Soga/Latin/Uganda
-    {    204,     7,   111,    46,    44,    59,    37,    48,    45,    43,   101,    8222,    8220,    8218,    8216,       0,6 ,       0,6 ,       0,6 ,       0,6 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,  17440,21 ,  17461,75 ,     85,14 ,  17440,21 ,  17461,75 ,     85,14 ,      64,4 ,      61,4 ,   45,4 ,   5,17 ,  22,23 , {75,69,83},        2,3 ,  16988,23 ,       4,4 ,     114,6 ,    5289,7 ,    1191,5 ,     2,     1,     7,     6,     7 }, // Luyia/Latin/Kenya
-    {    205,     7,   210,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,  17536,28 ,  10012,60 ,  15815,14 ,  17536,28 ,  10012,60 ,  15815,14 ,     623,9 ,     610,8 ,   45,4 ,   5,17 ,  22,23 , {84,90,83},      192,3 ,  17011,28 ,      13,5 ,       4,0 ,    5296,6 ,    5302,8 ,     2,     0,     1,     6,     7 }, // Asu/Latin/Tanzania
-    {    206,     7,   221,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,  17564,28 ,  17592,69 ,  17661,14 ,  17564,28 ,  17592,69 ,  17661,14 ,     632,9 ,     618,6 ,   45,4 ,   5,17 ,  22,23 , {85,71,88},      197,3 ,  17039,28 ,       4,4 ,       4,0 ,    5310,6 ,    1685,6 ,     0,     0,     1,     7,     7 }, // Teso/Latin/Uganda
-    {    206,     7,   111,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,  17564,28 ,  17592,69 ,  17661,14 ,  17564,28 ,  17592,69 ,  17661,14 ,     632,9 ,     618,6 ,   45,4 ,   5,17 ,  22,23 , {75,69,83},        2,3 ,  17067,27 ,       4,4 ,       4,0 ,    5310,6 ,    5316,5 ,     2,     1,     7,     6,     7 }, // Teso/Latin/Kenya
-    {    207,     7,    67,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {69,82,78},        0,0 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     2,     1,     1,     6,     7 }, // Saho/Latin/Eritrea
-    {    208,     7,   132,    46,   160,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     415,8 ,     97,16 ,      37,5 ,      8,10 ,  17675,28 ,  17703,53 ,  17756,14 ,  17675,28 ,  17703,53 ,  17756,14 ,     641,6 ,     624,6 ,   45,4 ,   5,17 ,  22,23 , {88,79,70},      207,3 ,  17094,23 ,       0,4 ,       4,0 ,   5321,11 ,    5332,5 ,     0,     0,     1,     6,     7 }, // Koyra Chiini/Latin/Mali
-    {    209,     7,   210,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,  15725,28 ,  15753,62 ,  15815,14 ,  15725,28 ,  15753,62 ,  15815,14 ,     552,5 ,     533,9 ,   45,4 ,   5,17 ,  22,23 , {84,90,83},      192,3 ,  16681,27 ,       0,4 ,       4,0 ,    5337,6 ,    1620,8 ,     2,     0,     1,     6,     7 }, // Rwa/Latin/Tanzania
-    {    210,     7,   111,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,  17770,28 ,  17798,69 ,  17867,14 ,  17770,28 ,  17798,69 ,  17867,14 ,     647,2 ,     630,2 ,   45,4 ,   5,17 ,  22,23 , {75,69,83},        2,3 ,  17117,23 ,       0,4 ,       4,0 ,    5343,6 ,    1191,5 ,     2,     1,     7,     6,     7 }, // Luo/Latin/Kenya
-    {    211,     7,   221,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,  15485,28 ,  15513,74 ,  15587,14 ,  15485,28 ,  15513,74 ,  15587,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {85,71,88},      197,3 ,  16626,26 ,       4,4 ,       4,0 ,    5349,6 ,    1685,6 ,     0,     0,     1,     7,     7 }, // Chiga/Latin/Uganda
-    {    212,     7,   145,    44,   160,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,  17881,28 ,  17909,48 ,  17957,14 ,  17881,28 ,  17909,48 ,  17957,14 ,     649,9 ,    632,10 ,   45,4 ,   5,17 ,  22,23 , {77,65,68},        0,0 ,  17140,22 ,      13,5 ,       4,0 ,   5355,17 ,    5372,6 ,     2,     1,     1,     6,     7 }, // Central Morocco Tamazight/Latin/Morocco
-    {    213,     7,   132,    46,   160,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     415,8 ,     97,16 ,      37,5 ,      8,10 ,  17971,28 ,  17999,54 ,  17756,14 ,  17971,28 ,  17999,54 ,  17756,14 ,     641,6 ,     624,6 ,   45,4 ,   5,17 ,  22,23 , {88,79,70},      207,3 ,  17094,23 ,       0,4 ,       4,0 ,   5378,15 ,    5332,5 ,     0,     0,     1,     6,     7 }, // Koyraboro Senni/Latin/Mali
-    {    214,     7,   210,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,  18053,28 ,  18081,63 ,  18144,14 ,  18053,28 ,  18081,63 ,  18144,14 ,     658,5 ,     642,8 ,   45,4 ,   5,17 ,  22,23 , {84,90,83},      192,3 ,  17162,27 ,       0,4 ,       4,0 ,    5393,9 ,    1620,8 ,     2,     0,     1,     6,     7 }, // Shambala/Latin/Tanzania
-    {    215,    13,   100,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     547,6 ,     35,18 ,      18,7 ,     25,12 ,  18158,33 ,  18191,54 ,  18245,19 ,  18158,33 ,  18191,54 ,  18245,19 ,     663,3 ,     650,6 ,   45,4 ,   5,17 ,  22,23 , {73,78,82},      121,1 ,  17189,10 ,       8,5 ,       4,0 ,    5402,4 ,    2662,4 ,     2,     1,     7,     7,     7 }, // Bodo/Devanagari/India
-    {    218,     2,   178,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,  18264,25 ,  18289,45 ,  18334,17 ,  18264,25 ,  18289,45 ,  18264,25 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {82,85,66},      123,1 ,  17199,43 ,      13,5 ,       4,0 ,    5406,7 ,    5413,5 ,     2,     1,     1,     6,     7 }, // Chechen/Cyrillic/Russia
-    {    219,     2,   178,    44,   160,    59,    37,    48,    45,    43,   101,     171,     187,    8222,    8220,       0,6 ,       0,6 ,     976,8 ,     976,8 ,   1003,10 ,   1713,23 ,      37,5 ,      8,10 ,  18351,37 ,  18388,68 ,  11437,14 ,  18351,37 ,  18388,68 ,  11437,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {82,85,66},      123,1 ,  17242,44 ,      13,5 ,       4,0 ,   5418,19 ,    5437,7 ,     2,     1,     1,     6,     7 }, // Church/Cyrillic/Russia
-    {    220,     2,   178,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {82,85,66},      123,1 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     2,     1,     1,     6,     7 }, // Chuvash/Cyrillic/Russia
-    {    230,     7,    49,    44,    46,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     415,8 ,     97,16 ,      37,5 ,      8,10 ,  18456,28 ,  18484,50 ,  18534,14 ,  18456,28 ,  18484,50 ,  18534,14 ,     666,5 ,     656,6 ,   45,4 ,   5,17 ,  22,23 , {67,68,70},      210,2 ,  17286,24 ,       0,4 ,       4,0 ,    5444,8 ,   5452,16 ,     2,     1,     1,     6,     7 }, // Luba Katanga/Latin/Congo Kinshasa
-    {    231,     7,   125,    44,    46,    59,    37,    48,    45,    43,   101,    8222,    8220,    8218,    8216,       0,6 ,       0,6 ,    984,10 ,    984,10 ,     156,8 ,    622,18 ,      37,5 ,      8,10 ,  18548,28 ,  18576,65 ,   3695,14 ,  18641,35 ,  18576,65 ,   3695,14 ,     671,5 ,     662,8 ,  445,5 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,   8436,19 ,      13,5 ,       4,0 ,   5468,14 ,   5482,10 ,     2,     1,     1,     6,     7 }, // Luxembourgish/Latin/Luxembourg
-    {    236,     7,    21,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     2,     1,     1,     6,     7 }, // Walloon/Latin/Belgium
-    {    237,     7,    37,    44,   160,    59,    37,    48,    45,    43,   101,    8222,    8221,    8218,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     415,8 ,     97,16 ,      37,5 ,      8,10 ,  18676,28 ,  18704,72 ,  18776,14 ,  18676,28 ,  18704,72 ,  18776,14 ,     676,3 ,     670,3 ,   45,4 ,   5,17 ,  22,23 , {88,65,70},       32,4 ,  17310,21 ,       0,4 ,       4,0 ,    5492,5 ,    5497,7 ,     0,     0,     1,     6,     7 }, // Aghem/Latin/Cameroon
-    {    238,     7,    37,    44,   160,    59,    37,    48,    45,    43,   101,     171,     187,    8222,    8220,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     415,8 ,     97,16 ,      37,5 ,      8,10 ,  18790,28 ,  18818,70 ,  18888,14 ,  18790,28 ,  18818,70 ,  18888,14 ,    679,10 ,     673,9 ,   45,4 ,   5,17 ,  22,23 , {88,65,70},       32,4 ,  17331,22 ,      13,5 ,       4,0 ,    5504,5 ,    5509,8 ,     0,     0,     1,     6,     7 }, // Basaa/Latin/Cameroon
-    {    239,     7,   156,    46,   160,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     415,8 ,     97,16 ,      37,5 ,      8,10 ,  17971,28 ,  18902,53 ,  18955,14 ,  17971,28 ,  18902,53 ,  18955,14 ,     689,8 ,    682,10 ,   45,4 ,   5,17 ,  22,23 , {88,79,70},      207,3 ,  17094,23 ,       0,4 ,       4,0 ,   5517,10 ,    5527,5 ,     0,     0,     1,     6,     7 }, // Zarma/Latin/Niger
-    {    240,     7,    37,    44,   160,    59,    37,    48,    45,    43,   101,     171,     187,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     415,8 ,     97,16 ,      37,5 ,      8,10 ,  18969,28 ,  18997,45 ,  19042,14 ,  18969,28 ,  18997,45 ,  19042,14 ,     697,5 ,     692,6 ,   45,4 ,   5,17 ,  22,23 , {88,65,70},       32,4 ,       0,7 ,      13,5 ,       4,0 ,    5532,5 ,    1981,8 ,     0,     0,     1,     6,     7 }, // Duala/Latin/Cameroon
-    {    241,     7,   187,    44,   160,    59,    37,    48,    45,    43,   101,     171,     187,    8220,    8221,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     415,8 ,     97,16 ,      37,5 ,      8,10 ,  19056,28 ,  19084,50 ,  19134,14 ,  19056,28 ,  19084,50 ,  19134,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {88,79,70},      207,3 ,  17353,23 ,      13,5 ,       4,0 ,    5537,5 ,    5542,7 ,     0,     0,     1,     6,     7 }, // Jola Fonyi/Latin/Senegal
-    {    242,     7,    37,    44,   160,    59,    37,    48,    45,    43,   101,     171,     187,    8220,    8221,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     415,8 ,     97,16 ,      37,5 ,      8,10 ,  19148,30 ,  19178,85 ,  19263,14 ,  19148,30 ,  19178,85 ,  19263,14 ,     702,7 ,     698,9 ,   45,4 ,   5,17 ,  22,23 , {88,65,70},       32,4 ,  17376,23 ,      13,5 ,       4,0 ,    5549,6 ,    5555,7 ,     0,     0,     1,     6,     7 }, // Ewondo/Latin/Cameroon
-    {    243,     7,    37,    44,   160,    59,    37,    48,    45,    43,   101,     171,     187,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     415,8 ,     97,16 ,      37,5 ,      8,10 ,  19277,29 ,  19306,45 ,  19351,14 ,  19277,29 ,  19306,45 ,  19351,14 ,     709,6 ,     707,7 ,   45,4 ,   5,17 ,  22,23 , {88,65,70},       32,4 ,  17399,11 ,      13,5 ,       4,0 ,    5562,5 ,    5567,7 ,     0,     0,     1,     6,     7 }, // Bafia/Latin/Cameroon
-    {    244,     7,   146,    44,    46,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,  19365,28 ,  19393,59 ,  19452,14 ,  19365,28 ,  19393,59 ,  19452,14 ,     715,8 ,    714,10 ,   45,4 ,   5,17 ,  22,23 , {77,90,78},      278,3 ,       0,7 ,      41,6 ,       4,0 ,    5574,5 ,   5579,10 ,     2,     1,     7,     6,     7 }, // Makhuwa Meetto/Latin/Mozambique
-    {    245,     7,    37,    44,    46,    59,    37,    48,    45,    43,   101,     171,     187,    8220,    8221,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     415,8 ,     97,16 ,      37,5 ,      8,10 ,  19466,28 ,  19494,74 ,  19568,14 ,  19466,28 ,  19494,74 ,  19568,14 ,     723,5 ,     724,5 ,   45,4 ,   5,17 ,  22,23 , {88,65,70},       32,4 ,  17410,17 ,       4,4 ,       4,0 ,    5589,6 ,    5595,7 ,     0,     0,     1,     6,     7 }, // Mundang/Latin/Cameroon
-    {    246,     7,    37,    44,   160,    59,    37,    48,    45,    43,   101,    8222,    8221,     171,     187,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     415,8 ,     97,16 ,      37,5 ,      8,10 ,  19582,30 ,  19612,89 ,  19701,14 ,  19582,30 ,  19612,89 ,  19701,14 ,     728,4 ,     729,4 ,   45,4 ,   5,17 ,  22,23 , {88,65,70},       32,4 ,  17427,20 ,      13,5 ,       4,0 ,    5602,6 ,    5608,7 ,     0,     0,     1,     6,     7 }, // Kwasio/Latin/Cameroon
-    {    247,     7,   254,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     538,9 ,     97,16 ,      18,7 ,    531,12 ,  19715,38 ,  19753,79 ,  19832,14 ,  19715,38 ,  19753,79 ,  19832,14 ,     732,2 ,     733,2 ,   45,4 ,   5,17 ,  22,23 , {83,83,80},      119,1 ,       0,7 ,       4,4 ,       4,0 ,    5615,9 ,       0,0 ,     2,     1,     1,     6,     7 }, // Nuer/Latin/South Sudan
-    {    248,     2,   178,    44,   160,    59,    37,    48,    45,    43,   101,     171,     187,    8222,    8220,       0,6 ,       0,6 ,    994,11 ,    994,11 ,     227,6 ,   1736,30 ,      37,5 ,      8,10 ,  19846,21 ,  19867,71 ,  19938,14 ,  19846,21 ,  19867,71 ,  19938,14 ,     734,2 ,     735,2 , 1231,5 , 1236,17 ,  22,23 , {82,85,66},      123,1 ,  17447,47 ,      13,5 ,       4,0 ,    5624,9 ,    5633,9 ,     2,     1,     1,     6,     7 }, // Sakha/Cyrillic/Russia
-    {    249,     7,   210,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,    119,10 ,     10,17 ,      37,5 ,      8,10 ,  19952,28 ,  19980,60 ,  20040,14 ,  19952,28 ,  19980,60 ,  20040,14 ,     736,9 ,     737,9 ,   45,4 ,   5,17 ,  22,23 , {84,90,83},      192,3 ,  17494,25 ,       0,4 ,       4,0 ,    5642,9 ,    5651,9 ,     2,     0,     1,     6,     7 }, // Sangu/Latin/Tanzania
-    {    251,     7,   156,    46,   160,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     415,8 ,     97,16 ,      37,5 ,      8,10 ,  17971,28 ,  17999,54 ,  17756,14 ,  17971,28 ,  17999,54 ,  17756,14 ,     689,8 ,    682,10 ,   45,4 ,   5,17 ,  22,23 , {88,79,70},      207,3 ,  17094,23 ,       0,4 ,       4,0 ,   5660,13 ,    5527,5 ,     0,     0,     1,     6,     7 }, // Tasawaq/Latin/Niger
-    {    252,    35,   121,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,    119,10 ,     10,17 ,      18,7 ,     25,12 ,  20054,30 ,  20054,30 ,     85,14 ,  20054,30 ,  20054,30 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {76,82,68},        6,1 ,  17519,15 ,       4,4 ,       4,0 ,    5673,2 ,    5675,4 ,     2,     1,     1,     6,     7 }, // Vai/Vai/Liberia
-    {    252,     7,   121,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,    119,10 ,     10,17 ,      18,7 ,     25,12 ,  20084,48 ,  20084,48 ,     85,14 ,  20084,48 ,  20084,48 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {76,82,68},        6,1 ,  17534,20 ,       4,4 ,       4,0 ,    5679,3 ,    5682,8 ,     2,     1,     1,     6,     7 }, // Vai/Latin/Liberia
-    {    253,     7,   206,    44,  8217,    59,    37,    48,    45,    43,   101,     171,     187,    8249,    8250,       0,6 ,       0,6 ,     264,9 ,     264,9 ,     53,10 ,    622,18 ,      37,5 ,      8,10 ,  20132,28 ,  20160,53 ,  20213,14 ,  20132,28 ,  20160,53 ,  20213,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {67,72,70},        0,0 ,       0,7 ,      41,6 ,       4,0 ,    5690,6 ,    5696,6 ,     2,     0,     1,     6,     7 }, // Walser/Latin/Switzerland
-    {    254,     7,    37,    44,   160,    59,    37,    48,    45,    43,   101,     171,     187,     171,     187,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     415,8 ,     97,16 ,      37,5 ,      8,10 ,  20227,21 ,  20248,71 ,  20319,14 ,  20227,21 ,  20248,71 ,  20319,14 ,     745,8 ,     746,8 ,   45,4 ,   5,17 ,  22,23 , {88,65,70},       32,4 ,       0,7 ,      13,5 ,       4,0 ,    5702,6 ,    5708,7 ,     0,     0,     1,     6,     7 }, // Yangben/Latin/Cameroon
-    {    256,     7,   197,    44,    46,    59,    37,    48,    45,    43,   101,     171,     187,    8220,    8221,       0,6 ,       0,6 ,     705,7 ,     705,7 ,     269,6 ,    372,22 ,      37,5 ,      8,10 ,  20333,28 ,  20361,54 ,   3391,14 ,  20333,28 ,  20361,54 ,   3391,14 ,    753,12 ,    754,11 ,    0,5 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,   3102,20 ,      13,5 ,       4,0 ,    5715,9 ,    2427,6 ,     2,     1,     1,     6,     7 }, // Asturian/Latin/Spain
-    {    257,     7,    37,    44,    46,    59,    37,    48,    45,    43,   101,     171,     187,    8249,    8250,   1005,11 ,   1005,11 ,   1016,16 ,    1032,9 ,     53,10 ,   1566,18 ,      37,5 ,      8,10 ,  20415,60 ,  20415,60 ,  20475,25 ,  20415,60 ,  20415,60 ,  20475,25 ,     765,8 ,    765,13 ,   45,4 ,   5,17 ,  22,23 , {88,65,70},       32,4 ,  17554,12 ,       8,5 ,       4,0 ,    5724,5 ,    5729,7 ,     0,     0,     1,     6,     7 }, // Ngomba/Latin/Cameroon
-    {    258,     7,    37,    44,    46,    59,    37,    48,    45,    43,   101,     171,     187,    8249,    8250,       0,6 ,       0,6 ,       0,6 ,       0,6 ,   1766,10 ,     80,17 ,      37,5 ,      8,10 ,  20500,54 ,  20500,54 ,  20554,21 ,  20500,54 ,  20500,54 ,  20554,21 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {88,65,70},       32,4 ,  17566,16 ,      41,6 ,       4,0 ,    5736,4 ,    5740,7 ,     0,     0,     1,     6,     7 }, // Kako/Latin/Cameroon
-    {    259,     7,    37,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,   1566,18 ,      37,5 ,      8,10 ,  20575,49 ,  20575,49 ,  20624,21 ,  20575,49 ,  20575,49 ,  20624,21 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {88,65,70},       32,4 ,  17582,12 ,       8,5 ,       4,0 ,    5747,5 ,    5752,7 ,     0,     0,     1,     6,     7 }, // Meta/Latin/Cameroon
-    {    260,     7,    37,    44,    46,    59,    37,    48,    45,    43,   101,     171,     187,    8220,    8221,       0,6 ,       0,6 ,       0,6 ,       0,6 ,      27,8 ,   1776,32 ,      37,5 ,      8,10 , 20645,111 , 20645,111 ,     85,14 , 20645,111 , 20645,111 ,     85,14 ,     773,9 ,     778,8 ,   45,4 ,   5,17 ,  22,23 , {88,65,70},       32,4 ,  17594,16 ,       8,5 ,       4,0 ,   5759,16 ,    5775,7 ,     0,     0,     1,     6,     7 }, // Ngiemboon/Latin/Cameroon
-    {    261,     7,   197,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     2,     1,     1,     6,     7 }, // Aragonese/Latin/Spain
-    {    290,    11,   100,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {73,78,82},      121,1 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     2,     1,     7,     7,     7 }, // Manipuri/Bengali/India
-    {    309,   100,   232,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {86,78,68},      336,1 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     0,     0,     1,     6,     7 }, // Tai Dam/Tai Viet/Vietnam
-    {    312,     7,    37,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {88,65,70},       32,4 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     0,     0,     1,     6,     7 }, // Akoose/Latin/Cameroon
-    {    313,     7,   225,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     547,6 ,     35,18 ,      18,7 ,     25,12 ,  20756,87 ,  20756,87 ,     85,14 ,  20756,87 ,  20756,87 ,  20843,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {85,83,68},        6,1 ,       0,7 ,      41,6 ,       4,0 ,   5782,12 ,   5794,22 ,     2,     1,     7,     6,     7 }, // Lakota/Latin/United States
-    {    314,     9,   145,    44,   160,    59,    37,    48,    45,    43,   101,     171,     187,    8222,    8221,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     415,8 ,     97,16 ,      37,5 ,      8,10 ,  15159,30 ,  20857,48 ,     85,14 ,  15159,30 ,  20857,48 ,     85,14 ,     526,6 ,     501,8 ,   45,4 ,   5,17 ,  22,23 , {77,65,68},        0,0 ,  16531,21 ,       0,4 ,       4,0 ,    5816,8 ,    5001,6 ,     2,     1,     1,     6,     7 }, // Standard Moroccan Tamazight/Tifinagh/Morocco
-    {    315,     7,    43,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {67,76,80},        6,1 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     0,     0,     1,     6,     7 }, // Mapuche/Latin/Chile
-    {    316,     1,   103,  1643,  1644,  1563,  1642,  1632,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      18,7 ,     25,12 ,  20905,58 ,  20905,58 ,  20963,14 ,  20905,58 ,  20905,58 ,  20963,14 ,     782,3 ,     786,3 ,   45,4 ,   5,17 ,  22,23 , {73,81,68},       44,5 ,  17610,20 ,      13,5 ,       4,0 ,   5824,14 ,    5838,5 ,     0,     0,     6,     5,     6 }, // Central Kurdish/Arabic/Iraq
-    {    316,     1,   102,  1643,  1644,  1563,  1642,  1632,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,  20905,58 ,  20905,58 ,  20963,14 ,  20905,58 ,  20905,58 ,  20963,14 ,     782,3 ,     786,3 ,   45,4 ,   5,17 ,  22,23 , {73,82,82},        0,0 ,  17630,19 ,      13,5 ,       4,0 ,   5824,14 ,    5843,5 ,     0,     0,     6,     5,     5 }, // Central Kurdish/Arabic/Iran
-    {    317,     7,    82,    44,    46,    59,    37,    48,    45,    43,   101,    8222,    8220,    8218,    8216,       0,6 ,       0,6 ,     180,7 ,     180,7 ,     113,6 ,    622,18 ,      55,4 ,      59,9 ,  20977,28 ,  21005,53 ,  21058,14 ,  20977,28 ,  21005,53 ,  21058,14 ,     785,9 ,    789,10 ,   45,4 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,  17649,27 ,      13,5 ,       4,0 ,   5848,14 ,    5862,6 ,     2,     1,     1,     6,     7 }, // Lower Sorbian/Latin/Germany
-    {    318,     7,    82,    44,    46,    59,    37,    48,    45,    43,   101,    8222,    8220,    8218,    8216,       0,6 ,       0,6 ,     180,7 ,     180,7 ,     113,6 ,    622,18 ,    543,12 ,      59,9 ,  21072,28 ,  21100,53 ,  21153,14 ,  21072,28 ,  21100,53 ,  21153,14 ,     785,9 ,     799,9 , 1253,5 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,  17676,29 ,      13,5 ,       4,0 ,   5868,15 ,    5883,6 ,     2,     1,     1,     6,     7 }, // Upper Sorbian/Latin/Germany
-    {    319,     7,    37,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {88,65,70},       32,4 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     0,     0,     1,     6,     7 }, // Kenyang/Latin/Cameroon
-    {    320,     7,    38,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {67,65,68},      240,3 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     2,     0,     7,     6,     7 }, // Mohawk/Latin/Canada
-    {    321,    75,    91,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {71,78,70},      216,2 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     0,     0,     1,     6,     7 }, // Nko/Nko/Guinea
-    {    322,     7,   260,    44,   160,    59,    37,    48,    45,    43,   101,    8222,    8220,    8222,    8220,       0,6 ,       0,6 ,    1041,8 ,    1041,8 ,     156,8 ,   1808,27 ,      37,5 ,      8,10 ,  21167,28 ,  21195,69 ,  21264,14 ,  21167,28 ,  21195,69 ,  21264,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 ,    {0,0,0},        0,0 ,    2586,0 ,      13,5 ,       4,0 ,    5889,9 ,    5898,6 ,     2,     1,     1,     6,     7 }, // Prussian/Latin/World
-    {    323,     7,    90,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {71,84,81},      305,1 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     2,     1,     7,     6,     7 }, // Kiche/Latin/Guatemala
-    {    324,     7,   205,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {83,69,75},      190,2 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     2,     0,     1,     6,     7 }, // Southern Sami/Latin/Sweden
-    {    325,     7,   205,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {83,69,75},      190,2 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     2,     0,     1,     6,     7 }, // Lule Sami/Latin/Sweden
-    {    326,     7,    73,    44,   160,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     640,8 ,   1835,18 ,     220,4 ,     224,9 ,  21278,28 ,  21306,70 ,     85,14 ,  21278,28 ,  21376,73 ,  21449,14 ,     794,3 ,     808,3 ,   45,4 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,  17705,11 ,      13,5 ,       4,0 ,   5904,11 ,    5915,5 ,     2,     1,     1,     6,     7 }, // Inari Sami/Latin/Finland
-    {    327,     7,    73,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     2,     1,     1,     6,     7 }, // Skolt Sami/Latin/Finland
-    {    328,     7,    13,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {65,85,68},      340,2 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     2,     1,     7,     6,     7 }, // Warlpiri/Latin/Australia
-    {    346,     1,   102,  1643,  1644,  1563,  1642,  1776,    45,    43,   101,     171,     187,    8249,    8250,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,  726,4 , 1258,39 ,  22,23 , {73,82,82},      342,3 ,  17716,27 ,       8,5 ,       4,0 ,    5920,7 ,    3252,5 ,     0,     0,     6,     5,     5 }, // Mazanderani/Arabic/Iran
-    {    349,     1,   102,  1643,  1644,  1563,  1642,  1776,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {73,82,82},        0,0 ,       0,7 ,       8,5 ,       4,0 ,   5927,11 ,       0,0 ,     0,     0,     6,     5,     5 }, // Northern Luri/Arabic/Iran
-    {    349,     1,   103,  1643,  1644,  1563,  1642,  1776,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      18,7 ,     25,12 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {73,81,68},       44,5 ,       0,7 ,       8,5 ,       4,0 ,   5927,11 ,       0,0 ,     0,     0,     6,     5,     6 }, // Northern Luri/Arabic/Iraq
-    {    357,     6,    97,    46,    44,    59,    37,    48,    45,    43,   101,   12300,   12301,   12302,   12303,     165,5 ,     165,5 ,    1049,5 ,    1049,5 ,     394,8 ,    423,14 ,     175,6 ,    192,13 ,   1980,28 ,   1980,28 ,   2008,14 ,   1980,28 ,   1980,28 ,   2008,14 ,      58,2 ,      55,2 ,   45,4 ,   5,17 ,  22,23 , {72,75,68},      134,3 ,  17743,11 ,       4,4 ,       4,0 ,    5938,2 ,   5940,14 ,     2,     1,     7,     6,     7 }, // Cantonese/Traditional Han/Hong Kong
-    {    357,     5,    44,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,     165,5 ,     165,5 ,    1049,5 ,    1049,5 ,     394,8 ,    402,13 ,     175,6 ,    181,11 ,   1959,21 ,   1980,28 ,   2008,14 ,   1959,21 ,   1980,28 ,   2008,14 ,      58,2 ,      55,2 ,   45,4 ,   5,17 ,  22,23 , {67,78,89},      243,1 ,   3122,13 ,       4,4 ,       4,0 ,    5954,2 ,    5956,7 ,     2,     1,     7,     6,     7 }, // Cantonese/Simplified Han/China
-    {    358,   138,   225,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {85,83,68},      159,3 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     2,     1,     7,     6,     7 }, // Osage/Osage/United States
-    {    360,     7,   260,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 ,    {0,0,0},        0,0 ,    2586,0 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     2,     1,     1,     6,     7 }, // Ido/Latin/World
-    {    361,     7,   260,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 ,    {0,0,0},        0,0 ,    2586,0 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     2,     1,     1,     6,     7 }, // Lojban/Latin/World
-    {    362,     7,   106,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {69,85,82},       14,1 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     2,     1,     1,     6,     7 }, // Sicilian/Latin/Italy
-    {    363,     1,   102,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {73,82,82},        0,0 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     0,     0,     6,     5,     5 }, // Southern Kurdish/Arabic/Iran
-    {    364,     1,   163,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {80,75,82},      176,2 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     2,     0,     7,     6,     7 }, // Western Balochi/Arabic/Pakistan
-    {    365,     7,   170,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,     919,9 ,     928,8 ,     547,6 ,     35,18 ,      18,7 ,     25,12 ,  21463,25 ,  21488,56 ,  21544,14 ,  21463,25 ,  21488,56 ,  21544,14 ,       0,2 ,       0,2 , 1297,8 ,   5,17 ,  22,23 , {80,72,80},      179,1 ,  17754,56 ,       4,4 ,       4,0 ,    5963,8 ,    4715,9 ,     2,     1,     7,     6,     7 }, // Cebuano/Latin/Philippines
-    {    366,     2,   178,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {82,85,66},      123,1 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     2,     1,     1,     6,     7 }, // Erzya/Cyrillic/Russia
-    {    367,     7,   225,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {85,83,68},      159,3 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     2,     1,     7,     6,     7 }, // Chickasaw/Latin/United States
-    {    368,     7,   225,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {85,83,68},      159,3 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     2,     1,     7,     6,     7 }, // Muscogee/Latin/United States
-    {    369,     7,   172,    46,    44,    59,    37,    48,    45,    43,   101,    8220,    8221,    8216,    8217,       0,6 ,       0,6 ,       0,6 ,       0,6 ,     53,10 ,     63,17 ,      37,5 ,      8,10 ,      0,28 ,      0,28 ,     85,14 ,      0,28 ,      0,28 ,     85,14 ,       0,2 ,       0,2 ,   45,4 ,   5,17 ,  22,23 , {80,76,78},      273,2 ,       0,7 ,       8,5 ,       4,0 ,       0,0 ,       0,0 ,     2,     1,     1,     6,     7 }, // Silesian/Latin/Poland
-    {      0,     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,       0,       0,       0,       0,        0,0,        0,0,        0,0,        0,0,        0,0,        0,0,        0,0,        0,0,        0,0,        0,0,        0,0,        0,0,        0,0,        0,0,        0,0,        0,0,     0,0,     0,0,     0,0,    {0,0,0},         0,0,        0,0,        0,0,        0,0,        0,0,        0,0,     0,     0,     0,     0,     0 } // trailing 0s
+   //  lang  script   terr lStrt lpMid lpEnd lPair lDelm  dec  group prcnt  zero minus plus   exp  qtOpn qtEnd altQO altQE lDFmt sDFmt lTFmt sTFmt slDay lDays ssDys sDays snDay nDays   am    pm   byte siQnt iecQn crSym crDsp crFmt crFNg ntLng ntTer                                                                                                                                                        currISO   curDgt curRnd dow1st  wknd+  wknd-
+    {      1,     0,     0,    0,    0,    0,    0,    6,    0,    1,    2,    3,    4,    5,    6,    7,    7,    8,    8,    0,   17,    0,    0,    0,    0,   56,   56,   83,   96,    0,    0,    0,    5,   22,    0,    0,    0,    0,    0,    0,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 10,  8, 56, 56, 27, 27, 13, 13,  2,  2,  5, 17, 23,  0,  0,  4,  0,  0,  0,    {0,0,0},      2,     1,     1,     6,     7 }, // C/AnyScript/AnyCountry
+    {      3,     7,    69,    0,    0,    0,    0,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,   27,   45,   10,   22,  109,  109,  163,  163,   83,   83,    2,    2,    0,    5,   22,    0,    0,    4,    0,    0,    6,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 18,  8, 12,  7, 54, 54, 27, 27, 13, 13,  2,  2,  4, 17, 23,  2, 17,  4,  0,  6, 10, {69,84,66},      2,     1,     7,     6,     7 }, // Oromo/Latin/Ethiopia
+    {      3,     7,   111,    0,    0,    0,    0,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,   27,   45,    0,    0,  109,  109,  163,  163,  190,  190,    2,    2,    0,    5,   22,    2,    0,    4,    0,    0,   16,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 18,  8, 10,  5, 54, 54, 27, 27, 13, 13,  2,  2,  4, 17, 23,  3,  0,  4,  0,  6,  8, {75,69,83},      2,     1,     7,     6,     7 }, // Oromo/Latin/Kenya
+    {      4,     7,    69,    0,    0,    0,    0,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,   53,   70,    0,    0,   56,   56,   56,   56,   83,   83,    0,    0,    0,    5,   22,    0,    0,    8,    0,    0,    0,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 10,  5, 27, 27, 27, 27, 13, 13,  2,  2,  4, 17, 23,  0,  0,  5,  0,  0,  0, {69,84,66},      2,     1,     7,     6,     7 }, // Afar/Latin/Ethiopia
+    {      5,     7,   195,    0,    0,    7,    7,    6,    1,   14,    2,    3,    4,    5,    9,   10,   11,   12,   13,   80,   70,    0,    0,  203,  203,  260,  260,  287,  287,    4,    4,   45,    5,   22,    5,   17,    4,    0,   24,   33,  6,  6,  8,  8,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 10,  5, 57, 57, 27, 27, 13, 13,  3,  3,  5, 17, 23,  1, 66,  4,  0,  9, 11, {90,65,82},      2,     1,     7,     6,     7 }, // Afrikaans/Latin/South Africa
+    {      5,     7,   148,    0,    0,    7,    7,    6,    1,   14,    2,    3,    4,    5,    9,   10,   11,   12,   13,   97,   70,   10,   22,  203,  203,  260,  260,  287,  287,    4,    4,   45,    5,   22,    6,   83,    4,    0,   24,   44,  6,  6,  8,  8,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 16, 10, 12,  7, 57, 57, 27, 27, 13, 13,  3,  3,  5, 17, 23,  1, 54,  4,  0,  9,  7, {78,65,68},      2,     1,     1,     6,     7 }, // Afrikaans/Latin/Namibia
+    {      6,     7,     2,    0,    0,   15,   15,    6,    1,   14,    2,    3,    4,    5,    9,   15,   16,   10,   11,    0,  113,   29,   22,  300,  300,  357,  384,  411,  411,    7,    7,   50,    5,   22,    7,  137,   13,    0,   51,   56,  6,  6,  9,  9,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17,  6, 13,  7, 57, 57, 27, 27, 14, 14, 11, 10,  4, 17, 23,  4, 44,  5,  0,  5,  8, {65,76,76},      0,     0,     1,     6,     7 }, // Albanian/Latin/Albania
+    {      6,     7,   127,    0,    0,   15,   15,    6,    1,   14,    2,    3,    4,    5,    9,   15,   16,   10,   11,    0,  113,    0,    0,  300,  300,  357,  384,  411,  411,    7,    7,   50,    5,   22,   11,  181,   13,    0,   51,   64,  6,  6,  9,  9,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17,  6, 10,  5, 57, 57, 27, 27, 14, 14, 11, 10,  4, 17, 23,  3, 53,  5,  0,  5, 18, {77,75,68},      2,     1,     1,     6,     7 }, // Albanian/Latin/Macedonia
+    {      6,     7,   257,    0,    0,   15,   15,    6,    1,   14,    2,    3,    4,    5,    9,   15,   16,   10,   11,    0,  113,    0,    0,  300,  300,  357,  384,  411,  411,    7,    7,   50,    5,   22,   14,  234,   13,    0,   51,   82,  6,  6,  9,  9,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17,  6, 10,  5, 57, 57, 27, 27, 14, 14, 11, 10,  4, 17, 23,  1, 20,  5,  0,  5,  6, {69,85,82},      2,     1,     1,     6,     7 }, // Albanian/Latin/Kosovo
+    {      7,    14,    69,   24,   24,   30,   39,    6,    0,    1,    2,    3,    4,    5,    9,   15,   16,   17,   18,   53,   45,   10,   22,  425,  425,  452,  452,  478,  478,   18,   17,   54,   57,   22,   15,  254,    4,    0,   88,   92,  6,  6,  9,  8,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 12,  7, 27, 27, 26, 26, 13, 13,  3,  4,  3, 23, 23,  2, 33,  4,  0,  4,  5, {69,84,66},      2,     1,     7,     6,     7 }, // Amharic/Ethiopic/Ethiopia
+    {      8,     1,    64,   47,   47,   47,   47,   53,   19,   20,   21,   23,   24,   26,   28,   11,   10,   13,   12,  119,  136,   10,   22,  491,  491,  491,  491,  542,  542,   21,   21,   80,   84,   22,   17,  287,   13,    0,   97,  104,  6,  6,  6,  6,  1,  1,  1,  2,  1,  2,  2,  2,  1,  1,  1,  1, 17, 10, 12,  7, 51, 51, 51, 51, 13, 13,  1,  1,  4, 47, 23,  5, 80,  5,  0,  7,  3, {69,71,80},      2,     1,     6,     5,     6 }, // Arabic/Arabic/Egypt
+    {      8,     1,     3,   47,   47,   47,   47,    6,    1,    0,   30,    3,   33,   35,    9,   11,   10,   13,   12,  119,  136,   10,   22,  491,  491,  491,  491,  542,  542,   21,   21,   80,   84,   22,   22,  367,   13,    0,   97,  107,  6,  6,  6,  6,  1,  1,  1,  3,  1,  2,  2,  1,  1,  1,  1,  1, 17, 10, 12,  7, 51, 51, 51, 51, 13, 13,  1,  1,  4, 47, 23,  5,101,  5,  0,  7,  7, {68,90,68},      2,     1,     6,     5,     6 }, // Arabic/Arabic/Algeria
+    {      8,     1,    17,   47,   47,   47,   47,   53,   19,   20,   21,   23,   24,   26,   28,   11,   10,   13,   12,  119,  136,   10,   22,  491,  491,  491,  491,  542,  542,   21,   21,   80,   84,   22,   27,  468,   13,    0,   97,  114,  6,  6,  6,  6,  1,  1,  1,  2,  1,  2,  2,  2,  1,  1,  1,  1, 17, 10, 12,  7, 51, 51, 51, 51, 13, 13,  1,  1,  4, 47, 23,  5, 90,  5,  0,  7,  7, {66,72,68},      3,     0,     6,     5,     6 }, // Arabic/Arabic/Bahrain
+    {      8,     1,    42,   47,   47,   47,   47,   53,   19,   20,   21,   23,   24,   26,   28,   11,   10,   13,   12,  119,  136,   10,   22,  491,  491,  491,  491,  542,  542,   21,   21,   80,   84,   22,   32,  558,   13,    0,   97,  121,  6,  6,  6,  6,  1,  1,  1,  2,  1,  2,  2,  2,  1,  1,  1,  1, 17, 10, 12,  7, 51, 51, 51, 51, 13, 13,  1,  1,  4, 47, 23,  4,111,  5,  0,  7,  4, {88,65,70},      0,     0,     1,     6,     7 }, // Arabic/Arabic/Chad
+    {      8,     1,    48,   47,   47,   47,   47,   53,   19,   20,   21,   23,   24,   26,   28,   11,   10,   13,   12,  119,  136,    0,    0,  491,  491,  491,  491,  542,  542,   21,   21,   80,   84,   22,   33,  669,   13,    0,   97,  125,  6,  6,  6,  6,  1,  1,  1,  2,  1,  2,  2,  2,  1,  1,  1,  1, 17, 10, 10,  5, 51, 51, 51, 51, 13, 13,  1,  1,  4, 47, 23,  2,104,  5,  0,  7,  9, {75,77,70},      0,     0,     1,     6,     7 }, // Arabic/Arabic/Comoros
+    {      8,     1,    59,   47,   47,   47,   47,   53,   19,   20,   21,   23,   24,   26,   28,   11,   10,   13,   12,  119,  136,   10,   22,  491,  491,  491,  491,  542,  542,   21,   21,   80,   84,   22,   36,  773,   13,    0,   97,  134,  6,  6,  6,  6,  1,  1,  1,  2,  1,  2,  2,  2,  1,  1,  1,  1, 17, 10, 12,  7, 51, 51, 51, 51, 13, 13,  1,  1,  4, 47, 23,  3, 83,  5,  0,  7,  6, {68,74,70},      0,     0,     6,     6,     7 }, // Arabic/Arabic/Djibouti
+    {      8,     1,    67,   47,   47,   47,   47,   53,   19,   20,   21,   23,   24,   26,   28,   11,   10,   13,   12,  119,  136,   10,   22,  491,  491,  491,  491,  542,  542,   21,   21,   80,   84,   22,   39,  856,   13,    0,   97,  140,  6,  6,  6,  6,  1,  1,  1,  2,  1,  2,  2,  2,  1,  1,  1,  1, 17, 10, 12,  7, 51, 51, 51, 51, 13, 13,  1,  1,  4, 47, 23,  3, 90,  5,  0,  7,  7, {69,82,78},      2,     1,     1,     6,     7 }, // Arabic/Arabic/Eritrea
+    {      8,     1,   103,   47,   47,   47,   47,   53,   19,   20,   21,   23,   24,   26,   28,   11,   10,   13,   12,  119,  136,   10,   22,  491,  491,  491,  491,  542,  542,   21,   21,   80,   84,   22,   42,  946,   13,    0,   97,  147,  6,  6,  6,  6,  1,  1,  1,  2,  1,  2,  2,  2,  1,  1,  1,  1, 17, 10, 12,  7, 51, 51, 51, 51, 13, 13,  1,  1,  4, 47, 23,  5, 83,  5,  0,  7,  6, {73,81,68},      0,     0,     6,     5,     6 }, // Arabic/Arabic/Iraq
+    {      8,     1,   105,   47,   47,   47,   47,   53,   19,   20,   21,   23,   24,   26,   28,   11,   10,   13,   12,  119,  136,    1,    1,  491,  491,  491,  491,  542,  542,   21,   21,   80,   84,   22,   47, 1029,   13,    0,   97,  153,  6,  6,  6,  6,  1,  1,  1,  2,  1,  2,  2,  2,  1,  1,  1,  1, 17, 10,  9,  4, 51, 51, 51, 51, 13, 13,  1,  1,  4, 47, 23,  1,132,  5,  0,  7,  7, {73,76,83},      2,     1,     7,     5,     6 }, // Arabic/Arabic/Israel
+    {      8,     1,   109,   47,   47,   47,   47,   53,   19,   20,   21,   23,   24,   26,   28,   11,   10,   13,   12,  119,  136,   10,   22,  491,  491,  491,  491,  542,  542,   21,   21,   80,   84,   22,   48, 1161,   13,    0,   97,  160,  6,  6,  6,  6,  1,  1,  1,  2,  1,  2,  2,  2,  1,  1,  1,  1, 17, 10, 12,  7, 51, 51, 51, 51, 13, 13,  1,  1,  4, 47, 23,  5, 83,  5,  0,  7,  6, {74,79,68},      3,     0,     6,     5,     6 }, // Arabic/Arabic/Jordan
+    {      8,     1,   115,   47,   47,   47,   47,   53,   19,   20,   21,   23,   24,   26,   28,   11,   10,   13,   12,  119,  136,   10,   22,  491,  491,  491,  491,  542,  542,   21,   21,   80,   84,   22,   53, 1244,   13,    0,   97,  166,  6,  6,  6,  6,  1,  1,  1,  2,  1,  2,  2,  2,  1,  1,  1,  1, 17, 10, 12,  7, 51, 51, 51, 51, 13, 13,  1,  1,  4, 47, 23,  5, 83,  5,  0,  7,  6, {75,87,68},      3,     0,     6,     5,     6 }, // Arabic/Arabic/Kuwait
+    {      8,     1,   119,   47,   47,   47,   47,   53,   19,   20,   21,   23,   24,   26,   28,   11,   10,   13,   12,  119,  136,   10,   22,  491,  491,  491,  491,  542,  542,   21,   21,   80,   84,   22,   58, 1327,   13,    0,   97,  172,  6,  6,  6,  6,  1,  1,  1,  2,  1,  2,  2,  2,  1,  1,  1,  1, 17, 10, 12,  7, 51, 51, 51, 51, 13, 13,  1,  1,  4, 47, 23,  5, 83,  5,  0,  7,  5, {76,66,80},      0,     0,     1,     6,     7 }, // Arabic/Arabic/Lebanon
+    {      8,     1,   122,   47,   47,   47,   47,    6,    1,    0,   30,    3,   33,   35,    9,   11,   10,   13,   12,  119,  136,   10,   22,  491,  491,  491,  491,  542,  542,   21,   21,   80,   84,   22,   63, 1410,   13,    0,   97,  177,  6,  6,  6,  6,  1,  1,  1,  3,  1,  2,  2,  1,  1,  1,  1,  1, 17, 10, 12,  7, 51, 51, 51, 51, 13, 13,  1,  1,  4, 47, 23,  5, 87,  5,  0,  7,  5, {76,89,68},      3,     0,     6,     5,     6 }, // Arabic/Arabic/Libya
+    {      8,     1,   136,   47,   47,   47,   47,   53,   19,   20,   21,   23,   24,   26,   28,   11,   10,   13,   12,  119,  136,   10,   22,  491,  491,  491,  491,  542,  542,   21,   21,   80,   84,   22,   68, 1497,   13,    0,   97,  182,  6,  6,  6,  6,  1,  1,  1,  2,  1,  2,  2,  2,  1,  1,  1,  1, 17, 10, 12,  7, 51, 51, 51, 51, 13, 13,  1,  1,  4, 47, 23,  4,111,  5,  0,  7,  9, {77,82,85},      2,     1,     1,     6,     7 }, // Arabic/Arabic/Mauritania
+    {      8,     1,   145,   47,   47,   47,   47,    6,    1,    0,   30,    3,   33,   35,    9,   11,   10,   13,   12,  119,  136,    0,    0,  491,  491,  491,  491,  542,  542,   21,   21,   80,   84,   22,   72, 1608,   13,    0,   97,  191,  6,  6,  6,  6,  1,  1,  1,  3,  1,  2,  2,  1,  1,  1,  1,  1, 17, 10, 10,  5, 51, 51, 51, 51, 13, 13,  1,  1,  4, 47, 23,  5, 86,  5,  0,  7,  6, {77,65,68},      2,     1,     1,     6,     7 }, // Arabic/Arabic/Morocco
+    {      8,     1,   162,   47,   47,   47,   47,   53,   19,   20,   21,   23,   24,   26,   28,   11,   10,   13,   12,  119,  136,   10,   22,  491,  491,  491,  491,  542,  542,   21,   21,   80,   84,   22,   77, 1694,   13,    0,   97,  197,  6,  6,  6,  6,  1,  1,  1,  2,  1,  2,  2,  2,  1,  1,  1,  1, 17, 10, 12,  7, 51, 51, 51, 51, 13, 13,  1,  1,  4, 47, 23,  5, 76,  5,  0,  7,  5, {79,77,82},      3,     0,     6,     5,     6 }, // Arabic/Arabic/Oman
+    {      8,     1,   165,   47,   47,   47,   47,   53,   19,   20,   21,   23,   24,   26,   28,   11,   10,   13,   12,  119,  136,   10,   22,  491,  491,  491,  491,  542,  542,   21,   21,   80,   84,   22,   47, 1029,   13,    0,   97,  202,  6,  6,  6,  6,  1,  1,  1,  2,  1,  2,  2,  2,  1,  1,  1,  1, 17, 10, 12,  7, 51, 51, 51, 51, 13, 13,  1,  1,  4, 47, 23,  1,132,  5,  0,  7, 18, {73,76,83},      2,     1,     1,     6,     7 }, // Arabic/Arabic/Palestinian Territories
+    {      8,     1,   175,   47,   47,   47,   47,   53,   19,   20,   21,   23,   24,   26,   28,   11,   10,   13,   12,  119,  136,   10,   22,  491,  491,  491,  491,  542,  542,   21,   21,   80,   84,   22,   82, 1770,   13,    0,   97,  220,  6,  6,  6,  6,  1,  1,  1,  2,  1,  2,  2,  2,  1,  1,  1,  1, 17, 10, 12,  7, 51, 51, 51, 51, 13, 13,  1,  1,  4, 47, 23,  5, 69,  5,  0,  7,  3, {81,65,82},      2,     1,     6,     5,     6 }, // Arabic/Arabic/Qatar
+    {      8,     1,   186,   47,   47,   47,   47,   53,   19,   20,   21,   23,   24,   26,   28,   11,   10,   13,   12,  119,  136,   10,   22,  491,  491,  491,  491,  542,  542,   21,   21,   80,   84,   22,   87, 1839,   13,    0,   97,  223,  6,  6,  6,  6,  1,  1,  1,  2,  1,  2,  2,  2,  1,  1,  1,  1, 17, 10, 12,  7, 51, 51, 51, 51, 13, 13,  1,  1,  4, 47, 23,  5, 76,  5,  0,  7, 24, {83,65,82},      2,     1,     7,     5,     6 }, // Arabic/Arabic/Saudi Arabia
+    {      8,     1,   194,   47,   47,   47,   47,   53,   19,   20,   21,   23,   24,   26,   28,   11,   10,   13,   12,  119,  136,   10,   22,  491,  491,  491,  491,  542,  542,   21,   21,   80,   84,   22,   92, 1915,   13,    0,   97,  247,  6,  6,  6,  6,  1,  1,  1,  2,  1,  2,  2,  2,  1,  1,  1,  1, 17, 10, 12,  7, 51, 51, 51, 51, 13, 13,  1,  1,  4, 47, 23,  1, 76,  5,  0,  7,  7, {83,79,83},      0,     0,     1,     6,     7 }, // Arabic/Arabic/Somalia
+    {      8,     1,   201,   47,   47,   47,   47,   53,   19,   20,   21,   23,   24,   26,   28,   11,   10,   13,   12,  119,  136,   10,   22,  491,  491,  491,  491,  542,  542,   21,   21,   80,   84,   22,   93, 1991,   13,    0,   97,  254,  6,  6,  6,  6,  1,  1,  1,  2,  1,  2,  2,  2,  1,  1,  1,  1, 17, 10, 12,  7, 51, 51, 51, 51, 13, 13,  1,  1,  4, 47, 23,  4, 90,  5,  0,  7,  7, {83,68,71},      2,     1,     6,     5,     6 }, // Arabic/Arabic/Sudan
+    {      8,     1,   207,   47,   47,   47,   47,   53,   19,   20,   21,   23,   24,   26,   28,   11,   10,   13,   12,  119,  136,   10,   22,  491,  491,  491,  491,  542,  542,   21,   21,   80,   84,   22,   97, 2081,   13,    0,   97,  261,  6,  6,  6,  6,  1,  1,  1,  2,  1,  2,  2,  2,  1,  1,  1,  1, 17, 10, 12,  7, 51, 51, 51, 51, 13, 13,  1,  1,  4, 47, 23,  5, 76,  5,  0,  7,  5, {83,89,80},      0,     0,     6,     5,     6 }, // Arabic/Arabic/Syria
+    {      8,     1,   216,   47,   47,   47,   47,    6,    1,    0,   30,    3,   33,   35,    9,   11,   10,   13,   12,  119,  136,   10,   22,  491,  491,  491,  491,  542,  542,   21,   21,   80,   84,   22,  102, 2157,   13,    0,   97,  266,  6,  6,  6,  6,  1,  1,  1,  3,  1,  2,  2,  1,  1,  1,  1,  1, 17, 10, 12,  7, 51, 51, 51, 51, 13, 13,  1,  1,  4, 47, 23,  5, 94,  5,  0,  7,  4, {84,78,68},      3,     0,     1,     6,     7 }, // Arabic/Arabic/Tunisia
+    {      8,     1,   223,   47,   47,   47,   47,   53,   19,   20,   21,   23,   24,   26,   28,   11,   10,   13,   12,  119,  136,   10,   22,  491,  491,  491,  491,  542,  542,   21,   21,   80,   84,   22,  107, 2251,   13,    0,   97,  270,  6,  6,  6,  6,  1,  1,  1,  2,  1,  2,  2,  2,  1,  1,  1,  1, 17, 10, 12,  7, 51, 51, 51, 51, 13, 13,  1,  1,  4, 47, 23,  5, 90,  5,  0,  7, 24, {65,69,68},      2,     1,     6,     5,     6 }, // Arabic/Arabic/United Arab Emirates
+    {      8,     1,   236,   47,   47,   47,   47,    6,    0,    1,   30,    3,   33,   35,    9,   11,   10,   13,   12,  119,  136,   10,   22,  491,  491,  491,  491,  542,  542,   21,   21,   80,   84,   22,   72, 1608,   13,    0,   97,  294,  6,  6,  6,  6,  1,  1,  1,  3,  1,  2,  2,  1,  1,  1,  1,  1, 17, 10, 12,  7, 51, 51, 51, 51, 13, 13,  1,  1,  4, 47, 23,  5, 86,  5,  0,  7, 15, {77,65,68},      2,     1,     1,     6,     7 }, // Arabic/Arabic/Western Sahara
+    {      8,     1,   237,   47,   47,   47,   47,   53,   19,   20,   21,   23,   24,   26,   28,   11,   10,   13,   12,  119,  136,   10,   22,  491,  491,  491,  491,  542,  542,   21,   21,   80,   84,   22,  112, 2341,   13,    0,   97,  309,  6,  6,  6,  6,  1,  1,  1,  2,  1,  2,  2,  2,  1,  1,  1,  1, 17, 10, 12,  7, 51, 51, 51, 51, 13, 13,  1,  1,  4, 47, 23,  5, 69,  5,  0,  7,  5, {89,69,82},      0,     0,     7,     5,     6 }, // Arabic/Arabic/Yemen
+    {      8,     1,   254,   47,   47,   47,   47,   53,   19,   20,   21,   23,   24,   26,   28,   11,   10,   13,   12,  119,  136,   10,   22,  491,  491,  491,  491,  542,  542,   21,   21,   80,   84,   22,  117, 2410,   13,    0,   97,  314,  6,  6,  6,  6,  1,  1,  1,  2,  1,  2,  2,  2,  1,  1,  1,  1, 17, 10, 12,  7, 51, 51, 51, 51, 13, 13,  1,  1,  4, 47, 23,  1,131,  5,  0,  7, 12, {83,83,80},      2,     1,     1,     6,     7 }, // Arabic/Arabic/South Sudan
+    {      8,     1,   260,   47,   47,   47,   47,   53,   19,   20,   21,   23,   24,   26,   28,   11,   10,   13,   12,  119,  136,   10,   22,  491,  491,  491,  491,  542,  542,   21,   21,   80,   84,   22,    0,    0,   13,    0,  326,  348,  6,  6,  6,  6,  1,  1,  1,  2,  1,  2,  2,  2,  1,  1,  1,  1, 17, 10, 12,  7, 51, 51, 51, 51, 13, 13,  1,  1,  4, 47, 23,  0,  0,  5,  0, 22,  6,    {0,0,0},      2,     1,     1,     6,     7 }, // Arabic/Arabic/World
+    {      9,    10,    11,    0,    0,   54,   54,    6,    1,   14,    2,    3,    4,    5,    9,   15,   16,   15,   16,  146,  166,    0,    0,  555,  555,  616,  616,  643,  643,    0,    0,  131,  137,   22,  118, 2541,   13,    0,  354,  361,  6,  6,  7,  7,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 20,  8, 10,  5, 61, 61, 27, 27, 13, 13,  2,  2,  6, 17, 23,  1, 45,  5,  0,  7,  8, {65,77,68},      2,     0,     1,     6,     7 }, // Armenian/Armenian/Armenia
+    {     10,    11,   100,    0,    0,   61,   61,    6,    0,    1,    2,   37,    4,    5,    9,   10,   11,   12,   13,  174,  192,   42,   42,  656,  656,  713,  713,  744,  744,   22,   22,  154,  158,   22,  119, 2586,    8,    0,  369,  376,  6,  6,  9,  9,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 18,  8, 12,  7, 57, 57, 31, 31, 13, 13,  9,  7,  4, 37, 23,  1, 42,  5,  0,  7,  4, {73,78,82},      2,     1,     7,     7,     7 }, // Assamese/Bengali/India
+    {     12,     7,    15,    0,    0,   70,   70,    6,    1,    0,    2,    3,    4,    5,    9,   10,   11,   12,   13,  200,  166,    0,    0,  757,  757,  823,  849,   96,   96,    0,    0,  195,    5,   22,  120, 2628,   13,    0,  380,  390,  6,  6,  8,  8,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17,  8, 10,  5, 66, 66, 26, 26, 13, 13,  2,  2,  4, 17, 23,  1, 57,  5,  0, 10, 10, {65,90,78},      2,     1,     1,     6,     7 }, // Azerbaijani/Latin/Azerbaijan
+    {     12,     1,   102,    0,    0,    0,    0,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,   53,   70,    0,    0,   56,   56,   56,   56,   83,   83,    0,    0,    0,    5,   22,    0,    0,    8,    0,    0,    0,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 10,  5, 27, 27, 27, 27, 13, 13,  2,  2,  4, 17, 23,  0,  0,  5,  0,  0,  0, {73,82,82},      0,     0,     6,     5,     5 }, // Azerbaijani/Arabic/Iran
+    {     12,     2,    15,    0,    0,    0,    0,    6,    1,    0,    2,    3,    4,    5,    9,   15,   16,   17,   18,  200,  166,    0,    0,  875,  875,  941,  941,   96,   96,   31,   29,    0,    5,   22,  120, 2685,   13,    0,  400,  410,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17,  8, 10,  5, 66, 66, 26, 26, 13, 13,  2,  2,  4, 17, 23,  1,  5,  5,  0, 10, 10, {65,90,78},      2,     1,     1,     6,     7 }, // Azerbaijani/Cyrillic/Azerbaijan
+    {     13,     2,   178,    0,    0,    0,    0,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,   53,   70,    0,    0,   56,   56,   56,   56,   83,   83,    0,    0,    0,    5,   22,  121,    0,    8,    0,    0,    0,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 10,  5, 27, 27, 27, 27, 13, 13,  2,  2,  4, 17, 23,  1,  0,  5,  0,  0,  0, {82,85,66},      2,     1,     1,     6,     7 }, // Bashkir/Cyrillic/Russia
+    {     14,     7,   197,    0,    0,   78,   78,    6,    1,    0,    2,    3,   38,    5,    9,   10,   11,   10,   11,  217,  253,   54,    0,  967,  967, 1034, 1034, 1061, 1061,    0,    0,  199,    5,   22,   14, 2690,   13,    0,  420,  427,  6,  6,  9,  9,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 36,  6, 12,  5, 67, 67, 27, 27, 13, 13,  2,  2,  7, 17, 23,  1, 19,  5,  0,  7,  8, {69,85,82},      2,     1,     1,     6,     7 }, // Basque/Latin/Spain
+    {     15,    11,    18,    0,    0,   87,   87,    6,    0,    1,    2,   37,    4,    5,    9,   10,   11,   12,   13,  174,  259,   10,   22, 1074, 1074, 1131, 1131, 1167, 1167,    0,    0,  154,    5,   22,  122, 2709,    0,    0,  435,  440,  6,  6,  9,  9,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 18,  6, 12,  7, 57, 57, 36, 36, 17, 17,  2,  2,  4, 17, 23,  1, 48,  4,  0,  5,  8, {66,68,84},      2,     1,     7,     6,     7 }, // Bengali/Bengali/Bangladesh
+    {     15,    11,   100,    0,    0,   87,   87,    6,    0,    1,    2,   37,    4,    5,    9,   10,   11,   12,   13,  174,  259,   10,   22, 1074, 1074, 1131, 1131, 1167, 1167,    0,    0,  154,    5,   22,  119, 2757,    0,    0,  435,  448,  6,  6,  9,  9,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 18,  6, 12,  7, 57, 57, 36, 36, 17, 17,  2,  2,  4, 17, 23,  1, 42,  4,  0,  5,  4, {73,78,82},      2,     1,     7,     7,     7 }, // Bengali/Bengali/India
+    {     16,    31,    25,   96,   96,   96,   96,    6,    0,    1,    2,   39,    4,    5,    9,   10,   11,   12,   13,  265,   70,   66,   93, 1184, 1184, 1262, 1262, 1295, 1295,   33,   31,    0,    5,   22,  123, 2799,    4,    0,  452,  458,  9,  9,  9,  9,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 30, 10, 27, 22, 78, 78, 33, 33, 26, 26,  5,  6,  4, 17, 23,  3,  8,  4,  0,  6,  5, {66,84,78},      2,     1,     7,     6,     7 }, // Dzongkha/Tibetan/Bhutan
+    {     19,     7,    74,    0,    0,  105,  105,    6,    1,   14,    2,    3,    4,    5,    9,   15,   16,   10,   11,   97,   45,    0,    0, 1321, 1321, 1363, 1363, 1395, 1395,   38,   37,  206,  213,  230,   14, 2807,   13,    0,  463,  472,  6,  6,  8,  8,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 16, 10, 10,  5, 42, 42, 32, 32, 17, 17,  4,  4,  7, 17, 23,  1, 35,  5,  0,  9,  5, {69,85,82},      2,     1,     1,     6,     7 }, // Breton/Latin/France
+    {     20,     2,    33,    0,    0,  113,  113,    6,    1,   14,    2,    3,    4,    5,    9,   40,   10,   40,   10,  295,  317,    1,    1, 1412, 1412, 1466, 1466, 1486, 1486,   42,   41,  253,    5,   22,  126, 2842,   13,    0,  477,  486,  6,  6,  7,  7,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 22, 12,  9,  4, 54, 54, 20, 20, 13, 13,  6,  6,  7, 17, 23,  3, 46,  5,  0,  9,  8, {66,71,78},      2,     1,     1,     6,     7 }, // Bulgarian/Cyrillic/Bulgaria
+    {     21,    25,   147,  120,  120,  125,  125,  135,    0,    1,    2,   41,    4,    5,    9,   10,   11,   12,   13,  329,  347,  115,  125, 1499, 1499, 1499, 1499, 1552, 1552,   48,   47,  260,    5,   22,    2, 2888,   13,    0,  494,  494,  5,  5, 10, 10,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 18,  8, 10,  6, 53, 53, 53, 53, 13, 13,  5,  3,  5, 17, 23,  1, 28,  5,  0,  6,  6, {77,77,75},      0,     0,     7,     6,     7 }, // Burmese/Myanmar/Myanmar
+    {     22,     2,    20,    0,    0,  136,  136,    6,    1,   14,    2,    3,    4,    5,    9,   15,   16,   40,   10,  295,  167,  131,    0, 1565, 1565, 1620, 1620, 1640, 1640,    0,    0,  265,  270,   22,    0, 2916,   13,    0,  500,  510,  6,  6,  7,  7,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 22,  7, 11,  5, 55, 55, 20, 20, 13, 13,  2,  2,  5, 17, 23,  2, 88,  5,  0, 10,  8, {66,89,78},      2,     0,     1,     6,     7 }, // Belarusian/Cyrillic/Belarus
+    {     23,    20,    36,    0,    0,  143,  152,    6,    1,    0,    2,    3,    4,    5,    9,   10,   11,   12,   13,   97,  259,   10,   22, 1653, 1698, 1744, 1744, 1783, 1783,    0,    0,  287,    5,   22,  129, 3004,    0,    0,  518,  523,  6,  6,  9,  9,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 16,  6, 12,  7, 45, 46, 39, 39, 13, 13,  2,  2,  2, 17, 23,  1, 28,  4,  0,  5,  7, {75,72,82},      2,     1,     7,     6,     7 }, // Khmer/Khmer/Cambodia
+    {     24,     7,   197,    0,    0,  161,  161,    6,    1,    0,    2,    3,    4,    5,    9,   15,   16,   10,   11,  355,  259,    1,    1, 1796, 1796, 1855, 1855, 1882, 1882,   53,   50,    0,    5,   22,   14, 3032,   13,    0,  530,  536,  6,  6,  7,  7,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 22,  6,  9,  4, 59, 59, 27, 27, 20, 20,  5,  5,  5, 17, 23,  1, 19,  5,  0,  6,  7, {69,85,82},      2,     1,     1,     6,     7 }, // Catalan/Latin/Spain
+    {     24,     7,     5,    0,    0,  161,  161,    6,    1,    0,    2,    3,    4,    5,    9,   15,   16,   10,   11,  355,  259,    1,    1, 1796, 1796, 1855, 1855, 1882, 1882,   53,   50,    0,    5,   22,   14, 3032,   13,    0,  530,  543,  6,  6,  7,  7,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 22,  6,  9,  4, 59, 59, 27, 27, 20, 20,  5,  5,  5, 17, 23,  1, 19,  5,  0,  6,  7, {69,85,82},      2,     1,     1,     6,     7 }, // Catalan/Latin/Andorra
+    {     24,     7,    74,    0,    0,  161,  161,    6,    1,    0,    2,    3,    4,    5,    9,   15,   16,   10,   11,  355,  259,    1,    1, 1796, 1796, 1855, 1855, 1882, 1882,   53,   50,    0,    5,   22,   14, 3032,   13,    0,  530,  550,  6,  6,  7,  7,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 22,  6,  9,  4, 59, 59, 27, 27, 20, 20,  5,  5,  5, 17, 23,  1, 19,  5,  0,  6,  6, {69,85,82},      2,     1,     1,     6,     7 }, // Catalan/Latin/France
+    {     24,     7,   106,    0,    0,  161,  161,    6,    1,    0,    2,    3,    4,    5,    9,   15,   16,   10,   11,  355,  259,    1,    1, 1796, 1796, 1855, 1855, 1882, 1882,   53,   50,    0,    5,   22,   14, 3032,   13,    0,  530,  556,  6,  6,  7,  7,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 22,  6,  9,  4, 59, 59, 27, 27, 20, 20,  5,  5,  5, 17, 23,  1, 19,  5,  0,  6,  6, {69,85,82},      2,     1,     1,     6,     7 }, // Catalan/Latin/Italy
+    {     25,     5,    44,  168,  168,  173,  173,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,  377,  390,  142,   27, 1902, 1902, 1929, 1929, 1949, 1949,   58,   55,  289,  291,   22,  130, 3051,    4,    0,  562,  566,  5,  5,  5,  5,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 13,  8, 11,  6, 27, 27, 20, 20, 13, 13,  2,  2,  2, 21, 23,  1, 12,  4,  0,  4,  2, {67,78,89},      2,     1,     7,     6,     7 }, // Chinese/Simplified Han/China
+    {     25,     5,    97,  168,  168,  173,  173,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,  377,  259,  142,   27, 1902, 1902, 1929, 1929, 1949, 1949,   58,   55,  289,  291,   22,  131, 3063,    4,    0,  562,  568,  5,  5,  5,  5,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 13,  6, 11,  6, 27, 27, 20, 20, 13, 13,  2,  2,  2, 21, 23,  3, 10,  4,  0,  4,  9, {72,75,68},      2,     1,     7,     6,     7 }, // Chinese/Simplified Han/Hong Kong
+    {     25,     5,   126,  168,  168,  173,  173,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,  377,  259,  142,   27, 1902, 1902, 1929, 1929, 1949, 1949,   58,   55,  289,  291,   22,  134, 3073,    4,    0,  562,  577,  5,  5,  5,  5,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 13,  6, 11,  6, 27, 27, 20, 20, 13, 13,  2,  2,  2, 21, 23,  4, 12,  4,  0,  4,  9, {77,79,80},      2,     1,     7,     6,     7 }, // Chinese/Simplified Han/Macau
+    {     25,     5,   190,  168,  168,  173,  173,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,  377,   45,  142,   27, 1902, 1902, 1929, 1929, 1949, 1949,   58,   55,  289,  291,   22,    6, 3085,    4,    0,  562,  586,  5,  5,  5,  5,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 13,  8, 11,  6, 27, 27, 20, 20, 13, 13,  2,  2,  2, 21, 23,  1, 14,  4,  0,  4,  3, {83,71,68},      2,     1,     7,     6,     7 }, // Chinese/Simplified Han/Singapore
+    {     25,     6,    97,  168,  168,  178,  178,    6,    0,    1,    2,    3,    4,    5,    9,   42,   43,   44,   45,  377,  398,  153,   27, 1902, 1902, 1962, 1962, 1949, 1949,   58,   55,  312,    5,   22,  131, 3063,   18,    0,  589,  593,  5,  5,  5,  5,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 13,  8, 13,  6, 27, 27, 20, 20, 13, 13,  2,  2,  3, 17, 23,  3, 10,  5,  0,  4,  9, {72,75,68},      2,     1,     7,     6,     7 }, // Chinese/Traditional Han/Hong Kong
+    {     25,     6,   126,  168,  168,  178,  178,    6,    0,    1,    2,    3,    4,    5,    9,   42,   43,   44,   45,  377,  398,  153,   27, 1902, 1902, 1962, 1962, 1949, 1949,   58,   55,  312,    5,   22,  134, 3099,   18,    0,  589,  602,  5,  5,  5,  5,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 13,  8, 13,  6, 27, 27, 20, 20, 13, 13,  2,  2,  3, 17, 23,  4, 12,  5,  0,  4,  9, {77,79,80},      2,     1,     7,     6,     7 }, // Chinese/Traditional Han/Macau
+    {     25,     6,   208,  168,  168,  173,  173,    6,    0,    1,    2,    3,    4,    5,    9,   42,   43,   44,   45,  406,  390,  153,   27, 1902, 1902, 1962, 1962, 1949, 1949,   58,   55,    0,    5,   22,    6, 3111,    4,    0,  589,  611,  5,  5,  5,  5,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 14,  8, 13,  6, 27, 27, 20, 20, 13, 13,  2,  2,  4, 17, 23,  1, 12,  4,  0,  4,  2, {84,87,68},      2,     0,     7,     6,     7 }, // Chinese/Traditional Han/Taiwan
+    {     26,     7,    74,    0,    0,    0,    0,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,   53,   70,    0,    0,   56,   56,   56,   56,   83,   83,    0,    0,    0,    5,   22,   14,    0,    8,    0,    0,    0,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 10,  5, 27, 27, 27, 27, 13, 13,  2,  2,  4, 17, 23,  1,  0,  5,  0,  0,  0, {69,85,82},      2,     1,     1,     6,     7 }, // Corsican/Latin/France
+    {     27,     7,    54,    0,    0,  161,  161,    6,    1,    0,    2,    3,    4,    5,    9,   40,   10,   46,   12,  420,  439,   54,    0, 1982, 1982, 2039, 2039, 2066, 2079,    0,    0,  315,    5,   22,  138, 3123,   13,    0,  613,  621,  6,  6,  7,  7,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 19, 13, 12,  5, 57, 57, 27, 27, 13, 13,  2,  2,  7, 17, 23,  3, 59,  5,  0,  8,  8, {72,82,75},      2,     1,     1,     6,     7 }, // Croatian/Latin/Croatia
+    {     27,     7,    27,    0,    0,  161,  161,    6,    1,    0,    2,    3,    4,    5,    9,   40,   10,   46,   12,  420,  452,   54,    0, 1982, 1982, 2039, 2039, 2079, 2079,    0,    0,  315,    5,   22,  141, 3182,   13,    0,  613,  629,  6,  6,  7,  7,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 19,  9, 12,  5, 57, 57, 27, 27, 13, 13,  2,  2,  7, 17, 23,  2, 84,  5,  0,  8, 19, {66,65,77},      2,     1,     1,     6,     7 }, // Croatian/Latin/Bosnia And Herzegowina
+    {     28,     7,    57,    0,    0,  183,  183,    6,    1,   14,    2,    3,    4,    5,    9,   40,   10,   46,   12,  461,  166,    1,    1, 2092, 2092, 2140, 2140, 2160, 2160,   60,   57,  322,    5,   22,  143, 3266,   13,    0,  648,  655,  6,  6,  7,  7,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17,  8,  9,  4, 48, 48, 20, 20, 13, 13,  4,  4,  5, 17, 23,  2, 67,  5,  0,  7,  5, {67,90,75},      2,     0,     1,     6,     7 }, // Czech/Latin/Czech Republic
+    {     29,     7,    58,    0,    0,  190,  190,    6,    1,    0,    2,    3,    4,    5,    9,   10,   11,   12,   13,  478,  501,  166,  166, 2173, 2173, 2223, 2250, 2284, 2284,    0,    0,    0,    5,   22,  145, 3333,   13,    0,  660,  665,  6,  6,  8,  8,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 23, 10, 10,  5, 50, 50, 27, 34, 13, 13,  2,  2,  5, 17, 23,  3, 41,  5,  0,  5,  7, {68,75,75},      2,     0,     1,     6,     7 }, // Danish/Latin/Denmark
+    {     29,     7,    86,    0,    0,  190,  190,    6,    1,    0,    2,    3,    4,    5,    9,   10,   11,   12,   13,  478,  501,  166,  166, 2173, 2173, 2223, 2250, 2284, 2284,    0,    0,    0,    5,   22,  145, 3333,   13,    0,  660,  672,  6,  6,  8,  8,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 23, 10, 10,  5, 50, 50, 27, 34, 13, 13,  2,  2,  5, 17, 23,  3, 41,  5,  0,  5,  8, {68,75,75},      2,     0,     1,     6,     7 }, // Danish/Latin/Greenland
+    {     30,     7,   151,    0,    0,    7,    7,    6,    1,    0,    2,    3,    4,    5,    9,   12,   13,   10,   11,   97,  511,    0,    0, 2297, 2297, 2355, 2355, 2375, 2375,   64,   61,    0,    5,   22,   14, 3374,   13,    0,  680,  680,  6,  6,  8,  8,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 16, 10, 10,  5, 58, 58, 20, 20, 13, 13,  4,  4,  4, 17, 23,  1, 18,  5,  0, 10,  9, {69,85,82},      2,     1,     1,     6,     7 }, // Dutch/Latin/Netherlands
+    {     30,     7,    12,    0,    0,    7,    7,    6,    1,    0,    2,    3,    4,    5,    9,   12,   13,   10,   11,   97,  511,    0,    0, 2297, 2297, 2355, 2355, 2375, 2375,   64,   61,    0,    5,   22,  148, 3392,   13,    0,  680,  690,  6,  6,  8,  8,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 16, 10, 10,  5, 58, 58, 20, 20, 13, 13,  4,  4,  4, 17, 23,  4, 54,  5,  0, 10,  5, {65,87,71},      2,     1,     1,     6,     7 }, // Dutch/Latin/Aruba
+    {     30,     7,    21,    0,    0,    7,    7,    6,    1,    0,    2,    3,    4,    5,    9,   12,   13,   10,   11,   97,   46,    0,    0, 2297, 2297, 2355, 2355, 2375, 2375,   64,   61,    0,    5,   22,   14, 3374,   13,    0,  680,  695,  6,  6,  8,  8,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 16,  9, 10,  5, 58, 58, 20, 20, 13, 13,  4,  4,  4, 17, 23,  1, 18,  5,  0, 10,  6, {69,85,82},      2,     1,     1,     6,     7 }, // Dutch/Latin/Belgium
+    {     30,     7,   152,    0,    0,    7,    7,    6,    1,    0,    2,    3,    4,    5,    9,   12,   13,   10,   11,   97,  511,    0,    0, 2297, 2297, 2355, 2355, 2375, 2375,   64,   61,    0,    5,   22,  152, 3446,   13,    0,  680,  701,  6,  6,  8,  8,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 16, 10, 10,  5, 58, 58, 20, 20, 13, 13,  4,  4,  4, 17, 23,  4, 96,  5,  0, 10,  7, {65,78,71},      2,     1,     1,     6,     7 }, // Dutch/Latin/Cura Sao
+    {     30,     7,   202,    0,    0,    7,    7,    6,    1,    0,    2,    3,    4,    5,    9,   12,   13,   10,   11,   97,  511,    0,    0, 2297, 2297, 2355, 2355, 2375, 2375,   64,   61,    0,    5,   22,    6, 3542,   13,    0,  680,  708,  6,  6,  8,  8,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 16, 10, 10,  5, 58, 58, 20, 20, 13, 13,  4,  4,  4, 17, 23,  1, 57,  5,  0, 10,  8, {83,82,68},      2,     1,     1,     6,     7 }, // Dutch/Latin/Suriname
+    {     30,     7,   255,    0,    0,    7,    7,    6,    1,    0,    2,    3,    4,    5,    9,   12,   13,   10,   11,   97,  511,    0,    0, 2297, 2297, 2355, 2355, 2375, 2375,   64,   61,    0,    5,   22,    6, 3599,   13,    0,  680,  716,  6,  6,  8,  8,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 16, 10, 10,  5, 58, 58, 20, 20, 13, 13,  4,  4,  4, 17, 23,  1, 60,  5,  0, 10, 19, {85,83,68},      2,     1,     1,     6,     7 }, // Dutch/Latin/Bonaire
+    {     30,     7,   256,    0,    0,    7,    7,    6,    1,    0,    2,    3,    4,    5,    9,   12,   13,   10,   11,   97,  511,    0,    0, 2297, 2297, 2355, 2355, 2375, 2375,   64,   61,    0,    5,   22,  152, 3446,   13,    0,  680,  735,  6,  6,  8,  8,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 16, 10, 10,  5, 58, 58, 20, 20, 13, 13,  4,  4,  4, 17, 23,  4, 96,  5,  0, 10, 12, {65,78,71},      2,     1,     1,     6,     7 }, // Dutch/Latin/Sint Maarten
+    {     31,     7,   225,    0,    0,  198,  208,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,   27,  521,   10,   22,    0,    0,   56,   56,   83,   83,    0,    0,    0,    5,   22,    6, 3659,    4,    0,  747,  763,  6,  6, 10,  9,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 18,  6, 12,  7, 56, 56, 27, 27, 13, 13,  2,  2,  5, 17, 23,  1, 34,  4,  0, 16, 13, {85,83,68},      2,     1,     7,     6,     7 }, // English/Latin/United States
+    {     31,     3,   225,    0,    0,    0,    0,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,   53,   70,    0,    0,   56,   56,   56,   56,   83,   83,    0,    0,    0,    5,   22,  156,    0,    8,    0,    0,    0,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 10,  5, 27, 27, 27, 27, 13, 13,  2,  2,  4, 17, 23,  3,  0,  5,  0,  0,  0, {85,83,68},      2,     1,     7,     6,     7 }, // English/Deseret/United States
+    {     31,     7,     4,    0,    0,  198,  208,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,   27,  521,   10,   22,    0,    0,   56,   56,   83,   83,    0,    0,    0,    5,   22,    6, 3659,    4,    0,  756,  776,  6,  6, 10,  9,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 18,  6, 12,  7, 56, 56, 27, 27, 13, 13,  2,  2,  5, 17, 23,  1, 34,  4,  0,  7, 14, {85,83,68},      2,     1,     7,     6,     7 }, // English/Latin/American Samoa
+    {     31,     7,     7,    0,    0,  208,  208,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,    0,   45,    0,    0,    0,    0,   56,   56,   83,   83,   68,   65,    0,    5,   22,    6, 3693,    4,    0,  756,  790,  6,  6,  9,  9,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 10,  5, 56, 56, 27, 27, 13, 13,  2,  2,  5, 17, 23,  1, 70,  4,  0,  7,  8, {88,67,68},      2,     1,     1,     6,     7 }, // English/Latin/Anguilla
+    {     31,     7,     9,    0,    0,  208,  208,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,    0,   45,   10,   22,    0,    0,   56,   56,   83,   83,   68,   65,    0,    5,   22,    6, 3693,    4,    0,  756,  798,  6,  6,  9,  9,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 12,  7, 56, 56, 27, 27, 13, 13,  2,  2,  5, 17, 23,  1, 70,  4,  0,  7, 17, {88,67,68},      2,     1,     7,     6,     7 }, // English/Latin/Antigua And Barbuda
+    {     31,     7,    13,    0,    0,  208,  208,    6,    0,    1,    2,    3,    4,    5,    6,   10,   11,   12,   13,    0,  259,   10,   22,    0,    0,   56,   56, 2388, 2388,   68,   65,    0,    5,   22,    6, 3763,    4,    0,  815,  815,  6,  6,  9,  9,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17,  6, 12,  7, 56, 56, 27, 27, 24, 24,  2,  2,  5, 17, 23,  1, 58,  4,  0, 18,  9, {65,85,68},      2,     1,     7,     6,     7 }, // English/Latin/Australia
+    {     31,     7,    14,    0,    0,  208,  208,    6,    1,    0,    2,    3,    4,    5,    9,   10,   11,   12,   13,    0,   45,    0,    0,    0,    0,   56,   56,   83,   83,   68,   65,    0,    5,   22,   14, 3821,    8,    0,  756,  833,  6,  6,  9,  9,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 10,  5, 56, 56, 27, 27, 13, 13,  2,  2,  5, 17, 23,  1, 19,  5,  0,  7,  7, {69,85,82},      2,     1,     1,     6,     7 }, // English/Latin/Austria
+    {     31,     7,    16,    0,    0,  208,  208,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,    0,   45,   10,   22,    0,    0,   56,   56,   83,   83,   68,   65,    0,    5,   22,    6, 3840,    4,    0,  756,  840,  6,  6,  9,  9,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 12,  7, 56, 56, 27, 27, 13, 13,  2,  2,  5, 17, 23,  1, 52,  4,  0,  7,  7, {66,83,68},      2,     1,     7,     6,     7 }, // English/Latin/Bahamas
+    {     31,     7,    19,    0,    0,  208,  208,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,    0,   45,   10,   22,    0,    0,   56,   56,   83,   83,   68,   65,    0,    5,   22,    6, 3892,    4,    0,  756,  847,  6,  6,  9,  9,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 12,  7, 56, 56, 27, 27, 13, 13,  2,  2,  5, 17, 23,  1, 55,  4,  0,  7,  8, {66,66,68},      2,     1,     1,     6,     7 }, // English/Latin/Barbados
+    {     31,     7,    21,    0,    0,  208,  208,    6,    1,    0,    2,    3,    4,    5,    9,   10,   11,   12,   13,    0,   45,    0,    0,    0,    0,   56,   56,   83,   83,   68,   65,    0,    5,   22,   14, 3821,   13,    0,  756,  855,  6,  6,  9,  9,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17,  8, 10,  5, 56, 56, 27, 27, 13, 13,  2,  2,  5, 17, 23,  1, 19,  5,  0,  7,  7, {69,85,82},      2,     1,     1,     6,     7 }, // English/Latin/Belgium
+    {     31,     7,    22,    0,    0,  208,  208,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,  527,   45,    0,    0,    0,    0,   56,   56,   83,   83,   68,   65,    0,    5,   22,    6, 3947,    4,    0,  756,  862,  6,  6,  9,  9,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 18,  8, 10,  5, 56, 56, 27, 27, 13, 13,  2,  2,  5, 17, 23,  1, 46,  4,  0,  7,  6, {66,90,68},      2,     1,     7,     6,     7 }, // English/Latin/Belize
+    {     31,     7,    24,    0,    0,  208,  208,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,    0,   45,   10,   22,    0,    0,   56,   56,   83,   83,   68,   65,    0,    5,   22,    6, 3993,    4,    0,  756,  868,  6,  6,  9,  9,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 12,  7, 56, 56, 27, 27, 13, 13,  2,  2,  5, 17, 23,  1, 52,  4,  0,  7,  7, {66,77,68},      2,     1,     1,     6,     7 }, // English/Latin/Bermuda
+    {     31,     7,    28,    0,    0,  208,  208,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,  527,   45,    0,    0,    0,    0,   56,   56,   83,   83,   68,   65,    0,    5,   22,  136, 4045,    4,    0,  756,  875,  6,  6,  9,  9,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 18,  8, 10,  5, 56, 56, 27, 27, 13, 13,  2,  2,  5, 17, 23,  1, 49,  4,  0,  7,  8, {66,87,80},      2,     1,     7,     6,     7 }, // English/Latin/Botswana
+    {     31,     7,    31,    0,    0,  208,  208,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,    0,   45,    0,    0,    0,    0,   56,   56,   83,   83,   68,   65,    0,    5,   22,  156, 3659,    4,    0,  756,  883,  6,  6,  9,  9,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 10,  5, 56, 56, 27, 27, 13, 13,  2,  2,  5, 17, 23,  3, 34,  4,  0,  7, 30, {85,83,68},      2,     1,     1,     6,     7 }, // English/Latin/British Indian Ocean Territory
+    {     31,     7,    35,    0,    0,  198,  208,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,   27,  521,    0,    0,    0,    0,   56,   56,   83,   83,    0,    0,    0,    5,   22,  159, 4094,    4,    0,  756,  913,  6,  6, 10,  9,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 18,  6, 10,  5, 56, 56, 27, 27, 13, 13,  2,  2,  5, 17, 23,  3, 52,  4,  0,  7,  7, {66,73,70},      0,     0,     1,     6,     7 }, // English/Latin/Burundi
+    {     31,     7,    37,    0,    0,  208,  208,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,    0,   45,    0,    0,    0,    0,   56,   56,   83,   83,   68,   65,    0,    5,   22,   32, 4146,    4,    0,  756,  920,  6,  6,  9,  9,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 10,  5, 56, 56, 27, 27, 13, 13,  2,  2,  5, 17, 23,  4, 82,  4,  0,  7,  8, {88,65,70},      0,     0,     1,     6,     7 }, // English/Latin/Cameroon
+    {     31,     7,    38,    0,    0,  198,  208,    6,    0,    1,    2,    3,    4,    5,    6,   10,   11,   12,   13,   27,   70,   10,   22,    0,    0, 2412, 2412,   83,   83,   64,   61,    0,    5,   22,    6, 4228,    4,    0,  928,  944,  6,  6, 10,  9,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 18, 10, 12,  7, 56, 56, 34, 34, 13, 13,  4,  4,  5, 17, 23,  1, 52,  4,  0, 16,  6, {67,65,68},      2,     0,     7,     6,     7 }, // English/Latin/Canada
+    {     31,     7,    40,    0,    0,  208,  208,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,    0,   45,   10,   22,    0,    0,   56,   56,   83,   83,   68,   65,    0,    5,   22,    6, 4280,    4,    0,  756,  950,  6,  6,  9,  9,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 12,  7, 56, 56, 27, 27, 13, 13,  2,  2,  5, 17, 23,  1, 70,  4,  0,  7, 14, {75,89,68},      2,     1,     1,     6,     7 }, // English/Latin/Cayman Islands
+    {     31,     7,    45,    0,    0,  208,  208,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,    0,   45,    0,    0,    0,    0,   56,   56,   83,   83,   68,   65,    0,    5,   22,    6, 3763,    4,    0,  756,  964,  6,  6,  9,  9,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 10,  5, 56, 56, 27, 27, 13, 13,  2,  2,  5, 17, 23,  1, 58,  4,  0,  7, 16, {65,85,68},      2,     1,     1,     6,     7 }, // English/Latin/Christmas Island
+    {     31,     7,    46,    0,    0,  208,  208,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,    0,   45,    0,    0,    0,    0,   56,   56,   83,   83,   68,   65,    0,    5,   22,    6, 3763,    4,    0,  756,  980,  6,  6,  9,  9,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 10,  5, 56, 56, 27, 27, 13, 13,  2,  2,  5, 17, 23,  1, 58,  4,  0,  7, 23, {65,85,68},      2,     1,     1,     6,     7 }, // English/Latin/Cocos Islands
+    {     31,     7,    51,    0,    0,  208,  208,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,    0,   45,    0,    0,    0,    0,   56,   56,   83,   83,   68,   65,    0,    5,   22,    6, 4350,    4,    0,  756, 1003,  6,  6,  9,  9,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 10,  5, 56, 56, 27, 27, 13, 13,  2,  2,  5, 17, 23,  1, 61,  4,  0,  7, 12, {78,90,68},      2,     1,     1,     6,     7 }, // English/Latin/Cook Islands
+    {     31,     7,    56,    0,    0,  208,  208,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,    0,   45,   10,   22,    0,    0,   56,   56,   83,   83,   68,   65,    0,    5,   22,   14, 3821,    4,    0,  756, 1015,  6,  6,  9,  9,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 12,  7, 56, 56, 27, 27, 13, 13,  2,  2,  5, 17, 23,  1, 19,  4,  0,  7,  6, {69,85,82},      2,     1,     1,     6,     7 }, // English/Latin/Cyprus
+    {     31,     7,    58,    0,    0,  208,  208,    6,    1,    0,    2,    3,    4,    5,    9,   10,   11,   12,   13,    0,   45,  166,  166,    0,    0,   56,   56,   83,   83,   68,   65,    0,    5,   22,  145, 4411,   13,    0,  756, 1021,  6,  6,  9,  9,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 10,  5, 56, 56, 27, 27, 13, 13,  2,  2,  5, 17, 23,  3, 43,  5,  0,  7,  7, {68,75,75},      2,     0,     1,     6,     7 }, // English/Latin/Denmark
+    {     31,     7,    60,    0,    0,  208,  208,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,    0,   45,   10,   22,    0,    0,   56,   56,   83,   83,   68,   65,    0,    5,   22,    6, 3693,    4,    0,  756, 1028,  6,  6,  9,  9,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 12,  7, 56, 56, 27, 27, 13, 13,  2,  2,  5, 17, 23,  1, 70,  4,  0,  7,  8, {88,67,68},      2,     1,     7,     6,     7 }, // English/Latin/Dominica
+    {     31,     7,    67,    0,    0,  208,  208,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,    0,   45,   10,   22,    0,    0,   56,   56,   83,   83,   68,   65,    0,    5,   22,   39, 4454,    4,    0,  756, 1036,  6,  6,  9,  9,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 12,  7, 56, 56, 27, 27, 13, 13,  2,  2,  5, 17, 23,  3, 49,  4,  0,  7,  7, {69,82,78},      2,     1,     1,     6,     7 }, // English/Latin/Eritrea
+    {     31,     7,    70,    0,    0,  208,  208,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,    0,   45,    0,    0,    0,    0,   56,   56,   83,   83,   68,   65,    0,    5,   22,  117, 4503,    4,    0,  756, 1043,  6,  6,  9,  9,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 10,  5, 56, 56, 27, 27, 13, 13,  2,  2,  5, 17, 23,  1, 73,  4,  0,  7, 16, {70,75,80},      2,     1,     1,     6,     7 }, // English/Latin/Falkland Islands
+    {     31,     7,    72,    0,    0,  208,  208,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,    0,   45,   10,   22,    0,    0,   56,   56,   83,   83,   68,   65,    0,    5,   22,    6, 4576,    4,    0,  756, 1059,  6,  6,  9,  9,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 12,  7, 56, 56, 27, 27, 13, 13,  2,  2,  5, 17, 23,  1, 46,  4,  0,  7,  4, {70,74,68},      2,     1,     1,     6,     7 }, // English/Latin/Fiji
+    {     31,     7,    73,    0,    0,  208,  208,    6,    1,   14,    2,    3,    4,    5,    9,   10,   11,   12,   13,    0,   45,  176,  167,    0,    0,   56,   56,   83,   83,   68,   65,    0,    5,   22,   14, 3821,   13,    0,  756, 1063,  6,  6,  9,  9,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10,  9,  4, 56, 56, 27, 27, 13, 13,  2,  2,  5, 17, 23,  1, 19,  5,  0,  7,  7, {69,85,82},      2,     1,     1,     6,     7 }, // English/Latin/Finland
+    {     31,     7,    75,    0,    0,  208,  208,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,    0,   45,    0,    0,    0,    0,   56,   56,   83,   83,   68,   65,    0,    5,   22,  117, 4622,    4,    0,  756, 1070,  6,  6,  9,  9,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 10,  5, 56, 56, 27, 27, 13, 13,  2,  2,  5, 17, 23,  1, 31,  4,  0,  7,  8, {71,66,80},      2,     1,     1,     6,     7 }, // English/Latin/Guernsey
+    {     31,     7,    80,    0,    0,  208,  208,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,    0,   45,   10,   22,    0,    0,   56,   56,   83,   83,   68,   65,    0,    5,   22,  162, 4653,    4,    0,  756, 1078,  6,  6,  9,  9,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 12,  7, 56, 56, 27, 27, 13, 13,  2,  2,  5, 17, 23,  1, 49,  4,  0,  7,  6, {71,77,68},      2,     1,     1,     6,     7 }, // English/Latin/Gambia
+    {     31,     7,    82,    0,    0,  208,  208,    6,    1,    0,    2,    3,    4,    5,    9,   10,   11,   12,   13,    0,   45,    0,    0,    0,    0,   56,   56,   83,   83,   68,   65,    0,    5,   22,   14, 3821,   13,    0,  756, 1084,  6,  6,  9,  9,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 10,  5, 56, 56, 27, 27, 13, 13,  2,  2,  5, 17, 23,  1, 19,  5,  0,  7,  7, {69,85,82},      2,     1,     1,     6,     7 }, // English/Latin/Germany
+    {     31,     7,    83,    0,    0,  208,  208,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,    0,   45,   10,   22,    0,    0,   56,   56,   83,   83,   68,   65,    0,    5,   22,  163, 4702,    4,    0,  756, 1091,  6,  6,  9,  9,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 12,  7, 56, 56, 27, 27, 13, 13,  2,  2,  5, 17, 23,  3, 46,  4,  0,  7,  5, {71,72,83},      2,     1,     1,     6,     7 }, // English/Latin/Ghana
+    {     31,     7,    84,    0,    0,  208,  208,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,    0,   45,    0,    0,    0,    0,   56,   56,   83,   83,   68,   65,    0,    5,   22,  117, 4748,    4,    0,  756, 1096,  6,  6,  9,  9,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 10,  5, 56, 56, 27, 27, 13, 13,  2,  2,  5, 17, 23,  1, 52,  4,  0,  7,  9, {71,73,80},      2,     1,     1,     6,     7 }, // English/Latin/Gibraltar
+    {     31,     7,    87,    0,    0,  208,  208,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,    0,   45,   10,   22,    0,    0,   56,   56,   83,   83,   68,   65,    0,    5,   22,    6, 3693,    4,    0,  756, 1105,  6,  6,  9,  9,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 12,  7, 56, 56, 27, 27, 13, 13,  2,  2,  5, 17, 23,  1, 70,  4,  0,  7,  7, {88,67,68},      2,     1,     1,     6,     7 }, // English/Latin/Grenada
+    {     31,     7,    89,    0,    0,  198,  208,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,   27,  521,   10,   22,    0,    0,   56,   56,   83,   83,    0,    0,    0,    5,   22,    6, 3659,    4,    0,  756, 1112,  6,  6, 10,  9,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 18,  6, 12,  7, 56, 56, 27, 27, 13, 13,  2,  2,  5, 17, 23,  1, 34,  4,  0,  7,  4, {85,83,68},      2,     1,     7,     6,     7 }, // English/Latin/Guam
+    {     31,     7,    93,    0,    0,  208,  208,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,    0,   45,   10,   22,    0,    0,   56,   56,   83,   83,   68,   65,    0,    5,   22,    6, 4800,    4,    0,  756, 1116,  6,  6,  9,  9,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 12,  7, 56, 56, 27, 27, 13, 13,  2,  2,  5, 17, 23,  1, 55,  4,  0,  7,  6, {71,89,68},      2,     0,     1,     6,     7 }, // English/Latin/Guyana
+    {     31,     7,    97,    0,    0,  208,  208,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,    0,  398,   10,   22,    0,    0,   56,   56,   83,   83,   68,   65,    0,    5,   22,  131, 4855,    4,    0,  756, 1122,  6,  6,  9,  9,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17,  8, 12,  7, 56, 56, 27, 27, 13, 13,  2,  2,  5, 17, 23,  3, 55,  4,  0,  7, 19, {72,75,68},      2,     1,     7,     6,     7 }, // English/Latin/Hong Kong
+    {     31,     7,   100,    0,    0,  198,  208,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,  174,   45,   10,   22,    0,    0,   56,   56,   83,   83,   68,   65,    0,    5,   22,  119, 4910,    4,    0,  756,  891,  6,  6, 10,  9,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 18,  8, 12,  7, 56, 56, 27, 27, 13, 13,  2,  2,  5, 17, 23,  1, 43,  4,  0,  7,  5, {73,78,82},      2,     1,     7,     7,     7 }, // English/Latin/India
+    {     31,     7,   104,    0,    0,  208,  208,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,   97,   45,    0,    0,    0,    0,   56,   56,   83,   83,   64,   61,    0,    5,   22,   14, 3821,    4,    0,  756, 1141,  6,  6,  9,  9,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 16, 10, 10,  5, 56, 56, 27, 27, 13, 13,  4,  4,  5, 17, 23,  1, 19,  4,  0,  7,  7, {69,85,82},      2,     1,     1,     6,     7 }, // English/Latin/Ireland
+    {     31,     7,   105,    0,    0,  208,  208,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,    0,   45,    1,    1,    0,    0,   56,   56,   83,   83,   68,   65,    0,    5,   22,   47, 4953,    4,    0,  756, 1148,  6,  6,  9,  9,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10,  9,  4, 56, 56, 27, 27, 13, 13,  2,  2,  5, 17, 23,  1, 61,  4,  0,  7,  6, {73,76,83},      2,     1,     7,     5,     6 }, // English/Latin/Israel
+    {     31,     7,   107,    0,    0,  208,  208,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,    0,  259,   10,   22,    0,    0,   56,   56,   83,   83,   68,   65,    0,    5,   22,    6, 5014,    4,    0,  756, 1154,  6,  6,  9,  9,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17,  6, 12,  7, 56, 56, 27, 27, 13, 13,  2,  2,  5, 17, 23,  1, 52,  4,  0,  7,  7, {74,77,68},      2,     1,     7,     6,     7 }, // English/Latin/Jamaica
+    {     31,     7,   111,    0,    0,  208,  208,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,    0,   45,    0,    0,    0,    0,   56,   56,   83,   83,   68,   65,    0,    5,   22,    2, 5066,    4,    0,  756, 1161,  6,  6,  9,  9,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 10,  5, 56, 56, 27, 27, 13, 13,  2,  2,  5, 17, 23,  3, 52,  4,  0,  7,  5, {75,69,83},      2,     1,     7,     6,     7 }, // English/Latin/Kenya
+    {     31,     7,   112,    0,    0,  208,  208,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,    0,   45,   10,   22,    0,    0,   56,   56,   83,   83,   68,   65,    0,    5,   22,    6, 3763,    4,    0,  756, 1166,  6,  6,  9,  9,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 12,  7, 56, 56, 27, 27, 13, 13,  2,  2,  5, 17, 23,  1, 58,  4,  0,  7,  8, {65,85,68},      2,     1,     1,     6,     7 }, // English/Latin/Kiribati
+    {     31,     7,   120,    0,    0,  208,  208,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,    0,   45,   10,   22,    0,    0,   56,   56,   83,   83,   68,   65,    0,    5,   22,    5, 5118,    4,    0,  756, 1174,  6,  6,  9,  9,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 12,  7, 56, 56, 27, 27, 13, 13,  2,  2,  5, 17, 23,  1, 60,  4,  0,  7,  7, {90,65,82},      2,     1,     1,     6,     7 }, // English/Latin/Lesotho
+    {     31,     7,   121,    0,    0,  208,  208,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,    0,   45,   10,   22,    0,    0,   56,   56,   83,   83,   68,   65,    0,    5,   22,    6, 5178,    4,    0,  756, 1181,  6,  6,  9,  9,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 12,  7, 56, 56, 27, 27, 13, 13,  2,  2,  5, 17, 23,  1, 52,  4,  0,  7,  7, {76,82,68},      2,     1,     1,     6,     7 }, // English/Latin/Liberia
+    {     31,     7,   126,    0,    0,  208,  208,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,    0,   45,   10,   22,    0,    0,   56,   56,   83,   83,   68,   65,    0,    5,   22,  134, 5230,    4,    0,  756, 1188,  6,  6,  9,  9,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 12,  7, 56, 56, 27, 27, 13, 13,  2,  2,  5, 17, 23,  4, 52,  4,  0,  7, 15, {77,79,80},      2,     1,     7,     6,     7 }, // English/Latin/Macau
+    {     31,     7,   128,    0,    0,  208,  208,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,    0,   45,    0,    0,    0,    0,   56,   56,   83,   83,   68,   65,    0,    5,   22,  166, 5282,    4,    0,  756, 1203,  6,  6,  9,  9,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 10,  5, 56, 56, 27, 27, 13, 13,  2,  2,  5, 17, 23,  2, 53,  4,  0,  7, 10, {77,71,65},      0,     0,     1,     6,     7 }, // English/Latin/Madagascar
+    {     31,     7,   129,    0,    0,  208,  208,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,    0,   45,   10,   22,    0,    0,   56,   56,   83,   83,   68,   65,    0,    5,   22,  142, 5335,    4,    0,  756, 1213,  6,  6,  9,  9,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 12,  7, 56, 56, 27, 27, 13, 13,  2,  2,  5, 17, 23,  2, 52,  4,  0,  7,  6, {77,87,75},      2,     1,     1,     6,     7 }, // English/Latin/Malawi
+    {     31,     7,   130,    0,    0,  208,  208,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,    0,   45,   10,   22,    0,    0,   56,   56,   83,   83,   68,   65,    0,    5,   22,  168, 5387,    4,    0,  756, 1219,  6,  6,  9,  9,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 12,  7, 56, 56, 27, 27, 13, 13,  2,  2,  5, 17, 23,  2, 58,  4,  0,  7,  8, {77,89,82},      2,     1,     1,     6,     7 }, // English/Latin/Malaysia
+    {     31,     7,   133,    0,    0,  208,  208,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,    0,   45,    0,    0,    0,    0,   56,   56,   83,   83,   68,   65,    0,    5,   22,   14, 3821,    4,    0,  756, 1227,  6,  6,  9,  9,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 10,  5, 56, 56, 27, 27, 13, 13,  2,  2,  5, 17, 23,  1, 19,  4,  0,  7,  5, {69,85,82},      2,     1,     7,     6,     7 }, // English/Latin/Malta
+    {     31,     7,   134,    0,    0,  198,  208,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,   27,  521,   10,   22,    0,    0,   56,   56,   83,   83,    0,    0,    0,    5,   22,    6, 3659,    4,    0,  756, 1232,  6,  6, 10,  9,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 18,  6, 12,  7, 56, 56, 27, 27, 13, 13,  2,  2,  5, 17, 23,  1, 34,  4,  0,  7, 16, {85,83,68},      2,     1,     7,     6,     7 }, // English/Latin/Marshall Islands
+    {     31,     7,   137,    0,    0,  208,  208,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,    0,   45,    0,    0,    0,    0,   56,   56,   83,   83,   68,   65,    0,    5,   22,  170, 5445,    4,    0,  756, 1248,  6,  6,  9,  9,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 10,  5, 56, 56, 27, 27, 13, 13,  2,  2,  5, 17, 23,  2, 52,  4,  0,  7,  9, {77,85,82},      2,     0,     1,     6,     7 }, // English/Latin/Mauritius
+    {     31,     7,   140,    0,    0,  208,  208,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,    0,   45,   10,   22,    0,    0,   56,   56,   83,   83,   68,   65,    0,    5,   22,  156, 3659,    4,    0,  756, 1257,  6,  6,  9,  9,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 12,  7, 56, 56, 27, 27, 13, 13,  2,  2,  5, 17, 23,  3, 34,  4,  0,  7, 10, {85,83,68},      2,     1,     1,     6,     7 }, // English/Latin/Micronesia
+    {     31,     7,   144,    0,    0,  208,  208,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,    0,   45,    0,    0,    0,    0,   56,   56,   83,   83,   68,   65,    0,    5,   22,    6, 3693,    4,    0,  756, 1267,  6,  6,  9,  9,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 10,  5, 56, 56, 27, 27, 13, 13,  2,  2,  5, 17, 23,  1, 70,  4,  0,  7, 10, {88,67,68},      2,     1,     1,     6,     7 }, // English/Latin/Montserrat
+    {     31,     7,   148,    0,    0,  208,  208,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,    0,   45,   10,   22,    0,    0,   56,   56,   83,   83,   68,   65,    0,    5,   22,    6, 5497,    4,    0,  756, 1277,  6,  6,  9,  9,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 12,  7, 56, 56, 27, 27, 13, 13,  2,  2,  5, 17, 23,  1, 52,  4,  0,  7,  7, {78,65,68},      2,     1,     1,     6,     7 }, // English/Latin/Namibia
+    {     31,     7,   149,    0,    0,  208,  208,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,    0,   45,    0,    0,    0,    0,   56,   56,   83,   83,   68,   65,    0,    5,   22,    6, 3763,    4,    0,  756, 1284,  6,  6,  9,  9,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 10,  5, 56, 56, 27, 27, 13, 13,  2,  2,  5, 17, 23,  1, 58,  4,  0,  7,  5, {65,85,68},      2,     1,     1,     6,     7 }, // English/Latin/Nauru
+    {     31,     7,   151,    0,    0,  208,  208,    6,    1,    0,    2,    3,    4,    5,    9,   10,   11,   12,   13,    0,   45,    0,    0,    0,    0,   56,   56,   83,   83,   68,   65,    0,    5,   22,   14, 3821,    8,   23,  756, 1289,  6,  6,  9,  9,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 10,  5, 56, 56, 27, 27, 13, 13,  2,  2,  5, 17, 23,  1, 19,  5,  6,  7, 11, {69,85,82},      2,     1,     1,     6,     7 }, // English/Latin/Netherlands
+    {     31,     7,   154,    0,    0,  208,  208,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,    0,   46,   10,   22,    0,    0,   56,   56,   83,   83,   68,   65,    0,    5,   22,    6, 4350,    4,    0,  756, 1300,  6,  6,  9,  9,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17,  7, 12,  7, 56, 56, 27, 27, 13, 13,  2,  2,  5, 17, 23,  1, 61,  4,  0,  7, 11, {78,90,68},      2,     1,     1,     6,     7 }, // English/Latin/New Zealand
+    {     31,     7,   157,    0,    0,  208,  208,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,    0,   45,    0,    0,    0,    0,   56,   56,   83,   83,   68,   65,    0,    5,   22,  172, 5549,    4,    0,  756, 1311,  6,  6,  9,  9,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 10,  5, 56, 56, 27, 27, 13, 13,  2,  2,  5, 17, 23,  1, 49,  4,  0,  7,  7, {78,71,78},      2,     1,     1,     6,     7 }, // English/Latin/Nigeria
+    {     31,     7,   158,    0,    0,  208,  208,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,    0,   45,    0,    0,    0,    0,   56,   56,   83,   83,   68,   65,    0,    5,   22,    6, 4350,    4,    0,  756, 1318,  6,  6,  9,  9,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 10,  5, 56, 56, 27, 27, 13, 13,  2,  2,  5, 17, 23,  1, 61,  4,  0,  7,  4, {78,90,68},      2,     1,     1,     6,     7 }, // English/Latin/Niue
+    {     31,     7,   159,    0,    0,  208,  208,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,    0,   45,    0,    0,    0,    0,   56,   56,   83,   83,   68,   65,    0,    5,   22,    6, 3763,    4,    0,  756, 1322,  6,  6,  9,  9,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 10,  5, 56, 56, 27, 27, 13, 13,  2,  2,  5, 17, 23,  1, 58,  4,  0,  7, 14, {65,85,68},      2,     1,     1,     6,     7 }, // English/Latin/Norfolk Island
+    {     31,     7,   160,    0,    0,  198,  208,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,   27,  521,   10,   22,    0,    0,   56,   56,   83,   83,    0,    0,    0,    5,   22,    6, 3659,    4,    0,  756, 1336,  6,  6, 10,  9,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 18,  6, 12,  7, 56, 56, 27, 27, 13, 13,  2,  2,  5, 17, 23,  1, 34,  4,  0,  7, 24, {85,83,68},      2,     1,     1,     6,     7 }, // English/Latin/Northern Mariana Islands
+    {     31,     7,   163,    0,    0,  208,  208,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,    0,   45,   10,   22,    0,    0,   56,   56,   83,   83,   68,   65,    0,    5,   22,  170, 5598,    4,    0,  756, 1360,  6,  6,  9,  9,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 12,  7, 56, 56, 27, 27, 13, 13,  2,  2,  5, 17, 23,  2, 52,  4,  0,  7,  8, {80,75,82},      2,     0,     7,     6,     7 }, // English/Latin/Pakistan
+    {     31,     7,   164,    0,    0,  208,  208,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,    0,   45,   10,   22,    0,    0,   56,   56,   83,   83,   68,   65,    0,    5,   22,  156, 3659,    4,    0,  756, 1368,  6,  6,  9,  9,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 12,  7, 56, 56, 27, 27, 13, 13,  2,  2,  5, 17, 23,  3, 34,  4,  0,  7,  5, {85,83,68},      2,     1,     1,     6,     7 }, // English/Latin/Palau
+    {     31,     7,   167,    0,    0,  208,  208,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,    0,   45,   10,   22,    0,    0,   56,   56,   83,   83,   68,   65,    0,    5,   22,    2, 5650,    4,    0,  756, 1373,  6,  6,  9,  9,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 12,  7, 56, 56, 27, 27, 13, 13,  2,  2,  5, 17, 23,  1, 72,  4,  0,  7, 16, {80,71,75},      2,     1,     1,     6,     7 }, // English/Latin/Papua New Guinea
+    {     31,     7,   170,    0,    0,  208,  208,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,    0,   45,   10,   22,    0,    0,   56,   56,   83,   83,   68,   65,    0,    5,   22,  173, 5722,    4,    0,  756, 1389,  6,  6,  9,  9,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 12,  7, 56, 56, 27, 27, 13, 13,  2,  2,  5, 17, 23,  1, 52,  4,  0,  7, 11, {80,72,80},      2,     1,     7,     6,     7 }, // English/Latin/Philippines
+    {     31,     7,   171,    0,    0,  208,  208,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,    0,   45,    0,    0,    0,    0,   56,   56,   83,   83,   68,   65,    0,    5,   22,    6, 4350,    4,    0,  756, 1400,  6,  6,  9,  9,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 10,  5, 56, 56, 27, 27, 13, 13,  2,  2,  5, 17, 23,  1, 61,  4,  0,  7, 16, {78,90,68},      2,     1,     1,     6,     7 }, // English/Latin/Pitcairn
+    {     31,     7,   174,    0,    0,  198,  208,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,   27,  521,   10,   22,    0,    0,   56,   56,   83,   83,    0,    0,    0,    5,   22,    6, 3659,    4,    0,  756, 1416,  6,  6, 10,  9,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 18,  6, 12,  7, 56, 56, 27, 27, 13, 13,  2,  2,  5, 17, 23,  1, 34,  4,  0,  7, 11, {85,83,68},      2,     1,     7,     6,     7 }, // English/Latin/Puerto Rico
+    {     31,     7,   179,    0,    0,  208,  208,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,    0,   45,    0,    0,    0,    0,   56,   56,   83,   83,   68,   65,    0,    5,   22,  174, 5774,    4,    0,  756, 1427,  6,  6,  9,  9,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 10,  5, 56, 56, 27, 27, 13, 13,  2,  2,  5, 17, 23,  2, 46,  4,  0,  7,  6, {82,87,70},      0,     0,     1,     6,     7 }, // English/Latin/Rwanda
+    {     31,     7,   180,    0,    0,  208,  208,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,    0,   45,   10,   22,    0,    0,   56,   56,   83,   83,   68,   65,    0,    5,   22,    6, 3693,    4,    0,  756, 1433,  6,  6,  9,  9,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 12,  7, 56, 56, 27, 27, 13, 13,  2,  2,  5, 17, 23,  1, 70,  4,  0,  7, 16, {88,67,68},      2,     1,     1,     6,     7 }, // English/Latin/Saint Kitts And Nevis
+    {     31,     7,   181,    0,    0,  208,  208,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,    0,   45,   10,   22,    0,    0,   56,   56,   83,   83,   68,   65,    0,    5,   22,    6, 3693,    4,    0,  756, 1449,  6,  6,  9,  9,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 12,  7, 56, 56, 27, 27, 13, 13,  2,  2,  5, 17, 23,  1, 70,  4,  0,  7,  8, {88,67,68},      2,     1,     1,     6,     7 }, // English/Latin/Saint Lucia
+    {     31,     7,   182,    0,    0,  208,  208,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,    0,   45,   10,   22,    0,    0,   56,   56,   83,   83,   68,   65,    0,    5,   22,    6, 3693,    4,    0,  756, 1457,  6,  6,  9,  9,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 12,  7, 56, 56, 27, 27, 13, 13,  2,  2,  5, 17, 23,  1, 70,  4,  0,  7, 23, {88,67,68},      2,     1,     1,     6,     7 }, // English/Latin/Saint Vincent And The Grenadines
+    {     31,     7,   183,    0,    0,  208,  208,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,    0,   45,   10,   22,    0,    0,   56,   56,   83,   83,   68,   65,    0,    5,   22,  176, 5820,    4,    0,  756,  785,  6,  6,  9,  9,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 12,  7, 56, 56, 27, 27, 13, 13,  2,  2,  5, 17, 23,  3, 39,  4,  0,  7,  5, {87,83,84},      2,     1,     7,     6,     7 }, // English/Latin/Samoa
+    {     31,     7,   188,    0,    0,  208,  208,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,    0,   45,    0,    0,    0,    0,   56,   56,   83,   83,   68,   65,    0,    5,   22,  179, 5859,    4,    0,  756, 1480,  6,  6,  9,  9,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 10,  5, 56, 56, 27, 27, 13, 13,  2,  2,  5, 17, 23,  2, 58,  4,  0,  7, 10, {83,67,82},      2,     1,     1,     6,     7 }, // English/Latin/Seychelles
+    {     31,     7,   189,    0,    0,  208,  208,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,    0,   45,   10,   22,    0,    0,   56,   56,   83,   83,   68,   65,    0,    5,   22,    7, 5917,    4,    0,  756, 1490,  6,  6,  9,  9,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 12,  7, 56, 56, 27, 27, 13, 13,  2,  2,  5, 17, 23,  2, 67,  4,  0,  7, 12, {83,76,76},      0,     0,     1,     6,     7 }, // English/Latin/Sierra Leone
+    {     31,     7,   190,    0,    0,  208,  208,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,    0,  259,   10,   22,    0,    0,   56,   56,   83,   83,   68,   65,    0,    5,   22,    6, 5984,    4,    0,  756, 1502,  6,  6,  9,  9,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17,  6, 12,  7, 56, 56, 27, 27, 13, 13,  2,  2,  5, 17, 23,  1, 55,  4,  0,  7,  9, {83,71,68},      2,     1,     7,     6,     7 }, // English/Latin/Singapore
+    {     31,     7,   192,    0,    0,  208,  208,    6,    1,    0,    2,    3,    4,    5,    6,   10,   11,   12,   13,    0,   45,    0,    0,    0,    0,   56,   56,   83,   83,   68,   65,    0,    5,   22,   14, 3821,   13,   29,  756, 1511,  6,  6,  9,  9,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 10,  5, 56, 56, 27, 27, 13, 13,  2,  2,  5, 17, 23,  1, 19,  5,  7,  7,  8, {69,85,82},      2,     1,     1,     6,     7 }, // English/Latin/Slovenia
+    {     31,     7,   193,    0,    0,  208,  208,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,    0,   45,   10,   22,    0,    0,   56,   56,   83,   83,   68,   65,    0,    5,   22,    6, 6039,    4,    0,  756, 1519,  6,  6,  9,  9,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 12,  7, 56, 56, 27, 27, 13, 13,  2,  2,  5, 17, 23,  1, 73,  4,  0,  7, 15, {83,66,68},      2,     1,     1,     6,     7 }, // English/Latin/Solomon Islands
+    {     31,     7,   195,    0,    0,  208,  208,    6,    1,   14,    2,    3,    4,    5,    9,   10,   11,   12,   13,  527,  545,    0,    0,    0,    0,   56,   56,   83,   83,   68,   65,    0,    5,   22,    5, 5118,    4,    0,  756, 1534,  6,  6,  9,  9,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 18, 10, 10,  5, 56, 56, 27, 27, 13, 13,  2,  2,  5, 17, 23,  1, 60,  4,  0,  7, 12, {90,65,82},      2,     1,     7,     6,     7 }, // English/Latin/South Africa
+    {     31,     7,   199,    0,    0,  208,  208,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,    0,   45,    0,    0,    0,    0,   56,   56,   83,   83,   68,   65,    0,    5,   22,  117, 6112,    4,    0,  756, 1546,  6,  6,  9,  9,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 10,  5, 56, 56, 27, 27, 13, 13,  2,  2,  5, 17, 23,  1, 52,  4,  0,  7,  9, {83,72,80},      2,     1,     1,     6,     7 }, // English/Latin/Saint Helena
+    {     31,     7,   201,    0,    0,  208,  208,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,    0,   45,   10,   22,    0,    0,   56,   56,   83,   83,   68,   65,    0,    5,   22,    0, 6164,    4,    0,  756, 1555,  6,  6,  9,  9,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 12,  7, 56, 56, 27, 27, 13, 13,  2,  2,  5, 17, 23,  0, 49,  4,  0,  7,  5, {83,68,71},      2,     1,     6,     5,     6 }, // English/Latin/Sudan
+    {     31,     7,   204,    0,    0,  208,  208,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,    0,   45,   10,   22,    0,    0,   56,   56,   83,   83,   68,   65,    0,    5,   22,  181, 6213,    4,    0,  756, 1560,  6,  6,  9,  9,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 12,  7, 56, 56, 27, 27, 13, 13,  2,  2,  5, 17, 23,  1, 52,  4,  0,  7,  8, {83,90,76},      2,     1,     1,     6,     7 }, // English/Latin/Swaziland
+    {     31,     7,   205,    0,    0,  208,  208,    6,    1,   14,    2,    3,    4,    5,   47,   10,   11,   12,   13,    0,   70,    0,    0,    0,    0,   56,   56,   83,   83,   68,   65,    0,    5,   22,  145, 6265,   13,    0,  756, 1568,  6,  6,  9,  9,  1,  1,  1,  1,  1,  1,  1,  4,  1,  1,  1,  1, 17, 10, 10,  5, 56, 56, 27, 27, 13, 13,  2,  2,  5, 17, 23,  2, 46,  5,  0,  7,  6, {83,69,75},      2,     0,     1,     6,     7 }, // English/Latin/Sweden
+    {     31,     7,   206,    0,    0,  208,  208,    6,    0,   13,    2,    3,    4,    5,    9,   10,   11,   12,   13,    0,   45,    0,    0,    0,    0,   56,   56,   83,   83,   68,   65,    0,    5,   22,    0, 6311,    8,   36,  756, 1574,  6,  6,  9,  9,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 10,  5, 56, 56, 27, 27, 13, 13,  2,  2,  5, 17, 23,  0, 40,  5,  5,  7, 11, {67,72,70},      2,     0,     1,     6,     7 }, // English/Latin/Switzerland
+    {     31,     7,   210,    0,    0,  208,  208,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,    0,   45,    0,    0,    0,    0,   56,   56,   83,   83,   68,   65,    0,    5,   22,  182, 6351,    4,    0,  756, 1585,  6,  6,  9,  9,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 10,  5, 56, 56, 27, 27, 13, 13,  2,  2,  5, 17, 23,  3, 61,  4,  0,  7,  8, {84,90,83},      2,     0,     1,     6,     7 }, // English/Latin/Tanzania
+    {     31,     7,   213,    0,    0,  208,  208,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,    0,   45,    0,    0,    0,    0,   56,   56,   83,   83,   68,   65,    0,    5,   22,    6, 4350,    4,    0,  756, 1593,  6,  6,  9,  9,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 10,  5, 56, 56, 27, 27, 13, 13,  2,  2,  5, 17, 23,  1, 61,  4,  0,  7,  7, {78,90,68},      2,     1,     1,     6,     7 }, // English/Latin/Tokelau
+    {     31,     7,   214,    0,    0,  208,  208,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,    0,   45,   10,   22,    0,    0,   56,   56,   83,   83,   68,   65,    0,    5,   22,  185, 6412,    4,    0,  756, 1600,  6,  6,  9,  9,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 12,  7, 56, 56, 27, 27, 13, 13,  2,  2,  5, 17, 23,  2, 48,  4,  0,  7,  5, {84,79,80},      2,     1,     1,     6,     7 }, // English/Latin/Tonga
+    {     31,     7,   215,    0,    0,  208,  208,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,    0,   45,   10,   22,    0,    0,   56,   56,   83,   83,   68,   65,    0,    5,   22,    6, 6460,    4,    0,  756, 1605,  6,  6,  9,  9,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 12,  7, 56, 56, 27, 27, 13, 13,  2,  2,  5, 17, 23,  1, 79,  4,  0,  7, 17, {84,84,68},      2,     1,     7,     6,     7 }, // English/Latin/Trinidad And Tobago
+    {     31,     7,   219,    0,    0,  208,  208,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,    0,   45,   10,   22,    0,    0,   56,   56,   83,   83,   68,   65,    0,    5,   22,  156, 3659,    4,    0,  756, 1622,  6,  6,  9,  9,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 12,  7, 56, 56, 27, 27, 13, 13,  2,  2,  5, 17, 23,  3, 34,  4,  0,  7, 22, {85,83,68},      2,     1,     1,     6,     7 }, // English/Latin/Turks And Caicos Islands
+    {     31,     7,   220,    0,    0,  208,  208,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,    0,   45,    0,    0,    0,    0,   56,   56,   83,   83,   68,   65,    0,    5,   22,    6, 3763,    4,    0,  756, 1644,  6,  6,  9,  9,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 10,  5, 56, 56, 27, 27, 13, 13,  2,  2,  5, 17, 23,  1, 58,  4,  0,  7,  6, {65,85,68},      2,     1,     1,     6,     7 }, // English/Latin/Tuvalu
+    {     31,     7,   221,    0,    0,  208,  208,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,    0,   45,    0,    0,    0,    0,   56,   56,   83,   83,   68,   65,    0,    5,   22,  187, 6539,    4,    0,  756, 1650,  6,  6,  9,  9,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 10,  5, 56, 56, 27, 27, 13, 13,  2,  2,  5, 17, 23,  3, 55,  4,  0,  7,  6, {85,71,88},      0,     0,     1,     7,     7 }, // English/Latin/Uganda
+    {     31,     7,   223,    0,    0,  198,  208,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,    0,   45,   10,   22,    0,    0,   56,   56,   83,   83,    0,    0,    0,    5,   22,  190, 6594,    4,    0,  756, 1656,  6,  6, 10,  9,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 12,  7, 56, 56, 27, 27, 13, 13,  2,  2,  5, 17, 23,  3, 54,  4,  0,  7, 20, {65,69,68},      2,     1,     6,     5,     6 }, // English/Latin/United Arab Emirates
+    {     31,     7,   224,    0,    0,  208,  208,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,    0,   45,    0,    0,    0,    0,   56,   56,   83,   83,   68,   65,    0,    5,   22,  117, 6648,    4,    0, 1676, 1691,  6,  6,  9,  9,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 10,  5, 56, 56, 27, 27, 13, 13,  2,  2,  5, 17, 23,  1, 46,  4,  0, 15, 14, {71,66,80},      2,     1,     1,     6,     7 }, // English/Latin/United Kingdom
+    {     31,     7,   226,    0,    0,  198,  208,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,   27,  521,   10,   22,    0,    0,   56,   56,   83,   83,    0,    0,    0,    5,   22,    6, 3659,    4,    0,  756, 1705,  6,  6, 10,  9,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 18,  6, 12,  7, 56, 56, 27, 27, 13, 13,  2,  2,  5, 17, 23,  1, 34,  4,  0,  7, 21, {85,83,68},      2,     1,     7,     6,     7 }, // English/Latin/United States Minor Outlying Islands
+    {     31,     7,   229,    0,    0,  208,  208,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,    0,   45,   10,   22,    0,    0,   56,   56,   83,   83,   68,   65,    0,    5,   22,  193, 6694,    4,    0,  756, 1726,  6,  6,  9,  9,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 12,  7, 56, 56, 27, 27, 13, 13,  2,  2,  5, 17, 23,  2, 43,  4,  0,  7,  7, {86,85,86},      0,     0,     1,     6,     7 }, // English/Latin/Vanuatu
+    {     31,     7,   233,    0,    0,  208,  208,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,    0,   45,   10,   22,    0,    0,   56,   56,   83,   83,   68,   65,    0,    5,   22,  156, 3659,    4,    0,  756, 1733,  6,  6,  9,  9,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 12,  7, 56, 56, 27, 27, 13, 13,  2,  2,  5, 17, 23,  3, 34,  4,  0,  7, 22, {85,83,68},      2,     1,     1,     6,     7 }, // English/Latin/British Virgin Islands
+    {     31,     7,   234,    0,    0,  198,  208,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,   27,  521,   10,   22,    0,    0,   56,   56,   83,   83,    0,    0,    0,    5,   22,    6, 3659,    4,    0,  756, 1755,  6,  6, 10,  9,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 18,  6, 12,  7, 56, 56, 27, 27, 13, 13,  2,  2,  5, 17, 23,  1, 34,  4,  0,  7, 19, {85,83,68},      2,     1,     7,     6,     7 }, // English/Latin/United States Virgin Islands
+    {     31,     7,   239,    0,    0,  208,  208,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,    0,   45,   10,   22,    0,    0,   56,   56,   83,   83,   68,   65,    0,    5,   22,    2, 6737,    4,    0,  756, 1774,  6,  6,  9,  9,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 12,  7, 56, 56, 27, 27, 13, 13,  2,  2,  5, 17, 23,  1, 49,  4,  0,  7,  6, {90,77,87},      2,     1,     1,     6,     7 }, // English/Latin/Zambia
+    {     31,     7,   240,    0,    0,  208,  208,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,  527,  398,    0,    0,    0,    0,   56,   56,   83,   83,   68,   65,    0,    5,   22,  156, 3659,    4,    0,  756, 1780,  6,  6,  9,  9,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 18,  8, 10,  5, 56, 56, 27, 27, 13, 13,  2,  2,  5, 17, 23,  3, 34,  4,  0,  7,  8, {85,83,68},      2,     1,     7,     6,     7 }, // English/Latin/Zimbabwe
+    {     31,     7,   249,    0,    0,  208,  208,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,    0,   45,    0,    0,    0,    0,   56,   56,   83,   83,   68,   65,    0,    5,   22,  156, 3659,    4,    0,  756, 1788,  6,  6,  9,  9,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 10,  5, 56, 56, 27, 27, 13, 13,  2,  2,  5, 17, 23,  3, 34,  4,  0,  7, 12, {85,83,68},      2,     1,     1,     6,     7 }, // English/Latin/Diego Garcia
+    {     31,     7,   251,    0,    0,  208,  208,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,    0,   45,    0,    0,    0,    0,   56,   56,   83,   83,   68,   65,    0,    5,   22,  117, 4622,    4,    0,  756, 1800,  6,  6,  9,  9,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 10,  5, 56, 56, 27, 27, 13, 13,  2,  2,  5, 17, 23,  1, 31,  4,  0,  7, 11, {71,66,80},      2,     1,     1,     6,     7 }, // English/Latin/Isle Of Man
+    {     31,     7,   252,    0,    0,  208,  208,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,    0,   45,    0,    0,    0,    0,   56,   56,   83,   83,   68,   65,    0,    5,   22,  117, 4622,    4,    0,  756, 1811,  6,  6,  9,  9,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 10,  5, 56, 56, 27, 27, 13, 13,  2,  2,  5, 17, 23,  1, 31,  4,  0,  7,  6, {71,66,80},      2,     1,     1,     6,     7 }, // English/Latin/Jersey
+    {     31,     7,   254,    0,    0,  208,  208,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,    0,   45,   10,   22,    0,    0,   56,   56,   83,   83,   68,   65,    0,    5,   22,  117, 6786,    4,    0,  756, 1817,  6,  6,  9,  9,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 12,  7, 56, 56, 27, 27, 13, 13,  2,  2,  5, 17, 23,  1, 67,  4,  0,  7, 11, {83,83,80},      2,     1,     1,     6,     7 }, // English/Latin/South Sudan
+    {     31,     7,   256,    0,    0,  208,  208,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,    0,   45,    0,    0,    0,    0,   56,   56,   83,   83,   68,   65,    0,    5,   22,  152, 6853,    4,    0,  756, 1828,  6,  6,  9,  9,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 10,  5, 56, 56, 27, 27, 13, 13,  2,  2,  5, 17, 23,  4, 94,  4,  0,  7, 12, {65,78,71},      2,     1,     1,     6,     7 }, // English/Latin/Sint Maarten
+    {     31,     7,   260,    0,    0,  208,  208,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,    0,   45,   10,   22,    0,    0,   56,   56,   83,   83,   68,   65,    0,    5,   22,    0,    0,    4,    0,  756, 1840,  6,  6,  9,  9,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 12,  7, 56, 56, 27, 27, 13, 13,  2,  2,  5, 17, 23,  0,  0,  4,  0,  7,  5,    {0,0,0},      2,     1,     1,     6,     7 }, // English/Latin/World
+    {     31,     7,   261,    0,    0,  208,  208,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,    0,   45,    0,    0,    0,    0,   56,   56,   83,   83,   68,   65,    0,    5,   22,    0,    0,   13,    0,  756, 1845,  6,  6,  9,  9,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 10,  5, 56, 56, 27, 27, 13, 13,  2,  2,  5, 17, 23,  0,  0,  5,  0,  7,  6,    {0,0,0},      2,     1,     1,     6,     7 }, // English/Latin/Europe
+    {     32,     7,   260,    0,    0,  217,  217,    6,    1,   14,    2,    3,   38,    5,    9,   10,   11,   12,   13,  555,   72,  185,    0, 2446, 2446, 2496, 2496, 2516, 2516,   70,   67,  327,    5,   22,    0,    0,   41,    0, 1851, 1860,  6,  6,  9,  9,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 26,  8, 25,  5, 50, 50, 20, 20, 13, 13,  3,  3,  6, 17, 23,  0,  0,  6,  0,  9,  5,    {0,0,0},      2,     1,     1,     6,     7 }, // Esperanto/Latin/World
+    {     33,     7,    68,    0,    0,  226,  226,    6,    1,   14,    2,    3,   38,    5,   47,   40,   10,   46,   12,  420,  166,    0,    0, 2529, 2529, 2591, 2591, 2591, 2591,    0,    0,  333,    5,   22,   14, 6947,   13,    0, 1865, 1870,  6,  6,  8,  8,  1,  1,  1,  1,  1,  1,  1,  4,  1,  1,  1,  1, 18,  8, 10,  5, 62, 62, 13, 13, 13, 13,  2,  2,  6, 17, 23,  1, 19,  5,  0,  5,  5, {69,85,82},      2,     1,     1,     6,     7 }, // Estonian/Latin/Estonia
+    {     34,     7,    71,    0,    0,  190,  190,    6,    1,    0,    2,    3,   38,    5,    9,   10,   11,   12,   13,  420,  166,    0,    0, 2604, 2604, 2677, 2704, 2738, 2738,    0,    0,  339,    5,   22,  145, 6966,   13,    0, 1875, 1883,  6,  6,  8,  8,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 18,  8, 10,  5, 73, 73, 27, 34, 13, 13,  2,  2,  3, 17, 23,  2, 42,  5,  0,  8,  7, {68,75,75},      2,     0,     1,     6,     7 }, // Faroese/Latin/Faroe Islands
+    {     34,     7,    58,    0,    0,  190,  190,    6,    1,    0,    2,    3,   38,    5,    9,   10,   11,   12,   13,  420,  166,    0,    0, 2604, 2604, 2677, 2704, 2738, 2738,    0,    0,  339,    5,   22,  145, 6966,   13,    0, 1875,  665,  6,  6,  8,  8,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 18,  8, 10,  5, 73, 73, 27, 34, 13, 13,  2,  2,  3, 17, 23,  3, 42,  5,  0,  8,  7, {68,75,75},      2,     0,     1,     6,     7 }, // Faroese/Latin/Denmark
+    {     36,     7,    73,    0,    0,  226,  226,    6,    1,   14,    2,    3,   38,    5,    9,   11,   11,   13,   13,  461,  581,  176,  167, 2751, 2817, 2897, 2897, 2917, 2917,   73,   70,  342,  347,  364,   14, 7008,   13,    0, 1890, 1895,  6,  6,  8,  8,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17,  8,  9,  4, 66, 80, 20, 20, 13, 13,  3,  3,  5, 17, 23,  1, 19,  5,  0,  5,  5, {69,85,82},      2,     1,     1,     6,     7 }, // Finnish/Latin/Finland
+    {     37,     7,    74,    0,    0,  234,  234,    6,    1,   51,    2,    3,    4,    5,    9,   15,   16,   15,   16,   97,   45,    0,    0, 2930, 2930, 2981, 2981, 3015, 3015,    0,    0,  387,  213,  230,   14, 3032,   13,    0, 1900, 1908,  6,  6,  8,  8,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 16, 10, 10,  5, 51, 51, 34, 34, 13, 13,  2,  2,  6, 17, 23,  1, 19,  5,  0,  8,  6, {69,85,82},      2,     1,     1,     6,     7 }, // French/Latin/France
+    {     37,     7,     3,    0,    0,  234,  234,    6,    1,   51,    2,    3,    4,    5,    9,   15,   16,   15,   16,   97,   45,   10,   22, 2930, 2930, 2981, 2981, 3015, 3015,    0,    0,  387,  213,  230,  195, 7027,   13,    0, 1900, 1914,  6,  6,  8,  8,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 16, 10, 12,  7, 51, 51, 34, 34, 13, 13,  2,  2,  6, 17, 23,  2, 50,  5,  0,  8,  7, {68,90,68},      2,     1,     6,     5,     6 }, // French/Latin/Algeria
+    {     37,     7,    21,    0,    0,  234,  234,    6,    1,   51,    2,    3,    4,    5,    9,   15,   16,   15,   16,   97,   46,  210,    0, 2930, 2930, 2981, 2981, 3015, 3015,    0,    0,  387,  213,  230,   14, 3032,   13,    0, 1900, 1921,  6,  6,  8,  8,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 16,  7, 23,  5, 51, 51, 34, 34, 13, 13,  2,  2,  6, 17, 23,  1, 19,  5,  0,  8,  8, {69,85,82},      2,     1,     1,     6,     7 }, // French/Latin/Belgium
+    {     37,     7,    23,    0,    0,  234,  234,    6,    1,   51,    2,    3,    4,    5,    9,   15,   16,   15,   16,   97,   45,    0,    0, 2930, 2930, 2981, 2981, 3015, 3015,    0,    0,  387,  213,  230,   33, 7077,   13,    0, 1900, 1929,  6,  6,  8,  8,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 16, 10, 10,  5, 51, 51, 34, 34, 13, 13,  2,  2,  6, 17, 23,  3, 58,  5,  0,  8,  5, {88,79,70},      0,     0,     1,     6,     7 }, // French/Latin/Benin
+    {     37,     7,    34,    0,    0,  234,  234,    6,    1,   51,    2,    3,    4,    5,    9,   15,   16,   15,   16,   97,   45,    0,    0, 2930, 2930, 2981, 2981, 3015, 3015,    0,    0,  387,  213,  230,   33, 7077,   13,    0, 1900, 1934,  6,  6,  8,  8,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 16, 10, 10,  5, 51, 51, 34, 34, 13, 13,  2,  2,  6, 17, 23,  3, 58,  5,  0,  8, 12, {88,79,70},      0,     0,     1,     6,     7 }, // French/Latin/Burkina Faso
+    {     37,     7,    35,    0,    0,  234,  234,    6,    1,   51,    2,    3,    4,    5,    9,   15,   16,   15,   16,   97,   45,    0,    0, 2930, 2930, 2981, 2981, 3015, 3015,    0,    0,  387,  213,  230,  159, 7135,   13,    0, 1900,  913,  6,  6,  8,  8,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 16, 10, 10,  5, 51, 51, 34, 34, 13, 13,  2,  2,  6, 17, 23,  3, 52,  5,  0,  8,  7, {66,73,70},      0,     0,     1,     6,     7 }, // French/Latin/Burundi
+    {     37,     7,    37,    0,    0,  234,  234,    6,    1,   51,    2,    3,    4,    5,    9,   15,   16,   15,   16,   97,   45,    0,    0, 2930, 2930, 2981, 2981, 3015, 3015,   76,   73,  387,  213,  230,   32, 7187,   13,    0, 1900, 1946,  6,  6,  8,  8,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 16, 10, 10,  5, 51, 51, 34, 34, 13, 13,  5,  4,  6, 17, 23,  4, 55,  5,  0,  8,  8, {88,65,70},      0,     0,     1,     6,     7 }, // French/Latin/Cameroon
+    {     37,     7,    38,    0,    0,  234,  234,    6,    1,   14,    2,    3,    4,    5,    9,   15,   16,   11,   10,   97,   70,  233,  233, 2930, 2930, 2981, 2981, 3015, 3015,   64,   61,  387,  213,  230,    6, 7242,   47,    0, 1954,  944,  6,  6,  8,  8,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 16, 10, 24,  9, 51, 51, 34, 34, 13, 13,  4,  4,  6, 17, 23,  1, 53,  6,  0, 17,  6, {67,65,68},      2,     0,     7,     6,     7 }, // French/Latin/Canada
+    {     37,     7,    41,    0,    0,  234,  234,    6,    1,   51,    2,    3,    4,    5,    9,   15,   16,   15,   16,   97,   45,    0,    0, 2930, 2930, 2981, 2981, 3015, 3015,    0,    0,  387,  213,  230,   32, 7187,   13,    0, 1900, 1971,  6,  6,  8,  8,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 16, 10, 10,  5, 51, 51, 34, 34, 13, 13,  2,  2,  6, 17, 23,  4, 55,  5,  0,  8, 25, {88,65,70},      0,     0,     1,     6,     7 }, // French/Latin/Central African Republic
+    {     37,     7,    42,    0,    0,  234,  234,    6,    1,   51,    2,    3,    4,    5,    9,   15,   16,   15,   16,   97,   45,   10,   22, 2930, 2930, 2981, 2981, 3015, 3015,    0,    0,  387,  213,  230,   32, 7187,   13,    0, 1900, 1996,  6,  6,  8,  8,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 16, 10, 12,  7, 51, 51, 34, 34, 13, 13,  2,  2,  6, 17, 23,  4, 55,  5,  0,  8,  5, {88,65,70},      0,     0,     1,     6,     7 }, // French/Latin/Chad
+    {     37,     7,    48,    0,    0,  234,  234,    6,    1,   51,    2,    3,    4,    5,    9,   15,   16,   15,   16,   97,   45,    0,    0, 2930, 2930, 2981, 2981, 3015, 3015,    0,    0,  387,  213,  230,   33, 7295,   13,    0, 1900, 2001,  6,  6,  8,  8,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 16, 10, 10,  5, 51, 51, 34, 34, 13, 13,  2,  2,  6, 17, 23,  2, 50,  5,  0,  8,  7, {75,77,70},      0,     0,     1,     6,     7 }, // French/Latin/Comoros
+    {     37,     7,    49,    0,    0,  234,  234,    6,    1,   51,    2,    3,    4,    5,    9,   15,   16,   15,   16,   97,   45,    0,    0, 2930, 2930, 2981, 2981, 3015, 3015,    0,    0,  387,  213,  230,   32, 7345,   13,    0, 1900, 2008,  6,  6,  8,  8,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 16, 10, 10,  5, 51, 51, 34, 34, 13, 13,  2,  2,  6, 17, 23,  2, 52,  5,  0,  8, 14, {67,68,70},      2,     1,     1,     6,     7 }, // French/Latin/Congo Kinshasa
+    {     37,     7,    50,    0,    0,  234,  234,    6,    1,   51,    2,    3,    4,    5,    9,   15,   16,   15,   16,   97,   45,    0,    0, 2930, 2930, 2981, 2981, 3015, 3015,    0,    0,  387,  213,  230,   32, 7187,   13,    0, 1900, 2022,  6,  6,  8,  8,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 16, 10, 10,  5, 51, 51, 34, 34, 13, 13,  2,  2,  6, 17, 23,  4, 55,  5,  0,  8, 17, {88,65,70},      0,     0,     1,     6,     7 }, // French/Latin/Congo Brazzaville
+    {     37,     7,    53,    0,    0,  234,  234,    6,    1,   51,    2,    3,    4,    5,    9,   15,   16,   15,   16,   97,   45,    0,    0, 2930, 2930, 2981, 2981, 3015, 3015,    0,    0,  387,  213,  230,   33, 7077,   13,    0, 1900, 2039,  6,  6,  8,  8,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 16, 10, 10,  5, 51, 51, 34, 34, 13, 13,  2,  2,  6, 17, 23,  3, 58,  5,  0,  8, 13, {88,79,70},      0,     0,     1,     6,     7 }, // French/Latin/Ivory Coast
+    {     37,     7,    59,    0,    0,  234,  234,    6,    1,   51,    2,    3,    4,    5,    9,   15,   16,   15,   16,   97,   45,   10,   22, 2930, 2930, 2981, 2981, 3015, 3015,    0,    0,  387,  213,  230,   36, 7397,   13,    0, 1900, 2052,  6,  6,  8,  8,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 16, 10, 12,  7, 51, 51, 34, 34, 13, 13,  2,  2,  6, 17, 23,  3, 56,  5,  0,  8,  8, {68,74,70},      0,     0,     6,     6,     7 }, // French/Latin/Djibouti
+    {     37,     7,    66,    0,    0,  234,  234,    6,    1,   51,    2,    3,    4,    5,    9,   15,   16,   15,   16,   97,   45,    0,    0, 2930, 2930, 2981, 2981, 3015, 3015,    0,    0,  387,  213,  230,   32, 7187,   13,    0, 1900, 2060,  6,  6,  8,  8,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 16, 10, 10,  5, 51, 51, 34, 34, 13, 13,  2,  2,  6, 17, 23,  4, 55,  5,  0,  8, 18, {88,65,70},      0,     0,     1,     6,     7 }, // French/Latin/Equatorial Guinea
+    {     37,     7,    76,    0,    0,  234,  234,    6,    1,   51,    2,    3,    4,    5,    9,   15,   16,   15,   16,   97,   45,    0,    0, 2930, 2930, 2981, 2981, 3015, 3015,    0,    0,  387,  213,  230,   14, 3032,   13,    0, 1900, 2078,  6,  6,  8,  8,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 16, 10, 10,  5, 51, 51, 34, 34, 13, 13,  2,  2,  6, 17, 23,  1, 19,  5,  0,  8, 16, {69,85,82},      2,     1,     1,     6,     7 }, // French/Latin/French Guiana
+    {     37,     7,    77,    0,    0,  234,  234,    6,    1,   51,    2,    3,    4,    5,    9,   15,   16,   15,   16,   97,   45,    0,    0, 2930, 2930, 2981, 2981, 3015, 3015,    0,    0,  387,  213,  230,  197, 7453,   13,    0, 1900, 2094,  6,  6,  8,  8,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 16, 10, 10,  5, 51, 51, 34, 34, 13, 13,  2,  2,  6, 17, 23,  4, 34,  5,  0,  8, 19, {88,80,70},      0,     0,     1,     6,     7 }, // French/Latin/French Polynesia
+    {     37,     7,    79,    0,    0,  234,  234,    6,    1,   51,    2,    3,    4,    5,    9,   15,   16,   15,   16,   97,   45,    0,    0, 2930, 2930, 2981, 2981, 3015, 3015,    0,    0,  387,  213,  230,   32, 7187,   13,    0, 1900, 2113,  6,  6,  8,  8,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 16, 10, 10,  5, 51, 51, 34, 34, 13, 13,  2,  2,  6, 17, 23,  4, 55,  5,  0,  8,  5, {88,65,70},      0,     0,     1,     6,     7 }, // French/Latin/Gabon
+    {     37,     7,    88,    0,    0,  234,  234,    6,    1,   51,    2,    3,    4,    5,    9,   15,   16,   15,   16,   97,   45,    0,    0, 2930, 2930, 2981, 2981, 3015, 3015,    0,    0,  387,  213,  230,   14, 3032,   13,    0, 1900, 2118,  6,  6,  8,  8,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 16, 10, 10,  5, 51, 51, 34, 34, 13, 13,  2,  2,  6, 17, 23,  1, 19,  5,  0,  8, 10, {69,85,82},      2,     1,     1,     6,     7 }, // French/Latin/Guadeloupe
+    {     37,     7,    91,    0,    0,  234,  234,    6,    1,   51,    2,    3,    4,    5,    9,   15,   16,   15,   16,   97,   45,    0,    0, 2930, 2930, 2981, 2981, 3015, 3015,    0,    0,  387,  213,  230,  201, 7487,   13,    0, 1900, 2060,  6,  6,  8,  8,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 16, 10, 10,  5, 51, 51, 34, 34, 13, 13,  2,  2,  6, 17, 23,  2, 47,  5,  0,  8,  6, {71,78,70},      0,     0,     1,     6,     7 }, // French/Latin/Guinea
+    {     37,     7,    94,    0,    0,  234,  234,    6,    1,   51,    2,    3,    4,    5,    9,   15,   16,   15,   16,   97,   45,    0,    0, 2930, 2930, 2981, 2981, 3015, 3015,    0,    0,  387,  213,  230,  163, 7534,   13,    0, 1900, 2128,  6,  6,  8,  8,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 16, 10, 10,  5, 51, 51, 34, 34, 13, 13,  2,  2,  6, 17, 23,  1, 56,  5,  0,  8,  5, {72,84,71},      2,     1,     1,     6,     7 }, // French/Latin/Haiti
+    {     37,     7,   125,    0,    0,  234,  234,    6,    1,    0,    2,    3,    4,    5,    9,   15,   16,   15,   16,   97,   45,    0,    0, 2930, 2930, 2981, 2981, 3015, 3015,    0,    0,  387,  213,  230,   14, 3032,   13,    0, 1900, 2133,  6,  6,  8,  8,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 16, 10, 10,  5, 51, 51, 34, 34, 13, 13,  2,  2,  6, 17, 23,  1, 19,  5,  0,  8, 10, {69,85,82},      2,     1,     1,     6,     7 }, // French/Latin/Luxembourg
+    {     37,     7,   128,    0,    0,  234,  234,    6,    1,   51,    2,    3,    4,    5,    9,   15,   16,   15,   16,   97,   45,    0,    0, 2930, 2930, 2981, 2981, 3015, 3015,    0,    0,  387,  213,  230,  166, 7590,   13,    0, 1900, 1203,  6,  6,  8,  8,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 16, 10, 10,  5, 51, 51, 34, 34, 13, 13,  2,  2,  6, 17, 23,  2, 53,  5,  0,  8, 10, {77,71,65},      0,     0,     1,     6,     7 }, // French/Latin/Madagascar
+    {     37,     7,   132,    0,    0,  234,  234,    6,    1,   51,    2,    3,    4,    5,    9,   15,   16,   15,   16,   97,   45,    0,    0, 2930, 2930, 2981, 2981, 3015, 3015,    0,    0,  387,  213,  230,   33, 7077,   13,    0, 1900, 2143,  6,  6,  8,  8,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 16, 10, 10,  5, 51, 51, 34, 34, 13, 13,  2,  2,  6, 17, 23,  3, 58,  5,  0,  8,  4, {88,79,70},      0,     0,     1,     6,     7 }, // French/Latin/Mali
+    {     37,     7,   135,    0,    0,  234,  234,    6,    1,   51,    2,    3,    4,    5,    9,   15,   16,   15,   16,   97,   45,    0,    0, 2930, 2930, 2981, 2981, 3015, 3015,    0,    0,  387,  213,  230,   14, 3032,   13,    0, 1900, 2147,  6,  6,  8,  8,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 16, 10, 10,  5, 51, 51, 34, 34, 13, 13,  2,  2,  6, 17, 23,  1, 19,  5,  0,  8, 10, {69,85,82},      2,     1,     1,     6,     7 }, // French/Latin/Martinique
+    {     37,     7,   136,    0,    0,  234,  234,    6,    1,   51,    2,    3,    4,    5,    9,   15,   16,   15,   16,   97,   45,   10,   22, 2930, 2930, 2981, 2981, 3015, 3015,    0,    0,  387,  213,  230,  203, 7643,   13,    0, 1900, 2157,  6,  6,  8,  8,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 16, 10, 12,  7, 51, 51, 34, 34, 13, 13,  2,  2,  6, 17, 23,  2, 65,  5,  0,  8, 10, {77,82,85},      2,     1,     1,     6,     7 }, // French/Latin/Mauritania
+    {     37,     7,   137,    0,    0,  234,  234,    6,    1,   51,    2,    3,    4,    5,    9,   15,   16,   15,   16,   97,   45,    0,    0, 2930, 2930, 2981, 2981, 3015, 3015,    0,    0,  387,  213,  230,  170, 7708,   13,    0, 1900, 2167,  6,  6,  8,  8,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 16, 10, 10,  5, 51, 51, 34, 34, 13, 13,  2,  2,  6, 17, 23,  2, 62,  5,  0,  8,  7, {77,85,82},      2,     0,     1,     6,     7 }, // French/Latin/Mauritius
+    {     37,     7,   138,    0,    0,  234,  234,    6,    1,   51,    2,    3,    4,    5,    9,   15,   16,   15,   16,   97,   45,    0,    0, 2930, 2930, 2981, 2981, 3015, 3015,    0,    0,  387,  213,  230,   14, 3032,   13,    0, 1900, 2174,  6,  6,  8,  8,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 16, 10, 10,  5, 51, 51, 34, 34, 13, 13,  2,  2,  6, 17, 23,  1, 19,  5,  0,  8,  7, {69,85,82},      2,     1,     1,     6,     7 }, // French/Latin/Mayotte
+    {     37,     7,   142,    0,    0,  234,  234,    6,    1,   51,    2,    3,    4,    5,    9,   15,   16,   15,   16,   97,   45,    0,    0, 2930, 2930, 2981, 2981, 3015, 3015,    0,    0,  387,  213,  230,   14, 3032,   13,    0, 1900, 2181,  6,  6,  8,  8,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 16, 10, 10,  5, 51, 51, 34, 34, 13, 13,  2,  2,  6, 17, 23,  1, 19,  5,  0,  8,  6, {69,85,82},      2,     1,     1,     6,     7 }, // French/Latin/Monaco
+    {     37,     7,   145,    0,    0,  234,  234,    6,    1,    0,    2,    3,    4,    5,    9,   15,   16,   15,   16,   97,   45,    0,    0, 2930, 2930, 2981, 2981, 3015, 3015,   64,   61,  387,  213,  230,  205, 7770,   13,    0, 1900, 2187,  6,  6,  8,  8,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 16, 10, 10,  5, 51, 51, 34, 34, 13, 13,  4,  4,  6, 17, 23,  3, 53,  5,  0,  8,  5, {77,65,68},      2,     1,     1,     6,     7 }, // French/Latin/Morocco
+    {     37,     7,   153,    0,    0,  234,  234,    6,    1,   51,    2,    3,    4,    5,    9,   15,   16,   15,   16,   97,   45,    0,    0, 2930, 2930, 2981, 2981, 3015, 3015,    0,    0,  387,  213,  230,  197, 7453,   13,    0, 1900, 2192,  6,  6,  8,  8,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 16, 10, 10,  5, 51, 51, 34, 34, 13, 13,  2,  2,  6, 17, 23,  4, 34,  5,  0,  8, 18, {88,80,70},      0,     0,     1,     6,     7 }, // French/Latin/New Caledonia
+    {     37,     7,   156,    0,    0,  234,  234,    6,    1,   51,    2,    3,    4,    5,    9,   15,   16,   15,   16,   97,   45,    0,    0, 2930, 2930, 2981, 2981, 3015, 3015,    0,    0,  387,  213,  230,   33, 7077,   13,    0, 1900, 1311,  6,  6,  8,  8,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 16, 10, 10,  5, 51, 51, 34, 34, 13, 13,  2,  2,  6, 17, 23,  3, 58,  5,  0,  8,  5, {88,79,70},      0,     0,     1,     6,     7 }, // French/Latin/Niger
+    {     37,     7,   176,    0,    0,  234,  234,    6,    1,   51,    2,    3,    4,    5,    9,   15,   16,   15,   16,   97,   45,    0,    0, 2930, 2930, 2981, 2981, 3015, 3015,    0,    0,  387,  213,  230,   14, 3032,   13,    0, 1900, 2210,  6,  6,  8,  8,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 16, 10, 10,  5, 51, 51, 34, 34, 13, 13,  2,  2,  6, 17, 23,  1, 19,  5,  0,  8, 10, {69,85,82},      2,     1,     1,     6,     7 }, // French/Latin/Reunion
+    {     37,     7,   179,    0,    0,  234,  234,    6,    1,   51,    2,    3,    4,    5,    9,   15,   16,   15,   16,   97,   45,    0,    0, 2930, 2930, 2981, 2981, 3015, 3015,    0,    0,  387,  213,  230,  174, 7823,   13,    0, 1900, 1427,  6,  6,  8,  8,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 16, 10, 10,  5, 51, 51, 34, 34, 13, 13,  2,  2,  6, 17, 23,  2, 49,  5,  0,  8,  6, {82,87,70},      0,     0,     1,     6,     7 }, // French/Latin/Rwanda
+    {     37,     7,   187,    0,    0,  234,  234,    6,    1,   51,    2,    3,    4,    5,    9,   15,   16,   15,   16,   97,   45,    0,    0, 2930, 2930, 2981, 2981, 3015, 3015,    0,    0,  387,  213,  230,   33, 7077,   13,    0, 1900, 2220,  6,  6,  8,  8,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 16, 10, 10,  5, 51, 51, 34, 34, 13, 13,  2,  2,  6, 17, 23,  3, 58,  5,  0,  8,  7, {88,79,70},      0,     0,     1,     6,     7 }, // French/Latin/Senegal
+    {     37,     7,   188,    0,    0,  234,  234,    6,    1,   51,    2,    3,    4,    5,    9,   15,   16,   15,   16,   97,   45,    0,    0, 2930, 2930, 2981, 2981, 3015, 3015,    0,    0,  387,  213,  230,  179, 7872,   13,    0, 1900, 1480,  6,  6,  8,  8,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 16, 10, 10,  5, 51, 51, 34, 34, 13, 13,  2,  2,  6, 17, 23,  2, 70,  5,  0,  8, 10, {83,67,82},      2,     1,     1,     6,     7 }, // French/Latin/Seychelles
+    {     37,     7,   200,    0,    0,  234,  234,    6,    1,   51,    2,    3,    4,    5,    9,   15,   16,   15,   16,   97,   45,    0,    0, 2930, 2930, 2981, 2981, 3015, 3015,    0,    0,  387,  213,  230,   14, 3032,   13,    0, 1900, 2227,  6,  6,  8,  8,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 16, 10, 10,  5, 51, 51, 34, 34, 13, 13,  2,  2,  6, 17, 23,  1, 19,  5,  0,  8, 24, {69,85,82},      2,     1,     1,     6,     7 }, // French/Latin/Saint Pierre And Miquelon
+    {     37,     7,   206,    0,    0,  234,  234,    6,    1,   51,    2,    3,    4,    5,    9,   15,   16,   17,   18,    0,  166,  257,    0, 2930, 2930, 2981, 2981, 3015, 3015,    0,    0,  387,  213,  230,  208, 7942,   13,    0, 2251, 2266,  6,  6,  8,  8,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17,  8, 14,  5, 51, 51, 34, 34, 13, 13,  2,  2,  6, 17, 23,  3, 44,  5,  0, 15,  6, {67,72,70},      2,     0,     1,     6,     7 }, // French/Latin/Switzerland
+    {     37,     7,   207,    0,    0,  234,  234,    6,    1,   51,    2,    3,    4,    5,    9,   15,   16,   15,   16,   97,   45,   10,   22, 2930, 2930, 2981, 2981, 3015, 3015,    0,    0,  387,  213,  230,  211, 7986,   13,    0, 1900, 2272,  6,  6,  8,  8,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 16, 10, 12,  7, 51, 51, 34, 34, 13, 13,  2,  2,  6, 17, 23,  2, 50,  5,  0,  8,  5, {83,89,80},      0,     0,     6,     5,     6 }, // French/Latin/Syria
+    {     37,     7,   212,    0,    0,  234,  234,    6,    1,   51,    2,    3,    4,    5,    9,   15,   16,   15,   16,   97,   45,    0,    0, 2930, 2930, 2981, 2981, 3015, 3015,    0,    0,  387,  213,  230,   33, 7077,   13,    0, 1900, 2277,  6,  6,  8,  8,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 16, 10, 10,  5, 51, 51, 34, 34, 13, 13,  2,  2,  6, 17, 23,  3, 58,  5,  0,  8,  4, {88,79,70},      0,     0,     1,     6,     7 }, // French/Latin/Togo
+    {     37,     7,   216,    0,    0,  234,  234,    6,    1,   51,    2,    3,    4,    5,    9,   15,   16,   15,   16,   97,   45,   10,   22, 2930, 2930, 2981, 2981, 3015, 3015,    0,    0,  387,  213,  230,  213, 8036,   13,    0, 1900, 2281,  6,  6,  8,  8,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 16, 10, 12,  7, 51, 51, 34, 34, 13, 13,  2,  2,  6, 17, 23,  2, 50,  5,  0,  8,  7, {84,78,68},      3,     0,     1,     6,     7 }, // French/Latin/Tunisia
+    {     37,     7,   229,    0,    0,  234,  234,    6,    1,   51,    2,    3,    4,    5,    9,   15,   16,   15,   16,   97,   45,   10,   22, 2930, 2930, 2981, 2981, 3015, 3015,    0,    0,  387,  213,  230,  193, 8086,   13,    0, 1900, 1726,  6,  6,  8,  8,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 16, 10, 12,  7, 51, 51, 34, 34, 13, 13,  2,  2,  6, 17, 23,  2, 50,  5,  0,  8,  7, {86,85,86},      0,     0,     1,     6,     7 }, // French/Latin/Vanuatu
+    {     37,     7,   235,    0,    0,  234,  234,    6,    1,   51,    2,    3,    4,    5,    9,   15,   16,   15,   16,   97,   45,    0,    0, 2930, 2930, 2981, 2981, 3015, 3015,    0,    0,  387,  213,  230,  197, 7453,   13,    0, 1900, 2288,  6,  6,  8,  8,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 16, 10, 10,  5, 51, 51, 34, 34, 13, 13,  2,  2,  6, 17, 23,  4, 34,  5,  0,  8, 16, {88,80,70},      0,     0,     1,     6,     7 }, // French/Latin/Wallis And Futuna Islands
+    {     37,     7,   244,    0,    0,  234,  234,    6,    1,   51,    2,    3,    4,    5,    9,   15,   16,   15,   16,   97,   45,    0,    0, 2930, 2930, 2981, 2981, 3015, 3015,    0,    0,  387,  213,  230,   14, 3032,   13,    0, 1900, 2304,  6,  6,  8,  8,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 16, 10, 10,  5, 51, 51, 34, 34, 13, 13,  2,  2,  6, 17, 23,  1, 19,  5,  0,  8, 16, {69,85,82},      2,     1,     1,     6,     7 }, // French/Latin/Saint Barthelemy
+    {     37,     7,   245,    0,    0,  234,  234,    6,    1,   51,    2,    3,    4,    5,    9,   15,   16,   15,   16,   97,   45,    0,    0, 2930, 2930, 2981, 2981, 3015, 3015,    0,    0,  387,  213,  230,   14, 3032,   13,    0, 1900, 2320,  6,  6,  8,  8,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 16, 10, 10,  5, 51, 51, 34, 34, 13, 13,  2,  2,  6, 17, 23,  1, 19,  5,  0,  8, 12, {69,85,82},      2,     1,     1,     6,     7 }, // French/Latin/Saint Martin
+    {     38,     7,   151,    0,    0,    7,    7,    6,    1,    0,    2,    3,    4,    5,    9,   10,   11,   12,   13,   97,  347,    0,    0, 3028, 3028, 3081, 3081,   83,   83,    0,    0,    0,    5,   22,   14, 3374,    8,   53, 2332, 2337,  6,  6,  8,  8,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 16,  8, 10,  5, 53, 53, 20, 20, 13, 13,  2,  2,  4, 17, 23,  1, 18,  5,  6,  5,  8, {69,85,82},      2,     1,     1,     6,     7 }, // Western Frisian/Latin/Netherlands
+    {     39,     7,   224,    0,    0,  242,  242,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,  589,   45,    0,    0, 3101, 3101, 3169, 3169, 3196, 3196,    5,   77,  393,    5,   22,  117, 8136,    4,    0, 2345, 2353,  6,  6, 10, 10,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 21, 10, 10,  5, 68, 68, 27, 27, 13, 13,  1,  1,  6, 17, 23,  1, 85,  4,  0,  8, 22, {71,66,80},      2,     1,     1,     6,     7 }, // Gaelic/Latin/United Kingdom
+    {     40,     7,   197,    0,    0,  252,  252,    6,    1,    0,    2,    3,    4,    5,    9,   10,   11,   12,   13,  610,   45,    0,    0, 3209, 3257, 3305, 3339, 3373, 3386,   64,   61,    0,    5,   22,   14, 3032,   13,    0, 2375, 2381,  6,  6,  7,  7,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 27,  8, 10,  5, 48, 48, 34, 34, 13, 20,  4,  4,  5, 17, 23,  1, 19,  5,  0,  6,  6, {69,85,82},      2,     1,     1,     6,     7 }, // Galician/Latin/Spain
+    {     41,    15,    81,    0,    0,  259,  259,    6,    1,   14,    2,    3,    4,    5,    9,   40,   10,   15,   16,  637,  166,    0,    0, 3406, 3406, 3467, 3467, 3494, 3494,    0,    0,  399,  404,   22,  215, 8221,   13,    0, 2387, 2394,  6,  6,  8,  8,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 19,  8, 10,  5, 61, 61, 27, 27, 13, 13,  2,  2,  5, 37, 23,  1, 42,  5,  0,  7, 10, {71,69,76},      2,     1,     1,     6,     7 }, // Georgian/Georgian/Georgia
+    {     42,     7,    82,    0,    0,  267,  267,    6,    1,    0,    2,    3,    4,    5,    9,   40,   10,   46,   12,  420,  166,    0,    0, 3507, 3507, 3566, 3586, 3613, 3613,    0,    0,  441,    5,   22,   14, 8263,   13,    0, 2404, 2411,  6,  6,  9,  9,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 18,  8, 10,  5, 59, 59, 20, 27, 13, 13,  2,  2,  5, 17, 23,  1, 18,  5,  0,  7, 11, {69,85,82},      2,     1,     1,     6,     7 }, // German/Latin/Germany
+    {     42,     7,    14,    0,    0,  267,  267,    6,    1,   14,    2,    3,    4,    5,    9,   40,   10,   46,   12,  420,  166,    0,    0, 3507, 3507, 3566, 3586, 3613, 3613,    0,    0,  441,    5,   22,   14, 8263,    8,    0, 2422, 2422,  6,  6,  9,  9,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 18,  8, 10,  5, 59, 59, 20, 27, 13, 13,  2,  2,  5, 17, 23,  1, 18,  5,  0, 24, 10, {69,85,82},      2,     1,     1,     6,     7 }, // German/Latin/Austria
+    {     42,     7,    21,    0,    0,  267,  267,    6,    1,    0,    2,    3,    4,    5,    9,   40,   10,   46,   12,  420,  166,    0,    0, 3507, 3507, 3566, 3586, 3613, 3613,    0,    0,  441,    5,   22,   14, 8263,   13,    0, 2404, 2446,  6,  6,  9,  9,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 18,  8, 10,  5, 59, 59, 20, 27, 13, 13,  2,  2,  5, 17, 23,  1, 18,  5,  0,  7,  7, {69,85,82},      2,     1,     1,     6,     7 }, // German/Latin/Belgium
+    {     42,     7,   106,    0,    0,  267,  267,    6,    1,    0,    2,    3,    4,    5,    9,   40,   10,   46,   12,  420,  166,    0,    0, 3507, 3507, 3566, 3586, 3613, 3613,    0,    0,  441,    5,   22,   14, 8263,   13,    0, 2404, 2453,  6,  6,  9,  9,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 18,  8, 10,  5, 59, 59, 20, 27, 13, 13,  2,  2,  5, 17, 23,  1, 18,  5,  0,  7,  7, {69,85,82},      2,     1,     1,     6,     7 }, // German/Latin/Italy
+    {     42,     7,   123,    0,    0,  267,  267,    6,    0,   13,    2,    3,    4,    5,    9,   40,   10,   46,   12,  420,  166,    0,    0, 3507, 3507, 3566, 3586, 3613, 3613,    0,    0,  441,    5,   22,  208, 8281,    8,    0, 2404, 2460,  6,  6,  9,  9,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 18,  8, 10,  5, 59, 59, 20, 27, 13, 13,  2,  2,  5, 17, 23,  3, 57,  5,  0,  7, 13, {67,72,70},      2,     0,     1,     6,     7 }, // German/Latin/Liechtenstein
+    {     42,     7,   125,    0,    0,  267,  267,    6,    1,    0,    2,    3,    4,    5,    9,   40,   10,   46,   12,  420,  166,    0,    0, 3507, 3507, 3566, 3586, 3613, 3613,    0,    0,  441,    5,   22,   14, 8263,   13,    0, 2404, 2473,  6,  6,  9,  9,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 18,  8, 10,  5, 59, 59, 20, 27, 13, 13,  2,  2,  5, 17, 23,  1, 18,  5,  0,  7,  9, {69,85,82},      2,     1,     1,     6,     7 }, // German/Latin/Luxembourg
+    {     42,     7,   206,    0,    0,  267,  267,    6,    0,   13,    2,    3,    4,    5,    9,   40,   10,   46,   12,  420,  166,    0,    0, 3507, 3507, 3566, 3586, 3613, 3613,    0,    0,  441,    5,   22,  208, 8281,    8,   36, 2482, 2482,  6,  6,  9,  9,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 18,  8, 10,  5, 59, 59, 20, 27, 13, 13,  2,  2,  5, 17, 23,  3, 57,  5,  5, 21,  7, {67,72,70},      2,     0,     1,     6,     7 }, // German/Latin/Switzerland
+    {     43,    16,    85,    0,    0,  276,  276,    6,    1,    0,    2,    3,    4,    5,    6,   15,   16,   10,   11,    0,  259,   10,   22, 3626, 3626, 3680, 3680, 3707, 3707,   81,   78,    0,    5,   22,   14, 8338,   13,    0, 2503, 2511,  6,  6,  9,  9,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17,  6, 12,  7, 54, 54, 27, 27, 13, 13,  4,  4,  4, 17, 23,  1, 18,  5,  0,  8,  6, {69,85,82},      2,     1,     1,     6,     7 }, // Greek/Greek/Greece
+    {     43,    16,    56,    0,    0,  276,  276,    6,    1,    0,    2,    3,    4,    5,    6,   15,   16,   10,   11,    0,  259,   10,   22, 3626, 3626, 3680, 3680, 3707, 3707,   81,   78,    0,    5,   22,   14, 8338,   13,    0, 2503, 2517,  6,  6,  9,  9,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17,  6, 12,  7, 54, 54, 27, 27, 13, 13,  4,  4,  4, 17, 23,  1, 18,  5,  0,  8,  6, {69,85,82},      2,     1,     1,     6,     7 }, // Greek/Greek/Cyprus
+    {     44,     7,    86,    0,    0,  285,  285,    6,    1,    0,    2,    3,   38,    5,   47,   16,   15,   18,   17,   80,   70,  166,  166, 3720, 3720, 3817, 3817, 3844, 3844,    0,    0,    0,    5,   22,  145, 8356,    4,   59, 2523, 2534,  6,  6, 11, 11,  1,  1,  1,  1,  1,  1,  1,  4,  1,  1,  1,  1, 17, 10, 10,  5, 97, 97, 27, 27, 13, 13,  2,  2,  4, 17, 23,  3, 61,  4,  5, 11, 16, {68,75,75},      2,     0,     1,     6,     7 }, // Greenlandic/Latin/Greenland
+    {     45,     7,   168,    0,    0,    0,    0,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,   53,   70,    0,    0,   56,   56,   56,   56,   83,   83,    0,    0,    0,    5,   22,  216,    0,    8,    0,    0,    0,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 10,  5, 27, 27, 27, 27, 13, 13,  2,  2,  4, 17, 23,  1,  0,  5,  0,  0,  0, {80,89,71},      0,     0,     7,     6,     7 }, // Guarani/Latin/Paraguay
+    {     46,    17,   100,    0,    0,  296,  296,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,  174,  259,  271,  284, 3857, 3857, 3909, 3909, 3940, 3940,    0,    0,  446,  450,   22,  119, 8417,    4,    0, 2550, 2557,  6,  6,  9,  9,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 18,  6, 13,  8, 52, 52, 31, 31, 18, 18,  2,  2,  4, 19, 23,  1, 45,  4,  0,  7,  4, {73,78,82},      2,     1,     7,     7,     7 }, // Gujarati/Gujarati/India
+    {     47,     7,   157,    0,    0,  305,  305,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,  656,  259,    0,    0, 3958, 3958, 4009, 4009, 4036, 4036,   85,   82,    0,    5,   22,  172, 8462,   64,    0, 2561, 2566,  6,  6,  8,  8,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17,  6, 10,  5, 51, 51, 27, 27, 13, 13,  6,  5,  4, 17, 23,  1, 53,  6,  0,  5,  8, {78,71,78},      2,     1,     1,     6,     7 }, // Hausa/Latin/Nigeria
+    {     47,     1,   157,    0,    0,    0,    0,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,   53,   70,    0,    0,   56,   56,   56,   56,   83,   83,    0,    0,    0,    5,   22,  172,    0,    8,    0,    0,    0,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 10,  5, 27, 27, 27, 27, 13, 13,  2,  2,  4, 17, 23,  1,  0,  5,  0,  0,  0, {78,71,78},      2,     1,     1,     6,     7 }, // Hausa/Arabic/Nigeria
+    {     47,     7,    83,    0,    0,  305,  305,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,  656,  259,   10,   22, 3958, 3958, 4009, 4009, 4036, 4036,   85,   82,    0,    5,   22,  163,    0,   64,    0, 2561, 2574,  6,  6,  8,  8,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17,  6, 12,  7, 51, 51, 27, 27, 13, 13,  6,  5,  4, 17, 23,  3,  0,  6,  0,  5,  4, {71,72,83},      2,     1,     1,     6,     7 }, // Hausa/Latin/Ghana
+    {     47,     7,   156,    0,    0,  305,  305,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,  656,  259,    0,    0, 3958, 3958, 4009, 4009, 4036, 4036,   85,   82,    0,    5,   22,   33, 8515,   64,    0, 2561, 2578,  6,  6,  8,  8,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17,  6, 10,  5, 51, 51, 27, 27, 13, 13,  6,  5,  4, 17, 23,  3, 29,  6,  0,  5,  5, {88,79,70},      0,     0,     1,     6,     7 }, // Hausa/Latin/Niger
+    {     48,    18,   105,    0,    0,  313,  313,    6,    0,    1,    2,    3,   33,   35,    9,   11,   11,   13,   13,  673,  581,    1,    1, 4049, 4049, 4113, 4113, 4158, 4158,   91,   87,  469,    5,   22,   47, 8544,   70,   76, 2583, 2588,  6,  6,  6,  6,  1,  1,  1,  1,  1,  2,  2,  1,  1,  1,  1,  1, 18,  8,  9,  4, 64, 64, 45, 45, 20, 20,  6,  5,  4, 17, 23,  1, 53,  6,  8,  5,  5, {73,76,83},      2,     1,     7,     5,     6 }, // Hebrew/Hebrew/Israel
+    {     49,    13,   100,    0,    0,  319,  328,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,    0,  259,   10,   22, 4178, 4178, 4230, 4230, 4261, 4261,   68,   65,  473,    5,   22,  119, 8597,    4,    0, 2593, 2599,  6,  6,  9,  8,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17,  6, 12,  7, 52, 52, 31, 31, 18, 18,  2,  2,  4, 17, 23,  1, 41,  4,  0,  6,  4, {73,78,82},      2,     1,     7,     7,     7 }, // Hindi/Devanagari/India
+    {     50,     7,    98,    0,    0,  336,  336,    6,    1,   14,    2,    3,    4,    5,    9,   40,   11,   16,   15,  691,  710,    1,    1, 4279, 4279, 4330, 4330, 4348, 4348,   97,   92,  477,    5,   22,  217, 8638,   13,    0, 2603, 2609,  6,  6,  8,  8,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 19, 13,  9,  4, 51, 51, 18, 18, 16, 16,  3,  3,  4, 17, 23,  2, 45,  5,  0,  6, 12, {72,85,70},      2,     0,     1,     6,     7 }, // Hungarian/Latin/Hungary
+    {     51,     7,    99,    0,    0,  190,  190,    6,    1,    0,    2,    3,    4,    5,    9,   40,   10,   46,   12,  420,  581,    0,    0, 4364, 4364, 4444, 4444, 4478, 4478,  100,   95,  481,    5,   22,  219, 8683,   13,    0, 2621, 2629,  6,  6,  8,  8,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 18,  8, 10,  5, 80, 80, 34, 34, 13, 13,  4,  4,  4, 17, 23,  3, 48,  5,  0,  8,  6, {73,83,75},      0,     0,     1,     6,     7 }, // Icelandic/Latin/Iceland
+    {     52,     7,   101,    0,    0,  344,  354,    6,    1,    0,    2,    3,    4,    5,    9,   10,   11,   12,   13,  527,   45,  166,  166, 4491, 4491, 4533, 4533, 4560, 4560,    0,    0,    0,    5,   22,  222, 8731,    4,    0, 2635, 2635,  6,  6, 10,  9,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 18,  8, 10,  5, 42, 42, 27, 27, 13, 13,  2,  2,  4, 17, 23,  2, 38,  4,  0,  9,  9, {73,68,82},      2,     0,     7,     6,     7 }, // Indonesian/Latin/Indonesia
+    {     53,     7,   260,    0,    0,  252,  252,    6,    1,    0,    2,    3,    4,    5,    9,   12,   13,   10,   11,  723,  511,    0,    0, 4573, 4573, 4629, 4629, 4656, 4656,    0,    0,    0,    5,   22,    0,    0,    8,    0, 2644, 2655,  6,  6,  7,  7,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 26, 10, 10,  5, 56, 56, 27, 27, 13, 13,  2,  2,  5, 17, 23,  0,  0,  5,  0, 11,  5,    {0,0,0},      2,     1,     1,     6,     7 }, // Interlingua/Latin/World
+    {     55,    44,    38,    0,    0,    0,    0,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,   53,   70,    0,    0,   56,   56,   56,   56,   83,   83,    0,    0,    0,    5,   22,  224,    0,    8,    0,    0,    0,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 10,  5, 27, 27, 27, 27, 13, 13,  2,  2,  4, 17, 23,  3,  0,  5,  0,  0,  0, {67,65,68},      2,     0,     7,     6,     7 }, // Inuktitut/Canadian Aboriginal/Canada
+    {     55,     7,    38,    0,    0,    0,    0,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,   53,   70,    0,    0,   56,   56,   56,   56,   83,   83,    0,    0,    0,    5,   22,  224,    0,    8,    0,    0,    0,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 10,  5, 27, 27, 27, 27, 13, 13,  2,  2,  4, 17, 23,  3,  0,  5,  0,  0,  0, {67,65,68},      2,     0,     7,     6,     7 }, // Inuktitut/Latin/Canada
+    {     57,     7,   104,    0,    0,  363,  242,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,   97,   45,    0,    0, 4669, 4669, 4743, 4743, 4779, 4779,  104,   99,  485,    5,   22,   14, 8769,    4,    0, 2660, 2667,  6,  6, 11, 10,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 16, 10, 10,  5, 74, 74, 36, 36, 13, 13,  4,  4,  6, 17, 23,  1, 30,  4,  0,  7,  4, {69,85,82},      2,     1,     1,     6,     7 }, // Irish/Latin/Ireland
+    {     57,     7,   224,    0,    0,  363,  242,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,   97,   45,    0,    0, 4669, 4669, 4743, 4743, 4779, 4779,  104,   99,  485,    5,   22,  117, 8799,    4,    0, 2660, 2671,  6,  6, 11, 10,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 16, 10, 10,  5, 74, 74, 36, 36, 13, 13,  4,  4,  6, 17, 23,  1, 94,  4,  0,  7, 19, {71,66,80},      2,     1,     1,     6,     7 }, // Irish/Latin/United Kingdom
+    {     58,     7,   106,    0,    0,  252,  252,    6,    1,    0,    2,    3,    4,    5,    9,   15,   16,   10,   11,   97,   45,    0,    0, 4792, 4792, 4848, 4848, 4875, 4875,    0,    0,    0,    5,   22,   14, 3032,   13,    0, 2690, 2698,  6,  6,  7,  7,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 16,  8, 10,  5, 56, 56, 27, 27, 13, 13,  2,  2,  4, 17, 23,  1, 18,  5,  0,  8,  6, {69,85,82},      2,     1,     1,     6,     7 }, // Italian/Latin/Italy
+    {     58,     7,   184,    0,    0,  252,  252,    6,    1,    0,    2,    3,    4,    5,    9,   15,   16,   10,   11,   97,   45,    0,    0, 4792, 4792, 4848, 4848, 4875, 4875,    0,    0,    0,    5,   22,   14, 3032,   13,    0, 2690, 2704,  6,  6,  7,  7,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 16,  8, 10,  5, 56, 56, 27, 27, 13, 13,  2,  2,  4, 17, 23,  1, 18,  5,  0,  8, 10, {69,85,82},      2,     1,     1,     6,     7 }, // Italian/Latin/San Marino
+    {     58,     7,   206,    0,    0,  252,  252,    6,    0,   13,    2,    3,    4,    5,    9,   15,   16,   17,   18,    0,  166,    0,    0, 4792, 4792, 4848, 4848, 4875, 4875,    0,    0,    0,    5,   22,    0, 8893,    8,   36, 2690, 2714,  6,  6,  7,  7,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17,  8, 10,  5, 56, 56, 27, 27, 13, 13,  2,  2,  4, 17, 23,  0, 52,  5,  5,  8,  8, {67,72,70},      2,     0,     1,     6,     7 }, // Italian/Latin/Switzerland
+    {     58,     7,   230,    0,    0,  252,  252,    6,    1,    0,    2,    3,    4,    5,    9,   15,   16,   10,   11,   97,   45,    0,    0, 4792, 4792, 4848, 4848, 4875, 4875,    0,    0,    0,    5,   22,   14, 3032,   13,    0, 2690, 2722,  6,  6,  7,  7,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 16,  8, 10,  5, 56, 56, 27, 27, 13, 13,  2,  2,  4, 17, 23,  1, 18,  5,  0,  8, 18, {69,85,82},      2,     1,     1,     6,     7 }, // Italian/Latin/Vatican City State
+    {     59,    19,   108,  168,  168,  168,  168,    6,    0,    1,    2,    3,    4,    5,    9,   42,   43,   44,   45,  377,  545,  292,    1, 4888, 4888, 4915, 4915, 4915, 4915,  108,  103,  491,  494,   22,  227, 8945,    4,    0, 2740, 2740,  5,  5,  5,  5,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 13, 10, 10,  4, 27, 27, 13, 13, 13, 13,  2,  2,  3, 17, 23,  1, 10,  4,  0,  3,  2, {74,80,89},      0,     0,     7,     6,     7 }, // Japanese/Japanese/Japan
+    {     60,     7,   101,    0,    0,  374,  384,    6,    1,    0,    2,    3,    4,    5,    9,   10,   11,   12,   13,    0,  511,    0,    0, 4928, 4928, 4968, 4968, 4996, 4996,  110,  105,  511,    5,   22,  222, 8731,    8,    0, 2743, 2747,  6,  6, 10,  9,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 10,  5, 40, 40, 28, 28, 13, 13,  4,  5,  4, 17, 23,  2, 38,  5,  0,  4,  9, {73,68,82},      2,     0,     7,     6,     7 }, // Javanese/Latin/Indonesia
+    {     61,    21,   100,    0,    0,  393,  405,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,   27,  259,  271,  284, 5009, 5009, 5062, 5062, 5094, 5094,  114,  110,  515,  523,   22,  119, 8955,    4,    0, 2756, 2761,  6,  6, 12, 11,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 18,  6, 13,  8, 53, 53, 32, 32, 19, 19,  9,  7,  8, 35, 23,  1, 48,  4,  0,  5,  4, {73,78,82},      2,     1,     7,     7,     7 }, // Kannada/Kannada/India
+    {     62,     1,   100,    0,    0,    0,    0,   53,   19,   20,   21,   52,   33,   53,   56,   10,   11,   12,   13,   27,  521,   10,   22, 5113, 5113, 5164, 5164, 5213, 5213,    0,    0,    0,    5,   22,  119, 9003,    8,    0, 2765, 2770,  6,  6,  6,  6,  1,  1,  1,  1,  1,  3,  3,  4,  1,  1,  1,  1, 18,  6, 12,  7, 51, 51, 49, 49, 13, 13,  2,  2,  4, 17, 23,  1, 16,  5,  0,  5,  9, {73,78,82},      2,     1,     7,     7,     7 }, // Kashmiri/Arabic/India
+    {     63,     2,   110,    0,    0,    0,  416,    6,    1,   14,    2,    3,    4,    5,    9,   15,   16,   10,   11,  749,  166,    0,    0, 5226, 5226, 5281, 5281, 5301, 5301,    0,    0,  253,  558,  575,  228, 9019,   13,    0, 2779, 2789,  6,  6,  6, 10,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 22,  8, 10,  5, 55, 55, 20, 20, 13, 13,  2,  2,  4, 17, 23,  1, 57,  5,  0, 10,  9, {75,90,84},      2,     1,     1,     6,     7 }, // Kazakh/Cyrillic/Kazakhstan
+    {     64,     7,   179,    0,    0,    0,    0,    6,    1,    0,    2,    3,    4,    5,    9,   15,   16,   12,   13,   53,   70,    0,    0, 5314, 5314, 5397, 5397,   83,   83,    0,    0,    0,    5,   22,  174,    0,    8,    0, 2798, 2809,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 10,  5, 83, 83, 34, 34, 13, 13,  2,  2,  4, 17, 23,  2,  0,  5,  0, 11,  8, {82,87,70},      0,     0,     1,     6,     7 }, // Kinyarwanda/Latin/Rwanda
+    {     65,     2,   116,    0,    0,  426,  426,    6,    1,   14,    2,    3,    4,    5,    9,   15,   16,   40,   10,  771,  259,    0,    0, 5431, 5431, 5487, 5487, 5524, 5524,  123,  117,  253,  598,   22,  229, 9076,   13,    0, 2817, 2825,  6,  6, 10, 10,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 23,  6, 10,  5, 56, 56, 37, 37, 13, 13,  5, 14,  4, 18, 23,  3, 51,  5,  0,  8, 10, {75,71,83},      2,     1,     1,     6,     7 }, // Kirghiz/Cyrillic/Kyrgyzstan
+    {     66,    22,   114,    0,    0,  436,  436,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,  794,  810,  302,  315, 5537, 5537, 5564, 5564, 5564, 5564,  128,  131,  616,    5,   22,  232, 9127,    4,    0, 2835, 2838,  6,  6,  7,  7,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 16,  9, 13,  7, 27, 27, 13, 13, 13, 13,  2,  2,  3, 17, 23,  1, 18,  4,  0,  3,  4, {75,82,87},      0,     0,     7,     6,     7 }, // Korean/Korean/South Korea
+    {     66,    22,   113,    0,    0,  436,  436,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,  794,  810,  302,  315, 5537, 5537, 5564, 5564, 5564, 5564,  128,  131,  616,    5,   22,  233, 9145,    4,    0, 2835, 2842,  6,  6,  7,  7,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 16,  9, 13,  7, 27, 27, 13, 13, 13, 13,  2,  2,  3, 17, 23,  3, 38,  4,  0,  3, 11, {75,80,87},      0,     0,     1,     6,     7 }, // Korean/Korean/North Korea
+    {     67,     7,   217,    0,    0,  443,  443,    6,    1,    0,    2,    3,    4,    5,    9,   10,   11,   12,   13,   53,   70,    0,    0, 5577, 5577, 5618, 5618, 5637, 5637,  130,  133,    0,    5,   22,  236,    0,   13,    0, 2853, 2858,  6,  6,  7,  7,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 10,  5, 41, 41, 19, 19, 13, 13,  2,  2,  4, 17, 23,  1,  0,  5,  0,  5,  7, {84,82,89},      2,     1,     1,     6,     7 }, // Kurdish/Latin/Turkey
+    {     68,     7,    35,    0,    0,    0,    0,    6,    1,    0,    2,    3,    4,    5,    9,   11,   11,   13,   13,   97,  398,    0,    0, 5650, 5650, 5738, 5738,   83,   83,  132,  135,    0,    5,   22,  159, 9183,    0,    0, 2865, 2873,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 16,  8, 10,  5, 88, 88, 33, 33, 13, 13,  5,  5,  4, 17, 23,  3, 20,  4,  0,  8,  8, {66,73,70},      0,     0,     1,     6,     7 }, // Rundi/Latin/Burundi
+    {     69,    23,   117,    0,    0,    0,  450,    6,    1,    0,    2,    3,    4,    5,    9,   10,   11,   12,   13,  819,  398,  322,    1, 5771, 5771, 5827, 5827, 5862, 5862,  137,  140,    0,    5,   22,  237, 9203,    4,   36, 2881, 2881,  6,  6,  6,  9,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 19,  8, 24,  4, 56, 56, 35, 35, 16, 16,  8,  8,  4, 17, 23,  1, 20,  4,  5,  3,  3, {76,65,75},      0,     0,     7,     6,     7 }, // Lao/Lao/Laos
+    {     71,     7,   118,    0,    0,  459,  459,    6,    1,   14,    2,    3,    4,    5,    9,   10,   11,   12,   13,  838,  166,    0,    0, 5878, 5949, 6020, 6070, 6120, 6120,  145,  148,  619,    5,   22,   14, 9223,   13,    0, 2884, 2892,  6,  6,  8,  8,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 26,  8, 10,  5, 71, 71, 50, 50, 13, 13, 14, 11,  5, 17, 23,  1, 22,  5,  0,  8,  7, {69,85,82},      2,     1,     1,     6,     7 }, // Latvian/Latin/Latvia
+    {     72,     7,    49,    0,    0,  467,  467,    6,    1,    0,    2,    3,    4,    5,    9,   10,   11,   12,   13,   97,  398,    0,    0, 6133, 6133, 6232, 6232, 6259, 6259,  159,  159,    0,    5,   22,   32, 9245,   13,    0, 2899, 2906,  6,  6,  9,  9,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 16,  8, 10,  5, 99, 99, 27, 27, 13, 13,  8,  6,  4, 17, 23,  2, 16,  5,  0,  7, 30, {67,68,70},      2,     1,     1,     6,     7 }, // Lingala/Latin/Congo Kinshasa
+    {     72,     7,     6,    0,    0,  467,  467,    6,    1,    0,    2,    3,    4,    5,    9,   10,   11,   12,   13,   97,  398,    0,    0, 6133, 6133, 6232, 6232, 6259, 6259,  159,  159,    0,    5,   22,  238, 9261,   13,    0, 2899, 2936,  6,  6,  9,  9,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 16,  8, 10,  5, 99, 99, 27, 27, 13, 13,  8,  6,  4, 17, 23,  2, 16,  5,  0,  7,  6, {65,79,65},      2,     1,     1,     6,     7 }, // Lingala/Latin/Angola
+    {     72,     7,    41,    0,    0,  467,  467,    6,    1,    0,    2,    3,    4,    5,    9,   10,   11,   12,   13,   97,  398,    0,    0, 6133, 6133, 6232, 6232, 6259, 6259,  159,  159,    0,    5,   22,   32, 9277,   13,    0, 2899, 2942,  6,  6,  9,  9,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 16,  8, 10,  5, 99, 99, 27, 27, 13, 13,  8,  6,  4, 17, 23,  4, 16,  5,  0,  7, 26, {88,65,70},      0,     0,     1,     6,     7 }, // Lingala/Latin/Central African Republic
+    {     72,     7,    50,    0,    0,  467,  467,    6,    1,    0,    2,    3,    4,    5,    9,   10,   11,   12,   13,   97,  398,    0,    0, 6133, 6133, 6232, 6232, 6259, 6259,  159,  159,    0,    5,   22,   32, 9277,   13,    0, 2899, 2968,  6,  6,  9,  9,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 16,  8, 10,  5, 99, 99, 27, 27, 13, 13,  8,  6,  4, 17, 23,  4, 16,  5,  0,  7,  5, {88,65,70},      0,     0,     1,     6,     7 }, // Lingala/Latin/Congo Brazzaville
+    {     73,     7,   124,    0,    0,  476,  476,    6,    1,   14,    2,    3,   38,    5,   47,   40,   10,   40,   10,  864,   70,    0,    0, 6272, 6272, 6360, 6360, 6380, 6380,  167,  165,  624,    5,   22,   14, 9293,   13,    0, 2973, 2981,  6,  6,  8,  8,  1,  1,  1,  1,  1,  1,  1,  4,  1,  1,  1,  1, 27, 10, 10,  5, 88, 88, 20, 20, 13, 13,  9,  6,  6, 17, 23,  1, 29,  5,  0,  8,  7, {69,85,82},      2,     1,     1,     6,     7 }, // Lithuanian/Latin/Lithuania
+    {     74,     2,   127,    0,    0,  113,  113,    6,    1,    0,    2,    3,    4,    5,    9,   40,   10,   46,   12,    0,  113,    0,    0, 6393, 6393, 6446, 6480, 1486, 1486,  176,  171,  630,    5,   22,  240, 9322,   13,    0, 2988, 2998,  6,  6,  7,  7,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17,  6, 10,  5, 53, 53, 34, 33, 13, 13, 10,  8,  5, 17, 23,  4, 55,  5,  0, 10, 18, {77,75,68},      2,     1,     1,     6,     7 }, // Macedonian/Cyrillic/Macedonia
+    {     75,     7,   128,    0,    0,    0,    0,    6,    0,    1,    2,    3,    4,    5,    9,   15,   16,   10,   11,   97,   70,    0,    0, 6513, 6513, 6572, 6572, 6605, 6605,    0,    0,    0,    5,   22,  166, 5291,    8,    0, 3016, 3024,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 16, 10, 10,  5, 59, 59, 33, 33, 13, 13,  2,  2,  4, 17, 23,  2,  6,  5,  0,  8, 12, {77,71,65},      0,     0,     1,     6,     7 }, // Malagasy/Latin/Madagascar
+    {     76,     7,   130,    0,    0,  354,  354,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,    0,   46,   10,   22, 6618, 6618, 6660, 6660, 6687, 6687,  186,  179,  619,    5,   22,  168, 9377,    4,    0, 3036, 1219,  6,  6,  9,  9,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17,  7, 12,  7, 42, 42, 27, 27, 13, 13,  2,  3,  4, 17, 23,  2, 38,  4,  0,  6,  8, {77,89,82},      2,     1,     1,     6,     7 }, // Malay/Latin/Malaysia
+    {     76,     1,   130,    0,    0,    0,    0,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,   53,   70,    0,    0,   56,   56,   56,   56,   83,   83,    0,    0,    0,    5,   22,  168,    0,    8,    0,    0,    0,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 10,  5, 27, 27, 27, 27, 13, 13,  2,  2,  4, 17, 23,  2,  0,  5,  0,  0,  0, {77,89,82},      2,     1,     1,     6,     7 }, // Malay/Arabic/Malaysia
+    {     76,     7,    32,    0,    0,  354,  354,    6,    1,    0,    2,    3,    4,    5,    9,   10,   11,   12,   13,   85,   46,   10,   22, 6618, 6618, 6660, 6660, 6687, 6687,  186,  179,  619,    5,   22,    6, 9415,    8,    0, 3036, 3042,  6,  6,  9,  9,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 12,  7, 12,  7, 42, 42, 27, 27, 13, 13,  2,  3,  4, 17, 23,  1, 30,  5,  0,  6,  6, {66,78,68},      2,     1,     1,     6,     7 }, // Malay/Latin/Brunei
+    {     76,     7,   190,    0,    0,  354,  354,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,    0,   46,   10,   22, 6618, 6618, 6660, 6660, 6687, 6687,  186,  179,  619,    5,   22,    6, 9445,    4,    0, 3036, 3048,  6,  6,  9,  9,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17,  7, 12,  7, 42, 42, 27, 27, 13, 13,  2,  3,  4, 17, 23,  1, 36,  4,  0,  6,  9, {83,71,68},      2,     1,     7,     6,     7 }, // Malay/Latin/Singapore
+    {     77,    24,   100,    0,    0,  484,  497,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,  891,  259,   10,   22, 6700, 6776, 6851, 6851, 6891, 6912,    0,    0,  635,  641,   22,  119, 9481,    4,    0, 3057, 3063,  6,  6, 13, 12,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 18,  6, 12,  7, 76, 75, 40, 40, 21, 20,  2,  2,  6, 27, 23,  1, 39,  4,  0,  6,  6, {73,78,82},      2,     1,     7,     7,     7 }, // Malayalam/Malayalam/India
+    {     78,     7,   133,    0,    0,  509,  517,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,  909,   45,    0,    0, 6932, 6932, 6994, 6994, 7021, 7041,    0,    0,    0,    5,   22,   14, 9520,    4,    0, 3069, 1227,  6,  6,  8,  7,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 23, 10, 10,  5, 62, 62, 27, 27, 20, 19,  2,  2,  4, 17, 23,  1, 26,  4,  0,  5,  5, {69,85,82},      2,     1,     7,     6,     7 }, // Maltese/Latin/Malta
+    {     79,     7,   154,    0,    0,    0,    0,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,    0,  511,   10,   22, 7060, 7060, 7106, 7106, 7132, 7132,    0,    0,    0,    5,   22,    6, 9546,    8,    0, 3074, 3079,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 12,  7, 46, 46, 26, 26, 13, 13,  2,  2,  4, 17, 23,  1, 36,  5,  0,  5,  8, {78,90,68},      2,     1,     1,     6,     7 }, // Maori/Latin/New Zealand
+    {     80,    13,   100,    0,    0,  524,  524,    6,    0,    1,    2,   60,    4,    5,    9,   10,   11,   12,   13,  174,  259,   10,   22, 7145, 7145, 7197, 7197, 4261, 4261,  188,  182,  473,    5,   22,  119, 9582,    4,    0, 3087, 2599,  6,  6,  9,  9,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 18,  6, 12,  7, 52, 52, 31, 31, 18, 18,  5,  4,  4, 17, 23,  1, 42,  4,  0,  5,  4, {73,78,82},      2,     1,     7,     7,     7 }, // Marathi/Devanagari/India
+    {     82,     2,   143,    0,    0,    0,    0,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,  932,  967,   54,    0, 7228, 7270, 7312, 7312, 7312, 7312,  193,  186,  253,  668,   22,  244, 9624,    8,    0, 3092, 3098,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 35, 10, 12,  5, 42, 42, 20, 20, 20, 20,  4,  4,  4, 17, 23,  1, 45,  5,  0,  6,  6, {77,78,84},      2,     0,     1,     6,     7 }, // Mongolian/Cyrillic/Mongolia
+    {     82,     8,    44,    0,    0,    0,    0,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,   53,   70,    0,    0,   56,   56,   56,   56,   83,   83,    0,    0,    0,    5,   22,  245,    0,    8,    0,    0,    0,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 10,  5, 27, 27, 27, 27, 13, 13,  2,  2,  4, 17, 23,  3,  0,  5,  0,  0,  0, {67,78,89},      2,     1,     7,     6,     7 }, // Mongolian/Mongolian/China
+    {     84,    13,   150,  533,    0,  538,  538,    6,    0,    1,    2,   60,    4,    5,    9,   10,   11,   12,   13,   53,  253,    0,    0, 7332, 7332, 7385, 7385, 7417, 7417,  197,  190,  473,  685,   22,  248, 9669,    8,    0, 3104, 3104,  5,  6,  7,  7,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17,  6, 10,  5, 53, 53, 32, 32, 17, 17,  9,  7,  4, 19, 23,  4, 48,  5,  0,  6,  5, {78,80,82},      2,     1,     7,     6,     7 }, // Nepali/Devanagari/Nepal
+    {     84,    13,   100,  533,    0,  538,  538,    6,    0,    1,    2,   60,    4,    5,    9,   10,   11,   12,   13,   53,  253,   10,   22, 7332, 7332, 7385, 7385, 7417, 7417,  197,  190,  473,  685,   22,  119, 9717,    8,    0, 3104, 2599,  5,  6,  7,  7,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17,  6, 12,  7, 53, 53, 32, 32, 17, 17,  9,  7,  4, 19, 23,  1, 48,  5,  0,  6,  4, {73,78,82},      2,     1,     7,     7,     7 }, // Nepali/Devanagari/India
+    {     85,     7,   161,    0,    0,  190,  190,    6,    1,   14,    2,    3,   38,    5,    9,   15,   16,   12,   13,  461,  501,    0,    0, 2173, 2173, 2250, 2250, 2284, 2284,   64,   61,    0,    5,   22,  145, 9765,    8,    0, 3110, 3122,  6,  6,  8,  8,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 10,  5, 50, 50, 34, 34, 13, 13,  4,  4,  4, 17, 23,  2, 43,  5,  0, 12,  5, {78,79,75},      2,     0,     1,     6,     7 }, // Norwegian Bokmal/Latin/Norway
+    {     85,     7,   203,    0,    0,  190,  190,    6,    1,   14,    2,    3,   38,    5,    9,   15,   16,   12,   13,  461,  501,    0,    0, 2173, 2173, 2250, 2250, 2284, 2284,   64,   61,    0,    5,   22,  145, 9765,    8,    0, 3110, 3127,  6,  6,  8,  8,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 10,  5, 50, 50, 34, 34, 13, 13,  4,  4,  4, 17, 23,  2, 43,  5,  0, 12, 21, {78,79,75},      2,     0,     1,     6,     7 }, // Norwegian Bokmal/Latin/Svalbard And Jan Mayen Islands
+    {     86,     7,    74,    0,    0,    0,    0,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,   53,   70,    0,    0,   56,   56,   56,   56,   83,   83,    0,    0,    0,    5,   22,   14,    0,    8,    0,    0,    0,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 10,  5, 27, 27, 27, 27, 13, 13,  2,  2,  4, 17, 23,  1,  0,  5,  0,  0,  0, {69,85,82},      2,     1,     1,     6,     7 }, // Occitan/Latin/France
+    {     87,    26,   100,    0,    0,  545,  553,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,   27,  521,   10,   22, 7434, 7434, 7487, 7487, 7519, 7519,    0,    0,  704,    5,   22,  119, 9808,    4,    0, 3148, 3153,  6,  6,  8,  7,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 18,  6, 12,  7, 53, 53, 32, 32, 17, 17,  2,  2,  5, 17, 23,  1, 42,  4,  0,  5,  4, {73,78,82},      2,     1,     7,     7,     7 }, // Oriya/Oriya/India
+    {     88,     1,     1,  560,  560,  566,  575,   53,   19,   20,   21,   52,   33,   53,   56,   10,   11,   12,   13,  977,  390,   55,    1, 7536, 7536, 7536, 7536,   83,   83,  206,  197,  709,    5,   22,  252, 9850,   13,    0, 3157, 3161,  6,  6,  9,  8,  1,  1,  1,  1,  1,  3,  3,  4,  1,  1,  1,  1, 20,  8, 11,  4, 38, 38, 38, 38, 13, 13,  4,  4,  5, 17, 23,  1, 24,  5,  0,  4,  9, {65,70,78},      0,     0,     6,     4,     5 }, // Pashto/Arabic/Afghanistan
+    {     88,     1,   163,  560,  560,  566,  575,   53,   19,   20,   21,   52,   33,   53,   56,   10,   11,   12,   13,  977,  390,   10,   22, 7536, 7536, 7536, 7536,   83,   83,  206,  197,  709,    5,   22,  170, 9874,   13,    0, 3157, 3170,  6,  6,  9,  8,  1,  1,  1,  1,  1,  3,  3,  4,  1,  1,  1,  1, 20,  8, 12,  7, 38, 38, 38, 38, 13, 13,  4,  4,  5, 17, 23,  2, 51,  5,  0,  4,  7, {80,75,82},      2,     0,     7,     6,     7 }, // Pashto/Arabic/Pakistan
+    {     89,     1,   102,  583,  583,  590,  598,   53,   19,   20,   21,   52,   61,   35,   56,   15,   16,   17,   18,   97,  390,   55,    1, 7574, 7574, 7574, 7574, 7622, 7622,  210,  201,  714,  718,   22,  253, 9925,   84,    0, 3177, 3182,  7,  7,  8,  7,  1,  1,  1,  1,  1,  2,  2,  4,  1,  1,  1,  1, 16,  8, 11,  4, 48, 48, 48, 48, 13, 13,  9,  8,  4, 44, 23,  4, 36,  5,  0,  5,  5, {73,82,82},      0,     0,     6,     5,     5 }, // Persian/Arabic/Iran
+    {     89,     1,     1,  583,  583,  590,  598,   53,   19,   20,   21,   52,   61,   35,   56,   15,   16,   17,   18,   97,  390,   55,    1, 7574, 7574, 7574, 7574, 7622, 7622,  210,  201,  714,  718,   22,  252, 9961,    8,    0, 3187, 3161,  7,  7,  8,  7,  1,  1,  1,  1,  1,  2,  2,  4,  1,  1,  1,  1, 16,  8, 11,  4, 48, 48, 48, 48, 13, 13,  9,  8,  4, 44, 23,  1, 54,  5,  0,  3,  9, {65,70,78},      0,     0,     6,     4,     5 }, // Persian/Arabic/Afghanistan
+    {     90,     7,   172,    0,    0,  161,  161,    6,    1,   14,    2,    3,    4,    5,    9,   40,   11,   15,   16,    0,  501,    0,    0, 7635, 7635, 7693, 7693, 7726, 7739,    0,    0,  322,    5,   22,  257,10015,   13,    0, 3190, 3196,  6,  6,  7,  7,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 10,  5, 58, 58, 33, 33, 13, 13,  2,  2,  5, 17, 23,  2, 76,  5,  0,  6,  6, {80,76,78},      2,     1,     1,     6,     7 }, // Polish/Latin/Poland
+    {     91,     7,    30,    0,    0,  252,  252,    6,    1,    0,    2,    3,    4,    5,    9,   10,   11,   12,   13,  610,   45,    0,    0, 7752, 7752, 7830, 7830, 7864, 7864,    0,    0,    0,    5,   22,    5,10091,    8,    0, 3202, 3211,  6,  6,  7,  7,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 27, 10, 10,  5, 78, 78, 34, 34, 13, 13,  2,  2,  5, 17, 23,  2, 53,  5,  0,  9,  6, {66,82,76},      2,     1,     7,     6,     7 }, // Portuguese/Latin/Brazil
+    {     91,     7,     6,    0,    0,  252,  252,    6,    1,   14,    2,    3,    4,    5,    9,   15,   16,   10,   11,  610,   45,    0,    0, 7752, 7752, 7877, 7877, 7864, 7864,  219,  209,    0,    5,   22,  238,10144,   13,    0, 3202, 3217,  6,  6,  7,  7,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 27,  8, 10,  5, 78, 78, 48, 48, 13, 13,  8,  8,  5, 17, 23,  2, 53,  5,  0,  9,  6, {65,79,65},      2,     1,     1,     6,     7 }, // Portuguese/Latin/Angola
+    {     91,     7,    39,    0,    0,  252,  252,    6,    1,   14,    2,    3,    4,    5,    9,   15,   16,   10,   11,  610,   45,    0,    0, 7752, 7752, 7877, 7877, 7864, 7864,  219,  209,    0,    5,   22,  259,10197,   13,    0, 3202, 3223,  6,  6,  7,  7,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 27,  8, 10,  5, 78, 78, 48, 48, 13, 13,  8,  8,  5, 17, 23,  1, 68,  5,  0,  9, 10, {67,86,69},      2,     1,     1,     6,     7 }, // Portuguese/Latin/Cape Verde
+    {     91,     7,    62,    0,    0,  252,  252,    6,    1,   14,    2,    3,    4,    5,    9,   15,   16,   10,   11,  610,   45,    0,    0, 7752, 7752, 7877, 7877, 7864, 7864,  219,  209,    0,    5,   22,  156,10265,   13,    0, 3202, 3233,  6,  6,  7,  7,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 27,  8, 10,  5, 78, 78, 48, 48, 13, 13,  8,  8,  5, 17, 23,  3, 80,  5,  0,  9, 11, {85,83,68},      2,     1,     1,     6,     7 }, // Portuguese/Latin/East Timor
+    {     91,     7,    66,    0,    0,  252,  252,    6,    1,   14,    2,    3,    4,    5,    9,   15,   16,   10,   11,  610,   45,    0,    0, 7752, 7752, 7877, 7877, 7864, 7864,  219,  209,    0,    5,   22,   32,10345,   13,    0, 3202, 3244,  6,  6,  7,  7,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 27,  8, 10,  5, 78, 78, 48, 48, 13, 13,  8,  8,  5, 17, 23,  4, 58,  5,  0,  9, 16, {88,65,70},      0,     0,     1,     6,     7 }, // Portuguese/Latin/Equatorial Guinea
+    {     91,     7,    92,    0,    0,  252,  252,    6,    1,   14,    2,    3,    4,    5,    9,   15,   16,   10,   11,  610,   45,    0,    0, 7752, 7752, 7877, 7877, 7864, 7864,  219,  209,    0,    5,   22,   33,10403,   13,    0, 3202, 3260,  6,  6,  7,  7,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 27,  8, 10,  5, 78, 78, 48, 48, 13, 13,  8,  8,  5, 17, 23,  3, 61,  5,  0,  9, 12, {88,79,70},      0,     0,     1,     6,     7 }, // Portuguese/Latin/Guinea Bissau
+    {     91,     7,   125,    0,    0,  252,  252,    6,    1,   14,    2,    3,    4,    5,    9,   15,   16,   10,   11,  610,   45,    0,    0, 7752, 7752, 7877, 7877, 7864, 7864,  219,  209,    0,    5,   22,   14, 3032,   13,    0, 3202, 3272,  6,  6,  7,  7,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 27,  8, 10,  5, 78, 78, 48, 48, 13, 13,  8,  8,  5, 17, 23,  1, 19,  5,  0,  9, 10, {69,85,82},      2,     1,     1,     6,     7 }, // Portuguese/Latin/Luxembourg
+    {     91,     7,   126,    0,    0,  252,  252,    6,    1,   14,    2,    3,    4,    5,    9,   15,   16,   10,   11,  610,   45,   10,   22, 7752, 7752, 7877, 7877, 7864, 7864,  219,  209,    0,    5,   22,  134,10464,   13,    0, 3202, 3282,  6,  6,  7,  7,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 27,  8, 12,  7, 78, 78, 48, 48, 13, 13,  8,  8,  5, 17, 23,  4, 53,  5,  0,  9, 19, {77,79,80},      2,     1,     7,     6,     7 }, // Portuguese/Latin/Macau
+    {     91,     7,   146,    0,    0,  252,  252,    6,    1,   14,    2,    3,    4,    5,    9,   15,   16,   10,   11,  610,   45,    0,    0, 7752, 7752, 7877, 7877, 7864, 7864,  219,  209,    0,    5,   22,  260,10517,   13,    0, 3202, 3301,  6,  6,  7,  7,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 27,  8, 10,  5, 78, 78, 48, 48, 13, 13,  8,  8,  5, 17, 23,  3, 65,  5,  0,  9, 10, {77,90,78},      2,     1,     7,     6,     7 }, // Portuguese/Latin/Mozambique
+    {     91,     7,   173,    0,    0,  252,  252,    6,    1,   14,    2,    3,    4,    5,    9,   15,   16,   10,   11,  610,   45,    0,    0, 7752, 7752, 7877, 7877, 7864, 7864,  219,  209,    0,    5,   22,   14, 3032,   13,    0, 3311, 3328,  6,  6,  7,  7,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 27,  8, 10,  5, 78, 78, 48, 48, 13, 13,  8,  8,  5, 17, 23,  1, 19,  5,  0, 17,  8, {69,85,82},      2,     1,     7,     6,     7 }, // Portuguese/Latin/Portugal
+    {     91,     7,   185,    0,    0,  252,  252,    6,    1,   14,    2,    3,    4,    5,    9,   15,   16,   10,   11,  610,   45,    0,    0, 7752, 7752, 7877, 7877, 7864, 7864,  219,  209,    0,    5,   22,  263,10582,   13,    0, 3202, 3336,  6,  6,  7,  7,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 27,  8, 10,  5, 78, 78, 48, 48, 13, 13,  8,  8,  5, 17, 23,  2, 91,  5,  0,  9, 19, {83,84,78},      2,     1,     1,     6,     7 }, // Portuguese/Latin/Sao Tome And Principe
+    {     91,     7,   206,    0,    0,  252,  252,    6,    1,   14,    2,    3,    4,    5,    9,   15,   16,   10,   11,  610,   45,    0,    0, 7752, 7752, 7877, 7877, 7864, 7864,  219,  209,    0,    5,   22,  208,10673,   13,    0, 3202, 3355,  6,  6,  7,  7,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 27,  8, 10,  5, 78, 78, 48, 48, 13, 13,  8,  8,  5, 17, 23,  3, 44,  5,  0,  9,  5, {67,72,70},      2,     0,     1,     6,     7 }, // Portuguese/Latin/Switzerland
+    {     92,     4,   100,    0,    0,  605,  605,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,    0,  259,   10,   22, 7925, 7925, 7981, 7981, 8016, 8016,  227,  217,  762,    5,   22,  119,10717,    4,    0, 3360, 3366,  6,  6,  9,  9,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17,  6, 12,  7, 56, 56, 35, 35, 22, 22,  6,  6,  4, 17, 23,  1, 38,  4,  0,  6,  4, {73,78,82},      2,     1,     7,     7,     7 }, // Punjabi/Gurmukhi/India
+    {     92,     1,   163,    0,    0,    0,    0,   53,   19,   20,   21,   52,   33,   53,   56,   10,   11,   12,   13,  527,   45,   10,   22, 8038, 8038, 8038, 8038,   83,   83,    0,    0,    0,    5,   22,   77,10755,   41,    0, 3370, 3170,  6,  6,  6,  6,  1,  1,  1,  1,  1,  3,  3,  4,  1,  1,  1,  1, 18, 10, 12,  7, 36, 36, 36, 36, 13, 13,  2,  2,  4, 17, 23,  1,  6,  6,  0,  6,  7, {80,75,82},      2,     0,     7,     6,     7 }, // Punjabi/Arabic/Pakistan
+    {     93,     7,   169,    0,    0,  614,  625,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,  174,   45,    0,    0, 8074, 8074, 8126, 8126, 8153, 8153,   64,   61,    0,    5,   22,  265,10761,    8,    0, 3376, 3384,  6,  6, 11, 10,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 18, 10, 10,  5, 52, 52, 27, 27, 13, 13,  4,  4,  4, 17, 23,  2, 28,  5,  0,  8,  4, {80,69,78},      2,     1,     7,     6,     7 }, // Quechua/Latin/Peru
+    {     93,     7,    26,    0,    0,  614,  625,    6,    1,    0,    2,    3,    4,    5,    9,   10,   11,   12,   13,  174,   45,    0,    0, 8074, 8074, 8126, 8126, 8153, 8153,   64,   61,    0,    5,   22,  267,10789,    8,    0, 3376, 3388,  6,  6, 11, 10,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 18, 10, 10,  5, 52, 52, 27, 27, 13, 13,  4,  4,  4, 17, 23,  2, 24,  5,  0,  8,  7, {66,79,66},      2,     1,     1,     6,     7 }, // Quechua/Latin/Bolivia
+    {     93,     7,    63,    0,    0,  614,  625,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,  174,   45,    0,    0, 8074, 8074, 8126, 8126, 8153, 8153,   64,   61,    0,    5,   22,    6,10813,    8,    0, 3376, 3395,  6,  6, 11, 10,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 18, 10, 10,  5, 52, 52, 27, 27, 13, 13,  4,  4,  4, 17, 23,  1, 36,  5,  0,  8,  7, {85,83,68},      2,     1,     1,     6,     7 }, // Quechua/Latin/Ecuador
+    {     94,     7,   206,    0,    0,    0,    0,    6,    0,   13,    2,    3,   38,    5,    9,   15,   16,   17,   18,  997,  347,    0,    0, 8166, 8166, 8221, 8221, 8243, 8243,    0,    0,    0,    5,   22,  208,10849,   13,    0, 3402, 3411,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 23,  8, 10,  5, 55, 55, 22, 22, 13, 13,  2,  2,  4, 17, 23,  3, 45,  5,  0,  9,  6, {67,72,70},      2,     0,     1,     6,     7 }, // Romansh/Latin/Switzerland
+    {     95,     7,   177,    0,    0,  635,  635,    6,    1,    0,    2,    3,    4,    5,    9,   40,   11,   15,   16,    0,  501,    0,    0, 8256, 8256, 8303, 8303, 3015, 3015,   64,   61,  766,    5,   22,  269,10894,   13,    0, 3417, 3423,  6,  6,  8,  8,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 10,  5, 47, 47, 33, 33, 13, 13,  4,  4,  4, 17, 23,  3, 56,  5,  0,  6,  7, {82,79,78},      2,     1,     1,     6,     7 }, // Romanian/Latin/Romania
+    {     95,     7,   141,    0,    0,  635,  635,    6,    1,    0,    2,    3,    4,    5,    9,   40,   11,   15,   16,    0,  501,    0,    0, 8256, 8256, 8336, 8336, 8363, 8363,   64,   61,  766,    5,   22,    7,10950,   13,    0, 3417, 3430,  6,  6,  8,  8,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 10,  5, 47, 47, 27, 27, 15, 15,  4,  4,  4, 17, 23,  1, 68,  5,  0,  6, 17, {77,68,76},      2,     1,     1,     6,     7 }, // Romanian/Latin/Moldova
+    {     96,     2,   178,    0,    0,  113,  113,    6,    1,   14,    2,    3,    4,    5,    9,   15,   16,   40,   10,  295,  501,    0,    0, 8378, 8378, 8439, 8439, 8459, 8439,    0,    0,  265,  668,   22,  121,11018,   13,    0, 3447, 3454,  6,  6,  7,  7,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 22, 10, 10,  5, 61, 61, 20, 20, 13, 20,  2,  2,  5, 17, 23,  1, 88,  5,  0,  7,  6, {82,85,66},      2,     1,     1,     6,     7 }, // Russian/Cyrillic/Russia
+    {     96,     2,    20,    0,    0,  113,  113,    6,    1,   14,    2,    3,    4,    5,    9,   15,   16,   40,   10,  295,  501,    0,    0, 8378, 8378, 8439, 8439, 8459, 8439,    0,    0,  265,  668,   22,    0,11106,   13,    0, 3447,  510,  6,  6,  7,  7,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 22, 10, 10,  5, 61, 61, 20, 20, 13, 20,  2,  2,  5, 17, 23,  2, 93,  5,  0,  7,  8, {66,89,78},      2,     0,     1,     6,     7 }, // Russian/Cyrillic/Belarus
+    {     96,     2,   110,    0,    0,  113,  113,    6,    1,   14,    2,    3,    4,    5,    9,   15,   16,   40,   10,  295,  501,    0,    0, 8378, 8378, 8439, 8439, 8459, 8439,    0,    0,  265,  668,   22,  228,11199,   13,    0, 3447, 3460,  6,  6,  7,  7,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 22, 10, 10,  5, 61, 61, 20, 20, 13, 20,  2,  2,  5, 17, 23,  1, 82,  5,  0,  7,  9, {75,90,84},      2,     1,     1,     6,     7 }, // Russian/Cyrillic/Kazakhstan
+    {     96,     2,   116,    0,    0,  113,  113,    6,    1,   14,    2,    3,    4,    5,    9,   15,   16,   40,   10,  295,  501,    0,    0, 8378, 8378, 8439, 8439, 8459, 8439,    0,    0,  265,  668,   22,  229,11281,   13,    0, 3447, 3469,  6,  6,  7,  7,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 22, 10, 10,  5, 61, 61, 20, 20, 13, 20,  2,  2,  5, 17, 23,  3, 81,  5,  0,  7,  8, {75,71,83},      2,     1,     1,     6,     7 }, // Russian/Cyrillic/Kyrgyzstan
+    {     96,     2,   141,    0,    0,  113,  113,    6,    1,   14,    2,    3,    4,    5,    9,   15,   16,   40,   10,  295,  501,    0,    0, 8378, 8378, 8439, 8439, 8459, 8439,    0,    0,  265,  668,   22,    7,11362,   13,    0, 3447, 3477,  6,  6,  7,  7,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 22, 10, 10,  5, 61, 61, 20, 20, 13, 20,  2,  2,  5, 17, 23,  1, 78,  5,  0,  7,  7, {77,68,76},      2,     1,     1,     6,     7 }, // Russian/Cyrillic/Moldova
+    {     96,     2,   222,    0,    0,  113,  113,    6,    1,   14,    2,    3,    4,    5,    9,   15,   16,   40,   10,  295,  501,    0,    0, 8378, 8378, 8439, 8439, 8459, 8439,    0,    0,  265,  668,   22,  272,11440,   13,    0, 3447, 3484,  6,  6,  7,  7,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 22, 10, 10,  5, 61, 61, 20, 20, 13, 20,  2,  2,  5, 17, 23,  1, 91,  5,  0,  7,  7, {85,65,72},      2,     1,     1,     6,     7 }, // Russian/Cyrillic/Ukraine
+    {     98,     7,    41,    0,    0,    0,    0,    6,    1,    0,    2,    3,    4,    5,    9,   15,   16,   10,   11,   97,  398,    0,    0, 8472, 8472, 8537, 8537, 8564, 8564,  233,  223,    0,    5,   22,   32,11531,    4,   36, 3491, 3496,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 16,  8, 10,  5, 65, 65, 27, 27, 13, 13,  2,  2,  4, 17, 23,  4, 18,  4,  5,  5, 22, {88,65,70},      0,     0,     1,     6,     7 }, // Sango/Latin/Central African Republic
+    {     99,    13,   100,    0,    0,    0,    0,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,   53,   70,    0,    0,   56,   56,   56,   56,   83,   83,    0,    0,    0,    5,   22,  119,    0,    8,    0,    0,    0,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 10,  5, 27, 27, 27, 27, 13, 13,  2,  2,  4, 17, 23,  1,  0,  5,  0,  0,  0, {73,78,82},      2,     1,     7,     7,     7 }, // Sanskrit/Devanagari/India
+    {    100,     2,   243,    0,    0,  113,  113,    6,    1,    0,    2,    3,    4,    5,    9,   40,   10,   12,   12, 1020, 1040,    0,    0, 8577, 8577, 8628, 8628, 8655, 8655,  235,  225,  770,    5,   22,  273,11549,   13,    0, 3518, 3524,  6,  6,  7,  7,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 20,  7, 10,  5, 51, 51, 27, 27, 13, 13,  9,  8,  7, 17, 23,  3, 57,  5,  0,  6,  6, {82,83,68},      0,     0,     1,     6,     7 }, // Serbian/Cyrillic/Serbia
+    {    100,     7,    27,    0,    0,  161,  161,    6,    1,    0,    2,    3,    4,    5,    9,   40,   10,   12,   12, 1020, 1040,    0,    0, 8668, 8668, 8724, 8724, 2066, 2066,  244,  233,  315,    5,   22,  141,11606,   13,    0, 3530,  629,  6,  6,  7,  7,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 20,  7, 10,  5, 56, 56, 25, 25, 13, 13, 11,  8,  7, 17, 23,  2,173,  5,  0,  6, 19, {66,65,77},      2,     1,     1,     6,     7 }, // Serbian/Latin/Bosnia And Herzegowina
+    {    100,     7,   242,    0,    0,  161,  161,    6,    1,    0,    2,    3,    4,    5,    9,   40,   10,   12,   12, 1020, 1040,    0,    0, 8668, 8668, 8749, 8749, 2066, 2066,  244,  233,  315,    5,   22,   14,11779,   13,    0, 3530, 3536,  6,  6,  7,  7,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 20,  7, 10,  5, 56, 56, 27, 27, 13, 13, 11,  8,  7, 17, 23,  1, 22,  5,  0,  6,  9, {69,85,82},      2,     1,     1,     6,     7 }, // Serbian/Latin/Montenegro
+    {    100,     7,   243,    0,    0,  161,  161,    6,    1,    0,    2,    3,    4,    5,    9,   40,   10,   12,   12, 1020, 1040,    0,    0, 8776, 8776, 8749, 8749, 2066, 2066,  255,  233,  315,    5,   22,  273,11801,   13,    0, 3530, 3545,  6,  6,  7,  7,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 20,  7, 10,  5, 53, 53, 27, 27, 13, 13,  9,  8,  7, 17, 23,  3, 57,  5,  0,  6,  6, {82,83,68},      0,     0,     1,     6,     7 }, // Serbian/Latin/Serbia
+    {    100,     2,    27,    0,    0,  113,  113,    6,    1,    0,    2,    3,    4,    5,    9,   40,   10,   12,   12, 1020, 1040,    0,    0, 8829, 8829, 8883, 8883, 8655, 8655,  264,  225,  770,    5,   22,  276,11858,   13,    0, 3518, 3551,  6,  6,  7,  7,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 20,  7, 10,  5, 54, 54, 25, 25, 13, 13, 11,  8,  7, 17, 23,  2,173,  5,  0,  6, 19, {66,65,77},      2,     1,     1,     6,     7 }, // Serbian/Cyrillic/Bosnia And Herzegowina
+    {    100,     2,   242,    0,    0,  113,  113,    6,    1,    0,    2,    3,    4,    5,    9,   40,   10,   12,   12, 1020, 1040,    0,    0, 8829, 8829, 8628, 8628, 8655, 8655,  264,  225,  770,    5,   22,   14,12031,   13,    0, 3518, 3570,  6,  6,  7,  7,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 20,  7, 10,  5, 54, 54, 27, 27, 13, 13, 11,  8,  7, 17, 23,  1, 22,  5,  0,  6,  9, {69,85,82},      2,     1,     1,     6,     7 }, // Serbian/Cyrillic/Montenegro
+    {    100,     2,   257,    0,    0,  113,  113,    6,    1,    0,    2,    3,    4,    5,    9,   40,   10,   12,   12, 1020, 1040,    0,    0, 8577, 8577, 8628, 8628, 8655, 8655,  235,  225,  770,    5,   22,   14,12031,   13,    0, 3518, 3579,  6,  6,  7,  7,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 20,  7, 10,  5, 51, 51, 27, 27, 13, 13,  9,  8,  7, 17, 23,  1, 22,  5,  0,  6,  6, {69,85,82},      2,     1,     1,     6,     7 }, // Serbian/Cyrillic/Kosovo
+    {    100,     7,   257,    0,    0,  161,  161,    6,    1,    0,    2,    3,    4,    5,    9,   40,   10,   12,   12, 1020, 1040,    0,    0, 8776, 8776, 8749, 8749, 2066, 2066,  255,  233,  315,    5,   22,   14,11779,   13,    0, 3530, 3585,  6,  6,  7,  7,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 20,  7, 10,  5, 53, 53, 27, 27, 13, 13,  9,  8,  7, 17, 23,  1, 22,  5,  0,  6,  6, {69,85,82},      2,     1,     1,     6,     7 }, // Serbian/Latin/Kosovo
+    {    101,     2,    81,    0,    0,  643,  643,    6,    1,   14,    2,    3,    4,    5,    9,   15,   16,   40,   10, 1047,  166,    0,    0, 8908, 8968, 9028, 9055, 9082, 9082,  275,  241,    0,    5,   22,  215,12053,    8,    0, 3591, 3595,  6,  6,  9,  9,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 23,  8, 10,  5, 60, 60, 27, 27, 13, 13, 15, 15,  4, 17, 23,  1, 16,  5,  0,  4, 11, {71,69,76},      2,     1,     1,     6,     7 }, // Ossetic/Cyrillic/Georgia
+    {    101,     2,   178,    0,    0,  643,  643,    6,    1,   14,    2,    3,    4,    5,    9,   15,   16,   40,   10, 1047,  166,    0,    0, 8908, 8968, 9028, 9055, 9082, 9082,  275,  241,    0,    5,   22,  121,12069,    8,    0, 3591, 3606,  6,  6,  9,  9,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 23,  8, 10,  5, 60, 60, 27, 27, 13, 13, 15, 15,  4, 17, 23,  1, 16,  5,  0,  4,  6, {82,85,66},      2,     1,     1,     6,     7 }, // Ossetic/Cyrillic/Russia
+    {    102,     7,   195,    0,    0,    0,    0,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,   53,   70,    0,    0,   56,   56,   56,   56,   83,   83,    0,    0,    0,    5,   22,    5,    0,    8,    0,    0,    0,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 10,  5, 27, 27, 27, 27, 13, 13,  2,  2,  4, 17, 23,  1,  0,  5,  0,  0,  0, {90,65,82},      2,     1,     7,     6,     7 }, // Southern Sotho/Latin/South Africa
+    {    103,     7,   195,    0,    0,    0,    0,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,   53,   70,    0,    0,   56,   56,   56,   56,   83,   83,    0,    0,    0,    5,   22,    5,    0,    8,    0,    0,    0,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 10,  5, 27, 27, 27, 27, 13, 13,  2,  2,  4, 17, 23,  1,  0,  5,  0,  0,  0, {90,65,82},      2,     1,     7,     6,     7 }, // Tswana/Latin/South Africa
+    {    104,     7,   240,    0,    0,    0,    0,    6,    0,    1,    2,    3,    4,    5,    9,   11,   11,   13,   13,   53,   70,    0,    0, 9095, 9095, 9149, 9149, 9176, 9176,    0,    0,    0,    5,   22,  156,12085,    4,    0, 3612, 1780,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 10,  5, 54, 54, 27, 27, 13, 13,  2,  2,  4, 17, 23,  3, 15,  4,  0,  8,  8, {85,83,68},      2,     1,     7,     6,     7 }, // Shona/Latin/Zimbabwe
+    {    105,     1,   163,    0,    0,  652,  660,   53,   19,   20,   21,   23,   24,   26,   28,   10,   11,   12,   13,   53,   70,   10,   22, 9189, 9189, 9189, 9189, 9223, 9223,  290,  256,  777,  783,   22,  170,12100,    8,    0, 3620, 3624,  6,  6,  8,  7,  1,  1,  1,  2,  1,  2,  2,  2,  1,  1,  1,  1, 17, 10, 12,  7, 34, 34, 34, 34, 30, 30, 11, 11,  6, 61, 23,  2, 42,  5,  0,  4,  7, {80,75,82},      2,     0,     7,     6,     7 }, // Sindhi/Arabic/Pakistan
+    {    106,    32,   198,    0,    0,  667,  676,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,   53,   70,  166,  166, 9253, 9253, 9314, 9314, 9352, 9352,  301,  267,  844,  849,   22,  278,12142,    4,    0, 3631, 3636,  6,  6,  9,  8,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 10,  5, 61, 61, 38, 38, 18, 18,  5,  4,  5, 42, 23,  3, 57,  4,  0,  5, 11, {76,75,82},      2,     1,     1,     6,     7 }, // Sinhala/Sinhala/Sri Lanka
+    {    107,     7,   195,    0,    0,    0,    0,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,   53,   70,    0,    0,   56,   56,   56,   56,   83,   83,    0,    0,    0,    5,   22,    5,    0,    8,    0,    0,    0,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 10,  5, 27, 27, 27, 27, 13, 13,  2,  2,  4, 17, 23,  1,  0,  5,  0,  0,  0, {90,65,82},      2,     1,     7,     6,     7 }, // Swati/Latin/South Africa
+    {    108,     7,   191,    0,    0,  183,  684,    6,    1,   14,    2,    3,    4,    5,    6,   40,   10,   46,   12,  461, 1070,    1,    1, 9370, 9370, 9421, 9421, 9441, 9441,    0,    0,  322,    5,   22,   14,12199,   13,    0, 3647, 3657,  6,  6,  7,  7,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10,  9,  4, 51, 51, 20, 20, 13, 13,  2,  2,  5, 17, 23,  1, 25,  5,  0, 10,  9, {69,85,82},      2,     1,     1,     6,     7 }, // Slovak/Latin/Slovakia
+    {    109,     7,   192,    0,    0,  691,  691,    6,    1,    0,    2,    3,   38,    5,    6,   40,   10,   46,   12, 1020,  440,    0,    0, 9454, 9454, 9505, 9505, 9539, 9539,   60,  271,   50,    5,   22,   14,12224,   13,    0, 3666, 3677,  6,  6,  8,  8,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 19,  9, 10,  5, 51, 51, 34, 34, 13, 13,  4,  4,  4, 17, 23,  1, 27,  5,  0, 11,  9, {69,85,82},      2,     1,     1,     6,     7 }, // Slovenian/Latin/Slovenia
+    {    110,     7,   194,    0,    0,  699,  699,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13, 1080,   45,   10,   22, 9552, 9552, 9598, 9598, 9629, 9629,  306,  275,  891,  897,   22,   92,12251,    4,    0, 3686, 3694,  6,  6,  9,  9,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 19,  8, 12,  7, 46, 46, 31, 31, 14, 14,  2,  2,  6, 17, 23,  1, 20,  4,  0,  8, 10, {83,79,83},      0,     0,     1,     6,     7 }, // Somali/Latin/Somalia
+    {    110,     7,    59,    0,    0,  699,  699,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13, 1080,   45,   10,   22, 9552, 9552, 9598, 9598, 9629, 9629,  306,  275,  891,  897,   22,   36,12271,    4,    0, 3686, 3704,  6,  6,  9,  9,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 19,  8, 12,  7, 46, 46, 31, 31, 14, 14,  2,  2,  6, 17, 23,  3, 49,  4,  0,  8,  7, {68,74,70},      0,     0,     6,     6,     7 }, // Somali/Latin/Djibouti
+    {    110,     7,    69,    0,    0,  699,  699,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13, 1080,   45,   10,   22, 9552, 9552, 9598, 9598, 9629, 9629,  306,  275,  891,  897,   22,    0,12320,    4,    0, 3686, 3711,  6,  6,  9,  9,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 19,  8, 12,  7, 46, 46, 31, 31, 14, 14,  2,  2,  6, 17, 23,  2, 51,  4,  0,  8,  8, {69,84,66},      2,     1,     7,     6,     7 }, // Somali/Latin/Ethiopia
+    {    110,     7,   111,    0,    0,  699,  699,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13, 1080,   45,    0,    0, 9552, 9552, 9598, 9598, 9629, 9629,  306,  275,  891,  897,   22,    2,12371,    4,    0, 3686, 1161,  6,  6,  9,  9,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 19,  8, 10,  5, 46, 46, 31, 31, 14, 14,  2,  2,  6, 17, 23,  3, 51,  4,  0,  8,  5, {75,69,83},      2,     1,     7,     6,     7 }, // Somali/Latin/Kenya
+    {    111,     7,   197,    0,    0,  708,  708,    6,    1,    0,    2,    3,    4,    5,    9,   15,   16,   10,   11,  610,  259,   55,    1, 9643, 9643, 9695, 9695, 8153, 8153,   53,   50,    0,    5,   22,   14, 3032,   13,    0, 3719, 2381,  6,  6,  7,  7,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 27,  6, 11,  4, 52, 52, 34, 34, 13, 13,  5,  5,  5, 17, 23,  1, 19,  5,  0, 17,  6, {69,85,82},      2,     1,     1,     6,     7 }, // Spanish/Latin/Spain
+    {    111,     7,    10,    0,    0,  708,  708,    6,    1,    0,    2,    3,    4,    5,    9,   10,   11,   12,   13,  610,  259,    0,    0, 9643, 9643, 9695, 9695, 3015, 3015,   53,   50,    0,    5,   22,    6,12422,    8,    0, 3719, 3736,  6,  6,  7,  7,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 27,  6, 10,  5, 52, 52, 34, 34, 13, 13,  5,  5,  5, 17, 23,  1, 50,  5,  0,  7,  9, {65,82,83},      2,     1,     1,     6,     7 }, // Spanish/Latin/Argentina
+    {    111,     7,    22,    0,    0,  708,  708,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,  610,  259,    0,    0, 9643, 9643, 9695, 9695, 3015, 4656,   64,   61,    0,    5,   22,    6,12472,    4,    0, 3719, 3745,  6,  6,  7,  7,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 27,  6, 10,  5, 52, 52, 34, 34, 13, 13,  4,  4,  5, 17, 23,  1, 51,  4,  0,  7,  6, {66,90,68},      2,     1,     7,     6,     7 }, // Spanish/Latin/Belize
+    {    111,     7,    26,    0,    0,  708,  708,    6,    1,    0,    2,    3,    4,    5,    9,   10,   11,   12,   13,  610,  259,    0,    0, 9643, 9643, 9695, 9695, 3015, 4656,   53,   50,    0,    5,   22,  267,12523,    4,    0, 3719, 3388,  6,  6,  7,  7,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 27,  6, 10,  5, 52, 52, 34, 34, 13, 13,  5,  5,  5, 17, 23,  2, 34,  4,  0,  7,  7, {66,79,66},      2,     1,     1,     6,     7 }, // Spanish/Latin/Bolivia
+    {    111,     7,    30,    0,    0,  708,  708,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,  610,  259,    0,    0, 9643, 9643, 9695, 9695, 3015, 4656,   64,   61,    0,    5,   22,    5,12557,    4,    0, 3719, 3211,  6,  6,  7,  7,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 27,  6, 10,  5, 52, 52, 34, 34, 13, 13,  4,  4,  5, 17, 23,  2, 51,  4,  0,  7,  6, {66,82,76},      2,     1,     7,     6,     7 }, // Spanish/Latin/Brazil
+    {    111,     7,    43,    0,    0,  708,  708,    6,    1,    0,    2,    3,    4,    5,    9,   10,   11,   12,   13,  610,  347,    0,    0, 9643, 9643, 9695, 9695, 3015, 4656,   53,   50,    0,    5,   22,    6,12608,    4,   36, 3719, 3751,  6,  6,  7,  7,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 27,  8, 10,  5, 52, 52, 34, 34, 13, 13,  5,  5,  5, 17, 23,  1, 44,  4,  5,  7,  5, {67,76,80},      0,     0,     1,     6,     7 }, // Spanish/Latin/Chile
+    {    111,     7,    47,    0,    0,  708,  708,    6,    1,    0,    2,    3,    4,    5,    9,   10,   11,   12,   13,  610,   46,   10,   22, 9643, 9643, 9695, 9695, 4656, 3015,   53,   50,    0,    5,   22,    6,12652,    8,    0, 3719, 3756,  6,  6,  7,  7,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 27,  7, 12,  7, 52, 52, 34, 34, 13, 13,  5,  5,  5, 17, 23,  1, 53,  5,  0,  7,  8, {67,79,80},      2,     0,     7,     6,     7 }, // Spanish/Latin/Colombia
+    {    111,     7,    52,    0,    0,  708,  708,    6,    1,   14,    2,    3,    4,    5,    9,   10,   11,   12,   13,  610,  259,    0,    0, 9643, 9643, 9695, 9695, 3015, 4656,   53,   50,    0,    5,   22,  281,12705,    4,    0, 3719, 3764,  6,  6,  7,  7,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 27,  6, 10,  5, 52, 52, 34, 34, 13, 13,  5,  5,  5, 17, 23,  1, 66,  4,  0,  7, 10, {67,82,67},      2,     0,     1,     6,     7 }, // Spanish/Latin/Costa Rica
+    {    111,     7,    55,    0,    0,  708,  708,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,  610,  259,    0,    0, 9643, 9643, 9695, 9695, 3015, 4656,   64,   61,    0,    5,   22,    6,12771,    4,    0, 3719, 3774,  6,  6,  7,  7,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 27,  6, 10,  5, 52, 52, 34, 34, 13, 13,  4,  4,  5, 17, 23,  1, 41,  4,  0,  7,  4, {67,85,80},      2,     1,     1,     6,     7 }, // Spanish/Latin/Cuba
+    {    111,     7,    61,    0,    0,  708,  708,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,  610,  259,   10,   22, 9643, 9643, 9695, 9695, 3015, 3015,   53,   50,    0,    5,   22,  282,12812,    4,   89, 3719, 3778,  6,  6,  7,  7,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 27,  6, 12,  7, 52, 52, 34, 34, 13, 13,  5,  5,  5, 17, 23,  3, 53,  4,  6,  7, 20, {68,79,80},      2,     1,     7,     6,     7 }, // Spanish/Latin/Dominican Republic
+    {    111,     7,    63,    0,    0,  708,  708,    6,    1,    0,    2,    3,    4,    5,    9,   10,   11,   12,   13,  610,  259,    0,    0, 9643, 9643, 9695, 9695, 3015, 4656,   53,   50,    0,    5,   22,    6,12865,    4,   36, 3719, 3395,  6,  6,  7,  7,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 27,  6, 10,  5, 52, 52, 34, 34, 13, 13,  5,  5,  5, 17, 23,  1, 69,  4,  5,  7,  7, {85,83,68},      2,     1,     1,     6,     7 }, // Spanish/Latin/Ecuador
+    {    111,     7,    65,    0,    0,  708,  708,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,  610,  259,    0,    0, 9643, 9643, 9695, 9695, 3015, 4656,   53,   50,    0,    5,   22,    6,12865,    4,    0, 3719, 3798,  6,  6,  7,  7,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 27,  6, 10,  5, 52, 52, 34, 34, 13, 13,  5,  5,  5, 17, 23,  1, 69,  4,  0,  7, 11, {85,83,68},      2,     1,     7,     6,     7 }, // Spanish/Latin/El Salvador
+    {    111,     7,    66,    0,    0,  708,  708,    6,    1,    0,    2,    3,    4,    5,    9,   15,   16,   10,   11,  610,  259,   55,    1, 9643, 9643, 9695, 9695, 8153, 8153,   53,   50,    0,    5,   22,   32,12934,    4,    0, 3719, 3809,  6,  6,  7,  7,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 27,  6, 11,  4, 52, 52, 34, 34, 13, 13,  5,  5,  5, 17, 23,  4, 91,  4,  0,  7, 17, {88,65,70},      0,     0,     1,     6,     7 }, // Spanish/Latin/Equatorial Guinea
+    {    111,     7,    90,    0,    0,  708,  708,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,  610,   46,    0,    0, 9643, 9643, 9695, 9695, 3015, 4656,   53,   50,    0,    5,   22,  285,13025,   18,    0, 3719, 3826,  6,  6,  7,  7,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 27,  7, 10,  5, 52, 52, 34, 34, 13, 13,  5,  5,  5, 17, 23,  1, 29,  5,  0,  7,  9, {71,84,81},      2,     1,     7,     6,     7 }, // Spanish/Latin/Guatemala
+    {    111,     7,    96,    0,    0,  708,  708,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13, 1099,  259,    0,    0, 9643, 9643, 9695, 9695, 3015, 4656,   53,   50,    0,    5,   22,    7,13054,    4,    0, 3719, 3835,  6,  6,  7,  7,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 27,  6, 10,  5, 52, 52, 34, 34, 13, 13,  5,  5,  5, 17, 23,  1, 59,  4,  0,  7,  8, {72,78,76},      2,     1,     7,     6,     7 }, // Spanish/Latin/Honduras
+    {    111,     7,   139,    0,    0,  708,  708,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,  610,   45,    1,    1, 9643, 9643, 9695, 9695, 3015, 3015,   53,   50,    0,    5,   22,    6,13113,   47,    0, 3843, 3860,  6,  6,  7,  7,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 27,  8,  9,  4, 52, 52, 34, 34, 13, 13,  5,  5,  5, 17, 23,  1, 47,  6,  0, 17,  6, {77,88,78},      2,     1,     7,     6,     7 }, // Spanish/Latin/Mexico
+    {    111,     7,   155,    0,    0,  708,  708,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,  610,  259,    0,    0, 9643, 9643, 9695, 9695, 3015, 4656,   53,   50,    0,    5,   22,  286,13160,    4,    0, 3719, 3866,  6,  6,  7,  7,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 27,  6, 10,  5, 52, 52, 34, 34, 13, 13,  5,  5,  5, 17, 23,  2, 68,  4,  0,  7,  9, {78,73,79},      2,     1,     7,     6,     7 }, // Spanish/Latin/Nicaragua
+    {    111,     7,   166,    0,    0,  708,  708,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,  610, 1126,   10,   22, 9643, 9643, 9695, 9695, 3015, 4656,   53,   50,    0,    5,   22,  288,13228,    4,    0, 3719, 3875,  6,  6,  7,  7,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 27,  8, 12,  7, 52, 52, 34, 34, 13, 13,  5,  5,  5, 17, 23,  3, 53,  4,  0,  7,  6, {80,65,66},      2,     1,     7,     6,     7 }, // Spanish/Latin/Panama
+    {    111,     7,   168,    0,    0,  708,  708,    6,    1,    0,    2,    3,    4,    5,    9,   10,   11,   12,   13,  610,  259,    0,    0, 9643, 9643, 9695, 9695, 3015, 4656,   53,   50,    0,    5,   22,  291,13281,    8,   23, 3719, 3881,  6,  6,  7,  7,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 27,  6, 10,  5, 52, 52, 34, 34, 13, 13,  5,  5,  5, 17, 23,  3, 60,  5,  6,  7,  8, {80,89,71},      0,     0,     7,     6,     7 }, // Spanish/Latin/Paraguay
+    {    111,     7,   169,    0,    0,  708,  708,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,  610,   46,    0,    0, 9643, 9643, 9695, 9695, 3015, 4656,   53,   50,    0,    5,   22,  265,13341,    8,    0, 3719, 3384,  6,  6,  7,  7,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 27,  7, 10,  5, 52, 52, 34, 34, 13, 13,  5,  5,  5, 17, 23,  2, 42,  5,  0,  7,  4, {80,69,78},      2,     1,     7,     6,     7 }, // Spanish/Latin/Peru
+    {    111,     7,   170,    0,    0,  708,  708,    6,    1,    0,    2,    3,    4,    5,    9,   15,   16,   10,   11,  610,  259,   10,   22, 9643, 9643, 9695, 9695, 8153, 8153,   53,   50,    0,    5,   22,  173,13383,   13,    0, 3719, 3889,  6,  6,  7,  7,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 27,  6, 12,  7, 52, 52, 34, 34, 13, 13,  5,  5,  5, 17, 23,  1, 47,  5,  0,  7,  9, {80,72,80},      2,     1,     7,     6,     7 }, // Spanish/Latin/Philippines
+    {    111,     7,   174,    0,    0,  708,  708,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,  610, 1126,   10,   22, 9643, 9643, 9695, 9695, 3015, 4656,   53,   50,    0,    5,   22,    6,12865,    4,    0, 3719, 1416,  6,  6,  7,  7,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 27,  8, 12,  7, 52, 52, 34, 34, 13, 13,  5,  5,  5, 17, 23,  1, 69,  4,  0,  7, 11, {85,83,68},      2,     1,     7,     6,     7 }, // Spanish/Latin/Puerto Rico
+    {    111,     7,   225,    0,    0,  708,  708,    6,    0,    1,    2,    3,    4,    5,    9,   15,   16,   10,   11,  610,  398,   10,   22, 9643, 9643, 9695, 9695, 3015, 3015,   53,   50,    0,    5,   22,    6,12865,   95,    0, 3719, 3898,  6,  6,  7,  7,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 27,  8, 12,  7, 52, 52, 34, 34, 13, 13,  5,  5,  5, 17, 23,  1, 69,  7,  0,  7, 14, {85,83,68},      2,     1,     7,     6,     7 }, // Spanish/Latin/United States
+    {    111,     7,   227,    0,    0,  708,  708,    6,    1,    0,    2,    3,    4,    5,    9,   10,   11,   12,   13,  610,  259,    0,    0, 9643, 9643, 9695, 9695, 3015, 4656,   53,   50,    0,    5,   22,    6,13430,    8,    0, 3719, 3912,  6,  6,  7,  7,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 27,  6, 10,  5, 52, 52, 34, 34, 13, 13,  5,  5,  5, 17, 23,  1, 47,  5,  0,  7,  7, {85,89,85},      2,     1,     1,     6,     7 }, // Spanish/Latin/Uruguay
+    {    111,     7,   231,    0,    0,  708,  708,    6,    1,    0,    2,    3,    4,    5,    9,   10,   11,   12,   13,  610,  259,   10,   22, 9643, 9643, 9695, 9695, 3015, 4656,   53,   50,    0,    5,   22,  294,13477,    4,   36, 3719, 3919,  6,  6,  7,  7,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 27,  6, 12,  7, 52, 52, 34, 34, 13, 13,  5,  5,  5, 17, 23,  4, 57,  4,  5,  7,  9, {86,69,83},      2,     1,     7,     6,     7 }, // Spanish/Latin/Venezuela
+    {    111,     7,   238,    0,    0,  708,  708,    6,    1,    0,    2,    3,    4,    5,    9,   15,   16,   10,   11,  610,  259,   55,    1, 9643, 9643, 9695, 9695, 8153, 8153,   53,   50,    0,    5,   22,   14, 3032,   13,    0, 3719, 3928,  6,  6,  7,  7,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 27,  6, 11,  4, 52, 52, 34, 34, 13, 13,  5,  5,  5, 17, 23,  1, 19,  5,  0,  7,  8, {69,85,82},      2,     1,     1,     6,     7 }, // Spanish/Latin/Canary Islands
+    {    111,     7,   246,    0,    0,  708,  708,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,  610,  259,    0,    0, 9643, 9643, 9695, 9695, 3015, 4656,   64,   61,    0,    5,   22,    0,    0,    4,    0, 3936, 3959,  6,  6,  7,  7,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 27,  6, 10,  5, 52, 52, 34, 34, 13, 13,  4,  4,  5, 17, 23,  0,  0,  4,  0, 23, 13,    {0,0,0},      2,     1,     1,     6,     7 }, // Spanish/Latin/Latin America
+    {    111,     7,   250,    0,    0,  708,  708,    6,    1,    0,    2,    3,    4,    5,    9,   15,   16,   10,   11,  610,  259,   55,    1, 9643, 9643, 9695, 9695, 8153, 8153,   53,   50,    0,    5,   22,   14, 3032,   13,    0, 3719, 3972,  6,  6,  7,  7,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 27,  6, 11,  4, 52, 52, 34, 34, 13, 13,  5,  5,  5, 17, 23,  1, 19,  5,  0,  7, 15, {69,85,82},      2,     1,     1,     6,     7 }, // Spanish/Latin/Ceuta And Melilla
+    {    112,     7,   101,    0,    0,    0,    0,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,   53,   70,    0,    0,   56,   56,   56,   56,   83,   83,    0,    0,    0,    5,   22,  222,    0,    8,    0,    0,    0,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 10,  5, 27, 27, 27, 27, 13, 13,  2,  2,  4, 17, 23,  2,  0,  5,  0,  0,  0, {73,68,82},      2,     0,     7,     6,     7 }, // Sundanese/Latin/Indonesia
+    {    113,     7,   210,    0,    0,  715,  715,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,    0,   45,    0,    0, 9729, 9729, 9729, 9729,   83,   83,    0,    0,  619,  914,   22,  182,13534,    8,    0, 3987, 1585,  6,  6,  8,  8,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 10,  5, 59, 59, 59, 59, 13, 13,  2,  2,  5, 51, 23,  3, 66,  5,  0,  9,  8, {84,90,83},      2,     0,     1,     6,     7 }, // Swahili/Latin/Tanzania
+    {    113,     7,    49,    0,    0,  715,  715,    6,    1,    0,    2,    3,    4,    5,    9,   10,   11,   12,   13,    0,   45,    0,    0, 9729, 9729, 9729, 9729,   83,   83,    0,    0,  619,  914,   22,   32,13600,    8,    0, 3987, 3996,  6,  6,  8,  8,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 10,  5, 59, 59, 59, 59, 13, 13,  2,  2,  5, 51, 23,  2, 54,  5,  0,  9, 32, {67,68,70},      2,     1,     1,     6,     7 }, // Swahili/Latin/Congo Kinshasa
+    {    113,     7,   111,    0,    0,  715,  715,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,    0,   45,    0,    0, 9729, 9729, 9729, 9729,   83,   83,    0,    0,  619,  914,   22,    2,13654,  102,  108, 3987, 1161,  6,  6,  8,  8,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 10,  5, 59, 59, 59, 59, 13, 13,  2,  2,  5, 51, 23,  3, 57,  6,  6,  9,  5, {75,69,83},      2,     1,     7,     6,     7 }, // Swahili/Latin/Kenya
+    {    113,     7,   221,    0,    0,  715,  715,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,    0,   45,    0,    0, 9729, 9729, 9729, 9729,   83,   83,    0,    0,  619,  914,   22,  187,13711,    8,    0, 3987, 1650,  6,  6,  8,  8,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 10,  5, 59, 59, 59, 59, 13, 13,  2,  2,  5, 51, 23,  3, 60,  5,  0,  9,  6, {85,71,88},      0,     0,     1,     7,     7 }, // Swahili/Latin/Uganda
+    {    114,     7,   205,    0,    0,  723,  723,    6,    1,   14,    2,    3,   38,    5,   47,   11,   11,   13,   13,   97,   70,  346,    0, 9788, 9788, 9837, 9837, 2284, 2284,  308,  277,    0,    5,   22,  145,13771,   13,    0, 4028, 4035,  6,  6,  9,  9,  1,  1,  1,  1,  1,  1,  1,  4,  1,  1,  1,  1, 16, 10, 16,  5, 49, 49, 28, 28, 13, 13,  2,  2,  4, 17, 23,  2, 44,  5,  0,  7,  7, {83,69,75},      2,     0,     1,     6,     7 }, // Swedish/Latin/Sweden
+    {    114,     7,    73,    0,    0,  723,  723,    6,    1,   14,    2,    3,   38,    5,   47,   11,   11,   13,   13,   97,   70,  346,    0, 9788, 9788, 9837, 9837, 2284, 2284,  308,  277,    0,    5,   22,   14, 3032,   13,    0, 4028, 1063,  6,  6,  9,  9,  1,  1,  1,  1,  1,  1,  1,  4,  1,  1,  1,  1, 16, 10, 16,  5, 49, 49, 28, 28, 13, 13,  2,  2,  4, 17, 23,  1, 18,  5,  0,  7,  7, {69,85,82},      2,     1,     1,     6,     7 }, // Swedish/Latin/Finland
+    {    114,     7,   248,    0,    0,  723,  723,    6,    1,   14,    2,    3,   38,    5,   47,   11,   11,   13,   13,   97,   70,  346,    0, 9788, 9788, 9837, 9837, 2284, 2284,  308,  277,    0,    5,   22,   14, 3032,   13,    0, 4028, 4042,  6,  6,  9,  9,  1,  1,  1,  1,  1,  1,  1,  4,  1,  1,  1,  1, 16, 10, 16,  5, 49, 49, 28, 28, 13, 13,  2,  2,  4, 17, 23,  1, 18,  5,  0,  7,  5, {69,85,82},      2,     1,     1,     6,     7 }, // Swedish/Latin/Aland Islands
+    {    115,     7,   106,    0,    0,    0,    0,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,   53,   70,    0,    0,   56,   56,   56,   56,   83,   83,    0,    0,    0,    5,   22,   14,    0,    8,    0,    0,    0,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 10,  5, 27, 27, 27, 27, 13, 13,  2,  2,  4, 17, 23,  1,  0,  5,  0,  0,  0, {69,85,82},      2,     1,     1,     6,     7 }, // Sardinian/Latin/Italy
+    {    116,     2,   209,    0,    0,    0,    0,    6,    1,   14,    2,    3,    4,    5,    9,   10,   11,   12,   13,  527,   45,    0,    0, 9865, 9865, 9919, 9919, 9946, 9946,    0,    0,    0,    5,   22,  298,13815,   13,    0, 4047, 4053,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 18,  8, 10,  5, 54, 54, 27, 27, 13, 13,  2,  2,  4, 17, 23,  4, 18,  5,  0,  6, 10, {84,74,83},      2,     1,     1,     6,     7 }, // Tajik/Cyrillic/Tajikistan
+    {    117,    27,   100,    0,    0,  732,  732,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,  174,  259,  362,  315, 9959, 9959,10007,10007,10045,10045,  310,  279,  965,    5,   22,  119,13833,    8,    0, 4063, 4068,  6,  6, 13, 13,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 18,  6, 12,  7, 48, 48, 38, 38, 19, 19,  8,  8,  7, 17, 23,  1, 48,  5,  0,  5,  7, {73,78,82},      2,     1,     7,     7,     7 }, // Tamil/Tamil/India
+    {    117,    27,   130,    0,    0,  732,  732,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,  174,  259,  362,  315, 9959, 9959,10007,10007,10045,10045,  310,  279,  965,    5,   22,  168,13881,    8,    0, 4063, 4075,  6,  6, 13, 13,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 18,  6, 12,  7, 48, 48, 38, 38, 19, 19,  8,  8,  7, 17, 23,  2, 60,  5,  0,  5,  7, {77,89,82},      2,     1,     1,     6,     7 }, // Tamil/Tamil/Malaysia
+    {    117,    27,   190,    0,    0,  732,  732,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,  174,  259,  362,  315, 9959, 9959,10007,10007,10045,10045,  310,  279,  965,    5,   22,    6,13941,    8,    0, 4063, 4082,  6,  6, 13, 13,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 18,  6, 12,  7, 48, 48, 38, 38, 19, 19,  8,  8,  7, 17, 23,  1, 60,  5,  0,  5, 11, {83,71,68},      2,     1,     7,     6,     7 }, // Tamil/Tamil/Singapore
+    {    117,    27,   198,    0,    0,  732,  732,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,  174,  259,    0,    0, 9959, 9959,10007,10007,10045,10045,  310,  279,  965,    5,   22,  302,14001,    8,    0, 4063, 4093,  6,  6, 13, 13,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 18,  6, 10,  5, 48, 48, 38, 38, 19, 19,  8,  8,  7, 17, 23,  3, 48,  5,  0,  5,  6, {76,75,82},      2,     1,     1,     6,     7 }, // Tamil/Tamil/Sri Lanka
+    {    118,     2,   178,    0,    0,  745,  745,    6,    1,   14,    2,    3,    4,    5,    9,   10,   11,   12,   13, 1134,  501,    1,    1,10064,10064,10119,10119,10154,10154,    0,    0,    0,    5,   22,  121,14049,    0,    0, 4099, 3454,  6,  6,  9,  9,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 23, 10,  9,  4, 55, 55, 35, 35, 13, 13,  2,  2,  4, 17, 23,  1, 20,  4,  0,  5,  6, {82,85,66},      2,     1,     1,     6,     7 }, // Tatar/Cyrillic/Russia
+    {    119,    28,   100,    0,    0,  754,  754,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13, 1157,  347,   10,   22,10167,10167,10226,10226,10257,10257,    0,    0,  972,  979,   22,  119,14069,    4,    0, 4104, 4110,  6,  6, 11, 11,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 18,  8, 12,  7, 59, 59, 31, 31, 17, 17,  2,  2,  7, 29, 23,  1, 25,  4,  0,  6,  8, {73,78,82},      2,     1,     7,     7,     7 }, // Telugu/Telugu/India
+    {    120,    30,   211,  120,  120,  765,  773,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13, 1175,  259,  374,    0,10274,10274,10341,10341,10363,10363,  318,  287, 1008,    5,   22,  305,14094,    4,    0, 4118, 4118,  5,  5,  8,  7,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 19,  6, 28,  5, 67, 67, 22, 22, 15, 15, 10, 10,  4, 17, 23,  1, 15,  4,  0,  3,  3, {84,72,66},      2,     1,     7,     6,     7 }, // Thai/Thai/Thailand
+    {    121,    31,    44,    0,    0,    0,    0,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13, 1194,   70,   10,   22,10378,10378,10456,10456,10506,10506,  328,  297,    0,    5,   22,  130,14109,    8,    0, 4121, 4129,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 23, 10, 12,  7, 78, 78, 50, 50, 26, 26,  7,  8,  4, 17, 23,  1,  6,  5,  0,  8,  6, {67,78,89},      2,     1,     7,     6,     7 }, // Tibetan/Tibetan/China
+    {    121,    31,   100,    0,    0,    0,    0,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13, 1194,   70,   10,   22,10378,10378,10456,10456,10506,10506,  328,  297,    0,    5,   22,  119,14115,    8,    0, 4121, 4135,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 23, 10, 12,  7, 78, 78, 50, 50, 26, 26,  7,  8,  4, 17, 23,  1, 12,  5,  0,  8,  7, {73,78,82},      2,     1,     7,     7,     7 }, // Tibetan/Tibetan/India
+    {    122,    14,    69,    0,    0,    0,    0,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13, 1217,   45,   10,   22,10532,10532,10560,10560,10580,10593,  335,  305,    0,    5,   22,    0,  254,    4,    0, 4142,   92,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 23,  8, 12,  7, 28, 28, 20, 20, 13, 13,  7,  7,  4, 17, 23,  2,  9,  4,  0,  4,  5, {69,84,66},      2,     1,     7,     6,     7 }, // Tigrinya/Ethiopic/Ethiopia
+    {    122,    14,    67,    0,    0,    0,    0,    6,    0,    1,    2,    3,    4,    5,    9,   12,   13,   10,   11, 1217,   45,   10,   22,10532,10532,10560,10560,10593,10593,  335,  305,    0,    5,   22,   39,    0,    4,    0, 4142, 4146,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 23,  8, 12,  7, 28, 28, 20, 20, 13, 13,  7,  7,  4, 17, 23,  3,  0,  4,  0,  4,  4, {69,82,78},      2,     1,     1,     6,     7 }, // Tigrinya/Ethiopic/Eritrea
+    {    123,     7,   214,  780,  780,  780,  780,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,   97,  259,   10,   22,10606,10606,10665,10665,10693,10693,  342,  312, 1012, 1017, 1076,  185,14127,   13,    0, 4150, 1600,  8,  8,  8,  8,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 16,  6, 12,  7, 59, 59, 28, 28, 13, 13, 10,  6,  5, 59, 65,  2, 40,  5,  0, 13,  5, {84,79,80},      2,     1,     1,     6,     7 }, // Tongan/Latin/Tonga
+    {    124,     7,   195,    0,    0,    0,    0,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,   53,   70,    0,    0,   56,   56,   56,   56,   83,   83,    0,    0,    0,    5,   22,    5,    0,    8,    0,    0,    0,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 10,  5, 27, 27, 27, 27, 13, 13,  2,  2,  4, 17, 23,  1,  0,  5,  0,  0,  0, {90,65,82},      2,     1,     7,     6,     7 }, // Tsonga/Latin/South Africa
+    {    125,     7,   217,    0,    0,  788,  788,    6,    1,    0,    2,    3,    4,    5,    9,   10,   11,   12,   13, 1240,  502,    0,    0,10706,10706,10759,10759,10786,10786,  352,  318,  195,    5,   22,  236,14167,    4,    0, 4163, 4169,  6,  6,  8,  8,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 16,  9, 10,  5, 53, 53, 27, 27, 13, 13,  2,  2,  4, 17, 23,  1, 39,  4,  0,  6,  7, {84,82,89},      2,     1,     1,     6,     7 }, // Turkish/Latin/Turkey
+    {    125,     7,    56,    0,    0,  788,  788,    6,    1,    0,    2,    3,    4,    5,    9,   10,   11,   12,   13, 1240,  502,   10,   22,10706,10706,10759,10759,10786,10786,  352,  318,  195,    5,   22,   14, 8263,    4,    0, 4163, 4176,  6,  6,  8,  8,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 16,  9, 12,  7, 53, 53, 27, 27, 13, 13,  2,  2,  4, 17, 23,  1, 18,  4,  0,  6,  6, {69,85,82},      2,     1,     1,     6,     7 }, // Turkish/Latin/Cyprus
+    {    126,     7,   218,    0,    0,  796,  796,    6,    1,   14,    2,    3,    4,    5,    9,   10,   11,   10,   11, 1240,  501,    0,    0,10799,10852,10905,10932,10959,10959,  354,  320, 1141,    5,   22,  306,14206,   13,    0, 4182, 4194,  6,  6,  8,  8,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 16, 10, 10,  5, 53, 53, 27, 27, 13, 13, 13, 14,  4, 17, 23,  3, 48,  5,  0, 12, 12, {84,77,84},      2,     1,     1,     6,     7 }, // Turkmen/Latin/Turkmenistan
+    {    128,     1,    44,    0,    0,  198,  208,    6,    0,    1,    2,    3,    4,    5,    9,   16,   15,   18,   17, 1256,   70,   10,   22,10972,10972,11026,11026,11046,11046,  367,  334,    0,    5,   22,  227,14254,    4,    0, 4206, 4214,  6,  6, 10,  9,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 12,  7, 54, 54, 20, 20, 13, 13, 12, 12,  4, 17, 23,  1, 39,  4,  0,  8,  5, {67,78,89},      2,     1,     7,     6,     7 }, // Uighur/Arabic/China
+    {    129,     2,   222,    0,    0,  136,  136,    6,    1,   14,    2,    3,    4,    5,   63,   15,   16,   40,   10, 1273,  166,    0,    0,11059,11059, 1466, 1466,11114,11114,  379,  346, 1145,  668,   22,  272,14293,   13,    0, 4219, 4229,  6,  6,  7,  7,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 22,  8, 10,  5, 55, 55, 20, 20, 13, 13,  2,  2,  5, 17, 23,  1, 48,  5,  0, 10,  7, {85,65,72},      2,     1,     1,     6,     7 }, // Ukrainian/Cyrillic/Ukraine
+    {    130,     1,   163,  560,  560,  804,  814,    6,    0,    1,    2,    3,   33,   35,    9,   11,   10,   13,   12, 1295,  259,   10,   22,11127,11127,11127,11127,   83,   83,    0,    0, 1150, 1154,   22,  170,14341,    4,    0, 4236, 3170,  6,  6, 10,  9,  1,  1,  1,  1,  1,  2,  2,  1,  1,  1,  1,  1, 18,  6, 12,  7, 35, 35, 35, 35, 13, 13,  2,  2,  4, 20, 23,  2, 48,  4,  0,  4,  7, {80,75,82},      2,     0,     7,     6,     7 }, // Urdu/Arabic/Pakistan
+    {    130,     1,   100,  560,  560,  823,  823,    6,   19,   20,    2,   52,   33,   53,   56,   11,   10,   13,   12, 1295,  259,   10,   22,11127,11127,11127,11127,   83,   83,    0,    0, 1150, 1154,   22,  119,14389,    8,    0, 4236, 4240,  6,  6,  6,  6,  1,  1,  1,  1,  1,  3,  3,  4,  1,  1,  1,  1, 18,  6, 12,  7, 35, 35, 35, 35, 13, 13,  2,  2,  4, 20, 23,  1, 41,  5,  0,  4,  5, {73,78,82},      2,     1,     7,     7,     7 }, // Urdu/Arabic/India
+    {    131,     7,   228,    0,    0,  829,  829,    6,    1,   14,    2,    3,    4,    5,    9,   10,   11,   13,   12, 1313,   45,   55,    0,11162,11162,11222,11222,11253,11253,  381,  348,  195,    5,   22,  309,14430,   13,    0, 4245, 4251,  6,  6,  8,  8,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 18,  8, 11,  5, 60, 60, 31, 31, 13, 13,  2,  2,  4, 17, 23,  4, 57,  5,  0,  6, 11, {85,90,83},      2,     0,     1,     6,     7 }, // Uzbek/Latin/Uzbekistan
+    {    131,     1,     1,    0,    0,    0,    0,   53,   19,   20,   21,   52,   33,   53,   56,   10,   11,   12,   13, 1331,  390,   55,    1, 7574, 7574,11266,11266,   83,   83,    0,    0,    0,    5,   22,  252, 9961,   13,    0, 4262, 3161,  6,  6,  6,  6,  1,  1,  1,  1,  1,  3,  3,  4,  1,  1,  1,  1, 33,  8, 11,  4, 48, 48, 20, 20, 13, 13,  2,  2,  4, 17, 23,  1,  6,  5,  0,  6,  9, {65,70,78},      0,     0,     6,     4,     5 }, // Uzbek/Arabic/Afghanistan
+    {    131,     2,   228,    0,    0,    0,    0,    6,    1,   14,    2,    3,    4,    5,    9,   10,   11,   12,   13,  637,   45,   54,    0,11286,11286,11338,11338,11365,11365,  383,  350,    0,    5,   22,  313,14487,   13,    0, 4268, 4275,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 19,  8, 12,  5, 52, 52, 27, 27, 13, 13,  2,  2,  4, 17, 23,  3, 48,  5,  0,  7, 10, {85,90,83},      2,     0,     1,     6,     7 }, // Uzbek/Cyrillic/Uzbekistan
+    {    132,     7,   232,    0,    0,  837,  837,    6,    1,    0,    2,    3,    4,    5,    9,   10,   11,   12,   13,  174,   45,    0,    0,11378,11378,11432,11432,11464,11464,  385,  352,    0,    5,   22,  316,14535,   13,    0, 4285, 4295,  6,  6,  8,  8,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 18, 10, 10,  5, 54, 54, 32, 32, 20, 20,  2,  2,  4, 17, 23,  1, 32,  5,  0, 10,  8, {86,78,68},      0,     0,     1,     6,     7 }, // Vietnamese/Latin/Vietnam
+    {    133,     7,   260,    0,    0,    0,    0,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13, 1364,   70,    0,    0,11484,11484,11526,11546,11573,11573,    0,    0,    0,    5,   22,    0,    0,    8,    0, 4303,    0,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 23, 10, 10,  5, 42, 42, 20, 27, 13, 13,  2,  2,  4, 17, 23,  0,  0,  5,  0,  7,  0,    {0,0,0},      2,     1,     1,     6,     7 }, // Volapuk/Latin/World
+    {    134,     7,   224,    0,    0,  845,  856,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,    0,   45,    0,    0,11586,11586,11662,11690,11719,11719,  387,  354, 1174,    5,   22,  117,14567,    4,    0, 4310, 4317,  6,  6, 11, 10,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17,  8, 10,  5, 76, 76, 28, 29, 14, 14,  2,  2,  7, 17, 23,  1, 90,  4,  0,  7, 16, {71,66,80},      2,     1,     1,     6,     7 }, // Welsh/Latin/United Kingdom
+    {    135,     7,   187,    0,    0,    0,    0,    6,    1,    0,    2,    3,    4,    5,    9,   10,   11,   12,   13, 1387,  511,    0,    0,11733,11733,11782,11782,11782,11782,  389,  356,    0,    5,   22,   33,14657,    8,    0, 4333, 4338,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 10,  5, 49, 49, 27, 27, 27, 27,  3,  3,  4, 17, 23,  3, 64,  5,  0,  5,  8, {88,79,70},      0,     0,     1,     6,     7 }, // Wolof/Latin/Senegal
+    {    136,     7,   195,    0,    0,    0,    0,    6,    0,   14,    2,    3,    4,    5,    9,   12,   13,   10,   11,   53,   70,    0,    0,11809,11809,11869,11869,   83,   83,    0,    0,    0,    5,   22,    5,14721,    4,    0, 4346, 4354,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 10,  5, 60, 60, 27, 27, 13, 13,  2,  2,  4, 17, 23,  1, 78,  4,  0,  8, 15, {90,65,82},      2,     1,     7,     6,     7 }, // Xhosa/Latin/South Africa
+    {    137,    18,   260,    0,    0,  866,  866,    6,    0,    1,    2,    3,    4,    5,    9,   11,   11,   13,   13, 1404,   45,    0,    0,11896,11896,11896,11896,   83,   83,  392,  359,    0,    5,   22,    0,    0,   41,    0, 4369, 4375,  6,  6,  9,  9,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 19,  8, 10,  5, 53, 53, 53, 53, 13, 13, 11, 10,  4, 17, 23,  0,  0,  6,  0,  6,  5,    {0,0,0},      2,     1,     1,     6,     7 }, // Yiddish/Hebrew/World
+    {    138,     7,   157,    0,    0,    0,    0,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13, 1423,  398,    0,    1,11949,11992,12060,12060,12092,12092,  403,  369,    0,    5,   22,  172,14799,    4,    0, 4380, 4390,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 16,  8, 10,  3, 43, 68, 32, 32, 13, 13,  5,  5,  4, 17, 23,  1, 48,  4,  0, 10, 19, {78,71,78},      2,     1,     1,     6,     7 }, // Yoruba/Latin/Nigeria
+    {    138,     7,    23,    0,    0,    0,    0,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13, 1423,  398,    0,    1,12105,12148,12216,12216,12248,12248,  408,  374,    0,    5,   22,   33,14847,    4,    0, 4380, 4409,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 16,  8, 10,  3, 43, 68, 32, 32, 13, 13,  5,  5,  4, 17, 23,  3, 27,  4,  0, 10, 16, {88,79,70},      0,     0,     1,     6,     7 }, // Yoruba/Latin/Benin
+    {    140,     7,   195,    0,    0,  875,  884,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,   27,  521,    0,    0,12261,12261,12334,12334,12361,12361,    0,    0,    0,    5,   22,    5,14874,    4,    0, 4425, 4432,  6,  6,  9,  8,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 18,  6, 10,  5, 73, 73, 27, 27, 13, 13,  2,  2,  5, 17, 23,  1, 66,  4,  0,  7, 17, {90,65,82},      2,     1,     7,     6,     7 }, // Zulu/Latin/South Africa
+    {    141,     7,   161,    0,    0,  190,  190,    6,    1,   14,    2,    3,   38,    5,    9,   15,   16,   12,   13,  461,  501,  346,    0,12374,12374,12424,12451, 2284, 2284,  413,  379,    0,    5,   22,  145, 9765,   13,    0, 4449, 4456,  6,  6,  8,  8,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 16,  5, 50, 50, 27, 27, 13, 13,  9, 11,  4, 17, 23,  2, 43,  5,  0,  7,  5, {78,79,75},      2,     0,     1,     6,     7 }, // Norwegian Nynorsk/Latin/Norway
+    {    142,     7,    27,    0,    0,  161,  161,    6,    1,    0,    2,    3,    4,    5,    9,   40,   11,   12,   13,  420, 1439,    0,    0, 1982, 1982, 2039, 2039, 2066, 2079,  422,  390,  315,    5,   22,  141,14940,   13,    0, 4461,  629,  6,  6,  7,  7,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 19, 11, 10,  5, 57, 57, 27, 27, 13, 13, 10,  7,  7, 17, 23,  2,169,  5,  0,  8, 19, {66,65,77},      2,     1,     1,     6,     7 }, // Bosnian/Latin/Bosnia And Herzegowina
+    {    142,     2,    27,    0,    0,  113,  113,    6,    1,    0,    2,    3,    4,    5,    9,   40,   10,   46,   12, 1020, 1040,    0,    0,12478,12478,12533,12533, 8655, 8655,  264,  397,    0,    5,   22,  276,15109,   13,    0, 4469, 3551,  6,  6,  7,  7,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 20,  7, 10,  5, 55, 55, 27, 27, 13, 13, 11, 13,  4, 17, 23,  2,151,  5,  0,  8, 19, {66,65,77},      2,     1,     1,     6,     7 }, // Bosnian/Cyrillic/Bosnia And Herzegowina
+    {    143,    29,   131,    0,    0,    0,    0,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,   53,   70,    0,    0,   56,   56,   56,   56,   83,   83,    0,    0,    0,    5,   22,    0,    0,    8,    0,    0,    0,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 10,  5, 27, 27, 27, 27, 13, 13,  2,  2,  4, 17, 23,  0,  0,  5,  0,  0,  0, {77,86,82},      2,     1,     5,     6,     7 }, // Divehi/Thaana/Maldives
+    {    144,     7,   251,    0,    0,    0,    0,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,   80,   45,    0,    0,12560,12560,12616,12616,   83,   83,   64,   61,    0,    5,   22,  117,    0,    4,    0, 4477, 4482,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17,  8, 10,  5, 56, 56, 29, 29, 13, 13,  4,  4,  4, 17, 23,  1,  0,  4,  0,  5, 12, {71,66,80},      2,     1,     1,     6,     7 }, // Manx/Latin/Isle Of Man
+    {    145,     7,   224,    0,    0,    0,    0,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,   97,   45,    0,    0,12645,12645,12705,12705,   83,   83,   64,   61,    0,    5,   22,  117,    0,    4,    0, 4494, 4502,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 16, 10, 10,  5, 60, 60, 27, 27, 13, 13,  4,  4,  4, 17, 23,  1,  0,  4,  0,  8, 14, {71,66,80},      2,     1,     1,     6,     7 }, // Cornish/Latin/United Kingdom
+    {    146,     7,    83,    0,    0,    0,    0,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13, 1450,  547,   10,   22,12732,12732,12780,12780,12807,12807,  432,  410,    0,    5,   22,  163,15260,    4,    0, 4516, 4520,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 18,  8, 12,  7, 48, 48, 27, 27, 13, 13,  2,  2,  4, 17, 23,  3, 10,  4,  0,  4,  5, {71,72,83},      2,     1,     1,     6,     7 }, // Akan/Latin/Ghana
+    {    147,    13,   100,    0,    0,    0,    0,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,   97,  192,   10,   22,12820,12820,12820,12820,12868,12868,    0,    0, 1181,    5,   22,  119,15270,    4,    0, 4525, 2599,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 16,  6, 12,  7, 48, 48, 48, 48, 19, 19,  2,  2,  4, 17, 23,  1, 30,  4,  0,  6,  4, {73,78,82},      2,     1,     7,     7,     7 }, // Konkani/Devanagari/India
+    {    148,     7,    83,    0,    0,    0,    0,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,   53,   70,    0,    0,   56,   56,   56,   56,   83,   83,    0,    0,    0,    5,   22,    0,    0,    8,    0,    0,    0,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 10,  5, 27, 27, 27, 27, 13, 13,  2,  2,  4, 17, 23,  0,  0,  5,  0,  0,  0, {71,72,83},      2,     1,     1,     6,     7 }, // Ga/Latin/Ghana
+    {    149,     7,   157,    0,    0,  892,  715,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,    0,  259,    0,    0,12887,12887,12940,12940,   83,   83,  434,  412,    0,    5,   22,  172,15300,    4,    0, 4531, 4541,  6,  6,  9,  8,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17,  6, 10,  5, 53, 53, 28, 28, 13, 13,  7,  7,  4, 17, 23,  1,  5,  4,  0, 10,  8, {78,71,78},      2,     1,     1,     6,     7 }, // Igbo/Latin/Nigeria
+    {    150,     7,   111,    0,    0,    0,    0,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,    0,   45,    0,    0,12968,12968,13041,13041,13068,13068,  441,  419,    0,    5,   22,    2,15305,    4,    0, 4549, 1161,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 10,  5, 73, 73, 27, 27, 13, 13,  9,  7,  4, 17, 23,  3, 16,  4,  0,  7,  5, {75,69,83},      2,     1,     7,     6,     7 }, // Kamba/Latin/Kenya
+    {    151,    33,   103,    0,    0,    0,    0,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,   53,   70,    0,    0,   56,   56,   56,   56,   83,   83,    0,    0,    0,    5,   22,    0,    0,    8,    0,    0,    0,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 10,  5, 27, 27, 27, 27, 13, 13,  2,  2,  4, 17, 23,  0,  0,  5,  0,  0,  0, {73,81,68},      0,     0,     6,     5,     6 }, // Syriac/Syriac/Iraq
+    {    152,    14,    67,    0,    0,    0,    0,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,   53,   70,    0,    0,   56,   56,   56,   56,   83,   83,    0,    0,    0,    5,   22,    0,    0,    8,    0,    0,    0,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 10,  5, 27, 27, 27, 27, 13, 13,  2,  2,  4, 17, 23,  0,  0,  5,  0,  0,  0, {69,82,78},      2,     1,     1,     6,     7 }, // Blin/Ethiopic/Eritrea
+    {    153,    14,    69,    0,    0,    0,    0,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,   53,   70,    0,    0,   56,   56,   56,   56,   83,   83,    0,    0,    0,    5,   22,    0,    0,    8,    0,    0,    0,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 10,  5, 27, 27, 27, 27, 13, 13,  2,  2,  4, 17, 23,  0,  0,  5,  0,  0,  0, {69,84,66},      2,     1,     7,     6,     7 }, // Geez/Ethiopic/Ethiopia
+    {    155,     7,    69,    0,    0,    0,    0,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,   53,   70,    0,    0,   56,   56,   56,   56,   83,   83,    0,    0,    0,    5,   22,    0,    0,    8,    0,    0,    0,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 10,  5, 27, 27, 27, 27, 13, 13,  2,  2,  4, 17, 23,  0,  0,  5,  0,  0,  0, {69,84,66},      2,     1,     7,     6,     7 }, // Sidamo/Latin/Ethiopia
+    {    156,     7,   157,    0,    0,    0,    0,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,   53,   70,    0,    0,   56,   56,   56,   56,   83,   83,    0,    0,    0,    5,   22,  172,    0,    8,    0,    0,    0,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 10,  5, 27, 27, 27, 27, 13, 13,  2,  2,  4, 17, 23,  1,  0,  5,  0,  0,  0, {78,71,78},      2,     1,     1,     6,     7 }, // Atsam/Latin/Nigeria
+    {    157,    14,    67,    0,    0,    0,    0,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,   53,   70,    0,    0,   56,   56,   56,   56,   83,   83,    0,    0,    0,    5,   22,    0,    0,    8,    0,    0,    0,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 10,  5, 27, 27, 27, 27, 13, 13,  2,  2,  4, 17, 23,  0,  0,  5,  0,  0,  0, {69,82,78},      2,     1,     1,     6,     7 }, // Tigre/Ethiopic/Eritrea
+    {    158,     7,   157,    0,    0,    0,    0,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,   53,   70,    0,    0,   56,   56,   56,   56,   83,   83,    0,    0,    0,    5,   22,  172,    0,    8,    0,    0,    0,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 10,  5, 27, 27, 27, 27, 13, 13,  2,  2,  4, 17, 23,  1,  0,  5,  0,  0,  0, {78,71,78},      2,     1,     1,     6,     7 }, // Jju/Latin/Nigeria
+    {    159,     7,   106,    0,    0,  252,  252,    6,    1,    0,    2,    3,    4,    5,    9,   12,   13,   10,   11, 1468,   45,    0,    0,13081,13081,13130,13130, 3015, 3015,   53,   50,    0,    5,   22,   14, 3032,    8,    0, 4556, 2453,  6,  6,  7,  7,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 27,  8, 10,  5, 49, 49, 27, 27, 13, 13,  2,  2,  4, 17, 23,  1, 19,  5,  0,  6,  6, {69,85,82},      2,     1,     1,     6,     7 }, // Friulian/Latin/Italy
+    {    160,     7,   195,    0,    0,    0,    0,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,   53,   70,    0,    0,   56,   56,   56,   56,   83,   83,    0,    0,    0,    5,   22,    5,    0,    8,    0,    0,    0,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 10,  5, 27, 27, 27, 27, 13, 13,  2,  2,  4, 17, 23,  1,  0,  5,  0,  0,  0, {90,65,82},      2,     1,     7,     6,     7 }, // Venda/Latin/South Africa
+    {    161,     7,    83,    0,    0,  901,  912,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13, 1495,  521,  402,  402,13157,13157,13200,13200,13227,13227,  450,  426,    0,    5,   22,  163,15321,    4,    0, 4562, 4568,  6,  6, 11, 10,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 23,  6, 17, 12, 43, 43, 27, 27, 13, 13,  3,  5,  4, 17, 23,  3, 36,  4,  0,  6, 12, {71,72,83},      2,     1,     1,     6,     7 }, // Ewe/Latin/Ghana
+    {    161,     7,   212,    0,    0,  901,  912,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13, 1495,  521,    0,    0,13157,13157,13200,13200,13227,13227,  450,  426,    0,    5,   22,   33,15357,    4,    0, 4562, 4580,  6,  6, 11, 10,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 23,  6, 10,  5, 43, 43, 27, 27, 13, 13,  3,  5,  4, 17, 23,  3,105,  4,  0,  6, 11, {88,79,70},      0,     0,     1,     6,     7 }, // Ewe/Latin/Togo
+    {    162,    14,    69,    0,    0,    0,    0,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,   53,   70,    0,    0,   56,   56,   56,   56,   83,   83,    0,    0,    0,    5,   22,    0,    0,    8,    0,    0,    0,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 10,  5, 27, 27, 27, 27, 13, 13,  2,  2,  4, 17, 23,  0,  0,  5,  0,  0,  0, {69,84,66},      2,     1,     7,     6,     7 }, // Walamo/Ethiopic/Ethiopia
+    {    163,     7,   225,    0,    0,    0,    0,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,    0,  259,   10,   22,13240,13240,13296,13296,   83,   83,    0,    0,    0,    5,   22,    6,    0,    4,    0, 4591, 4605,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17,  6, 12,  7, 56, 56, 20, 20, 13, 13,  2,  2,  4, 17, 23,  1,  0,  4,  0, 14, 19, {85,83,68},      2,     1,     7,     6,     7 }, // Hawaiian/Latin/United States
+    {    164,     7,   157,    0,    0,    0,    0,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,   53,   70,    0,    0,   56,   56,   56,   56,   83,   83,    0,    0,    0,    5,   22,  172,    0,    8,    0,    0,    0,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 10,  5, 27, 27, 27, 27, 13, 13,  2,  2,  4, 17, 23,  1,  0,  5,  0,  0,  0, {78,71,78},      2,     1,     1,     6,     7 }, // Tyap/Latin/Nigeria
+    {    165,     7,   129,    0,    0,    0,    0,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,   53,   70,    0,    0,   56,   56,   56,   56,   83,   83,    0,    0,    0,    5,   22,    0,    0,    8,    0,    0,    0,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 10,  5, 27, 27, 27, 27, 13, 13,  2,  2,  4, 17, 23,  0,  0,  5,  0,  0,  0, {77,87,75},      2,     1,     1,     6,     7 }, // Nyanja/Latin/Malawi
+    {    166,     7,   170,    0,    0,  922,  931,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,   27,  521,   10,   22,13316,13316,13370,13370,13370,13370,    0,    0,    0,    5,   22,  173,15462,    4,    0, 4624, 4632,  6,  6,  9,  8,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 18,  6, 12,  7, 54, 54, 27, 27, 27, 27,  2,  2,  5, 17, 23,  1, 57,  4,  0,  8,  9, {80,72,80},      2,     1,     7,     6,     7 }, // Filipino/Latin/Philippines
+    {    167,     7,   206,    0,    0,  267,  267,    6,    0,   13,    2,    3,   38,    5,    9,   15,   16,   17,   18,  420,  166,    0,    0,13397,13397,13459,13459, 3613, 3613,  453,  431,    0,    5,   22,  208,15519,   13,    0, 4641, 4641,  6,  6,  9,  9,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 18,  8, 10,  5, 62, 62, 27, 27, 13, 13, 12, 11,  4, 17, 23,  3, 54,  5,  0, 16,  7, {67,72,70},      2,     0,     1,     6,     7 }, // Swiss German/Latin/Switzerland
+    {    167,     7,    74,    0,    0,  267,  267,    6,    0,   13,    2,    3,   38,    5,    9,   15,   16,   17,   18,  420,  166,    0,    0,13397,13397,13459,13459, 3613, 3613,  453,  431,    0,    5,   22,   14, 8263,   13,    0, 4641, 4657,  6,  6,  9,  9,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 18,  8, 10,  5, 62, 62, 27, 27, 13, 13, 12, 11,  4, 17, 23,  1, 18,  5,  0, 16, 10, {69,85,82},      2,     1,     1,     6,     7 }, // Swiss German/Latin/France
+    {    167,     7,   123,    0,    0,  267,  267,    6,    0,   13,    2,    3,   38,    5,    9,   15,   16,   17,   18,  420,  166,    0,    0,13397,13397,13459,13459, 3613, 3613,  453,  431,    0,    5,   22,  208,15519,   13,    0, 4641, 4667,  6,  6,  9,  9,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 18,  8, 10,  5, 62, 62, 27, 27, 13, 13, 12, 11,  4, 17, 23,  3, 54,  5,  0, 16, 13, {67,72,70},      2,     0,     1,     6,     7 }, // Swiss German/Latin/Liechtenstein
+    {    168,    34,    44,    0,    0,    0,    0,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,   53,   70,   10,   22,13486,13486,13513,13513,13533,13533,  465,  442,    0,    5,   22,  130,    0,    8,    0, 4680, 4683,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 12,  7, 27, 27, 20, 20, 13, 13,  2,  2,  4, 17, 23,  1,  0,  5,  0,  3,  2, {67,78,89},      2,     1,     7,     6,     7 }, // Sichuan Yi/Yi/China
+    {    169,     7,   121,    0,    0,    0,    0,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,   53,   70,    0,    0,   56,   56,   56,   56,   83,   83,    0,    0,    0,    5,   22,    6,    0,    8,    0,    0,    0,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 10,  5, 27, 27, 27, 27, 13, 13,  2,  2,  4, 17, 23,  1,  0,  5,  0,  0,  0, {76,82,68},      2,     1,     1,     6,     7 }, // Kpelle/Latin/Liberia
+    {    170,     7,    82,    0,    0,  459,  459,    6,    1,    0,    2,    3,    4,    5,    9,   40,   10,   46,   12, 1518,  167,  419,  438,13546,13546,13610,13610, 3613, 3613,    0,    0,    0,    5,   22,   14,15573,   13,    0, 4685, 4699,  6,  6,  8,  8,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 23,  7, 19, 10, 64, 64, 27, 27, 13, 13,  2,  2,  4, 17, 23,  1, 14,  5,  0, 14, 11, {69,85,82},      2,     1,     1,     6,     7 }, // Low German/Latin/Germany
+    {    170,     7,   151,    0,    0,  459,  459,    6,    1,    0,    2,    3,    4,    5,    9,   40,   10,   46,   12, 1518,  167,  419,  438,13546,13546,13610,13610, 3613, 3613,    0,    0,    0,    5,   22,   14,15573,   13,    0, 4685, 4710,  6,  6,  8,  8,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 23,  7, 19, 10, 64, 64, 27, 27, 13, 13,  2,  2,  4, 17, 23,  1, 14,  5,  0, 14, 12, {69,85,82},      2,     1,     1,     6,     7 }, // Low German/Latin/Netherlands
+    {    171,     7,   195,    0,    0,    0,    0,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,   53,   70,    0,    0,   56,   56,   56,   56,   83,   83,    0,    0,    0,    5,   22,    5,    0,    8,    0,    0,    0,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 10,  5, 27, 27, 27, 27, 13, 13,  2,  2,  4, 17, 23,  1,  0,  5,  0,  0,  0, {90,65,82},      2,     1,     7,     6,     7 }, // South Ndebele/Latin/South Africa
+    {    172,     7,   195,    0,    0,    0,    0,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,   53,   70,    0,    0,   56,   56,   56,   56,   83,   83,    0,    0,    0,    5,   22,    5,    0,    8,    0,    0,    0,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 10,  5, 27, 27, 27, 27, 13, 13,  2,  2,  4, 17, 23,  1,  0,  5,  0,  0,  0, {90,65,82},      2,     1,     7,     6,     7 }, // Northern Sotho/Latin/South Africa
+    {    173,     7,   161,    0,    0,  226,  226,    6,    1,   14,    2,    3,   38,    5,   64,   11,   11,   13,   13,   53,   70,    0,    0,13637,13637,13711,13711,13743,13743,  467,  444,    0,    5,   22,  145,15587,   13,    0, 4722, 4737,  6,  6,  8,  8,  1,  1,  1,  1,  1,  1,  1,  4,  1,  1,  1,  1, 17, 10, 10,  5, 74, 74, 32, 32, 13, 13, 11, 13,  4, 17, 23,  2, 62,  5,  0, 15,  5, {78,79,75},      2,     0,     1,     6,     7 }, // Northern Sami/Latin/Norway
+    {    173,     7,    73,    0,    0,  226,  226,    6,    1,   14,    2,    3,   38,    5,   64,   11,   11,   13,   13,   97,  501,    0,    0,13756,13756,13825,13825,13845,13845,  478,  457,    0,    5,   22,   14,15649,   13,    0, 4722, 4742,  6,  6,  8,  8,  1,  1,  1,  1,  1,  1,  1,  4,  1,  1,  1,  1, 16, 10, 10,  5, 69, 69, 20, 20, 13, 13,  2,  2,  4, 17, 23,  1, 22,  5,  0, 15,  6, {69,85,82},      2,     1,     1,     6,     7 }, // Northern Sami/Latin/Finland
+    {    173,     7,   205,    0,    0,  226,  226,    6,    1,   14,    2,    3,   38,    5,   64,   11,   11,   13,   13,   53,   70,    0,    0,13637,13637,13711,13711,13743,13743,  467,  444,    0,    5,   22,  145,15671,   13,    0, 4722, 4748,  6,  6,  8,  8,  1,  1,  1,  1,  1,  1,  1,  4,  1,  1,  1,  1, 17, 10, 10,  5, 74, 74, 32, 32, 13, 13, 11, 13,  4, 17, 23,  2, 62,  5,  0, 15,  6, {83,69,75},      2,     0,     1,     6,     7 }, // Northern Sami/Latin/Sweden
+    {    174,     7,   208,    0,    0,    0,    0,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,   53,   70,    0,    0,   56,   56,   56,   56,   83,   83,    0,    0,    0,    5,   22,  317,    0,    8,    0,    0,    0,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 10,  5, 27, 27, 27, 27, 13, 13,  2,  2,  4, 17, 23,  3,  0,  5,  0,  0,  0, {84,87,68},      2,     0,     7,     6,     7 }, // Taroko/Latin/Taiwan
+    {    175,     7,   111,    0,    0,    0,    0,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,    0,   45,    0,    0,13858,13858,13919,13919,13946,13946,  480,  459,    0,    5,   22,    2,13654,    4,    0, 4754, 1161,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 10,  5, 61, 61, 27, 27, 13, 13,  6,  3,  4, 17, 23,  3, 17,  4,  0,  8,  5, {75,69,83},      2,     1,     7,     6,     7 }, // Gusii/Latin/Kenya
+    {    176,     7,   111,    0,    0,    0,    0,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,    0,   45,    0,    0,13959,13959,14063,14063,14090,14090,  486,  462,    0,    5,   22,    2,13654,    4,    0, 4762, 1161,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 10,  5,104,104, 27, 27, 13, 13, 10, 10,  4, 17, 23,  3, 17,  4,  0,  7,  5, {75,69,83},      2,     1,     7,     6,     7 }, // Taita/Latin/Kenya
+    {    177,     7,   187,    0,    0,    0,    0,    6,    1,   14,    2,    3,    4,    5,    9,   40,   11,   46,   13,   97,  398,    0,    0,14103,14103,14161,14161,14188,14188,  496,  472,    0,    5,   22,   33,15733,   13,    0, 4769, 4338,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 16,  8, 10,  5, 58, 58, 27, 27, 13, 13,  6,  7,  4, 17, 23,  3, 19,  5,  0,  6,  8, {88,79,70},      0,     0,     1,     6,     7 }, // Fulah/Latin/Senegal
+    {    177,     7,    34,    0,    0,    0,    0,    6,    1,   14,    2,    3,    4,    5,    9,   40,   11,   46,   13,   97,  398,    0,    0,14103,14103,14161,14161,14188,14188,  496,  472,    0,    5,   22,   33,15733,   13,    0, 4769, 4775,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 16,  8, 10,  5, 58, 58, 27, 27, 13, 13,  6,  7,  4, 17, 23,  3, 19,  5,  0,  6, 14, {88,79,70},      0,     0,     1,     6,     7 }, // Fulah/Latin/Burkina Faso
+    {    177,     7,    37,    0,    0,    0,    0,    6,    1,   14,    2,    3,    4,    5,    9,   40,   11,   46,   13,   97,  398,    0,    0,14103,14103,14161,14161,14188,14188,  496,  472,    0,    5,   22,   32,15752,   13,    0, 4769, 4789,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 16,  8, 10,  5, 58, 58, 27, 27, 13, 13,  6,  7,  4, 17, 23,  4, 18,  5,  0,  6,  8, {88,65,70},      0,     0,     1,     6,     7 }, // Fulah/Latin/Cameroon
+    {    177,     7,    80,    0,    0,    0,    0,    6,    1,   14,    2,    3,    4,    5,    9,   40,   11,   46,   13,   97,  398,   10,   22,14103,14103,14161,14161,14188,14188,  496,  472,    0,    5,   22,  162,15770,   13,    0, 4769, 4797,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 16,  8, 12,  7, 58, 58, 27, 27, 13, 13,  6,  7,  4, 17, 23,  1, 13,  5,  0,  6,  6, {71,77,68},      2,     1,     1,     6,     7 }, // Fulah/Latin/Gambia
+    {    177,     7,    83,    0,    0,    0,    0,    6,    1,   14,    2,    3,    4,    5,    9,   40,   11,   46,   13,   97,  398,   10,   22,14103,14103,14161,14161,14188,14188,  496,  472,    0,    5,   22,  163,    0,   13,    0, 4769, 4803,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 16,  8, 12,  7, 58, 58, 27, 27, 13, 13,  6,  7,  4, 17, 23,  3,  0,  5,  0,  6,  5, {71,72,83},      2,     1,     1,     6,     7 }, // Fulah/Latin/Ghana
+    {    177,     7,    91,    0,    0,    0,    0,    6,    1,   14,    2,    3,    4,    5,    9,   40,   11,   46,   13,   97,  398,    0,    0,14103,14103,14161,14161,14188,14188,  496,  472,    0,    5,   22,  201,    0,   13,    0, 4769, 4808,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 16,  8, 10,  5, 58, 58, 27, 27, 13, 13,  6,  7,  4, 17, 23,  2,  0,  5,  0,  6,  4, {71,78,70},      0,     0,     1,     6,     7 }, // Fulah/Latin/Guinea
+    {    177,     7,    92,    0,    0,    0,    0,    6,    1,   14,    2,    3,    4,    5,    9,   40,   11,   46,   13,   97,  398,    0,    0,14103,14103,14161,14161,14188,14188,  496,  472,    0,    5,   22,   33,15733,   13,    0, 4769, 4812,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 16,  8, 10,  5, 58, 58, 27, 27, 13, 13,  6,  7,  4, 17, 23,  3, 19,  5,  0,  6, 12, {88,79,70},      0,     0,     1,     6,     7 }, // Fulah/Latin/Guinea Bissau
+    {    177,     7,   121,    0,    0,    0,    0,    6,    1,   14,    2,    3,    4,    5,    9,   40,   11,   46,   13,   97,  398,   10,   22,14103,14103,14161,14161,14188,14188,  496,  472,    0,    5,   22,    6,15783,   13,    0, 4769, 4824,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 16,  8, 12,  7, 58, 58, 27, 27, 13, 13,  6,  7,  4, 17, 23,  1, 16,  5,  0,  6,  9, {76,82,68},      2,     1,     1,     6,     7 }, // Fulah/Latin/Liberia
+    {    177,     7,   136,    0,    0,    0,    0,    6,    1,   14,    2,    3,    4,    5,    9,   40,   11,   46,   13,   97,  398,   10,   22,14103,14103,14161,14161,14188,14188,  496,  472,    0,    5,   22,  203,15799,   13,    0, 4769, 4833,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 16,  8, 12,  7, 58, 58, 27, 27, 13, 13,  6,  7,  4, 17, 23,  2, 15,  5,  0,  6,  8, {77,82,85},      2,     1,     1,     6,     7 }, // Fulah/Latin/Mauritania
+    {    177,     7,   156,    0,    0,    0,    0,    6,    1,   14,    2,    3,    4,    5,    9,   40,   11,   46,   13,   97,  398,    0,    0,14103,14103,14161,14161,14188,14188,  496,  472,    0,    5,   22,   33,15733,   13,    0, 4769, 4841,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 16,  8, 10,  5, 58, 58, 27, 27, 13, 13,  6,  7,  4, 17, 23,  3, 19,  5,  0,  6,  6, {88,79,70},      0,     0,     1,     6,     7 }, // Fulah/Latin/Niger
+    {    177,     7,   157,    0,    0,    0,    0,    6,    1,   14,    2,    3,    4,    5,    9,   40,   11,   46,   13,   97,  398,    0,    0,14103,14103,14161,14161,14188,14188,  496,  472,    0,    5,   22,  172,15814,   13,    0, 4769, 4847,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 16,  8, 10,  5, 58, 58, 27, 27, 13, 13,  6,  7,  4, 17, 23,  1, 16,  5,  0,  6,  9, {78,71,78},      2,     1,     1,     6,     7 }, // Fulah/Latin/Nigeria
+    {    177,     7,   189,    0,    0,    0,    0,    6,    1,   14,    2,    3,    4,    5,    9,   40,   11,   46,   13,   97,  398,   10,   22,14103,14103,14161,14161,14188,14188,  496,  472,    0,    5,   22,    7,15830,   13,    0, 4769, 4856,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 16,  8, 12,  7, 58, 58, 27, 27, 13, 13,  6,  7,  4, 17, 23,  2, 18,  5,  0,  6, 11, {83,76,76},      0,     0,     1,     6,     7 }, // Fulah/Latin/Sierra Leone
+    {    177,   134,    91,    0,    0,    0,    0,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,   53,   70,    0,    0,   56,   56,   56,   56,   83,   83,    0,    0,    0,    5,   22,  201,    0,    8,    0,    0,    0,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 10,  5, 27, 27, 27, 27, 13, 13,  2,  2,  4, 17, 23,  2,  0,  5,  0,  0,  0, {71,78,70},      0,     0,     1,     6,     7 }, // Fulah/Adlam/Guinea
+    {    178,     7,   111,    0,    0,    0,    0,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,    0,   45,    0,    0,14201,14201,14263,14263,14290,14290,  502,  479,    0,    5,   22,    2,15848,    4,    0, 4867, 1161,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 10,  5, 62, 62, 27, 27, 13, 13,  6,  8,  4, 17, 23,  3, 16,  4,  0,  6,  5, {75,69,83},      2,     1,     7,     6,     7 }, // Kikuyu/Latin/Kenya
+    {    179,     7,   111,    0,    0,    0,    0,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,    0,   45,    0,    0,14303,14303,14407,14407,14434,14434,  508,  487,    0,    5,   22,    2,15864,    4,    0, 4873, 1161,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 10,  5,104,104, 27, 27, 13, 13,  7,  5,  4, 17, 23,  3, 18,  4,  0,  8,  5, {75,69,83},      2,     1,     7,     6,     7 }, // Samburu/Latin/Kenya
+    {    180,     7,   146,    0,    0,    0,    0,    6,    1,    0,    2,    3,    4,    5,    9,   10,   11,   12,   13,  610,  398,    0,    0,14447,14447,14501,14501,14528,14528,    0,    0,    0,    5,   22,  260,15882,    0,    0, 4881, 3301,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 27,  8, 10,  5, 54, 54, 27, 27, 13, 13,  2,  2,  4, 17, 23,  3, 21,  4,  0,  4, 10, {77,90,78},      2,     1,     7,     6,     7 }, // Sena/Latin/Mozambique
+    {    181,     7,   240,    0,    0,    0,    0,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,    0,   45,    0,    0,14541,14541,14590,14590,14617,14617,    0,    0,    0,    5,   22,  156,15903,    4,    0, 4885, 1780,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 10,  5, 49, 49, 27, 27, 13, 13,  2,  2,  4, 17, 23,  3, 17,  4,  0, 10,  8, {85,83,68},      2,     1,     7,     6,     7 }, // North Ndebele/Latin/Zimbabwe
+    {    182,     7,   210,    0,    0,    0,    0,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,    0,   45,    0,    0,14630,14630,14694,14694,14722,14722,  515,  492,    0,    5,   22,  182,15920,    4,    0, 4895, 1585,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 10,  5, 64, 64, 28, 28, 13, 13,  8,  7,  4, 17, 23,  3, 18,  4,  0,  9,  8, {84,90,83},      2,     0,     1,     6,     7 }, // Rombo/Latin/Tanzania
+    {    183,     9,   145,    0,    0,    0,    0,    6,    1,   14,    2,    3,    4,    5,    9,   15,   16,   40,   11,   97,  398,    0,    0,14735,14735,14781,14781,   83,   83,  523,  499,    0,    5,   22,    0,15938,    0,    0, 4904, 4911,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 16,  8, 10,  5, 46, 46, 29, 29, 13, 13,  6,  8,  4, 17, 23,  0, 14,  4,  0,  7,  6, {77,65,68},      2,     1,     1,     6,     7 }, // Tachelhit/Tifinagh/Morocco
+    {    183,     7,   145,    0,    0,    0,    0,    6,    1,   14,    2,    3,    4,    5,    9,   15,   16,   40,   11,   97,  398,    0,    0,14810,14810,14857,14857,   83,   83,  529,  507,    0,    5,   22,    0,15952,    0,    0, 4917, 4927,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 16,  8, 10,  5, 47, 47, 29, 29, 13, 13,  6,  8,  4, 17, 23,  0, 14,  4,  0, 10,  6, {77,65,68},      2,     1,     1,     6,     7 }, // Tachelhit/Latin/Morocco
+    {    184,     7,     3,    0,    0,  939,  951,    6,    1,   14,    2,    3,    4,    5,   68,   15,   16,   10,   11,   97,  398,   10,   22,14886,14919,14969,14996,15025,15038,  535,  515, 1185, 1192,   22,  195,15966,    0,    0, 4933, 4942,  6,  6, 12, 11,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 16,  8, 12,  7, 33, 50, 27, 29, 13, 13,  7,  9,  7, 21, 23,  2, 52,  4,  0,  9,  8, {68,90,68},      2,     1,     6,     5,     6 }, // Kabyle/Latin/Algeria
+    {    185,     7,   221,    0,    0,    0,    0,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,    0,   45,    0,    0,15051,15051,15124,15124,15151,15151,    0,    0,    0,    5,   22,  187,16018,    4,    0, 4950, 1650,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 10,  5, 73, 73, 27, 27, 13, 13,  2,  2,  4, 17, 23,  3, 19,  4,  0, 10,  6, {85,71,88},      0,     0,     1,     7,     7 }, // Nyankole/Latin/Uganda
+    {    186,     7,   210,    0,    0,    0,    0,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,    0,   45,    0,    0,15164,15164,15245,15245,15272,15272,  542,  524,    0,    5,   22,  182,16037,    0,    0, 4960, 4966,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 10,  5, 81, 81, 27, 27, 13, 13,  7,  7,  4, 17, 23,  3, 22,  4,  0,  6, 10, {84,90,83},      2,     0,     1,     6,     7 }, // Bena/Latin/Tanzania
+    {    187,     7,   210,    0,    0,    0,    0,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,    0,   45,    0,    0,15285,15285,15346,15346,15373,15373,  549,  531,    0,    5,   22,  182,13534,    4,    0, 4976, 1585,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 10,  5, 61, 61, 27, 27, 13, 13,  5,  9,  4, 17, 23,  3, 20,  4,  0,  8,  8, {84,90,83},      2,     0,     1,     6,     7 }, // Vunjo/Latin/Tanzania
+    {    188,     7,   132,    0,    0,    0,    0,    6,    0,    1,    2,    3,    4,    5,    9,   15,   16,   10,   11,   97,  398,    0,    0,15386,15386,15429,15429,15456,15456,    0,    0,    0,    5,   22,   33,16059,    4,    0, 4984, 2143,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 16,  8, 10,  5, 43, 43, 27, 27, 13, 13,  2,  2,  4, 17, 23,  3, 17,  4,  0,  9,  4, {88,79,70},      0,     0,     1,     6,     7 }, // Bambara/Latin/Mali
+    {    188,    75,   132,    0,    0,    0,    0,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,   53,   70,    0,    0,   56,   56,   56,   56,   83,   83,    0,    0,    0,    5,   22,   33,    0,    8,    0,    0,    0,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 10,  5, 27, 27, 27, 27, 13, 13,  2,  2,  4, 17, 23,  3,  0,  5,  0,  0,  0, {88,79,70},      0,     0,     1,     6,     7 }, // Bambara/Nko/Mali
+    {    189,     7,   111,    0,    0,    0,    0,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,    0,   45,    0,    0,15469,15469,15532,15532,15559,15559,  554,  540,    0,    5,   22,    2,13654,    4,    0, 4993, 1161,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 10,  5, 63, 63, 27, 27, 13, 13,  2,  2,  4, 17, 23,  3, 17,  4,  0,  6,  5, {75,69,83},      2,     1,     7,     6,     7 }, // Embu/Latin/Kenya
+    {    190,    12,   225,    0,    0,  962,  971,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,   27,  521,   10,   22,15572,15572,15620,15620,15647,15647,  556,  542, 1213,    5,   22,    6,16076,    4,    0, 4999, 5002,  6,  6,  9,  8,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 18,  6, 12,  7, 48, 48, 27, 27, 13, 13,  3,  6,  6, 17, 23,  1, 24,  4,  0,  3, 15, {85,83,68},      2,     1,     7,     6,     7 }, // Cherokee/Cherokee/United States
+    {    191,     7,   137,    0,    0,    0,    0,    6,    0,   14,    2,    3,    4,    5,    9,   10,   11,   12,   13,   97,  398,    0,    0,15660,15660,15707,15707,15733,15733,    0,    0,    0,    5,   22,  170,16100,   41,    0, 5017, 5031,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 16,  8, 10,  5, 47, 47, 26, 26, 13, 13,  2,  2,  4, 17, 23,  2, 14,  6,  0, 14,  5, {77,85,82},      2,     0,     1,     6,     7 }, // Morisyen/Latin/Mauritius
+    {    192,     7,   210,    0,    0,    0,    0,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,    0,   45,    0,    0,15746,15746,15878,15878,14722,14722,  559,  548,    0,    5,   22,  182,13534,    4,    0, 5036, 1585,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 10,  5,132,132, 27, 27, 13, 13,  4,  5,  4, 17, 23,  3, 20,  4,  0, 10,  8, {84,90,83},      2,     0,     1,     6,     7 }, // Makonde/Latin/Tanzania
+    {    193,     7,   210,    0,    0,    0,    0,    6,    0,    1,    2,    3,    4,    5,    9,   11,   11,   13,   13,    0,   45,    0,    0,15905,15905,15967,15967,16002,16002,  563,  553,    0,    5,   22,  182,16114,   41,    0, 5046, 5054,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 10,  5, 62, 62, 35, 35, 13, 13,  3,  3,  4, 17, 23,  3, 22,  6,  0,  8,  9, {84,90,83},      2,     0,     1,     6,     7 }, // Langi/Latin/Tanzania
+    {    194,     7,   221,    0,    0,    0,    0,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,    0,   45,    0,    0,16015,16015,16080,16080,16107,16107,    0,    0,    0,    5,   22,  187,16136,    0,    0, 5063, 5070,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 10,  5, 65, 65, 27, 27, 13, 13,  2,  2,  4, 17, 23,  3, 19,  4,  0,  7,  7, {85,71,88},      0,     0,     1,     7,     7 }, // Ganda/Latin/Uganda
+    {    195,     7,   239,    0,    0,    0,    0,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,    0,   45,   10,   22,16120,16120,16120,16120,   83,   83,  566,  556,    0,    5,   22,    2,    0,    4,    0, 5077, 1774,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 12,  7, 79, 79, 79, 79, 13, 13,  8,  7,  4, 17, 23,  1,  0,  4,  0,  9,  6, {90,77,87},      2,     1,     1,     6,     7 }, // Bemba/Latin/Zambia
+    {    196,     7,    39,    0,    0,  161,  161,    6,    1,   14,    2,    3,    4,    5,    9,   10,   11,   12,   13, 1541,   45,    0,    0,16199,16271,16343,16343,16370,16370,   68,   65,    0,    5,   22,  259,16155,   13,    0, 5086, 5098,  6,  6,  7,  7,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 27, 10, 10,  5, 72, 72, 27, 27, 13, 13,  2,  2,  4, 17, 23,  1, 42,  5,  0, 12, 10, {67,86,69},      2,     1,     1,     6,     7 }, // Kabuverdianu/Latin/Cape Verde
+    {    197,     7,   111,    0,    0,    0,    0,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,    0,   45,    0,    0,16383,16383,16433,16433,16460,16460,  574,  563,    0,    5,   22,    2,13654,    4,    0, 5108, 1161,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 10,  5, 50, 50, 27, 27, 13, 13,  2,  2,  4, 17, 23,  3, 17,  4,  0,  6,  5, {75,69,83},      2,     1,     7,     6,     7 }, // Meru/Latin/Kenya
+    {    198,     7,   111,    0,    0,    0,    0,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,    0,   45,    0,    0,16473,16473,16525,16525,16552,16552,  576,  565,    0,    5,   22,    2,16197,    4,    0, 5114, 5122,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 10,  5, 52, 52, 27, 27, 13, 13,  6, 10,  4, 17, 23,  3, 19,  4,  0,  8, 12, {75,69,83},      2,     1,     7,     6,     7 }, // Kalenjin/Latin/Kenya
+    {    199,     7,   148,    0,    0,    0,    0,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,    0,   45,   10,   22,16565,16565,16656,16656,16678,16678,  582,  575,    0,    5,   22,    6,16216,    4,    0, 5134, 5147,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 12,  7, 91, 91, 22, 22, 13, 13,  7,  5,  4, 17, 23,  1, 15,  4,  0, 13,  8, {78,65,68},      2,     1,     1,     6,     7 }, // Nama/Latin/Namibia
+    {    200,     7,   210,    0,    0,    0,    0,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,    0,   45,    0,    0,15285,15285,15346,15346,15373,15373,  549,  531,    0,    5,   22,  182,13534,    4,    0, 5155, 1585,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 10,  5, 61, 61, 27, 27, 13, 13,  5,  9,  4, 17, 23,  3, 20,  4,  0,  9,  8, {84,90,83},      2,     0,     1,     6,     7 }, // Machame/Latin/Tanzania
+    {    201,     7,    82,    0,    0,  459,  459,    6,    1,   14,    2,    3,   38,    5,   47,   40,   10,   46,   12, 1568, 1070,    0,    0,16691,16691,16762,16762, 3613, 3613,  589,  580,    0,    5,   22,   14,  234,   13,    0, 5164, 5170,  6,  6,  8,  8,  1,  1,  1,  1,  1,  1,  1,  4,  1,  1,  1,  1, 23, 10, 10,  5, 71, 71, 27, 27, 13, 13, 16, 16,  4, 17, 23,  1,  4,  5,  0,  6, 11, {69,85,82},      2,     1,     1,     6,     7 }, // Colognian/Latin/Germany
+    {    202,     7,   111,    0,    0,    0,    0,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,    0,   45,    0,    0,16789,16789,15346,15346,14722,14722,  605,  596,    0,    5,   22,    2,16231,    4,    0,  740, 1161,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 10,  5, 57, 57, 27, 27, 13, 13,  9,  6,  4, 17, 23,  3, 18,  4,  0,  3,  5, {75,69,83},      2,     1,     7,     6,     7 }, // Masai/Latin/Kenya
+    {    202,     7,   210,    0,    0,    0,    0,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,    0,   45,    0,    0,16789,16789,15346,15346,14722,14722,  605,  596,    0,    5,   22,  182,16249,    4,    0,  740, 5181,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 10,  5, 57, 57, 27, 27, 13, 13,  9,  6,  4, 17, 23,  3, 21,  4,  0,  3,  8, {84,90,83},      2,     0,     1,     6,     7 }, // Masai/Latin/Tanzania
+    {    203,     7,   221,    0,    0,    0,    0,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,    0,   45,    0,    0,16846,16846,16910,16910,16944,16944,  614,  602,    0,    5,   22,  187,16136,   13,    0, 5189, 5070,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 10,  5, 64, 64, 34, 34, 13, 13,  6,  6,  4, 17, 23,  3, 19,  5,  0,  7,  7, {85,71,88},      0,     0,     1,     7,     7 }, // Soga/Latin/Uganda
+    {    204,     7,   111,    0,    0,    0,    0,    6,    0,    1,    2,    3,    4,    5,    9,   40,   10,   46,   12,    0,   45,    0,    0,16957,16957,17031,17031,   83,   83,   64,   61,    0,    5,   22,    2,16270,    4,  114, 5196, 1161,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 10,  5, 74, 74, 20, 20, 13, 13,  4,  4,  4, 17, 23,  3, 16,  4,  6,  7,  5, {75,69,83},      2,     1,     7,     6,     7 }, // Luyia/Latin/Kenya
+    {    205,     7,   210,    0,    0,    0,    0,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,    0,   45,    0,    0, 9729, 9729,17051,17051,15373,15373,  620,  608,    0,    5,   22,  182,16286,   13,    0, 5203, 5209,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 10,  5, 59, 59, 27, 27, 13, 13,  9,  8,  4, 17, 23,  3, 21,  5,  0,  6,  8, {84,90,83},      2,     0,     1,     6,     7 }, // Asu/Latin/Tanzania
+    {    206,     7,   221,    0,    0,    0,    0,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,    0,   45,    0,    0,17078,17078,17146,17146,17173,17173,  629,  616,    0,    5,   22,  187,16307,    4,    0, 5217, 1650,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 10,  5, 68, 68, 27, 27, 13, 13,  9,  6,  4, 17, 23,  3, 21,  4,  0,  6,  6, {85,71,88},      0,     0,     1,     7,     7 }, // Teso/Latin/Uganda
+    {    206,     7,   111,    0,    0,    0,    0,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,    0,   45,    0,    0,17078,17078,17146,17146,17173,17173,  629,  616,    0,    5,   22,    2,16328,    4,    0, 5217, 5223,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 10,  5, 68, 68, 27, 27, 13, 13,  9,  6,  4, 17, 23,  3, 20,  4,  0,  6,  5, {75,69,83},      2,     1,     7,     6,     7 }, // Teso/Latin/Kenya
+    {    207,     7,    67,    0,    0,    0,    0,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,   53,   70,    0,    0,   56,   56,   56,   56,   83,   83,    0,    0,    0,    5,   22,    0,    0,    8,    0,    0,    0,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 10,  5, 27, 27, 27, 27, 13, 13,  2,  2,  4, 17, 23,  0,  0,  5,  0,  0,  0, {69,82,78},      2,     1,     1,     6,     7 }, // Saho/Latin/Eritrea
+    {    208,     7,   132,    0,    0,    0,    0,    6,    0,   14,    2,    3,    4,    5,    9,   10,   11,   12,   13,   97,  398,    0,    0,17186,17186,17238,17238,17265,17265,  638,  622,    0,    5,   22,   33,16348,    0,    0, 5228, 5239,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 16,  8, 10,  5, 52, 52, 27, 27, 13, 13,  6,  6,  4, 17, 23,  3, 16,  4,  0, 11,  5, {88,79,70},      0,     0,     1,     6,     7 }, // Koyra Chiini/Latin/Mali
+    {    209,     7,   210,    0,    0,    0,    0,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,    0,   45,    0,    0,15285,15285,15346,15346,15373,15373,  549,  531,    0,    5,   22,  182,13534,    0,    0, 5244, 1585,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 10,  5, 61, 61, 27, 27, 13, 13,  5,  9,  4, 17, 23,  3, 20,  4,  0,  6,  8, {84,90,83},      2,     0,     1,     6,     7 }, // Rwa/Latin/Tanzania
+    {    210,     7,   111,    0,    0,    0,    0,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,    0,   45,    0,    0,17278,17278,17346,17346,17373,17373,  644,  628,    0,    5,   22,    2,16364,    0,    0, 5250, 1161,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 10,  5, 68, 68, 27, 27, 13, 13,  2,  2,  4, 17, 23,  3, 16,  4,  0,  6,  5, {75,69,83},      2,     1,     7,     6,     7 }, // Luo/Latin/Kenya
+    {    211,     7,   221,    0,    0,    0,    0,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,    0,   45,    0,    0,15051,15051,15124,15124,15151,15151,    0,    0,    0,    5,   22,  187,16018,    4,    0, 5256, 1650,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 10,  5, 73, 73, 27, 27, 13, 13,  2,  2,  4, 17, 23,  3, 19,  4,  0,  6,  6, {85,71,88},      0,     0,     1,     7,     7 }, // Chiga/Latin/Uganda
+    {    212,     7,   145,    0,    0,    0,    0,    6,    1,   14,    2,    3,    4,    5,    9,   10,   11,   12,   13,    0,   45,    0,    0,17386,17386,17433,17433,17460,17460,  646,  630,    0,    5,   22,    0,16380,   13,    0, 5262, 5279,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 10,  5, 47, 47, 27, 27, 13, 13,  9, 10,  4, 17, 23,  0, 15,  5,  0, 17,  6, {77,65,68},      2,     1,     1,     6,     7 }, // Central Morocco Tamazight/Latin/Morocco
+    {    213,     7,   132,    0,    0,    0,    0,    6,    0,   14,    2,    3,    4,    5,    9,   10,   11,   12,   13,   97,  398,    0,    0,17473,17473,17526,17526,17265,17265,  638,  622,    0,    5,   22,   33,16348,    0,    0, 5285, 5239,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 16,  8, 10,  5, 53, 53, 27, 27, 13, 13,  6,  6,  4, 17, 23,  3, 16,  4,  0, 15,  5, {88,79,70},      0,     0,     1,     6,     7 }, // Koyraboro Senni/Latin/Mali
+    {    214,     7,   210,    0,    0,    0,    0,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,    0,   45,    0,    0,17553,17553,17615,17615,17642,17642,  655,  640,    0,    5,   22,  182,13556,    0,    0, 5300, 1585,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 10,  5, 62, 62, 27, 27, 13, 13,  5,  8,  4, 17, 23,  3, 20,  4,  0,  9,  8, {84,90,83},      2,     0,     1,     6,     7 }, // Shambala/Latin/Tanzania
+    {    215,    13,   100,    0,    0,    0,    0,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,   27,  521,   10,   22,17655,17655,17708,17708,17740,17740,  660,  648,    0,    5,   22,  119,16395,    8,    0, 5309, 2599,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 18,  6, 12,  7, 53, 53, 32, 32, 18, 18,  3,  6,  4, 17, 23,  1,  3,  5,  0,  4,  4, {73,78,82},      2,     1,     7,     7,     7 }, // Bodo/Devanagari/India
+    {    218,     2,   178,    0,    0,    0,    0,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,   53,   70,    0,    0,17758,17758,17802,17802,17826,17802,    0,    0,    0,    5,   22,  121,16398,   13,    0, 5313, 3454,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 10,  5, 44, 44, 24, 24, 16, 24,  2,  2,  4, 17, 23,  1, 42,  5,  0,  7,  5, {82,85,66},      2,     1,     1,     6,     7 }, // Chechen/Cyrillic/Russia
+    {    219,     2,   178,    0,    0,  979,  979,    6,    1,   14,    2,    3,    4,    5,    9,   15,   16,   40,   10, 1591,  967,    0,    0,17842,17842,17909,17909,11114,11114,    0,    0,    0,    5,   22,  121,16440,   13,    0, 5320, 5339,  6,  6,  8,  8,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 23, 10, 10,  5, 67, 67, 36, 36, 13, 13,  2,  2,  4, 17, 23,  1, 43,  5,  0, 19,  7, {82,85,66},      2,     1,     1,     6,     7 }, // Church/Cyrillic/Russia
+    {    220,     2,   178,    0,    0,    0,    0,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,   53,   70,    0,    0,   56,   56,   56,   56,   83,   83,    0,    0,    0,    5,   22,  121,    0,    8,    0,    0,    0,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 10,  5, 27, 27, 27, 27, 13, 13,  2,  2,  4, 17, 23,  1,  0,  5,  0,  0,  0, {82,85,66},      2,     1,     1,     6,     7 }, // Chuvash/Cyrillic/Russia
+    {    230,     7,    49,    0,    0,    0,    0,    6,    1,    0,    2,    3,    4,    5,    9,   10,   11,   12,   13,   97,  398,    0,    0,17945,17945,17994,17994,18021,18021,  663,  654,    0,    5,   22,   32,16483,    0,    0, 5346, 5354,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 16,  8, 10,  5, 49, 49, 27, 27, 13, 13,  5,  6,  4, 17, 23,  2, 17,  4,  0,  8, 16, {67,68,70},      2,     1,     1,     6,     7 }, // Luba Katanga/Latin/Congo Kinshasa
+    {    231,     7,   125,    0,    0,  987,  987,    6,    1,    0,    2,    3,    4,    5,    9,   40,   10,   46,   12,  420,  166,    0,    0,18034,18034,18098,18125, 3613, 3613,  668,  660,  441,    5,   22,   14, 8263,   13,    0, 5370, 5370,  6,  6, 10, 10,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 18,  8, 10,  5, 64, 64, 27, 34, 13, 13,  5,  8,  5, 17, 23,  1, 18,  5,  0, 14, 10, {69,85,82},      2,     1,     1,     6,     7 }, // Luxembourgish/Latin/Luxembourg
+    {    236,     7,    21,    0,    0,    0,    0,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,   53,   70,    0,    0,   56,   56,   56,   56,   83,   83,    0,    0,    0,    5,   22,   14,    0,    8,    0,    0,    0,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 10,  5, 27, 27, 27, 27, 13, 13,  2,  2,  4, 17, 23,  1,  0,  5,  0,  0,  0, {69,85,82},      2,     1,     1,     6,     7 }, // Walloon/Latin/Belgium
+    {    237,     7,    37,    0,    0,    0,    0,    6,    1,   14,    2,    3,    4,    5,    9,   40,   11,   46,   13,   97,  398,    0,    0,18159,18159,18230,18230,18257,18257,  673,  668,    0,    5,   22,   32,16500,    0,    0, 5384, 5389,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 16,  8, 10,  5, 71, 71, 27, 27, 13, 13,  3,  3,  4, 17, 23,  4, 14,  4,  0,  5,  7, {88,65,70},      0,     0,     1,     6,     7 }, // Aghem/Latin/Cameroon
+    {    238,     7,    37,    0,    0,    0,    0,    6,    1,   14,    2,    3,    4,    5,    9,   15,   16,   40,   10,   97,  398,    0,    0,18270,18270,18339,18339,18366,18366,  676,  671,    0,    5,   22,   32,16514,   13,    0, 5396, 5401,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 16,  8, 10,  5, 69, 69, 27, 27, 13, 13, 10,  9,  4, 17, 23,  4, 15,  5,  0,  5,  8, {88,65,70},      0,     0,     1,     6,     7 }, // Basaa/Latin/Cameroon
+    {    239,     7,   156,    0,    0,    0,    0,    6,    0,   14,    2,    3,    4,    5,    9,   10,   11,   12,   13,   97,  398,    0,    0,18379,18379,17526,17526,18431,18431,  686,  680,    0,    5,   22,   33,16348,    0,    0, 5409, 5419,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 16,  8, 10,  5, 52, 52, 27, 27, 13, 13,  8, 10,  4, 17, 23,  3, 16,  4,  0, 10,  5, {88,79,70},      0,     0,     1,     6,     7 }, // Zarma/Latin/Niger
+    {    240,     7,    37,    0,    0,    0,    0,    6,    1,   14,    2,    3,    4,    5,    9,   15,   16,   12,   13,   97,  398,    0,    0,18444,18444,18488,18488,18515,18515,  694,  690,    0,    5,   22,   32,    0,   13,    0, 5424, 1946,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 16,  8, 10,  5, 44, 44, 27, 27, 13, 13,  5,  6,  4, 17, 23,  4,  0,  5,  0,  5,  8, {88,65,70},      0,     0,     1,     6,     7 }, // Duala/Latin/Cameroon
+    {    241,     7,   187,    0,    0,    0,    0,    6,    1,   14,    2,    3,    4,    5,    9,   15,   16,   10,   11,   97,  398,    0,    0,18528,18528,18577,18577,18604,18604,    0,    0,    0,    5,   22,   33,16529,   13,    0, 5429, 5434,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 16,  8, 10,  5, 49, 49, 27, 27, 13, 13,  2,  2,  4, 17, 23,  3, 16,  5,  0,  5,  7, {88,79,70},      0,     0,     1,     6,     7 }, // Jola Fonyi/Latin/Senegal
+    {    242,     7,    37,    0,    0,    0,    0,    6,    1,   14,    2,    3,    4,    5,    9,   15,   16,   10,   11,   97,  398,    0,    0,18617,18617,18701,18701,18730,18730,  699,  696,    0,    5,   22,   32,16545,   13,    0, 5441, 5447,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 16,  8, 10,  5, 84, 84, 29, 29, 13, 13,  7,  9,  4, 17, 23,  4, 16,  5,  0,  6,  7, {88,65,70},      0,     0,     1,     6,     7 }, // Ewondo/Latin/Cameroon
+    {    243,     7,    37,    0,    0,    0,    0,    6,    1,   14,    2,    3,    4,    5,    9,   15,   16,   12,   13,   97,  398,    0,    0,18743,18743,18787,18787,18815,18815,  706,  705,    0,    5,   22,   32,16561,   13,    0, 5454, 5459,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 16,  8, 10,  5, 44, 44, 28, 28, 13, 13,  6,  7,  4, 17, 23,  4,  4,  5,  0,  5,  7, {88,65,70},      0,     0,     1,     6,     7 }, // Bafia/Latin/Cameroon
+    {    244,     7,   146,    0,    0,    0,    0,    6,    1,    0,    2,    3,    4,    5,    9,   10,   11,   12,   13,    0,   45,    0,    0,18828,18828,18886,18886,18913,18913,  712,  712,    0,    5,   22,  260,    0,   41,    0, 5466, 5471,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 10,  5, 58, 58, 27, 27, 13, 13,  8, 10,  4, 17, 23,  3,  0,  6,  0,  5, 10, {77,90,78},      2,     1,     7,     6,     7 }, // Makhuwa Meetto/Latin/Mozambique
+    {    245,     7,    37,    0,    0,    0,    0,    6,    1,    0,    2,    3,    4,    5,    9,   15,   16,   10,   11,   97,  398,    0,    0,18926,18926,18999,18999,19026,19026,  720,  722,    0,    5,   22,   32,16565,    4,    0, 5481, 5487,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 16,  8, 10,  5, 73, 73, 27, 27, 13, 13,  5,  5,  4, 17, 23,  4, 10,  4,  0,  6,  7, {88,65,70},      0,     0,     1,     6,     7 }, // Mundang/Latin/Cameroon
+    {    246,     7,    37,    0,    0,    0,    0,    6,    1,   14,    2,    3,    4,    5,    9,   40,   11,   15,   16,   97,  398,    0,    0,19039,19039,19127,19127,19156,19156,  725,  727,    0,    5,   22,   32,16575,   13,    0, 5494, 5500,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 16,  8, 10,  5, 88, 88, 29, 29, 13, 13,  4,  4,  4, 17, 23,  4, 13,  5,  0,  6,  7, {88,65,70},      0,     0,     1,     6,     7 }, // Kwasio/Latin/Cameroon
+    {    247,     7,   254,    0,    0,    0,    0,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,   97,   46,  448,   22,19169,19169,19247,19247,19284,19284,  729,  731,    0,    5,   22,  117,    0,    4,    0, 5507,    0,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 16,  9, 12,  7, 78, 78, 37, 37, 13, 13,  2,  2,  4, 17, 23,  1,  0,  4,  0,  9,  0, {83,83,80},      2,     1,     1,     6,     7 }, // Nuer/Latin/South Sudan
+    {    248,     2,   178,    0,    0,  997,  997,    6,    1,   14,    2,    3,    4,    5,    9,   15,   16,   40,   10, 1614,  253,    0,    0,19297,19297,19367,19367,19387,19387,  731,  733, 1219, 1224,   22,  121,16588,   13,    0, 5516, 5525,  6,  6, 11, 11,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 30,  6, 10,  5, 70, 70, 20, 20, 13, 13,  2,  2,  5, 17, 23,  1, 46,  5,  0,  9,  9, {82,85,66},      2,     1,     1,     6,     7 }, // Sakha/Cyrillic/Russia
+    {    249,     7,   210,    0,    0,    0,    0,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,    0,   45,    0,    0,19400,19400,19459,19459,19486,19486,  733,  735,    0,    5,   22,  182,16634,    0,    0, 5534, 5543,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 10,  5, 59, 59, 27, 27, 13, 13,  9,  9,  4, 17, 23,  3, 18,  4,  0,  9,  9, {84,90,83},      2,     0,     1,     6,     7 }, // Sangu/Latin/Tanzania
+    {    251,     7,   156,    0,    0,    0,    0,    6,    0,   14,    2,    3,    4,    5,    9,   10,   11,   12,   13,   97,  398,    0,    0,17473,17473,17526,17526,17265,17265,  686,  680,    0,    5,   22,   33,16348,    0,    0, 5552, 5419,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 16,  8, 10,  5, 53, 53, 27, 27, 13, 13,  8, 10,  4, 17, 23,  3, 16,  4,  0, 13,  5, {88,79,70},      0,     0,     1,     6,     7 }, // Tasawaq/Latin/Niger
+    {    252,    35,   121,    0,    0,    0,    0,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,    0,   45,   10,   22,19499,19499,19499,19499,   83,   83,    0,    0,    0,    5,   22,    6,16652,    4,    0, 5565, 5567,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 12,  7, 29, 29, 29, 29, 13, 13,  2,  2,  4, 17, 23,  1,  8,  4,  0,  2,  4, {76,82,68},      2,     1,     1,     6,     7 }, // Vai/Vai/Liberia
+    {    252,     7,   121,    0,    0,    0,    0,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,    0,   45,   10,   22,19528,19528,19528,19528,   83,   83,    0,    0,    0,    5,   22,    6,16660,    4,    0, 5571, 5574,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 12,  7, 47, 47, 47, 47, 13, 13,  2,  2,  4, 17, 23,  1, 13,  4,  0,  3,  8, {76,82,68},      2,     1,     1,     6,     7 }, // Vai/Latin/Liberia
+    {    253,     7,   206,    0,    0,  267,  267,    6,    1,   13,    2,    3,    4,    5,    9,   15,   16,   17,   18,  420,   70,    0,    0,19575,19575,19627,19627,19654,19654,    0,    0,    0,    5,   22,    0,    0,   41,    0, 5582, 5588,  6,  6,  9,  9,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 18, 10, 10,  5, 52, 52, 27, 27, 13, 13,  2,  2,  4, 17, 23,  0,  0,  6,  0,  6,  6, {67,72,70},      2,     0,     1,     6,     7 }, // Walser/Latin/Switzerland
+    {    254,     7,    37,    0,    0,    0,    0,    6,    1,   14,    2,    3,    4,    5,    9,   15,   16,   15,   16,   97,  398,    0,    0,19667,19667,19737,19737,19757,19757,  742,  744,    0,    5,   22,   32,    0,   13,    0, 5594, 5600,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 16,  8, 10,  5, 70, 70, 20, 20, 13, 13,  8,  8,  4, 17, 23,  4,  0,  5,  0,  6,  7, {88,65,70},      0,     0,     1,     6,     7 }, // Yangben/Latin/Cameroon
+    {    256,     7,   197,    0,    0,  708,  708,    6,    1,    0,    2,    3,    4,    5,    9,   15,   16,   10,   11,  355,  259,    0,    0,19770,19770,19823,19823, 3373, 3373,  750,  752,    0,    5,   22,   14, 3032,   13,    0, 5607, 2381,  6,  6,  7,  7,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 22,  6, 10,  5, 53, 53, 27, 27, 13, 13, 12, 11,  5, 17, 23,  1, 19,  5,  0,  9,  6, {69,85,82},      2,     1,     1,     6,     7 }, // Asturian/Latin/Spain
+    {    257,     7,    37, 1008, 1008, 1019, 1035,    6,    1,    0,    2,    3,    4,    5,    9,   15,   16,   17,   18, 1450,   70,    0,    0,19850,19850,19850,19850,19909,19909,  762,  763,    0,    5,   22,   32,16673,    8,    0, 5616, 5621, 11, 11, 16,  9,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 18, 10, 10,  5, 59, 59, 59, 59, 24, 24,  8, 13,  4, 17, 23,  4,  5,  5,  0,  5,  7, {88,65,70},      0,     0,     1,     6,     7 }, // Ngomba/Latin/Cameroon
+    {    258,     7,    37,    0,    0,    0,    0,    6,    1,    0,    2,    3,    4,    5,    9,   15,   16,   17,   18,   80, 1644,    0,    0,19933,19933,19933,19933,19986,19986,    0,    0,    0,    5,   22,   32,14657,   41,    0, 5628, 5632,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 10,  5, 53, 53, 53, 53, 20, 20,  2,  2,  4, 17, 23,  4,  9,  6,  0,  4,  7, {88,65,70},      0,     0,     1,     6,     7 }, // Kako/Latin/Cameroon
+    {    259,     7,    37,    0,    0,    0,    0,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13, 1450,   70,    0,    0,20006,20006,20006,20006,20054,20054,    0,    0,    0,    5,   22,   32,16678,    8,    0, 5639, 5644,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 18, 10, 10,  5, 48, 48, 48, 48, 20, 20,  2,  2,  4, 17, 23,  4,  5,  5,  0,  5,  7, {88,65,70},      0,     0,     1,     6,     7 }, // Meta/Latin/Cameroon
+    {    260,     7,    37,    0,    0,    0,    0,    6,    1,    0,    2,    3,    4,    5,    9,   15,   16,   10,   11, 1654,   45,    0,    0,20074,20074,20074,20074,   83,   83,  770,  776,    0,    5,   22,   32,16683,    8,    0, 5651, 5667,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 32,  8, 10,  5,110,110,110,110, 13, 13,  9,  8,  4, 17, 23,  4,  9,  5,  0, 16,  7, {88,65,70},      0,     0,     1,     6,     7 }, // Ngiemboon/Latin/Cameroon
+    {    261,     7,   197,    0,    0,    0,    0,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,   53,   70,    0,    0,   56,   56,   56,   56,   83,   83,    0,    0,    0,    5,   22,   14,    0,    8,    0,    0,    0,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 10,  5, 27, 27, 27, 27, 13, 13,  2,  2,  4, 17, 23,  1,  0,  5,  0,  0,  0, {69,85,82},      2,     1,     1,     6,     7 }, // Aragonese/Latin/Spain
+    {    272,    46,    18,    0,    0, 1044, 1044,    6,    0,    1,    2,   69,    4,    5,    9,   10,   11,   12,   13,  174,  259,   10,   22,20184,20184,20310,20310,20394,20394,    0,    0, 1241,    5,   22,  122,16692,    0,    0, 5674, 5686,  6,  6, 12, 12,  1,  1,  1,  1,  2,  1,  1,  1,  1,  1,  1,  1, 18,  6, 12,  7,126,126, 84, 84, 38, 38,  2,  2,  8, 17, 23,  1, 69,  4,  0, 12, 14, {66,68,84},      2,     1,     7,     6,     7 }, // Chakma/Chakma/Bangladesh
+    {    272,    46,   100,    0,    0, 1044, 1044,    6,    0,    1,    2,   69,    4,    5,    9,   10,   11,   12,   13,  174,  259,   10,   22,20184,20184,20310,20310,20394,20394,    0,    0, 1241,    5,   22,  119,16761,    0,    0, 5674, 5700,  6,  6, 12, 12,  1,  1,  1,  1,  2,  1,  1,  1,  1,  1,  1,  1, 18,  6, 12,  7,126,126, 84, 84, 38, 38,  2,  2,  8, 17, 23,  1, 87,  4,  0, 12, 10, {73,78,82},      2,     1,     7,     7,     7 }, // Chakma/Chakma/India
+    {    290,    11,   100,    0,    0,    0,    0,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,   53,   70,    0,    0,   56,   56,   56,   56,   83,   83,    0,    0,    0,    5,   22,  119,    0,    8,    0,    0,    0,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 10,  5, 27, 27, 27, 27, 13, 13,  2,  2,  4, 17, 23,  1,  0,  5,  0,  0,  0, {73,78,82},      2,     1,     7,     7,     7 }, // Manipuri/Bengali/India
+    {    309,   100,   232,    0,    0,    0,    0,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,   53,   70,    0,    0,   56,   56,   56,   56,   83,   83,    0,    0,    0,    5,   22,  316,    0,    8,    0,    0,    0,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 10,  5, 27, 27, 27, 27, 13, 13,  2,  2,  4, 17, 23,  1,  0,  5,  0,  0,  0, {86,78,68},      0,     0,     1,     6,     7 }, // Tai Dam/Tai Viet/Vietnam
+    {    312,     7,    37,    0,    0,    0,    0,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,   53,   70,    0,    0,   56,   56,   56,   56,   83,   83,    0,    0,    0,    5,   22,   32,    0,    8,    0,    0,    0,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 10,  5, 27, 27, 27, 27, 13, 13,  2,  2,  4, 17, 23,  4,  0,  5,  0,  0,  0, {88,65,70},      0,     0,     1,     6,     7 }, // Akoose/Latin/Cameroon
+    {    313,     7,   225,    0,    0,    0,    0,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,   27,  521,   10,   22,20432,20432,20432,20432,   83,20518,    0,    0,    0,    5,   22,    6,    0,   41,    0, 5710, 5722,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 18,  6, 12,  7, 86, 86, 86, 86, 13, 13,  2,  2,  4, 17, 23,  1,  0,  6,  0, 12, 22, {85,83,68},      2,     1,     7,     6,     7 }, // Lakota/Latin/United States
+    {    314,     9,   145,    0,    0,    0,    0,    6,    1,   14,    2,    3,    4,    5,    9,   15,   16,   40,   11,   97,  398,    0,    0,20531,20531,14781,14781,   83,   83,  523,  499,    0,    5,   22,    0,15938,    0,    0, 5744, 4911,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 16,  8, 10,  5, 47, 47, 29, 29, 13, 13,  6,  8,  4, 17, 23,  0, 14,  4,  0,  8,  6, {77,65,68},      2,     1,     1,     6,     7 }, // Standard Moroccan Tamazight/Tifinagh/Morocco
+    {    315,     7,    43,    0,    0,    0,    0,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,   53,   70,    0,    0,   56,   56,   56,   56,   83,   83,    0,    0,    0,    5,   22,    6,    0,    8,    0,    0,    0,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 10,  5, 27, 27, 27, 27, 13, 13,  2,  2,  4, 17, 23,  1,  0,  5,  0,  0,  0, {67,76,80},      0,     0,     1,     6,     7 }, // Mapuche/Latin/Chile
+    {    316,     1,   103,    0,    0,    0,    0,   53,   19,   20,   21,   23,   71,   73,   28,   10,   11,   12,   13,   53,   70,   10,   22,20578,20578,20578,20578,20635,20635,  779,  784,    0,    5,   22,   42,16848,   13,    0, 5752, 5766,  6,  6,  6,  6,  1,  1,  1,  1,  1,  2,  2,  2,  1,  1,  1,  1, 17, 10, 12,  7, 57, 57, 57, 57, 13, 13,  3,  3,  4, 17, 23,  5, 13,  5,  0, 14,  5, {73,81,68},      0,     0,     6,     5,     6 }, // Central Kurdish/Arabic/Iraq
+    {    316,     1,   102,    0,    0,    0,    0,   53,   19,   20,   21,   23,   71,   73,   28,   10,   11,   12,   13,   53,   70,    0,    0,20578,20578,20578,20578,20635,20635,  779,  784,    0,    5,   22,    0,16861,   13,    0, 5752, 5771,  6,  6,  6,  6,  1,  1,  1,  1,  1,  2,  2,  2,  1,  1,  1,  1, 17, 10, 10,  5, 57, 57, 57, 57, 13, 13,  3,  3,  4, 17, 23,  0, 12,  5,  0, 14,  5, {73,82,82},      0,     0,     6,     5,     5 }, // Central Kurdish/Arabic/Iran
+    {    317,     7,    82,    0,    0,  183,  183,    6,    1,    0,    2,    3,    4,    5,    9,   40,   10,   46,   12,  420,  113,    1,    1,20648,20648,20700,20700,20727,20727,  782,  787,    0,    5,   22,   14,16873,   13,    0, 5776, 5790,  6,  6,  7,  7,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 18,  6,  9,  4, 52, 52, 27, 27, 13, 13,  9, 10,  4, 17, 23,  1, 26,  5,  0, 14,  6, {69,85,82},      2,     1,     1,     6,     7 }, // Lower Sorbian/Latin/Germany
+    {    318,     7,    82,    0,    0,  183,  183,    6,    1,    0,    2,    3,    4,    5,    9,   40,   10,   46,   12,  420,  113,    1,  460,20740,20740,20792,20792,20819,20819,  782,  797, 1249,    5,   22,   14,16899,   13,    0, 5796, 5811,  6,  6,  7,  7,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 18,  6,  9, 12, 52, 52, 27, 27, 13, 13,  9,  9,  5, 17, 23,  1, 28,  5,  0, 15,  6, {69,85,82},      2,     1,     1,     6,     7 }, // Upper Sorbian/Latin/Germany
+    {    319,     7,    37,    0,    0,    0,    0,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,   53,   70,    0,    0,   56,   56,   56,   56,   83,   83,    0,    0,    0,    5,   22,   32,    0,    8,    0,    0,    0,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 10,  5, 27, 27, 27, 27, 13, 13,  2,  2,  4, 17, 23,  4,  0,  5,  0,  0,  0, {88,65,70},      0,     0,     1,     6,     7 }, // Kenyang/Latin/Cameroon
+    {    320,     7,    38,    0,    0,    0,    0,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,   53,   70,    0,    0,   56,   56,   56,   56,   83,   83,    0,    0,    0,    5,   22,  224,    0,    8,    0,    0,    0,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 10,  5, 27, 27, 27, 27, 13, 13,  2,  2,  4, 17, 23,  3,  0,  5,  0,  0,  0, {67,65,68},      2,     0,     7,     6,     7 }, // Mohawk/Latin/Canada
+    {    321,    75,    91,    0,    0,    0,    0,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,   53,   70,    0,    0,   56,   56,   56,   56,   83,   83,    0,    0,    0,    5,   22,  201,    0,    8,    0,    0,    0,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 10,  5, 27, 27, 27, 27, 13, 13,  2,  2,  4, 17, 23,  2,  0,  5,  0,  0,  0, {71,78,70},      0,     0,     1,     6,     7 }, // Nko/Nko/Guinea
+    {    322,     7,   260,    0,    0, 1056, 1056,    6,    1,   14,    2,    3,    4,    5,    9,   40,   10,   40,   10, 1686,  166,    0,    0,20832,20832,20900,20900,20927,20927,    0,    0,    0,    5,   22,    0,    0,   13,    0, 5817, 5826,  6,  6,  8,  8,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 27,  8, 10,  5, 68, 68, 27, 27, 13, 13,  2,  2,  4, 17, 23,  0,  0,  5,  0,  9,  6,    {0,0,0},      2,     1,     1,     6,     7 }, // Prussian/Latin/World
+    {    323,     7,    90,    0,    0,    0,    0,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,   53,   70,    0,    0,   56,   56,   56,   56,   83,   83,    0,    0,    0,    5,   22,  285,    0,    8,    0,    0,    0,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 10,  5, 27, 27, 27, 27, 13, 13,  2,  2,  4, 17, 23,  1,  0,  5,  0,  0,  0, {71,84,81},      2,     1,     7,     6,     7 }, // Kiche/Latin/Guatemala
+    {    324,     7,   205,    0,    0,    0,    0,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,   53,   70,    0,    0,   56,   56,   56,   56,   83,   83,    0,    0,    0,    5,   22,  145,    0,    8,    0,    0,    0,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 10,  5, 27, 27, 27, 27, 13, 13,  2,  2,  4, 17, 23,  2,  0,  5,  0,  0,  0, {83,69,75},      2,     0,     1,     6,     7 }, // Southern Sami/Latin/Sweden
+    {    325,     7,   205,    0,    0,    0,    0,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,   53,   70,    0,    0,   56,   56,   56,   56,   83,   83,    0,    0,    0,    5,   22,  145,    0,    8,    0,    0,    0,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 10,  5, 27, 27, 27, 27, 13, 13,  2,  2,  4, 17, 23,  2,  0,  5,  0,  0,  0, {83,69,75},      2,     0,     1,     6,     7 }, // Lule Sami/Latin/Sweden
+    {    326,     7,    73,    0,    0,    0,    0,    6,    1,   14,    2,    3,    4,    5,    9,   10,   11,   12,   13, 1713,  581,  176,  167,20940,21009,21081,21081,   83,21108,  791,  806,    0,    5,   22,   14,  242,   13,    0, 5832, 5843,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 18,  8,  9,  4, 69, 72, 27, 27, 13, 13,  3,  3,  4, 17, 23,  1,  4,  5,  0, 11,  5, {69,85,82},      2,     1,     1,     6,     7 }, // Inari Sami/Latin/Finland
+    {    327,     7,    73,    0,    0,    0,    0,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,   53,   70,    0,    0,   56,   56,   56,   56,   83,   83,    0,    0,    0,    5,   22,   14,    0,    8,    0,    0,    0,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 10,  5, 27, 27, 27, 27, 13, 13,  2,  2,  4, 17, 23,  1,  0,  5,  0,  0,  0, {69,85,82},      2,     1,     1,     6,     7 }, // Skolt Sami/Latin/Finland
+    {    328,     7,    13,    0,    0,    0,    0,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,   53,   70,    0,    0,   56,   56,   56,   56,   83,   83,    0,    0,    0,    5,   22,  225,    0,    8,    0,    0,    0,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 10,  5, 27, 27, 27, 27, 13, 13,  2,  2,  4, 17, 23,  2,  0,  5,  0,  0,  0, {65,85,68},      2,     1,     7,     6,     7 }, // Warlpiri/Latin/Australia
+    {    346,     1,   102,    0,    0,    0,    0,   53,   19,   20,   21,   52,   33,   53,   56,   15,   16,   17,   18,   53,   70,    0,    0,   56,   56,   56,   56,   83,   83,    0,    0,  714, 1254,   22,  320,16927,    8,    0, 5848, 3182,  6,  6,  6,  6,  1,  1,  1,  1,  1,  3,  3,  4,  1,  1,  1,  1, 17, 10, 10,  5, 27, 27, 27, 27, 13, 13,  2,  2,  4, 39, 23,  3, 26,  5,  0,  7,  5, {73,82,82},      0,     0,     6,     5,     5 }, // Mazanderani/Arabic/Iran
+    {    349,     1,   102,    0,    0,    0,    0,   53,   19,   20,   21,   52,   33,   53,   56,   10,   11,   12,   13,   53,   70,    0,    0,   56,   56,   56,   56,   83,   83,    0,    0,    0,    5,   22,    0,    0,    8,    0, 5855,    0,  6,  6,  6,  6,  1,  1,  1,  1,  1,  3,  3,  4,  1,  1,  1,  1, 17, 10, 10,  5, 27, 27, 27, 27, 13, 13,  2,  2,  4, 17, 23,  0,  0,  5,  0, 11,  0, {73,82,82},      0,     0,     6,     5,     5 }, // Northern Luri/Arabic/Iran
+    {    349,     1,   103,    0,    0,    0,    0,   53,   19,   20,   21,   52,   33,   53,   56,   10,   11,   12,   13,   53,   70,   10,   22,   56,   56,   56,   56,   83,   83,    0,    0,    0,    5,   22,   42,    0,    8,    0, 5855,    0,  6,  6,  6,  6,  1,  1,  1,  1,  1,  3,  3,  4,  1,  1,  1,  1, 17, 10, 12,  7, 27, 27, 27, 27, 13, 13,  2,  2,  4, 17, 23,  5,  0,  5,  0, 11,  0, {73,81,68},      0,     0,     6,     5,     6 }, // Northern Luri/Arabic/Iraq
+    {    357,     6,    97,  168,  168, 1064, 1064,    6,    0,    1,    2,    3,    4,    5,    9,   42,   43,   44,   45,  406,  390,  153,   27, 1902, 1902, 1902, 1902, 1949, 1949,   58,   55,    0,    5,   22,  131,16953,    4,    0, 5866, 5868,  5,  5,  5,  5,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 14,  8, 13,  6, 27, 27, 27, 27, 13, 13,  2,  2,  4, 17, 23,  3, 10,  4,  0,  2, 14, {72,75,68},      2,     1,     7,     6,     7 }, // Cantonese/Traditional Han/Hong Kong
+    {    357,     5,    44,  168,  168, 1064, 1064,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,  377,  390,  142,   27, 1902, 1902, 1929, 1929, 1949, 1949,   58,   55,    0,    5,   22,  227, 3051,    4,    0, 5882, 5884,  5,  5,  5,  5,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 13,  8, 11,  6, 27, 27, 20, 20, 13, 13,  2,  2,  4, 17, 23,  1, 12,  4,  0,  2,  7, {67,78,89},      2,     1,     7,     6,     7 }, // Cantonese/Simplified Han/China
+    {    358,   138,   225,    0,    0,    0,    0,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,   53,   70,    0,    0,   56,   56,   56,   56,   83,   83,    0,    0,    0,    5,   22,  156,    0,    8,    0,    0,    0,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 10,  5, 27, 27, 27, 27, 13, 13,  2,  2,  4, 17, 23,  3,  0,  5,  0,  0,  0, {85,83,68},      2,     1,     7,     6,     7 }, // Osage/Osage/United States
+    {    360,     7,   260,    0,    0,    0,    0,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,   53,   70,    0,    0,   56,   56,   56,   56,   83,   83,    0,    0,    0,    5,   22,    0,    0,    8,    0,    0,    0,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 10,  5, 27, 27, 27, 27, 13, 13,  2,  2,  4, 17, 23,  0,  0,  5,  0,  0,  0,    {0,0,0},      2,     1,     1,     6,     7 }, // Ido/Latin/World
+    {    361,     7,   260,    0,    0,    0,    0,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,   53,   70,    0,    0,   56,   56,   56,   56,   83,   83,    0,    0,    0,    5,   22,    0,    0,    8,    0,    0,    0,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 10,  5, 27, 27, 27, 27, 13, 13,  2,  2,  4, 17, 23,  0,  0,  5,  0,  0,  0,    {0,0,0},      2,     1,     1,     6,     7 }, // Lojban/Latin/World
+    {    362,     7,   106,    0,    0,    0,    0,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,   53,   70,    0,    0,   56,   56,   56,   56,   83,   83,    0,    0,    0,    5,   22,   14,    0,    8,    0,    0,    0,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 10,  5, 27, 27, 27, 27, 13, 13,  2,  2,  4, 17, 23,  1,  0,  5,  0,  0,  0, {69,85,82},      2,     1,     1,     6,     7 }, // Sicilian/Latin/Italy
+    {    363,     1,   102,    0,    0,    0,    0,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,   53,   70,    0,    0,   56,   56,   56,   56,   83,   83,    0,    0,    0,    5,   22,    0,    0,    8,    0,    0,    0,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 10,  5, 27, 27, 27, 27, 13, 13,  2,  2,  4, 17, 23,  0,  0,  5,  0,  0,  0, {73,82,82},      0,     0,     6,     5,     5 }, // Southern Kurdish/Arabic/Iran
+    {    364,     1,   163,    0,    0,    0,    0,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,   53,   70,    0,    0,   56,   56,   56,   56,   83,   83,    0,    0,    0,    5,   22,  170,    0,    8,    0,    0,    0,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 10,  5, 27, 27, 27, 27, 13, 13,  2,  2,  4, 17, 23,  2,  0,  5,  0,  0,  0, {80,75,82},      2,     0,     7,     6,     7 }, // Western Balochi/Arabic/Pakistan
+    {    365,     7,   170,    0,    0,  922,  931,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,   27,  521,   10,   22,21121,21121,21176,21176,21200,21200,    0,    0, 1293,    5,   22,  173,16963,    4,    0, 5891, 4632,  6,  6,  9,  8,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 18,  6, 12,  7, 55, 55, 24, 24, 13, 13,  2,  2,  8, 17, 23,  1, 55,  4,  0,  8,  9, {80,72,80},      2,     1,     7,     6,     7 }, // Cebuano/Latin/Philippines
+    {    366,     2,   178,    0,    0,    0,    0,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,   53,   70,    0,    0,   56,   56,   56,   56,   83,   83,    0,    0,    0,    5,   22,  121,    0,    8,    0,    0,    0,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 10,  5, 27, 27, 27, 27, 13, 13,  2,  2,  4, 17, 23,  1,  0,  5,  0,  0,  0, {82,85,66},      2,     1,     1,     6,     7 }, // Erzya/Cyrillic/Russia
+    {    367,     7,   225,    0,    0,    0,    0,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,   53,   70,    0,    0,   56,   56,   56,   56,   83,   83,    0,    0,    0,    5,   22,  156,    0,    8,    0,    0,    0,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 10,  5, 27, 27, 27, 27, 13, 13,  2,  2,  4, 17, 23,  3,  0,  5,  0,  0,  0, {85,83,68},      2,     1,     7,     6,     7 }, // Chickasaw/Latin/United States
+    {    368,     7,   225,    0,    0,    0,    0,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,   53,   70,    0,    0,   56,   56,   56,   56,   83,   83,    0,    0,    0,    5,   22,  156,    0,    8,    0,    0,    0,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 10,  5, 27, 27, 27, 27, 13, 13,  2,  2,  4, 17, 23,  3,  0,  5,  0,  0,  0, {85,83,68},      2,     1,     7,     6,     7 }, // Muscogee/Latin/United States
+    {    369,     7,   172,    0,    0,    0,    0,    6,    0,    1,    2,    3,    4,    5,    9,   10,   11,   12,   13,   53,   70,    0,    0,   56,   56,   56,   56,   83,   83,    0,    0,    0,    5,   22,  257,    0,    8,    0,    0,    0,  6,  6,  6,  6,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 17, 10, 10,  5, 27, 27, 27, 27, 13, 13,  2,  2,  4, 17, 23,  2,  0,  5,  0,  0,  0, {80,76,78},      2,     1,     1,     6,     7 }, // Silesian/Latin/Poland
+    {      0,     0,     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,    {0,0,0},      0,     0,     0,     0,     0 } // trailing zeros
 };
 
-static const ushort list_pattern_part_data[] = {
-0x25, 0x31, 0x2c, 0x20, 0x25, 0x32, 0x25, 0x31, 0x20, 0x65, 0x6e, 0x20, 0x25, 0x32, 0x25, 0x31, 0x20, 0x64, 0x68, 0x65,
-0x20, 0x25, 0x32, 0x25, 0x31, 0x1363, 0x20, 0x25, 0x32, 0x25, 0x31, 0x2c, 0x20, 0x12a5, 0x1293, 0x20, 0x25, 0x32, 0x25, 0x31,
-0x20, 0x12a5, 0x1293, 0x20, 0x25, 0x32, 0x25, 0x31, 0x20, 0x648, 0x25, 0x32, 0x25, 0x31, 0x20, 0x587, 0x20, 0x25, 0x32, 0x25,
-0x31, 0x20, 0x986, 0x9f0, 0x9c1, 0x20, 0x25, 0x32, 0x25, 0x31, 0x20, 0x76, 0x259, 0x20, 0x25, 0x32, 0x25, 0x31, 0x20, 0x65,
-0x74, 0x61, 0x20, 0x25, 0x32, 0x25, 0x31, 0x20, 0x98f, 0x9ac, 0x982, 0x20, 0x25, 0x32, 0x25, 0x31, 0x20, 0xf51, 0xf44, 0xf0b,
-0x20, 0x25, 0x32, 0x25, 0x31, 0x20, 0x68, 0x61, 0x20, 0x25, 0x32, 0x25, 0x31, 0x20, 0x438, 0x20, 0x25, 0x32, 0x25, 0x31,
-0x20, 0x25, 0x32, 0x25, 0x31, 0x1014, 0x103e, 0x1004, 0x1037, 0x103a, 0x20, 0x25, 0x32, 0x25, 0x31, 0x20, 0x456, 0x20, 0x25, 0x32,
-0x25, 0x31, 0x20, 0x1793, 0x17b7, 0x1784, 0x20, 0x25, 0x32, 0x25, 0x31, 0x20, 0x1793, 0x17b7, 0x1784, 0x200b, 0x25, 0x32, 0x25, 0x31,
-0x20, 0x69, 0x20, 0x25, 0x32, 0x25, 0x31, 0x3001, 0x25, 0x32, 0x25, 0x31, 0x548c, 0x25, 0x32, 0x25, 0x31, 0x53ca, 0x25, 0x32,
-0x25, 0x31, 0x20, 0x61, 0x20, 0x25, 0x32, 0x25, 0x31, 0x20, 0x6f, 0x67, 0x20, 0x25, 0x32, 0x25, 0x31, 0x2c, 0x20, 0x61,
-0x6e, 0x64, 0x20, 0x25, 0x32, 0x25, 0x31, 0x20, 0x61, 0x6e, 0x64, 0x20, 0x25, 0x32, 0x25, 0x31, 0x20, 0x6b, 0x61, 0x6a,
-0x20, 0x25, 0x32, 0x25, 0x31, 0x20, 0x6a, 0x61, 0x20, 0x25, 0x32, 0x25, 0x31, 0x20, 0x65, 0x74, 0x20, 0x25, 0x32, 0x25,
-0x31, 0x20, 0x61, 0x67, 0x75, 0x73, 0x20, 0x25, 0x32, 0x25, 0x31, 0x20, 0x65, 0x20, 0x25, 0x32, 0x25, 0x31, 0x20, 0x10d3,
-0x10d0, 0x20, 0x25, 0x32, 0x25, 0x31, 0x20, 0x75, 0x6e, 0x64, 0x20, 0x25, 0x32, 0x25, 0x31, 0x20, 0x3ba, 0x3b1, 0x3b9, 0x20,
-0x25, 0x32, 0x25, 0x31, 0x20, 0x61, 0x61, 0x6d, 0x6d, 0x61, 0x20, 0x25, 0x32, 0x25, 0x31, 0x20, 0xa85, 0xaa8, 0xac7, 0x20,
-0x25, 0x32, 0x25, 0x31, 0x20, 0x64, 0x61, 0x20, 0x25, 0x32, 0x25, 0x31, 0x20, 0x5d5, 0x25, 0x32, 0x25, 0x31, 0x2c, 0x20,
-0x914, 0x930, 0x20, 0x25, 0x32, 0x25, 0x31, 0x20, 0x914, 0x930, 0x20, 0x25, 0x32, 0x25, 0x31, 0x20, 0xe9, 0x73, 0x20, 0x25,
-0x32, 0x25, 0x31, 0x2c, 0x20, 0x64, 0x61, 0x6e, 0x20, 0x25, 0x32, 0x25, 0x31, 0x20, 0x64, 0x61, 0x6e, 0x20, 0x25, 0x32,
-0x25, 0x31, 0x2c, 0x20, 0x61, 0x67, 0x75, 0x73, 0x20, 0x25, 0x32, 0x25, 0x31, 0x2c, 0x20, 0x6c, 0x61, 0x6e, 0x20, 0x25,
-0x32, 0x25, 0x31, 0x20, 0x6c, 0x61, 0x6e, 0x20, 0x25, 0x32, 0x25, 0x31, 0x2c, 0x20, 0xcae, 0xca4, 0xccd, 0xca4, 0xcc1, 0x20,
-0x25, 0x32, 0x25, 0x31, 0x20, 0xcae, 0xca4, 0xccd, 0xca4, 0xcc1, 0x20, 0x25, 0x32, 0x25, 0x31, 0x20, 0x436, 0x4d9, 0x43d, 0x435,
-0x20, 0x25, 0x32, 0x25, 0x31, 0x20, 0x436, 0x430, 0x43d, 0x430, 0x20, 0x25, 0x32, 0x25, 0x31, 0x20, 0xbc0f, 0x20, 0x25, 0x32,
-0x25, 0x31, 0x20, 0xfb, 0x20, 0x25, 0x32, 0x25, 0x31, 0x20, 0xec1, 0xea5, 0xeb0, 0x20, 0x25, 0x32, 0x25, 0x31, 0x20, 0x75,
-0x6e, 0x20, 0x25, 0x32, 0x25, 0x31, 0x20, 0x6d, 0x70, 0xe9, 0x20, 0x25, 0x32, 0x25, 0x31, 0x20, 0x69, 0x72, 0x20, 0x25,
-0x32, 0x25, 0x31, 0x2c, 0x20, 0x25, 0x32, 0x20, 0xd0e, 0xd28, 0xd4d, 0xd28, 0xd3f, 0xd35, 0x25, 0x31, 0x20, 0xd15, 0xd42, 0xd1f,
-0xd3e, 0xd24, 0xd46, 0x20, 0x25, 0x32, 0x25, 0x31, 0x2c, 0x20, 0x75, 0x20, 0x25, 0x32, 0x25, 0x31, 0x20, 0x75, 0x20, 0x25,
-0x32, 0x25, 0x31, 0x20, 0x906, 0x923, 0x93f, 0x20, 0x25, 0x32, 0x25, 0x31, 0x2c, 0x25, 0x32, 0x25, 0x31, 0x20, 0x930, 0x20,
-0x25, 0x32, 0x25, 0x31, 0x2c, 0x20, 0xb13, 0x20, 0x25, 0x32, 0x25, 0x31, 0x20, 0xb13, 0x20, 0x25, 0x32, 0x25, 0x31, 0x60c,
-0x20, 0x25, 0x32, 0x25, 0x31, 0x60c, 0x20, 0x627, 0x648, 0x20, 0x25, 0x32, 0x25, 0x31, 0x20, 0x627, 0x648, 0x20, 0x25, 0x32,
-0x25, 0x31, 0x60c, 0x200f, 0x20, 0x25, 0x32, 0x25, 0x31, 0x60c, 0x20, 0x648, 0x20, 0x25, 0x32, 0x25, 0x31, 0x20, 0x648, 0x20,
-0x25, 0x32, 0x25, 0x31, 0x20, 0xa05, 0xa24, 0xa47, 0x20, 0x25, 0x32, 0x25, 0x31, 0x2c, 0x20, 0x75, 0x74, 0x61, 0x71, 0x20,
-0x25, 0x32, 0x25, 0x31, 0x20, 0x75, 0x74, 0x61, 0x71, 0x20, 0x25, 0x32, 0x25, 0x31, 0x20, 0x219, 0x69, 0x20, 0x25, 0x32,
-0x25, 0x31, 0x20, 0x4d5, 0x43c, 0x4d5, 0x20, 0x25, 0x32, 0x25, 0x31, 0x60c, 0x20, 0x6fd, 0x20, 0x25, 0x32, 0x25, 0x31, 0x20,
-0x6fd, 0x20, 0x25, 0x32, 0x25, 0x31, 0x2c, 0x20, 0xdc3, 0xdc4, 0x20, 0x25, 0x32, 0x25, 0x31, 0x20, 0xdc3, 0xdc4, 0x20, 0x25,
-0x32, 0x25, 0x31, 0x20, 0x61, 0xa0, 0x25, 0x32, 0x25, 0x31, 0x20, 0x69, 0x6e, 0x20, 0x25, 0x32, 0x25, 0x31, 0x20, 0x69,
-0x79, 0x6f, 0x20, 0x25, 0x32, 0x25, 0x31, 0x20, 0x79, 0x20, 0x25, 0x32, 0x25, 0x31, 0x20, 0x6e, 0x61, 0x20, 0x25, 0x32,
-0x25, 0x31, 0x20, 0x6f, 0x63, 0x68, 0x20, 0x25, 0x32, 0x25, 0x31, 0x20, 0xbae, 0xbb1, 0xbcd, 0xbb1, 0xbc1, 0xbae, 0xbcd, 0x20,
-0x25, 0x32, 0x25, 0x31, 0x20, 0x4bb, 0x4d9, 0x43c, 0x20, 0x25, 0x32, 0x25, 0x31, 0x20, 0xc2e, 0xc30, 0xc3f, 0xc2f, 0xc41, 0x20,
-0x25, 0x32, 0x25, 0x31, 0x20, 0xe41, 0xe25, 0xe30, 0x25, 0x32, 0x25, 0x31, 0xe41, 0xe25, 0xe30, 0x25, 0x32, 0x25, 0x31, 0x20,
-0x6d, 0x6f, 0x20, 0x25, 0x32, 0x25, 0x31, 0x20, 0x76, 0x65, 0x20, 0x25, 0x32, 0x25, 0x31, 0x20, 0x77, 0x65, 0x20, 0x25,
-0x32, 0x25, 0x31, 0x60c, 0x20, 0x627, 0x648, 0x631, 0x20, 0x25, 0x32, 0x25, 0x31, 0x20, 0x627, 0x648, 0x631, 0x20, 0x25, 0x32,
-0x25, 0x32, 0x60c, 0x20, 0x25, 0x31, 0x25, 0x31, 0x20, 0x76, 0x61, 0x20, 0x25, 0x32, 0x25, 0x31, 0x20, 0x76, 0xe0, 0x20,
-0x25, 0x32, 0x25, 0x31, 0x2c, 0x20, 0x61, 0x28, 0x63, 0x29, 0x20, 0x25, 0x32, 0x25, 0x31, 0x20, 0x61, 0x28, 0x63, 0x29,
-0x20, 0x25, 0x32, 0x25, 0x31, 0x20, 0x5d0, 0x5d5, 0x5df, 0x20, 0x25, 0x32, 0x25, 0x31, 0x2c, 0x20, 0x6e, 0x65, 0x2d, 0x25,
-0x32, 0x25, 0x31, 0x20, 0x6e, 0x65, 0x2d, 0x25, 0x32, 0x25, 0x31, 0x2c, 0x20, 0x6e, 0x61, 0x20, 0x25, 0x32, 0x25, 0x31,
-0x2c, 0x20, 0x6b, 0x70, 0x6c, 0x65, 0x20, 0x25, 0x32, 0x25, 0x31, 0x20, 0x6b, 0x70, 0x6c, 0x65, 0x20, 0x25, 0x32, 0x25,
-0x31, 0x2c, 0x20, 0x61, 0x74, 0x20, 0x25, 0x32, 0x25, 0x31, 0x20, 0x61, 0x74, 0x20, 0x25, 0x32, 0x25, 0x31, 0x2c, 0x20,
-0x61, 0x6b, 0x6b, 0x65, 0x64, 0x20, 0x25, 0x32, 0x25, 0x31, 0x20, 0x61, 0x6b, 0x6b, 0x65, 0x64, 0x20, 0x25, 0x32, 0x25,
-0x31, 0x2c, 0x20, 0x13a0, 0x13b4, 0x20, 0x25, 0x32, 0x25, 0x31, 0x20, 0x13a0, 0x13b4, 0x20, 0x25, 0x32, 0x25, 0x31, 0x20, 0x438,
-0x486, 0x20, 0x25, 0x32, 0x25, 0x31, 0x20, 0x61, 0x28, 0x6e, 0x29, 0x20, 0x25, 0x32, 0x25, 0x31, 0x20, 0x443, 0x43e, 0x43d,
-0x43d, 0x430, 0x20, 0x25, 0x32, 0x25, 0x31, 0x2c, 0x20, 0x14b, 0x301, 0x67, 0x25b, 0x20, 0x25, 0x32, 0x25, 0x31, 0x2c, 0x20,
-0x1e3f, 0x62, 0x25b, 0x6e, 0x20, 0x14b, 0x301, 0x67, 0x25b, 0x20, 0x25, 0x32, 0x25, 0x31, 0x20, 0x70, 0x254, 0x70, 0x20, 0x25,
-0x32, 0x25, 0x31, 0x20, 0x62, 0x65, 0x20, 0x25, 0x32, 0x25, 0x31, 0x540c, 0x25, 0x32
+static const char16_t list_pattern_part_data[] = {
+0x25, 0x31, 0x2c, 0x20, 0x25, 0x32, 0x3b, 0x25, 0x31, 0x20, 0x65, 0x6e, 0x20, 0x25, 0x32, 0x25, 0x31, 0x20, 0x64, 0x68,
+0x65, 0x20, 0x25, 0x32, 0x25, 0x31, 0x1363, 0x20, 0x25, 0x32, 0x25, 0x31, 0x2c, 0x20, 0x12a5, 0x1293, 0x20, 0x25, 0x32, 0x25,
+0x31, 0x20, 0x12a5, 0x1293, 0x20, 0x25, 0x32, 0x25, 0x31, 0x20, 0x648, 0x25, 0x32, 0x61b, 0x25, 0x31, 0x20, 0x587, 0x20, 0x25,
+0x32, 0x25, 0x31, 0x20, 0x986, 0x9f0, 0x9c1, 0x20, 0x25, 0x32, 0x25, 0x31, 0x20, 0x76, 0x259, 0x20, 0x25, 0x32, 0x25, 0x31,
+0x20, 0x65, 0x74, 0x61, 0x20, 0x25, 0x32, 0x25, 0x31, 0x20, 0x98f, 0x9ac, 0x982, 0x20, 0x25, 0x32, 0x25, 0x31, 0x20, 0xf51,
+0xf44, 0xf0b, 0x20, 0x25, 0x32, 0x25, 0x31, 0x20, 0x68, 0x61, 0x20, 0x25, 0x32, 0x25, 0x31, 0x20, 0x438, 0x20, 0x25, 0x32,
+0x25, 0x31, 0x20, 0x25, 0x32, 0x25, 0x31, 0x1014, 0x103e, 0x1004, 0x1037, 0x103a, 0x20, 0x25, 0x32, 0x104a, 0x25, 0x31, 0x20, 0x456,
+0x20, 0x25, 0x32, 0x25, 0x31, 0x20, 0x1793, 0x17b7, 0x1784, 0x20, 0x25, 0x32, 0x25, 0x31, 0x20, 0x1793, 0x17b7, 0x1784, 0x200b, 0x25,
+0x32, 0x25, 0x31, 0x20, 0x69, 0x20, 0x25, 0x32, 0x25, 0x31, 0x3001, 0x25, 0x32, 0x25, 0x31, 0x548c, 0x25, 0x32, 0x25, 0x31,
+0x53ca, 0x25, 0x32, 0x25, 0x31, 0x20, 0x61, 0x20, 0x25, 0x32, 0x25, 0x31, 0x20, 0x6f, 0x67, 0x20, 0x25, 0x32, 0x25, 0x31,
+0x2c, 0x20, 0x61, 0x6e, 0x64, 0x20, 0x25, 0x32, 0x25, 0x31, 0x20, 0x61, 0x6e, 0x64, 0x20, 0x25, 0x32, 0x25, 0x31, 0x20,
+0x6b, 0x61, 0x6a, 0x20, 0x25, 0x32, 0x25, 0x31, 0x20, 0x6a, 0x61, 0x20, 0x25, 0x32, 0x25, 0x31, 0x20, 0x65, 0x74, 0x20,
+0x25, 0x32, 0x25, 0x31, 0x20, 0x61, 0x67, 0x75, 0x73, 0x20, 0x25, 0x32, 0x25, 0x31, 0x20, 0x65, 0x20, 0x25, 0x32, 0x25,
+0x31, 0x20, 0x10d3, 0x10d0, 0x20, 0x25, 0x32, 0x25, 0x31, 0x20, 0x75, 0x6e, 0x64, 0x20, 0x25, 0x32, 0x25, 0x31, 0x20, 0x3ba,
+0x3b1, 0x3b9, 0x20, 0x25, 0x32, 0x25, 0x31, 0x20, 0x61, 0x61, 0x6d, 0x6d, 0x61, 0x20, 0x25, 0x32, 0x25, 0x31, 0x20, 0xa85,
+0xaa8, 0xac7, 0x20, 0x25, 0x32, 0x25, 0x31, 0x20, 0x64, 0x61, 0x20, 0x25, 0x32, 0x25, 0x31, 0x20, 0x5d5, 0x25, 0x32, 0x25,
+0x31, 0x2c, 0x20, 0x914, 0x930, 0x20, 0x25, 0x32, 0x25, 0x31, 0x20, 0x914, 0x930, 0x20, 0x25, 0x32, 0x25, 0x31, 0x20, 0xe9,
+0x73, 0x20, 0x25, 0x32, 0x25, 0x31, 0x2c, 0x20, 0x64, 0x61, 0x6e, 0x20, 0x25, 0x32, 0x25, 0x31, 0x20, 0x64, 0x61, 0x6e,
+0x20, 0x25, 0x32, 0x25, 0x31, 0x2c, 0x20, 0x61, 0x67, 0x75, 0x73, 0x20, 0x25, 0x32, 0x25, 0x31, 0x2c, 0x20, 0x6c, 0x61,
+0x6e, 0x20, 0x25, 0x32, 0x25, 0x31, 0x20, 0x6c, 0x61, 0x6e, 0x20, 0x25, 0x32, 0x25, 0x31, 0x2c, 0x20, 0xcae, 0xca4, 0xccd,
+0xca4, 0xcc1, 0x20, 0x25, 0x32, 0x25, 0x31, 0x20, 0xcae, 0xca4, 0xccd, 0xca4, 0xcc1, 0x20, 0x25, 0x32, 0x25, 0x31, 0x20, 0x436,
+0x4d9, 0x43d, 0x435, 0x20, 0x25, 0x32, 0x25, 0x31, 0x20, 0x436, 0x430, 0x43d, 0x430, 0x20, 0x25, 0x32, 0x25, 0x31, 0x20, 0xbc0f,
+0x20, 0x25, 0x32, 0x25, 0x31, 0x20, 0xfb, 0x20, 0x25, 0x32, 0x25, 0x31, 0x20, 0xec1, 0xea5, 0xeb0, 0x20, 0x25, 0x32, 0x25,
+0x31, 0x20, 0x75, 0x6e, 0x20, 0x25, 0x32, 0x25, 0x31, 0x20, 0x6d, 0x70, 0xe9, 0x20, 0x25, 0x32, 0x25, 0x31, 0x20, 0x69,
+0x72, 0x20, 0x25, 0x32, 0x25, 0x31, 0x2c, 0x20, 0x25, 0x32, 0x20, 0xd0e, 0xd28, 0xd4d, 0xd28, 0xd3f, 0xd35, 0x25, 0x31, 0x20,
+0xd15, 0xd42, 0xd1f, 0xd3e, 0xd24, 0xd46, 0x20, 0x25, 0x32, 0x25, 0x31, 0x2c, 0x20, 0x75, 0x20, 0x25, 0x32, 0x25, 0x31, 0x20,
+0x75, 0x20, 0x25, 0x32, 0x25, 0x31, 0x20, 0x906, 0x923, 0x93f, 0x20, 0x25, 0x32, 0x25, 0x31, 0x2c, 0x25, 0x32, 0x25, 0x31,
+0x20, 0x930, 0x20, 0x25, 0x32, 0x25, 0x31, 0x2c, 0x20, 0xb13, 0x20, 0x25, 0x32, 0x25, 0x31, 0x20, 0xb13, 0x20, 0x25, 0x32,
+0x25, 0x31, 0x60c, 0x20, 0x25, 0x32, 0x25, 0x31, 0x60c, 0x20, 0x627, 0x648, 0x20, 0x25, 0x32, 0x25, 0x31, 0x20, 0x627, 0x648,
+0x20, 0x25, 0x32, 0x25, 0x31, 0x60c, 0x200f, 0x20, 0x25, 0x32, 0x25, 0x31, 0x60c, 0x20, 0x648, 0x20, 0x25, 0x32, 0x25, 0x31,
+0x20, 0x648, 0x20, 0x25, 0x32, 0x25, 0x31, 0x20, 0xa05, 0xa24, 0xa47, 0x20, 0x25, 0x32, 0x25, 0x31, 0x2c, 0x20, 0x75, 0x74,
+0x61, 0x71, 0x20, 0x25, 0x32, 0x25, 0x31, 0x20, 0x75, 0x74, 0x61, 0x71, 0x20, 0x25, 0x32, 0x25, 0x31, 0x20, 0x219, 0x69,
+0x20, 0x25, 0x32, 0x25, 0x31, 0x20, 0x4d5, 0x43c, 0x4d5, 0x20, 0x25, 0x32, 0x25, 0x31, 0x60c, 0x20, 0x6fd, 0x20, 0x25, 0x32,
+0x25, 0x31, 0x20, 0x6fd, 0x20, 0x25, 0x32, 0x25, 0x31, 0x2c, 0x20, 0xdc3, 0xdc4, 0x20, 0x25, 0x32, 0x25, 0x31, 0x20, 0xdc3,
+0xdc4, 0x20, 0x25, 0x32, 0x25, 0x31, 0x20, 0x61, 0xa0, 0x25, 0x32, 0x25, 0x31, 0x20, 0x69, 0x6e, 0x20, 0x25, 0x32, 0x25,
+0x31, 0x20, 0x69, 0x79, 0x6f, 0x20, 0x25, 0x32, 0x25, 0x31, 0x20, 0x79, 0x20, 0x25, 0x32, 0x25, 0x31, 0x20, 0x6e, 0x61,
+0x20, 0x25, 0x32, 0x25, 0x31, 0x20, 0x6f, 0x63, 0x68, 0x20, 0x25, 0x32, 0x25, 0x31, 0x20, 0xbae, 0xbb1, 0xbcd, 0xbb1, 0xbc1,
+0xbae, 0xbcd, 0x20, 0x25, 0x32, 0x25, 0x31, 0x20, 0x4bb, 0x4d9, 0x43c, 0x20, 0x25, 0x32, 0x25, 0x31, 0x20, 0xc2e, 0xc30, 0xc3f,
+0xc2f, 0xc41, 0x20, 0x25, 0x32, 0x25, 0x31, 0x20, 0xe41, 0xe25, 0xe30, 0x25, 0x32, 0x25, 0x31, 0xe41, 0xe25, 0xe30, 0x25, 0x32,
+0x25, 0x31, 0x20, 0x6d, 0x6f, 0x20, 0x25, 0x32, 0x25, 0x31, 0x20, 0x76, 0x65, 0x20, 0x25, 0x32, 0x25, 0x31, 0x20, 0x77,
+0x65, 0x20, 0x25, 0x32, 0x25, 0x31, 0x60c, 0x20, 0x627, 0x648, 0x631, 0x20, 0x25, 0x32, 0x25, 0x31, 0x20, 0x627, 0x648, 0x631,
+0x20, 0x25, 0x32, 0x25, 0x32, 0x60c, 0x20, 0x25, 0x31, 0x25, 0x31, 0x20, 0x76, 0x61, 0x20, 0x25, 0x32, 0x25, 0x31, 0x20,
+0x76, 0xe0, 0x20, 0x25, 0x32, 0x25, 0x31, 0x2c, 0x20, 0x61, 0x28, 0x63, 0x29, 0x20, 0x25, 0x32, 0x25, 0x31, 0x20, 0x61,
+0x28, 0x63, 0x29, 0x20, 0x25, 0x32, 0x25, 0x31, 0x20, 0x5d0, 0x5d5, 0x5df, 0x20, 0x25, 0x32, 0x25, 0x31, 0x2c, 0x20, 0x6e,
+0x65, 0x2d, 0x25, 0x32, 0x25, 0x31, 0x20, 0x6e, 0x65, 0x2d, 0x25, 0x32, 0x25, 0x31, 0x2c, 0x20, 0x6e, 0x61, 0x20, 0x25,
+0x32, 0x25, 0x31, 0x2c, 0x20, 0x6b, 0x70, 0x6c, 0x65, 0x20, 0x25, 0x32, 0x25, 0x31, 0x20, 0x6b, 0x70, 0x6c, 0x65, 0x20,
+0x25, 0x32, 0x25, 0x31, 0x2c, 0x20, 0x61, 0x74, 0x20, 0x25, 0x32, 0x25, 0x31, 0x20, 0x61, 0x74, 0x20, 0x25, 0x32, 0x25,
+0x31, 0x2c, 0x20, 0x61, 0x6b, 0x6b, 0x65, 0x64, 0x20, 0x25, 0x32, 0x25, 0x31, 0x20, 0x61, 0x6b, 0x6b, 0x65, 0x64, 0x20,
+0x25, 0x32, 0x25, 0x31, 0x2c, 0x20, 0x13a0, 0x13b4, 0x20, 0x25, 0x32, 0x25, 0x31, 0x20, 0x13a0, 0x13b4, 0x20, 0x25, 0x32, 0x25,
+0x31, 0x20, 0x438, 0x486, 0x20, 0x25, 0x32, 0x25, 0x31, 0x20, 0x61, 0x28, 0x6e, 0x29, 0x20, 0x25, 0x32, 0x25, 0x31, 0x20,
+0x443, 0x43e, 0x43d, 0x43d, 0x430, 0x20, 0x25, 0x32, 0x25, 0x31, 0x2c, 0x20, 0x14b, 0x301, 0x67, 0x25b, 0x20, 0x25, 0x32, 0x25,
+0x31, 0x2c, 0x20, 0x1e3f, 0x62, 0x25b, 0x6e, 0x20, 0x14b, 0x301, 0x67, 0x25b, 0x20, 0x25, 0x32, 0x25, 0x31, 0x20, 0x70, 0x254,
+0x70, 0x20, 0x25, 0x32, 0x25, 0x31, 0x20, 0xd804, 0xdd03, 0xd804, 0xdd33, 0xd804, 0xdd03, 0x20, 0x25, 0x32, 0x25, 0x31, 0x20, 0x62,
+0x65, 0x20, 0x25, 0x32, 0x25, 0x31, 0x540c, 0x25, 0x32
 };
 
-static const ushort date_format_data[] = {
-0x64, 0x20, 0x4d, 0x4d, 0x4d, 0x20, 0x79, 0x79, 0x79, 0x79, 0x64, 0x64, 0x64, 0x64, 0x2c, 0x20, 0x64, 0x20, 0x4d, 0x4d,
-0x4d, 0x4d, 0x20, 0x79, 0x79, 0x79, 0x79, 0x64, 0x64, 0x2f, 0x4d, 0x4d, 0x2f, 0x79, 0x79, 0x64, 0x64, 0x64, 0x64, 0x2c,
-0x20, 0x4d, 0x4d, 0x4d, 0x4d, 0x20, 0x64, 0x2c, 0x20, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x2d, 0x4d, 0x4d,
-0x2d, 0x64, 0x64, 0x79, 0x79, 0x79, 0x79, 0x20, 0x4d, 0x4d, 0x4d, 0x4d, 0x20, 0x64, 0x2c, 0x20, 0x64, 0x64, 0x64, 0x64,
+static const char16_t single_character_data[] = {
+0x2e, 0x2c, 0x25, 0x30, 0x2d, 0x2b, 0x65, 0x22, 0x27, 0x45, 0x201c, 0x201d, 0x2018, 0x2019, 0xa0, 0xab, 0xbb, 0x2039, 0x203a, 0x66b,
+0x66c, 0x66a, 0x61c, 0x660, 0x61c, 0x2d, 0x61c, 0x2b, 0x627, 0x633, 0x200e, 0x25, 0x200e, 0x200e, 0x2d, 0x200e, 0x2b, 0x9e6, 0x2212, 0xf20,
+0x201e, 0x1040, 0x300c, 0x300d, 0x300e, 0x300f, 0x201a, 0xd7, 0x31, 0x30, 0x5e, 0x202f, 0x6f0, 0x200e, 0x2b, 0x200e, 0xd7, 0x6f1, 0x6f0, 0x5e,
+0x966, 0x200e, 0x2212, 0x415, 0xb7, 0x31, 0x30, 0x5e, 0x5a, 0xd804, 0xdd36, 0x200f, 0x2d, 0x200f, 0x2b
+};
+
+static const char16_t date_format_data[] = {
+0x64, 0x64, 0x64, 0x64, 0x2c, 0x20, 0x64, 0x20, 0x4d, 0x4d, 0x4d, 0x4d, 0x20, 0x79, 0x79, 0x79, 0x79, 0x64, 0x20, 0x4d,
+0x4d, 0x4d, 0x20, 0x79, 0x79, 0x79, 0x79, 0x64, 0x64, 0x64, 0x64, 0x2c, 0x20, 0x4d, 0x4d, 0x4d, 0x4d, 0x20, 0x64, 0x2c,
+0x20, 0x79, 0x79, 0x79, 0x79, 0x64, 0x64, 0x2f, 0x4d, 0x4d, 0x2f, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x20, 0x4d, 0x4d,
+0x4d, 0x4d, 0x20, 0x64, 0x2c, 0x20, 0x64, 0x64, 0x64, 0x64, 0x79, 0x79, 0x79, 0x79, 0x2d, 0x4d, 0x4d, 0x2d, 0x64, 0x64,
 0x64, 0x64, 0x64, 0x64, 0x20, 0x64, 0x64, 0x20, 0x4d, 0x4d, 0x4d, 0x4d, 0x20, 0x79, 0x79, 0x79, 0x79, 0x64, 0x64, 0x64,
 0x64, 0x20, 0x64, 0x20, 0x4d, 0x4d, 0x4d, 0x4d, 0x20, 0x79, 0x79, 0x79, 0x79, 0x64, 0x2e, 0x4d, 0x2e, 0x79, 0x79, 0x64,
-0x64, 0x2f, 0x4d, 0x4d, 0x2f, 0x79, 0x79, 0x79, 0x79, 0x64, 0x200f, 0x2f, 0x4d, 0x200f, 0x2f, 0x79, 0x79, 0x79, 0x79, 0x64,
-0x64, 0x64, 0x64, 0x60c, 0x20, 0x64, 0x20, 0x4d, 0x4d, 0x4d, 0x4d, 0x20, 0x79, 0x79, 0x79, 0x79, 0x64, 0x64, 0x2e, 0x4d,
-0x4d, 0x2e, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x20, 0x569, 0x2e, 0x20, 0x4d, 0x4d, 0x4d, 0x4d, 0x20, 0x64, 0x2c, 0x20,
-0x64, 0x64, 0x64, 0x64, 0x64, 0x2d, 0x4d, 0x2d, 0x79, 0x79, 0x79, 0x79, 0x64, 0x64, 0x64, 0x64, 0x2c, 0x20, 0x64, 0x20,
-0x4d, 0x4d, 0x4d, 0x4d, 0x2c, 0x20, 0x79, 0x79, 0x79, 0x79, 0x64, 0x20, 0x4d, 0x4d, 0x4d, 0x4d, 0x20, 0x79, 0x79, 0x79,
-0x79, 0x2c, 0x20, 0x64, 0x64, 0x64, 0x64, 0x79, 0x79, 0x2f, 0x4d, 0x2f, 0x64, 0x79, 0x79, 0x79, 0x79, 0x28, 0x27, 0x65,
-0x27, 0x29, 0x27, 0x6b, 0x6f, 0x27, 0x20, 0x4d, 0x4d, 0x4d, 0x4d, 0x27, 0x72, 0x65, 0x6e, 0x27, 0x20, 0x64, 0x28, 0x27,
-0x61, 0x27, 0x29, 0x2c, 0x20, 0x64, 0x64, 0x64, 0x64, 0x64, 0x2f, 0x4d, 0x2f, 0x79, 0x79, 0x64, 0x64, 0x64, 0x64, 0x2c,
-0x20, 0xf66, 0xfa4, 0xfb1, 0xf72, 0xf0b, 0xf63, 0xf7c, 0xf0b, 0x79, 0x79, 0x79, 0x79, 0x20, 0x4d, 0x4d, 0x4d, 0x4d, 0x20, 0xf5a,
-0xf7a, 0xf66, 0xf0b, 0x64, 0x64, 0x64, 0x2e, 0x4d, 0x4d, 0x2e, 0x79, 0x79, 0x20, 0x27, 0x433, 0x27, 0x2e, 0x64, 0x64, 0x64,
-0x64, 0x2c, 0x20, 0x64, 0x20, 0x4d, 0x4d, 0x4d, 0x4d, 0x20, 0x79, 0x79, 0x79, 0x79, 0x20, 0x27, 0x433, 0x27, 0x2e, 0x64,
-0x64, 0x2d, 0x4d, 0x4d, 0x2d, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x104a, 0x20, 0x4d, 0x4d, 0x4d, 0x4d, 0x20, 0x64, 0x104a,
-0x20, 0x64, 0x64, 0x64, 0x64, 0x64, 0x2e, 0x4d, 0x4d, 0x2e, 0x79, 0x79, 0x64, 0x64, 0x64, 0x64, 0x2c, 0x20, 0x64, 0x20,
-0x4d, 0x4d, 0x4d, 0x4d, 0x20, 0x27, 0x64, 0x65, 0x27, 0x20, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x2f, 0x4d,
-0x2f, 0x64, 0x79, 0x79, 0x79, 0x79, 0x5e74, 0x4d, 0x6708, 0x64, 0x65e5, 0x64, 0x64, 0x64, 0x64, 0x64, 0x2f, 0x4d, 0x2f, 0x79,
-0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x5e74, 0x4d, 0x6708, 0x64, 0x65e5, 0x20, 0x64, 0x64, 0x64, 0x64, 0x64, 0x64, 0x2e,
-0x20, 0x4d, 0x4d, 0x2e, 0x20, 0x79, 0x79, 0x79, 0x79, 0x2e, 0x64, 0x64, 0x64, 0x64, 0x2c, 0x20, 0x64, 0x2e, 0x20, 0x4d,
-0x4d, 0x4d, 0x4d, 0x20, 0x79, 0x79, 0x79, 0x79, 0x2e, 0x64, 0x2e, 0x20, 0x4d, 0x2e, 0x20, 0x79, 0x79, 0x2e, 0x64, 0x64,
-0x64, 0x64, 0x20, 0x64, 0x2e, 0x20, 0x4d, 0x4d, 0x4d, 0x4d, 0x20, 0x79, 0x79, 0x79, 0x79, 0x64, 0x64, 0x2e, 0x4d, 0x4d,
-0x2e, 0x79, 0x79, 0x79, 0x79, 0x64, 0x64, 0x64, 0x64, 0x20, 0x27, 0x64, 0x65, 0x6e, 0x27, 0x20, 0x64, 0x2e, 0x20, 0x4d,
-0x4d, 0x4d, 0x4d, 0x20, 0x79, 0x79, 0x79, 0x79, 0x64, 0x64, 0x2d, 0x4d, 0x4d, 0x2d, 0x79, 0x79, 0x79, 0x79, 0x64, 0x2f,
-0x4d, 0x4d, 0x2f, 0x79, 0x79, 0x79, 0x79, 0x4d, 0x2f, 0x64, 0x2f, 0x79, 0x79, 0x64, 0x64, 0x64, 0x64, 0x2c, 0x20, 0x64,
-0x64, 0x20, 0x4d, 0x4d, 0x4d, 0x4d, 0x20, 0x79, 0x79, 0x79, 0x79, 0x64, 0x2f, 0x4d, 0x4d, 0x2f, 0x79, 0x79, 0x79, 0x79,
-0x79, 0x79, 0x2f, 0x4d, 0x4d, 0x2f, 0x64, 0x64, 0x79, 0x79, 0x2d, 0x4d, 0x4d, 0x2d, 0x64, 0x64, 0x64, 0x64, 0x64, 0x64,
-0x2c, 0x20, 0x64, 0x2d, 0x27, 0x61, 0x27, 0x20, 0x27, 0x64, 0x65, 0x27, 0x20, 0x4d, 0x4d, 0x4d, 0x4d, 0x20, 0x79, 0x79,
-0x79, 0x79, 0x64, 0x64, 0x64, 0x64, 0x2c, 0x20, 0x64, 0x2e, 0x20, 0x4d, 0x4d, 0x4d, 0x4d, 0x20, 0x79, 0x79, 0x79, 0x79,
-0x64, 0x2e, 0x4d, 0x2e, 0x79, 0x79, 0x79, 0x79, 0x64, 0x64, 0x64, 0x64, 0x2c, 0x20, 0x64, 0x27, 0x6d, 0x68, 0x27, 0x20,
-0x4d, 0x4d, 0x4d, 0x4d, 0x20, 0x79, 0x79, 0x79, 0x79, 0x64, 0x64, 0x64, 0x64, 0x2c, 0x20, 0x64, 0x20, 0x27, 0x64, 0x65,
-0x27, 0x20, 0x4d, 0x4d, 0x4d, 0x4d, 0x20, 0x27, 0x64, 0x65, 0x27, 0x20, 0x79, 0x79, 0x79, 0x79, 0x64, 0x64, 0x64, 0x64,
-0x2c, 0x20, 0x64, 0x64, 0x20, 0x4d, 0x4d, 0x4d, 0x4d, 0x2c, 0x20, 0x79, 0x79, 0x79, 0x79, 0x64, 0x64, 0x64, 0x64, 0x20,
-0x64, 0x20, 0x4d, 0x4d, 0x4d, 0x4d, 0x2c, 0x20, 0x79, 0x79, 0x79, 0x79, 0x64, 0x64, 0x64, 0x64, 0x2c, 0x20, 0x64, 0x20,
-0x5d1, 0x4d, 0x4d, 0x4d, 0x4d, 0x20, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x2e, 0x20, 0x4d, 0x4d, 0x2e, 0x20,
-0x64, 0x64, 0x2e, 0x79, 0x79, 0x79, 0x79, 0x2e, 0x20, 0x4d, 0x4d, 0x4d, 0x4d, 0x20, 0x64, 0x2e, 0x2c, 0x20, 0x64, 0x64,
-0x64, 0x64, 0x64, 0x64, 0x64, 0x64, 0x20, 0x27, 0x6c, 0x65, 0x27, 0x20, 0x64, 0x20, 0x27, 0x64, 0x65, 0x27, 0x20, 0x4d,
-0x4d, 0x4d, 0x4d, 0x20, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x20, 0x27, 0x436, 0x27, 0x2e, 0x20, 0x64, 0x20,
-0x4d, 0x4d, 0x4d, 0x4d, 0x2c, 0x20, 0x64, 0x64, 0x64, 0x64, 0x79, 0x79, 0x79, 0x79, 0x2d, 0x27, 0x436, 0x27, 0x2e, 0x2c,
-0x20, 0x64, 0x2d, 0x4d, 0x4d, 0x4d, 0x4d, 0x2c, 0x20, 0x64, 0x64, 0x64, 0x64, 0x79, 0x79, 0x2e, 0x20, 0x4d, 0x2e, 0x20,
-0x64, 0x2e, 0x79, 0x79, 0x79, 0x79, 0xb144, 0x20, 0x4d, 0xc6d4, 0x20, 0x64, 0xc77c, 0x20, 0x64, 0x64, 0x64, 0x64, 0x64, 0x64,
-0x64, 0x64, 0x20, 0xe97, 0xeb5, 0x20, 0x64, 0x20, 0x4d, 0x4d, 0x4d, 0x4d, 0x20, 0x79, 0x79, 0x79, 0x79, 0x64, 0x64, 0x64,
-0x64, 0x2c, 0x20, 0x79, 0x79, 0x79, 0x79, 0x2e, 0x20, 0x27, 0x67, 0x61, 0x64, 0x61, 0x27, 0x20, 0x64, 0x2e, 0x20, 0x4d,
-0x4d, 0x4d, 0x4d, 0x79, 0x79, 0x79, 0x79, 0x20, 0x27, 0x6d, 0x27, 0x2e, 0x20, 0x4d, 0x4d, 0x4d, 0x4d, 0x20, 0x64, 0x20,
-0x27, 0x64, 0x27, 0x2e, 0x2c, 0x20, 0x64, 0x64, 0x64, 0x64, 0x64, 0x64, 0x20, 0x4d, 0x4d, 0x4d, 0x4d, 0x20, 0x79, 0x79,
-0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x2c, 0x20, 0x4d, 0x4d, 0x4d, 0x4d, 0x20, 0x64, 0x2c, 0x20, 0x64, 0x64, 0x64, 0x64,
-0x64, 0x64, 0x64, 0x64, 0x2c, 0x20, 0x64, 0x20, 0x27, 0x74, 0x61, 0x27, 0x2019, 0x20, 0x4d, 0x4d, 0x4d, 0x4d, 0x20, 0x79,
-0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x2e, 0x4d, 0x4d, 0x2e, 0x64, 0x64, 0x79, 0x79, 0x79, 0x79, 0x20, 0x27, 0x43e,
-0x43d, 0x44b, 0x27, 0x20, 0x4d, 0x4d, 0x4d, 0x4d, 0x27, 0x44b, 0x43d, 0x27, 0x20, 0x64, 0x2c, 0x20, 0x64, 0x64, 0x64, 0x64,
-0x20, 0x27, 0x433, 0x430, 0x440, 0x430, 0x433, 0x27, 0x64, 0x64, 0x64, 0x64, 0x20, 0x62f, 0x20, 0x79, 0x79, 0x79, 0x79, 0x20,
-0x62f, 0x20, 0x4d, 0x4d, 0x4d, 0x4d, 0x20, 0x64, 0x64, 0x64, 0x64, 0x64, 0x2c, 0x20, 0x27, 0x69, 0x6c, 0x73, 0x27, 0x20,
-0x64, 0x20, 0x4d, 0x4d, 0x4d, 0x4d, 0x20, 0x79, 0x79, 0x79, 0x79, 0x64, 0x2e, 0x4d, 0x2e, 0x79, 0x79, 0x2e, 0x64, 0x64,
-0x64, 0x64, 0x2c, 0x20, 0x64, 0x64, 0x2e, 0x20, 0x4d, 0x4d, 0x4d, 0x4d, 0x20, 0x79, 0x79, 0x79, 0x79, 0x2e, 0x64, 0x64,
-0x64, 0x64, 0x2c, 0x20, 0x64, 0x20, 0x4d, 0x4d, 0x4d, 0x4d, 0x2c, 0x20, 0x79, 0x79, 0x79, 0x79, 0x20, 0x27, 0x430, 0x437,
-0x27, 0x64, 0x2e, 0x20, 0x4d, 0x2e, 0x20, 0x79, 0x79, 0x79, 0x79, 0x64, 0x2e, 0x20, 0x4d, 0x4d, 0x2e, 0x20, 0x79, 0x79,
-0x64, 0x64, 0x64, 0x64, 0x2c, 0x20, 0x64, 0x64, 0x2e, 0x20, 0x4d, 0x4d, 0x4d, 0x4d, 0x20, 0x79, 0x79, 0x79, 0x79, 0x64,
-0x64, 0x64, 0x64, 0x2c, 0x20, 0x4d, 0x4d, 0x4d, 0x4d, 0x20, 0x64, 0x64, 0x2c, 0x20, 0x79, 0x79, 0x79, 0x79, 0x64, 0x64,
-0x64, 0x64, 0x20, 0x64, 0x64, 0x20, 0x27, 0x64, 0x65, 0x27, 0x20, 0x4d, 0x4d, 0x4d, 0x4d, 0x20, 0x27, 0x64, 0x65, 0x27,
-0x20, 0x79, 0x79, 0x79, 0x79, 0x4d, 0x4d, 0x2f, 0x64, 0x64, 0x2f, 0x79, 0x79, 0x64, 0x20, 0x4d, 0x4d, 0x4d, 0x4d, 0x2c,
-0x20, 0x79, 0x79, 0x79, 0x79, 0x20, 0x27, 0x435, 0x43b, 0x27, 0x2c, 0x20, 0x64, 0x64, 0x64, 0x64, 0x64, 0x2c, 0x20, 0x4d,
-0x4d, 0x4d, 0x4d, 0x20, 0x79, 0x79, 0x79, 0x79, 0x2c, 0x20, 0x64, 0x64, 0x64, 0x64, 0x64, 0x64, 0x64, 0x64, 0xe17, 0xe35,
-0xe48, 0x20, 0x64, 0x20, 0x4d, 0x4d, 0x4d, 0x4d, 0x20, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x20, 0x4d, 0x4d,
-0x4d, 0x4d, 0xf60, 0xf72, 0xf0b, 0xf5a, 0xf7a, 0xf66, 0xf0b, 0x64, 0x2c, 0x20, 0x64, 0x64, 0x64, 0x64, 0x64, 0x64, 0x64, 0x64,
-0x1363, 0x20, 0x64, 0x64, 0x20, 0x4d, 0x4d, 0x4d, 0x4d, 0x20, 0x1218, 0x12d3, 0x120d, 0x1272, 0x20, 0x79, 0x79, 0x79, 0x79, 0x64,
-0x2e, 0x4d, 0x4d, 0x2e, 0x79, 0x79, 0x79, 0x79, 0x64, 0x20, 0x4d, 0x4d, 0x4d, 0x4d, 0x20, 0x79, 0x79, 0x79, 0x79, 0x20,
-0x64, 0x64, 0x64, 0x64, 0x79, 0x79, 0x79, 0x79, 0x20, 0x64, 0x2d, 0x4d, 0x4d, 0x4d, 0x4d, 0x60c, 0x20, 0x64, 0x64, 0x64,
-0x64, 0x64, 0x64, 0x64, 0x64, 0x2c, 0x20, 0x64, 0x20, 0x4d, 0x4d, 0x4d, 0x4d, 0x20, 0x79, 0x79, 0x79, 0x79, 0x20, 0x27,
-0x440, 0x27, 0x2e, 0x64, 0x64, 0x64, 0x64, 0x60c, 0x20, 0x64, 0x20, 0x4d, 0x4d, 0x4d, 0x4d, 0x60c, 0x20, 0x79, 0x79, 0x79,
-0x79, 0x64, 0x64, 0x64, 0x64, 0x2c, 0x20, 0x64, 0x2d, 0x4d, 0x4d, 0x4d, 0x4d, 0x2c, 0x20, 0x79, 0x79, 0x79, 0x79, 0x79,
-0x79, 0x79, 0x79, 0x20, 0x646, 0x686, 0x6cc, 0x20, 0x6cc, 0x6cc, 0x644, 0x20, 0x64, 0x20, 0x646, 0x686, 0x6cc, 0x20, 0x4d, 0x4d,
-0x4d, 0x4d, 0x20, 0x64, 0x64, 0x64, 0x64, 0x20, 0x6a9, 0x648, 0x646, 0x6cc, 0x79, 0x79, 0x79, 0x79, 0x20, 0x4d, 0x4d, 0x4d,
-0x4d, 0x27, 0x61, 0x27, 0x20, 0x27, 0x64, 0x27, 0x2e, 0x20, 0x64, 0x27, 0x69, 0x64, 0x27, 0x64, 0x64, 0x64, 0x64, 0x2c,
-0x20, 0x64, 0x20, 0x4d, 0x4d, 0x4d, 0x2c, 0x20, 0x79, 0x79, 0x79, 0x79, 0x64, 0x64, 0x64, 0x64, 0x2c, 0x20, 0x64, 0x5d8,
-0x5df, 0x20, 0x4d, 0x4d, 0x4d, 0x4d, 0x20, 0x79, 0x79, 0x79, 0x79, 0x64, 0x64, 0x64, 0x64, 0x2c, 0x20, 0x64, 0x20, 0x4d,
-0x4d, 0x4d, 0x20, 0x79, 0x79, 0x79, 0x79, 0x64, 0x2e, 0x20, 0x4d, 0x2e, 0x20, 0x79, 0x79, 0x79, 0x79, 0x2e, 0x79, 0x79,
-0x2f, 0x4d, 0x4d, 0x2f, 0x64, 0x64, 0x64, 0x64, 0x64, 0x64, 0x2c, 0x20, 0x79, 0x79, 0x79, 0x79, 0x20, 0x4d, 0x4d, 0x4d,
-0x4d, 0x20, 0x64, 0x64, 0x64, 0x2d, 0x4d, 0x2d, 0x79, 0x79, 0x64, 0x64, 0x64, 0x64, 0x20, 0x64, 0x20, 0x27, 0x64, 0x69,
-0x27, 0x20, 0x4d, 0x4d, 0x4d, 0x4d, 0x20, 0x27, 0x64, 0x61, 0x6c, 0x27, 0x20, 0x79, 0x79, 0x79, 0x79, 0x64, 0x64, 0x64,
-0x64, 0x2c, 0x20, 0x4d, 0x4d, 0x4d, 0x4d, 0x20, 0x64, 0x20, 0x27, 0x6c, 0x69, 0x61, 0x27, 0x20, 0x79, 0x79, 0x79, 0x79,
-0x64, 0x64, 0x64, 0x64, 0x2c, 0x20, 0x27, 0x64, 0x65, 0x27, 0x20, 0x64, 0x2e, 0x20, 0x4d, 0x4d, 0x4d, 0x4d, 0x20, 0x79,
-0x79, 0x79, 0x79, 0x64, 0x64, 0x64, 0x64, 0x2c, 0x20, 0x64, 0x20, 0x27, 0x64, 0x69, 0x27, 0x20, 0x4d, 0x4d, 0x4d, 0x4d,
-0x20, 0x27, 0x64, 0x69, 0x27, 0x20, 0x79, 0x79, 0x79, 0x79, 0x64, 0x64, 0x64, 0x64, 0x2c, 0x20, 0x27, 0x64, 0xe4, 0x27,
-0x20, 0x64, 0x2e, 0x20, 0x4d, 0x4d, 0x4d, 0x4d, 0x20, 0x79, 0x79, 0x79, 0x79, 0x64, 0x64, 0x64, 0x64, 0x2c, 0x20, 0x64,
-0x20, 0x4d, 0x4d, 0x4d, 0x4d, 0x20, 0x27, 0x43b, 0x27, 0x2e, 0x20, 0x79, 0x79, 0x79, 0x79, 0x2e, 0x79, 0x79, 0x79, 0x79,
-0x20, 0x27, 0x441, 0x44b, 0x43b, 0x27, 0x20, 0x4d, 0x4d, 0x4d, 0x4d, 0x20, 0x64, 0x20, 0x27, 0x43a, 0x4af, 0x43d, 0x44d, 0x27,
-0x2c, 0x20, 0x64, 0x64, 0x64, 0x64, 0x64, 0x64, 0x2f, 0x4d, 0x4d, 0x20, 0x79, 0x79, 0x79, 0x79, 0x64, 0x64, 0x64, 0x64,
-0x20, 0x2c, 0x20, 0x27, 0x6c, 0x79, 0x25b, 0x27, 0x30c, 0x2bc, 0x20, 0x64, 0x20, 0x27, 0x6e, 0x61, 0x27, 0x20, 0x4d, 0x4d,
-0x4d, 0x4d, 0x2c, 0x20, 0x79, 0x79, 0x79, 0x79, 0x64, 0x64, 0x64, 0x64, 0x2c, 0x20, 0x79, 0x79, 0x79, 0x79, 0x20, 0x27,
-0x6d, 0x65, 0x74, 0x74, 0x61, 0x73, 0x27, 0x20, 0x64, 0x2e, 0x20, 0x4d, 0x4d, 0x4d, 0x4d, 0x64, 0x64, 0x64, 0x64, 0x2c,
-0x20, 0x4d, 0x4d, 0x4d, 0x4d, 0x20, 0x64, 0x2e, 0x20, 0x79, 0x79, 0x79, 0x79
+0x64, 0x64, 0x64, 0x60c, 0x20, 0x64, 0x20, 0x4d, 0x4d, 0x4d, 0x4d, 0x20, 0x79, 0x79, 0x79, 0x79, 0x64, 0x200f, 0x2f, 0x4d,
+0x200f, 0x2f, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x20, 0x569, 0x2e, 0x20, 0x4d, 0x4d, 0x4d, 0x4d, 0x20, 0x64,
+0x2c, 0x20, 0x64, 0x64, 0x64, 0x64, 0x64, 0x64, 0x2e, 0x4d, 0x4d, 0x2e, 0x79, 0x79, 0x64, 0x64, 0x64, 0x64, 0x2c, 0x20,
+0x64, 0x20, 0x4d, 0x4d, 0x4d, 0x4d, 0x2c, 0x20, 0x79, 0x79, 0x79, 0x79, 0x64, 0x2d, 0x4d, 0x2d, 0x79, 0x79, 0x79, 0x79,
+0x64, 0x20, 0x4d, 0x4d, 0x4d, 0x4d, 0x20, 0x79, 0x79, 0x79, 0x79, 0x2c, 0x20, 0x64, 0x64, 0x64, 0x64, 0x79, 0x79, 0x79,
+0x79, 0x28, 0x27, 0x65, 0x27, 0x29, 0x27, 0x6b, 0x6f, 0x27, 0x20, 0x4d, 0x4d, 0x4d, 0x4d, 0x27, 0x72, 0x65, 0x6e, 0x27,
+0x20, 0x64, 0x28, 0x27, 0x61, 0x27, 0x29, 0x2c, 0x20, 0x64, 0x64, 0x64, 0x64, 0x79, 0x79, 0x2f, 0x4d, 0x2f, 0x64, 0x64,
+0x2f, 0x4d, 0x2f, 0x79, 0x79, 0x64, 0x64, 0x64, 0x64, 0x2c, 0x20, 0xf66, 0xfa4, 0xfb1, 0xf72, 0xf0b, 0xf63, 0xf7c, 0xf0b, 0x79,
+0x79, 0x79, 0x79, 0x20, 0x4d, 0x4d, 0x4d, 0x4d, 0x20, 0xf5a, 0xf7a, 0xf66, 0xf0b, 0x64, 0x64, 0x64, 0x64, 0x64, 0x64, 0x2c,
+0x20, 0x64, 0x20, 0x4d, 0x4d, 0x4d, 0x4d, 0x20, 0x79, 0x79, 0x79, 0x79, 0x20, 0x27, 0x433, 0x27, 0x2e, 0x64, 0x2e, 0x4d,
+0x4d, 0x2e, 0x79, 0x79, 0x20, 0x27, 0x433, 0x27, 0x2e, 0x79, 0x79, 0x79, 0x79, 0x104a, 0x20, 0x4d, 0x4d, 0x4d, 0x4d, 0x20,
+0x64, 0x104a, 0x20, 0x64, 0x64, 0x64, 0x64, 0x64, 0x64, 0x2d, 0x4d, 0x4d, 0x2d, 0x79, 0x79, 0x64, 0x64, 0x64, 0x64, 0x2c,
+0x20, 0x64, 0x20, 0x4d, 0x4d, 0x4d, 0x4d, 0x20, 0x27, 0x64, 0x65, 0x27, 0x20, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79,
+0x79, 0x5e74, 0x4d, 0x6708, 0x64, 0x65e5, 0x64, 0x64, 0x64, 0x64, 0x79, 0x79, 0x79, 0x79, 0x2f, 0x4d, 0x2f, 0x64, 0x64, 0x2f,
+0x4d, 0x2f, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x5e74, 0x4d, 0x6708, 0x64, 0x65e5, 0x20, 0x64, 0x64, 0x64, 0x64,
+0x64, 0x64, 0x64, 0x64, 0x2c, 0x20, 0x64, 0x2e, 0x20, 0x4d, 0x4d, 0x4d, 0x4d, 0x20, 0x79, 0x79, 0x79, 0x79, 0x2e, 0x64,
+0x64, 0x2e, 0x20, 0x4d, 0x4d, 0x2e, 0x20, 0x79, 0x79, 0x79, 0x79, 0x2e, 0x64, 0x2e, 0x20, 0x4d, 0x2e, 0x20, 0x79, 0x79,
+0x2e, 0x64, 0x64, 0x64, 0x64, 0x20, 0x64, 0x2e, 0x20, 0x4d, 0x4d, 0x4d, 0x4d, 0x20, 0x79, 0x79, 0x79, 0x79, 0x64, 0x64,
+0x64, 0x64, 0x20, 0x27, 0x64, 0x65, 0x6e, 0x27, 0x20, 0x64, 0x2e, 0x20, 0x4d, 0x4d, 0x4d, 0x4d, 0x20, 0x79, 0x79, 0x79,
+0x79, 0x64, 0x64, 0x2e, 0x4d, 0x4d, 0x2e, 0x79, 0x79, 0x79, 0x79, 0x64, 0x64, 0x2d, 0x4d, 0x4d, 0x2d, 0x79, 0x79, 0x79,
+0x79, 0x4d, 0x2f, 0x64, 0x2f, 0x79, 0x79, 0x64, 0x64, 0x64, 0x64, 0x2c, 0x20, 0x64, 0x64, 0x20, 0x4d, 0x4d, 0x4d, 0x4d,
+0x20, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x2f, 0x4d, 0x4d, 0x2f, 0x64, 0x64, 0x64, 0x64, 0x64, 0x64, 0x2c,
+0x20, 0x64, 0x2d, 0x27, 0x61, 0x27, 0x20, 0x27, 0x64, 0x65, 0x27, 0x20, 0x4d, 0x4d, 0x4d, 0x4d, 0x20, 0x79, 0x79, 0x79,
+0x79, 0x64, 0x2e, 0x4d, 0x2e, 0x79, 0x79, 0x79, 0x79, 0x64, 0x64, 0x64, 0x64, 0x2c, 0x20, 0x64, 0x27, 0x6d, 0x68, 0x27,
+0x20, 0x4d, 0x4d, 0x4d, 0x4d, 0x20, 0x79, 0x79, 0x79, 0x79, 0x64, 0x64, 0x64, 0x64, 0x2c, 0x20, 0x64, 0x20, 0x27, 0x64,
+0x65, 0x27, 0x20, 0x4d, 0x4d, 0x4d, 0x4d, 0x20, 0x27, 0x64, 0x65, 0x27, 0x20, 0x79, 0x79, 0x79, 0x79, 0x64, 0x64, 0x64,
+0x64, 0x2c, 0x20, 0x64, 0x64, 0x20, 0x4d, 0x4d, 0x4d, 0x4d, 0x2c, 0x20, 0x79, 0x79, 0x79, 0x79, 0x64, 0x64, 0x64, 0x64,
+0x20, 0x64, 0x20, 0x4d, 0x4d, 0x4d, 0x4d, 0x2c, 0x20, 0x79, 0x79, 0x79, 0x79, 0x64, 0x64, 0x64, 0x64, 0x2c, 0x20, 0x64,
+0x20, 0x5d1, 0x4d, 0x4d, 0x4d, 0x4d, 0x20, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x2e, 0x20, 0x4d, 0x4d, 0x4d,
+0x4d, 0x20, 0x64, 0x2e, 0x2c, 0x20, 0x64, 0x64, 0x64, 0x64, 0x79, 0x79, 0x79, 0x79, 0x2e, 0x20, 0x4d, 0x4d, 0x2e, 0x20,
+0x64, 0x64, 0x2e, 0x64, 0x64, 0x64, 0x64, 0x20, 0x27, 0x6c, 0x65, 0x27, 0x20, 0x64, 0x20, 0x27, 0x64, 0x65, 0x27, 0x20,
+0x4d, 0x4d, 0x4d, 0x4d, 0x20, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x20, 0x27, 0x436, 0x27, 0x2e, 0x20, 0x64,
+0x20, 0x4d, 0x4d, 0x4d, 0x4d, 0x2c, 0x20, 0x64, 0x64, 0x64, 0x64, 0x79, 0x79, 0x79, 0x79, 0x2d, 0x27, 0x436, 0x27, 0x2e,
+0x2c, 0x20, 0x64, 0x2d, 0x4d, 0x4d, 0x4d, 0x4d, 0x2c, 0x20, 0x64, 0x64, 0x64, 0x64, 0x79, 0x79, 0x79, 0x79, 0xb144, 0x20,
+0x4d, 0xc6d4, 0x20, 0x64, 0xc77c, 0x20, 0x64, 0x64, 0x64, 0x64, 0x79, 0x79, 0x2e, 0x20, 0x4d, 0x2e, 0x20, 0x64, 0x2e, 0x64,
+0x64, 0x64, 0x64, 0x20, 0xe97, 0xeb5, 0x20, 0x64, 0x20, 0x4d, 0x4d, 0x4d, 0x4d, 0x20, 0x79, 0x79, 0x79, 0x79, 0x64, 0x64,
+0x64, 0x64, 0x2c, 0x20, 0x79, 0x79, 0x79, 0x79, 0x2e, 0x20, 0x27, 0x67, 0x61, 0x64, 0x61, 0x27, 0x20, 0x64, 0x2e, 0x20,
+0x4d, 0x4d, 0x4d, 0x4d, 0x79, 0x79, 0x79, 0x79, 0x20, 0x27, 0x6d, 0x27, 0x2e, 0x20, 0x4d, 0x4d, 0x4d, 0x4d, 0x20, 0x64,
+0x20, 0x27, 0x64, 0x27, 0x2e, 0x2c, 0x20, 0x64, 0x64, 0x64, 0x64, 0x79, 0x79, 0x79, 0x79, 0x2c, 0x20, 0x4d, 0x4d, 0x4d,
+0x4d, 0x20, 0x64, 0x2c, 0x20, 0x64, 0x64, 0x64, 0x64, 0x64, 0x64, 0x64, 0x64, 0x2c, 0x20, 0x64, 0x20, 0x27, 0x74, 0x61,
+0x27, 0x2019, 0x20, 0x4d, 0x4d, 0x4d, 0x4d, 0x20, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x20, 0x27, 0x43e, 0x43d,
+0x44b, 0x27, 0x20, 0x4d, 0x4d, 0x4d, 0x4d, 0x27, 0x44b, 0x43d, 0x27, 0x20, 0x64, 0x2c, 0x20, 0x64, 0x64, 0x64, 0x64, 0x20,
+0x27, 0x433, 0x430, 0x440, 0x430, 0x433, 0x27, 0x79, 0x79, 0x79, 0x79, 0x2e, 0x4d, 0x4d, 0x2e, 0x64, 0x64, 0x64, 0x64, 0x64,
+0x64, 0x20, 0x62f, 0x20, 0x79, 0x79, 0x79, 0x79, 0x20, 0x62f, 0x20, 0x4d, 0x4d, 0x4d, 0x4d, 0x20, 0x64, 0x64, 0x64, 0x64,
+0x64, 0x2c, 0x20, 0x27, 0x69, 0x6c, 0x73, 0x27, 0x20, 0x64, 0x20, 0x4d, 0x4d, 0x4d, 0x4d, 0x20, 0x79, 0x79, 0x79, 0x79,
+0x64, 0x64, 0x64, 0x64, 0x2c, 0x20, 0x64, 0x64, 0x2e, 0x20, 0x4d, 0x4d, 0x4d, 0x4d, 0x20, 0x79, 0x79, 0x79, 0x79, 0x2e,
+0x64, 0x2e, 0x4d, 0x2e, 0x79, 0x79, 0x2e, 0x64, 0x64, 0x64, 0x64, 0x2c, 0x20, 0x64, 0x20, 0x4d, 0x4d, 0x4d, 0x4d, 0x2c,
+0x20, 0x79, 0x79, 0x79, 0x79, 0x20, 0x27, 0x430, 0x437, 0x27, 0x64, 0x2e, 0x20, 0x4d, 0x2e, 0x20, 0x79, 0x79, 0x79, 0x79,
+0x64, 0x64, 0x64, 0x64, 0x2c, 0x20, 0x4d, 0x4d, 0x4d, 0x4d, 0x20, 0x64, 0x64, 0x2c, 0x20, 0x79, 0x79, 0x79, 0x79, 0x64,
+0x64, 0x64, 0x64, 0x20, 0x64, 0x64, 0x20, 0x27, 0x64, 0x65, 0x27, 0x20, 0x4d, 0x4d, 0x4d, 0x4d, 0x20, 0x27, 0x64, 0x65,
+0x27, 0x20, 0x79, 0x79, 0x79, 0x79, 0x4d, 0x4d, 0x2f, 0x64, 0x64, 0x2f, 0x79, 0x79, 0x64, 0x20, 0x4d, 0x4d, 0x4d, 0x4d,
+0x2c, 0x20, 0x79, 0x79, 0x79, 0x79, 0x20, 0x27, 0x435, 0x43b, 0x27, 0x2c, 0x20, 0x64, 0x64, 0x64, 0x64, 0x64, 0x2c, 0x20,
+0x4d, 0x4d, 0x4d, 0x4d, 0x20, 0x79, 0x79, 0x79, 0x79, 0x2c, 0x20, 0x64, 0x64, 0x64, 0x64, 0x64, 0x64, 0x64, 0x64, 0xe17,
+0xe35, 0xe48, 0x20, 0x64, 0x20, 0x4d, 0x4d, 0x4d, 0x4d, 0x20, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x20, 0x4d,
+0x4d, 0x4d, 0x4d, 0xf60, 0xf72, 0xf0b, 0xf5a, 0xf7a, 0xf66, 0xf0b, 0x64, 0x2c, 0x20, 0x64, 0x64, 0x64, 0x64, 0x64, 0x64, 0x64,
+0x64, 0x1363, 0x20, 0x64, 0x64, 0x20, 0x4d, 0x4d, 0x4d, 0x4d, 0x20, 0x1218, 0x12d3, 0x120d, 0x1272, 0x20, 0x79, 0x79, 0x79, 0x79,
+0x64, 0x20, 0x4d, 0x4d, 0x4d, 0x4d, 0x20, 0x79, 0x79, 0x79, 0x79, 0x20, 0x64, 0x64, 0x64, 0x64, 0x79, 0x79, 0x79, 0x79,
+0x20, 0x64, 0x2d, 0x4d, 0x4d, 0x4d, 0x4d, 0x60c, 0x20, 0x64, 0x64, 0x64, 0x64, 0x64, 0x64, 0x64, 0x64, 0x2c, 0x20, 0x64,
+0x20, 0x4d, 0x4d, 0x4d, 0x4d, 0x20, 0x79, 0x79, 0x79, 0x79, 0x20, 0x27, 0x440, 0x27, 0x2e, 0x64, 0x64, 0x64, 0x64, 0x60c,
+0x20, 0x64, 0x20, 0x4d, 0x4d, 0x4d, 0x4d, 0x60c, 0x20, 0x79, 0x79, 0x79, 0x79, 0x64, 0x64, 0x64, 0x64, 0x2c, 0x20, 0x64,
+0x2d, 0x4d, 0x4d, 0x4d, 0x4d, 0x2c, 0x20, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x20, 0x646, 0x686, 0x6cc, 0x20,
+0x6cc, 0x6cc, 0x644, 0x20, 0x64, 0x20, 0x646, 0x686, 0x6cc, 0x20, 0x4d, 0x4d, 0x4d, 0x4d, 0x20, 0x64, 0x64, 0x64, 0x64, 0x20,
+0x6a9, 0x648, 0x646, 0x6cc, 0x79, 0x79, 0x79, 0x79, 0x20, 0x4d, 0x4d, 0x4d, 0x4d, 0x27, 0x61, 0x27, 0x20, 0x27, 0x64, 0x27,
+0x2e, 0x20, 0x64, 0x27, 0x69, 0x64, 0x27, 0x64, 0x64, 0x64, 0x64, 0x2c, 0x20, 0x64, 0x20, 0x4d, 0x4d, 0x4d, 0x2c, 0x20,
+0x79, 0x79, 0x79, 0x79, 0x64, 0x64, 0x64, 0x64, 0x2c, 0x20, 0x64, 0x5d8, 0x5df, 0x20, 0x4d, 0x4d, 0x4d, 0x4d, 0x20, 0x79,
+0x79, 0x79, 0x79, 0x64, 0x64, 0x64, 0x64, 0x2c, 0x20, 0x64, 0x20, 0x4d, 0x4d, 0x4d, 0x20, 0x79, 0x79, 0x79, 0x79, 0x64,
+0x2e, 0x20, 0x4d, 0x2e, 0x20, 0x79, 0x79, 0x79, 0x79, 0x2e, 0x64, 0x64, 0x64, 0x64, 0x2c, 0x20, 0x79, 0x79, 0x79, 0x79,
+0x20, 0x4d, 0x4d, 0x4d, 0x4d, 0x20, 0x64, 0x64, 0x64, 0x64, 0x64, 0x64, 0x20, 0x64, 0x20, 0x27, 0x64, 0x69, 0x27, 0x20,
+0x4d, 0x4d, 0x4d, 0x4d, 0x20, 0x27, 0x64, 0x61, 0x6c, 0x27, 0x20, 0x79, 0x79, 0x79, 0x79, 0x64, 0x64, 0x64, 0x64, 0x2c,
+0x20, 0x4d, 0x4d, 0x4d, 0x4d, 0x20, 0x64, 0x20, 0x27, 0x6c, 0x69, 0x61, 0x27, 0x20, 0x79, 0x79, 0x79, 0x79, 0x64, 0x64,
+0x64, 0x64, 0x2c, 0x20, 0x27, 0x64, 0x65, 0x27, 0x20, 0x64, 0x2e, 0x20, 0x4d, 0x4d, 0x4d, 0x4d, 0x20, 0x79, 0x79, 0x79,
+0x79, 0x64, 0x64, 0x64, 0x64, 0x2c, 0x20, 0x64, 0x20, 0x27, 0x64, 0x69, 0x27, 0x20, 0x4d, 0x4d, 0x4d, 0x4d, 0x20, 0x27,
+0x64, 0x69, 0x27, 0x20, 0x79, 0x79, 0x79, 0x79, 0x64, 0x64, 0x64, 0x64, 0x2c, 0x20, 0x27, 0x64, 0xe4, 0x27, 0x20, 0x64,
+0x2e, 0x20, 0x4d, 0x4d, 0x4d, 0x4d, 0x20, 0x79, 0x79, 0x79, 0x79, 0x64, 0x64, 0x64, 0x64, 0x2c, 0x20, 0x64, 0x20, 0x4d,
+0x4d, 0x4d, 0x4d, 0x20, 0x27, 0x43b, 0x27, 0x2e, 0x20, 0x79, 0x79, 0x79, 0x79, 0x2e, 0x79, 0x79, 0x79, 0x79, 0x20, 0x27,
+0x441, 0x44b, 0x43b, 0x27, 0x20, 0x4d, 0x4d, 0x4d, 0x4d, 0x20, 0x64, 0x20, 0x27, 0x43a, 0x4af, 0x43d, 0x44d, 0x27, 0x2c, 0x20,
+0x64, 0x64, 0x64, 0x64, 0x64, 0x64, 0x2f, 0x4d, 0x4d, 0x20, 0x79, 0x79, 0x79, 0x79, 0x64, 0x64, 0x64, 0x64, 0x20, 0x2c,
+0x20, 0x27, 0x6c, 0x79, 0x25b, 0x27, 0x30c, 0x2bc, 0x20, 0x64, 0x20, 0x27, 0x6e, 0x61, 0x27, 0x20, 0x4d, 0x4d, 0x4d, 0x4d,
+0x2c, 0x20, 0x79, 0x79, 0x79, 0x79, 0x64, 0x64, 0x64, 0x64, 0x2c, 0x20, 0x79, 0x79, 0x79, 0x79, 0x20, 0x27, 0x6d, 0x65,
+0x74, 0x74, 0x61, 0x73, 0x27, 0x20, 0x64, 0x2e, 0x20, 0x4d, 0x4d, 0x4d, 0x4d, 0x64, 0x64, 0x64, 0x64, 0x2c, 0x20, 0x4d,
+0x4d, 0x4d, 0x4d, 0x20, 0x64, 0x2e, 0x20, 0x79, 0x79, 0x79, 0x79
 };
 
-static const ushort time_format_data[] = {
-0x48, 0x48, 0x3a, 0x6d, 0x6d, 0x3a, 0x73, 0x73, 0x48, 0x48, 0x3a, 0x6d, 0x6d, 0x3a, 0x73, 0x73, 0x20, 0x74, 0x68, 0x3a,
-0x6d, 0x6d, 0x20, 0x41, 0x50, 0x68, 0x3a, 0x6d, 0x6d, 0x3a, 0x73, 0x73, 0x20, 0x41, 0x50, 0x20, 0x74, 0x48, 0x48, 0x3a,
-0x6d, 0x6d, 0x68, 0x3a, 0x6d, 0x6d, 0x3a, 0x73, 0x73, 0x20, 0x41, 0x50, 0x2c, 0x20, 0x74, 0x48, 0x3a, 0x6d, 0x6d, 0x48,
-0x3a, 0x6d, 0x6d, 0x3a, 0x73, 0x73, 0x20, 0x74, 0x41, 0x50, 0x20, 0x68, 0x2e, 0x6d, 0x6d, 0x41, 0x50, 0x20, 0x68, 0x2e,
-0x6d, 0x6d, 0x2e, 0x73, 0x73, 0x20, 0x74, 0x48, 0x48, 0x3a, 0x6d, 0x6d, 0x3a, 0x73, 0x73, 0x20, 0x28, 0x74, 0x29, 0xf46,
-0xf74, 0xf0b, 0xf5a, 0xf7c, 0xf51, 0xf0b, 0x20, 0x68, 0x20, 0xf66, 0xf90, 0xf62, 0xf0b, 0xf58, 0xf0b, 0x20, 0x6d, 0x6d, 0x20, 0x41,
-0x50, 0xf46, 0xf74, 0xf0b, 0xf5a, 0xf7c, 0xf51, 0xf0b, 0x20, 0x68, 0x20, 0xf66, 0xf90, 0xf62, 0xf0b, 0xf58, 0xf0b, 0x20, 0x6d, 0x6d,
-0x3a, 0x73, 0x73, 0x20, 0x41, 0x50, 0x20, 0x74, 0x42, 0x20, 0x48, 0x3a, 0x6d, 0x6d, 0x74, 0x20, 0x48, 0x48, 0x3a, 0x6d,
-0x6d, 0x3a, 0x73, 0x73, 0x48, 0x48, 0x3a, 0x6d, 0x6d, 0x3a, 0x73, 0x73, 0x2c, 0x20, 0x74, 0x41, 0x50, 0x68, 0x3a, 0x6d,
-0x6d, 0x74, 0x20, 0x41, 0x50, 0x68, 0x3a, 0x6d, 0x6d, 0x3a, 0x73, 0x73, 0x41, 0x50, 0x68, 0x3a, 0x6d, 0x6d, 0x3a, 0x73,
-0x73, 0x20, 0x5b, 0x74, 0x5d, 0x48, 0x48, 0x2e, 0x6d, 0x6d, 0x48, 0x48, 0x2e, 0x6d, 0x6d, 0x2e, 0x73, 0x73, 0x20, 0x74,
-0x48, 0x2e, 0x6d, 0x6d, 0x48, 0x2e, 0x6d, 0x6d, 0x2e, 0x73, 0x73, 0x20, 0x74, 0x48, 0x2d, 0x27, 0x61, 0x27, 0x20, 0x27,
-0x68, 0x6f, 0x72, 0x6f, 0x27, 0x20, 0x27, 0x6b, 0x61, 0x6a, 0x27, 0x20, 0x6d, 0x3a, 0x73, 0x73, 0x20, 0x74, 0x48, 0x20,
-0x27, 0x68, 0x27, 0x20, 0x6d, 0x6d, 0x20, 0x27, 0x6d, 0x69, 0x6e, 0x27, 0x20, 0x73, 0x73, 0x20, 0x27, 0x73, 0x27, 0x20,
-0x74, 0x48, 0x48, 0x20, 0x27, 0x68, 0x27, 0x20, 0x6d, 0x6d, 0x48, 0x48, 0x20, 0x27, 0x68, 0x27, 0x20, 0x6d, 0x6d, 0x20,
-0x27, 0x6d, 0x69, 0x6e, 0x27, 0x20, 0x73, 0x73, 0x20, 0x27, 0x73, 0x27, 0x20, 0x74, 0x48, 0x48, 0x2e, 0x6d, 0x6d, 0x3a,
-0x73, 0x73, 0x20, 0x27, 0x68, 0x27, 0x20, 0x74, 0x68, 0x68, 0x3a, 0x6d, 0x6d, 0x20, 0x41, 0x50, 0x68, 0x68, 0x3a, 0x6d,
-0x6d, 0x3a, 0x73, 0x73, 0x20, 0x41, 0x50, 0x20, 0x74, 0x48, 0x6642, 0x6d, 0x6d, 0x5206, 0x73, 0x73, 0x79d2, 0x20, 0x74, 0x41,
-0x50, 0x20, 0x68, 0x3a, 0x6d, 0x6d, 0x41, 0x50, 0x20, 0x68, 0xc2dc, 0x20, 0x6d, 0xbd84, 0x20, 0x73, 0xcd08, 0x20, 0x74, 0x48,
-0x20, 0xec2, 0xea1, 0xe87, 0x20, 0x6d, 0x20, 0xe99, 0xeb2, 0xe97, 0xeb5, 0x20, 0x73, 0x73, 0x20, 0xea7, 0xeb4, 0xe99, 0xeb2, 0xe97,
-0xeb5, 0x20, 0x74, 0x48, 0x3a, 0x6d, 0x6d, 0x3a, 0x73, 0x73, 0x20, 0x28, 0x74, 0x29, 0x27, 0x6b, 0x6c, 0x27, 0x2e, 0x20,
-0x48, 0x48, 0x3a, 0x6d, 0x6d, 0x3a, 0x73, 0x73, 0x20, 0x74, 0x41, 0x50, 0x20, 0x68, 0x3a, 0x6d, 0x6d, 0x3a, 0x73, 0x73,
-0x20, 0x74, 0x48, 0x20, 0xe19, 0xe32, 0xe2c, 0xe34, 0xe01, 0xe32, 0x20, 0x6d, 0x6d, 0x20, 0xe19, 0xe32, 0xe17, 0xe35, 0x20, 0x73,
-0x73, 0x20, 0xe27, 0xe34, 0xe19, 0xe32, 0xe17, 0xe35, 0x20, 0x74, 0x48, 0x3a, 0x6d, 0x41, 0x50, 0x20, 0x27, 0x67, 0x61, 0x27,
-0x20, 0x68, 0x3a, 0x6d, 0x6d, 0x41, 0x50, 0x20, 0x27, 0x67, 0x61, 0x27, 0x20, 0x68, 0x3a, 0x6d, 0x6d, 0x3a, 0x73, 0x73,
-0x20, 0x74, 0x27, 0x4b, 0x6c, 0x27, 0x2e, 0x20, 0x48, 0x2e, 0x6d, 0x6d, 0x27, 0x4b, 0x6c, 0x6f, 0x63, 0x6b, 0x27, 0x20,
-0x48, 0x2e, 0x6d, 0x6d, 0x3a, 0x73, 0x73, 0x20, 0x28, 0x74, 0x29, 0x74, 0x20, 0x68, 0x3a, 0x6d, 0x6d, 0x3a, 0x73, 0x73,
-0x20, 0x41, 0x50, 0x48, 0x3a, 0x6d, 0x6d, 0x20, 0x27, 0x68, 0x6f, 0x64, 0x17a, 0x27, 0x2e
+static const char16_t time_format_data[] = {
+0x48, 0x48, 0x3a, 0x6d, 0x6d, 0x3a, 0x73, 0x73, 0x20, 0x74, 0x68, 0x3a, 0x6d, 0x6d, 0x3a, 0x73, 0x73, 0x20, 0x41, 0x50,
+0x20, 0x74, 0x68, 0x3a, 0x6d, 0x6d, 0x20, 0x41, 0x50, 0x68, 0x3a, 0x6d, 0x6d, 0x3a, 0x73, 0x73, 0x20, 0x41, 0x50, 0x2c,
+0x20, 0x74, 0x41, 0x50, 0x20, 0x68, 0x2e, 0x6d, 0x6d, 0x2e, 0x73, 0x73, 0x20, 0x74, 0x48, 0x48, 0x3a, 0x6d, 0x6d, 0x3a,
+0x73, 0x73, 0x20, 0x28, 0x74, 0x29, 0xf46, 0xf74, 0xf0b, 0xf5a, 0xf7c, 0xf51, 0xf0b, 0x20, 0x68, 0x20, 0xf66, 0xf90, 0xf62, 0xf0b,
+0xf58, 0xf0b, 0x20, 0x6d, 0x6d, 0x3a, 0x73, 0x73, 0x20, 0x41, 0x50, 0x20, 0x74, 0xf46, 0xf74, 0xf0b, 0xf5a, 0xf7c, 0xf51, 0xf0b,
+0x20, 0x68, 0x20, 0xf66, 0xf90, 0xf62, 0xf0b, 0xf58, 0xf0b, 0x20, 0x6d, 0x6d, 0x20, 0x41, 0x50, 0x74, 0x20, 0x48, 0x48, 0x3a,
+0x6d, 0x6d, 0x3a, 0x73, 0x73, 0x42, 0x20, 0x48, 0x3a, 0x6d, 0x6d, 0x48, 0x48, 0x3a, 0x6d, 0x6d, 0x3a, 0x73, 0x73, 0x2c,
+0x20, 0x74, 0x74, 0x20, 0x41, 0x50, 0x68, 0x3a, 0x6d, 0x6d, 0x3a, 0x73, 0x73, 0x41, 0x50, 0x68, 0x3a, 0x6d, 0x6d, 0x3a,
+0x73, 0x73, 0x20, 0x5b, 0x74, 0x5d, 0x48, 0x48, 0x2e, 0x6d, 0x6d, 0x2e, 0x73, 0x73, 0x20, 0x74, 0x48, 0x2e, 0x6d, 0x6d,
+0x2e, 0x73, 0x73, 0x20, 0x74, 0x48, 0x2d, 0x27, 0x61, 0x27, 0x20, 0x27, 0x68, 0x6f, 0x72, 0x6f, 0x27, 0x20, 0x27, 0x6b,
+0x61, 0x6a, 0x27, 0x20, 0x6d, 0x3a, 0x73, 0x73, 0x20, 0x74, 0x48, 0x20, 0x27, 0x68, 0x27, 0x20, 0x6d, 0x6d, 0x20, 0x27,
+0x6d, 0x69, 0x6e, 0x27, 0x20, 0x73, 0x73, 0x20, 0x27, 0x73, 0x27, 0x20, 0x74, 0x48, 0x48, 0x20, 0x27, 0x68, 0x27, 0x20,
+0x6d, 0x6d, 0x20, 0x27, 0x6d, 0x69, 0x6e, 0x27, 0x20, 0x73, 0x73, 0x20, 0x27, 0x73, 0x27, 0x20, 0x74, 0x48, 0x48, 0x2e,
+0x6d, 0x6d, 0x3a, 0x73, 0x73, 0x20, 0x27, 0x68, 0x27, 0x20, 0x74, 0x68, 0x68, 0x3a, 0x6d, 0x6d, 0x3a, 0x73, 0x73, 0x20,
+0x41, 0x50, 0x20, 0x74, 0x68, 0x68, 0x3a, 0x6d, 0x6d, 0x20, 0x41, 0x50, 0x48, 0x6642, 0x6d, 0x6d, 0x5206, 0x73, 0x73, 0x79d2,
+0x20, 0x74, 0x41, 0x50, 0x20, 0x68, 0xc2dc, 0x20, 0x6d, 0xbd84, 0x20, 0x73, 0xcd08, 0x20, 0x74, 0x41, 0x50, 0x20, 0x68, 0x3a,
+0x6d, 0x6d, 0x48, 0x20, 0xec2, 0xea1, 0xe87, 0x20, 0x6d, 0x20, 0xe99, 0xeb2, 0xe97, 0xeb5, 0x20, 0x73, 0x73, 0x20, 0xea7, 0xeb4,
+0xe99, 0xeb2, 0xe97, 0xeb5, 0x20, 0x74, 0x27, 0x6b, 0x6c, 0x27, 0x2e, 0x20, 0x48, 0x48, 0x3a, 0x6d, 0x6d, 0x3a, 0x73, 0x73,
+0x20, 0x74, 0x41, 0x50, 0x20, 0x68, 0x3a, 0x6d, 0x6d, 0x3a, 0x73, 0x73, 0x20, 0x74, 0x48, 0x20, 0xe19, 0xe32, 0xe2c, 0xe34,
+0xe01, 0xe32, 0x20, 0x6d, 0x6d, 0x20, 0xe19, 0xe32, 0xe17, 0xe35, 0x20, 0x73, 0x73, 0x20, 0xe27, 0xe34, 0xe19, 0xe32, 0xe17, 0xe35,
+0x20, 0x74, 0x41, 0x50, 0x20, 0x27, 0x67, 0x61, 0x27, 0x20, 0x68, 0x3a, 0x6d, 0x6d, 0x3a, 0x73, 0x73, 0x20, 0x74, 0x27,
+0x4b, 0x6c, 0x6f, 0x63, 0x6b, 0x27, 0x20, 0x48, 0x2e, 0x6d, 0x6d, 0x3a, 0x73, 0x73, 0x20, 0x28, 0x74, 0x29, 0x27, 0x4b,
+0x6c, 0x27, 0x2e, 0x20, 0x48, 0x2e, 0x6d, 0x6d, 0x74, 0x20, 0x68, 0x3a, 0x6d, 0x6d, 0x3a, 0x73, 0x73, 0x20, 0x41, 0x50,
+0x48, 0x3a, 0x6d, 0x6d, 0x20, 0x27, 0x68, 0x6f, 0x64, 0x17a, 0x27, 0x2e
 };
 
-static const ushort days_data[] = {
-0x53, 0x75, 0x6e, 0x3b, 0x4d, 0x6f, 0x6e, 0x3b, 0x54, 0x75, 0x65, 0x3b, 0x57, 0x65, 0x64, 0x3b, 0x54, 0x68, 0x75, 0x3b,
-0x46, 0x72, 0x69, 0x3b, 0x53, 0x61, 0x74, 0x3b, 0x53, 0x75, 0x6e, 0x64, 0x61, 0x79, 0x3b, 0x4d, 0x6f, 0x6e, 0x64, 0x61,
-0x79, 0x3b, 0x54, 0x75, 0x65, 0x73, 0x64, 0x61, 0x79, 0x3b, 0x57, 0x65, 0x64, 0x6e, 0x65, 0x73, 0x64, 0x61, 0x79, 0x3b,
-0x54, 0x68, 0x75, 0x72, 0x73, 0x64, 0x61, 0x79, 0x3b, 0x46, 0x72, 0x69, 0x64, 0x61, 0x79, 0x3b, 0x53, 0x61, 0x74, 0x75,
-0x72, 0x64, 0x61, 0x79, 0x3b, 0x53, 0x3b, 0x4d, 0x3b, 0x54, 0x3b, 0x57, 0x3b, 0x54, 0x3b, 0x46, 0x3b, 0x53, 0x3b, 0x37,
-0x3b, 0x31, 0x3b, 0x32, 0x3b, 0x33, 0x3b, 0x34, 0x3b, 0x35, 0x3b, 0x36, 0x3b, 0x44, 0x69, 0x6c, 0x3b, 0x57, 0x69, 0x78,
-0x3b, 0x51, 0x69, 0x62, 0x3b, 0x52, 0x6f, 0x62, 0x3b, 0x4b, 0x61, 0x6d, 0x3b, 0x4a, 0x69, 0x6d, 0x3b, 0x53, 0x61, 0x6e,
-0x3b, 0x44, 0x69, 0x6c, 0x62, 0x61, 0x74, 0x61, 0x3b, 0x57, 0x69, 0x69, 0x78, 0x61, 0x74, 0x61, 0x3b, 0x51, 0x69, 0x62,
-0x78, 0x61, 0x74, 0x61, 0x3b, 0x52, 0x6f, 0x6f, 0x62, 0x69, 0x69, 0x3b, 0x4b, 0x61, 0x6d, 0x69, 0x69, 0x73, 0x61, 0x3b,
-0x4a, 0x69, 0x6d, 0x61, 0x61, 0x74, 0x61, 0x3b, 0x53, 0x61, 0x6e, 0x62, 0x61, 0x74, 0x61, 0x3b, 0x44, 0x3b, 0x57, 0x3b,
-0x51, 0x3b, 0x52, 0x3b, 0x4b, 0x3b, 0x4a, 0x3b, 0x53, 0x3b, 0x53, 0x6f, 0x2e, 0x3b, 0x4d, 0x61, 0x2e, 0x3b, 0x44, 0x69,
-0x2e, 0x3b, 0x57, 0x6f, 0x2e, 0x3b, 0x44, 0x6f, 0x2e, 0x3b, 0x56, 0x72, 0x2e, 0x3b, 0x53, 0x61, 0x2e, 0x3b, 0x53, 0x6f,
-0x6e, 0x64, 0x61, 0x67, 0x3b, 0x4d, 0x61, 0x61, 0x6e, 0x64, 0x61, 0x67, 0x3b, 0x44, 0x69, 0x6e, 0x73, 0x64, 0x61, 0x67,
-0x3b, 0x57, 0x6f, 0x65, 0x6e, 0x73, 0x64, 0x61, 0x67, 0x3b, 0x44, 0x6f, 0x6e, 0x64, 0x65, 0x72, 0x64, 0x61, 0x67, 0x3b,
-0x56, 0x72, 0x79, 0x64, 0x61, 0x67, 0x3b, 0x53, 0x61, 0x74, 0x65, 0x72, 0x64, 0x61, 0x67, 0x3b, 0x53, 0x3b, 0x4d, 0x3b,
-0x44, 0x3b, 0x57, 0x3b, 0x44, 0x3b, 0x56, 0x3b, 0x53, 0x3b, 0x64, 0x69, 0x65, 0x3b, 0x68, 0xeb, 0x6e, 0x3b, 0x6d, 0x61,
-0x72, 0x3b, 0x6d, 0xeb, 0x72, 0x3b, 0x65, 0x6e, 0x6a, 0x3b, 0x70, 0x72, 0x65, 0x3b, 0x73, 0x68, 0x74, 0x3b, 0x65, 0x20,
-0x64, 0x69, 0x65, 0x6c, 0x3b, 0x65, 0x20, 0x68, 0xeb, 0x6e, 0xeb, 0x3b, 0x65, 0x20, 0x6d, 0x61, 0x72, 0x74, 0xeb, 0x3b,
-0x65, 0x20, 0x6d, 0xeb, 0x72, 0x6b, 0x75, 0x72, 0xeb, 0x3b, 0x65, 0x20, 0x65, 0x6e, 0x6a, 0x74, 0x65, 0x3b, 0x65, 0x20,
-0x70, 0x72, 0x65, 0x6d, 0x74, 0x65, 0x3b, 0x65, 0x20, 0x73, 0x68, 0x74, 0x75, 0x6e, 0xeb, 0x3b, 0x64, 0x3b, 0x68, 0x3b,
-0x6d, 0x3b, 0x6d, 0x3b, 0x65, 0x3b, 0x70, 0x3b, 0x73, 0x68, 0x3b, 0x44, 0x69, 0x65, 0x3b, 0x48, 0xeb, 0x6e, 0x3b, 0x4d,
-0x61, 0x72, 0x3b, 0x4d, 0xeb, 0x72, 0x3b, 0x45, 0x6e, 0x6a, 0x3b, 0x50, 0x72, 0x65, 0x3b, 0x53, 0x68, 0x74, 0x3b, 0x12a5,
-0x1211, 0x12f5, 0x3b, 0x1230, 0x129e, 0x3b, 0x121b, 0x12ad, 0x1230, 0x3b, 0x1228, 0x1261, 0x12d5, 0x3b, 0x1210, 0x1219, 0x1235, 0x3b, 0x12d3, 0x122d,
-0x1265, 0x3b, 0x1245, 0x12f3, 0x121c, 0x3b, 0x12a5, 0x1211, 0x12f5, 0x3b, 0x1230, 0x129e, 0x3b, 0x121b, 0x12ad, 0x1230, 0x129e, 0x3b, 0x1228, 0x1261,
-0x12d5, 0x3b, 0x1210, 0x1219, 0x1235, 0x3b, 0x12d3, 0x122d, 0x1265, 0x3b, 0x1245, 0x12f3, 0x121c, 0x3b, 0x12a5, 0x3b, 0x1230, 0x3b, 0x121b, 0x3b,
-0x1228, 0x3b, 0x1210, 0x3b, 0x12d3, 0x3b, 0x1245, 0x3b, 0x627, 0x644, 0x623, 0x62d, 0x62f, 0x3b, 0x627, 0x644, 0x627, 0x62b, 0x646, 0x64a,
-0x646, 0x3b, 0x627, 0x644, 0x62b, 0x644, 0x627, 0x62b, 0x627, 0x621, 0x3b, 0x627, 0x644, 0x623, 0x631, 0x628, 0x639, 0x627, 0x621, 0x3b,
-0x627, 0x644, 0x62e, 0x645, 0x64a, 0x633, 0x3b, 0x627, 0x644, 0x62c, 0x645, 0x639, 0x629, 0x3b, 0x627, 0x644, 0x633, 0x628, 0x62a, 0x3b,
-0x62d, 0x3b, 0x646, 0x3b, 0x62b, 0x3b, 0x631, 0x3b, 0x62e, 0x3b, 0x62c, 0x3b, 0x633, 0x3b, 0x56f, 0x56b, 0x580, 0x3b, 0x565, 0x580,
-0x56f, 0x3b, 0x565, 0x580, 0x584, 0x3b, 0x579, 0x580, 0x584, 0x3b, 0x570, 0x576, 0x563, 0x3b, 0x578, 0x582, 0x580, 0x3b, 0x577, 0x562,
-0x569, 0x3b, 0x56f, 0x56b, 0x580, 0x561, 0x56f, 0x56b, 0x3b, 0x565, 0x580, 0x56f, 0x578, 0x582, 0x577, 0x561, 0x562, 0x569, 0x56b, 0x3b,
-0x565, 0x580, 0x565, 0x584, 0x577, 0x561, 0x562, 0x569, 0x56b, 0x3b, 0x579, 0x578, 0x580, 0x565, 0x584, 0x577, 0x561, 0x562, 0x569, 0x56b,
-0x3b, 0x570, 0x56b, 0x576, 0x563, 0x577, 0x561, 0x562, 0x569, 0x56b, 0x3b, 0x578, 0x582, 0x580, 0x562, 0x561, 0x569, 0x3b, 0x577, 0x561,
-0x562, 0x561, 0x569, 0x3b, 0x53f, 0x3b, 0x535, 0x3b, 0x535, 0x3b, 0x549, 0x3b, 0x540, 0x3b, 0x548, 0x3b, 0x547, 0x3b, 0x9a6, 0x9c7,
-0x993, 0x3b, 0x9b8, 0x9cb, 0x9ae, 0x3b, 0x9ae, 0x999, 0x9cd, 0x997, 0x9b2, 0x3b, 0x9ac, 0x9c1, 0x9a7, 0x3b, 0x9ac, 0x9c3, 0x9b9, 0x3b,
-0x9b6, 0x9c1, 0x995, 0x9cd, 0x9f0, 0x3b, 0x9b6, 0x9a8, 0x9bf, 0x3b, 0x9a6, 0x9c7, 0x993, 0x9ac, 0x9be, 0x9f0, 0x3b, 0x9b8, 0x9cb, 0x9ae,
-0x9ac, 0x9be, 0x9f0, 0x3b, 0x9ae, 0x999, 0x9cd, 0x997, 0x9b2, 0x9ac, 0x9be, 0x9f0, 0x3b, 0x9ac, 0x9c1, 0x9a7, 0x9ac, 0x9be, 0x9f0, 0x3b,
-0x9ac, 0x9c3, 0x9b9, 0x9b8, 0x9cd, 0x9aa, 0x9a4, 0x9bf, 0x9ac, 0x9be, 0x9f0, 0x3b, 0x9b6, 0x9c1, 0x995, 0x9cd, 0x9f0, 0x9ac, 0x9be, 0x9f0,
-0x3b, 0x9b6, 0x9a8, 0x9bf, 0x9ac, 0x9be, 0x9f0, 0x3b, 0x9a6, 0x3b, 0x9b8, 0x3b, 0x9ae, 0x3b, 0x9ac, 0x3b, 0x9ac, 0x3b, 0x9b6, 0x3b,
-0x9b6, 0x3b, 0x42, 0x2e, 0x3b, 0x42, 0x2e, 0x45, 0x2e, 0x3b, 0xc7, 0x2e, 0x41, 0x2e, 0x3b, 0xc7, 0x2e, 0x3b, 0x43, 0x2e,
-0x41, 0x2e, 0x3b, 0x43, 0x2e, 0x3b, 0x15e, 0x2e, 0x3b, 0x62, 0x61, 0x7a, 0x61, 0x72, 0x3b, 0x62, 0x61, 0x7a, 0x61, 0x72,
-0x20, 0x65, 0x72, 0x74, 0x259, 0x73, 0x69, 0x3b, 0xe7, 0x259, 0x72, 0x15f, 0x259, 0x6e, 0x62, 0x259, 0x20, 0x61, 0x78, 0x15f,
-0x61, 0x6d, 0x131, 0x3b, 0xe7, 0x259, 0x72, 0x15f, 0x259, 0x6e, 0x62, 0x259, 0x3b, 0x63, 0xfc, 0x6d, 0x259, 0x20, 0x61, 0x78,
-0x15f, 0x61, 0x6d, 0x131, 0x3b, 0x63, 0xfc, 0x6d, 0x259, 0x3b, 0x15f, 0x259, 0x6e, 0x62, 0x259, 0x3b, 0x42, 0x2e, 0x3b, 0x42,
-0x2e, 0x65, 0x2e, 0x3b, 0xc7, 0x2e, 0x61, 0x2e, 0x3b, 0xc7, 0x2e, 0x3b, 0x43, 0x2e, 0x61, 0x2e, 0x3b, 0x43, 0x2e, 0x3b,
-0x15e, 0x2e, 0x3b, 0x411, 0x2e, 0x3b, 0x411, 0x2e, 0x415, 0x2e, 0x3b, 0x427, 0x2e, 0x410, 0x2e, 0x3b, 0x427, 0x2e, 0x3b, 0x4b8,
-0x2e, 0x410, 0x2e, 0x3b, 0x4b8, 0x2e, 0x3b, 0x428, 0x2e, 0x3b, 0x431, 0x430, 0x437, 0x430, 0x440, 0x3b, 0x431, 0x430, 0x437, 0x430,
-0x440, 0x20, 0x435, 0x440, 0x442, 0x4d9, 0x441, 0x438, 0x3b, 0x447, 0x4d9, 0x440, 0x448, 0x4d9, 0x43d, 0x431, 0x4d9, 0x20, 0x430, 0x445,
-0x448, 0x430, 0x43c, 0x44b, 0x3b, 0x447, 0x4d9, 0x440, 0x448, 0x4d9, 0x43d, 0x431, 0x4d9, 0x3b, 0x4b9, 0x4af, 0x43c, 0x4d9, 0x20, 0x430,
-0x445, 0x448, 0x430, 0x43c, 0x44b, 0x3b, 0x4b9, 0x4af, 0x43c, 0x4d9, 0x3b, 0x448, 0x4d9, 0x43d, 0x431, 0x4d9, 0x3b, 0x69, 0x67, 0x2e,
-0x3b, 0x61, 0x6c, 0x2e, 0x3b, 0x61, 0x72, 0x2e, 0x3b, 0x61, 0x7a, 0x2e, 0x3b, 0x6f, 0x67, 0x2e, 0x3b, 0x6f, 0x72, 0x2e,
-0x3b, 0x6c, 0x72, 0x2e, 0x3b, 0x69, 0x67, 0x61, 0x6e, 0x64, 0x65, 0x61, 0x3b, 0x61, 0x73, 0x74, 0x65, 0x6c, 0x65, 0x68,
-0x65, 0x6e, 0x61, 0x3b, 0x61, 0x73, 0x74, 0x65, 0x61, 0x72, 0x74, 0x65, 0x61, 0x3b, 0x61, 0x73, 0x74, 0x65, 0x61, 0x7a,
-0x6b, 0x65, 0x6e, 0x61, 0x3b, 0x6f, 0x73, 0x74, 0x65, 0x67, 0x75, 0x6e, 0x61, 0x3b, 0x6f, 0x73, 0x74, 0x69, 0x72, 0x61,
-0x6c, 0x61, 0x3b, 0x6c, 0x61, 0x72, 0x75, 0x6e, 0x62, 0x61, 0x74, 0x61, 0x3b, 0x49, 0x3b, 0x41, 0x3b, 0x41, 0x3b, 0x41,
-0x3b, 0x4f, 0x3b, 0x4f, 0x3b, 0x4c, 0x3b, 0x9b0, 0x9ac, 0x9bf, 0x3b, 0x9b8, 0x9cb, 0x9ae, 0x3b, 0x9ae, 0x999, 0x9cd, 0x997, 0x9b2,
-0x3b, 0x9ac, 0x9c1, 0x9a7, 0x3b, 0x9ac, 0x9c3, 0x9b9, 0x9b8, 0x9cd, 0x9aa, 0x9a4, 0x9bf, 0x3b, 0x9b6, 0x9c1, 0x995, 0x9cd, 0x9b0, 0x3b,
-0x9b6, 0x9a8, 0x9bf, 0x3b, 0x9b0, 0x9ac, 0x9bf, 0x9ac, 0x9be, 0x9b0, 0x3b, 0x9b8, 0x9cb, 0x9ae, 0x9ac, 0x9be, 0x9b0, 0x3b, 0x9ae, 0x999,
-0x9cd, 0x997, 0x9b2, 0x9ac, 0x9be, 0x9b0, 0x3b, 0x9ac, 0x9c1, 0x9a7, 0x9ac, 0x9be, 0x9b0, 0x3b, 0x9ac, 0x9c3, 0x9b9, 0x9b8, 0x9cd, 0x9aa,
-0x9a4, 0x9bf, 0x9ac, 0x9be, 0x9b0, 0x3b, 0x9b6, 0x9c1, 0x995, 0x9cd, 0x9b0, 0x9ac, 0x9be, 0x9b0, 0x3b, 0x9b6, 0x9a8, 0x9bf, 0x9ac, 0x9be,
-0x9b0, 0x3b, 0x9b0, 0x3b, 0x9b8, 0x9cb, 0x3b, 0x9ae, 0x3b, 0x9ac, 0x9c1, 0x3b, 0x9ac, 0x9c3, 0x3b, 0x9b6, 0x9c1, 0x3b, 0x9b6, 0x3b,
-0xf5f, 0xfb3, 0xf0b, 0x3b, 0xf58, 0xf72, 0xf62, 0xf0b, 0x3b, 0xf63, 0xfb7, 0xf42, 0xf0b, 0x3b, 0xf55, 0xf74, 0xf62, 0xf0b, 0x3b, 0xf66,
-0xf44, 0xf66, 0xf0b, 0x3b, 0xf66, 0xfa4, 0xf7a, 0xf53, 0xf0b, 0x3b, 0xf49, 0xf72, 0xf0b, 0x3b, 0xf42, 0xf5f, 0xf60, 0xf0b, 0xf5f, 0xfb3,
-0xf0b, 0xf56, 0xf0b, 0x3b, 0xf42, 0xf5f, 0xf60, 0xf0b, 0xf58, 0xf72, 0xf42, 0xf0b, 0xf51, 0xf58, 0xf62, 0xf0b, 0x3b, 0xf42, 0xf5f, 0xf60,
-0xf0b, 0xf63, 0xfb7, 0xf42, 0xf0b, 0xf54, 0xf0b, 0x3b, 0xf42, 0xf5f, 0xf60, 0xf0b, 0xf55, 0xf74, 0xf62, 0xf0b, 0xf56, 0xf74, 0xf0b, 0x3b,
-0xf42, 0xf5f, 0xf60, 0xf0b, 0xf54, 0xf0b, 0xf66, 0xf44, 0xf66, 0xf0b, 0x3b, 0xf42, 0xf5f, 0xf60, 0xf0b, 0xf66, 0xfa4, 0xf7a, 0xf53, 0xf0b,
-0xf54, 0xf0b, 0x3b, 0xf42, 0xf5f, 0xf60, 0xf0b, 0xf49, 0xf72, 0xf0b, 0xf58, 0xf0b, 0x3b, 0xf5f, 0xfb3, 0x3b, 0xf58, 0xf72, 0xf62, 0x3b,
-0xf63, 0xfb7, 0xf42, 0x3b, 0xf55, 0xf74, 0xf62, 0x3b, 0xf66, 0xf44, 0xfb6, 0x3b, 0xf66, 0xfa4, 0xf7a, 0xf53, 0x3b, 0xf49, 0xf72, 0x3b,
-0x53, 0x75, 0x6c, 0x3b, 0x4c, 0x75, 0x6e, 0x3b, 0x4d, 0x65, 0x75, 0x2e, 0x3b, 0x4d, 0x65, 0x72, 0x2e, 0x3b, 0x59, 0x61,
-0x6f, 0x75, 0x3b, 0x47, 0x77, 0x65, 0x2e, 0x3b, 0x53, 0x61, 0x64, 0x2e, 0x3b, 0x53, 0x75, 0x6c, 0x3b, 0x4c, 0x75, 0x6e,
-0x3b, 0x4d, 0x65, 0x75, 0x72, 0x7a, 0x68, 0x3b, 0x4d, 0x65, 0x72, 0x63, 0x2bc, 0x68, 0x65, 0x72, 0x3b, 0x59, 0x61, 0x6f,
-0x75, 0x3b, 0x47, 0x77, 0x65, 0x6e, 0x65, 0x72, 0x3b, 0x53, 0x61, 0x64, 0x6f, 0x72, 0x6e, 0x3b, 0x53, 0x75, 0x3b, 0x4c,
-0x3b, 0x4d, 0x7a, 0x3b, 0x4d, 0x63, 0x3b, 0x59, 0x3b, 0x47, 0x3b, 0x53, 0x61, 0x3b, 0x43d, 0x434, 0x3b, 0x43f, 0x43d, 0x3b,
-0x432, 0x442, 0x3b, 0x441, 0x440, 0x3b, 0x447, 0x442, 0x3b, 0x43f, 0x442, 0x3b, 0x441, 0x431, 0x3b, 0x43d, 0x435, 0x434, 0x435, 0x43b,
-0x44f, 0x3b, 0x43f, 0x43e, 0x43d, 0x435, 0x434, 0x435, 0x43b, 0x43d, 0x438, 0x43a, 0x3b, 0x432, 0x442, 0x43e, 0x440, 0x43d, 0x438, 0x43a,
-0x3b, 0x441, 0x440, 0x44f, 0x434, 0x430, 0x3b, 0x447, 0x435, 0x442, 0x432, 0x44a, 0x440, 0x442, 0x44a, 0x43a, 0x3b, 0x43f, 0x435, 0x442,
-0x44a, 0x43a, 0x3b, 0x441, 0x44a, 0x431, 0x43e, 0x442, 0x430, 0x3b, 0x43d, 0x3b, 0x43f, 0x3b, 0x432, 0x3b, 0x441, 0x3b, 0x447, 0x3b,
-0x43f, 0x3b, 0x441, 0x3b, 0x1010, 0x1014, 0x1004, 0x103a, 0x1039, 0x1002, 0x1014, 0x103d, 0x1031, 0x3b, 0x1010, 0x1014, 0x1004, 0x103a, 0x1039, 0x101c,
-0x102c, 0x3b, 0x1021, 0x1004, 0x103a, 0x1039, 0x1002, 0x102b, 0x3b, 0x1017, 0x102f, 0x1012, 0x1039, 0x1013, 0x101f, 0x1030, 0x1038, 0x3b, 0x1000, 0x103c,
-0x102c, 0x101e, 0x1015, 0x1010, 0x1031, 0x1038, 0x3b, 0x101e, 0x1031, 0x102c, 0x1000, 0x103c, 0x102c, 0x3b, 0x1005, 0x1014, 0x1031, 0x3b, 0x1010, 0x3b,
-0x1010, 0x3b, 0x1021, 0x3b, 0x1017, 0x3b, 0x1000, 0x3b, 0x101e, 0x3b, 0x1005, 0x3b, 0x43d, 0x434, 0x3b, 0x43f, 0x43d, 0x3b, 0x430, 0x45e,
-0x3b, 0x441, 0x440, 0x3b, 0x447, 0x446, 0x3b, 0x43f, 0x442, 0x3b, 0x441, 0x431, 0x3b, 0x43d, 0x44f, 0x434, 0x437, 0x435, 0x43b, 0x44f,
-0x3b, 0x43f, 0x430, 0x43d, 0x44f, 0x434, 0x437, 0x435, 0x43b, 0x430, 0x43a, 0x3b, 0x430, 0x45e, 0x442, 0x43e, 0x440, 0x430, 0x43a, 0x3b,
-0x441, 0x435, 0x440, 0x430, 0x434, 0x430, 0x3b, 0x447, 0x430, 0x446, 0x432, 0x435, 0x440, 0x3b, 0x43f, 0x44f, 0x442, 0x43d, 0x456, 0x446,
-0x430, 0x3b, 0x441, 0x443, 0x431, 0x43e, 0x442, 0x430, 0x3b, 0x43d, 0x3b, 0x43f, 0x3b, 0x430, 0x3b, 0x441, 0x3b, 0x447, 0x3b, 0x43f,
-0x3b, 0x441, 0x3b, 0x17a2, 0x17b6, 0x1791, 0x17b7, 0x178f, 0x17d2, 0x1799, 0x3b, 0x1785, 0x1793, 0x17d2, 0x1791, 0x3b, 0x17a2, 0x1784, 0x17d2, 0x1782,
-0x17b6, 0x179a, 0x3b, 0x1796, 0x17bb, 0x1792, 0x3b, 0x1796, 0x17d2, 0x179a, 0x17a0, 0x3b, 0x179f, 0x17bb, 0x1780, 0x17d2, 0x179a, 0x3b, 0x179f, 0x17c5,
-0x179a, 0x17cd, 0x3b, 0x17a2, 0x17b6, 0x1791, 0x17b7, 0x178f, 0x17d2, 0x1799, 0x3b, 0x1785, 0x1793, 0x17d2, 0x1791, 0x3b, 0x17a2, 0x1784, 0x17d2, 0x1782,
-0x17b6, 0x179a, 0x3b, 0x1796, 0x17bb, 0x1792, 0x3b, 0x1796, 0x17d2, 0x179a, 0x17a0, 0x179f, 0x17d2, 0x1794, 0x178f, 0x17b7, 0x17cd, 0x3b, 0x179f, 0x17bb,
-0x1780, 0x17d2, 0x179a, 0x3b, 0x179f, 0x17c5, 0x179a, 0x17cd, 0x3b, 0x17a2, 0x3b, 0x1785, 0x3b, 0x17a2, 0x3b, 0x1796, 0x3b, 0x1796, 0x3b, 0x179f,
-0x3b, 0x179f, 0x3b, 0x17a2, 0x17b6, 0x1791, 0x17b7, 0x178f, 0x17d2, 0x1799, 0x3b, 0x1785, 0x17d0, 0x1793, 0x17d2, 0x1791, 0x3b, 0x17a2, 0x1784, 0x17d2,
-0x1782, 0x17b6, 0x179a, 0x3b, 0x1796, 0x17bb, 0x1792, 0x3b, 0x1796, 0x17d2, 0x179a, 0x17a0, 0x179f, 0x17d2, 0x1794, 0x178f, 0x17b7, 0x17cd, 0x3b, 0x179f,
-0x17bb, 0x1780, 0x17d2, 0x179a, 0x3b, 0x179f, 0x17c5, 0x179a, 0x17cd, 0x3b, 0x64, 0x67, 0x2e, 0x3b, 0x64, 0x6c, 0x2e, 0x3b, 0x64, 0x74,
-0x2e, 0x3b, 0x64, 0x63, 0x2e, 0x3b, 0x64, 0x6a, 0x2e, 0x3b, 0x64, 0x76, 0x2e, 0x3b, 0x64, 0x73, 0x2e, 0x3b, 0x64, 0x69,
-0x75, 0x6d, 0x65, 0x6e, 0x67, 0x65, 0x3b, 0x64, 0x69, 0x6c, 0x6c, 0x75, 0x6e, 0x73, 0x3b, 0x64, 0x69, 0x6d, 0x61, 0x72,
-0x74, 0x73, 0x3b, 0x64, 0x69, 0x6d, 0x65, 0x63, 0x72, 0x65, 0x73, 0x3b, 0x64, 0x69, 0x6a, 0x6f, 0x75, 0x73, 0x3b, 0x64,
-0x69, 0x76, 0x65, 0x6e, 0x64, 0x72, 0x65, 0x73, 0x3b, 0x64, 0x69, 0x73, 0x73, 0x61, 0x62, 0x74, 0x65, 0x3b, 0x64, 0x67,
-0x3b, 0x64, 0x6c, 0x3b, 0x64, 0x74, 0x3b, 0x64, 0x63, 0x3b, 0x64, 0x6a, 0x3b, 0x64, 0x76, 0x3b, 0x64, 0x73, 0x3b, 0x5468,
-0x65e5, 0x3b, 0x5468, 0x4e00, 0x3b, 0x5468, 0x4e8c, 0x3b, 0x5468, 0x4e09, 0x3b, 0x5468, 0x56db, 0x3b, 0x5468, 0x4e94, 0x3b, 0x5468, 0x516d, 0x3b,
-0x661f, 0x671f, 0x65e5, 0x3b, 0x661f, 0x671f, 0x4e00, 0x3b, 0x661f, 0x671f, 0x4e8c, 0x3b, 0x661f, 0x671f, 0x4e09, 0x3b, 0x661f, 0x671f, 0x56db, 0x3b,
-0x661f, 0x671f, 0x4e94, 0x3b, 0x661f, 0x671f, 0x516d, 0x3b, 0x65e5, 0x3b, 0x4e00, 0x3b, 0x4e8c, 0x3b, 0x4e09, 0x3b, 0x56db, 0x3b, 0x4e94, 0x3b,
-0x516d, 0x3b, 0x9031, 0x65e5, 0x3b, 0x9031, 0x4e00, 0x3b, 0x9031, 0x4e8c, 0x3b, 0x9031, 0x4e09, 0x3b, 0x9031, 0x56db, 0x3b, 0x9031, 0x4e94, 0x3b,
-0x9031, 0x516d, 0x3b, 0x6e, 0x65, 0x64, 0x3b, 0x70, 0x6f, 0x6e, 0x3b, 0x75, 0x74, 0x6f, 0x3b, 0x73, 0x72, 0x69, 0x3b, 0x10d,
-0x65, 0x74, 0x3b, 0x70, 0x65, 0x74, 0x3b, 0x73, 0x75, 0x62, 0x3b, 0x6e, 0x65, 0x64, 0x6a, 0x65, 0x6c, 0x6a, 0x61, 0x3b,
-0x70, 0x6f, 0x6e, 0x65, 0x64, 0x6a, 0x65, 0x6c, 0x6a, 0x61, 0x6b, 0x3b, 0x75, 0x74, 0x6f, 0x72, 0x61, 0x6b, 0x3b, 0x73,
-0x72, 0x69, 0x6a, 0x65, 0x64, 0x61, 0x3b, 0x10d, 0x65, 0x74, 0x76, 0x72, 0x74, 0x61, 0x6b, 0x3b, 0x70, 0x65, 0x74, 0x61,
-0x6b, 0x3b, 0x73, 0x75, 0x62, 0x6f, 0x74, 0x61, 0x3b, 0x6e, 0x3b, 0x70, 0x3b, 0x75, 0x3b, 0x73, 0x3b, 0x10d, 0x3b, 0x70,
-0x3b, 0x73, 0x3b, 0x4e, 0x3b, 0x50, 0x3b, 0x55, 0x3b, 0x53, 0x3b, 0x10c, 0x3b, 0x50, 0x3b, 0x53, 0x3b, 0x6e, 0x65, 0x3b,
-0x70, 0x6f, 0x3b, 0xfa, 0x74, 0x3b, 0x73, 0x74, 0x3b, 0x10d, 0x74, 0x3b, 0x70, 0xe1, 0x3b, 0x73, 0x6f, 0x3b, 0x6e, 0x65,
-0x64, 0x11b, 0x6c, 0x65, 0x3b, 0x70, 0x6f, 0x6e, 0x64, 0x11b, 0x6c, 0xed, 0x3b, 0xfa, 0x74, 0x65, 0x72, 0xfd, 0x3b, 0x73,
-0x74, 0x159, 0x65, 0x64, 0x61, 0x3b, 0x10d, 0x74, 0x76, 0x72, 0x74, 0x65, 0x6b, 0x3b, 0x70, 0xe1, 0x74, 0x65, 0x6b, 0x3b,
-0x73, 0x6f, 0x62, 0x6f, 0x74, 0x61, 0x3b, 0x4e, 0x3b, 0x50, 0x3b, 0xda, 0x3b, 0x53, 0x3b, 0x10c, 0x3b, 0x50, 0x3b, 0x53,
-0x3b, 0x73, 0xf8, 0x6e, 0x3b, 0x6d, 0x61, 0x6e, 0x3b, 0x74, 0x69, 0x72, 0x3b, 0x6f, 0x6e, 0x73, 0x3b, 0x74, 0x6f, 0x72,
-0x3b, 0x66, 0x72, 0x65, 0x3b, 0x6c, 0xf8, 0x72, 0x3b, 0x73, 0xf8, 0x6e, 0x64, 0x61, 0x67, 0x3b, 0x6d, 0x61, 0x6e, 0x64,
-0x61, 0x67, 0x3b, 0x74, 0x69, 0x72, 0x73, 0x64, 0x61, 0x67, 0x3b, 0x6f, 0x6e, 0x73, 0x64, 0x61, 0x67, 0x3b, 0x74, 0x6f,
-0x72, 0x73, 0x64, 0x61, 0x67, 0x3b, 0x66, 0x72, 0x65, 0x64, 0x61, 0x67, 0x3b, 0x6c, 0xf8, 0x72, 0x64, 0x61, 0x67, 0x3b,
-0x53, 0x3b, 0x4d, 0x3b, 0x54, 0x3b, 0x4f, 0x3b, 0x54, 0x3b, 0x46, 0x3b, 0x4c, 0x3b, 0x73, 0xf8, 0x6e, 0x2e, 0x3b, 0x6d,
-0x61, 0x6e, 0x2e, 0x3b, 0x74, 0x69, 0x72, 0x2e, 0x3b, 0x6f, 0x6e, 0x73, 0x2e, 0x3b, 0x74, 0x6f, 0x72, 0x2e, 0x3b, 0x66,
-0x72, 0x65, 0x2e, 0x3b, 0x6c, 0xf8, 0x72, 0x2e, 0x3b, 0x7a, 0x6f, 0x3b, 0x6d, 0x61, 0x3b, 0x64, 0x69, 0x3b, 0x77, 0x6f,
-0x3b, 0x64, 0x6f, 0x3b, 0x76, 0x72, 0x3b, 0x7a, 0x61, 0x3b, 0x7a, 0x6f, 0x6e, 0x64, 0x61, 0x67, 0x3b, 0x6d, 0x61, 0x61,
-0x6e, 0x64, 0x61, 0x67, 0x3b, 0x64, 0x69, 0x6e, 0x73, 0x64, 0x61, 0x67, 0x3b, 0x77, 0x6f, 0x65, 0x6e, 0x73, 0x64, 0x61,
-0x67, 0x3b, 0x64, 0x6f, 0x6e, 0x64, 0x65, 0x72, 0x64, 0x61, 0x67, 0x3b, 0x76, 0x72, 0x69, 0x6a, 0x64, 0x61, 0x67, 0x3b,
-0x7a, 0x61, 0x74, 0x65, 0x72, 0x64, 0x61, 0x67, 0x3b, 0x5a, 0x3b, 0x4d, 0x3b, 0x44, 0x3b, 0x57, 0x3b, 0x44, 0x3b, 0x56,
-0x3b, 0x5a, 0x3b, 0x53, 0x75, 0x2e, 0x3b, 0x4d, 0x2e, 0x3b, 0x54, 0x75, 0x2e, 0x3b, 0x57, 0x2e, 0x3b, 0x54, 0x68, 0x2e,
-0x3b, 0x46, 0x2e, 0x3b, 0x53, 0x61, 0x2e, 0x3b, 0x53, 0x75, 0x6e, 0x2e, 0x3b, 0x4d, 0x6f, 0x6e, 0x2e, 0x3b, 0x54, 0x75,
-0x65, 0x2e, 0x3b, 0x57, 0x65, 0x64, 0x2e, 0x3b, 0x54, 0x68, 0x75, 0x2e, 0x3b, 0x46, 0x72, 0x69, 0x2e, 0x3b, 0x53, 0x61,
-0x74, 0x2e, 0x3b, 0x64, 0x69, 0x3b, 0x6c, 0x75, 0x3b, 0x6d, 0x61, 0x3b, 0x6d, 0x65, 0x3b, 0x135, 0x61, 0x3b, 0x76, 0x65,
-0x3b, 0x73, 0x61, 0x3b, 0x64, 0x69, 0x6d, 0x61, 0x6e, 0x109, 0x6f, 0x3b, 0x6c, 0x75, 0x6e, 0x64, 0x6f, 0x3b, 0x6d, 0x61,
-0x72, 0x64, 0x6f, 0x3b, 0x6d, 0x65, 0x72, 0x6b, 0x72, 0x65, 0x64, 0x6f, 0x3b, 0x135, 0x61, 0x16d, 0x64, 0x6f, 0x3b, 0x76,
-0x65, 0x6e, 0x64, 0x72, 0x65, 0x64, 0x6f, 0x3b, 0x73, 0x61, 0x62, 0x61, 0x74, 0x6f, 0x3b, 0x44, 0x3b, 0x4c, 0x3b, 0x4d,
-0x3b, 0x4d, 0x3b, 0x134, 0x3b, 0x56, 0x3b, 0x53, 0x3b, 0x50, 0x3b, 0x45, 0x3b, 0x54, 0x3b, 0x4b, 0x3b, 0x4e, 0x3b, 0x52,
-0x3b, 0x4c, 0x3b, 0x70, 0xfc, 0x68, 0x61, 0x70, 0xe4, 0x65, 0x76, 0x3b, 0x65, 0x73, 0x6d, 0x61, 0x73, 0x70, 0xe4, 0x65,
-0x76, 0x3b, 0x74, 0x65, 0x69, 0x73, 0x69, 0x70, 0xe4, 0x65, 0x76, 0x3b, 0x6b, 0x6f, 0x6c, 0x6d, 0x61, 0x70, 0xe4, 0x65,
-0x76, 0x3b, 0x6e, 0x65, 0x6c, 0x6a, 0x61, 0x70, 0xe4, 0x65, 0x76, 0x3b, 0x72, 0x65, 0x65, 0x64, 0x65, 0x3b, 0x6c, 0x61,
-0x75, 0x70, 0xe4, 0x65, 0x76, 0x3b, 0x73, 0x75, 0x6e, 0x3b, 0x6d, 0xe1, 0x6e, 0x3b, 0x74, 0xfd, 0x73, 0x3b, 0x6d, 0x69,
-0x6b, 0x3b, 0x68, 0xf3, 0x73, 0x3b, 0x66, 0x72, 0xed, 0x3b, 0x6c, 0x65, 0x79, 0x3b, 0x73, 0x75, 0x6e, 0x6e, 0x75, 0x64,
-0x61, 0x67, 0x75, 0x72, 0x3b, 0x6d, 0xe1, 0x6e, 0x61, 0x64, 0x61, 0x67, 0x75, 0x72, 0x3b, 0x74, 0xfd, 0x73, 0x64, 0x61,
-0x67, 0x75, 0x72, 0x3b, 0x6d, 0x69, 0x6b, 0x75, 0x64, 0x61, 0x67, 0x75, 0x72, 0x3b, 0x68, 0xf3, 0x73, 0x64, 0x61, 0x67,
-0x75, 0x72, 0x3b, 0x66, 0x72, 0xed, 0x67, 0x67, 0x6a, 0x61, 0x64, 0x61, 0x67, 0x75, 0x72, 0x3b, 0x6c, 0x65, 0x79, 0x67,
-0x61, 0x72, 0x64, 0x61, 0x67, 0x75, 0x72, 0x3b, 0x53, 0x3b, 0x4d, 0x3b, 0x54, 0x3b, 0x4d, 0x3b, 0x48, 0x3b, 0x46, 0x3b,
-0x4c, 0x3b, 0x73, 0x75, 0x6e, 0x2e, 0x3b, 0x6d, 0xe1, 0x6e, 0x2e, 0x3b, 0x74, 0xfd, 0x73, 0x2e, 0x3b, 0x6d, 0x69, 0x6b,
-0x2e, 0x3b, 0x68, 0xf3, 0x73, 0x2e, 0x3b, 0x66, 0x72, 0xed, 0x2e, 0x3b, 0x6c, 0x65, 0x79, 0x2e, 0x3b, 0x73, 0x75, 0x3b,
-0x6d, 0x61, 0x3b, 0x74, 0x69, 0x3b, 0x6b, 0x65, 0x3b, 0x74, 0x6f, 0x3b, 0x70, 0x65, 0x3b, 0x6c, 0x61, 0x3b, 0x73, 0x75,
-0x6e, 0x6e, 0x75, 0x6e, 0x74, 0x61, 0x69, 0x3b, 0x6d, 0x61, 0x61, 0x6e, 0x61, 0x6e, 0x74, 0x61, 0x69, 0x3b, 0x74, 0x69,
-0x69, 0x73, 0x74, 0x61, 0x69, 0x3b, 0x6b, 0x65, 0x73, 0x6b, 0x69, 0x76, 0x69, 0x69, 0x6b, 0x6b, 0x6f, 0x3b, 0x74, 0x6f,
-0x72, 0x73, 0x74, 0x61, 0x69, 0x3b, 0x70, 0x65, 0x72, 0x6a, 0x61, 0x6e, 0x74, 0x61, 0x69, 0x3b, 0x6c, 0x61, 0x75, 0x61,
-0x6e, 0x74, 0x61, 0x69, 0x3b, 0x53, 0x3b, 0x4d, 0x3b, 0x54, 0x3b, 0x4b, 0x3b, 0x54, 0x3b, 0x50, 0x3b, 0x4c, 0x3b, 0x73,
-0x75, 0x6e, 0x6e, 0x75, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x61, 0x3b, 0x6d, 0x61, 0x61, 0x6e, 0x61, 0x6e, 0x74, 0x61, 0x69,
-0x6e, 0x61, 0x3b, 0x74, 0x69, 0x69, 0x73, 0x74, 0x61, 0x69, 0x6e, 0x61, 0x3b, 0x6b, 0x65, 0x73, 0x6b, 0x69, 0x76, 0x69,
-0x69, 0x6b, 0x6b, 0x6f, 0x6e, 0x61, 0x3b, 0x74, 0x6f, 0x72, 0x73, 0x74, 0x61, 0x69, 0x6e, 0x61, 0x3b, 0x70, 0x65, 0x72,
-0x6a, 0x61, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x61, 0x3b, 0x6c, 0x61, 0x75, 0x61, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x61, 0x3b,
-0x64, 0x69, 0x6d, 0x2e, 0x3b, 0x6c, 0x75, 0x6e, 0x2e, 0x3b, 0x6d, 0x61, 0x72, 0x2e, 0x3b, 0x6d, 0x65, 0x72, 0x2e, 0x3b,
-0x6a, 0x65, 0x75, 0x2e, 0x3b, 0x76, 0x65, 0x6e, 0x2e, 0x3b, 0x73, 0x61, 0x6d, 0x2e, 0x3b, 0x64, 0x69, 0x6d, 0x61, 0x6e,
-0x63, 0x68, 0x65, 0x3b, 0x6c, 0x75, 0x6e, 0x64, 0x69, 0x3b, 0x6d, 0x61, 0x72, 0x64, 0x69, 0x3b, 0x6d, 0x65, 0x72, 0x63,
-0x72, 0x65, 0x64, 0x69, 0x3b, 0x6a, 0x65, 0x75, 0x64, 0x69, 0x3b, 0x76, 0x65, 0x6e, 0x64, 0x72, 0x65, 0x64, 0x69, 0x3b,
-0x73, 0x61, 0x6d, 0x65, 0x64, 0x69, 0x3b, 0x44, 0x3b, 0x4c, 0x3b, 0x4d, 0x3b, 0x4d, 0x3b, 0x4a, 0x3b, 0x56, 0x3b, 0x53,
-0x3b, 0x73, 0x69, 0x3b, 0x6d, 0x6f, 0x3b, 0x74, 0x69, 0x3b, 0x77, 0x6f, 0x3b, 0x74, 0x6f, 0x3b, 0x66, 0x72, 0x3b, 0x73,
-0x6f, 0x3b, 0x73, 0x6e, 0x65, 0x69, 0x6e, 0x3b, 0x6d, 0x6f, 0x61, 0x6e, 0x64, 0x65, 0x69, 0x3b, 0x74, 0x69, 0x69, 0x73,
-0x64, 0x65, 0x69, 0x3b, 0x77, 0x6f, 0x61, 0x6e, 0x73, 0x64, 0x65, 0x69, 0x3b, 0x74, 0x6f, 0x6e, 0x67, 0x65, 0x72, 0x73,
-0x64, 0x65, 0x69, 0x3b, 0x66, 0x72, 0x65, 0x65, 0x64, 0x3b, 0x73, 0x6e, 0x65, 0x6f, 0x6e, 0x3b, 0x44, 0x69, 0x44, 0x3b,
-0x44, 0x69, 0x4c, 0x3b, 0x44, 0x69, 0x4d, 0x3b, 0x44, 0x69, 0x43, 0x3b, 0x44, 0x69, 0x61, 0x3b, 0x44, 0x69, 0x68, 0x3b,
-0x44, 0x69, 0x53, 0x3b, 0x44, 0x69, 0x44, 0xf2, 0x6d, 0x68, 0x6e, 0x61, 0x69, 0x63, 0x68, 0x3b, 0x44, 0x69, 0x4c, 0x75,
-0x61, 0x69, 0x6e, 0x3b, 0x44, 0x69, 0x4d, 0xe0, 0x69, 0x72, 0x74, 0x3b, 0x44, 0x69, 0x43, 0x69, 0x61, 0x64, 0x61, 0x69,
-0x6e, 0x3b, 0x44, 0x69, 0x61, 0x72, 0x44, 0x61, 0x6f, 0x69, 0x6e, 0x3b, 0x44, 0x69, 0x68, 0x41, 0x6f, 0x69, 0x6e, 0x65,
-0x3b, 0x44, 0x69, 0x53, 0x61, 0x74, 0x68, 0x61, 0x69, 0x72, 0x6e, 0x65, 0x3b, 0x44, 0x3b, 0x4c, 0x3b, 0x4d, 0x3b, 0x43,
-0x3b, 0x41, 0x3b, 0x48, 0x3b, 0x53, 0x3b, 0x44, 0x6f, 0x6d, 0x2e, 0x3b, 0x4c, 0x75, 0x6e, 0x73, 0x3b, 0x4d, 0x61, 0x72,
-0x2e, 0x3b, 0x4d, 0xe9, 0x72, 0x2e, 0x3b, 0x58, 0x6f, 0x76, 0x2e, 0x3b, 0x56, 0x65, 0x6e, 0x2e, 0x3b, 0x53, 0xe1, 0x62,
-0x2e, 0x3b, 0x44, 0x6f, 0x6d, 0x69, 0x6e, 0x67, 0x6f, 0x3b, 0x4c, 0x75, 0x6e, 0x73, 0x3b, 0x4d, 0x61, 0x72, 0x74, 0x65,
-0x73, 0x3b, 0x4d, 0xe9, 0x72, 0x63, 0x6f, 0x72, 0x65, 0x73, 0x3b, 0x58, 0x6f, 0x76, 0x65, 0x73, 0x3b, 0x56, 0x65, 0x6e,
-0x72, 0x65, 0x73, 0x3b, 0x53, 0xe1, 0x62, 0x61, 0x64, 0x6f, 0x3b, 0x44, 0x3b, 0x4c, 0x3b, 0x4d, 0x3b, 0x4d, 0x3b, 0x58,
-0x3b, 0x56, 0x3b, 0x53, 0x3b, 0x64, 0x6f, 0x6d, 0x2e, 0x3b, 0x6c, 0x75, 0x6e, 0x73, 0x3b, 0x6d, 0x61, 0x72, 0x2e, 0x3b,
-0x6d, 0xe9, 0x72, 0x2e, 0x3b, 0x78, 0x6f, 0x76, 0x2e, 0x3b, 0x76, 0x65, 0x6e, 0x2e, 0x3b, 0x73, 0xe1, 0x62, 0x2e, 0x3b,
-0x64, 0x6f, 0x6d, 0x69, 0x6e, 0x67, 0x6f, 0x3b, 0x6c, 0x75, 0x6e, 0x73, 0x3b, 0x6d, 0x61, 0x72, 0x74, 0x65, 0x73, 0x3b,
-0x6d, 0xe9, 0x72, 0x63, 0x6f, 0x72, 0x65, 0x73, 0x3b, 0x78, 0x6f, 0x76, 0x65, 0x73, 0x3b, 0x76, 0x65, 0x6e, 0x72, 0x65,
-0x73, 0x3b, 0x73, 0xe1, 0x62, 0x61, 0x64, 0x6f, 0x3b, 0x64, 0x2e, 0x3b, 0x6c, 0x2e, 0x3b, 0x6d, 0x2e, 0x3b, 0x6d, 0x2e,
-0x3b, 0x78, 0x2e, 0x3b, 0x76, 0x2e, 0x3b, 0x73, 0x2e, 0x3b, 0x10d9, 0x10d5, 0x10d8, 0x3b, 0x10dd, 0x10e0, 0x10e8, 0x3b, 0x10e1, 0x10d0,
-0x10db, 0x3b, 0x10dd, 0x10d7, 0x10ee, 0x3b, 0x10ee, 0x10e3, 0x10d7, 0x3b, 0x10de, 0x10d0, 0x10e0, 0x3b, 0x10e8, 0x10d0, 0x10d1, 0x3b, 0x10d9, 0x10d5,
-0x10d8, 0x10e0, 0x10d0, 0x3b, 0x10dd, 0x10e0, 0x10e8, 0x10d0, 0x10d1, 0x10d0, 0x10d7, 0x10d8, 0x3b, 0x10e1, 0x10d0, 0x10db, 0x10e8, 0x10d0, 0x10d1, 0x10d0,
-0x10d7, 0x10d8, 0x3b, 0x10dd, 0x10d7, 0x10ee, 0x10e8, 0x10d0, 0x10d1, 0x10d0, 0x10d7, 0x10d8, 0x3b, 0x10ee, 0x10e3, 0x10d7, 0x10e8, 0x10d0, 0x10d1, 0x10d0,
-0x10d7, 0x10d8, 0x3b, 0x10de, 0x10d0, 0x10e0, 0x10d0, 0x10e1, 0x10d9, 0x10d4, 0x10d5, 0x10d8, 0x3b, 0x10e8, 0x10d0, 0x10d1, 0x10d0, 0x10d7, 0x10d8, 0x3b,
-0x10d9, 0x3b, 0x10dd, 0x3b, 0x10e1, 0x3b, 0x10dd, 0x3b, 0x10ee, 0x3b, 0x10de, 0x3b, 0x10e8, 0x3b, 0x53, 0x6f, 0x3b, 0x4d, 0x6f, 0x3b,
-0x44, 0x69, 0x3b, 0x4d, 0x69, 0x3b, 0x44, 0x6f, 0x3b, 0x46, 0x72, 0x3b, 0x53, 0x61, 0x3b, 0x53, 0x6f, 0x6e, 0x6e, 0x74,
-0x61, 0x67, 0x3b, 0x4d, 0x6f, 0x6e, 0x74, 0x61, 0x67, 0x3b, 0x44, 0x69, 0x65, 0x6e, 0x73, 0x74, 0x61, 0x67, 0x3b, 0x4d,
-0x69, 0x74, 0x74, 0x77, 0x6f, 0x63, 0x68, 0x3b, 0x44, 0x6f, 0x6e, 0x6e, 0x65, 0x72, 0x73, 0x74, 0x61, 0x67, 0x3b, 0x46,
-0x72, 0x65, 0x69, 0x74, 0x61, 0x67, 0x3b, 0x53, 0x61, 0x6d, 0x73, 0x74, 0x61, 0x67, 0x3b, 0x53, 0x3b, 0x4d, 0x3b, 0x44,
-0x3b, 0x4d, 0x3b, 0x44, 0x3b, 0x46, 0x3b, 0x53, 0x3b, 0x53, 0x6f, 0x2e, 0x3b, 0x4d, 0x6f, 0x2e, 0x3b, 0x44, 0x69, 0x2e,
-0x3b, 0x4d, 0x69, 0x2e, 0x3b, 0x44, 0x6f, 0x2e, 0x3b, 0x46, 0x72, 0x2e, 0x3b, 0x53, 0x61, 0x2e, 0x3b, 0x39a, 0x3c5, 0x3c1,
-0x3b, 0x394, 0x3b5, 0x3c5, 0x3b, 0x3a4, 0x3c1, 0x3af, 0x3b, 0x3a4, 0x3b5, 0x3c4, 0x3b, 0x3a0, 0x3ad, 0x3bc, 0x3b, 0x3a0, 0x3b1, 0x3c1,
-0x3b, 0x3a3, 0x3ac, 0x3b2, 0x3b, 0x39a, 0x3c5, 0x3c1, 0x3b9, 0x3b1, 0x3ba, 0x3ae, 0x3b, 0x394, 0x3b5, 0x3c5, 0x3c4, 0x3ad, 0x3c1, 0x3b1,
-0x3b, 0x3a4, 0x3c1, 0x3af, 0x3c4, 0x3b7, 0x3b, 0x3a4, 0x3b5, 0x3c4, 0x3ac, 0x3c1, 0x3c4, 0x3b7, 0x3b, 0x3a0, 0x3ad, 0x3bc, 0x3c0, 0x3c4,
-0x3b7, 0x3b, 0x3a0, 0x3b1, 0x3c1, 0x3b1, 0x3c3, 0x3ba, 0x3b5, 0x3c5, 0x3ae, 0x3b, 0x3a3, 0x3ac, 0x3b2, 0x3b2, 0x3b1, 0x3c4, 0x3bf, 0x3b,
-0x39a, 0x3b, 0x394, 0x3b, 0x3a4, 0x3b, 0x3a4, 0x3b, 0x3a0, 0x3b, 0x3a0, 0x3b, 0x3a3, 0x3b, 0x73, 0x61, 0x70, 0x3b, 0x61, 0x74,
-0x61, 0x3b, 0x6d, 0x61, 0x72, 0x3b, 0x70, 0x69, 0x6e, 0x3b, 0x73, 0x69, 0x73, 0x3b, 0x74, 0x61, 0x6c, 0x3b, 0x61, 0x72,
-0x66, 0x3b, 0x73, 0x61, 0x70, 0x61, 0x61, 0x74, 0x3b, 0x61, 0x74, 0x61, 0x61, 0x73, 0x69, 0x6e, 0x6e, 0x67, 0x6f, 0x72,
-0x6e, 0x65, 0x71, 0x3b, 0x6d, 0x61, 0x72, 0x6c, 0x75, 0x6e, 0x6e, 0x67, 0x6f, 0x72, 0x6e, 0x65, 0x71, 0x3b, 0x70, 0x69,
-0x6e, 0x67, 0x61, 0x73, 0x75, 0x6e, 0x6e, 0x67, 0x6f, 0x72, 0x6e, 0x65, 0x71, 0x3b, 0x73, 0x69, 0x73, 0x61, 0x6d, 0x61,
-0x6e, 0x6e, 0x67, 0x6f, 0x72, 0x6e, 0x65, 0x71, 0x3b, 0x74, 0x61, 0x6c, 0x6c, 0x69, 0x6d, 0x61, 0x6e, 0x6e, 0x67, 0x6f,
-0x72, 0x6e, 0x65, 0x71, 0x3b, 0x61, 0x72, 0x66, 0x69, 0x6e, 0x69, 0x6e, 0x6e, 0x67, 0x6f, 0x72, 0x6e, 0x65, 0x71, 0x3b,
-0x53, 0x3b, 0x41, 0x3b, 0x4d, 0x3b, 0x50, 0x3b, 0x53, 0x3b, 0x54, 0x3b, 0x41, 0x3b, 0xab0, 0xab5, 0xabf, 0x3b, 0xab8, 0xacb,
-0xaae, 0x3b, 0xaae, 0xa82, 0xa97, 0xab3, 0x3b, 0xaac, 0xac1, 0xaa7, 0x3b, 0xa97, 0xac1, 0xab0, 0xac1, 0x3b, 0xab6, 0xac1, 0xa95, 0xacd,
-0xab0, 0x3b, 0xab6, 0xaa8, 0xabf, 0x3b, 0xab0, 0xab5, 0xabf, 0xab5, 0xabe, 0xab0, 0x3b, 0xab8, 0xacb, 0xaae, 0xab5, 0xabe, 0xab0, 0x3b,
-0xaae, 0xa82, 0xa97, 0xab3, 0xab5, 0xabe, 0xab0, 0x3b, 0xaac, 0xac1, 0xaa7, 0xab5, 0xabe, 0xab0, 0x3b, 0xa97, 0xac1, 0xab0, 0xac1, 0xab5,
-0xabe, 0xab0, 0x3b, 0xab6, 0xac1, 0xa95, 0xacd, 0xab0, 0xab5, 0xabe, 0xab0, 0x3b, 0xab6, 0xaa8, 0xabf, 0xab5, 0xabe, 0xab0, 0x3b, 0xab0,
-0x3b, 0xab8, 0xacb, 0x3b, 0xaae, 0xa82, 0x3b, 0xaac, 0xac1, 0x3b, 0xa97, 0xac1, 0x3b, 0xab6, 0xac1, 0x3b, 0xab6, 0x3b, 0x4c, 0x61,
-0x68, 0x3b, 0x4c, 0x69, 0x74, 0x3b, 0x54, 0x61, 0x6c, 0x3b, 0x4c, 0x61, 0x72, 0x3b, 0x41, 0x6c, 0x68, 0x3b, 0x4a, 0x75,
-0x6d, 0x3b, 0x41, 0x73, 0x61, 0x3b, 0x4c, 0x61, 0x68, 0x61, 0x64, 0x69, 0x3b, 0x4c, 0x69, 0x74, 0x69, 0x6e, 0x69, 0x6e,
-0x3b, 0x54, 0x61, 0x6c, 0x61, 0x74, 0x61, 0x3b, 0x4c, 0x61, 0x72, 0x61, 0x62, 0x61, 0x3b, 0x41, 0x6c, 0x68, 0x61, 0x6d,
-0x69, 0x73, 0x3b, 0x4a, 0x75, 0x6d, 0x6d, 0x61, 0x2bc, 0x61, 0x3b, 0x41, 0x73, 0x61, 0x62, 0x61, 0x72, 0x3b, 0x4c, 0x3b,
-0x4c, 0x3b, 0x54, 0x3b, 0x4c, 0x3b, 0x41, 0x3b, 0x4a, 0x3b, 0x41, 0x3b, 0x5d9, 0x5d5, 0x5dd, 0x20, 0x5d0, 0x5f3, 0x3b, 0x5d9,
-0x5d5, 0x5dd, 0x20, 0x5d1, 0x5f3, 0x3b, 0x5d9, 0x5d5, 0x5dd, 0x20, 0x5d2, 0x5f3, 0x3b, 0x5d9, 0x5d5, 0x5dd, 0x20, 0x5d3, 0x5f3, 0x3b,
-0x5d9, 0x5d5, 0x5dd, 0x20, 0x5d4, 0x5f3, 0x3b, 0x5d9, 0x5d5, 0x5dd, 0x20, 0x5d5, 0x5f3, 0x3b, 0x5e9, 0x5d1, 0x5ea, 0x3b, 0x5d9, 0x5d5,
-0x5dd, 0x20, 0x5e8, 0x5d0, 0x5e9, 0x5d5, 0x5df, 0x3b, 0x5d9, 0x5d5, 0x5dd, 0x20, 0x5e9, 0x5e0, 0x5d9, 0x3b, 0x5d9, 0x5d5, 0x5dd, 0x20,
-0x5e9, 0x5dc, 0x5d9, 0x5e9, 0x5d9, 0x3b, 0x5d9, 0x5d5, 0x5dd, 0x20, 0x5e8, 0x5d1, 0x5d9, 0x5e2, 0x5d9, 0x3b, 0x5d9, 0x5d5, 0x5dd, 0x20,
-0x5d7, 0x5de, 0x5d9, 0x5e9, 0x5d9, 0x3b, 0x5d9, 0x5d5, 0x5dd, 0x20, 0x5e9, 0x5d9, 0x5e9, 0x5d9, 0x3b, 0x5d9, 0x5d5, 0x5dd, 0x20, 0x5e9,
-0x5d1, 0x5ea, 0x3b, 0x5d0, 0x5f3, 0x3b, 0x5d1, 0x5f3, 0x3b, 0x5d2, 0x5f3, 0x3b, 0x5d3, 0x5f3, 0x3b, 0x5d4, 0x5f3, 0x3b, 0x5d5, 0x5f3,
-0x3b, 0x5e9, 0x5f3, 0x3b, 0x930, 0x935, 0x93f, 0x3b, 0x938, 0x94b, 0x92e, 0x3b, 0x92e, 0x902, 0x917, 0x932, 0x3b, 0x92c, 0x941, 0x927,
-0x3b, 0x917, 0x941, 0x930, 0x941, 0x3b, 0x936, 0x941, 0x915, 0x94d, 0x930, 0x3b, 0x936, 0x928, 0x93f, 0x3b, 0x930, 0x935, 0x93f, 0x935,
-0x93e, 0x930, 0x3b, 0x938, 0x94b, 0x92e, 0x935, 0x93e, 0x930, 0x3b, 0x92e, 0x902, 0x917, 0x932, 0x935, 0x93e, 0x930, 0x3b, 0x92c, 0x941,
-0x927, 0x935, 0x93e, 0x930, 0x3b, 0x917, 0x941, 0x930, 0x941, 0x935, 0x93e, 0x930, 0x3b, 0x936, 0x941, 0x915, 0x94d, 0x930, 0x935, 0x93e,
-0x930, 0x3b, 0x936, 0x928, 0x93f, 0x935, 0x93e, 0x930, 0x3b, 0x930, 0x3b, 0x938, 0x94b, 0x3b, 0x92e, 0x902, 0x3b, 0x92c, 0x941, 0x3b,
-0x917, 0x941, 0x3b, 0x936, 0x941, 0x3b, 0x936, 0x3b, 0x56, 0x3b, 0x48, 0x3b, 0x4b, 0x3b, 0x53, 0x7a, 0x65, 0x3b, 0x43, 0x73,
-0x3b, 0x50, 0x3b, 0x53, 0x7a, 0x6f, 0x3b, 0x76, 0x61, 0x73, 0xe1, 0x72, 0x6e, 0x61, 0x70, 0x3b, 0x68, 0xe9, 0x74, 0x66,
-0x151, 0x3b, 0x6b, 0x65, 0x64, 0x64, 0x3b, 0x73, 0x7a, 0x65, 0x72, 0x64, 0x61, 0x3b, 0x63, 0x73, 0xfc, 0x74, 0xf6, 0x72,
-0x74, 0xf6, 0x6b, 0x3b, 0x70, 0xe9, 0x6e, 0x74, 0x65, 0x6b, 0x3b, 0x73, 0x7a, 0x6f, 0x6d, 0x62, 0x61, 0x74, 0x3b, 0x56,
-0x3b, 0x48, 0x3b, 0x4b, 0x3b, 0x53, 0x7a, 0x3b, 0x43, 0x73, 0x3b, 0x50, 0x3b, 0x53, 0x7a, 0x3b, 0x73, 0x75, 0x6e, 0x2e,
-0x3b, 0x6d, 0xe1, 0x6e, 0x2e, 0x3b, 0xfe, 0x72, 0x69, 0x2e, 0x3b, 0x6d, 0x69, 0xf0, 0x2e, 0x3b, 0x66, 0x69, 0x6d, 0x2e,
-0x3b, 0x66, 0xf6, 0x73, 0x2e, 0x3b, 0x6c, 0x61, 0x75, 0x2e, 0x3b, 0x73, 0x75, 0x6e, 0x6e, 0x75, 0x64, 0x61, 0x67, 0x75,
-0x72, 0x3b, 0x6d, 0xe1, 0x6e, 0x75, 0x64, 0x61, 0x67, 0x75, 0x72, 0x3b, 0xfe, 0x72, 0x69, 0xf0, 0x6a, 0x75, 0x64, 0x61,
-0x67, 0x75, 0x72, 0x3b, 0x6d, 0x69, 0xf0, 0x76, 0x69, 0x6b, 0x75, 0x64, 0x61, 0x67, 0x75, 0x72, 0x3b, 0x66, 0x69, 0x6d,
-0x6d, 0x74, 0x75, 0x64, 0x61, 0x67, 0x75, 0x72, 0x3b, 0x66, 0xf6, 0x73, 0x74, 0x75, 0x64, 0x61, 0x67, 0x75, 0x72, 0x3b,
-0x6c, 0x61, 0x75, 0x67, 0x61, 0x72, 0x64, 0x61, 0x67, 0x75, 0x72, 0x3b, 0x53, 0x3b, 0x4d, 0x3b, 0xde, 0x3b, 0x4d, 0x3b,
-0x46, 0x3b, 0x46, 0x3b, 0x4c, 0x3b, 0x4d, 0x69, 0x6e, 0x3b, 0x53, 0x65, 0x6e, 0x3b, 0x53, 0x65, 0x6c, 0x3b, 0x52, 0x61,
-0x62, 0x3b, 0x4b, 0x61, 0x6d, 0x3b, 0x4a, 0x75, 0x6d, 0x3b, 0x53, 0x61, 0x62, 0x3b, 0x4d, 0x69, 0x6e, 0x67, 0x67, 0x75,
-0x3b, 0x53, 0x65, 0x6e, 0x69, 0x6e, 0x3b, 0x53, 0x65, 0x6c, 0x61, 0x73, 0x61, 0x3b, 0x52, 0x61, 0x62, 0x75, 0x3b, 0x4b,
-0x61, 0x6d, 0x69, 0x73, 0x3b, 0x4a, 0x75, 0x6d, 0x61, 0x74, 0x3b, 0x53, 0x61, 0x62, 0x74, 0x75, 0x3b, 0x4d, 0x3b, 0x53,
-0x3b, 0x53, 0x3b, 0x52, 0x3b, 0x4b, 0x3b, 0x4a, 0x3b, 0x53, 0x3b, 0x64, 0x6f, 0x6d, 0x3b, 0x6c, 0x75, 0x6e, 0x3b, 0x6d,
-0x61, 0x72, 0x3b, 0x6d, 0x65, 0x72, 0x3b, 0x6a, 0x6f, 0x76, 0x3b, 0x76, 0x65, 0x6e, 0x3b, 0x73, 0x61, 0x62, 0x3b, 0x64,
-0x6f, 0x6d, 0x69, 0x6e, 0x69, 0x63, 0x61, 0x3b, 0x6c, 0x75, 0x6e, 0x65, 0x64, 0x69, 0x3b, 0x6d, 0x61, 0x72, 0x74, 0x65,
-0x64, 0x69, 0x3b, 0x6d, 0x65, 0x72, 0x63, 0x75, 0x72, 0x69, 0x64, 0x69, 0x3b, 0x6a, 0x6f, 0x76, 0x65, 0x64, 0x69, 0x3b,
-0x76, 0x65, 0x6e, 0x65, 0x72, 0x64, 0x69, 0x3b, 0x73, 0x61, 0x62, 0x62, 0x61, 0x74, 0x6f, 0x3b, 0x64, 0x3b, 0x6c, 0x3b,
-0x6d, 0x3b, 0x6d, 0x3b, 0x6a, 0x3b, 0x76, 0x3b, 0x73, 0x3b, 0x44, 0x6f, 0x6d, 0x68, 0x3b, 0x4c, 0x75, 0x61, 0x6e, 0x3b,
-0x4d, 0xe1, 0x69, 0x72, 0x74, 0x3b, 0x43, 0xe9, 0x61, 0x64, 0x3b, 0x44, 0xe9, 0x61, 0x72, 0x3b, 0x41, 0x6f, 0x69, 0x6e,
-0x65, 0x3b, 0x53, 0x61, 0x74, 0x68, 0x3b, 0x44, 0xe9, 0x20, 0x44, 0x6f, 0x6d, 0x68, 0x6e, 0x61, 0x69, 0x67, 0x68, 0x3b,
-0x44, 0xe9, 0x20, 0x4c, 0x75, 0x61, 0x69, 0x6e, 0x3b, 0x44, 0xe9, 0x20, 0x4d, 0xe1, 0x69, 0x72, 0x74, 0x3b, 0x44, 0xe9,
-0x20, 0x43, 0xe9, 0x61, 0x64, 0x61, 0x6f, 0x69, 0x6e, 0x3b, 0x44, 0xe9, 0x61, 0x72, 0x64, 0x61, 0x6f, 0x69, 0x6e, 0x3b,
-0x44, 0xe9, 0x20, 0x68, 0x41, 0x6f, 0x69, 0x6e, 0x65, 0x3b, 0x44, 0xe9, 0x20, 0x53, 0x61, 0x74, 0x68, 0x61, 0x69, 0x72,
-0x6e, 0x3b, 0x44, 0x3b, 0x4c, 0x3b, 0x4d, 0x3b, 0x43, 0x3b, 0x44, 0x3b, 0x41, 0x3b, 0x53, 0x3b, 0x64, 0x6f, 0x6d, 0x3b,
-0x6c, 0x75, 0x6e, 0x3b, 0x6d, 0x61, 0x72, 0x3b, 0x6d, 0x65, 0x72, 0x3b, 0x67, 0x69, 0x6f, 0x3b, 0x76, 0x65, 0x6e, 0x3b,
-0x73, 0x61, 0x62, 0x3b, 0x64, 0x6f, 0x6d, 0x65, 0x6e, 0x69, 0x63, 0x61, 0x3b, 0x6c, 0x75, 0x6e, 0x65, 0x64, 0xec, 0x3b,
-0x6d, 0x61, 0x72, 0x74, 0x65, 0x64, 0xec, 0x3b, 0x6d, 0x65, 0x72, 0x63, 0x6f, 0x6c, 0x65, 0x64, 0xec, 0x3b, 0x67, 0x69,
-0x6f, 0x76, 0x65, 0x64, 0xec, 0x3b, 0x76, 0x65, 0x6e, 0x65, 0x72, 0x64, 0xec, 0x3b, 0x73, 0x61, 0x62, 0x61, 0x74, 0x6f,
-0x3b, 0x44, 0x3b, 0x4c, 0x3b, 0x4d, 0x3b, 0x4d, 0x3b, 0x47, 0x3b, 0x56, 0x3b, 0x53, 0x3b, 0x65e5, 0x3b, 0x6708, 0x3b, 0x706b,
-0x3b, 0x6c34, 0x3b, 0x6728, 0x3b, 0x91d1, 0x3b, 0x571f, 0x3b, 0x65e5, 0x66dc, 0x65e5, 0x3b, 0x6708, 0x66dc, 0x65e5, 0x3b, 0x706b, 0x66dc, 0x65e5,
-0x3b, 0x6c34, 0x66dc, 0x65e5, 0x3b, 0x6728, 0x66dc, 0x65e5, 0x3b, 0x91d1, 0x66dc, 0x65e5, 0x3b, 0x571f, 0x66dc, 0x65e5, 0x3b, 0x41, 0x68, 0x61,
-0x64, 0x3b, 0x53, 0x65, 0x6e, 0x3b, 0x53, 0x65, 0x6c, 0x3b, 0x52, 0x61, 0x62, 0x3b, 0x4b, 0x61, 0x6d, 0x3b, 0x4a, 0x75,
-0x6d, 0x3b, 0x53, 0x61, 0x62, 0x3b, 0x41, 0x68, 0x61, 0x64, 0x3b, 0x53, 0x65, 0x6e, 0x69, 0x6e, 0x3b, 0x53, 0x65, 0x6c,
-0x61, 0x73, 0x61, 0x3b, 0x52, 0x61, 0x62, 0x75, 0x3b, 0x4b, 0x61, 0x6d, 0x69, 0x73, 0x3b, 0x4a, 0x75, 0x6d, 0x61, 0x74,
-0x3b, 0x53, 0x61, 0x62, 0x74, 0x75, 0x3b, 0x41, 0x3b, 0x53, 0x3b, 0x53, 0x3b, 0x52, 0x3b, 0x4b, 0x3b, 0x4a, 0x3b, 0x53,
-0x3b, 0xcad, 0xcbe, 0xca8, 0xcc1, 0x3b, 0xcb8, 0xccb, 0xcae, 0x3b, 0xcae, 0xc82, 0xc97, 0xcb3, 0x3b, 0xcac, 0xcc1, 0xca7, 0x3b, 0xc97,
-0xcc1, 0xcb0, 0xcc1, 0x3b, 0xcb6, 0xcc1, 0xc95, 0xccd, 0xcb0, 0x3b, 0xcb6, 0xca8, 0xcbf, 0x3b, 0xcad, 0xcbe, 0xca8, 0xcc1, 0xcb5, 0xcbe,
-0xcb0, 0x3b, 0xcb8, 0xccb, 0xcae, 0xcb5, 0xcbe, 0xcb0, 0x3b, 0xcae, 0xc82, 0xc97, 0xcb3, 0xcb5, 0xcbe, 0xcb0, 0x3b, 0xcac, 0xcc1, 0xca7,
-0xcb5, 0xcbe, 0xcb0, 0x3b, 0xc97, 0xcc1, 0xcb0, 0xcc1, 0xcb5, 0xcbe, 0xcb0, 0x3b, 0xcb6, 0xcc1, 0xc95, 0xccd, 0xcb0, 0xcb5, 0xcbe, 0xcb0,
-0x3b, 0xcb6, 0xca8, 0xcbf, 0xcb5, 0xcbe, 0xcb0, 0x3b, 0xcad, 0xcbe, 0x3b, 0xcb8, 0xccb, 0x3b, 0xcae, 0xc82, 0x3b, 0xcac, 0xcc1, 0x3b,
-0xc97, 0xcc1, 0x3b, 0xcb6, 0xcc1, 0x3b, 0xcb6, 0x3b, 0x622, 0x62a, 0x6be, 0x648, 0x627, 0x631, 0x3b, 0x698, 0x654, 0x646, 0x62f, 0x655,
-0x631, 0x648, 0x627, 0x631, 0x3b, 0x628, 0x6c6, 0x645, 0x648, 0x627, 0x631, 0x3b, 0x628, 0x648, 0x62f, 0x648, 0x627, 0x631, 0x3b, 0x628,
-0x631, 0x620, 0x633, 0x648, 0x627, 0x631, 0x3b, 0x62c, 0x64f, 0x645, 0x6c1, 0x3b, 0x628, 0x679, 0x648, 0x627, 0x631, 0x3b, 0x627, 0x64e,
-0x62a, 0x6be, 0x648, 0x627, 0x631, 0x3b, 0x698, 0x654, 0x646, 0x62f, 0x631, 0x655, 0x631, 0x648, 0x627, 0x631, 0x3b, 0x628, 0x6c6, 0x645,
-0x648, 0x627, 0x631, 0x3b, 0x628, 0x648, 0x62f, 0x648, 0x627, 0x631, 0x3b, 0x628, 0x631, 0x620, 0x633, 0x648, 0x627, 0x631, 0x3b, 0x62c,
-0x64f, 0x645, 0x6c1, 0x3b, 0x628, 0x679, 0x648, 0x627, 0x631, 0x3b, 0x627, 0x3b, 0x698, 0x3b, 0x628, 0x3b, 0x628, 0x3b, 0x628, 0x3b,
-0x62c, 0x3b, 0x628, 0x3b, 0x436, 0x441, 0x3b, 0x434, 0x441, 0x3b, 0x441, 0x441, 0x3b, 0x441, 0x440, 0x3b, 0x431, 0x441, 0x3b, 0x436,
-0x43c, 0x3b, 0x441, 0x431, 0x3b, 0x436, 0x435, 0x43a, 0x441, 0x435, 0x43d, 0x431, 0x456, 0x3b, 0x434, 0x4af, 0x439, 0x441, 0x435, 0x43d,
-0x431, 0x456, 0x3b, 0x441, 0x435, 0x439, 0x441, 0x435, 0x43d, 0x431, 0x456, 0x3b, 0x441, 0x4d9, 0x440, 0x441, 0x435, 0x43d, 0x431, 0x456,
-0x3b, 0x431, 0x435, 0x439, 0x441, 0x435, 0x43d, 0x431, 0x456, 0x3b, 0x436, 0x4b1, 0x43c, 0x430, 0x3b, 0x441, 0x435, 0x43d, 0x431, 0x456,
-0x3b, 0x416, 0x3b, 0x414, 0x3b, 0x421, 0x3b, 0x421, 0x3b, 0x411, 0x3b, 0x416, 0x3b, 0x421, 0x3b, 0x63, 0x79, 0x75, 0x2e, 0x3b,
-0x6d, 0x62, 0x65, 0x2e, 0x3b, 0x6b, 0x61, 0x62, 0x2e, 0x3b, 0x67, 0x74, 0x75, 0x2e, 0x3b, 0x6b, 0x61, 0x6e, 0x2e, 0x3b,
-0x67, 0x6e, 0x75, 0x2e, 0x3b, 0x67, 0x6e, 0x64, 0x2e, 0x3b, 0x4b, 0x75, 0x20, 0x63, 0x79, 0x75, 0x6d, 0x77, 0x65, 0x72,
-0x75, 0x3b, 0x4b, 0x75, 0x77, 0x61, 0x20, 0x6d, 0x62, 0x65, 0x72, 0x65, 0x3b, 0x4b, 0x75, 0x77, 0x61, 0x20, 0x6b, 0x61,
-0x62, 0x69, 0x72, 0x69, 0x3b, 0x4b, 0x75, 0x77, 0x61, 0x20, 0x67, 0x61, 0x74, 0x61, 0x74, 0x75, 0x3b, 0x4b, 0x75, 0x77,
-0x61, 0x20, 0x6b, 0x61, 0x6e, 0x65, 0x3b, 0x4b, 0x75, 0x77, 0x61, 0x20, 0x67, 0x61, 0x74, 0x61, 0x6e, 0x75, 0x3b, 0x4b,
-0x75, 0x77, 0x61, 0x20, 0x67, 0x61, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x74, 0x75, 0x3b, 0x436, 0x435, 0x43a, 0x2e, 0x3b, 0x434,
-0x4af, 0x439, 0x2e, 0x3b, 0x448, 0x435, 0x439, 0x448, 0x2e, 0x3b, 0x448, 0x430, 0x440, 0x448, 0x2e, 0x3b, 0x431, 0x435, 0x439, 0x448,
-0x2e, 0x3b, 0x436, 0x443, 0x43c, 0x430, 0x3b, 0x438, 0x448, 0x43c, 0x2e, 0x3b, 0x436, 0x435, 0x43a, 0x448, 0x435, 0x43c, 0x431, 0x438,
-0x3b, 0x434, 0x4af, 0x439, 0x448, 0x4e9, 0x43c, 0x431, 0x4af, 0x3b, 0x448, 0x435, 0x439, 0x448, 0x435, 0x43c, 0x431, 0x438, 0x3b, 0x448,
-0x430, 0x440, 0x448, 0x435, 0x43c, 0x431, 0x438, 0x3b, 0x431, 0x435, 0x439, 0x448, 0x435, 0x43c, 0x431, 0x438, 0x3b, 0x436, 0x443, 0x43c,
-0x430, 0x3b, 0x438, 0x448, 0x435, 0x43c, 0x431, 0x438, 0x3b, 0x416, 0x3b, 0x414, 0x3b, 0x428, 0x3b, 0x428, 0x3b, 0x411, 0x3b, 0x416,
-0x3b, 0x418, 0x3b, 0xc77c, 0x3b, 0xc6d4, 0x3b, 0xd654, 0x3b, 0xc218, 0x3b, 0xbaa9, 0x3b, 0xae08, 0x3b, 0xd1a0, 0x3b, 0xc77c, 0xc694, 0xc77c,
+static const char16_t days_data[] = {
+0x53, 0x75, 0x6e, 0x64, 0x61, 0x79, 0x3b, 0x4d, 0x6f, 0x6e, 0x64, 0x61, 0x79, 0x3b, 0x54, 0x75, 0x65, 0x73, 0x64, 0x61,
+0x79, 0x3b, 0x57, 0x65, 0x64, 0x6e, 0x65, 0x73, 0x64, 0x61, 0x79, 0x3b, 0x54, 0x68, 0x75, 0x72, 0x73, 0x64, 0x61, 0x79,
+0x3b, 0x46, 0x72, 0x69, 0x64, 0x61, 0x79, 0x3b, 0x53, 0x61, 0x74, 0x75, 0x72, 0x64, 0x61, 0x79, 0x53, 0x75, 0x6e, 0x3b,
+0x4d, 0x6f, 0x6e, 0x3b, 0x54, 0x75, 0x65, 0x3b, 0x57, 0x65, 0x64, 0x3b, 0x54, 0x68, 0x75, 0x3b, 0x46, 0x72, 0x69, 0x3b,
+0x53, 0x61, 0x74, 0x53, 0x3b, 0x4d, 0x3b, 0x54, 0x3b, 0x57, 0x3b, 0x54, 0x3b, 0x46, 0x3b, 0x53, 0x37, 0x3b, 0x31, 0x3b,
+0x32, 0x3b, 0x33, 0x3b, 0x34, 0x3b, 0x35, 0x3b, 0x36, 0x44, 0x69, 0x6c, 0x62, 0x61, 0x74, 0x61, 0x3b, 0x57, 0x69, 0x69,
+0x78, 0x61, 0x74, 0x61, 0x3b, 0x51, 0x69, 0x62, 0x78, 0x61, 0x74, 0x61, 0x3b, 0x52, 0x6f, 0x6f, 0x62, 0x69, 0x69, 0x3b,
+0x4b, 0x61, 0x6d, 0x69, 0x69, 0x73, 0x61, 0x3b, 0x4a, 0x69, 0x6d, 0x61, 0x61, 0x74, 0x61, 0x3b, 0x53, 0x61, 0x6e, 0x62,
+0x61, 0x74, 0x61, 0x44, 0x69, 0x6c, 0x3b, 0x57, 0x69, 0x78, 0x3b, 0x51, 0x69, 0x62, 0x3b, 0x52, 0x6f, 0x62, 0x3b, 0x4b,
+0x61, 0x6d, 0x3b, 0x4a, 0x69, 0x6d, 0x3b, 0x53, 0x61, 0x6e, 0x44, 0x3b, 0x57, 0x3b, 0x51, 0x3b, 0x52, 0x3b, 0x4b, 0x3b,
+0x4a, 0x3b, 0x53, 0x53, 0x6f, 0x6e, 0x64, 0x61, 0x67, 0x3b, 0x4d, 0x61, 0x61, 0x6e, 0x64, 0x61, 0x67, 0x3b, 0x44, 0x69,
+0x6e, 0x73, 0x64, 0x61, 0x67, 0x3b, 0x57, 0x6f, 0x65, 0x6e, 0x73, 0x64, 0x61, 0x67, 0x3b, 0x44, 0x6f, 0x6e, 0x64, 0x65,
+0x72, 0x64, 0x61, 0x67, 0x3b, 0x56, 0x72, 0x79, 0x64, 0x61, 0x67, 0x3b, 0x53, 0x61, 0x74, 0x65, 0x72, 0x64, 0x61, 0x67,
+0x53, 0x6f, 0x2e, 0x3b, 0x4d, 0x61, 0x2e, 0x3b, 0x44, 0x69, 0x2e, 0x3b, 0x57, 0x6f, 0x2e, 0x3b, 0x44, 0x6f, 0x2e, 0x3b,
+0x56, 0x72, 0x2e, 0x3b, 0x53, 0x61, 0x2e, 0x53, 0x3b, 0x4d, 0x3b, 0x44, 0x3b, 0x57, 0x3b, 0x44, 0x3b, 0x56, 0x3b, 0x53,
+0x65, 0x20, 0x64, 0x69, 0x65, 0x6c, 0x3b, 0x65, 0x20, 0x68, 0xeb, 0x6e, 0xeb, 0x3b, 0x65, 0x20, 0x6d, 0x61, 0x72, 0x74,
+0xeb, 0x3b, 0x65, 0x20, 0x6d, 0xeb, 0x72, 0x6b, 0x75, 0x72, 0xeb, 0x3b, 0x65, 0x20, 0x65, 0x6e, 0x6a, 0x74, 0x65, 0x3b,
+0x65, 0x20, 0x70, 0x72, 0x65, 0x6d, 0x74, 0x65, 0x3b, 0x65, 0x20, 0x73, 0x68, 0x74, 0x75, 0x6e, 0xeb, 0x64, 0x69, 0x65,
+0x3b, 0x68, 0xeb, 0x6e, 0x3b, 0x6d, 0x61, 0x72, 0x3b, 0x6d, 0xeb, 0x72, 0x3b, 0x65, 0x6e, 0x6a, 0x3b, 0x70, 0x72, 0x65,
+0x3b, 0x73, 0x68, 0x74, 0x44, 0x69, 0x65, 0x3b, 0x48, 0xeb, 0x6e, 0x3b, 0x4d, 0x61, 0x72, 0x3b, 0x4d, 0xeb, 0x72, 0x3b,
+0x45, 0x6e, 0x6a, 0x3b, 0x50, 0x72, 0x65, 0x3b, 0x53, 0x68, 0x74, 0x64, 0x3b, 0x68, 0x3b, 0x6d, 0x3b, 0x6d, 0x3b, 0x65,
+0x3b, 0x70, 0x3b, 0x73, 0x68, 0x12a5, 0x1211, 0x12f5, 0x3b, 0x1230, 0x129e, 0x3b, 0x121b, 0x12ad, 0x1230, 0x129e, 0x3b, 0x1228, 0x1261, 0x12d5,
+0x3b, 0x1210, 0x1219, 0x1235, 0x3b, 0x12d3, 0x122d, 0x1265, 0x3b, 0x1245, 0x12f3, 0x121c, 0x12a5, 0x1211, 0x12f5, 0x3b, 0x1230, 0x129e, 0x3b, 0x121b,
+0x12ad, 0x1230, 0x3b, 0x1228, 0x1261, 0x12d5, 0x3b, 0x1210, 0x1219, 0x1235, 0x3b, 0x12d3, 0x122d, 0x1265, 0x3b, 0x1245, 0x12f3, 0x121c, 0x12a5, 0x3b,
+0x1230, 0x3b, 0x121b, 0x3b, 0x1228, 0x3b, 0x1210, 0x3b, 0x12d3, 0x3b, 0x1245, 0x627, 0x644, 0x623, 0x62d, 0x62f, 0x3b, 0x627, 0x644, 0x627,
+0x62b, 0x646, 0x64a, 0x646, 0x3b, 0x627, 0x644, 0x62b, 0x644, 0x627, 0x62b, 0x627, 0x621, 0x3b, 0x627, 0x644, 0x623, 0x631, 0x628, 0x639,
+0x627, 0x621, 0x3b, 0x627, 0x644, 0x62e, 0x645, 0x64a, 0x633, 0x3b, 0x627, 0x644, 0x62c, 0x645, 0x639, 0x629, 0x3b, 0x627, 0x644, 0x633,
+0x628, 0x62a, 0x62d, 0x3b, 0x646, 0x3b, 0x62b, 0x3b, 0x631, 0x3b, 0x62e, 0x3b, 0x62c, 0x3b, 0x633, 0x56f, 0x56b, 0x580, 0x561, 0x56f,
+0x56b, 0x3b, 0x565, 0x580, 0x56f, 0x578, 0x582, 0x577, 0x561, 0x562, 0x569, 0x56b, 0x3b, 0x565, 0x580, 0x565, 0x584, 0x577, 0x561, 0x562,
+0x569, 0x56b, 0x3b, 0x579, 0x578, 0x580, 0x565, 0x584, 0x577, 0x561, 0x562, 0x569, 0x56b, 0x3b, 0x570, 0x56b, 0x576, 0x563, 0x577, 0x561,
+0x562, 0x569, 0x56b, 0x3b, 0x578, 0x582, 0x580, 0x562, 0x561, 0x569, 0x3b, 0x577, 0x561, 0x562, 0x561, 0x569, 0x56f, 0x56b, 0x580, 0x3b,
+0x565, 0x580, 0x56f, 0x3b, 0x565, 0x580, 0x584, 0x3b, 0x579, 0x580, 0x584, 0x3b, 0x570, 0x576, 0x563, 0x3b, 0x578, 0x582, 0x580, 0x3b,
+0x577, 0x562, 0x569, 0x53f, 0x3b, 0x535, 0x3b, 0x535, 0x3b, 0x549, 0x3b, 0x540, 0x3b, 0x548, 0x3b, 0x547, 0x9a6, 0x9c7, 0x993, 0x9ac,
+0x9be, 0x9f0, 0x3b, 0x9b8, 0x9cb, 0x9ae, 0x9ac, 0x9be, 0x9f0, 0x3b, 0x9ae, 0x999, 0x9cd, 0x997, 0x9b2, 0x9ac, 0x9be, 0x9f0, 0x3b, 0x9ac,
+0x9c1, 0x9a7, 0x9ac, 0x9be, 0x9f0, 0x3b, 0x9ac, 0x9c3, 0x9b9, 0x9b8, 0x9cd, 0x9aa, 0x9a4, 0x9bf, 0x9ac, 0x9be, 0x9f0, 0x3b, 0x9b6, 0x9c1,
+0x995, 0x9cd, 0x9f0, 0x9ac, 0x9be, 0x9f0, 0x3b, 0x9b6, 0x9a8, 0x9bf, 0x9ac, 0x9be, 0x9f0, 0x9a6, 0x9c7, 0x993, 0x3b, 0x9b8, 0x9cb, 0x9ae,
+0x3b, 0x9ae, 0x999, 0x9cd, 0x997, 0x9b2, 0x3b, 0x9ac, 0x9c1, 0x9a7, 0x3b, 0x9ac, 0x9c3, 0x9b9, 0x3b, 0x9b6, 0x9c1, 0x995, 0x9cd, 0x9f0,
+0x3b, 0x9b6, 0x9a8, 0x9bf, 0x9a6, 0x3b, 0x9b8, 0x3b, 0x9ae, 0x3b, 0x9ac, 0x3b, 0x9ac, 0x3b, 0x9b6, 0x3b, 0x9b6, 0x62, 0x61, 0x7a,
+0x61, 0x72, 0x3b, 0x62, 0x61, 0x7a, 0x61, 0x72, 0x20, 0x65, 0x72, 0x74, 0x259, 0x73, 0x69, 0x3b, 0xe7, 0x259, 0x72, 0x15f,
+0x259, 0x6e, 0x62, 0x259, 0x20, 0x61, 0x78, 0x15f, 0x61, 0x6d, 0x131, 0x3b, 0xe7, 0x259, 0x72, 0x15f, 0x259, 0x6e, 0x62, 0x259,
+0x3b, 0x63, 0xfc, 0x6d, 0x259, 0x20, 0x61, 0x78, 0x15f, 0x61, 0x6d, 0x131, 0x3b, 0x63, 0xfc, 0x6d, 0x259, 0x3b, 0x15f, 0x259,
+0x6e, 0x62, 0x259, 0x42, 0x2e, 0x3b, 0x42, 0x2e, 0x45, 0x2e, 0x3b, 0xc7, 0x2e, 0x41, 0x2e, 0x3b, 0xc7, 0x2e, 0x3b, 0x43,
+0x2e, 0x41, 0x2e, 0x3b, 0x43, 0x2e, 0x3b, 0x15e, 0x2e, 0x42, 0x2e, 0x3b, 0x42, 0x2e, 0x65, 0x2e, 0x3b, 0xc7, 0x2e, 0x61,
+0x2e, 0x3b, 0xc7, 0x2e, 0x3b, 0x43, 0x2e, 0x61, 0x2e, 0x3b, 0x43, 0x2e, 0x3b, 0x15e, 0x2e, 0x431, 0x430, 0x437, 0x430, 0x440,
+0x3b, 0x431, 0x430, 0x437, 0x430, 0x440, 0x20, 0x435, 0x440, 0x442, 0x4d9, 0x441, 0x438, 0x3b, 0x447, 0x4d9, 0x440, 0x448, 0x4d9, 0x43d,
+0x431, 0x4d9, 0x20, 0x430, 0x445, 0x448, 0x430, 0x43c, 0x44b, 0x3b, 0x447, 0x4d9, 0x440, 0x448, 0x4d9, 0x43d, 0x431, 0x4d9, 0x3b, 0x4b9,
+0x4af, 0x43c, 0x4d9, 0x20, 0x430, 0x445, 0x448, 0x430, 0x43c, 0x44b, 0x3b, 0x4b9, 0x4af, 0x43c, 0x4d9, 0x3b, 0x448, 0x4d9, 0x43d, 0x431,
+0x4d9, 0x411, 0x2e, 0x3b, 0x411, 0x2e, 0x415, 0x2e, 0x3b, 0x427, 0x2e, 0x410, 0x2e, 0x3b, 0x427, 0x2e, 0x3b, 0x4b8, 0x2e, 0x410,
+0x2e, 0x3b, 0x4b8, 0x2e, 0x3b, 0x428, 0x2e, 0x69, 0x67, 0x61, 0x6e, 0x64, 0x65, 0x61, 0x3b, 0x61, 0x73, 0x74, 0x65, 0x6c,
+0x65, 0x68, 0x65, 0x6e, 0x61, 0x3b, 0x61, 0x73, 0x74, 0x65, 0x61, 0x72, 0x74, 0x65, 0x61, 0x3b, 0x61, 0x73, 0x74, 0x65,
+0x61, 0x7a, 0x6b, 0x65, 0x6e, 0x61, 0x3b, 0x6f, 0x73, 0x74, 0x65, 0x67, 0x75, 0x6e, 0x61, 0x3b, 0x6f, 0x73, 0x74, 0x69,
+0x72, 0x61, 0x6c, 0x61, 0x3b, 0x6c, 0x61, 0x72, 0x75, 0x6e, 0x62, 0x61, 0x74, 0x61, 0x69, 0x67, 0x2e, 0x3b, 0x61, 0x6c,
+0x2e, 0x3b, 0x61, 0x72, 0x2e, 0x3b, 0x61, 0x7a, 0x2e, 0x3b, 0x6f, 0x67, 0x2e, 0x3b, 0x6f, 0x72, 0x2e, 0x3b, 0x6c, 0x72,
+0x2e, 0x49, 0x3b, 0x41, 0x3b, 0x41, 0x3b, 0x41, 0x3b, 0x4f, 0x3b, 0x4f, 0x3b, 0x4c, 0x9b0, 0x9ac, 0x9bf, 0x9ac, 0x9be, 0x9b0,
+0x3b, 0x9b8, 0x9cb, 0x9ae, 0x9ac, 0x9be, 0x9b0, 0x3b, 0x9ae, 0x999, 0x9cd, 0x997, 0x9b2, 0x9ac, 0x9be, 0x9b0, 0x3b, 0x9ac, 0x9c1, 0x9a7,
+0x9ac, 0x9be, 0x9b0, 0x3b, 0x9ac, 0x9c3, 0x9b9, 0x9b8, 0x9cd, 0x9aa, 0x9a4, 0x9bf, 0x9ac, 0x9be, 0x9b0, 0x3b, 0x9b6, 0x9c1, 0x995, 0x9cd,
+0x9b0, 0x9ac, 0x9be, 0x9b0, 0x3b, 0x9b6, 0x9a8, 0x9bf, 0x9ac, 0x9be, 0x9b0, 0x9b0, 0x9ac, 0x9bf, 0x3b, 0x9b8, 0x9cb, 0x9ae, 0x3b, 0x9ae,
+0x999, 0x9cd, 0x997, 0x9b2, 0x3b, 0x9ac, 0x9c1, 0x9a7, 0x3b, 0x9ac, 0x9c3, 0x9b9, 0x9b8, 0x9cd, 0x9aa, 0x9a4, 0x9bf, 0x3b, 0x9b6, 0x9c1,
+0x995, 0x9cd, 0x9b0, 0x3b, 0x9b6, 0x9a8, 0x9bf, 0x9b0, 0x3b, 0x9b8, 0x9cb, 0x3b, 0x9ae, 0x3b, 0x9ac, 0x9c1, 0x3b, 0x9ac, 0x9c3, 0x3b,
+0x9b6, 0x9c1, 0x3b, 0x9b6, 0xf42, 0xf5f, 0xf60, 0xf0b, 0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf0b, 0x3b, 0xf42, 0xf5f, 0xf60, 0xf0b, 0xf58, 0xf72,
+0xf42, 0xf0b, 0xf51, 0xf58, 0xf62, 0xf0b, 0x3b, 0xf42, 0xf5f, 0xf60, 0xf0b, 0xf63, 0xfb7, 0xf42, 0xf0b, 0xf54, 0xf0b, 0x3b, 0xf42, 0xf5f,
+0xf60, 0xf0b, 0xf55, 0xf74, 0xf62, 0xf0b, 0xf56, 0xf74, 0xf0b, 0x3b, 0xf42, 0xf5f, 0xf60, 0xf0b, 0xf54, 0xf0b, 0xf66, 0xf44, 0xf66, 0xf0b,
+0x3b, 0xf42, 0xf5f, 0xf60, 0xf0b, 0xf66, 0xfa4, 0xf7a, 0xf53, 0xf0b, 0xf54, 0xf0b, 0x3b, 0xf42, 0xf5f, 0xf60, 0xf0b, 0xf49, 0xf72, 0xf0b,
+0xf58, 0xf0b, 0xf5f, 0xfb3, 0xf0b, 0x3b, 0xf58, 0xf72, 0xf62, 0xf0b, 0x3b, 0xf63, 0xfb7, 0xf42, 0xf0b, 0x3b, 0xf55, 0xf74, 0xf62, 0xf0b,
+0x3b, 0xf66, 0xf44, 0xf66, 0xf0b, 0x3b, 0xf66, 0xfa4, 0xf7a, 0xf53, 0xf0b, 0x3b, 0xf49, 0xf72, 0xf0b, 0xf5f, 0xfb3, 0x3b, 0xf58, 0xf72,
+0xf62, 0x3b, 0xf63, 0xfb7, 0xf42, 0x3b, 0xf55, 0xf74, 0xf62, 0x3b, 0xf66, 0xf44, 0xfb6, 0x3b, 0xf66, 0xfa4, 0xf7a, 0xf53, 0x3b, 0xf49,
+0xf72, 0x53, 0x75, 0x6c, 0x3b, 0x4c, 0x75, 0x6e, 0x3b, 0x4d, 0x65, 0x75, 0x72, 0x7a, 0x68, 0x3b, 0x4d, 0x65, 0x72, 0x63,
+0x2bc, 0x68, 0x65, 0x72, 0x3b, 0x59, 0x61, 0x6f, 0x75, 0x3b, 0x47, 0x77, 0x65, 0x6e, 0x65, 0x72, 0x3b, 0x53, 0x61, 0x64,
+0x6f, 0x72, 0x6e, 0x53, 0x75, 0x6c, 0x3b, 0x4c, 0x75, 0x6e, 0x3b, 0x4d, 0x65, 0x75, 0x2e, 0x3b, 0x4d, 0x65, 0x72, 0x2e,
+0x3b, 0x59, 0x61, 0x6f, 0x75, 0x3b, 0x47, 0x77, 0x65, 0x2e, 0x3b, 0x53, 0x61, 0x64, 0x2e, 0x53, 0x75, 0x3b, 0x4c, 0x3b,
+0x4d, 0x7a, 0x3b, 0x4d, 0x63, 0x3b, 0x59, 0x3b, 0x47, 0x3b, 0x53, 0x61, 0x43d, 0x435, 0x434, 0x435, 0x43b, 0x44f, 0x3b, 0x43f,
+0x43e, 0x43d, 0x435, 0x434, 0x435, 0x43b, 0x43d, 0x438, 0x43a, 0x3b, 0x432, 0x442, 0x43e, 0x440, 0x43d, 0x438, 0x43a, 0x3b, 0x441, 0x440,
+0x44f, 0x434, 0x430, 0x3b, 0x447, 0x435, 0x442, 0x432, 0x44a, 0x440, 0x442, 0x44a, 0x43a, 0x3b, 0x43f, 0x435, 0x442, 0x44a, 0x43a, 0x3b,
+0x441, 0x44a, 0x431, 0x43e, 0x442, 0x430, 0x43d, 0x434, 0x3b, 0x43f, 0x43d, 0x3b, 0x432, 0x442, 0x3b, 0x441, 0x440, 0x3b, 0x447, 0x442,
+0x3b, 0x43f, 0x442, 0x3b, 0x441, 0x431, 0x43d, 0x3b, 0x43f, 0x3b, 0x432, 0x3b, 0x441, 0x3b, 0x447, 0x3b, 0x43f, 0x3b, 0x441, 0x1010,
+0x1014, 0x1004, 0x103a, 0x1039, 0x1002, 0x1014, 0x103d, 0x1031, 0x3b, 0x1010, 0x1014, 0x1004, 0x103a, 0x1039, 0x101c, 0x102c, 0x3b, 0x1021, 0x1004, 0x103a,
+0x1039, 0x1002, 0x102b, 0x3b, 0x1017, 0x102f, 0x1012, 0x1039, 0x1013, 0x101f, 0x1030, 0x1038, 0x3b, 0x1000, 0x103c, 0x102c, 0x101e, 0x1015, 0x1010, 0x1031,
+0x1038, 0x3b, 0x101e, 0x1031, 0x102c, 0x1000, 0x103c, 0x102c, 0x3b, 0x1005, 0x1014, 0x1031, 0x1010, 0x3b, 0x1010, 0x3b, 0x1021, 0x3b, 0x1017, 0x3b,
+0x1000, 0x3b, 0x101e, 0x3b, 0x1005, 0x43d, 0x44f, 0x434, 0x437, 0x435, 0x43b, 0x44f, 0x3b, 0x43f, 0x430, 0x43d, 0x44f, 0x434, 0x437, 0x435,
+0x43b, 0x430, 0x43a, 0x3b, 0x430, 0x45e, 0x442, 0x43e, 0x440, 0x430, 0x43a, 0x3b, 0x441, 0x435, 0x440, 0x430, 0x434, 0x430, 0x3b, 0x447,
+0x430, 0x446, 0x432, 0x435, 0x440, 0x3b, 0x43f, 0x44f, 0x442, 0x43d, 0x456, 0x446, 0x430, 0x3b, 0x441, 0x443, 0x431, 0x43e, 0x442, 0x430,
+0x43d, 0x434, 0x3b, 0x43f, 0x43d, 0x3b, 0x430, 0x45e, 0x3b, 0x441, 0x440, 0x3b, 0x447, 0x446, 0x3b, 0x43f, 0x442, 0x3b, 0x441, 0x431,
+0x43d, 0x3b, 0x43f, 0x3b, 0x430, 0x3b, 0x441, 0x3b, 0x447, 0x3b, 0x43f, 0x3b, 0x441, 0x17a2, 0x17b6, 0x1791, 0x17b7, 0x178f, 0x17d2, 0x1799,
+0x3b, 0x1785, 0x1793, 0x17d2, 0x1791, 0x3b, 0x17a2, 0x1784, 0x17d2, 0x1782, 0x17b6, 0x179a, 0x3b, 0x1796, 0x17bb, 0x1792, 0x3b, 0x1796, 0x17d2, 0x179a,
+0x17a0, 0x179f, 0x17d2, 0x1794, 0x178f, 0x17b7, 0x17cd, 0x3b, 0x179f, 0x17bb, 0x1780, 0x17d2, 0x179a, 0x3b, 0x179f, 0x17c5, 0x179a, 0x17cd, 0x17a2, 0x17b6,
+0x1791, 0x17b7, 0x178f, 0x17d2, 0x1799, 0x3b, 0x1785, 0x17d0, 0x1793, 0x17d2, 0x1791, 0x3b, 0x17a2, 0x1784, 0x17d2, 0x1782, 0x17b6, 0x179a, 0x3b, 0x1796,
+0x17bb, 0x1792, 0x3b, 0x1796, 0x17d2, 0x179a, 0x17a0, 0x179f, 0x17d2, 0x1794, 0x178f, 0x17b7, 0x17cd, 0x3b, 0x179f, 0x17bb, 0x1780, 0x17d2, 0x179a, 0x3b,
+0x179f, 0x17c5, 0x179a, 0x17cd, 0x17a2, 0x17b6, 0x1791, 0x17b7, 0x178f, 0x17d2, 0x1799, 0x3b, 0x1785, 0x1793, 0x17d2, 0x1791, 0x3b, 0x17a2, 0x1784, 0x17d2,
+0x1782, 0x17b6, 0x179a, 0x3b, 0x1796, 0x17bb, 0x1792, 0x3b, 0x1796, 0x17d2, 0x179a, 0x17a0, 0x3b, 0x179f, 0x17bb, 0x1780, 0x17d2, 0x179a, 0x3b, 0x179f,
+0x17c5, 0x179a, 0x17cd, 0x17a2, 0x3b, 0x1785, 0x3b, 0x17a2, 0x3b, 0x1796, 0x3b, 0x1796, 0x3b, 0x179f, 0x3b, 0x179f, 0x64, 0x69, 0x75, 0x6d,
+0x65, 0x6e, 0x67, 0x65, 0x3b, 0x64, 0x69, 0x6c, 0x6c, 0x75, 0x6e, 0x73, 0x3b, 0x64, 0x69, 0x6d, 0x61, 0x72, 0x74, 0x73,
+0x3b, 0x64, 0x69, 0x6d, 0x65, 0x63, 0x72, 0x65, 0x73, 0x3b, 0x64, 0x69, 0x6a, 0x6f, 0x75, 0x73, 0x3b, 0x64, 0x69, 0x76,
+0x65, 0x6e, 0x64, 0x72, 0x65, 0x73, 0x3b, 0x64, 0x69, 0x73, 0x73, 0x61, 0x62, 0x74, 0x65, 0x64, 0x67, 0x2e, 0x3b, 0x64,
+0x6c, 0x2e, 0x3b, 0x64, 0x74, 0x2e, 0x3b, 0x64, 0x63, 0x2e, 0x3b, 0x64, 0x6a, 0x2e, 0x3b, 0x64, 0x76, 0x2e, 0x3b, 0x64,
+0x73, 0x2e, 0x64, 0x67, 0x3b, 0x64, 0x6c, 0x3b, 0x64, 0x74, 0x3b, 0x64, 0x63, 0x3b, 0x64, 0x6a, 0x3b, 0x64, 0x76, 0x3b,
+0x64, 0x73, 0x661f, 0x671f, 0x65e5, 0x3b, 0x661f, 0x671f, 0x4e00, 0x3b, 0x661f, 0x671f, 0x4e8c, 0x3b, 0x661f, 0x671f, 0x4e09, 0x3b, 0x661f, 0x671f,
+0x56db, 0x3b, 0x661f, 0x671f, 0x4e94, 0x3b, 0x661f, 0x671f, 0x516d, 0x5468, 0x65e5, 0x3b, 0x5468, 0x4e00, 0x3b, 0x5468, 0x4e8c, 0x3b, 0x5468, 0x4e09,
+0x3b, 0x5468, 0x56db, 0x3b, 0x5468, 0x4e94, 0x3b, 0x5468, 0x516d, 0x65e5, 0x3b, 0x4e00, 0x3b, 0x4e8c, 0x3b, 0x4e09, 0x3b, 0x56db, 0x3b, 0x4e94,
+0x3b, 0x516d, 0x9031, 0x65e5, 0x3b, 0x9031, 0x4e00, 0x3b, 0x9031, 0x4e8c, 0x3b, 0x9031, 0x4e09, 0x3b, 0x9031, 0x56db, 0x3b, 0x9031, 0x4e94, 0x3b,
+0x9031, 0x516d, 0x6e, 0x65, 0x64, 0x6a, 0x65, 0x6c, 0x6a, 0x61, 0x3b, 0x70, 0x6f, 0x6e, 0x65, 0x64, 0x6a, 0x65, 0x6c, 0x6a,
+0x61, 0x6b, 0x3b, 0x75, 0x74, 0x6f, 0x72, 0x61, 0x6b, 0x3b, 0x73, 0x72, 0x69, 0x6a, 0x65, 0x64, 0x61, 0x3b, 0x10d, 0x65,
+0x74, 0x76, 0x72, 0x74, 0x61, 0x6b, 0x3b, 0x70, 0x65, 0x74, 0x61, 0x6b, 0x3b, 0x73, 0x75, 0x62, 0x6f, 0x74, 0x61, 0x6e,
+0x65, 0x64, 0x3b, 0x70, 0x6f, 0x6e, 0x3b, 0x75, 0x74, 0x6f, 0x3b, 0x73, 0x72, 0x69, 0x3b, 0x10d, 0x65, 0x74, 0x3b, 0x70,
+0x65, 0x74, 0x3b, 0x73, 0x75, 0x62, 0x6e, 0x3b, 0x70, 0x3b, 0x75, 0x3b, 0x73, 0x3b, 0x10d, 0x3b, 0x70, 0x3b, 0x73, 0x4e,
+0x3b, 0x50, 0x3b, 0x55, 0x3b, 0x53, 0x3b, 0x10c, 0x3b, 0x50, 0x3b, 0x53, 0x6e, 0x65, 0x64, 0x11b, 0x6c, 0x65, 0x3b, 0x70,
+0x6f, 0x6e, 0x64, 0x11b, 0x6c, 0xed, 0x3b, 0xfa, 0x74, 0x65, 0x72, 0xfd, 0x3b, 0x73, 0x74, 0x159, 0x65, 0x64, 0x61, 0x3b,
+0x10d, 0x74, 0x76, 0x72, 0x74, 0x65, 0x6b, 0x3b, 0x70, 0xe1, 0x74, 0x65, 0x6b, 0x3b, 0x73, 0x6f, 0x62, 0x6f, 0x74, 0x61,
+0x6e, 0x65, 0x3b, 0x70, 0x6f, 0x3b, 0xfa, 0x74, 0x3b, 0x73, 0x74, 0x3b, 0x10d, 0x74, 0x3b, 0x70, 0xe1, 0x3b, 0x73, 0x6f,
+0x4e, 0x3b, 0x50, 0x3b, 0xda, 0x3b, 0x53, 0x3b, 0x10c, 0x3b, 0x50, 0x3b, 0x53, 0x73, 0xf8, 0x6e, 0x64, 0x61, 0x67, 0x3b,
+0x6d, 0x61, 0x6e, 0x64, 0x61, 0x67, 0x3b, 0x74, 0x69, 0x72, 0x73, 0x64, 0x61, 0x67, 0x3b, 0x6f, 0x6e, 0x73, 0x64, 0x61,
+0x67, 0x3b, 0x74, 0x6f, 0x72, 0x73, 0x64, 0x61, 0x67, 0x3b, 0x66, 0x72, 0x65, 0x64, 0x61, 0x67, 0x3b, 0x6c, 0xf8, 0x72,
+0x64, 0x61, 0x67, 0x73, 0xf8, 0x6e, 0x3b, 0x6d, 0x61, 0x6e, 0x3b, 0x74, 0x69, 0x72, 0x3b, 0x6f, 0x6e, 0x73, 0x3b, 0x74,
+0x6f, 0x72, 0x3b, 0x66, 0x72, 0x65, 0x3b, 0x6c, 0xf8, 0x72, 0x73, 0xf8, 0x6e, 0x2e, 0x3b, 0x6d, 0x61, 0x6e, 0x2e, 0x3b,
+0x74, 0x69, 0x72, 0x2e, 0x3b, 0x6f, 0x6e, 0x73, 0x2e, 0x3b, 0x74, 0x6f, 0x72, 0x2e, 0x3b, 0x66, 0x72, 0x65, 0x2e, 0x3b,
+0x6c, 0xf8, 0x72, 0x2e, 0x53, 0x3b, 0x4d, 0x3b, 0x54, 0x3b, 0x4f, 0x3b, 0x54, 0x3b, 0x46, 0x3b, 0x4c, 0x7a, 0x6f, 0x6e,
+0x64, 0x61, 0x67, 0x3b, 0x6d, 0x61, 0x61, 0x6e, 0x64, 0x61, 0x67, 0x3b, 0x64, 0x69, 0x6e, 0x73, 0x64, 0x61, 0x67, 0x3b,
+0x77, 0x6f, 0x65, 0x6e, 0x73, 0x64, 0x61, 0x67, 0x3b, 0x64, 0x6f, 0x6e, 0x64, 0x65, 0x72, 0x64, 0x61, 0x67, 0x3b, 0x76,
+0x72, 0x69, 0x6a, 0x64, 0x61, 0x67, 0x3b, 0x7a, 0x61, 0x74, 0x65, 0x72, 0x64, 0x61, 0x67, 0x7a, 0x6f, 0x3b, 0x6d, 0x61,
+0x3b, 0x64, 0x69, 0x3b, 0x77, 0x6f, 0x3b, 0x64, 0x6f, 0x3b, 0x76, 0x72, 0x3b, 0x7a, 0x61, 0x5a, 0x3b, 0x4d, 0x3b, 0x44,
+0x3b, 0x57, 0x3b, 0x44, 0x3b, 0x56, 0x3b, 0x5a, 0x53, 0x75, 0x2e, 0x3b, 0x4d, 0x2e, 0x3b, 0x54, 0x75, 0x2e, 0x3b, 0x57,
+0x2e, 0x3b, 0x54, 0x68, 0x2e, 0x3b, 0x46, 0x2e, 0x3b, 0x53, 0x61, 0x2e, 0x53, 0x75, 0x6e, 0x2e, 0x3b, 0x4d, 0x6f, 0x6e,
+0x2e, 0x3b, 0x54, 0x75, 0x65, 0x2e, 0x3b, 0x57, 0x65, 0x64, 0x2e, 0x3b, 0x54, 0x68, 0x75, 0x2e, 0x3b, 0x46, 0x72, 0x69,
+0x2e, 0x3b, 0x53, 0x61, 0x74, 0x2e, 0x64, 0x69, 0x6d, 0x61, 0x6e, 0x109, 0x6f, 0x3b, 0x6c, 0x75, 0x6e, 0x64, 0x6f, 0x3b,
+0x6d, 0x61, 0x72, 0x64, 0x6f, 0x3b, 0x6d, 0x65, 0x72, 0x6b, 0x72, 0x65, 0x64, 0x6f, 0x3b, 0x135, 0x61, 0x16d, 0x64, 0x6f,
+0x3b, 0x76, 0x65, 0x6e, 0x64, 0x72, 0x65, 0x64, 0x6f, 0x3b, 0x73, 0x61, 0x62, 0x61, 0x74, 0x6f, 0x64, 0x69, 0x3b, 0x6c,
+0x75, 0x3b, 0x6d, 0x61, 0x3b, 0x6d, 0x65, 0x3b, 0x135, 0x61, 0x3b, 0x76, 0x65, 0x3b, 0x73, 0x61, 0x44, 0x3b, 0x4c, 0x3b,
+0x4d, 0x3b, 0x4d, 0x3b, 0x134, 0x3b, 0x56, 0x3b, 0x53, 0x70, 0xfc, 0x68, 0x61, 0x70, 0xe4, 0x65, 0x76, 0x3b, 0x65, 0x73,
+0x6d, 0x61, 0x73, 0x70, 0xe4, 0x65, 0x76, 0x3b, 0x74, 0x65, 0x69, 0x73, 0x69, 0x70, 0xe4, 0x65, 0x76, 0x3b, 0x6b, 0x6f,
+0x6c, 0x6d, 0x61, 0x70, 0xe4, 0x65, 0x76, 0x3b, 0x6e, 0x65, 0x6c, 0x6a, 0x61, 0x70, 0xe4, 0x65, 0x76, 0x3b, 0x72, 0x65,
+0x65, 0x64, 0x65, 0x3b, 0x6c, 0x61, 0x75, 0x70, 0xe4, 0x65, 0x76, 0x50, 0x3b, 0x45, 0x3b, 0x54, 0x3b, 0x4b, 0x3b, 0x4e,
+0x3b, 0x52, 0x3b, 0x4c, 0x73, 0x75, 0x6e, 0x6e, 0x75, 0x64, 0x61, 0x67, 0x75, 0x72, 0x3b, 0x6d, 0xe1, 0x6e, 0x61, 0x64,
+0x61, 0x67, 0x75, 0x72, 0x3b, 0x74, 0xfd, 0x73, 0x64, 0x61, 0x67, 0x75, 0x72, 0x3b, 0x6d, 0x69, 0x6b, 0x75, 0x64, 0x61,
+0x67, 0x75, 0x72, 0x3b, 0x68, 0xf3, 0x73, 0x64, 0x61, 0x67, 0x75, 0x72, 0x3b, 0x66, 0x72, 0xed, 0x67, 0x67, 0x6a, 0x61,
+0x64, 0x61, 0x67, 0x75, 0x72, 0x3b, 0x6c, 0x65, 0x79, 0x67, 0x61, 0x72, 0x64, 0x61, 0x67, 0x75, 0x72, 0x73, 0x75, 0x6e,
+0x3b, 0x6d, 0xe1, 0x6e, 0x3b, 0x74, 0xfd, 0x73, 0x3b, 0x6d, 0x69, 0x6b, 0x3b, 0x68, 0xf3, 0x73, 0x3b, 0x66, 0x72, 0xed,
+0x3b, 0x6c, 0x65, 0x79, 0x73, 0x75, 0x6e, 0x2e, 0x3b, 0x6d, 0xe1, 0x6e, 0x2e, 0x3b, 0x74, 0xfd, 0x73, 0x2e, 0x3b, 0x6d,
+0x69, 0x6b, 0x2e, 0x3b, 0x68, 0xf3, 0x73, 0x2e, 0x3b, 0x66, 0x72, 0xed, 0x2e, 0x3b, 0x6c, 0x65, 0x79, 0x2e, 0x53, 0x3b,
+0x4d, 0x3b, 0x54, 0x3b, 0x4d, 0x3b, 0x48, 0x3b, 0x46, 0x3b, 0x4c, 0x73, 0x75, 0x6e, 0x6e, 0x75, 0x6e, 0x74, 0x61, 0x69,
+0x3b, 0x6d, 0x61, 0x61, 0x6e, 0x61, 0x6e, 0x74, 0x61, 0x69, 0x3b, 0x74, 0x69, 0x69, 0x73, 0x74, 0x61, 0x69, 0x3b, 0x6b,
+0x65, 0x73, 0x6b, 0x69, 0x76, 0x69, 0x69, 0x6b, 0x6b, 0x6f, 0x3b, 0x74, 0x6f, 0x72, 0x73, 0x74, 0x61, 0x69, 0x3b, 0x70,
+0x65, 0x72, 0x6a, 0x61, 0x6e, 0x74, 0x61, 0x69, 0x3b, 0x6c, 0x61, 0x75, 0x61, 0x6e, 0x74, 0x61, 0x69, 0x73, 0x75, 0x6e,
+0x6e, 0x75, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x61, 0x3b, 0x6d, 0x61, 0x61, 0x6e, 0x61, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x61,
+0x3b, 0x74, 0x69, 0x69, 0x73, 0x74, 0x61, 0x69, 0x6e, 0x61, 0x3b, 0x6b, 0x65, 0x73, 0x6b, 0x69, 0x76, 0x69, 0x69, 0x6b,
+0x6b, 0x6f, 0x6e, 0x61, 0x3b, 0x74, 0x6f, 0x72, 0x73, 0x74, 0x61, 0x69, 0x6e, 0x61, 0x3b, 0x70, 0x65, 0x72, 0x6a, 0x61,
+0x6e, 0x74, 0x61, 0x69, 0x6e, 0x61, 0x3b, 0x6c, 0x61, 0x75, 0x61, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x61, 0x73, 0x75, 0x3b,
+0x6d, 0x61, 0x3b, 0x74, 0x69, 0x3b, 0x6b, 0x65, 0x3b, 0x74, 0x6f, 0x3b, 0x70, 0x65, 0x3b, 0x6c, 0x61, 0x53, 0x3b, 0x4d,
+0x3b, 0x54, 0x3b, 0x4b, 0x3b, 0x54, 0x3b, 0x50, 0x3b, 0x4c, 0x64, 0x69, 0x6d, 0x61, 0x6e, 0x63, 0x68, 0x65, 0x3b, 0x6c,
+0x75, 0x6e, 0x64, 0x69, 0x3b, 0x6d, 0x61, 0x72, 0x64, 0x69, 0x3b, 0x6d, 0x65, 0x72, 0x63, 0x72, 0x65, 0x64, 0x69, 0x3b,
+0x6a, 0x65, 0x75, 0x64, 0x69, 0x3b, 0x76, 0x65, 0x6e, 0x64, 0x72, 0x65, 0x64, 0x69, 0x3b, 0x73, 0x61, 0x6d, 0x65, 0x64,
+0x69, 0x64, 0x69, 0x6d, 0x2e, 0x3b, 0x6c, 0x75, 0x6e, 0x2e, 0x3b, 0x6d, 0x61, 0x72, 0x2e, 0x3b, 0x6d, 0x65, 0x72, 0x2e,
+0x3b, 0x6a, 0x65, 0x75, 0x2e, 0x3b, 0x76, 0x65, 0x6e, 0x2e, 0x3b, 0x73, 0x61, 0x6d, 0x2e, 0x44, 0x3b, 0x4c, 0x3b, 0x4d,
+0x3b, 0x4d, 0x3b, 0x4a, 0x3b, 0x56, 0x3b, 0x53, 0x73, 0x6e, 0x65, 0x69, 0x6e, 0x3b, 0x6d, 0x6f, 0x61, 0x6e, 0x64, 0x65,
+0x69, 0x3b, 0x74, 0x69, 0x69, 0x73, 0x64, 0x65, 0x69, 0x3b, 0x77, 0x6f, 0x61, 0x6e, 0x73, 0x64, 0x65, 0x69, 0x3b, 0x74,
+0x6f, 0x6e, 0x67, 0x65, 0x72, 0x73, 0x64, 0x65, 0x69, 0x3b, 0x66, 0x72, 0x65, 0x65, 0x64, 0x3b, 0x73, 0x6e, 0x65, 0x6f,
+0x6e, 0x73, 0x69, 0x3b, 0x6d, 0x6f, 0x3b, 0x74, 0x69, 0x3b, 0x77, 0x6f, 0x3b, 0x74, 0x6f, 0x3b, 0x66, 0x72, 0x3b, 0x73,
+0x6f, 0x44, 0x69, 0x44, 0xf2, 0x6d, 0x68, 0x6e, 0x61, 0x69, 0x63, 0x68, 0x3b, 0x44, 0x69, 0x4c, 0x75, 0x61, 0x69, 0x6e,
+0x3b, 0x44, 0x69, 0x4d, 0xe0, 0x69, 0x72, 0x74, 0x3b, 0x44, 0x69, 0x43, 0x69, 0x61, 0x64, 0x61, 0x69, 0x6e, 0x3b, 0x44,
+0x69, 0x61, 0x72, 0x44, 0x61, 0x6f, 0x69, 0x6e, 0x3b, 0x44, 0x69, 0x68, 0x41, 0x6f, 0x69, 0x6e, 0x65, 0x3b, 0x44, 0x69,
+0x53, 0x61, 0x74, 0x68, 0x61, 0x69, 0x72, 0x6e, 0x65, 0x44, 0x69, 0x44, 0x3b, 0x44, 0x69, 0x4c, 0x3b, 0x44, 0x69, 0x4d,
+0x3b, 0x44, 0x69, 0x43, 0x3b, 0x44, 0x69, 0x61, 0x3b, 0x44, 0x69, 0x68, 0x3b, 0x44, 0x69, 0x53, 0x44, 0x3b, 0x4c, 0x3b,
+0x4d, 0x3b, 0x43, 0x3b, 0x41, 0x3b, 0x48, 0x3b, 0x53, 0x44, 0x6f, 0x6d, 0x69, 0x6e, 0x67, 0x6f, 0x3b, 0x4c, 0x75, 0x6e,
+0x73, 0x3b, 0x4d, 0x61, 0x72, 0x74, 0x65, 0x73, 0x3b, 0x4d, 0xe9, 0x72, 0x63, 0x6f, 0x72, 0x65, 0x73, 0x3b, 0x58, 0x6f,
+0x76, 0x65, 0x73, 0x3b, 0x56, 0x65, 0x6e, 0x72, 0x65, 0x73, 0x3b, 0x53, 0xe1, 0x62, 0x61, 0x64, 0x6f, 0x64, 0x6f, 0x6d,
+0x69, 0x6e, 0x67, 0x6f, 0x3b, 0x6c, 0x75, 0x6e, 0x73, 0x3b, 0x6d, 0x61, 0x72, 0x74, 0x65, 0x73, 0x3b, 0x6d, 0xe9, 0x72,
+0x63, 0x6f, 0x72, 0x65, 0x73, 0x3b, 0x78, 0x6f, 0x76, 0x65, 0x73, 0x3b, 0x76, 0x65, 0x6e, 0x72, 0x65, 0x73, 0x3b, 0x73,
+0xe1, 0x62, 0x61, 0x64, 0x6f, 0x44, 0x6f, 0x6d, 0x2e, 0x3b, 0x4c, 0x75, 0x6e, 0x73, 0x3b, 0x4d, 0x61, 0x72, 0x2e, 0x3b,
+0x4d, 0xe9, 0x72, 0x2e, 0x3b, 0x58, 0x6f, 0x76, 0x2e, 0x3b, 0x56, 0x65, 0x6e, 0x2e, 0x3b, 0x53, 0xe1, 0x62, 0x2e, 0x64,
+0x6f, 0x6d, 0x2e, 0x3b, 0x6c, 0x75, 0x6e, 0x73, 0x3b, 0x6d, 0x61, 0x72, 0x2e, 0x3b, 0x6d, 0xe9, 0x72, 0x2e, 0x3b, 0x78,
+0x6f, 0x76, 0x2e, 0x3b, 0x76, 0x65, 0x6e, 0x2e, 0x3b, 0x73, 0xe1, 0x62, 0x2e, 0x44, 0x3b, 0x4c, 0x3b, 0x4d, 0x3b, 0x4d,
+0x3b, 0x58, 0x3b, 0x56, 0x3b, 0x53, 0x64, 0x2e, 0x3b, 0x6c, 0x2e, 0x3b, 0x6d, 0x2e, 0x3b, 0x6d, 0x2e, 0x3b, 0x78, 0x2e,
+0x3b, 0x76, 0x2e, 0x3b, 0x73, 0x2e, 0x10d9, 0x10d5, 0x10d8, 0x10e0, 0x10d0, 0x3b, 0x10dd, 0x10e0, 0x10e8, 0x10d0, 0x10d1, 0x10d0, 0x10d7, 0x10d8,
+0x3b, 0x10e1, 0x10d0, 0x10db, 0x10e8, 0x10d0, 0x10d1, 0x10d0, 0x10d7, 0x10d8, 0x3b, 0x10dd, 0x10d7, 0x10ee, 0x10e8, 0x10d0, 0x10d1, 0x10d0, 0x10d7, 0x10d8,
+0x3b, 0x10ee, 0x10e3, 0x10d7, 0x10e8, 0x10d0, 0x10d1, 0x10d0, 0x10d7, 0x10d8, 0x3b, 0x10de, 0x10d0, 0x10e0, 0x10d0, 0x10e1, 0x10d9, 0x10d4, 0x10d5, 0x10d8,
+0x3b, 0x10e8, 0x10d0, 0x10d1, 0x10d0, 0x10d7, 0x10d8, 0x10d9, 0x10d5, 0x10d8, 0x3b, 0x10dd, 0x10e0, 0x10e8, 0x3b, 0x10e1, 0x10d0, 0x10db, 0x3b, 0x10dd,
+0x10d7, 0x10ee, 0x3b, 0x10ee, 0x10e3, 0x10d7, 0x3b, 0x10de, 0x10d0, 0x10e0, 0x3b, 0x10e8, 0x10d0, 0x10d1, 0x10d9, 0x3b, 0x10dd, 0x3b, 0x10e1, 0x3b,
+0x10dd, 0x3b, 0x10ee, 0x3b, 0x10de, 0x3b, 0x10e8, 0x53, 0x6f, 0x6e, 0x6e, 0x74, 0x61, 0x67, 0x3b, 0x4d, 0x6f, 0x6e, 0x74, 0x61,
+0x67, 0x3b, 0x44, 0x69, 0x65, 0x6e, 0x73, 0x74, 0x61, 0x67, 0x3b, 0x4d, 0x69, 0x74, 0x74, 0x77, 0x6f, 0x63, 0x68, 0x3b,
+0x44, 0x6f, 0x6e, 0x6e, 0x65, 0x72, 0x73, 0x74, 0x61, 0x67, 0x3b, 0x46, 0x72, 0x65, 0x69, 0x74, 0x61, 0x67, 0x3b, 0x53,
+0x61, 0x6d, 0x73, 0x74, 0x61, 0x67, 0x53, 0x6f, 0x3b, 0x4d, 0x6f, 0x3b, 0x44, 0x69, 0x3b, 0x4d, 0x69, 0x3b, 0x44, 0x6f,
+0x3b, 0x46, 0x72, 0x3b, 0x53, 0x61, 0x53, 0x6f, 0x2e, 0x3b, 0x4d, 0x6f, 0x2e, 0x3b, 0x44, 0x69, 0x2e, 0x3b, 0x4d, 0x69,
+0x2e, 0x3b, 0x44, 0x6f, 0x2e, 0x3b, 0x46, 0x72, 0x2e, 0x3b, 0x53, 0x61, 0x2e, 0x53, 0x3b, 0x4d, 0x3b, 0x44, 0x3b, 0x4d,
+0x3b, 0x44, 0x3b, 0x46, 0x3b, 0x53, 0x39a, 0x3c5, 0x3c1, 0x3b9, 0x3b1, 0x3ba, 0x3ae, 0x3b, 0x394, 0x3b5, 0x3c5, 0x3c4, 0x3ad, 0x3c1,
+0x3b1, 0x3b, 0x3a4, 0x3c1, 0x3af, 0x3c4, 0x3b7, 0x3b, 0x3a4, 0x3b5, 0x3c4, 0x3ac, 0x3c1, 0x3c4, 0x3b7, 0x3b, 0x3a0, 0x3ad, 0x3bc, 0x3c0,
+0x3c4, 0x3b7, 0x3b, 0x3a0, 0x3b1, 0x3c1, 0x3b1, 0x3c3, 0x3ba, 0x3b5, 0x3c5, 0x3ae, 0x3b, 0x3a3, 0x3ac, 0x3b2, 0x3b2, 0x3b1, 0x3c4, 0x3bf,
+0x39a, 0x3c5, 0x3c1, 0x3b, 0x394, 0x3b5, 0x3c5, 0x3b, 0x3a4, 0x3c1, 0x3af, 0x3b, 0x3a4, 0x3b5, 0x3c4, 0x3b, 0x3a0, 0x3ad, 0x3bc, 0x3b,
+0x3a0, 0x3b1, 0x3c1, 0x3b, 0x3a3, 0x3ac, 0x3b2, 0x39a, 0x3b, 0x394, 0x3b, 0x3a4, 0x3b, 0x3a4, 0x3b, 0x3a0, 0x3b, 0x3a0, 0x3b, 0x3a3,
+0x73, 0x61, 0x70, 0x61, 0x61, 0x74, 0x3b, 0x61, 0x74, 0x61, 0x61, 0x73, 0x69, 0x6e, 0x6e, 0x67, 0x6f, 0x72, 0x6e, 0x65,
+0x71, 0x3b, 0x6d, 0x61, 0x72, 0x6c, 0x75, 0x6e, 0x6e, 0x67, 0x6f, 0x72, 0x6e, 0x65, 0x71, 0x3b, 0x70, 0x69, 0x6e, 0x67,
+0x61, 0x73, 0x75, 0x6e, 0x6e, 0x67, 0x6f, 0x72, 0x6e, 0x65, 0x71, 0x3b, 0x73, 0x69, 0x73, 0x61, 0x6d, 0x61, 0x6e, 0x6e,
+0x67, 0x6f, 0x72, 0x6e, 0x65, 0x71, 0x3b, 0x74, 0x61, 0x6c, 0x6c, 0x69, 0x6d, 0x61, 0x6e, 0x6e, 0x67, 0x6f, 0x72, 0x6e,
+0x65, 0x71, 0x3b, 0x61, 0x72, 0x66, 0x69, 0x6e, 0x69, 0x6e, 0x6e, 0x67, 0x6f, 0x72, 0x6e, 0x65, 0x71, 0x73, 0x61, 0x70,
+0x3b, 0x61, 0x74, 0x61, 0x3b, 0x6d, 0x61, 0x72, 0x3b, 0x70, 0x69, 0x6e, 0x3b, 0x73, 0x69, 0x73, 0x3b, 0x74, 0x61, 0x6c,
+0x3b, 0x61, 0x72, 0x66, 0x53, 0x3b, 0x41, 0x3b, 0x4d, 0x3b, 0x50, 0x3b, 0x53, 0x3b, 0x54, 0x3b, 0x41, 0xab0, 0xab5, 0xabf,
+0xab5, 0xabe, 0xab0, 0x3b, 0xab8, 0xacb, 0xaae, 0xab5, 0xabe, 0xab0, 0x3b, 0xaae, 0xa82, 0xa97, 0xab3, 0xab5, 0xabe, 0xab0, 0x3b, 0xaac,
+0xac1, 0xaa7, 0xab5, 0xabe, 0xab0, 0x3b, 0xa97, 0xac1, 0xab0, 0xac1, 0xab5, 0xabe, 0xab0, 0x3b, 0xab6, 0xac1, 0xa95, 0xacd, 0xab0, 0xab5,
+0xabe, 0xab0, 0x3b, 0xab6, 0xaa8, 0xabf, 0xab5, 0xabe, 0xab0, 0xab0, 0xab5, 0xabf, 0x3b, 0xab8, 0xacb, 0xaae, 0x3b, 0xaae, 0xa82, 0xa97,
+0xab3, 0x3b, 0xaac, 0xac1, 0xaa7, 0x3b, 0xa97, 0xac1, 0xab0, 0xac1, 0x3b, 0xab6, 0xac1, 0xa95, 0xacd, 0xab0, 0x3b, 0xab6, 0xaa8, 0xabf,
+0xab0, 0x3b, 0xab8, 0xacb, 0x3b, 0xaae, 0xa82, 0x3b, 0xaac, 0xac1, 0x3b, 0xa97, 0xac1, 0x3b, 0xab6, 0xac1, 0x3b, 0xab6, 0x4c, 0x61,
+0x68, 0x61, 0x64, 0x69, 0x3b, 0x4c, 0x69, 0x74, 0x69, 0x6e, 0x69, 0x6e, 0x3b, 0x54, 0x61, 0x6c, 0x61, 0x74, 0x61, 0x3b,
+0x4c, 0x61, 0x72, 0x61, 0x62, 0x61, 0x3b, 0x41, 0x6c, 0x68, 0x61, 0x6d, 0x69, 0x73, 0x3b, 0x4a, 0x75, 0x6d, 0x6d, 0x61,
+0x2bc, 0x61, 0x3b, 0x41, 0x73, 0x61, 0x62, 0x61, 0x72, 0x4c, 0x61, 0x68, 0x3b, 0x4c, 0x69, 0x74, 0x3b, 0x54, 0x61, 0x6c,
+0x3b, 0x4c, 0x61, 0x72, 0x3b, 0x41, 0x6c, 0x68, 0x3b, 0x4a, 0x75, 0x6d, 0x3b, 0x41, 0x73, 0x61, 0x4c, 0x3b, 0x4c, 0x3b,
+0x54, 0x3b, 0x4c, 0x3b, 0x41, 0x3b, 0x4a, 0x3b, 0x41, 0x5d9, 0x5d5, 0x5dd, 0x20, 0x5e8, 0x5d0, 0x5e9, 0x5d5, 0x5df, 0x3b, 0x5d9,
+0x5d5, 0x5dd, 0x20, 0x5e9, 0x5e0, 0x5d9, 0x3b, 0x5d9, 0x5d5, 0x5dd, 0x20, 0x5e9, 0x5dc, 0x5d9, 0x5e9, 0x5d9, 0x3b, 0x5d9, 0x5d5, 0x5dd,
+0x20, 0x5e8, 0x5d1, 0x5d9, 0x5e2, 0x5d9, 0x3b, 0x5d9, 0x5d5, 0x5dd, 0x20, 0x5d7, 0x5de, 0x5d9, 0x5e9, 0x5d9, 0x3b, 0x5d9, 0x5d5, 0x5dd,
+0x20, 0x5e9, 0x5d9, 0x5e9, 0x5d9, 0x3b, 0x5d9, 0x5d5, 0x5dd, 0x20, 0x5e9, 0x5d1, 0x5ea, 0x5d9, 0x5d5, 0x5dd, 0x20, 0x5d0, 0x5f3, 0x3b,
+0x5d9, 0x5d5, 0x5dd, 0x20, 0x5d1, 0x5f3, 0x3b, 0x5d9, 0x5d5, 0x5dd, 0x20, 0x5d2, 0x5f3, 0x3b, 0x5d9, 0x5d5, 0x5dd, 0x20, 0x5d3, 0x5f3,
+0x3b, 0x5d9, 0x5d5, 0x5dd, 0x20, 0x5d4, 0x5f3, 0x3b, 0x5d9, 0x5d5, 0x5dd, 0x20, 0x5d5, 0x5f3, 0x3b, 0x5e9, 0x5d1, 0x5ea, 0x5d0, 0x5f3,
+0x3b, 0x5d1, 0x5f3, 0x3b, 0x5d2, 0x5f3, 0x3b, 0x5d3, 0x5f3, 0x3b, 0x5d4, 0x5f3, 0x3b, 0x5d5, 0x5f3, 0x3b, 0x5e9, 0x5f3, 0x930, 0x935,
+0x93f, 0x935, 0x93e, 0x930, 0x3b, 0x938, 0x94b, 0x92e, 0x935, 0x93e, 0x930, 0x3b, 0x92e, 0x902, 0x917, 0x932, 0x935, 0x93e, 0x930, 0x3b,
+0x92c, 0x941, 0x927, 0x935, 0x93e, 0x930, 0x3b, 0x917, 0x941, 0x930, 0x941, 0x935, 0x93e, 0x930, 0x3b, 0x936, 0x941, 0x915, 0x94d, 0x930,
+0x935, 0x93e, 0x930, 0x3b, 0x936, 0x928, 0x93f, 0x935, 0x93e, 0x930, 0x930, 0x935, 0x93f, 0x3b, 0x938, 0x94b, 0x92e, 0x3b, 0x92e, 0x902,
+0x917, 0x932, 0x3b, 0x92c, 0x941, 0x927, 0x3b, 0x917, 0x941, 0x930, 0x941, 0x3b, 0x936, 0x941, 0x915, 0x94d, 0x930, 0x3b, 0x936, 0x928,
+0x93f, 0x930, 0x3b, 0x938, 0x94b, 0x3b, 0x92e, 0x902, 0x3b, 0x92c, 0x941, 0x3b, 0x917, 0x941, 0x3b, 0x936, 0x941, 0x3b, 0x936, 0x76,
+0x61, 0x73, 0xe1, 0x72, 0x6e, 0x61, 0x70, 0x3b, 0x68, 0xe9, 0x74, 0x66, 0x151, 0x3b, 0x6b, 0x65, 0x64, 0x64, 0x3b, 0x73,
+0x7a, 0x65, 0x72, 0x64, 0x61, 0x3b, 0x63, 0x73, 0xfc, 0x74, 0xf6, 0x72, 0x74, 0xf6, 0x6b, 0x3b, 0x70, 0xe9, 0x6e, 0x74,
+0x65, 0x6b, 0x3b, 0x73, 0x7a, 0x6f, 0x6d, 0x62, 0x61, 0x74, 0x56, 0x3b, 0x48, 0x3b, 0x4b, 0x3b, 0x53, 0x7a, 0x65, 0x3b,
+0x43, 0x73, 0x3b, 0x50, 0x3b, 0x53, 0x7a, 0x6f, 0x56, 0x3b, 0x48, 0x3b, 0x4b, 0x3b, 0x53, 0x7a, 0x3b, 0x43, 0x73, 0x3b,
+0x50, 0x3b, 0x53, 0x7a, 0x73, 0x75, 0x6e, 0x6e, 0x75, 0x64, 0x61, 0x67, 0x75, 0x72, 0x3b, 0x6d, 0xe1, 0x6e, 0x75, 0x64,
+0x61, 0x67, 0x75, 0x72, 0x3b, 0xfe, 0x72, 0x69, 0xf0, 0x6a, 0x75, 0x64, 0x61, 0x67, 0x75, 0x72, 0x3b, 0x6d, 0x69, 0xf0,
+0x76, 0x69, 0x6b, 0x75, 0x64, 0x61, 0x67, 0x75, 0x72, 0x3b, 0x66, 0x69, 0x6d, 0x6d, 0x74, 0x75, 0x64, 0x61, 0x67, 0x75,
+0x72, 0x3b, 0x66, 0xf6, 0x73, 0x74, 0x75, 0x64, 0x61, 0x67, 0x75, 0x72, 0x3b, 0x6c, 0x61, 0x75, 0x67, 0x61, 0x72, 0x64,
+0x61, 0x67, 0x75, 0x72, 0x73, 0x75, 0x6e, 0x2e, 0x3b, 0x6d, 0xe1, 0x6e, 0x2e, 0x3b, 0xfe, 0x72, 0x69, 0x2e, 0x3b, 0x6d,
+0x69, 0xf0, 0x2e, 0x3b, 0x66, 0x69, 0x6d, 0x2e, 0x3b, 0x66, 0xf6, 0x73, 0x2e, 0x3b, 0x6c, 0x61, 0x75, 0x2e, 0x53, 0x3b,
+0x4d, 0x3b, 0xde, 0x3b, 0x4d, 0x3b, 0x46, 0x3b, 0x46, 0x3b, 0x4c, 0x4d, 0x69, 0x6e, 0x67, 0x67, 0x75, 0x3b, 0x53, 0x65,
+0x6e, 0x69, 0x6e, 0x3b, 0x53, 0x65, 0x6c, 0x61, 0x73, 0x61, 0x3b, 0x52, 0x61, 0x62, 0x75, 0x3b, 0x4b, 0x61, 0x6d, 0x69,
+0x73, 0x3b, 0x4a, 0x75, 0x6d, 0x61, 0x74, 0x3b, 0x53, 0x61, 0x62, 0x74, 0x75, 0x4d, 0x69, 0x6e, 0x3b, 0x53, 0x65, 0x6e,
+0x3b, 0x53, 0x65, 0x6c, 0x3b, 0x52, 0x61, 0x62, 0x3b, 0x4b, 0x61, 0x6d, 0x3b, 0x4a, 0x75, 0x6d, 0x3b, 0x53, 0x61, 0x62,
+0x4d, 0x3b, 0x53, 0x3b, 0x53, 0x3b, 0x52, 0x3b, 0x4b, 0x3b, 0x4a, 0x3b, 0x53, 0x64, 0x6f, 0x6d, 0x69, 0x6e, 0x69, 0x63,
+0x61, 0x3b, 0x6c, 0x75, 0x6e, 0x65, 0x64, 0x69, 0x3b, 0x6d, 0x61, 0x72, 0x74, 0x65, 0x64, 0x69, 0x3b, 0x6d, 0x65, 0x72,
+0x63, 0x75, 0x72, 0x69, 0x64, 0x69, 0x3b, 0x6a, 0x6f, 0x76, 0x65, 0x64, 0x69, 0x3b, 0x76, 0x65, 0x6e, 0x65, 0x72, 0x64,
+0x69, 0x3b, 0x73, 0x61, 0x62, 0x62, 0x61, 0x74, 0x6f, 0x64, 0x6f, 0x6d, 0x3b, 0x6c, 0x75, 0x6e, 0x3b, 0x6d, 0x61, 0x72,
+0x3b, 0x6d, 0x65, 0x72, 0x3b, 0x6a, 0x6f, 0x76, 0x3b, 0x76, 0x65, 0x6e, 0x3b, 0x73, 0x61, 0x62, 0x64, 0x3b, 0x6c, 0x3b,
+0x6d, 0x3b, 0x6d, 0x3b, 0x6a, 0x3b, 0x76, 0x3b, 0x73, 0x44, 0xe9, 0x20, 0x44, 0x6f, 0x6d, 0x68, 0x6e, 0x61, 0x69, 0x67,
+0x68, 0x3b, 0x44, 0xe9, 0x20, 0x4c, 0x75, 0x61, 0x69, 0x6e, 0x3b, 0x44, 0xe9, 0x20, 0x4d, 0xe1, 0x69, 0x72, 0x74, 0x3b,
+0x44, 0xe9, 0x20, 0x43, 0xe9, 0x61, 0x64, 0x61, 0x6f, 0x69, 0x6e, 0x3b, 0x44, 0xe9, 0x61, 0x72, 0x64, 0x61, 0x6f, 0x69,
+0x6e, 0x3b, 0x44, 0xe9, 0x20, 0x68, 0x41, 0x6f, 0x69, 0x6e, 0x65, 0x3b, 0x44, 0xe9, 0x20, 0x53, 0x61, 0x74, 0x68, 0x61,
+0x69, 0x72, 0x6e, 0x44, 0x6f, 0x6d, 0x68, 0x3b, 0x4c, 0x75, 0x61, 0x6e, 0x3b, 0x4d, 0xe1, 0x69, 0x72, 0x74, 0x3b, 0x43,
+0xe9, 0x61, 0x64, 0x3b, 0x44, 0xe9, 0x61, 0x72, 0x3b, 0x41, 0x6f, 0x69, 0x6e, 0x65, 0x3b, 0x53, 0x61, 0x74, 0x68, 0x44,
+0x3b, 0x4c, 0x3b, 0x4d, 0x3b, 0x43, 0x3b, 0x44, 0x3b, 0x41, 0x3b, 0x53, 0x64, 0x6f, 0x6d, 0x65, 0x6e, 0x69, 0x63, 0x61,
+0x3b, 0x6c, 0x75, 0x6e, 0x65, 0x64, 0xec, 0x3b, 0x6d, 0x61, 0x72, 0x74, 0x65, 0x64, 0xec, 0x3b, 0x6d, 0x65, 0x72, 0x63,
+0x6f, 0x6c, 0x65, 0x64, 0xec, 0x3b, 0x67, 0x69, 0x6f, 0x76, 0x65, 0x64, 0xec, 0x3b, 0x76, 0x65, 0x6e, 0x65, 0x72, 0x64,
+0xec, 0x3b, 0x73, 0x61, 0x62, 0x61, 0x74, 0x6f, 0x64, 0x6f, 0x6d, 0x3b, 0x6c, 0x75, 0x6e, 0x3b, 0x6d, 0x61, 0x72, 0x3b,
+0x6d, 0x65, 0x72, 0x3b, 0x67, 0x69, 0x6f, 0x3b, 0x76, 0x65, 0x6e, 0x3b, 0x73, 0x61, 0x62, 0x44, 0x3b, 0x4c, 0x3b, 0x4d,
+0x3b, 0x4d, 0x3b, 0x47, 0x3b, 0x56, 0x3b, 0x53, 0x65e5, 0x66dc, 0x65e5, 0x3b, 0x6708, 0x66dc, 0x65e5, 0x3b, 0x706b, 0x66dc, 0x65e5, 0x3b,
+0x6c34, 0x66dc, 0x65e5, 0x3b, 0x6728, 0x66dc, 0x65e5, 0x3b, 0x91d1, 0x66dc, 0x65e5, 0x3b, 0x571f, 0x66dc, 0x65e5, 0x65e5, 0x3b, 0x6708, 0x3b, 0x706b,
+0x3b, 0x6c34, 0x3b, 0x6728, 0x3b, 0x91d1, 0x3b, 0x571f, 0x41, 0x68, 0x61, 0x64, 0x3b, 0x53, 0x65, 0x6e, 0x69, 0x6e, 0x3b, 0x53,
+0x65, 0x6c, 0x61, 0x73, 0x61, 0x3b, 0x52, 0x61, 0x62, 0x75, 0x3b, 0x4b, 0x61, 0x6d, 0x69, 0x73, 0x3b, 0x4a, 0x75, 0x6d,
+0x61, 0x74, 0x3b, 0x53, 0x61, 0x62, 0x74, 0x75, 0x41, 0x68, 0x61, 0x64, 0x3b, 0x53, 0x65, 0x6e, 0x3b, 0x53, 0x65, 0x6c,
+0x3b, 0x52, 0x61, 0x62, 0x3b, 0x4b, 0x61, 0x6d, 0x3b, 0x4a, 0x75, 0x6d, 0x3b, 0x53, 0x61, 0x62, 0x41, 0x3b, 0x53, 0x3b,
+0x53, 0x3b, 0x52, 0x3b, 0x4b, 0x3b, 0x4a, 0x3b, 0x53, 0xcad, 0xcbe, 0xca8, 0xcc1, 0xcb5, 0xcbe, 0xcb0, 0x3b, 0xcb8, 0xccb, 0xcae,
+0xcb5, 0xcbe, 0xcb0, 0x3b, 0xcae, 0xc82, 0xc97, 0xcb3, 0xcb5, 0xcbe, 0xcb0, 0x3b, 0xcac, 0xcc1, 0xca7, 0xcb5, 0xcbe, 0xcb0, 0x3b, 0xc97,
+0xcc1, 0xcb0, 0xcc1, 0xcb5, 0xcbe, 0xcb0, 0x3b, 0xcb6, 0xcc1, 0xc95, 0xccd, 0xcb0, 0xcb5, 0xcbe, 0xcb0, 0x3b, 0xcb6, 0xca8, 0xcbf, 0xcb5,
+0xcbe, 0xcb0, 0xcad, 0xcbe, 0xca8, 0xcc1, 0x3b, 0xcb8, 0xccb, 0xcae, 0x3b, 0xcae, 0xc82, 0xc97, 0xcb3, 0x3b, 0xcac, 0xcc1, 0xca7, 0x3b,
+0xc97, 0xcc1, 0xcb0, 0xcc1, 0x3b, 0xcb6, 0xcc1, 0xc95, 0xccd, 0xcb0, 0x3b, 0xcb6, 0xca8, 0xcbf, 0xcad, 0xcbe, 0x3b, 0xcb8, 0xccb, 0x3b,
+0xcae, 0xc82, 0x3b, 0xcac, 0xcc1, 0x3b, 0xc97, 0xcc1, 0x3b, 0xcb6, 0xcc1, 0x3b, 0xcb6, 0x627, 0x64e, 0x62a, 0x6be, 0x648, 0x627, 0x631,
+0x3b, 0x698, 0x654, 0x646, 0x62f, 0x631, 0x655, 0x631, 0x648, 0x627, 0x631, 0x3b, 0x628, 0x6c6, 0x645, 0x648, 0x627, 0x631, 0x3b, 0x628,
+0x648, 0x62f, 0x648, 0x627, 0x631, 0x3b, 0x628, 0x631, 0x620, 0x633, 0x648, 0x627, 0x631, 0x3b, 0x62c, 0x64f, 0x645, 0x6c1, 0x3b, 0x628,
+0x679, 0x648, 0x627, 0x631, 0x622, 0x62a, 0x6be, 0x648, 0x627, 0x631, 0x3b, 0x698, 0x654, 0x646, 0x62f, 0x655, 0x631, 0x648, 0x627, 0x631,
+0x3b, 0x628, 0x6c6, 0x645, 0x648, 0x627, 0x631, 0x3b, 0x628, 0x648, 0x62f, 0x648, 0x627, 0x631, 0x3b, 0x628, 0x631, 0x620, 0x633, 0x648,
+0x627, 0x631, 0x3b, 0x62c, 0x64f, 0x645, 0x6c1, 0x3b, 0x628, 0x679, 0x648, 0x627, 0x631, 0x627, 0x3b, 0x698, 0x3b, 0x628, 0x3b, 0x628,
+0x3b, 0x628, 0x3b, 0x62c, 0x3b, 0x628, 0x436, 0x435, 0x43a, 0x441, 0x435, 0x43d, 0x431, 0x456, 0x3b, 0x434, 0x4af, 0x439, 0x441, 0x435,
+0x43d, 0x431, 0x456, 0x3b, 0x441, 0x435, 0x439, 0x441, 0x435, 0x43d, 0x431, 0x456, 0x3b, 0x441, 0x4d9, 0x440, 0x441, 0x435, 0x43d, 0x431,
+0x456, 0x3b, 0x431, 0x435, 0x439, 0x441, 0x435, 0x43d, 0x431, 0x456, 0x3b, 0x436, 0x4b1, 0x43c, 0x430, 0x3b, 0x441, 0x435, 0x43d, 0x431,
+0x456, 0x436, 0x441, 0x3b, 0x434, 0x441, 0x3b, 0x441, 0x441, 0x3b, 0x441, 0x440, 0x3b, 0x431, 0x441, 0x3b, 0x436, 0x43c, 0x3b, 0x441,
+0x431, 0x416, 0x3b, 0x414, 0x3b, 0x421, 0x3b, 0x421, 0x3b, 0x411, 0x3b, 0x416, 0x3b, 0x421, 0x4b, 0x75, 0x20, 0x63, 0x79, 0x75,
+0x6d, 0x77, 0x65, 0x72, 0x75, 0x3b, 0x4b, 0x75, 0x77, 0x61, 0x20, 0x6d, 0x62, 0x65, 0x72, 0x65, 0x3b, 0x4b, 0x75, 0x77,
+0x61, 0x20, 0x6b, 0x61, 0x62, 0x69, 0x72, 0x69, 0x3b, 0x4b, 0x75, 0x77, 0x61, 0x20, 0x67, 0x61, 0x74, 0x61, 0x74, 0x75,
+0x3b, 0x4b, 0x75, 0x77, 0x61, 0x20, 0x6b, 0x61, 0x6e, 0x65, 0x3b, 0x4b, 0x75, 0x77, 0x61, 0x20, 0x67, 0x61, 0x74, 0x61,
+0x6e, 0x75, 0x3b, 0x4b, 0x75, 0x77, 0x61, 0x20, 0x67, 0x61, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x74, 0x75, 0x63, 0x79, 0x75,
+0x2e, 0x3b, 0x6d, 0x62, 0x65, 0x2e, 0x3b, 0x6b, 0x61, 0x62, 0x2e, 0x3b, 0x67, 0x74, 0x75, 0x2e, 0x3b, 0x6b, 0x61, 0x6e,
+0x2e, 0x3b, 0x67, 0x6e, 0x75, 0x2e, 0x3b, 0x67, 0x6e, 0x64, 0x2e, 0x436, 0x435, 0x43a, 0x448, 0x435, 0x43c, 0x431, 0x438, 0x3b,
+0x434, 0x4af, 0x439, 0x448, 0x4e9, 0x43c, 0x431, 0x4af, 0x3b, 0x448, 0x435, 0x439, 0x448, 0x435, 0x43c, 0x431, 0x438, 0x3b, 0x448, 0x430,
+0x440, 0x448, 0x435, 0x43c, 0x431, 0x438, 0x3b, 0x431, 0x435, 0x439, 0x448, 0x435, 0x43c, 0x431, 0x438, 0x3b, 0x436, 0x443, 0x43c, 0x430,
+0x3b, 0x438, 0x448, 0x435, 0x43c, 0x431, 0x438, 0x436, 0x435, 0x43a, 0x2e, 0x3b, 0x434, 0x4af, 0x439, 0x2e, 0x3b, 0x448, 0x435, 0x439,
+0x448, 0x2e, 0x3b, 0x448, 0x430, 0x440, 0x448, 0x2e, 0x3b, 0x431, 0x435, 0x439, 0x448, 0x2e, 0x3b, 0x436, 0x443, 0x43c, 0x430, 0x3b,
+0x438, 0x448, 0x43c, 0x2e, 0x416, 0x3b, 0x414, 0x3b, 0x428, 0x3b, 0x428, 0x3b, 0x411, 0x3b, 0x416, 0x3b, 0x418, 0xc77c, 0xc694, 0xc77c,
 0x3b, 0xc6d4, 0xc694, 0xc77c, 0x3b, 0xd654, 0xc694, 0xc77c, 0x3b, 0xc218, 0xc694, 0xc77c, 0x3b, 0xbaa9, 0xc694, 0xc77c, 0x3b, 0xae08, 0xc694, 0xc77c,
-0x3b, 0xd1a0, 0xc694, 0xc77c, 0x3b, 0x79, 0x15f, 0x3b, 0x64, 0x15f, 0x3b, 0x73, 0x15f, 0x3b, 0xe7, 0x15f, 0x3b, 0x70, 0x15f, 0x3b,
-0xee, 0x6e, 0x3b, 0x15f, 0x3b, 0x79, 0x65, 0x6b, 0x15f, 0x65, 0x6d, 0x3b, 0x64, 0x75, 0x15f, 0x65, 0x6d, 0x3b, 0x73, 0xea,
-0x15f, 0x65, 0x6d, 0x3b, 0xe7, 0x61, 0x72, 0x15f, 0x65, 0x6d, 0x3b, 0x70, 0xea, 0x6e, 0x63, 0x15f, 0x65, 0x6d, 0x3b, 0xee,
-0x6e, 0x3b, 0x15f, 0x65, 0x6d, 0xee, 0x3b, 0x59, 0x3b, 0x44, 0x3b, 0x53, 0x3b, 0xc7, 0x3b, 0x50, 0x3b, 0xce, 0x3b, 0x15e,
-0x3b, 0x63, 0x75, 0x2e, 0x3b, 0x6d, 0x62, 0x65, 0x2e, 0x3b, 0x6b, 0x61, 0x62, 0x2e, 0x3b, 0x67, 0x74, 0x75, 0x2e, 0x3b,
-0x6b, 0x61, 0x6e, 0x2e, 0x3b, 0x67, 0x6e, 0x75, 0x2e, 0x3b, 0x67, 0x6e, 0x64, 0x2e, 0x3b, 0x4b, 0x75, 0x20, 0x77, 0x2019,
-0x69, 0x6e, 0x64, 0x77, 0x69, 0x3b, 0x4b, 0x75, 0x20, 0x77, 0x61, 0x20, 0x6d, 0x62, 0x65, 0x72, 0x65, 0x3b, 0x4b, 0x75,
-0x20, 0x77, 0x61, 0x20, 0x6b, 0x61, 0x62, 0x69, 0x72, 0x69, 0x3b, 0x4b, 0x75, 0x20, 0x77, 0x61, 0x20, 0x67, 0x61, 0x74,
-0x61, 0x74, 0x75, 0x3b, 0x4b, 0x75, 0x20, 0x77, 0x61, 0x20, 0x6b, 0x61, 0x6e, 0x65, 0x3b, 0x4b, 0x75, 0x20, 0x77, 0x61,
-0x20, 0x67, 0x61, 0x74, 0x61, 0x6e, 0x75, 0x3b, 0x4b, 0x75, 0x20, 0x77, 0x61, 0x20, 0x67, 0x61, 0x74, 0x61, 0x6e, 0x64,
-0x61, 0x74, 0x75, 0x3b, 0xead, 0xeb2, 0xe97, 0xeb4, 0xe94, 0x3b, 0xe88, 0xeb1, 0xe99, 0x3b, 0xead, 0xeb1, 0xe87, 0xe84, 0xeb2, 0xe99,
-0x3b, 0xe9e, 0xeb8, 0xe94, 0x3b, 0xe9e, 0xeb0, 0xeab, 0xeb1, 0xe94, 0x3b, 0xeaa, 0xeb8, 0xe81, 0x3b, 0xec0, 0xeaa, 0xebb, 0xeb2, 0x3b,
-0xea7, 0xeb1, 0xe99, 0xead, 0xeb2, 0xe97, 0xeb4, 0xe94, 0x3b, 0xea7, 0xeb1, 0xe99, 0xe88, 0xeb1, 0xe99, 0x3b, 0xea7, 0xeb1, 0xe99, 0xead,
-0xeb1, 0xe87, 0xe84, 0xeb2, 0xe99, 0x3b, 0xea7, 0xeb1, 0xe99, 0xe9e, 0xeb8, 0xe94, 0x3b, 0xea7, 0xeb1, 0xe99, 0xe9e, 0xeb0, 0xeab, 0xeb1,
-0xe94, 0x3b, 0xea7, 0xeb1, 0xe99, 0xeaa, 0xeb8, 0xe81, 0x3b, 0xea7, 0xeb1, 0xe99, 0xec0, 0xeaa, 0xebb, 0xeb2, 0x3b, 0xead, 0xeb2, 0x3b,
-0xe88, 0x3b, 0xead, 0x3b, 0xe9e, 0x3b, 0xe9e, 0xeab, 0x3b, 0xeaa, 0xeb8, 0x3b, 0xeaa, 0x3b, 0x53, 0x76, 0x113, 0x74, 0x64, 0x2e,
-0x3b, 0x50, 0x69, 0x72, 0x6d, 0x64, 0x2e, 0x3b, 0x4f, 0x74, 0x72, 0x64, 0x2e, 0x3b, 0x54, 0x72, 0x65, 0x161, 0x64, 0x2e,
-0x3b, 0x43, 0x65, 0x74, 0x75, 0x72, 0x74, 0x64, 0x2e, 0x3b, 0x50, 0x69, 0x65, 0x6b, 0x74, 0x64, 0x2e, 0x3b, 0x53, 0x65,
-0x73, 0x74, 0x64, 0x2e, 0x3b, 0x53, 0x76, 0x113, 0x74, 0x64, 0x69, 0x65, 0x6e, 0x61, 0x3b, 0x50, 0x69, 0x72, 0x6d, 0x64,
-0x69, 0x65, 0x6e, 0x61, 0x3b, 0x4f, 0x74, 0x72, 0x64, 0x69, 0x65, 0x6e, 0x61, 0x3b, 0x54, 0x72, 0x65, 0x161, 0x64, 0x69,
-0x65, 0x6e, 0x61, 0x3b, 0x43, 0x65, 0x74, 0x75, 0x72, 0x74, 0x64, 0x69, 0x65, 0x6e, 0x61, 0x3b, 0x50, 0x69, 0x65, 0x6b,
-0x74, 0x64, 0x69, 0x65, 0x6e, 0x61, 0x3b, 0x53, 0x65, 0x73, 0x74, 0x64, 0x69, 0x65, 0x6e, 0x61, 0x3b, 0x53, 0x3b, 0x50,
-0x3b, 0x4f, 0x3b, 0x54, 0x3b, 0x43, 0x3b, 0x50, 0x3b, 0x53, 0x3b, 0x73, 0x76, 0x113, 0x74, 0x64, 0x2e, 0x3b, 0x70, 0x69,
-0x72, 0x6d, 0x64, 0x2e, 0x3b, 0x6f, 0x74, 0x72, 0x64, 0x2e, 0x3b, 0x74, 0x72, 0x65, 0x161, 0x64, 0x2e, 0x3b, 0x63, 0x65,
-0x74, 0x75, 0x72, 0x74, 0x64, 0x2e, 0x3b, 0x70, 0x69, 0x65, 0x6b, 0x74, 0x64, 0x2e, 0x3b, 0x73, 0x65, 0x73, 0x74, 0x64,
-0x2e, 0x3b, 0x73, 0x76, 0x113, 0x74, 0x64, 0x69, 0x65, 0x6e, 0x61, 0x3b, 0x70, 0x69, 0x72, 0x6d, 0x64, 0x69, 0x65, 0x6e,
-0x61, 0x3b, 0x6f, 0x74, 0x72, 0x64, 0x69, 0x65, 0x6e, 0x61, 0x3b, 0x74, 0x72, 0x65, 0x161, 0x64, 0x69, 0x65, 0x6e, 0x61,
-0x3b, 0x63, 0x65, 0x74, 0x75, 0x72, 0x74, 0x64, 0x69, 0x65, 0x6e, 0x61, 0x3b, 0x70, 0x69, 0x65, 0x6b, 0x74, 0x64, 0x69,
-0x65, 0x6e, 0x61, 0x3b, 0x73, 0x65, 0x73, 0x74, 0x64, 0x69, 0x65, 0x6e, 0x61, 0x3b, 0x65, 0x79, 0x65, 0x3b, 0x79, 0x62,
-0x6f, 0x3b, 0x6d, 0x62, 0x6c, 0x3b, 0x6d, 0x73, 0x74, 0x3b, 0x6d, 0x69, 0x6e, 0x3b, 0x6d, 0x74, 0x6e, 0x3b, 0x6d, 0x70,
-0x73, 0x3b, 0x65, 0x79, 0x65, 0x6e, 0x67, 0x61, 0x3b, 0x6d, 0x6f, 0x6b, 0x254, 0x6c, 0x254, 0x20, 0x6d, 0x77, 0x61, 0x20,
-0x79, 0x61, 0x6d, 0x62, 0x6f, 0x3b, 0x6d, 0x6f, 0x6b, 0x254, 0x6c, 0x254, 0x20, 0x6d, 0x77, 0x61, 0x20, 0x6d, 0xed, 0x62,
-0x61, 0x6c, 0xe9, 0x3b, 0x6d, 0x6f, 0x6b, 0x254, 0x6c, 0x254, 0x20, 0x6d, 0x77, 0x61, 0x20, 0x6d, 0xed, 0x73, 0xe1, 0x74,
-0x6f, 0x3b, 0x6d, 0x6f, 0x6b, 0x254, 0x6c, 0x254, 0x20, 0x79, 0x61, 0x20, 0x6d, 0xed, 0x6e, 0xe9, 0x69, 0x3b, 0x6d, 0x6f,
-0x6b, 0x254, 0x6c, 0x254, 0x20, 0x79, 0x61, 0x20, 0x6d, 0xed, 0x74, 0xe1, 0x6e, 0x6f, 0x3b, 0x6d, 0x70, 0x254, 0x301, 0x73,
-0x254, 0x3b, 0x65, 0x3b, 0x79, 0x3b, 0x6d, 0x3b, 0x6d, 0x3b, 0x6d, 0x3b, 0x6d, 0x3b, 0x70, 0x3b, 0x73, 0x6b, 0x3b, 0x70,
-0x72, 0x3b, 0x61, 0x6e, 0x3b, 0x74, 0x72, 0x3b, 0x6b, 0x74, 0x3b, 0x70, 0x6e, 0x3b, 0x161, 0x74, 0x3b, 0x73, 0x65, 0x6b,
-0x6d, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x69, 0x73, 0x3b, 0x70, 0x69, 0x72, 0x6d, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x69, 0x73,
-0x3b, 0x61, 0x6e, 0x74, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x69, 0x73, 0x3b, 0x74, 0x72, 0x65, 0x10d, 0x69, 0x61, 0x64,
-0x69, 0x65, 0x6e, 0x69, 0x73, 0x3b, 0x6b, 0x65, 0x74, 0x76, 0x69, 0x72, 0x74, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x69, 0x73,
-0x3b, 0x70, 0x65, 0x6e, 0x6b, 0x74, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x69, 0x73, 0x3b, 0x161, 0x65, 0x161, 0x74, 0x61, 0x64,
-0x69, 0x65, 0x6e, 0x69, 0x73, 0x3b, 0x53, 0x3b, 0x50, 0x3b, 0x41, 0x3b, 0x54, 0x3b, 0x4b, 0x3b, 0x50, 0x3b, 0x160, 0x3b,
-0x43d, 0x435, 0x434, 0x2e, 0x3b, 0x43f, 0x43e, 0x43d, 0x2e, 0x3b, 0x432, 0x442, 0x43e, 0x2e, 0x3b, 0x441, 0x440, 0x435, 0x2e, 0x3b,
-0x447, 0x435, 0x442, 0x2e, 0x3b, 0x43f, 0x435, 0x442, 0x2e, 0x3b, 0x441, 0x430, 0x431, 0x2e, 0x3b, 0x43d, 0x435, 0x434, 0x435, 0x43b,
-0x430, 0x3b, 0x43f, 0x43e, 0x43d, 0x435, 0x434, 0x435, 0x43b, 0x43d, 0x438, 0x43a, 0x3b, 0x432, 0x442, 0x43e, 0x440, 0x43d, 0x438, 0x43a,
-0x3b, 0x441, 0x440, 0x435, 0x434, 0x430, 0x3b, 0x447, 0x435, 0x442, 0x432, 0x440, 0x442, 0x43e, 0x43a, 0x3b, 0x43f, 0x435, 0x442, 0x43e,
-0x43a, 0x3b, 0x441, 0x430, 0x431, 0x43e, 0x442, 0x430, 0x3b, 0x43d, 0x435, 0x434, 0x2e, 0x3b, 0x43f, 0x43e, 0x43d, 0x2e, 0x3b, 0x432,
-0x442, 0x2e, 0x3b, 0x441, 0x440, 0x435, 0x2e, 0x3b, 0x447, 0x435, 0x442, 0x2e, 0x3b, 0x43f, 0x435, 0x442, 0x2e, 0x3b, 0x441, 0x430,
-0x431, 0x2e, 0x3b, 0x41, 0x6c, 0x61, 0x68, 0x3b, 0x41, 0x6c, 0x61, 0x74, 0x73, 0x3b, 0x54, 0x61, 0x6c, 0x3b, 0x41, 0x6c,
-0x61, 0x72, 0x3b, 0x41, 0x6c, 0x61, 0x6b, 0x3b, 0x5a, 0x6f, 0x6d, 0x3b, 0x41, 0x73, 0x61, 0x62, 0x3b, 0x41, 0x6c, 0x61,
-0x68, 0x61, 0x64, 0x79, 0x3b, 0x41, 0x6c, 0x61, 0x74, 0x73, 0x69, 0x6e, 0x61, 0x69, 0x6e, 0x79, 0x3b, 0x54, 0x61, 0x6c,
-0x61, 0x74, 0x61, 0x3b, 0x41, 0x6c, 0x61, 0x72, 0x6f, 0x62, 0x69, 0x61, 0x3b, 0x41, 0x6c, 0x61, 0x6b, 0x61, 0x6d, 0x69,
-0x73, 0x79, 0x3b, 0x5a, 0x6f, 0x6d, 0x61, 0x3b, 0x41, 0x73, 0x61, 0x62, 0x6f, 0x74, 0x73, 0x79, 0x3b, 0x41, 0x3b, 0x41,
-0x3b, 0x54, 0x3b, 0x41, 0x3b, 0x41, 0x3b, 0x5a, 0x3b, 0x41, 0x3b, 0x41, 0x68, 0x64, 0x3b, 0x49, 0x73, 0x6e, 0x3b, 0x53,
-0x65, 0x6c, 0x3b, 0x52, 0x61, 0x62, 0x3b, 0x4b, 0x68, 0x61, 0x3b, 0x4a, 0x75, 0x6d, 0x3b, 0x53, 0x61, 0x62, 0x3b, 0x41,
-0x68, 0x61, 0x64, 0x3b, 0x49, 0x73, 0x6e, 0x69, 0x6e, 0x3b, 0x53, 0x65, 0x6c, 0x61, 0x73, 0x61, 0x3b, 0x52, 0x61, 0x62,
-0x75, 0x3b, 0x4b, 0x68, 0x61, 0x6d, 0x69, 0x73, 0x3b, 0x4a, 0x75, 0x6d, 0x61, 0x61, 0x74, 0x3b, 0x53, 0x61, 0x62, 0x74,
-0x75, 0x3b, 0x41, 0x3b, 0x49, 0x3b, 0x53, 0x3b, 0x52, 0x3b, 0x4b, 0x3b, 0x4a, 0x3b, 0x53, 0x3b, 0xd1e, 0xd3e, 0xd2f, 0xd7c,
-0x3b, 0xd24, 0xd3f, 0xd19, 0xd4d, 0xd15, 0xd7e, 0x3b, 0xd1a, 0xd4a, 0xd35, 0xd4d, 0xd35, 0x3b, 0xd2c, 0xd41, 0xd27, 0xd7b, 0x3b, 0xd35,
-0xd4d, 0xd2f, 0xd3e, 0xd34, 0xd02, 0x3b, 0xd35, 0xd46, 0xd33, 0xd4d, 0xd33, 0xd3f, 0x3b, 0xd36, 0xd28, 0xd3f, 0x3b, 0xd1e, 0xd3e, 0xd2f,
-0xd31, 0xd3e, 0xd34, 0xd4d, 0x200c, 0xd1a, 0x3b, 0xd24, 0xd3f, 0xd19, 0xd4d, 0xd15, 0xd33, 0xd3e, 0xd34, 0xd4d, 0x200c, 0xd1a, 0x3b, 0xd1a,
-0xd4a, 0xd35, 0xd4d, 0xd35, 0xd3e, 0xd34, 0xd4d, 0x200c, 0xd1a, 0x3b, 0xd2c, 0xd41, 0xd27, 0xd28, 0xd3e, 0xd34, 0xd4d, 0x200c, 0xd1a, 0x3b,
-0xd35, 0xd4d, 0xd2f, 0xd3e, 0xd34, 0xd3e, 0xd34, 0xd4d, 0x200c, 0xd1a, 0x3b, 0xd35, 0xd46, 0xd33, 0xd4d, 0xd33, 0xd3f, 0xd2f, 0xd3e, 0xd34,
-0xd4d, 0x200c, 0xd1a, 0x3b, 0xd36, 0xd28, 0xd3f, 0xd2f, 0xd3e, 0xd34, 0xd4d, 0x200c, 0xd1a, 0x3b, 0xd1e, 0xd3e, 0x3b, 0xd24, 0xd3f, 0x3b,
-0xd1a, 0xd4a, 0x3b, 0xd2c, 0xd41, 0x3b, 0xd35, 0xd4d, 0xd2f, 0xd3e, 0x3b, 0xd35, 0xd46, 0x3b, 0xd36, 0x3b, 0xd1e, 0xd3e, 0xd2f, 0xd31,
+0x3b, 0xd1a0, 0xc694, 0xc77c, 0xc77c, 0x3b, 0xc6d4, 0x3b, 0xd654, 0x3b, 0xc218, 0x3b, 0xbaa9, 0x3b, 0xae08, 0x3b, 0xd1a0, 0x79, 0x65, 0x6b,
+0x15f, 0x65, 0x6d, 0x3b, 0x64, 0x75, 0x15f, 0x65, 0x6d, 0x3b, 0x73, 0xea, 0x15f, 0x65, 0x6d, 0x3b, 0xe7, 0x61, 0x72, 0x15f,
+0x65, 0x6d, 0x3b, 0x70, 0xea, 0x6e, 0x63, 0x15f, 0x65, 0x6d, 0x3b, 0xee, 0x6e, 0x3b, 0x15f, 0x65, 0x6d, 0xee, 0x79, 0x15f,
+0x3b, 0x64, 0x15f, 0x3b, 0x73, 0x15f, 0x3b, 0xe7, 0x15f, 0x3b, 0x70, 0x15f, 0x3b, 0xee, 0x6e, 0x3b, 0x15f, 0x59, 0x3b, 0x44,
+0x3b, 0x53, 0x3b, 0xc7, 0x3b, 0x50, 0x3b, 0xce, 0x3b, 0x15e, 0x4b, 0x75, 0x20, 0x77, 0x2019, 0x69, 0x6e, 0x64, 0x77, 0x69,
+0x3b, 0x4b, 0x75, 0x20, 0x77, 0x61, 0x20, 0x6d, 0x62, 0x65, 0x72, 0x65, 0x3b, 0x4b, 0x75, 0x20, 0x77, 0x61, 0x20, 0x6b,
+0x61, 0x62, 0x69, 0x72, 0x69, 0x3b, 0x4b, 0x75, 0x20, 0x77, 0x61, 0x20, 0x67, 0x61, 0x74, 0x61, 0x74, 0x75, 0x3b, 0x4b,
+0x75, 0x20, 0x77, 0x61, 0x20, 0x6b, 0x61, 0x6e, 0x65, 0x3b, 0x4b, 0x75, 0x20, 0x77, 0x61, 0x20, 0x67, 0x61, 0x74, 0x61,
+0x6e, 0x75, 0x3b, 0x4b, 0x75, 0x20, 0x77, 0x61, 0x20, 0x67, 0x61, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x74, 0x75, 0x63, 0x75,
+0x2e, 0x3b, 0x6d, 0x62, 0x65, 0x2e, 0x3b, 0x6b, 0x61, 0x62, 0x2e, 0x3b, 0x67, 0x74, 0x75, 0x2e, 0x3b, 0x6b, 0x61, 0x6e,
+0x2e, 0x3b, 0x67, 0x6e, 0x75, 0x2e, 0x3b, 0x67, 0x6e, 0x64, 0x2e, 0xea7, 0xeb1, 0xe99, 0xead, 0xeb2, 0xe97, 0xeb4, 0xe94, 0x3b,
+0xea7, 0xeb1, 0xe99, 0xe88, 0xeb1, 0xe99, 0x3b, 0xea7, 0xeb1, 0xe99, 0xead, 0xeb1, 0xe87, 0xe84, 0xeb2, 0xe99, 0x3b, 0xea7, 0xeb1, 0xe99,
+0xe9e, 0xeb8, 0xe94, 0x3b, 0xea7, 0xeb1, 0xe99, 0xe9e, 0xeb0, 0xeab, 0xeb1, 0xe94, 0x3b, 0xea7, 0xeb1, 0xe99, 0xeaa, 0xeb8, 0xe81, 0x3b,
+0xea7, 0xeb1, 0xe99, 0xec0, 0xeaa, 0xebb, 0xeb2, 0xead, 0xeb2, 0xe97, 0xeb4, 0xe94, 0x3b, 0xe88, 0xeb1, 0xe99, 0x3b, 0xead, 0xeb1, 0xe87,
+0xe84, 0xeb2, 0xe99, 0x3b, 0xe9e, 0xeb8, 0xe94, 0x3b, 0xe9e, 0xeb0, 0xeab, 0xeb1, 0xe94, 0x3b, 0xeaa, 0xeb8, 0xe81, 0x3b, 0xec0, 0xeaa,
+0xebb, 0xeb2, 0xead, 0xeb2, 0x3b, 0xe88, 0x3b, 0xead, 0x3b, 0xe9e, 0x3b, 0xe9e, 0xeab, 0x3b, 0xeaa, 0xeb8, 0x3b, 0xeaa, 0x53, 0x76,
+0x113, 0x74, 0x64, 0x69, 0x65, 0x6e, 0x61, 0x3b, 0x50, 0x69, 0x72, 0x6d, 0x64, 0x69, 0x65, 0x6e, 0x61, 0x3b, 0x4f, 0x74,
+0x72, 0x64, 0x69, 0x65, 0x6e, 0x61, 0x3b, 0x54, 0x72, 0x65, 0x161, 0x64, 0x69, 0x65, 0x6e, 0x61, 0x3b, 0x43, 0x65, 0x74,
+0x75, 0x72, 0x74, 0x64, 0x69, 0x65, 0x6e, 0x61, 0x3b, 0x50, 0x69, 0x65, 0x6b, 0x74, 0x64, 0x69, 0x65, 0x6e, 0x61, 0x3b,
+0x53, 0x65, 0x73, 0x74, 0x64, 0x69, 0x65, 0x6e, 0x61, 0x73, 0x76, 0x113, 0x74, 0x64, 0x69, 0x65, 0x6e, 0x61, 0x3b, 0x70,
+0x69, 0x72, 0x6d, 0x64, 0x69, 0x65, 0x6e, 0x61, 0x3b, 0x6f, 0x74, 0x72, 0x64, 0x69, 0x65, 0x6e, 0x61, 0x3b, 0x74, 0x72,
+0x65, 0x161, 0x64, 0x69, 0x65, 0x6e, 0x61, 0x3b, 0x63, 0x65, 0x74, 0x75, 0x72, 0x74, 0x64, 0x69, 0x65, 0x6e, 0x61, 0x3b,
+0x70, 0x69, 0x65, 0x6b, 0x74, 0x64, 0x69, 0x65, 0x6e, 0x61, 0x3b, 0x73, 0x65, 0x73, 0x74, 0x64, 0x69, 0x65, 0x6e, 0x61,
+0x53, 0x76, 0x113, 0x74, 0x64, 0x2e, 0x3b, 0x50, 0x69, 0x72, 0x6d, 0x64, 0x2e, 0x3b, 0x4f, 0x74, 0x72, 0x64, 0x2e, 0x3b,
+0x54, 0x72, 0x65, 0x161, 0x64, 0x2e, 0x3b, 0x43, 0x65, 0x74, 0x75, 0x72, 0x74, 0x64, 0x2e, 0x3b, 0x50, 0x69, 0x65, 0x6b,
+0x74, 0x64, 0x2e, 0x3b, 0x53, 0x65, 0x73, 0x74, 0x64, 0x2e, 0x73, 0x76, 0x113, 0x74, 0x64, 0x2e, 0x3b, 0x70, 0x69, 0x72,
+0x6d, 0x64, 0x2e, 0x3b, 0x6f, 0x74, 0x72, 0x64, 0x2e, 0x3b, 0x74, 0x72, 0x65, 0x161, 0x64, 0x2e, 0x3b, 0x63, 0x65, 0x74,
+0x75, 0x72, 0x74, 0x64, 0x2e, 0x3b, 0x70, 0x69, 0x65, 0x6b, 0x74, 0x64, 0x2e, 0x3b, 0x73, 0x65, 0x73, 0x74, 0x64, 0x2e,
+0x53, 0x3b, 0x50, 0x3b, 0x4f, 0x3b, 0x54, 0x3b, 0x43, 0x3b, 0x50, 0x3b, 0x53, 0x65, 0x79, 0x65, 0x6e, 0x67, 0x61, 0x3b,
+0x6d, 0x6f, 0x6b, 0x254, 0x6c, 0x254, 0x20, 0x6d, 0x77, 0x61, 0x20, 0x79, 0x61, 0x6d, 0x62, 0x6f, 0x3b, 0x6d, 0x6f, 0x6b,
+0x254, 0x6c, 0x254, 0x20, 0x6d, 0x77, 0x61, 0x20, 0x6d, 0xed, 0x62, 0x61, 0x6c, 0xe9, 0x3b, 0x6d, 0x6f, 0x6b, 0x254, 0x6c,
+0x254, 0x20, 0x6d, 0x77, 0x61, 0x20, 0x6d, 0xed, 0x73, 0xe1, 0x74, 0x6f, 0x3b, 0x6d, 0x6f, 0x6b, 0x254, 0x6c, 0x254, 0x20,
+0x79, 0x61, 0x20, 0x6d, 0xed, 0x6e, 0xe9, 0x69, 0x3b, 0x6d, 0x6f, 0x6b, 0x254, 0x6c, 0x254, 0x20, 0x79, 0x61, 0x20, 0x6d,
+0xed, 0x74, 0xe1, 0x6e, 0x6f, 0x3b, 0x6d, 0x70, 0x254, 0x301, 0x73, 0x254, 0x65, 0x79, 0x65, 0x3b, 0x79, 0x62, 0x6f, 0x3b,
+0x6d, 0x62, 0x6c, 0x3b, 0x6d, 0x73, 0x74, 0x3b, 0x6d, 0x69, 0x6e, 0x3b, 0x6d, 0x74, 0x6e, 0x3b, 0x6d, 0x70, 0x73, 0x65,
+0x3b, 0x79, 0x3b, 0x6d, 0x3b, 0x6d, 0x3b, 0x6d, 0x3b, 0x6d, 0x3b, 0x70, 0x73, 0x65, 0x6b, 0x6d, 0x61, 0x64, 0x69, 0x65,
+0x6e, 0x69, 0x73, 0x3b, 0x70, 0x69, 0x72, 0x6d, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x69, 0x73, 0x3b, 0x61, 0x6e, 0x74, 0x72,
+0x61, 0x64, 0x69, 0x65, 0x6e, 0x69, 0x73, 0x3b, 0x74, 0x72, 0x65, 0x10d, 0x69, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x69, 0x73,
+0x3b, 0x6b, 0x65, 0x74, 0x76, 0x69, 0x72, 0x74, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x69, 0x73, 0x3b, 0x70, 0x65, 0x6e, 0x6b,
+0x74, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x69, 0x73, 0x3b, 0x161, 0x65, 0x161, 0x74, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x69, 0x73,
+0x73, 0x6b, 0x3b, 0x70, 0x72, 0x3b, 0x61, 0x6e, 0x3b, 0x74, 0x72, 0x3b, 0x6b, 0x74, 0x3b, 0x70, 0x6e, 0x3b, 0x161, 0x74,
+0x53, 0x3b, 0x50, 0x3b, 0x41, 0x3b, 0x54, 0x3b, 0x4b, 0x3b, 0x50, 0x3b, 0x160, 0x43d, 0x435, 0x434, 0x435, 0x43b, 0x430, 0x3b,
+0x43f, 0x43e, 0x43d, 0x435, 0x434, 0x435, 0x43b, 0x43d, 0x438, 0x43a, 0x3b, 0x432, 0x442, 0x43e, 0x440, 0x43d, 0x438, 0x43a, 0x3b, 0x441,
+0x440, 0x435, 0x434, 0x430, 0x3b, 0x447, 0x435, 0x442, 0x432, 0x440, 0x442, 0x43e, 0x43a, 0x3b, 0x43f, 0x435, 0x442, 0x43e, 0x43a, 0x3b,
+0x441, 0x430, 0x431, 0x43e, 0x442, 0x430, 0x43d, 0x435, 0x434, 0x2e, 0x3b, 0x43f, 0x43e, 0x43d, 0x2e, 0x3b, 0x432, 0x442, 0x43e, 0x2e,
+0x3b, 0x441, 0x440, 0x435, 0x2e, 0x3b, 0x447, 0x435, 0x442, 0x2e, 0x3b, 0x43f, 0x435, 0x442, 0x2e, 0x3b, 0x441, 0x430, 0x431, 0x2e,
+0x43d, 0x435, 0x434, 0x2e, 0x3b, 0x43f, 0x43e, 0x43d, 0x2e, 0x3b, 0x432, 0x442, 0x2e, 0x3b, 0x441, 0x440, 0x435, 0x2e, 0x3b, 0x447,
+0x435, 0x442, 0x2e, 0x3b, 0x43f, 0x435, 0x442, 0x2e, 0x3b, 0x441, 0x430, 0x431, 0x2e, 0x41, 0x6c, 0x61, 0x68, 0x61, 0x64, 0x79,
+0x3b, 0x41, 0x6c, 0x61, 0x74, 0x73, 0x69, 0x6e, 0x61, 0x69, 0x6e, 0x79, 0x3b, 0x54, 0x61, 0x6c, 0x61, 0x74, 0x61, 0x3b,
+0x41, 0x6c, 0x61, 0x72, 0x6f, 0x62, 0x69, 0x61, 0x3b, 0x41, 0x6c, 0x61, 0x6b, 0x61, 0x6d, 0x69, 0x73, 0x79, 0x3b, 0x5a,
+0x6f, 0x6d, 0x61, 0x3b, 0x41, 0x73, 0x61, 0x62, 0x6f, 0x74, 0x73, 0x79, 0x41, 0x6c, 0x61, 0x68, 0x3b, 0x41, 0x6c, 0x61,
+0x74, 0x73, 0x3b, 0x54, 0x61, 0x6c, 0x3b, 0x41, 0x6c, 0x61, 0x72, 0x3b, 0x41, 0x6c, 0x61, 0x6b, 0x3b, 0x5a, 0x6f, 0x6d,
+0x3b, 0x41, 0x73, 0x61, 0x62, 0x41, 0x3b, 0x41, 0x3b, 0x54, 0x3b, 0x41, 0x3b, 0x41, 0x3b, 0x5a, 0x3b, 0x41, 0x41, 0x68,
+0x61, 0x64, 0x3b, 0x49, 0x73, 0x6e, 0x69, 0x6e, 0x3b, 0x53, 0x65, 0x6c, 0x61, 0x73, 0x61, 0x3b, 0x52, 0x61, 0x62, 0x75,
+0x3b, 0x4b, 0x68, 0x61, 0x6d, 0x69, 0x73, 0x3b, 0x4a, 0x75, 0x6d, 0x61, 0x61, 0x74, 0x3b, 0x53, 0x61, 0x62, 0x74, 0x75,
+0x41, 0x68, 0x64, 0x3b, 0x49, 0x73, 0x6e, 0x3b, 0x53, 0x65, 0x6c, 0x3b, 0x52, 0x61, 0x62, 0x3b, 0x4b, 0x68, 0x61, 0x3b,
+0x4a, 0x75, 0x6d, 0x3b, 0x53, 0x61, 0x62, 0x41, 0x3b, 0x49, 0x3b, 0x53, 0x3b, 0x52, 0x3b, 0x4b, 0x3b, 0x4a, 0x3b, 0x53,
+0xd1e, 0xd3e, 0xd2f, 0xd31, 0xd3e, 0xd34, 0xd4d, 0x200c, 0xd1a, 0x3b, 0xd24, 0xd3f, 0xd19, 0xd4d, 0xd15, 0xd33, 0xd3e, 0xd34, 0xd4d, 0x200c,
+0xd1a, 0x3b, 0xd1a, 0xd4a, 0xd35, 0xd4d, 0xd35, 0xd3e, 0xd34, 0xd4d, 0x200c, 0xd1a, 0x3b, 0xd2c, 0xd41, 0xd27, 0xd28, 0xd3e, 0xd34, 0xd4d,
+0x200c, 0xd1a, 0x3b, 0xd35, 0xd4d, 0xd2f, 0xd3e, 0xd34, 0xd3e, 0xd34, 0xd4d, 0x200c, 0xd1a, 0x3b, 0xd35, 0xd46, 0xd33, 0xd4d, 0xd33, 0xd3f,
+0xd2f, 0xd3e, 0xd34, 0xd4d, 0x200c, 0xd1a, 0x3b, 0xd36, 0xd28, 0xd3f, 0xd2f, 0xd3e, 0xd34, 0xd4d, 0x200c, 0xd1a, 0xd1e, 0xd3e, 0xd2f, 0xd31,
 0xd3e, 0xd34, 0xd4d, 0x200c, 0xd1a, 0x3b, 0xd24, 0xd3f, 0xd19, 0xd4d, 0xd15, 0xd33, 0xd3e, 0xd34, 0xd4d, 0x200c, 0xd1a, 0x3b, 0xd1a, 0xd4a,
 0xd35, 0xd4d, 0xd35, 0xd3e, 0xd34, 0xd4d, 0xd1a, 0x3b, 0xd2c, 0xd41, 0xd27, 0xd28, 0xd3e, 0xd34, 0xd4d, 0x200c, 0xd1a, 0x3b, 0xd35, 0xd4d,
 0xd2f, 0xd3e, 0xd34, 0xd3e, 0xd34, 0xd4d, 0x200c, 0xd1a, 0x3b, 0xd35, 0xd46, 0xd33, 0xd4d, 0xd33, 0xd3f, 0xd2f, 0xd3e, 0xd34, 0xd4d, 0x200c,
-0xd1a, 0x3b, 0xd36, 0xd28, 0xd3f, 0xd2f, 0xd3e, 0xd34, 0xd4d, 0x200c, 0xd1a, 0x3b, 0xd1e, 0x3b, 0xd24, 0xd3f, 0x3b, 0xd1a, 0xd4a, 0x3b,
-0xd2c, 0xd41, 0x3b, 0xd35, 0xd4d, 0xd2f, 0xd3e, 0x3b, 0xd35, 0xd46, 0x3b, 0xd36, 0x3b, 0x126, 0x61, 0x64, 0x3b, 0x54, 0x6e, 0x65,
-0x3b, 0x54, 0x6c, 0x69, 0x3b, 0x45, 0x72, 0x62, 0x3b, 0x126, 0x61, 0x6d, 0x3b, 0x120, 0x69, 0x6d, 0x3b, 0x53, 0x69, 0x62,
-0x3b, 0x49, 0x6c, 0x2d, 0x126, 0x61, 0x64, 0x64, 0x3b, 0x49, 0x74, 0x2d, 0x54, 0x6e, 0x65, 0x6a, 0x6e, 0x3b, 0x49, 0x74,
-0x2d, 0x54, 0x6c, 0x69, 0x65, 0x74, 0x61, 0x3b, 0x4c, 0x2d, 0x45, 0x72, 0x62, 0x67, 0x127, 0x61, 0x3b, 0x49, 0x6c, 0x2d,
-0x126, 0x61, 0x6d, 0x69, 0x73, 0x3b, 0x49, 0x6c, 0x2d, 0x120, 0x69, 0x6d, 0x67, 0x127, 0x61, 0x3b, 0x49, 0x73, 0x2d, 0x53,
-0x69, 0x62, 0x74, 0x3b, 0x126, 0x64, 0x3b, 0x54, 0x6e, 0x3b, 0x54, 0x6c, 0x3b, 0x45, 0x72, 0x3b, 0x126, 0x6d, 0x3b, 0x120,
-0x6d, 0x3b, 0x53, 0x62, 0x3b, 0x126, 0x64, 0x3b, 0x54, 0x3b, 0x54, 0x6c, 0x3b, 0x45, 0x72, 0x3b, 0x126, 0x6d, 0x3b, 0x120,
-0x6d, 0x3b, 0x53, 0x62, 0x3b, 0x54, 0x61, 0x70, 0x3b, 0x48, 0x69, 0x6e, 0x3b, 0x54, 0x16b, 0x3b, 0x41, 0x70, 0x61, 0x3b,
-0x50, 0x61, 0x72, 0x3b, 0x4d, 0x65, 0x72, 0x3b, 0x48, 0x6f, 0x72, 0x3b, 0x52, 0x101, 0x74, 0x61, 0x70, 0x75, 0x3b, 0x52,
-0x101, 0x68, 0x69, 0x6e, 0x61, 0x3b, 0x52, 0x101, 0x74, 0x16b, 0x3b, 0x52, 0x101, 0x61, 0x70, 0x61, 0x3b, 0x52, 0x101, 0x70,
-0x61, 0x72, 0x65, 0x3b, 0x52, 0x101, 0x6d, 0x65, 0x72, 0x65, 0x3b, 0x52, 0x101, 0x68, 0x6f, 0x72, 0x6f, 0x69, 0x3b, 0x54,
-0x3b, 0x48, 0x3b, 0x54, 0x3b, 0x41, 0x3b, 0x50, 0x3b, 0x4d, 0x3b, 0x48, 0x3b, 0x930, 0x935, 0x93f, 0x3b, 0x938, 0x94b, 0x92e,
-0x3b, 0x92e, 0x902, 0x917, 0x933, 0x3b, 0x92c, 0x941, 0x927, 0x3b, 0x917, 0x941, 0x930, 0x941, 0x3b, 0x936, 0x941, 0x915, 0x94d, 0x930,
-0x3b, 0x936, 0x928, 0x93f, 0x3b, 0x930, 0x935, 0x93f, 0x935, 0x93e, 0x930, 0x3b, 0x938, 0x94b, 0x92e, 0x935, 0x93e, 0x930, 0x3b, 0x92e,
+0xd1a, 0x3b, 0xd36, 0xd28, 0xd3f, 0xd2f, 0xd3e, 0xd34, 0xd4d, 0x200c, 0xd1a, 0xd1e, 0xd3e, 0xd2f, 0xd7c, 0x3b, 0xd24, 0xd3f, 0xd19, 0xd4d,
+0xd15, 0xd7e, 0x3b, 0xd1a, 0xd4a, 0xd35, 0xd4d, 0xd35, 0x3b, 0xd2c, 0xd41, 0xd27, 0xd7b, 0x3b, 0xd35, 0xd4d, 0xd2f, 0xd3e, 0xd34, 0xd02,
+0x3b, 0xd35, 0xd46, 0xd33, 0xd4d, 0xd33, 0xd3f, 0x3b, 0xd36, 0xd28, 0xd3f, 0xd1e, 0xd3e, 0x3b, 0xd24, 0xd3f, 0x3b, 0xd1a, 0xd4a, 0x3b,
+0xd2c, 0xd41, 0x3b, 0xd35, 0xd4d, 0xd2f, 0xd3e, 0x3b, 0xd35, 0xd46, 0x3b, 0xd36, 0xd1e, 0x3b, 0xd24, 0xd3f, 0x3b, 0xd1a, 0xd4a, 0x3b,
+0xd2c, 0xd41, 0x3b, 0xd35, 0xd4d, 0xd2f, 0xd3e, 0x3b, 0xd35, 0xd46, 0x3b, 0xd36, 0x49, 0x6c, 0x2d, 0x126, 0x61, 0x64, 0x64, 0x3b,
+0x49, 0x74, 0x2d, 0x54, 0x6e, 0x65, 0x6a, 0x6e, 0x3b, 0x49, 0x74, 0x2d, 0x54, 0x6c, 0x69, 0x65, 0x74, 0x61, 0x3b, 0x4c,
+0x2d, 0x45, 0x72, 0x62, 0x67, 0x127, 0x61, 0x3b, 0x49, 0x6c, 0x2d, 0x126, 0x61, 0x6d, 0x69, 0x73, 0x3b, 0x49, 0x6c, 0x2d,
+0x120, 0x69, 0x6d, 0x67, 0x127, 0x61, 0x3b, 0x49, 0x73, 0x2d, 0x53, 0x69, 0x62, 0x74, 0x126, 0x61, 0x64, 0x3b, 0x54, 0x6e,
+0x65, 0x3b, 0x54, 0x6c, 0x69, 0x3b, 0x45, 0x72, 0x62, 0x3b, 0x126, 0x61, 0x6d, 0x3b, 0x120, 0x69, 0x6d, 0x3b, 0x53, 0x69,
+0x62, 0x126, 0x64, 0x3b, 0x54, 0x6e, 0x3b, 0x54, 0x6c, 0x3b, 0x45, 0x72, 0x3b, 0x126, 0x6d, 0x3b, 0x120, 0x6d, 0x3b, 0x53,
+0x62, 0x126, 0x64, 0x3b, 0x54, 0x3b, 0x54, 0x6c, 0x3b, 0x45, 0x72, 0x3b, 0x126, 0x6d, 0x3b, 0x120, 0x6d, 0x3b, 0x53, 0x62,
+0x52, 0x101, 0x74, 0x61, 0x70, 0x75, 0x3b, 0x52, 0x101, 0x68, 0x69, 0x6e, 0x61, 0x3b, 0x52, 0x101, 0x74, 0x16b, 0x3b, 0x52,
+0x101, 0x61, 0x70, 0x61, 0x3b, 0x52, 0x101, 0x70, 0x61, 0x72, 0x65, 0x3b, 0x52, 0x101, 0x6d, 0x65, 0x72, 0x65, 0x3b, 0x52,
+0x101, 0x68, 0x6f, 0x72, 0x6f, 0x69, 0x54, 0x61, 0x70, 0x3b, 0x48, 0x69, 0x6e, 0x3b, 0x54, 0x16b, 0x3b, 0x41, 0x70, 0x61,
+0x3b, 0x50, 0x61, 0x72, 0x3b, 0x4d, 0x65, 0x72, 0x3b, 0x48, 0x6f, 0x72, 0x54, 0x3b, 0x48, 0x3b, 0x54, 0x3b, 0x41, 0x3b,
+0x50, 0x3b, 0x4d, 0x3b, 0x48, 0x930, 0x935, 0x93f, 0x935, 0x93e, 0x930, 0x3b, 0x938, 0x94b, 0x92e, 0x935, 0x93e, 0x930, 0x3b, 0x92e,
 0x902, 0x917, 0x933, 0x935, 0x93e, 0x930, 0x3b, 0x92c, 0x941, 0x927, 0x935, 0x93e, 0x930, 0x3b, 0x917, 0x941, 0x930, 0x941, 0x935, 0x93e,
-0x930, 0x3b, 0x936, 0x941, 0x915, 0x94d, 0x930, 0x935, 0x93e, 0x930, 0x3b, 0x936, 0x928, 0x93f, 0x935, 0x93e, 0x930, 0x3b, 0x41d, 0x44f,
-0x3b, 0x414, 0x430, 0x3b, 0x41c, 0x44f, 0x3b, 0x41b, 0x445, 0x3b, 0x41f, 0x4af, 0x3b, 0x411, 0x430, 0x3b, 0x411, 0x44f, 0x3b, 0x41d,
-0x44f, 0x43c, 0x3b, 0x414, 0x430, 0x432, 0x430, 0x430, 0x3b, 0x41c, 0x44f, 0x433, 0x43c, 0x430, 0x440, 0x3b, 0x41b, 0x445, 0x430, 0x433,
-0x432, 0x430, 0x3b, 0x41f, 0x4af, 0x440, 0x44d, 0x432, 0x3b, 0x411, 0x430, 0x430, 0x441, 0x430, 0x43d, 0x3b, 0x411, 0x44f, 0x43c, 0x431,
-0x430, 0x3b, 0x43d, 0x44f, 0x43c, 0x3b, 0x434, 0x430, 0x432, 0x430, 0x430, 0x3b, 0x43c, 0x44f, 0x433, 0x43c, 0x430, 0x440, 0x3b, 0x43b,
-0x445, 0x430, 0x433, 0x432, 0x430, 0x3b, 0x43f, 0x4af, 0x440, 0x44d, 0x432, 0x3b, 0x431, 0x430, 0x430, 0x441, 0x430, 0x43d, 0x3b, 0x431,
-0x44f, 0x43c, 0x431, 0x430, 0x3b, 0x906, 0x907, 0x924, 0x3b, 0x938, 0x94b, 0x92e, 0x3b, 0x92e, 0x919, 0x94d, 0x917, 0x932, 0x3b, 0x92c,
-0x941, 0x927, 0x3b, 0x92c, 0x93f, 0x939, 0x93f, 0x3b, 0x936, 0x941, 0x915, 0x94d, 0x930, 0x3b, 0x936, 0x928, 0x93f, 0x3b, 0x906, 0x907,
-0x924, 0x92c, 0x93e, 0x930, 0x3b, 0x938, 0x94b, 0x92e, 0x92c, 0x93e, 0x930, 0x3b, 0x92e, 0x919, 0x94d, 0x917, 0x932, 0x92c, 0x93e, 0x930,
-0x3b, 0x92c, 0x941, 0x927, 0x92c, 0x93e, 0x930, 0x3b, 0x92c, 0x93f, 0x939, 0x93f, 0x92c, 0x93e, 0x930, 0x3b, 0x936, 0x941, 0x915, 0x94d,
-0x930, 0x92c, 0x93e, 0x930, 0x3b, 0x936, 0x928, 0x93f, 0x92c, 0x93e, 0x930, 0x3b, 0x906, 0x3b, 0x938, 0x94b, 0x3b, 0x92e, 0x3b, 0x92c,
-0x941, 0x3b, 0x92c, 0x93f, 0x3b, 0x936, 0x941, 0x3b, 0x936, 0x3b, 0xb30, 0xb2c, 0xb3f, 0x3b, 0xb38, 0xb4b, 0xb2e, 0x3b, 0xb2e, 0xb19,
-0xb4d, 0xb17, 0xb33, 0x3b, 0xb2c, 0xb41, 0xb27, 0x3b, 0xb17, 0xb41, 0xb30, 0xb41, 0x3b, 0xb36, 0xb41, 0xb15, 0xb4d, 0xb30, 0x3b, 0xb36,
-0xb28, 0xb3f, 0x3b, 0xb30, 0xb2c, 0xb3f, 0xb2c, 0xb3e, 0xb30, 0x3b, 0xb38, 0xb4b, 0xb2e, 0xb2c, 0xb3e, 0xb30, 0x3b, 0xb2e, 0xb19, 0xb4d,
-0xb17, 0xb33, 0xb2c, 0xb3e, 0xb30, 0x3b, 0xb2c, 0xb41, 0xb27, 0xb2c, 0xb3e, 0xb30, 0x3b, 0xb17, 0xb41, 0xb30, 0xb41, 0xb2c, 0xb3e, 0xb30,
-0x3b, 0xb36, 0xb41, 0xb15, 0xb4d, 0xb30, 0xb2c, 0xb3e, 0xb30, 0x3b, 0xb36, 0xb28, 0xb3f, 0xb2c, 0xb3e, 0xb30, 0x3b, 0xb30, 0x3b, 0xb38,
-0xb4b, 0x3b, 0xb2e, 0x3b, 0xb2c, 0xb41, 0x3b, 0xb17, 0xb41, 0x3b, 0xb36, 0xb41, 0x3b, 0xb36, 0x3b, 0x64a, 0x648, 0x646, 0x6cd, 0x3b,
-0x62f, 0x648, 0x646, 0x6cd, 0x3b, 0x62f, 0x631, 0x6d0, 0x646, 0x6cd, 0x3b, 0x685, 0x644, 0x631, 0x646, 0x6cd, 0x3b, 0x67e, 0x64a, 0x646,
-0x681, 0x646, 0x6cd, 0x3b, 0x62c, 0x645, 0x639, 0x647, 0x3b, 0x627, 0x648, 0x646, 0x6cd, 0x3b, 0x6cc, 0x6a9, 0x634, 0x646, 0x628, 0x647,
+0x930, 0x3b, 0x936, 0x941, 0x915, 0x94d, 0x930, 0x935, 0x93e, 0x930, 0x3b, 0x936, 0x928, 0x93f, 0x935, 0x93e, 0x930, 0x930, 0x935, 0x93f,
+0x3b, 0x938, 0x94b, 0x92e, 0x3b, 0x92e, 0x902, 0x917, 0x933, 0x3b, 0x92c, 0x941, 0x927, 0x3b, 0x917, 0x941, 0x930, 0x941, 0x3b, 0x936,
+0x941, 0x915, 0x94d, 0x930, 0x3b, 0x936, 0x928, 0x93f, 0x41d, 0x44f, 0x43c, 0x3b, 0x414, 0x430, 0x432, 0x430, 0x430, 0x3b, 0x41c, 0x44f,
+0x433, 0x43c, 0x430, 0x440, 0x3b, 0x41b, 0x445, 0x430, 0x433, 0x432, 0x430, 0x3b, 0x41f, 0x4af, 0x440, 0x44d, 0x432, 0x3b, 0x411, 0x430,
+0x430, 0x441, 0x430, 0x43d, 0x3b, 0x411, 0x44f, 0x43c, 0x431, 0x430, 0x43d, 0x44f, 0x43c, 0x3b, 0x434, 0x430, 0x432, 0x430, 0x430, 0x3b,
+0x43c, 0x44f, 0x433, 0x43c, 0x430, 0x440, 0x3b, 0x43b, 0x445, 0x430, 0x433, 0x432, 0x430, 0x3b, 0x43f, 0x4af, 0x440, 0x44d, 0x432, 0x3b,
+0x431, 0x430, 0x430, 0x441, 0x430, 0x43d, 0x3b, 0x431, 0x44f, 0x43c, 0x431, 0x430, 0x41d, 0x44f, 0x3b, 0x414, 0x430, 0x3b, 0x41c, 0x44f,
+0x3b, 0x41b, 0x445, 0x3b, 0x41f, 0x4af, 0x3b, 0x411, 0x430, 0x3b, 0x411, 0x44f, 0x906, 0x907, 0x924, 0x92c, 0x93e, 0x930, 0x3b, 0x938,
+0x94b, 0x92e, 0x92c, 0x93e, 0x930, 0x3b, 0x92e, 0x919, 0x94d, 0x917, 0x932, 0x92c, 0x93e, 0x930, 0x3b, 0x92c, 0x941, 0x927, 0x92c, 0x93e,
+0x930, 0x3b, 0x92c, 0x93f, 0x939, 0x93f, 0x92c, 0x93e, 0x930, 0x3b, 0x936, 0x941, 0x915, 0x94d, 0x930, 0x92c, 0x93e, 0x930, 0x3b, 0x936,
+0x928, 0x93f, 0x92c, 0x93e, 0x930, 0x906, 0x907, 0x924, 0x3b, 0x938, 0x94b, 0x92e, 0x3b, 0x92e, 0x919, 0x94d, 0x917, 0x932, 0x3b, 0x92c,
+0x941, 0x927, 0x3b, 0x92c, 0x93f, 0x939, 0x93f, 0x3b, 0x936, 0x941, 0x915, 0x94d, 0x930, 0x3b, 0x936, 0x928, 0x93f, 0x906, 0x3b, 0x938,
+0x94b, 0x3b, 0x92e, 0x3b, 0x92c, 0x941, 0x3b, 0x92c, 0x93f, 0x3b, 0x936, 0x941, 0x3b, 0x936, 0xb30, 0xb2c, 0xb3f, 0xb2c, 0xb3e, 0xb30,
+0x3b, 0xb38, 0xb4b, 0xb2e, 0xb2c, 0xb3e, 0xb30, 0x3b, 0xb2e, 0xb19, 0xb4d, 0xb17, 0xb33, 0xb2c, 0xb3e, 0xb30, 0x3b, 0xb2c, 0xb41, 0xb27,
+0xb2c, 0xb3e, 0xb30, 0x3b, 0xb17, 0xb41, 0xb30, 0xb41, 0xb2c, 0xb3e, 0xb30, 0x3b, 0xb36, 0xb41, 0xb15, 0xb4d, 0xb30, 0xb2c, 0xb3e, 0xb30,
+0x3b, 0xb36, 0xb28, 0xb3f, 0xb2c, 0xb3e, 0xb30, 0xb30, 0xb2c, 0xb3f, 0x3b, 0xb38, 0xb4b, 0xb2e, 0x3b, 0xb2e, 0xb19, 0xb4d, 0xb17, 0xb33,
+0x3b, 0xb2c, 0xb41, 0xb27, 0x3b, 0xb17, 0xb41, 0xb30, 0xb41, 0x3b, 0xb36, 0xb41, 0xb15, 0xb4d, 0xb30, 0x3b, 0xb36, 0xb28, 0xb3f, 0xb30,
+0x3b, 0xb38, 0xb4b, 0x3b, 0xb2e, 0x3b, 0xb2c, 0xb41, 0x3b, 0xb17, 0xb41, 0x3b, 0xb36, 0xb41, 0x3b, 0xb36, 0x64a, 0x648, 0x646, 0x6cd,
+0x3b, 0x62f, 0x648, 0x646, 0x6cd, 0x3b, 0x62f, 0x631, 0x6d0, 0x646, 0x6cd, 0x3b, 0x685, 0x644, 0x631, 0x646, 0x6cd, 0x3b, 0x67e, 0x64a,
+0x646, 0x681, 0x646, 0x6cd, 0x3b, 0x62c, 0x645, 0x639, 0x647, 0x3b, 0x627, 0x648, 0x646, 0x6cd, 0x6cc, 0x6a9, 0x634, 0x646, 0x628, 0x647,
 0x3b, 0x62f, 0x648, 0x634, 0x646, 0x628, 0x647, 0x3b, 0x633, 0x647, 0x200c, 0x634, 0x646, 0x628, 0x647, 0x3b, 0x686, 0x647, 0x627, 0x631,
 0x634, 0x646, 0x628, 0x647, 0x3b, 0x67e, 0x646, 0x62c, 0x634, 0x646, 0x628, 0x647, 0x3b, 0x62c, 0x645, 0x639, 0x647, 0x3b, 0x634, 0x646,
-0x628, 0x647, 0x3b, 0x6cc, 0x3b, 0x62f, 0x3b, 0x633, 0x3b, 0x686, 0x3b, 0x67e, 0x3b, 0x62c, 0x3b, 0x634, 0x3b, 0x6e, 0x69, 0x65,
-0x64, 0x7a, 0x2e, 0x3b, 0x70, 0x6f, 0x6e, 0x2e, 0x3b, 0x77, 0x74, 0x2e, 0x3b, 0x15b, 0x72, 0x2e, 0x3b, 0x63, 0x7a, 0x77,
-0x2e, 0x3b, 0x70, 0x74, 0x2e, 0x3b, 0x73, 0x6f, 0x62, 0x2e, 0x3b, 0x6e, 0x69, 0x65, 0x64, 0x7a, 0x69, 0x65, 0x6c, 0x61,
-0x3b, 0x70, 0x6f, 0x6e, 0x69, 0x65, 0x64, 0x7a, 0x69, 0x61, 0x142, 0x65, 0x6b, 0x3b, 0x77, 0x74, 0x6f, 0x72, 0x65, 0x6b,
-0x3b, 0x15b, 0x72, 0x6f, 0x64, 0x61, 0x3b, 0x63, 0x7a, 0x77, 0x61, 0x72, 0x74, 0x65, 0x6b, 0x3b, 0x70, 0x69, 0x105, 0x74,
-0x65, 0x6b, 0x3b, 0x73, 0x6f, 0x62, 0x6f, 0x74, 0x61, 0x3b, 0x4e, 0x3b, 0x50, 0x3b, 0x57, 0x3b, 0x15a, 0x3b, 0x43, 0x3b,
-0x50, 0x3b, 0x53, 0x3b, 0x6e, 0x3b, 0x70, 0x3b, 0x77, 0x3b, 0x15b, 0x3b, 0x63, 0x3b, 0x70, 0x3b, 0x73, 0x3b, 0x64, 0x6f,
-0x6d, 0x2e, 0x3b, 0x73, 0x65, 0x67, 0x2e, 0x3b, 0x74, 0x65, 0x72, 0x2e, 0x3b, 0x71, 0x75, 0x61, 0x2e, 0x3b, 0x71, 0x75,
-0x69, 0x2e, 0x3b, 0x73, 0x65, 0x78, 0x2e, 0x3b, 0x73, 0xe1, 0x62, 0x2e, 0x3b, 0x64, 0x6f, 0x6d, 0x69, 0x6e, 0x67, 0x6f,
-0x3b, 0x73, 0x65, 0x67, 0x75, 0x6e, 0x64, 0x61, 0x2d, 0x66, 0x65, 0x69, 0x72, 0x61, 0x3b, 0x74, 0x65, 0x72, 0xe7, 0x61,
-0x2d, 0x66, 0x65, 0x69, 0x72, 0x61, 0x3b, 0x71, 0x75, 0x61, 0x72, 0x74, 0x61, 0x2d, 0x66, 0x65, 0x69, 0x72, 0x61, 0x3b,
-0x71, 0x75, 0x69, 0x6e, 0x74, 0x61, 0x2d, 0x66, 0x65, 0x69, 0x72, 0x61, 0x3b, 0x73, 0x65, 0x78, 0x74, 0x61, 0x2d, 0x66,
-0x65, 0x69, 0x72, 0x61, 0x3b, 0x73, 0xe1, 0x62, 0x61, 0x64, 0x6f, 0x3b, 0x44, 0x3b, 0x53, 0x3b, 0x54, 0x3b, 0x51, 0x3b,
-0x51, 0x3b, 0x53, 0x3b, 0x53, 0x3b, 0x64, 0x6f, 0x6d, 0x69, 0x6e, 0x67, 0x6f, 0x3b, 0x73, 0x65, 0x67, 0x75, 0x6e, 0x64,
-0x61, 0x3b, 0x74, 0x65, 0x72, 0xe7, 0x61, 0x3b, 0x71, 0x75, 0x61, 0x72, 0x74, 0x61, 0x3b, 0x71, 0x75, 0x69, 0x6e, 0x74,
-0x61, 0x3b, 0x73, 0x65, 0x78, 0x74, 0x61, 0x3b, 0x73, 0xe1, 0x62, 0x61, 0x64, 0x6f, 0x3b, 0xa10, 0xa24, 0x3b, 0xa38, 0xa4b,
-0xa2e, 0x3b, 0xa2e, 0xa70, 0xa17, 0xa32, 0x3b, 0xa2c, 0xa41, 0xa71, 0xa27, 0x3b, 0xa35, 0xa40, 0xa30, 0x3b, 0xa38, 0xa3c, 0xa41, 0xa71,
-0xa15, 0xa30, 0x3b, 0xa38, 0xa3c, 0xa28, 0xa3f, 0xa71, 0xa1a, 0xa30, 0x3b, 0xa10, 0xa24, 0xa35, 0xa3e, 0xa30, 0x3b, 0xa38, 0xa4b, 0xa2e,
-0xa35, 0xa3e, 0xa30, 0x3b, 0xa2e, 0xa70, 0xa17, 0xa32, 0xa35, 0xa3e, 0xa30, 0x3b, 0xa2c, 0xa41, 0xa71, 0xa27, 0xa35, 0xa3e, 0xa30, 0x3b,
-0xa35, 0xa40, 0xa30, 0xa35, 0xa3e, 0xa30, 0x3b, 0xa38, 0xa3c, 0xa41, 0xa71, 0xa15, 0xa30, 0xa35, 0xa3e, 0xa30, 0x3b, 0xa38, 0xa3c, 0xa28,
-0xa3f, 0xa71, 0xa1a, 0xa30, 0xa35, 0xa3e, 0xa30, 0x3b, 0xa10, 0x3b, 0xa38, 0xa4b, 0x3b, 0xa2e, 0xa70, 0x3b, 0xa2c, 0xa41, 0xa71, 0x3b,
-0xa35, 0xa40, 0x3b, 0xa38, 0xa3c, 0xa41, 0xa71, 0x3b, 0xa38, 0xa3c, 0x3b, 0x627, 0x62a, 0x648, 0x627, 0x631, 0x3b, 0x67e, 0x6cc, 0x631,
-0x3b, 0x645, 0x646, 0x6af, 0x644, 0x3b, 0x628, 0x64f, 0x62f, 0x6be, 0x3b, 0x62c, 0x645, 0x639, 0x631, 0x627, 0x62a, 0x3b, 0x62c, 0x645,
-0x639, 0x6c1, 0x3b, 0x6c1, 0x641, 0x62a, 0x6c1, 0x3b, 0x44, 0x6f, 0x6d, 0x3b, 0x4c, 0x75, 0x6e, 0x3b, 0x4d, 0x61, 0x72, 0x3b,
-0x4d, 0x69, 0xe9, 0x3b, 0x4a, 0x75, 0x65, 0x3b, 0x56, 0x69, 0x65, 0x3b, 0x53, 0x61, 0x62, 0x3b, 0x44, 0x6f, 0x6d, 0x69,
-0x6e, 0x67, 0x6f, 0x3b, 0x4c, 0x75, 0x6e, 0x65, 0x73, 0x3b, 0x4d, 0x61, 0x72, 0x74, 0x65, 0x73, 0x3b, 0x4d, 0x69, 0xe9,
-0x72, 0x63, 0x6f, 0x6c, 0x65, 0x73, 0x3b, 0x4a, 0x75, 0x65, 0x76, 0x65, 0x73, 0x3b, 0x56, 0x69, 0x65, 0x72, 0x6e, 0x65,
-0x73, 0x3b, 0x53, 0xe1, 0x62, 0x61, 0x64, 0x6f, 0x3b, 0x44, 0x3b, 0x4c, 0x3b, 0x4d, 0x3b, 0x58, 0x3b, 0x4a, 0x3b, 0x56,
-0x3b, 0x53, 0x3b, 0x64, 0x75, 0x3b, 0x67, 0x6c, 0x69, 0x3b, 0x6d, 0x61, 0x3b, 0x6d, 0x65, 0x3b, 0x67, 0x69, 0x65, 0x3b,
-0x76, 0x65, 0x3b, 0x73, 0x6f, 0x3b, 0x64, 0x75, 0x6d, 0x65, 0x6e, 0x67, 0x69, 0x61, 0x3b, 0x67, 0x6c, 0x69, 0x6e, 0x64,
+0x628, 0x647, 0x6cc, 0x3b, 0x62f, 0x3b, 0x633, 0x3b, 0x686, 0x3b, 0x67e, 0x3b, 0x62c, 0x3b, 0x634, 0x6e, 0x69, 0x65, 0x64, 0x7a,
+0x69, 0x65, 0x6c, 0x61, 0x3b, 0x70, 0x6f, 0x6e, 0x69, 0x65, 0x64, 0x7a, 0x69, 0x61, 0x142, 0x65, 0x6b, 0x3b, 0x77, 0x74,
+0x6f, 0x72, 0x65, 0x6b, 0x3b, 0x15b, 0x72, 0x6f, 0x64, 0x61, 0x3b, 0x63, 0x7a, 0x77, 0x61, 0x72, 0x74, 0x65, 0x6b, 0x3b,
+0x70, 0x69, 0x105, 0x74, 0x65, 0x6b, 0x3b, 0x73, 0x6f, 0x62, 0x6f, 0x74, 0x61, 0x6e, 0x69, 0x65, 0x64, 0x7a, 0x2e, 0x3b,
+0x70, 0x6f, 0x6e, 0x2e, 0x3b, 0x77, 0x74, 0x2e, 0x3b, 0x15b, 0x72, 0x2e, 0x3b, 0x63, 0x7a, 0x77, 0x2e, 0x3b, 0x70, 0x74,
+0x2e, 0x3b, 0x73, 0x6f, 0x62, 0x2e, 0x4e, 0x3b, 0x50, 0x3b, 0x57, 0x3b, 0x15a, 0x3b, 0x43, 0x3b, 0x50, 0x3b, 0x53, 0x6e,
+0x3b, 0x70, 0x3b, 0x77, 0x3b, 0x15b, 0x3b, 0x63, 0x3b, 0x70, 0x3b, 0x73, 0x64, 0x6f, 0x6d, 0x69, 0x6e, 0x67, 0x6f, 0x3b,
+0x73, 0x65, 0x67, 0x75, 0x6e, 0x64, 0x61, 0x2d, 0x66, 0x65, 0x69, 0x72, 0x61, 0x3b, 0x74, 0x65, 0x72, 0xe7, 0x61, 0x2d,
+0x66, 0x65, 0x69, 0x72, 0x61, 0x3b, 0x71, 0x75, 0x61, 0x72, 0x74, 0x61, 0x2d, 0x66, 0x65, 0x69, 0x72, 0x61, 0x3b, 0x71,
+0x75, 0x69, 0x6e, 0x74, 0x61, 0x2d, 0x66, 0x65, 0x69, 0x72, 0x61, 0x3b, 0x73, 0x65, 0x78, 0x74, 0x61, 0x2d, 0x66, 0x65,
+0x69, 0x72, 0x61, 0x3b, 0x73, 0xe1, 0x62, 0x61, 0x64, 0x6f, 0x64, 0x6f, 0x6d, 0x2e, 0x3b, 0x73, 0x65, 0x67, 0x2e, 0x3b,
+0x74, 0x65, 0x72, 0x2e, 0x3b, 0x71, 0x75, 0x61, 0x2e, 0x3b, 0x71, 0x75, 0x69, 0x2e, 0x3b, 0x73, 0x65, 0x78, 0x2e, 0x3b,
+0x73, 0xe1, 0x62, 0x2e, 0x44, 0x3b, 0x53, 0x3b, 0x54, 0x3b, 0x51, 0x3b, 0x51, 0x3b, 0x53, 0x3b, 0x53, 0x64, 0x6f, 0x6d,
+0x69, 0x6e, 0x67, 0x6f, 0x3b, 0x73, 0x65, 0x67, 0x75, 0x6e, 0x64, 0x61, 0x3b, 0x74, 0x65, 0x72, 0xe7, 0x61, 0x3b, 0x71,
+0x75, 0x61, 0x72, 0x74, 0x61, 0x3b, 0x71, 0x75, 0x69, 0x6e, 0x74, 0x61, 0x3b, 0x73, 0x65, 0x78, 0x74, 0x61, 0x3b, 0x73,
+0xe1, 0x62, 0x61, 0x64, 0x6f, 0xa10, 0xa24, 0xa35, 0xa3e, 0xa30, 0x3b, 0xa38, 0xa4b, 0xa2e, 0xa35, 0xa3e, 0xa30, 0x3b, 0xa2e, 0xa70,
+0xa17, 0xa32, 0xa35, 0xa3e, 0xa30, 0x3b, 0xa2c, 0xa41, 0xa71, 0xa27, 0xa35, 0xa3e, 0xa30, 0x3b, 0xa35, 0xa40, 0xa30, 0xa35, 0xa3e, 0xa30,
+0x3b, 0xa38, 0xa3c, 0xa41, 0xa71, 0xa15, 0xa30, 0xa35, 0xa3e, 0xa30, 0x3b, 0xa38, 0xa3c, 0xa28, 0xa3f, 0xa71, 0xa1a, 0xa30, 0xa35, 0xa3e,
+0xa30, 0xa10, 0xa24, 0x3b, 0xa38, 0xa4b, 0xa2e, 0x3b, 0xa2e, 0xa70, 0xa17, 0xa32, 0x3b, 0xa2c, 0xa41, 0xa71, 0xa27, 0x3b, 0xa35, 0xa40,
+0xa30, 0x3b, 0xa38, 0xa3c, 0xa41, 0xa71, 0xa15, 0xa30, 0x3b, 0xa38, 0xa3c, 0xa28, 0xa3f, 0xa71, 0xa1a, 0xa30, 0xa10, 0x3b, 0xa38, 0xa4b,
+0x3b, 0xa2e, 0xa70, 0x3b, 0xa2c, 0xa41, 0xa71, 0x3b, 0xa35, 0xa40, 0x3b, 0xa38, 0xa3c, 0xa41, 0xa71, 0x3b, 0xa38, 0xa3c, 0x627, 0x62a,
+0x648, 0x627, 0x631, 0x3b, 0x67e, 0x6cc, 0x631, 0x3b, 0x645, 0x646, 0x6af, 0x644, 0x3b, 0x628, 0x64f, 0x62f, 0x6be, 0x3b, 0x62c, 0x645,
+0x639, 0x631, 0x627, 0x62a, 0x3b, 0x62c, 0x645, 0x639, 0x6c1, 0x3b, 0x6c1, 0x641, 0x62a, 0x6c1, 0x44, 0x6f, 0x6d, 0x69, 0x6e, 0x67,
+0x6f, 0x3b, 0x4c, 0x75, 0x6e, 0x65, 0x73, 0x3b, 0x4d, 0x61, 0x72, 0x74, 0x65, 0x73, 0x3b, 0x4d, 0x69, 0xe9, 0x72, 0x63,
+0x6f, 0x6c, 0x65, 0x73, 0x3b, 0x4a, 0x75, 0x65, 0x76, 0x65, 0x73, 0x3b, 0x56, 0x69, 0x65, 0x72, 0x6e, 0x65, 0x73, 0x3b,
+0x53, 0xe1, 0x62, 0x61, 0x64, 0x6f, 0x44, 0x6f, 0x6d, 0x3b, 0x4c, 0x75, 0x6e, 0x3b, 0x4d, 0x61, 0x72, 0x3b, 0x4d, 0x69,
+0xe9, 0x3b, 0x4a, 0x75, 0x65, 0x3b, 0x56, 0x69, 0x65, 0x3b, 0x53, 0x61, 0x62, 0x44, 0x3b, 0x4c, 0x3b, 0x4d, 0x3b, 0x58,
+0x3b, 0x4a, 0x3b, 0x56, 0x3b, 0x53, 0x64, 0x75, 0x6d, 0x65, 0x6e, 0x67, 0x69, 0x61, 0x3b, 0x67, 0x6c, 0x69, 0x6e, 0x64,
 0x65, 0x73, 0x64, 0x69, 0x3b, 0x6d, 0x61, 0x72, 0x64, 0x69, 0x3b, 0x6d, 0x65, 0x73, 0x65, 0x6d, 0x6e, 0x61, 0x3b, 0x67,
 0x69, 0x65, 0x76, 0x67, 0x69, 0x61, 0x3b, 0x76, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x64, 0x69, 0x3b, 0x73, 0x6f, 0x6e, 0x64,
-0x61, 0x3b, 0x44, 0x3b, 0x47, 0x3b, 0x4d, 0x3b, 0x4d, 0x3b, 0x47, 0x3b, 0x56, 0x3b, 0x53, 0x3b, 0x64, 0x75, 0x6d, 0x2e,
-0x3b, 0x6c, 0x75, 0x6e, 0x2e, 0x3b, 0x6d, 0x61, 0x72, 0x2e, 0x3b, 0x6d, 0x69, 0x65, 0x2e, 0x3b, 0x6a, 0x6f, 0x69, 0x3b,
-0x76, 0x69, 0x6e, 0x2e, 0x3b, 0x73, 0xe2, 0x6d, 0x2e, 0x3b, 0x64, 0x75, 0x6d, 0x69, 0x6e, 0x69, 0x63, 0x103, 0x3b, 0x6c,
-0x75, 0x6e, 0x69, 0x3b, 0x6d, 0x61, 0x72, 0x21b, 0x69, 0x3b, 0x6d, 0x69, 0x65, 0x72, 0x63, 0x75, 0x72, 0x69, 0x3b, 0x6a,
-0x6f, 0x69, 0x3b, 0x76, 0x69, 0x6e, 0x65, 0x72, 0x69, 0x3b, 0x73, 0xe2, 0x6d, 0x62, 0x103, 0x74, 0x103, 0x3b, 0x44, 0x75,
-0x6d, 0x3b, 0x4c, 0x75, 0x6e, 0x3b, 0x4d, 0x61, 0x72, 0x3b, 0x4d, 0x69, 0x65, 0x3b, 0x4a, 0x6f, 0x69, 0x3b, 0x56, 0x69,
-0x6e, 0x3b, 0x53, 0xe2, 0x6d, 0x3b, 0x44, 0x3b, 0x4c, 0x3b, 0x4d, 0x61, 0x3b, 0x4d, 0x69, 0x3b, 0x4a, 0x3b, 0x56, 0x3b,
-0x53, 0x3b, 0x432, 0x441, 0x3b, 0x43f, 0x43d, 0x3b, 0x432, 0x442, 0x3b, 0x441, 0x440, 0x3b, 0x447, 0x442, 0x3b, 0x43f, 0x442, 0x3b,
-0x441, 0x431, 0x3b, 0x432, 0x43e, 0x441, 0x43a, 0x440, 0x435, 0x441, 0x435, 0x43d, 0x44c, 0x435, 0x3b, 0x43f, 0x43e, 0x43d, 0x435, 0x434,
-0x435, 0x43b, 0x44c, 0x43d, 0x438, 0x43a, 0x3b, 0x432, 0x442, 0x43e, 0x440, 0x43d, 0x438, 0x43a, 0x3b, 0x441, 0x440, 0x435, 0x434, 0x430,
-0x3b, 0x447, 0x435, 0x442, 0x432, 0x435, 0x440, 0x433, 0x3b, 0x43f, 0x44f, 0x442, 0x43d, 0x438, 0x446, 0x430, 0x3b, 0x441, 0x443, 0x431,
-0x431, 0x43e, 0x442, 0x430, 0x3b, 0x412, 0x3b, 0x41f, 0x3b, 0x412, 0x3b, 0x421, 0x3b, 0x427, 0x3b, 0x41f, 0x3b, 0x421, 0x3b, 0x42,
-0x6b, 0x31, 0x3b, 0x42, 0x6b, 0x32, 0x3b, 0x42, 0x6b, 0x33, 0x3b, 0x42, 0x6b, 0x34, 0x3b, 0x42, 0x6b, 0x35, 0x3b, 0x4c,
-0xe2, 0x70, 0x3b, 0x4c, 0xe2, 0x79, 0x3b, 0x42, 0x69, 0x6b, 0x75, 0x61, 0x2d, 0xf4, 0x6b, 0x6f, 0x3b, 0x42, 0xef, 0x6b,
-0x75, 0x61, 0x2d, 0xfb, 0x73, 0x65, 0x3b, 0x42, 0xef, 0x6b, 0x75, 0x61, 0x2d, 0x70, 0x74, 0xe2, 0x3b, 0x42, 0xef, 0x6b,
-0x75, 0x61, 0x2d, 0x75, 0x73, 0xef, 0xf6, 0x3b, 0x42, 0xef, 0x6b, 0x75, 0x61, 0x2d, 0x6f, 0x6b, 0xfc, 0x3b, 0x4c, 0xe2,
-0x70, 0xf4, 0x73, 0xf6, 0x3b, 0x4c, 0xe2, 0x79, 0x65, 0x6e, 0x67, 0x61, 0x3b, 0x4b, 0x3b, 0x53, 0x3b, 0x54, 0x3b, 0x53,
-0x3b, 0x4b, 0x3b, 0x50, 0x3b, 0x59, 0x3b, 0x43d, 0x435, 0x434, 0x3b, 0x43f, 0x43e, 0x43d, 0x3b, 0x443, 0x442, 0x43e, 0x3b, 0x441,
-0x440, 0x435, 0x3b, 0x447, 0x435, 0x442, 0x3b, 0x43f, 0x435, 0x442, 0x3b, 0x441, 0x443, 0x431, 0x3b, 0x43d, 0x435, 0x434, 0x435, 0x459,
-0x430, 0x3b, 0x43f, 0x43e, 0x43d, 0x435, 0x434, 0x435, 0x459, 0x430, 0x43a, 0x3b, 0x443, 0x442, 0x43e, 0x440, 0x430, 0x43a, 0x3b, 0x441,
-0x440, 0x435, 0x434, 0x430, 0x3b, 0x447, 0x435, 0x442, 0x432, 0x440, 0x442, 0x430, 0x43a, 0x3b, 0x43f, 0x435, 0x442, 0x430, 0x43a, 0x3b,
-0x441, 0x443, 0x431, 0x43e, 0x442, 0x430, 0x3b, 0x43d, 0x3b, 0x43f, 0x3b, 0x443, 0x3b, 0x441, 0x3b, 0x447, 0x3b, 0x43f, 0x3b, 0x441,
-0x3b, 0x43d, 0x435, 0x434, 0x3b, 0x43f, 0x43e, 0x43d, 0x3b, 0x443, 0x442, 0x3b, 0x441, 0x440, 0x3b, 0x447, 0x435, 0x442, 0x3b, 0x43f,
-0x435, 0x442, 0x3b, 0x441, 0x443, 0x431, 0x3b, 0x43d, 0x435, 0x434, 0x458, 0x435, 0x459, 0x430, 0x3b, 0x43f, 0x43e, 0x43d, 0x435, 0x434,
-0x435, 0x459, 0x430, 0x43a, 0x3b, 0x443, 0x442, 0x43e, 0x440, 0x430, 0x43a, 0x3b, 0x441, 0x440, 0x438, 0x458, 0x435, 0x434, 0x430, 0x3b,
-0x447, 0x435, 0x442, 0x432, 0x440, 0x442, 0x430, 0x43a, 0x3b, 0x43f, 0x435, 0x442, 0x430, 0x43a, 0x3b, 0x441, 0x443, 0x431, 0x43e, 0x442,
-0x430, 0x3b, 0x6e, 0x65, 0x64, 0x3b, 0x70, 0x6f, 0x6e, 0x3b, 0x75, 0x74, 0x3b, 0x73, 0x72, 0x3b, 0x10d, 0x65, 0x74, 0x3b,
-0x70, 0x65, 0x74, 0x3b, 0x73, 0x75, 0x62, 0x3b, 0x6e, 0x65, 0x64, 0x6a, 0x65, 0x6c, 0x6a, 0x61, 0x3b, 0x70, 0x6f, 0x6e,
+0x61, 0x64, 0x75, 0x3b, 0x67, 0x6c, 0x69, 0x3b, 0x6d, 0x61, 0x3b, 0x6d, 0x65, 0x3b, 0x67, 0x69, 0x65, 0x3b, 0x76, 0x65,
+0x3b, 0x73, 0x6f, 0x44, 0x3b, 0x47, 0x3b, 0x4d, 0x3b, 0x4d, 0x3b, 0x47, 0x3b, 0x56, 0x3b, 0x53, 0x64, 0x75, 0x6d, 0x69,
+0x6e, 0x69, 0x63, 0x103, 0x3b, 0x6c, 0x75, 0x6e, 0x69, 0x3b, 0x6d, 0x61, 0x72, 0x21b, 0x69, 0x3b, 0x6d, 0x69, 0x65, 0x72,
+0x63, 0x75, 0x72, 0x69, 0x3b, 0x6a, 0x6f, 0x69, 0x3b, 0x76, 0x69, 0x6e, 0x65, 0x72, 0x69, 0x3b, 0x73, 0xe2, 0x6d, 0x62,
+0x103, 0x74, 0x103, 0x64, 0x75, 0x6d, 0x2e, 0x3b, 0x6c, 0x75, 0x6e, 0x2e, 0x3b, 0x6d, 0x61, 0x72, 0x2e, 0x3b, 0x6d, 0x69,
+0x65, 0x2e, 0x3b, 0x6a, 0x6f, 0x69, 0x3b, 0x76, 0x69, 0x6e, 0x2e, 0x3b, 0x73, 0xe2, 0x6d, 0x2e, 0x44, 0x75, 0x6d, 0x3b,
+0x4c, 0x75, 0x6e, 0x3b, 0x4d, 0x61, 0x72, 0x3b, 0x4d, 0x69, 0x65, 0x3b, 0x4a, 0x6f, 0x69, 0x3b, 0x56, 0x69, 0x6e, 0x3b,
+0x53, 0xe2, 0x6d, 0x44, 0x3b, 0x4c, 0x3b, 0x4d, 0x61, 0x3b, 0x4d, 0x69, 0x3b, 0x4a, 0x3b, 0x56, 0x3b, 0x53, 0x432, 0x43e,
+0x441, 0x43a, 0x440, 0x435, 0x441, 0x435, 0x43d, 0x44c, 0x435, 0x3b, 0x43f, 0x43e, 0x43d, 0x435, 0x434, 0x435, 0x43b, 0x44c, 0x43d, 0x438,
+0x43a, 0x3b, 0x432, 0x442, 0x43e, 0x440, 0x43d, 0x438, 0x43a, 0x3b, 0x441, 0x440, 0x435, 0x434, 0x430, 0x3b, 0x447, 0x435, 0x442, 0x432,
+0x435, 0x440, 0x433, 0x3b, 0x43f, 0x44f, 0x442, 0x43d, 0x438, 0x446, 0x430, 0x3b, 0x441, 0x443, 0x431, 0x431, 0x43e, 0x442, 0x430, 0x432,
+0x441, 0x3b, 0x43f, 0x43d, 0x3b, 0x432, 0x442, 0x3b, 0x441, 0x440, 0x3b, 0x447, 0x442, 0x3b, 0x43f, 0x442, 0x3b, 0x441, 0x431, 0x412,
+0x3b, 0x41f, 0x3b, 0x412, 0x3b, 0x421, 0x3b, 0x427, 0x3b, 0x41f, 0x3b, 0x421, 0x42, 0x69, 0x6b, 0x75, 0x61, 0x2d, 0xf4, 0x6b,
+0x6f, 0x3b, 0x42, 0xef, 0x6b, 0x75, 0x61, 0x2d, 0xfb, 0x73, 0x65, 0x3b, 0x42, 0xef, 0x6b, 0x75, 0x61, 0x2d, 0x70, 0x74,
+0xe2, 0x3b, 0x42, 0xef, 0x6b, 0x75, 0x61, 0x2d, 0x75, 0x73, 0xef, 0xf6, 0x3b, 0x42, 0xef, 0x6b, 0x75, 0x61, 0x2d, 0x6f,
+0x6b, 0xfc, 0x3b, 0x4c, 0xe2, 0x70, 0xf4, 0x73, 0xf6, 0x3b, 0x4c, 0xe2, 0x79, 0x65, 0x6e, 0x67, 0x61, 0x42, 0x6b, 0x31,
+0x3b, 0x42, 0x6b, 0x32, 0x3b, 0x42, 0x6b, 0x33, 0x3b, 0x42, 0x6b, 0x34, 0x3b, 0x42, 0x6b, 0x35, 0x3b, 0x4c, 0xe2, 0x70,
+0x3b, 0x4c, 0xe2, 0x79, 0x4b, 0x3b, 0x53, 0x3b, 0x54, 0x3b, 0x53, 0x3b, 0x4b, 0x3b, 0x50, 0x3b, 0x59, 0x43d, 0x435, 0x434,
+0x435, 0x459, 0x430, 0x3b, 0x43f, 0x43e, 0x43d, 0x435, 0x434, 0x435, 0x459, 0x430, 0x43a, 0x3b, 0x443, 0x442, 0x43e, 0x440, 0x430, 0x43a,
+0x3b, 0x441, 0x440, 0x435, 0x434, 0x430, 0x3b, 0x447, 0x435, 0x442, 0x432, 0x440, 0x442, 0x430, 0x43a, 0x3b, 0x43f, 0x435, 0x442, 0x430,
+0x43a, 0x3b, 0x441, 0x443, 0x431, 0x43e, 0x442, 0x430, 0x43d, 0x435, 0x434, 0x3b, 0x43f, 0x43e, 0x43d, 0x3b, 0x443, 0x442, 0x43e, 0x3b,
+0x441, 0x440, 0x435, 0x3b, 0x447, 0x435, 0x442, 0x3b, 0x43f, 0x435, 0x442, 0x3b, 0x441, 0x443, 0x431, 0x43d, 0x3b, 0x43f, 0x3b, 0x443,
+0x3b, 0x441, 0x3b, 0x447, 0x3b, 0x43f, 0x3b, 0x441, 0x6e, 0x65, 0x64, 0x6a, 0x65, 0x6c, 0x6a, 0x61, 0x3b, 0x70, 0x6f, 0x6e,
 0x65, 0x64, 0x65, 0x6c, 0x6a, 0x61, 0x6b, 0x3b, 0x75, 0x74, 0x6f, 0x72, 0x61, 0x6b, 0x3b, 0x73, 0x72, 0x69, 0x6a, 0x65,
 0x64, 0x61, 0x3b, 0x10d, 0x65, 0x74, 0x76, 0x72, 0x74, 0x61, 0x6b, 0x3b, 0x70, 0x65, 0x74, 0x61, 0x6b, 0x3b, 0x73, 0x75,
-0x62, 0x6f, 0x74, 0x61, 0x3b, 0x6e, 0x65, 0x64, 0x3b, 0x70, 0x6f, 0x6e, 0x3b, 0x75, 0x74, 0x6f, 0x3b, 0x73, 0x72, 0x65,
-0x3b, 0x10d, 0x65, 0x74, 0x3b, 0x70, 0x65, 0x74, 0x3b, 0x73, 0x75, 0x62, 0x3b, 0x6e, 0x65, 0x64, 0x65, 0x6c, 0x6a, 0x61,
-0x3b, 0x70, 0x6f, 0x6e, 0x65, 0x64, 0x65, 0x6c, 0x6a, 0x61, 0x6b, 0x3b, 0x75, 0x74, 0x6f, 0x72, 0x61, 0x6b, 0x3b, 0x73,
-0x72, 0x65, 0x64, 0x61, 0x3b, 0x10d, 0x65, 0x74, 0x76, 0x72, 0x74, 0x61, 0x6b, 0x3b, 0x70, 0x65, 0x74, 0x61, 0x6b, 0x3b,
-0x73, 0x75, 0x62, 0x6f, 0x74, 0x61, 0x3b, 0x425, 0x446, 0x431, 0x3b, 0x41a, 0x440, 0x441, 0x3b, 0x414, 0x446, 0x433, 0x3b, 0x4d4,
-0x440, 0x442, 0x3b, 0x426, 0x43f, 0x440, 0x3b, 0x41c, 0x440, 0x431, 0x3b, 0x421, 0x431, 0x442, 0x3b, 0x425, 0x443, 0x44b, 0x446, 0x430,
-0x443, 0x431, 0x43e, 0x43d, 0x3b, 0x41a, 0x44a, 0x443, 0x44b, 0x440, 0x438, 0x441, 0x4d5, 0x440, 0x3b, 0x414, 0x44b, 0x446, 0x446, 0x4d5,
-0x433, 0x3b, 0x4d4, 0x440, 0x442, 0x44b, 0x446, 0x446, 0x4d5, 0x433, 0x3b, 0x426, 0x44b, 0x43f, 0x43f, 0x4d5, 0x440, 0x4d5, 0x43c, 0x3b,
-0x41c, 0x430, 0x439, 0x440, 0x4d5, 0x43c, 0x431, 0x43e, 0x43d, 0x3b, 0x421, 0x430, 0x431, 0x430, 0x442, 0x3b, 0x425, 0x3b, 0x41a, 0x3b,
-0x414, 0x3b, 0x4d4, 0x3b, 0x426, 0x3b, 0x41c, 0x3b, 0x421, 0x3b, 0x445, 0x446, 0x431, 0x3b, 0x43a, 0x440, 0x441, 0x3b, 0x434, 0x446,
-0x433, 0x3b, 0x4d5, 0x440, 0x442, 0x3b, 0x446, 0x43f, 0x440, 0x3b, 0x43c, 0x440, 0x431, 0x3b, 0x441, 0x431, 0x442, 0x3b, 0x445, 0x443,
-0x44b, 0x446, 0x430, 0x443, 0x431, 0x43e, 0x43d, 0x3b, 0x43a, 0x44a, 0x443, 0x44b, 0x440, 0x438, 0x441, 0x4d5, 0x440, 0x3b, 0x434, 0x44b,
-0x446, 0x446, 0x4d5, 0x433, 0x3b, 0x4d5, 0x440, 0x442, 0x44b, 0x446, 0x446, 0x4d5, 0x433, 0x3b, 0x446, 0x44b, 0x43f, 0x43f, 0x4d5, 0x440,
-0x4d5, 0x43c, 0x3b, 0x43c, 0x430, 0x439, 0x440, 0x4d5, 0x43c, 0x431, 0x43e, 0x43d, 0x3b, 0x441, 0x430, 0x431, 0x430, 0x442, 0x3b, 0x53,
-0x76, 0x6f, 0x3b, 0x4d, 0x75, 0x76, 0x3b, 0x43, 0x68, 0x70, 0x3b, 0x43, 0x68, 0x74, 0x3b, 0x43, 0x68, 0x6e, 0x3b, 0x43,
-0x68, 0x73, 0x3b, 0x4d, 0x75, 0x67, 0x3b, 0x53, 0x76, 0x6f, 0x6e, 0x64, 0x6f, 0x3b, 0x4d, 0x75, 0x76, 0x68, 0x75, 0x72,
-0x6f, 0x3b, 0x43, 0x68, 0x69, 0x70, 0x69, 0x72, 0x69, 0x3b, 0x43, 0x68, 0x69, 0x74, 0x61, 0x74, 0x75, 0x3b, 0x43, 0x68,
-0x69, 0x6e, 0x61, 0x3b, 0x43, 0x68, 0x69, 0x73, 0x68, 0x61, 0x6e, 0x75, 0x3b, 0x4d, 0x75, 0x67, 0x6f, 0x76, 0x65, 0x72,
-0x61, 0x3b, 0x53, 0x3b, 0x4d, 0x3b, 0x43, 0x3b, 0x43, 0x3b, 0x43, 0x3b, 0x43, 0x3b, 0x4d, 0x3b, 0x622, 0x686, 0x631, 0x3b,
-0x633, 0x648, 0x645, 0x631, 0x3b, 0x627, 0x6b1, 0x627, 0x631, 0x648, 0x3b, 0x627, 0x631, 0x628, 0x639, 0x3b, 0x62e, 0x645, 0x64a, 0x633,
-0x3b, 0x62c, 0x645, 0x639, 0x648, 0x3b, 0x687, 0x646, 0x687, 0x631, 0x3b, 0x622, 0x686, 0x631, 0x3b, 0x633, 0x648, 0x3b, 0x627, 0x6b1,
-0x627, 0x631, 0x648, 0x3b, 0x627, 0x631, 0x628, 0x639, 0x3b, 0x62e, 0x645, 0x3b, 0x62c, 0x645, 0x639, 0x648, 0x3b, 0x687, 0x646, 0x687,
-0x631, 0x3b, 0xd89, 0xdbb, 0xdd2, 0xdaf, 0xdcf, 0x3b, 0xdc3, 0xdb3, 0xdd4, 0xdaf, 0xdcf, 0x3b, 0xd85, 0xd9f, 0xdc4, 0x3b, 0xdb6, 0xdaf,
-0xdcf, 0xdaf, 0xdcf, 0x3b, 0xdb6, 0xdca, 0x200d, 0xdbb, 0xdc4, 0xdc3, 0xdca, 0x3b, 0xdc3, 0xdd2, 0xd9a, 0xdd4, 0x3b, 0xdc3, 0xdd9, 0xdb1,
-0x3b, 0xd89, 0xdbb, 0xdd2, 0xdaf, 0xdcf, 0x3b, 0xdc3, 0xdb3, 0xdd4, 0xdaf, 0xdcf, 0x3b, 0xd85, 0xd9f, 0xdc4, 0xdbb, 0xdd4, 0xdc0, 0xdcf,
-0xdaf, 0xdcf, 0x3b, 0xdb6, 0xdaf, 0xdcf, 0xdaf, 0xdcf, 0x3b, 0xdb6, 0xdca, 0x200d, 0xdbb, 0xdc4, 0xdc3, 0xdca, 0xdb4, 0xdad, 0xdd2, 0xdb1,
-0xdca, 0xdaf, 0xdcf, 0x3b, 0xdc3, 0xdd2, 0xd9a, 0xdd4, 0xdbb, 0xdcf, 0xdaf, 0xdcf, 0x3b, 0xdc3, 0xdd9, 0xdb1, 0xdc3, 0xdd4, 0xdbb, 0xdcf,
-0xdaf, 0xdcf, 0x3b, 0xd89, 0x3b, 0xdc3, 0x3b, 0xd85, 0x3b, 0xdb6, 0x3b, 0xdb6, 0xdca, 0x200d, 0xdbb, 0x3b, 0xdc3, 0xdd2, 0x3b, 0xdc3,
-0xdd9, 0x3b, 0x6e, 0x65, 0x3b, 0x70, 0x6f, 0x3b, 0x75, 0x74, 0x3b, 0x73, 0x74, 0x3b, 0x161, 0x74, 0x3b, 0x70, 0x69, 0x3b,
-0x73, 0x6f, 0x3b, 0x6e, 0x65, 0x64, 0x65, 0x13e, 0x61, 0x3b, 0x70, 0x6f, 0x6e, 0x64, 0x65, 0x6c, 0x6f, 0x6b, 0x3b, 0x75,
-0x74, 0x6f, 0x72, 0x6f, 0x6b, 0x3b, 0x73, 0x74, 0x72, 0x65, 0x64, 0x61, 0x3b, 0x161, 0x74, 0x76, 0x72, 0x74, 0x6f, 0x6b,
-0x3b, 0x70, 0x69, 0x61, 0x74, 0x6f, 0x6b, 0x3b, 0x73, 0x6f, 0x62, 0x6f, 0x74, 0x61, 0x3b, 0x6e, 0x3b, 0x70, 0x3b, 0x75,
-0x3b, 0x73, 0x3b, 0x161, 0x3b, 0x70, 0x3b, 0x73, 0x3b, 0x6e, 0x65, 0x64, 0x2e, 0x3b, 0x70, 0x6f, 0x6e, 0x2e, 0x3b, 0x74,
-0x6f, 0x72, 0x2e, 0x3b, 0x73, 0x72, 0x65, 0x2e, 0x3b, 0x10d, 0x65, 0x74, 0x2e, 0x3b, 0x70, 0x65, 0x74, 0x2e, 0x3b, 0x73,
-0x6f, 0x62, 0x2e, 0x3b, 0x6e, 0x65, 0x64, 0x65, 0x6c, 0x6a, 0x61, 0x3b, 0x70, 0x6f, 0x6e, 0x65, 0x64, 0x65, 0x6c, 0x6a,
-0x65, 0x6b, 0x3b, 0x74, 0x6f, 0x72, 0x65, 0x6b, 0x3b, 0x73, 0x72, 0x65, 0x64, 0x61, 0x3b, 0x10d, 0x65, 0x74, 0x72, 0x74,
-0x65, 0x6b, 0x3b, 0x70, 0x65, 0x74, 0x65, 0x6b, 0x3b, 0x73, 0x6f, 0x62, 0x6f, 0x74, 0x61, 0x3b, 0x6e, 0x3b, 0x70, 0x3b,
-0x74, 0x3b, 0x73, 0x3b, 0x10d, 0x3b, 0x70, 0x3b, 0x73, 0x3b, 0x41, 0x78, 0x64, 0x3b, 0x49, 0x73, 0x6e, 0x3b, 0x54, 0x6c,
-0x64, 0x6f, 0x3b, 0x41, 0x72, 0x62, 0x63, 0x3b, 0x4b, 0x68, 0x6d, 0x73, 0x3b, 0x4a, 0x6d, 0x63, 0x3b, 0x53, 0x62, 0x74,
-0x69, 0x3b, 0x41, 0x78, 0x61, 0x64, 0x3b, 0x49, 0x73, 0x6e, 0x69, 0x69, 0x6e, 0x3b, 0x54, 0x61, 0x6c, 0x61, 0x61, 0x64,
-0x6f, 0x3b, 0x41, 0x72, 0x62, 0x61, 0x63, 0x6f, 0x3b, 0x4b, 0x68, 0x61, 0x6d, 0x69, 0x69, 0x73, 0x3b, 0x4a, 0x69, 0x6d,
-0x63, 0x6f, 0x3b, 0x53, 0x61, 0x62, 0x74, 0x69, 0x3b, 0x41, 0x3b, 0x49, 0x3b, 0x54, 0x3b, 0x41, 0x3b, 0x4b, 0x68, 0x3b,
-0x4a, 0x3b, 0x53, 0x3b, 0x64, 0x6f, 0x6d, 0x2e, 0x3b, 0x6c, 0x75, 0x6e, 0x2e, 0x3b, 0x6d, 0x61, 0x72, 0x2e, 0x3b, 0x6d,
-0x69, 0xe9, 0x2e, 0x3b, 0x6a, 0x75, 0x65, 0x2e, 0x3b, 0x76, 0x69, 0x65, 0x2e, 0x3b, 0x73, 0xe1, 0x62, 0x2e, 0x3b, 0x64,
-0x6f, 0x6d, 0x69, 0x6e, 0x67, 0x6f, 0x3b, 0x6c, 0x75, 0x6e, 0x65, 0x73, 0x3b, 0x6d, 0x61, 0x72, 0x74, 0x65, 0x73, 0x3b,
-0x6d, 0x69, 0xe9, 0x72, 0x63, 0x6f, 0x6c, 0x65, 0x73, 0x3b, 0x6a, 0x75, 0x65, 0x76, 0x65, 0x73, 0x3b, 0x76, 0x69, 0x65,
-0x72, 0x6e, 0x65, 0x73, 0x3b, 0x73, 0xe1, 0x62, 0x61, 0x64, 0x6f, 0x3b, 0x4a, 0x75, 0x6d, 0x61, 0x70, 0x69, 0x6c, 0x69,
-0x3b, 0x4a, 0x75, 0x6d, 0x61, 0x74, 0x61, 0x74, 0x75, 0x3b, 0x4a, 0x75, 0x6d, 0x61, 0x6e, 0x6e, 0x65, 0x3b, 0x4a, 0x75,
-0x6d, 0x61, 0x74, 0x61, 0x6e, 0x6f, 0x3b, 0x41, 0x6c, 0x68, 0x61, 0x6d, 0x69, 0x73, 0x69, 0x3b, 0x49, 0x6a, 0x75, 0x6d,
-0x61, 0x61, 0x3b, 0x4a, 0x75, 0x6d, 0x61, 0x6d, 0x6f, 0x73, 0x69, 0x3b, 0x73, 0xf6, 0x6e, 0x3b, 0x6d, 0xe5, 0x6e, 0x3b,
-0x74, 0x69, 0x73, 0x3b, 0x6f, 0x6e, 0x73, 0x3b, 0x74, 0x6f, 0x72, 0x73, 0x3b, 0x66, 0x72, 0x65, 0x3b, 0x6c, 0xf6, 0x72,
-0x3b, 0x73, 0xf6, 0x6e, 0x64, 0x61, 0x67, 0x3b, 0x6d, 0xe5, 0x6e, 0x64, 0x61, 0x67, 0x3b, 0x74, 0x69, 0x73, 0x64, 0x61,
-0x67, 0x3b, 0x6f, 0x6e, 0x73, 0x64, 0x61, 0x67, 0x3b, 0x74, 0x6f, 0x72, 0x73, 0x64, 0x61, 0x67, 0x3b, 0x66, 0x72, 0x65,
-0x64, 0x61, 0x67, 0x3b, 0x6c, 0xf6, 0x72, 0x64, 0x61, 0x67, 0x3b, 0x42f, 0x448, 0x431, 0x3b, 0x414, 0x448, 0x431, 0x3b, 0x421,
-0x448, 0x431, 0x3b, 0x427, 0x448, 0x431, 0x3b, 0x41f, 0x448, 0x431, 0x3b, 0x4b6, 0x43c, 0x44a, 0x3b, 0x428, 0x43d, 0x431, 0x3b, 0x42f,
-0x43a, 0x448, 0x430, 0x43d, 0x431, 0x435, 0x3b, 0x414, 0x443, 0x448, 0x430, 0x43d, 0x431, 0x435, 0x3b, 0x421, 0x435, 0x448, 0x430, 0x43d,
-0x431, 0x435, 0x3b, 0x427, 0x43e, 0x440, 0x448, 0x430, 0x43d, 0x431, 0x435, 0x3b, 0x41f, 0x430, 0x43d, 0x4b7, 0x448, 0x430, 0x43d, 0x431,
-0x435, 0x3b, 0x4b6, 0x443, 0x43c, 0x44a, 0x430, 0x3b, 0x428, 0x430, 0x43d, 0x431, 0x435, 0x3b, 0x42f, 0x3b, 0x414, 0x3b, 0x421, 0x3b,
-0x427, 0x3b, 0x41f, 0x3b, 0x4b6, 0x3b, 0x428, 0x3b, 0xb9e, 0xbbe, 0xbaf, 0xbbf, 0x2e, 0x3b, 0xba4, 0xbbf, 0xb99, 0xbcd, 0x2e, 0x3b,
-0xb9a, 0xbc6, 0xbb5, 0xbcd, 0x2e, 0x3b, 0xbaa, 0xbc1, 0xba4, 0x2e, 0x3b, 0xbb5, 0xbbf, 0xbaf, 0xbbe, 0x2e, 0x3b, 0xbb5, 0xbc6, 0xbb3,
-0xbcd, 0x2e, 0x3b, 0xb9a, 0xba9, 0xbbf, 0x3b, 0xb9e, 0xbbe, 0xbaf, 0xbbf, 0xbb1, 0xbc1, 0x3b, 0xba4, 0xbbf, 0xb99, 0xbcd, 0xb95, 0xbb3,
-0xbcd, 0x3b, 0xb9a, 0xbc6, 0xbb5, 0xbcd, 0xbb5, 0xbbe, 0xbaf, 0xbcd, 0x3b, 0xbaa, 0xbc1, 0xba4, 0xba9, 0xbcd, 0x3b, 0xbb5, 0xbbf, 0xbaf,
-0xbbe, 0xbb4, 0xba9, 0xbcd, 0x3b, 0xbb5, 0xbc6, 0xbb3, 0xbcd, 0xbb3, 0xbbf, 0x3b, 0xb9a, 0xba9, 0xbbf, 0x3b, 0xb9e, 0xbbe, 0x3b, 0xba4,
-0xbbf, 0x3b, 0xb9a, 0xbc6, 0x3b, 0xbaa, 0xbc1, 0x3b, 0xbb5, 0xbbf, 0x3b, 0xbb5, 0xbc6, 0x3b, 0xb9a, 0x3b, 0x44f, 0x43a, 0x448, 0x2e,
-0x3b, 0x434, 0x4af, 0x448, 0x2e, 0x3b, 0x441, 0x438, 0x448, 0x2e, 0x3b, 0x447, 0x4d9, 0x440, 0x2e, 0x3b, 0x43f, 0x4d9, 0x43d, 0x497,
-0x2e, 0x3b, 0x497, 0x43e, 0x43c, 0x2e, 0x3b, 0x448, 0x438, 0x43c, 0x2e, 0x3b, 0x44f, 0x43a, 0x448, 0x4d9, 0x43c, 0x431, 0x435, 0x3b,
-0x434, 0x4af, 0x448, 0x4d9, 0x43c, 0x431, 0x435, 0x3b, 0x441, 0x438, 0x448, 0x4d9, 0x43c, 0x431, 0x435, 0x3b, 0x447, 0x4d9, 0x440, 0x448,
-0x4d9, 0x43c, 0x431, 0x435, 0x3b, 0x43f, 0x4d9, 0x43d, 0x497, 0x435, 0x448, 0x4d9, 0x43c, 0x431, 0x435, 0x3b, 0x497, 0x43e, 0x43c, 0x433,
-0x430, 0x3b, 0x448, 0x438, 0x43c, 0x431, 0x4d9, 0x3b, 0x42f, 0x3b, 0x414, 0x3b, 0x421, 0x3b, 0x427, 0x3b, 0x41f, 0x3b, 0x496, 0x3b,
-0x428, 0x3b, 0xc06, 0xc26, 0xc3f, 0x3b, 0xc38, 0xc4b, 0xc2e, 0x3b, 0xc2e, 0xc02, 0xc17, 0xc33, 0x3b, 0xc2c, 0xc41, 0xc27, 0x3b, 0xc17,
-0xc41, 0xc30, 0xc41, 0x3b, 0xc36, 0xc41, 0xc15, 0xc4d, 0xc30, 0x3b, 0xc36, 0xc28, 0xc3f, 0x3b, 0xc06, 0xc26, 0xc3f, 0xc35, 0xc3e, 0xc30,
-0xc02, 0x3b, 0xc38, 0xc4b, 0xc2e, 0xc35, 0xc3e, 0xc30, 0xc02, 0x3b, 0xc2e, 0xc02, 0xc17, 0xc33, 0xc35, 0xc3e, 0xc30, 0xc02, 0x3b, 0xc2c,
-0xc41, 0xc27, 0xc35, 0xc3e, 0xc30, 0xc02, 0x3b, 0xc17, 0xc41, 0xc30, 0xc41, 0xc35, 0xc3e, 0xc30, 0xc02, 0x3b, 0xc36, 0xc41, 0xc15, 0xc4d,
-0xc30, 0xc35, 0xc3e, 0xc30, 0xc02, 0x3b, 0xc36, 0xc28, 0xc3f, 0xc35, 0xc3e, 0xc30, 0xc02, 0x3b, 0xc06, 0x3b, 0xc38, 0xc4b, 0x3b, 0xc2e,
-0x3b, 0xc2c, 0xc41, 0x3b, 0xc17, 0xc41, 0x3b, 0xc36, 0xc41, 0x3b, 0xc36, 0x3b, 0xe2d, 0xe32, 0x2e, 0x3b, 0xe08, 0x2e, 0x3b, 0xe2d,
-0x2e, 0x3b, 0xe1e, 0x2e, 0x3b, 0xe1e, 0xe24, 0x2e, 0x3b, 0xe28, 0x2e, 0x3b, 0xe2a, 0x2e, 0x3b, 0xe27, 0xe31, 0xe19, 0xe2d, 0xe32,
-0xe17, 0xe34, 0xe15, 0xe22, 0xe4c, 0x3b, 0xe27, 0xe31, 0xe19, 0xe08, 0xe31, 0xe19, 0xe17, 0xe23, 0xe4c, 0x3b, 0xe27, 0xe31, 0xe19, 0xe2d,
-0xe31, 0xe07, 0xe04, 0xe32, 0xe23, 0x3b, 0xe27, 0xe31, 0xe19, 0xe1e, 0xe38, 0xe18, 0x3b, 0xe27, 0xe31, 0xe19, 0xe1e, 0xe24, 0xe2b, 0xe31,
-0xe2a, 0xe1a, 0xe14, 0xe35, 0x3b, 0xe27, 0xe31, 0xe19, 0xe28, 0xe38, 0xe01, 0xe23, 0xe4c, 0x3b, 0xe27, 0xe31, 0xe19, 0xe40, 0xe2a, 0xe32,
-0xe23, 0xe4c, 0x3b, 0xe2d, 0xe32, 0x3b, 0xe08, 0x3b, 0xe2d, 0x3b, 0xe1e, 0x3b, 0xe1e, 0xe24, 0x3b, 0xe28, 0x3b, 0xe2a, 0x3b, 0xf49,
-0xf72, 0xf0b, 0xf58, 0xf0b, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf0b, 0x3b, 0xf58, 0xf72, 0xf42, 0xf0b, 0xf51, 0xf58, 0xf62, 0xf0b, 0x3b,
-0xf63, 0xfb7, 0xf42, 0xf0b, 0xf54, 0xf0b, 0x3b, 0xf55, 0xf74, 0xf62, 0xf0b, 0xf56, 0xf74, 0xf0b, 0x3b, 0xf54, 0xf0b, 0xf66, 0xf44, 0xf66,
-0xf0b, 0x3b, 0xf66, 0xfa4, 0xf7a, 0xf53, 0xf0b, 0xf54, 0xf0b, 0x3b, 0xf42, 0xf5f, 0xf60, 0xf0b, 0xf49, 0xf72, 0xf0b, 0xf58, 0xf0b, 0x3b,
-0xf42, 0xf5f, 0xf60, 0xf0b, 0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf0b, 0x3b, 0xf42, 0xf5f, 0xf60, 0xf0b, 0xf58, 0xf72, 0xf42, 0xf0b, 0xf51, 0xf58,
-0xf62, 0xf0b, 0x3b, 0xf42, 0xf5f, 0xf60, 0xf0b, 0xf63, 0xfb7, 0xf42, 0xf0b, 0xf54, 0xf0b, 0x3b, 0xf42, 0xf5f, 0xf60, 0xf0b, 0xf55, 0xf74,
-0xf62, 0xf0b, 0xf56, 0xf74, 0xf0b, 0x3b, 0xf42, 0xf5f, 0xf60, 0xf0b, 0xf54, 0xf0b, 0xf66, 0xf44, 0xf66, 0xf0b, 0x3b, 0xf42, 0xf5f, 0xf60,
-0xf0b, 0xf66, 0xfa4, 0xf7a, 0xf53, 0xf0b, 0xf54, 0xf0b, 0x3b, 0xf49, 0xf72, 0x3b, 0xf5f, 0xfb3, 0x3b, 0xf58, 0xf72, 0xf42, 0x3b, 0xf63,
-0xfb7, 0xf42, 0x3b, 0xf55, 0xf74, 0xf62, 0x3b, 0xf66, 0xf44, 0xf66, 0x3b, 0xf66, 0xfa4, 0xf7a, 0xf53, 0x3b, 0x1230, 0x1295, 0x3b, 0x1230,
-0x1291, 0x3b, 0x1230, 0x1209, 0x3b, 0x1228, 0x1261, 0x3b, 0x1213, 0x1219, 0x3b, 0x12d3, 0x122d, 0x3b, 0x1240, 0x12f3, 0x3b, 0x1230, 0x1295, 0x1260,
-0x1275, 0x3b, 0x1230, 0x1291, 0x12ed, 0x3b, 0x1220, 0x1209, 0x1235, 0x3b, 0x1228, 0x1261, 0x12d5, 0x3b, 0x1283, 0x1219, 0x1235, 0x3b, 0x12d3, 0x122d,
-0x1262, 0x3b, 0x1240, 0x12f3, 0x121d, 0x3b, 0x1230, 0x3b, 0x1230, 0x3b, 0x1220, 0x3b, 0x1228, 0x3b, 0x1213, 0x3b, 0x12d3, 0x3b, 0x1240, 0x3b,
-0x1230, 0x3b, 0x1230, 0x3b, 0x1230, 0x3b, 0x1228, 0x3b, 0x1213, 0x3b, 0x12d3, 0x3b, 0x1240, 0x3b, 0x53, 0x101, 0x70, 0x3b, 0x4d, 0x14d,
-0x6e, 0x3b, 0x54, 0x16b, 0x73, 0x3b, 0x50, 0x75, 0x6c, 0x3b, 0x54, 0x75, 0x2bb, 0x61, 0x3b, 0x46, 0x61, 0x6c, 0x3b, 0x54,
-0x6f, 0x6b, 0x3b, 0x53, 0x101, 0x70, 0x61, 0x74, 0x65, 0x3b, 0x4d, 0x14d, 0x6e, 0x69, 0x74, 0x65, 0x3b, 0x54, 0x16b, 0x73,
-0x69, 0x74, 0x65, 0x3b, 0x50, 0x75, 0x6c, 0x65, 0x6c, 0x75, 0x6c, 0x75, 0x3b, 0x54, 0x75, 0x2bb, 0x61, 0x70, 0x75, 0x6c,
-0x65, 0x6c, 0x75, 0x6c, 0x75, 0x3b, 0x46, 0x61, 0x6c, 0x61, 0x69, 0x74, 0x65, 0x3b, 0x54, 0x6f, 0x6b, 0x6f, 0x6e, 0x61,
-0x6b, 0x69, 0x3b, 0x53, 0x3b, 0x4d, 0x3b, 0x54, 0x3b, 0x50, 0x3b, 0x54, 0x3b, 0x46, 0x3b, 0x54, 0x3b, 0x50, 0x61, 0x7a,
-0x3b, 0x50, 0x7a, 0x74, 0x3b, 0x53, 0x61, 0x6c, 0x3b, 0xc7, 0x61, 0x72, 0x3b, 0x50, 0x65, 0x72, 0x3b, 0x43, 0x75, 0x6d,
-0x3b, 0x43, 0x6d, 0x74, 0x3b, 0x50, 0x61, 0x7a, 0x61, 0x72, 0x3b, 0x50, 0x61, 0x7a, 0x61, 0x72, 0x74, 0x65, 0x73, 0x69,
-0x3b, 0x53, 0x61, 0x6c, 0x131, 0x3b, 0xc7, 0x61, 0x72, 0x15f, 0x61, 0x6d, 0x62, 0x61, 0x3b, 0x50, 0x65, 0x72, 0x15f, 0x65,
-0x6d, 0x62, 0x65, 0x3b, 0x43, 0x75, 0x6d, 0x61, 0x3b, 0x43, 0x75, 0x6d, 0x61, 0x72, 0x74, 0x65, 0x73, 0x69, 0x3b, 0x50,
-0x3b, 0x50, 0x3b, 0x53, 0x3b, 0xc7, 0x3b, 0x50, 0x3b, 0x43, 0x3b, 0x43, 0x3b, 0xdd, 0x65, 0x6b, 0x3b, 0x44, 0x75, 0x15f,
-0x3b, 0x53, 0x69, 0x15f, 0x3b, 0xc7, 0x61, 0x72, 0x3b, 0x50, 0x65, 0x6e, 0x3b, 0x41, 0x6e, 0x6e, 0x3b, 0x15e, 0x65, 0x6e,
-0x3b, 0xdd, 0x65, 0x6b, 0x15f, 0x65, 0x6e, 0x62, 0x65, 0x3b, 0x44, 0x75, 0x15f, 0x65, 0x6e, 0x62, 0x65, 0x3b, 0x53, 0x69,
-0x15f, 0x65, 0x6e, 0x62, 0x65, 0x3b, 0xc7, 0x61, 0x72, 0x15f, 0x65, 0x6e, 0x62, 0x65, 0x3b, 0x50, 0x65, 0x6e, 0x15f, 0x65,
-0x6e, 0x62, 0x65, 0x3b, 0x41, 0x6e, 0x6e, 0x61, 0x3b, 0x15e, 0x65, 0x6e, 0x62, 0x65, 0x3b, 0xdd, 0x3b, 0x44, 0x3b, 0x53,
-0x3b, 0xc7, 0x3b, 0x50, 0x3b, 0x41, 0x3b, 0x15e, 0x3b, 0xfd, 0x65, 0x6b, 0x3b, 0x64, 0x75, 0x15f, 0x3b, 0x73, 0x69, 0x15f,
-0x3b, 0xe7, 0x61, 0x72, 0x3b, 0x70, 0x65, 0x6e, 0x3b, 0x61, 0x6e, 0x6e, 0x3b, 0x15f, 0x65, 0x6e, 0x3b, 0xfd, 0x65, 0x6b,
-0x15f, 0x65, 0x6e, 0x62, 0x65, 0x3b, 0x64, 0x75, 0x15f, 0x65, 0x6e, 0x62, 0x65, 0x3b, 0x73, 0x69, 0x15f, 0x65, 0x6e, 0x62,
-0x65, 0x3b, 0xe7, 0x61, 0x72, 0x15f, 0x65, 0x6e, 0x62, 0x65, 0x3b, 0x70, 0x65, 0x6e, 0x15f, 0x65, 0x6e, 0x62, 0x65, 0x3b,
-0x61, 0x6e, 0x6e, 0x61, 0x3b, 0x15f, 0x65, 0x6e, 0x62, 0x65, 0x3b, 0x64a, 0x6d5, 0x3b, 0x62f, 0x6c8, 0x3b, 0x633, 0x6d5, 0x3b,
-0x686, 0x627, 0x3b, 0x67e, 0x6d5, 0x3b, 0x62c, 0x6c8, 0x3b, 0x634, 0x6d5, 0x3b, 0x64a, 0x6d5, 0x643, 0x634, 0x6d5, 0x646, 0x628, 0x6d5,
+0x62, 0x6f, 0x74, 0x61, 0x6e, 0x65, 0x64, 0x3b, 0x70, 0x6f, 0x6e, 0x3b, 0x75, 0x74, 0x3b, 0x73, 0x72, 0x3b, 0x10d, 0x65,
+0x74, 0x3b, 0x70, 0x65, 0x74, 0x3b, 0x73, 0x75, 0x62, 0x6e, 0x65, 0x64, 0x3b, 0x70, 0x6f, 0x6e, 0x3b, 0x75, 0x74, 0x6f,
+0x3b, 0x73, 0x72, 0x65, 0x3b, 0x10d, 0x65, 0x74, 0x3b, 0x70, 0x65, 0x74, 0x3b, 0x73, 0x75, 0x62, 0x6e, 0x65, 0x64, 0x65,
+0x6c, 0x6a, 0x61, 0x3b, 0x70, 0x6f, 0x6e, 0x65, 0x64, 0x65, 0x6c, 0x6a, 0x61, 0x6b, 0x3b, 0x75, 0x74, 0x6f, 0x72, 0x61,
+0x6b, 0x3b, 0x73, 0x72, 0x65, 0x64, 0x61, 0x3b, 0x10d, 0x65, 0x74, 0x76, 0x72, 0x74, 0x61, 0x6b, 0x3b, 0x70, 0x65, 0x74,
+0x61, 0x6b, 0x3b, 0x73, 0x75, 0x62, 0x6f, 0x74, 0x61, 0x43d, 0x435, 0x434, 0x458, 0x435, 0x459, 0x430, 0x3b, 0x43f, 0x43e, 0x43d,
+0x435, 0x434, 0x435, 0x459, 0x430, 0x43a, 0x3b, 0x443, 0x442, 0x43e, 0x440, 0x430, 0x43a, 0x3b, 0x441, 0x440, 0x438, 0x458, 0x435, 0x434,
+0x430, 0x3b, 0x447, 0x435, 0x442, 0x432, 0x440, 0x442, 0x430, 0x43a, 0x3b, 0x43f, 0x435, 0x442, 0x430, 0x43a, 0x3b, 0x441, 0x443, 0x431,
+0x43e, 0x442, 0x430, 0x43d, 0x435, 0x434, 0x3b, 0x43f, 0x43e, 0x43d, 0x3b, 0x443, 0x442, 0x3b, 0x441, 0x440, 0x3b, 0x447, 0x435, 0x442,
+0x3b, 0x43f, 0x435, 0x442, 0x3b, 0x441, 0x443, 0x431, 0x425, 0x443, 0x44b, 0x446, 0x430, 0x443, 0x431, 0x43e, 0x43d, 0x3b, 0x41a, 0x44a,
+0x443, 0x44b, 0x440, 0x438, 0x441, 0x4d5, 0x440, 0x3b, 0x414, 0x44b, 0x446, 0x446, 0x4d5, 0x433, 0x3b, 0x4d4, 0x440, 0x442, 0x44b, 0x446,
+0x446, 0x4d5, 0x433, 0x3b, 0x426, 0x44b, 0x43f, 0x43f, 0x4d5, 0x440, 0x4d5, 0x43c, 0x3b, 0x41c, 0x430, 0x439, 0x440, 0x4d5, 0x43c, 0x431,
+0x43e, 0x43d, 0x3b, 0x421, 0x430, 0x431, 0x430, 0x442, 0x445, 0x443, 0x44b, 0x446, 0x430, 0x443, 0x431, 0x43e, 0x43d, 0x3b, 0x43a, 0x44a,
+0x443, 0x44b, 0x440, 0x438, 0x441, 0x4d5, 0x440, 0x3b, 0x434, 0x44b, 0x446, 0x446, 0x4d5, 0x433, 0x3b, 0x4d5, 0x440, 0x442, 0x44b, 0x446,
+0x446, 0x4d5, 0x433, 0x3b, 0x446, 0x44b, 0x43f, 0x43f, 0x4d5, 0x440, 0x4d5, 0x43c, 0x3b, 0x43c, 0x430, 0x439, 0x440, 0x4d5, 0x43c, 0x431,
+0x43e, 0x43d, 0x3b, 0x441, 0x430, 0x431, 0x430, 0x442, 0x425, 0x446, 0x431, 0x3b, 0x41a, 0x440, 0x441, 0x3b, 0x414, 0x446, 0x433, 0x3b,
+0x4d4, 0x440, 0x442, 0x3b, 0x426, 0x43f, 0x440, 0x3b, 0x41c, 0x440, 0x431, 0x3b, 0x421, 0x431, 0x442, 0x445, 0x446, 0x431, 0x3b, 0x43a,
+0x440, 0x441, 0x3b, 0x434, 0x446, 0x433, 0x3b, 0x4d5, 0x440, 0x442, 0x3b, 0x446, 0x43f, 0x440, 0x3b, 0x43c, 0x440, 0x431, 0x3b, 0x441,
+0x431, 0x442, 0x425, 0x3b, 0x41a, 0x3b, 0x414, 0x3b, 0x4d4, 0x3b, 0x426, 0x3b, 0x41c, 0x3b, 0x421, 0x53, 0x76, 0x6f, 0x6e, 0x64,
+0x6f, 0x3b, 0x4d, 0x75, 0x76, 0x68, 0x75, 0x72, 0x6f, 0x3b, 0x43, 0x68, 0x69, 0x70, 0x69, 0x72, 0x69, 0x3b, 0x43, 0x68,
+0x69, 0x74, 0x61, 0x74, 0x75, 0x3b, 0x43, 0x68, 0x69, 0x6e, 0x61, 0x3b, 0x43, 0x68, 0x69, 0x73, 0x68, 0x61, 0x6e, 0x75,
+0x3b, 0x4d, 0x75, 0x67, 0x6f, 0x76, 0x65, 0x72, 0x61, 0x53, 0x76, 0x6f, 0x3b, 0x4d, 0x75, 0x76, 0x3b, 0x43, 0x68, 0x70,
+0x3b, 0x43, 0x68, 0x74, 0x3b, 0x43, 0x68, 0x6e, 0x3b, 0x43, 0x68, 0x73, 0x3b, 0x4d, 0x75, 0x67, 0x53, 0x3b, 0x4d, 0x3b,
+0x43, 0x3b, 0x43, 0x3b, 0x43, 0x3b, 0x43, 0x3b, 0x4d, 0x622, 0x686, 0x631, 0x3b, 0x633, 0x648, 0x645, 0x631, 0x3b, 0x627, 0x6b1,
+0x627, 0x631, 0x648, 0x3b, 0x627, 0x631, 0x628, 0x639, 0x3b, 0x62e, 0x645, 0x64a, 0x633, 0x3b, 0x62c, 0x645, 0x639, 0x648, 0x3b, 0x687,
+0x646, 0x687, 0x631, 0x622, 0x686, 0x631, 0x3b, 0x633, 0x648, 0x3b, 0x627, 0x6b1, 0x627, 0x631, 0x648, 0x3b, 0x627, 0x631, 0x628, 0x639,
+0x3b, 0x62e, 0x645, 0x3b, 0x62c, 0x645, 0x639, 0x648, 0x3b, 0x687, 0x646, 0x687, 0x631, 0xd89, 0xdbb, 0xdd2, 0xdaf, 0xdcf, 0x3b, 0xdc3,
+0xdb3, 0xdd4, 0xdaf, 0xdcf, 0x3b, 0xd85, 0xd9f, 0xdc4, 0xdbb, 0xdd4, 0xdc0, 0xdcf, 0xdaf, 0xdcf, 0x3b, 0xdb6, 0xdaf, 0xdcf, 0xdaf, 0xdcf,
+0x3b, 0xdb6, 0xdca, 0x200d, 0xdbb, 0xdc4, 0xdc3, 0xdca, 0xdb4, 0xdad, 0xdd2, 0xdb1, 0xdca, 0xdaf, 0xdcf, 0x3b, 0xdc3, 0xdd2, 0xd9a, 0xdd4,
+0xdbb, 0xdcf, 0xdaf, 0xdcf, 0x3b, 0xdc3, 0xdd9, 0xdb1, 0xdc3, 0xdd4, 0xdbb, 0xdcf, 0xdaf, 0xdcf, 0xd89, 0xdbb, 0xdd2, 0xdaf, 0xdcf, 0x3b,
+0xdc3, 0xdb3, 0xdd4, 0xdaf, 0xdcf, 0x3b, 0xd85, 0xd9f, 0xdc4, 0x3b, 0xdb6, 0xdaf, 0xdcf, 0xdaf, 0xdcf, 0x3b, 0xdb6, 0xdca, 0x200d, 0xdbb,
+0xdc4, 0xdc3, 0xdca, 0x3b, 0xdc3, 0xdd2, 0xd9a, 0xdd4, 0x3b, 0xdc3, 0xdd9, 0xdb1, 0xd89, 0x3b, 0xdc3, 0x3b, 0xd85, 0x3b, 0xdb6, 0x3b,
+0xdb6, 0xdca, 0x200d, 0xdbb, 0x3b, 0xdc3, 0xdd2, 0x3b, 0xdc3, 0xdd9, 0x6e, 0x65, 0x64, 0x65, 0x13e, 0x61, 0x3b, 0x70, 0x6f, 0x6e,
+0x64, 0x65, 0x6c, 0x6f, 0x6b, 0x3b, 0x75, 0x74, 0x6f, 0x72, 0x6f, 0x6b, 0x3b, 0x73, 0x74, 0x72, 0x65, 0x64, 0x61, 0x3b,
+0x161, 0x74, 0x76, 0x72, 0x74, 0x6f, 0x6b, 0x3b, 0x70, 0x69, 0x61, 0x74, 0x6f, 0x6b, 0x3b, 0x73, 0x6f, 0x62, 0x6f, 0x74,
+0x61, 0x6e, 0x65, 0x3b, 0x70, 0x6f, 0x3b, 0x75, 0x74, 0x3b, 0x73, 0x74, 0x3b, 0x161, 0x74, 0x3b, 0x70, 0x69, 0x3b, 0x73,
+0x6f, 0x6e, 0x3b, 0x70, 0x3b, 0x75, 0x3b, 0x73, 0x3b, 0x161, 0x3b, 0x70, 0x3b, 0x73, 0x6e, 0x65, 0x64, 0x65, 0x6c, 0x6a,
+0x61, 0x3b, 0x70, 0x6f, 0x6e, 0x65, 0x64, 0x65, 0x6c, 0x6a, 0x65, 0x6b, 0x3b, 0x74, 0x6f, 0x72, 0x65, 0x6b, 0x3b, 0x73,
+0x72, 0x65, 0x64, 0x61, 0x3b, 0x10d, 0x65, 0x74, 0x72, 0x74, 0x65, 0x6b, 0x3b, 0x70, 0x65, 0x74, 0x65, 0x6b, 0x3b, 0x73,
+0x6f, 0x62, 0x6f, 0x74, 0x61, 0x6e, 0x65, 0x64, 0x2e, 0x3b, 0x70, 0x6f, 0x6e, 0x2e, 0x3b, 0x74, 0x6f, 0x72, 0x2e, 0x3b,
+0x73, 0x72, 0x65, 0x2e, 0x3b, 0x10d, 0x65, 0x74, 0x2e, 0x3b, 0x70, 0x65, 0x74, 0x2e, 0x3b, 0x73, 0x6f, 0x62, 0x2e, 0x6e,
+0x3b, 0x70, 0x3b, 0x74, 0x3b, 0x73, 0x3b, 0x10d, 0x3b, 0x70, 0x3b, 0x73, 0x41, 0x78, 0x61, 0x64, 0x3b, 0x49, 0x73, 0x6e,
+0x69, 0x69, 0x6e, 0x3b, 0x54, 0x61, 0x6c, 0x61, 0x61, 0x64, 0x6f, 0x3b, 0x41, 0x72, 0x62, 0x61, 0x63, 0x6f, 0x3b, 0x4b,
+0x68, 0x61, 0x6d, 0x69, 0x69, 0x73, 0x3b, 0x4a, 0x69, 0x6d, 0x63, 0x6f, 0x3b, 0x53, 0x61, 0x62, 0x74, 0x69, 0x41, 0x78,
+0x64, 0x3b, 0x49, 0x73, 0x6e, 0x3b, 0x54, 0x6c, 0x64, 0x6f, 0x3b, 0x41, 0x72, 0x62, 0x63, 0x3b, 0x4b, 0x68, 0x6d, 0x73,
+0x3b, 0x4a, 0x6d, 0x63, 0x3b, 0x53, 0x62, 0x74, 0x69, 0x41, 0x3b, 0x49, 0x3b, 0x54, 0x3b, 0x41, 0x3b, 0x4b, 0x68, 0x3b,
+0x4a, 0x3b, 0x53, 0x64, 0x6f, 0x6d, 0x69, 0x6e, 0x67, 0x6f, 0x3b, 0x6c, 0x75, 0x6e, 0x65, 0x73, 0x3b, 0x6d, 0x61, 0x72,
+0x74, 0x65, 0x73, 0x3b, 0x6d, 0x69, 0xe9, 0x72, 0x63, 0x6f, 0x6c, 0x65, 0x73, 0x3b, 0x6a, 0x75, 0x65, 0x76, 0x65, 0x73,
+0x3b, 0x76, 0x69, 0x65, 0x72, 0x6e, 0x65, 0x73, 0x3b, 0x73, 0xe1, 0x62, 0x61, 0x64, 0x6f, 0x64, 0x6f, 0x6d, 0x2e, 0x3b,
+0x6c, 0x75, 0x6e, 0x2e, 0x3b, 0x6d, 0x61, 0x72, 0x2e, 0x3b, 0x6d, 0x69, 0xe9, 0x2e, 0x3b, 0x6a, 0x75, 0x65, 0x2e, 0x3b,
+0x76, 0x69, 0x65, 0x2e, 0x3b, 0x73, 0xe1, 0x62, 0x2e, 0x4a, 0x75, 0x6d, 0x61, 0x70, 0x69, 0x6c, 0x69, 0x3b, 0x4a, 0x75,
+0x6d, 0x61, 0x74, 0x61, 0x74, 0x75, 0x3b, 0x4a, 0x75, 0x6d, 0x61, 0x6e, 0x6e, 0x65, 0x3b, 0x4a, 0x75, 0x6d, 0x61, 0x74,
+0x61, 0x6e, 0x6f, 0x3b, 0x41, 0x6c, 0x68, 0x61, 0x6d, 0x69, 0x73, 0x69, 0x3b, 0x49, 0x6a, 0x75, 0x6d, 0x61, 0x61, 0x3b,
+0x4a, 0x75, 0x6d, 0x61, 0x6d, 0x6f, 0x73, 0x69, 0x73, 0xf6, 0x6e, 0x64, 0x61, 0x67, 0x3b, 0x6d, 0xe5, 0x6e, 0x64, 0x61,
+0x67, 0x3b, 0x74, 0x69, 0x73, 0x64, 0x61, 0x67, 0x3b, 0x6f, 0x6e, 0x73, 0x64, 0x61, 0x67, 0x3b, 0x74, 0x6f, 0x72, 0x73,
+0x64, 0x61, 0x67, 0x3b, 0x66, 0x72, 0x65, 0x64, 0x61, 0x67, 0x3b, 0x6c, 0xf6, 0x72, 0x64, 0x61, 0x67, 0x73, 0xf6, 0x6e,
+0x3b, 0x6d, 0xe5, 0x6e, 0x3b, 0x74, 0x69, 0x73, 0x3b, 0x6f, 0x6e, 0x73, 0x3b, 0x74, 0x6f, 0x72, 0x73, 0x3b, 0x66, 0x72,
+0x65, 0x3b, 0x6c, 0xf6, 0x72, 0x42f, 0x43a, 0x448, 0x430, 0x43d, 0x431, 0x435, 0x3b, 0x414, 0x443, 0x448, 0x430, 0x43d, 0x431, 0x435,
+0x3b, 0x421, 0x435, 0x448, 0x430, 0x43d, 0x431, 0x435, 0x3b, 0x427, 0x43e, 0x440, 0x448, 0x430, 0x43d, 0x431, 0x435, 0x3b, 0x41f, 0x430,
+0x43d, 0x4b7, 0x448, 0x430, 0x43d, 0x431, 0x435, 0x3b, 0x4b6, 0x443, 0x43c, 0x44a, 0x430, 0x3b, 0x428, 0x430, 0x43d, 0x431, 0x435, 0x42f,
+0x448, 0x431, 0x3b, 0x414, 0x448, 0x431, 0x3b, 0x421, 0x448, 0x431, 0x3b, 0x427, 0x448, 0x431, 0x3b, 0x41f, 0x448, 0x431, 0x3b, 0x4b6,
+0x43c, 0x44a, 0x3b, 0x428, 0x43d, 0x431, 0x42f, 0x3b, 0x414, 0x3b, 0x421, 0x3b, 0x427, 0x3b, 0x41f, 0x3b, 0x4b6, 0x3b, 0x428, 0xb9e,
+0xbbe, 0xbaf, 0xbbf, 0xbb1, 0xbc1, 0x3b, 0xba4, 0xbbf, 0xb99, 0xbcd, 0xb95, 0xbb3, 0xbcd, 0x3b, 0xb9a, 0xbc6, 0xbb5, 0xbcd, 0xbb5, 0xbbe,
+0xbaf, 0xbcd, 0x3b, 0xbaa, 0xbc1, 0xba4, 0xba9, 0xbcd, 0x3b, 0xbb5, 0xbbf, 0xbaf, 0xbbe, 0xbb4, 0xba9, 0xbcd, 0x3b, 0xbb5, 0xbc6, 0xbb3,
+0xbcd, 0xbb3, 0xbbf, 0x3b, 0xb9a, 0xba9, 0xbbf, 0xb9e, 0xbbe, 0xbaf, 0xbbf, 0x2e, 0x3b, 0xba4, 0xbbf, 0xb99, 0xbcd, 0x2e, 0x3b, 0xb9a,
+0xbc6, 0xbb5, 0xbcd, 0x2e, 0x3b, 0xbaa, 0xbc1, 0xba4, 0x2e, 0x3b, 0xbb5, 0xbbf, 0xbaf, 0xbbe, 0x2e, 0x3b, 0xbb5, 0xbc6, 0xbb3, 0xbcd,
+0x2e, 0x3b, 0xb9a, 0xba9, 0xbbf, 0xb9e, 0xbbe, 0x3b, 0xba4, 0xbbf, 0x3b, 0xb9a, 0xbc6, 0x3b, 0xbaa, 0xbc1, 0x3b, 0xbb5, 0xbbf, 0x3b,
+0xbb5, 0xbc6, 0x3b, 0xb9a, 0x44f, 0x43a, 0x448, 0x4d9, 0x43c, 0x431, 0x435, 0x3b, 0x434, 0x4af, 0x448, 0x4d9, 0x43c, 0x431, 0x435, 0x3b,
+0x441, 0x438, 0x448, 0x4d9, 0x43c, 0x431, 0x435, 0x3b, 0x447, 0x4d9, 0x440, 0x448, 0x4d9, 0x43c, 0x431, 0x435, 0x3b, 0x43f, 0x4d9, 0x43d,
+0x497, 0x435, 0x448, 0x4d9, 0x43c, 0x431, 0x435, 0x3b, 0x497, 0x43e, 0x43c, 0x433, 0x430, 0x3b, 0x448, 0x438, 0x43c, 0x431, 0x4d9, 0x44f,
+0x43a, 0x448, 0x2e, 0x3b, 0x434, 0x4af, 0x448, 0x2e, 0x3b, 0x441, 0x438, 0x448, 0x2e, 0x3b, 0x447, 0x4d9, 0x440, 0x2e, 0x3b, 0x43f,
+0x4d9, 0x43d, 0x497, 0x2e, 0x3b, 0x497, 0x43e, 0x43c, 0x2e, 0x3b, 0x448, 0x438, 0x43c, 0x2e, 0x42f, 0x3b, 0x414, 0x3b, 0x421, 0x3b,
+0x427, 0x3b, 0x41f, 0x3b, 0x496, 0x3b, 0x428, 0xc06, 0xc26, 0xc3f, 0xc35, 0xc3e, 0xc30, 0xc02, 0x3b, 0xc38, 0xc4b, 0xc2e, 0xc35, 0xc3e,
+0xc30, 0xc02, 0x3b, 0xc2e, 0xc02, 0xc17, 0xc33, 0xc35, 0xc3e, 0xc30, 0xc02, 0x3b, 0xc2c, 0xc41, 0xc27, 0xc35, 0xc3e, 0xc30, 0xc02, 0x3b,
+0xc17, 0xc41, 0xc30, 0xc41, 0xc35, 0xc3e, 0xc30, 0xc02, 0x3b, 0xc36, 0xc41, 0xc15, 0xc4d, 0xc30, 0xc35, 0xc3e, 0xc30, 0xc02, 0x3b, 0xc36,
+0xc28, 0xc3f, 0xc35, 0xc3e, 0xc30, 0xc02, 0xc06, 0xc26, 0xc3f, 0x3b, 0xc38, 0xc4b, 0xc2e, 0x3b, 0xc2e, 0xc02, 0xc17, 0xc33, 0x3b, 0xc2c,
+0xc41, 0xc27, 0x3b, 0xc17, 0xc41, 0xc30, 0xc41, 0x3b, 0xc36, 0xc41, 0xc15, 0xc4d, 0xc30, 0x3b, 0xc36, 0xc28, 0xc3f, 0xc06, 0x3b, 0xc38,
+0xc4b, 0x3b, 0xc2e, 0x3b, 0xc2c, 0xc41, 0x3b, 0xc17, 0xc41, 0x3b, 0xc36, 0xc41, 0x3b, 0xc36, 0xe27, 0xe31, 0xe19, 0xe2d, 0xe32, 0xe17,
+0xe34, 0xe15, 0xe22, 0xe4c, 0x3b, 0xe27, 0xe31, 0xe19, 0xe08, 0xe31, 0xe19, 0xe17, 0xe23, 0xe4c, 0x3b, 0xe27, 0xe31, 0xe19, 0xe2d, 0xe31,
+0xe07, 0xe04, 0xe32, 0xe23, 0x3b, 0xe27, 0xe31, 0xe19, 0xe1e, 0xe38, 0xe18, 0x3b, 0xe27, 0xe31, 0xe19, 0xe1e, 0xe24, 0xe2b, 0xe31, 0xe2a,
+0xe1a, 0xe14, 0xe35, 0x3b, 0xe27, 0xe31, 0xe19, 0xe28, 0xe38, 0xe01, 0xe23, 0xe4c, 0x3b, 0xe27, 0xe31, 0xe19, 0xe40, 0xe2a, 0xe32, 0xe23,
+0xe4c, 0xe2d, 0xe32, 0x2e, 0x3b, 0xe08, 0x2e, 0x3b, 0xe2d, 0x2e, 0x3b, 0xe1e, 0x2e, 0x3b, 0xe1e, 0xe24, 0x2e, 0x3b, 0xe28, 0x2e,
+0x3b, 0xe2a, 0x2e, 0xe2d, 0xe32, 0x3b, 0xe08, 0x3b, 0xe2d, 0x3b, 0xe1e, 0x3b, 0xe1e, 0xe24, 0x3b, 0xe28, 0x3b, 0xe2a, 0xf42, 0xf5f,
+0xf60, 0xf0b, 0xf49, 0xf72, 0xf0b, 0xf58, 0xf0b, 0x3b, 0xf42, 0xf5f, 0xf60, 0xf0b, 0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf0b, 0x3b, 0xf42, 0xf5f,
+0xf60, 0xf0b, 0xf58, 0xf72, 0xf42, 0xf0b, 0xf51, 0xf58, 0xf62, 0xf0b, 0x3b, 0xf42, 0xf5f, 0xf60, 0xf0b, 0xf63, 0xfb7, 0xf42, 0xf0b, 0xf54,
+0xf0b, 0x3b, 0xf42, 0xf5f, 0xf60, 0xf0b, 0xf55, 0xf74, 0xf62, 0xf0b, 0xf56, 0xf74, 0xf0b, 0x3b, 0xf42, 0xf5f, 0xf60, 0xf0b, 0xf54, 0xf0b,
+0xf66, 0xf44, 0xf66, 0xf0b, 0x3b, 0xf42, 0xf5f, 0xf60, 0xf0b, 0xf66, 0xfa4, 0xf7a, 0xf53, 0xf0b, 0xf54, 0xf0b, 0xf49, 0xf72, 0xf0b, 0xf58,
+0xf0b, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf0b, 0x3b, 0xf58, 0xf72, 0xf42, 0xf0b, 0xf51, 0xf58, 0xf62, 0xf0b, 0x3b, 0xf63, 0xfb7, 0xf42,
+0xf0b, 0xf54, 0xf0b, 0x3b, 0xf55, 0xf74, 0xf62, 0xf0b, 0xf56, 0xf74, 0xf0b, 0x3b, 0xf54, 0xf0b, 0xf66, 0xf44, 0xf66, 0xf0b, 0x3b, 0xf66,
+0xfa4, 0xf7a, 0xf53, 0xf0b, 0xf54, 0xf0b, 0xf49, 0xf72, 0x3b, 0xf5f, 0xfb3, 0x3b, 0xf58, 0xf72, 0xf42, 0x3b, 0xf63, 0xfb7, 0xf42, 0x3b,
+0xf55, 0xf74, 0xf62, 0x3b, 0xf66, 0xf44, 0xf66, 0x3b, 0xf66, 0xfa4, 0xf7a, 0xf53, 0x1230, 0x1295, 0x1260, 0x1275, 0x3b, 0x1230, 0x1291, 0x12ed,
+0x3b, 0x1220, 0x1209, 0x1235, 0x3b, 0x1228, 0x1261, 0x12d5, 0x3b, 0x1283, 0x1219, 0x1235, 0x3b, 0x12d3, 0x122d, 0x1262, 0x3b, 0x1240, 0x12f3, 0x121d,
+0x1230, 0x1295, 0x3b, 0x1230, 0x1291, 0x3b, 0x1230, 0x1209, 0x3b, 0x1228, 0x1261, 0x3b, 0x1213, 0x1219, 0x3b, 0x12d3, 0x122d, 0x3b, 0x1240, 0x12f3,
+0x1230, 0x3b, 0x1230, 0x3b, 0x1220, 0x3b, 0x1228, 0x3b, 0x1213, 0x3b, 0x12d3, 0x3b, 0x1240, 0x1230, 0x3b, 0x1230, 0x3b, 0x1230, 0x3b, 0x1228,
+0x3b, 0x1213, 0x3b, 0x12d3, 0x3b, 0x1240, 0x53, 0x101, 0x70, 0x61, 0x74, 0x65, 0x3b, 0x4d, 0x14d, 0x6e, 0x69, 0x74, 0x65, 0x3b,
+0x54, 0x16b, 0x73, 0x69, 0x74, 0x65, 0x3b, 0x50, 0x75, 0x6c, 0x65, 0x6c, 0x75, 0x6c, 0x75, 0x3b, 0x54, 0x75, 0x2bb, 0x61,
+0x70, 0x75, 0x6c, 0x65, 0x6c, 0x75, 0x6c, 0x75, 0x3b, 0x46, 0x61, 0x6c, 0x61, 0x69, 0x74, 0x65, 0x3b, 0x54, 0x6f, 0x6b,
+0x6f, 0x6e, 0x61, 0x6b, 0x69, 0x53, 0x101, 0x70, 0x3b, 0x4d, 0x14d, 0x6e, 0x3b, 0x54, 0x16b, 0x73, 0x3b, 0x50, 0x75, 0x6c,
+0x3b, 0x54, 0x75, 0x2bb, 0x61, 0x3b, 0x46, 0x61, 0x6c, 0x3b, 0x54, 0x6f, 0x6b, 0x53, 0x3b, 0x4d, 0x3b, 0x54, 0x3b, 0x50,
+0x3b, 0x54, 0x3b, 0x46, 0x3b, 0x54, 0x50, 0x61, 0x7a, 0x61, 0x72, 0x3b, 0x50, 0x61, 0x7a, 0x61, 0x72, 0x74, 0x65, 0x73,
+0x69, 0x3b, 0x53, 0x61, 0x6c, 0x131, 0x3b, 0xc7, 0x61, 0x72, 0x15f, 0x61, 0x6d, 0x62, 0x61, 0x3b, 0x50, 0x65, 0x72, 0x15f,
+0x65, 0x6d, 0x62, 0x65, 0x3b, 0x43, 0x75, 0x6d, 0x61, 0x3b, 0x43, 0x75, 0x6d, 0x61, 0x72, 0x74, 0x65, 0x73, 0x69, 0x50,
+0x61, 0x7a, 0x3b, 0x50, 0x7a, 0x74, 0x3b, 0x53, 0x61, 0x6c, 0x3b, 0xc7, 0x61, 0x72, 0x3b, 0x50, 0x65, 0x72, 0x3b, 0x43,
+0x75, 0x6d, 0x3b, 0x43, 0x6d, 0x74, 0x50, 0x3b, 0x50, 0x3b, 0x53, 0x3b, 0xc7, 0x3b, 0x50, 0x3b, 0x43, 0x3b, 0x43, 0xdd,
+0x65, 0x6b, 0x15f, 0x65, 0x6e, 0x62, 0x65, 0x3b, 0x44, 0x75, 0x15f, 0x65, 0x6e, 0x62, 0x65, 0x3b, 0x53, 0x69, 0x15f, 0x65,
+0x6e, 0x62, 0x65, 0x3b, 0xc7, 0x61, 0x72, 0x15f, 0x65, 0x6e, 0x62, 0x65, 0x3b, 0x50, 0x65, 0x6e, 0x15f, 0x65, 0x6e, 0x62,
+0x65, 0x3b, 0x41, 0x6e, 0x6e, 0x61, 0x3b, 0x15e, 0x65, 0x6e, 0x62, 0x65, 0xfd, 0x65, 0x6b, 0x15f, 0x65, 0x6e, 0x62, 0x65,
+0x3b, 0x64, 0x75, 0x15f, 0x65, 0x6e, 0x62, 0x65, 0x3b, 0x73, 0x69, 0x15f, 0x65, 0x6e, 0x62, 0x65, 0x3b, 0xe7, 0x61, 0x72,
+0x15f, 0x65, 0x6e, 0x62, 0x65, 0x3b, 0x70, 0x65, 0x6e, 0x15f, 0x65, 0x6e, 0x62, 0x65, 0x3b, 0x61, 0x6e, 0x6e, 0x61, 0x3b,
+0x15f, 0x65, 0x6e, 0x62, 0x65, 0xdd, 0x65, 0x6b, 0x3b, 0x44, 0x75, 0x15f, 0x3b, 0x53, 0x69, 0x15f, 0x3b, 0xc7, 0x61, 0x72,
+0x3b, 0x50, 0x65, 0x6e, 0x3b, 0x41, 0x6e, 0x6e, 0x3b, 0x15e, 0x65, 0x6e, 0xfd, 0x65, 0x6b, 0x3b, 0x64, 0x75, 0x15f, 0x3b,
+0x73, 0x69, 0x15f, 0x3b, 0xe7, 0x61, 0x72, 0x3b, 0x70, 0x65, 0x6e, 0x3b, 0x61, 0x6e, 0x6e, 0x3b, 0x15f, 0x65, 0x6e, 0xdd,
+0x3b, 0x44, 0x3b, 0x53, 0x3b, 0xc7, 0x3b, 0x50, 0x3b, 0x41, 0x3b, 0x15e, 0x64a, 0x6d5, 0x643, 0x634, 0x6d5, 0x646, 0x628, 0x6d5,
 0x3b, 0x62f, 0x6c8, 0x634, 0x6d5, 0x646, 0x628, 0x6d5, 0x3b, 0x633, 0x6d5, 0x64a, 0x634, 0x6d5, 0x646, 0x628, 0x6d5, 0x3b, 0x686, 0x627,
 0x631, 0x634, 0x6d5, 0x646, 0x628, 0x6d5, 0x3b, 0x67e, 0x6d5, 0x64a, 0x634, 0x6d5, 0x646, 0x628, 0x6d5, 0x3b, 0x62c, 0x6c8, 0x645, 0x6d5,
-0x3b, 0x634, 0x6d5, 0x646, 0x628, 0x6d5, 0x3b, 0x64a, 0x3b, 0x62f, 0x3b, 0x633, 0x3b, 0x686, 0x3b, 0x67e, 0x3b, 0x62c, 0x3b, 0x634,
-0x3b, 0x43d, 0x435, 0x434, 0x456, 0x43b, 0x44f, 0x3b, 0x43f, 0x43e, 0x43d, 0x435, 0x434, 0x456, 0x43b, 0x43e, 0x43a, 0x3b, 0x432, 0x456,
-0x432, 0x442, 0x43e, 0x440, 0x43e, 0x43a, 0x3b, 0x441, 0x435, 0x440, 0x435, 0x434, 0x430, 0x3b, 0x447, 0x435, 0x442, 0x432, 0x435, 0x440,
-0x3b, 0x43f, 0x2bc, 0x44f, 0x442, 0x43d, 0x438, 0x446, 0x44f, 0x3b, 0x441, 0x443, 0x431, 0x43e, 0x442, 0x430, 0x3b, 0x41d, 0x3b, 0x41f,
-0x3b, 0x412, 0x3b, 0x421, 0x3b, 0x427, 0x3b, 0x41f, 0x3b, 0x421, 0x3b, 0x627, 0x62a, 0x648, 0x627, 0x631, 0x3b, 0x67e, 0x6cc, 0x631,
-0x3b, 0x645, 0x646, 0x6af, 0x644, 0x3b, 0x628, 0x62f, 0x6be, 0x3b, 0x62c, 0x645, 0x639, 0x631, 0x627, 0x62a, 0x3b, 0x62c, 0x645, 0x639,
-0x6c1, 0x3b, 0x6c1, 0x641, 0x62a, 0x6c1, 0x3b, 0x59, 0x61, 0x6b, 0x3b, 0x44, 0x75, 0x73, 0x68, 0x3b, 0x53, 0x65, 0x73, 0x68,
-0x3b, 0x43, 0x68, 0x6f, 0x72, 0x3b, 0x50, 0x61, 0x79, 0x3b, 0x4a, 0x75, 0x6d, 0x3b, 0x53, 0x68, 0x61, 0x6e, 0x3b, 0x79,
-0x61, 0x6b, 0x73, 0x68, 0x61, 0x6e, 0x62, 0x61, 0x3b, 0x64, 0x75, 0x73, 0x68, 0x61, 0x6e, 0x62, 0x61, 0x3b, 0x73, 0x65,
-0x73, 0x68, 0x61, 0x6e, 0x62, 0x61, 0x3b, 0x63, 0x68, 0x6f, 0x72, 0x73, 0x68, 0x61, 0x6e, 0x62, 0x61, 0x3b, 0x70, 0x61,
-0x79, 0x73, 0x68, 0x61, 0x6e, 0x62, 0x61, 0x3b, 0x6a, 0x75, 0x6d, 0x61, 0x3b, 0x73, 0x68, 0x61, 0x6e, 0x62, 0x61, 0x3b,
-0x59, 0x3b, 0x44, 0x3b, 0x53, 0x3b, 0x43, 0x3b, 0x50, 0x3b, 0x4a, 0x3b, 0x53, 0x3b, 0x6cc, 0x2e, 0x3b, 0x62f, 0x2e, 0x3b,
-0x633, 0x2e, 0x3b, 0x686, 0x2e, 0x3b, 0x67e, 0x2e, 0x3b, 0x62c, 0x2e, 0x3b, 0x634, 0x2e, 0x3b, 0x44f, 0x43a, 0x448, 0x3b, 0x434,
-0x443, 0x448, 0x3b, 0x441, 0x435, 0x448, 0x3b, 0x447, 0x43e, 0x440, 0x3b, 0x43f, 0x430, 0x439, 0x3b, 0x436, 0x443, 0x43c, 0x3b, 0x448,
-0x430, 0x43d, 0x3b, 0x44f, 0x43a, 0x448, 0x430, 0x43d, 0x431, 0x430, 0x3b, 0x434, 0x443, 0x448, 0x430, 0x43d, 0x431, 0x430, 0x3b, 0x441,
-0x435, 0x448, 0x430, 0x43d, 0x431, 0x430, 0x3b, 0x447, 0x43e, 0x440, 0x448, 0x430, 0x43d, 0x431, 0x430, 0x3b, 0x43f, 0x430, 0x439, 0x448,
-0x430, 0x43d, 0x431, 0x430, 0x3b, 0x436, 0x443, 0x43c, 0x430, 0x3b, 0x448, 0x430, 0x43d, 0x431, 0x430, 0x3b, 0x42f, 0x3b, 0x414, 0x3b,
-0x421, 0x3b, 0x427, 0x3b, 0x41f, 0x3b, 0x416, 0x3b, 0x428, 0x3b, 0x43, 0x4e, 0x3b, 0x54, 0x68, 0x20, 0x32, 0x3b, 0x54, 0x68,
-0x20, 0x33, 0x3b, 0x54, 0x68, 0x20, 0x34, 0x3b, 0x54, 0x68, 0x20, 0x35, 0x3b, 0x54, 0x68, 0x20, 0x36, 0x3b, 0x54, 0x68,
-0x20, 0x37, 0x3b, 0x43, 0x68, 0x1ee7, 0x20, 0x4e, 0x68, 0x1ead, 0x74, 0x3b, 0x54, 0x68, 0x1ee9, 0x20, 0x48, 0x61, 0x69, 0x3b,
-0x54, 0x68, 0x1ee9, 0x20, 0x42, 0x61, 0x3b, 0x54, 0x68, 0x1ee9, 0x20, 0x54, 0x1b0, 0x3b, 0x54, 0x68, 0x1ee9, 0x20, 0x4e, 0x103,
-0x6d, 0x3b, 0x54, 0x68, 0x1ee9, 0x20, 0x53, 0xe1, 0x75, 0x3b, 0x54, 0x68, 0x1ee9, 0x20, 0x42, 0x1ea3, 0x79, 0x3b, 0x43, 0x4e,
-0x3b, 0x54, 0x32, 0x3b, 0x54, 0x33, 0x3b, 0x54, 0x34, 0x3b, 0x54, 0x35, 0x3b, 0x54, 0x36, 0x3b, 0x54, 0x37, 0x3b, 0x53,
-0x75, 0x3b, 0x4d, 0x75, 0x3b, 0x54, 0x75, 0x3b, 0x56, 0x65, 0x3b, 0x44, 0xf6, 0x3b, 0x46, 0x72, 0x3b, 0x5a, 0xe4, 0x3b,
-0x73, 0x75, 0x64, 0x65, 0x6c, 0x3b, 0x6d, 0x75, 0x64, 0x65, 0x6c, 0x3b, 0x74, 0x75, 0x64, 0x65, 0x6c, 0x3b, 0x76, 0x65,
-0x64, 0x65, 0x6c, 0x3b, 0x64, 0xf6, 0x64, 0x65, 0x6c, 0x3b, 0x66, 0x72, 0x69, 0x64, 0x65, 0x6c, 0x3b, 0x7a, 0xe4, 0x64,
-0x65, 0x6c, 0x3b, 0x53, 0x3b, 0x4d, 0x3b, 0x54, 0x3b, 0x56, 0x3b, 0x44, 0x3b, 0x46, 0x3b, 0x5a, 0x3b, 0x73, 0x75, 0x2e,
-0x3b, 0x6d, 0x75, 0x2e, 0x3b, 0x74, 0x75, 0x2e, 0x3b, 0x76, 0x65, 0x2e, 0x3b, 0x64, 0xf6, 0x2e, 0x3b, 0x66, 0x72, 0x2e,
-0x3b, 0x7a, 0xe4, 0x2e, 0x3b, 0x53, 0x75, 0x6c, 0x3b, 0x4c, 0x6c, 0x75, 0x6e, 0x3b, 0x4d, 0x61, 0x77, 0x3b, 0x4d, 0x65,
-0x72, 0x3b, 0x49, 0x61, 0x75, 0x3b, 0x47, 0x77, 0x65, 0x3b, 0x53, 0x61, 0x64, 0x3b, 0x44, 0x79, 0x64, 0x64, 0x20, 0x53,
-0x75, 0x6c, 0x3b, 0x44, 0x79, 0x64, 0x64, 0x20, 0x4c, 0x6c, 0x75, 0x6e, 0x3b, 0x44, 0x79, 0x64, 0x64, 0x20, 0x4d, 0x61,
-0x77, 0x72, 0x74, 0x68, 0x3b, 0x44, 0x79, 0x64, 0x64, 0x20, 0x4d, 0x65, 0x72, 0x63, 0x68, 0x65, 0x72, 0x3b, 0x44, 0x79,
-0x64, 0x64, 0x20, 0x49, 0x61, 0x75, 0x3b, 0x44, 0x79, 0x64, 0x64, 0x20, 0x47, 0x77, 0x65, 0x6e, 0x65, 0x72, 0x3b, 0x44,
-0x79, 0x64, 0x64, 0x20, 0x53, 0x61, 0x64, 0x77, 0x72, 0x6e, 0x3b, 0x53, 0x3b, 0x4c, 0x6c, 0x3b, 0x4d, 0x3b, 0x4d, 0x3b,
-0x49, 0x3b, 0x47, 0x3b, 0x53, 0x3b, 0x53, 0x75, 0x6c, 0x3b, 0x4c, 0x6c, 0x75, 0x6e, 0x3b, 0x4d, 0x61, 0x77, 0x3b, 0x4d,
-0x65, 0x72, 0x3b, 0x49, 0x61, 0x75, 0x3b, 0x47, 0x77, 0x65, 0x6e, 0x3b, 0x53, 0x61, 0x64, 0x3b, 0x44, 0x69, 0x62, 0x3b,
-0x41, 0x6c, 0x74, 0x3b, 0x54, 0x61, 0x6c, 0x3b, 0xc0, 0x6c, 0x61, 0x3b, 0x41, 0x6c, 0x78, 0x3b, 0xc0, 0x6a, 0x6a, 0x3b,
-0x41, 0x73, 0x65, 0x3b, 0x44, 0x69, 0x62, 0xe9, 0x65, 0x72, 0x3b, 0x41, 0x6c, 0x74, 0x69, 0x6e, 0x65, 0x3b, 0x54, 0x61,
-0x6c, 0x61, 0x61, 0x74, 0x61, 0x3b, 0xc0, 0x6c, 0x61, 0x72, 0x62, 0x61, 0x3b, 0x41, 0x6c, 0x78, 0x61, 0x6d, 0x69, 0x73,
-0x3b, 0xc0, 0x6a, 0x6a, 0x75, 0x6d, 0x61, 0x3b, 0x41, 0x73, 0x65, 0x65, 0x72, 0x3b, 0x43, 0x61, 0x77, 0x3b, 0x4d, 0x76,
-0x75, 0x3b, 0x42, 0x69, 0x6e, 0x3b, 0x54, 0x68, 0x61, 0x3b, 0x53, 0x69, 0x6e, 0x3b, 0x48, 0x6c, 0x61, 0x3b, 0x4d, 0x67,
-0x71, 0x3b, 0x43, 0x61, 0x77, 0x65, 0x3b, 0x4d, 0x76, 0x75, 0x6c, 0x6f, 0x3b, 0x4c, 0x77, 0x65, 0x73, 0x69, 0x62, 0x69,
-0x6e, 0x69, 0x3b, 0x4c, 0x77, 0x65, 0x73, 0x69, 0x74, 0x68, 0x61, 0x74, 0x68, 0x75, 0x3b, 0x4c, 0x77, 0x65, 0x73, 0x69,
-0x6e, 0x65, 0x3b, 0x4c, 0x77, 0x65, 0x73, 0x69, 0x68, 0x6c, 0x61, 0x6e, 0x75, 0x3b, 0x4d, 0x67, 0x71, 0x69, 0x62, 0x65,
-0x6c, 0x6f, 0x3b, 0x5d6, 0x5d5, 0x5e0, 0x5d8, 0x5d9, 0x5e7, 0x3b, 0x5de, 0x5d0, 0x5b8, 0x5e0, 0x5d8, 0x5d9, 0x5e7, 0x3b, 0x5d3, 0x5d9,
-0x5e0, 0x5e1, 0x5d8, 0x5d9, 0x5e7, 0x3b, 0x5de, 0x5d9, 0x5d8, 0x5d5, 0x5d5, 0x5d0, 0x5da, 0x3b, 0x5d3, 0x5d0, 0x5e0, 0x5e2, 0x5e8, 0x5e9,
-0x5d8, 0x5d9, 0x5e7, 0x3b, 0x5e4, 0x5bf, 0x5e8, 0x5f2, 0x5b7, 0x5d8, 0x5d9, 0x5e7, 0x3b, 0x5e9, 0x5d1, 0x5ea, 0x3b, 0xc0, 0xec, 0x6b,
-0x3b, 0x41, 0x6a, 0x3b, 0xcc, 0x73, 0x1eb9, 0x301, 0x67, 0x3b, 0x1ecc, 0x6a, 0x1ecd, 0x301, 0x72, 0x3b, 0x1ecc, 0x6a, 0x1ecd, 0x301,
-0x62, 0x3b, 0x1eb8, 0x74, 0x3b, 0xc0, 0x62, 0xe1, 0x6d, 0x3b, 0xc0, 0xec, 0x6b, 0xfa, 0x3b, 0x41, 0x6a, 0xe9, 0x3b, 0xcc,
-0x73, 0x1eb9, 0x301, 0x67, 0x75, 0x6e, 0x3b, 0x1ecc, 0x6a, 0x1ecd, 0x301, 0x72, 0xfa, 0x3b, 0x1ecc, 0x6a, 0x1ecd, 0x301, 0x62, 0x1ecd,
-0x3b, 0x1eb8, 0x74, 0xec, 0x3b, 0xc0, 0x62, 0xe1, 0x6d, 0x1eb9, 0x301, 0x74, 0x61, 0x3b, 0xc0, 0x3b, 0x41, 0x3b, 0xcc, 0x3b,
-0x1ecc, 0x3b, 0x1ecc, 0x3b, 0x1eb8, 0x3b, 0xc0, 0x3b, 0x1ecc, 0x6a, 0x1ecd, 0x301, 0x20, 0xc0, 0xec, 0x6b, 0xfa, 0x3b, 0x1ecc, 0x6a,
-0x1ecd, 0x301, 0x20, 0x41, 0x6a, 0xe9, 0x3b, 0x1ecc, 0x6a, 0x1ecd, 0x301, 0x20, 0xcc, 0x73, 0x1eb9, 0x301, 0x67, 0x75, 0x6e, 0x3b,
-0x1ecc, 0x6a, 0x1ecd, 0x301, 0x72, 0xfa, 0x3b, 0x1ecc, 0x6a, 0x1ecd, 0x301, 0x62, 0x1ecd, 0x3b, 0x1ecc, 0x6a, 0x1ecd, 0x301, 0x20, 0x1eb8,
-0x74, 0xec, 0x3b, 0x1ecc, 0x6a, 0x1ecd, 0x301, 0x20, 0xc0, 0x62, 0xe1, 0x6d, 0x1eb9, 0x301, 0x74, 0x61, 0x3b, 0xc0, 0xec, 0x6b,
-0x3b, 0x41, 0x6a, 0x3b, 0xcc, 0x73, 0x25b, 0x301, 0x67, 0x3b, 0x186, 0x6a, 0x254, 0x301, 0x72, 0x3b, 0x186, 0x6a, 0x254, 0x301,
-0x62, 0x3b, 0x190, 0x74, 0x3b, 0xc0, 0x62, 0xe1, 0x6d, 0x3b, 0xc0, 0xec, 0x6b, 0xfa, 0x3b, 0x41, 0x6a, 0xe9, 0x3b, 0xcc,
-0x73, 0x25b, 0x301, 0x67, 0x75, 0x6e, 0x3b, 0x186, 0x6a, 0x254, 0x301, 0x72, 0xfa, 0x3b, 0x186, 0x6a, 0x254, 0x301, 0x62, 0x254,
-0x3b, 0x190, 0x74, 0xec, 0x3b, 0xc0, 0x62, 0xe1, 0x6d, 0x25b, 0x301, 0x74, 0x61, 0x3b, 0xc0, 0x3b, 0x41, 0x3b, 0xcc, 0x3b,
-0x186, 0x3b, 0x186, 0x3b, 0x190, 0x3b, 0xc0, 0x3b, 0x186, 0x6a, 0x254, 0x301, 0x20, 0xc0, 0xec, 0x6b, 0xfa, 0x3b, 0x186, 0x6a,
+0x3b, 0x634, 0x6d5, 0x646, 0x628, 0x6d5, 0x64a, 0x6d5, 0x3b, 0x62f, 0x6c8, 0x3b, 0x633, 0x6d5, 0x3b, 0x686, 0x627, 0x3b, 0x67e, 0x6d5,
+0x3b, 0x62c, 0x6c8, 0x3b, 0x634, 0x6d5, 0x64a, 0x3b, 0x62f, 0x3b, 0x633, 0x3b, 0x686, 0x3b, 0x67e, 0x3b, 0x62c, 0x3b, 0x634, 0x43d,
+0x435, 0x434, 0x456, 0x43b, 0x44f, 0x3b, 0x43f, 0x43e, 0x43d, 0x435, 0x434, 0x456, 0x43b, 0x43e, 0x43a, 0x3b, 0x432, 0x456, 0x432, 0x442,
+0x43e, 0x440, 0x43e, 0x43a, 0x3b, 0x441, 0x435, 0x440, 0x435, 0x434, 0x430, 0x3b, 0x447, 0x435, 0x442, 0x432, 0x435, 0x440, 0x3b, 0x43f,
+0x2bc, 0x44f, 0x442, 0x43d, 0x438, 0x446, 0x44f, 0x3b, 0x441, 0x443, 0x431, 0x43e, 0x442, 0x430, 0x41d, 0x3b, 0x41f, 0x3b, 0x412, 0x3b,
+0x421, 0x3b, 0x427, 0x3b, 0x41f, 0x3b, 0x421, 0x627, 0x62a, 0x648, 0x627, 0x631, 0x3b, 0x67e, 0x6cc, 0x631, 0x3b, 0x645, 0x646, 0x6af,
+0x644, 0x3b, 0x628, 0x62f, 0x6be, 0x3b, 0x62c, 0x645, 0x639, 0x631, 0x627, 0x62a, 0x3b, 0x62c, 0x645, 0x639, 0x6c1, 0x3b, 0x6c1, 0x641,
+0x62a, 0x6c1, 0x79, 0x61, 0x6b, 0x73, 0x68, 0x61, 0x6e, 0x62, 0x61, 0x3b, 0x64, 0x75, 0x73, 0x68, 0x61, 0x6e, 0x62, 0x61,
+0x3b, 0x73, 0x65, 0x73, 0x68, 0x61, 0x6e, 0x62, 0x61, 0x3b, 0x63, 0x68, 0x6f, 0x72, 0x73, 0x68, 0x61, 0x6e, 0x62, 0x61,
+0x3b, 0x70, 0x61, 0x79, 0x73, 0x68, 0x61, 0x6e, 0x62, 0x61, 0x3b, 0x6a, 0x75, 0x6d, 0x61, 0x3b, 0x73, 0x68, 0x61, 0x6e,
+0x62, 0x61, 0x59, 0x61, 0x6b, 0x3b, 0x44, 0x75, 0x73, 0x68, 0x3b, 0x53, 0x65, 0x73, 0x68, 0x3b, 0x43, 0x68, 0x6f, 0x72,
+0x3b, 0x50, 0x61, 0x79, 0x3b, 0x4a, 0x75, 0x6d, 0x3b, 0x53, 0x68, 0x61, 0x6e, 0x59, 0x3b, 0x44, 0x3b, 0x53, 0x3b, 0x43,
+0x3b, 0x50, 0x3b, 0x4a, 0x3b, 0x53, 0x6cc, 0x2e, 0x3b, 0x62f, 0x2e, 0x3b, 0x633, 0x2e, 0x3b, 0x686, 0x2e, 0x3b, 0x67e, 0x2e,
+0x3b, 0x62c, 0x2e, 0x3b, 0x634, 0x2e, 0x44f, 0x43a, 0x448, 0x430, 0x43d, 0x431, 0x430, 0x3b, 0x434, 0x443, 0x448, 0x430, 0x43d, 0x431,
+0x430, 0x3b, 0x441, 0x435, 0x448, 0x430, 0x43d, 0x431, 0x430, 0x3b, 0x447, 0x43e, 0x440, 0x448, 0x430, 0x43d, 0x431, 0x430, 0x3b, 0x43f,
+0x430, 0x439, 0x448, 0x430, 0x43d, 0x431, 0x430, 0x3b, 0x436, 0x443, 0x43c, 0x430, 0x3b, 0x448, 0x430, 0x43d, 0x431, 0x430, 0x44f, 0x43a,
+0x448, 0x3b, 0x434, 0x443, 0x448, 0x3b, 0x441, 0x435, 0x448, 0x3b, 0x447, 0x43e, 0x440, 0x3b, 0x43f, 0x430, 0x439, 0x3b, 0x436, 0x443,
+0x43c, 0x3b, 0x448, 0x430, 0x43d, 0x42f, 0x3b, 0x414, 0x3b, 0x421, 0x3b, 0x427, 0x3b, 0x41f, 0x3b, 0x416, 0x3b, 0x428, 0x43, 0x68,
+0x1ee7, 0x20, 0x4e, 0x68, 0x1ead, 0x74, 0x3b, 0x54, 0x68, 0x1ee9, 0x20, 0x48, 0x61, 0x69, 0x3b, 0x54, 0x68, 0x1ee9, 0x20, 0x42,
+0x61, 0x3b, 0x54, 0x68, 0x1ee9, 0x20, 0x54, 0x1b0, 0x3b, 0x54, 0x68, 0x1ee9, 0x20, 0x4e, 0x103, 0x6d, 0x3b, 0x54, 0x68, 0x1ee9,
+0x20, 0x53, 0xe1, 0x75, 0x3b, 0x54, 0x68, 0x1ee9, 0x20, 0x42, 0x1ea3, 0x79, 0x43, 0x4e, 0x3b, 0x54, 0x68, 0x20, 0x32, 0x3b,
+0x54, 0x68, 0x20, 0x33, 0x3b, 0x54, 0x68, 0x20, 0x34, 0x3b, 0x54, 0x68, 0x20, 0x35, 0x3b, 0x54, 0x68, 0x20, 0x36, 0x3b,
+0x54, 0x68, 0x20, 0x37, 0x43, 0x4e, 0x3b, 0x54, 0x32, 0x3b, 0x54, 0x33, 0x3b, 0x54, 0x34, 0x3b, 0x54, 0x35, 0x3b, 0x54,
+0x36, 0x3b, 0x54, 0x37, 0x73, 0x75, 0x64, 0x65, 0x6c, 0x3b, 0x6d, 0x75, 0x64, 0x65, 0x6c, 0x3b, 0x74, 0x75, 0x64, 0x65,
+0x6c, 0x3b, 0x76, 0x65, 0x64, 0x65, 0x6c, 0x3b, 0x64, 0xf6, 0x64, 0x65, 0x6c, 0x3b, 0x66, 0x72, 0x69, 0x64, 0x65, 0x6c,
+0x3b, 0x7a, 0xe4, 0x64, 0x65, 0x6c, 0x53, 0x75, 0x3b, 0x4d, 0x75, 0x3b, 0x54, 0x75, 0x3b, 0x56, 0x65, 0x3b, 0x44, 0xf6,
+0x3b, 0x46, 0x72, 0x3b, 0x5a, 0xe4, 0x73, 0x75, 0x2e, 0x3b, 0x6d, 0x75, 0x2e, 0x3b, 0x74, 0x75, 0x2e, 0x3b, 0x76, 0x65,
+0x2e, 0x3b, 0x64, 0xf6, 0x2e, 0x3b, 0x66, 0x72, 0x2e, 0x3b, 0x7a, 0xe4, 0x2e, 0x53, 0x3b, 0x4d, 0x3b, 0x54, 0x3b, 0x56,
+0x3b, 0x44, 0x3b, 0x46, 0x3b, 0x5a, 0x44, 0x79, 0x64, 0x64, 0x20, 0x53, 0x75, 0x6c, 0x3b, 0x44, 0x79, 0x64, 0x64, 0x20,
+0x4c, 0x6c, 0x75, 0x6e, 0x3b, 0x44, 0x79, 0x64, 0x64, 0x20, 0x4d, 0x61, 0x77, 0x72, 0x74, 0x68, 0x3b, 0x44, 0x79, 0x64,
+0x64, 0x20, 0x4d, 0x65, 0x72, 0x63, 0x68, 0x65, 0x72, 0x3b, 0x44, 0x79, 0x64, 0x64, 0x20, 0x49, 0x61, 0x75, 0x3b, 0x44,
+0x79, 0x64, 0x64, 0x20, 0x47, 0x77, 0x65, 0x6e, 0x65, 0x72, 0x3b, 0x44, 0x79, 0x64, 0x64, 0x20, 0x53, 0x61, 0x64, 0x77,
+0x72, 0x6e, 0x53, 0x75, 0x6c, 0x3b, 0x4c, 0x6c, 0x75, 0x6e, 0x3b, 0x4d, 0x61, 0x77, 0x3b, 0x4d, 0x65, 0x72, 0x3b, 0x49,
+0x61, 0x75, 0x3b, 0x47, 0x77, 0x65, 0x3b, 0x53, 0x61, 0x64, 0x53, 0x75, 0x6c, 0x3b, 0x4c, 0x6c, 0x75, 0x6e, 0x3b, 0x4d,
+0x61, 0x77, 0x3b, 0x4d, 0x65, 0x72, 0x3b, 0x49, 0x61, 0x75, 0x3b, 0x47, 0x77, 0x65, 0x6e, 0x3b, 0x53, 0x61, 0x64, 0x53,
+0x3b, 0x4c, 0x6c, 0x3b, 0x4d, 0x3b, 0x4d, 0x3b, 0x49, 0x3b, 0x47, 0x3b, 0x53, 0x44, 0x69, 0x62, 0xe9, 0x65, 0x72, 0x3b,
+0x41, 0x6c, 0x74, 0x69, 0x6e, 0x65, 0x3b, 0x54, 0x61, 0x6c, 0x61, 0x61, 0x74, 0x61, 0x3b, 0xc0, 0x6c, 0x61, 0x72, 0x62,
+0x61, 0x3b, 0x41, 0x6c, 0x78, 0x61, 0x6d, 0x69, 0x73, 0x3b, 0xc0, 0x6a, 0x6a, 0x75, 0x6d, 0x61, 0x3b, 0x41, 0x73, 0x65,
+0x65, 0x72, 0x44, 0x69, 0x62, 0x3b, 0x41, 0x6c, 0x74, 0x3b, 0x54, 0x61, 0x6c, 0x3b, 0xc0, 0x6c, 0x61, 0x3b, 0x41, 0x6c,
+0x78, 0x3b, 0xc0, 0x6a, 0x6a, 0x3b, 0x41, 0x73, 0x65, 0x43, 0x61, 0x77, 0x65, 0x3b, 0x4d, 0x76, 0x75, 0x6c, 0x6f, 0x3b,
+0x4c, 0x77, 0x65, 0x73, 0x69, 0x62, 0x69, 0x6e, 0x69, 0x3b, 0x4c, 0x77, 0x65, 0x73, 0x69, 0x74, 0x68, 0x61, 0x74, 0x68,
+0x75, 0x3b, 0x4c, 0x77, 0x65, 0x73, 0x69, 0x6e, 0x65, 0x3b, 0x4c, 0x77, 0x65, 0x73, 0x69, 0x68, 0x6c, 0x61, 0x6e, 0x75,
+0x3b, 0x4d, 0x67, 0x71, 0x69, 0x62, 0x65, 0x6c, 0x6f, 0x43, 0x61, 0x77, 0x3b, 0x4d, 0x76, 0x75, 0x3b, 0x42, 0x69, 0x6e,
+0x3b, 0x54, 0x68, 0x61, 0x3b, 0x53, 0x69, 0x6e, 0x3b, 0x48, 0x6c, 0x61, 0x3b, 0x4d, 0x67, 0x71, 0x5d6, 0x5d5, 0x5e0, 0x5d8,
+0x5d9, 0x5e7, 0x3b, 0x5de, 0x5d0, 0x5b8, 0x5e0, 0x5d8, 0x5d9, 0x5e7, 0x3b, 0x5d3, 0x5d9, 0x5e0, 0x5e1, 0x5d8, 0x5d9, 0x5e7, 0x3b, 0x5de,
+0x5d9, 0x5d8, 0x5d5, 0x5d5, 0x5d0, 0x5da, 0x3b, 0x5d3, 0x5d0, 0x5e0, 0x5e2, 0x5e8, 0x5e9, 0x5d8, 0x5d9, 0x5e7, 0x3b, 0x5e4, 0x5bf, 0x5e8,
+0x5f2, 0x5b7, 0x5d8, 0x5d9, 0x5e7, 0x3b, 0x5e9, 0x5d1, 0x5ea, 0xc0, 0xec, 0x6b, 0xfa, 0x3b, 0x41, 0x6a, 0xe9, 0x3b, 0xcc, 0x73,
+0x1eb9, 0x301, 0x67, 0x75, 0x6e, 0x3b, 0x1ecc, 0x6a, 0x1ecd, 0x301, 0x72, 0xfa, 0x3b, 0x1ecc, 0x6a, 0x1ecd, 0x301, 0x62, 0x1ecd, 0x3b,
+0x1eb8, 0x74, 0xec, 0x3b, 0xc0, 0x62, 0xe1, 0x6d, 0x1eb9, 0x301, 0x74, 0x61, 0x1ecc, 0x6a, 0x1ecd, 0x301, 0x20, 0xc0, 0xec, 0x6b,
+0xfa, 0x3b, 0x1ecc, 0x6a, 0x1ecd, 0x301, 0x20, 0x41, 0x6a, 0xe9, 0x3b, 0x1ecc, 0x6a, 0x1ecd, 0x301, 0x20, 0xcc, 0x73, 0x1eb9, 0x301,
+0x67, 0x75, 0x6e, 0x3b, 0x1ecc, 0x6a, 0x1ecd, 0x301, 0x72, 0xfa, 0x3b, 0x1ecc, 0x6a, 0x1ecd, 0x301, 0x62, 0x1ecd, 0x3b, 0x1ecc, 0x6a,
+0x1ecd, 0x301, 0x20, 0x1eb8, 0x74, 0xec, 0x3b, 0x1ecc, 0x6a, 0x1ecd, 0x301, 0x20, 0xc0, 0x62, 0xe1, 0x6d, 0x1eb9, 0x301, 0x74, 0x61,
+0xc0, 0xec, 0x6b, 0x3b, 0x41, 0x6a, 0x3b, 0xcc, 0x73, 0x1eb9, 0x301, 0x67, 0x3b, 0x1ecc, 0x6a, 0x1ecd, 0x301, 0x72, 0x3b, 0x1ecc,
+0x6a, 0x1ecd, 0x301, 0x62, 0x3b, 0x1eb8, 0x74, 0x3b, 0xc0, 0x62, 0xe1, 0x6d, 0xc0, 0x3b, 0x41, 0x3b, 0xcc, 0x3b, 0x1ecc, 0x3b,
+0x1ecc, 0x3b, 0x1eb8, 0x3b, 0xc0, 0xc0, 0xec, 0x6b, 0xfa, 0x3b, 0x41, 0x6a, 0xe9, 0x3b, 0xcc, 0x73, 0x25b, 0x301, 0x67, 0x75,
+0x6e, 0x3b, 0x186, 0x6a, 0x254, 0x301, 0x72, 0xfa, 0x3b, 0x186, 0x6a, 0x254, 0x301, 0x62, 0x254, 0x3b, 0x190, 0x74, 0xec, 0x3b,
+0xc0, 0x62, 0xe1, 0x6d, 0x25b, 0x301, 0x74, 0x61, 0x186, 0x6a, 0x254, 0x301, 0x20, 0xc0, 0xec, 0x6b, 0xfa, 0x3b, 0x186, 0x6a,
 0x254, 0x301, 0x20, 0x41, 0x6a, 0xe9, 0x3b, 0x186, 0x6a, 0x254, 0x301, 0x20, 0xcc, 0x73, 0x25b, 0x301, 0x67, 0x75, 0x6e, 0x3b,
 0x186, 0x6a, 0x254, 0x301, 0x72, 0xfa, 0x3b, 0x186, 0x6a, 0x254, 0x301, 0x62, 0x254, 0x3b, 0x186, 0x6a, 0x254, 0x301, 0x20, 0x190,
-0x74, 0xec, 0x3b, 0x186, 0x6a, 0x254, 0x301, 0x20, 0xc0, 0x62, 0xe1, 0x6d, 0x25b, 0x301, 0x74, 0x61, 0x3b, 0x53, 0x6f, 0x6e,
-0x3b, 0x4d, 0x73, 0x6f, 0x3b, 0x42, 0x69, 0x6c, 0x3b, 0x54, 0x68, 0x61, 0x3b, 0x53, 0x69, 0x6e, 0x3b, 0x48, 0x6c, 0x61,
-0x3b, 0x4d, 0x67, 0x71, 0x3b, 0x49, 0x53, 0x6f, 0x6e, 0x74, 0x6f, 0x3b, 0x55, 0x4d, 0x73, 0x6f, 0x6d, 0x62, 0x75, 0x6c,
-0x75, 0x6b, 0x6f, 0x3b, 0x55, 0x4c, 0x77, 0x65, 0x73, 0x69, 0x62, 0x69, 0x6c, 0x69, 0x3b, 0x55, 0x4c, 0x77, 0x65, 0x73,
-0x69, 0x74, 0x68, 0x61, 0x74, 0x68, 0x75, 0x3b, 0x55, 0x4c, 0x77, 0x65, 0x73, 0x69, 0x6e, 0x65, 0x3b, 0x55, 0x4c, 0x77,
-0x65, 0x73, 0x69, 0x68, 0x6c, 0x61, 0x6e, 0x75, 0x3b, 0x55, 0x4d, 0x67, 0x71, 0x69, 0x62, 0x65, 0x6c, 0x6f, 0x3b, 0x53,
-0x3b, 0x4d, 0x3b, 0x42, 0x3b, 0x54, 0x3b, 0x53, 0x3b, 0x48, 0x3b, 0x4d, 0x3b, 0x73, 0xf8, 0x6e, 0x3b, 0x6d, 0xe5, 0x6e,
-0x3b, 0x74, 0x79, 0x73, 0x3b, 0x6f, 0x6e, 0x73, 0x3b, 0x74, 0x6f, 0x72, 0x3b, 0x66, 0x72, 0x65, 0x3b, 0x6c, 0x61, 0x75,
-0x3b, 0x73, 0xf8, 0x6e, 0x64, 0x61, 0x67, 0x3b, 0x6d, 0xe5, 0x6e, 0x64, 0x61, 0x67, 0x3b, 0x74, 0x79, 0x73, 0x64, 0x61,
-0x67, 0x3b, 0x6f, 0x6e, 0x73, 0x64, 0x61, 0x67, 0x3b, 0x74, 0x6f, 0x72, 0x73, 0x64, 0x61, 0x67, 0x3b, 0x66, 0x72, 0x65,
-0x64, 0x61, 0x67, 0x3b, 0x6c, 0x61, 0x75, 0x72, 0x64, 0x61, 0x67, 0x3b, 0x73, 0xf8, 0x2e, 0x3b, 0x6d, 0xe5, 0x2e, 0x3b,
-0x74, 0x79, 0x2e, 0x3b, 0x6f, 0x6e, 0x2e, 0x3b, 0x74, 0x6f, 0x2e, 0x3b, 0x66, 0x72, 0x2e, 0x3b, 0x6c, 0x61, 0x2e, 0x3b,
-0x43d, 0x435, 0x434, 0x3b, 0x43f, 0x43e, 0x43d, 0x3b, 0x443, 0x442, 0x43e, 0x3b, 0x441, 0x440, 0x438, 0x3b, 0x447, 0x435, 0x442, 0x3b,
-0x43f, 0x435, 0x442, 0x3b, 0x441, 0x443, 0x431, 0x3b, 0x43d, 0x435, 0x434, 0x458, 0x435, 0x459, 0x430, 0x3b, 0x43f, 0x43e, 0x43d, 0x435,
-0x434, 0x458, 0x435, 0x459, 0x430, 0x43a, 0x3b, 0x443, 0x442, 0x43e, 0x440, 0x430, 0x43a, 0x3b, 0x441, 0x440, 0x438, 0x458, 0x435, 0x434,
-0x430, 0x3b, 0x447, 0x435, 0x442, 0x432, 0x440, 0x442, 0x430, 0x43a, 0x3b, 0x43f, 0x435, 0x442, 0x430, 0x43a, 0x3b, 0x441, 0x443, 0x431,
-0x43e, 0x442, 0x430, 0x3b, 0x4a, 0x65, 0x64, 0x3b, 0x4a, 0x65, 0x6c, 0x3b, 0x4a, 0x65, 0x6d, 0x3b, 0x4a, 0x65, 0x72, 0x63,
-0x3b, 0x4a, 0x65, 0x72, 0x64, 0x3b, 0x4a, 0x65, 0x68, 0x3b, 0x4a, 0x65, 0x73, 0x3b, 0x4a, 0x65, 0x64, 0x6f, 0x6f, 0x6e,
-0x65, 0x65, 0x3b, 0x4a, 0x65, 0x6c, 0x68, 0x65, 0x69, 0x6e, 0x3b, 0x4a, 0x65, 0x6d, 0x61, 0x79, 0x72, 0x74, 0x3b, 0x4a,
-0x65, 0x72, 0x63, 0x65, 0x61, 0x6e, 0x3b, 0x4a, 0x65, 0x72, 0x64, 0x65, 0x69, 0x6e, 0x3b, 0x4a, 0x65, 0x68, 0x65, 0x69,
-0x6e, 0x65, 0x79, 0x3b, 0x4a, 0x65, 0x73, 0x61, 0x72, 0x6e, 0x3b, 0x53, 0x75, 0x6c, 0x3b, 0x4c, 0x75, 0x6e, 0x3b, 0x4d,
-0x74, 0x68, 0x3b, 0x4d, 0x68, 0x72, 0x3b, 0x59, 0x6f, 0x77, 0x3b, 0x47, 0x77, 0x65, 0x3b, 0x53, 0x61, 0x64, 0x3b, 0x64,
-0x79, 0x20, 0x53, 0x75, 0x6c, 0x3b, 0x64, 0x79, 0x20, 0x4c, 0x75, 0x6e, 0x3b, 0x64, 0x79, 0x20, 0x4d, 0x65, 0x75, 0x72,
-0x74, 0x68, 0x3b, 0x64, 0x79, 0x20, 0x4d, 0x65, 0x72, 0x68, 0x65, 0x72, 0x3b, 0x64, 0x79, 0x20, 0x59, 0x6f, 0x77, 0x3b,
-0x64, 0x79, 0x20, 0x47, 0x77, 0x65, 0x6e, 0x65, 0x72, 0x3b, 0x64, 0x79, 0x20, 0x53, 0x61, 0x64, 0x6f, 0x72, 0x6e, 0x3b,
+0x74, 0xec, 0x3b, 0x186, 0x6a, 0x254, 0x301, 0x20, 0xc0, 0x62, 0xe1, 0x6d, 0x25b, 0x301, 0x74, 0x61, 0xc0, 0xec, 0x6b, 0x3b,
+0x41, 0x6a, 0x3b, 0xcc, 0x73, 0x25b, 0x301, 0x67, 0x3b, 0x186, 0x6a, 0x254, 0x301, 0x72, 0x3b, 0x186, 0x6a, 0x254, 0x301, 0x62,
+0x3b, 0x190, 0x74, 0x3b, 0xc0, 0x62, 0xe1, 0x6d, 0xc0, 0x3b, 0x41, 0x3b, 0xcc, 0x3b, 0x186, 0x3b, 0x186, 0x3b, 0x190, 0x3b,
+0xc0, 0x49, 0x53, 0x6f, 0x6e, 0x74, 0x6f, 0x3b, 0x55, 0x4d, 0x73, 0x6f, 0x6d, 0x62, 0x75, 0x6c, 0x75, 0x6b, 0x6f, 0x3b,
+0x55, 0x4c, 0x77, 0x65, 0x73, 0x69, 0x62, 0x69, 0x6c, 0x69, 0x3b, 0x55, 0x4c, 0x77, 0x65, 0x73, 0x69, 0x74, 0x68, 0x61,
+0x74, 0x68, 0x75, 0x3b, 0x55, 0x4c, 0x77, 0x65, 0x73, 0x69, 0x6e, 0x65, 0x3b, 0x55, 0x4c, 0x77, 0x65, 0x73, 0x69, 0x68,
+0x6c, 0x61, 0x6e, 0x75, 0x3b, 0x55, 0x4d, 0x67, 0x71, 0x69, 0x62, 0x65, 0x6c, 0x6f, 0x53, 0x6f, 0x6e, 0x3b, 0x4d, 0x73,
+0x6f, 0x3b, 0x42, 0x69, 0x6c, 0x3b, 0x54, 0x68, 0x61, 0x3b, 0x53, 0x69, 0x6e, 0x3b, 0x48, 0x6c, 0x61, 0x3b, 0x4d, 0x67,
+0x71, 0x53, 0x3b, 0x4d, 0x3b, 0x42, 0x3b, 0x54, 0x3b, 0x53, 0x3b, 0x48, 0x3b, 0x4d, 0x73, 0xf8, 0x6e, 0x64, 0x61, 0x67,
+0x3b, 0x6d, 0xe5, 0x6e, 0x64, 0x61, 0x67, 0x3b, 0x74, 0x79, 0x73, 0x64, 0x61, 0x67, 0x3b, 0x6f, 0x6e, 0x73, 0x64, 0x61,
+0x67, 0x3b, 0x74, 0x6f, 0x72, 0x73, 0x64, 0x61, 0x67, 0x3b, 0x66, 0x72, 0x65, 0x64, 0x61, 0x67, 0x3b, 0x6c, 0x61, 0x75,
+0x72, 0x64, 0x61, 0x67, 0x73, 0xf8, 0x6e, 0x3b, 0x6d, 0xe5, 0x6e, 0x3b, 0x74, 0x79, 0x73, 0x3b, 0x6f, 0x6e, 0x73, 0x3b,
+0x74, 0x6f, 0x72, 0x3b, 0x66, 0x72, 0x65, 0x3b, 0x6c, 0x61, 0x75, 0x73, 0xf8, 0x2e, 0x3b, 0x6d, 0xe5, 0x2e, 0x3b, 0x74,
+0x79, 0x2e, 0x3b, 0x6f, 0x6e, 0x2e, 0x3b, 0x74, 0x6f, 0x2e, 0x3b, 0x66, 0x72, 0x2e, 0x3b, 0x6c, 0x61, 0x2e, 0x43d, 0x435,
+0x434, 0x458, 0x435, 0x459, 0x430, 0x3b, 0x43f, 0x43e, 0x43d, 0x435, 0x434, 0x458, 0x435, 0x459, 0x430, 0x43a, 0x3b, 0x443, 0x442, 0x43e,
+0x440, 0x430, 0x43a, 0x3b, 0x441, 0x440, 0x438, 0x458, 0x435, 0x434, 0x430, 0x3b, 0x447, 0x435, 0x442, 0x432, 0x440, 0x442, 0x430, 0x43a,
+0x3b, 0x43f, 0x435, 0x442, 0x430, 0x43a, 0x3b, 0x441, 0x443, 0x431, 0x43e, 0x442, 0x430, 0x43d, 0x435, 0x434, 0x3b, 0x43f, 0x43e, 0x43d,
+0x3b, 0x443, 0x442, 0x43e, 0x3b, 0x441, 0x440, 0x438, 0x3b, 0x447, 0x435, 0x442, 0x3b, 0x43f, 0x435, 0x442, 0x3b, 0x441, 0x443, 0x431,
+0x4a, 0x65, 0x64, 0x6f, 0x6f, 0x6e, 0x65, 0x65, 0x3b, 0x4a, 0x65, 0x6c, 0x68, 0x65, 0x69, 0x6e, 0x3b, 0x4a, 0x65, 0x6d,
+0x61, 0x79, 0x72, 0x74, 0x3b, 0x4a, 0x65, 0x72, 0x63, 0x65, 0x61, 0x6e, 0x3b, 0x4a, 0x65, 0x72, 0x64, 0x65, 0x69, 0x6e,
+0x3b, 0x4a, 0x65, 0x68, 0x65, 0x69, 0x6e, 0x65, 0x79, 0x3b, 0x4a, 0x65, 0x73, 0x61, 0x72, 0x6e, 0x4a, 0x65, 0x64, 0x3b,
+0x4a, 0x65, 0x6c, 0x3b, 0x4a, 0x65, 0x6d, 0x3b, 0x4a, 0x65, 0x72, 0x63, 0x3b, 0x4a, 0x65, 0x72, 0x64, 0x3b, 0x4a, 0x65,
+0x68, 0x3b, 0x4a, 0x65, 0x73, 0x64, 0x79, 0x20, 0x53, 0x75, 0x6c, 0x3b, 0x64, 0x79, 0x20, 0x4c, 0x75, 0x6e, 0x3b, 0x64,
+0x79, 0x20, 0x4d, 0x65, 0x75, 0x72, 0x74, 0x68, 0x3b, 0x64, 0x79, 0x20, 0x4d, 0x65, 0x72, 0x68, 0x65, 0x72, 0x3b, 0x64,
+0x79, 0x20, 0x59, 0x6f, 0x77, 0x3b, 0x64, 0x79, 0x20, 0x47, 0x77, 0x65, 0x6e, 0x65, 0x72, 0x3b, 0x64, 0x79, 0x20, 0x53,
+0x61, 0x64, 0x6f, 0x72, 0x6e, 0x53, 0x75, 0x6c, 0x3b, 0x4c, 0x75, 0x6e, 0x3b, 0x4d, 0x74, 0x68, 0x3b, 0x4d, 0x68, 0x72,
+0x3b, 0x59, 0x6f, 0x77, 0x3b, 0x47, 0x77, 0x65, 0x3b, 0x53, 0x61, 0x64, 0x4b, 0x77, 0x65, 0x73, 0x69, 0x64, 0x61, 0x3b,
+0x44, 0x77, 0x6f, 0x77, 0x64, 0x61, 0x3b, 0x42, 0x65, 0x6e, 0x61, 0x64, 0x61, 0x3b, 0x57, 0x75, 0x6b, 0x75, 0x64, 0x61,
+0x3b, 0x59, 0x61, 0x77, 0x64, 0x61, 0x3b, 0x46, 0x69, 0x64, 0x61, 0x3b, 0x4d, 0x65, 0x6d, 0x65, 0x6e, 0x65, 0x64, 0x61,
 0x4b, 0x77, 0x65, 0x3b, 0x44, 0x77, 0x6f, 0x3b, 0x42, 0x65, 0x6e, 0x3b, 0x57, 0x75, 0x6b, 0x3b, 0x59, 0x61, 0x77, 0x3b,
-0x46, 0x69, 0x61, 0x3b, 0x4d, 0x65, 0x6d, 0x3b, 0x4b, 0x77, 0x65, 0x73, 0x69, 0x64, 0x61, 0x3b, 0x44, 0x77, 0x6f, 0x77,
-0x64, 0x61, 0x3b, 0x42, 0x65, 0x6e, 0x61, 0x64, 0x61, 0x3b, 0x57, 0x75, 0x6b, 0x75, 0x64, 0x61, 0x3b, 0x59, 0x61, 0x77,
-0x64, 0x61, 0x3b, 0x46, 0x69, 0x64, 0x61, 0x3b, 0x4d, 0x65, 0x6d, 0x65, 0x6e, 0x65, 0x64, 0x61, 0x3b, 0x4b, 0x3b, 0x44,
-0x3b, 0x42, 0x3b, 0x57, 0x3b, 0x59, 0x3b, 0x46, 0x3b, 0x4d, 0x3b, 0x906, 0x92f, 0x924, 0x93e, 0x930, 0x3b, 0x938, 0x94b, 0x92e,
-0x93e, 0x930, 0x3b, 0x92e, 0x902, 0x917, 0x933, 0x93e, 0x930, 0x3b, 0x92c, 0x941, 0x927, 0x935, 0x93e, 0x930, 0x3b, 0x917, 0x941, 0x930,
-0x941, 0x935, 0x93e, 0x930, 0x3b, 0x936, 0x941, 0x915, 0x94d, 0x930, 0x93e, 0x930, 0x3b, 0x936, 0x947, 0x928, 0x935, 0x93e, 0x930, 0x3b,
-0x906, 0x3b, 0x938, 0x94b, 0x3b, 0x92e, 0x902, 0x3b, 0x92c, 0x941, 0x3b, 0x917, 0x941, 0x3b, 0x936, 0x941, 0x3b, 0x936, 0x947, 0x3b,
+0x46, 0x69, 0x61, 0x3b, 0x4d, 0x65, 0x6d, 0x4b, 0x3b, 0x44, 0x3b, 0x42, 0x3b, 0x57, 0x3b, 0x59, 0x3b, 0x46, 0x3b, 0x4d,
+0x906, 0x92f, 0x924, 0x93e, 0x930, 0x3b, 0x938, 0x94b, 0x92e, 0x93e, 0x930, 0x3b, 0x92e, 0x902, 0x917, 0x933, 0x93e, 0x930, 0x3b, 0x92c,
+0x941, 0x927, 0x935, 0x93e, 0x930, 0x3b, 0x917, 0x941, 0x930, 0x941, 0x935, 0x93e, 0x930, 0x3b, 0x936, 0x941, 0x915, 0x94d, 0x930, 0x93e,
+0x930, 0x3b, 0x936, 0x947, 0x928, 0x935, 0x93e, 0x930, 0x906, 0x3b, 0x938, 0x94b, 0x3b, 0x92e, 0x902, 0x3b, 0x92c, 0x941, 0x3b, 0x917,
+0x941, 0x3b, 0x936, 0x941, 0x3b, 0x936, 0x947, 0x53, 0x1ecd, 0x6e, 0x64, 0x65, 0x65, 0x3b, 0x4d, 0x1ecd, 0x6e, 0x64, 0x65, 0x3b,
+0x54, 0x69, 0x75, 0x7a, 0x64, 0x65, 0x65, 0x3b, 0x57, 0x65, 0x6e, 0x65, 0x7a, 0x64, 0x65, 0x65, 0x3b, 0x54, 0x1ecd, 0x1ecd,
+0x7a, 0x64, 0x65, 0x65, 0x3b, 0x46, 0x72, 0x61, 0x1ecb, 0x64, 0x65, 0x65, 0x3b, 0x53, 0x61, 0x74, 0x1ecd, 0x64, 0x65, 0x65,
 0x1ee4, 0x6b, 0x61, 0x3b, 0x4d, 0x1ecd, 0x6e, 0x3b, 0x54, 0x69, 0x75, 0x3b, 0x57, 0x65, 0x6e, 0x3b, 0x54, 0x1ecd, 0x1ecd, 0x3b,
-0x46, 0x72, 0x61, 0x1ecb, 0x3b, 0x53, 0x61, 0x74, 0x3b, 0x53, 0x1ecd, 0x6e, 0x64, 0x65, 0x65, 0x3b, 0x4d, 0x1ecd, 0x6e, 0x64,
-0x65, 0x3b, 0x54, 0x69, 0x75, 0x7a, 0x64, 0x65, 0x65, 0x3b, 0x57, 0x65, 0x6e, 0x65, 0x7a, 0x64, 0x65, 0x65, 0x3b, 0x54,
-0x1ecd, 0x1ecd, 0x7a, 0x64, 0x65, 0x65, 0x3b, 0x46, 0x72, 0x61, 0x1ecb, 0x64, 0x65, 0x65, 0x3b, 0x53, 0x61, 0x74, 0x1ecd, 0x64,
-0x65, 0x65, 0x3b, 0x57, 0x6b, 0x79, 0x3b, 0x57, 0x6b, 0x77, 0x3b, 0x57, 0x6b, 0x6c, 0x3b, 0x57, 0x74, 0x169, 0x3b, 0x57,
-0x6b, 0x6e, 0x3b, 0x57, 0x74, 0x6e, 0x3b, 0x57, 0x74, 0x68, 0x3b, 0x57, 0x61, 0x20, 0x6b, 0x79, 0x75, 0x6d, 0x77, 0x61,
-0x3b, 0x57, 0x61, 0x20, 0x6b, 0x77, 0x61, 0x6d, 0x62, 0x129, 0x6c, 0x129, 0x6c, 0x79, 0x61, 0x3b, 0x57, 0x61, 0x20, 0x6b,
-0x65, 0x6c, 0x129, 0x3b, 0x57, 0x61, 0x20, 0x6b, 0x61, 0x74, 0x61, 0x74, 0x169, 0x3b, 0x57, 0x61, 0x20, 0x6b, 0x61, 0x6e,
-0x61, 0x3b, 0x57, 0x61, 0x20, 0x6b, 0x61, 0x74, 0x61, 0x6e, 0x6f, 0x3b, 0x57, 0x61, 0x20, 0x74, 0x68, 0x61, 0x6e, 0x74,
-0x68, 0x61, 0x74, 0x169, 0x3b, 0x59, 0x3b, 0x57, 0x3b, 0x45, 0x3b, 0x41, 0x3b, 0x41, 0x3b, 0x41, 0x3b, 0x41, 0x3b, 0x64,
-0x6f, 0x6d, 0x3b, 0x6c, 0x75, 0x6e, 0x3b, 0x6d, 0x61, 0x72, 0x3b, 0x6d, 0x69, 0x65, 0x3b, 0x6a, 0x6f, 0x69, 0x3b, 0x76,
-0x69, 0x6e, 0x3b, 0x73, 0x61, 0x62, 0x3b, 0x64, 0x6f, 0x6d, 0x65, 0x6e, 0x69, 0x65, 0x3b, 0x6c, 0x75, 0x6e, 0x69, 0x73,
-0x3b, 0x6d, 0x61, 0x72, 0x74, 0x61, 0x72, 0x73, 0x3b, 0x6d, 0x69, 0x65, 0x72, 0x63, 0x75, 0x73, 0x3b, 0x6a, 0x6f, 0x69,
-0x62, 0x65, 0x3b, 0x76, 0x69, 0x6e, 0x61, 0x72, 0x73, 0x3b, 0x73, 0x61, 0x62, 0x69, 0x64, 0x65, 0x3b, 0x6b, 0x254, 0x73,
-0x3b, 0x64, 0x7a, 0x6f, 0x3b, 0x62, 0x6c, 0x61, 0x3b, 0x6b, 0x75, 0x256, 0x3b, 0x79, 0x61, 0x77, 0x3b, 0x66, 0x69, 0x256,
-0x3b, 0x6d, 0x65, 0x6d, 0x3b, 0x6b, 0x254, 0x73, 0x69, 0x256, 0x61, 0x3b, 0x64, 0x7a, 0x6f, 0x256, 0x61, 0x3b, 0x62, 0x6c,
-0x61, 0x256, 0x61, 0x3b, 0x6b, 0x75, 0x256, 0x61, 0x3b, 0x79, 0x61, 0x77, 0x6f, 0x256, 0x61, 0x3b, 0x66, 0x69, 0x256, 0x61,
-0x3b, 0x6d, 0x65, 0x6d, 0x6c, 0x65, 0x256, 0x61, 0x3b, 0x6b, 0x3b, 0x64, 0x3b, 0x62, 0x3b, 0x6b, 0x3b, 0x79, 0x3b, 0x66,
-0x3b, 0x6d, 0x3b, 0x4c, 0x50, 0x3b, 0x50, 0x31, 0x3b, 0x50, 0x32, 0x3b, 0x50, 0x33, 0x3b, 0x50, 0x34, 0x3b, 0x50, 0x35,
-0x3b, 0x50, 0x36, 0x3b, 0x4c, 0x101, 0x70, 0x75, 0x6c, 0x65, 0x3b, 0x50, 0x6f, 0x2bb, 0x61, 0x6b, 0x61, 0x68, 0x69, 0x3b,
-0x50, 0x6f, 0x2bb, 0x61, 0x6c, 0x75, 0x61, 0x3b, 0x50, 0x6f, 0x2bb, 0x61, 0x6b, 0x6f, 0x6c, 0x75, 0x3b, 0x50, 0x6f, 0x2bb,
-0x61, 0x68, 0x101, 0x3b, 0x50, 0x6f, 0x2bb, 0x61, 0x6c, 0x69, 0x6d, 0x61, 0x3b, 0x50, 0x6f, 0x2bb, 0x61, 0x6f, 0x6e, 0x6f,
-0x3b, 0x4c, 0x69, 0x6e, 0x3b, 0x4c, 0x75, 0x6e, 0x3b, 0x4d, 0x61, 0x72, 0x3b, 0x4d, 0x69, 0x79, 0x3b, 0x48, 0x75, 0x77,
-0x3b, 0x42, 0x69, 0x79, 0x3b, 0x53, 0x61, 0x62, 0x3b, 0x4c, 0x69, 0x6e, 0x67, 0x67, 0x6f, 0x3b, 0x4c, 0x75, 0x6e, 0x65,
-0x73, 0x3b, 0x4d, 0x61, 0x72, 0x74, 0x65, 0x73, 0x3b, 0x4d, 0x69, 0x79, 0x65, 0x72, 0x6b, 0x75, 0x6c, 0x65, 0x73, 0x3b,
-0x48, 0x75, 0x77, 0x65, 0x62, 0x65, 0x73, 0x3b, 0x42, 0x69, 0x79, 0x65, 0x72, 0x6e, 0x65, 0x73, 0x3b, 0x53, 0x61, 0x62,
-0x61, 0x64, 0x6f, 0x3b, 0x53, 0x75, 0x2e, 0x3b, 0x4d, 0xe4, 0x2e, 0x3b, 0x5a, 0x69, 0x2e, 0x3b, 0x4d, 0x69, 0x2e, 0x3b,
-0x44, 0x75, 0x2e, 0x3b, 0x46, 0x72, 0x2e, 0x3b, 0x53, 0x61, 0x2e, 0x3b, 0x53, 0x75, 0x6e, 0x6e, 0x74, 0x69, 0x67, 0x3b,
-0x4d, 0xe4, 0xe4, 0x6e, 0x74, 0x69, 0x67, 0x3b, 0x5a, 0x69, 0x69, 0x73, 0x63, 0x68, 0x74, 0x69, 0x67, 0x3b, 0x4d, 0x69,
-0x74, 0x74, 0x77, 0x75, 0x63, 0x68, 0x3b, 0x44, 0x75, 0x6e, 0x73, 0x63, 0x68, 0x74, 0x69, 0x67, 0x3b, 0x46, 0x72, 0x69,
-0x69, 0x74, 0x69, 0x67, 0x3b, 0x53, 0x61, 0x6d, 0x73, 0x63, 0x68, 0x74, 0x69, 0x67, 0x3b, 0xa46d, 0xa18f, 0x3b, 0xa18f, 0xa2cd,
-0x3b, 0xa18f, 0xa44d, 0x3b, 0xa18f, 0xa315, 0x3b, 0xa18f, 0xa1d6, 0x3b, 0xa18f, 0xa26c, 0x3b, 0xa18f, 0xa0d8, 0x3b, 0xa46d, 0xa18f, 0xa44d, 0x3b,
-0xa18f, 0xa282, 0xa2cd, 0x3b, 0xa18f, 0xa282, 0xa44d, 0x3b, 0xa18f, 0xa282, 0xa315, 0x3b, 0xa18f, 0xa282, 0xa1d6, 0x3b, 0xa18f, 0xa282, 0xa26c, 0x3b,
-0xa18f, 0xa282, 0xa0d8, 0x3b, 0xa18f, 0x3b, 0xa2cd, 0x3b, 0xa44d, 0x3b, 0xa315, 0x3b, 0xa1d6, 0x3b, 0xa26c, 0x3b, 0xa0d8, 0x3b, 0x53, 0xfc,
-0x2e, 0x3b, 0x4d, 0x61, 0x2e, 0x3b, 0x44, 0x69, 0x2e, 0x3b, 0x4d, 0x69, 0x2e, 0x3b, 0x44, 0x75, 0x2e, 0x3b, 0x46, 0x72,
-0x2e, 0x3b, 0x53, 0x61, 0x2e, 0x3b, 0x53, 0xfc, 0x6e, 0x6e, 0x64, 0x61, 0x67, 0x3b, 0x4d, 0x61, 0x61, 0x6e, 0x64, 0x61,
+0x46, 0x72, 0x61, 0x1ecb, 0x3b, 0x53, 0x61, 0x74, 0x57, 0x61, 0x20, 0x6b, 0x79, 0x75, 0x6d, 0x77, 0x61, 0x3b, 0x57, 0x61,
+0x20, 0x6b, 0x77, 0x61, 0x6d, 0x62, 0x129, 0x6c, 0x129, 0x6c, 0x79, 0x61, 0x3b, 0x57, 0x61, 0x20, 0x6b, 0x65, 0x6c, 0x129,
+0x3b, 0x57, 0x61, 0x20, 0x6b, 0x61, 0x74, 0x61, 0x74, 0x169, 0x3b, 0x57, 0x61, 0x20, 0x6b, 0x61, 0x6e, 0x61, 0x3b, 0x57,
+0x61, 0x20, 0x6b, 0x61, 0x74, 0x61, 0x6e, 0x6f, 0x3b, 0x57, 0x61, 0x20, 0x74, 0x68, 0x61, 0x6e, 0x74, 0x68, 0x61, 0x74,
+0x169, 0x57, 0x6b, 0x79, 0x3b, 0x57, 0x6b, 0x77, 0x3b, 0x57, 0x6b, 0x6c, 0x3b, 0x57, 0x74, 0x169, 0x3b, 0x57, 0x6b, 0x6e,
+0x3b, 0x57, 0x74, 0x6e, 0x3b, 0x57, 0x74, 0x68, 0x59, 0x3b, 0x57, 0x3b, 0x45, 0x3b, 0x41, 0x3b, 0x41, 0x3b, 0x41, 0x3b,
+0x41, 0x64, 0x6f, 0x6d, 0x65, 0x6e, 0x69, 0x65, 0x3b, 0x6c, 0x75, 0x6e, 0x69, 0x73, 0x3b, 0x6d, 0x61, 0x72, 0x74, 0x61,
+0x72, 0x73, 0x3b, 0x6d, 0x69, 0x65, 0x72, 0x63, 0x75, 0x73, 0x3b, 0x6a, 0x6f, 0x69, 0x62, 0x65, 0x3b, 0x76, 0x69, 0x6e,
+0x61, 0x72, 0x73, 0x3b, 0x73, 0x61, 0x62, 0x69, 0x64, 0x65, 0x64, 0x6f, 0x6d, 0x3b, 0x6c, 0x75, 0x6e, 0x3b, 0x6d, 0x61,
+0x72, 0x3b, 0x6d, 0x69, 0x65, 0x3b, 0x6a, 0x6f, 0x69, 0x3b, 0x76, 0x69, 0x6e, 0x3b, 0x73, 0x61, 0x62, 0x6b, 0x254, 0x73,
+0x69, 0x256, 0x61, 0x3b, 0x64, 0x7a, 0x6f, 0x256, 0x61, 0x3b, 0x62, 0x6c, 0x61, 0x256, 0x61, 0x3b, 0x6b, 0x75, 0x256, 0x61,
+0x3b, 0x79, 0x61, 0x77, 0x6f, 0x256, 0x61, 0x3b, 0x66, 0x69, 0x256, 0x61, 0x3b, 0x6d, 0x65, 0x6d, 0x6c, 0x65, 0x256, 0x61,
+0x6b, 0x254, 0x73, 0x3b, 0x64, 0x7a, 0x6f, 0x3b, 0x62, 0x6c, 0x61, 0x3b, 0x6b, 0x75, 0x256, 0x3b, 0x79, 0x61, 0x77, 0x3b,
+0x66, 0x69, 0x256, 0x3b, 0x6d, 0x65, 0x6d, 0x6b, 0x3b, 0x64, 0x3b, 0x62, 0x3b, 0x6b, 0x3b, 0x79, 0x3b, 0x66, 0x3b, 0x6d,
+0x4c, 0x101, 0x70, 0x75, 0x6c, 0x65, 0x3b, 0x50, 0x6f, 0x2bb, 0x61, 0x6b, 0x61, 0x68, 0x69, 0x3b, 0x50, 0x6f, 0x2bb, 0x61,
+0x6c, 0x75, 0x61, 0x3b, 0x50, 0x6f, 0x2bb, 0x61, 0x6b, 0x6f, 0x6c, 0x75, 0x3b, 0x50, 0x6f, 0x2bb, 0x61, 0x68, 0x101, 0x3b,
+0x50, 0x6f, 0x2bb, 0x61, 0x6c, 0x69, 0x6d, 0x61, 0x3b, 0x50, 0x6f, 0x2bb, 0x61, 0x6f, 0x6e, 0x6f, 0x4c, 0x50, 0x3b, 0x50,
+0x31, 0x3b, 0x50, 0x32, 0x3b, 0x50, 0x33, 0x3b, 0x50, 0x34, 0x3b, 0x50, 0x35, 0x3b, 0x50, 0x36, 0x4c, 0x69, 0x6e, 0x67,
+0x67, 0x6f, 0x3b, 0x4c, 0x75, 0x6e, 0x65, 0x73, 0x3b, 0x4d, 0x61, 0x72, 0x74, 0x65, 0x73, 0x3b, 0x4d, 0x69, 0x79, 0x65,
+0x72, 0x6b, 0x75, 0x6c, 0x65, 0x73, 0x3b, 0x48, 0x75, 0x77, 0x65, 0x62, 0x65, 0x73, 0x3b, 0x42, 0x69, 0x79, 0x65, 0x72,
+0x6e, 0x65, 0x73, 0x3b, 0x53, 0x61, 0x62, 0x61, 0x64, 0x6f, 0x4c, 0x69, 0x6e, 0x3b, 0x4c, 0x75, 0x6e, 0x3b, 0x4d, 0x61,
+0x72, 0x3b, 0x4d, 0x69, 0x79, 0x3b, 0x48, 0x75, 0x77, 0x3b, 0x42, 0x69, 0x79, 0x3b, 0x53, 0x61, 0x62, 0x53, 0x75, 0x6e,
+0x6e, 0x74, 0x69, 0x67, 0x3b, 0x4d, 0xe4, 0xe4, 0x6e, 0x74, 0x69, 0x67, 0x3b, 0x5a, 0x69, 0x69, 0x73, 0x63, 0x68, 0x74,
+0x69, 0x67, 0x3b, 0x4d, 0x69, 0x74, 0x74, 0x77, 0x75, 0x63, 0x68, 0x3b, 0x44, 0x75, 0x6e, 0x73, 0x63, 0x68, 0x74, 0x69,
+0x67, 0x3b, 0x46, 0x72, 0x69, 0x69, 0x74, 0x69, 0x67, 0x3b, 0x53, 0x61, 0x6d, 0x73, 0x63, 0x68, 0x74, 0x69, 0x67, 0x53,
+0x75, 0x2e, 0x3b, 0x4d, 0xe4, 0x2e, 0x3b, 0x5a, 0x69, 0x2e, 0x3b, 0x4d, 0x69, 0x2e, 0x3b, 0x44, 0x75, 0x2e, 0x3b, 0x46,
+0x72, 0x2e, 0x3b, 0x53, 0x61, 0x2e, 0xa46d, 0xa18f, 0xa44d, 0x3b, 0xa18f, 0xa282, 0xa2cd, 0x3b, 0xa18f, 0xa282, 0xa44d, 0x3b, 0xa18f, 0xa282,
+0xa315, 0x3b, 0xa18f, 0xa282, 0xa1d6, 0x3b, 0xa18f, 0xa282, 0xa26c, 0x3b, 0xa18f, 0xa282, 0xa0d8, 0xa46d, 0xa18f, 0x3b, 0xa18f, 0xa2cd, 0x3b, 0xa18f,
+0xa44d, 0x3b, 0xa18f, 0xa315, 0x3b, 0xa18f, 0xa1d6, 0x3b, 0xa18f, 0xa26c, 0x3b, 0xa18f, 0xa0d8, 0xa18f, 0x3b, 0xa2cd, 0x3b, 0xa44d, 0x3b, 0xa315,
+0x3b, 0xa1d6, 0x3b, 0xa26c, 0x3b, 0xa0d8, 0x53, 0xfc, 0x6e, 0x6e, 0x64, 0x61, 0x67, 0x3b, 0x4d, 0x61, 0x61, 0x6e, 0x64, 0x61,
 0x67, 0x3b, 0x44, 0x69, 0x6e, 0x67, 0x73, 0x64, 0x61, 0x67, 0x3b, 0x4d, 0x69, 0x64, 0x64, 0x65, 0x77, 0x65, 0x6b, 0x65,
 0x6e, 0x3b, 0x44, 0x75, 0x6e, 0x6e, 0x65, 0x72, 0x73, 0x64, 0x61, 0x67, 0x3b, 0x46, 0x72, 0x65, 0x65, 0x64, 0x61, 0x67,
-0x3b, 0x53, 0xfc, 0x6e, 0x6e, 0x61, 0x76, 0x65, 0x6e, 0x64, 0x3b, 0x73, 0x6f, 0x74, 0x6e, 0x3b, 0x76, 0x75, 0x6f, 0x73,
+0x3b, 0x53, 0xfc, 0x6e, 0x6e, 0x61, 0x76, 0x65, 0x6e, 0x64, 0x53, 0xfc, 0x2e, 0x3b, 0x4d, 0x61, 0x2e, 0x3b, 0x44, 0x69,
+0x2e, 0x3b, 0x4d, 0x69, 0x2e, 0x3b, 0x44, 0x75, 0x2e, 0x3b, 0x46, 0x72, 0x2e, 0x3b, 0x53, 0x61, 0x2e, 0x73, 0x6f, 0x74,
+0x6e, 0x61, 0x62, 0x65, 0x61, 0x69, 0x76, 0x69, 0x3b, 0x76, 0x75, 0x6f, 0x73, 0x73, 0xe1, 0x72, 0x67, 0x61, 0x3b, 0x6d,
+0x61, 0x14b, 0x14b, 0x65, 0x62, 0xe1, 0x72, 0x67, 0x61, 0x3b, 0x67, 0x61, 0x73, 0x6b, 0x61, 0x76, 0x61, 0x68, 0x6b, 0x6b,
+0x75, 0x3b, 0x64, 0x75, 0x6f, 0x72, 0x61, 0x73, 0x64, 0x61, 0x74, 0x3b, 0x62, 0x65, 0x61, 0x72, 0x6a, 0x61, 0x64, 0x61,
+0x74, 0x3b, 0x6c, 0xe1, 0x76, 0x76, 0x61, 0x72, 0x64, 0x61, 0x74, 0x73, 0x6f, 0x74, 0x6e, 0x3b, 0x76, 0x75, 0x6f, 0x73,
 0x3b, 0x6d, 0x61, 0x14b, 0x3b, 0x67, 0x61, 0x73, 0x6b, 0x3b, 0x64, 0x75, 0x6f, 0x72, 0x3b, 0x62, 0x65, 0x61, 0x72, 0x3b,
-0x6c, 0xe1, 0x76, 0x3b, 0x73, 0x6f, 0x74, 0x6e, 0x61, 0x62, 0x65, 0x61, 0x69, 0x76, 0x69, 0x3b, 0x76, 0x75, 0x6f, 0x73,
-0x73, 0xe1, 0x72, 0x67, 0x61, 0x3b, 0x6d, 0x61, 0x14b, 0x14b, 0x65, 0x62, 0xe1, 0x72, 0x67, 0x61, 0x3b, 0x67, 0x61, 0x73,
-0x6b, 0x61, 0x76, 0x61, 0x68, 0x6b, 0x6b, 0x75, 0x3b, 0x64, 0x75, 0x6f, 0x72, 0x61, 0x73, 0x64, 0x61, 0x74, 0x3b, 0x62,
-0x65, 0x61, 0x72, 0x6a, 0x61, 0x64, 0x61, 0x74, 0x3b, 0x6c, 0xe1, 0x76, 0x76, 0x61, 0x72, 0x64, 0x61, 0x74, 0x3b, 0x53,
-0x3b, 0x56, 0x3b, 0x4d, 0x3b, 0x47, 0x3b, 0x44, 0x3b, 0x42, 0x3b, 0x4c, 0x3b, 0x73, 0x6f, 0x3b, 0x6d, 0xe1, 0x3b, 0x64,
-0x69, 0x3b, 0x67, 0x61, 0x3b, 0x64, 0x75, 0x3b, 0x62, 0x65, 0x3b, 0x6c, 0xe1, 0x3b, 0x73, 0x6f, 0x74, 0x6e, 0x61, 0x62,
-0x65, 0x61, 0x69, 0x76, 0x69, 0x3b, 0x6d, 0xe1, 0x6e, 0x6e, 0x6f, 0x64, 0x61, 0x74, 0x3b, 0x64, 0x69, 0x73, 0x64, 0x61,
-0x74, 0x3b, 0x67, 0x61, 0x73, 0x6b, 0x61, 0x76, 0x61, 0x68, 0x6b, 0x6b, 0x75, 0x3b, 0x64, 0x75, 0x6f, 0x72, 0x61, 0x73,
-0x74, 0x61, 0x74, 0x3b, 0x62, 0x65, 0x61, 0x72, 0x6a, 0x61, 0x64, 0x61, 0x74, 0x3b, 0x6c, 0xe1, 0x76, 0x76, 0x6f, 0x72,
-0x64, 0x61, 0x74, 0x3b, 0x53, 0x3b, 0x4d, 0x3b, 0x44, 0x3b, 0x47, 0x3b, 0x44, 0x3b, 0x42, 0x3b, 0x4c, 0x3b, 0x43, 0x70,
-0x72, 0x3b, 0x43, 0x74, 0x74, 0x3b, 0x43, 0x6d, 0x6e, 0x3b, 0x43, 0x6d, 0x74, 0x3b, 0x41, 0x72, 0x73, 0x3b, 0x49, 0x63,
-0x6d, 0x3b, 0x45, 0x73, 0x74, 0x3b, 0x43, 0x68, 0x75, 0x6d, 0x61, 0x70, 0x69, 0x72, 0x69, 0x3b, 0x43, 0x68, 0x75, 0x6d,
-0x61, 0x74, 0x61, 0x74, 0x6f, 0x3b, 0x43, 0x68, 0x75, 0x6d, 0x61, 0x69, 0x6e, 0x65, 0x3b, 0x43, 0x68, 0x75, 0x6d, 0x61,
-0x74, 0x61, 0x6e, 0x6f, 0x3b, 0x41, 0x72, 0x61, 0x6d, 0x69, 0x73, 0x69, 0x3b, 0x49, 0x63, 0x68, 0x75, 0x6d, 0x61, 0x3b,
-0x45, 0x73, 0x61, 0x62, 0x61, 0x74, 0x6f, 0x3b, 0x43, 0x3b, 0x43, 0x3b, 0x43, 0x3b, 0x43, 0x3b, 0x41, 0x3b, 0x49, 0x3b,
-0x45, 0x3b, 0x4a, 0x75, 0x6d, 0x3b, 0x4a, 0x69, 0x6d, 0x3b, 0x4b, 0x61, 0x77, 0x3b, 0x4b, 0x61, 0x64, 0x3b, 0x4b, 0x61,
-0x6e, 0x3b, 0x4b, 0x61, 0x73, 0x3b, 0x4e, 0x67, 0x75, 0x3b, 0x49, 0x74, 0x75, 0x6b, 0x75, 0x20, 0x6a, 0x61, 0x20, 0x6a,
-0x75, 0x6d, 0x77, 0x61, 0x3b, 0x4b, 0x75, 0x72, 0x61, 0x6d, 0x75, 0x6b, 0x61, 0x20, 0x6a, 0x69, 0x6d, 0x77, 0x65, 0x72,
-0x69, 0x3b, 0x4b, 0x75, 0x72, 0x61, 0x6d, 0x75, 0x6b, 0x61, 0x20, 0x6b, 0x61, 0x77, 0x69, 0x3b, 0x4b, 0x75, 0x72, 0x61,
-0x6d, 0x75, 0x6b, 0x61, 0x20, 0x6b, 0x61, 0x64, 0x61, 0x64, 0x75, 0x3b, 0x4b, 0x75, 0x72, 0x61, 0x6d, 0x75, 0x6b, 0x61,
-0x20, 0x6b, 0x61, 0x6e, 0x61, 0x3b, 0x4b, 0x75, 0x72, 0x61, 0x6d, 0x75, 0x6b, 0x61, 0x20, 0x6b, 0x61, 0x73, 0x61, 0x6e,
-0x75, 0x3b, 0x4b, 0x69, 0x66, 0x75, 0x6c, 0x61, 0x20, 0x6e, 0x67, 0x75, 0x77, 0x6f, 0x3b, 0x4a, 0x3b, 0x4a, 0x3b, 0x4b,
-0x3b, 0x4b, 0x3b, 0x4b, 0x3b, 0x4b, 0x3b, 0x4e, 0x3b, 0x64, 0x65, 0x77, 0x3b, 0x61, 0x61, 0x253, 0x3b, 0x6d, 0x61, 0x77,
-0x3b, 0x6e, 0x6a, 0x65, 0x3b, 0x6e, 0x61, 0x61, 0x3b, 0x6d, 0x77, 0x64, 0x3b, 0x68, 0x62, 0x69, 0x3b, 0x64, 0x65, 0x77,
-0x6f, 0x3b, 0x61, 0x61, 0x253, 0x6e, 0x64, 0x65, 0x3b, 0x6d, 0x61, 0x77, 0x62, 0x61, 0x61, 0x72, 0x65, 0x3b, 0x6e, 0x6a,
-0x65, 0x73, 0x6c, 0x61, 0x61, 0x72, 0x65, 0x3b, 0x6e, 0x61, 0x61, 0x73, 0x61, 0x61, 0x6e, 0x64, 0x65, 0x3b, 0x6d, 0x61,
-0x77, 0x6e, 0x64, 0x65, 0x3b, 0x68, 0x6f, 0x6f, 0x72, 0x65, 0x2d, 0x62, 0x69, 0x69, 0x72, 0x3b, 0x64, 0x3b, 0x61, 0x3b,
-0x6d, 0x3b, 0x6e, 0x3b, 0x6e, 0x3b, 0x6d, 0x3b, 0x68, 0x3b, 0x4b, 0x4d, 0x41, 0x3b, 0x4e, 0x54, 0x54, 0x3b, 0x4e, 0x4d,
-0x4e, 0x3b, 0x4e, 0x4d, 0x54, 0x3b, 0x41, 0x52, 0x54, 0x3b, 0x4e, 0x4d, 0x41, 0x3b, 0x4e, 0x4d, 0x4d, 0x3b, 0x4b, 0x69,
-0x75, 0x6d, 0x69, 0x61, 0x3b, 0x4e, 0x6a, 0x75, 0x6d, 0x61, 0x74, 0x61, 0x74, 0x169, 0x3b, 0x4e, 0x6a, 0x75, 0x6d, 0x61,
-0x69, 0x6e, 0x65, 0x3b, 0x4e, 0x6a, 0x75, 0x6d, 0x61, 0x74, 0x61, 0x6e, 0x61, 0x3b, 0x41, 0x72, 0x61, 0x6d, 0x69, 0x74,
-0x68, 0x69, 0x3b, 0x4e, 0x6a, 0x75, 0x6d, 0x61, 0x61, 0x3b, 0x4e, 0x6a, 0x75, 0x6d, 0x61, 0x6d, 0x6f, 0x74, 0x68, 0x69,
-0x3b, 0x4b, 0x3b, 0x4e, 0x3b, 0x4e, 0x3b, 0x4e, 0x3b, 0x41, 0x3b, 0x4e, 0x3b, 0x4e, 0x3b, 0x41, 0x72, 0x65, 0x3b, 0x4b,
-0x75, 0x6e, 0x3b, 0x4f, 0x6e, 0x67, 0x3b, 0x49, 0x6e, 0x65, 0x3b, 0x49, 0x6c, 0x65, 0x3b, 0x53, 0x61, 0x70, 0x3b, 0x4b,
-0x77, 0x65, 0x3b, 0x4d, 0x64, 0x65, 0x72, 0x6f, 0x74, 0x20, 0x65, 0x65, 0x20, 0x61, 0x72, 0x65, 0x3b, 0x4d, 0x64, 0x65,
+0x6c, 0xe1, 0x76, 0x53, 0x3b, 0x56, 0x3b, 0x4d, 0x3b, 0x47, 0x3b, 0x44, 0x3b, 0x42, 0x3b, 0x4c, 0x73, 0x6f, 0x74, 0x6e,
+0x61, 0x62, 0x65, 0x61, 0x69, 0x76, 0x69, 0x3b, 0x6d, 0xe1, 0x6e, 0x6e, 0x6f, 0x64, 0x61, 0x74, 0x3b, 0x64, 0x69, 0x73,
+0x64, 0x61, 0x74, 0x3b, 0x67, 0x61, 0x73, 0x6b, 0x61, 0x76, 0x61, 0x68, 0x6b, 0x6b, 0x75, 0x3b, 0x64, 0x75, 0x6f, 0x72,
+0x61, 0x73, 0x74, 0x61, 0x74, 0x3b, 0x62, 0x65, 0x61, 0x72, 0x6a, 0x61, 0x64, 0x61, 0x74, 0x3b, 0x6c, 0xe1, 0x76, 0x76,
+0x6f, 0x72, 0x64, 0x61, 0x74, 0x73, 0x6f, 0x3b, 0x6d, 0xe1, 0x3b, 0x64, 0x69, 0x3b, 0x67, 0x61, 0x3b, 0x64, 0x75, 0x3b,
+0x62, 0x65, 0x3b, 0x6c, 0xe1, 0x53, 0x3b, 0x4d, 0x3b, 0x44, 0x3b, 0x47, 0x3b, 0x44, 0x3b, 0x42, 0x3b, 0x4c, 0x43, 0x68,
+0x75, 0x6d, 0x61, 0x70, 0x69, 0x72, 0x69, 0x3b, 0x43, 0x68, 0x75, 0x6d, 0x61, 0x74, 0x61, 0x74, 0x6f, 0x3b, 0x43, 0x68,
+0x75, 0x6d, 0x61, 0x69, 0x6e, 0x65, 0x3b, 0x43, 0x68, 0x75, 0x6d, 0x61, 0x74, 0x61, 0x6e, 0x6f, 0x3b, 0x41, 0x72, 0x61,
+0x6d, 0x69, 0x73, 0x69, 0x3b, 0x49, 0x63, 0x68, 0x75, 0x6d, 0x61, 0x3b, 0x45, 0x73, 0x61, 0x62, 0x61, 0x74, 0x6f, 0x43,
+0x70, 0x72, 0x3b, 0x43, 0x74, 0x74, 0x3b, 0x43, 0x6d, 0x6e, 0x3b, 0x43, 0x6d, 0x74, 0x3b, 0x41, 0x72, 0x73, 0x3b, 0x49,
+0x63, 0x6d, 0x3b, 0x45, 0x73, 0x74, 0x43, 0x3b, 0x43, 0x3b, 0x43, 0x3b, 0x43, 0x3b, 0x41, 0x3b, 0x49, 0x3b, 0x45, 0x49,
+0x74, 0x75, 0x6b, 0x75, 0x20, 0x6a, 0x61, 0x20, 0x6a, 0x75, 0x6d, 0x77, 0x61, 0x3b, 0x4b, 0x75, 0x72, 0x61, 0x6d, 0x75,
+0x6b, 0x61, 0x20, 0x6a, 0x69, 0x6d, 0x77, 0x65, 0x72, 0x69, 0x3b, 0x4b, 0x75, 0x72, 0x61, 0x6d, 0x75, 0x6b, 0x61, 0x20,
+0x6b, 0x61, 0x77, 0x69, 0x3b, 0x4b, 0x75, 0x72, 0x61, 0x6d, 0x75, 0x6b, 0x61, 0x20, 0x6b, 0x61, 0x64, 0x61, 0x64, 0x75,
+0x3b, 0x4b, 0x75, 0x72, 0x61, 0x6d, 0x75, 0x6b, 0x61, 0x20, 0x6b, 0x61, 0x6e, 0x61, 0x3b, 0x4b, 0x75, 0x72, 0x61, 0x6d,
+0x75, 0x6b, 0x61, 0x20, 0x6b, 0x61, 0x73, 0x61, 0x6e, 0x75, 0x3b, 0x4b, 0x69, 0x66, 0x75, 0x6c, 0x61, 0x20, 0x6e, 0x67,
+0x75, 0x77, 0x6f, 0x4a, 0x75, 0x6d, 0x3b, 0x4a, 0x69, 0x6d, 0x3b, 0x4b, 0x61, 0x77, 0x3b, 0x4b, 0x61, 0x64, 0x3b, 0x4b,
+0x61, 0x6e, 0x3b, 0x4b, 0x61, 0x73, 0x3b, 0x4e, 0x67, 0x75, 0x4a, 0x3b, 0x4a, 0x3b, 0x4b, 0x3b, 0x4b, 0x3b, 0x4b, 0x3b,
+0x4b, 0x3b, 0x4e, 0x64, 0x65, 0x77, 0x6f, 0x3b, 0x61, 0x61, 0x253, 0x6e, 0x64, 0x65, 0x3b, 0x6d, 0x61, 0x77, 0x62, 0x61,
+0x61, 0x72, 0x65, 0x3b, 0x6e, 0x6a, 0x65, 0x73, 0x6c, 0x61, 0x61, 0x72, 0x65, 0x3b, 0x6e, 0x61, 0x61, 0x73, 0x61, 0x61,
+0x6e, 0x64, 0x65, 0x3b, 0x6d, 0x61, 0x77, 0x6e, 0x64, 0x65, 0x3b, 0x68, 0x6f, 0x6f, 0x72, 0x65, 0x2d, 0x62, 0x69, 0x69,
+0x72, 0x64, 0x65, 0x77, 0x3b, 0x61, 0x61, 0x253, 0x3b, 0x6d, 0x61, 0x77, 0x3b, 0x6e, 0x6a, 0x65, 0x3b, 0x6e, 0x61, 0x61,
+0x3b, 0x6d, 0x77, 0x64, 0x3b, 0x68, 0x62, 0x69, 0x64, 0x3b, 0x61, 0x3b, 0x6d, 0x3b, 0x6e, 0x3b, 0x6e, 0x3b, 0x6d, 0x3b,
+0x68, 0x4b, 0x69, 0x75, 0x6d, 0x69, 0x61, 0x3b, 0x4e, 0x6a, 0x75, 0x6d, 0x61, 0x74, 0x61, 0x74, 0x169, 0x3b, 0x4e, 0x6a,
+0x75, 0x6d, 0x61, 0x69, 0x6e, 0x65, 0x3b, 0x4e, 0x6a, 0x75, 0x6d, 0x61, 0x74, 0x61, 0x6e, 0x61, 0x3b, 0x41, 0x72, 0x61,
+0x6d, 0x69, 0x74, 0x68, 0x69, 0x3b, 0x4e, 0x6a, 0x75, 0x6d, 0x61, 0x61, 0x3b, 0x4e, 0x6a, 0x75, 0x6d, 0x61, 0x6d, 0x6f,
+0x74, 0x68, 0x69, 0x4b, 0x4d, 0x41, 0x3b, 0x4e, 0x54, 0x54, 0x3b, 0x4e, 0x4d, 0x4e, 0x3b, 0x4e, 0x4d, 0x54, 0x3b, 0x41,
+0x52, 0x54, 0x3b, 0x4e, 0x4d, 0x41, 0x3b, 0x4e, 0x4d, 0x4d, 0x4b, 0x3b, 0x4e, 0x3b, 0x4e, 0x3b, 0x4e, 0x3b, 0x41, 0x3b,
+0x4e, 0x3b, 0x4e, 0x4d, 0x64, 0x65, 0x72, 0x6f, 0x74, 0x20, 0x65, 0x65, 0x20, 0x61, 0x72, 0x65, 0x3b, 0x4d, 0x64, 0x65,
 0x72, 0x6f, 0x74, 0x20, 0x65, 0x65, 0x20, 0x6b, 0x75, 0x6e, 0x69, 0x3b, 0x4d, 0x64, 0x65, 0x72, 0x6f, 0x74, 0x20, 0x65,
 0x65, 0x20, 0x6f, 0x6e, 0x67, 0x2019, 0x77, 0x61, 0x6e, 0x3b, 0x4d, 0x64, 0x65, 0x72, 0x6f, 0x74, 0x20, 0x65, 0x65, 0x20,
 0x69, 0x6e, 0x65, 0x74, 0x3b, 0x4d, 0x64, 0x65, 0x72, 0x6f, 0x74, 0x20, 0x65, 0x65, 0x20, 0x69, 0x6c, 0x65, 0x3b, 0x4d,
 0x64, 0x65, 0x72, 0x6f, 0x74, 0x20, 0x65, 0x65, 0x20, 0x73, 0x61, 0x70, 0x61, 0x3b, 0x4d, 0x64, 0x65, 0x72, 0x6f, 0x74,
-0x20, 0x65, 0x65, 0x20, 0x6b, 0x77, 0x65, 0x3b, 0x41, 0x3b, 0x4b, 0x3b, 0x4f, 0x3b, 0x49, 0x3b, 0x49, 0x3b, 0x53, 0x3b,
-0x4b, 0x3b, 0x44, 0x69, 0x6d, 0x3b, 0x50, 0x6f, 0x73, 0x3b, 0x50, 0x69, 0x72, 0x3b, 0x54, 0x61, 0x74, 0x3b, 0x4e, 0x61,
-0x69, 0x3b, 0x53, 0x68, 0x61, 0x3b, 0x53, 0x61, 0x62, 0x3b, 0x44, 0x69, 0x6d, 0x69, 0x6e, 0x67, 0x75, 0x3b, 0x43, 0x68,
-0x69, 0x70, 0x6f, 0x73, 0x69, 0x3b, 0x43, 0x68, 0x69, 0x70, 0x69, 0x72, 0x69, 0x3b, 0x43, 0x68, 0x69, 0x74, 0x61, 0x74,
-0x75, 0x3b, 0x43, 0x68, 0x69, 0x6e, 0x61, 0x69, 0x3b, 0x43, 0x68, 0x69, 0x73, 0x68, 0x61, 0x6e, 0x75, 0x3b, 0x53, 0x61,
-0x62, 0x75, 0x64, 0x75, 0x3b, 0x44, 0x3b, 0x50, 0x3b, 0x43, 0x3b, 0x54, 0x3b, 0x4e, 0x3b, 0x53, 0x3b, 0x53, 0x3b, 0x53,
-0x6f, 0x6e, 0x3b, 0x4d, 0x76, 0x75, 0x3b, 0x53, 0x69, 0x62, 0x3b, 0x53, 0x69, 0x74, 0x3b, 0x53, 0x69, 0x6e, 0x3b, 0x53,
-0x69, 0x68, 0x3b, 0x4d, 0x67, 0x71, 0x3b, 0x53, 0x6f, 0x6e, 0x74, 0x6f, 0x3b, 0x4d, 0x76, 0x75, 0x6c, 0x6f, 0x3b, 0x53,
-0x69, 0x62, 0x69, 0x6c, 0x69, 0x3b, 0x53, 0x69, 0x74, 0x68, 0x61, 0x74, 0x68, 0x75, 0x3b, 0x53, 0x69, 0x6e, 0x65, 0x3b,
-0x53, 0x69, 0x68, 0x6c, 0x61, 0x6e, 0x75, 0x3b, 0x4d, 0x67, 0x71, 0x69, 0x62, 0x65, 0x6c, 0x6f, 0x3b, 0x53, 0x3b, 0x4d,
-0x3b, 0x53, 0x3b, 0x53, 0x3b, 0x53, 0x3b, 0x53, 0x3b, 0x4d, 0x3b, 0x49, 0x6a, 0x70, 0x3b, 0x49, 0x6a, 0x74, 0x3b, 0x49,
-0x6a, 0x6e, 0x3b, 0x49, 0x6a, 0x74, 0x6e, 0x3b, 0x41, 0x6c, 0x68, 0x3b, 0x49, 0x6a, 0x75, 0x3b, 0x49, 0x6a, 0x6d, 0x3b,
-0x49, 0x6a, 0x75, 0x6d, 0x61, 0x70, 0x69, 0x6c, 0x69, 0x3b, 0x49, 0x6a, 0x75, 0x6d, 0x61, 0x74, 0x61, 0x74, 0x75, 0x3b,
-0x49, 0x6a, 0x75, 0x6d, 0x61, 0x6e, 0x6e, 0x65, 0x3b, 0x49, 0x6a, 0x75, 0x6d, 0x61, 0x74, 0x61, 0x6e, 0x6f, 0x3b, 0x41,
-0x6c, 0x68, 0x61, 0x6d, 0x69, 0x73, 0x69, 0x3b, 0x49, 0x6a, 0x75, 0x6d, 0x61, 0x61, 0x3b, 0x49, 0x6a, 0x75, 0x6d, 0x61,
-0x6d, 0x6f, 0x73, 0x69, 0x3b, 0x32, 0x3b, 0x33, 0x3b, 0x34, 0x3b, 0x35, 0x3b, 0x36, 0x3b, 0x37, 0x3b, 0x31, 0x3b, 0x2d30,
-0x2d59, 0x2d30, 0x3b, 0x2d30, 0x2d62, 0x2d4f, 0x3b, 0x2d30, 0x2d59, 0x2d49, 0x3b, 0x2d30, 0x2d3d, 0x2d55, 0x3b, 0x2d30, 0x2d3d, 0x2d61, 0x3b, 0x2d30,
-0x2d59, 0x2d49, 0x2d4e, 0x3b, 0x2d30, 0x2d59, 0x2d49, 0x2d39, 0x3b, 0x2d30, 0x2d59, 0x2d30, 0x2d4e, 0x2d30, 0x2d59, 0x3b, 0x2d30, 0x2d62, 0x2d4f, 0x2d30,
-0x2d59, 0x3b, 0x2d30, 0x2d59, 0x2d49, 0x2d4f, 0x2d30, 0x2d59, 0x3b, 0x2d30, 0x2d3d, 0x2d55, 0x2d30, 0x2d59, 0x3b, 0x2d30, 0x2d3d, 0x2d61, 0x2d30, 0x2d59,
-0x3b, 0x2d59, 0x2d49, 0x2d4e, 0x2d61, 0x2d30, 0x2d59, 0x3b, 0x2d30, 0x2d59, 0x2d49, 0x2d39, 0x2d62, 0x2d30, 0x2d59, 0x3b, 0x61, 0x73, 0x61, 0x3b,
-0x61, 0x79, 0x6e, 0x3b, 0x61, 0x73, 0x69, 0x3b, 0x61, 0x6b, 0x1e5b, 0x3b, 0x61, 0x6b, 0x77, 0x3b, 0x61, 0x73, 0x69, 0x6d,
-0x3b, 0x61, 0x73, 0x69, 0x1e0d, 0x3b, 0x61, 0x73, 0x61, 0x6d, 0x61, 0x73, 0x3b, 0x61, 0x79, 0x6e, 0x61, 0x73, 0x3b, 0x61,
-0x73, 0x69, 0x6e, 0x61, 0x73, 0x3b, 0x61, 0x6b, 0x1e5b, 0x61, 0x73, 0x3b, 0x61, 0x6b, 0x77, 0x61, 0x73, 0x3b, 0x61, 0x73,
-0x69, 0x6d, 0x77, 0x61, 0x73, 0x3b, 0x61, 0x73, 0x69, 0x1e0d, 0x79, 0x61, 0x73, 0x3b, 0x41, 0x63, 0x65, 0x3b, 0x41, 0x72,
-0x69, 0x3b, 0x41, 0x72, 0x61, 0x3b, 0x41, 0x68, 0x61, 0x3b, 0x41, 0x6d, 0x68, 0x3b, 0x53, 0x65, 0x6d, 0x3b, 0x53, 0x65,
-0x64, 0x3b, 0x41, 0x63, 0x65, 0x72, 0x3b, 0x41, 0x72, 0x69, 0x6d, 0x3b, 0x41, 0x72, 0x61, 0x6d, 0x3b, 0x41, 0x68, 0x61,
-0x64, 0x3b, 0x41, 0x6d, 0x68, 0x61, 0x64, 0x3b, 0x53, 0x65, 0x6d, 0x3b, 0x53, 0x65, 0x64, 0x3b, 0x59, 0x3b, 0x53, 0x3b,
-0x4b, 0x3b, 0x4b, 0x3b, 0x53, 0x3b, 0x53, 0x3b, 0x53, 0x3b, 0x59, 0x61, 0x6e, 0x3b, 0x53, 0x61, 0x6e, 0x3b, 0x4b, 0x72,
-0x61, 0x1e0d, 0x3b, 0x4b, 0x75, 0x1e93, 0x3b, 0x53, 0x61, 0x6d, 0x3b, 0x53, 0x1e0d, 0x69, 0x73, 0x3b, 0x53, 0x61, 0x79, 0x3b,
-0x59, 0x61, 0x6e, 0x61, 0x73, 0x73, 0x3b, 0x53, 0x61, 0x6e, 0x61, 0x73, 0x73, 0x3b, 0x4b, 0x72, 0x61, 0x1e0d, 0x61, 0x73,
-0x73, 0x3b, 0x4b, 0x75, 0x1e93, 0x61, 0x73, 0x73, 0x3b, 0x53, 0x61, 0x6d, 0x61, 0x73, 0x73, 0x3b, 0x53, 0x1e0d, 0x69, 0x73,
-0x61, 0x73, 0x73, 0x3b, 0x53, 0x61, 0x79, 0x61, 0x73, 0x73, 0x3b, 0x43, 0x3b, 0x52, 0x3b, 0x41, 0x3b, 0x48, 0x3b, 0x4d,
-0x3b, 0x53, 0x3b, 0x44, 0x3b, 0x53, 0x41, 0x4e, 0x3b, 0x4f, 0x52, 0x4b, 0x3b, 0x4f, 0x4b, 0x42, 0x3b, 0x4f, 0x4b, 0x53,
-0x3b, 0x4f, 0x4b, 0x4e, 0x3b, 0x4f, 0x4b, 0x54, 0x3b, 0x4f, 0x4d, 0x4b, 0x3b, 0x53, 0x61, 0x6e, 0x64, 0x65, 0x3b, 0x4f,
-0x72, 0x77, 0x6f, 0x6b, 0x75, 0x62, 0x61, 0x6e, 0x7a, 0x61, 0x3b, 0x4f, 0x72, 0x77, 0x61, 0x6b, 0x61, 0x62, 0x69, 0x72,
-0x69, 0x3b, 0x4f, 0x72, 0x77, 0x61, 0x6b, 0x61, 0x73, 0x68, 0x61, 0x74, 0x75, 0x3b, 0x4f, 0x72, 0x77, 0x61, 0x6b, 0x61,
-0x6e, 0x61, 0x3b, 0x4f, 0x72, 0x77, 0x61, 0x6b, 0x61, 0x74, 0x61, 0x61, 0x6e, 0x6f, 0x3b, 0x4f, 0x72, 0x77, 0x61, 0x6d,
-0x75, 0x6b, 0x61, 0x61, 0x67, 0x61, 0x3b, 0x53, 0x3b, 0x4b, 0x3b, 0x52, 0x3b, 0x53, 0x3b, 0x4e, 0x3b, 0x54, 0x3b, 0x4d,
-0x3b, 0x4d, 0x75, 0x6c, 0x3b, 0x56, 0x69, 0x6c, 0x3b, 0x48, 0x69, 0x76, 0x3b, 0x48, 0x69, 0x64, 0x3b, 0x48, 0x69, 0x74,
-0x3b, 0x48, 0x69, 0x68, 0x3b, 0x4c, 0x65, 0x6d, 0x3b, 0x70, 0x61, 0x20, 0x6d, 0x75, 0x6c, 0x75, 0x6e, 0x67, 0x75, 0x3b,
-0x70, 0x61, 0x20, 0x73, 0x68, 0x61, 0x68, 0x75, 0x76, 0x69, 0x6c, 0x75, 0x68, 0x61, 0x3b, 0x70, 0x61, 0x20, 0x68, 0x69,
-0x76, 0x69, 0x6c, 0x69, 0x3b, 0x70, 0x61, 0x20, 0x68, 0x69, 0x64, 0x61, 0x74, 0x75, 0x3b, 0x70, 0x61, 0x20, 0x68, 0x69,
-0x74, 0x61, 0x79, 0x69, 0x3b, 0x70, 0x61, 0x20, 0x68, 0x69, 0x68, 0x61, 0x6e, 0x75, 0x3b, 0x70, 0x61, 0x20, 0x73, 0x68,
-0x61, 0x68, 0x75, 0x6c, 0x65, 0x6d, 0x62, 0x65, 0x6c, 0x61, 0x3b, 0x4d, 0x3b, 0x4a, 0x3b, 0x48, 0x3b, 0x48, 0x3b, 0x48,
-0x3b, 0x57, 0x3b, 0x4a, 0x3b, 0x4a, 0x70, 0x69, 0x3b, 0x4a, 0x74, 0x74, 0x3b, 0x4a, 0x6e, 0x6e, 0x3b, 0x4a, 0x74, 0x6e,
-0x3b, 0x41, 0x6c, 0x68, 0x3b, 0x49, 0x6a, 0x75, 0x3b, 0x4a, 0x6d, 0x6f, 0x3b, 0x4a, 0x75, 0x6d, 0x61, 0x70, 0x69, 0x6c,
-0x79, 0x69, 0x3b, 0x4a, 0x75, 0x6d, 0x61, 0x74, 0x61, 0x74, 0x75, 0x75, 0x3b, 0x4a, 0x75, 0x6d, 0x61, 0x6e, 0x6e, 0x65,
-0x3b, 0x4a, 0x75, 0x6d, 0x61, 0x74, 0x61, 0x6e, 0x75, 0x3b, 0x41, 0x6c, 0x68, 0x61, 0x6d, 0x69, 0x73, 0x69, 0x3b, 0x49,
-0x6a, 0x75, 0x6d, 0x61, 0x61, 0x3b, 0x4a, 0x75, 0x6d, 0x61, 0x6d, 0x6f, 0x73, 0x69, 0x3b, 0x4a, 0x3b, 0x4a, 0x3b, 0x4a,
-0x3b, 0x4a, 0x3b, 0x41, 0x3b, 0x49, 0x3b, 0x4a, 0x3b, 0x6b, 0x61, 0x72, 0x3b, 0x6e, 0x74, 0x25b, 0x3b, 0x74, 0x61, 0x72,
-0x3b, 0x61, 0x72, 0x61, 0x3b, 0x61, 0x6c, 0x61, 0x3b, 0x6a, 0x75, 0x6d, 0x3b, 0x73, 0x69, 0x62, 0x3b, 0x6b, 0x61, 0x72,
-0x69, 0x3b, 0x6e, 0x74, 0x25b, 0x6e, 0x25b, 0x3b, 0x74, 0x61, 0x72, 0x61, 0x74, 0x61, 0x3b, 0x61, 0x72, 0x61, 0x62, 0x61,
-0x3b, 0x61, 0x6c, 0x61, 0x6d, 0x69, 0x73, 0x61, 0x3b, 0x6a, 0x75, 0x6d, 0x61, 0x3b, 0x73, 0x69, 0x62, 0x69, 0x72, 0x69,
-0x3b, 0x4b, 0x3b, 0x4e, 0x3b, 0x54, 0x3b, 0x41, 0x3b, 0x41, 0x3b, 0x4a, 0x3b, 0x53, 0x3b, 0x4b, 0x6d, 0x61, 0x3b, 0x54,
-0x61, 0x74, 0x3b, 0x49, 0x6e, 0x65, 0x3b, 0x54, 0x61, 0x6e, 0x3b, 0x41, 0x72, 0x6d, 0x3b, 0x4d, 0x61, 0x61, 0x3b, 0x4e,
-0x4d, 0x4d, 0x3b, 0x4b, 0x69, 0x75, 0x6d, 0x69, 0x61, 0x3b, 0x4e, 0x6a, 0x75, 0x6d, 0x61, 0x74, 0x61, 0x74, 0x75, 0x3b,
-0x4e, 0x6a, 0x75, 0x6d, 0x61, 0x69, 0x6e, 0x65, 0x3b, 0x4e, 0x6a, 0x75, 0x6d, 0x61, 0x74, 0x61, 0x6e, 0x6f, 0x3b, 0x41,
-0x72, 0x61, 0x6d, 0x69, 0x74, 0x68, 0x69, 0x3b, 0x4e, 0x6a, 0x75, 0x6d, 0x61, 0x61, 0x3b, 0x4e, 0x4a, 0x75, 0x6d, 0x61,
-0x6d, 0x6f, 0x74, 0x68, 0x69, 0x69, 0x3b, 0x4b, 0x3b, 0x4e, 0x3b, 0x4e, 0x3b, 0x4e, 0x3b, 0x41, 0x3b, 0x4d, 0x3b, 0x4e,
-0x3b, 0x13c6, 0x13cd, 0x13ac, 0x3b, 0x13c9, 0x13c5, 0x13af, 0x3b, 0x13d4, 0x13b5, 0x13c1, 0x3b, 0x13e6, 0x13a2, 0x13c1, 0x3b, 0x13c5, 0x13a9, 0x13c1,
-0x3b, 0x13e7, 0x13be, 0x13a9, 0x3b, 0x13c8, 0x13d5, 0x13be, 0x3b, 0x13a4, 0x13be, 0x13d9, 0x13d3, 0x13c6, 0x13cd, 0x13ac, 0x3b, 0x13a4, 0x13be, 0x13d9,
-0x13d3, 0x13c9, 0x13c5, 0x13af, 0x3b, 0x13d4, 0x13b5, 0x13c1, 0x13a2, 0x13a6, 0x3b, 0x13e6, 0x13a2, 0x13c1, 0x13a2, 0x13a6, 0x3b, 0x13c5, 0x13a9, 0x13c1,
-0x13a2, 0x13a6, 0x3b, 0x13e7, 0x13be, 0x13a9, 0x13b6, 0x13cd, 0x13d7, 0x3b, 0x13a4, 0x13be, 0x13d9, 0x13d3, 0x13c8, 0x13d5, 0x13be, 0x3b, 0x13c6, 0x3b,
-0x13c9, 0x3b, 0x13d4, 0x3b, 0x13e6, 0x3b, 0x13c5, 0x3b, 0x13e7, 0x3b, 0x13a4, 0x3b, 0x64, 0x69, 0x6d, 0x3b, 0x6c, 0x69, 0x6e, 0x3b,
-0x6d, 0x61, 0x72, 0x3b, 0x6d, 0x65, 0x72, 0x3b, 0x7a, 0x65, 0x3b, 0x76, 0x61, 0x6e, 0x3b, 0x73, 0x61, 0x6d, 0x3b, 0x64,
-0x69, 0x6d, 0x61, 0x6e, 0x73, 0x3b, 0x6c, 0x69, 0x6e, 0x64, 0x69, 0x3b, 0x6d, 0x61, 0x72, 0x64, 0x69, 0x3b, 0x6d, 0x65,
-0x72, 0x6b, 0x72, 0x65, 0x64, 0x69, 0x3b, 0x7a, 0x65, 0x64, 0x69, 0x3b, 0x76, 0x61, 0x6e, 0x64, 0x72, 0x65, 0x64, 0x69,
-0x3b, 0x73, 0x61, 0x6d, 0x64, 0x69, 0x3b, 0x64, 0x3b, 0x6c, 0x3b, 0x6d, 0x3b, 0x6d, 0x3b, 0x7a, 0x3b, 0x76, 0x3b, 0x73,
-0x3b, 0x4c, 0x6c, 0x32, 0x3b, 0x4c, 0x6c, 0x33, 0x3b, 0x4c, 0x6c, 0x34, 0x3b, 0x4c, 0x6c, 0x35, 0x3b, 0x4c, 0x6c, 0x36,
-0x3b, 0x4c, 0x6c, 0x37, 0x3b, 0x4c, 0x6c, 0x31, 0x3b, 0x4c, 0x69, 0x64, 0x75, 0x76, 0x61, 0x20, 0x6c, 0x79, 0x61, 0x70,
-0x69, 0x6c, 0x69, 0x3b, 0x4c, 0x69, 0x64, 0x75, 0x76, 0x61, 0x20, 0x6c, 0x79, 0x61, 0x74, 0x61, 0x74, 0x75, 0x3b, 0x4c,
-0x69, 0x64, 0x75, 0x76, 0x61, 0x20, 0x6c, 0x79, 0x61, 0x6e, 0x63, 0x68, 0x65, 0x63, 0x68, 0x69, 0x3b, 0x4c, 0x69, 0x64,
-0x75, 0x76, 0x61, 0x20, 0x6c, 0x79, 0x61, 0x6e, 0x6e, 0x79, 0x61, 0x6e, 0x6f, 0x3b, 0x4c, 0x69, 0x64, 0x75, 0x76, 0x61,
-0x20, 0x6c, 0x79, 0x61, 0x6e, 0x6e, 0x79, 0x61, 0x6e, 0x6f, 0x20, 0x6e, 0x61, 0x20, 0x6c, 0x69, 0x6e, 0x6a, 0x69, 0x3b,
-0x4c, 0x69, 0x64, 0x75, 0x76, 0x61, 0x20, 0x6c, 0x79, 0x61, 0x6e, 0x6e, 0x79, 0x61, 0x6e, 0x6f, 0x20, 0x6e, 0x61, 0x20,
-0x6d, 0x61, 0x76, 0x69, 0x6c, 0x69, 0x3b, 0x4c, 0x69, 0x64, 0x75, 0x76, 0x61, 0x20, 0x6c, 0x69, 0x74, 0x61, 0x6e, 0x64,
-0x69, 0x3b, 0x50, 0xed, 0x69, 0x6c, 0x69, 0x3b, 0x54, 0xe1, 0x61, 0x74, 0x75, 0x3b, 0xcd, 0x6e, 0x65, 0x3b, 0x54, 0xe1,
-0x61, 0x6e, 0x6f, 0x3b, 0x41, 0x6c, 0x68, 0x3b, 0x49, 0x6a, 0x6d, 0x3b, 0x4d, 0xf3, 0x6f, 0x73, 0x69, 0x3b, 0x4a, 0x75,
-0x6d, 0x61, 0x70, 0xed, 0x69, 0x72, 0x69, 0x3b, 0x4a, 0x75, 0x6d, 0x61, 0x74, 0xe1, 0x74, 0x75, 0x3b, 0x4a, 0x75, 0x6d,
-0x61, 0xed, 0x6e, 0x65, 0x3b, 0x4a, 0x75, 0x6d, 0x61, 0x74, 0xe1, 0x61, 0x6e, 0x6f, 0x3b, 0x41, 0x6c, 0x61, 0x6d, 0xed,
-0x69, 0x73, 0x69, 0x3b, 0x49, 0x6a, 0x75, 0x6d, 0xe1, 0x61, 0x3b, 0x4a, 0x75, 0x6d, 0x61, 0x6d, 0xf3, 0x6f, 0x73, 0x69,
-0x3b, 0x50, 0x3b, 0x54, 0x3b, 0x45, 0x3b, 0x4f, 0x3b, 0x41, 0x3b, 0x49, 0x3b, 0x4d, 0x3b, 0x53, 0x61, 0x62, 0x3b, 0x42,
-0x61, 0x6c, 0x3b, 0x4c, 0x77, 0x32, 0x3b, 0x4c, 0x77, 0x33, 0x3b, 0x4c, 0x77, 0x34, 0x3b, 0x4c, 0x77, 0x35, 0x3b, 0x4c,
-0x77, 0x36, 0x3b, 0x53, 0x61, 0x62, 0x62, 0x69, 0x69, 0x74, 0x69, 0x3b, 0x42, 0x61, 0x6c, 0x61, 0x7a, 0x61, 0x3b, 0x4c,
-0x77, 0x61, 0x6b, 0x75, 0x62, 0x69, 0x72, 0x69, 0x3b, 0x4c, 0x77, 0x61, 0x6b, 0x75, 0x73, 0x61, 0x74, 0x75, 0x3b, 0x4c,
-0x77, 0x61, 0x6b, 0x75, 0x6e, 0x61, 0x3b, 0x4c, 0x77, 0x61, 0x6b, 0x75, 0x74, 0x61, 0x61, 0x6e, 0x6f, 0x3b, 0x4c, 0x77,
-0x61, 0x6d, 0x75, 0x6b, 0x61, 0x61, 0x67, 0x61, 0x3b, 0x53, 0x3b, 0x42, 0x3b, 0x4c, 0x3b, 0x4c, 0x3b, 0x4c, 0x3b, 0x4c,
-0x3b, 0x4c, 0x3b, 0x50, 0x61, 0x20, 0x4d, 0x75, 0x6c, 0x75, 0x6e, 0x67, 0x75, 0x3b, 0x50, 0x61, 0x6c, 0x69, 0x63, 0x68,
-0x69, 0x6d, 0x6f, 0x3b, 0x50, 0x61, 0x6c, 0x69, 0x63, 0x68, 0x69, 0x62, 0x75, 0x6c, 0x69, 0x3b, 0x50, 0x61, 0x6c, 0x69,
-0x63, 0x68, 0x69, 0x74, 0x61, 0x74, 0x75, 0x3b, 0x50, 0x61, 0x6c, 0x69, 0x63, 0x68, 0x69, 0x6e, 0x65, 0x3b, 0x50, 0x61,
-0x6c, 0x69, 0x63, 0x68, 0x69, 0x73, 0x61, 0x6e, 0x6f, 0x3b, 0x50, 0x61, 0x63, 0x68, 0x69, 0x62, 0x65, 0x6c, 0x75, 0x73,
-0x68, 0x69, 0x3b, 0x64, 0x75, 0x6d, 0x3b, 0x73, 0x69, 0x67, 0x3b, 0x74, 0x65, 0x72, 0x3b, 0x6b, 0x75, 0x61, 0x3b, 0x6b,
-0x69, 0x6e, 0x3b, 0x73, 0x65, 0x73, 0x3b, 0x73, 0x61, 0x62, 0x3b, 0x64, 0x75, 0x6d, 0x69, 0x6e, 0x67, 0x75, 0x3b, 0x73,
+0x20, 0x65, 0x65, 0x20, 0x6b, 0x77, 0x65, 0x41, 0x72, 0x65, 0x3b, 0x4b, 0x75, 0x6e, 0x3b, 0x4f, 0x6e, 0x67, 0x3b, 0x49,
+0x6e, 0x65, 0x3b, 0x49, 0x6c, 0x65, 0x3b, 0x53, 0x61, 0x70, 0x3b, 0x4b, 0x77, 0x65, 0x41, 0x3b, 0x4b, 0x3b, 0x4f, 0x3b,
+0x49, 0x3b, 0x49, 0x3b, 0x53, 0x3b, 0x4b, 0x44, 0x69, 0x6d, 0x69, 0x6e, 0x67, 0x75, 0x3b, 0x43, 0x68, 0x69, 0x70, 0x6f,
+0x73, 0x69, 0x3b, 0x43, 0x68, 0x69, 0x70, 0x69, 0x72, 0x69, 0x3b, 0x43, 0x68, 0x69, 0x74, 0x61, 0x74, 0x75, 0x3b, 0x43,
+0x68, 0x69, 0x6e, 0x61, 0x69, 0x3b, 0x43, 0x68, 0x69, 0x73, 0x68, 0x61, 0x6e, 0x75, 0x3b, 0x53, 0x61, 0x62, 0x75, 0x64,
+0x75, 0x44, 0x69, 0x6d, 0x3b, 0x50, 0x6f, 0x73, 0x3b, 0x50, 0x69, 0x72, 0x3b, 0x54, 0x61, 0x74, 0x3b, 0x4e, 0x61, 0x69,
+0x3b, 0x53, 0x68, 0x61, 0x3b, 0x53, 0x61, 0x62, 0x44, 0x3b, 0x50, 0x3b, 0x43, 0x3b, 0x54, 0x3b, 0x4e, 0x3b, 0x53, 0x3b,
+0x53, 0x53, 0x6f, 0x6e, 0x74, 0x6f, 0x3b, 0x4d, 0x76, 0x75, 0x6c, 0x6f, 0x3b, 0x53, 0x69, 0x62, 0x69, 0x6c, 0x69, 0x3b,
+0x53, 0x69, 0x74, 0x68, 0x61, 0x74, 0x68, 0x75, 0x3b, 0x53, 0x69, 0x6e, 0x65, 0x3b, 0x53, 0x69, 0x68, 0x6c, 0x61, 0x6e,
+0x75, 0x3b, 0x4d, 0x67, 0x71, 0x69, 0x62, 0x65, 0x6c, 0x6f, 0x53, 0x6f, 0x6e, 0x3b, 0x4d, 0x76, 0x75, 0x3b, 0x53, 0x69,
+0x62, 0x3b, 0x53, 0x69, 0x74, 0x3b, 0x53, 0x69, 0x6e, 0x3b, 0x53, 0x69, 0x68, 0x3b, 0x4d, 0x67, 0x71, 0x53, 0x3b, 0x4d,
+0x3b, 0x53, 0x3b, 0x53, 0x3b, 0x53, 0x3b, 0x53, 0x3b, 0x4d, 0x49, 0x6a, 0x75, 0x6d, 0x61, 0x70, 0x69, 0x6c, 0x69, 0x3b,
+0x49, 0x6a, 0x75, 0x6d, 0x61, 0x74, 0x61, 0x74, 0x75, 0x3b, 0x49, 0x6a, 0x75, 0x6d, 0x61, 0x6e, 0x6e, 0x65, 0x3b, 0x49,
+0x6a, 0x75, 0x6d, 0x61, 0x74, 0x61, 0x6e, 0x6f, 0x3b, 0x41, 0x6c, 0x68, 0x61, 0x6d, 0x69, 0x73, 0x69, 0x3b, 0x49, 0x6a,
+0x75, 0x6d, 0x61, 0x61, 0x3b, 0x49, 0x6a, 0x75, 0x6d, 0x61, 0x6d, 0x6f, 0x73, 0x69, 0x49, 0x6a, 0x70, 0x3b, 0x49, 0x6a,
+0x74, 0x3b, 0x49, 0x6a, 0x6e, 0x3b, 0x49, 0x6a, 0x74, 0x6e, 0x3b, 0x41, 0x6c, 0x68, 0x3b, 0x49, 0x6a, 0x75, 0x3b, 0x49,
+0x6a, 0x6d, 0x32, 0x3b, 0x33, 0x3b, 0x34, 0x3b, 0x35, 0x3b, 0x36, 0x3b, 0x37, 0x3b, 0x31, 0x2d30, 0x2d59, 0x2d30, 0x2d4e, 0x2d30,
+0x2d59, 0x3b, 0x2d30, 0x2d62, 0x2d4f, 0x2d30, 0x2d59, 0x3b, 0x2d30, 0x2d59, 0x2d49, 0x2d4f, 0x2d30, 0x2d59, 0x3b, 0x2d30, 0x2d3d, 0x2d55, 0x2d30, 0x2d59,
+0x3b, 0x2d30, 0x2d3d, 0x2d61, 0x2d30, 0x2d59, 0x3b, 0x2d59, 0x2d49, 0x2d4e, 0x2d61, 0x2d30, 0x2d59, 0x3b, 0x2d30, 0x2d59, 0x2d49, 0x2d39, 0x2d62, 0x2d30,
+0x2d59, 0x2d30, 0x2d59, 0x2d30, 0x3b, 0x2d30, 0x2d62, 0x2d4f, 0x3b, 0x2d30, 0x2d59, 0x2d49, 0x3b, 0x2d30, 0x2d3d, 0x2d55, 0x3b, 0x2d30, 0x2d3d, 0x2d61,
+0x3b, 0x2d30, 0x2d59, 0x2d49, 0x2d4e, 0x3b, 0x2d30, 0x2d59, 0x2d49, 0x2d39, 0x61, 0x73, 0x61, 0x6d, 0x61, 0x73, 0x3b, 0x61, 0x79, 0x6e,
+0x61, 0x73, 0x3b, 0x61, 0x73, 0x69, 0x6e, 0x61, 0x73, 0x3b, 0x61, 0x6b, 0x1e5b, 0x61, 0x73, 0x3b, 0x61, 0x6b, 0x77, 0x61,
+0x73, 0x3b, 0x61, 0x73, 0x69, 0x6d, 0x77, 0x61, 0x73, 0x3b, 0x61, 0x73, 0x69, 0x1e0d, 0x79, 0x61, 0x73, 0x61, 0x73, 0x61,
+0x3b, 0x61, 0x79, 0x6e, 0x3b, 0x61, 0x73, 0x69, 0x3b, 0x61, 0x6b, 0x1e5b, 0x3b, 0x61, 0x6b, 0x77, 0x3b, 0x61, 0x73, 0x69,
+0x6d, 0x3b, 0x61, 0x73, 0x69, 0x1e0d, 0x41, 0x63, 0x65, 0x72, 0x3b, 0x41, 0x72, 0x69, 0x6d, 0x3b, 0x41, 0x72, 0x61, 0x6d,
+0x3b, 0x41, 0x68, 0x61, 0x64, 0x3b, 0x41, 0x6d, 0x68, 0x61, 0x64, 0x3b, 0x53, 0x65, 0x6d, 0x3b, 0x53, 0x65, 0x64, 0x59,
+0x61, 0x6e, 0x61, 0x73, 0x73, 0x3b, 0x53, 0x61, 0x6e, 0x61, 0x73, 0x73, 0x3b, 0x4b, 0x72, 0x61, 0x1e0d, 0x61, 0x73, 0x73,
+0x3b, 0x4b, 0x75, 0x1e93, 0x61, 0x73, 0x73, 0x3b, 0x53, 0x61, 0x6d, 0x61, 0x73, 0x73, 0x3b, 0x53, 0x1e0d, 0x69, 0x73, 0x61,
+0x73, 0x73, 0x3b, 0x53, 0x61, 0x79, 0x61, 0x73, 0x73, 0x41, 0x63, 0x65, 0x3b, 0x41, 0x72, 0x69, 0x3b, 0x41, 0x72, 0x61,
+0x3b, 0x41, 0x68, 0x61, 0x3b, 0x41, 0x6d, 0x68, 0x3b, 0x53, 0x65, 0x6d, 0x3b, 0x53, 0x65, 0x64, 0x59, 0x61, 0x6e, 0x3b,
+0x53, 0x61, 0x6e, 0x3b, 0x4b, 0x72, 0x61, 0x1e0d, 0x3b, 0x4b, 0x75, 0x1e93, 0x3b, 0x53, 0x61, 0x6d, 0x3b, 0x53, 0x1e0d, 0x69,
+0x73, 0x3b, 0x53, 0x61, 0x79, 0x59, 0x3b, 0x53, 0x3b, 0x4b, 0x3b, 0x4b, 0x3b, 0x53, 0x3b, 0x53, 0x3b, 0x53, 0x43, 0x3b,
+0x52, 0x3b, 0x41, 0x3b, 0x48, 0x3b, 0x4d, 0x3b, 0x53, 0x3b, 0x44, 0x53, 0x61, 0x6e, 0x64, 0x65, 0x3b, 0x4f, 0x72, 0x77,
+0x6f, 0x6b, 0x75, 0x62, 0x61, 0x6e, 0x7a, 0x61, 0x3b, 0x4f, 0x72, 0x77, 0x61, 0x6b, 0x61, 0x62, 0x69, 0x72, 0x69, 0x3b,
+0x4f, 0x72, 0x77, 0x61, 0x6b, 0x61, 0x73, 0x68, 0x61, 0x74, 0x75, 0x3b, 0x4f, 0x72, 0x77, 0x61, 0x6b, 0x61, 0x6e, 0x61,
+0x3b, 0x4f, 0x72, 0x77, 0x61, 0x6b, 0x61, 0x74, 0x61, 0x61, 0x6e, 0x6f, 0x3b, 0x4f, 0x72, 0x77, 0x61, 0x6d, 0x75, 0x6b,
+0x61, 0x61, 0x67, 0x61, 0x53, 0x41, 0x4e, 0x3b, 0x4f, 0x52, 0x4b, 0x3b, 0x4f, 0x4b, 0x42, 0x3b, 0x4f, 0x4b, 0x53, 0x3b,
+0x4f, 0x4b, 0x4e, 0x3b, 0x4f, 0x4b, 0x54, 0x3b, 0x4f, 0x4d, 0x4b, 0x53, 0x3b, 0x4b, 0x3b, 0x52, 0x3b, 0x53, 0x3b, 0x4e,
+0x3b, 0x54, 0x3b, 0x4d, 0x70, 0x61, 0x20, 0x6d, 0x75, 0x6c, 0x75, 0x6e, 0x67, 0x75, 0x3b, 0x70, 0x61, 0x20, 0x73, 0x68,
+0x61, 0x68, 0x75, 0x76, 0x69, 0x6c, 0x75, 0x68, 0x61, 0x3b, 0x70, 0x61, 0x20, 0x68, 0x69, 0x76, 0x69, 0x6c, 0x69, 0x3b,
+0x70, 0x61, 0x20, 0x68, 0x69, 0x64, 0x61, 0x74, 0x75, 0x3b, 0x70, 0x61, 0x20, 0x68, 0x69, 0x74, 0x61, 0x79, 0x69, 0x3b,
+0x70, 0x61, 0x20, 0x68, 0x69, 0x68, 0x61, 0x6e, 0x75, 0x3b, 0x70, 0x61, 0x20, 0x73, 0x68, 0x61, 0x68, 0x75, 0x6c, 0x65,
+0x6d, 0x62, 0x65, 0x6c, 0x61, 0x4d, 0x75, 0x6c, 0x3b, 0x56, 0x69, 0x6c, 0x3b, 0x48, 0x69, 0x76, 0x3b, 0x48, 0x69, 0x64,
+0x3b, 0x48, 0x69, 0x74, 0x3b, 0x48, 0x69, 0x68, 0x3b, 0x4c, 0x65, 0x6d, 0x4d, 0x3b, 0x4a, 0x3b, 0x48, 0x3b, 0x48, 0x3b,
+0x48, 0x3b, 0x57, 0x3b, 0x4a, 0x4a, 0x75, 0x6d, 0x61, 0x70, 0x69, 0x6c, 0x79, 0x69, 0x3b, 0x4a, 0x75, 0x6d, 0x61, 0x74,
+0x61, 0x74, 0x75, 0x75, 0x3b, 0x4a, 0x75, 0x6d, 0x61, 0x6e, 0x6e, 0x65, 0x3b, 0x4a, 0x75, 0x6d, 0x61, 0x74, 0x61, 0x6e,
+0x75, 0x3b, 0x41, 0x6c, 0x68, 0x61, 0x6d, 0x69, 0x73, 0x69, 0x3b, 0x49, 0x6a, 0x75, 0x6d, 0x61, 0x61, 0x3b, 0x4a, 0x75,
+0x6d, 0x61, 0x6d, 0x6f, 0x73, 0x69, 0x4a, 0x70, 0x69, 0x3b, 0x4a, 0x74, 0x74, 0x3b, 0x4a, 0x6e, 0x6e, 0x3b, 0x4a, 0x74,
+0x6e, 0x3b, 0x41, 0x6c, 0x68, 0x3b, 0x49, 0x6a, 0x75, 0x3b, 0x4a, 0x6d, 0x6f, 0x4a, 0x3b, 0x4a, 0x3b, 0x4a, 0x3b, 0x4a,
+0x3b, 0x41, 0x3b, 0x49, 0x3b, 0x4a, 0x6b, 0x61, 0x72, 0x69, 0x3b, 0x6e, 0x74, 0x25b, 0x6e, 0x25b, 0x3b, 0x74, 0x61, 0x72,
+0x61, 0x74, 0x61, 0x3b, 0x61, 0x72, 0x61, 0x62, 0x61, 0x3b, 0x61, 0x6c, 0x61, 0x6d, 0x69, 0x73, 0x61, 0x3b, 0x6a, 0x75,
+0x6d, 0x61, 0x3b, 0x73, 0x69, 0x62, 0x69, 0x72, 0x69, 0x6b, 0x61, 0x72, 0x3b, 0x6e, 0x74, 0x25b, 0x3b, 0x74, 0x61, 0x72,
+0x3b, 0x61, 0x72, 0x61, 0x3b, 0x61, 0x6c, 0x61, 0x3b, 0x6a, 0x75, 0x6d, 0x3b, 0x73, 0x69, 0x62, 0x4b, 0x3b, 0x4e, 0x3b,
+0x54, 0x3b, 0x41, 0x3b, 0x41, 0x3b, 0x4a, 0x3b, 0x53, 0x4b, 0x69, 0x75, 0x6d, 0x69, 0x61, 0x3b, 0x4e, 0x6a, 0x75, 0x6d,
+0x61, 0x74, 0x61, 0x74, 0x75, 0x3b, 0x4e, 0x6a, 0x75, 0x6d, 0x61, 0x69, 0x6e, 0x65, 0x3b, 0x4e, 0x6a, 0x75, 0x6d, 0x61,
+0x74, 0x61, 0x6e, 0x6f, 0x3b, 0x41, 0x72, 0x61, 0x6d, 0x69, 0x74, 0x68, 0x69, 0x3b, 0x4e, 0x6a, 0x75, 0x6d, 0x61, 0x61,
+0x3b, 0x4e, 0x4a, 0x75, 0x6d, 0x61, 0x6d, 0x6f, 0x74, 0x68, 0x69, 0x69, 0x4b, 0x6d, 0x61, 0x3b, 0x54, 0x61, 0x74, 0x3b,
+0x49, 0x6e, 0x65, 0x3b, 0x54, 0x61, 0x6e, 0x3b, 0x41, 0x72, 0x6d, 0x3b, 0x4d, 0x61, 0x61, 0x3b, 0x4e, 0x4d, 0x4d, 0x4b,
+0x3b, 0x4e, 0x3b, 0x4e, 0x3b, 0x4e, 0x3b, 0x41, 0x3b, 0x4d, 0x3b, 0x4e, 0x13a4, 0x13be, 0x13d9, 0x13d3, 0x13c6, 0x13cd, 0x13ac, 0x3b,
+0x13a4, 0x13be, 0x13d9, 0x13d3, 0x13c9, 0x13c5, 0x13af, 0x3b, 0x13d4, 0x13b5, 0x13c1, 0x13a2, 0x13a6, 0x3b, 0x13e6, 0x13a2, 0x13c1, 0x13a2, 0x13a6, 0x3b,
+0x13c5, 0x13a9, 0x13c1, 0x13a2, 0x13a6, 0x3b, 0x13e7, 0x13be, 0x13a9, 0x13b6, 0x13cd, 0x13d7, 0x3b, 0x13a4, 0x13be, 0x13d9, 0x13d3, 0x13c8, 0x13d5, 0x13be,
+0x13c6, 0x13cd, 0x13ac, 0x3b, 0x13c9, 0x13c5, 0x13af, 0x3b, 0x13d4, 0x13b5, 0x13c1, 0x3b, 0x13e6, 0x13a2, 0x13c1, 0x3b, 0x13c5, 0x13a9, 0x13c1, 0x3b,
+0x13e7, 0x13be, 0x13a9, 0x3b, 0x13c8, 0x13d5, 0x13be, 0x13c6, 0x3b, 0x13c9, 0x3b, 0x13d4, 0x3b, 0x13e6, 0x3b, 0x13c5, 0x3b, 0x13e7, 0x3b, 0x13a4,
+0x64, 0x69, 0x6d, 0x61, 0x6e, 0x73, 0x3b, 0x6c, 0x69, 0x6e, 0x64, 0x69, 0x3b, 0x6d, 0x61, 0x72, 0x64, 0x69, 0x3b, 0x6d,
+0x65, 0x72, 0x6b, 0x72, 0x65, 0x64, 0x69, 0x3b, 0x7a, 0x65, 0x64, 0x69, 0x3b, 0x76, 0x61, 0x6e, 0x64, 0x72, 0x65, 0x64,
+0x69, 0x3b, 0x73, 0x61, 0x6d, 0x64, 0x69, 0x64, 0x69, 0x6d, 0x3b, 0x6c, 0x69, 0x6e, 0x3b, 0x6d, 0x61, 0x72, 0x3b, 0x6d,
+0x65, 0x72, 0x3b, 0x7a, 0x65, 0x3b, 0x76, 0x61, 0x6e, 0x3b, 0x73, 0x61, 0x6d, 0x64, 0x3b, 0x6c, 0x3b, 0x6d, 0x3b, 0x6d,
+0x3b, 0x7a, 0x3b, 0x76, 0x3b, 0x73, 0x4c, 0x69, 0x64, 0x75, 0x76, 0x61, 0x20, 0x6c, 0x79, 0x61, 0x70, 0x69, 0x6c, 0x69,
+0x3b, 0x4c, 0x69, 0x64, 0x75, 0x76, 0x61, 0x20, 0x6c, 0x79, 0x61, 0x74, 0x61, 0x74, 0x75, 0x3b, 0x4c, 0x69, 0x64, 0x75,
+0x76, 0x61, 0x20, 0x6c, 0x79, 0x61, 0x6e, 0x63, 0x68, 0x65, 0x63, 0x68, 0x69, 0x3b, 0x4c, 0x69, 0x64, 0x75, 0x76, 0x61,
+0x20, 0x6c, 0x79, 0x61, 0x6e, 0x6e, 0x79, 0x61, 0x6e, 0x6f, 0x3b, 0x4c, 0x69, 0x64, 0x75, 0x76, 0x61, 0x20, 0x6c, 0x79,
+0x61, 0x6e, 0x6e, 0x79, 0x61, 0x6e, 0x6f, 0x20, 0x6e, 0x61, 0x20, 0x6c, 0x69, 0x6e, 0x6a, 0x69, 0x3b, 0x4c, 0x69, 0x64,
+0x75, 0x76, 0x61, 0x20, 0x6c, 0x79, 0x61, 0x6e, 0x6e, 0x79, 0x61, 0x6e, 0x6f, 0x20, 0x6e, 0x61, 0x20, 0x6d, 0x61, 0x76,
+0x69, 0x6c, 0x69, 0x3b, 0x4c, 0x69, 0x64, 0x75, 0x76, 0x61, 0x20, 0x6c, 0x69, 0x74, 0x61, 0x6e, 0x64, 0x69, 0x4c, 0x6c,
+0x32, 0x3b, 0x4c, 0x6c, 0x33, 0x3b, 0x4c, 0x6c, 0x34, 0x3b, 0x4c, 0x6c, 0x35, 0x3b, 0x4c, 0x6c, 0x36, 0x3b, 0x4c, 0x6c,
+0x37, 0x3b, 0x4c, 0x6c, 0x31, 0x4a, 0x75, 0x6d, 0x61, 0x70, 0xed, 0x69, 0x72, 0x69, 0x3b, 0x4a, 0x75, 0x6d, 0x61, 0x74,
+0xe1, 0x74, 0x75, 0x3b, 0x4a, 0x75, 0x6d, 0x61, 0xed, 0x6e, 0x65, 0x3b, 0x4a, 0x75, 0x6d, 0x61, 0x74, 0xe1, 0x61, 0x6e,
+0x6f, 0x3b, 0x41, 0x6c, 0x61, 0x6d, 0xed, 0x69, 0x73, 0x69, 0x3b, 0x49, 0x6a, 0x75, 0x6d, 0xe1, 0x61, 0x3b, 0x4a, 0x75,
+0x6d, 0x61, 0x6d, 0xf3, 0x6f, 0x73, 0x69, 0x50, 0xed, 0x69, 0x6c, 0x69, 0x3b, 0x54, 0xe1, 0x61, 0x74, 0x75, 0x3b, 0xcd,
+0x6e, 0x65, 0x3b, 0x54, 0xe1, 0x61, 0x6e, 0x6f, 0x3b, 0x41, 0x6c, 0x68, 0x3b, 0x49, 0x6a, 0x6d, 0x3b, 0x4d, 0xf3, 0x6f,
+0x73, 0x69, 0x50, 0x3b, 0x54, 0x3b, 0x45, 0x3b, 0x4f, 0x3b, 0x41, 0x3b, 0x49, 0x3b, 0x4d, 0x53, 0x61, 0x62, 0x62, 0x69,
+0x69, 0x74, 0x69, 0x3b, 0x42, 0x61, 0x6c, 0x61, 0x7a, 0x61, 0x3b, 0x4c, 0x77, 0x61, 0x6b, 0x75, 0x62, 0x69, 0x72, 0x69,
+0x3b, 0x4c, 0x77, 0x61, 0x6b, 0x75, 0x73, 0x61, 0x74, 0x75, 0x3b, 0x4c, 0x77, 0x61, 0x6b, 0x75, 0x6e, 0x61, 0x3b, 0x4c,
+0x77, 0x61, 0x6b, 0x75, 0x74, 0x61, 0x61, 0x6e, 0x6f, 0x3b, 0x4c, 0x77, 0x61, 0x6d, 0x75, 0x6b, 0x61, 0x61, 0x67, 0x61,
+0x53, 0x61, 0x62, 0x3b, 0x42, 0x61, 0x6c, 0x3b, 0x4c, 0x77, 0x32, 0x3b, 0x4c, 0x77, 0x33, 0x3b, 0x4c, 0x77, 0x34, 0x3b,
+0x4c, 0x77, 0x35, 0x3b, 0x4c, 0x77, 0x36, 0x53, 0x3b, 0x42, 0x3b, 0x4c, 0x3b, 0x4c, 0x3b, 0x4c, 0x3b, 0x4c, 0x3b, 0x4c,
+0x50, 0x61, 0x20, 0x4d, 0x75, 0x6c, 0x75, 0x6e, 0x67, 0x75, 0x3b, 0x50, 0x61, 0x6c, 0x69, 0x63, 0x68, 0x69, 0x6d, 0x6f,
+0x3b, 0x50, 0x61, 0x6c, 0x69, 0x63, 0x68, 0x69, 0x62, 0x75, 0x6c, 0x69, 0x3b, 0x50, 0x61, 0x6c, 0x69, 0x63, 0x68, 0x69,
+0x74, 0x61, 0x74, 0x75, 0x3b, 0x50, 0x61, 0x6c, 0x69, 0x63, 0x68, 0x69, 0x6e, 0x65, 0x3b, 0x50, 0x61, 0x6c, 0x69, 0x63,
+0x68, 0x69, 0x73, 0x61, 0x6e, 0x6f, 0x3b, 0x50, 0x61, 0x63, 0x68, 0x69, 0x62, 0x65, 0x6c, 0x75, 0x73, 0x68, 0x69, 0x64,
+0x75, 0x6d, 0x69, 0x6e, 0x67, 0x75, 0x3b, 0x73, 0x69, 0x67, 0x75, 0x6e, 0x64, 0x61, 0x2d, 0x66, 0x65, 0x72, 0x61, 0x3b,
+0x74, 0x65, 0x72, 0x73, 0x61, 0x2d, 0x66, 0x65, 0x72, 0x61, 0x3b, 0x6b, 0x75, 0x61, 0x72, 0x74, 0x61, 0x2d, 0x66, 0x65,
+0x72, 0x61, 0x3b, 0x6b, 0x69, 0x6e, 0x74, 0x61, 0x2d, 0x66, 0x65, 0x72, 0x61, 0x3b, 0x73, 0x65, 0x73, 0x74, 0x61, 0x2d,
+0x66, 0x65, 0x72, 0x61, 0x3b, 0x73, 0xe1, 0x62, 0x61, 0x64, 0x75, 0x64, 0x75, 0x6d, 0x69, 0x6e, 0x67, 0x75, 0x3b, 0x73,
 0x69, 0x67, 0x75, 0x6e, 0x64, 0x61, 0x2d, 0x66, 0x65, 0x72, 0x61, 0x3b, 0x74, 0x65, 0x72, 0x73, 0x61, 0x2d, 0x66, 0x65,
 0x72, 0x61, 0x3b, 0x6b, 0x75, 0x61, 0x72, 0x74, 0x61, 0x2d, 0x66, 0x65, 0x72, 0x61, 0x3b, 0x6b, 0x69, 0x6e, 0x74, 0x61,
-0x2d, 0x66, 0x65, 0x72, 0x61, 0x3b, 0x73, 0x65, 0x73, 0x74, 0x61, 0x2d, 0x66, 0x65, 0x72, 0x61, 0x3b, 0x73, 0xe1, 0x62,
-0x61, 0x64, 0x75, 0x3b, 0x44, 0x3b, 0x53, 0x3b, 0x54, 0x3b, 0x4b, 0x3b, 0x4b, 0x3b, 0x53, 0x3b, 0x53, 0x3b, 0x64, 0x75,
-0x6d, 0x69, 0x6e, 0x67, 0x75, 0x3b, 0x73, 0x69, 0x67, 0x75, 0x6e, 0x64, 0x61, 0x2d, 0x66, 0x65, 0x72, 0x61, 0x3b, 0x74,
-0x65, 0x72, 0x73, 0x61, 0x2d, 0x66, 0x65, 0x72, 0x61, 0x3b, 0x6b, 0x75, 0x61, 0x72, 0x74, 0x61, 0x2d, 0x66, 0x65, 0x72,
-0x61, 0x3b, 0x6b, 0x69, 0x6e, 0x74, 0x61, 0x2d, 0x66, 0x65, 0x72, 0x61, 0x3b, 0x73, 0x65, 0x73, 0x74, 0x61, 0x2d, 0x66,
-0x65, 0x72, 0x61, 0x3b, 0x73, 0x61, 0x62, 0x61, 0x64, 0x75, 0x3b, 0x4b, 0x49, 0x55, 0x3b, 0x4d, 0x52, 0x41, 0x3b, 0x57,
-0x41, 0x49, 0x3b, 0x57, 0x45, 0x54, 0x3b, 0x57, 0x45, 0x4e, 0x3b, 0x57, 0x54, 0x4e, 0x3b, 0x4a, 0x55, 0x4d, 0x3b, 0x4b,
-0x69, 0x75, 0x6d, 0x69, 0x61, 0x3b, 0x4d, 0x75, 0x72, 0x61, 0x6d, 0x75, 0x6b, 0x6f, 0x3b, 0x57, 0x61, 0x69, 0x72, 0x69,
-0x3b, 0x57, 0x65, 0x74, 0x68, 0x61, 0x74, 0x75, 0x3b, 0x57, 0x65, 0x6e, 0x61, 0x3b, 0x57, 0x65, 0x74, 0x61, 0x6e, 0x6f,
-0x3b, 0x4a, 0x75, 0x6d, 0x61, 0x6d, 0x6f, 0x73, 0x69, 0x3b, 0x4b, 0x3b, 0x4d, 0x3b, 0x57, 0x3b, 0x57, 0x3b, 0x57, 0x3b,
-0x57, 0x3b, 0x4a, 0x3b, 0x4b, 0x74, 0x73, 0x3b, 0x4b, 0x6f, 0x74, 0x3b, 0x4b, 0x6f, 0x6f, 0x3b, 0x4b, 0x6f, 0x73, 0x3b,
-0x4b, 0x6f, 0x61, 0x3b, 0x4b, 0x6f, 0x6d, 0x3b, 0x4b, 0x6f, 0x6c, 0x3b, 0x4b, 0x6f, 0x74, 0x69, 0x73, 0x61, 0x70, 0x3b,
-0x4b, 0x6f, 0x74, 0x61, 0x61, 0x69, 0x3b, 0x4b, 0x6f, 0x61, 0x65, 0x6e, 0x67, 0x2019, 0x3b, 0x4b, 0x6f, 0x73, 0x6f, 0x6d,
-0x6f, 0x6b, 0x3b, 0x4b, 0x6f, 0x61, 0x6e, 0x67, 0x2019, 0x77, 0x61, 0x6e, 0x3b, 0x4b, 0x6f, 0x6d, 0x75, 0x75, 0x74, 0x3b,
-0x4b, 0x6f, 0x6c, 0x6f, 0x3b, 0x54, 0x3b, 0x54, 0x3b, 0x4f, 0x3b, 0x53, 0x3b, 0x41, 0x3b, 0x4d, 0x3b, 0x4c, 0x3b, 0x53,
-0x6f, 0x6e, 0x3b, 0x4d, 0x61, 0x3b, 0x44, 0x65, 0x3b, 0x57, 0x75, 0x3b, 0x44, 0x6f, 0x3b, 0x46, 0x72, 0x3b, 0x53, 0x61,
-0x74, 0x3b, 0x53, 0x6f, 0x6e, 0x74, 0x61, 0x78, 0x74, 0x73, 0x65, 0x65, 0x73, 0x3b, 0x4d, 0x61, 0x6e, 0x74, 0x61, 0x78,
-0x74, 0x73, 0x65, 0x65, 0x73, 0x3b, 0x44, 0x65, 0x6e, 0x73, 0x74, 0x61, 0x78, 0x74, 0x73, 0x65, 0x65, 0x73, 0x3b, 0x57,
-0x75, 0x6e, 0x73, 0x74, 0x61, 0x78, 0x74, 0x73, 0x65, 0x65, 0x73, 0x3b, 0x44, 0x6f, 0x6e, 0x64, 0x65, 0x72, 0x74, 0x61,
-0x78, 0x74, 0x73, 0x65, 0x65, 0x73, 0x3b, 0x46, 0x72, 0x61, 0x69, 0x74, 0x61, 0x78, 0x74, 0x73, 0x65, 0x65, 0x73, 0x3b,
-0x53, 0x61, 0x74, 0x65, 0x72, 0x74, 0x61, 0x78, 0x74, 0x73, 0x65, 0x65, 0x73, 0x3b, 0x53, 0x3b, 0x4d, 0x3b, 0x45, 0x3b,
-0x57, 0x3b, 0x44, 0x3b, 0x46, 0x3b, 0x41, 0x3b, 0x53, 0x75, 0x2e, 0x3b, 0x4d, 0x6f, 0x2e, 0x3b, 0x44, 0x69, 0x2e, 0x3b,
-0x4d, 0x65, 0x2e, 0x3b, 0x44, 0x75, 0x2e, 0x3b, 0x46, 0x72, 0x2e, 0x3b, 0x53, 0x61, 0x2e, 0x3b, 0x53, 0x75, 0x6e, 0x6e,
-0x64, 0x61, 0x61, 0x63, 0x68, 0x3b, 0x4d, 0x6f, 0x68, 0x6e, 0x64, 0x61, 0x61, 0x63, 0x68, 0x3b, 0x44, 0x69, 0x6e, 0x6e,
-0x73, 0x64, 0x61, 0x61, 0x63, 0x68, 0x3b, 0x4d, 0x65, 0x74, 0x77, 0x6f, 0x63, 0x68, 0x3b, 0x44, 0x75, 0x6e, 0x6e, 0x65,
-0x72, 0x73, 0x64, 0x61, 0x61, 0x63, 0x68, 0x3b, 0x46, 0x72, 0x69, 0x69, 0x64, 0x61, 0x61, 0x63, 0x68, 0x3b, 0x53, 0x61,
-0x6d, 0x73, 0x64, 0x61, 0x61, 0x63, 0x68, 0x3b, 0x4a, 0x75, 0x6d, 0x61, 0x70, 0xed, 0x6c, 0xed, 0x3b, 0x4a, 0x75, 0x6d,
-0x61, 0x74, 0xe1, 0x74, 0x75, 0x3b, 0x4a, 0x75, 0x6d, 0x61, 0x6e, 0x65, 0x3b, 0x4a, 0x75, 0x6d, 0x61, 0x74, 0xe1, 0x6e,
-0x254, 0x3b, 0x41, 0x6c, 0x61, 0xe1, 0x6d, 0x69, 0x73, 0x69, 0x3b, 0x4a, 0x75, 0x6d, 0xe1, 0x61, 0x3b, 0x4a, 0x75, 0x6d,
-0x61, 0x6d, 0xf3, 0x73, 0x69, 0x3b, 0x53, 0x61, 0x62, 0x69, 0x3b, 0x42, 0x61, 0x6c, 0x61, 0x3b, 0x4b, 0x75, 0x62, 0x69,
-0x3b, 0x4b, 0x75, 0x73, 0x61, 0x3b, 0x4b, 0x75, 0x6e, 0x61, 0x3b, 0x4b, 0x75, 0x74, 0x61, 0x3b, 0x4d, 0x75, 0x6b, 0x61,
-0x3b, 0x53, 0x61, 0x62, 0x69, 0x69, 0x74, 0x69, 0x3b, 0x42, 0x61, 0x6c, 0x61, 0x7a, 0x61, 0x3b, 0x4f, 0x77, 0x6f, 0x6b,
-0x75, 0x62, 0x69, 0x6c, 0x69, 0x3b, 0x4f, 0x77, 0x6f, 0x6b, 0x75, 0x73, 0x61, 0x74, 0x75, 0x3b, 0x4f, 0x6c, 0x6f, 0x6b,
-0x75, 0x6e, 0x61, 0x3b, 0x4f, 0x6c, 0x6f, 0x6b, 0x75, 0x74, 0x61, 0x61, 0x6e, 0x75, 0x3b, 0x4f, 0x6c, 0x6f, 0x6d, 0x75,
-0x6b, 0x61, 0x61, 0x67, 0x61, 0x3b, 0x53, 0x3b, 0x42, 0x3b, 0x42, 0x3b, 0x53, 0x3b, 0x4b, 0x3b, 0x4b, 0x3b, 0x4d, 0x3b,
-0x4a, 0x32, 0x3b, 0x4a, 0x33, 0x3b, 0x4a, 0x34, 0x3b, 0x4a, 0x35, 0x3b, 0x41, 0x6c, 0x3b, 0x49, 0x6a, 0x3b, 0x4a, 0x31,
-0x3b, 0x4a, 0x75, 0x6d, 0x61, 0x70, 0x69, 0x72, 0x69, 0x3b, 0x4a, 0x75, 0x6d, 0x61, 0x74, 0x61, 0x74, 0x75, 0x3b, 0x4a,
-0x75, 0x6d, 0x61, 0x6e, 0x6e, 0x65, 0x3b, 0x4a, 0x75, 0x6d, 0x61, 0x74, 0x61, 0x6e, 0x6f, 0x3b, 0x4d, 0x75, 0x72, 0x77,
-0x61, 0x20, 0x77, 0x61, 0x20, 0x4b, 0x61, 0x6e, 0x6e, 0x65, 0x3b, 0x4d, 0x75, 0x72, 0x77, 0x61, 0x20, 0x77, 0x61, 0x20,
-0x4b, 0x61, 0x74, 0x61, 0x6e, 0x6f, 0x3b, 0x4a, 0x75, 0x6d, 0x61, 0x6d, 0x6f, 0x73, 0x69, 0x3b, 0x4a, 0x70, 0x69, 0x3b,
-0x4a, 0x74, 0x74, 0x3b, 0x4a, 0x6e, 0x6e, 0x3b, 0x4a, 0x74, 0x6e, 0x3b, 0x41, 0x6c, 0x68, 0x3b, 0x49, 0x6a, 0x6d, 0x3b,
-0x4a, 0x6d, 0x6f, 0x3b, 0x4a, 0x75, 0x6d, 0x3b, 0x42, 0x61, 0x72, 0x3b, 0x41, 0x61, 0x72, 0x3b, 0x55, 0x6e, 0x69, 0x3b,
-0x55, 0x6e, 0x67, 0x3b, 0x4b, 0x61, 0x6e, 0x3b, 0x53, 0x61, 0x62, 0x3b, 0x4e, 0x61, 0x6b, 0x61, 0x65, 0x6a, 0x75, 0x6d,
-0x61, 0x3b, 0x4e, 0x61, 0x6b, 0x61, 0x65, 0x62, 0x61, 0x72, 0x61, 0x73, 0x61, 0x3b, 0x4e, 0x61, 0x6b, 0x61, 0x61, 0x72,
-0x65, 0x3b, 0x4e, 0x61, 0x6b, 0x61, 0x75, 0x6e, 0x69, 0x3b, 0x4e, 0x61, 0x6b, 0x61, 0x75, 0x6e, 0x67, 0x2019, 0x6f, 0x6e,
-0x3b, 0x4e, 0x61, 0x6b, 0x61, 0x6b, 0x61, 0x6e, 0x79, 0x3b, 0x4e, 0x61, 0x6b, 0x61, 0x73, 0x61, 0x62, 0x69, 0x74, 0x69,
-0x3b, 0x4a, 0x3b, 0x42, 0x3b, 0x41, 0x3b, 0x55, 0x3b, 0x55, 0x3b, 0x4b, 0x3b, 0x53, 0x3b, 0x41, 0x6c, 0x68, 0x3b, 0x41,
-0x74, 0x69, 0x3b, 0x41, 0x74, 0x61, 0x3b, 0x41, 0x6c, 0x61, 0x3b, 0x41, 0x6c, 0x6d, 0x3b, 0x41, 0x6c, 0x6a, 0x3b, 0x41,
-0x73, 0x73, 0x3b, 0x41, 0x6c, 0x68, 0x61, 0x64, 0x69, 0x3b, 0x41, 0x74, 0x69, 0x6e, 0x69, 0x3b, 0x41, 0x74, 0x61, 0x6c,
-0x61, 0x74, 0x61, 0x3b, 0x41, 0x6c, 0x61, 0x72, 0x62, 0x61, 0x3b, 0x41, 0x6c, 0x68, 0x61, 0x6d, 0x69, 0x69, 0x73, 0x61,
-0x3b, 0x41, 0x6c, 0x6a, 0x75, 0x6d, 0x61, 0x3b, 0x41, 0x73, 0x73, 0x61, 0x62, 0x64, 0x75, 0x3b, 0x48, 0x3b, 0x54, 0x3b,
-0x54, 0x3b, 0x4c, 0x3b, 0x4c, 0x3b, 0x4c, 0x3b, 0x53, 0x3b, 0x4a, 0x4d, 0x50, 0x3b, 0x57, 0x55, 0x54, 0x3b, 0x54, 0x41,
-0x52, 0x3b, 0x54, 0x41, 0x44, 0x3b, 0x54, 0x41, 0x4e, 0x3b, 0x54, 0x41, 0x42, 0x3b, 0x4e, 0x47, 0x53, 0x3b, 0x4a, 0x75,
+0x2d, 0x66, 0x65, 0x72, 0x61, 0x3b, 0x73, 0x65, 0x73, 0x74, 0x61, 0x2d, 0x66, 0x65, 0x72, 0x61, 0x3b, 0x73, 0x61, 0x62,
+0x61, 0x64, 0x75, 0x64, 0x75, 0x6d, 0x3b, 0x73, 0x69, 0x67, 0x3b, 0x74, 0x65, 0x72, 0x3b, 0x6b, 0x75, 0x61, 0x3b, 0x6b,
+0x69, 0x6e, 0x3b, 0x73, 0x65, 0x73, 0x3b, 0x73, 0x61, 0x62, 0x44, 0x3b, 0x53, 0x3b, 0x54, 0x3b, 0x4b, 0x3b, 0x4b, 0x3b,
+0x53, 0x3b, 0x53, 0x4b, 0x69, 0x75, 0x6d, 0x69, 0x61, 0x3b, 0x4d, 0x75, 0x72, 0x61, 0x6d, 0x75, 0x6b, 0x6f, 0x3b, 0x57,
+0x61, 0x69, 0x72, 0x69, 0x3b, 0x57, 0x65, 0x74, 0x68, 0x61, 0x74, 0x75, 0x3b, 0x57, 0x65, 0x6e, 0x61, 0x3b, 0x57, 0x65,
+0x74, 0x61, 0x6e, 0x6f, 0x3b, 0x4a, 0x75, 0x6d, 0x61, 0x6d, 0x6f, 0x73, 0x69, 0x4b, 0x49, 0x55, 0x3b, 0x4d, 0x52, 0x41,
+0x3b, 0x57, 0x41, 0x49, 0x3b, 0x57, 0x45, 0x54, 0x3b, 0x57, 0x45, 0x4e, 0x3b, 0x57, 0x54, 0x4e, 0x3b, 0x4a, 0x55, 0x4d,
+0x4b, 0x3b, 0x4d, 0x3b, 0x57, 0x3b, 0x57, 0x3b, 0x57, 0x3b, 0x57, 0x3b, 0x4a, 0x4b, 0x6f, 0x74, 0x69, 0x73, 0x61, 0x70,
+0x3b, 0x4b, 0x6f, 0x74, 0x61, 0x61, 0x69, 0x3b, 0x4b, 0x6f, 0x61, 0x65, 0x6e, 0x67, 0x2019, 0x3b, 0x4b, 0x6f, 0x73, 0x6f,
+0x6d, 0x6f, 0x6b, 0x3b, 0x4b, 0x6f, 0x61, 0x6e, 0x67, 0x2019, 0x77, 0x61, 0x6e, 0x3b, 0x4b, 0x6f, 0x6d, 0x75, 0x75, 0x74,
+0x3b, 0x4b, 0x6f, 0x6c, 0x6f, 0x4b, 0x74, 0x73, 0x3b, 0x4b, 0x6f, 0x74, 0x3b, 0x4b, 0x6f, 0x6f, 0x3b, 0x4b, 0x6f, 0x73,
+0x3b, 0x4b, 0x6f, 0x61, 0x3b, 0x4b, 0x6f, 0x6d, 0x3b, 0x4b, 0x6f, 0x6c, 0x54, 0x3b, 0x54, 0x3b, 0x4f, 0x3b, 0x53, 0x3b,
+0x41, 0x3b, 0x4d, 0x3b, 0x4c, 0x53, 0x6f, 0x6e, 0x74, 0x61, 0x78, 0x74, 0x73, 0x65, 0x65, 0x73, 0x3b, 0x4d, 0x61, 0x6e,
+0x74, 0x61, 0x78, 0x74, 0x73, 0x65, 0x65, 0x73, 0x3b, 0x44, 0x65, 0x6e, 0x73, 0x74, 0x61, 0x78, 0x74, 0x73, 0x65, 0x65,
+0x73, 0x3b, 0x57, 0x75, 0x6e, 0x73, 0x74, 0x61, 0x78, 0x74, 0x73, 0x65, 0x65, 0x73, 0x3b, 0x44, 0x6f, 0x6e, 0x64, 0x65,
+0x72, 0x74, 0x61, 0x78, 0x74, 0x73, 0x65, 0x65, 0x73, 0x3b, 0x46, 0x72, 0x61, 0x69, 0x74, 0x61, 0x78, 0x74, 0x73, 0x65,
+0x65, 0x73, 0x3b, 0x53, 0x61, 0x74, 0x65, 0x72, 0x74, 0x61, 0x78, 0x74, 0x73, 0x65, 0x65, 0x73, 0x53, 0x6f, 0x6e, 0x3b,
+0x4d, 0x61, 0x3b, 0x44, 0x65, 0x3b, 0x57, 0x75, 0x3b, 0x44, 0x6f, 0x3b, 0x46, 0x72, 0x3b, 0x53, 0x61, 0x74, 0x53, 0x3b,
+0x4d, 0x3b, 0x45, 0x3b, 0x57, 0x3b, 0x44, 0x3b, 0x46, 0x3b, 0x41, 0x53, 0x75, 0x6e, 0x6e, 0x64, 0x61, 0x61, 0x63, 0x68,
+0x3b, 0x4d, 0x6f, 0x68, 0x6e, 0x64, 0x61, 0x61, 0x63, 0x68, 0x3b, 0x44, 0x69, 0x6e, 0x6e, 0x73, 0x64, 0x61, 0x61, 0x63,
+0x68, 0x3b, 0x4d, 0x65, 0x74, 0x77, 0x6f, 0x63, 0x68, 0x3b, 0x44, 0x75, 0x6e, 0x6e, 0x65, 0x72, 0x73, 0x64, 0x61, 0x61,
+0x63, 0x68, 0x3b, 0x46, 0x72, 0x69, 0x69, 0x64, 0x61, 0x61, 0x63, 0x68, 0x3b, 0x53, 0x61, 0x6d, 0x73, 0x64, 0x61, 0x61,
+0x63, 0x68, 0x53, 0x75, 0x2e, 0x3b, 0x4d, 0x6f, 0x2e, 0x3b, 0x44, 0x69, 0x2e, 0x3b, 0x4d, 0x65, 0x2e, 0x3b, 0x44, 0x75,
+0x2e, 0x3b, 0x46, 0x72, 0x2e, 0x3b, 0x53, 0x61, 0x2e, 0x4a, 0x75, 0x6d, 0x61, 0x70, 0xed, 0x6c, 0xed, 0x3b, 0x4a, 0x75,
+0x6d, 0x61, 0x74, 0xe1, 0x74, 0x75, 0x3b, 0x4a, 0x75, 0x6d, 0x61, 0x6e, 0x65, 0x3b, 0x4a, 0x75, 0x6d, 0x61, 0x74, 0xe1,
+0x6e, 0x254, 0x3b, 0x41, 0x6c, 0x61, 0xe1, 0x6d, 0x69, 0x73, 0x69, 0x3b, 0x4a, 0x75, 0x6d, 0xe1, 0x61, 0x3b, 0x4a, 0x75,
+0x6d, 0x61, 0x6d, 0xf3, 0x73, 0x69, 0x53, 0x61, 0x62, 0x69, 0x69, 0x74, 0x69, 0x3b, 0x42, 0x61, 0x6c, 0x61, 0x7a, 0x61,
+0x3b, 0x4f, 0x77, 0x6f, 0x6b, 0x75, 0x62, 0x69, 0x6c, 0x69, 0x3b, 0x4f, 0x77, 0x6f, 0x6b, 0x75, 0x73, 0x61, 0x74, 0x75,
+0x3b, 0x4f, 0x6c, 0x6f, 0x6b, 0x75, 0x6e, 0x61, 0x3b, 0x4f, 0x6c, 0x6f, 0x6b, 0x75, 0x74, 0x61, 0x61, 0x6e, 0x75, 0x3b,
+0x4f, 0x6c, 0x6f, 0x6d, 0x75, 0x6b, 0x61, 0x61, 0x67, 0x61, 0x53, 0x61, 0x62, 0x69, 0x3b, 0x42, 0x61, 0x6c, 0x61, 0x3b,
+0x4b, 0x75, 0x62, 0x69, 0x3b, 0x4b, 0x75, 0x73, 0x61, 0x3b, 0x4b, 0x75, 0x6e, 0x61, 0x3b, 0x4b, 0x75, 0x74, 0x61, 0x3b,
+0x4d, 0x75, 0x6b, 0x61, 0x53, 0x3b, 0x42, 0x3b, 0x42, 0x3b, 0x53, 0x3b, 0x4b, 0x3b, 0x4b, 0x3b, 0x4d, 0x4a, 0x75, 0x6d,
+0x61, 0x70, 0x69, 0x72, 0x69, 0x3b, 0x4a, 0x75, 0x6d, 0x61, 0x74, 0x61, 0x74, 0x75, 0x3b, 0x4a, 0x75, 0x6d, 0x61, 0x6e,
+0x6e, 0x65, 0x3b, 0x4a, 0x75, 0x6d, 0x61, 0x74, 0x61, 0x6e, 0x6f, 0x3b, 0x4d, 0x75, 0x72, 0x77, 0x61, 0x20, 0x77, 0x61,
+0x20, 0x4b, 0x61, 0x6e, 0x6e, 0x65, 0x3b, 0x4d, 0x75, 0x72, 0x77, 0x61, 0x20, 0x77, 0x61, 0x20, 0x4b, 0x61, 0x74, 0x61,
+0x6e, 0x6f, 0x3b, 0x4a, 0x75, 0x6d, 0x61, 0x6d, 0x6f, 0x73, 0x69, 0x4a, 0x32, 0x3b, 0x4a, 0x33, 0x3b, 0x4a, 0x34, 0x3b,
+0x4a, 0x35, 0x3b, 0x41, 0x6c, 0x3b, 0x49, 0x6a, 0x3b, 0x4a, 0x31, 0x4a, 0x70, 0x69, 0x3b, 0x4a, 0x74, 0x74, 0x3b, 0x4a,
+0x6e, 0x6e, 0x3b, 0x4a, 0x74, 0x6e, 0x3b, 0x41, 0x6c, 0x68, 0x3b, 0x49, 0x6a, 0x6d, 0x3b, 0x4a, 0x6d, 0x6f, 0x4e, 0x61,
+0x6b, 0x61, 0x65, 0x6a, 0x75, 0x6d, 0x61, 0x3b, 0x4e, 0x61, 0x6b, 0x61, 0x65, 0x62, 0x61, 0x72, 0x61, 0x73, 0x61, 0x3b,
+0x4e, 0x61, 0x6b, 0x61, 0x61, 0x72, 0x65, 0x3b, 0x4e, 0x61, 0x6b, 0x61, 0x75, 0x6e, 0x69, 0x3b, 0x4e, 0x61, 0x6b, 0x61,
+0x75, 0x6e, 0x67, 0x2019, 0x6f, 0x6e, 0x3b, 0x4e, 0x61, 0x6b, 0x61, 0x6b, 0x61, 0x6e, 0x79, 0x3b, 0x4e, 0x61, 0x6b, 0x61,
+0x73, 0x61, 0x62, 0x69, 0x74, 0x69, 0x4a, 0x75, 0x6d, 0x3b, 0x42, 0x61, 0x72, 0x3b, 0x41, 0x61, 0x72, 0x3b, 0x55, 0x6e,
+0x69, 0x3b, 0x55, 0x6e, 0x67, 0x3b, 0x4b, 0x61, 0x6e, 0x3b, 0x53, 0x61, 0x62, 0x4a, 0x3b, 0x42, 0x3b, 0x41, 0x3b, 0x55,
+0x3b, 0x55, 0x3b, 0x4b, 0x3b, 0x53, 0x41, 0x6c, 0x68, 0x61, 0x64, 0x69, 0x3b, 0x41, 0x74, 0x69, 0x6e, 0x69, 0x3b, 0x41,
+0x74, 0x61, 0x6c, 0x61, 0x74, 0x61, 0x3b, 0x41, 0x6c, 0x61, 0x72, 0x62, 0x61, 0x3b, 0x41, 0x6c, 0x68, 0x61, 0x6d, 0x69,
+0x69, 0x73, 0x61, 0x3b, 0x41, 0x6c, 0x6a, 0x75, 0x6d, 0x61, 0x3b, 0x41, 0x73, 0x73, 0x61, 0x62, 0x64, 0x75, 0x41, 0x6c,
+0x68, 0x3b, 0x41, 0x74, 0x69, 0x3b, 0x41, 0x74, 0x61, 0x3b, 0x41, 0x6c, 0x61, 0x3b, 0x41, 0x6c, 0x6d, 0x3b, 0x41, 0x6c,
+0x6a, 0x3b, 0x41, 0x73, 0x73, 0x48, 0x3b, 0x54, 0x3b, 0x54, 0x3b, 0x4c, 0x3b, 0x4c, 0x3b, 0x4c, 0x3b, 0x53, 0x4a, 0x75,
 0x6d, 0x61, 0x70, 0x69, 0x6c, 0x3b, 0x57, 0x75, 0x6f, 0x6b, 0x20, 0x54, 0x69, 0x63, 0x68, 0x3b, 0x54, 0x69, 0x63, 0x68,
 0x20, 0x41, 0x72, 0x69, 0x79, 0x6f, 0x3b, 0x54, 0x69, 0x63, 0x68, 0x20, 0x41, 0x64, 0x65, 0x6b, 0x3b, 0x54, 0x69, 0x63,
 0x68, 0x20, 0x41, 0x6e, 0x67, 0x2019, 0x77, 0x65, 0x6e, 0x3b, 0x54, 0x69, 0x63, 0x68, 0x20, 0x41, 0x62, 0x69, 0x63, 0x68,
-0x3b, 0x4e, 0x67, 0x65, 0x73, 0x6f, 0x3b, 0x4a, 0x3b, 0x57, 0x3b, 0x54, 0x3b, 0x54, 0x3b, 0x54, 0x3b, 0x54, 0x3b, 0x4e,
-0x3b, 0x41, 0x73, 0x61, 0x3b, 0x41, 0x79, 0x6e, 0x3b, 0x41, 0x73, 0x6e, 0x3b, 0x41, 0x6b, 0x72, 0x3b, 0x41, 0x6b, 0x77,
-0x3b, 0x41, 0x73, 0x6d, 0x3b, 0x41, 0x73, 0x1e0d, 0x3b, 0x41, 0x73, 0x61, 0x6d, 0x61, 0x73, 0x3b, 0x41, 0x79, 0x6e, 0x61,
-0x73, 0x3b, 0x41, 0x73, 0x69, 0x6e, 0x61, 0x73, 0x3b, 0x41, 0x6b, 0x72, 0x61, 0x73, 0x3b, 0x41, 0x6b, 0x77, 0x61, 0x73,
-0x3b, 0x41, 0x73, 0x69, 0x6d, 0x77, 0x61, 0x73, 0x3b, 0x41, 0x73, 0x69, 0x1e0d, 0x79, 0x61, 0x73, 0x3b, 0x41, 0x3b, 0x41,
-0x3b, 0x41, 0x3b, 0x41, 0x3b, 0x41, 0x3b, 0x41, 0x3b, 0x41, 0x3b, 0x41, 0x6c, 0x68, 0x3b, 0x41, 0x74, 0x69, 0x3b, 0x41,
-0x74, 0x61, 0x3b, 0x41, 0x6c, 0x61, 0x3b, 0x41, 0x6c, 0x6d, 0x3b, 0x41, 0x6c, 0x7a, 0x3b, 0x41, 0x73, 0x69, 0x3b, 0x41,
+0x3b, 0x4e, 0x67, 0x65, 0x73, 0x6f, 0x4a, 0x4d, 0x50, 0x3b, 0x57, 0x55, 0x54, 0x3b, 0x54, 0x41, 0x52, 0x3b, 0x54, 0x41,
+0x44, 0x3b, 0x54, 0x41, 0x4e, 0x3b, 0x54, 0x41, 0x42, 0x3b, 0x4e, 0x47, 0x53, 0x4a, 0x3b, 0x57, 0x3b, 0x54, 0x3b, 0x54,
+0x3b, 0x54, 0x3b, 0x54, 0x3b, 0x4e, 0x41, 0x73, 0x61, 0x6d, 0x61, 0x73, 0x3b, 0x41, 0x79, 0x6e, 0x61, 0x73, 0x3b, 0x41,
+0x73, 0x69, 0x6e, 0x61, 0x73, 0x3b, 0x41, 0x6b, 0x72, 0x61, 0x73, 0x3b, 0x41, 0x6b, 0x77, 0x61, 0x73, 0x3b, 0x41, 0x73,
+0x69, 0x6d, 0x77, 0x61, 0x73, 0x3b, 0x41, 0x73, 0x69, 0x1e0d, 0x79, 0x61, 0x73, 0x41, 0x73, 0x61, 0x3b, 0x41, 0x79, 0x6e,
+0x3b, 0x41, 0x73, 0x6e, 0x3b, 0x41, 0x6b, 0x72, 0x3b, 0x41, 0x6b, 0x77, 0x3b, 0x41, 0x73, 0x6d, 0x3b, 0x41, 0x73, 0x1e0d,
+0x41, 0x3b, 0x41, 0x3b, 0x41, 0x3b, 0x41, 0x3b, 0x41, 0x3b, 0x41, 0x3b, 0x41, 0x41, 0x6c, 0x68, 0x61, 0x64, 0x69, 0x3b,
+0x41, 0x74, 0x69, 0x6e, 0x6e, 0x69, 0x3b, 0x41, 0x74, 0x61, 0x6c, 0x61, 0x61, 0x74, 0x61, 0x3b, 0x41, 0x6c, 0x61, 0x72,
+0x62, 0x61, 0x3b, 0x41, 0x6c, 0x68, 0x61, 0x6d, 0x69, 0x69, 0x73, 0x61, 0x3b, 0x41, 0x6c, 0x7a, 0x75, 0x6d, 0x61, 0x3b,
+0x41, 0x73, 0x69, 0x62, 0x74, 0x69, 0x41, 0x6c, 0x68, 0x3b, 0x41, 0x74, 0x69, 0x3b, 0x41, 0x74, 0x61, 0x3b, 0x41, 0x6c,
+0x61, 0x3b, 0x41, 0x6c, 0x6d, 0x3b, 0x41, 0x6c, 0x7a, 0x3b, 0x41, 0x73, 0x69, 0x4a, 0x75, 0x6d, 0x61, 0x61, 0x70, 0x69,
+0x69, 0x3b, 0x4a, 0x75, 0x6d, 0x61, 0x61, 0x74, 0x61, 0x74, 0x75, 0x3b, 0x4a, 0x75, 0x6d, 0x61, 0x61, 0x6e, 0x65, 0x3b,
+0x4a, 0x75, 0x6d, 0x61, 0x61, 0x74, 0x61, 0x6e, 0x6f, 0x3b, 0x41, 0x6c, 0x68, 0x61, 0x6d, 0x69, 0x73, 0x69, 0x3b, 0x49,
+0x6a, 0x75, 0x6d, 0x61, 0x61, 0x3b, 0x4a, 0x75, 0x6d, 0x61, 0x61, 0x6d, 0x6f, 0x73, 0x69, 0x4a, 0x70, 0x69, 0x3b, 0x4a,
+0x74, 0x74, 0x3b, 0x4a, 0x6d, 0x6e, 0x3b, 0x4a, 0x74, 0x6e, 0x3b, 0x41, 0x6c, 0x68, 0x3b, 0x49, 0x6a, 0x75, 0x3b, 0x4a,
+0x6d, 0x6f, 0x32, 0x3b, 0x33, 0x3b, 0x34, 0x3b, 0x35, 0x3b, 0x41, 0x3b, 0x49, 0x3b, 0x31, 0x930, 0x92c, 0x93f, 0x92c, 0x93e,
+0x930, 0x3b, 0x938, 0x92e, 0x92c, 0x93e, 0x930, 0x3b, 0x92e, 0x902, 0x917, 0x932, 0x92c, 0x93e, 0x930, 0x3b, 0x92c, 0x941, 0x926, 0x92c,
+0x93e, 0x930, 0x3b, 0x92c, 0x93f, 0x938, 0x925, 0x93f, 0x92c, 0x93e, 0x930, 0x3b, 0x938, 0x941, 0x916, 0x941, 0x930, 0x92c, 0x93e, 0x930,
+0x3b, 0x938, 0x941, 0x928, 0x93f, 0x92c, 0x93e, 0x930, 0x930, 0x92c, 0x93f, 0x3b, 0x938, 0x92e, 0x3b, 0x92e, 0x902, 0x917, 0x932, 0x3b,
+0x92c, 0x941, 0x926, 0x3b, 0x92c, 0x93f, 0x938, 0x925, 0x93f, 0x3b, 0x938, 0x941, 0x916, 0x941, 0x930, 0x3b, 0x938, 0x941, 0x928, 0x93f,
+0x930, 0x3b, 0x938, 0x3b, 0x92e, 0x902, 0x3b, 0x92c, 0x941, 0x3b, 0x92c, 0x93f, 0x3b, 0x938, 0x941, 0x3b, 0x938, 0x941, 0x43a, 0x4c0,
+0x438, 0x440, 0x430, 0x3b, 0x43e, 0x440, 0x448, 0x43e, 0x442, 0x3b, 0x448, 0x438, 0x43d, 0x430, 0x440, 0x430, 0x3b, 0x43a, 0x445, 0x430,
+0x430, 0x440, 0x430, 0x3b, 0x435, 0x430, 0x440, 0x430, 0x3b, 0x43f, 0x4c0, 0x435, 0x440, 0x430, 0x441, 0x43a, 0x430, 0x3b, 0x448, 0x443,
+0x43e, 0x442, 0x43a, 0x4c0, 0x438, 0x3b, 0x43e, 0x440, 0x3b, 0x448, 0x438, 0x3b, 0x43a, 0x445, 0x430, 0x3b, 0x435, 0x430, 0x3b, 0x43f,
+0x4c0, 0x435, 0x3b, 0x448, 0x443, 0x43e, 0x43a, 0x4c0, 0x3b, 0x43e, 0x3b, 0x448, 0x3b, 0x43a, 0x445, 0x3b, 0x435, 0x3b, 0x43f, 0x4c0,
+0x3b, 0x448, 0x43d, 0x435, 0x434, 0x463, 0x301, 0x43b, 0x467, 0x3b, 0x43f, 0x43e, 0x43d, 0x435, 0x434, 0x463, 0x301, 0x43b, 0x44c, 0x43d,
+0x438, 0x43a, 0x44a, 0x3b, 0x432, 0x442, 0x43e, 0x301, 0x440, 0x43d, 0x438, 0x43a, 0x44a, 0x3b, 0x441, 0x440, 0x435, 0x434, 0x430, 0x300,
+0x3b, 0x447, 0x435, 0x442, 0x432, 0x435, 0x440, 0x442, 0x43e, 0x301, 0x43a, 0x44a, 0x3b, 0x43f, 0x467, 0x442, 0x43e, 0x301, 0x43a, 0x44a,
+0x3b, 0x441, 0xa64b, 0x431, 0x431, 0x461, 0x301, 0x442, 0x430, 0x43d, 0x434, 0x2de7, 0x487, 0x467, 0x3b, 0x43f, 0x43d, 0x2de3, 0x435, 0x3b,
+0x432, 0x442, 0x43e, 0x2dec, 0x487, 0x3b, 0x441, 0x440, 0x2de3, 0x435, 0x3b, 0x447, 0x435, 0x2de6, 0x487, 0x3b, 0x43f, 0x467, 0x2de6, 0x487,
+0x3b, 0x441, 0xa64b, 0x2de0, 0x487, 0x4c, 0x75, 0x6d, 0x69, 0x6e, 0x67, 0x75, 0x3b, 0x4e, 0x6b, 0x6f, 0x64, 0x79, 0x61, 0x3b,
+0x4e, 0x64, 0xe0, 0x61, 0x79, 0xe0, 0x3b, 0x4e, 0x64, 0x61, 0x6e, 0x67, 0xf9, 0x3b, 0x4e, 0x6a, 0xf2, 0x77, 0x61, 0x3b,
+0x4e, 0x67, 0xf2, 0x76, 0x79, 0x61, 0x3b, 0x4c, 0x75, 0x62, 0x69, 0x6e, 0x67, 0x75, 0x4c, 0x75, 0x6d, 0x3b, 0x4e, 0x6b,
+0x6f, 0x3b, 0x4e, 0x64, 0x79, 0x3b, 0x4e, 0x64, 0x67, 0x3b, 0x4e, 0x6a, 0x77, 0x3b, 0x4e, 0x67, 0x76, 0x3b, 0x4c, 0x75,
+0x62, 0x4c, 0x3b, 0x4e, 0x3b, 0x4e, 0x3b, 0x4e, 0x3b, 0x4e, 0x3b, 0x4e, 0x3b, 0x4c, 0x53, 0x6f, 0x6e, 0x6e, 0x64, 0x65,
+0x67, 0x3b, 0x4d, 0xe9, 0x69, 0x6e, 0x64, 0x65, 0x67, 0x3b, 0x44, 0xeb, 0x6e, 0x73, 0x63, 0x68, 0x64, 0x65, 0x67, 0x3b,
+0x4d, 0xeb, 0x74, 0x74, 0x77, 0x6f, 0x63, 0x68, 0x3b, 0x44, 0x6f, 0x6e, 0x6e, 0x65, 0x73, 0x63, 0x68, 0x64, 0x65, 0x67,
+0x3b, 0x46, 0x72, 0x65, 0x69, 0x64, 0x65, 0x67, 0x3b, 0x53, 0x61, 0x6d, 0x73, 0x63, 0x68, 0x64, 0x65, 0x67, 0x53, 0x6f,
+0x6e, 0x3b, 0x4d, 0xe9, 0x69, 0x3b, 0x44, 0xeb, 0x6e, 0x3b, 0x4d, 0xeb, 0x74, 0x3b, 0x44, 0x6f, 0x6e, 0x3b, 0x46, 0x72,
+0x65, 0x3b, 0x53, 0x61, 0x6d, 0x53, 0x6f, 0x6e, 0x2e, 0x3b, 0x4d, 0xe9, 0x69, 0x2e, 0x3b, 0x44, 0xeb, 0x6e, 0x2e, 0x3b,
+0x4d, 0xeb, 0x74, 0x2e, 0x3b, 0x44, 0x6f, 0x6e, 0x2e, 0x3b, 0x46, 0x72, 0x65, 0x2e, 0x3b, 0x53, 0x61, 0x6d, 0x2e, 0x74,
+0x73, 0x75, 0x294, 0x6e, 0x74, 0x73, 0x268, 0x3b, 0x74, 0x73, 0x75, 0x294, 0x75, 0x6b, 0x70, 0xe0, 0x3b, 0x74, 0x73, 0x75,
+0x294, 0x75, 0x67, 0x68, 0x254, 0x65, 0x3b, 0x74, 0x73, 0x75, 0x294, 0x75, 0x74, 0x254, 0x300, 0x6d, 0x6c, 0xf2, 0x3b, 0x74,
+0x73, 0x75, 0x294, 0x75, 0x6d, 0xe8, 0x3b, 0x74, 0x73, 0x75, 0x294, 0x75, 0x67, 0x68, 0x268, 0x302, 0x6d, 0x3b, 0x74, 0x73,
+0x75, 0x294, 0x6e, 0x64, 0x7a, 0x268, 0x6b, 0x254, 0x294, 0x254, 0x6e, 0x74, 0x73, 0x3b, 0x6b, 0x70, 0x61, 0x3b, 0x67, 0x68,
+0x254, 0x3b, 0x74, 0x254, 0x6d, 0x3b, 0x75, 0x6d, 0x65, 0x3b, 0x67, 0x68, 0x268, 0x3b, 0x64, 0x7a, 0x6b, 0x6e, 0x3b, 0x6b,
+0x3b, 0x67, 0x3b, 0x74, 0x3b, 0x75, 0x3b, 0x67, 0x3b, 0x64, 0x14b, 0x67, 0x77, 0xe0, 0x20, 0x6e, 0x254, 0x302, 0x79, 0x3b,
+0x14b, 0x67, 0x77, 0xe0, 0x20, 0x6e, 0x6a, 0x61, 0x14b, 0x67, 0x75, 0x6d, 0x62, 0x61, 0x3b, 0x14b, 0x67, 0x77, 0xe0, 0x20,
+0xfb, 0x6d, 0x3b, 0x14b, 0x67, 0x77, 0xe0, 0x20, 0x14b, 0x67, 0xea, 0x3b, 0x14b, 0x67, 0x77, 0xe0, 0x20, 0x6d, 0x62, 0x254,
+0x6b, 0x3b, 0x14b, 0x67, 0x77, 0xe0, 0x20, 0x6b, 0x254, 0x254, 0x3b, 0x14b, 0x67, 0x77, 0xe0, 0x20, 0x6a, 0xf4, 0x6e, 0x6e,
+0x254, 0x79, 0x3b, 0x6e, 0x6a, 0x61, 0x3b, 0x75, 0x75, 0x6d, 0x3b, 0x14b, 0x67, 0x65, 0x3b, 0x6d, 0x62, 0x254, 0x3b, 0x6b,
+0x254, 0x254, 0x3b, 0x6a, 0x6f, 0x6e, 0x6e, 0x3b, 0x6e, 0x3b, 0x75, 0x3b, 0x14b, 0x3b, 0x6d, 0x3b, 0x6b, 0x3b, 0x6a, 0x41,
 0x6c, 0x68, 0x61, 0x64, 0x69, 0x3b, 0x41, 0x74, 0x69, 0x6e, 0x6e, 0x69, 0x3b, 0x41, 0x74, 0x61, 0x6c, 0x61, 0x61, 0x74,
-0x61, 0x3b, 0x41, 0x6c, 0x61, 0x72, 0x62, 0x61, 0x3b, 0x41, 0x6c, 0x68, 0x61, 0x6d, 0x69, 0x69, 0x73, 0x61, 0x3b, 0x41,
-0x6c, 0x7a, 0x75, 0x6d, 0x61, 0x3b, 0x41, 0x73, 0x69, 0x62, 0x74, 0x69, 0x3b, 0x4a, 0x70, 0x69, 0x3b, 0x4a, 0x74, 0x74,
-0x3b, 0x4a, 0x6d, 0x6e, 0x3b, 0x4a, 0x74, 0x6e, 0x3b, 0x41, 0x6c, 0x68, 0x3b, 0x49, 0x6a, 0x75, 0x3b, 0x4a, 0x6d, 0x6f,
-0x3b, 0x4a, 0x75, 0x6d, 0x61, 0x61, 0x70, 0x69, 0x69, 0x3b, 0x4a, 0x75, 0x6d, 0x61, 0x61, 0x74, 0x61, 0x74, 0x75, 0x3b,
-0x4a, 0x75, 0x6d, 0x61, 0x61, 0x6e, 0x65, 0x3b, 0x4a, 0x75, 0x6d, 0x61, 0x61, 0x74, 0x61, 0x6e, 0x6f, 0x3b, 0x41, 0x6c,
-0x68, 0x61, 0x6d, 0x69, 0x73, 0x69, 0x3b, 0x49, 0x6a, 0x75, 0x6d, 0x61, 0x61, 0x3b, 0x4a, 0x75, 0x6d, 0x61, 0x61, 0x6d,
-0x6f, 0x73, 0x69, 0x3b, 0x32, 0x3b, 0x33, 0x3b, 0x34, 0x3b, 0x35, 0x3b, 0x41, 0x3b, 0x49, 0x3b, 0x31, 0x3b, 0x930, 0x92c,
-0x93f, 0x3b, 0x938, 0x92e, 0x3b, 0x92e, 0x902, 0x917, 0x932, 0x3b, 0x92c, 0x941, 0x926, 0x3b, 0x92c, 0x93f, 0x938, 0x925, 0x93f, 0x3b,
-0x938, 0x941, 0x916, 0x941, 0x930, 0x3b, 0x938, 0x941, 0x928, 0x93f, 0x3b, 0x930, 0x92c, 0x93f, 0x92c, 0x93e, 0x930, 0x3b, 0x938, 0x92e,
-0x92c, 0x93e, 0x930, 0x3b, 0x92e, 0x902, 0x917, 0x932, 0x92c, 0x93e, 0x930, 0x3b, 0x92c, 0x941, 0x926, 0x92c, 0x93e, 0x930, 0x3b, 0x92c,
-0x93f, 0x938, 0x925, 0x93f, 0x92c, 0x93e, 0x930, 0x3b, 0x938, 0x941, 0x916, 0x941, 0x930, 0x92c, 0x93e, 0x930, 0x3b, 0x938, 0x941, 0x928,
-0x93f, 0x92c, 0x93e, 0x930, 0x3b, 0x930, 0x3b, 0x938, 0x3b, 0x92e, 0x902, 0x3b, 0x92c, 0x941, 0x3b, 0x92c, 0x93f, 0x3b, 0x938, 0x941,
-0x3b, 0x938, 0x941, 0x3b, 0x43a, 0x4c0, 0x438, 0x3b, 0x43e, 0x440, 0x3b, 0x448, 0x438, 0x3b, 0x43a, 0x445, 0x430, 0x3b, 0x435, 0x430,
-0x3b, 0x43f, 0x4c0, 0x435, 0x3b, 0x448, 0x443, 0x43e, 0x3b, 0x43a, 0x4c0, 0x438, 0x440, 0x430, 0x3b, 0x43e, 0x440, 0x448, 0x43e, 0x442,
-0x3b, 0x448, 0x438, 0x43d, 0x430, 0x440, 0x430, 0x3b, 0x43a, 0x445, 0x430, 0x430, 0x440, 0x430, 0x3b, 0x435, 0x430, 0x440, 0x430, 0x3b,
-0x43f, 0x4c0, 0x435, 0x440, 0x430, 0x441, 0x43a, 0x430, 0x3b, 0x448, 0x443, 0x43e, 0x442, 0x3b, 0x43a, 0x4c0, 0x3b, 0x43e, 0x3b, 0x448,
-0x3b, 0x43a, 0x445, 0x3b, 0x435, 0x3b, 0x43f, 0x4c0, 0x3b, 0x448, 0x3b, 0x43d, 0x434, 0x2de7, 0x487, 0x467, 0x3b, 0x43f, 0x43d, 0x2de3,
-0x435, 0x3b, 0x432, 0x442, 0x43e, 0x2dec, 0x487, 0x3b, 0x441, 0x440, 0x2de3, 0x435, 0x3b, 0x447, 0x435, 0x2de6, 0x487, 0x3b, 0x43f, 0x467,
-0x2de6, 0x487, 0x3b, 0x441, 0xa64b, 0x2de0, 0x487, 0x3b, 0x43d, 0x435, 0x434, 0x463, 0x301, 0x43b, 0x467, 0x3b, 0x43f, 0x43e, 0x43d, 0x435,
-0x434, 0x463, 0x301, 0x43b, 0x44c, 0x43d, 0x438, 0x43a, 0x44a, 0x3b, 0x432, 0x442, 0x43e, 0x301, 0x440, 0x43d, 0x438, 0x43a, 0x44a, 0x3b,
-0x441, 0x440, 0x435, 0x434, 0x430, 0x300, 0x3b, 0x447, 0x435, 0x442, 0x432, 0x435, 0x440, 0x442, 0x43e, 0x301, 0x43a, 0x44a, 0x3b, 0x43f,
-0x467, 0x442, 0x43e, 0x301, 0x43a, 0x44a, 0x3b, 0x441, 0xa64b, 0x431, 0x431, 0x461, 0x301, 0x442, 0x430, 0x3b, 0x4c, 0x75, 0x6d, 0x3b,
-0x4e, 0x6b, 0x6f, 0x3b, 0x4e, 0x64, 0x79, 0x3b, 0x4e, 0x64, 0x67, 0x3b, 0x4e, 0x6a, 0x77, 0x3b, 0x4e, 0x67, 0x76, 0x3b,
-0x4c, 0x75, 0x62, 0x3b, 0x4c, 0x75, 0x6d, 0x69, 0x6e, 0x67, 0x75, 0x3b, 0x4e, 0x6b, 0x6f, 0x64, 0x79, 0x61, 0x3b, 0x4e,
-0x64, 0xe0, 0x61, 0x79, 0xe0, 0x3b, 0x4e, 0x64, 0x61, 0x6e, 0x67, 0xf9, 0x3b, 0x4e, 0x6a, 0xf2, 0x77, 0x61, 0x3b, 0x4e,
-0x67, 0xf2, 0x76, 0x79, 0x61, 0x3b, 0x4c, 0x75, 0x62, 0x69, 0x6e, 0x67, 0x75, 0x3b, 0x4c, 0x3b, 0x4e, 0x3b, 0x4e, 0x3b,
-0x4e, 0x3b, 0x4e, 0x3b, 0x4e, 0x3b, 0x4c, 0x3b, 0x53, 0x6f, 0x6e, 0x3b, 0x4d, 0xe9, 0x69, 0x3b, 0x44, 0xeb, 0x6e, 0x3b,
-0x4d, 0xeb, 0x74, 0x3b, 0x44, 0x6f, 0x6e, 0x3b, 0x46, 0x72, 0x65, 0x3b, 0x53, 0x61, 0x6d, 0x3b, 0x53, 0x6f, 0x6e, 0x6e,
-0x64, 0x65, 0x67, 0x3b, 0x4d, 0xe9, 0x69, 0x6e, 0x64, 0x65, 0x67, 0x3b, 0x44, 0xeb, 0x6e, 0x73, 0x63, 0x68, 0x64, 0x65,
-0x67, 0x3b, 0x4d, 0xeb, 0x74, 0x74, 0x77, 0x6f, 0x63, 0x68, 0x3b, 0x44, 0x6f, 0x6e, 0x6e, 0x65, 0x73, 0x63, 0x68, 0x64,
-0x65, 0x67, 0x3b, 0x46, 0x72, 0x65, 0x69, 0x64, 0x65, 0x67, 0x3b, 0x53, 0x61, 0x6d, 0x73, 0x63, 0x68, 0x64, 0x65, 0x67,
-0x3b, 0x53, 0x6f, 0x6e, 0x2e, 0x3b, 0x4d, 0xe9, 0x69, 0x2e, 0x3b, 0x44, 0xeb, 0x6e, 0x2e, 0x3b, 0x4d, 0xeb, 0x74, 0x2e,
-0x3b, 0x44, 0x6f, 0x6e, 0x2e, 0x3b, 0x46, 0x72, 0x65, 0x2e, 0x3b, 0x53, 0x61, 0x6d, 0x2e, 0x3b, 0x6e, 0x74, 0x73, 0x3b,
-0x6b, 0x70, 0x61, 0x3b, 0x67, 0x68, 0x254, 0x3b, 0x74, 0x254, 0x6d, 0x3b, 0x75, 0x6d, 0x65, 0x3b, 0x67, 0x68, 0x268, 0x3b,
-0x64, 0x7a, 0x6b, 0x3b, 0x74, 0x73, 0x75, 0x294, 0x6e, 0x74, 0x73, 0x268, 0x3b, 0x74, 0x73, 0x75, 0x294, 0x75, 0x6b, 0x70,
-0xe0, 0x3b, 0x74, 0x73, 0x75, 0x294, 0x75, 0x67, 0x68, 0x254, 0x65, 0x3b, 0x74, 0x73, 0x75, 0x294, 0x75, 0x74, 0x254, 0x300,
-0x6d, 0x6c, 0xf2, 0x3b, 0x74, 0x73, 0x75, 0x294, 0x75, 0x6d, 0xe8, 0x3b, 0x74, 0x73, 0x75, 0x294, 0x75, 0x67, 0x68, 0x268,
-0x302, 0x6d, 0x3b, 0x74, 0x73, 0x75, 0x294, 0x6e, 0x64, 0x7a, 0x268, 0x6b, 0x254, 0x294, 0x254, 0x3b, 0x6e, 0x3b, 0x6b, 0x3b,
-0x67, 0x3b, 0x74, 0x3b, 0x75, 0x3b, 0x67, 0x3b, 0x64, 0x3b, 0x6e, 0x254, 0x79, 0x3b, 0x6e, 0x6a, 0x61, 0x3b, 0x75, 0x75,
-0x6d, 0x3b, 0x14b, 0x67, 0x65, 0x3b, 0x6d, 0x62, 0x254, 0x3b, 0x6b, 0x254, 0x254, 0x3b, 0x6a, 0x6f, 0x6e, 0x3b, 0x14b, 0x67,
-0x77, 0xe0, 0x20, 0x6e, 0x254, 0x302, 0x79, 0x3b, 0x14b, 0x67, 0x77, 0xe0, 0x20, 0x6e, 0x6a, 0x61, 0x14b, 0x67, 0x75, 0x6d,
-0x62, 0x61, 0x3b, 0x14b, 0x67, 0x77, 0xe0, 0x20, 0xfb, 0x6d, 0x3b, 0x14b, 0x67, 0x77, 0xe0, 0x20, 0x14b, 0x67, 0xea, 0x3b,
-0x14b, 0x67, 0x77, 0xe0, 0x20, 0x6d, 0x62, 0x254, 0x6b, 0x3b, 0x14b, 0x67, 0x77, 0xe0, 0x20, 0x6b, 0x254, 0x254, 0x3b, 0x14b,
-0x67, 0x77, 0xe0, 0x20, 0x6a, 0xf4, 0x6e, 0x3b, 0x6e, 0x3b, 0x6e, 0x3b, 0x75, 0x3b, 0x14b, 0x3b, 0x6d, 0x3b, 0x6b, 0x3b,
-0x6a, 0x3b, 0x41, 0x6c, 0x68, 0x61, 0x64, 0x69, 0x3b, 0x41, 0x74, 0x69, 0x6e, 0x6e, 0x69, 0x3b, 0x41, 0x74, 0x61, 0x6c,
-0x61, 0x61, 0x74, 0x61, 0x3b, 0x41, 0x6c, 0x61, 0x72, 0x62, 0x61, 0x3b, 0x41, 0x6c, 0x68, 0x61, 0x6d, 0x69, 0x73, 0x69,
-0x3b, 0x41, 0x6c, 0x7a, 0x75, 0x6d, 0x61, 0x3b, 0x41, 0x73, 0x69, 0x62, 0x74, 0x69, 0x3b, 0x48, 0x3b, 0x54, 0x3b, 0x54,
-0x3b, 0x4c, 0x3b, 0x4d, 0x3b, 0x5a, 0x3b, 0x53, 0x3b, 0xe9, 0x74, 0x3b, 0x6d, 0x254, 0x301, 0x73, 0x3b, 0x6b, 0x77, 0x61,
-0x3b, 0x6d, 0x75, 0x6b, 0x3b, 0x14b, 0x67, 0x69, 0x3b, 0x257, 0xf3, 0x6e, 0x3b, 0x65, 0x73, 0x61, 0x3b, 0xe9, 0x74, 0x69,
-0x3b, 0x6d, 0x254, 0x301, 0x73, 0xfa, 0x3b, 0x6b, 0x77, 0x61, 0x73, 0xfa, 0x3b, 0x6d, 0x75, 0x6b, 0x254, 0x301, 0x73, 0xfa,
-0x3b, 0x14b, 0x67, 0x69, 0x73, 0xfa, 0x3b, 0x257, 0xf3, 0x6e, 0x25b, 0x73, 0xfa, 0x3b, 0x65, 0x73, 0x61, 0x253, 0x61, 0x73,
-0xfa, 0x3b, 0x65, 0x3b, 0x6d, 0x3b, 0x6b, 0x3b, 0x6d, 0x3b, 0x14b, 0x3b, 0x257, 0x3b, 0x65, 0x3b, 0x44, 0x69, 0x6d, 0x3b,
-0x54, 0x65, 0x6e, 0x3b, 0x54, 0x61, 0x6c, 0x3b, 0x41, 0x6c, 0x61, 0x3b, 0x41, 0x72, 0x61, 0x3b, 0x41, 0x72, 0x6a, 0x3b,
-0x53, 0x69, 0x62, 0x3b, 0x44, 0x69, 0x6d, 0x61, 0x73, 0x3b, 0x54, 0x65, 0x6e, 0x65, 0x14b, 0x3b, 0x54, 0x61, 0x6c, 0x61,
-0x74, 0x61, 0x3b, 0x41, 0x6c, 0x61, 0x72, 0x62, 0x61, 0x79, 0x3b, 0x41, 0x72, 0x61, 0x6d, 0x69, 0x73, 0x61, 0x79, 0x3b,
-0x41, 0x72, 0x6a, 0x75, 0x6d, 0x61, 0x3b, 0x53, 0x69, 0x62, 0x69, 0x74, 0x69, 0x3b, 0x44, 0x3b, 0x54, 0x3b, 0x54, 0x3b,
-0x41, 0x3b, 0x41, 0x3b, 0x41, 0x3b, 0x53, 0x3b, 0x73, 0x254, 0x301, 0x6e, 0x3b, 0x6d, 0x254, 0x301, 0x6e, 0x3b, 0x73, 0x6d,
-0x62, 0x3b, 0x73, 0x6d, 0x6c, 0x3b, 0x73, 0x6d, 0x6e, 0x3b, 0x66, 0xfa, 0x6c, 0x3b, 0x73, 0xe9, 0x72, 0x3b, 0x73, 0x254,
-0x301, 0x6e, 0x64, 0x254, 0x3b, 0x6d, 0x254, 0x301, 0x6e, 0x64, 0x69, 0x3b, 0x73, 0x254, 0x301, 0x6e, 0x64, 0x254, 0x20, 0x6d,
-0x259, 0x6c, 0xfa, 0x20, 0x6d, 0x259, 0x301, 0x62, 0x25b, 0x30c, 0x3b, 0x73, 0x254, 0x301, 0x6e, 0x64, 0x254, 0x20, 0x6d, 0x259,
-0x6c, 0xfa, 0x20, 0x6d, 0x259, 0x301, 0x6c, 0x25b, 0x301, 0x3b, 0x73, 0x254, 0x301, 0x6e, 0x64, 0x254, 0x20, 0x6d, 0x259, 0x6c,
-0xfa, 0x20, 0x6d, 0x259, 0x301, 0x6e, 0x79, 0x69, 0x3b, 0x66, 0xfa, 0x6c, 0x61, 0x64, 0xe9, 0x3b, 0x73, 0xe9, 0x72, 0x61,
-0x64, 0xe9, 0x3b, 0x73, 0x3b, 0x6d, 0x3b, 0x73, 0x3b, 0x73, 0x3b, 0x73, 0x3b, 0x66, 0x3b, 0x73, 0x3b, 0x73, 0x254, 0x301,
-0x6e, 0x3b, 0x6c, 0x1dd, 0x6e, 0x3b, 0x6d, 0x61, 0x61, 0x3b, 0x6d, 0x25b, 0x6b, 0x3b, 0x6a, 0x1dd, 0x1dd, 0x3b, 0x6a, 0xfa,
-0x6d, 0x3b, 0x73, 0x61, 0x6d, 0x3b, 0x73, 0x254, 0x301, 0x6e, 0x64, 0x1dd, 0x3b, 0x6c, 0x1dd, 0x6e, 0x64, 0xed, 0x3b, 0x6d,
-0x61, 0x61, 0x64, 0xed, 0x3b, 0x6d, 0x25b, 0x6b, 0x72, 0x25b, 0x64, 0xed, 0x3b, 0x6a, 0x1dd, 0x1dd, 0x64, 0xed, 0x3b, 0x6a,
-0xfa, 0x6d, 0x62, 0xe1, 0x3b, 0x73, 0x61, 0x6d, 0x64, 0xed, 0x3b, 0x73, 0x3b, 0x6c, 0x3b, 0x6d, 0x3b, 0x6d, 0x3b, 0x6a,
-0x3b, 0x6a, 0x3b, 0x73, 0x3b, 0x53, 0x61, 0x62, 0x3b, 0x4a, 0x74, 0x74, 0x3b, 0x4a, 0x6e, 0x6e, 0x3b, 0x4a, 0x74, 0x6e,
-0x3b, 0x41, 0x72, 0x61, 0x3b, 0x49, 0x6a, 0x75, 0x3b, 0x4a, 0x6d, 0x6f, 0x3b, 0x53, 0x61, 0x62, 0x61, 0x74, 0x6f, 0x3b,
-0x4a, 0x75, 0x6d, 0x61, 0x74, 0x61, 0x74, 0x75, 0x3b, 0x4a, 0x75, 0x6d, 0x61, 0x6e, 0x6e, 0x65, 0x3b, 0x4a, 0x75, 0x6d,
-0x61, 0x74, 0x61, 0x6e, 0x6f, 0x3b, 0x41, 0x72, 0x61, 0x68, 0x61, 0x6d, 0x69, 0x73, 0x69, 0x3b, 0x49, 0x6a, 0x75, 0x6d,
-0x61, 0x61, 0x3b, 0x4a, 0x75, 0x6d, 0x61, 0x6d, 0x6f, 0x73, 0x69, 0x3b, 0x53, 0x3b, 0x4a, 0x3b, 0x4a, 0x3b, 0x4a, 0x3b,
-0x41, 0x3b, 0x49, 0x3b, 0x4a, 0x3b, 0x43, 0x79, 0x61, 0x3b, 0x43, 0x6c, 0x61, 0x3b, 0x43, 0x7a, 0x69, 0x3b, 0x43, 0x6b,
-0x6f, 0x3b, 0x43, 0x6b, 0x61, 0x3b, 0x43, 0x67, 0x61, 0x3b, 0x43, 0x7a, 0x65, 0x3b, 0x43, 0x6f, 0x6d, 0x2019, 0x79, 0x61,
-0x6b, 0x6b, 0x65, 0x3b, 0x43, 0x6f, 0x6d, 0x6c, 0x61, 0x61, 0x257, 0x69, 0x69, 0x3b, 0x43, 0x6f, 0x6d, 0x7a, 0x79, 0x69,
-0x69, 0x257, 0x69, 0x69, 0x3b, 0x43, 0x6f, 0x6d, 0x6b, 0x6f, 0x6c, 0x6c, 0x65, 0x3b, 0x43, 0x6f, 0x6d, 0x6b, 0x61, 0x6c,
-0x64, 0x1dd, 0x253, 0x6c, 0x69, 0x69, 0x3b, 0x43, 0x6f, 0x6d, 0x67, 0x61, 0x69, 0x73, 0x75, 0x75, 0x3b, 0x43, 0x6f, 0x6d,
-0x7a, 0x79, 0x65, 0x253, 0x73, 0x75, 0x75, 0x3b, 0x59, 0x3b, 0x4c, 0x3b, 0x5a, 0x3b, 0x4f, 0x3b, 0x41, 0x3b, 0x47, 0x3b,
-0x45, 0x3b, 0x73, 0x254, 0x301, 0x6e, 0x3b, 0x6d, 0x254, 0x301, 0x6e, 0x3b, 0x73, 0x6d, 0x62, 0x3b, 0x73, 0x6d, 0x6c, 0x3b,
-0x73, 0x6d, 0x6e, 0x3b, 0x6d, 0x62, 0x73, 0x3b, 0x73, 0x61, 0x73, 0x3b, 0x73, 0x254, 0x301, 0x6e, 0x64, 0x254, 0x3b, 0x6d,
-0x254, 0x301, 0x6e, 0x64, 0x254, 0x3b, 0x73, 0x254, 0x301, 0x6e, 0x64, 0x254, 0x20, 0x6d, 0x61, 0x66, 0xfa, 0x20, 0x6d, 0xe1,
-0x62, 0x61, 0x3b, 0x73, 0x254, 0x301, 0x6e, 0x64, 0x254, 0x20, 0x6d, 0x61, 0x66, 0xfa, 0x20, 0x6d, 0xe1, 0x6c, 0x61, 0x6c,
-0x3b, 0x73, 0x254, 0x301, 0x6e, 0x64, 0x254, 0x20, 0x6d, 0x61, 0x66, 0xfa, 0x20, 0x6d, 0xe1, 0x6e, 0x61, 0x3b, 0x6d, 0x61,
-0x62, 0xe1, 0x67, 0xe1, 0x20, 0x6d, 0xe1, 0x20, 0x73, 0x75, 0x6b, 0x75, 0x6c, 0x3b, 0x73, 0xe1, 0x73, 0x61, 0x64, 0x69,
-0x3b, 0x73, 0x3b, 0x6d, 0x3b, 0x73, 0x3b, 0x73, 0x3b, 0x73, 0x3b, 0x6d, 0x3b, 0x73, 0x3b, 0x43, 0xe4, 0x14b, 0x3b, 0x4a,
-0x69, 0x65, 0x63, 0x3b, 0x52, 0x25b, 0x77, 0x3b, 0x44, 0x69, 0x254, 0x331, 0x6b, 0x3b, 0x14a, 0x75, 0x61, 0x61, 0x6e, 0x3b,
-0x44, 0x68, 0x69, 0x65, 0x65, 0x63, 0x3b, 0x42, 0xe4, 0x6b, 0x25b, 0x6c, 0x3b, 0x43, 0xe4, 0x14b, 0x20, 0x6b, 0x75, 0x254,
-0x74, 0x68, 0x3b, 0x4a, 0x69, 0x65, 0x63, 0x20, 0x6c, 0x61, 0x331, 0x74, 0x3b, 0x52, 0x25b, 0x77, 0x20, 0x6c, 0xe4, 0x74,
-0x6e, 0x69, 0x3b, 0x44, 0x69, 0x254, 0x331, 0x6b, 0x20, 0x6c, 0xe4, 0x74, 0x6e, 0x69, 0x3b, 0x14a, 0x75, 0x61, 0x61, 0x6e,
-0x20, 0x6c, 0xe4, 0x74, 0x6e, 0x69, 0x3b, 0x44, 0x68, 0x69, 0x65, 0x65, 0x63, 0x20, 0x6c, 0xe4, 0x74, 0x6e, 0x69, 0x3b,
-0x42, 0xe4, 0x6b, 0x25b, 0x6c, 0x20, 0x6c, 0xe4, 0x74, 0x6e, 0x69, 0x3b, 0x43, 0x3b, 0x4a, 0x3b, 0x52, 0x3b, 0x44, 0x3b,
-0x14a, 0x3b, 0x44, 0x3b, 0x42, 0x3b, 0x431, 0x441, 0x3b, 0x431, 0x43d, 0x3b, 0x43e, 0x43f, 0x3b, 0x441, 0x44d, 0x3b, 0x447, 0x43f,
-0x3b, 0x431, 0x44d, 0x3b, 0x441, 0x431, 0x3b, 0x431, 0x430, 0x441, 0x43a, 0x44b, 0x4bb, 0x44b, 0x430, 0x43d, 0x43d, 0x44c, 0x430, 0x3b,
-0x431, 0x44d, 0x43d, 0x438, 0x434, 0x438, 0x44d, 0x43d, 0x43d, 0x44c, 0x438, 0x43a, 0x3b, 0x43e, 0x43f, 0x442, 0x443, 0x43e, 0x440, 0x443,
-0x43d, 0x43d, 0x44c, 0x443, 0x43a, 0x3b, 0x441, 0x44d, 0x440, 0x44d, 0x434, 0x44d, 0x3b, 0x447, 0x44d, 0x43f, 0x43f, 0x438, 0x44d, 0x440,
-0x3b, 0x411, 0x44d, 0x44d, 0x442, 0x438, 0x4a5, 0x441, 0x44d, 0x3b, 0x441, 0x443, 0x431, 0x443, 0x43e, 0x442, 0x430, 0x3b, 0x411, 0x3b,
-0x411, 0x3b, 0x41e, 0x3b, 0x421, 0x3b, 0x427, 0x3b, 0x411, 0x3b, 0x421, 0x3b, 0x4d, 0x75, 0x6c, 0x3b, 0x4a, 0x74, 0x74, 0x3b,
-0x4a, 0x6e, 0x6e, 0x3b, 0x4a, 0x74, 0x6e, 0x3b, 0x41, 0x6c, 0x68, 0x3b, 0x49, 0x6a, 0x75, 0x3b, 0x4a, 0x6d, 0x6f, 0x3b,
+0x61, 0x3b, 0x41, 0x6c, 0x61, 0x72, 0x62, 0x61, 0x3b, 0x41, 0x6c, 0x68, 0x61, 0x6d, 0x69, 0x73, 0x69, 0x3b, 0x41, 0x6c,
+0x7a, 0x75, 0x6d, 0x61, 0x3b, 0x41, 0x73, 0x69, 0x62, 0x74, 0x69, 0x48, 0x3b, 0x54, 0x3b, 0x54, 0x3b, 0x4c, 0x3b, 0x4d,
+0x3b, 0x5a, 0x3b, 0x53, 0xe9, 0x74, 0x69, 0x3b, 0x6d, 0x254, 0x301, 0x73, 0xfa, 0x3b, 0x6b, 0x77, 0x61, 0x73, 0xfa, 0x3b,
+0x6d, 0x75, 0x6b, 0x254, 0x301, 0x73, 0xfa, 0x3b, 0x14b, 0x67, 0x69, 0x73, 0xfa, 0x3b, 0x257, 0xf3, 0x6e, 0x25b, 0x73, 0xfa,
+0x3b, 0x65, 0x73, 0x61, 0x253, 0x61, 0x73, 0xfa, 0xe9, 0x74, 0x3b, 0x6d, 0x254, 0x301, 0x73, 0x3b, 0x6b, 0x77, 0x61, 0x3b,
+0x6d, 0x75, 0x6b, 0x3b, 0x14b, 0x67, 0x69, 0x3b, 0x257, 0xf3, 0x6e, 0x3b, 0x65, 0x73, 0x61, 0x65, 0x3b, 0x6d, 0x3b, 0x6b,
+0x3b, 0x6d, 0x3b, 0x14b, 0x3b, 0x257, 0x3b, 0x65, 0x44, 0x69, 0x6d, 0x61, 0x73, 0x3b, 0x54, 0x65, 0x6e, 0x65, 0x14b, 0x3b,
+0x54, 0x61, 0x6c, 0x61, 0x74, 0x61, 0x3b, 0x41, 0x6c, 0x61, 0x72, 0x62, 0x61, 0x79, 0x3b, 0x41, 0x72, 0x61, 0x6d, 0x69,
+0x73, 0x61, 0x79, 0x3b, 0x41, 0x72, 0x6a, 0x75, 0x6d, 0x61, 0x3b, 0x53, 0x69, 0x62, 0x69, 0x74, 0x69, 0x44, 0x69, 0x6d,
+0x3b, 0x54, 0x65, 0x6e, 0x3b, 0x54, 0x61, 0x6c, 0x3b, 0x41, 0x6c, 0x61, 0x3b, 0x41, 0x72, 0x61, 0x3b, 0x41, 0x72, 0x6a,
+0x3b, 0x53, 0x69, 0x62, 0x44, 0x3b, 0x54, 0x3b, 0x54, 0x3b, 0x41, 0x3b, 0x41, 0x3b, 0x41, 0x3b, 0x53, 0x73, 0x254, 0x301,
+0x6e, 0x64, 0x254, 0x3b, 0x6d, 0x254, 0x301, 0x6e, 0x64, 0x69, 0x3b, 0x73, 0x254, 0x301, 0x6e, 0x64, 0x254, 0x20, 0x6d, 0x259,
+0x6c, 0xfa, 0x20, 0x6d, 0x259, 0x301, 0x62, 0x25b, 0x30c, 0x3b, 0x73, 0x254, 0x301, 0x6e, 0x64, 0x254, 0x20, 0x6d, 0x259, 0x6c,
+0xfa, 0x20, 0x6d, 0x259, 0x301, 0x6c, 0x25b, 0x301, 0x3b, 0x73, 0x254, 0x301, 0x6e, 0x64, 0x254, 0x20, 0x6d, 0x259, 0x6c, 0xfa,
+0x20, 0x6d, 0x259, 0x301, 0x6e, 0x79, 0x69, 0x3b, 0x66, 0xfa, 0x6c, 0x61, 0x64, 0xe9, 0x3b, 0x73, 0xe9, 0x72, 0x61, 0x64,
+0xe9, 0x73, 0x254, 0x301, 0x6e, 0x3b, 0x6d, 0x254, 0x301, 0x6e, 0x3b, 0x73, 0x6d, 0x62, 0x3b, 0x73, 0x6d, 0x6c, 0x3b, 0x73,
+0x6d, 0x6e, 0x3b, 0x66, 0xfa, 0x6c, 0x3b, 0x73, 0xe9, 0x72, 0x73, 0x3b, 0x6d, 0x3b, 0x73, 0x3b, 0x73, 0x3b, 0x73, 0x3b,
+0x66, 0x3b, 0x73, 0x73, 0x254, 0x301, 0x6e, 0x64, 0x1dd, 0x3b, 0x6c, 0x1dd, 0x6e, 0x64, 0xed, 0x3b, 0x6d, 0x61, 0x61, 0x64,
+0xed, 0x3b, 0x6d, 0x25b, 0x6b, 0x72, 0x25b, 0x64, 0xed, 0x3b, 0x6a, 0x1dd, 0x1dd, 0x64, 0xed, 0x3b, 0x6a, 0xfa, 0x6d, 0x62,
+0xe1, 0x3b, 0x73, 0x61, 0x6d, 0x64, 0xed, 0x73, 0x254, 0x301, 0x6e, 0x3b, 0x6c, 0x1dd, 0x6e, 0x3b, 0x6d, 0x61, 0x61, 0x3b,
+0x6d, 0x25b, 0x6b, 0x3b, 0x6a, 0x1dd, 0x1dd, 0x3b, 0x6a, 0xfa, 0x6d, 0x3b, 0x73, 0x61, 0x6d, 0x73, 0x3b, 0x6c, 0x3b, 0x6d,
+0x3b, 0x6d, 0x3b, 0x6a, 0x3b, 0x6a, 0x3b, 0x73, 0x53, 0x61, 0x62, 0x61, 0x74, 0x6f, 0x3b, 0x4a, 0x75, 0x6d, 0x61, 0x74,
+0x61, 0x74, 0x75, 0x3b, 0x4a, 0x75, 0x6d, 0x61, 0x6e, 0x6e, 0x65, 0x3b, 0x4a, 0x75, 0x6d, 0x61, 0x74, 0x61, 0x6e, 0x6f,
+0x3b, 0x41, 0x72, 0x61, 0x68, 0x61, 0x6d, 0x69, 0x73, 0x69, 0x3b, 0x49, 0x6a, 0x75, 0x6d, 0x61, 0x61, 0x3b, 0x4a, 0x75,
+0x6d, 0x61, 0x6d, 0x6f, 0x73, 0x69, 0x53, 0x61, 0x62, 0x3b, 0x4a, 0x74, 0x74, 0x3b, 0x4a, 0x6e, 0x6e, 0x3b, 0x4a, 0x74,
+0x6e, 0x3b, 0x41, 0x72, 0x61, 0x3b, 0x49, 0x6a, 0x75, 0x3b, 0x4a, 0x6d, 0x6f, 0x53, 0x3b, 0x4a, 0x3b, 0x4a, 0x3b, 0x4a,
+0x3b, 0x41, 0x3b, 0x49, 0x3b, 0x4a, 0x43, 0x6f, 0x6d, 0x2019, 0x79, 0x61, 0x6b, 0x6b, 0x65, 0x3b, 0x43, 0x6f, 0x6d, 0x6c,
+0x61, 0x61, 0x257, 0x69, 0x69, 0x3b, 0x43, 0x6f, 0x6d, 0x7a, 0x79, 0x69, 0x69, 0x257, 0x69, 0x69, 0x3b, 0x43, 0x6f, 0x6d,
+0x6b, 0x6f, 0x6c, 0x6c, 0x65, 0x3b, 0x43, 0x6f, 0x6d, 0x6b, 0x61, 0x6c, 0x64, 0x1dd, 0x253, 0x6c, 0x69, 0x69, 0x3b, 0x43,
+0x6f, 0x6d, 0x67, 0x61, 0x69, 0x73, 0x75, 0x75, 0x3b, 0x43, 0x6f, 0x6d, 0x7a, 0x79, 0x65, 0x253, 0x73, 0x75, 0x75, 0x43,
+0x79, 0x61, 0x3b, 0x43, 0x6c, 0x61, 0x3b, 0x43, 0x7a, 0x69, 0x3b, 0x43, 0x6b, 0x6f, 0x3b, 0x43, 0x6b, 0x61, 0x3b, 0x43,
+0x67, 0x61, 0x3b, 0x43, 0x7a, 0x65, 0x59, 0x3b, 0x4c, 0x3b, 0x5a, 0x3b, 0x4f, 0x3b, 0x41, 0x3b, 0x47, 0x3b, 0x45, 0x73,
+0x254, 0x301, 0x6e, 0x64, 0x254, 0x3b, 0x6d, 0x254, 0x301, 0x6e, 0x64, 0x254, 0x3b, 0x73, 0x254, 0x301, 0x6e, 0x64, 0x254, 0x20,
+0x6d, 0x61, 0x66, 0xfa, 0x20, 0x6d, 0xe1, 0x62, 0x61, 0x3b, 0x73, 0x254, 0x301, 0x6e, 0x64, 0x254, 0x20, 0x6d, 0x61, 0x66,
+0xfa, 0x20, 0x6d, 0xe1, 0x6c, 0x61, 0x6c, 0x3b, 0x73, 0x254, 0x301, 0x6e, 0x64, 0x254, 0x20, 0x6d, 0x61, 0x66, 0xfa, 0x20,
+0x6d, 0xe1, 0x6e, 0x61, 0x3b, 0x6d, 0x61, 0x62, 0xe1, 0x67, 0xe1, 0x20, 0x6d, 0xe1, 0x20, 0x73, 0x75, 0x6b, 0x75, 0x6c,
+0x3b, 0x73, 0xe1, 0x73, 0x61, 0x64, 0x69, 0x73, 0x254, 0x301, 0x6e, 0x3b, 0x6d, 0x254, 0x301, 0x6e, 0x3b, 0x73, 0x6d, 0x62,
+0x3b, 0x73, 0x6d, 0x6c, 0x3b, 0x73, 0x6d, 0x6e, 0x3b, 0x6d, 0x62, 0x73, 0x3b, 0x73, 0x61, 0x73, 0x73, 0x3b, 0x6d, 0x3b,
+0x73, 0x3b, 0x73, 0x3b, 0x73, 0x3b, 0x6d, 0x3b, 0x73, 0x43, 0xe4, 0x14b, 0x20, 0x6b, 0x75, 0x254, 0x74, 0x68, 0x3b, 0x4a,
+0x69, 0x65, 0x63, 0x20, 0x6c, 0x61, 0x331, 0x74, 0x3b, 0x52, 0x25b, 0x77, 0x20, 0x6c, 0xe4, 0x74, 0x6e, 0x69, 0x3b, 0x44,
+0x69, 0x254, 0x331, 0x6b, 0x20, 0x6c, 0xe4, 0x74, 0x6e, 0x69, 0x3b, 0x14a, 0x75, 0x61, 0x61, 0x6e, 0x20, 0x6c, 0xe4, 0x74,
+0x6e, 0x69, 0x3b, 0x44, 0x68, 0x69, 0x65, 0x65, 0x63, 0x20, 0x6c, 0xe4, 0x74, 0x6e, 0x69, 0x3b, 0x42, 0xe4, 0x6b, 0x25b,
+0x6c, 0x20, 0x6c, 0xe4, 0x74, 0x6e, 0x69, 0x43, 0xe4, 0x14b, 0x3b, 0x4a, 0x69, 0x65, 0x63, 0x3b, 0x52, 0x25b, 0x77, 0x3b,
+0x44, 0x69, 0x254, 0x331, 0x6b, 0x3b, 0x14a, 0x75, 0x61, 0x61, 0x6e, 0x3b, 0x44, 0x68, 0x69, 0x65, 0x65, 0x63, 0x3b, 0x42,
+0xe4, 0x6b, 0x25b, 0x6c, 0x43, 0x3b, 0x4a, 0x3b, 0x52, 0x3b, 0x44, 0x3b, 0x14a, 0x3b, 0x44, 0x3b, 0x42, 0x431, 0x430, 0x441,
+0x43a, 0x44b, 0x4bb, 0x44b, 0x430, 0x43d, 0x43d, 0x44c, 0x430, 0x3b, 0x431, 0x44d, 0x43d, 0x438, 0x434, 0x438, 0x44d, 0x43d, 0x43d, 0x44c,
+0x438, 0x43a, 0x3b, 0x43e, 0x43f, 0x442, 0x443, 0x43e, 0x440, 0x443, 0x43d, 0x43d, 0x44c, 0x443, 0x43a, 0x3b, 0x441, 0x44d, 0x440, 0x44d,
+0x434, 0x44d, 0x3b, 0x447, 0x44d, 0x43f, 0x43f, 0x438, 0x44d, 0x440, 0x3b, 0x411, 0x44d, 0x44d, 0x442, 0x438, 0x4a5, 0x441, 0x44d, 0x3b,
+0x441, 0x443, 0x431, 0x443, 0x43e, 0x442, 0x430, 0x431, 0x441, 0x3b, 0x431, 0x43d, 0x3b, 0x43e, 0x43f, 0x3b, 0x441, 0x44d, 0x3b, 0x447,
+0x43f, 0x3b, 0x431, 0x44d, 0x3b, 0x441, 0x431, 0x411, 0x3b, 0x411, 0x3b, 0x41e, 0x3b, 0x421, 0x3b, 0x427, 0x3b, 0x411, 0x3b, 0x421,
 0x4d, 0x75, 0x6c, 0x75, 0x6e, 0x67, 0x75, 0x3b, 0x4a, 0x75, 0x6d, 0x61, 0x74, 0x61, 0x74, 0x75, 0x3b, 0x4a, 0x75, 0x6d,
 0x61, 0x6e, 0x6e, 0x65, 0x3b, 0x4a, 0x75, 0x6d, 0x61, 0x74, 0x61, 0x6e, 0x6f, 0x3b, 0x41, 0x6c, 0x61, 0x68, 0x61, 0x6d,
-0x69, 0x73, 0x69, 0x3b, 0x49, 0x6a, 0x75, 0x6d, 0x61, 0x61, 0x3b, 0x4a, 0x75, 0x6d, 0x61, 0x6d, 0x6f, 0x73, 0x69, 0x3b,
-0x4d, 0x3b, 0x4a, 0x3b, 0x4a, 0x3b, 0x4a, 0x3b, 0x41, 0x3b, 0x49, 0x3b, 0x4a, 0x3b, 0xa55e, 0xa54c, 0xa535, 0x3b, 0xa5f3, 0xa5e1,
-0xa609, 0x3b, 0xa55a, 0xa55e, 0xa55a, 0x3b, 0xa549, 0xa55e, 0xa552, 0x3b, 0xa549, 0xa524, 0xa546, 0xa562, 0x3b, 0xa549, 0xa524, 0xa540, 0xa56e, 0x3b,
-0xa53b, 0xa52c, 0xa533, 0x3b, 0x6c, 0x61, 0x68, 0x61, 0x64, 0x69, 0x3b, 0x74, 0x25b, 0x25b, 0x6e, 0x25b, 0x25b, 0x3b, 0x74, 0x61,
-0x6c, 0x61, 0x74, 0x61, 0x3b, 0x61, 0x6c, 0x61, 0x62, 0x61, 0x3b, 0x61, 0x69, 0x6d, 0x69, 0x73, 0x61, 0x3b, 0x61, 0x69,
-0x6a, 0x69, 0x6d, 0x61, 0x3b, 0x73, 0x69, 0x253, 0x69, 0x74, 0x69, 0x3b, 0x53, 0x75, 0x6e, 0x3b, 0x4d, 0xe4, 0x6e, 0x3b,
-0x5a, 0x69, 0x161, 0x3b, 0x4d, 0x69, 0x74, 0x3b, 0x46, 0x72, 0xf3, 0x3b, 0x46, 0x72, 0x69, 0x3b, 0x53, 0x61, 0x6d, 0x3b,
-0x53, 0x75, 0x6e, 0x6e, 0x74, 0x61, 0x67, 0x3b, 0x4d, 0xe4, 0x6e, 0x74, 0x61, 0x67, 0x3b, 0x5a, 0x69, 0x161, 0x74, 0x61,
-0x67, 0x3b, 0x4d, 0x69, 0x74, 0x74, 0x77, 0x75, 0x10d, 0x3b, 0x46, 0x72, 0xf3, 0x6e, 0x74, 0x61, 0x67, 0x3b, 0x46, 0x72,
-0x69, 0x74, 0x61, 0x67, 0x3b, 0x53, 0x61, 0x6d, 0x161, 0x74, 0x61, 0x67, 0x3b, 0x53, 0x3b, 0x4d, 0x3b, 0x5a, 0x3b, 0x4d,
-0x3b, 0x46, 0x3b, 0x46, 0x3b, 0x53, 0x3b, 0x73, 0x64, 0x3b, 0x6d, 0x64, 0x3b, 0x6d, 0x77, 0x3b, 0x65, 0x74, 0x3b, 0x6b,
-0x6c, 0x3b, 0x66, 0x6c, 0x3b, 0x73, 0x73, 0x3b, 0x73, 0x254, 0x301, 0x6e, 0x64, 0x69, 0x25b, 0x3b, 0x6d, 0xf3, 0x6e, 0x64,
-0x69, 0x65, 0x3b, 0x6d, 0x75, 0xe1, 0x6e, 0x79, 0xe1, 0x14b, 0x6d, 0xf3, 0x6e, 0x64, 0x69, 0x65, 0x3b, 0x6d, 0x65, 0x74,
-0xfa, 0x6b, 0x70, 0xed, 0xe1, 0x70, 0x25b, 0x3b, 0x6b, 0xfa, 0x70, 0xe9, 0x6c, 0x69, 0x6d, 0x65, 0x74, 0xfa, 0x6b, 0x70,
-0x69, 0x61, 0x70, 0x25b, 0x3b, 0x66, 0x65, 0x6c, 0xe9, 0x74, 0x65, 0x3b, 0x73, 0xe9, 0x73, 0x65, 0x6c, 0xe9, 0x3b, 0x73,
-0x3b, 0x6d, 0x3b, 0x6d, 0x3b, 0x65, 0x3b, 0x6b, 0x3b, 0x66, 0x3b, 0x73, 0x3b, 0x64, 0x6f, 0x6d, 0x3b, 0x6c, 0x6c, 0x75,
-0x3b, 0x6d, 0x61, 0x72, 0x3b, 0x6d, 0x69, 0xe9, 0x3b, 0x78, 0x75, 0x65, 0x3b, 0x76, 0x69, 0x65, 0x3b, 0x73, 0xe1, 0x62,
-0x3b, 0x64, 0x6f, 0x6d, 0x69, 0x6e, 0x67, 0x75, 0x3b, 0x6c, 0x6c, 0x75, 0x6e, 0x65, 0x73, 0x3b, 0x6d, 0x61, 0x72, 0x74,
-0x65, 0x73, 0x3b, 0x6d, 0x69, 0xe9, 0x72, 0x63, 0x6f, 0x6c, 0x65, 0x73, 0x3b, 0x78, 0x75, 0x65, 0x76, 0x65, 0x73, 0x3b,
-0x76, 0x69, 0x65, 0x6e, 0x72, 0x65, 0x73, 0x3b, 0x73, 0xe1, 0x62, 0x61, 0x64, 0x75, 0x3b, 0x53, 0x254, 0x301, 0x6e, 0x64,
-0x69, 0x3b, 0x4d, 0x254, 0x301, 0x6e, 0x64, 0x69, 0x3b, 0xc1, 0x70, 0x74, 0x61, 0x20, 0x4d, 0x254, 0x301, 0x6e, 0x64, 0x69,
-0x3b, 0x57, 0x25b, 0x301, 0x6e, 0x25b, 0x73, 0x25b, 0x64, 0x25b, 0x3b, 0x54, 0x254, 0x301, 0x73, 0x25b, 0x64, 0x25b, 0x3b, 0x46,
-0x25b, 0x6c, 0xe2, 0x79, 0x25b, 0x64, 0x25b, 0x3b, 0x53, 0xe1, 0x73, 0x69, 0x64, 0x25b, 0x3b, 0x53, 0x254, 0x301, 0x3b, 0x4d,
-0x254, 0x301, 0x3b, 0xc1, 0x4d, 0x3b, 0x57, 0x25b, 0x301, 0x3b, 0x54, 0x254, 0x301, 0x3b, 0x46, 0x25b, 0x3b, 0x53, 0xe1, 0x3b,
-0x73, 0x254, 0x6e, 0x64, 0x69, 0x3b, 0x6c, 0x75, 0x6e, 0x64, 0x69, 0x3b, 0x6d, 0x61, 0x72, 0x64, 0x69, 0x3b, 0x6d, 0x25b,
-0x72, 0x6b, 0x25b, 0x72, 0x25b, 0x64, 0x69, 0x3b, 0x79, 0x65, 0x64, 0x69, 0x3b, 0x76, 0x61, 0x14b, 0x64, 0x25b, 0x72, 0x25b,
-0x64, 0x69, 0x3b, 0x6d, 0x254, 0x6e, 0x254, 0x20, 0x73, 0x254, 0x6e, 0x64, 0x69, 0x3b, 0x73, 0x6f, 0x3b, 0x6c, 0x75, 0x3b,
-0x6d, 0x61, 0x3b, 0x6d, 0x25b, 0x3b, 0x79, 0x65, 0x3b, 0x76, 0x61, 0x3b, 0x6d, 0x73, 0x3b, 0x41, 0x6e, 0x65, 0x67, 0x20,
-0x31, 0x3b, 0x41, 0x6e, 0x65, 0x67, 0x20, 0x32, 0x3b, 0x41, 0x6e, 0x65, 0x67, 0x20, 0x33, 0x3b, 0x41, 0x6e, 0x65, 0x67,
-0x20, 0x34, 0x3b, 0x41, 0x6e, 0x65, 0x67, 0x20, 0x35, 0x3b, 0x41, 0x6e, 0x65, 0x67, 0x20, 0x36, 0x3b, 0x41, 0x6e, 0x65,
-0x67, 0x20, 0x37, 0x3b, 0x41, 0x31, 0x3b, 0x41, 0x32, 0x3b, 0x41, 0x33, 0x3b, 0x41, 0x34, 0x3b, 0x41, 0x35, 0x3b, 0x41,
-0x36, 0x3b, 0x41, 0x37, 0x3b, 0x6c, 0x79, 0x25b, 0x2bc, 0x25b, 0x301, 0x20, 0x73, 0x1e85, 0xed, 0x14b, 0x74, 0xe8, 0x3b, 0x6d,
-0x76, 0x66, 0xf2, 0x20, 0x6c, 0x79, 0x25b, 0x30c, 0x2bc, 0x3b, 0x6d, 0x62, 0x254, 0x301, 0x254, 0x6e, 0x74, 0xe8, 0x20, 0x6d,
-0x76, 0x66, 0xf2, 0x20, 0x6c, 0x79, 0x25b, 0x30c, 0x2bc, 0x3b, 0x74, 0x73, 0xe8, 0x74, 0x73, 0x25b, 0x300, 0x25b, 0x20, 0x6c,
-0x79, 0x25b, 0x30c, 0x2bc, 0x3b, 0x6d, 0x62, 0x254, 0x301, 0x254, 0x6e, 0x74, 0xe8, 0x20, 0x74, 0x73, 0x65, 0x74, 0x73, 0x25b,
-0x300, 0x25b, 0x20, 0x6c, 0x79, 0x25b, 0x30c, 0x2bc, 0x3b, 0x6d, 0x76, 0x66, 0xf2, 0x20, 0x6d, 0xe0, 0x67, 0x61, 0x20, 0x6c,
-0x79, 0x25b, 0x30c, 0x2bc, 0x3b, 0x6d, 0xe0, 0x67, 0x61, 0x20, 0x6c, 0x79, 0x25b, 0x30c, 0x2bc, 0x3b, 0x41, 0x14b, 0x70, 0xe9,
-0x74, 0x75, 0x77, 0x61, 0x6b, 0x21f, 0x61, 0x14b, 0x3b, 0x41, 0x14b, 0x70, 0xe9, 0x74, 0x75, 0x77, 0x61, 0x14b, 0x17e, 0x69,
-0x3b, 0x41, 0x14b, 0x70, 0xe9, 0x74, 0x75, 0x6e, 0x75, 0x14b, 0x70, 0x61, 0x3b, 0x41, 0x14b, 0x70, 0xe9, 0x74, 0x75, 0x79,
-0x61, 0x6d, 0x6e, 0x69, 0x3b, 0x41, 0x14b, 0x70, 0xe9, 0x74, 0x75, 0x74, 0x6f, 0x70, 0x61, 0x3b, 0x41, 0x14b, 0x70, 0xe9,
-0x74, 0x75, 0x7a, 0x61, 0x70, 0x74, 0x61, 0x14b, 0x3b, 0x4f, 0x77, 0xe1, 0x14b, 0x67, 0x79, 0x75, 0x17e, 0x61, 0x17e, 0x61,
-0x70, 0x69, 0x3b, 0x41, 0x3b, 0x57, 0x3b, 0x4e, 0x3b, 0x59, 0x3b, 0x54, 0x3b, 0x5a, 0x3b, 0x4f, 0x3b, 0x2d30, 0x2d59, 0x2d30,
-0x2d4e, 0x2d30, 0x2d59, 0x3b, 0x2d30, 0x2d62, 0x2d4f, 0x2d30, 0x2d59, 0x3b, 0x2d30, 0x2d59, 0x2d49, 0x2d4f, 0x2d30, 0x2d59, 0x3b, 0x2d30, 0x2d3d, 0x2d55,
-0x2d30, 0x2d59, 0x3b, 0x2d30, 0x2d3d, 0x2d61, 0x2d30, 0x2d59, 0x3b, 0x2d30, 0x2d59, 0x2d49, 0x2d4e, 0x2d61, 0x2d30, 0x2d59, 0x3b, 0x2d30, 0x2d59, 0x2d49,
-0x2d39, 0x2d62, 0x2d30, 0x2d59, 0x3b, 0x6cc, 0x6d5, 0x6a9, 0x634, 0x6d5, 0x645, 0x645, 0x6d5, 0x3b, 0x62f, 0x648, 0x648, 0x634, 0x6d5, 0x645,
-0x645, 0x6d5, 0x3b, 0x633, 0x6ce, 0x634, 0x6d5, 0x645, 0x645, 0x6d5, 0x3b, 0x686, 0x648, 0x627, 0x631, 0x634, 0x6d5, 0x645, 0x645, 0x6d5,
-0x3b, 0x67e, 0x6ce, 0x646, 0x62c, 0x634, 0x6d5, 0x645, 0x645, 0x6d5, 0x3b, 0x6be, 0x6d5, 0x6cc, 0x646, 0x6cc, 0x3b, 0x634, 0x6d5, 0x645,
-0x645, 0x6d5, 0x3b, 0x6cc, 0x3b, 0x62f, 0x3b, 0x633, 0x3b, 0x686, 0x3b, 0x67e, 0x3b, 0x6be, 0x3b, 0x634, 0x3b, 0x6e, 0x6a, 0x65,
-0x3b, 0x70, 0xf3, 0x6e, 0x3b, 0x77, 0x61, 0x142, 0x3b, 0x73, 0x72, 0x6a, 0x3b, 0x73, 0x74, 0x77, 0x3b, 0x70, 0x11b, 0x74,
-0x3b, 0x73, 0x6f, 0x62, 0x3b, 0x6e, 0x6a, 0x65, 0x17a, 0x65, 0x6c, 0x61, 0x3b, 0x70, 0xf3, 0x6e, 0x6a, 0x65, 0x17a, 0x65,
-0x6c, 0x65, 0x3b, 0x77, 0x61, 0x142, 0x74, 0x6f, 0x72, 0x61, 0x3b, 0x73, 0x72, 0x6a, 0x6f, 0x64, 0x61, 0x3b, 0x73, 0x74,
-0x77, 0xf3, 0x72, 0x74, 0x6b, 0x3b, 0x70, 0x11b, 0x74, 0x6b, 0x3b, 0x73, 0x6f, 0x62, 0x6f, 0x74, 0x61, 0x3b, 0x6e, 0x3b,
-0x70, 0x3b, 0x77, 0x3b, 0x73, 0x3b, 0x73, 0x3b, 0x70, 0x3b, 0x73, 0x3b, 0x6e, 0x6a, 0x65, 0x3b, 0x70, 0xf3, 0x6e, 0x3b,
-0x77, 0x75, 0x74, 0x3b, 0x73, 0x72, 0x6a, 0x3b, 0x161, 0x74, 0x77, 0x3b, 0x70, 0x6a, 0x61, 0x3b, 0x73, 0x6f, 0x62, 0x3b,
+0x69, 0x73, 0x69, 0x3b, 0x49, 0x6a, 0x75, 0x6d, 0x61, 0x61, 0x3b, 0x4a, 0x75, 0x6d, 0x61, 0x6d, 0x6f, 0x73, 0x69, 0x4d,
+0x75, 0x6c, 0x3b, 0x4a, 0x74, 0x74, 0x3b, 0x4a, 0x6e, 0x6e, 0x3b, 0x4a, 0x74, 0x6e, 0x3b, 0x41, 0x6c, 0x68, 0x3b, 0x49,
+0x6a, 0x75, 0x3b, 0x4a, 0x6d, 0x6f, 0x4d, 0x3b, 0x4a, 0x3b, 0x4a, 0x3b, 0x4a, 0x3b, 0x41, 0x3b, 0x49, 0x3b, 0x4a, 0xa55e,
+0xa54c, 0xa535, 0x3b, 0xa5f3, 0xa5e1, 0xa609, 0x3b, 0xa55a, 0xa55e, 0xa55a, 0x3b, 0xa549, 0xa55e, 0xa552, 0x3b, 0xa549, 0xa524, 0xa546, 0xa562, 0x3b,
+0xa549, 0xa524, 0xa540, 0xa56e, 0x3b, 0xa53b, 0xa52c, 0xa533, 0x6c, 0x61, 0x68, 0x61, 0x64, 0x69, 0x3b, 0x74, 0x25b, 0x25b, 0x6e, 0x25b,
+0x25b, 0x3b, 0x74, 0x61, 0x6c, 0x61, 0x74, 0x61, 0x3b, 0x61, 0x6c, 0x61, 0x62, 0x61, 0x3b, 0x61, 0x69, 0x6d, 0x69, 0x73,
+0x61, 0x3b, 0x61, 0x69, 0x6a, 0x69, 0x6d, 0x61, 0x3b, 0x73, 0x69, 0x253, 0x69, 0x74, 0x69, 0x53, 0x75, 0x6e, 0x6e, 0x74,
+0x61, 0x67, 0x3b, 0x4d, 0xe4, 0x6e, 0x74, 0x61, 0x67, 0x3b, 0x5a, 0x69, 0x161, 0x74, 0x61, 0x67, 0x3b, 0x4d, 0x69, 0x74,
+0x74, 0x77, 0x75, 0x10d, 0x3b, 0x46, 0x72, 0xf3, 0x6e, 0x74, 0x61, 0x67, 0x3b, 0x46, 0x72, 0x69, 0x74, 0x61, 0x67, 0x3b,
+0x53, 0x61, 0x6d, 0x161, 0x74, 0x61, 0x67, 0x53, 0x75, 0x6e, 0x3b, 0x4d, 0xe4, 0x6e, 0x3b, 0x5a, 0x69, 0x161, 0x3b, 0x4d,
+0x69, 0x74, 0x3b, 0x46, 0x72, 0xf3, 0x3b, 0x46, 0x72, 0x69, 0x3b, 0x53, 0x61, 0x6d, 0x53, 0x3b, 0x4d, 0x3b, 0x5a, 0x3b,
+0x4d, 0x3b, 0x46, 0x3b, 0x46, 0x3b, 0x53, 0x73, 0x254, 0x301, 0x6e, 0x64, 0x69, 0x25b, 0x3b, 0x6d, 0xf3, 0x6e, 0x64, 0x69,
+0x65, 0x3b, 0x6d, 0x75, 0xe1, 0x6e, 0x79, 0xe1, 0x14b, 0x6d, 0xf3, 0x6e, 0x64, 0x69, 0x65, 0x3b, 0x6d, 0x65, 0x74, 0xfa,
+0x6b, 0x70, 0xed, 0xe1, 0x70, 0x25b, 0x3b, 0x6b, 0xfa, 0x70, 0xe9, 0x6c, 0x69, 0x6d, 0x65, 0x74, 0xfa, 0x6b, 0x70, 0x69,
+0x61, 0x70, 0x25b, 0x3b, 0x66, 0x65, 0x6c, 0xe9, 0x74, 0x65, 0x3b, 0x73, 0xe9, 0x73, 0x65, 0x6c, 0xe9, 0x73, 0x64, 0x3b,
+0x6d, 0x64, 0x3b, 0x6d, 0x77, 0x3b, 0x65, 0x74, 0x3b, 0x6b, 0x6c, 0x3b, 0x66, 0x6c, 0x3b, 0x73, 0x73, 0x73, 0x3b, 0x6d,
+0x3b, 0x6d, 0x3b, 0x65, 0x3b, 0x6b, 0x3b, 0x66, 0x3b, 0x73, 0x64, 0x6f, 0x6d, 0x69, 0x6e, 0x67, 0x75, 0x3b, 0x6c, 0x6c,
+0x75, 0x6e, 0x65, 0x73, 0x3b, 0x6d, 0x61, 0x72, 0x74, 0x65, 0x73, 0x3b, 0x6d, 0x69, 0xe9, 0x72, 0x63, 0x6f, 0x6c, 0x65,
+0x73, 0x3b, 0x78, 0x75, 0x65, 0x76, 0x65, 0x73, 0x3b, 0x76, 0x69, 0x65, 0x6e, 0x72, 0x65, 0x73, 0x3b, 0x73, 0xe1, 0x62,
+0x61, 0x64, 0x75, 0x64, 0x6f, 0x6d, 0x3b, 0x6c, 0x6c, 0x75, 0x3b, 0x6d, 0x61, 0x72, 0x3b, 0x6d, 0x69, 0xe9, 0x3b, 0x78,
+0x75, 0x65, 0x3b, 0x76, 0x69, 0x65, 0x3b, 0x73, 0xe1, 0x62, 0x53, 0x254, 0x301, 0x6e, 0x64, 0x69, 0x3b, 0x4d, 0x254, 0x301,
+0x6e, 0x64, 0x69, 0x3b, 0xc1, 0x70, 0x74, 0x61, 0x20, 0x4d, 0x254, 0x301, 0x6e, 0x64, 0x69, 0x3b, 0x57, 0x25b, 0x301, 0x6e,
+0x25b, 0x73, 0x25b, 0x64, 0x25b, 0x3b, 0x54, 0x254, 0x301, 0x73, 0x25b, 0x64, 0x25b, 0x3b, 0x46, 0x25b, 0x6c, 0xe2, 0x79, 0x25b,
+0x64, 0x25b, 0x3b, 0x53, 0xe1, 0x73, 0x69, 0x64, 0x25b, 0x53, 0x254, 0x301, 0x3b, 0x4d, 0x254, 0x301, 0x3b, 0xc1, 0x4d, 0x3b,
+0x57, 0x25b, 0x301, 0x3b, 0x54, 0x254, 0x301, 0x3b, 0x46, 0x25b, 0x3b, 0x53, 0xe1, 0x73, 0x254, 0x6e, 0x64, 0x69, 0x3b, 0x6c,
+0x75, 0x6e, 0x64, 0x69, 0x3b, 0x6d, 0x61, 0x72, 0x64, 0x69, 0x3b, 0x6d, 0x25b, 0x72, 0x6b, 0x25b, 0x72, 0x25b, 0x64, 0x69,
+0x3b, 0x79, 0x65, 0x64, 0x69, 0x3b, 0x76, 0x61, 0x14b, 0x64, 0x25b, 0x72, 0x25b, 0x64, 0x69, 0x3b, 0x6d, 0x254, 0x6e, 0x254,
+0x20, 0x73, 0x254, 0x6e, 0x64, 0x69, 0x73, 0x6f, 0x3b, 0x6c, 0x75, 0x3b, 0x6d, 0x61, 0x3b, 0x6d, 0x25b, 0x3b, 0x79, 0x65,
+0x3b, 0x76, 0x61, 0x3b, 0x6d, 0x73, 0x41, 0x6e, 0x65, 0x67, 0x20, 0x31, 0x3b, 0x41, 0x6e, 0x65, 0x67, 0x20, 0x32, 0x3b,
+0x41, 0x6e, 0x65, 0x67, 0x20, 0x33, 0x3b, 0x41, 0x6e, 0x65, 0x67, 0x20, 0x34, 0x3b, 0x41, 0x6e, 0x65, 0x67, 0x20, 0x35,
+0x3b, 0x41, 0x6e, 0x65, 0x67, 0x20, 0x36, 0x3b, 0x41, 0x6e, 0x65, 0x67, 0x20, 0x37, 0x41, 0x31, 0x3b, 0x41, 0x32, 0x3b,
+0x41, 0x33, 0x3b, 0x41, 0x34, 0x3b, 0x41, 0x35, 0x3b, 0x41, 0x36, 0x3b, 0x41, 0x37, 0x6c, 0x79, 0x25b, 0x2bc, 0x25b, 0x301,
+0x20, 0x73, 0x1e85, 0xed, 0x14b, 0x74, 0xe8, 0x3b, 0x6d, 0x76, 0x66, 0xf2, 0x20, 0x6c, 0x79, 0x25b, 0x30c, 0x2bc, 0x3b, 0x6d,
+0x62, 0x254, 0x301, 0x254, 0x6e, 0x74, 0xe8, 0x20, 0x6d, 0x76, 0x66, 0xf2, 0x20, 0x6c, 0x79, 0x25b, 0x30c, 0x2bc, 0x3b, 0x74,
+0x73, 0xe8, 0x74, 0x73, 0x25b, 0x300, 0x25b, 0x20, 0x6c, 0x79, 0x25b, 0x30c, 0x2bc, 0x3b, 0x6d, 0x62, 0x254, 0x301, 0x254, 0x6e,
+0x74, 0xe8, 0x20, 0x74, 0x73, 0x65, 0x74, 0x73, 0x25b, 0x300, 0x25b, 0x20, 0x6c, 0x79, 0x25b, 0x30c, 0x2bc, 0x3b, 0x6d, 0x76,
+0x66, 0xf2, 0x20, 0x6d, 0xe0, 0x67, 0x61, 0x20, 0x6c, 0x79, 0x25b, 0x30c, 0x2bc, 0x3b, 0x6d, 0xe0, 0x67, 0x61, 0x20, 0x6c,
+0x79, 0x25b, 0x30c, 0x2bc, 0xd804, 0xdd22, 0xd804, 0xdd27, 0xd804, 0xdd1d, 0xd804, 0xdd28, 0xd804, 0xdd1d, 0xd804, 0xdd22, 0xd804, 0xdd34, 0x3b, 0xd804,
+0xdd25, 0xd804, 0xdd27, 0xd804, 0xdd1f, 0xd804, 0xdd34, 0xd804, 0xdd1d, 0xd804, 0xdd22, 0xd804, 0xdd34, 0x3b, 0xd804, 0xdd1f, 0xd804, 0xdd27, 0xd804, 0xdd01,
+0xd804, 0xdd09, 0xd804, 0xdd27, 0xd804, 0xdd23, 0xd804, 0xdd34, 0xd804, 0xdd1d, 0xd804, 0xdd22, 0xd804, 0xdd34, 0x3b, 0xd804, 0xdd1d, 0xd804, 0xdd2a, 0xd804,
+0xdd16, 0xd804, 0xdd34, 0xd804, 0xdd1d, 0xd804, 0xdd22, 0xd804, 0xdd34, 0x3b, 0xd804, 0xdd1d, 0xd804, 0xdd33, 0xd804, 0xdd22, 0xd804, 0xdd28, 0xd804, 0xdd25,
+0xd804, 0xdd2a, 0xd804, 0xdd1b, 0xd804, 0xdd34, 0xd804, 0xdd1d, 0xd804, 0xdd22, 0xd804, 0xdd34, 0x3b, 0xd804, 0xdd25, 0xd804, 0xdd2a, 0xd804, 0xdd07, 0xd804,
+0xdd34, 0xd804, 0xdd07, 0xd804, 0xdd2e, 0xd804, 0xdd22, 0xd804, 0xdd34, 0xd804, 0xdd1d, 0xd804, 0xdd22, 0xd804, 0xdd34, 0x3b, 0xd804, 0xdd25, 0xd804, 0xdd27,
+0xd804, 0xdd1a, 0xd804, 0xdd28, 0xd804, 0xdd1d, 0xd804, 0xdd22, 0xd804, 0xdd34, 0xd804, 0xdd22, 0xd804, 0xdd27, 0xd804, 0xdd1d, 0xd804, 0xdd28, 0x3b, 0xd804,
+0xdd25, 0xd804, 0xdd27, 0xd804, 0xdd1f, 0xd804, 0xdd34, 0x3b, 0xd804, 0xdd1f, 0xd804, 0xdd27, 0xd804, 0xdd01, 0xd804, 0xdd09, 0xd804, 0xdd27, 0xd804, 0xdd23,
+0xd804, 0xdd34, 0x3b, 0xd804, 0xdd1d, 0xd804, 0xdd2a, 0xd804, 0xdd16, 0xd804, 0xdd34, 0x3b, 0xd804, 0xdd1d, 0xd804, 0xdd33, 0xd804, 0xdd22, 0xd804, 0xdd28,
+0xd804, 0xdd25, 0xd804, 0xdd2a, 0xd804, 0xdd1b, 0xd804, 0xdd34, 0x3b, 0xd804, 0xdd25, 0xd804, 0xdd2a, 0xd804, 0xdd07, 0xd804, 0xdd34, 0xd804, 0xdd07, 0xd804,
+0xdd2e, 0xd804, 0xdd22, 0xd804, 0xdd34, 0x3b, 0xd804, 0xdd25, 0xd804, 0xdd27, 0xd804, 0xdd1a, 0xd804, 0xdd28, 0xd804, 0xdd22, 0xd804, 0xdd27, 0x3b, 0xd804,
+0xdd25, 0xd804, 0xdd27, 0x3b, 0xd804, 0xdd1f, 0xd804, 0xdd27, 0x3b, 0xd804, 0xdd1d, 0xd804, 0xdd2a, 0x3b, 0xd804, 0xdd1d, 0xd804, 0xdd33, 0xd804, 0xdd22,
+0xd804, 0xdd28, 0x3b, 0xd804, 0xdd25, 0xd804, 0xdd2a, 0x3b, 0xd804, 0xdd25, 0xd804, 0xdd27, 0x41, 0x14b, 0x70, 0xe9, 0x74, 0x75, 0x77, 0x61,
+0x6b, 0x21f, 0x61, 0x14b, 0x3b, 0x41, 0x14b, 0x70, 0xe9, 0x74, 0x75, 0x77, 0x61, 0x14b, 0x17e, 0x69, 0x3b, 0x41, 0x14b, 0x70,
+0xe9, 0x74, 0x75, 0x6e, 0x75, 0x14b, 0x70, 0x61, 0x3b, 0x41, 0x14b, 0x70, 0xe9, 0x74, 0x75, 0x79, 0x61, 0x6d, 0x6e, 0x69,
+0x3b, 0x41, 0x14b, 0x70, 0xe9, 0x74, 0x75, 0x74, 0x6f, 0x70, 0x61, 0x3b, 0x41, 0x14b, 0x70, 0xe9, 0x74, 0x75, 0x7a, 0x61,
+0x70, 0x74, 0x61, 0x14b, 0x3b, 0x4f, 0x77, 0xe1, 0x14b, 0x67, 0x79, 0x75, 0x17e, 0x61, 0x17e, 0x61, 0x70, 0x69, 0x41, 0x3b,
+0x57, 0x3b, 0x4e, 0x3b, 0x59, 0x3b, 0x54, 0x3b, 0x5a, 0x3b, 0x4f, 0x2d30, 0x2d59, 0x2d30, 0x2d4e, 0x2d30, 0x2d59, 0x3b, 0x2d30, 0x2d62,
+0x2d4f, 0x2d30, 0x2d59, 0x3b, 0x2d30, 0x2d59, 0x2d49, 0x2d4f, 0x2d30, 0x2d59, 0x3b, 0x2d30, 0x2d3d, 0x2d55, 0x2d30, 0x2d59, 0x3b, 0x2d30, 0x2d3d, 0x2d61,
+0x2d30, 0x2d59, 0x3b, 0x2d30, 0x2d59, 0x2d49, 0x2d4e, 0x2d61, 0x2d30, 0x2d59, 0x3b, 0x2d30, 0x2d59, 0x2d49, 0x2d39, 0x2d62, 0x2d30, 0x2d59, 0x6cc, 0x6d5,
+0x6a9, 0x634, 0x6d5, 0x645, 0x645, 0x6d5, 0x3b, 0x62f, 0x648, 0x648, 0x634, 0x6d5, 0x645, 0x645, 0x6d5, 0x3b, 0x633, 0x6ce, 0x634, 0x6d5,
+0x645, 0x645, 0x6d5, 0x3b, 0x686, 0x648, 0x627, 0x631, 0x634, 0x6d5, 0x645, 0x645, 0x6d5, 0x3b, 0x67e, 0x6ce, 0x646, 0x62c, 0x634, 0x6d5,
+0x645, 0x645, 0x6d5, 0x3b, 0x6be, 0x6d5, 0x6cc, 0x646, 0x6cc, 0x3b, 0x634, 0x6d5, 0x645, 0x645, 0x6d5, 0x6cc, 0x3b, 0x62f, 0x3b, 0x633,
+0x3b, 0x686, 0x3b, 0x67e, 0x3b, 0x6be, 0x3b, 0x634, 0x6e, 0x6a, 0x65, 0x17a, 0x65, 0x6c, 0x61, 0x3b, 0x70, 0xf3, 0x6e, 0x6a,
+0x65, 0x17a, 0x65, 0x6c, 0x65, 0x3b, 0x77, 0x61, 0x142, 0x74, 0x6f, 0x72, 0x61, 0x3b, 0x73, 0x72, 0x6a, 0x6f, 0x64, 0x61,
+0x3b, 0x73, 0x74, 0x77, 0xf3, 0x72, 0x74, 0x6b, 0x3b, 0x70, 0x11b, 0x74, 0x6b, 0x3b, 0x73, 0x6f, 0x62, 0x6f, 0x74, 0x61,
+0x6e, 0x6a, 0x65, 0x3b, 0x70, 0xf3, 0x6e, 0x3b, 0x77, 0x61, 0x142, 0x3b, 0x73, 0x72, 0x6a, 0x3b, 0x73, 0x74, 0x77, 0x3b,
+0x70, 0x11b, 0x74, 0x3b, 0x73, 0x6f, 0x62, 0x6e, 0x3b, 0x70, 0x3b, 0x77, 0x3b, 0x73, 0x3b, 0x73, 0x3b, 0x70, 0x3b, 0x73,
 0x6e, 0x6a, 0x65, 0x64, 0x17a, 0x65, 0x6c, 0x61, 0x3b, 0x70, 0xf3, 0x6e, 0x64, 0x17a, 0x65, 0x6c, 0x61, 0x3b, 0x77, 0x75,
 0x74, 0x6f, 0x72, 0x61, 0x3b, 0x73, 0x72, 0x6a, 0x65, 0x64, 0x61, 0x3b, 0x161, 0x74, 0x77, 0xf3, 0x72, 0x74, 0x6b, 0x3b,
-0x70, 0x6a, 0x61, 0x74, 0x6b, 0x3b, 0x73, 0x6f, 0x62, 0x6f, 0x74, 0x61, 0x3b, 0x6e, 0x3b, 0x70, 0x3b, 0x77, 0x3b, 0x73,
-0x3b, 0x161, 0x3b, 0x70, 0x3b, 0x73, 0x3b, 0x6e, 0x61, 0x64, 0x3b, 0x70, 0x61, 0x6e, 0x3b, 0x77, 0x69, 0x73, 0x3b, 0x70,
-0x75, 0x73, 0x3b, 0x6b, 0x65, 0x74, 0x3b, 0x70, 0x113, 0x6e, 0x3b, 0x73, 0x61, 0x62, 0x3b, 0x6e, 0x61, 0x64, 0x12b, 0x6c,
-0x69, 0x3b, 0x70, 0x61, 0x6e, 0x61, 0x64, 0x12b, 0x6c, 0x69, 0x3b, 0x77, 0x69, 0x73, 0x61, 0x73, 0x12b, 0x64, 0x69, 0x73,
-0x3b, 0x70, 0x75, 0x73, 0x73, 0x69, 0x73, 0x61, 0x77, 0x61, 0x69, 0x74, 0x69, 0x3b, 0x6b, 0x65, 0x74, 0x77, 0x69, 0x72,
-0x74, 0x69, 0x6b, 0x73, 0x3b, 0x70, 0x113, 0x6e, 0x74, 0x6e, 0x69, 0x6b, 0x73, 0x3b, 0x73, 0x61, 0x62, 0x61, 0x74, 0x74,
-0x69, 0x6b, 0x61, 0x3b, 0x4e, 0x3b, 0x50, 0x3b, 0x57, 0x3b, 0x50, 0x3b, 0x4b, 0x3b, 0x50, 0x3b, 0x53, 0x3b, 0x70, 0x61,
-0x73, 0x3b, 0x76, 0x75, 0x6f, 0x3b, 0x6d, 0x61, 0x6a, 0x3b, 0x6b, 0x6f, 0x73, 0x3b, 0x74, 0x75, 0x6f, 0x3b, 0x76, 0xe1,
-0x73, 0x3b, 0x6c, 0xe1, 0x76, 0x3b, 0x70, 0x61, 0x73, 0x65, 0x70, 0x65, 0x69, 0x76, 0x69, 0x3b, 0x76, 0x75, 0x6f, 0x73,
-0x73, 0x61, 0x72, 0x67, 0xe2, 0x3b, 0x6d, 0x61, 0x6a, 0x65, 0x62, 0x61, 0x72, 0x67, 0xe2, 0x3b, 0x6b, 0x6f, 0x73, 0x6b,
-0x6f, 0x6b, 0x6b, 0x6f, 0x3b, 0x74, 0x75, 0x6f, 0x72, 0xe2, 0x73, 0x74, 0xe2, 0x68, 0x3b, 0x76, 0xe1, 0x73, 0x74, 0x75,
-0x70, 0x70, 0x65, 0x69, 0x76, 0x69, 0x3b, 0x6c, 0xe1, 0x76, 0x75, 0x72, 0x64, 0xe2, 0x68, 0x3b, 0x70, 0x61, 0x73, 0x65,
-0x70, 0x65, 0x65, 0x69, 0x76, 0x69, 0x3b, 0x76, 0x75, 0x6f, 0x73, 0x73, 0x61, 0x61, 0x72, 0x67, 0xe2, 0x3b, 0x6d, 0x61,
-0x6a, 0x65, 0x62, 0x61, 0x61, 0x72, 0x67, 0xe2, 0x3b, 0x6b, 0x6f, 0x73, 0x6b, 0x6f, 0x68, 0x6f, 0x3b, 0x74, 0x75, 0x6f,
-0x72, 0xe2, 0x73, 0x74, 0x75, 0x76, 0x3b, 0x76, 0xe1, 0x73, 0x74, 0x75, 0x70, 0x70, 0x65, 0x65, 0x69, 0x76, 0x69, 0x3b,
-0x6c, 0xe1, 0x76, 0x75, 0x72, 0x64, 0x75, 0x76, 0x3b, 0x70, 0x3b, 0x56, 0x3b, 0x4d, 0x3b, 0x4b, 0x3b, 0x54, 0x3b, 0x56,
-0x3b, 0x4c, 0x3b, 0x44, 0x6f, 0x6d, 0x3b, 0x4c, 0x75, 0x6e, 0x3b, 0x4d, 0x61, 0x72, 0x3b, 0x4d, 0x6b, 0x73, 0x3b, 0x48,
-0x75, 0x3b, 0x42, 0x69, 0x3b, 0x53, 0x61, 0x3b, 0x44, 0x6f, 0x6d, 0x69, 0x6e, 0x67, 0x6f, 0x3b, 0x4c, 0x75, 0x6e, 0x65,
-0x73, 0x3b, 0x4d, 0x61, 0x72, 0x74, 0x65, 0x73, 0x3b, 0x4d, 0x69, 0x79, 0x65, 0x72, 0x6b, 0x75, 0x6c, 0x65, 0x73, 0x3b,
-0x48, 0x75, 0x77, 0x65, 0x62, 0x65, 0x73, 0x3b, 0x42, 0x69, 0x79, 0x65, 0x72, 0x6e, 0x65, 0x73, 0x3b, 0x53, 0x61, 0x62,
-0x61, 0x64, 0x6f, 0x3b, 0x44, 0x3b, 0x4c, 0x3b, 0x4d, 0x3b, 0x4d, 0x3b, 0x48, 0x3b, 0x42, 0x3b, 0x53, 0x3b
+0x70, 0x6a, 0x61, 0x74, 0x6b, 0x3b, 0x73, 0x6f, 0x62, 0x6f, 0x74, 0x61, 0x6e, 0x6a, 0x65, 0x3b, 0x70, 0xf3, 0x6e, 0x3b,
+0x77, 0x75, 0x74, 0x3b, 0x73, 0x72, 0x6a, 0x3b, 0x161, 0x74, 0x77, 0x3b, 0x70, 0x6a, 0x61, 0x3b, 0x73, 0x6f, 0x62, 0x6e,
+0x3b, 0x70, 0x3b, 0x77, 0x3b, 0x73, 0x3b, 0x161, 0x3b, 0x70, 0x3b, 0x73, 0x6e, 0x61, 0x64, 0x12b, 0x6c, 0x69, 0x3b, 0x70,
+0x61, 0x6e, 0x61, 0x64, 0x12b, 0x6c, 0x69, 0x3b, 0x77, 0x69, 0x73, 0x61, 0x73, 0x12b, 0x64, 0x69, 0x73, 0x3b, 0x70, 0x75,
+0x73, 0x73, 0x69, 0x73, 0x61, 0x77, 0x61, 0x69, 0x74, 0x69, 0x3b, 0x6b, 0x65, 0x74, 0x77, 0x69, 0x72, 0x74, 0x69, 0x6b,
+0x73, 0x3b, 0x70, 0x113, 0x6e, 0x74, 0x6e, 0x69, 0x6b, 0x73, 0x3b, 0x73, 0x61, 0x62, 0x61, 0x74, 0x74, 0x69, 0x6b, 0x61,
+0x6e, 0x61, 0x64, 0x3b, 0x70, 0x61, 0x6e, 0x3b, 0x77, 0x69, 0x73, 0x3b, 0x70, 0x75, 0x73, 0x3b, 0x6b, 0x65, 0x74, 0x3b,
+0x70, 0x113, 0x6e, 0x3b, 0x73, 0x61, 0x62, 0x4e, 0x3b, 0x50, 0x3b, 0x57, 0x3b, 0x50, 0x3b, 0x4b, 0x3b, 0x50, 0x3b, 0x53,
+0x70, 0x61, 0x73, 0x65, 0x70, 0x65, 0x69, 0x76, 0x69, 0x3b, 0x76, 0x75, 0x6f, 0x73, 0x73, 0x61, 0x72, 0x67, 0xe2, 0x3b,
+0x6d, 0x61, 0x6a, 0x65, 0x62, 0x61, 0x72, 0x67, 0xe2, 0x3b, 0x6b, 0x6f, 0x73, 0x6b, 0x6f, 0x6b, 0x6b, 0x6f, 0x3b, 0x74,
+0x75, 0x6f, 0x72, 0xe2, 0x73, 0x74, 0xe2, 0x68, 0x3b, 0x76, 0xe1, 0x73, 0x74, 0x75, 0x70, 0x70, 0x65, 0x69, 0x76, 0x69,
+0x3b, 0x6c, 0xe1, 0x76, 0x75, 0x72, 0x64, 0xe2, 0x68, 0x70, 0x61, 0x73, 0x65, 0x70, 0x65, 0x65, 0x69, 0x76, 0x69, 0x3b,
+0x76, 0x75, 0x6f, 0x73, 0x73, 0x61, 0x61, 0x72, 0x67, 0xe2, 0x3b, 0x6d, 0x61, 0x6a, 0x65, 0x62, 0x61, 0x61, 0x72, 0x67,
+0xe2, 0x3b, 0x6b, 0x6f, 0x73, 0x6b, 0x6f, 0x68, 0x6f, 0x3b, 0x74, 0x75, 0x6f, 0x72, 0xe2, 0x73, 0x74, 0x75, 0x76, 0x3b,
+0x76, 0xe1, 0x73, 0x74, 0x75, 0x70, 0x70, 0x65, 0x65, 0x69, 0x76, 0x69, 0x3b, 0x6c, 0xe1, 0x76, 0x75, 0x72, 0x64, 0x75,
+0x76, 0x70, 0x61, 0x73, 0x3b, 0x76, 0x75, 0x6f, 0x3b, 0x6d, 0x61, 0x6a, 0x3b, 0x6b, 0x6f, 0x73, 0x3b, 0x74, 0x75, 0x6f,
+0x3b, 0x76, 0xe1, 0x73, 0x3b, 0x6c, 0xe1, 0x76, 0x70, 0x3b, 0x56, 0x3b, 0x4d, 0x3b, 0x4b, 0x3b, 0x54, 0x3b, 0x56, 0x3b,
+0x4c, 0x44, 0x6f, 0x6d, 0x69, 0x6e, 0x67, 0x6f, 0x3b, 0x4c, 0x75, 0x6e, 0x65, 0x73, 0x3b, 0x4d, 0x61, 0x72, 0x74, 0x65,
+0x73, 0x3b, 0x4d, 0x69, 0x79, 0x65, 0x72, 0x6b, 0x75, 0x6c, 0x65, 0x73, 0x3b, 0x48, 0x75, 0x77, 0x65, 0x62, 0x65, 0x73,
+0x3b, 0x42, 0x69, 0x79, 0x65, 0x72, 0x6e, 0x65, 0x73, 0x3b, 0x53, 0x61, 0x62, 0x61, 0x64, 0x6f, 0x44, 0x6f, 0x6d, 0x3b,
+0x4c, 0x75, 0x6e, 0x3b, 0x4d, 0x61, 0x72, 0x3b, 0x4d, 0x6b, 0x73, 0x3b, 0x48, 0x75, 0x3b, 0x42, 0x69, 0x3b, 0x53, 0x61,
+0x44, 0x3b, 0x4c, 0x3b, 0x4d, 0x3b, 0x4d, 0x3b, 0x48, 0x3b, 0x42, 0x3b, 0x53
 };
 
-static const ushort byte_unit_data[] = {
+static const char16_t byte_unit_data[] = {
 0x62, 0x79, 0x74, 0x65, 0x73, 0x6b, 0x42, 0x3b, 0x4d, 0x42, 0x3b, 0x47, 0x42, 0x3b, 0x54, 0x42, 0x3b, 0x50, 0x42, 0x3b,
 0x45, 0x42, 0x4b, 0x69, 0x42, 0x3b, 0x4d, 0x69, 0x42, 0x3b, 0x47, 0x69, 0x42, 0x3b, 0x54, 0x69, 0x42, 0x3b, 0x50, 0x69,
-0x42, 0x3b, 0x45, 0x69, 0x42, 0x62, 0x79, 0x74, 0x65, 0x67, 0x72, 0x65, 0x65, 0x70, 0x62, 0x61, 0x6a, 0x74, 0x1263, 0x12ed,
-0x1275, 0x12aa, 0x1263, 0x3b, 0x121c, 0x130b, 0x1263, 0x12ed, 0x1275, 0x3b, 0x130a, 0x1263, 0x3b, 0x1274, 0x122b, 0x1263, 0x12ed, 0x1275, 0x3b, 0x1354,
-0x1263, 0x3b, 0x45, 0x42, 0x628, 0x627, 0x64a, 0x62a, 0x643, 0x64a, 0x644, 0x648, 0x628, 0x627, 0x64a, 0x62a, 0x3b, 0x645, 0x64a, 0x63a,
-0x627, 0x628, 0x627, 0x64a, 0x62a, 0x3b, 0x63a, 0x64a, 0x63a, 0x627, 0x628, 0x627, 0x64a, 0x62a, 0x3b, 0x62a, 0x64a, 0x631, 0x627, 0x628,
-0x627, 0x64a, 0x62a, 0x3b, 0x628, 0x64a, 0x62a, 0x627, 0x628, 0x627, 0x64a, 0x62a, 0x3b, 0x45, 0x42, 0x562, 0x561, 0x575, 0x569, 0x565,
-0x580, 0x56f, 0x532, 0x3b, 0x544, 0x532, 0x3b, 0x533, 0x532, 0x3b, 0x54f, 0x532, 0x3b, 0x54a, 0x532, 0x3b, 0x45, 0x42, 0x9ac, 0x9be,
-0x987, 0x99f, 0x995, 0x9bf, 0x983, 0x20, 0x9ac, 0x9be, 0x983, 0x3b, 0x9ae, 0x9c7, 0x983, 0x20, 0x9ac, 0x9be, 0x983, 0x3b, 0x997, 0x9bf,
-0x983, 0x20, 0x9ac, 0x9be, 0x983, 0x3b, 0x99f, 0x9c7, 0x983, 0x20, 0x9ac, 0x9be, 0x983, 0x3b, 0x50, 0x42, 0x3b, 0x45, 0x42, 0x62,
-0x61, 0x79, 0x74, 0x62, 0x79, 0x74, 0x65, 0x2d, 0x61, 0x6b, 0x6f, 0x6b, 0x74, 0x65, 0x64, 0x6f, 0xf9, 0x6b, 0x6f, 0x3b,
-0x4d, 0x6f, 0x3b, 0x47, 0x6f, 0x3b, 0x54, 0x6f, 0x3b, 0x50, 0x6f, 0x3b, 0x45, 0x6f, 0x4b, 0x69, 0x6f, 0x3b, 0x4d, 0x69,
-0x6f, 0x3b, 0x47, 0x69, 0x6f, 0x3b, 0x54, 0x69, 0x6f, 0x3b, 0x50, 0x69, 0x6f, 0x3b, 0x45, 0x69, 0x6f, 0x431, 0x430, 0x439,
-0x442, 0x43e, 0x432, 0x435, 0x1018, 0x102d, 0x102f, 0x1000, 0x103a, 0x431, 0x430, 0x439, 0x442, 0x44b, 0x41a, 0x411, 0x3b, 0x41c, 0x411, 0x3b,
-0x413, 0x411, 0x3b, 0x422, 0x411, 0x3b, 0x41f, 0x411, 0x3b, 0x45, 0x42, 0x1794, 0x17c3, 0x5b57, 0x8282, 0x5343, 0x5b57, 0x8282, 0x3b, 0x5146,
-0x5b57, 0x8282, 0x3b, 0x5409, 0x5b57, 0x8282, 0x3b, 0x592a, 0x5b57, 0x8282, 0x3b, 0x50, 0x42, 0x3b, 0x45, 0x42, 0x4f4d, 0x5143, 0x7d44, 0x62,
-0x61, 0x6a, 0x74, 0x6f, 0x76, 0x69, 0x62, 0x61, 0x6a, 0x74, 0x79, 0x62, 0x61, 0x6a, 0x74, 0x6f, 0x6a, 0x62, 0x61, 0x69,
-0x64, 0x69, 0x64, 0x62, 0xfd, 0x74, 0x74, 0x61, 0x76, 0x75, 0x74, 0x6b, 0x74, 0x3b, 0x4d, 0x74, 0x3b, 0x47, 0x74, 0x3b,
-0x54, 0x74, 0x3b, 0x50, 0x74, 0x3b, 0x45, 0x74, 0x4b, 0x69, 0x74, 0x3b, 0x4d, 0x69, 0x74, 0x3b, 0x47, 0x69, 0x74, 0x3b,
-0x54, 0x69, 0x74, 0x3b, 0x50, 0x69, 0x74, 0x3b, 0x45, 0x69, 0x74, 0x6f, 0x63, 0x74, 0x65, 0x74, 0x73, 0x62, 0x61, 0x69,
-0x64, 0x68, 0x74, 0x10d1, 0x10d0, 0x10d8, 0x10e2, 0x10d8, 0x10d9, 0x10d1, 0x10d0, 0x10d8, 0x10e2, 0x10d8, 0x3b, 0x10db, 0x10d1, 0x10d0, 0x10d8, 0x10e2,
-0x10d8, 0x3b, 0x10d2, 0x10d1, 0x10d0, 0x10d8, 0x10e2, 0x10d8, 0x3b, 0x10e2, 0x10d1, 0x10d0, 0x10d8, 0x10e2, 0x10d8, 0x3b, 0x10de, 0x10d1, 0x10d0, 0x10d8,
-0x10e2, 0x10d8, 0x3b, 0x45, 0x42, 0x42, 0x79, 0x74, 0x65, 0x73, 0xaac, 0xabe, 0xa87, 0xa9f, 0x6b, 0x42, 0x3b, 0x4d, 0x42, 0x3b,
-0x47, 0x42, 0x3b, 0x54, 0x42, 0x3b, 0xaaa, 0xac0, 0xaac, 0xac0, 0x3b, 0x45, 0x42, 0x5d1, 0x5d9, 0x5d9, 0x5d8, 0x92c, 0x93e, 0x907,
-0x91f, 0x62, 0xe1, 0x6a, 0x74, 0x62, 0xe6, 0x74, 0x69, 0x62, 0x65, 0x61, 0x72, 0x74, 0x61, 0x30d0, 0x30a4, 0x30c8, 0x4b, 0x42,
-0x3b, 0x4d, 0x42, 0x3b, 0x47, 0x42, 0x3b, 0x54, 0x42, 0x3b, 0x50, 0x42, 0x3b, 0x45, 0x42, 0x62, 0x69, 0x74, 0x65, 0xcac,
-0xcc8, 0xc9f, 0xccd, 0x200c, 0xc97, 0xcb3, 0xcc1, 0xc95, 0xcbf, 0x2e, 0xcac, 0xcc8, 0x2e, 0x3b, 0xcae, 0xcc6, 0x2e, 0xcac, 0xcc8, 0x2e,
-0x3b, 0xc97, 0xcbf, 0x2e, 0xcac, 0xcc8, 0x2e, 0x3b, 0xc9f, 0xcc6, 0x2e, 0xcac, 0xcc8, 0x2e, 0x3b, 0xcaa, 0xcc6, 0xcac, 0xcc8, 0x3b,
-0x45, 0x42, 0x431, 0x430, 0x439, 0x442, 0x43a, 0x411, 0x3b, 0x4d, 0x411, 0x3b, 0x413, 0x411, 0x3b, 0x54, 0x411, 0x3b, 0x41f, 0x411,
-0x3b, 0x45, 0x411, 0x4b, 0x69, 0x411, 0x3b, 0x4d, 0x69, 0x411, 0x3b, 0x47, 0x69, 0x411, 0x3b, 0x54, 0x69, 0x411, 0x3b, 0x50,
-0x69, 0x411, 0x3b, 0x45, 0x69, 0x411, 0x43a, 0x411, 0x3b, 0x41c, 0x411, 0x3b, 0x413, 0x411, 0x3b, 0x422, 0x411, 0x3b, 0x41f, 0x442,
-0x431, 0x3b, 0x45, 0x42, 0xbc14, 0xc774, 0xd2b8, 0x62, 0x61, 0x69, 0x74, 0x69, 0x62, 0x61, 0x69, 0x74, 0x61, 0x69, 0x431, 0x430,
-0x458, 0x442, 0x438, 0x62, 0x61, 0x69, 0x74, 0xd2c, 0xd48, 0xd31, 0xd4d, 0xd31, 0xd4d, 0xd15, 0xd46, 0xd2c, 0xd3f, 0x3b, 0xd0e, 0xd02,
-0xd2c, 0xd3f, 0x3b, 0xd1c, 0xd3f, 0xd2c, 0xd3f, 0x3b, 0xd1f, 0xd3f, 0xd2c, 0xd3f, 0x3b, 0xd2a, 0xd3f, 0xd2c, 0xd3f, 0x3b, 0x45, 0x42,
-0x43a, 0x411, 0x3b, 0x41c, 0x411, 0x3b, 0x413, 0x411, 0x3b, 0x422, 0x411, 0x3b, 0x41f, 0x411, 0x3b, 0x45, 0x42, 0x6b, 0x42, 0x3b,
-0x4d, 0x42, 0x3b, 0x47, 0x42, 0x3b, 0x54, 0x42, 0x3b, 0x92a, 0x93f, 0x91f, 0x93e, 0x3b, 0x45, 0x42, 0xb2c, 0xb3e, 0xb07, 0xb1f,
-0xb4d, 0x628, 0x627, 0x64a, 0x67c, 0x633, 0x628, 0x627, 0x6cc, 0x62a, 0x6a9, 0x6cc, 0x644, 0x648, 0x628, 0x627, 0x6cc, 0x62a, 0x3b, 0x645,
-0x6af, 0x627, 0x628, 0x627, 0x6cc, 0x62a, 0x3b, 0x6af, 0x6cc, 0x6af, 0x627, 0x628, 0x627, 0x6cc, 0x62a, 0x3b, 0x62a, 0x631, 0x627, 0x628,
-0x627, 0x6cc, 0x62a, 0x3b, 0x67e, 0x62a, 0x627, 0x628, 0x627, 0x6cc, 0x62a, 0x3b, 0x45, 0x42, 0xa2c, 0xa3e, 0xa07, 0xa1f, 0x62, 0x79,
-0x21b, 0x69, 0x431, 0x430, 0x458, 0x442, 0x43e, 0x432, 0x438, 0x628, 0x627, 0x626, 0x64a, 0x67d, 0x632, 0x6aa, 0x644, 0x648, 0x20, 0x628,
-0x627, 0x626, 0x64a, 0x67d, 0x632, 0x3b, 0x645, 0x64a, 0x6af, 0x627, 0x20, 0x628, 0x627, 0x626, 0x64a, 0x67d, 0x632, 0x3b, 0x6af, 0x64a,
-0x6af, 0x627, 0x20, 0x628, 0x627, 0x626, 0x64a, 0x67d, 0x632, 0x3b, 0x67d, 0x64a, 0x631, 0x627, 0x20, 0x628, 0x627, 0x626, 0x64a, 0x67d,
-0x632, 0x3b, 0x67e, 0x64a, 0x631, 0x627, 0x20, 0x628, 0x627, 0x626, 0x64a, 0x67d, 0x633, 0x3b, 0x45, 0x42, 0xdb6, 0xdba, 0xdd2, 0xda7,
-0xdca, 0xd9a, 0xdd2, 0xdb6, 0x20, 0x7b, 0x30, 0x7d, 0x3b, 0xdb8, 0xdd9, 0xdb6, 0x20, 0x7b, 0x30, 0x7d, 0x3b, 0xd9c, 0xdd2, 0xdb6,
-0x20, 0x7b, 0x30, 0x7d, 0x3b, 0xda7, 0xdd9, 0xdb6, 0x20, 0x7b, 0x30, 0x7d, 0x3b, 0xdb4, 0xdd9, 0xdb6, 0x20, 0x7b, 0x30, 0x7d,
-0x3b, 0x45, 0x42, 0x62, 0x65, 0x79, 0x74, 0x69, 0x73, 0x6b, 0x42, 0x3b, 0x4d, 0x42, 0x3b, 0x47, 0x42, 0x3b, 0x54, 0x42,
-0x3b, 0x42, 0x42, 0x3b, 0x45, 0x42, 0x6b, 0x69, 0x6c, 0x6f, 0x62, 0x61, 0x69, 0x74, 0x69, 0x20, 0x7b, 0x30, 0x7d, 0x3b,
-0x4d, 0x42, 0x20, 0x7b, 0x30, 0x7d, 0x3b, 0x47, 0x42, 0x20, 0x7b, 0x30, 0x7d, 0x3b, 0x74, 0x65, 0x72, 0x61, 0x62, 0x61,
-0x69, 0x74, 0x69, 0x20, 0x7b, 0x30, 0x7d, 0x3b, 0x50, 0x42, 0x20, 0x7b, 0x30, 0x7d, 0x3b, 0x45, 0x42, 0xbaa, 0xbc8, 0xb9f,
-0xbcd, 0xb95, 0xbb3, 0xbcd, 0xc2c, 0xc48, 0xc1f, 0xc4d, 0x200c, 0xc32, 0xc41, 0xc15, 0xc47, 0xc2c, 0xc40, 0x3b, 0xc0e, 0xc2e, 0xc4d, 0x200c,
-0xc2c, 0xc3f, 0x3b, 0xc1c, 0xc40, 0xc2c, 0xc40, 0x3b, 0xc1f, 0xc40, 0xc2c, 0xc40, 0x3b, 0xc2a, 0xc40, 0xc2c, 0xc40, 0x3b, 0x45, 0x42,
-0xe44, 0xe1a, 0xe15, 0xe4c, 0x70, 0x61, 0x69, 0x74, 0x69, 0x6b, 0x42, 0x20, 0x2bb, 0x65, 0x20, 0x7b, 0x30, 0x7d, 0x3b, 0x4d,
-0x42, 0x20, 0x2bb, 0x65, 0x20, 0x7b, 0x30, 0x7d, 0x3b, 0x47, 0x42, 0x20, 0x2bb, 0x65, 0x20, 0x7b, 0x30, 0x7d, 0x3b, 0x54,
-0x42, 0x20, 0x2bb, 0x65, 0x20, 0x7b, 0x30, 0x7d, 0x3b, 0x50, 0x42, 0x20, 0x2bb, 0x65, 0x20, 0x7b, 0x30, 0x7d, 0x3b, 0x45,
-0x42, 0x20, 0x2bb, 0x65, 0x20, 0x7b, 0x30, 0x7d, 0x4b, 0x69, 0x42, 0x20, 0x2bb, 0x65, 0x20, 0x7b, 0x30, 0x7d, 0x3b, 0x4d,
-0x69, 0x42, 0x20, 0x2bb, 0x65, 0x20, 0x7b, 0x30, 0x7d, 0x3b, 0x47, 0x69, 0x42, 0x20, 0x2bb, 0x65, 0x20, 0x7b, 0x30, 0x7d,
-0x3b, 0x54, 0x69, 0x42, 0x20, 0x2bb, 0x65, 0x20, 0x7b, 0x30, 0x7d, 0x3b, 0x50, 0x69, 0x42, 0x20, 0x2bb, 0x65, 0x20, 0x7b,
-0x30, 0x7d, 0x3b, 0x45, 0x69, 0x42, 0x20, 0x2bb, 0x65, 0x20, 0x7b, 0x30, 0x7d, 0x62, 0x61, 0xfd, 0x74, 0x431, 0x430, 0x439,
-0x442, 0x438, 0x628, 0x627, 0x626, 0x679, 0x6b, 0x42, 0x3b, 0x4d, 0x42, 0x3b, 0x47, 0x42, 0x3b, 0x54, 0x42, 0x3b, 0x67e, 0x6cc,
-0x20, 0x628, 0x6cc, 0x3b, 0x45, 0x42, 0x62, 0x65, 0x69, 0x74, 0x69, 0x61, 0x75, 0x92c, 0x93e, 0x92f, 0x91f, 0x61, 0x1e6d, 0x61,
-0x6d, 0x1e0d, 0x61, 0x6e, 0x6b, 0x41, 0x1e6c, 0x3b, 0x4d, 0x41, 0x1e6c, 0x3b, 0x47, 0x41, 0x1e6c, 0x3b, 0x54, 0x41, 0x1e6c, 0x3b,
-0x50, 0x42, 0x3b, 0x45, 0x42, 0x13d7, 0x13d3, 0x13cd, 0x13a6, 0x13b5, 0x13a9, 0x431, 0x430, 0x430, 0x439, 0x442, 0x43a, 0x411, 0x3b, 0x41c,
-0x411, 0x3b, 0x47, 0x42, 0x3b, 0x54, 0x42, 0x3b, 0x50, 0x42, 0x3b, 0x45, 0x42, 0x62, 0x79, 0x74, 0x65, 0x79, 0x6a9, 0x6cc,
+0x42, 0x3b, 0x45, 0x69, 0x42, 0x67, 0x72, 0x65, 0x65, 0x70, 0x62, 0x61, 0x6a, 0x74, 0x1263, 0x12ed, 0x1275, 0x12aa, 0x1263, 0x3b,
+0x121c, 0x130b, 0x1263, 0x12ed, 0x1275, 0x3b, 0x130a, 0x1263, 0x3b, 0x1274, 0x122b, 0x1263, 0x12ed, 0x1275, 0x3b, 0x1354, 0x1263, 0x3b, 0x45, 0x42,
+0x628, 0x627, 0x64a, 0x62a, 0x643, 0x64a, 0x644, 0x648, 0x628, 0x627, 0x64a, 0x62a, 0x3b, 0x645, 0x64a, 0x63a, 0x627, 0x628, 0x627, 0x64a,
+0x62a, 0x3b, 0x63a, 0x64a, 0x63a, 0x627, 0x628, 0x627, 0x64a, 0x62a, 0x3b, 0x62a, 0x64a, 0x631, 0x627, 0x628, 0x627, 0x64a, 0x62a, 0x3b,
+0x628, 0x64a, 0x62a, 0x627, 0x628, 0x627, 0x64a, 0x62a, 0x3b, 0x45, 0x42, 0x562, 0x561, 0x575, 0x569, 0x565, 0x580, 0x56f, 0x532, 0x3b,
+0x544, 0x532, 0x3b, 0x533, 0x532, 0x3b, 0x54f, 0x532, 0x3b, 0x54a, 0x532, 0x3b, 0x45, 0x42, 0x9ac, 0x9be, 0x987, 0x99f, 0x995, 0x9bf,
+0x983, 0x20, 0x9ac, 0x9be, 0x983, 0x3b, 0x9ae, 0x9c7, 0x983, 0x20, 0x9ac, 0x9be, 0x983, 0x3b, 0x997, 0x9bf, 0x983, 0x20, 0x9ac, 0x9be,
+0x983, 0x3b, 0x99f, 0x9c7, 0x983, 0x20, 0x9ac, 0x9be, 0x983, 0x3b, 0x50, 0x42, 0x3b, 0x45, 0x42, 0x62, 0x61, 0x79, 0x74, 0x62,
+0x79, 0x74, 0x65, 0x2d, 0x61, 0x6b, 0x6f, 0x6b, 0x74, 0x65, 0x64, 0x6f, 0xf9, 0x6b, 0x6f, 0x3b, 0x4d, 0x6f, 0x3b, 0x47,
+0x6f, 0x3b, 0x54, 0x6f, 0x3b, 0x50, 0x6f, 0x3b, 0x45, 0x6f, 0x4b, 0x69, 0x6f, 0x3b, 0x4d, 0x69, 0x6f, 0x3b, 0x47, 0x69,
+0x6f, 0x3b, 0x54, 0x69, 0x6f, 0x3b, 0x50, 0x69, 0x6f, 0x3b, 0x45, 0x69, 0x6f, 0x431, 0x430, 0x439, 0x442, 0x43e, 0x432, 0x435,
+0x1018, 0x102d, 0x102f, 0x1000, 0x103a, 0x431, 0x430, 0x439, 0x442, 0x44b, 0x41a, 0x411, 0x3b, 0x41c, 0x411, 0x3b, 0x413, 0x411, 0x3b, 0x422,
+0x411, 0x3b, 0x41f, 0x411, 0x3b, 0x45, 0x42, 0x1794, 0x17c3, 0x5b57, 0x8282, 0x5343, 0x5b57, 0x8282, 0x3b, 0x5146, 0x5b57, 0x8282, 0x3b, 0x5409,
+0x5b57, 0x8282, 0x3b, 0x592a, 0x5b57, 0x8282, 0x3b, 0x50, 0x42, 0x3b, 0x45, 0x42, 0x4f4d, 0x5143, 0x7d44, 0x62, 0x61, 0x6a, 0x74, 0x6f,
+0x76, 0x69, 0x62, 0x61, 0x6a, 0x74, 0x79, 0x62, 0x61, 0x6a, 0x74, 0x6f, 0x6a, 0x62, 0x61, 0x69, 0x64, 0x69, 0x64, 0x62,
+0xfd, 0x74, 0x74, 0x61, 0x76, 0x75, 0x74, 0x6b, 0x74, 0x3b, 0x4d, 0x74, 0x3b, 0x47, 0x74, 0x3b, 0x54, 0x74, 0x3b, 0x50,
+0x74, 0x3b, 0x45, 0x74, 0x4b, 0x69, 0x74, 0x3b, 0x4d, 0x69, 0x74, 0x3b, 0x47, 0x69, 0x74, 0x3b, 0x54, 0x69, 0x74, 0x3b,
+0x50, 0x69, 0x74, 0x3b, 0x45, 0x69, 0x74, 0x6f, 0x63, 0x74, 0x65, 0x74, 0x73, 0x62, 0x61, 0x69, 0x64, 0x68, 0x74, 0x10d1,
+0x10d0, 0x10d8, 0x10e2, 0x10d8, 0x10d9, 0x10d1, 0x10d0, 0x10d8, 0x10e2, 0x10d8, 0x3b, 0x10db, 0x10d1, 0x10d0, 0x10d8, 0x10e2, 0x10d8, 0x3b, 0x10d2, 0x10d1,
+0x10d0, 0x10d8, 0x10e2, 0x10d8, 0x3b, 0x10e2, 0x10d1, 0x10d0, 0x10d8, 0x10e2, 0x10d8, 0x3b, 0x10de, 0x10d1, 0x10d0, 0x10d8, 0x10e2, 0x10d8, 0x3b, 0x45,
+0x42, 0x42, 0x79, 0x74, 0x65, 0x73, 0xaac, 0xabe, 0xa87, 0xa9f, 0x6b, 0x42, 0x3b, 0x4d, 0x42, 0x3b, 0x47, 0x42, 0x3b, 0x54,
+0x42, 0x3b, 0xaaa, 0xac0, 0xaac, 0xac0, 0x3b, 0x45, 0x42, 0x5d1, 0x5d9, 0x5d9, 0x5d8, 0x92c, 0x93e, 0x907, 0x91f, 0x62, 0xe1, 0x6a,
+0x74, 0x62, 0xe6, 0x74, 0x69, 0x62, 0x65, 0x61, 0x72, 0x74, 0x61, 0x30d0, 0x30a4, 0x30c8, 0x4b, 0x42, 0x3b, 0x4d, 0x42, 0x3b,
+0x47, 0x42, 0x3b, 0x54, 0x42, 0x3b, 0x50, 0x42, 0x3b, 0x45, 0x42, 0x62, 0x69, 0x74, 0x65, 0xcac, 0xcc8, 0xc9f, 0xccd, 0x200c,
+0xc97, 0xcb3, 0xcc1, 0xc95, 0xcbf, 0x2e, 0xcac, 0xcc8, 0x2e, 0x3b, 0xcae, 0xcc6, 0x2e, 0xcac, 0xcc8, 0x2e, 0x3b, 0xc97, 0xcbf, 0x2e,
+0xcac, 0xcc8, 0x2e, 0x3b, 0xc9f, 0xcc6, 0x2e, 0xcac, 0xcc8, 0x2e, 0x3b, 0xcaa, 0xcc6, 0xcac, 0xcc8, 0x3b, 0x45, 0x42, 0x43a, 0x411,
+0x3b, 0x4d, 0x411, 0x3b, 0x413, 0x411, 0x3b, 0x54, 0x411, 0x3b, 0x41f, 0x411, 0x3b, 0x45, 0x411, 0x4b, 0x69, 0x411, 0x3b, 0x4d,
+0x69, 0x411, 0x3b, 0x47, 0x69, 0x411, 0x3b, 0x54, 0x69, 0x411, 0x3b, 0x50, 0x69, 0x411, 0x3b, 0x45, 0x69, 0x411, 0x43a, 0x411,
+0x3b, 0x41c, 0x411, 0x3b, 0x413, 0x411, 0x3b, 0x422, 0x411, 0x3b, 0x41f, 0x442, 0x431, 0x3b, 0x45, 0x42, 0xbc14, 0xc774, 0xd2b8, 0x62,
+0x61, 0x69, 0x74, 0x69, 0x62, 0x61, 0x69, 0x74, 0x61, 0x69, 0x431, 0x430, 0x458, 0x442, 0x438, 0xd2c, 0xd48, 0xd31, 0xd4d, 0xd31,
+0xd4d, 0xd15, 0xd46, 0xd2c, 0xd3f, 0x3b, 0xd0e, 0xd02, 0xd2c, 0xd3f, 0x3b, 0xd1c, 0xd3f, 0xd2c, 0xd3f, 0x3b, 0xd1f, 0xd3f, 0xd2c, 0xd3f,
+0x3b, 0xd2a, 0xd3f, 0xd2c, 0xd3f, 0x3b, 0x45, 0x42, 0x43a, 0x411, 0x3b, 0x41c, 0x411, 0x3b, 0x413, 0x411, 0x3b, 0x422, 0x411, 0x3b,
+0x41f, 0x411, 0x3b, 0x45, 0x42, 0x6b, 0x42, 0x3b, 0x4d, 0x42, 0x3b, 0x47, 0x42, 0x3b, 0x54, 0x42, 0x3b, 0x92a, 0x93f, 0x91f,
+0x93e, 0x3b, 0x45, 0x42, 0xb2c, 0xb3e, 0xb07, 0xb1f, 0xb4d, 0x628, 0x627, 0x64a, 0x67c, 0x633, 0x628, 0x627, 0x6cc, 0x62a, 0x6a9, 0x6cc,
 0x644, 0x648, 0x628, 0x627, 0x6cc, 0x62a, 0x3b, 0x645, 0x6af, 0x627, 0x628, 0x627, 0x6cc, 0x62a, 0x3b, 0x6af, 0x6cc, 0x6af, 0x627, 0x628,
-0x627, 0x6cc, 0x62a, 0x3b, 0x62a, 0x631, 0x627, 0x628, 0x627, 0x6cc, 0x62a, 0x3b, 0x50, 0x42, 0x3b, 0x45, 0x42, 0x6d, 0x67, 0x61,
-0x20, 0x62, 0x79, 0x74, 0x65
+0x627, 0x6cc, 0x62a, 0x3b, 0x62a, 0x631, 0x627, 0x628, 0x627, 0x6cc, 0x62a, 0x3b, 0x67e, 0x62a, 0x627, 0x628, 0x627, 0x6cc, 0x62a, 0x3b,
+0x45, 0x42, 0xa2c, 0xa3e, 0xa07, 0xa1f, 0x62, 0x79, 0x21b, 0x69, 0x431, 0x430, 0x458, 0x442, 0x43e, 0x432, 0x438, 0x628, 0x627, 0x626,
+0x64a, 0x67d, 0x632, 0x6aa, 0x644, 0x648, 0x20, 0x628, 0x627, 0x626, 0x64a, 0x67d, 0x632, 0x3b, 0x645, 0x64a, 0x6af, 0x627, 0x20, 0x628,
+0x627, 0x626, 0x64a, 0x67d, 0x632, 0x3b, 0x6af, 0x64a, 0x6af, 0x627, 0x20, 0x628, 0x627, 0x626, 0x64a, 0x67d, 0x632, 0x3b, 0x67d, 0x64a,
+0x631, 0x627, 0x20, 0x628, 0x627, 0x626, 0x64a, 0x67d, 0x632, 0x3b, 0x67e, 0x64a, 0x631, 0x627, 0x20, 0x628, 0x627, 0x626, 0x64a, 0x67d,
+0x633, 0x3b, 0x45, 0x42, 0xdb6, 0xdba, 0xdd2, 0xda7, 0xdca, 0xd9a, 0xdd2, 0xdb6, 0x20, 0x7b, 0x30, 0x7d, 0x3b, 0xdb8, 0xdd9, 0xdb6,
+0x20, 0x7b, 0x30, 0x7d, 0x3b, 0xd9c, 0xdd2, 0xdb6, 0x20, 0x7b, 0x30, 0x7d, 0x3b, 0xda7, 0xdd9, 0xdb6, 0x20, 0x7b, 0x30, 0x7d,
+0x3b, 0xdb4, 0xdd9, 0xdb6, 0x20, 0x7b, 0x30, 0x7d, 0x3b, 0x45, 0x42, 0x62, 0x65, 0x79, 0x74, 0x69, 0x73, 0x6b, 0x42, 0x3b,
+0x4d, 0x42, 0x3b, 0x47, 0x42, 0x3b, 0x54, 0x42, 0x3b, 0x42, 0x42, 0x3b, 0x45, 0x42, 0x6b, 0x69, 0x6c, 0x6f, 0x62, 0x61,
+0x69, 0x74, 0x69, 0x20, 0x7b, 0x30, 0x7d, 0x3b, 0x4d, 0x42, 0x20, 0x7b, 0x30, 0x7d, 0x3b, 0x47, 0x42, 0x20, 0x7b, 0x30,
+0x7d, 0x3b, 0x74, 0x65, 0x72, 0x61, 0x62, 0x61, 0x69, 0x74, 0x69, 0x20, 0x7b, 0x30, 0x7d, 0x3b, 0x50, 0x42, 0x20, 0x7b,
+0x30, 0x7d, 0x3b, 0x45, 0x42, 0xbaa, 0xbc8, 0xb9f, 0xbcd, 0xb95, 0xbb3, 0xbcd, 0xc2c, 0xc48, 0xc1f, 0xc4d, 0x200c, 0xc32, 0xc41, 0xc15,
+0xc47, 0xc2c, 0xc40, 0x3b, 0xc0e, 0xc2e, 0xc4d, 0x200c, 0xc2c, 0xc3f, 0x3b, 0xc1c, 0xc40, 0xc2c, 0xc40, 0x3b, 0xc1f, 0xc40, 0xc2c, 0xc40,
+0x3b, 0xc2a, 0xc40, 0xc2c, 0xc40, 0x3b, 0x45, 0x42, 0xe44, 0xe1a, 0xe15, 0xe4c, 0x70, 0x61, 0x69, 0x74, 0x69, 0x6b, 0x42, 0x20,
+0x2bb, 0x65, 0x20, 0x7b, 0x30, 0x7d, 0x3b, 0x4d, 0x42, 0x20, 0x2bb, 0x65, 0x20, 0x7b, 0x30, 0x7d, 0x3b, 0x47, 0x42, 0x20,
+0x2bb, 0x65, 0x20, 0x7b, 0x30, 0x7d, 0x3b, 0x54, 0x42, 0x20, 0x2bb, 0x65, 0x20, 0x7b, 0x30, 0x7d, 0x3b, 0x50, 0x42, 0x20,
+0x2bb, 0x65, 0x20, 0x7b, 0x30, 0x7d, 0x3b, 0x45, 0x42, 0x20, 0x2bb, 0x65, 0x20, 0x7b, 0x30, 0x7d, 0x4b, 0x69, 0x42, 0x20,
+0x2bb, 0x65, 0x20, 0x7b, 0x30, 0x7d, 0x3b, 0x4d, 0x69, 0x42, 0x20, 0x2bb, 0x65, 0x20, 0x7b, 0x30, 0x7d, 0x3b, 0x47, 0x69,
+0x42, 0x20, 0x2bb, 0x65, 0x20, 0x7b, 0x30, 0x7d, 0x3b, 0x54, 0x69, 0x42, 0x20, 0x2bb, 0x65, 0x20, 0x7b, 0x30, 0x7d, 0x3b,
+0x50, 0x69, 0x42, 0x20, 0x2bb, 0x65, 0x20, 0x7b, 0x30, 0x7d, 0x3b, 0x45, 0x69, 0x42, 0x20, 0x2bb, 0x65, 0x20, 0x7b, 0x30,
+0x7d, 0x62, 0x61, 0xfd, 0x74, 0x431, 0x430, 0x439, 0x442, 0x438, 0x628, 0x627, 0x626, 0x679, 0x6b, 0x42, 0x3b, 0x4d, 0x42, 0x3b,
+0x47, 0x42, 0x3b, 0x54, 0x42, 0x3b, 0x67e, 0x6cc, 0x20, 0x628, 0x6cc, 0x3b, 0x45, 0x42, 0x62, 0x65, 0x69, 0x74, 0x69, 0x61,
+0x75, 0x92c, 0x93e, 0x92f, 0x91f, 0x61, 0x1e6d, 0x61, 0x6d, 0x1e0d, 0x61, 0x6e, 0x6b, 0x41, 0x1e6c, 0x3b, 0x4d, 0x41, 0x1e6c, 0x3b,
+0x47, 0x41, 0x1e6c, 0x3b, 0x54, 0x41, 0x1e6c, 0x3b, 0x50, 0x42, 0x3b, 0x45, 0x42, 0x13d7, 0x13d3, 0x13cd, 0x13a6, 0x13b5, 0x13a9, 0x431,
+0x430, 0x430, 0x439, 0x442, 0x43a, 0x411, 0x3b, 0x41c, 0x411, 0x3b, 0x47, 0x42, 0x3b, 0x54, 0x42, 0x3b, 0x50, 0x42, 0x3b, 0x45,
+0x42, 0xd804, 0xdd1d, 0xd804, 0xdd2d, 0xd804, 0xdd16, 0xd804, 0xdd34, 0x62, 0x79, 0x74, 0x65, 0x79, 0x6a9, 0x6cc, 0x644, 0x648, 0x628, 0x627,
+0x6cc, 0x62a, 0x3b, 0x645, 0x6af, 0x627, 0x628, 0x627, 0x6cc, 0x62a, 0x3b, 0x6af, 0x6cc, 0x6af, 0x627, 0x628, 0x627, 0x6cc, 0x62a, 0x3b,
+0x62a, 0x631, 0x627, 0x628, 0x627, 0x6cc, 0x62a, 0x3b, 0x50, 0x42, 0x3b, 0x45, 0x42, 0x6d, 0x67, 0x61, 0x20, 0x62, 0x79, 0x74,
+0x65
 };
 
-static const ushort am_data[] = {
+static const char16_t am_data[] = {
 0x41, 0x4d, 0x57, 0x44, 0x76, 0x6d, 0x2e, 0x65, 0x20, 0x70, 0x61, 0x72, 0x61, 0x64, 0x69, 0x74, 0x65, 0x73, 0x1325, 0x12cb,
 0x1275, 0x635, 0x9aa, 0x9c2, 0x9f0, 0x9cd, 0x9ac, 0x9be, 0x9b9, 0x9cd, 0x9a8, 0x410, 0x41c, 0xf66, 0xf94, 0xf0b, 0xf46, 0xf0b, 0x41, 0x2e,
 0x4d, 0x2e, 0x43f, 0x440, 0x2e, 0x43e, 0x431, 0x2e, 0x1014, 0x1036, 0x1014, 0x1000, 0x103a, 0x61, 0x2e, 0xa0, 0x6d, 0x2e, 0x4e0a, 0x5348,
 0x64, 0x6f, 0x70, 0x2e, 0x61, 0x2e, 0x6d, 0x2e, 0x61, 0x6d, 0x61, 0x74, 0x6d, 0x61, 0x70, 0x2e, 0x6d, 0x61, 0x74, 0x69,
-0x6e, 0x6d, 0x3c0, 0x2e, 0x3bc, 0x2e, 0x53, 0x61, 0x66, 0x69, 0x79, 0x61, 0x5dc, 0x5e4, 0x5e0, 0x5d4, 0x5f4, 0x5e6, 0x64, 0x65,
-0x2e, 0x66, 0x2e, 0x68, 0x2e, 0x72, 0x2e, 0x6e, 0x2e, 0x5348, 0x524d, 0x49, 0x73, 0x75, 0x6b, 0xcaa, 0xcc2, 0xcb0, 0xccd, 0xcb5,
-0xcbe, 0xcb9, 0xccd, 0xca8, 0x442, 0x430, 0x4a3, 0x43a, 0x44b, 0xc624, 0xc804, 0x42, 0x4e, 0x5a, 0x2e, 0x4d, 0x55, 0x2e, 0xe81, 0xec8,
-0xead, 0xe99, 0xe97, 0xec8, 0xebd, 0xe87, 0x70, 0x72, 0x69, 0x65, 0x6b, 0x161, 0x70, 0x75, 0x73, 0x64, 0x69, 0x65, 0x6e, 0x101,
-0x6e, 0x74, 0x254, 0x301, 0x6e, 0x67, 0x254, 0x301, 0x70, 0x72, 0x69, 0x65, 0x161, 0x70, 0x69, 0x65, 0x74, 0x43f, 0x440, 0x435,
-0x442, 0x43f, 0x43b, 0x430, 0x434, 0x43d, 0x435, 0x50, 0x47, 0x92e, 0x2e, 0x92a, 0x942, 0x2e, 0x4af, 0x2e, 0x4e9, 0x2e, 0x92a, 0x942,
-0x930, 0x94d, 0x935, 0x93e, 0x939, 0x94d, 0x928, 0x63a, 0x2e, 0x645, 0x2e, 0x642, 0x628, 0x644, 0x200c, 0x627, 0x632, 0x638, 0x647, 0x631,
-0x64, 0x61, 0x20, 0x6d, 0x61, 0x6e, 0x68, 0xe3, 0xa2a, 0xa42, 0x2e, 0xa26, 0xa41, 0x2e, 0x4e, 0x44, 0x43f, 0x440, 0x435, 0x20,
-0x43f, 0x43e, 0x434, 0x43d, 0x435, 0x43f, 0x440, 0x438, 0x458, 0x435, 0x20, 0x43f, 0x43e, 0x434, 0x43d, 0x435, 0x70, 0x72, 0x69, 0x6a,
-0x65, 0x20, 0x70, 0x6f, 0x64, 0x6e, 0x65, 0x70, 0x72, 0x65, 0x20, 0x70, 0x6f, 0x64, 0x6e, 0x65, 0x4d5, 0x43c, 0x431, 0x438,
-0x441, 0x431, 0x43e, 0x43d, 0x44b, 0x20, 0x440, 0x430, 0x437, 0x43c, 0x4d5, 0x635, 0x628, 0x62d, 0x60c, 0x20, 0x645, 0x646, 0x62c, 0x647,
-0x646, 0x62f, 0xdb4, 0xdd9, 0x2e, 0xdc0, 0x2e, 0x47, 0x48, 0x66, 0x6d, 0xbae, 0xbc1, 0xbb1, 0xbcd, 0xbaa, 0xb95, 0xbb2, 0xbcd, 0xe01,
-0xe48, 0xe2d, 0xe19, 0xe40, 0xe17, 0xe35, 0xe48, 0xe22, 0xe07, 0xf66, 0xf94, 0xf0b, 0xf51, 0xfb2, 0xf7c, 0xf0b, 0x1295, 0x1309, 0x1206, 0x20,
-0x1230, 0x12d3, 0x1270, 0x68, 0x65, 0x6e, 0x67, 0x69, 0x68, 0x65, 0x6e, 0x67, 0x69, 0xd6, 0xd6, 0x67, 0xfc, 0x6e, 0x6f, 0x72,
-0x74, 0x61, 0x64, 0x61, 0x6e, 0x20, 0xf6, 0x148, 0x686, 0x6c8, 0x634, 0x62a, 0x649, 0x646, 0x20, 0x628, 0x6c7, 0x631, 0x6c7, 0x646,
-0x434, 0x43f, 0x54, 0x4f, 0x422, 0x41e, 0x53, 0x41, 0x79, 0x62, 0x53, 0x75, 0x62, 0x5e4, 0x5bf, 0x5d0, 0x5b7, 0x5e8, 0x5de, 0x5d9,
-0x5d8, 0x5d0, 0x5b8, 0x5d2, 0xc0, 0xe1, 0x72, 0x1ecd, 0x300, 0xc0, 0xe1, 0x72, 0x254, 0x300, 0x66, 0x6f, 0x72, 0x6d, 0x69, 0x64,
-0x64, 0x61, 0x67, 0x70, 0x72, 0x69, 0x6a, 0x65, 0x70, 0x6f, 0x64, 0x6e, 0x65, 0x41, 0x4e, 0x4e, 0x2019, 0x1ee5, 0x74, 0x1ee5,
-0x74, 0x1ee5, 0x128, 0x79, 0x61, 0x6b, 0x77, 0x61, 0x6b, 0x79, 0x61, 0x61, 0x2e, 0x14b, 0x64, 0x69, 0x61, 0x6d, 0x20, 0x56,
-0x6f, 0x72, 0x6d, 0x69, 0x74, 0x74, 0x61, 0x67, 0xa3b8, 0xa111, 0x69, 0x111, 0x69, 0x74, 0x62, 0x65, 0x61, 0x69, 0x76, 0x65,
-0x74, 0x69, 0x62, 0x4d, 0x61, 0x6d, 0x62, 0x69, 0x61, 0x4c, 0x75, 0x6d, 0x61, 0x20, 0x6c, 0x77, 0x61, 0x20, 0x4b, 0x73,
-0x75, 0x62, 0x61, 0x6b, 0x61, 0x4b, 0x69, 0x72, 0x6f, 0x6b, 0x6f, 0x54, 0x65, 0x73, 0x69, 0x72, 0x61, 0x6e, 0x6b, 0x61,
-0x6e, 0x67, 0x2019, 0x61, 0x6d, 0x61, 0x2d5c, 0x2d49, 0x2d3c, 0x2d30, 0x2d61, 0x2d5c, 0x74, 0x69, 0x66, 0x61, 0x77, 0x74, 0x6e, 0x20,
-0x74, 0x75, 0x66, 0x61, 0x74, 0x70, 0x61, 0x6d, 0x69, 0x6c, 0x61, 0x75, 0x75, 0x74, 0x75, 0x6b, 0x6f, 0x4b, 0x49, 0x13cc,
-0x13be, 0x13b4, 0x4d, 0x75, 0x68, 0x69, 0x54, 0x4f, 0x4f, 0x75, 0x6c, 0x75, 0x63, 0x68, 0x65, 0x6c, 0x6f, 0x52, 0x168, 0x6b,
-0x61, 0x72, 0x6f, 0x6f, 0x6e, 0x1c1, 0x67, 0x6f, 0x61, 0x67, 0x61, 0x73, 0x55, 0x68, 0x72, 0x20, 0x76, 0xf6, 0x72, 0x6d,
-0x69, 0x64, 0x64, 0x61, 0x61, 0x63, 0x68, 0x73, 0x190, 0x6e, 0x6b, 0x61, 0x6b, 0x25b, 0x6e, 0x79, 0xe1, 0x4d, 0x75, 0x6e,
-0x6b, 0x79, 0x6f, 0x69, 0x63, 0x68, 0x65, 0x68, 0x65, 0x61, 0x76, 0x6f, 0x54, 0x61, 0x70, 0x61, 0x72, 0x61, 0x63, 0x68,
-0x75, 0x41, 0x64, 0x64, 0x75, 0x68, 0x61, 0x4f, 0x44, 0x5a, 0x64, 0x61, 0x74, 0x20, 0x61, 0x7a, 0x61, 0x6c, 0x6d, 0x61,
-0x6b, 0x65, 0x6f, 0x92b, 0x941, 0x902, 0x44, 0x69, 0x6e, 0x64, 0x61, 0x6d, 0x6f, 0x69, 0x65, 0x73, 0x61, 0x2e, 0x67, 0x49,
-0x20, 0x62, 0x69, 0x6b, 0x25b, 0x302, 0x67, 0x6c, 0xe0, 0x53, 0x75, 0x62, 0x62, 0x61, 0x61, 0x68, 0x69, 0x69, 0x64, 0x69,
-0x253, 0x61, 0x6b, 0xed, 0x6b, 0xed, 0x72, 0xed, 0x67, 0x73, 0xe1, 0x72, 0xfa, 0x77, 0xe1, 0x77, 0x69, 0x63, 0x68, 0x69,
-0x73, 0x68, 0x75, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6d, 0x61, 0x6e, 0xe1, 0x52, 0x57, 0x42d, 0x418, 0x4c, 0x77, 0x61, 0x6d,
-0x69, 0x6c, 0x61, 0x77, 0x75, 0x6b, 0x69, 0x25b, 0x6d, 0x25b, 0x301, 0x25b, 0x6d, 0x64, 0x65, 0x20, 0x6c, 0x61, 0x20, 0x6d,
-0x61, 0xf1, 0x61, 0x6e, 0x61, 0x6d, 0x62, 0x61, 0xa78c, 0x6d, 0x62, 0x61, 0xa78c, 0x6d, 0x62, 0x61, 0x2bc, 0xe1, 0x6d, 0x62,
-0x61, 0x2bc, 0x628, 0x2e, 0x646, 0x64, 0x6f, 0x70, 0x6f, 0x142, 0x64, 0x6e, 0x6a, 0x61, 0x69, 0x70, 0x2e
+0x6e, 0x3c0, 0x2e, 0x3bc, 0x2e, 0x53, 0x61, 0x66, 0x69, 0x79, 0x61, 0x5dc, 0x5e4, 0x5e0, 0x5d4, 0x5f4, 0x5e6, 0x64, 0x65, 0x2e,
+0x66, 0x2e, 0x68, 0x2e, 0x72, 0x2e, 0x6e, 0x2e, 0x5348, 0x524d, 0x49, 0x73, 0x75, 0x6b, 0xcaa, 0xcc2, 0xcb0, 0xccd, 0xcb5, 0xcbe,
+0xcb9, 0xccd, 0xca8, 0x442, 0x430, 0x4a3, 0x43a, 0x44b, 0xc624, 0xc804, 0x42, 0x4e, 0x5a, 0x2e, 0x4d, 0x55, 0x2e, 0xe81, 0xec8, 0xead,
+0xe99, 0xe97, 0xec8, 0xebd, 0xe87, 0x70, 0x72, 0x69, 0x65, 0x6b, 0x161, 0x70, 0x75, 0x73, 0x64, 0x69, 0x65, 0x6e, 0x101, 0x6e,
+0x74, 0x254, 0x301, 0x6e, 0x67, 0x254, 0x301, 0x70, 0x72, 0x69, 0x65, 0x161, 0x70, 0x69, 0x65, 0x74, 0x43f, 0x440, 0x435, 0x442,
+0x43f, 0x43b, 0x430, 0x434, 0x43d, 0x435, 0x50, 0x47, 0x92e, 0x2e, 0x92a, 0x942, 0x2e, 0x4af, 0x2e, 0x4e9, 0x2e, 0x92a, 0x942, 0x930,
+0x94d, 0x935, 0x93e, 0x939, 0x94d, 0x928, 0x63a, 0x2e, 0x645, 0x2e, 0x642, 0x628, 0x644, 0x200c, 0x627, 0x632, 0x638, 0x647, 0x631, 0x64,
+0x61, 0x20, 0x6d, 0x61, 0x6e, 0x68, 0xe3, 0xa2a, 0xa42, 0x2e, 0xa26, 0xa41, 0x2e, 0x4e, 0x44, 0x43f, 0x440, 0x435, 0x20, 0x43f,
+0x43e, 0x434, 0x43d, 0x435, 0x70, 0x72, 0x69, 0x6a, 0x65, 0x20, 0x70, 0x6f, 0x64, 0x6e, 0x65, 0x70, 0x72, 0x65, 0x20, 0x70,
+0x6f, 0x64, 0x6e, 0x65, 0x43f, 0x440, 0x438, 0x458, 0x435, 0x20, 0x43f, 0x43e, 0x434, 0x43d, 0x435, 0x4d5, 0x43c, 0x431, 0x438, 0x441,
+0x431, 0x43e, 0x43d, 0x44b, 0x20, 0x440, 0x430, 0x437, 0x43c, 0x4d5, 0x635, 0x628, 0x62d, 0x60c, 0x20, 0x645, 0x646, 0x62c, 0x647, 0x646,
+0x62f, 0xdb4, 0xdd9, 0x2e, 0xdc0, 0x2e, 0x47, 0x48, 0x66, 0x6d, 0xbae, 0xbc1, 0xbb1, 0xbcd, 0xbaa, 0xb95, 0xbb2, 0xbcd, 0xe01, 0xe48,
+0xe2d, 0xe19, 0xe40, 0xe17, 0xe35, 0xe48, 0xe22, 0xe07, 0xf66, 0xf94, 0xf0b, 0xf51, 0xfb2, 0xf7c, 0xf0b, 0x1295, 0x1309, 0x1206, 0x20, 0x1230,
+0x12d3, 0x1270, 0x68, 0x65, 0x6e, 0x67, 0x69, 0x68, 0x65, 0x6e, 0x67, 0x69, 0xd6, 0xd6, 0x67, 0xfc, 0x6e, 0x6f, 0x72, 0x74,
+0x61, 0x64, 0x61, 0x6e, 0x20, 0xf6, 0x148, 0x686, 0x6c8, 0x634, 0x62a, 0x649, 0x646, 0x20, 0x628, 0x6c7, 0x631, 0x6c7, 0x646, 0x434,
+0x43f, 0x54, 0x4f, 0x422, 0x41e, 0x53, 0x41, 0x79, 0x62, 0x53, 0x75, 0x62, 0x5e4, 0x5bf, 0x5d0, 0x5b7, 0x5e8, 0x5de, 0x5d9, 0x5d8,
+0x5d0, 0x5b8, 0x5d2, 0xc0, 0xe1, 0x72, 0x1ecd, 0x300, 0xc0, 0xe1, 0x72, 0x254, 0x300, 0x66, 0x6f, 0x72, 0x6d, 0x69, 0x64, 0x64,
+0x61, 0x67, 0x70, 0x72, 0x69, 0x6a, 0x65, 0x70, 0x6f, 0x64, 0x6e, 0x65, 0x41, 0x4e, 0x4e, 0x2019, 0x1ee5, 0x74, 0x1ee5, 0x74,
+0x1ee5, 0x128, 0x79, 0x61, 0x6b, 0x77, 0x61, 0x6b, 0x79, 0x61, 0x14b, 0x64, 0x69, 0x61, 0x6d, 0x20, 0x56, 0x6f, 0x72, 0x6d,
+0x69, 0x74, 0x74, 0x61, 0x67, 0xa3b8, 0xa111, 0x69, 0x111, 0x69, 0x74, 0x62, 0x65, 0x61, 0x69, 0x76, 0x65, 0x74, 0x69, 0x62,
+0x4d, 0x61, 0x6d, 0x62, 0x69, 0x61, 0x4c, 0x75, 0x6d, 0x61, 0x20, 0x6c, 0x77, 0x61, 0x20, 0x4b, 0x73, 0x75, 0x62, 0x61,
+0x6b, 0x61, 0x4b, 0x69, 0x72, 0x6f, 0x6b, 0x6f, 0x54, 0x65, 0x73, 0x69, 0x72, 0x61, 0x6e, 0x6b, 0x61, 0x6e, 0x67, 0x2019,
+0x61, 0x6d, 0x61, 0x2d5c, 0x2d49, 0x2d3c, 0x2d30, 0x2d61, 0x2d5c, 0x74, 0x69, 0x66, 0x61, 0x77, 0x74, 0x6e, 0x20, 0x74, 0x75, 0x66,
+0x61, 0x74, 0x70, 0x61, 0x6d, 0x69, 0x6c, 0x61, 0x75, 0x75, 0x74, 0x75, 0x6b, 0x6f, 0x4b, 0x49, 0x13cc, 0x13be, 0x13b4, 0x4d,
+0x75, 0x68, 0x69, 0x54, 0x4f, 0x4f, 0x75, 0x6c, 0x75, 0x63, 0x68, 0x65, 0x6c, 0x6f, 0x52, 0x168, 0x6b, 0x61, 0x72, 0x6f,
+0x6f, 0x6e, 0x1c1, 0x67, 0x6f, 0x61, 0x67, 0x61, 0x73, 0x55, 0x68, 0x72, 0x20, 0x76, 0xf6, 0x72, 0x6d, 0x69, 0x64, 0x64,
+0x61, 0x61, 0x63, 0x68, 0x73, 0x190, 0x6e, 0x6b, 0x61, 0x6b, 0x25b, 0x6e, 0x79, 0xe1, 0x4d, 0x75, 0x6e, 0x6b, 0x79, 0x6f,
+0x69, 0x63, 0x68, 0x65, 0x68, 0x65, 0x61, 0x76, 0x6f, 0x54, 0x61, 0x70, 0x61, 0x72, 0x61, 0x63, 0x68, 0x75, 0x41, 0x64,
+0x64, 0x75, 0x68, 0x61, 0x4f, 0x44, 0x5a, 0x64, 0x61, 0x74, 0x20, 0x61, 0x7a, 0x61, 0x6c, 0x6d, 0x61, 0x6b, 0x65, 0x6f,
+0x92b, 0x941, 0x902, 0x44, 0x69, 0x6e, 0x64, 0x61, 0x6d, 0x6f, 0x69, 0x65, 0x73, 0x61, 0x2e, 0x67, 0x49, 0x20, 0x62, 0x69,
+0x6b, 0x25b, 0x302, 0x67, 0x6c, 0xe0, 0x53, 0x75, 0x62, 0x62, 0x61, 0x61, 0x68, 0x69, 0x69, 0x64, 0x69, 0x253, 0x61, 0x6b,
+0xed, 0x6b, 0xed, 0x72, 0xed, 0x67, 0x73, 0xe1, 0x72, 0xfa, 0x77, 0xe1, 0x77, 0x69, 0x63, 0x68, 0x69, 0x73, 0x68, 0x75,
+0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6d, 0x61, 0x6e, 0xe1, 0x52, 0x57, 0x42d, 0x418, 0x4c, 0x77, 0x61, 0x6d, 0x69, 0x6c, 0x61,
+0x77, 0x75, 0x6b, 0x69, 0x25b, 0x6d, 0x25b, 0x301, 0x25b, 0x6d, 0x64, 0x65, 0x20, 0x6c, 0x61, 0x20, 0x6d, 0x61, 0xf1, 0x61,
+0x6e, 0x61, 0x6d, 0x62, 0x61, 0xa78c, 0x6d, 0x62, 0x61, 0xa78c, 0x6d, 0x62, 0x61, 0x2bc, 0xe1, 0x6d, 0x62, 0x61, 0x2bc, 0x628,
+0x2e, 0x646, 0x64, 0x6f, 0x70, 0x6f, 0x142, 0x64, 0x6e, 0x6a, 0x61, 0x69, 0x70, 0x2e
 };
 
-static const ushort pm_data[] = {
+static const char16_t pm_data[] = {
 0x50, 0x4d, 0x57, 0x42, 0x6e, 0x6d, 0x2e, 0x65, 0x20, 0x70, 0x61, 0x73, 0x64, 0x69, 0x74, 0x65, 0x73, 0x12a8, 0x1230, 0x12d3,
 0x1275, 0x645, 0x985, 0x9aa, 0x9f0, 0x9be, 0x9b9, 0x9cd, 0x9a8, 0x41f, 0x41c, 0xf55, 0xfb1, 0xf72, 0xf0b, 0xf46, 0xf0b, 0x47, 0x2e, 0x4d,
 0x2e, 0x441, 0x43b, 0x2e, 0x43e, 0x431, 0x2e, 0x100a, 0x1014, 0x1031, 0x70, 0x2e, 0xa0, 0x6d, 0x2e, 0x4e0b, 0x5348, 0x6f, 0x64, 0x70,
@@ -3271,944 +3254,903 @@ static const ushort pm_data[] = {
 0x5d0, 0x5b8, 0x5db, 0x5de, 0x5d9, 0x5d8, 0x5d0, 0x5b8, 0x5d2, 0x1ecc, 0x300, 0x73, 0xe1, 0x6e, 0x186, 0x300, 0x73, 0xe1, 0x6e, 0x65,
 0x74, 0x74, 0x65, 0x72, 0x6d, 0x69, 0x64, 0x64, 0x61, 0x67, 0x70, 0x6f, 0x70, 0x6f, 0x64, 0x6e, 0x65, 0x43f, 0x43e, 0x441,
 0x43b, 0x438, 0x458, 0x435, 0x20, 0x43f, 0x43e, 0x434, 0x43d, 0x435, 0x45, 0x57, 0x4e, 0x2019, 0x61, 0x62, 0x61, 0x6c, 0x69, 0x128,
-0x79, 0x61, 0x77, 0x129, 0x6f, 0x6f, 0x70, 0x2e, 0x263, 0x65, 0x74, 0x72, 0x254, 0x61, 0x6d, 0x20, 0x4e, 0x61, 0x6d, 0x69,
-0x74, 0x74, 0x61, 0x67, 0xa06f, 0xa2d2, 0x65, 0x61, 0x68, 0x6b, 0x65, 0x74, 0x62, 0x65, 0x61, 0x69, 0x76, 0x65, 0x74, 0x65,
-0x62, 0x4d, 0x6f, 0x67, 0x6c, 0x75, 0x6d, 0x61, 0x20, 0x6c, 0x77, 0x61, 0x20, 0x70, 0x6b, 0x69, 0x6b, 0x69, 0x69, 0x257,
-0x65, 0x48, 0x77, 0x61, 0x129, 0x2d, 0x69, 0x6e, 0x129, 0x54, 0x65, 0x69, 0x70, 0x61, 0x6b, 0x69, 0x6e, 0x67, 0x6f, 0x74,
-0x6f, 0x2d5c, 0x2d30, 0x2d37, 0x2d33, 0x2d33, 0x2d6f, 0x2d30, 0x2d5c, 0x74, 0x61, 0x64, 0x67, 0x67, 0x2b7, 0x61, 0x74, 0x6e, 0x20, 0x74,
-0x6d, 0x65, 0x64, 0x64, 0x69, 0x74, 0x70, 0x61, 0x6d, 0x75, 0x6e, 0x79, 0x69, 0x6b, 0x79, 0x69, 0x75, 0x6b, 0x6f, 0x6e,
-0x79, 0x69, 0x55, 0x54, 0x13d2, 0x13af, 0x13f1, 0x13a2, 0x13d7, 0x13e2, 0x43, 0x68, 0x69, 0x6c, 0x6f, 0x4d, 0x55, 0x55, 0x61, 0x6b,
-0x61, 0x73, 0x75, 0x62, 0x61, 0x168, 0x47, 0x6b, 0x6f, 0x6f, 0x73, 0x6b, 0x6f, 0x6c, 0x69, 0x6e, 0x79, 0x1c3, 0x75, 0x69,
-0x61, 0x73, 0x55, 0x68, 0x72, 0x20, 0x6e, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x64, 0x61, 0x61, 0x63, 0x68, 0x73, 0x190, 0x6e,
-0x64, 0xe1, 0x6d, 0xe2, 0x45, 0x69, 0x67, 0x75, 0x6c, 0x6f, 0x69, 0x63, 0x68, 0x61, 0x6d, 0x74, 0x68, 0x69, 0x45, 0x62,
-0x6f, 0x6e, 0x67, 0x69, 0x41, 0x6c, 0x75, 0x75, 0x6c, 0x61, 0x4f, 0x54, 0x1e0c, 0x65, 0x66, 0x66, 0x69, 0x72, 0x20, 0x61,
-0x7a, 0x61, 0x6e, 0x79, 0x69, 0x61, 0x67, 0x68, 0x75, 0x6f, 0x92c, 0x947, 0x932, 0x93e, 0x938, 0x947, 0x44, 0x69, 0x6c, 0x6f,
-0x6c, 0x6f, 0x6e, 0x6f, 0x6d, 0xeb, 0x74, 0x74, 0x65, 0x73, 0x61, 0x2e, 0x6b, 0x49, 0x20, 0x253, 0x75, 0x67, 0x61, 0x6a,
-0x254, 0x70, 0x5a, 0x61, 0x61, 0x72, 0x69, 0x6b, 0x61, 0x79, 0x20, 0x62, 0x65, 0x62, 0x79, 0xe1, 0x6d, 0x75, 0x6e, 0x67,
-0x259, 0x67, 0xf3, 0x67, 0x259, 0x6c, 0x65, 0x63, 0x25b, 0x25b, 0x301, 0x6e, 0x6b, 0x6f, 0x6d, 0x63, 0x68, 0x6f, 0x63, 0x68,
-0x69, 0x6c, 0x2019, 0x6c, 0x6c, 0x69, 0x6c, 0x6c, 0x69, 0x6b, 0x75, 0x67, 0xfa, 0x54, 0x14a, 0x42d, 0x41a, 0x50, 0x61, 0x73,
-0x68, 0x61, 0x6d, 0x69, 0x68, 0x65, 0x6b, 0x69, 0x73, 0x25b, 0x301, 0x6e, 0x64, 0x25b, 0x64, 0x65, 0x20, 0x6c, 0x61, 0x20,
-0x74, 0x61, 0x72, 0x64, 0x65, 0x14b, 0x6b, 0x61, 0x20, 0x6d, 0x62, 0x254, 0x301, 0x74, 0x20, 0x6e, 0x6a, 0x69, 0x6e, 0x63,
-0x77, 0xf2, 0x6e, 0x7a, 0xe9, 0x6d, 0x62f, 0x2e, 0x646, 0x77, 0xf3, 0x74, 0x70, 0x6f, 0x142, 0x64, 0x6e, 0x6a, 0x61, 0x70,
-0x6f, 0x70, 0x6f, 0x142, 0x64, 0x6e, 0x6a, 0x75, 0x65, 0x70, 0x2e
+0x79, 0x61, 0x77, 0x129, 0x6f, 0x6f, 0x263, 0x65, 0x74, 0x72, 0x254, 0x61, 0x6d, 0x20, 0x4e, 0x61, 0x6d, 0x69, 0x74, 0x74,
+0x61, 0x67, 0xa06f, 0xa2d2, 0x65, 0x61, 0x68, 0x6b, 0x65, 0x74, 0x62, 0x65, 0x61, 0x69, 0x76, 0x65, 0x74, 0x65, 0x62, 0x4d,
+0x6f, 0x67, 0x6c, 0x75, 0x6d, 0x61, 0x20, 0x6c, 0x77, 0x61, 0x20, 0x70, 0x6b, 0x69, 0x6b, 0x69, 0x69, 0x257, 0x65, 0x48,
+0x77, 0x61, 0x129, 0x2d, 0x69, 0x6e, 0x129, 0x54, 0x65, 0x69, 0x70, 0x61, 0x6b, 0x69, 0x6e, 0x67, 0x6f, 0x74, 0x6f, 0x2d5c,
+0x2d30, 0x2d37, 0x2d33, 0x2d33, 0x2d6f, 0x2d30, 0x2d5c, 0x74, 0x61, 0x64, 0x67, 0x67, 0x2b7, 0x61, 0x74, 0x6e, 0x20, 0x74, 0x6d, 0x65,
+0x64, 0x64, 0x69, 0x74, 0x70, 0x61, 0x6d, 0x75, 0x6e, 0x79, 0x69, 0x6b, 0x79, 0x69, 0x75, 0x6b, 0x6f, 0x6e, 0x79, 0x69,
+0x55, 0x54, 0x13d2, 0x13af, 0x13f1, 0x13a2, 0x13d7, 0x13e2, 0x43, 0x68, 0x69, 0x6c, 0x6f, 0x4d, 0x55, 0x55, 0x61, 0x6b, 0x61, 0x73,
+0x75, 0x62, 0x61, 0x168, 0x47, 0x6b, 0x6f, 0x6f, 0x73, 0x6b, 0x6f, 0x6c, 0x69, 0x6e, 0x79, 0x1c3, 0x75, 0x69, 0x61, 0x73,
+0x55, 0x68, 0x72, 0x20, 0x6e, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x64, 0x61, 0x61, 0x63, 0x68, 0x73, 0x190, 0x6e, 0x64, 0xe1,
+0x6d, 0xe2, 0x45, 0x69, 0x67, 0x75, 0x6c, 0x6f, 0x69, 0x63, 0x68, 0x61, 0x6d, 0x74, 0x68, 0x69, 0x45, 0x62, 0x6f, 0x6e,
+0x67, 0x69, 0x41, 0x6c, 0x75, 0x75, 0x6c, 0x61, 0x4f, 0x54, 0x1e0c, 0x65, 0x66, 0x66, 0x69, 0x72, 0x20, 0x61, 0x7a, 0x61,
+0x6e, 0x79, 0x69, 0x61, 0x67, 0x68, 0x75, 0x6f, 0x92c, 0x947, 0x932, 0x93e, 0x938, 0x947, 0x44, 0x69, 0x6c, 0x6f, 0x6c, 0x6f,
+0x6e, 0x6f, 0x6d, 0xeb, 0x74, 0x74, 0x65, 0x73, 0x61, 0x2e, 0x6b, 0x49, 0x20, 0x253, 0x75, 0x67, 0x61, 0x6a, 0x254, 0x70,
+0x5a, 0x61, 0x61, 0x72, 0x69, 0x6b, 0x61, 0x79, 0x20, 0x62, 0x65, 0x62, 0x79, 0xe1, 0x6d, 0x75, 0x6e, 0x67, 0x259, 0x67,
+0xf3, 0x67, 0x259, 0x6c, 0x65, 0x63, 0x25b, 0x25b, 0x301, 0x6e, 0x6b, 0x6f, 0x6d, 0x63, 0x68, 0x6f, 0x63, 0x68, 0x69, 0x6c,
+0x2019, 0x6c, 0x6c, 0x69, 0x6c, 0x6c, 0x69, 0x6b, 0x75, 0x67, 0xfa, 0x54, 0x14a, 0x42d, 0x41a, 0x50, 0x61, 0x73, 0x68, 0x61,
+0x6d, 0x69, 0x68, 0x65, 0x6b, 0x69, 0x73, 0x25b, 0x301, 0x6e, 0x64, 0x25b, 0x64, 0x65, 0x20, 0x6c, 0x61, 0x20, 0x74, 0x61,
+0x72, 0x64, 0x65, 0x14b, 0x6b, 0x61, 0x20, 0x6d, 0x62, 0x254, 0x301, 0x74, 0x20, 0x6e, 0x6a, 0x69, 0x6e, 0x63, 0x77, 0xf2,
+0x6e, 0x7a, 0xe9, 0x6d, 0x62f, 0x2e, 0x646, 0x77, 0xf3, 0x74, 0x70, 0x6f, 0x142, 0x64, 0x6e, 0x6a, 0x61, 0x70, 0x6f, 0x70,
+0x6f, 0x142, 0x64, 0x6e, 0x6a, 0x75, 0x65, 0x70, 0x2e
 };
 
-static const ushort currency_symbol_data[] = {
+static const char16_t currency_symbol_data[] = {
 0x42, 0x72, 0x4b, 0x73, 0x68, 0x52, 0x24, 0x4c, 0x65, 0x6b, 0xeb, 0x64, 0x65, 0x6e, 0x20ac, 0x1265, 0x122d, 0x62c, 0x2e, 0x645,
-0x2e, 0x200f, 0x62f, 0x2e, 0x62c, 0x2e, 0x200f, 0x62f, 0x2e, 0x628, 0x2e, 0x200f, 0x46, 0x43, 0x46, 0x41, 0x43, 0x46, 0x46, 0x64,
-0x6a, 0x4e, 0x66, 0x6b, 0x62f, 0x2e, 0x639, 0x2e, 0x200f, 0x20aa, 0x62f, 0x2e, 0x623, 0x2e, 0x200f, 0x62f, 0x2e, 0x643, 0x2e, 0x200f,
-0x644, 0x2e, 0x644, 0x2e, 0x200f, 0x62f, 0x2e, 0x644, 0x2e, 0x200f, 0x623, 0x2e, 0x645, 0x2e, 0x62f, 0x2e, 0x645, 0x2e, 0x200f, 0x631,
-0x2e, 0x639, 0x2e, 0x200f, 0x631, 0x2e, 0x642, 0x2e, 0x200f, 0x631, 0x2e, 0x633, 0x2e, 0x200f, 0x53, 0x62c, 0x2e, 0x633, 0x2e, 0x644,
-0x2e, 0x633, 0x2e, 0x200f, 0x62f, 0x2e, 0x62a, 0x2e, 0x200f, 0x62f, 0x2e, 0x625, 0x2e, 0x200f, 0x631, 0x2e, 0x64a, 0x2e, 0x200f, 0xa3,
-0x58f, 0x20b9, 0x20bc, 0x20bd, 0x9f3, 0x4e, 0x75, 0x2e, 0x43b, 0x432, 0x2e, 0x4b, 0x17db, 0xa5, 0x48, 0x4b, 0x24, 0x4d, 0x4f, 0x50,
-0x24, 0x48, 0x52, 0x4b, 0x4b, 0x4d, 0x4b, 0x10d, 0x6b, 0x72, 0x2e, 0x41, 0x66, 0x6c, 0x2e, 0x4e, 0x41, 0x66, 0x2e, 0x55,
-0x53, 0x24, 0x50, 0x46, 0x42, 0x75, 0x44, 0x47, 0x48, 0x20b5, 0x41, 0x72, 0x4d, 0x4b, 0x52, 0x4d, 0x52, 0x73, 0x20a6, 0x20b1,
-0x52, 0x46, 0x57, 0x53, 0x24, 0x53, 0x52, 0x4c, 0x65, 0x45, 0x6b, 0x72, 0x54, 0x53, 0x68, 0x54, 0x24, 0x55, 0x53, 0x68,
-0x41, 0x45, 0x44, 0x56, 0x54, 0x44, 0x41, 0x43, 0x46, 0x41, 0x46, 0x43, 0x46, 0x43, 0x46, 0x50, 0x46, 0x47, 0x47, 0x55,
-0x4d, 0x4d, 0x41, 0x44, 0x43, 0x48, 0x46, 0x4c, 0x53, 0x44, 0x54, 0x20be, 0x20b2, 0x46, 0x74, 0x49, 0x53, 0x4b, 0x52, 0x70,
-0x43, 0x41, 0x24, 0xffe5, 0x20b8, 0x441, 0x43e, 0x43c, 0x20a9, 0x4b, 0x50, 0x57, 0x20ba, 0x20ad, 0x4b, 0x7a, 0x434, 0x435, 0x43d, 0x2e,
-0x20ae, 0x43, 0x4e, 0xa5, 0x928, 0x947, 0x930, 0x942, 0x60b, 0x631, 0x6cc, 0x627, 0x644, 0x7a, 0x142, 0x52, 0x24, 0x200b, 0x4d, 0x54,
-0x6e, 0x44, 0x62, 0x631, 0x53, 0x2f, 0x42, 0x73, 0x52, 0x4f, 0x4e, 0x4c, 0x20b4, 0x52, 0x53, 0x44, 0x41a, 0x41c, 0xdbb, 0xdd4,
+0x2e, 0x200f, 0x62f, 0x2e, 0x62c, 0x2e, 0x200f, 0x62f, 0x2e, 0x628, 0x2e, 0x200f, 0x46, 0x43, 0x46, 0x41, 0x46, 0x64, 0x6a, 0x4e,
+0x66, 0x6b, 0x62f, 0x2e, 0x639, 0x2e, 0x200f, 0x20aa, 0x62f, 0x2e, 0x623, 0x2e, 0x200f, 0x62f, 0x2e, 0x643, 0x2e, 0x200f, 0x644, 0x2e,
+0x644, 0x2e, 0x200f, 0x62f, 0x2e, 0x644, 0x2e, 0x200f, 0x623, 0x2e, 0x645, 0x2e, 0x62f, 0x2e, 0x645, 0x2e, 0x200f, 0x631, 0x2e, 0x639,
+0x2e, 0x200f, 0x631, 0x2e, 0x642, 0x2e, 0x200f, 0x631, 0x2e, 0x633, 0x2e, 0x200f, 0x53, 0x62c, 0x2e, 0x633, 0x2e, 0x644, 0x2e, 0x633,
+0x2e, 0x200f, 0x62f, 0x2e, 0x62a, 0x2e, 0x200f, 0x62f, 0x2e, 0x625, 0x2e, 0x200f, 0x631, 0x2e, 0x64a, 0x2e, 0x200f, 0xa3, 0x58f, 0x20b9,
+0x20bc, 0x20bd, 0x9f3, 0x4e, 0x75, 0x2e, 0x43b, 0x432, 0x2e, 0x17db, 0xa5, 0x48, 0x4b, 0x24, 0x4d, 0x4f, 0x50, 0x24, 0x48, 0x52,
+0x4b, 0x4b, 0x4d, 0x4b, 0x10d, 0x6b, 0x72, 0x2e, 0x41, 0x66, 0x6c, 0x2e, 0x4e, 0x41, 0x66, 0x2e, 0x55, 0x53, 0x24, 0x46,
+0x42, 0x75, 0x44, 0x47, 0x48, 0x20b5, 0x41, 0x72, 0x52, 0x4d, 0x52, 0x73, 0x20a6, 0x20b1, 0x52, 0x46, 0x57, 0x53, 0x24, 0x53,
+0x52, 0x45, 0x54, 0x53, 0x68, 0x54, 0x24, 0x55, 0x53, 0x68, 0x41, 0x45, 0x44, 0x56, 0x54, 0x44, 0x41, 0x46, 0x43, 0x46,
+0x50, 0x46, 0x47, 0x55, 0x4d, 0x4d, 0x41, 0x44, 0x43, 0x48, 0x46, 0x4c, 0x53, 0x44, 0x54, 0x20be, 0x20b2, 0x46, 0x74, 0x49,
+0x53, 0x4b, 0x52, 0x70, 0x43, 0x41, 0x24, 0xffe5, 0x20b8, 0x441, 0x43e, 0x43c, 0x20a9, 0x4b, 0x50, 0x57, 0x20ba, 0x20ad, 0x4b, 0x7a,
+0x434, 0x435, 0x43d, 0x2e, 0x20ae, 0x43, 0x4e, 0xa5, 0x928, 0x947, 0x930, 0x942, 0x60b, 0x631, 0x6cc, 0x627, 0x644, 0x7a, 0x142, 0x200b,
+0x4d, 0x54, 0x6e, 0x44, 0x62, 0x53, 0x2f, 0x42, 0x73, 0x52, 0x4f, 0x4e, 0x20b4, 0x52, 0x53, 0x44, 0x41a, 0x41c, 0xdbb, 0xdd4,
 0x2e, 0x20a1, 0x52, 0x44, 0x24, 0x51, 0x43, 0x24, 0x42, 0x2f, 0x2e, 0x47, 0x73, 0x2e, 0x42, 0x73, 0x2e, 0x53, 0x441, 0x43e,
 0x43c, 0x2e, 0x52, 0x73, 0x2e, 0xe3f, 0x54, 0x4d, 0x54, 0x73, 0x6f, 0x2bb, 0x6d, 0x441, 0x45e, 0x43c, 0x20ab, 0x4e, 0x54, 0x24,
-0x41, 0x24, 0x49, 0x52, 0x52
+0x49, 0x52, 0x52
 };
 
-static const ushort currency_display_name_data[] = {
-0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x49, 0x74, 0x6f, 0x6f, 0x70, 0x68, 0x69, 0x79, 0x61, 0x61, 0x20, 0x42, 0x69,
-0x72, 0x72, 0x69, 0x69, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x53, 0x75, 0x69, 0x64, 0x2d, 0x41, 0x66, 0x72, 0x69,
-0x6b, 0x61, 0x61, 0x6e, 0x73, 0x65, 0x20, 0x72, 0x61, 0x6e, 0x64, 0x3b, 0x3b, 0x53, 0x75, 0x69, 0x64, 0x2d, 0x41, 0x66,
-0x72, 0x69, 0x6b, 0x61, 0x61, 0x6e, 0x73, 0x65, 0x20, 0x72, 0x61, 0x6e, 0x64, 0x3b, 0x3b, 0x3b, 0x3b, 0x53, 0x75, 0x69,
-0x64, 0x2d, 0x41, 0x66, 0x72, 0x69, 0x6b, 0x61, 0x61, 0x6e, 0x73, 0x65, 0x20, 0x72, 0x61, 0x6e, 0x64, 0x3b, 0x4e, 0x61,
-0x6d, 0x69, 0x62, 0x69, 0x65, 0x73, 0x65, 0x20, 0x64, 0x6f, 0x6c, 0x6c, 0x61, 0x72, 0x3b, 0x3b, 0x4e, 0x61, 0x6d, 0x69,
-0x62, 0x69, 0x65, 0x73, 0x65, 0x20, 0x64, 0x6f, 0x6c, 0x6c, 0x61, 0x72, 0x3b, 0x3b, 0x3b, 0x3b, 0x4e, 0x61, 0x6d, 0x69,
-0x62, 0x69, 0x65, 0x73, 0x65, 0x20, 0x64, 0x6f, 0x6c, 0x6c, 0x61, 0x72, 0x3b, 0x4c, 0x65, 0x6b, 0x75, 0x20, 0x73, 0x68,
-0x71, 0x69, 0x70, 0x74, 0x61, 0x72, 0x3b, 0x3b, 0x6c, 0x65, 0x6b, 0x20, 0x73, 0x68, 0x71, 0x69, 0x70, 0x74, 0x61, 0x72,
-0x3b, 0x3b, 0x3b, 0x3b, 0x6c, 0x65, 0x6b, 0xeb, 0x20, 0x73, 0x68, 0x71, 0x69, 0x70, 0x74, 0x61, 0x72, 0x3b, 0x44, 0x65,
-0x6e, 0x61, 0x72, 0x69, 0x20, 0x6d, 0x61, 0x71, 0x65, 0x64, 0x6f, 0x6e, 0x61, 0x73, 0x3b, 0x3b, 0x64, 0x65, 0x6e, 0x61,
-0x72, 0x20, 0x6d, 0x61, 0x71, 0x65, 0x64, 0x6f, 0x6e, 0x61, 0x73, 0x3b, 0x3b, 0x3b, 0x3b, 0x64, 0x65, 0x6e, 0x61, 0x72,
-0xeb, 0x20, 0x6d, 0x61, 0x71, 0x65, 0x64, 0x6f, 0x6e, 0x61, 0x73, 0x3b, 0x45, 0x75, 0x72, 0x6f, 0x6a, 0x61, 0x3b, 0x3b,
-0x65, 0x75, 0x72, 0x6f, 0x3b, 0x3b, 0x3b, 0x3b, 0x65, 0x75, 0x72, 0x6f, 0x3b, 0x12e8, 0x12a2, 0x1275, 0x12ee, 0x1335, 0x12eb, 0x20,
-0x1265, 0x122d, 0x3b, 0x3b, 0x12e8, 0x12a2, 0x1275, 0x12ee, 0x1335, 0x12eb, 0x20, 0x1265, 0x122d, 0x3b, 0x3b, 0x3b, 0x3b, 0x12e8, 0x12a2, 0x1275,
-0x12ee, 0x1335, 0x12eb, 0x20, 0x1265, 0x122d, 0x3b, 0x62c, 0x646, 0x64a, 0x647, 0x20, 0x645, 0x635, 0x631, 0x64a, 0x3b, 0x62c, 0x646, 0x64a,
+static const char16_t currency_display_name_data[] = {
+0x49, 0x74, 0x6f, 0x6f, 0x70, 0x68, 0x69, 0x79, 0x61, 0x61, 0x20, 0x42, 0x69, 0x72, 0x72, 0x69, 0x69, 0x53, 0x75, 0x69,
+0x64, 0x2d, 0x41, 0x66, 0x72, 0x69, 0x6b, 0x61, 0x61, 0x6e, 0x73, 0x65, 0x20, 0x72, 0x61, 0x6e, 0x64, 0x3b, 0x3b, 0x53,
+0x75, 0x69, 0x64, 0x2d, 0x41, 0x66, 0x72, 0x69, 0x6b, 0x61, 0x61, 0x6e, 0x73, 0x65, 0x20, 0x72, 0x61, 0x6e, 0x64, 0x3b,
+0x3b, 0x3b, 0x3b, 0x53, 0x75, 0x69, 0x64, 0x2d, 0x41, 0x66, 0x72, 0x69, 0x6b, 0x61, 0x61, 0x6e, 0x73, 0x65, 0x20, 0x72,
+0x61, 0x6e, 0x64, 0x4e, 0x61, 0x6d, 0x69, 0x62, 0x69, 0x65, 0x73, 0x65, 0x20, 0x64, 0x6f, 0x6c, 0x6c, 0x61, 0x72, 0x3b,
+0x3b, 0x4e, 0x61, 0x6d, 0x69, 0x62, 0x69, 0x65, 0x73, 0x65, 0x20, 0x64, 0x6f, 0x6c, 0x6c, 0x61, 0x72, 0x3b, 0x3b, 0x3b,
+0x3b, 0x4e, 0x61, 0x6d, 0x69, 0x62, 0x69, 0x65, 0x73, 0x65, 0x20, 0x64, 0x6f, 0x6c, 0x6c, 0x61, 0x72, 0x4c, 0x65, 0x6b,
+0x75, 0x20, 0x73, 0x68, 0x71, 0x69, 0x70, 0x74, 0x61, 0x72, 0x3b, 0x3b, 0x6c, 0x65, 0x6b, 0x20, 0x73, 0x68, 0x71, 0x69,
+0x70, 0x74, 0x61, 0x72, 0x3b, 0x3b, 0x3b, 0x3b, 0x6c, 0x65, 0x6b, 0xeb, 0x20, 0x73, 0x68, 0x71, 0x69, 0x70, 0x74, 0x61,
+0x72, 0x44, 0x65, 0x6e, 0x61, 0x72, 0x69, 0x20, 0x6d, 0x61, 0x71, 0x65, 0x64, 0x6f, 0x6e, 0x61, 0x73, 0x3b, 0x3b, 0x64,
+0x65, 0x6e, 0x61, 0x72, 0x20, 0x6d, 0x61, 0x71, 0x65, 0x64, 0x6f, 0x6e, 0x61, 0x73, 0x3b, 0x3b, 0x3b, 0x3b, 0x64, 0x65,
+0x6e, 0x61, 0x72, 0xeb, 0x20, 0x6d, 0x61, 0x71, 0x65, 0x64, 0x6f, 0x6e, 0x61, 0x73, 0x45, 0x75, 0x72, 0x6f, 0x6a, 0x61,
+0x3b, 0x3b, 0x65, 0x75, 0x72, 0x6f, 0x3b, 0x3b, 0x3b, 0x3b, 0x65, 0x75, 0x72, 0x6f, 0x12e8, 0x12a2, 0x1275, 0x12ee, 0x1335, 0x12eb,
+0x20, 0x1265, 0x122d, 0x3b, 0x3b, 0x12e8, 0x12a2, 0x1275, 0x12ee, 0x1335, 0x12eb, 0x20, 0x1265, 0x122d, 0x3b, 0x3b, 0x3b, 0x3b, 0x12e8, 0x12a2,
+0x1275, 0x12ee, 0x1335, 0x12eb, 0x20, 0x1265, 0x122d, 0x62c, 0x646, 0x64a, 0x647, 0x20, 0x645, 0x635, 0x631, 0x64a, 0x3b, 0x62c, 0x646, 0x64a,
 0x647, 0x20, 0x645, 0x635, 0x631, 0x64a, 0x3b, 0x62c, 0x646, 0x64a, 0x647, 0x20, 0x645, 0x635, 0x631, 0x64a, 0x3b, 0x62c, 0x646, 0x64a,
 0x647, 0x627, 0x646, 0x20, 0x645, 0x635, 0x631, 0x64a, 0x627, 0x646, 0x3b, 0x62c, 0x646, 0x64a, 0x647, 0x627, 0x62a, 0x20, 0x645, 0x635,
 0x631, 0x64a, 0x629, 0x3b, 0x62c, 0x646, 0x64a, 0x647, 0x64b, 0x627, 0x20, 0x645, 0x635, 0x631, 0x64a, 0x64b, 0x627, 0x3b, 0x62c, 0x646,
-0x64a, 0x647, 0x20, 0x645, 0x635, 0x631, 0x64a, 0x3b, 0x62f, 0x64a, 0x646, 0x627, 0x631, 0x20, 0x62c, 0x632, 0x627, 0x626, 0x631, 0x64a,
-0x3b, 0x62f, 0x64a, 0x646, 0x627, 0x631, 0x20, 0x62c, 0x632, 0x627, 0x626, 0x631, 0x64a, 0x3b, 0x62f, 0x64a, 0x646, 0x627, 0x631, 0x20,
-0x62c, 0x632, 0x627, 0x626, 0x631, 0x64a, 0x3b, 0x62f, 0x64a, 0x646, 0x627, 0x631, 0x627, 0x646, 0x20, 0x62c, 0x632, 0x627, 0x626, 0x631,
-0x64a, 0x627, 0x646, 0x3b, 0x62f, 0x64a, 0x646, 0x627, 0x631, 0x627, 0x62a, 0x20, 0x62c, 0x632, 0x627, 0x626, 0x631, 0x64a, 0x629, 0x3b,
-0x62f, 0x64a, 0x646, 0x627, 0x631, 0x64b, 0x627, 0x20, 0x62c, 0x632, 0x627, 0x626, 0x631, 0x64a, 0x64b, 0x627, 0x3b, 0x62f, 0x64a, 0x646,
-0x627, 0x631, 0x20, 0x62c, 0x632, 0x627, 0x626, 0x631, 0x64a, 0x3b, 0x62f, 0x64a, 0x646, 0x627, 0x631, 0x20, 0x628, 0x62d, 0x631, 0x64a,
-0x646, 0x64a, 0x3b, 0x62f, 0x64a, 0x646, 0x627, 0x631, 0x20, 0x628, 0x62d, 0x631, 0x64a, 0x646, 0x64a, 0x3b, 0x62f, 0x64a, 0x646, 0x627,
-0x631, 0x20, 0x628, 0x62d, 0x631, 0x64a, 0x646, 0x64a, 0x3b, 0x62f, 0x64a, 0x646, 0x627, 0x631, 0x20, 0x628, 0x62d, 0x631, 0x64a, 0x646,
-0x64a, 0x3b, 0x62f, 0x64a, 0x646, 0x627, 0x631, 0x20, 0x628, 0x62d, 0x631, 0x64a, 0x646, 0x64a, 0x3b, 0x62f, 0x64a, 0x646, 0x627, 0x631,
-0x20, 0x628, 0x62d, 0x631, 0x64a, 0x646, 0x64a, 0x3b, 0x62f, 0x64a, 0x646, 0x627, 0x631, 0x20, 0x628, 0x62d, 0x631, 0x64a, 0x646, 0x64a,
-0x3b, 0x641, 0x631, 0x646, 0x643, 0x20, 0x648, 0x633, 0x637, 0x20, 0x623, 0x641, 0x631, 0x64a, 0x642, 0x64a, 0x3b, 0x641, 0x631, 0x646,
-0x643, 0x20, 0x648, 0x633, 0x637, 0x20, 0x623, 0x641, 0x631, 0x64a, 0x642, 0x64a, 0x3b, 0x641, 0x631, 0x646, 0x643, 0x20, 0x648, 0x633,
-0x637, 0x20, 0x623, 0x641, 0x631, 0x64a, 0x642, 0x64a, 0x3b, 0x641, 0x631, 0x646, 0x643, 0x20, 0x648, 0x633, 0x637, 0x20, 0x623, 0x641,
-0x631, 0x64a, 0x642, 0x64a, 0x3b, 0x641, 0x631, 0x646, 0x643, 0x20, 0x648, 0x633, 0x637, 0x20, 0x623, 0x641, 0x631, 0x64a, 0x642, 0x64a,
-0x3b, 0x641, 0x631, 0x646, 0x643, 0x20, 0x648, 0x633, 0x637, 0x20, 0x623, 0x641, 0x631, 0x64a, 0x642, 0x64a, 0x3b, 0x641, 0x631, 0x646,
-0x643, 0x20, 0x648, 0x633, 0x637, 0x20, 0x623, 0x641, 0x631, 0x64a, 0x642, 0x64a, 0x3b, 0x641, 0x631, 0x646, 0x643, 0x20, 0x62c, 0x632,
-0x631, 0x20, 0x627, 0x644, 0x642, 0x645, 0x631, 0x3b, 0x641, 0x631, 0x646, 0x643, 0x20, 0x62c, 0x632, 0x631, 0x20, 0x627, 0x644, 0x642,
-0x645, 0x631, 0x3b, 0x641, 0x631, 0x646, 0x643, 0x20, 0x62c, 0x632, 0x631, 0x20, 0x627, 0x644, 0x642, 0x645, 0x631, 0x3b, 0x641, 0x631,
-0x646, 0x643, 0x20, 0x62c, 0x632, 0x631, 0x20, 0x627, 0x644, 0x642, 0x645, 0x631, 0x3b, 0x641, 0x631, 0x646, 0x643, 0x20, 0x62c, 0x632,
-0x631, 0x20, 0x627, 0x644, 0x642, 0x645, 0x631, 0x3b, 0x641, 0x631, 0x646, 0x643, 0x20, 0x62c, 0x632, 0x631, 0x20, 0x627, 0x644, 0x642,
-0x645, 0x631, 0x3b, 0x641, 0x631, 0x646, 0x643, 0x20, 0x62c, 0x632, 0x631, 0x20, 0x627, 0x644, 0x642, 0x645, 0x631, 0x3b, 0x641, 0x631,
-0x646, 0x643, 0x20, 0x62c, 0x64a, 0x628, 0x648, 0x62a, 0x64a, 0x3b, 0x641, 0x631, 0x646, 0x643, 0x20, 0x62c, 0x64a, 0x628, 0x648, 0x62a,
-0x64a, 0x3b, 0x641, 0x631, 0x646, 0x643, 0x20, 0x62c, 0x64a, 0x628, 0x648, 0x62a, 0x64a, 0x3b, 0x641, 0x631, 0x646, 0x643, 0x20, 0x62c,
-0x64a, 0x628, 0x648, 0x62a, 0x64a, 0x3b, 0x641, 0x631, 0x646, 0x643, 0x20, 0x62c, 0x64a, 0x628, 0x648, 0x62a, 0x64a, 0x3b, 0x641, 0x631,
-0x646, 0x643, 0x20, 0x62c, 0x64a, 0x628, 0x648, 0x62a, 0x64a, 0x3b, 0x641, 0x631, 0x646, 0x643, 0x20, 0x62c, 0x64a, 0x628, 0x648, 0x62a,
+0x64a, 0x647, 0x20, 0x645, 0x635, 0x631, 0x64a, 0x62f, 0x64a, 0x646, 0x627, 0x631, 0x20, 0x62c, 0x632, 0x627, 0x626, 0x631, 0x64a, 0x3b,
+0x62f, 0x64a, 0x646, 0x627, 0x631, 0x20, 0x62c, 0x632, 0x627, 0x626, 0x631, 0x64a, 0x3b, 0x62f, 0x64a, 0x646, 0x627, 0x631, 0x20, 0x62c,
+0x632, 0x627, 0x626, 0x631, 0x64a, 0x3b, 0x62f, 0x64a, 0x646, 0x627, 0x631, 0x627, 0x646, 0x20, 0x62c, 0x632, 0x627, 0x626, 0x631, 0x64a,
+0x627, 0x646, 0x3b, 0x62f, 0x64a, 0x646, 0x627, 0x631, 0x627, 0x62a, 0x20, 0x62c, 0x632, 0x627, 0x626, 0x631, 0x64a, 0x629, 0x3b, 0x62f,
+0x64a, 0x646, 0x627, 0x631, 0x64b, 0x627, 0x20, 0x62c, 0x632, 0x627, 0x626, 0x631, 0x64a, 0x64b, 0x627, 0x3b, 0x62f, 0x64a, 0x646, 0x627,
+0x631, 0x20, 0x62c, 0x632, 0x627, 0x626, 0x631, 0x64a, 0x62f, 0x64a, 0x646, 0x627, 0x631, 0x20, 0x628, 0x62d, 0x631, 0x64a, 0x646, 0x64a,
+0x3b, 0x62f, 0x64a, 0x646, 0x627, 0x631, 0x20, 0x628, 0x62d, 0x631, 0x64a, 0x646, 0x64a, 0x3b, 0x62f, 0x64a, 0x646, 0x627, 0x631, 0x20,
+0x628, 0x62d, 0x631, 0x64a, 0x646, 0x64a, 0x3b, 0x62f, 0x64a, 0x646, 0x627, 0x631, 0x20, 0x628, 0x62d, 0x631, 0x64a, 0x646, 0x64a, 0x3b,
+0x62f, 0x64a, 0x646, 0x627, 0x631, 0x20, 0x628, 0x62d, 0x631, 0x64a, 0x646, 0x64a, 0x3b, 0x62f, 0x64a, 0x646, 0x627, 0x631, 0x20, 0x628,
+0x62d, 0x631, 0x64a, 0x646, 0x64a, 0x3b, 0x62f, 0x64a, 0x646, 0x627, 0x631, 0x20, 0x628, 0x62d, 0x631, 0x64a, 0x646, 0x64a, 0x641, 0x631,
+0x646, 0x643, 0x20, 0x648, 0x633, 0x637, 0x20, 0x623, 0x641, 0x631, 0x64a, 0x642, 0x64a, 0x3b, 0x641, 0x631, 0x646, 0x643, 0x20, 0x648,
+0x633, 0x637, 0x20, 0x623, 0x641, 0x631, 0x64a, 0x642, 0x64a, 0x3b, 0x641, 0x631, 0x646, 0x643, 0x20, 0x648, 0x633, 0x637, 0x20, 0x623,
+0x641, 0x631, 0x64a, 0x642, 0x64a, 0x3b, 0x641, 0x631, 0x646, 0x643, 0x20, 0x648, 0x633, 0x637, 0x20, 0x623, 0x641, 0x631, 0x64a, 0x642,
+0x64a, 0x3b, 0x641, 0x631, 0x646, 0x643, 0x20, 0x648, 0x633, 0x637, 0x20, 0x623, 0x641, 0x631, 0x64a, 0x642, 0x64a, 0x3b, 0x641, 0x631,
+0x646, 0x643, 0x20, 0x648, 0x633, 0x637, 0x20, 0x623, 0x641, 0x631, 0x64a, 0x642, 0x64a, 0x3b, 0x641, 0x631, 0x646, 0x643, 0x20, 0x648,
+0x633, 0x637, 0x20, 0x623, 0x641, 0x631, 0x64a, 0x642, 0x64a, 0x641, 0x631, 0x646, 0x643, 0x20, 0x62c, 0x632, 0x631, 0x20, 0x627, 0x644,
+0x642, 0x645, 0x631, 0x3b, 0x641, 0x631, 0x646, 0x643, 0x20, 0x62c, 0x632, 0x631, 0x20, 0x627, 0x644, 0x642, 0x645, 0x631, 0x3b, 0x641,
+0x631, 0x646, 0x643, 0x20, 0x62c, 0x632, 0x631, 0x20, 0x627, 0x644, 0x642, 0x645, 0x631, 0x3b, 0x641, 0x631, 0x646, 0x643, 0x20, 0x62c,
+0x632, 0x631, 0x20, 0x627, 0x644, 0x642, 0x645, 0x631, 0x3b, 0x641, 0x631, 0x646, 0x643, 0x20, 0x62c, 0x632, 0x631, 0x20, 0x627, 0x644,
+0x642, 0x645, 0x631, 0x3b, 0x641, 0x631, 0x646, 0x643, 0x20, 0x62c, 0x632, 0x631, 0x20, 0x627, 0x644, 0x642, 0x645, 0x631, 0x3b, 0x641,
+0x631, 0x646, 0x643, 0x20, 0x62c, 0x632, 0x631, 0x20, 0x627, 0x644, 0x642, 0x645, 0x631, 0x641, 0x631, 0x646, 0x643, 0x20, 0x62c, 0x64a,
+0x628, 0x648, 0x62a, 0x64a, 0x3b, 0x641, 0x631, 0x646, 0x643, 0x20, 0x62c, 0x64a, 0x628, 0x648, 0x62a, 0x64a, 0x3b, 0x641, 0x631, 0x646,
+0x643, 0x20, 0x62c, 0x64a, 0x628, 0x648, 0x62a, 0x64a, 0x3b, 0x641, 0x631, 0x646, 0x643, 0x20, 0x62c, 0x64a, 0x628, 0x648, 0x62a, 0x64a,
+0x3b, 0x641, 0x631, 0x646, 0x643, 0x20, 0x62c, 0x64a, 0x628, 0x648, 0x62a, 0x64a, 0x3b, 0x641, 0x631, 0x646, 0x643, 0x20, 0x62c, 0x64a,
+0x628, 0x648, 0x62a, 0x64a, 0x3b, 0x641, 0x631, 0x646, 0x643, 0x20, 0x62c, 0x64a, 0x628, 0x648, 0x62a, 0x64a, 0x646, 0x627, 0x643, 0x641,
+0x627, 0x20, 0x623, 0x631, 0x64a, 0x62a, 0x631, 0x64a, 0x3b, 0x646, 0x627, 0x643, 0x641, 0x627, 0x20, 0x623, 0x631, 0x64a, 0x62a, 0x631,
 0x64a, 0x3b, 0x646, 0x627, 0x643, 0x641, 0x627, 0x20, 0x623, 0x631, 0x64a, 0x62a, 0x631, 0x64a, 0x3b, 0x646, 0x627, 0x643, 0x641, 0x627,
 0x20, 0x623, 0x631, 0x64a, 0x62a, 0x631, 0x64a, 0x3b, 0x646, 0x627, 0x643, 0x641, 0x627, 0x20, 0x623, 0x631, 0x64a, 0x62a, 0x631, 0x64a,
 0x3b, 0x646, 0x627, 0x643, 0x641, 0x627, 0x20, 0x623, 0x631, 0x64a, 0x62a, 0x631, 0x64a, 0x3b, 0x646, 0x627, 0x643, 0x641, 0x627, 0x20,
-0x623, 0x631, 0x64a, 0x62a, 0x631, 0x64a, 0x3b, 0x646, 0x627, 0x643, 0x641, 0x627, 0x20, 0x623, 0x631, 0x64a, 0x62a, 0x631, 0x64a, 0x3b,
-0x646, 0x627, 0x643, 0x641, 0x627, 0x20, 0x623, 0x631, 0x64a, 0x62a, 0x631, 0x64a, 0x3b, 0x62f, 0x64a, 0x646, 0x627, 0x631, 0x20, 0x639,
-0x631, 0x627, 0x642, 0x64a, 0x3b, 0x62f, 0x64a, 0x646, 0x627, 0x631, 0x20, 0x639, 0x631, 0x627, 0x642, 0x64a, 0x3b, 0x62f, 0x64a, 0x646,
-0x627, 0x631, 0x20, 0x639, 0x631, 0x627, 0x642, 0x64a, 0x3b, 0x62f, 0x64a, 0x646, 0x627, 0x631, 0x20, 0x639, 0x631, 0x627, 0x642, 0x64a,
-0x3b, 0x62f, 0x64a, 0x646, 0x627, 0x631, 0x20, 0x639, 0x631, 0x627, 0x642, 0x64a, 0x3b, 0x62f, 0x64a, 0x646, 0x627, 0x631, 0x20, 0x639,
-0x631, 0x627, 0x642, 0x64a, 0x3b, 0x62f, 0x64a, 0x646, 0x627, 0x631, 0x20, 0x639, 0x631, 0x627, 0x642, 0x64a, 0x3b, 0x634, 0x64a, 0x643,
-0x644, 0x20, 0x625, 0x633, 0x631, 0x627, 0x626, 0x64a, 0x644, 0x64a, 0x20, 0x62c, 0x62f, 0x64a, 0x62f, 0x3b, 0x634, 0x64a, 0x643, 0x644,
-0x20, 0x625, 0x633, 0x631, 0x627, 0x626, 0x64a, 0x644, 0x64a, 0x20, 0x62c, 0x62f, 0x64a, 0x62f, 0x3b, 0x634, 0x64a, 0x643, 0x644, 0x20,
-0x625, 0x633, 0x631, 0x627, 0x626, 0x64a, 0x644, 0x64a, 0x20, 0x62c, 0x62f, 0x64a, 0x62f, 0x3b, 0x634, 0x64a, 0x643, 0x644, 0x20, 0x625,
-0x633, 0x631, 0x627, 0x626, 0x64a, 0x644, 0x64a, 0x20, 0x62c, 0x62f, 0x64a, 0x62f, 0x3b, 0x634, 0x64a, 0x643, 0x644, 0x20, 0x625, 0x633,
-0x631, 0x627, 0x626, 0x64a, 0x644, 0x64a, 0x20, 0x62c, 0x62f, 0x64a, 0x62f, 0x3b, 0x634, 0x64a, 0x643, 0x644, 0x20, 0x625, 0x633, 0x631,
-0x627, 0x626, 0x64a, 0x644, 0x64a, 0x20, 0x62c, 0x62f, 0x64a, 0x62f, 0x3b, 0x634, 0x64a, 0x643, 0x644, 0x20, 0x625, 0x633, 0x631, 0x627,
-0x626, 0x64a, 0x644, 0x64a, 0x20, 0x62c, 0x62f, 0x64a, 0x62f, 0x3b, 0x62f, 0x64a, 0x646, 0x627, 0x631, 0x20, 0x623, 0x631, 0x62f, 0x646,
-0x64a, 0x3b, 0x62f, 0x64a, 0x646, 0x627, 0x631, 0x20, 0x623, 0x631, 0x62f, 0x646, 0x64a, 0x3b, 0x62f, 0x64a, 0x646, 0x627, 0x631, 0x20,
-0x623, 0x631, 0x62f, 0x646, 0x64a, 0x3b, 0x62f, 0x64a, 0x646, 0x627, 0x631, 0x20, 0x623, 0x631, 0x62f, 0x646, 0x64a, 0x3b, 0x62f, 0x64a,
-0x646, 0x627, 0x631, 0x20, 0x623, 0x631, 0x62f, 0x646, 0x64a, 0x3b, 0x62f, 0x64a, 0x646, 0x627, 0x631, 0x20, 0x623, 0x631, 0x62f, 0x646,
-0x64a, 0x3b, 0x62f, 0x64a, 0x646, 0x627, 0x631, 0x20, 0x623, 0x631, 0x62f, 0x646, 0x64a, 0x3b, 0x62f, 0x64a, 0x646, 0x627, 0x631, 0x20,
-0x643, 0x648, 0x64a, 0x62a, 0x64a, 0x3b, 0x62f, 0x64a, 0x646, 0x627, 0x631, 0x20, 0x643, 0x648, 0x64a, 0x62a, 0x64a, 0x3b, 0x62f, 0x64a,
-0x646, 0x627, 0x631, 0x20, 0x643, 0x648, 0x64a, 0x62a, 0x64a, 0x3b, 0x62f, 0x64a, 0x646, 0x627, 0x631, 0x20, 0x643, 0x648, 0x64a, 0x62a,
-0x64a, 0x3b, 0x62f, 0x64a, 0x646, 0x627, 0x631, 0x20, 0x643, 0x648, 0x64a, 0x62a, 0x64a, 0x3b, 0x62f, 0x64a, 0x646, 0x627, 0x631, 0x20,
-0x643, 0x648, 0x64a, 0x62a, 0x64a, 0x3b, 0x62f, 0x64a, 0x646, 0x627, 0x631, 0x20, 0x643, 0x648, 0x64a, 0x62a, 0x64a, 0x3b, 0x62c, 0x646,
-0x64a, 0x647, 0x20, 0x644, 0x628, 0x646, 0x627, 0x646, 0x64a, 0x3b, 0x62c, 0x646, 0x64a, 0x647, 0x20, 0x644, 0x628, 0x646, 0x627, 0x646,
-0x64a, 0x3b, 0x62c, 0x646, 0x64a, 0x647, 0x20, 0x644, 0x628, 0x646, 0x627, 0x646, 0x64a, 0x3b, 0x62c, 0x646, 0x64a, 0x647, 0x20, 0x644,
-0x628, 0x646, 0x627, 0x646, 0x64a, 0x3b, 0x62c, 0x646, 0x64a, 0x647, 0x20, 0x644, 0x628, 0x646, 0x627, 0x646, 0x64a, 0x3b, 0x62c, 0x646,
-0x64a, 0x647, 0x20, 0x644, 0x628, 0x646, 0x627, 0x646, 0x64a, 0x3b, 0x62c, 0x646, 0x64a, 0x647, 0x20, 0x644, 0x628, 0x646, 0x627, 0x646,
-0x64a, 0x3b, 0x62f, 0x64a, 0x646, 0x627, 0x631, 0x20, 0x644, 0x64a, 0x628, 0x64a, 0x3b, 0x62f, 0x64a, 0x646, 0x627, 0x631, 0x20, 0x644,
-0x64a, 0x628, 0x64a, 0x3b, 0x62f, 0x64a, 0x646, 0x627, 0x631, 0x20, 0x644, 0x64a, 0x628, 0x64a, 0x3b, 0x62f, 0x64a, 0x646, 0x627, 0x631,
-0x627, 0x646, 0x20, 0x644, 0x64a, 0x628, 0x64a, 0x627, 0x646, 0x3b, 0x62f, 0x64a, 0x646, 0x627, 0x631, 0x627, 0x62a, 0x20, 0x644, 0x64a,
-0x628, 0x64a, 0x629, 0x3b, 0x62f, 0x64a, 0x646, 0x627, 0x631, 0x64b, 0x627, 0x20, 0x644, 0x64a, 0x628, 0x64a, 0x64b, 0x627, 0x3b, 0x62f,
-0x64a, 0x646, 0x627, 0x631, 0x20, 0x644, 0x64a, 0x628, 0x64a, 0x3b, 0x623, 0x648, 0x642, 0x64a, 0x629, 0x20, 0x645, 0x648, 0x631, 0x64a,
-0x62a, 0x627, 0x646, 0x64a, 0x629, 0x3b, 0x623, 0x648, 0x642, 0x64a, 0x629, 0x20, 0x645, 0x648, 0x631, 0x64a, 0x62a, 0x627, 0x646, 0x64a,
-0x629, 0x3b, 0x623, 0x648, 0x642, 0x64a, 0x629, 0x20, 0x645, 0x648, 0x631, 0x64a, 0x62a, 0x627, 0x646, 0x64a, 0x629, 0x3b, 0x623, 0x648,
-0x642, 0x64a, 0x629, 0x20, 0x645, 0x648, 0x631, 0x64a, 0x62a, 0x627, 0x646, 0x64a, 0x629, 0x3b, 0x623, 0x648, 0x642, 0x64a, 0x629, 0x20,
-0x645, 0x648, 0x631, 0x64a, 0x62a, 0x627, 0x646, 0x64a, 0x629, 0x3b, 0x623, 0x648, 0x642, 0x64a, 0x629, 0x20, 0x645, 0x648, 0x631, 0x64a,
-0x62a, 0x627, 0x646, 0x64a, 0x629, 0x3b, 0x623, 0x648, 0x642, 0x64a, 0x629, 0x20, 0x645, 0x648, 0x631, 0x64a, 0x62a, 0x627, 0x646, 0x64a,
-0x629, 0x3b, 0x62f, 0x631, 0x647, 0x645, 0x20, 0x645, 0x63a, 0x631, 0x628, 0x64a, 0x3b, 0x62f, 0x631, 0x647, 0x645, 0x20, 0x645, 0x63a,
-0x631, 0x628, 0x64a, 0x3b, 0x62f, 0x631, 0x647, 0x645, 0x20, 0x645, 0x63a, 0x631, 0x628, 0x64a, 0x3b, 0x62f, 0x631, 0x647, 0x645, 0x627,
-0x646, 0x20, 0x645, 0x63a, 0x631, 0x628, 0x64a, 0x627, 0x646, 0x3b, 0x62f, 0x631, 0x627, 0x647, 0x645, 0x20, 0x645, 0x63a, 0x631, 0x628,
-0x64a, 0x629, 0x3b, 0x62f, 0x631, 0x647, 0x645, 0x64b, 0x627, 0x20, 0x645, 0x63a, 0x631, 0x628, 0x64a, 0x64b, 0x627, 0x3b, 0x62f, 0x631,
-0x647, 0x645, 0x20, 0x645, 0x63a, 0x631, 0x628, 0x64a, 0x3b, 0x631, 0x64a, 0x627, 0x644, 0x20, 0x639, 0x645, 0x627, 0x646, 0x64a, 0x3b,
-0x631, 0x64a, 0x627, 0x644, 0x20, 0x639, 0x645, 0x627, 0x646, 0x64a, 0x3b, 0x631, 0x64a, 0x627, 0x644, 0x20, 0x639, 0x645, 0x627, 0x646,
-0x64a, 0x3b, 0x631, 0x64a, 0x627, 0x644, 0x20, 0x639, 0x645, 0x627, 0x646, 0x64a, 0x3b, 0x631, 0x64a, 0x627, 0x644, 0x20, 0x639, 0x645,
-0x627, 0x646, 0x64a, 0x3b, 0x631, 0x64a, 0x627, 0x644, 0x20, 0x639, 0x645, 0x627, 0x646, 0x64a, 0x3b, 0x631, 0x64a, 0x627, 0x644, 0x20,
-0x639, 0x645, 0x627, 0x646, 0x64a, 0x3b, 0x631, 0x64a, 0x627, 0x644, 0x20, 0x642, 0x637, 0x631, 0x64a, 0x3b, 0x631, 0x64a, 0x627, 0x644,
-0x20, 0x642, 0x637, 0x631, 0x64a, 0x3b, 0x631, 0x64a, 0x627, 0x644, 0x20, 0x642, 0x637, 0x631, 0x64a, 0x3b, 0x631, 0x64a, 0x627, 0x644,
-0x20, 0x642, 0x637, 0x631, 0x64a, 0x3b, 0x631, 0x64a, 0x627, 0x644, 0x20, 0x642, 0x637, 0x631, 0x64a, 0x3b, 0x631, 0x64a, 0x627, 0x644,
-0x20, 0x642, 0x637, 0x631, 0x64a, 0x3b, 0x631, 0x64a, 0x627, 0x644, 0x20, 0x642, 0x637, 0x631, 0x64a, 0x3b, 0x631, 0x64a, 0x627, 0x644,
-0x20, 0x633, 0x639, 0x648, 0x62f, 0x64a, 0x3b, 0x631, 0x64a, 0x627, 0x644, 0x20, 0x633, 0x639, 0x648, 0x62f, 0x64a, 0x3b, 0x631, 0x64a,
-0x627, 0x644, 0x20, 0x633, 0x639, 0x648, 0x62f, 0x64a, 0x3b, 0x631, 0x64a, 0x627, 0x644, 0x20, 0x633, 0x639, 0x648, 0x62f, 0x64a, 0x3b,
-0x631, 0x64a, 0x627, 0x644, 0x20, 0x633, 0x639, 0x648, 0x62f, 0x64a, 0x3b, 0x631, 0x64a, 0x627, 0x644, 0x20, 0x633, 0x639, 0x648, 0x62f,
-0x64a, 0x3b, 0x631, 0x64a, 0x627, 0x644, 0x20, 0x633, 0x639, 0x648, 0x62f, 0x64a, 0x3b, 0x634, 0x644, 0x646, 0x20, 0x635, 0x648, 0x645,
-0x627, 0x644, 0x64a, 0x3b, 0x634, 0x644, 0x646, 0x20, 0x635, 0x648, 0x645, 0x627, 0x644, 0x64a, 0x3b, 0x634, 0x644, 0x646, 0x20, 0x635,
+0x623, 0x631, 0x64a, 0x62a, 0x631, 0x64a, 0x62f, 0x64a, 0x646, 0x627, 0x631, 0x20, 0x639, 0x631, 0x627, 0x642, 0x64a, 0x3b, 0x62f, 0x64a,
+0x646, 0x627, 0x631, 0x20, 0x639, 0x631, 0x627, 0x642, 0x64a, 0x3b, 0x62f, 0x64a, 0x646, 0x627, 0x631, 0x20, 0x639, 0x631, 0x627, 0x642,
+0x64a, 0x3b, 0x62f, 0x64a, 0x646, 0x627, 0x631, 0x20, 0x639, 0x631, 0x627, 0x642, 0x64a, 0x3b, 0x62f, 0x64a, 0x646, 0x627, 0x631, 0x20,
+0x639, 0x631, 0x627, 0x642, 0x64a, 0x3b, 0x62f, 0x64a, 0x646, 0x627, 0x631, 0x20, 0x639, 0x631, 0x627, 0x642, 0x64a, 0x3b, 0x62f, 0x64a,
+0x646, 0x627, 0x631, 0x20, 0x639, 0x631, 0x627, 0x642, 0x64a, 0x634, 0x64a, 0x643, 0x644, 0x20, 0x625, 0x633, 0x631, 0x627, 0x626, 0x64a,
+0x644, 0x64a, 0x20, 0x62c, 0x62f, 0x64a, 0x62f, 0x3b, 0x634, 0x64a, 0x643, 0x644, 0x20, 0x625, 0x633, 0x631, 0x627, 0x626, 0x64a, 0x644,
+0x64a, 0x20, 0x62c, 0x62f, 0x64a, 0x62f, 0x3b, 0x634, 0x64a, 0x643, 0x644, 0x20, 0x625, 0x633, 0x631, 0x627, 0x626, 0x64a, 0x644, 0x64a,
+0x20, 0x62c, 0x62f, 0x64a, 0x62f, 0x3b, 0x634, 0x64a, 0x643, 0x644, 0x20, 0x625, 0x633, 0x631, 0x627, 0x626, 0x64a, 0x644, 0x64a, 0x20,
+0x62c, 0x62f, 0x64a, 0x62f, 0x3b, 0x634, 0x64a, 0x643, 0x644, 0x20, 0x625, 0x633, 0x631, 0x627, 0x626, 0x64a, 0x644, 0x64a, 0x20, 0x62c,
+0x62f, 0x64a, 0x62f, 0x3b, 0x634, 0x64a, 0x643, 0x644, 0x20, 0x625, 0x633, 0x631, 0x627, 0x626, 0x64a, 0x644, 0x64a, 0x20, 0x62c, 0x62f,
+0x64a, 0x62f, 0x3b, 0x634, 0x64a, 0x643, 0x644, 0x20, 0x625, 0x633, 0x631, 0x627, 0x626, 0x64a, 0x644, 0x64a, 0x20, 0x62c, 0x62f, 0x64a,
+0x62f, 0x62f, 0x64a, 0x646, 0x627, 0x631, 0x20, 0x623, 0x631, 0x62f, 0x646, 0x64a, 0x3b, 0x62f, 0x64a, 0x646, 0x627, 0x631, 0x20, 0x623,
+0x631, 0x62f, 0x646, 0x64a, 0x3b, 0x62f, 0x64a, 0x646, 0x627, 0x631, 0x20, 0x623, 0x631, 0x62f, 0x646, 0x64a, 0x3b, 0x62f, 0x64a, 0x646,
+0x627, 0x631, 0x20, 0x623, 0x631, 0x62f, 0x646, 0x64a, 0x3b, 0x62f, 0x64a, 0x646, 0x627, 0x631, 0x20, 0x623, 0x631, 0x62f, 0x646, 0x64a,
+0x3b, 0x62f, 0x64a, 0x646, 0x627, 0x631, 0x20, 0x623, 0x631, 0x62f, 0x646, 0x64a, 0x3b, 0x62f, 0x64a, 0x646, 0x627, 0x631, 0x20, 0x623,
+0x631, 0x62f, 0x646, 0x64a, 0x62f, 0x64a, 0x646, 0x627, 0x631, 0x20, 0x643, 0x648, 0x64a, 0x62a, 0x64a, 0x3b, 0x62f, 0x64a, 0x646, 0x627,
+0x631, 0x20, 0x643, 0x648, 0x64a, 0x62a, 0x64a, 0x3b, 0x62f, 0x64a, 0x646, 0x627, 0x631, 0x20, 0x643, 0x648, 0x64a, 0x62a, 0x64a, 0x3b,
+0x62f, 0x64a, 0x646, 0x627, 0x631, 0x20, 0x643, 0x648, 0x64a, 0x62a, 0x64a, 0x3b, 0x62f, 0x64a, 0x646, 0x627, 0x631, 0x20, 0x643, 0x648,
+0x64a, 0x62a, 0x64a, 0x3b, 0x62f, 0x64a, 0x646, 0x627, 0x631, 0x20, 0x643, 0x648, 0x64a, 0x62a, 0x64a, 0x3b, 0x62f, 0x64a, 0x646, 0x627,
+0x631, 0x20, 0x643, 0x648, 0x64a, 0x62a, 0x64a, 0x62c, 0x646, 0x64a, 0x647, 0x20, 0x644, 0x628, 0x646, 0x627, 0x646, 0x64a, 0x3b, 0x62c,
+0x646, 0x64a, 0x647, 0x20, 0x644, 0x628, 0x646, 0x627, 0x646, 0x64a, 0x3b, 0x62c, 0x646, 0x64a, 0x647, 0x20, 0x644, 0x628, 0x646, 0x627,
+0x646, 0x64a, 0x3b, 0x62c, 0x646, 0x64a, 0x647, 0x20, 0x644, 0x628, 0x646, 0x627, 0x646, 0x64a, 0x3b, 0x62c, 0x646, 0x64a, 0x647, 0x20,
+0x644, 0x628, 0x646, 0x627, 0x646, 0x64a, 0x3b, 0x62c, 0x646, 0x64a, 0x647, 0x20, 0x644, 0x628, 0x646, 0x627, 0x646, 0x64a, 0x3b, 0x62c,
+0x646, 0x64a, 0x647, 0x20, 0x644, 0x628, 0x646, 0x627, 0x646, 0x64a, 0x62f, 0x64a, 0x646, 0x627, 0x631, 0x20, 0x644, 0x64a, 0x628, 0x64a,
+0x3b, 0x62f, 0x64a, 0x646, 0x627, 0x631, 0x20, 0x644, 0x64a, 0x628, 0x64a, 0x3b, 0x62f, 0x64a, 0x646, 0x627, 0x631, 0x20, 0x644, 0x64a,
+0x628, 0x64a, 0x3b, 0x62f, 0x64a, 0x646, 0x627, 0x631, 0x627, 0x646, 0x20, 0x644, 0x64a, 0x628, 0x64a, 0x627, 0x646, 0x3b, 0x62f, 0x64a,
+0x646, 0x627, 0x631, 0x627, 0x62a, 0x20, 0x644, 0x64a, 0x628, 0x64a, 0x629, 0x3b, 0x62f, 0x64a, 0x646, 0x627, 0x631, 0x64b, 0x627, 0x20,
+0x644, 0x64a, 0x628, 0x64a, 0x64b, 0x627, 0x3b, 0x62f, 0x64a, 0x646, 0x627, 0x631, 0x20, 0x644, 0x64a, 0x628, 0x64a, 0x623, 0x648, 0x642,
+0x64a, 0x629, 0x20, 0x645, 0x648, 0x631, 0x64a, 0x62a, 0x627, 0x646, 0x64a, 0x629, 0x3b, 0x623, 0x648, 0x642, 0x64a, 0x629, 0x20, 0x645,
+0x648, 0x631, 0x64a, 0x62a, 0x627, 0x646, 0x64a, 0x629, 0x3b, 0x623, 0x648, 0x642, 0x64a, 0x629, 0x20, 0x645, 0x648, 0x631, 0x64a, 0x62a,
+0x627, 0x646, 0x64a, 0x629, 0x3b, 0x623, 0x648, 0x642, 0x64a, 0x629, 0x20, 0x645, 0x648, 0x631, 0x64a, 0x62a, 0x627, 0x646, 0x64a, 0x629,
+0x3b, 0x623, 0x648, 0x642, 0x64a, 0x629, 0x20, 0x645, 0x648, 0x631, 0x64a, 0x62a, 0x627, 0x646, 0x64a, 0x629, 0x3b, 0x623, 0x648, 0x642,
+0x64a, 0x629, 0x20, 0x645, 0x648, 0x631, 0x64a, 0x62a, 0x627, 0x646, 0x64a, 0x629, 0x3b, 0x623, 0x648, 0x642, 0x64a, 0x629, 0x20, 0x645,
+0x648, 0x631, 0x64a, 0x62a, 0x627, 0x646, 0x64a, 0x629, 0x62f, 0x631, 0x647, 0x645, 0x20, 0x645, 0x63a, 0x631, 0x628, 0x64a, 0x3b, 0x62f,
+0x631, 0x647, 0x645, 0x20, 0x645, 0x63a, 0x631, 0x628, 0x64a, 0x3b, 0x62f, 0x631, 0x647, 0x645, 0x20, 0x645, 0x63a, 0x631, 0x628, 0x64a,
+0x3b, 0x62f, 0x631, 0x647, 0x645, 0x627, 0x646, 0x20, 0x645, 0x63a, 0x631, 0x628, 0x64a, 0x627, 0x646, 0x3b, 0x62f, 0x631, 0x627, 0x647,
+0x645, 0x20, 0x645, 0x63a, 0x631, 0x628, 0x64a, 0x629, 0x3b, 0x62f, 0x631, 0x647, 0x645, 0x64b, 0x627, 0x20, 0x645, 0x63a, 0x631, 0x628,
+0x64a, 0x64b, 0x627, 0x3b, 0x62f, 0x631, 0x647, 0x645, 0x20, 0x645, 0x63a, 0x631, 0x628, 0x64a, 0x631, 0x64a, 0x627, 0x644, 0x20, 0x639,
+0x645, 0x627, 0x646, 0x64a, 0x3b, 0x631, 0x64a, 0x627, 0x644, 0x20, 0x639, 0x645, 0x627, 0x646, 0x64a, 0x3b, 0x631, 0x64a, 0x627, 0x644,
+0x20, 0x639, 0x645, 0x627, 0x646, 0x64a, 0x3b, 0x631, 0x64a, 0x627, 0x644, 0x20, 0x639, 0x645, 0x627, 0x646, 0x64a, 0x3b, 0x631, 0x64a,
+0x627, 0x644, 0x20, 0x639, 0x645, 0x627, 0x646, 0x64a, 0x3b, 0x631, 0x64a, 0x627, 0x644, 0x20, 0x639, 0x645, 0x627, 0x646, 0x64a, 0x3b,
+0x631, 0x64a, 0x627, 0x644, 0x20, 0x639, 0x645, 0x627, 0x646, 0x64a, 0x631, 0x64a, 0x627, 0x644, 0x20, 0x642, 0x637, 0x631, 0x64a, 0x3b,
+0x631, 0x64a, 0x627, 0x644, 0x20, 0x642, 0x637, 0x631, 0x64a, 0x3b, 0x631, 0x64a, 0x627, 0x644, 0x20, 0x642, 0x637, 0x631, 0x64a, 0x3b,
+0x631, 0x64a, 0x627, 0x644, 0x20, 0x642, 0x637, 0x631, 0x64a, 0x3b, 0x631, 0x64a, 0x627, 0x644, 0x20, 0x642, 0x637, 0x631, 0x64a, 0x3b,
+0x631, 0x64a, 0x627, 0x644, 0x20, 0x642, 0x637, 0x631, 0x64a, 0x3b, 0x631, 0x64a, 0x627, 0x644, 0x20, 0x642, 0x637, 0x631, 0x64a, 0x631,
+0x64a, 0x627, 0x644, 0x20, 0x633, 0x639, 0x648, 0x62f, 0x64a, 0x3b, 0x631, 0x64a, 0x627, 0x644, 0x20, 0x633, 0x639, 0x648, 0x62f, 0x64a,
+0x3b, 0x631, 0x64a, 0x627, 0x644, 0x20, 0x633, 0x639, 0x648, 0x62f, 0x64a, 0x3b, 0x631, 0x64a, 0x627, 0x644, 0x20, 0x633, 0x639, 0x648,
+0x62f, 0x64a, 0x3b, 0x631, 0x64a, 0x627, 0x644, 0x20, 0x633, 0x639, 0x648, 0x62f, 0x64a, 0x3b, 0x631, 0x64a, 0x627, 0x644, 0x20, 0x633,
+0x639, 0x648, 0x62f, 0x64a, 0x3b, 0x631, 0x64a, 0x627, 0x644, 0x20, 0x633, 0x639, 0x648, 0x62f, 0x64a, 0x634, 0x644, 0x646, 0x20, 0x635,
 0x648, 0x645, 0x627, 0x644, 0x64a, 0x3b, 0x634, 0x644, 0x646, 0x20, 0x635, 0x648, 0x645, 0x627, 0x644, 0x64a, 0x3b, 0x634, 0x644, 0x646,
 0x20, 0x635, 0x648, 0x645, 0x627, 0x644, 0x64a, 0x3b, 0x634, 0x644, 0x646, 0x20, 0x635, 0x648, 0x645, 0x627, 0x644, 0x64a, 0x3b, 0x634,
-0x644, 0x646, 0x20, 0x635, 0x648, 0x645, 0x627, 0x644, 0x64a, 0x3b, 0x62c, 0x646, 0x64a, 0x647, 0x20, 0x633, 0x648, 0x62f, 0x627, 0x646,
-0x64a, 0x3b, 0x62c, 0x646, 0x64a, 0x647, 0x20, 0x633, 0x648, 0x62f, 0x627, 0x646, 0x64a, 0x3b, 0x62c, 0x646, 0x64a, 0x647, 0x20, 0x633,
-0x648, 0x62f, 0x627, 0x646, 0x64a, 0x3b, 0x62c, 0x646, 0x64a, 0x647, 0x20, 0x633, 0x648, 0x62f, 0x627, 0x646, 0x64a, 0x3b, 0x62c, 0x646,
-0x64a, 0x647, 0x627, 0x62a, 0x20, 0x633, 0x648, 0x62f, 0x627, 0x646, 0x64a, 0x629, 0x3b, 0x62c, 0x646, 0x64a, 0x647, 0x64b, 0x627, 0x20,
-0x633, 0x648, 0x62f, 0x627, 0x646, 0x64a, 0x64b, 0x627, 0x3b, 0x62c, 0x646, 0x64a, 0x647, 0x20, 0x633, 0x648, 0x62f, 0x627, 0x646, 0x64a,
-0x3b, 0x644, 0x64a, 0x631, 0x629, 0x20, 0x633, 0x648, 0x631, 0x64a, 0x629, 0x3b, 0x644, 0x64a, 0x631, 0x629, 0x20, 0x633, 0x648, 0x631,
+0x644, 0x646, 0x20, 0x635, 0x648, 0x645, 0x627, 0x644, 0x64a, 0x3b, 0x634, 0x644, 0x646, 0x20, 0x635, 0x648, 0x645, 0x627, 0x644, 0x64a,
+0x3b, 0x634, 0x644, 0x646, 0x20, 0x635, 0x648, 0x645, 0x627, 0x644, 0x64a, 0x62c, 0x646, 0x64a, 0x647, 0x20, 0x633, 0x648, 0x62f, 0x627,
+0x646, 0x64a, 0x3b, 0x62c, 0x646, 0x64a, 0x647, 0x20, 0x633, 0x648, 0x62f, 0x627, 0x646, 0x64a, 0x3b, 0x62c, 0x646, 0x64a, 0x647, 0x20,
+0x633, 0x648, 0x62f, 0x627, 0x646, 0x64a, 0x3b, 0x62c, 0x646, 0x64a, 0x647, 0x20, 0x633, 0x648, 0x62f, 0x627, 0x646, 0x64a, 0x3b, 0x62c,
+0x646, 0x64a, 0x647, 0x627, 0x62a, 0x20, 0x633, 0x648, 0x62f, 0x627, 0x646, 0x64a, 0x629, 0x3b, 0x62c, 0x646, 0x64a, 0x647, 0x64b, 0x627,
+0x20, 0x633, 0x648, 0x62f, 0x627, 0x646, 0x64a, 0x64b, 0x627, 0x3b, 0x62c, 0x646, 0x64a, 0x647, 0x20, 0x633, 0x648, 0x62f, 0x627, 0x646,
+0x64a, 0x644, 0x64a, 0x631, 0x629, 0x20, 0x633, 0x648, 0x631, 0x64a, 0x629, 0x3b, 0x644, 0x64a, 0x631, 0x629, 0x20, 0x633, 0x648, 0x631,
 0x64a, 0x629, 0x3b, 0x644, 0x64a, 0x631, 0x629, 0x20, 0x633, 0x648, 0x631, 0x64a, 0x629, 0x3b, 0x644, 0x64a, 0x631, 0x629, 0x20, 0x633,
 0x648, 0x631, 0x64a, 0x629, 0x3b, 0x644, 0x64a, 0x631, 0x629, 0x20, 0x633, 0x648, 0x631, 0x64a, 0x629, 0x3b, 0x644, 0x64a, 0x631, 0x629,
-0x20, 0x633, 0x648, 0x631, 0x64a, 0x629, 0x3b, 0x644, 0x64a, 0x631, 0x629, 0x20, 0x633, 0x648, 0x631, 0x64a, 0x629, 0x3b, 0x62f, 0x64a,
-0x646, 0x627, 0x631, 0x20, 0x62a, 0x648, 0x646, 0x633, 0x64a, 0x3b, 0x62f, 0x64a, 0x646, 0x627, 0x631, 0x20, 0x62a, 0x648, 0x646, 0x633,
-0x64a, 0x3b, 0x62f, 0x64a, 0x646, 0x627, 0x631, 0x20, 0x62a, 0x648, 0x646, 0x633, 0x64a, 0x3b, 0x62f, 0x64a, 0x646, 0x627, 0x631, 0x627,
-0x646, 0x20, 0x62a, 0x648, 0x646, 0x633, 0x64a, 0x627, 0x646, 0x3b, 0x62f, 0x64a, 0x646, 0x627, 0x631, 0x627, 0x62a, 0x20, 0x62a, 0x648,
-0x646, 0x633, 0x64a, 0x629, 0x3b, 0x62f, 0x64a, 0x646, 0x627, 0x631, 0x64b, 0x627, 0x20, 0x62a, 0x648, 0x646, 0x633, 0x64a, 0x64b, 0x627,
-0x3b, 0x62f, 0x64a, 0x646, 0x627, 0x631, 0x20, 0x62a, 0x648, 0x646, 0x633, 0x64a, 0x3b, 0x62f, 0x631, 0x647, 0x645, 0x20, 0x625, 0x645,
-0x627, 0x631, 0x627, 0x62a, 0x64a, 0x3b, 0x62f, 0x631, 0x647, 0x645, 0x20, 0x625, 0x645, 0x627, 0x631, 0x627, 0x62a, 0x64a, 0x3b, 0x62f,
-0x631, 0x647, 0x645, 0x20, 0x625, 0x645, 0x627, 0x631, 0x627, 0x62a, 0x64a, 0x3b, 0x62f, 0x631, 0x647, 0x645, 0x20, 0x625, 0x645, 0x627,
-0x631, 0x627, 0x62a, 0x64a, 0x3b, 0x62f, 0x631, 0x647, 0x645, 0x20, 0x625, 0x645, 0x627, 0x631, 0x627, 0x62a, 0x64a, 0x3b, 0x62f, 0x631,
-0x647, 0x645, 0x20, 0x625, 0x645, 0x627, 0x631, 0x627, 0x62a, 0x64a, 0x3b, 0x62f, 0x631, 0x647, 0x645, 0x20, 0x625, 0x645, 0x627, 0x631,
-0x627, 0x62a, 0x64a, 0x3b, 0x631, 0x64a, 0x627, 0x644, 0x20, 0x64a, 0x645, 0x646, 0x64a, 0x3b, 0x631, 0x64a, 0x627, 0x644, 0x20, 0x64a,
-0x645, 0x646, 0x64a, 0x3b, 0x631, 0x64a, 0x627, 0x644, 0x20, 0x64a, 0x645, 0x646, 0x64a, 0x3b, 0x631, 0x64a, 0x627, 0x644, 0x20, 0x64a,
-0x645, 0x646, 0x64a, 0x3b, 0x631, 0x64a, 0x627, 0x644, 0x20, 0x64a, 0x645, 0x646, 0x64a, 0x3b, 0x631, 0x64a, 0x627, 0x644, 0x20, 0x64a,
-0x645, 0x646, 0x64a, 0x3b, 0x631, 0x64a, 0x627, 0x644, 0x20, 0x64a, 0x645, 0x646, 0x64a, 0x3b, 0x62c, 0x646, 0x64a, 0x647, 0x20, 0x62c,
-0x646, 0x648, 0x628, 0x20, 0x627, 0x644, 0x633, 0x648, 0x62f, 0x627, 0x646, 0x3b, 0x62c, 0x646, 0x64a, 0x647, 0x20, 0x62c, 0x646, 0x648,
-0x628, 0x20, 0x627, 0x644, 0x633, 0x648, 0x62f, 0x627, 0x646, 0x3b, 0x62c, 0x646, 0x64a, 0x647, 0x20, 0x62c, 0x646, 0x648, 0x628, 0x20,
-0x627, 0x644, 0x633, 0x648, 0x62f, 0x627, 0x646, 0x3b, 0x62c, 0x646, 0x64a, 0x647, 0x627, 0x646, 0x20, 0x62c, 0x646, 0x648, 0x628, 0x20,
-0x627, 0x644, 0x633, 0x648, 0x62f, 0x627, 0x646, 0x3b, 0x62c, 0x646, 0x64a, 0x647, 0x627, 0x62a, 0x20, 0x62c, 0x646, 0x648, 0x628, 0x20,
-0x627, 0x644, 0x633, 0x648, 0x62f, 0x627, 0x646, 0x3b, 0x62c, 0x646, 0x64a, 0x647, 0x64b, 0x627, 0x20, 0x62c, 0x646, 0x648, 0x628, 0x20,
+0x20, 0x633, 0x648, 0x631, 0x64a, 0x629, 0x3b, 0x644, 0x64a, 0x631, 0x629, 0x20, 0x633, 0x648, 0x631, 0x64a, 0x629, 0x62f, 0x64a, 0x646,
+0x627, 0x631, 0x20, 0x62a, 0x648, 0x646, 0x633, 0x64a, 0x3b, 0x62f, 0x64a, 0x646, 0x627, 0x631, 0x20, 0x62a, 0x648, 0x646, 0x633, 0x64a,
+0x3b, 0x62f, 0x64a, 0x646, 0x627, 0x631, 0x20, 0x62a, 0x648, 0x646, 0x633, 0x64a, 0x3b, 0x62f, 0x64a, 0x646, 0x627, 0x631, 0x627, 0x646,
+0x20, 0x62a, 0x648, 0x646, 0x633, 0x64a, 0x627, 0x646, 0x3b, 0x62f, 0x64a, 0x646, 0x627, 0x631, 0x627, 0x62a, 0x20, 0x62a, 0x648, 0x646,
+0x633, 0x64a, 0x629, 0x3b, 0x62f, 0x64a, 0x646, 0x627, 0x631, 0x64b, 0x627, 0x20, 0x62a, 0x648, 0x646, 0x633, 0x64a, 0x64b, 0x627, 0x3b,
+0x62f, 0x64a, 0x646, 0x627, 0x631, 0x20, 0x62a, 0x648, 0x646, 0x633, 0x64a, 0x62f, 0x631, 0x647, 0x645, 0x20, 0x625, 0x645, 0x627, 0x631,
+0x627, 0x62a, 0x64a, 0x3b, 0x62f, 0x631, 0x647, 0x645, 0x20, 0x625, 0x645, 0x627, 0x631, 0x627, 0x62a, 0x64a, 0x3b, 0x62f, 0x631, 0x647,
+0x645, 0x20, 0x625, 0x645, 0x627, 0x631, 0x627, 0x62a, 0x64a, 0x3b, 0x62f, 0x631, 0x647, 0x645, 0x20, 0x625, 0x645, 0x627, 0x631, 0x627,
+0x62a, 0x64a, 0x3b, 0x62f, 0x631, 0x647, 0x645, 0x20, 0x625, 0x645, 0x627, 0x631, 0x627, 0x62a, 0x64a, 0x3b, 0x62f, 0x631, 0x647, 0x645,
+0x20, 0x625, 0x645, 0x627, 0x631, 0x627, 0x62a, 0x64a, 0x3b, 0x62f, 0x631, 0x647, 0x645, 0x20, 0x625, 0x645, 0x627, 0x631, 0x627, 0x62a,
+0x64a, 0x631, 0x64a, 0x627, 0x644, 0x20, 0x64a, 0x645, 0x646, 0x64a, 0x3b, 0x631, 0x64a, 0x627, 0x644, 0x20, 0x64a, 0x645, 0x646, 0x64a,
+0x3b, 0x631, 0x64a, 0x627, 0x644, 0x20, 0x64a, 0x645, 0x646, 0x64a, 0x3b, 0x631, 0x64a, 0x627, 0x644, 0x20, 0x64a, 0x645, 0x646, 0x64a,
+0x3b, 0x631, 0x64a, 0x627, 0x644, 0x20, 0x64a, 0x645, 0x646, 0x64a, 0x3b, 0x631, 0x64a, 0x627, 0x644, 0x20, 0x64a, 0x645, 0x646, 0x64a,
+0x3b, 0x631, 0x64a, 0x627, 0x644, 0x20, 0x64a, 0x645, 0x646, 0x64a, 0x62c, 0x646, 0x64a, 0x647, 0x20, 0x62c, 0x646, 0x648, 0x628, 0x20,
 0x627, 0x644, 0x633, 0x648, 0x62f, 0x627, 0x646, 0x3b, 0x62c, 0x646, 0x64a, 0x647, 0x20, 0x62c, 0x646, 0x648, 0x628, 0x20, 0x627, 0x644,
-0x633, 0x648, 0x62f, 0x627, 0x646, 0x3b, 0x570, 0x561, 0x575, 0x56f, 0x561, 0x56f, 0x561, 0x576, 0x20, 0x564, 0x580, 0x561, 0x574, 0x3b,
-0x3b, 0x570, 0x561, 0x575, 0x56f, 0x561, 0x56f, 0x561, 0x576, 0x20, 0x564, 0x580, 0x561, 0x574, 0x3b, 0x3b, 0x3b, 0x3b, 0x570, 0x561,
-0x575, 0x56f, 0x561, 0x56f, 0x561, 0x576, 0x20, 0x564, 0x580, 0x561, 0x574, 0x3b, 0x9ad, 0x9be, 0x9f0, 0x9a4, 0x9c0, 0x9af, 0x9bc, 0x20,
-0x9f0, 0x9c1, 0x9aa, 0x9c0, 0x3b, 0x3b, 0x9ad, 0x9be, 0x9f0, 0x9a4, 0x9c0, 0x9af, 0x9bc, 0x20, 0x9f0, 0x9c1, 0x9aa, 0x9c0, 0x3b, 0x3b,
-0x3b, 0x3b, 0x9ad, 0x9be, 0x9f0, 0x9a4, 0x9c0, 0x9af, 0x9bc, 0x20, 0x9f0, 0x9c1, 0x9aa, 0x9c0, 0x3b, 0x41, 0x7a, 0x259, 0x72, 0x62,
-0x61, 0x79, 0x63, 0x61, 0x6e, 0x20, 0x4d, 0x61, 0x6e, 0x61, 0x74, 0x131, 0x3b, 0x3b, 0x41, 0x7a, 0x259, 0x72, 0x62, 0x61,
-0x79, 0x63, 0x61, 0x6e, 0x20, 0x6d, 0x61, 0x6e, 0x61, 0x74, 0x131, 0x3b, 0x3b, 0x3b, 0x3b, 0x41, 0x7a, 0x259, 0x72, 0x62,
-0x61, 0x79, 0x63, 0x61, 0x6e, 0x20, 0x6d, 0x61, 0x6e, 0x61, 0x74, 0x131, 0x3b, 0x43c, 0x430, 0x43d, 0x430, 0x442, 0x3b, 0x3b,
-0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x65, 0x75, 0x72, 0x6f, 0x61, 0x3b, 0x3b, 0x65, 0x75, 0x72, 0x6f, 0x3b, 0x3b, 0x3b, 0x3b,
-0x65, 0x75, 0x72, 0x6f, 0x3b, 0x9ac, 0x9be, 0x982, 0x9b2, 0x9be, 0x9a6, 0x9c7, 0x9b6, 0x9c0, 0x20, 0x99f, 0x9be, 0x995, 0x9be, 0x3b,
-0x3b, 0x9ac, 0x9be, 0x982, 0x9b2, 0x9be, 0x9a6, 0x9c7, 0x9b6, 0x9c0, 0x20, 0x99f, 0x9be, 0x995, 0x9be, 0x3b, 0x3b, 0x3b, 0x3b, 0x9ac,
-0x9be, 0x982, 0x9b2, 0x9be, 0x9a6, 0x9c7, 0x9b6, 0x9c0, 0x20, 0x99f, 0x9be, 0x995, 0x9be, 0x3b, 0x9ad, 0x9be, 0x9b0, 0x9a4, 0x9c0, 0x9af,
-0x9bc, 0x20, 0x9b0, 0x9c1, 0x9aa, 0x9bf, 0x3b, 0x3b, 0x9ad, 0x9be, 0x9b0, 0x9a4, 0x9c0, 0x9af, 0x9bc, 0x20, 0x9b0, 0x9c1, 0x9aa, 0x9bf,
-0x3b, 0x3b, 0x3b, 0x3b, 0x9ad, 0x9be, 0x9b0, 0x9a4, 0x9c0, 0x9af, 0x9bc, 0x20, 0x9b0, 0x9c1, 0x9aa, 0x9bf, 0x3b, 0xf51, 0xf44, 0xf74,
-0xf63, 0xf0b, 0xf40, 0xfb2, 0xf58, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x65, 0x75, 0x72, 0x6f, 0x3b, 0x3b, 0x65, 0x75,
-0x72, 0x6f, 0x3b, 0x65, 0x75, 0x72, 0x6f, 0x3b, 0x65, 0x75, 0x72, 0x6f, 0x3b, 0x61, 0x20, 0x65, 0x75, 0x72, 0x6f, 0x69,
-0x6f, 0xf9, 0x3b, 0x65, 0x75, 0x72, 0x6f, 0x3b, 0x411, 0x44a, 0x43b, 0x433, 0x430, 0x440, 0x441, 0x43a, 0x438, 0x20, 0x43b, 0x435,
-0x432, 0x3b, 0x3b, 0x431, 0x44a, 0x43b, 0x433, 0x430, 0x440, 0x441, 0x43a, 0x438, 0x20, 0x43b, 0x435, 0x432, 0x3b, 0x3b, 0x3b, 0x3b,
-0x431, 0x44a, 0x43b, 0x433, 0x430, 0x440, 0x441, 0x43a, 0x438, 0x20, 0x43b, 0x435, 0x432, 0x430, 0x3b, 0x1019, 0x103c, 0x1014, 0x103a, 0x1019,
-0x102c, 0x20, 0x1000, 0x103b, 0x1015, 0x103a, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x1019, 0x103c, 0x1014, 0x103a, 0x1019, 0x102c, 0x20, 0x1000,
-0x103b, 0x1015, 0x103a, 0x3b, 0x431, 0x435, 0x43b, 0x430, 0x440, 0x443, 0x441, 0x43a, 0x456, 0x20, 0x440, 0x443, 0x431, 0x435, 0x43b, 0x44c,
-0x3b, 0x3b, 0x431, 0x435, 0x43b, 0x430, 0x440, 0x443, 0x441, 0x43a, 0x456, 0x20, 0x440, 0x443, 0x431, 0x435, 0x43b, 0x44c, 0x3b, 0x3b,
-0x431, 0x435, 0x43b, 0x430, 0x440, 0x443, 0x441, 0x43a, 0x456, 0x44f, 0x20, 0x440, 0x443, 0x431, 0x43b, 0x456, 0x3b, 0x431, 0x435, 0x43b,
-0x430, 0x440, 0x443, 0x441, 0x43a, 0x456, 0x445, 0x20, 0x440, 0x443, 0x431, 0x43b, 0x451, 0x45e, 0x3b, 0x431, 0x435, 0x43b, 0x430, 0x440,
-0x443, 0x441, 0x43a, 0x430, 0x433, 0x430, 0x20, 0x440, 0x443, 0x431, 0x43b, 0x44f, 0x3b, 0x179a, 0x17c0, 0x179b, 0x200b, 0x1780, 0x1798, 0x17d2,
-0x1796, 0x17bb, 0x1787, 0x17b6, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x179a, 0x17c0, 0x179b, 0x200b, 0x1780, 0x1798, 0x17d2, 0x1796, 0x17bb, 0x1787,
-0x17b6, 0x3b, 0x65, 0x75, 0x72, 0x6f, 0x3b, 0x3b, 0x65, 0x75, 0x72, 0x6f, 0x3b, 0x3b, 0x3b, 0x3b, 0x65, 0x75, 0x72, 0x6f,
-0x73, 0x3b, 0x4eba, 0x6c11, 0x5e01, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x4eba, 0x6c11, 0x5e01, 0x3b, 0x6e2f, 0x5143, 0x3b, 0x3b, 0x3b,
-0x3b, 0x3b, 0x3b, 0x6e2f, 0x5143, 0x3b, 0x6fb3, 0x95e8, 0x5e01, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x6fb3, 0x95e8, 0x5143, 0x3b, 0x65b0,
-0x52a0, 0x5761, 0x5143, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x65b0, 0x52a0, 0x5761, 0x5143, 0x3b, 0x6fb3, 0x9580, 0x5143, 0x3b, 0x3b, 0x3b,
-0x3b, 0x3b, 0x3b, 0x6fb3, 0x9580, 0x5143, 0x3b, 0x65b0, 0x53f0, 0x5e63, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x65b0, 0x53f0, 0x5e63, 0x3b,
-0x68, 0x72, 0x76, 0x61, 0x74, 0x73, 0x6b, 0x61, 0x20, 0x6b, 0x75, 0x6e, 0x61, 0x3b, 0x3b, 0x68, 0x72, 0x76, 0x61, 0x74,
-0x73, 0x6b, 0x61, 0x20, 0x6b, 0x75, 0x6e, 0x61, 0x3b, 0x3b, 0x68, 0x72, 0x76, 0x61, 0x74, 0x73, 0x6b, 0x65, 0x20, 0x6b,
-0x75, 0x6e, 0x65, 0x3b, 0x3b, 0x68, 0x72, 0x76, 0x61, 0x74, 0x73, 0x6b, 0x69, 0x68, 0x20, 0x6b, 0x75, 0x6e, 0x61, 0x3b,
-0x6b, 0x6f, 0x6e, 0x76, 0x65, 0x72, 0x74, 0x69, 0x62, 0x69, 0x6c, 0x6e, 0x61, 0x20, 0x6d, 0x61, 0x72, 0x6b, 0x61, 0x3b,
-0x3b, 0x6b, 0x6f, 0x6e, 0x76, 0x65, 0x72, 0x74, 0x69, 0x62, 0x69, 0x6c, 0x6e, 0x61, 0x20, 0x6d, 0x61, 0x72, 0x6b, 0x61,
-0x3b, 0x3b, 0x6b, 0x6f, 0x6e, 0x76, 0x65, 0x72, 0x74, 0x69, 0x62, 0x69, 0x6c, 0x6e, 0x65, 0x20, 0x6d, 0x61, 0x72, 0x6b,
-0x65, 0x3b, 0x3b, 0x6b, 0x6f, 0x6e, 0x76, 0x65, 0x72, 0x74, 0x69, 0x62, 0x69, 0x6c, 0x6e, 0x69, 0x68, 0x20, 0x6d, 0x61,
-0x72, 0x61, 0x6b, 0x61, 0x3b, 0x10d, 0x65, 0x73, 0x6b, 0xe1, 0x20, 0x6b, 0x6f, 0x72, 0x75, 0x6e, 0x61, 0x3b, 0x3b, 0x10d,
-0x65, 0x73, 0x6b, 0xe1, 0x20, 0x6b, 0x6f, 0x72, 0x75, 0x6e, 0x61, 0x3b, 0x3b, 0x10d, 0x65, 0x73, 0x6b, 0xe9, 0x20, 0x6b,
-0x6f, 0x72, 0x75, 0x6e, 0x79, 0x3b, 0x10d, 0x65, 0x73, 0x6b, 0xe9, 0x20, 0x6b, 0x6f, 0x72, 0x75, 0x6e, 0x79, 0x3b, 0x10d,
-0x65, 0x73, 0x6b, 0xfd, 0x63, 0x68, 0x20, 0x6b, 0x6f, 0x72, 0x75, 0x6e, 0x3b, 0x64, 0x61, 0x6e, 0x73, 0x6b, 0x20, 0x6b,
+0x633, 0x648, 0x62f, 0x627, 0x646, 0x3b, 0x62c, 0x646, 0x64a, 0x647, 0x20, 0x62c, 0x646, 0x648, 0x628, 0x20, 0x627, 0x644, 0x633, 0x648,
+0x62f, 0x627, 0x646, 0x3b, 0x62c, 0x646, 0x64a, 0x647, 0x627, 0x646, 0x20, 0x62c, 0x646, 0x648, 0x628, 0x20, 0x627, 0x644, 0x633, 0x648,
+0x62f, 0x627, 0x646, 0x3b, 0x62c, 0x646, 0x64a, 0x647, 0x627, 0x62a, 0x20, 0x62c, 0x646, 0x648, 0x628, 0x20, 0x627, 0x644, 0x633, 0x648,
+0x62f, 0x627, 0x646, 0x3b, 0x62c, 0x646, 0x64a, 0x647, 0x64b, 0x627, 0x20, 0x62c, 0x646, 0x648, 0x628, 0x20, 0x627, 0x644, 0x633, 0x648,
+0x62f, 0x627, 0x646, 0x3b, 0x62c, 0x646, 0x64a, 0x647, 0x20, 0x62c, 0x646, 0x648, 0x628, 0x20, 0x627, 0x644, 0x633, 0x648, 0x62f, 0x627,
+0x646, 0x570, 0x561, 0x575, 0x56f, 0x561, 0x56f, 0x561, 0x576, 0x20, 0x564, 0x580, 0x561, 0x574, 0x3b, 0x3b, 0x570, 0x561, 0x575, 0x56f,
+0x561, 0x56f, 0x561, 0x576, 0x20, 0x564, 0x580, 0x561, 0x574, 0x3b, 0x3b, 0x3b, 0x3b, 0x570, 0x561, 0x575, 0x56f, 0x561, 0x56f, 0x561,
+0x576, 0x20, 0x564, 0x580, 0x561, 0x574, 0x9ad, 0x9be, 0x9f0, 0x9a4, 0x9c0, 0x9af, 0x9bc, 0x20, 0x9f0, 0x9c1, 0x9aa, 0x9c0, 0x3b, 0x3b,
+0x9ad, 0x9be, 0x9f0, 0x9a4, 0x9c0, 0x9af, 0x9bc, 0x20, 0x9f0, 0x9c1, 0x9aa, 0x9c0, 0x3b, 0x3b, 0x3b, 0x3b, 0x9ad, 0x9be, 0x9f0, 0x9a4,
+0x9c0, 0x9af, 0x9bc, 0x20, 0x9f0, 0x9c1, 0x9aa, 0x9c0, 0x41, 0x7a, 0x259, 0x72, 0x62, 0x61, 0x79, 0x63, 0x61, 0x6e, 0x20, 0x4d,
+0x61, 0x6e, 0x61, 0x74, 0x131, 0x3b, 0x3b, 0x41, 0x7a, 0x259, 0x72, 0x62, 0x61, 0x79, 0x63, 0x61, 0x6e, 0x20, 0x6d, 0x61,
+0x6e, 0x61, 0x74, 0x131, 0x3b, 0x3b, 0x3b, 0x3b, 0x41, 0x7a, 0x259, 0x72, 0x62, 0x61, 0x79, 0x63, 0x61, 0x6e, 0x20, 0x6d,
+0x61, 0x6e, 0x61, 0x74, 0x131, 0x43c, 0x430, 0x43d, 0x430, 0x442, 0x65, 0x75, 0x72, 0x6f, 0x61, 0x3b, 0x3b, 0x65, 0x75, 0x72,
+0x6f, 0x3b, 0x3b, 0x3b, 0x3b, 0x65, 0x75, 0x72, 0x6f, 0x9ac, 0x9be, 0x982, 0x9b2, 0x9be, 0x9a6, 0x9c7, 0x9b6, 0x9c0, 0x20, 0x99f,
+0x9be, 0x995, 0x9be, 0x3b, 0x3b, 0x9ac, 0x9be, 0x982, 0x9b2, 0x9be, 0x9a6, 0x9c7, 0x9b6, 0x9c0, 0x20, 0x99f, 0x9be, 0x995, 0x9be, 0x3b,
+0x3b, 0x3b, 0x3b, 0x9ac, 0x9be, 0x982, 0x9b2, 0x9be, 0x9a6, 0x9c7, 0x9b6, 0x9c0, 0x20, 0x99f, 0x9be, 0x995, 0x9be, 0x9ad, 0x9be, 0x9b0,
+0x9a4, 0x9c0, 0x9af, 0x9bc, 0x20, 0x9b0, 0x9c1, 0x9aa, 0x9bf, 0x3b, 0x3b, 0x9ad, 0x9be, 0x9b0, 0x9a4, 0x9c0, 0x9af, 0x9bc, 0x20, 0x9b0,
+0x9c1, 0x9aa, 0x9bf, 0x3b, 0x3b, 0x3b, 0x3b, 0x9ad, 0x9be, 0x9b0, 0x9a4, 0x9c0, 0x9af, 0x9bc, 0x20, 0x9b0, 0x9c1, 0x9aa, 0x9bf, 0xf51,
+0xf44, 0xf74, 0xf63, 0xf0b, 0xf40, 0xfb2, 0xf58, 0x65, 0x75, 0x72, 0x6f, 0x3b, 0x3b, 0x65, 0x75, 0x72, 0x6f, 0x3b, 0x65, 0x75,
+0x72, 0x6f, 0x3b, 0x65, 0x75, 0x72, 0x6f, 0x3b, 0x61, 0x20, 0x65, 0x75, 0x72, 0x6f, 0x69, 0x6f, 0xf9, 0x3b, 0x65, 0x75,
+0x72, 0x6f, 0x411, 0x44a, 0x43b, 0x433, 0x430, 0x440, 0x441, 0x43a, 0x438, 0x20, 0x43b, 0x435, 0x432, 0x3b, 0x3b, 0x431, 0x44a, 0x43b,
+0x433, 0x430, 0x440, 0x441, 0x43a, 0x438, 0x20, 0x43b, 0x435, 0x432, 0x3b, 0x3b, 0x3b, 0x3b, 0x431, 0x44a, 0x43b, 0x433, 0x430, 0x440,
+0x441, 0x43a, 0x438, 0x20, 0x43b, 0x435, 0x432, 0x430, 0x1019, 0x103c, 0x1014, 0x103a, 0x1019, 0x102c, 0x20, 0x1000, 0x103b, 0x1015, 0x103a, 0x3b,
+0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x1019, 0x103c, 0x1014, 0x103a, 0x1019, 0x102c, 0x20, 0x1000, 0x103b, 0x1015, 0x103a, 0x431, 0x435, 0x43b, 0x430,
+0x440, 0x443, 0x441, 0x43a, 0x456, 0x20, 0x440, 0x443, 0x431, 0x435, 0x43b, 0x44c, 0x3b, 0x3b, 0x431, 0x435, 0x43b, 0x430, 0x440, 0x443,
+0x441, 0x43a, 0x456, 0x20, 0x440, 0x443, 0x431, 0x435, 0x43b, 0x44c, 0x3b, 0x3b, 0x431, 0x435, 0x43b, 0x430, 0x440, 0x443, 0x441, 0x43a,
+0x456, 0x44f, 0x20, 0x440, 0x443, 0x431, 0x43b, 0x456, 0x3b, 0x431, 0x435, 0x43b, 0x430, 0x440, 0x443, 0x441, 0x43a, 0x456, 0x445, 0x20,
+0x440, 0x443, 0x431, 0x43b, 0x451, 0x45e, 0x3b, 0x431, 0x435, 0x43b, 0x430, 0x440, 0x443, 0x441, 0x43a, 0x430, 0x433, 0x430, 0x20, 0x440,
+0x443, 0x431, 0x43b, 0x44f, 0x179a, 0x17c0, 0x179b, 0x200b, 0x1780, 0x1798, 0x17d2, 0x1796, 0x17bb, 0x1787, 0x17b6, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b,
+0x3b, 0x179a, 0x17c0, 0x179b, 0x200b, 0x1780, 0x1798, 0x17d2, 0x1796, 0x17bb, 0x1787, 0x17b6, 0x65, 0x75, 0x72, 0x6f, 0x3b, 0x3b, 0x65, 0x75,
+0x72, 0x6f, 0x3b, 0x3b, 0x3b, 0x3b, 0x65, 0x75, 0x72, 0x6f, 0x73, 0x4eba, 0x6c11, 0x5e01, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b,
+0x4eba, 0x6c11, 0x5e01, 0x6e2f, 0x5143, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x6e2f, 0x5143, 0x6fb3, 0x95e8, 0x5e01, 0x3b, 0x3b, 0x3b, 0x3b,
+0x3b, 0x3b, 0x6fb3, 0x95e8, 0x5143, 0x65b0, 0x52a0, 0x5761, 0x5143, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x65b0, 0x52a0, 0x5761, 0x5143, 0x6fb3,
+0x9580, 0x5143, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x6fb3, 0x9580, 0x5143, 0x65b0, 0x53f0, 0x5e63, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b,
+0x65b0, 0x53f0, 0x5e63, 0x68, 0x72, 0x76, 0x61, 0x74, 0x73, 0x6b, 0x61, 0x20, 0x6b, 0x75, 0x6e, 0x61, 0x3b, 0x3b, 0x68, 0x72,
+0x76, 0x61, 0x74, 0x73, 0x6b, 0x61, 0x20, 0x6b, 0x75, 0x6e, 0x61, 0x3b, 0x3b, 0x68, 0x72, 0x76, 0x61, 0x74, 0x73, 0x6b,
+0x65, 0x20, 0x6b, 0x75, 0x6e, 0x65, 0x3b, 0x3b, 0x68, 0x72, 0x76, 0x61, 0x74, 0x73, 0x6b, 0x69, 0x68, 0x20, 0x6b, 0x75,
+0x6e, 0x61, 0x6b, 0x6f, 0x6e, 0x76, 0x65, 0x72, 0x74, 0x69, 0x62, 0x69, 0x6c, 0x6e, 0x61, 0x20, 0x6d, 0x61, 0x72, 0x6b,
+0x61, 0x3b, 0x3b, 0x6b, 0x6f, 0x6e, 0x76, 0x65, 0x72, 0x74, 0x69, 0x62, 0x69, 0x6c, 0x6e, 0x61, 0x20, 0x6d, 0x61, 0x72,
+0x6b, 0x61, 0x3b, 0x3b, 0x6b, 0x6f, 0x6e, 0x76, 0x65, 0x72, 0x74, 0x69, 0x62, 0x69, 0x6c, 0x6e, 0x65, 0x20, 0x6d, 0x61,
+0x72, 0x6b, 0x65, 0x3b, 0x3b, 0x6b, 0x6f, 0x6e, 0x76, 0x65, 0x72, 0x74, 0x69, 0x62, 0x69, 0x6c, 0x6e, 0x69, 0x68, 0x20,
+0x6d, 0x61, 0x72, 0x61, 0x6b, 0x61, 0x10d, 0x65, 0x73, 0x6b, 0xe1, 0x20, 0x6b, 0x6f, 0x72, 0x75, 0x6e, 0x61, 0x3b, 0x3b,
+0x10d, 0x65, 0x73, 0x6b, 0xe1, 0x20, 0x6b, 0x6f, 0x72, 0x75, 0x6e, 0x61, 0x3b, 0x3b, 0x10d, 0x65, 0x73, 0x6b, 0xe9, 0x20,
+0x6b, 0x6f, 0x72, 0x75, 0x6e, 0x79, 0x3b, 0x10d, 0x65, 0x73, 0x6b, 0xe9, 0x20, 0x6b, 0x6f, 0x72, 0x75, 0x6e, 0x79, 0x3b,
+0x10d, 0x65, 0x73, 0x6b, 0xfd, 0x63, 0x68, 0x20, 0x6b, 0x6f, 0x72, 0x75, 0x6e, 0x64, 0x61, 0x6e, 0x73, 0x6b, 0x20, 0x6b,
 0x72, 0x6f, 0x6e, 0x65, 0x3b, 0x3b, 0x64, 0x61, 0x6e, 0x73, 0x6b, 0x20, 0x6b, 0x72, 0x6f, 0x6e, 0x65, 0x3b, 0x3b, 0x3b,
-0x3b, 0x64, 0x61, 0x6e, 0x73, 0x6b, 0x65, 0x20, 0x6b, 0x72, 0x6f, 0x6e, 0x65, 0x72, 0x3b, 0x45, 0x75, 0x72, 0x6f, 0x3b,
-0x3b, 0x65, 0x75, 0x72, 0x6f, 0x3b, 0x3b, 0x3b, 0x3b, 0x65, 0x75, 0x72, 0x6f, 0x3b, 0x41, 0x72, 0x75, 0x62, 0x61, 0x61,
-0x6e, 0x73, 0x65, 0x20, 0x67, 0x75, 0x6c, 0x64, 0x65, 0x6e, 0x3b, 0x3b, 0x41, 0x72, 0x75, 0x62, 0x61, 0x61, 0x6e, 0x73,
-0x65, 0x20, 0x67, 0x75, 0x6c, 0x64, 0x65, 0x6e, 0x3b, 0x3b, 0x3b, 0x3b, 0x41, 0x72, 0x75, 0x62, 0x61, 0x61, 0x6e, 0x73,
-0x65, 0x20, 0x67, 0x75, 0x6c, 0x64, 0x65, 0x6e, 0x3b, 0x4e, 0x65, 0x64, 0x65, 0x72, 0x6c, 0x61, 0x6e, 0x64, 0x73, 0x2d,
-0x41, 0x6e, 0x74, 0x69, 0x6c, 0x6c, 0x69, 0x61, 0x61, 0x6e, 0x73, 0x65, 0x20, 0x67, 0x75, 0x6c, 0x64, 0x65, 0x6e, 0x3b,
-0x3b, 0x4e, 0x65, 0x64, 0x65, 0x72, 0x6c, 0x61, 0x6e, 0x64, 0x73, 0x2d, 0x41, 0x6e, 0x74, 0x69, 0x6c, 0x6c, 0x69, 0x61,
-0x61, 0x6e, 0x73, 0x65, 0x20, 0x67, 0x75, 0x6c, 0x64, 0x65, 0x6e, 0x3b, 0x3b, 0x3b, 0x3b, 0x4e, 0x65, 0x64, 0x65, 0x72,
-0x6c, 0x61, 0x6e, 0x64, 0x73, 0x2d, 0x41, 0x6e, 0x74, 0x69, 0x6c, 0x6c, 0x69, 0x61, 0x61, 0x6e, 0x73, 0x65, 0x20, 0x67,
-0x75, 0x6c, 0x64, 0x65, 0x6e, 0x3b, 0x53, 0x75, 0x72, 0x69, 0x6e, 0x61, 0x61, 0x6d, 0x73, 0x65, 0x20, 0x64, 0x6f, 0x6c,
-0x6c, 0x61, 0x72, 0x3b, 0x3b, 0x53, 0x75, 0x72, 0x69, 0x6e, 0x61, 0x61, 0x6d, 0x73, 0x65, 0x20, 0x64, 0x6f, 0x6c, 0x6c,
-0x61, 0x72, 0x3b, 0x3b, 0x3b, 0x3b, 0x53, 0x75, 0x72, 0x69, 0x6e, 0x61, 0x61, 0x6d, 0x73, 0x65, 0x20, 0x64, 0x6f, 0x6c,
-0x6c, 0x61, 0x72, 0x3b, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x6b, 0x61, 0x61, 0x6e, 0x73, 0x65, 0x20, 0x64, 0x6f, 0x6c, 0x6c,
-0x61, 0x72, 0x3b, 0x3b, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x6b, 0x61, 0x61, 0x6e, 0x73, 0x65, 0x20, 0x64, 0x6f, 0x6c, 0x6c,
-0x61, 0x72, 0x3b, 0x3b, 0x3b, 0x3b, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x6b, 0x61, 0x61, 0x6e, 0x73, 0x65, 0x20, 0x64, 0x6f,
-0x6c, 0x6c, 0x61, 0x72, 0x3b, 0x55, 0x53, 0x20, 0x44, 0x6f, 0x6c, 0x6c, 0x61, 0x72, 0x3b, 0x3b, 0x55, 0x53, 0x20, 0x64,
-0x6f, 0x6c, 0x6c, 0x61, 0x72, 0x3b, 0x3b, 0x3b, 0x3b, 0x55, 0x53, 0x20, 0x64, 0x6f, 0x6c, 0x6c, 0x61, 0x72, 0x73, 0x3b,
-0x45, 0x61, 0x73, 0x74, 0x20, 0x43, 0x61, 0x72, 0x69, 0x62, 0x62, 0x65, 0x61, 0x6e, 0x20, 0x44, 0x6f, 0x6c, 0x6c, 0x61,
-0x72, 0x3b, 0x3b, 0x45, 0x61, 0x73, 0x74, 0x20, 0x43, 0x61, 0x72, 0x69, 0x62, 0x62, 0x65, 0x61, 0x6e, 0x20, 0x64, 0x6f,
-0x6c, 0x6c, 0x61, 0x72, 0x3b, 0x3b, 0x3b, 0x3b, 0x45, 0x61, 0x73, 0x74, 0x20, 0x43, 0x61, 0x72, 0x69, 0x62, 0x62, 0x65,
-0x61, 0x6e, 0x20, 0x64, 0x6f, 0x6c, 0x6c, 0x61, 0x72, 0x73, 0x3b, 0x41, 0x75, 0x73, 0x74, 0x72, 0x61, 0x6c, 0x69, 0x61,
-0x6e, 0x20, 0x44, 0x6f, 0x6c, 0x6c, 0x61, 0x72, 0x3b, 0x3b, 0x41, 0x75, 0x73, 0x74, 0x72, 0x61, 0x6c, 0x69, 0x61, 0x6e,
-0x20, 0x64, 0x6f, 0x6c, 0x6c, 0x61, 0x72, 0x3b, 0x3b, 0x3b, 0x3b, 0x41, 0x75, 0x73, 0x74, 0x72, 0x61, 0x6c, 0x69, 0x61,
-0x6e, 0x20, 0x64, 0x6f, 0x6c, 0x6c, 0x61, 0x72, 0x73, 0x3b, 0x45, 0x75, 0x72, 0x6f, 0x3b, 0x3b, 0x65, 0x75, 0x72, 0x6f,
-0x3b, 0x3b, 0x3b, 0x3b, 0x65, 0x75, 0x72, 0x6f, 0x73, 0x3b, 0x42, 0x61, 0x68, 0x61, 0x6d, 0x69, 0x61, 0x6e, 0x20, 0x44,
-0x6f, 0x6c, 0x6c, 0x61, 0x72, 0x3b, 0x3b, 0x42, 0x61, 0x68, 0x61, 0x6d, 0x69, 0x61, 0x6e, 0x20, 0x64, 0x6f, 0x6c, 0x6c,
-0x61, 0x72, 0x3b, 0x3b, 0x3b, 0x3b, 0x42, 0x61, 0x68, 0x61, 0x6d, 0x69, 0x61, 0x6e, 0x20, 0x64, 0x6f, 0x6c, 0x6c, 0x61,
-0x72, 0x73, 0x3b, 0x42, 0x61, 0x72, 0x62, 0x61, 0x64, 0x69, 0x61, 0x6e, 0x20, 0x44, 0x6f, 0x6c, 0x6c, 0x61, 0x72, 0x3b,
-0x3b, 0x42, 0x61, 0x72, 0x62, 0x61, 0x64, 0x69, 0x61, 0x6e, 0x20, 0x64, 0x6f, 0x6c, 0x6c, 0x61, 0x72, 0x3b, 0x3b, 0x3b,
-0x3b, 0x42, 0x61, 0x72, 0x62, 0x61, 0x64, 0x69, 0x61, 0x6e, 0x20, 0x64, 0x6f, 0x6c, 0x6c, 0x61, 0x72, 0x73, 0x3b, 0x42,
-0x65, 0x6c, 0x69, 0x7a, 0x65, 0x20, 0x44, 0x6f, 0x6c, 0x6c, 0x61, 0x72, 0x3b, 0x3b, 0x42, 0x65, 0x6c, 0x69, 0x7a, 0x65,
-0x20, 0x64, 0x6f, 0x6c, 0x6c, 0x61, 0x72, 0x3b, 0x3b, 0x3b, 0x3b, 0x42, 0x65, 0x6c, 0x69, 0x7a, 0x65, 0x20, 0x64, 0x6f,
-0x6c, 0x6c, 0x61, 0x72, 0x73, 0x3b, 0x42, 0x65, 0x72, 0x6d, 0x75, 0x64, 0x61, 0x6e, 0x20, 0x44, 0x6f, 0x6c, 0x6c, 0x61,
-0x72, 0x3b, 0x3b, 0x42, 0x65, 0x72, 0x6d, 0x75, 0x64, 0x61, 0x6e, 0x20, 0x64, 0x6f, 0x6c, 0x6c, 0x61, 0x72, 0x3b, 0x3b,
-0x3b, 0x3b, 0x42, 0x65, 0x72, 0x6d, 0x75, 0x64, 0x61, 0x6e, 0x20, 0x64, 0x6f, 0x6c, 0x6c, 0x61, 0x72, 0x73, 0x3b, 0x42,
-0x6f, 0x74, 0x73, 0x77, 0x61, 0x6e, 0x61, 0x6e, 0x20, 0x50, 0x75, 0x6c, 0x61, 0x3b, 0x3b, 0x42, 0x6f, 0x74, 0x73, 0x77,
-0x61, 0x6e, 0x61, 0x6e, 0x20, 0x70, 0x75, 0x6c, 0x61, 0x3b, 0x3b, 0x3b, 0x3b, 0x42, 0x6f, 0x74, 0x73, 0x77, 0x61, 0x6e,
-0x61, 0x6e, 0x20, 0x70, 0x75, 0x6c, 0x61, 0x73, 0x3b, 0x42, 0x75, 0x72, 0x75, 0x6e, 0x64, 0x69, 0x61, 0x6e, 0x20, 0x46,
-0x72, 0x61, 0x6e, 0x63, 0x3b, 0x3b, 0x42, 0x75, 0x72, 0x75, 0x6e, 0x64, 0x69, 0x61, 0x6e, 0x20, 0x66, 0x72, 0x61, 0x6e,
-0x63, 0x3b, 0x3b, 0x3b, 0x3b, 0x42, 0x75, 0x72, 0x75, 0x6e, 0x64, 0x69, 0x61, 0x6e, 0x20, 0x66, 0x72, 0x61, 0x6e, 0x63,
-0x73, 0x3b, 0x43, 0x65, 0x6e, 0x74, 0x72, 0x61, 0x6c, 0x20, 0x41, 0x66, 0x72, 0x69, 0x63, 0x61, 0x6e, 0x20, 0x43, 0x46,
-0x41, 0x20, 0x46, 0x72, 0x61, 0x6e, 0x63, 0x3b, 0x3b, 0x43, 0x65, 0x6e, 0x74, 0x72, 0x61, 0x6c, 0x20, 0x41, 0x66, 0x72,
-0x69, 0x63, 0x61, 0x6e, 0x20, 0x43, 0x46, 0x41, 0x20, 0x66, 0x72, 0x61, 0x6e, 0x63, 0x3b, 0x3b, 0x3b, 0x3b, 0x43, 0x65,
-0x6e, 0x74, 0x72, 0x61, 0x6c, 0x20, 0x41, 0x66, 0x72, 0x69, 0x63, 0x61, 0x6e, 0x20, 0x43, 0x46, 0x41, 0x20, 0x66, 0x72,
-0x61, 0x6e, 0x63, 0x73, 0x3b, 0x43, 0x61, 0x6e, 0x61, 0x64, 0x69, 0x61, 0x6e, 0x20, 0x44, 0x6f, 0x6c, 0x6c, 0x61, 0x72,
-0x3b, 0x3b, 0x43, 0x61, 0x6e, 0x61, 0x64, 0x69, 0x61, 0x6e, 0x20, 0x64, 0x6f, 0x6c, 0x6c, 0x61, 0x72, 0x3b, 0x3b, 0x3b,
-0x3b, 0x43, 0x61, 0x6e, 0x61, 0x64, 0x69, 0x61, 0x6e, 0x20, 0x64, 0x6f, 0x6c, 0x6c, 0x61, 0x72, 0x73, 0x3b, 0x43, 0x61,
-0x79, 0x6d, 0x61, 0x6e, 0x20, 0x49, 0x73, 0x6c, 0x61, 0x6e, 0x64, 0x73, 0x20, 0x44, 0x6f, 0x6c, 0x6c, 0x61, 0x72, 0x3b,
-0x3b, 0x43, 0x61, 0x79, 0x6d, 0x61, 0x6e, 0x20, 0x49, 0x73, 0x6c, 0x61, 0x6e, 0x64, 0x73, 0x20, 0x64, 0x6f, 0x6c, 0x6c,
-0x61, 0x72, 0x3b, 0x3b, 0x3b, 0x3b, 0x43, 0x61, 0x79, 0x6d, 0x61, 0x6e, 0x20, 0x49, 0x73, 0x6c, 0x61, 0x6e, 0x64, 0x73,
-0x20, 0x64, 0x6f, 0x6c, 0x6c, 0x61, 0x72, 0x73, 0x3b, 0x4e, 0x65, 0x77, 0x20, 0x5a, 0x65, 0x61, 0x6c, 0x61, 0x6e, 0x64,
-0x20, 0x44, 0x6f, 0x6c, 0x6c, 0x61, 0x72, 0x3b, 0x3b, 0x4e, 0x65, 0x77, 0x20, 0x5a, 0x65, 0x61, 0x6c, 0x61, 0x6e, 0x64,
-0x20, 0x64, 0x6f, 0x6c, 0x6c, 0x61, 0x72, 0x3b, 0x3b, 0x3b, 0x3b, 0x4e, 0x65, 0x77, 0x20, 0x5a, 0x65, 0x61, 0x6c, 0x61,
-0x6e, 0x64, 0x20, 0x64, 0x6f, 0x6c, 0x6c, 0x61, 0x72, 0x73, 0x3b, 0x44, 0x61, 0x6e, 0x69, 0x73, 0x68, 0x20, 0x4b, 0x72,
+0x3b, 0x64, 0x61, 0x6e, 0x73, 0x6b, 0x65, 0x20, 0x6b, 0x72, 0x6f, 0x6e, 0x65, 0x72, 0x45, 0x75, 0x72, 0x6f, 0x3b, 0x3b,
+0x65, 0x75, 0x72, 0x6f, 0x3b, 0x3b, 0x3b, 0x3b, 0x65, 0x75, 0x72, 0x6f, 0x41, 0x72, 0x75, 0x62, 0x61, 0x61, 0x6e, 0x73,
+0x65, 0x20, 0x67, 0x75, 0x6c, 0x64, 0x65, 0x6e, 0x3b, 0x3b, 0x41, 0x72, 0x75, 0x62, 0x61, 0x61, 0x6e, 0x73, 0x65, 0x20,
+0x67, 0x75, 0x6c, 0x64, 0x65, 0x6e, 0x3b, 0x3b, 0x3b, 0x3b, 0x41, 0x72, 0x75, 0x62, 0x61, 0x61, 0x6e, 0x73, 0x65, 0x20,
+0x67, 0x75, 0x6c, 0x64, 0x65, 0x6e, 0x4e, 0x65, 0x64, 0x65, 0x72, 0x6c, 0x61, 0x6e, 0x64, 0x73, 0x2d, 0x41, 0x6e, 0x74,
+0x69, 0x6c, 0x6c, 0x69, 0x61, 0x61, 0x6e, 0x73, 0x65, 0x20, 0x67, 0x75, 0x6c, 0x64, 0x65, 0x6e, 0x3b, 0x3b, 0x4e, 0x65,
+0x64, 0x65, 0x72, 0x6c, 0x61, 0x6e, 0x64, 0x73, 0x2d, 0x41, 0x6e, 0x74, 0x69, 0x6c, 0x6c, 0x69, 0x61, 0x61, 0x6e, 0x73,
+0x65, 0x20, 0x67, 0x75, 0x6c, 0x64, 0x65, 0x6e, 0x3b, 0x3b, 0x3b, 0x3b, 0x4e, 0x65, 0x64, 0x65, 0x72, 0x6c, 0x61, 0x6e,
+0x64, 0x73, 0x2d, 0x41, 0x6e, 0x74, 0x69, 0x6c, 0x6c, 0x69, 0x61, 0x61, 0x6e, 0x73, 0x65, 0x20, 0x67, 0x75, 0x6c, 0x64,
+0x65, 0x6e, 0x53, 0x75, 0x72, 0x69, 0x6e, 0x61, 0x61, 0x6d, 0x73, 0x65, 0x20, 0x64, 0x6f, 0x6c, 0x6c, 0x61, 0x72, 0x3b,
+0x3b, 0x53, 0x75, 0x72, 0x69, 0x6e, 0x61, 0x61, 0x6d, 0x73, 0x65, 0x20, 0x64, 0x6f, 0x6c, 0x6c, 0x61, 0x72, 0x3b, 0x3b,
+0x3b, 0x3b, 0x53, 0x75, 0x72, 0x69, 0x6e, 0x61, 0x61, 0x6d, 0x73, 0x65, 0x20, 0x64, 0x6f, 0x6c, 0x6c, 0x61, 0x72, 0x41,
+0x6d, 0x65, 0x72, 0x69, 0x6b, 0x61, 0x61, 0x6e, 0x73, 0x65, 0x20, 0x64, 0x6f, 0x6c, 0x6c, 0x61, 0x72, 0x3b, 0x3b, 0x41,
+0x6d, 0x65, 0x72, 0x69, 0x6b, 0x61, 0x61, 0x6e, 0x73, 0x65, 0x20, 0x64, 0x6f, 0x6c, 0x6c, 0x61, 0x72, 0x3b, 0x3b, 0x3b,
+0x3b, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x6b, 0x61, 0x61, 0x6e, 0x73, 0x65, 0x20, 0x64, 0x6f, 0x6c, 0x6c, 0x61, 0x72, 0x55,
+0x53, 0x20, 0x44, 0x6f, 0x6c, 0x6c, 0x61, 0x72, 0x3b, 0x3b, 0x55, 0x53, 0x20, 0x64, 0x6f, 0x6c, 0x6c, 0x61, 0x72, 0x3b,
+0x3b, 0x3b, 0x3b, 0x55, 0x53, 0x20, 0x64, 0x6f, 0x6c, 0x6c, 0x61, 0x72, 0x73, 0x45, 0x61, 0x73, 0x74, 0x20, 0x43, 0x61,
+0x72, 0x69, 0x62, 0x62, 0x65, 0x61, 0x6e, 0x20, 0x44, 0x6f, 0x6c, 0x6c, 0x61, 0x72, 0x3b, 0x3b, 0x45, 0x61, 0x73, 0x74,
+0x20, 0x43, 0x61, 0x72, 0x69, 0x62, 0x62, 0x65, 0x61, 0x6e, 0x20, 0x64, 0x6f, 0x6c, 0x6c, 0x61, 0x72, 0x3b, 0x3b, 0x3b,
+0x3b, 0x45, 0x61, 0x73, 0x74, 0x20, 0x43, 0x61, 0x72, 0x69, 0x62, 0x62, 0x65, 0x61, 0x6e, 0x20, 0x64, 0x6f, 0x6c, 0x6c,
+0x61, 0x72, 0x73, 0x41, 0x75, 0x73, 0x74, 0x72, 0x61, 0x6c, 0x69, 0x61, 0x6e, 0x20, 0x44, 0x6f, 0x6c, 0x6c, 0x61, 0x72,
+0x3b, 0x3b, 0x41, 0x75, 0x73, 0x74, 0x72, 0x61, 0x6c, 0x69, 0x61, 0x6e, 0x20, 0x64, 0x6f, 0x6c, 0x6c, 0x61, 0x72, 0x3b,
+0x3b, 0x3b, 0x3b, 0x41, 0x75, 0x73, 0x74, 0x72, 0x61, 0x6c, 0x69, 0x61, 0x6e, 0x20, 0x64, 0x6f, 0x6c, 0x6c, 0x61, 0x72,
+0x73, 0x45, 0x75, 0x72, 0x6f, 0x3b, 0x3b, 0x65, 0x75, 0x72, 0x6f, 0x3b, 0x3b, 0x3b, 0x3b, 0x65, 0x75, 0x72, 0x6f, 0x73,
+0x42, 0x61, 0x68, 0x61, 0x6d, 0x69, 0x61, 0x6e, 0x20, 0x44, 0x6f, 0x6c, 0x6c, 0x61, 0x72, 0x3b, 0x3b, 0x42, 0x61, 0x68,
+0x61, 0x6d, 0x69, 0x61, 0x6e, 0x20, 0x64, 0x6f, 0x6c, 0x6c, 0x61, 0x72, 0x3b, 0x3b, 0x3b, 0x3b, 0x42, 0x61, 0x68, 0x61,
+0x6d, 0x69, 0x61, 0x6e, 0x20, 0x64, 0x6f, 0x6c, 0x6c, 0x61, 0x72, 0x73, 0x42, 0x61, 0x72, 0x62, 0x61, 0x64, 0x69, 0x61,
+0x6e, 0x20, 0x44, 0x6f, 0x6c, 0x6c, 0x61, 0x72, 0x3b, 0x3b, 0x42, 0x61, 0x72, 0x62, 0x61, 0x64, 0x69, 0x61, 0x6e, 0x20,
+0x64, 0x6f, 0x6c, 0x6c, 0x61, 0x72, 0x3b, 0x3b, 0x3b, 0x3b, 0x42, 0x61, 0x72, 0x62, 0x61, 0x64, 0x69, 0x61, 0x6e, 0x20,
+0x64, 0x6f, 0x6c, 0x6c, 0x61, 0x72, 0x73, 0x42, 0x65, 0x6c, 0x69, 0x7a, 0x65, 0x20, 0x44, 0x6f, 0x6c, 0x6c, 0x61, 0x72,
+0x3b, 0x3b, 0x42, 0x65, 0x6c, 0x69, 0x7a, 0x65, 0x20, 0x64, 0x6f, 0x6c, 0x6c, 0x61, 0x72, 0x3b, 0x3b, 0x3b, 0x3b, 0x42,
+0x65, 0x6c, 0x69, 0x7a, 0x65, 0x20, 0x64, 0x6f, 0x6c, 0x6c, 0x61, 0x72, 0x73, 0x42, 0x65, 0x72, 0x6d, 0x75, 0x64, 0x61,
+0x6e, 0x20, 0x44, 0x6f, 0x6c, 0x6c, 0x61, 0x72, 0x3b, 0x3b, 0x42, 0x65, 0x72, 0x6d, 0x75, 0x64, 0x61, 0x6e, 0x20, 0x64,
+0x6f, 0x6c, 0x6c, 0x61, 0x72, 0x3b, 0x3b, 0x3b, 0x3b, 0x42, 0x65, 0x72, 0x6d, 0x75, 0x64, 0x61, 0x6e, 0x20, 0x64, 0x6f,
+0x6c, 0x6c, 0x61, 0x72, 0x73, 0x42, 0x6f, 0x74, 0x73, 0x77, 0x61, 0x6e, 0x61, 0x6e, 0x20, 0x50, 0x75, 0x6c, 0x61, 0x3b,
+0x3b, 0x42, 0x6f, 0x74, 0x73, 0x77, 0x61, 0x6e, 0x61, 0x6e, 0x20, 0x70, 0x75, 0x6c, 0x61, 0x3b, 0x3b, 0x3b, 0x3b, 0x42,
+0x6f, 0x74, 0x73, 0x77, 0x61, 0x6e, 0x61, 0x6e, 0x20, 0x70, 0x75, 0x6c, 0x61, 0x73, 0x42, 0x75, 0x72, 0x75, 0x6e, 0x64,
+0x69, 0x61, 0x6e, 0x20, 0x46, 0x72, 0x61, 0x6e, 0x63, 0x3b, 0x3b, 0x42, 0x75, 0x72, 0x75, 0x6e, 0x64, 0x69, 0x61, 0x6e,
+0x20, 0x66, 0x72, 0x61, 0x6e, 0x63, 0x3b, 0x3b, 0x3b, 0x3b, 0x42, 0x75, 0x72, 0x75, 0x6e, 0x64, 0x69, 0x61, 0x6e, 0x20,
+0x66, 0x72, 0x61, 0x6e, 0x63, 0x73, 0x43, 0x65, 0x6e, 0x74, 0x72, 0x61, 0x6c, 0x20, 0x41, 0x66, 0x72, 0x69, 0x63, 0x61,
+0x6e, 0x20, 0x43, 0x46, 0x41, 0x20, 0x46, 0x72, 0x61, 0x6e, 0x63, 0x3b, 0x3b, 0x43, 0x65, 0x6e, 0x74, 0x72, 0x61, 0x6c,
+0x20, 0x41, 0x66, 0x72, 0x69, 0x63, 0x61, 0x6e, 0x20, 0x43, 0x46, 0x41, 0x20, 0x66, 0x72, 0x61, 0x6e, 0x63, 0x3b, 0x3b,
+0x3b, 0x3b, 0x43, 0x65, 0x6e, 0x74, 0x72, 0x61, 0x6c, 0x20, 0x41, 0x66, 0x72, 0x69, 0x63, 0x61, 0x6e, 0x20, 0x43, 0x46,
+0x41, 0x20, 0x66, 0x72, 0x61, 0x6e, 0x63, 0x73, 0x43, 0x61, 0x6e, 0x61, 0x64, 0x69, 0x61, 0x6e, 0x20, 0x44, 0x6f, 0x6c,
+0x6c, 0x61, 0x72, 0x3b, 0x3b, 0x43, 0x61, 0x6e, 0x61, 0x64, 0x69, 0x61, 0x6e, 0x20, 0x64, 0x6f, 0x6c, 0x6c, 0x61, 0x72,
+0x3b, 0x3b, 0x3b, 0x3b, 0x43, 0x61, 0x6e, 0x61, 0x64, 0x69, 0x61, 0x6e, 0x20, 0x64, 0x6f, 0x6c, 0x6c, 0x61, 0x72, 0x73,
+0x43, 0x61, 0x79, 0x6d, 0x61, 0x6e, 0x20, 0x49, 0x73, 0x6c, 0x61, 0x6e, 0x64, 0x73, 0x20, 0x44, 0x6f, 0x6c, 0x6c, 0x61,
+0x72, 0x3b, 0x3b, 0x43, 0x61, 0x79, 0x6d, 0x61, 0x6e, 0x20, 0x49, 0x73, 0x6c, 0x61, 0x6e, 0x64, 0x73, 0x20, 0x64, 0x6f,
+0x6c, 0x6c, 0x61, 0x72, 0x3b, 0x3b, 0x3b, 0x3b, 0x43, 0x61, 0x79, 0x6d, 0x61, 0x6e, 0x20, 0x49, 0x73, 0x6c, 0x61, 0x6e,
+0x64, 0x73, 0x20, 0x64, 0x6f, 0x6c, 0x6c, 0x61, 0x72, 0x73, 0x4e, 0x65, 0x77, 0x20, 0x5a, 0x65, 0x61, 0x6c, 0x61, 0x6e,
+0x64, 0x20, 0x44, 0x6f, 0x6c, 0x6c, 0x61, 0x72, 0x3b, 0x3b, 0x4e, 0x65, 0x77, 0x20, 0x5a, 0x65, 0x61, 0x6c, 0x61, 0x6e,
+0x64, 0x20, 0x64, 0x6f, 0x6c, 0x6c, 0x61, 0x72, 0x3b, 0x3b, 0x3b, 0x3b, 0x4e, 0x65, 0x77, 0x20, 0x5a, 0x65, 0x61, 0x6c,
+0x61, 0x6e, 0x64, 0x20, 0x64, 0x6f, 0x6c, 0x6c, 0x61, 0x72, 0x73, 0x44, 0x61, 0x6e, 0x69, 0x73, 0x68, 0x20, 0x4b, 0x72,
 0x6f, 0x6e, 0x65, 0x3b, 0x3b, 0x44, 0x61, 0x6e, 0x69, 0x73, 0x68, 0x20, 0x6b, 0x72, 0x6f, 0x6e, 0x65, 0x3b, 0x3b, 0x3b,
-0x3b, 0x44, 0x61, 0x6e, 0x69, 0x73, 0x68, 0x20, 0x6b, 0x72, 0x6f, 0x6e, 0x65, 0x72, 0x3b, 0x45, 0x72, 0x69, 0x74, 0x72,
-0x65, 0x61, 0x6e, 0x20, 0x4e, 0x61, 0x6b, 0x66, 0x61, 0x3b, 0x3b, 0x45, 0x72, 0x69, 0x74, 0x72, 0x65, 0x61, 0x6e, 0x20,
-0x6e, 0x61, 0x6b, 0x66, 0x61, 0x3b, 0x3b, 0x3b, 0x3b, 0x45, 0x72, 0x69, 0x74, 0x72, 0x65, 0x61, 0x6e, 0x20, 0x6e, 0x61,
-0x6b, 0x66, 0x61, 0x73, 0x3b, 0x46, 0x61, 0x6c, 0x6b, 0x6c, 0x61, 0x6e, 0x64, 0x20, 0x49, 0x73, 0x6c, 0x61, 0x6e, 0x64,
-0x73, 0x20, 0x50, 0x6f, 0x75, 0x6e, 0x64, 0x3b, 0x3b, 0x46, 0x61, 0x6c, 0x6b, 0x6c, 0x61, 0x6e, 0x64, 0x20, 0x49, 0x73,
-0x6c, 0x61, 0x6e, 0x64, 0x73, 0x20, 0x70, 0x6f, 0x75, 0x6e, 0x64, 0x3b, 0x3b, 0x3b, 0x3b, 0x46, 0x61, 0x6c, 0x6b, 0x6c,
-0x61, 0x6e, 0x64, 0x20, 0x49, 0x73, 0x6c, 0x61, 0x6e, 0x64, 0x73, 0x20, 0x70, 0x6f, 0x75, 0x6e, 0x64, 0x73, 0x3b, 0x46,
-0x69, 0x6a, 0x69, 0x61, 0x6e, 0x20, 0x44, 0x6f, 0x6c, 0x6c, 0x61, 0x72, 0x3b, 0x3b, 0x46, 0x69, 0x6a, 0x69, 0x61, 0x6e,
-0x20, 0x64, 0x6f, 0x6c, 0x6c, 0x61, 0x72, 0x3b, 0x3b, 0x3b, 0x3b, 0x46, 0x69, 0x6a, 0x69, 0x61, 0x6e, 0x20, 0x64, 0x6f,
-0x6c, 0x6c, 0x61, 0x72, 0x73, 0x3b, 0x55, 0x4b, 0x20, 0x50, 0x6f, 0x75, 0x6e, 0x64, 0x3b, 0x3b, 0x55, 0x4b, 0x20, 0x70,
-0x6f, 0x75, 0x6e, 0x64, 0x3b, 0x3b, 0x3b, 0x3b, 0x55, 0x4b, 0x20, 0x70, 0x6f, 0x75, 0x6e, 0x64, 0x73, 0x3b, 0x47, 0x61,
-0x6d, 0x62, 0x69, 0x61, 0x6e, 0x20, 0x44, 0x61, 0x6c, 0x61, 0x73, 0x69, 0x3b, 0x3b, 0x47, 0x61, 0x6d, 0x62, 0x69, 0x61,
-0x6e, 0x20, 0x64, 0x61, 0x6c, 0x61, 0x73, 0x69, 0x3b, 0x3b, 0x3b, 0x3b, 0x47, 0x61, 0x6d, 0x62, 0x69, 0x61, 0x6e, 0x20,
-0x64, 0x61, 0x6c, 0x61, 0x73, 0x69, 0x73, 0x3b, 0x47, 0x68, 0x61, 0x6e, 0x61, 0x69, 0x61, 0x6e, 0x20, 0x43, 0x65, 0x64,
-0x69, 0x3b, 0x3b, 0x47, 0x68, 0x61, 0x6e, 0x61, 0x69, 0x61, 0x6e, 0x20, 0x63, 0x65, 0x64, 0x69, 0x3b, 0x3b, 0x3b, 0x3b,
-0x47, 0x68, 0x61, 0x6e, 0x61, 0x69, 0x61, 0x6e, 0x20, 0x63, 0x65, 0x64, 0x69, 0x73, 0x3b, 0x47, 0x69, 0x62, 0x72, 0x61,
-0x6c, 0x74, 0x61, 0x72, 0x20, 0x50, 0x6f, 0x75, 0x6e, 0x64, 0x3b, 0x3b, 0x47, 0x69, 0x62, 0x72, 0x61, 0x6c, 0x74, 0x61,
-0x72, 0x20, 0x70, 0x6f, 0x75, 0x6e, 0x64, 0x3b, 0x3b, 0x3b, 0x3b, 0x47, 0x69, 0x62, 0x72, 0x61, 0x6c, 0x74, 0x61, 0x72,
-0x20, 0x70, 0x6f, 0x75, 0x6e, 0x64, 0x73, 0x3b, 0x47, 0x75, 0x79, 0x61, 0x6e, 0x61, 0x65, 0x73, 0x65, 0x20, 0x44, 0x6f,
-0x6c, 0x6c, 0x61, 0x72, 0x3b, 0x3b, 0x47, 0x75, 0x79, 0x61, 0x6e, 0x61, 0x65, 0x73, 0x65, 0x20, 0x64, 0x6f, 0x6c, 0x6c,
-0x61, 0x72, 0x3b, 0x3b, 0x3b, 0x3b, 0x47, 0x75, 0x79, 0x61, 0x6e, 0x61, 0x65, 0x73, 0x65, 0x20, 0x64, 0x6f, 0x6c, 0x6c,
-0x61, 0x72, 0x73, 0x3b, 0x48, 0x6f, 0x6e, 0x67, 0x20, 0x4b, 0x6f, 0x6e, 0x67, 0x20, 0x44, 0x6f, 0x6c, 0x6c, 0x61, 0x72,
-0x3b, 0x3b, 0x48, 0x6f, 0x6e, 0x67, 0x20, 0x4b, 0x6f, 0x6e, 0x67, 0x20, 0x64, 0x6f, 0x6c, 0x6c, 0x61, 0x72, 0x3b, 0x3b,
-0x3b, 0x3b, 0x48, 0x6f, 0x6e, 0x67, 0x20, 0x4b, 0x6f, 0x6e, 0x67, 0x20, 0x64, 0x6f, 0x6c, 0x6c, 0x61, 0x72, 0x73, 0x3b,
-0x49, 0x6e, 0x64, 0x69, 0x61, 0x6e, 0x20, 0x52, 0x75, 0x70, 0x65, 0x65, 0x3b, 0x3b, 0x49, 0x6e, 0x64, 0x69, 0x61, 0x6e,
-0x20, 0x72, 0x75, 0x70, 0x65, 0x65, 0x3b, 0x3b, 0x3b, 0x3b, 0x49, 0x6e, 0x64, 0x69, 0x61, 0x6e, 0x20, 0x72, 0x75, 0x70,
-0x65, 0x65, 0x73, 0x3b, 0x49, 0x73, 0x72, 0x61, 0x65, 0x6c, 0x69, 0x20, 0x4e, 0x65, 0x77, 0x20, 0x53, 0x68, 0x65, 0x6b,
-0x65, 0x6c, 0x3b, 0x3b, 0x49, 0x73, 0x72, 0x61, 0x65, 0x6c, 0x69, 0x20, 0x6e, 0x65, 0x77, 0x20, 0x73, 0x68, 0x65, 0x6b,
-0x65, 0x6c, 0x3b, 0x3b, 0x3b, 0x3b, 0x49, 0x73, 0x72, 0x61, 0x65, 0x6c, 0x69, 0x20, 0x6e, 0x65, 0x77, 0x20, 0x73, 0x68,
-0x65, 0x6b, 0x65, 0x6c, 0x73, 0x3b, 0x4a, 0x61, 0x6d, 0x61, 0x69, 0x63, 0x61, 0x6e, 0x20, 0x44, 0x6f, 0x6c, 0x6c, 0x61,
-0x72, 0x3b, 0x3b, 0x4a, 0x61, 0x6d, 0x61, 0x69, 0x63, 0x61, 0x6e, 0x20, 0x64, 0x6f, 0x6c, 0x6c, 0x61, 0x72, 0x3b, 0x3b,
-0x3b, 0x3b, 0x4a, 0x61, 0x6d, 0x61, 0x69, 0x63, 0x61, 0x6e, 0x20, 0x64, 0x6f, 0x6c, 0x6c, 0x61, 0x72, 0x73, 0x3b, 0x4b,
-0x65, 0x6e, 0x79, 0x61, 0x6e, 0x20, 0x53, 0x68, 0x69, 0x6c, 0x6c, 0x69, 0x6e, 0x67, 0x3b, 0x3b, 0x4b, 0x65, 0x6e, 0x79,
-0x61, 0x6e, 0x20, 0x73, 0x68, 0x69, 0x6c, 0x6c, 0x69, 0x6e, 0x67, 0x3b, 0x3b, 0x3b, 0x3b, 0x4b, 0x65, 0x6e, 0x79, 0x61,
-0x6e, 0x20, 0x73, 0x68, 0x69, 0x6c, 0x6c, 0x69, 0x6e, 0x67, 0x73, 0x3b, 0x53, 0x6f, 0x75, 0x74, 0x68, 0x20, 0x41, 0x66,
-0x72, 0x69, 0x63, 0x61, 0x6e, 0x20, 0x52, 0x61, 0x6e, 0x64, 0x3b, 0x3b, 0x53, 0x6f, 0x75, 0x74, 0x68, 0x20, 0x41, 0x66,
-0x72, 0x69, 0x63, 0x61, 0x6e, 0x20, 0x72, 0x61, 0x6e, 0x64, 0x3b, 0x3b, 0x3b, 0x3b, 0x53, 0x6f, 0x75, 0x74, 0x68, 0x20,
-0x41, 0x66, 0x72, 0x69, 0x63, 0x61, 0x6e, 0x20, 0x72, 0x61, 0x6e, 0x64, 0x3b, 0x4c, 0x69, 0x62, 0x65, 0x72, 0x69, 0x61,
-0x6e, 0x20, 0x44, 0x6f, 0x6c, 0x6c, 0x61, 0x72, 0x3b, 0x3b, 0x4c, 0x69, 0x62, 0x65, 0x72, 0x69, 0x61, 0x6e, 0x20, 0x64,
-0x6f, 0x6c, 0x6c, 0x61, 0x72, 0x3b, 0x3b, 0x3b, 0x3b, 0x4c, 0x69, 0x62, 0x65, 0x72, 0x69, 0x61, 0x6e, 0x20, 0x64, 0x6f,
-0x6c, 0x6c, 0x61, 0x72, 0x73, 0x3b, 0x4d, 0x61, 0x63, 0x61, 0x6e, 0x65, 0x73, 0x65, 0x20, 0x50, 0x61, 0x74, 0x61, 0x63,
-0x61, 0x3b, 0x3b, 0x4d, 0x61, 0x63, 0x61, 0x6e, 0x65, 0x73, 0x65, 0x20, 0x70, 0x61, 0x74, 0x61, 0x63, 0x61, 0x3b, 0x3b,
-0x3b, 0x3b, 0x4d, 0x61, 0x63, 0x61, 0x6e, 0x65, 0x73, 0x65, 0x20, 0x70, 0x61, 0x74, 0x61, 0x63, 0x61, 0x73, 0x3b, 0x4d,
-0x61, 0x6c, 0x61, 0x67, 0x61, 0x73, 0x79, 0x20, 0x41, 0x72, 0x69, 0x61, 0x72, 0x79, 0x3b, 0x3b, 0x4d, 0x61, 0x6c, 0x61,
-0x67, 0x61, 0x73, 0x79, 0x20, 0x61, 0x72, 0x69, 0x61, 0x72, 0x79, 0x3b, 0x3b, 0x3b, 0x3b, 0x4d, 0x61, 0x6c, 0x61, 0x67,
-0x61, 0x73, 0x79, 0x20, 0x61, 0x72, 0x69, 0x61, 0x72, 0x69, 0x65, 0x73, 0x3b, 0x4d, 0x61, 0x6c, 0x61, 0x77, 0x69, 0x61,
-0x6e, 0x20, 0x4b, 0x77, 0x61, 0x63, 0x68, 0x61, 0x3b, 0x3b, 0x4d, 0x61, 0x6c, 0x61, 0x77, 0x69, 0x61, 0x6e, 0x20, 0x6b,
-0x77, 0x61, 0x63, 0x68, 0x61, 0x3b, 0x3b, 0x3b, 0x3b, 0x4d, 0x61, 0x6c, 0x61, 0x77, 0x69, 0x61, 0x6e, 0x20, 0x6b, 0x77,
-0x61, 0x63, 0x68, 0x61, 0x73, 0x3b, 0x4d, 0x61, 0x6c, 0x61, 0x79, 0x73, 0x69, 0x61, 0x6e, 0x20, 0x52, 0x69, 0x6e, 0x67,
-0x67, 0x69, 0x74, 0x3b, 0x3b, 0x4d, 0x61, 0x6c, 0x61, 0x79, 0x73, 0x69, 0x61, 0x6e, 0x20, 0x72, 0x69, 0x6e, 0x67, 0x67,
-0x69, 0x74, 0x3b, 0x3b, 0x3b, 0x3b, 0x4d, 0x61, 0x6c, 0x61, 0x79, 0x73, 0x69, 0x61, 0x6e, 0x20, 0x72, 0x69, 0x6e, 0x67,
-0x67, 0x69, 0x74, 0x73, 0x3b, 0x4d, 0x61, 0x75, 0x72, 0x69, 0x74, 0x69, 0x61, 0x6e, 0x20, 0x52, 0x75, 0x70, 0x65, 0x65,
+0x3b, 0x44, 0x61, 0x6e, 0x69, 0x73, 0x68, 0x20, 0x6b, 0x72, 0x6f, 0x6e, 0x65, 0x72, 0x45, 0x72, 0x69, 0x74, 0x72, 0x65,
+0x61, 0x6e, 0x20, 0x4e, 0x61, 0x6b, 0x66, 0x61, 0x3b, 0x3b, 0x45, 0x72, 0x69, 0x74, 0x72, 0x65, 0x61, 0x6e, 0x20, 0x6e,
+0x61, 0x6b, 0x66, 0x61, 0x3b, 0x3b, 0x3b, 0x3b, 0x45, 0x72, 0x69, 0x74, 0x72, 0x65, 0x61, 0x6e, 0x20, 0x6e, 0x61, 0x6b,
+0x66, 0x61, 0x73, 0x46, 0x61, 0x6c, 0x6b, 0x6c, 0x61, 0x6e, 0x64, 0x20, 0x49, 0x73, 0x6c, 0x61, 0x6e, 0x64, 0x73, 0x20,
+0x50, 0x6f, 0x75, 0x6e, 0x64, 0x3b, 0x3b, 0x46, 0x61, 0x6c, 0x6b, 0x6c, 0x61, 0x6e, 0x64, 0x20, 0x49, 0x73, 0x6c, 0x61,
+0x6e, 0x64, 0x73, 0x20, 0x70, 0x6f, 0x75, 0x6e, 0x64, 0x3b, 0x3b, 0x3b, 0x3b, 0x46, 0x61, 0x6c, 0x6b, 0x6c, 0x61, 0x6e,
+0x64, 0x20, 0x49, 0x73, 0x6c, 0x61, 0x6e, 0x64, 0x73, 0x20, 0x70, 0x6f, 0x75, 0x6e, 0x64, 0x73, 0x46, 0x69, 0x6a, 0x69,
+0x61, 0x6e, 0x20, 0x44, 0x6f, 0x6c, 0x6c, 0x61, 0x72, 0x3b, 0x3b, 0x46, 0x69, 0x6a, 0x69, 0x61, 0x6e, 0x20, 0x64, 0x6f,
+0x6c, 0x6c, 0x61, 0x72, 0x3b, 0x3b, 0x3b, 0x3b, 0x46, 0x69, 0x6a, 0x69, 0x61, 0x6e, 0x20, 0x64, 0x6f, 0x6c, 0x6c, 0x61,
+0x72, 0x73, 0x55, 0x4b, 0x20, 0x50, 0x6f, 0x75, 0x6e, 0x64, 0x3b, 0x3b, 0x55, 0x4b, 0x20, 0x70, 0x6f, 0x75, 0x6e, 0x64,
+0x3b, 0x3b, 0x3b, 0x3b, 0x55, 0x4b, 0x20, 0x70, 0x6f, 0x75, 0x6e, 0x64, 0x73, 0x47, 0x61, 0x6d, 0x62, 0x69, 0x61, 0x6e,
+0x20, 0x44, 0x61, 0x6c, 0x61, 0x73, 0x69, 0x3b, 0x3b, 0x47, 0x61, 0x6d, 0x62, 0x69, 0x61, 0x6e, 0x20, 0x64, 0x61, 0x6c,
+0x61, 0x73, 0x69, 0x3b, 0x3b, 0x3b, 0x3b, 0x47, 0x61, 0x6d, 0x62, 0x69, 0x61, 0x6e, 0x20, 0x64, 0x61, 0x6c, 0x61, 0x73,
+0x69, 0x73, 0x47, 0x68, 0x61, 0x6e, 0x61, 0x69, 0x61, 0x6e, 0x20, 0x43, 0x65, 0x64, 0x69, 0x3b, 0x3b, 0x47, 0x68, 0x61,
+0x6e, 0x61, 0x69, 0x61, 0x6e, 0x20, 0x63, 0x65, 0x64, 0x69, 0x3b, 0x3b, 0x3b, 0x3b, 0x47, 0x68, 0x61, 0x6e, 0x61, 0x69,
+0x61, 0x6e, 0x20, 0x63, 0x65, 0x64, 0x69, 0x73, 0x47, 0x69, 0x62, 0x72, 0x61, 0x6c, 0x74, 0x61, 0x72, 0x20, 0x50, 0x6f,
+0x75, 0x6e, 0x64, 0x3b, 0x3b, 0x47, 0x69, 0x62, 0x72, 0x61, 0x6c, 0x74, 0x61, 0x72, 0x20, 0x70, 0x6f, 0x75, 0x6e, 0x64,
+0x3b, 0x3b, 0x3b, 0x3b, 0x47, 0x69, 0x62, 0x72, 0x61, 0x6c, 0x74, 0x61, 0x72, 0x20, 0x70, 0x6f, 0x75, 0x6e, 0x64, 0x73,
+0x47, 0x75, 0x79, 0x61, 0x6e, 0x61, 0x65, 0x73, 0x65, 0x20, 0x44, 0x6f, 0x6c, 0x6c, 0x61, 0x72, 0x3b, 0x3b, 0x47, 0x75,
+0x79, 0x61, 0x6e, 0x61, 0x65, 0x73, 0x65, 0x20, 0x64, 0x6f, 0x6c, 0x6c, 0x61, 0x72, 0x3b, 0x3b, 0x3b, 0x3b, 0x47, 0x75,
+0x79, 0x61, 0x6e, 0x61, 0x65, 0x73, 0x65, 0x20, 0x64, 0x6f, 0x6c, 0x6c, 0x61, 0x72, 0x73, 0x48, 0x6f, 0x6e, 0x67, 0x20,
+0x4b, 0x6f, 0x6e, 0x67, 0x20, 0x44, 0x6f, 0x6c, 0x6c, 0x61, 0x72, 0x3b, 0x3b, 0x48, 0x6f, 0x6e, 0x67, 0x20, 0x4b, 0x6f,
+0x6e, 0x67, 0x20, 0x64, 0x6f, 0x6c, 0x6c, 0x61, 0x72, 0x3b, 0x3b, 0x3b, 0x3b, 0x48, 0x6f, 0x6e, 0x67, 0x20, 0x4b, 0x6f,
+0x6e, 0x67, 0x20, 0x64, 0x6f, 0x6c, 0x6c, 0x61, 0x72, 0x73, 0x49, 0x6e, 0x64, 0x69, 0x61, 0x6e, 0x20, 0x52, 0x75, 0x70,
+0x65, 0x65, 0x3b, 0x3b, 0x49, 0x6e, 0x64, 0x69, 0x61, 0x6e, 0x20, 0x72, 0x75, 0x70, 0x65, 0x65, 0x3b, 0x3b, 0x3b, 0x3b,
+0x49, 0x6e, 0x64, 0x69, 0x61, 0x6e, 0x20, 0x72, 0x75, 0x70, 0x65, 0x65, 0x73, 0x49, 0x73, 0x72, 0x61, 0x65, 0x6c, 0x69,
+0x20, 0x4e, 0x65, 0x77, 0x20, 0x53, 0x68, 0x65, 0x6b, 0x65, 0x6c, 0x3b, 0x3b, 0x49, 0x73, 0x72, 0x61, 0x65, 0x6c, 0x69,
+0x20, 0x6e, 0x65, 0x77, 0x20, 0x73, 0x68, 0x65, 0x6b, 0x65, 0x6c, 0x3b, 0x3b, 0x3b, 0x3b, 0x49, 0x73, 0x72, 0x61, 0x65,
+0x6c, 0x69, 0x20, 0x6e, 0x65, 0x77, 0x20, 0x73, 0x68, 0x65, 0x6b, 0x65, 0x6c, 0x73, 0x4a, 0x61, 0x6d, 0x61, 0x69, 0x63,
+0x61, 0x6e, 0x20, 0x44, 0x6f, 0x6c, 0x6c, 0x61, 0x72, 0x3b, 0x3b, 0x4a, 0x61, 0x6d, 0x61, 0x69, 0x63, 0x61, 0x6e, 0x20,
+0x64, 0x6f, 0x6c, 0x6c, 0x61, 0x72, 0x3b, 0x3b, 0x3b, 0x3b, 0x4a, 0x61, 0x6d, 0x61, 0x69, 0x63, 0x61, 0x6e, 0x20, 0x64,
+0x6f, 0x6c, 0x6c, 0x61, 0x72, 0x73, 0x4b, 0x65, 0x6e, 0x79, 0x61, 0x6e, 0x20, 0x53, 0x68, 0x69, 0x6c, 0x6c, 0x69, 0x6e,
+0x67, 0x3b, 0x3b, 0x4b, 0x65, 0x6e, 0x79, 0x61, 0x6e, 0x20, 0x73, 0x68, 0x69, 0x6c, 0x6c, 0x69, 0x6e, 0x67, 0x3b, 0x3b,
+0x3b, 0x3b, 0x4b, 0x65, 0x6e, 0x79, 0x61, 0x6e, 0x20, 0x73, 0x68, 0x69, 0x6c, 0x6c, 0x69, 0x6e, 0x67, 0x73, 0x53, 0x6f,
+0x75, 0x74, 0x68, 0x20, 0x41, 0x66, 0x72, 0x69, 0x63, 0x61, 0x6e, 0x20, 0x52, 0x61, 0x6e, 0x64, 0x3b, 0x3b, 0x53, 0x6f,
+0x75, 0x74, 0x68, 0x20, 0x41, 0x66, 0x72, 0x69, 0x63, 0x61, 0x6e, 0x20, 0x72, 0x61, 0x6e, 0x64, 0x3b, 0x3b, 0x3b, 0x3b,
+0x53, 0x6f, 0x75, 0x74, 0x68, 0x20, 0x41, 0x66, 0x72, 0x69, 0x63, 0x61, 0x6e, 0x20, 0x72, 0x61, 0x6e, 0x64, 0x4c, 0x69,
+0x62, 0x65, 0x72, 0x69, 0x61, 0x6e, 0x20, 0x44, 0x6f, 0x6c, 0x6c, 0x61, 0x72, 0x3b, 0x3b, 0x4c, 0x69, 0x62, 0x65, 0x72,
+0x69, 0x61, 0x6e, 0x20, 0x64, 0x6f, 0x6c, 0x6c, 0x61, 0x72, 0x3b, 0x3b, 0x3b, 0x3b, 0x4c, 0x69, 0x62, 0x65, 0x72, 0x69,
+0x61, 0x6e, 0x20, 0x64, 0x6f, 0x6c, 0x6c, 0x61, 0x72, 0x73, 0x4d, 0x61, 0x63, 0x61, 0x6e, 0x65, 0x73, 0x65, 0x20, 0x50,
+0x61, 0x74, 0x61, 0x63, 0x61, 0x3b, 0x3b, 0x4d, 0x61, 0x63, 0x61, 0x6e, 0x65, 0x73, 0x65, 0x20, 0x70, 0x61, 0x74, 0x61,
+0x63, 0x61, 0x3b, 0x3b, 0x3b, 0x3b, 0x4d, 0x61, 0x63, 0x61, 0x6e, 0x65, 0x73, 0x65, 0x20, 0x70, 0x61, 0x74, 0x61, 0x63,
+0x61, 0x73, 0x4d, 0x61, 0x6c, 0x61, 0x67, 0x61, 0x73, 0x79, 0x20, 0x41, 0x72, 0x69, 0x61, 0x72, 0x79, 0x3b, 0x3b, 0x4d,
+0x61, 0x6c, 0x61, 0x67, 0x61, 0x73, 0x79, 0x20, 0x61, 0x72, 0x69, 0x61, 0x72, 0x79, 0x3b, 0x3b, 0x3b, 0x3b, 0x4d, 0x61,
+0x6c, 0x61, 0x67, 0x61, 0x73, 0x79, 0x20, 0x61, 0x72, 0x69, 0x61, 0x72, 0x69, 0x65, 0x73, 0x4d, 0x61, 0x6c, 0x61, 0x77,
+0x69, 0x61, 0x6e, 0x20, 0x4b, 0x77, 0x61, 0x63, 0x68, 0x61, 0x3b, 0x3b, 0x4d, 0x61, 0x6c, 0x61, 0x77, 0x69, 0x61, 0x6e,
+0x20, 0x6b, 0x77, 0x61, 0x63, 0x68, 0x61, 0x3b, 0x3b, 0x3b, 0x3b, 0x4d, 0x61, 0x6c, 0x61, 0x77, 0x69, 0x61, 0x6e, 0x20,
+0x6b, 0x77, 0x61, 0x63, 0x68, 0x61, 0x73, 0x4d, 0x61, 0x6c, 0x61, 0x79, 0x73, 0x69, 0x61, 0x6e, 0x20, 0x52, 0x69, 0x6e,
+0x67, 0x67, 0x69, 0x74, 0x3b, 0x3b, 0x4d, 0x61, 0x6c, 0x61, 0x79, 0x73, 0x69, 0x61, 0x6e, 0x20, 0x72, 0x69, 0x6e, 0x67,
+0x67, 0x69, 0x74, 0x3b, 0x3b, 0x3b, 0x3b, 0x4d, 0x61, 0x6c, 0x61, 0x79, 0x73, 0x69, 0x61, 0x6e, 0x20, 0x72, 0x69, 0x6e,
+0x67, 0x67, 0x69, 0x74, 0x73, 0x4d, 0x61, 0x75, 0x72, 0x69, 0x74, 0x69, 0x61, 0x6e, 0x20, 0x52, 0x75, 0x70, 0x65, 0x65,
 0x3b, 0x3b, 0x4d, 0x61, 0x75, 0x72, 0x69, 0x74, 0x69, 0x61, 0x6e, 0x20, 0x72, 0x75, 0x70, 0x65, 0x65, 0x3b, 0x3b, 0x3b,
-0x3b, 0x4d, 0x61, 0x75, 0x72, 0x69, 0x74, 0x69, 0x61, 0x6e, 0x20, 0x72, 0x75, 0x70, 0x65, 0x65, 0x73, 0x3b, 0x4e, 0x61,
-0x6d, 0x69, 0x62, 0x69, 0x61, 0x6e, 0x20, 0x44, 0x6f, 0x6c, 0x6c, 0x61, 0x72, 0x3b, 0x3b, 0x4e, 0x61, 0x6d, 0x69, 0x62,
-0x69, 0x61, 0x6e, 0x20, 0x64, 0x6f, 0x6c, 0x6c, 0x61, 0x72, 0x3b, 0x3b, 0x3b, 0x3b, 0x4e, 0x61, 0x6d, 0x69, 0x62, 0x69,
-0x61, 0x6e, 0x20, 0x64, 0x6f, 0x6c, 0x6c, 0x61, 0x72, 0x73, 0x3b, 0x4e, 0x69, 0x67, 0x65, 0x72, 0x69, 0x61, 0x6e, 0x20,
-0x4e, 0x61, 0x69, 0x72, 0x61, 0x3b, 0x3b, 0x4e, 0x69, 0x67, 0x65, 0x72, 0x69, 0x61, 0x6e, 0x20, 0x6e, 0x61, 0x69, 0x72,
-0x61, 0x3b, 0x3b, 0x3b, 0x3b, 0x4e, 0x69, 0x67, 0x65, 0x72, 0x69, 0x61, 0x6e, 0x20, 0x6e, 0x61, 0x69, 0x72, 0x61, 0x73,
-0x3b, 0x50, 0x61, 0x6b, 0x69, 0x73, 0x74, 0x61, 0x6e, 0x69, 0x20, 0x52, 0x75, 0x70, 0x65, 0x65, 0x3b, 0x3b, 0x50, 0x61,
-0x6b, 0x69, 0x73, 0x74, 0x61, 0x6e, 0x69, 0x20, 0x72, 0x75, 0x70, 0x65, 0x65, 0x3b, 0x3b, 0x3b, 0x3b, 0x50, 0x61, 0x6b,
-0x69, 0x73, 0x74, 0x61, 0x6e, 0x69, 0x20, 0x72, 0x75, 0x70, 0x65, 0x65, 0x73, 0x3b, 0x50, 0x61, 0x70, 0x75, 0x61, 0x20,
-0x4e, 0x65, 0x77, 0x20, 0x47, 0x75, 0x69, 0x6e, 0x65, 0x61, 0x6e, 0x20, 0x4b, 0x69, 0x6e, 0x61, 0x3b, 0x3b, 0x50, 0x61,
-0x70, 0x75, 0x61, 0x20, 0x4e, 0x65, 0x77, 0x20, 0x47, 0x75, 0x69, 0x6e, 0x65, 0x61, 0x6e, 0x20, 0x6b, 0x69, 0x6e, 0x61,
-0x3b, 0x3b, 0x3b, 0x3b, 0x50, 0x61, 0x70, 0x75, 0x61, 0x20, 0x4e, 0x65, 0x77, 0x20, 0x47, 0x75, 0x69, 0x6e, 0x65, 0x61,
-0x6e, 0x20, 0x6b, 0x69, 0x6e, 0x61, 0x3b, 0x50, 0x68, 0x69, 0x6c, 0x69, 0x70, 0x70, 0x69, 0x6e, 0x65, 0x20, 0x50, 0x69,
-0x73, 0x6f, 0x3b, 0x3b, 0x50, 0x68, 0x69, 0x6c, 0x69, 0x70, 0x70, 0x69, 0x6e, 0x65, 0x20, 0x70, 0x69, 0x73, 0x6f, 0x3b,
-0x3b, 0x3b, 0x3b, 0x50, 0x68, 0x69, 0x6c, 0x69, 0x70, 0x70, 0x69, 0x6e, 0x65, 0x20, 0x70, 0x69, 0x73, 0x6f, 0x73, 0x3b,
-0x52, 0x77, 0x61, 0x6e, 0x64, 0x61, 0x6e, 0x20, 0x46, 0x72, 0x61, 0x6e, 0x63, 0x3b, 0x3b, 0x52, 0x77, 0x61, 0x6e, 0x64,
-0x61, 0x6e, 0x20, 0x66, 0x72, 0x61, 0x6e, 0x63, 0x3b, 0x3b, 0x3b, 0x3b, 0x52, 0x77, 0x61, 0x6e, 0x64, 0x61, 0x6e, 0x20,
-0x66, 0x72, 0x61, 0x6e, 0x63, 0x73, 0x3b, 0x53, 0x61, 0x6d, 0x6f, 0x61, 0x6e, 0x20, 0x54, 0x61, 0x6c, 0x61, 0x3b, 0x3b,
-0x53, 0x61, 0x6d, 0x6f, 0x61, 0x6e, 0x20, 0x74, 0x61, 0x6c, 0x61, 0x3b, 0x3b, 0x3b, 0x3b, 0x53, 0x61, 0x6d, 0x6f, 0x61,
-0x6e, 0x20, 0x74, 0x61, 0x6c, 0x61, 0x3b, 0x53, 0x65, 0x79, 0x63, 0x68, 0x65, 0x6c, 0x6c, 0x6f, 0x69, 0x73, 0x20, 0x52,
-0x75, 0x70, 0x65, 0x65, 0x3b, 0x3b, 0x53, 0x65, 0x79, 0x63, 0x68, 0x65, 0x6c, 0x6c, 0x6f, 0x69, 0x73, 0x20, 0x72, 0x75,
-0x70, 0x65, 0x65, 0x3b, 0x3b, 0x3b, 0x3b, 0x53, 0x65, 0x79, 0x63, 0x68, 0x65, 0x6c, 0x6c, 0x6f, 0x69, 0x73, 0x20, 0x72,
-0x75, 0x70, 0x65, 0x65, 0x73, 0x3b, 0x53, 0x69, 0x65, 0x72, 0x72, 0x61, 0x20, 0x4c, 0x65, 0x6f, 0x6e, 0x65, 0x61, 0x6e,
-0x20, 0x4c, 0x65, 0x6f, 0x6e, 0x65, 0x3b, 0x3b, 0x53, 0x69, 0x65, 0x72, 0x72, 0x61, 0x20, 0x4c, 0x65, 0x6f, 0x6e, 0x65,
-0x61, 0x6e, 0x20, 0x6c, 0x65, 0x6f, 0x6e, 0x65, 0x3b, 0x3b, 0x3b, 0x3b, 0x53, 0x69, 0x65, 0x72, 0x72, 0x61, 0x20, 0x4c,
-0x65, 0x6f, 0x6e, 0x65, 0x61, 0x6e, 0x20, 0x6c, 0x65, 0x6f, 0x6e, 0x65, 0x73, 0x3b, 0x53, 0x69, 0x6e, 0x67, 0x61, 0x70,
-0x6f, 0x72, 0x65, 0x20, 0x44, 0x6f, 0x6c, 0x6c, 0x61, 0x72, 0x3b, 0x3b, 0x53, 0x69, 0x6e, 0x67, 0x61, 0x70, 0x6f, 0x72,
-0x65, 0x20, 0x64, 0x6f, 0x6c, 0x6c, 0x61, 0x72, 0x3b, 0x3b, 0x3b, 0x3b, 0x53, 0x69, 0x6e, 0x67, 0x61, 0x70, 0x6f, 0x72,
-0x65, 0x20, 0x64, 0x6f, 0x6c, 0x6c, 0x61, 0x72, 0x73, 0x3b, 0x53, 0x6f, 0x6c, 0x6f, 0x6d, 0x6f, 0x6e, 0x20, 0x49, 0x73,
-0x6c, 0x61, 0x6e, 0x64, 0x73, 0x20, 0x44, 0x6f, 0x6c, 0x6c, 0x61, 0x72, 0x3b, 0x3b, 0x53, 0x6f, 0x6c, 0x6f, 0x6d, 0x6f,
-0x6e, 0x20, 0x49, 0x73, 0x6c, 0x61, 0x6e, 0x64, 0x73, 0x20, 0x64, 0x6f, 0x6c, 0x6c, 0x61, 0x72, 0x3b, 0x3b, 0x3b, 0x3b,
-0x53, 0x6f, 0x6c, 0x6f, 0x6d, 0x6f, 0x6e, 0x20, 0x49, 0x73, 0x6c, 0x61, 0x6e, 0x64, 0x73, 0x20, 0x64, 0x6f, 0x6c, 0x6c,
-0x61, 0x72, 0x73, 0x3b, 0x53, 0x74, 0x20, 0x48, 0x65, 0x6c, 0x65, 0x6e, 0x61, 0x20, 0x50, 0x6f, 0x75, 0x6e, 0x64, 0x3b,
-0x3b, 0x53, 0x74, 0x20, 0x48, 0x65, 0x6c, 0x65, 0x6e, 0x61, 0x20, 0x70, 0x6f, 0x75, 0x6e, 0x64, 0x3b, 0x3b, 0x3b, 0x3b,
-0x53, 0x74, 0x20, 0x48, 0x65, 0x6c, 0x65, 0x6e, 0x61, 0x20, 0x70, 0x6f, 0x75, 0x6e, 0x64, 0x73, 0x3b, 0x53, 0x75, 0x64,
-0x61, 0x6e, 0x65, 0x73, 0x65, 0x20, 0x50, 0x6f, 0x75, 0x6e, 0x64, 0x3b, 0x3b, 0x53, 0x75, 0x64, 0x61, 0x6e, 0x65, 0x73,
-0x65, 0x20, 0x70, 0x6f, 0x75, 0x6e, 0x64, 0x3b, 0x3b, 0x3b, 0x3b, 0x53, 0x75, 0x64, 0x61, 0x6e, 0x65, 0x73, 0x65, 0x20,
-0x70, 0x6f, 0x75, 0x6e, 0x64, 0x73, 0x3b, 0x53, 0x77, 0x61, 0x7a, 0x69, 0x20, 0x4c, 0x69, 0x6c, 0x61, 0x6e, 0x67, 0x65,
-0x6e, 0x69, 0x3b, 0x3b, 0x53, 0x77, 0x61, 0x7a, 0x69, 0x20, 0x6c, 0x69, 0x6c, 0x61, 0x6e, 0x67, 0x65, 0x6e, 0x69, 0x3b,
-0x3b, 0x3b, 0x3b, 0x53, 0x77, 0x61, 0x7a, 0x69, 0x20, 0x65, 0x6d, 0x61, 0x6c, 0x61, 0x6e, 0x67, 0x65, 0x6e, 0x69, 0x3b,
-0x53, 0x77, 0x65, 0x64, 0x69, 0x73, 0x68, 0x20, 0x4b, 0x72, 0x6f, 0x6e, 0x61, 0x3b, 0x3b, 0x53, 0x77, 0x65, 0x64, 0x69,
-0x73, 0x68, 0x20, 0x6b, 0x72, 0x6f, 0x6e, 0x61, 0x3b, 0x3b, 0x3b, 0x3b, 0x53, 0x77, 0x65, 0x64, 0x69, 0x73, 0x68, 0x20,
-0x6b, 0x72, 0x6f, 0x6e, 0x6f, 0x72, 0x3b, 0x53, 0x77, 0x69, 0x73, 0x73, 0x20, 0x46, 0x72, 0x61, 0x6e, 0x63, 0x3b, 0x3b,
-0x53, 0x77, 0x69, 0x73, 0x73, 0x20, 0x66, 0x72, 0x61, 0x6e, 0x63, 0x3b, 0x3b, 0x3b, 0x3b, 0x53, 0x77, 0x69, 0x73, 0x73,
-0x20, 0x66, 0x72, 0x61, 0x6e, 0x63, 0x73, 0x3b, 0x54, 0x61, 0x6e, 0x7a, 0x61, 0x6e, 0x69, 0x61, 0x6e, 0x20, 0x53, 0x68,
-0x69, 0x6c, 0x6c, 0x69, 0x6e, 0x67, 0x3b, 0x3b, 0x54, 0x61, 0x6e, 0x7a, 0x61, 0x6e, 0x69, 0x61, 0x6e, 0x20, 0x73, 0x68,
-0x69, 0x6c, 0x6c, 0x69, 0x6e, 0x67, 0x3b, 0x3b, 0x3b, 0x3b, 0x54, 0x61, 0x6e, 0x7a, 0x61, 0x6e, 0x69, 0x61, 0x6e, 0x20,
-0x73, 0x68, 0x69, 0x6c, 0x6c, 0x69, 0x6e, 0x67, 0x73, 0x3b, 0x54, 0x6f, 0x6e, 0x67, 0x61, 0x6e, 0x20, 0x50, 0x61, 0x2bb,
-0x61, 0x6e, 0x67, 0x61, 0x3b, 0x3b, 0x54, 0x6f, 0x6e, 0x67, 0x61, 0x6e, 0x20, 0x70, 0x61, 0x2bb, 0x61, 0x6e, 0x67, 0x61,
-0x3b, 0x3b, 0x3b, 0x3b, 0x54, 0x6f, 0x6e, 0x67, 0x61, 0x6e, 0x20, 0x70, 0x61, 0x2bb, 0x61, 0x6e, 0x67, 0x61, 0x3b, 0x54,
-0x72, 0x69, 0x6e, 0x69, 0x64, 0x61, 0x64, 0x20, 0x26, 0x20, 0x54, 0x6f, 0x62, 0x61, 0x67, 0x6f, 0x20, 0x44, 0x6f, 0x6c,
-0x6c, 0x61, 0x72, 0x3b, 0x3b, 0x54, 0x72, 0x69, 0x6e, 0x69, 0x64, 0x61, 0x64, 0x20, 0x26, 0x20, 0x54, 0x6f, 0x62, 0x61,
-0x67, 0x6f, 0x20, 0x64, 0x6f, 0x6c, 0x6c, 0x61, 0x72, 0x3b, 0x3b, 0x3b, 0x3b, 0x54, 0x72, 0x69, 0x6e, 0x69, 0x64, 0x61,
-0x64, 0x20, 0x26, 0x20, 0x54, 0x6f, 0x62, 0x61, 0x67, 0x6f, 0x20, 0x64, 0x6f, 0x6c, 0x6c, 0x61, 0x72, 0x73, 0x3b, 0x55,
+0x3b, 0x4d, 0x61, 0x75, 0x72, 0x69, 0x74, 0x69, 0x61, 0x6e, 0x20, 0x72, 0x75, 0x70, 0x65, 0x65, 0x73, 0x4e, 0x61, 0x6d,
+0x69, 0x62, 0x69, 0x61, 0x6e, 0x20, 0x44, 0x6f, 0x6c, 0x6c, 0x61, 0x72, 0x3b, 0x3b, 0x4e, 0x61, 0x6d, 0x69, 0x62, 0x69,
+0x61, 0x6e, 0x20, 0x64, 0x6f, 0x6c, 0x6c, 0x61, 0x72, 0x3b, 0x3b, 0x3b, 0x3b, 0x4e, 0x61, 0x6d, 0x69, 0x62, 0x69, 0x61,
+0x6e, 0x20, 0x64, 0x6f, 0x6c, 0x6c, 0x61, 0x72, 0x73, 0x4e, 0x69, 0x67, 0x65, 0x72, 0x69, 0x61, 0x6e, 0x20, 0x4e, 0x61,
+0x69, 0x72, 0x61, 0x3b, 0x3b, 0x4e, 0x69, 0x67, 0x65, 0x72, 0x69, 0x61, 0x6e, 0x20, 0x6e, 0x61, 0x69, 0x72, 0x61, 0x3b,
+0x3b, 0x3b, 0x3b, 0x4e, 0x69, 0x67, 0x65, 0x72, 0x69, 0x61, 0x6e, 0x20, 0x6e, 0x61, 0x69, 0x72, 0x61, 0x73, 0x50, 0x61,
+0x6b, 0x69, 0x73, 0x74, 0x61, 0x6e, 0x69, 0x20, 0x52, 0x75, 0x70, 0x65, 0x65, 0x3b, 0x3b, 0x50, 0x61, 0x6b, 0x69, 0x73,
+0x74, 0x61, 0x6e, 0x69, 0x20, 0x72, 0x75, 0x70, 0x65, 0x65, 0x3b, 0x3b, 0x3b, 0x3b, 0x50, 0x61, 0x6b, 0x69, 0x73, 0x74,
+0x61, 0x6e, 0x69, 0x20, 0x72, 0x75, 0x70, 0x65, 0x65, 0x73, 0x50, 0x61, 0x70, 0x75, 0x61, 0x20, 0x4e, 0x65, 0x77, 0x20,
+0x47, 0x75, 0x69, 0x6e, 0x65, 0x61, 0x6e, 0x20, 0x4b, 0x69, 0x6e, 0x61, 0x3b, 0x3b, 0x50, 0x61, 0x70, 0x75, 0x61, 0x20,
+0x4e, 0x65, 0x77, 0x20, 0x47, 0x75, 0x69, 0x6e, 0x65, 0x61, 0x6e, 0x20, 0x6b, 0x69, 0x6e, 0x61, 0x3b, 0x3b, 0x3b, 0x3b,
+0x50, 0x61, 0x70, 0x75, 0x61, 0x20, 0x4e, 0x65, 0x77, 0x20, 0x47, 0x75, 0x69, 0x6e, 0x65, 0x61, 0x6e, 0x20, 0x6b, 0x69,
+0x6e, 0x61, 0x50, 0x68, 0x69, 0x6c, 0x69, 0x70, 0x70, 0x69, 0x6e, 0x65, 0x20, 0x50, 0x69, 0x73, 0x6f, 0x3b, 0x3b, 0x50,
+0x68, 0x69, 0x6c, 0x69, 0x70, 0x70, 0x69, 0x6e, 0x65, 0x20, 0x70, 0x69, 0x73, 0x6f, 0x3b, 0x3b, 0x3b, 0x3b, 0x50, 0x68,
+0x69, 0x6c, 0x69, 0x70, 0x70, 0x69, 0x6e, 0x65, 0x20, 0x70, 0x69, 0x73, 0x6f, 0x73, 0x52, 0x77, 0x61, 0x6e, 0x64, 0x61,
+0x6e, 0x20, 0x46, 0x72, 0x61, 0x6e, 0x63, 0x3b, 0x3b, 0x52, 0x77, 0x61, 0x6e, 0x64, 0x61, 0x6e, 0x20, 0x66, 0x72, 0x61,
+0x6e, 0x63, 0x3b, 0x3b, 0x3b, 0x3b, 0x52, 0x77, 0x61, 0x6e, 0x64, 0x61, 0x6e, 0x20, 0x66, 0x72, 0x61, 0x6e, 0x63, 0x73,
+0x53, 0x61, 0x6d, 0x6f, 0x61, 0x6e, 0x20, 0x54, 0x61, 0x6c, 0x61, 0x3b, 0x3b, 0x53, 0x61, 0x6d, 0x6f, 0x61, 0x6e, 0x20,
+0x74, 0x61, 0x6c, 0x61, 0x3b, 0x3b, 0x3b, 0x3b, 0x53, 0x61, 0x6d, 0x6f, 0x61, 0x6e, 0x20, 0x74, 0x61, 0x6c, 0x61, 0x53,
+0x65, 0x79, 0x63, 0x68, 0x65, 0x6c, 0x6c, 0x6f, 0x69, 0x73, 0x20, 0x52, 0x75, 0x70, 0x65, 0x65, 0x3b, 0x3b, 0x53, 0x65,
+0x79, 0x63, 0x68, 0x65, 0x6c, 0x6c, 0x6f, 0x69, 0x73, 0x20, 0x72, 0x75, 0x70, 0x65, 0x65, 0x3b, 0x3b, 0x3b, 0x3b, 0x53,
+0x65, 0x79, 0x63, 0x68, 0x65, 0x6c, 0x6c, 0x6f, 0x69, 0x73, 0x20, 0x72, 0x75, 0x70, 0x65, 0x65, 0x73, 0x53, 0x69, 0x65,
+0x72, 0x72, 0x61, 0x20, 0x4c, 0x65, 0x6f, 0x6e, 0x65, 0x61, 0x6e, 0x20, 0x4c, 0x65, 0x6f, 0x6e, 0x65, 0x3b, 0x3b, 0x53,
+0x69, 0x65, 0x72, 0x72, 0x61, 0x20, 0x4c, 0x65, 0x6f, 0x6e, 0x65, 0x61, 0x6e, 0x20, 0x6c, 0x65, 0x6f, 0x6e, 0x65, 0x3b,
+0x3b, 0x3b, 0x3b, 0x53, 0x69, 0x65, 0x72, 0x72, 0x61, 0x20, 0x4c, 0x65, 0x6f, 0x6e, 0x65, 0x61, 0x6e, 0x20, 0x6c, 0x65,
+0x6f, 0x6e, 0x65, 0x73, 0x53, 0x69, 0x6e, 0x67, 0x61, 0x70, 0x6f, 0x72, 0x65, 0x20, 0x44, 0x6f, 0x6c, 0x6c, 0x61, 0x72,
+0x3b, 0x3b, 0x53, 0x69, 0x6e, 0x67, 0x61, 0x70, 0x6f, 0x72, 0x65, 0x20, 0x64, 0x6f, 0x6c, 0x6c, 0x61, 0x72, 0x3b, 0x3b,
+0x3b, 0x3b, 0x53, 0x69, 0x6e, 0x67, 0x61, 0x70, 0x6f, 0x72, 0x65, 0x20, 0x64, 0x6f, 0x6c, 0x6c, 0x61, 0x72, 0x73, 0x53,
+0x6f, 0x6c, 0x6f, 0x6d, 0x6f, 0x6e, 0x20, 0x49, 0x73, 0x6c, 0x61, 0x6e, 0x64, 0x73, 0x20, 0x44, 0x6f, 0x6c, 0x6c, 0x61,
+0x72, 0x3b, 0x3b, 0x53, 0x6f, 0x6c, 0x6f, 0x6d, 0x6f, 0x6e, 0x20, 0x49, 0x73, 0x6c, 0x61, 0x6e, 0x64, 0x73, 0x20, 0x64,
+0x6f, 0x6c, 0x6c, 0x61, 0x72, 0x3b, 0x3b, 0x3b, 0x3b, 0x53, 0x6f, 0x6c, 0x6f, 0x6d, 0x6f, 0x6e, 0x20, 0x49, 0x73, 0x6c,
+0x61, 0x6e, 0x64, 0x73, 0x20, 0x64, 0x6f, 0x6c, 0x6c, 0x61, 0x72, 0x73, 0x53, 0x74, 0x20, 0x48, 0x65, 0x6c, 0x65, 0x6e,
+0x61, 0x20, 0x50, 0x6f, 0x75, 0x6e, 0x64, 0x3b, 0x3b, 0x53, 0x74, 0x20, 0x48, 0x65, 0x6c, 0x65, 0x6e, 0x61, 0x20, 0x70,
+0x6f, 0x75, 0x6e, 0x64, 0x3b, 0x3b, 0x3b, 0x3b, 0x53, 0x74, 0x20, 0x48, 0x65, 0x6c, 0x65, 0x6e, 0x61, 0x20, 0x70, 0x6f,
+0x75, 0x6e, 0x64, 0x73, 0x53, 0x75, 0x64, 0x61, 0x6e, 0x65, 0x73, 0x65, 0x20, 0x50, 0x6f, 0x75, 0x6e, 0x64, 0x3b, 0x3b,
+0x53, 0x75, 0x64, 0x61, 0x6e, 0x65, 0x73, 0x65, 0x20, 0x70, 0x6f, 0x75, 0x6e, 0x64, 0x3b, 0x3b, 0x3b, 0x3b, 0x53, 0x75,
+0x64, 0x61, 0x6e, 0x65, 0x73, 0x65, 0x20, 0x70, 0x6f, 0x75, 0x6e, 0x64, 0x73, 0x53, 0x77, 0x61, 0x7a, 0x69, 0x20, 0x4c,
+0x69, 0x6c, 0x61, 0x6e, 0x67, 0x65, 0x6e, 0x69, 0x3b, 0x3b, 0x53, 0x77, 0x61, 0x7a, 0x69, 0x20, 0x6c, 0x69, 0x6c, 0x61,
+0x6e, 0x67, 0x65, 0x6e, 0x69, 0x3b, 0x3b, 0x3b, 0x3b, 0x53, 0x77, 0x61, 0x7a, 0x69, 0x20, 0x65, 0x6d, 0x61, 0x6c, 0x61,
+0x6e, 0x67, 0x65, 0x6e, 0x69, 0x53, 0x77, 0x65, 0x64, 0x69, 0x73, 0x68, 0x20, 0x4b, 0x72, 0x6f, 0x6e, 0x61, 0x3b, 0x3b,
+0x53, 0x77, 0x65, 0x64, 0x69, 0x73, 0x68, 0x20, 0x6b, 0x72, 0x6f, 0x6e, 0x61, 0x3b, 0x3b, 0x3b, 0x3b, 0x53, 0x77, 0x65,
+0x64, 0x69, 0x73, 0x68, 0x20, 0x6b, 0x72, 0x6f, 0x6e, 0x6f, 0x72, 0x53, 0x77, 0x69, 0x73, 0x73, 0x20, 0x46, 0x72, 0x61,
+0x6e, 0x63, 0x3b, 0x3b, 0x53, 0x77, 0x69, 0x73, 0x73, 0x20, 0x66, 0x72, 0x61, 0x6e, 0x63, 0x3b, 0x3b, 0x3b, 0x3b, 0x53,
+0x77, 0x69, 0x73, 0x73, 0x20, 0x66, 0x72, 0x61, 0x6e, 0x63, 0x73, 0x54, 0x61, 0x6e, 0x7a, 0x61, 0x6e, 0x69, 0x61, 0x6e,
+0x20, 0x53, 0x68, 0x69, 0x6c, 0x6c, 0x69, 0x6e, 0x67, 0x3b, 0x3b, 0x54, 0x61, 0x6e, 0x7a, 0x61, 0x6e, 0x69, 0x61, 0x6e,
+0x20, 0x73, 0x68, 0x69, 0x6c, 0x6c, 0x69, 0x6e, 0x67, 0x3b, 0x3b, 0x3b, 0x3b, 0x54, 0x61, 0x6e, 0x7a, 0x61, 0x6e, 0x69,
+0x61, 0x6e, 0x20, 0x73, 0x68, 0x69, 0x6c, 0x6c, 0x69, 0x6e, 0x67, 0x73, 0x54, 0x6f, 0x6e, 0x67, 0x61, 0x6e, 0x20, 0x50,
+0x61, 0x2bb, 0x61, 0x6e, 0x67, 0x61, 0x3b, 0x3b, 0x54, 0x6f, 0x6e, 0x67, 0x61, 0x6e, 0x20, 0x70, 0x61, 0x2bb, 0x61, 0x6e,
+0x67, 0x61, 0x3b, 0x3b, 0x3b, 0x3b, 0x54, 0x6f, 0x6e, 0x67, 0x61, 0x6e, 0x20, 0x70, 0x61, 0x2bb, 0x61, 0x6e, 0x67, 0x61,
+0x54, 0x72, 0x69, 0x6e, 0x69, 0x64, 0x61, 0x64, 0x20, 0x26, 0x20, 0x54, 0x6f, 0x62, 0x61, 0x67, 0x6f, 0x20, 0x44, 0x6f,
+0x6c, 0x6c, 0x61, 0x72, 0x3b, 0x3b, 0x54, 0x72, 0x69, 0x6e, 0x69, 0x64, 0x61, 0x64, 0x20, 0x26, 0x20, 0x54, 0x6f, 0x62,
+0x61, 0x67, 0x6f, 0x20, 0x64, 0x6f, 0x6c, 0x6c, 0x61, 0x72, 0x3b, 0x3b, 0x3b, 0x3b, 0x54, 0x72, 0x69, 0x6e, 0x69, 0x64,
+0x61, 0x64, 0x20, 0x26, 0x20, 0x54, 0x6f, 0x62, 0x61, 0x67, 0x6f, 0x20, 0x64, 0x6f, 0x6c, 0x6c, 0x61, 0x72, 0x73, 0x55,
 0x67, 0x61, 0x6e, 0x64, 0x61, 0x6e, 0x20, 0x53, 0x68, 0x69, 0x6c, 0x6c, 0x69, 0x6e, 0x67, 0x3b, 0x3b, 0x55, 0x67, 0x61,
 0x6e, 0x64, 0x61, 0x6e, 0x20, 0x73, 0x68, 0x69, 0x6c, 0x6c, 0x69, 0x6e, 0x67, 0x3b, 0x3b, 0x3b, 0x3b, 0x55, 0x67, 0x61,
-0x6e, 0x64, 0x61, 0x6e, 0x20, 0x73, 0x68, 0x69, 0x6c, 0x6c, 0x69, 0x6e, 0x67, 0x73, 0x3b, 0x55, 0x6e, 0x69, 0x74, 0x65,
-0x64, 0x20, 0x41, 0x72, 0x61, 0x62, 0x20, 0x45, 0x6d, 0x69, 0x72, 0x61, 0x74, 0x65, 0x73, 0x20, 0x44, 0x69, 0x72, 0x68,
-0x61, 0x6d, 0x3b, 0x3b, 0x55, 0x41, 0x45, 0x20, 0x64, 0x69, 0x72, 0x68, 0x61, 0x6d, 0x3b, 0x3b, 0x3b, 0x3b, 0x55, 0x41,
-0x45, 0x20, 0x64, 0x69, 0x72, 0x68, 0x61, 0x6d, 0x73, 0x3b, 0x42, 0x72, 0x69, 0x74, 0x69, 0x73, 0x68, 0x20, 0x50, 0x6f,
-0x75, 0x6e, 0x64, 0x3b, 0x3b, 0x42, 0x72, 0x69, 0x74, 0x69, 0x73, 0x68, 0x20, 0x70, 0x6f, 0x75, 0x6e, 0x64, 0x3b, 0x3b,
-0x3b, 0x3b, 0x42, 0x72, 0x69, 0x74, 0x69, 0x73, 0x68, 0x20, 0x70, 0x6f, 0x75, 0x6e, 0x64, 0x73, 0x3b, 0x56, 0x61, 0x6e,
-0x75, 0x61, 0x74, 0x75, 0x20, 0x56, 0x61, 0x74, 0x75, 0x3b, 0x3b, 0x56, 0x61, 0x6e, 0x75, 0x61, 0x74, 0x75, 0x20, 0x76,
-0x61, 0x74, 0x75, 0x3b, 0x3b, 0x3b, 0x3b, 0x56, 0x61, 0x6e, 0x75, 0x61, 0x74, 0x75, 0x20, 0x76, 0x61, 0x74, 0x75, 0x73,
-0x3b, 0x5a, 0x61, 0x6d, 0x62, 0x69, 0x61, 0x6e, 0x20, 0x4b, 0x77, 0x61, 0x63, 0x68, 0x61, 0x3b, 0x3b, 0x5a, 0x61, 0x6d,
-0x62, 0x69, 0x61, 0x6e, 0x20, 0x6b, 0x77, 0x61, 0x63, 0x68, 0x61, 0x3b, 0x3b, 0x3b, 0x3b, 0x5a, 0x61, 0x6d, 0x62, 0x69,
-0x61, 0x6e, 0x20, 0x6b, 0x77, 0x61, 0x63, 0x68, 0x61, 0x73, 0x3b, 0x53, 0x6f, 0x75, 0x74, 0x68, 0x20, 0x53, 0x75, 0x64,
-0x61, 0x6e, 0x65, 0x73, 0x65, 0x20, 0x50, 0x6f, 0x75, 0x6e, 0x64, 0x3b, 0x3b, 0x53, 0x6f, 0x75, 0x74, 0x68, 0x20, 0x53,
-0x75, 0x64, 0x61, 0x6e, 0x65, 0x73, 0x65, 0x20, 0x70, 0x6f, 0x75, 0x6e, 0x64, 0x3b, 0x3b, 0x3b, 0x3b, 0x53, 0x6f, 0x75,
-0x74, 0x68, 0x20, 0x53, 0x75, 0x64, 0x61, 0x6e, 0x65, 0x73, 0x65, 0x20, 0x70, 0x6f, 0x75, 0x6e, 0x64, 0x73, 0x3b, 0x4e,
-0x65, 0x74, 0x68, 0x65, 0x72, 0x6c, 0x61, 0x6e, 0x64, 0x73, 0x20, 0x41, 0x6e, 0x74, 0x69, 0x6c, 0x6c, 0x65, 0x61, 0x6e,
-0x20, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x65, 0x72, 0x3b, 0x3b, 0x4e, 0x65, 0x74, 0x68, 0x65, 0x72, 0x6c, 0x61, 0x6e, 0x64,
-0x73, 0x20, 0x41, 0x6e, 0x74, 0x69, 0x6c, 0x6c, 0x65, 0x61, 0x6e, 0x20, 0x67, 0x75, 0x69, 0x6c, 0x64, 0x65, 0x72, 0x3b,
-0x3b, 0x3b, 0x3b, 0x4e, 0x65, 0x74, 0x68, 0x65, 0x72, 0x6c, 0x61, 0x6e, 0x64, 0x73, 0x20, 0x41, 0x6e, 0x74, 0x69, 0x6c,
-0x6c, 0x65, 0x61, 0x6e, 0x20, 0x67, 0x75, 0x69, 0x6c, 0x64, 0x65, 0x72, 0x73, 0x3b, 0x65, 0x75, 0x72, 0x6f, 0x3b, 0x3b,
-0x65, 0x75, 0x72, 0x6f, 0x3b, 0x3b, 0x3b, 0x3b, 0x65, 0x75, 0x72, 0x6f, 0x74, 0x3b, 0x64, 0x6f, 0x6e, 0x73, 0x6b, 0x20,
-0x6b, 0x72, 0xf3, 0x6e, 0x61, 0x3b, 0x3b, 0x64, 0x6f, 0x6e, 0x73, 0x6b, 0x20, 0x6b, 0x72, 0xf3, 0x6e, 0x61, 0x3b, 0x3b,
-0x3b, 0x3b, 0x64, 0x61, 0x6e, 0x73, 0x6b, 0x61, 0x72, 0x20, 0x6b, 0x72, 0xf3, 0x6e, 0x75, 0x72, 0x3b, 0x65, 0x75, 0x72,
-0x6f, 0x3b, 0x3b, 0x65, 0x75, 0x72, 0x6f, 0x3b, 0x3b, 0x3b, 0x3b, 0x65, 0x75, 0x72, 0x6f, 0x61, 0x3b, 0x64, 0x69, 0x6e,
-0x61, 0x72, 0x20, 0x61, 0x6c, 0x67, 0xe9, 0x72, 0x69, 0x65, 0x6e, 0x3b, 0x3b, 0x64, 0x69, 0x6e, 0x61, 0x72, 0x20, 0x61,
-0x6c, 0x67, 0xe9, 0x72, 0x69, 0x65, 0x6e, 0x3b, 0x3b, 0x3b, 0x3b, 0x64, 0x69, 0x6e, 0x61, 0x72, 0x73, 0x20, 0x61, 0x6c,
-0x67, 0xe9, 0x72, 0x69, 0x65, 0x6e, 0x73, 0x3b, 0x66, 0x72, 0x61, 0x6e, 0x63, 0x20, 0x43, 0x46, 0x41, 0x20, 0x28, 0x42,
-0x43, 0x45, 0x41, 0x4f, 0x29, 0x3b, 0x3b, 0x66, 0x72, 0x61, 0x6e, 0x63, 0x20, 0x43, 0x46, 0x41, 0x20, 0x28, 0x42, 0x43,
-0x45, 0x41, 0x4f, 0x29, 0x3b, 0x3b, 0x3b, 0x3b, 0x66, 0x72, 0x61, 0x6e, 0x63, 0x73, 0x20, 0x43, 0x46, 0x41, 0x20, 0x28,
-0x42, 0x43, 0x45, 0x41, 0x4f, 0x29, 0x3b, 0x66, 0x72, 0x61, 0x6e, 0x63, 0x20, 0x62, 0x75, 0x72, 0x75, 0x6e, 0x64, 0x61,
-0x69, 0x73, 0x3b, 0x3b, 0x66, 0x72, 0x61, 0x6e, 0x63, 0x20, 0x62, 0x75, 0x72, 0x75, 0x6e, 0x64, 0x61, 0x69, 0x73, 0x3b,
-0x3b, 0x3b, 0x3b, 0x66, 0x72, 0x61, 0x6e, 0x63, 0x73, 0x20, 0x62, 0x75, 0x72, 0x75, 0x6e, 0x64, 0x61, 0x69, 0x73, 0x3b,
-0x66, 0x72, 0x61, 0x6e, 0x63, 0x20, 0x43, 0x46, 0x41, 0x20, 0x28, 0x42, 0x45, 0x41, 0x43, 0x29, 0x3b, 0x3b, 0x66, 0x72,
-0x61, 0x6e, 0x63, 0x20, 0x43, 0x46, 0x41, 0x20, 0x28, 0x42, 0x45, 0x41, 0x43, 0x29, 0x3b, 0x3b, 0x3b, 0x3b, 0x66, 0x72,
-0x61, 0x6e, 0x63, 0x73, 0x20, 0x43, 0x46, 0x41, 0x20, 0x28, 0x42, 0x45, 0x41, 0x43, 0x29, 0x3b, 0x64, 0x6f, 0x6c, 0x6c,
-0x61, 0x72, 0x20, 0x63, 0x61, 0x6e, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x3b, 0x3b, 0x64, 0x6f, 0x6c, 0x6c, 0x61, 0x72, 0x20,
-0x63, 0x61, 0x6e, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x3b, 0x3b, 0x3b, 0x3b, 0x64, 0x6f, 0x6c, 0x6c, 0x61, 0x72, 0x73, 0x20,
-0x63, 0x61, 0x6e, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x73, 0x3b, 0x66, 0x72, 0x61, 0x6e, 0x63, 0x20, 0x63, 0x6f, 0x6d, 0x6f,
-0x72, 0x69, 0x65, 0x6e, 0x3b, 0x3b, 0x66, 0x72, 0x61, 0x6e, 0x63, 0x20, 0x63, 0x6f, 0x6d, 0x6f, 0x72, 0x69, 0x65, 0x6e,
-0x3b, 0x3b, 0x3b, 0x3b, 0x66, 0x72, 0x61, 0x6e, 0x63, 0x73, 0x20, 0x63, 0x6f, 0x6d, 0x6f, 0x72, 0x69, 0x65, 0x6e, 0x73,
-0x3b, 0x66, 0x72, 0x61, 0x6e, 0x63, 0x20, 0x63, 0x6f, 0x6e, 0x67, 0x6f, 0x6c, 0x61, 0x69, 0x73, 0x3b, 0x3b, 0x66, 0x72,
-0x61, 0x6e, 0x63, 0x20, 0x63, 0x6f, 0x6e, 0x67, 0x6f, 0x6c, 0x61, 0x69, 0x73, 0x3b, 0x3b, 0x3b, 0x3b, 0x66, 0x72, 0x61,
-0x6e, 0x63, 0x73, 0x20, 0x63, 0x6f, 0x6e, 0x67, 0x6f, 0x6c, 0x61, 0x69, 0x73, 0x3b, 0x66, 0x72, 0x61, 0x6e, 0x63, 0x20,
-0x64, 0x6a, 0x69, 0x62, 0x6f, 0x75, 0x74, 0x69, 0x65, 0x6e, 0x3b, 0x3b, 0x66, 0x72, 0x61, 0x6e, 0x63, 0x20, 0x64, 0x6a,
-0x69, 0x62, 0x6f, 0x75, 0x74, 0x69, 0x65, 0x6e, 0x3b, 0x3b, 0x3b, 0x3b, 0x66, 0x72, 0x61, 0x6e, 0x63, 0x73, 0x20, 0x64,
-0x6a, 0x69, 0x62, 0x6f, 0x75, 0x74, 0x69, 0x65, 0x6e, 0x73, 0x3b, 0x66, 0x72, 0x61, 0x6e, 0x63, 0x20, 0x43, 0x46, 0x50,
-0x3b, 0x3b, 0x66, 0x72, 0x61, 0x6e, 0x63, 0x20, 0x43, 0x46, 0x50, 0x3b, 0x3b, 0x3b, 0x3b, 0x66, 0x72, 0x61, 0x6e, 0x63,
-0x73, 0x20, 0x43, 0x46, 0x50, 0x3b, 0x66, 0x72, 0x61, 0x6e, 0x63, 0x20, 0x67, 0x75, 0x69, 0x6e, 0xe9, 0x65, 0x6e, 0x3b,
-0x3b, 0x66, 0x72, 0x61, 0x6e, 0x63, 0x20, 0x67, 0x75, 0x69, 0x6e, 0xe9, 0x65, 0x6e, 0x3b, 0x3b, 0x3b, 0x3b, 0x66, 0x72,
-0x61, 0x6e, 0x63, 0x73, 0x20, 0x67, 0x75, 0x69, 0x6e, 0xe9, 0x65, 0x6e, 0x73, 0x3b, 0x67, 0x6f, 0x75, 0x72, 0x64, 0x65,
+0x6e, 0x64, 0x61, 0x6e, 0x20, 0x73, 0x68, 0x69, 0x6c, 0x6c, 0x69, 0x6e, 0x67, 0x73, 0x55, 0x6e, 0x69, 0x74, 0x65, 0x64,
+0x20, 0x41, 0x72, 0x61, 0x62, 0x20, 0x45, 0x6d, 0x69, 0x72, 0x61, 0x74, 0x65, 0x73, 0x20, 0x44, 0x69, 0x72, 0x68, 0x61,
+0x6d, 0x3b, 0x3b, 0x55, 0x41, 0x45, 0x20, 0x64, 0x69, 0x72, 0x68, 0x61, 0x6d, 0x3b, 0x3b, 0x3b, 0x3b, 0x55, 0x41, 0x45,
+0x20, 0x64, 0x69, 0x72, 0x68, 0x61, 0x6d, 0x73, 0x42, 0x72, 0x69, 0x74, 0x69, 0x73, 0x68, 0x20, 0x50, 0x6f, 0x75, 0x6e,
+0x64, 0x3b, 0x3b, 0x42, 0x72, 0x69, 0x74, 0x69, 0x73, 0x68, 0x20, 0x70, 0x6f, 0x75, 0x6e, 0x64, 0x3b, 0x3b, 0x3b, 0x3b,
+0x42, 0x72, 0x69, 0x74, 0x69, 0x73, 0x68, 0x20, 0x70, 0x6f, 0x75, 0x6e, 0x64, 0x73, 0x56, 0x61, 0x6e, 0x75, 0x61, 0x74,
+0x75, 0x20, 0x56, 0x61, 0x74, 0x75, 0x3b, 0x3b, 0x56, 0x61, 0x6e, 0x75, 0x61, 0x74, 0x75, 0x20, 0x76, 0x61, 0x74, 0x75,
+0x3b, 0x3b, 0x3b, 0x3b, 0x56, 0x61, 0x6e, 0x75, 0x61, 0x74, 0x75, 0x20, 0x76, 0x61, 0x74, 0x75, 0x73, 0x5a, 0x61, 0x6d,
+0x62, 0x69, 0x61, 0x6e, 0x20, 0x4b, 0x77, 0x61, 0x63, 0x68, 0x61, 0x3b, 0x3b, 0x5a, 0x61, 0x6d, 0x62, 0x69, 0x61, 0x6e,
+0x20, 0x6b, 0x77, 0x61, 0x63, 0x68, 0x61, 0x3b, 0x3b, 0x3b, 0x3b, 0x5a, 0x61, 0x6d, 0x62, 0x69, 0x61, 0x6e, 0x20, 0x6b,
+0x77, 0x61, 0x63, 0x68, 0x61, 0x73, 0x53, 0x6f, 0x75, 0x74, 0x68, 0x20, 0x53, 0x75, 0x64, 0x61, 0x6e, 0x65, 0x73, 0x65,
+0x20, 0x50, 0x6f, 0x75, 0x6e, 0x64, 0x3b, 0x3b, 0x53, 0x6f, 0x75, 0x74, 0x68, 0x20, 0x53, 0x75, 0x64, 0x61, 0x6e, 0x65,
+0x73, 0x65, 0x20, 0x70, 0x6f, 0x75, 0x6e, 0x64, 0x3b, 0x3b, 0x3b, 0x3b, 0x53, 0x6f, 0x75, 0x74, 0x68, 0x20, 0x53, 0x75,
+0x64, 0x61, 0x6e, 0x65, 0x73, 0x65, 0x20, 0x70, 0x6f, 0x75, 0x6e, 0x64, 0x73, 0x4e, 0x65, 0x74, 0x68, 0x65, 0x72, 0x6c,
+0x61, 0x6e, 0x64, 0x73, 0x20, 0x41, 0x6e, 0x74, 0x69, 0x6c, 0x6c, 0x65, 0x61, 0x6e, 0x20, 0x47, 0x75, 0x69, 0x6c, 0x64,
+0x65, 0x72, 0x3b, 0x3b, 0x4e, 0x65, 0x74, 0x68, 0x65, 0x72, 0x6c, 0x61, 0x6e, 0x64, 0x73, 0x20, 0x41, 0x6e, 0x74, 0x69,
+0x6c, 0x6c, 0x65, 0x61, 0x6e, 0x20, 0x67, 0x75, 0x69, 0x6c, 0x64, 0x65, 0x72, 0x3b, 0x3b, 0x3b, 0x3b, 0x4e, 0x65, 0x74,
+0x68, 0x65, 0x72, 0x6c, 0x61, 0x6e, 0x64, 0x73, 0x20, 0x41, 0x6e, 0x74, 0x69, 0x6c, 0x6c, 0x65, 0x61, 0x6e, 0x20, 0x67,
+0x75, 0x69, 0x6c, 0x64, 0x65, 0x72, 0x73, 0x65, 0x75, 0x72, 0x6f, 0x3b, 0x3b, 0x65, 0x75, 0x72, 0x6f, 0x3b, 0x3b, 0x3b,
+0x3b, 0x65, 0x75, 0x72, 0x6f, 0x74, 0x64, 0x6f, 0x6e, 0x73, 0x6b, 0x20, 0x6b, 0x72, 0xf3, 0x6e, 0x61, 0x3b, 0x3b, 0x64,
+0x6f, 0x6e, 0x73, 0x6b, 0x20, 0x6b, 0x72, 0xf3, 0x6e, 0x61, 0x3b, 0x3b, 0x3b, 0x3b, 0x64, 0x61, 0x6e, 0x73, 0x6b, 0x61,
+0x72, 0x20, 0x6b, 0x72, 0xf3, 0x6e, 0x75, 0x72, 0x65, 0x75, 0x72, 0x6f, 0x3b, 0x3b, 0x65, 0x75, 0x72, 0x6f, 0x3b, 0x3b,
+0x3b, 0x3b, 0x65, 0x75, 0x72, 0x6f, 0x61, 0x64, 0x69, 0x6e, 0x61, 0x72, 0x20, 0x61, 0x6c, 0x67, 0xe9, 0x72, 0x69, 0x65,
+0x6e, 0x3b, 0x3b, 0x64, 0x69, 0x6e, 0x61, 0x72, 0x20, 0x61, 0x6c, 0x67, 0xe9, 0x72, 0x69, 0x65, 0x6e, 0x3b, 0x3b, 0x3b,
+0x3b, 0x64, 0x69, 0x6e, 0x61, 0x72, 0x73, 0x20, 0x61, 0x6c, 0x67, 0xe9, 0x72, 0x69, 0x65, 0x6e, 0x73, 0x66, 0x72, 0x61,
+0x6e, 0x63, 0x20, 0x43, 0x46, 0x41, 0x20, 0x28, 0x42, 0x43, 0x45, 0x41, 0x4f, 0x29, 0x3b, 0x3b, 0x66, 0x72, 0x61, 0x6e,
+0x63, 0x20, 0x43, 0x46, 0x41, 0x20, 0x28, 0x42, 0x43, 0x45, 0x41, 0x4f, 0x29, 0x3b, 0x3b, 0x3b, 0x3b, 0x66, 0x72, 0x61,
+0x6e, 0x63, 0x73, 0x20, 0x43, 0x46, 0x41, 0x20, 0x28, 0x42, 0x43, 0x45, 0x41, 0x4f, 0x29, 0x66, 0x72, 0x61, 0x6e, 0x63,
+0x20, 0x62, 0x75, 0x72, 0x75, 0x6e, 0x64, 0x61, 0x69, 0x73, 0x3b, 0x3b, 0x66, 0x72, 0x61, 0x6e, 0x63, 0x20, 0x62, 0x75,
+0x72, 0x75, 0x6e, 0x64, 0x61, 0x69, 0x73, 0x3b, 0x3b, 0x3b, 0x3b, 0x66, 0x72, 0x61, 0x6e, 0x63, 0x73, 0x20, 0x62, 0x75,
+0x72, 0x75, 0x6e, 0x64, 0x61, 0x69, 0x73, 0x66, 0x72, 0x61, 0x6e, 0x63, 0x20, 0x43, 0x46, 0x41, 0x20, 0x28, 0x42, 0x45,
+0x41, 0x43, 0x29, 0x3b, 0x3b, 0x66, 0x72, 0x61, 0x6e, 0x63, 0x20, 0x43, 0x46, 0x41, 0x20, 0x28, 0x42, 0x45, 0x41, 0x43,
+0x29, 0x3b, 0x3b, 0x3b, 0x3b, 0x66, 0x72, 0x61, 0x6e, 0x63, 0x73, 0x20, 0x43, 0x46, 0x41, 0x20, 0x28, 0x42, 0x45, 0x41,
+0x43, 0x29, 0x64, 0x6f, 0x6c, 0x6c, 0x61, 0x72, 0x20, 0x63, 0x61, 0x6e, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x3b, 0x3b, 0x64,
+0x6f, 0x6c, 0x6c, 0x61, 0x72, 0x20, 0x63, 0x61, 0x6e, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x3b, 0x3b, 0x3b, 0x3b, 0x64, 0x6f,
+0x6c, 0x6c, 0x61, 0x72, 0x73, 0x20, 0x63, 0x61, 0x6e, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x73, 0x66, 0x72, 0x61, 0x6e, 0x63,
+0x20, 0x63, 0x6f, 0x6d, 0x6f, 0x72, 0x69, 0x65, 0x6e, 0x3b, 0x3b, 0x66, 0x72, 0x61, 0x6e, 0x63, 0x20, 0x63, 0x6f, 0x6d,
+0x6f, 0x72, 0x69, 0x65, 0x6e, 0x3b, 0x3b, 0x3b, 0x3b, 0x66, 0x72, 0x61, 0x6e, 0x63, 0x73, 0x20, 0x63, 0x6f, 0x6d, 0x6f,
+0x72, 0x69, 0x65, 0x6e, 0x73, 0x66, 0x72, 0x61, 0x6e, 0x63, 0x20, 0x63, 0x6f, 0x6e, 0x67, 0x6f, 0x6c, 0x61, 0x69, 0x73,
+0x3b, 0x3b, 0x66, 0x72, 0x61, 0x6e, 0x63, 0x20, 0x63, 0x6f, 0x6e, 0x67, 0x6f, 0x6c, 0x61, 0x69, 0x73, 0x3b, 0x3b, 0x3b,
+0x3b, 0x66, 0x72, 0x61, 0x6e, 0x63, 0x73, 0x20, 0x63, 0x6f, 0x6e, 0x67, 0x6f, 0x6c, 0x61, 0x69, 0x73, 0x66, 0x72, 0x61,
+0x6e, 0x63, 0x20, 0x64, 0x6a, 0x69, 0x62, 0x6f, 0x75, 0x74, 0x69, 0x65, 0x6e, 0x3b, 0x3b, 0x66, 0x72, 0x61, 0x6e, 0x63,
+0x20, 0x64, 0x6a, 0x69, 0x62, 0x6f, 0x75, 0x74, 0x69, 0x65, 0x6e, 0x3b, 0x3b, 0x3b, 0x3b, 0x66, 0x72, 0x61, 0x6e, 0x63,
+0x73, 0x20, 0x64, 0x6a, 0x69, 0x62, 0x6f, 0x75, 0x74, 0x69, 0x65, 0x6e, 0x73, 0x66, 0x72, 0x61, 0x6e, 0x63, 0x20, 0x43,
+0x46, 0x50, 0x3b, 0x3b, 0x66, 0x72, 0x61, 0x6e, 0x63, 0x20, 0x43, 0x46, 0x50, 0x3b, 0x3b, 0x3b, 0x3b, 0x66, 0x72, 0x61,
+0x6e, 0x63, 0x73, 0x20, 0x43, 0x46, 0x50, 0x66, 0x72, 0x61, 0x6e, 0x63, 0x20, 0x67, 0x75, 0x69, 0x6e, 0xe9, 0x65, 0x6e,
+0x3b, 0x3b, 0x66, 0x72, 0x61, 0x6e, 0x63, 0x20, 0x67, 0x75, 0x69, 0x6e, 0xe9, 0x65, 0x6e, 0x3b, 0x3b, 0x3b, 0x3b, 0x66,
+0x72, 0x61, 0x6e, 0x63, 0x73, 0x20, 0x67, 0x75, 0x69, 0x6e, 0xe9, 0x65, 0x6e, 0x73, 0x67, 0x6f, 0x75, 0x72, 0x64, 0x65,
 0x20, 0x68, 0x61, 0xef, 0x74, 0x69, 0x65, 0x6e, 0x6e, 0x65, 0x3b, 0x3b, 0x67, 0x6f, 0x75, 0x72, 0x64, 0x65, 0x20, 0x68,
 0x61, 0xef, 0x74, 0x69, 0x65, 0x6e, 0x6e, 0x65, 0x3b, 0x3b, 0x3b, 0x3b, 0x67, 0x6f, 0x75, 0x72, 0x64, 0x65, 0x73, 0x20,
-0x68, 0x61, 0xef, 0x74, 0x69, 0x65, 0x6e, 0x6e, 0x65, 0x73, 0x3b, 0x61, 0x72, 0x69, 0x61, 0x72, 0x79, 0x20, 0x6d, 0x61,
-0x6c, 0x67, 0x61, 0x63, 0x68, 0x65, 0x3b, 0x3b, 0x61, 0x72, 0x69, 0x61, 0x72, 0x79, 0x20, 0x6d, 0x61, 0x6c, 0x67, 0x61,
-0x63, 0x68, 0x65, 0x3b, 0x3b, 0x3b, 0x3b, 0x61, 0x72, 0x69, 0x61, 0x72, 0x79, 0x73, 0x20, 0x6d, 0x61, 0x6c, 0x67, 0x61,
-0x63, 0x68, 0x65, 0x73, 0x3b, 0x6f, 0x75, 0x67, 0x75, 0x69, 0x79, 0x61, 0x20, 0x6d, 0x61, 0x75, 0x72, 0x69, 0x74, 0x61,
-0x6e, 0x69, 0x65, 0x6e, 0x3b, 0x3b, 0x6f, 0x75, 0x67, 0x75, 0x69, 0x79, 0x61, 0x20, 0x6d, 0x61, 0x75, 0x72, 0x69, 0x74,
-0x61, 0x6e, 0x69, 0x65, 0x6e, 0x3b, 0x3b, 0x3b, 0x3b, 0x6f, 0x75, 0x67, 0x75, 0x69, 0x79, 0x61, 0x73, 0x20, 0x6d, 0x61,
-0x75, 0x72, 0x69, 0x74, 0x61, 0x6e, 0x69, 0x65, 0x6e, 0x73, 0x3b, 0x72, 0x6f, 0x75, 0x70, 0x69, 0x65, 0x20, 0x6d, 0x61,
-0x75, 0x72, 0x69, 0x63, 0x69, 0x65, 0x6e, 0x6e, 0x65, 0x3b, 0x3b, 0x72, 0x6f, 0x75, 0x70, 0x69, 0x65, 0x20, 0x6d, 0x61,
-0x75, 0x72, 0x69, 0x63, 0x69, 0x65, 0x6e, 0x6e, 0x65, 0x3b, 0x3b, 0x3b, 0x3b, 0x72, 0x6f, 0x75, 0x70, 0x69, 0x65, 0x73,
-0x20, 0x6d, 0x61, 0x75, 0x72, 0x69, 0x63, 0x69, 0x65, 0x6e, 0x6e, 0x65, 0x73, 0x3b, 0x64, 0x69, 0x72, 0x68, 0x61, 0x6d,
-0x20, 0x6d, 0x61, 0x72, 0x6f, 0x63, 0x61, 0x69, 0x6e, 0x3b, 0x3b, 0x64, 0x69, 0x72, 0x68, 0x61, 0x6d, 0x20, 0x6d, 0x61,
-0x72, 0x6f, 0x63, 0x61, 0x69, 0x6e, 0x3b, 0x3b, 0x3b, 0x3b, 0x64, 0x69, 0x72, 0x68, 0x61, 0x6d, 0x73, 0x20, 0x6d, 0x61,
-0x72, 0x6f, 0x63, 0x61, 0x69, 0x6e, 0x73, 0x3b, 0x66, 0x72, 0x61, 0x6e, 0x63, 0x20, 0x72, 0x77, 0x61, 0x6e, 0x64, 0x61,
-0x69, 0x73, 0x3b, 0x3b, 0x66, 0x72, 0x61, 0x6e, 0x63, 0x20, 0x72, 0x77, 0x61, 0x6e, 0x64, 0x61, 0x69, 0x73, 0x3b, 0x3b,
-0x3b, 0x3b, 0x66, 0x72, 0x61, 0x6e, 0x63, 0x73, 0x20, 0x72, 0x77, 0x61, 0x6e, 0x64, 0x61, 0x69, 0x73, 0x3b, 0x72, 0x6f,
-0x75, 0x70, 0x69, 0x65, 0x20, 0x64, 0x65, 0x73, 0x20, 0x53, 0x65, 0x79, 0x63, 0x68, 0x65, 0x6c, 0x6c, 0x65, 0x73, 0x3b,
-0x3b, 0x72, 0x6f, 0x75, 0x70, 0x69, 0x65, 0x20, 0x64, 0x65, 0x73, 0x20, 0x53, 0x65, 0x79, 0x63, 0x68, 0x65, 0x6c, 0x6c,
-0x65, 0x73, 0x3b, 0x3b, 0x3b, 0x3b, 0x72, 0x6f, 0x75, 0x70, 0x69, 0x65, 0x73, 0x20, 0x64, 0x65, 0x73, 0x20, 0x53, 0x65,
-0x79, 0x63, 0x68, 0x65, 0x6c, 0x6c, 0x65, 0x73, 0x3b, 0x66, 0x72, 0x61, 0x6e, 0x63, 0x20, 0x73, 0x75, 0x69, 0x73, 0x73,
-0x65, 0x3b, 0x3b, 0x66, 0x72, 0x61, 0x6e, 0x63, 0x20, 0x73, 0x75, 0x69, 0x73, 0x73, 0x65, 0x3b, 0x3b, 0x3b, 0x3b, 0x66,
-0x72, 0x61, 0x6e, 0x63, 0x73, 0x20, 0x73, 0x75, 0x69, 0x73, 0x73, 0x65, 0x73, 0x3b, 0x6c, 0x69, 0x76, 0x72, 0x65, 0x20,
-0x73, 0x79, 0x72, 0x69, 0x65, 0x6e, 0x6e, 0x65, 0x3b, 0x3b, 0x6c, 0x69, 0x76, 0x72, 0x65, 0x20, 0x73, 0x79, 0x72, 0x69,
-0x65, 0x6e, 0x6e, 0x65, 0x3b, 0x3b, 0x3b, 0x3b, 0x6c, 0x69, 0x76, 0x72, 0x65, 0x73, 0x20, 0x73, 0x79, 0x72, 0x69, 0x65,
-0x6e, 0x6e, 0x65, 0x73, 0x3b, 0x64, 0x69, 0x6e, 0x61, 0x72, 0x20, 0x74, 0x75, 0x6e, 0x69, 0x73, 0x69, 0x65, 0x6e, 0x3b,
-0x3b, 0x64, 0x69, 0x6e, 0x61, 0x72, 0x20, 0x74, 0x75, 0x6e, 0x69, 0x73, 0x69, 0x65, 0x6e, 0x3b, 0x3b, 0x3b, 0x3b, 0x64,
-0x69, 0x6e, 0x61, 0x72, 0x73, 0x20, 0x74, 0x75, 0x6e, 0x69, 0x73, 0x69, 0x65, 0x6e, 0x73, 0x3b, 0x76, 0x61, 0x74, 0x75,
-0x20, 0x76, 0x61, 0x6e, 0x75, 0x61, 0x74, 0x75, 0x61, 0x6e, 0x3b, 0x3b, 0x76, 0x61, 0x74, 0x75, 0x20, 0x76, 0x61, 0x6e,
-0x75, 0x61, 0x74, 0x75, 0x61, 0x6e, 0x3b, 0x3b, 0x3b, 0x3b, 0x76, 0x61, 0x74, 0x75, 0x73, 0x20, 0x76, 0x61, 0x6e, 0x75,
-0x61, 0x74, 0x75, 0x61, 0x6e, 0x73, 0x3b, 0x50, 0x75, 0x6e, 0x6e, 0x64, 0x20, 0x53, 0x61, 0x73, 0x61, 0x6e, 0x6e, 0x61,
-0x63, 0x68, 0x3b, 0x3b, 0x70, 0x68, 0x75, 0x6e, 0x6e, 0x64, 0x20, 0x53, 0x61, 0x73, 0x61, 0x6e, 0x6e, 0x61, 0x63, 0x68,
-0x3b, 0x70, 0x68, 0x75, 0x6e, 0x6e, 0x64, 0x20, 0x53, 0x61, 0x73, 0x61, 0x6e, 0x6e, 0x61, 0x63, 0x68, 0x3b, 0x70, 0x75,
-0x69, 0x6e, 0x6e, 0x64, 0x20, 0x53, 0x68, 0x61, 0x73, 0x61, 0x6e, 0x6e, 0x61, 0x63, 0x68, 0x3b, 0x3b, 0x70, 0x75, 0x6e,
-0x6e, 0x64, 0x20, 0x53, 0x61, 0x73, 0x61, 0x6e, 0x6e, 0x61, 0x63, 0x68, 0x3b, 0x10e5, 0x10d0, 0x10e0, 0x10d7, 0x10e3, 0x10da, 0x10d8,
-0x20, 0x10da, 0x10d0, 0x10e0, 0x10d8, 0x3b, 0x3b, 0x10e5, 0x10d0, 0x10e0, 0x10d7, 0x10e3, 0x10da, 0x10d8, 0x20, 0x10da, 0x10d0, 0x10e0, 0x10d8, 0x3b,
-0x3b, 0x3b, 0x3b, 0x10e5, 0x10d0, 0x10e0, 0x10d7, 0x10e3, 0x10da, 0x10d8, 0x20, 0x10da, 0x10d0, 0x10e0, 0x10d8, 0x3b, 0x45, 0x75, 0x72, 0x6f,
-0x3b, 0x3b, 0x45, 0x75, 0x72, 0x6f, 0x3b, 0x3b, 0x3b, 0x3b, 0x45, 0x75, 0x72, 0x6f, 0x3b, 0x53, 0x63, 0x68, 0x77, 0x65,
-0x69, 0x7a, 0x65, 0x72, 0x20, 0x46, 0x72, 0x61, 0x6e, 0x6b, 0x65, 0x6e, 0x3b, 0x3b, 0x53, 0x63, 0x68, 0x77, 0x65, 0x69,
-0x7a, 0x65, 0x72, 0x20, 0x46, 0x72, 0x61, 0x6e, 0x6b, 0x65, 0x6e, 0x3b, 0x3b, 0x3b, 0x3b, 0x53, 0x63, 0x68, 0x77, 0x65,
-0x69, 0x7a, 0x65, 0x72, 0x20, 0x46, 0x72, 0x61, 0x6e, 0x6b, 0x65, 0x6e, 0x3b, 0x395, 0x3c5, 0x3c1, 0x3ce, 0x3b, 0x3b, 0x3b5,
-0x3c5, 0x3c1, 0x3ce, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b5, 0x3c5, 0x3c1, 0x3ce, 0x3b, 0x64, 0x61, 0x6e, 0x6d, 0x61, 0x72, 0x6b, 0x69,
-0x6d, 0x75, 0x74, 0x20, 0x6b, 0x6f, 0x72, 0x75, 0x75, 0x6e, 0x69, 0x3b, 0x3b, 0x64, 0x61, 0x6e, 0x73, 0x6b, 0x69, 0x6e,
-0x75, 0x74, 0x20, 0x6b, 0x6f, 0x72, 0x75, 0x75, 0x6e, 0x69, 0x3b, 0x3b, 0x3b, 0x3b, 0x64, 0x61, 0x6e, 0x6d, 0x61, 0x72,
-0x6b, 0x69, 0x6d, 0x75, 0x74, 0x20, 0x6b, 0x6f, 0x72, 0x75, 0x75, 0x6e, 0x69, 0x3b, 0xaad, 0xabe, 0xab0, 0xaa4, 0xac0, 0xaaf,
-0x20, 0xab0, 0xac2, 0xaaa, 0xabf, 0xaaf, 0xabe, 0x3b, 0x3b, 0xaad, 0xabe, 0xab0, 0xaa4, 0xac0, 0xaaf, 0x20, 0xab0, 0xac2, 0xaaa, 0xabf,
-0xaaf, 0xabe, 0x3b, 0x3b, 0x3b, 0x3b, 0xaad, 0xabe, 0xab0, 0xaa4, 0xac0, 0xaaf, 0x20, 0xab0, 0xac2, 0xaaa, 0xabf, 0xaaf, 0xabe, 0x3b,
-0x4e, 0x61, 0x69, 0x72, 0x61, 0x72, 0x20, 0x4e, 0x61, 0x6a, 0x65, 0x72, 0x69, 0x79, 0x61, 0x3b, 0x3b, 0x4e, 0x61, 0x69,
-0x72, 0x61, 0x72, 0x20, 0x4e, 0x61, 0x6a, 0x65, 0x72, 0x69, 0x79, 0x61, 0x3b, 0x3b, 0x3b, 0x3b, 0x4e, 0x61, 0x69, 0x72,
-0x6f, 0x72, 0x69, 0x6e, 0x20, 0x4e, 0x61, 0x6a, 0x65, 0x72, 0x69, 0x79, 0x61, 0x3b, 0x4b, 0x75, 0x257, 0x69, 0x6e, 0x20,
-0x53, 0x65, 0x66, 0x61, 0x20, 0x6e, 0x61, 0x20, 0x41, 0x66, 0x69, 0x72, 0x6b, 0x61, 0x20, 0x54, 0x61, 0x20, 0x59, 0x61,
-0x6d, 0x6d, 0x61, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x5e9, 0x5e7, 0x5dc, 0x20, 0x5d7, 0x5d3, 0x5e9, 0x3b, 0x3b, 0x5e9,
-0x5e7, 0x5dc, 0x20, 0x5d7, 0x5d3, 0x5e9, 0x3b, 0x5e9, 0x5e7, 0x5dc, 0x5d9, 0x5dd, 0x20, 0x5d7, 0x5d3, 0x5e9, 0x5d9, 0x5dd, 0x3b, 0x3b,
-0x5e9, 0x5e7, 0x5dc, 0x5d9, 0x5dd, 0x20, 0x5d7, 0x5d3, 0x5e9, 0x5d9, 0x5dd, 0x3b, 0x5e9, 0x5e7, 0x5dc, 0x5d9, 0x5dd, 0x20, 0x5d7, 0x5d3,
-0x5e9, 0x5d9, 0x5dd, 0x3b, 0x92d, 0x93e, 0x930, 0x924, 0x940, 0x92f, 0x20, 0x930, 0x941, 0x92a, 0x92f, 0x93e, 0x3b, 0x3b, 0x92d, 0x93e,
-0x930, 0x924, 0x940, 0x92f, 0x20, 0x930, 0x941, 0x92a, 0x92f, 0x93e, 0x3b, 0x3b, 0x3b, 0x3b, 0x92d, 0x93e, 0x930, 0x924, 0x940, 0x92f,
-0x20, 0x930, 0x941, 0x92a, 0x90f, 0x3b, 0x6d, 0x61, 0x67, 0x79, 0x61, 0x72, 0x20, 0x66, 0x6f, 0x72, 0x69, 0x6e, 0x74, 0x3b,
-0x3b, 0x6d, 0x61, 0x67, 0x79, 0x61, 0x72, 0x20, 0x66, 0x6f, 0x72, 0x69, 0x6e, 0x74, 0x3b, 0x3b, 0x3b, 0x3b, 0x6d, 0x61,
-0x67, 0x79, 0x61, 0x72, 0x20, 0x66, 0x6f, 0x72, 0x69, 0x6e, 0x74, 0x3b, 0xed, 0x73, 0x6c, 0x65, 0x6e, 0x73, 0x6b, 0x20,
-0x6b, 0x72, 0xf3, 0x6e, 0x61, 0x3b, 0x3b, 0xed, 0x73, 0x6c, 0x65, 0x6e, 0x73, 0x6b, 0x20, 0x6b, 0x72, 0xf3, 0x6e, 0x61,
-0x3b, 0x3b, 0x3b, 0x3b, 0xed, 0x73, 0x6c, 0x65, 0x6e, 0x73, 0x6b, 0x61, 0x72, 0x20, 0x6b, 0x72, 0xf3, 0x6e, 0x75, 0x72,
-0x3b, 0x52, 0x75, 0x70, 0x69, 0x61, 0x68, 0x20, 0x49, 0x6e, 0x64, 0x6f, 0x6e, 0x65, 0x73, 0x69, 0x61, 0x3b, 0x3b, 0x3b,
-0x3b, 0x3b, 0x3b, 0x52, 0x75, 0x70, 0x69, 0x61, 0x68, 0x20, 0x49, 0x6e, 0x64, 0x6f, 0x6e, 0x65, 0x73, 0x69, 0x61, 0x3b,
-0x45, 0x75, 0x72, 0x6f, 0x3b, 0x3b, 0x65, 0x75, 0x72, 0x6f, 0x3b, 0x65, 0x75, 0x72, 0x6f, 0x3b, 0x65, 0x75, 0x72, 0x6f,
-0x3b, 0x65, 0x75, 0x72, 0x6f, 0x3b, 0x65, 0x75, 0x72, 0x6f, 0x3b, 0x50, 0x75, 0x6e, 0x74, 0x20, 0x53, 0x74, 0x65, 0x69,
-0x72, 0x6c, 0x69, 0x6e, 0x67, 0x3b, 0x3b, 0x70, 0x68, 0x75, 0x6e, 0x74, 0x20, 0x73, 0x74, 0x65, 0x69, 0x72, 0x6c, 0x69,
-0x6e, 0x67, 0x3b, 0x70, 0x68, 0x75, 0x6e, 0x74, 0x20, 0x73, 0x74, 0x65, 0x69, 0x72, 0x6c, 0x69, 0x6e, 0x67, 0x3b, 0x70,
-0x68, 0x75, 0x6e, 0x74, 0x20, 0x73, 0x74, 0x65, 0x69, 0x72, 0x6c, 0x69, 0x6e, 0x67, 0x3b, 0x62, 0x70, 0x75, 0x6e, 0x74,
-0x20, 0x73, 0x74, 0x65, 0x69, 0x72, 0x6c, 0x69, 0x6e, 0x67, 0x3b, 0x70, 0x75, 0x6e, 0x74, 0x20, 0x73, 0x74, 0x65, 0x69,
-0x72, 0x6c, 0x69, 0x6e, 0x67, 0x3b, 0x65, 0x75, 0x72, 0x6f, 0x3b, 0x3b, 0x65, 0x75, 0x72, 0x6f, 0x3b, 0x3b, 0x3b, 0x3b,
-0x65, 0x75, 0x72, 0x6f, 0x3b, 0x66, 0x72, 0x61, 0x6e, 0x63, 0x6f, 0x20, 0x73, 0x76, 0x69, 0x7a, 0x7a, 0x65, 0x72, 0x6f,
-0x3b, 0x3b, 0x66, 0x72, 0x61, 0x6e, 0x63, 0x6f, 0x20, 0x73, 0x76, 0x69, 0x7a, 0x7a, 0x65, 0x72, 0x6f, 0x3b, 0x3b, 0x3b,
-0x3b, 0x66, 0x72, 0x61, 0x6e, 0x63, 0x68, 0x69, 0x20, 0x73, 0x76, 0x69, 0x7a, 0x7a, 0x65, 0x72, 0x69, 0x3b, 0x65e5, 0x672c,
-0x5186, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x5186, 0x3b, 0xcad, 0xcbe, 0xcb0, 0xca4, 0xcc0, 0xcaf, 0x20, 0xcb0, 0xcc2, 0xcaa, 0xcbe,
-0xcaf, 0xcbf, 0x3b, 0x3b, 0xcad, 0xcbe, 0xcb0, 0xca4, 0xcc0, 0xcaf, 0x20, 0xcb0, 0xcc2, 0xcaa, 0xcbe, 0xcaf, 0xcbf, 0x3b, 0x3b, 0x3b,
-0x3b, 0xcad, 0xcbe, 0xcb0, 0xca4, 0xcc0, 0xcaf, 0x20, 0xcb0, 0xcc2, 0xcaa, 0xcbe, 0xcaf, 0xcbf, 0xc97, 0xcb3, 0xcc1, 0x3b, 0x6c1, 0x650,
-0x646, 0x62f, 0x64f, 0x633, 0x62a, 0x672, 0x646, 0x6cd, 0x20, 0x631, 0x6c4, 0x67e, 0x64e, 0x6d2, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b,
-0x3b, 0x49a, 0x430, 0x437, 0x430, 0x49b, 0x441, 0x442, 0x430, 0x43d, 0x20, 0x442, 0x435, 0x4a3, 0x433, 0x435, 0x441, 0x456, 0x3b, 0x3b,
-0x49a, 0x430, 0x437, 0x430, 0x49b, 0x441, 0x442, 0x430, 0x43d, 0x20, 0x442, 0x435, 0x4a3, 0x433, 0x435, 0x441, 0x456, 0x3b, 0x3b, 0x3b,
-0x3b, 0x49a, 0x430, 0x437, 0x430, 0x49b, 0x441, 0x442, 0x430, 0x43d, 0x20, 0x442, 0x435, 0x4a3, 0x433, 0x435, 0x441, 0x456, 0x3b, 0x41a,
-0x44b, 0x440, 0x433, 0x44b, 0x437, 0x441, 0x442, 0x430, 0x43d, 0x20, 0x441, 0x43e, 0x43c, 0x443, 0x3b, 0x3b, 0x41a, 0x44b, 0x440, 0x433,
-0x44b, 0x437, 0x441, 0x442, 0x430, 0x43d, 0x20, 0x441, 0x43e, 0x43c, 0x443, 0x3b, 0x3b, 0x3b, 0x3b, 0x41a, 0x44b, 0x440, 0x433, 0x44b,
-0x437, 0x441, 0x442, 0x430, 0x43d, 0x20, 0x441, 0x43e, 0x43c, 0x443, 0x3b, 0xb300, 0xd55c, 0xbbfc, 0xad6d, 0x20, 0xc6d0, 0x3b, 0x3b, 0x3b,
-0x3b, 0x3b, 0x3b, 0xb300, 0xd55c, 0xbbfc, 0xad6d, 0x20, 0xc6d0, 0x3b, 0xc870, 0xc120, 0x20, 0xbbfc, 0xc8fc, 0xc8fc, 0xc758, 0x20, 0xc778, 0xbbfc,
-0x20, 0xacf5, 0xd654, 0xad6d, 0x20, 0xc6d0, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0xc870, 0xc120, 0x20, 0xbbfc, 0xc8fc, 0xc8fc, 0xc758, 0x20,
-0xc778, 0xbbfc, 0x20, 0xacf5, 0xd654, 0xad6d, 0x20, 0xc6d0, 0x3b, 0x49, 0x66, 0x61, 0x72, 0x61, 0x6e, 0x67, 0x61, 0x20, 0x72, 0x79,
-0x2019, 0x55, 0x62, 0x75, 0x72, 0x75, 0x6e, 0x64, 0x69, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0xea5, 0xeb2, 0xea7, 0x20,
-0xe81, 0xeb5, 0xe9a, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0xea5, 0xeb2, 0xea7, 0x20, 0xe81, 0xeb5, 0xe9a, 0x3b, 0x65, 0x69, 0x72,
-0x6f, 0x3b, 0x65, 0x69, 0x72, 0x6f, 0x3b, 0x65, 0x69, 0x72, 0x6f, 0x3b, 0x3b, 0x3b, 0x3b, 0x65, 0x69, 0x72, 0x6f, 0x3b,
-0x46, 0x61, 0x6c, 0xe1, 0x6e, 0x67, 0x61, 0x20, 0x79, 0x61, 0x20, 0x4b, 0x6f, 0x6e, 0x67, 0xf3, 0x3b, 0x3b, 0x3b, 0x3b,
-0x3b, 0x3b, 0x3b, 0x4b, 0x77, 0x61, 0x6e, 0x7a, 0x61, 0x20, 0x79, 0x61, 0x20, 0x41, 0x6e, 0x67, 0xf3, 0x6c, 0x61, 0x3b,
-0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x46, 0x61, 0x6c, 0xe1, 0x6e, 0x67, 0x61, 0x20, 0x43, 0x46, 0x41, 0x20, 0x42, 0x45,
-0x41, 0x43, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x45, 0x75, 0x72, 0x61, 0x73, 0x3b, 0x3b, 0x65, 0x75, 0x72, 0x61,
-0x73, 0x3b, 0x3b, 0x65, 0x75, 0x72, 0x61, 0x69, 0x3b, 0x65, 0x75, 0x72, 0x6f, 0x3b, 0x65, 0x75, 0x72, 0x173, 0x3b, 0x41c,
-0x430, 0x43a, 0x435, 0x434, 0x43e, 0x43d, 0x441, 0x43a, 0x438, 0x20, 0x434, 0x435, 0x43d, 0x430, 0x440, 0x3b, 0x3b, 0x41c, 0x430, 0x43a,
-0x435, 0x434, 0x43e, 0x43d, 0x441, 0x43a, 0x438, 0x20, 0x434, 0x435, 0x43d, 0x430, 0x440, 0x3b, 0x3b, 0x3b, 0x3b, 0x41c, 0x430, 0x43a,
-0x435, 0x434, 0x43e, 0x43d, 0x441, 0x43a, 0x438, 0x20, 0x434, 0x435, 0x43d, 0x430, 0x440, 0x438, 0x3b, 0x41, 0x72, 0x69, 0x61, 0x72,
-0x79, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x52, 0x69, 0x6e, 0x67, 0x67, 0x69, 0x74, 0x20, 0x4d, 0x61, 0x6c, 0x61,
-0x79, 0x73, 0x69, 0x61, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x52, 0x69, 0x6e, 0x67, 0x67, 0x69, 0x74, 0x20, 0x4d, 0x61,
-0x6c, 0x61, 0x79, 0x73, 0x69, 0x61, 0x3b, 0x44, 0x6f, 0x6c, 0x61, 0x72, 0x20, 0x42, 0x72, 0x75, 0x6e, 0x65, 0x69, 0x3b,
-0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x44, 0x6f, 0x6c, 0x61, 0x72, 0x20, 0x42, 0x72, 0x75, 0x6e, 0x65, 0x69, 0x3b, 0x44, 0x6f,
-0x6c, 0x61, 0x72, 0x20, 0x53, 0x69, 0x6e, 0x67, 0x61, 0x70, 0x75, 0x72, 0x61, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x44,
-0x6f, 0x6c, 0x61, 0x72, 0x20, 0x53, 0x69, 0x6e, 0x67, 0x61, 0x70, 0x75, 0x72, 0x61, 0x3b, 0xd07, 0xd28, 0xd4d, 0xd24, 0xd4d,
-0xd2f, 0xd7b, 0x20, 0xd30, 0xd42, 0xd2a, 0x3b, 0x3b, 0xd07, 0xd28, 0xd4d, 0xd24, 0xd4d, 0xd2f, 0xd7b, 0x20, 0xd30, 0xd42, 0xd2a, 0x3b,
-0x3b, 0x3b, 0x3b, 0xd07, 0xd28, 0xd4d, 0xd24, 0xd4d, 0xd2f, 0xd7b, 0x20, 0xd30, 0xd42, 0xd2a, 0x3b, 0x65, 0x77, 0x72, 0x6f, 0x3b,
-0x3b, 0x65, 0x77, 0x72, 0x6f, 0x3b, 0x3b, 0x65, 0x77, 0x72, 0x6f, 0x3b, 0x65, 0x77, 0x72, 0x6f, 0x3b, 0x65, 0x77, 0x72,
-0x6f, 0x3b, 0x54, 0x101, 0x72, 0x61, 0x20, 0x6f, 0x20, 0x41, 0x6f, 0x74, 0x65, 0x61, 0x72, 0x6f, 0x61, 0x3b, 0x3b, 0x3b,
-0x3b, 0x3b, 0x3b, 0x74, 0x101, 0x72, 0x61, 0x20, 0x6f, 0x20, 0x41, 0x6f, 0x74, 0x65, 0x61, 0x72, 0x6f, 0x61, 0x3b, 0x92d,
-0x93e, 0x930, 0x924, 0x940, 0x92f, 0x20, 0x930, 0x941, 0x92a, 0x92f, 0x93e, 0x3b, 0x3b, 0x92d, 0x93e, 0x930, 0x924, 0x940, 0x92f, 0x20,
-0x930, 0x941, 0x92a, 0x92f, 0x93e, 0x3b, 0x3b, 0x3b, 0x3b, 0x92d, 0x93e, 0x930, 0x924, 0x940, 0x92f, 0x20, 0x930, 0x941, 0x92a, 0x92f,
-0x947, 0x3b, 0x41c, 0x43e, 0x43d, 0x433, 0x43e, 0x43b, 0x20, 0x442, 0x4e9, 0x433, 0x440, 0x4e9, 0x433, 0x3b, 0x3b, 0x41c, 0x43e, 0x43d,
-0x433, 0x43e, 0x43b, 0x20, 0x442, 0x4e9, 0x433, 0x440, 0x4e9, 0x433, 0x3b, 0x3b, 0x3b, 0x3b, 0x41c, 0x43e, 0x43d, 0x433, 0x43e, 0x43b,
-0x20, 0x442, 0x4e9, 0x433, 0x440, 0x4e9, 0x433, 0x3b, 0x928, 0x947, 0x92a, 0x93e, 0x932, 0x940, 0x20, 0x930, 0x942, 0x92a, 0x948, 0x92f,
-0x93e, 0x901, 0x3b, 0x3b, 0x928, 0x947, 0x92a, 0x93e, 0x932, 0x940, 0x20, 0x930, 0x942, 0x92a, 0x948, 0x92f, 0x93e, 0x901, 0x3b, 0x3b,
-0x3b, 0x3b, 0x928, 0x947, 0x92a, 0x93e, 0x932, 0x940, 0x20, 0x930, 0x942, 0x92a, 0x948, 0x92f, 0x93e, 0x901, 0x3b, 0x92d, 0x93e, 0x930,
+0x68, 0x61, 0xef, 0x74, 0x69, 0x65, 0x6e, 0x6e, 0x65, 0x73, 0x61, 0x72, 0x69, 0x61, 0x72, 0x79, 0x20, 0x6d, 0x61, 0x6c,
+0x67, 0x61, 0x63, 0x68, 0x65, 0x3b, 0x3b, 0x61, 0x72, 0x69, 0x61, 0x72, 0x79, 0x20, 0x6d, 0x61, 0x6c, 0x67, 0x61, 0x63,
+0x68, 0x65, 0x3b, 0x3b, 0x3b, 0x3b, 0x61, 0x72, 0x69, 0x61, 0x72, 0x79, 0x73, 0x20, 0x6d, 0x61, 0x6c, 0x67, 0x61, 0x63,
+0x68, 0x65, 0x73, 0x6f, 0x75, 0x67, 0x75, 0x69, 0x79, 0x61, 0x20, 0x6d, 0x61, 0x75, 0x72, 0x69, 0x74, 0x61, 0x6e, 0x69,
+0x65, 0x6e, 0x3b, 0x3b, 0x6f, 0x75, 0x67, 0x75, 0x69, 0x79, 0x61, 0x20, 0x6d, 0x61, 0x75, 0x72, 0x69, 0x74, 0x61, 0x6e,
+0x69, 0x65, 0x6e, 0x3b, 0x3b, 0x3b, 0x3b, 0x6f, 0x75, 0x67, 0x75, 0x69, 0x79, 0x61, 0x73, 0x20, 0x6d, 0x61, 0x75, 0x72,
+0x69, 0x74, 0x61, 0x6e, 0x69, 0x65, 0x6e, 0x73, 0x72, 0x6f, 0x75, 0x70, 0x69, 0x65, 0x20, 0x6d, 0x61, 0x75, 0x72, 0x69,
+0x63, 0x69, 0x65, 0x6e, 0x6e, 0x65, 0x3b, 0x3b, 0x72, 0x6f, 0x75, 0x70, 0x69, 0x65, 0x20, 0x6d, 0x61, 0x75, 0x72, 0x69,
+0x63, 0x69, 0x65, 0x6e, 0x6e, 0x65, 0x3b, 0x3b, 0x3b, 0x3b, 0x72, 0x6f, 0x75, 0x70, 0x69, 0x65, 0x73, 0x20, 0x6d, 0x61,
+0x75, 0x72, 0x69, 0x63, 0x69, 0x65, 0x6e, 0x6e, 0x65, 0x73, 0x64, 0x69, 0x72, 0x68, 0x61, 0x6d, 0x20, 0x6d, 0x61, 0x72,
+0x6f, 0x63, 0x61, 0x69, 0x6e, 0x3b, 0x3b, 0x64, 0x69, 0x72, 0x68, 0x61, 0x6d, 0x20, 0x6d, 0x61, 0x72, 0x6f, 0x63, 0x61,
+0x69, 0x6e, 0x3b, 0x3b, 0x3b, 0x3b, 0x64, 0x69, 0x72, 0x68, 0x61, 0x6d, 0x73, 0x20, 0x6d, 0x61, 0x72, 0x6f, 0x63, 0x61,
+0x69, 0x6e, 0x73, 0x66, 0x72, 0x61, 0x6e, 0x63, 0x20, 0x72, 0x77, 0x61, 0x6e, 0x64, 0x61, 0x69, 0x73, 0x3b, 0x3b, 0x66,
+0x72, 0x61, 0x6e, 0x63, 0x20, 0x72, 0x77, 0x61, 0x6e, 0x64, 0x61, 0x69, 0x73, 0x3b, 0x3b, 0x3b, 0x3b, 0x66, 0x72, 0x61,
+0x6e, 0x63, 0x73, 0x20, 0x72, 0x77, 0x61, 0x6e, 0x64, 0x61, 0x69, 0x73, 0x72, 0x6f, 0x75, 0x70, 0x69, 0x65, 0x20, 0x64,
+0x65, 0x73, 0x20, 0x53, 0x65, 0x79, 0x63, 0x68, 0x65, 0x6c, 0x6c, 0x65, 0x73, 0x3b, 0x3b, 0x72, 0x6f, 0x75, 0x70, 0x69,
+0x65, 0x20, 0x64, 0x65, 0x73, 0x20, 0x53, 0x65, 0x79, 0x63, 0x68, 0x65, 0x6c, 0x6c, 0x65, 0x73, 0x3b, 0x3b, 0x3b, 0x3b,
+0x72, 0x6f, 0x75, 0x70, 0x69, 0x65, 0x73, 0x20, 0x64, 0x65, 0x73, 0x20, 0x53, 0x65, 0x79, 0x63, 0x68, 0x65, 0x6c, 0x6c,
+0x65, 0x73, 0x66, 0x72, 0x61, 0x6e, 0x63, 0x20, 0x73, 0x75, 0x69, 0x73, 0x73, 0x65, 0x3b, 0x3b, 0x66, 0x72, 0x61, 0x6e,
+0x63, 0x20, 0x73, 0x75, 0x69, 0x73, 0x73, 0x65, 0x3b, 0x3b, 0x3b, 0x3b, 0x66, 0x72, 0x61, 0x6e, 0x63, 0x73, 0x20, 0x73,
+0x75, 0x69, 0x73, 0x73, 0x65, 0x73, 0x6c, 0x69, 0x76, 0x72, 0x65, 0x20, 0x73, 0x79, 0x72, 0x69, 0x65, 0x6e, 0x6e, 0x65,
+0x3b, 0x3b, 0x6c, 0x69, 0x76, 0x72, 0x65, 0x20, 0x73, 0x79, 0x72, 0x69, 0x65, 0x6e, 0x6e, 0x65, 0x3b, 0x3b, 0x3b, 0x3b,
+0x6c, 0x69, 0x76, 0x72, 0x65, 0x73, 0x20, 0x73, 0x79, 0x72, 0x69, 0x65, 0x6e, 0x6e, 0x65, 0x73, 0x64, 0x69, 0x6e, 0x61,
+0x72, 0x20, 0x74, 0x75, 0x6e, 0x69, 0x73, 0x69, 0x65, 0x6e, 0x3b, 0x3b, 0x64, 0x69, 0x6e, 0x61, 0x72, 0x20, 0x74, 0x75,
+0x6e, 0x69, 0x73, 0x69, 0x65, 0x6e, 0x3b, 0x3b, 0x3b, 0x3b, 0x64, 0x69, 0x6e, 0x61, 0x72, 0x73, 0x20, 0x74, 0x75, 0x6e,
+0x69, 0x73, 0x69, 0x65, 0x6e, 0x73, 0x76, 0x61, 0x74, 0x75, 0x20, 0x76, 0x61, 0x6e, 0x75, 0x61, 0x74, 0x75, 0x61, 0x6e,
+0x3b, 0x3b, 0x76, 0x61, 0x74, 0x75, 0x20, 0x76, 0x61, 0x6e, 0x75, 0x61, 0x74, 0x75, 0x61, 0x6e, 0x3b, 0x3b, 0x3b, 0x3b,
+0x76, 0x61, 0x74, 0x75, 0x73, 0x20, 0x76, 0x61, 0x6e, 0x75, 0x61, 0x74, 0x75, 0x61, 0x6e, 0x73, 0x50, 0x75, 0x6e, 0x6e,
+0x64, 0x20, 0x53, 0x61, 0x73, 0x61, 0x6e, 0x6e, 0x61, 0x63, 0x68, 0x3b, 0x3b, 0x70, 0x68, 0x75, 0x6e, 0x6e, 0x64, 0x20,
+0x53, 0x61, 0x73, 0x61, 0x6e, 0x6e, 0x61, 0x63, 0x68, 0x3b, 0x70, 0x68, 0x75, 0x6e, 0x6e, 0x64, 0x20, 0x53, 0x61, 0x73,
+0x61, 0x6e, 0x6e, 0x61, 0x63, 0x68, 0x3b, 0x70, 0x75, 0x69, 0x6e, 0x6e, 0x64, 0x20, 0x53, 0x68, 0x61, 0x73, 0x61, 0x6e,
+0x6e, 0x61, 0x63, 0x68, 0x3b, 0x3b, 0x70, 0x75, 0x6e, 0x6e, 0x64, 0x20, 0x53, 0x61, 0x73, 0x61, 0x6e, 0x6e, 0x61, 0x63,
+0x68, 0x10e5, 0x10d0, 0x10e0, 0x10d7, 0x10e3, 0x10da, 0x10d8, 0x20, 0x10da, 0x10d0, 0x10e0, 0x10d8, 0x3b, 0x3b, 0x10e5, 0x10d0, 0x10e0, 0x10d7, 0x10e3,
+0x10da, 0x10d8, 0x20, 0x10da, 0x10d0, 0x10e0, 0x10d8, 0x3b, 0x3b, 0x3b, 0x3b, 0x10e5, 0x10d0, 0x10e0, 0x10d7, 0x10e3, 0x10da, 0x10d8, 0x20, 0x10da,
+0x10d0, 0x10e0, 0x10d8, 0x45, 0x75, 0x72, 0x6f, 0x3b, 0x3b, 0x45, 0x75, 0x72, 0x6f, 0x3b, 0x3b, 0x3b, 0x3b, 0x45, 0x75, 0x72,
+0x6f, 0x53, 0x63, 0x68, 0x77, 0x65, 0x69, 0x7a, 0x65, 0x72, 0x20, 0x46, 0x72, 0x61, 0x6e, 0x6b, 0x65, 0x6e, 0x3b, 0x3b,
+0x53, 0x63, 0x68, 0x77, 0x65, 0x69, 0x7a, 0x65, 0x72, 0x20, 0x46, 0x72, 0x61, 0x6e, 0x6b, 0x65, 0x6e, 0x3b, 0x3b, 0x3b,
+0x3b, 0x53, 0x63, 0x68, 0x77, 0x65, 0x69, 0x7a, 0x65, 0x72, 0x20, 0x46, 0x72, 0x61, 0x6e, 0x6b, 0x65, 0x6e, 0x395, 0x3c5,
+0x3c1, 0x3ce, 0x3b, 0x3b, 0x3b5, 0x3c5, 0x3c1, 0x3ce, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b5, 0x3c5, 0x3c1, 0x3ce, 0x64, 0x61, 0x6e, 0x6d,
+0x61, 0x72, 0x6b, 0x69, 0x6d, 0x75, 0x74, 0x20, 0x6b, 0x6f, 0x72, 0x75, 0x75, 0x6e, 0x69, 0x3b, 0x3b, 0x64, 0x61, 0x6e,
+0x73, 0x6b, 0x69, 0x6e, 0x75, 0x74, 0x20, 0x6b, 0x6f, 0x72, 0x75, 0x75, 0x6e, 0x69, 0x3b, 0x3b, 0x3b, 0x3b, 0x64, 0x61,
+0x6e, 0x6d, 0x61, 0x72, 0x6b, 0x69, 0x6d, 0x75, 0x74, 0x20, 0x6b, 0x6f, 0x72, 0x75, 0x75, 0x6e, 0x69, 0xaad, 0xabe, 0xab0,
+0xaa4, 0xac0, 0xaaf, 0x20, 0xab0, 0xac2, 0xaaa, 0xabf, 0xaaf, 0xabe, 0x3b, 0x3b, 0xaad, 0xabe, 0xab0, 0xaa4, 0xac0, 0xaaf, 0x20, 0xab0,
+0xac2, 0xaaa, 0xabf, 0xaaf, 0xabe, 0x3b, 0x3b, 0x3b, 0x3b, 0xaad, 0xabe, 0xab0, 0xaa4, 0xac0, 0xaaf, 0x20, 0xab0, 0xac2, 0xaaa, 0xabf,
+0xaaf, 0xabe, 0x4e, 0x61, 0x69, 0x72, 0x61, 0x72, 0x20, 0x4e, 0x61, 0x6a, 0x65, 0x72, 0x69, 0x79, 0x61, 0x3b, 0x3b, 0x4e,
+0x61, 0x69, 0x72, 0x61, 0x72, 0x20, 0x4e, 0x61, 0x6a, 0x65, 0x72, 0x69, 0x79, 0x61, 0x3b, 0x3b, 0x3b, 0x3b, 0x4e, 0x61,
+0x69, 0x72, 0x6f, 0x72, 0x69, 0x6e, 0x20, 0x4e, 0x61, 0x6a, 0x65, 0x72, 0x69, 0x79, 0x61, 0x4b, 0x75, 0x257, 0x69, 0x6e,
+0x20, 0x53, 0x65, 0x66, 0x61, 0x20, 0x6e, 0x61, 0x20, 0x41, 0x66, 0x69, 0x72, 0x6b, 0x61, 0x20, 0x54, 0x61, 0x20, 0x59,
+0x61, 0x6d, 0x6d, 0x61, 0x5e9, 0x5e7, 0x5dc, 0x20, 0x5d7, 0x5d3, 0x5e9, 0x3b, 0x3b, 0x5e9, 0x5e7, 0x5dc, 0x20, 0x5d7, 0x5d3, 0x5e9,
+0x3b, 0x5e9, 0x5e7, 0x5dc, 0x5d9, 0x5dd, 0x20, 0x5d7, 0x5d3, 0x5e9, 0x5d9, 0x5dd, 0x3b, 0x3b, 0x5e9, 0x5e7, 0x5dc, 0x5d9, 0x5dd, 0x20,
+0x5d7, 0x5d3, 0x5e9, 0x5d9, 0x5dd, 0x3b, 0x5e9, 0x5e7, 0x5dc, 0x5d9, 0x5dd, 0x20, 0x5d7, 0x5d3, 0x5e9, 0x5d9, 0x5dd, 0x92d, 0x93e, 0x930,
+0x924, 0x940, 0x92f, 0x20, 0x930, 0x941, 0x92a, 0x92f, 0x93e, 0x3b, 0x3b, 0x92d, 0x93e, 0x930, 0x924, 0x940, 0x92f, 0x20, 0x930, 0x941,
+0x92a, 0x92f, 0x93e, 0x3b, 0x3b, 0x3b, 0x3b, 0x92d, 0x93e, 0x930, 0x924, 0x940, 0x92f, 0x20, 0x930, 0x941, 0x92a, 0x90f, 0x6d, 0x61,
+0x67, 0x79, 0x61, 0x72, 0x20, 0x66, 0x6f, 0x72, 0x69, 0x6e, 0x74, 0x3b, 0x3b, 0x6d, 0x61, 0x67, 0x79, 0x61, 0x72, 0x20,
+0x66, 0x6f, 0x72, 0x69, 0x6e, 0x74, 0x3b, 0x3b, 0x3b, 0x3b, 0x6d, 0x61, 0x67, 0x79, 0x61, 0x72, 0x20, 0x66, 0x6f, 0x72,
+0x69, 0x6e, 0x74, 0xed, 0x73, 0x6c, 0x65, 0x6e, 0x73, 0x6b, 0x20, 0x6b, 0x72, 0xf3, 0x6e, 0x61, 0x3b, 0x3b, 0xed, 0x73,
+0x6c, 0x65, 0x6e, 0x73, 0x6b, 0x20, 0x6b, 0x72, 0xf3, 0x6e, 0x61, 0x3b, 0x3b, 0x3b, 0x3b, 0xed, 0x73, 0x6c, 0x65, 0x6e,
+0x73, 0x6b, 0x61, 0x72, 0x20, 0x6b, 0x72, 0xf3, 0x6e, 0x75, 0x72, 0x52, 0x75, 0x70, 0x69, 0x61, 0x68, 0x20, 0x49, 0x6e,
+0x64, 0x6f, 0x6e, 0x65, 0x73, 0x69, 0x61, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x52, 0x75, 0x70, 0x69, 0x61, 0x68, 0x20,
+0x49, 0x6e, 0x64, 0x6f, 0x6e, 0x65, 0x73, 0x69, 0x61, 0x45, 0x75, 0x72, 0x6f, 0x3b, 0x3b, 0x65, 0x75, 0x72, 0x6f, 0x3b,
+0x65, 0x75, 0x72, 0x6f, 0x3b, 0x65, 0x75, 0x72, 0x6f, 0x3b, 0x65, 0x75, 0x72, 0x6f, 0x3b, 0x65, 0x75, 0x72, 0x6f, 0x50,
+0x75, 0x6e, 0x74, 0x20, 0x53, 0x74, 0x65, 0x69, 0x72, 0x6c, 0x69, 0x6e, 0x67, 0x3b, 0x3b, 0x70, 0x68, 0x75, 0x6e, 0x74,
+0x20, 0x73, 0x74, 0x65, 0x69, 0x72, 0x6c, 0x69, 0x6e, 0x67, 0x3b, 0x70, 0x68, 0x75, 0x6e, 0x74, 0x20, 0x73, 0x74, 0x65,
+0x69, 0x72, 0x6c, 0x69, 0x6e, 0x67, 0x3b, 0x70, 0x68, 0x75, 0x6e, 0x74, 0x20, 0x73, 0x74, 0x65, 0x69, 0x72, 0x6c, 0x69,
+0x6e, 0x67, 0x3b, 0x62, 0x70, 0x75, 0x6e, 0x74, 0x20, 0x73, 0x74, 0x65, 0x69, 0x72, 0x6c, 0x69, 0x6e, 0x67, 0x3b, 0x70,
+0x75, 0x6e, 0x74, 0x20, 0x73, 0x74, 0x65, 0x69, 0x72, 0x6c, 0x69, 0x6e, 0x67, 0x66, 0x72, 0x61, 0x6e, 0x63, 0x6f, 0x20,
+0x73, 0x76, 0x69, 0x7a, 0x7a, 0x65, 0x72, 0x6f, 0x3b, 0x3b, 0x66, 0x72, 0x61, 0x6e, 0x63, 0x6f, 0x20, 0x73, 0x76, 0x69,
+0x7a, 0x7a, 0x65, 0x72, 0x6f, 0x3b, 0x3b, 0x3b, 0x3b, 0x66, 0x72, 0x61, 0x6e, 0x63, 0x68, 0x69, 0x20, 0x73, 0x76, 0x69,
+0x7a, 0x7a, 0x65, 0x72, 0x69, 0x65e5, 0x672c, 0x5186, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x5186, 0xcad, 0xcbe, 0xcb0, 0xca4, 0xcc0,
+0xcaf, 0x20, 0xcb0, 0xcc2, 0xcaa, 0xcbe, 0xcaf, 0xcbf, 0x3b, 0x3b, 0xcad, 0xcbe, 0xcb0, 0xca4, 0xcc0, 0xcaf, 0x20, 0xcb0, 0xcc2, 0xcaa,
+0xcbe, 0xcaf, 0xcbf, 0x3b, 0x3b, 0x3b, 0x3b, 0xcad, 0xcbe, 0xcb0, 0xca4, 0xcc0, 0xcaf, 0x20, 0xcb0, 0xcc2, 0xcaa, 0xcbe, 0xcaf, 0xcbf,
+0xc97, 0xcb3, 0xcc1, 0x6c1, 0x650, 0x646, 0x62f, 0x64f, 0x633, 0x62a, 0x672, 0x646, 0x6cd, 0x20, 0x631, 0x6c4, 0x67e, 0x64e, 0x6d2, 0x49a,
+0x430, 0x437, 0x430, 0x49b, 0x441, 0x442, 0x430, 0x43d, 0x20, 0x442, 0x435, 0x4a3, 0x433, 0x435, 0x441, 0x456, 0x3b, 0x3b, 0x49a, 0x430,
+0x437, 0x430, 0x49b, 0x441, 0x442, 0x430, 0x43d, 0x20, 0x442, 0x435, 0x4a3, 0x433, 0x435, 0x441, 0x456, 0x3b, 0x3b, 0x3b, 0x3b, 0x49a,
+0x430, 0x437, 0x430, 0x49b, 0x441, 0x442, 0x430, 0x43d, 0x20, 0x442, 0x435, 0x4a3, 0x433, 0x435, 0x441, 0x456, 0x41a, 0x44b, 0x440, 0x433,
+0x44b, 0x437, 0x441, 0x442, 0x430, 0x43d, 0x20, 0x441, 0x43e, 0x43c, 0x443, 0x3b, 0x3b, 0x41a, 0x44b, 0x440, 0x433, 0x44b, 0x437, 0x441,
+0x442, 0x430, 0x43d, 0x20, 0x441, 0x43e, 0x43c, 0x443, 0x3b, 0x3b, 0x3b, 0x3b, 0x41a, 0x44b, 0x440, 0x433, 0x44b, 0x437, 0x441, 0x442,
+0x430, 0x43d, 0x20, 0x441, 0x43e, 0x43c, 0x443, 0xb300, 0xd55c, 0xbbfc, 0xad6d, 0x20, 0xc6d0, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0xb300,
+0xd55c, 0xbbfc, 0xad6d, 0x20, 0xc6d0, 0xc870, 0xc120, 0x20, 0xbbfc, 0xc8fc, 0xc8fc, 0xc758, 0x20, 0xc778, 0xbbfc, 0x20, 0xacf5, 0xd654, 0xad6d, 0x20,
+0xc6d0, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0xc870, 0xc120, 0x20, 0xbbfc, 0xc8fc, 0xc8fc, 0xc758, 0x20, 0xc778, 0xbbfc, 0x20, 0xacf5, 0xd654,
+0xad6d, 0x20, 0xc6d0, 0x49, 0x66, 0x61, 0x72, 0x61, 0x6e, 0x67, 0x61, 0x20, 0x72, 0x79, 0x2019, 0x55, 0x62, 0x75, 0x72, 0x75,
+0x6e, 0x64, 0x69, 0xea5, 0xeb2, 0xea7, 0x20, 0xe81, 0xeb5, 0xe9a, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0xea5, 0xeb2, 0xea7, 0x20,
+0xe81, 0xeb5, 0xe9a, 0x65, 0x69, 0x72, 0x6f, 0x3b, 0x65, 0x69, 0x72, 0x6f, 0x3b, 0x65, 0x69, 0x72, 0x6f, 0x3b, 0x3b, 0x3b,
+0x3b, 0x65, 0x69, 0x72, 0x6f, 0x46, 0x61, 0x6c, 0xe1, 0x6e, 0x67, 0x61, 0x20, 0x79, 0x61, 0x20, 0x4b, 0x6f, 0x6e, 0x67,
+0xf3, 0x4b, 0x77, 0x61, 0x6e, 0x7a, 0x61, 0x20, 0x79, 0x61, 0x20, 0x41, 0x6e, 0x67, 0xf3, 0x6c, 0x61, 0x46, 0x61, 0x6c,
+0xe1, 0x6e, 0x67, 0x61, 0x20, 0x43, 0x46, 0x41, 0x20, 0x42, 0x45, 0x41, 0x43, 0x45, 0x75, 0x72, 0x61, 0x73, 0x3b, 0x3b,
+0x65, 0x75, 0x72, 0x61, 0x73, 0x3b, 0x3b, 0x65, 0x75, 0x72, 0x61, 0x69, 0x3b, 0x65, 0x75, 0x72, 0x6f, 0x3b, 0x65, 0x75,
+0x72, 0x173, 0x41c, 0x430, 0x43a, 0x435, 0x434, 0x43e, 0x43d, 0x441, 0x43a, 0x438, 0x20, 0x434, 0x435, 0x43d, 0x430, 0x440, 0x3b, 0x3b,
+0x41c, 0x430, 0x43a, 0x435, 0x434, 0x43e, 0x43d, 0x441, 0x43a, 0x438, 0x20, 0x434, 0x435, 0x43d, 0x430, 0x440, 0x3b, 0x3b, 0x3b, 0x3b,
+0x41c, 0x430, 0x43a, 0x435, 0x434, 0x43e, 0x43d, 0x441, 0x43a, 0x438, 0x20, 0x434, 0x435, 0x43d, 0x430, 0x440, 0x438, 0x52, 0x69, 0x6e,
+0x67, 0x67, 0x69, 0x74, 0x20, 0x4d, 0x61, 0x6c, 0x61, 0x79, 0x73, 0x69, 0x61, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x52,
+0x69, 0x6e, 0x67, 0x67, 0x69, 0x74, 0x20, 0x4d, 0x61, 0x6c, 0x61, 0x79, 0x73, 0x69, 0x61, 0x44, 0x6f, 0x6c, 0x61, 0x72,
+0x20, 0x42, 0x72, 0x75, 0x6e, 0x65, 0x69, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x44, 0x6f, 0x6c, 0x61, 0x72, 0x20, 0x42,
+0x72, 0x75, 0x6e, 0x65, 0x69, 0x44, 0x6f, 0x6c, 0x61, 0x72, 0x20, 0x53, 0x69, 0x6e, 0x67, 0x61, 0x70, 0x75, 0x72, 0x61,
+0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x44, 0x6f, 0x6c, 0x61, 0x72, 0x20, 0x53, 0x69, 0x6e, 0x67, 0x61, 0x70, 0x75, 0x72,
+0x61, 0xd07, 0xd28, 0xd4d, 0xd24, 0xd4d, 0xd2f, 0xd7b, 0x20, 0xd30, 0xd42, 0xd2a, 0x3b, 0x3b, 0xd07, 0xd28, 0xd4d, 0xd24, 0xd4d, 0xd2f,
+0xd7b, 0x20, 0xd30, 0xd42, 0xd2a, 0x3b, 0x3b, 0x3b, 0x3b, 0xd07, 0xd28, 0xd4d, 0xd24, 0xd4d, 0xd2f, 0xd7b, 0x20, 0xd30, 0xd42, 0xd2a,
+0x65, 0x77, 0x72, 0x6f, 0x3b, 0x3b, 0x65, 0x77, 0x72, 0x6f, 0x3b, 0x3b, 0x65, 0x77, 0x72, 0x6f, 0x3b, 0x65, 0x77, 0x72,
+0x6f, 0x3b, 0x65, 0x77, 0x72, 0x6f, 0x54, 0x101, 0x72, 0x61, 0x20, 0x6f, 0x20, 0x41, 0x6f, 0x74, 0x65, 0x61, 0x72, 0x6f,
+0x61, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x74, 0x101, 0x72, 0x61, 0x20, 0x6f, 0x20, 0x41, 0x6f, 0x74, 0x65, 0x61, 0x72,
+0x6f, 0x61, 0x92d, 0x93e, 0x930, 0x924, 0x940, 0x92f, 0x20, 0x930, 0x941, 0x92a, 0x92f, 0x93e, 0x3b, 0x3b, 0x92d, 0x93e, 0x930, 0x924,
+0x940, 0x92f, 0x20, 0x930, 0x941, 0x92a, 0x92f, 0x93e, 0x3b, 0x3b, 0x3b, 0x3b, 0x92d, 0x93e, 0x930, 0x924, 0x940, 0x92f, 0x20, 0x930,
+0x941, 0x92a, 0x92f, 0x947, 0x41c, 0x43e, 0x43d, 0x433, 0x43e, 0x43b, 0x20, 0x442, 0x4e9, 0x433, 0x440, 0x4e9, 0x433, 0x3b, 0x3b, 0x41c,
+0x43e, 0x43d, 0x433, 0x43e, 0x43b, 0x20, 0x442, 0x4e9, 0x433, 0x440, 0x4e9, 0x433, 0x3b, 0x3b, 0x3b, 0x3b, 0x41c, 0x43e, 0x43d, 0x433,
+0x43e, 0x43b, 0x20, 0x442, 0x4e9, 0x433, 0x440, 0x4e9, 0x433, 0x928, 0x947, 0x92a, 0x93e, 0x932, 0x940, 0x20, 0x930, 0x942, 0x92a, 0x948,
+0x92f, 0x93e, 0x901, 0x3b, 0x3b, 0x928, 0x947, 0x92a, 0x93e, 0x932, 0x940, 0x20, 0x930, 0x942, 0x92a, 0x948, 0x92f, 0x93e, 0x901, 0x3b,
+0x3b, 0x3b, 0x3b, 0x928, 0x947, 0x92a, 0x93e, 0x932, 0x940, 0x20, 0x930, 0x942, 0x92a, 0x948, 0x92f, 0x93e, 0x901, 0x92d, 0x93e, 0x930,
 0x924, 0x940, 0x92f, 0x20, 0x930, 0x942, 0x92a, 0x93f, 0x901, 0x92f, 0x93e, 0x3b, 0x3b, 0x92d, 0x93e, 0x930, 0x924, 0x940, 0x92f, 0x20,
 0x930, 0x942, 0x92a, 0x93f, 0x901, 0x92f, 0x93e, 0x3b, 0x3b, 0x3b, 0x3b, 0x92d, 0x93e, 0x930, 0x924, 0x940, 0x92f, 0x20, 0x930, 0x942,
-0x92a, 0x93f, 0x901, 0x92f, 0x93e, 0x3b, 0x6e, 0x6f, 0x72, 0x73, 0x6b, 0x65, 0x20, 0x6b, 0x72, 0x6f, 0x6e, 0x65, 0x72, 0x3b,
-0x3b, 0x6e, 0x6f, 0x72, 0x73, 0x6b, 0x20, 0x6b, 0x72, 0x6f, 0x6e, 0x65, 0x3b, 0x3b, 0x3b, 0x3b, 0x6e, 0x6f, 0x72, 0x73,
-0x6b, 0x65, 0x20, 0x6b, 0x72, 0x6f, 0x6e, 0x65, 0x72, 0x3b, 0xb2d, 0xb3e, 0xb30, 0xb24, 0xb40, 0xb5f, 0x20, 0xb1f, 0xb19, 0xb4d,
-0xb15, 0xb3e, 0x3b, 0x3b, 0xb2d, 0xb3e, 0xb30, 0xb24, 0xb40, 0xb5f, 0x20, 0xb1f, 0xb19, 0xb4d, 0xb15, 0xb3e, 0x3b, 0x3b, 0x3b, 0x3b,
-0xb2d, 0xb3e, 0xb30, 0xb24, 0xb40, 0xb5f, 0x20, 0xb1f, 0xb19, 0xb4d, 0xb15, 0xb3e, 0x3b, 0x627, 0x641, 0x63a, 0x627, 0x646, 0x6cd, 0x3b,
-0x3b, 0x627, 0x641, 0x63a, 0x627, 0x646, 0x6cd, 0x3b, 0x3b, 0x3b, 0x3b, 0x627, 0x641, 0x63a, 0x627, 0x646, 0x6cd, 0x3b, 0x67e, 0x627,
-0x6a9, 0x633, 0x62a, 0x627, 0x646, 0x6cd, 0x20, 0x6a9, 0x644, 0x62f, 0x627, 0x631, 0x647, 0x3b, 0x3b, 0x67e, 0x627, 0x6a9, 0x633, 0x62a,
-0x627, 0x646, 0x6cd, 0x20, 0x6a9, 0x644, 0x62f, 0x627, 0x631, 0x647, 0x3b, 0x3b, 0x3b, 0x3b, 0x67e, 0x627, 0x6a9, 0x633, 0x62a, 0x627,
-0x646, 0x6cd, 0x20, 0x6a9, 0x644, 0x62f, 0x627, 0x631, 0x6d2, 0x3b, 0x631, 0x6cc, 0x627, 0x644, 0x20, 0x627, 0x6cc, 0x631, 0x627, 0x646,
-0x3b, 0x3b, 0x631, 0x6cc, 0x627, 0x644, 0x20, 0x627, 0x6cc, 0x631, 0x627, 0x646, 0x3b, 0x3b, 0x3b, 0x3b, 0x631, 0x6cc, 0x627, 0x644,
-0x20, 0x627, 0x6cc, 0x631, 0x627, 0x646, 0x3b, 0x627, 0x641, 0x63a, 0x627, 0x646, 0x6cc, 0x20, 0x627, 0x641, 0x63a, 0x627, 0x646, 0x633,
-0x62a, 0x627, 0x646, 0x3b, 0x3b, 0x627, 0x641, 0x63a, 0x627, 0x646, 0x6cc, 0x20, 0x627, 0x641, 0x63a, 0x627, 0x646, 0x633, 0x62a, 0x627,
-0x646, 0x3b, 0x3b, 0x3b, 0x3b, 0x627, 0x641, 0x63a, 0x627, 0x646, 0x6cc, 0x20, 0x627, 0x641, 0x63a, 0x627, 0x646, 0x633, 0x62a, 0x627,
-0x646, 0x3b, 0x7a, 0x142, 0x6f, 0x74, 0x79, 0x20, 0x70, 0x6f, 0x6c, 0x73, 0x6b, 0x69, 0x3b, 0x3b, 0x7a, 0x142, 0x6f, 0x74,
-0x79, 0x20, 0x70, 0x6f, 0x6c, 0x73, 0x6b, 0x69, 0x3b, 0x3b, 0x7a, 0x142, 0x6f, 0x74, 0x65, 0x20, 0x70, 0x6f, 0x6c, 0x73,
-0x6b, 0x69, 0x65, 0x3b, 0x7a, 0x142, 0x6f, 0x74, 0x79, 0x63, 0x68, 0x20, 0x70, 0x6f, 0x6c, 0x73, 0x6b, 0x69, 0x63, 0x68,
-0x3b, 0x7a, 0x142, 0x6f, 0x74, 0x65, 0x67, 0x6f, 0x20, 0x70, 0x6f, 0x6c, 0x73, 0x6b, 0x69, 0x65, 0x67, 0x6f, 0x3b, 0x52,
-0x65, 0x61, 0x6c, 0x20, 0x62, 0x72, 0x61, 0x73, 0x69, 0x6c, 0x65, 0x69, 0x72, 0x6f, 0x3b, 0x3b, 0x52, 0x65, 0x61, 0x6c,
-0x20, 0x62, 0x72, 0x61, 0x73, 0x69, 0x6c, 0x65, 0x69, 0x72, 0x6f, 0x3b, 0x3b, 0x3b, 0x3b, 0x52, 0x65, 0x61, 0x69, 0x73,
-0x20, 0x62, 0x72, 0x61, 0x73, 0x69, 0x6c, 0x65, 0x69, 0x72, 0x6f, 0x73, 0x3b, 0x6b, 0x77, 0x61, 0x6e, 0x7a, 0x61, 0x20,
-0x61, 0x6e, 0x67, 0x6f, 0x6c, 0x61, 0x6e, 0x6f, 0x3b, 0x3b, 0x6b, 0x77, 0x61, 0x6e, 0x7a, 0x61, 0x20, 0x61, 0x6e, 0x67,
-0x6f, 0x6c, 0x61, 0x6e, 0x6f, 0x3b, 0x3b, 0x3b, 0x3b, 0x6b, 0x77, 0x61, 0x6e, 0x7a, 0x61, 0x73, 0x20, 0x61, 0x6e, 0x67,
-0x6f, 0x6c, 0x61, 0x6e, 0x6f, 0x73, 0x3b, 0x65, 0x73, 0x63, 0x75, 0x64, 0x6f, 0x20, 0x63, 0x61, 0x62, 0x6f, 0x2d, 0x76,
-0x65, 0x72, 0x64, 0x69, 0x61, 0x6e, 0x6f, 0x3b, 0x3b, 0x65, 0x73, 0x63, 0x75, 0x64, 0x6f, 0x20, 0x63, 0x61, 0x62, 0x6f,
-0x2d, 0x76, 0x65, 0x72, 0x64, 0x69, 0x61, 0x6e, 0x6f, 0x3b, 0x3b, 0x3b, 0x3b, 0x65, 0x73, 0x63, 0x75, 0x64, 0x6f, 0x73,
-0x20, 0x63, 0x61, 0x62, 0x6f, 0x2d, 0x76, 0x65, 0x72, 0x64, 0x69, 0x61, 0x6e, 0x6f, 0x73, 0x3b, 0x64, 0xf3, 0x6c, 0x61,
-0x72, 0x20, 0x64, 0x6f, 0x73, 0x20, 0x45, 0x73, 0x74, 0x61, 0x64, 0x6f, 0x73, 0x20, 0x55, 0x6e, 0x69, 0x64, 0x6f, 0x73,
-0x3b, 0x3b, 0x64, 0xf3, 0x6c, 0x61, 0x72, 0x20, 0x64, 0x6f, 0x73, 0x20, 0x45, 0x73, 0x74, 0x61, 0x64, 0x6f, 0x73, 0x20,
-0x55, 0x6e, 0x69, 0x64, 0x6f, 0x73, 0x3b, 0x3b, 0x3b, 0x3b, 0x64, 0xf3, 0x6c, 0x61, 0x72, 0x65, 0x73, 0x20, 0x64, 0x6f,
-0x73, 0x20, 0x45, 0x73, 0x74, 0x61, 0x64, 0x6f, 0x73, 0x20, 0x55, 0x6e, 0x69, 0x64, 0x6f, 0x73, 0x3b, 0x66, 0x72, 0x61,
-0x6e, 0x63, 0x6f, 0x20, 0x43, 0x46, 0x41, 0x20, 0x28, 0x42, 0x45, 0x41, 0x43, 0x29, 0x3b, 0x3b, 0x66, 0x72, 0x61, 0x6e,
-0x63, 0x6f, 0x20, 0x43, 0x46, 0x41, 0x20, 0x28, 0x42, 0x45, 0x41, 0x43, 0x29, 0x3b, 0x3b, 0x3b, 0x3b, 0x66, 0x72, 0x61,
-0x6e, 0x63, 0x6f, 0x73, 0x20, 0x43, 0x46, 0x41, 0x20, 0x28, 0x42, 0x45, 0x41, 0x43, 0x29, 0x3b, 0x66, 0x72, 0x61, 0x6e,
-0x63, 0x6f, 0x20, 0x43, 0x46, 0x41, 0x20, 0x28, 0x42, 0x43, 0x45, 0x41, 0x4f, 0x29, 0x3b, 0x3b, 0x66, 0x72, 0x61, 0x6e,
-0x63, 0x6f, 0x20, 0x43, 0x46, 0x41, 0x20, 0x28, 0x42, 0x43, 0x45, 0x41, 0x4f, 0x29, 0x3b, 0x3b, 0x3b, 0x3b, 0x66, 0x72,
-0x61, 0x6e, 0x63, 0x6f, 0x73, 0x20, 0x43, 0x46, 0x41, 0x20, 0x28, 0x42, 0x43, 0x45, 0x41, 0x4f, 0x29, 0x3b, 0x70, 0x61,
-0x74, 0x61, 0x63, 0x61, 0x20, 0x6d, 0x61, 0x63, 0x61, 0x65, 0x6e, 0x73, 0x65, 0x3b, 0x3b, 0x70, 0x61, 0x74, 0x61, 0x63,
-0x61, 0x20, 0x6d, 0x61, 0x63, 0x61, 0x65, 0x6e, 0x73, 0x65, 0x3b, 0x3b, 0x3b, 0x3b, 0x70, 0x61, 0x74, 0x61, 0x63, 0x61,
-0x73, 0x20, 0x6d, 0x61, 0x63, 0x61, 0x65, 0x6e, 0x73, 0x65, 0x73, 0x3b, 0x6d, 0x65, 0x74, 0x69, 0x63, 0x61, 0x6c, 0x20,
-0x6d, 0x6f, 0xe7, 0x61, 0x6d, 0x62, 0x69, 0x63, 0x61, 0x6e, 0x6f, 0x3b, 0x3b, 0x6d, 0x65, 0x74, 0x69, 0x63, 0x61, 0x6c,
-0x20, 0x6d, 0x6f, 0xe7, 0x61, 0x6d, 0x62, 0x69, 0x63, 0x61, 0x6e, 0x6f, 0x3b, 0x3b, 0x3b, 0x3b, 0x6d, 0x65, 0x74, 0x69,
-0x63, 0x61, 0x69, 0x73, 0x20, 0x6d, 0x6f, 0xe7, 0x61, 0x6d, 0x62, 0x69, 0x63, 0x61, 0x6e, 0x6f, 0x73, 0x3b, 0x64, 0x6f,
-0x62, 0x72, 0x61, 0x20, 0x64, 0x65, 0x20, 0x53, 0xe3, 0x6f, 0x20, 0x54, 0x6f, 0x6d, 0xe9, 0x20, 0x65, 0x20, 0x50, 0x72,
-0xed, 0x6e, 0x63, 0x69, 0x70, 0x65, 0x3b, 0x3b, 0x64, 0x6f, 0x62, 0x72, 0x61, 0x20, 0x64, 0x65, 0x20, 0x53, 0xe3, 0x6f,
-0x20, 0x54, 0x6f, 0x6d, 0xe9, 0x20, 0x65, 0x20, 0x50, 0x72, 0xed, 0x6e, 0x63, 0x69, 0x70, 0x65, 0x3b, 0x3b, 0x3b, 0x3b,
-0x64, 0x6f, 0x62, 0x72, 0x61, 0x73, 0x20, 0x64, 0x65, 0x20, 0x53, 0xe3, 0x6f, 0x20, 0x54, 0x6f, 0x6d, 0xe9, 0x20, 0x65,
-0x20, 0x50, 0x72, 0xed, 0x6e, 0x63, 0x69, 0x70, 0x65, 0x3b, 0x66, 0x72, 0x61, 0x6e, 0x63, 0x6f, 0x20, 0x73, 0x75, 0xed,
-0xe7, 0x6f, 0x3b, 0x3b, 0x66, 0x72, 0x61, 0x6e, 0x63, 0x6f, 0x20, 0x73, 0x75, 0xed, 0xe7, 0x6f, 0x3b, 0x3b, 0x3b, 0x3b,
-0x66, 0x72, 0x61, 0x6e, 0x63, 0x6f, 0x73, 0x20, 0x73, 0x75, 0xed, 0xe7, 0x6f, 0x73, 0x3b, 0xa2d, 0xa3e, 0xa30, 0xa24, 0xa40,
-0x20, 0xa30, 0xa41, 0xa2a, 0xa07, 0xa06, 0x3b, 0x3b, 0xa2d, 0xa3e, 0xa30, 0xa24, 0xa40, 0x20, 0xa30, 0xa41, 0xa2a, 0xa07, 0xa06, 0x3b,
-0x3b, 0x3b, 0x3b, 0xa2d, 0xa3e, 0xa30, 0xa24, 0xa40, 0x20, 0xa30, 0xa41, 0xa2a, 0xa0f, 0x3b, 0x631, 0x648, 0x67e, 0x626, 0x6cc, 0x6c1,
-0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x53, 0x6f, 0x6c, 0x20, 0x50, 0x65, 0x72, 0x75, 0x61, 0x6e, 0x6f, 0x3b, 0x3b,
-0x3b, 0x3b, 0x3b, 0x3b, 0x53, 0x6f, 0x6c, 0x20, 0x70, 0x65, 0x72, 0x75, 0x61, 0x6e, 0x6f, 0x3b, 0x42, 0x6f, 0x6c, 0x69,
-0x76, 0x69, 0x61, 0x6e, 0x6f, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x42, 0x6f, 0x6c, 0x69, 0x76, 0x69, 0x61, 0x6e, 0x6f,
-0x3b, 0x44, 0xf3, 0x6c, 0x61, 0x72, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x6e, 0x6f, 0x3b, 0x3b, 0x3b, 0x3b,
-0x3b, 0x3b, 0x44, 0xf3, 0x6c, 0x61, 0x72, 0x20, 0x61, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x6e, 0x6f, 0x3b, 0x66, 0x72,
-0x61, 0x6e, 0x63, 0x20, 0x73, 0x76, 0x69, 0x7a, 0x7a, 0x65, 0x72, 0x3b, 0x3b, 0x66, 0x72, 0x61, 0x6e, 0x63, 0x20, 0x73,
-0x76, 0x69, 0x7a, 0x7a, 0x65, 0x72, 0x3b, 0x3b, 0x3b, 0x3b, 0x66, 0x72, 0x61, 0x6e, 0x63, 0x20, 0x73, 0x76, 0x69, 0x7a,
-0x7a, 0x65, 0x72, 0x3b, 0x6c, 0x65, 0x75, 0x20, 0x72, 0x6f, 0x6d, 0xe2, 0x6e, 0x65, 0x73, 0x63, 0x3b, 0x3b, 0x6c, 0x65,
-0x75, 0x20, 0x72, 0x6f, 0x6d, 0xe2, 0x6e, 0x65, 0x73, 0x63, 0x3b, 0x3b, 0x6c, 0x65, 0x69, 0x20, 0x72, 0x6f, 0x6d, 0xe2,
-0x6e, 0x65, 0x219, 0x74, 0x69, 0x3b, 0x3b, 0x6c, 0x65, 0x69, 0x20, 0x72, 0x6f, 0x6d, 0xe2, 0x6e, 0x65, 0x219, 0x74, 0x69,
-0x3b, 0x6c, 0x65, 0x75, 0x20, 0x6d, 0x6f, 0x6c, 0x64, 0x6f, 0x76, 0x65, 0x6e, 0x65, 0x73, 0x63, 0x3b, 0x3b, 0x6c, 0x65,
-0x75, 0x20, 0x6d, 0x6f, 0x6c, 0x64, 0x6f, 0x76, 0x65, 0x6e, 0x65, 0x73, 0x63, 0x3b, 0x3b, 0x6c, 0x65, 0x69, 0x20, 0x6d,
-0x6f, 0x6c, 0x64, 0x6f, 0x76, 0x65, 0x6e, 0x65, 0x219, 0x74, 0x69, 0x3b, 0x3b, 0x6c, 0x65, 0x69, 0x20, 0x6d, 0x6f, 0x6c,
-0x64, 0x6f, 0x76, 0x65, 0x6e, 0x65, 0x219, 0x74, 0x69, 0x3b, 0x440, 0x43e, 0x441, 0x441, 0x438, 0x439, 0x441, 0x43a, 0x438, 0x439,
-0x20, 0x440, 0x443, 0x431, 0x43b, 0x44c, 0x3b, 0x3b, 0x440, 0x43e, 0x441, 0x441, 0x438, 0x439, 0x441, 0x43a, 0x438, 0x439, 0x20, 0x440,
-0x443, 0x431, 0x43b, 0x44c, 0x3b, 0x3b, 0x440, 0x43e, 0x441, 0x441, 0x438, 0x439, 0x441, 0x43a, 0x438, 0x445, 0x20, 0x440, 0x443, 0x431,
-0x43b, 0x44f, 0x3b, 0x440, 0x43e, 0x441, 0x441, 0x438, 0x439, 0x441, 0x43a, 0x438, 0x445, 0x20, 0x440, 0x443, 0x431, 0x43b, 0x435, 0x439,
-0x3b, 0x440, 0x43e, 0x441, 0x441, 0x438, 0x439, 0x441, 0x43a, 0x43e, 0x433, 0x43e, 0x20, 0x440, 0x443, 0x431, 0x43b, 0x44f, 0x3b, 0x431,
-0x435, 0x43b, 0x43e, 0x440, 0x443, 0x441, 0x441, 0x43a, 0x438, 0x439, 0x20, 0x440, 0x443, 0x431, 0x43b, 0x44c, 0x3b, 0x3b, 0x431, 0x435,
-0x43b, 0x43e, 0x440, 0x443, 0x441, 0x441, 0x43a, 0x438, 0x439, 0x20, 0x440, 0x443, 0x431, 0x43b, 0x44c, 0x3b, 0x3b, 0x431, 0x435, 0x43b,
-0x43e, 0x440, 0x443, 0x441, 0x441, 0x43a, 0x438, 0x445, 0x20, 0x440, 0x443, 0x431, 0x43b, 0x44f, 0x3b, 0x431, 0x435, 0x43b, 0x43e, 0x440,
-0x443, 0x441, 0x441, 0x43a, 0x438, 0x445, 0x20, 0x440, 0x443, 0x431, 0x43b, 0x435, 0x439, 0x3b, 0x431, 0x435, 0x43b, 0x43e, 0x440, 0x443,
-0x441, 0x441, 0x43a, 0x43e, 0x433, 0x43e, 0x20, 0x440, 0x443, 0x431, 0x43b, 0x44f, 0x3b, 0x43a, 0x430, 0x437, 0x430, 0x445, 0x441, 0x43a,
-0x438, 0x439, 0x20, 0x442, 0x435, 0x43d, 0x433, 0x435, 0x3b, 0x3b, 0x43a, 0x430, 0x437, 0x430, 0x445, 0x441, 0x43a, 0x438, 0x439, 0x20,
-0x442, 0x435, 0x43d, 0x433, 0x435, 0x3b, 0x3b, 0x43a, 0x430, 0x437, 0x430, 0x445, 0x441, 0x43a, 0x438, 0x445, 0x20, 0x442, 0x435, 0x43d,
-0x433, 0x435, 0x3b, 0x43a, 0x430, 0x437, 0x430, 0x445, 0x441, 0x43a, 0x438, 0x445, 0x20, 0x442, 0x435, 0x43d, 0x433, 0x435, 0x3b, 0x43a,
-0x430, 0x437, 0x430, 0x445, 0x441, 0x43a, 0x43e, 0x433, 0x43e, 0x20, 0x442, 0x435, 0x43d, 0x433, 0x435, 0x3b, 0x43a, 0x438, 0x440, 0x433,
-0x438, 0x437, 0x441, 0x43a, 0x438, 0x439, 0x20, 0x441, 0x43e, 0x43c, 0x3b, 0x3b, 0x43a, 0x438, 0x440, 0x433, 0x438, 0x437, 0x441, 0x43a,
-0x438, 0x439, 0x20, 0x441, 0x43e, 0x43c, 0x3b, 0x3b, 0x43a, 0x438, 0x440, 0x433, 0x438, 0x437, 0x441, 0x43a, 0x438, 0x445, 0x20, 0x441,
-0x43e, 0x43c, 0x430, 0x3b, 0x43a, 0x438, 0x440, 0x433, 0x438, 0x437, 0x441, 0x43a, 0x438, 0x445, 0x20, 0x441, 0x43e, 0x43c, 0x43e, 0x432,
-0x3b, 0x43a, 0x438, 0x440, 0x433, 0x438, 0x437, 0x441, 0x43a, 0x43e, 0x433, 0x43e, 0x20, 0x441, 0x43e, 0x43c, 0x430, 0x3b, 0x43c, 0x43e,
+0x92a, 0x93f, 0x901, 0x92f, 0x93e, 0x6e, 0x6f, 0x72, 0x73, 0x6b, 0x65, 0x20, 0x6b, 0x72, 0x6f, 0x6e, 0x65, 0x72, 0x3b, 0x3b,
+0x6e, 0x6f, 0x72, 0x73, 0x6b, 0x20, 0x6b, 0x72, 0x6f, 0x6e, 0x65, 0x3b, 0x3b, 0x3b, 0x3b, 0x6e, 0x6f, 0x72, 0x73, 0x6b,
+0x65, 0x20, 0x6b, 0x72, 0x6f, 0x6e, 0x65, 0x72, 0xb2d, 0xb3e, 0xb30, 0xb24, 0xb40, 0xb5f, 0x20, 0xb1f, 0xb19, 0xb4d, 0xb15, 0xb3e,
+0x3b, 0x3b, 0xb2d, 0xb3e, 0xb30, 0xb24, 0xb40, 0xb5f, 0x20, 0xb1f, 0xb19, 0xb4d, 0xb15, 0xb3e, 0x3b, 0x3b, 0x3b, 0x3b, 0xb2d, 0xb3e,
+0xb30, 0xb24, 0xb40, 0xb5f, 0x20, 0xb1f, 0xb19, 0xb4d, 0xb15, 0xb3e, 0x627, 0x641, 0x63a, 0x627, 0x646, 0x6cd, 0x3b, 0x3b, 0x627, 0x641,
+0x63a, 0x627, 0x646, 0x6cd, 0x3b, 0x3b, 0x3b, 0x3b, 0x627, 0x641, 0x63a, 0x627, 0x646, 0x6cd, 0x67e, 0x627, 0x6a9, 0x633, 0x62a, 0x627,
+0x646, 0x6cd, 0x20, 0x6a9, 0x644, 0x62f, 0x627, 0x631, 0x647, 0x3b, 0x3b, 0x67e, 0x627, 0x6a9, 0x633, 0x62a, 0x627, 0x646, 0x6cd, 0x20,
+0x6a9, 0x644, 0x62f, 0x627, 0x631, 0x647, 0x3b, 0x3b, 0x3b, 0x3b, 0x67e, 0x627, 0x6a9, 0x633, 0x62a, 0x627, 0x646, 0x6cd, 0x20, 0x6a9,
+0x644, 0x62f, 0x627, 0x631, 0x6d2, 0x631, 0x6cc, 0x627, 0x644, 0x20, 0x627, 0x6cc, 0x631, 0x627, 0x646, 0x3b, 0x3b, 0x631, 0x6cc, 0x627,
+0x644, 0x20, 0x627, 0x6cc, 0x631, 0x627, 0x646, 0x3b, 0x3b, 0x3b, 0x3b, 0x631, 0x6cc, 0x627, 0x644, 0x20, 0x627, 0x6cc, 0x631, 0x627,
+0x646, 0x627, 0x641, 0x63a, 0x627, 0x646, 0x6cc, 0x20, 0x627, 0x641, 0x63a, 0x627, 0x646, 0x633, 0x62a, 0x627, 0x646, 0x3b, 0x3b, 0x627,
+0x641, 0x63a, 0x627, 0x646, 0x6cc, 0x20, 0x627, 0x641, 0x63a, 0x627, 0x646, 0x633, 0x62a, 0x627, 0x646, 0x3b, 0x3b, 0x3b, 0x3b, 0x627,
+0x641, 0x63a, 0x627, 0x646, 0x6cc, 0x20, 0x627, 0x641, 0x63a, 0x627, 0x646, 0x633, 0x62a, 0x627, 0x646, 0x7a, 0x142, 0x6f, 0x74, 0x79,
+0x20, 0x70, 0x6f, 0x6c, 0x73, 0x6b, 0x69, 0x3b, 0x3b, 0x7a, 0x142, 0x6f, 0x74, 0x79, 0x20, 0x70, 0x6f, 0x6c, 0x73, 0x6b,
+0x69, 0x3b, 0x3b, 0x7a, 0x142, 0x6f, 0x74, 0x65, 0x20, 0x70, 0x6f, 0x6c, 0x73, 0x6b, 0x69, 0x65, 0x3b, 0x7a, 0x142, 0x6f,
+0x74, 0x79, 0x63, 0x68, 0x20, 0x70, 0x6f, 0x6c, 0x73, 0x6b, 0x69, 0x63, 0x68, 0x3b, 0x7a, 0x142, 0x6f, 0x74, 0x65, 0x67,
+0x6f, 0x20, 0x70, 0x6f, 0x6c, 0x73, 0x6b, 0x69, 0x65, 0x67, 0x6f, 0x52, 0x65, 0x61, 0x6c, 0x20, 0x62, 0x72, 0x61, 0x73,
+0x69, 0x6c, 0x65, 0x69, 0x72, 0x6f, 0x3b, 0x3b, 0x52, 0x65, 0x61, 0x6c, 0x20, 0x62, 0x72, 0x61, 0x73, 0x69, 0x6c, 0x65,
+0x69, 0x72, 0x6f, 0x3b, 0x3b, 0x3b, 0x3b, 0x52, 0x65, 0x61, 0x69, 0x73, 0x20, 0x62, 0x72, 0x61, 0x73, 0x69, 0x6c, 0x65,
+0x69, 0x72, 0x6f, 0x73, 0x6b, 0x77, 0x61, 0x6e, 0x7a, 0x61, 0x20, 0x61, 0x6e, 0x67, 0x6f, 0x6c, 0x61, 0x6e, 0x6f, 0x3b,
+0x3b, 0x6b, 0x77, 0x61, 0x6e, 0x7a, 0x61, 0x20, 0x61, 0x6e, 0x67, 0x6f, 0x6c, 0x61, 0x6e, 0x6f, 0x3b, 0x3b, 0x3b, 0x3b,
+0x6b, 0x77, 0x61, 0x6e, 0x7a, 0x61, 0x73, 0x20, 0x61, 0x6e, 0x67, 0x6f, 0x6c, 0x61, 0x6e, 0x6f, 0x73, 0x65, 0x73, 0x63,
+0x75, 0x64, 0x6f, 0x20, 0x63, 0x61, 0x62, 0x6f, 0x2d, 0x76, 0x65, 0x72, 0x64, 0x69, 0x61, 0x6e, 0x6f, 0x3b, 0x3b, 0x65,
+0x73, 0x63, 0x75, 0x64, 0x6f, 0x20, 0x63, 0x61, 0x62, 0x6f, 0x2d, 0x76, 0x65, 0x72, 0x64, 0x69, 0x61, 0x6e, 0x6f, 0x3b,
+0x3b, 0x3b, 0x3b, 0x65, 0x73, 0x63, 0x75, 0x64, 0x6f, 0x73, 0x20, 0x63, 0x61, 0x62, 0x6f, 0x2d, 0x76, 0x65, 0x72, 0x64,
+0x69, 0x61, 0x6e, 0x6f, 0x73, 0x64, 0xf3, 0x6c, 0x61, 0x72, 0x20, 0x64, 0x6f, 0x73, 0x20, 0x45, 0x73, 0x74, 0x61, 0x64,
+0x6f, 0x73, 0x20, 0x55, 0x6e, 0x69, 0x64, 0x6f, 0x73, 0x3b, 0x3b, 0x64, 0xf3, 0x6c, 0x61, 0x72, 0x20, 0x64, 0x6f, 0x73,
+0x20, 0x45, 0x73, 0x74, 0x61, 0x64, 0x6f, 0x73, 0x20, 0x55, 0x6e, 0x69, 0x64, 0x6f, 0x73, 0x3b, 0x3b, 0x3b, 0x3b, 0x64,
+0xf3, 0x6c, 0x61, 0x72, 0x65, 0x73, 0x20, 0x64, 0x6f, 0x73, 0x20, 0x45, 0x73, 0x74, 0x61, 0x64, 0x6f, 0x73, 0x20, 0x55,
+0x6e, 0x69, 0x64, 0x6f, 0x73, 0x66, 0x72, 0x61, 0x6e, 0x63, 0x6f, 0x20, 0x43, 0x46, 0x41, 0x20, 0x28, 0x42, 0x45, 0x41,
+0x43, 0x29, 0x3b, 0x3b, 0x66, 0x72, 0x61, 0x6e, 0x63, 0x6f, 0x20, 0x43, 0x46, 0x41, 0x20, 0x28, 0x42, 0x45, 0x41, 0x43,
+0x29, 0x3b, 0x3b, 0x3b, 0x3b, 0x66, 0x72, 0x61, 0x6e, 0x63, 0x6f, 0x73, 0x20, 0x43, 0x46, 0x41, 0x20, 0x28, 0x42, 0x45,
+0x41, 0x43, 0x29, 0x66, 0x72, 0x61, 0x6e, 0x63, 0x6f, 0x20, 0x43, 0x46, 0x41, 0x20, 0x28, 0x42, 0x43, 0x45, 0x41, 0x4f,
+0x29, 0x3b, 0x3b, 0x66, 0x72, 0x61, 0x6e, 0x63, 0x6f, 0x20, 0x43, 0x46, 0x41, 0x20, 0x28, 0x42, 0x43, 0x45, 0x41, 0x4f,
+0x29, 0x3b, 0x3b, 0x3b, 0x3b, 0x66, 0x72, 0x61, 0x6e, 0x63, 0x6f, 0x73, 0x20, 0x43, 0x46, 0x41, 0x20, 0x28, 0x42, 0x43,
+0x45, 0x41, 0x4f, 0x29, 0x70, 0x61, 0x74, 0x61, 0x63, 0x61, 0x20, 0x6d, 0x61, 0x63, 0x61, 0x65, 0x6e, 0x73, 0x65, 0x3b,
+0x3b, 0x70, 0x61, 0x74, 0x61, 0x63, 0x61, 0x20, 0x6d, 0x61, 0x63, 0x61, 0x65, 0x6e, 0x73, 0x65, 0x3b, 0x3b, 0x3b, 0x3b,
+0x70, 0x61, 0x74, 0x61, 0x63, 0x61, 0x73, 0x20, 0x6d, 0x61, 0x63, 0x61, 0x65, 0x6e, 0x73, 0x65, 0x73, 0x6d, 0x65, 0x74,
+0x69, 0x63, 0x61, 0x6c, 0x20, 0x6d, 0x6f, 0xe7, 0x61, 0x6d, 0x62, 0x69, 0x63, 0x61, 0x6e, 0x6f, 0x3b, 0x3b, 0x6d, 0x65,
+0x74, 0x69, 0x63, 0x61, 0x6c, 0x20, 0x6d, 0x6f, 0xe7, 0x61, 0x6d, 0x62, 0x69, 0x63, 0x61, 0x6e, 0x6f, 0x3b, 0x3b, 0x3b,
+0x3b, 0x6d, 0x65, 0x74, 0x69, 0x63, 0x61, 0x69, 0x73, 0x20, 0x6d, 0x6f, 0xe7, 0x61, 0x6d, 0x62, 0x69, 0x63, 0x61, 0x6e,
+0x6f, 0x73, 0x64, 0x6f, 0x62, 0x72, 0x61, 0x20, 0x64, 0x65, 0x20, 0x53, 0xe3, 0x6f, 0x20, 0x54, 0x6f, 0x6d, 0xe9, 0x20,
+0x65, 0x20, 0x50, 0x72, 0xed, 0x6e, 0x63, 0x69, 0x70, 0x65, 0x3b, 0x3b, 0x64, 0x6f, 0x62, 0x72, 0x61, 0x20, 0x64, 0x65,
+0x20, 0x53, 0xe3, 0x6f, 0x20, 0x54, 0x6f, 0x6d, 0xe9, 0x20, 0x65, 0x20, 0x50, 0x72, 0xed, 0x6e, 0x63, 0x69, 0x70, 0x65,
+0x3b, 0x3b, 0x3b, 0x3b, 0x64, 0x6f, 0x62, 0x72, 0x61, 0x73, 0x20, 0x64, 0x65, 0x20, 0x53, 0xe3, 0x6f, 0x20, 0x54, 0x6f,
+0x6d, 0xe9, 0x20, 0x65, 0x20, 0x50, 0x72, 0xed, 0x6e, 0x63, 0x69, 0x70, 0x65, 0x66, 0x72, 0x61, 0x6e, 0x63, 0x6f, 0x20,
+0x73, 0x75, 0xed, 0xe7, 0x6f, 0x3b, 0x3b, 0x66, 0x72, 0x61, 0x6e, 0x63, 0x6f, 0x20, 0x73, 0x75, 0xed, 0xe7, 0x6f, 0x3b,
+0x3b, 0x3b, 0x3b, 0x66, 0x72, 0x61, 0x6e, 0x63, 0x6f, 0x73, 0x20, 0x73, 0x75, 0xed, 0xe7, 0x6f, 0x73, 0xa2d, 0xa3e, 0xa30,
+0xa24, 0xa40, 0x20, 0xa30, 0xa41, 0xa2a, 0xa07, 0xa06, 0x3b, 0x3b, 0xa2d, 0xa3e, 0xa30, 0xa24, 0xa40, 0x20, 0xa30, 0xa41, 0xa2a, 0xa07,
+0xa06, 0x3b, 0x3b, 0x3b, 0x3b, 0xa2d, 0xa3e, 0xa30, 0xa24, 0xa40, 0x20, 0xa30, 0xa41, 0xa2a, 0xa0f, 0x631, 0x648, 0x67e, 0x626, 0x6cc,
+0x6c1, 0x53, 0x6f, 0x6c, 0x20, 0x50, 0x65, 0x72, 0x75, 0x61, 0x6e, 0x6f, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x53, 0x6f,
+0x6c, 0x20, 0x70, 0x65, 0x72, 0x75, 0x61, 0x6e, 0x6f, 0x42, 0x6f, 0x6c, 0x69, 0x76, 0x69, 0x61, 0x6e, 0x6f, 0x3b, 0x3b,
+0x3b, 0x3b, 0x3b, 0x3b, 0x42, 0x6f, 0x6c, 0x69, 0x76, 0x69, 0x61, 0x6e, 0x6f, 0x44, 0xf3, 0x6c, 0x61, 0x72, 0x20, 0x41,
+0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x6e, 0x6f, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x44, 0xf3, 0x6c, 0x61, 0x72, 0x20,
+0x61, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x6e, 0x6f, 0x66, 0x72, 0x61, 0x6e, 0x63, 0x20, 0x73, 0x76, 0x69, 0x7a, 0x7a,
+0x65, 0x72, 0x3b, 0x3b, 0x66, 0x72, 0x61, 0x6e, 0x63, 0x20, 0x73, 0x76, 0x69, 0x7a, 0x7a, 0x65, 0x72, 0x3b, 0x3b, 0x3b,
+0x3b, 0x66, 0x72, 0x61, 0x6e, 0x63, 0x20, 0x73, 0x76, 0x69, 0x7a, 0x7a, 0x65, 0x72, 0x6c, 0x65, 0x75, 0x20, 0x72, 0x6f,
+0x6d, 0xe2, 0x6e, 0x65, 0x73, 0x63, 0x3b, 0x3b, 0x6c, 0x65, 0x75, 0x20, 0x72, 0x6f, 0x6d, 0xe2, 0x6e, 0x65, 0x73, 0x63,
+0x3b, 0x3b, 0x6c, 0x65, 0x69, 0x20, 0x72, 0x6f, 0x6d, 0xe2, 0x6e, 0x65, 0x219, 0x74, 0x69, 0x3b, 0x3b, 0x6c, 0x65, 0x69,
+0x20, 0x72, 0x6f, 0x6d, 0xe2, 0x6e, 0x65, 0x219, 0x74, 0x69, 0x6c, 0x65, 0x75, 0x20, 0x6d, 0x6f, 0x6c, 0x64, 0x6f, 0x76,
+0x65, 0x6e, 0x65, 0x73, 0x63, 0x3b, 0x3b, 0x6c, 0x65, 0x75, 0x20, 0x6d, 0x6f, 0x6c, 0x64, 0x6f, 0x76, 0x65, 0x6e, 0x65,
+0x73, 0x63, 0x3b, 0x3b, 0x6c, 0x65, 0x69, 0x20, 0x6d, 0x6f, 0x6c, 0x64, 0x6f, 0x76, 0x65, 0x6e, 0x65, 0x219, 0x74, 0x69,
+0x3b, 0x3b, 0x6c, 0x65, 0x69, 0x20, 0x6d, 0x6f, 0x6c, 0x64, 0x6f, 0x76, 0x65, 0x6e, 0x65, 0x219, 0x74, 0x69, 0x440, 0x43e,
+0x441, 0x441, 0x438, 0x439, 0x441, 0x43a, 0x438, 0x439, 0x20, 0x440, 0x443, 0x431, 0x43b, 0x44c, 0x3b, 0x3b, 0x440, 0x43e, 0x441, 0x441,
+0x438, 0x439, 0x441, 0x43a, 0x438, 0x439, 0x20, 0x440, 0x443, 0x431, 0x43b, 0x44c, 0x3b, 0x3b, 0x440, 0x43e, 0x441, 0x441, 0x438, 0x439,
+0x441, 0x43a, 0x438, 0x445, 0x20, 0x440, 0x443, 0x431, 0x43b, 0x44f, 0x3b, 0x440, 0x43e, 0x441, 0x441, 0x438, 0x439, 0x441, 0x43a, 0x438,
+0x445, 0x20, 0x440, 0x443, 0x431, 0x43b, 0x435, 0x439, 0x3b, 0x440, 0x43e, 0x441, 0x441, 0x438, 0x439, 0x441, 0x43a, 0x43e, 0x433, 0x43e,
+0x20, 0x440, 0x443, 0x431, 0x43b, 0x44f, 0x431, 0x435, 0x43b, 0x43e, 0x440, 0x443, 0x441, 0x441, 0x43a, 0x438, 0x439, 0x20, 0x440, 0x443,
+0x431, 0x43b, 0x44c, 0x3b, 0x3b, 0x431, 0x435, 0x43b, 0x43e, 0x440, 0x443, 0x441, 0x441, 0x43a, 0x438, 0x439, 0x20, 0x440, 0x443, 0x431,
+0x43b, 0x44c, 0x3b, 0x3b, 0x431, 0x435, 0x43b, 0x43e, 0x440, 0x443, 0x441, 0x441, 0x43a, 0x438, 0x445, 0x20, 0x440, 0x443, 0x431, 0x43b,
+0x44f, 0x3b, 0x431, 0x435, 0x43b, 0x43e, 0x440, 0x443, 0x441, 0x441, 0x43a, 0x438, 0x445, 0x20, 0x440, 0x443, 0x431, 0x43b, 0x435, 0x439,
+0x3b, 0x431, 0x435, 0x43b, 0x43e, 0x440, 0x443, 0x441, 0x441, 0x43a, 0x43e, 0x433, 0x43e, 0x20, 0x440, 0x443, 0x431, 0x43b, 0x44f, 0x43a,
+0x430, 0x437, 0x430, 0x445, 0x441, 0x43a, 0x438, 0x439, 0x20, 0x442, 0x435, 0x43d, 0x433, 0x435, 0x3b, 0x3b, 0x43a, 0x430, 0x437, 0x430,
+0x445, 0x441, 0x43a, 0x438, 0x439, 0x20, 0x442, 0x435, 0x43d, 0x433, 0x435, 0x3b, 0x3b, 0x43a, 0x430, 0x437, 0x430, 0x445, 0x441, 0x43a,
+0x438, 0x445, 0x20, 0x442, 0x435, 0x43d, 0x433, 0x435, 0x3b, 0x43a, 0x430, 0x437, 0x430, 0x445, 0x441, 0x43a, 0x438, 0x445, 0x20, 0x442,
+0x435, 0x43d, 0x433, 0x435, 0x3b, 0x43a, 0x430, 0x437, 0x430, 0x445, 0x441, 0x43a, 0x43e, 0x433, 0x43e, 0x20, 0x442, 0x435, 0x43d, 0x433,
+0x435, 0x43a, 0x438, 0x440, 0x433, 0x438, 0x437, 0x441, 0x43a, 0x438, 0x439, 0x20, 0x441, 0x43e, 0x43c, 0x3b, 0x3b, 0x43a, 0x438, 0x440,
+0x433, 0x438, 0x437, 0x441, 0x43a, 0x438, 0x439, 0x20, 0x441, 0x43e, 0x43c, 0x3b, 0x3b, 0x43a, 0x438, 0x440, 0x433, 0x438, 0x437, 0x441,
+0x43a, 0x438, 0x445, 0x20, 0x441, 0x43e, 0x43c, 0x430, 0x3b, 0x43a, 0x438, 0x440, 0x433, 0x438, 0x437, 0x441, 0x43a, 0x438, 0x445, 0x20,
+0x441, 0x43e, 0x43c, 0x43e, 0x432, 0x3b, 0x43a, 0x438, 0x440, 0x433, 0x438, 0x437, 0x441, 0x43a, 0x43e, 0x433, 0x43e, 0x20, 0x441, 0x43e,
+0x43c, 0x430, 0x43c, 0x43e, 0x43b, 0x434, 0x430, 0x432, 0x441, 0x43a, 0x438, 0x439, 0x20, 0x43b, 0x435, 0x439, 0x3b, 0x3b, 0x43c, 0x43e,
 0x43b, 0x434, 0x430, 0x432, 0x441, 0x43a, 0x438, 0x439, 0x20, 0x43b, 0x435, 0x439, 0x3b, 0x3b, 0x43c, 0x43e, 0x43b, 0x434, 0x430, 0x432,
-0x441, 0x43a, 0x438, 0x439, 0x20, 0x43b, 0x435, 0x439, 0x3b, 0x3b, 0x43c, 0x43e, 0x43b, 0x434, 0x430, 0x432, 0x441, 0x43a, 0x438, 0x445,
-0x20, 0x43b, 0x435, 0x44f, 0x3b, 0x43c, 0x43e, 0x43b, 0x434, 0x430, 0x432, 0x441, 0x43a, 0x438, 0x445, 0x20, 0x43b, 0x435, 0x435, 0x432,
-0x3b, 0x43c, 0x43e, 0x43b, 0x434, 0x430, 0x432, 0x441, 0x43a, 0x43e, 0x433, 0x43e, 0x20, 0x43b, 0x435, 0x44f, 0x3b, 0x443, 0x43a, 0x440,
-0x430, 0x438, 0x43d, 0x441, 0x43a, 0x430, 0x44f, 0x20, 0x433, 0x440, 0x438, 0x432, 0x43d, 0x430, 0x3b, 0x3b, 0x443, 0x43a, 0x440, 0x430,
-0x438, 0x43d, 0x441, 0x43a, 0x430, 0x44f, 0x20, 0x433, 0x440, 0x438, 0x432, 0x43d, 0x430, 0x3b, 0x3b, 0x443, 0x43a, 0x440, 0x430, 0x438,
-0x43d, 0x441, 0x43a, 0x438, 0x435, 0x20, 0x433, 0x440, 0x438, 0x432, 0x43d, 0x44b, 0x3b, 0x443, 0x43a, 0x440, 0x430, 0x438, 0x43d, 0x441,
-0x43a, 0x438, 0x445, 0x20, 0x433, 0x440, 0x438, 0x432, 0x435, 0x43d, 0x3b, 0x443, 0x43a, 0x440, 0x430, 0x438, 0x43d, 0x441, 0x43a, 0x43e,
-0x439, 0x20, 0x433, 0x440, 0x438, 0x432, 0x43d, 0x44b, 0x3b, 0x66, 0x61, 0x72, 0xe2, 0x6e, 0x67, 0x61, 0x20, 0x43, 0x46, 0x41,
-0x20, 0x28, 0x42, 0x45, 0x41, 0x43, 0x29, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x421, 0x440, 0x43f, 0x441, 0x43a, 0x438,
-0x20, 0x434, 0x438, 0x43d, 0x430, 0x440, 0x3b, 0x3b, 0x441, 0x440, 0x43f, 0x441, 0x43a, 0x438, 0x20, 0x434, 0x438, 0x43d, 0x430, 0x440,
-0x3b, 0x3b, 0x441, 0x440, 0x43f, 0x441, 0x43a, 0x430, 0x20, 0x434, 0x438, 0x43d, 0x430, 0x440, 0x430, 0x3b, 0x3b, 0x441, 0x440, 0x43f,
-0x441, 0x43a, 0x438, 0x445, 0x20, 0x434, 0x438, 0x43d, 0x430, 0x440, 0x430, 0x3b, 0x411, 0x43e, 0x441, 0x430, 0x43d, 0x441, 0x43a, 0x43e,
-0x2d, 0x445, 0x435, 0x440, 0x446, 0x435, 0x433, 0x43e, 0x432, 0x430, 0x447, 0x43a, 0x430, 0x20, 0x43a, 0x43e, 0x43d, 0x432, 0x435, 0x440,
-0x442, 0x438, 0x431, 0x438, 0x43b, 0x43d, 0x430, 0x20, 0x43c, 0x430, 0x440, 0x43a, 0x430, 0x3b, 0x3b, 0x431, 0x43e, 0x441, 0x430, 0x43d,
-0x441, 0x43a, 0x43e, 0x2d, 0x445, 0x435, 0x440, 0x446, 0x435, 0x433, 0x43e, 0x432, 0x430, 0x447, 0x43a, 0x430, 0x20, 0x43a, 0x43e, 0x43d,
-0x432, 0x435, 0x440, 0x442, 0x438, 0x431, 0x438, 0x43b, 0x43d, 0x430, 0x20, 0x43c, 0x430, 0x440, 0x43a, 0x430, 0x3b, 0x3b, 0x431, 0x43e,
-0x441, 0x430, 0x43d, 0x441, 0x43a, 0x43e, 0x2d, 0x445, 0x435, 0x440, 0x446, 0x435, 0x433, 0x43e, 0x432, 0x430, 0x447, 0x43a, 0x435, 0x20,
-0x43a, 0x43e, 0x43d, 0x432, 0x435, 0x440, 0x442, 0x438, 0x431, 0x438, 0x43b, 0x43d, 0x435, 0x20, 0x43c, 0x430, 0x440, 0x43a, 0x65, 0x3b,
-0x3b, 0x431, 0x43e, 0x441, 0x430, 0x43d, 0x441, 0x43a, 0x43e, 0x2d, 0x445, 0x435, 0x440, 0x446, 0x435, 0x433, 0x43e, 0x432, 0x430, 0x447,
-0x43a, 0x438, 0x445, 0x20, 0x43a, 0x43e, 0x43d, 0x432, 0x435, 0x440, 0x442, 0x438, 0x431, 0x438, 0x43b, 0x43d, 0x438, 0x445, 0x20, 0x43c,
-0x430, 0x440, 0x430, 0x43a, 0x430, 0x3b, 0x415, 0x432, 0x440, 0x43e, 0x3b, 0x3b, 0x435, 0x432, 0x440, 0x43e, 0x3b, 0x3b, 0x435, 0x432,
-0x440, 0x430, 0x3b, 0x3b, 0x435, 0x432, 0x440, 0x430, 0x3b, 0x42, 0x6f, 0x73, 0x61, 0x6e, 0x73, 0x6b, 0x6f, 0x2d, 0x68, 0x65,
+0x441, 0x43a, 0x438, 0x445, 0x20, 0x43b, 0x435, 0x44f, 0x3b, 0x43c, 0x43e, 0x43b, 0x434, 0x430, 0x432, 0x441, 0x43a, 0x438, 0x445, 0x20,
+0x43b, 0x435, 0x435, 0x432, 0x3b, 0x43c, 0x43e, 0x43b, 0x434, 0x430, 0x432, 0x441, 0x43a, 0x43e, 0x433, 0x43e, 0x20, 0x43b, 0x435, 0x44f,
+0x443, 0x43a, 0x440, 0x430, 0x438, 0x43d, 0x441, 0x43a, 0x430, 0x44f, 0x20, 0x433, 0x440, 0x438, 0x432, 0x43d, 0x430, 0x3b, 0x3b, 0x443,
+0x43a, 0x440, 0x430, 0x438, 0x43d, 0x441, 0x43a, 0x430, 0x44f, 0x20, 0x433, 0x440, 0x438, 0x432, 0x43d, 0x430, 0x3b, 0x3b, 0x443, 0x43a,
+0x440, 0x430, 0x438, 0x43d, 0x441, 0x43a, 0x438, 0x435, 0x20, 0x433, 0x440, 0x438, 0x432, 0x43d, 0x44b, 0x3b, 0x443, 0x43a, 0x440, 0x430,
+0x438, 0x43d, 0x441, 0x43a, 0x438, 0x445, 0x20, 0x433, 0x440, 0x438, 0x432, 0x435, 0x43d, 0x3b, 0x443, 0x43a, 0x440, 0x430, 0x438, 0x43d,
+0x441, 0x43a, 0x43e, 0x439, 0x20, 0x433, 0x440, 0x438, 0x432, 0x43d, 0x44b, 0x66, 0x61, 0x72, 0xe2, 0x6e, 0x67, 0x61, 0x20, 0x43,
+0x46, 0x41, 0x20, 0x28, 0x42, 0x45, 0x41, 0x43, 0x29, 0x421, 0x440, 0x43f, 0x441, 0x43a, 0x438, 0x20, 0x434, 0x438, 0x43d, 0x430,
+0x440, 0x3b, 0x3b, 0x441, 0x440, 0x43f, 0x441, 0x43a, 0x438, 0x20, 0x434, 0x438, 0x43d, 0x430, 0x440, 0x3b, 0x3b, 0x441, 0x440, 0x43f,
+0x441, 0x43a, 0x430, 0x20, 0x434, 0x438, 0x43d, 0x430, 0x440, 0x430, 0x3b, 0x3b, 0x441, 0x440, 0x43f, 0x441, 0x43a, 0x438, 0x445, 0x20,
+0x434, 0x438, 0x43d, 0x430, 0x440, 0x430, 0x42, 0x6f, 0x73, 0x61, 0x6e, 0x73, 0x6b, 0x6f, 0x2d, 0x68, 0x65, 0x72, 0x63, 0x65,
+0x67, 0x6f, 0x76, 0x61, 0x10d, 0x6b, 0x61, 0x20, 0x6b, 0x6f, 0x6e, 0x76, 0x65, 0x72, 0x74, 0x69, 0x62, 0x69, 0x6c, 0x6e,
+0x61, 0x20, 0x6d, 0x61, 0x72, 0x6b, 0x61, 0x3b, 0x3b, 0x62, 0x6f, 0x73, 0x61, 0x6e, 0x73, 0x6b, 0x6f, 0x2d, 0x68, 0x65,
 0x72, 0x63, 0x65, 0x67, 0x6f, 0x76, 0x61, 0x10d, 0x6b, 0x61, 0x20, 0x6b, 0x6f, 0x6e, 0x76, 0x65, 0x72, 0x74, 0x69, 0x62,
 0x69, 0x6c, 0x6e, 0x61, 0x20, 0x6d, 0x61, 0x72, 0x6b, 0x61, 0x3b, 0x3b, 0x62, 0x6f, 0x73, 0x61, 0x6e, 0x73, 0x6b, 0x6f,
-0x2d, 0x68, 0x65, 0x72, 0x63, 0x65, 0x67, 0x6f, 0x76, 0x61, 0x10d, 0x6b, 0x61, 0x20, 0x6b, 0x6f, 0x6e, 0x76, 0x65, 0x72,
-0x74, 0x69, 0x62, 0x69, 0x6c, 0x6e, 0x61, 0x20, 0x6d, 0x61, 0x72, 0x6b, 0x61, 0x3b, 0x3b, 0x62, 0x6f, 0x73, 0x61, 0x6e,
-0x73, 0x6b, 0x6f, 0x2d, 0x68, 0x65, 0x72, 0x63, 0x65, 0x67, 0x6f, 0x76, 0x61, 0x10d, 0x6b, 0x65, 0x20, 0x6b, 0x6f, 0x6e,
-0x76, 0x65, 0x72, 0x74, 0x69, 0x62, 0x69, 0x6c, 0x6e, 0x65, 0x20, 0x6d, 0x61, 0x72, 0x6b, 0x65, 0x3b, 0x3b, 0x62, 0x6f,
-0x73, 0x61, 0x6e, 0x73, 0x6b, 0x6f, 0x2d, 0x68, 0x65, 0x72, 0x63, 0x65, 0x67, 0x6f, 0x76, 0x61, 0x10d, 0x6b, 0x69, 0x68,
-0x20, 0x6b, 0x6f, 0x6e, 0x76, 0x65, 0x72, 0x74, 0x69, 0x62, 0x69, 0x6c, 0x6e, 0x69, 0x68, 0x20, 0x6d, 0x61, 0x72, 0x61,
-0x6b, 0x61, 0x3b, 0x45, 0x76, 0x72, 0x6f, 0x3b, 0x3b, 0x65, 0x76, 0x72, 0x6f, 0x3b, 0x3b, 0x65, 0x76, 0x72, 0x61, 0x3b,
-0x3b, 0x65, 0x76, 0x72, 0x61, 0x3b, 0x53, 0x72, 0x70, 0x73, 0x6b, 0x69, 0x20, 0x64, 0x69, 0x6e, 0x61, 0x72, 0x3b, 0x3b,
-0x73, 0x72, 0x70, 0x73, 0x6b, 0x69, 0x20, 0x64, 0x69, 0x6e, 0x61, 0x72, 0x3b, 0x3b, 0x73, 0x72, 0x70, 0x73, 0x6b, 0x61,
-0x20, 0x64, 0x69, 0x6e, 0x61, 0x72, 0x61, 0x3b, 0x3b, 0x73, 0x72, 0x70, 0x73, 0x6b, 0x69, 0x68, 0x20, 0x64, 0x69, 0x6e,
-0x61, 0x72, 0x61, 0x3b, 0x41b, 0x430, 0x440, 0x3b, 0x3b, 0x43b, 0x430, 0x440, 0x3b, 0x3b, 0x3b, 0x3b, 0x43b, 0x430, 0x440, 0x44b,
-0x3b, 0x421, 0x43e, 0x43c, 0x3b, 0x3b, 0x441, 0x43e, 0x43c, 0x3b, 0x3b, 0x3b, 0x3b, 0x441, 0x43e, 0x43c, 0x44b, 0x3b, 0x44, 0x6f,
-0x72, 0x61, 0x20, 0x72, 0x65, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x6b, 0x61, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b,
+0x2d, 0x68, 0x65, 0x72, 0x63, 0x65, 0x67, 0x6f, 0x76, 0x61, 0x10d, 0x6b, 0x65, 0x20, 0x6b, 0x6f, 0x6e, 0x76, 0x65, 0x72,
+0x74, 0x69, 0x62, 0x69, 0x6c, 0x6e, 0x65, 0x20, 0x6d, 0x61, 0x72, 0x6b, 0x65, 0x3b, 0x3b, 0x62, 0x6f, 0x73, 0x61, 0x6e,
+0x73, 0x6b, 0x6f, 0x2d, 0x68, 0x65, 0x72, 0x63, 0x65, 0x67, 0x6f, 0x76, 0x61, 0x10d, 0x6b, 0x69, 0x68, 0x20, 0x6b, 0x6f,
+0x6e, 0x76, 0x65, 0x72, 0x74, 0x69, 0x62, 0x69, 0x6c, 0x6e, 0x69, 0x68, 0x20, 0x6d, 0x61, 0x72, 0x61, 0x6b, 0x61, 0x45,
+0x76, 0x72, 0x6f, 0x3b, 0x3b, 0x65, 0x76, 0x72, 0x6f, 0x3b, 0x3b, 0x65, 0x76, 0x72, 0x61, 0x3b, 0x3b, 0x65, 0x76, 0x72,
+0x61, 0x53, 0x72, 0x70, 0x73, 0x6b, 0x69, 0x20, 0x64, 0x69, 0x6e, 0x61, 0x72, 0x3b, 0x3b, 0x73, 0x72, 0x70, 0x73, 0x6b,
+0x69, 0x20, 0x64, 0x69, 0x6e, 0x61, 0x72, 0x3b, 0x3b, 0x73, 0x72, 0x70, 0x73, 0x6b, 0x61, 0x20, 0x64, 0x69, 0x6e, 0x61,
+0x72, 0x61, 0x3b, 0x3b, 0x73, 0x72, 0x70, 0x73, 0x6b, 0x69, 0x68, 0x20, 0x64, 0x69, 0x6e, 0x61, 0x72, 0x61, 0x411, 0x43e,
+0x441, 0x430, 0x43d, 0x441, 0x43a, 0x43e, 0x2d, 0x445, 0x435, 0x440, 0x446, 0x435, 0x433, 0x43e, 0x432, 0x430, 0x447, 0x43a, 0x430, 0x20,
+0x43a, 0x43e, 0x43d, 0x432, 0x435, 0x440, 0x442, 0x438, 0x431, 0x438, 0x43b, 0x43d, 0x430, 0x20, 0x43c, 0x430, 0x440, 0x43a, 0x430, 0x3b,
+0x3b, 0x431, 0x43e, 0x441, 0x430, 0x43d, 0x441, 0x43a, 0x43e, 0x2d, 0x445, 0x435, 0x440, 0x446, 0x435, 0x433, 0x43e, 0x432, 0x430, 0x447,
+0x43a, 0x430, 0x20, 0x43a, 0x43e, 0x43d, 0x432, 0x435, 0x440, 0x442, 0x438, 0x431, 0x438, 0x43b, 0x43d, 0x430, 0x20, 0x43c, 0x430, 0x440,
+0x43a, 0x430, 0x3b, 0x3b, 0x431, 0x43e, 0x441, 0x430, 0x43d, 0x441, 0x43a, 0x43e, 0x2d, 0x445, 0x435, 0x440, 0x446, 0x435, 0x433, 0x43e,
+0x432, 0x430, 0x447, 0x43a, 0x435, 0x20, 0x43a, 0x43e, 0x43d, 0x432, 0x435, 0x440, 0x442, 0x438, 0x431, 0x438, 0x43b, 0x43d, 0x435, 0x20,
+0x43c, 0x430, 0x440, 0x43a, 0x65, 0x3b, 0x3b, 0x431, 0x43e, 0x441, 0x430, 0x43d, 0x441, 0x43a, 0x43e, 0x2d, 0x445, 0x435, 0x440, 0x446,
+0x435, 0x433, 0x43e, 0x432, 0x430, 0x447, 0x43a, 0x438, 0x445, 0x20, 0x43a, 0x43e, 0x43d, 0x432, 0x435, 0x440, 0x442, 0x438, 0x431, 0x438,
+0x43b, 0x43d, 0x438, 0x445, 0x20, 0x43c, 0x430, 0x440, 0x430, 0x43a, 0x430, 0x415, 0x432, 0x440, 0x43e, 0x3b, 0x3b, 0x435, 0x432, 0x440,
+0x43e, 0x3b, 0x3b, 0x435, 0x432, 0x440, 0x430, 0x3b, 0x3b, 0x435, 0x432, 0x440, 0x430, 0x41b, 0x430, 0x440, 0x3b, 0x3b, 0x43b, 0x430,
+0x440, 0x3b, 0x3b, 0x3b, 0x3b, 0x43b, 0x430, 0x440, 0x44b, 0x421, 0x43e, 0x43c, 0x3b, 0x3b, 0x441, 0x43e, 0x43c, 0x3b, 0x3b, 0x3b,
+0x3b, 0x441, 0x43e, 0x43c, 0x44b, 0x44, 0x6f, 0x72, 0x61, 0x20, 0x72, 0x65, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x6b, 0x61,
 0x67e, 0x627, 0x6aa, 0x633, 0x62a, 0x627, 0x646, 0x64a, 0x20, 0x631, 0x67e, 0x64a, 0x3b, 0x3b, 0x67e, 0x627, 0x6aa, 0x633, 0x62a, 0x627,
 0x646, 0x64a, 0x20, 0x631, 0x67e, 0x64a, 0x3b, 0x3b, 0x3b, 0x3b, 0x67e, 0x627, 0x6aa, 0x633, 0x62a, 0x627, 0x646, 0x64a, 0x20, 0x631,
-0x67e, 0x64a, 0x3b, 0xdc1, 0xdca, 0x200d, 0xdbb, 0xdd3, 0x20, 0xdbd, 0xd82, 0xd9a, 0xdcf, 0x20, 0xdbb, 0xdd4, 0xdb4, 0xdd2, 0xdba, 0xdbd,
-0x3b, 0x3b, 0xdc1, 0xdca, 0x200d, 0xdbb, 0xdd3, 0x20, 0xdbd, 0xd82, 0xd9a, 0xdcf, 0x20, 0xdbb, 0xdd4, 0xdb4, 0xdd2, 0xdba, 0xdbd, 0x3b,
-0x3b, 0x3b, 0x3b, 0xdc1, 0xdca, 0x200d, 0xdbb, 0xdd3, 0x20, 0xdbd, 0xd82, 0xd9a, 0xdcf, 0x20, 0xdbb, 0xdd4, 0xdb4, 0xdd2, 0xdba, 0xdbd,
-0x3b, 0x65, 0x75, 0x72, 0x6f, 0x3b, 0x3b, 0x65, 0x75, 0x72, 0x6f, 0x3b, 0x3b, 0x65, 0x75, 0x72, 0xe1, 0x3b, 0x65, 0x75,
-0x72, 0x61, 0x3b, 0x65, 0x75, 0x72, 0x3b, 0x65, 0x76, 0x72, 0x6f, 0x3b, 0x3b, 0x65, 0x76, 0x72, 0x6f, 0x3b, 0x65, 0x76,
-0x72, 0x61, 0x3b, 0x65, 0x76, 0x72, 0x69, 0x3b, 0x3b, 0x65, 0x76, 0x72, 0x6f, 0x76, 0x3b, 0x53, 0x68, 0x69, 0x6c, 0x69,
-0x6e, 0x67, 0x6b, 0x61, 0x20, 0x53, 0x6f, 0x6f, 0x6d, 0x61, 0x61, 0x6c, 0x69, 0x79, 0x61, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b,
-0x3b, 0x3b, 0x46, 0x61, 0x72, 0x61, 0x6e, 0x20, 0x4a, 0x61, 0x62, 0x75, 0x75, 0x74, 0x69, 0x3b, 0x3b, 0x66, 0x61, 0x72,
-0x61, 0x6e, 0x6b, 0x61, 0x20, 0x4a, 0x61, 0x62, 0x75, 0x75, 0x74, 0x69, 0x3b, 0x3b, 0x3b, 0x3b, 0x66, 0x61, 0x72, 0x61,
-0x6e, 0x6b, 0x61, 0x20, 0x4a, 0x61, 0x62, 0x75, 0x75, 0x74, 0x69, 0x3b, 0x42, 0x69, 0x72, 0x74, 0x61, 0x20, 0x49, 0x74,
-0x6f, 0x6f, 0x62, 0x62, 0x69, 0x79, 0x61, 0x3b, 0x3b, 0x62, 0x69, 0x72, 0x74, 0x61, 0x20, 0x49, 0x74, 0x6f, 0x6f, 0x62,
-0x62, 0x69, 0x79, 0x61, 0x3b, 0x3b, 0x3b, 0x3b, 0x62, 0x69, 0x72, 0x74, 0x61, 0x20, 0x49, 0x74, 0x6f, 0x6f, 0x62, 0x62,
-0x69, 0x79, 0x61, 0x3b, 0x53, 0x68, 0x69, 0x6c, 0x69, 0x6e, 0x67, 0x6b, 0x61, 0x20, 0x4b, 0x65, 0x6e, 0x79, 0x61, 0x3b,
-0x3b, 0x73, 0x68, 0x69, 0x6c, 0x69, 0x6e, 0x67, 0x6b, 0x61, 0x20, 0x4b, 0x65, 0x6e, 0x79, 0x61, 0x3b, 0x3b, 0x3b, 0x3b,
-0x73, 0x68, 0x69, 0x6c, 0x69, 0x6e, 0x67, 0x6b, 0x61, 0x20, 0x4b, 0x65, 0x6e, 0x79, 0x61, 0x3b, 0x70, 0x65, 0x73, 0x6f,
-0x20, 0x61, 0x72, 0x67, 0x65, 0x6e, 0x74, 0x69, 0x6e, 0x6f, 0x3b, 0x3b, 0x70, 0x65, 0x73, 0x6f, 0x20, 0x61, 0x72, 0x67,
-0x65, 0x6e, 0x74, 0x69, 0x6e, 0x6f, 0x3b, 0x3b, 0x3b, 0x3b, 0x70, 0x65, 0x73, 0x6f, 0x73, 0x20, 0x61, 0x72, 0x67, 0x65,
-0x6e, 0x74, 0x69, 0x6e, 0x6f, 0x73, 0x3b, 0x64, 0xf3, 0x6c, 0x61, 0x72, 0x20, 0x62, 0x65, 0x6c, 0x69, 0x63, 0x65, 0xf1,
-0x6f, 0x3b, 0x3b, 0x64, 0xf3, 0x6c, 0x61, 0x72, 0x20, 0x62, 0x65, 0x6c, 0x69, 0x63, 0x65, 0xf1, 0x6f, 0x3b, 0x3b, 0x3b,
-0x3b, 0x64, 0xf3, 0x6c, 0x61, 0x72, 0x65, 0x73, 0x20, 0x62, 0x65, 0x6c, 0x69, 0x63, 0x65, 0xf1, 0x6f, 0x73, 0x3b, 0x62,
-0x6f, 0x6c, 0x69, 0x76, 0x69, 0x61, 0x6e, 0x6f, 0x3b, 0x3b, 0x62, 0x6f, 0x6c, 0x69, 0x76, 0x69, 0x61, 0x6e, 0x6f, 0x3b,
-0x3b, 0x3b, 0x3b, 0x62, 0x6f, 0x6c, 0x69, 0x76, 0x69, 0x61, 0x6e, 0x6f, 0x73, 0x3b, 0x72, 0x65, 0x61, 0x6c, 0x20, 0x62,
-0x72, 0x61, 0x73, 0x69, 0x6c, 0x65, 0xf1, 0x6f, 0x3b, 0x3b, 0x72, 0x65, 0x61, 0x6c, 0x20, 0x62, 0x72, 0x61, 0x73, 0x69,
-0x6c, 0x65, 0xf1, 0x6f, 0x3b, 0x3b, 0x3b, 0x3b, 0x72, 0x65, 0x61, 0x6c, 0x65, 0x73, 0x20, 0x62, 0x72, 0x61, 0x73, 0x69,
-0x6c, 0x65, 0xf1, 0x6f, 0x73, 0x3b, 0x50, 0x65, 0x73, 0x6f, 0x20, 0x63, 0x68, 0x69, 0x6c, 0x65, 0x6e, 0x6f, 0x3b, 0x3b,
-0x70, 0x65, 0x73, 0x6f, 0x20, 0x63, 0x68, 0x69, 0x6c, 0x65, 0x6e, 0x6f, 0x3b, 0x3b, 0x3b, 0x3b, 0x70, 0x65, 0x73, 0x6f,
-0x73, 0x20, 0x63, 0x68, 0x69, 0x6c, 0x65, 0x6e, 0x6f, 0x73, 0x3b, 0x70, 0x65, 0x73, 0x6f, 0x20, 0x63, 0x6f, 0x6c, 0x6f,
-0x6d, 0x62, 0x69, 0x61, 0x6e, 0x6f, 0x3b, 0x3b, 0x70, 0x65, 0x73, 0x6f, 0x20, 0x63, 0x6f, 0x6c, 0x6f, 0x6d, 0x62, 0x69,
-0x61, 0x6e, 0x6f, 0x3b, 0x3b, 0x3b, 0x3b, 0x70, 0x65, 0x73, 0x6f, 0x73, 0x20, 0x63, 0x6f, 0x6c, 0x6f, 0x6d, 0x62, 0x69,
-0x61, 0x6e, 0x6f, 0x73, 0x3b, 0x63, 0x6f, 0x6c, 0xf3, 0x6e, 0x20, 0x63, 0x6f, 0x73, 0x74, 0x61, 0x72, 0x72, 0x69, 0x63,
+0x67e, 0x64a, 0xdc1, 0xdca, 0x200d, 0xdbb, 0xdd3, 0x20, 0xdbd, 0xd82, 0xd9a, 0xdcf, 0x20, 0xdbb, 0xdd4, 0xdb4, 0xdd2, 0xdba, 0xdbd, 0x3b,
+0x3b, 0xdc1, 0xdca, 0x200d, 0xdbb, 0xdd3, 0x20, 0xdbd, 0xd82, 0xd9a, 0xdcf, 0x20, 0xdbb, 0xdd4, 0xdb4, 0xdd2, 0xdba, 0xdbd, 0x3b, 0x3b,
+0x3b, 0x3b, 0xdc1, 0xdca, 0x200d, 0xdbb, 0xdd3, 0x20, 0xdbd, 0xd82, 0xd9a, 0xdcf, 0x20, 0xdbb, 0xdd4, 0xdb4, 0xdd2, 0xdba, 0xdbd, 0x65,
+0x75, 0x72, 0x6f, 0x3b, 0x3b, 0x65, 0x75, 0x72, 0x6f, 0x3b, 0x3b, 0x65, 0x75, 0x72, 0xe1, 0x3b, 0x65, 0x75, 0x72, 0x61,
+0x3b, 0x65, 0x75, 0x72, 0x65, 0x76, 0x72, 0x6f, 0x3b, 0x3b, 0x65, 0x76, 0x72, 0x6f, 0x3b, 0x65, 0x76, 0x72, 0x61, 0x3b,
+0x65, 0x76, 0x72, 0x69, 0x3b, 0x3b, 0x65, 0x76, 0x72, 0x6f, 0x76, 0x53, 0x68, 0x69, 0x6c, 0x69, 0x6e, 0x67, 0x6b, 0x61,
+0x20, 0x53, 0x6f, 0x6f, 0x6d, 0x61, 0x61, 0x6c, 0x69, 0x79, 0x61, 0x46, 0x61, 0x72, 0x61, 0x6e, 0x20, 0x4a, 0x61, 0x62,
+0x75, 0x75, 0x74, 0x69, 0x3b, 0x3b, 0x66, 0x61, 0x72, 0x61, 0x6e, 0x6b, 0x61, 0x20, 0x4a, 0x61, 0x62, 0x75, 0x75, 0x74,
+0x69, 0x3b, 0x3b, 0x3b, 0x3b, 0x66, 0x61, 0x72, 0x61, 0x6e, 0x6b, 0x61, 0x20, 0x4a, 0x61, 0x62, 0x75, 0x75, 0x74, 0x69,
+0x42, 0x69, 0x72, 0x74, 0x61, 0x20, 0x49, 0x74, 0x6f, 0x6f, 0x62, 0x62, 0x69, 0x79, 0x61, 0x3b, 0x3b, 0x62, 0x69, 0x72,
+0x74, 0x61, 0x20, 0x49, 0x74, 0x6f, 0x6f, 0x62, 0x62, 0x69, 0x79, 0x61, 0x3b, 0x3b, 0x3b, 0x3b, 0x62, 0x69, 0x72, 0x74,
+0x61, 0x20, 0x49, 0x74, 0x6f, 0x6f, 0x62, 0x62, 0x69, 0x79, 0x61, 0x53, 0x68, 0x69, 0x6c, 0x69, 0x6e, 0x67, 0x6b, 0x61,
+0x20, 0x4b, 0x65, 0x6e, 0x79, 0x61, 0x3b, 0x3b, 0x73, 0x68, 0x69, 0x6c, 0x69, 0x6e, 0x67, 0x6b, 0x61, 0x20, 0x4b, 0x65,
+0x6e, 0x79, 0x61, 0x3b, 0x3b, 0x3b, 0x3b, 0x73, 0x68, 0x69, 0x6c, 0x69, 0x6e, 0x67, 0x6b, 0x61, 0x20, 0x4b, 0x65, 0x6e,
+0x79, 0x61, 0x70, 0x65, 0x73, 0x6f, 0x20, 0x61, 0x72, 0x67, 0x65, 0x6e, 0x74, 0x69, 0x6e, 0x6f, 0x3b, 0x3b, 0x70, 0x65,
+0x73, 0x6f, 0x20, 0x61, 0x72, 0x67, 0x65, 0x6e, 0x74, 0x69, 0x6e, 0x6f, 0x3b, 0x3b, 0x3b, 0x3b, 0x70, 0x65, 0x73, 0x6f,
+0x73, 0x20, 0x61, 0x72, 0x67, 0x65, 0x6e, 0x74, 0x69, 0x6e, 0x6f, 0x73, 0x64, 0xf3, 0x6c, 0x61, 0x72, 0x20, 0x62, 0x65,
+0x6c, 0x69, 0x63, 0x65, 0xf1, 0x6f, 0x3b, 0x3b, 0x64, 0xf3, 0x6c, 0x61, 0x72, 0x20, 0x62, 0x65, 0x6c, 0x69, 0x63, 0x65,
+0xf1, 0x6f, 0x3b, 0x3b, 0x3b, 0x3b, 0x64, 0xf3, 0x6c, 0x61, 0x72, 0x65, 0x73, 0x20, 0x62, 0x65, 0x6c, 0x69, 0x63, 0x65,
+0xf1, 0x6f, 0x73, 0x62, 0x6f, 0x6c, 0x69, 0x76, 0x69, 0x61, 0x6e, 0x6f, 0x3b, 0x3b, 0x62, 0x6f, 0x6c, 0x69, 0x76, 0x69,
+0x61, 0x6e, 0x6f, 0x3b, 0x3b, 0x3b, 0x3b, 0x62, 0x6f, 0x6c, 0x69, 0x76, 0x69, 0x61, 0x6e, 0x6f, 0x73, 0x72, 0x65, 0x61,
+0x6c, 0x20, 0x62, 0x72, 0x61, 0x73, 0x69, 0x6c, 0x65, 0xf1, 0x6f, 0x3b, 0x3b, 0x72, 0x65, 0x61, 0x6c, 0x20, 0x62, 0x72,
+0x61, 0x73, 0x69, 0x6c, 0x65, 0xf1, 0x6f, 0x3b, 0x3b, 0x3b, 0x3b, 0x72, 0x65, 0x61, 0x6c, 0x65, 0x73, 0x20, 0x62, 0x72,
+0x61, 0x73, 0x69, 0x6c, 0x65, 0xf1, 0x6f, 0x73, 0x50, 0x65, 0x73, 0x6f, 0x20, 0x63, 0x68, 0x69, 0x6c, 0x65, 0x6e, 0x6f,
+0x3b, 0x3b, 0x70, 0x65, 0x73, 0x6f, 0x20, 0x63, 0x68, 0x69, 0x6c, 0x65, 0x6e, 0x6f, 0x3b, 0x3b, 0x3b, 0x3b, 0x70, 0x65,
+0x73, 0x6f, 0x73, 0x20, 0x63, 0x68, 0x69, 0x6c, 0x65, 0x6e, 0x6f, 0x73, 0x70, 0x65, 0x73, 0x6f, 0x20, 0x63, 0x6f, 0x6c,
+0x6f, 0x6d, 0x62, 0x69, 0x61, 0x6e, 0x6f, 0x3b, 0x3b, 0x70, 0x65, 0x73, 0x6f, 0x20, 0x63, 0x6f, 0x6c, 0x6f, 0x6d, 0x62,
+0x69, 0x61, 0x6e, 0x6f, 0x3b, 0x3b, 0x3b, 0x3b, 0x70, 0x65, 0x73, 0x6f, 0x73, 0x20, 0x63, 0x6f, 0x6c, 0x6f, 0x6d, 0x62,
+0x69, 0x61, 0x6e, 0x6f, 0x73, 0x63, 0x6f, 0x6c, 0xf3, 0x6e, 0x20, 0x63, 0x6f, 0x73, 0x74, 0x61, 0x72, 0x72, 0x69, 0x63,
 0x65, 0x6e, 0x73, 0x65, 0x3b, 0x3b, 0x63, 0x6f, 0x6c, 0xf3, 0x6e, 0x20, 0x63, 0x6f, 0x73, 0x74, 0x61, 0x72, 0x72, 0x69,
 0x63, 0x65, 0x6e, 0x73, 0x65, 0x3b, 0x3b, 0x3b, 0x3b, 0x63, 0x6f, 0x6c, 0x6f, 0x6e, 0x65, 0x73, 0x20, 0x63, 0x6f, 0x73,
-0x74, 0x61, 0x72, 0x72, 0x69, 0x63, 0x65, 0x6e, 0x73, 0x65, 0x73, 0x3b, 0x70, 0x65, 0x73, 0x6f, 0x20, 0x63, 0x75, 0x62,
-0x61, 0x6e, 0x6f, 0x3b, 0x3b, 0x70, 0x65, 0x73, 0x6f, 0x20, 0x63, 0x75, 0x62, 0x61, 0x6e, 0x6f, 0x3b, 0x3b, 0x3b, 0x3b,
-0x70, 0x65, 0x73, 0x6f, 0x73, 0x20, 0x63, 0x75, 0x62, 0x61, 0x6e, 0x6f, 0x73, 0x3b, 0x70, 0x65, 0x73, 0x6f, 0x20, 0x64,
-0x6f, 0x6d, 0x69, 0x6e, 0x69, 0x63, 0x61, 0x6e, 0x6f, 0x3b, 0x3b, 0x70, 0x65, 0x73, 0x6f, 0x20, 0x64, 0x6f, 0x6d, 0x69,
-0x6e, 0x69, 0x63, 0x61, 0x6e, 0x6f, 0x3b, 0x3b, 0x3b, 0x3b, 0x70, 0x65, 0x73, 0x6f, 0x73, 0x20, 0x64, 0x6f, 0x6d, 0x69,
-0x6e, 0x69, 0x63, 0x61, 0x6e, 0x6f, 0x73, 0x3b, 0x64, 0xf3, 0x6c, 0x61, 0x72, 0x20, 0x65, 0x73, 0x74, 0x61, 0x64, 0x6f,
-0x75, 0x6e, 0x69, 0x64, 0x65, 0x6e, 0x73, 0x65, 0x3b, 0x3b, 0x64, 0xf3, 0x6c, 0x61, 0x72, 0x20, 0x65, 0x73, 0x74, 0x61,
-0x64, 0x6f, 0x75, 0x6e, 0x69, 0x64, 0x65, 0x6e, 0x73, 0x65, 0x3b, 0x3b, 0x3b, 0x3b, 0x64, 0xf3, 0x6c, 0x61, 0x72, 0x65,
-0x73, 0x20, 0x65, 0x73, 0x74, 0x61, 0x64, 0x6f, 0x75, 0x6e, 0x69, 0x64, 0x65, 0x6e, 0x73, 0x65, 0x73, 0x3b, 0x66, 0x72,
-0x61, 0x6e, 0x63, 0x6f, 0x20, 0x43, 0x46, 0x41, 0x20, 0x64, 0x65, 0x20, 0xc1, 0x66, 0x72, 0x69, 0x63, 0x61, 0x20, 0x43,
-0x65, 0x6e, 0x74, 0x72, 0x61, 0x6c, 0x3b, 0x3b, 0x66, 0x72, 0x61, 0x6e, 0x63, 0x6f, 0x20, 0x43, 0x46, 0x41, 0x20, 0x64,
-0x65, 0x20, 0xc1, 0x66, 0x72, 0x69, 0x63, 0x61, 0x20, 0x43, 0x65, 0x6e, 0x74, 0x72, 0x61, 0x6c, 0x3b, 0x3b, 0x3b, 0x3b,
-0x66, 0x72, 0x61, 0x6e, 0x63, 0x6f, 0x73, 0x20, 0x43, 0x46, 0x41, 0x20, 0x64, 0x65, 0x20, 0xc1, 0x66, 0x72, 0x69, 0x63,
-0x61, 0x20, 0x43, 0x65, 0x6e, 0x74, 0x72, 0x61, 0x6c, 0x3b, 0x71, 0x75, 0x65, 0x74, 0x7a, 0x61, 0x6c, 0x3b, 0x3b, 0x71,
-0x75, 0x65, 0x74, 0x7a, 0x61, 0x6c, 0x3b, 0x3b, 0x3b, 0x3b, 0x71, 0x75, 0x65, 0x74, 0x7a, 0x61, 0x6c, 0x65, 0x73, 0x3b,
-0x6c, 0x65, 0x6d, 0x70, 0x69, 0x72, 0x61, 0x20, 0x68, 0x6f, 0x6e, 0x64, 0x75, 0x72, 0x65, 0xf1, 0x6f, 0x3b, 0x3b, 0x6c,
-0x65, 0x6d, 0x70, 0x69, 0x72, 0x61, 0x20, 0x68, 0x6f, 0x6e, 0x64, 0x75, 0x72, 0x65, 0xf1, 0x6f, 0x3b, 0x3b, 0x3b, 0x3b,
-0x6c, 0x65, 0x6d, 0x70, 0x69, 0x72, 0x61, 0x73, 0x20, 0x68, 0x6f, 0x6e, 0x64, 0x75, 0x72, 0x65, 0xf1, 0x6f, 0x73, 0x3b,
-0x70, 0x65, 0x73, 0x6f, 0x20, 0x6d, 0x65, 0x78, 0x69, 0x63, 0x61, 0x6e, 0x6f, 0x3b, 0x3b, 0x70, 0x65, 0x73, 0x6f, 0x20,
-0x6d, 0x65, 0x78, 0x69, 0x63, 0x61, 0x6e, 0x6f, 0x3b, 0x3b, 0x3b, 0x3b, 0x70, 0x65, 0x73, 0x6f, 0x73, 0x20, 0x6d, 0x65,
-0x78, 0x69, 0x63, 0x61, 0x6e, 0x6f, 0x73, 0x3b, 0x63, 0xf3, 0x72, 0x64, 0x6f, 0x62, 0x61, 0x20, 0x6e, 0x69, 0x63, 0x61,
-0x72, 0x61, 0x67, 0xfc, 0x65, 0x6e, 0x73, 0x65, 0x3b, 0x3b, 0x63, 0xf3, 0x72, 0x64, 0x6f, 0x62, 0x61, 0x20, 0x6e, 0x69,
-0x63, 0x61, 0x72, 0x61, 0x67, 0xfc, 0x65, 0x6e, 0x73, 0x65, 0x3b, 0x3b, 0x3b, 0x3b, 0x63, 0xf3, 0x72, 0x64, 0x6f, 0x62,
-0x61, 0x73, 0x20, 0x6e, 0x69, 0x63, 0x61, 0x72, 0x61, 0x67, 0xfc, 0x65, 0x6e, 0x73, 0x65, 0x73, 0x3b, 0x62, 0x61, 0x6c,
-0x62, 0x6f, 0x61, 0x20, 0x70, 0x61, 0x6e, 0x61, 0x6d, 0x65, 0xf1, 0x6f, 0x3b, 0x3b, 0x62, 0x61, 0x6c, 0x62, 0x6f, 0x61,
-0x20, 0x70, 0x61, 0x6e, 0x61, 0x6d, 0x65, 0xf1, 0x6f, 0x3b, 0x3b, 0x3b, 0x3b, 0x62, 0x61, 0x6c, 0x62, 0x6f, 0x61, 0x73,
-0x20, 0x70, 0x61, 0x6e, 0x61, 0x6d, 0x65, 0xf1, 0x6f, 0x73, 0x3b, 0x67, 0x75, 0x61, 0x72, 0x61, 0x6e, 0xed, 0x20, 0x70,
-0x61, 0x72, 0x61, 0x67, 0x75, 0x61, 0x79, 0x6f, 0x3b, 0x3b, 0x67, 0x75, 0x61, 0x72, 0x61, 0x6e, 0xed, 0x20, 0x70, 0x61,
-0x72, 0x61, 0x67, 0x75, 0x61, 0x79, 0x6f, 0x3b, 0x3b, 0x3b, 0x3b, 0x67, 0x75, 0x61, 0x72, 0x61, 0x6e, 0xed, 0x65, 0x73,
-0x20, 0x70, 0x61, 0x72, 0x61, 0x67, 0x75, 0x61, 0x79, 0x6f, 0x73, 0x3b, 0x73, 0x6f, 0x6c, 0x20, 0x70, 0x65, 0x72, 0x75,
-0x61, 0x6e, 0x6f, 0x3b, 0x3b, 0x73, 0x6f, 0x6c, 0x20, 0x70, 0x65, 0x72, 0x75, 0x61, 0x6e, 0x6f, 0x3b, 0x3b, 0x3b, 0x3b,
-0x73, 0x6f, 0x6c, 0x65, 0x73, 0x20, 0x70, 0x65, 0x72, 0x75, 0x61, 0x6e, 0x6f, 0x73, 0x3b, 0x70, 0x65, 0x73, 0x6f, 0x20,
-0x66, 0x69, 0x6c, 0x69, 0x70, 0x69, 0x6e, 0x6f, 0x3b, 0x3b, 0x70, 0x65, 0x73, 0x6f, 0x20, 0x66, 0x69, 0x6c, 0x69, 0x70,
-0x69, 0x6e, 0x6f, 0x3b, 0x3b, 0x3b, 0x3b, 0x70, 0x65, 0x73, 0x6f, 0x73, 0x20, 0x66, 0x69, 0x6c, 0x69, 0x70, 0x69, 0x6e,
-0x6f, 0x73, 0x3b, 0x70, 0x65, 0x73, 0x6f, 0x20, 0x75, 0x72, 0x75, 0x67, 0x75, 0x61, 0x79, 0x6f, 0x3b, 0x3b, 0x70, 0x65,
-0x73, 0x6f, 0x20, 0x75, 0x72, 0x75, 0x67, 0x75, 0x61, 0x79, 0x6f, 0x3b, 0x3b, 0x3b, 0x3b, 0x70, 0x65, 0x73, 0x6f, 0x73,
-0x20, 0x75, 0x72, 0x75, 0x67, 0x75, 0x61, 0x79, 0x6f, 0x73, 0x3b, 0x62, 0x6f, 0x6c, 0xed, 0x76, 0x61, 0x72, 0x20, 0x73,
-0x6f, 0x62, 0x65, 0x72, 0x61, 0x6e, 0x6f, 0x3b, 0x3b, 0x62, 0x6f, 0x6c, 0xed, 0x76, 0x61, 0x72, 0x20, 0x73, 0x6f, 0x62,
-0x65, 0x72, 0x61, 0x6e, 0x6f, 0x3b, 0x3b, 0x3b, 0x3b, 0x62, 0x6f, 0x6c, 0xed, 0x76, 0x61, 0x72, 0x65, 0x73, 0x20, 0x73,
-0x6f, 0x62, 0x65, 0x72, 0x61, 0x6e, 0x6f, 0x73, 0x3b, 0x53, 0x68, 0x69, 0x6c, 0x69, 0x6e, 0x67, 0x69, 0x20, 0x79, 0x61,
-0x20, 0x54, 0x61, 0x6e, 0x7a, 0x61, 0x6e, 0x69, 0x61, 0x3b, 0x3b, 0x73, 0x68, 0x69, 0x6c, 0x69, 0x6e, 0x67, 0x69, 0x20,
-0x79, 0x61, 0x20, 0x54, 0x61, 0x6e, 0x7a, 0x61, 0x6e, 0x69, 0x61, 0x3b, 0x3b, 0x3b, 0x3b, 0x73, 0x68, 0x69, 0x6c, 0x69,
-0x6e, 0x67, 0x69, 0x20, 0x7a, 0x61, 0x20, 0x54, 0x61, 0x6e, 0x7a, 0x61, 0x6e, 0x69, 0x61, 0x3b, 0x46, 0x61, 0x72, 0x61,
-0x6e, 0x67, 0x61, 0x20, 0x79, 0x61, 0x20, 0x4b, 0x6f, 0x6e, 0x67, 0x6f, 0x3b, 0x3b, 0x66, 0x61, 0x72, 0x61, 0x6e, 0x67,
-0x61, 0x20, 0x79, 0x61, 0x20, 0x4b, 0x6f, 0x6e, 0x67, 0x6f, 0x3b, 0x3b, 0x3b, 0x3b, 0x66, 0x61, 0x72, 0x61, 0x6e, 0x67,
-0x61, 0x20, 0x7a, 0x61, 0x20, 0x4b, 0x6f, 0x6e, 0x67, 0x6f, 0x3b, 0x53, 0x68, 0x69, 0x6c, 0x69, 0x6e, 0x67, 0x69, 0x20,
-0x79, 0x61, 0x20, 0x4b, 0x65, 0x6e, 0x79, 0x61, 0x3b, 0x3b, 0x73, 0x68, 0x69, 0x6c, 0x69, 0x6e, 0x67, 0x69, 0x20, 0x79,
-0x61, 0x20, 0x4b, 0x65, 0x6e, 0x79, 0x61, 0x3b, 0x3b, 0x3b, 0x3b, 0x73, 0x68, 0x69, 0x6c, 0x69, 0x6e, 0x67, 0x69, 0x20,
-0x7a, 0x61, 0x20, 0x4b, 0x65, 0x6e, 0x79, 0x61, 0x3b, 0x53, 0x68, 0x69, 0x6c, 0x69, 0x6e, 0x67, 0x69, 0x20, 0x79, 0x61,
-0x20, 0x55, 0x67, 0x61, 0x6e, 0x64, 0x61, 0x3b, 0x3b, 0x73, 0x68, 0x69, 0x6c, 0x69, 0x6e, 0x67, 0x69, 0x20, 0x79, 0x61,
-0x20, 0x55, 0x67, 0x61, 0x6e, 0x64, 0x61, 0x3b, 0x3b, 0x3b, 0x3b, 0x73, 0x68, 0x69, 0x6c, 0x69, 0x6e, 0x67, 0x69, 0x20,
-0x7a, 0x61, 0x20, 0x55, 0x67, 0x61, 0x6e, 0x64, 0x61, 0x3b, 0x73, 0x76, 0x65, 0x6e, 0x73, 0x6b, 0x20, 0x6b, 0x72, 0x6f,
-0x6e, 0x61, 0x3b, 0x3b, 0x73, 0x76, 0x65, 0x6e, 0x73, 0x6b, 0x20, 0x6b, 0x72, 0x6f, 0x6e, 0x61, 0x3b, 0x3b, 0x3b, 0x3b,
-0x73, 0x76, 0x65, 0x6e, 0x73, 0x6b, 0x61, 0x20, 0x6b, 0x72, 0x6f, 0x6e, 0x6f, 0x72, 0x3b, 0x421, 0x43e, 0x43c, 0x43e, 0x43d,
-0x4e3, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x421, 0x43e, 0x43c, 0x43e, 0x43d, 0x4e3, 0x3b, 0xb87, 0xba8, 0xbcd, 0xba4, 0xbbf, 0xbaf,
-0x20, 0xbb0, 0xbc2, 0xbaa, 0xbbe, 0xbaf, 0xbcd, 0x3b, 0x3b, 0xb87, 0xba8, 0xbcd, 0xba4, 0xbbf, 0xbaf, 0x20, 0xbb0, 0xbc2, 0xbaa, 0xbbe,
-0xbaf, 0xbcd, 0x3b, 0x3b, 0x3b, 0x3b, 0xb87, 0xba8, 0xbcd, 0xba4, 0xbbf, 0xbaf, 0x20, 0xbb0, 0xbc2, 0xbaa, 0xbbe, 0xbaf, 0xbcd, 0xb95,
-0xbb3, 0xbcd, 0x3b, 0xbae, 0xbb2, 0xbc7, 0xbb7, 0xbbf, 0xbaf, 0xba9, 0xbcd, 0x20, 0xbb0, 0xbbf, 0xb99, 0xbcd, 0xb95, 0xbbf, 0xb9f, 0xbcd,
-0x3b, 0x3b, 0xbae, 0xbb2, 0xbc7, 0xbb7, 0xbbf, 0xbaf, 0xba9, 0xbcd, 0x20, 0xbb0, 0xbbf, 0xb99, 0xbcd, 0xb95, 0xbbf, 0xb9f, 0xbcd, 0x3b,
-0x3b, 0x3b, 0x3b, 0xbae, 0xbb2, 0xbc7, 0xbb7, 0xbbf, 0xbaf, 0xba9, 0xbcd, 0x20, 0xbb0, 0xbbf, 0xb99, 0xbcd, 0xb95, 0xbbf, 0xb9f, 0xbcd,
-0xb95, 0xbb3, 0xbcd, 0x3b, 0xb9a, 0xbbf, 0xb99, 0xbcd, 0xb95, 0xbaa, 0xbcd, 0xbaa, 0xbc2, 0xbb0, 0xbcd, 0x20, 0xb9f, 0xbbe, 0xbb2, 0xbb0,
-0xbcd, 0x3b, 0x3b, 0xb9a, 0xbbf, 0xb99, 0xbcd, 0xb95, 0xbaa, 0xbcd, 0xbaa, 0xbc2, 0xbb0, 0xbcd, 0x20, 0xb9f, 0xbbe, 0xbb2, 0xbb0, 0xbcd,
-0x3b, 0x3b, 0x3b, 0x3b, 0xb9a, 0xbbf, 0xb99, 0xbcd, 0xb95, 0xbaa, 0xbcd, 0xbaa, 0xbc2, 0xbb0, 0xbcd, 0x20, 0xb9f, 0xbbe, 0xbb2, 0xbb0,
-0xbcd, 0xb95, 0xbb3, 0xbcd, 0x3b, 0xb87, 0xbb2, 0xb99, 0xbcd, 0xb95, 0xbc8, 0x20, 0xbb0, 0xbc2, 0xbaa, 0xbbe, 0xbaf, 0xbcd, 0x3b, 0x3b,
-0xb87, 0xbb2, 0xb99, 0xbcd, 0xb95, 0xbc8, 0x20, 0xbb0, 0xbc2, 0xbaa, 0xbbe, 0xbaf, 0xbcd, 0x3b, 0x3b, 0x3b, 0x3b, 0xb87, 0xbb2, 0xb99,
-0xbcd, 0xb95, 0xbc8, 0x20, 0xbb0, 0xbc2, 0xbaa, 0xbbe, 0xbaf, 0xbcd, 0xb95, 0xbb3, 0xbcd, 0x3b, 0x420, 0x43e, 0x441, 0x441, 0x438, 0x44f,
-0x20, 0x441, 0x443, 0x43c, 0x44b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x441, 0x443, 0x43c, 0x3b, 0xc30, 0xc42, 0xc2a, 0xc3e, 0xc2f,
-0xc3f, 0x3b, 0x3b, 0xc30, 0xc42, 0xc2a, 0xc3e, 0xc2f, 0xc3f, 0x3b, 0x3b, 0x3b, 0x3b, 0xc30, 0xc42, 0xc2a, 0xc3e, 0xc2f, 0xc32, 0xc41,
-0x3b, 0xe1a, 0xe32, 0xe17, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0xe1a, 0xe32, 0xe17, 0xe44, 0xe17, 0xe22, 0x3b, 0xf61, 0xf74, 0xf0b,
-0xf68, 0xf53, 0xf0b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0xf62, 0xf92, 0xfb1, 0xf0b, 0xf42, 0xf62, 0xf0b, 0xf66, 0xf92, 0xf7c,
-0xf62, 0xf0b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x12e8, 0x12a2, 0x1275, 0x12ee, 0x1335, 0x12eb, 0x20, 0x1265, 0x122d, 0x3b, 0x3b,
-0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x50, 0x61, 0x2bb, 0x61, 0x6e, 0x67, 0x61, 0x20, 0x66, 0x61, 0x6b, 0x61, 0x74, 0x6f, 0x6e,
-0x67, 0x61, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x50, 0x61, 0x2bb, 0x61, 0x6e, 0x67, 0x61, 0x20, 0x66, 0x61, 0x6b, 0x61,
-0x74, 0x6f, 0x6e, 0x67, 0x61, 0x3b, 0x54, 0xfc, 0x72, 0x6b, 0x20, 0x4c, 0x69, 0x72, 0x61, 0x73, 0x131, 0x3b, 0x3b, 0x54,
-0xfc, 0x72, 0x6b, 0x20, 0x6c, 0x69, 0x72, 0x61, 0x73, 0x131, 0x3b, 0x3b, 0x3b, 0x3b, 0x54, 0xfc, 0x72, 0x6b, 0x20, 0x6c,
-0x69, 0x72, 0x61, 0x73, 0x131, 0x3b, 0x54, 0xfc, 0x72, 0x6b, 0x6d, 0x65, 0x6e, 0x20, 0x6d, 0x61, 0x6e, 0x61, 0x64, 0x79,
+0x74, 0x61, 0x72, 0x72, 0x69, 0x63, 0x65, 0x6e, 0x73, 0x65, 0x73, 0x70, 0x65, 0x73, 0x6f, 0x20, 0x63, 0x75, 0x62, 0x61,
+0x6e, 0x6f, 0x3b, 0x3b, 0x70, 0x65, 0x73, 0x6f, 0x20, 0x63, 0x75, 0x62, 0x61, 0x6e, 0x6f, 0x3b, 0x3b, 0x3b, 0x3b, 0x70,
+0x65, 0x73, 0x6f, 0x73, 0x20, 0x63, 0x75, 0x62, 0x61, 0x6e, 0x6f, 0x73, 0x70, 0x65, 0x73, 0x6f, 0x20, 0x64, 0x6f, 0x6d,
+0x69, 0x6e, 0x69, 0x63, 0x61, 0x6e, 0x6f, 0x3b, 0x3b, 0x70, 0x65, 0x73, 0x6f, 0x20, 0x64, 0x6f, 0x6d, 0x69, 0x6e, 0x69,
+0x63, 0x61, 0x6e, 0x6f, 0x3b, 0x3b, 0x3b, 0x3b, 0x70, 0x65, 0x73, 0x6f, 0x73, 0x20, 0x64, 0x6f, 0x6d, 0x69, 0x6e, 0x69,
+0x63, 0x61, 0x6e, 0x6f, 0x73, 0x64, 0xf3, 0x6c, 0x61, 0x72, 0x20, 0x65, 0x73, 0x74, 0x61, 0x64, 0x6f, 0x75, 0x6e, 0x69,
+0x64, 0x65, 0x6e, 0x73, 0x65, 0x3b, 0x3b, 0x64, 0xf3, 0x6c, 0x61, 0x72, 0x20, 0x65, 0x73, 0x74, 0x61, 0x64, 0x6f, 0x75,
+0x6e, 0x69, 0x64, 0x65, 0x6e, 0x73, 0x65, 0x3b, 0x3b, 0x3b, 0x3b, 0x64, 0xf3, 0x6c, 0x61, 0x72, 0x65, 0x73, 0x20, 0x65,
+0x73, 0x74, 0x61, 0x64, 0x6f, 0x75, 0x6e, 0x69, 0x64, 0x65, 0x6e, 0x73, 0x65, 0x73, 0x66, 0x72, 0x61, 0x6e, 0x63, 0x6f,
+0x20, 0x43, 0x46, 0x41, 0x20, 0x64, 0x65, 0x20, 0xc1, 0x66, 0x72, 0x69, 0x63, 0x61, 0x20, 0x43, 0x65, 0x6e, 0x74, 0x72,
+0x61, 0x6c, 0x3b, 0x3b, 0x66, 0x72, 0x61, 0x6e, 0x63, 0x6f, 0x20, 0x43, 0x46, 0x41, 0x20, 0x64, 0x65, 0x20, 0xc1, 0x66,
+0x72, 0x69, 0x63, 0x61, 0x20, 0x43, 0x65, 0x6e, 0x74, 0x72, 0x61, 0x6c, 0x3b, 0x3b, 0x3b, 0x3b, 0x66, 0x72, 0x61, 0x6e,
+0x63, 0x6f, 0x73, 0x20, 0x43, 0x46, 0x41, 0x20, 0x64, 0x65, 0x20, 0xc1, 0x66, 0x72, 0x69, 0x63, 0x61, 0x20, 0x43, 0x65,
+0x6e, 0x74, 0x72, 0x61, 0x6c, 0x71, 0x75, 0x65, 0x74, 0x7a, 0x61, 0x6c, 0x3b, 0x3b, 0x71, 0x75, 0x65, 0x74, 0x7a, 0x61,
+0x6c, 0x3b, 0x3b, 0x3b, 0x3b, 0x71, 0x75, 0x65, 0x74, 0x7a, 0x61, 0x6c, 0x65, 0x73, 0x6c, 0x65, 0x6d, 0x70, 0x69, 0x72,
+0x61, 0x20, 0x68, 0x6f, 0x6e, 0x64, 0x75, 0x72, 0x65, 0xf1, 0x6f, 0x3b, 0x3b, 0x6c, 0x65, 0x6d, 0x70, 0x69, 0x72, 0x61,
+0x20, 0x68, 0x6f, 0x6e, 0x64, 0x75, 0x72, 0x65, 0xf1, 0x6f, 0x3b, 0x3b, 0x3b, 0x3b, 0x6c, 0x65, 0x6d, 0x70, 0x69, 0x72,
+0x61, 0x73, 0x20, 0x68, 0x6f, 0x6e, 0x64, 0x75, 0x72, 0x65, 0xf1, 0x6f, 0x73, 0x70, 0x65, 0x73, 0x6f, 0x20, 0x6d, 0x65,
+0x78, 0x69, 0x63, 0x61, 0x6e, 0x6f, 0x3b, 0x3b, 0x70, 0x65, 0x73, 0x6f, 0x20, 0x6d, 0x65, 0x78, 0x69, 0x63, 0x61, 0x6e,
+0x6f, 0x3b, 0x3b, 0x3b, 0x3b, 0x70, 0x65, 0x73, 0x6f, 0x73, 0x20, 0x6d, 0x65, 0x78, 0x69, 0x63, 0x61, 0x6e, 0x6f, 0x73,
+0x63, 0xf3, 0x72, 0x64, 0x6f, 0x62, 0x61, 0x20, 0x6e, 0x69, 0x63, 0x61, 0x72, 0x61, 0x67, 0xfc, 0x65, 0x6e, 0x73, 0x65,
+0x3b, 0x3b, 0x63, 0xf3, 0x72, 0x64, 0x6f, 0x62, 0x61, 0x20, 0x6e, 0x69, 0x63, 0x61, 0x72, 0x61, 0x67, 0xfc, 0x65, 0x6e,
+0x73, 0x65, 0x3b, 0x3b, 0x3b, 0x3b, 0x63, 0xf3, 0x72, 0x64, 0x6f, 0x62, 0x61, 0x73, 0x20, 0x6e, 0x69, 0x63, 0x61, 0x72,
+0x61, 0x67, 0xfc, 0x65, 0x6e, 0x73, 0x65, 0x73, 0x62, 0x61, 0x6c, 0x62, 0x6f, 0x61, 0x20, 0x70, 0x61, 0x6e, 0x61, 0x6d,
+0x65, 0xf1, 0x6f, 0x3b, 0x3b, 0x62, 0x61, 0x6c, 0x62, 0x6f, 0x61, 0x20, 0x70, 0x61, 0x6e, 0x61, 0x6d, 0x65, 0xf1, 0x6f,
+0x3b, 0x3b, 0x3b, 0x3b, 0x62, 0x61, 0x6c, 0x62, 0x6f, 0x61, 0x73, 0x20, 0x70, 0x61, 0x6e, 0x61, 0x6d, 0x65, 0xf1, 0x6f,
+0x73, 0x67, 0x75, 0x61, 0x72, 0x61, 0x6e, 0xed, 0x20, 0x70, 0x61, 0x72, 0x61, 0x67, 0x75, 0x61, 0x79, 0x6f, 0x3b, 0x3b,
+0x67, 0x75, 0x61, 0x72, 0x61, 0x6e, 0xed, 0x20, 0x70, 0x61, 0x72, 0x61, 0x67, 0x75, 0x61, 0x79, 0x6f, 0x3b, 0x3b, 0x3b,
+0x3b, 0x67, 0x75, 0x61, 0x72, 0x61, 0x6e, 0xed, 0x65, 0x73, 0x20, 0x70, 0x61, 0x72, 0x61, 0x67, 0x75, 0x61, 0x79, 0x6f,
+0x73, 0x73, 0x6f, 0x6c, 0x20, 0x70, 0x65, 0x72, 0x75, 0x61, 0x6e, 0x6f, 0x3b, 0x3b, 0x73, 0x6f, 0x6c, 0x20, 0x70, 0x65,
+0x72, 0x75, 0x61, 0x6e, 0x6f, 0x3b, 0x3b, 0x3b, 0x3b, 0x73, 0x6f, 0x6c, 0x65, 0x73, 0x20, 0x70, 0x65, 0x72, 0x75, 0x61,
+0x6e, 0x6f, 0x73, 0x70, 0x65, 0x73, 0x6f, 0x20, 0x66, 0x69, 0x6c, 0x69, 0x70, 0x69, 0x6e, 0x6f, 0x3b, 0x3b, 0x70, 0x65,
+0x73, 0x6f, 0x20, 0x66, 0x69, 0x6c, 0x69, 0x70, 0x69, 0x6e, 0x6f, 0x3b, 0x3b, 0x3b, 0x3b, 0x70, 0x65, 0x73, 0x6f, 0x73,
+0x20, 0x66, 0x69, 0x6c, 0x69, 0x70, 0x69, 0x6e, 0x6f, 0x73, 0x70, 0x65, 0x73, 0x6f, 0x20, 0x75, 0x72, 0x75, 0x67, 0x75,
+0x61, 0x79, 0x6f, 0x3b, 0x3b, 0x70, 0x65, 0x73, 0x6f, 0x20, 0x75, 0x72, 0x75, 0x67, 0x75, 0x61, 0x79, 0x6f, 0x3b, 0x3b,
+0x3b, 0x3b, 0x70, 0x65, 0x73, 0x6f, 0x73, 0x20, 0x75, 0x72, 0x75, 0x67, 0x75, 0x61, 0x79, 0x6f, 0x73, 0x62, 0x6f, 0x6c,
+0xed, 0x76, 0x61, 0x72, 0x20, 0x73, 0x6f, 0x62, 0x65, 0x72, 0x61, 0x6e, 0x6f, 0x3b, 0x3b, 0x62, 0x6f, 0x6c, 0xed, 0x76,
+0x61, 0x72, 0x20, 0x73, 0x6f, 0x62, 0x65, 0x72, 0x61, 0x6e, 0x6f, 0x3b, 0x3b, 0x3b, 0x3b, 0x62, 0x6f, 0x6c, 0xed, 0x76,
+0x61, 0x72, 0x65, 0x73, 0x20, 0x73, 0x6f, 0x62, 0x65, 0x72, 0x61, 0x6e, 0x6f, 0x73, 0x53, 0x68, 0x69, 0x6c, 0x69, 0x6e,
+0x67, 0x69, 0x20, 0x79, 0x61, 0x20, 0x54, 0x61, 0x6e, 0x7a, 0x61, 0x6e, 0x69, 0x61, 0x3b, 0x3b, 0x73, 0x68, 0x69, 0x6c,
+0x69, 0x6e, 0x67, 0x69, 0x20, 0x79, 0x61, 0x20, 0x54, 0x61, 0x6e, 0x7a, 0x61, 0x6e, 0x69, 0x61, 0x3b, 0x3b, 0x3b, 0x3b,
+0x73, 0x68, 0x69, 0x6c, 0x69, 0x6e, 0x67, 0x69, 0x20, 0x7a, 0x61, 0x20, 0x54, 0x61, 0x6e, 0x7a, 0x61, 0x6e, 0x69, 0x61,
+0x46, 0x61, 0x72, 0x61, 0x6e, 0x67, 0x61, 0x20, 0x79, 0x61, 0x20, 0x4b, 0x6f, 0x6e, 0x67, 0x6f, 0x3b, 0x3b, 0x66, 0x61,
+0x72, 0x61, 0x6e, 0x67, 0x61, 0x20, 0x79, 0x61, 0x20, 0x4b, 0x6f, 0x6e, 0x67, 0x6f, 0x3b, 0x3b, 0x3b, 0x3b, 0x66, 0x61,
+0x72, 0x61, 0x6e, 0x67, 0x61, 0x20, 0x7a, 0x61, 0x20, 0x4b, 0x6f, 0x6e, 0x67, 0x6f, 0x53, 0x68, 0x69, 0x6c, 0x69, 0x6e,
+0x67, 0x69, 0x20, 0x79, 0x61, 0x20, 0x4b, 0x65, 0x6e, 0x79, 0x61, 0x3b, 0x3b, 0x73, 0x68, 0x69, 0x6c, 0x69, 0x6e, 0x67,
+0x69, 0x20, 0x79, 0x61, 0x20, 0x4b, 0x65, 0x6e, 0x79, 0x61, 0x3b, 0x3b, 0x3b, 0x3b, 0x73, 0x68, 0x69, 0x6c, 0x69, 0x6e,
+0x67, 0x69, 0x20, 0x7a, 0x61, 0x20, 0x4b, 0x65, 0x6e, 0x79, 0x61, 0x53, 0x68, 0x69, 0x6c, 0x69, 0x6e, 0x67, 0x69, 0x20,
+0x79, 0x61, 0x20, 0x55, 0x67, 0x61, 0x6e, 0x64, 0x61, 0x3b, 0x3b, 0x73, 0x68, 0x69, 0x6c, 0x69, 0x6e, 0x67, 0x69, 0x20,
+0x79, 0x61, 0x20, 0x55, 0x67, 0x61, 0x6e, 0x64, 0x61, 0x3b, 0x3b, 0x3b, 0x3b, 0x73, 0x68, 0x69, 0x6c, 0x69, 0x6e, 0x67,
+0x69, 0x20, 0x7a, 0x61, 0x20, 0x55, 0x67, 0x61, 0x6e, 0x64, 0x61, 0x73, 0x76, 0x65, 0x6e, 0x73, 0x6b, 0x20, 0x6b, 0x72,
+0x6f, 0x6e, 0x61, 0x3b, 0x3b, 0x73, 0x76, 0x65, 0x6e, 0x73, 0x6b, 0x20, 0x6b, 0x72, 0x6f, 0x6e, 0x61, 0x3b, 0x3b, 0x3b,
+0x3b, 0x73, 0x76, 0x65, 0x6e, 0x73, 0x6b, 0x61, 0x20, 0x6b, 0x72, 0x6f, 0x6e, 0x6f, 0x72, 0x421, 0x43e, 0x43c, 0x43e, 0x43d,
+0x4e3, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x421, 0x43e, 0x43c, 0x43e, 0x43d, 0x4e3, 0xb87, 0xba8, 0xbcd, 0xba4, 0xbbf, 0xbaf, 0x20,
+0xbb0, 0xbc2, 0xbaa, 0xbbe, 0xbaf, 0xbcd, 0x3b, 0x3b, 0xb87, 0xba8, 0xbcd, 0xba4, 0xbbf, 0xbaf, 0x20, 0xbb0, 0xbc2, 0xbaa, 0xbbe, 0xbaf,
+0xbcd, 0x3b, 0x3b, 0x3b, 0x3b, 0xb87, 0xba8, 0xbcd, 0xba4, 0xbbf, 0xbaf, 0x20, 0xbb0, 0xbc2, 0xbaa, 0xbbe, 0xbaf, 0xbcd, 0xb95, 0xbb3,
+0xbcd, 0xbae, 0xbb2, 0xbc7, 0xbb7, 0xbbf, 0xbaf, 0xba9, 0xbcd, 0x20, 0xbb0, 0xbbf, 0xb99, 0xbcd, 0xb95, 0xbbf, 0xb9f, 0xbcd, 0x3b, 0x3b,
+0xbae, 0xbb2, 0xbc7, 0xbb7, 0xbbf, 0xbaf, 0xba9, 0xbcd, 0x20, 0xbb0, 0xbbf, 0xb99, 0xbcd, 0xb95, 0xbbf, 0xb9f, 0xbcd, 0x3b, 0x3b, 0x3b,
+0x3b, 0xbae, 0xbb2, 0xbc7, 0xbb7, 0xbbf, 0xbaf, 0xba9, 0xbcd, 0x20, 0xbb0, 0xbbf, 0xb99, 0xbcd, 0xb95, 0xbbf, 0xb9f, 0xbcd, 0xb95, 0xbb3,
+0xbcd, 0xb9a, 0xbbf, 0xb99, 0xbcd, 0xb95, 0xbaa, 0xbcd, 0xbaa, 0xbc2, 0xbb0, 0xbcd, 0x20, 0xb9f, 0xbbe, 0xbb2, 0xbb0, 0xbcd, 0x3b, 0x3b,
+0xb9a, 0xbbf, 0xb99, 0xbcd, 0xb95, 0xbaa, 0xbcd, 0xbaa, 0xbc2, 0xbb0, 0xbcd, 0x20, 0xb9f, 0xbbe, 0xbb2, 0xbb0, 0xbcd, 0x3b, 0x3b, 0x3b,
+0x3b, 0xb9a, 0xbbf, 0xb99, 0xbcd, 0xb95, 0xbaa, 0xbcd, 0xbaa, 0xbc2, 0xbb0, 0xbcd, 0x20, 0xb9f, 0xbbe, 0xbb2, 0xbb0, 0xbcd, 0xb95, 0xbb3,
+0xbcd, 0xb87, 0xbb2, 0xb99, 0xbcd, 0xb95, 0xbc8, 0x20, 0xbb0, 0xbc2, 0xbaa, 0xbbe, 0xbaf, 0xbcd, 0x3b, 0x3b, 0xb87, 0xbb2, 0xb99, 0xbcd,
+0xb95, 0xbc8, 0x20, 0xbb0, 0xbc2, 0xbaa, 0xbbe, 0xbaf, 0xbcd, 0x3b, 0x3b, 0x3b, 0x3b, 0xb87, 0xbb2, 0xb99, 0xbcd, 0xb95, 0xbc8, 0x20,
+0xbb0, 0xbc2, 0xbaa, 0xbbe, 0xbaf, 0xbcd, 0xb95, 0xbb3, 0xbcd, 0x420, 0x43e, 0x441, 0x441, 0x438, 0x44f, 0x20, 0x441, 0x443, 0x43c, 0x44b,
+0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x441, 0x443, 0x43c, 0xc30, 0xc42, 0xc2a, 0xc3e, 0xc2f, 0xc3f, 0x3b, 0x3b, 0xc30, 0xc42, 0xc2a,
+0xc3e, 0xc2f, 0xc3f, 0x3b, 0x3b, 0x3b, 0x3b, 0xc30, 0xc42, 0xc2a, 0xc3e, 0xc2f, 0xc32, 0xc41, 0xe1a, 0xe32, 0xe17, 0x3b, 0x3b, 0x3b,
+0x3b, 0x3b, 0x3b, 0xe1a, 0xe32, 0xe17, 0xe44, 0xe17, 0xe22, 0xf61, 0xf74, 0xf0b, 0xf68, 0xf53, 0xf0b, 0xf62, 0xf92, 0xfb1, 0xf0b, 0xf42,
+0xf62, 0xf0b, 0xf66, 0xf92, 0xf7c, 0xf62, 0xf0b, 0x50, 0x61, 0x2bb, 0x61, 0x6e, 0x67, 0x61, 0x20, 0x66, 0x61, 0x6b, 0x61, 0x74,
+0x6f, 0x6e, 0x67, 0x61, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x50, 0x61, 0x2bb, 0x61, 0x6e, 0x67, 0x61, 0x20, 0x66, 0x61,
+0x6b, 0x61, 0x74, 0x6f, 0x6e, 0x67, 0x61, 0x54, 0xfc, 0x72, 0x6b, 0x20, 0x4c, 0x69, 0x72, 0x61, 0x73, 0x131, 0x3b, 0x3b,
+0x54, 0xfc, 0x72, 0x6b, 0x20, 0x6c, 0x69, 0x72, 0x61, 0x73, 0x131, 0x3b, 0x3b, 0x3b, 0x3b, 0x54, 0xfc, 0x72, 0x6b, 0x20,
+0x6c, 0x69, 0x72, 0x61, 0x73, 0x131, 0x54, 0xfc, 0x72, 0x6b, 0x6d, 0x65, 0x6e, 0x20, 0x6d, 0x61, 0x6e, 0x61, 0x64, 0x79,
 0x3b, 0x3b, 0x74, 0xfc, 0x72, 0x6b, 0x6d, 0x65, 0x6e, 0x20, 0x6d, 0x61, 0x6e, 0x61, 0x64, 0x79, 0x3b, 0x3b, 0x3b, 0x3b,
-0x74, 0xfc, 0x72, 0x6b, 0x6d, 0x65, 0x6e, 0x20, 0x6d, 0x61, 0x6e, 0x61, 0x64, 0x79, 0x3b, 0x62c, 0x6c7, 0x6ad, 0x6af, 0x648,
-0x20, 0x64a, 0x6c8, 0x6d5, 0x646, 0x649, 0x3b, 0x3b, 0x62c, 0x6c7, 0x6ad, 0x6af, 0x648, 0x20, 0x64a, 0x6c8, 0x6d5, 0x646, 0x649, 0x3b,
-0x3b, 0x3b, 0x3b, 0x62c, 0x6c7, 0x6ad, 0x6af, 0x648, 0x20, 0x64a, 0x6c8, 0x6d5, 0x646, 0x649, 0x3b, 0x443, 0x43a, 0x440, 0x430, 0x457,
-0x43d, 0x441, 0x44c, 0x43a, 0x430, 0x20, 0x433, 0x440, 0x438, 0x432, 0x43d, 0x44f, 0x3b, 0x3b, 0x433, 0x440, 0x438, 0x432, 0x43d, 0x44f,
-0x3b, 0x3b, 0x433, 0x440, 0x438, 0x432, 0x43d, 0x456, 0x3b, 0x433, 0x440, 0x438, 0x432, 0x435, 0x43d, 0x44c, 0x3b, 0x433, 0x440, 0x438,
-0x432, 0x43d, 0x456, 0x3b, 0x67e, 0x627, 0x6a9, 0x633, 0x62a, 0x627, 0x646, 0x6cc, 0x20, 0x631, 0x648, 0x67e, 0x6cc, 0x6c1, 0x3b, 0x3b,
-0x67e, 0x627, 0x6a9, 0x633, 0x62a, 0x627, 0x646, 0x6cc, 0x20, 0x631, 0x648, 0x67e, 0x6cc, 0x6c1, 0x3b, 0x3b, 0x3b, 0x3b, 0x67e, 0x627,
-0x6a9, 0x633, 0x62a, 0x627, 0x646, 0x6cc, 0x20, 0x631, 0x648, 0x67e, 0x6cc, 0x6c1, 0x3b, 0x628, 0x6be, 0x627, 0x631, 0x62a, 0x6cc, 0x20,
-0x631, 0x648, 0x67e, 0x6cc, 0x6c1, 0x3b, 0x3b, 0x628, 0x6be, 0x627, 0x631, 0x62a, 0x6cc, 0x20, 0x631, 0x648, 0x67e, 0x6cc, 0x6c1, 0x3b,
-0x3b, 0x3b, 0x3b, 0x628, 0x6be, 0x627, 0x631, 0x62a, 0x6cc, 0x20, 0x631, 0x648, 0x67e, 0x6d2, 0x3b, 0x4f, 0x2018, 0x7a, 0x62, 0x65,
-0x6b, 0x69, 0x73, 0x74, 0x6f, 0x6e, 0x20, 0x73, 0x6f, 0x2018, 0x6d, 0x69, 0x3b, 0x3b, 0x4f, 0x2018, 0x7a, 0x62, 0x65, 0x6b,
-0x69, 0x73, 0x74, 0x6f, 0x6e, 0x20, 0x73, 0x6f, 0x2018, 0x6d, 0x69, 0x3b, 0x3b, 0x3b, 0x3b, 0x4f, 0x2018, 0x7a, 0x62, 0x65,
-0x6b, 0x69, 0x73, 0x74, 0x6f, 0x6e, 0x20, 0x73, 0x6f, 0x2018, 0x6d, 0x69, 0x3b, 0x627, 0x641, 0x63a, 0x627, 0x646, 0x6cc, 0x3b,
-0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x40e, 0x437, 0x431, 0x435, 0x43a, 0x438, 0x441, 0x442, 0x43e, 0x43d, 0x20, 0x441, 0x45e, 0x43c,
-0x3b, 0x3b, 0x40e, 0x437, 0x431, 0x435, 0x43a, 0x438, 0x441, 0x442, 0x43e, 0x43d, 0x20, 0x441, 0x45e, 0x43c, 0x3b, 0x3b, 0x3b, 0x3b,
-0x40e, 0x437, 0x431, 0x435, 0x43a, 0x438, 0x441, 0x442, 0x43e, 0x43d, 0x20, 0x441, 0x45e, 0x43c, 0x3b, 0x110, 0x1ed3, 0x6e, 0x67, 0x20,
+0x74, 0xfc, 0x72, 0x6b, 0x6d, 0x65, 0x6e, 0x20, 0x6d, 0x61, 0x6e, 0x61, 0x64, 0x79, 0x62c, 0x6c7, 0x6ad, 0x6af, 0x648, 0x20,
+0x64a, 0x6c8, 0x6d5, 0x646, 0x649, 0x3b, 0x3b, 0x62c, 0x6c7, 0x6ad, 0x6af, 0x648, 0x20, 0x64a, 0x6c8, 0x6d5, 0x646, 0x649, 0x3b, 0x3b,
+0x3b, 0x3b, 0x62c, 0x6c7, 0x6ad, 0x6af, 0x648, 0x20, 0x64a, 0x6c8, 0x6d5, 0x646, 0x649, 0x443, 0x43a, 0x440, 0x430, 0x457, 0x43d, 0x441,
+0x44c, 0x43a, 0x430, 0x20, 0x433, 0x440, 0x438, 0x432, 0x43d, 0x44f, 0x3b, 0x3b, 0x433, 0x440, 0x438, 0x432, 0x43d, 0x44f, 0x3b, 0x3b,
+0x433, 0x440, 0x438, 0x432, 0x43d, 0x456, 0x3b, 0x433, 0x440, 0x438, 0x432, 0x435, 0x43d, 0x44c, 0x3b, 0x433, 0x440, 0x438, 0x432, 0x43d,
+0x456, 0x67e, 0x627, 0x6a9, 0x633, 0x62a, 0x627, 0x646, 0x6cc, 0x20, 0x631, 0x648, 0x67e, 0x6cc, 0x6c1, 0x3b, 0x3b, 0x67e, 0x627, 0x6a9,
+0x633, 0x62a, 0x627, 0x646, 0x6cc, 0x20, 0x631, 0x648, 0x67e, 0x6cc, 0x6c1, 0x3b, 0x3b, 0x3b, 0x3b, 0x67e, 0x627, 0x6a9, 0x633, 0x62a,
+0x627, 0x646, 0x6cc, 0x20, 0x631, 0x648, 0x67e, 0x6cc, 0x6c1, 0x628, 0x6be, 0x627, 0x631, 0x62a, 0x6cc, 0x20, 0x631, 0x648, 0x67e, 0x6cc,
+0x6c1, 0x3b, 0x3b, 0x628, 0x6be, 0x627, 0x631, 0x62a, 0x6cc, 0x20, 0x631, 0x648, 0x67e, 0x6cc, 0x6c1, 0x3b, 0x3b, 0x3b, 0x3b, 0x628,
+0x6be, 0x627, 0x631, 0x62a, 0x6cc, 0x20, 0x631, 0x648, 0x67e, 0x6d2, 0x4f, 0x2018, 0x7a, 0x62, 0x65, 0x6b, 0x69, 0x73, 0x74, 0x6f,
+0x6e, 0x20, 0x73, 0x6f, 0x2018, 0x6d, 0x69, 0x3b, 0x3b, 0x4f, 0x2018, 0x7a, 0x62, 0x65, 0x6b, 0x69, 0x73, 0x74, 0x6f, 0x6e,
+0x20, 0x73, 0x6f, 0x2018, 0x6d, 0x69, 0x3b, 0x3b, 0x3b, 0x3b, 0x4f, 0x2018, 0x7a, 0x62, 0x65, 0x6b, 0x69, 0x73, 0x74, 0x6f,
+0x6e, 0x20, 0x73, 0x6f, 0x2018, 0x6d, 0x69, 0x40e, 0x437, 0x431, 0x435, 0x43a, 0x438, 0x441, 0x442, 0x43e, 0x43d, 0x20, 0x441, 0x45e,
+0x43c, 0x3b, 0x3b, 0x40e, 0x437, 0x431, 0x435, 0x43a, 0x438, 0x441, 0x442, 0x43e, 0x43d, 0x20, 0x441, 0x45e, 0x43c, 0x3b, 0x3b, 0x3b,
+0x3b, 0x40e, 0x437, 0x431, 0x435, 0x43a, 0x438, 0x441, 0x442, 0x43e, 0x43d, 0x20, 0x441, 0x45e, 0x43c, 0x110, 0x1ed3, 0x6e, 0x67, 0x20,
 0x56, 0x69, 0x1ec7, 0x74, 0x20, 0x4e, 0x61, 0x6d, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x110, 0x1ed3, 0x6e, 0x67, 0x20, 0x56,
-0x69, 0x1ec7, 0x74, 0x20, 0x4e, 0x61, 0x6d, 0x3b, 0x50, 0x75, 0x6e, 0x74, 0x20, 0x50, 0x72, 0x79, 0x64, 0x61, 0x69, 0x6e,
-0x3b, 0x70, 0x75, 0x6e, 0x74, 0x20, 0x50, 0x72, 0x79, 0x64, 0x61, 0x69, 0x6e, 0x3b, 0x62, 0x75, 0x6e, 0x74, 0x20, 0x50,
-0x72, 0x79, 0x64, 0x61, 0x69, 0x6e, 0x3b, 0x62, 0x75, 0x6e, 0x74, 0x20, 0x50, 0x72, 0x79, 0x64, 0x61, 0x69, 0x6e, 0x3b,
-0x70, 0x75, 0x6e, 0x74, 0x20, 0x50, 0x72, 0x79, 0x64, 0x61, 0x69, 0x6e, 0x3b, 0x70, 0x75, 0x6e, 0x74, 0x20, 0x50, 0x72,
-0x79, 0x64, 0x61, 0x69, 0x6e, 0x3b, 0x70, 0x75, 0x6e, 0x74, 0x20, 0x50, 0x72, 0x79, 0x64, 0x61, 0x69, 0x6e, 0x3b, 0x46,
-0x72, 0x61, 0x6e, 0x63, 0x20, 0x43, 0x46, 0x41, 0x20, 0x62, 0x75, 0x20, 0x41, 0x66, 0x72, 0x69, 0x6b, 0x20, 0x53, 0x6f,
-0x77, 0x77, 0x75, 0x2d, 0x6a, 0x61, 0x6e, 0x74, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x46, 0x72, 0x61, 0x6e, 0x63, 0x20,
-0x43, 0x46, 0x41, 0x20, 0x79, 0x75, 0x20, 0x41, 0x66, 0x72, 0x69, 0x6b, 0x20, 0x53, 0x6f, 0x77, 0x77, 0x75, 0x2d, 0x6a,
-0x61, 0x6e, 0x74, 0x3b, 0x69, 0x52, 0x61, 0x6e, 0x64, 0x69, 0x20, 0x79, 0x61, 0x73, 0x65, 0x4d, 0x7a, 0x61, 0x6e, 0x7a,
-0x69, 0x20, 0x41, 0x66, 0x72, 0x69, 0x6b, 0x61, 0x3b, 0x3b, 0x69, 0x52, 0x61, 0x6e, 0x64, 0x69, 0x20, 0x59, 0x61, 0x73,
-0x65, 0x4d, 0x7a, 0x61, 0x6e, 0x7a, 0x69, 0x20, 0x41, 0x66, 0x72, 0x69, 0x6b, 0x61, 0x3b, 0x3b, 0x3b, 0x3b, 0x69, 0x52,
-0x61, 0x6e, 0x64, 0x69, 0x20, 0x79, 0x61, 0x73, 0x65, 0x4d, 0x7a, 0x61, 0x6e, 0x7a, 0x69, 0x20, 0x41, 0x66, 0x72, 0x69,
-0x6b, 0x61, 0x3b, 0x4e, 0xe1, 0xec, 0x72, 0xe0, 0x20, 0x74, 0x69, 0x20, 0x4f, 0x72, 0xed, 0x6c, 0x1eb9, 0x300, 0x2d, 0xe8,
-0x64, 0xe8, 0x20, 0x4e, 0xe0, 0xec, 0x6a, 0xed, 0x72, 0xed, 0xe0, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x4e, 0xe1, 0xed,
-0x72, 0xe0, 0x20, 0x4e, 0xe0, 0xec, 0x6a, 0xed, 0x72, 0xed, 0xe0, 0x3b, 0x46, 0x61, 0x72, 0x61, 0x6e, 0x73, 0x69, 0x20,
-0x74, 0x69, 0x20, 0x4f, 0x72, 0xed, 0x6c, 0x25b, 0x301, 0xe8, 0x64, 0x65, 0x20, 0x42, 0x49, 0x4b, 0x45, 0x41, 0x4f, 0x3b,
-0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x69, 0x2d, 0x53, 0x6f, 0x75, 0x74, 0x68, 0x20, 0x41, 0x66, 0x72, 0x69, 0x63, 0x61,
-0x6e, 0x20, 0x52, 0x61, 0x6e, 0x64, 0x3b, 0x3b, 0x69, 0x2d, 0x53, 0x6f, 0x75, 0x74, 0x68, 0x20, 0x41, 0x66, 0x72, 0x69,
-0x63, 0x61, 0x6e, 0x20, 0x52, 0x61, 0x6e, 0x64, 0x3b, 0x3b, 0x3b, 0x3b, 0x69, 0x2d, 0x53, 0x6f, 0x75, 0x74, 0x68, 0x20,
-0x41, 0x66, 0x72, 0x69, 0x63, 0x61, 0x6e, 0x20, 0x52, 0x61, 0x6e, 0x64, 0x3b, 0x42, 0x6f, 0x73, 0x61, 0x6e, 0x73, 0x6b,
-0x6f, 0x68, 0x65, 0x72, 0x63, 0x65, 0x67, 0x6f, 0x76, 0x61, 0x10d, 0x6b, 0x61, 0x20, 0x6b, 0x6f, 0x6e, 0x76, 0x65, 0x72,
-0x74, 0x69, 0x62, 0x69, 0x6c, 0x6e, 0x61, 0x20, 0x6d, 0x61, 0x72, 0x6b, 0x61, 0x3b, 0x3b, 0x62, 0x6f, 0x73, 0x61, 0x6e,
-0x73, 0x6b, 0x6f, 0x68, 0x65, 0x72, 0x63, 0x65, 0x67, 0x6f, 0x76, 0x61, 0x10d, 0x6b, 0x61, 0x20, 0x6b, 0x6f, 0x6e, 0x76,
-0x65, 0x72, 0x74, 0x69, 0x62, 0x69, 0x6c, 0x6e, 0x61, 0x20, 0x6d, 0x61, 0x72, 0x6b, 0x61, 0x3b, 0x3b, 0x62, 0x6f, 0x73,
-0x61, 0x6e, 0x73, 0x6b, 0x6f, 0x68, 0x65, 0x72, 0x63, 0x65, 0x67, 0x6f, 0x76, 0x61, 0x10d, 0x6b, 0x65, 0x20, 0x6b, 0x6f,
-0x6e, 0x76, 0x65, 0x72, 0x74, 0x69, 0x62, 0x69, 0x6c, 0x6e, 0x65, 0x20, 0x6d, 0x61, 0x72, 0x6b, 0x65, 0x3b, 0x3b, 0x62,
-0x6f, 0x73, 0x61, 0x6e, 0x73, 0x6b, 0x6f, 0x68, 0x65, 0x72, 0x63, 0x65, 0x67, 0x6f, 0x76, 0x61, 0x10d, 0x6b, 0x69, 0x68,
-0x20, 0x6b, 0x6f, 0x6e, 0x76, 0x65, 0x72, 0x74, 0x69, 0x62, 0x69, 0x6c, 0x6e, 0x69, 0x68, 0x20, 0x6d, 0x61, 0x72, 0x61,
-0x6b, 0x61, 0x3b, 0x41a, 0x43e, 0x43d, 0x432, 0x435, 0x440, 0x442, 0x438, 0x431, 0x438, 0x43b, 0x43d, 0x430, 0x20, 0x43c, 0x430, 0x440,
-0x43a, 0x430, 0x3b, 0x3b, 0x431, 0x43e, 0x441, 0x430, 0x43d, 0x441, 0x43a, 0x43e, 0x2d, 0x445, 0x435, 0x440, 0x446, 0x435, 0x433, 0x43e,
-0x432, 0x430, 0x447, 0x43a, 0x430, 0x20, 0x43a, 0x43e, 0x43d, 0x432, 0x435, 0x440, 0x442, 0x438, 0x431, 0x438, 0x43b, 0x43d, 0x430, 0x20,
-0x43c, 0x430, 0x440, 0x43a, 0x430, 0x3b, 0x3b, 0x431, 0x43e, 0x441, 0x430, 0x43d, 0x441, 0x43a, 0x43e, 0x2d, 0x445, 0x435, 0x440, 0x446,
-0x435, 0x433, 0x43e, 0x432, 0x430, 0x447, 0x43a, 0x435, 0x20, 0x43a, 0x43e, 0x43d, 0x432, 0x435, 0x440, 0x442, 0x438, 0x431, 0x438, 0x43b,
-0x43d, 0x435, 0x20, 0x43c, 0x430, 0x440, 0x43a, 0x435, 0x3b, 0x3b, 0x431, 0x43e, 0x441, 0x430, 0x43d, 0x441, 0x43a, 0x43e, 0x2d, 0x445,
-0x435, 0x440, 0x446, 0x435, 0x433, 0x43e, 0x432, 0x430, 0x447, 0x43a, 0x438, 0x445, 0x20, 0x43a, 0x43e, 0x43d, 0x432, 0x435, 0x440, 0x442,
-0x438, 0x431, 0x438, 0x43b, 0x43d, 0x438, 0x445, 0x20, 0x43c, 0x430, 0x440, 0x430, 0x43a, 0x430, 0x3b, 0x47, 0x68, 0x61, 0x6e, 0x61,
-0x20, 0x53, 0x69, 0x64, 0x69, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x92d, 0x93e, 0x930, 0x924, 0x940, 0x92f, 0x20, 0x930,
-0x941, 0x92a, 0x92f, 0x93e, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x92d, 0x93e, 0x930, 0x924, 0x940, 0x92f, 0x20, 0x930, 0x941, 0x92a,
-0x92f, 0x93e, 0x3b, 0x4e, 0x61, 0x1ecb, 0x72, 0x61, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x53, 0x69, 0x6c, 0x69, 0x6e,
-0x67, 0x69, 0x20, 0x79, 0x61, 0x20, 0x4b, 0x65, 0x6e, 0x79, 0x61, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x67, 0x68,
-0x61, 0x6e, 0x61, 0x20, 0x73, 0x69, 0x256, 0x69, 0x3b, 0x3b, 0x67, 0x68, 0x61, 0x6e, 0x61, 0x20, 0x73, 0x69, 0x256, 0x69,
-0x3b, 0x3b, 0x3b, 0x3b, 0x67, 0x68, 0x61, 0x6e, 0x61, 0x20, 0x73, 0x69, 0x256, 0x69, 0x3b, 0x263, 0x65, 0x74, 0x6f, 0x256,
-0x6f, 0x66, 0x65, 0x20, 0x61, 0x66, 0x72, 0x69, 0x6b, 0x61, 0x67, 0x61, 0x20, 0x43, 0x46, 0x41, 0x20, 0x66, 0x72, 0x61,
-0x6e, 0x63, 0x20, 0x42, 0x43, 0x45, 0x41, 0x4f, 0x3b, 0x3b, 0x263, 0x65, 0x74, 0x6f, 0x256, 0x6f, 0x66, 0x65, 0x20, 0x61,
-0x66, 0x72, 0x69, 0x6b, 0x61, 0x67, 0x61, 0x20, 0x43, 0x46, 0x41, 0x20, 0x66, 0x72, 0x61, 0x6e, 0x63, 0x20, 0x42, 0x43,
-0x45, 0x41, 0x4f, 0x3b, 0x3b, 0x3b, 0x3b, 0x263, 0x65, 0x74, 0x6f, 0x256, 0x6f, 0x66, 0x65, 0x20, 0x61, 0x66, 0x72, 0x69,
-0x6b, 0x61, 0x67, 0x61, 0x20, 0x43, 0x46, 0x41, 0x20, 0x66, 0x72, 0x61, 0x6e, 0x63, 0x20, 0x42, 0x43, 0x45, 0x41, 0x4f,
-0x3b, 0x50, 0x69, 0x73, 0x6f, 0x20, 0x6e, 0x67, 0x20, 0x50, 0x69, 0x6c, 0x69, 0x70, 0x69, 0x6e, 0x61, 0x73, 0x3b, 0x3b,
-0x70, 0x69, 0x73, 0x6f, 0x20, 0x6e, 0x67, 0x20, 0x50, 0x69, 0x6c, 0x69, 0x70, 0x69, 0x6e, 0x61, 0x73, 0x3b, 0x3b, 0x3b,
-0x3b, 0x70, 0x69, 0x73, 0x6f, 0x20, 0x6e, 0x67, 0x20, 0x50, 0x69, 0x6c, 0x69, 0x70, 0x69, 0x6e, 0x61, 0x73, 0x3b, 0x53,
+0x69, 0x1ec7, 0x74, 0x20, 0x4e, 0x61, 0x6d, 0x50, 0x75, 0x6e, 0x74, 0x20, 0x50, 0x72, 0x79, 0x64, 0x61, 0x69, 0x6e, 0x3b,
+0x70, 0x75, 0x6e, 0x74, 0x20, 0x50, 0x72, 0x79, 0x64, 0x61, 0x69, 0x6e, 0x3b, 0x62, 0x75, 0x6e, 0x74, 0x20, 0x50, 0x72,
+0x79, 0x64, 0x61, 0x69, 0x6e, 0x3b, 0x62, 0x75, 0x6e, 0x74, 0x20, 0x50, 0x72, 0x79, 0x64, 0x61, 0x69, 0x6e, 0x3b, 0x70,
+0x75, 0x6e, 0x74, 0x20, 0x50, 0x72, 0x79, 0x64, 0x61, 0x69, 0x6e, 0x3b, 0x70, 0x75, 0x6e, 0x74, 0x20, 0x50, 0x72, 0x79,
+0x64, 0x61, 0x69, 0x6e, 0x3b, 0x70, 0x75, 0x6e, 0x74, 0x20, 0x50, 0x72, 0x79, 0x64, 0x61, 0x69, 0x6e, 0x46, 0x72, 0x61,
+0x6e, 0x63, 0x20, 0x43, 0x46, 0x41, 0x20, 0x62, 0x75, 0x20, 0x41, 0x66, 0x72, 0x69, 0x6b, 0x20, 0x53, 0x6f, 0x77, 0x77,
+0x75, 0x2d, 0x6a, 0x61, 0x6e, 0x74, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x46, 0x72, 0x61, 0x6e, 0x63, 0x20, 0x43, 0x46,
+0x41, 0x20, 0x79, 0x75, 0x20, 0x41, 0x66, 0x72, 0x69, 0x6b, 0x20, 0x53, 0x6f, 0x77, 0x77, 0x75, 0x2d, 0x6a, 0x61, 0x6e,
+0x74, 0x69, 0x52, 0x61, 0x6e, 0x64, 0x69, 0x20, 0x79, 0x61, 0x73, 0x65, 0x4d, 0x7a, 0x61, 0x6e, 0x7a, 0x69, 0x20, 0x41,
+0x66, 0x72, 0x69, 0x6b, 0x61, 0x3b, 0x3b, 0x69, 0x52, 0x61, 0x6e, 0x64, 0x69, 0x20, 0x59, 0x61, 0x73, 0x65, 0x4d, 0x7a,
+0x61, 0x6e, 0x7a, 0x69, 0x20, 0x41, 0x66, 0x72, 0x69, 0x6b, 0x61, 0x3b, 0x3b, 0x3b, 0x3b, 0x69, 0x52, 0x61, 0x6e, 0x64,
+0x69, 0x20, 0x79, 0x61, 0x73, 0x65, 0x4d, 0x7a, 0x61, 0x6e, 0x7a, 0x69, 0x20, 0x41, 0x66, 0x72, 0x69, 0x6b, 0x61, 0x4e,
+0xe1, 0xec, 0x72, 0xe0, 0x20, 0x74, 0x69, 0x20, 0x4f, 0x72, 0xed, 0x6c, 0x1eb9, 0x300, 0x2d, 0xe8, 0x64, 0xe8, 0x20, 0x4e,
+0xe0, 0xec, 0x6a, 0xed, 0x72, 0xed, 0xe0, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x4e, 0xe1, 0xed, 0x72, 0xe0, 0x20, 0x4e,
+0xe0, 0xec, 0x6a, 0xed, 0x72, 0xed, 0xe0, 0x46, 0x61, 0x72, 0x61, 0x6e, 0x73, 0x69, 0x20, 0x74, 0x69, 0x20, 0x4f, 0x72,
+0xed, 0x6c, 0x25b, 0x301, 0xe8, 0x64, 0x65, 0x20, 0x42, 0x49, 0x4b, 0x45, 0x41, 0x4f, 0x69, 0x2d, 0x53, 0x6f, 0x75, 0x74,
+0x68, 0x20, 0x41, 0x66, 0x72, 0x69, 0x63, 0x61, 0x6e, 0x20, 0x52, 0x61, 0x6e, 0x64, 0x3b, 0x3b, 0x69, 0x2d, 0x53, 0x6f,
+0x75, 0x74, 0x68, 0x20, 0x41, 0x66, 0x72, 0x69, 0x63, 0x61, 0x6e, 0x20, 0x52, 0x61, 0x6e, 0x64, 0x3b, 0x3b, 0x3b, 0x3b,
+0x69, 0x2d, 0x53, 0x6f, 0x75, 0x74, 0x68, 0x20, 0x41, 0x66, 0x72, 0x69, 0x63, 0x61, 0x6e, 0x20, 0x52, 0x61, 0x6e, 0x64,
+0x42, 0x6f, 0x73, 0x61, 0x6e, 0x73, 0x6b, 0x6f, 0x68, 0x65, 0x72, 0x63, 0x65, 0x67, 0x6f, 0x76, 0x61, 0x10d, 0x6b, 0x61,
+0x20, 0x6b, 0x6f, 0x6e, 0x76, 0x65, 0x72, 0x74, 0x69, 0x62, 0x69, 0x6c, 0x6e, 0x61, 0x20, 0x6d, 0x61, 0x72, 0x6b, 0x61,
+0x3b, 0x3b, 0x62, 0x6f, 0x73, 0x61, 0x6e, 0x73, 0x6b, 0x6f, 0x68, 0x65, 0x72, 0x63, 0x65, 0x67, 0x6f, 0x76, 0x61, 0x10d,
+0x6b, 0x61, 0x20, 0x6b, 0x6f, 0x6e, 0x76, 0x65, 0x72, 0x74, 0x69, 0x62, 0x69, 0x6c, 0x6e, 0x61, 0x20, 0x6d, 0x61, 0x72,
+0x6b, 0x61, 0x3b, 0x3b, 0x62, 0x6f, 0x73, 0x61, 0x6e, 0x73, 0x6b, 0x6f, 0x68, 0x65, 0x72, 0x63, 0x65, 0x67, 0x6f, 0x76,
+0x61, 0x10d, 0x6b, 0x65, 0x20, 0x6b, 0x6f, 0x6e, 0x76, 0x65, 0x72, 0x74, 0x69, 0x62, 0x69, 0x6c, 0x6e, 0x65, 0x20, 0x6d,
+0x61, 0x72, 0x6b, 0x65, 0x3b, 0x3b, 0x62, 0x6f, 0x73, 0x61, 0x6e, 0x73, 0x6b, 0x6f, 0x68, 0x65, 0x72, 0x63, 0x65, 0x67,
+0x6f, 0x76, 0x61, 0x10d, 0x6b, 0x69, 0x68, 0x20, 0x6b, 0x6f, 0x6e, 0x76, 0x65, 0x72, 0x74, 0x69, 0x62, 0x69, 0x6c, 0x6e,
+0x69, 0x68, 0x20, 0x6d, 0x61, 0x72, 0x61, 0x6b, 0x61, 0x41a, 0x43e, 0x43d, 0x432, 0x435, 0x440, 0x442, 0x438, 0x431, 0x438, 0x43b,
+0x43d, 0x430, 0x20, 0x43c, 0x430, 0x440, 0x43a, 0x430, 0x3b, 0x3b, 0x431, 0x43e, 0x441, 0x430, 0x43d, 0x441, 0x43a, 0x43e, 0x2d, 0x445,
+0x435, 0x440, 0x446, 0x435, 0x433, 0x43e, 0x432, 0x430, 0x447, 0x43a, 0x430, 0x20, 0x43a, 0x43e, 0x43d, 0x432, 0x435, 0x440, 0x442, 0x438,
+0x431, 0x438, 0x43b, 0x43d, 0x430, 0x20, 0x43c, 0x430, 0x440, 0x43a, 0x430, 0x3b, 0x3b, 0x431, 0x43e, 0x441, 0x430, 0x43d, 0x441, 0x43a,
+0x43e, 0x2d, 0x445, 0x435, 0x440, 0x446, 0x435, 0x433, 0x43e, 0x432, 0x430, 0x447, 0x43a, 0x435, 0x20, 0x43a, 0x43e, 0x43d, 0x432, 0x435,
+0x440, 0x442, 0x438, 0x431, 0x438, 0x43b, 0x43d, 0x435, 0x20, 0x43c, 0x430, 0x440, 0x43a, 0x435, 0x3b, 0x3b, 0x431, 0x43e, 0x441, 0x430,
+0x43d, 0x441, 0x43a, 0x43e, 0x2d, 0x445, 0x435, 0x440, 0x446, 0x435, 0x433, 0x43e, 0x432, 0x430, 0x447, 0x43a, 0x438, 0x445, 0x20, 0x43a,
+0x43e, 0x43d, 0x432, 0x435, 0x440, 0x442, 0x438, 0x431, 0x438, 0x43b, 0x43d, 0x438, 0x445, 0x20, 0x43c, 0x430, 0x440, 0x430, 0x43a, 0x430,
+0x47, 0x68, 0x61, 0x6e, 0x61, 0x20, 0x53, 0x69, 0x64, 0x69, 0x92d, 0x93e, 0x930, 0x924, 0x940, 0x92f, 0x20, 0x930, 0x941, 0x92a,
+0x92f, 0x93e, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x92d, 0x93e, 0x930, 0x924, 0x940, 0x92f, 0x20, 0x930, 0x941, 0x92a, 0x92f, 0x93e,
+0x4e, 0x61, 0x1ecb, 0x72, 0x61, 0x53, 0x69, 0x6c, 0x69, 0x6e, 0x67, 0x69, 0x20, 0x79, 0x61, 0x20, 0x4b, 0x65, 0x6e, 0x79,
+0x61, 0x67, 0x68, 0x61, 0x6e, 0x61, 0x20, 0x73, 0x69, 0x256, 0x69, 0x3b, 0x3b, 0x67, 0x68, 0x61, 0x6e, 0x61, 0x20, 0x73,
+0x69, 0x256, 0x69, 0x3b, 0x3b, 0x3b, 0x3b, 0x67, 0x68, 0x61, 0x6e, 0x61, 0x20, 0x73, 0x69, 0x256, 0x69, 0x263, 0x65, 0x74,
+0x6f, 0x256, 0x6f, 0x66, 0x65, 0x20, 0x61, 0x66, 0x72, 0x69, 0x6b, 0x61, 0x67, 0x61, 0x20, 0x43, 0x46, 0x41, 0x20, 0x66,
+0x72, 0x61, 0x6e, 0x63, 0x20, 0x42, 0x43, 0x45, 0x41, 0x4f, 0x3b, 0x3b, 0x263, 0x65, 0x74, 0x6f, 0x256, 0x6f, 0x66, 0x65,
+0x20, 0x61, 0x66, 0x72, 0x69, 0x6b, 0x61, 0x67, 0x61, 0x20, 0x43, 0x46, 0x41, 0x20, 0x66, 0x72, 0x61, 0x6e, 0x63, 0x20,
+0x42, 0x43, 0x45, 0x41, 0x4f, 0x3b, 0x3b, 0x3b, 0x3b, 0x263, 0x65, 0x74, 0x6f, 0x256, 0x6f, 0x66, 0x65, 0x20, 0x61, 0x66,
+0x72, 0x69, 0x6b, 0x61, 0x67, 0x61, 0x20, 0x43, 0x46, 0x41, 0x20, 0x66, 0x72, 0x61, 0x6e, 0x63, 0x20, 0x42, 0x43, 0x45,
+0x41, 0x4f, 0x50, 0x69, 0x73, 0x6f, 0x20, 0x6e, 0x67, 0x20, 0x50, 0x69, 0x6c, 0x69, 0x70, 0x69, 0x6e, 0x61, 0x73, 0x3b,
+0x3b, 0x70, 0x69, 0x73, 0x6f, 0x20, 0x6e, 0x67, 0x20, 0x50, 0x69, 0x6c, 0x69, 0x70, 0x69, 0x6e, 0x61, 0x73, 0x3b, 0x3b,
+0x3b, 0x3b, 0x70, 0x69, 0x73, 0x6f, 0x20, 0x6e, 0x67, 0x20, 0x50, 0x69, 0x6c, 0x69, 0x70, 0x69, 0x6e, 0x61, 0x73, 0x53,
 0x63, 0x68, 0x77, 0x69, 0x69, 0x7a, 0x65, 0x72, 0x20, 0x46, 0x72, 0x61, 0x6e, 0x6b, 0x65, 0x3b, 0x3b, 0x53, 0x63, 0x68,
 0x77, 0x69, 0x69, 0x7a, 0x65, 0x72, 0x20, 0x46, 0x72, 0x61, 0x6e, 0x6b, 0x65, 0x3b, 0x3b, 0x3b, 0x3b, 0x53, 0x63, 0x68,
-0x77, 0x69, 0x69, 0x7a, 0x65, 0x72, 0x20, 0x46, 0x72, 0x61, 0x6e, 0x6b, 0x65, 0x3b, 0x45, 0x75, 0x72, 0x6f, 0x3b, 0x3b,
-0x3b, 0x3b, 0x3b, 0x3b, 0x45, 0x75, 0x72, 0x6f, 0x3b, 0x6e, 0x6f, 0x72, 0x67, 0x67, 0x61, 0x20, 0x6b, 0x72, 0x75, 0x76,
-0x64, 0x6e, 0x6f, 0x3b, 0x3b, 0x6e, 0x6f, 0x72, 0x67, 0x67, 0x61, 0x20, 0x6b, 0x72, 0x75, 0x76, 0x64, 0x6e, 0x6f, 0x3b,
-0x6e, 0x6f, 0x72, 0x67, 0x67, 0x61, 0x20, 0x6b, 0x72, 0x75, 0x76, 0x64, 0x6e, 0x6f, 0x3b, 0x3b, 0x3b, 0x6e, 0x6f, 0x72,
-0x67, 0x67, 0x61, 0x20, 0x6b, 0x72, 0x75, 0x76, 0x64, 0x6e, 0x6f, 0x3b, 0x65, 0x75, 0x72, 0x6f, 0x3b, 0x3b, 0x65, 0x75,
-0x72, 0x6f, 0x3b, 0x65, 0x75, 0x72, 0x6f, 0x3b, 0x3b, 0x3b, 0x65, 0x75, 0x72, 0x6f, 0x3b, 0x72, 0x75, 0x6f, 0x167, 0x167,
-0x61, 0x20, 0x6b, 0x72, 0x75, 0x76, 0x64, 0x6e, 0x6f, 0x3b, 0x3b, 0x72, 0x75, 0x6f, 0x167, 0x167, 0x61, 0x20, 0x6b, 0x72,
-0x75, 0x76, 0x64, 0x6e, 0x6f, 0x3b, 0x72, 0x75, 0x6f, 0x167, 0x167, 0x61, 0x20, 0x6b, 0x72, 0x75, 0x76, 0x64, 0x6e, 0x6f,
-0x3b, 0x3b, 0x3b, 0x72, 0x75, 0x6f, 0x167, 0x167, 0x61, 0x20, 0x6b, 0x72, 0x75, 0x76, 0x64, 0x6e, 0x6f, 0x3b, 0x53, 0x68,
-0x69, 0x6c, 0x69, 0x6e, 0x67, 0x69, 0x20, 0x79, 0x61, 0x20, 0x4b, 0x65, 0x6e, 0x79, 0x61, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b,
-0x3b, 0x3b, 0x4d, 0x62, 0x75, 0x75, 0x257, 0x75, 0x20, 0x53, 0x65, 0x65, 0x66, 0x61, 0x61, 0x20, 0x42, 0x43, 0x45, 0x41,
-0x4f, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x4d, 0x62, 0x75, 0x75, 0x257, 0x69, 0x20, 0x53, 0x65, 0x65, 0x66, 0x61,
-0x61, 0x20, 0x42, 0x45, 0x41, 0x43, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x44, 0x61, 0x6c, 0x61, 0x73, 0x69, 0x20,
-0x47, 0x61, 0x6d, 0x6d, 0x62, 0x69, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x44, 0x6f, 0x6c, 0x61, 0x61, 0x72, 0x20,
-0x4c, 0x69, 0x62, 0x65, 0x72, 0x69, 0x79, 0x61, 0x61, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x55, 0x67, 0x69, 0x79,
-0x79, 0x61, 0x20, 0x4d, 0x75, 0x72, 0x69, 0x74, 0x61, 0x6e, 0x69, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x4e, 0x61,
-0x79, 0x72, 0x61, 0x61, 0x20, 0x4e, 0x69, 0x6a, 0x65, 0x72, 0x69, 0x79, 0x61, 0x61, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b,
-0x3b, 0x4c, 0x65, 0x77, 0x6f, 0x6f, 0x6e, 0x20, 0x53, 0x65, 0x72, 0x61, 0x61, 0x20, 0x4c, 0x69, 0x79, 0x6f, 0x6e, 0x3b,
-0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x43, 0x69, 0x72, 0x69, 0x6e, 0x67, 0x69, 0x20, 0x79, 0x61, 0x20, 0x4b, 0x65, 0x6e,
-0x79, 0x61, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x4e, 0x6a, 0x69, 0x6c, 0x69, 0x6e, 0x67, 0x69, 0x20, 0x65, 0x65,
-0x6c, 0x20, 0x4b, 0x65, 0x6e, 0x79, 0x61, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x4d, 0x65, 0x74, 0x69, 0x63, 0x61,
-0x6c, 0x20, 0x64, 0x65, 0x20, 0x4d, 0x6f, 0xe7, 0x61, 0x6d, 0x62, 0x69, 0x71, 0x75, 0x65, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b,
-0x3b, 0x3b, 0x44, 0x6f, 0x6c, 0x61, 0x20, 0x79, 0x61, 0x73, 0x65, 0x20, 0x41, 0x6d, 0x65, 0x6c, 0x69, 0x6b, 0x61, 0x3b,
-0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x68, 0x65, 0x6c, 0x65, 0x72, 0x69, 0x20, 0x73, 0x61, 0x20, 0x54, 0x61, 0x6e, 0x7a,
-0x61, 0x6e, 0x69, 0x61, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x2d30, 0x2d37, 0x2d54, 0x2d49, 0x2d4e, 0x20, 0x2d4f, 0x20, 0x2d4d,
-0x2d4e, 0x2d56, 0x2d54, 0x2d49, 0x2d31, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x61, 0x64, 0x72, 0x69, 0x6d, 0x20, 0x6e, 0x20,
-0x6c, 0x6d, 0x263, 0x72, 0x69, 0x62, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x41, 0x64, 0x69, 0x6e, 0x61, 0x72, 0x20,
-0x41, 0x7a, 0x7a, 0x61, 0x79, 0x72, 0x69, 0x3b, 0x3b, 0x41, 0x64, 0x69, 0x6e, 0x61, 0x72, 0x20, 0x6e, 0x20, 0x5a, 0x7a,
-0x61, 0x79, 0x65, 0x72, 0x3b, 0x3b, 0x3b, 0x3b, 0x49, 0x64, 0x69, 0x6e, 0x61, 0x72, 0x65, 0x6e, 0x20, 0x6e, 0x20, 0x5a,
-0x7a, 0x61, 0x79, 0x65, 0x72, 0x3b, 0x45, 0x73, 0x68, 0x69, 0x72, 0x69, 0x6e, 0x67, 0x69, 0x20, 0x79, 0x61, 0x20, 0x55,
-0x67, 0x61, 0x6e, 0x64, 0x61, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x53, 0x68, 0x69, 0x6c, 0x69, 0x6e, 0x67, 0x69,
-0x20, 0x79, 0x61, 0x20, 0x48, 0x75, 0x74, 0x61, 0x6e, 0x7a, 0x61, 0x6e, 0x69, 0x61, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b,
-0x3b, 0x53, 0x68, 0x69, 0x6c, 0x69, 0x6e, 0x67, 0x69, 0x20, 0x79, 0x61, 0x20, 0x54, 0x61, 0x6e, 0x7a, 0x61, 0x6e, 0x69,
-0x61, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x73, 0x65, 0x66, 0x61, 0x20, 0x46, 0x72, 0x61, 0x14b, 0x20, 0x28, 0x42,
-0x43, 0x45, 0x41, 0x4f, 0x29, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x55, 0x53, 0x20, 0x13a0, 0x13d5, 0x13b3, 0x3b, 0x3b,
-0x55, 0x53, 0x20, 0x13a0, 0x13d5, 0x13b3, 0x3b, 0x3b, 0x3b, 0x3b, 0x55, 0x53, 0x20, 0x13a0, 0x13d5, 0x13b3, 0x3b, 0x72, 0x6f, 0x75,
-0x70, 0x69, 0x20, 0x6d, 0x6f, 0x72, 0x69, 0x73, 0x69, 0x65, 0x6e, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x53, 0x68,
-0x69, 0x6c, 0xed, 0x69, 0x6e, 0x67, 0x69, 0x20, 0x79, 0x61, 0x20, 0x54, 0x61, 0x61, 0x6e, 0x73, 0x61, 0x6e, 0xed, 0x61,
-0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x53, 0x69, 0x6c, 0x69, 0x6e, 0x67, 0x69, 0x20, 0x65, 0x79, 0x61, 0x20, 0x59,
-0x75, 0x67, 0x61, 0x6e, 0x64, 0x61, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x53, 0x6b, 0x75, 0x64, 0x75, 0x20, 0x4b,
-0x61, 0x62, 0x75, 0x76, 0x65, 0x72, 0x64, 0x69, 0x61, 0x6e, 0x75, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x53, 0x6b, 0x75,
-0x64, 0x75, 0x20, 0x4b, 0x61, 0x62, 0x75, 0x76, 0x65, 0x72, 0x64, 0x69, 0x61, 0x6e, 0x75, 0x3b, 0x53, 0x69, 0x6c, 0x69,
-0x6e, 0x67, 0x69, 0x74, 0x61, 0x62, 0x20, 0x79, 0x61, 0x20, 0x4b, 0x65, 0x6e, 0x79, 0x61, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b,
-0x3b, 0x3b, 0x4e, 0x61, 0x6d, 0x69, 0x62, 0x69, 0x61, 0x20, 0x44, 0x6f, 0x6c, 0x6c, 0x61, 0x72, 0x69, 0x3b, 0x3b, 0x3b,
-0x3b, 0x3b, 0x3b, 0x3b, 0x45, 0x75, 0x72, 0x6f, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x49, 0x72, 0x6f, 0x70, 0x69,
-0x79, 0x69, 0x61, 0x6e, 0xed, 0x20, 0x65, 0x20, 0x4b, 0x65, 0x6e, 0x79, 0x61, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b,
-0x49, 0x72, 0x6f, 0x70, 0x69, 0x79, 0x69, 0x61, 0x6e, 0xed, 0x20, 0x65, 0x20, 0x54, 0x61, 0x6e, 0x7a, 0x61, 0x6e, 0x69,
-0x61, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x53, 0x69, 0x72, 0x69, 0x6e, 0x6a, 0x69, 0x20, 0x79, 0x61, 0x20, 0x4b,
-0x65, 0x6e, 0x79, 0x61, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x73, 0x68, 0x69, 0x6c, 0x69, 0x6e, 0x67, 0x69, 0x20,
-0x79, 0x61, 0x20, 0x54, 0x61, 0x6e, 0x64, 0x68, 0x61, 0x6e, 0x69, 0x61, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x41,
-0x6e, 0x67, 0x6f, 0x2019, 0x6f, 0x74, 0x6f, 0x6c, 0x20, 0x6c, 0x6f, 0x6b, 0x2019, 0x20, 0x55, 0x67, 0x61, 0x6e, 0x64, 0x61,
-0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x41, 0x6e, 0x67, 0x6f, 0x2019, 0x6f, 0x74, 0x6f, 0x6c, 0x20, 0x6c, 0x6f, 0x6b,
-0x2019, 0x20, 0x4b, 0x65, 0x6e, 0x79, 0x61, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x43, 0x46, 0x41, 0x20, 0x46, 0x72,
-0x61, 0x14b, 0x20, 0x28, 0x42, 0x43, 0x45, 0x41, 0x4f, 0x29, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x53, 0x69, 0x6c,
-0x69, 0x6e, 0x67, 0x20, 0x6d, 0x61, 0x72, 0x20, 0x4b, 0x65, 0x6e, 0x79, 0x61, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b,
-0x44, 0x65, 0x72, 0x68, 0x65, 0x6d, 0x20, 0x55, 0x6d, 0x65, 0x1e5b, 0x1e5b, 0x75, 0x6b, 0x69, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b,
-0x3b, 0x3b, 0x73, 0x68, 0x69, 0x6c, 0x69, 0x6e, 0x67, 0x69, 0x20, 0x79, 0x61, 0x20, 0x54, 0x61, 0x6e, 0x7a, 0x61, 0x6e,
-0x69, 0x61, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x930, 0x93e, 0x902, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x420,
-0x43e, 0x441, 0x441, 0x438, 0x439, 0x43d, 0x20, 0x441, 0x43e, 0x43c, 0x3b, 0x3b, 0x420, 0x43e, 0x441, 0x441, 0x438, 0x439, 0x43d, 0x20,
-0x441, 0x43e, 0x43c, 0x3b, 0x3b, 0x3b, 0x3b, 0x420, 0x43e, 0x441, 0x441, 0x438, 0x439, 0x43d, 0x20, 0x441, 0x43e, 0x44c, 0x43c, 0x430,
-0x448, 0x3b, 0x440, 0x461, 0x441, 0x441, 0x456, 0x301, 0x439, 0x441, 0x43a, 0x457, 0x439, 0x20, 0x440, 0xa64b, 0x301, 0x431, 0x43b, 0x44c,
-0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x440, 0x461, 0x441, 0x441, 0x456, 0x301, 0x439, 0x441, 0x43a, 0x430, 0x433, 0x461, 0x20, 0x440,
-0xa64b, 0x431, 0x43b, 0x467, 0x300, 0x3b, 0x4e, 0x66, 0x61, 0x6c, 0x61, 0x6e, 0x67, 0x61, 0x20, 0x77, 0x61, 0x20, 0x4b, 0x6f,
-0x6e, 0x67, 0x75, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x43, 0x46, 0x41, 0x20, 0x46, 0xe0, 0x6c, 0xe2, 0x14b, 0x20,
-0x42, 0x45, 0x41, 0x43, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x46, 0x72, 0x1ce, 0x14b, 0x20, 0x43, 0x46, 0x41, 0x20,
-0x28, 0x42, 0x45, 0x41, 0x43, 0x29, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x73, 0x65, 0x65, 0x66, 0x61, 0x20, 0x79,
-0x61, 0x74, 0x69, 0x20, 0x42, 0x43, 0x45, 0x41, 0x4f, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x46, 0x259, 0x6c, 0xe1,
-0x14b, 0x20, 0x43, 0x46, 0x41, 0x20, 0x28, 0x42, 0x45, 0x41, 0x43, 0x29, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x66,
-0x72, 0xe1, 0x14b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x73, 0x6f, 0x6c, 0x61, 0x69, 0x20, 0x42, 0x45, 0x41, 0x43,
-0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x46, 0x72, 0x61, 0x14b, 0x20, 0x43, 0x46, 0x41, 0x20, 0x42, 0x45, 0x41, 0x43,
-0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x410, 0x440, 0x430, 0x441, 0x441, 0x44b, 0x44b, 0x439, 0x430, 0x20, 0x441, 0x43e, 0x43b,
-0x43a, 0x443, 0x43e, 0x431, 0x430, 0x439, 0x430, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x410, 0x440, 0x430, 0x441, 0x441, 0x44b, 0x44b,
-0x439, 0x430, 0x20, 0x441, 0x43e, 0x43b, 0x43a, 0x443, 0x43e, 0x431, 0x430, 0x439, 0x430, 0x3b, 0x49, 0x68, 0x65, 0x6c, 0x61, 0x20,
-0x79, 0x61, 0x20, 0x54, 0x61, 0x6e, 0x73, 0x61, 0x6e, 0x69, 0x79, 0x61, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0xa55e,
-0xa524, 0xa52b, 0xa569, 0x20, 0xa55c, 0xa55e, 0xa54c, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x4c, 0x61, 0x69, 0x62, 0x68, 0x69,
-0x79, 0x61, 0x20, 0x44, 0x61, 0x6c, 0x61, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x46, 0x25b, 0x6c, 0xe2, 0x14b, 0x3b,
-0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x46, 0x72, 0x61, 0x6e, 0x63, 0x20, 0x43, 0x46, 0x41, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b,
-0x3b, 0x3b, 0x73, 0x68, 0x69, 0x72, 0xe8, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x66, 0x65, 0x6c, 0xe1, 0x14b, 0x20,
-0x43, 0x46, 0x41, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x62f, 0x6cc, 0x646, 0x627, 0x631, 0x6cc, 0x20, 0x639, 0x6ce, 0x631,
-0x627, 0x642, 0x6cc, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x695, 0x6cc, 0x627, 0x6b5, 0x6cc, 0x20, 0x626, 0x6ce, 0x631, 0x627,
-0x646, 0x6cc, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x65, 0x75, 0x72, 0x6f, 0x3b, 0x3b, 0x65, 0x75, 0x72, 0x6f, 0x3b,
-0x65, 0x75, 0x72, 0x6f, 0x3b, 0x65, 0x75, 0x72, 0x6f, 0x3b, 0x3b, 0x65, 0x75, 0x72, 0x6f, 0x3b, 0x65, 0x75, 0x72, 0x6f,
-0x3b, 0x3b, 0x65, 0x75, 0x72, 0x6f, 0x3b, 0x65, 0x75, 0x72, 0x61, 0x6a, 0x3b, 0x65, 0x75, 0x72, 0x61, 0x3b, 0x3b, 0x65,
-0x75, 0x72, 0x6f, 0x77, 0x3b, 0x65, 0x75, 0x72, 0x6f, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x627, 0x6cc, 0x631, 0x627,
-0x646, 0x20, 0x631, 0x6cc, 0x627, 0x644, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x627, 0x6cc, 0x631, 0x627, 0x646, 0x20, 0x631, 0x6cc,
-0x627, 0x644, 0x3b, 0x6e2f, 0x5e63, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x6e2f, 0x5e63, 0x3b, 0x50, 0x68, 0x69, 0x6c, 0x69, 0x70,
-0x70, 0x69, 0x6e, 0x65, 0x20, 0x50, 0x69, 0x73, 0x6f, 0x3b, 0x3b, 0x50, 0x68, 0x69, 0x6c, 0x69, 0x70, 0x70, 0x69, 0x6e,
-0x65, 0x20, 0x70, 0x69, 0x73, 0x6f, 0x3b, 0x3b, 0x3b, 0x3b, 0x4d, 0x67, 0x61, 0x20, 0x50, 0x68, 0x69, 0x6c, 0x69, 0x70,
-0x70, 0x69, 0x6e, 0x65, 0x20, 0x70, 0x69, 0x73, 0x6f, 0x3b
+0x77, 0x69, 0x69, 0x7a, 0x65, 0x72, 0x20, 0x46, 0x72, 0x61, 0x6e, 0x6b, 0x65, 0x45, 0x75, 0x72, 0x6f, 0x3b, 0x3b, 0x3b,
+0x3b, 0x3b, 0x3b, 0x45, 0x75, 0x72, 0x6f, 0x6e, 0x6f, 0x72, 0x67, 0x67, 0x61, 0x20, 0x6b, 0x72, 0x75, 0x76, 0x64, 0x6e,
+0x6f, 0x3b, 0x3b, 0x6e, 0x6f, 0x72, 0x67, 0x67, 0x61, 0x20, 0x6b, 0x72, 0x75, 0x76, 0x64, 0x6e, 0x6f, 0x3b, 0x6e, 0x6f,
+0x72, 0x67, 0x67, 0x61, 0x20, 0x6b, 0x72, 0x75, 0x76, 0x64, 0x6e, 0x6f, 0x3b, 0x3b, 0x3b, 0x6e, 0x6f, 0x72, 0x67, 0x67,
+0x61, 0x20, 0x6b, 0x72, 0x75, 0x76, 0x64, 0x6e, 0x6f, 0x65, 0x75, 0x72, 0x6f, 0x3b, 0x3b, 0x65, 0x75, 0x72, 0x6f, 0x3b,
+0x65, 0x75, 0x72, 0x6f, 0x3b, 0x3b, 0x3b, 0x65, 0x75, 0x72, 0x6f, 0x72, 0x75, 0x6f, 0x167, 0x167, 0x61, 0x20, 0x6b, 0x72,
+0x75, 0x76, 0x64, 0x6e, 0x6f, 0x3b, 0x3b, 0x72, 0x75, 0x6f, 0x167, 0x167, 0x61, 0x20, 0x6b, 0x72, 0x75, 0x76, 0x64, 0x6e,
+0x6f, 0x3b, 0x72, 0x75, 0x6f, 0x167, 0x167, 0x61, 0x20, 0x6b, 0x72, 0x75, 0x76, 0x64, 0x6e, 0x6f, 0x3b, 0x3b, 0x3b, 0x72,
+0x75, 0x6f, 0x167, 0x167, 0x61, 0x20, 0x6b, 0x72, 0x75, 0x76, 0x64, 0x6e, 0x6f, 0x4d, 0x62, 0x75, 0x75, 0x257, 0x75, 0x20,
+0x53, 0x65, 0x65, 0x66, 0x61, 0x61, 0x20, 0x42, 0x43, 0x45, 0x41, 0x4f, 0x4d, 0x62, 0x75, 0x75, 0x257, 0x69, 0x20, 0x53,
+0x65, 0x65, 0x66, 0x61, 0x61, 0x20, 0x42, 0x45, 0x41, 0x43, 0x44, 0x61, 0x6c, 0x61, 0x73, 0x69, 0x20, 0x47, 0x61, 0x6d,
+0x6d, 0x62, 0x69, 0x44, 0x6f, 0x6c, 0x61, 0x61, 0x72, 0x20, 0x4c, 0x69, 0x62, 0x65, 0x72, 0x69, 0x79, 0x61, 0x61, 0x55,
+0x67, 0x69, 0x79, 0x79, 0x61, 0x20, 0x4d, 0x75, 0x72, 0x69, 0x74, 0x61, 0x6e, 0x69, 0x4e, 0x61, 0x79, 0x72, 0x61, 0x61,
+0x20, 0x4e, 0x69, 0x6a, 0x65, 0x72, 0x69, 0x79, 0x61, 0x61, 0x4c, 0x65, 0x77, 0x6f, 0x6f, 0x6e, 0x20, 0x53, 0x65, 0x72,
+0x61, 0x61, 0x20, 0x4c, 0x69, 0x79, 0x6f, 0x6e, 0x43, 0x69, 0x72, 0x69, 0x6e, 0x67, 0x69, 0x20, 0x79, 0x61, 0x20, 0x4b,
+0x65, 0x6e, 0x79, 0x61, 0x4e, 0x6a, 0x69, 0x6c, 0x69, 0x6e, 0x67, 0x69, 0x20, 0x65, 0x65, 0x6c, 0x20, 0x4b, 0x65, 0x6e,
+0x79, 0x61, 0x4d, 0x65, 0x74, 0x69, 0x63, 0x61, 0x6c, 0x20, 0x64, 0x65, 0x20, 0x4d, 0x6f, 0xe7, 0x61, 0x6d, 0x62, 0x69,
+0x71, 0x75, 0x65, 0x44, 0x6f, 0x6c, 0x61, 0x20, 0x79, 0x61, 0x73, 0x65, 0x20, 0x41, 0x6d, 0x65, 0x6c, 0x69, 0x6b, 0x61,
+0x68, 0x65, 0x6c, 0x65, 0x72, 0x69, 0x20, 0x73, 0x61, 0x20, 0x54, 0x61, 0x6e, 0x7a, 0x61, 0x6e, 0x69, 0x61, 0x2d30, 0x2d37,
+0x2d54, 0x2d49, 0x2d4e, 0x20, 0x2d4f, 0x20, 0x2d4d, 0x2d4e, 0x2d56, 0x2d54, 0x2d49, 0x2d31, 0x61, 0x64, 0x72, 0x69, 0x6d, 0x20, 0x6e, 0x20,
+0x6c, 0x6d, 0x263, 0x72, 0x69, 0x62, 0x41, 0x64, 0x69, 0x6e, 0x61, 0x72, 0x20, 0x41, 0x7a, 0x7a, 0x61, 0x79, 0x72, 0x69,
+0x3b, 0x3b, 0x41, 0x64, 0x69, 0x6e, 0x61, 0x72, 0x20, 0x6e, 0x20, 0x5a, 0x7a, 0x61, 0x79, 0x65, 0x72, 0x3b, 0x3b, 0x3b,
+0x3b, 0x49, 0x64, 0x69, 0x6e, 0x61, 0x72, 0x65, 0x6e, 0x20, 0x6e, 0x20, 0x5a, 0x7a, 0x61, 0x79, 0x65, 0x72, 0x45, 0x73,
+0x68, 0x69, 0x72, 0x69, 0x6e, 0x67, 0x69, 0x20, 0x79, 0x61, 0x20, 0x55, 0x67, 0x61, 0x6e, 0x64, 0x61, 0x53, 0x68, 0x69,
+0x6c, 0x69, 0x6e, 0x67, 0x69, 0x20, 0x79, 0x61, 0x20, 0x48, 0x75, 0x74, 0x61, 0x6e, 0x7a, 0x61, 0x6e, 0x69, 0x61, 0x73,
+0x65, 0x66, 0x61, 0x20, 0x46, 0x72, 0x61, 0x14b, 0x20, 0x28, 0x42, 0x43, 0x45, 0x41, 0x4f, 0x29, 0x55, 0x53, 0x20, 0x13a0,
+0x13d5, 0x13b3, 0x3b, 0x3b, 0x55, 0x53, 0x20, 0x13a0, 0x13d5, 0x13b3, 0x3b, 0x3b, 0x3b, 0x3b, 0x55, 0x53, 0x20, 0x13a0, 0x13d5, 0x13b3,
+0x72, 0x6f, 0x75, 0x70, 0x69, 0x20, 0x6d, 0x6f, 0x72, 0x69, 0x73, 0x69, 0x65, 0x6e, 0x53, 0x68, 0x69, 0x6c, 0xed, 0x69,
+0x6e, 0x67, 0x69, 0x20, 0x79, 0x61, 0x20, 0x54, 0x61, 0x61, 0x6e, 0x73, 0x61, 0x6e, 0xed, 0x61, 0x53, 0x69, 0x6c, 0x69,
+0x6e, 0x67, 0x69, 0x20, 0x65, 0x79, 0x61, 0x20, 0x59, 0x75, 0x67, 0x61, 0x6e, 0x64, 0x61, 0x53, 0x6b, 0x75, 0x64, 0x75,
+0x20, 0x4b, 0x61, 0x62, 0x75, 0x76, 0x65, 0x72, 0x64, 0x69, 0x61, 0x6e, 0x75, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x53,
+0x6b, 0x75, 0x64, 0x75, 0x20, 0x4b, 0x61, 0x62, 0x75, 0x76, 0x65, 0x72, 0x64, 0x69, 0x61, 0x6e, 0x75, 0x53, 0x69, 0x6c,
+0x69, 0x6e, 0x67, 0x69, 0x74, 0x61, 0x62, 0x20, 0x79, 0x61, 0x20, 0x4b, 0x65, 0x6e, 0x79, 0x61, 0x4e, 0x61, 0x6d, 0x69,
+0x62, 0x69, 0x61, 0x20, 0x44, 0x6f, 0x6c, 0x6c, 0x61, 0x72, 0x69, 0x49, 0x72, 0x6f, 0x70, 0x69, 0x79, 0x69, 0x61, 0x6e,
+0xed, 0x20, 0x65, 0x20, 0x4b, 0x65, 0x6e, 0x79, 0x61, 0x49, 0x72, 0x6f, 0x70, 0x69, 0x79, 0x69, 0x61, 0x6e, 0xed, 0x20,
+0x65, 0x20, 0x54, 0x61, 0x6e, 0x7a, 0x61, 0x6e, 0x69, 0x61, 0x53, 0x69, 0x72, 0x69, 0x6e, 0x6a, 0x69, 0x20, 0x79, 0x61,
+0x20, 0x4b, 0x65, 0x6e, 0x79, 0x61, 0x73, 0x68, 0x69, 0x6c, 0x69, 0x6e, 0x67, 0x69, 0x20, 0x79, 0x61, 0x20, 0x54, 0x61,
+0x6e, 0x64, 0x68, 0x61, 0x6e, 0x69, 0x61, 0x41, 0x6e, 0x67, 0x6f, 0x2019, 0x6f, 0x74, 0x6f, 0x6c, 0x20, 0x6c, 0x6f, 0x6b,
+0x2019, 0x20, 0x55, 0x67, 0x61, 0x6e, 0x64, 0x61, 0x41, 0x6e, 0x67, 0x6f, 0x2019, 0x6f, 0x74, 0x6f, 0x6c, 0x20, 0x6c, 0x6f,
+0x6b, 0x2019, 0x20, 0x4b, 0x65, 0x6e, 0x79, 0x61, 0x43, 0x46, 0x41, 0x20, 0x46, 0x72, 0x61, 0x14b, 0x20, 0x28, 0x42, 0x43,
+0x45, 0x41, 0x4f, 0x29, 0x53, 0x69, 0x6c, 0x69, 0x6e, 0x67, 0x20, 0x6d, 0x61, 0x72, 0x20, 0x4b, 0x65, 0x6e, 0x79, 0x61,
+0x44, 0x65, 0x72, 0x68, 0x65, 0x6d, 0x20, 0x55, 0x6d, 0x65, 0x1e5b, 0x1e5b, 0x75, 0x6b, 0x69, 0x930, 0x93e, 0x902, 0x420, 0x43e,
+0x441, 0x441, 0x438, 0x439, 0x43d, 0x20, 0x441, 0x43e, 0x43c, 0x3b, 0x3b, 0x420, 0x43e, 0x441, 0x441, 0x438, 0x439, 0x43d, 0x20, 0x441,
+0x43e, 0x43c, 0x3b, 0x3b, 0x3b, 0x3b, 0x420, 0x43e, 0x441, 0x441, 0x438, 0x439, 0x43d, 0x20, 0x441, 0x43e, 0x44c, 0x43c, 0x430, 0x448,
+0x440, 0x461, 0x441, 0x441, 0x456, 0x301, 0x439, 0x441, 0x43a, 0x457, 0x439, 0x20, 0x440, 0xa64b, 0x301, 0x431, 0x43b, 0x44c, 0x3b, 0x3b,
+0x3b, 0x3b, 0x3b, 0x3b, 0x440, 0x461, 0x441, 0x441, 0x456, 0x301, 0x439, 0x441, 0x43a, 0x430, 0x433, 0x461, 0x20, 0x440, 0xa64b, 0x431,
+0x43b, 0x467, 0x300, 0x4e, 0x66, 0x61, 0x6c, 0x61, 0x6e, 0x67, 0x61, 0x20, 0x77, 0x61, 0x20, 0x4b, 0x6f, 0x6e, 0x67, 0x75,
+0x43, 0x46, 0x41, 0x20, 0x46, 0xe0, 0x6c, 0xe2, 0x14b, 0x20, 0x42, 0x45, 0x41, 0x43, 0x46, 0x72, 0x1ce, 0x14b, 0x20, 0x43,
+0x46, 0x41, 0x20, 0x28, 0x42, 0x45, 0x41, 0x43, 0x29, 0x73, 0x65, 0x65, 0x66, 0x61, 0x20, 0x79, 0x61, 0x74, 0x69, 0x20,
+0x42, 0x43, 0x45, 0x41, 0x4f, 0x46, 0x259, 0x6c, 0xe1, 0x14b, 0x20, 0x43, 0x46, 0x41, 0x20, 0x28, 0x42, 0x45, 0x41, 0x43,
+0x29, 0x66, 0x72, 0xe1, 0x14b, 0x73, 0x6f, 0x6c, 0x61, 0x69, 0x20, 0x42, 0x45, 0x41, 0x43, 0x46, 0x72, 0x61, 0x14b, 0x20,
+0x43, 0x46, 0x41, 0x20, 0x42, 0x45, 0x41, 0x43, 0x410, 0x440, 0x430, 0x441, 0x441, 0x44b, 0x44b, 0x439, 0x430, 0x20, 0x441, 0x43e,
+0x43b, 0x43a, 0x443, 0x43e, 0x431, 0x430, 0x439, 0x430, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x410, 0x440, 0x430, 0x441, 0x441, 0x44b,
+0x44b, 0x439, 0x430, 0x20, 0x441, 0x43e, 0x43b, 0x43a, 0x443, 0x43e, 0x431, 0x430, 0x439, 0x430, 0x49, 0x68, 0x65, 0x6c, 0x61, 0x20,
+0x79, 0x61, 0x20, 0x54, 0x61, 0x6e, 0x73, 0x61, 0x6e, 0x69, 0x79, 0x61, 0xa55e, 0xa524, 0xa52b, 0xa569, 0x20, 0xa55c, 0xa55e, 0xa54c,
+0x4c, 0x61, 0x69, 0x62, 0x68, 0x69, 0x79, 0x61, 0x20, 0x44, 0x61, 0x6c, 0x61, 0x46, 0x25b, 0x6c, 0xe2, 0x14b, 0x73, 0x68,
+0x69, 0x72, 0xe8, 0x66, 0x65, 0x6c, 0xe1, 0x14b, 0x20, 0x43, 0x46, 0x41, 0xd804, 0xdd1d, 0xd804, 0xdd01, 0xd804, 0xdd23, 0xd804, 0xdd18,
+0xd804, 0xdd2c, 0xd804, 0xdd25, 0xd804, 0xdd28, 0x20, 0xd804, 0xdd11, 0xd804, 0xdd2c, 0xd804, 0xdd0b, 0x3b, 0x3b, 0xd804, 0xdd1d, 0xd804, 0xdd01, 0xd804,
+0xdd23, 0xd804, 0xdd18, 0xd804, 0xdd2c, 0xd804, 0xdd25, 0xd804, 0xdd28, 0x20, 0xd804, 0xdd11, 0xd804, 0xdd2c, 0xd804, 0xdd0b, 0x3b, 0x3b, 0x3b, 0x3b,
+0xd804, 0xdd1d, 0xd804, 0xdd01, 0xd804, 0xdd23, 0xd804, 0xdd18, 0xd804, 0xdd2c, 0xd804, 0xdd25, 0xd804, 0xdd28, 0x20, 0xd804, 0xdd11, 0xd804, 0xdd2c, 0xd804,
+0xdd0b, 0xd804, 0xdd03, 0xd804, 0xdd28, 0xd804, 0xdd1a, 0xd804, 0xdd34, 0xd804, 0xdd18, 0xd804, 0xdd28, 0xd804, 0xdd20, 0xd804, 0xdd1a, 0xd804, 0xdd34, 0x20,
+0xd804, 0xdd22, 0xd804, 0xdd2a, 0xd804, 0xdd1b, 0xd804, 0xdd28, 0x3b, 0x3b, 0xd804, 0xdd03, 0xd804, 0xdd28, 0xd804, 0xdd1a, 0xd804, 0xdd34, 0xd804, 0xdd18,
+0xd804, 0xdd28, 0xd804, 0xdd20, 0xd804, 0xdd1a, 0xd804, 0xdd34, 0x20, 0xd804, 0xdd22, 0xd804, 0xdd2a, 0xd804, 0xdd1b, 0xd804, 0xdd28, 0x3b, 0x3b, 0x3b,
+0x3b, 0xd804, 0xdd03, 0xd804, 0xdd28, 0xd804, 0xdd1a, 0xd804, 0xdd34, 0xd804, 0xdd18, 0xd804, 0xdd28, 0xd804, 0xdd20, 0xd804, 0xdd1a, 0xd804, 0xdd34, 0x20,
+0xd804, 0xdd22, 0xd804, 0xdd2a, 0xd804, 0xdd1b, 0xd804, 0xdd28, 0x62f, 0x6cc, 0x646, 0x627, 0x631, 0x6cc, 0x20, 0x639, 0x6ce, 0x631, 0x627, 0x642,
+0x6cc, 0x695, 0x6cc, 0x627, 0x6b5, 0x6cc, 0x20, 0x626, 0x6ce, 0x631, 0x627, 0x646, 0x6cc, 0x65, 0x75, 0x72, 0x6f, 0x3b, 0x3b, 0x65,
+0x75, 0x72, 0x6f, 0x3b, 0x65, 0x75, 0x72, 0x6f, 0x3b, 0x65, 0x75, 0x72, 0x6f, 0x3b, 0x3b, 0x65, 0x75, 0x72, 0x6f, 0x65,
+0x75, 0x72, 0x6f, 0x3b, 0x3b, 0x65, 0x75, 0x72, 0x6f, 0x3b, 0x65, 0x75, 0x72, 0x61, 0x6a, 0x3b, 0x65, 0x75, 0x72, 0x61,
+0x3b, 0x3b, 0x65, 0x75, 0x72, 0x6f, 0x77, 0x627, 0x6cc, 0x631, 0x627, 0x646, 0x20, 0x631, 0x6cc, 0x627, 0x644, 0x3b, 0x3b, 0x3b,
+0x3b, 0x3b, 0x3b, 0x627, 0x6cc, 0x631, 0x627, 0x646, 0x20, 0x631, 0x6cc, 0x627, 0x644, 0x6e2f, 0x5e63, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b,
+0x3b, 0x6e2f, 0x5e63, 0x50, 0x68, 0x69, 0x6c, 0x69, 0x70, 0x70, 0x69, 0x6e, 0x65, 0x20, 0x50, 0x69, 0x73, 0x6f, 0x3b, 0x3b,
+0x50, 0x68, 0x69, 0x6c, 0x69, 0x70, 0x70, 0x69, 0x6e, 0x65, 0x20, 0x70, 0x69, 0x73, 0x6f, 0x3b, 0x3b, 0x3b, 0x3b, 0x4d,
+0x67, 0x61, 0x20, 0x50, 0x68, 0x69, 0x6c, 0x69, 0x70, 0x70, 0x69, 0x6e, 0x65, 0x20, 0x70, 0x69, 0x73, 0x6f
 };
 
-static const ushort currency_format_data[] = {
+static const char16_t currency_format_data[] = {
 0x25, 0x31, 0x25, 0x32, 0x25, 0x32, 0x25, 0x31, 0x25, 0x32, 0xa0, 0x25, 0x31, 0x25, 0x31, 0xa0, 0x25, 0x32, 0x25, 0x32,
 0x25, 0x31, 0x4b, 0x25, 0x32, 0xa0, 0x2d, 0x25, 0x31, 0x28, 0x25, 0x31, 0xa0, 0x25, 0x32, 0x29, 0x25, 0x32, 0x2d, 0x25,
 0x31, 0x25, 0x32, 0xa0, 0x25, 0x31, 0x4b, 0x25, 0x31, 0xa0, 0x6b, 0x25, 0x32, 0x25, 0x32, 0xa0, 0x25, 0x31, 0x2d, 0x25,
@@ -4217,7 +4159,7 @@ static const ushort currency_format_data[] = {
 0x25, 0x32, 0x25, 0x32, 0xa0, 0x4d, 0x25, 0x31, 0x25, 0x32, 0x2d, 0x4d, 0x25, 0x31, 0x25, 0x32, 0x2d, 0xa0, 0x25, 0x31
 };
 
-static const ushort endonyms_data[] = {
+static const char16_t endonyms_data[] = {
 0x4f, 0x72, 0x6f, 0x6d, 0x6f, 0x6f, 0x49, 0x74, 0x6f, 0x6f, 0x70, 0x68, 0x69, 0x79, 0x61, 0x61, 0x4b, 0x65, 0x65, 0x6e,
 0x69, 0x79, 0x61, 0x61, 0x41, 0x66, 0x72, 0x69, 0x6b, 0x61, 0x61, 0x6e, 0x73, 0x53, 0x75, 0x69, 0x64, 0x2d, 0x41, 0x66,
 0x72, 0x69, 0x6b, 0x61, 0x4e, 0x61, 0x6d, 0x69, 0x62, 0x69, 0xeb, 0x73, 0x68, 0x71, 0x69, 0x70, 0x53, 0x68, 0x71, 0x69,
@@ -4252,271 +4194,267 @@ static const ushort endonyms_data[] = {
 0x69, 0x48, 0x72, 0x76, 0x61, 0x74, 0x73, 0x6b, 0x61, 0x42, 0x6f, 0x73, 0x6e, 0x61, 0x20, 0x69, 0x20, 0x48, 0x65, 0x72,
 0x63, 0x65, 0x67, 0x6f, 0x76, 0x69, 0x6e, 0x61, 0x10d, 0x65, 0x161, 0x74, 0x69, 0x6e, 0x61, 0x10c, 0x65, 0x73, 0x6b, 0x6f,
 0x64, 0x61, 0x6e, 0x73, 0x6b, 0x44, 0x61, 0x6e, 0x6d, 0x61, 0x72, 0x6b, 0x47, 0x72, 0xf8, 0x6e, 0x6c, 0x61, 0x6e, 0x64,
-0x4e, 0x65, 0x64, 0x65, 0x72, 0x6c, 0x61, 0x6e, 0x64, 0x73, 0x4e, 0x65, 0x64, 0x65, 0x72, 0x6c, 0x61, 0x6e, 0x64, 0x41,
-0x72, 0x75, 0x62, 0x61, 0x42, 0x65, 0x6c, 0x67, 0x69, 0xeb, 0x43, 0x75, 0x72, 0x61, 0xe7, 0x61, 0x6f, 0x53, 0x75, 0x72,
-0x69, 0x6e, 0x61, 0x6d, 0x65, 0x43, 0x61, 0x72, 0x69, 0x62, 0x69, 0x73, 0x63, 0x68, 0x20, 0x4e, 0x65, 0x64, 0x65, 0x72,
-0x6c, 0x61, 0x6e, 0x64, 0x53, 0x69, 0x6e, 0x74, 0x2d, 0x4d, 0x61, 0x61, 0x72, 0x74, 0x65, 0x6e, 0x41, 0x6d, 0x65, 0x72,
-0x69, 0x63, 0x61, 0x6e, 0x20, 0x45, 0x6e, 0x67, 0x6c, 0x69, 0x73, 0x68, 0x55, 0x6e, 0x69, 0x74, 0x65, 0x64, 0x20, 0x53,
-0x74, 0x61, 0x74, 0x65, 0x73, 0x45, 0x6e, 0x67, 0x6c, 0x69, 0x73, 0x68, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x6e,
-0x20, 0x53, 0x61, 0x6d, 0x6f, 0x61, 0x41, 0x6e, 0x67, 0x75, 0x69, 0x6c, 0x6c, 0x61, 0x41, 0x6e, 0x74, 0x69, 0x67, 0x75,
-0x61, 0x20, 0x26, 0x20, 0x42, 0x61, 0x72, 0x62, 0x75, 0x64, 0x61, 0x41, 0x75, 0x73, 0x74, 0x72, 0x61, 0x6c, 0x69, 0x61,
-0x6e, 0x20, 0x45, 0x6e, 0x67, 0x6c, 0x69, 0x73, 0x68, 0x41, 0x75, 0x73, 0x74, 0x72, 0x61, 0x6c, 0x69, 0x61, 0x41, 0x75,
-0x73, 0x74, 0x72, 0x69, 0x61, 0x42, 0x61, 0x68, 0x61, 0x6d, 0x61, 0x73, 0x42, 0x61, 0x72, 0x62, 0x61, 0x64, 0x6f, 0x73,
-0x42, 0x65, 0x6c, 0x67, 0x69, 0x75, 0x6d, 0x42, 0x65, 0x6c, 0x69, 0x7a, 0x65, 0x42, 0x65, 0x72, 0x6d, 0x75, 0x64, 0x61,
-0x42, 0x6f, 0x74, 0x73, 0x77, 0x61, 0x6e, 0x61, 0x42, 0x72, 0x69, 0x74, 0x69, 0x73, 0x68, 0x20, 0x49, 0x6e, 0x64, 0x69,
-0x61, 0x6e, 0x20, 0x4f, 0x63, 0x65, 0x61, 0x6e, 0x20, 0x54, 0x65, 0x72, 0x72, 0x69, 0x74, 0x6f, 0x72, 0x79, 0x42, 0x75,
-0x72, 0x75, 0x6e, 0x64, 0x69, 0x43, 0x61, 0x6d, 0x65, 0x72, 0x6f, 0x6f, 0x6e, 0x43, 0x61, 0x6e, 0x61, 0x64, 0x69, 0x61,
-0x6e, 0x20, 0x45, 0x6e, 0x67, 0x6c, 0x69, 0x73, 0x68, 0x43, 0x61, 0x6e, 0x61, 0x64, 0x61, 0x43, 0x61, 0x79, 0x6d, 0x61,
-0x6e, 0x20, 0x49, 0x73, 0x6c, 0x61, 0x6e, 0x64, 0x73, 0x43, 0x68, 0x72, 0x69, 0x73, 0x74, 0x6d, 0x61, 0x73, 0x20, 0x49,
-0x73, 0x6c, 0x61, 0x6e, 0x64, 0x43, 0x6f, 0x63, 0x6f, 0x73, 0x20, 0x28, 0x4b, 0x65, 0x65, 0x6c, 0x69, 0x6e, 0x67, 0x29,
-0x20, 0x49, 0x73, 0x6c, 0x61, 0x6e, 0x64, 0x73, 0x43, 0x6f, 0x6f, 0x6b, 0x20, 0x49, 0x73, 0x6c, 0x61, 0x6e, 0x64, 0x73,
-0x43, 0x79, 0x70, 0x72, 0x75, 0x73, 0x44, 0x65, 0x6e, 0x6d, 0x61, 0x72, 0x6b, 0x44, 0x6f, 0x6d, 0x69, 0x6e, 0x69, 0x63,
-0x61, 0x45, 0x72, 0x69, 0x74, 0x72, 0x65, 0x61, 0x46, 0x61, 0x6c, 0x6b, 0x6c, 0x61, 0x6e, 0x64, 0x20, 0x49, 0x73, 0x6c,
-0x61, 0x6e, 0x64, 0x73, 0x46, 0x69, 0x6a, 0x69, 0x46, 0x69, 0x6e, 0x6c, 0x61, 0x6e, 0x64, 0x47, 0x75, 0x65, 0x72, 0x6e,
-0x73, 0x65, 0x79, 0x47, 0x61, 0x6d, 0x62, 0x69, 0x61, 0x47, 0x65, 0x72, 0x6d, 0x61, 0x6e, 0x79, 0x47, 0x68, 0x61, 0x6e,
-0x61, 0x47, 0x69, 0x62, 0x72, 0x61, 0x6c, 0x74, 0x61, 0x72, 0x47, 0x72, 0x65, 0x6e, 0x61, 0x64, 0x61, 0x47, 0x75, 0x61,
-0x6d, 0x47, 0x75, 0x79, 0x61, 0x6e, 0x61, 0x48, 0x6f, 0x6e, 0x67, 0x20, 0x4b, 0x6f, 0x6e, 0x67, 0x20, 0x53, 0x41, 0x52,
-0x20, 0x43, 0x68, 0x69, 0x6e, 0x61, 0x49, 0x6e, 0x64, 0x69, 0x61, 0x49, 0x72, 0x65, 0x6c, 0x61, 0x6e, 0x64, 0x49, 0x73,
-0x72, 0x61, 0x65, 0x6c, 0x4a, 0x61, 0x6d, 0x61, 0x69, 0x63, 0x61, 0x4b, 0x65, 0x6e, 0x79, 0x61, 0x4b, 0x69, 0x72, 0x69,
-0x62, 0x61, 0x74, 0x69, 0x4c, 0x65, 0x73, 0x6f, 0x74, 0x68, 0x6f, 0x4c, 0x69, 0x62, 0x65, 0x72, 0x69, 0x61, 0x4d, 0x61,
-0x63, 0x61, 0x6f, 0x20, 0x53, 0x41, 0x52, 0x20, 0x43, 0x68, 0x69, 0x6e, 0x61, 0x4d, 0x61, 0x64, 0x61, 0x67, 0x61, 0x73,
-0x63, 0x61, 0x72, 0x4d, 0x61, 0x6c, 0x61, 0x77, 0x69, 0x4d, 0x61, 0x6c, 0x61, 0x79, 0x73, 0x69, 0x61, 0x4d, 0x61, 0x6c,
-0x74, 0x61, 0x4d, 0x61, 0x72, 0x73, 0x68, 0x61, 0x6c, 0x6c, 0x20, 0x49, 0x73, 0x6c, 0x61, 0x6e, 0x64, 0x73, 0x4d, 0x61,
-0x75, 0x72, 0x69, 0x74, 0x69, 0x75, 0x73, 0x4d, 0x69, 0x63, 0x72, 0x6f, 0x6e, 0x65, 0x73, 0x69, 0x61, 0x4d, 0x6f, 0x6e,
-0x74, 0x73, 0x65, 0x72, 0x72, 0x61, 0x74, 0x4e, 0x61, 0x6d, 0x69, 0x62, 0x69, 0x61, 0x4e, 0x61, 0x75, 0x72, 0x75, 0x4e,
-0x65, 0x74, 0x68, 0x65, 0x72, 0x6c, 0x61, 0x6e, 0x64, 0x73, 0x4e, 0x65, 0x77, 0x20, 0x5a, 0x65, 0x61, 0x6c, 0x61, 0x6e,
-0x64, 0x4e, 0x69, 0x67, 0x65, 0x72, 0x69, 0x61, 0x4e, 0x69, 0x75, 0x65, 0x4e, 0x6f, 0x72, 0x66, 0x6f, 0x6c, 0x6b, 0x20,
-0x49, 0x73, 0x6c, 0x61, 0x6e, 0x64, 0x4e, 0x6f, 0x72, 0x74, 0x68, 0x65, 0x72, 0x6e, 0x20, 0x4d, 0x61, 0x72, 0x69, 0x61,
-0x6e, 0x61, 0x20, 0x49, 0x73, 0x6c, 0x61, 0x6e, 0x64, 0x73, 0x50, 0x61, 0x6b, 0x69, 0x73, 0x74, 0x61, 0x6e, 0x50, 0x61,
-0x6c, 0x61, 0x75, 0x50, 0x61, 0x70, 0x75, 0x61, 0x20, 0x4e, 0x65, 0x77, 0x20, 0x47, 0x75, 0x69, 0x6e, 0x65, 0x61, 0x50,
-0x68, 0x69, 0x6c, 0x69, 0x70, 0x70, 0x69, 0x6e, 0x65, 0x73, 0x50, 0x69, 0x74, 0x63, 0x61, 0x69, 0x72, 0x6e, 0x20, 0x49,
-0x73, 0x6c, 0x61, 0x6e, 0x64, 0x73, 0x50, 0x75, 0x65, 0x72, 0x74, 0x6f, 0x20, 0x52, 0x69, 0x63, 0x6f, 0x52, 0x77, 0x61,
-0x6e, 0x64, 0x61, 0x53, 0x74, 0x20, 0x4b, 0x69, 0x74, 0x74, 0x73, 0x20, 0x26, 0x20, 0x4e, 0x65, 0x76, 0x69, 0x73, 0x53,
-0x74, 0x20, 0x4c, 0x75, 0x63, 0x69, 0x61, 0x53, 0x74, 0x20, 0x56, 0x69, 0x6e, 0x63, 0x65, 0x6e, 0x74, 0x20, 0x26, 0x20,
-0x47, 0x72, 0x65, 0x6e, 0x61, 0x64, 0x69, 0x6e, 0x65, 0x73, 0x53, 0x61, 0x6d, 0x6f, 0x61, 0x53, 0x65, 0x79, 0x63, 0x68,
-0x65, 0x6c, 0x6c, 0x65, 0x73, 0x53, 0x69, 0x65, 0x72, 0x72, 0x61, 0x20, 0x4c, 0x65, 0x6f, 0x6e, 0x65, 0x53, 0x69, 0x6e,
-0x67, 0x61, 0x70, 0x6f, 0x72, 0x65, 0x53, 0x6c, 0x6f, 0x76, 0x65, 0x6e, 0x69, 0x61, 0x53, 0x6f, 0x6c, 0x6f, 0x6d, 0x6f,
-0x6e, 0x20, 0x49, 0x73, 0x6c, 0x61, 0x6e, 0x64, 0x73, 0x53, 0x6f, 0x75, 0x74, 0x68, 0x20, 0x41, 0x66, 0x72, 0x69, 0x63,
-0x61, 0x53, 0x74, 0x20, 0x48, 0x65, 0x6c, 0x65, 0x6e, 0x61, 0x53, 0x75, 0x64, 0x61, 0x6e, 0x45, 0x73, 0x77, 0x61, 0x74,
-0x69, 0x6e, 0x69, 0x53, 0x77, 0x65, 0x64, 0x65, 0x6e, 0x53, 0x77, 0x69, 0x74, 0x7a, 0x65, 0x72, 0x6c, 0x61, 0x6e, 0x64,
-0x54, 0x61, 0x6e, 0x7a, 0x61, 0x6e, 0x69, 0x61, 0x54, 0x6f, 0x6b, 0x65, 0x6c, 0x61, 0x75, 0x54, 0x6f, 0x6e, 0x67, 0x61,
-0x54, 0x72, 0x69, 0x6e, 0x69, 0x64, 0x61, 0x64, 0x20, 0x26, 0x20, 0x54, 0x6f, 0x62, 0x61, 0x67, 0x6f, 0x54, 0x75, 0x72,
-0x6b, 0x73, 0x20, 0x26, 0x20, 0x43, 0x61, 0x69, 0x63, 0x6f, 0x73, 0x20, 0x49, 0x73, 0x6c, 0x61, 0x6e, 0x64, 0x73, 0x54,
-0x75, 0x76, 0x61, 0x6c, 0x75, 0x55, 0x67, 0x61, 0x6e, 0x64, 0x61, 0x55, 0x6e, 0x69, 0x74, 0x65, 0x64, 0x20, 0x41, 0x72,
-0x61, 0x62, 0x20, 0x45, 0x6d, 0x69, 0x72, 0x61, 0x74, 0x65, 0x73, 0x42, 0x72, 0x69, 0x74, 0x69, 0x73, 0x68, 0x20, 0x45,
-0x6e, 0x67, 0x6c, 0x69, 0x73, 0x68, 0x55, 0x6e, 0x69, 0x74, 0x65, 0x64, 0x20, 0x4b, 0x69, 0x6e, 0x67, 0x64, 0x6f, 0x6d,
-0x55, 0x2e, 0x53, 0x2e, 0x20, 0x4f, 0x75, 0x74, 0x6c, 0x79, 0x69, 0x6e, 0x67, 0x20, 0x49, 0x73, 0x6c, 0x61, 0x6e, 0x64,
-0x73, 0x56, 0x61, 0x6e, 0x75, 0x61, 0x74, 0x75, 0x42, 0x72, 0x69, 0x74, 0x69, 0x73, 0x68, 0x20, 0x56, 0x69, 0x72, 0x67,
-0x69, 0x6e, 0x20, 0x49, 0x73, 0x6c, 0x61, 0x6e, 0x64, 0x73, 0x55, 0x2e, 0x53, 0x2e, 0x20, 0x56, 0x69, 0x72, 0x67, 0x69,
-0x6e, 0x20, 0x49, 0x73, 0x6c, 0x61, 0x6e, 0x64, 0x73, 0x5a, 0x61, 0x6d, 0x62, 0x69, 0x61, 0x5a, 0x69, 0x6d, 0x62, 0x61,
-0x62, 0x77, 0x65, 0x44, 0x69, 0x65, 0x67, 0x6f, 0x20, 0x47, 0x61, 0x72, 0x63, 0x69, 0x61, 0x49, 0x73, 0x6c, 0x65, 0x20,
-0x6f, 0x66, 0x20, 0x4d, 0x61, 0x6e, 0x4a, 0x65, 0x72, 0x73, 0x65, 0x79, 0x53, 0x6f, 0x75, 0x74, 0x68, 0x20, 0x53, 0x75,
-0x64, 0x61, 0x6e, 0x53, 0x69, 0x6e, 0x74, 0x20, 0x4d, 0x61, 0x61, 0x72, 0x74, 0x65, 0x6e, 0x57, 0x6f, 0x72, 0x6c, 0x64,
-0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x65, 0x73, 0x70, 0x65, 0x72, 0x61, 0x6e, 0x74, 0x6f, 0x4d, 0x6f, 0x6e, 0x64, 0x6f,
-0x65, 0x65, 0x73, 0x74, 0x69, 0x45, 0x65, 0x73, 0x74, 0x69, 0x66, 0xf8, 0x72, 0x6f, 0x79, 0x73, 0x6b, 0x74, 0x46, 0xf8,
-0x72, 0x6f, 0x79, 0x61, 0x72, 0x73, 0x75, 0x6f, 0x6d, 0x69, 0x53, 0x75, 0x6f, 0x6d, 0x69, 0x66, 0x72, 0x61, 0x6e, 0xe7,
-0x61, 0x69, 0x73, 0x46, 0x72, 0x61, 0x6e, 0x63, 0x65, 0x41, 0x6c, 0x67, 0xe9, 0x72, 0x69, 0x65, 0x42, 0x65, 0x6c, 0x67,
-0x69, 0x71, 0x75, 0x65, 0x42, 0xe9, 0x6e, 0x69, 0x6e, 0x42, 0x75, 0x72, 0x6b, 0x69, 0x6e, 0x61, 0x20, 0x46, 0x61, 0x73,
-0x6f, 0x43, 0x61, 0x6d, 0x65, 0x72, 0x6f, 0x75, 0x6e, 0x66, 0x72, 0x61, 0x6e, 0xe7, 0x61, 0x69, 0x73, 0x20, 0x63, 0x61,
-0x6e, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x52, 0xe9, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x71, 0x75, 0x65, 0x20, 0x63, 0x65, 0x6e,
-0x74, 0x72, 0x61, 0x66, 0x72, 0x69, 0x63, 0x61, 0x69, 0x6e, 0x65, 0x54, 0x63, 0x68, 0x61, 0x64, 0x43, 0x6f, 0x6d, 0x6f,
-0x72, 0x65, 0x73, 0x43, 0x6f, 0x6e, 0x67, 0x6f, 0x2d, 0x4b, 0x69, 0x6e, 0x73, 0x68, 0x61, 0x73, 0x61, 0x43, 0x6f, 0x6e,
-0x67, 0x6f, 0x2d, 0x42, 0x72, 0x61, 0x7a, 0x7a, 0x61, 0x76, 0x69, 0x6c, 0x6c, 0x65, 0x43, 0xf4, 0x74, 0x65, 0x20, 0x64,
-0x2019, 0x49, 0x76, 0x6f, 0x69, 0x72, 0x65, 0x44, 0x6a, 0x69, 0x62, 0x6f, 0x75, 0x74, 0x69, 0x47, 0x75, 0x69, 0x6e, 0xe9,
-0x65, 0x20, 0xe9, 0x71, 0x75, 0x61, 0x74, 0x6f, 0x72, 0x69, 0x61, 0x6c, 0x65, 0x47, 0x75, 0x79, 0x61, 0x6e, 0x65, 0x20,
-0x66, 0x72, 0x61, 0x6e, 0xe7, 0x61, 0x69, 0x73, 0x65, 0x50, 0x6f, 0x6c, 0x79, 0x6e, 0xe9, 0x73, 0x69, 0x65, 0x20, 0x66,
-0x72, 0x61, 0x6e, 0xe7, 0x61, 0x69, 0x73, 0x65, 0x47, 0x61, 0x62, 0x6f, 0x6e, 0x47, 0x75, 0x61, 0x64, 0x65, 0x6c, 0x6f,
-0x75, 0x70, 0x65, 0x47, 0x75, 0x69, 0x6e, 0xe9, 0x65, 0x48, 0x61, 0xef, 0x74, 0x69, 0x4c, 0x75, 0x78, 0x65, 0x6d, 0x62,
-0x6f, 0x75, 0x72, 0x67, 0x4d, 0x61, 0x6c, 0x69, 0x4d, 0x61, 0x72, 0x74, 0x69, 0x6e, 0x69, 0x71, 0x75, 0x65, 0x4d, 0x61,
-0x75, 0x72, 0x69, 0x74, 0x61, 0x6e, 0x69, 0x65, 0x4d, 0x61, 0x75, 0x72, 0x69, 0x63, 0x65, 0x4d, 0x61, 0x79, 0x6f, 0x74,
-0x74, 0x65, 0x4d, 0x6f, 0x6e, 0x61, 0x63, 0x6f, 0x4d, 0x61, 0x72, 0x6f, 0x63, 0x4e, 0x6f, 0x75, 0x76, 0x65, 0x6c, 0x6c,
-0x65, 0x2d, 0x43, 0x61, 0x6c, 0xe9, 0x64, 0x6f, 0x6e, 0x69, 0x65, 0x4e, 0x69, 0x67, 0x65, 0x72, 0x4c, 0x61, 0x20, 0x52,
-0xe9, 0x75, 0x6e, 0x69, 0x6f, 0x6e, 0x53, 0xe9, 0x6e, 0xe9, 0x67, 0x61, 0x6c, 0x53, 0x61, 0x69, 0x6e, 0x74, 0x2d, 0x50,
-0x69, 0x65, 0x72, 0x72, 0x65, 0x2d, 0x65, 0x74, 0x2d, 0x4d, 0x69, 0x71, 0x75, 0x65, 0x6c, 0x6f, 0x6e, 0x66, 0x72, 0x61,
-0x6e, 0xe7, 0x61, 0x69, 0x73, 0x20, 0x73, 0x75, 0x69, 0x73, 0x73, 0x65, 0x53, 0x75, 0x69, 0x73, 0x73, 0x65, 0x53, 0x79,
-0x72, 0x69, 0x65, 0x54, 0x6f, 0x67, 0x6f, 0x54, 0x75, 0x6e, 0x69, 0x73, 0x69, 0x65, 0x57, 0x61, 0x6c, 0x6c, 0x69, 0x73,
-0x2d, 0x65, 0x74, 0x2d, 0x46, 0x75, 0x74, 0x75, 0x6e, 0x61, 0x53, 0x61, 0x69, 0x6e, 0x74, 0x2d, 0x42, 0x61, 0x72, 0x74,
-0x68, 0xe9, 0x6c, 0x65, 0x6d, 0x79, 0x53, 0x61, 0x69, 0x6e, 0x74, 0x2d, 0x4d, 0x61, 0x72, 0x74, 0x69, 0x6e, 0x46, 0x72,
-0x79, 0x73, 0x6b, 0x4e, 0x65, 0x64, 0x65, 0x72, 0x6c, 0xe2, 0x6e, 0x47, 0xe0, 0x69, 0x64, 0x68, 0x6c, 0x69, 0x67, 0x41,
-0x6e, 0x20, 0x52, 0xec, 0x6f, 0x67, 0x68, 0x61, 0x63, 0x68, 0x64, 0x20, 0x41, 0x6f, 0x6e, 0x61, 0x69, 0x63, 0x68, 0x74,
-0x65, 0x67, 0x61, 0x6c, 0x65, 0x67, 0x6f, 0x45, 0x73, 0x70, 0x61, 0xf1, 0x61, 0x10e5, 0x10d0, 0x10e0, 0x10d7, 0x10e3, 0x10da, 0x10d8,
-0x10e1, 0x10d0, 0x10e5, 0x10d0, 0x10e0, 0x10d7, 0x10d5, 0x10d4, 0x10da, 0x10dd, 0x44, 0x65, 0x75, 0x74, 0x73, 0x63, 0x68, 0x44, 0x65, 0x75,
-0x74, 0x73, 0x63, 0x68, 0x6c, 0x61, 0x6e, 0x64, 0xd6, 0x73, 0x74, 0x65, 0x72, 0x72, 0x65, 0x69, 0x63, 0x68, 0x69, 0x73,
-0x63, 0x68, 0x65, 0x73, 0x20, 0x44, 0x65, 0x75, 0x74, 0x73, 0x63, 0x68, 0xd6, 0x73, 0x74, 0x65, 0x72, 0x72, 0x65, 0x69,
-0x63, 0x68, 0x42, 0x65, 0x6c, 0x67, 0x69, 0x65, 0x6e, 0x49, 0x74, 0x61, 0x6c, 0x69, 0x65, 0x6e, 0x4c, 0x69, 0x65, 0x63,
-0x68, 0x74, 0x65, 0x6e, 0x73, 0x74, 0x65, 0x69, 0x6e, 0x4c, 0x75, 0x78, 0x65, 0x6d, 0x62, 0x75, 0x72, 0x67, 0x53, 0x63,
-0x68, 0x77, 0x65, 0x69, 0x7a, 0x65, 0x72, 0x20, 0x48, 0x6f, 0x63, 0x68, 0x64, 0x65, 0x75, 0x74, 0x73, 0x63, 0x68, 0x53,
-0x63, 0x68, 0x77, 0x65, 0x69, 0x7a, 0x395, 0x3bb, 0x3bb, 0x3b7, 0x3bd, 0x3b9, 0x3ba, 0x3ac, 0x395, 0x3bb, 0x3bb, 0x3ac, 0x3b4, 0x3b1,
-0x39a, 0x3cd, 0x3c0, 0x3c1, 0x3bf, 0x3c2, 0x6b, 0x61, 0x6c, 0x61, 0x61, 0x6c, 0x6c, 0x69, 0x73, 0x75, 0x74, 0x4b, 0x61, 0x6c,
-0x61, 0x61, 0x6c, 0x6c, 0x69, 0x74, 0x20, 0x4e, 0x75, 0x6e, 0x61, 0x61, 0x74, 0xa97, 0xac1, 0xa9c, 0xab0, 0xabe, 0xaa4, 0xac0,
-0xaad, 0xabe, 0xab0, 0xaa4, 0x48, 0x61, 0x75, 0x73, 0x61, 0x4e, 0x61, 0x6a, 0x65, 0x72, 0x69, 0x79, 0x61, 0x47, 0x61, 0x6e,
-0x61, 0x4e, 0x69, 0x6a, 0x61, 0x72, 0x5e2, 0x5d1, 0x5e8, 0x5d9, 0x5ea, 0x5d9, 0x5e9, 0x5e8, 0x5d0, 0x5dc, 0x939, 0x93f, 0x928, 0x94d,
-0x926, 0x940, 0x92d, 0x93e, 0x930, 0x924, 0x6d, 0x61, 0x67, 0x79, 0x61, 0x72, 0x4d, 0x61, 0x67, 0x79, 0x61, 0x72, 0x6f, 0x72,
-0x73, 0x7a, 0xe1, 0x67, 0xed, 0x73, 0x6c, 0x65, 0x6e, 0x73, 0x6b, 0x61, 0xcd, 0x73, 0x6c, 0x61, 0x6e, 0x64, 0x49, 0x6e,
-0x64, 0x6f, 0x6e, 0x65, 0x73, 0x69, 0x61, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x67, 0x75, 0x61, 0x4d, 0x75,
-0x6e, 0x64, 0x6f, 0x47, 0x61, 0x65, 0x69, 0x6c, 0x67, 0x65, 0xc9, 0x69, 0x72, 0x65, 0x61, 0x6e, 0x20, 0x52, 0xed, 0x6f,
-0x63, 0x68, 0x74, 0x20, 0x41, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x74, 0x68, 0x65, 0x69, 0x74, 0x61, 0x6c, 0x69, 0x61, 0x6e,
-0x6f, 0x49, 0x74, 0x61, 0x6c, 0x69, 0x61, 0x53, 0x61, 0x6e, 0x20, 0x4d, 0x61, 0x72, 0x69, 0x6e, 0x6f, 0x53, 0x76, 0x69,
-0x7a, 0x7a, 0x65, 0x72, 0x61, 0x43, 0x69, 0x74, 0x74, 0xe0, 0x20, 0x64, 0x65, 0x6c, 0x20, 0x56, 0x61, 0x74, 0x69, 0x63,
-0x61, 0x6e, 0x6f, 0x65e5, 0x672c, 0x8a9e, 0x65e5, 0x672c, 0x4a, 0x61, 0x77, 0x61, 0x49, 0x6e, 0x64, 0x6f, 0x6e, 0xe9, 0x73, 0x69,
-0x61, 0xc95, 0xca8, 0xccd, 0xca8, 0xca1, 0xcad, 0xcbe, 0xcb0, 0xca4, 0x6a9, 0x672, 0x634, 0x64f, 0x631, 0x6c1, 0x650, 0x646, 0x62f, 0x648,
-0x633, 0x62a, 0x627, 0x646, 0x49b, 0x430, 0x437, 0x430, 0x49b, 0x20, 0x442, 0x456, 0x43b, 0x456, 0x49a, 0x430, 0x437, 0x430, 0x49b, 0x441,
-0x442, 0x430, 0x43d, 0x4b, 0x69, 0x6e, 0x79, 0x61, 0x72, 0x77, 0x61, 0x6e, 0x64, 0x61, 0x55, 0x20, 0x52, 0x77, 0x61, 0x6e,
-0x64, 0x61, 0x43a, 0x44b, 0x440, 0x433, 0x44b, 0x437, 0x447, 0x430, 0x41a, 0x44b, 0x440, 0x433, 0x44b, 0x437, 0x441, 0x442, 0x430, 0x43d,
-0xd55c, 0xad6d, 0xc5b4, 0xb300, 0xd55c, 0xbbfc, 0xad6d, 0xc870, 0xc120, 0xbbfc, 0xc8fc, 0xc8fc, 0xc758, 0xc778, 0xbbfc, 0xacf5, 0xd654, 0xad6d, 0x6b, 0x75,
-0x72, 0x64, 0xee, 0x54, 0x69, 0x72, 0x6b, 0x69, 0x79, 0x65, 0x49, 0x6b, 0x69, 0x72, 0x75, 0x6e, 0x64, 0x69, 0x55, 0x62,
-0x75, 0x72, 0x75, 0x6e, 0x64, 0x69, 0xea5, 0xeb2, 0xea7, 0x6c, 0x61, 0x74, 0x76, 0x69, 0x65, 0x161, 0x75, 0x4c, 0x61, 0x74,
-0x76, 0x69, 0x6a, 0x61, 0x6c, 0x69, 0x6e, 0x67, 0xe1, 0x6c, 0x61, 0x52, 0x65, 0x70, 0x75, 0x62, 0x6c, 0xed, 0x6b, 0x69,
-0x20, 0x79, 0x61, 0x20, 0x4b, 0x6f, 0x6e, 0x67, 0xf3, 0x20, 0x44, 0x65, 0x6d, 0x6f, 0x6b, 0x72, 0x61, 0x74, 0xed, 0x6b,
-0x69, 0x41, 0x6e, 0x67, 0xf3, 0x6c, 0x61, 0x52, 0x65, 0x70, 0x69, 0x62, 0x69, 0x6b, 0x69, 0x20, 0x79, 0x61, 0x20, 0x41,
-0x66, 0x72, 0xed, 0x6b, 0x61, 0x20, 0x79, 0x61, 0x20, 0x4b, 0xe1, 0x74, 0x69, 0x4b, 0x6f, 0x6e, 0x67, 0x6f, 0x6c, 0x69,
-0x65, 0x74, 0x75, 0x76, 0x69, 0x173, 0x4c, 0x69, 0x65, 0x74, 0x75, 0x76, 0x61, 0x43c, 0x430, 0x43a, 0x435, 0x434, 0x43e, 0x43d,
-0x441, 0x43a, 0x438, 0x421, 0x435, 0x432, 0x435, 0x440, 0x43d, 0x430, 0x20, 0x41c, 0x430, 0x43a, 0x435, 0x434, 0x43e, 0x43d, 0x438, 0x458,
-0x430, 0x4d, 0x61, 0x6c, 0x61, 0x67, 0x61, 0x73, 0x79, 0x4d, 0x61, 0x64, 0x61, 0x67, 0x61, 0x73, 0x69, 0x6b, 0x61, 0x72,
-0x61, 0x4d, 0x65, 0x6c, 0x61, 0x79, 0x75, 0x42, 0x72, 0x75, 0x6e, 0x65, 0x69, 0x53, 0x69, 0x6e, 0x67, 0x61, 0x70, 0x75,
-0x72, 0x61, 0xd2e, 0xd32, 0xd2f, 0xd3e, 0xd33, 0xd02, 0xd07, 0xd28, 0xd4d, 0xd24, 0xd4d, 0xd2f, 0x4d, 0x61, 0x6c, 0x74, 0x69, 0x4d,
-0x101, 0x6f, 0x72, 0x69, 0x41, 0x6f, 0x74, 0x65, 0x61, 0x72, 0x6f, 0x61, 0x92e, 0x930, 0x93e, 0x920, 0x940, 0x43c, 0x43e, 0x43d,
-0x433, 0x43e, 0x43b, 0x41c, 0x43e, 0x43d, 0x433, 0x43e, 0x43b, 0x928, 0x947, 0x92a, 0x93e, 0x932, 0x940, 0x928, 0x947, 0x92a, 0x93e, 0x932,
-0x6e, 0x6f, 0x72, 0x73, 0x6b, 0x20, 0x62, 0x6f, 0x6b, 0x6d, 0xe5, 0x6c, 0x4e, 0x6f, 0x72, 0x67, 0x65, 0x53, 0x76, 0x61,
-0x6c, 0x62, 0x61, 0x72, 0x64, 0x20, 0x6f, 0x67, 0x20, 0x4a, 0x61, 0x6e, 0x20, 0x4d, 0x61, 0x79, 0x65, 0x6e, 0xb13, 0xb21,
-0xb3c, 0xb3f, 0xb06, 0xb2d, 0xb3e, 0xb30, 0xb24, 0x67e, 0x69a, 0x62a, 0x648, 0x627, 0x641, 0x63a, 0x627, 0x646, 0x633, 0x62a, 0x627, 0x646,
-0x67e, 0x627, 0x6a9, 0x633, 0x62a, 0x627, 0x646, 0x641, 0x627, 0x631, 0x633, 0x6cc, 0x627, 0x6cc, 0x631, 0x627, 0x646, 0x62f, 0x631, 0x6cc,
-0x70, 0x6f, 0x6c, 0x73, 0x6b, 0x69, 0x50, 0x6f, 0x6c, 0x73, 0x6b, 0x61, 0x70, 0x6f, 0x72, 0x74, 0x75, 0x67, 0x75, 0xea,
-0x73, 0x42, 0x72, 0x61, 0x73, 0x69, 0x6c, 0x41, 0x6e, 0x67, 0x6f, 0x6c, 0x61, 0x43, 0x61, 0x62, 0x6f, 0x20, 0x56, 0x65,
-0x72, 0x64, 0x65, 0x54, 0x69, 0x6d, 0x6f, 0x72, 0x2d, 0x4c, 0x65, 0x73, 0x74, 0x65, 0x47, 0x75, 0x69, 0x6e, 0xe9, 0x20,
-0x45, 0x71, 0x75, 0x61, 0x74, 0x6f, 0x72, 0x69, 0x61, 0x6c, 0x47, 0x75, 0x69, 0x6e, 0xe9, 0x2d, 0x42, 0x69, 0x73, 0x73,
-0x61, 0x75, 0x4c, 0x75, 0x78, 0x65, 0x6d, 0x62, 0x75, 0x72, 0x67, 0x6f, 0x4d, 0x61, 0x63, 0x61, 0x75, 0x2c, 0x20, 0x52,
-0x41, 0x45, 0x20, 0x64, 0x61, 0x20, 0x43, 0x68, 0x69, 0x6e, 0x61, 0x4d, 0x6f, 0xe7, 0x61, 0x6d, 0x62, 0x69, 0x71, 0x75,
-0x65, 0x70, 0x6f, 0x72, 0x74, 0x75, 0x67, 0x75, 0xea, 0x73, 0x20, 0x65, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x75, 0x50, 0x6f,
-0x72, 0x74, 0x75, 0x67, 0x61, 0x6c, 0x53, 0xe3, 0x6f, 0x20, 0x54, 0x6f, 0x6d, 0xe9, 0x20, 0x65, 0x20, 0x50, 0x72, 0xed,
-0x6e, 0x63, 0x69, 0x70, 0x65, 0x53, 0x75, 0xed, 0xe7, 0x61, 0xa2a, 0xa70, 0xa1c, 0xa3e, 0xa2c, 0xa40, 0xa2d, 0xa3e, 0xa30, 0xa24,
-0x67e, 0x646, 0x62c, 0x627, 0x628, 0x6cc, 0x52, 0x75, 0x6e, 0x61, 0x73, 0x69, 0x6d, 0x69, 0x50, 0x65, 0x72, 0xfa, 0x42, 0x6f,
-0x6c, 0x69, 0x76, 0x69, 0x61, 0x45, 0x63, 0x75, 0x61, 0x64, 0x6f, 0x72, 0x72, 0x75, 0x6d, 0x61, 0x6e, 0x74, 0x73, 0x63,
-0x68, 0x53, 0x76, 0x69, 0x7a, 0x72, 0x61, 0x72, 0x6f, 0x6d, 0xe2, 0x6e, 0x103, 0x52, 0x6f, 0x6d, 0xe2, 0x6e, 0x69, 0x61,
-0x52, 0x65, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x61, 0x20, 0x4d, 0x6f, 0x6c, 0x64, 0x6f, 0x76, 0x61, 0x440, 0x443, 0x441,
-0x441, 0x43a, 0x438, 0x439, 0x420, 0x43e, 0x441, 0x441, 0x438, 0x44f, 0x41a, 0x430, 0x437, 0x430, 0x445, 0x441, 0x442, 0x430, 0x43d, 0x41a,
-0x438, 0x440, 0x433, 0x438, 0x437, 0x438, 0x44f, 0x41c, 0x43e, 0x43b, 0x434, 0x43e, 0x432, 0x430, 0x423, 0x43a, 0x440, 0x430, 0x438, 0x43d,
-0x430, 0x53, 0xe4, 0x6e, 0x67, 0xf6, 0x4b, 0xf6, 0x64, 0xf6, 0x72, 0xf6, 0x73, 0xea, 0x73, 0x65, 0x20, 0x74, 0xee, 0x20,
-0x42, 0xea, 0x61, 0x66, 0x72, 0xee, 0x6b, 0x61, 0x441, 0x440, 0x43f, 0x441, 0x43a, 0x438, 0x421, 0x440, 0x431, 0x438, 0x458, 0x430,
-0x411, 0x43e, 0x441, 0x43d, 0x430, 0x20, 0x438, 0x20, 0x425, 0x435, 0x440, 0x446, 0x435, 0x433, 0x43e, 0x432, 0x438, 0x43d, 0x430, 0x426,
-0x440, 0x43d, 0x430, 0x20, 0x413, 0x43e, 0x440, 0x430, 0x41a, 0x43e, 0x441, 0x43e, 0x432, 0x43e, 0x73, 0x72, 0x70, 0x73, 0x6b, 0x69,
-0x43, 0x72, 0x6e, 0x61, 0x20, 0x47, 0x6f, 0x72, 0x61, 0x53, 0x72, 0x62, 0x69, 0x6a, 0x61, 0x4b, 0x6f, 0x73, 0x6f, 0x76,
-0x6f, 0x438, 0x440, 0x43e, 0x43d, 0x413, 0x443, 0x44b, 0x440, 0x434, 0x437, 0x44b, 0x441, 0x442, 0x43e, 0x43d, 0x423, 0x4d5, 0x440, 0x4d5,
-0x441, 0x435, 0x63, 0x68, 0x69, 0x53, 0x68, 0x6f, 0x6e, 0x61, 0x633, 0x646, 0x68c, 0x64a, 0x67e, 0x627, 0x6aa, 0x633, 0x62a, 0x627,
-0x646, 0xdc3, 0xdd2, 0xd82, 0xdc4, 0xdbd, 0xdc1, 0xdca, 0x200d, 0xdbb, 0xdd3, 0x20, 0xdbd, 0xd82, 0xd9a, 0xdcf, 0xdc0, 0x73, 0x6c, 0x6f,
-0x76, 0x65, 0x6e, 0x10d, 0x69, 0x6e, 0x61, 0x53, 0x6c, 0x6f, 0x76, 0x65, 0x6e, 0x73, 0x6b, 0x6f, 0x73, 0x6c, 0x6f, 0x76,
-0x65, 0x6e, 0x161, 0x10d, 0x69, 0x6e, 0x61, 0x53, 0x6c, 0x6f, 0x76, 0x65, 0x6e, 0x69, 0x6a, 0x61, 0x53, 0x6f, 0x6f, 0x6d,
-0x61, 0x61, 0x6c, 0x69, 0x53, 0x6f, 0x6f, 0x6d, 0x61, 0x61, 0x6c, 0x69, 0x79, 0x61, 0x4a, 0x61, 0x62, 0x75, 0x75, 0x74,
-0x69, 0x49, 0x74, 0x6f, 0x6f, 0x62, 0x69, 0x79, 0x61, 0x65, 0x73, 0x70, 0x61, 0xf1, 0x6f, 0x6c, 0x20, 0x64, 0x65, 0x20,
-0x45, 0x73, 0x70, 0x61, 0xf1, 0x61, 0x65, 0x73, 0x70, 0x61, 0xf1, 0x6f, 0x6c, 0x41, 0x72, 0x67, 0x65, 0x6e, 0x74, 0x69,
-0x6e, 0x61, 0x42, 0x65, 0x6c, 0x69, 0x63, 0x65, 0x43, 0x68, 0x69, 0x6c, 0x65, 0x43, 0x6f, 0x6c, 0x6f, 0x6d, 0x62, 0x69,
-0x61, 0x43, 0x6f, 0x73, 0x74, 0x61, 0x20, 0x52, 0x69, 0x63, 0x61, 0x43, 0x75, 0x62, 0x61, 0x52, 0x65, 0x70, 0xfa, 0x62,
-0x6c, 0x69, 0x63, 0x61, 0x20, 0x44, 0x6f, 0x6d, 0x69, 0x6e, 0x69, 0x63, 0x61, 0x6e, 0x61, 0x45, 0x6c, 0x20, 0x53, 0x61,
-0x6c, 0x76, 0x61, 0x64, 0x6f, 0x72, 0x47, 0x75, 0x69, 0x6e, 0x65, 0x61, 0x20, 0x45, 0x63, 0x75, 0x61, 0x74, 0x6f, 0x72,
-0x69, 0x61, 0x6c, 0x47, 0x75, 0x61, 0x74, 0x65, 0x6d, 0x61, 0x6c, 0x61, 0x48, 0x6f, 0x6e, 0x64, 0x75, 0x72, 0x61, 0x73,
-0x65, 0x73, 0x70, 0x61, 0xf1, 0x6f, 0x6c, 0x20, 0x64, 0x65, 0x20, 0x4d, 0xe9, 0x78, 0x69, 0x63, 0x6f, 0x4d, 0xe9, 0x78,
-0x69, 0x63, 0x6f, 0x4e, 0x69, 0x63, 0x61, 0x72, 0x61, 0x67, 0x75, 0x61, 0x50, 0x61, 0x6e, 0x61, 0x6d, 0xe1, 0x50, 0x61,
-0x72, 0x61, 0x67, 0x75, 0x61, 0x79, 0x46, 0x69, 0x6c, 0x69, 0x70, 0x69, 0x6e, 0x61, 0x73, 0x45, 0x73, 0x74, 0x61, 0x64,
-0x6f, 0x73, 0x20, 0x55, 0x6e, 0x69, 0x64, 0x6f, 0x73, 0x55, 0x72, 0x75, 0x67, 0x75, 0x61, 0x79, 0x56, 0x65, 0x6e, 0x65,
-0x7a, 0x75, 0x65, 0x6c, 0x61, 0x43, 0x61, 0x6e, 0x61, 0x72, 0x69, 0x61, 0x73, 0x65, 0x73, 0x70, 0x61, 0xf1, 0x6f, 0x6c,
-0x20, 0x6c, 0x61, 0x74, 0x69, 0x6e, 0x6f, 0x61, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x6e, 0x6f, 0x4c, 0x61, 0x74, 0x69,
-0x6e, 0x6f, 0x61, 0x6d, 0xe9, 0x72, 0x69, 0x63, 0x61, 0x43, 0x65, 0x75, 0x74, 0x61, 0x20, 0x79, 0x20, 0x4d, 0x65, 0x6c,
-0x69, 0x6c, 0x6c, 0x61, 0x4b, 0x69, 0x73, 0x77, 0x61, 0x68, 0x69, 0x6c, 0x69, 0x4a, 0x61, 0x6d, 0x68, 0x75, 0x72, 0x69,
-0x20, 0x79, 0x61, 0x20, 0x4b, 0x69, 0x64, 0x65, 0x6d, 0x6f, 0x6b, 0x72, 0x61, 0x73, 0x69, 0x61, 0x20, 0x79, 0x61, 0x20,
-0x4b, 0x6f, 0x6e, 0x67, 0x6f, 0x73, 0x76, 0x65, 0x6e, 0x73, 0x6b, 0x61, 0x53, 0x76, 0x65, 0x72, 0x69, 0x67, 0x65, 0xc5,
-0x6c, 0x61, 0x6e, 0x64, 0x442, 0x43e, 0x4b7, 0x438, 0x43a, 0x4e3, 0x422, 0x43e, 0x4b7, 0x438, 0x43a, 0x438, 0x441, 0x442, 0x43e, 0x43d,
-0xba4, 0xbae, 0xbbf, 0xbb4, 0xbcd, 0xb87, 0xba8, 0xbcd, 0xba4, 0xbbf, 0xbaf, 0xbbe, 0xbae, 0xbb2, 0xbc7, 0xb9a, 0xbbf, 0xbaf, 0xbbe, 0xb9a,
-0xbbf, 0xb99, 0xbcd, 0xb95, 0xbaa, 0xbcd, 0xbaa, 0xbc2, 0xbb0, 0xbcd, 0xb87, 0xbb2, 0xb99, 0xbcd, 0xb95, 0xbc8, 0x442, 0x430, 0x442, 0x430,
-0x440, 0xc24, 0xc46, 0xc32, 0xc41, 0xc17, 0xc41, 0xc2d, 0xc3e, 0xc30, 0xc24, 0xc26, 0xc47, 0xc36, 0xc02, 0xe44, 0xe17, 0xe22, 0xf56, 0xf7c,
-0xf51, 0xf0b, 0xf66, 0xf90, 0xf51, 0xf0b, 0xf62, 0xf92, 0xfb1, 0xf0b, 0xf53, 0xf42, 0xf62, 0xf92, 0xfb1, 0xf0b, 0xf42, 0xf62, 0xf0b, 0x1275,
-0x130d, 0x122d, 0x129b, 0x12a4, 0x122d, 0x1275, 0x122b, 0x6c, 0x65, 0x61, 0x20, 0x66, 0x61, 0x6b, 0x61, 0x74, 0x6f, 0x6e, 0x67, 0x61,
-0x54, 0xfc, 0x72, 0x6b, 0xe7, 0x65, 0x54, 0xfc, 0x72, 0x6b, 0x69, 0x79, 0x65, 0x4b, 0x131, 0x62, 0x72, 0x131, 0x73, 0x74,
-0xfc, 0x72, 0x6b, 0x6d, 0x65, 0x6e, 0x20, 0x64, 0x69, 0x6c, 0x69, 0x54, 0xfc, 0x72, 0x6b, 0x6d, 0x65, 0x6e, 0x69, 0x73,
-0x74, 0x61, 0x6e, 0x626, 0x6c7, 0x64a, 0x63a, 0x6c7, 0x631, 0x686, 0x6d5, 0x62c, 0x6c7, 0x6ad, 0x6af, 0x648, 0x443, 0x43a, 0x440, 0x430,
-0x457, 0x43d, 0x441, 0x44c, 0x43a, 0x430, 0x423, 0x43a, 0x440, 0x430, 0x457, 0x43d, 0x430, 0x627, 0x631, 0x62f, 0x648, 0x628, 0x6be, 0x627,
-0x631, 0x62a, 0x6f, 0x2018, 0x7a, 0x62, 0x65, 0x6b, 0x4f, 0x2bb, 0x7a, 0x62, 0x65, 0x6b, 0x69, 0x73, 0x74, 0x6f, 0x6e, 0x627,
-0x648, 0x632, 0x628, 0x6cc, 0x6a9, 0x45e, 0x437, 0x431, 0x435, 0x43a, 0x447, 0x430, 0x40e, 0x437, 0x431, 0x435, 0x43a, 0x438, 0x441, 0x442,
-0x43e, 0x43d, 0x54, 0x69, 0x1ebf, 0x6e, 0x67, 0x20, 0x56, 0x69, 0x1ec7, 0x74, 0x56, 0x69, 0x1ec7, 0x74, 0x20, 0x4e, 0x61, 0x6d,
-0x56, 0x6f, 0x6c, 0x61, 0x70, 0xfc, 0x6b, 0x43, 0x79, 0x6d, 0x72, 0x61, 0x65, 0x67, 0x59, 0x20, 0x44, 0x65, 0x79, 0x72,
-0x6e, 0x61, 0x73, 0x20, 0x55, 0x6e, 0x65, 0x64, 0x69, 0x67, 0x57, 0x6f, 0x6c, 0x6f, 0x66, 0x53, 0x65, 0x6e, 0x65, 0x67,
-0x61, 0x61, 0x6c, 0x69, 0x73, 0x69, 0x58, 0x68, 0x6f, 0x73, 0x61, 0x65, 0x4d, 0x7a, 0x61, 0x6e, 0x74, 0x73, 0x69, 0x20,
-0x41, 0x66, 0x72, 0x69, 0x6b, 0x61, 0x5d9, 0x5d9, 0x5b4, 0x5d3, 0x5d9, 0x5e9, 0x5d5, 0x5d5, 0x5e2, 0x5dc, 0x5d8, 0xc8, 0x64, 0xe8,
-0x20, 0x59, 0x6f, 0x72, 0xf9, 0x62, 0xe1, 0x4f, 0x72, 0x69, 0x6c, 0x1eb9, 0x300, 0x2d, 0xe8, 0x64, 0xe8, 0x20, 0x4e, 0xe0,
-0xec, 0x6a, 0xed, 0x72, 0xed, 0xe0, 0x4f, 0x72, 0xed, 0x6c, 0x25b, 0x301, 0xe8, 0x64, 0x65, 0x20, 0x42, 0x25b, 0x300, 0x6e,
-0x25b, 0x300, 0x69, 0x73, 0x69, 0x5a, 0x75, 0x6c, 0x75, 0x69, 0x4e, 0x69, 0x6e, 0x67, 0x69, 0x7a, 0x69, 0x6d, 0x75, 0x20,
-0x41, 0x66, 0x72, 0x69, 0x6b, 0x61, 0x6e, 0x79, 0x6e, 0x6f, 0x72, 0x73, 0x6b, 0x4e, 0x6f, 0x72, 0x65, 0x67, 0x62, 0x6f,
-0x73, 0x61, 0x6e, 0x73, 0x6b, 0x69, 0x431, 0x43e, 0x441, 0x430, 0x43d, 0x441, 0x43a, 0x438, 0x47, 0x61, 0x65, 0x6c, 0x67, 0x45,
-0x6c, 0x6c, 0x61, 0x6e, 0x20, 0x56, 0x61, 0x6e, 0x6e, 0x69, 0x6e, 0x6b, 0x65, 0x72, 0x6e, 0x65, 0x77, 0x65, 0x6b, 0x52,
-0x79, 0x77, 0x76, 0x61, 0x6e, 0x65, 0x74, 0x68, 0x20, 0x55, 0x6e, 0x79, 0x73, 0x41, 0x6b, 0x61, 0x6e, 0x47, 0x61, 0x61,
-0x6e, 0x61, 0x915, 0x94b, 0x902, 0x915, 0x923, 0x940, 0x41, 0x73, 0x1ee5, 0x73, 0x1ee5, 0x20, 0x49, 0x67, 0x62, 0x6f, 0x4e, 0x61,
-0x1ecb, 0x6a, 0x1ecb, 0x72, 0x1ecb, 0x61, 0x4b, 0x69, 0x6b, 0x61, 0x6d, 0x62, 0x61, 0x66, 0x75, 0x72, 0x6c, 0x61, 0x6e, 0x49,
-0x74, 0x61, 0x6c, 0x69, 0x65, 0x45, 0x28b, 0x65, 0x67, 0x62, 0x65, 0x47, 0x68, 0x61, 0x6e, 0x61, 0x20, 0x6e, 0x75, 0x74,
-0x6f, 0x6d, 0x65, 0x54, 0x6f, 0x67, 0x6f, 0x20, 0x6e, 0x75, 0x74, 0x6f, 0x6d, 0x65, 0x2bb, 0x14c, 0x6c, 0x65, 0x6c, 0x6f,
-0x20, 0x48, 0x61, 0x77, 0x61, 0x69, 0x2bb, 0x69, 0x2bb, 0x41, 0x6d, 0x65, 0x6c, 0x69, 0x6b, 0x61, 0x20, 0x48, 0x75, 0x69,
-0x20, 0x50, 0x16b, 0x20, 0x2bb, 0x49, 0x61, 0x46, 0x69, 0x6c, 0x69, 0x70, 0x69, 0x6e, 0x6f, 0x50, 0x69, 0x6c, 0x69, 0x70,
-0x69, 0x6e, 0x61, 0x73, 0x53, 0x63, 0x68, 0x77, 0x69, 0x69, 0x7a, 0x65, 0x72, 0x74, 0xfc, 0xfc, 0x74, 0x73, 0x63, 0x68,
-0x53, 0x63, 0x68, 0x77, 0x69, 0x69, 0x7a, 0x46, 0x72, 0x61, 0x6e, 0x6b, 0x72, 0x69, 0x69, 0x63, 0x68, 0x4c, 0x69, 0xe4,
-0x63, 0x68, 0x74, 0x65, 0x73, 0x63, 0x68, 0x74, 0xe4, 0x69, 0xa188, 0xa320, 0xa259, 0xa34f, 0xa1e9, 0x4e, 0x65, 0x64, 0x64, 0x65,
-0x72, 0x73, 0x61, 0x73, 0x73, 0x2019, 0x73, 0x63, 0x68, 0x44, 0xfc, 0xfc, 0x74, 0x73, 0x63, 0x68, 0x6c, 0x61, 0x6e, 0x64,
-0x4e, 0x65, 0x64, 0x64, 0x65, 0x72, 0x6c, 0x61, 0x6e, 0x6e, 0x65, 0x6e, 0x64, 0x61, 0x76, 0x76, 0x69, 0x73, 0xe1, 0x6d,
-0x65, 0x67, 0x69, 0x65, 0x6c, 0x6c, 0x61, 0x4e, 0x6f, 0x72, 0x67, 0x61, 0x53, 0x75, 0x6f, 0x70, 0x6d, 0x61, 0x52, 0x75,
-0x6f, 0x167, 0x167, 0x61, 0x45, 0x6b, 0x65, 0x67, 0x75, 0x73, 0x69, 0x69, 0x4b, 0x69, 0x74, 0x61, 0x69, 0x74, 0x61, 0x50,
-0x75, 0x6c, 0x61, 0x61, 0x72, 0x42, 0x75, 0x72, 0x6b, 0x69, 0x62, 0x61, 0x61, 0x20, 0x46, 0x61, 0x61, 0x73, 0x6f, 0x4b,
-0x61, 0x6d, 0x65, 0x72, 0x75, 0x75, 0x6e, 0x47, 0x61, 0x6d, 0x6d, 0x62, 0x69, 0x47, 0x61, 0x6e, 0x61, 0x61, 0x47, 0x69,
-0x6e, 0x65, 0x47, 0x69, 0x6e, 0x65, 0x2d, 0x42, 0x69, 0x73, 0x61, 0x61, 0x77, 0x6f, 0x4c, 0x69, 0x62, 0x65, 0x72, 0x69,
-0x79, 0x61, 0x61, 0x4d, 0x75, 0x72, 0x69, 0x74, 0x61, 0x6e, 0x69, 0x4e, 0x69, 0x6a, 0x65, 0x65, 0x72, 0x4e, 0x69, 0x6a,
-0x65, 0x72, 0x69, 0x79, 0x61, 0x61, 0x53, 0x65, 0x72, 0x61, 0x61, 0x20, 0x6c, 0x69, 0x79, 0x6f, 0x6e, 0x47, 0x69, 0x6b,
-0x75, 0x79, 0x75, 0x4b, 0x69, 0x73, 0x61, 0x6d, 0x70, 0x75, 0x72, 0x73, 0x65, 0x6e, 0x61, 0x69, 0x73, 0x69, 0x4e, 0x64,
-0x65, 0x62, 0x65, 0x6c, 0x65, 0x4b, 0x69, 0x68, 0x6f, 0x72, 0x6f, 0x6d, 0x62, 0x6f, 0x2d5c, 0x2d30, 0x2d5b, 0x2d4d, 0x2d43, 0x2d49,
-0x2d5c, 0x2d4d, 0x2d4e, 0x2d56, 0x2d54, 0x2d49, 0x2d31, 0x54, 0x61, 0x73, 0x68, 0x65, 0x6c, 0x1e25, 0x69, 0x79, 0x74, 0x6c, 0x6d, 0x263,
-0x72, 0x69, 0x62, 0x54, 0x61, 0x71, 0x62, 0x61, 0x79, 0x6c, 0x69, 0x74, 0x4c, 0x65, 0x7a, 0x7a, 0x61, 0x79, 0x65, 0x72,
-0x52, 0x75, 0x6e, 0x79, 0x61, 0x6e, 0x6b, 0x6f, 0x72, 0x65, 0x48, 0x69, 0x62, 0x65, 0x6e, 0x61, 0x48, 0x75, 0x74, 0x61,
-0x6e, 0x7a, 0x61, 0x6e, 0x69, 0x61, 0x4b, 0x79, 0x69, 0x76, 0x75, 0x6e, 0x6a, 0x6f, 0x62, 0x61, 0x6d, 0x61, 0x6e, 0x61,
-0x6b, 0x61, 0x6e, 0x4b, 0x129, 0x65, 0x6d, 0x62, 0x75, 0x13e3, 0x13b3, 0x13a9, 0x13cc, 0x13ca, 0x20, 0x13a2, 0x13f3, 0x13be, 0x13b5, 0x13cd,
-0x13d4, 0x13c5, 0x20, 0x13cd, 0x13a6, 0x13da, 0x13a9, 0x6b, 0x72, 0x65, 0x6f, 0x6c, 0x20, 0x6d, 0x6f, 0x72, 0x69, 0x73, 0x69, 0x65,
-0x6e, 0x4d, 0x6f, 0x72, 0x69, 0x73, 0x43, 0x68, 0x69, 0x6d, 0x61, 0x6b, 0x6f, 0x6e, 0x64, 0x65, 0x4b, 0x268, 0x6c, 0x61,
-0x61, 0x6e, 0x67, 0x69, 0x54, 0x61, 0x61, 0x6e, 0x73, 0x61, 0x6e, 0xed, 0x61, 0x4c, 0x75, 0x67, 0x61, 0x6e, 0x64, 0x61,
-0x59, 0x75, 0x67, 0x61, 0x6e, 0x64, 0x61, 0x49, 0x63, 0x68, 0x69, 0x62, 0x65, 0x6d, 0x62, 0x61, 0x6b, 0x61, 0x62, 0x75,
-0x76, 0x65, 0x72, 0x64, 0x69, 0x61, 0x6e, 0x75, 0x4b, 0x61, 0x62, 0x75, 0x20, 0x56, 0x65, 0x72, 0x64, 0x69, 0x4b, 0x129,
-0x6d, 0x129, 0x72, 0x169, 0x4b, 0x61, 0x6c, 0x65, 0x6e, 0x6a, 0x69, 0x6e, 0x45, 0x6d, 0x65, 0x74, 0x61, 0x62, 0x20, 0x4b,
-0x65, 0x6e, 0x79, 0x61, 0x4b, 0x68, 0x6f, 0x65, 0x6b, 0x68, 0x6f, 0x65, 0x67, 0x6f, 0x77, 0x61, 0x62, 0x4e, 0x61, 0x6d,
-0x69, 0x62, 0x69, 0x61, 0x62, 0x4b, 0x69, 0x6d, 0x61, 0x63, 0x68, 0x61, 0x6d, 0x65, 0x4b, 0xf6, 0x6c, 0x73, 0x63, 0x68,
-0x44, 0x6f, 0xfc, 0x74, 0x73, 0x63, 0x68, 0x6c, 0x61, 0x6e, 0x64, 0x4d, 0x61, 0x61, 0x54, 0x61, 0x6e, 0x73, 0x61, 0x6e,
-0x69, 0x61, 0x4f, 0x6c, 0x75, 0x73, 0x6f, 0x67, 0x61, 0x4c, 0x75, 0x6c, 0x75, 0x68, 0x69, 0x61, 0x4b, 0x69, 0x70, 0x61,
-0x72, 0x65, 0x54, 0x61, 0x64, 0x68, 0x61, 0x6e, 0x69, 0x61, 0x4b, 0x69, 0x74, 0x65, 0x73, 0x6f, 0x4b, 0x65, 0x6e, 0x69,
-0x61, 0x4b, 0x6f, 0x79, 0x72, 0x61, 0x20, 0x63, 0x69, 0x69, 0x6e, 0x69, 0x4d, 0x61, 0x61, 0x6c, 0x69, 0x4b, 0x69, 0x72,
-0x75, 0x77, 0x61, 0x44, 0x68, 0x6f, 0x6c, 0x75, 0x6f, 0x52, 0x75, 0x6b, 0x69, 0x67, 0x61, 0x54, 0x61, 0x6d, 0x61, 0x7a,
-0x69, 0x263, 0x74, 0x20, 0x6e, 0x20, 0x6c, 0x61, 0x1e6d, 0x6c, 0x61, 0x1e63, 0x4d, 0x65, 0x1e5b, 0x1e5b, 0x75, 0x6b, 0x4b, 0x6f,
-0x79, 0x72, 0x61, 0x62, 0x6f, 0x72, 0x6f, 0x20, 0x73, 0x65, 0x6e, 0x6e, 0x69, 0x4b, 0x69, 0x73, 0x68, 0x61, 0x6d, 0x62,
-0x61, 0x61, 0x92c, 0x921, 0x93c, 0x94b, 0x43d, 0x43e, 0x445, 0x447, 0x438, 0x439, 0x43d, 0x420, 0x43e, 0x441, 0x441, 0x438, 0x446, 0x435,
-0x440, 0x43a, 0x43e, 0x432, 0x43d, 0x43e, 0x441, 0x43b, 0x43e, 0x432, 0x435, 0x301, 0x43d, 0x441, 0x43a, 0x457, 0x439, 0x440, 0x461, 0x441,
-0x441, 0x456, 0x301, 0x430, 0x54, 0x73, 0x68, 0x69, 0x6c, 0x75, 0x62, 0x61, 0x44, 0x69, 0x74, 0x75, 0x6e, 0x67, 0x61, 0x20,
-0x77, 0x61, 0x20, 0x4b, 0x6f, 0x6e, 0x67, 0x75, 0x4c, 0xeb, 0x74, 0x7a, 0x65, 0x62, 0x75, 0x65, 0x72, 0x67, 0x65, 0x73,
-0x63, 0x68, 0x4c, 0xeb, 0x74, 0x7a, 0x65, 0x62, 0x75, 0x65, 0x72, 0x67, 0x41, 0x67, 0x68, 0x65, 0x6d, 0x4b, 0xe0, 0x6d,
-0xe0, 0x6c, 0xfb, 0x14b, 0x181, 0xe0, 0x73, 0xe0, 0x61, 0x4b, 0xe0, 0x6d, 0x25b, 0x300, 0x72, 0xfb, 0x6e, 0x5a, 0x61, 0x72,
-0x6d, 0x61, 0x63, 0x69, 0x69, 0x6e, 0x65, 0x4e, 0x69, 0x17e, 0x65, 0x72, 0x64, 0x75, 0xe1, 0x6c, 0xe1, 0x6a, 0x6f, 0x6f,
-0x6c, 0x61, 0x53, 0x65, 0x6e, 0x65, 0x67, 0x61, 0x6c, 0x65, 0x77, 0x6f, 0x6e, 0x64, 0x6f, 0x4b, 0x61, 0x6d, 0x259, 0x72,
-0xfa, 0x6e, 0x72, 0x69, 0x6b, 0x70, 0x61, 0x6b, 0x61, 0x6d, 0x25b, 0x72, 0xfa, 0x6e, 0x4d, 0x61, 0x6b, 0x75, 0x61, 0x55,
-0x6d, 0x6f, 0x7a, 0x61, 0x6d, 0x62, 0x69, 0x6b, 0x69, 0x4d, 0x55, 0x4e, 0x44, 0x41, 0x14a, 0x6b, 0x61, 0x6d, 0x65, 0x72,
-0x75, 0x14b, 0x4b, 0x77, 0x61, 0x73, 0x69, 0x6f, 0x4b, 0x61, 0x6d, 0x65, 0x72, 0x75, 0x6e, 0x54, 0x68, 0x6f, 0x6b, 0x20,
-0x4e, 0x61, 0x74, 0x68, 0x441, 0x430, 0x445, 0x430, 0x20, 0x442, 0x44b, 0x43b, 0x430, 0x410, 0x440, 0x430, 0x441, 0x441, 0x44b, 0x44b,
-0x439, 0x430, 0x49, 0x73, 0x68, 0x69, 0x73, 0x61, 0x6e, 0x67, 0x75, 0x54, 0x61, 0x6e, 0x73, 0x61, 0x6e, 0x69, 0x79, 0x61,
-0x54, 0x61, 0x73, 0x61, 0x77, 0x61, 0x71, 0x20, 0x73, 0x65, 0x6e, 0x6e, 0x69, 0xa559, 0xa524, 0xa55e, 0xa524, 0xa52b, 0xa569, 0x56,
-0x61, 0x69, 0x4c, 0x61, 0x69, 0x62, 0x68, 0x69, 0x79, 0x61, 0x57, 0x61, 0x6c, 0x73, 0x65, 0x72, 0x53, 0x63, 0x68, 0x77,
-0x69, 0x7a, 0x6e, 0x75, 0x61, 0x73, 0x75, 0x65, 0x4b, 0x65, 0x6d, 0x65, 0x6c, 0xfa, 0x6e, 0x61, 0x73, 0x74, 0x75, 0x72,
-0x69, 0x61, 0x6e, 0x75, 0x4e, 0x64, 0x61, 0xa78c, 0x61, 0x4b, 0x61, 0x6d, 0x25b, 0x6c, 0xfb, 0x6e, 0x6b, 0x61, 0x6b, 0x254,
-0x4b, 0x61, 0x6d, 0x25b, 0x72, 0x75, 0x6e, 0x6d, 0x65, 0x74, 0x61, 0x2bc, 0x4b, 0x61, 0x6d, 0x61, 0x6c, 0x75, 0x6e, 0x53,
-0x68, 0x77, 0xf3, 0x14b, 0xf2, 0x20, 0x6e, 0x67, 0x69, 0x65, 0x6d, 0x62, 0x254, 0x254, 0x6e, 0x4b, 0xe0, 0x6d, 0x61, 0x6c,
-0xfb, 0x6d, 0x4c, 0x61, 0x6b, 0x21f, 0xf3, 0x6c, 0x2bc, 0x69, 0x79, 0x61, 0x70, 0x69, 0x4d, 0xed, 0x6c, 0x61, 0x68, 0x61,
-0x14b, 0x73, 0x6b, 0x61, 0x20, 0x54, 0x21f, 0x61, 0x6d, 0xe1, 0x6b, 0x21f, 0x6f, 0x10d, 0x68, 0x65, 0x2d5c, 0x2d30, 0x2d4e, 0x2d30,
-0x2d63, 0x2d49, 0x2d56, 0x2d5c, 0x6a9, 0x648, 0x631, 0x62f, 0x6cc, 0x6cc, 0x20, 0x646, 0x627, 0x648, 0x6d5, 0x646, 0x62f, 0x6cc, 0x639, 0x6ce,
-0x631, 0x627, 0x642, 0x626, 0x6ce, 0x631, 0x627, 0x646, 0x64, 0x6f, 0x6c, 0x6e, 0x6f, 0x73, 0x65, 0x72, 0x62, 0x161, 0x107, 0x69,
-0x6e, 0x61, 0x4e, 0x69, 0x6d, 0x73, 0x6b, 0x61, 0x68, 0x6f, 0x72, 0x6e, 0x6a, 0x6f, 0x73, 0x65, 0x72, 0x62, 0x161, 0x107,
-0x69, 0x6e, 0x61, 0x4e, 0x11b, 0x6d, 0x73, 0x6b, 0x61, 0x70, 0x72, 0x16b, 0x73, 0x69, 0x73, 0x6b, 0x61, 0x6e, 0x73, 0x77,
-0x12b, 0x74, 0x61, 0x69, 0x61, 0x6e, 0x61, 0x72, 0xe2, 0x161, 0x6b, 0x69, 0x65, 0x6c, 0xe2, 0x53, 0x75, 0x6f, 0x6d, 0xe2,
-0x645, 0x627, 0x632, 0x631, 0x648, 0x646, 0x6cc, 0x644, 0x6ca, 0x631, 0x6cc, 0x20, 0x634, 0x648, 0x645, 0x627, 0x644, 0x6cc, 0x7cb5, 0x8a9e,
-0x4e2d, 0x83ef, 0x4eba, 0x6c11, 0x5171, 0x548c, 0x570b, 0x9999, 0x6e2f, 0x7279, 0x5225, 0x884c, 0x653f, 0x5340, 0x7ca4, 0x8bed, 0x4e2d, 0x534e, 0x4eba, 0x6c11,
-0x5171, 0x548c, 0x56fd, 0x42, 0x69, 0x6e, 0x69, 0x73, 0x61, 0x79, 0x61
+0x4e, 0x65, 0x64, 0x65, 0x72, 0x6c, 0x61, 0x6e, 0x64, 0x73, 0x41, 0x72, 0x75, 0x62, 0x61, 0x42, 0x65, 0x6c, 0x67, 0x69,
+0xeb, 0x43, 0x75, 0x72, 0x61, 0xe7, 0x61, 0x6f, 0x53, 0x75, 0x72, 0x69, 0x6e, 0x61, 0x6d, 0x65, 0x43, 0x61, 0x72, 0x69,
+0x62, 0x69, 0x73, 0x63, 0x68, 0x20, 0x4e, 0x65, 0x64, 0x65, 0x72, 0x6c, 0x61, 0x6e, 0x64, 0x53, 0x69, 0x6e, 0x74, 0x2d,
+0x4d, 0x61, 0x61, 0x72, 0x74, 0x65, 0x6e, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x6e, 0x20, 0x45, 0x6e, 0x67, 0x6c,
+0x69, 0x73, 0x68, 0x55, 0x6e, 0x69, 0x74, 0x65, 0x64, 0x20, 0x53, 0x74, 0x61, 0x74, 0x65, 0x73, 0x41, 0x6d, 0x65, 0x72,
+0x69, 0x63, 0x61, 0x6e, 0x20, 0x53, 0x61, 0x6d, 0x6f, 0x61, 0x41, 0x6e, 0x67, 0x75, 0x69, 0x6c, 0x6c, 0x61, 0x41, 0x6e,
+0x74, 0x69, 0x67, 0x75, 0x61, 0x20, 0x26, 0x20, 0x42, 0x61, 0x72, 0x62, 0x75, 0x64, 0x61, 0x41, 0x75, 0x73, 0x74, 0x72,
+0x61, 0x6c, 0x69, 0x61, 0x6e, 0x20, 0x45, 0x6e, 0x67, 0x6c, 0x69, 0x73, 0x68, 0x41, 0x75, 0x73, 0x74, 0x72, 0x69, 0x61,
+0x42, 0x61, 0x68, 0x61, 0x6d, 0x61, 0x73, 0x42, 0x61, 0x72, 0x62, 0x61, 0x64, 0x6f, 0x73, 0x42, 0x65, 0x6c, 0x67, 0x69,
+0x75, 0x6d, 0x42, 0x65, 0x6c, 0x69, 0x7a, 0x65, 0x42, 0x65, 0x72, 0x6d, 0x75, 0x64, 0x61, 0x42, 0x6f, 0x74, 0x73, 0x77,
+0x61, 0x6e, 0x61, 0x42, 0x72, 0x69, 0x74, 0x69, 0x73, 0x68, 0x20, 0x49, 0x6e, 0x64, 0x69, 0x61, 0x6e, 0x20, 0x4f, 0x63,
+0x65, 0x61, 0x6e, 0x20, 0x54, 0x65, 0x72, 0x72, 0x69, 0x74, 0x6f, 0x72, 0x79, 0x42, 0x75, 0x72, 0x75, 0x6e, 0x64, 0x69,
+0x43, 0x61, 0x6d, 0x65, 0x72, 0x6f, 0x6f, 0x6e, 0x43, 0x61, 0x6e, 0x61, 0x64, 0x69, 0x61, 0x6e, 0x20, 0x45, 0x6e, 0x67,
+0x6c, 0x69, 0x73, 0x68, 0x43, 0x61, 0x6e, 0x61, 0x64, 0x61, 0x43, 0x61, 0x79, 0x6d, 0x61, 0x6e, 0x20, 0x49, 0x73, 0x6c,
+0x61, 0x6e, 0x64, 0x73, 0x43, 0x68, 0x72, 0x69, 0x73, 0x74, 0x6d, 0x61, 0x73, 0x20, 0x49, 0x73, 0x6c, 0x61, 0x6e, 0x64,
+0x43, 0x6f, 0x63, 0x6f, 0x73, 0x20, 0x28, 0x4b, 0x65, 0x65, 0x6c, 0x69, 0x6e, 0x67, 0x29, 0x20, 0x49, 0x73, 0x6c, 0x61,
+0x6e, 0x64, 0x73, 0x43, 0x6f, 0x6f, 0x6b, 0x20, 0x49, 0x73, 0x6c, 0x61, 0x6e, 0x64, 0x73, 0x43, 0x79, 0x70, 0x72, 0x75,
+0x73, 0x44, 0x65, 0x6e, 0x6d, 0x61, 0x72, 0x6b, 0x44, 0x6f, 0x6d, 0x69, 0x6e, 0x69, 0x63, 0x61, 0x45, 0x72, 0x69, 0x74,
+0x72, 0x65, 0x61, 0x46, 0x61, 0x6c, 0x6b, 0x6c, 0x61, 0x6e, 0x64, 0x20, 0x49, 0x73, 0x6c, 0x61, 0x6e, 0x64, 0x73, 0x46,
+0x69, 0x6a, 0x69, 0x46, 0x69, 0x6e, 0x6c, 0x61, 0x6e, 0x64, 0x47, 0x75, 0x65, 0x72, 0x6e, 0x73, 0x65, 0x79, 0x47, 0x61,
+0x6d, 0x62, 0x69, 0x61, 0x47, 0x65, 0x72, 0x6d, 0x61, 0x6e, 0x79, 0x47, 0x68, 0x61, 0x6e, 0x61, 0x47, 0x69, 0x62, 0x72,
+0x61, 0x6c, 0x74, 0x61, 0x72, 0x47, 0x72, 0x65, 0x6e, 0x61, 0x64, 0x61, 0x47, 0x75, 0x61, 0x6d, 0x47, 0x75, 0x79, 0x61,
+0x6e, 0x61, 0x48, 0x6f, 0x6e, 0x67, 0x20, 0x4b, 0x6f, 0x6e, 0x67, 0x20, 0x53, 0x41, 0x52, 0x20, 0x43, 0x68, 0x69, 0x6e,
+0x61, 0x49, 0x72, 0x65, 0x6c, 0x61, 0x6e, 0x64, 0x49, 0x73, 0x72, 0x61, 0x65, 0x6c, 0x4a, 0x61, 0x6d, 0x61, 0x69, 0x63,
+0x61, 0x4b, 0x65, 0x6e, 0x79, 0x61, 0x4b, 0x69, 0x72, 0x69, 0x62, 0x61, 0x74, 0x69, 0x4c, 0x65, 0x73, 0x6f, 0x74, 0x68,
+0x6f, 0x4c, 0x69, 0x62, 0x65, 0x72, 0x69, 0x61, 0x4d, 0x61, 0x63, 0x61, 0x6f, 0x20, 0x53, 0x41, 0x52, 0x20, 0x43, 0x68,
+0x69, 0x6e, 0x61, 0x4d, 0x61, 0x64, 0x61, 0x67, 0x61, 0x73, 0x63, 0x61, 0x72, 0x4d, 0x61, 0x6c, 0x61, 0x77, 0x69, 0x4d,
+0x61, 0x6c, 0x61, 0x79, 0x73, 0x69, 0x61, 0x4d, 0x61, 0x6c, 0x74, 0x61, 0x4d, 0x61, 0x72, 0x73, 0x68, 0x61, 0x6c, 0x6c,
+0x20, 0x49, 0x73, 0x6c, 0x61, 0x6e, 0x64, 0x73, 0x4d, 0x61, 0x75, 0x72, 0x69, 0x74, 0x69, 0x75, 0x73, 0x4d, 0x69, 0x63,
+0x72, 0x6f, 0x6e, 0x65, 0x73, 0x69, 0x61, 0x4d, 0x6f, 0x6e, 0x74, 0x73, 0x65, 0x72, 0x72, 0x61, 0x74, 0x4e, 0x61, 0x6d,
+0x69, 0x62, 0x69, 0x61, 0x4e, 0x61, 0x75, 0x72, 0x75, 0x4e, 0x65, 0x74, 0x68, 0x65, 0x72, 0x6c, 0x61, 0x6e, 0x64, 0x73,
+0x4e, 0x65, 0x77, 0x20, 0x5a, 0x65, 0x61, 0x6c, 0x61, 0x6e, 0x64, 0x4e, 0x69, 0x67, 0x65, 0x72, 0x69, 0x61, 0x4e, 0x69,
+0x75, 0x65, 0x4e, 0x6f, 0x72, 0x66, 0x6f, 0x6c, 0x6b, 0x20, 0x49, 0x73, 0x6c, 0x61, 0x6e, 0x64, 0x4e, 0x6f, 0x72, 0x74,
+0x68, 0x65, 0x72, 0x6e, 0x20, 0x4d, 0x61, 0x72, 0x69, 0x61, 0x6e, 0x61, 0x20, 0x49, 0x73, 0x6c, 0x61, 0x6e, 0x64, 0x73,
+0x50, 0x61, 0x6b, 0x69, 0x73, 0x74, 0x61, 0x6e, 0x50, 0x61, 0x6c, 0x61, 0x75, 0x50, 0x61, 0x70, 0x75, 0x61, 0x20, 0x4e,
+0x65, 0x77, 0x20, 0x47, 0x75, 0x69, 0x6e, 0x65, 0x61, 0x50, 0x68, 0x69, 0x6c, 0x69, 0x70, 0x70, 0x69, 0x6e, 0x65, 0x73,
+0x50, 0x69, 0x74, 0x63, 0x61, 0x69, 0x72, 0x6e, 0x20, 0x49, 0x73, 0x6c, 0x61, 0x6e, 0x64, 0x73, 0x50, 0x75, 0x65, 0x72,
+0x74, 0x6f, 0x20, 0x52, 0x69, 0x63, 0x6f, 0x52, 0x77, 0x61, 0x6e, 0x64, 0x61, 0x53, 0x74, 0x20, 0x4b, 0x69, 0x74, 0x74,
+0x73, 0x20, 0x26, 0x20, 0x4e, 0x65, 0x76, 0x69, 0x73, 0x53, 0x74, 0x20, 0x4c, 0x75, 0x63, 0x69, 0x61, 0x53, 0x74, 0x20,
+0x56, 0x69, 0x6e, 0x63, 0x65, 0x6e, 0x74, 0x20, 0x26, 0x20, 0x47, 0x72, 0x65, 0x6e, 0x61, 0x64, 0x69, 0x6e, 0x65, 0x73,
+0x53, 0x65, 0x79, 0x63, 0x68, 0x65, 0x6c, 0x6c, 0x65, 0x73, 0x53, 0x69, 0x65, 0x72, 0x72, 0x61, 0x20, 0x4c, 0x65, 0x6f,
+0x6e, 0x65, 0x53, 0x69, 0x6e, 0x67, 0x61, 0x70, 0x6f, 0x72, 0x65, 0x53, 0x6c, 0x6f, 0x76, 0x65, 0x6e, 0x69, 0x61, 0x53,
+0x6f, 0x6c, 0x6f, 0x6d, 0x6f, 0x6e, 0x20, 0x49, 0x73, 0x6c, 0x61, 0x6e, 0x64, 0x73, 0x53, 0x6f, 0x75, 0x74, 0x68, 0x20,
+0x41, 0x66, 0x72, 0x69, 0x63, 0x61, 0x53, 0x74, 0x20, 0x48, 0x65, 0x6c, 0x65, 0x6e, 0x61, 0x53, 0x75, 0x64, 0x61, 0x6e,
+0x45, 0x73, 0x77, 0x61, 0x74, 0x69, 0x6e, 0x69, 0x53, 0x77, 0x65, 0x64, 0x65, 0x6e, 0x53, 0x77, 0x69, 0x74, 0x7a, 0x65,
+0x72, 0x6c, 0x61, 0x6e, 0x64, 0x54, 0x61, 0x6e, 0x7a, 0x61, 0x6e, 0x69, 0x61, 0x54, 0x6f, 0x6b, 0x65, 0x6c, 0x61, 0x75,
+0x54, 0x6f, 0x6e, 0x67, 0x61, 0x54, 0x72, 0x69, 0x6e, 0x69, 0x64, 0x61, 0x64, 0x20, 0x26, 0x20, 0x54, 0x6f, 0x62, 0x61,
+0x67, 0x6f, 0x54, 0x75, 0x72, 0x6b, 0x73, 0x20, 0x26, 0x20, 0x43, 0x61, 0x69, 0x63, 0x6f, 0x73, 0x20, 0x49, 0x73, 0x6c,
+0x61, 0x6e, 0x64, 0x73, 0x54, 0x75, 0x76, 0x61, 0x6c, 0x75, 0x55, 0x67, 0x61, 0x6e, 0x64, 0x61, 0x55, 0x6e, 0x69, 0x74,
+0x65, 0x64, 0x20, 0x41, 0x72, 0x61, 0x62, 0x20, 0x45, 0x6d, 0x69, 0x72, 0x61, 0x74, 0x65, 0x73, 0x42, 0x72, 0x69, 0x74,
+0x69, 0x73, 0x68, 0x20, 0x45, 0x6e, 0x67, 0x6c, 0x69, 0x73, 0x68, 0x55, 0x6e, 0x69, 0x74, 0x65, 0x64, 0x20, 0x4b, 0x69,
+0x6e, 0x67, 0x64, 0x6f, 0x6d, 0x55, 0x2e, 0x53, 0x2e, 0x20, 0x4f, 0x75, 0x74, 0x6c, 0x79, 0x69, 0x6e, 0x67, 0x20, 0x49,
+0x73, 0x6c, 0x61, 0x6e, 0x64, 0x73, 0x56, 0x61, 0x6e, 0x75, 0x61, 0x74, 0x75, 0x42, 0x72, 0x69, 0x74, 0x69, 0x73, 0x68,
+0x20, 0x56, 0x69, 0x72, 0x67, 0x69, 0x6e, 0x20, 0x49, 0x73, 0x6c, 0x61, 0x6e, 0x64, 0x73, 0x55, 0x2e, 0x53, 0x2e, 0x20,
+0x56, 0x69, 0x72, 0x67, 0x69, 0x6e, 0x20, 0x49, 0x73, 0x6c, 0x61, 0x6e, 0x64, 0x73, 0x5a, 0x61, 0x6d, 0x62, 0x69, 0x61,
+0x5a, 0x69, 0x6d, 0x62, 0x61, 0x62, 0x77, 0x65, 0x44, 0x69, 0x65, 0x67, 0x6f, 0x20, 0x47, 0x61, 0x72, 0x63, 0x69, 0x61,
+0x49, 0x73, 0x6c, 0x65, 0x20, 0x6f, 0x66, 0x20, 0x4d, 0x61, 0x6e, 0x4a, 0x65, 0x72, 0x73, 0x65, 0x79, 0x53, 0x6f, 0x75,
+0x74, 0x68, 0x20, 0x53, 0x75, 0x64, 0x61, 0x6e, 0x53, 0x69, 0x6e, 0x74, 0x20, 0x4d, 0x61, 0x61, 0x72, 0x74, 0x65, 0x6e,
+0x57, 0x6f, 0x72, 0x6c, 0x64, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x65, 0x73, 0x70, 0x65, 0x72, 0x61, 0x6e, 0x74, 0x6f,
+0x4d, 0x6f, 0x6e, 0x64, 0x6f, 0x65, 0x65, 0x73, 0x74, 0x69, 0x45, 0x65, 0x73, 0x74, 0x69, 0x66, 0xf8, 0x72, 0x6f, 0x79,
+0x73, 0x6b, 0x74, 0x46, 0xf8, 0x72, 0x6f, 0x79, 0x61, 0x72, 0x73, 0x75, 0x6f, 0x6d, 0x69, 0x53, 0x75, 0x6f, 0x6d, 0x69,
+0x66, 0x72, 0x61, 0x6e, 0xe7, 0x61, 0x69, 0x73, 0x46, 0x72, 0x61, 0x6e, 0x63, 0x65, 0x41, 0x6c, 0x67, 0xe9, 0x72, 0x69,
+0x65, 0x42, 0x65, 0x6c, 0x67, 0x69, 0x71, 0x75, 0x65, 0x42, 0xe9, 0x6e, 0x69, 0x6e, 0x42, 0x75, 0x72, 0x6b, 0x69, 0x6e,
+0x61, 0x20, 0x46, 0x61, 0x73, 0x6f, 0x43, 0x61, 0x6d, 0x65, 0x72, 0x6f, 0x75, 0x6e, 0x66, 0x72, 0x61, 0x6e, 0xe7, 0x61,
+0x69, 0x73, 0x20, 0x63, 0x61, 0x6e, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x52, 0xe9, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x71, 0x75,
+0x65, 0x20, 0x63, 0x65, 0x6e, 0x74, 0x72, 0x61, 0x66, 0x72, 0x69, 0x63, 0x61, 0x69, 0x6e, 0x65, 0x54, 0x63, 0x68, 0x61,
+0x64, 0x43, 0x6f, 0x6d, 0x6f, 0x72, 0x65, 0x73, 0x43, 0x6f, 0x6e, 0x67, 0x6f, 0x2d, 0x4b, 0x69, 0x6e, 0x73, 0x68, 0x61,
+0x73, 0x61, 0x43, 0x6f, 0x6e, 0x67, 0x6f, 0x2d, 0x42, 0x72, 0x61, 0x7a, 0x7a, 0x61, 0x76, 0x69, 0x6c, 0x6c, 0x65, 0x43,
+0xf4, 0x74, 0x65, 0x20, 0x64, 0x2019, 0x49, 0x76, 0x6f, 0x69, 0x72, 0x65, 0x44, 0x6a, 0x69, 0x62, 0x6f, 0x75, 0x74, 0x69,
+0x47, 0x75, 0x69, 0x6e, 0xe9, 0x65, 0x20, 0xe9, 0x71, 0x75, 0x61, 0x74, 0x6f, 0x72, 0x69, 0x61, 0x6c, 0x65, 0x47, 0x75,
+0x79, 0x61, 0x6e, 0x65, 0x20, 0x66, 0x72, 0x61, 0x6e, 0xe7, 0x61, 0x69, 0x73, 0x65, 0x50, 0x6f, 0x6c, 0x79, 0x6e, 0xe9,
+0x73, 0x69, 0x65, 0x20, 0x66, 0x72, 0x61, 0x6e, 0xe7, 0x61, 0x69, 0x73, 0x65, 0x47, 0x61, 0x62, 0x6f, 0x6e, 0x47, 0x75,
+0x61, 0x64, 0x65, 0x6c, 0x6f, 0x75, 0x70, 0x65, 0x48, 0x61, 0xef, 0x74, 0x69, 0x4c, 0x75, 0x78, 0x65, 0x6d, 0x62, 0x6f,
+0x75, 0x72, 0x67, 0x4d, 0x61, 0x6c, 0x69, 0x4d, 0x61, 0x72, 0x74, 0x69, 0x6e, 0x69, 0x71, 0x75, 0x65, 0x4d, 0x61, 0x75,
+0x72, 0x69, 0x74, 0x61, 0x6e, 0x69, 0x65, 0x4d, 0x61, 0x75, 0x72, 0x69, 0x63, 0x65, 0x4d, 0x61, 0x79, 0x6f, 0x74, 0x74,
+0x65, 0x4d, 0x6f, 0x6e, 0x61, 0x63, 0x6f, 0x4d, 0x61, 0x72, 0x6f, 0x63, 0x4e, 0x6f, 0x75, 0x76, 0x65, 0x6c, 0x6c, 0x65,
+0x2d, 0x43, 0x61, 0x6c, 0xe9, 0x64, 0x6f, 0x6e, 0x69, 0x65, 0x4c, 0x61, 0x20, 0x52, 0xe9, 0x75, 0x6e, 0x69, 0x6f, 0x6e,
+0x53, 0xe9, 0x6e, 0xe9, 0x67, 0x61, 0x6c, 0x53, 0x61, 0x69, 0x6e, 0x74, 0x2d, 0x50, 0x69, 0x65, 0x72, 0x72, 0x65, 0x2d,
+0x65, 0x74, 0x2d, 0x4d, 0x69, 0x71, 0x75, 0x65, 0x6c, 0x6f, 0x6e, 0x66, 0x72, 0x61, 0x6e, 0xe7, 0x61, 0x69, 0x73, 0x20,
+0x73, 0x75, 0x69, 0x73, 0x73, 0x65, 0x53, 0x75, 0x69, 0x73, 0x73, 0x65, 0x53, 0x79, 0x72, 0x69, 0x65, 0x54, 0x6f, 0x67,
+0x6f, 0x54, 0x75, 0x6e, 0x69, 0x73, 0x69, 0x65, 0x57, 0x61, 0x6c, 0x6c, 0x69, 0x73, 0x2d, 0x65, 0x74, 0x2d, 0x46, 0x75,
+0x74, 0x75, 0x6e, 0x61, 0x53, 0x61, 0x69, 0x6e, 0x74, 0x2d, 0x42, 0x61, 0x72, 0x74, 0x68, 0xe9, 0x6c, 0x65, 0x6d, 0x79,
+0x53, 0x61, 0x69, 0x6e, 0x74, 0x2d, 0x4d, 0x61, 0x72, 0x74, 0x69, 0x6e, 0x46, 0x72, 0x79, 0x73, 0x6b, 0x4e, 0x65, 0x64,
+0x65, 0x72, 0x6c, 0xe2, 0x6e, 0x47, 0xe0, 0x69, 0x64, 0x68, 0x6c, 0x69, 0x67, 0x41, 0x6e, 0x20, 0x52, 0xec, 0x6f, 0x67,
+0x68, 0x61, 0x63, 0x68, 0x64, 0x20, 0x41, 0x6f, 0x6e, 0x61, 0x69, 0x63, 0x68, 0x74, 0x65, 0x67, 0x61, 0x6c, 0x65, 0x67,
+0x6f, 0x45, 0x73, 0x70, 0x61, 0xf1, 0x61, 0x10e5, 0x10d0, 0x10e0, 0x10d7, 0x10e3, 0x10da, 0x10d8, 0x10e1, 0x10d0, 0x10e5, 0x10d0, 0x10e0, 0x10d7,
+0x10d5, 0x10d4, 0x10da, 0x10dd, 0x44, 0x65, 0x75, 0x74, 0x73, 0x63, 0x68, 0x44, 0x65, 0x75, 0x74, 0x73, 0x63, 0x68, 0x6c, 0x61,
+0x6e, 0x64, 0xd6, 0x73, 0x74, 0x65, 0x72, 0x72, 0x65, 0x69, 0x63, 0x68, 0x69, 0x73, 0x63, 0x68, 0x65, 0x73, 0x20, 0x44,
+0x65, 0x75, 0x74, 0x73, 0x63, 0x68, 0x42, 0x65, 0x6c, 0x67, 0x69, 0x65, 0x6e, 0x49, 0x74, 0x61, 0x6c, 0x69, 0x65, 0x6e,
+0x4c, 0x69, 0x65, 0x63, 0x68, 0x74, 0x65, 0x6e, 0x73, 0x74, 0x65, 0x69, 0x6e, 0x4c, 0x75, 0x78, 0x65, 0x6d, 0x62, 0x75,
+0x72, 0x67, 0x53, 0x63, 0x68, 0x77, 0x65, 0x69, 0x7a, 0x65, 0x72, 0x20, 0x48, 0x6f, 0x63, 0x68, 0x64, 0x65, 0x75, 0x74,
+0x73, 0x63, 0x68, 0x395, 0x3bb, 0x3bb, 0x3b7, 0x3bd, 0x3b9, 0x3ba, 0x3ac, 0x395, 0x3bb, 0x3bb, 0x3ac, 0x3b4, 0x3b1, 0x39a, 0x3cd, 0x3c0,
+0x3c1, 0x3bf, 0x3c2, 0x6b, 0x61, 0x6c, 0x61, 0x61, 0x6c, 0x6c, 0x69, 0x73, 0x75, 0x74, 0x4b, 0x61, 0x6c, 0x61, 0x61, 0x6c,
+0x6c, 0x69, 0x74, 0x20, 0x4e, 0x75, 0x6e, 0x61, 0x61, 0x74, 0xa97, 0xac1, 0xa9c, 0xab0, 0xabe, 0xaa4, 0xac0, 0xaad, 0xabe, 0xab0,
+0xaa4, 0x48, 0x61, 0x75, 0x73, 0x61, 0x4e, 0x61, 0x6a, 0x65, 0x72, 0x69, 0x79, 0x61, 0x47, 0x61, 0x6e, 0x61, 0x4e, 0x69,
+0x6a, 0x61, 0x72, 0x5e2, 0x5d1, 0x5e8, 0x5d9, 0x5ea, 0x5d9, 0x5e9, 0x5e8, 0x5d0, 0x5dc, 0x939, 0x93f, 0x928, 0x94d, 0x926, 0x940, 0x92d,
+0x93e, 0x930, 0x924, 0x6d, 0x61, 0x67, 0x79, 0x61, 0x72, 0x4d, 0x61, 0x67, 0x79, 0x61, 0x72, 0x6f, 0x72, 0x73, 0x7a, 0xe1,
+0x67, 0xed, 0x73, 0x6c, 0x65, 0x6e, 0x73, 0x6b, 0x61, 0xcd, 0x73, 0x6c, 0x61, 0x6e, 0x64, 0x49, 0x6e, 0x64, 0x6f, 0x6e,
+0x65, 0x73, 0x69, 0x61, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x67, 0x75, 0x61, 0x4d, 0x75, 0x6e, 0x64, 0x6f,
+0x47, 0x61, 0x65, 0x69, 0x6c, 0x67, 0x65, 0xc9, 0x69, 0x72, 0x65, 0x61, 0x6e, 0x20, 0x52, 0xed, 0x6f, 0x63, 0x68, 0x74,
+0x20, 0x41, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x74, 0x68, 0x65, 0x69, 0x74, 0x61, 0x6c, 0x69, 0x61, 0x6e, 0x6f, 0x49, 0x74,
+0x61, 0x6c, 0x69, 0x61, 0x53, 0x61, 0x6e, 0x20, 0x4d, 0x61, 0x72, 0x69, 0x6e, 0x6f, 0x53, 0x76, 0x69, 0x7a, 0x7a, 0x65,
+0x72, 0x61, 0x43, 0x69, 0x74, 0x74, 0xe0, 0x20, 0x64, 0x65, 0x6c, 0x20, 0x56, 0x61, 0x74, 0x69, 0x63, 0x61, 0x6e, 0x6f,
+0x65e5, 0x672c, 0x8a9e, 0x4a, 0x61, 0x77, 0x61, 0x49, 0x6e, 0x64, 0x6f, 0x6e, 0xe9, 0x73, 0x69, 0x61, 0xc95, 0xca8, 0xccd, 0xca8,
+0xca1, 0xcad, 0xcbe, 0xcb0, 0xca4, 0x6a9, 0x672, 0x634, 0x64f, 0x631, 0x6c1, 0x650, 0x646, 0x62f, 0x648, 0x633, 0x62a, 0x627, 0x646, 0x49b,
+0x430, 0x437, 0x430, 0x49b, 0x20, 0x442, 0x456, 0x43b, 0x456, 0x49a, 0x430, 0x437, 0x430, 0x49b, 0x441, 0x442, 0x430, 0x43d, 0x4b, 0x69,
+0x6e, 0x79, 0x61, 0x72, 0x77, 0x61, 0x6e, 0x64, 0x61, 0x55, 0x20, 0x52, 0x77, 0x61, 0x6e, 0x64, 0x61, 0x43a, 0x44b, 0x440,
+0x433, 0x44b, 0x437, 0x447, 0x430, 0x41a, 0x44b, 0x440, 0x433, 0x44b, 0x437, 0x441, 0x442, 0x430, 0x43d, 0xd55c, 0xad6d, 0xc5b4, 0xb300, 0xd55c,
+0xbbfc, 0xad6d, 0xc870, 0xc120, 0xbbfc, 0xc8fc, 0xc8fc, 0xc758, 0xc778, 0xbbfc, 0xacf5, 0xd654, 0xad6d, 0x6b, 0x75, 0x72, 0x64, 0xee, 0x54, 0x69,
+0x72, 0x6b, 0x69, 0x79, 0x65, 0x49, 0x6b, 0x69, 0x72, 0x75, 0x6e, 0x64, 0x69, 0x55, 0x62, 0x75, 0x72, 0x75, 0x6e, 0x64,
+0x69, 0xea5, 0xeb2, 0xea7, 0x6c, 0x61, 0x74, 0x76, 0x69, 0x65, 0x161, 0x75, 0x4c, 0x61, 0x74, 0x76, 0x69, 0x6a, 0x61, 0x6c,
+0x69, 0x6e, 0x67, 0xe1, 0x6c, 0x61, 0x52, 0x65, 0x70, 0x75, 0x62, 0x6c, 0xed, 0x6b, 0x69, 0x20, 0x79, 0x61, 0x20, 0x4b,
+0x6f, 0x6e, 0x67, 0xf3, 0x20, 0x44, 0x65, 0x6d, 0x6f, 0x6b, 0x72, 0x61, 0x74, 0xed, 0x6b, 0x69, 0x41, 0x6e, 0x67, 0xf3,
+0x6c, 0x61, 0x52, 0x65, 0x70, 0x69, 0x62, 0x69, 0x6b, 0x69, 0x20, 0x79, 0x61, 0x20, 0x41, 0x66, 0x72, 0xed, 0x6b, 0x61,
+0x20, 0x79, 0x61, 0x20, 0x4b, 0xe1, 0x74, 0x69, 0x4b, 0x6f, 0x6e, 0x67, 0x6f, 0x6c, 0x69, 0x65, 0x74, 0x75, 0x76, 0x69,
+0x173, 0x4c, 0x69, 0x65, 0x74, 0x75, 0x76, 0x61, 0x43c, 0x430, 0x43a, 0x435, 0x434, 0x43e, 0x43d, 0x441, 0x43a, 0x438, 0x421, 0x435,
+0x432, 0x435, 0x440, 0x43d, 0x430, 0x20, 0x41c, 0x430, 0x43a, 0x435, 0x434, 0x43e, 0x43d, 0x438, 0x458, 0x430, 0x4d, 0x61, 0x6c, 0x61,
+0x67, 0x61, 0x73, 0x79, 0x4d, 0x61, 0x64, 0x61, 0x67, 0x61, 0x73, 0x69, 0x6b, 0x61, 0x72, 0x61, 0x4d, 0x65, 0x6c, 0x61,
+0x79, 0x75, 0x42, 0x72, 0x75, 0x6e, 0x65, 0x69, 0x53, 0x69, 0x6e, 0x67, 0x61, 0x70, 0x75, 0x72, 0x61, 0xd2e, 0xd32, 0xd2f,
+0xd3e, 0xd33, 0xd02, 0xd07, 0xd28, 0xd4d, 0xd24, 0xd4d, 0xd2f, 0x4d, 0x61, 0x6c, 0x74, 0x69, 0x4d, 0x101, 0x6f, 0x72, 0x69, 0x41,
+0x6f, 0x74, 0x65, 0x61, 0x72, 0x6f, 0x61, 0x92e, 0x930, 0x93e, 0x920, 0x940, 0x43c, 0x43e, 0x43d, 0x433, 0x43e, 0x43b, 0x41c, 0x43e,
+0x43d, 0x433, 0x43e, 0x43b, 0x928, 0x947, 0x92a, 0x93e, 0x932, 0x940, 0x6e, 0x6f, 0x72, 0x73, 0x6b, 0x20, 0x62, 0x6f, 0x6b, 0x6d,
+0xe5, 0x6c, 0x4e, 0x6f, 0x72, 0x67, 0x65, 0x53, 0x76, 0x61, 0x6c, 0x62, 0x61, 0x72, 0x64, 0x20, 0x6f, 0x67, 0x20, 0x4a,
+0x61, 0x6e, 0x20, 0x4d, 0x61, 0x79, 0x65, 0x6e, 0xb13, 0xb21, 0xb3c, 0xb3f, 0xb06, 0xb2d, 0xb3e, 0xb30, 0xb24, 0x67e, 0x69a, 0x62a,
+0x648, 0x627, 0x641, 0x63a, 0x627, 0x646, 0x633, 0x62a, 0x627, 0x646, 0x67e, 0x627, 0x6a9, 0x633, 0x62a, 0x627, 0x646, 0x641, 0x627, 0x631,
+0x633, 0x6cc, 0x627, 0x6cc, 0x631, 0x627, 0x646, 0x62f, 0x631, 0x6cc, 0x70, 0x6f, 0x6c, 0x73, 0x6b, 0x69, 0x50, 0x6f, 0x6c, 0x73,
+0x6b, 0x61, 0x70, 0x6f, 0x72, 0x74, 0x75, 0x67, 0x75, 0xea, 0x73, 0x42, 0x72, 0x61, 0x73, 0x69, 0x6c, 0x41, 0x6e, 0x67,
+0x6f, 0x6c, 0x61, 0x43, 0x61, 0x62, 0x6f, 0x20, 0x56, 0x65, 0x72, 0x64, 0x65, 0x54, 0x69, 0x6d, 0x6f, 0x72, 0x2d, 0x4c,
+0x65, 0x73, 0x74, 0x65, 0x47, 0x75, 0x69, 0x6e, 0xe9, 0x20, 0x45, 0x71, 0x75, 0x61, 0x74, 0x6f, 0x72, 0x69, 0x61, 0x6c,
+0x47, 0x75, 0x69, 0x6e, 0xe9, 0x2d, 0x42, 0x69, 0x73, 0x73, 0x61, 0x75, 0x4c, 0x75, 0x78, 0x65, 0x6d, 0x62, 0x75, 0x72,
+0x67, 0x6f, 0x4d, 0x61, 0x63, 0x61, 0x75, 0x2c, 0x20, 0x52, 0x41, 0x45, 0x20, 0x64, 0x61, 0x20, 0x43, 0x68, 0x69, 0x6e,
+0x61, 0x4d, 0x6f, 0xe7, 0x61, 0x6d, 0x62, 0x69, 0x71, 0x75, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x75, 0x67, 0x75, 0xea, 0x73,
+0x20, 0x65, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x75, 0x50, 0x6f, 0x72, 0x74, 0x75, 0x67, 0x61, 0x6c, 0x53, 0xe3, 0x6f, 0x20,
+0x54, 0x6f, 0x6d, 0xe9, 0x20, 0x65, 0x20, 0x50, 0x72, 0xed, 0x6e, 0x63, 0x69, 0x70, 0x65, 0x53, 0x75, 0xed, 0xe7, 0x61,
+0xa2a, 0xa70, 0xa1c, 0xa3e, 0xa2c, 0xa40, 0xa2d, 0xa3e, 0xa30, 0xa24, 0x67e, 0x646, 0x62c, 0x627, 0x628, 0x6cc, 0x52, 0x75, 0x6e, 0x61,
+0x73, 0x69, 0x6d, 0x69, 0x50, 0x65, 0x72, 0xfa, 0x42, 0x6f, 0x6c, 0x69, 0x76, 0x69, 0x61, 0x45, 0x63, 0x75, 0x61, 0x64,
+0x6f, 0x72, 0x72, 0x75, 0x6d, 0x61, 0x6e, 0x74, 0x73, 0x63, 0x68, 0x53, 0x76, 0x69, 0x7a, 0x72, 0x61, 0x72, 0x6f, 0x6d,
+0xe2, 0x6e, 0x103, 0x52, 0x6f, 0x6d, 0xe2, 0x6e, 0x69, 0x61, 0x52, 0x65, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x61, 0x20,
+0x4d, 0x6f, 0x6c, 0x64, 0x6f, 0x76, 0x61, 0x440, 0x443, 0x441, 0x441, 0x43a, 0x438, 0x439, 0x420, 0x43e, 0x441, 0x441, 0x438, 0x44f,
+0x41a, 0x430, 0x437, 0x430, 0x445, 0x441, 0x442, 0x430, 0x43d, 0x41a, 0x438, 0x440, 0x433, 0x438, 0x437, 0x438, 0x44f, 0x41c, 0x43e, 0x43b,
+0x434, 0x43e, 0x432, 0x430, 0x423, 0x43a, 0x440, 0x430, 0x438, 0x43d, 0x430, 0x53, 0xe4, 0x6e, 0x67, 0xf6, 0x4b, 0xf6, 0x64, 0xf6,
+0x72, 0xf6, 0x73, 0xea, 0x73, 0x65, 0x20, 0x74, 0xee, 0x20, 0x42, 0xea, 0x61, 0x66, 0x72, 0xee, 0x6b, 0x61, 0x441, 0x440,
+0x43f, 0x441, 0x43a, 0x438, 0x421, 0x440, 0x431, 0x438, 0x458, 0x430, 0x73, 0x72, 0x70, 0x73, 0x6b, 0x69, 0x43, 0x72, 0x6e, 0x61,
+0x20, 0x47, 0x6f, 0x72, 0x61, 0x53, 0x72, 0x62, 0x69, 0x6a, 0x61, 0x411, 0x43e, 0x441, 0x43d, 0x430, 0x20, 0x438, 0x20, 0x425,
+0x435, 0x440, 0x446, 0x435, 0x433, 0x43e, 0x432, 0x438, 0x43d, 0x430, 0x426, 0x440, 0x43d, 0x430, 0x20, 0x413, 0x43e, 0x440, 0x430, 0x41a,
+0x43e, 0x441, 0x43e, 0x432, 0x43e, 0x4b, 0x6f, 0x73, 0x6f, 0x76, 0x6f, 0x438, 0x440, 0x43e, 0x43d, 0x413, 0x443, 0x44b, 0x440, 0x434,
+0x437, 0x44b, 0x441, 0x442, 0x43e, 0x43d, 0x423, 0x4d5, 0x440, 0x4d5, 0x441, 0x435, 0x63, 0x68, 0x69, 0x53, 0x68, 0x6f, 0x6e, 0x61,
+0x633, 0x646, 0x68c, 0x64a, 0x67e, 0x627, 0x6aa, 0x633, 0x62a, 0x627, 0x646, 0xdc3, 0xdd2, 0xd82, 0xdc4, 0xdbd, 0xdc1, 0xdca, 0x200d, 0xdbb,
+0xdd3, 0x20, 0xdbd, 0xd82, 0xd9a, 0xdcf, 0xdc0, 0x73, 0x6c, 0x6f, 0x76, 0x65, 0x6e, 0x10d, 0x69, 0x6e, 0x61, 0x53, 0x6c, 0x6f,
+0x76, 0x65, 0x6e, 0x73, 0x6b, 0x6f, 0x73, 0x6c, 0x6f, 0x76, 0x65, 0x6e, 0x161, 0x10d, 0x69, 0x6e, 0x61, 0x53, 0x6c, 0x6f,
+0x76, 0x65, 0x6e, 0x69, 0x6a, 0x61, 0x53, 0x6f, 0x6f, 0x6d, 0x61, 0x61, 0x6c, 0x69, 0x53, 0x6f, 0x6f, 0x6d, 0x61, 0x61,
+0x6c, 0x69, 0x79, 0x61, 0x4a, 0x61, 0x62, 0x75, 0x75, 0x74, 0x69, 0x49, 0x74, 0x6f, 0x6f, 0x62, 0x69, 0x79, 0x61, 0x65,
+0x73, 0x70, 0x61, 0xf1, 0x6f, 0x6c, 0x20, 0x64, 0x65, 0x20, 0x45, 0x73, 0x70, 0x61, 0xf1, 0x61, 0x41, 0x72, 0x67, 0x65,
+0x6e, 0x74, 0x69, 0x6e, 0x61, 0x42, 0x65, 0x6c, 0x69, 0x63, 0x65, 0x43, 0x68, 0x69, 0x6c, 0x65, 0x43, 0x6f, 0x6c, 0x6f,
+0x6d, 0x62, 0x69, 0x61, 0x43, 0x6f, 0x73, 0x74, 0x61, 0x20, 0x52, 0x69, 0x63, 0x61, 0x43, 0x75, 0x62, 0x61, 0x52, 0x65,
+0x70, 0xfa, 0x62, 0x6c, 0x69, 0x63, 0x61, 0x20, 0x44, 0x6f, 0x6d, 0x69, 0x6e, 0x69, 0x63, 0x61, 0x6e, 0x61, 0x45, 0x6c,
+0x20, 0x53, 0x61, 0x6c, 0x76, 0x61, 0x64, 0x6f, 0x72, 0x47, 0x75, 0x69, 0x6e, 0x65, 0x61, 0x20, 0x45, 0x63, 0x75, 0x61,
+0x74, 0x6f, 0x72, 0x69, 0x61, 0x6c, 0x47, 0x75, 0x61, 0x74, 0x65, 0x6d, 0x61, 0x6c, 0x61, 0x48, 0x6f, 0x6e, 0x64, 0x75,
+0x72, 0x61, 0x73, 0x65, 0x73, 0x70, 0x61, 0xf1, 0x6f, 0x6c, 0x20, 0x64, 0x65, 0x20, 0x4d, 0xe9, 0x78, 0x69, 0x63, 0x6f,
+0x4d, 0xe9, 0x78, 0x69, 0x63, 0x6f, 0x4e, 0x69, 0x63, 0x61, 0x72, 0x61, 0x67, 0x75, 0x61, 0x50, 0x61, 0x6e, 0x61, 0x6d,
+0xe1, 0x50, 0x61, 0x72, 0x61, 0x67, 0x75, 0x61, 0x79, 0x46, 0x69, 0x6c, 0x69, 0x70, 0x69, 0x6e, 0x61, 0x73, 0x45, 0x73,
+0x74, 0x61, 0x64, 0x6f, 0x73, 0x20, 0x55, 0x6e, 0x69, 0x64, 0x6f, 0x73, 0x55, 0x72, 0x75, 0x67, 0x75, 0x61, 0x79, 0x56,
+0x65, 0x6e, 0x65, 0x7a, 0x75, 0x65, 0x6c, 0x61, 0x43, 0x61, 0x6e, 0x61, 0x72, 0x69, 0x61, 0x73, 0x65, 0x73, 0x70, 0x61,
+0xf1, 0x6f, 0x6c, 0x20, 0x6c, 0x61, 0x74, 0x69, 0x6e, 0x6f, 0x61, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x6e, 0x6f, 0x4c,
+0x61, 0x74, 0x69, 0x6e, 0x6f, 0x61, 0x6d, 0xe9, 0x72, 0x69, 0x63, 0x61, 0x43, 0x65, 0x75, 0x74, 0x61, 0x20, 0x79, 0x20,
+0x4d, 0x65, 0x6c, 0x69, 0x6c, 0x6c, 0x61, 0x4b, 0x69, 0x73, 0x77, 0x61, 0x68, 0x69, 0x6c, 0x69, 0x4a, 0x61, 0x6d, 0x68,
+0x75, 0x72, 0x69, 0x20, 0x79, 0x61, 0x20, 0x4b, 0x69, 0x64, 0x65, 0x6d, 0x6f, 0x6b, 0x72, 0x61, 0x73, 0x69, 0x61, 0x20,
+0x79, 0x61, 0x20, 0x4b, 0x6f, 0x6e, 0x67, 0x6f, 0x73, 0x76, 0x65, 0x6e, 0x73, 0x6b, 0x61, 0x53, 0x76, 0x65, 0x72, 0x69,
+0x67, 0x65, 0xc5, 0x6c, 0x61, 0x6e, 0x64, 0x442, 0x43e, 0x4b7, 0x438, 0x43a, 0x4e3, 0x422, 0x43e, 0x4b7, 0x438, 0x43a, 0x438, 0x441,
+0x442, 0x43e, 0x43d, 0xba4, 0xbae, 0xbbf, 0xbb4, 0xbcd, 0xb87, 0xba8, 0xbcd, 0xba4, 0xbbf, 0xbaf, 0xbbe, 0xbae, 0xbb2, 0xbc7, 0xb9a, 0xbbf,
+0xbaf, 0xbbe, 0xb9a, 0xbbf, 0xb99, 0xbcd, 0xb95, 0xbaa, 0xbcd, 0xbaa, 0xbc2, 0xbb0, 0xbcd, 0xb87, 0xbb2, 0xb99, 0xbcd, 0xb95, 0xbc8, 0x442,
+0x430, 0x442, 0x430, 0x440, 0xc24, 0xc46, 0xc32, 0xc41, 0xc17, 0xc41, 0xc2d, 0xc3e, 0xc30, 0xc24, 0xc26, 0xc47, 0xc36, 0xc02, 0xe44, 0xe17,
+0xe22, 0xf56, 0xf7c, 0xf51, 0xf0b, 0xf66, 0xf90, 0xf51, 0xf0b, 0xf62, 0xf92, 0xfb1, 0xf0b, 0xf53, 0xf42, 0xf62, 0xf92, 0xfb1, 0xf0b, 0xf42,
+0xf62, 0xf0b, 0x1275, 0x130d, 0x122d, 0x129b, 0x12a4, 0x122d, 0x1275, 0x122b, 0x6c, 0x65, 0x61, 0x20, 0x66, 0x61, 0x6b, 0x61, 0x74, 0x6f,
+0x6e, 0x67, 0x61, 0x54, 0xfc, 0x72, 0x6b, 0xe7, 0x65, 0x54, 0xfc, 0x72, 0x6b, 0x69, 0x79, 0x65, 0x4b, 0x131, 0x62, 0x72,
+0x131, 0x73, 0x74, 0xfc, 0x72, 0x6b, 0x6d, 0x65, 0x6e, 0x20, 0x64, 0x69, 0x6c, 0x69, 0x54, 0xfc, 0x72, 0x6b, 0x6d, 0x65,
+0x6e, 0x69, 0x73, 0x74, 0x61, 0x6e, 0x626, 0x6c7, 0x64a, 0x63a, 0x6c7, 0x631, 0x686, 0x6d5, 0x62c, 0x6c7, 0x6ad, 0x6af, 0x648, 0x443,
+0x43a, 0x440, 0x430, 0x457, 0x43d, 0x441, 0x44c, 0x43a, 0x430, 0x423, 0x43a, 0x440, 0x430, 0x457, 0x43d, 0x430, 0x627, 0x631, 0x62f, 0x648,
+0x628, 0x6be, 0x627, 0x631, 0x62a, 0x6f, 0x2018, 0x7a, 0x62, 0x65, 0x6b, 0x4f, 0x2bb, 0x7a, 0x62, 0x65, 0x6b, 0x69, 0x73, 0x74,
+0x6f, 0x6e, 0x627, 0x648, 0x632, 0x628, 0x6cc, 0x6a9, 0x45e, 0x437, 0x431, 0x435, 0x43a, 0x447, 0x430, 0x40e, 0x437, 0x431, 0x435, 0x43a,
+0x438, 0x441, 0x442, 0x43e, 0x43d, 0x54, 0x69, 0x1ebf, 0x6e, 0x67, 0x20, 0x56, 0x69, 0x1ec7, 0x74, 0x56, 0x69, 0x1ec7, 0x74, 0x20,
+0x4e, 0x61, 0x6d, 0x56, 0x6f, 0x6c, 0x61, 0x70, 0xfc, 0x6b, 0x43, 0x79, 0x6d, 0x72, 0x61, 0x65, 0x67, 0x59, 0x20, 0x44,
+0x65, 0x79, 0x72, 0x6e, 0x61, 0x73, 0x20, 0x55, 0x6e, 0x65, 0x64, 0x69, 0x67, 0x57, 0x6f, 0x6c, 0x6f, 0x66, 0x53, 0x65,
+0x6e, 0x65, 0x67, 0x61, 0x61, 0x6c, 0x69, 0x73, 0x69, 0x58, 0x68, 0x6f, 0x73, 0x61, 0x65, 0x4d, 0x7a, 0x61, 0x6e, 0x74,
+0x73, 0x69, 0x20, 0x41, 0x66, 0x72, 0x69, 0x6b, 0x61, 0x5d9, 0x5d9, 0x5b4, 0x5d3, 0x5d9, 0x5e9, 0x5d5, 0x5d5, 0x5e2, 0x5dc, 0x5d8,
+0xc8, 0x64, 0xe8, 0x20, 0x59, 0x6f, 0x72, 0xf9, 0x62, 0xe1, 0x4f, 0x72, 0x69, 0x6c, 0x1eb9, 0x300, 0x2d, 0xe8, 0x64, 0xe8,
+0x20, 0x4e, 0xe0, 0xec, 0x6a, 0xed, 0x72, 0xed, 0xe0, 0x4f, 0x72, 0xed, 0x6c, 0x25b, 0x301, 0xe8, 0x64, 0x65, 0x20, 0x42,
+0x25b, 0x300, 0x6e, 0x25b, 0x300, 0x69, 0x73, 0x69, 0x5a, 0x75, 0x6c, 0x75, 0x69, 0x4e, 0x69, 0x6e, 0x67, 0x69, 0x7a, 0x69,
+0x6d, 0x75, 0x20, 0x41, 0x66, 0x72, 0x69, 0x6b, 0x61, 0x6e, 0x79, 0x6e, 0x6f, 0x72, 0x73, 0x6b, 0x4e, 0x6f, 0x72, 0x65,
+0x67, 0x62, 0x6f, 0x73, 0x61, 0x6e, 0x73, 0x6b, 0x69, 0x431, 0x43e, 0x441, 0x430, 0x43d, 0x441, 0x43a, 0x438, 0x47, 0x61, 0x65,
+0x6c, 0x67, 0x45, 0x6c, 0x6c, 0x61, 0x6e, 0x20, 0x56, 0x61, 0x6e, 0x6e, 0x69, 0x6e, 0x6b, 0x65, 0x72, 0x6e, 0x65, 0x77,
+0x65, 0x6b, 0x52, 0x79, 0x77, 0x76, 0x61, 0x6e, 0x65, 0x74, 0x68, 0x20, 0x55, 0x6e, 0x79, 0x73, 0x41, 0x6b, 0x61, 0x6e,
+0x47, 0x61, 0x61, 0x6e, 0x61, 0x915, 0x94b, 0x902, 0x915, 0x923, 0x940, 0x41, 0x73, 0x1ee5, 0x73, 0x1ee5, 0x20, 0x49, 0x67, 0x62,
+0x6f, 0x4e, 0x61, 0x1ecb, 0x6a, 0x1ecb, 0x72, 0x1ecb, 0x61, 0x4b, 0x69, 0x6b, 0x61, 0x6d, 0x62, 0x61, 0x66, 0x75, 0x72, 0x6c,
+0x61, 0x6e, 0x45, 0x28b, 0x65, 0x67, 0x62, 0x65, 0x47, 0x68, 0x61, 0x6e, 0x61, 0x20, 0x6e, 0x75, 0x74, 0x6f, 0x6d, 0x65,
+0x54, 0x6f, 0x67, 0x6f, 0x20, 0x6e, 0x75, 0x74, 0x6f, 0x6d, 0x65, 0x2bb, 0x14c, 0x6c, 0x65, 0x6c, 0x6f, 0x20, 0x48, 0x61,
+0x77, 0x61, 0x69, 0x2bb, 0x69, 0x2bb, 0x41, 0x6d, 0x65, 0x6c, 0x69, 0x6b, 0x61, 0x20, 0x48, 0x75, 0x69, 0x20, 0x50, 0x16b,
+0x20, 0x2bb, 0x49, 0x61, 0x46, 0x69, 0x6c, 0x69, 0x70, 0x69, 0x6e, 0x6f, 0x50, 0x69, 0x6c, 0x69, 0x70, 0x69, 0x6e, 0x61,
+0x73, 0x53, 0x63, 0x68, 0x77, 0x69, 0x69, 0x7a, 0x65, 0x72, 0x74, 0xfc, 0xfc, 0x74, 0x73, 0x63, 0x68, 0x46, 0x72, 0x61,
+0x6e, 0x6b, 0x72, 0x69, 0x69, 0x63, 0x68, 0x4c, 0x69, 0xe4, 0x63, 0x68, 0x74, 0x65, 0x73, 0x63, 0x68, 0x74, 0xe4, 0x69,
+0xa188, 0xa320, 0xa259, 0xa34f, 0xa1e9, 0x4e, 0x65, 0x64, 0x64, 0x65, 0x72, 0x73, 0x61, 0x73, 0x73, 0x2019, 0x73, 0x63, 0x68, 0x44,
+0xfc, 0xfc, 0x74, 0x73, 0x63, 0x68, 0x6c, 0x61, 0x6e, 0x64, 0x4e, 0x65, 0x64, 0x64, 0x65, 0x72, 0x6c, 0x61, 0x6e, 0x6e,
+0x65, 0x6e, 0x64, 0x61, 0x76, 0x76, 0x69, 0x73, 0xe1, 0x6d, 0x65, 0x67, 0x69, 0x65, 0x6c, 0x6c, 0x61, 0x4e, 0x6f, 0x72,
+0x67, 0x61, 0x53, 0x75, 0x6f, 0x70, 0x6d, 0x61, 0x52, 0x75, 0x6f, 0x167, 0x167, 0x61, 0x45, 0x6b, 0x65, 0x67, 0x75, 0x73,
+0x69, 0x69, 0x4b, 0x69, 0x74, 0x61, 0x69, 0x74, 0x61, 0x50, 0x75, 0x6c, 0x61, 0x61, 0x72, 0x42, 0x75, 0x72, 0x6b, 0x69,
+0x62, 0x61, 0x61, 0x20, 0x46, 0x61, 0x61, 0x73, 0x6f, 0x4b, 0x61, 0x6d, 0x65, 0x72, 0x75, 0x75, 0x6e, 0x47, 0x61, 0x6d,
+0x6d, 0x62, 0x69, 0x47, 0x61, 0x6e, 0x61, 0x61, 0x47, 0x69, 0x6e, 0x65, 0x47, 0x69, 0x6e, 0x65, 0x2d, 0x42, 0x69, 0x73,
+0x61, 0x61, 0x77, 0x6f, 0x4c, 0x69, 0x62, 0x65, 0x72, 0x69, 0x79, 0x61, 0x61, 0x4d, 0x75, 0x72, 0x69, 0x74, 0x61, 0x6e,
+0x69, 0x4e, 0x69, 0x6a, 0x65, 0x65, 0x72, 0x4e, 0x69, 0x6a, 0x65, 0x72, 0x69, 0x79, 0x61, 0x61, 0x53, 0x65, 0x72, 0x61,
+0x61, 0x20, 0x6c, 0x69, 0x79, 0x6f, 0x6e, 0x47, 0x69, 0x6b, 0x75, 0x79, 0x75, 0x4b, 0x69, 0x73, 0x61, 0x6d, 0x70, 0x75,
+0x72, 0x73, 0x65, 0x6e, 0x61, 0x69, 0x73, 0x69, 0x4e, 0x64, 0x65, 0x62, 0x65, 0x6c, 0x65, 0x4b, 0x69, 0x68, 0x6f, 0x72,
+0x6f, 0x6d, 0x62, 0x6f, 0x2d5c, 0x2d30, 0x2d5b, 0x2d4d, 0x2d43, 0x2d49, 0x2d5c, 0x2d4d, 0x2d4e, 0x2d56, 0x2d54, 0x2d49, 0x2d31, 0x54, 0x61, 0x73,
+0x68, 0x65, 0x6c, 0x1e25, 0x69, 0x79, 0x74, 0x6c, 0x6d, 0x263, 0x72, 0x69, 0x62, 0x54, 0x61, 0x71, 0x62, 0x61, 0x79, 0x6c,
+0x69, 0x74, 0x4c, 0x65, 0x7a, 0x7a, 0x61, 0x79, 0x65, 0x72, 0x52, 0x75, 0x6e, 0x79, 0x61, 0x6e, 0x6b, 0x6f, 0x72, 0x65,
+0x48, 0x69, 0x62, 0x65, 0x6e, 0x61, 0x48, 0x75, 0x74, 0x61, 0x6e, 0x7a, 0x61, 0x6e, 0x69, 0x61, 0x4b, 0x79, 0x69, 0x76,
+0x75, 0x6e, 0x6a, 0x6f, 0x62, 0x61, 0x6d, 0x61, 0x6e, 0x61, 0x6b, 0x61, 0x6e, 0x4b, 0x129, 0x65, 0x6d, 0x62, 0x75, 0x13e3,
+0x13b3, 0x13a9, 0x13cc, 0x13ca, 0x20, 0x13a2, 0x13f3, 0x13be, 0x13b5, 0x13cd, 0x13d4, 0x13c5, 0x20, 0x13cd, 0x13a6, 0x13da, 0x13a9, 0x6b, 0x72, 0x65,
+0x6f, 0x6c, 0x20, 0x6d, 0x6f, 0x72, 0x69, 0x73, 0x69, 0x65, 0x6e, 0x4d, 0x6f, 0x72, 0x69, 0x73, 0x43, 0x68, 0x69, 0x6d,
+0x61, 0x6b, 0x6f, 0x6e, 0x64, 0x65, 0x4b, 0x268, 0x6c, 0x61, 0x61, 0x6e, 0x67, 0x69, 0x54, 0x61, 0x61, 0x6e, 0x73, 0x61,
+0x6e, 0xed, 0x61, 0x4c, 0x75, 0x67, 0x61, 0x6e, 0x64, 0x61, 0x59, 0x75, 0x67, 0x61, 0x6e, 0x64, 0x61, 0x49, 0x63, 0x68,
+0x69, 0x62, 0x65, 0x6d, 0x62, 0x61, 0x6b, 0x61, 0x62, 0x75, 0x76, 0x65, 0x72, 0x64, 0x69, 0x61, 0x6e, 0x75, 0x4b, 0x61,
+0x62, 0x75, 0x20, 0x56, 0x65, 0x72, 0x64, 0x69, 0x4b, 0x129, 0x6d, 0x129, 0x72, 0x169, 0x4b, 0x61, 0x6c, 0x65, 0x6e, 0x6a,
+0x69, 0x6e, 0x45, 0x6d, 0x65, 0x74, 0x61, 0x62, 0x20, 0x4b, 0x65, 0x6e, 0x79, 0x61, 0x4b, 0x68, 0x6f, 0x65, 0x6b, 0x68,
+0x6f, 0x65, 0x67, 0x6f, 0x77, 0x61, 0x62, 0x4e, 0x61, 0x6d, 0x69, 0x62, 0x69, 0x61, 0x62, 0x4b, 0x69, 0x6d, 0x61, 0x63,
+0x68, 0x61, 0x6d, 0x65, 0x4b, 0xf6, 0x6c, 0x73, 0x63, 0x68, 0x44, 0x6f, 0xfc, 0x74, 0x73, 0x63, 0x68, 0x6c, 0x61, 0x6e,
+0x64, 0x54, 0x61, 0x6e, 0x73, 0x61, 0x6e, 0x69, 0x61, 0x4f, 0x6c, 0x75, 0x73, 0x6f, 0x67, 0x61, 0x4c, 0x75, 0x6c, 0x75,
+0x68, 0x69, 0x61, 0x4b, 0x69, 0x70, 0x61, 0x72, 0x65, 0x54, 0x61, 0x64, 0x68, 0x61, 0x6e, 0x69, 0x61, 0x4b, 0x69, 0x74,
+0x65, 0x73, 0x6f, 0x4b, 0x65, 0x6e, 0x69, 0x61, 0x4b, 0x6f, 0x79, 0x72, 0x61, 0x20, 0x63, 0x69, 0x69, 0x6e, 0x69, 0x4d,
+0x61, 0x61, 0x6c, 0x69, 0x4b, 0x69, 0x72, 0x75, 0x77, 0x61, 0x44, 0x68, 0x6f, 0x6c, 0x75, 0x6f, 0x52, 0x75, 0x6b, 0x69,
+0x67, 0x61, 0x54, 0x61, 0x6d, 0x61, 0x7a, 0x69, 0x263, 0x74, 0x20, 0x6e, 0x20, 0x6c, 0x61, 0x1e6d, 0x6c, 0x61, 0x1e63, 0x4d,
+0x65, 0x1e5b, 0x1e5b, 0x75, 0x6b, 0x4b, 0x6f, 0x79, 0x72, 0x61, 0x62, 0x6f, 0x72, 0x6f, 0x20, 0x73, 0x65, 0x6e, 0x6e, 0x69,
+0x4b, 0x69, 0x73, 0x68, 0x61, 0x6d, 0x62, 0x61, 0x61, 0x92c, 0x921, 0x93c, 0x94b, 0x43d, 0x43e, 0x445, 0x447, 0x438, 0x439, 0x43d,
+0x446, 0x435, 0x440, 0x43a, 0x43e, 0x432, 0x43d, 0x43e, 0x441, 0x43b, 0x43e, 0x432, 0x435, 0x301, 0x43d, 0x441, 0x43a, 0x457, 0x439, 0x440,
+0x461, 0x441, 0x441, 0x456, 0x301, 0x430, 0x54, 0x73, 0x68, 0x69, 0x6c, 0x75, 0x62, 0x61, 0x44, 0x69, 0x74, 0x75, 0x6e, 0x67,
+0x61, 0x20, 0x77, 0x61, 0x20, 0x4b, 0x6f, 0x6e, 0x67, 0x75, 0x4c, 0xeb, 0x74, 0x7a, 0x65, 0x62, 0x75, 0x65, 0x72, 0x67,
+0x65, 0x73, 0x63, 0x68, 0x41, 0x67, 0x68, 0x65, 0x6d, 0x4b, 0xe0, 0x6d, 0xe0, 0x6c, 0xfb, 0x14b, 0x181, 0xe0, 0x73, 0xe0,
+0x61, 0x4b, 0xe0, 0x6d, 0x25b, 0x300, 0x72, 0xfb, 0x6e, 0x5a, 0x61, 0x72, 0x6d, 0x61, 0x63, 0x69, 0x69, 0x6e, 0x65, 0x4e,
+0x69, 0x17e, 0x65, 0x72, 0x64, 0x75, 0xe1, 0x6c, 0xe1, 0x6a, 0x6f, 0x6f, 0x6c, 0x61, 0x53, 0x65, 0x6e, 0x65, 0x67, 0x61,
+0x6c, 0x65, 0x77, 0x6f, 0x6e, 0x64, 0x6f, 0x4b, 0x61, 0x6d, 0x259, 0x72, 0xfa, 0x6e, 0x72, 0x69, 0x6b, 0x70, 0x61, 0x6b,
+0x61, 0x6d, 0x25b, 0x72, 0xfa, 0x6e, 0x4d, 0x61, 0x6b, 0x75, 0x61, 0x55, 0x6d, 0x6f, 0x7a, 0x61, 0x6d, 0x62, 0x69, 0x6b,
+0x69, 0x4d, 0x55, 0x4e, 0x44, 0x41, 0x14a, 0x6b, 0x61, 0x6d, 0x65, 0x72, 0x75, 0x14b, 0x4b, 0x77, 0x61, 0x73, 0x69, 0x6f,
+0x4b, 0x61, 0x6d, 0x65, 0x72, 0x75, 0x6e, 0x54, 0x68, 0x6f, 0x6b, 0x20, 0x4e, 0x61, 0x74, 0x68, 0x441, 0x430, 0x445, 0x430,
+0x20, 0x442, 0x44b, 0x43b, 0x430, 0x410, 0x440, 0x430, 0x441, 0x441, 0x44b, 0x44b, 0x439, 0x430, 0x49, 0x73, 0x68, 0x69, 0x73, 0x61,
+0x6e, 0x67, 0x75, 0x54, 0x61, 0x6e, 0x73, 0x61, 0x6e, 0x69, 0x79, 0x61, 0x54, 0x61, 0x73, 0x61, 0x77, 0x61, 0x71, 0x20,
+0x73, 0x65, 0x6e, 0x6e, 0x69, 0xa559, 0xa524, 0xa55e, 0xa524, 0xa52b, 0xa569, 0x56, 0x61, 0x69, 0x4c, 0x61, 0x69, 0x62, 0x68, 0x69,
+0x79, 0x61, 0x57, 0x61, 0x6c, 0x73, 0x65, 0x72, 0x53, 0x63, 0x68, 0x77, 0x69, 0x7a, 0x6e, 0x75, 0x61, 0x73, 0x75, 0x65,
+0x4b, 0x65, 0x6d, 0x65, 0x6c, 0xfa, 0x6e, 0x61, 0x73, 0x74, 0x75, 0x72, 0x69, 0x61, 0x6e, 0x75, 0x4e, 0x64, 0x61, 0xa78c,
+0x61, 0x4b, 0x61, 0x6d, 0x25b, 0x6c, 0xfb, 0x6e, 0x6b, 0x61, 0x6b, 0x254, 0x4b, 0x61, 0x6d, 0x25b, 0x72, 0x75, 0x6e, 0x6d,
+0x65, 0x74, 0x61, 0x2bc, 0x4b, 0x61, 0x6d, 0x61, 0x6c, 0x75, 0x6e, 0x53, 0x68, 0x77, 0xf3, 0x14b, 0xf2, 0x20, 0x6e, 0x67,
+0x69, 0x65, 0x6d, 0x62, 0x254, 0x254, 0x6e, 0x4b, 0xe0, 0x6d, 0x61, 0x6c, 0xfb, 0x6d, 0xd804, 0xdd0c, 0xd804, 0xdd0b, 0xd804, 0xdd34,
+0xd804, 0xdd1f, 0xd804, 0xdd33, 0xd804, 0xdd26, 0xd804, 0xdd1d, 0xd804, 0xdd01, 0xd804, 0xdd23, 0xd804, 0xdd18, 0xd804, 0xdd2c, 0xd804, 0xdd0c, 0xd804, 0xdd34,
+0xd804, 0xdd1e, 0xd804, 0xdd22, 0xd804, 0xdd27, 0xd804, 0xdd16, 0xd804, 0xdd34, 0x4c, 0x61, 0x6b, 0x21f, 0xf3, 0x6c, 0x2bc, 0x69, 0x79, 0x61,
+0x70, 0x69, 0x4d, 0xed, 0x6c, 0x61, 0x68, 0x61, 0x14b, 0x73, 0x6b, 0x61, 0x20, 0x54, 0x21f, 0x61, 0x6d, 0xe1, 0x6b, 0x21f,
+0x6f, 0x10d, 0x68, 0x65, 0x2d5c, 0x2d30, 0x2d4e, 0x2d30, 0x2d63, 0x2d49, 0x2d56, 0x2d5c, 0x6a9, 0x648, 0x631, 0x62f, 0x6cc, 0x6cc, 0x20, 0x646,
+0x627, 0x648, 0x6d5, 0x646, 0x62f, 0x6cc, 0x639, 0x6ce, 0x631, 0x627, 0x642, 0x626, 0x6ce, 0x631, 0x627, 0x646, 0x64, 0x6f, 0x6c, 0x6e,
+0x6f, 0x73, 0x65, 0x72, 0x62, 0x161, 0x107, 0x69, 0x6e, 0x61, 0x4e, 0x69, 0x6d, 0x73, 0x6b, 0x61, 0x68, 0x6f, 0x72, 0x6e,
+0x6a, 0x6f, 0x73, 0x65, 0x72, 0x62, 0x161, 0x107, 0x69, 0x6e, 0x61, 0x4e, 0x11b, 0x6d, 0x73, 0x6b, 0x61, 0x70, 0x72, 0x16b,
+0x73, 0x69, 0x73, 0x6b, 0x61, 0x6e, 0x73, 0x77, 0x12b, 0x74, 0x61, 0x69, 0x61, 0x6e, 0x61, 0x72, 0xe2, 0x161, 0x6b, 0x69,
+0x65, 0x6c, 0xe2, 0x53, 0x75, 0x6f, 0x6d, 0xe2, 0x645, 0x627, 0x632, 0x631, 0x648, 0x646, 0x6cc, 0x644, 0x6ca, 0x631, 0x6cc, 0x20,
+0x634, 0x648, 0x645, 0x627, 0x644, 0x6cc, 0x7cb5, 0x8a9e, 0x4e2d, 0x83ef, 0x4eba, 0x6c11, 0x5171, 0x548c, 0x570b, 0x9999, 0x6e2f, 0x7279, 0x5225, 0x884c,
+0x653f, 0x5340, 0x7ca4, 0x8bed, 0x4e2d, 0x534e, 0x4eba, 0x6c11, 0x5171, 0x548c, 0x56fd, 0x42, 0x69, 0x6e, 0x69, 0x73, 0x61, 0x79, 0x61
 };
 
 static const char language_name_list[] =
diff --git a/src/corelib/text/qlocale_p.h b/src/corelib/text/qlocale_p.h
index 7e26e86fdf..42d434eac4 100644
--- a/src/corelib/text/qlocale_p.h
+++ b/src/corelib/text/qlocale_p.h
@@ -221,21 +221,19 @@ public:
 
     typedef QVarLengthArray<char, 256> CharBuff;
 
-    static QString doubleToString(const QChar zero, const QChar plus,
-                                  const QChar minus, const QChar exponent,
-                                  const QChar group, const QChar decimal,
-                                  double d, int precision,
-                                  DoubleForm form,
+    static QString doubleToString(const QString &zero, const QString &plus,
+                                  const QString &minus, const QString &exponent,
+                                  const QString &group, const QString &decimal,
+                                  double d, int precision, DoubleForm form,
                                   int width, unsigned flags);
-    static QString longLongToString(const QChar zero, const QChar group,
-                                    const QChar plus, const QChar minus,
+    static QString longLongToString(const QString &zero, const QString &group,
+                                    const QString &plus, const QString &minus,
                                     qint64 l, int precision, int base,
                                     int width, unsigned flags);
-    static QString unsLongLongToString(const QChar zero, const QChar group,
-                                       const QChar plus,
+    static QString unsLongLongToString(const QString &zero, const QString &group,
+                                       const QString &plus,
                                        quint64 l, int precision,
-                                       int base, int width,
-                                       unsigned flags);
+                                       int base, int width, unsigned flags);
 
     QString doubleToString(double d,
                            int precision = -1,
@@ -282,48 +280,105 @@ public:
 
     bool numberToCLocale(QStringView s, QLocale::NumberOptions number_options,
                          CharBuff *result) const;
-    inline char digitToCLocale(QChar c) const;
+    inline char numericToCLocale(QStringView in) const;
 
     // this function is used in QIntValidator (QtGui)
     Q_CORE_EXPORT bool validateChars(QStringView str, NumberMode numMode, QByteArray *buff, int decDigits = -1,
             QLocale::NumberOptions number_options = QLocale::DefaultNumberOptions) const;
 
+    QString decimalPoint() const;
+    QString groupSeparator() const;
+    QString listSeparator() const;
+    QString percentSign() const;
+    QString zeroDigit() const;
+    uint zeroUcs() const;
+    QString positiveSign() const;
+    QString negativeSign() const;
+    QString exponentSeparator() const;
+
+    struct DataRange
+    {
+        quint16 offset;
+        quint16 size;
+        QString getData(const char16_t *table) const
+        {
+            return size > 0
+                ? QString::fromRawData(reinterpret_cast<const QChar *>(table + offset), size)
+                : QString();
+        }
+        QStringView viewData(const char16_t *table) const
+        {
+            return { reinterpret_cast<const QChar *>(table + offset), size };
+        }
+        QString getListEntry(const char16_t *table, int index) const
+        {
+            return listEntry(table, index).getData(table);
+        }
+        QStringView viewListEntry(const char16_t *table, int index) const
+        {
+            return listEntry(table, index).viewData(table);
+        }
+        uint ucsFirst(const char16_t *table) const
+        {
+            if (size && !QChar::isSurrogate(table[offset]))
+                return table[offset];
+            if (size > 1 && QChar::isHighSurrogate(table[offset]))
+                return QChar::surrogateToUcs4(table[offset], table[offset + 1]);
+            return 0;
+        }
+    private:
+        DataRange listEntry(const char16_t *table, int index) const
+        {
+            const char16_t separator = ';';
+            quint16 i = 0;
+            while (index > 0 && i < size) {
+                if (table[offset + i] == separator)
+                    index--;
+                i++;
+            }
+            quint16 end = i;
+            while (end < size && table[offset + end] != separator)
+                end++;
+            return { quint16(offset + i), quint16(end - i) };
+        }
+    };
+
+#define ForEachQLocaleRange(X) \
+    X(startListPattern) X(midListPattern) X(endListPattern) X(pairListPattern) X(listDelimit) \
+    X(decimalSeparator) X(groupDelim) X(percent) X(zero) X(minus) X(plus) X(exponential) \
+    X(quoteStart) X(quoteEnd) X(quoteStartAlternate) X(quoteEndAlternate) \
+    X(longDateFormat) X(shortDateFormat) X(longTimeFormat) X(shortTimeFormat) \
+    X(longDayNamesStandalone) X(longDayNames) \
+    X(shortDayNamesStandalone) X(shortDayNames) \
+    X(narrowDayNamesStandalone) X(narrowDayNames) \
+    X(anteMeridiem) X(postMeridiem) \
+    X(byteCount) X(byteAmountSI) X(byteAmountIEC) \
+    X(currencySymbol) X(currencyDisplayName) \
+    X(currencyFormat) X(currencyFormatNegative) \
+    X(endonymLanguage) X(endonymCountry)
+
+#define rangeGetter(name) \
+    DataRange name() const { return { m_ ## name ## _idx, m_ ## name ## _size }; }
+    ForEachQLocaleRange(rangeGetter)
+#undef rangeGetter
+
 public:
     quint16 m_language_id, m_script_id, m_country_id;
 
-    // FIXME QTBUG-69324: not all unicode code-points map to single-token UTF-16 :-(
-    char16_t m_decimal, m_group, m_list, m_percent, m_zero, m_minus, m_plus, m_exponential;
-    char16_t m_quotation_start, m_quotation_end;
-    char16_t m_alternate_quotation_start, m_alternate_quotation_end;
-
-    quint16 m_list_pattern_part_start_idx, m_list_pattern_part_start_size;
-    quint16 m_list_pattern_part_mid_idx, m_list_pattern_part_mid_size;
-    quint16 m_list_pattern_part_end_idx, m_list_pattern_part_end_size;
-    quint16 m_list_pattern_part_two_idx, m_list_pattern_part_two_size;
-    quint16 m_short_date_format_idx, m_short_date_format_size;
-    quint16 m_long_date_format_idx, m_long_date_format_size;
-    quint16 m_short_time_format_idx, m_short_time_format_size;
-    quint16 m_long_time_format_idx, m_long_time_format_size;
-    quint16 m_standalone_short_day_names_idx, m_standalone_short_day_names_size;
-    quint16 m_standalone_long_day_names_idx, m_standalone_long_day_names_size;
-    quint16 m_standalone_narrow_day_names_idx, m_standalone_narrow_day_names_size;
-    quint16 m_short_day_names_idx, m_short_day_names_size;
-    quint16 m_long_day_names_idx, m_long_day_names_size;
-    quint16 m_narrow_day_names_idx, m_narrow_day_names_size;
-    quint16 m_am_idx, m_am_size;
-    quint16 m_pm_idx, m_pm_size;
-    quint16 m_byte_idx, m_byte_size;
-    quint16 m_byte_si_quantified_idx, m_byte_si_quantified_size;
-    quint16 m_byte_iec_quantified_idx, m_byte_iec_quantified_size;
+    // Offsets, then sizes, for each range:
+#define rangeIndex(name) quint16 m_ ## name ## _idx;
+    ForEachQLocaleRange(rangeIndex)
+#undef rangeIndex
+#define Size(name) quint8 m_ ## name ## _size;
+    ForEachQLocaleRange(Size)
+#undef Size
+
+#undef ForEachQLocaleRange
+
+    // Strays:
     char    m_currency_iso_code[3];
-    quint16 m_currency_symbol_idx, m_currency_symbol_size;
-    quint16 m_currency_display_name_idx, m_currency_display_name_size;
-    quint8  m_currency_format_idx, m_currency_format_size;
-    quint8  m_currency_negative_format_idx, m_currency_negative_format_size;
-    quint16 m_language_endonym_idx, m_language_endonym_size;
-    quint16 m_country_endonym_idx, m_country_endonym_size;
     quint16 m_currency_digits : 2;
-    quint16 m_currency_rounding : 3;
+    quint16 m_currency_rounding : 3; // (not yet used !)
     quint16 m_first_day_of_week : 3;
     quint16 m_weekend_start : 3;
     quint16 m_weekend_end : 3;
@@ -347,15 +402,6 @@ public:
     static QLocalePrivate *get(QLocale &l) { return l.d; }
     static const QLocalePrivate *get(const QLocale &l) { return l.d; }
 
-    QChar decimal() const { return QChar(m_data->m_decimal); }
-    QChar group() const { return QChar(m_data->m_group); }
-    QChar list() const { return QChar(m_data->m_list); }
-    QChar percent() const { return QChar(m_data->m_percent); }
-    QChar zero() const { return QChar(m_data->m_zero); }
-    QChar plus() const { return QChar(m_data->m_plus); }
-    QChar minus() const { return QChar(m_data->m_minus); }
-    QChar exponential() const { return QChar(m_data->m_exponential); }
-
     quint16 languageId() const { return m_data->m_language_id; }
     quint16 countryId() const { return m_data->m_country_id; }
 
@@ -395,37 +441,44 @@ inline QLocalePrivate *QSharedDataPointer<QLocalePrivate>::clone()
     return QLocalePrivate::create(d->m_data, d->m_data_offset, d->m_numberOptions);
 }
 
-inline char QLocaleData::digitToCLocale(QChar in) const
+inline char QLocaleData::numericToCLocale(QStringView in) const
 {
-    const ushort tenUnicode = m_zero + 10;
-
-    if (in.unicode() >= m_zero && in.unicode() < tenUnicode)
-        return '0' + in.unicode() - m_zero;
+    Q_ASSERT(in.size() == 1 || (in.size() == 2 && in.at(0).isHighSurrogate()));
 
-    if (in.unicode() >= '0' && in.unicode() <= '9')
-        return in.toLatin1();
-
-    if (in == m_plus || in == QLatin1Char('+'))
+    if (in == positiveSign() || in == u"+")
         return '+';
 
-    if (in == m_minus || in == QLatin1Char('-') || in == QChar(0x2212))
+    if (in == negativeSign() || in == u"-" || in == u"\x2212")
         return '-';
 
-    if (in == m_decimal)
+    if (in == decimalPoint())
         return '.';
 
-    if (in == m_group)
-        return ',';
-
-    if (in == m_exponential || in == QChar(QChar::toUpper(m_exponential)))
+    if (in.compare(exponentSeparator(), Qt::CaseInsensitive) == 0)
         return 'e';
 
+    const QString group = groupSeparator();
+    if (in == group)
+        return ',';
+
     // In several languages group() is a non-breaking space (U+00A0) or its thin
     // version (U+202f), which look like spaces.  People (and thus some of our
     // tests) use a regular space instead and complain if it doesn't work.
-    if ((m_group == 0xA0 || m_group == 0x202f) && in.unicode() == ' ')
+    // Should this be extended generally to any case where group is a space ?
+    if ((group == u"\xa0" || group == u"\x202f") && in == u" ")
         return ',';
 
+    const uint zeroUcs4 = zeroUcs();
+    const uint tenUcs4 = zeroUcs4 + 10;
+    const uint inUcs4 = in.size() == 2
+        ? QChar::surrogateToUcs4(in.at(0), in.at(1)) : in.at(0).unicode();
+
+    if (zeroUcs4 <= inUcs4 && inUcs4 < tenUcs4)
+        return '0' + inUcs4 - zeroUcs4;
+
+    if ('0' <= inUcs4 && inUcs4 <= '9')
+        return inUcs4;
+
     return 0;
 }
 
diff --git a/src/corelib/text/qlocale_tools.cpp b/src/corelib/text/qlocale_tools.cpp
index 0da769d694..9adb6e4a23 100644
--- a/src/corelib/text/qlocale_tools.cpp
+++ b/src/corelib/text/qlocale_tools.cpp
@@ -428,72 +428,85 @@ qstrtoll(const char * nptr, const char **endptr, int base, bool *ok)
     return result;
 }
 
-QString qulltoa(qulonglong l, int base, const QChar _zero)
+QString qulltoa(qulonglong number, int base, const QStringView zero)
 {
-    ushort buff[65]; // length of MAX_ULLONG in base 2
-    ushort *p = buff + 65;
-
-    if (base != 10 || _zero.unicode() == '0') {
-        while (l != 0) {
-            int c = l % base;
-
-            --p;
-
-            if (c < 10)
-                *p = '0' + c;
-            else
-                *p = c - 10 + 'a';
+    // Length of MAX_ULLONG in base 2 is 64; and we may need a surrogate pair
+    // per digit. We do not need a terminator.
+    const unsigned maxlen = 128;
+    Q_STATIC_ASSERT(CHAR_BIT * sizeof(number) <= maxlen);
+    ushort buff[maxlen];
+    ushort *const end = buff + maxlen, *p = end;
+
+    if (base != 10 || zero == u"0") {
+        while (number != 0) {
+            int c = number % base;
+            *--p = c < 10 ? '0' + c : c - 10 + 'a';
+            number /= base;
+        }
+    } else if (zero.size() && !zero.at(0).isSurrogate()) {
+        const ushort zeroUcs4 = zero.at(0).unicode();
+        while (number != 0) {
+            *(--p) = zeroUcs4 + number % base;
 
-            l /= base;
+            number /= base;
         }
-    }
-    else {
-        while (l != 0) {
-            int c = l % base;
+    } else if (zero.size() == 2 && zero.at(0).isHighSurrogate()) {
+        const uint zeroUcs4 = QChar::surrogateToUcs4(zero.at(0), zero.at(1));
+        while (number != 0) {
+            const uint digit = zeroUcs4 + number % base;
 
-            *(--p) = _zero.unicode() + c;
+            *(--p) = QChar::lowSurrogate(digit);
+            *(--p) = QChar::highSurrogate(digit);
 
-            l /= base;
+            number /= base;
         }
+    } else {
+        return QString();
     }
 
-    return QString(reinterpret_cast<QChar *>(p), 65 - (p - buff));
+    return QString(reinterpret_cast<QChar *>(p), end - p);
 }
 
-QString &decimalForm(QChar zero, QChar decimal, QChar group,
+QString &decimalForm(const QString &zero, const QString &decimal, const QString &group,
                      QString &digits, int decpt, int precision,
                      PrecisionMode pm,
                      bool always_show_decpt,
                      bool thousands_group)
 {
+    const auto digitWidth = zero.size();
+    Q_ASSERT(digitWidth == 1 || digitWidth == 2);
+    Q_ASSERT(digits.size() % digitWidth == 0);
+
     if (decpt < 0) {
         for (int i = 0; i < -decpt; ++i)
             digits.prepend(zero);
         decpt = 0;
-    }
-    else if (decpt > digits.length()) {
-        for (int i = digits.length(); i < decpt; ++i)
+    } else {
+        for (int i = digits.length() / digitWidth; i < decpt; ++i)
             digits.append(zero);
     }
 
-    if (pm == PMDecimalDigits) {
-        uint decimal_digits = digits.length() - decpt;
-        for (int i = decimal_digits; i < precision; ++i)
+    switch (pm) {
+    case PMDecimalDigits:
+        for (int i = digits.length() / digitWidth - decpt; i < precision; ++i)
             digits.append(zero);
-    }
-    else if (pm == PMSignificantDigits) {
-        for (int i = digits.length(); i < precision; ++i)
+        break;
+    case  PMSignificantDigits:
+        for (int i = digits.length() / digitWidth; i < precision; ++i)
             digits.append(zero);
-    }
-    else { // pm == PMChopTrailingZeros
+        break;
+    case PMChopTrailingZeros:
+        break;
     }
 
-    if (always_show_decpt || decpt < digits.length())
-        digits.insert(decpt, decimal);
+    if (always_show_decpt || decpt < digits.length() / digitWidth)
+        digits.insert(decpt * digitWidth, decimal);
 
+    // FIXME: they're not simply thousands separators !
+    // Need to mirror IndianNumberGrouping code in QLocaleData::longLongToString()
     if (thousands_group) {
         for (int i = decpt - 3; i > 0; i -= 3)
-            digits.insert(i, group);
+            digits.insert(i * digitWidth, group);
     }
 
     if (decpt == 0)
@@ -502,32 +515,37 @@ QString &decimalForm(QChar zero, QChar decimal, QChar group,
     return digits;
 }
 
-QString &exponentForm(QChar zero, QChar decimal, QChar exponential,
-                      QChar group, QChar plus, QChar minus,
+QString &exponentForm(const QString &zero, const QString &decimal, const QString &exponential,
+                      const QString &group, const QString &plus, const QString &minus,
                       QString &digits, int decpt, int precision,
                       PrecisionMode pm,
                       bool always_show_decpt,
                       bool leading_zero_in_exponent)
 {
-    int exp = decpt - 1;
+    const auto digitWidth = zero.size();
+    Q_ASSERT(digitWidth == 1 || digitWidth == 2);
+    Q_ASSERT(digits.size() % digitWidth == 0);
 
-    if (pm == PMDecimalDigits) {
-        for (int i = digits.length(); i < precision + 1; ++i)
+    switch (pm) {
+    case PMDecimalDigits:
+        for (int i = digits.length() / digitWidth; i < precision + 1; ++i)
             digits.append(zero);
-    }
-    else if (pm == PMSignificantDigits) {
-        for (int i = digits.length(); i < precision; ++i)
+        break;
+    case PMSignificantDigits:
+        for (int i = digits.length() / digitWidth; i < precision; ++i)
             digits.append(zero);
-    }
-    else { // pm == PMChopTrailingZeros
+        break;
+    case PMChopTrailingZeros:
+        break;
     }
 
-    if (always_show_decpt || digits.length() > 1)
-        digits.insert(1, decimal);
+    if (always_show_decpt || digits.length() > digitWidth)
+        digits.insert(digitWidth, decimal);
 
     digits.append(exponential);
-    digits.append(QLocaleData::longLongToString(zero, group, plus, minus,
-                   exp, leading_zero_in_exponent ? 2 : 1, 10, -1, QLocaleData::AlwaysShowSign));
+    digits.append(QLocaleData::longLongToString(zero, group, plus, minus, decpt - 1,
+                                                leading_zero_in_exponent ? 2 : 1,
+                                                10, -1, QLocaleData::AlwaysShowSign));
 
     return digits;
 }
diff --git a/src/corelib/text/qlocale_tools_p.h b/src/corelib/text/qlocale_tools_p.h
index e2142bf545..f04c4512c0 100644
--- a/src/corelib/text/qlocale_tools_p.h
+++ b/src/corelib/text/qlocale_tools_p.h
@@ -67,7 +67,7 @@ double qt_asciiToDouble(const char *num, int numLen, bool &ok, int &processed,
 void qt_doubleToAscii(double d, QLocaleData::DoubleForm form, int precision, char *buf, int bufSize,
                       bool &sign, int &length, int &decpt);
 
-QString qulltoa(qulonglong l, int base, const QChar _zero);
+QString qulltoa(qulonglong l, int base, const QStringView zero);
 Q_CORE_EXPORT QString qdtoa(qreal d, int *decpt, int *sign);
 
 enum PrecisionMode {
@@ -76,13 +76,13 @@ enum PrecisionMode {
     PMChopTrailingZeros =   0x03
 };
 
-QString &decimalForm(QChar zero, QChar decimal, QChar group,
+QString &decimalForm(const QString &zero, const QString &decimal, const QString &group,
                      QString &digits, int decpt, int precision,
                      PrecisionMode pm,
                      bool always_show_decpt,
                      bool thousands_group);
-QString &exponentForm(QChar zero, QChar decimal, QChar exponential,
-                      QChar group, QChar plus, QChar minus,
+QString &exponentForm(const QString &zero, const QString &decimal, const QString &exponential,
+                      const QString &group, const QString &plus, const QString &minus,
                       QString &digits, int decpt, int precision,
                       PrecisionMode pm,
                       bool always_show_decpt,
diff --git a/src/corelib/text/qlocale_win.cpp b/src/corelib/text/qlocale_win.cpp
index 4a38adf309..f8c30d95b5 100644
--- a/src/corelib/text/qlocale_win.cpp
+++ b/src/corelib/text/qlocale_win.cpp
@@ -567,25 +567,30 @@ QVariant QSystemLocalePrivate::toCurrencyString(const QSystemLocale::CurrencyToS
     QString value;
     switch (arg.value.type()) {
     case QVariant::Int:
-        value = QLocaleData::longLongToString(QLatin1Char('0'), QLatin1Char(','), QLatin1Char('+'), QLatin1Char('-'),
-                                                 arg.value.toInt(), -1, 10, -1, QLocale::OmitGroupSeparator);
+        value = QLocaleData::longLongToString(
+            QStringLiteral("0"), QStringLiteral(","), QStringLiteral("+"), QStringLiteral("-"),
+            arg.value.toInt(), -1, 10, -1, QLocale::OmitGroupSeparator);
         break;
     case QVariant::UInt:
-        value = QLocaleData::unsLongLongToString(QLatin1Char('0'), QLatin1Char(','), QLatin1Char('+'),
-                                                    arg.value.toUInt(), -1, 10, -1, QLocale::OmitGroupSeparator);
+        value = QLocaleData::unsLongLongToString(
+            QStringLiteral("0"), QStringLiteral(","), QStringLiteral("+"),
+            arg.value.toUInt(), -1, 10, -1, QLocale::OmitGroupSeparator);
         break;
     case QVariant::Double:
-        value = QLocaleData::doubleToString(QLatin1Char('0'), QLatin1Char('+'), QLatin1Char('-'),
-                                               QLatin1Char(' '), QLatin1Char(','), QLatin1Char('.'),
-                                               arg.value.toDouble(), -1, QLocaleData::DFDecimal, -1, QLocale::OmitGroupSeparator);
+        value = QLocaleData::doubleToString(
+            QStringLiteral("0"), QStringLiteral("+"), QStringLiteral("-"),
+            QStringLiteral(" "), QStringLiteral(","), QStringLiteral("."),
+            arg.value.toDouble(), -1, QLocaleData::DFDecimal, -1, QLocale::OmitGroupSeparator);
         break;
     case QVariant::LongLong:
-        value = QLocaleData::longLongToString(QLatin1Char('0'), QLatin1Char(','), QLatin1Char('+'), QLatin1Char('-'),
-                                                 arg.value.toLongLong(), -1, 10, -1, QLocale::OmitGroupSeparator);
+        value = QLocaleData::longLongToString(
+            QStringLiteral("0"), QStringLiteral(","), QStringLiteral("+"), QStringLiteral("-"),
+            arg.value.toLongLong(), -1, 10, -1, QLocale::OmitGroupSeparator);
         break;
     case QVariant::ULongLong:
-        value = QLocaleData::unsLongLongToString(QLatin1Char('0'), QLatin1Char(','), QLatin1Char('+'),
-                                                    arg.value.toULongLong(), -1, 10, -1, QLocale::OmitGroupSeparator);
+        value = QLocaleData::unsLongLongToString(
+            QStringLiteral("0"), QStringLiteral(","), QStringLiteral("+"),
+            arg.value.toULongLong(), -1, 10, -1, QLocale::OmitGroupSeparator);
         break;
     default:
         return QVariant();
diff --git a/src/corelib/text/qstring.cpp b/src/corelib/text/qstring.cpp
index a2c603c776..da2c44bef6 100644
--- a/src/corelib/text/qstring.cpp
+++ b/src/corelib/text/qstring.cpp
@@ -100,7 +100,7 @@
 #define ULLONG_MAX quint64_C(18446744073709551615)
 #endif
 
-#define IS_RAW_DATA(d) ((d)->offset != sizeof(QStringData))
+#define IS_RAW_DATA(d) ((d.d)->flags & QArrayData::RawDataType)
 
 QT_BEGIN_NAMESPACE
 
@@ -163,7 +163,7 @@ qsizetype QtPrivate::qustrlen(const ushort *str) noexcept
 {
     qsizetype result = 0;
 
-#ifdef __SSE2__
+#if defined(__SSE2__) && !(defined(__SANITIZE_ADDRESS__) || QT_HAS_FEATURE(address_sanitizer))
     // find the 16-byte alignment immediately prior or equal to str
     quintptr misalignment = quintptr(str) & 0xf;
     Q_ASSERT((misalignment & 1) == 0);
@@ -1377,28 +1377,6 @@ const QString::Null QString::null = { };
 */
 
 /*!
-    \class QCharRef
-    \inmodule QtCore
-    \reentrant
-    \brief The QCharRef class is a helper class for QString.
-
-    \internal
-
-    \ingroup string-processing
-
-    When you get an object of type QCharRef, if you can assign to it,
-    the assignment will apply to the character in the string from
-    which you got the reference. That is its whole purpose in life.
-    The QCharRef becomes invalid once modifications are made to the
-    string: if you want to keep the character, copy it into a QChar.
-
-    Most of the QChar member functions also exist in QCharRef.
-    However, they are not explicitly documented here.
-
-    \sa QString::operator[](), QString::at(), QChar
-*/
-
-/*!
     \class QString
     \inmodule QtCore
     \reentrant
@@ -2120,8 +2098,8 @@ int QString::toUcs4_helper(const ushort *uc, int length, uint *out)
 */
 QString::QString(const QChar *unicode, int size)
 {
-   if (!unicode) {
-        d = Data::sharedNull();
+    if (!unicode) {
+        d.clear();
     } else {
         if (size < 0) {
             size = 0;
@@ -2129,13 +2107,11 @@ QString::QString(const QChar *unicode, int size)
                 ++size;
         }
         if (!size) {
-            d = Data::allocate(0);
+            d = DataPointer(Data::allocate(0), 0);
         } else {
-            d = Data::allocate(size + 1);
-            Q_CHECK_PTR(d);
-            d->size = size;
-            memcpy(d->data(), unicode, size * sizeof(QChar));
-            d->data()[size] = '\0';
+            d = DataPointer(Data::allocate(size + 1), size);
+            memcpy(d.data(), unicode, size * sizeof(QChar));
+            d.data()[size] = '\0';
         }
     }
 }
@@ -2148,15 +2124,13 @@ QString::QString(const QChar *unicode, int size)
 */
 QString::QString(int size, QChar ch)
 {
-   if (size <= 0) {
-        d = Data::allocate(0);
+    if (size <= 0) {
+        d = DataPointer(Data::allocate(0), 0);
     } else {
-        d = Data::allocate(size + 1);
-        Q_CHECK_PTR(d);
-        d->size = size;
-        d->data()[size] = '\0';
-        ushort *i = d->data() + size;
-        ushort *b = d->data();
+        d = DataPointer(Data::allocate(size + 1), size);
+        d.data()[size] = '\0';
+        ushort *i = d.data() + size;
+        ushort *b = d.data();
         const ushort value = ch.unicode();
         while (i != b)
            *--i = value;
@@ -2171,10 +2145,8 @@ QString::QString(int size, QChar ch)
 */
 QString::QString(int size, Qt::Initialization)
 {
-    d = Data::allocate(size + 1);
-    Q_CHECK_PTR(d);
-    d->size = size;
-    d->data()[size] = '\0';
+    d = DataPointer(Data::allocate(size + 1), size);
+    d.data()[size] = '\0';
 }
 
 /*! \fn QString::QString(QLatin1String str)
@@ -2189,11 +2161,9 @@ QString::QString(int size, Qt::Initialization)
 */
 QString::QString(QChar ch)
 {
-    d = Data::allocate(2);
-    Q_CHECK_PTR(d);
-    d->size = 1;
-    d->data()[0] = ch.unicode();
-    d->data()[1] = '\0';
+    d = DataPointer(Data::allocate(2), 1);
+    d.data()[0] = ch.unicode();
+    d.data()[1] = '\0';
 }
 
 /*! \fn QString::QString(const QByteArray &ba)
@@ -2215,7 +2185,7 @@ QString::QString(QChar ch)
     \internal
 */
 
-/*! \fn QString::QString(QStringDataPtr)
+/*! \fn QString::QString(QStringPrivate)
     \internal
 */
 
@@ -2285,16 +2255,16 @@ void QString::resize(int size)
     if (size < 0)
         size = 0;
 
-    if (IS_RAW_DATA(d) && !d->ref.isShared() && size < d->size) {
-        d->size = size;
+    if (!d->isShared() && !d->isMutable() && size < int(d.size)) {
+        d.size = size;
         return;
     }
 
-    if (d->ref.isShared() || uint(size) + 1u > d->alloc)
+    if (d->needsDetach() || size > capacity())
         reallocData(uint(size) + 1u, true);
-    if (d->alloc) {
-        d->size = size;
-        d->data()[size] = '\0';
+    d.size = size;
+    if (d->isMutable()) {
+        d.data()[size] = '\0';
     }
 }
 
@@ -2314,7 +2284,7 @@ void QString::resize(int size, QChar fillChar)
     resize(size);
     const int difference = length() - oldSize;
     if (difference > 0)
-        std::fill_n(d->begin() + oldSize, difference, fillChar.unicode());
+        std::fill_n(d.data() + oldSize, difference, fillChar.unicode());
 }
 
 /*! \fn int QString::capacity() const
@@ -2371,28 +2341,22 @@ void QString::reallocData(uint alloc, bool grow)
 {
     auto allocOptions = d->detachFlags();
     if (grow)
-        allocOptions |= QArrayData::Grow;
-
-    if (d->ref.isShared() || IS_RAW_DATA(d)) {
-        Data *x = Data::allocate(alloc, allocOptions);
-        Q_CHECK_PTR(x);
-        x->size = qMin(int(alloc) - 1, d->size);
-        ::memcpy(x->data(), d->data(), x->size * sizeof(QChar));
-        x->data()[x->size] = 0;
-        if (!d->ref.deref())
-            Data::deallocate(d);
-        d = x;
+        allocOptions |= QArrayData::GrowsForward;
+
+    if (d->needsDetach()) {
+        DataPointer dd(Data::allocate(alloc, allocOptions), qMin(int(alloc) - 1, d.size));
+        ::memcpy(dd.data(), d.data(), dd.size * sizeof(QChar));
+        dd.data()[dd.size] = 0;
+        d = dd;
     } else {
-        Data *p = Data::reallocateUnaligned(d, alloc, allocOptions);
-        Q_CHECK_PTR(p);
-        d = p;
+        d.reallocate(alloc, allocOptions);
     }
 }
 
 #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
 void QString::expand(int i)
 {
-    resize(qMax(i + 1, d->size), QLatin1Char(' '));
+    resize(qMax(i + 1, size()), QLatin1Char(' '));
 }
 #endif
 
@@ -2411,9 +2375,6 @@ void QString::expand(int i)
 
 QString &QString::operator=(const QString &other) noexcept
 {
-    other.d->ref.ref();
-    if (!d->ref.deref())
-        Data::deallocate(d);
     d = other.d;
     return *this;
 }
@@ -2435,9 +2396,9 @@ QString &QString::operator=(const QString &other) noexcept
 QString &QString::operator=(QLatin1String other)
 {
     if (isDetached() && other.size() <= capacity()) { // assumes d->alloc == 0 -> !isDetached() (sharedNull)
-        d->size = other.size();
-        d->data()[other.size()] = 0;
-        qt_from_latin1(d->data(), other.latin1(), other.size());
+        d.size = other.size();
+        d.data()[other.size()] = 0;
+        qt_from_latin1(d.data(), other.latin1(), other.size());
     } else {
         *this = fromLatin1(other.latin1(), other.size());
     }
@@ -2500,10 +2461,9 @@ QString &QString::operator=(QChar ch)
 {
     if (isDetached() && capacity() >= 1) { // assumes d->alloc == 0 -> !isDetached() (sharedNull)
         // re-use existing capacity:
-        ushort *dat = d->data();
-        dat[0] = ch.unicode();
-        dat[1] = 0;
-        d->size = 1;
+        d.data()[0] = ch.unicode();
+        d.data()[1] = 0;
+        d.size = 1;
     } else {
         operator=(QString(ch));
     }
@@ -2589,13 +2549,13 @@ QString &QString::insert(int i, QLatin1String str)
         return *this;
 
     int len = str.size();
-    if (Q_UNLIKELY(i > d->size))
+    if (Q_UNLIKELY(i > size()))
         resize(i + len, QLatin1Char(' '));
     else
-        resize(d->size + len);
+        resize(size() + len);
 
-    ::memmove(d->data() + i + len, d->data() + i, (d->size - i - len) * sizeof(QChar));
-    qt_from_latin1(d->data() + i, s, uint(len));
+    ::memmove(d.data() + i + len, d.data() + i, (d.size - i - len) * sizeof(QChar));
+    qt_from_latin1(d.data() + i, s, uint(len));
     return *this;
 }
 
@@ -2612,7 +2572,7 @@ QString& QString::insert(int i, const QChar *unicode, int size)
         return *this;
 
     const ushort *s = (const ushort *)unicode;
-    if (s >= d->data() && s < d->data() + d->alloc) {
+    if (s >= d.data() && s < d.data() + d.size) {
         // Part of me - take a copy
         ushort *tmp = static_cast<ushort *>(::malloc(size * sizeof(QChar)));
         Q_CHECK_PTR(tmp);
@@ -2622,13 +2582,13 @@ QString& QString::insert(int i, const QChar *unicode, int size)
         return *this;
     }
 
-    if (Q_UNLIKELY(i > d->size))
+    if (Q_UNLIKELY(i > int(d.size)))
         resize(i + size, QLatin1Char(' '));
     else
-        resize(d->size + size);
+        resize(d.size + size);
 
-    ::memmove(d->data() + i + size, d->data() + i, (d->size - i - size) * sizeof(QChar));
-    memcpy(d->data() + i, s, size * sizeof(QChar));
+    ::memmove(d.data() + i + size, d.data() + i, (d.size - i - size) * sizeof(QChar));
+    memcpy(d.data() + i, s, size * sizeof(QChar));
     return *this;
 }
 
@@ -2642,15 +2602,15 @@ QString& QString::insert(int i, const QChar *unicode, int size)
 QString& QString::insert(int i, QChar ch)
 {
     if (i < 0)
-        i += d->size;
+        i += d.size;
     if (i < 0)
         return *this;
-    if (Q_UNLIKELY(i > d->size))
+    if (Q_UNLIKELY(i > size()))
         resize(i + 1, QLatin1Char(' '));
     else
-        resize(d->size + 1);
-    ::memmove(d->data() + i + 1, d->data() + i, (d->size - i - 1) * sizeof(QChar));
-    d->data()[i] = ch.unicode();
+        resize(d.size + 1);
+    ::memmove(d.data() + i + 1, d.data() + i, (d.size - i - 1) * sizeof(QChar));
+    d.data()[i] = ch.unicode();
     return *this;
 }
 
@@ -2674,15 +2634,15 @@ QString& QString::insert(int i, QChar ch)
 */
 QString &QString::append(const QString &str)
 {
-    if (str.d != Data::sharedNull()) {
-        if (d == Data::sharedNull()) {
+    if (!str.isNull()) {
+        if (isNull()) {
             operator=(str);
         } else {
-            if (d->ref.isShared() || uint(d->size + str.d->size) + 1u > d->alloc)
-                reallocData(uint(d->size + str.d->size) + 1u, true);
-            memcpy(d->data() + d->size, str.d->data(), str.d->size * sizeof(QChar));
-            d->size += str.d->size;
-            d->data()[d->size] = '\0';
+            if (d->needsDetach() || size() + str.size() > capacity())
+                reallocData(uint(size() + str.size()) + 1u, true);
+            memcpy(d.data() + d.size, str.d.data(), str.d.size * sizeof(QChar));
+            d.size += str.d.size;
+            d.data()[d.size] = '\0';
         }
     }
     return *this;
@@ -2697,11 +2657,11 @@ QString &QString::append(const QString &str)
 QString &QString::append(const QChar *str, int len)
 {
     if (str && len > 0) {
-        if (d->ref.isShared() || uint(d->size + len) + 1u > d->alloc)
-            reallocData(uint(d->size + len) + 1u, true);
-        memcpy(d->data() + d->size, str, len * sizeof(QChar));
-        d->size += len;
-        d->data()[d->size] = '\0';
+        if (d->needsDetach() || size() + len > capacity())
+            reallocData(uint(size() + len) + 1u, true);
+        memcpy(d.data() + d.size, str, len * sizeof(QChar));
+        d.size += len;
+        d.data()[d.size] = '\0';
     }
     return *this;
 }
@@ -2716,12 +2676,12 @@ QString &QString::append(QLatin1String str)
     const char *s = str.latin1();
     if (s) {
         int len = str.size();
-        if (d->ref.isShared() || uint(d->size + len) + 1u > d->alloc)
-            reallocData(uint(d->size + len) + 1u, true);
-        ushort *i = d->data() + d->size;
+        if (d->needsDetach() || size() + len > capacity())
+            reallocData(uint(size() + len) + 1u, true);
+        ushort *i = d.data() + d.size;
         qt_from_latin1(i, s, uint(len));
         i[len] = '\0';
-        d->size += len;
+        d.size += len;
     }
     return *this;
 }
@@ -2763,10 +2723,10 @@ QString &QString::append(QLatin1String str)
 */
 QString &QString::append(QChar ch)
 {
-    if (d->ref.isShared() || uint(d->size) + 2u > d->alloc)
-        reallocData(uint(d->size) + 2u, true);
-    d->data()[d->size++] = ch.unicode();
-    d->data()[d->size] = '\0';
+    if (d->needsDetach() || size() + 1 > capacity())
+        reallocData(uint(d.size) + 2u, true);
+    d.data()[d.size++] = ch.unicode();
+    d.data()[d.size] = '\0';
     return *this;
 }
 
@@ -2859,16 +2819,16 @@ QString &QString::append(QChar ch)
 QString &QString::remove(int pos, int len)
 {
     if (pos < 0)  // count from end of string
-        pos += d->size;
-    if (uint(pos) >= uint(d->size)) {
+        pos += size();
+    if (uint(pos) >= uint(size())) {
         // range problems
-    } else if (len >= d->size - pos) {
+    } else if (len >= size() - pos) {
         resize(pos); // truncate
     } else if (len > 0) {
         detach();
-        memmove(d->data() + pos, d->data() + pos + len,
-                (d->size - pos - len + 1) * sizeof(ushort));
-        d->size -= len;
+        memmove(d.data() + pos, d.data() + pos + len,
+                (d.size - pos - len + 1) * sizeof(ushort));
+        d.size -= len;
     }
     return *this;
 }
@@ -3013,10 +2973,10 @@ QString &QString::replace(int pos, int len, const QString &after)
 */
 QString &QString::replace(int pos, int len, const QChar *unicode, int size)
 {
-    if (uint(pos) > uint(d->size))
+    if (uint(pos) > uint(this->size()))
         return *this;
-    if (len > d->size - pos)
-        len = d->size - pos;
+    if (len > this->size() - pos)
+        len = this->size() - pos;
 
     uint index = pos;
     replace_helper(&index, 1, len, unicode, size);
@@ -3080,10 +3040,10 @@ bool pointsIntoRange(const QChar *ptr, const ushort *base, int len)
  */
 void QString::replace_helper(uint *indices, int nIndices, int blen, const QChar *after, int alen)
 {
-    // Copy after if it lies inside our own d->data() area (which we could
+    // Copy after if it lies inside our own d.b area (which we could
     // possibly invalidate via a realloc or modify by replacement).
     QChar *afterBuffer = nullptr;
-    if (pointsIntoRange(after, d->data(), d->size)) // Use copy in place of vulnerable original:
+    if (pointsIntoRange(after, d.data(), d.size)) // Use copy in place of vulnerable original:
         after = afterBuffer = textCopy(after, alen);
 
     QT_TRY {
@@ -3091,36 +3051,36 @@ void QString::replace_helper(uint *indices, int nIndices, int blen, const QChar
             // replace in place
             detach();
             for (int i = 0; i < nIndices; ++i)
-                memcpy(d->data() + indices[i], after, alen * sizeof(QChar));
+                memcpy(d.data() + indices[i], after, alen * sizeof(QChar));
         } else if (alen < blen) {
             // replace from front
             detach();
             uint to = indices[0];
             if (alen)
-                memcpy(d->data()+to, after, alen*sizeof(QChar));
+                memcpy(d.data()+to, after, alen*sizeof(QChar));
             to += alen;
             uint movestart = indices[0] + blen;
             for (int i = 1; i < nIndices; ++i) {
                 int msize = indices[i] - movestart;
                 if (msize > 0) {
-                    memmove(d->data() + to, d->data() + movestart, msize * sizeof(QChar));
+                    memmove(d.data() + to, d.data() + movestart, msize * sizeof(QChar));
                     to += msize;
                 }
                 if (alen) {
-                    memcpy(d->data() + to, after, alen * sizeof(QChar));
+                    memcpy(d.data() + to, after, alen * sizeof(QChar));
                     to += alen;
                 }
                 movestart = indices[i] + blen;
             }
-            int msize = d->size - movestart;
+            int msize = d.size - movestart;
             if (msize > 0)
-                memmove(d->data() + to, d->data() + movestart, msize * sizeof(QChar));
-            resize(d->size - nIndices*(blen-alen));
+                memmove(d.data() + to, d.data() + movestart, msize * sizeof(QChar));
+            resize(d.size - nIndices*(blen-alen));
         } else {
             // replace from back
             int adjust = nIndices*(alen-blen);
-            int newLen = d->size + adjust;
-            int moveend = d->size;
+            int newLen = d.size + adjust;
+            int moveend = d.size;
             resize(newLen);
 
             while (nIndices) {
@@ -3128,9 +3088,9 @@ void QString::replace_helper(uint *indices, int nIndices, int blen, const QChar
                 int movestart = indices[nIndices] + blen;
                 int insertstart = indices[nIndices] + nIndices*(alen-blen);
                 int moveto = insertstart + alen;
-                memmove(d->data() + moveto, d->data() + movestart,
+                memmove(d.data() + moveto, d.data() + movestart,
                         (moveend - movestart)*sizeof(QChar));
-                memcpy(d->data() + insertstart, after, alen * sizeof(QChar));
+                memcpy(d.data() + insertstart, after, alen * sizeof(QChar));
                 moveend = movestart-blen;
             }
         }
@@ -3156,7 +3116,7 @@ QString &QString::replace(const QChar *before, int blen,
                           const QChar *after, int alen,
                           Qt::CaseSensitivity cs)
 {
-    if (d->size == 0) {
+    if (d.size == 0) {
         if (blen)
             return *this;
     } else {
@@ -3191,10 +3151,10 @@ QString &QString::replace(const QChar *before, int blen,
               We're about to change data, that before and after might point
               into, and we'll need that data for our next batch of indices.
             */
-            if (!afterBuffer && pointsIntoRange(after, d->data(), d->size))
+            if (!afterBuffer && pointsIntoRange(after, d.data(), d.size))
                 after = afterBuffer = textCopy(after, alen);
 
-            if (!beforeBuffer && pointsIntoRange(before, d->data(), d->size)) {
+            if (!beforeBuffer && pointsIntoRange(before, d.data(), d.size)) {
                 beforeBuffer = textCopy(before, blen);
                 matcher = QStringMatcher(beforeBuffer, blen, cs);
             }
@@ -3223,13 +3183,13 @@ QString &QString::replace(const QChar *before, int blen,
 */
 QString& QString::replace(QChar ch, const QString &after, Qt::CaseSensitivity cs)
 {
-    if (after.d->size == 0)
+    if (after.size() == 0)
         return remove(ch, cs);
 
-    if (after.d->size == 1)
+    if (after.size() == 1)
         return replace(ch, after.front(), cs);
 
-    if (d->size == 0)
+    if (size() == 0)
         return *this;
 
     ushort cc = (cs == Qt::CaseSensitive ? ch.unicode() : ch.toCaseFolded().unicode());
@@ -3239,14 +3199,14 @@ QString& QString::replace(QChar ch, const QString &after, Qt::CaseSensitivity cs
         uint indices[1024];
         uint pos = 0;
         if (cs == Qt::CaseSensitive) {
-            while (pos < 1024 && index < d->size) {
-                if (d->data()[index] == cc)
+            while (pos < 1024 && index < size()) {
+                if (d.data()[index] == cc)
                     indices[pos++] = index;
                 index++;
             }
         } else {
-            while (pos < 1024 && index < d->size) {
-                if (QChar::toCaseFolded(d->data()[index]) == cc)
+            while (pos < 1024 && index < size()) {
+                if (QChar::toCaseFolded(d.data()[index]) == cc)
                     indices[pos++] = index;
                 index++;
             }
@@ -3254,12 +3214,12 @@ QString& QString::replace(QChar ch, const QString &after, Qt::CaseSensitivity cs
         if (!pos) // Nothing to replace
             break;
 
-        replace_helper(indices, pos, 1, after.constData(), after.d->size);
+        replace_helper(indices, pos, 1, after.constData(), after.size());
 
         if (Q_LIKELY(index == -1)) // Nothing left to replace
             break;
         // The call to replace_helper just moved what index points at:
-        index += pos*(after.d->size - 1);
+        index += pos*(after.size() - 1);
     }
     return *this;
 }
@@ -3274,13 +3234,13 @@ QString& QString::replace(QChar ch, const QString &after, Qt::CaseSensitivity cs
 */
 QString& QString::replace(QChar before, QChar after, Qt::CaseSensitivity cs)
 {
-    if (d->size) {
+    if (d.size) {
         const int idx = indexOf(before, 0, cs);
         if (idx != -1) {
             detach();
             const ushort a = after.unicode();
-            ushort *i = d->data();
-            const ushort *e = i + d->size;
+            ushort *i = d.data();
+            ushort *const e = i + d.size;
             i += idx;
             *i = a;
             if (cs == Qt::CaseSensitive) {
@@ -3341,7 +3301,7 @@ QString &QString::replace(QLatin1String before, const QString &after, Qt::CaseSe
     int blen = before.size();
     QVarLengthArray<ushort> b(blen);
     qt_from_latin1(b.data(), before.latin1(), blen);
-    return replace((const QChar *)b.data(), blen, after.constData(), after.d->size, cs);
+    return replace((const QChar *)b.data(), blen, after.constData(), after.d.size, cs);
 }
 
 /*!
@@ -3361,7 +3321,7 @@ QString &QString::replace(const QString &before, QLatin1String after, Qt::CaseSe
     int alen = after.size();
     QVarLengthArray<ushort> a(alen);
     qt_from_latin1(a.data(), after.latin1(), alen);
-    return replace(before.constData(), before.d->size, (const QChar *)a.data(), alen, cs);
+    return replace(before.constData(), before.d.size, (const QChar *)a.data(), alen, cs);
 }
 
 /*!
@@ -3397,7 +3357,7 @@ QString &QString::replace(QChar c, QLatin1String after, Qt::CaseSensitivity cs)
 */
 bool operator==(const QString &s1, const QString &s2) noexcept
 {
-    if (s1.d->size != s2.d->size)
+    if (s1.d.size != s2.d.size)
         return false;
 
     return qt_compare_strings(s1, s2, Qt::CaseSensitive) == 0;
@@ -3410,7 +3370,7 @@ bool operator==(const QString &s1, const QString &s2) noexcept
 */
 bool QString::operator==(QLatin1String other) const noexcept
 {
-    if (d->size != other.size())
+    if (size() != other.size())
         return false;
 
     return qt_compare_strings(*this, other, Qt::CaseSensitive) == 0;
@@ -3956,7 +3916,7 @@ QString& QString::replace(const QRegExp &rx, const QString &after)
     if (isEmpty() && rx2.indexIn(*this) == -1)
         return *this;
 
-    reallocData(uint(d->size) + 1u);
+    reallocData(uint(d.size) + 1u);
 
     int index = 0;
     int numCaptures = rx2.captureCount();
@@ -4055,8 +4015,8 @@ QString& QString::replace(const QRegExp &rx, const QString &after)
         }
         if (!pos)
             break;
-        replacements[pos].pos = d->size;
-        int newlen = d->size + adjust;
+        replacements[pos].pos = d.size;
+        int newlen = d.size + adjust;
 
         // to continue searching at the right position after we did
         // the first round of replacements
@@ -4071,14 +4031,14 @@ QString& QString::replace(const QRegExp &rx, const QString &after)
         while (i < pos) {
             int copyend = replacements[i].pos;
             int size = copyend - copystart;
-            memcpy(static_cast<void*>(uc), static_cast<const void *>(d->data() + copystart), size * sizeof(QChar));
+            memcpy(static_cast<void*>(uc), static_cast<const void *>(d.data() + copystart), size * sizeof(QChar));
             uc += size;
-            memcpy(static_cast<void *>(uc), static_cast<const void *>(after.d->data()), al * sizeof(QChar));
+            memcpy(static_cast<void *>(uc), static_cast<const void *>(after.d.data()), al * sizeof(QChar));
             uc += al;
             copystart = copyend + replacements[i].length;
             i++;
         }
-        memcpy(static_cast<void *>(uc), static_cast<const void *>(d->data() + copystart), (d->size - copystart) * sizeof(QChar));
+        memcpy(static_cast<void *>(uc), static_cast<const void *>(d.data() + copystart), (d.size - copystart) * sizeof(QChar));
         newstring.resize(newlen);
         *this = newstring;
         caretMode = QRegExp::CaretWontMatch;
@@ -4118,7 +4078,7 @@ QString &QString::replace(const QRegularExpression &re, const QString &after)
     if (!iterator.hasNext()) // no matches at all
         return *this;
 
-    reallocData(uint(d->size) + 1u);
+    reallocData(uint(d.size) + 1u);
 
     int numCaptures = re.captureCount();
 
@@ -4451,24 +4411,6 @@ int QString::count(const QRegExp& rx) const
 
 #if QT_CONFIG(regularexpression)
 /*!
-    \overload indexOf()
-    \since 5.0
-
-    Returns the index position of the first match of the regular
-    expression \a re in the string, searching forward from index
-    position \a from. Returns -1 if \a re didn't match anywhere.
-
-    Example:
-
-    \snippet qstring/main.cpp 93
-*/
-int QString::indexOf(const QRegularExpression& re, int from) const
-{
-    return indexOf(re, from, nullptr);
-}
-
-/*!
-    \overload
     \since 5.5
 
     Returns the index position of the first match of the regular
@@ -4481,7 +4423,7 @@ int QString::indexOf(const QRegularExpression& re, int from) const
 
     Example:
 
-    \snippet qstring/main.cpp 99
+    \snippet qstring/main.cpp 93
 */
 int QString::indexOf(const QRegularExpression &re, int from, QRegularExpressionMatch *rmatch) const
 {
@@ -4502,24 +4444,6 @@ int QString::indexOf(const QRegularExpression &re, int from, QRegularExpressionM
 }
 
 /*!
-    \overload lastIndexOf()
-    \since 5.0
-
-    Returns the index position of the last match of the regular
-    expression \a re in the string, which starts before the index
-    position \a from. Returns -1 if \a re didn't match anywhere.
-
-    Example:
-
-    \snippet qstring/main.cpp 94
-*/
-int QString::lastIndexOf(const QRegularExpression &re, int from) const
-{
-    return lastIndexOf(re, from, nullptr);
-}
-
-/*!
-    \overload
     \since 5.5
 
     Returns the index position of the last match of the regular
@@ -4532,7 +4456,7 @@ int QString::lastIndexOf(const QRegularExpression &re, int from) const
 
     Example:
 
-    \snippet qstring/main.cpp 100
+    \snippet qstring/main.cpp 94
 */
 int QString::lastIndexOf(const QRegularExpression &re, int from, QRegularExpressionMatch *rmatch) const
 {
@@ -4559,19 +4483,7 @@ int QString::lastIndexOf(const QRegularExpression &re, int from, QRegularExpress
     return lastIndex;
 }
 
-/*! \overload contains()
-    \since 5.0
-
-    Returns \c true if the regular expression \a re matches somewhere in
-    this string; otherwise returns \c false.
-*/
-bool QString::contains(const QRegularExpression &re) const
-{
-    return contains(re, nullptr);
-}
-
 /*!
-    \overload contains()
     \since 5.1
 
     Returns \c true if the regular expression \a re matches somewhere in this
@@ -4918,9 +4830,9 @@ QString QString::section(const QRegularExpression &re, int start, int end, Secti
 */
 QString QString::left(int n)  const
 {
-    if (uint(n) >= uint(d->size))
+    if (uint(n) >= uint(size()))
         return *this;
-    return QString((const QChar*) d->data(), n);
+    return QString((const QChar*) d.data(), n);
 }
 
 /*!
@@ -4936,9 +4848,9 @@ QString QString::left(int n)  const
 */
 QString QString::right(int n) const
 {
-    if (uint(n) >= uint(d->size))
+    if (uint(n) >= uint(size()))
         return *this;
-    return QString((const QChar*) d->data() + d->size - n, n);
+    return QString(constData() + size() - n, n);
 }
 
 /*!
@@ -4961,18 +4873,19 @@ QString QString::right(int n) const
 QString QString::mid(int position, int n) const
 {
     using namespace QtPrivate;
-    switch (QContainerImplHelper::mid(d->size, &position, &n)) {
+    switch (QContainerImplHelper::mid(size(), &position, &n)) {
     case QContainerImplHelper::Null:
         return QString();
     case QContainerImplHelper::Empty:
     {
-        QStringDataPtr empty = { Data::allocate(0) };
+        QPair<Data *, ushort *> pair = Data::allocate(0);
+        DataPointer empty = { pair.first, pair.second, 0 };
         return QString(empty);
     }
     case QContainerImplHelper::Full:
         return *this;
     case QContainerImplHelper::Subset:
-        return QString((const QChar*)d->data() + position, n);
+        return QString(constData() + position, n);
     }
     Q_UNREACHABLE();
     return QString();
@@ -5222,29 +5135,29 @@ QByteArray QString::toLatin1_helper_inplace(QString &s)
 
     // We can return our own buffer to the caller.
     // Conversion to Latin-1 always shrinks the buffer by half.
-    const ushort *data = reinterpret_cast<const ushort *>(s.constData());
-    uint length = s.size();
+    const ushort *data = s.d.data();
+    int length = s.d.size;
 
-    // Swap the d pointers.
+    // Move the d pointer over to the bytearray.
     // Kids, avert your eyes. Don't try this at home.
-    QArrayData *ba_d = s.d;
 
-    // multiply the allocated capacity by sizeof(ushort)
-    ba_d->alloc *= sizeof(ushort);
+    // this relies on the fact that we use QArrayData for everything behind the scenes which has the same layout
+    static_assert(sizeof(QByteArray::DataPointer) == sizeof(QString::DataPointer), "sizes have to be equal");
+    QByteArray::DataPointer ba_d(reinterpret_cast<QByteArray::Data *>(s.d.d_ptr()), reinterpret_cast<char *>(s.d.data()), length);
+    ba_d.ref();
+    s.clear();
 
-    // reset ourselves to QString()
-    s.d = QString().d;
+    char *ddata = ba_d.data();
 
-    // do the in-place conversion
-    uchar *dst = reinterpret_cast<uchar *>(ba_d->data());
-    qt_to_latin1(dst, data, length);
-    dst[length] = '\0';
+    // multiply the allocated capacity by sizeof(ushort)
+    ba_d.d_ptr()->alloc *= sizeof(ushort);
 
-    QByteArrayDataPtr badptr = { ba_d };
-    return QByteArray(badptr);
+    // do the in-place conversion
+    qt_to_latin1(reinterpret_cast<uchar *>(ddata), data, length);
+    ddata[length] = '\0';
+    return QByteArray(ba_d);
 }
 
-
 /*!
     \fn QByteArray QString::toLatin1() const
 
@@ -5424,34 +5337,25 @@ QVector<uint> QtPrivate::convertToUcs4(QStringView string)
     return qt_convert_to_ucs4(string);
 }
 
-QString::Data *QString::fromLatin1_helper(const char *str, int size)
+QString::DataPointer QString::fromLatin1_helper(const char *str, int size)
 {
-    Data *d;
+    DataPointer d;
     if (!str) {
-        d = Data::sharedNull();
+        // nothing to do
     } else if (size == 0 || (!*str && size < 0)) {
-        d = Data::allocate(0);
+        d = DataPointer(Data::allocate(0), 0);
     } else {
         if (size < 0)
             size = qstrlen(str);
-        d = Data::allocate(size + 1);
-        Q_CHECK_PTR(d);
-        d->size = size;
-        d->data()[size] = '\0';
-        ushort *dst = d->data();
+        d = DataPointer(Data::allocate(size + 1), size);
+        d.data()[size] = '\0';
+        ushort *dst = d.data();
 
         qt_from_latin1(dst, str, uint(size));
     }
     return d;
 }
 
-QString::Data *QString::fromAscii_helper(const char *str, int size)
-{
-    QString s = fromUtf8(str, size);
-    s.d->ref.ref();
-    return s.d;
-}
-
 /*! \fn QString QString::fromLatin1(const char *str, int size)
     Returns a QString initialized with the first \a size characters
     of the Latin-1 string \a str.
@@ -5494,7 +5398,8 @@ QString QString::fromLocal8Bit_helper(const char *str, int size)
     if (!str)
         return QString();
     if (size == 0 || (!*str && size < 0)) {
-        QStringDataPtr empty = { Data::allocate(0) };
+        QPair<Data *, ushort *> pair = Data::allocate(0);
+        QString::DataPointer empty = { pair.first, pair.second, 0 };
         return QString(empty);
     }
 #if QT_CONFIG(textcodec)
@@ -5664,7 +5569,7 @@ QString& QString::setUnicode(const QChar *unicode, int size)
 {
      resize(size);
      if (unicode && size)
-         memcpy(d->data(), unicode, size * sizeof(QChar));
+         memcpy(d.data(), unicode, size * sizeof(QChar));
      return *this;
 }
 
@@ -5786,7 +5691,7 @@ QString QString::trimmed_helper(QString &str)
 */
 
 /*!
-    \fn QCharRef QString::operator[](int position)
+    \fn QChar &QString::operator[](int position)
 
     Returns the character at the specified \a position in the string as a
     modifiable reference.
@@ -5795,20 +5700,6 @@ QString QString::trimmed_helper(QString &str)
 
     \snippet qstring/main.cpp 85
 
-    The return value is of type QCharRef, a helper class for QString.
-    When you get an object of type QCharRef, you can use it as if it
-    were a reference to a QChar. If you assign to it, the assignment will apply to
-    the character in the QString from which you got the reference.
-
-    \note Before Qt 5.14 it was possible to use this operator to access
-    a character at an out-of-bounds position in the string, and
-    then assign to such a position, causing the string to be
-    automatically resized. Furthermore, assigning a value to the
-    returned QCharRef would cause a detach of the string, even if the
-    string has been copied in the meanwhile (and the QCharRef kept
-    alive while the copy was taken). These behaviors are deprecated,
-    and will be changed in a future version of Qt.
-
     \sa at()
 */
 
@@ -5818,19 +5709,6 @@ QString QString::trimmed_helper(QString &str)
     \overload operator[]()
 */
 
-/*! \fn QCharRef QString::operator[](uint position)
-
-\overload operator[]()
-
-Returns the character at the specified \a position in the string as a
-modifiable reference.
-*/
-
-/*! \fn const QChar QString::operator[](uint position) const
-    Equivalent to \c at(position).
-\overload operator[]()
-*/
-
 /*!
     \fn QChar QString::front() const
     \since 5.10
@@ -5862,7 +5740,7 @@ modifiable reference.
 */
 
 /*!
-    \fn QCharRef QString::front()
+    \fn QChar &QString::front()
     \since 5.10
 
     Returns a reference to the first character in the string.
@@ -5877,7 +5755,7 @@ modifiable reference.
 */
 
 /*!
-    \fn QCharRef QString::back()
+    \fn QChar &QString::back()
     \since 5.10
 
     Returns a reference to the last character in the string.
@@ -5910,7 +5788,7 @@ modifiable reference.
 
 void QString::truncate(int pos)
 {
-    if (pos < d->size)
+    if (pos < size())
         resize(pos);
 }
 
@@ -5932,7 +5810,7 @@ void QString::truncate(int pos)
 void QString::chop(int n)
 {
     if (n > 0)
-        resize(d->size - n);
+        resize(d.size - n);
 }
 
 /*!
@@ -5949,10 +5827,10 @@ void QString::chop(int n)
 
 QString& QString::fill(QChar ch, int size)
 {
-    resize(size < 0 ? d->size : size);
-    if (d->size) {
-        QChar *i = (QChar*)d->data() + d->size;
-        QChar *b = (QChar*)d->data();
+    resize(size < 0 ? d.size : size);
+    if (d.size) {
+        QChar *i = (QChar*)d.data() + d.size;
+        QChar *b = (QChar*)d.data();
         while (i != b)
            *--i = ch;
     }
@@ -6533,11 +6411,11 @@ int QString::localeAwareCompare_helper(const QChar *data1, int length1,
 
 const ushort *QString::utf16() const
 {
-    if (IS_RAW_DATA(d)) {
+    if (!d->isMutable()) {
         // ensure '\0'-termination for ::fromRawData strings
-        const_cast<QString*>(this)->reallocData(uint(d->size) + 1u);
+        const_cast<QString*>(this)->reallocData(uint(d.size) + 1u);
     }
-    return d->data();
+    return d.data();
 }
 
 /*!
@@ -6566,8 +6444,8 @@ QString QString::leftJustified(int width, QChar fill, bool truncate) const
     if (padlen > 0) {
         result.resize(len+padlen);
         if (len)
-            memcpy(result.d->data(), d->data(), sizeof(QChar)*len);
-        QChar *uc = (QChar*)result.d->data() + len;
+            memcpy(result.d.data(), d.data(), sizeof(QChar)*len);
+        QChar *uc = (QChar*)result.d.data() + len;
         while (padlen--)
            * uc++ = fill;
     } else {
@@ -6604,11 +6482,11 @@ QString QString::rightJustified(int width, QChar fill, bool truncate) const
     int padlen = width - len;
     if (padlen > 0) {
         result.resize(len+padlen);
-        QChar *uc = (QChar*)result.d->data();
+        QChar *uc = (QChar*)result.d.data();
         while (padlen--)
            * uc++ = fill;
         if (len)
-          memcpy(static_cast<void *>(uc), static_cast<const void *>(d->data()), sizeof(QChar)*len);
+          memcpy(static_cast<void *>(uc), static_cast<const void *>(d.data()), sizeof(QChar)*len);
     } else {
         if (truncate)
             result = left(width);
@@ -8154,7 +8032,7 @@ QVector<QStringRef> QString::splitRef(const QRegularExpression &re, SplitBehavio
 */
 QString QString::repeated(int times) const
 {
-    if (d->size == 0)
+    if (d.size == 0)
         return *this;
 
     if (times <= 1) {
@@ -8163,27 +8041,27 @@ QString QString::repeated(int times) const
         return QString();
     }
 
-    const int resultSize = times * d->size;
+    const int resultSize = times * d.size;
 
     QString result;
     result.reserve(resultSize);
-    if (result.d->alloc != uint(resultSize) + 1u)
+    if (result.capacity() != resultSize)
         return QString(); // not enough memory
 
-    memcpy(result.d->data(), d->data(), d->size * sizeof(ushort));
+    memcpy(result.d.data(), d.data(), d.size * sizeof(ushort));
 
-    int sizeSoFar = d->size;
-    ushort *end = result.d->data() + sizeSoFar;
+    int sizeSoFar = d.size;
+    ushort *end = result.d.data() + sizeSoFar;
 
     const int halfResultSize = resultSize >> 1;
     while (sizeSoFar <= halfResultSize) {
-        memcpy(end, result.d->data(), sizeSoFar * sizeof(ushort));
+        memcpy(end, result.d.data(), sizeSoFar * sizeof(ushort));
         end += sizeSoFar;
         sizeSoFar <<= 1;
     }
-    memcpy(end, result.d->data(), (resultSize - sizeSoFar) * sizeof(ushort));
-    result.d->data()[resultSize] = '\0';
-    result.d->size = resultSize;
+    memcpy(end, result.d.data(), (resultSize - sizeSoFar) * sizeof(ushort));
+    result.d.data()[resultSize] = '\0';
+    result.d.size = resultSize;
     return result;
 }
 
@@ -9183,8 +9061,8 @@ QString QtPrivate::argToQString(QLatin1String pattern, size_t n, const ArgBase *
 */
 bool QString::isSimpleText() const
 {
-    const ushort *p = d->data();
-    const ushort * const end = p + d->size;
+    const ushort *p = d.data();
+    const ushort * const end = p + d.size;
     while (p < end) {
         ushort uc = *p;
         // sort out regions of complex text formatting
@@ -9348,17 +9226,14 @@ bool QString::isRightToLeft() const
 */
 QString QString::fromRawData(const QChar *unicode, int size)
 {
-    Data *x;
+    QString::DataPointer x;
     if (!unicode) {
-        x = Data::sharedNull();
     } else if (!size) {
-        x = Data::allocate(0);
+        x = DataPointer(Data::allocate(0), 0);
     } else {
         x = Data::fromRawData(reinterpret_cast<const ushort *>(unicode), size);
-        Q_CHECK_PTR(x);
     }
-    QStringDataPtr dataPtr = { x };
-    return QString(dataPtr);
+    return QString(x);
 }
 
 /*!
@@ -9377,17 +9252,10 @@ QString QString::fromRawData(const QChar *unicode, int size)
 */
 QString &QString::setRawData(const QChar *unicode, int size)
 {
-    if (d->ref.isShared() || d->alloc) {
-        *this = fromRawData(unicode, size);
-    } else {
-        if (unicode) {
-            d->size = size;
-            d->offset = reinterpret_cast<const char *>(unicode) - reinterpret_cast<char *>(d);
-        } else {
-            d->offset = sizeof(QStringData);
-            d->size = 0;
-        }
+    if (!unicode || !size) {
+        clear();
     }
+    *this = fromRawData(unicode, size);
     return *this;
 }
 
@@ -10686,7 +10554,7 @@ ownership of it, no memory is freed when instances are destroyed.
 */
 
 QString QStringRef::toString() const {
-    if (!m_string)
+    if (isNull())
         return QString();
     if (m_size && m_position == 0 && m_size == m_string->size())
         return *m_string;
diff --git a/src/corelib/text/qstring.h b/src/corelib/text/qstring.h
index bfc190e9e9..f4d6fc24a5 100644
--- a/src/corelib/text/qstring.h
+++ b/src/corelib/text/qstring.h
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
 ** Copyright (C) 2016 The Qt Company Ltd.
-** Copyright (C) 2016 Intel Corporation.
+** Copyright (C) 2019 Intel Corporation.
 ** Copyright (C) 2019 Mail.ru Group.
 ** Contact: https://www.qt.io/licensing/
 **
@@ -48,7 +48,7 @@
 
 #include <QtCore/qchar.h>
 #include <QtCore/qbytearray.h>
-#include <QtCore/qrefcount.h>
+#include <QtCore/qarraydata.h>
 #include <QtCore/qnamespace.h>
 #include <QtCore/qstringliteral.h>
 #include <QtCore/qstringalgorithms.h>
@@ -70,7 +70,6 @@ Q_FORWARD_DECLARE_OBJC_CLASS(NSString);
 
 QT_BEGIN_NAMESPACE
 
-class QCharRef;
 class QRegExp;
 class QRegularExpression;
 class QRegularExpressionMatch;
@@ -246,8 +245,9 @@ qsizetype QStringView::lastIndexOf(QLatin1String s, qsizetype from, Qt::CaseSens
 
 class Q_CORE_EXPORT QString
 {
+    typedef QTypedArrayData<ushort> Data;
 public:
-    typedef QStringData Data;
+    typedef QStringPrivate DataPointer;
 
     inline QString() noexcept;
     explicit QString(const QChar *unicode, int size = -1);
@@ -259,12 +259,13 @@ public:
     QString &operator=(QChar c);
     QString &operator=(const QString &) noexcept;
     QString &operator=(QLatin1String latin1);
-    inline QString(QString && other) noexcept : d(other.d) { other.d = Data::sharedNull(); }
+    inline QString(QString &&other) noexcept
+    { qSwap(d, other.d); }
     inline QString &operator=(QString &&other) noexcept
     { qSwap(d, other.d); return *this; }
     inline void swap(QString &other) noexcept { qSwap(d, other.d); }
-    inline int size() const { return d->size; }
-    inline int count() const { return d->size; }
+    inline int size() const { return int(d.size); }
+    inline int count() const { return int(d.size); }
     inline int length() const;
     inline bool isEmpty() const;
     void resize(int size);
@@ -274,7 +275,7 @@ public:
     void truncate(int pos);
     void chop(int n);
 
-    int capacity() const;
+    inline int capacity() const;
     inline void reserve(int size);
     inline void squeeze();
 
@@ -285,19 +286,17 @@ public:
 
     inline void detach();
     inline bool isDetached() const;
-    inline bool isSharedWith(const QString &other) const { return d == other.d; }
+    inline bool isSharedWith(const QString &other) const { return d.isSharedWith(other.d); }
     void clear();
 
     inline const QChar at(int i) const;
     const QChar operator[](int i) const;
-    Q_REQUIRED_RESULT QCharRef operator[](int i);
-    const QChar operator[](uint i) const;
-    Q_REQUIRED_RESULT QCharRef operator[](uint i);
+    Q_REQUIRED_RESULT QChar &operator[](int i);
 
     Q_REQUIRED_RESULT inline QChar front() const { return at(0); }
-    Q_REQUIRED_RESULT inline QCharRef front();
+    Q_REQUIRED_RESULT inline QChar &front();
     Q_REQUIRED_RESULT inline QChar back() const { return at(size() - 1); }
-    Q_REQUIRED_RESULT inline QCharRef back();
+    Q_REQUIRED_RESULT inline QChar &back();
 
     Q_REQUIRED_RESULT QString arg(qlonglong a, int fieldwidth=0, int base=10,
                 QChar fillChar = QLatin1Char(' ')) const;
@@ -425,12 +424,11 @@ public:
 #endif
 
 #if QT_CONFIG(regularexpression)
-    int indexOf(const QRegularExpression &re, int from = 0) const;
-    int indexOf(const QRegularExpression &re, int from, QRegularExpressionMatch *rmatch) const; // ### Qt 6: merge overloads
-    int lastIndexOf(const QRegularExpression &re, int from = -1) const;
-    int lastIndexOf(const QRegularExpression &re, int from, QRegularExpressionMatch *rmatch) const; // ### Qt 6: merge overloads
-    bool contains(const QRegularExpression &re) const;
-    bool contains(const QRegularExpression &re, QRegularExpressionMatch *rmatch) const; // ### Qt 6: merge overloads
+    int indexOf(const QRegularExpression &re, int from = 0,
+                QRegularExpressionMatch *rmatch = nullptr) const;
+    int lastIndexOf(const QRegularExpression &re, int from = -1,
+                    QRegularExpressionMatch *rmatch = nullptr) const;
+    bool contains(const QRegularExpression &re, QRegularExpressionMatch *rmatch = nullptr) const;
     int count(const QRegularExpression &re) const;
 #endif
 
@@ -543,10 +541,10 @@ public:
     inline QString &prepend(QLatin1String s) { return insert(0, s); }
 
     inline QString &operator+=(QChar c) {
-        if (d->ref.isShared() || uint(d->size) + 2u > d->alloc)
-            reallocData(uint(d->size) + 2u, true);
-        d->data()[d->size++] = c.unicode();
-        d->data()[d->size] = '\0';
+        if (d->needsDetach() || int(d.size + 1) > capacity())
+            reallocData(uint(d.size) + 2u, true);
+        d->data()[d.size++] = c.unicode();
+        d->data()[d.size] = '\0';
         return *this;
     }
 
@@ -682,8 +680,7 @@ public:
     // note - this are all inline so we can benefit from strlen() compile time optimizations
     static inline QString fromLatin1(const char *str, int size = -1)
     {
-        QStringDataPtr dataPtr = { fromLatin1_helper(str, (str && size == -1) ? int(strlen(str)) : size) };
-        return QString(dataPtr);
+        return QString(fromLatin1_helper(str, (str && size == -1)  ? int(strlen(str)) : size));
     }
     static inline QString fromUtf8(const char *str, int size = -1)
     {
@@ -815,10 +812,10 @@ public:
 #endif
 #if !defined(QT_NO_CAST_FROM_ASCII) && !defined(QT_RESTRICTED_CAST_FROM_ASCII)
     inline QT_ASCII_CAST_WARN QString(const char *ch)
-        : d(fromAscii_helper(ch, ch ? int(strlen(ch)) : -1))
+        : QString(fromUtf8(ch))
     {}
     inline QT_ASCII_CAST_WARN QString(const QByteArray &a)
-        : d(fromAscii_helper(a.constData(), qstrnlen(a.constData(), a.size())))
+        : QString(fromUtf8(a))
     {}
     inline QT_ASCII_CAST_WARN QString &operator=(const char *ch)
     { return (*this = fromUtf8(ch)); }
@@ -934,10 +931,10 @@ public:
     struct Null { };
     QT_DEPRECATED_X("use QString()")
     static const Null null;
-    inline QString(const Null &): d(Data::sharedNull()) {}
+    inline QString(const Null &) {}
     inline QString &operator=(const Null &) { *this = QString(); return *this; }
 #endif
-    inline bool isNull() const { return d == Data::sharedNull(); }
+    inline bool isNull() const { return d->isNull(); }
 
 
     bool isSimpleText() const;
@@ -946,7 +943,7 @@ public:
     { return QStringView(*this).isValidUtf16(); }
 
     QString(int size, Qt::Initialization);
-    Q_DECL_CONSTEXPR inline QString(QStringDataPtr dd) : d(dd.ptr) {}
+    explicit QString(DataPointer dd) : d(dd) {}
 
 private:
 #if defined(QT_NO_CAST_FROM_ASCII)
@@ -958,7 +955,7 @@ private:
     QString &operator=(const QByteArray &a);
 #endif
 
-    Data *d;
+    DataPointer d;
 
     friend inline bool operator==(QChar, const QString &) noexcept;
     friend inline bool operator< (QChar, const QString &) noexcept;
@@ -996,8 +993,7 @@ private:
     static QString trimmed_helper(QString &str);
     static QString simplified_helper(const QString &str);
     static QString simplified_helper(QString &str);
-    static Data *fromLatin1_helper(const char *str, int size = -1);
-    static Data *fromAscii_helper(const char *str, int size = -1);
+    static DataPointer fromLatin1_helper(const char *str, int size = -1);
     static QString fromUtf8_helper(const char *str, int size);
     static QString fromLocal8Bit_helper(const char *, int size);
     static QByteArray toLatin1_helper(const QString &);
@@ -1008,7 +1004,6 @@ private:
     static qlonglong toIntegral_helper(const QChar *data, int len, bool *ok, int base);
     static qulonglong toIntegral_helper(const QChar *data, uint len, bool *ok, int base);
     void replace_helper(uint *indices, int nIndices, int blen, const QChar *after, int alen);
-    friend class QCharRef;
     friend class QTextCodec;
     friend class QStringRef;
     friend class QStringView;
@@ -1033,8 +1028,7 @@ private:
     }
 
 public:
-    typedef Data * DataPtr;
-    inline DataPtr &data_ptr() { return d; }
+    inline DataPointer &data_ptr() { return d; }
 };
 
 //
@@ -1049,33 +1043,31 @@ QString QStringView::toString() const
 inline QString::QString(QLatin1String aLatin1) : d(fromLatin1_helper(aLatin1.latin1(), aLatin1.size()))
 { }
 inline int QString::length() const
-{ return d->size; }
+{ return int(d.size); }
 inline const QChar QString::at(int i) const
-{ Q_ASSERT(uint(i) < uint(size())); return QChar(d->data()[i]); }
+{ Q_ASSERT(uint(i) < uint(size())); return QChar(d.data()[i]); }
 inline const QChar QString::operator[](int i) const
-{ Q_ASSERT(uint(i) < uint(size())); return QChar(d->data()[i]); }
-inline const QChar QString::operator[](uint i) const
-{ Q_ASSERT(i < uint(size())); return QChar(d->data()[i]); }
+{ Q_ASSERT(uint(i) < uint(size())); return QChar(d.data()[i]); }
 inline bool QString::isEmpty() const
-{ return d->size == 0; }
+{ return d.size == 0; }
 inline const QChar *QString::unicode() const
-{ return reinterpret_cast<const QChar*>(d->data()); }
+{ return reinterpret_cast<const QChar*>(d.data()); }
 inline const QChar *QString::data() const
-{ return reinterpret_cast<const QChar*>(d->data()); }
+{ return reinterpret_cast<const QChar*>(d.data()); }
 inline QChar *QString::data()
-{ detach(); return reinterpret_cast<QChar*>(d->data()); }
+{ detach(); return reinterpret_cast<QChar*>(d.data()); }
 inline const QChar *QString::constData() const
-{ return reinterpret_cast<const QChar*>(d->data()); }
+{ return reinterpret_cast<const QChar*>(d.data()); }
 inline void QString::detach()
-{ if (d->ref.isShared() || (d->offset != sizeof(QStringData))) reallocData(uint(d->size) + 1u); }
+{ if (d->needsDetach()) reallocData(d.size + 1u); }
 inline bool QString::isDetached() const
-{ return !d->ref.isShared(); }
+{ return !d->isShared(); }
 inline void QString::clear()
 { if (!isNull()) *this = QString(); }
 inline QString::QString(const QString &other) noexcept : d(other.d)
-{ Q_ASSERT(&other != this); d->ref.ref(); }
+{ }
 inline int QString::capacity() const
-{ return d->alloc ? d->alloc - 1 : 0; }
+{ const auto realCapacity = d->constAllocatedCapacity(); return realCapacity ? int(realCapacity) - 1 : 0; }
 inline QString &QString::setNum(short n, int base)
 { return setNum(qlonglong(n), base); }
 inline QString &QString::setNum(ushort n, int base)
@@ -1162,178 +1154,51 @@ inline QString QString::fromWCharArray(const wchar_t *string, int size)
                                             : fromUcs4(reinterpret_cast<const uint *>(string), size);
 }
 
-class
-#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
-Q_CORE_EXPORT
-#endif
-QCharRef { // ### Qt 7: remove
-    QString &s;
-    int i;
-    inline QCharRef(QString &str, int idx)
-        : s(str),i(idx) {}
-    friend class QString;
-public:
-
-    // most QChar operations repeated here
-
-    // all this is not documented: We just say "like QChar" and let it be.
-    inline operator QChar() const
-    {
-        using namespace QtPrivate::DeprecatedRefClassBehavior;
-        if (Q_LIKELY(i < s.d->size))
-            return QChar(s.d->data()[i]);
-#ifdef QT_DEBUG
-        warn(WarningType::OutOfRange, EmittingClass::QCharRef);
-#endif
-        return QChar();
-    }
-    inline QCharRef &operator=(QChar c)
-    {
-        using namespace QtPrivate::DeprecatedRefClassBehavior;
-        if (Q_UNLIKELY(i >= s.d->size)) {
-#ifdef QT_DEBUG
-            warn(WarningType::OutOfRange, EmittingClass::QCharRef);
-#endif
-            s.resize(i + 1, QLatin1Char(' '));
-        } else {
-#ifdef QT_DEBUG
-            if (Q_UNLIKELY(!s.isDetached()))
-                warn(WarningType::DelayedDetach, EmittingClass::QCharRef);
-#endif
-            s.detach();
-        }
-        s.d->data()[i] = c.unicode();
-        return *this;
-    }
-
-    // An operator= for each QChar cast constructors
-#ifndef QT_NO_CAST_FROM_ASCII
-    inline QT_ASCII_CAST_WARN QCharRef &operator=(char c)
-    { return operator=(QChar::fromLatin1(c)); }
-    inline QT_ASCII_CAST_WARN QCharRef &operator=(uchar c)
-    { return operator=(QChar::fromLatin1(c)); }
-#endif
-    inline QCharRef &operator=(const QCharRef &c) { return operator=(QChar(c)); }
-    inline QCharRef &operator=(ushort rc) { return operator=(QChar(rc)); }
-    inline QCharRef &operator=(short rc) { return operator=(QChar(rc)); }
-    inline QCharRef &operator=(uint rc) { return operator=(QChar(rc)); }
-    inline QCharRef &operator=(int rc) { return operator=(QChar(rc)); }
-
-    // each function...
-    inline bool isNull() const { return QChar(*this).isNull(); }
-    inline bool isPrint() const { return QChar(*this).isPrint(); }
-    inline bool isPunct() const { return QChar(*this).isPunct(); }
-    inline bool isSpace() const { return QChar(*this).isSpace(); }
-    inline bool isMark() const { return QChar(*this).isMark(); }
-    inline bool isLetter() const { return QChar(*this).isLetter(); }
-    inline bool isNumber() const { return QChar(*this).isNumber(); }
-    inline bool isLetterOrNumber() { return QChar(*this).isLetterOrNumber(); }
-    inline bool isDigit() const { return QChar(*this).isDigit(); }
-    inline bool isLower() const { return QChar(*this).isLower(); }
-    inline bool isUpper() const { return QChar(*this).isUpper(); }
-    inline bool isTitleCase() const { return QChar(*this).isTitleCase(); }
-
-    inline int digitValue() const { return QChar(*this).digitValue(); }
-    QChar toLower() const { return QChar(*this).toLower(); }
-    QChar toUpper() const { return QChar(*this).toUpper(); }
-    QChar toTitleCase () const { return QChar(*this).toTitleCase(); }
-
-    QChar::Category category() const { return QChar(*this).category(); }
-    QChar::Direction direction() const { return QChar(*this).direction(); }
-    QChar::JoiningType joiningType() const { return QChar(*this).joiningType(); }
-#if QT_DEPRECATED_SINCE(5, 3)
-    QT_DEPRECATED QChar::Joining joining() const
-    {
-        switch (QChar(*this).joiningType()) {
-        case QChar::Joining_Causing: return QChar::Center;
-        case QChar::Joining_Dual: return QChar::Dual;
-        case QChar::Joining_Right: return QChar::Right;
-        case QChar::Joining_None:
-        case QChar::Joining_Left:
-        case QChar::Joining_Transparent:
-        default: return QChar::OtherJoining;
-        }
-    }
-#endif
-    bool hasMirrored() const { return QChar(*this).hasMirrored(); }
-    QChar mirroredChar() const { return QChar(*this).mirroredChar(); }
-    QString decomposition() const { return QChar(*this).decomposition(); }
-    QChar::Decomposition decompositionTag() const { return QChar(*this).decompositionTag(); }
-    uchar combiningClass() const { return QChar(*this).combiningClass(); }
-
-    inline QChar::Script script() const { return QChar(*this).script(); }
-
-    QChar::UnicodeVersion unicodeVersion() const { return QChar(*this).unicodeVersion(); }
-
-    inline uchar cell() const { return QChar(*this).cell(); }
-    inline uchar row() const { return QChar(*this).row(); }
-    inline void setCell(uchar cell);
-    inline void setRow(uchar row);
-
-#if QT_DEPRECATED_SINCE(5, 0)
-    QT_DEPRECATED  char toAscii() const { return QChar(*this).toLatin1(); }
-#endif
-    char toLatin1() const { return QChar(*this).toLatin1(); }
-    ushort unicode() const { return QChar(*this).unicode(); }
-    ushort& unicode() { return s.data()[i].unicode(); }
-
-};
-Q_DECLARE_TYPEINFO(QCharRef, Q_MOVABLE_TYPE);
-
-inline void QCharRef::setRow(uchar arow) { QChar(*this).setRow(arow); }
-inline void QCharRef::setCell(uchar acell) { QChar(*this).setCell(acell); }
-
-
-inline QString::QString() noexcept : d(Data::sharedNull()) {}
-inline QString::~QString() { if (!d->ref.deref()) Data::deallocate(d); }
+inline QString::QString() noexcept {}
+inline QString::~QString() {}
 
 inline void QString::reserve(int asize)
 {
-    if (d->ref.isShared() || uint(asize) >= d->alloc)
-        reallocData(qMax(asize, d->size) + 1u);
+    if (d->needsDetach() || asize >= capacity())
+        reallocData(uint(qMax(asize, size())) + 1u);
 
-    if (!d->capacityReserved) {
-        // cannot set unconditionally, since d could be the shared_null/shared_empty (which is const)
-        d->capacityReserved = true;
-    }
+    // we're not shared anymore, for sure
+    d->flags() |= Data::CapacityReserved;
 }
 
 inline void QString::squeeze()
 {
-    if (d->ref.isShared() || uint(d->size) + 1u < d->alloc)
-        reallocData(uint(d->size) + 1u);
+    if ((d->flags() & Data::CapacityReserved) == 0)
+        return;
+    if (d->needsDetach() || int(d.size) < capacity())
+        reallocData(uint(d.size) + 1u);
 
-    if (d->capacityReserved) {
-        // cannot set unconditionally, since d could be shared_null or
-        // otherwise static.
-        d->capacityReserved = false;
-    }
+    // we're not shared anymore, for sure
+    d->flags() &= uint(~Data::CapacityReserved);
 }
 
 inline QString &QString::setUtf16(const ushort *autf16, int asize)
 { return setUnicode(reinterpret_cast<const QChar *>(autf16), asize); }
-inline QCharRef QString::operator[](int i)
-{ Q_ASSERT(i >= 0); detach(); return QCharRef(*this, i); }
-inline QCharRef QString::operator[](uint i)
-{  detach(); return QCharRef(*this, i); }
-inline QCharRef QString::front() { return operator[](0); }
-inline QCharRef QString::back() { return operator[](size() - 1); }
+inline QChar &QString::operator[](int i)
+{ Q_ASSERT(i >= 0 && i < size()); return data()[i]; }
+inline QChar &QString::front() { return operator[](0); }
+inline QChar &QString::back() { return operator[](size() - 1); }
 inline QString::iterator QString::begin()
-{ detach(); return reinterpret_cast<QChar*>(d->data()); }
+{ detach(); return reinterpret_cast<QChar*>(d.data()); }
 inline QString::const_iterator QString::begin() const
-{ return reinterpret_cast<const QChar*>(d->data()); }
+{ return reinterpret_cast<const QChar*>(d.data()); }
 inline QString::const_iterator QString::cbegin() const
-{ return reinterpret_cast<const QChar*>(d->data()); }
+{ return reinterpret_cast<const QChar*>(d.data()); }
 inline QString::const_iterator QString::constBegin() const
-{ return reinterpret_cast<const QChar*>(d->data()); }
+{ return reinterpret_cast<const QChar*>(d.data()); }
 inline QString::iterator QString::end()
-{ detach(); return reinterpret_cast<QChar*>(d->data() + d->size); }
+{ detach(); return reinterpret_cast<QChar*>(d.data() + d.size); }
 inline QString::const_iterator QString::end() const
-{ return reinterpret_cast<const QChar*>(d->data() + d->size); }
+{ return reinterpret_cast<const QChar*>(d.data() + d.size); }
 inline QString::const_iterator QString::cend() const
-{ return reinterpret_cast<const QChar*>(d->data() + d->size); }
+{ return reinterpret_cast<const QChar*>(d.data() + d.size); }
 inline QString::const_iterator QString::constEnd() const
-{ return reinterpret_cast<const QChar*>(d->data() + d->size); }
+{ return reinterpret_cast<const QChar*>(d.data() + d.size); }
 #if QT_STRINGVIEW_LEVEL < 2
 inline bool QString::contains(const QString &s, Qt::CaseSensitivity cs) const
 { return indexOf(s, 0, cs) != -1; }
@@ -1560,7 +1425,8 @@ inline QString QString::fromStdU32String(const std::u32string &s)
 inline std::u32string QString::toStdU32String() const
 {
     std::u32string u32str(length(), char32_t(0));
-    int len = toUcs4_helper(d->data(), length(), reinterpret_cast<uint*>(&u32str[0]));
+    int len = toUcs4_helper(reinterpret_cast<const ushort *>(constData()), length(),
+                            reinterpret_cast<uint*>(&u32str[0]));
     u32str.resize(len);
     return u32str;
 }
@@ -1698,7 +1564,7 @@ public:
     inline const QChar *unicode() const
     {
         if (!m_string)
-            return reinterpret_cast<const QChar *>(QString::Data::sharedNull()->data());
+            return reinterpret_cast<const QChar *>(QString::Data::sharedNullData());
         return m_string->unicode() + m_position;
     }
     inline const QChar *data() const { return unicode(); }
diff --git a/src/corelib/text/qstringbuilder.cpp b/src/corelib/text/qstringbuilder.cpp
index cf443ec369..29bd216e80 100644
--- a/src/corelib/text/qstringbuilder.cpp
+++ b/src/corelib/text/qstringbuilder.cpp
@@ -73,7 +73,7 @@ QT_BEGIN_NAMESPACE
 
     \list
     \li QString, QStringRef, (since 5.10:) QStringView
-    \li QChar, QCharRef, QLatin1Char, (since 5.10:) \c char16_t,
+    \li QChar, QLatin1Char, (since 5.10:) \c char16_t,
     \li QLatin1String,
     \li (since 5.10:) \c{const char16_t[]} (\c{u"foo"}),
     \li QByteArray, \c char, \c{const char[]}.
@@ -108,7 +108,7 @@ QT_BEGIN_NAMESPACE
 
     This function is usable with arguments of type \c QString,
     \c QLatin1String, \c QStringRef,
-    \c QChar, \c QCharRef, \c QLatin1Char, and \c char.
+    \c QChar, \c QLatin1Char, and \c char.
 */
 
 /* \fn template <typename A, typename B> QByteArray QStringBuilder<A, B>::toLatin1() const
diff --git a/src/corelib/text/qstringbuilder.h b/src/corelib/text/qstringbuilder.h
index 288d98d633..45fd270b66 100644
--- a/src/corelib/text/qstringbuilder.h
+++ b/src/corelib/text/qstringbuilder.h
@@ -231,16 +231,6 @@ template <> struct QConcatenable<QChar::SpecialCharacter> : private QAbstractCon
     { *out++ = c; }
 };
 
-template <> struct QConcatenable<QCharRef> : private QAbstractConcatenable
-{
-    typedef QCharRef type;
-    typedef QString ConvertTo;
-    enum { ExactSize = true };
-    static int size(QCharRef) { return 1; }
-    static inline void appendTo(QCharRef c, QChar *&out)
-    { *out++ = QChar(c); }
-};
-
 template <> struct QConcatenable<QLatin1String> : private QAbstractConcatenable
 {
     typedef QLatin1String type;
diff --git a/src/corelib/text/qstringlist.h b/src/corelib/text/qstringlist.h
index 9ea379bb92..c03e34b9ba 100644
--- a/src/corelib/text/qstringlist.h
+++ b/src/corelib/text/qstringlist.h
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-#include <QtCore/qlist.h>
+#include <QtCore/qvector.h>
 
 #ifndef QSTRINGLIST_H
 #define QSTRINGLIST_H
@@ -55,21 +55,21 @@ class QRegExp;
 class QRegularExpression;
 
 #if !defined(QT_NO_JAVA_STYLE_ITERATORS)
-typedef QListIterator<QString> QStringListIterator;
-typedef QMutableListIterator<QString> QMutableStringListIterator;
+typedef QVectorIterator<QString> QStringListIterator;
+typedef QMutableVectorIterator<QString> QMutableStringListIterator;
 #endif
 
 class QStringList;
 
 #ifdef Q_QDOC
-class QStringList : public QList<QString>
+class QStringList : public QVector<QString>
 #else
-template <> struct QListSpecialMethods<QString>
+template <> struct QVectorSpecialMethods<QString>
 #endif
 {
 #ifndef Q_QDOC
 protected:
-    ~QListSpecialMethods() = default;
+    ~QVectorSpecialMethods() = default;
 #endif
 public:
     inline void sort(Qt::CaseSensitivity cs = Qt::CaseSensitive);
@@ -108,23 +108,23 @@ private:
 };
 
 // ### Qt6: check if there's a better way
-class QStringList : public QList<QString>
+class QStringList : public QVector<QString>
 {
 #endif
 public:
     inline QStringList() noexcept { }
     inline explicit QStringList(const QString &i) { append(i); }
-    inline QStringList(const QList<QString> &l) : QList<QString>(l) { }
-    inline QStringList(QList<QString> &&l) noexcept : QList<QString>(std::move(l)) { }
-    inline QStringList(std::initializer_list<QString> args) : QList<QString>(args) { }
+    inline QStringList(const QVector<QString> &l) : QVector<QString>(l) { }
+    inline QStringList(QVector<QString> &&l) noexcept : QVector<QString>(std::move(l)) { }
+    inline QStringList(std::initializer_list<QString> args) : QVector<QString>(args) { }
     template <typename InputIterator, QtPrivate::IfIsInputIterator<InputIterator> = true>
     inline QStringList(InputIterator first, InputIterator last)
-        : QList<QString>(first, last) { }
+        : QVector<QString>(first, last) { }
 
-    QStringList &operator=(const QList<QString> &other)
-    { QList<QString>::operator=(other); return *this; }
-    QStringList &operator=(QList<QString> &&other) noexcept
-    { QList<QString>::operator=(std::move(other)); return *this; }
+    QStringList &operator=(const QVector<QString> &other)
+    { QVector<QString>::operator=(other); return *this; }
+    QStringList &operator=(QVector<QString> &&other) noexcept
+    { QVector<QString>::operator=(std::move(other)); return *this; }
 
 #if QT_STRINGVIEW_LEVEL < 2
     inline bool contains(const QString &str, Qt::CaseSensitivity cs = Qt::CaseSensitive) const;
@@ -138,7 +138,7 @@ public:
     { append(str); return *this; }
     inline QStringList &operator<<(const QStringList &l)
     { *this += l; return *this; }
-    inline QStringList &operator<<(const QList<QString> &l)
+    inline QStringList &operator<<(const QVector<QString> &l)
     { *this += l; return *this; }
 
     inline int indexOf(QStringView str, int from = 0) const;
@@ -159,16 +159,16 @@ public:
     inline int lastIndexOf(const QRegularExpression &re, int from = -1) const;
 #endif // QT_CONFIG(regularexpression)
 
-    using QList<QString>::indexOf;
-    using QList<QString>::lastIndexOf;
+    using QVector<QString>::indexOf;
+    using QVector<QString>::lastIndexOf;
 };
 
 Q_DECLARE_TYPEINFO(QStringList, Q_MOVABLE_TYPE);
 
 #ifndef Q_QDOC
-inline QStringList *QListSpecialMethods<QString>::self()
+inline QStringList *QVectorSpecialMethods<QString>::self()
 { return static_cast<QStringList *>(this); }
-inline const QStringList *QListSpecialMethods<QString>::self() const
+inline const QStringList *QVectorSpecialMethods<QString>::self() const
 { return static_cast<const QStringList *>(this); }
 
 namespace QtPrivate {
@@ -213,45 +213,45 @@ namespace QtPrivate {
 #endif // QT_CONFIG(regularexpression)
 }
 
-inline void QListSpecialMethods<QString>::sort(Qt::CaseSensitivity cs)
+inline void QVectorSpecialMethods<QString>::sort(Qt::CaseSensitivity cs)
 {
     QtPrivate::QStringList_sort(self(), cs);
 }
 
-inline int QListSpecialMethods<QString>::removeDuplicates()
+inline int QVectorSpecialMethods<QString>::removeDuplicates()
 {
     return QtPrivate::QStringList_removeDuplicates(self());
 }
 
 #if QT_STRINGVIEW_LEVEL < 2
-inline QString QListSpecialMethods<QString>::join(const QString &sep) const
+inline QString QVectorSpecialMethods<QString>::join(const QString &sep) const
 {
     return QtPrivate::QStringList_join(self(), sep.constData(), sep.length());
 }
 #endif
 
-inline QString QListSpecialMethods<QString>::join(QStringView sep) const
+inline QString QVectorSpecialMethods<QString>::join(QStringView sep) const
 {
     return QtPrivate::QStringList_join(self(), sep);
 }
 
-QString QListSpecialMethods<QString>::join(QLatin1String sep) const
+QString QVectorSpecialMethods<QString>::join(QLatin1String sep) const
 {
     return QtPrivate::QStringList_join(*self(), sep);
 }
 
-inline QString QListSpecialMethods<QString>::join(QChar sep) const
+inline QString QVectorSpecialMethods<QString>::join(QChar sep) const
 {
     return QtPrivate::QStringList_join(self(), &sep, 1);
 }
 
-inline QStringList QListSpecialMethods<QString>::filter(QStringView str, Qt::CaseSensitivity cs) const
+inline QStringList QVectorSpecialMethods<QString>::filter(QStringView str, Qt::CaseSensitivity cs) const
 {
     return QtPrivate::QStringList_filter(self(), str, cs);
 }
 
 #if QT_STRINGVIEW_LEVEL < 2
-inline QStringList QListSpecialMethods<QString>::filter(const QString &str, Qt::CaseSensitivity cs) const
+inline QStringList QVectorSpecialMethods<QString>::filter(const QString &str, Qt::CaseSensitivity cs) const
 {
     return QtPrivate::QStringList_filter(self(), str, cs);
 }
@@ -274,33 +274,33 @@ inline bool QStringList::contains(QStringView str, Qt::CaseSensitivity cs) const
     return QtPrivate::QStringList_contains(this, str, cs);
 }
 
-inline QStringList &QListSpecialMethods<QString>::replaceInStrings(QStringView before, QStringView after, Qt::CaseSensitivity cs)
+inline QStringList &QVectorSpecialMethods<QString>::replaceInStrings(QStringView before, QStringView after, Qt::CaseSensitivity cs)
 {
     QtPrivate::QStringList_replaceInStrings(self(), before, after, cs);
     return *self();
 }
 
 #if QT_STRINGVIEW_LEVEL < 2
-inline QStringList &QListSpecialMethods<QString>::replaceInStrings(const QString &before, const QString &after, Qt::CaseSensitivity cs)
+inline QStringList &QVectorSpecialMethods<QString>::replaceInStrings(const QString &before, const QString &after, Qt::CaseSensitivity cs)
 {
     QtPrivate::QStringList_replaceInStrings(self(), before, after, cs);
     return *self();
 }
 
-inline QStringList &QListSpecialMethods<QString>::replaceInStrings(QStringView before, const QString &after, Qt::CaseSensitivity cs)
+inline QStringList &QVectorSpecialMethods<QString>::replaceInStrings(QStringView before, const QString &after, Qt::CaseSensitivity cs)
 {
     QtPrivate::QStringList_replaceInStrings(self(), before, qToStringViewIgnoringNull(after), cs);
     return *self();
 }
 
-inline QStringList &QListSpecialMethods<QString>::replaceInStrings(const QString &before, QStringView after, Qt::CaseSensitivity cs)
+inline QStringList &QVectorSpecialMethods<QString>::replaceInStrings(const QString &before, QStringView after, Qt::CaseSensitivity cs)
 {
     QtPrivate::QStringList_replaceInStrings(self(), QStringView(before), after, cs);
     return *self();
 }
 #endif
 
-inline QStringList operator+(const QList<QString> &one, const QStringList &other)
+inline QStringList operator+(const QVector<QString> &one, const QStringList &other)
 {
     QStringList n = one;
     n += other;
@@ -328,13 +328,13 @@ inline int QStringList::lastIndexOf(QLatin1String string, int from) const
 }
 
 #ifndef QT_NO_REGEXP
-inline QStringList &QListSpecialMethods<QString>::replaceInStrings(const QRegExp &rx, const QString &after)
+inline QStringList &QVectorSpecialMethods<QString>::replaceInStrings(const QRegExp &rx, const QString &after)
 {
     QtPrivate::QStringList_replaceInStrings(self(), rx, after);
     return *self();
 }
 
-inline QStringList QListSpecialMethods<QString>::filter(const QRegExp &rx) const
+inline QStringList QVectorSpecialMethods<QString>::filter(const QRegExp &rx) const
 {
     return QtPrivate::QStringList_filter(self(), rx);
 }
@@ -361,13 +361,13 @@ inline int QStringList::lastIndexOf(QRegExp &rx, int from) const
 #endif
 
 #if QT_CONFIG(regularexpression)
-inline QStringList &QListSpecialMethods<QString>::replaceInStrings(const QRegularExpression &rx, const QString &after)
+inline QStringList &QVectorSpecialMethods<QString>::replaceInStrings(const QRegularExpression &rx, const QString &after)
 {
     QtPrivate::QStringList_replaceInStrings(self(), rx, after);
     return *self();
 }
 
-inline QStringList QListSpecialMethods<QString>::filter(const QRegularExpression &rx) const
+inline QStringList QVectorSpecialMethods<QString>::filter(const QRegularExpression &rx) const
 {
     return QtPrivate::QStringList_filter(self(), rx);
 }
diff --git a/src/corelib/text/qstringliteral.h b/src/corelib/text/qstringliteral.h
index 2a7e607c63..742d38de7d 100644
--- a/src/corelib/text/qstringliteral.h
+++ b/src/corelib/text/qstringliteral.h
@@ -42,6 +42,7 @@
 #define QSTRINGLITERAL_H
 
 #include <QtCore/qarraydata.h>
+#include <QtCore/qarraydatapointer.h>
 
 #if 0
 #pragma qt_class(QStringLiteral)
@@ -49,8 +50,6 @@
 
 QT_BEGIN_NAMESPACE
 
-typedef QTypedArrayData<ushort> QStringData;
-
 // all our supported compilers support Unicode string literals,
 // even if their Q_COMPILER_UNICODE_STRING has been revoked due
 // to lacking stdlib support. But QStringLiteral only needs the
@@ -65,44 +64,23 @@ Q_STATIC_ASSERT_X(sizeof(qunicodechar) == 2,
 #define QStringLiteral(str) \
     ([]() noexcept -> QString { \
         enum { Size = sizeof(QT_UNICODE_LITERAL(str))/2 - 1 }; \
-        static const QStaticStringData<Size> qstring_literal = { \
-            Q_STATIC_STRING_DATA_HEADER_INITIALIZER(Size), \
-            QT_UNICODE_LITERAL(str) }; \
-        QStringDataPtr holder = { qstring_literal.data_ptr() }; \
-        const QString qstring_literal_temp(holder); \
-        return qstring_literal_temp; \
+        static const QArrayData qstring_literal = { \
+            Q_BASIC_ATOMIC_INITIALIZER(-1), QArrayData::StaticDataFlags, 0 \
+        }; \
+        QStringPrivate holder = {  \
+            static_cast<QTypedArrayData<ushort> *>(const_cast<QArrayData *>(&qstring_literal)), \
+            reinterpret_cast<ushort *>(const_cast<qunicodechar *>(QT_UNICODE_LITERAL(str))), \
+            Size \
+        }; \
+        return QString(holder); \
     }()) \
     /**/
 
-#define Q_STATIC_STRING_DATA_HEADER_INITIALIZER_WITH_OFFSET(size, offset) \
-    { Q_REFCOUNT_INITIALIZE_STATIC, size, 0, 0, offset } \
-    /**/
-
-#define Q_STATIC_STRING_DATA_HEADER_INITIALIZER(size) \
-    Q_STATIC_STRING_DATA_HEADER_INITIALIZER_WITH_OFFSET(size, sizeof(QStringData)) \
-    /**/
-
 #if QT_DEPRECATED_SINCE(5, 14)
 # define QStringViewLiteral(str) QStringView(QT_UNICODE_LITERAL(str), QtPrivate::Deprecated)
 #endif
 
-template <int N>
-struct QStaticStringData
-{
-    QArrayData str;
-    qunicodechar data[N + 1];
-
-    QStringData *data_ptr() const
-    {
-        Q_ASSERT(str.ref.isStatic());
-        return const_cast<QStringData *>(static_cast<const QStringData*>(&str));
-    }
-};
-
-struct QStringDataPtr
-{
-    QStringData *ptr;
-};
+using QStringPrivate = QArrayDataPointer<ushort>;
 
 QT_END_NAMESPACE
 
diff --git a/src/corelib/thread/qfutureinterface.cpp b/src/corelib/thread/qfutureinterface.cpp
index f1fd40e7b6..e6380a8732 100644
--- a/src/corelib/thread/qfutureinterface.cpp
+++ b/src/corelib/thread/qfutureinterface.cpp
@@ -424,12 +424,7 @@ void QFutureInterfaceBase::setProgressValueAndText(int progressValue,
     }
 }
 
-QMutex *QFutureInterfaceBase::mutex() const
-{
-    return &d->m_mutex;
-}
-
-QMutex &QFutureInterfaceBase::mutex(int) const
+QMutex &QFutureInterfaceBase::mutex() const
 {
     return d->m_mutex;
 }
diff --git a/src/corelib/thread/qfutureinterface.h b/src/corelib/thread/qfutureinterface.h
index bcdae24833..43dfd6bac4 100644
--- a/src/corelib/thread/qfutureinterface.h
+++ b/src/corelib/thread/qfutureinterface.h
@@ -119,8 +119,7 @@ public:
     void waitForResult(int resultIndex);
     void waitForResume();
 
-    QMutex *mutex() const;
-    QMutex &mutex(int) const;
+    QMutex &mutex() const;
     QtPrivate::ExceptionStore &exceptionStore();
     QtPrivate::ResultStoreBase &resultStoreBase();
     const QtPrivate::ResultStoreBase &resultStoreBase() const;
@@ -191,7 +190,7 @@ public:
 template <typename T>
 inline void QFutureInterface<T>::reportResult(const T *result, int index)
 {
-    std::lock_guard<QMutex> locker(mutex(0));
+    std::lock_guard<QMutex> locker{mutex()};
     if (this->queryState(Canceled) || this->queryState(Finished)) {
         return;
     }
@@ -217,7 +216,7 @@ inline void QFutureInterface<T>::reportResult(const T &result, int index)
 template <typename T>
 inline void QFutureInterface<T>::reportResults(const QVector<T> &_results, int beginIndex, int count)
 {
-    std::lock_guard<QMutex> locker(mutex(0));
+    std::lock_guard<QMutex> locker{mutex()};
     if (this->queryState(Canceled) || this->queryState(Finished)) {
         return;
     }
@@ -245,14 +244,14 @@ inline void QFutureInterface<T>::reportFinished(const T *result)
 template <typename T>
 inline const T &QFutureInterface<T>::resultReference(int index) const
 {
-    std::lock_guard<QMutex> locker(mutex(0));
+    std::lock_guard<QMutex> locker{mutex()};
     return resultStoreBase().resultAt(index).template value<T>();
 }
 
 template <typename T>
 inline const T *QFutureInterface<T>::resultPointer(int index) const
 {
-    std::lock_guard<QMutex> locker(mutex(0));
+    std::lock_guard<QMutex> locker{mutex()};
     return resultStoreBase().resultAt(index).template pointer<T>();
 }
 
@@ -266,7 +265,7 @@ inline QList<T> QFutureInterface<T>::results()
     QFutureInterfaceBase::waitForResult(-1);
 
     QList<T> res;
-    std::lock_guard<QMutex> locker(mutex(0));
+    std::lock_guard<QMutex> locker{mutex()};
 
     QtPrivate::ResultIteratorBase it = resultStoreBase().begin();
     while (it != resultStoreBase().end()) {
diff --git a/src/corelib/thread/qrunnable.cpp b/src/corelib/thread/qrunnable.cpp
index c911cd0745..32f3cd657e 100644
--- a/src/corelib/thread/qrunnable.cpp
+++ b/src/corelib/thread/qrunnable.cpp
@@ -43,7 +43,6 @@ QT_BEGIN_NAMESPACE
 
 QRunnable::~QRunnable()
 {
-    // Must be empty until ### Qt 6
 }
 
 /*!
diff --git a/src/corelib/thread/qthread.cpp b/src/corelib/thread/qthread.cpp
index d18056063f..155bff1758 100644
--- a/src/corelib/thread/qthread.cpp
+++ b/src/corelib/thread/qthread.cpp
@@ -853,7 +853,7 @@ bool QThread::event(QEvent* event)
     return QObject::event(event);
 }
 
-Qt::HANDLE QThread::currentThreadId() noexcept
+Qt::HANDLE QThread::currentThreadIdImpl() noexcept
 {
     return Qt::HANDLE(currentThread());
 }
diff --git a/src/corelib/thread/qthread.h b/src/corelib/thread/qthread.h
index 2072e22340..635dd94522 100644
--- a/src/corelib/thread/qthread.h
+++ b/src/corelib/thread/qthread.h
@@ -161,6 +161,7 @@ private:
 #if QT_CONFIG(cxx11_future)
     static QThread *createThreadImpl(std::future<void> &&future);
 #endif
+    static Qt::HANDLE currentThreadIdImpl() noexcept Q_DECL_PURE_FUNCTION;
 
     friend class QCoreApplication;
     friend class QThreadData;
@@ -236,6 +237,38 @@ QThread *QThread::create(Function &&f)
 
 #endif // QT_CONFIG(cxx11_future)
 
+/*
+    On architectures and platforms we know, interpret the thread control
+    block (TCB) as a unique identifier for a thread within a process. Otherwise,
+    fall back to a slower but safe implementation.
+
+    As per the documentation of currentThreadId, we return an opaque handle
+    as a thread identifier, and application code is not supposed to use that
+    value for anything. In Qt we use the handle to check if threads are identical,
+    for which the TCB is sufficient.
+
+    So we use the fastest possible way, rathern than spend time on returning
+    some pseudo-interoperable value.
+*/
+inline Qt::HANDLE QThread::currentThreadId() noexcept
+{
+    Qt::HANDLE tid; // typedef to void*
+    Q_STATIC_ASSERT(sizeof(tid) == sizeof(void*));
+    // See https://akkadia.org/drepper/tls.pdf for x86 ABI
+#if defined(Q_PROCESSOR_X86_32) && defined(Q_OS_LINUX) // x86 32-bit always uses GS
+    __asm__("movl %%gs:0, %0" : "=r" (tid) : : );
+#elif defined(Q_PROCESSOR_X86_64) && defined(Q_OS_DARWIN64)
+    // 64bit macOS uses GS, see https://github.com/apple/darwin-xnu/blob/master/libsyscall/os/tsd.h
+    __asm__("movq %%gs:0, %0" : "=r" (tid) : : );
+#elif defined(Q_PROCESSOR_X86_64) && (defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD))
+    // x86_64 Linux, BSD uses FS
+    __asm__("movq %%fs:0, %0" : "=r" (tid) : : );
+#else
+    tid = currentThreadIdImpl();
+#endif
+    return tid;
+}
+
 QT_END_NAMESPACE
 
 #endif // QTHREAD_H
diff --git a/src/corelib/thread/qthread_unix.cpp b/src/corelib/thread/qthread_unix.cpp
index 1da68b3130..727d72a334 100644
--- a/src/corelib/thread/qthread_unix.cpp
+++ b/src/corelib/thread/qthread_unix.cpp
@@ -415,16 +415,36 @@ void QThreadPrivate::finish(void *arg)
 }
 
 
-
-
 /**************************************************************************
  ** QThread
  *************************************************************************/
 
-Qt::HANDLE QThread::currentThreadId() noexcept
+/*
+    Since each thread is guaranteed to have its own copy of
+    currenThreadData, the address is guaranteed to be unique for each
+    running thread (but likely to be reused for newly started threads).
+
+    CI tests fails on ARM architectures if we try to use the assembler,
+    or the address of the thread_local (even with a recent gcc version), so
+    stick to the pthread version there. The assembler would be
+
+    // http://infocenter.arm.com/help/index.jsp?topic=/com.arm.doc.ddi0344k/Babeihid.html
+    asm volatile ("mrc p15, 0, %0, c13, c0, 3" : "=r" (tid));
+
+    and
+
+    // see glibc/sysdeps/aarch64/nptl/tls.h
+    asm volatile ("mrs %0, tpidr_el0" : "=r" (tid));
+
+    for 32 and 64bit versions, respectively.
+*/
+Qt::HANDLE QThread::currentThreadIdImpl() noexcept
 {
-    // requires a C cast here otherwise we run into trouble on AIX
+#if defined(Q_PROCESSOR_ARM)
     return to_HANDLE(pthread_self());
+#else
+    return &currentThreadData;
+#endif
 }
 
 #if defined(QT_LINUXBASE) && !defined(_SC_NPROCESSORS_ONLN)
diff --git a/src/corelib/thread/qthread_win.cpp b/src/corelib/thread/qthread_win.cpp
index bc70e3178a..00d67b3a00 100644
--- a/src/corelib/thread/qthread_win.cpp
+++ b/src/corelib/thread/qthread_win.cpp
@@ -449,7 +449,7 @@ void QThreadPrivate::finish(void *arg, bool lockAnyway) noexcept
  ** QThread
  *************************************************************************/
 
-Qt::HANDLE QThread::currentThreadId() noexcept
+Qt::HANDLE QThread::currentThreadIdImpl() noexcept
 {
     return reinterpret_cast<Qt::HANDLE>(quintptr(GetCurrentThreadId()));
 }
diff --git a/src/corelib/time/qcalendar.cpp b/src/corelib/time/qcalendar.cpp
index 32f0a511a3..02788f5e23 100644
--- a/src/corelib/time/qcalendar.cpp
+++ b/src/corelib/time/qcalendar.cpp
@@ -518,7 +518,7 @@ int QCalendarBackend::dayOfWeek(qint64 jd) const
 
 /*!
     \fn QString QCalendarBackend::dateTimeToString(QStringView format, const QDateTime &datetime,
-                                                   const QDate &dateOnly, const QTime &timeOnly,
+                                                   QDate dateOnly, QTime timeOnly,
                                                    const QLocale &locale) const
 
     Returns a string representing a given date, time or date-time.
@@ -1095,7 +1095,7 @@ QString QCalendar::standaloneWeekDayName(const QLocale &locale, int day,
     \sa monthName(), weekDayName(), QDate::toString(), QTime::toString()
 */
 QString QCalendar::dateTimeToString(QStringView format, const QDateTime &datetime,
-                                    const QDate &dateOnly, const QTime &timeOnly,
+                                    QDate dateOnly, QTime timeOnly,
                                     const QLocale &locale) const
 {
     return d ? d->dateTimeToString(format, datetime, dateOnly, timeOnly, locale) : QString();
diff --git a/src/corelib/time/qcalendar.h b/src/corelib/time/qcalendar.h
index 42c8e150c5..5eb2e541c8 100644
--- a/src/corelib/time/qcalendar.h
+++ b/src/corelib/time/qcalendar.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2019 The Qt Company Ltd.
+** Copyright (C) 2020 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtCore module of the Qt Toolkit.
@@ -178,7 +178,7 @@ public:
 
     // Formatting of date-times:
     QString dateTimeToString(QStringView format, const QDateTime &datetime,
-                             const QDate &dateOnly, const QTime &timeOnly,
+                             QDate dateOnly, QTime timeOnly,
                              const QLocale &locale) const;
 
     // What's available ?
diff --git a/src/corelib/time/qcalendarbackend_p.h b/src/corelib/time/qcalendarbackend_p.h
index 21506e9e2c..129e86494b 100644
--- a/src/corelib/time/qcalendarbackend_p.h
+++ b/src/corelib/time/qcalendarbackend_p.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2019 The Qt Company Ltd.
+** Copyright (C) 2020 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtCore module of the Qt Toolkit.
@@ -56,23 +56,33 @@
 #include <QtCore/qstringlist.h>
 #include <QtCore/qstring.h>
 #include <QtCore/qmap.h>
+#include <QtCore/private/qlocale_p.h>
 
 QT_BEGIN_NAMESPACE
 
 // Locale-related parts, mostly handled in ../text/qlocale.cpp
-struct QLocaleDataEntry {
-    quint16 index, size;
-};
 
 struct QCalendarLocale {
     quint16 m_language_id, m_script_id, m_country_id;
+
+#define rangeGetter(name) \
+    QLocaleData::DataRange name() const { return { m_ ## name ## _idx, m_ ## name ## _size }; }
+
+    rangeGetter(longMonthStandalone) rangeGetter(longMonth)
+    rangeGetter(shortMonthStandalone) rangeGetter(shortMonth)
+    rangeGetter(narrowMonthStandalone) rangeGetter(narrowMonth)
+#undef rangeGetter
+
     // Month name indexes:
-    QLocaleDataEntry m_standalone_short;
-    QLocaleDataEntry m_standalone_long;
-    QLocaleDataEntry m_standalone_narrow;
-    QLocaleDataEntry m_short;
-    QLocaleDataEntry m_long;
-    QLocaleDataEntry m_narrow;
+    quint16 m_longMonthStandalone_idx, m_longMonth_idx;
+    quint16 m_shortMonthStandalone_idx, m_shortMonth_idx;
+    quint16 m_narrowMonthStandalone_idx, m_narrowMonth_idx;
+
+    // Twelve long month names (separated by commas) can add up to more than 256
+    // QChars - e.g. kde_TZ gets to 264.
+    quint16 m_longMonthStandalone_size, m_longMonth_size;
+    quint8 m_shortMonthStandalone_size, m_shortMonth_size;
+    quint8 m_narrowMonthStandalone_size, m_narrowMonth_size;
 };
 
 // Partial implementation, of methods with common forms, in qcalendar.cpp
@@ -116,7 +126,7 @@ public:
 
     // Formatting of date-times (implemented in qlocale.cpp):
     virtual QString dateTimeToString(QStringView format, const QDateTime &datetime,
-                                     const QDate &dateOnly, const QTime &timeOnly,
+                                     QDate dateOnly, QTime timeOnly,
                                      const QLocale &locale) const;
 
     // Calendar enumeration by name:
@@ -127,7 +137,7 @@ protected:
 
     // Locale support:
     virtual const QCalendarLocale *localeMonthIndexData() const = 0;
-    virtual const ushort *localeMonthData() const = 0;
+    virtual const char16_t *localeMonthData() const = 0;
 
     bool registerAlias(const QString &name);
 
diff --git a/src/corelib/time/qdatetime.cpp b/src/corelib/time/qdatetime.cpp
index b3a12a4a46..e9fe34110a 100644
--- a/src/corelib/time/qdatetime.cpp
+++ b/src/corelib/time/qdatetime.cpp
@@ -51,7 +51,6 @@
 #if QT_CONFIG(timezone)
 #include "qtimezoneprivate_p.h"
 #endif
-#include "qregexp.h"
 #include "qdebug.h"
 #ifndef Q_OS_WIN
 #include <locale.h>
@@ -135,8 +134,6 @@ static int qt_monthNumberFromShortName(QStringView shortName)
     }
     return -1;
 }
-static int qt_monthNumberFromShortName(const QString &shortName)
-{ return qt_monthNumberFromShortName(QStringView(shortName)); }
 
 static int fromShortMonthName(QStringView monthName, int year)
 {
@@ -153,43 +150,144 @@ static int fromShortMonthName(QStringView monthName, int year)
 }
 #endif // textdate
 
-#if QT_CONFIG(datestring)
+#if QT_CONFIG(datestring) // depends on, so implies, textdate
 struct ParsedRfcDateTime {
     QDate date;
     QTime time;
     int utcOffset;
 };
 
+static int shortDayFromName(QStringView name)
+{
+    const char16_t shortDayNames[] = u"MonTueWedThuFriSatSun";
+    for (int i = 0; i < 7; i++) {
+        if (name == QStringView(shortDayNames + 3 * i, 3))
+            return i + 1;
+    }
+    return 0;
+}
+
 static ParsedRfcDateTime rfcDateImpl(const QString &s)
 {
+    // Matches "[ddd,] dd MMM yyyy[ hh:mm[:ss]] [±hhmm]" - correct RFC 822, 2822, 5322 format -
+    // or           "ddd MMM dd[ hh:mm:ss] yyyy [±hhmm]" - permissive RFC 850, 1036 (read only)
     ParsedRfcDateTime result;
 
-    // Matches "[ddd,] dd MMM yyyy[ hh:mm[:ss]] [±hhmm]" - correct RFC 822, 2822, 5322 format
-    QRegExp rex(QStringLiteral("^[ \\t]*(?:[A-Z][a-z]+,)?[ \\t]*(\\d{1,2})[ \\t]+([A-Z][a-z]+)[ \\t]+(\\d\\d\\d\\d)(?:[ \\t]+(\\d\\d):(\\d\\d)(?::(\\d\\d))?)?[ \\t]*(?:([+-])(\\d\\d)(\\d\\d))?"));
-    if (s.indexOf(rex) == 0) {
-        const QStringList cap = rex.capturedTexts();
-        result.date = QDate(cap[3].toInt(), qt_monthNumberFromShortName(cap[2]), cap[1].toInt());
-        if (!cap[4].isEmpty())
-            result.time = QTime(cap[4].toInt(), cap[5].toInt(), cap[6].toInt());
-        const bool positiveOffset = (cap[7] == QLatin1String("+"));
-        const int hourOffset = cap[8].toInt();
-        const int minOffset = cap[9].toInt();
-        result.utcOffset = ((hourOffset * 60 + minOffset) * (positiveOffset ? 60 : -60));
-    } else {
-        // Matches "ddd MMM dd[ hh:mm:ss] yyyy [±hhmm]" - permissive RFC 850, 1036 (read only)
-        QRegExp rex(QStringLiteral("^[ \\t]*[A-Z][a-z]+[ \\t]+([A-Z][a-z]+)[ \\t]+(\\d\\d)(?:[ \\t]+(\\d\\d):(\\d\\d):(\\d\\d))?[ \\t]+(\\d\\d\\d\\d)[ \\t]*(?:([+-])(\\d\\d)(\\d\\d))?"));
-        if (s.indexOf(rex) == 0) {
-            const QStringList cap = rex.capturedTexts();
-            result.date = QDate(cap[6].toInt(), qt_monthNumberFromShortName(cap[1]), cap[2].toInt());
-            if (!cap[3].isEmpty())
-                result.time = QTime(cap[3].toInt(), cap[4].toInt(), cap[5].toInt());
-            const bool positiveOffset = (cap[7] == QLatin1String("+"));
-            const int hourOffset = cap[8].toInt();
-            const int minOffset = cap[9].toInt();
-            result.utcOffset = ((hourOffset * 60 + minOffset) * (positiveOffset ? 60 : -60));
+    auto words = s.splitRef(QLatin1Char(' '), Qt::SkipEmptyParts);
+    if (words.size() < 3 || words.size() > 6)
+        return result;
+    const QChar colon(QLatin1Char(':'));
+    const QLocale C = QLocale::c();
+    bool ok = true;
+    QDate date;
+
+    const auto isShortName = [](QStringView name) {
+        return (name.length() == 3 && name.at(0).isUpper()
+                && name.at(1).isLower() && name.at(2).isLower());
+    };
+
+    /* Reject entirely (return) if the string is malformed; however, if the date
+     * is merely invalid, (break, so as to) go on to parsing of the time.
+     */
+    int yearIndex;
+    do { // "loop" so that we can use break on merely invalid, but "right shape" date.
+        QStringView dayName;
+        bool rfcX22 = true;
+        if (words.at(0).endsWith(QLatin1Char(','))) {
+            dayName = words.takeFirst().chopped(1);
+        } else if (!words.at(0).at(0).isDigit()) {
+            dayName = words.takeFirst();
+            rfcX22 = false;
+        } // else: dayName is not specified (so we can only be RFC *22)
+        if (words.size() < 3 || words.size() > 5)
+            return result;
+
+        // Don't break before setting yearIndex.
+        int dayIndex, monthIndex;
+        if (rfcX22) {
+            // dd MMM yyyy [hh:mm[:ss]] [±hhmm]
+            dayIndex = 0;
+            monthIndex = 1;
+            yearIndex = 2;
+        } else {
+            // MMM dd[ hh:mm:ss] yyyy [±hhmm]
+            dayIndex = 1;
+            monthIndex = 0;
+            yearIndex = words.size() > 3 && words.at(2).contains(colon) ? 3 : 2;
+        }
+
+        int dayOfWeek = 0;
+        if (!dayName.isEmpty()) {
+            if (!isShortName(dayName))
+                return result;
+            dayOfWeek = shortDayFromName(dayName);
+            if (!dayOfWeek)
+                break;
         }
+
+        const int day = words.at(dayIndex).toInt(&ok);
+        if (!ok)
+            return result;
+        const int year = words.at(yearIndex).toInt(&ok);
+        if (!ok)
+            return result;
+        const QStringView monthName = words.at(monthIndex);
+        if (!isShortName(monthName))
+            return result;
+        int month = fromShortMonthName(monthName, year);
+        if (month < 0)
+            break;
+
+        date = QDate(year, month, day);
+        if (dayOfWeek && date.dayOfWeek() != dayOfWeek)
+            date = QDate();
+    } while (false);
+    words.remove(yearIndex);
+    words.remove(0, 2); // month and day-of-month, in some order
+
+    // Time: [hh:mm[:ss]]
+    QTime time;
+    if (words.size() && words.at(0).contains(colon)) {
+        const QStringView when = words.takeFirst();
+        if (when.at(2) != colon || (when.size() == 8 ? when.at(5) != colon : when.size() > 5))
+            return result;
+        const int hour = C.toInt(when.left(2), &ok);
+        if (!ok)
+            return result;
+        const int minute = C.toInt(when.mid(3, 2), &ok);
+        if (!ok)
+            return result;
+        const auto secs = when.size() == 8 ? C.toInt(when.right(2), &ok) : 0;
+        if (!ok)
+            return result;
+        time = QTime(hour, minute, secs);
     }
 
+    // Offset: [±hhmm]
+    int offset = 0;
+    if (words.size()) {
+        const QStringView zone = words.takeFirst();
+        if (words.size() || !(zone.size() == 3 || zone.size() == 5))
+            return result;
+        bool negate = false;
+        if (zone.at(0) == QLatin1Char('-'))
+            negate = true;
+        else if (zone.at(0) != QLatin1Char('+'))
+            return result;
+        const int hour = C.toInt(zone.mid(1, 2), &ok);
+        if (!ok)
+            return result;
+        const auto minute = zone.size() > 3 ? C.toInt(zone.mid(3, 2), &ok) : 0;
+        if (!ok)
+            return result;
+        offset = (hour * 60 + minute) * 60;
+        if (negate)
+            offset = -offset;
+    }
+
+    result.date = date;
+    result.time = time;
+    result.utcOffset = offset;
     return result;
 }
 #endif // datestring
@@ -1561,7 +1659,7 @@ QDate QDate::addYears(int nyears) const
     \sa addDays()
 */
 
-qint64 QDate::daysTo(const QDate &d) const
+qint64 QDate::daysTo(QDate d) const
 {
     if (isNull() || d.isNull())
         return 0;
@@ -1572,7 +1670,7 @@ qint64 QDate::daysTo(const QDate &d) const
 
 
 /*!
-    \fn bool QDate::operator==(const QDate &d) const
+    \fn bool QDate::operator==(QDate d) const
 
     Returns \c true if this date is equal to \a d; otherwise returns
     false.
@@ -1580,35 +1678,35 @@ qint64 QDate::daysTo(const QDate &d) const
 */
 
 /*!
-    \fn bool QDate::operator!=(const QDate &d) const
+    \fn bool QDate::operator!=(QDate d) const
 
     Returns \c true if this date is different from \a d; otherwise
     returns \c false.
 */
 
 /*!
-    \fn bool QDate::operator<(const QDate &d) const
+    \fn bool QDate::operator<(QDate d) const
 
     Returns \c true if this date is earlier than \a d; otherwise returns
     false.
 */
 
 /*!
-    \fn bool QDate::operator<=(const QDate &d) const
+    \fn bool QDate::operator<=(QDate d) const
 
     Returns \c true if this date is earlier than or equal to \a d;
     otherwise returns \c false.
 */
 
 /*!
-    \fn bool QDate::operator>(const QDate &d) const
+    \fn bool QDate::operator>(QDate d) const
 
     Returns \c true if this date is later than \a d; otherwise returns
     false.
 */
 
 /*!
-    \fn bool QDate::operator>=(const QDate &d) const
+    \fn bool QDate::operator>=(QDate d) const
 
     Returns \c true if this date is later than or equal to \a d;
     otherwise returns \c false.
@@ -2219,7 +2317,7 @@ QTime QTime::addSecs(int s) const
     \sa addSecs(), QDateTime::secsTo()
 */
 
-int QTime::secsTo(const QTime &t) const
+int QTime::secsTo(QTime t) const
 {
     if (!isValid() || !t.isValid())
         return 0;
@@ -2271,7 +2369,7 @@ QTime QTime::addMSecs(int ms) const
     \sa secsTo(), addMSecs(), QDateTime::msecsTo()
 */
 
-int QTime::msecsTo(const QTime &t) const
+int QTime::msecsTo(QTime t) const
 {
     if (!isValid() || !t.isValid())
         return 0;
@@ -2280,38 +2378,38 @@ int QTime::msecsTo(const QTime &t) const
 
 
 /*!
-    \fn bool QTime::operator==(const QTime &t) const
+    \fn bool QTime::operator==(QTime t) const
 
     Returns \c true if this time is equal to \a t; otherwise returns \c false.
 */
 
 /*!
-    \fn bool QTime::operator!=(const QTime &t) const
+    \fn bool QTime::operator!=(QTime t) const
 
     Returns \c true if this time is different from \a t; otherwise returns \c false.
 */
 
 /*!
-    \fn bool QTime::operator<(const QTime &t) const
+    \fn bool QTime::operator<(QTime t) const
 
     Returns \c true if this time is earlier than \a t; otherwise returns \c false.
 */
 
 /*!
-    \fn bool QTime::operator<=(const QTime &t) const
+    \fn bool QTime::operator<=(QTime t) const
 
     Returns \c true if this time is earlier than or equal to \a t;
     otherwise returns \c false.
 */
 
 /*!
-    \fn bool QTime::operator>(const QTime &t) const
+    \fn bool QTime::operator>(QTime t) const
 
     Returns \c true if this time is later than \a t; otherwise returns \c false.
 */
 
 /*!
-    \fn bool QTime::operator>=(const QTime &t) const
+    \fn bool QTime::operator>=(QTime t) const
 
     Returns \c true if this time is later than or equal to \a t;
     otherwise returns \c false.
@@ -3437,7 +3535,7 @@ inline QDateTimePrivate *QDateTime::Data::operator->()
  *****************************************************************************/
 
 Q_NEVER_INLINE
-QDateTime::Data QDateTimePrivate::create(const QDate &toDate, const QTime &toTime, Qt::TimeSpec toSpec,
+QDateTime::Data QDateTimePrivate::create(QDate toDate, QTime toTime, Qt::TimeSpec toSpec,
                                          int offsetSeconds)
 {
     QDateTime::Data result(toSpec);
@@ -3447,7 +3545,7 @@ QDateTime::Data QDateTimePrivate::create(const QDate &toDate, const QTime &toTim
 }
 
 #if QT_CONFIG(timezone)
-inline QDateTime::Data QDateTimePrivate::create(const QDate &toDate, const QTime &toTime,
+inline QDateTime::Data QDateTimePrivate::create(QDate toDate, QTime toTime,
                                                 const QTimeZone &toTimeZone)
 {
     QDateTime::Data result(Qt::TimeZone);
@@ -3652,7 +3750,7 @@ QDateTime::QDateTime() noexcept(Data::CanBeSmall)
 
     \sa QDate::startOfDay()
 */
-QDateTime::QDateTime(const QDate &date)
+QDateTime::QDateTime(QDate date)
     : QDateTime(date.startOfDay(Qt::LocalTime, 0))
 {
 }
@@ -3660,28 +3758,6 @@ QDateTime::QDateTime(const QDate &date)
 
 /*!
     Constructs a datetime with the given \a date and \a time, using
-    the time specification defined by \a spec.
-
-    If \a date is valid and \a time is not, the time will be set to midnight.
-
-    If \a spec is Qt::OffsetFromUTC then it will be set to Qt::UTC, i.e. an
-    offset of 0 seconds. To create a Qt::OffsetFromUTC datetime use the
-    correct constructor.
-
-    If \a spec is Qt::TimeZone then the spec will be set to Qt::LocalTime,
-    i.e. the current system time zone.  To create a Qt::TimeZone datetime
-    use the correct constructor.
-*/
-
-QDateTime::QDateTime(const QDate &date, const QTime &time, Qt::TimeSpec spec)
-    : d(QDateTimePrivate::create(date, time, spec, 0))
-{
-}
-
-/*!
-    \since 5.2
-
-    Constructs a datetime with the given \a date and \a time, using
     the time specification defined by \a spec and \a offsetSeconds seconds.
 
     If \a date is valid and \a time is not, the time will be set to midnight.
@@ -3696,7 +3772,7 @@ QDateTime::QDateTime(const QDate &date, const QTime &time, Qt::TimeSpec spec)
     use the correct constructor.
 */
 
-QDateTime::QDateTime(const QDate &date, const QTime &time, Qt::TimeSpec spec, int offsetSeconds)
+QDateTime::QDateTime(QDate date, QTime time, Qt::TimeSpec spec, int offsetSeconds)
          : d(QDateTimePrivate::create(date, time, spec, offsetSeconds))
 {
 }
@@ -3713,7 +3789,7 @@ QDateTime::QDateTime(const QDate &date, const QTime &time, Qt::TimeSpec spec, in
     If \a timeZone is invalid then the datetime will be invalid.
 */
 
-QDateTime::QDateTime(const QDate &date, const QTime &time, const QTimeZone &timeZone)
+QDateTime::QDateTime(QDate date, QTime time, const QTimeZone &timeZone)
     : d(QDateTimePrivate::create(date, time, timeZone))
 {
 }
@@ -4001,7 +4077,7 @@ bool QDateTime::isDaylightTime() const
     \sa date(), setTime(), setTimeSpec()
 */
 
-void QDateTime::setDate(const QDate &date)
+void QDateTime::setDate(QDate date)
 {
     setDateTime(d, date, time());
 }
@@ -4019,7 +4095,7 @@ void QDateTime::setDate(const QDate &date)
     \sa time(), setDate(), setTimeSpec()
 */
 
-void QDateTime::setTime(const QTime &time)
+void QDateTime::setTime(QTime time)
 {
     setDateTime(d, date(), time);
 }
@@ -5307,7 +5383,7 @@ QT_WARNING_POP
             isoString.chop(1); // trim 'Z'
         } else {
             // the loop below is faster but functionally equal to:
-            // const int signIndex = isoString.indexOf(QRegExp(QStringLiteral("[+-]")));
+            // const int signIndex = isoString.indexOf(QRegulargExpression(QStringLiteral("[+-]")));
             int signIndex = isoString.size() - 1;
             Q_ASSERT(signIndex >= 0);
             bool found = false;
@@ -5575,7 +5651,7 @@ QDateTime QDateTime::fromString(const QString &string, const QString &format)
     \sa {Serializing Qt Data Types}
 */
 
-QDataStream &operator<<(QDataStream &out, const QDate &date)
+QDataStream &operator<<(QDataStream &out, QDate date)
 {
     if (out.version() < QDataStream::Qt_5_0)
         return out << quint32(date.jd);
@@ -5615,7 +5691,7 @@ QDataStream &operator>>(QDataStream &in, QDate &date)
     \sa {Serializing Qt Data Types}
 */
 
-QDataStream &operator<<(QDataStream &out, const QTime &time)
+QDataStream &operator<<(QDataStream &out, QTime time)
 {
     if (out.version() >= QDataStream::Qt_4_0) {
         return out << quint32(time.mds);
@@ -5795,7 +5871,7 @@ QDataStream &operator>>(QDataStream &in, QDateTime &dateTime)
 *****************************************************************************/
 
 #if !defined(QT_NO_DEBUG_STREAM) && QT_CONFIG(datestring)
-QDebug operator<<(QDebug dbg, const QDate &date)
+QDebug operator<<(QDebug dbg, QDate date)
 {
     QDebugStateSaver saver(dbg);
     dbg.nospace() << "QDate(";
@@ -5807,7 +5883,7 @@ QDebug operator<<(QDebug dbg, const QDate &date)
     return dbg;
 }
 
-QDebug operator<<(QDebug dbg, const QTime &time)
+QDebug operator<<(QDebug dbg, QTime time)
 {
     QDebugStateSaver saver(dbg);
     dbg.nospace() << "QTime(";
@@ -5863,24 +5939,24 @@ uint qHash(const QDateTime &key, uint seed)
     return key.isValid() ? qHash(key.toMSecsSinceEpoch(), seed) : seed;
 }
 
-/*! \fn uint qHash(const QDate &key, uint seed = 0)
+/*! \fn uint qHash(QDate key, uint seed = 0)
     \relates QHash
     \since 5.0
 
     Returns the hash value for the \a key, using \a seed to seed the calculation.
 */
-uint qHash(const QDate &key, uint seed) noexcept
+uint qHash(QDate key, uint seed) noexcept
 {
     return qHash(key.toJulianDay(), seed);
 }
 
-/*! \fn uint qHash(const QTime &key, uint seed = 0)
+/*! \fn uint qHash(QTime key, uint seed = 0)
     \relates QHash
     \since 5.0
 
     Returns the hash value for the \a key, using \a seed to seed the calculation.
 */
-uint qHash(const QTime &key, uint seed) noexcept
+uint qHash(QTime key, uint seed) noexcept
 {
     return qHash(key.msecsSinceStartOfDay(), seed);
 }
diff --git a/src/corelib/time/qdatetime.h b/src/corelib/time/qdatetime.h
index 645923ada8..b1a3e0b1d6 100644
--- a/src/corelib/time/qdatetime.h
+++ b/src/corelib/time/qdatetime.h
@@ -143,14 +143,14 @@ public:
     Q_REQUIRED_RESULT QDate addYears(int years) const;
     Q_REQUIRED_RESULT QDate addMonths(int months, QCalendar cal) const;
     Q_REQUIRED_RESULT QDate addYears(int years, QCalendar cal) const;
-    qint64 daysTo(const QDate &) const; // ### Qt 6: QDate
+    qint64 daysTo(QDate d) const;
 
-    Q_DECL_CONSTEXPR bool operator==(const QDate &other) const { return jd == other.jd; }
-    Q_DECL_CONSTEXPR bool operator!=(const QDate &other) const { return jd != other.jd; }
-    Q_DECL_CONSTEXPR bool operator< (const QDate &other) const { return jd <  other.jd; }
-    Q_DECL_CONSTEXPR bool operator<=(const QDate &other) const { return jd <= other.jd; }
-    Q_DECL_CONSTEXPR bool operator> (const QDate &other) const { return jd >  other.jd; }
-    Q_DECL_CONSTEXPR bool operator>=(const QDate &other) const { return jd >= other.jd; }
+    Q_DECL_CONSTEXPR bool operator==(QDate other) const { return jd == other.jd; }
+    Q_DECL_CONSTEXPR bool operator!=(QDate other) const { return jd != other.jd; }
+    Q_DECL_CONSTEXPR bool operator< (QDate other) const { return jd <  other.jd; }
+    Q_DECL_CONSTEXPR bool operator<=(QDate other) const { return jd <= other.jd; }
+    Q_DECL_CONSTEXPR bool operator> (QDate other) const { return jd >  other.jd; }
+    Q_DECL_CONSTEXPR bool operator>=(QDate other) const { return jd >= other.jd; }
 
     static QDate currentDate();
 #if QT_CONFIG(datestring)
@@ -176,7 +176,7 @@ private:
     friend class QDateTime;
     friend class QDateTimePrivate;
 #ifndef QT_NO_DATASTREAM
-    friend Q_CORE_EXPORT QDataStream &operator<<(QDataStream &, const QDate &);
+    friend Q_CORE_EXPORT QDataStream &operator<<(QDataStream &, QDate);
     friend Q_CORE_EXPORT QDataStream &operator>>(QDataStream &, QDate &);
 #endif
 };
@@ -208,16 +208,16 @@ public:
     bool setHMS(int h, int m, int s, int ms = 0);
 
     Q_REQUIRED_RESULT QTime addSecs(int secs) const;
-    int secsTo(const QTime &) const; // ### Qt 6: plain QTime
+    int secsTo(QTime t) const;
     Q_REQUIRED_RESULT QTime addMSecs(int ms) const;
-    int msecsTo(const QTime &) const; // ### Qt 6: plain QTime
+    int msecsTo(QTime t) const;
 
-    Q_DECL_CONSTEXPR bool operator==(const QTime &other) const { return mds == other.mds; }
-    Q_DECL_CONSTEXPR bool operator!=(const QTime &other) const { return mds != other.mds; }
-    Q_DECL_CONSTEXPR bool operator< (const QTime &other) const { return mds <  other.mds; }
-    Q_DECL_CONSTEXPR bool operator<=(const QTime &other) const { return mds <= other.mds; }
-    Q_DECL_CONSTEXPR bool operator> (const QTime &other) const { return mds >  other.mds; }
-    Q_DECL_CONSTEXPR bool operator>=(const QTime &other) const { return mds >= other.mds; }
+    Q_DECL_CONSTEXPR bool operator==(QTime other) const { return mds == other.mds; }
+    Q_DECL_CONSTEXPR bool operator!=(QTime other) const { return mds != other.mds; }
+    Q_DECL_CONSTEXPR bool operator< (QTime other) const { return mds <  other.mds; }
+    Q_DECL_CONSTEXPR bool operator<=(QTime other) const { return mds <= other.mds; }
+    Q_DECL_CONSTEXPR bool operator> (QTime other) const { return mds >  other.mds; }
+    Q_DECL_CONSTEXPR bool operator>=(QTime other) const { return mds >= other.mds; }
 
     static Q_DECL_CONSTEXPR inline QTime fromMSecsSinceStartOfDay(int msecs) { return QTime(msecs); }
     Q_DECL_CONSTEXPR inline int msecsSinceStartOfDay() const { return mds == NullTime ? 0 : mds; }
@@ -241,8 +241,8 @@ private:
 
     friend class QDateTime;
     friend class QDateTimePrivate;
-#ifndef QT_NO_DATASTREAM // ### Qt 6: plain QTime
-    friend Q_CORE_EXPORT QDataStream &operator<<(QDataStream &, const QTime &);
+#ifndef QT_NO_DATASTREAM
+    friend Q_CORE_EXPORT QDataStream &operator<<(QDataStream &, QTime);
     friend Q_CORE_EXPORT QDataStream &operator>>(QDataStream &, QTime &);
 #endif
 };
@@ -293,13 +293,11 @@ class Q_CORE_EXPORT QDateTime
 public:
     QDateTime() noexcept(Data::CanBeSmall);
 #if QT_DEPRECATED_SINCE(5, 15) // ### Qt 6: remove
-    QT_DEPRECATED_X("Use QDate::startOfDay()") explicit QDateTime(const QDate &);
+    QT_DEPRECATED_X("Use QDate::startOfDay()") explicit QDateTime(QDate);
 #endif
-    QDateTime(const QDate &, const QTime &, Qt::TimeSpec spec = Qt::LocalTime);
-    // ### Qt 6: Merge with above with default offsetSeconds = 0
-    QDateTime(const QDate &date, const QTime &time, Qt::TimeSpec spec, int offsetSeconds);
+    QDateTime(QDate date, QTime time, Qt::TimeSpec spec = Qt::LocalTime, int offsetSeconds = 0);
 #if QT_CONFIG(timezone)
-    QDateTime(const QDate &date, const QTime &time, const QTimeZone &timeZone);
+    QDateTime(QDate date, QTime time, const QTimeZone &timeZone);
 #endif // timezone
     QDateTime(const QDateTime &other) noexcept;
     QDateTime(QDateTime &&other) noexcept;
@@ -326,8 +324,8 @@ public:
     qint64 toMSecsSinceEpoch() const;
     qint64 toSecsSinceEpoch() const;
 
-    void setDate(const QDate &date); // ### Qt 6: plain QDate
-    void setTime(const QTime &time);
+    void setDate(QDate date);
+    void setTime(QTime time);
     void setTimeSpec(Qt::TimeSpec spec);
     void setOffsetFromUtc(int offsetSeconds);
 #if QT_CONFIG(timezone)
@@ -433,25 +431,25 @@ private:
 Q_DECLARE_SHARED(QDateTime)
 
 #ifndef QT_NO_DATASTREAM
-Q_CORE_EXPORT QDataStream &operator<<(QDataStream &, const QDate &);
+Q_CORE_EXPORT QDataStream &operator<<(QDataStream &, QDate);
 Q_CORE_EXPORT QDataStream &operator>>(QDataStream &, QDate &);
-Q_CORE_EXPORT QDataStream &operator<<(QDataStream &, const QTime &);
+Q_CORE_EXPORT QDataStream &operator<<(QDataStream &, QTime);
 Q_CORE_EXPORT QDataStream &operator>>(QDataStream &, QTime &);
 Q_CORE_EXPORT QDataStream &operator<<(QDataStream &, const QDateTime &);
 Q_CORE_EXPORT QDataStream &operator>>(QDataStream &, QDateTime &);
 #endif // QT_NO_DATASTREAM
 
 #if !defined(QT_NO_DEBUG_STREAM) && QT_CONFIG(datestring)
-Q_CORE_EXPORT QDebug operator<<(QDebug, const QDate &);
-Q_CORE_EXPORT QDebug operator<<(QDebug, const QTime &);
+Q_CORE_EXPORT QDebug operator<<(QDebug, QDate);
+Q_CORE_EXPORT QDebug operator<<(QDebug, QTime);
 Q_CORE_EXPORT QDebug operator<<(QDebug, const QDateTime &);
 #endif
 
 // QDateTime is not noexcept for now -- to be revised once
 // timezone and calendaring support is added
 Q_CORE_EXPORT uint qHash(const QDateTime &key, uint seed = 0);
-Q_CORE_EXPORT uint qHash(const QDate &key, uint seed = 0) noexcept;
-Q_CORE_EXPORT uint qHash(const QTime &key, uint seed = 0) noexcept;
+Q_CORE_EXPORT uint qHash(QDate key, uint seed = 0) noexcept;
+Q_CORE_EXPORT uint qHash(QTime key, uint seed = 0) noexcept;
 
 QT_END_NAMESPACE
 
diff --git a/src/corelib/time/qdatetime_p.h b/src/corelib/time/qdatetime_p.h
index f4f00a8b9b..c500b023c4 100644
--- a/src/corelib/time/qdatetime_p.h
+++ b/src/corelib/time/qdatetime_p.h
@@ -110,11 +110,11 @@ public:
         DaylightMask        = SetToStandardTime | SetToDaylightTime
     };
 
-    static QDateTime::Data create(const QDate &toDate, const QTime &toTime, Qt::TimeSpec toSpec,
+    static QDateTime::Data create(QDate toDate, QTime toTime, Qt::TimeSpec toSpec,
                                   int offsetSeconds);
 
 #if QT_CONFIG(timezone)
-    static QDateTime::Data create(const QDate &toDate, const QTime &toTime, const QTimeZone & timeZone);
+    static QDateTime::Data create(QDate toDate, QTime toTime, const QTimeZone & timeZone);
 #endif // timezone
 
     StatusFlags m_status = StatusFlag(Qt::LocalTime << TimeSpecShift);
diff --git a/src/corelib/time/qdatetimeparser_p.h b/src/corelib/time/qdatetimeparser_p.h
index 5c612ef6a4..bc390db223 100644
--- a/src/corelib/time/qdatetimeparser_p.h
+++ b/src/corelib/time/qdatetimeparser_p.h
@@ -77,7 +77,6 @@ QT_BEGIN_NAMESPACE
 
 class Q_CORE_EXPORT QDateTimeParser
 {
-    Q_DECLARE_TR_FUNCTIONS(QDateTimeParser)
 public:
     enum Context {
         FromString,
@@ -267,10 +266,11 @@ protected: // for the benefit of QDateTimeEditPrivate
         return skipToNextSection(section, current, QStringRef(&sectionText));
     }
     QString stateName(State s) const;
+    QString getAmPmText(AmPm ap, Case cs) const;
+
     virtual QDateTime getMinimum() const;
     virtual QDateTime getMaximum() const;
     virtual int cursorPosition() const { return -1; }
-    virtual QString getAmPmText(AmPm ap, Case cs) const;
     virtual QLocale locale() const { return defaultLocale; }
 
     mutable int currentSectionIndex;
diff --git a/src/corelib/time/qhijricalendar.cpp b/src/corelib/time/qhijricalendar.cpp
index b5d89fbc5c..c0f7662c0d 100644
--- a/src/corelib/time/qhijricalendar.cpp
+++ b/src/corelib/time/qhijricalendar.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2019 The Qt Company Ltd.
+** Copyright (C) 2020 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtCore module of the Qt Toolkit.
@@ -118,7 +118,7 @@ const QCalendarLocale *QHijriCalendar::localeMonthIndexData() const
     return locale_data;
 }
 
-const ushort *QHijriCalendar::localeMonthData() const
+const char16_t *QHijriCalendar::localeMonthData() const
 {
     return months_data;
 }
diff --git a/src/corelib/time/qhijricalendar_data_p.h b/src/corelib/time/qhijricalendar_data_p.h
index 66039e9e5d..2708db66be 100644
--- a/src/corelib/time/qhijricalendar_data_p.h
+++ b/src/corelib/time/qhijricalendar_data_p.h
@@ -59,7 +59,7 @@ QT_BEGIN_NAMESPACE
 // GENERATED PART STARTS HERE
 
 /*
-    This part of the file was generated on 2019-10-24 from the
+    This part of the file was generated on 2020-01-30 from the
     Common Locale Data Repository v36
 
     http://www.unicode.org/cldr/
@@ -70,1133 +70,1141 @@ QT_BEGIN_NAMESPACE
 */
 
 static const QCalendarLocale locale_data[] = {
-   //  lang   script terr   sShort  sLong   sNarrow short   long    narrow
-      {     1,     0,     0,{ 0,79 },{ 79,107 },{ 186,29 },{ 0,79 },{ 79,107 },{ 186,29 }}, // C/AnyScript/AnyCountry
-       {     3,     7,    69,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Oromo/Latin/Ethiopia
-       {     3,     7,   111,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Oromo/Latin/Kenya
-       {     4,     7,    69,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Afar/Latin/Ethiopia
-       {     5,     7,   195,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Afrikaans/Latin/South Africa
-       {     5,     7,   148,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Afrikaans/Latin/Namibia
-       {     6,     7,     2,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Albanian/Latin/Albania
-       {     6,     7,   127,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Albanian/Latin/Macedonia
-       {     6,     7,   257,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Albanian/Latin/Kosovo
-       {     7,    14,    69,{ 0,79 },{ 242,75 },{ 215,27 },{ 0,79 },{ 242,75 },{ 215,27 }}, // Amharic/Ethiopic/Ethiopia
-       {     8,     1,    64,{ 317,97 },{ 317,97 },{ 414,27 },{ 317,97 },{ 317,97 },{ 414,27 }}, // Arabic/Arabic/Egypt
-       {     8,     1,     3,{ 317,97 },{ 317,97 },{ 414,27 },{ 317,97 },{ 317,97 },{ 414,27 }}, // Arabic/Arabic/Algeria
-       {     8,     1,    17,{ 317,97 },{ 317,97 },{ 414,27 },{ 317,97 },{ 317,97 },{ 414,27 }}, // Arabic/Arabic/Bahrain
-       {     8,     1,    42,{ 317,97 },{ 317,97 },{ 414,27 },{ 317,97 },{ 317,97 },{ 414,27 }}, // Arabic/Arabic/Chad
-       {     8,     1,    48,{ 317,97 },{ 317,97 },{ 414,27 },{ 317,97 },{ 317,97 },{ 414,27 }}, // Arabic/Arabic/Comoros
-       {     8,     1,    59,{ 317,97 },{ 317,97 },{ 414,27 },{ 317,97 },{ 317,97 },{ 414,27 }}, // Arabic/Arabic/Djibouti
-       {     8,     1,    67,{ 317,97 },{ 317,97 },{ 414,27 },{ 317,97 },{ 317,97 },{ 414,27 }}, // Arabic/Arabic/Eritrea
-       {     8,     1,   103,{ 317,97 },{ 317,97 },{ 414,27 },{ 317,97 },{ 317,97 },{ 414,27 }}, // Arabic/Arabic/Iraq
-       {     8,     1,   105,{ 317,97 },{ 317,97 },{ 414,27 },{ 317,97 },{ 317,97 },{ 414,27 }}, // Arabic/Arabic/Israel
-       {     8,     1,   109,{ 317,97 },{ 317,97 },{ 414,27 },{ 317,97 },{ 317,97 },{ 414,27 }}, // Arabic/Arabic/Jordan
-       {     8,     1,   115,{ 317,97 },{ 317,97 },{ 414,27 },{ 317,97 },{ 317,97 },{ 414,27 }}, // Arabic/Arabic/Kuwait
-       {     8,     1,   119,{ 317,97 },{ 317,97 },{ 414,27 },{ 317,97 },{ 317,97 },{ 414,27 }}, // Arabic/Arabic/Lebanon
-       {     8,     1,   122,{ 317,97 },{ 317,97 },{ 414,27 },{ 317,97 },{ 317,97 },{ 414,27 }}, // Arabic/Arabic/Libya
-       {     8,     1,   136,{ 317,97 },{ 317,97 },{ 414,27 },{ 317,97 },{ 317,97 },{ 414,27 }}, // Arabic/Arabic/Mauritania
-       {     8,     1,   145,{ 317,97 },{ 317,97 },{ 414,27 },{ 317,97 },{ 317,97 },{ 414,27 }}, // Arabic/Arabic/Morocco
-       {     8,     1,   162,{ 317,97 },{ 317,97 },{ 414,27 },{ 317,97 },{ 317,97 },{ 414,27 }}, // Arabic/Arabic/Oman
-       {     8,     1,   165,{ 317,97 },{ 317,97 },{ 414,27 },{ 317,97 },{ 317,97 },{ 414,27 }}, // Arabic/Arabic/Palestinian Territories
-       {     8,     1,   175,{ 317,97 },{ 317,97 },{ 414,27 },{ 317,97 },{ 317,97 },{ 414,27 }}, // Arabic/Arabic/Qatar
-       {     8,     1,   186,{ 317,97 },{ 317,97 },{ 414,27 },{ 317,97 },{ 317,97 },{ 414,27 }}, // Arabic/Arabic/Saudi Arabia
-       {     8,     1,   194,{ 317,97 },{ 317,97 },{ 414,27 },{ 317,97 },{ 317,97 },{ 414,27 }}, // Arabic/Arabic/Somalia
-       {     8,     1,   201,{ 317,97 },{ 317,97 },{ 414,27 },{ 317,97 },{ 317,97 },{ 414,27 }}, // Arabic/Arabic/Sudan
-       {     8,     1,   207,{ 317,97 },{ 317,97 },{ 414,27 },{ 317,97 },{ 317,97 },{ 414,27 }}, // Arabic/Arabic/Syria
-       {     8,     1,   216,{ 317,97 },{ 317,97 },{ 414,27 },{ 317,97 },{ 317,97 },{ 414,27 }}, // Arabic/Arabic/Tunisia
-       {     8,     1,   223,{ 317,97 },{ 317,97 },{ 414,27 },{ 317,97 },{ 317,97 },{ 414,27 }}, // Arabic/Arabic/United Arab Emirates
-       {     8,     1,   236,{ 317,97 },{ 317,97 },{ 414,27 },{ 317,97 },{ 317,97 },{ 414,27 }}, // Arabic/Arabic/Western Sahara
-       {     8,     1,   237,{ 317,97 },{ 317,97 },{ 414,27 },{ 317,97 },{ 317,97 },{ 414,27 }}, // Arabic/Arabic/Yemen
-       {     8,     1,   254,{ 317,97 },{ 317,97 },{ 414,27 },{ 317,97 },{ 317,97 },{ 414,27 }}, // Arabic/Arabic/South Sudan
-       {     8,     1,   260,{ 317,97 },{ 317,97 },{ 414,27 },{ 317,97 },{ 317,97 },{ 414,27 }}, // Arabic/Arabic/World
-       {     9,    10,    11,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Armenian/Armenian/Armenia
-       {    10,    11,   100,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Assamese/Bengali/India
-       {    12,     7,    15,{ 441,72 },{ 513,111 },{ 215,27 },{ 441,72 },{ 513,111 },{ 215,27 }}, // Azerbaijani/Latin/Azerbaijan
-       {    12,     1,   102,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Azerbaijani/Arabic/Iran
-       {    12,     2,    15,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Azerbaijani/Cyrillic/Azerbaijan
-       {    13,     2,   178,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Bashkir/Cyrillic/Russia
-       {    14,     7,   197,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Basque/Latin/Spain
-       {    15,    11,    18,{ 624,105 },{ 624,105 },{ 729,27 },{ 624,105 },{ 624,105 },{ 729,27 }}, // Bengali/Bengali/Bangladesh
-       {    15,    11,   100,{ 624,105 },{ 624,105 },{ 729,27 },{ 624,105 },{ 624,105 },{ 729,27 }}, // Bengali/Bengali/India
-       {    16,    31,    25,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Dzongkha/Tibetan/Bhutan
-       {    19,     7,    74,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Breton/Latin/France
-       {    20,     2,    33,{ 0,79 },{ 756,97 },{ 215,27 },{ 0,79 },{ 756,97 },{ 215,27 }}, // Bulgarian/Cyrillic/Bulgaria
-       {    21,    25,   147,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Burmese/Myanmar/Myanmar
-       {    22,     2,    20,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Belarusian/Cyrillic/Belarus
-       {    23,    20,    36,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Khmer/Khmer/Cambodia
-       {    24,     7,   197,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Catalan/Latin/Spain
-       {    24,     7,     5,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Catalan/Latin/Andorra
-       {    24,     7,    74,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Catalan/Latin/France
-       {    24,     7,   106,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Catalan/Latin/Italy
-       {    25,     5,    44,{ 853,39 },{ 892,38 },{ 215,27 },{ 853,39 },{ 892,38 },{ 215,27 }}, // Chinese/Simplified Han/China
-       {    25,     5,    97,{ 853,39 },{ 892,38 },{ 215,27 },{ 853,39 },{ 892,38 },{ 215,27 }}, // Chinese/Simplified Han/Hong Kong
-       {    25,     5,   126,{ 853,39 },{ 892,38 },{ 215,27 },{ 853,39 },{ 892,38 },{ 215,27 }}, // Chinese/Simplified Han/Macau
-       {    25,     5,   190,{ 853,39 },{ 892,38 },{ 215,27 },{ 853,39 },{ 892,38 },{ 215,27 }}, // Chinese/Simplified Han/Singapore
-       {    25,     6,    97,{ 930,72 },{ 930,72 },{ 215,27 },{ 930,72 },{ 930,72 },{ 215,27 }}, // Chinese/Traditional Han/Hong Kong
-       {    25,     6,   126,{ 930,72 },{ 930,72 },{ 215,27 },{ 930,72 },{ 930,72 },{ 215,27 }}, // Chinese/Traditional Han/Macau
-       {    25,     6,   208,{ 930,72 },{ 930,72 },{ 215,27 },{ 930,72 },{ 930,72 },{ 215,27 }}, // Chinese/Traditional Han/Taiwan
-       {    26,     7,    74,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Corsican/Latin/France
-       {    27,     7,    54,{ 0,79 },{ 79,107 },{ 1002,39 },{ 0,79 },{ 79,107 },{ 1002,39 }}, // Croatian/Latin/Croatia
-       {    27,     7,    27,{ 0,79 },{ 79,107 },{ 1002,39 },{ 0,79 },{ 79,107 },{ 1002,39 }}, // Croatian/Latin/Bosnia And Herzegowina
-       {    28,     7,    57,{ 1041,77 },{ 1118,130 },{ 215,27 },{ 1041,77 },{ 1118,130 },{ 215,27 }}, // Czech/Latin/Czech Republic
-       {    29,     7,    58,{ 0,79 },{ 1248,107 },{ 215,27 },{ 0,79 },{ 1248,107 },{ 215,27 }}, // Danish/Latin/Denmark
-       {    29,     7,    86,{ 0,79 },{ 1248,107 },{ 215,27 },{ 0,79 },{ 1248,107 },{ 215,27 }}, // Danish/Latin/Greenland
-       {    30,     7,   151,{ 1355,84 },{ 1439,135 },{ 215,27 },{ 1355,84 },{ 1439,135 },{ 215,27 }}, // Dutch/Latin/Netherlands
-       {    30,     7,    12,{ 1355,84 },{ 1439,135 },{ 215,27 },{ 1355,84 },{ 1439,135 },{ 215,27 }}, // Dutch/Latin/Aruba
-       {    30,     7,    21,{ 1355,84 },{ 1439,135 },{ 215,27 },{ 1355,84 },{ 1439,135 },{ 215,27 }}, // Dutch/Latin/Belgium
-       {    30,     7,   152,{ 1355,84 },{ 1439,135 },{ 215,27 },{ 1355,84 },{ 1439,135 },{ 215,27 }}, // Dutch/Latin/Cura Sao
-       {    30,     7,   202,{ 1355,84 },{ 1439,135 },{ 215,27 },{ 1355,84 },{ 1439,135 },{ 215,27 }}, // Dutch/Latin/Suriname
-       {    30,     7,   255,{ 1355,84 },{ 1439,135 },{ 215,27 },{ 1355,84 },{ 1439,135 },{ 215,27 }}, // Dutch/Latin/Bonaire
-       {    30,     7,   256,{ 1355,84 },{ 1439,135 },{ 215,27 },{ 1355,84 },{ 1439,135 },{ 215,27 }}, // Dutch/Latin/Sint Maarten
-       {    31,     7,   225,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // English/Latin/United States
-       {    31,     3,   225,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // English/Deseret/United States
-       {    31,     7,     4,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // English/Latin/American Samoa
-       {    31,     7,     7,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // English/Latin/Anguilla
-       {    31,     7,     9,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // English/Latin/Antigua And Barbuda
-       {    31,     7,    13,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // English/Latin/Australia
-       {    31,     7,    14,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // English/Latin/Austria
-       {    31,     7,    16,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // English/Latin/Bahamas
-       {    31,     7,    19,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // English/Latin/Barbados
-       {    31,     7,    21,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // English/Latin/Belgium
-       {    31,     7,    22,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // English/Latin/Belize
-       {    31,     7,    24,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // English/Latin/Bermuda
-       {    31,     7,    28,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // English/Latin/Botswana
-       {    31,     7,    31,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // English/Latin/British Indian Ocean Territory
-       {    31,     7,    35,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // English/Latin/Burundi
-       {    31,     7,    37,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // English/Latin/Cameroon
-       {    31,     7,    38,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // English/Latin/Canada
-       {    31,     7,    40,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // English/Latin/Cayman Islands
-       {    31,     7,    45,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // English/Latin/Christmas Island
-       {    31,     7,    46,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // English/Latin/Cocos Islands
-       {    31,     7,    51,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // English/Latin/Cook Islands
-       {    31,     7,    56,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // English/Latin/Cyprus
-       {    31,     7,    58,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // English/Latin/Denmark
-       {    31,     7,    60,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // English/Latin/Dominica
-       {    31,     7,    67,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // English/Latin/Eritrea
-       {    31,     7,    70,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // English/Latin/Falkland Islands
-       {    31,     7,    72,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // English/Latin/Fiji
-       {    31,     7,    73,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // English/Latin/Finland
-       {    31,     7,    75,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // English/Latin/Guernsey
-       {    31,     7,    80,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // English/Latin/Gambia
-       {    31,     7,    82,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // English/Latin/Germany
-       {    31,     7,    83,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // English/Latin/Ghana
-       {    31,     7,    84,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // English/Latin/Gibraltar
-       {    31,     7,    87,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // English/Latin/Grenada
-       {    31,     7,    89,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // English/Latin/Guam
-       {    31,     7,    93,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // English/Latin/Guyana
-       {    31,     7,    97,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // English/Latin/Hong Kong
-       {    31,     7,   100,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // English/Latin/India
-       {    31,     7,   104,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // English/Latin/Ireland
-       {    31,     7,   105,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // English/Latin/Israel
-       {    31,     7,   107,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // English/Latin/Jamaica
-       {    31,     7,   111,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // English/Latin/Kenya
-       {    31,     7,   112,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // English/Latin/Kiribati
-       {    31,     7,   120,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // English/Latin/Lesotho
-       {    31,     7,   121,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // English/Latin/Liberia
-       {    31,     7,   126,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // English/Latin/Macau
-       {    31,     7,   128,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // English/Latin/Madagascar
-       {    31,     7,   129,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // English/Latin/Malawi
-       {    31,     7,   130,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // English/Latin/Malaysia
-       {    31,     7,   133,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // English/Latin/Malta
-       {    31,     7,   134,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // English/Latin/Marshall Islands
-       {    31,     7,   137,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // English/Latin/Mauritius
-       {    31,     7,   140,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // English/Latin/Micronesia
-       {    31,     7,   144,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // English/Latin/Montserrat
-       {    31,     7,   148,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // English/Latin/Namibia
-       {    31,     7,   149,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // English/Latin/Nauru
-       {    31,     7,   151,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // English/Latin/Netherlands
-       {    31,     7,   154,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // English/Latin/New Zealand
-       {    31,     7,   157,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // English/Latin/Nigeria
-       {    31,     7,   158,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // English/Latin/Niue
-       {    31,     7,   159,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // English/Latin/Norfolk Island
-       {    31,     7,   160,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // English/Latin/Northern Mariana Islands
-       {    31,     7,   163,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // English/Latin/Pakistan
-       {    31,     7,   164,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // English/Latin/Palau
-       {    31,     7,   167,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // English/Latin/Papua New Guinea
-       {    31,     7,   170,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // English/Latin/Philippines
-       {    31,     7,   171,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // English/Latin/Pitcairn
-       {    31,     7,   174,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // English/Latin/Puerto Rico
-       {    31,     7,   179,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // English/Latin/Rwanda
-       {    31,     7,   180,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // English/Latin/Saint Kitts And Nevis
-       {    31,     7,   181,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // English/Latin/Saint Lucia
-       {    31,     7,   182,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // English/Latin/Saint Vincent And The Grenadines
-       {    31,     7,   183,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // English/Latin/Samoa
-       {    31,     7,   188,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // English/Latin/Seychelles
-       {    31,     7,   189,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // English/Latin/Sierra Leone
-       {    31,     7,   190,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // English/Latin/Singapore
-       {    31,     7,   192,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // English/Latin/Slovenia
-       {    31,     7,   193,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // English/Latin/Solomon Islands
-       {    31,     7,   195,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // English/Latin/South Africa
-       {    31,     7,   199,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // English/Latin/Saint Helena
-       {    31,     7,   201,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // English/Latin/Sudan
-       {    31,     7,   204,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // English/Latin/Swaziland
-       {    31,     7,   205,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // English/Latin/Sweden
-       {    31,     7,   206,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // English/Latin/Switzerland
-       {    31,     7,   210,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // English/Latin/Tanzania
-       {    31,     7,   213,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // English/Latin/Tokelau
-       {    31,     7,   214,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // English/Latin/Tonga
-       {    31,     7,   215,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // English/Latin/Trinidad And Tobago
-       {    31,     7,   219,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // English/Latin/Turks And Caicos Islands
-       {    31,     7,   220,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // English/Latin/Tuvalu
-       {    31,     7,   221,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // English/Latin/Uganda
-       {    31,     7,   223,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // English/Latin/United Arab Emirates
-       {    31,     7,   224,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // English/Latin/United Kingdom
-       {    31,     7,   226,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // English/Latin/United States Minor Outlying Islands
-       {    31,     7,   229,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // English/Latin/Vanuatu
-       {    31,     7,   233,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // English/Latin/British Virgin Islands
-       {    31,     7,   234,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // English/Latin/United States Virgin Islands
-       {    31,     7,   239,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // English/Latin/Zambia
-       {    31,     7,   240,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // English/Latin/Zimbabwe
-       {    31,     7,   249,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // English/Latin/Diego Garcia
-       {    31,     7,   251,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // English/Latin/Isle Of Man
-       {    31,     7,   252,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // English/Latin/Jersey
-       {    31,     7,   254,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // English/Latin/South Sudan
-       {    31,     7,   256,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // English/Latin/Sint Maarten
-       {    31,     7,   260,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // English/Latin/World
-       {    31,     7,   261,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // English/Latin/Europe
-       {    32,     7,   260,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Esperanto/Latin/World
-       {    33,     7,    68,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Estonian/Latin/Estonia
-       {    34,     7,    71,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Faroese/Latin/Faroe Islands
-       {    34,     7,    58,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Faroese/Latin/Denmark
-       {    36,     7,    73,{ 0,79 },{ 1574,130 },{ 215,27 },{ 0,79 },{ 1574,130 },{ 215,27 }}, // Finnish/Latin/Finland
-       {    37,     7,    74,{ 1704,91 },{ 1795,140 },{ 215,27 },{ 1935,91 },{ 1795,140 },{ 215,27 }}, // French/Latin/France
-       {    37,     7,     3,{ 1704,91 },{ 1795,140 },{ 215,27 },{ 1935,91 },{ 1795,140 },{ 215,27 }}, // French/Latin/Algeria
-       {    37,     7,    21,{ 1704,91 },{ 1795,140 },{ 215,27 },{ 1935,91 },{ 1795,140 },{ 215,27 }}, // French/Latin/Belgium
-       {    37,     7,    23,{ 1704,91 },{ 1795,140 },{ 215,27 },{ 1935,91 },{ 1795,140 },{ 215,27 }}, // French/Latin/Benin
-       {    37,     7,    34,{ 1704,91 },{ 1795,140 },{ 215,27 },{ 1935,91 },{ 1795,140 },{ 215,27 }}, // French/Latin/Burkina Faso
-       {    37,     7,    35,{ 1704,91 },{ 1795,140 },{ 215,27 },{ 1935,91 },{ 1795,140 },{ 215,27 }}, // French/Latin/Burundi
-       {    37,     7,    37,{ 1704,91 },{ 1795,140 },{ 215,27 },{ 1935,91 },{ 1795,140 },{ 215,27 }}, // French/Latin/Cameroon
-       {    37,     7,    38,{ 1704,91 },{ 1795,140 },{ 215,27 },{ 1935,91 },{ 1795,140 },{ 215,27 }}, // French/Latin/Canada
-       {    37,     7,    41,{ 1704,91 },{ 1795,140 },{ 215,27 },{ 1935,91 },{ 1795,140 },{ 215,27 }}, // French/Latin/Central African Republic
-       {    37,     7,    42,{ 1704,91 },{ 1795,140 },{ 215,27 },{ 1935,91 },{ 1795,140 },{ 215,27 }}, // French/Latin/Chad
-       {    37,     7,    48,{ 1704,91 },{ 1795,140 },{ 215,27 },{ 1935,91 },{ 1795,140 },{ 215,27 }}, // French/Latin/Comoros
-       {    37,     7,    49,{ 1704,91 },{ 1795,140 },{ 215,27 },{ 1935,91 },{ 1795,140 },{ 215,27 }}, // French/Latin/Congo Kinshasa
-       {    37,     7,    50,{ 1704,91 },{ 1795,140 },{ 215,27 },{ 1935,91 },{ 1795,140 },{ 215,27 }}, // French/Latin/Congo Brazzaville
-       {    37,     7,    53,{ 1704,91 },{ 1795,140 },{ 215,27 },{ 1935,91 },{ 1795,140 },{ 215,27 }}, // French/Latin/Ivory Coast
-       {    37,     7,    59,{ 1704,91 },{ 1795,140 },{ 215,27 },{ 1935,91 },{ 1795,140 },{ 215,27 }}, // French/Latin/Djibouti
-       {    37,     7,    66,{ 1704,91 },{ 1795,140 },{ 215,27 },{ 1935,91 },{ 1795,140 },{ 215,27 }}, // French/Latin/Equatorial Guinea
-       {    37,     7,    76,{ 1704,91 },{ 1795,140 },{ 215,27 },{ 1935,91 },{ 1795,140 },{ 215,27 }}, // French/Latin/French Guiana
-       {    37,     7,    77,{ 1704,91 },{ 1795,140 },{ 215,27 },{ 1935,91 },{ 1795,140 },{ 215,27 }}, // French/Latin/French Polynesia
-       {    37,     7,    79,{ 1704,91 },{ 1795,140 },{ 215,27 },{ 1935,91 },{ 1795,140 },{ 215,27 }}, // French/Latin/Gabon
-       {    37,     7,    88,{ 1704,91 },{ 1795,140 },{ 215,27 },{ 1935,91 },{ 1795,140 },{ 215,27 }}, // French/Latin/Guadeloupe
-       {    37,     7,    91,{ 1704,91 },{ 1795,140 },{ 215,27 },{ 1935,91 },{ 1795,140 },{ 215,27 }}, // French/Latin/Guinea
-       {    37,     7,    94,{ 1704,91 },{ 1795,140 },{ 215,27 },{ 1935,91 },{ 1795,140 },{ 215,27 }}, // French/Latin/Haiti
-       {    37,     7,   125,{ 1704,91 },{ 1795,140 },{ 215,27 },{ 1935,91 },{ 1795,140 },{ 215,27 }}, // French/Latin/Luxembourg
-       {    37,     7,   128,{ 1704,91 },{ 1795,140 },{ 215,27 },{ 1935,91 },{ 1795,140 },{ 215,27 }}, // French/Latin/Madagascar
-       {    37,     7,   132,{ 1704,91 },{ 1795,140 },{ 215,27 },{ 1935,91 },{ 1795,140 },{ 215,27 }}, // French/Latin/Mali
-       {    37,     7,   135,{ 1704,91 },{ 1795,140 },{ 215,27 },{ 1935,91 },{ 1795,140 },{ 215,27 }}, // French/Latin/Martinique
-       {    37,     7,   136,{ 1704,91 },{ 1795,140 },{ 215,27 },{ 1935,91 },{ 1795,140 },{ 215,27 }}, // French/Latin/Mauritania
-       {    37,     7,   137,{ 1704,91 },{ 1795,140 },{ 215,27 },{ 1935,91 },{ 1795,140 },{ 215,27 }}, // French/Latin/Mauritius
-       {    37,     7,   138,{ 1704,91 },{ 1795,140 },{ 215,27 },{ 1935,91 },{ 1795,140 },{ 215,27 }}, // French/Latin/Mayotte
-       {    37,     7,   142,{ 1704,91 },{ 1795,140 },{ 215,27 },{ 1935,91 },{ 1795,140 },{ 215,27 }}, // French/Latin/Monaco
-       {    37,     7,   145,{ 1704,91 },{ 1795,140 },{ 215,27 },{ 1935,91 },{ 1795,140 },{ 215,27 }}, // French/Latin/Morocco
-       {    37,     7,   153,{ 1704,91 },{ 1795,140 },{ 215,27 },{ 1935,91 },{ 1795,140 },{ 215,27 }}, // French/Latin/New Caledonia
-       {    37,     7,   156,{ 1704,91 },{ 1795,140 },{ 215,27 },{ 1935,91 },{ 1795,140 },{ 215,27 }}, // French/Latin/Niger
-       {    37,     7,   176,{ 1704,91 },{ 1795,140 },{ 215,27 },{ 1935,91 },{ 1795,140 },{ 215,27 }}, // French/Latin/Reunion
-       {    37,     7,   179,{ 1704,91 },{ 1795,140 },{ 215,27 },{ 1935,91 },{ 1795,140 },{ 215,27 }}, // French/Latin/Rwanda
-       {    37,     7,   187,{ 1704,91 },{ 1795,140 },{ 215,27 },{ 1935,91 },{ 1795,140 },{ 215,27 }}, // French/Latin/Senegal
-       {    37,     7,   188,{ 1704,91 },{ 1795,140 },{ 215,27 },{ 1935,91 },{ 1795,140 },{ 215,27 }}, // French/Latin/Seychelles
-       {    37,     7,   200,{ 1704,91 },{ 1795,140 },{ 215,27 },{ 1935,91 },{ 1795,140 },{ 215,27 }}, // French/Latin/Saint Pierre And Miquelon
-       {    37,     7,   206,{ 1704,91 },{ 1795,140 },{ 215,27 },{ 1935,91 },{ 1795,140 },{ 215,27 }}, // French/Latin/Switzerland
-       {    37,     7,   207,{ 1704,91 },{ 1795,140 },{ 215,27 },{ 1935,91 },{ 1795,140 },{ 215,27 }}, // French/Latin/Syria
-       {    37,     7,   212,{ 1704,91 },{ 1795,140 },{ 215,27 },{ 1935,91 },{ 1795,140 },{ 215,27 }}, // French/Latin/Togo
-       {    37,     7,   216,{ 1704,91 },{ 1795,140 },{ 215,27 },{ 1935,91 },{ 1795,140 },{ 215,27 }}, // French/Latin/Tunisia
-       {    37,     7,   229,{ 1704,91 },{ 1795,140 },{ 215,27 },{ 1935,91 },{ 1795,140 },{ 215,27 }}, // French/Latin/Vanuatu
-       {    37,     7,   235,{ 1704,91 },{ 1795,140 },{ 215,27 },{ 1935,91 },{ 1795,140 },{ 215,27 }}, // French/Latin/Wallis And Futuna Islands
-       {    37,     7,   244,{ 1704,91 },{ 1795,140 },{ 215,27 },{ 1935,91 },{ 1795,140 },{ 215,27 }}, // French/Latin/Saint Barthelemy
-       {    37,     7,   245,{ 1704,91 },{ 1795,140 },{ 215,27 },{ 1935,91 },{ 1795,140 },{ 215,27 }}, // French/Latin/Saint Martin
-       {    38,     7,   151,{ 1355,84 },{ 1439,135 },{ 215,27 },{ 1355,84 },{ 1439,135 },{ 215,27 }}, // Western Frisian/Latin/Netherlands
-       {    39,     7,   224,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Gaelic/Latin/United Kingdom
-       {    40,     7,   197,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Galician/Latin/Spain
-       {    41,    15,    81,{ 2026,74 },{ 2100,125 },{ 215,27 },{ 2026,74 },{ 2100,125 },{ 215,27 }}, // Georgian/Georgian/Georgia
-       {    42,     7,    82,{ 0,79 },{ 2225,117 },{ 215,27 },{ 0,79 },{ 2225,117 },{ 215,27 }}, // German/Latin/Germany
-       {    42,     7,    14,{ 0,79 },{ 2225,117 },{ 215,27 },{ 0,79 },{ 2225,117 },{ 215,27 }}, // German/Latin/Austria
-       {    42,     7,    21,{ 0,79 },{ 2225,117 },{ 215,27 },{ 0,79 },{ 2225,117 },{ 215,27 }}, // German/Latin/Belgium
-       {    42,     7,   106,{ 0,79 },{ 2225,117 },{ 215,27 },{ 0,79 },{ 2225,117 },{ 215,27 }}, // German/Latin/Italy
-       {    42,     7,   123,{ 0,79 },{ 2225,117 },{ 215,27 },{ 0,79 },{ 2225,117 },{ 215,27 }}, // German/Latin/Liechtenstein
-       {    42,     7,   125,{ 0,79 },{ 2225,117 },{ 215,27 },{ 0,79 },{ 2225,117 },{ 215,27 }}, // German/Latin/Luxembourg
-       {    42,     7,   206,{ 0,79 },{ 2225,117 },{ 215,27 },{ 0,79 },{ 2225,117 },{ 215,27 }}, // German/Latin/Switzerland
-       {    43,    16,    85,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Greek/Greek/Greece
-       {    43,    16,    56,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Greek/Greek/Cyprus
-       {    44,     7,    86,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Greenlandic/Latin/Greenland
-       {    45,     7,   168,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Guarani/Latin/Paraguay
-       {    46,    17,   100,{ 2342,75 },{ 2417,99 },{ 215,27 },{ 2342,75 },{ 2417,99 },{ 215,27 }}, // Gujarati/Gujarati/India
-       {    47,     7,   157,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Hausa/Latin/Nigeria
-       {    47,     1,   157,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Hausa/Arabic/Nigeria
-       {    47,     7,    83,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Hausa/Latin/Ghana
-       {    47,     7,   156,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Hausa/Latin/Niger
-       {    48,    18,   105,{ 2516,96 },{ 2612,117 },{ 215,27 },{ 2516,96 },{ 2729,117 },{ 215,27 }}, // Hebrew/Hebrew/Israel
-       {    49,    13,   100,{ 0,79 },{ 2846,109 },{ 215,27 },{ 0,79 },{ 2846,109 },{ 215,27 }}, // Hindi/Devanagari/India
-       {    50,     7,    98,{ 2955,77 },{ 3032,100 },{ 215,27 },{ 2955,77 },{ 3132,128 },{ 215,27 }}, // Hungarian/Latin/Hungary
-       {    51,     7,    99,{ 3260,79 },{ 1248,107 },{ 215,27 },{ 3260,79 },{ 1248,107 },{ 215,27 }}, // Icelandic/Latin/Iceland
-       {    52,     7,   101,{ 3339,87 },{ 3426,110 },{ 215,27 },{ 3339,87 },{ 3426,110 },{ 215,27 }}, // Indonesian/Latin/Indonesia
-       {    53,     7,   260,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Interlingua/Latin/World
-       {    55,    44,    38,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Inuktitut/Canadian Aboriginal/Canada
-       {    55,     7,    38,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Inuktitut/Latin/Canada
-       {    57,     7,   104,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Irish/Latin/Ireland
-       {    57,     7,   224,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Irish/Latin/United Kingdom
-       {    58,     7,   106,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Italian/Latin/Italy
-       {    58,     7,   184,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Italian/Latin/San Marino
-       {    58,     7,   206,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Italian/Latin/Switzerland
-       {    58,     7,   230,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Italian/Latin/Vatican City State
-       {    59,    19,   108,{ 3536,98 },{ 3536,98 },{ 215,27 },{ 3536,98 },{ 3536,98 },{ 215,27 }}, // Japanese/Japanese/Japan
-       {    60,     7,   101,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Javanese/Latin/Indonesia
-       {    61,    21,   100,{ 3634,80 },{ 3714,101 },{ 215,27 },{ 3634,80 },{ 3714,101 },{ 215,27 }}, // Kannada/Kannada/India
-       {    62,     1,   100,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Kashmiri/Arabic/India
-       {    63,     2,   110,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Kazakh/Cyrillic/Kazakhstan
-       {    64,     7,   179,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Kinyarwanda/Latin/Rwanda
-       {    65,     2,   116,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Kirghiz/Cyrillic/Kyrgyzstan
-       {    66,    22,   114,{ 0,79 },{ 3815,70 },{ 215,27 },{ 0,79 },{ 3815,70 },{ 215,27 }}, // Korean/Korean/South Korea
-       {    66,    22,   113,{ 0,79 },{ 3815,70 },{ 215,27 },{ 0,79 },{ 3815,70 },{ 215,27 }}, // Korean/Korean/North Korea
-       {    67,     7,   217,{ 0,79 },{ 3885,110 },{ 215,27 },{ 0,79 },{ 3885,110 },{ 215,27 }}, // Kurdish/Latin/Turkey
-       {    68,     7,    35,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Rundi/Latin/Burundi
-       {    69,    23,   117,{ 3995,76 },{ 4071,96 },{ 215,27 },{ 4167,78 },{ 4071,96 },{ 215,27 }}, // Lao/Lao/Laos
-       {    71,     7,   118,{ 0,79 },{ 4245,109 },{ 215,27 },{ 0,79 },{ 4245,109 },{ 215,27 }}, // Latvian/Latin/Latvia
-       {    72,     7,    49,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Lingala/Latin/Congo Kinshasa
-       {    72,     7,     6,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Lingala/Latin/Angola
-       {    72,     7,    41,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Lingala/Latin/Central African Republic
-       {    72,     7,    50,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Lingala/Latin/Congo Brazzaville
-       {    73,     7,   124,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Lithuanian/Latin/Lithuania
-       {    74,     2,   127,{ 4354,72 },{ 4426,90 },{ 215,27 },{ 4354,72 },{ 4426,90 },{ 215,27 }}, // Macedonian/Cyrillic/Macedonia
-       {    75,     7,   128,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Malagasy/Latin/Madagascar
-       {    76,     7,   130,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Malay/Latin/Malaysia
-       {    76,     1,   130,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Malay/Arabic/Malaysia
-       {    76,     7,    32,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Malay/Latin/Brunei
-       {    76,     7,   190,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Malay/Latin/Singapore
-       {    77,    24,   100,{ 4516,98 },{ 4614,103 },{ 4717,27 },{ 4516,98 },{ 4744,103 },{ 4717,27 }}, // Malayalam/Malayalam/India
-       {    78,     7,   133,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Maltese/Latin/Malta
-       {    79,     7,   154,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Maori/Latin/New Zealand
-       {    80,    13,   100,{ 4847,79 },{ 4926,88 },{ 5014,27 },{ 4847,79 },{ 4926,88 },{ 5014,27 }}, // Marathi/Devanagari/India
-       {    82,     2,   143,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Mongolian/Cyrillic/Mongolia
-       {    82,     8,    44,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Mongolian/Mongolian/China
-       {    84,    13,   150,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Nepali/Devanagari/Nepal
-       {    84,    13,   100,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Nepali/Devanagari/India
-       {    85,     7,   161,{ 5041,79 },{ 5120,107 },{ 215,27 },{ 5227,79 },{ 5120,107 },{ 215,27 }}, // Norwegian Bokmal/Latin/Norway
-       {    85,     7,   203,{ 5041,79 },{ 5120,107 },{ 215,27 },{ 5227,79 },{ 5120,107 },{ 215,27 }}, // Norwegian Bokmal/Latin/Svalbard And Jan Mayen Islands
-       {    86,     7,    74,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Occitan/Latin/France
-       {    87,    26,   100,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Oriya/Oriya/India
-       {    88,     1,     1,{ 5306,74 },{ 5380,75 },{ 215,27 },{ 5455,74 },{ 5529,76 },{ 215,27 }}, // Pashto/Arabic/Afghanistan
-       {    88,     1,   163,{ 5306,74 },{ 5605,80 },{ 215,27 },{ 5455,74 },{ 5685,81 },{ 215,27 }}, // Pashto/Arabic/Pakistan
-       {    89,     1,   102,{ 5766,91 },{ 5766,91 },{ 5857,24 },{ 5881,93 },{ 5881,93 },{ 5857,24 }}, // Persian/Arabic/Iran
-       {    89,     1,     1,{ 5766,91 },{ 5766,91 },{ 5857,24 },{ 5881,93 },{ 5881,93 },{ 5857,24 }}, // Persian/Arabic/Afghanistan
-       {    90,     7,   172,{ 5974,78 },{ 6052,108 },{ 215,27 },{ 5974,78 },{ 6052,108 },{ 215,27 }}, // Polish/Latin/Poland
-       {    91,     7,    30,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Portuguese/Latin/Brazil
-       {    91,     7,     6,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Portuguese/Latin/Angola
-       {    91,     7,    39,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Portuguese/Latin/Cape Verde
-       {    91,     7,    62,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Portuguese/Latin/East Timor
-       {    91,     7,    66,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Portuguese/Latin/Equatorial Guinea
-       {    91,     7,    92,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Portuguese/Latin/Guinea Bissau
-       {    91,     7,   125,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Portuguese/Latin/Luxembourg
-       {    91,     7,   126,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Portuguese/Latin/Macau
-       {    91,     7,   146,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Portuguese/Latin/Mozambique
-       {    91,     7,   173,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Portuguese/Latin/Portugal
-       {    91,     7,   185,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Portuguese/Latin/Sao Tome And Principe
-       {    91,     7,   206,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Portuguese/Latin/Switzerland
-       {    92,     4,   100,{ 6160,78 },{ 6238,93 },{ 215,27 },{ 6160,78 },{ 6331,95 },{ 215,27 }}, // Punjabi/Gurmukhi/India
-       {    92,     1,   163,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Punjabi/Arabic/Pakistan
-       {    93,     7,   169,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Quechua/Latin/Peru
-       {    93,     7,    26,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Quechua/Latin/Bolivia
-       {    93,     7,    63,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Quechua/Latin/Ecuador
-       {    94,     7,   206,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Romansh/Latin/Switzerland
-       {    95,     7,   177,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Romanian/Latin/Romania
-       {    95,     7,   141,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Romanian/Latin/Moldova
-       {    96,     2,   178,{ 6426,80 },{ 6506,132 },{ 215,27 },{ 6426,80 },{ 6506,132 },{ 215,27 }}, // Russian/Cyrillic/Russia
-       {    96,     2,    20,{ 6426,80 },{ 6506,132 },{ 215,27 },{ 6426,80 },{ 6506,132 },{ 215,27 }}, // Russian/Cyrillic/Belarus
-       {    96,     2,   110,{ 6426,80 },{ 6506,132 },{ 215,27 },{ 6426,80 },{ 6506,132 },{ 215,27 }}, // Russian/Cyrillic/Kazakhstan
-       {    96,     2,   116,{ 6426,80 },{ 6506,132 },{ 215,27 },{ 6426,80 },{ 6506,132 },{ 215,27 }}, // Russian/Cyrillic/Kyrgyzstan
-       {    96,     2,   141,{ 6426,80 },{ 6506,132 },{ 215,27 },{ 6426,80 },{ 6506,132 },{ 215,27 }}, // Russian/Cyrillic/Moldova
-       {    96,     2,   222,{ 6426,80 },{ 6506,132 },{ 215,27 },{ 6426,80 },{ 6506,132 },{ 215,27 }}, // Russian/Cyrillic/Ukraine
-       {    98,     7,    41,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Sango/Latin/Central African Republic
-       {    99,    13,   100,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Sanskrit/Devanagari/India
-       {   100,     2,   243,{ 6638,70 },{ 6708,91 },{ 215,27 },{ 6638,70 },{ 6799,98 },{ 215,27 }}, // Serbian/Cyrillic/Serbia
-       {   100,     2,    27,{ 6638,70 },{ 6708,91 },{ 215,27 },{ 6638,70 },{ 6799,98 },{ 215,27 }}, // Serbian/Cyrillic/Bosnia And Herzegowina
-       {   100,     2,   242,{ 6638,70 },{ 6708,91 },{ 215,27 },{ 6638,70 },{ 6799,98 },{ 215,27 }}, // Serbian/Cyrillic/Montenegro
-       {   100,     2,   257,{ 6638,70 },{ 6708,91 },{ 215,27 },{ 6638,70 },{ 6799,98 },{ 215,27 }}, // Serbian/Cyrillic/Kosovo
-       {   100,     7,    27,{ 6897,73 },{ 6970,95 },{ 215,27 },{ 6897,73 },{ 7065,98 },{ 215,27 }}, // Serbian/Latin/Bosnia And Herzegowina
-       {   100,     7,   242,{ 6897,73 },{ 6970,95 },{ 215,27 },{ 6897,73 },{ 7065,98 },{ 215,27 }}, // Serbian/Latin/Montenegro
-       {   100,     7,   243,{ 6897,73 },{ 6970,95 },{ 215,27 },{ 6897,73 },{ 7065,98 },{ 215,27 }}, // Serbian/Latin/Serbia
-       {   100,     7,   257,{ 6897,73 },{ 6970,95 },{ 215,27 },{ 6897,73 },{ 7065,98 },{ 215,27 }}, // Serbian/Latin/Kosovo
-       {   101,     2,    81,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Ossetic/Cyrillic/Georgia
-       {   101,     2,   178,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Ossetic/Cyrillic/Russia
-       {   102,     7,   195,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Southern Sotho/Latin/South Africa
-       {   103,     7,   195,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Tswana/Latin/South Africa
-       {   104,     7,   240,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Shona/Latin/Zimbabwe
-       {   105,     1,   163,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Sindhi/Arabic/Pakistan
-       {   106,    32,   198,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Sinhala/Sinhala/Sri Lanka
-       {   107,     7,   195,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Swati/Latin/South Africa
-       {   108,     7,   191,{ 7163,79 },{ 7242,136 },{ 215,27 },{ 7163,79 },{ 7242,136 },{ 215,27 }}, // Slovak/Latin/Slovakia
-       {   109,     7,   192,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Slovenian/Latin/Slovenia
-       {   110,     7,   194,{ 7378,75 },{ 7453,132 },{ 215,27 },{ 7585,79 },{ 7664,131 },{ 215,27 }}, // Somali/Latin/Somalia
-       {   110,     7,    59,{ 7378,75 },{ 7453,132 },{ 215,27 },{ 7585,79 },{ 7664,131 },{ 215,27 }}, // Somali/Latin/Djibouti
-       {   110,     7,    69,{ 7378,75 },{ 7453,132 },{ 215,27 },{ 7585,79 },{ 7664,131 },{ 215,27 }}, // Somali/Latin/Ethiopia
-       {   110,     7,   111,{ 7378,75 },{ 7453,132 },{ 215,27 },{ 7585,79 },{ 7664,131 },{ 215,27 }}, // Somali/Latin/Kenya
-       {   111,     7,   197,{ 5227,79 },{ 7795,107 },{ 215,27 },{ 5227,79 },{ 7795,107 },{ 215,27 }}, // Spanish/Latin/Spain
-       {   111,     7,    10,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Spanish/Latin/Argentina
-       {   111,     7,    22,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Spanish/Latin/Belize
-       {   111,     7,    26,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Spanish/Latin/Bolivia
-       {   111,     7,    30,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Spanish/Latin/Brazil
-       {   111,     7,    43,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Spanish/Latin/Chile
-       {   111,     7,    47,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Spanish/Latin/Colombia
-       {   111,     7,    52,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Spanish/Latin/Costa Rica
-       {   111,     7,    55,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Spanish/Latin/Cuba
-       {   111,     7,    61,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Spanish/Latin/Dominican Republic
-       {   111,     7,    63,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Spanish/Latin/Ecuador
-       {   111,     7,    65,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Spanish/Latin/El Salvador
-       {   111,     7,    66,{ 5227,79 },{ 7795,107 },{ 215,27 },{ 5227,79 },{ 7795,107 },{ 215,27 }}, // Spanish/Latin/Equatorial Guinea
-       {   111,     7,    90,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Spanish/Latin/Guatemala
-       {   111,     7,    96,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Spanish/Latin/Honduras
-       {   111,     7,   139,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Spanish/Latin/Mexico
-       {   111,     7,   155,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Spanish/Latin/Nicaragua
-       {   111,     7,   166,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Spanish/Latin/Panama
-       {   111,     7,   168,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Spanish/Latin/Paraguay
-       {   111,     7,   169,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Spanish/Latin/Peru
-       {   111,     7,   170,{ 5227,79 },{ 7795,107 },{ 215,27 },{ 5227,79 },{ 7795,107 },{ 215,27 }}, // Spanish/Latin/Philippines
-       {   111,     7,   174,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Spanish/Latin/Puerto Rico
-       {   111,     7,   225,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Spanish/Latin/United States
-       {   111,     7,   227,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Spanish/Latin/Uruguay
-       {   111,     7,   231,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Spanish/Latin/Venezuela
-       {   111,     7,   238,{ 5227,79 },{ 7795,107 },{ 215,27 },{ 5227,79 },{ 7795,107 },{ 215,27 }}, // Spanish/Latin/Canary Islands
-       {   111,     7,   246,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Spanish/Latin/Latin America
-       {   111,     7,   250,{ 5227,79 },{ 7795,107 },{ 215,27 },{ 5227,79 },{ 7795,107 },{ 215,27 }}, // Spanish/Latin/Ceuta And Melilla
-       {   112,     7,   101,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Sundanese/Latin/Indonesia
-       {   113,     7,   210,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Swahili/Latin/Tanzania
-       {   113,     7,    49,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Swahili/Latin/Congo Kinshasa
-       {   113,     7,   111,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Swahili/Latin/Kenya
-       {   113,     7,   221,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Swahili/Latin/Uganda
-       {   114,     7,   205,{ 0,79 },{ 7902,128 },{ 215,27 },{ 0,79 },{ 8030,128 },{ 215,27 }}, // Swedish/Latin/Sweden
-       {   114,     7,    73,{ 0,79 },{ 7902,128 },{ 215,27 },{ 0,79 },{ 8030,128 },{ 215,27 }}, // Swedish/Latin/Finland
-       {   114,     7,   248,{ 0,79 },{ 7902,128 },{ 215,27 },{ 0,79 },{ 8030,128 },{ 215,27 }}, // Swedish/Latin/Aland Islands
-       {   115,     7,   106,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Sardinian/Latin/Italy
-       {   116,     2,   209,{ 8158,75 },{ 8233,111 },{ 215,27 },{ 8158,75 },{ 8344,111 },{ 215,27 }}, // Tajik/Cyrillic/Tajikistan
-       {   117,    27,   100,{ 8455,73 },{ 8528,92 },{ 215,27 },{ 8455,73 },{ 8528,92 },{ 215,27 }}, // Tamil/Tamil/India
-       {   117,    27,   130,{ 8455,73 },{ 8528,92 },{ 215,27 },{ 8455,73 },{ 8528,92 },{ 215,27 }}, // Tamil/Tamil/Malaysia
-       {   117,    27,   190,{ 8455,73 },{ 8528,92 },{ 215,27 },{ 8455,73 },{ 8528,92 },{ 215,27 }}, // Tamil/Tamil/Singapore
-       {   117,    27,   198,{ 8455,73 },{ 8528,92 },{ 215,27 },{ 8455,73 },{ 8528,92 },{ 215,27 }}, // Tamil/Tamil/Sri Lanka
-       {   118,     2,   178,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Tatar/Cyrillic/Russia
-       {   119,    28,   100,{ 8620,75 },{ 8695,96 },{ 215,27 },{ 8620,75 },{ 79,107 },{ 215,27 }}, // Telugu/Telugu/India
-       {   120,    30,   211,{ 8791,90 },{ 8881,103 },{ 215,27 },{ 8791,90 },{ 8881,103 },{ 215,27 }}, // Thai/Thai/Thailand
-       {   121,    31,    44,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Tibetan/Tibetan/China
-       {   121,    31,   100,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Tibetan/Tibetan/India
-       {   122,    14,    69,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Tigrinya/Ethiopic/Ethiopia
-       {   122,    14,    67,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Tigrinya/Ethiopic/Eritrea
-       {   123,     7,   214,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Tongan/Latin/Tonga
-       {   124,     7,   195,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Tsonga/Latin/South Africa
-       {   125,     7,   217,{ 8984,84 },{ 9068,111 },{ 215,27 },{ 8984,84 },{ 9068,111 },{ 215,27 }}, // Turkish/Latin/Turkey
-       {   125,     7,    56,{ 8984,84 },{ 9068,111 },{ 215,27 },{ 8984,84 },{ 9068,111 },{ 215,27 }}, // Turkish/Latin/Cyprus
-       {   126,     7,   218,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Turkmen/Latin/Turkmenistan
-       {   128,     1,    44,{ 9179,119 },{ 9179,119 },{ 215,27 },{ 9179,119 },{ 9179,119 },{ 215,27 }}, // Uighur/Arabic/China
-       {   129,     2,   222,{ 9298,72 },{ 9370,104 },{ 215,27 },{ 9474,82 },{ 9370,104 },{ 215,27 }}, // Ukrainian/Cyrillic/Ukraine
-       {   130,     1,   163,{ 9556,99 },{ 9655,97 },{ 215,27 },{ 9556,99 },{ 9655,97 },{ 215,27 }}, // Urdu/Arabic/Pakistan
-       {   130,     1,   100,{ 9556,99 },{ 9655,97 },{ 215,27 },{ 9556,99 },{ 9655,97 },{ 215,27 }}, // Urdu/Arabic/India
-       {   131,     7,   228,{ 9752,83 },{ 9835,123 },{ 215,27 },{ 9752,83 },{ 9835,123 },{ 215,27 }}, // Uzbek/Latin/Uzbekistan
-       {   131,     1,     1,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Uzbek/Arabic/Afghanistan
-       {   131,     2,   228,{ 0,79 },{ 9958,115 },{ 215,27 },{ 0,79 },{ 9958,115 },{ 215,27 }}, // Uzbek/Cyrillic/Uzbekistan
-       {   132,     7,   232,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Vietnamese/Latin/Vietnam
-       {   133,     7,   260,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Volapuk/Latin/World
-       {   134,     7,   224,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Welsh/Latin/United Kingdom
-       {   135,     7,   187,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Wolof/Latin/Senegal
-       {   136,     7,   195,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Xhosa/Latin/South Africa
-       {   137,    18,   260,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Yiddish/Hebrew/World
-       {   138,     7,   157,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Yoruba/Latin/Nigeria
-       {   138,     7,    23,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Yoruba/Latin/Benin
-       {   140,     7,   195,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Zulu/Latin/South Africa
-       {   141,     7,   161,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Norwegian Nynorsk/Latin/Norway
-       {   142,     7,    27,{ 10073,75 },{ 10148,99 },{ 215,27 },{ 10073,75 },{ 10148,99 },{ 215,27 }}, // Bosnian/Latin/Bosnia And Herzegowina
-       {   142,     2,    27,{ 6638,70 },{ 6708,91 },{ 215,27 },{ 6638,70 },{ 6799,98 },{ 215,27 }}, // Bosnian/Cyrillic/Bosnia And Herzegowina
-       {   143,    29,   131,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Divehi/Thaana/Maldives
-       {   144,     7,   251,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Manx/Latin/Isle Of Man
-       {   145,     7,   224,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Cornish/Latin/United Kingdom
-       {   146,     7,    83,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Akan/Latin/Ghana
-       {   147,    13,   100,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Konkani/Devanagari/India
-       {   148,     7,    83,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Ga/Latin/Ghana
-       {   149,     7,   157,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Igbo/Latin/Nigeria
-       {   150,     7,   111,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Kamba/Latin/Kenya
-       {   151,    33,   103,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Syriac/Syriac/Iraq
-       {   152,    14,    67,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Blin/Ethiopic/Eritrea
-       {   153,    14,    69,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Geez/Ethiopic/Ethiopia
-       {   155,     7,    69,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Sidamo/Latin/Ethiopia
-       {   156,     7,   157,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Atsam/Latin/Nigeria
-       {   157,    14,    67,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Tigre/Ethiopic/Eritrea
-       {   158,     7,   157,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Jju/Latin/Nigeria
-       {   159,     7,   106,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Friulian/Latin/Italy
-       {   160,     7,   195,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Venda/Latin/South Africa
-       {   161,     7,    83,{ 10247,48 },{ 10295,87 },{ 215,27 },{ 10247,48 },{ 10295,87 },{ 215,27 }}, // Ewe/Latin/Ghana
-       {   161,     7,   212,{ 10247,48 },{ 10295,87 },{ 215,27 },{ 10247,48 },{ 10295,87 },{ 215,27 }}, // Ewe/Latin/Togo
-       {   162,    14,    69,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Walamo/Ethiopic/Ethiopia
-       {   163,     7,   225,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Hawaiian/Latin/United States
-       {   164,     7,   157,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Tyap/Latin/Nigeria
-       {   165,     7,   129,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Nyanja/Latin/Malawi
-       {   166,     7,   170,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Filipino/Latin/Philippines
-       {   167,     7,   206,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Swiss German/Latin/Switzerland
-       {   167,     7,    74,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Swiss German/Latin/France
-       {   167,     7,   123,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Swiss German/Latin/Liechtenstein
-       {   168,    34,    44,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Sichuan Yi/Yi/China
-       {   169,     7,   121,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Kpelle/Latin/Liberia
-       {   170,     7,    82,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Low German/Latin/Germany
-       {   170,     7,   151,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Low German/Latin/Netherlands
-       {   171,     7,   195,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // South Ndebele/Latin/South Africa
-       {   172,     7,   195,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Northern Sotho/Latin/South Africa
-       {   173,     7,   161,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Northern Sami/Latin/Norway
-       {   173,     7,    73,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Northern Sami/Latin/Finland
-       {   173,     7,   205,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Northern Sami/Latin/Sweden
-       {   174,     7,   208,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Taroko/Latin/Taiwan
-       {   175,     7,   111,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Gusii/Latin/Kenya
-       {   176,     7,   111,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Taita/Latin/Kenya
-       {   177,     7,   187,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Fulah/Latin/Senegal
-       {   177,     7,    34,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Fulah/Latin/Burkina Faso
-       {   177,     7,    37,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Fulah/Latin/Cameroon
-       {   177,     7,    80,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Fulah/Latin/Gambia
-       {   177,     7,    83,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Fulah/Latin/Ghana
-       {   177,     7,    91,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Fulah/Latin/Guinea
-       {   177,     7,    92,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Fulah/Latin/Guinea Bissau
-       {   177,     7,   121,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Fulah/Latin/Liberia
-       {   177,     7,   136,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Fulah/Latin/Mauritania
-       {   177,     7,   156,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Fulah/Latin/Niger
-       {   177,     7,   157,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Fulah/Latin/Nigeria
-       {   177,     7,   189,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Fulah/Latin/Sierra Leone
-       {   177,   134,    91,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Fulah/Adlam/Guinea
-       {   178,     7,   111,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Kikuyu/Latin/Kenya
-       {   179,     7,   111,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Samburu/Latin/Kenya
-       {   180,     7,   146,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Sena/Latin/Mozambique
-       {   181,     7,   240,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // North Ndebele/Latin/Zimbabwe
-       {   182,     7,   210,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Rombo/Latin/Tanzania
-       {   183,     9,   145,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Tachelhit/Tifinagh/Morocco
-       {   183,     7,   145,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Tachelhit/Latin/Morocco
-       {   184,     7,     3,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Kabyle/Latin/Algeria
-       {   185,     7,   221,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Nyankole/Latin/Uganda
-       {   186,     7,   210,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Bena/Latin/Tanzania
-       {   187,     7,   210,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Vunjo/Latin/Tanzania
-       {   188,     7,   132,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Bambara/Latin/Mali
-       {   188,    75,   132,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Bambara/Nko/Mali
-       {   189,     7,   111,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Embu/Latin/Kenya
-       {   190,    12,   225,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Cherokee/Cherokee/United States
-       {   191,     7,   137,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Morisyen/Latin/Mauritius
-       {   192,     7,   210,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Makonde/Latin/Tanzania
-       {   193,     7,   210,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Langi/Latin/Tanzania
-       {   194,     7,   221,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Ganda/Latin/Uganda
-       {   195,     7,   239,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Bemba/Latin/Zambia
-       {   196,     7,    39,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Kabuverdianu/Latin/Cape Verde
-       {   197,     7,   111,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Meru/Latin/Kenya
-       {   198,     7,   111,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Kalenjin/Latin/Kenya
-       {   199,     7,   148,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Nama/Latin/Namibia
-       {   200,     7,   210,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Machame/Latin/Tanzania
-       {   201,     7,    82,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Colognian/Latin/Germany
-       {   202,     7,   111,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Masai/Latin/Kenya
-       {   202,     7,   210,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Masai/Latin/Tanzania
-       {   203,     7,   221,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Soga/Latin/Uganda
-       {   204,     7,   111,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Luyia/Latin/Kenya
-       {   205,     7,   210,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Asu/Latin/Tanzania
-       {   206,     7,   221,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Teso/Latin/Uganda
-       {   206,     7,   111,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Teso/Latin/Kenya
-       {   207,     7,    67,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Saho/Latin/Eritrea
-       {   208,     7,   132,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Koyra Chiini/Latin/Mali
-       {   209,     7,   210,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Rwa/Latin/Tanzania
-       {   210,     7,   111,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Luo/Latin/Kenya
-       {   211,     7,   221,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Chiga/Latin/Uganda
-       {   212,     7,   145,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Central Morocco Tamazight/Latin/Morocco
-       {   213,     7,   132,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Koyraboro Senni/Latin/Mali
-       {   214,     7,   210,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Shambala/Latin/Tanzania
-       {   215,    13,   100,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Bodo/Devanagari/India
-       {   218,     2,   178,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Chechen/Cyrillic/Russia
-       {   219,     2,   178,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Church/Cyrillic/Russia
-       {   220,     2,   178,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Chuvash/Cyrillic/Russia
-       {   230,     7,    49,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Luba Katanga/Latin/Congo Kinshasa
-       {   231,     7,   125,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Luxembourgish/Latin/Luxembourg
-       {   236,     7,    21,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Walloon/Latin/Belgium
-       {   237,     7,    37,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Aghem/Latin/Cameroon
-       {   238,     7,    37,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Basaa/Latin/Cameroon
-       {   239,     7,   156,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Zarma/Latin/Niger
-       {   240,     7,    37,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Duala/Latin/Cameroon
-       {   241,     7,   187,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Jola Fonyi/Latin/Senegal
-       {   242,     7,    37,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Ewondo/Latin/Cameroon
-       {   243,     7,    37,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Bafia/Latin/Cameroon
-       {   244,     7,   146,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Makhuwa Meetto/Latin/Mozambique
-       {   245,     7,    37,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Mundang/Latin/Cameroon
-       {   246,     7,    37,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Kwasio/Latin/Cameroon
-       {   247,     7,   254,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Nuer/Latin/South Sudan
-       {   248,     2,   178,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Sakha/Cyrillic/Russia
-       {   249,     7,   210,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Sangu/Latin/Tanzania
-       {   251,     7,   156,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Tasawaq/Latin/Niger
-       {   252,    35,   121,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Vai/Vai/Liberia
-       {   252,     7,   121,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Vai/Latin/Liberia
-       {   253,     7,   206,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Walser/Latin/Switzerland
-       {   254,     7,    37,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Yangben/Latin/Cameroon
-       {   256,     7,   197,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 10382,143 },{ 215,27 }}, // Asturian/Latin/Spain
-       {   257,     7,    37,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Ngomba/Latin/Cameroon
-       {   258,     7,    37,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Kako/Latin/Cameroon
-       {   259,     7,    37,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Meta/Latin/Cameroon
-       {   260,     7,    37,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Ngiemboon/Latin/Cameroon
-       {   261,     7,   197,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Aragonese/Latin/Spain
-       {   290,    11,   100,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Manipuri/Bengali/India
-       {   309,   100,   232,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Tai Dam/Tai Viet/Vietnam
-       {   312,     7,    37,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Akoose/Latin/Cameroon
-       {   313,     7,   225,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Lakota/Latin/United States
-       {   314,     9,   145,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Standard Moroccan Tamazight/Tifinagh/Morocco
-       {   315,     7,    43,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Mapuche/Latin/Chile
-       {   316,     1,   103,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Central Kurdish/Arabic/Iraq
-       {   316,     1,   102,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Central Kurdish/Arabic/Iran
-       {   317,     7,    82,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Lower Sorbian/Latin/Germany
-       {   318,     7,    82,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Upper Sorbian/Latin/Germany
-       {   319,     7,    37,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Kenyang/Latin/Cameroon
-       {   320,     7,    38,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Mohawk/Latin/Canada
-       {   321,    75,    91,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Nko/Nko/Guinea
-       {   322,     7,   260,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Prussian/Latin/World
-       {   323,     7,    90,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Kiche/Latin/Guatemala
-       {   324,     7,   205,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Southern Sami/Latin/Sweden
-       {   325,     7,   205,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Lule Sami/Latin/Sweden
-       {   326,     7,    73,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Inari Sami/Latin/Finland
-       {   327,     7,    73,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Skolt Sami/Latin/Finland
-       {   328,     7,    13,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Warlpiri/Latin/Australia
-       {   346,     1,   102,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Mazanderani/Arabic/Iran
-       {   349,     1,   102,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Northern Luri/Arabic/Iran
-       {   349,     1,   103,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Northern Luri/Arabic/Iraq
-       {   357,     6,    97,{ 930,72 },{ 930,72 },{ 215,27 },{ 930,72 },{ 930,72 },{ 215,27 }}, // Cantonese/Traditional Han/Hong Kong
-       {   357,     5,    44,{ 10525,72 },{ 10525,72 },{ 215,27 },{ 10525,72 },{ 10525,72 },{ 215,27 }}, // Cantonese/Simplified Han/China
-       {   358,   138,   225,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Osage/Osage/United States
-       {   360,     7,   260,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Ido/Latin/World
-       {   361,     7,   260,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Lojban/Latin/World
-       {   362,     7,   106,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Sicilian/Latin/Italy
-       {   363,     1,   102,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Southern Kurdish/Arabic/Iran
-       {   364,     1,   163,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Western Balochi/Arabic/Pakistan
-       {   365,     7,   170,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Cebuano/Latin/Philippines
-       {   366,     2,   178,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Erzya/Cyrillic/Russia
-       {   367,     7,   225,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Chickasaw/Latin/United States
-       {   368,     7,   225,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Muscogee/Latin/United States
-       {   369,     7,   172,{ 0,79 },{ 79,107 },{ 215,27 },{ 0,79 },{ 79,107 },{ 215,27 }}, // Silesian/Latin/Poland
-       {     0,     0,     0,{  0,0},{  0,0},{  0,0},{  0,0},{  0,0},{  0,0}}, // trailing zeros
+   //  lang   script terr  sLng long sSrt shrt sNrw naro Sizes...
+      {     1,     0,     0,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// C/AnyScript/AnyCountry
+      {     3,     7,    69,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Oromo/Latin/Ethiopia
+      {     3,     7,   111,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Oromo/Latin/Kenya
+      {     4,     7,    69,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Afar/Latin/Ethiopia
+      {     5,     7,   195,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Afrikaans/Latin/South Africa
+      {     5,     7,   148,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Afrikaans/Latin/Namibia
+      {     6,     7,     2,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Albanian/Latin/Albania
+      {     6,     7,   127,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Albanian/Latin/Macedonia
+      {     6,     7,   257,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Albanian/Latin/Kosovo
+      {     7,    14,    69,  210,  210,  106,  106,  184,  184, 74, 74, 78, 78, 26, 26 },// Amharic/Ethiopic/Ethiopia
+      {     8,     1,    64,  284,  284,  284,  284,  380,  380, 96, 96, 96, 96, 26, 26 },// Arabic/Arabic/Egypt
+      {     8,     1,     3,  284,  284,  284,  284,  380,  380, 96, 96, 96, 96, 26, 26 },// Arabic/Arabic/Algeria
+      {     8,     1,    17,  284,  284,  284,  284,  380,  380, 96, 96, 96, 96, 26, 26 },// Arabic/Arabic/Bahrain
+      {     8,     1,    42,  284,  284,  284,  284,  380,  380, 96, 96, 96, 96, 26, 26 },// Arabic/Arabic/Chad
+      {     8,     1,    48,  284,  284,  284,  284,  380,  380, 96, 96, 96, 96, 26, 26 },// Arabic/Arabic/Comoros
+      {     8,     1,    59,  284,  284,  284,  284,  380,  380, 96, 96, 96, 96, 26, 26 },// Arabic/Arabic/Djibouti
+      {     8,     1,    67,  284,  284,  284,  284,  380,  380, 96, 96, 96, 96, 26, 26 },// Arabic/Arabic/Eritrea
+      {     8,     1,   103,  284,  284,  284,  284,  380,  380, 96, 96, 96, 96, 26, 26 },// Arabic/Arabic/Iraq
+      {     8,     1,   105,  284,  284,  284,  284,  380,  380, 96, 96, 96, 96, 26, 26 },// Arabic/Arabic/Israel
+      {     8,     1,   109,  284,  284,  284,  284,  380,  380, 96, 96, 96, 96, 26, 26 },// Arabic/Arabic/Jordan
+      {     8,     1,   115,  284,  284,  284,  284,  380,  380, 96, 96, 96, 96, 26, 26 },// Arabic/Arabic/Kuwait
+      {     8,     1,   119,  284,  284,  284,  284,  380,  380, 96, 96, 96, 96, 26, 26 },// Arabic/Arabic/Lebanon
+      {     8,     1,   122,  284,  284,  284,  284,  380,  380, 96, 96, 96, 96, 26, 26 },// Arabic/Arabic/Libya
+      {     8,     1,   136,  284,  284,  284,  284,  380,  380, 96, 96, 96, 96, 26, 26 },// Arabic/Arabic/Mauritania
+      {     8,     1,   145,  284,  284,  284,  284,  380,  380, 96, 96, 96, 96, 26, 26 },// Arabic/Arabic/Morocco
+      {     8,     1,   162,  284,  284,  284,  284,  380,  380, 96, 96, 96, 96, 26, 26 },// Arabic/Arabic/Oman
+      {     8,     1,   165,  284,  284,  284,  284,  380,  380, 96, 96, 96, 96, 26, 26 },// Arabic/Arabic/Palestinian Territories
+      {     8,     1,   175,  284,  284,  284,  284,  380,  380, 96, 96, 96, 96, 26, 26 },// Arabic/Arabic/Qatar
+      {     8,     1,   186,  284,  284,  284,  284,  380,  380, 96, 96, 96, 96, 26, 26 },// Arabic/Arabic/Saudi Arabia
+      {     8,     1,   194,  284,  284,  284,  284,  380,  380, 96, 96, 96, 96, 26, 26 },// Arabic/Arabic/Somalia
+      {     8,     1,   201,  284,  284,  284,  284,  380,  380, 96, 96, 96, 96, 26, 26 },// Arabic/Arabic/Sudan
+      {     8,     1,   207,  284,  284,  284,  284,  380,  380, 96, 96, 96, 96, 26, 26 },// Arabic/Arabic/Syria
+      {     8,     1,   216,  284,  284,  284,  284,  380,  380, 96, 96, 96, 96, 26, 26 },// Arabic/Arabic/Tunisia
+      {     8,     1,   223,  284,  284,  284,  284,  380,  380, 96, 96, 96, 96, 26, 26 },// Arabic/Arabic/United Arab Emirates
+      {     8,     1,   236,  284,  284,  284,  284,  380,  380, 96, 96, 96, 96, 26, 26 },// Arabic/Arabic/Western Sahara
+      {     8,     1,   237,  284,  284,  284,  284,  380,  380, 96, 96, 96, 96, 26, 26 },// Arabic/Arabic/Yemen
+      {     8,     1,   254,  284,  284,  284,  284,  380,  380, 96, 96, 96, 96, 26, 26 },// Arabic/Arabic/South Sudan
+      {     8,     1,   260,  284,  284,  284,  284,  380,  380, 96, 96, 96, 96, 26, 26 },// Arabic/Arabic/World
+      {     9,    10,    11,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Armenian/Armenian/Armenia
+      {    10,    11,   100,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Assamese/Bengali/India
+      {    12,     7,    15,  406,  406,  516,  516,  184,  184,110,110, 71, 71, 26, 26 },// Azerbaijani/Latin/Azerbaijan
+      {    12,     1,   102,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Azerbaijani/Arabic/Iran
+      {    12,     2,    15,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Azerbaijani/Cyrillic/Azerbaijan
+      {    13,     2,   178,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Bashkir/Cyrillic/Russia
+      {    14,     7,   197,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Basque/Latin/Spain
+      {    15,    11,    18,  587,  587,  587,  587,  691,  691,104,104,104,104, 26, 26 },// Bengali/Bengali/Bangladesh
+      {    15,    11,   100,  587,  587,  587,  587,  691,  691,104,104,104,104, 26, 26 },// Bengali/Bengali/India
+      {    16,    31,    25,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Dzongkha/Tibetan/Bhutan
+      {    19,     7,    74,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Breton/Latin/France
+      {    20,     2,    33,  717,  717,  106,  106,  184,  184, 96, 96, 78, 78, 26, 26 },// Bulgarian/Cyrillic/Bulgaria
+      {    21,    25,   147,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Burmese/Myanmar/Myanmar
+      {    22,     2,    20,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Belarusian/Cyrillic/Belarus
+      {    23,    20,    36,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Khmer/Khmer/Cambodia
+      {    24,     7,   197,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Catalan/Latin/Spain
+      {    24,     7,     5,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Catalan/Latin/Andorra
+      {    24,     7,    74,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Catalan/Latin/France
+      {    24,     7,   106,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Catalan/Latin/Italy
+      {    25,     5,    44,  813,  813,  850,  850,  184,  184, 37, 37, 38, 38, 26, 26 },// Chinese/Simplified Han/China
+      {    25,     5,    97,  813,  813,  850,  850,  184,  184, 37, 37, 38, 38, 26, 26 },// Chinese/Simplified Han/Hong Kong
+      {    25,     5,   126,  813,  813,  850,  850,  184,  184, 37, 37, 38, 38, 26, 26 },// Chinese/Simplified Han/Macau
+      {    25,     5,   190,  813,  813,  850,  850,  184,  184, 37, 37, 38, 38, 26, 26 },// Chinese/Simplified Han/Singapore
+      {    25,     6,    97,  888,  888,  888,  888,  184,  184, 71, 71, 71, 71, 26, 26 },// Chinese/Traditional Han/Hong Kong
+      {    25,     6,   126,  888,  888,  888,  888,  184,  184, 71, 71, 71, 71, 26, 26 },// Chinese/Traditional Han/Macau
+      {    25,     6,   208,  888,  888,  888,  888,  184,  184, 71, 71, 71, 71, 26, 26 },// Chinese/Traditional Han/Taiwan
+      {    26,     7,    74,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Corsican/Latin/France
+      {    27,     7,    54,    0,    0,  106,  106,  959,  959,106,106, 78, 78, 38, 38 },// Croatian/Latin/Croatia
+      {    27,     7,    27,    0,    0,  106,  106,  959,  959,106,106, 78, 78, 38, 38 },// Croatian/Latin/Bosnia And Herzegowina
+      {    28,     7,    57,  997,  997, 1126, 1126,  184,  184,129,129, 76, 76, 26, 26 },// Czech/Latin/Czech Republic
+      {    29,     7,    58, 1202, 1202,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Danish/Latin/Denmark
+      {    29,     7,    86, 1202, 1202,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Danish/Latin/Greenland
+      {    30,     7,   151, 1308, 1308, 1442, 1442,  184,  184,134,134, 83, 83, 26, 26 },// Dutch/Latin/Netherlands
+      {    30,     7,    12, 1308, 1308, 1442, 1442,  184,  184,134,134, 83, 83, 26, 26 },// Dutch/Latin/Aruba
+      {    30,     7,    21, 1308, 1308, 1442, 1442,  184,  184,134,134, 83, 83, 26, 26 },// Dutch/Latin/Belgium
+      {    30,     7,   152, 1308, 1308, 1442, 1442,  184,  184,134,134, 83, 83, 26, 26 },// Dutch/Latin/Cura Sao
+      {    30,     7,   202, 1308, 1308, 1442, 1442,  184,  184,134,134, 83, 83, 26, 26 },// Dutch/Latin/Suriname
+      {    30,     7,   255, 1308, 1308, 1442, 1442,  184,  184,134,134, 83, 83, 26, 26 },// Dutch/Latin/Bonaire
+      {    30,     7,   256, 1308, 1308, 1442, 1442,  184,  184,134,134, 83, 83, 26, 26 },// Dutch/Latin/Sint Maarten
+      {    31,     7,   225,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// English/Latin/United States
+      {    31,     3,   225,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// English/Deseret/United States
+      {    31,     7,     4,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// English/Latin/American Samoa
+      {    31,     7,     7,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// English/Latin/Anguilla
+      {    31,     7,     9,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// English/Latin/Antigua And Barbuda
+      {    31,     7,    13,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// English/Latin/Australia
+      {    31,     7,    14,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// English/Latin/Austria
+      {    31,     7,    16,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// English/Latin/Bahamas
+      {    31,     7,    19,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// English/Latin/Barbados
+      {    31,     7,    21,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// English/Latin/Belgium
+      {    31,     7,    22,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// English/Latin/Belize
+      {    31,     7,    24,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// English/Latin/Bermuda
+      {    31,     7,    28,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// English/Latin/Botswana
+      {    31,     7,    31,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// English/Latin/British Indian Ocean Territory
+      {    31,     7,    35,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// English/Latin/Burundi
+      {    31,     7,    37,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// English/Latin/Cameroon
+      {    31,     7,    38,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// English/Latin/Canada
+      {    31,     7,    40,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// English/Latin/Cayman Islands
+      {    31,     7,    45,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// English/Latin/Christmas Island
+      {    31,     7,    46,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// English/Latin/Cocos Islands
+      {    31,     7,    51,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// English/Latin/Cook Islands
+      {    31,     7,    56,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// English/Latin/Cyprus
+      {    31,     7,    58,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// English/Latin/Denmark
+      {    31,     7,    60,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// English/Latin/Dominica
+      {    31,     7,    67,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// English/Latin/Eritrea
+      {    31,     7,    70,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// English/Latin/Falkland Islands
+      {    31,     7,    72,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// English/Latin/Fiji
+      {    31,     7,    73,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// English/Latin/Finland
+      {    31,     7,    75,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// English/Latin/Guernsey
+      {    31,     7,    80,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// English/Latin/Gambia
+      {    31,     7,    82,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// English/Latin/Germany
+      {    31,     7,    83,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// English/Latin/Ghana
+      {    31,     7,    84,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// English/Latin/Gibraltar
+      {    31,     7,    87,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// English/Latin/Grenada
+      {    31,     7,    89,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// English/Latin/Guam
+      {    31,     7,    93,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// English/Latin/Guyana
+      {    31,     7,    97,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// English/Latin/Hong Kong
+      {    31,     7,   100,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// English/Latin/India
+      {    31,     7,   104,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// English/Latin/Ireland
+      {    31,     7,   105,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// English/Latin/Israel
+      {    31,     7,   107,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// English/Latin/Jamaica
+      {    31,     7,   111,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// English/Latin/Kenya
+      {    31,     7,   112,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// English/Latin/Kiribati
+      {    31,     7,   120,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// English/Latin/Lesotho
+      {    31,     7,   121,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// English/Latin/Liberia
+      {    31,     7,   126,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// English/Latin/Macau
+      {    31,     7,   128,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// English/Latin/Madagascar
+      {    31,     7,   129,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// English/Latin/Malawi
+      {    31,     7,   130,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// English/Latin/Malaysia
+      {    31,     7,   133,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// English/Latin/Malta
+      {    31,     7,   134,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// English/Latin/Marshall Islands
+      {    31,     7,   137,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// English/Latin/Mauritius
+      {    31,     7,   140,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// English/Latin/Micronesia
+      {    31,     7,   144,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// English/Latin/Montserrat
+      {    31,     7,   148,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// English/Latin/Namibia
+      {    31,     7,   149,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// English/Latin/Nauru
+      {    31,     7,   151,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// English/Latin/Netherlands
+      {    31,     7,   154,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// English/Latin/New Zealand
+      {    31,     7,   157,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// English/Latin/Nigeria
+      {    31,     7,   158,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// English/Latin/Niue
+      {    31,     7,   159,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// English/Latin/Norfolk Island
+      {    31,     7,   160,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// English/Latin/Northern Mariana Islands
+      {    31,     7,   163,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// English/Latin/Pakistan
+      {    31,     7,   164,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// English/Latin/Palau
+      {    31,     7,   167,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// English/Latin/Papua New Guinea
+      {    31,     7,   170,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// English/Latin/Philippines
+      {    31,     7,   171,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// English/Latin/Pitcairn
+      {    31,     7,   174,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// English/Latin/Puerto Rico
+      {    31,     7,   179,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// English/Latin/Rwanda
+      {    31,     7,   180,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// English/Latin/Saint Kitts And Nevis
+      {    31,     7,   181,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// English/Latin/Saint Lucia
+      {    31,     7,   182,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// English/Latin/Saint Vincent And The Grenadines
+      {    31,     7,   183,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// English/Latin/Samoa
+      {    31,     7,   188,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// English/Latin/Seychelles
+      {    31,     7,   189,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// English/Latin/Sierra Leone
+      {    31,     7,   190,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// English/Latin/Singapore
+      {    31,     7,   192,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// English/Latin/Slovenia
+      {    31,     7,   193,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// English/Latin/Solomon Islands
+      {    31,     7,   195,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// English/Latin/South Africa
+      {    31,     7,   199,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// English/Latin/Saint Helena
+      {    31,     7,   201,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// English/Latin/Sudan
+      {    31,     7,   204,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// English/Latin/Swaziland
+      {    31,     7,   205,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// English/Latin/Sweden
+      {    31,     7,   206,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// English/Latin/Switzerland
+      {    31,     7,   210,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// English/Latin/Tanzania
+      {    31,     7,   213,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// English/Latin/Tokelau
+      {    31,     7,   214,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// English/Latin/Tonga
+      {    31,     7,   215,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// English/Latin/Trinidad And Tobago
+      {    31,     7,   219,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// English/Latin/Turks And Caicos Islands
+      {    31,     7,   220,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// English/Latin/Tuvalu
+      {    31,     7,   221,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// English/Latin/Uganda
+      {    31,     7,   223,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// English/Latin/United Arab Emirates
+      {    31,     7,   224,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// English/Latin/United Kingdom
+      {    31,     7,   226,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// English/Latin/United States Minor Outlying Islands
+      {    31,     7,   229,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// English/Latin/Vanuatu
+      {    31,     7,   233,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// English/Latin/British Virgin Islands
+      {    31,     7,   234,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// English/Latin/United States Virgin Islands
+      {    31,     7,   239,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// English/Latin/Zambia
+      {    31,     7,   240,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// English/Latin/Zimbabwe
+      {    31,     7,   249,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// English/Latin/Diego Garcia
+      {    31,     7,   251,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// English/Latin/Isle Of Man
+      {    31,     7,   252,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// English/Latin/Jersey
+      {    31,     7,   254,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// English/Latin/South Sudan
+      {    31,     7,   256,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// English/Latin/Sint Maarten
+      {    31,     7,   260,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// English/Latin/World
+      {    31,     7,   261,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// English/Latin/Europe
+      {    32,     7,   260,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Esperanto/Latin/World
+      {    33,     7,    68,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Estonian/Latin/Estonia
+      {    34,     7,    71,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Faroese/Latin/Faroe Islands
+      {    34,     7,    58,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Faroese/Latin/Denmark
+      {    36,     7,    73, 1525, 1525,  106,  106,  184,  184,129,129, 78, 78, 26, 26 },// Finnish/Latin/Finland
+      {    37,     7,    74, 1654, 1654, 1793, 1883,  184,  184,139,139, 90, 90, 26, 26 },// French/Latin/France
+      {    37,     7,     3, 1654, 1654, 1793, 1883,  184,  184,139,139, 90, 90, 26, 26 },// French/Latin/Algeria
+      {    37,     7,    21, 1654, 1654, 1793, 1883,  184,  184,139,139, 90, 90, 26, 26 },// French/Latin/Belgium
+      {    37,     7,    23, 1654, 1654, 1793, 1883,  184,  184,139,139, 90, 90, 26, 26 },// French/Latin/Benin
+      {    37,     7,    34, 1654, 1654, 1793, 1883,  184,  184,139,139, 90, 90, 26, 26 },// French/Latin/Burkina Faso
+      {    37,     7,    35, 1654, 1654, 1793, 1883,  184,  184,139,139, 90, 90, 26, 26 },// French/Latin/Burundi
+      {    37,     7,    37, 1654, 1654, 1793, 1883,  184,  184,139,139, 90, 90, 26, 26 },// French/Latin/Cameroon
+      {    37,     7,    38, 1654, 1654, 1793, 1883,  184,  184,139,139, 90, 90, 26, 26 },// French/Latin/Canada
+      {    37,     7,    41, 1654, 1654, 1793, 1883,  184,  184,139,139, 90, 90, 26, 26 },// French/Latin/Central African Republic
+      {    37,     7,    42, 1654, 1654, 1793, 1883,  184,  184,139,139, 90, 90, 26, 26 },// French/Latin/Chad
+      {    37,     7,    48, 1654, 1654, 1793, 1883,  184,  184,139,139, 90, 90, 26, 26 },// French/Latin/Comoros
+      {    37,     7,    49, 1654, 1654, 1793, 1883,  184,  184,139,139, 90, 90, 26, 26 },// French/Latin/Congo Kinshasa
+      {    37,     7,    50, 1654, 1654, 1793, 1883,  184,  184,139,139, 90, 90, 26, 26 },// French/Latin/Congo Brazzaville
+      {    37,     7,    53, 1654, 1654, 1793, 1883,  184,  184,139,139, 90, 90, 26, 26 },// French/Latin/Ivory Coast
+      {    37,     7,    59, 1654, 1654, 1793, 1883,  184,  184,139,139, 90, 90, 26, 26 },// French/Latin/Djibouti
+      {    37,     7,    66, 1654, 1654, 1793, 1883,  184,  184,139,139, 90, 90, 26, 26 },// French/Latin/Equatorial Guinea
+      {    37,     7,    76, 1654, 1654, 1793, 1883,  184,  184,139,139, 90, 90, 26, 26 },// French/Latin/French Guiana
+      {    37,     7,    77, 1654, 1654, 1793, 1883,  184,  184,139,139, 90, 90, 26, 26 },// French/Latin/French Polynesia
+      {    37,     7,    79, 1654, 1654, 1793, 1883,  184,  184,139,139, 90, 90, 26, 26 },// French/Latin/Gabon
+      {    37,     7,    88, 1654, 1654, 1793, 1883,  184,  184,139,139, 90, 90, 26, 26 },// French/Latin/Guadeloupe
+      {    37,     7,    91, 1654, 1654, 1793, 1883,  184,  184,139,139, 90, 90, 26, 26 },// French/Latin/Guinea
+      {    37,     7,    94, 1654, 1654, 1793, 1883,  184,  184,139,139, 90, 90, 26, 26 },// French/Latin/Haiti
+      {    37,     7,   125, 1654, 1654, 1793, 1883,  184,  184,139,139, 90, 90, 26, 26 },// French/Latin/Luxembourg
+      {    37,     7,   128, 1654, 1654, 1793, 1883,  184,  184,139,139, 90, 90, 26, 26 },// French/Latin/Madagascar
+      {    37,     7,   132, 1654, 1654, 1793, 1883,  184,  184,139,139, 90, 90, 26, 26 },// French/Latin/Mali
+      {    37,     7,   135, 1654, 1654, 1793, 1883,  184,  184,139,139, 90, 90, 26, 26 },// French/Latin/Martinique
+      {    37,     7,   136, 1654, 1654, 1793, 1883,  184,  184,139,139, 90, 90, 26, 26 },// French/Latin/Mauritania
+      {    37,     7,   137, 1654, 1654, 1793, 1883,  184,  184,139,139, 90, 90, 26, 26 },// French/Latin/Mauritius
+      {    37,     7,   138, 1654, 1654, 1793, 1883,  184,  184,139,139, 90, 90, 26, 26 },// French/Latin/Mayotte
+      {    37,     7,   142, 1654, 1654, 1793, 1883,  184,  184,139,139, 90, 90, 26, 26 },// French/Latin/Monaco
+      {    37,     7,   145, 1654, 1654, 1793, 1883,  184,  184,139,139, 90, 90, 26, 26 },// French/Latin/Morocco
+      {    37,     7,   153, 1654, 1654, 1793, 1883,  184,  184,139,139, 90, 90, 26, 26 },// French/Latin/New Caledonia
+      {    37,     7,   156, 1654, 1654, 1793, 1883,  184,  184,139,139, 90, 90, 26, 26 },// French/Latin/Niger
+      {    37,     7,   176, 1654, 1654, 1793, 1883,  184,  184,139,139, 90, 90, 26, 26 },// French/Latin/Reunion
+      {    37,     7,   179, 1654, 1654, 1793, 1883,  184,  184,139,139, 90, 90, 26, 26 },// French/Latin/Rwanda
+      {    37,     7,   187, 1654, 1654, 1793, 1883,  184,  184,139,139, 90, 90, 26, 26 },// French/Latin/Senegal
+      {    37,     7,   188, 1654, 1654, 1793, 1883,  184,  184,139,139, 90, 90, 26, 26 },// French/Latin/Seychelles
+      {    37,     7,   200, 1654, 1654, 1793, 1883,  184,  184,139,139, 90, 90, 26, 26 },// French/Latin/Saint Pierre And Miquelon
+      {    37,     7,   206, 1654, 1654, 1793, 1883,  184,  184,139,139, 90, 90, 26, 26 },// French/Latin/Switzerland
+      {    37,     7,   207, 1654, 1654, 1793, 1883,  184,  184,139,139, 90, 90, 26, 26 },// French/Latin/Syria
+      {    37,     7,   212, 1654, 1654, 1793, 1883,  184,  184,139,139, 90, 90, 26, 26 },// French/Latin/Togo
+      {    37,     7,   216, 1654, 1654, 1793, 1883,  184,  184,139,139, 90, 90, 26, 26 },// French/Latin/Tunisia
+      {    37,     7,   229, 1654, 1654, 1793, 1883,  184,  184,139,139, 90, 90, 26, 26 },// French/Latin/Vanuatu
+      {    37,     7,   235, 1654, 1654, 1793, 1883,  184,  184,139,139, 90, 90, 26, 26 },// French/Latin/Wallis And Futuna Islands
+      {    37,     7,   244, 1654, 1654, 1793, 1883,  184,  184,139,139, 90, 90, 26, 26 },// French/Latin/Saint Barthelemy
+      {    37,     7,   245, 1654, 1654, 1793, 1883,  184,  184,139,139, 90, 90, 26, 26 },// French/Latin/Saint Martin
+      {    38,     7,   151, 1308, 1308, 1442, 1442,  184,  184,134,134, 83, 83, 26, 26 },// Western Frisian/Latin/Netherlands
+      {    39,     7,   224,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Gaelic/Latin/United Kingdom
+      {    40,     7,   197,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Galician/Latin/Spain
+      {    41,    15,    81, 1973, 1973, 2097, 2097,  184,  184,124,124, 73, 73, 26, 26 },// Georgian/Georgian/Georgia
+      {    42,     7,    82, 2170, 2170,  106,  106,  184,  184,116,116, 78, 78, 26, 26 },// German/Latin/Germany
+      {    42,     7,    14, 2170, 2170,  106,  106,  184,  184,116,116, 78, 78, 26, 26 },// German/Latin/Austria
+      {    42,     7,    21, 2170, 2170,  106,  106,  184,  184,116,116, 78, 78, 26, 26 },// German/Latin/Belgium
+      {    42,     7,   106, 2170, 2170,  106,  106,  184,  184,116,116, 78, 78, 26, 26 },// German/Latin/Italy
+      {    42,     7,   123, 2170, 2170,  106,  106,  184,  184,116,116, 78, 78, 26, 26 },// German/Latin/Liechtenstein
+      {    42,     7,   125, 2170, 2170,  106,  106,  184,  184,116,116, 78, 78, 26, 26 },// German/Latin/Luxembourg
+      {    42,     7,   206, 2170, 2170,  106,  106,  184,  184,116,116, 78, 78, 26, 26 },// German/Latin/Switzerland
+      {    43,    16,    85,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Greek/Greek/Greece
+      {    43,    16,    56,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Greek/Greek/Cyprus
+      {    44,     7,    86,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Greenlandic/Latin/Greenland
+      {    45,     7,   168,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Guarani/Latin/Paraguay
+      {    46,    17,   100, 2286, 2286, 2384, 2384,  184,  184, 98, 98, 74, 74, 26, 26 },// Gujarati/Gujarati/India
+      {    47,     7,   157,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Hausa/Latin/Nigeria
+      {    47,     1,   157,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Hausa/Arabic/Nigeria
+      {    47,     7,    83,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Hausa/Latin/Ghana
+      {    47,     7,   156,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Hausa/Latin/Niger
+      {    48,    18,   105, 2458, 2574, 2690, 2690,  184,  184,116,116, 95, 95, 26, 26 },// Hebrew/Hebrew/Israel
+      {    49,    13,   100, 2785, 2785,  106,  106,  184,  184,108,108, 78, 78, 26, 26 },// Hindi/Devanagari/India
+      {    50,     7,    98, 2893, 2992, 3119, 3119,  184,  184, 99,127, 76, 76, 26, 26 },// Hungarian/Latin/Hungary
+      {    51,     7,    99, 1202, 1202, 3195, 3195,  184,  184,106,106, 78, 78, 26, 26 },// Icelandic/Latin/Iceland
+      {    52,     7,   101, 3273, 3273, 3382, 3382,  184,  184,109,109, 86, 86, 26, 26 },// Indonesian/Latin/Indonesia
+      {    53,     7,   260,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Interlingua/Latin/World
+      {    55,    44,    38,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Inuktitut/Canadian Aboriginal/Canada
+      {    55,     7,    38,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Inuktitut/Latin/Canada
+      {    57,     7,   104,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Irish/Latin/Ireland
+      {    57,     7,   224,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Irish/Latin/United Kingdom
+      {    58,     7,   106,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Italian/Latin/Italy
+      {    58,     7,   184,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Italian/Latin/San Marino
+      {    58,     7,   206,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Italian/Latin/Switzerland
+      {    58,     7,   230,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Italian/Latin/Vatican City State
+      {    59,    19,   108, 3468, 3468, 3468, 3468,  184,  184, 97, 97, 97, 97, 26, 26 },// Japanese/Japanese/Japan
+      {    60,     7,   101,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Javanese/Latin/Indonesia
+      {    61,    21,   100, 3565, 3565, 3665, 3665,  184,  184,100,100, 79, 79, 26, 26 },// Kannada/Kannada/India
+      {    62,     1,   100,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Kashmiri/Arabic/India
+      {    63,     2,   110,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Kazakh/Cyrillic/Kazakhstan
+      {    64,     7,   179,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Kinyarwanda/Latin/Rwanda
+      {    65,     2,   116,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Kirghiz/Cyrillic/Kyrgyzstan
+      {    66,    22,   114, 3744, 3744,  106,  106,  184,  184, 69, 69, 78, 78, 26, 26 },// Korean/Korean/South Korea
+      {    66,    22,   113, 3744, 3744,  106,  106,  184,  184, 69, 69, 78, 78, 26, 26 },// Korean/Korean/North Korea
+      {    67,     7,   217, 3813, 3813,  106,  106,  184,  184,109,109, 78, 78, 26, 26 },// Kurdish/Latin/Turkey
+      {    68,     7,    35,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Rundi/Latin/Burundi
+      {    69,    23,   117, 3922, 3922, 4017, 4092,  184,  184, 95, 95, 75, 77, 26, 26 },// Lao/Lao/Laos
+      {    71,     7,   118, 4169, 4169,  106,  106,  184,  184,108,108, 78, 78, 26, 26 },// Latvian/Latin/Latvia
+      {    72,     7,    49,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Lingala/Latin/Congo Kinshasa
+      {    72,     7,     6,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Lingala/Latin/Angola
+      {    72,     7,    41,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Lingala/Latin/Central African Republic
+      {    72,     7,    50,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Lingala/Latin/Congo Brazzaville
+      {    73,     7,   124,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Lithuanian/Latin/Lithuania
+      {    74,     2,   127, 4277, 4277, 4366, 4366,  184,  184, 89, 89, 71, 71, 26, 26 },// Macedonian/Cyrillic/Macedonia
+      {    75,     7,   128,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Malagasy/Latin/Madagascar
+      {    76,     7,   130,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Malay/Latin/Malaysia
+      {    76,     1,   130,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Malay/Arabic/Malaysia
+      {    76,     7,    32,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Malay/Latin/Brunei
+      {    76,     7,   190,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Malay/Latin/Singapore
+      {    77,    24,   100, 4437, 4539, 4641, 4641, 4738, 4738,102,102, 97, 97, 26, 26 },// Malayalam/Malayalam/India
+      {    78,     7,   133,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Maltese/Latin/Malta
+      {    79,     7,   154,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Maori/Latin/New Zealand
+      {    80,    13,   100, 4764, 4764, 4851, 4851, 4929, 4929, 87, 87, 78, 78, 26, 26 },// Marathi/Devanagari/India
+      {    82,     2,   143,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Mongolian/Cyrillic/Mongolia
+      {    82,     8,    44,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Mongolian/Mongolian/China
+      {    84,    13,   150,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Nepali/Devanagari/Nepal
+      {    84,    13,   100,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Nepali/Devanagari/India
+      {    85,     7,   161, 4955, 4955, 5061, 5139,  184,  184,106,106, 78, 78, 26, 26 },// Norwegian Bokmal/Latin/Norway
+      {    85,     7,   203, 4955, 4955, 5061, 5139,  184,  184,106,106, 78, 78, 26, 26 },// Norwegian Bokmal/Latin/Svalbard And Jan Mayen Islands
+      {    86,     7,    74,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Occitan/Latin/France
+      {    87,    26,   100,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Oriya/Oriya/India
+      {    88,     1,     1, 5217, 5291, 5366, 5439,  184,  184, 74, 75, 73, 73, 26, 26 },// Pashto/Arabic/Afghanistan
+      {    88,     1,   163, 5512, 5591, 5366, 5439,  184,  184, 79, 80, 73, 73, 26, 26 },// Pashto/Arabic/Pakistan
+      {    89,     1,   102, 5671, 5761, 5671, 5761, 5853, 5853, 90, 92, 90, 92, 23, 23 },// Persian/Arabic/Iran
+      {    89,     1,     1, 5671, 5761, 5671, 5761, 5853, 5853, 90, 92, 90, 92, 23, 23 },// Persian/Arabic/Afghanistan
+      {    90,     7,   172, 5876, 5876, 5983, 5983,  184,  184,107,107, 77, 77, 26, 26 },// Polish/Latin/Poland
+      {    91,     7,    30,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Portuguese/Latin/Brazil
+      {    91,     7,     6,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Portuguese/Latin/Angola
+      {    91,     7,    39,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Portuguese/Latin/Cape Verde
+      {    91,     7,    62,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Portuguese/Latin/East Timor
+      {    91,     7,    66,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Portuguese/Latin/Equatorial Guinea
+      {    91,     7,    92,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Portuguese/Latin/Guinea Bissau
+      {    91,     7,   125,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Portuguese/Latin/Luxembourg
+      {    91,     7,   126,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Portuguese/Latin/Macau
+      {    91,     7,   146,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Portuguese/Latin/Mozambique
+      {    91,     7,   173,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Portuguese/Latin/Portugal
+      {    91,     7,   185,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Portuguese/Latin/Sao Tome And Principe
+      {    91,     7,   206,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Portuguese/Latin/Switzerland
+      {    92,     4,   100, 6060, 6152, 6246, 6246,  184,  184, 92, 94, 77, 77, 26, 26 },// Punjabi/Gurmukhi/India
+      {    92,     1,   163,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Punjabi/Arabic/Pakistan
+      {    93,     7,   169,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Quechua/Latin/Peru
+      {    93,     7,    26,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Quechua/Latin/Bolivia
+      {    93,     7,    63,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Quechua/Latin/Ecuador
+      {    94,     7,   206,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Romansh/Latin/Switzerland
+      {    95,     7,   177,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Romanian/Latin/Romania
+      {    95,     7,   141,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Romanian/Latin/Moldova
+      {    96,     2,   178, 6323, 6323, 6454, 6454,  184,  184,131,131, 79, 79, 26, 26 },// Russian/Cyrillic/Russia
+      {    96,     2,    20, 6323, 6323, 6454, 6454,  184,  184,131,131, 79, 79, 26, 26 },// Russian/Cyrillic/Belarus
+      {    96,     2,   110, 6323, 6323, 6454, 6454,  184,  184,131,131, 79, 79, 26, 26 },// Russian/Cyrillic/Kazakhstan
+      {    96,     2,   116, 6323, 6323, 6454, 6454,  184,  184,131,131, 79, 79, 26, 26 },// Russian/Cyrillic/Kyrgyzstan
+      {    96,     2,   141, 6323, 6323, 6454, 6454,  184,  184,131,131, 79, 79, 26, 26 },// Russian/Cyrillic/Moldova
+      {    96,     2,   222, 6323, 6323, 6454, 6454,  184,  184,131,131, 79, 79, 26, 26 },// Russian/Cyrillic/Ukraine
+      {    98,     7,    41,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Sango/Latin/Central African Republic
+      {    99,    13,   100,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Sanskrit/Devanagari/India
+      {   100,     2,   243, 6533, 6623, 6720, 6720,  184,  184, 90, 97, 69, 69, 26, 26 },// Serbian/Cyrillic/Serbia
+      {   100,     7,    27, 6789, 6883, 6980, 6980,  184,  184, 94, 97, 72, 72, 26, 26 },// Serbian/Latin/Bosnia And Herzegowina
+      {   100,     7,   242, 6789, 6883, 6980, 6980,  184,  184, 94, 97, 72, 72, 26, 26 },// Serbian/Latin/Montenegro
+      {   100,     7,   243, 6789, 6883, 6980, 6980,  184,  184, 94, 97, 72, 72, 26, 26 },// Serbian/Latin/Serbia
+      {   100,     2,    27, 6533, 6623, 6720, 6720,  184,  184, 90, 97, 69, 69, 26, 26 },// Serbian/Cyrillic/Bosnia And Herzegowina
+      {   100,     2,   242, 6533, 6623, 6720, 6720,  184,  184, 90, 97, 69, 69, 26, 26 },// Serbian/Cyrillic/Montenegro
+      {   100,     2,   257, 6533, 6623, 6720, 6720,  184,  184, 90, 97, 69, 69, 26, 26 },// Serbian/Cyrillic/Kosovo
+      {   100,     7,   257, 6789, 6883, 6980, 6980,  184,  184, 94, 97, 72, 72, 26, 26 },// Serbian/Latin/Kosovo
+      {   101,     2,    81,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Ossetic/Cyrillic/Georgia
+      {   101,     2,   178,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Ossetic/Cyrillic/Russia
+      {   102,     7,   195,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Southern Sotho/Latin/South Africa
+      {   103,     7,   195,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Tswana/Latin/South Africa
+      {   104,     7,   240,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Shona/Latin/Zimbabwe
+      {   105,     1,   163,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Sindhi/Arabic/Pakistan
+      {   106,    32,   198,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Sinhala/Sinhala/Sri Lanka
+      {   107,     7,   195,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Swati/Latin/South Africa
+      {   108,     7,   191, 7052, 7052, 7187, 7187,  184,  184,135,135, 78, 78, 26, 26 },// Slovak/Latin/Slovakia
+      {   109,     7,   192,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Slovenian/Latin/Slovenia
+      {   110,     7,   194, 7265, 7396, 7526, 7600,  184,  184,131,130, 74, 78, 26, 26 },// Somali/Latin/Somalia
+      {   110,     7,    59, 7265, 7396, 7526, 7600,  184,  184,131,130, 74, 78, 26, 26 },// Somali/Latin/Djibouti
+      {   110,     7,    69, 7265, 7396, 7526, 7600,  184,  184,131,130, 74, 78, 26, 26 },// Somali/Latin/Ethiopia
+      {   110,     7,   111, 7265, 7396, 7526, 7600,  184,  184,131,130, 74, 78, 26, 26 },// Somali/Latin/Kenya
+      {   111,     7,   197, 7678, 7678, 5139, 5139,  184,  184,106,106, 78, 78, 26, 26 },// Spanish/Latin/Spain
+      {   111,     7,    10,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Spanish/Latin/Argentina
+      {   111,     7,    22,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Spanish/Latin/Belize
+      {   111,     7,    26,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Spanish/Latin/Bolivia
+      {   111,     7,    30,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Spanish/Latin/Brazil
+      {   111,     7,    43,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Spanish/Latin/Chile
+      {   111,     7,    47,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Spanish/Latin/Colombia
+      {   111,     7,    52,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Spanish/Latin/Costa Rica
+      {   111,     7,    55,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Spanish/Latin/Cuba
+      {   111,     7,    61,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Spanish/Latin/Dominican Republic
+      {   111,     7,    63,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Spanish/Latin/Ecuador
+      {   111,     7,    65,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Spanish/Latin/El Salvador
+      {   111,     7,    66, 7678, 7678, 5139, 5139,  184,  184,106,106, 78, 78, 26, 26 },// Spanish/Latin/Equatorial Guinea
+      {   111,     7,    90,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Spanish/Latin/Guatemala
+      {   111,     7,    96,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Spanish/Latin/Honduras
+      {   111,     7,   139,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Spanish/Latin/Mexico
+      {   111,     7,   155,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Spanish/Latin/Nicaragua
+      {   111,     7,   166,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Spanish/Latin/Panama
+      {   111,     7,   168,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Spanish/Latin/Paraguay
+      {   111,     7,   169,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Spanish/Latin/Peru
+      {   111,     7,   170, 7678, 7678, 5139, 5139,  184,  184,106,106, 78, 78, 26, 26 },// Spanish/Latin/Philippines
+      {   111,     7,   174,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Spanish/Latin/Puerto Rico
+      {   111,     7,   225,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Spanish/Latin/United States
+      {   111,     7,   227,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Spanish/Latin/Uruguay
+      {   111,     7,   231,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Spanish/Latin/Venezuela
+      {   111,     7,   238, 7678, 7678, 5139, 5139,  184,  184,106,106, 78, 78, 26, 26 },// Spanish/Latin/Canary Islands
+      {   111,     7,   246,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Spanish/Latin/Latin America
+      {   111,     7,   250, 7678, 7678, 5139, 5139,  184,  184,106,106, 78, 78, 26, 26 },// Spanish/Latin/Ceuta And Melilla
+      {   112,     7,   101,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Sundanese/Latin/Indonesia
+      {   113,     7,   210,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Swahili/Latin/Tanzania
+      {   113,     7,    49,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Swahili/Latin/Congo Kinshasa
+      {   113,     7,   111,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Swahili/Latin/Kenya
+      {   113,     7,   221,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Swahili/Latin/Uganda
+      {   114,     7,   205, 7784, 7911,  106,  106,  184,  184,127,127, 78, 78, 26, 26 },// Swedish/Latin/Sweden
+      {   114,     7,    73, 7784, 7911,  106,  106,  184,  184,127,127, 78, 78, 26, 26 },// Swedish/Latin/Finland
+      {   114,     7,   248, 7784, 7911,  106,  106,  184,  184,127,127, 78, 78, 26, 26 },// Swedish/Latin/Aland Islands
+      {   115,     7,   106,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Sardinian/Latin/Italy
+      {   116,     2,   209, 8038, 8148, 8258, 8258,  184,  184,110,110, 74, 74, 26, 26 },// Tajik/Cyrillic/Tajikistan
+      {   117,    27,   100, 8332, 8332, 8423, 8423,  184,  184, 91, 91, 72, 72, 26, 26 },// Tamil/Tamil/India
+      {   117,    27,   130, 8332, 8332, 8423, 8423,  184,  184, 91, 91, 72, 72, 26, 26 },// Tamil/Tamil/Malaysia
+      {   117,    27,   190, 8332, 8332, 8423, 8423,  184,  184, 91, 91, 72, 72, 26, 26 },// Tamil/Tamil/Singapore
+      {   117,    27,   198, 8332, 8332, 8423, 8423,  184,  184, 91, 91, 72, 72, 26, 26 },// Tamil/Tamil/Sri Lanka
+      {   118,     2,   178,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Tatar/Cyrillic/Russia
+      {   119,    28,   100, 8495,    0, 8590, 8590,  184,  184, 95,106, 74, 74, 26, 26 },// Telugu/Telugu/India
+      {   120,    30,   211, 8664, 8664, 8766, 8766,  184,  184,102,102, 89, 89, 26, 26 },// Thai/Thai/Thailand
+      {   121,    31,    44,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Tibetan/Tibetan/China
+      {   121,    31,   100,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Tibetan/Tibetan/India
+      {   122,    14,    69,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Tigrinya/Ethiopic/Ethiopia
+      {   122,    14,    67,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Tigrinya/Ethiopic/Eritrea
+      {   123,     7,   214,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Tongan/Latin/Tonga
+      {   124,     7,   195,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Tsonga/Latin/South Africa
+      {   125,     7,   217, 8855, 8855, 8965, 8965,  184,  184,110,110, 83, 83, 26, 26 },// Turkish/Latin/Turkey
+      {   125,     7,    56, 8855, 8855, 8965, 8965,  184,  184,110,110, 83, 83, 26, 26 },// Turkish/Latin/Cyprus
+      {   126,     7,   218,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Turkmen/Latin/Turkmenistan
+      {   128,     1,    44, 9048, 9048, 9048, 9048,  184,  184,118,118,118,118, 26, 26 },// Uighur/Arabic/China
+      {   129,     2,   222, 9166, 9166, 9269, 9340,  184,  184,103,103, 71, 81, 26, 26 },// Ukrainian/Cyrillic/Ukraine
+      {   130,     1,   163, 9421, 9421, 9517, 9517,  184,  184, 96, 96, 98, 98, 26, 26 },// Urdu/Arabic/Pakistan
+      {   130,     1,   100, 9421, 9421, 9517, 9517,  184,  184, 96, 96, 98, 98, 26, 26 },// Urdu/Arabic/India
+      {   131,     7,   228, 9615, 9615, 9737, 9737,  184,  184,122,122, 82, 82, 26, 26 },// Uzbek/Latin/Uzbekistan
+      {   131,     1,     1,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Uzbek/Arabic/Afghanistan
+      {   131,     2,   228, 9819, 9819,  106,  106,  184,  184,114,114, 78, 78, 26, 26 },// Uzbek/Cyrillic/Uzbekistan
+      {   132,     7,   232,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Vietnamese/Latin/Vietnam
+      {   133,     7,   260,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Volapuk/Latin/World
+      {   134,     7,   224,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Welsh/Latin/United Kingdom
+      {   135,     7,   187,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Wolof/Latin/Senegal
+      {   136,     7,   195,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Xhosa/Latin/South Africa
+      {   137,    18,   260,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Yiddish/Hebrew/World
+      {   138,     7,   157,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Yoruba/Latin/Nigeria
+      {   138,     7,    23,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Yoruba/Latin/Benin
+      {   140,     7,   195,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Zulu/Latin/South Africa
+      {   141,     7,   161,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Norwegian Nynorsk/Latin/Norway
+      {   142,     7,    27, 9933, 9933,10031,10031,  184,  184, 98, 98, 74, 74, 26, 26 },// Bosnian/Latin/Bosnia And Herzegowina
+      {   142,     2,    27, 6533, 6623, 6720, 6720,  184,  184, 90, 97, 69, 69, 26, 26 },// Bosnian/Cyrillic/Bosnia And Herzegowina
+      {   143,    29,   131,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Divehi/Thaana/Maldives
+      {   144,     7,   251,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Manx/Latin/Isle Of Man
+      {   145,     7,   224,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Cornish/Latin/United Kingdom
+      {   146,     7,    83,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Akan/Latin/Ghana
+      {   147,    13,   100,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Konkani/Devanagari/India
+      {   148,     7,    83,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Ga/Latin/Ghana
+      {   149,     7,   157,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Igbo/Latin/Nigeria
+      {   150,     7,   111,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Kamba/Latin/Kenya
+      {   151,    33,   103,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Syriac/Syriac/Iraq
+      {   152,    14,    67,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Blin/Ethiopic/Eritrea
+      {   153,    14,    69,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Geez/Ethiopic/Ethiopia
+      {   155,     7,    69,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Sidamo/Latin/Ethiopia
+      {   156,     7,   157,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Atsam/Latin/Nigeria
+      {   157,    14,    67,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Tigre/Ethiopic/Eritrea
+      {   158,     7,   157,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Jju/Latin/Nigeria
+      {   159,     7,   106,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Friulian/Latin/Italy
+      {   160,     7,   195,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Venda/Latin/South Africa
+      {   161,     7,    83,10105,10105,10191,10191,  184,  184, 86, 86, 47, 47, 26, 26 },// Ewe/Latin/Ghana
+      {   161,     7,   212,10105,10105,10191,10191,  184,  184, 86, 86, 47, 47, 26, 26 },// Ewe/Latin/Togo
+      {   162,    14,    69,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Walamo/Ethiopic/Ethiopia
+      {   163,     7,   225,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Hawaiian/Latin/United States
+      {   164,     7,   157,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Tyap/Latin/Nigeria
+      {   165,     7,   129,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Nyanja/Latin/Malawi
+      {   166,     7,   170,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Filipino/Latin/Philippines
+      {   167,     7,   206,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Swiss German/Latin/Switzerland
+      {   167,     7,    74,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Swiss German/Latin/France
+      {   167,     7,   123,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Swiss German/Latin/Liechtenstein
+      {   168,    34,    44,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Sichuan Yi/Yi/China
+      {   169,     7,   121,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Kpelle/Latin/Liberia
+      {   170,     7,    82,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Low German/Latin/Germany
+      {   170,     7,   151,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Low German/Latin/Netherlands
+      {   171,     7,   195,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// South Ndebele/Latin/South Africa
+      {   172,     7,   195,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Northern Sotho/Latin/South Africa
+      {   173,     7,   161,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Northern Sami/Latin/Norway
+      {   173,     7,    73,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Northern Sami/Latin/Finland
+      {   173,     7,   205,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Northern Sami/Latin/Sweden
+      {   174,     7,   208,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Taroko/Latin/Taiwan
+      {   175,     7,   111,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Gusii/Latin/Kenya
+      {   176,     7,   111,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Taita/Latin/Kenya
+      {   177,     7,   187,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Fulah/Latin/Senegal
+      {   177,     7,    34,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Fulah/Latin/Burkina Faso
+      {   177,     7,    37,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Fulah/Latin/Cameroon
+      {   177,     7,    80,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Fulah/Latin/Gambia
+      {   177,     7,    83,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Fulah/Latin/Ghana
+      {   177,     7,    91,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Fulah/Latin/Guinea
+      {   177,     7,    92,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Fulah/Latin/Guinea Bissau
+      {   177,     7,   121,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Fulah/Latin/Liberia
+      {   177,     7,   136,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Fulah/Latin/Mauritania
+      {   177,     7,   156,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Fulah/Latin/Niger
+      {   177,     7,   157,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Fulah/Latin/Nigeria
+      {   177,     7,   189,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Fulah/Latin/Sierra Leone
+      {   177,   134,    91,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Fulah/Adlam/Guinea
+      {   178,     7,   111,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Kikuyu/Latin/Kenya
+      {   179,     7,   111,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Samburu/Latin/Kenya
+      {   180,     7,   146,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Sena/Latin/Mozambique
+      {   181,     7,   240,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// North Ndebele/Latin/Zimbabwe
+      {   182,     7,   210,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Rombo/Latin/Tanzania
+      {   183,     9,   145,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Tachelhit/Tifinagh/Morocco
+      {   183,     7,   145,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Tachelhit/Latin/Morocco
+      {   184,     7,     3,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Kabyle/Latin/Algeria
+      {   185,     7,   221,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Nyankole/Latin/Uganda
+      {   186,     7,   210,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Bena/Latin/Tanzania
+      {   187,     7,   210,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Vunjo/Latin/Tanzania
+      {   188,     7,   132,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Bambara/Latin/Mali
+      {   188,    75,   132,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Bambara/Nko/Mali
+      {   189,     7,   111,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Embu/Latin/Kenya
+      {   190,    12,   225,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Cherokee/Cherokee/United States
+      {   191,     7,   137,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Morisyen/Latin/Mauritius
+      {   192,     7,   210,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Makonde/Latin/Tanzania
+      {   193,     7,   210,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Langi/Latin/Tanzania
+      {   194,     7,   221,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Ganda/Latin/Uganda
+      {   195,     7,   239,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Bemba/Latin/Zambia
+      {   196,     7,    39,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Kabuverdianu/Latin/Cape Verde
+      {   197,     7,   111,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Meru/Latin/Kenya
+      {   198,     7,   111,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Kalenjin/Latin/Kenya
+      {   199,     7,   148,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Nama/Latin/Namibia
+      {   200,     7,   210,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Machame/Latin/Tanzania
+      {   201,     7,    82,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Colognian/Latin/Germany
+      {   202,     7,   111,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Masai/Latin/Kenya
+      {   202,     7,   210,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Masai/Latin/Tanzania
+      {   203,     7,   221,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Soga/Latin/Uganda
+      {   204,     7,   111,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Luyia/Latin/Kenya
+      {   205,     7,   210,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Asu/Latin/Tanzania
+      {   206,     7,   221,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Teso/Latin/Uganda
+      {   206,     7,   111,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Teso/Latin/Kenya
+      {   207,     7,    67,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Saho/Latin/Eritrea
+      {   208,     7,   132,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Koyra Chiini/Latin/Mali
+      {   209,     7,   210,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Rwa/Latin/Tanzania
+      {   210,     7,   111,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Luo/Latin/Kenya
+      {   211,     7,   221,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Chiga/Latin/Uganda
+      {   212,     7,   145,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Central Morocco Tamazight/Latin/Morocco
+      {   213,     7,   132,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Koyraboro Senni/Latin/Mali
+      {   214,     7,   210,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Shambala/Latin/Tanzania
+      {   215,    13,   100,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Bodo/Devanagari/India
+      {   218,     2,   178,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Chechen/Cyrillic/Russia
+      {   219,     2,   178,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Church/Cyrillic/Russia
+      {   220,     2,   178,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Chuvash/Cyrillic/Russia
+      {   230,     7,    49,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Luba Katanga/Latin/Congo Kinshasa
+      {   231,     7,   125,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Luxembourgish/Latin/Luxembourg
+      {   236,     7,    21,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Walloon/Latin/Belgium
+      {   237,     7,    37,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Aghem/Latin/Cameroon
+      {   238,     7,    37,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Basaa/Latin/Cameroon
+      {   239,     7,   156,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Zarma/Latin/Niger
+      {   240,     7,    37,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Duala/Latin/Cameroon
+      {   241,     7,   187,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Jola Fonyi/Latin/Senegal
+      {   242,     7,    37,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Ewondo/Latin/Cameroon
+      {   243,     7,    37,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Bafia/Latin/Cameroon
+      {   244,     7,   146,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Makhuwa Meetto/Latin/Mozambique
+      {   245,     7,    37,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Mundang/Latin/Cameroon
+      {   246,     7,    37,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Kwasio/Latin/Cameroon
+      {   247,     7,   254,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Nuer/Latin/South Sudan
+      {   248,     2,   178,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Sakha/Cyrillic/Russia
+      {   249,     7,   210,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Sangu/Latin/Tanzania
+      {   251,     7,   156,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Tasawaq/Latin/Niger
+      {   252,    35,   121,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Vai/Vai/Liberia
+      {   252,     7,   121,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Vai/Latin/Liberia
+      {   253,     7,   206,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Walser/Latin/Switzerland
+      {   254,     7,    37,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Yangben/Latin/Cameroon
+      {   256,     7,   197,    0,10238,  106,  106,  184,  184,106,142, 78, 78, 26, 26 },// Asturian/Latin/Spain
+      {   257,     7,    37,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Ngomba/Latin/Cameroon
+      {   258,     7,    37,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Kako/Latin/Cameroon
+      {   259,     7,    37,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Meta/Latin/Cameroon
+      {   260,     7,    37,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Ngiemboon/Latin/Cameroon
+      {   261,     7,   197,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Aragonese/Latin/Spain
+      {   272,    46,    18,10380,10380,  106,  106,10601,10601,221,221, 78, 78, 41, 41 },// Chakma/Chakma/Bangladesh
+      {   272,    46,   100,10380,10380,  106,  106,10601,10601,221,221, 78, 78, 41, 41 },// Chakma/Chakma/India
+      {   290,    11,   100,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Manipuri/Bengali/India
+      {   309,   100,   232,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Tai Dam/Tai Viet/Vietnam
+      {   312,     7,    37,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Akoose/Latin/Cameroon
+      {   313,     7,   225,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Lakota/Latin/United States
+      {   314,     9,   145,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Standard Moroccan Tamazight/Tifinagh/Morocco
+      {   315,     7,    43,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Mapuche/Latin/Chile
+      {   316,     1,   103,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Central Kurdish/Arabic/Iraq
+      {   316,     1,   102,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Central Kurdish/Arabic/Iran
+      {   317,     7,    82,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Lower Sorbian/Latin/Germany
+      {   318,     7,    82,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Upper Sorbian/Latin/Germany
+      {   319,     7,    37,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Kenyang/Latin/Cameroon
+      {   320,     7,    38,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Mohawk/Latin/Canada
+      {   321,    75,    91,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Nko/Nko/Guinea
+      {   322,     7,   260,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Prussian/Latin/World
+      {   323,     7,    90,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Kiche/Latin/Guatemala
+      {   324,     7,   205,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Southern Sami/Latin/Sweden
+      {   325,     7,   205,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Lule Sami/Latin/Sweden
+      {   326,     7,    73,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Inari Sami/Latin/Finland
+      {   327,     7,    73,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Skolt Sami/Latin/Finland
+      {   328,     7,    13,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Warlpiri/Latin/Australia
+      {   346,     1,   102,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Mazanderani/Arabic/Iran
+      {   349,     1,   102,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Northern Luri/Arabic/Iran
+      {   349,     1,   103,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Northern Luri/Arabic/Iraq
+      {   357,     6,    97,  888,  888,  888,  888,  184,  184, 71, 71, 71, 71, 26, 26 },// Cantonese/Traditional Han/Hong Kong
+      {   357,     5,    44,10642,10642,10642,10642,  184,  184, 71, 71, 71, 71, 26, 26 },// Cantonese/Simplified Han/China
+      {   358,   138,   225,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Osage/Osage/United States
+      {   360,     7,   260,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Ido/Latin/World
+      {   361,     7,   260,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Lojban/Latin/World
+      {   362,     7,   106,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Sicilian/Latin/Italy
+      {   363,     1,   102,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Southern Kurdish/Arabic/Iran
+      {   364,     1,   163,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Western Balochi/Arabic/Pakistan
+      {   365,     7,   170,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Cebuano/Latin/Philippines
+      {   366,     2,   178,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Erzya/Cyrillic/Russia
+      {   367,     7,   225,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Chickasaw/Latin/United States
+      {   368,     7,   225,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Muscogee/Latin/United States
+      {   369,     7,   172,    0,    0,  106,  106,  184,  184,106,106, 78, 78, 26, 26 },// Silesian/Latin/Poland
+      {     0,     0,     0,    0,    0,    0,    0,    0,    0,  0,  0,  0,  0,  0,  0 },// trailing zeros
 };
 
-static const ushort months_data[] = {
-0x4d, 0x75, 0x68, 0x2e, 0x3b, 0x53, 0x61, 0x66, 0x2e, 0x3b, 0x52, 0x61, 0x62, 0x2e, 0x20, 0x49, 0x3b, 0x52, 0x61, 0x62,
-0x2e, 0x20, 0x49, 0x49, 0x3b, 0x4a, 0x75, 0x6d, 0x2e, 0x20, 0x49, 0x3b, 0x4a, 0x75, 0x6d, 0x2e, 0x20, 0x49, 0x49, 0x3b,
-0x52, 0x61, 0x6a, 0x2e, 0x3b, 0x53, 0x68, 0x61, 0x2e, 0x3b, 0x52, 0x61, 0x6d, 0x2e, 0x3b, 0x53, 0x68, 0x61, 0x77, 0x2e,
-0x3b, 0x44, 0x68, 0x75, 0x2bb, 0x6c, 0x2d, 0x51, 0x2e, 0x3b, 0x44, 0x68, 0x75, 0x2bb, 0x6c, 0x2d, 0x48, 0x2e, 0x3b, 0x4d,
-0x75, 0x68, 0x61, 0x72, 0x72, 0x61, 0x6d, 0x3b, 0x53, 0x61, 0x66, 0x61, 0x72, 0x3b, 0x52, 0x61, 0x62, 0x69, 0x2bb, 0x20,
-0x49, 0x3b, 0x52, 0x61, 0x62, 0x69, 0x2bb, 0x20, 0x49, 0x49, 0x3b, 0x4a, 0x75, 0x6d, 0x61, 0x64, 0x61, 0x20, 0x49, 0x3b,
-0x4a, 0x75, 0x6d, 0x61, 0x64, 0x61, 0x20, 0x49, 0x49, 0x3b, 0x52, 0x61, 0x6a, 0x61, 0x62, 0x3b, 0x53, 0x68, 0x61, 0x2bb,
+static const char16_t months_data[] = {
+0x4d, 0x75, 0x68, 0x61, 0x72, 0x72, 0x61, 0x6d, 0x3b, 0x53, 0x61, 0x66, 0x61, 0x72, 0x3b, 0x52, 0x61, 0x62, 0x69, 0x2bb,
+0x20, 0x49, 0x3b, 0x52, 0x61, 0x62, 0x69, 0x2bb, 0x20, 0x49, 0x49, 0x3b, 0x4a, 0x75, 0x6d, 0x61, 0x64, 0x61, 0x20, 0x49,
+0x3b, 0x4a, 0x75, 0x6d, 0x61, 0x64, 0x61, 0x20, 0x49, 0x49, 0x3b, 0x52, 0x61, 0x6a, 0x61, 0x62, 0x3b, 0x53, 0x68, 0x61,
+0x2bb, 0x62, 0x61, 0x6e, 0x3b, 0x52, 0x61, 0x6d, 0x61, 0x64, 0x61, 0x6e, 0x3b, 0x53, 0x68, 0x61, 0x77, 0x77, 0x61, 0x6c,
+0x3b, 0x44, 0x68, 0x75, 0x2bb, 0x6c, 0x2d, 0x51, 0x69, 0x2bb, 0x64, 0x61, 0x68, 0x3b, 0x44, 0x68, 0x75, 0x2bb, 0x6c, 0x2d,
+0x48, 0x69, 0x6a, 0x6a, 0x61, 0x68, 0x4d, 0x75, 0x68, 0x2e, 0x3b, 0x53, 0x61, 0x66, 0x2e, 0x3b, 0x52, 0x61, 0x62, 0x2e,
+0x20, 0x49, 0x3b, 0x52, 0x61, 0x62, 0x2e, 0x20, 0x49, 0x49, 0x3b, 0x4a, 0x75, 0x6d, 0x2e, 0x20, 0x49, 0x3b, 0x4a, 0x75,
+0x6d, 0x2e, 0x20, 0x49, 0x49, 0x3b, 0x52, 0x61, 0x6a, 0x2e, 0x3b, 0x53, 0x68, 0x61, 0x2e, 0x3b, 0x52, 0x61, 0x6d, 0x2e,
+0x3b, 0x53, 0x68, 0x61, 0x77, 0x2e, 0x3b, 0x44, 0x68, 0x75, 0x2bb, 0x6c, 0x2d, 0x51, 0x2e, 0x3b, 0x44, 0x68, 0x75, 0x2bb,
+0x6c, 0x2d, 0x48, 0x2e, 0x31, 0x3b, 0x32, 0x3b, 0x33, 0x3b, 0x34, 0x3b, 0x35, 0x3b, 0x36, 0x3b, 0x37, 0x3b, 0x38, 0x3b,
+0x39, 0x3b, 0x31, 0x30, 0x3b, 0x31, 0x31, 0x3b, 0x31, 0x32, 0x1219, 0x1200, 0x1228, 0x121d, 0x3b, 0x1233, 0x1348, 0x122d, 0x3b, 0x1228,
+0x1262, 0x12d1, 0x120d, 0x20, 0x12a0, 0x12c8, 0x120d, 0x3b, 0x1228, 0x1262, 0x12d1, 0x120d, 0x20, 0x12a0, 0x12ba, 0x122d, 0x3b, 0x1300, 0x121b, 0x12f0,
+0x120d, 0x20, 0x12a0, 0x12c8, 0x120d, 0x3b, 0x1300, 0x121b, 0x12f0, 0x120d, 0x20, 0x12a0, 0x12ba, 0x122d, 0x3b, 0x1228, 0x1300, 0x1265, 0x3b, 0x123b,
+0x12a5, 0x1263, 0x1295, 0x3b, 0x1228, 0x1218, 0x12f3, 0x1295, 0x3b, 0x1238, 0x12cb, 0x120d, 0x3b, 0x12d9, 0x120d, 0x1242, 0x12f3, 0x1205, 0x3b, 0x12d9,
+0x120d, 0x1202, 0x1303, 0x1205, 0x645, 0x62d, 0x631, 0x645, 0x3b, 0x635, 0x641, 0x631, 0x3b, 0x631, 0x628, 0x64a, 0x639, 0x20, 0x627, 0x644,
+0x623, 0x648, 0x644, 0x3b, 0x631, 0x628, 0x64a, 0x639, 0x20, 0x627, 0x644, 0x622, 0x62e, 0x631, 0x3b, 0x62c, 0x645, 0x627, 0x62f, 0x649,
+0x20, 0x627, 0x644, 0x623, 0x648, 0x644, 0x649, 0x3b, 0x62c, 0x645, 0x627, 0x62f, 0x649, 0x20, 0x627, 0x644, 0x622, 0x62e, 0x631, 0x629,
+0x3b, 0x631, 0x62c, 0x628, 0x3b, 0x634, 0x639, 0x628, 0x627, 0x646, 0x3b, 0x631, 0x645, 0x636, 0x627, 0x646, 0x3b, 0x634, 0x648, 0x627,
+0x644, 0x3b, 0x630, 0x648, 0x20, 0x627, 0x644, 0x642, 0x639, 0x62f, 0x629, 0x3b, 0x630, 0x648, 0x20, 0x627, 0x644, 0x62d, 0x62c, 0x629,
+0x661, 0x3b, 0x662, 0x3b, 0x663, 0x3b, 0x664, 0x3b, 0x665, 0x3b, 0x666, 0x3b, 0x667, 0x3b, 0x668, 0x3b, 0x669, 0x3b, 0x661, 0x660,
+0x3b, 0x661, 0x661, 0x3b, 0x661, 0x662, 0x4d, 0x259, 0x68, 0x259, 0x72, 0x72, 0x259, 0x6d, 0x3b, 0x53, 0x259, 0x66, 0x259, 0x72,
+0x3b, 0x52, 0x259, 0x62, 0x69, 0xfc, 0x6c, 0x259, 0x76, 0x76, 0x259, 0x6c, 0x3b, 0x52, 0x259, 0x62, 0x69, 0xfc, 0x6c, 0x61,
+0x78, 0x131, 0x72, 0x3b, 0x43, 0x259, 0x6d, 0x61, 0x64, 0x69, 0x79, 0x259, 0x6c, 0x259, 0x76, 0x76, 0x259, 0x6c, 0x3b, 0x43,
+0x259, 0x6d, 0x61, 0x64, 0x69, 0x79, 0x259, 0x6c, 0x61, 0x78, 0x131, 0x72, 0x3b, 0x52, 0x259, 0x63, 0x259, 0x62, 0x3b, 0x15e,
+0x61, 0x62, 0x61, 0x6e, 0x3b, 0x52, 0x61, 0x6d, 0x61, 0x7a, 0x61, 0x6e, 0x3b, 0x15e, 0x259, 0x76, 0x76, 0x61, 0x6c, 0x3b,
+0x5a, 0x69, 0x6c, 0x71, 0x259, 0x64, 0x259, 0x3b, 0x5a, 0x69, 0x6c, 0x68, 0x69, 0x63, 0x63, 0x259, 0x4d, 0x259, 0x68, 0x2e,
+0x3b, 0x53, 0x259, 0x66, 0x2e, 0x3b, 0x52, 0x259, 0x62, 0x2e, 0x20, 0x49, 0x3b, 0x52, 0x259, 0x62, 0x2e, 0x20, 0x49, 0x49,
+0x3b, 0x43, 0x259, 0x6d, 0x2e, 0x20, 0x49, 0x3b, 0x43, 0x259, 0x6d, 0x2e, 0x20, 0x49, 0x49, 0x3b, 0x52, 0x259, 0x63, 0x2e,
+0x3b, 0x15e, 0x61, 0x62, 0x2e, 0x3b, 0x52, 0x61, 0x6d, 0x2e, 0x3b, 0x15e, 0x259, 0x76, 0x2e, 0x3b, 0x5a, 0x69, 0x6c, 0x71,
+0x2e, 0x3b, 0x5a, 0x69, 0x6c, 0x68, 0x2e, 0x9ae, 0x9b9, 0x9b0, 0x9b0, 0x9ae, 0x3b, 0x9b8, 0x9ab, 0x9b0, 0x3b, 0x9b0, 0x9ac, 0x9bf,
+0x989, 0x9b2, 0x20, 0x986, 0x989, 0x9af, 0x9bc, 0x9be, 0x9b2, 0x3b, 0x9b0, 0x9ac, 0x9bf, 0x989, 0x9b8, 0x20, 0x9b8, 0x9be, 0x9a8, 0x9bf,
+0x3b, 0x99c, 0x9ae, 0x9be, 0x9a6, 0x9bf, 0x989, 0x9b2, 0x20, 0x986, 0x989, 0x9af, 0x9bc, 0x9be, 0x9b2, 0x3b, 0x99c, 0x9ae, 0x9be, 0x9a6,
+0x9bf, 0x989, 0x9b8, 0x20, 0x9b8, 0x9be, 0x9a8, 0x9bf, 0x3b, 0x9b0, 0x99c, 0x9ac, 0x3b, 0x9b6, 0x9be, 0x2018, 0x9ac, 0x9be, 0x9a8, 0x3b,
+0x9b0, 0x9ae, 0x99c, 0x9be, 0x9a8, 0x3b, 0x9b6, 0x9be, 0x993, 0x9af, 0x9bc, 0x9be, 0x9b2, 0x3b, 0x99c, 0x9cd, 0x9ac, 0x9bf, 0x9b2, 0x995,
+0x9a6, 0x3b, 0x99c, 0x9cd, 0x9ac, 0x9bf, 0x9b2, 0x9b9, 0x99c, 0x9cd, 0x99c, 0x9e7, 0x3b, 0x9e8, 0x3b, 0x9e9, 0x3b, 0x9ea, 0x3b, 0x9eb,
+0x3b, 0x9ec, 0x3b, 0x9ed, 0x3b, 0x9ee, 0x3b, 0x9ef, 0x3b, 0x9e7, 0x9e6, 0x3b, 0x9e7, 0x9e7, 0x3b, 0x9e7, 0x9e8, 0x43c, 0x443, 0x445,
+0x430, 0x440, 0x430, 0x43c, 0x3b, 0x441, 0x430, 0x444, 0x430, 0x440, 0x3b, 0x440, 0x430, 0x431, 0x438, 0x2d, 0x31, 0x3b, 0x440, 0x430,
+0x431, 0x438, 0x2d, 0x32, 0x3b, 0x434, 0x436, 0x443, 0x43c, 0x430, 0x434, 0x430, 0x2d, 0x31, 0x3b, 0x434, 0x436, 0x443, 0x43c, 0x430,
+0x434, 0x430, 0x2d, 0x32, 0x3b, 0x440, 0x430, 0x434, 0x436, 0x430, 0x431, 0x3b, 0x448, 0x430, 0x431, 0x430, 0x43d, 0x3b, 0x440, 0x430,
+0x43c, 0x430, 0x437, 0x430, 0x43d, 0x3b, 0x428, 0x430, 0x432, 0x430, 0x43b, 0x3b, 0x414, 0x445, 0x443, 0x43b, 0x2d, 0x41a, 0x430, 0x430,
+0x434, 0x430, 0x3b, 0x414, 0x445, 0x443, 0x43b, 0x2d, 0x445, 0x438, 0x434, 0x436, 0x430, 0x4e00, 0x6708, 0x3b, 0x4e8c, 0x6708, 0x3b, 0x4e09,
+0x6708, 0x3b, 0x56db, 0x6708, 0x3b, 0x4e94, 0x6708, 0x3b, 0x516d, 0x6708, 0x3b, 0x4e03, 0x6708, 0x3b, 0x516b, 0x6708, 0x3b, 0x4e5d, 0x6708, 0x3b,
+0x5341, 0x6708, 0x3b, 0x5341, 0x4e00, 0x6708, 0x3b, 0x5341, 0x4e8c, 0x6708, 0x31, 0x6708, 0x3b, 0x32, 0x6708, 0x3b, 0x33, 0x6708, 0x3b, 0x34,
+0x6708, 0x3b, 0x35, 0x6708, 0x3b, 0x36, 0x6708, 0x3b, 0x37, 0x6708, 0x3b, 0x38, 0x6708, 0x3b, 0x39, 0x6708, 0x3b, 0x31, 0x30, 0x6708,
+0x3b, 0x31, 0x31, 0x6708, 0x3b, 0x31, 0x32, 0x6708, 0x7a46, 0x54c8, 0x862d, 0x59c6, 0x6708, 0x3b, 0x8272, 0x6cd5, 0x723e, 0x6708, 0x3b, 0x8cf4,
+0x6bd4, 0x6708, 0x20, 0x49, 0x3b, 0x8cf4, 0x6bd4, 0x6708, 0x20, 0x49, 0x49, 0x3b, 0x4e3b, 0x99ac, 0x9054, 0x6708, 0x20, 0x49, 0x3b, 0x4e3b,
+0x99ac, 0x9054, 0x6708, 0x20, 0x49, 0x49, 0x3b, 0x8cf4, 0x54f2, 0x535c, 0x6708, 0x3b, 0x820d, 0x723e, 0x90a6, 0x6708, 0x3b, 0x8cf4, 0x8cb7, 0x4e39,
+0x6708, 0x3b, 0x9583, 0x74e6, 0x9b6f, 0x6708, 0x3b, 0x90fd, 0x723e, 0x5580, 0x723e, 0x5fb7, 0x6708, 0x3b, 0x90fd, 0x723e, 0x9ed1, 0x54f2, 0x6708, 0x31,
+0x2e, 0x3b, 0x32, 0x2e, 0x3b, 0x33, 0x2e, 0x3b, 0x34, 0x2e, 0x3b, 0x35, 0x2e, 0x3b, 0x36, 0x2e, 0x3b, 0x37, 0x2e, 0x3b,
+0x38, 0x2e, 0x3b, 0x39, 0x2e, 0x3b, 0x31, 0x30, 0x2e, 0x3b, 0x31, 0x31, 0x2e, 0x3b, 0x31, 0x32, 0x2e, 0x6d, 0x75, 0x68,
+0x61, 0x72, 0x72, 0x65, 0x6d, 0x3b, 0x73, 0x61, 0x66, 0x61, 0x72, 0x3b, 0x72, 0x65, 0x62, 0xed, 0x2019, 0x75, 0x20, 0x6c,
+0x2d, 0x61, 0x77, 0x77, 0x61, 0x6c, 0x3b, 0x72, 0x65, 0x62, 0xed, 0x2019, 0x75, 0x20, 0x73, 0x2d, 0x73, 0xe1, 0x6e, 0xed,
+0x3b, 0x64, 0x17e, 0x75, 0x6d, 0xe1, 0x64, 0xe1, 0x20, 0x61, 0x6c, 0x2d, 0xfa, 0x6c, 0xe1, 0x3b, 0x64, 0x17e, 0x75, 0x6d,
+0xe1, 0x64, 0xe1, 0x20, 0x61, 0x6c, 0x2d, 0xe1, 0x63, 0x68, 0x69, 0x72, 0x61, 0x3b, 0x72, 0x65, 0x64, 0x17e, 0x65, 0x62,
+0x3b, 0x161, 0x61, 0x2019, 0x62, 0xe1, 0x6e, 0x3b, 0x72, 0x61, 0x6d, 0x61, 0x64, 0xe1, 0x6e, 0x3b, 0x161, 0x61, 0x77, 0x77,
+0x61, 0x6c, 0x3b, 0x7a, 0xfa, 0x20, 0x6c, 0x2d, 0x6b, 0x61, 0x2019, 0x64, 0x61, 0x3b, 0x7a, 0xfa, 0x20, 0x6c, 0x2d, 0x68,
+0x69, 0x64, 0x17e, 0x64, 0x17e, 0x61, 0x6d, 0x75, 0x68, 0x2e, 0x3b, 0x73, 0x61, 0x66, 0x2e, 0x3b, 0x72, 0x65, 0x62, 0x2e,
+0x20, 0x49, 0x3b, 0x72, 0x65, 0x62, 0x2e, 0x20, 0x49, 0x49, 0x3b, 0x64, 0x17e, 0x75, 0x6d, 0x2e, 0x20, 0x49, 0x3b, 0x64,
+0x17e, 0x75, 0x6d, 0x2e, 0x20, 0x49, 0x49, 0x3b, 0x72, 0x65, 0x64, 0x2e, 0x3b, 0x161, 0x61, 0x2e, 0x3b, 0x72, 0x61, 0x6d,
+0x2e, 0x3b, 0x161, 0x61, 0x77, 0x2e, 0x3b, 0x7a, 0xfa, 0x20, 0x6c, 0x2d, 0x6b, 0x2e, 0x3b, 0x7a, 0xfa, 0x20, 0x6c, 0x2d,
+0x68, 0x2e, 0x6d, 0x75, 0x68, 0x61, 0x72, 0x72, 0x61, 0x6d, 0x3b, 0x73, 0x61, 0x66, 0x61, 0x72, 0x3b, 0x72, 0x61, 0x62,
+0x69, 0x2bb, 0x20, 0x49, 0x3b, 0x72, 0x61, 0x62, 0x69, 0x2bb, 0x20, 0x49, 0x49, 0x3b, 0x6a, 0x75, 0x6d, 0x61, 0x64, 0x61,
+0x20, 0x49, 0x3b, 0x6a, 0x75, 0x6d, 0x61, 0x64, 0x61, 0x20, 0x49, 0x49, 0x3b, 0x72, 0x61, 0x6a, 0x61, 0x62, 0x3b, 0x73,
+0x68, 0x61, 0x2bb, 0x62, 0x61, 0x6e, 0x3b, 0x72, 0x61, 0x6d, 0x61, 0x64, 0x61, 0x6e, 0x3b, 0x73, 0x68, 0x61, 0x77, 0x77,
+0x61, 0x6c, 0x3b, 0x64, 0x68, 0x75, 0x2bb, 0x6c, 0x2d, 0x51, 0x69, 0x2bb, 0x64, 0x61, 0x68, 0x3b, 0x64, 0x68, 0x75, 0x2bb,
+0x6c, 0x2d, 0x48, 0x69, 0x6a, 0x6a, 0x61, 0x68, 0x4d, 0x6f, 0x65, 0x68, 0x61, 0x72, 0x72, 0x61, 0x6d, 0x3b, 0x53, 0x61,
+0x66, 0x61, 0x72, 0x3b, 0x52, 0x61, 0x62, 0x69, 0x2bb, 0x61, 0x20, 0x61, 0x6c, 0x20, 0x61, 0x77, 0x61, 0x6c, 0x3b, 0x52,
+0x61, 0x62, 0x69, 0x2bb, 0x61, 0x20, 0x61, 0x6c, 0x20, 0x74, 0x68, 0x61, 0x6e, 0x69, 0x3b, 0x4a, 0x6f, 0x65, 0x6d, 0x61,
+0x64, 0x2bb, 0x61, 0x6c, 0x20, 0x61, 0x77, 0x61, 0x6c, 0x3b, 0x4a, 0x6f, 0x65, 0x6d, 0x61, 0x64, 0x2bb, 0x61, 0x6c, 0x20,
+0x74, 0x68, 0x61, 0x6e, 0x69, 0x3b, 0x52, 0x61, 0x6a, 0x61, 0x62, 0x3b, 0x53, 0x6a, 0x61, 0x2bb, 0x61, 0x62, 0x61, 0x6e,
+0x3b, 0x52, 0x61, 0x6d, 0x61, 0x64, 0x61, 0x6e, 0x3b, 0x53, 0x6a, 0x61, 0x77, 0x61, 0x6c, 0x3b, 0x44, 0x6f, 0x65, 0x20,
+0x61, 0x6c, 0x20, 0x6b, 0x61, 0x2bb, 0x61, 0x62, 0x61, 0x3b, 0x44, 0x6f, 0x65, 0x20, 0x61, 0x6c, 0x20, 0x68, 0x69, 0x7a,
+0x6a, 0x61, 0x4d, 0x6f, 0x65, 0x68, 0x2e, 0x3b, 0x53, 0x61, 0x66, 0x2e, 0x3b, 0x52, 0x61, 0x62, 0x2e, 0x20, 0x49, 0x3b,
+0x52, 0x61, 0x62, 0x2e, 0x20, 0x49, 0x49, 0x3b, 0x4a, 0x6f, 0x65, 0x6d, 0x2e, 0x20, 0x49, 0x3b, 0x4a, 0x6f, 0x65, 0x6d,
+0x2e, 0x20, 0x49, 0x49, 0x3b, 0x52, 0x61, 0x6a, 0x2e, 0x3b, 0x53, 0x6a, 0x61, 0x2e, 0x3b, 0x52, 0x61, 0x6d, 0x2e, 0x3b,
+0x53, 0x6a, 0x61, 0x77, 0x2e, 0x3b, 0x44, 0x6f, 0x65, 0x20, 0x61, 0x6c, 0x20, 0x6b, 0x2e, 0x3b, 0x44, 0x6f, 0x65, 0x20,
+0x61, 0x6c, 0x20, 0x68, 0x2e, 0x6d, 0x75, 0x68, 0x61, 0x72, 0x72, 0x61, 0x6d, 0x3b, 0x73, 0x61, 0x66, 0x61, 0x72, 0x3b,
+0x72, 0x61, 0x62, 0x69, 0x2019, 0x20, 0x61, 0x6c, 0x2d, 0x61, 0x77, 0x77, 0x61, 0x6c, 0x3b, 0x72, 0x61, 0x62, 0x69, 0x2019,
+0x20, 0x61, 0x6c, 0x2d, 0x61, 0x6b, 0x68, 0x69, 0x72, 0x3b, 0x64, 0x17e, 0x75, 0x6d, 0x61, 0x64, 0x61, 0x2d, 0x6c, 0x2d,
+0x75, 0x6c, 0x61, 0x3b, 0x64, 0x17e, 0x75, 0x6d, 0x61, 0x64, 0x61, 0x2d, 0x6c, 0x2d, 0x61, 0x6b, 0x68, 0x69, 0x72, 0x61,
+0x3b, 0x72, 0x61, 0x64, 0x17e, 0x61, 0x62, 0x3b, 0x161, 0x61, 0x2019, 0x62, 0x61, 0x6e, 0x3b, 0x72, 0x61, 0x6d, 0x61, 0x64,
+0x61, 0x6e, 0x3b, 0x161, 0x61, 0x77, 0x77, 0x61, 0x6c, 0x3b, 0x64, 0x68, 0x75, 0x2d, 0x6c, 0x2d, 0x71, 0x61, 0x2019, 0x64,
+0x61, 0x3b, 0x64, 0x68, 0x75, 0x2d, 0x6c, 0x2d, 0x68, 0x69, 0x64, 0x64, 0x17e, 0x61, 0x6d, 0x6f, 0x75, 0x68, 0x61, 0x72,
+0x72, 0x61, 0x6d, 0x3b, 0x73, 0x61, 0x66, 0x61, 0x72, 0x3b, 0x72, 0x61, 0x62, 0x69, 0x61, 0x20, 0x61, 0x6c, 0x20, 0x61,
+0x77, 0x61, 0x6c, 0x3b, 0x72, 0x61, 0x62, 0x69, 0x61, 0x20, 0x61, 0x74, 0x68, 0x2d, 0x74, 0x68, 0x61, 0x6e, 0x69, 0x3b,
+0x6a, 0x6f, 0x75, 0x6d, 0x61, 0x64, 0x61, 0x20, 0x61, 0x6c, 0x20, 0x6f, 0x75, 0x6c, 0x61, 0x3b, 0x6a, 0x6f, 0x75, 0x6d,
+0x61, 0x64, 0x61, 0x20, 0x61, 0x74, 0x68, 0x2d, 0x74, 0x68, 0x61, 0x6e, 0x69, 0x61, 0x3b, 0x72, 0x61, 0x6a, 0x61, 0x62,
+0x3b, 0x63, 0x68, 0x61, 0x61, 0x62, 0x61, 0x6e, 0x65, 0x3b, 0x72, 0x61, 0x6d, 0x61, 0x64, 0x61, 0x6e, 0x3b, 0x63, 0x68,
+0x61, 0x77, 0x77, 0x61, 0x6c, 0x3b, 0x64, 0x68, 0x6f, 0x75, 0x20, 0x61, 0x6c, 0x20, 0x71, 0x69, 0x60, 0x64, 0x61, 0x3b,
+0x64, 0x68, 0x6f, 0x75, 0x20, 0x61, 0x6c, 0x2d, 0x68, 0x69, 0x6a, 0x6a, 0x61, 0x6d, 0x6f, 0x75, 0x68, 0x2e, 0x3b, 0x73,
+0x61, 0x66, 0x2e, 0x3b, 0x72, 0x61, 0x62, 0x2e, 0x20, 0x61, 0x77, 0x2e, 0x3b, 0x72, 0x61, 0x62, 0x2e, 0x20, 0x74, 0x68,
+0x2e, 0x3b, 0x6a, 0x6f, 0x75, 0x6d, 0x2e, 0x20, 0x6f, 0x75, 0x2e, 0x3b, 0x6a, 0x6f, 0x75, 0x6d, 0x2e, 0x20, 0x74, 0x68,
+0x2e, 0x3b, 0x72, 0x61, 0x6a, 0x2e, 0x3b, 0x63, 0x68, 0x61, 0x61, 0x2e, 0x3b, 0x72, 0x61, 0x6d, 0x2e, 0x3b, 0x63, 0x68,
+0x61, 0x77, 0x2e, 0x3b, 0x64, 0x68, 0x6f, 0x75, 0x2e, 0x20, 0x71, 0x69, 0x2e, 0x3b, 0x64, 0x68, 0x6f, 0x75, 0x2e, 0x20,
+0x68, 0x69, 0x2e, 0x6d, 0x6f, 0x75, 0x68, 0x2e, 0x3b, 0x73, 0x61, 0x66, 0x2e, 0x3b, 0x72, 0x61, 0x62, 0x2e, 0x20, 0x61,
+0x77, 0x2e, 0x3b, 0x72, 0x61, 0x62, 0x2e, 0x20, 0x74, 0x68, 0x2e, 0x3b, 0x6a, 0x6f, 0x75, 0x6d, 0x2e, 0x20, 0x6f, 0x75,
+0x6c, 0x2e, 0x3b, 0x6a, 0x6f, 0x75, 0x6d, 0x2e, 0x20, 0x74, 0x68, 0x61, 0x2e, 0x3b, 0x72, 0x61, 0x6a, 0x2e, 0x3b, 0x63,
+0x68, 0x61, 0x61, 0x2e, 0x3b, 0x72, 0x61, 0x6d, 0x2e, 0x3b, 0x63, 0x68, 0x61, 0x77, 0x2e, 0x3b, 0x64, 0x68, 0x6f, 0x75,
+0x2e, 0x20, 0x71, 0x2e, 0x3b, 0x64, 0x68, 0x6f, 0x75, 0x2e, 0x20, 0x68, 0x2e, 0x10db, 0x10e3, 0x10f0, 0x10d0, 0x10e0, 0x10d0, 0x10db,
+0x10d8, 0x3b, 0x10e1, 0x10d0, 0x10e4, 0x10d0, 0x10e0, 0x10d8, 0x3b, 0x10e0, 0x10d0, 0x10d1, 0x10d8, 0x20, 0x10e3, 0x10da, 0x2d, 0x10d0, 0x10d5, 0x10d0,
+0x10da, 0x10d8, 0x3b, 0x10e0, 0x10d0, 0x10d1, 0x10d8, 0x20, 0x10e3, 0x10da, 0x2d, 0x10d0, 0x10ee, 0x10d8, 0x10e0, 0x10d8, 0x3b, 0x10ef, 0x10e3, 0x10db,
+0x10d0, 0x10d3, 0x10d0, 0x20, 0x10e3, 0x10da, 0x2d, 0x10d0, 0x10d5, 0x10d0, 0x10da, 0x10d8, 0x3b, 0x10ef, 0x10e3, 0x10db, 0x10d0, 0x10d3, 0x10d0, 0x20,
+0x10e3, 0x10da, 0x2d, 0x10d0, 0x10ee, 0x10d8, 0x10e0, 0x10d8, 0x3b, 0x10e0, 0x10d0, 0x10ef, 0x10d0, 0x10d1, 0x10d8, 0x3b, 0x10e8, 0x10d0, 0x10d1, 0x10d0,
+0x10dc, 0x10d8, 0x3b, 0x10e0, 0x10d0, 0x10db, 0x10d0, 0x10d3, 0x10d0, 0x10dc, 0x10d8, 0x3b, 0x10e8, 0x10d0, 0x10d5, 0x10d0, 0x10da, 0x10d8, 0x3b, 0x10d6,
+0x10e3, 0x10da, 0x2d, 0x10d9, 0x10d0, 0x10d0, 0x10d3, 0x10d0, 0x3b, 0x10d6, 0x10e3, 0x10da, 0x2d, 0x10f0, 0x10d8, 0x10ef, 0x10d0, 0x10db, 0x10e3, 0x10f0,
+0x2e, 0x3b, 0x10e1, 0x10d0, 0x10e4, 0x2e, 0x3b, 0x10e0, 0x10d0, 0x10d1, 0x2e, 0x20, 0x49, 0x3b, 0x10e0, 0x10d0, 0x10d1, 0x2e, 0x20, 0x49,
+0x49, 0x3b, 0x10ef, 0x10e3, 0x10db, 0x2e, 0x20, 0x49, 0x3b, 0x10ef, 0x10e3, 0x10db, 0x2e, 0x20, 0x49, 0x49, 0x3b, 0x10e0, 0x10d0, 0x10ef,
+0x2e, 0x3b, 0x10e8, 0x10d0, 0x10d1, 0x2e, 0x3b, 0x10e0, 0x10d0, 0x10db, 0x2e, 0x3b, 0x10e8, 0x10d0, 0x10d5, 0x2e, 0x3b, 0x10d6, 0x10e3, 0x10da,
+0x2d, 0x10d9, 0x2e, 0x3b, 0x10d6, 0x10e3, 0x10da, 0x2d, 0x10f0, 0x2e, 0x4d, 0x75, 0x68, 0x61, 0x72, 0x72, 0x61, 0x6d, 0x3b, 0x53,
+0x61, 0x66, 0x61, 0x72, 0x3b, 0x52, 0x61, 0x62, 0x69, 0x2bb, 0x20, 0x49, 0x3b, 0x52, 0x61, 0x62, 0x69, 0x2bb, 0x20, 0x49,
+0x49, 0x3b, 0x44, 0x73, 0x63, 0x68, 0x75, 0x6d, 0x61, 0x64, 0x61, 0x20, 0x49, 0x3b, 0x44, 0x73, 0x63, 0x68, 0x75, 0x6d,
+0x61, 0x64, 0x61, 0x20, 0x49, 0x49, 0x3b, 0x52, 0x61, 0x64, 0x73, 0x63, 0x68, 0x61, 0x62, 0x3b, 0x53, 0x68, 0x61, 0x2bb,
 0x62, 0x61, 0x6e, 0x3b, 0x52, 0x61, 0x6d, 0x61, 0x64, 0x61, 0x6e, 0x3b, 0x53, 0x68, 0x61, 0x77, 0x77, 0x61, 0x6c, 0x3b,
-0x44, 0x68, 0x75, 0x2bb, 0x6c, 0x2d, 0x51, 0x69, 0x2bb, 0x64, 0x61, 0x68, 0x3b, 0x44, 0x68, 0x75, 0x2bb, 0x6c, 0x2d, 0x48,
-0x69, 0x6a, 0x6a, 0x61, 0x68, 0x3b, 0x31, 0x3b, 0x32, 0x3b, 0x33, 0x3b, 0x34, 0x3b, 0x35, 0x3b, 0x36, 0x3b, 0x37, 0x3b,
-0x38, 0x3b, 0x39, 0x3b, 0x31, 0x30, 0x3b, 0x31, 0x31, 0x3b, 0x31, 0x32, 0x3b, 0x31, 0x33, 0x31, 0x3b, 0x32, 0x3b, 0x33,
-0x3b, 0x34, 0x3b, 0x35, 0x3b, 0x36, 0x3b, 0x37, 0x3b, 0x38, 0x3b, 0x39, 0x3b, 0x31, 0x30, 0x3b, 0x31, 0x31, 0x3b, 0x31,
-0x32, 0x3b, 0x1219, 0x1200, 0x1228, 0x121d, 0x3b, 0x1233, 0x1348, 0x122d, 0x3b, 0x1228, 0x1262, 0x12d1, 0x120d, 0x20, 0x12a0, 0x12c8, 0x120d, 0x3b,
-0x1228, 0x1262, 0x12d1, 0x120d, 0x20, 0x12a0, 0x12ba, 0x122d, 0x3b, 0x1300, 0x121b, 0x12f0, 0x120d, 0x20, 0x12a0, 0x12c8, 0x120d, 0x3b, 0x1300, 0x121b,
-0x12f0, 0x120d, 0x20, 0x12a0, 0x12ba, 0x122d, 0x3b, 0x1228, 0x1300, 0x1265, 0x3b, 0x123b, 0x12a5, 0x1263, 0x1295, 0x3b, 0x1228, 0x1218, 0x12f3, 0x1295,
-0x3b, 0x1238, 0x12cb, 0x120d, 0x3b, 0x12d9, 0x120d, 0x1242, 0x12f3, 0x1205, 0x3b, 0x12d9, 0x120d, 0x1202, 0x1303, 0x1205, 0x3b, 0x645, 0x62d, 0x631,
-0x645, 0x3b, 0x635, 0x641, 0x631, 0x3b, 0x631, 0x628, 0x64a, 0x639, 0x20, 0x627, 0x644, 0x623, 0x648, 0x644, 0x3b, 0x631, 0x628, 0x64a,
-0x639, 0x20, 0x627, 0x644, 0x622, 0x62e, 0x631, 0x3b, 0x62c, 0x645, 0x627, 0x62f, 0x649, 0x20, 0x627, 0x644, 0x623, 0x648, 0x644, 0x649,
-0x3b, 0x62c, 0x645, 0x627, 0x62f, 0x649, 0x20, 0x627, 0x644, 0x622, 0x62e, 0x631, 0x629, 0x3b, 0x631, 0x62c, 0x628, 0x3b, 0x634, 0x639,
-0x628, 0x627, 0x646, 0x3b, 0x631, 0x645, 0x636, 0x627, 0x646, 0x3b, 0x634, 0x648, 0x627, 0x644, 0x3b, 0x630, 0x648, 0x20, 0x627, 0x644,
-0x642, 0x639, 0x62f, 0x629, 0x3b, 0x630, 0x648, 0x20, 0x627, 0x644, 0x62d, 0x62c, 0x629, 0x3b, 0x661, 0x3b, 0x662, 0x3b, 0x663, 0x3b,
-0x664, 0x3b, 0x665, 0x3b, 0x666, 0x3b, 0x667, 0x3b, 0x668, 0x3b, 0x669, 0x3b, 0x661, 0x660, 0x3b, 0x661, 0x661, 0x3b, 0x661, 0x662,
-0x3b, 0x4d, 0x259, 0x68, 0x2e, 0x3b, 0x53, 0x259, 0x66, 0x2e, 0x3b, 0x52, 0x259, 0x62, 0x2e, 0x20, 0x49, 0x3b, 0x52, 0x259,
-0x62, 0x2e, 0x20, 0x49, 0x49, 0x3b, 0x43, 0x259, 0x6d, 0x2e, 0x20, 0x49, 0x3b, 0x43, 0x259, 0x6d, 0x2e, 0x20, 0x49, 0x49,
-0x3b, 0x52, 0x259, 0x63, 0x2e, 0x3b, 0x15e, 0x61, 0x62, 0x2e, 0x3b, 0x52, 0x61, 0x6d, 0x2e, 0x3b, 0x15e, 0x259, 0x76, 0x2e,
-0x3b, 0x5a, 0x69, 0x6c, 0x71, 0x2e, 0x3b, 0x5a, 0x69, 0x6c, 0x68, 0x2e, 0x3b, 0x4d, 0x259, 0x68, 0x259, 0x72, 0x72, 0x259,
-0x6d, 0x3b, 0x53, 0x259, 0x66, 0x259, 0x72, 0x3b, 0x52, 0x259, 0x62, 0x69, 0xfc, 0x6c, 0x259, 0x76, 0x76, 0x259, 0x6c, 0x3b,
-0x52, 0x259, 0x62, 0x69, 0xfc, 0x6c, 0x61, 0x78, 0x131, 0x72, 0x3b, 0x43, 0x259, 0x6d, 0x61, 0x64, 0x69, 0x79, 0x259, 0x6c,
-0x259, 0x76, 0x76, 0x259, 0x6c, 0x3b, 0x43, 0x259, 0x6d, 0x61, 0x64, 0x69, 0x79, 0x259, 0x6c, 0x61, 0x78, 0x131, 0x72, 0x3b,
-0x52, 0x259, 0x63, 0x259, 0x62, 0x3b, 0x15e, 0x61, 0x62, 0x61, 0x6e, 0x3b, 0x52, 0x61, 0x6d, 0x61, 0x7a, 0x61, 0x6e, 0x3b,
-0x15e, 0x259, 0x76, 0x76, 0x61, 0x6c, 0x3b, 0x5a, 0x69, 0x6c, 0x71, 0x259, 0x64, 0x259, 0x3b, 0x5a, 0x69, 0x6c, 0x68, 0x69,
-0x63, 0x63, 0x259, 0x3b, 0x9ae, 0x9b9, 0x9b0, 0x9b0, 0x9ae, 0x3b, 0x9b8, 0x9ab, 0x9b0, 0x3b, 0x9b0, 0x9ac, 0x9bf, 0x989, 0x9b2, 0x20,
-0x986, 0x989, 0x9af, 0x9bc, 0x9be, 0x9b2, 0x3b, 0x9b0, 0x9ac, 0x9bf, 0x989, 0x9b8, 0x20, 0x9b8, 0x9be, 0x9a8, 0x9bf, 0x3b, 0x99c, 0x9ae,
-0x9be, 0x9a6, 0x9bf, 0x989, 0x9b2, 0x20, 0x986, 0x989, 0x9af, 0x9bc, 0x9be, 0x9b2, 0x3b, 0x99c, 0x9ae, 0x9be, 0x9a6, 0x9bf, 0x989, 0x9b8,
-0x20, 0x9b8, 0x9be, 0x9a8, 0x9bf, 0x3b, 0x9b0, 0x99c, 0x9ac, 0x3b, 0x9b6, 0x9be, 0x2018, 0x9ac, 0x9be, 0x9a8, 0x3b, 0x9b0, 0x9ae, 0x99c,
-0x9be, 0x9a8, 0x3b, 0x9b6, 0x9be, 0x993, 0x9af, 0x9bc, 0x9be, 0x9b2, 0x3b, 0x99c, 0x9cd, 0x9ac, 0x9bf, 0x9b2, 0x995, 0x9a6, 0x3b, 0x99c,
-0x9cd, 0x9ac, 0x9bf, 0x9b2, 0x9b9, 0x99c, 0x9cd, 0x99c, 0x3b, 0x9e7, 0x3b, 0x9e8, 0x3b, 0x9e9, 0x3b, 0x9ea, 0x3b, 0x9eb, 0x3b, 0x9ec,
-0x3b, 0x9ed, 0x3b, 0x9ee, 0x3b, 0x9ef, 0x3b, 0x9e7, 0x9e6, 0x3b, 0x9e7, 0x9e7, 0x3b, 0x9e7, 0x9e8, 0x3b, 0x43c, 0x443, 0x445, 0x430,
-0x440, 0x430, 0x43c, 0x3b, 0x441, 0x430, 0x444, 0x430, 0x440, 0x3b, 0x440, 0x430, 0x431, 0x438, 0x2d, 0x31, 0x3b, 0x440, 0x430, 0x431,
-0x438, 0x2d, 0x32, 0x3b, 0x434, 0x436, 0x443, 0x43c, 0x430, 0x434, 0x430, 0x2d, 0x31, 0x3b, 0x434, 0x436, 0x443, 0x43c, 0x430, 0x434,
-0x430, 0x2d, 0x32, 0x3b, 0x440, 0x430, 0x434, 0x436, 0x430, 0x431, 0x3b, 0x448, 0x430, 0x431, 0x430, 0x43d, 0x3b, 0x440, 0x430, 0x43c,
-0x430, 0x437, 0x430, 0x43d, 0x3b, 0x428, 0x430, 0x432, 0x430, 0x43b, 0x3b, 0x414, 0x445, 0x443, 0x43b, 0x2d, 0x41a, 0x430, 0x430, 0x434,
-0x430, 0x3b, 0x414, 0x445, 0x443, 0x43b, 0x2d, 0x445, 0x438, 0x434, 0x436, 0x430, 0x3b, 0x31, 0x6708, 0x3b, 0x32, 0x6708, 0x3b, 0x33,
-0x6708, 0x3b, 0x34, 0x6708, 0x3b, 0x35, 0x6708, 0x3b, 0x36, 0x6708, 0x3b, 0x37, 0x6708, 0x3b, 0x38, 0x6708, 0x3b, 0x39, 0x6708, 0x3b,
-0x31, 0x30, 0x6708, 0x3b, 0x31, 0x31, 0x6708, 0x3b, 0x31, 0x32, 0x6708, 0x3b, 0x4e00, 0x6708, 0x3b, 0x4e8c, 0x6708, 0x3b, 0x4e09, 0x6708,
-0x3b, 0x56db, 0x6708, 0x3b, 0x4e94, 0x6708, 0x3b, 0x516d, 0x6708, 0x3b, 0x4e03, 0x6708, 0x3b, 0x516b, 0x6708, 0x3b, 0x4e5d, 0x6708, 0x3b, 0x5341,
-0x6708, 0x3b, 0x5341, 0x4e00, 0x6708, 0x3b, 0x5341, 0x4e8c, 0x6708, 0x3b, 0x7a46, 0x54c8, 0x862d, 0x59c6, 0x6708, 0x3b, 0x8272, 0x6cd5, 0x723e, 0x6708,
-0x3b, 0x8cf4, 0x6bd4, 0x6708, 0x20, 0x49, 0x3b, 0x8cf4, 0x6bd4, 0x6708, 0x20, 0x49, 0x49, 0x3b, 0x4e3b, 0x99ac, 0x9054, 0x6708, 0x20, 0x49,
-0x3b, 0x4e3b, 0x99ac, 0x9054, 0x6708, 0x20, 0x49, 0x49, 0x3b, 0x8cf4, 0x54f2, 0x535c, 0x6708, 0x3b, 0x820d, 0x723e, 0x90a6, 0x6708, 0x3b, 0x8cf4,
-0x8cb7, 0x4e39, 0x6708, 0x3b, 0x9583, 0x74e6, 0x9b6f, 0x6708, 0x3b, 0x90fd, 0x723e, 0x5580, 0x723e, 0x5fb7, 0x6708, 0x3b, 0x90fd, 0x723e, 0x9ed1, 0x54f2,
-0x6708, 0x3b, 0x31, 0x2e, 0x3b, 0x32, 0x2e, 0x3b, 0x33, 0x2e, 0x3b, 0x34, 0x2e, 0x3b, 0x35, 0x2e, 0x3b, 0x36, 0x2e, 0x3b,
-0x37, 0x2e, 0x3b, 0x38, 0x2e, 0x3b, 0x39, 0x2e, 0x3b, 0x31, 0x30, 0x2e, 0x3b, 0x31, 0x31, 0x2e, 0x3b, 0x31, 0x32, 0x2e,
-0x3b, 0x6d, 0x75, 0x68, 0x2e, 0x3b, 0x73, 0x61, 0x66, 0x2e, 0x3b, 0x72, 0x65, 0x62, 0x2e, 0x20, 0x49, 0x3b, 0x72, 0x65,
-0x62, 0x2e, 0x20, 0x49, 0x49, 0x3b, 0x64, 0x17e, 0x75, 0x6d, 0x2e, 0x20, 0x49, 0x3b, 0x64, 0x17e, 0x75, 0x6d, 0x2e, 0x20,
-0x49, 0x49, 0x3b, 0x72, 0x65, 0x64, 0x2e, 0x3b, 0x161, 0x61, 0x2e, 0x3b, 0x72, 0x61, 0x6d, 0x2e, 0x3b, 0x161, 0x61, 0x77,
-0x2e, 0x3b, 0x7a, 0xfa, 0x20, 0x6c, 0x2d, 0x6b, 0x2e, 0x3b, 0x7a, 0xfa, 0x20, 0x6c, 0x2d, 0x68, 0x2e, 0x3b, 0x6d, 0x75,
-0x68, 0x61, 0x72, 0x72, 0x65, 0x6d, 0x3b, 0x73, 0x61, 0x66, 0x61, 0x72, 0x3b, 0x72, 0x65, 0x62, 0xed, 0x2019, 0x75, 0x20,
-0x6c, 0x2d, 0x61, 0x77, 0x77, 0x61, 0x6c, 0x3b, 0x72, 0x65, 0x62, 0xed, 0x2019, 0x75, 0x20, 0x73, 0x2d, 0x73, 0xe1, 0x6e,
-0xed, 0x3b, 0x64, 0x17e, 0x75, 0x6d, 0xe1, 0x64, 0xe1, 0x20, 0x61, 0x6c, 0x2d, 0xfa, 0x6c, 0xe1, 0x3b, 0x64, 0x17e, 0x75,
-0x6d, 0xe1, 0x64, 0xe1, 0x20, 0x61, 0x6c, 0x2d, 0xe1, 0x63, 0x68, 0x69, 0x72, 0x61, 0x3b, 0x72, 0x65, 0x64, 0x17e, 0x65,
-0x62, 0x3b, 0x161, 0x61, 0x2019, 0x62, 0xe1, 0x6e, 0x3b, 0x72, 0x61, 0x6d, 0x61, 0x64, 0xe1, 0x6e, 0x3b, 0x161, 0x61, 0x77,
-0x77, 0x61, 0x6c, 0x3b, 0x7a, 0xfa, 0x20, 0x6c, 0x2d, 0x6b, 0x61, 0x2019, 0x64, 0x61, 0x3b, 0x7a, 0xfa, 0x20, 0x6c, 0x2d,
-0x68, 0x69, 0x64, 0x17e, 0x64, 0x17e, 0x61, 0x3b, 0x6d, 0x75, 0x68, 0x61, 0x72, 0x72, 0x61, 0x6d, 0x3b, 0x73, 0x61, 0x66,
-0x61, 0x72, 0x3b, 0x72, 0x61, 0x62, 0x69, 0x2bb, 0x20, 0x49, 0x3b, 0x72, 0x61, 0x62, 0x69, 0x2bb, 0x20, 0x49, 0x49, 0x3b,
-0x6a, 0x75, 0x6d, 0x61, 0x64, 0x61, 0x20, 0x49, 0x3b, 0x6a, 0x75, 0x6d, 0x61, 0x64, 0x61, 0x20, 0x49, 0x49, 0x3b, 0x72,
-0x61, 0x6a, 0x61, 0x62, 0x3b, 0x73, 0x68, 0x61, 0x2bb, 0x62, 0x61, 0x6e, 0x3b, 0x72, 0x61, 0x6d, 0x61, 0x64, 0x61, 0x6e,
-0x3b, 0x73, 0x68, 0x61, 0x77, 0x77, 0x61, 0x6c, 0x3b, 0x64, 0x68, 0x75, 0x2bb, 0x6c, 0x2d, 0x51, 0x69, 0x2bb, 0x64, 0x61,
-0x68, 0x3b, 0x64, 0x68, 0x75, 0x2bb, 0x6c, 0x2d, 0x48, 0x69, 0x6a, 0x6a, 0x61, 0x68, 0x3b, 0x4d, 0x6f, 0x65, 0x68, 0x2e,
-0x3b, 0x53, 0x61, 0x66, 0x2e, 0x3b, 0x52, 0x61, 0x62, 0x2e, 0x20, 0x49, 0x3b, 0x52, 0x61, 0x62, 0x2e, 0x20, 0x49, 0x49,
-0x3b, 0x4a, 0x6f, 0x65, 0x6d, 0x2e, 0x20, 0x49, 0x3b, 0x4a, 0x6f, 0x65, 0x6d, 0x2e, 0x20, 0x49, 0x49, 0x3b, 0x52, 0x61,
-0x6a, 0x2e, 0x3b, 0x53, 0x6a, 0x61, 0x2e, 0x3b, 0x52, 0x61, 0x6d, 0x2e, 0x3b, 0x53, 0x6a, 0x61, 0x77, 0x2e, 0x3b, 0x44,
-0x6f, 0x65, 0x20, 0x61, 0x6c, 0x20, 0x6b, 0x2e, 0x3b, 0x44, 0x6f, 0x65, 0x20, 0x61, 0x6c, 0x20, 0x68, 0x2e, 0x3b, 0x4d,
-0x6f, 0x65, 0x68, 0x61, 0x72, 0x72, 0x61, 0x6d, 0x3b, 0x53, 0x61, 0x66, 0x61, 0x72, 0x3b, 0x52, 0x61, 0x62, 0x69, 0x2bb,
-0x61, 0x20, 0x61, 0x6c, 0x20, 0x61, 0x77, 0x61, 0x6c, 0x3b, 0x52, 0x61, 0x62, 0x69, 0x2bb, 0x61, 0x20, 0x61, 0x6c, 0x20,
-0x74, 0x68, 0x61, 0x6e, 0x69, 0x3b, 0x4a, 0x6f, 0x65, 0x6d, 0x61, 0x64, 0x2bb, 0x61, 0x6c, 0x20, 0x61, 0x77, 0x61, 0x6c,
-0x3b, 0x4a, 0x6f, 0x65, 0x6d, 0x61, 0x64, 0x2bb, 0x61, 0x6c, 0x20, 0x74, 0x68, 0x61, 0x6e, 0x69, 0x3b, 0x52, 0x61, 0x6a,
-0x61, 0x62, 0x3b, 0x53, 0x6a, 0x61, 0x2bb, 0x61, 0x62, 0x61, 0x6e, 0x3b, 0x52, 0x61, 0x6d, 0x61, 0x64, 0x61, 0x6e, 0x3b,
-0x53, 0x6a, 0x61, 0x77, 0x61, 0x6c, 0x3b, 0x44, 0x6f, 0x65, 0x20, 0x61, 0x6c, 0x20, 0x6b, 0x61, 0x2bb, 0x61, 0x62, 0x61,
-0x3b, 0x44, 0x6f, 0x65, 0x20, 0x61, 0x6c, 0x20, 0x68, 0x69, 0x7a, 0x6a, 0x61, 0x3b, 0x6d, 0x75, 0x68, 0x61, 0x72, 0x72,
-0x61, 0x6d, 0x3b, 0x73, 0x61, 0x66, 0x61, 0x72, 0x3b, 0x72, 0x61, 0x62, 0x69, 0x2019, 0x20, 0x61, 0x6c, 0x2d, 0x61, 0x77,
-0x77, 0x61, 0x6c, 0x3b, 0x72, 0x61, 0x62, 0x69, 0x2019, 0x20, 0x61, 0x6c, 0x2d, 0x61, 0x6b, 0x68, 0x69, 0x72, 0x3b, 0x64,
-0x17e, 0x75, 0x6d, 0x61, 0x64, 0x61, 0x2d, 0x6c, 0x2d, 0x75, 0x6c, 0x61, 0x3b, 0x64, 0x17e, 0x75, 0x6d, 0x61, 0x64, 0x61,
-0x2d, 0x6c, 0x2d, 0x61, 0x6b, 0x68, 0x69, 0x72, 0x61, 0x3b, 0x72, 0x61, 0x64, 0x17e, 0x61, 0x62, 0x3b, 0x161, 0x61, 0x2019,
-0x62, 0x61, 0x6e, 0x3b, 0x72, 0x61, 0x6d, 0x61, 0x64, 0x61, 0x6e, 0x3b, 0x161, 0x61, 0x77, 0x77, 0x61, 0x6c, 0x3b, 0x64,
-0x68, 0x75, 0x2d, 0x6c, 0x2d, 0x71, 0x61, 0x2019, 0x64, 0x61, 0x3b, 0x64, 0x68, 0x75, 0x2d, 0x6c, 0x2d, 0x68, 0x69, 0x64,
-0x64, 0x17e, 0x61, 0x3b, 0x6d, 0x6f, 0x75, 0x68, 0x2e, 0x3b, 0x73, 0x61, 0x66, 0x2e, 0x3b, 0x72, 0x61, 0x62, 0x2e, 0x20,
-0x61, 0x77, 0x2e, 0x3b, 0x72, 0x61, 0x62, 0x2e, 0x20, 0x74, 0x68, 0x2e, 0x3b, 0x6a, 0x6f, 0x75, 0x6d, 0x2e, 0x20, 0x6f,
-0x75, 0x2e, 0x3b, 0x6a, 0x6f, 0x75, 0x6d, 0x2e, 0x20, 0x74, 0x68, 0x2e, 0x3b, 0x72, 0x61, 0x6a, 0x2e, 0x3b, 0x63, 0x68,
-0x61, 0x61, 0x2e, 0x3b, 0x72, 0x61, 0x6d, 0x2e, 0x3b, 0x63, 0x68, 0x61, 0x77, 0x2e, 0x3b, 0x64, 0x68, 0x6f, 0x75, 0x2e,
-0x20, 0x71, 0x69, 0x2e, 0x3b, 0x64, 0x68, 0x6f, 0x75, 0x2e, 0x20, 0x68, 0x69, 0x2e, 0x3b, 0x6d, 0x6f, 0x75, 0x68, 0x61,
-0x72, 0x72, 0x61, 0x6d, 0x3b, 0x73, 0x61, 0x66, 0x61, 0x72, 0x3b, 0x72, 0x61, 0x62, 0x69, 0x61, 0x20, 0x61, 0x6c, 0x20,
-0x61, 0x77, 0x61, 0x6c, 0x3b, 0x72, 0x61, 0x62, 0x69, 0x61, 0x20, 0x61, 0x74, 0x68, 0x2d, 0x74, 0x68, 0x61, 0x6e, 0x69,
-0x3b, 0x6a, 0x6f, 0x75, 0x6d, 0x61, 0x64, 0x61, 0x20, 0x61, 0x6c, 0x20, 0x6f, 0x75, 0x6c, 0x61, 0x3b, 0x6a, 0x6f, 0x75,
-0x6d, 0x61, 0x64, 0x61, 0x20, 0x61, 0x74, 0x68, 0x2d, 0x74, 0x68, 0x61, 0x6e, 0x69, 0x61, 0x3b, 0x72, 0x61, 0x6a, 0x61,
-0x62, 0x3b, 0x63, 0x68, 0x61, 0x61, 0x62, 0x61, 0x6e, 0x65, 0x3b, 0x72, 0x61, 0x6d, 0x61, 0x64, 0x61, 0x6e, 0x3b, 0x63,
-0x68, 0x61, 0x77, 0x77, 0x61, 0x6c, 0x3b, 0x64, 0x68, 0x6f, 0x75, 0x20, 0x61, 0x6c, 0x20, 0x71, 0x69, 0x60, 0x64, 0x61,
-0x3b, 0x64, 0x68, 0x6f, 0x75, 0x20, 0x61, 0x6c, 0x2d, 0x68, 0x69, 0x6a, 0x6a, 0x61, 0x3b, 0x6d, 0x6f, 0x75, 0x68, 0x2e,
-0x3b, 0x73, 0x61, 0x66, 0x2e, 0x3b, 0x72, 0x61, 0x62, 0x2e, 0x20, 0x61, 0x77, 0x2e, 0x3b, 0x72, 0x61, 0x62, 0x2e, 0x20,
-0x74, 0x68, 0x2e, 0x3b, 0x6a, 0x6f, 0x75, 0x6d, 0x2e, 0x20, 0x6f, 0x75, 0x6c, 0x2e, 0x3b, 0x6a, 0x6f, 0x75, 0x6d, 0x2e,
-0x20, 0x74, 0x68, 0x61, 0x2e, 0x3b, 0x72, 0x61, 0x6a, 0x2e, 0x3b, 0x63, 0x68, 0x61, 0x61, 0x2e, 0x3b, 0x72, 0x61, 0x6d,
-0x2e, 0x3b, 0x63, 0x68, 0x61, 0x77, 0x2e, 0x3b, 0x64, 0x68, 0x6f, 0x75, 0x2e, 0x20, 0x71, 0x2e, 0x3b, 0x64, 0x68, 0x6f,
-0x75, 0x2e, 0x20, 0x68, 0x2e, 0x3b, 0x10db, 0x10e3, 0x10f0, 0x2e, 0x3b, 0x10e1, 0x10d0, 0x10e4, 0x2e, 0x3b, 0x10e0, 0x10d0, 0x10d1, 0x2e,
-0x20, 0x49, 0x3b, 0x10e0, 0x10d0, 0x10d1, 0x2e, 0x20, 0x49, 0x49, 0x3b, 0x10ef, 0x10e3, 0x10db, 0x2e, 0x20, 0x49, 0x3b, 0x10ef, 0x10e3,
-0x10db, 0x2e, 0x20, 0x49, 0x49, 0x3b, 0x10e0, 0x10d0, 0x10ef, 0x2e, 0x3b, 0x10e8, 0x10d0, 0x10d1, 0x2e, 0x3b, 0x10e0, 0x10d0, 0x10db, 0x2e,
-0x3b, 0x10e8, 0x10d0, 0x10d5, 0x2e, 0x3b, 0x10d6, 0x10e3, 0x10da, 0x2d, 0x10d9, 0x2e, 0x3b, 0x10d6, 0x10e3, 0x10da, 0x2d, 0x10f0, 0x2e, 0x3b,
-0x10db, 0x10e3, 0x10f0, 0x10d0, 0x10e0, 0x10d0, 0x10db, 0x10d8, 0x3b, 0x10e1, 0x10d0, 0x10e4, 0x10d0, 0x10e0, 0x10d8, 0x3b, 0x10e0, 0x10d0, 0x10d1, 0x10d8,
-0x20, 0x10e3, 0x10da, 0x2d, 0x10d0, 0x10d5, 0x10d0, 0x10da, 0x10d8, 0x3b, 0x10e0, 0x10d0, 0x10d1, 0x10d8, 0x20, 0x10e3, 0x10da, 0x2d, 0x10d0, 0x10ee,
-0x10d8, 0x10e0, 0x10d8, 0x3b, 0x10ef, 0x10e3, 0x10db, 0x10d0, 0x10d3, 0x10d0, 0x20, 0x10e3, 0x10da, 0x2d, 0x10d0, 0x10d5, 0x10d0, 0x10da, 0x10d8, 0x3b,
-0x10ef, 0x10e3, 0x10db, 0x10d0, 0x10d3, 0x10d0, 0x20, 0x10e3, 0x10da, 0x2d, 0x10d0, 0x10ee, 0x10d8, 0x10e0, 0x10d8, 0x3b, 0x10e0, 0x10d0, 0x10ef, 0x10d0,
-0x10d1, 0x10d8, 0x3b, 0x10e8, 0x10d0, 0x10d1, 0x10d0, 0x10dc, 0x10d8, 0x3b, 0x10e0, 0x10d0, 0x10db, 0x10d0, 0x10d3, 0x10d0, 0x10dc, 0x10d8, 0x3b, 0x10e8,
-0x10d0, 0x10d5, 0x10d0, 0x10da, 0x10d8, 0x3b, 0x10d6, 0x10e3, 0x10da, 0x2d, 0x10d9, 0x10d0, 0x10d0, 0x10d3, 0x10d0, 0x3b, 0x10d6, 0x10e3, 0x10da, 0x2d,
-0x10f0, 0x10d8, 0x10ef, 0x10d0, 0x3b, 0x4d, 0x75, 0x68, 0x61, 0x72, 0x72, 0x61, 0x6d, 0x3b, 0x53, 0x61, 0x66, 0x61, 0x72, 0x3b,
-0x52, 0x61, 0x62, 0x69, 0x2bb, 0x20, 0x49, 0x3b, 0x52, 0x61, 0x62, 0x69, 0x2bb, 0x20, 0x49, 0x49, 0x3b, 0x44, 0x73, 0x63,
-0x68, 0x75, 0x6d, 0x61, 0x64, 0x61, 0x20, 0x49, 0x3b, 0x44, 0x73, 0x63, 0x68, 0x75, 0x6d, 0x61, 0x64, 0x61, 0x20, 0x49,
-0x49, 0x3b, 0x52, 0x61, 0x64, 0x73, 0x63, 0x68, 0x61, 0x62, 0x3b, 0x53, 0x68, 0x61, 0x2bb, 0x62, 0x61, 0x6e, 0x3b, 0x52,
-0x61, 0x6d, 0x61, 0x64, 0x61, 0x6e, 0x3b, 0x53, 0x68, 0x61, 0x77, 0x77, 0x61, 0x6c, 0x3b, 0x44, 0x68, 0x75, 0x20, 0x6c,
-0x2d, 0x71, 0x61, 0x2bf, 0x64, 0x61, 0x3b, 0x44, 0x68, 0x75, 0x20, 0x6c, 0x2d, 0x48, 0x69, 0x64, 0x64, 0x73, 0x63, 0x68,
-0x61, 0x3b, 0xaae, 0xac1, 0xab9, 0x2e, 0x3b, 0xab8, 0xaab, 0x2e, 0x3b, 0xab0, 0xaac, 0x2e, 0x49, 0x3b, 0xab0, 0xaac, 0x2e, 0x20,
-0x49, 0x49, 0x3b, 0xa9c, 0xac1, 0xaae, 0x2e, 0x20, 0x49, 0x3b, 0xa9c, 0xac1, 0xaae, 0x2e, 0x20, 0x49, 0x49, 0x3b, 0xab0, 0xabe,
-0xa9c, 0x2e, 0x3b, 0xab6, 0xabe, 0x2e, 0x3b, 0xab0, 0xabe, 0xaae, 0x2e, 0x3b, 0xab6, 0xabe, 0xab5, 0x2e, 0x3b, 0xaa7, 0xac1, 0x2bb,
-0xab2, 0x2d, 0xa95, 0xacd, 0xaaf, 0xac1, 0x2e, 0x3b, 0xaa7, 0xac1, 0x2bb, 0xab2, 0x2d, 0xa8f, 0xa9a, 0x2e, 0x3b, 0xaae, 0xac1, 0xab9,
-0xab0, 0xacd, 0xab0, 0xaae, 0x3b, 0xab8, 0xaab, 0xab0, 0x3b, 0xab0, 0xabe, 0xaac, 0xac0, 0x2bb, 0x20, 0x49, 0x3b, 0xab0, 0xabe, 0xaac,
-0xac0, 0x2bb, 0x20, 0x49, 0x49, 0x3b, 0xa9c, 0xac1, 0xaae, 0xabe, 0xaa6, 0xabe, 0x20, 0x49, 0x3b, 0xa9c, 0xac1, 0xaae, 0xabe, 0xaa6,
-0xabe, 0x20, 0x49, 0x49, 0x3b, 0xab0, 0xa9c, 0xaac, 0x3b, 0xab6, 0xabe, 0x2bb, 0xaac, 0xabe, 0xaa8, 0x3b, 0xab0, 0xaae, 0xaa6, 0xabe,
-0xaa8, 0x3b, 0xab6, 0xabe, 0xab5, 0xacd, 0xab5, 0xab2, 0x3b, 0xaa7, 0xac1, 0x2bb, 0xab2, 0x2d, 0xa95, 0xacd, 0xab5, 0xac0, 0x2bb, 0xaa1,
-0xabe, 0xab9, 0x3b, 0xaa7, 0xac1, 0x2bb, 0xab2, 0x2d, 0xab9, 0xabf, 0xa9c, 0xacd, 0xa9c, 0xabe, 0xab9, 0x3b, 0x5de, 0x5d5, 0x5d7, 0x5e8,
-0x5dd, 0x3b, 0x5e6, 0x5e4, 0x5e8, 0x3b, 0x5e8, 0x5d1, 0x5d9, 0x5e2, 0x20, 0x5d0, 0x5f3, 0x3b, 0x5e8, 0x5d1, 0x5d9, 0x5e2, 0x20, 0x5d1,
-0x5f3, 0x3b, 0x5d2, 0x5f3, 0x5d5, 0x5de, 0x5d0, 0x5d3, 0x5d0, 0x20, 0x5d0, 0x5f3, 0x3b, 0x5d2, 0x5f3, 0x5d5, 0x5de, 0x5d0, 0x5d3, 0x5d0,
-0x20, 0x5d1, 0x5f3, 0x3b, 0x5e8, 0x5d2, 0x5f3, 0x5d1, 0x3b, 0x5e9, 0x5e2, 0x5d1, 0x5d0, 0x5df, 0x3b, 0x5e8, 0x5de, 0x5d3, 0x5d0, 0x5df,
-0x3b, 0x5e9, 0x5d5, 0x5d5, 0x5d0, 0x5dc, 0x3b, 0x5d3, 0x5f3, 0x5d5, 0x20, 0x5d0, 0x5dc, 0x5be, 0x5e7, 0x5e2, 0x5d3, 0x5d4, 0x3b, 0x5d3,
-0x5f3, 0x5d5, 0x20, 0x5d0, 0x5dc, 0x5be, 0x5d7, 0x5d9, 0x5d2, 0x5f3, 0x5d4, 0x3b, 0x5de, 0x5d5, 0x5d7, 0x5e8, 0x5dd, 0x3b, 0x5e6, 0x5e4,
-0x5e8, 0x3b, 0x5e8, 0x5d1, 0x5d9, 0x5e2, 0x20, 0x5d0, 0x5dc, 0x5be, 0x5d0, 0x5d5, 0x5d5, 0x5dc, 0x3b, 0x5e8, 0x5d1, 0x5d9, 0x5e2, 0x20,
-0x5d0, 0x5be, 0x5ea, 0x5f3, 0x5d0, 0x5e0, 0x5d9, 0x3b, 0x5d2, 0x5f3, 0x5d5, 0x5de, 0x5d0, 0x5d3, 0x5d0, 0x20, 0x5d0, 0x5dc, 0x5be, 0x5d0,
-0x5d5, 0x5dc, 0x5d0, 0x3b, 0x5d2, 0x5f3, 0x5d5, 0x5de, 0x5d0, 0x5d3, 0x5d0, 0x20, 0x5d0, 0x5be, 0x5ea, 0x5f3, 0x5d0, 0x5e0, 0x5d9, 0x5d4,
-0x3b, 0x5e8, 0x5d2, 0x5f3, 0x5d1, 0x3b, 0x5e9, 0x5e2, 0x5d1, 0x5d0, 0x5df, 0x3b, 0x5e8, 0x5de, 0x5d3, 0x5d0, 0x5df, 0x3b, 0x5e9, 0x5d5,
-0x5d5, 0x5d0, 0x5dc, 0x3b, 0x5d3, 0x5f3, 0x5d5, 0x20, 0x5d0, 0x5dc, 0x5be, 0x5e7, 0x5e2, 0x5d3, 0x5d4, 0x3b, 0x5d3, 0x5f3, 0x5d5, 0x20,
-0x5d0, 0x5dc, 0x5be, 0x5d7, 0x5d9, 0x5d2, 0x5f3, 0x5d4, 0x3b, 0x5de, 0x5d5, 0x5d7, 0x5e8, 0x5dd, 0x3b, 0x5e6, 0x5e4, 0x5e8, 0x3b, 0x5e8,
-0x5d1, 0x5d9, 0x5e2, 0x20, 0x5d0, 0x5dc, 0x2d, 0x5d0, 0x5d5, 0x5d5, 0x5dc, 0x3b, 0x5e8, 0x5d1, 0x5d9, 0x5e2, 0x20, 0x5d0, 0x2d, 0x5ea,
-0x5f3, 0x5d0, 0x5e0, 0x5d9, 0x3b, 0x5d2, 0x5f3, 0x5d5, 0x5de, 0x5d0, 0x5d3, 0x5d0, 0x20, 0x5d0, 0x5dc, 0x2d, 0x5d0, 0x5d5, 0x5dc, 0x5d0,
-0x3b, 0x5d2, 0x5f3, 0x5d5, 0x5de, 0x5d0, 0x5d3, 0x5d0, 0x20, 0x5d0, 0x2d, 0x5ea, 0x5f3, 0x5d0, 0x5e0, 0x5d9, 0x5d4, 0x3b, 0x5e8, 0x5d2,
+0x44, 0x68, 0x75, 0x20, 0x6c, 0x2d, 0x71, 0x61, 0x2bf, 0x64, 0x61, 0x3b, 0x44, 0x68, 0x75, 0x20, 0x6c, 0x2d, 0x48, 0x69,
+0x64, 0x64, 0x73, 0x63, 0x68, 0x61, 0xaae, 0xac1, 0xab9, 0xab0, 0xacd, 0xab0, 0xaae, 0x3b, 0xab8, 0xaab, 0xab0, 0x3b, 0xab0, 0xabe,
+0xaac, 0xac0, 0x2bb, 0x20, 0x49, 0x3b, 0xab0, 0xabe, 0xaac, 0xac0, 0x2bb, 0x20, 0x49, 0x49, 0x3b, 0xa9c, 0xac1, 0xaae, 0xabe, 0xaa6,
+0xabe, 0x20, 0x49, 0x3b, 0xa9c, 0xac1, 0xaae, 0xabe, 0xaa6, 0xabe, 0x20, 0x49, 0x49, 0x3b, 0xab0, 0xa9c, 0xaac, 0x3b, 0xab6, 0xabe,
+0x2bb, 0xaac, 0xabe, 0xaa8, 0x3b, 0xab0, 0xaae, 0xaa6, 0xabe, 0xaa8, 0x3b, 0xab6, 0xabe, 0xab5, 0xacd, 0xab5, 0xab2, 0x3b, 0xaa7, 0xac1,
+0x2bb, 0xab2, 0x2d, 0xa95, 0xacd, 0xab5, 0xac0, 0x2bb, 0xaa1, 0xabe, 0xab9, 0x3b, 0xaa7, 0xac1, 0x2bb, 0xab2, 0x2d, 0xab9, 0xabf, 0xa9c,
+0xacd, 0xa9c, 0xabe, 0xab9, 0xaae, 0xac1, 0xab9, 0x2e, 0x3b, 0xab8, 0xaab, 0x2e, 0x3b, 0xab0, 0xaac, 0x2e, 0x49, 0x3b, 0xab0, 0xaac,
+0x2e, 0x20, 0x49, 0x49, 0x3b, 0xa9c, 0xac1, 0xaae, 0x2e, 0x20, 0x49, 0x3b, 0xa9c, 0xac1, 0xaae, 0x2e, 0x20, 0x49, 0x49, 0x3b,
+0xab0, 0xabe, 0xa9c, 0x2e, 0x3b, 0xab6, 0xabe, 0x2e, 0x3b, 0xab0, 0xabe, 0xaae, 0x2e, 0x3b, 0xab6, 0xabe, 0xab5, 0x2e, 0x3b, 0xaa7,
+0xac1, 0x2bb, 0xab2, 0x2d, 0xa95, 0xacd, 0xaaf, 0xac1, 0x2e, 0x3b, 0xaa7, 0xac1, 0x2bb, 0xab2, 0x2d, 0xa8f, 0xa9a, 0x2e, 0x5de, 0x5d5,
+0x5d7, 0x5e8, 0x5dd, 0x3b, 0x5e6, 0x5e4, 0x5e8, 0x3b, 0x5e8, 0x5d1, 0x5d9, 0x5e2, 0x20, 0x5d0, 0x5dc, 0x5be, 0x5d0, 0x5d5, 0x5d5, 0x5dc,
+0x3b, 0x5e8, 0x5d1, 0x5d9, 0x5e2, 0x20, 0x5d0, 0x5be, 0x5ea, 0x5f3, 0x5d0, 0x5e0, 0x5d9, 0x3b, 0x5d2, 0x5f3, 0x5d5, 0x5de, 0x5d0, 0x5d3,
+0x5d0, 0x20, 0x5d0, 0x5dc, 0x5be, 0x5d0, 0x5d5, 0x5dc, 0x5d0, 0x3b, 0x5d2, 0x5f3, 0x5d5, 0x5de, 0x5d0, 0x5d3, 0x5d0, 0x20, 0x5d0, 0x5be,
+0x5ea, 0x5f3, 0x5d0, 0x5e0, 0x5d9, 0x5d4, 0x3b, 0x5e8, 0x5d2, 0x5f3, 0x5d1, 0x3b, 0x5e9, 0x5e2, 0x5d1, 0x5d0, 0x5df, 0x3b, 0x5e8, 0x5de,
+0x5d3, 0x5d0, 0x5df, 0x3b, 0x5e9, 0x5d5, 0x5d5, 0x5d0, 0x5dc, 0x3b, 0x5d3, 0x5f3, 0x5d5, 0x20, 0x5d0, 0x5dc, 0x5be, 0x5e7, 0x5e2, 0x5d3,
+0x5d4, 0x3b, 0x5d3, 0x5f3, 0x5d5, 0x20, 0x5d0, 0x5dc, 0x5be, 0x5d7, 0x5d9, 0x5d2, 0x5f3, 0x5d4, 0x5de, 0x5d5, 0x5d7, 0x5e8, 0x5dd, 0x3b,
+0x5e6, 0x5e4, 0x5e8, 0x3b, 0x5e8, 0x5d1, 0x5d9, 0x5e2, 0x20, 0x5d0, 0x5dc, 0x2d, 0x5d0, 0x5d5, 0x5d5, 0x5dc, 0x3b, 0x5e8, 0x5d1, 0x5d9,
+0x5e2, 0x20, 0x5d0, 0x2d, 0x5ea, 0x5f3, 0x5d0, 0x5e0, 0x5d9, 0x3b, 0x5d2, 0x5f3, 0x5d5, 0x5de, 0x5d0, 0x5d3, 0x5d0, 0x20, 0x5d0, 0x5dc,
+0x2d, 0x5d0, 0x5d5, 0x5dc, 0x5d0, 0x3b, 0x5d2, 0x5f3, 0x5d5, 0x5de, 0x5d0, 0x5d3, 0x5d0, 0x20, 0x5d0, 0x2d, 0x5ea, 0x5f3, 0x5d0, 0x5e0,
+0x5d9, 0x5d4, 0x3b, 0x5e8, 0x5d2, 0x5f3, 0x5d1, 0x3b, 0x5e9, 0x5e2, 0x5d1, 0x5d0, 0x5df, 0x3b, 0x5e8, 0x5de, 0x5d3, 0x5d0, 0x5df, 0x3b,
+0x5e9, 0x5d5, 0x5d5, 0x5d0, 0x5dc, 0x3b, 0x5d3, 0x5f3, 0x5d5, 0x20, 0x5d0, 0x5dc, 0x5be, 0x5e7, 0x5e2, 0x5d3, 0x5d4, 0x3b, 0x5d3, 0x5f3,
+0x5d5, 0x20, 0x5d0, 0x5dc, 0x5be, 0x5d7, 0x5d9, 0x5d2, 0x5f3, 0x5d4, 0x5de, 0x5d5, 0x5d7, 0x5e8, 0x5dd, 0x3b, 0x5e6, 0x5e4, 0x5e8, 0x3b,
+0x5e8, 0x5d1, 0x5d9, 0x5e2, 0x20, 0x5d0, 0x5f3, 0x3b, 0x5e8, 0x5d1, 0x5d9, 0x5e2, 0x20, 0x5d1, 0x5f3, 0x3b, 0x5d2, 0x5f3, 0x5d5, 0x5de,
+0x5d0, 0x5d3, 0x5d0, 0x20, 0x5d0, 0x5f3, 0x3b, 0x5d2, 0x5f3, 0x5d5, 0x5de, 0x5d0, 0x5d3, 0x5d0, 0x20, 0x5d1, 0x5f3, 0x3b, 0x5e8, 0x5d2,
 0x5f3, 0x5d1, 0x3b, 0x5e9, 0x5e2, 0x5d1, 0x5d0, 0x5df, 0x3b, 0x5e8, 0x5de, 0x5d3, 0x5d0, 0x5df, 0x3b, 0x5e9, 0x5d5, 0x5d5, 0x5d0, 0x5dc,
 0x3b, 0x5d3, 0x5f3, 0x5d5, 0x20, 0x5d0, 0x5dc, 0x5be, 0x5e7, 0x5e2, 0x5d3, 0x5d4, 0x3b, 0x5d3, 0x5f3, 0x5d5, 0x20, 0x5d0, 0x5dc, 0x5be,
-0x5d7, 0x5d9, 0x5d2, 0x5f3, 0x5d4, 0x3b, 0x92e, 0x941, 0x939, 0x930, 0x94d, 0x930, 0x92e, 0x3b, 0x938, 0x92b, 0x930, 0x3b, 0x930, 0x93e,
-0x92c, 0x940, 0x20, 0x92a, 0x94d, 0x930, 0x925, 0x92e, 0x3b, 0x930, 0x93e, 0x92c, 0x940, 0x20, 0x926, 0x94d, 0x935, 0x93f, 0x924, 0x940,
-0x92f, 0x3b, 0x91c, 0x941, 0x92e, 0x94d, 0x921, 0x93e, 0x20, 0x92a, 0x94d, 0x930, 0x925, 0x92e, 0x3b, 0x91c, 0x941, 0x92e, 0x94d, 0x921,
-0x93e, 0x20, 0x926, 0x94d, 0x935, 0x93f, 0x924, 0x940, 0x92f, 0x3b, 0x930, 0x91c, 0x92c, 0x3b, 0x936, 0x93e, 0x935, 0x928, 0x3b, 0x930,
-0x92e, 0x91c, 0x93e, 0x928, 0x3b, 0x936, 0x935, 0x94d, 0x935, 0x94d, 0x932, 0x3b, 0x91c, 0x93f, 0x932, 0x2d, 0x915, 0x94d, 0x926, 0x93e,
-0x939, 0x3b, 0x91c, 0x93f, 0x932, 0x94d, 0x2d, 0x939, 0x93f, 0x91c, 0x94d, 0x91c, 0x93e, 0x939, 0x3b, 0x4d, 0x6f, 0x68, 0x2e, 0x3b,
-0x53, 0x61, 0x66, 0x2e, 0x3b, 0x52, 0xe9, 0x62, 0x2e, 0x20, 0x31, 0x3b, 0x52, 0xe9, 0x62, 0x2e, 0x20, 0x32, 0x3b, 0x44,
-0x73, 0x65, 0x6d, 0x2e, 0x20, 0x49, 0x3b, 0x44, 0x73, 0x65, 0x6d, 0x2e, 0x20, 0x49, 0x49, 0x3b, 0x52, 0x65, 0x64, 0x2e,
-0x3b, 0x53, 0x61, 0x62, 0x2e, 0x3b, 0x52, 0x61, 0x6d, 0x2e, 0x3b, 0x53, 0x65, 0x76, 0x2e, 0x3b, 0x44, 0x73, 0xfc, 0x6c,
-0x20, 0x6b, 0x2e, 0x3b, 0x44, 0x73, 0xfc, 0x6c, 0x20, 0x68, 0x2e, 0x3b, 0x4d, 0x6f, 0x68, 0x61, 0x72, 0x72, 0x65, 0x6d,
-0x3b, 0x53, 0x61, 0x66, 0x61, 0x72, 0x3b, 0x52, 0xe9, 0x62, 0x69, 0x20, 0x49, 0x3b, 0x52, 0xe9, 0x62, 0x69, 0x20, 0x49,
-0x49, 0x3b, 0x44, 0x73, 0x65, 0x6d, 0xe1, 0x64, 0x69, 0x20, 0x49, 0x3b, 0x44, 0x73, 0x65, 0x6d, 0xe1, 0x64, 0x69, 0x20,
-0x49, 0x49, 0x3b, 0x52, 0x65, 0x64, 0x73, 0x65, 0x62, 0x3b, 0x53, 0x61, 0x62, 0xe1, 0x6e, 0x3b, 0x52, 0x61, 0x6d, 0x61,
-0x64, 0xe1, 0x6e, 0x3b, 0x53, 0x65, 0x76, 0x76, 0xe1, 0x6c, 0x3b, 0x44, 0x73, 0xfc, 0x6c, 0x20, 0x6b, 0x61, 0x64, 0x65,
-0x3b, 0x44, 0x73, 0xfc, 0x6c, 0x20, 0x68, 0x65, 0x64, 0x73, 0x65, 0x3b, 0x4d, 0x6f, 0x68, 0x61, 0x72, 0x72, 0x65, 0x6d,
+0x5d7, 0x5d9, 0x5d2, 0x5f3, 0x5d4, 0x92e, 0x941, 0x939, 0x930, 0x94d, 0x930, 0x92e, 0x3b, 0x938, 0x92b, 0x930, 0x3b, 0x930, 0x93e, 0x92c,
+0x940, 0x20, 0x92a, 0x94d, 0x930, 0x925, 0x92e, 0x3b, 0x930, 0x93e, 0x92c, 0x940, 0x20, 0x926, 0x94d, 0x935, 0x93f, 0x924, 0x940, 0x92f,
+0x3b, 0x91c, 0x941, 0x92e, 0x94d, 0x921, 0x93e, 0x20, 0x92a, 0x94d, 0x930, 0x925, 0x92e, 0x3b, 0x91c, 0x941, 0x92e, 0x94d, 0x921, 0x93e,
+0x20, 0x926, 0x94d, 0x935, 0x93f, 0x924, 0x940, 0x92f, 0x3b, 0x930, 0x91c, 0x92c, 0x3b, 0x936, 0x93e, 0x935, 0x928, 0x3b, 0x930, 0x92e,
+0x91c, 0x93e, 0x928, 0x3b, 0x936, 0x935, 0x94d, 0x935, 0x94d, 0x932, 0x3b, 0x91c, 0x93f, 0x932, 0x2d, 0x915, 0x94d, 0x926, 0x93e, 0x939,
+0x3b, 0x91c, 0x93f, 0x932, 0x94d, 0x2d, 0x939, 0x93f, 0x91c, 0x94d, 0x91c, 0x93e, 0x939, 0x4d, 0x6f, 0x68, 0x61, 0x72, 0x72, 0x65,
+0x6d, 0x3b, 0x53, 0x61, 0x66, 0x61, 0x72, 0x3b, 0x52, 0xe9, 0x62, 0x69, 0x20, 0x49, 0x3b, 0x52, 0xe9, 0x62, 0x69, 0x20,
+0x49, 0x49, 0x3b, 0x44, 0x73, 0x65, 0x6d, 0xe1, 0x64, 0x69, 0x20, 0x49, 0x3b, 0x44, 0x73, 0x65, 0x6d, 0xe1, 0x64, 0x69,
+0x20, 0x49, 0x49, 0x3b, 0x52, 0x65, 0x64, 0x73, 0x65, 0x62, 0x3b, 0x53, 0x61, 0x62, 0xe1, 0x6e, 0x3b, 0x52, 0x61, 0x6d,
+0x61, 0x64, 0xe1, 0x6e, 0x3b, 0x53, 0x65, 0x76, 0x76, 0xe1, 0x6c, 0x3b, 0x44, 0x73, 0xfc, 0x6c, 0x20, 0x6b, 0x61, 0x64,
+0x65, 0x3b, 0x44, 0x73, 0xfc, 0x6c, 0x20, 0x68, 0x65, 0x64, 0x73, 0x65, 0x4d, 0x6f, 0x68, 0x61, 0x72, 0x72, 0x65, 0x6d,
 0x3b, 0x53, 0x61, 0x66, 0x61, 0x72, 0x3b, 0x52, 0xe9, 0x62, 0x69, 0x20, 0x65, 0x6c, 0x20, 0x61, 0x76, 0x76, 0x65, 0x6c,
 0x3b, 0x52, 0xe9, 0x62, 0x69, 0x20, 0x65, 0x6c, 0x20, 0x61, 0x63, 0x63, 0x68, 0x65, 0x72, 0x3b, 0x44, 0x73, 0x65, 0x6d,
 0xe1, 0x64, 0x69, 0x20, 0x65, 0x6c, 0x20, 0x61, 0x76, 0x76, 0x65, 0x6c, 0x3b, 0x44, 0x73, 0x65, 0x6d, 0xe1, 0x64, 0x69,
 0x20, 0x65, 0x6c, 0x20, 0x61, 0x63, 0x63, 0x68, 0x65, 0x72, 0x3b, 0x52, 0x65, 0x64, 0x73, 0x65, 0x62, 0x3b, 0x53, 0x61,
 0x62, 0xe1, 0x6e, 0x3b, 0x52, 0x61, 0x6d, 0x61, 0x64, 0xe1, 0x6e, 0x3b, 0x53, 0x65, 0x76, 0x76, 0xe1, 0x6c, 0x3b, 0x44,
-0x73, 0xfc, 0x6c, 0x20, 0x6b, 0x61, 0x64, 0x65, 0x3b, 0x44, 0x73, 0xfc, 0x6c, 0x20, 0x68, 0x65, 0x64, 0x73, 0x65, 0x3b,
-0x6d, 0x75, 0x68, 0x2e, 0x3b, 0x73, 0x61, 0x66, 0x2e, 0x3b, 0x72, 0x61, 0x62, 0x2e, 0x20, 0x49, 0x3b, 0x72, 0x61, 0x62,
-0x2e, 0x20, 0x49, 0x49, 0x3b, 0x6a, 0x75, 0x6d, 0x2e, 0x20, 0x49, 0x3b, 0x6a, 0x75, 0x6d, 0x2e, 0x20, 0x49, 0x49, 0x3b,
-0x72, 0x61, 0x6a, 0x2e, 0x3b, 0x73, 0x68, 0x61, 0x2e, 0x3b, 0x72, 0x61, 0x6d, 0x2e, 0x3b, 0x73, 0x68, 0x61, 0x77, 0x2e,
-0x3b, 0x64, 0x68, 0x75, 0x2bb, 0x6c, 0x2d, 0x51, 0x2e, 0x3b, 0x64, 0x68, 0x75, 0x2bb, 0x6c, 0x2d, 0x48, 0x2e, 0x3b, 0x4d,
-0x75, 0x68, 0x2e, 0x3b, 0x53, 0x61, 0x66, 0x2e, 0x3b, 0x52, 0x61, 0x62, 0x2e, 0x20, 0x41, 0x77, 0x61, 0x6c, 0x3b, 0x52,
-0x61, 0x62, 0x2e, 0x20, 0x41, 0x6b, 0x68, 0x69, 0x72, 0x3b, 0x4a, 0x75, 0x6d, 0x2e, 0x20, 0x41, 0x77, 0x61, 0x6c, 0x3b,
-0x4a, 0x75, 0x6d, 0x2e, 0x20, 0x41, 0x6b, 0x68, 0x69, 0x72, 0x3b, 0x52, 0x61, 0x6a, 0x2e, 0x3b, 0x53, 0x79, 0x61, 0x2e,
-0x3b, 0x52, 0x61, 0x6d, 0x2e, 0x3b, 0x53, 0x79, 0x61, 0x77, 0x2e, 0x3b, 0x5a, 0x75, 0x6c, 0x6b, 0x61, 0x2e, 0x3b, 0x5a,
-0x75, 0x6c, 0x68, 0x69, 0x2e, 0x3b, 0x4d, 0x75, 0x68, 0x61, 0x72, 0x61, 0x6d, 0x3b, 0x53, 0x61, 0x66, 0x61, 0x72, 0x3b,
-0x52, 0x61, 0x62, 0x69, 0x75, 0x6c, 0x61, 0x77, 0x61, 0x6c, 0x3b, 0x52, 0x61, 0x62, 0x69, 0x75, 0x6c, 0x61, 0x6b, 0x68,
-0x69, 0x72, 0x3b, 0x4a, 0x75, 0x6d, 0x61, 0x64, 0x69, 0x6c, 0x61, 0x77, 0x61, 0x6c, 0x3b, 0x4a, 0x75, 0x6d, 0x61, 0x64,
-0x69, 0x6c, 0x61, 0x6b, 0x68, 0x69, 0x72, 0x3b, 0x52, 0x61, 0x6a, 0x61, 0x62, 0x3b, 0x53, 0x79, 0x61, 0x6b, 0x62, 0x61,
-0x6e, 0x3b, 0x52, 0x61, 0x6d, 0x61, 0x64, 0x61, 0x6e, 0x3b, 0x53, 0x79, 0x61, 0x77, 0x61, 0x6c, 0x3b, 0x5a, 0x75, 0x6c,
-0x6b, 0x61, 0x69, 0x64, 0x61, 0x68, 0x3b, 0x5a, 0x75, 0x6c, 0x68, 0x69, 0x6a, 0x61, 0x68, 0x3b, 0x30e0, 0x30cf, 0x30c3, 0x30e9,
-0x30e0, 0x3b, 0x30b5, 0x30d5, 0x30a2, 0x30eb, 0x3b, 0x30e9, 0x30d3, 0x30fc, 0x30fb, 0x30a6, 0x30eb, 0x30fb, 0x30a2, 0x30a6, 0x30ef, 0x30eb, 0x3b, 0x30e9,
-0x30d3, 0x30fc, 0x30fb, 0x30a6, 0x30c3, 0x30fb, 0x30b5, 0x30fc, 0x30cb, 0x30fc, 0x3b, 0x30b8, 0x30e5, 0x30de, 0x30fc, 0x30c0, 0x30eb, 0x30fb, 0x30a2, 0x30a6,
-0x30ef, 0x30eb, 0x3b, 0x30b8, 0x30e5, 0x30de, 0x30fc, 0x30c0, 0x30c3, 0x30b5, 0x30fc, 0x30cb, 0x30fc, 0x3b, 0x30e9, 0x30b8, 0x30e3, 0x30d6, 0x3b, 0x30b7,
-0x30e3, 0x30a2, 0x30d0, 0x30fc, 0x30f3, 0x3b, 0x30e9, 0x30de, 0x30c0, 0x30fc, 0x30f3, 0x3b, 0x30b7, 0x30e3, 0x30a6, 0x30ef, 0x30fc, 0x30eb, 0x3b, 0x30ba,
-0x30eb, 0x30fb, 0x30ab, 0x30a4, 0x30c0, 0x3b, 0x30ba, 0x30eb, 0x30fb, 0x30d2, 0x30c3, 0x30b8, 0x30e3, 0x3b, 0xcae, 0xcc1, 0xcb9, 0xccd, 0x2e, 0x3b,
-0xcb8, 0xcab, 0xcbe, 0x2e, 0x3b, 0xcb0, 0xcac, 0xcbf, 0x2018, 0x20, 0x49, 0x3b, 0xcb0, 0xcac, 0xcbf, 0x2018, 0x20, 0x49, 0x49, 0x3b,
-0xc9c, 0xcc1, 0xcae, 0xccd, 0x2e, 0x20, 0x49, 0x3b, 0xc9c, 0xcc1, 0xcae, 0xccd, 0x2e, 0x20, 0x49, 0x49, 0x3b, 0xcb0, 0xc9c, 0xccd,
-0x2e, 0x3b, 0xcb6, 0x2e, 0x3b, 0xcb0, 0xcae, 0xccd, 0x2e, 0x3b, 0xcb6, 0xcb5, 0xccd, 0x2e, 0x3b, 0xca7, 0xcc1, 0x2018, 0xcb2, 0xccd,
-0x2d, 0xc95, 0xcbf, 0x2e, 0x3b, 0xca7, 0xcc1, 0x2018, 0xcb2, 0xccd, 0x2d, 0xcb9, 0x2e, 0x3b, 0xcae, 0xcc1, 0xcb9, 0xcb0, 0xcae, 0xccd,
-0x3b, 0xcb8, 0xcab, 0xcbe, 0xcb0, 0xccd, 0x3b, 0xcb0, 0xcac, 0xcbf, 0x2018, 0x20, 0x49, 0x3b, 0xcb0, 0xcac, 0xcbf, 0x2018, 0x20, 0x49,
-0x49, 0x3b, 0xc9c, 0xcc1, 0xcae, 0xcbe, 0xca6, 0xcbe, 0x20, 0x49, 0x3b, 0xc9c, 0xcc1, 0xcae, 0xcbe, 0xca6, 0xcbe, 0x20, 0x49, 0x49,
-0x3b, 0xcb0, 0xc9c, 0xcac, 0xccd, 0x3b, 0xcb6, 0x2019, 0xcac, 0xcbe, 0xca8, 0xccd, 0x3b, 0xcb0, 0xcae, 0xca6, 0xcbe, 0xca8, 0xccd, 0x3b,
-0xcb6, 0xcb5, 0xccd, 0xcb5, 0xcbe, 0xcb2, 0xccd, 0x3b, 0xca7, 0xcc1, 0x2018, 0xcb2, 0xccd, 0x2d, 0xc95, 0xcbf, 0x2018, 0xca1, 0xcbe, 0xcb9,
-0xccd, 0x3b, 0xca7, 0xcc1, 0x2018, 0xcb2, 0xccd, 0x2d, 0xcb9, 0xcbf, 0xc9c, 0xcbe, 0xcb9, 0xccd, 0x3b, 0xbb34, 0xd558, 0xb78c, 0x3b, 0xc0ac,
-0xd30c, 0xb974, 0x3b, 0xb77c, 0xbe44, 0x20, 0xc54c, 0x20, 0xc544, 0xc648, 0x3b, 0xb77c, 0xbe44, 0x20, 0xc54c, 0x20, 0xc384, 0xb2c8, 0x3b, 0xc8fc,
-0xb9c8, 0xb2e4, 0x20, 0xc54c, 0x20, 0xc544, 0xc648, 0x3b, 0xc8fc, 0xb9c8, 0xb2e4, 0x20, 0xc54c, 0x20, 0xc384, 0xb2c8, 0x3b, 0xb77c, 0xc7a1, 0x3b,
-0xc250, 0xc544, 0xbc18, 0x3b, 0xb77c, 0xb9c8, 0xb2e8, 0x3b, 0xc250, 0xc648, 0x3b, 0xb4c0, 0x20, 0xc54c, 0x20, 0xae4c, 0xb2e4, 0x3b, 0xb4c0, 0x20,
-0xc54c, 0x20, 0xd788, 0xc790, 0x3b, 0x6d, 0x75, 0x1e96, 0x65, 0x72, 0x65, 0x6d, 0x3b, 0x73, 0x65, 0x66, 0x65, 0x72, 0x3b, 0x72,
-0x65, 0x62, 0xee, 0x2bf, 0x75, 0x6c, 0x65, 0x77, 0x65, 0x6c, 0x3b, 0x72, 0x65, 0x62, 0xee, 0x2bf, 0x75, 0x6c, 0x61, 0x78,
-0x65, 0x72, 0x3b, 0x63, 0x65, 0x6d, 0x61, 0x7a, 0xee, 0x79, 0x65, 0x6c, 0x65, 0x77, 0x65, 0x6c, 0x3b, 0x63, 0x65, 0x6d,
-0x61, 0x7a, 0xee, 0x79, 0x65, 0x6c, 0x61, 0x78, 0x65, 0x72, 0x3b, 0x72, 0x65, 0x63, 0x65, 0x62, 0x3b, 0x15f, 0x65, 0x2bf,
-0x62, 0x61, 0x6e, 0x3b, 0x72, 0x65, 0x6d, 0x65, 0x7a, 0x61, 0x6e, 0x3b, 0x15f, 0x65, 0x77, 0x61, 0x6c, 0x3b, 0x7a, 0xee,
-0x6c, 0x71, 0x65, 0x2bf, 0x64, 0x65, 0x3b, 0x7a, 0xee, 0x6c, 0x1e96, 0x65, 0x63, 0x65, 0x3b, 0xea1, 0xeb8, 0xeae, 0xeb1, 0xe94,
-0x3b, 0xec0, 0xe84, 0xeb2, 0xeb0, 0x3b, 0xeae, 0xead, 0xe81, 0xe9a, 0xeb5, 0x20, 0x31, 0x3b, 0xeae, 0xead, 0xe81, 0xe9a, 0xeb5, 0x20,
-0x32, 0x3b, 0xe99, 0xeb8, 0xea1, 0xeb2, 0x20, 0x31, 0x3b, 0xe99, 0xeb8, 0xea1, 0xeb2, 0x20, 0x32, 0x3b, 0xec0, 0xeae, 0xeb2, 0xeb0,
-0x3b, 0xe8a, 0xeb2, 0x3b, 0xec0, 0xeae, 0xeb2, 0xeb0, 0xea1, 0xeb0, 0x3b, 0xec0, 0xe8a, 0xebb, 0xeb2, 0x3b, 0xe8a, 0xeb8, 0xea5, 0xe81,
-0xeb4, 0xead, 0xeb8, 0x3b, 0xe8a, 0xeb8, 0xea5, 0xeab, 0xeb4, 0xe88, 0x3b, 0xea1, 0xeb8, 0xea3, 0xeb0, 0xeae, 0xead, 0xea1, 0x3b, 0xe8a,
-0xeb2, 0xe9f, 0xeb2, 0xea3, 0x3b, 0xeae, 0xead, 0xe94, 0xe9a, 0xeb5, 0x20, 0x31, 0x3b, 0xeae, 0xead, 0xe94, 0xe9a, 0xeb5, 0x20, 0x32,
-0x3b, 0xe88, 0xeb8, 0xea1, 0xeb2, 0xe94, 0xeb2, 0x20, 0x31, 0x3b, 0xe88, 0xeb8, 0xea1, 0xeb2, 0xe94, 0xeb2, 0x20, 0x32, 0x3b, 0xeae,
-0xeb2, 0xe88, 0xeb1, 0xe9a, 0x3b, 0xe8a, 0xeb0, 0xe9a, 0xeb2, 0xe99, 0x3b, 0xeae, 0xeb2, 0xea1, 0xeb2, 0xe94, 0xead, 0xe99, 0x3b, 0xec0,
-0xe8a, 0xebb, 0xeb2, 0xea7, 0xeb1, 0xe94, 0x3b, 0xe94, 0xeb8, 0xead, 0xeb1, 0xe94, 0xe81, 0xeb4, 0xe94, 0xeb0, 0x3b, 0xe94, 0xeb8, 0xead,
-0xeb1, 0xe94, 0xe81, 0xeb4, 0xe88, 0xeb0, 0x3b, 0xea1, 0xeb8, 0xeae, 0xeb1, 0xe94, 0x3b, 0xec0, 0xe84, 0xeb2, 0xeb0, 0x3b, 0xeae, 0xead,
-0xe94, 0xe9a, 0xeb5, 0x20, 0x31, 0x3b, 0xeae, 0xead, 0xe81, 0xe9a, 0xeb5, 0x20, 0x32, 0x3b, 0xe99, 0xeb8, 0xea1, 0xeb2, 0x20, 0x31,
-0x3b, 0xe99, 0xeb8, 0xea1, 0xeb2, 0x20, 0x32, 0x3b, 0xec0, 0xeae, 0xeb2, 0xeb0, 0x3b, 0xe8a, 0xeb0, 0xead, 0xecc, 0x3b, 0xec0, 0xeae,
-0xeb2, 0xeb0, 0xea1, 0xeb0, 0x3b, 0xec0, 0xe8a, 0xebb, 0xeb2, 0x3b, 0xe8a, 0xeb8, 0xea5, 0xe81, 0xeb4, 0xead, 0xeb8, 0x3b, 0xe8a, 0xeb8,
-0xea5, 0xeab, 0xeb4, 0xe88, 0x3b, 0x6d, 0x75, 0x68, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x3b, 0x73, 0x61, 0x66, 0x61, 0x72, 0x73,
-0x3b, 0x31, 0x2e, 0x20, 0x72, 0x61, 0x62, 0x12b, 0x3b, 0x32, 0x2e, 0x20, 0x72, 0x61, 0x62, 0x12b, 0x3b, 0x31, 0x2e, 0x20,
-0x64, 0x17e, 0x75, 0x6d, 0x101, 0x64, 0x101, 0x3b, 0x32, 0x2e, 0x20, 0x64, 0x17e, 0x75, 0x6d, 0x101, 0x64, 0x101, 0x3b, 0x72,
-0x61, 0x64, 0x17e, 0x61, 0x62, 0x73, 0x3b, 0x161, 0x61, 0x62, 0x61, 0x6e, 0x73, 0x3b, 0x72, 0x61, 0x6d, 0x61, 0x64, 0x101,
-0x6e, 0x73, 0x3b, 0x161, 0x61, 0x75, 0x76, 0x61, 0x6c, 0x73, 0x3b, 0x64, 0x75, 0x20, 0x61, 0x6c, 0x2d, 0x6b, 0x69, 0x64,
-0x101, 0x3b, 0x64, 0x75, 0x20, 0x61, 0x6c, 0x2d, 0x68, 0x69, 0x64, 0x17e, 0x101, 0x3b, 0x43c, 0x443, 0x445, 0x2e, 0x3b, 0x441,
-0x430, 0x444, 0x2e, 0x3b, 0x440, 0x430, 0x431, 0x2e, 0x20, 0x49, 0x3b, 0x440, 0x430, 0x431, 0x2e, 0x20, 0x49, 0x49, 0x3b, 0x45f,
-0x443, 0x43c, 0x2e, 0x20, 0x49, 0x3b, 0x45f, 0x443, 0x43c, 0x2e, 0x20, 0x49, 0x49, 0x3b, 0x440, 0x430, 0x45f, 0x2e, 0x3b, 0x448,
-0x430, 0x431, 0x2e, 0x3b, 0x440, 0x430, 0x43c, 0x2e, 0x3b, 0x448, 0x430, 0x432, 0x2e, 0x3b, 0x434, 0x443, 0x43b, 0x43a, 0x2e, 0x3b,
-0x434, 0x443, 0x43b, 0x445, 0x2e, 0x3b, 0x43c, 0x443, 0x445, 0x430, 0x440, 0x435, 0x43c, 0x3b, 0x441, 0x430, 0x444, 0x430, 0x440, 0x3b,
-0x440, 0x430, 0x431, 0x438, 0x20, 0x49, 0x3b, 0x440, 0x430, 0x431, 0x438, 0x20, 0x49, 0x49, 0x3b, 0x45f, 0x443, 0x43c, 0x430, 0x434,
-0x430, 0x20, 0x49, 0x3b, 0x45f, 0x443, 0x43c, 0x430, 0x434, 0x430, 0x20, 0x49, 0x49, 0x3b, 0x440, 0x430, 0x45f, 0x430, 0x431, 0x3b,
-0x448, 0x430, 0x431, 0x430, 0x43d, 0x3b, 0x440, 0x430, 0x43c, 0x430, 0x434, 0x430, 0x43d, 0x3b, 0x448, 0x430, 0x432, 0x430, 0x43b, 0x3b,
-0x434, 0x443, 0x43b, 0x43a, 0x438, 0x434, 0x430, 0x3b, 0x434, 0x443, 0x43b, 0x445, 0x438, 0x45f, 0x430, 0x3b, 0xd2e, 0xd41, 0xd39, 0x2e,
-0x3b, 0xd38, 0xd2b, 0x2e, 0x3b, 0xd31, 0xd2c, 0xd40, 0xd39, 0xd41, 0xd7d, 0x20, 0xd05, 0xd35, 0xd4d, 0xd35, 0x2e, 0x3b, 0xd31, 0xd2c,
-0xd40, 0xd39, 0xd41, 0xd7d, 0x20, 0xd06, 0xd16, 0xd3f, 0x2e, 0x3b, 0xd1c, 0xd2e, 0xd3e, 0xd26, 0xd41, 0xd7d, 0x20, 0xd05, 0xd35, 0xd4d,
-0xd35, 0x2e, 0x3b, 0xd1c, 0xd2e, 0xd3e, 0xd26, 0xd41, 0xd7d, 0x20, 0xd06, 0xd16, 0xd3f, 0x2e, 0x3b, 0xd31, 0xd1c, 0x2e, 0x3b, 0xd36,
-0xd39, 0xd2c, 0xd3e, 0x2e, 0x3b, 0xd31, 0xd2e, 0xd26, 0xd3e, 0x2e, 0x3b, 0xd36, 0xd35, 0xd4d, 0xd35, 0xd3e, 0x2e, 0x3b, 0xd26, 0xd41,
-0xd7d, 0x20, 0xd16, 0xd39, 0x2e, 0x3b, 0xd26, 0xd41, 0xd7d, 0x20, 0xd39, 0xd3f, 0x2e, 0x3b, 0xd2e, 0xd41, 0xd39, 0xd31, 0xd02, 0x3b,
-0xd38, 0xd2b, 0xd7c, 0x3b, 0xd31, 0xd2c, 0xd40, 0xd39, 0xd41, 0xd7d, 0x20, 0xd05, 0xd35, 0xd4d, 0xd35, 0xd7d, 0x3b, 0xd31, 0xd2c, 0xd40,
-0xd39, 0xd41, 0xd7d, 0x20, 0xd06, 0xd16, 0xd3f, 0xd7c, 0x3b, 0xd1c, 0xd2e, 0xd3e, 0xd26, 0xd41, 0xd7d, 0x20, 0xd05, 0xd35, 0xd4d, 0xd35,
-0xd7d, 0x3b, 0xd1c, 0xd2e, 0xd3e, 0xd26, 0xd41, 0xd7d, 0x20, 0xd06, 0xd16, 0xd3f, 0xd7c, 0x3b, 0xd31, 0xd1c, 0xd2c, 0xd4d, 0x3b, 0xd36,
-0xd39, 0xd2c, 0xd3e, 0xd7b, 0x3b, 0xd31, 0xd2e, 0xd26, 0xd3e, 0xd7b, 0x3b, 0xd36, 0xd35, 0xd4d, 0xd35, 0xd3e, 0xd7d, 0x3b, 0xd26, 0xd41,
-0xd7d, 0x20, 0xd16, 0xd39, 0xd26, 0xd4d, 0x3b, 0xd26, 0xd41, 0xd7d, 0x20, 0xd39, 0xd3f, 0xd1c, 0xd4d, 0xd1c, 0x3b, 0xd2e, 0xd41, 0x3b,
-0xd38, 0x3b, 0xd31, 0x3b, 0xd31, 0x3b, 0xd1c, 0x3b, 0xd1c, 0x3b, 0xd31, 0x3b, 0xd36, 0x3b, 0xd31, 0x3b, 0xd36, 0x3b, 0xd26, 0xd41,
-0x3b, 0xd26, 0xd41, 0x3b, 0xd2e, 0xd41, 0xd39, 0xd31, 0xd02, 0x3b, 0xd38, 0xd2b, 0xd7c, 0x3b, 0xd31, 0xd2c, 0xd40, 0xd39, 0xd41, 0xd7d,
-0x20, 0xd05, 0xd35, 0xd4d, 0xd35, 0xd7d, 0x3b, 0xd31, 0xd2c, 0xd40, 0xd39, 0xd41, 0xd7d, 0x20, 0xd06, 0xd16, 0xd3f, 0xd7c, 0x3b, 0xd1c,
-0xd2e, 0xd3e, 0xd26, 0xd41, 0xd7d, 0x20, 0xd05, 0xd35, 0xd4d, 0xd35, 0xd7d, 0x3b, 0xd1c, 0xd2e, 0xd3e, 0xd26, 0xd41, 0xd7d, 0x20, 0xd06,
-0xd16, 0xd3f, 0xd7c, 0x3b, 0xd31, 0xd1c, 0xd2c, 0xd4d, 0x3b, 0xd36, 0xd39, 0xd2c, 0xd3e, 0xd7b, 0x3b, 0xd31, 0xd2e, 0xd33, 0xd3e, 0xd7b,
-0x3b, 0xd36, 0xd35, 0xd4d, 0xd35, 0xd3e, 0xd7d, 0x3b, 0xd26, 0xd41, 0xd7d, 0x20, 0xd16, 0xd39, 0xd26, 0xd4d, 0x3b, 0xd26, 0xd41, 0xd7d,
-0x20, 0xd39, 0xd3f, 0xd1c, 0xd4d, 0xd1c, 0x3b, 0x92e, 0x94b, 0x939, 0x2e, 0x3b, 0x938, 0x92b, 0x2e, 0x3b, 0x930, 0x93e, 0x92c, 0x940,
-0x20, 0x49, 0x3b, 0x930, 0x93e, 0x92c, 0x940, 0x20, 0x49, 0x49, 0x3b, 0x91c, 0x941, 0x92e, 0x93e, 0x2e, 0x20, 0x49, 0x3b, 0x91c,
-0x941, 0x92e, 0x93e, 0x2e, 0x20, 0x49, 0x49, 0x3b, 0x930, 0x91d, 0x93e, 0x2e, 0x3b, 0x936, 0x93e, 0x92c, 0x93e, 0x2e, 0x3b, 0x930,
-0x92e, 0x2e, 0x3b, 0x936, 0x935, 0x94d, 0x935, 0x93e, 0x2e, 0x3b, 0x927, 0x941, 0x932, 0x2d, 0x915, 0x940, 0x2e, 0x3b, 0x927, 0x941,
-0x932, 0x2d, 0x939, 0x93f, 0x2e, 0x3b, 0x92e, 0x94b, 0x939, 0x930, 0x92e, 0x3b, 0x938, 0x92b, 0x930, 0x3b, 0x930, 0x93e, 0x92c, 0x940,
-0x20, 0x49, 0x3b, 0x930, 0x93e, 0x92c, 0x940, 0x20, 0x49, 0x49, 0x3b, 0x91c, 0x941, 0x92e, 0x93e, 0x926, 0x93e, 0x20, 0x49, 0x3b,
-0x91c, 0x941, 0x92e, 0x93e, 0x926, 0x93e, 0x20, 0x49, 0x49, 0x3b, 0x930, 0x91d, 0x93e, 0x92c, 0x3b, 0x936, 0x93e, 0x92c, 0x93e, 0x928,
-0x3b, 0x930, 0x92e, 0x91c, 0x93e, 0x928, 0x3b, 0x936, 0x935, 0x94d, 0x935, 0x93e, 0x932, 0x3b, 0x927, 0x941, 0x932, 0x2d, 0x915, 0x940,
-0x926, 0x93e, 0x939, 0x3b, 0x927, 0x941, 0x932, 0x2d, 0x939, 0x93f, 0x91c, 0x93e, 0x939, 0x3b, 0x967, 0x3b, 0x968, 0x3b, 0x969, 0x3b,
-0x96a, 0x3b, 0x96b, 0x3b, 0x96c, 0x3b, 0x96d, 0x3b, 0x96e, 0x3b, 0x96f, 0x3b, 0x967, 0x966, 0x3b, 0x967, 0x967, 0x3b, 0x967, 0x968,
-0x3b, 0x6d, 0x75, 0x68, 0x2e, 0x3b, 0x73, 0x61, 0x66, 0x2e, 0x3b, 0x72, 0x61, 0x62, 0x2e, 0x20, 0x49, 0x3b, 0x72, 0x61,
+0x73, 0xfc, 0x6c, 0x20, 0x6b, 0x61, 0x64, 0x65, 0x3b, 0x44, 0x73, 0xfc, 0x6c, 0x20, 0x68, 0x65, 0x64, 0x73, 0x65, 0x4d,
+0x6f, 0x68, 0x2e, 0x3b, 0x53, 0x61, 0x66, 0x2e, 0x3b, 0x52, 0xe9, 0x62, 0x2e, 0x20, 0x31, 0x3b, 0x52, 0xe9, 0x62, 0x2e,
+0x20, 0x32, 0x3b, 0x44, 0x73, 0x65, 0x6d, 0x2e, 0x20, 0x49, 0x3b, 0x44, 0x73, 0x65, 0x6d, 0x2e, 0x20, 0x49, 0x49, 0x3b,
+0x52, 0x65, 0x64, 0x2e, 0x3b, 0x53, 0x61, 0x62, 0x2e, 0x3b, 0x52, 0x61, 0x6d, 0x2e, 0x3b, 0x53, 0x65, 0x76, 0x2e, 0x3b,
+0x44, 0x73, 0xfc, 0x6c, 0x20, 0x6b, 0x2e, 0x3b, 0x44, 0x73, 0xfc, 0x6c, 0x20, 0x68, 0x2e, 0x6d, 0x75, 0x68, 0x2e, 0x3b,
+0x73, 0x61, 0x66, 0x2e, 0x3b, 0x72, 0x61, 0x62, 0x2e, 0x20, 0x49, 0x3b, 0x72, 0x61, 0x62, 0x2e, 0x20, 0x49, 0x49, 0x3b,
+0x6a, 0x75, 0x6d, 0x2e, 0x20, 0x49, 0x3b, 0x6a, 0x75, 0x6d, 0x2e, 0x20, 0x49, 0x49, 0x3b, 0x72, 0x61, 0x6a, 0x2e, 0x3b,
+0x73, 0x68, 0x61, 0x2e, 0x3b, 0x72, 0x61, 0x6d, 0x2e, 0x3b, 0x73, 0x68, 0x61, 0x77, 0x2e, 0x3b, 0x64, 0x68, 0x75, 0x2bb,
+0x6c, 0x2d, 0x51, 0x2e, 0x3b, 0x64, 0x68, 0x75, 0x2bb, 0x6c, 0x2d, 0x48, 0x2e, 0x4d, 0x75, 0x68, 0x61, 0x72, 0x61, 0x6d,
+0x3b, 0x53, 0x61, 0x66, 0x61, 0x72, 0x3b, 0x52, 0x61, 0x62, 0x69, 0x75, 0x6c, 0x61, 0x77, 0x61, 0x6c, 0x3b, 0x52, 0x61,
+0x62, 0x69, 0x75, 0x6c, 0x61, 0x6b, 0x68, 0x69, 0x72, 0x3b, 0x4a, 0x75, 0x6d, 0x61, 0x64, 0x69, 0x6c, 0x61, 0x77, 0x61,
+0x6c, 0x3b, 0x4a, 0x75, 0x6d, 0x61, 0x64, 0x69, 0x6c, 0x61, 0x6b, 0x68, 0x69, 0x72, 0x3b, 0x52, 0x61, 0x6a, 0x61, 0x62,
+0x3b, 0x53, 0x79, 0x61, 0x6b, 0x62, 0x61, 0x6e, 0x3b, 0x52, 0x61, 0x6d, 0x61, 0x64, 0x61, 0x6e, 0x3b, 0x53, 0x79, 0x61,
+0x77, 0x61, 0x6c, 0x3b, 0x5a, 0x75, 0x6c, 0x6b, 0x61, 0x69, 0x64, 0x61, 0x68, 0x3b, 0x5a, 0x75, 0x6c, 0x68, 0x69, 0x6a,
+0x61, 0x68, 0x4d, 0x75, 0x68, 0x2e, 0x3b, 0x53, 0x61, 0x66, 0x2e, 0x3b, 0x52, 0x61, 0x62, 0x2e, 0x20, 0x41, 0x77, 0x61,
+0x6c, 0x3b, 0x52, 0x61, 0x62, 0x2e, 0x20, 0x41, 0x6b, 0x68, 0x69, 0x72, 0x3b, 0x4a, 0x75, 0x6d, 0x2e, 0x20, 0x41, 0x77,
+0x61, 0x6c, 0x3b, 0x4a, 0x75, 0x6d, 0x2e, 0x20, 0x41, 0x6b, 0x68, 0x69, 0x72, 0x3b, 0x52, 0x61, 0x6a, 0x2e, 0x3b, 0x53,
+0x79, 0x61, 0x2e, 0x3b, 0x52, 0x61, 0x6d, 0x2e, 0x3b, 0x53, 0x79, 0x61, 0x77, 0x2e, 0x3b, 0x5a, 0x75, 0x6c, 0x6b, 0x61,
+0x2e, 0x3b, 0x5a, 0x75, 0x6c, 0x68, 0x69, 0x2e, 0x30e0, 0x30cf, 0x30c3, 0x30e9, 0x30e0, 0x3b, 0x30b5, 0x30d5, 0x30a2, 0x30eb, 0x3b, 0x30e9,
+0x30d3, 0x30fc, 0x30fb, 0x30a6, 0x30eb, 0x30fb, 0x30a2, 0x30a6, 0x30ef, 0x30eb, 0x3b, 0x30e9, 0x30d3, 0x30fc, 0x30fb, 0x30a6, 0x30c3, 0x30fb, 0x30b5, 0x30fc,
+0x30cb, 0x30fc, 0x3b, 0x30b8, 0x30e5, 0x30de, 0x30fc, 0x30c0, 0x30eb, 0x30fb, 0x30a2, 0x30a6, 0x30ef, 0x30eb, 0x3b, 0x30b8, 0x30e5, 0x30de, 0x30fc, 0x30c0,
+0x30c3, 0x30b5, 0x30fc, 0x30cb, 0x30fc, 0x3b, 0x30e9, 0x30b8, 0x30e3, 0x30d6, 0x3b, 0x30b7, 0x30e3, 0x30a2, 0x30d0, 0x30fc, 0x30f3, 0x3b, 0x30e9, 0x30de,
+0x30c0, 0x30fc, 0x30f3, 0x3b, 0x30b7, 0x30e3, 0x30a6, 0x30ef, 0x30fc, 0x30eb, 0x3b, 0x30ba, 0x30eb, 0x30fb, 0x30ab, 0x30a4, 0x30c0, 0x3b, 0x30ba, 0x30eb,
+0x30fb, 0x30d2, 0x30c3, 0x30b8, 0x30e3, 0xcae, 0xcc1, 0xcb9, 0xcb0, 0xcae, 0xccd, 0x3b, 0xcb8, 0xcab, 0xcbe, 0xcb0, 0xccd, 0x3b, 0xcb0, 0xcac,
+0xcbf, 0x2018, 0x20, 0x49, 0x3b, 0xcb0, 0xcac, 0xcbf, 0x2018, 0x20, 0x49, 0x49, 0x3b, 0xc9c, 0xcc1, 0xcae, 0xcbe, 0xca6, 0xcbe, 0x20,
+0x49, 0x3b, 0xc9c, 0xcc1, 0xcae, 0xcbe, 0xca6, 0xcbe, 0x20, 0x49, 0x49, 0x3b, 0xcb0, 0xc9c, 0xcac, 0xccd, 0x3b, 0xcb6, 0x2019, 0xcac,
+0xcbe, 0xca8, 0xccd, 0x3b, 0xcb0, 0xcae, 0xca6, 0xcbe, 0xca8, 0xccd, 0x3b, 0xcb6, 0xcb5, 0xccd, 0xcb5, 0xcbe, 0xcb2, 0xccd, 0x3b, 0xca7,
+0xcc1, 0x2018, 0xcb2, 0xccd, 0x2d, 0xc95, 0xcbf, 0x2018, 0xca1, 0xcbe, 0xcb9, 0xccd, 0x3b, 0xca7, 0xcc1, 0x2018, 0xcb2, 0xccd, 0x2d, 0xcb9,
+0xcbf, 0xc9c, 0xcbe, 0xcb9, 0xccd, 0xcae, 0xcc1, 0xcb9, 0xccd, 0x2e, 0x3b, 0xcb8, 0xcab, 0xcbe, 0x2e, 0x3b, 0xcb0, 0xcac, 0xcbf, 0x2018,
+0x20, 0x49, 0x3b, 0xcb0, 0xcac, 0xcbf, 0x2018, 0x20, 0x49, 0x49, 0x3b, 0xc9c, 0xcc1, 0xcae, 0xccd, 0x2e, 0x20, 0x49, 0x3b, 0xc9c,
+0xcc1, 0xcae, 0xccd, 0x2e, 0x20, 0x49, 0x49, 0x3b, 0xcb0, 0xc9c, 0xccd, 0x2e, 0x3b, 0xcb6, 0x2e, 0x3b, 0xcb0, 0xcae, 0xccd, 0x2e,
+0x3b, 0xcb6, 0xcb5, 0xccd, 0x2e, 0x3b, 0xca7, 0xcc1, 0x2018, 0xcb2, 0xccd, 0x2d, 0xc95, 0xcbf, 0x2e, 0x3b, 0xca7, 0xcc1, 0x2018, 0xcb2,
+0xccd, 0x2d, 0xcb9, 0x2e, 0xbb34, 0xd558, 0xb78c, 0x3b, 0xc0ac, 0xd30c, 0xb974, 0x3b, 0xb77c, 0xbe44, 0x20, 0xc54c, 0x20, 0xc544, 0xc648, 0x3b,
+0xb77c, 0xbe44, 0x20, 0xc54c, 0x20, 0xc384, 0xb2c8, 0x3b, 0xc8fc, 0xb9c8, 0xb2e4, 0x20, 0xc54c, 0x20, 0xc544, 0xc648, 0x3b, 0xc8fc, 0xb9c8, 0xb2e4,
+0x20, 0xc54c, 0x20, 0xc384, 0xb2c8, 0x3b, 0xb77c, 0xc7a1, 0x3b, 0xc250, 0xc544, 0xbc18, 0x3b, 0xb77c, 0xb9c8, 0xb2e8, 0x3b, 0xc250, 0xc648, 0x3b,
+0xb4c0, 0x20, 0xc54c, 0x20, 0xae4c, 0xb2e4, 0x3b, 0xb4c0, 0x20, 0xc54c, 0x20, 0xd788, 0xc790, 0x6d, 0x75, 0x1e96, 0x65, 0x72, 0x65, 0x6d,
+0x3b, 0x73, 0x65, 0x66, 0x65, 0x72, 0x3b, 0x72, 0x65, 0x62, 0xee, 0x2bf, 0x75, 0x6c, 0x65, 0x77, 0x65, 0x6c, 0x3b, 0x72,
+0x65, 0x62, 0xee, 0x2bf, 0x75, 0x6c, 0x61, 0x78, 0x65, 0x72, 0x3b, 0x63, 0x65, 0x6d, 0x61, 0x7a, 0xee, 0x79, 0x65, 0x6c,
+0x65, 0x77, 0x65, 0x6c, 0x3b, 0x63, 0x65, 0x6d, 0x61, 0x7a, 0xee, 0x79, 0x65, 0x6c, 0x61, 0x78, 0x65, 0x72, 0x3b, 0x72,
+0x65, 0x63, 0x65, 0x62, 0x3b, 0x15f, 0x65, 0x2bf, 0x62, 0x61, 0x6e, 0x3b, 0x72, 0x65, 0x6d, 0x65, 0x7a, 0x61, 0x6e, 0x3b,
+0x15f, 0x65, 0x77, 0x61, 0x6c, 0x3b, 0x7a, 0xee, 0x6c, 0x71, 0x65, 0x2bf, 0x64, 0x65, 0x3b, 0x7a, 0xee, 0x6c, 0x1e96, 0x65,
+0x63, 0x65, 0xea1, 0xeb8, 0xea3, 0xeb0, 0xeae, 0xead, 0xea1, 0x3b, 0xe8a, 0xeb2, 0xe9f, 0xeb2, 0xea3, 0x3b, 0xeae, 0xead, 0xe94, 0xe9a,
+0xeb5, 0x20, 0x31, 0x3b, 0xeae, 0xead, 0xe94, 0xe9a, 0xeb5, 0x20, 0x32, 0x3b, 0xe88, 0xeb8, 0xea1, 0xeb2, 0xe94, 0xeb2, 0x20, 0x31,
+0x3b, 0xe88, 0xeb8, 0xea1, 0xeb2, 0xe94, 0xeb2, 0x20, 0x32, 0x3b, 0xeae, 0xeb2, 0xe88, 0xeb1, 0xe9a, 0x3b, 0xe8a, 0xeb0, 0xe9a, 0xeb2,
+0xe99, 0x3b, 0xeae, 0xeb2, 0xea1, 0xeb2, 0xe94, 0xead, 0xe99, 0x3b, 0xec0, 0xe8a, 0xebb, 0xeb2, 0xea7, 0xeb1, 0xe94, 0x3b, 0xe94, 0xeb8,
+0xead, 0xeb1, 0xe94, 0xe81, 0xeb4, 0xe94, 0xeb0, 0x3b, 0xe94, 0xeb8, 0xead, 0xeb1, 0xe94, 0xe81, 0xeb4, 0xe88, 0xeb0, 0xea1, 0xeb8, 0xeae,
+0xeb1, 0xe94, 0x3b, 0xec0, 0xe84, 0xeb2, 0xeb0, 0x3b, 0xeae, 0xead, 0xe81, 0xe9a, 0xeb5, 0x20, 0x31, 0x3b, 0xeae, 0xead, 0xe81, 0xe9a,
+0xeb5, 0x20, 0x32, 0x3b, 0xe99, 0xeb8, 0xea1, 0xeb2, 0x20, 0x31, 0x3b, 0xe99, 0xeb8, 0xea1, 0xeb2, 0x20, 0x32, 0x3b, 0xec0, 0xeae,
+0xeb2, 0xeb0, 0x3b, 0xe8a, 0xeb2, 0x3b, 0xec0, 0xeae, 0xeb2, 0xeb0, 0xea1, 0xeb0, 0x3b, 0xec0, 0xe8a, 0xebb, 0xeb2, 0x3b, 0xe8a, 0xeb8,
+0xea5, 0xe81, 0xeb4, 0xead, 0xeb8, 0x3b, 0xe8a, 0xeb8, 0xea5, 0xeab, 0xeb4, 0xe88, 0xea1, 0xeb8, 0xeae, 0xeb1, 0xe94, 0x3b, 0xec0, 0xe84,
+0xeb2, 0xeb0, 0x3b, 0xeae, 0xead, 0xe94, 0xe9a, 0xeb5, 0x20, 0x31, 0x3b, 0xeae, 0xead, 0xe81, 0xe9a, 0xeb5, 0x20, 0x32, 0x3b, 0xe99,
+0xeb8, 0xea1, 0xeb2, 0x20, 0x31, 0x3b, 0xe99, 0xeb8, 0xea1, 0xeb2, 0x20, 0x32, 0x3b, 0xec0, 0xeae, 0xeb2, 0xeb0, 0x3b, 0xe8a, 0xeb0,
+0xead, 0xecc, 0x3b, 0xec0, 0xeae, 0xeb2, 0xeb0, 0xea1, 0xeb0, 0x3b, 0xec0, 0xe8a, 0xebb, 0xeb2, 0x3b, 0xe8a, 0xeb8, 0xea5, 0xe81, 0xeb4,
+0xead, 0xeb8, 0x3b, 0xe8a, 0xeb8, 0xea5, 0xeab, 0xeb4, 0xe88, 0x6d, 0x75, 0x68, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x3b, 0x73, 0x61,
+0x66, 0x61, 0x72, 0x73, 0x3b, 0x31, 0x2e, 0x20, 0x72, 0x61, 0x62, 0x12b, 0x3b, 0x32, 0x2e, 0x20, 0x72, 0x61, 0x62, 0x12b,
+0x3b, 0x31, 0x2e, 0x20, 0x64, 0x17e, 0x75, 0x6d, 0x101, 0x64, 0x101, 0x3b, 0x32, 0x2e, 0x20, 0x64, 0x17e, 0x75, 0x6d, 0x101,
+0x64, 0x101, 0x3b, 0x72, 0x61, 0x64, 0x17e, 0x61, 0x62, 0x73, 0x3b, 0x161, 0x61, 0x62, 0x61, 0x6e, 0x73, 0x3b, 0x72, 0x61,
+0x6d, 0x61, 0x64, 0x101, 0x6e, 0x73, 0x3b, 0x161, 0x61, 0x75, 0x76, 0x61, 0x6c, 0x73, 0x3b, 0x64, 0x75, 0x20, 0x61, 0x6c,
+0x2d, 0x6b, 0x69, 0x64, 0x101, 0x3b, 0x64, 0x75, 0x20, 0x61, 0x6c, 0x2d, 0x68, 0x69, 0x64, 0x17e, 0x101, 0x43c, 0x443, 0x445,
+0x430, 0x440, 0x435, 0x43c, 0x3b, 0x441, 0x430, 0x444, 0x430, 0x440, 0x3b, 0x440, 0x430, 0x431, 0x438, 0x20, 0x49, 0x3b, 0x440, 0x430,
+0x431, 0x438, 0x20, 0x49, 0x49, 0x3b, 0x45f, 0x443, 0x43c, 0x430, 0x434, 0x430, 0x20, 0x49, 0x3b, 0x45f, 0x443, 0x43c, 0x430, 0x434,
+0x430, 0x20, 0x49, 0x49, 0x3b, 0x440, 0x430, 0x45f, 0x430, 0x431, 0x3b, 0x448, 0x430, 0x431, 0x430, 0x43d, 0x3b, 0x440, 0x430, 0x43c,
+0x430, 0x434, 0x430, 0x43d, 0x3b, 0x448, 0x430, 0x432, 0x430, 0x43b, 0x3b, 0x434, 0x443, 0x43b, 0x43a, 0x438, 0x434, 0x430, 0x3b, 0x434,
+0x443, 0x43b, 0x445, 0x438, 0x45f, 0x430, 0x43c, 0x443, 0x445, 0x2e, 0x3b, 0x441, 0x430, 0x444, 0x2e, 0x3b, 0x440, 0x430, 0x431, 0x2e,
+0x20, 0x49, 0x3b, 0x440, 0x430, 0x431, 0x2e, 0x20, 0x49, 0x49, 0x3b, 0x45f, 0x443, 0x43c, 0x2e, 0x20, 0x49, 0x3b, 0x45f, 0x443,
+0x43c, 0x2e, 0x20, 0x49, 0x49, 0x3b, 0x440, 0x430, 0x45f, 0x2e, 0x3b, 0x448, 0x430, 0x431, 0x2e, 0x3b, 0x440, 0x430, 0x43c, 0x2e,
+0x3b, 0x448, 0x430, 0x432, 0x2e, 0x3b, 0x434, 0x443, 0x43b, 0x43a, 0x2e, 0x3b, 0x434, 0x443, 0x43b, 0x445, 0x2e, 0xd2e, 0xd41, 0xd39,
+0xd31, 0xd02, 0x3b, 0xd38, 0xd2b, 0xd7c, 0x3b, 0xd31, 0xd2c, 0xd40, 0xd39, 0xd41, 0xd7d, 0x20, 0xd05, 0xd35, 0xd4d, 0xd35, 0xd7d, 0x3b,
+0xd31, 0xd2c, 0xd40, 0xd39, 0xd41, 0xd7d, 0x20, 0xd06, 0xd16, 0xd3f, 0xd7c, 0x3b, 0xd1c, 0xd2e, 0xd3e, 0xd26, 0xd41, 0xd7d, 0x20, 0xd05,
+0xd35, 0xd4d, 0xd35, 0xd7d, 0x3b, 0xd1c, 0xd2e, 0xd3e, 0xd26, 0xd41, 0xd7d, 0x20, 0xd06, 0xd16, 0xd3f, 0xd7c, 0x3b, 0xd31, 0xd1c, 0xd2c,
+0xd4d, 0x3b, 0xd36, 0xd39, 0xd2c, 0xd3e, 0xd7b, 0x3b, 0xd31, 0xd2e, 0xd26, 0xd3e, 0xd7b, 0x3b, 0xd36, 0xd35, 0xd4d, 0xd35, 0xd3e, 0xd7d,
+0x3b, 0xd26, 0xd41, 0xd7d, 0x20, 0xd16, 0xd39, 0xd26, 0xd4d, 0x3b, 0xd26, 0xd41, 0xd7d, 0x20, 0xd39, 0xd3f, 0xd1c, 0xd4d, 0xd1c, 0xd2e,
+0xd41, 0xd39, 0xd31, 0xd02, 0x3b, 0xd38, 0xd2b, 0xd7c, 0x3b, 0xd31, 0xd2c, 0xd40, 0xd39, 0xd41, 0xd7d, 0x20, 0xd05, 0xd35, 0xd4d, 0xd35,
+0xd7d, 0x3b, 0xd31, 0xd2c, 0xd40, 0xd39, 0xd41, 0xd7d, 0x20, 0xd06, 0xd16, 0xd3f, 0xd7c, 0x3b, 0xd1c, 0xd2e, 0xd3e, 0xd26, 0xd41, 0xd7d,
+0x20, 0xd05, 0xd35, 0xd4d, 0xd35, 0xd7d, 0x3b, 0xd1c, 0xd2e, 0xd3e, 0xd26, 0xd41, 0xd7d, 0x20, 0xd06, 0xd16, 0xd3f, 0xd7c, 0x3b, 0xd31,
+0xd1c, 0xd2c, 0xd4d, 0x3b, 0xd36, 0xd39, 0xd2c, 0xd3e, 0xd7b, 0x3b, 0xd31, 0xd2e, 0xd33, 0xd3e, 0xd7b, 0x3b, 0xd36, 0xd35, 0xd4d, 0xd35,
+0xd3e, 0xd7d, 0x3b, 0xd26, 0xd41, 0xd7d, 0x20, 0xd16, 0xd39, 0xd26, 0xd4d, 0x3b, 0xd26, 0xd41, 0xd7d, 0x20, 0xd39, 0xd3f, 0xd1c, 0xd4d,
+0xd1c, 0xd2e, 0xd41, 0xd39, 0x2e, 0x3b, 0xd38, 0xd2b, 0x2e, 0x3b, 0xd31, 0xd2c, 0xd40, 0xd39, 0xd41, 0xd7d, 0x20, 0xd05, 0xd35, 0xd4d,
+0xd35, 0x2e, 0x3b, 0xd31, 0xd2c, 0xd40, 0xd39, 0xd41, 0xd7d, 0x20, 0xd06, 0xd16, 0xd3f, 0x2e, 0x3b, 0xd1c, 0xd2e, 0xd3e, 0xd26, 0xd41,
+0xd7d, 0x20, 0xd05, 0xd35, 0xd4d, 0xd35, 0x2e, 0x3b, 0xd1c, 0xd2e, 0xd3e, 0xd26, 0xd41, 0xd7d, 0x20, 0xd06, 0xd16, 0xd3f, 0x2e, 0x3b,
+0xd31, 0xd1c, 0x2e, 0x3b, 0xd36, 0xd39, 0xd2c, 0xd3e, 0x2e, 0x3b, 0xd31, 0xd2e, 0xd26, 0xd3e, 0x2e, 0x3b, 0xd36, 0xd35, 0xd4d, 0xd35,
+0xd3e, 0x2e, 0x3b, 0xd26, 0xd41, 0xd7d, 0x20, 0xd16, 0xd39, 0x2e, 0x3b, 0xd26, 0xd41, 0xd7d, 0x20, 0xd39, 0xd3f, 0x2e, 0xd2e, 0xd41,
+0x3b, 0xd38, 0x3b, 0xd31, 0x3b, 0xd31, 0x3b, 0xd1c, 0x3b, 0xd1c, 0x3b, 0xd31, 0x3b, 0xd36, 0x3b, 0xd31, 0x3b, 0xd36, 0x3b, 0xd26,
+0xd41, 0x3b, 0xd26, 0xd41, 0x92e, 0x94b, 0x939, 0x930, 0x92e, 0x3b, 0x938, 0x92b, 0x930, 0x3b, 0x930, 0x93e, 0x92c, 0x940, 0x20, 0x49,
+0x3b, 0x930, 0x93e, 0x92c, 0x940, 0x20, 0x49, 0x49, 0x3b, 0x91c, 0x941, 0x92e, 0x93e, 0x926, 0x93e, 0x20, 0x49, 0x3b, 0x91c, 0x941,
+0x92e, 0x93e, 0x926, 0x93e, 0x20, 0x49, 0x49, 0x3b, 0x930, 0x91d, 0x93e, 0x92c, 0x3b, 0x936, 0x93e, 0x92c, 0x93e, 0x928, 0x3b, 0x930,
+0x92e, 0x91c, 0x93e, 0x928, 0x3b, 0x936, 0x935, 0x94d, 0x935, 0x93e, 0x932, 0x3b, 0x927, 0x941, 0x932, 0x2d, 0x915, 0x940, 0x926, 0x93e,
+0x939, 0x3b, 0x927, 0x941, 0x932, 0x2d, 0x939, 0x93f, 0x91c, 0x93e, 0x939, 0x92e, 0x94b, 0x939, 0x2e, 0x3b, 0x938, 0x92b, 0x2e, 0x3b,
+0x930, 0x93e, 0x92c, 0x940, 0x20, 0x49, 0x3b, 0x930, 0x93e, 0x92c, 0x940, 0x20, 0x49, 0x49, 0x3b, 0x91c, 0x941, 0x92e, 0x93e, 0x2e,
+0x20, 0x49, 0x3b, 0x91c, 0x941, 0x92e, 0x93e, 0x2e, 0x20, 0x49, 0x49, 0x3b, 0x930, 0x91d, 0x93e, 0x2e, 0x3b, 0x936, 0x93e, 0x92c,
+0x93e, 0x2e, 0x3b, 0x930, 0x92e, 0x2e, 0x3b, 0x936, 0x935, 0x94d, 0x935, 0x93e, 0x2e, 0x3b, 0x927, 0x941, 0x932, 0x2d, 0x915, 0x940,
+0x2e, 0x3b, 0x927, 0x941, 0x932, 0x2d, 0x939, 0x93f, 0x2e, 0x967, 0x3b, 0x968, 0x3b, 0x969, 0x3b, 0x96a, 0x3b, 0x96b, 0x3b, 0x96c,
+0x3b, 0x96d, 0x3b, 0x96e, 0x3b, 0x96f, 0x3b, 0x967, 0x966, 0x3b, 0x967, 0x967, 0x3b, 0x967, 0x968, 0x6d, 0x75, 0x68, 0x61, 0x72,
+0x72, 0x61, 0x6d, 0x3b, 0x73, 0x61, 0x66, 0x61, 0x72, 0x3b, 0x72, 0x61, 0x62, 0x69, 0x2bb, 0x20, 0x49, 0x3b, 0x72, 0x61,
+0x62, 0x69, 0x2bb, 0x20, 0x49, 0x49, 0x3b, 0x6a, 0x75, 0x6d, 0x61, 0x64, 0x61, 0x20, 0x49, 0x3b, 0x6a, 0x75, 0x6d, 0x61,
+0x64, 0x61, 0x20, 0x49, 0x49, 0x3b, 0x72, 0x61, 0x6a, 0x61, 0x62, 0x3b, 0x73, 0x68, 0x61, 0x2bb, 0x62, 0x61, 0x6e, 0x3b,
+0x72, 0x61, 0x6d, 0x61, 0x64, 0x61, 0x6e, 0x3b, 0x73, 0x68, 0x61, 0x77, 0x77, 0x61, 0x6c, 0x3b, 0x64, 0x68, 0x75, 0x2bb,
+0x6c, 0x2d, 0x71, 0x69, 0x2bb, 0x64, 0x61, 0x68, 0x3b, 0x64, 0x68, 0x75, 0x2bb, 0x6c, 0x2d, 0x68, 0x69, 0x6a, 0x6a, 0x61,
+0x68, 0x6d, 0x75, 0x68, 0x2e, 0x3b, 0x73, 0x61, 0x66, 0x2e, 0x3b, 0x72, 0x61, 0x62, 0x2e, 0x20, 0x49, 0x3b, 0x72, 0x61,
 0x62, 0x2e, 0x20, 0x49, 0x49, 0x3b, 0x6a, 0x75, 0x6d, 0x2e, 0x20, 0x49, 0x3b, 0x6a, 0x75, 0x6d, 0x2e, 0x20, 0x49, 0x49,
 0x3b, 0x72, 0x61, 0x6a, 0x2e, 0x3b, 0x73, 0x68, 0x61, 0x2e, 0x3b, 0x72, 0x61, 0x6d, 0x2e, 0x3b, 0x73, 0x68, 0x61, 0x77,
-0x2e, 0x3b, 0x64, 0x68, 0x75, 0x2bb, 0x6c, 0x2d, 0x71, 0x2e, 0x3b, 0x44, 0x68, 0x75, 0x2bb, 0x6c, 0x2d, 0x48, 0x2e, 0x3b,
-0x6d, 0x75, 0x68, 0x61, 0x72, 0x72, 0x61, 0x6d, 0x3b, 0x73, 0x61, 0x66, 0x61, 0x72, 0x3b, 0x72, 0x61, 0x62, 0x69, 0x2bb,
-0x20, 0x49, 0x3b, 0x72, 0x61, 0x62, 0x69, 0x2bb, 0x20, 0x49, 0x49, 0x3b, 0x6a, 0x75, 0x6d, 0x61, 0x64, 0x61, 0x20, 0x49,
-0x3b, 0x6a, 0x75, 0x6d, 0x61, 0x64, 0x61, 0x20, 0x49, 0x49, 0x3b, 0x72, 0x61, 0x6a, 0x61, 0x62, 0x3b, 0x73, 0x68, 0x61,
-0x2bb, 0x62, 0x61, 0x6e, 0x3b, 0x72, 0x61, 0x6d, 0x61, 0x64, 0x61, 0x6e, 0x3b, 0x73, 0x68, 0x61, 0x77, 0x77, 0x61, 0x6c,
-0x3b, 0x64, 0x68, 0x75, 0x2bb, 0x6c, 0x2d, 0x71, 0x69, 0x2bb, 0x64, 0x61, 0x68, 0x3b, 0x64, 0x68, 0x75, 0x2bb, 0x6c, 0x2d,
-0x68, 0x69, 0x6a, 0x6a, 0x61, 0x68, 0x3b, 0x6d, 0x75, 0x68, 0x2e, 0x3b, 0x73, 0x61, 0x66, 0x2e, 0x3b, 0x72, 0x61, 0x62,
-0x2e, 0x20, 0x49, 0x3b, 0x72, 0x61, 0x62, 0x2e, 0x20, 0x49, 0x49, 0x3b, 0x6a, 0x75, 0x6d, 0x2e, 0x20, 0x49, 0x3b, 0x6a,
-0x75, 0x6d, 0x2e, 0x20, 0x49, 0x49, 0x3b, 0x72, 0x61, 0x6a, 0x2e, 0x3b, 0x73, 0x68, 0x61, 0x2e, 0x3b, 0x72, 0x61, 0x6d,
-0x2e, 0x3b, 0x73, 0x68, 0x61, 0x77, 0x2e, 0x3b, 0x64, 0x68, 0x75, 0x2bb, 0x6c, 0x2d, 0x71, 0x2e, 0x3b, 0x64, 0x68, 0x75,
-0x2bb, 0x6c, 0x2d, 0x68, 0x2e, 0x3b, 0x645, 0x62d, 0x631, 0x645, 0x3b, 0x635, 0x641, 0x631, 0x3b, 0x631, 0x628, 0x64a, 0x639, 0x3b,
+0x2e, 0x3b, 0x64, 0x68, 0x75, 0x2bb, 0x6c, 0x2d, 0x71, 0x2e, 0x3b, 0x44, 0x68, 0x75, 0x2bb, 0x6c, 0x2d, 0x48, 0x2e, 0x6d,
+0x75, 0x68, 0x2e, 0x3b, 0x73, 0x61, 0x66, 0x2e, 0x3b, 0x72, 0x61, 0x62, 0x2e, 0x20, 0x49, 0x3b, 0x72, 0x61, 0x62, 0x2e,
+0x20, 0x49, 0x49, 0x3b, 0x6a, 0x75, 0x6d, 0x2e, 0x20, 0x49, 0x3b, 0x6a, 0x75, 0x6d, 0x2e, 0x20, 0x49, 0x49, 0x3b, 0x72,
+0x61, 0x6a, 0x2e, 0x3b, 0x73, 0x68, 0x61, 0x2e, 0x3b, 0x72, 0x61, 0x6d, 0x2e, 0x3b, 0x73, 0x68, 0x61, 0x77, 0x2e, 0x3b,
+0x64, 0x68, 0x75, 0x2bb, 0x6c, 0x2d, 0x71, 0x2e, 0x3b, 0x64, 0x68, 0x75, 0x2bb, 0x6c, 0x2d, 0x68, 0x2e, 0x645, 0x62d, 0x631,
+0x645, 0x3b, 0x635, 0x641, 0x631, 0x3b, 0x631, 0x628, 0x64a, 0x639, 0x3b, 0x631, 0x628, 0x64a, 0x639, 0x20, 0x49, 0x49, 0x3b, 0x62c,
+0x645, 0x627, 0x639, 0x647, 0x3b, 0x62c, 0x645, 0x648, 0x645, 0x627, 0x20, 0x49, 0x49, 0x3b, 0x631, 0x62c, 0x628, 0x3b, 0x634, 0x639,
+0x628, 0x627, 0x646, 0x3b, 0x631, 0x645, 0x636, 0x627, 0x646, 0x3b, 0x634, 0x648, 0x627, 0x644, 0x3b, 0x62f, 0x627, 0x644, 0x642, 0x627,
+0x639, 0x62f, 0x647, 0x3b, 0x630, 0x64a, 0x20, 0x627, 0x644, 0x62d, 0x62c, 0x645, 0x62d, 0x631, 0x645, 0x3b, 0x635, 0x641, 0x631, 0x3b,
+0x631, 0x628, 0x64a, 0x639, 0x3b, 0x631, 0x628, 0x64a, 0x639, 0x20, 0x49, 0x49, 0x3b, 0x62c, 0x645, 0x627, 0x639, 0x647, 0x3b, 0x62c,
+0x645, 0x648, 0x645, 0x627, 0x20, 0x49, 0x49, 0x3b, 0x631, 0x62c, 0x628, 0x3b, 0x634, 0x639, 0x628, 0x627, 0x646, 0x3b, 0x631, 0x645,
+0x636, 0x627, 0x646, 0x3b, 0x634, 0x648, 0x627, 0x644, 0x3b, 0x630, 0x64a, 0x20, 0x627, 0x644, 0x642, 0x639, 0x62f, 0x647, 0x3b, 0x630,
+0x64a, 0x20, 0x627, 0x644, 0x62d, 0x62c, 0x645, 0x62d, 0x631, 0x645, 0x3b, 0x635, 0x641, 0x631, 0x3b, 0x631, 0x628, 0x64a, 0x639, 0x3b,
 0x631, 0x628, 0x64a, 0x639, 0x20, 0x49, 0x49, 0x3b, 0x62c, 0x645, 0x627, 0x639, 0x647, 0x3b, 0x62c, 0x645, 0x627, 0x62f, 0x64a, 0x20,
 0x6f2, 0x3b, 0x631, 0x62c, 0x628, 0x3b, 0x634, 0x639, 0x628, 0x627, 0x646, 0x3b, 0x631, 0x645, 0x636, 0x627, 0x646, 0x3b, 0x634, 0x648,
-0x627, 0x644, 0x3b, 0x62f, 0x627, 0x644, 0x642, 0x627, 0x639, 0x62f, 0x647, 0x3b, 0x630, 0x64a, 0x20, 0x627, 0x644, 0x62d, 0x62c, 0x3b,
-0x645, 0x62d, 0x631, 0x645, 0x3b, 0x635, 0x641, 0x631, 0x3b, 0x631, 0x628, 0x64a, 0x639, 0x3b, 0x631, 0x628, 0x64a, 0x639, 0x20, 0x49,
-0x49, 0x3b, 0x62c, 0x645, 0x627, 0x639, 0x647, 0x3b, 0x62c, 0x645, 0x648, 0x645, 0x627, 0x20, 0x49, 0x49, 0x3b, 0x631, 0x62c, 0x628,
-0x3b, 0x634, 0x639, 0x628, 0x627, 0x646, 0x3b, 0x631, 0x645, 0x636, 0x627, 0x646, 0x3b, 0x634, 0x648, 0x627, 0x644, 0x3b, 0x62f, 0x627,
-0x644, 0x642, 0x627, 0x639, 0x62f, 0x647, 0x3b, 0x630, 0x64a, 0x20, 0x627, 0x644, 0x62d, 0x62c, 0x3b, 0x645, 0x62d, 0x631, 0x645, 0x3b,
-0x635, 0x641, 0x631, 0x3b, 0x631, 0x628, 0x64a, 0x639, 0x3b, 0x631, 0x628, 0x64a, 0x639, 0x20, 0x49, 0x49, 0x3b, 0x62c, 0x645, 0x627,
-0x62f, 0x20, 0x6f1, 0x3b, 0x62c, 0x645, 0x627, 0x62f, 0x20, 0x6f2, 0x3b, 0x631, 0x62c, 0x628, 0x3b, 0x634, 0x639, 0x628, 0x627, 0x646,
-0x3b, 0x631, 0x645, 0x636, 0x627, 0x646, 0x3b, 0x634, 0x648, 0x627, 0x644, 0x3b, 0x62f, 0x627, 0x644, 0x642, 0x627, 0x639, 0x62f, 0x647,
-0x3b, 0x630, 0x64a, 0x20, 0x627, 0x644, 0x62d, 0x62c, 0x3b, 0x645, 0x62d, 0x631, 0x645, 0x3b, 0x635, 0x641, 0x631, 0x3b, 0x631, 0x628,
-0x64a, 0x639, 0x3b, 0x631, 0x628, 0x64a, 0x639, 0x20, 0x49, 0x49, 0x3b, 0x62c, 0x645, 0x627, 0x639, 0x647, 0x3b, 0x62c, 0x645, 0x648,
-0x645, 0x627, 0x20, 0x49, 0x49, 0x3b, 0x631, 0x62c, 0x628, 0x3b, 0x634, 0x639, 0x628, 0x627, 0x646, 0x3b, 0x631, 0x645, 0x636, 0x627,
-0x646, 0x3b, 0x634, 0x648, 0x627, 0x644, 0x3b, 0x630, 0x64a, 0x20, 0x627, 0x644, 0x642, 0x639, 0x62f, 0x647, 0x3b, 0x630, 0x64a, 0x20,
-0x627, 0x644, 0x62d, 0x62c, 0x3b, 0x645, 0x62d, 0x631, 0x645, 0x3b, 0x62f, 0x20, 0x635, 0x641, 0x631, 0x6d2, 0x20, 0x62f, 0x3b, 0x631,
-0x628, 0x64a, 0x639, 0x3b, 0x631, 0x628, 0x64a, 0x639, 0x20, 0x49, 0x49, 0x3b, 0x62c, 0x645, 0x627, 0x639, 0x647, 0x3b, 0x62c, 0x645,
-0x648, 0x645, 0x627, 0x20, 0x49, 0x49, 0x3b, 0x631, 0x62c, 0x628, 0x3b, 0x634, 0x639, 0x628, 0x627, 0x646, 0x3b, 0x631, 0x645, 0x636,
-0x627, 0x646, 0x3b, 0x634, 0x648, 0x627, 0x644, 0x3b, 0x62f, 0x627, 0x644, 0x642, 0x627, 0x639, 0x62f, 0x647, 0x3b, 0x630, 0x64a, 0x20,
-0x627, 0x644, 0x62d, 0x62c, 0x3b, 0x645, 0x62d, 0x631, 0x645, 0x3b, 0x62f, 0x20, 0x635, 0x641, 0x631, 0x6d2, 0x20, 0x62f, 0x3b, 0x631,
-0x628, 0x64a, 0x639, 0x3b, 0x631, 0x628, 0x64a, 0x639, 0x20, 0x49, 0x49, 0x3b, 0x62c, 0x645, 0x627, 0x639, 0x647, 0x3b, 0x62c, 0x645,
-0x648, 0x645, 0x627, 0x20, 0x49, 0x49, 0x3b, 0x631, 0x62c, 0x628, 0x3b, 0x634, 0x639, 0x628, 0x627, 0x646, 0x3b, 0x631, 0x645, 0x636,
-0x627, 0x646, 0x3b, 0x634, 0x648, 0x627, 0x644, 0x3b, 0x630, 0x64a, 0x20, 0x627, 0x644, 0x642, 0x639, 0x62f, 0x647, 0x3b, 0x630, 0x64a,
-0x20, 0x627, 0x644, 0x62d, 0x62c, 0x3b, 0x645, 0x62d, 0x631, 0x645, 0x3b, 0x635, 0x641, 0x631, 0x3b, 0x631, 0x628, 0x6cc, 0x639, 0x200c,
-0x627, 0x644, 0x627, 0x648, 0x644, 0x3b, 0x631, 0x628, 0x6cc, 0x639, 0x200c, 0x627, 0x644, 0x62b, 0x627, 0x646, 0x6cc, 0x3b, 0x62c, 0x645,
-0x627, 0x62f, 0x6cc, 0x200c, 0x627, 0x644, 0x627, 0x648, 0x644, 0x3b, 0x62c, 0x645, 0x627, 0x62f, 0x6cc, 0x200c, 0x627, 0x644, 0x62b, 0x627,
-0x646, 0x6cc, 0x3b, 0x631, 0x62c, 0x628, 0x3b, 0x634, 0x639, 0x628, 0x627, 0x646, 0x3b, 0x631, 0x645, 0x636, 0x627, 0x646, 0x3b, 0x634,
-0x648, 0x627, 0x644, 0x3b, 0x630, 0x6cc, 0x642, 0x639, 0x62f, 0x647, 0x3b, 0x630, 0x6cc, 0x62d, 0x62c, 0x647, 0x3b, 0x645, 0x3b, 0x635,
-0x3b, 0x631, 0x3b, 0x631, 0x3b, 0x62c, 0x3b, 0x62c, 0x3b, 0x631, 0x3b, 0x634, 0x3b, 0x631, 0x3b, 0x634, 0x3b, 0x630, 0x3b, 0x630,
-0x3b, 0x645, 0x62d, 0x631, 0x645, 0x3b, 0x635, 0x641, 0x631, 0x3b, 0x631, 0x628, 0x6cc, 0x639, 0x200c, 0x627, 0x644, 0x627, 0x648, 0x644,
+0x627, 0x644, 0x3b, 0x62f, 0x627, 0x644, 0x642, 0x627, 0x639, 0x62f, 0x647, 0x3b, 0x630, 0x64a, 0x20, 0x627, 0x644, 0x62d, 0x62c, 0x645,
+0x62d, 0x631, 0x645, 0x3b, 0x635, 0x641, 0x631, 0x3b, 0x631, 0x628, 0x64a, 0x639, 0x3b, 0x631, 0x628, 0x64a, 0x639, 0x20, 0x49, 0x49,
+0x3b, 0x62c, 0x645, 0x627, 0x62f, 0x20, 0x6f1, 0x3b, 0x62c, 0x645, 0x627, 0x62f, 0x20, 0x6f2, 0x3b, 0x631, 0x62c, 0x628, 0x3b, 0x634,
+0x639, 0x628, 0x627, 0x646, 0x3b, 0x631, 0x645, 0x636, 0x627, 0x646, 0x3b, 0x634, 0x648, 0x627, 0x644, 0x3b, 0x62f, 0x627, 0x644, 0x642,
+0x627, 0x639, 0x62f, 0x647, 0x3b, 0x630, 0x64a, 0x20, 0x627, 0x644, 0x62d, 0x62c, 0x645, 0x62d, 0x631, 0x645, 0x3b, 0x62f, 0x20, 0x635,
+0x641, 0x631, 0x6d2, 0x20, 0x62f, 0x3b, 0x631, 0x628, 0x64a, 0x639, 0x3b, 0x631, 0x628, 0x64a, 0x639, 0x20, 0x49, 0x49, 0x3b, 0x62c,
+0x645, 0x627, 0x639, 0x647, 0x3b, 0x62c, 0x645, 0x648, 0x645, 0x627, 0x20, 0x49, 0x49, 0x3b, 0x631, 0x62c, 0x628, 0x3b, 0x634, 0x639,
+0x628, 0x627, 0x646, 0x3b, 0x631, 0x645, 0x636, 0x627, 0x646, 0x3b, 0x634, 0x648, 0x627, 0x644, 0x3b, 0x62f, 0x627, 0x644, 0x642, 0x627,
+0x639, 0x62f, 0x647, 0x3b, 0x630, 0x64a, 0x20, 0x627, 0x644, 0x62d, 0x62c, 0x645, 0x62d, 0x631, 0x645, 0x3b, 0x62f, 0x20, 0x635, 0x641,
+0x631, 0x6d2, 0x20, 0x62f, 0x3b, 0x631, 0x628, 0x64a, 0x639, 0x3b, 0x631, 0x628, 0x64a, 0x639, 0x20, 0x49, 0x49, 0x3b, 0x62c, 0x645,
+0x627, 0x639, 0x647, 0x3b, 0x62c, 0x645, 0x648, 0x645, 0x627, 0x20, 0x49, 0x49, 0x3b, 0x631, 0x62c, 0x628, 0x3b, 0x634, 0x639, 0x628,
+0x627, 0x646, 0x3b, 0x631, 0x645, 0x636, 0x627, 0x646, 0x3b, 0x634, 0x648, 0x627, 0x644, 0x3b, 0x630, 0x64a, 0x20, 0x627, 0x644, 0x642,
+0x639, 0x62f, 0x647, 0x3b, 0x630, 0x64a, 0x20, 0x627, 0x644, 0x62d, 0x62c, 0x645, 0x62d, 0x631, 0x645, 0x3b, 0x635, 0x641, 0x631, 0x3b,
+0x631, 0x628, 0x6cc, 0x639, 0x200c, 0x627, 0x644, 0x627, 0x648, 0x644, 0x3b, 0x631, 0x628, 0x6cc, 0x639, 0x200c, 0x627, 0x644, 0x62b, 0x627,
+0x646, 0x6cc, 0x3b, 0x62c, 0x645, 0x627, 0x62f, 0x6cc, 0x200c, 0x627, 0x644, 0x627, 0x648, 0x644, 0x3b, 0x62c, 0x645, 0x627, 0x62f, 0x6cc,
+0x200c, 0x627, 0x644, 0x62b, 0x627, 0x646, 0x6cc, 0x3b, 0x631, 0x62c, 0x628, 0x3b, 0x634, 0x639, 0x628, 0x627, 0x646, 0x3b, 0x631, 0x645,
+0x636, 0x627, 0x646, 0x3b, 0x634, 0x648, 0x627, 0x644, 0x3b, 0x630, 0x6cc, 0x642, 0x639, 0x62f, 0x647, 0x3b, 0x630, 0x6cc, 0x62d, 0x62c,
+0x647, 0x645, 0x62d, 0x631, 0x645, 0x3b, 0x635, 0x641, 0x631, 0x3b, 0x631, 0x628, 0x6cc, 0x639, 0x200c, 0x627, 0x644, 0x627, 0x648, 0x644,
 0x3b, 0x631, 0x628, 0x6cc, 0x639, 0x200c, 0x627, 0x644, 0x62b, 0x627, 0x646, 0x6cc, 0x3b, 0x62c, 0x645, 0x627, 0x62f, 0x6cc, 0x200c, 0x627,
 0x644, 0x627, 0x648, 0x644, 0x3b, 0x62c, 0x645, 0x627, 0x62f, 0x6cc, 0x200c, 0x627, 0x644, 0x62b, 0x627, 0x646, 0x6cc, 0x3b, 0x631, 0x62c,
 0x628, 0x3b, 0x634, 0x639, 0x628, 0x627, 0x646, 0x3b, 0x631, 0x645, 0x636, 0x627, 0x646, 0x3b, 0x634, 0x648, 0x627, 0x644, 0x3b, 0x630,
-0x6cc, 0x642, 0x639, 0x62f, 0x647, 0x654, 0x3b, 0x630, 0x6cc, 0x62d, 0x62c, 0x647, 0x654, 0x3b, 0x4d, 0x75, 0x68, 0x2e, 0x3b, 0x53,
-0x61, 0x66, 0x2e, 0x3b, 0x52, 0x61, 0x62, 0x2e, 0x20, 0x49, 0x3b, 0x52, 0x61, 0x62, 0x2e, 0x20, 0x49, 0x49, 0x3b, 0x44,
-0x17c, 0x75, 0x2e, 0x20, 0x49, 0x3b, 0x44, 0x17c, 0x75, 0x2e, 0x20, 0x49, 0x49, 0x3b, 0x52, 0x61, 0x2e, 0x3b, 0x53, 0x7a,
-0x61, 0x2e, 0x3b, 0x52, 0x61, 0x6d, 0x2e, 0x3b, 0x53, 0x7a, 0x61, 0x77, 0x2e, 0x3b, 0x5a, 0x75, 0x20, 0x61, 0x6c, 0x2d,
-0x6b, 0x2e, 0x3b, 0x5a, 0x75, 0x20, 0x61, 0x6c, 0x2d, 0x68, 0x2e, 0x3b, 0x4d, 0x75, 0x68, 0x61, 0x72, 0x72, 0x61, 0x6d,
-0x3b, 0x53, 0x61, 0x66, 0x61, 0x72, 0x3b, 0x52, 0x61, 0x62, 0x69, 0x2bb, 0x20, 0x49, 0x3b, 0x52, 0x61, 0x62, 0x69, 0x2bb,
-0x20, 0x49, 0x49, 0x3b, 0x44, 0x17c, 0x75, 0x6d, 0x61, 0x64, 0x61, 0x20, 0x49, 0x3b, 0x44, 0x17c, 0x75, 0x6d, 0x61, 0x64,
-0x61, 0x20, 0x49, 0x49, 0x3b, 0x52, 0x61, 0x64, 0x17c, 0x61, 0x62, 0x3b, 0x53, 0x7a, 0x61, 0x62, 0x61, 0x6e, 0x3b, 0x52,
-0x61, 0x6d, 0x61, 0x64, 0x61, 0x6e, 0x3b, 0x53, 0x7a, 0x61, 0x77, 0x77, 0x61, 0x6c, 0x3b, 0x5a, 0x75, 0x20, 0x61, 0x6c,
-0x2d, 0x6b, 0x61, 0x64, 0x61, 0x3b, 0x5a, 0x75, 0x20, 0x61, 0x6c, 0x2d, 0x68, 0x69, 0x64, 0x17c, 0x64, 0x17c, 0x61, 0x3b,
-0xa2e, 0xa41, 0xa39, 0xa71, 0x2e, 0x3b, 0xa38, 0xa2b, 0x2e, 0x3b, 0xa30, 0xa2c, 0x2e, 0x20, 0x49, 0x3b, 0xa30, 0xa2c, 0x2e, 0x20,
-0x49, 0x49, 0x3b, 0xa1c, 0xa41, 0xa2e, 0x2e, 0x20, 0x49, 0x3b, 0xa1c, 0xa41, 0xa2e, 0x2e, 0x20, 0x49, 0x49, 0x3b, 0xa30, 0xa3e,
-0xa1c, 0x2e, 0x3b, 0xa38, 0xa3c, 0xa3e, 0x2e, 0x3b, 0xa30, 0xa3e, 0xa2e, 0x2e, 0x3b, 0xa38, 0xa3c, 0xa05, 0x2e, 0x3b, 0xa26, 0xa42,
-0x2d, 0xa05, 0xa32, 0x2d, 0xa15, 0xa40, 0x2e, 0x3b, 0xa26, 0xa42, 0x2d, 0xa05, 0xa32, 0x2d, 0xa39, 0xa3f, 0x2e, 0x3b, 0xa2e, 0xa41,
-0xa39, 0xa71, 0xa30, 0xa2e, 0x3b, 0xa38, 0xa2b, 0xa30, 0x3b, 0xa30, 0xa2c, 0xa40, 0x2bb, 0x20, 0x49, 0x3b, 0xa30, 0xa2c, 0xa40, 0x2bb,
-0x20, 0x49, 0x49, 0x3b, 0xa1c, 0xa41, 0xa2e, 0xa3e, 0xa26, 0xa3e, 0x20, 0x49, 0x3b, 0xa1c, 0xa41, 0xa2e, 0xa3e, 0xa26, 0xa3e, 0x20,
-0x49, 0x49, 0x3b, 0xa30, 0xa1c, 0xa2c, 0x3b, 0xa38, 0xa3c, 0xa2c, 0xa3e, 0xa28, 0x3b, 0xa30, 0xa2e, 0xa1c, 0xa3c, 0xa3e, 0xa28, 0x3b,
-0xa38, 0xa3c, 0xa35, 0xa3e, 0xa32, 0x3b, 0xa26, 0xa42, 0x2d, 0xa05, 0xa32, 0x2d, 0xa15, 0xa40, 0xa26, 0xa3e, 0xa39, 0x3b, 0xa26, 0xa42,
-0x2d, 0xa05, 0xa32, 0x2d, 0xa39, 0xa3f, 0xa1c, 0xa4d, 0xa39, 0xa3e, 0x3b, 0xa2e, 0xa41, 0xa39, 0xa71, 0xa30, 0xa2e, 0x3b, 0xa38, 0xa2b,
-0xa30, 0x3b, 0xa30, 0xa2c, 0xa40, 0x20, 0x2bb, 0x20, 0x49, 0x3b, 0xa30, 0xa2c, 0xa40, 0x20, 0x2bb, 0x20, 0x49, 0x49, 0x3b, 0xa1c,
-0xa41, 0xa2e, 0xa3e, 0xa26, 0xa3e, 0x20, 0x49, 0x3b, 0xa1c, 0xa41, 0xa2e, 0xa3e, 0xa26, 0xa3e, 0x20, 0x49, 0x49, 0x3b, 0xa30, 0xa1c,
-0xa2c, 0x3b, 0xa38, 0xa3c, 0xa2c, 0xa3e, 0xa28, 0x3b, 0xa30, 0xa2e, 0xa1c, 0xa3c, 0xa3e, 0xa28, 0x3b, 0xa38, 0xa3c, 0xa35, 0xa3e, 0xa32,
-0x3b, 0xa26, 0xa42, 0x2d, 0xa05, 0xa32, 0x2d, 0xa15, 0xa40, 0xa26, 0xa3e, 0xa39, 0x3b, 0xa26, 0xa42, 0x2d, 0xa05, 0xa32, 0x2d, 0xa39,
-0xa3f, 0xa1c, 0xa4d, 0xa39, 0xa3e, 0x3b, 0x43c, 0x443, 0x445, 0x2e, 0x3b, 0x441, 0x430, 0x444, 0x2e, 0x3b, 0x440, 0x430, 0x431, 0x2e,
-0x20, 0x49, 0x3b, 0x440, 0x430, 0x431, 0x2e, 0x20, 0x49, 0x49, 0x3b, 0x434, 0x436, 0x443, 0x43c, 0x2e, 0x20, 0x49, 0x3b, 0x434,
-0x436, 0x443, 0x43c, 0x2e, 0x20, 0x49, 0x49, 0x3b, 0x440, 0x430, 0x434, 0x436, 0x2e, 0x3b, 0x448, 0x430, 0x430, 0x431, 0x2e, 0x3b,
-0x440, 0x430, 0x43c, 0x2e, 0x3b, 0x448, 0x430, 0x432, 0x2e, 0x3b, 0x437, 0x443, 0x43b, 0x44c, 0x2d, 0x43a, 0x2e, 0x3b, 0x437, 0x443,
-0x43b, 0x44c, 0x2d, 0x445, 0x2e, 0x3b, 0x43c, 0x443, 0x445, 0x430, 0x440, 0x440, 0x430, 0x43c, 0x3b, 0x441, 0x430, 0x444, 0x430, 0x440,
-0x3b, 0x440, 0x430, 0x431, 0x438, 0x2d, 0x443, 0x43b, 0x44c, 0x2d, 0x430, 0x432, 0x432, 0x430, 0x43b, 0x44c, 0x3b, 0x440, 0x430, 0x431,
-0x438, 0x2d, 0x443, 0x43b, 0x44c, 0x2d, 0x430, 0x445, 0x438, 0x440, 0x3b, 0x434, 0x436, 0x443, 0x43c, 0x430, 0x434, 0x2d, 0x443, 0x43b,
-0x44c, 0x2d, 0x430, 0x432, 0x432, 0x430, 0x43b, 0x44c, 0x3b, 0x434, 0x436, 0x443, 0x43c, 0x430, 0x434, 0x2d, 0x443, 0x43b, 0x44c, 0x2d,
-0x430, 0x445, 0x438, 0x440, 0x3b, 0x440, 0x430, 0x434, 0x436, 0x430, 0x431, 0x3b, 0x448, 0x430, 0x430, 0x431, 0x430, 0x43d, 0x3b, 0x440,
-0x430, 0x43c, 0x430, 0x434, 0x430, 0x43d, 0x3b, 0x448, 0x430, 0x432, 0x432, 0x430, 0x43b, 0x44c, 0x3b, 0x437, 0x443, 0x43b, 0x44c, 0x2d,
-0x43a, 0x430, 0x430, 0x434, 0x430, 0x3b, 0x437, 0x443, 0x43b, 0x44c, 0x2d, 0x445, 0x438, 0x434, 0x436, 0x436, 0x430, 0x3b, 0x41c, 0x443,
-0x445, 0x2e, 0x3b, 0x421, 0x430, 0x444, 0x2e, 0x3b, 0x420, 0x435, 0x431, 0x2e, 0x20, 0x31, 0x3b, 0x420, 0x435, 0x431, 0x2e, 0x20,
-0x32, 0x3b, 0x40f, 0x443, 0x43c, 0x2e, 0x20, 0x31, 0x3b, 0x40f, 0x443, 0x43c, 0x2e, 0x20, 0x32, 0x3b, 0x420, 0x435, 0x45f, 0x2e,
-0x3b, 0x428, 0x430, 0x2e, 0x3b, 0x420, 0x430, 0x43c, 0x2e, 0x3b, 0x428, 0x435, 0x2e, 0x3b, 0x417, 0x443, 0x43b, 0x2d, 0x43a, 0x2e,
-0x3b, 0x417, 0x443, 0x43b, 0x2d, 0x445, 0x2e, 0x3b, 0x41c, 0x443, 0x445, 0x430, 0x440, 0x435, 0x43c, 0x3b, 0x421, 0x430, 0x444, 0x435,
-0x440, 0x3b, 0x420, 0x435, 0x431, 0x438, 0x20, 0x31, 0x3b, 0x420, 0x435, 0x431, 0x438, 0x20, 0x32, 0x3b, 0x40f, 0x443, 0x43c, 0x430,
-0x434, 0x435, 0x20, 0x31, 0x3b, 0x40f, 0x443, 0x43c, 0x430, 0x434, 0x435, 0x20, 0x32, 0x3b, 0x420, 0x435, 0x45f, 0x435, 0x431, 0x3b,
-0x428, 0x430, 0x2bb, 0x431, 0x430, 0x43d, 0x3b, 0x420, 0x430, 0x43c, 0x430, 0x437, 0x430, 0x43d, 0x3b, 0x428, 0x435, 0x432, 0x430, 0x43b,
-0x3b, 0x417, 0x443, 0x43b, 0x2d, 0x43a, 0x430, 0x434, 0x435, 0x3b, 0x417, 0x443, 0x43b, 0x2d, 0x445, 0x438, 0x45f, 0x435, 0x3b, 0x41c,
-0x443, 0x440, 0x430, 0x445, 0x430, 0x43c, 0x3b, 0x421, 0x430, 0x444, 0x430, 0x440, 0x3b, 0x420, 0x430, 0x431, 0x438, 0x2bb, 0x20, 0x49,
-0x3b, 0x420, 0x430, 0x431, 0x438, 0x2bb, 0x20, 0x49, 0x49, 0x3b, 0x408, 0x443, 0x43c, 0x430, 0x434, 0x430, 0x20, 0x49, 0x3b, 0x408,
-0x443, 0x43c, 0x430, 0x434, 0x430, 0x20, 0x49, 0x49, 0x3b, 0x420, 0x430, 0x452, 0x430, 0x431, 0x3b, 0x428, 0x430, 0x2bb, 0x431, 0x430,
-0x43d, 0x3b, 0x420, 0x430, 0x43c, 0x430, 0x434, 0x430, 0x43d, 0x3b, 0x428, 0x430, 0x432, 0x430, 0x43b, 0x3b, 0x414, 0x443, 0x2bb, 0x43b,
-0x2d, 0x41a, 0x438, 0x2bb, 0x434, 0x430, 0x3b, 0x414, 0x443, 0x2bb, 0x43b, 0x2d, 0x445, 0x438, 0x452, 0x430, 0x3b, 0x4d, 0x75, 0x68,
-0x2e, 0x3b, 0x53, 0x61, 0x66, 0x2e, 0x3b, 0x52, 0x65, 0x62, 0x2e, 0x20, 0x31, 0x3b, 0x52, 0x65, 0x62, 0x2e, 0x20, 0x32,
-0x3b, 0x44, 0x17e, 0x75, 0x6d, 0x2e, 0x20, 0x31, 0x3b, 0x44, 0x17e, 0x75, 0x6d, 0x2e, 0x20, 0x32, 0x3b, 0x52, 0x65, 0x64,
-0x17e, 0x2e, 0x3b, 0x160, 0x61, 0x2e, 0x3b, 0x52, 0x61, 0x6d, 0x2e, 0x3b, 0x160, 0x65, 0x2e, 0x3b, 0x5a, 0x75, 0x6c, 0x2d,
-0x6b, 0x2e, 0x3b, 0x5a, 0x75, 0x6c, 0x2d, 0x68, 0x2e, 0x3b, 0x4d, 0x75, 0x68, 0x61, 0x72, 0x65, 0x6d, 0x3b, 0x53, 0x61,
-0x66, 0x65, 0x72, 0x3b, 0x52, 0x65, 0x62, 0x69, 0x20, 0x31, 0x3b, 0x52, 0x65, 0x62, 0x69, 0x20, 0x32, 0x3b, 0x44, 0x17e,
-0x75, 0x6d, 0x61, 0x64, 0x65, 0x20, 0x31, 0x3b, 0x44, 0x17e, 0x75, 0x6d, 0x61, 0x64, 0x65, 0x20, 0x32, 0x3b, 0x52, 0x65,
-0x64, 0x17e, 0x65, 0x62, 0x3b, 0x160, 0x61, 0x2bb, 0x62, 0x61, 0x6e, 0x3b, 0x52, 0x61, 0x6d, 0x61, 0x7a, 0x61, 0x6e, 0x3b,
-0x160, 0x65, 0x76, 0x61, 0x6c, 0x3b, 0x5a, 0x75, 0x6c, 0x2d, 0x6b, 0x61, 0x64, 0x65, 0x3b, 0x5a, 0x75, 0x6c, 0x2d, 0x68,
-0x69, 0x64, 0x17e, 0x65, 0x3b, 0x4d, 0x75, 0x72, 0x61, 0x68, 0x61, 0x6d, 0x3b, 0x53, 0x61, 0x66, 0x61, 0x72, 0x3b, 0x52,
-0x61, 0x62, 0x69, 0x2bb, 0x20, 0x49, 0x3b, 0x52, 0x61, 0x62, 0x69, 0x2bb, 0x20, 0x49, 0x49, 0x3b, 0x4a, 0x75, 0x6d, 0x61,
-0x64, 0x61, 0x20, 0x49, 0x3b, 0x4a, 0x75, 0x6d, 0x61, 0x64, 0x61, 0x20, 0x49, 0x49, 0x3b, 0x52, 0x61, 0x111, 0x61, 0x62,
-0x3b, 0x160, 0x61, 0x2bb, 0x62, 0x61, 0x6e, 0x3b, 0x52, 0x61, 0x6d, 0x61, 0x64, 0x61, 0x6e, 0x3b, 0x160, 0x61, 0x76, 0x61,
-0x6c, 0x3b, 0x44, 0x75, 0x2bb, 0x6c, 0x2d, 0x4b, 0x69, 0x2bb, 0x64, 0x61, 0x3b, 0x44, 0x75, 0x2bb, 0x6c, 0x2d, 0x68, 0x69,
-0x111, 0x61, 0x3b, 0x6d, 0x75, 0x68, 0x2e, 0x3b, 0x73, 0x61, 0x66, 0x2e, 0x3b, 0x72, 0x61, 0x62, 0x2e, 0x20, 0x49, 0x3b,
-0x72, 0x61, 0x62, 0x2e, 0x20, 0x49, 0x49, 0x3b, 0x64, 0x17e, 0x75, 0x6d, 0x2e, 0x20, 0x49, 0x3b, 0x64, 0x17e, 0x75, 0x6d,
-0x2e, 0x20, 0x49, 0x49, 0x3b, 0x72, 0x61, 0x64, 0x2e, 0x3b, 0x161, 0x61, 0x2e, 0x3b, 0x72, 0x61, 0x6d, 0x2e, 0x3b, 0x161,
-0x61, 0x75, 0x2e, 0x3b, 0x64, 0x68, 0xfa, 0x20, 0x6c, 0x2d, 0x6b, 0x2e, 0x3b, 0x64, 0x68, 0xfa, 0x20, 0x6c, 0x2d, 0x68,
-0x2e, 0x3b, 0x61, 0x6c, 0x2d, 0x6d, 0x75, 0x68, 0x61, 0x72, 0x72, 0x61, 0x6d, 0x3b, 0x73, 0x61, 0x66, 0x61, 0x72, 0x3b,
-0x72, 0x61, 0x62, 0xed, 0xb4, 0x20, 0x61, 0x6c, 0x2d, 0x61, 0x76, 0x76, 0x61, 0x6c, 0x3b, 0x72, 0x61, 0x62, 0xed, 0xb4,
-0x61, 0x74, 0x68, 0x2d, 0x74, 0x68, 0xe1, 0x6e, 0xed, 0x3b, 0x64, 0x17e, 0x75, 0x6d, 0xe1, 0x64, 0xe1, 0x20, 0x6c, 0x2d,
-0xfa, 0x6c, 0xe1, 0x3b, 0x64, 0x17e, 0x75, 0x6d, 0xe1, 0x64, 0xe1, 0x20, 0x6c, 0x2d, 0xe1, 0x63, 0x68, 0x69, 0x72, 0x61,
-0x3b, 0x72, 0x61, 0x64, 0x17e, 0x61, 0x62, 0x3b, 0x161, 0x61, 0xb4, 0x20, 0x62, 0xe1, 0x6e, 0x3b, 0x72, 0x61, 0x6d, 0x61,
-0x64, 0xe1, 0x6e, 0x3b, 0x161, 0x61, 0x75, 0x76, 0xe1, 0x6c, 0x3b, 0x64, 0x68, 0xfa, 0x20, 0x6c, 0x2d, 0x6b, 0x61, 0xb4,
-0x20, 0x64, 0x61, 0x3b, 0x64, 0x68, 0xfa, 0x20, 0x6c, 0x2d, 0x68, 0x69, 0x64, 0x17e, 0x64, 0x17e, 0x61, 0x3b, 0x4d, 0x75,
-0x78, 0x2e, 0x3b, 0x53, 0x61, 0x66, 0x2e, 0x3b, 0x52, 0x61, 0x62, 0x2e, 0x20, 0x49, 0x3b, 0x52, 0x61, 0x62, 0x2e, 0x20,
-0x49, 0x49, 0x3b, 0x4a, 0x75, 0x6d, 0x2e, 0x20, 0x49, 0x3b, 0x4a, 0x75, 0x6d, 0x2e, 0x20, 0x49, 0x49, 0x3b, 0x52, 0x61,
-0x6a, 0x2e, 0x3b, 0x53, 0x68, 0x61, 0x2e, 0x3b, 0x52, 0x61, 0x6d, 0x2e, 0x3b, 0x53, 0x68, 0x61, 0x77, 0x2e, 0x3b, 0x44,
-0x75, 0x6c, 0x2d, 0x51, 0x2e, 0x3b, 0x44, 0x75, 0x6c, 0x2d, 0x58, 0x2e, 0x3b, 0x4d, 0x75, 0x78, 0x61, 0x72, 0x72, 0x61,
-0x6d, 0x3b, 0x53, 0x61, 0x66, 0x61, 0x72, 0x3b, 0x52, 0x61, 0x62, 0x69, 0x63, 0x20, 0x61, 0x6c, 0x2d, 0x61, 0x77, 0x77,
-0x61, 0x6c, 0x3b, 0x52, 0x61, 0x62, 0x69, 0x63, 0x20, 0x61, 0x6c, 0x2d, 0x74, 0x68, 0x61, 0x6e, 0x69, 0x3b, 0x4a, 0x75,
-0x6d, 0x61, 0x64, 0x61, 0x20, 0x61, 0x6c, 0x2d, 0x61, 0x77, 0x77, 0x61, 0x6c, 0x3b, 0x6a, 0x75, 0x6d, 0x61, 0x64, 0x61,
-0x20, 0x61, 0x6c, 0x2d, 0x74, 0x68, 0x61, 0x6e, 0x69, 0x3b, 0x52, 0x61, 0x6a, 0x61, 0x62, 0x3b, 0x53, 0x68, 0x61, 0x63,
-0x62, 0x61, 0x6e, 0x3b, 0x52, 0x61, 0x6d, 0x61, 0x64, 0x61, 0x6e, 0x3b, 0x53, 0x68, 0x61, 0x77, 0x77, 0x61, 0x6c, 0x3b,
-0x44, 0x75, 0x6c, 0x20, 0x61, 0x6c, 0x2d, 0x71, 0x61, 0x63, 0x64, 0x61, 0x68, 0x3b, 0x44, 0x75, 0x6c, 0x20, 0x78, 0x69,
-0x6a, 0x6a, 0x61, 0x68, 0x3b, 0x4d, 0x75, 0x78, 0x2e, 0x3b, 0x53, 0x61, 0x66, 0x2e, 0x3b, 0x52, 0x61, 0x62, 0x2e, 0x20,
-0x49, 0x3b, 0x52, 0x61, 0x62, 0x2e, 0x20, 0x49, 0x49, 0x3b, 0x4a, 0x75, 0x6d, 0x2e, 0x20, 0x49, 0x3b, 0x4a, 0x75, 0x6d,
-0x2e, 0x20, 0x49, 0x49, 0x3b, 0x52, 0x61, 0x6a, 0x2e, 0x3b, 0x53, 0x68, 0x61, 0x2e, 0x3b, 0x52, 0x61, 0x6d, 0x2e, 0x3b,
-0x53, 0x68, 0x61, 0x77, 0x2e, 0x3b, 0x44, 0x68, 0x75, 0x2bb, 0x6c, 0x2d, 0x51, 0x2e, 0x3b, 0x44, 0x68, 0x75, 0x2bb, 0x6c,
-0x2d, 0x48, 0x2e, 0x3b, 0x4d, 0x75, 0x78, 0x61, 0x72, 0x72, 0x61, 0x6d, 0x3b, 0x53, 0x61, 0x66, 0x61, 0x72, 0x3b, 0x52,
-0x61, 0x62, 0x69, 0x63, 0x20, 0x61, 0x6c, 0x2d, 0x61, 0x77, 0x77, 0x61, 0x6c, 0x3b, 0x52, 0x61, 0x62, 0x69, 0x63, 0x20,
-0x61, 0x6c, 0x2d, 0x74, 0x68, 0x61, 0x6e, 0x69, 0x3b, 0x4a, 0x75, 0x6d, 0x61, 0x64, 0x61, 0x20, 0x61, 0x6c, 0x2d, 0x61,
-0x77, 0x77, 0x61, 0x6c, 0x3b, 0x6a, 0x75, 0x6d, 0x61, 0x64, 0x61, 0x20, 0x61, 0x6c, 0x2d, 0x74, 0x68, 0x61, 0x6e, 0x69,
-0x3b, 0x52, 0x61, 0x6a, 0x61, 0x62, 0x3b, 0x53, 0x68, 0x61, 0x63, 0x62, 0x61, 0x6e, 0x3b, 0x52, 0x61, 0x6d, 0x61, 0x64,
-0x61, 0x6e, 0x3b, 0x53, 0x68, 0x61, 0x77, 0x77, 0x61, 0x6c, 0x3b, 0x44, 0x75, 0x6c, 0x20, 0x61, 0x6c, 0x2d, 0x71, 0x61,
-0x63, 0x64, 0x61, 0x3b, 0x44, 0x75, 0x6c, 0x20, 0x78, 0x69, 0x6a, 0x6a, 0x61, 0x68, 0x3b, 0x6d, 0x75, 0x68, 0x61, 0x72,
-0x72, 0x61, 0x6d, 0x3b, 0x73, 0x61, 0x66, 0x61, 0x72, 0x3b, 0x72, 0x61, 0x62, 0x69, 0x2bb, 0x20, 0x49, 0x3b, 0x72, 0x61,
-0x62, 0x69, 0x2bb, 0x20, 0x49, 0x49, 0x3b, 0x6a, 0x75, 0x6d, 0x61, 0x64, 0x61, 0x20, 0x49, 0x3b, 0x6a, 0x75, 0x6d, 0x61,
-0x64, 0x61, 0x20, 0x49, 0x49, 0x3b, 0x72, 0x61, 0x6a, 0x61, 0x62, 0x3b, 0x73, 0x68, 0x61, 0x2bb, 0x62, 0x61, 0x6e, 0x3b,
-0x72, 0x61, 0x6d, 0x61, 0x64, 0xe1, 0x6e, 0x3b, 0x73, 0x68, 0x61, 0x77, 0x77, 0x61, 0x6c, 0x3b, 0x64, 0x68, 0x75, 0x2bb,
-0x6c, 0x2d, 0x71, 0x69, 0x2bb, 0x64, 0x61, 0x68, 0x3b, 0x64, 0x68, 0x75, 0x2bb, 0x6c, 0x2d, 0x68, 0x69, 0x6a, 0x6a, 0x61,
-0x68, 0x3b, 0x4d, 0x75, 0x68, 0x61, 0x72, 0x72, 0x61, 0x6d, 0x3b, 0x53, 0x61, 0x66, 0x61, 0x72, 0x3b, 0x52, 0x61, 0x62,
-0x69, 0x2019, 0x20, 0x61, 0x6c, 0x2d, 0x61, 0x77, 0x77, 0x61, 0x6c, 0x3b, 0x52, 0x61, 0x62, 0x69, 0x2019, 0x20, 0x61, 0x6c,
-0x2d, 0x61, 0x6b, 0x68, 0x69, 0x72, 0x3b, 0x4a, 0x75, 0x6d, 0x61, 0x64, 0x61, 0x2d, 0x6c, 0x2d, 0x75, 0x6c, 0x61, 0x3b,
-0x4a, 0x75, 0x6d, 0x61, 0x64, 0x61, 0x2d, 0x6c, 0x2d, 0x61, 0x6b, 0x68, 0x69, 0x72, 0x61, 0x3b, 0x52, 0x61, 0x6a, 0x61,
-0x62, 0x3b, 0x53, 0x68, 0x61, 0x2019, 0x62, 0x61, 0x6e, 0x3b, 0x52, 0x61, 0x6d, 0x61, 0x64, 0x61, 0x6e, 0x3b, 0x53, 0x68,
-0x61, 0x77, 0x77, 0x61, 0x6c, 0x3b, 0x44, 0x68, 0x75, 0x2d, 0x6c, 0x2d, 0x67, 0x61, 0x2019, 0x64, 0x61, 0x3b, 0x44, 0x68,
-0x75, 0x2d, 0x6c, 0x2d, 0x68, 0x69, 0x6a, 0x6a, 0x61, 0x3b, 0x6d, 0x75, 0x68, 0x61, 0x72, 0x72, 0x61, 0x6d, 0x3b, 0x73,
-0x61, 0x66, 0x61, 0x72, 0x3b, 0x72, 0x61, 0x62, 0x69, 0x2019, 0x20, 0x61, 0x6c, 0x2d, 0x61, 0x77, 0x77, 0x61, 0x6c, 0x3b,
-0x72, 0x61, 0x62, 0x69, 0x2019, 0x20, 0x61, 0x6c, 0x2d, 0x61, 0x6b, 0x68, 0x69, 0x72, 0x3b, 0x6a, 0x75, 0x6d, 0x61, 0x64,
-0x61, 0x2d, 0x6c, 0x2d, 0x75, 0x6c, 0x61, 0x3b, 0x6a, 0x75, 0x6d, 0x61, 0x64, 0x61, 0x2d, 0x6c, 0x2d, 0x61, 0x6b, 0x68,
-0x69, 0x72, 0x61, 0x3b, 0x72, 0x61, 0x6a, 0x61, 0x62, 0x3b, 0x73, 0x68, 0x61, 0x2019, 0x62, 0x61, 0x6e, 0x3b, 0x72, 0x61,
-0x6d, 0x61, 0x64, 0x61, 0x6e, 0x3b, 0x73, 0x68, 0x61, 0x77, 0x77, 0x61, 0x6c, 0x3b, 0x64, 0x68, 0x75, 0x2d, 0x6c, 0x2d,
-0x67, 0x61, 0x2019, 0x64, 0x61, 0x3b, 0x64, 0x68, 0x75, 0x2d, 0x6c, 0x2d, 0x68, 0x69, 0x6a, 0x6a, 0x61, 0x3b, 0x41c, 0x443,
+0x6cc, 0x642, 0x639, 0x62f, 0x647, 0x654, 0x3b, 0x630, 0x6cc, 0x62d, 0x62c, 0x647, 0x654, 0x645, 0x3b, 0x635, 0x3b, 0x631, 0x3b, 0x631,
+0x3b, 0x62c, 0x3b, 0x62c, 0x3b, 0x631, 0x3b, 0x634, 0x3b, 0x631, 0x3b, 0x634, 0x3b, 0x630, 0x3b, 0x630, 0x4d, 0x75, 0x68, 0x61,
+0x72, 0x72, 0x61, 0x6d, 0x3b, 0x53, 0x61, 0x66, 0x61, 0x72, 0x3b, 0x52, 0x61, 0x62, 0x69, 0x2bb, 0x20, 0x49, 0x3b, 0x52,
+0x61, 0x62, 0x69, 0x2bb, 0x20, 0x49, 0x49, 0x3b, 0x44, 0x17c, 0x75, 0x6d, 0x61, 0x64, 0x61, 0x20, 0x49, 0x3b, 0x44, 0x17c,
+0x75, 0x6d, 0x61, 0x64, 0x61, 0x20, 0x49, 0x49, 0x3b, 0x52, 0x61, 0x64, 0x17c, 0x61, 0x62, 0x3b, 0x53, 0x7a, 0x61, 0x62,
+0x61, 0x6e, 0x3b, 0x52, 0x61, 0x6d, 0x61, 0x64, 0x61, 0x6e, 0x3b, 0x53, 0x7a, 0x61, 0x77, 0x77, 0x61, 0x6c, 0x3b, 0x5a,
+0x75, 0x20, 0x61, 0x6c, 0x2d, 0x6b, 0x61, 0x64, 0x61, 0x3b, 0x5a, 0x75, 0x20, 0x61, 0x6c, 0x2d, 0x68, 0x69, 0x64, 0x17c,
+0x64, 0x17c, 0x61, 0x4d, 0x75, 0x68, 0x2e, 0x3b, 0x53, 0x61, 0x66, 0x2e, 0x3b, 0x52, 0x61, 0x62, 0x2e, 0x20, 0x49, 0x3b,
+0x52, 0x61, 0x62, 0x2e, 0x20, 0x49, 0x49, 0x3b, 0x44, 0x17c, 0x75, 0x2e, 0x20, 0x49, 0x3b, 0x44, 0x17c, 0x75, 0x2e, 0x20,
+0x49, 0x49, 0x3b, 0x52, 0x61, 0x2e, 0x3b, 0x53, 0x7a, 0x61, 0x2e, 0x3b, 0x52, 0x61, 0x6d, 0x2e, 0x3b, 0x53, 0x7a, 0x61,
+0x77, 0x2e, 0x3b, 0x5a, 0x75, 0x20, 0x61, 0x6c, 0x2d, 0x6b, 0x2e, 0x3b, 0x5a, 0x75, 0x20, 0x61, 0x6c, 0x2d, 0x68, 0x2e,
+0xa2e, 0xa41, 0xa39, 0xa71, 0xa30, 0xa2e, 0x3b, 0xa38, 0xa2b, 0xa30, 0x3b, 0xa30, 0xa2c, 0xa40, 0x2bb, 0x20, 0x49, 0x3b, 0xa30, 0xa2c,
+0xa40, 0x2bb, 0x20, 0x49, 0x49, 0x3b, 0xa1c, 0xa41, 0xa2e, 0xa3e, 0xa26, 0xa3e, 0x20, 0x49, 0x3b, 0xa1c, 0xa41, 0xa2e, 0xa3e, 0xa26,
+0xa3e, 0x20, 0x49, 0x49, 0x3b, 0xa30, 0xa1c, 0xa2c, 0x3b, 0xa38, 0xa3c, 0xa2c, 0xa3e, 0xa28, 0x3b, 0xa30, 0xa2e, 0xa1c, 0xa3c, 0xa3e,
+0xa28, 0x3b, 0xa38, 0xa3c, 0xa35, 0xa3e, 0xa32, 0x3b, 0xa26, 0xa42, 0x2d, 0xa05, 0xa32, 0x2d, 0xa15, 0xa40, 0xa26, 0xa3e, 0xa39, 0x3b,
+0xa26, 0xa42, 0x2d, 0xa05, 0xa32, 0x2d, 0xa39, 0xa3f, 0xa1c, 0xa4d, 0xa39, 0xa3e, 0xa2e, 0xa41, 0xa39, 0xa71, 0xa30, 0xa2e, 0x3b, 0xa38,
+0xa2b, 0xa30, 0x3b, 0xa30, 0xa2c, 0xa40, 0x20, 0x2bb, 0x20, 0x49, 0x3b, 0xa30, 0xa2c, 0xa40, 0x20, 0x2bb, 0x20, 0x49, 0x49, 0x3b,
+0xa1c, 0xa41, 0xa2e, 0xa3e, 0xa26, 0xa3e, 0x20, 0x49, 0x3b, 0xa1c, 0xa41, 0xa2e, 0xa3e, 0xa26, 0xa3e, 0x20, 0x49, 0x49, 0x3b, 0xa30,
+0xa1c, 0xa2c, 0x3b, 0xa38, 0xa3c, 0xa2c, 0xa3e, 0xa28, 0x3b, 0xa30, 0xa2e, 0xa1c, 0xa3c, 0xa3e, 0xa28, 0x3b, 0xa38, 0xa3c, 0xa35, 0xa3e,
+0xa32, 0x3b, 0xa26, 0xa42, 0x2d, 0xa05, 0xa32, 0x2d, 0xa15, 0xa40, 0xa26, 0xa3e, 0xa39, 0x3b, 0xa26, 0xa42, 0x2d, 0xa05, 0xa32, 0x2d,
+0xa39, 0xa3f, 0xa1c, 0xa4d, 0xa39, 0xa3e, 0xa2e, 0xa41, 0xa39, 0xa71, 0x2e, 0x3b, 0xa38, 0xa2b, 0x2e, 0x3b, 0xa30, 0xa2c, 0x2e, 0x20,
+0x49, 0x3b, 0xa30, 0xa2c, 0x2e, 0x20, 0x49, 0x49, 0x3b, 0xa1c, 0xa41, 0xa2e, 0x2e, 0x20, 0x49, 0x3b, 0xa1c, 0xa41, 0xa2e, 0x2e,
+0x20, 0x49, 0x49, 0x3b, 0xa30, 0xa3e, 0xa1c, 0x2e, 0x3b, 0xa38, 0xa3c, 0xa3e, 0x2e, 0x3b, 0xa30, 0xa3e, 0xa2e, 0x2e, 0x3b, 0xa38,
+0xa3c, 0xa05, 0x2e, 0x3b, 0xa26, 0xa42, 0x2d, 0xa05, 0xa32, 0x2d, 0xa15, 0xa40, 0x2e, 0x3b, 0xa26, 0xa42, 0x2d, 0xa05, 0xa32, 0x2d,
+0xa39, 0xa3f, 0x2e, 0x43c, 0x443, 0x445, 0x430, 0x440, 0x440, 0x430, 0x43c, 0x3b, 0x441, 0x430, 0x444, 0x430, 0x440, 0x3b, 0x440, 0x430,
+0x431, 0x438, 0x2d, 0x443, 0x43b, 0x44c, 0x2d, 0x430, 0x432, 0x432, 0x430, 0x43b, 0x44c, 0x3b, 0x440, 0x430, 0x431, 0x438, 0x2d, 0x443,
+0x43b, 0x44c, 0x2d, 0x430, 0x445, 0x438, 0x440, 0x3b, 0x434, 0x436, 0x443, 0x43c, 0x430, 0x434, 0x2d, 0x443, 0x43b, 0x44c, 0x2d, 0x430,
+0x432, 0x432, 0x430, 0x43b, 0x44c, 0x3b, 0x434, 0x436, 0x443, 0x43c, 0x430, 0x434, 0x2d, 0x443, 0x43b, 0x44c, 0x2d, 0x430, 0x445, 0x438,
+0x440, 0x3b, 0x440, 0x430, 0x434, 0x436, 0x430, 0x431, 0x3b, 0x448, 0x430, 0x430, 0x431, 0x430, 0x43d, 0x3b, 0x440, 0x430, 0x43c, 0x430,
+0x434, 0x430, 0x43d, 0x3b, 0x448, 0x430, 0x432, 0x432, 0x430, 0x43b, 0x44c, 0x3b, 0x437, 0x443, 0x43b, 0x44c, 0x2d, 0x43a, 0x430, 0x430,
+0x434, 0x430, 0x3b, 0x437, 0x443, 0x43b, 0x44c, 0x2d, 0x445, 0x438, 0x434, 0x436, 0x436, 0x430, 0x43c, 0x443, 0x445, 0x2e, 0x3b, 0x441,
+0x430, 0x444, 0x2e, 0x3b, 0x440, 0x430, 0x431, 0x2e, 0x20, 0x49, 0x3b, 0x440, 0x430, 0x431, 0x2e, 0x20, 0x49, 0x49, 0x3b, 0x434,
+0x436, 0x443, 0x43c, 0x2e, 0x20, 0x49, 0x3b, 0x434, 0x436, 0x443, 0x43c, 0x2e, 0x20, 0x49, 0x49, 0x3b, 0x440, 0x430, 0x434, 0x436,
+0x2e, 0x3b, 0x448, 0x430, 0x430, 0x431, 0x2e, 0x3b, 0x440, 0x430, 0x43c, 0x2e, 0x3b, 0x448, 0x430, 0x432, 0x2e, 0x3b, 0x437, 0x443,
+0x43b, 0x44c, 0x2d, 0x43a, 0x2e, 0x3b, 0x437, 0x443, 0x43b, 0x44c, 0x2d, 0x445, 0x2e, 0x41c, 0x443, 0x445, 0x430, 0x440, 0x435, 0x43c,
+0x3b, 0x421, 0x430, 0x444, 0x435, 0x440, 0x3b, 0x420, 0x435, 0x431, 0x438, 0x20, 0x31, 0x3b, 0x420, 0x435, 0x431, 0x438, 0x20, 0x32,
+0x3b, 0x40f, 0x443, 0x43c, 0x430, 0x434, 0x435, 0x20, 0x31, 0x3b, 0x40f, 0x443, 0x43c, 0x430, 0x434, 0x435, 0x20, 0x32, 0x3b, 0x420,
+0x435, 0x45f, 0x435, 0x431, 0x3b, 0x428, 0x430, 0x2bb, 0x431, 0x430, 0x43d, 0x3b, 0x420, 0x430, 0x43c, 0x430, 0x437, 0x430, 0x43d, 0x3b,
+0x428, 0x435, 0x432, 0x430, 0x43b, 0x3b, 0x417, 0x443, 0x43b, 0x2d, 0x43a, 0x430, 0x434, 0x435, 0x3b, 0x417, 0x443, 0x43b, 0x2d, 0x445,
+0x438, 0x45f, 0x435, 0x41c, 0x443, 0x440, 0x430, 0x445, 0x430, 0x43c, 0x3b, 0x421, 0x430, 0x444, 0x430, 0x440, 0x3b, 0x420, 0x430, 0x431,
+0x438, 0x2bb, 0x20, 0x49, 0x3b, 0x420, 0x430, 0x431, 0x438, 0x2bb, 0x20, 0x49, 0x49, 0x3b, 0x408, 0x443, 0x43c, 0x430, 0x434, 0x430,
+0x20, 0x49, 0x3b, 0x408, 0x443, 0x43c, 0x430, 0x434, 0x430, 0x20, 0x49, 0x49, 0x3b, 0x420, 0x430, 0x452, 0x430, 0x431, 0x3b, 0x428,
+0x430, 0x2bb, 0x431, 0x430, 0x43d, 0x3b, 0x420, 0x430, 0x43c, 0x430, 0x434, 0x430, 0x43d, 0x3b, 0x428, 0x430, 0x432, 0x430, 0x43b, 0x3b,
+0x414, 0x443, 0x2bb, 0x43b, 0x2d, 0x41a, 0x438, 0x2bb, 0x434, 0x430, 0x3b, 0x414, 0x443, 0x2bb, 0x43b, 0x2d, 0x445, 0x438, 0x452, 0x430,
+0x41c, 0x443, 0x445, 0x2e, 0x3b, 0x421, 0x430, 0x444, 0x2e, 0x3b, 0x420, 0x435, 0x431, 0x2e, 0x20, 0x31, 0x3b, 0x420, 0x435, 0x431,
+0x2e, 0x20, 0x32, 0x3b, 0x40f, 0x443, 0x43c, 0x2e, 0x20, 0x31, 0x3b, 0x40f, 0x443, 0x43c, 0x2e, 0x20, 0x32, 0x3b, 0x420, 0x435,
+0x45f, 0x2e, 0x3b, 0x428, 0x430, 0x2e, 0x3b, 0x420, 0x430, 0x43c, 0x2e, 0x3b, 0x428, 0x435, 0x2e, 0x3b, 0x417, 0x443, 0x43b, 0x2d,
+0x43a, 0x2e, 0x3b, 0x417, 0x443, 0x43b, 0x2d, 0x445, 0x2e, 0x4d, 0x75, 0x68, 0x61, 0x72, 0x65, 0x6d, 0x3b, 0x53, 0x61, 0x66,
+0x65, 0x72, 0x3b, 0x52, 0x65, 0x62, 0x69, 0x20, 0x31, 0x3b, 0x52, 0x65, 0x62, 0x69, 0x20, 0x32, 0x3b, 0x44, 0x17e, 0x75,
+0x6d, 0x61, 0x64, 0x65, 0x20, 0x31, 0x3b, 0x44, 0x17e, 0x75, 0x6d, 0x61, 0x64, 0x65, 0x20, 0x32, 0x3b, 0x52, 0x65, 0x64,
+0x17e, 0x65, 0x62, 0x3b, 0x160, 0x61, 0x2bb, 0x62, 0x61, 0x6e, 0x3b, 0x52, 0x61, 0x6d, 0x61, 0x7a, 0x61, 0x6e, 0x3b, 0x160,
+0x65, 0x76, 0x61, 0x6c, 0x3b, 0x5a, 0x75, 0x6c, 0x2d, 0x6b, 0x61, 0x64, 0x65, 0x3b, 0x5a, 0x75, 0x6c, 0x2d, 0x68, 0x69,
+0x64, 0x17e, 0x65, 0x4d, 0x75, 0x72, 0x61, 0x68, 0x61, 0x6d, 0x3b, 0x53, 0x61, 0x66, 0x61, 0x72, 0x3b, 0x52, 0x61, 0x62,
+0x69, 0x2bb, 0x20, 0x49, 0x3b, 0x52, 0x61, 0x62, 0x69, 0x2bb, 0x20, 0x49, 0x49, 0x3b, 0x4a, 0x75, 0x6d, 0x61, 0x64, 0x61,
+0x20, 0x49, 0x3b, 0x4a, 0x75, 0x6d, 0x61, 0x64, 0x61, 0x20, 0x49, 0x49, 0x3b, 0x52, 0x61, 0x111, 0x61, 0x62, 0x3b, 0x160,
+0x61, 0x2bb, 0x62, 0x61, 0x6e, 0x3b, 0x52, 0x61, 0x6d, 0x61, 0x64, 0x61, 0x6e, 0x3b, 0x160, 0x61, 0x76, 0x61, 0x6c, 0x3b,
+0x44, 0x75, 0x2bb, 0x6c, 0x2d, 0x4b, 0x69, 0x2bb, 0x64, 0x61, 0x3b, 0x44, 0x75, 0x2bb, 0x6c, 0x2d, 0x68, 0x69, 0x111, 0x61,
+0x4d, 0x75, 0x68, 0x2e, 0x3b, 0x53, 0x61, 0x66, 0x2e, 0x3b, 0x52, 0x65, 0x62, 0x2e, 0x20, 0x31, 0x3b, 0x52, 0x65, 0x62,
+0x2e, 0x20, 0x32, 0x3b, 0x44, 0x17e, 0x75, 0x6d, 0x2e, 0x20, 0x31, 0x3b, 0x44, 0x17e, 0x75, 0x6d, 0x2e, 0x20, 0x32, 0x3b,
+0x52, 0x65, 0x64, 0x17e, 0x2e, 0x3b, 0x160, 0x61, 0x2e, 0x3b, 0x52, 0x61, 0x6d, 0x2e, 0x3b, 0x160, 0x65, 0x2e, 0x3b, 0x5a,
+0x75, 0x6c, 0x2d, 0x6b, 0x2e, 0x3b, 0x5a, 0x75, 0x6c, 0x2d, 0x68, 0x2e, 0x61, 0x6c, 0x2d, 0x6d, 0x75, 0x68, 0x61, 0x72,
+0x72, 0x61, 0x6d, 0x3b, 0x73, 0x61, 0x66, 0x61, 0x72, 0x3b, 0x72, 0x61, 0x62, 0xed, 0xb4, 0x20, 0x61, 0x6c, 0x2d, 0x61,
+0x76, 0x76, 0x61, 0x6c, 0x3b, 0x72, 0x61, 0x62, 0xed, 0xb4, 0x61, 0x74, 0x68, 0x2d, 0x74, 0x68, 0xe1, 0x6e, 0xed, 0x3b,
+0x64, 0x17e, 0x75, 0x6d, 0xe1, 0x64, 0xe1, 0x20, 0x6c, 0x2d, 0xfa, 0x6c, 0xe1, 0x3b, 0x64, 0x17e, 0x75, 0x6d, 0xe1, 0x64,
+0xe1, 0x20, 0x6c, 0x2d, 0xe1, 0x63, 0x68, 0x69, 0x72, 0x61, 0x3b, 0x72, 0x61, 0x64, 0x17e, 0x61, 0x62, 0x3b, 0x161, 0x61,
+0xb4, 0x20, 0x62, 0xe1, 0x6e, 0x3b, 0x72, 0x61, 0x6d, 0x61, 0x64, 0xe1, 0x6e, 0x3b, 0x161, 0x61, 0x75, 0x76, 0xe1, 0x6c,
+0x3b, 0x64, 0x68, 0xfa, 0x20, 0x6c, 0x2d, 0x6b, 0x61, 0xb4, 0x20, 0x64, 0x61, 0x3b, 0x64, 0x68, 0xfa, 0x20, 0x6c, 0x2d,
+0x68, 0x69, 0x64, 0x17e, 0x64, 0x17e, 0x61, 0x6d, 0x75, 0x68, 0x2e, 0x3b, 0x73, 0x61, 0x66, 0x2e, 0x3b, 0x72, 0x61, 0x62,
+0x2e, 0x20, 0x49, 0x3b, 0x72, 0x61, 0x62, 0x2e, 0x20, 0x49, 0x49, 0x3b, 0x64, 0x17e, 0x75, 0x6d, 0x2e, 0x20, 0x49, 0x3b,
+0x64, 0x17e, 0x75, 0x6d, 0x2e, 0x20, 0x49, 0x49, 0x3b, 0x72, 0x61, 0x64, 0x2e, 0x3b, 0x161, 0x61, 0x2e, 0x3b, 0x72, 0x61,
+0x6d, 0x2e, 0x3b, 0x161, 0x61, 0x75, 0x2e, 0x3b, 0x64, 0x68, 0xfa, 0x20, 0x6c, 0x2d, 0x6b, 0x2e, 0x3b, 0x64, 0x68, 0xfa,
+0x20, 0x6c, 0x2d, 0x68, 0x2e, 0x4d, 0x75, 0x78, 0x61, 0x72, 0x72, 0x61, 0x6d, 0x3b, 0x53, 0x61, 0x66, 0x61, 0x72, 0x3b,
+0x52, 0x61, 0x62, 0x69, 0x63, 0x20, 0x61, 0x6c, 0x2d, 0x61, 0x77, 0x77, 0x61, 0x6c, 0x3b, 0x52, 0x61, 0x62, 0x69, 0x63,
+0x20, 0x61, 0x6c, 0x2d, 0x74, 0x68, 0x61, 0x6e, 0x69, 0x3b, 0x4a, 0x75, 0x6d, 0x61, 0x64, 0x61, 0x20, 0x61, 0x6c, 0x2d,
+0x61, 0x77, 0x77, 0x61, 0x6c, 0x3b, 0x6a, 0x75, 0x6d, 0x61, 0x64, 0x61, 0x20, 0x61, 0x6c, 0x2d, 0x74, 0x68, 0x61, 0x6e,
+0x69, 0x3b, 0x52, 0x61, 0x6a, 0x61, 0x62, 0x3b, 0x53, 0x68, 0x61, 0x63, 0x62, 0x61, 0x6e, 0x3b, 0x52, 0x61, 0x6d, 0x61,
+0x64, 0x61, 0x6e, 0x3b, 0x53, 0x68, 0x61, 0x77, 0x77, 0x61, 0x6c, 0x3b, 0x44, 0x75, 0x6c, 0x20, 0x61, 0x6c, 0x2d, 0x71,
+0x61, 0x63, 0x64, 0x61, 0x68, 0x3b, 0x44, 0x75, 0x6c, 0x20, 0x78, 0x69, 0x6a, 0x6a, 0x61, 0x68, 0x4d, 0x75, 0x78, 0x61,
+0x72, 0x72, 0x61, 0x6d, 0x3b, 0x53, 0x61, 0x66, 0x61, 0x72, 0x3b, 0x52, 0x61, 0x62, 0x69, 0x63, 0x20, 0x61, 0x6c, 0x2d,
+0x61, 0x77, 0x77, 0x61, 0x6c, 0x3b, 0x52, 0x61, 0x62, 0x69, 0x63, 0x20, 0x61, 0x6c, 0x2d, 0x74, 0x68, 0x61, 0x6e, 0x69,
+0x3b, 0x4a, 0x75, 0x6d, 0x61, 0x64, 0x61, 0x20, 0x61, 0x6c, 0x2d, 0x61, 0x77, 0x77, 0x61, 0x6c, 0x3b, 0x6a, 0x75, 0x6d,
+0x61, 0x64, 0x61, 0x20, 0x61, 0x6c, 0x2d, 0x74, 0x68, 0x61, 0x6e, 0x69, 0x3b, 0x52, 0x61, 0x6a, 0x61, 0x62, 0x3b, 0x53,
+0x68, 0x61, 0x63, 0x62, 0x61, 0x6e, 0x3b, 0x52, 0x61, 0x6d, 0x61, 0x64, 0x61, 0x6e, 0x3b, 0x53, 0x68, 0x61, 0x77, 0x77,
+0x61, 0x6c, 0x3b, 0x44, 0x75, 0x6c, 0x20, 0x61, 0x6c, 0x2d, 0x71, 0x61, 0x63, 0x64, 0x61, 0x3b, 0x44, 0x75, 0x6c, 0x20,
+0x78, 0x69, 0x6a, 0x6a, 0x61, 0x68, 0x4d, 0x75, 0x78, 0x2e, 0x3b, 0x53, 0x61, 0x66, 0x2e, 0x3b, 0x52, 0x61, 0x62, 0x2e,
+0x20, 0x49, 0x3b, 0x52, 0x61, 0x62, 0x2e, 0x20, 0x49, 0x49, 0x3b, 0x4a, 0x75, 0x6d, 0x2e, 0x20, 0x49, 0x3b, 0x4a, 0x75,
+0x6d, 0x2e, 0x20, 0x49, 0x49, 0x3b, 0x52, 0x61, 0x6a, 0x2e, 0x3b, 0x53, 0x68, 0x61, 0x2e, 0x3b, 0x52, 0x61, 0x6d, 0x2e,
+0x3b, 0x53, 0x68, 0x61, 0x77, 0x2e, 0x3b, 0x44, 0x75, 0x6c, 0x2d, 0x51, 0x2e, 0x3b, 0x44, 0x75, 0x6c, 0x2d, 0x58, 0x2e,
+0x4d, 0x75, 0x78, 0x2e, 0x3b, 0x53, 0x61, 0x66, 0x2e, 0x3b, 0x52, 0x61, 0x62, 0x2e, 0x20, 0x49, 0x3b, 0x52, 0x61, 0x62,
+0x2e, 0x20, 0x49, 0x49, 0x3b, 0x4a, 0x75, 0x6d, 0x2e, 0x20, 0x49, 0x3b, 0x4a, 0x75, 0x6d, 0x2e, 0x20, 0x49, 0x49, 0x3b,
+0x52, 0x61, 0x6a, 0x2e, 0x3b, 0x53, 0x68, 0x61, 0x2e, 0x3b, 0x52, 0x61, 0x6d, 0x2e, 0x3b, 0x53, 0x68, 0x61, 0x77, 0x2e,
+0x3b, 0x44, 0x68, 0x75, 0x2bb, 0x6c, 0x2d, 0x51, 0x2e, 0x3b, 0x44, 0x68, 0x75, 0x2bb, 0x6c, 0x2d, 0x48, 0x2e, 0x6d, 0x75,
+0x68, 0x61, 0x72, 0x72, 0x61, 0x6d, 0x3b, 0x73, 0x61, 0x66, 0x61, 0x72, 0x3b, 0x72, 0x61, 0x62, 0x69, 0x2bb, 0x20, 0x49,
+0x3b, 0x72, 0x61, 0x62, 0x69, 0x2bb, 0x20, 0x49, 0x49, 0x3b, 0x6a, 0x75, 0x6d, 0x61, 0x64, 0x61, 0x20, 0x49, 0x3b, 0x6a,
+0x75, 0x6d, 0x61, 0x64, 0x61, 0x20, 0x49, 0x49, 0x3b, 0x72, 0x61, 0x6a, 0x61, 0x62, 0x3b, 0x73, 0x68, 0x61, 0x2bb, 0x62,
+0x61, 0x6e, 0x3b, 0x72, 0x61, 0x6d, 0x61, 0x64, 0xe1, 0x6e, 0x3b, 0x73, 0x68, 0x61, 0x77, 0x77, 0x61, 0x6c, 0x3b, 0x64,
+0x68, 0x75, 0x2bb, 0x6c, 0x2d, 0x71, 0x69, 0x2bb, 0x64, 0x61, 0x68, 0x3b, 0x64, 0x68, 0x75, 0x2bb, 0x6c, 0x2d, 0x68, 0x69,
+0x6a, 0x6a, 0x61, 0x68, 0x4d, 0x75, 0x68, 0x61, 0x72, 0x72, 0x61, 0x6d, 0x3b, 0x53, 0x61, 0x66, 0x61, 0x72, 0x3b, 0x52,
+0x61, 0x62, 0x69, 0x2019, 0x20, 0x61, 0x6c, 0x2d, 0x61, 0x77, 0x77, 0x61, 0x6c, 0x3b, 0x52, 0x61, 0x62, 0x69, 0x2019, 0x20,
+0x61, 0x6c, 0x2d, 0x61, 0x6b, 0x68, 0x69, 0x72, 0x3b, 0x4a, 0x75, 0x6d, 0x61, 0x64, 0x61, 0x2d, 0x6c, 0x2d, 0x75, 0x6c,
+0x61, 0x3b, 0x4a, 0x75, 0x6d, 0x61, 0x64, 0x61, 0x2d, 0x6c, 0x2d, 0x61, 0x6b, 0x68, 0x69, 0x72, 0x61, 0x3b, 0x52, 0x61,
+0x6a, 0x61, 0x62, 0x3b, 0x53, 0x68, 0x61, 0x2019, 0x62, 0x61, 0x6e, 0x3b, 0x52, 0x61, 0x6d, 0x61, 0x64, 0x61, 0x6e, 0x3b,
+0x53, 0x68, 0x61, 0x77, 0x77, 0x61, 0x6c, 0x3b, 0x44, 0x68, 0x75, 0x2d, 0x6c, 0x2d, 0x67, 0x61, 0x2019, 0x64, 0x61, 0x3b,
+0x44, 0x68, 0x75, 0x2d, 0x6c, 0x2d, 0x68, 0x69, 0x6a, 0x6a, 0x61, 0x6d, 0x75, 0x68, 0x61, 0x72, 0x72, 0x61, 0x6d, 0x3b,
+0x73, 0x61, 0x66, 0x61, 0x72, 0x3b, 0x72, 0x61, 0x62, 0x69, 0x2019, 0x20, 0x61, 0x6c, 0x2d, 0x61, 0x77, 0x77, 0x61, 0x6c,
+0x3b, 0x72, 0x61, 0x62, 0x69, 0x2019, 0x20, 0x61, 0x6c, 0x2d, 0x61, 0x6b, 0x68, 0x69, 0x72, 0x3b, 0x6a, 0x75, 0x6d, 0x61,
+0x64, 0x61, 0x2d, 0x6c, 0x2d, 0x75, 0x6c, 0x61, 0x3b, 0x6a, 0x75, 0x6d, 0x61, 0x64, 0x61, 0x2d, 0x6c, 0x2d, 0x61, 0x6b,
+0x68, 0x69, 0x72, 0x61, 0x3b, 0x72, 0x61, 0x6a, 0x61, 0x62, 0x3b, 0x73, 0x68, 0x61, 0x2019, 0x62, 0x61, 0x6e, 0x3b, 0x72,
+0x61, 0x6d, 0x61, 0x64, 0x61, 0x6e, 0x3b, 0x73, 0x68, 0x61, 0x77, 0x77, 0x61, 0x6c, 0x3b, 0x64, 0x68, 0x75, 0x2d, 0x6c,
+0x2d, 0x67, 0x61, 0x2019, 0x64, 0x61, 0x3b, 0x64, 0x68, 0x75, 0x2d, 0x6c, 0x2d, 0x68, 0x69, 0x6a, 0x6a, 0x61, 0x43c, 0x443,
+0x4b3, 0x430, 0x440, 0x440, 0x430, 0x43c, 0x3b, 0x441, 0x430, 0x444, 0x430, 0x440, 0x3b, 0x420, 0x430, 0x431, 0x435, 0x44a, 0x20, 0x49,
+0x3b, 0x420, 0x430, 0x431, 0x435, 0x44a, 0x20, 0x49, 0x49, 0x3b, 0x4b7, 0x438, 0x43c, 0x43e, 0x434, 0x438, 0x2d, 0x443, 0x43b, 0x2d,
+0x443, 0x43b, 0x43e, 0x3b, 0x4b7, 0x438, 0x43c, 0x43e, 0x434, 0x438, 0x2d, 0x443, 0x43b, 0x2d, 0x441, 0x43e, 0x43d, 0x438, 0x3b, 0x440,
+0x430, 0x4b7, 0x430, 0x431, 0x3b, 0x428, 0x430, 0x431, 0x430, 0x43d, 0x3b, 0x420, 0x430, 0x43c, 0x430, 0x434, 0x430, 0x43d, 0x3b, 0x428,
+0x430, 0x432, 0x432, 0x430, 0x43b, 0x3b, 0x414, 0x445, 0x443, 0x43b, 0x2d, 0x49a, 0x438, 0x434, 0x430, 0x4b3, 0x3b, 0x414, 0x445, 0x443,
+0x43b, 0x2d, 0x4b2, 0x438, 0x4b7, 0x4b7, 0x430, 0x4b3, 0x43c, 0x443, 0x4b3, 0x430, 0x440, 0x440, 0x430, 0x43c, 0x3b, 0x441, 0x430, 0x444,
+0x430, 0x440, 0x3b, 0x420, 0x430, 0x431, 0x435, 0x44a, 0x20, 0x49, 0x3b, 0x420, 0x430, 0x431, 0x435, 0x44a, 0x20, 0x49, 0x49, 0x3b,
+0x4b7, 0x438, 0x43c, 0x43e, 0x434, 0x438, 0x2d, 0x443, 0x43b, 0x2d, 0x443, 0x43b, 0x43e, 0x3b, 0x4b7, 0x438, 0x43c, 0x43e, 0x434, 0x438,
+0x2d, 0x443, 0x43b, 0x2d, 0x441, 0x43e, 0x43d, 0x438, 0x3b, 0x440, 0x430, 0x4b7, 0x430, 0x431, 0x3b, 0x428, 0x430, 0x431, 0x430, 0x43d,
+0x3b, 0x420, 0x430, 0x43c, 0x430, 0x434, 0x430, 0x43d, 0x3b, 0x428, 0x430, 0x432, 0x432, 0x430, 0x43b, 0x3b, 0x414, 0x445, 0x443, 0x442,
+0x2d, 0x49a, 0x438, 0x434, 0x430, 0x4b3, 0x3b, 0x414, 0x445, 0x443, 0x442, 0x2d, 0x4b2, 0x438, 0x4b7, 0x4b7, 0x430, 0x4b3, 0x41c, 0x443,
 0x4b3, 0x2e, 0x3b, 0x421, 0x430, 0x444, 0x2e, 0x3b, 0x420, 0x430, 0x431, 0x2e, 0x20, 0x49, 0x3b, 0x420, 0x430, 0x431, 0x2e, 0x20,
 0x49, 0x49, 0x3b, 0x4b6, 0x443, 0x43c, 0x2e, 0x20, 0x49, 0x3b, 0x4b6, 0x443, 0x43c, 0x2e, 0x20, 0x49, 0x49, 0x3b, 0x420, 0x430,
 0x4b7, 0x2e, 0x3b, 0x428, 0x430, 0x2e, 0x3b, 0x420, 0x430, 0x43c, 0x2e, 0x3b, 0x428, 0x430, 0x432, 0x2e, 0x3b, 0x414, 0x445, 0x443,
-0x43b, 0x2d, 0x49a, 0x2e, 0x3b, 0x414, 0x445, 0x443, 0x43b, 0x2d, 0x4b2, 0x2e, 0x3b, 0x43c, 0x443, 0x4b3, 0x430, 0x440, 0x440, 0x430,
-0x43c, 0x3b, 0x441, 0x430, 0x444, 0x430, 0x440, 0x3b, 0x420, 0x430, 0x431, 0x435, 0x44a, 0x20, 0x49, 0x3b, 0x420, 0x430, 0x431, 0x435,
-0x44a, 0x20, 0x49, 0x49, 0x3b, 0x4b7, 0x438, 0x43c, 0x43e, 0x434, 0x438, 0x2d, 0x443, 0x43b, 0x2d, 0x443, 0x43b, 0x43e, 0x3b, 0x4b7,
-0x438, 0x43c, 0x43e, 0x434, 0x438, 0x2d, 0x443, 0x43b, 0x2d, 0x441, 0x43e, 0x43d, 0x438, 0x3b, 0x440, 0x430, 0x4b7, 0x430, 0x431, 0x3b,
-0x428, 0x430, 0x431, 0x430, 0x43d, 0x3b, 0x420, 0x430, 0x43c, 0x430, 0x434, 0x430, 0x43d, 0x3b, 0x428, 0x430, 0x432, 0x432, 0x430, 0x43b,
-0x3b, 0x414, 0x445, 0x443, 0x43b, 0x2d, 0x49a, 0x438, 0x434, 0x430, 0x4b3, 0x3b, 0x414, 0x445, 0x443, 0x43b, 0x2d, 0x4b2, 0x438, 0x4b7,
-0x4b7, 0x430, 0x4b3, 0x3b, 0x43c, 0x443, 0x4b3, 0x430, 0x440, 0x440, 0x430, 0x43c, 0x3b, 0x441, 0x430, 0x444, 0x430, 0x440, 0x3b, 0x420,
-0x430, 0x431, 0x435, 0x44a, 0x20, 0x49, 0x3b, 0x420, 0x430, 0x431, 0x435, 0x44a, 0x20, 0x49, 0x49, 0x3b, 0x4b7, 0x438, 0x43c, 0x43e,
-0x434, 0x438, 0x2d, 0x443, 0x43b, 0x2d, 0x443, 0x43b, 0x43e, 0x3b, 0x4b7, 0x438, 0x43c, 0x43e, 0x434, 0x438, 0x2d, 0x443, 0x43b, 0x2d,
-0x441, 0x43e, 0x43d, 0x438, 0x3b, 0x440, 0x430, 0x4b7, 0x430, 0x431, 0x3b, 0x428, 0x430, 0x431, 0x430, 0x43d, 0x3b, 0x420, 0x430, 0x43c,
-0x430, 0x434, 0x430, 0x43d, 0x3b, 0x428, 0x430, 0x432, 0x432, 0x430, 0x43b, 0x3b, 0x414, 0x445, 0x443, 0x442, 0x2d, 0x49a, 0x438, 0x434,
-0x430, 0x4b3, 0x3b, 0x414, 0x445, 0x443, 0x442, 0x2d, 0x4b2, 0x438, 0x4b7, 0x4b7, 0x430, 0x4b3, 0x3b, 0xbae, 0xbc1, 0xbb9, 0x2e, 0x3b,
-0xb9a, 0xb83, 0xbaa, 0x2e, 0x3b, 0xbb0, 0xbaa, 0xbbf, 0x20, 0x31, 0x3b, 0xbb0, 0xbaa, 0xbbf, 0x20, 0x32, 0x3b, 0xb9c, 0xbc1, 0xbae,
-0x2e, 0x20, 0x31, 0x3b, 0xb9c, 0xbc1, 0xbae, 0x2e, 0x20, 0x32, 0x3b, 0xbb0, 0xb9c, 0x2e, 0x3b, 0xbb7, 0xb83, 0x2e, 0x3b, 0xbb0,
-0xbae, 0x2e, 0x3b, 0xbb7, 0xbb5, 0xbcd, 0x2e, 0x3b, 0xba4, 0xbc1, 0xbb2, 0xbcd, 0x20, 0xb95, 0xb83, 0x2e, 0x3b, 0xba4, 0xbc1, 0xbb2,
-0xbcd, 0x20, 0xbb9, 0xbbf, 0xb9c, 0xbcd, 0x2e, 0x3b, 0xbae, 0xbc1, 0xbb9, 0xbb0, 0xbcd, 0xbb0, 0xbae, 0xbcd, 0x3b, 0xb9a, 0xb83, 0xbaa,
-0xbb0, 0xbcd, 0x3b, 0xbb0, 0xbaa, 0xbbf, 0x20, 0x31, 0x3b, 0xbb0, 0xbaa, 0xbbf, 0x20, 0x32, 0x3b, 0xb9c, 0xbc1, 0xbae, 0xba4, 0xbbe,
-0x20, 0x31, 0x3b, 0xb9c, 0xbc1, 0xbae, 0xba4, 0xbbe, 0x20, 0x32, 0x3b, 0xbb0, 0xb9c, 0xbaa, 0xbcd, 0x3b, 0xbb7, 0xb83, 0xbaa, 0xbbe,
-0xba9, 0xbcd, 0x3b, 0xbb0, 0xbae, 0xbb2, 0xbbe, 0xba9, 0xbcd, 0x3b, 0xbb7, 0xbb5, 0xbcd, 0xbb5, 0xbbe, 0xbb2, 0xbcd, 0x3b, 0xba4, 0xbc1,
-0xbb2, 0xbcd, 0x20, 0xb95, 0xb83, 0xba4, 0xbbe, 0x3b, 0xba4, 0xbc1, 0xbb2, 0xbcd, 0x20, 0xbb9, 0xbbf, 0xb9c, 0xbcd, 0xb9c, 0xbbe, 0x3b,
-0xc2e, 0xc41, 0xc39, 0x2e, 0x3b, 0xc38, 0xc2b, 0x2e, 0x3b, 0xc30, 0x2e, 0x20, 0x49, 0x3b, 0xc30, 0x2e, 0x20, 0x49, 0x49, 0x3b,
-0xc1c, 0xc41, 0xc2e, 0x2e, 0x20, 0x49, 0x3b, 0xc1c, 0xc41, 0xc2e, 0x2e, 0x20, 0x49, 0x49, 0x3b, 0xc30, 0xc1c, 0x2e, 0x3b, 0xc37,
-0xc2c, 0xc3e, 0x2e, 0x3b, 0xc30, 0xc02, 0xc1c, 0xc3e, 0x2e, 0x3b, 0xc37, 0xc35, 0xc4d, 0xc35, 0xc3e, 0x2e, 0x3b, 0xc27, 0xc41, 0xc32,
-0xc4d, 0x2d, 0xc15, 0xc3f, 0x2e, 0x3b, 0xc27, 0xc41, 0xc32, 0xc4d, 0x2d, 0xc39, 0xc3f, 0x2e, 0x3b, 0xc2e, 0xc41, 0xc39, 0xc30, 0xc4d,
+0x43b, 0x2d, 0x49a, 0x2e, 0x3b, 0x414, 0x445, 0x443, 0x43b, 0x2d, 0x4b2, 0x2e, 0xbae, 0xbc1, 0xbb9, 0xbb0, 0xbcd, 0xbb0, 0xbae, 0xbcd,
+0x3b, 0xb9a, 0xb83, 0xbaa, 0xbb0, 0xbcd, 0x3b, 0xbb0, 0xbaa, 0xbbf, 0x20, 0x31, 0x3b, 0xbb0, 0xbaa, 0xbbf, 0x20, 0x32, 0x3b, 0xb9c,
+0xbc1, 0xbae, 0xba4, 0xbbe, 0x20, 0x31, 0x3b, 0xb9c, 0xbc1, 0xbae, 0xba4, 0xbbe, 0x20, 0x32, 0x3b, 0xbb0, 0xb9c, 0xbaa, 0xbcd, 0x3b,
+0xbb7, 0xb83, 0xbaa, 0xbbe, 0xba9, 0xbcd, 0x3b, 0xbb0, 0xbae, 0xbb2, 0xbbe, 0xba9, 0xbcd, 0x3b, 0xbb7, 0xbb5, 0xbcd, 0xbb5, 0xbbe, 0xbb2,
+0xbcd, 0x3b, 0xba4, 0xbc1, 0xbb2, 0xbcd, 0x20, 0xb95, 0xb83, 0xba4, 0xbbe, 0x3b, 0xba4, 0xbc1, 0xbb2, 0xbcd, 0x20, 0xbb9, 0xbbf, 0xb9c,
+0xbcd, 0xb9c, 0xbbe, 0xbae, 0xbc1, 0xbb9, 0x2e, 0x3b, 0xb9a, 0xb83, 0xbaa, 0x2e, 0x3b, 0xbb0, 0xbaa, 0xbbf, 0x20, 0x31, 0x3b, 0xbb0,
+0xbaa, 0xbbf, 0x20, 0x32, 0x3b, 0xb9c, 0xbc1, 0xbae, 0x2e, 0x20, 0x31, 0x3b, 0xb9c, 0xbc1, 0xbae, 0x2e, 0x20, 0x32, 0x3b, 0xbb0,
+0xb9c, 0x2e, 0x3b, 0xbb7, 0xb83, 0x2e, 0x3b, 0xbb0, 0xbae, 0x2e, 0x3b, 0xbb7, 0xbb5, 0xbcd, 0x2e, 0x3b, 0xba4, 0xbc1, 0xbb2, 0xbcd,
+0x20, 0xb95, 0xb83, 0x2e, 0x3b, 0xba4, 0xbc1, 0xbb2, 0xbcd, 0x20, 0xbb9, 0xbbf, 0xb9c, 0xbcd, 0x2e, 0xc2e, 0xc41, 0xc39, 0xc30, 0xc4d,
 0xc30, 0xc02, 0x3b, 0xc38, 0xc2b, 0xc30, 0xc4d, 0x3b, 0xc30, 0xc2c, 0xc40, 0x20, 0x49, 0x3b, 0xc30, 0xc2c, 0xc40, 0x20, 0x49, 0x49,
 0x3b, 0xc1c, 0xc41, 0xc2e, 0xc26, 0xc3e, 0x20, 0x49, 0x3b, 0xc1c, 0xc41, 0xc2e, 0xc26, 0xc3e, 0x20, 0x49, 0x49, 0x3b, 0xc30, 0xc1c,
 0xc2c, 0xc4d, 0x3b, 0xc37, 0xc2c, 0xc3e, 0xc28, 0xc4d, 0x3b, 0xc30, 0xc02, 0xc1c, 0xc3e, 0xc28, 0xc4d, 0x3b, 0xc37, 0xc35, 0xc4d, 0xc35,
 0xc3e, 0xc32, 0xc4d, 0x3b, 0xc27, 0xc41, 0xc32, 0xc4d, 0x2d, 0xc15, 0xc3f, 0x20, 0xc26, 0xc3e, 0xc39, 0xc4d, 0x3b, 0xc27, 0xc41, 0xc32,
-0xc4d, 0x2d, 0xc39, 0xc3f, 0xc1c, 0xc4d, 0xc1c, 0xc3e, 0xc39, 0xc4d, 0x3b, 0xe21, 0xe38, 0xe2e, 0xe31, 0xe23, 0x2e, 0x3b, 0xe40, 0xe28,
-0xe32, 0xe30, 0x2e, 0x3b, 0xe23, 0xe2d, 0xe1a, 0xe35, 0x20, 0x49, 0x3b, 0xe23, 0xe2d, 0xe1a, 0xe35, 0x20, 0x49, 0x49, 0x3b, 0xe08,
-0xe38, 0xe21, 0xe32, 0xe14, 0xe32, 0x20, 0x49, 0x3b, 0xe08, 0xe38, 0xe21, 0xe32, 0xe14, 0xe32, 0x20, 0x49, 0x49, 0x3b, 0xe40, 0xe23,
-0xe32, 0xe30, 0x2e, 0x3b, 0xe0a, 0xe30, 0xe2d, 0xe4c, 0x2e, 0x3b, 0xe40, 0xe23, 0xe32, 0xe30, 0xe21, 0xe30, 0x2e, 0x3b, 0xe40, 0xe0a,
-0xe32, 0xe27, 0x2e, 0x3b, 0xe0b, 0xe38, 0xe25, 0xe01, 0xe34, 0xe2d, 0xe3a, 0x2e, 0x3b, 0xe0b, 0xe38, 0xe25, 0xe2b, 0xe34, 0xe08, 0x2e,
-0x3b, 0xe21, 0xe38, 0xe2e, 0xe30, 0xe23, 0xe4c, 0xe23, 0xe2d, 0xe21, 0x3b, 0xe0b, 0xe2d, 0xe1f, 0xe32, 0xe23, 0xe4c, 0x3b, 0xe23, 0xe2d,
-0xe1a, 0xe35, 0x20, 0x49, 0x3b, 0xe23, 0xe2d, 0xe1a, 0xe35, 0x20, 0x49, 0x49, 0x3b, 0xe08, 0xe38, 0xe21, 0xe32, 0xe14, 0xe32, 0x20,
-0x49, 0x3b, 0xe08, 0xe38, 0xe21, 0xe32, 0xe14, 0xe32, 0x20, 0x49, 0x49, 0x3b, 0xe23, 0xe2d, 0xe08, 0xe31, 0xe1a, 0x3b, 0xe0a, 0xe30,
-0xe2d, 0xe30, 0xe1a, 0xe32, 0xe19, 0x3b, 0xe23, 0xe2d, 0xe21, 0xe30, 0xe14, 0xe2d, 0xe19, 0x3b, 0xe40, 0xe0a, 0xe32, 0xe27, 0xe31, 0xe25,
-0x3b, 0xe0b, 0xe38, 0xe25, 0xe01, 0xe34, 0xe2d, 0xe3a, 0xe14, 0xe30, 0xe2e, 0xe3a, 0x3b, 0xe0b, 0xe38, 0xe25, 0xe2b, 0xe34, 0xe08, 0xe0d,
-0xe30, 0xe2e, 0xe3a, 0x3b, 0x4d, 0x75, 0x68, 0x61, 0x72, 0x2e, 0x3b, 0x53, 0x61, 0x66, 0x65, 0x72, 0x3b, 0x52, 0x2e, 0x65,
-0x76, 0x76, 0x65, 0x6c, 0x3b, 0x52, 0x2e, 0x61, 0x68, 0x69, 0x72, 0x3b, 0x43, 0x2e, 0x65, 0x76, 0x76, 0x65, 0x6c, 0x3b,
-0x43, 0x2e, 0x61, 0x68, 0x69, 0x72, 0x3b, 0x52, 0x65, 0x63, 0x65, 0x70, 0x3b, 0x15e, 0x61, 0x62, 0x61, 0x6e, 0x3b, 0x52,
-0x61, 0x6d, 0x2e, 0x3b, 0x15e, 0x65, 0x76, 0x76, 0x61, 0x6c, 0x3b, 0x5a, 0x69, 0x6c, 0x6b, 0x61, 0x64, 0x65, 0x3b, 0x5a,
-0x69, 0x6c, 0x68, 0x69, 0x63, 0x63, 0x65, 0x3b, 0x4d, 0x75, 0x68, 0x61, 0x72, 0x72, 0x65, 0x6d, 0x3b, 0x53, 0x61, 0x66,
-0x65, 0x72, 0x3b, 0x52, 0x65, 0x62, 0x69, 0xfc, 0x6c, 0x65, 0x76, 0x76, 0x65, 0x6c, 0x3b, 0x52, 0x65, 0x62, 0x69, 0xfc,
-0x6c, 0x61, 0x68, 0x69, 0x72, 0x3b, 0x43, 0x65, 0x6d, 0x61, 0x7a, 0x69, 0x79, 0x65, 0x6c, 0x65, 0x76, 0x76, 0x65, 0x6c,
-0x3b, 0x43, 0x65, 0x6d, 0x61, 0x7a, 0x69, 0x79, 0x65, 0x6c, 0x61, 0x68, 0x69, 0x72, 0x3b, 0x52, 0x65, 0x63, 0x65, 0x70,
-0x3b, 0x15e, 0x61, 0x62, 0x61, 0x6e, 0x3b, 0x52, 0x61, 0x6d, 0x61, 0x7a, 0x61, 0x6e, 0x3b, 0x15e, 0x65, 0x76, 0x76, 0x61,
-0x6c, 0x3b, 0x5a, 0x69, 0x6c, 0x6b, 0x61, 0x64, 0x65, 0x3b, 0x5a, 0x69, 0x6c, 0x68, 0x69, 0x63, 0x63, 0x65, 0x3b, 0x645,
-0x6c7, 0x6be, 0x6d5, 0x631, 0x631, 0x6d5, 0x645, 0x3b, 0x633, 0x6d5, 0x67e, 0x6d5, 0x631, 0x3b, 0x631, 0x6d5, 0x628, 0x649, 0x626, 0x6c7,
-0x644, 0x626, 0x6d5, 0x6cb, 0x6cb, 0x6d5, 0x644, 0x3b, 0x631, 0x6d5, 0x628, 0x649, 0x626, 0x6c7, 0x644, 0x626, 0x627, 0x62e, 0x649, 0x631,
-0x3b, 0x62c, 0x6d5, 0x645, 0x627, 0x62f, 0x649, 0x64a, 0x6d5, 0x644, 0x626, 0x6d5, 0x6cb, 0x6cb, 0x6d5, 0x644, 0x3b, 0x62c, 0x6d5, 0x645,
-0x627, 0x62f, 0x649, 0x64a, 0x6d5, 0x644, 0x626, 0x627, 0x62e, 0x649, 0x631, 0x3b, 0x631, 0x6d5, 0x62c, 0x6d5, 0x628, 0x3b, 0x634, 0x6d5,
-0x626, 0x628, 0x627, 0x646, 0x3b, 0x631, 0x627, 0x645, 0x649, 0x632, 0x627, 0x646, 0x3b, 0x634, 0x6d5, 0x6cb, 0x6cb, 0x627, 0x644, 0x3b,
-0x632, 0x6c7, 0x644, 0x642, 0x6d5, 0x626, 0x62f, 0x6d5, 0x3b, 0x632, 0x6c7, 0x644, 0x6be, 0x6d5, 0x62c, 0x62c, 0x6d5, 0x3b, 0x43c, 0x443,
-0x445, 0x3b, 0x441, 0x430, 0x444, 0x3b, 0x440, 0x430, 0x431, 0x456, 0x20, 0x49, 0x3b, 0x440, 0x430, 0x431, 0x456, 0x20, 0x49, 0x49,
-0x3b, 0x434, 0x436, 0x443, 0x43c, 0x20, 0x49, 0x3b, 0x434, 0x436, 0x443, 0x43c, 0x20, 0x49, 0x49, 0x3b, 0x440, 0x430, 0x434, 0x436,
-0x3b, 0x448, 0x430, 0x430, 0x431, 0x3b, 0x440, 0x430, 0x43c, 0x3b, 0x434, 0x430, 0x432, 0x3b, 0x437, 0x443, 0x2d, 0x43b, 0x44c, 0x2d,
-0x43a, 0x3b, 0x437, 0x443, 0x2d, 0x43b, 0x44c, 0x2d, 0x445, 0x3b, 0x43c, 0x443, 0x445, 0x430, 0x440, 0x440, 0x430, 0x43c, 0x3b, 0x441,
-0x430, 0x444, 0x430, 0x440, 0x3b, 0x440, 0x430, 0x431, 0x456, 0x20, 0x49, 0x3b, 0x440, 0x430, 0x431, 0x456, 0x20, 0x49, 0x49, 0x3b,
-0x434, 0x436, 0x443, 0x43c, 0x430, 0x434, 0x430, 0x20, 0x49, 0x3b, 0x434, 0x436, 0x443, 0x43c, 0x430, 0x434, 0x430, 0x20, 0x49, 0x49,
-0x3b, 0x440, 0x430, 0x434, 0x436, 0x430, 0x431, 0x3b, 0x448, 0x430, 0x430, 0x431, 0x430, 0x43d, 0x3b, 0x440, 0x430, 0x43c, 0x430, 0x434,
-0x430, 0x43d, 0x3b, 0x434, 0x430, 0x432, 0x432, 0x430, 0x43b, 0x3b, 0x437, 0x443, 0x2d, 0x43b, 0x44c, 0x2d, 0x43a, 0x430, 0x430, 0x434,
-0x430, 0x3b, 0x437, 0x443, 0x2d, 0x43b, 0x44c, 0x2d, 0x445, 0x456, 0x434, 0x436, 0x430, 0x3b, 0x43c, 0x443, 0x445, 0x2e, 0x3b, 0x441,
-0x430, 0x444, 0x2e, 0x3b, 0x440, 0x430, 0x431, 0x456, 0x20, 0x49, 0x3b, 0x440, 0x430, 0x431, 0x456, 0x20, 0x49, 0x49, 0x3b, 0x434,
-0x436, 0x443, 0x43c, 0x2e, 0x20, 0x49, 0x3b, 0x434, 0x436, 0x443, 0x43c, 0x2e, 0x20, 0x49, 0x49, 0x3b, 0x440, 0x430, 0x434, 0x436,
-0x2e, 0x3b, 0x448, 0x430, 0x430, 0x431, 0x2e, 0x3b, 0x440, 0x430, 0x43c, 0x2e, 0x3b, 0x434, 0x430, 0x432, 0x2e, 0x3b, 0x437, 0x443,
-0x2d, 0x43b, 0x44c, 0x2d, 0x43a, 0x2e, 0x3b, 0x437, 0x443, 0x2d, 0x43b, 0x44c, 0x2d, 0x445, 0x2e, 0x3b, 0x645, 0x62d, 0x631, 0x645,
-0x3b, 0x635, 0x641, 0x631, 0x3b, 0x631, 0x628, 0x6cc, 0x639, 0x20, 0x627, 0x644, 0x627, 0x648, 0x651, 0x644, 0x3b, 0x631, 0x628, 0x6cc,
-0x639, 0x20, 0x627, 0x644, 0x62b, 0x651, 0x627, 0x646, 0x6cc, 0x3b, 0x62c, 0x645, 0x627, 0x62f, 0x6cc, 0x20, 0x627, 0x644, 0x627, 0x648,
-0x651, 0x644, 0x3b, 0x62c, 0x645, 0x627, 0x62f, 0x6cc, 0x20, 0x627, 0x644, 0x62b, 0x651, 0x627, 0x646, 0x6cc, 0x3b, 0x631, 0x62c, 0x628,
-0x3b, 0x634, 0x639, 0x628, 0x627, 0x646, 0x3b, 0x631, 0x645, 0x636, 0x627, 0x646, 0x3b, 0x634, 0x648, 0x627, 0x644, 0x3b, 0x630, 0x648,
-0x627, 0x644, 0x642, 0x639, 0x62f, 0x6c3, 0x3b, 0x630, 0x648, 0x627, 0x644, 0x62d, 0x62c, 0x6c3, 0x3b, 0x645, 0x62d, 0x631, 0x645, 0x3b,
-0x635, 0x641, 0x631, 0x3b, 0x631, 0x20, 0x628, 0x6cc, 0x639, 0x20, 0x627, 0x644, 0x627, 0x648, 0x644, 0x3b, 0x631, 0x20, 0x628, 0x6cc,
-0x639, 0x20, 0x627, 0x644, 0x62b, 0x627, 0x646, 0x6cc, 0x3b, 0x62c, 0x645, 0x627, 0x62f, 0x6cc, 0x20, 0x627, 0x644, 0x627, 0x648, 0x644,
-0x3b, 0x62c, 0x645, 0x627, 0x62f, 0x6cc, 0x20, 0x627, 0x644, 0x62b, 0x627, 0x646, 0x6cc, 0x3b, 0x631, 0x62c, 0x628, 0x3b, 0x634, 0x639,
-0x628, 0x627, 0x646, 0x3b, 0x631, 0x645, 0x636, 0x627, 0x646, 0x3b, 0x634, 0x648, 0x627, 0x644, 0x3b, 0x630, 0x648, 0x627, 0x644, 0x642,
-0x639, 0x62f, 0x6c3, 0x3b, 0x630, 0x648, 0x627, 0x644, 0x62d, 0x62c, 0x6c3, 0x3b, 0x4d, 0x75, 0x68, 0x2e, 0x3b, 0x53, 0x61, 0x66,
-0x2e, 0x3b, 0x52, 0x6f, 0x62, 0x2e, 0x20, 0x61, 0x76, 0x76, 0x2e, 0x3b, 0x52, 0x6f, 0x62, 0x2e, 0x20, 0x6f, 0x78, 0x2e,
-0x3b, 0x4a, 0x75, 0x6d, 0x2e, 0x20, 0x61, 0x76, 0x76, 0x2e, 0x3b, 0x4a, 0x75, 0x6d, 0x2e, 0x20, 0x6f, 0x78, 0x2e, 0x3b,
-0x52, 0x61, 0x6a, 0x2e, 0x3b, 0x53, 0x68, 0x61, 0x2e, 0x3b, 0x52, 0x61, 0x6d, 0x2e, 0x3b, 0x53, 0x68, 0x61, 0x76, 0x2e,
-0x3b, 0x5a, 0x75, 0x6c, 0x2d, 0x71, 0x2e, 0x3b, 0x5a, 0x75, 0x6c, 0x2d, 0x68, 0x2e, 0x3b, 0x4d, 0x75, 0x68, 0x61, 0x72,
+0xc4d, 0x2d, 0xc39, 0xc3f, 0xc1c, 0xc4d, 0xc1c, 0xc3e, 0xc39, 0xc4d, 0xc2e, 0xc41, 0xc39, 0x2e, 0x3b, 0xc38, 0xc2b, 0x2e, 0x3b, 0xc30,
+0x2e, 0x20, 0x49, 0x3b, 0xc30, 0x2e, 0x20, 0x49, 0x49, 0x3b, 0xc1c, 0xc41, 0xc2e, 0x2e, 0x20, 0x49, 0x3b, 0xc1c, 0xc41, 0xc2e,
+0x2e, 0x20, 0x49, 0x49, 0x3b, 0xc30, 0xc1c, 0x2e, 0x3b, 0xc37, 0xc2c, 0xc3e, 0x2e, 0x3b, 0xc30, 0xc02, 0xc1c, 0xc3e, 0x2e, 0x3b,
+0xc37, 0xc35, 0xc4d, 0xc35, 0xc3e, 0x2e, 0x3b, 0xc27, 0xc41, 0xc32, 0xc4d, 0x2d, 0xc15, 0xc3f, 0x2e, 0x3b, 0xc27, 0xc41, 0xc32, 0xc4d,
+0x2d, 0xc39, 0xc3f, 0x2e, 0xe21, 0xe38, 0xe2e, 0xe30, 0xe23, 0xe4c, 0xe23, 0xe2d, 0xe21, 0x3b, 0xe0b, 0xe2d, 0xe1f, 0xe32, 0xe23, 0xe4c,
+0x3b, 0xe23, 0xe2d, 0xe1a, 0xe35, 0x20, 0x49, 0x3b, 0xe23, 0xe2d, 0xe1a, 0xe35, 0x20, 0x49, 0x49, 0x3b, 0xe08, 0xe38, 0xe21, 0xe32,
+0xe14, 0xe32, 0x20, 0x49, 0x3b, 0xe08, 0xe38, 0xe21, 0xe32, 0xe14, 0xe32, 0x20, 0x49, 0x49, 0x3b, 0xe23, 0xe2d, 0xe08, 0xe31, 0xe1a,
+0x3b, 0xe0a, 0xe30, 0xe2d, 0xe30, 0xe1a, 0xe32, 0xe19, 0x3b, 0xe23, 0xe2d, 0xe21, 0xe30, 0xe14, 0xe2d, 0xe19, 0x3b, 0xe40, 0xe0a, 0xe32,
+0xe27, 0xe31, 0xe25, 0x3b, 0xe0b, 0xe38, 0xe25, 0xe01, 0xe34, 0xe2d, 0xe3a, 0xe14, 0xe30, 0xe2e, 0xe3a, 0x3b, 0xe0b, 0xe38, 0xe25, 0xe2b,
+0xe34, 0xe08, 0xe0d, 0xe30, 0xe2e, 0xe3a, 0xe21, 0xe38, 0xe2e, 0xe31, 0xe23, 0x2e, 0x3b, 0xe40, 0xe28, 0xe32, 0xe30, 0x2e, 0x3b, 0xe23,
+0xe2d, 0xe1a, 0xe35, 0x20, 0x49, 0x3b, 0xe23, 0xe2d, 0xe1a, 0xe35, 0x20, 0x49, 0x49, 0x3b, 0xe08, 0xe38, 0xe21, 0xe32, 0xe14, 0xe32,
+0x20, 0x49, 0x3b, 0xe08, 0xe38, 0xe21, 0xe32, 0xe14, 0xe32, 0x20, 0x49, 0x49, 0x3b, 0xe40, 0xe23, 0xe32, 0xe30, 0x2e, 0x3b, 0xe0a,
+0xe30, 0xe2d, 0xe4c, 0x2e, 0x3b, 0xe40, 0xe23, 0xe32, 0xe30, 0xe21, 0xe30, 0x2e, 0x3b, 0xe40, 0xe0a, 0xe32, 0xe27, 0x2e, 0x3b, 0xe0b,
+0xe38, 0xe25, 0xe01, 0xe34, 0xe2d, 0xe3a, 0x2e, 0x3b, 0xe0b, 0xe38, 0xe25, 0xe2b, 0xe34, 0xe08, 0x2e, 0x4d, 0x75, 0x68, 0x61, 0x72,
+0x72, 0x65, 0x6d, 0x3b, 0x53, 0x61, 0x66, 0x65, 0x72, 0x3b, 0x52, 0x65, 0x62, 0x69, 0xfc, 0x6c, 0x65, 0x76, 0x76, 0x65,
+0x6c, 0x3b, 0x52, 0x65, 0x62, 0x69, 0xfc, 0x6c, 0x61, 0x68, 0x69, 0x72, 0x3b, 0x43, 0x65, 0x6d, 0x61, 0x7a, 0x69, 0x79,
+0x65, 0x6c, 0x65, 0x76, 0x76, 0x65, 0x6c, 0x3b, 0x43, 0x65, 0x6d, 0x61, 0x7a, 0x69, 0x79, 0x65, 0x6c, 0x61, 0x68, 0x69,
+0x72, 0x3b, 0x52, 0x65, 0x63, 0x65, 0x70, 0x3b, 0x15e, 0x61, 0x62, 0x61, 0x6e, 0x3b, 0x52, 0x61, 0x6d, 0x61, 0x7a, 0x61,
+0x6e, 0x3b, 0x15e, 0x65, 0x76, 0x76, 0x61, 0x6c, 0x3b, 0x5a, 0x69, 0x6c, 0x6b, 0x61, 0x64, 0x65, 0x3b, 0x5a, 0x69, 0x6c,
+0x68, 0x69, 0x63, 0x63, 0x65, 0x4d, 0x75, 0x68, 0x61, 0x72, 0x2e, 0x3b, 0x53, 0x61, 0x66, 0x65, 0x72, 0x3b, 0x52, 0x2e,
+0x65, 0x76, 0x76, 0x65, 0x6c, 0x3b, 0x52, 0x2e, 0x61, 0x68, 0x69, 0x72, 0x3b, 0x43, 0x2e, 0x65, 0x76, 0x76, 0x65, 0x6c,
+0x3b, 0x43, 0x2e, 0x61, 0x68, 0x69, 0x72, 0x3b, 0x52, 0x65, 0x63, 0x65, 0x70, 0x3b, 0x15e, 0x61, 0x62, 0x61, 0x6e, 0x3b,
+0x52, 0x61, 0x6d, 0x2e, 0x3b, 0x15e, 0x65, 0x76, 0x76, 0x61, 0x6c, 0x3b, 0x5a, 0x69, 0x6c, 0x6b, 0x61, 0x64, 0x65, 0x3b,
+0x5a, 0x69, 0x6c, 0x68, 0x69, 0x63, 0x63, 0x65, 0x645, 0x6c7, 0x6be, 0x6d5, 0x631, 0x631, 0x6d5, 0x645, 0x3b, 0x633, 0x6d5, 0x67e,
+0x6d5, 0x631, 0x3b, 0x631, 0x6d5, 0x628, 0x649, 0x626, 0x6c7, 0x644, 0x626, 0x6d5, 0x6cb, 0x6cb, 0x6d5, 0x644, 0x3b, 0x631, 0x6d5, 0x628,
+0x649, 0x626, 0x6c7, 0x644, 0x626, 0x627, 0x62e, 0x649, 0x631, 0x3b, 0x62c, 0x6d5, 0x645, 0x627, 0x62f, 0x649, 0x64a, 0x6d5, 0x644, 0x626,
+0x6d5, 0x6cb, 0x6cb, 0x6d5, 0x644, 0x3b, 0x62c, 0x6d5, 0x645, 0x627, 0x62f, 0x649, 0x64a, 0x6d5, 0x644, 0x626, 0x627, 0x62e, 0x649, 0x631,
+0x3b, 0x631, 0x6d5, 0x62c, 0x6d5, 0x628, 0x3b, 0x634, 0x6d5, 0x626, 0x628, 0x627, 0x646, 0x3b, 0x631, 0x627, 0x645, 0x649, 0x632, 0x627,
+0x646, 0x3b, 0x634, 0x6d5, 0x6cb, 0x6cb, 0x627, 0x644, 0x3b, 0x632, 0x6c7, 0x644, 0x642, 0x6d5, 0x626, 0x62f, 0x6d5, 0x3b, 0x632, 0x6c7,
+0x644, 0x6be, 0x6d5, 0x62c, 0x62c, 0x6d5, 0x43c, 0x443, 0x445, 0x430, 0x440, 0x440, 0x430, 0x43c, 0x3b, 0x441, 0x430, 0x444, 0x430, 0x440,
+0x3b, 0x440, 0x430, 0x431, 0x456, 0x20, 0x49, 0x3b, 0x440, 0x430, 0x431, 0x456, 0x20, 0x49, 0x49, 0x3b, 0x434, 0x436, 0x443, 0x43c,
+0x430, 0x434, 0x430, 0x20, 0x49, 0x3b, 0x434, 0x436, 0x443, 0x43c, 0x430, 0x434, 0x430, 0x20, 0x49, 0x49, 0x3b, 0x440, 0x430, 0x434,
+0x436, 0x430, 0x431, 0x3b, 0x448, 0x430, 0x430, 0x431, 0x430, 0x43d, 0x3b, 0x440, 0x430, 0x43c, 0x430, 0x434, 0x430, 0x43d, 0x3b, 0x434,
+0x430, 0x432, 0x432, 0x430, 0x43b, 0x3b, 0x437, 0x443, 0x2d, 0x43b, 0x44c, 0x2d, 0x43a, 0x430, 0x430, 0x434, 0x430, 0x3b, 0x437, 0x443,
+0x2d, 0x43b, 0x44c, 0x2d, 0x445, 0x456, 0x434, 0x436, 0x430, 0x43c, 0x443, 0x445, 0x3b, 0x441, 0x430, 0x444, 0x3b, 0x440, 0x430, 0x431,
+0x456, 0x20, 0x49, 0x3b, 0x440, 0x430, 0x431, 0x456, 0x20, 0x49, 0x49, 0x3b, 0x434, 0x436, 0x443, 0x43c, 0x20, 0x49, 0x3b, 0x434,
+0x436, 0x443, 0x43c, 0x20, 0x49, 0x49, 0x3b, 0x440, 0x430, 0x434, 0x436, 0x3b, 0x448, 0x430, 0x430, 0x431, 0x3b, 0x440, 0x430, 0x43c,
+0x3b, 0x434, 0x430, 0x432, 0x3b, 0x437, 0x443, 0x2d, 0x43b, 0x44c, 0x2d, 0x43a, 0x3b, 0x437, 0x443, 0x2d, 0x43b, 0x44c, 0x2d, 0x445,
+0x43c, 0x443, 0x445, 0x2e, 0x3b, 0x441, 0x430, 0x444, 0x2e, 0x3b, 0x440, 0x430, 0x431, 0x456, 0x20, 0x49, 0x3b, 0x440, 0x430, 0x431,
+0x456, 0x20, 0x49, 0x49, 0x3b, 0x434, 0x436, 0x443, 0x43c, 0x2e, 0x20, 0x49, 0x3b, 0x434, 0x436, 0x443, 0x43c, 0x2e, 0x20, 0x49,
+0x49, 0x3b, 0x440, 0x430, 0x434, 0x436, 0x2e, 0x3b, 0x448, 0x430, 0x430, 0x431, 0x2e, 0x3b, 0x440, 0x430, 0x43c, 0x2e, 0x3b, 0x434,
+0x430, 0x432, 0x2e, 0x3b, 0x437, 0x443, 0x2d, 0x43b, 0x44c, 0x2d, 0x43a, 0x2e, 0x3b, 0x437, 0x443, 0x2d, 0x43b, 0x44c, 0x2d, 0x445,
+0x2e, 0x645, 0x62d, 0x631, 0x645, 0x3b, 0x635, 0x641, 0x631, 0x3b, 0x631, 0x20, 0x628, 0x6cc, 0x639, 0x20, 0x627, 0x644, 0x627, 0x648,
+0x644, 0x3b, 0x631, 0x20, 0x628, 0x6cc, 0x639, 0x20, 0x627, 0x644, 0x62b, 0x627, 0x646, 0x6cc, 0x3b, 0x62c, 0x645, 0x627, 0x62f, 0x6cc,
+0x20, 0x627, 0x644, 0x627, 0x648, 0x644, 0x3b, 0x62c, 0x645, 0x627, 0x62f, 0x6cc, 0x20, 0x627, 0x644, 0x62b, 0x627, 0x646, 0x6cc, 0x3b,
+0x631, 0x62c, 0x628, 0x3b, 0x634, 0x639, 0x628, 0x627, 0x646, 0x3b, 0x631, 0x645, 0x636, 0x627, 0x646, 0x3b, 0x634, 0x648, 0x627, 0x644,
+0x3b, 0x630, 0x648, 0x627, 0x644, 0x642, 0x639, 0x62f, 0x6c3, 0x3b, 0x630, 0x648, 0x627, 0x644, 0x62d, 0x62c, 0x6c3, 0x645, 0x62d, 0x631,
+0x645, 0x3b, 0x635, 0x641, 0x631, 0x3b, 0x631, 0x628, 0x6cc, 0x639, 0x20, 0x627, 0x644, 0x627, 0x648, 0x651, 0x644, 0x3b, 0x631, 0x628,
+0x6cc, 0x639, 0x20, 0x627, 0x644, 0x62b, 0x651, 0x627, 0x646, 0x6cc, 0x3b, 0x62c, 0x645, 0x627, 0x62f, 0x6cc, 0x20, 0x627, 0x644, 0x627,
+0x648, 0x651, 0x644, 0x3b, 0x62c, 0x645, 0x627, 0x62f, 0x6cc, 0x20, 0x627, 0x644, 0x62b, 0x651, 0x627, 0x646, 0x6cc, 0x3b, 0x631, 0x62c,
+0x628, 0x3b, 0x634, 0x639, 0x628, 0x627, 0x646, 0x3b, 0x631, 0x645, 0x636, 0x627, 0x646, 0x3b, 0x634, 0x648, 0x627, 0x644, 0x3b, 0x630,
+0x648, 0x627, 0x644, 0x642, 0x639, 0x62f, 0x6c3, 0x3b, 0x630, 0x648, 0x627, 0x644, 0x62d, 0x62c, 0x6c3, 0x4d, 0x75, 0x68, 0x61, 0x72,
 0x72, 0x61, 0x6d, 0x3b, 0x53, 0x61, 0x66, 0x61, 0x72, 0x3b, 0x52, 0x6f, 0x62, 0x69, 0x2019, 0x20, 0x75, 0x6c, 0x2d, 0x61,
 0x76, 0x76, 0x61, 0x6c, 0x3b, 0x52, 0x6f, 0x62, 0x69, 0x2019, 0x20, 0x75, 0x6c, 0x2d, 0x6f, 0x78, 0x69, 0x72, 0x3b, 0x4a,
 0x75, 0x6d, 0x61, 0x64, 0x20, 0x75, 0x6c, 0x2d, 0x61, 0x76, 0x76, 0x61, 0x6c, 0x3b, 0x4a, 0x75, 0x6d, 0x61, 0x64, 0x20,
 0x75, 0x6c, 0x2d, 0x6f, 0x78, 0x69, 0x72, 0x3b, 0x52, 0x61, 0x6a, 0x61, 0x62, 0x3b, 0x53, 0x68, 0x61, 0x2019, 0x62, 0x6f,
 0x6e, 0x3b, 0x52, 0x61, 0x6d, 0x61, 0x7a, 0x6f, 0x6e, 0x3b, 0x53, 0x68, 0x61, 0x76, 0x76, 0x6f, 0x6c, 0x3b, 0x5a, 0x75,
-0x6c, 0x2d, 0x71, 0x61, 0x2019, 0x64, 0x61, 0x3b, 0x5a, 0x75, 0x6c, 0x2d, 0x68, 0x69, 0x6a, 0x6a, 0x61, 0x3b, 0x41c, 0x443,
-0x4b3, 0x430, 0x440, 0x440, 0x430, 0x43c, 0x3b, 0x421, 0x430, 0x444, 0x430, 0x440, 0x3b, 0x420, 0x430, 0x431, 0x438, 0x443, 0x43b, 0x2d,
-0x430, 0x432, 0x432, 0x430, 0x43b, 0x3b, 0x420, 0x430, 0x431, 0x438, 0x443, 0x43b, 0x2d, 0x43e, 0x445, 0x438, 0x440, 0x3b, 0x416, 0x443,
-0x43c, 0x43e, 0x434, 0x438, 0x443, 0x43b, 0x2d, 0x443, 0x43b, 0x43e, 0x3b, 0x416, 0x443, 0x43c, 0x43e, 0x434, 0x438, 0x443, 0x43b, 0x2d,
-0x443, 0x445, 0x440, 0x43e, 0x3b, 0x420, 0x430, 0x436, 0x430, 0x431, 0x3b, 0x428, 0x430, 0x44a, 0x431, 0x43e, 0x43d, 0x3b, 0x420, 0x430,
-0x43c, 0x430, 0x437, 0x43e, 0x43d, 0x3b, 0x428, 0x430, 0x432, 0x432, 0x43e, 0x43b, 0x3b, 0x417, 0x438, 0x43b, 0x2d, 0x49b, 0x430, 0x44a,
-0x434, 0x430, 0x3b, 0x417, 0x438, 0x43b, 0x2d, 0x4b3, 0x438, 0x436, 0x436, 0x430, 0x3b, 0x6d, 0x75, 0x68, 0x2e, 0x3b, 0x73, 0x61,
-0x66, 0x2e, 0x3b, 0x72, 0x61, 0x62, 0x2e, 0x20, 0x69, 0x3b, 0x72, 0x61, 0x62, 0x2e, 0x20, 0x69, 0x69, 0x3b, 0x64, 0x17e,
-0x75, 0x6d, 0x2e, 0x20, 0x69, 0x3b, 0x64, 0x17e, 0x75, 0x6d, 0x2e, 0x20, 0x69, 0x69, 0x3b, 0x72, 0x65, 0x64, 0x17e, 0x2e,
-0x3b, 0x161, 0x61, 0x2e, 0x3b, 0x72, 0x61, 0x6d, 0x2e, 0x3b, 0x161, 0x65, 0x2e, 0x3b, 0x7a, 0x75, 0x6c, 0x2d, 0x6b, 0x2e,
-0x3b, 0x7a, 0x75, 0x6c, 0x2d, 0x68, 0x2e, 0x3b, 0x6d, 0x75, 0x68, 0x61, 0x72, 0x65, 0x6d, 0x3b, 0x73, 0x61, 0x66, 0x65,
-0x72, 0x3b, 0x72, 0x61, 0x62, 0x69, 0x2bb, 0x20, 0x69, 0x3b, 0x72, 0x61, 0x62, 0x69, 0x2bb, 0x20, 0x69, 0x69, 0x3b, 0x64,
-0x17e, 0x75, 0x6d, 0x61, 0x64, 0x65, 0x20, 0x69, 0x3b, 0x64, 0x17e, 0x75, 0x6d, 0x61, 0x64, 0x65, 0x20, 0x69, 0x69, 0x3b,
-0x72, 0x65, 0x64, 0x17e, 0x65, 0x62, 0x3b, 0x161, 0x61, 0x2bb, 0x62, 0x61, 0x6e, 0x3b, 0x72, 0x61, 0x6d, 0x61, 0x7a, 0x61,
-0x6e, 0x3b, 0x161, 0x65, 0x76, 0x61, 0x6c, 0x3b, 0x7a, 0x75, 0x6c, 0x2d, 0x6b, 0x61, 0x64, 0x65, 0x3b, 0x7a, 0x75, 0x6c,
-0x2d, 0x68, 0x69, 0x64, 0x17e, 0x65, 0x3b, 0x64, 0x7a, 0x76, 0x3b, 0x64, 0x7a, 0x64, 0x3b, 0x74, 0x65, 0x64, 0x3b, 0x61,
-0x66, 0x254, 0x3b, 0x64, 0x61, 0x6d, 0x3b, 0x6d, 0x61, 0x73, 0x3b, 0x73, 0x69, 0x61, 0x3b, 0x64, 0x65, 0x61, 0x3b, 0x61,
-0x6e, 0x79, 0x3b, 0x6b, 0x65, 0x6c, 0x3b, 0x61, 0x64, 0x65, 0x3b, 0x64, 0x7a, 0x6d, 0x3b, 0x64, 0x7a, 0x6f, 0x76, 0x65,
-0x3b, 0x64, 0x7a, 0x6f, 0x64, 0x7a, 0x65, 0x3b, 0x74, 0x65, 0x64, 0x6f, 0x78, 0x65, 0x3b, 0x61, 0x66, 0x254, 0x66, 0x69,
-0x1ebd, 0x3b, 0x64, 0x61, 0x6d, 0x25b, 0x3b, 0x6d, 0x61, 0x73, 0x61, 0x3b, 0x73, 0x69, 0x61, 0x6d, 0x6c, 0x254, 0x6d, 0x3b,
-0x64, 0x65, 0x61, 0x73, 0x69, 0x61, 0x6d, 0x69, 0x6d, 0x65, 0x3b, 0x61, 0x6e, 0x79, 0x254, 0x6e, 0x79, 0x254, 0x3b, 0x6b,
-0x65, 0x6c, 0x65, 0x3b, 0x61, 0x64, 0x65, 0x25b, 0x6d, 0x65, 0x6b, 0x70, 0x254, 0x78, 0x65, 0x3b, 0x64, 0x7a, 0x6f, 0x6d,
-0x65, 0x3b, 0x64, 0x65, 0x20, 0x4d, 0x75, 0x68, 0x61, 0x72, 0x72, 0x61, 0x6d, 0x3b, 0x64, 0x65, 0x20, 0x53, 0x61, 0x66,
-0x61, 0x72, 0x3b, 0x64, 0x65, 0x20, 0x52, 0x61, 0x62, 0x69, 0x2bb, 0x20, 0x49, 0x3b, 0x64, 0x65, 0x20, 0x52, 0x61, 0x62,
-0x69, 0x2bb, 0x20, 0x49, 0x49, 0x3b, 0x64, 0x65, 0x20, 0x4a, 0x75, 0x6d, 0x61, 0x64, 0x61, 0x20, 0x49, 0x3b, 0x64, 0x65,
-0x20, 0x4a, 0x75, 0x6d, 0x61, 0x64, 0x61, 0x20, 0x49, 0x49, 0x3b, 0x64, 0x65, 0x20, 0x52, 0x61, 0x6a, 0x61, 0x62, 0x3b,
-0x64, 0x65, 0x20, 0x53, 0x68, 0x61, 0x2bb, 0x62, 0x61, 0x6e, 0x3b, 0x64, 0x65, 0x20, 0x52, 0x61, 0x6d, 0x61, 0x64, 0x61,
-0x6e, 0x3b, 0x64, 0x65, 0x20, 0x53, 0x68, 0x61, 0x77, 0x77, 0x61, 0x6c, 0x3b, 0x64, 0x65, 0x20, 0x44, 0x68, 0x75, 0x2bb,
-0x6c, 0x2d, 0x51, 0x69, 0x2bb, 0x64, 0x61, 0x68, 0x3b, 0x64, 0x65, 0x20, 0x44, 0x68, 0x75, 0x2bb, 0x6c, 0x2d, 0x48, 0x69,
-0x6a, 0x6a, 0x61, 0x68, 0x3b, 0x7a46, 0x54c8, 0x5170, 0x59c6, 0x6708, 0x3b, 0x8272, 0x6cd5, 0x5c14, 0x6708, 0x3b, 0x8d56, 0x6bd4, 0x6708, 0x20,
-0x49, 0x3b, 0x8d56, 0x6bd4, 0x6708, 0x20, 0x49, 0x49, 0x3b, 0x4e3b, 0x9a6c, 0x8fbe, 0x6708, 0x20, 0x49, 0x3b, 0x4e3b, 0x9a6c, 0x8fbe, 0x6708,
-0x20, 0x49, 0x49, 0x3b, 0x8d56, 0x54f2, 0x535c, 0x6708, 0x3b, 0x820d, 0x5c14, 0x90a6, 0x6708, 0x3b, 0x8d56, 0x4e70, 0x4e39, 0x6708, 0x3b, 0x95ea,
-0x74e6, 0x9c81, 0x6708, 0x3b, 0x90fd, 0x5c14, 0x5580, 0x5c14, 0x5fb7, 0x6708, 0x3b, 0x90fd, 0x5c14, 0x9ed1, 0x54f2, 0x6708, 0x3b
+0x6c, 0x2d, 0x71, 0x61, 0x2019, 0x64, 0x61, 0x3b, 0x5a, 0x75, 0x6c, 0x2d, 0x68, 0x69, 0x6a, 0x6a, 0x61, 0x4d, 0x75, 0x68,
+0x2e, 0x3b, 0x53, 0x61, 0x66, 0x2e, 0x3b, 0x52, 0x6f, 0x62, 0x2e, 0x20, 0x61, 0x76, 0x76, 0x2e, 0x3b, 0x52, 0x6f, 0x62,
+0x2e, 0x20, 0x6f, 0x78, 0x2e, 0x3b, 0x4a, 0x75, 0x6d, 0x2e, 0x20, 0x61, 0x76, 0x76, 0x2e, 0x3b, 0x4a, 0x75, 0x6d, 0x2e,
+0x20, 0x6f, 0x78, 0x2e, 0x3b, 0x52, 0x61, 0x6a, 0x2e, 0x3b, 0x53, 0x68, 0x61, 0x2e, 0x3b, 0x52, 0x61, 0x6d, 0x2e, 0x3b,
+0x53, 0x68, 0x61, 0x76, 0x2e, 0x3b, 0x5a, 0x75, 0x6c, 0x2d, 0x71, 0x2e, 0x3b, 0x5a, 0x75, 0x6c, 0x2d, 0x68, 0x2e, 0x41c,
+0x443, 0x4b3, 0x430, 0x440, 0x440, 0x430, 0x43c, 0x3b, 0x421, 0x430, 0x444, 0x430, 0x440, 0x3b, 0x420, 0x430, 0x431, 0x438, 0x443, 0x43b,
+0x2d, 0x430, 0x432, 0x432, 0x430, 0x43b, 0x3b, 0x420, 0x430, 0x431, 0x438, 0x443, 0x43b, 0x2d, 0x43e, 0x445, 0x438, 0x440, 0x3b, 0x416,
+0x443, 0x43c, 0x43e, 0x434, 0x438, 0x443, 0x43b, 0x2d, 0x443, 0x43b, 0x43e, 0x3b, 0x416, 0x443, 0x43c, 0x43e, 0x434, 0x438, 0x443, 0x43b,
+0x2d, 0x443, 0x445, 0x440, 0x43e, 0x3b, 0x420, 0x430, 0x436, 0x430, 0x431, 0x3b, 0x428, 0x430, 0x44a, 0x431, 0x43e, 0x43d, 0x3b, 0x420,
+0x430, 0x43c, 0x430, 0x437, 0x43e, 0x43d, 0x3b, 0x428, 0x430, 0x432, 0x432, 0x43e, 0x43b, 0x3b, 0x417, 0x438, 0x43b, 0x2d, 0x49b, 0x430,
+0x44a, 0x434, 0x430, 0x3b, 0x417, 0x438, 0x43b, 0x2d, 0x4b3, 0x438, 0x436, 0x436, 0x430, 0x6d, 0x75, 0x68, 0x61, 0x72, 0x65, 0x6d,
+0x3b, 0x73, 0x61, 0x66, 0x65, 0x72, 0x3b, 0x72, 0x61, 0x62, 0x69, 0x2bb, 0x20, 0x69, 0x3b, 0x72, 0x61, 0x62, 0x69, 0x2bb,
+0x20, 0x69, 0x69, 0x3b, 0x64, 0x17e, 0x75, 0x6d, 0x61, 0x64, 0x65, 0x20, 0x69, 0x3b, 0x64, 0x17e, 0x75, 0x6d, 0x61, 0x64,
+0x65, 0x20, 0x69, 0x69, 0x3b, 0x72, 0x65, 0x64, 0x17e, 0x65, 0x62, 0x3b, 0x161, 0x61, 0x2bb, 0x62, 0x61, 0x6e, 0x3b, 0x72,
+0x61, 0x6d, 0x61, 0x7a, 0x61, 0x6e, 0x3b, 0x161, 0x65, 0x76, 0x61, 0x6c, 0x3b, 0x7a, 0x75, 0x6c, 0x2d, 0x6b, 0x61, 0x64,
+0x65, 0x3b, 0x7a, 0x75, 0x6c, 0x2d, 0x68, 0x69, 0x64, 0x17e, 0x65, 0x6d, 0x75, 0x68, 0x2e, 0x3b, 0x73, 0x61, 0x66, 0x2e,
+0x3b, 0x72, 0x61, 0x62, 0x2e, 0x20, 0x69, 0x3b, 0x72, 0x61, 0x62, 0x2e, 0x20, 0x69, 0x69, 0x3b, 0x64, 0x17e, 0x75, 0x6d,
+0x2e, 0x20, 0x69, 0x3b, 0x64, 0x17e, 0x75, 0x6d, 0x2e, 0x20, 0x69, 0x69, 0x3b, 0x72, 0x65, 0x64, 0x17e, 0x2e, 0x3b, 0x161,
+0x61, 0x2e, 0x3b, 0x72, 0x61, 0x6d, 0x2e, 0x3b, 0x161, 0x65, 0x2e, 0x3b, 0x7a, 0x75, 0x6c, 0x2d, 0x6b, 0x2e, 0x3b, 0x7a,
+0x75, 0x6c, 0x2d, 0x68, 0x2e, 0x64, 0x7a, 0x6f, 0x76, 0x65, 0x3b, 0x64, 0x7a, 0x6f, 0x64, 0x7a, 0x65, 0x3b, 0x74, 0x65,
+0x64, 0x6f, 0x78, 0x65, 0x3b, 0x61, 0x66, 0x254, 0x66, 0x69, 0x1ebd, 0x3b, 0x64, 0x61, 0x6d, 0x25b, 0x3b, 0x6d, 0x61, 0x73,
+0x61, 0x3b, 0x73, 0x69, 0x61, 0x6d, 0x6c, 0x254, 0x6d, 0x3b, 0x64, 0x65, 0x61, 0x73, 0x69, 0x61, 0x6d, 0x69, 0x6d, 0x65,
+0x3b, 0x61, 0x6e, 0x79, 0x254, 0x6e, 0x79, 0x254, 0x3b, 0x6b, 0x65, 0x6c, 0x65, 0x3b, 0x61, 0x64, 0x65, 0x25b, 0x6d, 0x65,
+0x6b, 0x70, 0x254, 0x78, 0x65, 0x3b, 0x64, 0x7a, 0x6f, 0x6d, 0x65, 0x64, 0x7a, 0x76, 0x3b, 0x64, 0x7a, 0x64, 0x3b, 0x74,
+0x65, 0x64, 0x3b, 0x61, 0x66, 0x254, 0x3b, 0x64, 0x61, 0x6d, 0x3b, 0x6d, 0x61, 0x73, 0x3b, 0x73, 0x69, 0x61, 0x3b, 0x64,
+0x65, 0x61, 0x3b, 0x61, 0x6e, 0x79, 0x3b, 0x6b, 0x65, 0x6c, 0x3b, 0x61, 0x64, 0x65, 0x3b, 0x64, 0x7a, 0x6d, 0x64, 0x65,
+0x20, 0x4d, 0x75, 0x68, 0x61, 0x72, 0x72, 0x61, 0x6d, 0x3b, 0x64, 0x65, 0x20, 0x53, 0x61, 0x66, 0x61, 0x72, 0x3b, 0x64,
+0x65, 0x20, 0x52, 0x61, 0x62, 0x69, 0x2bb, 0x20, 0x49, 0x3b, 0x64, 0x65, 0x20, 0x52, 0x61, 0x62, 0x69, 0x2bb, 0x20, 0x49,
+0x49, 0x3b, 0x64, 0x65, 0x20, 0x4a, 0x75, 0x6d, 0x61, 0x64, 0x61, 0x20, 0x49, 0x3b, 0x64, 0x65, 0x20, 0x4a, 0x75, 0x6d,
+0x61, 0x64, 0x61, 0x20, 0x49, 0x49, 0x3b, 0x64, 0x65, 0x20, 0x52, 0x61, 0x6a, 0x61, 0x62, 0x3b, 0x64, 0x65, 0x20, 0x53,
+0x68, 0x61, 0x2bb, 0x62, 0x61, 0x6e, 0x3b, 0x64, 0x65, 0x20, 0x52, 0x61, 0x6d, 0x61, 0x64, 0x61, 0x6e, 0x3b, 0x64, 0x65,
+0x20, 0x53, 0x68, 0x61, 0x77, 0x77, 0x61, 0x6c, 0x3b, 0x64, 0x65, 0x20, 0x44, 0x68, 0x75, 0x2bb, 0x6c, 0x2d, 0x51, 0x69,
+0x2bb, 0x64, 0x61, 0x68, 0x3b, 0x64, 0x65, 0x20, 0x44, 0x68, 0x75, 0x2bb, 0x6c, 0x2d, 0x48, 0x69, 0x6a, 0x6a, 0x61, 0x68,
+0xd804, 0xdd1f, 0xd804, 0xdd27, 0xd804, 0xdd26, 0xd804, 0xdd27, 0xd804, 0xdd22, 0xd804, 0xdd27, 0xd804, 0xdd1f, 0xd804, 0xdd34, 0x3b, 0xd804, 0xdd25, 0xd804,
+0xdd27, 0xd804, 0xdd1c, 0xd804, 0xdd22, 0xd804, 0xdd34, 0x3b, 0xd804, 0xdd22, 0xd804, 0xdd27, 0xd804, 0xdd1d, 0xd804, 0xdd28, 0xd804, 0xdd05, 0xd804, 0xdd23,
+0xd804, 0xdd34, 0x20, 0xd804, 0xdd03, 0xd804, 0xdd03, 0xd804, 0xdd2a, 0xd804, 0xdd20, 0xd804, 0xdd23, 0xd804, 0xdd34, 0x3b, 0xd804, 0xdd22, 0xd804, 0xdd27,
+0xd804, 0xdd1d, 0xd804, 0xdd28, 0xd804, 0xdd05, 0xd804, 0xdd25, 0xd804, 0xdd34, 0x20, 0xd804, 0xdd25, 0xd804, 0xdd1a, 0xd804, 0xdd28, 0x3b, 0xd804, 0xdd0e,
+0xd804, 0xdd27, 0xd804, 0xdd1f, 0xd804, 0xdd18, 0xd804, 0xdd28, 0xd804, 0xdd05, 0xd804, 0xdd23, 0xd804, 0xdd34, 0x20, 0xd804, 0xdd03, 0xd804, 0xdd03, 0xd804,
+0xdd2a, 0xd804, 0xdd20, 0xd804, 0xdd23, 0xd804, 0xdd34, 0x3b, 0xd804, 0xdd0e, 0xd804, 0xdd27, 0xd804, 0xdd1f, 0xd804, 0xdd18, 0xd804, 0xdd28, 0xd804, 0xdd05,
+0xd804, 0xdd0c, 0xd804, 0xdd34, 0x20, 0xd804, 0xdd25, 0xd804, 0xdd1a, 0xd804, 0xdd28, 0x3b, 0xd804, 0xdd22, 0xd804, 0xdd27, 0xd804, 0xdd0e, 0xd804, 0xdd27,
+0xd804, 0xdd1d, 0xd804, 0xdd34, 0x3b, 0xd804, 0xdd25, 0xd804, 0xdd33, 0xd804, 0xdd03, 0xd804, 0xdd1d, 0xd804, 0xdd27, 0xd804, 0xdd1a, 0xd804, 0xdd34, 0x3b,
+0xd804, 0xdd22, 0xd804, 0xdd27, 0xd804, 0xdd1f, 0xd804, 0xdd34, 0xd804, 0xdd0e, 0xd804, 0xdd1a, 0xd804, 0xdd34, 0x3b, 0xd804, 0xdd25, 0xd804, 0xdd24, 0xd804,
+0xdd23, 0xd804, 0xdd34, 0x3b, 0xd804, 0xdd0e, 0xd804, 0xdd28, 0xd804, 0xdd23, 0xd804, 0xdd34, 0xd804, 0xdd07, 0xd804, 0xdd27, 0xd804, 0xdd18, 0xd804, 0xdd34,
+0x3b, 0xd804, 0xdd0e, 0xd804, 0xdd28, 0xd804, 0xdd23, 0xd804, 0xdd34, 0xd804, 0xdd26, 0xd804, 0xdd27, 0xd804, 0xdd0e, 0xd804, 0xdd34, 0xd804, 0xdd0e, 0xd804,
+0xdd27, 0xd804, 0xdd37, 0x3b, 0xd804, 0xdd38, 0x3b, 0xd804, 0xdd39, 0x3b, 0xd804, 0xdd3a, 0x3b, 0xd804, 0xdd3b, 0x3b, 0xd804, 0xdd3c, 0x3b, 0xd804,
+0xdd3d, 0x3b, 0xd804, 0xdd3e, 0x3b, 0xd804, 0xdd3f, 0x3b, 0xd804, 0xdd37, 0xd804, 0xdd36, 0x3b, 0xd804, 0xdd37, 0xd804, 0xdd37, 0x3b, 0xd804, 0xdd37,
+0xd804, 0xdd38, 0x7a46, 0x54c8, 0x5170, 0x59c6, 0x6708, 0x3b, 0x8272, 0x6cd5, 0x5c14, 0x6708, 0x3b, 0x8d56, 0x6bd4, 0x6708, 0x20, 0x49, 0x3b, 0x8d56,
+0x6bd4, 0x6708, 0x20, 0x49, 0x49, 0x3b, 0x4e3b, 0x9a6c, 0x8fbe, 0x6708, 0x20, 0x49, 0x3b, 0x4e3b, 0x9a6c, 0x8fbe, 0x6708, 0x20, 0x49, 0x49,
+0x3b, 0x8d56, 0x54f2, 0x535c, 0x6708, 0x3b, 0x820d, 0x5c14, 0x90a6, 0x6708, 0x3b, 0x8d56, 0x4e70, 0x4e39, 0x6708, 0x3b, 0x95ea, 0x74e6, 0x9c81, 0x6708,
+0x3b, 0x90fd, 0x5c14, 0x5580, 0x5c14, 0x5fb7, 0x6708, 0x3b, 0x90fd, 0x5c14, 0x9ed1, 0x54f2, 0x6708
 };
 // GENERATED PART ENDS HERE
 
diff --git a/src/corelib/time/qhijricalendar_p.h b/src/corelib/time/qhijricalendar_p.h
index 60820488b4..abe2ade3e8 100644
--- a/src/corelib/time/qhijricalendar_p.h
+++ b/src/corelib/time/qhijricalendar_p.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2019 The Qt Company Ltd.
+** Copyright (C) 2020 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtCore module of the Qt Toolkit.
@@ -72,7 +72,7 @@ public:
 
 protected:
     const QCalendarLocale *localeMonthIndexData() const override;
-    const ushort *localeMonthData() const override;
+    const char16_t *localeMonthData() const override;
     // (The INTEGRITY compiler got upset at: using QCalendarBackend:QCalendarBackend;)
     QHijriCalendar(const QString &name, QCalendar::System id = QCalendar::System::User)
         : QCalendarBackend(name, id) {}
diff --git a/src/corelib/time/qjalalicalendar.cpp b/src/corelib/time/qjalalicalendar.cpp
index be9246d7db..17588aff6c 100644
--- a/src/corelib/time/qjalalicalendar.cpp
+++ b/src/corelib/time/qjalalicalendar.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2018 The Qt Company Ltd.
+** Copyright (C) 2020 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtCore module of the Qt Toolkit.
@@ -204,7 +204,7 @@ const QCalendarLocale *QJalaliCalendar::localeMonthIndexData() const
     return locale_data;
 }
 
-const ushort *QJalaliCalendar::localeMonthData() const
+const char16_t *QJalaliCalendar::localeMonthData() const
 {
     return months_data;
 }
diff --git a/src/corelib/time/qjalalicalendar_data_p.h b/src/corelib/time/qjalalicalendar_data_p.h
index 5bc44c83a0..cc0d23da1f 100644
--- a/src/corelib/time/qjalalicalendar_data_p.h
+++ b/src/corelib/time/qjalalicalendar_data_p.h
@@ -59,7 +59,7 @@ QT_BEGIN_NAMESPACE
 // GENERATED PART STARTS HERE
 
 /*
-    This part of the file was generated on 2019-10-24 from the
+    This part of the file was generated on 2020-01-30 from the
     Common Locale Data Repository v36
 
     http://www.unicode.org/cldr/
@@ -70,834 +70,831 @@ QT_BEGIN_NAMESPACE
 */
 
 static const QCalendarLocale locale_data[] = {
-   //  lang   script terr   sShort  sLong   sNarrow short   long    narrow
-      {     1,     0,     0,{ 0,48 },{ 48,84 },{ 132,24 },{ 0,48 },{ 48,84 },{ 156,29 }}, // C/AnyScript/AnyCountry
-       {     3,     7,    69,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Oromo/Latin/Ethiopia
-       {     3,     7,   111,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Oromo/Latin/Kenya
-       {     4,     7,    69,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Afar/Latin/Ethiopia
-       {     5,     7,   195,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Afrikaans/Latin/South Africa
-       {     5,     7,   148,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Afrikaans/Latin/Namibia
-       {     6,     7,     2,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Albanian/Latin/Albania
-       {     6,     7,   127,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Albanian/Latin/Macedonia
-       {     6,     7,   257,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Albanian/Latin/Kosovo
-       {     7,    14,    69,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Amharic/Ethiopic/Ethiopia
-       {     8,     1,    64,{ 212,68 },{ 212,68 },{ 185,27 },{ 212,68 },{ 212,68 },{ 185,27 }}, // Arabic/Arabic/Egypt
-       {     8,     1,     3,{ 212,68 },{ 212,68 },{ 185,27 },{ 212,68 },{ 212,68 },{ 185,27 }}, // Arabic/Arabic/Algeria
-       {     8,     1,    17,{ 212,68 },{ 212,68 },{ 185,27 },{ 212,68 },{ 212,68 },{ 185,27 }}, // Arabic/Arabic/Bahrain
-       {     8,     1,    42,{ 212,68 },{ 212,68 },{ 185,27 },{ 212,68 },{ 212,68 },{ 185,27 }}, // Arabic/Arabic/Chad
-       {     8,     1,    48,{ 212,68 },{ 212,68 },{ 185,27 },{ 212,68 },{ 212,68 },{ 185,27 }}, // Arabic/Arabic/Comoros
-       {     8,     1,    59,{ 212,68 },{ 212,68 },{ 185,27 },{ 212,68 },{ 212,68 },{ 185,27 }}, // Arabic/Arabic/Djibouti
-       {     8,     1,    67,{ 212,68 },{ 212,68 },{ 185,27 },{ 212,68 },{ 212,68 },{ 185,27 }}, // Arabic/Arabic/Eritrea
-       {     8,     1,   103,{ 212,68 },{ 212,68 },{ 185,27 },{ 212,68 },{ 212,68 },{ 185,27 }}, // Arabic/Arabic/Iraq
-       {     8,     1,   105,{ 212,68 },{ 212,68 },{ 185,27 },{ 212,68 },{ 212,68 },{ 185,27 }}, // Arabic/Arabic/Israel
-       {     8,     1,   109,{ 212,68 },{ 212,68 },{ 185,27 },{ 212,68 },{ 212,68 },{ 185,27 }}, // Arabic/Arabic/Jordan
-       {     8,     1,   115,{ 212,68 },{ 212,68 },{ 185,27 },{ 212,68 },{ 212,68 },{ 185,27 }}, // Arabic/Arabic/Kuwait
-       {     8,     1,   119,{ 212,68 },{ 212,68 },{ 185,27 },{ 212,68 },{ 212,68 },{ 185,27 }}, // Arabic/Arabic/Lebanon
-       {     8,     1,   122,{ 212,68 },{ 212,68 },{ 185,27 },{ 212,68 },{ 212,68 },{ 185,27 }}, // Arabic/Arabic/Libya
-       {     8,     1,   136,{ 212,68 },{ 212,68 },{ 185,27 },{ 212,68 },{ 212,68 },{ 185,27 }}, // Arabic/Arabic/Mauritania
-       {     8,     1,   145,{ 212,68 },{ 212,68 },{ 185,27 },{ 212,68 },{ 212,68 },{ 185,27 }}, // Arabic/Arabic/Morocco
-       {     8,     1,   162,{ 212,68 },{ 212,68 },{ 185,27 },{ 212,68 },{ 212,68 },{ 185,27 }}, // Arabic/Arabic/Oman
-       {     8,     1,   165,{ 212,68 },{ 212,68 },{ 185,27 },{ 212,68 },{ 212,68 },{ 185,27 }}, // Arabic/Arabic/Palestinian Territories
-       {     8,     1,   175,{ 212,68 },{ 212,68 },{ 185,27 },{ 212,68 },{ 212,68 },{ 185,27 }}, // Arabic/Arabic/Qatar
-       {     8,     1,   186,{ 212,68 },{ 212,68 },{ 185,27 },{ 212,68 },{ 212,68 },{ 185,27 }}, // Arabic/Arabic/Saudi Arabia
-       {     8,     1,   194,{ 212,68 },{ 212,68 },{ 185,27 },{ 212,68 },{ 212,68 },{ 185,27 }}, // Arabic/Arabic/Somalia
-       {     8,     1,   201,{ 212,68 },{ 212,68 },{ 185,27 },{ 212,68 },{ 212,68 },{ 185,27 }}, // Arabic/Arabic/Sudan
-       {     8,     1,   207,{ 212,68 },{ 212,68 },{ 185,27 },{ 212,68 },{ 212,68 },{ 185,27 }}, // Arabic/Arabic/Syria
-       {     8,     1,   216,{ 212,68 },{ 212,68 },{ 185,27 },{ 212,68 },{ 212,68 },{ 185,27 }}, // Arabic/Arabic/Tunisia
-       {     8,     1,   223,{ 212,68 },{ 212,68 },{ 185,27 },{ 212,68 },{ 212,68 },{ 185,27 }}, // Arabic/Arabic/United Arab Emirates
-       {     8,     1,   236,{ 212,68 },{ 212,68 },{ 185,27 },{ 212,68 },{ 212,68 },{ 185,27 }}, // Arabic/Arabic/Western Sahara
-       {     8,     1,   237,{ 212,68 },{ 212,68 },{ 185,27 },{ 212,68 },{ 212,68 },{ 185,27 }}, // Arabic/Arabic/Yemen
-       {     8,     1,   254,{ 212,68 },{ 212,68 },{ 185,27 },{ 212,68 },{ 212,68 },{ 185,27 }}, // Arabic/Arabic/South Sudan
-       {     8,     1,   260,{ 212,68 },{ 212,68 },{ 185,27 },{ 212,68 },{ 212,68 },{ 185,27 }}, // Arabic/Arabic/World
-       {     9,    10,    11,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Armenian/Armenian/Armenia
-       {    10,    11,   100,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Assamese/Bengali/India
-       {    12,     7,    15,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Azerbaijani/Latin/Azerbaijan
-       {    12,     1,   102,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Azerbaijani/Arabic/Iran
-       {    12,     2,    15,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Azerbaijani/Cyrillic/Azerbaijan
-       {    13,     2,   178,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Bashkir/Cyrillic/Russia
-       {    14,     7,   197,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Basque/Latin/Spain
-       {    15,    11,    18,{ 280,88 },{ 368,89 },{ 457,27 },{ 280,88 },{ 368,89 },{ 457,27 }}, // Bengali/Bengali/Bangladesh
-       {    15,    11,   100,{ 280,88 },{ 368,89 },{ 457,27 },{ 280,88 },{ 368,89 },{ 457,27 }}, // Bengali/Bengali/India
-       {    16,    31,    25,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Dzongkha/Tibetan/Bhutan
-       {    19,     7,    74,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Breton/Latin/France
-       {    20,     2,    33,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Bulgarian/Cyrillic/Bulgaria
-       {    21,    25,   147,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Burmese/Myanmar/Myanmar
-       {    22,     2,    20,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Belarusian/Cyrillic/Belarus
-       {    23,    20,    36,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Khmer/Khmer/Cambodia
-       {    24,     7,   197,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Catalan/Latin/Spain
-       {    24,     7,     5,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Catalan/Latin/Andorra
-       {    24,     7,    74,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Catalan/Latin/France
-       {    24,     7,   106,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Catalan/Latin/Italy
-       {    25,     5,    44,{ 484,39 },{ 523,38 },{ 185,27 },{ 484,39 },{ 523,38 },{ 185,27 }}, // Chinese/Simplified Han/China
-       {    25,     5,    97,{ 484,39 },{ 523,38 },{ 185,27 },{ 484,39 },{ 523,38 },{ 185,27 }}, // Chinese/Simplified Han/Hong Kong
-       {    25,     5,   126,{ 484,39 },{ 523,38 },{ 185,27 },{ 484,39 },{ 523,38 },{ 185,27 }}, // Chinese/Simplified Han/Macau
-       {    25,     5,   190,{ 484,39 },{ 523,38 },{ 185,27 },{ 484,39 },{ 523,38 },{ 185,27 }}, // Chinese/Simplified Han/Singapore
-       {    25,     6,    97,{ 484,39 },{ 484,39 },{ 185,27 },{ 484,39 },{ 484,39 },{ 185,27 }}, // Chinese/Traditional Han/Hong Kong
-       {    25,     6,   126,{ 484,39 },{ 484,39 },{ 185,27 },{ 484,39 },{ 484,39 },{ 185,27 }}, // Chinese/Traditional Han/Macau
-       {    25,     6,   208,{ 484,39 },{ 484,39 },{ 185,27 },{ 484,39 },{ 484,39 },{ 185,27 }}, // Chinese/Traditional Han/Taiwan
-       {    26,     7,    74,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Corsican/Latin/France
-       {    27,     7,    54,{ 48,84 },{ 48,84 },{ 561,39 },{ 48,84 },{ 48,84 },{ 561,39 }}, // Croatian/Latin/Croatia
-       {    27,     7,    27,{ 48,84 },{ 48,84 },{ 561,39 },{ 48,84 },{ 48,84 },{ 561,39 }}, // Croatian/Latin/Bosnia And Herzegowina
-       {    28,     7,    57,{ 600,82 },{ 600,82 },{ 185,27 },{ 600,82 },{ 600,82 },{ 185,27 }}, // Czech/Latin/Czech Republic
-       {    29,     7,    58,{ 682,84 },{ 682,84 },{ 185,27 },{ 682,84 },{ 682,84 },{ 185,27 }}, // Danish/Latin/Denmark
-       {    29,     7,    86,{ 682,84 },{ 682,84 },{ 185,27 },{ 682,84 },{ 682,84 },{ 185,27 }}, // Danish/Latin/Greenland
-       {    30,     7,   151,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Dutch/Latin/Netherlands
-       {    30,     7,    12,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Dutch/Latin/Aruba
-       {    30,     7,    21,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Dutch/Latin/Belgium
-       {    30,     7,   152,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Dutch/Latin/Cura Sao
-       {    30,     7,   202,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Dutch/Latin/Suriname
-       {    30,     7,   255,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Dutch/Latin/Bonaire
-       {    30,     7,   256,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Dutch/Latin/Sint Maarten
-       {    31,     7,   225,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/United States
-       {    31,     3,   225,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Deseret/United States
-       {    31,     7,     4,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/American Samoa
-       {    31,     7,     7,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Anguilla
-       {    31,     7,     9,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Antigua And Barbuda
-       {    31,     7,    13,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Australia
-       {    31,     7,    14,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Austria
-       {    31,     7,    16,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Bahamas
-       {    31,     7,    19,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Barbados
-       {    31,     7,    21,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Belgium
-       {    31,     7,    22,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Belize
-       {    31,     7,    24,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Bermuda
-       {    31,     7,    28,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Botswana
-       {    31,     7,    31,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/British Indian Ocean Territory
-       {    31,     7,    35,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Burundi
-       {    31,     7,    37,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Cameroon
-       {    31,     7,    38,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Canada
-       {    31,     7,    40,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Cayman Islands
-       {    31,     7,    45,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Christmas Island
-       {    31,     7,    46,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Cocos Islands
-       {    31,     7,    51,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Cook Islands
-       {    31,     7,    56,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Cyprus
-       {    31,     7,    58,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Denmark
-       {    31,     7,    60,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Dominica
-       {    31,     7,    67,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Eritrea
-       {    31,     7,    70,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Falkland Islands
-       {    31,     7,    72,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Fiji
-       {    31,     7,    73,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Finland
-       {    31,     7,    75,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Guernsey
-       {    31,     7,    80,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Gambia
-       {    31,     7,    82,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Germany
-       {    31,     7,    83,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Ghana
-       {    31,     7,    84,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Gibraltar
-       {    31,     7,    87,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Grenada
-       {    31,     7,    89,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Guam
-       {    31,     7,    93,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Guyana
-       {    31,     7,    97,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Hong Kong
-       {    31,     7,   100,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/India
-       {    31,     7,   104,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Ireland
-       {    31,     7,   105,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Israel
-       {    31,     7,   107,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Jamaica
-       {    31,     7,   111,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Kenya
-       {    31,     7,   112,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Kiribati
-       {    31,     7,   120,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Lesotho
-       {    31,     7,   121,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Liberia
-       {    31,     7,   126,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Macau
-       {    31,     7,   128,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Madagascar
-       {    31,     7,   129,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Malawi
-       {    31,     7,   130,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Malaysia
-       {    31,     7,   133,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Malta
-       {    31,     7,   134,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Marshall Islands
-       {    31,     7,   137,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Mauritius
-       {    31,     7,   140,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Micronesia
-       {    31,     7,   144,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Montserrat
-       {    31,     7,   148,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Namibia
-       {    31,     7,   149,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Nauru
-       {    31,     7,   151,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Netherlands
-       {    31,     7,   154,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/New Zealand
-       {    31,     7,   157,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Nigeria
-       {    31,     7,   158,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Niue
-       {    31,     7,   159,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Norfolk Island
-       {    31,     7,   160,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Northern Mariana Islands
-       {    31,     7,   163,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Pakistan
-       {    31,     7,   164,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Palau
-       {    31,     7,   167,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Papua New Guinea
-       {    31,     7,   170,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Philippines
-       {    31,     7,   171,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Pitcairn
-       {    31,     7,   174,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Puerto Rico
-       {    31,     7,   179,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Rwanda
-       {    31,     7,   180,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Saint Kitts And Nevis
-       {    31,     7,   181,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Saint Lucia
-       {    31,     7,   182,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Saint Vincent And The Grenadines
-       {    31,     7,   183,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Samoa
-       {    31,     7,   188,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Seychelles
-       {    31,     7,   189,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Sierra Leone
-       {    31,     7,   190,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Singapore
-       {    31,     7,   192,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Slovenia
-       {    31,     7,   193,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Solomon Islands
-       {    31,     7,   195,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/South Africa
-       {    31,     7,   199,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Saint Helena
-       {    31,     7,   201,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Sudan
-       {    31,     7,   204,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Swaziland
-       {    31,     7,   205,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Sweden
-       {    31,     7,   206,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Switzerland
-       {    31,     7,   210,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Tanzania
-       {    31,     7,   213,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Tokelau
-       {    31,     7,   214,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Tonga
-       {    31,     7,   215,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Trinidad And Tobago
-       {    31,     7,   219,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Turks And Caicos Islands
-       {    31,     7,   220,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Tuvalu
-       {    31,     7,   221,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Uganda
-       {    31,     7,   223,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/United Arab Emirates
-       {    31,     7,   224,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/United Kingdom
-       {    31,     7,   226,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/United States Minor Outlying Islands
-       {    31,     7,   229,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Vanuatu
-       {    31,     7,   233,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/British Virgin Islands
-       {    31,     7,   234,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/United States Virgin Islands
-       {    31,     7,   239,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Zambia
-       {    31,     7,   240,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Zimbabwe
-       {    31,     7,   249,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Diego Garcia
-       {    31,     7,   251,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Isle Of Man
-       {    31,     7,   252,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Jersey
-       {    31,     7,   254,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/South Sudan
-       {    31,     7,   256,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Sint Maarten
-       {    31,     7,   260,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/World
-       {    31,     7,   261,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // English/Latin/Europe
-       {    32,     7,   260,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Esperanto/Latin/World
-       {    33,     7,    68,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Estonian/Latin/Estonia
-       {    34,     7,    71,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Faroese/Latin/Faroe Islands
-       {    34,     7,    58,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Faroese/Latin/Denmark
-       {    36,     7,    73,{ 766,82 },{ 848,118 },{ 185,27 },{ 966,142 },{ 966,142 },{ 185,27 }}, // Finnish/Latin/Finland
-       {    37,     7,    74,{ 1108,58 },{ 1166,82 },{ 185,27 },{ 1108,58 },{ 1166,82 },{ 185,27 }}, // French/Latin/France
-       {    37,     7,     3,{ 1108,58 },{ 1166,82 },{ 185,27 },{ 1108,58 },{ 1166,82 },{ 185,27 }}, // French/Latin/Algeria
-       {    37,     7,    21,{ 1108,58 },{ 1166,82 },{ 185,27 },{ 1108,58 },{ 1166,82 },{ 185,27 }}, // French/Latin/Belgium
-       {    37,     7,    23,{ 1108,58 },{ 1166,82 },{ 185,27 },{ 1108,58 },{ 1166,82 },{ 185,27 }}, // French/Latin/Benin
-       {    37,     7,    34,{ 1108,58 },{ 1166,82 },{ 185,27 },{ 1108,58 },{ 1166,82 },{ 185,27 }}, // French/Latin/Burkina Faso
-       {    37,     7,    35,{ 1108,58 },{ 1166,82 },{ 185,27 },{ 1108,58 },{ 1166,82 },{ 185,27 }}, // French/Latin/Burundi
-       {    37,     7,    37,{ 1108,58 },{ 1166,82 },{ 185,27 },{ 1108,58 },{ 1166,82 },{ 185,27 }}, // French/Latin/Cameroon
-       {    37,     7,    38,{ 1248,58 },{ 1306,82 },{ 185,27 },{ 1248,58 },{ 1306,82 },{ 185,27 }}, // French/Latin/Canada
-       {    37,     7,    41,{ 1108,58 },{ 1166,82 },{ 185,27 },{ 1108,58 },{ 1166,82 },{ 185,27 }}, // French/Latin/Central African Republic
-       {    37,     7,    42,{ 1108,58 },{ 1166,82 },{ 185,27 },{ 1108,58 },{ 1166,82 },{ 185,27 }}, // French/Latin/Chad
-       {    37,     7,    48,{ 1108,58 },{ 1166,82 },{ 185,27 },{ 1108,58 },{ 1166,82 },{ 185,27 }}, // French/Latin/Comoros
-       {    37,     7,    49,{ 1108,58 },{ 1166,82 },{ 185,27 },{ 1108,58 },{ 1166,82 },{ 185,27 }}, // French/Latin/Congo Kinshasa
-       {    37,     7,    50,{ 1108,58 },{ 1166,82 },{ 185,27 },{ 1108,58 },{ 1166,82 },{ 185,27 }}, // French/Latin/Congo Brazzaville
-       {    37,     7,    53,{ 1108,58 },{ 1166,82 },{ 185,27 },{ 1108,58 },{ 1166,82 },{ 185,27 }}, // French/Latin/Ivory Coast
-       {    37,     7,    59,{ 1108,58 },{ 1166,82 },{ 185,27 },{ 1108,58 },{ 1166,82 },{ 185,27 }}, // French/Latin/Djibouti
-       {    37,     7,    66,{ 1108,58 },{ 1166,82 },{ 185,27 },{ 1108,58 },{ 1166,82 },{ 185,27 }}, // French/Latin/Equatorial Guinea
-       {    37,     7,    76,{ 1108,58 },{ 1166,82 },{ 185,27 },{ 1108,58 },{ 1166,82 },{ 185,27 }}, // French/Latin/French Guiana
-       {    37,     7,    77,{ 1108,58 },{ 1166,82 },{ 185,27 },{ 1108,58 },{ 1166,82 },{ 185,27 }}, // French/Latin/French Polynesia
-       {    37,     7,    79,{ 1108,58 },{ 1166,82 },{ 185,27 },{ 1108,58 },{ 1166,82 },{ 185,27 }}, // French/Latin/Gabon
-       {    37,     7,    88,{ 1108,58 },{ 1166,82 },{ 185,27 },{ 1108,58 },{ 1166,82 },{ 185,27 }}, // French/Latin/Guadeloupe
-       {    37,     7,    91,{ 1108,58 },{ 1166,82 },{ 185,27 },{ 1108,58 },{ 1166,82 },{ 185,27 }}, // French/Latin/Guinea
-       {    37,     7,    94,{ 1108,58 },{ 1166,82 },{ 185,27 },{ 1108,58 },{ 1166,82 },{ 185,27 }}, // French/Latin/Haiti
-       {    37,     7,   125,{ 1108,58 },{ 1166,82 },{ 185,27 },{ 1108,58 },{ 1166,82 },{ 185,27 }}, // French/Latin/Luxembourg
-       {    37,     7,   128,{ 1108,58 },{ 1166,82 },{ 185,27 },{ 1108,58 },{ 1166,82 },{ 185,27 }}, // French/Latin/Madagascar
-       {    37,     7,   132,{ 1108,58 },{ 1166,82 },{ 185,27 },{ 1108,58 },{ 1166,82 },{ 185,27 }}, // French/Latin/Mali
-       {    37,     7,   135,{ 1108,58 },{ 1166,82 },{ 185,27 },{ 1108,58 },{ 1166,82 },{ 185,27 }}, // French/Latin/Martinique
-       {    37,     7,   136,{ 1108,58 },{ 1166,82 },{ 185,27 },{ 1108,58 },{ 1166,82 },{ 185,27 }}, // French/Latin/Mauritania
-       {    37,     7,   137,{ 1108,58 },{ 1166,82 },{ 185,27 },{ 1108,58 },{ 1166,82 },{ 185,27 }}, // French/Latin/Mauritius
-       {    37,     7,   138,{ 1108,58 },{ 1166,82 },{ 185,27 },{ 1108,58 },{ 1166,82 },{ 185,27 }}, // French/Latin/Mayotte
-       {    37,     7,   142,{ 1108,58 },{ 1166,82 },{ 185,27 },{ 1108,58 },{ 1166,82 },{ 185,27 }}, // French/Latin/Monaco
-       {    37,     7,   145,{ 1108,58 },{ 1166,82 },{ 185,27 },{ 1108,58 },{ 1166,82 },{ 185,27 }}, // French/Latin/Morocco
-       {    37,     7,   153,{ 1108,58 },{ 1166,82 },{ 185,27 },{ 1108,58 },{ 1166,82 },{ 185,27 }}, // French/Latin/New Caledonia
-       {    37,     7,   156,{ 1108,58 },{ 1166,82 },{ 185,27 },{ 1108,58 },{ 1166,82 },{ 185,27 }}, // French/Latin/Niger
-       {    37,     7,   176,{ 1108,58 },{ 1166,82 },{ 185,27 },{ 1108,58 },{ 1166,82 },{ 185,27 }}, // French/Latin/Reunion
-       {    37,     7,   179,{ 1108,58 },{ 1166,82 },{ 185,27 },{ 1108,58 },{ 1166,82 },{ 185,27 }}, // French/Latin/Rwanda
-       {    37,     7,   187,{ 1108,58 },{ 1166,82 },{ 185,27 },{ 1108,58 },{ 1166,82 },{ 185,27 }}, // French/Latin/Senegal
-       {    37,     7,   188,{ 1108,58 },{ 1166,82 },{ 185,27 },{ 1108,58 },{ 1166,82 },{ 185,27 }}, // French/Latin/Seychelles
-       {    37,     7,   200,{ 1108,58 },{ 1166,82 },{ 185,27 },{ 1108,58 },{ 1166,82 },{ 185,27 }}, // French/Latin/Saint Pierre And Miquelon
-       {    37,     7,   206,{ 1108,58 },{ 1166,82 },{ 185,27 },{ 1108,58 },{ 1166,82 },{ 185,27 }}, // French/Latin/Switzerland
-       {    37,     7,   207,{ 1108,58 },{ 1166,82 },{ 185,27 },{ 1108,58 },{ 1166,82 },{ 185,27 }}, // French/Latin/Syria
-       {    37,     7,   212,{ 1108,58 },{ 1166,82 },{ 185,27 },{ 1108,58 },{ 1166,82 },{ 185,27 }}, // French/Latin/Togo
-       {    37,     7,   216,{ 1108,58 },{ 1166,82 },{ 185,27 },{ 1108,58 },{ 1166,82 },{ 185,27 }}, // French/Latin/Tunisia
-       {    37,     7,   229,{ 1108,58 },{ 1166,82 },{ 185,27 },{ 1108,58 },{ 1166,82 },{ 185,27 }}, // French/Latin/Vanuatu
-       {    37,     7,   235,{ 1108,58 },{ 1166,82 },{ 185,27 },{ 1108,58 },{ 1166,82 },{ 185,27 }}, // French/Latin/Wallis And Futuna Islands
-       {    37,     7,   244,{ 1108,58 },{ 1166,82 },{ 185,27 },{ 1108,58 },{ 1166,82 },{ 185,27 }}, // French/Latin/Saint Barthelemy
-       {    37,     7,   245,{ 1108,58 },{ 1166,82 },{ 185,27 },{ 1108,58 },{ 1166,82 },{ 185,27 }}, // French/Latin/Saint Martin
-       {    38,     7,   151,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Western Frisian/Latin/Netherlands
-       {    39,     7,   224,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Gaelic/Latin/United Kingdom
-       {    40,     7,   197,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Galician/Latin/Spain
-       {    41,    15,    81,{ 1388,92 },{ 1388,92 },{ 185,27 },{ 1388,92 },{ 1388,92 },{ 185,27 }}, // Georgian/Georgian/Georgia
-       {    42,     7,    82,{ 1480,87 },{ 1480,87 },{ 185,27 },{ 1480,87 },{ 1480,87 },{ 185,27 }}, // German/Latin/Germany
-       {    42,     7,    14,{ 1480,87 },{ 1480,87 },{ 185,27 },{ 1480,87 },{ 1480,87 },{ 185,27 }}, // German/Latin/Austria
-       {    42,     7,    21,{ 1480,87 },{ 1480,87 },{ 185,27 },{ 1480,87 },{ 1480,87 },{ 185,27 }}, // German/Latin/Belgium
-       {    42,     7,   106,{ 1480,87 },{ 1480,87 },{ 185,27 },{ 1480,87 },{ 1480,87 },{ 185,27 }}, // German/Latin/Italy
-       {    42,     7,   123,{ 1480,87 },{ 1480,87 },{ 185,27 },{ 1480,87 },{ 1480,87 },{ 185,27 }}, // German/Latin/Liechtenstein
-       {    42,     7,   125,{ 1480,87 },{ 1480,87 },{ 185,27 },{ 1480,87 },{ 1480,87 },{ 185,27 }}, // German/Latin/Luxembourg
-       {    42,     7,   206,{ 1480,87 },{ 1480,87 },{ 185,27 },{ 1480,87 },{ 1480,87 },{ 185,27 }}, // German/Latin/Switzerland
-       {    43,    16,    85,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Greek/Greek/Greece
-       {    43,    16,    56,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Greek/Greek/Cyprus
-       {    44,     7,    86,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Greenlandic/Latin/Greenland
-       {    45,     7,   168,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Guarani/Latin/Paraguay
-       {    46,    17,   100,{ 1567,86 },{ 1567,86 },{ 185,27 },{ 1567,86 },{ 1567,86 },{ 185,27 }}, // Gujarati/Gujarati/India
-       {    47,     7,   157,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Hausa/Latin/Nigeria
-       {    47,     1,   157,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Hausa/Arabic/Nigeria
-       {    47,     7,    83,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Hausa/Latin/Ghana
-       {    47,     7,   156,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Hausa/Latin/Niger
-       {    48,    18,   105,{ 1653,69 },{ 1653,69 },{ 185,27 },{ 1653,69 },{ 1653,69 },{ 185,27 }}, // Hebrew/Hebrew/Israel
-       {    49,    13,   100,{ 1722,82 },{ 1722,82 },{ 185,27 },{ 1722,82 },{ 1722,82 },{ 185,27 }}, // Hindi/Devanagari/India
-       {    50,     7,    98,{ 682,84 },{ 682,84 },{ 185,27 },{ 682,84 },{ 682,84 },{ 185,27 }}, // Hungarian/Latin/Hungary
-       {    51,     7,    99,{ 682,84 },{ 682,84 },{ 185,27 },{ 682,84 },{ 682,84 },{ 185,27 }}, // Icelandic/Latin/Iceland
-       {    52,     7,   101,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Indonesian/Latin/Indonesia
-       {    53,     7,   260,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Interlingua/Latin/World
-       {    55,    44,    38,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Inuktitut/Canadian Aboriginal/Canada
-       {    55,     7,    38,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Inuktitut/Latin/Canada
-       {    57,     7,   104,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Irish/Latin/Ireland
-       {    57,     7,   224,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Irish/Latin/United Kingdom
-       {    58,     7,   106,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Italian/Latin/Italy
-       {    58,     7,   184,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Italian/Latin/San Marino
-       {    58,     7,   206,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Italian/Latin/Switzerland
-       {    58,     7,   230,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Italian/Latin/Vatican City State
-       {    59,    19,   108,{ 1804,78 },{ 1804,78 },{ 185,27 },{ 1804,78 },{ 1804,78 },{ 185,27 }}, // Japanese/Japanese/Japan
-       {    60,     7,   101,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Javanese/Latin/Indonesia
-       {    61,    21,   100,{ 1882,93 },{ 1882,93 },{ 185,27 },{ 1882,93 },{ 1882,93 },{ 185,27 }}, // Kannada/Kannada/India
-       {    62,     1,   100,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Kashmiri/Arabic/India
-       {    63,     2,   110,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Kazakh/Cyrillic/Kazakhstan
-       {    64,     7,   179,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Kinyarwanda/Latin/Rwanda
-       {    65,     2,   116,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Kirghiz/Cyrillic/Kyrgyzstan
-       {    66,    22,   114,{ 1975,55 },{ 1975,55 },{ 185,27 },{ 1975,55 },{ 1975,55 },{ 185,27 }}, // Korean/Korean/South Korea
-       {    66,    22,   113,{ 1975,55 },{ 1975,55 },{ 185,27 },{ 1975,55 },{ 1975,55 },{ 185,27 }}, // Korean/Korean/North Korea
-       {    67,     7,   217,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Kurdish/Latin/Turkey
-       {    68,     7,    35,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Rundi/Latin/Burundi
-       {    69,    23,   117,{ 2030,80 },{ 2110,81 },{ 185,27 },{ 2191,80 },{ 2110,81 },{ 185,27 }}, // Lao/Lao/Laos
-       {    71,     7,   118,{ 2271,93 },{ 2271,93 },{ 185,27 },{ 2271,93 },{ 2271,93 },{ 185,27 }}, // Latvian/Latin/Latvia
-       {    72,     7,    49,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Lingala/Latin/Congo Kinshasa
-       {    72,     7,     6,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Lingala/Latin/Angola
-       {    72,     7,    41,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Lingala/Latin/Central African Republic
-       {    72,     7,    50,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Lingala/Latin/Congo Brazzaville
-       {    73,     7,   124,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Lithuanian/Latin/Lithuania
-       {    74,     2,   127,{ 2364,80 },{ 2364,80 },{ 185,27 },{ 2364,80 },{ 2364,80 },{ 185,27 }}, // Macedonian/Cyrillic/Macedonia
-       {    75,     7,   128,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Malagasy/Latin/Madagascar
-       {    76,     7,   130,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Malay/Latin/Malaysia
-       {    76,     1,   130,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Malay/Arabic/Malaysia
-       {    76,     7,    32,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Malay/Latin/Brunei
-       {    76,     7,   190,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Malay/Latin/Singapore
-       {    77,    24,   100,{ 2444,92 },{ 2444,92 },{ 2536,40 },{ 2444,92 },{ 2444,92 },{ 2536,40 }}, // Malayalam/Malayalam/India
-       {    78,     7,   133,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Maltese/Latin/Malta
-       {    79,     7,   154,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Maori/Latin/New Zealand
-       {    80,    13,   100,{ 2576,81 },{ 2576,81 },{ 2657,27 },{ 2576,81 },{ 2576,81 },{ 2657,27 }}, // Marathi/Devanagari/India
-       {    82,     2,   143,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Mongolian/Cyrillic/Mongolia
-       {    82,     8,    44,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Mongolian/Mongolian/China
-       {    84,    13,   150,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Nepali/Devanagari/Nepal
-       {    84,    13,   100,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Nepali/Devanagari/India
-       {    85,     7,   161,{ 682,84 },{ 682,84 },{ 185,27 },{ 682,84 },{ 682,84 },{ 185,27 }}, // Norwegian Bokmal/Latin/Norway
-       {    85,     7,   203,{ 682,84 },{ 682,84 },{ 185,27 },{ 682,84 },{ 682,84 },{ 185,27 }}, // Norwegian Bokmal/Latin/Svalbard And Jan Mayen Islands
-       {    86,     7,    74,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Occitan/Latin/France
-       {    87,    26,   100,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Oriya/Oriya/India
-       {    88,     1,     1,{ 2684,63 },{ 2684,63 },{ 2747,27 },{ 2684,63 },{ 2684,63 },{ 2747,27 }}, // Pashto/Arabic/Afghanistan
-       {    88,     1,   163,{ 2684,63 },{ 2684,63 },{ 2747,27 },{ 2684,63 },{ 2684,63 },{ 2747,27 }}, // Pashto/Arabic/Pakistan
-       {    89,     1,   102,{ 2774,67 },{ 2774,67 },{ 2841,24 },{ 2774,67 },{ 2774,67 },{ 2841,24 }}, // Persian/Arabic/Iran
-       {    89,     1,     1,{ 2774,67 },{ 2774,67 },{ 2865,24 },{ 2774,67 },{ 2889,57 },{ 2841,24 }}, // Persian/Arabic/Afghanistan
-       {    90,     7,   172,{ 2946,84 },{ 2946,84 },{ 185,27 },{ 2946,84 },{ 2946,84 },{ 185,27 }}, // Polish/Latin/Poland
-       {    91,     7,    30,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Portuguese/Latin/Brazil
-       {    91,     7,     6,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Portuguese/Latin/Angola
-       {    91,     7,    39,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Portuguese/Latin/Cape Verde
-       {    91,     7,    62,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Portuguese/Latin/East Timor
-       {    91,     7,    66,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Portuguese/Latin/Equatorial Guinea
-       {    91,     7,    92,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Portuguese/Latin/Guinea Bissau
-       {    91,     7,   125,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Portuguese/Latin/Luxembourg
-       {    91,     7,   126,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Portuguese/Latin/Macau
-       {    91,     7,   146,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Portuguese/Latin/Mozambique
-       {    91,     7,   173,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Portuguese/Latin/Portugal
-       {    91,     7,   185,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Portuguese/Latin/Sao Tome And Principe
-       {    91,     7,   206,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Portuguese/Latin/Switzerland
-       {    92,     4,   100,{ 3030,78 },{ 3030,78 },{ 185,27 },{ 3030,78 },{ 3030,78 },{ 185,27 }}, // Punjabi/Gurmukhi/India
-       {    92,     1,   163,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Punjabi/Arabic/Pakistan
-       {    93,     7,   169,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Quechua/Latin/Peru
-       {    93,     7,    26,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Quechua/Latin/Bolivia
-       {    93,     7,    63,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Quechua/Latin/Ecuador
-       {    94,     7,   206,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Romansh/Latin/Switzerland
-       {    95,     7,   177,{ 3108,86 },{ 3108,86 },{ 185,27 },{ 3108,86 },{ 3108,86 },{ 185,27 }}, // Romanian/Latin/Romania
-       {    95,     7,   141,{ 3108,86 },{ 3108,86 },{ 185,27 },{ 3108,86 },{ 3108,86 },{ 185,27 }}, // Romanian/Latin/Moldova
-       {    96,     2,   178,{ 3194,81 },{ 3194,81 },{ 185,27 },{ 3194,81 },{ 3194,81 },{ 185,27 }}, // Russian/Cyrillic/Russia
-       {    96,     2,    20,{ 3194,81 },{ 3194,81 },{ 185,27 },{ 3194,81 },{ 3194,81 },{ 185,27 }}, // Russian/Cyrillic/Belarus
-       {    96,     2,   110,{ 3194,81 },{ 3194,81 },{ 185,27 },{ 3194,81 },{ 3194,81 },{ 185,27 }}, // Russian/Cyrillic/Kazakhstan
-       {    96,     2,   116,{ 3194,81 },{ 3194,81 },{ 185,27 },{ 3194,81 },{ 3194,81 },{ 185,27 }}, // Russian/Cyrillic/Kyrgyzstan
-       {    96,     2,   141,{ 3194,81 },{ 3194,81 },{ 185,27 },{ 3194,81 },{ 3194,81 },{ 185,27 }}, // Russian/Cyrillic/Moldova
-       {    96,     2,   222,{ 3194,81 },{ 3194,81 },{ 185,27 },{ 3194,81 },{ 3194,81 },{ 185,27 }}, // Russian/Cyrillic/Ukraine
-       {    98,     7,    41,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Sango/Latin/Central African Republic
-       {    99,    13,   100,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Sanskrit/Devanagari/India
-       {   100,     2,   243,{ 3275,81 },{ 3275,81 },{ 185,27 },{ 3275,81 },{ 3275,81 },{ 185,27 }}, // Serbian/Cyrillic/Serbia
-       {   100,     2,    27,{ 3275,81 },{ 3275,81 },{ 185,27 },{ 3275,81 },{ 3275,81 },{ 185,27 }}, // Serbian/Cyrillic/Bosnia And Herzegowina
-       {   100,     2,   242,{ 3275,81 },{ 3275,81 },{ 185,27 },{ 3275,81 },{ 3275,81 },{ 185,27 }}, // Serbian/Cyrillic/Montenegro
-       {   100,     2,   257,{ 3275,81 },{ 3275,81 },{ 185,27 },{ 3275,81 },{ 3275,81 },{ 185,27 }}, // Serbian/Cyrillic/Kosovo
-       {   100,     7,    27,{ 3356,81 },{ 3356,81 },{ 185,27 },{ 3356,81 },{ 3356,81 },{ 185,27 }}, // Serbian/Latin/Bosnia And Herzegowina
-       {   100,     7,   242,{ 3356,81 },{ 3356,81 },{ 185,27 },{ 3356,81 },{ 3356,81 },{ 185,27 }}, // Serbian/Latin/Montenegro
-       {   100,     7,   243,{ 3356,81 },{ 3356,81 },{ 185,27 },{ 3356,81 },{ 3356,81 },{ 185,27 }}, // Serbian/Latin/Serbia
-       {   100,     7,   257,{ 3356,81 },{ 3356,81 },{ 185,27 },{ 3356,81 },{ 3356,81 },{ 185,27 }}, // Serbian/Latin/Kosovo
-       {   101,     2,    81,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Ossetic/Cyrillic/Georgia
-       {   101,     2,   178,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Ossetic/Cyrillic/Russia
-       {   102,     7,   195,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Southern Sotho/Latin/South Africa
-       {   103,     7,   195,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Tswana/Latin/South Africa
-       {   104,     7,   240,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Shona/Latin/Zimbabwe
-       {   105,     1,   163,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Sindhi/Arabic/Pakistan
-       {   106,    32,   198,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Sinhala/Sinhala/Sri Lanka
-       {   107,     7,   195,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Swati/Latin/South Africa
-       {   108,     7,   191,{ 600,82 },{ 600,82 },{ 185,27 },{ 600,82 },{ 600,82 },{ 185,27 }}, // Slovak/Latin/Slovakia
-       {   109,     7,   192,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Slovenian/Latin/Slovenia
-       {   110,     7,   194,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Somali/Latin/Somalia
-       {   110,     7,    59,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Somali/Latin/Djibouti
-       {   110,     7,    69,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Somali/Latin/Ethiopia
-       {   110,     7,   111,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Somali/Latin/Kenya
-       {   111,     7,   197,{ 682,84 },{ 682,84 },{ 185,27 },{ 682,84 },{ 682,84 },{ 185,27 }}, // Spanish/Latin/Spain
-       {   111,     7,    10,{ 682,84 },{ 682,84 },{ 185,27 },{ 682,84 },{ 682,84 },{ 185,27 }}, // Spanish/Latin/Argentina
-       {   111,     7,    22,{ 682,84 },{ 682,84 },{ 185,27 },{ 682,84 },{ 682,84 },{ 185,27 }}, // Spanish/Latin/Belize
-       {   111,     7,    26,{ 682,84 },{ 682,84 },{ 185,27 },{ 682,84 },{ 682,84 },{ 185,27 }}, // Spanish/Latin/Bolivia
-       {   111,     7,    30,{ 682,84 },{ 682,84 },{ 185,27 },{ 682,84 },{ 682,84 },{ 185,27 }}, // Spanish/Latin/Brazil
-       {   111,     7,    43,{ 682,84 },{ 682,84 },{ 185,27 },{ 682,84 },{ 682,84 },{ 185,27 }}, // Spanish/Latin/Chile
-       {   111,     7,    47,{ 682,84 },{ 682,84 },{ 185,27 },{ 682,84 },{ 682,84 },{ 185,27 }}, // Spanish/Latin/Colombia
-       {   111,     7,    52,{ 682,84 },{ 682,84 },{ 185,27 },{ 682,84 },{ 682,84 },{ 185,27 }}, // Spanish/Latin/Costa Rica
-       {   111,     7,    55,{ 682,84 },{ 682,84 },{ 185,27 },{ 682,84 },{ 682,84 },{ 185,27 }}, // Spanish/Latin/Cuba
-       {   111,     7,    61,{ 682,84 },{ 682,84 },{ 185,27 },{ 682,84 },{ 682,84 },{ 185,27 }}, // Spanish/Latin/Dominican Republic
-       {   111,     7,    63,{ 682,84 },{ 682,84 },{ 185,27 },{ 682,84 },{ 682,84 },{ 185,27 }}, // Spanish/Latin/Ecuador
-       {   111,     7,    65,{ 682,84 },{ 682,84 },{ 185,27 },{ 682,84 },{ 682,84 },{ 185,27 }}, // Spanish/Latin/El Salvador
-       {   111,     7,    66,{ 682,84 },{ 682,84 },{ 185,27 },{ 682,84 },{ 682,84 },{ 185,27 }}, // Spanish/Latin/Equatorial Guinea
-       {   111,     7,    90,{ 682,84 },{ 682,84 },{ 185,27 },{ 682,84 },{ 682,84 },{ 185,27 }}, // Spanish/Latin/Guatemala
-       {   111,     7,    96,{ 682,84 },{ 682,84 },{ 185,27 },{ 682,84 },{ 682,84 },{ 185,27 }}, // Spanish/Latin/Honduras
-       {   111,     7,   139,{ 682,84 },{ 682,84 },{ 185,27 },{ 682,84 },{ 682,84 },{ 185,27 }}, // Spanish/Latin/Mexico
-       {   111,     7,   155,{ 682,84 },{ 682,84 },{ 185,27 },{ 682,84 },{ 682,84 },{ 185,27 }}, // Spanish/Latin/Nicaragua
-       {   111,     7,   166,{ 682,84 },{ 682,84 },{ 185,27 },{ 682,84 },{ 682,84 },{ 185,27 }}, // Spanish/Latin/Panama
-       {   111,     7,   168,{ 682,84 },{ 682,84 },{ 185,27 },{ 682,84 },{ 682,84 },{ 185,27 }}, // Spanish/Latin/Paraguay
-       {   111,     7,   169,{ 682,84 },{ 682,84 },{ 185,27 },{ 682,84 },{ 682,84 },{ 185,27 }}, // Spanish/Latin/Peru
-       {   111,     7,   170,{ 682,84 },{ 682,84 },{ 185,27 },{ 682,84 },{ 682,84 },{ 185,27 }}, // Spanish/Latin/Philippines
-       {   111,     7,   174,{ 682,84 },{ 682,84 },{ 185,27 },{ 682,84 },{ 682,84 },{ 185,27 }}, // Spanish/Latin/Puerto Rico
-       {   111,     7,   225,{ 682,84 },{ 682,84 },{ 185,27 },{ 682,84 },{ 682,84 },{ 185,27 }}, // Spanish/Latin/United States
-       {   111,     7,   227,{ 682,84 },{ 682,84 },{ 185,27 },{ 682,84 },{ 682,84 },{ 185,27 }}, // Spanish/Latin/Uruguay
-       {   111,     7,   231,{ 682,84 },{ 682,84 },{ 185,27 },{ 682,84 },{ 682,84 },{ 185,27 }}, // Spanish/Latin/Venezuela
-       {   111,     7,   238,{ 682,84 },{ 682,84 },{ 185,27 },{ 682,84 },{ 682,84 },{ 185,27 }}, // Spanish/Latin/Canary Islands
-       {   111,     7,   246,{ 682,84 },{ 682,84 },{ 185,27 },{ 682,84 },{ 682,84 },{ 185,27 }}, // Spanish/Latin/Latin America
-       {   111,     7,   250,{ 682,84 },{ 682,84 },{ 185,27 },{ 682,84 },{ 682,84 },{ 185,27 }}, // Spanish/Latin/Ceuta And Melilla
-       {   112,     7,   101,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Sundanese/Latin/Indonesia
-       {   113,     7,   210,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Swahili/Latin/Tanzania
-       {   113,     7,    49,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Swahili/Latin/Congo Kinshasa
-       {   113,     7,   111,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Swahili/Latin/Kenya
-       {   113,     7,   221,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Swahili/Latin/Uganda
-       {   114,     7,   205,{ 3437,84 },{ 3437,84 },{ 185,27 },{ 3521,84 },{ 3521,84 },{ 185,27 }}, // Swedish/Latin/Sweden
-       {   114,     7,    73,{ 3437,84 },{ 3437,84 },{ 185,27 },{ 3521,84 },{ 3521,84 },{ 185,27 }}, // Swedish/Latin/Finland
-       {   114,     7,   248,{ 3437,84 },{ 3437,84 },{ 185,27 },{ 3521,84 },{ 3521,84 },{ 185,27 }}, // Swedish/Latin/Aland Islands
-       {   115,     7,   106,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Sardinian/Latin/Italy
-       {   116,     2,   209,{ 3605,81 },{ 3605,81 },{ 185,27 },{ 3605,81 },{ 3605,81 },{ 185,27 }}, // Tajik/Cyrillic/Tajikistan
-       {   117,    27,   100,{ 3686,64 },{ 3750,94 },{ 185,27 },{ 3686,64 },{ 3750,94 },{ 185,27 }}, // Tamil/Tamil/India
-       {   117,    27,   130,{ 3686,64 },{ 3750,94 },{ 185,27 },{ 3686,64 },{ 3750,94 },{ 185,27 }}, // Tamil/Tamil/Malaysia
-       {   117,    27,   190,{ 3686,64 },{ 3750,94 },{ 185,27 },{ 3686,64 },{ 3750,94 },{ 185,27 }}, // Tamil/Tamil/Singapore
-       {   117,    27,   198,{ 3686,64 },{ 3750,94 },{ 185,27 },{ 3686,64 },{ 3750,94 },{ 185,27 }}, // Tamil/Tamil/Sri Lanka
-       {   118,     2,   178,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Tatar/Cyrillic/Russia
-       {   119,    28,   100,{ 3844,89 },{ 3844,89 },{ 185,27 },{ 3844,89 },{ 3844,89 },{ 185,27 }}, // Telugu/Telugu/India
-       {   120,    30,   211,{ 3933,99 },{ 3933,99 },{ 185,27 },{ 3933,99 },{ 3933,99 },{ 185,27 }}, // Thai/Thai/Thailand
-       {   121,    31,    44,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Tibetan/Tibetan/China
-       {   121,    31,   100,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Tibetan/Tibetan/India
-       {   122,    14,    69,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Tigrinya/Ethiopic/Ethiopia
-       {   122,    14,    67,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Tigrinya/Ethiopic/Eritrea
-       {   123,     7,   214,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Tongan/Latin/Tonga
-       {   124,     7,   195,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Tsonga/Latin/South Africa
-       {   125,     7,   217,{ 4032,81 },{ 4032,81 },{ 185,27 },{ 4032,81 },{ 4032,81 },{ 185,27 }}, // Turkish/Latin/Turkey
-       {   125,     7,    56,{ 4032,81 },{ 4032,81 },{ 185,27 },{ 4032,81 },{ 4032,81 },{ 185,27 }}, // Turkish/Latin/Cyprus
-       {   126,     7,   218,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Turkmen/Latin/Turkmenistan
-       {   128,     1,    44,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Uighur/Arabic/China
-       {   129,     2,   222,{ 4113,50 },{ 4163,81 },{ 185,27 },{ 4244,58 },{ 4163,81 },{ 185,27 }}, // Ukrainian/Cyrillic/Ukraine
-       {   130,     1,   163,{ 4302,67 },{ 4302,67 },{ 185,27 },{ 4302,67 },{ 4302,67 },{ 185,27 }}, // Urdu/Arabic/Pakistan
-       {   130,     1,   100,{ 4302,67 },{ 4302,67 },{ 185,27 },{ 4302,67 },{ 4302,67 },{ 185,27 }}, // Urdu/Arabic/India
-       {   131,     7,   228,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Uzbek/Latin/Uzbekistan
-       {   131,     1,     1,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Uzbek/Arabic/Afghanistan
-       {   131,     2,   228,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Uzbek/Cyrillic/Uzbekistan
-       {   132,     7,   232,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Vietnamese/Latin/Vietnam
-       {   133,     7,   260,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Volapuk/Latin/World
-       {   134,     7,   224,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Welsh/Latin/United Kingdom
-       {   135,     7,   187,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Wolof/Latin/Senegal
-       {   136,     7,   195,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Xhosa/Latin/South Africa
-       {   137,    18,   260,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Yiddish/Hebrew/World
-       {   138,     7,   157,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Yoruba/Latin/Nigeria
-       {   138,     7,    23,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Yoruba/Latin/Benin
-       {   140,     7,   195,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Zulu/Latin/South Africa
-       {   141,     7,   161,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Norwegian Nynorsk/Latin/Norway
-       {   142,     7,    27,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Bosnian/Latin/Bosnia And Herzegowina
-       {   142,     2,    27,{ 3275,81 },{ 3275,81 },{ 185,27 },{ 3275,81 },{ 3275,81 },{ 185,27 }}, // Bosnian/Cyrillic/Bosnia And Herzegowina
-       {   143,    29,   131,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Divehi/Thaana/Maldives
-       {   144,     7,   251,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Manx/Latin/Isle Of Man
-       {   145,     7,   224,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Cornish/Latin/United Kingdom
-       {   146,     7,    83,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Akan/Latin/Ghana
-       {   147,    13,   100,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Konkani/Devanagari/India
-       {   148,     7,    83,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Ga/Latin/Ghana
-       {   149,     7,   157,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Igbo/Latin/Nigeria
-       {   150,     7,   111,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Kamba/Latin/Kenya
-       {   151,    33,   103,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Syriac/Syriac/Iraq
-       {   152,    14,    67,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Blin/Ethiopic/Eritrea
-       {   153,    14,    69,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Geez/Ethiopic/Ethiopia
-       {   155,     7,    69,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Sidamo/Latin/Ethiopia
-       {   156,     7,   157,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Atsam/Latin/Nigeria
-       {   157,    14,    67,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Tigre/Ethiopic/Eritrea
-       {   158,     7,   157,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Jju/Latin/Nigeria
-       {   159,     7,   106,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Friulian/Latin/Italy
-       {   160,     7,   195,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Venda/Latin/South Africa
-       {   161,     7,    83,{ 4369,48 },{ 4417,87 },{ 185,27 },{ 4369,48 },{ 4417,87 },{ 185,27 }}, // Ewe/Latin/Ghana
-       {   161,     7,   212,{ 4369,48 },{ 4417,87 },{ 185,27 },{ 4369,48 },{ 4417,87 },{ 185,27 }}, // Ewe/Latin/Togo
-       {   162,    14,    69,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Walamo/Ethiopic/Ethiopia
-       {   163,     7,   225,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Hawaiian/Latin/United States
-       {   164,     7,   157,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Tyap/Latin/Nigeria
-       {   165,     7,   129,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Nyanja/Latin/Malawi
-       {   166,     7,   170,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Filipino/Latin/Philippines
-       {   167,     7,   206,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Swiss German/Latin/Switzerland
-       {   167,     7,    74,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Swiss German/Latin/France
-       {   167,     7,   123,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Swiss German/Latin/Liechtenstein
-       {   168,    34,    44,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Sichuan Yi/Yi/China
-       {   169,     7,   121,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Kpelle/Latin/Liberia
-       {   170,     7,    82,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Low German/Latin/Germany
-       {   170,     7,   151,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Low German/Latin/Netherlands
-       {   171,     7,   195,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // South Ndebele/Latin/South Africa
-       {   172,     7,   195,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Northern Sotho/Latin/South Africa
-       {   173,     7,   161,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Northern Sami/Latin/Norway
-       {   173,     7,    73,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Northern Sami/Latin/Finland
-       {   173,     7,   205,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Northern Sami/Latin/Sweden
-       {   174,     7,   208,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Taroko/Latin/Taiwan
-       {   175,     7,   111,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Gusii/Latin/Kenya
-       {   176,     7,   111,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Taita/Latin/Kenya
-       {   177,     7,   187,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Fulah/Latin/Senegal
-       {   177,     7,    34,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Fulah/Latin/Burkina Faso
-       {   177,     7,    37,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Fulah/Latin/Cameroon
-       {   177,     7,    80,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Fulah/Latin/Gambia
-       {   177,     7,    83,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Fulah/Latin/Ghana
-       {   177,     7,    91,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Fulah/Latin/Guinea
-       {   177,     7,    92,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Fulah/Latin/Guinea Bissau
-       {   177,     7,   121,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Fulah/Latin/Liberia
-       {   177,     7,   136,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Fulah/Latin/Mauritania
-       {   177,     7,   156,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Fulah/Latin/Niger
-       {   177,     7,   157,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Fulah/Latin/Nigeria
-       {   177,     7,   189,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Fulah/Latin/Sierra Leone
-       {   177,   134,    91,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Fulah/Adlam/Guinea
-       {   178,     7,   111,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Kikuyu/Latin/Kenya
-       {   179,     7,   111,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Samburu/Latin/Kenya
-       {   180,     7,   146,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Sena/Latin/Mozambique
-       {   181,     7,   240,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // North Ndebele/Latin/Zimbabwe
-       {   182,     7,   210,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Rombo/Latin/Tanzania
-       {   183,     9,   145,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Tachelhit/Tifinagh/Morocco
-       {   183,     7,   145,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Tachelhit/Latin/Morocco
-       {   184,     7,     3,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Kabyle/Latin/Algeria
-       {   185,     7,   221,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Nyankole/Latin/Uganda
-       {   186,     7,   210,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Bena/Latin/Tanzania
-       {   187,     7,   210,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Vunjo/Latin/Tanzania
-       {   188,     7,   132,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Bambara/Latin/Mali
-       {   188,    75,   132,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Bambara/Nko/Mali
-       {   189,     7,   111,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Embu/Latin/Kenya
-       {   190,    12,   225,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Cherokee/Cherokee/United States
-       {   191,     7,   137,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Morisyen/Latin/Mauritius
-       {   192,     7,   210,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Makonde/Latin/Tanzania
-       {   193,     7,   210,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Langi/Latin/Tanzania
-       {   194,     7,   221,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Ganda/Latin/Uganda
-       {   195,     7,   239,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Bemba/Latin/Zambia
-       {   196,     7,    39,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Kabuverdianu/Latin/Cape Verde
-       {   197,     7,   111,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Meru/Latin/Kenya
-       {   198,     7,   111,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Kalenjin/Latin/Kenya
-       {   199,     7,   148,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Nama/Latin/Namibia
-       {   200,     7,   210,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Machame/Latin/Tanzania
-       {   201,     7,    82,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Colognian/Latin/Germany
-       {   202,     7,   111,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Masai/Latin/Kenya
-       {   202,     7,   210,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Masai/Latin/Tanzania
-       {   203,     7,   221,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Soga/Latin/Uganda
-       {   204,     7,   111,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Luyia/Latin/Kenya
-       {   205,     7,   210,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Asu/Latin/Tanzania
-       {   206,     7,   221,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Teso/Latin/Uganda
-       {   206,     7,   111,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Teso/Latin/Kenya
-       {   207,     7,    67,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Saho/Latin/Eritrea
-       {   208,     7,   132,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Koyra Chiini/Latin/Mali
-       {   209,     7,   210,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Rwa/Latin/Tanzania
-       {   210,     7,   111,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Luo/Latin/Kenya
-       {   211,     7,   221,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Chiga/Latin/Uganda
-       {   212,     7,   145,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Central Morocco Tamazight/Latin/Morocco
-       {   213,     7,   132,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Koyraboro Senni/Latin/Mali
-       {   214,     7,   210,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Shambala/Latin/Tanzania
-       {   215,    13,   100,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Bodo/Devanagari/India
-       {   218,     2,   178,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Chechen/Cyrillic/Russia
-       {   219,     2,   178,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Church/Cyrillic/Russia
-       {   220,     2,   178,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Chuvash/Cyrillic/Russia
-       {   230,     7,    49,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Luba Katanga/Latin/Congo Kinshasa
-       {   231,     7,   125,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Luxembourgish/Latin/Luxembourg
-       {   236,     7,    21,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Walloon/Latin/Belgium
-       {   237,     7,    37,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Aghem/Latin/Cameroon
-       {   238,     7,    37,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Basaa/Latin/Cameroon
-       {   239,     7,   156,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Zarma/Latin/Niger
-       {   240,     7,    37,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Duala/Latin/Cameroon
-       {   241,     7,   187,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Jola Fonyi/Latin/Senegal
-       {   242,     7,    37,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Ewondo/Latin/Cameroon
-       {   243,     7,    37,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Bafia/Latin/Cameroon
-       {   244,     7,   146,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Makhuwa Meetto/Latin/Mozambique
-       {   245,     7,    37,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Mundang/Latin/Cameroon
-       {   246,     7,    37,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Kwasio/Latin/Cameroon
-       {   247,     7,   254,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Nuer/Latin/South Sudan
-       {   248,     2,   178,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Sakha/Cyrillic/Russia
-       {   249,     7,   210,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Sangu/Latin/Tanzania
-       {   251,     7,   156,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Tasawaq/Latin/Niger
-       {   252,    35,   121,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Vai/Vai/Liberia
-       {   252,     7,   121,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Vai/Latin/Liberia
-       {   253,     7,   206,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Walser/Latin/Switzerland
-       {   254,     7,    37,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Yangben/Latin/Cameroon
-       {   256,     7,   197,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Asturian/Latin/Spain
-       {   257,     7,    37,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Ngomba/Latin/Cameroon
-       {   258,     7,    37,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Kako/Latin/Cameroon
-       {   259,     7,    37,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Meta/Latin/Cameroon
-       {   260,     7,    37,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Ngiemboon/Latin/Cameroon
-       {   261,     7,   197,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Aragonese/Latin/Spain
-       {   290,    11,   100,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Manipuri/Bengali/India
-       {   309,   100,   232,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Tai Dam/Tai Viet/Vietnam
-       {   312,     7,    37,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Akoose/Latin/Cameroon
-       {   313,     7,   225,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Lakota/Latin/United States
-       {   314,     9,   145,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Standard Moroccan Tamazight/Tifinagh/Morocco
-       {   315,     7,    43,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Mapuche/Latin/Chile
-       {   316,     1,   103,{ 4504,102 },{ 4504,102 },{ 185,27 },{ 4504,102 },{ 4504,102 },{ 185,27 }}, // Central Kurdish/Arabic/Iraq
-       {   316,     1,   102,{ 4504,102 },{ 4504,102 },{ 185,27 },{ 4504,102 },{ 4504,102 },{ 185,27 }}, // Central Kurdish/Arabic/Iran
-       {   317,     7,    82,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Lower Sorbian/Latin/Germany
-       {   318,     7,    82,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Upper Sorbian/Latin/Germany
-       {   319,     7,    37,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Kenyang/Latin/Cameroon
-       {   320,     7,    38,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Mohawk/Latin/Canada
-       {   321,    75,    91,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Nko/Nko/Guinea
-       {   322,     7,   260,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Prussian/Latin/World
-       {   323,     7,    90,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Kiche/Latin/Guatemala
-       {   324,     7,   205,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Southern Sami/Latin/Sweden
-       {   325,     7,   205,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Lule Sami/Latin/Sweden
-       {   326,     7,    73,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Inari Sami/Latin/Finland
-       {   327,     7,    73,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Skolt Sami/Latin/Finland
-       {   328,     7,    13,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Warlpiri/Latin/Australia
-       {   346,     1,   102,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Mazanderani/Arabic/Iran
-       {   349,     1,   102,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Northern Luri/Arabic/Iran
-       {   349,     1,   103,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Northern Luri/Arabic/Iraq
-       {   357,     6,    97,{ 484,39 },{ 484,39 },{ 185,27 },{ 484,39 },{ 484,39 },{ 185,27 }}, // Cantonese/Traditional Han/Hong Kong
-       {   357,     5,    44,{ 484,39 },{ 484,39 },{ 185,27 },{ 484,39 },{ 484,39 },{ 185,27 }}, // Cantonese/Simplified Han/China
-       {   358,   138,   225,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Osage/Osage/United States
-       {   360,     7,   260,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Ido/Latin/World
-       {   361,     7,   260,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Lojban/Latin/World
-       {   362,     7,   106,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Sicilian/Latin/Italy
-       {   363,     1,   102,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Southern Kurdish/Arabic/Iran
-       {   364,     1,   163,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Western Balochi/Arabic/Pakistan
-       {   365,     7,   170,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Cebuano/Latin/Philippines
-       {   366,     2,   178,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Erzya/Cyrillic/Russia
-       {   367,     7,   225,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Chickasaw/Latin/United States
-       {   368,     7,   225,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Muscogee/Latin/United States
-       {   369,     7,   172,{ 48,84 },{ 48,84 },{ 185,27 },{ 48,84 },{ 48,84 },{ 185,27 }}, // Silesian/Latin/Poland
-       {     0,     0,     0,{  0,0},{  0,0},{  0,0},{  0,0},{  0,0},{  0,0}}, // trailing zeros
+   //  lang   script terr  sLng long sSrt shrt sNrw naro Sizes...
+      {     1,     0,     0,    0,    0,   83,   83,  130,  153, 83, 83, 47, 47, 23, 26 },// C/AnyScript/AnyCountry
+      {     3,     7,    69,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Oromo/Latin/Ethiopia
+      {     3,     7,   111,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Oromo/Latin/Kenya
+      {     4,     7,    69,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Afar/Latin/Ethiopia
+      {     5,     7,   195,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Afrikaans/Latin/South Africa
+      {     5,     7,   148,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Afrikaans/Latin/Namibia
+      {     6,     7,     2,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Albanian/Latin/Albania
+      {     6,     7,   127,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Albanian/Latin/Macedonia
+      {     6,     7,   257,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Albanian/Latin/Kosovo
+      {     7,    14,    69,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Amharic/Ethiopic/Ethiopia
+      {     8,     1,    64,  179,  179,  179,  179,  153,  153, 67, 67, 67, 67, 26, 26 },// Arabic/Arabic/Egypt
+      {     8,     1,     3,  179,  179,  179,  179,  153,  153, 67, 67, 67, 67, 26, 26 },// Arabic/Arabic/Algeria
+      {     8,     1,    17,  179,  179,  179,  179,  153,  153, 67, 67, 67, 67, 26, 26 },// Arabic/Arabic/Bahrain
+      {     8,     1,    42,  179,  179,  179,  179,  153,  153, 67, 67, 67, 67, 26, 26 },// Arabic/Arabic/Chad
+      {     8,     1,    48,  179,  179,  179,  179,  153,  153, 67, 67, 67, 67, 26, 26 },// Arabic/Arabic/Comoros
+      {     8,     1,    59,  179,  179,  179,  179,  153,  153, 67, 67, 67, 67, 26, 26 },// Arabic/Arabic/Djibouti
+      {     8,     1,    67,  179,  179,  179,  179,  153,  153, 67, 67, 67, 67, 26, 26 },// Arabic/Arabic/Eritrea
+      {     8,     1,   103,  179,  179,  179,  179,  153,  153, 67, 67, 67, 67, 26, 26 },// Arabic/Arabic/Iraq
+      {     8,     1,   105,  179,  179,  179,  179,  153,  153, 67, 67, 67, 67, 26, 26 },// Arabic/Arabic/Israel
+      {     8,     1,   109,  179,  179,  179,  179,  153,  153, 67, 67, 67, 67, 26, 26 },// Arabic/Arabic/Jordan
+      {     8,     1,   115,  179,  179,  179,  179,  153,  153, 67, 67, 67, 67, 26, 26 },// Arabic/Arabic/Kuwait
+      {     8,     1,   119,  179,  179,  179,  179,  153,  153, 67, 67, 67, 67, 26, 26 },// Arabic/Arabic/Lebanon
+      {     8,     1,   122,  179,  179,  179,  179,  153,  153, 67, 67, 67, 67, 26, 26 },// Arabic/Arabic/Libya
+      {     8,     1,   136,  179,  179,  179,  179,  153,  153, 67, 67, 67, 67, 26, 26 },// Arabic/Arabic/Mauritania
+      {     8,     1,   145,  179,  179,  179,  179,  153,  153, 67, 67, 67, 67, 26, 26 },// Arabic/Arabic/Morocco
+      {     8,     1,   162,  179,  179,  179,  179,  153,  153, 67, 67, 67, 67, 26, 26 },// Arabic/Arabic/Oman
+      {     8,     1,   165,  179,  179,  179,  179,  153,  153, 67, 67, 67, 67, 26, 26 },// Arabic/Arabic/Palestinian Territories
+      {     8,     1,   175,  179,  179,  179,  179,  153,  153, 67, 67, 67, 67, 26, 26 },// Arabic/Arabic/Qatar
+      {     8,     1,   186,  179,  179,  179,  179,  153,  153, 67, 67, 67, 67, 26, 26 },// Arabic/Arabic/Saudi Arabia
+      {     8,     1,   194,  179,  179,  179,  179,  153,  153, 67, 67, 67, 67, 26, 26 },// Arabic/Arabic/Somalia
+      {     8,     1,   201,  179,  179,  179,  179,  153,  153, 67, 67, 67, 67, 26, 26 },// Arabic/Arabic/Sudan
+      {     8,     1,   207,  179,  179,  179,  179,  153,  153, 67, 67, 67, 67, 26, 26 },// Arabic/Arabic/Syria
+      {     8,     1,   216,  179,  179,  179,  179,  153,  153, 67, 67, 67, 67, 26, 26 },// Arabic/Arabic/Tunisia
+      {     8,     1,   223,  179,  179,  179,  179,  153,  153, 67, 67, 67, 67, 26, 26 },// Arabic/Arabic/United Arab Emirates
+      {     8,     1,   236,  179,  179,  179,  179,  153,  153, 67, 67, 67, 67, 26, 26 },// Arabic/Arabic/Western Sahara
+      {     8,     1,   237,  179,  179,  179,  179,  153,  153, 67, 67, 67, 67, 26, 26 },// Arabic/Arabic/Yemen
+      {     8,     1,   254,  179,  179,  179,  179,  153,  153, 67, 67, 67, 67, 26, 26 },// Arabic/Arabic/South Sudan
+      {     8,     1,   260,  179,  179,  179,  179,  153,  153, 67, 67, 67, 67, 26, 26 },// Arabic/Arabic/World
+      {     9,    10,    11,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Armenian/Armenian/Armenia
+      {    10,    11,   100,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Assamese/Bengali/India
+      {    12,     7,    15,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Azerbaijani/Latin/Azerbaijan
+      {    12,     1,   102,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Azerbaijani/Arabic/Iran
+      {    12,     2,    15,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Azerbaijani/Cyrillic/Azerbaijan
+      {    13,     2,   178,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Bashkir/Cyrillic/Russia
+      {    14,     7,   197,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Basque/Latin/Spain
+      {    15,    11,    18,  246,  246,  334,  334,  421,  421, 88, 88, 87, 87, 26, 26 },// Bengali/Bengali/Bangladesh
+      {    15,    11,   100,  246,  246,  334,  334,  421,  421, 88, 88, 87, 87, 26, 26 },// Bengali/Bengali/India
+      {    16,    31,    25,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Dzongkha/Tibetan/Bhutan
+      {    19,     7,    74,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Breton/Latin/France
+      {    20,     2,    33,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Bulgarian/Cyrillic/Bulgaria
+      {    21,    25,   147,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Burmese/Myanmar/Myanmar
+      {    22,     2,    20,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Belarusian/Cyrillic/Belarus
+      {    23,    20,    36,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Khmer/Khmer/Cambodia
+      {    24,     7,   197,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Catalan/Latin/Spain
+      {    24,     7,     5,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Catalan/Latin/Andorra
+      {    24,     7,    74,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Catalan/Latin/France
+      {    24,     7,   106,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Catalan/Latin/Italy
+      {    25,     5,    44,  447,  447,  484,  484,  153,  153, 37, 37, 38, 38, 26, 26 },// Chinese/Simplified Han/China
+      {    25,     5,    97,  447,  447,  484,  484,  153,  153, 37, 37, 38, 38, 26, 26 },// Chinese/Simplified Han/Hong Kong
+      {    25,     5,   126,  447,  447,  484,  484,  153,  153, 37, 37, 38, 38, 26, 26 },// Chinese/Simplified Han/Macau
+      {    25,     5,   190,  447,  447,  484,  484,  153,  153, 37, 37, 38, 38, 26, 26 },// Chinese/Simplified Han/Singapore
+      {    25,     6,    97,  484,  484,  484,  484,  153,  153, 38, 38, 38, 38, 26, 26 },// Chinese/Traditional Han/Hong Kong
+      {    25,     6,   126,  484,  484,  484,  484,  153,  153, 38, 38, 38, 38, 26, 26 },// Chinese/Traditional Han/Macau
+      {    25,     6,   208,  484,  484,  484,  484,  153,  153, 38, 38, 38, 38, 26, 26 },// Chinese/Traditional Han/Taiwan
+      {    26,     7,    74,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Corsican/Latin/France
+      {    27,     7,    54,    0,    0,    0,    0,  522,  522, 83, 83, 83, 83, 38, 38 },// Croatian/Latin/Croatia
+      {    27,     7,    27,    0,    0,    0,    0,  522,  522, 83, 83, 83, 83, 38, 38 },// Croatian/Latin/Bosnia And Herzegowina
+      {    28,     7,    57,  560,  560,  560,  560,  153,  153, 81, 81, 81, 81, 26, 26 },// Czech/Latin/Czech Republic
+      {    29,     7,    58,  641,  641,  641,  641,  153,  153, 83, 83, 83, 83, 26, 26 },// Danish/Latin/Denmark
+      {    29,     7,    86,  641,  641,  641,  641,  153,  153, 83, 83, 83, 83, 26, 26 },// Danish/Latin/Greenland
+      {    30,     7,   151,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Dutch/Latin/Netherlands
+      {    30,     7,    12,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Dutch/Latin/Aruba
+      {    30,     7,    21,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Dutch/Latin/Belgium
+      {    30,     7,   152,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Dutch/Latin/Cura Sao
+      {    30,     7,   202,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Dutch/Latin/Suriname
+      {    30,     7,   255,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Dutch/Latin/Bonaire
+      {    30,     7,   256,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Dutch/Latin/Sint Maarten
+      {    31,     7,   225,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// English/Latin/United States
+      {    31,     3,   225,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// English/Deseret/United States
+      {    31,     7,     4,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// English/Latin/American Samoa
+      {    31,     7,     7,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// English/Latin/Anguilla
+      {    31,     7,     9,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// English/Latin/Antigua And Barbuda
+      {    31,     7,    13,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// English/Latin/Australia
+      {    31,     7,    14,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// English/Latin/Austria
+      {    31,     7,    16,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// English/Latin/Bahamas
+      {    31,     7,    19,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// English/Latin/Barbados
+      {    31,     7,    21,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// English/Latin/Belgium
+      {    31,     7,    22,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// English/Latin/Belize
+      {    31,     7,    24,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// English/Latin/Bermuda
+      {    31,     7,    28,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// English/Latin/Botswana
+      {    31,     7,    31,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// English/Latin/British Indian Ocean Territory
+      {    31,     7,    35,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// English/Latin/Burundi
+      {    31,     7,    37,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// English/Latin/Cameroon
+      {    31,     7,    38,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// English/Latin/Canada
+      {    31,     7,    40,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// English/Latin/Cayman Islands
+      {    31,     7,    45,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// English/Latin/Christmas Island
+      {    31,     7,    46,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// English/Latin/Cocos Islands
+      {    31,     7,    51,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// English/Latin/Cook Islands
+      {    31,     7,    56,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// English/Latin/Cyprus
+      {    31,     7,    58,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// English/Latin/Denmark
+      {    31,     7,    60,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// English/Latin/Dominica
+      {    31,     7,    67,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// English/Latin/Eritrea
+      {    31,     7,    70,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// English/Latin/Falkland Islands
+      {    31,     7,    72,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// English/Latin/Fiji
+      {    31,     7,    73,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// English/Latin/Finland
+      {    31,     7,    75,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// English/Latin/Guernsey
+      {    31,     7,    80,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// English/Latin/Gambia
+      {    31,     7,    82,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// English/Latin/Germany
+      {    31,     7,    83,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// English/Latin/Ghana
+      {    31,     7,    84,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// English/Latin/Gibraltar
+      {    31,     7,    87,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// English/Latin/Grenada
+      {    31,     7,    89,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// English/Latin/Guam
+      {    31,     7,    93,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// English/Latin/Guyana
+      {    31,     7,    97,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// English/Latin/Hong Kong
+      {    31,     7,   100,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// English/Latin/India
+      {    31,     7,   104,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// English/Latin/Ireland
+      {    31,     7,   105,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// English/Latin/Israel
+      {    31,     7,   107,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// English/Latin/Jamaica
+      {    31,     7,   111,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// English/Latin/Kenya
+      {    31,     7,   112,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// English/Latin/Kiribati
+      {    31,     7,   120,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// English/Latin/Lesotho
+      {    31,     7,   121,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// English/Latin/Liberia
+      {    31,     7,   126,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// English/Latin/Macau
+      {    31,     7,   128,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// English/Latin/Madagascar
+      {    31,     7,   129,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// English/Latin/Malawi
+      {    31,     7,   130,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// English/Latin/Malaysia
+      {    31,     7,   133,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// English/Latin/Malta
+      {    31,     7,   134,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// English/Latin/Marshall Islands
+      {    31,     7,   137,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// English/Latin/Mauritius
+      {    31,     7,   140,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// English/Latin/Micronesia
+      {    31,     7,   144,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// English/Latin/Montserrat
+      {    31,     7,   148,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// English/Latin/Namibia
+      {    31,     7,   149,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// English/Latin/Nauru
+      {    31,     7,   151,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// English/Latin/Netherlands
+      {    31,     7,   154,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// English/Latin/New Zealand
+      {    31,     7,   157,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// English/Latin/Nigeria
+      {    31,     7,   158,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// English/Latin/Niue
+      {    31,     7,   159,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// English/Latin/Norfolk Island
+      {    31,     7,   160,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// English/Latin/Northern Mariana Islands
+      {    31,     7,   163,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// English/Latin/Pakistan
+      {    31,     7,   164,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// English/Latin/Palau
+      {    31,     7,   167,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// English/Latin/Papua New Guinea
+      {    31,     7,   170,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// English/Latin/Philippines
+      {    31,     7,   171,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// English/Latin/Pitcairn
+      {    31,     7,   174,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// English/Latin/Puerto Rico
+      {    31,     7,   179,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// English/Latin/Rwanda
+      {    31,     7,   180,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// English/Latin/Saint Kitts And Nevis
+      {    31,     7,   181,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// English/Latin/Saint Lucia
+      {    31,     7,   182,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// English/Latin/Saint Vincent And The Grenadines
+      {    31,     7,   183,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// English/Latin/Samoa
+      {    31,     7,   188,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// English/Latin/Seychelles
+      {    31,     7,   189,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// English/Latin/Sierra Leone
+      {    31,     7,   190,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// English/Latin/Singapore
+      {    31,     7,   192,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// English/Latin/Slovenia
+      {    31,     7,   193,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// English/Latin/Solomon Islands
+      {    31,     7,   195,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// English/Latin/South Africa
+      {    31,     7,   199,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// English/Latin/Saint Helena
+      {    31,     7,   201,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// English/Latin/Sudan
+      {    31,     7,   204,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// English/Latin/Swaziland
+      {    31,     7,   205,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// English/Latin/Sweden
+      {    31,     7,   206,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// English/Latin/Switzerland
+      {    31,     7,   210,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// English/Latin/Tanzania
+      {    31,     7,   213,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// English/Latin/Tokelau
+      {    31,     7,   214,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// English/Latin/Tonga
+      {    31,     7,   215,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// English/Latin/Trinidad And Tobago
+      {    31,     7,   219,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// English/Latin/Turks And Caicos Islands
+      {    31,     7,   220,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// English/Latin/Tuvalu
+      {    31,     7,   221,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// English/Latin/Uganda
+      {    31,     7,   223,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// English/Latin/United Arab Emirates
+      {    31,     7,   224,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// English/Latin/United Kingdom
+      {    31,     7,   226,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// English/Latin/United States Minor Outlying Islands
+      {    31,     7,   229,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// English/Latin/Vanuatu
+      {    31,     7,   233,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// English/Latin/British Virgin Islands
+      {    31,     7,   234,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// English/Latin/United States Virgin Islands
+      {    31,     7,   239,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// English/Latin/Zambia
+      {    31,     7,   240,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// English/Latin/Zimbabwe
+      {    31,     7,   249,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// English/Latin/Diego Garcia
+      {    31,     7,   251,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// English/Latin/Isle Of Man
+      {    31,     7,   252,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// English/Latin/Jersey
+      {    31,     7,   254,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// English/Latin/South Sudan
+      {    31,     7,   256,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// English/Latin/Sint Maarten
+      {    31,     7,   260,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// English/Latin/World
+      {    31,     7,   261,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// English/Latin/Europe
+      {    32,     7,   260,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Esperanto/Latin/World
+      {    33,     7,    68,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Estonian/Latin/Estonia
+      {    34,     7,    71,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Faroese/Latin/Faroe Islands
+      {    34,     7,    58,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Faroese/Latin/Denmark
+      {    36,     7,    73,  724,  841,  982,  841,  153,  153,117,141, 81,141, 26, 26 },// Finnish/Latin/Finland
+      {    37,     7,    74, 1063, 1063, 1144, 1144,  153,  153, 81, 81, 57, 57, 26, 26 },// French/Latin/France
+      {    37,     7,     3, 1063, 1063, 1144, 1144,  153,  153, 81, 81, 57, 57, 26, 26 },// French/Latin/Algeria
+      {    37,     7,    21, 1063, 1063, 1144, 1144,  153,  153, 81, 81, 57, 57, 26, 26 },// French/Latin/Belgium
+      {    37,     7,    23, 1063, 1063, 1144, 1144,  153,  153, 81, 81, 57, 57, 26, 26 },// French/Latin/Benin
+      {    37,     7,    34, 1063, 1063, 1144, 1144,  153,  153, 81, 81, 57, 57, 26, 26 },// French/Latin/Burkina Faso
+      {    37,     7,    35, 1063, 1063, 1144, 1144,  153,  153, 81, 81, 57, 57, 26, 26 },// French/Latin/Burundi
+      {    37,     7,    37, 1063, 1063, 1144, 1144,  153,  153, 81, 81, 57, 57, 26, 26 },// French/Latin/Cameroon
+      {    37,     7,    38, 1201, 1201, 1282, 1282,  153,  153, 81, 81, 57, 57, 26, 26 },// French/Latin/Canada
+      {    37,     7,    41, 1063, 1063, 1144, 1144,  153,  153, 81, 81, 57, 57, 26, 26 },// French/Latin/Central African Republic
+      {    37,     7,    42, 1063, 1063, 1144, 1144,  153,  153, 81, 81, 57, 57, 26, 26 },// French/Latin/Chad
+      {    37,     7,    48, 1063, 1063, 1144, 1144,  153,  153, 81, 81, 57, 57, 26, 26 },// French/Latin/Comoros
+      {    37,     7,    49, 1063, 1063, 1144, 1144,  153,  153, 81, 81, 57, 57, 26, 26 },// French/Latin/Congo Kinshasa
+      {    37,     7,    50, 1063, 1063, 1144, 1144,  153,  153, 81, 81, 57, 57, 26, 26 },// French/Latin/Congo Brazzaville
+      {    37,     7,    53, 1063, 1063, 1144, 1144,  153,  153, 81, 81, 57, 57, 26, 26 },// French/Latin/Ivory Coast
+      {    37,     7,    59, 1063, 1063, 1144, 1144,  153,  153, 81, 81, 57, 57, 26, 26 },// French/Latin/Djibouti
+      {    37,     7,    66, 1063, 1063, 1144, 1144,  153,  153, 81, 81, 57, 57, 26, 26 },// French/Latin/Equatorial Guinea
+      {    37,     7,    76, 1063, 1063, 1144, 1144,  153,  153, 81, 81, 57, 57, 26, 26 },// French/Latin/French Guiana
+      {    37,     7,    77, 1063, 1063, 1144, 1144,  153,  153, 81, 81, 57, 57, 26, 26 },// French/Latin/French Polynesia
+      {    37,     7,    79, 1063, 1063, 1144, 1144,  153,  153, 81, 81, 57, 57, 26, 26 },// French/Latin/Gabon
+      {    37,     7,    88, 1063, 1063, 1144, 1144,  153,  153, 81, 81, 57, 57, 26, 26 },// French/Latin/Guadeloupe
+      {    37,     7,    91, 1063, 1063, 1144, 1144,  153,  153, 81, 81, 57, 57, 26, 26 },// French/Latin/Guinea
+      {    37,     7,    94, 1063, 1063, 1144, 1144,  153,  153, 81, 81, 57, 57, 26, 26 },// French/Latin/Haiti
+      {    37,     7,   125, 1063, 1063, 1144, 1144,  153,  153, 81, 81, 57, 57, 26, 26 },// French/Latin/Luxembourg
+      {    37,     7,   128, 1063, 1063, 1144, 1144,  153,  153, 81, 81, 57, 57, 26, 26 },// French/Latin/Madagascar
+      {    37,     7,   132, 1063, 1063, 1144, 1144,  153,  153, 81, 81, 57, 57, 26, 26 },// French/Latin/Mali
+      {    37,     7,   135, 1063, 1063, 1144, 1144,  153,  153, 81, 81, 57, 57, 26, 26 },// French/Latin/Martinique
+      {    37,     7,   136, 1063, 1063, 1144, 1144,  153,  153, 81, 81, 57, 57, 26, 26 },// French/Latin/Mauritania
+      {    37,     7,   137, 1063, 1063, 1144, 1144,  153,  153, 81, 81, 57, 57, 26, 26 },// French/Latin/Mauritius
+      {    37,     7,   138, 1063, 1063, 1144, 1144,  153,  153, 81, 81, 57, 57, 26, 26 },// French/Latin/Mayotte
+      {    37,     7,   142, 1063, 1063, 1144, 1144,  153,  153, 81, 81, 57, 57, 26, 26 },// French/Latin/Monaco
+      {    37,     7,   145, 1063, 1063, 1144, 1144,  153,  153, 81, 81, 57, 57, 26, 26 },// French/Latin/Morocco
+      {    37,     7,   153, 1063, 1063, 1144, 1144,  153,  153, 81, 81, 57, 57, 26, 26 },// French/Latin/New Caledonia
+      {    37,     7,   156, 1063, 1063, 1144, 1144,  153,  153, 81, 81, 57, 57, 26, 26 },// French/Latin/Niger
+      {    37,     7,   176, 1063, 1063, 1144, 1144,  153,  153, 81, 81, 57, 57, 26, 26 },// French/Latin/Reunion
+      {    37,     7,   179, 1063, 1063, 1144, 1144,  153,  153, 81, 81, 57, 57, 26, 26 },// French/Latin/Rwanda
+      {    37,     7,   187, 1063, 1063, 1144, 1144,  153,  153, 81, 81, 57, 57, 26, 26 },// French/Latin/Senegal
+      {    37,     7,   188, 1063, 1063, 1144, 1144,  153,  153, 81, 81, 57, 57, 26, 26 },// French/Latin/Seychelles
+      {    37,     7,   200, 1063, 1063, 1144, 1144,  153,  153, 81, 81, 57, 57, 26, 26 },// French/Latin/Saint Pierre And Miquelon
+      {    37,     7,   206, 1063, 1063, 1144, 1144,  153,  153, 81, 81, 57, 57, 26, 26 },// French/Latin/Switzerland
+      {    37,     7,   207, 1063, 1063, 1144, 1144,  153,  153, 81, 81, 57, 57, 26, 26 },// French/Latin/Syria
+      {    37,     7,   212, 1063, 1063, 1144, 1144,  153,  153, 81, 81, 57, 57, 26, 26 },// French/Latin/Togo
+      {    37,     7,   216, 1063, 1063, 1144, 1144,  153,  153, 81, 81, 57, 57, 26, 26 },// French/Latin/Tunisia
+      {    37,     7,   229, 1063, 1063, 1144, 1144,  153,  153, 81, 81, 57, 57, 26, 26 },// French/Latin/Vanuatu
+      {    37,     7,   235, 1063, 1063, 1144, 1144,  153,  153, 81, 81, 57, 57, 26, 26 },// French/Latin/Wallis And Futuna Islands
+      {    37,     7,   244, 1063, 1063, 1144, 1144,  153,  153, 81, 81, 57, 57, 26, 26 },// French/Latin/Saint Barthelemy
+      {    37,     7,   245, 1063, 1063, 1144, 1144,  153,  153, 81, 81, 57, 57, 26, 26 },// French/Latin/Saint Martin
+      {    38,     7,   151,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Western Frisian/Latin/Netherlands
+      {    39,     7,   224,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Gaelic/Latin/United Kingdom
+      {    40,     7,   197,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Galician/Latin/Spain
+      {    41,    15,    81, 1339, 1339, 1339, 1339,  153,  153, 91, 91, 91, 91, 26, 26 },// Georgian/Georgian/Georgia
+      {    42,     7,    82, 1430, 1430, 1430, 1430,  153,  153, 86, 86, 86, 86, 26, 26 },// German/Latin/Germany
+      {    42,     7,    14, 1430, 1430, 1430, 1430,  153,  153, 86, 86, 86, 86, 26, 26 },// German/Latin/Austria
+      {    42,     7,    21, 1430, 1430, 1430, 1430,  153,  153, 86, 86, 86, 86, 26, 26 },// German/Latin/Belgium
+      {    42,     7,   106, 1430, 1430, 1430, 1430,  153,  153, 86, 86, 86, 86, 26, 26 },// German/Latin/Italy
+      {    42,     7,   123, 1430, 1430, 1430, 1430,  153,  153, 86, 86, 86, 86, 26, 26 },// German/Latin/Liechtenstein
+      {    42,     7,   125, 1430, 1430, 1430, 1430,  153,  153, 86, 86, 86, 86, 26, 26 },// German/Latin/Luxembourg
+      {    42,     7,   206, 1430, 1430, 1430, 1430,  153,  153, 86, 86, 86, 86, 26, 26 },// German/Latin/Switzerland
+      {    43,    16,    85,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Greek/Greek/Greece
+      {    43,    16,    56,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Greek/Greek/Cyprus
+      {    44,     7,    86,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Greenlandic/Latin/Greenland
+      {    45,     7,   168,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Guarani/Latin/Paraguay
+      {    46,    17,   100, 1516, 1516, 1516, 1516,  153,  153, 85, 85, 85, 85, 26, 26 },// Gujarati/Gujarati/India
+      {    47,     7,   157,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Hausa/Latin/Nigeria
+      {    47,     1,   157,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Hausa/Arabic/Nigeria
+      {    47,     7,    83,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Hausa/Latin/Ghana
+      {    47,     7,   156,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Hausa/Latin/Niger
+      {    48,    18,   105, 1601, 1601, 1601, 1601,  153,  153, 68, 68, 68, 68, 26, 26 },// Hebrew/Hebrew/Israel
+      {    49,    13,   100, 1669, 1669, 1669, 1669,  153,  153, 81, 81, 81, 81, 26, 26 },// Hindi/Devanagari/India
+      {    50,     7,    98,  641,  641,  641,  641,  153,  153, 83, 83, 83, 83, 26, 26 },// Hungarian/Latin/Hungary
+      {    51,     7,    99,  641,  641,  641,  641,  153,  153, 83, 83, 83, 83, 26, 26 },// Icelandic/Latin/Iceland
+      {    52,     7,   101,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Indonesian/Latin/Indonesia
+      {    53,     7,   260,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Interlingua/Latin/World
+      {    55,    44,    38,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Inuktitut/Canadian Aboriginal/Canada
+      {    55,     7,    38,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Inuktitut/Latin/Canada
+      {    57,     7,   104,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Irish/Latin/Ireland
+      {    57,     7,   224,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Irish/Latin/United Kingdom
+      {    58,     7,   106,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Italian/Latin/Italy
+      {    58,     7,   184,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Italian/Latin/San Marino
+      {    58,     7,   206,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Italian/Latin/Switzerland
+      {    58,     7,   230,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Italian/Latin/Vatican City State
+      {    59,    19,   108, 1750, 1750, 1750, 1750,  153,  153, 77, 77, 77, 77, 26, 26 },// Japanese/Japanese/Japan
+      {    60,     7,   101,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Javanese/Latin/Indonesia
+      {    61,    21,   100, 1827, 1827, 1827, 1827,  153,  153, 92, 92, 92, 92, 26, 26 },// Kannada/Kannada/India
+      {    62,     1,   100,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Kashmiri/Arabic/India
+      {    63,     2,   110,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Kazakh/Cyrillic/Kazakhstan
+      {    64,     7,   179,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Kinyarwanda/Latin/Rwanda
+      {    65,     2,   116,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Kirghiz/Cyrillic/Kyrgyzstan
+      {    66,    22,   114, 1919, 1919, 1919, 1919,  153,  153, 54, 54, 54, 54, 26, 26 },// Korean/Korean/South Korea
+      {    66,    22,   113, 1919, 1919, 1919, 1919,  153,  153, 54, 54, 54, 54, 26, 26 },// Korean/Korean/North Korea
+      {    67,     7,   217,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Kurdish/Latin/Turkey
+      {    68,     7,    35,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Rundi/Latin/Burundi
+      {    69,    23,   117, 1973, 1973, 2053, 2132,  153,  153, 80, 80, 79, 79, 26, 26 },// Lao/Lao/Laos
+      {    71,     7,   118, 2211, 2211, 2211, 2211,  153,  153, 92, 92, 92, 92, 26, 26 },// Latvian/Latin/Latvia
+      {    72,     7,    49,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Lingala/Latin/Congo Kinshasa
+      {    72,     7,     6,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Lingala/Latin/Angola
+      {    72,     7,    41,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Lingala/Latin/Central African Republic
+      {    72,     7,    50,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Lingala/Latin/Congo Brazzaville
+      {    73,     7,   124,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Lithuanian/Latin/Lithuania
+      {    74,     2,   127, 2303, 2303, 2303, 2303,  153,  153, 79, 79, 79, 79, 26, 26 },// Macedonian/Cyrillic/Macedonia
+      {    75,     7,   128,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Malagasy/Latin/Madagascar
+      {    76,     7,   130,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Malay/Latin/Malaysia
+      {    76,     1,   130,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Malay/Arabic/Malaysia
+      {    76,     7,    32,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Malay/Latin/Brunei
+      {    76,     7,   190,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Malay/Latin/Singapore
+      {    77,    24,   100, 2382, 2382, 2382, 2382, 2473, 2473, 91, 91, 91, 91, 39, 39 },// Malayalam/Malayalam/India
+      {    78,     7,   133,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Maltese/Latin/Malta
+      {    79,     7,   154,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Maori/Latin/New Zealand
+      {    80,    13,   100, 2512, 2512, 2512, 2512, 2592, 2592, 80, 80, 80, 80, 26, 26 },// Marathi/Devanagari/India
+      {    82,     2,   143,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Mongolian/Cyrillic/Mongolia
+      {    82,     8,    44,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Mongolian/Mongolian/China
+      {    84,    13,   150,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Nepali/Devanagari/Nepal
+      {    84,    13,   100,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Nepali/Devanagari/India
+      {    85,     7,   161,  641,  641,  641,  641,  153,  153, 83, 83, 83, 83, 26, 26 },// Norwegian Bokmal/Latin/Norway
+      {    85,     7,   203,  641,  641,  641,  641,  153,  153, 83, 83, 83, 83, 26, 26 },// Norwegian Bokmal/Latin/Svalbard And Jan Mayen Islands
+      {    86,     7,    74,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Occitan/Latin/France
+      {    87,    26,   100,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Oriya/Oriya/India
+      {    88,     1,     1, 2618, 2618, 2618, 2618, 2680, 2680, 62, 62, 62, 62, 26, 26 },// Pashto/Arabic/Afghanistan
+      {    88,     1,   163, 2618, 2618, 2618, 2618, 2680, 2680, 62, 62, 62, 62, 26, 26 },// Pashto/Arabic/Pakistan
+      {    89,     1,   102, 2706, 2706, 2706, 2706, 2772, 2772, 66, 66, 66, 66, 23, 23 },// Persian/Arabic/Iran
+      {    89,     1,     1, 2706, 2795, 2706, 2706, 2851, 2772, 66, 56, 66, 66, 23, 23 },// Persian/Arabic/Afghanistan
+      {    90,     7,   172, 2874, 2874, 2874, 2874,  153,  153, 83, 83, 83, 83, 26, 26 },// Polish/Latin/Poland
+      {    91,     7,    30,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Portuguese/Latin/Brazil
+      {    91,     7,     6,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Portuguese/Latin/Angola
+      {    91,     7,    39,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Portuguese/Latin/Cape Verde
+      {    91,     7,    62,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Portuguese/Latin/East Timor
+      {    91,     7,    66,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Portuguese/Latin/Equatorial Guinea
+      {    91,     7,    92,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Portuguese/Latin/Guinea Bissau
+      {    91,     7,   125,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Portuguese/Latin/Luxembourg
+      {    91,     7,   126,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Portuguese/Latin/Macau
+      {    91,     7,   146,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Portuguese/Latin/Mozambique
+      {    91,     7,   173,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Portuguese/Latin/Portugal
+      {    91,     7,   185,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Portuguese/Latin/Sao Tome And Principe
+      {    91,     7,   206,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Portuguese/Latin/Switzerland
+      {    92,     4,   100, 2957, 2957, 2957, 2957,  153,  153, 77, 77, 77, 77, 26, 26 },// Punjabi/Gurmukhi/India
+      {    92,     1,   163,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Punjabi/Arabic/Pakistan
+      {    93,     7,   169,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Quechua/Latin/Peru
+      {    93,     7,    26,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Quechua/Latin/Bolivia
+      {    93,     7,    63,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Quechua/Latin/Ecuador
+      {    94,     7,   206,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Romansh/Latin/Switzerland
+      {    95,     7,   177, 3034, 3034, 3034, 3034,  153,  153, 85, 85, 85, 85, 26, 26 },// Romanian/Latin/Romania
+      {    95,     7,   141, 3034, 3034, 3034, 3034,  153,  153, 85, 85, 85, 85, 26, 26 },// Romanian/Latin/Moldova
+      {    96,     2,   178, 3119, 3119, 3119, 3119,  153,  153, 80, 80, 80, 80, 26, 26 },// Russian/Cyrillic/Russia
+      {    96,     2,    20, 3119, 3119, 3119, 3119,  153,  153, 80, 80, 80, 80, 26, 26 },// Russian/Cyrillic/Belarus
+      {    96,     2,   110, 3119, 3119, 3119, 3119,  153,  153, 80, 80, 80, 80, 26, 26 },// Russian/Cyrillic/Kazakhstan
+      {    96,     2,   116, 3119, 3119, 3119, 3119,  153,  153, 80, 80, 80, 80, 26, 26 },// Russian/Cyrillic/Kyrgyzstan
+      {    96,     2,   141, 3119, 3119, 3119, 3119,  153,  153, 80, 80, 80, 80, 26, 26 },// Russian/Cyrillic/Moldova
+      {    96,     2,   222, 3119, 3119, 3119, 3119,  153,  153, 80, 80, 80, 80, 26, 26 },// Russian/Cyrillic/Ukraine
+      {    98,     7,    41,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Sango/Latin/Central African Republic
+      {    99,    13,   100,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Sanskrit/Devanagari/India
+      {   100,     2,   243, 3199, 3199, 3199, 3199,  153,  153, 80, 80, 80, 80, 26, 26 },// Serbian/Cyrillic/Serbia
+      {   100,     7,    27, 3279, 3279, 3279, 3279,  153,  153, 80, 80, 80, 80, 26, 26 },// Serbian/Latin/Bosnia And Herzegowina
+      {   100,     7,   242, 3279, 3279, 3279, 3279,  153,  153, 80, 80, 80, 80, 26, 26 },// Serbian/Latin/Montenegro
+      {   100,     7,   243, 3279, 3279, 3279, 3279,  153,  153, 80, 80, 80, 80, 26, 26 },// Serbian/Latin/Serbia
+      {   100,     2,    27, 3199, 3199, 3199, 3199,  153,  153, 80, 80, 80, 80, 26, 26 },// Serbian/Cyrillic/Bosnia And Herzegowina
+      {   100,     2,   242, 3199, 3199, 3199, 3199,  153,  153, 80, 80, 80, 80, 26, 26 },// Serbian/Cyrillic/Montenegro
+      {   100,     2,   257, 3199, 3199, 3199, 3199,  153,  153, 80, 80, 80, 80, 26, 26 },// Serbian/Cyrillic/Kosovo
+      {   100,     7,   257, 3279, 3279, 3279, 3279,  153,  153, 80, 80, 80, 80, 26, 26 },// Serbian/Latin/Kosovo
+      {   101,     2,    81,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Ossetic/Cyrillic/Georgia
+      {   101,     2,   178,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Ossetic/Cyrillic/Russia
+      {   102,     7,   195,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Southern Sotho/Latin/South Africa
+      {   103,     7,   195,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Tswana/Latin/South Africa
+      {   104,     7,   240,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Shona/Latin/Zimbabwe
+      {   105,     1,   163,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Sindhi/Arabic/Pakistan
+      {   106,    32,   198,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Sinhala/Sinhala/Sri Lanka
+      {   107,     7,   195,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Swati/Latin/South Africa
+      {   108,     7,   191,  560,  560,  560,  560,  153,  153, 81, 81, 81, 81, 26, 26 },// Slovak/Latin/Slovakia
+      {   109,     7,   192,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Slovenian/Latin/Slovenia
+      {   110,     7,   194,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Somali/Latin/Somalia
+      {   110,     7,    59,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Somali/Latin/Djibouti
+      {   110,     7,    69,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Somali/Latin/Ethiopia
+      {   110,     7,   111,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Somali/Latin/Kenya
+      {   111,     7,   197,  641,  641,  641,  641,  153,  153, 83, 83, 83, 83, 26, 26 },// Spanish/Latin/Spain
+      {   111,     7,    10,  641,  641,  641,  641,  153,  153, 83, 83, 83, 83, 26, 26 },// Spanish/Latin/Argentina
+      {   111,     7,    22,  641,  641,  641,  641,  153,  153, 83, 83, 83, 83, 26, 26 },// Spanish/Latin/Belize
+      {   111,     7,    26,  641,  641,  641,  641,  153,  153, 83, 83, 83, 83, 26, 26 },// Spanish/Latin/Bolivia
+      {   111,     7,    30,  641,  641,  641,  641,  153,  153, 83, 83, 83, 83, 26, 26 },// Spanish/Latin/Brazil
+      {   111,     7,    43,  641,  641,  641,  641,  153,  153, 83, 83, 83, 83, 26, 26 },// Spanish/Latin/Chile
+      {   111,     7,    47,  641,  641,  641,  641,  153,  153, 83, 83, 83, 83, 26, 26 },// Spanish/Latin/Colombia
+      {   111,     7,    52,  641,  641,  641,  641,  153,  153, 83, 83, 83, 83, 26, 26 },// Spanish/Latin/Costa Rica
+      {   111,     7,    55,  641,  641,  641,  641,  153,  153, 83, 83, 83, 83, 26, 26 },// Spanish/Latin/Cuba
+      {   111,     7,    61,  641,  641,  641,  641,  153,  153, 83, 83, 83, 83, 26, 26 },// Spanish/Latin/Dominican Republic
+      {   111,     7,    63,  641,  641,  641,  641,  153,  153, 83, 83, 83, 83, 26, 26 },// Spanish/Latin/Ecuador
+      {   111,     7,    65,  641,  641,  641,  641,  153,  153, 83, 83, 83, 83, 26, 26 },// Spanish/Latin/El Salvador
+      {   111,     7,    66,  641,  641,  641,  641,  153,  153, 83, 83, 83, 83, 26, 26 },// Spanish/Latin/Equatorial Guinea
+      {   111,     7,    90,  641,  641,  641,  641,  153,  153, 83, 83, 83, 83, 26, 26 },// Spanish/Latin/Guatemala
+      {   111,     7,    96,  641,  641,  641,  641,  153,  153, 83, 83, 83, 83, 26, 26 },// Spanish/Latin/Honduras
+      {   111,     7,   139,  641,  641,  641,  641,  153,  153, 83, 83, 83, 83, 26, 26 },// Spanish/Latin/Mexico
+      {   111,     7,   155,  641,  641,  641,  641,  153,  153, 83, 83, 83, 83, 26, 26 },// Spanish/Latin/Nicaragua
+      {   111,     7,   166,  641,  641,  641,  641,  153,  153, 83, 83, 83, 83, 26, 26 },// Spanish/Latin/Panama
+      {   111,     7,   168,  641,  641,  641,  641,  153,  153, 83, 83, 83, 83, 26, 26 },// Spanish/Latin/Paraguay
+      {   111,     7,   169,  641,  641,  641,  641,  153,  153, 83, 83, 83, 83, 26, 26 },// Spanish/Latin/Peru
+      {   111,     7,   170,  641,  641,  641,  641,  153,  153, 83, 83, 83, 83, 26, 26 },// Spanish/Latin/Philippines
+      {   111,     7,   174,  641,  641,  641,  641,  153,  153, 83, 83, 83, 83, 26, 26 },// Spanish/Latin/Puerto Rico
+      {   111,     7,   225,  641,  641,  641,  641,  153,  153, 83, 83, 83, 83, 26, 26 },// Spanish/Latin/United States
+      {   111,     7,   227,  641,  641,  641,  641,  153,  153, 83, 83, 83, 83, 26, 26 },// Spanish/Latin/Uruguay
+      {   111,     7,   231,  641,  641,  641,  641,  153,  153, 83, 83, 83, 83, 26, 26 },// Spanish/Latin/Venezuela
+      {   111,     7,   238,  641,  641,  641,  641,  153,  153, 83, 83, 83, 83, 26, 26 },// Spanish/Latin/Canary Islands
+      {   111,     7,   246,  641,  641,  641,  641,  153,  153, 83, 83, 83, 83, 26, 26 },// Spanish/Latin/Latin America
+      {   111,     7,   250,  641,  641,  641,  641,  153,  153, 83, 83, 83, 83, 26, 26 },// Spanish/Latin/Ceuta And Melilla
+      {   112,     7,   101,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Sundanese/Latin/Indonesia
+      {   113,     7,   210,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Swahili/Latin/Tanzania
+      {   113,     7,    49,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Swahili/Latin/Congo Kinshasa
+      {   113,     7,   111,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Swahili/Latin/Kenya
+      {   113,     7,   221,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Swahili/Latin/Uganda
+      {   114,     7,   205, 3359, 3442, 3359, 3442,  153,  153, 83, 83, 83, 83, 26, 26 },// Swedish/Latin/Sweden
+      {   114,     7,    73, 3359, 3442, 3359, 3442,  153,  153, 83, 83, 83, 83, 26, 26 },// Swedish/Latin/Finland
+      {   114,     7,   248, 3359, 3442, 3359, 3442,  153,  153, 83, 83, 83, 83, 26, 26 },// Swedish/Latin/Aland Islands
+      {   115,     7,   106,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Sardinian/Latin/Italy
+      {   116,     2,   209, 3525, 3525, 3525, 3525,  153,  153, 80, 80, 80, 80, 26, 26 },// Tajik/Cyrillic/Tajikistan
+      {   117,    27,   100, 3605, 3605, 3698, 3698,  153,  153, 93, 93, 63, 63, 26, 26 },// Tamil/Tamil/India
+      {   117,    27,   130, 3605, 3605, 3698, 3698,  153,  153, 93, 93, 63, 63, 26, 26 },// Tamil/Tamil/Malaysia
+      {   117,    27,   190, 3605, 3605, 3698, 3698,  153,  153, 93, 93, 63, 63, 26, 26 },// Tamil/Tamil/Singapore
+      {   117,    27,   198, 3605, 3605, 3698, 3698,  153,  153, 93, 93, 63, 63, 26, 26 },// Tamil/Tamil/Sri Lanka
+      {   118,     2,   178,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Tatar/Cyrillic/Russia
+      {   119,    28,   100, 3761, 3761, 3761, 3761,  153,  153, 88, 88, 88, 88, 26, 26 },// Telugu/Telugu/India
+      {   120,    30,   211, 3849, 3849, 3849, 3849,  153,  153, 98, 98, 98, 98, 26, 26 },// Thai/Thai/Thailand
+      {   121,    31,    44,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Tibetan/Tibetan/China
+      {   121,    31,   100,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Tibetan/Tibetan/India
+      {   122,    14,    69,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Tigrinya/Ethiopic/Ethiopia
+      {   122,    14,    67,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Tigrinya/Ethiopic/Eritrea
+      {   123,     7,   214,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Tongan/Latin/Tonga
+      {   124,     7,   195,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Tsonga/Latin/South Africa
+      {   125,     7,   217, 3947, 3947, 3947, 3947,  153,  153, 80, 80, 80, 80, 26, 26 },// Turkish/Latin/Turkey
+      {   125,     7,    56, 3947, 3947, 3947, 3947,  153,  153, 80, 80, 80, 80, 26, 26 },// Turkish/Latin/Cyprus
+      {   126,     7,   218,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Turkmen/Latin/Turkmenistan
+      {   128,     1,    44,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Uighur/Arabic/China
+      {   129,     2,   222, 4027, 4027, 4107, 4156,  153,  153, 80, 80, 49, 57, 26, 26 },// Ukrainian/Cyrillic/Ukraine
+      {   130,     1,   163, 4213, 4213, 4213, 4213,  153,  153, 66, 66, 66, 66, 26, 26 },// Urdu/Arabic/Pakistan
+      {   130,     1,   100, 4213, 4213, 4213, 4213,  153,  153, 66, 66, 66, 66, 26, 26 },// Urdu/Arabic/India
+      {   131,     7,   228,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Uzbek/Latin/Uzbekistan
+      {   131,     1,     1,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Uzbek/Arabic/Afghanistan
+      {   131,     2,   228,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Uzbek/Cyrillic/Uzbekistan
+      {   132,     7,   232,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Vietnamese/Latin/Vietnam
+      {   133,     7,   260,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Volapuk/Latin/World
+      {   134,     7,   224,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Welsh/Latin/United Kingdom
+      {   135,     7,   187,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Wolof/Latin/Senegal
+      {   136,     7,   195,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Xhosa/Latin/South Africa
+      {   137,    18,   260,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Yiddish/Hebrew/World
+      {   138,     7,   157,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Yoruba/Latin/Nigeria
+      {   138,     7,    23,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Yoruba/Latin/Benin
+      {   140,     7,   195,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Zulu/Latin/South Africa
+      {   141,     7,   161,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Norwegian Nynorsk/Latin/Norway
+      {   142,     7,    27,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Bosnian/Latin/Bosnia And Herzegowina
+      {   142,     2,    27, 3199, 3199, 3199, 3199,  153,  153, 80, 80, 80, 80, 26, 26 },// Bosnian/Cyrillic/Bosnia And Herzegowina
+      {   143,    29,   131,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Divehi/Thaana/Maldives
+      {   144,     7,   251,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Manx/Latin/Isle Of Man
+      {   145,     7,   224,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Cornish/Latin/United Kingdom
+      {   146,     7,    83,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Akan/Latin/Ghana
+      {   147,    13,   100,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Konkani/Devanagari/India
+      {   148,     7,    83,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Ga/Latin/Ghana
+      {   149,     7,   157,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Igbo/Latin/Nigeria
+      {   150,     7,   111,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Kamba/Latin/Kenya
+      {   151,    33,   103,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Syriac/Syriac/Iraq
+      {   152,    14,    67,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Blin/Ethiopic/Eritrea
+      {   153,    14,    69,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Geez/Ethiopic/Ethiopia
+      {   155,     7,    69,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Sidamo/Latin/Ethiopia
+      {   156,     7,   157,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Atsam/Latin/Nigeria
+      {   157,    14,    67,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Tigre/Ethiopic/Eritrea
+      {   158,     7,   157,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Jju/Latin/Nigeria
+      {   159,     7,   106,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Friulian/Latin/Italy
+      {   160,     7,   195,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Venda/Latin/South Africa
+      {   161,     7,    83, 4279, 4279, 4365, 4365,  153,  153, 86, 86, 47, 47, 26, 26 },// Ewe/Latin/Ghana
+      {   161,     7,   212, 4279, 4279, 4365, 4365,  153,  153, 86, 86, 47, 47, 26, 26 },// Ewe/Latin/Togo
+      {   162,    14,    69,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Walamo/Ethiopic/Ethiopia
+      {   163,     7,   225,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Hawaiian/Latin/United States
+      {   164,     7,   157,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Tyap/Latin/Nigeria
+      {   165,     7,   129,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Nyanja/Latin/Malawi
+      {   166,     7,   170,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Filipino/Latin/Philippines
+      {   167,     7,   206,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Swiss German/Latin/Switzerland
+      {   167,     7,    74,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Swiss German/Latin/France
+      {   167,     7,   123,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Swiss German/Latin/Liechtenstein
+      {   168,    34,    44,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Sichuan Yi/Yi/China
+      {   169,     7,   121,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Kpelle/Latin/Liberia
+      {   170,     7,    82,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Low German/Latin/Germany
+      {   170,     7,   151,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Low German/Latin/Netherlands
+      {   171,     7,   195,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// South Ndebele/Latin/South Africa
+      {   172,     7,   195,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Northern Sotho/Latin/South Africa
+      {   173,     7,   161,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Northern Sami/Latin/Norway
+      {   173,     7,    73,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Northern Sami/Latin/Finland
+      {   173,     7,   205,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Northern Sami/Latin/Sweden
+      {   174,     7,   208,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Taroko/Latin/Taiwan
+      {   175,     7,   111,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Gusii/Latin/Kenya
+      {   176,     7,   111,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Taita/Latin/Kenya
+      {   177,     7,   187,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Fulah/Latin/Senegal
+      {   177,     7,    34,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Fulah/Latin/Burkina Faso
+      {   177,     7,    37,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Fulah/Latin/Cameroon
+      {   177,     7,    80,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Fulah/Latin/Gambia
+      {   177,     7,    83,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Fulah/Latin/Ghana
+      {   177,     7,    91,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Fulah/Latin/Guinea
+      {   177,     7,    92,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Fulah/Latin/Guinea Bissau
+      {   177,     7,   121,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Fulah/Latin/Liberia
+      {   177,     7,   136,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Fulah/Latin/Mauritania
+      {   177,     7,   156,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Fulah/Latin/Niger
+      {   177,     7,   157,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Fulah/Latin/Nigeria
+      {   177,     7,   189,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Fulah/Latin/Sierra Leone
+      {   177,   134,    91,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Fulah/Adlam/Guinea
+      {   178,     7,   111,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Kikuyu/Latin/Kenya
+      {   179,     7,   111,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Samburu/Latin/Kenya
+      {   180,     7,   146,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Sena/Latin/Mozambique
+      {   181,     7,   240,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// North Ndebele/Latin/Zimbabwe
+      {   182,     7,   210,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Rombo/Latin/Tanzania
+      {   183,     9,   145,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Tachelhit/Tifinagh/Morocco
+      {   183,     7,   145,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Tachelhit/Latin/Morocco
+      {   184,     7,     3,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Kabyle/Latin/Algeria
+      {   185,     7,   221,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Nyankole/Latin/Uganda
+      {   186,     7,   210,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Bena/Latin/Tanzania
+      {   187,     7,   210,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Vunjo/Latin/Tanzania
+      {   188,     7,   132,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Bambara/Latin/Mali
+      {   188,    75,   132,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Bambara/Nko/Mali
+      {   189,     7,   111,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Embu/Latin/Kenya
+      {   190,    12,   225,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Cherokee/Cherokee/United States
+      {   191,     7,   137,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Morisyen/Latin/Mauritius
+      {   192,     7,   210,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Makonde/Latin/Tanzania
+      {   193,     7,   210,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Langi/Latin/Tanzania
+      {   194,     7,   221,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Ganda/Latin/Uganda
+      {   195,     7,   239,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Bemba/Latin/Zambia
+      {   196,     7,    39,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Kabuverdianu/Latin/Cape Verde
+      {   197,     7,   111,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Meru/Latin/Kenya
+      {   198,     7,   111,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Kalenjin/Latin/Kenya
+      {   199,     7,   148,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Nama/Latin/Namibia
+      {   200,     7,   210,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Machame/Latin/Tanzania
+      {   201,     7,    82,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Colognian/Latin/Germany
+      {   202,     7,   111,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Masai/Latin/Kenya
+      {   202,     7,   210,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Masai/Latin/Tanzania
+      {   203,     7,   221,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Soga/Latin/Uganda
+      {   204,     7,   111,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Luyia/Latin/Kenya
+      {   205,     7,   210,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Asu/Latin/Tanzania
+      {   206,     7,   221,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Teso/Latin/Uganda
+      {   206,     7,   111,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Teso/Latin/Kenya
+      {   207,     7,    67,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Saho/Latin/Eritrea
+      {   208,     7,   132,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Koyra Chiini/Latin/Mali
+      {   209,     7,   210,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Rwa/Latin/Tanzania
+      {   210,     7,   111,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Luo/Latin/Kenya
+      {   211,     7,   221,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Chiga/Latin/Uganda
+      {   212,     7,   145,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Central Morocco Tamazight/Latin/Morocco
+      {   213,     7,   132,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Koyraboro Senni/Latin/Mali
+      {   214,     7,   210,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Shambala/Latin/Tanzania
+      {   215,    13,   100,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Bodo/Devanagari/India
+      {   218,     2,   178,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Chechen/Cyrillic/Russia
+      {   219,     2,   178,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Church/Cyrillic/Russia
+      {   220,     2,   178,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Chuvash/Cyrillic/Russia
+      {   230,     7,    49,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Luba Katanga/Latin/Congo Kinshasa
+      {   231,     7,   125,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Luxembourgish/Latin/Luxembourg
+      {   236,     7,    21,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Walloon/Latin/Belgium
+      {   237,     7,    37,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Aghem/Latin/Cameroon
+      {   238,     7,    37,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Basaa/Latin/Cameroon
+      {   239,     7,   156,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Zarma/Latin/Niger
+      {   240,     7,    37,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Duala/Latin/Cameroon
+      {   241,     7,   187,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Jola Fonyi/Latin/Senegal
+      {   242,     7,    37,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Ewondo/Latin/Cameroon
+      {   243,     7,    37,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Bafia/Latin/Cameroon
+      {   244,     7,   146,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Makhuwa Meetto/Latin/Mozambique
+      {   245,     7,    37,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Mundang/Latin/Cameroon
+      {   246,     7,    37,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Kwasio/Latin/Cameroon
+      {   247,     7,   254,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Nuer/Latin/South Sudan
+      {   248,     2,   178,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Sakha/Cyrillic/Russia
+      {   249,     7,   210,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Sangu/Latin/Tanzania
+      {   251,     7,   156,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Tasawaq/Latin/Niger
+      {   252,    35,   121,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Vai/Vai/Liberia
+      {   252,     7,   121,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Vai/Latin/Liberia
+      {   253,     7,   206,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Walser/Latin/Switzerland
+      {   254,     7,    37,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Yangben/Latin/Cameroon
+      {   256,     7,   197,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Asturian/Latin/Spain
+      {   257,     7,    37,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Ngomba/Latin/Cameroon
+      {   258,     7,    37,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Kako/Latin/Cameroon
+      {   259,     7,    37,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Meta/Latin/Cameroon
+      {   260,     7,    37,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Ngiemboon/Latin/Cameroon
+      {   261,     7,   197,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Aragonese/Latin/Spain
+      {   272,    46,    18,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Chakma/Chakma/Bangladesh
+      {   272,    46,   100,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Chakma/Chakma/India
+      {   290,    11,   100,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Manipuri/Bengali/India
+      {   309,   100,   232,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Tai Dam/Tai Viet/Vietnam
+      {   312,     7,    37,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Akoose/Latin/Cameroon
+      {   313,     7,   225,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Lakota/Latin/United States
+      {   314,     9,   145,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Standard Moroccan Tamazight/Tifinagh/Morocco
+      {   315,     7,    43,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Mapuche/Latin/Chile
+      {   316,     1,   103, 4412, 4412, 4412, 4412,  153,  153,101,101,101,101, 26, 26 },// Central Kurdish/Arabic/Iraq
+      {   316,     1,   102, 4412, 4412, 4412, 4412,  153,  153,101,101,101,101, 26, 26 },// Central Kurdish/Arabic/Iran
+      {   317,     7,    82,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Lower Sorbian/Latin/Germany
+      {   318,     7,    82,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Upper Sorbian/Latin/Germany
+      {   319,     7,    37,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Kenyang/Latin/Cameroon
+      {   320,     7,    38,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Mohawk/Latin/Canada
+      {   321,    75,    91,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Nko/Nko/Guinea
+      {   322,     7,   260,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Prussian/Latin/World
+      {   323,     7,    90,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Kiche/Latin/Guatemala
+      {   324,     7,   205,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Southern Sami/Latin/Sweden
+      {   325,     7,   205,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Lule Sami/Latin/Sweden
+      {   326,     7,    73,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Inari Sami/Latin/Finland
+      {   327,     7,    73,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Skolt Sami/Latin/Finland
+      {   328,     7,    13,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Warlpiri/Latin/Australia
+      {   346,     1,   102,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Mazanderani/Arabic/Iran
+      {   349,     1,   102,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Northern Luri/Arabic/Iran
+      {   349,     1,   103,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Northern Luri/Arabic/Iraq
+      {   357,     6,    97,  484,  484,  484,  484,  153,  153, 38, 38, 38, 38, 26, 26 },// Cantonese/Traditional Han/Hong Kong
+      {   357,     5,    44,  484,  484,  484,  484,  153,  153, 38, 38, 38, 38, 26, 26 },// Cantonese/Simplified Han/China
+      {   358,   138,   225,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Osage/Osage/United States
+      {   360,     7,   260,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Ido/Latin/World
+      {   361,     7,   260,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Lojban/Latin/World
+      {   362,     7,   106,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Sicilian/Latin/Italy
+      {   363,     1,   102,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Southern Kurdish/Arabic/Iran
+      {   364,     1,   163,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Western Balochi/Arabic/Pakistan
+      {   365,     7,   170,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Cebuano/Latin/Philippines
+      {   366,     2,   178,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Erzya/Cyrillic/Russia
+      {   367,     7,   225,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Chickasaw/Latin/United States
+      {   368,     7,   225,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Muscogee/Latin/United States
+      {   369,     7,   172,    0,    0,    0,    0,  153,  153, 83, 83, 83, 83, 26, 26 },// Silesian/Latin/Poland
+      {     0,     0,     0,    0,    0,    0,    0,    0,    0,  0,  0,  0,  0,  0,  0 },// trailing zeros
 };
 
-static const ushort months_data[] = {
-0x46, 0x61, 0x72, 0x3b, 0x4f, 0x72, 0x64, 0x3b, 0x4b, 0x68, 0x6f, 0x3b, 0x54, 0x69, 0x72, 0x3b, 0x4d, 0x6f, 0x72, 0x3b,
-0x53, 0x68, 0x61, 0x3b, 0x4d, 0x65, 0x68, 0x3b, 0x41, 0x62, 0x61, 0x3b, 0x41, 0x7a, 0x61, 0x3b, 0x44, 0x65, 0x79, 0x3b,
-0x42, 0x61, 0x68, 0x3b, 0x45, 0x73, 0x66, 0x3b, 0x46, 0x61, 0x72, 0x76, 0x61, 0x72, 0x64, 0x69, 0x6e, 0x3b, 0x4f, 0x72,
-0x64, 0x69, 0x62, 0x65, 0x68, 0x65, 0x73, 0x68, 0x74, 0x3b, 0x4b, 0x68, 0x6f, 0x72, 0x64, 0x61, 0x64, 0x3b, 0x54, 0x69,
-0x72, 0x3b, 0x4d, 0x6f, 0x72, 0x64, 0x61, 0x64, 0x3b, 0x53, 0x68, 0x61, 0x68, 0x72, 0x69, 0x76, 0x61, 0x72, 0x3b, 0x4d,
-0x65, 0x68, 0x72, 0x3b, 0x41, 0x62, 0x61, 0x6e, 0x3b, 0x41, 0x7a, 0x61, 0x72, 0x3b, 0x44, 0x65, 0x79, 0x3b, 0x42, 0x61,
-0x68, 0x6d, 0x61, 0x6e, 0x3b, 0x45, 0x73, 0x66, 0x61, 0x6e, 0x64, 0x3b, 0x46, 0x3b, 0x4f, 0x3b, 0x4b, 0x3b, 0x54, 0x3b,
-0x4d, 0x3b, 0x53, 0x3b, 0x4d, 0x3b, 0x41, 0x3b, 0x41, 0x3b, 0x44, 0x3b, 0x42, 0x3b, 0x45, 0x3b, 0x31, 0x3b, 0x32, 0x3b,
-0x33, 0x3b, 0x34, 0x3b, 0x35, 0x3b, 0x36, 0x3b, 0x37, 0x3b, 0x38, 0x3b, 0x39, 0x3b, 0x31, 0x30, 0x3b, 0x31, 0x31, 0x3b,
-0x31, 0x32, 0x3b, 0x31, 0x33, 0x31, 0x3b, 0x32, 0x3b, 0x33, 0x3b, 0x34, 0x3b, 0x35, 0x3b, 0x36, 0x3b, 0x37, 0x3b, 0x38,
-0x3b, 0x39, 0x3b, 0x31, 0x30, 0x3b, 0x31, 0x31, 0x3b, 0x31, 0x32, 0x3b, 0x641, 0x631, 0x641, 0x631, 0x62f, 0x646, 0x3b, 0x623,
-0x630, 0x631, 0x628, 0x64a, 0x647, 0x634, 0x62a, 0x3b, 0x62e, 0x631, 0x62f, 0x627, 0x62f, 0x3b, 0x62a, 0x627, 0x631, 0x3b, 0x645, 0x631,
-0x62f, 0x627, 0x62f, 0x3b, 0x634, 0x647, 0x631, 0x641, 0x627, 0x631, 0x3b, 0x645, 0x647, 0x631, 0x3b, 0x622, 0x64a, 0x627, 0x646, 0x3b,
-0x622, 0x630, 0x631, 0x3b, 0x62f, 0x64a, 0x3b, 0x628, 0x647, 0x645, 0x646, 0x3b, 0x627, 0x633, 0x641, 0x646, 0x62f, 0x627, 0x631, 0x3b,
-0x9ab, 0x9cd, 0x9af, 0x9be, 0x9ad, 0x9be, 0x9b0, 0x9cd, 0x9a1, 0x9bf, 0x9a8, 0x3b, 0x985, 0x9b0, 0x9a1, 0x9bf, 0x9ac, 0x9c7, 0x9b9, 0x9c7,
-0x9b6, 0x9cd, 0x9a4, 0x3b, 0x996, 0x9cb, 0x9b0, 0x9cd, 0x9a6, 0x9cd, 0x9a6, 0x3b, 0x9a4, 0x9c0, 0x9b0, 0x3b, 0x9ae, 0x9b0, 0x9cd, 0x9af,
-0x9be, 0x9a6, 0x3b, 0x9b6, 0x9be, 0x9b9, 0x9b0, 0x9bf, 0x9ac, 0x9be, 0x9b0, 0x3b, 0x9ae, 0x9c7, 0x9b9, 0x9c7, 0x9b0, 0x3b, 0x986, 0x9ac,
-0x9be, 0x9a8, 0x3b, 0x986, 0x99c, 0x9be, 0x9b0, 0x3b, 0x9a6, 0x9c7, 0x3b, 0x9ac, 0x9be, 0x9b9, 0x9ae, 0x9be, 0x9a8, 0x3b, 0x98f, 0x9b8,
-0x9ab, 0x9cd, 0x9af, 0x9be, 0x9a8, 0x9cd, 0x9a1, 0x3b, 0x9ab, 0x9cd, 0x9af, 0x9be, 0x9ad, 0x9be, 0x9b0, 0x9cd, 0x9a1, 0x9bf, 0x9a8, 0x3b,
-0x985, 0x9b0, 0x9a1, 0x9bf, 0x9ac, 0x9c7, 0x9b9, 0x9c7, 0x9b6, 0x9cd, 0x9a4, 0x3b, 0x996, 0x9cb, 0x9b0, 0x9cd, 0x9a6, 0x9cd, 0x9a6, 0x3b,
-0x9a4, 0x9c0, 0x9b0, 0x3b, 0x9ae, 0x9b0, 0x9cd, 0x9af, 0x9be, 0x9a6, 0x3b, 0x9b6, 0x9be, 0x9b9, 0x9b0, 0x9bf, 0x9ac, 0x9be, 0x9b0, 0x3b,
-0x9ae, 0x9c7, 0x9b9, 0x9c7, 0x9b0, 0x3b, 0x986, 0x9ac, 0x9be, 0x9a8, 0x3b, 0x9ac, 0x9be, 0x99c, 0x9be, 0x9b0, 0x3b, 0x9a6, 0x9c7, 0x3b,
-0x9ac, 0x9be, 0x9b9, 0x9ae, 0x9be, 0x9a8, 0x3b, 0x98f, 0x9b8, 0x9ab, 0x9cd, 0x9af, 0x9be, 0x9a8, 0x9cd, 0x9a1, 0x3b, 0x9e7, 0x3b, 0x9e8,
-0x3b, 0x9e9, 0x3b, 0x9ea, 0x3b, 0x9eb, 0x3b, 0x9ec, 0x3b, 0x9ed, 0x3b, 0x9ee, 0x3b, 0x9ef, 0x3b, 0x9e7, 0x9e6, 0x3b, 0x9e7, 0x9e7,
-0x3b, 0x9e7, 0x9e8, 0x3b, 0x31, 0x6708, 0x3b, 0x32, 0x6708, 0x3b, 0x33, 0x6708, 0x3b, 0x34, 0x6708, 0x3b, 0x35, 0x6708, 0x3b, 0x36,
+static const char16_t months_data[] = {
+0x46, 0x61, 0x72, 0x76, 0x61, 0x72, 0x64, 0x69, 0x6e, 0x3b, 0x4f, 0x72, 0x64, 0x69, 0x62, 0x65, 0x68, 0x65, 0x73, 0x68,
+0x74, 0x3b, 0x4b, 0x68, 0x6f, 0x72, 0x64, 0x61, 0x64, 0x3b, 0x54, 0x69, 0x72, 0x3b, 0x4d, 0x6f, 0x72, 0x64, 0x61, 0x64,
+0x3b, 0x53, 0x68, 0x61, 0x68, 0x72, 0x69, 0x76, 0x61, 0x72, 0x3b, 0x4d, 0x65, 0x68, 0x72, 0x3b, 0x41, 0x62, 0x61, 0x6e,
+0x3b, 0x41, 0x7a, 0x61, 0x72, 0x3b, 0x44, 0x65, 0x79, 0x3b, 0x42, 0x61, 0x68, 0x6d, 0x61, 0x6e, 0x3b, 0x45, 0x73, 0x66,
+0x61, 0x6e, 0x64, 0x46, 0x61, 0x72, 0x3b, 0x4f, 0x72, 0x64, 0x3b, 0x4b, 0x68, 0x6f, 0x3b, 0x54, 0x69, 0x72, 0x3b, 0x4d,
+0x6f, 0x72, 0x3b, 0x53, 0x68, 0x61, 0x3b, 0x4d, 0x65, 0x68, 0x3b, 0x41, 0x62, 0x61, 0x3b, 0x41, 0x7a, 0x61, 0x3b, 0x44,
+0x65, 0x79, 0x3b, 0x42, 0x61, 0x68, 0x3b, 0x45, 0x73, 0x66, 0x46, 0x3b, 0x4f, 0x3b, 0x4b, 0x3b, 0x54, 0x3b, 0x4d, 0x3b,
+0x53, 0x3b, 0x4d, 0x3b, 0x41, 0x3b, 0x41, 0x3b, 0x44, 0x3b, 0x42, 0x3b, 0x45, 0x31, 0x3b, 0x32, 0x3b, 0x33, 0x3b, 0x34,
+0x3b, 0x35, 0x3b, 0x36, 0x3b, 0x37, 0x3b, 0x38, 0x3b, 0x39, 0x3b, 0x31, 0x30, 0x3b, 0x31, 0x31, 0x3b, 0x31, 0x32, 0x641,
+0x631, 0x641, 0x631, 0x62f, 0x646, 0x3b, 0x623, 0x630, 0x631, 0x628, 0x64a, 0x647, 0x634, 0x62a, 0x3b, 0x62e, 0x631, 0x62f, 0x627, 0x62f,
+0x3b, 0x62a, 0x627, 0x631, 0x3b, 0x645, 0x631, 0x62f, 0x627, 0x62f, 0x3b, 0x634, 0x647, 0x631, 0x641, 0x627, 0x631, 0x3b, 0x645, 0x647,
+0x631, 0x3b, 0x622, 0x64a, 0x627, 0x646, 0x3b, 0x622, 0x630, 0x631, 0x3b, 0x62f, 0x64a, 0x3b, 0x628, 0x647, 0x645, 0x646, 0x3b, 0x627,
+0x633, 0x641, 0x646, 0x62f, 0x627, 0x631, 0x9ab, 0x9cd, 0x9af, 0x9be, 0x9ad, 0x9be, 0x9b0, 0x9cd, 0x9a1, 0x9bf, 0x9a8, 0x3b, 0x985, 0x9b0,
+0x9a1, 0x9bf, 0x9ac, 0x9c7, 0x9b9, 0x9c7, 0x9b6, 0x9cd, 0x9a4, 0x3b, 0x996, 0x9cb, 0x9b0, 0x9cd, 0x9a6, 0x9cd, 0x9a6, 0x3b, 0x9a4, 0x9c0,
+0x9b0, 0x3b, 0x9ae, 0x9b0, 0x9cd, 0x9af, 0x9be, 0x9a6, 0x3b, 0x9b6, 0x9be, 0x9b9, 0x9b0, 0x9bf, 0x9ac, 0x9be, 0x9b0, 0x3b, 0x9ae, 0x9c7,
+0x9b9, 0x9c7, 0x9b0, 0x3b, 0x986, 0x9ac, 0x9be, 0x9a8, 0x3b, 0x9ac, 0x9be, 0x99c, 0x9be, 0x9b0, 0x3b, 0x9a6, 0x9c7, 0x3b, 0x9ac, 0x9be,
+0x9b9, 0x9ae, 0x9be, 0x9a8, 0x3b, 0x98f, 0x9b8, 0x9ab, 0x9cd, 0x9af, 0x9be, 0x9a8, 0x9cd, 0x9a1, 0x9ab, 0x9cd, 0x9af, 0x9be, 0x9ad, 0x9be,
+0x9b0, 0x9cd, 0x9a1, 0x9bf, 0x9a8, 0x3b, 0x985, 0x9b0, 0x9a1, 0x9bf, 0x9ac, 0x9c7, 0x9b9, 0x9c7, 0x9b6, 0x9cd, 0x9a4, 0x3b, 0x996, 0x9cb,
+0x9b0, 0x9cd, 0x9a6, 0x9cd, 0x9a6, 0x3b, 0x9a4, 0x9c0, 0x9b0, 0x3b, 0x9ae, 0x9b0, 0x9cd, 0x9af, 0x9be, 0x9a6, 0x3b, 0x9b6, 0x9be, 0x9b9,
+0x9b0, 0x9bf, 0x9ac, 0x9be, 0x9b0, 0x3b, 0x9ae, 0x9c7, 0x9b9, 0x9c7, 0x9b0, 0x3b, 0x986, 0x9ac, 0x9be, 0x9a8, 0x3b, 0x986, 0x99c, 0x9be,
+0x9b0, 0x3b, 0x9a6, 0x9c7, 0x3b, 0x9ac, 0x9be, 0x9b9, 0x9ae, 0x9be, 0x9a8, 0x3b, 0x98f, 0x9b8, 0x9ab, 0x9cd, 0x9af, 0x9be, 0x9a8, 0x9cd,
+0x9a1, 0x9e7, 0x3b, 0x9e8, 0x3b, 0x9e9, 0x3b, 0x9ea, 0x3b, 0x9eb, 0x3b, 0x9ec, 0x3b, 0x9ed, 0x3b, 0x9ee, 0x3b, 0x9ef, 0x3b, 0x9e7,
+0x9e6, 0x3b, 0x9e7, 0x9e7, 0x3b, 0x9e7, 0x9e8, 0x4e00, 0x6708, 0x3b, 0x4e8c, 0x6708, 0x3b, 0x4e09, 0x6708, 0x3b, 0x56db, 0x6708, 0x3b, 0x4e94,
+0x6708, 0x3b, 0x516d, 0x6708, 0x3b, 0x4e03, 0x6708, 0x3b, 0x516b, 0x6708, 0x3b, 0x4e5d, 0x6708, 0x3b, 0x5341, 0x6708, 0x3b, 0x5341, 0x4e00, 0x6708,
+0x3b, 0x5341, 0x4e8c, 0x6708, 0x31, 0x6708, 0x3b, 0x32, 0x6708, 0x3b, 0x33, 0x6708, 0x3b, 0x34, 0x6708, 0x3b, 0x35, 0x6708, 0x3b, 0x36,
 0x6708, 0x3b, 0x37, 0x6708, 0x3b, 0x38, 0x6708, 0x3b, 0x39, 0x6708, 0x3b, 0x31, 0x30, 0x6708, 0x3b, 0x31, 0x31, 0x6708, 0x3b, 0x31,
-0x32, 0x6708, 0x3b, 0x4e00, 0x6708, 0x3b, 0x4e8c, 0x6708, 0x3b, 0x4e09, 0x6708, 0x3b, 0x56db, 0x6708, 0x3b, 0x4e94, 0x6708, 0x3b, 0x516d, 0x6708,
-0x3b, 0x4e03, 0x6708, 0x3b, 0x516b, 0x6708, 0x3b, 0x4e5d, 0x6708, 0x3b, 0x5341, 0x6708, 0x3b, 0x5341, 0x4e00, 0x6708, 0x3b, 0x5341, 0x4e8c, 0x6708,
-0x3b, 0x31, 0x2e, 0x3b, 0x32, 0x2e, 0x3b, 0x33, 0x2e, 0x3b, 0x34, 0x2e, 0x3b, 0x35, 0x2e, 0x3b, 0x36, 0x2e, 0x3b, 0x37,
-0x2e, 0x3b, 0x38, 0x2e, 0x3b, 0x39, 0x2e, 0x3b, 0x31, 0x30, 0x2e, 0x3b, 0x31, 0x31, 0x2e, 0x3b, 0x31, 0x32, 0x2e, 0x3b,
+0x32, 0x6708, 0x31, 0x2e, 0x3b, 0x32, 0x2e, 0x3b, 0x33, 0x2e, 0x3b, 0x34, 0x2e, 0x3b, 0x35, 0x2e, 0x3b, 0x36, 0x2e, 0x3b,
+0x37, 0x2e, 0x3b, 0x38, 0x2e, 0x3b, 0x39, 0x2e, 0x3b, 0x31, 0x30, 0x2e, 0x3b, 0x31, 0x31, 0x2e, 0x3b, 0x31, 0x32, 0x2e,
 0x66, 0x61, 0x72, 0x76, 0x61, 0x72, 0x64, 0x69, 0x6e, 0x3b, 0x6f, 0x72, 0x64, 0x69, 0x62, 0x65, 0x68, 0x65, 0x161, 0x74,
 0x3b, 0x63, 0x68, 0x6f, 0x72, 0x64, 0xe1, 0x64, 0x3b, 0x74, 0xed, 0x72, 0x3b, 0x6d, 0x6f, 0x72, 0x64, 0xe1, 0x64, 0x3b,
 0x161, 0x61, 0x68, 0x72, 0xed, 0x76, 0x61, 0x72, 0x3b, 0x6d, 0x65, 0x68, 0x72, 0x3b, 0xe1, 0x62, 0xe1, 0x6e, 0x3b, 0xe1,
 0x7a, 0x61, 0x72, 0x3b, 0x64, 0x65, 0x69, 0x3b, 0x62, 0x61, 0x68, 0x6d, 0x61, 0x6e, 0x3b, 0x65, 0x73, 0x66, 0x61, 0x6e,
-0x64, 0x3b, 0x66, 0x61, 0x72, 0x76, 0x61, 0x72, 0x64, 0x69, 0x6e, 0x3b, 0x6f, 0x72, 0x64, 0x69, 0x62, 0x65, 0x68, 0x65,
-0x73, 0x68, 0x74, 0x3b, 0x6b, 0x68, 0x6f, 0x72, 0x64, 0x61, 0x64, 0x3b, 0x74, 0x69, 0x72, 0x3b, 0x6d, 0x6f, 0x72, 0x64,
-0x61, 0x64, 0x3b, 0x73, 0x68, 0x61, 0x68, 0x72, 0x69, 0x76, 0x61, 0x72, 0x3b, 0x6d, 0x65, 0x68, 0x72, 0x3b, 0x61, 0x62,
-0x61, 0x6e, 0x3b, 0x61, 0x7a, 0x61, 0x72, 0x3b, 0x64, 0x65, 0x79, 0x3b, 0x62, 0x61, 0x68, 0x6d, 0x61, 0x6e, 0x3b, 0x65,
-0x73, 0x66, 0x61, 0x6e, 0x64, 0x3b, 0x66, 0x61, 0x72, 0x76, 0x61, 0x72, 0x64, 0x69, 0x6e, 0x3b, 0x6f, 0x72, 0x64, 0x69,
-0x62, 0x65, 0x68, 0x65, 0x161, 0x74, 0x3b, 0x6b, 0x68, 0x6f, 0x72, 0x64, 0x61, 0x64, 0x3b, 0x74, 0x69, 0x72, 0x3b, 0x6d,
-0x6f, 0x72, 0x64, 0x61, 0x64, 0x3b, 0x161, 0x61, 0x68, 0x72, 0x69, 0x76, 0x61, 0x72, 0x3b, 0x6d, 0x65, 0x68, 0x72, 0x3b,
-0x61, 0x62, 0x61, 0x6e, 0x3b, 0x61, 0x7a, 0x61, 0x72, 0x3b, 0x64, 0x65, 0x79, 0x3b, 0x62, 0x61, 0x68, 0x6d, 0x61, 0x6e,
-0x3b, 0x65, 0x73, 0x66, 0x61, 0x6e, 0x64, 0x3b, 0x66, 0x61, 0x72, 0x76, 0x61, 0x72, 0x64, 0x69, 0x6e, 0x6b, 0x75, 0x75,
-0x3b, 0x6f, 0x72, 0x64, 0x69, 0x62, 0x65, 0x68, 0x65, 0x161, 0x74, 0x6b, 0x75, 0x75, 0x3b, 0x6b, 0x68, 0x6f, 0x72, 0x64,
-0x61, 0x64, 0x6b, 0x75, 0x75, 0x3b, 0x74, 0x69, 0x72, 0x6b, 0x75, 0x75, 0x3b, 0x6d, 0x6f, 0x72, 0x64, 0x61, 0x64, 0x6b,
-0x75, 0x75, 0x3b, 0x161, 0x61, 0x68, 0x72, 0x69, 0x76, 0x61, 0x72, 0x6b, 0x75, 0x75, 0x3b, 0x6d, 0x65, 0x68, 0x72, 0x6b,
-0x75, 0x75, 0x3b, 0x61, 0x62, 0x61, 0x6e, 0x6b, 0x75, 0x75, 0x3b, 0x61, 0x7a, 0x61, 0x72, 0x6b, 0x75, 0x75, 0x3b, 0x64,
-0x65, 0x79, 0x6b, 0x75, 0x75, 0x3b, 0x62, 0x61, 0x68, 0x6d, 0x61, 0x6e, 0x6b, 0x75, 0x75, 0x3b, 0x65, 0x73, 0x66, 0x61,
-0x6e, 0x64, 0x6b, 0x75, 0x75, 0x3b, 0x66, 0x61, 0x72, 0x76, 0x61, 0x72, 0x64, 0x69, 0x6e, 0x6b, 0x75, 0x75, 0x74, 0x61,
-0x3b, 0x6f, 0x72, 0x64, 0x69, 0x62, 0x65, 0x68, 0x65, 0x161, 0x74, 0x6b, 0x75, 0x75, 0x74, 0x61, 0x3b, 0x6b, 0x68, 0x6f,
-0x72, 0x64, 0x61, 0x64, 0x6b, 0x75, 0x75, 0x74, 0x61, 0x3b, 0x74, 0x69, 0x72, 0x6b, 0x75, 0x75, 0x74, 0x61, 0x3b, 0x6d,
-0x6f, 0x72, 0x64, 0x61, 0x64, 0x6b, 0x75, 0x75, 0x74, 0x61, 0x3b, 0x161, 0x61, 0x68, 0x72, 0x69, 0x76, 0x61, 0x72, 0x6b,
-0x75, 0x75, 0x74, 0x61, 0x3b, 0x6d, 0x65, 0x68, 0x72, 0x6b, 0x75, 0x75, 0x74, 0x61, 0x3b, 0x61, 0x62, 0x61, 0x6e, 0x6b,
-0x75, 0x75, 0x74, 0x61, 0x3b, 0x61, 0x7a, 0x61, 0x72, 0x6b, 0x75, 0x75, 0x74, 0x61, 0x3b, 0x64, 0x65, 0x79, 0x6b, 0x75,
-0x75, 0x74, 0x61, 0x3b, 0x62, 0x61, 0x68, 0x6d, 0x61, 0x6e, 0x6b, 0x75, 0x75, 0x74, 0x61, 0x3b, 0x65, 0x73, 0x66, 0x61,
-0x6e, 0x64, 0x6b, 0x75, 0x75, 0x74, 0x61, 0x3b, 0x66, 0x61, 0x72, 0x2e, 0x3b, 0x6f, 0x72, 0x64, 0x2e, 0x3b, 0x6b, 0x68,
-0x6f, 0x2e, 0x3b, 0x74, 0x69, 0x72, 0x3b, 0x6d, 0x6f, 0x72, 0x2e, 0x3b, 0x161, 0x61, 0x68, 0x2e, 0x3b, 0x6d, 0x65, 0x68,
-0x72, 0x3b, 0xe2, 0x62, 0xe2, 0x6e, 0x3b, 0xe2, 0x7a, 0x61, 0x72, 0x3b, 0x64, 0x65, 0x79, 0x3b, 0x62, 0x61, 0x68, 0x2e,
-0x3b, 0x65, 0x73, 0x66, 0x2e, 0x3b, 0x66, 0x61, 0x72, 0x76, 0x61, 0x72, 0x64, 0x69, 0x6e, 0x3b, 0x6f, 0x72, 0x64, 0x69,
-0x62, 0x65, 0x68, 0x65, 0x161, 0x74, 0x3b, 0x6b, 0x68, 0x6f, 0x72, 0x64, 0xe2, 0x64, 0x3b, 0x74, 0x69, 0x72, 0x3b, 0x6d,
-0x6f, 0x72, 0x64, 0xe2, 0x64, 0x3b, 0x161, 0x61, 0x68, 0x72, 0x69, 0x76, 0x61, 0x72, 0x3b, 0x6d, 0x65, 0x68, 0x72, 0x3b,
-0xe2, 0x62, 0xe2, 0x6e, 0x3b, 0xe2, 0x7a, 0x61, 0x72, 0x3b, 0x64, 0x65, 0x79, 0x3b, 0x62, 0x61, 0x68, 0x6d, 0x61, 0x6e,
-0x3b, 0x65, 0x73, 0x66, 0x61, 0x6e, 0x64, 0x3b, 0x46, 0x61, 0x72, 0x2e, 0x3b, 0x4f, 0x72, 0x64, 0x2e, 0x3b, 0x4b, 0x68,
-0x6f, 0x2e, 0x3b, 0x54, 0x69, 0x72, 0x3b, 0x4d, 0x6f, 0x72, 0x2e, 0x3b, 0x160, 0x61, 0x68, 0x2e, 0x3b, 0x4d, 0x65, 0x68,
-0x72, 0x3b, 0xc2, 0x62, 0xe2, 0x2e, 0x3b, 0xc2, 0x7a, 0x61, 0x72, 0x3b, 0x44, 0x65, 0x79, 0x3b, 0x42, 0x61, 0x68, 0x2e,
-0x3b, 0x45, 0x73, 0x66, 0x2e, 0x3b, 0x46, 0x61, 0x72, 0x76, 0x61, 0x72, 0x64, 0x69, 0x6e, 0x3b, 0x4f, 0x72, 0x64, 0x69,
-0x62, 0x65, 0x68, 0x65, 0x161, 0x74, 0x3b, 0x4b, 0x68, 0x6f, 0x72, 0x64, 0xe2, 0x64, 0x3b, 0x54, 0x69, 0x72, 0x3b, 0x4d,
-0x6f, 0x72, 0x64, 0xe2, 0x64, 0x3b, 0x160, 0x61, 0x68, 0x72, 0x69, 0x76, 0x61, 0x72, 0x3b, 0x4d, 0x65, 0x68, 0x72, 0x3b,
-0xc2, 0x62, 0xe2, 0x6e, 0x3b, 0xc2, 0x7a, 0x61, 0x72, 0x3b, 0x44, 0x65, 0x79, 0x3b, 0x42, 0x61, 0x68, 0x6d, 0x61, 0x6e,
-0x3b, 0x45, 0x73, 0x66, 0x61, 0x6e, 0x64, 0x3b, 0x10e4, 0x10d0, 0x10e0, 0x10d5, 0x10d0, 0x10e0, 0x10d3, 0x10d8, 0x10dc, 0x10d8, 0x3b, 0x10dd,
-0x10e0, 0x10d3, 0x10d8, 0x10d1, 0x10d4, 0x10f0, 0x10d4, 0x10e8, 0x10d7, 0x10d8, 0x3b, 0x10ee, 0x10dd, 0x10e0, 0x10d3, 0x10d0, 0x10d3, 0x10d8, 0x3b, 0x10d7,
-0x10d8, 0x10e0, 0x10d8, 0x3b, 0x10db, 0x10dd, 0x10e0, 0x10d3, 0x10d0, 0x10d3, 0x10d8, 0x3b, 0x10e8, 0x10d0, 0x10f0, 0x10e0, 0x10d8, 0x10d5, 0x10d0, 0x10e0,
-0x10d8, 0x3b, 0x10db, 0x10d4, 0x10f0, 0x10e0, 0x10d8, 0x3b, 0x10d0, 0x10d1, 0x10d0, 0x10dc, 0x10d8, 0x3b, 0x10d0, 0x10d6, 0x10d0, 0x10e0, 0x10d8, 0x3b,
-0x10d3, 0x10d4, 0x10d8, 0x3b, 0x10d1, 0x10d0, 0x10f0, 0x10db, 0x10d0, 0x10dc, 0x10d8, 0x3b, 0x10d4, 0x10e1, 0x10e4, 0x10d0, 0x10dc, 0x10d3, 0x10d8, 0x3b,
-0x46, 0x61, 0x72, 0x77, 0x61, 0x72, 0x64, 0x69, 0x6e, 0x3b, 0x4f, 0x72, 0x64, 0x69, 0x62, 0x65, 0x68, 0x65, 0x73, 0x63,
-0x68, 0x74, 0x3b, 0x43, 0x68, 0x6f, 0x72, 0x64, 0x101, 0x64, 0x3b, 0x54, 0x69, 0x72, 0x3b, 0x4d, 0x6f, 0x72, 0x64, 0x101,
-0x64, 0x3b, 0x53, 0x63, 0x68, 0x61, 0x68, 0x72, 0x69, 0x77, 0x61, 0x72, 0x3b, 0x4d, 0x65, 0x68, 0x72, 0x3b, 0x100, 0x62,
-0x101, 0x6e, 0x3b, 0x100, 0x73, 0x61, 0x72, 0x3b, 0x44, 0xe9, 0x69, 0x3b, 0x42, 0x61, 0x68, 0x6d, 0x61, 0x6e, 0x3b, 0x45,
-0x73, 0x73, 0x66, 0x61, 0x6e, 0x64, 0x3b, 0xaab, 0xabe, 0xab0, 0xacd, 0xab5, 0xabe, 0xab0, 0xacd, 0xaa6, 0xabf, 0xaa8, 0x3b, 0xa93,
-0xab0, 0xaa1, 0xac0, 0xaac, 0xac7, 0xab9, 0xac7, 0xab6, 0xacd, 0xa9f, 0x3b, 0xa96, 0xacb, 0xab0, 0xaa6, 0xabe, 0xaa6, 0x3b, 0xaa4, 0xabf,
-0xab0, 0x3b, 0xaae, 0xacb, 0xab0, 0xacd, 0xaa6, 0xabe, 0xaa6, 0x3b, 0xab6, 0xabe, 0xab9, 0xab0, 0xabf, 0xab5, 0xab0, 0x3b, 0xaae, 0xac7,
-0xab9, 0xab0, 0x3b, 0xa85, 0xaac, 0xabe, 0xaa8, 0x3b, 0xa85, 0xa9d, 0xabe, 0xab0, 0x3b, 0xaa1, 0xac7, 0xaaf, 0x3b, 0xaac, 0xabe, 0xab9,
-0xaae, 0xac7, 0xaa8, 0x3b, 0xa8f, 0xab8, 0xacd, 0xaab, 0xabe, 0xaa8, 0xacd, 0xaa1, 0x3b, 0x5e4, 0x5e8, 0x5d5, 0x5e8, 0x5d3, 0x5d9, 0x5df,
-0x3b, 0x5d0, 0x5e8, 0x5d3, 0x5d9, 0x5d1, 0x5d4, 0x5e9, 0x5ea, 0x3b, 0x5d7, 0x5f3, 0x5e8, 0x5d3, 0x5d0, 0x5d3, 0x3b, 0x5ea, 0x5d9, 0x5e8,
-0x3b, 0x5de, 0x5e8, 0x5d3, 0x5d0, 0x5d3, 0x3b, 0x5e9, 0x5d4, 0x5e8, 0x5d9, 0x5d5, 0x5e8, 0x3b, 0x5de, 0x5d4, 0x5e8, 0x3b, 0x5d0, 0x5d1,
-0x5d0, 0x5df, 0x3b, 0x5d0, 0x5d3, 0x5f3, 0x5e8, 0x3b, 0x5d3, 0x5d9, 0x3b, 0x5d1, 0x5d4, 0x5de, 0x5df, 0x3b, 0x5d0, 0x5e1, 0x5e4, 0x5e0,
-0x5d3, 0x3b, 0x92b, 0x930, 0x94d, 0x935, 0x93e, 0x926, 0x93f, 0x928, 0x3b, 0x913, 0x930, 0x94d, 0x926, 0x93f, 0x935, 0x947, 0x939, 0x947,
-0x938, 0x94d, 0x91f, 0x3b, 0x916, 0x94b, 0x930, 0x930, 0x94d, 0x926, 0x93e, 0x926, 0x3b, 0x91f, 0x93f, 0x930, 0x3b, 0x92e, 0x94b, 0x930,
-0x926, 0x93e, 0x926, 0x3b, 0x936, 0x93e, 0x939, 0x930, 0x940, 0x935, 0x930, 0x94d, 0x3b, 0x92e, 0x947, 0x939, 0x930, 0x3b, 0x905, 0x935,
-0x928, 0x3b, 0x905, 0x91c, 0x93c, 0x930, 0x3b, 0x921, 0x947, 0x3b, 0x92c, 0x939, 0x92e, 0x928, 0x3b, 0x908, 0x938, 0x94d, 0x92b, 0x928,
-0x94d, 0x926, 0x94d, 0x3b, 0x30d5, 0x30a1, 0x30eb, 0x30f4, 0x30a1, 0x30eb, 0x30c7, 0x30a3, 0x30fc, 0x30f3, 0x3b, 0x30aa, 0x30eb, 0x30c7, 0x30a3, 0x30fc,
-0x30d9, 0x30d8, 0x30b7, 0x30e5, 0x30c8, 0x3b, 0x30db, 0x30eb, 0x30c0, 0x30fc, 0x30c9, 0x3b, 0x30c6, 0x30a3, 0x30fc, 0x30eb, 0x3b, 0x30e2, 0x30eb, 0x30c0,
-0x30fc, 0x30c9, 0x3b, 0x30b7, 0x30e3, 0x30cf, 0x30ea, 0x30fc, 0x30f4, 0x30a1, 0x30eb, 0x3b, 0x30e1, 0x30d5, 0x30eb, 0x3b, 0x30a2, 0x30fc, 0x30d0, 0x30fc,
-0x30f3, 0x3b, 0x30a2, 0x30fc, 0x30b6, 0x30eb, 0x3b, 0x30c7, 0x30a4, 0x3b, 0x30d0, 0x30d5, 0x30de, 0x30f3, 0x3b, 0x30a8, 0x30b9, 0x30d5, 0x30a1, 0x30f3,
-0x30c9, 0x3b, 0xcab, 0xcb0, 0xccd, 0xcb5, 0xcb0, 0xccd, 0xca6, 0xcbf, 0xca8, 0xccd, 0x3b, 0xc93, 0xcb0, 0xccd, 0xca6, 0xcbf, 0xcac, 0xcc6,
-0xcb9, 0xcc6, 0xcb6, 0xccd, 0xc9f, 0xccd, 0x3b, 0xc96, 0xccb, 0xcb0, 0xccd, 0xca1, 0xcbe, 0xca6, 0xccd, 0x3b, 0xc9f, 0xcbf, 0xcb0, 0xccd,
-0x3b, 0xcae, 0xcca, 0xcb0, 0xccd, 0xca6, 0xcbe, 0xca6, 0xccd, 0x3b, 0xcb6, 0xcb9, 0xcb0, 0xcbf, 0xcb5, 0xcbe, 0xcb0, 0xccd, 0x3b, 0xcae,
-0xcc6, 0xcb9, 0xccd, 0xcb0, 0xccd, 0x3b, 0xc85, 0xcac, 0xca8, 0xccd, 0x3b, 0xc85, 0xc9d, 0xcb0, 0xccd, 0x3b, 0xca1, 0xcc7, 0x3b, 0xcac,
-0xcb9, 0xccd, 0xcae, 0xca8, 0xccd, 0x3b, 0xc8e, 0xcb8, 0xccd, 0xcab, 0xcbe, 0xc82, 0xca1, 0xccd, 0x3b, 0xd654, 0xb974, 0xbc14, 0xb518, 0x3b,
-0xc624, 0xb974, 0xb514, 0xbca0, 0xd5e4, 0xc26c, 0xd2b8, 0x3b, 0xd638, 0xb974, 0xb2e4, 0xb4dc, 0x3b, 0xd2f0, 0xb974, 0x3b, 0xbaa8, 0xb974, 0xb2e4, 0xb4dc,
-0x3b, 0xc0e4, 0xd750, 0xb9ac, 0xbc14, 0xb974, 0x3b, 0xba54, 0xd750, 0xb974, 0x3b, 0xc544, 0xbc18, 0x3b, 0xc544, 0xc790, 0xb974, 0x3b, 0xb2e4, 0xc774,
-0x3b, 0xbc14, 0xd750, 0xb9cc, 0x3b, 0xc5d0, 0xc2a4, 0xd310, 0xb4dc, 0x3b, 0xe9f, 0xea3, 0xeb2, 0xea7, 0xeb2, 0xe94, 0xeb4, 0xe99, 0x3b, 0xead,
-0xecd, 0xea3, 0xe94, 0xeb5, 0xe9a, 0xeb5, 0xec0, 0xeab, 0xeae, 0xe94, 0x3b, 0xe84, 0xecd, 0xea3, 0xec0, 0xe94, 0xe94, 0x3b, 0xec1, 0xe95,
-0xea3, 0x3b, 0xea1, 0xecd, 0xea3, 0xec0, 0xe94, 0xe94, 0x3b, 0xe8a, 0xeb2, 0xea3, 0xea5, 0xeb4, 0xea7, 0xeb2, 0x3b, 0xec0, 0xea1, 0xeb5,
-0x3b, 0xead, 0xeb2, 0xe9a, 0xeb2, 0xe99, 0x3b, 0xead, 0xeb2, 0xe8a, 0xeb2, 0x3b, 0xe94, 0xeb5, 0xea3, 0x3b, 0xe9a, 0xea3, 0xeb2, 0xea1,
-0xeb2, 0xe99, 0x3b, 0xec0, 0xead, 0xeaa, 0xe9f, 0xeb2, 0xe99, 0x3b, 0xe9f, 0xea3, 0xeb2, 0xea7, 0xeb2, 0xe94, 0xeb4, 0xe99, 0x3b, 0xead,
-0xecd, 0xea3, 0xe94, 0xeb5, 0xe9a, 0xeb5, 0xec0, 0xeab, 0xea3, 0xe94, 0x3b, 0xe84, 0xecd, 0xea3, 0xec0, 0xe94, 0xe94, 0x3b, 0xec1, 0xe95,
-0xea3, 0x3b, 0xea1, 0xecd, 0xea3, 0xec0, 0xe94, 0xe94, 0x3b, 0xe8a, 0xeb2, 0xea3, 0xeab, 0xeb4, 0xea7, 0xeb2, 0x3b, 0xec0, 0xea1, 0xeb5,
-0x3b, 0xead, 0xeb2, 0xe9a, 0xeb2, 0xe99, 0x3b, 0xead, 0xeb2, 0xe8a, 0xeb2, 0xea3, 0x3b, 0xe94, 0xeb5, 0xea3, 0x3b, 0xe9a, 0xea3, 0xeb2,
-0xec1, 0xea1, 0xe99, 0x3b, 0xec0, 0xead, 0xeaa, 0xe9f, 0xeb2, 0xe99, 0x3b, 0xe9f, 0xeb2, 0xea3, 0xea7, 0xeb2, 0xe94, 0xeb4, 0xe99, 0x3b,
-0xead, 0xecd, 0xea3, 0xe94, 0xeb5, 0xe9a, 0xeb5, 0xec0, 0xeab, 0xea3, 0xe94, 0x3b, 0xe84, 0xecd, 0xea3, 0xec0, 0xe94, 0xe94, 0x3b, 0xec1,
-0xe95, 0xea3, 0x3b, 0xea1, 0xecd, 0xea3, 0xec0, 0xe94, 0xe94, 0x3b, 0xe8a, 0xeb2, 0xea3, 0xeab, 0xeb4, 0xea7, 0xeb2, 0x3b, 0xec0, 0xea1,
-0xeb5, 0x3b, 0xead, 0xeb2, 0xe9a, 0xeb2, 0xe99, 0x3b, 0xead, 0xeb2, 0xe8a, 0xeb2, 0x3b, 0xe94, 0xeb5, 0xea3, 0x3b, 0xe9a, 0xea3, 0xeb2,
-0xea1, 0xeb2, 0xe99, 0x3b, 0xec0, 0xead, 0xeaa, 0xe9f, 0xeb2, 0xe99, 0x3b, 0x66, 0x61, 0x72, 0x76, 0x61, 0x72, 0x64, 0x12b, 0x6e,
+0x64, 0x66, 0x61, 0x72, 0x76, 0x61, 0x72, 0x64, 0x69, 0x6e, 0x3b, 0x6f, 0x72, 0x64, 0x69, 0x62, 0x65, 0x68, 0x65, 0x73,
+0x68, 0x74, 0x3b, 0x6b, 0x68, 0x6f, 0x72, 0x64, 0x61, 0x64, 0x3b, 0x74, 0x69, 0x72, 0x3b, 0x6d, 0x6f, 0x72, 0x64, 0x61,
+0x64, 0x3b, 0x73, 0x68, 0x61, 0x68, 0x72, 0x69, 0x76, 0x61, 0x72, 0x3b, 0x6d, 0x65, 0x68, 0x72, 0x3b, 0x61, 0x62, 0x61,
+0x6e, 0x3b, 0x61, 0x7a, 0x61, 0x72, 0x3b, 0x64, 0x65, 0x79, 0x3b, 0x62, 0x61, 0x68, 0x6d, 0x61, 0x6e, 0x3b, 0x65, 0x73,
+0x66, 0x61, 0x6e, 0x64, 0x66, 0x61, 0x72, 0x76, 0x61, 0x72, 0x64, 0x69, 0x6e, 0x6b, 0x75, 0x75, 0x3b, 0x6f, 0x72, 0x64,
+0x69, 0x62, 0x65, 0x68, 0x65, 0x161, 0x74, 0x6b, 0x75, 0x75, 0x3b, 0x6b, 0x68, 0x6f, 0x72, 0x64, 0x61, 0x64, 0x6b, 0x75,
+0x75, 0x3b, 0x74, 0x69, 0x72, 0x6b, 0x75, 0x75, 0x3b, 0x6d, 0x6f, 0x72, 0x64, 0x61, 0x64, 0x6b, 0x75, 0x75, 0x3b, 0x161,
+0x61, 0x68, 0x72, 0x69, 0x76, 0x61, 0x72, 0x6b, 0x75, 0x75, 0x3b, 0x6d, 0x65, 0x68, 0x72, 0x6b, 0x75, 0x75, 0x3b, 0x61,
+0x62, 0x61, 0x6e, 0x6b, 0x75, 0x75, 0x3b, 0x61, 0x7a, 0x61, 0x72, 0x6b, 0x75, 0x75, 0x3b, 0x64, 0x65, 0x79, 0x6b, 0x75,
+0x75, 0x3b, 0x62, 0x61, 0x68, 0x6d, 0x61, 0x6e, 0x6b, 0x75, 0x75, 0x3b, 0x65, 0x73, 0x66, 0x61, 0x6e, 0x64, 0x6b, 0x75,
+0x75, 0x66, 0x61, 0x72, 0x76, 0x61, 0x72, 0x64, 0x69, 0x6e, 0x6b, 0x75, 0x75, 0x74, 0x61, 0x3b, 0x6f, 0x72, 0x64, 0x69,
+0x62, 0x65, 0x68, 0x65, 0x161, 0x74, 0x6b, 0x75, 0x75, 0x74, 0x61, 0x3b, 0x6b, 0x68, 0x6f, 0x72, 0x64, 0x61, 0x64, 0x6b,
+0x75, 0x75, 0x74, 0x61, 0x3b, 0x74, 0x69, 0x72, 0x6b, 0x75, 0x75, 0x74, 0x61, 0x3b, 0x6d, 0x6f, 0x72, 0x64, 0x61, 0x64,
+0x6b, 0x75, 0x75, 0x74, 0x61, 0x3b, 0x161, 0x61, 0x68, 0x72, 0x69, 0x76, 0x61, 0x72, 0x6b, 0x75, 0x75, 0x74, 0x61, 0x3b,
+0x6d, 0x65, 0x68, 0x72, 0x6b, 0x75, 0x75, 0x74, 0x61, 0x3b, 0x61, 0x62, 0x61, 0x6e, 0x6b, 0x75, 0x75, 0x74, 0x61, 0x3b,
+0x61, 0x7a, 0x61, 0x72, 0x6b, 0x75, 0x75, 0x74, 0x61, 0x3b, 0x64, 0x65, 0x79, 0x6b, 0x75, 0x75, 0x74, 0x61, 0x3b, 0x62,
+0x61, 0x68, 0x6d, 0x61, 0x6e, 0x6b, 0x75, 0x75, 0x74, 0x61, 0x3b, 0x65, 0x73, 0x66, 0x61, 0x6e, 0x64, 0x6b, 0x75, 0x75,
+0x74, 0x61, 0x66, 0x61, 0x72, 0x76, 0x61, 0x72, 0x64, 0x69, 0x6e, 0x3b, 0x6f, 0x72, 0x64, 0x69, 0x62, 0x65, 0x68, 0x65,
+0x161, 0x74, 0x3b, 0x6b, 0x68, 0x6f, 0x72, 0x64, 0x61, 0x64, 0x3b, 0x74, 0x69, 0x72, 0x3b, 0x6d, 0x6f, 0x72, 0x64, 0x61,
+0x64, 0x3b, 0x161, 0x61, 0x68, 0x72, 0x69, 0x76, 0x61, 0x72, 0x3b, 0x6d, 0x65, 0x68, 0x72, 0x3b, 0x61, 0x62, 0x61, 0x6e,
+0x3b, 0x61, 0x7a, 0x61, 0x72, 0x3b, 0x64, 0x65, 0x79, 0x3b, 0x62, 0x61, 0x68, 0x6d, 0x61, 0x6e, 0x3b, 0x65, 0x73, 0x66,
+0x61, 0x6e, 0x64, 0x66, 0x61, 0x72, 0x76, 0x61, 0x72, 0x64, 0x69, 0x6e, 0x3b, 0x6f, 0x72, 0x64, 0x69, 0x62, 0x65, 0x68,
+0x65, 0x161, 0x74, 0x3b, 0x6b, 0x68, 0x6f, 0x72, 0x64, 0xe2, 0x64, 0x3b, 0x74, 0x69, 0x72, 0x3b, 0x6d, 0x6f, 0x72, 0x64,
+0xe2, 0x64, 0x3b, 0x161, 0x61, 0x68, 0x72, 0x69, 0x76, 0x61, 0x72, 0x3b, 0x6d, 0x65, 0x68, 0x72, 0x3b, 0xe2, 0x62, 0xe2,
+0x6e, 0x3b, 0xe2, 0x7a, 0x61, 0x72, 0x3b, 0x64, 0x65, 0x79, 0x3b, 0x62, 0x61, 0x68, 0x6d, 0x61, 0x6e, 0x3b, 0x65, 0x73,
+0x66, 0x61, 0x6e, 0x64, 0x66, 0x61, 0x72, 0x2e, 0x3b, 0x6f, 0x72, 0x64, 0x2e, 0x3b, 0x6b, 0x68, 0x6f, 0x2e, 0x3b, 0x74,
+0x69, 0x72, 0x3b, 0x6d, 0x6f, 0x72, 0x2e, 0x3b, 0x161, 0x61, 0x68, 0x2e, 0x3b, 0x6d, 0x65, 0x68, 0x72, 0x3b, 0xe2, 0x62,
+0xe2, 0x6e, 0x3b, 0xe2, 0x7a, 0x61, 0x72, 0x3b, 0x64, 0x65, 0x79, 0x3b, 0x62, 0x61, 0x68, 0x2e, 0x3b, 0x65, 0x73, 0x66,
+0x2e, 0x46, 0x61, 0x72, 0x76, 0x61, 0x72, 0x64, 0x69, 0x6e, 0x3b, 0x4f, 0x72, 0x64, 0x69, 0x62, 0x65, 0x68, 0x65, 0x161,
+0x74, 0x3b, 0x4b, 0x68, 0x6f, 0x72, 0x64, 0xe2, 0x64, 0x3b, 0x54, 0x69, 0x72, 0x3b, 0x4d, 0x6f, 0x72, 0x64, 0xe2, 0x64,
+0x3b, 0x160, 0x61, 0x68, 0x72, 0x69, 0x76, 0x61, 0x72, 0x3b, 0x4d, 0x65, 0x68, 0x72, 0x3b, 0xc2, 0x62, 0xe2, 0x6e, 0x3b,
+0xc2, 0x7a, 0x61, 0x72, 0x3b, 0x44, 0x65, 0x79, 0x3b, 0x42, 0x61, 0x68, 0x6d, 0x61, 0x6e, 0x3b, 0x45, 0x73, 0x66, 0x61,
+0x6e, 0x64, 0x46, 0x61, 0x72, 0x2e, 0x3b, 0x4f, 0x72, 0x64, 0x2e, 0x3b, 0x4b, 0x68, 0x6f, 0x2e, 0x3b, 0x54, 0x69, 0x72,
+0x3b, 0x4d, 0x6f, 0x72, 0x2e, 0x3b, 0x160, 0x61, 0x68, 0x2e, 0x3b, 0x4d, 0x65, 0x68, 0x72, 0x3b, 0xc2, 0x62, 0xe2, 0x2e,
+0x3b, 0xc2, 0x7a, 0x61, 0x72, 0x3b, 0x44, 0x65, 0x79, 0x3b, 0x42, 0x61, 0x68, 0x2e, 0x3b, 0x45, 0x73, 0x66, 0x2e, 0x10e4,
+0x10d0, 0x10e0, 0x10d5, 0x10d0, 0x10e0, 0x10d3, 0x10d8, 0x10dc, 0x10d8, 0x3b, 0x10dd, 0x10e0, 0x10d3, 0x10d8, 0x10d1, 0x10d4, 0x10f0, 0x10d4, 0x10e8, 0x10d7,
+0x10d8, 0x3b, 0x10ee, 0x10dd, 0x10e0, 0x10d3, 0x10d0, 0x10d3, 0x10d8, 0x3b, 0x10d7, 0x10d8, 0x10e0, 0x10d8, 0x3b, 0x10db, 0x10dd, 0x10e0, 0x10d3, 0x10d0,
+0x10d3, 0x10d8, 0x3b, 0x10e8, 0x10d0, 0x10f0, 0x10e0, 0x10d8, 0x10d5, 0x10d0, 0x10e0, 0x10d8, 0x3b, 0x10db, 0x10d4, 0x10f0, 0x10e0, 0x10d8, 0x3b, 0x10d0,
+0x10d1, 0x10d0, 0x10dc, 0x10d8, 0x3b, 0x10d0, 0x10d6, 0x10d0, 0x10e0, 0x10d8, 0x3b, 0x10d3, 0x10d4, 0x10d8, 0x3b, 0x10d1, 0x10d0, 0x10f0, 0x10db, 0x10d0,
+0x10dc, 0x10d8, 0x3b, 0x10d4, 0x10e1, 0x10e4, 0x10d0, 0x10dc, 0x10d3, 0x10d8, 0x46, 0x61, 0x72, 0x77, 0x61, 0x72, 0x64, 0x69, 0x6e, 0x3b,
+0x4f, 0x72, 0x64, 0x69, 0x62, 0x65, 0x68, 0x65, 0x73, 0x63, 0x68, 0x74, 0x3b, 0x43, 0x68, 0x6f, 0x72, 0x64, 0x101, 0x64,
+0x3b, 0x54, 0x69, 0x72, 0x3b, 0x4d, 0x6f, 0x72, 0x64, 0x101, 0x64, 0x3b, 0x53, 0x63, 0x68, 0x61, 0x68, 0x72, 0x69, 0x77,
+0x61, 0x72, 0x3b, 0x4d, 0x65, 0x68, 0x72, 0x3b, 0x100, 0x62, 0x101, 0x6e, 0x3b, 0x100, 0x73, 0x61, 0x72, 0x3b, 0x44, 0xe9,
+0x69, 0x3b, 0x42, 0x61, 0x68, 0x6d, 0x61, 0x6e, 0x3b, 0x45, 0x73, 0x73, 0x66, 0x61, 0x6e, 0x64, 0xaab, 0xabe, 0xab0, 0xacd,
+0xab5, 0xabe, 0xab0, 0xacd, 0xaa6, 0xabf, 0xaa8, 0x3b, 0xa93, 0xab0, 0xaa1, 0xac0, 0xaac, 0xac7, 0xab9, 0xac7, 0xab6, 0xacd, 0xa9f, 0x3b,
+0xa96, 0xacb, 0xab0, 0xaa6, 0xabe, 0xaa6, 0x3b, 0xaa4, 0xabf, 0xab0, 0x3b, 0xaae, 0xacb, 0xab0, 0xacd, 0xaa6, 0xabe, 0xaa6, 0x3b, 0xab6,
+0xabe, 0xab9, 0xab0, 0xabf, 0xab5, 0xab0, 0x3b, 0xaae, 0xac7, 0xab9, 0xab0, 0x3b, 0xa85, 0xaac, 0xabe, 0xaa8, 0x3b, 0xa85, 0xa9d, 0xabe,
+0xab0, 0x3b, 0xaa1, 0xac7, 0xaaf, 0x3b, 0xaac, 0xabe, 0xab9, 0xaae, 0xac7, 0xaa8, 0x3b, 0xa8f, 0xab8, 0xacd, 0xaab, 0xabe, 0xaa8, 0xacd,
+0xaa1, 0x5e4, 0x5e8, 0x5d5, 0x5e8, 0x5d3, 0x5d9, 0x5df, 0x3b, 0x5d0, 0x5e8, 0x5d3, 0x5d9, 0x5d1, 0x5d4, 0x5e9, 0x5ea, 0x3b, 0x5d7, 0x5f3,
+0x5e8, 0x5d3, 0x5d0, 0x5d3, 0x3b, 0x5ea, 0x5d9, 0x5e8, 0x3b, 0x5de, 0x5e8, 0x5d3, 0x5d0, 0x5d3, 0x3b, 0x5e9, 0x5d4, 0x5e8, 0x5d9, 0x5d5,
+0x5e8, 0x3b, 0x5de, 0x5d4, 0x5e8, 0x3b, 0x5d0, 0x5d1, 0x5d0, 0x5df, 0x3b, 0x5d0, 0x5d3, 0x5f3, 0x5e8, 0x3b, 0x5d3, 0x5d9, 0x3b, 0x5d1,
+0x5d4, 0x5de, 0x5df, 0x3b, 0x5d0, 0x5e1, 0x5e4, 0x5e0, 0x5d3, 0x92b, 0x930, 0x94d, 0x935, 0x93e, 0x926, 0x93f, 0x928, 0x3b, 0x913, 0x930,
+0x94d, 0x926, 0x93f, 0x935, 0x947, 0x939, 0x947, 0x938, 0x94d, 0x91f, 0x3b, 0x916, 0x94b, 0x930, 0x930, 0x94d, 0x926, 0x93e, 0x926, 0x3b,
+0x91f, 0x93f, 0x930, 0x3b, 0x92e, 0x94b, 0x930, 0x926, 0x93e, 0x926, 0x3b, 0x936, 0x93e, 0x939, 0x930, 0x940, 0x935, 0x930, 0x94d, 0x3b,
+0x92e, 0x947, 0x939, 0x930, 0x3b, 0x905, 0x935, 0x928, 0x3b, 0x905, 0x91c, 0x93c, 0x930, 0x3b, 0x921, 0x947, 0x3b, 0x92c, 0x939, 0x92e,
+0x928, 0x3b, 0x908, 0x938, 0x94d, 0x92b, 0x928, 0x94d, 0x926, 0x94d, 0x30d5, 0x30a1, 0x30eb, 0x30f4, 0x30a1, 0x30eb, 0x30c7, 0x30a3, 0x30fc, 0x30f3,
+0x3b, 0x30aa, 0x30eb, 0x30c7, 0x30a3, 0x30fc, 0x30d9, 0x30d8, 0x30b7, 0x30e5, 0x30c8, 0x3b, 0x30db, 0x30eb, 0x30c0, 0x30fc, 0x30c9, 0x3b, 0x30c6, 0x30a3,
+0x30fc, 0x30eb, 0x3b, 0x30e2, 0x30eb, 0x30c0, 0x30fc, 0x30c9, 0x3b, 0x30b7, 0x30e3, 0x30cf, 0x30ea, 0x30fc, 0x30f4, 0x30a1, 0x30eb, 0x3b, 0x30e1, 0x30d5,
+0x30eb, 0x3b, 0x30a2, 0x30fc, 0x30d0, 0x30fc, 0x30f3, 0x3b, 0x30a2, 0x30fc, 0x30b6, 0x30eb, 0x3b, 0x30c7, 0x30a4, 0x3b, 0x30d0, 0x30d5, 0x30de, 0x30f3,
+0x3b, 0x30a8, 0x30b9, 0x30d5, 0x30a1, 0x30f3, 0x30c9, 0xcab, 0xcb0, 0xccd, 0xcb5, 0xcb0, 0xccd, 0xca6, 0xcbf, 0xca8, 0xccd, 0x3b, 0xc93, 0xcb0,
+0xccd, 0xca6, 0xcbf, 0xcac, 0xcc6, 0xcb9, 0xcc6, 0xcb6, 0xccd, 0xc9f, 0xccd, 0x3b, 0xc96, 0xccb, 0xcb0, 0xccd, 0xca1, 0xcbe, 0xca6, 0xccd,
+0x3b, 0xc9f, 0xcbf, 0xcb0, 0xccd, 0x3b, 0xcae, 0xcca, 0xcb0, 0xccd, 0xca6, 0xcbe, 0xca6, 0xccd, 0x3b, 0xcb6, 0xcb9, 0xcb0, 0xcbf, 0xcb5,
+0xcbe, 0xcb0, 0xccd, 0x3b, 0xcae, 0xcc6, 0xcb9, 0xccd, 0xcb0, 0xccd, 0x3b, 0xc85, 0xcac, 0xca8, 0xccd, 0x3b, 0xc85, 0xc9d, 0xcb0, 0xccd,
+0x3b, 0xca1, 0xcc7, 0x3b, 0xcac, 0xcb9, 0xccd, 0xcae, 0xca8, 0xccd, 0x3b, 0xc8e, 0xcb8, 0xccd, 0xcab, 0xcbe, 0xc82, 0xca1, 0xccd, 0xd654,
+0xb974, 0xbc14, 0xb518, 0x3b, 0xc624, 0xb974, 0xb514, 0xbca0, 0xd5e4, 0xc26c, 0xd2b8, 0x3b, 0xd638, 0xb974, 0xb2e4, 0xb4dc, 0x3b, 0xd2f0, 0xb974, 0x3b,
+0xbaa8, 0xb974, 0xb2e4, 0xb4dc, 0x3b, 0xc0e4, 0xd750, 0xb9ac, 0xbc14, 0xb974, 0x3b, 0xba54, 0xd750, 0xb974, 0x3b, 0xc544, 0xbc18, 0x3b, 0xc544, 0xc790,
+0xb974, 0x3b, 0xb2e4, 0xc774, 0x3b, 0xbc14, 0xd750, 0xb9cc, 0x3b, 0xc5d0, 0xc2a4, 0xd310, 0xb4dc, 0xe9f, 0xea3, 0xeb2, 0xea7, 0xeb2, 0xe94, 0xeb4,
+0xe99, 0x3b, 0xead, 0xecd, 0xea3, 0xe94, 0xeb5, 0xe9a, 0xeb5, 0xec0, 0xeab, 0xea3, 0xe94, 0x3b, 0xe84, 0xecd, 0xea3, 0xec0, 0xe94, 0xe94,
+0x3b, 0xec1, 0xe95, 0xea3, 0x3b, 0xea1, 0xecd, 0xea3, 0xec0, 0xe94, 0xe94, 0x3b, 0xe8a, 0xeb2, 0xea3, 0xeab, 0xeb4, 0xea7, 0xeb2, 0x3b,
+0xec0, 0xea1, 0xeb5, 0x3b, 0xead, 0xeb2, 0xe9a, 0xeb2, 0xe99, 0x3b, 0xead, 0xeb2, 0xe8a, 0xeb2, 0xea3, 0x3b, 0xe94, 0xeb5, 0xea3, 0x3b,
+0xe9a, 0xea3, 0xeb2, 0xec1, 0xea1, 0xe99, 0x3b, 0xec0, 0xead, 0xeaa, 0xe9f, 0xeb2, 0xe99, 0xe9f, 0xea3, 0xeb2, 0xea7, 0xeb2, 0xe94, 0xeb4,
+0xe99, 0x3b, 0xead, 0xecd, 0xea3, 0xe94, 0xeb5, 0xe9a, 0xeb5, 0xec0, 0xeab, 0xeae, 0xe94, 0x3b, 0xe84, 0xecd, 0xea3, 0xec0, 0xe94, 0xe94,
+0x3b, 0xec1, 0xe95, 0xea3, 0x3b, 0xea1, 0xecd, 0xea3, 0xec0, 0xe94, 0xe94, 0x3b, 0xe8a, 0xeb2, 0xea3, 0xea5, 0xeb4, 0xea7, 0xeb2, 0x3b,
+0xec0, 0xea1, 0xeb5, 0x3b, 0xead, 0xeb2, 0xe9a, 0xeb2, 0xe99, 0x3b, 0xead, 0xeb2, 0xe8a, 0xeb2, 0x3b, 0xe94, 0xeb5, 0xea3, 0x3b, 0xe9a,
+0xea3, 0xeb2, 0xea1, 0xeb2, 0xe99, 0x3b, 0xec0, 0xead, 0xeaa, 0xe9f, 0xeb2, 0xe99, 0xe9f, 0xeb2, 0xea3, 0xea7, 0xeb2, 0xe94, 0xeb4, 0xe99,
+0x3b, 0xead, 0xecd, 0xea3, 0xe94, 0xeb5, 0xe9a, 0xeb5, 0xec0, 0xeab, 0xea3, 0xe94, 0x3b, 0xe84, 0xecd, 0xea3, 0xec0, 0xe94, 0xe94, 0x3b,
+0xec1, 0xe95, 0xea3, 0x3b, 0xea1, 0xecd, 0xea3, 0xec0, 0xe94, 0xe94, 0x3b, 0xe8a, 0xeb2, 0xea3, 0xeab, 0xeb4, 0xea7, 0xeb2, 0x3b, 0xec0,
+0xea1, 0xeb5, 0x3b, 0xead, 0xeb2, 0xe9a, 0xeb2, 0xe99, 0x3b, 0xead, 0xeb2, 0xe8a, 0xeb2, 0x3b, 0xe94, 0xeb5, 0xea3, 0x3b, 0xe9a, 0xea3,
+0xeb2, 0xea1, 0xeb2, 0xe99, 0x3b, 0xec0, 0xead, 0xeaa, 0xe9f, 0xeb2, 0xe99, 0x66, 0x61, 0x72, 0x76, 0x61, 0x72, 0x64, 0x12b, 0x6e,
 0x73, 0x3b, 0x6f, 0x72, 0x64, 0x69, 0x62, 0x65, 0x68, 0x65, 0x161, 0x74, 0x73, 0x3b, 0x68, 0x6f, 0x72, 0x64, 0x101, 0x64,
 0x73, 0x3b, 0x74, 0x12b, 0x72, 0x73, 0x3b, 0x6d, 0x6f, 0x72, 0x64, 0x101, 0x64, 0x73, 0x3b, 0x161, 0x61, 0x68, 0x72, 0x69,
 0x76, 0x113, 0x72, 0x73, 0x3b, 0x6d, 0x65, 0x68, 0x72, 0x73, 0x3b, 0x61, 0x62, 0x61, 0x6e, 0x73, 0x3b, 0x61, 0x7a, 0x65,
 0x72, 0x73, 0x3b, 0x64, 0x65, 0x6a, 0x73, 0x3b, 0x62, 0x61, 0x68, 0x6d, 0x61, 0x6e, 0x73, 0x3b, 0x65, 0x73, 0x66, 0x61,
-0x6e, 0x64, 0x73, 0x3b, 0x444, 0x430, 0x440, 0x432, 0x430, 0x440, 0x434, 0x438, 0x43d, 0x3b, 0x43e, 0x440, 0x434, 0x438, 0x431, 0x435,
-0x445, 0x435, 0x448, 0x442, 0x3b, 0x43a, 0x43e, 0x440, 0x434, 0x430, 0x434, 0x3b, 0x442, 0x438, 0x440, 0x3b, 0x43c, 0x43e, 0x440, 0x434,
-0x430, 0x434, 0x3b, 0x448, 0x430, 0x445, 0x440, 0x438, 0x432, 0x430, 0x440, 0x3b, 0x43c, 0x435, 0x440, 0x3b, 0x430, 0x431, 0x430, 0x43d,
-0x3b, 0x430, 0x437, 0x430, 0x440, 0x3b, 0x434, 0x435, 0x458, 0x3b, 0x431, 0x430, 0x445, 0x43c, 0x430, 0x43d, 0x3b, 0x435, 0x441, 0x444,
-0x430, 0x43d, 0x434, 0x3b, 0xd2b, 0xd7c, 0xd35, 0xd3e, 0xd7c, 0xd26, 0xd3f, 0xd7b, 0x3b, 0xd13, 0xd7c, 0xd21, 0xd3f, 0xd2c, 0xd46, 0xd39,
-0xd46, 0xd37, 0xd4d, 0x200c, 0xd31, 0xd4d, 0xd31, 0xd4d, 0x3b, 0xd16, 0xd4b, 0xd7c, 0xd26, 0xd3e, 0xd26, 0xd4d, 0x3b, 0xd1f, 0xd3f, 0xd7c,
-0x3b, 0xd2e, 0xd4b, 0xd7c, 0xd26, 0xd3e, 0xd26, 0xd4d, 0x3b, 0xd37, 0xd39, 0xd4d, 0x200c, 0xd30, 0xd3f, 0xd35, 0xd3e, 0xd7c, 0x3b, 0xd2e,
-0xd46, 0xd39, 0xd7c, 0x3b, 0xd05, 0xd2c, 0xd3e, 0xd7b, 0x3b, 0xd05, 0xd38, 0xd7c, 0x3b, 0xd21, 0xd46, 0xd2f, 0xd4d, 0x3b, 0xd2c, 0xd39,
-0xd4d, 0x200c, 0xd2e, 0xd3e, 0xd7b, 0x3b, 0xd0e, 0xd38, 0xd4d, 0x200c, 0xd2b, 0xd3e, 0xd7b, 0xd21, 0xd4d, 0x3b, 0xd2b, 0x2e, 0x3b, 0xd13,
-0x2e, 0x3b, 0xd16, 0xd4b, 0x3b, 0xd1f, 0xd3f, 0x2e, 0x3b, 0xd2e, 0xd4b, 0x2e, 0x3b, 0xd37, 0x2e, 0x3b, 0xd2e, 0xd46, 0x2e, 0x3b,
-0xd05, 0x2e, 0x3b, 0xd05, 0x2e, 0x3b, 0xd21, 0xd46, 0x2e, 0x3b, 0xd2c, 0x2e, 0x3b, 0xd0e, 0x2e, 0x3b, 0x92b, 0x930, 0x935, 0x930,
-0x926, 0x93f, 0x928, 0x3b, 0x913, 0x930, 0x94d, 0x926, 0x93f, 0x92c, 0x947, 0x939, 0x947, 0x936, 0x94d, 0x924, 0x3b, 0x916, 0x94b, 0x930,
-0x926, 0x93e, 0x926, 0x3b, 0x924, 0x93f, 0x930, 0x3b, 0x92e, 0x94b, 0x930, 0x926, 0x93e, 0x926, 0x3b, 0x936, 0x93e, 0x939, 0x930, 0x940,
-0x935, 0x93e, 0x930, 0x3b, 0x92e, 0x947, 0x939, 0x947, 0x930, 0x3b, 0x905, 0x92c, 0x93e, 0x928, 0x3b, 0x905, 0x91d, 0x93e, 0x930, 0x3b,
-0x926, 0x947, 0x3b, 0x92c, 0x93e, 0x939, 0x92e, 0x93e, 0x928, 0x3b, 0x90f, 0x938, 0x92b, 0x93e, 0x902, 0x926, 0x3b, 0x967, 0x3b, 0x968,
-0x3b, 0x969, 0x3b, 0x96a, 0x3b, 0x96b, 0x3b, 0x96c, 0x3b, 0x96d, 0x3b, 0x96e, 0x3b, 0x96f, 0x3b, 0x967, 0x966, 0x3b, 0x967, 0x967,
-0x3b, 0x967, 0x968, 0x3b, 0x648, 0x631, 0x6cc, 0x3b, 0x63a, 0x648, 0x6cc, 0x6cc, 0x3b, 0x63a, 0x628, 0x631, 0x6af, 0x648, 0x644, 0x6cc,
-0x3b, 0x686, 0x646, 0x6af, 0x627, 0x69a, 0x3b, 0x632, 0x645, 0x631, 0x6cc, 0x3b, 0x648, 0x696, 0x6cc, 0x3b, 0x62a, 0x644, 0x647, 0x3b,
-0x644, 0x693, 0x645, 0x3b, 0x644, 0x6cc, 0x646, 0x62f, 0x6cd, 0x3b, 0x645, 0x631, 0x63a, 0x648, 0x645, 0x6cc, 0x3b, 0x633, 0x644, 0x648,
-0x627, 0x63a, 0x647, 0x3b, 0x6a9, 0x628, 0x3b, 0x6f1, 0x3b, 0x6f2, 0x3b, 0x6f3, 0x3b, 0x6f4, 0x3b, 0x6f5, 0x3b, 0x6f6, 0x3b, 0x6f7,
-0x3b, 0x6f8, 0x3b, 0x6f9, 0x3b, 0x6f1, 0x6f0, 0x3b, 0x6f1, 0x6f1, 0x3b, 0x6f1, 0x6f2, 0x3b, 0x641, 0x631, 0x648, 0x631, 0x62f, 0x6cc,
-0x646, 0x3b, 0x627, 0x631, 0x62f, 0x6cc, 0x628, 0x647, 0x634, 0x62a, 0x3b, 0x62e, 0x631, 0x62f, 0x627, 0x62f, 0x3b, 0x62a, 0x6cc, 0x631,
-0x3b, 0x645, 0x631, 0x62f, 0x627, 0x62f, 0x3b, 0x634, 0x647, 0x631, 0x6cc, 0x648, 0x631, 0x3b, 0x645, 0x647, 0x631, 0x3b, 0x622, 0x628,
-0x627, 0x646, 0x3b, 0x622, 0x630, 0x631, 0x3b, 0x62f, 0x6cc, 0x3b, 0x628, 0x647, 0x645, 0x646, 0x3b, 0x627, 0x633, 0x641, 0x646, 0x62f,
-0x3b, 0x641, 0x3b, 0x627, 0x3b, 0x62e, 0x3b, 0x62a, 0x3b, 0x645, 0x3b, 0x634, 0x3b, 0x645, 0x3b, 0x622, 0x3b, 0x622, 0x3b, 0x62f,
-0x3b, 0x628, 0x3b, 0x627, 0x3b, 0x62d, 0x3b, 0x62b, 0x3b, 0x62c, 0x3b, 0x633, 0x3b, 0x627, 0x3b, 0x633, 0x3b, 0x645, 0x3b, 0x639,
-0x3b, 0x642, 0x3b, 0x62c, 0x3b, 0x62f, 0x3b, 0x62d, 0x3b, 0x62d, 0x645, 0x644, 0x3b, 0x62b, 0x648, 0x631, 0x3b, 0x62c, 0x648, 0x632,
-0x627, 0x3b, 0x633, 0x631, 0x637, 0x627, 0x646, 0x3b, 0x627, 0x633, 0x62f, 0x3b, 0x633, 0x646, 0x628, 0x644, 0x647, 0x654, 0x3b, 0x645,
-0x6cc, 0x632, 0x627, 0x646, 0x3b, 0x639, 0x642, 0x631, 0x628, 0x3b, 0x642, 0x648, 0x633, 0x3b, 0x62c, 0x62f, 0x6cc, 0x3b, 0x62f, 0x644,
-0x648, 0x3b, 0x62d, 0x648, 0x62a, 0x3b, 0x46, 0x61, 0x72, 0x77, 0x61, 0x72, 0x64, 0x69, 0x6e, 0x3b, 0x4f, 0x72, 0x64, 0x69,
-0x62, 0x65, 0x68, 0x65, 0x73, 0x7a, 0x74, 0x3b, 0x43, 0x68, 0x6f, 0x72, 0x64, 0x101, 0x64, 0x3b, 0x54, 0x69, 0x72, 0x3b,
-0x4d, 0x6f, 0x72, 0x64, 0x101, 0x64, 0x3b, 0x53, 0x7a, 0x61, 0x68, 0x72, 0x69, 0x77, 0x61, 0x72, 0x3b, 0x4d, 0x65, 0x68,
-0x72, 0x3b, 0x100, 0x62, 0x101, 0x6e, 0x3b, 0x100, 0x73, 0x61, 0x72, 0x3b, 0x44, 0xe9, 0x69, 0x3b, 0x42, 0x61, 0x68, 0x6d,
-0x61, 0x6e, 0x3b, 0x45, 0x73, 0x66, 0x61, 0x6e, 0x64, 0x3b, 0xa2b, 0xa3e, 0xa30, 0xa35, 0xa30, 0xa21, 0xa40, 0xa28, 0x3b, 0xa14,
-0xa30, 0xa21, 0xa3e, 0xa08, 0xa2c, 0xa39, 0xa48, 0xa38, 0xa3c, 0xa1f, 0x3b, 0xa16, 0xa4b, 0xa21, 0xa30, 0xa21, 0x3b, 0xa1f, 0xa3f, 0xa30,
-0x3b, 0xa2e, 0xa4b, 0xa30, 0xa21, 0xa3e, 0xa26, 0x3b, 0xa38, 0xa3c, 0xa30, 0xa3e, 0xa07, 0xa35, 0xa30, 0x3b, 0xa2e, 0xa47, 0xa39, 0xa30,
-0x3b, 0xa05, 0xa2c, 0xa3e, 0xa28, 0x3b, 0xa05, 0xa1c, 0xa3c, 0xa3e, 0xa30, 0x3b, 0xa21, 0xa47, 0xa05, 0x3b, 0xa2c, 0xa3e, 0xa39, 0xa2e,
-0xa28, 0x3b, 0xa10, 0xa38, 0xa2b, 0xa70, 0xa21, 0x3b, 0x46, 0x61, 0x72, 0x76, 0x61, 0x72, 0x64, 0x69, 0x6e, 0x3b, 0x4f, 0x72,
-0x64, 0x69, 0x62, 0x65, 0x68, 0x65, 0x73, 0x68, 0x74, 0x3b, 0x4b, 0x68, 0x6f, 0x72, 0x64, 0x61, 0x64, 0x3b, 0x54, 0x69,
-0x72, 0x3b, 0x41, 0x2d, 0x4d, 0x6f, 0x72, 0x64, 0x61, 0x64, 0x3b, 0x53, 0x68, 0x61, 0x68, 0x72, 0x69, 0x76, 0x61, 0x72,
-0x3b, 0x4d, 0x65, 0x68, 0x72, 0x3b, 0x41, 0x62, 0x61, 0x6e, 0x3b, 0x41, 0x7a, 0x61, 0x72, 0x3b, 0x44, 0x65, 0x79, 0x3b,
-0x42, 0x61, 0x68, 0x6d, 0x61, 0x6e, 0x3b, 0x45, 0x73, 0x66, 0x61, 0x6e, 0x64, 0x3b, 0x444, 0x430, 0x440, 0x432, 0x430, 0x440,
-0x434, 0x438, 0x43d, 0x3b, 0x43e, 0x440, 0x434, 0x438, 0x431, 0x435, 0x445, 0x435, 0x448, 0x442, 0x3b, 0x445, 0x43e, 0x440, 0x434, 0x430,
-0x434, 0x3b, 0x442, 0x438, 0x440, 0x3b, 0x43c, 0x43e, 0x440, 0x434, 0x430, 0x434, 0x3b, 0x448, 0x430, 0x445, 0x440, 0x438, 0x432, 0x435,
-0x440, 0x3b, 0x43c, 0x435, 0x445, 0x440, 0x3b, 0x430, 0x431, 0x430, 0x43d, 0x3b, 0x430, 0x437, 0x435, 0x440, 0x3b, 0x434, 0x435, 0x439,
-0x3b, 0x431, 0x430, 0x445, 0x43c, 0x430, 0x43d, 0x3b, 0x44d, 0x441, 0x444, 0x430, 0x43d, 0x434, 0x3b, 0x424, 0x430, 0x440, 0x430, 0x432,
-0x430, 0x434, 0x438, 0x43d, 0x3b, 0x41e, 0x440, 0x434, 0x438, 0x431, 0x435, 0x445, 0x435, 0x448, 0x442, 0x3b, 0x41a, 0x43e, 0x440, 0x434,
-0x430, 0x434, 0x3b, 0x422, 0x438, 0x440, 0x3b, 0x41c, 0x43e, 0x440, 0x434, 0x430, 0x434, 0x3b, 0x428, 0x430, 0x445, 0x440, 0x438, 0x432,
-0x430, 0x440, 0x3b, 0x41c, 0x435, 0x445, 0x440, 0x3b, 0x410, 0x431, 0x430, 0x43d, 0x3b, 0x410, 0x437, 0x430, 0x440, 0x3b, 0x414, 0x435,
-0x458, 0x3b, 0x411, 0x430, 0x445, 0x43c, 0x430, 0x43d, 0x3b, 0x415, 0x441, 0x444, 0x430, 0x43d, 0x434, 0x3b, 0x46, 0x61, 0x72, 0x61,
-0x76, 0x61, 0x64, 0x69, 0x6e, 0x3b, 0x4f, 0x72, 0x64, 0x69, 0x62, 0x65, 0x68, 0x65, 0x161, 0x74, 0x3b, 0x4b, 0x6f, 0x72,
-0x64, 0x61, 0x64, 0x3b, 0x54, 0x69, 0x72, 0x3b, 0x4d, 0x6f, 0x72, 0x64, 0x61, 0x64, 0x3b, 0x160, 0x61, 0x68, 0x72, 0x69,
-0x76, 0x61, 0x72, 0x3b, 0x4d, 0x65, 0x68, 0x72, 0x3b, 0x41, 0x62, 0x61, 0x6e, 0x3b, 0x41, 0x7a, 0x61, 0x72, 0x3b, 0x44,
-0x65, 0x6a, 0x3b, 0x42, 0x61, 0x68, 0x6d, 0x61, 0x6e, 0x3b, 0x45, 0x73, 0x66, 0x61, 0x6e, 0x64, 0x3b, 0x46, 0x61, 0x72,
-0x76, 0x61, 0x72, 0x64, 0x69, 0x6e, 0x3b, 0x4f, 0x72, 0x64, 0x69, 0x62, 0x65, 0x68, 0x65, 0x73, 0x68, 0x74, 0x3b, 0x4b,
-0x68, 0x6f, 0x72, 0x64, 0x101, 0x64, 0x3b, 0x54, 0x69, 0x72, 0x3b, 0x4d, 0x6f, 0x72, 0x64, 0x101, 0x64, 0x3b, 0x53, 0x68,
-0x61, 0x68, 0x72, 0x69, 0x76, 0x61, 0x72, 0x3b, 0x4d, 0x65, 0x68, 0x72, 0x3b, 0x100, 0x62, 0x101, 0x6e, 0x3b, 0x100, 0x7a,
-0x61, 0x72, 0x3b, 0x44, 0x65, 0x79, 0x3b, 0x42, 0x61, 0x68, 0x6d, 0x61, 0x6e, 0x3b, 0x45, 0x73, 0x66, 0x61, 0x6e, 0x64,
-0x3b, 0x66, 0x61, 0x72, 0x76, 0x61, 0x72, 0x64, 0x69, 0x6e, 0x3b, 0x6f, 0x72, 0x64, 0x69, 0x62, 0x65, 0x68, 0x65, 0x73,
-0x68, 0x74, 0x3b, 0x6b, 0x68, 0x6f, 0x72, 0x64, 0x101, 0x64, 0x3b, 0x74, 0x69, 0x72, 0x3b, 0x6d, 0x6f, 0x72, 0x64, 0x101,
-0x64, 0x3b, 0x73, 0x68, 0x61, 0x68, 0x72, 0x69, 0x76, 0x61, 0x72, 0x3b, 0x6d, 0x65, 0x68, 0x72, 0x3b, 0x101, 0x62, 0x101,
-0x6e, 0x3b, 0x101, 0x7a, 0x61, 0x72, 0x3b, 0x64, 0x65, 0x79, 0x3b, 0x62, 0x61, 0x68, 0x6d, 0x61, 0x6e, 0x3b, 0x65, 0x73,
-0x66, 0x61, 0x6e, 0x64, 0x3b, 0x444, 0x430, 0x440, 0x432, 0x430, 0x440, 0x434, 0x438, 0x43d, 0x3b, 0x443, 0x440, 0x434, 0x438, 0x431,
+0x6e, 0x64, 0x73, 0x444, 0x430, 0x440, 0x432, 0x430, 0x440, 0x434, 0x438, 0x43d, 0x3b, 0x43e, 0x440, 0x434, 0x438, 0x431, 0x435, 0x445,
+0x435, 0x448, 0x442, 0x3b, 0x43a, 0x43e, 0x440, 0x434, 0x430, 0x434, 0x3b, 0x442, 0x438, 0x440, 0x3b, 0x43c, 0x43e, 0x440, 0x434, 0x430,
+0x434, 0x3b, 0x448, 0x430, 0x445, 0x440, 0x438, 0x432, 0x430, 0x440, 0x3b, 0x43c, 0x435, 0x440, 0x3b, 0x430, 0x431, 0x430, 0x43d, 0x3b,
+0x430, 0x437, 0x430, 0x440, 0x3b, 0x434, 0x435, 0x458, 0x3b, 0x431, 0x430, 0x445, 0x43c, 0x430, 0x43d, 0x3b, 0x435, 0x441, 0x444, 0x430,
+0x43d, 0x434, 0xd2b, 0xd7c, 0xd35, 0xd3e, 0xd7c, 0xd26, 0xd3f, 0xd7b, 0x3b, 0xd13, 0xd7c, 0xd21, 0xd3f, 0xd2c, 0xd46, 0xd39, 0xd46, 0xd37,
+0xd4d, 0x200c, 0xd31, 0xd4d, 0xd31, 0xd4d, 0x3b, 0xd16, 0xd4b, 0xd7c, 0xd26, 0xd3e, 0xd26, 0xd4d, 0x3b, 0xd1f, 0xd3f, 0xd7c, 0x3b, 0xd2e,
+0xd4b, 0xd7c, 0xd26, 0xd3e, 0xd26, 0xd4d, 0x3b, 0xd37, 0xd39, 0xd4d, 0x200c, 0xd30, 0xd3f, 0xd35, 0xd3e, 0xd7c, 0x3b, 0xd2e, 0xd46, 0xd39,
+0xd7c, 0x3b, 0xd05, 0xd2c, 0xd3e, 0xd7b, 0x3b, 0xd05, 0xd38, 0xd7c, 0x3b, 0xd21, 0xd46, 0xd2f, 0xd4d, 0x3b, 0xd2c, 0xd39, 0xd4d, 0x200c,
+0xd2e, 0xd3e, 0xd7b, 0x3b, 0xd0e, 0xd38, 0xd4d, 0x200c, 0xd2b, 0xd3e, 0xd7b, 0xd21, 0xd4d, 0xd2b, 0x2e, 0x3b, 0xd13, 0x2e, 0x3b, 0xd16,
+0xd4b, 0x3b, 0xd1f, 0xd3f, 0x2e, 0x3b, 0xd2e, 0xd4b, 0x2e, 0x3b, 0xd37, 0x2e, 0x3b, 0xd2e, 0xd46, 0x2e, 0x3b, 0xd05, 0x2e, 0x3b,
+0xd05, 0x2e, 0x3b, 0xd21, 0xd46, 0x2e, 0x3b, 0xd2c, 0x2e, 0x3b, 0xd0e, 0x2e, 0x92b, 0x930, 0x935, 0x930, 0x926, 0x93f, 0x928, 0x3b,
+0x913, 0x930, 0x94d, 0x926, 0x93f, 0x92c, 0x947, 0x939, 0x947, 0x936, 0x94d, 0x924, 0x3b, 0x916, 0x94b, 0x930, 0x926, 0x93e, 0x926, 0x3b,
+0x924, 0x93f, 0x930, 0x3b, 0x92e, 0x94b, 0x930, 0x926, 0x93e, 0x926, 0x3b, 0x936, 0x93e, 0x939, 0x930, 0x940, 0x935, 0x93e, 0x930, 0x3b,
+0x92e, 0x947, 0x939, 0x947, 0x930, 0x3b, 0x905, 0x92c, 0x93e, 0x928, 0x3b, 0x905, 0x91d, 0x93e, 0x930, 0x3b, 0x926, 0x947, 0x3b, 0x92c,
+0x93e, 0x939, 0x92e, 0x93e, 0x928, 0x3b, 0x90f, 0x938, 0x92b, 0x93e, 0x902, 0x926, 0x967, 0x3b, 0x968, 0x3b, 0x969, 0x3b, 0x96a, 0x3b,
+0x96b, 0x3b, 0x96c, 0x3b, 0x96d, 0x3b, 0x96e, 0x3b, 0x96f, 0x3b, 0x967, 0x966, 0x3b, 0x967, 0x967, 0x3b, 0x967, 0x968, 0x648, 0x631,
+0x6cc, 0x3b, 0x63a, 0x648, 0x6cc, 0x6cc, 0x3b, 0x63a, 0x628, 0x631, 0x6af, 0x648, 0x644, 0x6cc, 0x3b, 0x686, 0x646, 0x6af, 0x627, 0x69a,
+0x3b, 0x632, 0x645, 0x631, 0x6cc, 0x3b, 0x648, 0x696, 0x6cc, 0x3b, 0x62a, 0x644, 0x647, 0x3b, 0x644, 0x693, 0x645, 0x3b, 0x644, 0x6cc,
+0x646, 0x62f, 0x6cd, 0x3b, 0x645, 0x631, 0x63a, 0x648, 0x645, 0x6cc, 0x3b, 0x633, 0x644, 0x648, 0x627, 0x63a, 0x647, 0x3b, 0x6a9, 0x628,
+0x6f1, 0x3b, 0x6f2, 0x3b, 0x6f3, 0x3b, 0x6f4, 0x3b, 0x6f5, 0x3b, 0x6f6, 0x3b, 0x6f7, 0x3b, 0x6f8, 0x3b, 0x6f9, 0x3b, 0x6f1, 0x6f0,
+0x3b, 0x6f1, 0x6f1, 0x3b, 0x6f1, 0x6f2, 0x641, 0x631, 0x648, 0x631, 0x62f, 0x6cc, 0x646, 0x3b, 0x627, 0x631, 0x62f, 0x6cc, 0x628, 0x647,
+0x634, 0x62a, 0x3b, 0x62e, 0x631, 0x62f, 0x627, 0x62f, 0x3b, 0x62a, 0x6cc, 0x631, 0x3b, 0x645, 0x631, 0x62f, 0x627, 0x62f, 0x3b, 0x634,
+0x647, 0x631, 0x6cc, 0x648, 0x631, 0x3b, 0x645, 0x647, 0x631, 0x3b, 0x622, 0x628, 0x627, 0x646, 0x3b, 0x622, 0x630, 0x631, 0x3b, 0x62f,
+0x6cc, 0x3b, 0x628, 0x647, 0x645, 0x646, 0x3b, 0x627, 0x633, 0x641, 0x646, 0x62f, 0x641, 0x3b, 0x627, 0x3b, 0x62e, 0x3b, 0x62a, 0x3b,
+0x645, 0x3b, 0x634, 0x3b, 0x645, 0x3b, 0x622, 0x3b, 0x622, 0x3b, 0x62f, 0x3b, 0x628, 0x3b, 0x627, 0x62d, 0x645, 0x644, 0x3b, 0x62b,
+0x648, 0x631, 0x3b, 0x62c, 0x648, 0x632, 0x627, 0x3b, 0x633, 0x631, 0x637, 0x627, 0x646, 0x3b, 0x627, 0x633, 0x62f, 0x3b, 0x633, 0x646,
+0x628, 0x644, 0x647, 0x654, 0x3b, 0x645, 0x6cc, 0x632, 0x627, 0x646, 0x3b, 0x639, 0x642, 0x631, 0x628, 0x3b, 0x642, 0x648, 0x633, 0x3b,
+0x62c, 0x62f, 0x6cc, 0x3b, 0x62f, 0x644, 0x648, 0x3b, 0x62d, 0x648, 0x62a, 0x62d, 0x3b, 0x62b, 0x3b, 0x62c, 0x3b, 0x633, 0x3b, 0x627,
+0x3b, 0x633, 0x3b, 0x645, 0x3b, 0x639, 0x3b, 0x642, 0x3b, 0x62c, 0x3b, 0x62f, 0x3b, 0x62d, 0x46, 0x61, 0x72, 0x77, 0x61, 0x72,
+0x64, 0x69, 0x6e, 0x3b, 0x4f, 0x72, 0x64, 0x69, 0x62, 0x65, 0x68, 0x65, 0x73, 0x7a, 0x74, 0x3b, 0x43, 0x68, 0x6f, 0x72,
+0x64, 0x101, 0x64, 0x3b, 0x54, 0x69, 0x72, 0x3b, 0x4d, 0x6f, 0x72, 0x64, 0x101, 0x64, 0x3b, 0x53, 0x7a, 0x61, 0x68, 0x72,
+0x69, 0x77, 0x61, 0x72, 0x3b, 0x4d, 0x65, 0x68, 0x72, 0x3b, 0x100, 0x62, 0x101, 0x6e, 0x3b, 0x100, 0x73, 0x61, 0x72, 0x3b,
+0x44, 0xe9, 0x69, 0x3b, 0x42, 0x61, 0x68, 0x6d, 0x61, 0x6e, 0x3b, 0x45, 0x73, 0x66, 0x61, 0x6e, 0x64, 0xa2b, 0xa3e, 0xa30,
+0xa35, 0xa30, 0xa21, 0xa40, 0xa28, 0x3b, 0xa14, 0xa30, 0xa21, 0xa3e, 0xa08, 0xa2c, 0xa39, 0xa48, 0xa38, 0xa3c, 0xa1f, 0x3b, 0xa16, 0xa4b,
+0xa21, 0xa30, 0xa21, 0x3b, 0xa1f, 0xa3f, 0xa30, 0x3b, 0xa2e, 0xa4b, 0xa30, 0xa21, 0xa3e, 0xa26, 0x3b, 0xa38, 0xa3c, 0xa30, 0xa3e, 0xa07,
+0xa35, 0xa30, 0x3b, 0xa2e, 0xa47, 0xa39, 0xa30, 0x3b, 0xa05, 0xa2c, 0xa3e, 0xa28, 0x3b, 0xa05, 0xa1c, 0xa3c, 0xa3e, 0xa30, 0x3b, 0xa21,
+0xa47, 0xa05, 0x3b, 0xa2c, 0xa3e, 0xa39, 0xa2e, 0xa28, 0x3b, 0xa10, 0xa38, 0xa2b, 0xa70, 0xa21, 0x46, 0x61, 0x72, 0x76, 0x61, 0x72,
+0x64, 0x69, 0x6e, 0x3b, 0x4f, 0x72, 0x64, 0x69, 0x62, 0x65, 0x68, 0x65, 0x73, 0x68, 0x74, 0x3b, 0x4b, 0x68, 0x6f, 0x72,
+0x64, 0x61, 0x64, 0x3b, 0x54, 0x69, 0x72, 0x3b, 0x41, 0x2d, 0x4d, 0x6f, 0x72, 0x64, 0x61, 0x64, 0x3b, 0x53, 0x68, 0x61,
+0x68, 0x72, 0x69, 0x76, 0x61, 0x72, 0x3b, 0x4d, 0x65, 0x68, 0x72, 0x3b, 0x41, 0x62, 0x61, 0x6e, 0x3b, 0x41, 0x7a, 0x61,
+0x72, 0x3b, 0x44, 0x65, 0x79, 0x3b, 0x42, 0x61, 0x68, 0x6d, 0x61, 0x6e, 0x3b, 0x45, 0x73, 0x66, 0x61, 0x6e, 0x64, 0x444,
+0x430, 0x440, 0x432, 0x430, 0x440, 0x434, 0x438, 0x43d, 0x3b, 0x43e, 0x440, 0x434, 0x438, 0x431, 0x435, 0x445, 0x435, 0x448, 0x442, 0x3b,
+0x445, 0x43e, 0x440, 0x434, 0x430, 0x434, 0x3b, 0x442, 0x438, 0x440, 0x3b, 0x43c, 0x43e, 0x440, 0x434, 0x430, 0x434, 0x3b, 0x448, 0x430,
+0x445, 0x440, 0x438, 0x432, 0x435, 0x440, 0x3b, 0x43c, 0x435, 0x445, 0x440, 0x3b, 0x430, 0x431, 0x430, 0x43d, 0x3b, 0x430, 0x437, 0x435,
+0x440, 0x3b, 0x434, 0x435, 0x439, 0x3b, 0x431, 0x430, 0x445, 0x43c, 0x430, 0x43d, 0x3b, 0x44d, 0x441, 0x444, 0x430, 0x43d, 0x434, 0x424,
+0x430, 0x440, 0x430, 0x432, 0x430, 0x434, 0x438, 0x43d, 0x3b, 0x41e, 0x440, 0x434, 0x438, 0x431, 0x435, 0x445, 0x435, 0x448, 0x442, 0x3b,
+0x41a, 0x43e, 0x440, 0x434, 0x430, 0x434, 0x3b, 0x422, 0x438, 0x440, 0x3b, 0x41c, 0x43e, 0x440, 0x434, 0x430, 0x434, 0x3b, 0x428, 0x430,
+0x445, 0x440, 0x438, 0x432, 0x430, 0x440, 0x3b, 0x41c, 0x435, 0x445, 0x440, 0x3b, 0x410, 0x431, 0x430, 0x43d, 0x3b, 0x410, 0x437, 0x430,
+0x440, 0x3b, 0x414, 0x435, 0x458, 0x3b, 0x411, 0x430, 0x445, 0x43c, 0x430, 0x43d, 0x3b, 0x415, 0x441, 0x444, 0x430, 0x43d, 0x434, 0x46,
+0x61, 0x72, 0x61, 0x76, 0x61, 0x64, 0x69, 0x6e, 0x3b, 0x4f, 0x72, 0x64, 0x69, 0x62, 0x65, 0x68, 0x65, 0x161, 0x74, 0x3b,
+0x4b, 0x6f, 0x72, 0x64, 0x61, 0x64, 0x3b, 0x54, 0x69, 0x72, 0x3b, 0x4d, 0x6f, 0x72, 0x64, 0x61, 0x64, 0x3b, 0x160, 0x61,
+0x68, 0x72, 0x69, 0x76, 0x61, 0x72, 0x3b, 0x4d, 0x65, 0x68, 0x72, 0x3b, 0x41, 0x62, 0x61, 0x6e, 0x3b, 0x41, 0x7a, 0x61,
+0x72, 0x3b, 0x44, 0x65, 0x6a, 0x3b, 0x42, 0x61, 0x68, 0x6d, 0x61, 0x6e, 0x3b, 0x45, 0x73, 0x66, 0x61, 0x6e, 0x64, 0x46,
+0x61, 0x72, 0x76, 0x61, 0x72, 0x64, 0x69, 0x6e, 0x3b, 0x4f, 0x72, 0x64, 0x69, 0x62, 0x65, 0x68, 0x65, 0x73, 0x68, 0x74,
+0x3b, 0x4b, 0x68, 0x6f, 0x72, 0x64, 0x101, 0x64, 0x3b, 0x54, 0x69, 0x72, 0x3b, 0x4d, 0x6f, 0x72, 0x64, 0x101, 0x64, 0x3b,
+0x53, 0x68, 0x61, 0x68, 0x72, 0x69, 0x76, 0x61, 0x72, 0x3b, 0x4d, 0x65, 0x68, 0x72, 0x3b, 0x100, 0x62, 0x101, 0x6e, 0x3b,
+0x100, 0x7a, 0x61, 0x72, 0x3b, 0x44, 0x65, 0x79, 0x3b, 0x42, 0x61, 0x68, 0x6d, 0x61, 0x6e, 0x3b, 0x45, 0x73, 0x66, 0x61,
+0x6e, 0x64, 0x66, 0x61, 0x72, 0x76, 0x61, 0x72, 0x64, 0x69, 0x6e, 0x3b, 0x6f, 0x72, 0x64, 0x69, 0x62, 0x65, 0x68, 0x65,
+0x73, 0x68, 0x74, 0x3b, 0x6b, 0x68, 0x6f, 0x72, 0x64, 0x101, 0x64, 0x3b, 0x74, 0x69, 0x72, 0x3b, 0x6d, 0x6f, 0x72, 0x64,
+0x101, 0x64, 0x3b, 0x73, 0x68, 0x61, 0x68, 0x72, 0x69, 0x76, 0x61, 0x72, 0x3b, 0x6d, 0x65, 0x68, 0x72, 0x3b, 0x101, 0x62,
+0x101, 0x6e, 0x3b, 0x101, 0x7a, 0x61, 0x72, 0x3b, 0x64, 0x65, 0x79, 0x3b, 0x62, 0x61, 0x68, 0x6d, 0x61, 0x6e, 0x3b, 0x65,
+0x73, 0x66, 0x61, 0x6e, 0x64, 0x444, 0x430, 0x440, 0x432, 0x430, 0x440, 0x434, 0x438, 0x43d, 0x3b, 0x443, 0x440, 0x434, 0x438, 0x431,
 0x438, 0x4b3, 0x438, 0x448, 0x442, 0x3b, 0x445, 0x443, 0x440, 0x434, 0x43e, 0x434, 0x3b, 0x442, 0x438, 0x440, 0x3b, 0x43c, 0x443, 0x440,
 0x434, 0x43e, 0x434, 0x3b, 0x448, 0x430, 0x4b3, 0x440, 0x438, 0x432, 0x430, 0x440, 0x3b, 0x43c, 0x435, 0x4b3, 0x440, 0x3b, 0x43e, 0x431,
 0x43e, 0x43d, 0x3b, 0x43e, 0x437, 0x430, 0x440, 0x3b, 0x434, 0x435, 0x439, 0x3b, 0x431, 0x430, 0x4b3, 0x43c, 0x430, 0x43d, 0x3b, 0x438,
-0x441, 0x444, 0x430, 0x43d, 0x434, 0x3b, 0xb83, 0xbaa, 0xbb0, 0xbcd, 0x2e, 0x3b, 0xb86, 0xbb0, 0xbcd, 0xb9f, 0xbbf, 0x2e, 0x3b, 0xb95,
-0xbca, 0xbb0, 0xbcd, 0x2e, 0x3b, 0xba4, 0xbbf, 0xbb0, 0xbcd, 0x3b, 0xbae, 0xbca, 0xbb0, 0xbcd, 0x2e, 0x3b, 0xbb7, 0xbbe, 0xbb0, 0xbbf,
-0x2e, 0x3b, 0xbae, 0xbc6, 0xbb9, 0xbcd, 0x2e, 0x3b, 0xb85, 0xbaa, 0xbbe, 0x2e, 0x3b, 0xb85, 0xb9a, 0xbbe, 0x2e, 0x3b, 0xba4, 0xbc7,
-0x3b, 0xbaa, 0xbb9, 0xbcd, 0x2e, 0x3b, 0xb8e, 0xb83, 0x2e, 0x3b, 0xb83, 0xbaa, 0xbb0, 0xbcd, 0xbb5, 0xbbe, 0xba4, 0xbbf, 0xba9, 0xbcd,
-0x3b, 0xb86, 0xbb0, 0xbcd, 0xb9f, 0xbbf, 0xbaa, 0xbc6, 0xbb9, 0xbc6, 0xbb7, 0xbcd, 0xba4, 0xbcd, 0x3b, 0xb95, 0xbca, 0xbb0, 0xbcd, 0xba4,
-0xbbe, 0xba4, 0xbcd, 0x3b, 0xba4, 0xbbf, 0xbb0, 0xbcd, 0x3b, 0xbae, 0xbca, 0xbb0, 0xbcd, 0xba4, 0xbbe, 0xba4, 0xbcd, 0x3b, 0xbb7, 0xbbe,
-0xbb0, 0xbbf, 0xbb5, 0xbbe, 0xbb0, 0xbcd, 0x3b, 0xbae, 0xbc6, 0xbb9, 0xbcd, 0xbb0, 0xbcd, 0x3b, 0xb85, 0xbaa, 0xbbe, 0xba9, 0xbcd, 0x3b,
-0xb85, 0xb9a, 0xbbe, 0xbb0, 0xbcd, 0x3b, 0xba4, 0xbc7, 0x3b, 0xbaa, 0xbb9, 0xbcd, 0xbae, 0xbbe, 0xba9, 0xbcd, 0x3b, 0xb8e, 0xb83, 0xbaa,
-0xbbe, 0xba9, 0xbcd, 0x3b, 0xc2b, 0xc3e, 0xc35, 0xc30, 0xc4d, 0xc21, 0xc3f, 0xc28, 0xc4d, 0x3b, 0xc0a, 0xc21, 0xc3e, 0xc2c, 0xc39, 0xc37,
-0xc4d, 0xc1f, 0xc4d, 0x3b, 0xc16, 0xc4b, 0xc30, 0xc4d, 0xc21, 0xc3e, 0xc21, 0xc4d, 0x3b, 0xc1f, 0xc3f, 0xc30, 0xc4d, 0x3b, 0xc2e, 0xc46,
-0xc30, 0xc4d, 0xc21, 0xc3e, 0xc21, 0xc4d, 0x3b, 0xc36, 0xc36, 0xc3f, 0xc35, 0xc30, 0xc4d, 0x3b, 0xc2e, 0xc46, 0xc39, 0xc30, 0xc4d, 0x3b,
-0xc05, 0xc2c, 0xc28, 0xc4d, 0x3b, 0xc05, 0xc1c, 0xc30, 0xc4d, 0x3b, 0xc21, 0xc47, 0x3b, 0xc2c, 0xc3e, 0xc39, 0xc4d, 0x200c, 0xc2e, 0xc3e,
-0xc28, 0xc4d, 0x3b, 0xc0e, 0xc38, 0xc4d, 0x200c, 0xc2b, 0xc3e, 0xc02, 0xc21, 0xc4d, 0x3b, 0xe1f, 0xe32, 0xe23, 0xe4c, 0xe27, 0xe32, 0xe23,
-0xe4c, 0xe14, 0xe34, 0xe19, 0x3b, 0xe2d, 0xe2d, 0xe23, 0xe4c, 0xe14, 0xe34, 0xe40, 0xe1a, 0xe40, 0xe2e, 0xe0a, 0xe15, 0xe4c, 0x3b, 0xe04,
-0xe2d, 0xe23, 0xe4c, 0xe41, 0xe14, 0xe14, 0x3b, 0xe40, 0xe15, 0xe2d, 0xe23, 0xe4c, 0x3b, 0xe21, 0xe2d, 0xe23, 0xe4c, 0xe41, 0xe14, 0xe14,
-0x3b, 0xe0a, 0xe32, 0xe2b, 0xe23, 0xe34, 0xe27, 0xe32, 0xe23, 0xe4c, 0x3b, 0xe40, 0xe21, 0xe2e, 0xe23, 0xe4c, 0x3b, 0xe2d, 0xe30, 0xe1a,
-0xe32, 0xe19, 0x3b, 0xe2d, 0xe30, 0xe0b, 0xe32, 0xe23, 0xe4c, 0x3b, 0xe40, 0xe14, 0xe22, 0xe4c, 0x3b, 0xe1a, 0xe32, 0xe2e, 0xe4c, 0xe21,
-0xe32, 0xe19, 0x3b, 0xe40, 0xe2d, 0xe2a, 0xe1f, 0xe32, 0xe19, 0xe14, 0xe4c, 0x3b, 0x46, 0x65, 0x72, 0x76, 0x65, 0x72, 0x64, 0x69,
-0x6e, 0x3b, 0x4f, 0x72, 0x64, 0x69, 0x62, 0x65, 0x68, 0x65, 0x15f, 0x74, 0x3b, 0x48, 0x6f, 0x72, 0x64, 0x61, 0x64, 0x3b,
-0x54, 0x69, 0x72, 0x3b, 0x4d, 0x6f, 0x72, 0x64, 0x61, 0x64, 0x3b, 0x15e, 0x65, 0x68, 0x72, 0x69, 0x76, 0x65, 0x72, 0x3b,
-0x4d, 0x65, 0x68, 0x72, 0x3b, 0x41, 0x62, 0x61, 0x6e, 0x3b, 0x41, 0x7a, 0x65, 0x72, 0x3b, 0x44, 0x65, 0x79, 0x3b, 0x42,
-0x65, 0x68, 0x6d, 0x65, 0x6e, 0x3b, 0x45, 0x73, 0x66, 0x65, 0x6e, 0x64, 0x3b, 0x444, 0x430, 0x440, 0x3b, 0x43e, 0x440, 0x434,
-0x3b, 0x445, 0x43e, 0x440, 0x3b, 0x442, 0x456, 0x440, 0x3b, 0x43c, 0x43e, 0x440, 0x3b, 0x448, 0x430, 0x445, 0x3b, 0x43c, 0x435, 0x445,
-0x3b, 0x430, 0x431, 0x430, 0x43d, 0x3b, 0x430, 0x437, 0x435, 0x440, 0x3b, 0x434, 0x435, 0x439, 0x3b, 0x431, 0x430, 0x445, 0x3b, 0x435,
-0x441, 0x444, 0x3b, 0x444, 0x430, 0x440, 0x432, 0x430, 0x440, 0x434, 0x456, 0x43d, 0x3b, 0x43e, 0x440, 0x434, 0x456, 0x431, 0x435, 0x445,
-0x435, 0x448, 0x442, 0x3b, 0x445, 0x43e, 0x440, 0x434, 0x430, 0x434, 0x3b, 0x442, 0x456, 0x440, 0x3b, 0x43c, 0x43e, 0x440, 0x434, 0x430,
-0x434, 0x3b, 0x448, 0x430, 0x445, 0x440, 0x456, 0x432, 0x435, 0x440, 0x3b, 0x43c, 0x435, 0x445, 0x440, 0x3b, 0x430, 0x431, 0x430, 0x43d,
-0x3b, 0x430, 0x437, 0x435, 0x440, 0x3b, 0x434, 0x435, 0x439, 0x3b, 0x431, 0x430, 0x445, 0x43c, 0x430, 0x43d, 0x3b, 0x435, 0x441, 0x444,
-0x430, 0x43d, 0x434, 0x3b, 0x444, 0x430, 0x440, 0x2e, 0x3b, 0x43e, 0x440, 0x434, 0x2e, 0x3b, 0x445, 0x43e, 0x440, 0x2e, 0x3b, 0x442,
-0x456, 0x440, 0x3b, 0x43c, 0x43e, 0x440, 0x2e, 0x3b, 0x448, 0x430, 0x445, 0x2e, 0x3b, 0x43c, 0x435, 0x445, 0x2e, 0x3b, 0x430, 0x431,
-0x430, 0x43d, 0x3b, 0x430, 0x437, 0x435, 0x440, 0x3b, 0x434, 0x435, 0x439, 0x3b, 0x431, 0x430, 0x445, 0x2e, 0x3b, 0x435, 0x441, 0x444,
-0x2e, 0x3b, 0x641, 0x631, 0x648, 0x631, 0x62f, 0x646, 0x3b, 0x622, 0x631, 0x688, 0x628, 0x627, 0x626, 0x634, 0x3b, 0x62e, 0x62f, 0x627,
-0x62f, 0x627, 0x62f, 0x3b, 0x62a, 0x6cc, 0x631, 0x3b, 0x645, 0x631, 0x62f, 0x627, 0x62f, 0x3b, 0x634, 0x6c1, 0x631, 0x6cc, 0x648, 0x627,
-0x631, 0x3b, 0x645, 0x6c1, 0x631, 0x3b, 0x627, 0x628, 0x627, 0x646, 0x3b, 0x622, 0x632, 0x631, 0x3b, 0x688, 0x6d2, 0x3b, 0x628, 0x6c1,
-0x645, 0x646, 0x3b, 0x627, 0x633, 0x641, 0x646, 0x62f, 0x3b, 0x64, 0x7a, 0x76, 0x3b, 0x64, 0x7a, 0x64, 0x3b, 0x74, 0x65, 0x64,
-0x3b, 0x61, 0x66, 0x254, 0x3b, 0x64, 0x61, 0x6d, 0x3b, 0x6d, 0x61, 0x73, 0x3b, 0x73, 0x69, 0x61, 0x3b, 0x64, 0x65, 0x61,
-0x3b, 0x61, 0x6e, 0x79, 0x3b, 0x6b, 0x65, 0x6c, 0x3b, 0x61, 0x64, 0x65, 0x3b, 0x64, 0x7a, 0x6d, 0x3b, 0x64, 0x7a, 0x6f,
-0x76, 0x65, 0x3b, 0x64, 0x7a, 0x6f, 0x64, 0x7a, 0x65, 0x3b, 0x74, 0x65, 0x64, 0x6f, 0x78, 0x65, 0x3b, 0x61, 0x66, 0x254,
-0x66, 0x69, 0x1ebd, 0x3b, 0x64, 0x61, 0x6d, 0x25b, 0x3b, 0x6d, 0x61, 0x73, 0x61, 0x3b, 0x73, 0x69, 0x61, 0x6d, 0x6c, 0x254,
-0x6d, 0x3b, 0x64, 0x65, 0x61, 0x73, 0x69, 0x61, 0x6d, 0x69, 0x6d, 0x65, 0x3b, 0x61, 0x6e, 0x79, 0x254, 0x6e, 0x79, 0x254,
-0x3b, 0x6b, 0x65, 0x6c, 0x65, 0x3b, 0x61, 0x64, 0x65, 0x25b, 0x6d, 0x65, 0x6b, 0x70, 0x254, 0x78, 0x65, 0x3b, 0x64, 0x7a,
-0x6f, 0x6d, 0x65, 0x3b, 0x62e, 0x627, 0x6a9, 0x6d5, 0x644, 0x6ce, 0x648, 0x6d5, 0x3b, 0x628, 0x627, 0x646, 0x6d5, 0x645, 0x6d5, 0x695,
-0x3b, 0x62c, 0x6c6, 0x632, 0x6d5, 0x631, 0x62f, 0x627, 0x646, 0x3b, 0x67e, 0x648, 0x648, 0x634, 0x67e, 0x6d5, 0x695, 0x3b, 0x6af, 0x6d5,
-0x644, 0x627, 0x648, 0x6ce, 0x698, 0x3b, 0x62e, 0x6d5, 0x631, 0x645, 0x627, 0x646, 0x627, 0x646, 0x3b, 0x695, 0x6d5, 0x632, 0x628, 0x6d5,
-0x631, 0x3b, 0x62e, 0x6d5, 0x632, 0x6d5, 0x6b5, 0x648, 0x6d5, 0x631, 0x3b, 0x633, 0x6d5, 0x631, 0x645, 0x627, 0x648, 0x6d5, 0x632, 0x3b,
-0x628, 0x6d5, 0x641, 0x631, 0x627, 0x646, 0x628, 0x627, 0x631, 0x3b, 0x695, 0x6ce, 0x628, 0x6d5, 0x646, 0x62f, 0x627, 0x646, 0x3b, 0x631,
-0x6d5, 0x634, 0x6d5, 0x645, 0x6ce, 0x3b
+0x441, 0x444, 0x430, 0x43d, 0x434, 0xb83, 0xbaa, 0xbb0, 0xbcd, 0xbb5, 0xbbe, 0xba4, 0xbbf, 0xba9, 0xbcd, 0x3b, 0xb86, 0xbb0, 0xbcd, 0xb9f,
+0xbbf, 0xbaa, 0xbc6, 0xbb9, 0xbc6, 0xbb7, 0xbcd, 0xba4, 0xbcd, 0x3b, 0xb95, 0xbca, 0xbb0, 0xbcd, 0xba4, 0xbbe, 0xba4, 0xbcd, 0x3b, 0xba4,
+0xbbf, 0xbb0, 0xbcd, 0x3b, 0xbae, 0xbca, 0xbb0, 0xbcd, 0xba4, 0xbbe, 0xba4, 0xbcd, 0x3b, 0xbb7, 0xbbe, 0xbb0, 0xbbf, 0xbb5, 0xbbe, 0xbb0,
+0xbcd, 0x3b, 0xbae, 0xbc6, 0xbb9, 0xbcd, 0xbb0, 0xbcd, 0x3b, 0xb85, 0xbaa, 0xbbe, 0xba9, 0xbcd, 0x3b, 0xb85, 0xb9a, 0xbbe, 0xbb0, 0xbcd,
+0x3b, 0xba4, 0xbc7, 0x3b, 0xbaa, 0xbb9, 0xbcd, 0xbae, 0xbbe, 0xba9, 0xbcd, 0x3b, 0xb8e, 0xb83, 0xbaa, 0xbbe, 0xba9, 0xbcd, 0xb83, 0xbaa,
+0xbb0, 0xbcd, 0x2e, 0x3b, 0xb86, 0xbb0, 0xbcd, 0xb9f, 0xbbf, 0x2e, 0x3b, 0xb95, 0xbca, 0xbb0, 0xbcd, 0x2e, 0x3b, 0xba4, 0xbbf, 0xbb0,
+0xbcd, 0x3b, 0xbae, 0xbca, 0xbb0, 0xbcd, 0x2e, 0x3b, 0xbb7, 0xbbe, 0xbb0, 0xbbf, 0x2e, 0x3b, 0xbae, 0xbc6, 0xbb9, 0xbcd, 0x2e, 0x3b,
+0xb85, 0xbaa, 0xbbe, 0x2e, 0x3b, 0xb85, 0xb9a, 0xbbe, 0x2e, 0x3b, 0xba4, 0xbc7, 0x3b, 0xbaa, 0xbb9, 0xbcd, 0x2e, 0x3b, 0xb8e, 0xb83,
+0x2e, 0xc2b, 0xc3e, 0xc35, 0xc30, 0xc4d, 0xc21, 0xc3f, 0xc28, 0xc4d, 0x3b, 0xc0a, 0xc21, 0xc3e, 0xc2c, 0xc39, 0xc37, 0xc4d, 0xc1f, 0xc4d,
+0x3b, 0xc16, 0xc4b, 0xc30, 0xc4d, 0xc21, 0xc3e, 0xc21, 0xc4d, 0x3b, 0xc1f, 0xc3f, 0xc30, 0xc4d, 0x3b, 0xc2e, 0xc46, 0xc30, 0xc4d, 0xc21,
+0xc3e, 0xc21, 0xc4d, 0x3b, 0xc36, 0xc36, 0xc3f, 0xc35, 0xc30, 0xc4d, 0x3b, 0xc2e, 0xc46, 0xc39, 0xc30, 0xc4d, 0x3b, 0xc05, 0xc2c, 0xc28,
+0xc4d, 0x3b, 0xc05, 0xc1c, 0xc30, 0xc4d, 0x3b, 0xc21, 0xc47, 0x3b, 0xc2c, 0xc3e, 0xc39, 0xc4d, 0x200c, 0xc2e, 0xc3e, 0xc28, 0xc4d, 0x3b,
+0xc0e, 0xc38, 0xc4d, 0x200c, 0xc2b, 0xc3e, 0xc02, 0xc21, 0xc4d, 0xe1f, 0xe32, 0xe23, 0xe4c, 0xe27, 0xe32, 0xe23, 0xe4c, 0xe14, 0xe34, 0xe19,
+0x3b, 0xe2d, 0xe2d, 0xe23, 0xe4c, 0xe14, 0xe34, 0xe40, 0xe1a, 0xe40, 0xe2e, 0xe0a, 0xe15, 0xe4c, 0x3b, 0xe04, 0xe2d, 0xe23, 0xe4c, 0xe41,
+0xe14, 0xe14, 0x3b, 0xe40, 0xe15, 0xe2d, 0xe23, 0xe4c, 0x3b, 0xe21, 0xe2d, 0xe23, 0xe4c, 0xe41, 0xe14, 0xe14, 0x3b, 0xe0a, 0xe32, 0xe2b,
+0xe23, 0xe34, 0xe27, 0xe32, 0xe23, 0xe4c, 0x3b, 0xe40, 0xe21, 0xe2e, 0xe23, 0xe4c, 0x3b, 0xe2d, 0xe30, 0xe1a, 0xe32, 0xe19, 0x3b, 0xe2d,
+0xe30, 0xe0b, 0xe32, 0xe23, 0xe4c, 0x3b, 0xe40, 0xe14, 0xe22, 0xe4c, 0x3b, 0xe1a, 0xe32, 0xe2e, 0xe4c, 0xe21, 0xe32, 0xe19, 0x3b, 0xe40,
+0xe2d, 0xe2a, 0xe1f, 0xe32, 0xe19, 0xe14, 0xe4c, 0x46, 0x65, 0x72, 0x76, 0x65, 0x72, 0x64, 0x69, 0x6e, 0x3b, 0x4f, 0x72, 0x64,
+0x69, 0x62, 0x65, 0x68, 0x65, 0x15f, 0x74, 0x3b, 0x48, 0x6f, 0x72, 0x64, 0x61, 0x64, 0x3b, 0x54, 0x69, 0x72, 0x3b, 0x4d,
+0x6f, 0x72, 0x64, 0x61, 0x64, 0x3b, 0x15e, 0x65, 0x68, 0x72, 0x69, 0x76, 0x65, 0x72, 0x3b, 0x4d, 0x65, 0x68, 0x72, 0x3b,
+0x41, 0x62, 0x61, 0x6e, 0x3b, 0x41, 0x7a, 0x65, 0x72, 0x3b, 0x44, 0x65, 0x79, 0x3b, 0x42, 0x65, 0x68, 0x6d, 0x65, 0x6e,
+0x3b, 0x45, 0x73, 0x66, 0x65, 0x6e, 0x64, 0x444, 0x430, 0x440, 0x432, 0x430, 0x440, 0x434, 0x456, 0x43d, 0x3b, 0x43e, 0x440, 0x434,
+0x456, 0x431, 0x435, 0x445, 0x435, 0x448, 0x442, 0x3b, 0x445, 0x43e, 0x440, 0x434, 0x430, 0x434, 0x3b, 0x442, 0x456, 0x440, 0x3b, 0x43c,
+0x43e, 0x440, 0x434, 0x430, 0x434, 0x3b, 0x448, 0x430, 0x445, 0x440, 0x456, 0x432, 0x435, 0x440, 0x3b, 0x43c, 0x435, 0x445, 0x440, 0x3b,
+0x430, 0x431, 0x430, 0x43d, 0x3b, 0x430, 0x437, 0x435, 0x440, 0x3b, 0x434, 0x435, 0x439, 0x3b, 0x431, 0x430, 0x445, 0x43c, 0x430, 0x43d,
+0x3b, 0x435, 0x441, 0x444, 0x430, 0x43d, 0x434, 0x444, 0x430, 0x440, 0x3b, 0x43e, 0x440, 0x434, 0x3b, 0x445, 0x43e, 0x440, 0x3b, 0x442,
+0x456, 0x440, 0x3b, 0x43c, 0x43e, 0x440, 0x3b, 0x448, 0x430, 0x445, 0x3b, 0x43c, 0x435, 0x445, 0x3b, 0x430, 0x431, 0x430, 0x43d, 0x3b,
+0x430, 0x437, 0x435, 0x440, 0x3b, 0x434, 0x435, 0x439, 0x3b, 0x431, 0x430, 0x445, 0x3b, 0x435, 0x441, 0x444, 0x444, 0x430, 0x440, 0x2e,
+0x3b, 0x43e, 0x440, 0x434, 0x2e, 0x3b, 0x445, 0x43e, 0x440, 0x2e, 0x3b, 0x442, 0x456, 0x440, 0x3b, 0x43c, 0x43e, 0x440, 0x2e, 0x3b,
+0x448, 0x430, 0x445, 0x2e, 0x3b, 0x43c, 0x435, 0x445, 0x2e, 0x3b, 0x430, 0x431, 0x430, 0x43d, 0x3b, 0x430, 0x437, 0x435, 0x440, 0x3b,
+0x434, 0x435, 0x439, 0x3b, 0x431, 0x430, 0x445, 0x2e, 0x3b, 0x435, 0x441, 0x444, 0x2e, 0x641, 0x631, 0x648, 0x631, 0x62f, 0x646, 0x3b,
+0x622, 0x631, 0x688, 0x628, 0x627, 0x626, 0x634, 0x3b, 0x62e, 0x62f, 0x627, 0x62f, 0x627, 0x62f, 0x3b, 0x62a, 0x6cc, 0x631, 0x3b, 0x645,
+0x631, 0x62f, 0x627, 0x62f, 0x3b, 0x634, 0x6c1, 0x631, 0x6cc, 0x648, 0x627, 0x631, 0x3b, 0x645, 0x6c1, 0x631, 0x3b, 0x627, 0x628, 0x627,
+0x646, 0x3b, 0x622, 0x632, 0x631, 0x3b, 0x688, 0x6d2, 0x3b, 0x628, 0x6c1, 0x645, 0x646, 0x3b, 0x627, 0x633, 0x641, 0x646, 0x62f, 0x64,
+0x7a, 0x6f, 0x76, 0x65, 0x3b, 0x64, 0x7a, 0x6f, 0x64, 0x7a, 0x65, 0x3b, 0x74, 0x65, 0x64, 0x6f, 0x78, 0x65, 0x3b, 0x61,
+0x66, 0x254, 0x66, 0x69, 0x1ebd, 0x3b, 0x64, 0x61, 0x6d, 0x25b, 0x3b, 0x6d, 0x61, 0x73, 0x61, 0x3b, 0x73, 0x69, 0x61, 0x6d,
+0x6c, 0x254, 0x6d, 0x3b, 0x64, 0x65, 0x61, 0x73, 0x69, 0x61, 0x6d, 0x69, 0x6d, 0x65, 0x3b, 0x61, 0x6e, 0x79, 0x254, 0x6e,
+0x79, 0x254, 0x3b, 0x6b, 0x65, 0x6c, 0x65, 0x3b, 0x61, 0x64, 0x65, 0x25b, 0x6d, 0x65, 0x6b, 0x70, 0x254, 0x78, 0x65, 0x3b,
+0x64, 0x7a, 0x6f, 0x6d, 0x65, 0x64, 0x7a, 0x76, 0x3b, 0x64, 0x7a, 0x64, 0x3b, 0x74, 0x65, 0x64, 0x3b, 0x61, 0x66, 0x254,
+0x3b, 0x64, 0x61, 0x6d, 0x3b, 0x6d, 0x61, 0x73, 0x3b, 0x73, 0x69, 0x61, 0x3b, 0x64, 0x65, 0x61, 0x3b, 0x61, 0x6e, 0x79,
+0x3b, 0x6b, 0x65, 0x6c, 0x3b, 0x61, 0x64, 0x65, 0x3b, 0x64, 0x7a, 0x6d, 0x62e, 0x627, 0x6a9, 0x6d5, 0x644, 0x6ce, 0x648, 0x6d5,
+0x3b, 0x628, 0x627, 0x646, 0x6d5, 0x645, 0x6d5, 0x695, 0x3b, 0x62c, 0x6c6, 0x632, 0x6d5, 0x631, 0x62f, 0x627, 0x646, 0x3b, 0x67e, 0x648,
+0x648, 0x634, 0x67e, 0x6d5, 0x695, 0x3b, 0x6af, 0x6d5, 0x644, 0x627, 0x648, 0x6ce, 0x698, 0x3b, 0x62e, 0x6d5, 0x631, 0x645, 0x627, 0x646,
+0x627, 0x646, 0x3b, 0x695, 0x6d5, 0x632, 0x628, 0x6d5, 0x631, 0x3b, 0x62e, 0x6d5, 0x632, 0x6d5, 0x6b5, 0x648, 0x6d5, 0x631, 0x3b, 0x633,
+0x6d5, 0x631, 0x645, 0x627, 0x648, 0x6d5, 0x632, 0x3b, 0x628, 0x6d5, 0x641, 0x631, 0x627, 0x646, 0x628, 0x627, 0x631, 0x3b, 0x695, 0x6ce,
+0x628, 0x6d5, 0x646, 0x62f, 0x627, 0x646, 0x3b, 0x631, 0x6d5, 0x634, 0x6d5, 0x645, 0x6ce
 };
 // GENERATED PART ENDS HERE
 
diff --git a/src/corelib/time/qjalalicalendar_p.h b/src/corelib/time/qjalalicalendar_p.h
index 5b94dada9f..77b87a36b3 100644
--- a/src/corelib/time/qjalalicalendar_p.h
+++ b/src/corelib/time/qjalalicalendar_p.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2018 The Qt Company Ltd.
+** Copyright (C) 2020 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtCore module of the Qt Toolkit.
@@ -78,7 +78,7 @@ public:
 protected:
     // locale support:
     const QCalendarLocale *localeMonthIndexData() const override;
-    const ushort *localeMonthData() const override;
+    const char16_t *localeMonthData() const override;
 };
 
 QT_END_NAMESPACE
diff --git a/src/corelib/time/qromancalendar.cpp b/src/corelib/time/qromancalendar.cpp
index c3cd134490..98b53eb9cf 100644
--- a/src/corelib/time/qromancalendar.cpp
+++ b/src/corelib/time/qromancalendar.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2019 The Qt Company Ltd.
+** Copyright (C) 2020 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtCore module of the Qt Toolkit.
@@ -97,7 +97,7 @@ const QCalendarLocale *QRomanCalendar::localeMonthIndexData() const
     return locale_data;
 }
 
-const ushort *QRomanCalendar::localeMonthData() const
+const char16_t *QRomanCalendar::localeMonthData() const
 {
     return months_data;
 }
diff --git a/src/corelib/time/qromancalendar_data_p.h b/src/corelib/time/qromancalendar_data_p.h
index 37ac0be07d..94b8fe0d18 100644
--- a/src/corelib/time/qromancalendar_data_p.h
+++ b/src/corelib/time/qromancalendar_data_p.h
@@ -59,7 +59,7 @@ QT_BEGIN_NAMESPACE
 // GENERATED PART STARTS HERE
 
 /*
-    This part of the file was generated on 2019-10-24 from the
+    This part of the file was generated on 2020-01-30 from the
     Common Locale Data Repository v36
 
     http://www.unicode.org/cldr/
@@ -70,2024 +70,2001 @@ QT_BEGIN_NAMESPACE
 */
 
 static const QCalendarLocale locale_data[] = {
-   //  lang   script terr   sShort  sLong   sNarrow short   long    narrow
-      {     1,     0,     0,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 158,29 }}, // C/AnyScript/AnyCountry
-       {     3,     7,    69,{ 187,48 },{ 235,111 },{ 134,24 },{ 187,48 },{ 235,111 },{ 134,24 }}, // Oromo/Latin/Ethiopia
-       {     3,     7,   111,{ 187,48 },{ 235,111 },{ 346,24 },{ 187,48 },{ 235,111 },{ 134,24 }}, // Oromo/Latin/Kenya
-       {     4,     7,    69,{ 370,48 },{ 370,48 },{ 418,27 },{ 370,48 },{ 370,48 },{ 418,27 }}, // Afar/Latin/Ethiopia
-       {     5,     7,   195,{ 445,59 },{ 504,92 },{ 134,24 },{ 445,59 },{ 504,92 },{ 134,24 }}, // Afrikaans/Latin/South Africa
-       {     5,     7,   148,{ 445,59 },{ 504,92 },{ 134,24 },{ 445,59 },{ 504,92 },{ 134,24 }}, // Afrikaans/Latin/Namibia
-       {     6,     7,     2,{ 596,50 },{ 646,78 },{ 724,27 },{ 596,50 },{ 646,78 },{ 724,27 }}, // Albanian/Latin/Albania
-       {     6,     7,   127,{ 596,50 },{ 646,78 },{ 724,27 },{ 596,50 },{ 646,78 },{ 724,27 }}, // Albanian/Latin/Macedonia
-       {     6,     7,   257,{ 596,50 },{ 646,78 },{ 724,27 },{ 596,50 },{ 646,78 },{ 724,27 }}, // Albanian/Latin/Kosovo
-       {     7,    14,    69,{ 751,46 },{ 797,61 },{ 858,24 },{ 751,46 },{ 797,61 },{ 858,24 }}, // Amharic/Ethiopic/Ethiopia
-       {     8,     1,    64,{ 882,75 },{ 882,75 },{ 957,24 },{ 882,75 },{ 882,75 },{ 957,24 }}, // Arabic/Arabic/Egypt
-       {     8,     1,     3,{ 981,71 },{ 981,71 },{ 1052,24 },{ 981,71 },{ 981,71 },{ 1052,24 }}, // Arabic/Arabic/Algeria
-       {     8,     1,    17,{ 882,75 },{ 882,75 },{ 957,24 },{ 882,75 },{ 882,75 },{ 957,24 }}, // Arabic/Arabic/Bahrain
-       {     8,     1,    42,{ 882,75 },{ 882,75 },{ 957,24 },{ 882,75 },{ 882,75 },{ 957,24 }}, // Arabic/Arabic/Chad
-       {     8,     1,    48,{ 882,75 },{ 882,75 },{ 957,24 },{ 882,75 },{ 882,75 },{ 957,24 }}, // Arabic/Arabic/Comoros
-       {     8,     1,    59,{ 882,75 },{ 882,75 },{ 957,24 },{ 882,75 },{ 882,75 },{ 957,24 }}, // Arabic/Arabic/Djibouti
-       {     8,     1,    67,{ 882,75 },{ 882,75 },{ 957,24 },{ 882,75 },{ 882,75 },{ 957,24 }}, // Arabic/Arabic/Eritrea
-       {     8,     1,   103,{ 1076,92 },{ 1076,92 },{ 1168,24 },{ 1192,92 },{ 1076,92 },{ 1168,24 }}, // Arabic/Arabic/Iraq
-       {     8,     1,   105,{ 882,75 },{ 882,75 },{ 957,24 },{ 882,75 },{ 882,75 },{ 957,24 }}, // Arabic/Arabic/Israel
-       {     8,     1,   109,{ 1076,92 },{ 1076,92 },{ 1168,24 },{ 1076,92 },{ 1076,92 },{ 1168,24 }}, // Arabic/Arabic/Jordan
-       {     8,     1,   115,{ 882,75 },{ 882,75 },{ 957,24 },{ 882,75 },{ 882,75 },{ 957,24 }}, // Arabic/Arabic/Kuwait
-       {     8,     1,   119,{ 1076,92 },{ 1076,92 },{ 1168,24 },{ 1076,92 },{ 1076,92 },{ 1168,24 }}, // Arabic/Arabic/Lebanon
-       {     8,     1,   122,{ 882,75 },{ 882,75 },{ 957,24 },{ 882,75 },{ 882,75 },{ 957,24 }}, // Arabic/Arabic/Libya
-       {     8,     1,   136,{ 1284,72 },{ 1284,72 },{ 1356,24 },{ 1284,72 },{ 1284,72 },{ 1356,24 }}, // Arabic/Arabic/Mauritania
-       {     8,     1,   145,{ 1380,70 },{ 1380,70 },{ 1450,24 },{ 1380,70 },{ 1380,70 },{ 1450,24 }}, // Arabic/Arabic/Morocco
-       {     8,     1,   162,{ 882,75 },{ 882,75 },{ 957,24 },{ 882,75 },{ 882,75 },{ 957,24 }}, // Arabic/Arabic/Oman
-       {     8,     1,   165,{ 1076,92 },{ 1076,92 },{ 1168,24 },{ 1076,92 },{ 1076,92 },{ 1168,24 }}, // Arabic/Arabic/Palestinian Territories
-       {     8,     1,   175,{ 882,75 },{ 882,75 },{ 957,24 },{ 882,75 },{ 882,75 },{ 957,24 }}, // Arabic/Arabic/Qatar
-       {     8,     1,   186,{ 882,75 },{ 882,75 },{ 957,24 },{ 882,75 },{ 882,75 },{ 957,24 }}, // Arabic/Arabic/Saudi Arabia
-       {     8,     1,   194,{ 882,75 },{ 882,75 },{ 957,24 },{ 882,75 },{ 882,75 },{ 957,24 }}, // Arabic/Arabic/Somalia
-       {     8,     1,   201,{ 882,75 },{ 882,75 },{ 957,24 },{ 882,75 },{ 882,75 },{ 957,24 }}, // Arabic/Arabic/Sudan
-       {     8,     1,   207,{ 1076,92 },{ 1076,92 },{ 1168,24 },{ 1076,92 },{ 1076,92 },{ 1168,24 }}, // Arabic/Arabic/Syria
-       {     8,     1,   216,{ 981,71 },{ 981,71 },{ 1052,24 },{ 981,71 },{ 981,71 },{ 1052,24 }}, // Arabic/Arabic/Tunisia
-       {     8,     1,   223,{ 882,75 },{ 882,75 },{ 957,24 },{ 882,75 },{ 882,75 },{ 957,24 }}, // Arabic/Arabic/United Arab Emirates
-       {     8,     1,   236,{ 882,75 },{ 882,75 },{ 957,24 },{ 882,75 },{ 882,75 },{ 957,24 }}, // Arabic/Arabic/Western Sahara
-       {     8,     1,   237,{ 882,75 },{ 882,75 },{ 957,24 },{ 882,75 },{ 882,75 },{ 957,24 }}, // Arabic/Arabic/Yemen
-       {     8,     1,   254,{ 882,75 },{ 882,75 },{ 957,24 },{ 882,75 },{ 882,75 },{ 957,24 }}, // Arabic/Arabic/South Sudan
-       {     8,     1,   260,{ 882,75 },{ 882,75 },{ 957,24 },{ 882,75 },{ 882,75 },{ 957,24 }}, // Arabic/Arabic/World
-       {     9,    10,    11,{ 1474,48 },{ 1522,94 },{ 1616,24 },{ 1474,48 },{ 1640,106 },{ 1616,24 }}, // Armenian/Armenian/Armenia
-       {    10,    11,   100,{ 1746,64 },{ 1810,89 },{ 1899,24 },{ 1746,64 },{ 1810,89 },{ 1899,24 }}, // Assamese/Bengali/India
-       {    12,     7,    15,{ 1923,48 },{ 1971,77 },{ 418,27 },{ 1923,48 },{ 2048,77 },{ 418,27 }}, // Azerbaijani/Latin/Azerbaijan
-       {    12,     1,   102,{ 370,48 },{ 370,48 },{ 418,27 },{ 370,48 },{ 370,48 },{ 418,27 }}, // Azerbaijani/Arabic/Iran
-       {    12,     2,    15,{ 2125,48 },{ 2173,77 },{ 418,27 },{ 2125,48 },{ 2250,77 },{ 418,27 }}, // Azerbaijani/Cyrillic/Azerbaijan
-       {    13,     2,   178,{ 370,48 },{ 370,48 },{ 418,27 },{ 370,48 },{ 370,48 },{ 418,27 }}, // Bashkir/Cyrillic/Russia
-       {    14,     7,   197,{ 2327,60 },{ 2387,93 },{ 2480,24 },{ 2327,60 },{ 2387,93 },{ 2480,24 }}, // Basque/Latin/Spain
-       {    15,    11,    18,{ 2504,90 },{ 2504,90 },{ 2594,33 },{ 2627,77 },{ 2504,90 },{ 2594,33 }}, // Bengali/Bengali/Bangladesh
-       {    15,    11,   100,{ 2504,90 },{ 2504,90 },{ 2594,33 },{ 2627,77 },{ 2504,90 },{ 2594,33 }}, // Bengali/Bengali/India
-       {    16,    31,    25,{ 2704,63 },{ 2767,191 },{ 2958,27 },{ 2985,27 },{ 3012,132 },{ 3144,27 }}, // Dzongkha/Tibetan/Bhutan
-       {    19,     7,    74,{ 3171,63 },{ 3234,78 },{ 3312,36 },{ 3171,63 },{ 3234,78 },{ 3312,36 }}, // Breton/Latin/France
-       {    20,     2,    33,{ 3348,49 },{ 3397,82 },{ 3479,24 },{ 3348,49 },{ 3397,82 },{ 3479,24 }}, // Bulgarian/Cyrillic/Bulgaria
-       {    21,    25,   147,{ 3503,43 },{ 3546,88 },{ 3634,24 },{ 3503,43 },{ 3546,88 },{ 3634,24 }}, // Burmese/Myanmar/Myanmar
-       {    22,     2,    20,{ 3658,48 },{ 3706,95 },{ 3801,24 },{ 3825,48 },{ 3873,98 },{ 3801,24 }}, // Belarusian/Cyrillic/Belarus
-       {    23,    20,    36,{ 3971,71 },{ 3971,71 },{ 4042,24 },{ 3971,71 },{ 3971,71 },{ 4042,24 }}, // Khmer/Khmer/Cambodia
-       {    24,     7,   197,{ 4066,60 },{ 4126,82 },{ 4208,36 },{ 4244,93 },{ 4337,115 },{ 4208,36 }}, // Catalan/Latin/Spain
-       {    24,     7,     5,{ 4066,60 },{ 4126,82 },{ 4208,36 },{ 4244,93 },{ 4337,115 },{ 4208,36 }}, // Catalan/Latin/Andorra
-       {    24,     7,    74,{ 4066,60 },{ 4126,82 },{ 4208,36 },{ 4244,93 },{ 4337,115 },{ 4208,36 }}, // Catalan/Latin/France
-       {    24,     7,   106,{ 4066,60 },{ 4126,82 },{ 4208,36 },{ 4244,93 },{ 4337,115 },{ 4208,36 }}, // Catalan/Latin/Italy
-       {    25,     5,    44,{ 4452,39 },{ 4491,38 },{ 418,27 },{ 4452,39 },{ 4491,38 },{ 418,27 }}, // Chinese/Simplified Han/China
-       {    25,     5,    97,{ 4452,39 },{ 4491,38 },{ 418,27 },{ 4452,39 },{ 4491,38 },{ 418,27 }}, // Chinese/Simplified Han/Hong Kong
-       {    25,     5,   126,{ 4452,39 },{ 4491,38 },{ 418,27 },{ 4452,39 },{ 4491,38 },{ 418,27 }}, // Chinese/Simplified Han/Macau
-       {    25,     5,   190,{ 4452,39 },{ 4491,38 },{ 418,27 },{ 4452,39 },{ 4491,38 },{ 418,27 }}, // Chinese/Simplified Han/Singapore
-       {    25,     6,    97,{ 4452,39 },{ 4452,39 },{ 418,27 },{ 4452,39 },{ 4452,39 },{ 418,27 }}, // Chinese/Traditional Han/Hong Kong
-       {    25,     6,   126,{ 4452,39 },{ 4452,39 },{ 418,27 },{ 4452,39 },{ 4452,39 },{ 418,27 }}, // Chinese/Traditional Han/Macau
-       {    25,     6,   208,{ 4452,39 },{ 4452,39 },{ 418,27 },{ 4452,39 },{ 4452,39 },{ 418,27 }}, // Chinese/Traditional Han/Taiwan
-       {    26,     7,    74,{ 370,48 },{ 370,48 },{ 418,27 },{ 370,48 },{ 370,48 },{ 418,27 }}, // Corsican/Latin/France
-       {    27,     7,    54,{ 4529,49 },{ 4578,94 },{ 4672,39 },{ 4529,49 },{ 4711,98 },{ 4672,39 }}, // Croatian/Latin/Croatia
-       {    27,     7,    27,{ 4529,49 },{ 4578,94 },{ 4672,39 },{ 4529,49 },{ 4711,98 },{ 4672,39 }}, // Croatian/Latin/Bosnia And Herzegowina
-       {    28,     7,    57,{ 4809,48 },{ 4857,82 },{ 418,27 },{ 4809,48 },{ 4939,84 },{ 418,27 }}, // Czech/Latin/Czech Republic
-       {    29,     7,    58,{ 5023,59 },{ 5082,84 },{ 134,24 },{ 5023,59 },{ 5082,84 },{ 134,24 }}, // Danish/Latin/Denmark
-       {    29,     7,    86,{ 5023,59 },{ 5082,84 },{ 134,24 },{ 5023,59 },{ 5082,84 },{ 134,24 }}, // Danish/Latin/Greenland
-       {    30,     7,   151,{ 5166,59 },{ 5225,88 },{ 134,24 },{ 5166,59 },{ 5225,88 },{ 134,24 }}, // Dutch/Latin/Netherlands
-       {    30,     7,    12,{ 5166,59 },{ 5225,88 },{ 134,24 },{ 5166,59 },{ 5225,88 },{ 134,24 }}, // Dutch/Latin/Aruba
-       {    30,     7,    21,{ 5166,59 },{ 5225,88 },{ 134,24 },{ 5166,59 },{ 5225,88 },{ 134,24 }}, // Dutch/Latin/Belgium
-       {    30,     7,   152,{ 5166,59 },{ 5225,88 },{ 134,24 },{ 5166,59 },{ 5225,88 },{ 134,24 }}, // Dutch/Latin/Cura Sao
-       {    30,     7,   202,{ 5166,59 },{ 5225,88 },{ 134,24 },{ 5166,59 },{ 5225,88 },{ 134,24 }}, // Dutch/Latin/Suriname
-       {    30,     7,   255,{ 5166,59 },{ 5225,88 },{ 134,24 },{ 5166,59 },{ 5225,88 },{ 134,24 }}, // Dutch/Latin/Bonaire
-       {    30,     7,   256,{ 5166,59 },{ 5225,88 },{ 134,24 },{ 5166,59 },{ 5225,88 },{ 134,24 }}, // Dutch/Latin/Sint Maarten
-       {    31,     7,   225,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/United States
-       {    31,     3,   225,{ 370,48 },{ 370,48 },{ 418,27 },{ 370,48 },{ 370,48 },{ 418,27 }}, // English/Deseret/United States
-       {    31,     7,     4,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/American Samoa
-       {    31,     7,     7,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Anguilla
-       {    31,     7,     9,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Antigua And Barbuda
-       {    31,     7,    13,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Australia
-       {    31,     7,    14,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Austria
-       {    31,     7,    16,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Bahamas
-       {    31,     7,    19,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Barbados
-       {    31,     7,    21,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Belgium
-       {    31,     7,    22,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Belize
-       {    31,     7,    24,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Bermuda
-       {    31,     7,    28,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Botswana
-       {    31,     7,    31,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/British Indian Ocean Territory
-       {    31,     7,    35,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Burundi
-       {    31,     7,    37,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Cameroon
-       {    31,     7,    38,{ 5313,59 },{ 48,86 },{ 134,24 },{ 5313,59 },{ 48,86 },{ 134,24 }}, // English/Latin/Canada
-       {    31,     7,    40,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Cayman Islands
-       {    31,     7,    45,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Christmas Island
-       {    31,     7,    46,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Cocos Islands
-       {    31,     7,    51,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Cook Islands
-       {    31,     7,    56,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Cyprus
-       {    31,     7,    58,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Denmark
-       {    31,     7,    60,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Dominica
-       {    31,     7,    67,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Eritrea
-       {    31,     7,    70,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Falkland Islands
-       {    31,     7,    72,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Fiji
-       {    31,     7,    73,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Finland
-       {    31,     7,    75,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Guernsey
-       {    31,     7,    80,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Gambia
-       {    31,     7,    82,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Germany
-       {    31,     7,    83,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Ghana
-       {    31,     7,    84,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Gibraltar
-       {    31,     7,    87,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Grenada
-       {    31,     7,    89,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Guam
-       {    31,     7,    93,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Guyana
-       {    31,     7,    97,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Hong Kong
-       {    31,     7,   100,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/India
-       {    31,     7,   104,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Ireland
-       {    31,     7,   105,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Israel
-       {    31,     7,   107,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Jamaica
-       {    31,     7,   111,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Kenya
-       {    31,     7,   112,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Kiribati
-       {    31,     7,   120,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Lesotho
-       {    31,     7,   121,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Liberia
-       {    31,     7,   126,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Macau
-       {    31,     7,   128,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Madagascar
-       {    31,     7,   129,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Malawi
-       {    31,     7,   130,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Malaysia
-       {    31,     7,   133,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Malta
-       {    31,     7,   134,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Marshall Islands
-       {    31,     7,   137,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Mauritius
-       {    31,     7,   140,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Micronesia
-       {    31,     7,   144,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Montserrat
-       {    31,     7,   148,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Namibia
-       {    31,     7,   149,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Nauru
-       {    31,     7,   151,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Netherlands
-       {    31,     7,   154,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/New Zealand
-       {    31,     7,   157,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Nigeria
-       {    31,     7,   158,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Niue
-       {    31,     7,   159,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Norfolk Island
-       {    31,     7,   160,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Northern Mariana Islands
-       {    31,     7,   163,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Pakistan
-       {    31,     7,   164,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Palau
-       {    31,     7,   167,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Papua New Guinea
-       {    31,     7,   170,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Philippines
-       {    31,     7,   171,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Pitcairn
-       {    31,     7,   174,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Puerto Rico
-       {    31,     7,   179,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Rwanda
-       {    31,     7,   180,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Saint Kitts And Nevis
-       {    31,     7,   181,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Saint Lucia
-       {    31,     7,   182,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Saint Vincent And The Grenadines
-       {    31,     7,   183,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Samoa
-       {    31,     7,   188,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Seychelles
-       {    31,     7,   189,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Sierra Leone
-       {    31,     7,   190,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Singapore
-       {    31,     7,   192,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Slovenia
-       {    31,     7,   193,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Solomon Islands
-       {    31,     7,   195,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/South Africa
-       {    31,     7,   199,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Saint Helena
-       {    31,     7,   201,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Sudan
-       {    31,     7,   204,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Swaziland
-       {    31,     7,   205,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Sweden
-       {    31,     7,   206,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Switzerland
-       {    31,     7,   210,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Tanzania
-       {    31,     7,   213,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Tokelau
-       {    31,     7,   214,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Tonga
-       {    31,     7,   215,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Trinidad And Tobago
-       {    31,     7,   219,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Turks And Caicos Islands
-       {    31,     7,   220,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Tuvalu
-       {    31,     7,   221,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Uganda
-       {    31,     7,   223,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/United Arab Emirates
-       {    31,     7,   224,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/United Kingdom
-       {    31,     7,   226,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/United States Minor Outlying Islands
-       {    31,     7,   229,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Vanuatu
-       {    31,     7,   233,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/British Virgin Islands
-       {    31,     7,   234,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/United States Virgin Islands
-       {    31,     7,   239,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Zambia
-       {    31,     7,   240,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Zimbabwe
-       {    31,     7,   249,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Diego Garcia
-       {    31,     7,   251,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Isle Of Man
-       {    31,     7,   252,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Jersey
-       {    31,     7,   254,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/South Sudan
-       {    31,     7,   256,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Sint Maarten
-       {    31,     7,   260,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/World
-       {    31,     7,   261,{ 0,48 },{ 48,86 },{ 134,24 },{ 0,48 },{ 48,86 },{ 134,24 }}, // English/Latin/Europe
-       {    32,     7,   260,{ 5372,48 },{ 5420,91 },{ 134,24 },{ 5372,48 },{ 5420,91 },{ 134,24 }}, // Esperanto/Latin/World
-       {    33,     7,    68,{ 5511,59 },{ 5570,91 },{ 5661,24 },{ 5511,59 },{ 5570,91 },{ 5661,24 }}, // Estonian/Latin/Estonia
-       {    34,     7,    71,{ 5685,48 },{ 5733,83 },{ 134,24 },{ 5816,59 },{ 5733,83 },{ 134,24 }}, // Faroese/Latin/Faroe Islands
-       {    34,     7,    58,{ 5685,48 },{ 5733,83 },{ 134,24 },{ 5816,59 },{ 5733,83 },{ 134,24 }}, // Faroese/Latin/Denmark
-       {    36,     7,    73,{ 5875,69 },{ 5944,105 },{ 6049,24 },{ 6073,93 },{ 6166,129 },{ 6049,24 }}, // Finnish/Latin/Finland
-       {    37,     7,    74,{ 6295,63 },{ 6358,85 },{ 134,24 },{ 6295,63 },{ 6358,85 },{ 134,24 }}, // French/Latin/France
-       {    37,     7,     3,{ 6295,63 },{ 6358,85 },{ 134,24 },{ 6295,63 },{ 6358,85 },{ 134,24 }}, // French/Latin/Algeria
-       {    37,     7,    21,{ 6295,63 },{ 6358,85 },{ 134,24 },{ 6295,63 },{ 6358,85 },{ 134,24 }}, // French/Latin/Belgium
-       {    37,     7,    23,{ 6295,63 },{ 6358,85 },{ 134,24 },{ 6295,63 },{ 6358,85 },{ 134,24 }}, // French/Latin/Benin
-       {    37,     7,    34,{ 6295,63 },{ 6358,85 },{ 134,24 },{ 6295,63 },{ 6358,85 },{ 134,24 }}, // French/Latin/Burkina Faso
-       {    37,     7,    35,{ 6295,63 },{ 6358,85 },{ 134,24 },{ 6295,63 },{ 6358,85 },{ 134,24 }}, // French/Latin/Burundi
-       {    37,     7,    37,{ 6295,63 },{ 6358,85 },{ 134,24 },{ 6295,63 },{ 6358,85 },{ 134,24 }}, // French/Latin/Cameroon
-       {    37,     7,    38,{ 6443,64 },{ 6358,85 },{ 134,24 },{ 6443,64 },{ 6358,85 },{ 134,24 }}, // French/Latin/Canada
-       {    37,     7,    41,{ 6295,63 },{ 6358,85 },{ 134,24 },{ 6295,63 },{ 6358,85 },{ 134,24 }}, // French/Latin/Central African Republic
-       {    37,     7,    42,{ 6295,63 },{ 6358,85 },{ 134,24 },{ 6295,63 },{ 6358,85 },{ 134,24 }}, // French/Latin/Chad
-       {    37,     7,    48,{ 6295,63 },{ 6358,85 },{ 134,24 },{ 6295,63 },{ 6358,85 },{ 134,24 }}, // French/Latin/Comoros
-       {    37,     7,    49,{ 6295,63 },{ 6358,85 },{ 134,24 },{ 6295,63 },{ 6358,85 },{ 134,24 }}, // French/Latin/Congo Kinshasa
-       {    37,     7,    50,{ 6295,63 },{ 6358,85 },{ 134,24 },{ 6295,63 },{ 6358,85 },{ 134,24 }}, // French/Latin/Congo Brazzaville
-       {    37,     7,    53,{ 6295,63 },{ 6358,85 },{ 134,24 },{ 6295,63 },{ 6358,85 },{ 134,24 }}, // French/Latin/Ivory Coast
-       {    37,     7,    59,{ 6295,63 },{ 6358,85 },{ 134,24 },{ 6295,63 },{ 6358,85 },{ 134,24 }}, // French/Latin/Djibouti
-       {    37,     7,    66,{ 6295,63 },{ 6358,85 },{ 134,24 },{ 6295,63 },{ 6358,85 },{ 134,24 }}, // French/Latin/Equatorial Guinea
-       {    37,     7,    76,{ 6295,63 },{ 6358,85 },{ 134,24 },{ 6295,63 },{ 6358,85 },{ 134,24 }}, // French/Latin/French Guiana
-       {    37,     7,    77,{ 6295,63 },{ 6358,85 },{ 134,24 },{ 6295,63 },{ 6358,85 },{ 134,24 }}, // French/Latin/French Polynesia
-       {    37,     7,    79,{ 6295,63 },{ 6358,85 },{ 134,24 },{ 6295,63 },{ 6358,85 },{ 134,24 }}, // French/Latin/Gabon
-       {    37,     7,    88,{ 6295,63 },{ 6358,85 },{ 134,24 },{ 6295,63 },{ 6358,85 },{ 134,24 }}, // French/Latin/Guadeloupe
-       {    37,     7,    91,{ 6295,63 },{ 6358,85 },{ 134,24 },{ 6295,63 },{ 6358,85 },{ 134,24 }}, // French/Latin/Guinea
-       {    37,     7,    94,{ 6295,63 },{ 6358,85 },{ 134,24 },{ 6295,63 },{ 6358,85 },{ 134,24 }}, // French/Latin/Haiti
-       {    37,     7,   125,{ 6295,63 },{ 6358,85 },{ 134,24 },{ 6295,63 },{ 6358,85 },{ 134,24 }}, // French/Latin/Luxembourg
-       {    37,     7,   128,{ 6295,63 },{ 6358,85 },{ 134,24 },{ 6295,63 },{ 6358,85 },{ 134,24 }}, // French/Latin/Madagascar
-       {    37,     7,   132,{ 6295,63 },{ 6358,85 },{ 134,24 },{ 6295,63 },{ 6358,85 },{ 134,24 }}, // French/Latin/Mali
-       {    37,     7,   135,{ 6295,63 },{ 6358,85 },{ 134,24 },{ 6295,63 },{ 6358,85 },{ 134,24 }}, // French/Latin/Martinique
-       {    37,     7,   136,{ 6295,63 },{ 6358,85 },{ 134,24 },{ 6295,63 },{ 6358,85 },{ 134,24 }}, // French/Latin/Mauritania
-       {    37,     7,   137,{ 6295,63 },{ 6358,85 },{ 134,24 },{ 6295,63 },{ 6358,85 },{ 134,24 }}, // French/Latin/Mauritius
-       {    37,     7,   138,{ 6295,63 },{ 6358,85 },{ 134,24 },{ 6295,63 },{ 6358,85 },{ 134,24 }}, // French/Latin/Mayotte
-       {    37,     7,   142,{ 6295,63 },{ 6358,85 },{ 134,24 },{ 6295,63 },{ 6358,85 },{ 134,24 }}, // French/Latin/Monaco
-       {    37,     7,   145,{ 6507,61 },{ 6358,85 },{ 134,24 },{ 6507,61 },{ 6358,85 },{ 134,24 }}, // French/Latin/Morocco
-       {    37,     7,   153,{ 6295,63 },{ 6358,85 },{ 134,24 },{ 6295,63 },{ 6358,85 },{ 134,24 }}, // French/Latin/New Caledonia
-       {    37,     7,   156,{ 6295,63 },{ 6358,85 },{ 134,24 },{ 6295,63 },{ 6358,85 },{ 134,24 }}, // French/Latin/Niger
-       {    37,     7,   176,{ 6295,63 },{ 6358,85 },{ 134,24 },{ 6295,63 },{ 6358,85 },{ 134,24 }}, // French/Latin/Reunion
-       {    37,     7,   179,{ 6295,63 },{ 6358,85 },{ 134,24 },{ 6295,63 },{ 6358,85 },{ 134,24 }}, // French/Latin/Rwanda
-       {    37,     7,   187,{ 6295,63 },{ 6358,85 },{ 134,24 },{ 6295,63 },{ 6358,85 },{ 134,24 }}, // French/Latin/Senegal
-       {    37,     7,   188,{ 6295,63 },{ 6358,85 },{ 134,24 },{ 6295,63 },{ 6358,85 },{ 134,24 }}, // French/Latin/Seychelles
-       {    37,     7,   200,{ 6295,63 },{ 6358,85 },{ 134,24 },{ 6295,63 },{ 6358,85 },{ 134,24 }}, // French/Latin/Saint Pierre And Miquelon
-       {    37,     7,   206,{ 6295,63 },{ 6358,85 },{ 134,24 },{ 6295,63 },{ 6358,85 },{ 134,24 }}, // French/Latin/Switzerland
-       {    37,     7,   207,{ 6295,63 },{ 6358,85 },{ 134,24 },{ 6295,63 },{ 6358,85 },{ 134,24 }}, // French/Latin/Syria
-       {    37,     7,   212,{ 6295,63 },{ 6358,85 },{ 134,24 },{ 6295,63 },{ 6358,85 },{ 134,24 }}, // French/Latin/Togo
-       {    37,     7,   216,{ 6295,63 },{ 6358,85 },{ 134,24 },{ 6295,63 },{ 6358,85 },{ 134,24 }}, // French/Latin/Tunisia
-       {    37,     7,   229,{ 6295,63 },{ 6358,85 },{ 134,24 },{ 6295,63 },{ 6358,85 },{ 134,24 }}, // French/Latin/Vanuatu
-       {    37,     7,   235,{ 6295,63 },{ 6358,85 },{ 134,24 },{ 6295,63 },{ 6358,85 },{ 134,24 }}, // French/Latin/Wallis And Futuna Islands
-       {    37,     7,   244,{ 6295,63 },{ 6358,85 },{ 134,24 },{ 6295,63 },{ 6358,85 },{ 134,24 }}, // French/Latin/Saint Barthelemy
-       {    37,     7,   245,{ 6295,63 },{ 6358,85 },{ 134,24 },{ 6295,63 },{ 6358,85 },{ 134,24 }}, // French/Latin/Saint Martin
-       {    38,     7,   151,{ 6568,48 },{ 6616,95 },{ 134,24 },{ 6568,48 },{ 6616,95 },{ 134,24 }}, // Western Frisian/Latin/Netherlands
-       {    39,     7,   224,{ 6711,61 },{ 6772,142 },{ 6914,24 },{ 6711,61 },{ 6938,167 },{ 6914,24 }}, // Gaelic/Latin/United Kingdom
-       {    40,     7,   197,{ 7105,60 },{ 7165,87 },{ 7252,24 },{ 7276,60 },{ 7336,87 },{ 7423,36 }}, // Galician/Latin/Spain
-       {    41,    15,    81,{ 7459,48 },{ 7507,99 },{ 7606,24 },{ 7459,48 },{ 7507,99 },{ 7606,24 }}, // Georgian/Georgian/Georgia
-       {    42,     7,    82,{ 7630,48 },{ 7678,83 },{ 134,24 },{ 7761,60 },{ 7678,83 },{ 134,24 }}, // German/Latin/Germany
-       {    42,     7,    14,{ 7821,48 },{ 7869,83 },{ 134,24 },{ 7952,59 },{ 7869,83 },{ 134,24 }}, // German/Latin/Austria
-       {    42,     7,    21,{ 7630,48 },{ 7678,83 },{ 134,24 },{ 7761,60 },{ 7678,83 },{ 134,24 }}, // German/Latin/Belgium
-       {    42,     7,   106,{ 7821,48 },{ 7869,83 },{ 134,24 },{ 7952,59 },{ 7869,83 },{ 134,24 }}, // German/Latin/Italy
-       {    42,     7,   123,{ 7630,48 },{ 7678,83 },{ 134,24 },{ 7761,60 },{ 7678,83 },{ 134,24 }}, // German/Latin/Liechtenstein
-       {    42,     7,   125,{ 7630,48 },{ 7678,83 },{ 134,24 },{ 7761,60 },{ 7678,83 },{ 134,24 }}, // German/Latin/Luxembourg
-       {    42,     7,   206,{ 7630,48 },{ 7678,83 },{ 134,24 },{ 7761,60 },{ 7678,83 },{ 134,24 }}, // German/Latin/Switzerland
-       {    43,    16,    85,{ 8011,50 },{ 8061,115 },{ 8176,24 },{ 8200,50 },{ 8250,115 },{ 8176,24 }}, // Greek/Greek/Greece
-       {    43,    16,    56,{ 8011,50 },{ 8061,115 },{ 8176,24 },{ 8200,50 },{ 8250,115 },{ 8176,24 }}, // Greek/Greek/Cyprus
-       {    44,     7,    86,{ 8365,50 },{ 8415,99 },{ 134,24 },{ 8365,50 },{ 8514,111 },{ 134,24 }}, // Greenlandic/Latin/Greenland
-       {    45,     7,   168,{ 370,48 },{ 370,48 },{ 418,27 },{ 370,48 },{ 370,48 },{ 418,27 }}, // Guarani/Latin/Paraguay
-       {    46,    17,   100,{ 8625,67 },{ 8692,87 },{ 8779,31 },{ 8625,67 },{ 8692,87 },{ 8779,31 }}, // Gujarati/Gujarati/India
-       {    47,     7,   157,{ 8810,48 },{ 8858,85 },{ 8943,24 },{ 8810,48 },{ 8858,85 },{ 8943,24 }}, // Hausa/Latin/Nigeria
-       {    47,     1,   157,{ 370,48 },{ 370,48 },{ 418,27 },{ 370,48 },{ 370,48 },{ 418,27 }}, // Hausa/Arabic/Nigeria
-       {    47,     7,    83,{ 8810,48 },{ 8858,85 },{ 8943,24 },{ 8810,48 },{ 8858,85 },{ 8943,24 }}, // Hausa/Latin/Ghana
-       {    47,     7,   156,{ 8810,48 },{ 8858,85 },{ 8943,24 },{ 8810,48 },{ 8858,85 },{ 8943,24 }}, // Hausa/Latin/Niger
-       {    48,    18,   105,{ 8967,58 },{ 9025,72 },{ 418,27 },{ 8967,58 },{ 9025,72 },{ 418,27 }}, // Hebrew/Hebrew/Israel
-       {    49,    13,   100,{ 9097,59 },{ 9156,73 },{ 9229,30 },{ 9097,59 },{ 9156,73 },{ 9229,30 }}, // Hindi/Devanagari/India
-       {    50,     7,    98,{ 9259,64 },{ 9323,98 },{ 9421,25 },{ 9259,64 },{ 9323,98 },{ 9421,25 }}, // Hungarian/Latin/Hungary
-       {    51,     7,    99,{ 9446,59 },{ 9505,82 },{ 9587,24 },{ 9446,59 },{ 9505,82 },{ 9587,24 }}, // Icelandic/Latin/Iceland
-       {    52,     7,   101,{ 9611,48 },{ 9659,87 },{ 134,24 },{ 9611,48 },{ 9659,87 },{ 134,24 }}, // Indonesian/Latin/Indonesia
-       {    53,     7,   260,{ 9746,48 },{ 9794,93 },{ 418,27 },{ 9746,48 },{ 9794,93 },{ 9887,24 }}, // Interlingua/Latin/World
-       {    55,    44,    38,{ 370,48 },{ 370,48 },{ 418,27 },{ 370,48 },{ 370,48 },{ 418,27 }}, // Inuktitut/Canadian Aboriginal/Canada
-       {    55,     7,    38,{ 370,48 },{ 370,48 },{ 418,27 },{ 370,48 },{ 370,48 },{ 418,27 }}, // Inuktitut/Latin/Canada
-       {    57,     7,   104,{ 9911,62 },{ 9973,107 },{ 10080,24 },{ 9911,62 },{ 9973,107 },{ 10080,24 }}, // Irish/Latin/Ireland
-       {    57,     7,   224,{ 9911,62 },{ 9973,107 },{ 10080,24 },{ 9911,62 },{ 9973,107 },{ 10080,24 }}, // Irish/Latin/United Kingdom
-       {    58,     7,   106,{ 10104,48 },{ 10152,94 },{ 10246,24 },{ 10104,48 },{ 10152,94 },{ 10246,24 }}, // Italian/Latin/Italy
-       {    58,     7,   184,{ 10104,48 },{ 10152,94 },{ 10246,24 },{ 10104,48 },{ 10152,94 },{ 10246,24 }}, // Italian/Latin/San Marino
-       {    58,     7,   206,{ 10104,48 },{ 10152,94 },{ 10246,24 },{ 10104,48 },{ 10152,94 },{ 10246,24 }}, // Italian/Latin/Switzerland
-       {    58,     7,   230,{ 10104,48 },{ 10152,94 },{ 10246,24 },{ 10104,48 },{ 10152,94 },{ 10246,24 }}, // Italian/Latin/Vatican City State
-       {    59,    19,   108,{ 4452,39 },{ 4452,39 },{ 418,27 },{ 4452,39 },{ 4452,39 },{ 418,27 }}, // Japanese/Japanese/Japan
-       {    60,     7,   101,{ 10270,48 },{ 9659,87 },{ 134,24 },{ 10270,48 },{ 9659,87 },{ 134,24 }}, // Javanese/Latin/Indonesia
-       {    61,    21,   100,{ 10318,63 },{ 10381,87 },{ 10468,31 },{ 10499,69 },{ 10381,87 },{ 10468,31 }}, // Kannada/Kannada/India
-       {    62,     1,   100,{ 10568,72 },{ 10568,72 },{ 10640,24 },{ 10568,72 },{ 10568,72 },{ 10640,24 }}, // Kashmiri/Arabic/India
-       {    63,     2,   110,{ 10664,60 },{ 10724,83 },{ 10807,24 },{ 10664,60 },{ 10831,83 },{ 10807,24 }}, // Kazakh/Cyrillic/Kazakhstan
-       {    64,     7,   179,{ 10914,60 },{ 10974,101 },{ 418,27 },{ 10914,60 },{ 10974,101 },{ 418,27 }}, // Kinyarwanda/Latin/Rwanda
-       {    65,     2,   116,{ 11075,48 },{ 11123,80 },{ 11203,24 },{ 11227,59 },{ 11286,80 },{ 11203,24 }}, // Kirghiz/Cyrillic/Kyrgyzstan
-       {    66,    22,   114,{ 11366,39 },{ 11366,39 },{ 11366,39 },{ 11366,39 },{ 11366,39 },{ 11366,39 }}, // Korean/Korean/South Korea
-       {    66,    22,   113,{ 11366,39 },{ 11366,39 },{ 11366,39 },{ 11366,39 },{ 11366,39 },{ 11366,39 }}, // Korean/Korean/North Korea
-       {    67,     7,   217,{ 11405,48 },{ 11453,88 },{ 11541,24 },{ 11405,48 },{ 11565,101 },{ 11541,24 }}, // Kurdish/Latin/Turkey
-       {    68,     7,    35,{ 11666,60 },{ 11726,106 },{ 418,27 },{ 11666,60 },{ 11726,106 },{ 418,27 }}, // Rundi/Latin/Burundi
-       {    69,    23,   117,{ 11832,61 },{ 11893,75 },{ 418,27 },{ 11832,61 },{ 11893,75 },{ 418,27 }}, // Lao/Lao/Laos
-       {    71,     7,   118,{ 11968,65 },{ 12033,101 },{ 134,24 },{ 11968,65 },{ 12033,101 },{ 134,24 }}, // Latvian/Latin/Latvia
-       {    72,     7,    49,{ 12134,48 },{ 12182,203 },{ 12385,24 },{ 12134,48 },{ 12182,203 },{ 12385,24 }}, // Lingala/Latin/Congo Kinshasa
-       {    72,     7,     6,{ 12134,48 },{ 12182,203 },{ 12385,24 },{ 12134,48 },{ 12182,203 },{ 12385,24 }}, // Lingala/Latin/Angola
-       {    72,     7,    41,{ 12134,48 },{ 12182,203 },{ 12385,24 },{ 12134,48 },{ 12182,203 },{ 12385,24 }}, // Lingala/Latin/Central African Republic
-       {    72,     7,    50,{ 12134,48 },{ 12182,203 },{ 12385,24 },{ 12134,48 },{ 12182,203 },{ 12385,24 }}, // Lingala/Latin/Congo Brazzaville
-       {    73,     7,   124,{ 12409,70 },{ 12479,96 },{ 12575,24 },{ 12409,70 },{ 12599,98 },{ 12575,24 }}, // Lithuanian/Latin/Lithuania
-       {    74,     2,   127,{ 12697,61 },{ 12758,85 },{ 12843,24 },{ 12697,61 },{ 12758,85 },{ 12843,24 }}, // Macedonian/Cyrillic/Macedonia
-       {    75,     7,   128,{ 12867,48 },{ 12915,92 },{ 134,24 },{ 12867,48 },{ 12915,92 },{ 134,24 }}, // Malagasy/Latin/Madagascar
-       {    76,     7,   130,{ 13007,48 },{ 13055,82 },{ 13137,24 },{ 13007,48 },{ 13055,82 },{ 13137,24 }}, // Malay/Latin/Malaysia
-       {    76,     1,   130,{ 370,48 },{ 370,48 },{ 418,27 },{ 370,48 },{ 370,48 },{ 418,27 }}, // Malay/Arabic/Malaysia
-       {    76,     7,    32,{ 13007,48 },{ 13055,82 },{ 13137,24 },{ 13007,48 },{ 13055,82 },{ 13137,24 }}, // Malay/Latin/Brunei
-       {    76,     7,   190,{ 13007,48 },{ 13055,82 },{ 13137,24 },{ 13007,48 },{ 13055,82 },{ 13137,24 }}, // Malay/Latin/Singapore
-       {    77,    24,   100,{ 13161,62 },{ 13223,88 },{ 13311,32 },{ 13161,62 },{ 13223,88 },{ 13311,32 }}, // Malayalam/Malayalam/India
-       {    78,     7,   133,{ 13343,48 },{ 13391,86 },{ 13477,36 },{ 13343,48 },{ 13391,86 },{ 13513,24 }}, // Maltese/Latin/Malta
-       {    79,     7,   154,{ 13537,59 },{ 13596,133 },{ 13729,24 },{ 13537,59 },{ 13596,133 },{ 13729,24 }}, // Maori/Latin/New Zealand
-       {    80,    13,   100,{ 13753,66 },{ 13819,86 },{ 13905,32 },{ 13753,66 },{ 13819,86 },{ 13905,32 }}, // Marathi/Devanagari/India
-       {    82,     2,   143,{ 13937,99 },{ 14036,192 },{ 14228,38 },{ 13937,99 },{ 14266,192 },{ 14228,38 }}, // Mongolian/Cyrillic/Mongolia
-       {    82,     8,    44,{ 370,48 },{ 370,48 },{ 418,27 },{ 370,48 },{ 370,48 },{ 418,27 }}, // Mongolian/Mongolian/China
-       {    84,    13,   150,{ 14458,85 },{ 14458,85 },{ 14543,53 },{ 14458,85 },{ 14458,85 },{ 14596,52 }}, // Nepali/Devanagari/Nepal
-       {    84,    13,   100,{ 14458,85 },{ 14458,85 },{ 14543,53 },{ 14458,85 },{ 14458,85 },{ 14596,52 }}, // Nepali/Devanagari/India
-       {    85,     7,   161,{ 5685,48 },{ 14648,83 },{ 134,24 },{ 5816,59 },{ 14648,83 },{ 134,24 }}, // Norwegian Bokmal/Latin/Norway
-       {    85,     7,   203,{ 5685,48 },{ 14648,83 },{ 134,24 },{ 5816,59 },{ 14648,83 },{ 134,24 }}, // Norwegian Bokmal/Latin/Svalbard And Jan Mayen Islands
-       {    86,     7,    74,{ 370,48 },{ 370,48 },{ 418,27 },{ 370,48 },{ 370,48 },{ 418,27 }}, // Occitan/Latin/France
-       {    87,    26,   100,{ 14731,86 },{ 14731,86 },{ 14817,32 },{ 14731,86 },{ 14731,86 },{ 14817,32 }}, // Oriya/Oriya/India
-       {    88,     1,     1,{ 14849,68 },{ 14917,69 },{ 418,27 },{ 14986,69 },{ 14986,69 },{ 15055,24 }}, // Pashto/Arabic/Afghanistan
-       {    88,     1,   163,{ 14849,68 },{ 14917,69 },{ 418,27 },{ 14986,69 },{ 14986,69 },{ 15055,24 }}, // Pashto/Arabic/Pakistan
-       {    89,     1,   102,{ 15079,70 },{ 15079,70 },{ 15149,24 },{ 15173,74 },{ 15173,74 },{ 15149,24 }}, // Persian/Arabic/Iran
-       {    89,     1,     1,{ 15247,68 },{ 15247,68 },{ 15055,24 },{ 15315,62 },{ 15247,68 },{ 15055,24 }}, // Persian/Arabic/Afghanistan
-       {    90,     7,   172,{ 15377,48 },{ 15425,97 },{ 15522,24 },{ 15377,48 },{ 15546,99 },{ 15645,24 }}, // Polish/Latin/Poland
-       {    91,     7,    30,{ 15669,60 },{ 15729,89 },{ 134,24 },{ 15669,60 },{ 15729,89 },{ 134,24 }}, // Portuguese/Latin/Brazil
-       {    91,     7,     6,{ 15669,60 },{ 15729,89 },{ 134,24 },{ 15669,60 },{ 15729,89 },{ 134,24 }}, // Portuguese/Latin/Angola
-       {    91,     7,    39,{ 15669,60 },{ 15729,89 },{ 134,24 },{ 15669,60 },{ 15729,89 },{ 134,24 }}, // Portuguese/Latin/Cape Verde
-       {    91,     7,    62,{ 15669,60 },{ 15729,89 },{ 134,24 },{ 15669,60 },{ 15729,89 },{ 134,24 }}, // Portuguese/Latin/East Timor
-       {    91,     7,    66,{ 15669,60 },{ 15729,89 },{ 134,24 },{ 15669,60 },{ 15729,89 },{ 134,24 }}, // Portuguese/Latin/Equatorial Guinea
-       {    91,     7,    92,{ 15669,60 },{ 15729,89 },{ 134,24 },{ 15669,60 },{ 15729,89 },{ 134,24 }}, // Portuguese/Latin/Guinea Bissau
-       {    91,     7,   125,{ 15669,60 },{ 15729,89 },{ 134,24 },{ 15669,60 },{ 15729,89 },{ 134,24 }}, // Portuguese/Latin/Luxembourg
-       {    91,     7,   126,{ 15669,60 },{ 15729,89 },{ 134,24 },{ 15669,60 },{ 15729,89 },{ 134,24 }}, // Portuguese/Latin/Macau
-       {    91,     7,   146,{ 15669,60 },{ 15729,89 },{ 134,24 },{ 15669,60 },{ 15729,89 },{ 134,24 }}, // Portuguese/Latin/Mozambique
-       {    91,     7,   173,{ 15669,60 },{ 15729,89 },{ 134,24 },{ 15669,60 },{ 15729,89 },{ 134,24 }}, // Portuguese/Latin/Portugal
-       {    91,     7,   185,{ 15669,60 },{ 15729,89 },{ 134,24 },{ 15669,60 },{ 15729,89 },{ 134,24 }}, // Portuguese/Latin/Sao Tome And Principe
-       {    91,     7,   206,{ 15669,60 },{ 15729,89 },{ 134,24 },{ 15669,60 },{ 15729,89 },{ 134,24 }}, // Portuguese/Latin/Switzerland
-       {    92,     4,   100,{ 15818,50 },{ 15868,68 },{ 15936,28 },{ 15818,50 },{ 15868,68 },{ 15936,28 }}, // Punjabi/Gurmukhi/India
-       {    92,     1,   163,{ 15964,67 },{ 15964,67 },{ 418,27 },{ 15964,67 },{ 15964,67 },{ 418,27 }}, // Punjabi/Arabic/Pakistan
-       {    93,     7,   169,{ 16031,48 },{ 16079,88 },{ 418,27 },{ 16031,48 },{ 16079,88 },{ 418,27 }}, // Quechua/Latin/Peru
-       {    93,     7,    26,{ 16031,48 },{ 16079,88 },{ 418,27 },{ 16031,48 },{ 16079,88 },{ 418,27 }}, // Quechua/Latin/Bolivia
-       {    93,     7,    63,{ 16031,48 },{ 16079,88 },{ 418,27 },{ 16031,48 },{ 16079,88 },{ 418,27 }}, // Quechua/Latin/Ecuador
-       {    94,     7,   206,{ 16167,67 },{ 16234,92 },{ 16326,24 },{ 16167,67 },{ 16350,125 },{ 16326,24 }}, // Romansh/Latin/Switzerland
-       {    95,     7,   177,{ 16475,60 },{ 16535,98 },{ 16633,24 },{ 16475,60 },{ 16535,98 },{ 16633,24 }}, // Romanian/Latin/Romania
-       {    95,     7,   141,{ 16475,60 },{ 16535,98 },{ 16633,24 },{ 16475,60 },{ 16535,98 },{ 16633,24 }}, // Romanian/Latin/Moldova
-       {    96,     2,   178,{ 16657,62 },{ 11286,80 },{ 11203,24 },{ 16719,62 },{ 16781,82 },{ 11203,24 }}, // Russian/Cyrillic/Russia
-       {    96,     2,    20,{ 16657,62 },{ 11286,80 },{ 11203,24 },{ 16719,62 },{ 16781,82 },{ 11203,24 }}, // Russian/Cyrillic/Belarus
-       {    96,     2,   110,{ 16657,62 },{ 11286,80 },{ 11203,24 },{ 16719,62 },{ 16781,82 },{ 11203,24 }}, // Russian/Cyrillic/Kazakhstan
-       {    96,     2,   116,{ 16657,62 },{ 11286,80 },{ 11203,24 },{ 16719,62 },{ 16781,82 },{ 11203,24 }}, // Russian/Cyrillic/Kyrgyzstan
-       {    96,     2,   141,{ 16657,62 },{ 11286,80 },{ 11203,24 },{ 16719,62 },{ 16781,82 },{ 11203,24 }}, // Russian/Cyrillic/Moldova
-       {    96,     2,   222,{ 16657,62 },{ 11286,80 },{ 11203,24 },{ 16719,62 },{ 16781,82 },{ 11203,24 }}, // Russian/Cyrillic/Ukraine
-       {    98,     7,    41,{ 16863,48 },{ 16911,91 },{ 17002,24 },{ 16863,48 },{ 16911,91 },{ 17002,24 }}, // Sango/Latin/Central African Republic
-       {    99,    13,   100,{ 370,48 },{ 370,48 },{ 418,27 },{ 370,48 },{ 370,48 },{ 418,27 }}, // Sanskrit/Devanagari/India
-       {   100,     2,   243,{ 17026,48 },{ 17074,81 },{ 12843,24 },{ 17026,48 },{ 17074,81 },{ 12843,24 }}, // Serbian/Cyrillic/Serbia
-       {   100,     2,    27,{ 17026,48 },{ 17074,81 },{ 12843,24 },{ 17026,48 },{ 17074,81 },{ 12843,24 }}, // Serbian/Cyrillic/Bosnia And Herzegowina
-       {   100,     2,   242,{ 17155,50 },{ 17074,81 },{ 12843,24 },{ 17155,50 },{ 17074,81 },{ 12843,24 }}, // Serbian/Cyrillic/Montenegro
-       {   100,     2,   257,{ 17155,50 },{ 17074,81 },{ 12843,24 },{ 17155,50 },{ 17074,81 },{ 12843,24 }}, // Serbian/Cyrillic/Kosovo
-       {   100,     7,    27,{ 17205,48 },{ 17253,81 },{ 9887,24 },{ 17205,48 },{ 17253,81 },{ 9887,24 }}, // Serbian/Latin/Bosnia And Herzegowina
-       {   100,     7,   242,{ 17334,50 },{ 17253,81 },{ 9887,24 },{ 17334,50 },{ 17253,81 },{ 9887,24 }}, // Serbian/Latin/Montenegro
-       {   100,     7,   243,{ 17205,48 },{ 17253,81 },{ 9887,24 },{ 17205,48 },{ 17253,81 },{ 9887,24 }}, // Serbian/Latin/Serbia
-       {   100,     7,   257,{ 17334,50 },{ 17253,81 },{ 9887,24 },{ 17334,50 },{ 17253,81 },{ 9887,24 }}, // Serbian/Latin/Kosovo
-       {   101,     2,    81,{ 17384,63 },{ 17447,82 },{ 11203,24 },{ 17529,60 },{ 17589,86 },{ 11203,24 }}, // Ossetic/Cyrillic/Georgia
-       {   101,     2,   178,{ 17384,63 },{ 17447,82 },{ 11203,24 },{ 17529,60 },{ 17589,86 },{ 11203,24 }}, // Ossetic/Cyrillic/Russia
-       {   102,     7,   195,{ 370,48 },{ 370,48 },{ 418,27 },{ 370,48 },{ 370,48 },{ 418,27 }}, // Southern Sotho/Latin/South Africa
-       {   103,     7,   195,{ 370,48 },{ 370,48 },{ 418,27 },{ 370,48 },{ 370,48 },{ 418,27 }}, // Tswana/Latin/South Africa
-       {   104,     7,   240,{ 17675,48 },{ 17723,100 },{ 17823,24 },{ 17675,48 },{ 17723,100 },{ 17823,24 }}, // Shona/Latin/Zimbabwe
-       {   105,     1,   163,{ 17847,72 },{ 17847,72 },{ 134,24 },{ 17847,72 },{ 17847,72 },{ 134,24 }}, // Sindhi/Arabic/Pakistan
-       {   106,    32,   198,{ 17919,59 },{ 17978,96 },{ 18074,32 },{ 18106,61 },{ 17978,96 },{ 18074,32 }}, // Sinhala/Sinhala/Sri Lanka
-       {   107,     7,   195,{ 370,48 },{ 370,48 },{ 418,27 },{ 370,48 },{ 370,48 },{ 418,27 }}, // Swati/Latin/South Africa
-       {   108,     7,   191,{ 18167,48 },{ 18215,82 },{ 9887,24 },{ 18167,48 },{ 18297,89 },{ 9887,24 }}, // Slovak/Latin/Slovakia
-       {   109,     7,   192,{ 18386,59 },{ 18445,86 },{ 9887,24 },{ 18386,59 },{ 18445,86 },{ 9887,24 }}, // Slovenian/Latin/Slovenia
-       {   110,     7,   194,{ 18531,48 },{ 18579,92 },{ 18671,24 },{ 18531,48 },{ 18695,189 },{ 18671,24 }}, // Somali/Latin/Somalia
-       {   110,     7,    59,{ 18531,48 },{ 18579,92 },{ 18671,24 },{ 18531,48 },{ 18695,189 },{ 18671,24 }}, // Somali/Latin/Djibouti
-       {   110,     7,    69,{ 18531,48 },{ 18579,92 },{ 18671,24 },{ 18531,48 },{ 18695,189 },{ 18671,24 }}, // Somali/Latin/Ethiopia
-       {   110,     7,   111,{ 18531,48 },{ 18579,92 },{ 18671,24 },{ 18531,48 },{ 18695,189 },{ 18671,24 }}, // Somali/Latin/Kenya
-       {   111,     7,   197,{ 18884,61 },{ 18945,89 },{ 19034,24 },{ 18884,61 },{ 18945,89 },{ 19034,24 }}, // Spanish/Latin/Spain
-       {   111,     7,    10,{ 19058,60 },{ 18945,89 },{ 19034,24 },{ 19058,60 },{ 18945,89 },{ 19034,24 }}, // Spanish/Latin/Argentina
-       {   111,     7,    22,{ 19058,60 },{ 18945,89 },{ 19034,24 },{ 19058,60 },{ 18945,89 },{ 19034,24 }}, // Spanish/Latin/Belize
-       {   111,     7,    26,{ 19058,60 },{ 18945,89 },{ 19034,24 },{ 19058,60 },{ 18945,89 },{ 19034,24 }}, // Spanish/Latin/Bolivia
-       {   111,     7,    30,{ 19058,60 },{ 18945,89 },{ 19034,24 },{ 19058,60 },{ 18945,89 },{ 19034,24 }}, // Spanish/Latin/Brazil
-       {   111,     7,    43,{ 18884,61 },{ 18945,89 },{ 19034,24 },{ 19058,60 },{ 18945,89 },{ 19034,24 }}, // Spanish/Latin/Chile
-       {   111,     7,    47,{ 18884,61 },{ 18945,89 },{ 19034,24 },{ 19058,60 },{ 18945,89 },{ 19034,24 }}, // Spanish/Latin/Colombia
-       {   111,     7,    52,{ 19058,60 },{ 18945,89 },{ 19034,24 },{ 19058,60 },{ 18945,89 },{ 19034,24 }}, // Spanish/Latin/Costa Rica
-       {   111,     7,    55,{ 19058,60 },{ 18945,89 },{ 19034,24 },{ 19058,60 },{ 18945,89 },{ 19034,24 }}, // Spanish/Latin/Cuba
-       {   111,     7,    61,{ 19058,60 },{ 18945,89 },{ 19034,24 },{ 19058,60 },{ 18945,89 },{ 19034,24 }}, // Spanish/Latin/Dominican Republic
-       {   111,     7,    63,{ 19058,60 },{ 18945,89 },{ 19034,24 },{ 19058,60 },{ 18945,89 },{ 19034,24 }}, // Spanish/Latin/Ecuador
-       {   111,     7,    65,{ 19058,60 },{ 18945,89 },{ 19034,24 },{ 19058,60 },{ 18945,89 },{ 19034,24 }}, // Spanish/Latin/El Salvador
-       {   111,     7,    66,{ 18884,61 },{ 18945,89 },{ 19034,24 },{ 18884,61 },{ 18945,89 },{ 19034,24 }}, // Spanish/Latin/Equatorial Guinea
-       {   111,     7,    90,{ 19058,60 },{ 18945,89 },{ 19034,24 },{ 19058,60 },{ 18945,89 },{ 19034,24 }}, // Spanish/Latin/Guatemala
-       {   111,     7,    96,{ 19058,60 },{ 18945,89 },{ 19034,24 },{ 19058,60 },{ 18945,89 },{ 19034,24 }}, // Spanish/Latin/Honduras
-       {   111,     7,   139,{ 19058,60 },{ 18945,89 },{ 19034,24 },{ 19058,60 },{ 18945,89 },{ 19034,24 }}, // Spanish/Latin/Mexico
-       {   111,     7,   155,{ 19058,60 },{ 18945,89 },{ 19034,24 },{ 19058,60 },{ 18945,89 },{ 19034,24 }}, // Spanish/Latin/Nicaragua
-       {   111,     7,   166,{ 19058,60 },{ 18945,89 },{ 19034,24 },{ 19058,60 },{ 18945,89 },{ 19034,24 }}, // Spanish/Latin/Panama
-       {   111,     7,   168,{ 18884,61 },{ 18945,89 },{ 19034,24 },{ 18884,61 },{ 18945,89 },{ 19034,24 }}, // Spanish/Latin/Paraguay
-       {   111,     7,   169,{ 19118,60 },{ 16079,88 },{ 19034,24 },{ 19178,60 },{ 19238,88 },{ 19034,24 }}, // Spanish/Latin/Peru
-       {   111,     7,   170,{ 18884,61 },{ 18945,89 },{ 19034,24 },{ 18884,61 },{ 18945,89 },{ 19034,24 }}, // Spanish/Latin/Philippines
-       {   111,     7,   174,{ 19058,60 },{ 18945,89 },{ 19034,24 },{ 19058,60 },{ 18945,89 },{ 19034,24 }}, // Spanish/Latin/Puerto Rico
-       {   111,     7,   225,{ 19058,60 },{ 18945,89 },{ 19034,24 },{ 19058,60 },{ 18945,89 },{ 19034,24 }}, // Spanish/Latin/United States
-       {   111,     7,   227,{ 19118,60 },{ 16079,88 },{ 19034,24 },{ 19178,60 },{ 19238,88 },{ 19034,24 }}, // Spanish/Latin/Uruguay
-       {   111,     7,   231,{ 18884,61 },{ 18945,89 },{ 19034,24 },{ 18884,61 },{ 18945,89 },{ 19034,24 }}, // Spanish/Latin/Venezuela
-       {   111,     7,   238,{ 18884,61 },{ 18945,89 },{ 19034,24 },{ 18884,61 },{ 18945,89 },{ 19034,24 }}, // Spanish/Latin/Canary Islands
-       {   111,     7,   246,{ 19058,60 },{ 18945,89 },{ 19034,24 },{ 19058,60 },{ 18945,89 },{ 19034,24 }}, // Spanish/Latin/Latin America
-       {   111,     7,   250,{ 18884,61 },{ 18945,89 },{ 19034,24 },{ 18884,61 },{ 18945,89 },{ 19034,24 }}, // Spanish/Latin/Ceuta And Melilla
-       {   112,     7,   101,{ 370,48 },{ 370,48 },{ 418,27 },{ 370,48 },{ 370,48 },{ 418,27 }}, // Sundanese/Latin/Indonesia
-       {   113,     7,   210,{ 19326,48 },{ 19374,84 },{ 134,24 },{ 19326,48 },{ 19374,84 },{ 134,24 }}, // Swahili/Latin/Tanzania
-       {   113,     7,    49,{ 19326,48 },{ 19374,84 },{ 134,24 },{ 19326,48 },{ 19374,84 },{ 134,24 }}, // Swahili/Latin/Congo Kinshasa
-       {   113,     7,   111,{ 19326,48 },{ 19374,84 },{ 134,24 },{ 19326,48 },{ 19374,84 },{ 134,24 }}, // Swahili/Latin/Kenya
-       {   113,     7,   221,{ 19326,48 },{ 19374,84 },{ 134,24 },{ 19326,48 },{ 19374,84 },{ 134,24 }}, // Swahili/Latin/Uganda
-       {   114,     7,   205,{ 19458,59 },{ 19517,86 },{ 134,24 },{ 19458,59 },{ 19517,86 },{ 134,24 }}, // Swedish/Latin/Sweden
-       {   114,     7,    73,{ 19458,59 },{ 19517,86 },{ 134,24 },{ 19458,59 },{ 19517,86 },{ 134,24 }}, // Swedish/Latin/Finland
-       {   114,     7,   248,{ 19458,59 },{ 19517,86 },{ 134,24 },{ 19458,59 },{ 19517,86 },{ 134,24 }}, // Swedish/Latin/Aland Islands
-       {   115,     7,   106,{ 370,48 },{ 370,48 },{ 418,27 },{ 370,48 },{ 370,48 },{ 418,27 }}, // Sardinian/Latin/Italy
-       {   116,     2,   209,{ 11075,48 },{ 19603,71 },{ 11203,24 },{ 11075,48 },{ 19603,71 },{ 11203,24 }}, // Tajik/Cyrillic/Tajikistan
-       {   117,    27,   100,{ 19674,58 },{ 19732,86 },{ 19818,31 },{ 19674,58 },{ 19732,86 },{ 19818,31 }}, // Tamil/Tamil/India
-       {   117,    27,   130,{ 19674,58 },{ 19732,86 },{ 19818,31 },{ 19674,58 },{ 19732,86 },{ 19818,31 }}, // Tamil/Tamil/Malaysia
-       {   117,    27,   190,{ 19674,58 },{ 19732,86 },{ 19818,31 },{ 19674,58 },{ 19732,86 },{ 19818,31 }}, // Tamil/Tamil/Singapore
-       {   117,    27,   198,{ 19674,58 },{ 19732,86 },{ 19818,31 },{ 19674,58 },{ 19732,86 },{ 19818,31 }}, // Tamil/Tamil/Sri Lanka
-       {   118,     2,   178,{ 19849,62 },{ 19911,81 },{ 418,27 },{ 19849,62 },{ 19911,81 },{ 418,27 }}, // Tatar/Cyrillic/Russia
-       {   119,    28,   100,{ 19992,62 },{ 20054,86 },{ 20140,31 },{ 19992,62 },{ 20054,86 },{ 20140,31 }}, // Telugu/Telugu/India
-       {   120,    30,   211,{ 20171,63 },{ 20234,98 },{ 20171,63 },{ 20171,63 },{ 20234,98 },{ 20171,63 }}, // Thai/Thai/Thailand
-       {   121,    31,    44,{ 2704,63 },{ 20332,159 },{ 418,27 },{ 2704,63 },{ 20491,147 },{ 418,27 }}, // Tibetan/Tibetan/China
-       {   121,    31,   100,{ 2704,63 },{ 20332,159 },{ 418,27 },{ 2704,63 },{ 20491,147 },{ 418,27 }}, // Tibetan/Tibetan/India
-       {   122,    14,    69,{ 20638,36 },{ 20674,54 },{ 20728,24 },{ 20638,36 },{ 20674,54 },{ 20728,24 }}, // Tigrinya/Ethiopic/Ethiopia
-       {   122,    14,    67,{ 20638,36 },{ 20674,54 },{ 20728,24 },{ 20638,36 },{ 20674,54 },{ 20728,24 }}, // Tigrinya/Ethiopic/Eritrea
-       {   123,     7,   214,{ 20752,51 },{ 20803,87 },{ 20890,24 },{ 20752,51 },{ 20803,87 },{ 20890,24 }}, // Tongan/Latin/Tonga
-       {   124,     7,   195,{ 370,48 },{ 370,48 },{ 418,27 },{ 370,48 },{ 370,48 },{ 418,27 }}, // Tsonga/Latin/South Africa
-       {   125,     7,   217,{ 20914,48 },{ 20962,75 },{ 21037,24 },{ 20914,48 },{ 20962,75 },{ 21037,24 }}, // Turkish/Latin/Turkey
-       {   125,     7,    56,{ 20914,48 },{ 20962,75 },{ 21037,24 },{ 20914,48 },{ 20962,75 },{ 21037,24 }}, // Turkish/Latin/Cyprus
-       {   126,     7,   218,{ 21061,50 },{ 21111,77 },{ 21188,24 },{ 21212,51 },{ 21263,77 },{ 21188,24 }}, // Turkmen/Latin/Turkmenistan
-       {   128,     1,    44,{ 21340,84 },{ 21340,84 },{ 418,27 },{ 21340,84 },{ 21340,84 },{ 418,27 }}, // Uighur/Arabic/China
-       {   129,     2,   222,{ 21424,48 },{ 21472,95 },{ 21567,24 },{ 21591,67 },{ 21658,87 },{ 21745,24 }}, // Ukrainian/Cyrillic/Ukraine
-       {   130,     1,   163,{ 21769,68 },{ 21769,68 },{ 134,24 },{ 21769,68 },{ 21769,68 },{ 134,24 }}, // Urdu/Arabic/Pakistan
-       {   130,     1,   100,{ 21769,68 },{ 21769,68 },{ 134,24 },{ 21769,68 },{ 21769,68 },{ 134,24 }}, // Urdu/Arabic/India
-       {   131,     7,   228,{ 21837,48 },{ 21885,75 },{ 21960,24 },{ 21984,48 },{ 22032,75 },{ 21960,24 }}, // Uzbek/Latin/Uzbekistan
-       {   131,     1,     1,{ 22107,47 },{ 15247,68 },{ 418,27 },{ 22107,47 },{ 15247,68 },{ 418,27 }}, // Uzbek/Arabic/Afghanistan
-       {   131,     2,   228,{ 22154,48 },{ 22202,71 },{ 11203,24 },{ 22154,48 },{ 22202,71 },{ 11203,24 }}, // Uzbek/Cyrillic/Uzbekistan
-       {   132,     7,   232,{ 22273,75 },{ 22348,99 },{ 418,27 },{ 22447,75 },{ 22522,99 },{ 418,27 }}, // Vietnamese/Latin/Vietnam
-       {   133,     7,   260,{ 22621,48 },{ 22669,74 },{ 22743,24 },{ 22767,48 },{ 22669,74 },{ 22743,24 }}, // Volapuk/Latin/World
-       {   134,     7,   224,{ 22815,52 },{ 22867,87 },{ 22954,26 },{ 22980,56 },{ 22867,87 },{ 22954,26 }}, // Welsh/Latin/United Kingdom
-       {   135,     7,   187,{ 23036,47 },{ 23083,84 },{ 418,27 },{ 23036,47 },{ 23083,84 },{ 418,27 }}, // Wolof/Latin/Senegal
-       {   136,     7,   195,{ 23167,48 },{ 23215,91 },{ 418,27 },{ 23167,48 },{ 23215,91 },{ 418,27 }}, // Xhosa/Latin/South Africa
-       {   137,    18,   260,{ 23306,58 },{ 23364,92 },{ 418,27 },{ 23364,92 },{ 23364,92 },{ 418,27 }}, // Yiddish/Hebrew/World
-       {   138,     7,   157,{ 23456,40 },{ 23496,73 },{ 23569,27 },{ 23596,55 },{ 23651,121 },{ 23569,27 }}, // Yoruba/Latin/Nigeria
-       {   138,     7,    23,{ 23772,41 },{ 23813,74 },{ 23887,27 },{ 23914,56 },{ 23970,134 },{ 23887,27 }}, // Yoruba/Latin/Benin
-       {   140,     7,   195,{ 24104,48 },{ 24152,91 },{ 134,24 },{ 24104,48 },{ 24152,91 },{ 24243,24 }}, // Zulu/Latin/South Africa
-       {   141,     7,   161,{ 5685,48 },{ 14648,83 },{ 134,24 },{ 24267,59 },{ 14648,83 },{ 134,24 }}, // Norwegian Nynorsk/Latin/Norway
-       {   142,     7,    27,{ 24326,48 },{ 24374,83 },{ 9887,24 },{ 24326,48 },{ 24374,83 },{ 9887,24 }}, // Bosnian/Latin/Bosnia And Herzegowina
-       {   142,     2,    27,{ 24457,48 },{ 24505,83 },{ 12843,24 },{ 24457,48 },{ 24505,83 },{ 12843,24 }}, // Bosnian/Cyrillic/Bosnia And Herzegowina
-       {   143,    29,   131,{ 370,48 },{ 370,48 },{ 418,27 },{ 370,48 },{ 370,48 },{ 418,27 }}, // Divehi/Thaana/Maldives
-       {   144,     7,   251,{ 24588,102 },{ 24690,140 },{ 418,27 },{ 24588,102 },{ 24690,140 },{ 418,27 }}, // Manx/Latin/Isle Of Man
-       {   145,     7,   224,{ 24830,46 },{ 24876,130 },{ 418,27 },{ 24830,46 },{ 24876,130 },{ 418,27 }}, // Cornish/Latin/United Kingdom
-       {   146,     7,    83,{ 25006,48 },{ 25054,192 },{ 418,27 },{ 25006,48 },{ 25054,192 },{ 418,27 }}, // Akan/Latin/Ghana
-       {   147,    13,   100,{ 25246,88 },{ 25246,88 },{ 418,27 },{ 25246,88 },{ 25246,88 },{ 418,27 }}, // Konkani/Devanagari/India
-       {   148,     7,    83,{ 370,48 },{ 370,48 },{ 418,27 },{ 370,48 },{ 370,48 },{ 418,27 }}, // Ga/Latin/Ghana
-       {   149,     7,   157,{ 25334,48 },{ 25382,87 },{ 25469,24 },{ 25334,48 },{ 25382,87 },{ 25469,24 }}, // Igbo/Latin/Nigeria
-       {   150,     7,   111,{ 25493,48 },{ 25541,189 },{ 25730,24 },{ 25493,48 },{ 25541,189 },{ 25730,24 }}, // Kamba/Latin/Kenya
-       {   151,    33,   103,{ 370,48 },{ 370,48 },{ 418,27 },{ 370,48 },{ 370,48 },{ 418,27 }}, // Syriac/Syriac/Iraq
-       {   152,    14,    67,{ 370,48 },{ 370,48 },{ 418,27 },{ 370,48 },{ 370,48 },{ 418,27 }}, // Blin/Ethiopic/Eritrea
-       {   153,    14,    69,{ 370,48 },{ 370,48 },{ 418,27 },{ 370,48 },{ 370,48 },{ 418,27 }}, // Geez/Ethiopic/Ethiopia
-       {   155,     7,    69,{ 370,48 },{ 370,48 },{ 418,27 },{ 370,48 },{ 370,48 },{ 418,27 }}, // Sidamo/Latin/Ethiopia
-       {   156,     7,   157,{ 370,48 },{ 370,48 },{ 418,27 },{ 370,48 },{ 370,48 },{ 418,27 }}, // Atsam/Latin/Nigeria
-       {   157,    14,    67,{ 370,48 },{ 370,48 },{ 418,27 },{ 370,48 },{ 370,48 },{ 418,27 }}, // Tigre/Ethiopic/Eritrea
-       {   158,     7,   157,{ 370,48 },{ 370,48 },{ 418,27 },{ 370,48 },{ 370,48 },{ 418,27 }}, // Jju/Latin/Nigeria
-       {   159,     7,   106,{ 25754,48 },{ 25802,77 },{ 25879,24 },{ 25754,48 },{ 25802,77 },{ 25879,24 }}, // Friulian/Latin/Italy
-       {   160,     7,   195,{ 370,48 },{ 370,48 },{ 418,27 },{ 370,48 },{ 370,48 },{ 418,27 }}, // Venda/Latin/South Africa
-       {   161,     7,    83,{ 25903,48 },{ 25951,87 },{ 26038,24 },{ 25903,48 },{ 25951,87 },{ 26038,24 }}, // Ewe/Latin/Ghana
-       {   161,     7,   212,{ 25903,48 },{ 25951,87 },{ 26038,24 },{ 25903,48 },{ 25951,87 },{ 26038,24 }}, // Ewe/Latin/Togo
-       {   162,    14,    69,{ 370,48 },{ 370,48 },{ 418,27 },{ 370,48 },{ 370,48 },{ 418,27 }}, // Walamo/Ethiopic/Ethiopia
-       {   163,     7,   225,{ 26062,59 },{ 26121,95 },{ 418,27 },{ 26062,59 },{ 26121,95 },{ 418,27 }}, // Hawaiian/Latin/United States
-       {   164,     7,   157,{ 370,48 },{ 370,48 },{ 418,27 },{ 370,48 },{ 370,48 },{ 418,27 }}, // Tyap/Latin/Nigeria
-       {   165,     7,   129,{ 370,48 },{ 370,48 },{ 418,27 },{ 370,48 },{ 370,48 },{ 418,27 }}, // Nyanja/Latin/Malawi
-       {   166,     7,   170,{ 26216,48 },{ 26264,88 },{ 26352,38 },{ 26216,48 },{ 26264,88 },{ 26216,48 }}, // Filipino/Latin/Philippines
-       {   167,     7,   206,{ 7630,48 },{ 26390,86 },{ 134,24 },{ 7630,48 },{ 26390,86 },{ 134,24 }}, // Swiss German/Latin/Switzerland
-       {   167,     7,    74,{ 7630,48 },{ 26390,86 },{ 134,24 },{ 7630,48 },{ 26390,86 },{ 134,24 }}, // Swiss German/Latin/France
-       {   167,     7,   123,{ 7630,48 },{ 26390,86 },{ 134,24 },{ 7630,48 },{ 26390,86 },{ 134,24 }}, // Swiss German/Latin/Liechtenstein
-       {   168,    34,    44,{ 26476,38 },{ 26476,38 },{ 418,27 },{ 26476,38 },{ 26476,38 },{ 418,27 }}, // Sichuan Yi/Yi/China
-       {   169,     7,   121,{ 370,48 },{ 370,48 },{ 418,27 },{ 370,48 },{ 370,48 },{ 418,27 }}, // Kpelle/Latin/Liberia
-       {   170,     7,    82,{ 26514,59 },{ 26573,85 },{ 134,24 },{ 26514,59 },{ 26573,85 },{ 134,24 }}, // Low German/Latin/Germany
-       {   170,     7,   151,{ 26514,59 },{ 26573,85 },{ 134,24 },{ 26514,59 },{ 26573,85 },{ 134,24 }}, // Low German/Latin/Netherlands
-       {   171,     7,   195,{ 370,48 },{ 370,48 },{ 418,27 },{ 370,48 },{ 370,48 },{ 418,27 }}, // South Ndebele/Latin/South Africa
-       {   172,     7,   195,{ 370,48 },{ 370,48 },{ 418,27 },{ 370,48 },{ 370,48 },{ 418,27 }}, // Northern Sotho/Latin/South Africa
-       {   173,     7,   161,{ 26658,59 },{ 26717,145 },{ 26862,24 },{ 26658,59 },{ 26717,145 },{ 26862,24 }}, // Northern Sami/Latin/Norway
-       {   173,     7,    73,{ 26886,60 },{ 26717,145 },{ 26862,24 },{ 26886,60 },{ 26717,145 },{ 26862,24 }}, // Northern Sami/Latin/Finland
-       {   173,     7,   205,{ 26658,59 },{ 26717,145 },{ 26862,24 },{ 26658,59 },{ 26717,145 },{ 26862,24 }}, // Northern Sami/Latin/Sweden
-       {   174,     7,   208,{ 370,48 },{ 370,48 },{ 418,27 },{ 370,48 },{ 370,48 },{ 418,27 }}, // Taroko/Latin/Taiwan
-       {   175,     7,   111,{ 26946,48 },{ 26994,88 },{ 27082,24 },{ 26946,48 },{ 26994,88 },{ 27082,24 }}, // Gusii/Latin/Kenya
-       {   176,     7,   111,{ 27106,48 },{ 27154,221 },{ 27375,24 },{ 27106,48 },{ 27154,221 },{ 27375,24 }}, // Taita/Latin/Kenya
-       {   177,     7,   187,{ 27399,48 },{ 27447,77 },{ 27524,24 },{ 27399,48 },{ 27447,77 },{ 27524,24 }}, // Fulah/Latin/Senegal
-       {   177,     7,    34,{ 27399,48 },{ 27447,77 },{ 27524,24 },{ 27399,48 },{ 27447,77 },{ 27524,24 }}, // Fulah/Latin/Burkina Faso
-       {   177,     7,    37,{ 27399,48 },{ 27447,77 },{ 27524,24 },{ 27399,48 },{ 27447,77 },{ 27524,24 }}, // Fulah/Latin/Cameroon
-       {   177,     7,    80,{ 27399,48 },{ 27447,77 },{ 27524,24 },{ 27399,48 },{ 27447,77 },{ 27524,24 }}, // Fulah/Latin/Gambia
-       {   177,     7,    83,{ 27399,48 },{ 27447,77 },{ 27524,24 },{ 27399,48 },{ 27447,77 },{ 27524,24 }}, // Fulah/Latin/Ghana
-       {   177,     7,    91,{ 27399,48 },{ 27447,77 },{ 27524,24 },{ 27399,48 },{ 27447,77 },{ 27524,24 }}, // Fulah/Latin/Guinea
-       {   177,     7,    92,{ 27399,48 },{ 27447,77 },{ 27524,24 },{ 27399,48 },{ 27447,77 },{ 27524,24 }}, // Fulah/Latin/Guinea Bissau
-       {   177,     7,   121,{ 27399,48 },{ 27447,77 },{ 27524,24 },{ 27399,48 },{ 27447,77 },{ 27524,24 }}, // Fulah/Latin/Liberia
-       {   177,     7,   136,{ 27399,48 },{ 27447,77 },{ 27524,24 },{ 27399,48 },{ 27447,77 },{ 27524,24 }}, // Fulah/Latin/Mauritania
-       {   177,     7,   156,{ 27399,48 },{ 27447,77 },{ 27524,24 },{ 27399,48 },{ 27447,77 },{ 27524,24 }}, // Fulah/Latin/Niger
-       {   177,     7,   157,{ 27399,48 },{ 27447,77 },{ 27524,24 },{ 27399,48 },{ 27447,77 },{ 27524,24 }}, // Fulah/Latin/Nigeria
-       {   177,     7,   189,{ 27399,48 },{ 27447,77 },{ 27524,24 },{ 27399,48 },{ 27447,77 },{ 27524,24 }}, // Fulah/Latin/Sierra Leone
-       {   177,   134,    91,{ 370,48 },{ 370,48 },{ 418,27 },{ 370,48 },{ 370,48 },{ 418,27 }}, // Fulah/Adlam/Guinea
-       {   178,     7,   111,{ 27548,48 },{ 27596,185 },{ 27781,24 },{ 27548,48 },{ 27596,185 },{ 27781,24 }}, // Kikuyu/Latin/Kenya
-       {   179,     7,   111,{ 27805,48 },{ 27853,173 },{ 28026,24 },{ 27805,48 },{ 27853,173 },{ 28026,24 }}, // Samburu/Latin/Kenya
-       {   180,     7,   146,{ 28050,48 },{ 28098,88 },{ 134,24 },{ 28050,48 },{ 28098,88 },{ 134,24 }}, // Sena/Latin/Mozambique
-       {   181,     7,   240,{ 28186,52 },{ 28238,112 },{ 28350,24 },{ 28186,52 },{ 28238,112 },{ 28350,24 }}, // North Ndebele/Latin/Zimbabwe
-       {   182,     7,   210,{ 28374,39 },{ 28413,194 },{ 28607,24 },{ 28374,39 },{ 28413,194 },{ 28607,24 }}, // Rombo/Latin/Tanzania
-       {   183,     9,   145,{ 28631,48 },{ 28679,81 },{ 28760,24 },{ 28631,48 },{ 28679,81 },{ 28760,24 }}, // Tachelhit/Tifinagh/Morocco
-       {   183,     7,   145,{ 28784,48 },{ 28832,81 },{ 28913,24 },{ 28784,48 },{ 28832,81 },{ 28913,24 }}, // Tachelhit/Latin/Morocco
-       {   184,     7,     3,{ 28937,48 },{ 28985,82 },{ 29067,24 },{ 29091,48 },{ 29139,84 },{ 29223,24 }}, // Kabyle/Latin/Algeria
-       {   185,     7,   221,{ 29247,48 },{ 29295,152 },{ 134,24 },{ 29247,48 },{ 29295,152 },{ 134,24 }}, // Nyankole/Latin/Uganda
-       {   186,     7,   210,{ 29447,48 },{ 29495,254 },{ 29749,24 },{ 29447,48 },{ 29495,254 },{ 29749,24 }}, // Bena/Latin/Tanzania
-       {   187,     7,   210,{ 19326,48 },{ 29773,87 },{ 134,24 },{ 19326,48 },{ 29773,87 },{ 134,24 }}, // Vunjo/Latin/Tanzania
-       {   188,     7,   132,{ 29860,47 },{ 29907,92 },{ 29999,24 },{ 29860,47 },{ 29907,92 },{ 29999,24 }}, // Bambara/Latin/Mali
-       {   188,    75,   132,{ 370,48 },{ 370,48 },{ 418,27 },{ 370,48 },{ 370,48 },{ 418,27 }}, // Bambara/Nko/Mali
-       {   189,     7,   111,{ 30023,48 },{ 30071,207 },{ 30278,24 },{ 30023,48 },{ 30071,207 },{ 30278,24 }}, // Embu/Latin/Kenya
-       {   190,    12,   225,{ 30302,36 },{ 30338,58 },{ 30396,24 },{ 30302,36 },{ 30338,58 },{ 30396,24 }}, // Cherokee/Cherokee/United States
-       {   191,     7,   137,{ 30420,47 },{ 30467,68 },{ 30535,24 },{ 30420,47 },{ 30467,68 },{ 30535,24 }}, // Morisyen/Latin/Mauritius
-       {   192,     7,   210,{ 19326,48 },{ 30559,264 },{ 134,24 },{ 19326,48 },{ 30559,264 },{ 134,24 }}, // Makonde/Latin/Tanzania
-       {   193,     7,   210,{ 30823,83 },{ 30906,111 },{ 31017,24 },{ 30823,83 },{ 30906,111 },{ 31017,24 }}, // Langi/Latin/Tanzania
-       {   194,     7,   221,{ 31041,48 },{ 31089,97 },{ 134,24 },{ 31041,48 },{ 31089,97 },{ 134,24 }}, // Ganda/Latin/Uganda
-       {   195,     7,   239,{ 31186,48 },{ 31234,83 },{ 31317,24 },{ 31186,48 },{ 31234,83 },{ 31317,24 }}, // Bemba/Latin/Zambia
-       {   196,     7,    39,{ 31341,48 },{ 31389,85 },{ 134,24 },{ 31341,48 },{ 31389,85 },{ 134,24 }}, // Kabuverdianu/Latin/Cape Verde
-       {   197,     7,   111,{ 31474,48 },{ 31522,86 },{ 31608,24 },{ 31474,48 },{ 31522,86 },{ 31608,24 }}, // Meru/Latin/Kenya
-       {   198,     7,   111,{ 31632,49 },{ 31681,121 },{ 31802,24 },{ 31632,49 },{ 31681,121 },{ 31802,24 }}, // Kalenjin/Latin/Kenya
-       {   199,     7,   148,{ 0,48 },{ 31826,136 },{ 134,24 },{ 0,48 },{ 31826,136 },{ 134,24 }}, // Nama/Latin/Namibia
-       {   200,     7,   210,{ 19326,48 },{ 29773,87 },{ 134,24 },{ 19326,48 },{ 29773,87 },{ 134,24 }}, // Machame/Latin/Tanzania
-       {   201,     7,    82,{ 31962,59 },{ 32021,87 },{ 13137,24 },{ 32108,48 },{ 32021,87 },{ 13137,24 }}, // Colognian/Latin/Germany
-       {   202,     7,   111,{ 32156,51 },{ 32207,132 },{ 418,27 },{ 32156,51 },{ 32207,132 },{ 418,27 }}, // Masai/Latin/Kenya
-       {   202,     7,   210,{ 32156,51 },{ 32207,132 },{ 418,27 },{ 32156,51 },{ 32207,132 },{ 418,27 }}, // Masai/Latin/Tanzania
-       {   203,     7,   221,{ 31041,48 },{ 31089,97 },{ 134,24 },{ 31041,48 },{ 31089,97 },{ 134,24 }}, // Soga/Latin/Uganda
-       {   204,     7,   111,{ 32339,48 },{ 19374,84 },{ 134,24 },{ 32339,48 },{ 19374,84 },{ 134,24 }}, // Luyia/Latin/Kenya
-       {   205,     7,   210,{ 32387,48 },{ 19374,84 },{ 134,24 },{ 32387,48 },{ 19374,84 },{ 134,24 }}, // Asu/Latin/Tanzania
-       {   206,     7,   221,{ 32435,48 },{ 32483,94 },{ 32577,24 },{ 32435,48 },{ 32483,94 },{ 32577,24 }}, // Teso/Latin/Uganda
-       {   206,     7,   111,{ 32435,48 },{ 32483,94 },{ 32577,24 },{ 32435,48 },{ 32483,94 },{ 32577,24 }}, // Teso/Latin/Kenya
-       {   207,     7,    67,{ 370,48 },{ 370,48 },{ 418,27 },{ 370,48 },{ 370,48 },{ 418,27 }}, // Saho/Latin/Eritrea
-       {   208,     7,   132,{ 32601,46 },{ 32647,88 },{ 32735,24 },{ 32601,46 },{ 32647,88 },{ 32735,24 }}, // Koyra Chiini/Latin/Mali
-       {   209,     7,   210,{ 19326,48 },{ 29773,87 },{ 134,24 },{ 19326,48 },{ 29773,87 },{ 134,24 }}, // Rwa/Latin/Tanzania
-       {   210,     7,   111,{ 32759,48 },{ 32807,186 },{ 32993,24 },{ 32759,48 },{ 32807,186 },{ 32993,24 }}, // Luo/Latin/Kenya
-       {   211,     7,   221,{ 29247,48 },{ 29295,152 },{ 134,24 },{ 29247,48 },{ 29295,152 },{ 134,24 }}, // Chiga/Latin/Uganda
-       {   212,     7,   145,{ 33017,48 },{ 33065,86 },{ 33151,24 },{ 33017,48 },{ 33065,86 },{ 33151,24 }}, // Central Morocco Tamazight/Latin/Morocco
-       {   213,     7,   132,{ 32601,46 },{ 32647,88 },{ 32735,24 },{ 32601,46 },{ 32647,88 },{ 32735,24 }}, // Koyraboro Senni/Latin/Mali
-       {   214,     7,   210,{ 19326,48 },{ 33175,84 },{ 134,24 },{ 19326,48 },{ 33175,84 },{ 134,24 }}, // Shambala/Latin/Tanzania
-       {   215,    13,   100,{ 33259,88 },{ 33259,88 },{ 33347,31 },{ 33259,88 },{ 33259,88 },{ 33347,31 }}, // Bodo/Devanagari/India
-       {   218,     2,   178,{ 22154,48 },{ 11286,80 },{ 11203,24 },{ 22154,48 },{ 11286,80 },{ 11203,24 }}, // Chechen/Cyrillic/Russia
-       {   219,     2,   178,{ 33378,65 },{ 33443,117 },{ 33560,30 },{ 33378,65 },{ 33590,117 },{ 33560,30 }}, // Church/Cyrillic/Russia
-       {   220,     2,   178,{ 370,48 },{ 370,48 },{ 418,27 },{ 370,48 },{ 370,48 },{ 418,27 }}, // Chuvash/Cyrillic/Russia
-       {   230,     7,    49,{ 33707,49 },{ 33756,99 },{ 33855,24 },{ 33707,49 },{ 33756,99 },{ 33855,24 }}, // Luba Katanga/Latin/Congo Kinshasa
-       {   231,     7,   125,{ 33879,48 },{ 33927,85 },{ 134,24 },{ 34012,59 },{ 33927,85 },{ 134,24 }}, // Luxembourgish/Latin/Luxembourg
-       {   236,     7,    21,{ 370,48 },{ 370,48 },{ 418,27 },{ 370,48 },{ 370,48 },{ 418,27 }}, // Walloon/Latin/Belgium
-       {   237,     7,    37,{ 34071,48 },{ 34119,195 },{ 34314,24 },{ 34071,48 },{ 34119,195 },{ 34314,24 }}, // Aghem/Latin/Cameroon
-       {   238,     7,    37,{ 34338,48 },{ 34386,90 },{ 34476,24 },{ 34338,48 },{ 34386,90 },{ 34476,24 }}, // Basaa/Latin/Cameroon
-       {   239,     7,   156,{ 32601,46 },{ 32647,88 },{ 32735,24 },{ 32601,46 },{ 32647,88 },{ 32735,24 }}, // Zarma/Latin/Niger
-       {   240,     7,    37,{ 34500,49 },{ 34549,99 },{ 34648,24 },{ 34500,49 },{ 34549,99 },{ 34648,24 }}, // Duala/Latin/Cameroon
-       {   241,     7,   187,{ 34672,36 },{ 34708,82 },{ 34790,24 },{ 34672,36 },{ 34708,82 },{ 34790,24 }}, // Jola Fonyi/Latin/Senegal
-       {   242,     7,    37,{ 34814,50 },{ 34864,141 },{ 35005,24 },{ 34814,50 },{ 34864,141 },{ 35005,24 }}, // Ewondo/Latin/Cameroon
-       {   243,     7,    37,{ 35029,39 },{ 35068,191 },{ 418,27 },{ 35029,39 },{ 35068,191 },{ 418,27 }}, // Bafia/Latin/Cameroon
-       {   244,     7,   146,{ 35259,48 },{ 35307,213 },{ 35520,24 },{ 35259,48 },{ 35307,213 },{ 35520,24 }}, // Makhuwa Meetto/Latin/Mozambique
-       {   245,     7,    37,{ 35544,48 },{ 35592,139 },{ 35731,24 },{ 35544,48 },{ 35592,139 },{ 35731,24 }}, // Mundang/Latin/Cameroon
-       {   246,     7,    37,{ 35755,51 },{ 35806,143 },{ 418,27 },{ 35755,51 },{ 35806,143 },{ 418,27 }}, // Kwasio/Latin/Cameroon
-       {   247,     7,   254,{ 35949,54 },{ 36003,96 },{ 36099,24 },{ 35949,54 },{ 36003,96 },{ 36099,24 }}, // Nuer/Latin/South Sudan
-       {   248,     2,   178,{ 36123,50 },{ 36173,116 },{ 36289,24 },{ 36123,50 },{ 36313,121 },{ 36289,24 }}, // Sakha/Cyrillic/Russia
-       {   249,     7,   210,{ 36434,48 },{ 36482,117 },{ 418,27 },{ 36434,48 },{ 36482,117 },{ 418,27 }}, // Sangu/Latin/Tanzania
-       {   251,     7,   156,{ 32601,46 },{ 32647,88 },{ 32735,24 },{ 32601,46 },{ 32647,88 },{ 32735,24 }}, // Tasawaq/Latin/Niger
-       {   252,    35,   121,{ 36599,38 },{ 36637,61 },{ 418,27 },{ 36599,38 },{ 36637,61 },{ 418,27 }}, // Vai/Vai/Liberia
-       {   252,     7,   121,{ 36698,81 },{ 36698,81 },{ 418,27 },{ 36698,81 },{ 36698,81 },{ 418,27 }}, // Vai/Latin/Liberia
-       {   253,     7,   206,{ 36779,48 },{ 36827,99 },{ 36926,24 },{ 36779,48 },{ 36827,99 },{ 36926,24 }}, // Walser/Latin/Switzerland
-       {   254,     7,    37,{ 36950,51 },{ 37001,191 },{ 418,27 },{ 36950,51 },{ 37001,191 },{ 418,27 }}, // Yangben/Latin/Cameroon
-       {   256,     7,   197,{ 37192,48 },{ 37240,85 },{ 37325,24 },{ 37349,48 },{ 37397,117 },{ 37325,24 }}, // Asturian/Latin/Spain
-       {   257,     7,    37,{ 37514,174 },{ 37514,174 },{ 418,27 },{ 37514,174 },{ 37514,174 },{ 418,27 }}, // Ngomba/Latin/Cameroon
-       {   258,     7,    37,{ 37688,102 },{ 37688,102 },{ 418,27 },{ 37688,102 },{ 37688,102 },{ 418,27 }}, // Kako/Latin/Cameroon
-       {   259,     7,    37,{ 37790,137 },{ 37927,142 },{ 38069,36 },{ 37790,137 },{ 37927,142 },{ 38069,36 }}, // Meta/Latin/Cameroon
-       {   260,     7,    37,{ 38105,165 },{ 38105,165 },{ 418,27 },{ 38105,165 },{ 38105,165 },{ 418,27 }}, // Ngiemboon/Latin/Cameroon
-       {   261,     7,   197,{ 370,48 },{ 370,48 },{ 418,27 },{ 370,48 },{ 370,48 },{ 418,27 }}, // Aragonese/Latin/Spain
-       {   290,    11,   100,{ 370,48 },{ 370,48 },{ 418,27 },{ 370,48 },{ 370,48 },{ 418,27 }}, // Manipuri/Bengali/India
-       {   309,   100,   232,{ 370,48 },{ 370,48 },{ 418,27 },{ 370,48 },{ 370,48 },{ 418,27 }}, // Tai Dam/Tai Viet/Vietnam
-       {   312,     7,    37,{ 370,48 },{ 370,48 },{ 418,27 },{ 370,48 },{ 370,48 },{ 418,27 }}, // Akoose/Latin/Cameroon
-       {   313,     7,   225,{ 38270,180 },{ 38270,180 },{ 418,27 },{ 38270,180 },{ 38270,180 },{ 418,27 }}, // Lakota/Latin/United States
-       {   314,     9,   145,{ 28631,48 },{ 28679,81 },{ 28760,24 },{ 28631,48 },{ 28679,81 },{ 28760,24 }}, // Standard Moroccan Tamazight/Tifinagh/Morocco
-       {   315,     7,    43,{ 370,48 },{ 370,48 },{ 418,27 },{ 370,48 },{ 370,48 },{ 418,27 }}, // Mapuche/Latin/Chile
-       {   316,     1,   103,{ 38450,105 },{ 38450,105 },{ 38555,24 },{ 38450,105 },{ 38450,105 },{ 38555,24 }}, // Central Kurdish/Arabic/Iraq
-       {   316,     1,   102,{ 38450,105 },{ 38450,105 },{ 38555,24 },{ 38450,105 },{ 38450,105 },{ 38555,24 }}, // Central Kurdish/Arabic/Iran
-       {   317,     7,    82,{ 38579,48 },{ 38627,85 },{ 9887,24 },{ 38712,60 },{ 38772,93 },{ 9887,24 }}, // Lower Sorbian/Latin/Germany
-       {   318,     7,    82,{ 38865,48 },{ 38913,86 },{ 9887,24 },{ 38999,60 },{ 39059,93 },{ 9887,24 }}, // Upper Sorbian/Latin/Germany
-       {   319,     7,    37,{ 370,48 },{ 370,48 },{ 418,27 },{ 370,48 },{ 370,48 },{ 418,27 }}, // Kenyang/Latin/Cameroon
-       {   320,     7,    38,{ 370,48 },{ 370,48 },{ 418,27 },{ 370,48 },{ 370,48 },{ 418,27 }}, // Mohawk/Latin/Canada
-       {   321,    75,    91,{ 370,48 },{ 370,48 },{ 418,27 },{ 370,48 },{ 370,48 },{ 418,27 }}, // Nko/Nko/Guinea
-       {   322,     7,   260,{ 39152,48 },{ 39200,91 },{ 39291,24 },{ 39152,48 },{ 39200,91 },{ 39291,24 }}, // Prussian/Latin/World
-       {   323,     7,    90,{ 370,48 },{ 370,48 },{ 418,27 },{ 370,48 },{ 370,48 },{ 418,27 }}, // Kiche/Latin/Guatemala
-       {   324,     7,   205,{ 370,48 },{ 370,48 },{ 418,27 },{ 370,48 },{ 370,48 },{ 418,27 }}, // Southern Sami/Latin/Sweden
-       {   325,     7,   205,{ 370,48 },{ 370,48 },{ 418,27 },{ 370,48 },{ 370,48 },{ 418,27 }}, // Lule Sami/Latin/Sweden
-       {   326,     7,    73,{ 39315,77 },{ 39392,140 },{ 39532,25 },{ 39315,77 },{ 39392,140 },{ 39532,25 }}, // Inari Sami/Latin/Finland
-       {   327,     7,    73,{ 370,48 },{ 370,48 },{ 418,27 },{ 370,48 },{ 370,48 },{ 418,27 }}, // Skolt Sami/Latin/Finland
-       {   328,     7,    13,{ 370,48 },{ 370,48 },{ 418,27 },{ 370,48 },{ 370,48 },{ 418,27 }}, // Warlpiri/Latin/Australia
-       {   346,     1,   102,{ 15079,70 },{ 15079,70 },{ 418,27 },{ 15079,70 },{ 15079,70 },{ 418,27 }}, // Mazanderani/Arabic/Iran
-       {   349,     1,   102,{ 39557,77 },{ 39557,77 },{ 418,27 },{ 39557,77 },{ 39557,77 },{ 418,27 }}, // Northern Luri/Arabic/Iran
-       {   349,     1,   103,{ 39557,77 },{ 39557,77 },{ 418,27 },{ 39557,77 },{ 39557,77 },{ 418,27 }}, // Northern Luri/Arabic/Iraq
-       {   357,     6,    97,{ 4452,39 },{ 4452,39 },{ 418,27 },{ 4452,39 },{ 4452,39 },{ 418,27 }}, // Cantonese/Traditional Han/Hong Kong
-       {   357,     5,    44,{ 4452,39 },{ 4491,38 },{ 418,27 },{ 4452,39 },{ 4491,38 },{ 418,27 }}, // Cantonese/Simplified Han/China
-       {   358,   138,   225,{ 370,48 },{ 370,48 },{ 418,27 },{ 370,48 },{ 370,48 },{ 418,27 }}, // Osage/Osage/United States
-       {   360,     7,   260,{ 370,48 },{ 370,48 },{ 418,27 },{ 370,48 },{ 370,48 },{ 418,27 }}, // Ido/Latin/World
-       {   361,     7,   260,{ 370,48 },{ 370,48 },{ 418,27 },{ 370,48 },{ 370,48 },{ 418,27 }}, // Lojban/Latin/World
-       {   362,     7,   106,{ 370,48 },{ 370,48 },{ 418,27 },{ 370,48 },{ 370,48 },{ 418,27 }}, // Sicilian/Latin/Italy
-       {   363,     1,   102,{ 370,48 },{ 370,48 },{ 418,27 },{ 370,48 },{ 370,48 },{ 418,27 }}, // Southern Kurdish/Arabic/Iran
-       {   364,     1,   163,{ 370,48 },{ 370,48 },{ 418,27 },{ 370,48 },{ 370,48 },{ 418,27 }}, // Western Balochi/Arabic/Pakistan
-       {   365,     7,   170,{ 39634,46 },{ 26264,88 },{ 39680,24 },{ 39634,46 },{ 26264,88 },{ 39680,24 }}, // Cebuano/Latin/Philippines
-       {   366,     2,   178,{ 370,48 },{ 370,48 },{ 418,27 },{ 370,48 },{ 370,48 },{ 418,27 }}, // Erzya/Cyrillic/Russia
-       {   367,     7,   225,{ 370,48 },{ 370,48 },{ 418,27 },{ 370,48 },{ 370,48 },{ 418,27 }}, // Chickasaw/Latin/United States
-       {   368,     7,   225,{ 370,48 },{ 370,48 },{ 418,27 },{ 370,48 },{ 370,48 },{ 418,27 }}, // Muscogee/Latin/United States
-       {   369,     7,   172,{ 370,48 },{ 370,48 },{ 418,27 },{ 370,48 },{ 370,48 },{ 418,27 }}, // Silesian/Latin/Poland
-       {     0,     0,     0,{  0,0},{  0,0},{  0,0},{  0,0},{  0,0},{  0,0}}, // trailing zeros
+   //  lang   script terr  sLng long sSrt shrt sNrw naro Sizes...
+      {     1,     0,     0,    0,    0,   85,   85,  132,  155, 85, 85, 47, 47, 23, 26 },// C/AnyScript/AnyCountry
+      {     3,     7,    69,  181,  181,  291,  291,  132,  132,110,110, 47, 47, 23, 23 },// Oromo/Latin/Ethiopia
+      {     3,     7,   111,  181,  181,  291,  291,  338,  132,110,110, 47, 47, 23, 23 },// Oromo/Latin/Kenya
+      {     4,     7,    69,  361,  361,  361,  361,  155,  155, 47, 47, 47, 47, 26, 26 },// Afar/Latin/Ethiopia
+      {     5,     7,   195,  408,  408,  499,  499,  132,  132, 91, 91, 58, 58, 23, 23 },// Afrikaans/Latin/South Africa
+      {     5,     7,   148,  408,  408,  499,  499,  132,  132, 91, 91, 58, 58, 23, 23 },// Afrikaans/Latin/Namibia
+      {     6,     7,     2,  557,  557,  634,  634,  683,  683, 77, 77, 49, 49, 26, 26 },// Albanian/Latin/Albania
+      {     6,     7,   127,  557,  557,  634,  634,  683,  683, 77, 77, 49, 49, 26, 26 },// Albanian/Latin/Macedonia
+      {     6,     7,   257,  557,  557,  634,  634,  683,  683, 77, 77, 49, 49, 26, 26 },// Albanian/Latin/Kosovo
+      {     7,    14,    69,  709,  709,  769,  769,  814,  814, 60, 60, 45, 45, 23, 23 },// Amharic/Ethiopic/Ethiopia
+      {     8,     1,    64,  837,  837,  837,  837,  911,  911, 74, 74, 74, 74, 23, 23 },// Arabic/Arabic/Egypt
+      {     8,     1,     3,  934,  934,  934,  934, 1004, 1004, 70, 70, 70, 70, 23, 23 },// Arabic/Arabic/Algeria
+      {     8,     1,    17,  837,  837,  837,  837,  911,  911, 74, 74, 74, 74, 23, 23 },// Arabic/Arabic/Bahrain
+      {     8,     1,    42,  837,  837,  837,  837,  911,  911, 74, 74, 74, 74, 23, 23 },// Arabic/Arabic/Chad
+      {     8,     1,    48,  837,  837,  837,  837,  911,  911, 74, 74, 74, 74, 23, 23 },// Arabic/Arabic/Comoros
+      {     8,     1,    59,  837,  837,  837,  837,  911,  911, 74, 74, 74, 74, 23, 23 },// Arabic/Arabic/Djibouti
+      {     8,     1,    67,  837,  837,  837,  837,  911,  911, 74, 74, 74, 74, 23, 23 },// Arabic/Arabic/Eritrea
+      {     8,     1,   103, 1027, 1027, 1027, 1118, 1209, 1209, 91, 91, 91, 91, 23, 23 },// Arabic/Arabic/Iraq
+      {     8,     1,   105,  837,  837,  837,  837,  911,  911, 74, 74, 74, 74, 23, 23 },// Arabic/Arabic/Israel
+      {     8,     1,   109, 1027, 1027, 1027, 1027, 1209, 1209, 91, 91, 91, 91, 23, 23 },// Arabic/Arabic/Jordan
+      {     8,     1,   115,  837,  837,  837,  837,  911,  911, 74, 74, 74, 74, 23, 23 },// Arabic/Arabic/Kuwait
+      {     8,     1,   119, 1027, 1027, 1027, 1027, 1209, 1209, 91, 91, 91, 91, 23, 23 },// Arabic/Arabic/Lebanon
+      {     8,     1,   122,  837,  837,  837,  837,  911,  911, 74, 74, 74, 74, 23, 23 },// Arabic/Arabic/Libya
+      {     8,     1,   136, 1232, 1232, 1232, 1232, 1303, 1303, 71, 71, 71, 71, 23, 23 },// Arabic/Arabic/Mauritania
+      {     8,     1,   145, 1326, 1326, 1326, 1326, 1395, 1395, 69, 69, 69, 69, 23, 23 },// Arabic/Arabic/Morocco
+      {     8,     1,   162,  837,  837,  837,  837,  911,  911, 74, 74, 74, 74, 23, 23 },// Arabic/Arabic/Oman
+      {     8,     1,   165, 1027, 1027, 1027, 1027, 1209, 1209, 91, 91, 91, 91, 23, 23 },// Arabic/Arabic/Palestinian Territories
+      {     8,     1,   175,  837,  837,  837,  837,  911,  911, 74, 74, 74, 74, 23, 23 },// Arabic/Arabic/Qatar
+      {     8,     1,   186,  837,  837,  837,  837,  911,  911, 74, 74, 74, 74, 23, 23 },// Arabic/Arabic/Saudi Arabia
+      {     8,     1,   194,  837,  837,  837,  837,  911,  911, 74, 74, 74, 74, 23, 23 },// Arabic/Arabic/Somalia
+      {     8,     1,   201,  837,  837,  837,  837,  911,  911, 74, 74, 74, 74, 23, 23 },// Arabic/Arabic/Sudan
+      {     8,     1,   207, 1027, 1027, 1027, 1027, 1209, 1209, 91, 91, 91, 91, 23, 23 },// Arabic/Arabic/Syria
+      {     8,     1,   216,  934,  934,  934,  934, 1004, 1004, 70, 70, 70, 70, 23, 23 },// Arabic/Arabic/Tunisia
+      {     8,     1,   223,  837,  837,  837,  837,  911,  911, 74, 74, 74, 74, 23, 23 },// Arabic/Arabic/United Arab Emirates
+      {     8,     1,   236,  837,  837,  837,  837,  911,  911, 74, 74, 74, 74, 23, 23 },// Arabic/Arabic/Western Sahara
+      {     8,     1,   237,  837,  837,  837,  837,  911,  911, 74, 74, 74, 74, 23, 23 },// Arabic/Arabic/Yemen
+      {     8,     1,   254,  837,  837,  837,  837,  911,  911, 74, 74, 74, 74, 23, 23 },// Arabic/Arabic/South Sudan
+      {     8,     1,   260,  837,  837,  837,  837,  911,  911, 74, 74, 74, 74, 23, 23 },// Arabic/Arabic/World
+      {     9,    10,    11, 1418, 1511, 1616, 1616, 1663, 1663, 93,105, 47, 47, 23, 23 },// Armenian/Armenian/Armenia
+      {    10,    11,   100, 1686, 1686, 1774, 1774, 1837, 1837, 88, 88, 63, 63, 23, 23 },// Assamese/Bengali/India
+      {    12,     7,    15, 1860, 1936, 2012, 2012,  155,  155, 76, 76, 47, 47, 26, 26 },// Azerbaijani/Latin/Azerbaijan
+      {    12,     1,   102,  361,  361,  361,  361,  155,  155, 47, 47, 47, 47, 26, 26 },// Azerbaijani/Arabic/Iran
+      {    12,     2,    15, 2059, 2135, 2211, 2211,  155,  155, 76, 76, 47, 47, 26, 26 },// Azerbaijani/Cyrillic/Azerbaijan
+      {    13,     2,   178,  361,  361,  361,  361,  155,  155, 47, 47, 47, 47, 26, 26 },// Bashkir/Cyrillic/Russia
+      {    14,     7,   197, 2258, 2258, 2350, 2350, 2409, 2409, 92, 92, 59, 59, 23, 23 },// Basque/Latin/Spain
+      {    15,    11,    18, 2432, 2432, 2432, 2521, 2597, 2597, 89, 89, 89, 76, 32, 32 },// Bengali/Bengali/Bangladesh
+      {    15,    11,   100, 2432, 2432, 2432, 2521, 2597, 2597, 89, 89, 89, 76, 32, 32 },// Bengali/Bengali/India
+      {    16,    31,    25, 2629, 2819, 2950, 3012, 3038, 3064,190,131, 62, 26, 26, 26 },// Dzongkha/Tibetan/Bhutan
+      {    19,     7,    74, 3090, 3090, 3167, 3167, 3229, 3229, 77, 77, 62, 62, 35, 35 },// Breton/Latin/France
+      {    20,     2,    33, 3264, 3264, 3345, 3345, 3393, 3393, 81, 81, 48, 48, 23, 23 },// Bulgarian/Cyrillic/Bulgaria
+      {    21,    25,   147, 3416, 3416, 3503, 3503, 3545, 3545, 87, 87, 42, 42, 23, 23 },// Burmese/Myanmar/Myanmar
+      {    22,     2,    20, 3568, 3662, 3759, 3806, 3853, 3853, 94, 97, 47, 47, 23, 23 },// Belarusian/Cyrillic/Belarus
+      {    23,    20,    36, 3876, 3876, 3876, 3876, 3946, 3946, 70, 70, 70, 70, 23, 23 },// Khmer/Khmer/Cambodia
+      {    24,     7,   197, 3969, 4050, 4164, 4223, 4315, 4315, 81,114, 59, 92, 35, 35 },// Catalan/Latin/Spain
+      {    24,     7,     5, 3969, 4050, 4164, 4223, 4315, 4315, 81,114, 59, 92, 35, 35 },// Catalan/Latin/Andorra
+      {    24,     7,    74, 3969, 4050, 4164, 4223, 4315, 4315, 81,114, 59, 92, 35, 35 },// Catalan/Latin/France
+      {    24,     7,   106, 3969, 4050, 4164, 4223, 4315, 4315, 81,114, 59, 92, 35, 35 },// Catalan/Latin/Italy
+      {    25,     5,    44, 4350, 4350, 4387, 4387,  155,  155, 37, 37, 38, 38, 26, 26 },// Chinese/Simplified Han/China
+      {    25,     5,    97, 4350, 4350, 4387, 4387,  155,  155, 37, 37, 38, 38, 26, 26 },// Chinese/Simplified Han/Hong Kong
+      {    25,     5,   126, 4350, 4350, 4387, 4387,  155,  155, 37, 37, 38, 38, 26, 26 },// Chinese/Simplified Han/Macau
+      {    25,     5,   190, 4350, 4350, 4387, 4387,  155,  155, 37, 37, 38, 38, 26, 26 },// Chinese/Simplified Han/Singapore
+      {    25,     6,    97, 4387, 4387, 4387, 4387,  155,  155, 38, 38, 38, 38, 26, 26 },// Chinese/Traditional Han/Hong Kong
+      {    25,     6,   126, 4387, 4387, 4387, 4387,  155,  155, 38, 38, 38, 38, 26, 26 },// Chinese/Traditional Han/Macau
+      {    25,     6,   208, 4387, 4387, 4387, 4387,  155,  155, 38, 38, 38, 38, 26, 26 },// Chinese/Traditional Han/Taiwan
+      {    26,     7,    74,  361,  361,  361,  361,  155,  155, 47, 47, 47, 47, 26, 26 },// Corsican/Latin/France
+      {    27,     7,    54, 4425, 4518, 4615, 4615, 4663, 4663, 93, 97, 48, 48, 38, 38 },// Croatian/Latin/Croatia
+      {    27,     7,    27, 4425, 4518, 4615, 4615, 4663, 4663, 93, 97, 48, 48, 38, 38 },// Croatian/Latin/Bosnia And Herzegowina
+      {    28,     7,    57, 4701, 4782, 4865, 4865,  155,  155, 81, 83, 47, 47, 26, 26 },// Czech/Latin/Czech Republic
+      {    29,     7,    58, 4912, 4912, 4995, 4995,  132,  132, 83, 83, 58, 58, 23, 23 },// Danish/Latin/Denmark
+      {    29,     7,    86, 4912, 4912, 4995, 4995,  132,  132, 83, 83, 58, 58, 23, 23 },// Danish/Latin/Greenland
+      {    30,     7,   151, 5053, 5053, 5140, 5140,  132,  132, 87, 87, 58, 58, 23, 23 },// Dutch/Latin/Netherlands
+      {    30,     7,    12, 5053, 5053, 5140, 5140,  132,  132, 87, 87, 58, 58, 23, 23 },// Dutch/Latin/Aruba
+      {    30,     7,    21, 5053, 5053, 5140, 5140,  132,  132, 87, 87, 58, 58, 23, 23 },// Dutch/Latin/Belgium
+      {    30,     7,   152, 5053, 5053, 5140, 5140,  132,  132, 87, 87, 58, 58, 23, 23 },// Dutch/Latin/Cura Sao
+      {    30,     7,   202, 5053, 5053, 5140, 5140,  132,  132, 87, 87, 58, 58, 23, 23 },// Dutch/Latin/Suriname
+      {    30,     7,   255, 5053, 5053, 5140, 5140,  132,  132, 87, 87, 58, 58, 23, 23 },// Dutch/Latin/Bonaire
+      {    30,     7,   256, 5053, 5053, 5140, 5140,  132,  132, 87, 87, 58, 58, 23, 23 },// Dutch/Latin/Sint Maarten
+      {    31,     7,   225,    0,    0,   85,   85,  132,  132, 85, 85, 47, 47, 23, 23 },// English/Latin/United States
+      {    31,     3,   225,  361,  361,  361,  361,  155,  155, 47, 47, 47, 47, 26, 26 },// English/Deseret/United States
+      {    31,     7,     4,    0,    0,   85,   85,  132,  132, 85, 85, 47, 47, 23, 23 },// English/Latin/American Samoa
+      {    31,     7,     7,    0,    0,   85,   85,  132,  132, 85, 85, 47, 47, 23, 23 },// English/Latin/Anguilla
+      {    31,     7,     9,    0,    0,   85,   85,  132,  132, 85, 85, 47, 47, 23, 23 },// English/Latin/Antigua And Barbuda
+      {    31,     7,    13,    0,    0,   85,   85,  132,  132, 85, 85, 47, 47, 23, 23 },// English/Latin/Australia
+      {    31,     7,    14,    0,    0,   85,   85,  132,  132, 85, 85, 47, 47, 23, 23 },// English/Latin/Austria
+      {    31,     7,    16,    0,    0,   85,   85,  132,  132, 85, 85, 47, 47, 23, 23 },// English/Latin/Bahamas
+      {    31,     7,    19,    0,    0,   85,   85,  132,  132, 85, 85, 47, 47, 23, 23 },// English/Latin/Barbados
+      {    31,     7,    21,    0,    0,   85,   85,  132,  132, 85, 85, 47, 47, 23, 23 },// English/Latin/Belgium
+      {    31,     7,    22,    0,    0,   85,   85,  132,  132, 85, 85, 47, 47, 23, 23 },// English/Latin/Belize
+      {    31,     7,    24,    0,    0,   85,   85,  132,  132, 85, 85, 47, 47, 23, 23 },// English/Latin/Bermuda
+      {    31,     7,    28,    0,    0,   85,   85,  132,  132, 85, 85, 47, 47, 23, 23 },// English/Latin/Botswana
+      {    31,     7,    31,    0,    0,   85,   85,  132,  132, 85, 85, 47, 47, 23, 23 },// English/Latin/British Indian Ocean Territory
+      {    31,     7,    35,    0,    0,   85,   85,  132,  132, 85, 85, 47, 47, 23, 23 },// English/Latin/Burundi
+      {    31,     7,    37,    0,    0,   85,   85,  132,  132, 85, 85, 47, 47, 23, 23 },// English/Latin/Cameroon
+      {    31,     7,    38,    0,    0, 5198, 5198,  132,  132, 85, 85, 58, 58, 23, 23 },// English/Latin/Canada
+      {    31,     7,    40,    0,    0,   85,   85,  132,  132, 85, 85, 47, 47, 23, 23 },// English/Latin/Cayman Islands
+      {    31,     7,    45,    0,    0,   85,   85,  132,  132, 85, 85, 47, 47, 23, 23 },// English/Latin/Christmas Island
+      {    31,     7,    46,    0,    0,   85,   85,  132,  132, 85, 85, 47, 47, 23, 23 },// English/Latin/Cocos Islands
+      {    31,     7,    51,    0,    0,   85,   85,  132,  132, 85, 85, 47, 47, 23, 23 },// English/Latin/Cook Islands
+      {    31,     7,    56,    0,    0,   85,   85,  132,  132, 85, 85, 47, 47, 23, 23 },// English/Latin/Cyprus
+      {    31,     7,    58,    0,    0,   85,   85,  132,  132, 85, 85, 47, 47, 23, 23 },// English/Latin/Denmark
+      {    31,     7,    60,    0,    0,   85,   85,  132,  132, 85, 85, 47, 47, 23, 23 },// English/Latin/Dominica
+      {    31,     7,    67,    0,    0,   85,   85,  132,  132, 85, 85, 47, 47, 23, 23 },// English/Latin/Eritrea
+      {    31,     7,    70,    0,    0,   85,   85,  132,  132, 85, 85, 47, 47, 23, 23 },// English/Latin/Falkland Islands
+      {    31,     7,    72,    0,    0,   85,   85,  132,  132, 85, 85, 47, 47, 23, 23 },// English/Latin/Fiji
+      {    31,     7,    73,    0,    0,   85,   85,  132,  132, 85, 85, 47, 47, 23, 23 },// English/Latin/Finland
+      {    31,     7,    75,    0,    0,   85,   85,  132,  132, 85, 85, 47, 47, 23, 23 },// English/Latin/Guernsey
+      {    31,     7,    80,    0,    0,   85,   85,  132,  132, 85, 85, 47, 47, 23, 23 },// English/Latin/Gambia
+      {    31,     7,    82,    0,    0,   85,   85,  132,  132, 85, 85, 47, 47, 23, 23 },// English/Latin/Germany
+      {    31,     7,    83,    0,    0,   85,   85,  132,  132, 85, 85, 47, 47, 23, 23 },// English/Latin/Ghana
+      {    31,     7,    84,    0,    0,   85,   85,  132,  132, 85, 85, 47, 47, 23, 23 },// English/Latin/Gibraltar
+      {    31,     7,    87,    0,    0,   85,   85,  132,  132, 85, 85, 47, 47, 23, 23 },// English/Latin/Grenada
+      {    31,     7,    89,    0,    0,   85,   85,  132,  132, 85, 85, 47, 47, 23, 23 },// English/Latin/Guam
+      {    31,     7,    93,    0,    0,   85,   85,  132,  132, 85, 85, 47, 47, 23, 23 },// English/Latin/Guyana
+      {    31,     7,    97,    0,    0,   85,   85,  132,  132, 85, 85, 47, 47, 23, 23 },// English/Latin/Hong Kong
+      {    31,     7,   100,    0,    0,   85,   85,  132,  132, 85, 85, 47, 47, 23, 23 },// English/Latin/India
+      {    31,     7,   104,    0,    0,   85,   85,  132,  132, 85, 85, 47, 47, 23, 23 },// English/Latin/Ireland
+      {    31,     7,   105,    0,    0,   85,   85,  132,  132, 85, 85, 47, 47, 23, 23 },// English/Latin/Israel
+      {    31,     7,   107,    0,    0,   85,   85,  132,  132, 85, 85, 47, 47, 23, 23 },// English/Latin/Jamaica
+      {    31,     7,   111,    0,    0,   85,   85,  132,  132, 85, 85, 47, 47, 23, 23 },// English/Latin/Kenya
+      {    31,     7,   112,    0,    0,   85,   85,  132,  132, 85, 85, 47, 47, 23, 23 },// English/Latin/Kiribati
+      {    31,     7,   120,    0,    0,   85,   85,  132,  132, 85, 85, 47, 47, 23, 23 },// English/Latin/Lesotho
+      {    31,     7,   121,    0,    0,   85,   85,  132,  132, 85, 85, 47, 47, 23, 23 },// English/Latin/Liberia
+      {    31,     7,   126,    0,    0,   85,   85,  132,  132, 85, 85, 47, 47, 23, 23 },// English/Latin/Macau
+      {    31,     7,   128,    0,    0,   85,   85,  132,  132, 85, 85, 47, 47, 23, 23 },// English/Latin/Madagascar
+      {    31,     7,   129,    0,    0,   85,   85,  132,  132, 85, 85, 47, 47, 23, 23 },// English/Latin/Malawi
+      {    31,     7,   130,    0,    0,   85,   85,  132,  132, 85, 85, 47, 47, 23, 23 },// English/Latin/Malaysia
+      {    31,     7,   133,    0,    0,   85,   85,  132,  132, 85, 85, 47, 47, 23, 23 },// English/Latin/Malta
+      {    31,     7,   134,    0,    0,   85,   85,  132,  132, 85, 85, 47, 47, 23, 23 },// English/Latin/Marshall Islands
+      {    31,     7,   137,    0,    0,   85,   85,  132,  132, 85, 85, 47, 47, 23, 23 },// English/Latin/Mauritius
+      {    31,     7,   140,    0,    0,   85,   85,  132,  132, 85, 85, 47, 47, 23, 23 },// English/Latin/Micronesia
+      {    31,     7,   144,    0,    0,   85,   85,  132,  132, 85, 85, 47, 47, 23, 23 },// English/Latin/Montserrat
+      {    31,     7,   148,    0,    0,   85,   85,  132,  132, 85, 85, 47, 47, 23, 23 },// English/Latin/Namibia
+      {    31,     7,   149,    0,    0,   85,   85,  132,  132, 85, 85, 47, 47, 23, 23 },// English/Latin/Nauru
+      {    31,     7,   151,    0,    0,   85,   85,  132,  132, 85, 85, 47, 47, 23, 23 },// English/Latin/Netherlands
+      {    31,     7,   154,    0,    0,   85,   85,  132,  132, 85, 85, 47, 47, 23, 23 },// English/Latin/New Zealand
+      {    31,     7,   157,    0,    0,   85,   85,  132,  132, 85, 85, 47, 47, 23, 23 },// English/Latin/Nigeria
+      {    31,     7,   158,    0,    0,   85,   85,  132,  132, 85, 85, 47, 47, 23, 23 },// English/Latin/Niue
+      {    31,     7,   159,    0,    0,   85,   85,  132,  132, 85, 85, 47, 47, 23, 23 },// English/Latin/Norfolk Island
+      {    31,     7,   160,    0,    0,   85,   85,  132,  132, 85, 85, 47, 47, 23, 23 },// English/Latin/Northern Mariana Islands
+      {    31,     7,   163,    0,    0,   85,   85,  132,  132, 85, 85, 47, 47, 23, 23 },// English/Latin/Pakistan
+      {    31,     7,   164,    0,    0,   85,   85,  132,  132, 85, 85, 47, 47, 23, 23 },// English/Latin/Palau
+      {    31,     7,   167,    0,    0,   85,   85,  132,  132, 85, 85, 47, 47, 23, 23 },// English/Latin/Papua New Guinea
+      {    31,     7,   170,    0,    0,   85,   85,  132,  132, 85, 85, 47, 47, 23, 23 },// English/Latin/Philippines
+      {    31,     7,   171,    0,    0,   85,   85,  132,  132, 85, 85, 47, 47, 23, 23 },// English/Latin/Pitcairn
+      {    31,     7,   174,    0,    0,   85,   85,  132,  132, 85, 85, 47, 47, 23, 23 },// English/Latin/Puerto Rico
+      {    31,     7,   179,    0,    0,   85,   85,  132,  132, 85, 85, 47, 47, 23, 23 },// English/Latin/Rwanda
+      {    31,     7,   180,    0,    0,   85,   85,  132,  132, 85, 85, 47, 47, 23, 23 },// English/Latin/Saint Kitts And Nevis
+      {    31,     7,   181,    0,    0,   85,   85,  132,  132, 85, 85, 47, 47, 23, 23 },// English/Latin/Saint Lucia
+      {    31,     7,   182,    0,    0,   85,   85,  132,  132, 85, 85, 47, 47, 23, 23 },// English/Latin/Saint Vincent And The Grenadines
+      {    31,     7,   183,    0,    0,   85,   85,  132,  132, 85, 85, 47, 47, 23, 23 },// English/Latin/Samoa
+      {    31,     7,   188,    0,    0,   85,   85,  132,  132, 85, 85, 47, 47, 23, 23 },// English/Latin/Seychelles
+      {    31,     7,   189,    0,    0,   85,   85,  132,  132, 85, 85, 47, 47, 23, 23 },// English/Latin/Sierra Leone
+      {    31,     7,   190,    0,    0,   85,   85,  132,  132, 85, 85, 47, 47, 23, 23 },// English/Latin/Singapore
+      {    31,     7,   192,    0,    0,   85,   85,  132,  132, 85, 85, 47, 47, 23, 23 },// English/Latin/Slovenia
+      {    31,     7,   193,    0,    0,   85,   85,  132,  132, 85, 85, 47, 47, 23, 23 },// English/Latin/Solomon Islands
+      {    31,     7,   195,    0,    0,   85,   85,  132,  132, 85, 85, 47, 47, 23, 23 },// English/Latin/South Africa
+      {    31,     7,   199,    0,    0,   85,   85,  132,  132, 85, 85, 47, 47, 23, 23 },// English/Latin/Saint Helena
+      {    31,     7,   201,    0,    0,   85,   85,  132,  132, 85, 85, 47, 47, 23, 23 },// English/Latin/Sudan
+      {    31,     7,   204,    0,    0,   85,   85,  132,  132, 85, 85, 47, 47, 23, 23 },// English/Latin/Swaziland
+      {    31,     7,   205,    0,    0,   85,   85,  132,  132, 85, 85, 47, 47, 23, 23 },// English/Latin/Sweden
+      {    31,     7,   206,    0,    0,   85,   85,  132,  132, 85, 85, 47, 47, 23, 23 },// English/Latin/Switzerland
+      {    31,     7,   210,    0,    0,   85,   85,  132,  132, 85, 85, 47, 47, 23, 23 },// English/Latin/Tanzania
+      {    31,     7,   213,    0,    0,   85,   85,  132,  132, 85, 85, 47, 47, 23, 23 },// English/Latin/Tokelau
+      {    31,     7,   214,    0,    0,   85,   85,  132,  132, 85, 85, 47, 47, 23, 23 },// English/Latin/Tonga
+      {    31,     7,   215,    0,    0,   85,   85,  132,  132, 85, 85, 47, 47, 23, 23 },// English/Latin/Trinidad And Tobago
+      {    31,     7,   219,    0,    0,   85,   85,  132,  132, 85, 85, 47, 47, 23, 23 },// English/Latin/Turks And Caicos Islands
+      {    31,     7,   220,    0,    0,   85,   85,  132,  132, 85, 85, 47, 47, 23, 23 },// English/Latin/Tuvalu
+      {    31,     7,   221,    0,    0,   85,   85,  132,  132, 85, 85, 47, 47, 23, 23 },// English/Latin/Uganda
+      {    31,     7,   223,    0,    0,   85,   85,  132,  132, 85, 85, 47, 47, 23, 23 },// English/Latin/United Arab Emirates
+      {    31,     7,   224,    0,    0,   85,   85,  132,  132, 85, 85, 47, 47, 23, 23 },// English/Latin/United Kingdom
+      {    31,     7,   226,    0,    0,   85,   85,  132,  132, 85, 85, 47, 47, 23, 23 },// English/Latin/United States Minor Outlying Islands
+      {    31,     7,   229,    0,    0,   85,   85,  132,  132, 85, 85, 47, 47, 23, 23 },// English/Latin/Vanuatu
+      {    31,     7,   233,    0,    0,   85,   85,  132,  132, 85, 85, 47, 47, 23, 23 },// English/Latin/British Virgin Islands
+      {    31,     7,   234,    0,    0,   85,   85,  132,  132, 85, 85, 47, 47, 23, 23 },// English/Latin/United States Virgin Islands
+      {    31,     7,   239,    0,    0,   85,   85,  132,  132, 85, 85, 47, 47, 23, 23 },// English/Latin/Zambia
+      {    31,     7,   240,    0,    0,   85,   85,  132,  132, 85, 85, 47, 47, 23, 23 },// English/Latin/Zimbabwe
+      {    31,     7,   249,    0,    0,   85,   85,  132,  132, 85, 85, 47, 47, 23, 23 },// English/Latin/Diego Garcia
+      {    31,     7,   251,    0,    0,   85,   85,  132,  132, 85, 85, 47, 47, 23, 23 },// English/Latin/Isle Of Man
+      {    31,     7,   252,    0,    0,   85,   85,  132,  132, 85, 85, 47, 47, 23, 23 },// English/Latin/Jersey
+      {    31,     7,   254,    0,    0,   85,   85,  132,  132, 85, 85, 47, 47, 23, 23 },// English/Latin/South Sudan
+      {    31,     7,   256,    0,    0,   85,   85,  132,  132, 85, 85, 47, 47, 23, 23 },// English/Latin/Sint Maarten
+      {    31,     7,   260,    0,    0,   85,   85,  132,  132, 85, 85, 47, 47, 23, 23 },// English/Latin/World
+      {    31,     7,   261,    0,    0,   85,   85,  132,  132, 85, 85, 47, 47, 23, 23 },// English/Latin/Europe
+      {    32,     7,   260, 5256, 5256, 5346, 5346,  132,  132, 90, 90, 47, 47, 23, 23 },// Esperanto/Latin/World
+      {    33,     7,    68, 5393, 5393, 5483, 5483, 5541, 5541, 90, 90, 58, 58, 23, 23 },// Estonian/Latin/Estonia
+      {    34,     7,    71, 5564, 5564, 5646, 5693,  132,  132, 82, 82, 47, 58, 23, 23 },// Faroese/Latin/Faroe Islands
+      {    34,     7,    58, 5564, 5564, 5646, 5693,  132,  132, 82, 82, 47, 58, 23, 23 },// Faroese/Latin/Denmark
+      {    36,     7,    73, 5751, 5855, 5983, 6051, 6143, 6143,104,128, 68, 92, 23, 23 },// Finnish/Latin/Finland
+      {    37,     7,    74, 6166, 6166, 6250, 6250,  132,  132, 84, 84, 62, 62, 23, 23 },// French/Latin/France
+      {    37,     7,     3, 6166, 6166, 6250, 6250,  132,  132, 84, 84, 62, 62, 23, 23 },// French/Latin/Algeria
+      {    37,     7,    21, 6166, 6166, 6250, 6250,  132,  132, 84, 84, 62, 62, 23, 23 },// French/Latin/Belgium
+      {    37,     7,    23, 6166, 6166, 6250, 6250,  132,  132, 84, 84, 62, 62, 23, 23 },// French/Latin/Benin
+      {    37,     7,    34, 6166, 6166, 6250, 6250,  132,  132, 84, 84, 62, 62, 23, 23 },// French/Latin/Burkina Faso
+      {    37,     7,    35, 6166, 6166, 6250, 6250,  132,  132, 84, 84, 62, 62, 23, 23 },// French/Latin/Burundi
+      {    37,     7,    37, 6166, 6166, 6250, 6250,  132,  132, 84, 84, 62, 62, 23, 23 },// French/Latin/Cameroon
+      {    37,     7,    38, 6166, 6166, 6312, 6312,  132,  132, 84, 84, 63, 63, 23, 23 },// French/Latin/Canada
+      {    37,     7,    41, 6166, 6166, 6250, 6250,  132,  132, 84, 84, 62, 62, 23, 23 },// French/Latin/Central African Republic
+      {    37,     7,    42, 6166, 6166, 6250, 6250,  132,  132, 84, 84, 62, 62, 23, 23 },// French/Latin/Chad
+      {    37,     7,    48, 6166, 6166, 6250, 6250,  132,  132, 84, 84, 62, 62, 23, 23 },// French/Latin/Comoros
+      {    37,     7,    49, 6166, 6166, 6250, 6250,  132,  132, 84, 84, 62, 62, 23, 23 },// French/Latin/Congo Kinshasa
+      {    37,     7,    50, 6166, 6166, 6250, 6250,  132,  132, 84, 84, 62, 62, 23, 23 },// French/Latin/Congo Brazzaville
+      {    37,     7,    53, 6166, 6166, 6250, 6250,  132,  132, 84, 84, 62, 62, 23, 23 },// French/Latin/Ivory Coast
+      {    37,     7,    59, 6166, 6166, 6250, 6250,  132,  132, 84, 84, 62, 62, 23, 23 },// French/Latin/Djibouti
+      {    37,     7,    66, 6166, 6166, 6250, 6250,  132,  132, 84, 84, 62, 62, 23, 23 },// French/Latin/Equatorial Guinea
+      {    37,     7,    76, 6166, 6166, 6250, 6250,  132,  132, 84, 84, 62, 62, 23, 23 },// French/Latin/French Guiana
+      {    37,     7,    77, 6166, 6166, 6250, 6250,  132,  132, 84, 84, 62, 62, 23, 23 },// French/Latin/French Polynesia
+      {    37,     7,    79, 6166, 6166, 6250, 6250,  132,  132, 84, 84, 62, 62, 23, 23 },// French/Latin/Gabon
+      {    37,     7,    88, 6166, 6166, 6250, 6250,  132,  132, 84, 84, 62, 62, 23, 23 },// French/Latin/Guadeloupe
+      {    37,     7,    91, 6166, 6166, 6250, 6250,  132,  132, 84, 84, 62, 62, 23, 23 },// French/Latin/Guinea
+      {    37,     7,    94, 6166, 6166, 6250, 6250,  132,  132, 84, 84, 62, 62, 23, 23 },// French/Latin/Haiti
+      {    37,     7,   125, 6166, 6166, 6250, 6250,  132,  132, 84, 84, 62, 62, 23, 23 },// French/Latin/Luxembourg
+      {    37,     7,   128, 6166, 6166, 6250, 6250,  132,  132, 84, 84, 62, 62, 23, 23 },// French/Latin/Madagascar
+      {    37,     7,   132, 6166, 6166, 6250, 6250,  132,  132, 84, 84, 62, 62, 23, 23 },// French/Latin/Mali
+      {    37,     7,   135, 6166, 6166, 6250, 6250,  132,  132, 84, 84, 62, 62, 23, 23 },// French/Latin/Martinique
+      {    37,     7,   136, 6166, 6166, 6250, 6250,  132,  132, 84, 84, 62, 62, 23, 23 },// French/Latin/Mauritania
+      {    37,     7,   137, 6166, 6166, 6250, 6250,  132,  132, 84, 84, 62, 62, 23, 23 },// French/Latin/Mauritius
+      {    37,     7,   138, 6166, 6166, 6250, 6250,  132,  132, 84, 84, 62, 62, 23, 23 },// French/Latin/Mayotte
+      {    37,     7,   142, 6166, 6166, 6250, 6250,  132,  132, 84, 84, 62, 62, 23, 23 },// French/Latin/Monaco
+      {    37,     7,   145, 6166, 6166, 6375, 6375,  132,  132, 84, 84, 60, 60, 23, 23 },// French/Latin/Morocco
+      {    37,     7,   153, 6166, 6166, 6250, 6250,  132,  132, 84, 84, 62, 62, 23, 23 },// French/Latin/New Caledonia
+      {    37,     7,   156, 6166, 6166, 6250, 6250,  132,  132, 84, 84, 62, 62, 23, 23 },// French/Latin/Niger
+      {    37,     7,   176, 6166, 6166, 6250, 6250,  132,  132, 84, 84, 62, 62, 23, 23 },// French/Latin/Reunion
+      {    37,     7,   179, 6166, 6166, 6250, 6250,  132,  132, 84, 84, 62, 62, 23, 23 },// French/Latin/Rwanda
+      {    37,     7,   187, 6166, 6166, 6250, 6250,  132,  132, 84, 84, 62, 62, 23, 23 },// French/Latin/Senegal
+      {    37,     7,   188, 6166, 6166, 6250, 6250,  132,  132, 84, 84, 62, 62, 23, 23 },// French/Latin/Seychelles
+      {    37,     7,   200, 6166, 6166, 6250, 6250,  132,  132, 84, 84, 62, 62, 23, 23 },// French/Latin/Saint Pierre And Miquelon
+      {    37,     7,   206, 6166, 6166, 6250, 6250,  132,  132, 84, 84, 62, 62, 23, 23 },// French/Latin/Switzerland
+      {    37,     7,   207, 6166, 6166, 6250, 6250,  132,  132, 84, 84, 62, 62, 23, 23 },// French/Latin/Syria
+      {    37,     7,   212, 6166, 6166, 6250, 6250,  132,  132, 84, 84, 62, 62, 23, 23 },// French/Latin/Togo
+      {    37,     7,   216, 6166, 6166, 6250, 6250,  132,  132, 84, 84, 62, 62, 23, 23 },// French/Latin/Tunisia
+      {    37,     7,   229, 6166, 6166, 6250, 6250,  132,  132, 84, 84, 62, 62, 23, 23 },// French/Latin/Vanuatu
+      {    37,     7,   235, 6166, 6166, 6250, 6250,  132,  132, 84, 84, 62, 62, 23, 23 },// French/Latin/Wallis And Futuna Islands
+      {    37,     7,   244, 6166, 6166, 6250, 6250,  132,  132, 84, 84, 62, 62, 23, 23 },// French/Latin/Saint Barthelemy
+      {    37,     7,   245, 6166, 6166, 6250, 6250,  132,  132, 84, 84, 62, 62, 23, 23 },// French/Latin/Saint Martin
+      {    38,     7,   151, 6435, 6435, 6529, 6529,  132,  132, 94, 94, 47, 47, 23, 23 },// Western Frisian/Latin/Netherlands
+      {    39,     7,   224, 6576, 6717, 6883, 6883, 6943, 6943,141,166, 60, 60, 23, 23 },// Gaelic/Latin/United Kingdom
+      {    40,     7,   197, 6966, 7052, 7138, 7197, 7256, 7279, 86, 86, 59, 59, 23, 35 },// Galician/Latin/Spain
+      {    41,    15,    81, 7314, 7314, 7412, 7412, 7459, 7459, 98, 98, 47, 47, 23, 23 },// Georgian/Georgian/Georgia
+      {    42,     7,    82, 7482, 7482, 7564, 7611,  132,  132, 82, 82, 47, 59, 23, 23 },// German/Latin/Germany
+      {    42,     7,    14, 7670, 7670, 7752, 7799,  132,  132, 82, 82, 47, 58, 23, 23 },// German/Latin/Austria
+      {    42,     7,    21, 7482, 7482, 7564, 7611,  132,  132, 82, 82, 47, 59, 23, 23 },// German/Latin/Belgium
+      {    42,     7,   106, 7670, 7670, 7752, 7799,  132,  132, 82, 82, 47, 58, 23, 23 },// German/Latin/Italy
+      {    42,     7,   123, 7482, 7482, 7564, 7611,  132,  132, 82, 82, 47, 59, 23, 23 },// German/Latin/Liechtenstein
+      {    42,     7,   125, 7482, 7482, 7564, 7611,  132,  132, 82, 82, 47, 59, 23, 23 },// German/Latin/Luxembourg
+      {    42,     7,   206, 7482, 7482, 7564, 7611,  132,  132, 82, 82, 47, 59, 23, 23 },// German/Latin/Switzerland
+      {    43,    16,    85, 7857, 7971, 8085, 8134, 8183, 8183,114,114, 49, 49, 23, 23 },// Greek/Greek/Greece
+      {    43,    16,    56, 7857, 7971, 8085, 8134, 8183, 8183,114,114, 49, 49, 23, 23 },// Greek/Greek/Cyprus
+      {    44,     7,    86, 8206, 8304, 8414, 8414,  132,  132, 98,110, 49, 49, 23, 23 },// Greenlandic/Latin/Greenland
+      {    45,     7,   168,  361,  361,  361,  361,  155,  155, 47, 47, 47, 47, 26, 26 },// Guarani/Latin/Paraguay
+      {    46,    17,   100, 8463, 8463, 8549, 8549, 8615, 8615, 86, 86, 66, 66, 30, 30 },// Gujarati/Gujarati/India
+      {    47,     7,   157, 8645, 8645, 8729, 8729, 8776, 8776, 84, 84, 47, 47, 23, 23 },// Hausa/Latin/Nigeria
+      {    47,     1,   157,  361,  361,  361,  361,  155,  155, 47, 47, 47, 47, 26, 26 },// Hausa/Arabic/Nigeria
+      {    47,     7,    83, 8645, 8645, 8729, 8729, 8776, 8776, 84, 84, 47, 47, 23, 23 },// Hausa/Latin/Ghana
+      {    47,     7,   156, 8645, 8645, 8729, 8729, 8776, 8776, 84, 84, 47, 47, 23, 23 },// Hausa/Latin/Niger
+      {    48,    18,   105, 8799, 8799, 8870, 8870,  155,  155, 71, 71, 57, 57, 26, 26 },// Hebrew/Hebrew/Israel
+      {    49,    13,   100, 8927, 8927, 8999, 8999, 9057, 9057, 72, 72, 58, 58, 29, 29 },// Hindi/Devanagari/India
+      {    50,     7,    98, 9086, 9086, 9183, 9183, 9246, 9246, 97, 97, 63, 63, 24, 24 },// Hungarian/Latin/Hungary
+      {    51,     7,    99, 9270, 9270, 9351, 9351, 9409, 9409, 81, 81, 58, 58, 23, 23 },// Icelandic/Latin/Iceland
+      {    52,     7,   101, 9432, 9432, 9518, 9518,  132,  132, 86, 86, 47, 47, 23, 23 },// Indonesian/Latin/Indonesia
+      {    53,     7,   260, 9565, 9565, 9657, 9657,  155, 9704, 92, 92, 47, 47, 26, 23 },// Interlingua/Latin/World
+      {    55,    44,    38,  361,  361,  361,  361,  155,  155, 47, 47, 47, 47, 26, 26 },// Inuktitut/Canadian Aboriginal/Canada
+      {    55,     7,    38,  361,  361,  361,  361,  155,  155, 47, 47, 47, 47, 26, 26 },// Inuktitut/Latin/Canada
+      {    57,     7,   104, 9727, 9727, 9833, 9833, 9894, 9894,106,106, 61, 61, 23, 23 },// Irish/Latin/Ireland
+      {    57,     7,   224, 9727, 9727, 9833, 9833, 9894, 9894,106,106, 61, 61, 23, 23 },// Irish/Latin/United Kingdom
+      {    58,     7,   106, 9917, 9917,10010,10010,10057,10057, 93, 93, 47, 47, 23, 23 },// Italian/Latin/Italy
+      {    58,     7,   184, 9917, 9917,10010,10010,10057,10057, 93, 93, 47, 47, 23, 23 },// Italian/Latin/San Marino
+      {    58,     7,   206, 9917, 9917,10010,10010,10057,10057, 93, 93, 47, 47, 23, 23 },// Italian/Latin/Switzerland
+      {    58,     7,   230, 9917, 9917,10010,10010,10057,10057, 93, 93, 47, 47, 23, 23 },// Italian/Latin/Vatican City State
+      {    59,    19,   108, 4387, 4387, 4387, 4387,  155,  155, 38, 38, 38, 38, 26, 26 },// Japanese/Japanese/Japan
+      {    60,     7,   101, 9432, 9432,10080,10080,  132,  132, 86, 86, 47, 47, 23, 23 },// Javanese/Latin/Indonesia
+      {    61,    21,   100,10127,10127,10213,10275,10343,10343, 86, 86, 62, 68, 30, 30 },// Kannada/Kannada/India
+      {    62,     1,   100,10373,10373,10373,10373,10444,10444, 71, 71, 71, 71, 23, 23 },// Kashmiri/Arabic/India
+      {    63,     2,   110,10467,10549,10631,10631,10690,10690, 82, 82, 59, 59, 23, 23 },// Kazakh/Cyrillic/Kazakhstan
+      {    64,     7,   179,10713,10713,10813,10813,  155,  155,100,100, 59, 59, 26, 26 },// Kinyarwanda/Latin/Rwanda
+      {    65,     2,   116,10872,10951,11030,11077,11135,11135, 79, 79, 47, 58, 23, 23 },// Kirghiz/Cyrillic/Kyrgyzstan
+      {    66,    22,   114,11158,11158,11158,11158,11158,11158, 38, 38, 38, 38, 38, 38 },// Korean/Korean/South Korea
+      {    66,    22,   113,11158,11158,11158,11158,11158,11158, 38, 38, 38, 38, 38, 38 },// Korean/Korean/North Korea
+      {    67,     7,   217,11196,11283,11383,11383,11430,11430, 87,100, 47, 47, 23, 23 },// Kurdish/Latin/Turkey
+      {    68,     7,    35,11453,11453,11558,11558,  155,  155,105,105, 59, 59, 26, 26 },// Rundi/Latin/Burundi
+      {    69,    23,   117,11617,11617,11691,11691,  155,  155, 74, 74, 60, 60, 26, 26 },// Lao/Lao/Laos
+      {    71,     7,   118,11751,11751,11851,11851,  132,  132,100,100, 64, 64, 23, 23 },// Latvian/Latin/Latvia
+      {    72,     7,    49,11915,11915,12117,12117,12164,12164,202,202, 47, 47, 23, 23 },// Lingala/Latin/Congo Kinshasa
+      {    72,     7,     6,11915,11915,12117,12117,12164,12164,202,202, 47, 47, 23, 23 },// Lingala/Latin/Angola
+      {    72,     7,    41,11915,11915,12117,12117,12164,12164,202,202, 47, 47, 23, 23 },// Lingala/Latin/Central African Republic
+      {    72,     7,    50,11915,11915,12117,12117,12164,12164,202,202, 47, 47, 23, 23 },// Lingala/Latin/Congo Brazzaville
+      {    73,     7,   124,12187,12282,12379,12379,12448,12448, 95, 97, 69, 69, 23, 23 },// Lithuanian/Latin/Lithuania
+      {    74,     2,   127,12471,12471,12555,12555,12615,12615, 84, 84, 60, 60, 23, 23 },// Macedonian/Cyrillic/Macedonia
+      {    75,     7,   128,12638,12638,12729,12729,  132,  132, 91, 91, 47, 47, 23, 23 },// Malagasy/Latin/Madagascar
+      {    76,     7,   130,12776,12776,12857,12857,12904,12904, 81, 81, 47, 47, 23, 23 },// Malay/Latin/Malaysia
+      {    76,     1,   130,  361,  361,  361,  361,  155,  155, 47, 47, 47, 47, 26, 26 },// Malay/Arabic/Malaysia
+      {    76,     7,    32,12776,12776,12857,12857,12904,12904, 81, 81, 47, 47, 23, 23 },// Malay/Latin/Brunei
+      {    76,     7,   190,12776,12776,12857,12857,12904,12904, 81, 81, 47, 47, 23, 23 },// Malay/Latin/Singapore
+      {    77,    24,   100,12927,12927,13014,13014,13075,13075, 87, 87, 61, 61, 31, 31 },// Malayalam/Malayalam/India
+      {    78,     7,   133,13106,13106,13191,13191,13238,13273, 85, 85, 47, 47, 35, 23 },// Maltese/Latin/Malta
+      {    79,     7,   154,13296,13296,13428,13428,13486,13486,132,132, 58, 58, 23, 23 },// Maori/Latin/New Zealand
+      {    80,    13,   100,13509,13509,13594,13594,13659,13659, 85, 85, 65, 65, 31, 31 },// Marathi/Devanagari/India
+      {    82,     2,   143,13690,13881,14072,14072,14170,14170,191,191, 98, 98, 37, 37 },// Mongolian/Cyrillic/Mongolia
+      {    82,     8,    44,  361,  361,  361,  361,  155,  155, 47, 47, 47, 47, 26, 26 },// Mongolian/Mongolian/China
+      {    84,    13,   150,14207,14207,14207,14207,14291,14343, 84, 84, 84, 84, 52, 51 },// Nepali/Devanagari/Nepal
+      {    84,    13,   100,14207,14207,14207,14207,14291,14343, 84, 84, 84, 84, 52, 51 },// Nepali/Devanagari/India
+      {    85,     7,   161,14394,14394, 5646, 5693,  132,  132, 82, 82, 47, 58, 23, 23 },// Norwegian Bokmal/Latin/Norway
+      {    85,     7,   203,14394,14394, 5646, 5693,  132,  132, 82, 82, 47, 58, 23, 23 },// Norwegian Bokmal/Latin/Svalbard And Jan Mayen Islands
+      {    86,     7,    74,  361,  361,  361,  361,  155,  155, 47, 47, 47, 47, 26, 26 },// Occitan/Latin/France
+      {    87,    26,   100,14476,14476,14476,14476,14561,14561, 85, 85, 85, 85, 31, 31 },// Oriya/Oriya/India
+      {    88,     1,     1,14592,14660,14728,14660,  155,14795, 68, 68, 67, 68, 26, 23 },// Pashto/Arabic/Afghanistan
+      {    88,     1,   163,14592,14660,14728,14660,  155,14795, 68, 68, 67, 68, 26, 23 },// Pashto/Arabic/Pakistan
+      {    89,     1,   102,14818,14887,14818,14887,14960,14960, 69, 73, 69, 73, 23, 23 },// Persian/Arabic/Iran
+      {    89,     1,     1,14983,14983,14983,15050,14795,14795, 67, 67, 67, 61, 23, 23 },// Persian/Arabic/Afghanistan
+      {    90,     7,   172,15111,15207,15305,15305,15352,15375, 96, 98, 47, 47, 23, 23 },// Polish/Latin/Poland
+      {    91,     7,    30,15398,15398,15486,15486,  132,  132, 88, 88, 59, 59, 23, 23 },// Portuguese/Latin/Brazil
+      {    91,     7,     6,15398,15398,15486,15486,  132,  132, 88, 88, 59, 59, 23, 23 },// Portuguese/Latin/Angola
+      {    91,     7,    39,15398,15398,15486,15486,  132,  132, 88, 88, 59, 59, 23, 23 },// Portuguese/Latin/Cape Verde
+      {    91,     7,    62,15398,15398,15486,15486,  132,  132, 88, 88, 59, 59, 23, 23 },// Portuguese/Latin/East Timor
+      {    91,     7,    66,15398,15398,15486,15486,  132,  132, 88, 88, 59, 59, 23, 23 },// Portuguese/Latin/Equatorial Guinea
+      {    91,     7,    92,15398,15398,15486,15486,  132,  132, 88, 88, 59, 59, 23, 23 },// Portuguese/Latin/Guinea Bissau
+      {    91,     7,   125,15398,15398,15486,15486,  132,  132, 88, 88, 59, 59, 23, 23 },// Portuguese/Latin/Luxembourg
+      {    91,     7,   126,15398,15398,15486,15486,  132,  132, 88, 88, 59, 59, 23, 23 },// Portuguese/Latin/Macau
+      {    91,     7,   146,15398,15398,15486,15486,  132,  132, 88, 88, 59, 59, 23, 23 },// Portuguese/Latin/Mozambique
+      {    91,     7,   173,15398,15398,15486,15486,  132,  132, 88, 88, 59, 59, 23, 23 },// Portuguese/Latin/Portugal
+      {    91,     7,   185,15398,15398,15486,15486,  132,  132, 88, 88, 59, 59, 23, 23 },// Portuguese/Latin/Sao Tome And Principe
+      {    91,     7,   206,15398,15398,15486,15486,  132,  132, 88, 88, 59, 59, 23, 23 },// Portuguese/Latin/Switzerland
+      {    92,     4,   100,15545,15545,15612,15612,15661,15661, 67, 67, 49, 49, 27, 27 },// Punjabi/Gurmukhi/India
+      {    92,     1,   163,15688,15688,15688,15688,  155,  155, 66, 66, 66, 66, 26, 26 },// Punjabi/Arabic/Pakistan
+      {    93,     7,   169,15754,15754,15841,15841,  155,  155, 87, 87, 47, 47, 26, 26 },// Quechua/Latin/Peru
+      {    93,     7,    26,15754,15754,15841,15841,  155,  155, 87, 87, 47, 47, 26, 26 },// Quechua/Latin/Bolivia
+      {    93,     7,    63,15754,15754,15841,15841,  155,  155, 87, 87, 47, 47, 26, 26 },// Quechua/Latin/Ecuador
+      {    94,     7,   206,15888,15979,16103,16103,16169,16169, 91,124, 66, 66, 23, 23 },// Romansh/Latin/Switzerland
+      {    95,     7,   177,16192,16192,16289,16289,16348,16348, 97, 97, 59, 59, 23, 23 },// Romanian/Latin/Romania
+      {    95,     7,   141,16192,16192,16289,16289,16348,16348, 97, 97, 59, 59, 23, 23 },// Romanian/Latin/Moldova
+      {    96,     2,   178,10951,16371,16452,16513,11135,11135, 79, 81, 61, 61, 23, 23 },// Russian/Cyrillic/Russia
+      {    96,     2,    20,10951,16371,16452,16513,11135,11135, 79, 81, 61, 61, 23, 23 },// Russian/Cyrillic/Belarus
+      {    96,     2,   110,10951,16371,16452,16513,11135,11135, 79, 81, 61, 61, 23, 23 },// Russian/Cyrillic/Kazakhstan
+      {    96,     2,   116,10951,16371,16452,16513,11135,11135, 79, 81, 61, 61, 23, 23 },// Russian/Cyrillic/Kyrgyzstan
+      {    96,     2,   141,10951,16371,16452,16513,11135,11135, 79, 81, 61, 61, 23, 23 },// Russian/Cyrillic/Moldova
+      {    96,     2,   222,10951,16371,16452,16513,11135,11135, 79, 81, 61, 61, 23, 23 },// Russian/Cyrillic/Ukraine
+      {    98,     7,    41,16574,16574,16664,16664,16711,16711, 90, 90, 47, 47, 23, 23 },// Sango/Latin/Central African Republic
+      {    99,    13,   100,  361,  361,  361,  361,  155,  155, 47, 47, 47, 47, 26, 26 },// Sanskrit/Devanagari/India
+      {   100,     2,   243,16734,16734,16814,16814,12615,12615, 80, 80, 47, 47, 23, 23 },// Serbian/Cyrillic/Serbia
+      {   100,     7,    27,16861,16861,16941,16941, 9704, 9704, 80, 80, 47, 47, 23, 23 },// Serbian/Latin/Bosnia And Herzegowina
+      {   100,     7,   242,16861,16861,16988,16988, 9704, 9704, 80, 80, 49, 49, 23, 23 },// Serbian/Latin/Montenegro
+      {   100,     7,   243,16861,16861,16941,16941, 9704, 9704, 80, 80, 47, 47, 23, 23 },// Serbian/Latin/Serbia
+      {   100,     2,    27,16734,16734,16814,16814,12615,12615, 80, 80, 47, 47, 23, 23 },// Serbian/Cyrillic/Bosnia And Herzegowina
+      {   100,     2,   242,16734,16734,17037,17037,12615,12615, 80, 80, 49, 49, 23, 23 },// Serbian/Cyrillic/Montenegro
+      {   100,     2,   257,16734,16734,17037,17037,12615,12615, 80, 80, 49, 49, 23, 23 },// Serbian/Cyrillic/Kosovo
+      {   100,     7,   257,16861,16861,16988,16988, 9704, 9704, 80, 80, 49, 49, 23, 23 },// Serbian/Latin/Kosovo
+      {   101,     2,    81,17086,17167,17252,17314,11135,11135, 81, 85, 62, 59, 23, 23 },// Ossetic/Cyrillic/Georgia
+      {   101,     2,   178,17086,17167,17252,17314,11135,11135, 81, 85, 62, 59, 23, 23 },// Ossetic/Cyrillic/Russia
+      {   102,     7,   195,  361,  361,  361,  361,  155,  155, 47, 47, 47, 47, 26, 26 },// Southern Sotho/Latin/South Africa
+      {   103,     7,   195,  361,  361,  361,  361,  155,  155, 47, 47, 47, 47, 26, 26 },// Tswana/Latin/South Africa
+      {   104,     7,   240,17373,17373,17472,17472,17519,17519, 99, 99, 47, 47, 23, 23 },// Shona/Latin/Zimbabwe
+      {   105,     1,   163,17542,17542,17542,17542,  132,  132, 71, 71, 71, 71, 23, 23 },// Sindhi/Arabic/Pakistan
+      {   106,    32,   198,17613,17613,17708,17766,17826,17826, 95, 95, 58, 60, 31, 31 },// Sinhala/Sinhala/Sri Lanka
+      {   107,     7,   195,  361,  361,  361,  361,  155,  155, 47, 47, 47, 47, 26, 26 },// Swati/Latin/South Africa
+      {   108,     7,   191,17857,17938,18026,18026, 9704, 9704, 81, 88, 47, 47, 23, 23 },// Slovak/Latin/Slovakia
+      {   109,     7,   192,18073,18073,18158,18158, 9704, 9704, 85, 85, 58, 58, 23, 23 },// Slovenian/Latin/Slovenia
+      {   110,     7,   194,18216,18307,18495,18495,18542,18542, 91,188, 47, 47, 23, 23 },// Somali/Latin/Somalia
+      {   110,     7,    59,18216,18307,18495,18495,18542,18542, 91,188, 47, 47, 23, 23 },// Somali/Latin/Djibouti
+      {   110,     7,    69,18216,18307,18495,18495,18542,18542, 91,188, 47, 47, 23, 23 },// Somali/Latin/Ethiopia
+      {   110,     7,   111,18216,18307,18495,18495,18542,18542, 91,188, 47, 47, 23, 23 },// Somali/Latin/Kenya
+      {   111,     7,   197,18565,18565,18653,18653,18713,18713, 88, 88, 60, 60, 23, 23 },// Spanish/Latin/Spain
+      {   111,     7,    10,18565,18565,18736,18736,18713,18713, 88, 88, 59, 59, 23, 23 },// Spanish/Latin/Argentina
+      {   111,     7,    22,18565,18565,18736,18736,18713,18713, 88, 88, 59, 59, 23, 23 },// Spanish/Latin/Belize
+      {   111,     7,    26,18565,18565,18736,18736,18713,18713, 88, 88, 59, 59, 23, 23 },// Spanish/Latin/Bolivia
+      {   111,     7,    30,18565,18565,18736,18736,18713,18713, 88, 88, 59, 59, 23, 23 },// Spanish/Latin/Brazil
+      {   111,     7,    43,18565,18565,18653,18736,18713,18713, 88, 88, 60, 59, 23, 23 },// Spanish/Latin/Chile
+      {   111,     7,    47,18565,18565,18653,18736,18713,18713, 88, 88, 60, 59, 23, 23 },// Spanish/Latin/Colombia
+      {   111,     7,    52,18565,18565,18736,18736,18713,18713, 88, 88, 59, 59, 23, 23 },// Spanish/Latin/Costa Rica
+      {   111,     7,    55,18565,18565,18736,18736,18713,18713, 88, 88, 59, 59, 23, 23 },// Spanish/Latin/Cuba
+      {   111,     7,    61,18565,18565,18736,18736,18713,18713, 88, 88, 59, 59, 23, 23 },// Spanish/Latin/Dominican Republic
+      {   111,     7,    63,18565,18565,18736,18736,18713,18713, 88, 88, 59, 59, 23, 23 },// Spanish/Latin/Ecuador
+      {   111,     7,    65,18565,18565,18736,18736,18713,18713, 88, 88, 59, 59, 23, 23 },// Spanish/Latin/El Salvador
+      {   111,     7,    66,18565,18565,18653,18653,18713,18713, 88, 88, 60, 60, 23, 23 },// Spanish/Latin/Equatorial Guinea
+      {   111,     7,    90,18565,18565,18736,18736,18713,18713, 88, 88, 59, 59, 23, 23 },// Spanish/Latin/Guatemala
+      {   111,     7,    96,18565,18565,18736,18736,18713,18713, 88, 88, 59, 59, 23, 23 },// Spanish/Latin/Honduras
+      {   111,     7,   139,18565,18565,18736,18736,18713,18713, 88, 88, 59, 59, 23, 23 },// Spanish/Latin/Mexico
+      {   111,     7,   155,18565,18565,18736,18736,18713,18713, 88, 88, 59, 59, 23, 23 },// Spanish/Latin/Nicaragua
+      {   111,     7,   166,18565,18565,18736,18736,18713,18713, 88, 88, 59, 59, 23, 23 },// Spanish/Latin/Panama
+      {   111,     7,   168,18565,18565,18653,18653,18713,18713, 88, 88, 60, 60, 23, 23 },// Spanish/Latin/Paraguay
+      {   111,     7,   169,15754,18795,18882,18941,18713,18713, 87, 87, 59, 59, 23, 23 },// Spanish/Latin/Peru
+      {   111,     7,   170,18565,18565,18653,18653,18713,18713, 88, 88, 60, 60, 23, 23 },// Spanish/Latin/Philippines
+      {   111,     7,   174,18565,18565,18736,18736,18713,18713, 88, 88, 59, 59, 23, 23 },// Spanish/Latin/Puerto Rico
+      {   111,     7,   225,18565,18565,18736,18736,18713,18713, 88, 88, 59, 59, 23, 23 },// Spanish/Latin/United States
+      {   111,     7,   227,15754,18795,18882,18941,18713,18713, 87, 87, 59, 59, 23, 23 },// Spanish/Latin/Uruguay
+      {   111,     7,   231,18565,18565,18653,18653,18713,18713, 88, 88, 60, 60, 23, 23 },// Spanish/Latin/Venezuela
+      {   111,     7,   238,18565,18565,18653,18653,18713,18713, 88, 88, 60, 60, 23, 23 },// Spanish/Latin/Canary Islands
+      {   111,     7,   246,18565,18565,18736,18736,18713,18713, 88, 88, 59, 59, 23, 23 },// Spanish/Latin/Latin America
+      {   111,     7,   250,18565,18565,18653,18653,18713,18713, 88, 88, 60, 60, 23, 23 },// Spanish/Latin/Ceuta And Melilla
+      {   112,     7,   101,  361,  361,  361,  361,  155,  155, 47, 47, 47, 47, 26, 26 },// Sundanese/Latin/Indonesia
+      {   113,     7,   210,19000,19000,19083,19083,  132,  132, 83, 83, 47, 47, 23, 23 },// Swahili/Latin/Tanzania
+      {   113,     7,    49,19000,19000,19083,19083,  132,  132, 83, 83, 47, 47, 23, 23 },// Swahili/Latin/Congo Kinshasa
+      {   113,     7,   111,19000,19000,19083,19083,  132,  132, 83, 83, 47, 47, 23, 23 },// Swahili/Latin/Kenya
+      {   113,     7,   221,19000,19000,19083,19083,  132,  132, 83, 83, 47, 47, 23, 23 },// Swahili/Latin/Uganda
+      {   114,     7,   205,19130,19130,19215,19215,  132,  132, 85, 85, 58, 58, 23, 23 },// Swedish/Latin/Sweden
+      {   114,     7,    73,19130,19130,19215,19215,  132,  132, 85, 85, 58, 58, 23, 23 },// Swedish/Latin/Finland
+      {   114,     7,   248,19130,19130,19215,19215,  132,  132, 85, 85, 58, 58, 23, 23 },// Swedish/Latin/Aland Islands
+      {   115,     7,   106,  361,  361,  361,  361,  155,  155, 47, 47, 47, 47, 26, 26 },// Sardinian/Latin/Italy
+      {   116,     2,   209,19273,19273,11030,11030,11135,11135, 70, 70, 47, 47, 23, 23 },// Tajik/Cyrillic/Tajikistan
+      {   117,    27,   100,19343,19343,19428,19428,19485,19485, 85, 85, 57, 57, 30, 30 },// Tamil/Tamil/India
+      {   117,    27,   130,19343,19343,19428,19428,19485,19485, 85, 85, 57, 57, 30, 30 },// Tamil/Tamil/Malaysia
+      {   117,    27,   190,19343,19343,19428,19428,19485,19485, 85, 85, 57, 57, 30, 30 },// Tamil/Tamil/Singapore
+      {   117,    27,   198,19343,19343,19428,19428,19485,19485, 85, 85, 57, 57, 30, 30 },// Tamil/Tamil/Sri Lanka
+      {   118,     2,   178,19515,19515,19595,19595,  155,  155, 80, 80, 61, 61, 26, 26 },// Tatar/Cyrillic/Russia
+      {   119,    28,   100,19656,19656,19741,19741,19802,19802, 85, 85, 61, 61, 30, 30 },// Telugu/Telugu/India
+      {   120,    30,   211,19832,19832,19929,19929,19929,19929, 97, 97, 62, 62, 62, 62 },// Thai/Thai/Thailand
+      {   121,    31,    44,19991,20149, 2950, 2950,  155,  155,158,146, 62, 62, 26, 26 },// Tibetan/Tibetan/China
+      {   121,    31,   100,19991,20149, 2950, 2950,  155,  155,158,146, 62, 62, 26, 26 },// Tibetan/Tibetan/India
+      {   122,    14,    69,20295,20295,20348,20348,20383,20383, 53, 53, 35, 35, 23, 23 },// Tigrinya/Ethiopic/Ethiopia
+      {   122,    14,    67,20295,20295,20348,20348,20383,20383, 53, 53, 35, 35, 23, 23 },// Tigrinya/Ethiopic/Eritrea
+      {   123,     7,   214,20406,20406,20492,20492,20542,20542, 86, 86, 50, 50, 23, 23 },// Tongan/Latin/Tonga
+      {   124,     7,   195,  361,  361,  361,  361,  155,  155, 47, 47, 47, 47, 26, 26 },// Tsonga/Latin/South Africa
+      {   125,     7,   217,20565,20565,20639,20639,20686,20686, 74, 74, 47, 47, 23, 23 },// Turkish/Latin/Turkey
+      {   125,     7,    56,20565,20565,20639,20639,20686,20686, 74, 74, 47, 47, 23, 23 },// Turkish/Latin/Cyprus
+      {   126,     7,   218,20709,20785,20861,20910,20960,20960, 76, 76, 49, 50, 23, 23 },// Turkmen/Latin/Turkmenistan
+      {   128,     1,    44,20983,20983,20983,20983,  155,  155, 83, 83, 83, 83, 26, 26 },// Uighur/Arabic/China
+      {   129,     2,   222,21066,21160,21246,21293,21359,21382, 94, 86, 47, 66, 23, 23 },// Ukrainian/Cyrillic/Ukraine
+      {   130,     1,   163,21405,21405,21405,21405,  132,  132, 67, 67, 67, 67, 23, 23 },// Urdu/Arabic/Pakistan
+      {   130,     1,   100,21405,21405,21405,21405,  132,  132, 67, 67, 67, 67, 23, 23 },// Urdu/Arabic/India
+      {   131,     7,   228,21472,21546,21620,21667,21714,21714, 74, 74, 47, 47, 23, 23 },// Uzbek/Latin/Uzbekistan
+      {   131,     1,     1,14983,14983,21737,21737,  155,  155, 67, 67, 46, 46, 26, 26 },// Uzbek/Arabic/Afghanistan
+      {   131,     2,   228,21783,21783,21853,21853,11135,11135, 70, 70, 47, 47, 23, 23 },// Uzbek/Cyrillic/Uzbekistan
+      {   132,     7,   232,21900,21998,22096,22170,  155,  155, 98, 98, 74, 74, 26, 26 },// Vietnamese/Latin/Vietnam
+      {   133,     7,   260,22244,22244,22317,22364,22411,22411, 73, 73, 47, 47, 23, 23 },// Volapuk/Latin/World
+      {   134,     7,   224,22434,22434,22520,22571,22626,22626, 86, 86, 51, 55, 25, 25 },// Welsh/Latin/United Kingdom
+      {   135,     7,   187,22651,22651,22734,22734,  155,  155, 83, 83, 46, 46, 26, 26 },// Wolof/Latin/Senegal
+      {   136,     7,   195,22780,22780,22870,22870,  155,  155, 90, 90, 47, 47, 26, 26 },// Xhosa/Latin/South Africa
+      {   137,    18,   260,22917,22917,23008,22917,  155,  155, 91, 91, 57, 91, 26, 26 },// Yiddish/Hebrew/World
+      {   138,     7,   157,23065,23137,23257,23296,23350,23350, 72,120, 39, 54, 26, 26 },// Yoruba/Latin/Nigeria
+      {   138,     7,    23,23376,23449,23582,23622,23677,23677, 73,133, 40, 55, 26, 26 },// Yoruba/Latin/Benin
+      {   140,     7,   195,23703,23703,23793,23793,  132,23840, 90, 90, 47, 47, 23, 23 },// Zulu/Latin/South Africa
+      {   141,     7,   161,14394,14394, 5646,23863,  132,  132, 82, 82, 47, 58, 23, 23 },// Norwegian Nynorsk/Latin/Norway
+      {   142,     7,    27,23921,23921,24003,24003, 9704, 9704, 82, 82, 47, 47, 23, 23 },// Bosnian/Latin/Bosnia And Herzegowina
+      {   142,     2,    27,24050,24050,24132,24132,12615,12615, 82, 82, 47, 47, 23, 23 },// Bosnian/Cyrillic/Bosnia And Herzegowina
+      {   143,    29,   131,  361,  361,  361,  361,  155,  155, 47, 47, 47, 47, 26, 26 },// Divehi/Thaana/Maldives
+      {   144,     7,   251,24179,24179,24318,24318,  155,  155,139,139,101,101, 26, 26 },// Manx/Latin/Isle Of Man
+      {   145,     7,   224,24419,24419,24548,24548,  155,  155,129,129, 45, 45, 26, 26 },// Cornish/Latin/United Kingdom
+      {   146,     7,    83,24593,24593,24784,24784,  155,  155,191,191, 47, 47, 26, 26 },// Akan/Latin/Ghana
+      {   147,    13,   100,24831,24831,24831,24831,  155,  155, 87, 87, 87, 87, 26, 26 },// Konkani/Devanagari/India
+      {   148,     7,    83,  361,  361,  361,  361,  155,  155, 47, 47, 47, 47, 26, 26 },// Ga/Latin/Ghana
+      {   149,     7,   157,24918,24918,25004,25004,25051,25051, 86, 86, 47, 47, 23, 23 },// Igbo/Latin/Nigeria
+      {   150,     7,   111,25074,25074,25262,25262,25309,25309,188,188, 47, 47, 23, 23 },// Kamba/Latin/Kenya
+      {   151,    33,   103,  361,  361,  361,  361,  155,  155, 47, 47, 47, 47, 26, 26 },// Syriac/Syriac/Iraq
+      {   152,    14,    67,  361,  361,  361,  361,  155,  155, 47, 47, 47, 47, 26, 26 },// Blin/Ethiopic/Eritrea
+      {   153,    14,    69,  361,  361,  361,  361,  155,  155, 47, 47, 47, 47, 26, 26 },// Geez/Ethiopic/Ethiopia
+      {   155,     7,    69,  361,  361,  361,  361,  155,  155, 47, 47, 47, 47, 26, 26 },// Sidamo/Latin/Ethiopia
+      {   156,     7,   157,  361,  361,  361,  361,  155,  155, 47, 47, 47, 47, 26, 26 },// Atsam/Latin/Nigeria
+      {   157,    14,    67,  361,  361,  361,  361,  155,  155, 47, 47, 47, 47, 26, 26 },// Tigre/Ethiopic/Eritrea
+      {   158,     7,   157,  361,  361,  361,  361,  155,  155, 47, 47, 47, 47, 26, 26 },// Jju/Latin/Nigeria
+      {   159,     7,   106,25332,25332,25408,25408,25455,25455, 76, 76, 47, 47, 23, 23 },// Friulian/Latin/Italy
+      {   160,     7,   195,  361,  361,  361,  361,  155,  155, 47, 47, 47, 47, 26, 26 },// Venda/Latin/South Africa
+      {   161,     7,    83,25478,25478,25564,25564,25611,25611, 86, 86, 47, 47, 23, 23 },// Ewe/Latin/Ghana
+      {   161,     7,   212,25478,25478,25564,25564,25611,25611, 86, 86, 47, 47, 23, 23 },// Ewe/Latin/Togo
+      {   162,    14,    69,  361,  361,  361,  361,  155,  155, 47, 47, 47, 47, 26, 26 },// Walamo/Ethiopic/Ethiopia
+      {   163,     7,   225,25634,25634,25728,25728,  155,  155, 94, 94, 58, 58, 26, 26 },// Hawaiian/Latin/United States
+      {   164,     7,   157,  361,  361,  361,  361,  155,  155, 47, 47, 47, 47, 26, 26 },// Tyap/Latin/Nigeria
+      {   165,     7,   129,  361,  361,  361,  361,  155,  155, 47, 47, 47, 47, 26, 26 },// Nyanja/Latin/Malawi
+      {   166,     7,   170,25786,25786,25873,25873,25920,25873, 87, 87, 47, 47, 37, 47 },// Filipino/Latin/Philippines
+      {   167,     7,   206,25957,25957, 7564, 7564,  132,  132, 85, 85, 47, 47, 23, 23 },// Swiss German/Latin/Switzerland
+      {   167,     7,    74,25957,25957, 7564, 7564,  132,  132, 85, 85, 47, 47, 23, 23 },// Swiss German/Latin/France
+      {   167,     7,   123,25957,25957, 7564, 7564,  132,  132, 85, 85, 47, 47, 23, 23 },// Swiss German/Latin/Liechtenstein
+      {   168,    34,    44,26042,26042,26042,26042,  155,  155, 37, 37, 37, 37, 26, 26 },// Sichuan Yi/Yi/China
+      {   169,     7,   121,  361,  361,  361,  361,  155,  155, 47, 47, 47, 47, 26, 26 },// Kpelle/Latin/Liberia
+      {   170,     7,    82,26079,26079,26163,26163,  132,  132, 84, 84, 58, 58, 23, 23 },// Low German/Latin/Germany
+      {   170,     7,   151,26079,26079,26163,26163,  132,  132, 84, 84, 58, 58, 23, 23 },// Low German/Latin/Netherlands
+      {   171,     7,   195,  361,  361,  361,  361,  155,  155, 47, 47, 47, 47, 26, 26 },// South Ndebele/Latin/South Africa
+      {   172,     7,   195,  361,  361,  361,  361,  155,  155, 47, 47, 47, 47, 26, 26 },// Northern Sotho/Latin/South Africa
+      {   173,     7,   161,26221,26221,26365,26365,26423,26423,144,144, 58, 58, 23, 23 },// Northern Sami/Latin/Norway
+      {   173,     7,    73,26221,26221,26446,26446,26423,26423,144,144, 59, 59, 23, 23 },// Northern Sami/Latin/Finland
+      {   173,     7,   205,26221,26221,26365,26365,26423,26423,144,144, 58, 58, 23, 23 },// Northern Sami/Latin/Sweden
+      {   174,     7,   208,  361,  361,  361,  361,  155,  155, 47, 47, 47, 47, 26, 26 },// Taroko/Latin/Taiwan
+      {   175,     7,   111,26505,26505,26592,26592,26639,26639, 87, 87, 47, 47, 23, 23 },// Gusii/Latin/Kenya
+      {   176,     7,   111,26662,26662,26882,26882,26929,26929,220,220, 47, 47, 23, 23 },// Taita/Latin/Kenya
+      {   177,     7,   187,26952,26952,27028,27028,27075,27075, 76, 76, 47, 47, 23, 23 },// Fulah/Latin/Senegal
+      {   177,     7,    34,26952,26952,27028,27028,27075,27075, 76, 76, 47, 47, 23, 23 },// Fulah/Latin/Burkina Faso
+      {   177,     7,    37,26952,26952,27028,27028,27075,27075, 76, 76, 47, 47, 23, 23 },// Fulah/Latin/Cameroon
+      {   177,     7,    80,26952,26952,27028,27028,27075,27075, 76, 76, 47, 47, 23, 23 },// Fulah/Latin/Gambia
+      {   177,     7,    83,26952,26952,27028,27028,27075,27075, 76, 76, 47, 47, 23, 23 },// Fulah/Latin/Ghana
+      {   177,     7,    91,26952,26952,27028,27028,27075,27075, 76, 76, 47, 47, 23, 23 },// Fulah/Latin/Guinea
+      {   177,     7,    92,26952,26952,27028,27028,27075,27075, 76, 76, 47, 47, 23, 23 },// Fulah/Latin/Guinea Bissau
+      {   177,     7,   121,26952,26952,27028,27028,27075,27075, 76, 76, 47, 47, 23, 23 },// Fulah/Latin/Liberia
+      {   177,     7,   136,26952,26952,27028,27028,27075,27075, 76, 76, 47, 47, 23, 23 },// Fulah/Latin/Mauritania
+      {   177,     7,   156,26952,26952,27028,27028,27075,27075, 76, 76, 47, 47, 23, 23 },// Fulah/Latin/Niger
+      {   177,     7,   157,26952,26952,27028,27028,27075,27075, 76, 76, 47, 47, 23, 23 },// Fulah/Latin/Nigeria
+      {   177,     7,   189,26952,26952,27028,27028,27075,27075, 76, 76, 47, 47, 23, 23 },// Fulah/Latin/Sierra Leone
+      {   177,   134,    91,  361,  361,  361,  361,  155,  155, 47, 47, 47, 47, 26, 26 },// Fulah/Adlam/Guinea
+      {   178,     7,   111,27098,27098,27282,27282,27329,27329,184,184, 47, 47, 23, 23 },// Kikuyu/Latin/Kenya
+      {   179,     7,   111,27352,27352,27524,27524,27571,27571,172,172, 47, 47, 23, 23 },// Samburu/Latin/Kenya
+      {   180,     7,   146,27594,27594,27681,27681,  132,  132, 87, 87, 47, 47, 23, 23 },// Sena/Latin/Mozambique
+      {   181,     7,   240,27728,27728,27839,27839,27890,27890,111,111, 51, 51, 23, 23 },// North Ndebele/Latin/Zimbabwe
+      {   182,     7,   210,27913,27913,28106,28106,28144,28144,193,193, 38, 38, 23, 23 },// Rombo/Latin/Tanzania
+      {   183,     9,   145,28167,28167,28247,28247,28294,28294, 80, 80, 47, 47, 23, 23 },// Tachelhit/Tifinagh/Morocco
+      {   183,     7,   145,28317,28317,28397,28397,28444,28444, 80, 80, 47, 47, 23, 23 },// Tachelhit/Latin/Morocco
+      {   184,     7,     3,28467,28548,28631,28678,28725,28748, 81, 83, 47, 47, 23, 23 },// Kabyle/Latin/Algeria
+      {   185,     7,   221,28771,28771,28922,28922,  132,  132,151,151, 47, 47, 23, 23 },// Nyankole/Latin/Uganda
+      {   186,     7,   210,28969,28969,29222,29222,29269,29269,253,253, 47, 47, 23, 23 },// Bena/Latin/Tanzania
+      {   187,     7,   210,29292,29292,19083,19083,  132,  132, 86, 86, 47, 47, 23, 23 },// Vunjo/Latin/Tanzania
+      {   188,     7,   132,29378,29378,29469,29469,29515,29515, 91, 91, 46, 46, 23, 23 },// Bambara/Latin/Mali
+      {   188,    75,   132,  361,  361,  361,  361,  155,  155, 47, 47, 47, 47, 26, 26 },// Bambara/Nko/Mali
+      {   189,     7,   111,29538,29538,29744,29744,29791,29791,206,206, 47, 47, 23, 23 },// Embu/Latin/Kenya
+      {   190,    12,   225,29814,29814,29871,29871,29906,29906, 57, 57, 35, 35, 23, 23 },// Cherokee/Cherokee/United States
+      {   191,     7,   137,29929,29929,29996,29996,30042,30042, 67, 67, 46, 46, 23, 23 },// Morisyen/Latin/Mauritius
+      {   192,     7,   210,30065,30065,19083,19083,  132,  132,263,263, 47, 47, 23, 23 },// Makonde/Latin/Tanzania
+      {   193,     7,   210,30328,30328,30438,30438,30520,30520,110,110, 82, 82, 23, 23 },// Langi/Latin/Tanzania
+      {   194,     7,   221,30543,30543,30639,30639,  132,  132, 96, 96, 47, 47, 23, 23 },// Ganda/Latin/Uganda
+      {   195,     7,   239,30686,30686,30768,30768,30815,30815, 82, 82, 47, 47, 23, 23 },// Bemba/Latin/Zambia
+      {   196,     7,    39,30838,30838,30922,30922,  132,  132, 84, 84, 47, 47, 23, 23 },// Kabuverdianu/Latin/Cape Verde
+      {   197,     7,   111,30969,30969,31054,31054,31101,31101, 85, 85, 47, 47, 23, 23 },// Meru/Latin/Kenya
+      {   198,     7,   111,31124,31124,31244,31244,31292,31292,120,120, 48, 48, 23, 23 },// Kalenjin/Latin/Kenya
+      {   199,     7,   148,31315,31315,   85,   85,  132,  132,135,135, 47, 47, 23, 23 },// Nama/Latin/Namibia
+      {   200,     7,   210,29292,29292,19083,19083,  132,  132, 86, 86, 47, 47, 23, 23 },// Machame/Latin/Tanzania
+      {   201,     7,    82,31450,31450,31536,31594,12904,12904, 86, 86, 58, 47, 23, 23 },// Colognian/Latin/Germany
+      {   202,     7,   111,31641,31641,31772,31772,  155,  155,131,131, 50, 50, 26, 26 },// Masai/Latin/Kenya
+      {   202,     7,   210,31641,31641,31772,31772,  155,  155,131,131, 50, 50, 26, 26 },// Masai/Latin/Tanzania
+      {   203,     7,   221,30543,30543,30639,30639,  132,  132, 96, 96, 47, 47, 23, 23 },// Soga/Latin/Uganda
+      {   204,     7,   111,19000,19000,31822,31822,  132,  132, 83, 83, 47, 47, 23, 23 },// Luyia/Latin/Kenya
+      {   205,     7,   210,19000,19000,31869,31869,  132,  132, 83, 83, 47, 47, 23, 23 },// Asu/Latin/Tanzania
+      {   206,     7,   221,31916,31916,32009,32009,32056,32056, 93, 93, 47, 47, 23, 23 },// Teso/Latin/Uganda
+      {   206,     7,   111,31916,31916,32009,32009,32056,32056, 93, 93, 47, 47, 23, 23 },// Teso/Latin/Kenya
+      {   207,     7,    67,  361,  361,  361,  361,  155,  155, 47, 47, 47, 47, 26, 26 },// Saho/Latin/Eritrea
+      {   208,     7,   132,32079,32079,32166,32166,32211,32211, 87, 87, 45, 45, 23, 23 },// Koyra Chiini/Latin/Mali
+      {   209,     7,   210,29292,29292,19083,19083,  132,  132, 86, 86, 47, 47, 23, 23 },// Rwa/Latin/Tanzania
+      {   210,     7,   111,32234,32234,32419,32419,32466,32466,185,185, 47, 47, 23, 23 },// Luo/Latin/Kenya
+      {   211,     7,   221,28771,28771,28922,28922,  132,  132,151,151, 47, 47, 23, 23 },// Chiga/Latin/Uganda
+      {   212,     7,   145,32489,32489,32574,32574,32621,32621, 85, 85, 47, 47, 23, 23 },// Central Morocco Tamazight/Latin/Morocco
+      {   213,     7,   132,32079,32079,32166,32166,32211,32211, 87, 87, 45, 45, 23, 23 },// Koyraboro Senni/Latin/Mali
+      {   214,     7,   210,32644,32644,19083,19083,  132,  132, 83, 83, 47, 47, 23, 23 },// Shambala/Latin/Tanzania
+      {   215,    13,   100,32727,32727,32727,32727,32814,32814, 87, 87, 87, 87, 30, 30 },// Bodo/Devanagari/India
+      {   218,     2,   178,10951,10951,21853,21853,11135,11135, 79, 79, 47, 47, 23, 23 },// Chechen/Cyrillic/Russia
+      {   219,     2,   178,32844,32960,33076,33076,33140,33140,116,116, 64, 64, 29, 29 },// Church/Cyrillic/Russia
+      {   220,     2,   178,  361,  361,  361,  361,  155,  155, 47, 47, 47, 47, 26, 26 },// Chuvash/Cyrillic/Russia
+      {   230,     7,    49,33169,33169,33267,33267,33315,33315, 98, 98, 48, 48, 23, 23 },// Luba Katanga/Latin/Congo Kinshasa
+      {   231,     7,   125,33338,33338,33422,33469,  132,  132, 84, 84, 47, 58, 23, 23 },// Luxembourgish/Latin/Luxembourg
+      {   236,     7,    21,  361,  361,  361,  361,  155,  155, 47, 47, 47, 47, 26, 26 },// Walloon/Latin/Belgium
+      {   237,     7,    37,33527,33527,33721,33721,33768,33768,194,194, 47, 47, 23, 23 },// Aghem/Latin/Cameroon
+      {   238,     7,    37,33791,33791,33880,33880,33927,33927, 89, 89, 47, 47, 23, 23 },// Basaa/Latin/Cameroon
+      {   239,     7,   156,32079,32079,32166,32166,32211,32211, 87, 87, 45, 45, 23, 23 },// Zarma/Latin/Niger
+      {   240,     7,    37,33950,33950,34048,34048,34096,34096, 98, 98, 48, 48, 23, 23 },// Duala/Latin/Cameroon
+      {   241,     7,   187,34119,34119,34200,34200,34235,34235, 81, 81, 35, 35, 23, 23 },// Jola Fonyi/Latin/Senegal
+      {   242,     7,    37,34258,34258,34398,34398,34447,34447,140,140, 49, 49, 23, 23 },// Ewondo/Latin/Cameroon
+      {   243,     7,    37,34470,34470,34660,34660,  155,  155,190,190, 38, 38, 26, 26 },// Bafia/Latin/Cameroon
+      {   244,     7,   146,34698,34698,34910,34910,34957,34957,212,212, 47, 47, 23, 23 },// Makhuwa Meetto/Latin/Mozambique
+      {   245,     7,    37,34980,34980,35118,35118,35165,35165,138,138, 47, 47, 23, 23 },// Mundang/Latin/Cameroon
+      {   246,     7,    37,35188,35188,35330,35330,  155,  155,142,142, 50, 50, 26, 26 },// Kwasio/Latin/Cameroon
+      {   247,     7,   254,35380,35380,35475,35475,35528,35528, 95, 95, 53, 53, 23, 23 },// Nuer/Latin/South Sudan
+      {   248,     2,   178,35551,35666,35786,35786,35835,35835,115,120, 49, 49, 23, 23 },// Sakha/Cyrillic/Russia
+      {   249,     7,   210,35858,35858,35974,35974,  155,  155,116,116, 47, 47, 26, 26 },// Sangu/Latin/Tanzania
+      {   251,     7,   156,32079,32079,32166,32166,32211,32211, 87, 87, 45, 45, 23, 23 },// Tasawaq/Latin/Niger
+      {   252,    35,   121,36021,36021,36081,36081,  155,  155, 60, 60, 37, 37, 26, 26 },// Vai/Vai/Liberia
+      {   252,     7,   121,36118,36118,36118,36118,  155,  155, 80, 80, 80, 80, 26, 26 },// Vai/Latin/Liberia
+      {   253,     7,   206,36198,36198,36296,36296,36343,36343, 98, 98, 47, 47, 23, 23 },// Walser/Latin/Switzerland
+      {   254,     7,    37,36366,36366,36556,36556,  155,  155,190,190, 50, 50, 26, 26 },// Yangben/Latin/Cameroon
+      {   256,     7,   197,36606,36690,36806,36853,36900,36900, 84,116, 47, 47, 23, 23 },// Asturian/Latin/Spain
+      {   257,     7,    37,36923,36923,36923,36923,  155,  155,173,173,173,173, 26, 26 },// Ngomba/Latin/Cameroon
+      {   258,     7,    37,37096,37096,37096,37096,  155,  155,101,101,101,101, 26, 26 },// Kako/Latin/Cameroon
+      {   259,     7,    37,37197,37197,37338,37338,37474,37474,141,141,136,136, 35, 35 },// Meta/Latin/Cameroon
+      {   260,     7,    37,37509,37509,37509,37509,  155,  155,164,164,164,164, 26, 26 },// Ngiemboon/Latin/Cameroon
+      {   261,     7,   197,  361,  361,  361,  361,  155,  155, 47, 47, 47, 47, 26, 26 },// Aragonese/Latin/Spain
+      {   272,    46,    18,37673,37862,37673,38051,38218,38218,189,189,189,167, 57, 57 },// Chakma/Chakma/Bangladesh
+      {   272,    46,   100,37673,37862,37673,38051,38218,38218,189,189,189,167, 57, 57 },// Chakma/Chakma/India
+      {   290,    11,   100,  361,  361,  361,  361,  155,  155, 47, 47, 47, 47, 26, 26 },// Manipuri/Bengali/India
+      {   309,   100,   232,  361,  361,  361,  361,  155,  155, 47, 47, 47, 47, 26, 26 },// Tai Dam/Tai Viet/Vietnam
+      {   312,     7,    37,  361,  361,  361,  361,  155,  155, 47, 47, 47, 47, 26, 26 },// Akoose/Latin/Cameroon
+      {   313,     7,   225,38275,38275,38275,38275,  155,  155,179,179,179,179, 26, 26 },// Lakota/Latin/United States
+      {   314,     9,   145,28167,28167,28247,28247,28294,28294, 80, 80, 47, 47, 23, 23 },// Standard Moroccan Tamazight/Tifinagh/Morocco
+      {   315,     7,    43,  361,  361,  361,  361,  155,  155, 47, 47, 47, 47, 26, 26 },// Mapuche/Latin/Chile
+      {   316,     1,   103,38454,38454,38454,38454,38558,38558,104,104,104,104, 23, 23 },// Central Kurdish/Arabic/Iraq
+      {   316,     1,   102,38454,38454,38454,38454,38558,38558,104,104,104,104, 23, 23 },// Central Kurdish/Arabic/Iran
+      {   317,     7,    82,38581,38665,38757,38804, 9704, 9704, 84, 92, 47, 59, 23, 23 },// Lower Sorbian/Latin/Germany
+      {   318,     7,    82,38863,38948,39040,39087, 9704, 9704, 85, 92, 47, 59, 23, 23 },// Upper Sorbian/Latin/Germany
+      {   319,     7,    37,  361,  361,  361,  361,  155,  155, 47, 47, 47, 47, 26, 26 },// Kenyang/Latin/Cameroon
+      {   320,     7,    38,  361,  361,  361,  361,  155,  155, 47, 47, 47, 47, 26, 26 },// Mohawk/Latin/Canada
+      {   321,    75,    91,  361,  361,  361,  361,  155,  155, 47, 47, 47, 47, 26, 26 },// Nko/Nko/Guinea
+      {   322,     7,   260,39146,39146,39236,39236,39283,39283, 90, 90, 47, 47, 23, 23 },// Prussian/Latin/World
+      {   323,     7,    90,  361,  361,  361,  361,  155,  155, 47, 47, 47, 47, 26, 26 },// Kiche/Latin/Guatemala
+      {   324,     7,   205,  361,  361,  361,  361,  155,  155, 47, 47, 47, 47, 26, 26 },// Southern Sami/Latin/Sweden
+      {   325,     7,   205,  361,  361,  361,  361,  155,  155, 47, 47, 47, 47, 26, 26 },// Lule Sami/Latin/Sweden
+      {   326,     7,    73,39306,39306,39445,39445,39521,39521,139,139, 76, 76, 24, 24 },// Inari Sami/Latin/Finland
+      {   327,     7,    73,  361,  361,  361,  361,  155,  155, 47, 47, 47, 47, 26, 26 },// Skolt Sami/Latin/Finland
+      {   328,     7,    13,  361,  361,  361,  361,  155,  155, 47, 47, 47, 47, 26, 26 },// Warlpiri/Latin/Australia
+      {   346,     1,   102,14818,14818,14818,14818,  155,  155, 69, 69, 69, 69, 26, 26 },// Mazanderani/Arabic/Iran
+      {   349,     1,   102,39545,39545,39545,39545,  155,  155, 76, 76, 76, 76, 26, 26 },// Northern Luri/Arabic/Iran
+      {   349,     1,   103,39545,39545,39545,39545,  155,  155, 76, 76, 76, 76, 26, 26 },// Northern Luri/Arabic/Iraq
+      {   357,     6,    97, 4387, 4387, 4387, 4387,  155,  155, 38, 38, 38, 38, 26, 26 },// Cantonese/Traditional Han/Hong Kong
+      {   357,     5,    44, 4350, 4350, 4387, 4387,  155,  155, 37, 37, 38, 38, 26, 26 },// Cantonese/Simplified Han/China
+      {   358,   138,   225,  361,  361,  361,  361,  155,  155, 47, 47, 47, 47, 26, 26 },// Osage/Osage/United States
+      {   360,     7,   260,  361,  361,  361,  361,  155,  155, 47, 47, 47, 47, 26, 26 },// Ido/Latin/World
+      {   361,     7,   260,  361,  361,  361,  361,  155,  155, 47, 47, 47, 47, 26, 26 },// Lojban/Latin/World
+      {   362,     7,   106,  361,  361,  361,  361,  155,  155, 47, 47, 47, 47, 26, 26 },// Sicilian/Latin/Italy
+      {   363,     1,   102,  361,  361,  361,  361,  155,  155, 47, 47, 47, 47, 26, 26 },// Southern Kurdish/Arabic/Iran
+      {   364,     1,   163,  361,  361,  361,  361,  155,  155, 47, 47, 47, 47, 26, 26 },// Western Balochi/Arabic/Pakistan
+      {   365,     7,   170,25786,25786,39621,39621,39666,39666, 87, 87, 45, 45, 23, 23 },// Cebuano/Latin/Philippines
+      {   366,     2,   178,  361,  361,  361,  361,  155,  155, 47, 47, 47, 47, 26, 26 },// Erzya/Cyrillic/Russia
+      {   367,     7,   225,  361,  361,  361,  361,  155,  155, 47, 47, 47, 47, 26, 26 },// Chickasaw/Latin/United States
+      {   368,     7,   225,  361,  361,  361,  361,  155,  155, 47, 47, 47, 47, 26, 26 },// Muscogee/Latin/United States
+      {   369,     7,   172,  361,  361,  361,  361,  155,  155, 47, 47, 47, 47, 26, 26 },// Silesian/Latin/Poland
+      {     0,     0,     0,    0,    0,    0,    0,    0,    0,  0,  0,  0,  0,  0,  0 },// trailing zeros
 };
 
-static const ushort months_data[] = {
-0x4a, 0x61, 0x6e, 0x3b, 0x46, 0x65, 0x62, 0x3b, 0x4d, 0x61, 0x72, 0x3b, 0x41, 0x70, 0x72, 0x3b, 0x4d, 0x61, 0x79, 0x3b,
-0x4a, 0x75, 0x6e, 0x3b, 0x4a, 0x75, 0x6c, 0x3b, 0x41, 0x75, 0x67, 0x3b, 0x53, 0x65, 0x70, 0x3b, 0x4f, 0x63, 0x74, 0x3b,
-0x4e, 0x6f, 0x76, 0x3b, 0x44, 0x65, 0x63, 0x3b, 0x4a, 0x61, 0x6e, 0x75, 0x61, 0x72, 0x79, 0x3b, 0x46, 0x65, 0x62, 0x72,
-0x75, 0x61, 0x72, 0x79, 0x3b, 0x4d, 0x61, 0x72, 0x63, 0x68, 0x3b, 0x41, 0x70, 0x72, 0x69, 0x6c, 0x3b, 0x4d, 0x61, 0x79,
-0x3b, 0x4a, 0x75, 0x6e, 0x65, 0x3b, 0x4a, 0x75, 0x6c, 0x79, 0x3b, 0x41, 0x75, 0x67, 0x75, 0x73, 0x74, 0x3b, 0x53, 0x65,
-0x70, 0x74, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x4f, 0x63, 0x74, 0x6f, 0x62, 0x65, 0x72, 0x3b, 0x4e, 0x6f, 0x76, 0x65,
-0x6d, 0x62, 0x65, 0x72, 0x3b, 0x44, 0x65, 0x63, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x4a, 0x3b, 0x46, 0x3b, 0x4d, 0x3b,
-0x41, 0x3b, 0x4d, 0x3b, 0x4a, 0x3b, 0x4a, 0x3b, 0x41, 0x3b, 0x53, 0x3b, 0x4f, 0x3b, 0x4e, 0x3b, 0x44, 0x3b, 0x31, 0x3b,
-0x32, 0x3b, 0x33, 0x3b, 0x34, 0x3b, 0x35, 0x3b, 0x36, 0x3b, 0x37, 0x3b, 0x38, 0x3b, 0x39, 0x3b, 0x31, 0x30, 0x3b, 0x31,
-0x31, 0x3b, 0x31, 0x32, 0x3b, 0x31, 0x33, 0x41, 0x6d, 0x61, 0x3b, 0x47, 0x75, 0x72, 0x3b, 0x42, 0x69, 0x74, 0x3b, 0x45,
-0x6c, 0x62, 0x3b, 0x43, 0x61, 0x6d, 0x3b, 0x57, 0x61, 0x78, 0x3b, 0x41, 0x64, 0x6f, 0x3b, 0x48, 0x61, 0x67, 0x3b, 0x46,
-0x75, 0x6c, 0x3b, 0x4f, 0x6e, 0x6b, 0x3b, 0x53, 0x61, 0x64, 0x3b, 0x4d, 0x75, 0x64, 0x3b, 0x41, 0x6d, 0x61, 0x6a, 0x6a,
-0x69, 0x69, 0x3b, 0x47, 0x75, 0x72, 0x61, 0x61, 0x6e, 0x64, 0x68, 0x61, 0x6c, 0x61, 0x3b, 0x42, 0x69, 0x74, 0x6f, 0x6f,
-0x74, 0x65, 0x65, 0x73, 0x73, 0x61, 0x3b, 0x45, 0x6c, 0x62, 0x61, 0x3b, 0x43, 0x61, 0x61, 0x6d, 0x73, 0x61, 0x3b, 0x57,
-0x61, 0x78, 0x61, 0x62, 0x61, 0x6a, 0x6a, 0x69, 0x69, 0x3b, 0x41, 0x64, 0x6f, 0x6f, 0x6c, 0x65, 0x65, 0x73, 0x73, 0x61,
-0x3b, 0x48, 0x61, 0x67, 0x61, 0x79, 0x79, 0x61, 0x3b, 0x46, 0x75, 0x75, 0x6c, 0x62, 0x61, 0x6e, 0x61, 0x3b, 0x4f, 0x6e,
-0x6b, 0x6f, 0x6c, 0x6f, 0x6c, 0x65, 0x65, 0x73, 0x73, 0x61, 0x3b, 0x53, 0x61, 0x64, 0x61, 0x61, 0x73, 0x61, 0x3b, 0x4d,
-0x75, 0x64, 0x64, 0x65, 0x65, 0x3b, 0x41, 0x3b, 0x47, 0x3b, 0x42, 0x3b, 0x45, 0x3b, 0x43, 0x3b, 0x57, 0x3b, 0x41, 0x3b,
-0x48, 0x3b, 0x46, 0x3b, 0x4f, 0x3b, 0x53, 0x3b, 0x4d, 0x3b, 0x4d, 0x30, 0x31, 0x3b, 0x4d, 0x30, 0x32, 0x3b, 0x4d, 0x30,
-0x33, 0x3b, 0x4d, 0x30, 0x34, 0x3b, 0x4d, 0x30, 0x35, 0x3b, 0x4d, 0x30, 0x36, 0x3b, 0x4d, 0x30, 0x37, 0x3b, 0x4d, 0x30,
-0x38, 0x3b, 0x4d, 0x30, 0x39, 0x3b, 0x4d, 0x31, 0x30, 0x3b, 0x4d, 0x31, 0x31, 0x3b, 0x4d, 0x31, 0x32, 0x3b, 0x31, 0x3b,
-0x32, 0x3b, 0x33, 0x3b, 0x34, 0x3b, 0x35, 0x3b, 0x36, 0x3b, 0x37, 0x3b, 0x38, 0x3b, 0x39, 0x3b, 0x31, 0x30, 0x3b, 0x31,
-0x31, 0x3b, 0x31, 0x32, 0x3b, 0x4a, 0x61, 0x6e, 0x2e, 0x3b, 0x46, 0x65, 0x62, 0x2e, 0x3b, 0x4d, 0x72, 0x74, 0x2e, 0x3b,
-0x41, 0x70, 0x72, 0x2e, 0x3b, 0x4d, 0x65, 0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x2e, 0x3b, 0x4a, 0x75, 0x6c, 0x2e, 0x3b, 0x41,
-0x75, 0x67, 0x2e, 0x3b, 0x53, 0x65, 0x70, 0x2e, 0x3b, 0x4f, 0x6b, 0x74, 0x2e, 0x3b, 0x4e, 0x6f, 0x76, 0x2e, 0x3b, 0x44,
-0x65, 0x73, 0x2e, 0x3b, 0x4a, 0x61, 0x6e, 0x75, 0x61, 0x72, 0x69, 0x65, 0x3b, 0x46, 0x65, 0x62, 0x72, 0x75, 0x61, 0x72,
-0x69, 0x65, 0x3b, 0x4d, 0x61, 0x61, 0x72, 0x74, 0x3b, 0x41, 0x70, 0x72, 0x69, 0x6c, 0x3b, 0x4d, 0x65, 0x69, 0x3b, 0x4a,
-0x75, 0x6e, 0x69, 0x65, 0x3b, 0x4a, 0x75, 0x6c, 0x69, 0x65, 0x3b, 0x41, 0x75, 0x67, 0x75, 0x73, 0x74, 0x75, 0x73, 0x3b,
-0x53, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x4f, 0x6b, 0x74, 0x6f, 0x62, 0x65, 0x72, 0x3b, 0x4e, 0x6f,
-0x76, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x44, 0x65, 0x73, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x6a, 0x61, 0x6e, 0x3b,
-0x73, 0x68, 0x6b, 0x3b, 0x6d, 0x61, 0x72, 0x3b, 0x70, 0x72, 0x69, 0x3b, 0x6d, 0x61, 0x6a, 0x3b, 0x71, 0x65, 0x72, 0x3b,
-0x6b, 0x6f, 0x72, 0x72, 0x3b, 0x67, 0x75, 0x73, 0x68, 0x3b, 0x73, 0x68, 0x74, 0x3b, 0x74, 0x65, 0x74, 0x3b, 0x6e, 0xeb,
-0x6e, 0x3b, 0x64, 0x68, 0x6a, 0x3b, 0x6a, 0x61, 0x6e, 0x61, 0x72, 0x3b, 0x73, 0x68, 0x6b, 0x75, 0x72, 0x74, 0x3b, 0x6d,
-0x61, 0x72, 0x73, 0x3b, 0x70, 0x72, 0x69, 0x6c, 0x6c, 0x3b, 0x6d, 0x61, 0x6a, 0x3b, 0x71, 0x65, 0x72, 0x73, 0x68, 0x6f,
-0x72, 0x3b, 0x6b, 0x6f, 0x72, 0x72, 0x69, 0x6b, 0x3b, 0x67, 0x75, 0x73, 0x68, 0x74, 0x3b, 0x73, 0x68, 0x74, 0x61, 0x74,
-0x6f, 0x72, 0x3b, 0x74, 0x65, 0x74, 0x6f, 0x72, 0x3b, 0x6e, 0xeb, 0x6e, 0x74, 0x6f, 0x72, 0x3b, 0x64, 0x68, 0x6a, 0x65,
-0x74, 0x6f, 0x72, 0x3b, 0x6a, 0x3b, 0x73, 0x68, 0x3b, 0x6d, 0x3b, 0x70, 0x3b, 0x6d, 0x3b, 0x71, 0x3b, 0x6b, 0x3b, 0x67,
-0x3b, 0x73, 0x68, 0x3b, 0x74, 0x3b, 0x6e, 0x3b, 0x64, 0x68, 0x3b, 0x1303, 0x1295, 0x12e9, 0x3b, 0x134c, 0x1265, 0x1229, 0x3b, 0x121b,
-0x122d, 0x127d, 0x3b, 0x12a4, 0x1355, 0x122a, 0x3b, 0x121c, 0x12ed, 0x3b, 0x1301, 0x1295, 0x3b, 0x1301, 0x120b, 0x12ed, 0x3b, 0x12a6, 0x1308, 0x1235,
-0x3b, 0x1234, 0x1355, 0x1274, 0x3b, 0x12a6, 0x12ad, 0x1276, 0x3b, 0x1296, 0x126c, 0x121d, 0x3b, 0x12f2, 0x1234, 0x121d, 0x3b, 0x1303, 0x1295, 0x12e9,
-0x12c8, 0x122a, 0x3b, 0x134c, 0x1265, 0x1229, 0x12c8, 0x122a, 0x3b, 0x121b, 0x122d, 0x127d, 0x3b, 0x12a4, 0x1355, 0x122a, 0x120d, 0x3b, 0x121c, 0x12ed,
-0x3b, 0x1301, 0x1295, 0x3b, 0x1301, 0x120b, 0x12ed, 0x3b, 0x12a6, 0x1308, 0x1235, 0x1275, 0x3b, 0x1234, 0x1355, 0x1274, 0x121d, 0x1260, 0x122d, 0x3b,
-0x12a6, 0x12ad, 0x1276, 0x1260, 0x122d, 0x3b, 0x1296, 0x126c, 0x121d, 0x1260, 0x122d, 0x3b, 0x12f2, 0x1234, 0x121d, 0x1260, 0x122d, 0x3b, 0x1303, 0x3b,
-0x134c, 0x3b, 0x121b, 0x3b, 0x12a4, 0x3b, 0x121c, 0x3b, 0x1301, 0x3b, 0x1301, 0x3b, 0x12a6, 0x3b, 0x1234, 0x3b, 0x12a6, 0x3b, 0x1296, 0x3b,
-0x12f2, 0x3b, 0x64a, 0x646, 0x627, 0x64a, 0x631, 0x3b, 0x641, 0x628, 0x631, 0x627, 0x64a, 0x631, 0x3b, 0x645, 0x627, 0x631, 0x633, 0x3b,
-0x623, 0x628, 0x631, 0x64a, 0x644, 0x3b, 0x645, 0x627, 0x64a, 0x648, 0x3b, 0x64a, 0x648, 0x646, 0x64a, 0x648, 0x3b, 0x64a, 0x648, 0x644,
-0x64a, 0x648, 0x3b, 0x623, 0x63a, 0x633, 0x637, 0x633, 0x3b, 0x633, 0x628, 0x62a, 0x645, 0x628, 0x631, 0x3b, 0x623, 0x643, 0x62a, 0x648,
-0x628, 0x631, 0x3b, 0x646, 0x648, 0x641, 0x645, 0x628, 0x631, 0x3b, 0x62f, 0x64a, 0x633, 0x645, 0x628, 0x631, 0x3b, 0x64a, 0x3b, 0x641,
-0x3b, 0x645, 0x3b, 0x623, 0x3b, 0x648, 0x3b, 0x646, 0x3b, 0x644, 0x3b, 0x63a, 0x3b, 0x633, 0x3b, 0x643, 0x3b, 0x628, 0x3b, 0x62f,
-0x3b, 0x62c, 0x627, 0x646, 0x641, 0x64a, 0x3b, 0x641, 0x64a, 0x641, 0x631, 0x64a, 0x3b, 0x645, 0x627, 0x631, 0x633, 0x3b, 0x623, 0x641,
-0x631, 0x64a, 0x644, 0x3b, 0x645, 0x627, 0x64a, 0x3b, 0x62c, 0x648, 0x627, 0x646, 0x3b, 0x62c, 0x648, 0x64a, 0x644, 0x64a, 0x629, 0x3b,
-0x623, 0x648, 0x62a, 0x3b, 0x633, 0x628, 0x62a, 0x645, 0x628, 0x631, 0x3b, 0x623, 0x643, 0x62a, 0x648, 0x628, 0x631, 0x3b, 0x646, 0x648,
-0x641, 0x645, 0x628, 0x631, 0x3b, 0x62f, 0x64a, 0x633, 0x645, 0x628, 0x631, 0x3b, 0x62c, 0x3b, 0x641, 0x3b, 0x645, 0x3b, 0x623, 0x3b,
-0x645, 0x3b, 0x62c, 0x3b, 0x62c, 0x3b, 0x623, 0x3b, 0x633, 0x3b, 0x623, 0x3b, 0x646, 0x3b, 0x62f, 0x3b, 0x643, 0x627, 0x646, 0x648,
-0x646, 0x20, 0x627, 0x644, 0x62b, 0x627, 0x646, 0x64a, 0x3b, 0x634, 0x628, 0x627, 0x637, 0x3b, 0x622, 0x630, 0x627, 0x631, 0x3b, 0x646,
-0x64a, 0x633, 0x627, 0x646, 0x3b, 0x623, 0x64a, 0x627, 0x631, 0x3b, 0x62d, 0x632, 0x64a, 0x631, 0x627, 0x646, 0x3b, 0x62a, 0x645, 0x648,
-0x632, 0x3b, 0x622, 0x628, 0x3b, 0x623, 0x64a, 0x644, 0x648, 0x644, 0x3b, 0x62a, 0x634, 0x631, 0x64a, 0x646, 0x20, 0x627, 0x644, 0x623,
-0x648, 0x644, 0x3b, 0x62a, 0x634, 0x631, 0x64a, 0x646, 0x20, 0x627, 0x644, 0x62b, 0x627, 0x646, 0x64a, 0x3b, 0x643, 0x627, 0x646, 0x648,
-0x646, 0x20, 0x627, 0x644, 0x623, 0x648, 0x644, 0x3b, 0x643, 0x3b, 0x634, 0x3b, 0x622, 0x3b, 0x646, 0x3b, 0x623, 0x3b, 0x62d, 0x3b,
-0x62a, 0x3b, 0x622, 0x3b, 0x623, 0x3b, 0x62a, 0x3b, 0x62a, 0x3b, 0x643, 0x3b, 0x643, 0x627, 0x646, 0x648, 0x646, 0x20, 0x627, 0x644,
-0x62b, 0x627, 0x646, 0x64a, 0x3b, 0x634, 0x628, 0x627, 0x637, 0x3b, 0x622, 0x630, 0x627, 0x631, 0x3b, 0x646, 0x64a, 0x633, 0x627, 0x646,
-0x3b, 0x623, 0x64a, 0x627, 0x631, 0x3b, 0x62d, 0x632, 0x64a, 0x631, 0x627, 0x646, 0x3b, 0x62a, 0x645, 0x648, 0x632, 0x3b, 0x622, 0x628,
-0x3b, 0x623, 0x64a, 0x644, 0x648, 0x644, 0x3b, 0x62a, 0x634, 0x631, 0x64a, 0x646, 0xa0, 0x627, 0x644, 0x623, 0x648, 0x644, 0x3b, 0x62a,
-0x634, 0x631, 0x64a, 0x646, 0x20, 0x627, 0x644, 0x62b, 0x627, 0x646, 0x64a, 0x3b, 0x643, 0x627, 0x646, 0x648, 0x646, 0x20, 0x627, 0x644,
-0x623, 0x648, 0x644, 0x3b, 0x64a, 0x646, 0x627, 0x64a, 0x631, 0x3b, 0x641, 0x628, 0x631, 0x627, 0x64a, 0x631, 0x3b, 0x645, 0x627, 0x631,
-0x633, 0x3b, 0x625, 0x628, 0x631, 0x64a, 0x644, 0x3b, 0x645, 0x627, 0x64a, 0x648, 0x3b, 0x64a, 0x648, 0x646, 0x64a, 0x648, 0x3b, 0x64a,
-0x648, 0x644, 0x64a, 0x648, 0x3b, 0x623, 0x63a, 0x634, 0x62a, 0x3b, 0x634, 0x62a, 0x645, 0x628, 0x631, 0x3b, 0x623, 0x643, 0x62a, 0x648,
-0x628, 0x631, 0x3b, 0x646, 0x648, 0x641, 0x645, 0x628, 0x631, 0x3b, 0x62f, 0x62c, 0x645, 0x628, 0x631, 0x3b, 0x64a, 0x3b, 0x641, 0x3b,
-0x645, 0x3b, 0x625, 0x3b, 0x648, 0x3b, 0x646, 0x3b, 0x644, 0x3b, 0x63a, 0x3b, 0x634, 0x3b, 0x643, 0x3b, 0x628, 0x3b, 0x62f, 0x3b,
-0x64a, 0x646, 0x627, 0x64a, 0x631, 0x3b, 0x641, 0x628, 0x631, 0x627, 0x64a, 0x631, 0x3b, 0x645, 0x627, 0x631, 0x633, 0x3b, 0x623, 0x628,
-0x631, 0x64a, 0x644, 0x3b, 0x645, 0x627, 0x64a, 0x3b, 0x64a, 0x648, 0x646, 0x64a, 0x648, 0x3b, 0x64a, 0x648, 0x644, 0x64a, 0x648, 0x632,
-0x3b, 0x63a, 0x634, 0x62a, 0x3b, 0x634, 0x62a, 0x646, 0x628, 0x631, 0x3b, 0x623, 0x643, 0x62a, 0x648, 0x628, 0x631, 0x3b, 0x646, 0x648,
-0x646, 0x628, 0x631, 0x3b, 0x62f, 0x62c, 0x646, 0x628, 0x631, 0x3b, 0x64a, 0x3b, 0x641, 0x3b, 0x645, 0x3b, 0x623, 0x3b, 0x645, 0x3b,
-0x646, 0x3b, 0x644, 0x3b, 0x63a, 0x3b, 0x634, 0x3b, 0x643, 0x3b, 0x628, 0x3b, 0x62f, 0x3b, 0x570, 0x576, 0x57e, 0x3b, 0x583, 0x57f,
-0x57e, 0x3b, 0x574, 0x580, 0x57f, 0x3b, 0x561, 0x57a, 0x580, 0x3b, 0x574, 0x575, 0x57d, 0x3b, 0x570, 0x576, 0x57d, 0x3b, 0x570, 0x56c,
-0x57d, 0x3b, 0x585, 0x563, 0x57d, 0x3b, 0x57d, 0x565, 0x57a, 0x3b, 0x570, 0x578, 0x56f, 0x3b, 0x576, 0x578, 0x575, 0x3b, 0x564, 0x565,
-0x56f, 0x3b, 0x570, 0x578, 0x582, 0x576, 0x57e, 0x561, 0x580, 0x3b, 0x583, 0x565, 0x57f, 0x580, 0x57e, 0x561, 0x580, 0x3b, 0x574, 0x561,
-0x580, 0x57f, 0x3b, 0x561, 0x57a, 0x580, 0x56b, 0x56c, 0x3b, 0x574, 0x561, 0x575, 0x56b, 0x57d, 0x3b, 0x570, 0x578, 0x582, 0x576, 0x56b,
-0x57d, 0x3b, 0x570, 0x578, 0x582, 0x56c, 0x56b, 0x57d, 0x3b, 0x585, 0x563, 0x578, 0x57d, 0x57f, 0x578, 0x57d, 0x3b, 0x57d, 0x565, 0x57a,
-0x57f, 0x565, 0x574, 0x562, 0x565, 0x580, 0x3b, 0x570, 0x578, 0x56f, 0x57f, 0x565, 0x574, 0x562, 0x565, 0x580, 0x3b, 0x576, 0x578, 0x575,
-0x565, 0x574, 0x562, 0x565, 0x580, 0x3b, 0x564, 0x565, 0x56f, 0x57f, 0x565, 0x574, 0x562, 0x565, 0x580, 0x3b, 0x540, 0x3b, 0x553, 0x3b,
-0x544, 0x3b, 0x531, 0x3b, 0x544, 0x3b, 0x540, 0x3b, 0x540, 0x3b, 0x555, 0x3b, 0x54d, 0x3b, 0x540, 0x3b, 0x546, 0x3b, 0x534, 0x3b,
-0x570, 0x578, 0x582, 0x576, 0x57e, 0x561, 0x580, 0x56b, 0x3b, 0x583, 0x565, 0x57f, 0x580, 0x57e, 0x561, 0x580, 0x56b, 0x3b, 0x574, 0x561,
-0x580, 0x57f, 0x56b, 0x3b, 0x561, 0x57a, 0x580, 0x56b, 0x56c, 0x56b, 0x3b, 0x574, 0x561, 0x575, 0x56b, 0x57d, 0x56b, 0x3b, 0x570, 0x578,
-0x582, 0x576, 0x56b, 0x57d, 0x56b, 0x3b, 0x570, 0x578, 0x582, 0x56c, 0x56b, 0x57d, 0x56b, 0x3b, 0x585, 0x563, 0x578, 0x57d, 0x57f, 0x578,
-0x57d, 0x56b, 0x3b, 0x57d, 0x565, 0x57a, 0x57f, 0x565, 0x574, 0x562, 0x565, 0x580, 0x56b, 0x3b, 0x570, 0x578, 0x56f, 0x57f, 0x565, 0x574,
-0x562, 0x565, 0x580, 0x56b, 0x3b, 0x576, 0x578, 0x575, 0x565, 0x574, 0x562, 0x565, 0x580, 0x56b, 0x3b, 0x564, 0x565, 0x56f, 0x57f, 0x565,
-0x574, 0x562, 0x565, 0x580, 0x56b, 0x3b, 0x99c, 0x9be, 0x9a8, 0x9c1, 0x3b, 0x9ab, 0x9c7, 0x9ac, 0x9cd, 0x9f0, 0x9c1, 0x3b, 0x9ae, 0x9be,
-0x9f0, 0x9cd, 0x99a, 0x3b, 0x98f, 0x9aa, 0x9cd, 0x9f0, 0x9bf, 0x9b2, 0x3b, 0x9ae, 0x9c7, 0x2019, 0x3b, 0x99c, 0x9c1, 0x9a8, 0x3b, 0x99c,
-0x9c1, 0x9b2, 0x9be, 0x987, 0x3b, 0x986, 0x997, 0x3b, 0x99b, 0x9c7, 0x9aa, 0x9cd, 0x9a4, 0x9c7, 0x3b, 0x985, 0x995, 0x9cd, 0x99f, 0x9cb,
-0x3b, 0x9a8, 0x9f1, 0x9c7, 0x3b, 0x9a1, 0x9bf, 0x99a, 0x9c7, 0x3b, 0x99c, 0x9be, 0x9a8, 0x9c1, 0x9f1, 0x9be, 0x9f0, 0x9c0, 0x3b, 0x9ab,
-0x9c7, 0x9ac, 0x9cd, 0x9f0, 0x9c1, 0x9f1, 0x9be, 0x9f0, 0x9c0, 0x3b, 0x9ae, 0x9be, 0x9f0, 0x9cd, 0x99a, 0x3b, 0x98f, 0x9aa, 0x9cd, 0x9f0,
-0x9bf, 0x9b2, 0x3b, 0x9ae, 0x9c7, 0x2019, 0x3b, 0x99c, 0x9c1, 0x9a8, 0x3b, 0x99c, 0x9c1, 0x9b2, 0x9be, 0x987, 0x3b, 0x986, 0x997, 0x9b7,
-0x9cd, 0x99f, 0x3b, 0x99b, 0x9c7, 0x9aa, 0x9cd, 0x9a4, 0x9c7, 0x9ae, 0x9cd, 0x9ac, 0x9f0, 0x3b, 0x985, 0x995, 0x9cd, 0x99f, 0x9cb, 0x9ac,
-0x9f0, 0x3b, 0x9a8, 0x9f1, 0x9c7, 0x9ae, 0x9cd, 0x9ac, 0x9f0, 0x3b, 0x9a1, 0x9bf, 0x99a, 0x9c7, 0x9ae, 0x9cd, 0x9ac, 0x9f0, 0x3b, 0x99c,
-0x3b, 0x9ab, 0x3b, 0x9ae, 0x3b, 0x98f, 0x3b, 0x9ae, 0x3b, 0x99c, 0x3b, 0x99c, 0x3b, 0x986, 0x3b, 0x99b, 0x3b, 0x985, 0x3b, 0x9a8,
-0x3b, 0x9a1, 0x3b, 0x79, 0x61, 0x6e, 0x3b, 0x66, 0x65, 0x76, 0x3b, 0x6d, 0x61, 0x72, 0x3b, 0x61, 0x70, 0x72, 0x3b, 0x6d,
-0x61, 0x79, 0x3b, 0x69, 0x79, 0x6e, 0x3b, 0x69, 0x79, 0x6c, 0x3b, 0x61, 0x76, 0x71, 0x3b, 0x73, 0x65, 0x6e, 0x3b, 0x6f,
-0x6b, 0x74, 0x3b, 0x6e, 0x6f, 0x79, 0x3b, 0x64, 0x65, 0x6b, 0x3b, 0x79, 0x61, 0x6e, 0x76, 0x61, 0x72, 0x3b, 0x46, 0x65,
-0x76, 0x72, 0x61, 0x6c, 0x3b, 0x6d, 0x61, 0x72, 0x74, 0x3b, 0x41, 0x70, 0x72, 0x65, 0x6c, 0x3b, 0x4d, 0x61, 0x79, 0x3b,
-0x130, 0x79, 0x75, 0x6e, 0x3b, 0x130, 0x79, 0x75, 0x6c, 0x3b, 0x41, 0x76, 0x71, 0x75, 0x73, 0x74, 0x3b, 0x53, 0x65, 0x6e,
-0x74, 0x79, 0x61, 0x62, 0x72, 0x3b, 0x4f, 0x6b, 0x74, 0x79, 0x61, 0x62, 0x72, 0x3b, 0x4e, 0x6f, 0x79, 0x61, 0x62, 0x72,
-0x3b, 0x64, 0x65, 0x6b, 0x61, 0x62, 0x72, 0x3b, 0x79, 0x61, 0x6e, 0x76, 0x61, 0x72, 0x3b, 0x66, 0x65, 0x76, 0x72, 0x61,
-0x6c, 0x3b, 0x6d, 0x61, 0x72, 0x74, 0x3b, 0x61, 0x70, 0x72, 0x65, 0x6c, 0x3b, 0x6d, 0x61, 0x79, 0x3b, 0x69, 0x79, 0x75,
-0x6e, 0x3b, 0x69, 0x79, 0x75, 0x6c, 0x3b, 0x61, 0x76, 0x71, 0x75, 0x73, 0x74, 0x3b, 0x73, 0x65, 0x6e, 0x74, 0x79, 0x61,
-0x62, 0x72, 0x3b, 0x6f, 0x6b, 0x74, 0x79, 0x61, 0x62, 0x72, 0x3b, 0x6e, 0x6f, 0x79, 0x61, 0x62, 0x72, 0x3b, 0x64, 0x65,
-0x6b, 0x61, 0x62, 0x72, 0x3b, 0x458, 0x430, 0x43d, 0x3b, 0x444, 0x435, 0x432, 0x3b, 0x43c, 0x430, 0x440, 0x3b, 0x430, 0x43f, 0x440,
-0x3b, 0x43c, 0x430, 0x439, 0x3b, 0x438, 0x458, 0x43d, 0x3b, 0x438, 0x458, 0x43b, 0x3b, 0x430, 0x432, 0x433, 0x3b, 0x441, 0x435, 0x43d,
-0x3b, 0x43e, 0x43a, 0x442, 0x3b, 0x43d, 0x43e, 0x458, 0x3b, 0x434, 0x435, 0x43a, 0x3b, 0x408, 0x430, 0x43d, 0x432, 0x430, 0x440, 0x3b,
-0x424, 0x435, 0x432, 0x440, 0x430, 0x43b, 0x3b, 0x41c, 0x430, 0x440, 0x442, 0x3b, 0x410, 0x43f, 0x440, 0x435, 0x43b, 0x3b, 0x41c, 0x430,
-0x439, 0x3b, 0x418, 0x458, 0x443, 0x43d, 0x3b, 0x418, 0x458, 0x443, 0x43b, 0x3b, 0x410, 0x432, 0x433, 0x443, 0x441, 0x442, 0x3b, 0x421,
-0x435, 0x43d, 0x442, 0x458, 0x430, 0x431, 0x440, 0x3b, 0x41e, 0x43a, 0x442, 0x458, 0x430, 0x431, 0x440, 0x3b, 0x41d, 0x43e, 0x458, 0x430,
-0x431, 0x440, 0x3b, 0x414, 0x435, 0x43a, 0x430, 0x431, 0x440, 0x3b, 0x458, 0x430, 0x43d, 0x432, 0x430, 0x440, 0x3b, 0x444, 0x435, 0x432,
-0x440, 0x430, 0x43b, 0x3b, 0x43c, 0x430, 0x440, 0x442, 0x3b, 0x430, 0x43f, 0x440, 0x435, 0x43b, 0x3b, 0x43c, 0x430, 0x439, 0x3b, 0x438,
-0x458, 0x443, 0x43d, 0x3b, 0x438, 0x458, 0x443, 0x43b, 0x3b, 0x430, 0x432, 0x433, 0x443, 0x441, 0x442, 0x3b, 0x441, 0x435, 0x43d, 0x442,
-0x458, 0x430, 0x431, 0x440, 0x3b, 0x43e, 0x43a, 0x442, 0x458, 0x430, 0x431, 0x440, 0x3b, 0x43d, 0x43e, 0x458, 0x430, 0x431, 0x440, 0x3b,
-0x434, 0x435, 0x43a, 0x430, 0x431, 0x440, 0x3b, 0x75, 0x72, 0x74, 0x2e, 0x3b, 0x6f, 0x74, 0x73, 0x2e, 0x3b, 0x6d, 0x61, 0x72,
-0x2e, 0x3b, 0x61, 0x70, 0x69, 0x2e, 0x3b, 0x6d, 0x61, 0x69, 0x2e, 0x3b, 0x65, 0x6b, 0x61, 0x2e, 0x3b, 0x75, 0x7a, 0x74,
-0x2e, 0x3b, 0x61, 0x62, 0x75, 0x2e, 0x3b, 0x69, 0x72, 0x61, 0x2e, 0x3b, 0x75, 0x72, 0x72, 0x2e, 0x3b, 0x61, 0x7a, 0x61,
-0x2e, 0x3b, 0x61, 0x62, 0x65, 0x2e, 0x3b, 0x75, 0x72, 0x74, 0x61, 0x72, 0x72, 0x69, 0x6c, 0x61, 0x3b, 0x6f, 0x74, 0x73,
-0x61, 0x69, 0x6c, 0x61, 0x3b, 0x6d, 0x61, 0x72, 0x74, 0x78, 0x6f, 0x61, 0x3b, 0x61, 0x70, 0x69, 0x72, 0x69, 0x6c, 0x61,
-0x3b, 0x6d, 0x61, 0x69, 0x61, 0x74, 0x7a, 0x61, 0x3b, 0x65, 0x6b, 0x61, 0x69, 0x6e, 0x61, 0x3b, 0x75, 0x7a, 0x74, 0x61,
-0x69, 0x6c, 0x61, 0x3b, 0x61, 0x62, 0x75, 0x7a, 0x74, 0x75, 0x61, 0x3b, 0x69, 0x72, 0x61, 0x69, 0x6c, 0x61, 0x3b, 0x75,
-0x72, 0x72, 0x69, 0x61, 0x3b, 0x61, 0x7a, 0x61, 0x72, 0x6f, 0x61, 0x3b, 0x61, 0x62, 0x65, 0x6e, 0x64, 0x75, 0x61, 0x3b,
-0x55, 0x3b, 0x4f, 0x3b, 0x4d, 0x3b, 0x41, 0x3b, 0x4d, 0x3b, 0x45, 0x3b, 0x55, 0x3b, 0x41, 0x3b, 0x49, 0x3b, 0x55, 0x3b,
-0x41, 0x3b, 0x41, 0x3b, 0x99c, 0x9be, 0x9a8, 0x9c1, 0x9af, 0x9bc, 0x9be, 0x9b0, 0x9c0, 0x3b, 0x9ab, 0x9c7, 0x9ac, 0x9cd, 0x9b0, 0x9c1,
-0x9af, 0x9bc, 0x9be, 0x9b0, 0x9c0, 0x3b, 0x9ae, 0x9be, 0x9b0, 0x9cd, 0x99a, 0x3b, 0x98f, 0x9aa, 0x9cd, 0x9b0, 0x9bf, 0x9b2, 0x3b, 0x9ae,
-0x9c7, 0x3b, 0x99c, 0x9c1, 0x9a8, 0x3b, 0x99c, 0x9c1, 0x9b2, 0x9be, 0x987, 0x3b, 0x986, 0x997, 0x9b8, 0x9cd, 0x99f, 0x3b, 0x9b8, 0x9c7,
-0x9aa, 0x9cd, 0x99f, 0x9c7, 0x9ae, 0x9cd, 0x9ac, 0x9b0, 0x3b, 0x985, 0x995, 0x9cd, 0x99f, 0x9cb, 0x9ac, 0x9b0, 0x3b, 0x9a8, 0x9ad, 0x9c7,
-0x9ae, 0x9cd, 0x9ac, 0x9b0, 0x3b, 0x9a1, 0x9bf, 0x9b8, 0x9c7, 0x9ae, 0x9cd, 0x9ac, 0x9b0, 0x3b, 0x99c, 0x9be, 0x3b, 0x9ab, 0x9c7, 0x3b,
-0x9ae, 0x9be, 0x3b, 0x98f, 0x3b, 0x9ae, 0x9c7, 0x3b, 0x99c, 0x9c1, 0x9a8, 0x3b, 0x99c, 0x9c1, 0x3b, 0x986, 0x3b, 0x9b8, 0x9c7, 0x3b,
-0x985, 0x3b, 0x9a8, 0x3b, 0x9a1, 0x9bf, 0x3b, 0x99c, 0x9be, 0x9a8, 0x9c1, 0x3b, 0x9ab, 0x9c7, 0x9ac, 0x3b, 0x9ae, 0x9be, 0x9b0, 0x9cd,
-0x99a, 0x3b, 0x98f, 0x9aa, 0x9cd, 0x9b0, 0x9bf, 0x9b2, 0x3b, 0x9ae, 0x9c7, 0x3b, 0x99c, 0x9c1, 0x9a8, 0x3b, 0x99c, 0x9c1, 0x9b2, 0x9be,
-0x987, 0x3b, 0x986, 0x997, 0x9b8, 0x9cd, 0x99f, 0x3b, 0x9b8, 0x9c7, 0x9aa, 0x9cd, 0x99f, 0x9c7, 0x9ae, 0x9cd, 0x9ac, 0x9b0, 0x3b, 0x985,
-0x995, 0x9cd, 0x99f, 0x9cb, 0x9ac, 0x9b0, 0x3b, 0x9a8, 0x9ad, 0x9c7, 0x9ae, 0x9cd, 0x9ac, 0x9b0, 0x3b, 0x9a1, 0x9bf, 0x9b8, 0x9c7, 0x9ae,
-0x9cd, 0x9ac, 0x9b0, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf21, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf22, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf23, 0x3b, 0xf5f,
-0xfb3, 0xf0b, 0xf24, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf25, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf26, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf27, 0x3b, 0xf5f,
-0xfb3, 0xf0b, 0xf28, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf29, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf21, 0xf20, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf21, 0xf21,
-0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf21, 0xf22, 0x3b, 0xf66, 0xfa4, 0xfb1, 0xf72, 0xf0b, 0xf5f, 0xfb3, 0xf0b, 0xf51, 0xf44, 0xf54, 0xf0b, 0x3b,
-0xf66, 0xfa4, 0xfb1, 0xf72, 0xf0b, 0xf5f, 0xfb3, 0xf0b, 0xf42, 0xf49, 0xf72, 0xf66, 0xf0b, 0xf54, 0xf0b, 0x3b, 0xf66, 0xfa4, 0xfb1, 0xf72,
-0xf0b, 0xf5f, 0xfb3, 0xf0b, 0xf42, 0xf66, 0xf74, 0xf58, 0xf0b, 0xf54, 0xf0b, 0x3b, 0xf66, 0xfa4, 0xfb1, 0xf72, 0xf0b, 0xf5f, 0xfb3, 0xf0b,
-0xf56, 0xf5e, 0xf72, 0xf0b, 0xf54, 0x3b, 0xf66, 0xfa4, 0xfb1, 0xf72, 0xf0b, 0xf5f, 0xfb3, 0xf0b, 0xf63, 0xf94, 0xf0b, 0xf54, 0xf0b, 0x3b,
-0xf66, 0xfa4, 0xfb1, 0xf72, 0xf0b, 0xf5f, 0xfb3, 0xf0b, 0xf51, 0xfb2, 0xf74, 0xf42, 0xf0b, 0xf54, 0x3b, 0xf66, 0xfa4, 0xfb1, 0xf72, 0xf0b,
-0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf51, 0xf74, 0xf53, 0xf0b, 0xf54, 0xf0b, 0x3b, 0xf66, 0xfa4, 0xfb1, 0xf72, 0xf0b, 0xf5f, 0xfb3, 0xf0b, 0xf56,
-0xf62, 0xf92, 0xfb1, 0xf51, 0xf0b, 0xf54, 0xf0b, 0x3b, 0xf66, 0xfa4, 0xfb1, 0xf72, 0xf0b, 0xf5f, 0xfb3, 0xf0b, 0xf51, 0xf42, 0xf74, 0xf0b,
-0xf54, 0xf0b, 0x3b, 0xf66, 0xfa4, 0xfb1, 0xf72, 0xf0b, 0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf45, 0xf74, 0xf0b, 0xf54, 0xf0b, 0x3b, 0xf66, 0xfa4,
-0xfb1, 0xf72, 0xf0b, 0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf45, 0xf74, 0xf0b, 0xf42, 0xf45, 0xf72, 0xf42, 0xf0b, 0xf54, 0xf0b, 0x3b, 0xf66, 0xfa4,
-0xfb1, 0xf72, 0xf0b, 0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf45, 0xf74, 0xf0b, 0xf42, 0xf49, 0xf72, 0xf66, 0xf0b, 0xf54, 0xf0b, 0x3b, 0xf21, 0x3b,
+static const char16_t months_data[] = {
+0x4a, 0x61, 0x6e, 0x75, 0x61, 0x72, 0x79, 0x3b, 0x46, 0x65, 0x62, 0x72, 0x75, 0x61, 0x72, 0x79, 0x3b, 0x4d, 0x61, 0x72,
+0x63, 0x68, 0x3b, 0x41, 0x70, 0x72, 0x69, 0x6c, 0x3b, 0x4d, 0x61, 0x79, 0x3b, 0x4a, 0x75, 0x6e, 0x65, 0x3b, 0x4a, 0x75,
+0x6c, 0x79, 0x3b, 0x41, 0x75, 0x67, 0x75, 0x73, 0x74, 0x3b, 0x53, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b,
+0x4f, 0x63, 0x74, 0x6f, 0x62, 0x65, 0x72, 0x3b, 0x4e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x44, 0x65, 0x63,
+0x65, 0x6d, 0x62, 0x65, 0x72, 0x4a, 0x61, 0x6e, 0x3b, 0x46, 0x65, 0x62, 0x3b, 0x4d, 0x61, 0x72, 0x3b, 0x41, 0x70, 0x72,
+0x3b, 0x4d, 0x61, 0x79, 0x3b, 0x4a, 0x75, 0x6e, 0x3b, 0x4a, 0x75, 0x6c, 0x3b, 0x41, 0x75, 0x67, 0x3b, 0x53, 0x65, 0x70,
+0x3b, 0x4f, 0x63, 0x74, 0x3b, 0x4e, 0x6f, 0x76, 0x3b, 0x44, 0x65, 0x63, 0x4a, 0x3b, 0x46, 0x3b, 0x4d, 0x3b, 0x41, 0x3b,
+0x4d, 0x3b, 0x4a, 0x3b, 0x4a, 0x3b, 0x41, 0x3b, 0x53, 0x3b, 0x4f, 0x3b, 0x4e, 0x3b, 0x44, 0x31, 0x3b, 0x32, 0x3b, 0x33,
+0x3b, 0x34, 0x3b, 0x35, 0x3b, 0x36, 0x3b, 0x37, 0x3b, 0x38, 0x3b, 0x39, 0x3b, 0x31, 0x30, 0x3b, 0x31, 0x31, 0x3b, 0x31,
+0x32, 0x41, 0x6d, 0x61, 0x6a, 0x6a, 0x69, 0x69, 0x3b, 0x47, 0x75, 0x72, 0x61, 0x61, 0x6e, 0x64, 0x68, 0x61, 0x6c, 0x61,
+0x3b, 0x42, 0x69, 0x74, 0x6f, 0x6f, 0x74, 0x65, 0x65, 0x73, 0x73, 0x61, 0x3b, 0x45, 0x6c, 0x62, 0x61, 0x3b, 0x43, 0x61,
+0x61, 0x6d, 0x73, 0x61, 0x3b, 0x57, 0x61, 0x78, 0x61, 0x62, 0x61, 0x6a, 0x6a, 0x69, 0x69, 0x3b, 0x41, 0x64, 0x6f, 0x6f,
+0x6c, 0x65, 0x65, 0x73, 0x73, 0x61, 0x3b, 0x48, 0x61, 0x67, 0x61, 0x79, 0x79, 0x61, 0x3b, 0x46, 0x75, 0x75, 0x6c, 0x62,
+0x61, 0x6e, 0x61, 0x3b, 0x4f, 0x6e, 0x6b, 0x6f, 0x6c, 0x6f, 0x6c, 0x65, 0x65, 0x73, 0x73, 0x61, 0x3b, 0x53, 0x61, 0x64,
+0x61, 0x61, 0x73, 0x61, 0x3b, 0x4d, 0x75, 0x64, 0x64, 0x65, 0x65, 0x41, 0x6d, 0x61, 0x3b, 0x47, 0x75, 0x72, 0x3b, 0x42,
+0x69, 0x74, 0x3b, 0x45, 0x6c, 0x62, 0x3b, 0x43, 0x61, 0x6d, 0x3b, 0x57, 0x61, 0x78, 0x3b, 0x41, 0x64, 0x6f, 0x3b, 0x48,
+0x61, 0x67, 0x3b, 0x46, 0x75, 0x6c, 0x3b, 0x4f, 0x6e, 0x6b, 0x3b, 0x53, 0x61, 0x64, 0x3b, 0x4d, 0x75, 0x64, 0x41, 0x3b,
+0x47, 0x3b, 0x42, 0x3b, 0x45, 0x3b, 0x43, 0x3b, 0x57, 0x3b, 0x41, 0x3b, 0x48, 0x3b, 0x46, 0x3b, 0x4f, 0x3b, 0x53, 0x3b,
+0x4d, 0x4d, 0x30, 0x31, 0x3b, 0x4d, 0x30, 0x32, 0x3b, 0x4d, 0x30, 0x33, 0x3b, 0x4d, 0x30, 0x34, 0x3b, 0x4d, 0x30, 0x35,
+0x3b, 0x4d, 0x30, 0x36, 0x3b, 0x4d, 0x30, 0x37, 0x3b, 0x4d, 0x30, 0x38, 0x3b, 0x4d, 0x30, 0x39, 0x3b, 0x4d, 0x31, 0x30,
+0x3b, 0x4d, 0x31, 0x31, 0x3b, 0x4d, 0x31, 0x32, 0x4a, 0x61, 0x6e, 0x75, 0x61, 0x72, 0x69, 0x65, 0x3b, 0x46, 0x65, 0x62,
+0x72, 0x75, 0x61, 0x72, 0x69, 0x65, 0x3b, 0x4d, 0x61, 0x61, 0x72, 0x74, 0x3b, 0x41, 0x70, 0x72, 0x69, 0x6c, 0x3b, 0x4d,
+0x65, 0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x69, 0x65, 0x3b, 0x4a, 0x75, 0x6c, 0x69, 0x65, 0x3b, 0x41, 0x75, 0x67, 0x75, 0x73,
+0x74, 0x75, 0x73, 0x3b, 0x53, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x4f, 0x6b, 0x74, 0x6f, 0x62, 0x65,
+0x72, 0x3b, 0x4e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x44, 0x65, 0x73, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x4a,
+0x61, 0x6e, 0x2e, 0x3b, 0x46, 0x65, 0x62, 0x2e, 0x3b, 0x4d, 0x72, 0x74, 0x2e, 0x3b, 0x41, 0x70, 0x72, 0x2e, 0x3b, 0x4d,
+0x65, 0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x2e, 0x3b, 0x4a, 0x75, 0x6c, 0x2e, 0x3b, 0x41, 0x75, 0x67, 0x2e, 0x3b, 0x53, 0x65,
+0x70, 0x2e, 0x3b, 0x4f, 0x6b, 0x74, 0x2e, 0x3b, 0x4e, 0x6f, 0x76, 0x2e, 0x3b, 0x44, 0x65, 0x73, 0x2e, 0x6a, 0x61, 0x6e,
+0x61, 0x72, 0x3b, 0x73, 0x68, 0x6b, 0x75, 0x72, 0x74, 0x3b, 0x6d, 0x61, 0x72, 0x73, 0x3b, 0x70, 0x72, 0x69, 0x6c, 0x6c,
+0x3b, 0x6d, 0x61, 0x6a, 0x3b, 0x71, 0x65, 0x72, 0x73, 0x68, 0x6f, 0x72, 0x3b, 0x6b, 0x6f, 0x72, 0x72, 0x69, 0x6b, 0x3b,
+0x67, 0x75, 0x73, 0x68, 0x74, 0x3b, 0x73, 0x68, 0x74, 0x61, 0x74, 0x6f, 0x72, 0x3b, 0x74, 0x65, 0x74, 0x6f, 0x72, 0x3b,
+0x6e, 0xeb, 0x6e, 0x74, 0x6f, 0x72, 0x3b, 0x64, 0x68, 0x6a, 0x65, 0x74, 0x6f, 0x72, 0x6a, 0x61, 0x6e, 0x3b, 0x73, 0x68,
+0x6b, 0x3b, 0x6d, 0x61, 0x72, 0x3b, 0x70, 0x72, 0x69, 0x3b, 0x6d, 0x61, 0x6a, 0x3b, 0x71, 0x65, 0x72, 0x3b, 0x6b, 0x6f,
+0x72, 0x72, 0x3b, 0x67, 0x75, 0x73, 0x68, 0x3b, 0x73, 0x68, 0x74, 0x3b, 0x74, 0x65, 0x74, 0x3b, 0x6e, 0xeb, 0x6e, 0x3b,
+0x64, 0x68, 0x6a, 0x6a, 0x3b, 0x73, 0x68, 0x3b, 0x6d, 0x3b, 0x70, 0x3b, 0x6d, 0x3b, 0x71, 0x3b, 0x6b, 0x3b, 0x67, 0x3b,
+0x73, 0x68, 0x3b, 0x74, 0x3b, 0x6e, 0x3b, 0x64, 0x68, 0x1303, 0x1295, 0x12e9, 0x12c8, 0x122a, 0x3b, 0x134c, 0x1265, 0x1229, 0x12c8, 0x122a,
+0x3b, 0x121b, 0x122d, 0x127d, 0x3b, 0x12a4, 0x1355, 0x122a, 0x120d, 0x3b, 0x121c, 0x12ed, 0x3b, 0x1301, 0x1295, 0x3b, 0x1301, 0x120b, 0x12ed, 0x3b,
+0x12a6, 0x1308, 0x1235, 0x1275, 0x3b, 0x1234, 0x1355, 0x1274, 0x121d, 0x1260, 0x122d, 0x3b, 0x12a6, 0x12ad, 0x1276, 0x1260, 0x122d, 0x3b, 0x1296, 0x126c,
+0x121d, 0x1260, 0x122d, 0x3b, 0x12f2, 0x1234, 0x121d, 0x1260, 0x122d, 0x1303, 0x1295, 0x12e9, 0x3b, 0x134c, 0x1265, 0x1229, 0x3b, 0x121b, 0x122d, 0x127d,
+0x3b, 0x12a4, 0x1355, 0x122a, 0x3b, 0x121c, 0x12ed, 0x3b, 0x1301, 0x1295, 0x3b, 0x1301, 0x120b, 0x12ed, 0x3b, 0x12a6, 0x1308, 0x1235, 0x3b, 0x1234,
+0x1355, 0x1274, 0x3b, 0x12a6, 0x12ad, 0x1276, 0x3b, 0x1296, 0x126c, 0x121d, 0x3b, 0x12f2, 0x1234, 0x121d, 0x1303, 0x3b, 0x134c, 0x3b, 0x121b, 0x3b,
+0x12a4, 0x3b, 0x121c, 0x3b, 0x1301, 0x3b, 0x1301, 0x3b, 0x12a6, 0x3b, 0x1234, 0x3b, 0x12a6, 0x3b, 0x1296, 0x3b, 0x12f2, 0x64a, 0x646, 0x627,
+0x64a, 0x631, 0x3b, 0x641, 0x628, 0x631, 0x627, 0x64a, 0x631, 0x3b, 0x645, 0x627, 0x631, 0x633, 0x3b, 0x623, 0x628, 0x631, 0x64a, 0x644,
+0x3b, 0x645, 0x627, 0x64a, 0x648, 0x3b, 0x64a, 0x648, 0x646, 0x64a, 0x648, 0x3b, 0x64a, 0x648, 0x644, 0x64a, 0x648, 0x3b, 0x623, 0x63a,
+0x633, 0x637, 0x633, 0x3b, 0x633, 0x628, 0x62a, 0x645, 0x628, 0x631, 0x3b, 0x623, 0x643, 0x62a, 0x648, 0x628, 0x631, 0x3b, 0x646, 0x648,
+0x641, 0x645, 0x628, 0x631, 0x3b, 0x62f, 0x64a, 0x633, 0x645, 0x628, 0x631, 0x64a, 0x3b, 0x641, 0x3b, 0x645, 0x3b, 0x623, 0x3b, 0x648,
+0x3b, 0x646, 0x3b, 0x644, 0x3b, 0x63a, 0x3b, 0x633, 0x3b, 0x643, 0x3b, 0x628, 0x3b, 0x62f, 0x62c, 0x627, 0x646, 0x641, 0x64a, 0x3b,
+0x641, 0x64a, 0x641, 0x631, 0x64a, 0x3b, 0x645, 0x627, 0x631, 0x633, 0x3b, 0x623, 0x641, 0x631, 0x64a, 0x644, 0x3b, 0x645, 0x627, 0x64a,
+0x3b, 0x62c, 0x648, 0x627, 0x646, 0x3b, 0x62c, 0x648, 0x64a, 0x644, 0x64a, 0x629, 0x3b, 0x623, 0x648, 0x62a, 0x3b, 0x633, 0x628, 0x62a,
+0x645, 0x628, 0x631, 0x3b, 0x623, 0x643, 0x62a, 0x648, 0x628, 0x631, 0x3b, 0x646, 0x648, 0x641, 0x645, 0x628, 0x631, 0x3b, 0x62f, 0x64a,
+0x633, 0x645, 0x628, 0x631, 0x62c, 0x3b, 0x641, 0x3b, 0x645, 0x3b, 0x623, 0x3b, 0x645, 0x3b, 0x62c, 0x3b, 0x62c, 0x3b, 0x623, 0x3b,
+0x633, 0x3b, 0x623, 0x3b, 0x646, 0x3b, 0x62f, 0x643, 0x627, 0x646, 0x648, 0x646, 0x20, 0x627, 0x644, 0x62b, 0x627, 0x646, 0x64a, 0x3b,
+0x634, 0x628, 0x627, 0x637, 0x3b, 0x622, 0x630, 0x627, 0x631, 0x3b, 0x646, 0x64a, 0x633, 0x627, 0x646, 0x3b, 0x623, 0x64a, 0x627, 0x631,
+0x3b, 0x62d, 0x632, 0x64a, 0x631, 0x627, 0x646, 0x3b, 0x62a, 0x645, 0x648, 0x632, 0x3b, 0x622, 0x628, 0x3b, 0x623, 0x64a, 0x644, 0x648,
+0x644, 0x3b, 0x62a, 0x634, 0x631, 0x64a, 0x646, 0x20, 0x627, 0x644, 0x623, 0x648, 0x644, 0x3b, 0x62a, 0x634, 0x631, 0x64a, 0x646, 0x20,
+0x627, 0x644, 0x62b, 0x627, 0x646, 0x64a, 0x3b, 0x643, 0x627, 0x646, 0x648, 0x646, 0x20, 0x627, 0x644, 0x623, 0x648, 0x644, 0x643, 0x627,
+0x646, 0x648, 0x646, 0x20, 0x627, 0x644, 0x62b, 0x627, 0x646, 0x64a, 0x3b, 0x634, 0x628, 0x627, 0x637, 0x3b, 0x622, 0x630, 0x627, 0x631,
+0x3b, 0x646, 0x64a, 0x633, 0x627, 0x646, 0x3b, 0x623, 0x64a, 0x627, 0x631, 0x3b, 0x62d, 0x632, 0x64a, 0x631, 0x627, 0x646, 0x3b, 0x62a,
+0x645, 0x648, 0x632, 0x3b, 0x622, 0x628, 0x3b, 0x623, 0x64a, 0x644, 0x648, 0x644, 0x3b, 0x62a, 0x634, 0x631, 0x64a, 0x646, 0xa0, 0x627,
+0x644, 0x623, 0x648, 0x644, 0x3b, 0x62a, 0x634, 0x631, 0x64a, 0x646, 0x20, 0x627, 0x644, 0x62b, 0x627, 0x646, 0x64a, 0x3b, 0x643, 0x627,
+0x646, 0x648, 0x646, 0x20, 0x627, 0x644, 0x623, 0x648, 0x644, 0x643, 0x3b, 0x634, 0x3b, 0x622, 0x3b, 0x646, 0x3b, 0x623, 0x3b, 0x62d,
+0x3b, 0x62a, 0x3b, 0x622, 0x3b, 0x623, 0x3b, 0x62a, 0x3b, 0x62a, 0x3b, 0x643, 0x64a, 0x646, 0x627, 0x64a, 0x631, 0x3b, 0x641, 0x628,
+0x631, 0x627, 0x64a, 0x631, 0x3b, 0x645, 0x627, 0x631, 0x633, 0x3b, 0x625, 0x628, 0x631, 0x64a, 0x644, 0x3b, 0x645, 0x627, 0x64a, 0x648,
+0x3b, 0x64a, 0x648, 0x646, 0x64a, 0x648, 0x3b, 0x64a, 0x648, 0x644, 0x64a, 0x648, 0x3b, 0x623, 0x63a, 0x634, 0x62a, 0x3b, 0x634, 0x62a,
+0x645, 0x628, 0x631, 0x3b, 0x623, 0x643, 0x62a, 0x648, 0x628, 0x631, 0x3b, 0x646, 0x648, 0x641, 0x645, 0x628, 0x631, 0x3b, 0x62f, 0x62c,
+0x645, 0x628, 0x631, 0x64a, 0x3b, 0x641, 0x3b, 0x645, 0x3b, 0x625, 0x3b, 0x648, 0x3b, 0x646, 0x3b, 0x644, 0x3b, 0x63a, 0x3b, 0x634,
+0x3b, 0x643, 0x3b, 0x628, 0x3b, 0x62f, 0x64a, 0x646, 0x627, 0x64a, 0x631, 0x3b, 0x641, 0x628, 0x631, 0x627, 0x64a, 0x631, 0x3b, 0x645,
+0x627, 0x631, 0x633, 0x3b, 0x623, 0x628, 0x631, 0x64a, 0x644, 0x3b, 0x645, 0x627, 0x64a, 0x3b, 0x64a, 0x648, 0x646, 0x64a, 0x648, 0x3b,
+0x64a, 0x648, 0x644, 0x64a, 0x648, 0x632, 0x3b, 0x63a, 0x634, 0x62a, 0x3b, 0x634, 0x62a, 0x646, 0x628, 0x631, 0x3b, 0x623, 0x643, 0x62a,
+0x648, 0x628, 0x631, 0x3b, 0x646, 0x648, 0x646, 0x628, 0x631, 0x3b, 0x62f, 0x62c, 0x646, 0x628, 0x631, 0x64a, 0x3b, 0x641, 0x3b, 0x645,
+0x3b, 0x623, 0x3b, 0x645, 0x3b, 0x646, 0x3b, 0x644, 0x3b, 0x63a, 0x3b, 0x634, 0x3b, 0x643, 0x3b, 0x628, 0x3b, 0x62f, 0x570, 0x578,
+0x582, 0x576, 0x57e, 0x561, 0x580, 0x3b, 0x583, 0x565, 0x57f, 0x580, 0x57e, 0x561, 0x580, 0x3b, 0x574, 0x561, 0x580, 0x57f, 0x3b, 0x561,
+0x57a, 0x580, 0x56b, 0x56c, 0x3b, 0x574, 0x561, 0x575, 0x56b, 0x57d, 0x3b, 0x570, 0x578, 0x582, 0x576, 0x56b, 0x57d, 0x3b, 0x570, 0x578,
+0x582, 0x56c, 0x56b, 0x57d, 0x3b, 0x585, 0x563, 0x578, 0x57d, 0x57f, 0x578, 0x57d, 0x3b, 0x57d, 0x565, 0x57a, 0x57f, 0x565, 0x574, 0x562,
+0x565, 0x580, 0x3b, 0x570, 0x578, 0x56f, 0x57f, 0x565, 0x574, 0x562, 0x565, 0x580, 0x3b, 0x576, 0x578, 0x575, 0x565, 0x574, 0x562, 0x565,
+0x580, 0x3b, 0x564, 0x565, 0x56f, 0x57f, 0x565, 0x574, 0x562, 0x565, 0x580, 0x570, 0x578, 0x582, 0x576, 0x57e, 0x561, 0x580, 0x56b, 0x3b,
+0x583, 0x565, 0x57f, 0x580, 0x57e, 0x561, 0x580, 0x56b, 0x3b, 0x574, 0x561, 0x580, 0x57f, 0x56b, 0x3b, 0x561, 0x57a, 0x580, 0x56b, 0x56c,
+0x56b, 0x3b, 0x574, 0x561, 0x575, 0x56b, 0x57d, 0x56b, 0x3b, 0x570, 0x578, 0x582, 0x576, 0x56b, 0x57d, 0x56b, 0x3b, 0x570, 0x578, 0x582,
+0x56c, 0x56b, 0x57d, 0x56b, 0x3b, 0x585, 0x563, 0x578, 0x57d, 0x57f, 0x578, 0x57d, 0x56b, 0x3b, 0x57d, 0x565, 0x57a, 0x57f, 0x565, 0x574,
+0x562, 0x565, 0x580, 0x56b, 0x3b, 0x570, 0x578, 0x56f, 0x57f, 0x565, 0x574, 0x562, 0x565, 0x580, 0x56b, 0x3b, 0x576, 0x578, 0x575, 0x565,
+0x574, 0x562, 0x565, 0x580, 0x56b, 0x3b, 0x564, 0x565, 0x56f, 0x57f, 0x565, 0x574, 0x562, 0x565, 0x580, 0x56b, 0x570, 0x576, 0x57e, 0x3b,
+0x583, 0x57f, 0x57e, 0x3b, 0x574, 0x580, 0x57f, 0x3b, 0x561, 0x57a, 0x580, 0x3b, 0x574, 0x575, 0x57d, 0x3b, 0x570, 0x576, 0x57d, 0x3b,
+0x570, 0x56c, 0x57d, 0x3b, 0x585, 0x563, 0x57d, 0x3b, 0x57d, 0x565, 0x57a, 0x3b, 0x570, 0x578, 0x56f, 0x3b, 0x576, 0x578, 0x575, 0x3b,
+0x564, 0x565, 0x56f, 0x540, 0x3b, 0x553, 0x3b, 0x544, 0x3b, 0x531, 0x3b, 0x544, 0x3b, 0x540, 0x3b, 0x540, 0x3b, 0x555, 0x3b, 0x54d,
+0x3b, 0x540, 0x3b, 0x546, 0x3b, 0x534, 0x99c, 0x9be, 0x9a8, 0x9c1, 0x9f1, 0x9be, 0x9f0, 0x9c0, 0x3b, 0x9ab, 0x9c7, 0x9ac, 0x9cd, 0x9f0,
+0x9c1, 0x9f1, 0x9be, 0x9f0, 0x9c0, 0x3b, 0x9ae, 0x9be, 0x9f0, 0x9cd, 0x99a, 0x3b, 0x98f, 0x9aa, 0x9cd, 0x9f0, 0x9bf, 0x9b2, 0x3b, 0x9ae,
+0x9c7, 0x2019, 0x3b, 0x99c, 0x9c1, 0x9a8, 0x3b, 0x99c, 0x9c1, 0x9b2, 0x9be, 0x987, 0x3b, 0x986, 0x997, 0x9b7, 0x9cd, 0x99f, 0x3b, 0x99b,
+0x9c7, 0x9aa, 0x9cd, 0x9a4, 0x9c7, 0x9ae, 0x9cd, 0x9ac, 0x9f0, 0x3b, 0x985, 0x995, 0x9cd, 0x99f, 0x9cb, 0x9ac, 0x9f0, 0x3b, 0x9a8, 0x9f1,
+0x9c7, 0x9ae, 0x9cd, 0x9ac, 0x9f0, 0x3b, 0x9a1, 0x9bf, 0x99a, 0x9c7, 0x9ae, 0x9cd, 0x9ac, 0x9f0, 0x99c, 0x9be, 0x9a8, 0x9c1, 0x3b, 0x9ab,
+0x9c7, 0x9ac, 0x9cd, 0x9f0, 0x9c1, 0x3b, 0x9ae, 0x9be, 0x9f0, 0x9cd, 0x99a, 0x3b, 0x98f, 0x9aa, 0x9cd, 0x9f0, 0x9bf, 0x9b2, 0x3b, 0x9ae,
+0x9c7, 0x2019, 0x3b, 0x99c, 0x9c1, 0x9a8, 0x3b, 0x99c, 0x9c1, 0x9b2, 0x9be, 0x987, 0x3b, 0x986, 0x997, 0x3b, 0x99b, 0x9c7, 0x9aa, 0x9cd,
+0x9a4, 0x9c7, 0x3b, 0x985, 0x995, 0x9cd, 0x99f, 0x9cb, 0x3b, 0x9a8, 0x9f1, 0x9c7, 0x3b, 0x9a1, 0x9bf, 0x99a, 0x9c7, 0x99c, 0x3b, 0x9ab,
+0x3b, 0x9ae, 0x3b, 0x98f, 0x3b, 0x9ae, 0x3b, 0x99c, 0x3b, 0x99c, 0x3b, 0x986, 0x3b, 0x99b, 0x3b, 0x985, 0x3b, 0x9a8, 0x3b, 0x9a1,
+0x79, 0x61, 0x6e, 0x76, 0x61, 0x72, 0x3b, 0x46, 0x65, 0x76, 0x72, 0x61, 0x6c, 0x3b, 0x6d, 0x61, 0x72, 0x74, 0x3b, 0x41,
+0x70, 0x72, 0x65, 0x6c, 0x3b, 0x4d, 0x61, 0x79, 0x3b, 0x130, 0x79, 0x75, 0x6e, 0x3b, 0x130, 0x79, 0x75, 0x6c, 0x3b, 0x41,
+0x76, 0x71, 0x75, 0x73, 0x74, 0x3b, 0x53, 0x65, 0x6e, 0x74, 0x79, 0x61, 0x62, 0x72, 0x3b, 0x4f, 0x6b, 0x74, 0x79, 0x61,
+0x62, 0x72, 0x3b, 0x4e, 0x6f, 0x79, 0x61, 0x62, 0x72, 0x3b, 0x64, 0x65, 0x6b, 0x61, 0x62, 0x72, 0x79, 0x61, 0x6e, 0x76,
+0x61, 0x72, 0x3b, 0x66, 0x65, 0x76, 0x72, 0x61, 0x6c, 0x3b, 0x6d, 0x61, 0x72, 0x74, 0x3b, 0x61, 0x70, 0x72, 0x65, 0x6c,
+0x3b, 0x6d, 0x61, 0x79, 0x3b, 0x69, 0x79, 0x75, 0x6e, 0x3b, 0x69, 0x79, 0x75, 0x6c, 0x3b, 0x61, 0x76, 0x71, 0x75, 0x73,
+0x74, 0x3b, 0x73, 0x65, 0x6e, 0x74, 0x79, 0x61, 0x62, 0x72, 0x3b, 0x6f, 0x6b, 0x74, 0x79, 0x61, 0x62, 0x72, 0x3b, 0x6e,
+0x6f, 0x79, 0x61, 0x62, 0x72, 0x3b, 0x64, 0x65, 0x6b, 0x61, 0x62, 0x72, 0x79, 0x61, 0x6e, 0x3b, 0x66, 0x65, 0x76, 0x3b,
+0x6d, 0x61, 0x72, 0x3b, 0x61, 0x70, 0x72, 0x3b, 0x6d, 0x61, 0x79, 0x3b, 0x69, 0x79, 0x6e, 0x3b, 0x69, 0x79, 0x6c, 0x3b,
+0x61, 0x76, 0x71, 0x3b, 0x73, 0x65, 0x6e, 0x3b, 0x6f, 0x6b, 0x74, 0x3b, 0x6e, 0x6f, 0x79, 0x3b, 0x64, 0x65, 0x6b, 0x408,
+0x430, 0x43d, 0x432, 0x430, 0x440, 0x3b, 0x424, 0x435, 0x432, 0x440, 0x430, 0x43b, 0x3b, 0x41c, 0x430, 0x440, 0x442, 0x3b, 0x410, 0x43f,
+0x440, 0x435, 0x43b, 0x3b, 0x41c, 0x430, 0x439, 0x3b, 0x418, 0x458, 0x443, 0x43d, 0x3b, 0x418, 0x458, 0x443, 0x43b, 0x3b, 0x410, 0x432,
+0x433, 0x443, 0x441, 0x442, 0x3b, 0x421, 0x435, 0x43d, 0x442, 0x458, 0x430, 0x431, 0x440, 0x3b, 0x41e, 0x43a, 0x442, 0x458, 0x430, 0x431,
+0x440, 0x3b, 0x41d, 0x43e, 0x458, 0x430, 0x431, 0x440, 0x3b, 0x414, 0x435, 0x43a, 0x430, 0x431, 0x440, 0x458, 0x430, 0x43d, 0x432, 0x430,
+0x440, 0x3b, 0x444, 0x435, 0x432, 0x440, 0x430, 0x43b, 0x3b, 0x43c, 0x430, 0x440, 0x442, 0x3b, 0x430, 0x43f, 0x440, 0x435, 0x43b, 0x3b,
+0x43c, 0x430, 0x439, 0x3b, 0x438, 0x458, 0x443, 0x43d, 0x3b, 0x438, 0x458, 0x443, 0x43b, 0x3b, 0x430, 0x432, 0x433, 0x443, 0x441, 0x442,
+0x3b, 0x441, 0x435, 0x43d, 0x442, 0x458, 0x430, 0x431, 0x440, 0x3b, 0x43e, 0x43a, 0x442, 0x458, 0x430, 0x431, 0x440, 0x3b, 0x43d, 0x43e,
+0x458, 0x430, 0x431, 0x440, 0x3b, 0x434, 0x435, 0x43a, 0x430, 0x431, 0x440, 0x458, 0x430, 0x43d, 0x3b, 0x444, 0x435, 0x432, 0x3b, 0x43c,
+0x430, 0x440, 0x3b, 0x430, 0x43f, 0x440, 0x3b, 0x43c, 0x430, 0x439, 0x3b, 0x438, 0x458, 0x43d, 0x3b, 0x438, 0x458, 0x43b, 0x3b, 0x430,
+0x432, 0x433, 0x3b, 0x441, 0x435, 0x43d, 0x3b, 0x43e, 0x43a, 0x442, 0x3b, 0x43d, 0x43e, 0x458, 0x3b, 0x434, 0x435, 0x43a, 0x75, 0x72,
+0x74, 0x61, 0x72, 0x72, 0x69, 0x6c, 0x61, 0x3b, 0x6f, 0x74, 0x73, 0x61, 0x69, 0x6c, 0x61, 0x3b, 0x6d, 0x61, 0x72, 0x74,
+0x78, 0x6f, 0x61, 0x3b, 0x61, 0x70, 0x69, 0x72, 0x69, 0x6c, 0x61, 0x3b, 0x6d, 0x61, 0x69, 0x61, 0x74, 0x7a, 0x61, 0x3b,
+0x65, 0x6b, 0x61, 0x69, 0x6e, 0x61, 0x3b, 0x75, 0x7a, 0x74, 0x61, 0x69, 0x6c, 0x61, 0x3b, 0x61, 0x62, 0x75, 0x7a, 0x74,
+0x75, 0x61, 0x3b, 0x69, 0x72, 0x61, 0x69, 0x6c, 0x61, 0x3b, 0x75, 0x72, 0x72, 0x69, 0x61, 0x3b, 0x61, 0x7a, 0x61, 0x72,
+0x6f, 0x61, 0x3b, 0x61, 0x62, 0x65, 0x6e, 0x64, 0x75, 0x61, 0x75, 0x72, 0x74, 0x2e, 0x3b, 0x6f, 0x74, 0x73, 0x2e, 0x3b,
+0x6d, 0x61, 0x72, 0x2e, 0x3b, 0x61, 0x70, 0x69, 0x2e, 0x3b, 0x6d, 0x61, 0x69, 0x2e, 0x3b, 0x65, 0x6b, 0x61, 0x2e, 0x3b,
+0x75, 0x7a, 0x74, 0x2e, 0x3b, 0x61, 0x62, 0x75, 0x2e, 0x3b, 0x69, 0x72, 0x61, 0x2e, 0x3b, 0x75, 0x72, 0x72, 0x2e, 0x3b,
+0x61, 0x7a, 0x61, 0x2e, 0x3b, 0x61, 0x62, 0x65, 0x2e, 0x55, 0x3b, 0x4f, 0x3b, 0x4d, 0x3b, 0x41, 0x3b, 0x4d, 0x3b, 0x45,
+0x3b, 0x55, 0x3b, 0x41, 0x3b, 0x49, 0x3b, 0x55, 0x3b, 0x41, 0x3b, 0x41, 0x99c, 0x9be, 0x9a8, 0x9c1, 0x9af, 0x9bc, 0x9be, 0x9b0,
+0x9c0, 0x3b, 0x9ab, 0x9c7, 0x9ac, 0x9cd, 0x9b0, 0x9c1, 0x9af, 0x9bc, 0x9be, 0x9b0, 0x9c0, 0x3b, 0x9ae, 0x9be, 0x9b0, 0x9cd, 0x99a, 0x3b,
+0x98f, 0x9aa, 0x9cd, 0x9b0, 0x9bf, 0x9b2, 0x3b, 0x9ae, 0x9c7, 0x3b, 0x99c, 0x9c1, 0x9a8, 0x3b, 0x99c, 0x9c1, 0x9b2, 0x9be, 0x987, 0x3b,
+0x986, 0x997, 0x9b8, 0x9cd, 0x99f, 0x3b, 0x9b8, 0x9c7, 0x9aa, 0x9cd, 0x99f, 0x9c7, 0x9ae, 0x9cd, 0x9ac, 0x9b0, 0x3b, 0x985, 0x995, 0x9cd,
+0x99f, 0x9cb, 0x9ac, 0x9b0, 0x3b, 0x9a8, 0x9ad, 0x9c7, 0x9ae, 0x9cd, 0x9ac, 0x9b0, 0x3b, 0x9a1, 0x9bf, 0x9b8, 0x9c7, 0x9ae, 0x9cd, 0x9ac,
+0x9b0, 0x99c, 0x9be, 0x9a8, 0x9c1, 0x3b, 0x9ab, 0x9c7, 0x9ac, 0x3b, 0x9ae, 0x9be, 0x9b0, 0x9cd, 0x99a, 0x3b, 0x98f, 0x9aa, 0x9cd, 0x9b0,
+0x9bf, 0x9b2, 0x3b, 0x9ae, 0x9c7, 0x3b, 0x99c, 0x9c1, 0x9a8, 0x3b, 0x99c, 0x9c1, 0x9b2, 0x9be, 0x987, 0x3b, 0x986, 0x997, 0x9b8, 0x9cd,
+0x99f, 0x3b, 0x9b8, 0x9c7, 0x9aa, 0x9cd, 0x99f, 0x9c7, 0x9ae, 0x9cd, 0x9ac, 0x9b0, 0x3b, 0x985, 0x995, 0x9cd, 0x99f, 0x9cb, 0x9ac, 0x9b0,
+0x3b, 0x9a8, 0x9ad, 0x9c7, 0x9ae, 0x9cd, 0x9ac, 0x9b0, 0x3b, 0x9a1, 0x9bf, 0x9b8, 0x9c7, 0x9ae, 0x9cd, 0x9ac, 0x9b0, 0x99c, 0x9be, 0x3b,
+0x9ab, 0x9c7, 0x3b, 0x9ae, 0x9be, 0x3b, 0x98f, 0x3b, 0x9ae, 0x9c7, 0x3b, 0x99c, 0x9c1, 0x9a8, 0x3b, 0x99c, 0x9c1, 0x3b, 0x986, 0x3b,
+0x9b8, 0x9c7, 0x3b, 0x985, 0x3b, 0x9a8, 0x3b, 0x9a1, 0x9bf, 0xf66, 0xfa4, 0xfb1, 0xf72, 0xf0b, 0xf5f, 0xfb3, 0xf0b, 0xf51, 0xf44, 0xf54,
+0xf0b, 0x3b, 0xf66, 0xfa4, 0xfb1, 0xf72, 0xf0b, 0xf5f, 0xfb3, 0xf0b, 0xf42, 0xf49, 0xf72, 0xf66, 0xf0b, 0xf54, 0xf0b, 0x3b, 0xf66, 0xfa4,
+0xfb1, 0xf72, 0xf0b, 0xf5f, 0xfb3, 0xf0b, 0xf42, 0xf66, 0xf74, 0xf58, 0xf0b, 0xf54, 0xf0b, 0x3b, 0xf66, 0xfa4, 0xfb1, 0xf72, 0xf0b, 0xf5f,
+0xfb3, 0xf0b, 0xf56, 0xf5e, 0xf72, 0xf0b, 0xf54, 0x3b, 0xf66, 0xfa4, 0xfb1, 0xf72, 0xf0b, 0xf5f, 0xfb3, 0xf0b, 0xf63, 0xf94, 0xf0b, 0xf54,
+0xf0b, 0x3b, 0xf66, 0xfa4, 0xfb1, 0xf72, 0xf0b, 0xf5f, 0xfb3, 0xf0b, 0xf51, 0xfb2, 0xf74, 0xf42, 0xf0b, 0xf54, 0x3b, 0xf66, 0xfa4, 0xfb1,
+0xf72, 0xf0b, 0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf51, 0xf74, 0xf53, 0xf0b, 0xf54, 0xf0b, 0x3b, 0xf66, 0xfa4, 0xfb1, 0xf72, 0xf0b, 0xf5f, 0xfb3,
+0xf0b, 0xf56, 0xf62, 0xf92, 0xfb1, 0xf51, 0xf0b, 0xf54, 0xf0b, 0x3b, 0xf66, 0xfa4, 0xfb1, 0xf72, 0xf0b, 0xf5f, 0xfb3, 0xf0b, 0xf51, 0xf42,
+0xf74, 0xf0b, 0xf54, 0xf0b, 0x3b, 0xf66, 0xfa4, 0xfb1, 0xf72, 0xf0b, 0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf45, 0xf74, 0xf0b, 0xf54, 0xf0b, 0x3b,
+0xf66, 0xfa4, 0xfb1, 0xf72, 0xf0b, 0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf45, 0xf74, 0xf0b, 0xf42, 0xf45, 0xf72, 0xf42, 0xf0b, 0xf54, 0xf0b, 0x3b,
+0xf66, 0xfa4, 0xfb1, 0xf72, 0xf0b, 0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf45, 0xf74, 0xf0b, 0xf42, 0xf49, 0xf72, 0xf66, 0xf0b, 0xf54, 0xf0b, 0xf5f,
+0xfb3, 0xf0b, 0xf51, 0xf44, 0xf54, 0xf0b, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf42, 0xf49, 0xf72, 0xf66, 0xf0b, 0xf54, 0xf0b, 0x3b, 0xf5f, 0xfb3,
+0xf0b, 0xf42, 0xf66, 0xf74, 0xf58, 0xf0b, 0xf54, 0xf0b, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf5e, 0xf72, 0xf0b, 0xf54, 0xf0b, 0x3b, 0xf5f,
+0xfb3, 0xf0b, 0xf63, 0xf94, 0xf0b, 0xf54, 0xf0b, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf51, 0xfb2, 0xf74, 0xf42, 0xf0b, 0xf54, 0x3b, 0xf5f, 0xfb3,
+0xf0b, 0xf56, 0xf51, 0xf74, 0xf53, 0xf0b, 0xf54, 0xf0b, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf62, 0xf92, 0xfb1, 0xf51, 0xf0b, 0xf54, 0xf0b,
+0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf51, 0xf42, 0xf74, 0xf0b, 0xf54, 0xf0b, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf45, 0xf74, 0xf0b, 0xf54, 0xf0b,
+0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf45, 0xf74, 0xf0b, 0xf42, 0xf45, 0xf72, 0xf42, 0xf0b, 0xf54, 0xf0b, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf56,
+0xf45, 0xf74, 0xf0b, 0xf42, 0xf49, 0xf72, 0xf66, 0xf0b, 0xf54, 0xf0b, 0xf5f, 0xfb3, 0xf0b, 0xf21, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf22, 0x3b,
+0xf5f, 0xfb3, 0xf0b, 0xf23, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf24, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf25, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf26, 0x3b,
+0xf5f, 0xfb3, 0xf0b, 0xf27, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf28, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf29, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf21, 0xf20,
+0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf21, 0xf21, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf21, 0xf22, 0xf21, 0x3b, 0xf22, 0x3b, 0xf23, 0x3b, 0xf24, 0x3b,
+0xf25, 0x3b, 0xf26, 0x3b, 0xf27, 0x3b, 0xf28, 0x3b, 0xf29, 0x3b, 0xf21, 0xf20, 0x3b, 0xf21, 0xf21, 0x3b, 0x31, 0x32, 0xf21, 0x3b,
 0xf22, 0x3b, 0xf23, 0x3b, 0xf24, 0x3b, 0xf25, 0x3b, 0xf26, 0x3b, 0xf27, 0x3b, 0xf28, 0x3b, 0xf29, 0x3b, 0xf21, 0xf20, 0x3b, 0xf21,
-0xf21, 0x3b, 0xf21, 0xf22, 0x3b, 0xf21, 0x3b, 0xf22, 0x3b, 0xf23, 0x3b, 0xf24, 0x3b, 0xf25, 0x3b, 0xf26, 0x3b, 0xf27, 0x3b, 0xf28,
-0x3b, 0xf29, 0x3b, 0xf21, 0xf20, 0x3b, 0xf21, 0xf21, 0x3b, 0x31, 0x32, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf51, 0xf44, 0xf54, 0xf0b, 0x3b,
-0xf5f, 0xfb3, 0xf0b, 0xf42, 0xf49, 0xf72, 0xf66, 0xf0b, 0xf54, 0xf0b, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf42, 0xf66, 0xf74, 0xf58, 0xf0b, 0xf54,
-0xf0b, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf5e, 0xf72, 0xf0b, 0xf54, 0xf0b, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf63, 0xf94, 0xf0b, 0xf54, 0xf0b,
-0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf51, 0xfb2, 0xf74, 0xf42, 0xf0b, 0xf54, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf51, 0xf74, 0xf53, 0xf0b, 0xf54,
-0xf0b, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf62, 0xf92, 0xfb1, 0xf51, 0xf0b, 0xf54, 0xf0b, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf51, 0xf42, 0xf74,
-0xf0b, 0xf54, 0xf0b, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf45, 0xf74, 0xf0b, 0xf54, 0xf0b, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf45, 0xf74,
-0xf0b, 0xf42, 0xf45, 0xf72, 0xf42, 0xf0b, 0xf54, 0xf0b, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf45, 0xf74, 0xf0b, 0xf42, 0xf49, 0xf72, 0xf66,
-0xf0b, 0xf54, 0xf0b, 0x3b, 0xf21, 0x3b, 0xf22, 0x3b, 0xf23, 0x3b, 0x34, 0x3b, 0xf25, 0x3b, 0xf26, 0x3b, 0xf27, 0x3b, 0xf28, 0x3b,
-0x39, 0x3b, 0xf21, 0xf20, 0x3b, 0xf21, 0xf21, 0x3b, 0xf21, 0xf22, 0x3b, 0x47, 0x65, 0x6e, 0x2e, 0x3b, 0x43, 0x2bc, 0x68, 0x77,
-0x65, 0x2e, 0x3b, 0x4d, 0x65, 0x75, 0x72, 0x2e, 0x3b, 0x45, 0x62, 0x72, 0x2e, 0x3b, 0x4d, 0x61, 0x65, 0x3b, 0x4d, 0x65,
-0x7a, 0x68, 0x2e, 0x3b, 0x47, 0x6f, 0x75, 0x65, 0x2e, 0x3b, 0x45, 0x6f, 0x73, 0x74, 0x3b, 0x47, 0x77, 0x65, 0x6e, 0x2e,
-0x3b, 0x48, 0x65, 0x72, 0x65, 0x3b, 0x44, 0x75, 0x3b, 0x4b, 0x7a, 0x75, 0x2e, 0x3b, 0x47, 0x65, 0x6e, 0x76, 0x65, 0x72,
-0x3b, 0x43, 0x2bc, 0x68, 0x77, 0x65, 0x76, 0x72, 0x65, 0x72, 0x3b, 0x4d, 0x65, 0x75, 0x72, 0x7a, 0x68, 0x3b, 0x45, 0x62,
-0x72, 0x65, 0x6c, 0x3b, 0x4d, 0x61, 0x65, 0x3b, 0x4d, 0x65, 0x7a, 0x68, 0x65, 0x76, 0x65, 0x6e, 0x3b, 0x47, 0x6f, 0x75,
-0x65, 0x72, 0x65, 0x3b, 0x45, 0x6f, 0x73, 0x74, 0x3b, 0x47, 0x77, 0x65, 0x6e, 0x67, 0x6f, 0x6c, 0x6f, 0x3b, 0x48, 0x65,
-0x72, 0x65, 0x3b, 0x44, 0x75, 0x3b, 0x4b, 0x65, 0x72, 0x7a, 0x75, 0x3b, 0x30, 0x31, 0x3b, 0x30, 0x32, 0x3b, 0x30, 0x33,
-0x3b, 0x30, 0x34, 0x3b, 0x30, 0x35, 0x3b, 0x30, 0x36, 0x3b, 0x30, 0x37, 0x3b, 0x30, 0x38, 0x3b, 0x30, 0x39, 0x3b, 0x31,
-0x30, 0x3b, 0x31, 0x31, 0x3b, 0x31, 0x32, 0x3b, 0x44f, 0x43d, 0x443, 0x3b, 0x444, 0x435, 0x432, 0x3b, 0x43c, 0x430, 0x440, 0x442,
-0x3b, 0x430, 0x43f, 0x440, 0x3b, 0x43c, 0x430, 0x439, 0x3b, 0x44e, 0x43d, 0x438, 0x3b, 0x44e, 0x43b, 0x438, 0x3b, 0x430, 0x432, 0x433,
-0x3b, 0x441, 0x435, 0x43f, 0x3b, 0x43e, 0x43a, 0x442, 0x3b, 0x43d, 0x43e, 0x435, 0x3b, 0x434, 0x435, 0x43a, 0x3b, 0x44f, 0x43d, 0x443,
-0x430, 0x440, 0x438, 0x3b, 0x444, 0x435, 0x432, 0x440, 0x443, 0x430, 0x440, 0x438, 0x3b, 0x43c, 0x430, 0x440, 0x442, 0x3b, 0x430, 0x43f,
-0x440, 0x438, 0x43b, 0x3b, 0x43c, 0x430, 0x439, 0x3b, 0x44e, 0x43d, 0x438, 0x3b, 0x44e, 0x43b, 0x438, 0x3b, 0x430, 0x432, 0x433, 0x443,
-0x441, 0x442, 0x3b, 0x441, 0x435, 0x43f, 0x442, 0x435, 0x43c, 0x432, 0x440, 0x438, 0x3b, 0x43e, 0x43a, 0x442, 0x43e, 0x43c, 0x432, 0x440,
-0x438, 0x3b, 0x43d, 0x43e, 0x435, 0x43c, 0x432, 0x440, 0x438, 0x3b, 0x434, 0x435, 0x43a, 0x435, 0x43c, 0x432, 0x440, 0x438, 0x3b, 0x44f,
-0x3b, 0x444, 0x3b, 0x43c, 0x3b, 0x430, 0x3b, 0x43c, 0x3b, 0x44e, 0x3b, 0x44e, 0x3b, 0x430, 0x3b, 0x441, 0x3b, 0x43e, 0x3b, 0x43d,
-0x3b, 0x434, 0x3b, 0x1007, 0x1014, 0x103a, 0x3b, 0x1016, 0x1031, 0x3b, 0x1019, 0x1010, 0x103a, 0x3b, 0x1027, 0x3b, 0x1019, 0x1031, 0x3b, 0x1007,
+0xf21, 0x3b, 0xf21, 0xf22, 0xf21, 0x3b, 0xf22, 0x3b, 0xf23, 0x3b, 0x34, 0x3b, 0xf25, 0x3b, 0xf26, 0x3b, 0xf27, 0x3b, 0xf28, 0x3b,
+0x39, 0x3b, 0xf21, 0xf20, 0x3b, 0xf21, 0xf21, 0x3b, 0xf21, 0xf22, 0x47, 0x65, 0x6e, 0x76, 0x65, 0x72, 0x3b, 0x43, 0x2bc, 0x68,
+0x77, 0x65, 0x76, 0x72, 0x65, 0x72, 0x3b, 0x4d, 0x65, 0x75, 0x72, 0x7a, 0x68, 0x3b, 0x45, 0x62, 0x72, 0x65, 0x6c, 0x3b,
+0x4d, 0x61, 0x65, 0x3b, 0x4d, 0x65, 0x7a, 0x68, 0x65, 0x76, 0x65, 0x6e, 0x3b, 0x47, 0x6f, 0x75, 0x65, 0x72, 0x65, 0x3b,
+0x45, 0x6f, 0x73, 0x74, 0x3b, 0x47, 0x77, 0x65, 0x6e, 0x67, 0x6f, 0x6c, 0x6f, 0x3b, 0x48, 0x65, 0x72, 0x65, 0x3b, 0x44,
+0x75, 0x3b, 0x4b, 0x65, 0x72, 0x7a, 0x75, 0x47, 0x65, 0x6e, 0x2e, 0x3b, 0x43, 0x2bc, 0x68, 0x77, 0x65, 0x2e, 0x3b, 0x4d,
+0x65, 0x75, 0x72, 0x2e, 0x3b, 0x45, 0x62, 0x72, 0x2e, 0x3b, 0x4d, 0x61, 0x65, 0x3b, 0x4d, 0x65, 0x7a, 0x68, 0x2e, 0x3b,
+0x47, 0x6f, 0x75, 0x65, 0x2e, 0x3b, 0x45, 0x6f, 0x73, 0x74, 0x3b, 0x47, 0x77, 0x65, 0x6e, 0x2e, 0x3b, 0x48, 0x65, 0x72,
+0x65, 0x3b, 0x44, 0x75, 0x3b, 0x4b, 0x7a, 0x75, 0x2e, 0x30, 0x31, 0x3b, 0x30, 0x32, 0x3b, 0x30, 0x33, 0x3b, 0x30, 0x34,
+0x3b, 0x30, 0x35, 0x3b, 0x30, 0x36, 0x3b, 0x30, 0x37, 0x3b, 0x30, 0x38, 0x3b, 0x30, 0x39, 0x3b, 0x31, 0x30, 0x3b, 0x31,
+0x31, 0x3b, 0x31, 0x32, 0x44f, 0x43d, 0x443, 0x430, 0x440, 0x438, 0x3b, 0x444, 0x435, 0x432, 0x440, 0x443, 0x430, 0x440, 0x438, 0x3b,
+0x43c, 0x430, 0x440, 0x442, 0x3b, 0x430, 0x43f, 0x440, 0x438, 0x43b, 0x3b, 0x43c, 0x430, 0x439, 0x3b, 0x44e, 0x43d, 0x438, 0x3b, 0x44e,
+0x43b, 0x438, 0x3b, 0x430, 0x432, 0x433, 0x443, 0x441, 0x442, 0x3b, 0x441, 0x435, 0x43f, 0x442, 0x435, 0x43c, 0x432, 0x440, 0x438, 0x3b,
+0x43e, 0x43a, 0x442, 0x43e, 0x43c, 0x432, 0x440, 0x438, 0x3b, 0x43d, 0x43e, 0x435, 0x43c, 0x432, 0x440, 0x438, 0x3b, 0x434, 0x435, 0x43a,
+0x435, 0x43c, 0x432, 0x440, 0x438, 0x44f, 0x43d, 0x443, 0x3b, 0x444, 0x435, 0x432, 0x3b, 0x43c, 0x430, 0x440, 0x442, 0x3b, 0x430, 0x43f,
+0x440, 0x3b, 0x43c, 0x430, 0x439, 0x3b, 0x44e, 0x43d, 0x438, 0x3b, 0x44e, 0x43b, 0x438, 0x3b, 0x430, 0x432, 0x433, 0x3b, 0x441, 0x435,
+0x43f, 0x3b, 0x43e, 0x43a, 0x442, 0x3b, 0x43d, 0x43e, 0x435, 0x3b, 0x434, 0x435, 0x43a, 0x44f, 0x3b, 0x444, 0x3b, 0x43c, 0x3b, 0x430,
+0x3b, 0x43c, 0x3b, 0x44e, 0x3b, 0x44e, 0x3b, 0x430, 0x3b, 0x441, 0x3b, 0x43e, 0x3b, 0x43d, 0x3b, 0x434, 0x1007, 0x1014, 0x103a, 0x1014,
+0x101d, 0x102b, 0x101b, 0x102e, 0x3b, 0x1016, 0x1031, 0x1016, 0x1031, 0x102c, 0x103a, 0x101d, 0x102b, 0x101b, 0x102e, 0x3b, 0x1019, 0x1010, 0x103a, 0x3b,
+0x1027, 0x1015, 0x103c, 0x102e, 0x3b, 0x1019, 0x1031, 0x3b, 0x1007, 0x103d, 0x1014, 0x103a, 0x3b, 0x1007, 0x1030, 0x101c, 0x102d, 0x102f, 0x1004, 0x103a,
+0x3b, 0x1029, 0x1002, 0x102f, 0x1010, 0x103a, 0x3b, 0x1005, 0x1000, 0x103a, 0x1010, 0x1004, 0x103a, 0x1018, 0x102c, 0x3b, 0x1021, 0x1031, 0x102c, 0x1000,
+0x103a, 0x1010, 0x102d, 0x102f, 0x1018, 0x102c, 0x3b, 0x1014, 0x102d, 0x102f, 0x101d, 0x1004, 0x103a, 0x1018, 0x102c, 0x3b, 0x1012, 0x102e, 0x1007, 0x1004,
+0x103a, 0x1018, 0x102c, 0x1007, 0x1014, 0x103a, 0x3b, 0x1016, 0x1031, 0x3b, 0x1019, 0x1010, 0x103a, 0x3b, 0x1027, 0x3b, 0x1019, 0x1031, 0x3b, 0x1007,
 0x103d, 0x1014, 0x103a, 0x3b, 0x1007, 0x1030, 0x3b, 0x1029, 0x3b, 0x1005, 0x1000, 0x103a, 0x3b, 0x1021, 0x1031, 0x102c, 0x1000, 0x103a, 0x3b, 0x1014,
-0x102d, 0x102f, 0x3b, 0x1012, 0x102e, 0x3b, 0x1007, 0x1014, 0x103a, 0x1014, 0x101d, 0x102b, 0x101b, 0x102e, 0x3b, 0x1016, 0x1031, 0x1016, 0x1031, 0x102c,
-0x103a, 0x101d, 0x102b, 0x101b, 0x102e, 0x3b, 0x1019, 0x1010, 0x103a, 0x3b, 0x1027, 0x1015, 0x103c, 0x102e, 0x3b, 0x1019, 0x1031, 0x3b, 0x1007, 0x103d,
-0x1014, 0x103a, 0x3b, 0x1007, 0x1030, 0x101c, 0x102d, 0x102f, 0x1004, 0x103a, 0x3b, 0x1029, 0x1002, 0x102f, 0x1010, 0x103a, 0x3b, 0x1005, 0x1000, 0x103a,
-0x1010, 0x1004, 0x103a, 0x1018, 0x102c, 0x3b, 0x1021, 0x1031, 0x102c, 0x1000, 0x103a, 0x1010, 0x102d, 0x102f, 0x1018, 0x102c, 0x3b, 0x1014, 0x102d, 0x102f,
-0x101d, 0x1004, 0x103a, 0x1018, 0x102c, 0x3b, 0x1012, 0x102e, 0x1007, 0x1004, 0x103a, 0x1018, 0x102c, 0x3b, 0x1007, 0x3b, 0x1016, 0x3b, 0x1019, 0x3b,
-0x1027, 0x3b, 0x1019, 0x3b, 0x1007, 0x3b, 0x1007, 0x3b, 0x1029, 0x3b, 0x1005, 0x3b, 0x1021, 0x3b, 0x1014, 0x3b, 0x1012, 0x3b, 0x441, 0x442,
-0x443, 0x3b, 0x43b, 0x44e, 0x442, 0x3b, 0x441, 0x430, 0x43a, 0x3b, 0x43a, 0x440, 0x430, 0x3b, 0x43c, 0x430, 0x439, 0x3b, 0x447, 0x44d,
-0x440, 0x3b, 0x43b, 0x456, 0x43f, 0x3b, 0x436, 0x43d, 0x456, 0x3b, 0x432, 0x435, 0x440, 0x3b, 0x43a, 0x430, 0x441, 0x3b, 0x43b, 0x456,
-0x441, 0x3b, 0x441, 0x43d, 0x435, 0x3b, 0x441, 0x442, 0x443, 0x434, 0x437, 0x435, 0x43d, 0x44c, 0x3b, 0x43b, 0x44e, 0x442, 0x44b, 0x3b,
-0x441, 0x430, 0x43a, 0x430, 0x432, 0x456, 0x43a, 0x3b, 0x43a, 0x440, 0x430, 0x441, 0x430, 0x432, 0x456, 0x43a, 0x3b, 0x43c, 0x430, 0x439,
-0x3b, 0x447, 0x44d, 0x440, 0x432, 0x435, 0x43d, 0x44c, 0x3b, 0x43b, 0x456, 0x43f, 0x435, 0x43d, 0x44c, 0x3b, 0x436, 0x43d, 0x456, 0x432,
-0x435, 0x43d, 0x44c, 0x3b, 0x432, 0x435, 0x440, 0x430, 0x441, 0x435, 0x43d, 0x44c, 0x3b, 0x43a, 0x430, 0x441, 0x442, 0x440, 0x44b, 0x447,
-0x43d, 0x456, 0x43a, 0x3b, 0x43b, 0x456, 0x441, 0x442, 0x430, 0x43f, 0x430, 0x434, 0x3b, 0x441, 0x43d, 0x435, 0x436, 0x430, 0x43d, 0x44c,
-0x3b, 0x441, 0x3b, 0x43b, 0x3b, 0x441, 0x3b, 0x43a, 0x3b, 0x43c, 0x3b, 0x447, 0x3b, 0x43b, 0x3b, 0x436, 0x3b, 0x432, 0x3b, 0x43a,
-0x3b, 0x43b, 0x3b, 0x441, 0x3b, 0x441, 0x442, 0x443, 0x3b, 0x43b, 0x44e, 0x442, 0x3b, 0x441, 0x430, 0x43a, 0x3b, 0x43a, 0x440, 0x430,
-0x3b, 0x43c, 0x430, 0x44f, 0x3b, 0x447, 0x44d, 0x440, 0x3b, 0x43b, 0x456, 0x43f, 0x3b, 0x436, 0x43d, 0x456, 0x3b, 0x432, 0x435, 0x440,
-0x3b, 0x43a, 0x430, 0x441, 0x3b, 0x43b, 0x456, 0x441, 0x3b, 0x441, 0x43d, 0x435, 0x3b, 0x441, 0x442, 0x443, 0x434, 0x437, 0x435, 0x43d,
-0x44f, 0x3b, 0x43b, 0x44e, 0x442, 0x430, 0x433, 0x430, 0x3b, 0x441, 0x430, 0x43a, 0x430, 0x432, 0x456, 0x43a, 0x430, 0x3b, 0x43a, 0x440,
-0x430, 0x441, 0x430, 0x432, 0x456, 0x43a, 0x430, 0x3b, 0x43c, 0x430, 0x44f, 0x3b, 0x447, 0x44d, 0x440, 0x432, 0x435, 0x43d, 0x44f, 0x3b,
-0x43b, 0x456, 0x43f, 0x435, 0x43d, 0x44f, 0x3b, 0x436, 0x43d, 0x456, 0x45e, 0x43d, 0x44f, 0x3b, 0x432, 0x435, 0x440, 0x430, 0x441, 0x43d,
-0x44f, 0x3b, 0x43a, 0x430, 0x441, 0x442, 0x440, 0x44b, 0x447, 0x43d, 0x456, 0x43a, 0x430, 0x3b, 0x43b, 0x456, 0x441, 0x442, 0x430, 0x43f,
-0x430, 0x434, 0x430, 0x3b, 0x441, 0x43d, 0x435, 0x436, 0x43d, 0x44f, 0x3b, 0x1798, 0x1780, 0x179a, 0x17b6, 0x3b, 0x1780, 0x17bb, 0x1798, 0x17d2,
-0x1797, 0x17c8, 0x3b, 0x1798, 0x17b8, 0x1793, 0x17b6, 0x3b, 0x1798, 0x17c1, 0x179f, 0x17b6, 0x3b, 0x17a7, 0x179f, 0x1797, 0x17b6, 0x3b, 0x1798, 0x17b7,
-0x1790, 0x17bb, 0x1793, 0x17b6, 0x3b, 0x1780, 0x1780, 0x17d2, 0x1780, 0x178a, 0x17b6, 0x3b, 0x179f, 0x17b8, 0x17a0, 0x17b6, 0x3b, 0x1780, 0x1789, 0x17d2,
-0x1789, 0x17b6, 0x3b, 0x178f, 0x17bb, 0x179b, 0x17b6, 0x3b, 0x179c, 0x17b7, 0x1785, 0x17d2, 0x1786, 0x17b7, 0x1780, 0x17b6, 0x3b, 0x1792, 0x17d2, 0x1793,
-0x17bc, 0x3b, 0x1798, 0x3b, 0x1780, 0x3b, 0x1798, 0x3b, 0x1798, 0x3b, 0x17a7, 0x3b, 0x1798, 0x3b, 0x1780, 0x3b, 0x179f, 0x3b, 0x1780, 0x3b,
-0x178f, 0x3b, 0x179c, 0x3b, 0x1792, 0x3b, 0x67, 0x65, 0x6e, 0x2e, 0x3b, 0x66, 0x65, 0x62, 0x72, 0x2e, 0x3b, 0x6d, 0x61, 0x72,
-0xe7, 0x3b, 0x61, 0x62, 0x72, 0x2e, 0x3b, 0x6d, 0x61, 0x69, 0x67, 0x3b, 0x6a, 0x75, 0x6e, 0x79, 0x3b, 0x6a, 0x75, 0x6c,
-0x2e, 0x3b, 0x61, 0x67, 0x2e, 0x3b, 0x73, 0x65, 0x74, 0x2e, 0x3b, 0x6f, 0x63, 0x74, 0x2e, 0x3b, 0x6e, 0x6f, 0x76, 0x2e,
-0x3b, 0x64, 0x65, 0x73, 0x2e, 0x3b, 0x67, 0x65, 0x6e, 0x65, 0x72, 0x3b, 0x66, 0x65, 0x62, 0x72, 0x65, 0x72, 0x3b, 0x6d,
-0x61, 0x72, 0xe7, 0x3b, 0x61, 0x62, 0x72, 0x69, 0x6c, 0x3b, 0x6d, 0x61, 0x69, 0x67, 0x3b, 0x6a, 0x75, 0x6e, 0x79, 0x3b,
-0x6a, 0x75, 0x6c, 0x69, 0x6f, 0x6c, 0x3b, 0x61, 0x67, 0x6f, 0x73, 0x74, 0x3b, 0x73, 0x65, 0x74, 0x65, 0x6d, 0x62, 0x72,
-0x65, 0x3b, 0x6f, 0x63, 0x74, 0x75, 0x62, 0x72, 0x65, 0x3b, 0x6e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x72, 0x65, 0x3b, 0x64,
-0x65, 0x73, 0x65, 0x6d, 0x62, 0x72, 0x65, 0x3b, 0x47, 0x4e, 0x3b, 0x46, 0x42, 0x3b, 0x4d, 0xc7, 0x3b, 0x41, 0x42, 0x3b,
-0x4d, 0x47, 0x3b, 0x4a, 0x4e, 0x3b, 0x4a, 0x4c, 0x3b, 0x41, 0x47, 0x3b, 0x53, 0x54, 0x3b, 0x4f, 0x43, 0x3b, 0x4e, 0x56,
-0x3b, 0x44, 0x53, 0x3b, 0x64, 0x65, 0x20, 0x67, 0x65, 0x6e, 0x2e, 0x3b, 0x64, 0x65, 0x20, 0x66, 0x65, 0x62, 0x72, 0x2e,
-0x3b, 0x64, 0x65, 0x20, 0x6d, 0x61, 0x72, 0xe7, 0x3b, 0x64, 0x2019, 0x61, 0x62, 0x72, 0x2e, 0x3b, 0x64, 0x65, 0x20, 0x6d,
-0x61, 0x69, 0x67, 0x3b, 0x64, 0x65, 0x20, 0x6a, 0x75, 0x6e, 0x79, 0x3b, 0x64, 0x65, 0x20, 0x6a, 0x75, 0x6c, 0x2e, 0x3b,
-0x64, 0x2019, 0x61, 0x67, 0x2e, 0x3b, 0x64, 0x65, 0x20, 0x73, 0x65, 0x74, 0x2e, 0x3b, 0x64, 0x2019, 0x6f, 0x63, 0x74, 0x2e,
-0x3b, 0x64, 0x65, 0x20, 0x6e, 0x6f, 0x76, 0x2e, 0x3b, 0x64, 0x65, 0x20, 0x64, 0x65, 0x73, 0x2e, 0x3b, 0x64, 0x65, 0x20,
-0x67, 0x65, 0x6e, 0x65, 0x72, 0x3b, 0x64, 0x65, 0x20, 0x66, 0x65, 0x62, 0x72, 0x65, 0x72, 0x3b, 0x64, 0x65, 0x20, 0x6d,
-0x61, 0x72, 0xe7, 0x3b, 0x64, 0x2019, 0x61, 0x62, 0x72, 0x69, 0x6c, 0x3b, 0x64, 0x65, 0x20, 0x6d, 0x61, 0x69, 0x67, 0x3b,
-0x64, 0x65, 0x20, 0x6a, 0x75, 0x6e, 0x79, 0x3b, 0x64, 0x65, 0x20, 0x6a, 0x75, 0x6c, 0x69, 0x6f, 0x6c, 0x3b, 0x64, 0x2019,
-0x61, 0x67, 0x6f, 0x73, 0x74, 0x3b, 0x64, 0x65, 0x20, 0x73, 0x65, 0x74, 0x65, 0x6d, 0x62, 0x72, 0x65, 0x3b, 0x64, 0x2019,
-0x6f, 0x63, 0x74, 0x75, 0x62, 0x72, 0x65, 0x3b, 0x64, 0x65, 0x20, 0x6e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x72, 0x65, 0x3b,
-0x64, 0x65, 0x20, 0x64, 0x65, 0x73, 0x65, 0x6d, 0x62, 0x72, 0x65, 0x3b, 0x31, 0x6708, 0x3b, 0x32, 0x6708, 0x3b, 0x33, 0x6708,
-0x3b, 0x34, 0x6708, 0x3b, 0x35, 0x6708, 0x3b, 0x36, 0x6708, 0x3b, 0x37, 0x6708, 0x3b, 0x38, 0x6708, 0x3b, 0x39, 0x6708, 0x3b, 0x31,
-0x30, 0x6708, 0x3b, 0x31, 0x31, 0x6708, 0x3b, 0x31, 0x32, 0x6708, 0x3b, 0x4e00, 0x6708, 0x3b, 0x4e8c, 0x6708, 0x3b, 0x4e09, 0x6708, 0x3b,
-0x56db, 0x6708, 0x3b, 0x4e94, 0x6708, 0x3b, 0x516d, 0x6708, 0x3b, 0x4e03, 0x6708, 0x3b, 0x516b, 0x6708, 0x3b, 0x4e5d, 0x6708, 0x3b, 0x5341, 0x6708,
-0x3b, 0x5341, 0x4e00, 0x6708, 0x3b, 0x5341, 0x4e8c, 0x6708, 0x3b, 0x73, 0x69, 0x6a, 0x3b, 0x76, 0x65, 0x6c, 0x6a, 0x3b, 0x6f, 0x17e,
-0x75, 0x3b, 0x74, 0x72, 0x61, 0x3b, 0x73, 0x76, 0x69, 0x3b, 0x6c, 0x69, 0x70, 0x3b, 0x73, 0x72, 0x70, 0x3b, 0x6b, 0x6f,
-0x6c, 0x3b, 0x72, 0x75, 0x6a, 0x3b, 0x6c, 0x69, 0x73, 0x3b, 0x73, 0x74, 0x75, 0x3b, 0x70, 0x72, 0x6f, 0x3b, 0x73, 0x69,
-0x6a, 0x65, 0x10d, 0x61, 0x6e, 0x6a, 0x3b, 0x76, 0x65, 0x6c, 0x6a, 0x61, 0x10d, 0x61, 0x3b, 0x6f, 0x17e, 0x75, 0x6a, 0x61,
-0x6b, 0x3b, 0x74, 0x72, 0x61, 0x76, 0x61, 0x6e, 0x6a, 0x3b, 0x73, 0x76, 0x69, 0x62, 0x61, 0x6e, 0x6a, 0x3b, 0x6c, 0x69,
-0x70, 0x61, 0x6e, 0x6a, 0x3b, 0x73, 0x72, 0x70, 0x61, 0x6e, 0x6a, 0x3b, 0x6b, 0x6f, 0x6c, 0x6f, 0x76, 0x6f, 0x7a, 0x3b,
-0x72, 0x75, 0x6a, 0x61, 0x6e, 0x3b, 0x6c, 0x69, 0x73, 0x74, 0x6f, 0x70, 0x61, 0x64, 0x3b, 0x73, 0x74, 0x75, 0x64, 0x65,
-0x6e, 0x69, 0x3b, 0x70, 0x72, 0x6f, 0x73, 0x69, 0x6e, 0x61, 0x63, 0x3b, 0x31, 0x2e, 0x3b, 0x32, 0x2e, 0x3b, 0x33, 0x2e,
-0x3b, 0x34, 0x2e, 0x3b, 0x35, 0x2e, 0x3b, 0x36, 0x2e, 0x3b, 0x37, 0x2e, 0x3b, 0x38, 0x2e, 0x3b, 0x39, 0x2e, 0x3b, 0x31,
-0x30, 0x2e, 0x3b, 0x31, 0x31, 0x2e, 0x3b, 0x31, 0x32, 0x2e, 0x3b, 0x73, 0x69, 0x6a, 0x65, 0x10d, 0x6e, 0x6a, 0x61, 0x3b,
-0x76, 0x65, 0x6c, 0x6a, 0x61, 0x10d, 0x65, 0x3b, 0x6f, 0x17e, 0x75, 0x6a, 0x6b, 0x61, 0x3b, 0x74, 0x72, 0x61, 0x76, 0x6e,
-0x6a, 0x61, 0x3b, 0x73, 0x76, 0x69, 0x62, 0x6e, 0x6a, 0x61, 0x3b, 0x6c, 0x69, 0x70, 0x6e, 0x6a, 0x61, 0x3b, 0x73, 0x72,
-0x70, 0x6e, 0x6a, 0x61, 0x3b, 0x6b, 0x6f, 0x6c, 0x6f, 0x76, 0x6f, 0x7a, 0x61, 0x3b, 0x72, 0x75, 0x6a, 0x6e, 0x61, 0x3b,
-0x6c, 0x69, 0x73, 0x74, 0x6f, 0x70, 0x61, 0x64, 0x61, 0x3b, 0x73, 0x74, 0x75, 0x64, 0x65, 0x6e, 0x6f, 0x67, 0x61, 0x3b,
-0x70, 0x72, 0x6f, 0x73, 0x69, 0x6e, 0x63, 0x61, 0x3b, 0x6c, 0x65, 0x64, 0x3b, 0xfa, 0x6e, 0x6f, 0x3b, 0x62, 0x159, 0x65,
-0x3b, 0x64, 0x75, 0x62, 0x3b, 0x6b, 0x76, 0x11b, 0x3b, 0x10d, 0x76, 0x6e, 0x3b, 0x10d, 0x76, 0x63, 0x3b, 0x73, 0x72, 0x70,
-0x3b, 0x7a, 0xe1, 0x159, 0x3b, 0x159, 0xed, 0x6a, 0x3b, 0x6c, 0x69, 0x73, 0x3b, 0x70, 0x72, 0x6f, 0x3b, 0x6c, 0x65, 0x64,
-0x65, 0x6e, 0x3b, 0xfa, 0x6e, 0x6f, 0x72, 0x3b, 0x62, 0x159, 0x65, 0x7a, 0x65, 0x6e, 0x3b, 0x64, 0x75, 0x62, 0x65, 0x6e,
-0x3b, 0x6b, 0x76, 0x11b, 0x74, 0x65, 0x6e, 0x3b, 0x10d, 0x65, 0x72, 0x76, 0x65, 0x6e, 0x3b, 0x10d, 0x65, 0x72, 0x76, 0x65,
-0x6e, 0x65, 0x63, 0x3b, 0x73, 0x72, 0x70, 0x65, 0x6e, 0x3b, 0x7a, 0xe1, 0x159, 0xed, 0x3b, 0x159, 0xed, 0x6a, 0x65, 0x6e,
-0x3b, 0x6c, 0x69, 0x73, 0x74, 0x6f, 0x70, 0x61, 0x64, 0x3b, 0x70, 0x72, 0x6f, 0x73, 0x69, 0x6e, 0x65, 0x63, 0x3b, 0x6c,
-0x65, 0x64, 0x6e, 0x61, 0x3b, 0xfa, 0x6e, 0x6f, 0x72, 0x61, 0x3b, 0x62, 0x159, 0x65, 0x7a, 0x6e, 0x61, 0x3b, 0x64, 0x75,
-0x62, 0x6e, 0x61, 0x3b, 0x6b, 0x76, 0x11b, 0x74, 0x6e, 0x61, 0x3b, 0x10d, 0x65, 0x72, 0x76, 0x6e, 0x61, 0x3b, 0x10d, 0x65,
-0x72, 0x76, 0x65, 0x6e, 0x63, 0x65, 0x3b, 0x73, 0x72, 0x70, 0x6e, 0x61, 0x3b, 0x7a, 0xe1, 0x159, 0xed, 0x3b, 0x159, 0xed,
-0x6a, 0x6e, 0x61, 0x3b, 0x6c, 0x69, 0x73, 0x74, 0x6f, 0x70, 0x61, 0x64, 0x75, 0x3b, 0x70, 0x72, 0x6f, 0x73, 0x69, 0x6e,
-0x63, 0x65, 0x3b, 0x6a, 0x61, 0x6e, 0x2e, 0x3b, 0x66, 0x65, 0x62, 0x2e, 0x3b, 0x6d, 0x61, 0x72, 0x2e, 0x3b, 0x61, 0x70,
-0x72, 0x2e, 0x3b, 0x6d, 0x61, 0x6a, 0x3b, 0x6a, 0x75, 0x6e, 0x2e, 0x3b, 0x6a, 0x75, 0x6c, 0x2e, 0x3b, 0x61, 0x75, 0x67,
-0x2e, 0x3b, 0x73, 0x65, 0x70, 0x2e, 0x3b, 0x6f, 0x6b, 0x74, 0x2e, 0x3b, 0x6e, 0x6f, 0x76, 0x2e, 0x3b, 0x64, 0x65, 0x63,
-0x2e, 0x3b, 0x6a, 0x61, 0x6e, 0x75, 0x61, 0x72, 0x3b, 0x66, 0x65, 0x62, 0x72, 0x75, 0x61, 0x72, 0x3b, 0x6d, 0x61, 0x72,
-0x74, 0x73, 0x3b, 0x61, 0x70, 0x72, 0x69, 0x6c, 0x3b, 0x6d, 0x61, 0x6a, 0x3b, 0x6a, 0x75, 0x6e, 0x69, 0x3b, 0x6a, 0x75,
-0x6c, 0x69, 0x3b, 0x61, 0x75, 0x67, 0x75, 0x73, 0x74, 0x3b, 0x73, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b,
-0x6f, 0x6b, 0x74, 0x6f, 0x62, 0x65, 0x72, 0x3b, 0x6e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x64, 0x65, 0x63,
-0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x6a, 0x61, 0x6e, 0x2e, 0x3b, 0x66, 0x65, 0x62, 0x2e, 0x3b, 0x6d, 0x72, 0x74, 0x2e,
-0x3b, 0x61, 0x70, 0x72, 0x2e, 0x3b, 0x6d, 0x65, 0x69, 0x3b, 0x6a, 0x75, 0x6e, 0x2e, 0x3b, 0x6a, 0x75, 0x6c, 0x2e, 0x3b,
-0x61, 0x75, 0x67, 0x2e, 0x3b, 0x73, 0x65, 0x70, 0x2e, 0x3b, 0x6f, 0x6b, 0x74, 0x2e, 0x3b, 0x6e, 0x6f, 0x76, 0x2e, 0x3b,
-0x64, 0x65, 0x63, 0x2e, 0x3b, 0x6a, 0x61, 0x6e, 0x75, 0x61, 0x72, 0x69, 0x3b, 0x66, 0x65, 0x62, 0x72, 0x75, 0x61, 0x72,
-0x69, 0x3b, 0x6d, 0x61, 0x61, 0x72, 0x74, 0x3b, 0x61, 0x70, 0x72, 0x69, 0x6c, 0x3b, 0x6d, 0x65, 0x69, 0x3b, 0x6a, 0x75,
-0x6e, 0x69, 0x3b, 0x6a, 0x75, 0x6c, 0x69, 0x3b, 0x61, 0x75, 0x67, 0x75, 0x73, 0x74, 0x75, 0x73, 0x3b, 0x73, 0x65, 0x70,
-0x74, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x6f, 0x6b, 0x74, 0x6f, 0x62, 0x65, 0x72, 0x3b, 0x6e, 0x6f, 0x76, 0x65, 0x6d,
-0x62, 0x65, 0x72, 0x3b, 0x64, 0x65, 0x63, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x4a, 0x61, 0x6e, 0x2e, 0x3b, 0x46, 0x65,
-0x62, 0x2e, 0x3b, 0x4d, 0x61, 0x72, 0x2e, 0x3b, 0x41, 0x70, 0x72, 0x2e, 0x3b, 0x4d, 0x61, 0x79, 0x3b, 0x4a, 0x75, 0x6e,
-0x2e, 0x3b, 0x4a, 0x75, 0x6c, 0x2e, 0x3b, 0x41, 0x75, 0x67, 0x2e, 0x3b, 0x53, 0x65, 0x70, 0x2e, 0x3b, 0x4f, 0x63, 0x74,
-0x2e, 0x3b, 0x4e, 0x6f, 0x76, 0x2e, 0x3b, 0x44, 0x65, 0x63, 0x2e, 0x3b, 0x6a, 0x61, 0x6e, 0x3b, 0x66, 0x65, 0x62, 0x3b,
-0x6d, 0x61, 0x72, 0x3b, 0x61, 0x70, 0x72, 0x3b, 0x6d, 0x61, 0x6a, 0x3b, 0x6a, 0x75, 0x6e, 0x3b, 0x6a, 0x75, 0x6c, 0x3b,
-0x61, 0x16d, 0x67, 0x3b, 0x73, 0x65, 0x70, 0x3b, 0x6f, 0x6b, 0x74, 0x3b, 0x6e, 0x6f, 0x76, 0x3b, 0x64, 0x65, 0x63, 0x3b,
-0x6a, 0x61, 0x6e, 0x75, 0x61, 0x72, 0x6f, 0x3b, 0x66, 0x65, 0x62, 0x72, 0x75, 0x61, 0x72, 0x6f, 0x3b, 0x6d, 0x61, 0x72,
-0x74, 0x6f, 0x3b, 0x61, 0x70, 0x72, 0x69, 0x6c, 0x6f, 0x3b, 0x6d, 0x61, 0x6a, 0x6f, 0x3b, 0x6a, 0x75, 0x6e, 0x69, 0x6f,
-0x3b, 0x6a, 0x75, 0x6c, 0x69, 0x6f, 0x3b, 0x61, 0x16d, 0x67, 0x75, 0x73, 0x74, 0x6f, 0x3b, 0x73, 0x65, 0x70, 0x74, 0x65,
-0x6d, 0x62, 0x72, 0x6f, 0x3b, 0x6f, 0x6b, 0x74, 0x6f, 0x62, 0x72, 0x6f, 0x3b, 0x6e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x72,
-0x6f, 0x3b, 0x64, 0x65, 0x63, 0x65, 0x6d, 0x62, 0x72, 0x6f, 0x3b, 0x6a, 0x61, 0x61, 0x6e, 0x3b, 0x76, 0x65, 0x65, 0x62,
-0x72, 0x3b, 0x6d, 0xe4, 0x72, 0x74, 0x73, 0x3b, 0x61, 0x70, 0x72, 0x3b, 0x6d, 0x61, 0x69, 0x3b, 0x6a, 0x75, 0x75, 0x6e,
-0x69, 0x3b, 0x6a, 0x75, 0x75, 0x6c, 0x69, 0x3b, 0x61, 0x75, 0x67, 0x3b, 0x73, 0x65, 0x70, 0x74, 0x3b, 0x6f, 0x6b, 0x74,
-0x3b, 0x6e, 0x6f, 0x76, 0x3b, 0x64, 0x65, 0x74, 0x73, 0x3b, 0x6a, 0x61, 0x61, 0x6e, 0x75, 0x61, 0x72, 0x3b, 0x76, 0x65,
-0x65, 0x62, 0x72, 0x75, 0x61, 0x72, 0x3b, 0x6d, 0xe4, 0x72, 0x74, 0x73, 0x3b, 0x61, 0x70, 0x72, 0x69, 0x6c, 0x6c, 0x3b,
-0x6d, 0x61, 0x69, 0x3b, 0x6a, 0x75, 0x75, 0x6e, 0x69, 0x3b, 0x6a, 0x75, 0x75, 0x6c, 0x69, 0x3b, 0x61, 0x75, 0x67, 0x75,
-0x73, 0x74, 0x3b, 0x73, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x6f, 0x6b, 0x74, 0x6f, 0x6f, 0x62, 0x65,
-0x72, 0x3b, 0x6e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x64, 0x65, 0x74, 0x73, 0x65, 0x6d, 0x62, 0x65, 0x72,
-0x3b, 0x4a, 0x3b, 0x56, 0x3b, 0x4d, 0x3b, 0x41, 0x3b, 0x4d, 0x3b, 0x4a, 0x3b, 0x4a, 0x3b, 0x41, 0x3b, 0x53, 0x3b, 0x4f,
-0x3b, 0x4e, 0x3b, 0x44, 0x3b, 0x6a, 0x61, 0x6e, 0x3b, 0x66, 0x65, 0x62, 0x3b, 0x6d, 0x61, 0x72, 0x3b, 0x61, 0x70, 0x72,
-0x3b, 0x6d, 0x61, 0x69, 0x3b, 0x6a, 0x75, 0x6e, 0x3b, 0x6a, 0x75, 0x6c, 0x3b, 0x61, 0x75, 0x67, 0x3b, 0x73, 0x65, 0x70,
-0x3b, 0x6f, 0x6b, 0x74, 0x3b, 0x6e, 0x6f, 0x76, 0x3b, 0x64, 0x65, 0x73, 0x3b, 0x6a, 0x61, 0x6e, 0x75, 0x61, 0x72, 0x3b,
-0x66, 0x65, 0x62, 0x72, 0x75, 0x61, 0x72, 0x3b, 0x6d, 0x61, 0x72, 0x73, 0x3b, 0x61, 0x70, 0x72, 0xed, 0x6c, 0x3b, 0x6d,
-0x61, 0x69, 0x3b, 0x6a, 0x75, 0x6e, 0x69, 0x3b, 0x6a, 0x75, 0x6c, 0x69, 0x3b, 0x61, 0x75, 0x67, 0x75, 0x73, 0x74, 0x3b,
+0x102d, 0x102f, 0x3b, 0x1012, 0x102e, 0x1007, 0x3b, 0x1016, 0x3b, 0x1019, 0x3b, 0x1027, 0x3b, 0x1019, 0x3b, 0x1007, 0x3b, 0x1007, 0x3b, 0x1029,
+0x3b, 0x1005, 0x3b, 0x1021, 0x3b, 0x1014, 0x3b, 0x1012, 0x441, 0x442, 0x443, 0x434, 0x437, 0x435, 0x43d, 0x44c, 0x3b, 0x43b, 0x44e, 0x442,
+0x44b, 0x3b, 0x441, 0x430, 0x43a, 0x430, 0x432, 0x456, 0x43a, 0x3b, 0x43a, 0x440, 0x430, 0x441, 0x430, 0x432, 0x456, 0x43a, 0x3b, 0x43c,
+0x430, 0x439, 0x3b, 0x447, 0x44d, 0x440, 0x432, 0x435, 0x43d, 0x44c, 0x3b, 0x43b, 0x456, 0x43f, 0x435, 0x43d, 0x44c, 0x3b, 0x436, 0x43d,
+0x456, 0x432, 0x435, 0x43d, 0x44c, 0x3b, 0x432, 0x435, 0x440, 0x430, 0x441, 0x435, 0x43d, 0x44c, 0x3b, 0x43a, 0x430, 0x441, 0x442, 0x440,
+0x44b, 0x447, 0x43d, 0x456, 0x43a, 0x3b, 0x43b, 0x456, 0x441, 0x442, 0x430, 0x43f, 0x430, 0x434, 0x3b, 0x441, 0x43d, 0x435, 0x436, 0x430,
+0x43d, 0x44c, 0x441, 0x442, 0x443, 0x434, 0x437, 0x435, 0x43d, 0x44f, 0x3b, 0x43b, 0x44e, 0x442, 0x430, 0x433, 0x430, 0x3b, 0x441, 0x430,
+0x43a, 0x430, 0x432, 0x456, 0x43a, 0x430, 0x3b, 0x43a, 0x440, 0x430, 0x441, 0x430, 0x432, 0x456, 0x43a, 0x430, 0x3b, 0x43c, 0x430, 0x44f,
+0x3b, 0x447, 0x44d, 0x440, 0x432, 0x435, 0x43d, 0x44f, 0x3b, 0x43b, 0x456, 0x43f, 0x435, 0x43d, 0x44f, 0x3b, 0x436, 0x43d, 0x456, 0x45e,
+0x43d, 0x44f, 0x3b, 0x432, 0x435, 0x440, 0x430, 0x441, 0x43d, 0x44f, 0x3b, 0x43a, 0x430, 0x441, 0x442, 0x440, 0x44b, 0x447, 0x43d, 0x456,
+0x43a, 0x430, 0x3b, 0x43b, 0x456, 0x441, 0x442, 0x430, 0x43f, 0x430, 0x434, 0x430, 0x3b, 0x441, 0x43d, 0x435, 0x436, 0x43d, 0x44f, 0x441,
+0x442, 0x443, 0x3b, 0x43b, 0x44e, 0x442, 0x3b, 0x441, 0x430, 0x43a, 0x3b, 0x43a, 0x440, 0x430, 0x3b, 0x43c, 0x430, 0x439, 0x3b, 0x447,
+0x44d, 0x440, 0x3b, 0x43b, 0x456, 0x43f, 0x3b, 0x436, 0x43d, 0x456, 0x3b, 0x432, 0x435, 0x440, 0x3b, 0x43a, 0x430, 0x441, 0x3b, 0x43b,
+0x456, 0x441, 0x3b, 0x441, 0x43d, 0x435, 0x441, 0x442, 0x443, 0x3b, 0x43b, 0x44e, 0x442, 0x3b, 0x441, 0x430, 0x43a, 0x3b, 0x43a, 0x440,
+0x430, 0x3b, 0x43c, 0x430, 0x44f, 0x3b, 0x447, 0x44d, 0x440, 0x3b, 0x43b, 0x456, 0x43f, 0x3b, 0x436, 0x43d, 0x456, 0x3b, 0x432, 0x435,
+0x440, 0x3b, 0x43a, 0x430, 0x441, 0x3b, 0x43b, 0x456, 0x441, 0x3b, 0x441, 0x43d, 0x435, 0x441, 0x3b, 0x43b, 0x3b, 0x441, 0x3b, 0x43a,
+0x3b, 0x43c, 0x3b, 0x447, 0x3b, 0x43b, 0x3b, 0x436, 0x3b, 0x432, 0x3b, 0x43a, 0x3b, 0x43b, 0x3b, 0x441, 0x1798, 0x1780, 0x179a, 0x17b6,
+0x3b, 0x1780, 0x17bb, 0x1798, 0x17d2, 0x1797, 0x17c8, 0x3b, 0x1798, 0x17b8, 0x1793, 0x17b6, 0x3b, 0x1798, 0x17c1, 0x179f, 0x17b6, 0x3b, 0x17a7, 0x179f,
+0x1797, 0x17b6, 0x3b, 0x1798, 0x17b7, 0x1790, 0x17bb, 0x1793, 0x17b6, 0x3b, 0x1780, 0x1780, 0x17d2, 0x1780, 0x178a, 0x17b6, 0x3b, 0x179f, 0x17b8, 0x17a0,
+0x17b6, 0x3b, 0x1780, 0x1789, 0x17d2, 0x1789, 0x17b6, 0x3b, 0x178f, 0x17bb, 0x179b, 0x17b6, 0x3b, 0x179c, 0x17b7, 0x1785, 0x17d2, 0x1786, 0x17b7, 0x1780,
+0x17b6, 0x3b, 0x1792, 0x17d2, 0x1793, 0x17bc, 0x1798, 0x3b, 0x1780, 0x3b, 0x1798, 0x3b, 0x1798, 0x3b, 0x17a7, 0x3b, 0x1798, 0x3b, 0x1780, 0x3b,
+0x179f, 0x3b, 0x1780, 0x3b, 0x178f, 0x3b, 0x179c, 0x3b, 0x1792, 0x67, 0x65, 0x6e, 0x65, 0x72, 0x3b, 0x66, 0x65, 0x62, 0x72, 0x65,
+0x72, 0x3b, 0x6d, 0x61, 0x72, 0xe7, 0x3b, 0x61, 0x62, 0x72, 0x69, 0x6c, 0x3b, 0x6d, 0x61, 0x69, 0x67, 0x3b, 0x6a, 0x75,
+0x6e, 0x79, 0x3b, 0x6a, 0x75, 0x6c, 0x69, 0x6f, 0x6c, 0x3b, 0x61, 0x67, 0x6f, 0x73, 0x74, 0x3b, 0x73, 0x65, 0x74, 0x65,
+0x6d, 0x62, 0x72, 0x65, 0x3b, 0x6f, 0x63, 0x74, 0x75, 0x62, 0x72, 0x65, 0x3b, 0x6e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x72,
+0x65, 0x3b, 0x64, 0x65, 0x73, 0x65, 0x6d, 0x62, 0x72, 0x65, 0x64, 0x65, 0x20, 0x67, 0x65, 0x6e, 0x65, 0x72, 0x3b, 0x64,
+0x65, 0x20, 0x66, 0x65, 0x62, 0x72, 0x65, 0x72, 0x3b, 0x64, 0x65, 0x20, 0x6d, 0x61, 0x72, 0xe7, 0x3b, 0x64, 0x2019, 0x61,
+0x62, 0x72, 0x69, 0x6c, 0x3b, 0x64, 0x65, 0x20, 0x6d, 0x61, 0x69, 0x67, 0x3b, 0x64, 0x65, 0x20, 0x6a, 0x75, 0x6e, 0x79,
+0x3b, 0x64, 0x65, 0x20, 0x6a, 0x75, 0x6c, 0x69, 0x6f, 0x6c, 0x3b, 0x64, 0x2019, 0x61, 0x67, 0x6f, 0x73, 0x74, 0x3b, 0x64,
+0x65, 0x20, 0x73, 0x65, 0x74, 0x65, 0x6d, 0x62, 0x72, 0x65, 0x3b, 0x64, 0x2019, 0x6f, 0x63, 0x74, 0x75, 0x62, 0x72, 0x65,
+0x3b, 0x64, 0x65, 0x20, 0x6e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x72, 0x65, 0x3b, 0x64, 0x65, 0x20, 0x64, 0x65, 0x73, 0x65,
+0x6d, 0x62, 0x72, 0x65, 0x67, 0x65, 0x6e, 0x2e, 0x3b, 0x66, 0x65, 0x62, 0x72, 0x2e, 0x3b, 0x6d, 0x61, 0x72, 0xe7, 0x3b,
+0x61, 0x62, 0x72, 0x2e, 0x3b, 0x6d, 0x61, 0x69, 0x67, 0x3b, 0x6a, 0x75, 0x6e, 0x79, 0x3b, 0x6a, 0x75, 0x6c, 0x2e, 0x3b,
+0x61, 0x67, 0x2e, 0x3b, 0x73, 0x65, 0x74, 0x2e, 0x3b, 0x6f, 0x63, 0x74, 0x2e, 0x3b, 0x6e, 0x6f, 0x76, 0x2e, 0x3b, 0x64,
+0x65, 0x73, 0x2e, 0x64, 0x65, 0x20, 0x67, 0x65, 0x6e, 0x2e, 0x3b, 0x64, 0x65, 0x20, 0x66, 0x65, 0x62, 0x72, 0x2e, 0x3b,
+0x64, 0x65, 0x20, 0x6d, 0x61, 0x72, 0xe7, 0x3b, 0x64, 0x2019, 0x61, 0x62, 0x72, 0x2e, 0x3b, 0x64, 0x65, 0x20, 0x6d, 0x61,
+0x69, 0x67, 0x3b, 0x64, 0x65, 0x20, 0x6a, 0x75, 0x6e, 0x79, 0x3b, 0x64, 0x65, 0x20, 0x6a, 0x75, 0x6c, 0x2e, 0x3b, 0x64,
+0x2019, 0x61, 0x67, 0x2e, 0x3b, 0x64, 0x65, 0x20, 0x73, 0x65, 0x74, 0x2e, 0x3b, 0x64, 0x2019, 0x6f, 0x63, 0x74, 0x2e, 0x3b,
+0x64, 0x65, 0x20, 0x6e, 0x6f, 0x76, 0x2e, 0x3b, 0x64, 0x65, 0x20, 0x64, 0x65, 0x73, 0x2e, 0x47, 0x4e, 0x3b, 0x46, 0x42,
+0x3b, 0x4d, 0xc7, 0x3b, 0x41, 0x42, 0x3b, 0x4d, 0x47, 0x3b, 0x4a, 0x4e, 0x3b, 0x4a, 0x4c, 0x3b, 0x41, 0x47, 0x3b, 0x53,
+0x54, 0x3b, 0x4f, 0x43, 0x3b, 0x4e, 0x56, 0x3b, 0x44, 0x53, 0x4e00, 0x6708, 0x3b, 0x4e8c, 0x6708, 0x3b, 0x4e09, 0x6708, 0x3b, 0x56db,
+0x6708, 0x3b, 0x4e94, 0x6708, 0x3b, 0x516d, 0x6708, 0x3b, 0x4e03, 0x6708, 0x3b, 0x516b, 0x6708, 0x3b, 0x4e5d, 0x6708, 0x3b, 0x5341, 0x6708, 0x3b,
+0x5341, 0x4e00, 0x6708, 0x3b, 0x5341, 0x4e8c, 0x6708, 0x31, 0x6708, 0x3b, 0x32, 0x6708, 0x3b, 0x33, 0x6708, 0x3b, 0x34, 0x6708, 0x3b, 0x35,
+0x6708, 0x3b, 0x36, 0x6708, 0x3b, 0x37, 0x6708, 0x3b, 0x38, 0x6708, 0x3b, 0x39, 0x6708, 0x3b, 0x31, 0x30, 0x6708, 0x3b, 0x31, 0x31,
+0x6708, 0x3b, 0x31, 0x32, 0x6708, 0x73, 0x69, 0x6a, 0x65, 0x10d, 0x61, 0x6e, 0x6a, 0x3b, 0x76, 0x65, 0x6c, 0x6a, 0x61, 0x10d,
+0x61, 0x3b, 0x6f, 0x17e, 0x75, 0x6a, 0x61, 0x6b, 0x3b, 0x74, 0x72, 0x61, 0x76, 0x61, 0x6e, 0x6a, 0x3b, 0x73, 0x76, 0x69,
+0x62, 0x61, 0x6e, 0x6a, 0x3b, 0x6c, 0x69, 0x70, 0x61, 0x6e, 0x6a, 0x3b, 0x73, 0x72, 0x70, 0x61, 0x6e, 0x6a, 0x3b, 0x6b,
+0x6f, 0x6c, 0x6f, 0x76, 0x6f, 0x7a, 0x3b, 0x72, 0x75, 0x6a, 0x61, 0x6e, 0x3b, 0x6c, 0x69, 0x73, 0x74, 0x6f, 0x70, 0x61,
+0x64, 0x3b, 0x73, 0x74, 0x75, 0x64, 0x65, 0x6e, 0x69, 0x3b, 0x70, 0x72, 0x6f, 0x73, 0x69, 0x6e, 0x61, 0x63, 0x73, 0x69,
+0x6a, 0x65, 0x10d, 0x6e, 0x6a, 0x61, 0x3b, 0x76, 0x65, 0x6c, 0x6a, 0x61, 0x10d, 0x65, 0x3b, 0x6f, 0x17e, 0x75, 0x6a, 0x6b,
+0x61, 0x3b, 0x74, 0x72, 0x61, 0x76, 0x6e, 0x6a, 0x61, 0x3b, 0x73, 0x76, 0x69, 0x62, 0x6e, 0x6a, 0x61, 0x3b, 0x6c, 0x69,
+0x70, 0x6e, 0x6a, 0x61, 0x3b, 0x73, 0x72, 0x70, 0x6e, 0x6a, 0x61, 0x3b, 0x6b, 0x6f, 0x6c, 0x6f, 0x76, 0x6f, 0x7a, 0x61,
+0x3b, 0x72, 0x75, 0x6a, 0x6e, 0x61, 0x3b, 0x6c, 0x69, 0x73, 0x74, 0x6f, 0x70, 0x61, 0x64, 0x61, 0x3b, 0x73, 0x74, 0x75,
+0x64, 0x65, 0x6e, 0x6f, 0x67, 0x61, 0x3b, 0x70, 0x72, 0x6f, 0x73, 0x69, 0x6e, 0x63, 0x61, 0x73, 0x69, 0x6a, 0x3b, 0x76,
+0x65, 0x6c, 0x6a, 0x3b, 0x6f, 0x17e, 0x75, 0x3b, 0x74, 0x72, 0x61, 0x3b, 0x73, 0x76, 0x69, 0x3b, 0x6c, 0x69, 0x70, 0x3b,
+0x73, 0x72, 0x70, 0x3b, 0x6b, 0x6f, 0x6c, 0x3b, 0x72, 0x75, 0x6a, 0x3b, 0x6c, 0x69, 0x73, 0x3b, 0x73, 0x74, 0x75, 0x3b,
+0x70, 0x72, 0x6f, 0x31, 0x2e, 0x3b, 0x32, 0x2e, 0x3b, 0x33, 0x2e, 0x3b, 0x34, 0x2e, 0x3b, 0x35, 0x2e, 0x3b, 0x36, 0x2e,
+0x3b, 0x37, 0x2e, 0x3b, 0x38, 0x2e, 0x3b, 0x39, 0x2e, 0x3b, 0x31, 0x30, 0x2e, 0x3b, 0x31, 0x31, 0x2e, 0x3b, 0x31, 0x32,
+0x2e, 0x6c, 0x65, 0x64, 0x65, 0x6e, 0x3b, 0xfa, 0x6e, 0x6f, 0x72, 0x3b, 0x62, 0x159, 0x65, 0x7a, 0x65, 0x6e, 0x3b, 0x64,
+0x75, 0x62, 0x65, 0x6e, 0x3b, 0x6b, 0x76, 0x11b, 0x74, 0x65, 0x6e, 0x3b, 0x10d, 0x65, 0x72, 0x76, 0x65, 0x6e, 0x3b, 0x10d,
+0x65, 0x72, 0x76, 0x65, 0x6e, 0x65, 0x63, 0x3b, 0x73, 0x72, 0x70, 0x65, 0x6e, 0x3b, 0x7a, 0xe1, 0x159, 0xed, 0x3b, 0x159,
+0xed, 0x6a, 0x65, 0x6e, 0x3b, 0x6c, 0x69, 0x73, 0x74, 0x6f, 0x70, 0x61, 0x64, 0x3b, 0x70, 0x72, 0x6f, 0x73, 0x69, 0x6e,
+0x65, 0x63, 0x6c, 0x65, 0x64, 0x6e, 0x61, 0x3b, 0xfa, 0x6e, 0x6f, 0x72, 0x61, 0x3b, 0x62, 0x159, 0x65, 0x7a, 0x6e, 0x61,
+0x3b, 0x64, 0x75, 0x62, 0x6e, 0x61, 0x3b, 0x6b, 0x76, 0x11b, 0x74, 0x6e, 0x61, 0x3b, 0x10d, 0x65, 0x72, 0x76, 0x6e, 0x61,
+0x3b, 0x10d, 0x65, 0x72, 0x76, 0x65, 0x6e, 0x63, 0x65, 0x3b, 0x73, 0x72, 0x70, 0x6e, 0x61, 0x3b, 0x7a, 0xe1, 0x159, 0xed,
+0x3b, 0x159, 0xed, 0x6a, 0x6e, 0x61, 0x3b, 0x6c, 0x69, 0x73, 0x74, 0x6f, 0x70, 0x61, 0x64, 0x75, 0x3b, 0x70, 0x72, 0x6f,
+0x73, 0x69, 0x6e, 0x63, 0x65, 0x6c, 0x65, 0x64, 0x3b, 0xfa, 0x6e, 0x6f, 0x3b, 0x62, 0x159, 0x65, 0x3b, 0x64, 0x75, 0x62,
+0x3b, 0x6b, 0x76, 0x11b, 0x3b, 0x10d, 0x76, 0x6e, 0x3b, 0x10d, 0x76, 0x63, 0x3b, 0x73, 0x72, 0x70, 0x3b, 0x7a, 0xe1, 0x159,
+0x3b, 0x159, 0xed, 0x6a, 0x3b, 0x6c, 0x69, 0x73, 0x3b, 0x70, 0x72, 0x6f, 0x6a, 0x61, 0x6e, 0x75, 0x61, 0x72, 0x3b, 0x66,
+0x65, 0x62, 0x72, 0x75, 0x61, 0x72, 0x3b, 0x6d, 0x61, 0x72, 0x74, 0x73, 0x3b, 0x61, 0x70, 0x72, 0x69, 0x6c, 0x3b, 0x6d,
+0x61, 0x6a, 0x3b, 0x6a, 0x75, 0x6e, 0x69, 0x3b, 0x6a, 0x75, 0x6c, 0x69, 0x3b, 0x61, 0x75, 0x67, 0x75, 0x73, 0x74, 0x3b,
 0x73, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x6f, 0x6b, 0x74, 0x6f, 0x62, 0x65, 0x72, 0x3b, 0x6e, 0x6f,
-0x76, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x64, 0x65, 0x73, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x6a, 0x61, 0x6e, 0x2e,
-0x3b, 0x66, 0x65, 0x62, 0x2e, 0x3b, 0x6d, 0x61, 0x72, 0x2e, 0x3b, 0x61, 0x70, 0x72, 0x2e, 0x3b, 0x6d, 0x61, 0x69, 0x3b,
-0x6a, 0x75, 0x6e, 0x2e, 0x3b, 0x6a, 0x75, 0x6c, 0x2e, 0x3b, 0x61, 0x75, 0x67, 0x2e, 0x3b, 0x73, 0x65, 0x70, 0x2e, 0x3b,
-0x6f, 0x6b, 0x74, 0x2e, 0x3b, 0x6e, 0x6f, 0x76, 0x2e, 0x3b, 0x64, 0x65, 0x73, 0x2e, 0x3b, 0x74, 0x61, 0x6d, 0x6d, 0x69,
-0x3b, 0x68, 0x65, 0x6c, 0x6d, 0x69, 0x3b, 0x6d, 0x61, 0x61, 0x6c, 0x69, 0x73, 0x3b, 0x68, 0x75, 0x68, 0x74, 0x69, 0x3b,
-0x74, 0x6f, 0x75, 0x6b, 0x6f, 0x3b, 0x6b, 0x65, 0x73, 0xe4, 0x3b, 0x68, 0x65, 0x69, 0x6e, 0xe4, 0x3b, 0x65, 0x6c, 0x6f,
-0x3b, 0x73, 0x79, 0x79, 0x73, 0x3b, 0x6c, 0x6f, 0x6b, 0x61, 0x3b, 0x6d, 0x61, 0x72, 0x72, 0x61, 0x73, 0x3b, 0x6a, 0x6f,
-0x75, 0x6c, 0x75, 0x3b, 0x74, 0x61, 0x6d, 0x6d, 0x69, 0x6b, 0x75, 0x75, 0x3b, 0x68, 0x65, 0x6c, 0x6d, 0x69, 0x6b, 0x75,
-0x75, 0x3b, 0x6d, 0x61, 0x61, 0x6c, 0x69, 0x73, 0x6b, 0x75, 0x75, 0x3b, 0x68, 0x75, 0x68, 0x74, 0x69, 0x6b, 0x75, 0x75,
-0x3b, 0x74, 0x6f, 0x75, 0x6b, 0x6f, 0x6b, 0x75, 0x75, 0x3b, 0x6b, 0x65, 0x73, 0xe4, 0x6b, 0x75, 0x75, 0x3b, 0x68, 0x65,
-0x69, 0x6e, 0xe4, 0x6b, 0x75, 0x75, 0x3b, 0x65, 0x6c, 0x6f, 0x6b, 0x75, 0x75, 0x3b, 0x73, 0x79, 0x79, 0x73, 0x6b, 0x75,
-0x75, 0x3b, 0x6c, 0x6f, 0x6b, 0x61, 0x6b, 0x75, 0x75, 0x3b, 0x6d, 0x61, 0x72, 0x72, 0x61, 0x73, 0x6b, 0x75, 0x75, 0x3b,
-0x6a, 0x6f, 0x75, 0x6c, 0x75, 0x6b, 0x75, 0x75, 0x3b, 0x54, 0x3b, 0x48, 0x3b, 0x4d, 0x3b, 0x48, 0x3b, 0x54, 0x3b, 0x4b,
-0x3b, 0x48, 0x3b, 0x45, 0x3b, 0x53, 0x3b, 0x4c, 0x3b, 0x4d, 0x3b, 0x4a, 0x3b, 0x74, 0x61, 0x6d, 0x6d, 0x69, 0x6b, 0x2e,
-0x3b, 0x68, 0x65, 0x6c, 0x6d, 0x69, 0x6b, 0x2e, 0x3b, 0x6d, 0x61, 0x61, 0x6c, 0x69, 0x73, 0x6b, 0x2e, 0x3b, 0x68, 0x75,
-0x68, 0x74, 0x69, 0x6b, 0x2e, 0x3b, 0x74, 0x6f, 0x75, 0x6b, 0x6f, 0x6b, 0x2e, 0x3b, 0x6b, 0x65, 0x73, 0xe4, 0x6b, 0x2e,
-0x3b, 0x68, 0x65, 0x69, 0x6e, 0xe4, 0x6b, 0x2e, 0x3b, 0x65, 0x6c, 0x6f, 0x6b, 0x2e, 0x3b, 0x73, 0x79, 0x79, 0x73, 0x6b,
-0x2e, 0x3b, 0x6c, 0x6f, 0x6b, 0x61, 0x6b, 0x2e, 0x3b, 0x6d, 0x61, 0x72, 0x72, 0x61, 0x73, 0x6b, 0x2e, 0x3b, 0x6a, 0x6f,
-0x75, 0x6c, 0x75, 0x6b, 0x2e, 0x3b, 0x74, 0x61, 0x6d, 0x6d, 0x69, 0x6b, 0x75, 0x75, 0x74, 0x61, 0x3b, 0x68, 0x65, 0x6c,
-0x6d, 0x69, 0x6b, 0x75, 0x75, 0x74, 0x61, 0x3b, 0x6d, 0x61, 0x61, 0x6c, 0x69, 0x73, 0x6b, 0x75, 0x75, 0x74, 0x61, 0x3b,
-0x68, 0x75, 0x68, 0x74, 0x69, 0x6b, 0x75, 0x75, 0x74, 0x61, 0x3b, 0x74, 0x6f, 0x75, 0x6b, 0x6f, 0x6b, 0x75, 0x75, 0x74,
-0x61, 0x3b, 0x6b, 0x65, 0x73, 0xe4, 0x6b, 0x75, 0x75, 0x74, 0x61, 0x3b, 0x68, 0x65, 0x69, 0x6e, 0xe4, 0x6b, 0x75, 0x75,
-0x74, 0x61, 0x3b, 0x65, 0x6c, 0x6f, 0x6b, 0x75, 0x75, 0x74, 0x61, 0x3b, 0x73, 0x79, 0x79, 0x73, 0x6b, 0x75, 0x75, 0x74,
-0x61, 0x3b, 0x6c, 0x6f, 0x6b, 0x61, 0x6b, 0x75, 0x75, 0x74, 0x61, 0x3b, 0x6d, 0x61, 0x72, 0x72, 0x61, 0x73, 0x6b, 0x75,
-0x75, 0x74, 0x61, 0x3b, 0x6a, 0x6f, 0x75, 0x6c, 0x75, 0x6b, 0x75, 0x75, 0x74, 0x61, 0x3b, 0x6a, 0x61, 0x6e, 0x76, 0x2e,
-0x3b, 0x66, 0xe9, 0x76, 0x72, 0x2e, 0x3b, 0x6d, 0x61, 0x72, 0x73, 0x3b, 0x61, 0x76, 0x72, 0x2e, 0x3b, 0x6d, 0x61, 0x69,
-0x3b, 0x6a, 0x75, 0x69, 0x6e, 0x3b, 0x6a, 0x75, 0x69, 0x6c, 0x2e, 0x3b, 0x61, 0x6f, 0xfb, 0x74, 0x3b, 0x73, 0x65, 0x70,
-0x74, 0x2e, 0x3b, 0x6f, 0x63, 0x74, 0x2e, 0x3b, 0x6e, 0x6f, 0x76, 0x2e, 0x3b, 0x64, 0xe9, 0x63, 0x2e, 0x3b, 0x6a, 0x61,
-0x6e, 0x76, 0x69, 0x65, 0x72, 0x3b, 0x66, 0xe9, 0x76, 0x72, 0x69, 0x65, 0x72, 0x3b, 0x6d, 0x61, 0x72, 0x73, 0x3b, 0x61,
-0x76, 0x72, 0x69, 0x6c, 0x3b, 0x6d, 0x61, 0x69, 0x3b, 0x6a, 0x75, 0x69, 0x6e, 0x3b, 0x6a, 0x75, 0x69, 0x6c, 0x6c, 0x65,
-0x74, 0x3b, 0x61, 0x6f, 0xfb, 0x74, 0x3b, 0x73, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x72, 0x65, 0x3b, 0x6f, 0x63, 0x74,
-0x6f, 0x62, 0x72, 0x65, 0x3b, 0x6e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x72, 0x65, 0x3b, 0x64, 0xe9, 0x63, 0x65, 0x6d, 0x62,
-0x72, 0x65, 0x3b, 0x6a, 0x61, 0x6e, 0x76, 0x2e, 0x3b, 0x66, 0xe9, 0x76, 0x72, 0x2e, 0x3b, 0x6d, 0x61, 0x72, 0x73, 0x3b,
-0x61, 0x76, 0x72, 0x2e, 0x3b, 0x6d, 0x61, 0x69, 0x3b, 0x6a, 0x75, 0x69, 0x6e, 0x3b, 0x6a, 0x75, 0x69, 0x6c, 0x6c, 0x2e,
-0x3b, 0x61, 0x6f, 0xfb, 0x74, 0x3b, 0x73, 0x65, 0x70, 0x74, 0x2e, 0x3b, 0x6f, 0x63, 0x74, 0x2e, 0x3b, 0x6e, 0x6f, 0x76,
-0x2e, 0x3b, 0x64, 0xe9, 0x63, 0x2e, 0x3b, 0x6a, 0x61, 0x6e, 0x2e, 0x3b, 0x66, 0xe9, 0x76, 0x2e, 0x3b, 0x6d, 0x61, 0x72,
-0x2e, 0x3b, 0x61, 0x76, 0x72, 0x2e, 0x3b, 0x6d, 0x61, 0x69, 0x3b, 0x6a, 0x75, 0x69, 0x2e, 0x3b, 0x6a, 0x75, 0x69, 0x6c,
-0x2e, 0x3b, 0x61, 0x6f, 0xfb, 0x74, 0x3b, 0x73, 0x65, 0x70, 0x74, 0x2e, 0x3b, 0x6f, 0x63, 0x74, 0x2e, 0x3b, 0x6e, 0x6f,
-0x76, 0x2e, 0x3b, 0x64, 0xe9, 0x63, 0x2e, 0x3b, 0x4a, 0x61, 0x6e, 0x3b, 0x46, 0x65, 0x62, 0x3b, 0x4d, 0x72, 0x74, 0x3b,
-0x41, 0x70, 0x72, 0x3b, 0x4d, 0x61, 0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x3b, 0x4a, 0x75, 0x6c, 0x3b, 0x41, 0x75, 0x67, 0x3b,
-0x53, 0x65, 0x70, 0x3b, 0x4f, 0x6b, 0x74, 0x3b, 0x4e, 0x6f, 0x76, 0x3b, 0x44, 0x65, 0x73, 0x3b, 0x4a, 0x61, 0x6e, 0x6e,
-0x65, 0x77, 0x61, 0x72, 0x69, 0x73, 0x3b, 0x46, 0x65, 0x62, 0x72, 0x65, 0x77, 0x61, 0x72, 0x69, 0x73, 0x3b, 0x4d, 0x61,
-0x61, 0x72, 0x74, 0x3b, 0x41, 0x70, 0x72, 0x69, 0x6c, 0x3b, 0x4d, 0x61, 0x61, 0x69, 0x65, 0x3b, 0x4a, 0x75, 0x6e, 0x79,
-0x3b, 0x4a, 0x75, 0x6c, 0x79, 0x3b, 0x41, 0x75, 0x67, 0x75, 0x73, 0x74, 0x75, 0x73, 0x3b, 0x53, 0x65, 0x70, 0x74, 0x69,
-0x6d, 0x62, 0x65, 0x72, 0x3b, 0x4f, 0x6b, 0x74, 0x6f, 0x62, 0x65, 0x72, 0x3b, 0x4e, 0x6f, 0x76, 0x69, 0x6d, 0x62, 0x65,
-0x72, 0x3b, 0x44, 0x65, 0x73, 0x69, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x46, 0x61, 0x6f, 0x69, 0x3b, 0x47, 0x65, 0x61, 0x72,
-0x72, 0x3b, 0x4d, 0xe0, 0x72, 0x74, 0x3b, 0x47, 0x69, 0x62, 0x6c, 0x3b, 0x43, 0xe8, 0x69, 0x74, 0x3b, 0xd2, 0x67, 0x6d,
-0x68, 0x3b, 0x49, 0x75, 0x63, 0x68, 0x3b, 0x4c, 0xf9, 0x6e, 0x61, 0x3b, 0x53, 0x75, 0x6c, 0x74, 0x3b, 0x44, 0xe0, 0x6d,
-0x68, 0x3b, 0x53, 0x61, 0x6d, 0x68, 0x3b, 0x44, 0xf9, 0x62, 0x68, 0x3b, 0x41, 0x6d, 0x20, 0x46, 0x61, 0x6f, 0x69, 0x6c,
-0x6c, 0x65, 0x61, 0x63, 0x68, 0x3b, 0x41, 0x6e, 0x20, 0x47, 0x65, 0x61, 0x72, 0x72, 0x61, 0x6e, 0x3b, 0x41, 0x6d, 0x20,
-0x4d, 0xe0, 0x72, 0x74, 0x3b, 0x41, 0x6e, 0x20, 0x47, 0x69, 0x62, 0x6c, 0x65, 0x61, 0x6e, 0x3b, 0x41, 0x6e, 0x20, 0x43,
-0xe8, 0x69, 0x74, 0x65, 0x61, 0x6e, 0x3b, 0x41, 0x6e, 0x20, 0x74, 0x2d, 0xd2, 0x67, 0x6d, 0x68, 0x69, 0x6f, 0x73, 0x3b,
-0x41, 0x6e, 0x20, 0x74, 0x2d, 0x49, 0x75, 0x63, 0x68, 0x61, 0x72, 0x3b, 0x41, 0x6e, 0x20, 0x4c, 0xf9, 0x6e, 0x61, 0x73,
-0x74, 0x61, 0x6c, 0x3b, 0x41, 0x6e, 0x20, 0x74, 0x2d, 0x53, 0x75, 0x6c, 0x74, 0x61, 0x69, 0x6e, 0x3b, 0x41, 0x6e, 0x20,
-0x44, 0xe0, 0x6d, 0x68, 0x61, 0x69, 0x72, 0x3b, 0x41, 0x6e, 0x20, 0x74, 0x2d, 0x53, 0x61, 0x6d, 0x68, 0x61, 0x69, 0x6e,
-0x3b, 0x41, 0x6e, 0x20, 0x44, 0xf9, 0x62, 0x68, 0x6c, 0x61, 0x63, 0x68, 0x64, 0x3b, 0x46, 0x3b, 0x47, 0x3b, 0x4d, 0x3b,
-0x47, 0x3b, 0x43, 0x3b, 0xd2, 0x3b, 0x49, 0x3b, 0x4c, 0x3b, 0x53, 0x3b, 0x44, 0x3b, 0x53, 0x3b, 0x44, 0x3b, 0x64, 0x68,
-0x65, 0x6e, 0x20, 0x46, 0x68, 0x61, 0x6f, 0x69, 0x6c, 0x6c, 0x65, 0x61, 0x63, 0x68, 0x3b, 0x64, 0x68, 0x65, 0x6e, 0x20,
-0x47, 0x68, 0x65, 0x61, 0x72, 0x72, 0x61, 0x6e, 0x3b, 0x64, 0x68, 0x65, 0x6e, 0x20, 0x4d, 0x68, 0xe0, 0x72, 0x74, 0x3b,
-0x64, 0x68, 0x65, 0x6e, 0x20, 0x47, 0x68, 0x69, 0x62, 0x6c, 0x65, 0x61, 0x6e, 0x3b, 0x64, 0x68, 0x65, 0x6e, 0x20, 0x43,
-0x68, 0xe8, 0x69, 0x74, 0x65, 0x61, 0x6e, 0x3b, 0x64, 0x68, 0x65, 0x6e, 0x20, 0xd2, 0x67, 0x6d, 0x68, 0x69, 0x6f, 0x73,
-0x3b, 0x64, 0x68, 0x65, 0x6e, 0x20, 0x49, 0x75, 0x63, 0x68, 0x61, 0x72, 0x3b, 0x64, 0x68, 0x65, 0x6e, 0x20, 0x4c, 0xf9,
-0x6e, 0x61, 0x73, 0x74, 0x61, 0x6c, 0x3b, 0x64, 0x68, 0x65, 0x6e, 0x20, 0x74, 0x2d, 0x53, 0x75, 0x6c, 0x74, 0x61, 0x69,
-0x6e, 0x3b, 0x64, 0x68, 0x65, 0x6e, 0x20, 0x44, 0xe0, 0x6d, 0x68, 0x61, 0x69, 0x72, 0x3b, 0x64, 0x68, 0x65, 0x6e, 0x20,
-0x74, 0x2d, 0x53, 0x61, 0x6d, 0x68, 0x61, 0x69, 0x6e, 0x3b, 0x64, 0x68, 0x65, 0x6e, 0x20, 0x44, 0xf9, 0x62, 0x68, 0x6c,
-0x61, 0x63, 0x68, 0x64, 0x3b, 0x58, 0x61, 0x6e, 0x2e, 0x3b, 0x46, 0x65, 0x62, 0x2e, 0x3b, 0x4d, 0x61, 0x72, 0x2e, 0x3b,
-0x41, 0x62, 0x72, 0x2e, 0x3b, 0x4d, 0x61, 0x69, 0x6f, 0x3b, 0x58, 0x75, 0xf1, 0x6f, 0x3b, 0x58, 0x75, 0x6c, 0x2e, 0x3b,
-0x41, 0x67, 0x6f, 0x2e, 0x3b, 0x53, 0x65, 0x74, 0x2e, 0x3b, 0x4f, 0x75, 0x74, 0x2e, 0x3b, 0x4e, 0x6f, 0x76, 0x2e, 0x3b,
-0x44, 0x65, 0x63, 0x2e, 0x3b, 0x58, 0x61, 0x6e, 0x65, 0x69, 0x72, 0x6f, 0x3b, 0x46, 0x65, 0x62, 0x72, 0x65, 0x69, 0x72,
-0x6f, 0x3b, 0x4d, 0x61, 0x72, 0x7a, 0x6f, 0x3b, 0x41, 0x62, 0x72, 0x69, 0x6c, 0x3b, 0x4d, 0x61, 0x69, 0x6f, 0x3b, 0x58,
-0x75, 0xf1, 0x6f, 0x3b, 0x58, 0x75, 0x6c, 0x6c, 0x6f, 0x3b, 0x41, 0x67, 0x6f, 0x73, 0x74, 0x6f, 0x3b, 0x53, 0x65, 0x74,
-0x65, 0x6d, 0x62, 0x72, 0x6f, 0x3b, 0x4f, 0x75, 0x74, 0x75, 0x62, 0x72, 0x6f, 0x3b, 0x4e, 0x6f, 0x76, 0x65, 0x6d, 0x62,
-0x72, 0x6f, 0x3b, 0x44, 0x65, 0x63, 0x65, 0x6d, 0x62, 0x72, 0x6f, 0x3b, 0x58, 0x3b, 0x46, 0x3b, 0x4d, 0x3b, 0x41, 0x3b,
-0x4d, 0x3b, 0x58, 0x3b, 0x58, 0x3b, 0x41, 0x3b, 0x53, 0x3b, 0x4f, 0x3b, 0x4e, 0x3b, 0x44, 0x3b, 0x78, 0x61, 0x6e, 0x2e,
-0x3b, 0x66, 0x65, 0x62, 0x2e, 0x3b, 0x6d, 0x61, 0x72, 0x2e, 0x3b, 0x61, 0x62, 0x72, 0x2e, 0x3b, 0x6d, 0x61, 0x69, 0x6f,
-0x3b, 0x78, 0x75, 0xf1, 0x6f, 0x3b, 0x78, 0x75, 0x6c, 0x2e, 0x3b, 0x61, 0x67, 0x6f, 0x2e, 0x3b, 0x73, 0x65, 0x74, 0x2e,
-0x3b, 0x6f, 0x75, 0x74, 0x2e, 0x3b, 0x6e, 0x6f, 0x76, 0x2e, 0x3b, 0x64, 0x65, 0x63, 0x2e, 0x3b, 0x78, 0x61, 0x6e, 0x65,
-0x69, 0x72, 0x6f, 0x3b, 0x66, 0x65, 0x62, 0x72, 0x65, 0x69, 0x72, 0x6f, 0x3b, 0x6d, 0x61, 0x72, 0x7a, 0x6f, 0x3b, 0x61,
-0x62, 0x72, 0x69, 0x6c, 0x3b, 0x6d, 0x61, 0x69, 0x6f, 0x3b, 0x78, 0x75, 0xf1, 0x6f, 0x3b, 0x78, 0x75, 0x6c, 0x6c, 0x6f,
-0x3b, 0x61, 0x67, 0x6f, 0x73, 0x74, 0x6f, 0x3b, 0x73, 0x65, 0x74, 0x65, 0x6d, 0x62, 0x72, 0x6f, 0x3b, 0x6f, 0x75, 0x74,
-0x75, 0x62, 0x72, 0x6f, 0x3b, 0x6e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x72, 0x6f, 0x3b, 0x64, 0x65, 0x63, 0x65, 0x6d, 0x62,
-0x72, 0x6f, 0x3b, 0x78, 0x2e, 0x3b, 0x66, 0x2e, 0x3b, 0x6d, 0x2e, 0x3b, 0x61, 0x2e, 0x3b, 0x6d, 0x2e, 0x3b, 0x78, 0x2e,
-0x3b, 0x78, 0x2e, 0x3b, 0x61, 0x2e, 0x3b, 0x73, 0x2e, 0x3b, 0x6f, 0x2e, 0x3b, 0x6e, 0x2e, 0x3b, 0x64, 0x2e, 0x3b, 0x10d8,
-0x10d0, 0x10dc, 0x3b, 0x10d7, 0x10d4, 0x10d1, 0x3b, 0x10db, 0x10d0, 0x10e0, 0x3b, 0x10d0, 0x10de, 0x10e0, 0x3b, 0x10db, 0x10d0, 0x10d8, 0x3b, 0x10d8,
-0x10d5, 0x10dc, 0x3b, 0x10d8, 0x10d5, 0x10da, 0x3b, 0x10d0, 0x10d2, 0x10d5, 0x3b, 0x10e1, 0x10d4, 0x10e5, 0x3b, 0x10dd, 0x10e5, 0x10e2, 0x3b, 0x10dc,
-0x10dd, 0x10d4, 0x3b, 0x10d3, 0x10d4, 0x10d9, 0x3b, 0x10d8, 0x10d0, 0x10dc, 0x10d5, 0x10d0, 0x10e0, 0x10d8, 0x3b, 0x10d7, 0x10d4, 0x10d1, 0x10d4, 0x10e0,
-0x10d5, 0x10d0, 0x10da, 0x10d8, 0x3b, 0x10db, 0x10d0, 0x10e0, 0x10e2, 0x10d8, 0x3b, 0x10d0, 0x10de, 0x10e0, 0x10d8, 0x10da, 0x10d8, 0x3b, 0x10db, 0x10d0,
-0x10d8, 0x10e1, 0x10d8, 0x3b, 0x10d8, 0x10d5, 0x10dc, 0x10d8, 0x10e1, 0x10d8, 0x3b, 0x10d8, 0x10d5, 0x10da, 0x10d8, 0x10e1, 0x10d8, 0x3b, 0x10d0, 0x10d2,
-0x10d5, 0x10d8, 0x10e1, 0x10e2, 0x10dd, 0x3b, 0x10e1, 0x10d4, 0x10e5, 0x10e2, 0x10d4, 0x10db, 0x10d1, 0x10d4, 0x10e0, 0x10d8, 0x3b, 0x10dd, 0x10e5, 0x10e2,
-0x10dd, 0x10db, 0x10d1, 0x10d4, 0x10e0, 0x10d8, 0x3b, 0x10dc, 0x10dd, 0x10d4, 0x10db, 0x10d1, 0x10d4, 0x10e0, 0x10d8, 0x3b, 0x10d3, 0x10d4, 0x10d9, 0x10d4,
-0x10db, 0x10d1, 0x10d4, 0x10e0, 0x10d8, 0x3b, 0x10d8, 0x3b, 0x10d7, 0x3b, 0x10db, 0x3b, 0x10d0, 0x3b, 0x10db, 0x3b, 0x10d8, 0x3b, 0x10d8, 0x3b,
-0x10d0, 0x3b, 0x10e1, 0x3b, 0x10dd, 0x3b, 0x10dc, 0x3b, 0x10d3, 0x3b, 0x4a, 0x61, 0x6e, 0x3b, 0x46, 0x65, 0x62, 0x3b, 0x4d, 0xe4,
-0x72, 0x3b, 0x41, 0x70, 0x72, 0x3b, 0x4d, 0x61, 0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x3b, 0x4a, 0x75, 0x6c, 0x3b, 0x41, 0x75,
-0x67, 0x3b, 0x53, 0x65, 0x70, 0x3b, 0x4f, 0x6b, 0x74, 0x3b, 0x4e, 0x6f, 0x76, 0x3b, 0x44, 0x65, 0x7a, 0x3b, 0x4a, 0x61,
-0x6e, 0x75, 0x61, 0x72, 0x3b, 0x46, 0x65, 0x62, 0x72, 0x75, 0x61, 0x72, 0x3b, 0x4d, 0xe4, 0x72, 0x7a, 0x3b, 0x41, 0x70,
-0x72, 0x69, 0x6c, 0x3b, 0x4d, 0x61, 0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x69, 0x3b, 0x4a, 0x75, 0x6c, 0x69, 0x3b, 0x41, 0x75,
-0x67, 0x75, 0x73, 0x74, 0x3b, 0x53, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x4f, 0x6b, 0x74, 0x6f, 0x62,
-0x65, 0x72, 0x3b, 0x4e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x44, 0x65, 0x7a, 0x65, 0x6d, 0x62, 0x65, 0x72,
-0x3b, 0x4a, 0x61, 0x6e, 0x2e, 0x3b, 0x46, 0x65, 0x62, 0x2e, 0x3b, 0x4d, 0xe4, 0x72, 0x7a, 0x3b, 0x41, 0x70, 0x72, 0x2e,
-0x3b, 0x4d, 0x61, 0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x69, 0x3b, 0x4a, 0x75, 0x6c, 0x69, 0x3b, 0x41, 0x75, 0x67, 0x2e, 0x3b,
-0x53, 0x65, 0x70, 0x74, 0x2e, 0x3b, 0x4f, 0x6b, 0x74, 0x2e, 0x3b, 0x4e, 0x6f, 0x76, 0x2e, 0x3b, 0x44, 0x65, 0x7a, 0x2e,
-0x3b, 0x4a, 0xe4, 0x6e, 0x3b, 0x46, 0x65, 0x62, 0x3b, 0x4d, 0xe4, 0x72, 0x3b, 0x41, 0x70, 0x72, 0x3b, 0x4d, 0x61, 0x69,
-0x3b, 0x4a, 0x75, 0x6e, 0x3b, 0x4a, 0x75, 0x6c, 0x3b, 0x41, 0x75, 0x67, 0x3b, 0x53, 0x65, 0x70, 0x3b, 0x4f, 0x6b, 0x74,
-0x3b, 0x4e, 0x6f, 0x76, 0x3b, 0x44, 0x65, 0x7a, 0x3b, 0x4a, 0xe4, 0x6e, 0x6e, 0x65, 0x72, 0x3b, 0x46, 0x65, 0x62, 0x72,
-0x75, 0x61, 0x72, 0x3b, 0x4d, 0xe4, 0x72, 0x7a, 0x3b, 0x41, 0x70, 0x72, 0x69, 0x6c, 0x3b, 0x4d, 0x61, 0x69, 0x3b, 0x4a,
-0x75, 0x6e, 0x69, 0x3b, 0x4a, 0x75, 0x6c, 0x69, 0x3b, 0x41, 0x75, 0x67, 0x75, 0x73, 0x74, 0x3b, 0x53, 0x65, 0x70, 0x74,
-0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x4f, 0x6b, 0x74, 0x6f, 0x62, 0x65, 0x72, 0x3b, 0x4e, 0x6f, 0x76, 0x65, 0x6d, 0x62,
-0x65, 0x72, 0x3b, 0x44, 0x65, 0x7a, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x4a, 0xe4, 0x6e, 0x2e, 0x3b, 0x46, 0x65, 0x62,
-0x2e, 0x3b, 0x4d, 0xe4, 0x72, 0x7a, 0x3b, 0x41, 0x70, 0x72, 0x2e, 0x3b, 0x4d, 0x61, 0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x69,
-0x3b, 0x4a, 0x75, 0x6c, 0x69, 0x3b, 0x41, 0x75, 0x67, 0x2e, 0x3b, 0x53, 0x65, 0x70, 0x2e, 0x3b, 0x4f, 0x6b, 0x74, 0x2e,
-0x3b, 0x4e, 0x6f, 0x76, 0x2e, 0x3b, 0x44, 0x65, 0x7a, 0x2e, 0x3b, 0x399, 0x3b1, 0x3bd, 0x3b, 0x3a6, 0x3b5, 0x3b2, 0x3b, 0x39c,
-0x3ac, 0x3c1, 0x3b, 0x391, 0x3c0, 0x3c1, 0x3b, 0x39c, 0x3ac, 0x3b9, 0x3b, 0x399, 0x3bf, 0x3cd, 0x3bd, 0x3b, 0x399, 0x3bf, 0x3cd, 0x3bb,
-0x3b, 0x391, 0x3cd, 0x3b3, 0x3b, 0x3a3, 0x3b5, 0x3c0, 0x3b, 0x39f, 0x3ba, 0x3c4, 0x3b, 0x39d, 0x3bf, 0x3ad, 0x3b, 0x394, 0x3b5, 0x3ba,
-0x3b, 0x399, 0x3b1, 0x3bd, 0x3bf, 0x3c5, 0x3ac, 0x3c1, 0x3b9, 0x3bf, 0x3c2, 0x3b, 0x3a6, 0x3b5, 0x3b2, 0x3c1, 0x3bf, 0x3c5, 0x3ac, 0x3c1,
-0x3b9, 0x3bf, 0x3c2, 0x3b, 0x39c, 0x3ac, 0x3c1, 0x3c4, 0x3b9, 0x3bf, 0x3c2, 0x3b, 0x391, 0x3c0, 0x3c1, 0x3af, 0x3bb, 0x3b9, 0x3bf, 0x3c2,
-0x3b, 0x39c, 0x3ac, 0x3b9, 0x3bf, 0x3c2, 0x3b, 0x399, 0x3bf, 0x3cd, 0x3bd, 0x3b9, 0x3bf, 0x3c2, 0x3b, 0x399, 0x3bf, 0x3cd, 0x3bb, 0x3b9,
-0x3bf, 0x3c2, 0x3b, 0x391, 0x3cd, 0x3b3, 0x3bf, 0x3c5, 0x3c3, 0x3c4, 0x3bf, 0x3c2, 0x3b, 0x3a3, 0x3b5, 0x3c0, 0x3c4, 0x3ad, 0x3bc, 0x3b2,
-0x3c1, 0x3b9, 0x3bf, 0x3c2, 0x3b, 0x39f, 0x3ba, 0x3c4, 0x3ce, 0x3b2, 0x3c1, 0x3b9, 0x3bf, 0x3c2, 0x3b, 0x39d, 0x3bf, 0x3ad, 0x3bc, 0x3b2,
-0x3c1, 0x3b9, 0x3bf, 0x3c2, 0x3b, 0x394, 0x3b5, 0x3ba, 0x3ad, 0x3bc, 0x3b2, 0x3c1, 0x3b9, 0x3bf, 0x3c2, 0x3b, 0x399, 0x3b, 0x3a6, 0x3b,
-0x39c, 0x3b, 0x391, 0x3b, 0x39c, 0x3b, 0x399, 0x3b, 0x399, 0x3b, 0x391, 0x3b, 0x3a3, 0x3b, 0x39f, 0x3b, 0x39d, 0x3b, 0x394, 0x3b,
-0x399, 0x3b1, 0x3bd, 0x3b, 0x3a6, 0x3b5, 0x3b2, 0x3b, 0x39c, 0x3b1, 0x3c1, 0x3b, 0x391, 0x3c0, 0x3c1, 0x3b, 0x39c, 0x3b1, 0x390, 0x3b,
-0x399, 0x3bf, 0x3c5, 0x3bd, 0x3b, 0x399, 0x3bf, 0x3c5, 0x3bb, 0x3b, 0x391, 0x3c5, 0x3b3, 0x3b, 0x3a3, 0x3b5, 0x3c0, 0x3b, 0x39f, 0x3ba,
-0x3c4, 0x3b, 0x39d, 0x3bf, 0x3b5, 0x3b, 0x394, 0x3b5, 0x3ba, 0x3b, 0x399, 0x3b1, 0x3bd, 0x3bf, 0x3c5, 0x3b1, 0x3c1, 0x3af, 0x3bf, 0x3c5,
-0x3b, 0x3a6, 0x3b5, 0x3b2, 0x3c1, 0x3bf, 0x3c5, 0x3b1, 0x3c1, 0x3af, 0x3bf, 0x3c5, 0x3b, 0x39c, 0x3b1, 0x3c1, 0x3c4, 0x3af, 0x3bf, 0x3c5,
-0x3b, 0x391, 0x3c0, 0x3c1, 0x3b9, 0x3bb, 0x3af, 0x3bf, 0x3c5, 0x3b, 0x39c, 0x3b1, 0x390, 0x3bf, 0x3c5, 0x3b, 0x399, 0x3bf, 0x3c5, 0x3bd,
-0x3af, 0x3bf, 0x3c5, 0x3b, 0x399, 0x3bf, 0x3c5, 0x3bb, 0x3af, 0x3bf, 0x3c5, 0x3b, 0x391, 0x3c5, 0x3b3, 0x3bf, 0x3cd, 0x3c3, 0x3c4, 0x3bf,
-0x3c5, 0x3b, 0x3a3, 0x3b5, 0x3c0, 0x3c4, 0x3b5, 0x3bc, 0x3b2, 0x3c1, 0x3af, 0x3bf, 0x3c5, 0x3b, 0x39f, 0x3ba, 0x3c4, 0x3c9, 0x3b2, 0x3c1,
-0x3af, 0x3bf, 0x3c5, 0x3b, 0x39d, 0x3bf, 0x3b5, 0x3bc, 0x3b2, 0x3c1, 0x3af, 0x3bf, 0x3c5, 0x3b, 0x394, 0x3b5, 0x3ba, 0x3b5, 0x3bc, 0x3b2,
-0x3c1, 0x3af, 0x3bf, 0x3c5, 0x3b, 0x6a, 0x61, 0x6e, 0x3b, 0x66, 0x65, 0x62, 0x72, 0x3b, 0x6d, 0x61, 0x72, 0x3b, 0x61, 0x70,
-0x72, 0x3b, 0x6d, 0x61, 0x6a, 0x3b, 0x6a, 0x75, 0x6e, 0x3b, 0x6a, 0x75, 0x6c, 0x3b, 0x61, 0x75, 0x67, 0x3b, 0x73, 0x65,
-0x70, 0x74, 0x3b, 0x6f, 0x6b, 0x74, 0x3b, 0x6e, 0x6f, 0x76, 0x3b, 0x64, 0x65, 0x63, 0x3b, 0x6a, 0x61, 0x6e, 0x75, 0x61,
-0x61, 0x72, 0x69, 0x3b, 0x66, 0x65, 0x62, 0x72, 0x75, 0x61, 0x61, 0x72, 0x69, 0x3b, 0x6d, 0x61, 0x72, 0x73, 0x69, 0x3b,
-0x61, 0x70, 0x72, 0x69, 0x69, 0x6c, 0x69, 0x3b, 0x6d, 0x61, 0x61, 0x6a, 0x69, 0x3b, 0x6a, 0x75, 0x75, 0x6e, 0x69, 0x3b,
-0x6a, 0x75, 0x75, 0x6c, 0x69, 0x3b, 0x61, 0x67, 0x67, 0x75, 0x73, 0x74, 0x69, 0x3b, 0x73, 0x65, 0x70, 0x74, 0x65, 0x6d,
-0x62, 0x61, 0x72, 0x69, 0x3b, 0x6f, 0x6b, 0x74, 0x6f, 0x62, 0x61, 0x72, 0x69, 0x3b, 0x6e, 0x6f, 0x76, 0x65, 0x6d, 0x62,
-0x61, 0x72, 0x69, 0x3b, 0x64, 0x65, 0x63, 0x65, 0x6d, 0x62, 0x61, 0x72, 0x69, 0x3b, 0x6a, 0x61, 0x6e, 0x75, 0x61, 0x61,
-0x72, 0x69, 0x70, 0x3b, 0x66, 0x65, 0x62, 0x72, 0x75, 0x61, 0x61, 0x72, 0x69, 0x70, 0x3b, 0x6d, 0x61, 0x72, 0x73, 0x69,
-0x70, 0x3b, 0x61, 0x70, 0x72, 0x69, 0x69, 0x6c, 0x69, 0x70, 0x3b, 0x6d, 0x61, 0x61, 0x6a, 0x69, 0x70, 0x3b, 0x6a, 0x75,
-0x75, 0x6e, 0x69, 0x70, 0x3b, 0x6a, 0x75, 0x75, 0x6c, 0x69, 0x70, 0x3b, 0x61, 0x67, 0x67, 0x75, 0x73, 0x74, 0x69, 0x70,
-0x3b, 0x73, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x61, 0x72, 0x69, 0x70, 0x3b, 0x6f, 0x6b, 0x74, 0x6f, 0x62, 0x61, 0x72,
-0x69, 0x70, 0x3b, 0x6e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x61, 0x72, 0x69, 0x70, 0x3b, 0x64, 0x65, 0x63, 0x65, 0x6d, 0x62,
-0x61, 0x72, 0x69, 0x70, 0x3b, 0xa9c, 0xabe, 0xaa8, 0xacd, 0xaaf, 0xac1, 0x3b, 0xaab, 0xac7, 0xaac, 0xacd, 0xab0, 0xac1, 0x3b, 0xaae,
-0xabe, 0xab0, 0xacd, 0xa9a, 0x3b, 0xa8f, 0xaaa, 0xacd, 0xab0, 0xabf, 0xab2, 0x3b, 0xaae, 0xac7, 0x3b, 0xa9c, 0xac2, 0xaa8, 0x3b, 0xa9c,
-0xac1, 0xab2, 0xabe, 0xa88, 0x3b, 0xa91, 0xa97, 0xab8, 0xacd, 0xa9f, 0x3b, 0xab8, 0xaaa, 0xacd, 0xa9f, 0xac7, 0x3b, 0xa91, 0xa95, 0xacd,
-0xa9f, 0xacb, 0x3b, 0xaa8, 0xab5, 0xac7, 0x3b, 0xaa1, 0xabf, 0xab8, 0xac7, 0x3b, 0xa9c, 0xabe, 0xaa8, 0xacd, 0xaaf, 0xac1, 0xa86, 0xab0,
-0xac0, 0x3b, 0xaab, 0xac7, 0xaac, 0xacd, 0xab0, 0xac1, 0xa86, 0xab0, 0xac0, 0x3b, 0xaae, 0xabe, 0xab0, 0xacd, 0xa9a, 0x3b, 0xa8f, 0xaaa,
-0xacd, 0xab0, 0xabf, 0xab2, 0x3b, 0xaae, 0xac7, 0x3b, 0xa9c, 0xac2, 0xaa8, 0x3b, 0xa9c, 0xac1, 0xab2, 0xabe, 0xa88, 0x3b, 0xa91, 0xa97,
-0xab8, 0xacd, 0xa9f, 0x3b, 0xab8, 0xaaa, 0xacd, 0xa9f, 0xac7, 0xaae, 0xacd, 0xaac, 0xab0, 0x3b, 0xa91, 0xa95, 0xacd, 0xa9f, 0xacb, 0xaac,
-0xab0, 0x3b, 0xaa8, 0xab5, 0xac7, 0xaae, 0xacd, 0xaac, 0xab0, 0x3b, 0xaa1, 0xabf, 0xab8, 0xac7, 0xaae, 0xacd, 0xaac, 0xab0, 0x3b, 0xa9c,
-0xabe, 0x3b, 0xaab, 0xac7, 0x3b, 0xaae, 0xabe, 0x3b, 0xa8f, 0x3b, 0xaae, 0xac7, 0x3b, 0xa9c, 0xac2, 0x3b, 0xa9c, 0xac1, 0x3b, 0xa91,
-0x3b, 0xab8, 0x3b, 0xa91, 0x3b, 0xaa8, 0x3b, 0xaa1, 0xabf, 0x3b, 0x4a, 0x61, 0x6e, 0x3b, 0x46, 0x61, 0x62, 0x3b, 0x4d, 0x61,
-0x72, 0x3b, 0x41, 0x66, 0x69, 0x3b, 0x4d, 0x61, 0x79, 0x3b, 0x59, 0x75, 0x6e, 0x3b, 0x59, 0x75, 0x6c, 0x3b, 0x41, 0x67,
-0x75, 0x3b, 0x53, 0x61, 0x74, 0x3b, 0x4f, 0x6b, 0x74, 0x3b, 0x4e, 0x75, 0x77, 0x3b, 0x44, 0x69, 0x73, 0x3b, 0x4a, 0x61,
-0x6e, 0x61, 0x69, 0x72, 0x75, 0x3b, 0x46, 0x61, 0x62, 0x75, 0x72, 0x61, 0x69, 0x72, 0x75, 0x3b, 0x4d, 0x61, 0x72, 0x69,
-0x73, 0x3b, 0x41, 0x66, 0x69, 0x72, 0x69, 0x6c, 0x75, 0x3b, 0x4d, 0x61, 0x79, 0x75, 0x3b, 0x59, 0x75, 0x6e, 0x69, 0x3b,
-0x59, 0x75, 0x6c, 0x69, 0x3b, 0x41, 0x67, 0x75, 0x73, 0x74, 0x61, 0x3b, 0x53, 0x61, 0x74, 0x75, 0x6d, 0x62, 0x61, 0x3b,
-0x4f, 0x6b, 0x74, 0x6f, 0x62, 0x61, 0x3b, 0x4e, 0x75, 0x77, 0x61, 0x6d, 0x62, 0x61, 0x3b, 0x44, 0x69, 0x73, 0x61, 0x6d,
-0x62, 0x61, 0x3b, 0x4a, 0x3b, 0x46, 0x3b, 0x4d, 0x3b, 0x41, 0x3b, 0x4d, 0x3b, 0x59, 0x3b, 0x59, 0x3b, 0x41, 0x3b, 0x53,
-0x3b, 0x4f, 0x3b, 0x4e, 0x3b, 0x44, 0x3b, 0x5d9, 0x5e0, 0x5d5, 0x5f3, 0x3b, 0x5e4, 0x5d1, 0x5e8, 0x5f3, 0x3b, 0x5de, 0x5e8, 0x5e5,
-0x3b, 0x5d0, 0x5e4, 0x5e8, 0x5f3, 0x3b, 0x5de, 0x5d0, 0x5d9, 0x3b, 0x5d9, 0x5d5, 0x5e0, 0x5d9, 0x3b, 0x5d9, 0x5d5, 0x5dc, 0x5d9, 0x3b,
-0x5d0, 0x5d5, 0x5d2, 0x5f3, 0x3b, 0x5e1, 0x5e4, 0x5d8, 0x5f3, 0x3b, 0x5d0, 0x5d5, 0x5e7, 0x5f3, 0x3b, 0x5e0, 0x5d5, 0x5d1, 0x5f3, 0x3b,
-0x5d3, 0x5e6, 0x5de, 0x5f3, 0x3b, 0x5d9, 0x5e0, 0x5d5, 0x5d0, 0x5e8, 0x3b, 0x5e4, 0x5d1, 0x5e8, 0x5d5, 0x5d0, 0x5e8, 0x3b, 0x5de, 0x5e8,
-0x5e5, 0x3b, 0x5d0, 0x5e4, 0x5e8, 0x5d9, 0x5dc, 0x3b, 0x5de, 0x5d0, 0x5d9, 0x3b, 0x5d9, 0x5d5, 0x5e0, 0x5d9, 0x3b, 0x5d9, 0x5d5, 0x5dc,
-0x5d9, 0x3b, 0x5d0, 0x5d5, 0x5d2, 0x5d5, 0x5e1, 0x5d8, 0x3b, 0x5e1, 0x5e4, 0x5d8, 0x5de, 0x5d1, 0x5e8, 0x3b, 0x5d0, 0x5d5, 0x5e7, 0x5d8,
-0x5d5, 0x5d1, 0x5e8, 0x3b, 0x5e0, 0x5d5, 0x5d1, 0x5de, 0x5d1, 0x5e8, 0x3b, 0x5d3, 0x5e6, 0x5de, 0x5d1, 0x5e8, 0x3b, 0x91c, 0x928, 0x970,
-0x3b, 0x92b, 0x93c, 0x930, 0x970, 0x3b, 0x92e, 0x93e, 0x930, 0x94d, 0x91a, 0x3b, 0x905, 0x92a, 0x94d, 0x930, 0x948, 0x932, 0x3b, 0x92e,
-0x908, 0x3b, 0x91c, 0x942, 0x928, 0x3b, 0x91c, 0x941, 0x932, 0x970, 0x3b, 0x905, 0x917, 0x970, 0x3b, 0x938, 0x93f, 0x924, 0x970, 0x3b,
-0x905, 0x915, 0x94d, 0x924, 0x942, 0x970, 0x3b, 0x928, 0x935, 0x970, 0x3b, 0x926, 0x93f, 0x938, 0x970, 0x3b, 0x91c, 0x928, 0x935, 0x930,
-0x940, 0x3b, 0x92b, 0x93c, 0x930, 0x935, 0x930, 0x940, 0x3b, 0x92e, 0x93e, 0x930, 0x94d, 0x91a, 0x3b, 0x905, 0x92a, 0x94d, 0x930, 0x948,
-0x932, 0x3b, 0x92e, 0x908, 0x3b, 0x91c, 0x942, 0x928, 0x3b, 0x91c, 0x941, 0x932, 0x93e, 0x908, 0x3b, 0x905, 0x917, 0x938, 0x94d, 0x924,
-0x3b, 0x938, 0x93f, 0x924, 0x902, 0x92c, 0x930, 0x3b, 0x905, 0x915, 0x94d, 0x924, 0x942, 0x92c, 0x930, 0x3b, 0x928, 0x935, 0x902, 0x92c,
-0x930, 0x3b, 0x926, 0x93f, 0x938, 0x902, 0x92c, 0x930, 0x3b, 0x91c, 0x3b, 0x92b, 0x93c, 0x3b, 0x92e, 0x93e, 0x3b, 0x905, 0x3b, 0x92e,
-0x3b, 0x91c, 0x942, 0x3b, 0x91c, 0x941, 0x3b, 0x905, 0x3b, 0x938, 0x93f, 0x3b, 0x905, 0x3b, 0x928, 0x3b, 0x926, 0x93f, 0x3b, 0x6a,
-0x61, 0x6e, 0x2e, 0x3b, 0x66, 0x65, 0x62, 0x72, 0x2e, 0x3b, 0x6d, 0xe1, 0x72, 0x63, 0x2e, 0x3b, 0xe1, 0x70, 0x72, 0x2e,
-0x3b, 0x6d, 0xe1, 0x6a, 0x2e, 0x3b, 0x6a, 0xfa, 0x6e, 0x2e, 0x3b, 0x6a, 0xfa, 0x6c, 0x2e, 0x3b, 0x61, 0x75, 0x67, 0x2e,
-0x3b, 0x73, 0x7a, 0x65, 0x70, 0x74, 0x2e, 0x3b, 0x6f, 0x6b, 0x74, 0x2e, 0x3b, 0x6e, 0x6f, 0x76, 0x2e, 0x3b, 0x64, 0x65,
-0x63, 0x2e, 0x3b, 0x6a, 0x61, 0x6e, 0x75, 0xe1, 0x72, 0x3b, 0x66, 0x65, 0x62, 0x72, 0x75, 0xe1, 0x72, 0x3b, 0x6d, 0xe1,
-0x72, 0x63, 0x69, 0x75, 0x73, 0x3b, 0xe1, 0x70, 0x72, 0x69, 0x6c, 0x69, 0x73, 0x3b, 0x6d, 0xe1, 0x6a, 0x75, 0x73, 0x3b,
-0x6a, 0xfa, 0x6e, 0x69, 0x75, 0x73, 0x3b, 0x6a, 0xfa, 0x6c, 0x69, 0x75, 0x73, 0x3b, 0x61, 0x75, 0x67, 0x75, 0x73, 0x7a,
-0x74, 0x75, 0x73, 0x3b, 0x73, 0x7a, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x6f, 0x6b, 0x74, 0xf3, 0x62,
+0x76, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x64, 0x65, 0x63, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x6a, 0x61, 0x6e, 0x2e, 0x3b,
+0x66, 0x65, 0x62, 0x2e, 0x3b, 0x6d, 0x61, 0x72, 0x2e, 0x3b, 0x61, 0x70, 0x72, 0x2e, 0x3b, 0x6d, 0x61, 0x6a, 0x3b, 0x6a,
+0x75, 0x6e, 0x2e, 0x3b, 0x6a, 0x75, 0x6c, 0x2e, 0x3b, 0x61, 0x75, 0x67, 0x2e, 0x3b, 0x73, 0x65, 0x70, 0x2e, 0x3b, 0x6f,
+0x6b, 0x74, 0x2e, 0x3b, 0x6e, 0x6f, 0x76, 0x2e, 0x3b, 0x64, 0x65, 0x63, 0x2e, 0x6a, 0x61, 0x6e, 0x75, 0x61, 0x72, 0x69,
+0x3b, 0x66, 0x65, 0x62, 0x72, 0x75, 0x61, 0x72, 0x69, 0x3b, 0x6d, 0x61, 0x61, 0x72, 0x74, 0x3b, 0x61, 0x70, 0x72, 0x69,
+0x6c, 0x3b, 0x6d, 0x65, 0x69, 0x3b, 0x6a, 0x75, 0x6e, 0x69, 0x3b, 0x6a, 0x75, 0x6c, 0x69, 0x3b, 0x61, 0x75, 0x67, 0x75,
+0x73, 0x74, 0x75, 0x73, 0x3b, 0x73, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x6f, 0x6b, 0x74, 0x6f, 0x62,
 0x65, 0x72, 0x3b, 0x6e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x64, 0x65, 0x63, 0x65, 0x6d, 0x62, 0x65, 0x72,
-0x3b, 0x4a, 0x3b, 0x46, 0x3b, 0x4d, 0x3b, 0xc1, 0x3b, 0x4d, 0x3b, 0x4a, 0x3b, 0x4a, 0x3b, 0x41, 0x3b, 0x53, 0x7a, 0x3b,
-0x4f, 0x3b, 0x4e, 0x3b, 0x44, 0x3b, 0x6a, 0x61, 0x6e, 0x2e, 0x3b, 0x66, 0x65, 0x62, 0x2e, 0x3b, 0x6d, 0x61, 0x72, 0x2e,
-0x3b, 0x61, 0x70, 0x72, 0x2e, 0x3b, 0x6d, 0x61, 0xed, 0x3b, 0x6a, 0xfa, 0x6e, 0x2e, 0x3b, 0x6a, 0xfa, 0x6c, 0x2e, 0x3b,
-0xe1, 0x67, 0xfa, 0x2e, 0x3b, 0x73, 0x65, 0x70, 0x2e, 0x3b, 0x6f, 0x6b, 0x74, 0x2e, 0x3b, 0x6e, 0xf3, 0x76, 0x2e, 0x3b,
-0x64, 0x65, 0x73, 0x2e, 0x3b, 0x6a, 0x61, 0x6e, 0xfa, 0x61, 0x72, 0x3b, 0x66, 0x65, 0x62, 0x72, 0xfa, 0x61, 0x72, 0x3b,
-0x6d, 0x61, 0x72, 0x73, 0x3b, 0x61, 0x70, 0x72, 0xed, 0x6c, 0x3b, 0x6d, 0x61, 0xed, 0x3b, 0x6a, 0xfa, 0x6e, 0xed, 0x3b,
-0x6a, 0xfa, 0x6c, 0xed, 0x3b, 0xe1, 0x67, 0xfa, 0x73, 0x74, 0x3b, 0x73, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x65, 0x72,
-0x3b, 0x6f, 0x6b, 0x74, 0xf3, 0x62, 0x65, 0x72, 0x3b, 0x6e, 0xf3, 0x76, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x64, 0x65,
-0x73, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x4a, 0x3b, 0x46, 0x3b, 0x4d, 0x3b, 0x41, 0x3b, 0x4d, 0x3b, 0x4a, 0x3b, 0x4a,
-0x3b, 0xc1, 0x3b, 0x53, 0x3b, 0x4f, 0x3b, 0x4e, 0x3b, 0x44, 0x3b, 0x4a, 0x61, 0x6e, 0x3b, 0x46, 0x65, 0x62, 0x3b, 0x4d,
-0x61, 0x72, 0x3b, 0x41, 0x70, 0x72, 0x3b, 0x4d, 0x65, 0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x3b, 0x4a, 0x75, 0x6c, 0x3b, 0x41,
-0x67, 0x75, 0x3b, 0x53, 0x65, 0x70, 0x3b, 0x4f, 0x6b, 0x74, 0x3b, 0x4e, 0x6f, 0x76, 0x3b, 0x44, 0x65, 0x73, 0x3b, 0x4a,
-0x61, 0x6e, 0x75, 0x61, 0x72, 0x69, 0x3b, 0x46, 0x65, 0x62, 0x72, 0x75, 0x61, 0x72, 0x69, 0x3b, 0x4d, 0x61, 0x72, 0x65,
-0x74, 0x3b, 0x41, 0x70, 0x72, 0x69, 0x6c, 0x3b, 0x4d, 0x65, 0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x69, 0x3b, 0x4a, 0x75, 0x6c,
-0x69, 0x3b, 0x41, 0x67, 0x75, 0x73, 0x74, 0x75, 0x73, 0x3b, 0x53, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b,
-0x4f, 0x6b, 0x74, 0x6f, 0x62, 0x65, 0x72, 0x3b, 0x4e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x44, 0x65, 0x73,
-0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x6a, 0x61, 0x6e, 0x3b, 0x66, 0x65, 0x62, 0x3b, 0x6d, 0x61, 0x72, 0x3b, 0x61, 0x70,
+0x6a, 0x61, 0x6e, 0x2e, 0x3b, 0x66, 0x65, 0x62, 0x2e, 0x3b, 0x6d, 0x72, 0x74, 0x2e, 0x3b, 0x61, 0x70, 0x72, 0x2e, 0x3b,
+0x6d, 0x65, 0x69, 0x3b, 0x6a, 0x75, 0x6e, 0x2e, 0x3b, 0x6a, 0x75, 0x6c, 0x2e, 0x3b, 0x61, 0x75, 0x67, 0x2e, 0x3b, 0x73,
+0x65, 0x70, 0x2e, 0x3b, 0x6f, 0x6b, 0x74, 0x2e, 0x3b, 0x6e, 0x6f, 0x76, 0x2e, 0x3b, 0x64, 0x65, 0x63, 0x2e, 0x4a, 0x61,
+0x6e, 0x2e, 0x3b, 0x46, 0x65, 0x62, 0x2e, 0x3b, 0x4d, 0x61, 0x72, 0x2e, 0x3b, 0x41, 0x70, 0x72, 0x2e, 0x3b, 0x4d, 0x61,
+0x79, 0x3b, 0x4a, 0x75, 0x6e, 0x2e, 0x3b, 0x4a, 0x75, 0x6c, 0x2e, 0x3b, 0x41, 0x75, 0x67, 0x2e, 0x3b, 0x53, 0x65, 0x70,
+0x2e, 0x3b, 0x4f, 0x63, 0x74, 0x2e, 0x3b, 0x4e, 0x6f, 0x76, 0x2e, 0x3b, 0x44, 0x65, 0x63, 0x2e, 0x6a, 0x61, 0x6e, 0x75,
+0x61, 0x72, 0x6f, 0x3b, 0x66, 0x65, 0x62, 0x72, 0x75, 0x61, 0x72, 0x6f, 0x3b, 0x6d, 0x61, 0x72, 0x74, 0x6f, 0x3b, 0x61,
+0x70, 0x72, 0x69, 0x6c, 0x6f, 0x3b, 0x6d, 0x61, 0x6a, 0x6f, 0x3b, 0x6a, 0x75, 0x6e, 0x69, 0x6f, 0x3b, 0x6a, 0x75, 0x6c,
+0x69, 0x6f, 0x3b, 0x61, 0x16d, 0x67, 0x75, 0x73, 0x74, 0x6f, 0x3b, 0x73, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x72, 0x6f,
+0x3b, 0x6f, 0x6b, 0x74, 0x6f, 0x62, 0x72, 0x6f, 0x3b, 0x6e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x72, 0x6f, 0x3b, 0x64, 0x65,
+0x63, 0x65, 0x6d, 0x62, 0x72, 0x6f, 0x6a, 0x61, 0x6e, 0x3b, 0x66, 0x65, 0x62, 0x3b, 0x6d, 0x61, 0x72, 0x3b, 0x61, 0x70,
+0x72, 0x3b, 0x6d, 0x61, 0x6a, 0x3b, 0x6a, 0x75, 0x6e, 0x3b, 0x6a, 0x75, 0x6c, 0x3b, 0x61, 0x16d, 0x67, 0x3b, 0x73, 0x65,
+0x70, 0x3b, 0x6f, 0x6b, 0x74, 0x3b, 0x6e, 0x6f, 0x76, 0x3b, 0x64, 0x65, 0x63, 0x6a, 0x61, 0x61, 0x6e, 0x75, 0x61, 0x72,
+0x3b, 0x76, 0x65, 0x65, 0x62, 0x72, 0x75, 0x61, 0x72, 0x3b, 0x6d, 0xe4, 0x72, 0x74, 0x73, 0x3b, 0x61, 0x70, 0x72, 0x69,
+0x6c, 0x6c, 0x3b, 0x6d, 0x61, 0x69, 0x3b, 0x6a, 0x75, 0x75, 0x6e, 0x69, 0x3b, 0x6a, 0x75, 0x75, 0x6c, 0x69, 0x3b, 0x61,
+0x75, 0x67, 0x75, 0x73, 0x74, 0x3b, 0x73, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x6f, 0x6b, 0x74, 0x6f,
+0x6f, 0x62, 0x65, 0x72, 0x3b, 0x6e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x64, 0x65, 0x74, 0x73, 0x65, 0x6d,
+0x62, 0x65, 0x72, 0x6a, 0x61, 0x61, 0x6e, 0x3b, 0x76, 0x65, 0x65, 0x62, 0x72, 0x3b, 0x6d, 0xe4, 0x72, 0x74, 0x73, 0x3b,
+0x61, 0x70, 0x72, 0x3b, 0x6d, 0x61, 0x69, 0x3b, 0x6a, 0x75, 0x75, 0x6e, 0x69, 0x3b, 0x6a, 0x75, 0x75, 0x6c, 0x69, 0x3b,
+0x61, 0x75, 0x67, 0x3b, 0x73, 0x65, 0x70, 0x74, 0x3b, 0x6f, 0x6b, 0x74, 0x3b, 0x6e, 0x6f, 0x76, 0x3b, 0x64, 0x65, 0x74,
+0x73, 0x4a, 0x3b, 0x56, 0x3b, 0x4d, 0x3b, 0x41, 0x3b, 0x4d, 0x3b, 0x4a, 0x3b, 0x4a, 0x3b, 0x41, 0x3b, 0x53, 0x3b, 0x4f,
+0x3b, 0x4e, 0x3b, 0x44, 0x6a, 0x61, 0x6e, 0x75, 0x61, 0x72, 0x3b, 0x66, 0x65, 0x62, 0x72, 0x75, 0x61, 0x72, 0x3b, 0x6d,
+0x61, 0x72, 0x73, 0x3b, 0x61, 0x70, 0x72, 0xed, 0x6c, 0x3b, 0x6d, 0x61, 0x69, 0x3b, 0x6a, 0x75, 0x6e, 0x69, 0x3b, 0x6a,
+0x75, 0x6c, 0x69, 0x3b, 0x61, 0x75, 0x67, 0x75, 0x73, 0x74, 0x3b, 0x73, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x65, 0x72,
+0x3b, 0x6f, 0x6b, 0x74, 0x6f, 0x62, 0x65, 0x72, 0x3b, 0x6e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x64, 0x65,
+0x73, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x6a, 0x61, 0x6e, 0x3b, 0x66, 0x65, 0x62, 0x3b, 0x6d, 0x61, 0x72, 0x3b, 0x61, 0x70,
 0x72, 0x3b, 0x6d, 0x61, 0x69, 0x3b, 0x6a, 0x75, 0x6e, 0x3b, 0x6a, 0x75, 0x6c, 0x3b, 0x61, 0x75, 0x67, 0x3b, 0x73, 0x65,
-0x70, 0x3b, 0x6f, 0x63, 0x74, 0x3b, 0x6e, 0x6f, 0x76, 0x3b, 0x64, 0x65, 0x63, 0x3b, 0x6a, 0x61, 0x6e, 0x75, 0x61, 0x72,
-0x69, 0x6f, 0x3b, 0x66, 0x65, 0x62, 0x72, 0x75, 0x61, 0x72, 0x69, 0x6f, 0x3b, 0x6d, 0x61, 0x72, 0x74, 0x69, 0x6f, 0x3b,
-0x61, 0x70, 0x72, 0x69, 0x6c, 0x3b, 0x6d, 0x61, 0x69, 0x6f, 0x3b, 0x6a, 0x75, 0x6e, 0x69, 0x6f, 0x3b, 0x6a, 0x75, 0x6c,
-0x69, 0x6f, 0x3b, 0x61, 0x75, 0x67, 0x75, 0x73, 0x74, 0x6f, 0x3b, 0x73, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x72, 0x65,
-0x3b, 0x6f, 0x63, 0x74, 0x6f, 0x62, 0x72, 0x65, 0x3b, 0x6e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x72, 0x65, 0x3b, 0x64, 0x65,
-0x63, 0x65, 0x6d, 0x62, 0x72, 0x65, 0x3b, 0x6a, 0x3b, 0x66, 0x3b, 0x6d, 0x3b, 0x61, 0x3b, 0x6d, 0x3b, 0x6a, 0x3b, 0x6a,
-0x3b, 0x61, 0x3b, 0x73, 0x3b, 0x6f, 0x3b, 0x6e, 0x3b, 0x64, 0x3b, 0x45, 0x61, 0x6e, 0x3b, 0x46, 0x65, 0x61, 0x62, 0x68,
-0x3b, 0x4d, 0xe1, 0x72, 0x74, 0x61, 0x3b, 0x41, 0x69, 0x62, 0x3b, 0x42, 0x65, 0x61, 0x6c, 0x3b, 0x4d, 0x65, 0x69, 0x74,
-0x68, 0x3b, 0x49, 0xfa, 0x69, 0x6c, 0x3b, 0x4c, 0xfa, 0x6e, 0x3b, 0x4d, 0x46, 0xf3, 0x6d, 0x68, 0x3b, 0x44, 0x46, 0xf3,
-0x6d, 0x68, 0x3b, 0x53, 0x61, 0x6d, 0x68, 0x3b, 0x4e, 0x6f, 0x6c, 0x6c, 0x3b, 0x45, 0x61, 0x6e, 0xe1, 0x69, 0x72, 0x3b,
-0x46, 0x65, 0x61, 0x62, 0x68, 0x72, 0x61, 0x3b, 0x4d, 0xe1, 0x72, 0x74, 0x61, 0x3b, 0x41, 0x69, 0x62, 0x72, 0x65, 0xe1,
-0x6e, 0x3b, 0x42, 0x65, 0x61, 0x6c, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x3b, 0x4d, 0x65, 0x69, 0x74, 0x68, 0x65, 0x61, 0x6d,
-0x68, 0x3b, 0x49, 0xfa, 0x69, 0x6c, 0x3b, 0x4c, 0xfa, 0x6e, 0x61, 0x73, 0x61, 0x3b, 0x4d, 0x65, 0xe1, 0x6e, 0x20, 0x46,
-0xf3, 0x6d, 0x68, 0x61, 0x69, 0x72, 0x3b, 0x44, 0x65, 0x69, 0x72, 0x65, 0x61, 0x64, 0x68, 0x20, 0x46, 0xf3, 0x6d, 0x68,
-0x61, 0x69, 0x72, 0x3b, 0x53, 0x61, 0x6d, 0x68, 0x61, 0x69, 0x6e, 0x3b, 0x4e, 0x6f, 0x6c, 0x6c, 0x61, 0x69, 0x67, 0x3b,
-0x45, 0x3b, 0x46, 0x3b, 0x4d, 0x3b, 0x41, 0x3b, 0x42, 0x3b, 0x4d, 0x3b, 0x49, 0x3b, 0x4c, 0x3b, 0x4d, 0x3b, 0x44, 0x3b,
-0x53, 0x3b, 0x4e, 0x3b, 0x67, 0x65, 0x6e, 0x3b, 0x66, 0x65, 0x62, 0x3b, 0x6d, 0x61, 0x72, 0x3b, 0x61, 0x70, 0x72, 0x3b,
-0x6d, 0x61, 0x67, 0x3b, 0x67, 0x69, 0x75, 0x3b, 0x6c, 0x75, 0x67, 0x3b, 0x61, 0x67, 0x6f, 0x3b, 0x73, 0x65, 0x74, 0x3b,
-0x6f, 0x74, 0x74, 0x3b, 0x6e, 0x6f, 0x76, 0x3b, 0x64, 0x69, 0x63, 0x3b, 0x67, 0x65, 0x6e, 0x6e, 0x61, 0x69, 0x6f, 0x3b,
-0x66, 0x65, 0x62, 0x62, 0x72, 0x61, 0x69, 0x6f, 0x3b, 0x6d, 0x61, 0x72, 0x7a, 0x6f, 0x3b, 0x61, 0x70, 0x72, 0x69, 0x6c,
-0x65, 0x3b, 0x6d, 0x61, 0x67, 0x67, 0x69, 0x6f, 0x3b, 0x67, 0x69, 0x75, 0x67, 0x6e, 0x6f, 0x3b, 0x6c, 0x75, 0x67, 0x6c,
-0x69, 0x6f, 0x3b, 0x61, 0x67, 0x6f, 0x73, 0x74, 0x6f, 0x3b, 0x73, 0x65, 0x74, 0x74, 0x65, 0x6d, 0x62, 0x72, 0x65, 0x3b,
-0x6f, 0x74, 0x74, 0x6f, 0x62, 0x72, 0x65, 0x3b, 0x6e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x72, 0x65, 0x3b, 0x64, 0x69, 0x63,
-0x65, 0x6d, 0x62, 0x72, 0x65, 0x3b, 0x47, 0x3b, 0x46, 0x3b, 0x4d, 0x3b, 0x41, 0x3b, 0x4d, 0x3b, 0x47, 0x3b, 0x4c, 0x3b,
-0x41, 0x3b, 0x53, 0x3b, 0x4f, 0x3b, 0x4e, 0x3b, 0x44, 0x3b, 0x4a, 0x61, 0x6e, 0x3b, 0x46, 0x65, 0x62, 0x3b, 0x4d, 0x61,
-0x72, 0x3b, 0x41, 0x70, 0x72, 0x3b, 0x4d, 0x65, 0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x3b, 0x4a, 0x75, 0x6c, 0x3b, 0x41, 0x67,
-0x74, 0x3b, 0x53, 0x65, 0x70, 0x3b, 0x4f, 0x6b, 0x74, 0x3b, 0x4e, 0x6f, 0x76, 0x3b, 0x44, 0x65, 0x73, 0x3b, 0xc9c, 0xca8,
-0x3b, 0xcab, 0xcc6, 0xcac, 0xccd, 0xcb0, 0x3b, 0xcae, 0xcbe, 0xcb0, 0xccd, 0xc9a, 0xccd, 0x3b, 0xc8f, 0xcaa, 0xccd, 0xcb0, 0xcbf, 0x3b,
-0xcae, 0xcc7, 0x3b, 0xc9c, 0xcc2, 0xca8, 0xccd, 0x3b, 0xc9c, 0xcc1, 0xcb2, 0xcc8, 0x3b, 0xc86, 0xc97, 0x3b, 0xcb8, 0xcc6, 0xcaa, 0xccd,
-0xc9f, 0xcc6, 0xc82, 0x3b, 0xc85, 0xc95, 0xccd, 0xc9f, 0xccb, 0x3b, 0xca8, 0xcb5, 0xcc6, 0xc82, 0x3b, 0xca1, 0xcbf, 0xcb8, 0xcc6, 0xc82,
-0x3b, 0xc9c, 0xca8, 0xcb5, 0xcb0, 0xcbf, 0x3b, 0xcab, 0xcc6, 0xcac, 0xccd, 0xcb0, 0xcb5, 0xcb0, 0xcbf, 0x3b, 0xcae, 0xcbe, 0xcb0, 0xccd,
-0xc9a, 0xccd, 0x3b, 0xc8f, 0xcaa, 0xccd, 0xcb0, 0xcbf, 0xcb2, 0xccd, 0x3b, 0xcae, 0xcc7, 0x3b, 0xc9c, 0xcc2, 0xca8, 0xccd, 0x3b, 0xc9c,
-0xcc1, 0xcb2, 0xcc8, 0x3b, 0xc86, 0xc97, 0xcb8, 0xccd, 0xc9f, 0xccd, 0x3b, 0xcb8, 0xcc6, 0xcaa, 0xccd, 0xc9f, 0xcc6, 0xc82, 0xcac, 0xcb0,
-0xccd, 0x3b, 0xc85, 0xc95, 0xccd, 0xc9f, 0xccb, 0xcac, 0xcb0, 0xccd, 0x3b, 0xca8, 0xcb5, 0xcc6, 0xc82, 0xcac, 0xcb0, 0xccd, 0x3b, 0xca1,
-0xcbf, 0xcb8, 0xcc6, 0xc82, 0xcac, 0xcb0, 0xccd, 0x3b, 0xc9c, 0x3b, 0xcab, 0xcc6, 0x3b, 0xcae, 0xcbe, 0x3b, 0xc8f, 0x3b, 0xcae, 0xcc7,
-0x3b, 0xc9c, 0xcc2, 0x3b, 0xc9c, 0xcc1, 0x3b, 0xc86, 0x3b, 0xcb8, 0xcc6, 0x3b, 0xc85, 0x3b, 0xca8, 0x3b, 0xca1, 0xcbf, 0x3b, 0xc9c,
-0xca8, 0xcb5, 0xcb0, 0xcbf, 0x3b, 0xcab, 0xcc6, 0xcac, 0xccd, 0xcb0, 0xcb5, 0xcb0, 0xcbf, 0x3b, 0xcae, 0xcbe, 0xcb0, 0xccd, 0xc9a, 0xccd,
-0x3b, 0xc8f, 0xcaa, 0xccd, 0xcb0, 0xcbf, 0x3b, 0xcae, 0xcc7, 0x3b, 0xc9c, 0xcc2, 0xca8, 0xccd, 0x3b, 0xc9c, 0xcc1, 0xcb2, 0xcc8, 0x3b,
-0xc86, 0xc97, 0x3b, 0xcb8, 0xcc6, 0xcaa, 0xccd, 0xc9f, 0xcc6, 0xc82, 0x3b, 0xc85, 0xc95, 0xccd, 0xc9f, 0xccb, 0x3b, 0xca8, 0xcb5, 0xcc6,
-0xc82, 0x3b, 0xca1, 0xcbf, 0xcb8, 0xcc6, 0xc82, 0x3b, 0x62c, 0x646, 0x624, 0x631, 0x6cc, 0x3b, 0x641, 0x631, 0x624, 0x631, 0x6cc, 0x3b,
-0x645, 0x627, 0x631, 0x655, 0x686, 0x3b, 0x627, 0x67e, 0x631, 0x6cc, 0x644, 0x3b, 0x645, 0x6cc, 0x654, 0x3b, 0x62c, 0x648, 0x657, 0x646,
-0x3b, 0x62c, 0x648, 0x657, 0x644, 0x627, 0x6cc, 0x6cc, 0x3b, 0x627, 0x6af, 0x633, 0x62a, 0x3b, 0x633, 0x62a, 0x645, 0x628, 0x631, 0x3b,
-0x627, 0x6a9, 0x62a, 0x648, 0x657, 0x628, 0x631, 0x3b, 0x646, 0x648, 0x645, 0x628, 0x631, 0x3b, 0x62f, 0x633, 0x645, 0x628, 0x631, 0x3b,
-0x62c, 0x3b, 0x641, 0x3b, 0x645, 0x3b, 0x627, 0x3b, 0x645, 0x3b, 0x62c, 0x3b, 0x62c, 0x3b, 0x627, 0x3b, 0x633, 0x3b, 0x633, 0x3b,
-0x627, 0x3b, 0x646, 0x3b, 0x49b, 0x430, 0x4a3, 0x2e, 0x3b, 0x430, 0x49b, 0x43f, 0x2e, 0x3b, 0x43d, 0x430, 0x443, 0x2e, 0x3b, 0x441,
-0x4d9, 0x443, 0x2e, 0x3b, 0x43c, 0x430, 0x43c, 0x2e, 0x3b, 0x43c, 0x430, 0x443, 0x2e, 0x3b, 0x448, 0x456, 0x43b, 0x2e, 0x3b, 0x442,
-0x430, 0x43c, 0x2e, 0x3b, 0x49b, 0x44b, 0x440, 0x2e, 0x3b, 0x49b, 0x430, 0x437, 0x2e, 0x3b, 0x49b, 0x430, 0x440, 0x2e, 0x3b, 0x436,
-0x435, 0x43b, 0x2e, 0x3b, 0x49a, 0x430, 0x4a3, 0x442, 0x430, 0x440, 0x3b, 0x410, 0x49b, 0x43f, 0x430, 0x43d, 0x3b, 0x41d, 0x430, 0x443,
-0x440, 0x44b, 0x437, 0x3b, 0x421, 0x4d9, 0x443, 0x456, 0x440, 0x3b, 0x41c, 0x430, 0x43c, 0x44b, 0x440, 0x3b, 0x41c, 0x430, 0x443, 0x441,
-0x44b, 0x43c, 0x3b, 0x428, 0x456, 0x43b, 0x434, 0x435, 0x3b, 0x422, 0x430, 0x43c, 0x44b, 0x437, 0x3b, 0x49a, 0x44b, 0x440, 0x43a, 0x4af,
-0x439, 0x435, 0x43a, 0x3b, 0x49a, 0x430, 0x437, 0x430, 0x43d, 0x3b, 0x49a, 0x430, 0x440, 0x430, 0x448, 0x430, 0x3b, 0x416, 0x435, 0x43b,
-0x442, 0x43e, 0x49b, 0x441, 0x430, 0x43d, 0x3b, 0x49a, 0x3b, 0x410, 0x3b, 0x41d, 0x3b, 0x421, 0x3b, 0x41c, 0x3b, 0x41c, 0x3b, 0x428,
-0x3b, 0x422, 0x3b, 0x49a, 0x3b, 0x49a, 0x3b, 0x49a, 0x3b, 0x416, 0x3b, 0x49b, 0x430, 0x4a3, 0x442, 0x430, 0x440, 0x3b, 0x430, 0x49b,
-0x43f, 0x430, 0x43d, 0x3b, 0x43d, 0x430, 0x443, 0x440, 0x44b, 0x437, 0x3b, 0x441, 0x4d9, 0x443, 0x456, 0x440, 0x3b, 0x43c, 0x430, 0x43c,
-0x44b, 0x440, 0x3b, 0x43c, 0x430, 0x443, 0x441, 0x44b, 0x43c, 0x3b, 0x448, 0x456, 0x43b, 0x434, 0x435, 0x3b, 0x442, 0x430, 0x43c, 0x44b,
-0x437, 0x3b, 0x49b, 0x44b, 0x440, 0x43a, 0x4af, 0x439, 0x435, 0x43a, 0x3b, 0x49b, 0x430, 0x437, 0x430, 0x43d, 0x3b, 0x49b, 0x430, 0x440,
-0x430, 0x448, 0x430, 0x3b, 0x436, 0x435, 0x43b, 0x442, 0x43e, 0x49b, 0x441, 0x430, 0x43d, 0x3b, 0x6d, 0x75, 0x74, 0x2e, 0x3b, 0x67,
-0x61, 0x73, 0x2e, 0x3b, 0x77, 0x65, 0x72, 0x2e, 0x3b, 0x6d, 0x61, 0x74, 0x2e, 0x3b, 0x67, 0x69, 0x63, 0x2e, 0x3b, 0x6b,
-0x61, 0x6d, 0x2e, 0x3b, 0x6e, 0x79, 0x61, 0x2e, 0x3b, 0x6b, 0x61, 0x6e, 0x2e, 0x3b, 0x6e, 0x7a, 0x65, 0x2e, 0x3b, 0x75,
-0x6b, 0x77, 0x2e, 0x3b, 0x75, 0x67, 0x75, 0x2e, 0x3b, 0x75, 0x6b, 0x75, 0x2e, 0x3b, 0x4d, 0x75, 0x74, 0x61, 0x72, 0x61,
-0x6d, 0x61, 0x3b, 0x47, 0x61, 0x73, 0x68, 0x79, 0x61, 0x6e, 0x74, 0x61, 0x72, 0x65, 0x3b, 0x57, 0x65, 0x72, 0x75, 0x72,
-0x77, 0x65, 0x3b, 0x4d, 0x61, 0x74, 0x61, 0x3b, 0x47, 0x69, 0x63, 0x75, 0x72, 0x61, 0x6e, 0x73, 0x69, 0x3b, 0x4b, 0x61,
-0x6d, 0x65, 0x6e, 0x61, 0x3b, 0x4e, 0x79, 0x61, 0x6b, 0x61, 0x6e, 0x67, 0x61, 0x3b, 0x4b, 0x61, 0x6e, 0x61, 0x6d, 0x61,
-0x3b, 0x4e, 0x7a, 0x65, 0x6c, 0x69, 0x3b, 0x55, 0x6b, 0x77, 0x61, 0x6b, 0x69, 0x72, 0x61, 0x3b, 0x55, 0x67, 0x75, 0x73,
-0x68, 0x79, 0x69, 0x6e, 0x67, 0x6f, 0x3b, 0x55, 0x6b, 0x75, 0x62, 0x6f, 0x7a, 0x61, 0x3b, 0x42f, 0x43d, 0x432, 0x3b, 0x424,
-0x435, 0x432, 0x3b, 0x41c, 0x430, 0x440, 0x3b, 0x410, 0x43f, 0x440, 0x3b, 0x41c, 0x430, 0x439, 0x3b, 0x418, 0x44e, 0x43d, 0x3b, 0x418,
-0x44e, 0x43b, 0x3b, 0x410, 0x432, 0x433, 0x3b, 0x421, 0x435, 0x43d, 0x3b, 0x41e, 0x43a, 0x442, 0x3b, 0x41d, 0x43e, 0x44f, 0x3b, 0x414,
-0x435, 0x43a, 0x3b, 0x42f, 0x43d, 0x432, 0x430, 0x440, 0x44c, 0x3b, 0x424, 0x435, 0x432, 0x440, 0x430, 0x43b, 0x44c, 0x3b, 0x41c, 0x430,
-0x440, 0x442, 0x3b, 0x410, 0x43f, 0x440, 0x435, 0x43b, 0x44c, 0x3b, 0x41c, 0x430, 0x439, 0x3b, 0x418, 0x44e, 0x43d, 0x44c, 0x3b, 0x418,
-0x44e, 0x43b, 0x44c, 0x3b, 0x410, 0x432, 0x433, 0x443, 0x441, 0x442, 0x3b, 0x421, 0x435, 0x43d, 0x442, 0x44f, 0x431, 0x440, 0x44c, 0x3b,
-0x41e, 0x43a, 0x442, 0x44f, 0x431, 0x440, 0x44c, 0x3b, 0x41d, 0x43e, 0x44f, 0x431, 0x440, 0x44c, 0x3b, 0x414, 0x435, 0x43a, 0x430, 0x431,
-0x440, 0x44c, 0x3b, 0x42f, 0x3b, 0x424, 0x3b, 0x41c, 0x3b, 0x410, 0x3b, 0x41c, 0x3b, 0x418, 0x3b, 0x418, 0x3b, 0x410, 0x3b, 0x421,
-0x3b, 0x41e, 0x3b, 0x41d, 0x3b, 0x414, 0x3b, 0x44f, 0x43d, 0x432, 0x2e, 0x3b, 0x444, 0x435, 0x432, 0x2e, 0x3b, 0x43c, 0x430, 0x440,
-0x2e, 0x3b, 0x430, 0x43f, 0x440, 0x2e, 0x3b, 0x43c, 0x430, 0x439, 0x3b, 0x438, 0x44e, 0x43d, 0x2e, 0x3b, 0x438, 0x44e, 0x43b, 0x2e,
-0x3b, 0x430, 0x432, 0x433, 0x2e, 0x3b, 0x441, 0x435, 0x43d, 0x2e, 0x3b, 0x43e, 0x43a, 0x442, 0x2e, 0x3b, 0x43d, 0x43e, 0x44f, 0x2e,
-0x3b, 0x434, 0x435, 0x43a, 0x2e, 0x3b, 0x44f, 0x43d, 0x432, 0x430, 0x440, 0x44c, 0x3b, 0x444, 0x435, 0x432, 0x440, 0x430, 0x43b, 0x44c,
-0x3b, 0x43c, 0x430, 0x440, 0x442, 0x3b, 0x430, 0x43f, 0x440, 0x435, 0x43b, 0x44c, 0x3b, 0x43c, 0x430, 0x439, 0x3b, 0x438, 0x44e, 0x43d,
-0x44c, 0x3b, 0x438, 0x44e, 0x43b, 0x44c, 0x3b, 0x430, 0x432, 0x433, 0x443, 0x441, 0x442, 0x3b, 0x441, 0x435, 0x43d, 0x442, 0x44f, 0x431,
-0x440, 0x44c, 0x3b, 0x43e, 0x43a, 0x442, 0x44f, 0x431, 0x440, 0x44c, 0x3b, 0x43d, 0x43e, 0x44f, 0x431, 0x440, 0x44c, 0x3b, 0x434, 0x435,
-0x43a, 0x430, 0x431, 0x440, 0x44c, 0x3b, 0x31, 0xc6d4, 0x3b, 0x32, 0xc6d4, 0x3b, 0x33, 0xc6d4, 0x3b, 0x34, 0xc6d4, 0x3b, 0x35, 0xc6d4,
-0x3b, 0x36, 0xc6d4, 0x3b, 0x37, 0xc6d4, 0x3b, 0x38, 0xc6d4, 0x3b, 0x39, 0xc6d4, 0x3b, 0x31, 0x30, 0xc6d4, 0x3b, 0x31, 0x31, 0xc6d4,
-0x3b, 0x31, 0x32, 0xc6d4, 0x3b, 0x72, 0xea, 0x62, 0x3b, 0x72, 0x65, 0x15f, 0x3b, 0x61, 0x64, 0x61, 0x3b, 0x61, 0x76, 0x72,
-0x3b, 0x67, 0x75, 0x6c, 0x3b, 0x70, 0xfb, 0x15f, 0x3b, 0x74, 0xee, 0x72, 0x3b, 0x67, 0x65, 0x6c, 0x3b, 0x72, 0x65, 0x7a,
-0x3b, 0x6b, 0x65, 0x77, 0x3b, 0x73, 0x65, 0x72, 0x3b, 0x62, 0x65, 0x72, 0x3b, 0x72, 0xea, 0x62, 0x65, 0x6e, 0x64, 0x61,
-0x6e, 0x3b, 0x72, 0x65, 0x15f, 0x65, 0x6d, 0xee, 0x3b, 0x61, 0x64, 0x61, 0x72, 0x3b, 0x61, 0x76, 0x72, 0xea, 0x6c, 0x3b,
-0x67, 0x75, 0x6c, 0x61, 0x6e, 0x3b, 0x70, 0xfb, 0x15f, 0x70, 0x65, 0x72, 0x3b, 0x74, 0xee, 0x72, 0x6d, 0x65, 0x68, 0x3b,
-0x67, 0x65, 0x6c, 0x61, 0x77, 0xea, 0x6a, 0x3b, 0x72, 0x65, 0x7a, 0x62, 0x65, 0x72, 0x3b, 0x6b, 0x65, 0x77, 0xe7, 0xea,
-0x72, 0x3b, 0x73, 0x65, 0x72, 0x6d, 0x61, 0x77, 0x65, 0x7a, 0x3b, 0x62, 0x65, 0x72, 0x66, 0x61, 0x6e, 0x62, 0x61, 0x72,
-0x3b, 0x52, 0x3b, 0x52, 0x3b, 0x41, 0x3b, 0x41, 0x3b, 0x47, 0x3b, 0x50, 0x3b, 0x54, 0x3b, 0x47, 0x3b, 0x52, 0x3b, 0x4b,
-0x3b, 0x53, 0x3b, 0x42, 0x3b, 0x72, 0xea, 0x62, 0x65, 0x6e, 0x64, 0x61, 0x6e, 0xea, 0x3b, 0x72, 0x65, 0x15f, 0x65, 0x6d,
-0x69, 0x79, 0xea, 0x3b, 0x61, 0x64, 0x61, 0x72, 0xea, 0x3b, 0x61, 0x76, 0x72, 0xea, 0x6c, 0xea, 0x3b, 0x67, 0x75, 0x6c,
-0x61, 0x6e, 0xea, 0x3b, 0x70, 0xfb, 0x15f, 0x70, 0x65, 0x72, 0xea, 0x3b, 0x74, 0xee, 0x72, 0x6d, 0x65, 0x68, 0xea, 0x3b,
-0x67, 0x65, 0x6c, 0x61, 0x77, 0xea, 0x6a, 0xea, 0x3b, 0x72, 0x65, 0x7a, 0x62, 0x65, 0x72, 0xea, 0x3b, 0x6b, 0x65, 0x77,
-0xe7, 0xea, 0x72, 0xea, 0x3b, 0x73, 0x65, 0x72, 0x6d, 0x61, 0x77, 0x65, 0x7a, 0xea, 0x3b, 0x62, 0x65, 0x72, 0x66, 0x61,
-0x6e, 0x62, 0x61, 0x72, 0xea, 0x3b, 0x4d, 0x75, 0x74, 0x2e, 0x3b, 0x47, 0x61, 0x73, 0x2e, 0x3b, 0x57, 0x65, 0x72, 0x2e,
-0x3b, 0x4d, 0x61, 0x74, 0x2e, 0x3b, 0x47, 0x69, 0x63, 0x2e, 0x3b, 0x4b, 0x61, 0x6d, 0x2e, 0x3b, 0x4e, 0x79, 0x61, 0x2e,
-0x3b, 0x4b, 0x61, 0x6e, 0x2e, 0x3b, 0x4e, 0x7a, 0x65, 0x2e, 0x3b, 0x55, 0x6b, 0x77, 0x2e, 0x3b, 0x55, 0x67, 0x75, 0x2e,
-0x3b, 0x55, 0x6b, 0x75, 0x2e, 0x3b, 0x4e, 0x7a, 0x65, 0x72, 0x6f, 0x3b, 0x52, 0x75, 0x68, 0x75, 0x68, 0x75, 0x6d, 0x61,
-0x3b, 0x4e, 0x74, 0x77, 0x61, 0x72, 0x61, 0x6e, 0x74, 0x65, 0x3b, 0x4e, 0x64, 0x61, 0x6d, 0x75, 0x6b, 0x69, 0x7a, 0x61,
-0x3b, 0x52, 0x75, 0x73, 0x61, 0x6d, 0x61, 0x3b, 0x52, 0x75, 0x68, 0x65, 0x73, 0x68, 0x69, 0x3b, 0x4d, 0x75, 0x6b, 0x61,
-0x6b, 0x61, 0x72, 0x6f, 0x3b, 0x4e, 0x79, 0x61, 0x6e, 0x64, 0x61, 0x67, 0x61, 0x72, 0x6f, 0x3b, 0x4e, 0x79, 0x61, 0x6b,
-0x61, 0x6e, 0x67, 0x61, 0x3b, 0x47, 0x69, 0x74, 0x75, 0x67, 0x75, 0x74, 0x75, 0x3b, 0x4d, 0x75, 0x6e, 0x79, 0x6f, 0x6e,
-0x79, 0x6f, 0x3b, 0x4b, 0x69, 0x67, 0x61, 0x72, 0x61, 0x6d, 0x61, 0x3b, 0xea1, 0x2e, 0xe81, 0x2e, 0x3b, 0xe81, 0x2e, 0xe9e,
-0x2e, 0x3b, 0xea1, 0x2e, 0xe99, 0x2e, 0x3b, 0xea1, 0x2e, 0xeaa, 0x2e, 0x3b, 0xe9e, 0x2e, 0xe9e, 0x2e, 0x3b, 0xea1, 0xeb4, 0x2e,
-0xe96, 0x2e, 0x3b, 0xe81, 0x2e, 0xea5, 0x2e, 0x3b, 0xeaa, 0x2e, 0xeab, 0x2e, 0x3b, 0xe81, 0x2e, 0xe8d, 0x2e, 0x3b, 0xe95, 0x2e,
-0xea5, 0x2e, 0x3b, 0xe9e, 0x2e, 0xe88, 0x2e, 0x3b, 0xe97, 0x2e, 0xea7, 0x2e, 0x3b, 0xea1, 0xeb1, 0xe87, 0xe81, 0xead, 0xe99, 0x3b,
-0xe81, 0xeb8, 0xea1, 0xe9e, 0xeb2, 0x3b, 0xea1, 0xeb5, 0xe99, 0xeb2, 0x3b, 0xec0, 0xea1, 0xeaa, 0xeb2, 0x3b, 0xe9e, 0xeb6, 0xe94, 0xeaa,
-0xeb0, 0xe9e, 0xeb2, 0x3b, 0xea1, 0xeb4, 0xe96, 0xeb8, 0xe99, 0xeb2, 0x3b, 0xe81, 0xecd, 0xea5, 0xeb0, 0xe81, 0xebb, 0xe94, 0x3b, 0xeaa,
-0xeb4, 0xe87, 0xeab, 0xeb2, 0x3b, 0xe81, 0xeb1, 0xe99, 0xe8d, 0xeb2, 0x3b, 0xe95, 0xeb8, 0xea5, 0xeb2, 0x3b, 0xe9e, 0xeb0, 0xe88, 0xeb4,
-0xe81, 0x3b, 0xe97, 0xeb1, 0xe99, 0xea7, 0xeb2, 0x3b, 0x6a, 0x61, 0x6e, 0x76, 0x2e, 0x3b, 0x66, 0x65, 0x62, 0x72, 0x2e, 0x3b,
-0x6d, 0x61, 0x72, 0x74, 0x73, 0x3b, 0x61, 0x70, 0x72, 0x2e, 0x3b, 0x6d, 0x61, 0x69, 0x6a, 0x73, 0x3b, 0x6a, 0x16b, 0x6e,
-0x2e, 0x3b, 0x6a, 0x16b, 0x6c, 0x2e, 0x3b, 0x61, 0x75, 0x67, 0x2e, 0x3b, 0x73, 0x65, 0x70, 0x74, 0x2e, 0x3b, 0x6f, 0x6b,
-0x74, 0x2e, 0x3b, 0x6e, 0x6f, 0x76, 0x2e, 0x3b, 0x64, 0x65, 0x63, 0x2e, 0x3b, 0x6a, 0x61, 0x6e, 0x76, 0x101, 0x72, 0x69,
-0x73, 0x3b, 0x66, 0x65, 0x62, 0x72, 0x75, 0x101, 0x72, 0x69, 0x73, 0x3b, 0x6d, 0x61, 0x72, 0x74, 0x73, 0x3b, 0x61, 0x70,
-0x72, 0x12b, 0x6c, 0x69, 0x73, 0x3b, 0x6d, 0x61, 0x69, 0x6a, 0x73, 0x3b, 0x6a, 0x16b, 0x6e, 0x69, 0x6a, 0x73, 0x3b, 0x6a,
-0x16b, 0x6c, 0x69, 0x6a, 0x73, 0x3b, 0x61, 0x75, 0x67, 0x75, 0x73, 0x74, 0x73, 0x3b, 0x73, 0x65, 0x70, 0x74, 0x65, 0x6d,
-0x62, 0x72, 0x69, 0x73, 0x3b, 0x6f, 0x6b, 0x74, 0x6f, 0x62, 0x72, 0x69, 0x73, 0x3b, 0x6e, 0x6f, 0x76, 0x65, 0x6d, 0x62,
-0x72, 0x69, 0x73, 0x3b, 0x64, 0x65, 0x63, 0x65, 0x6d, 0x62, 0x72, 0x69, 0x73, 0x3b, 0x79, 0x61, 0x6e, 0x3b, 0x66, 0x62,
-0x6c, 0x3b, 0x6d, 0x73, 0x69, 0x3b, 0x61, 0x70, 0x6c, 0x3b, 0x6d, 0x61, 0x69, 0x3b, 0x79, 0x75, 0x6e, 0x3b, 0x79, 0x75,
-0x6c, 0x3b, 0x61, 0x67, 0x74, 0x3b, 0x73, 0x74, 0x62, 0x3b, 0x254, 0x74, 0x62, 0x3b, 0x6e, 0x76, 0x62, 0x3b, 0x64, 0x73,
-0x62, 0x3b, 0x73, 0xe1, 0x6e, 0x7a, 0xe1, 0x20, 0x79, 0x61, 0x20, 0x79, 0x61, 0x6d, 0x62, 0x6f, 0x3b, 0x73, 0xe1, 0x6e,
-0x7a, 0xe1, 0x20, 0x79, 0x61, 0x20, 0x6d, 0xed, 0x62, 0x61, 0x6c, 0xe9, 0x3b, 0x73, 0xe1, 0x6e, 0x7a, 0xe1, 0x20, 0x79,
-0x61, 0x20, 0x6d, 0xed, 0x73, 0xe1, 0x74, 0x6f, 0x3b, 0x73, 0xe1, 0x6e, 0x7a, 0xe1, 0x20, 0x79, 0x61, 0x20, 0x6d, 0xed,
-0x6e, 0x65, 0x69, 0x3b, 0x73, 0xe1, 0x6e, 0x7a, 0xe1, 0x20, 0x79, 0x61, 0x20, 0x6d, 0xed, 0x74, 0xe1, 0x6e, 0x6f, 0x3b,
-0x73, 0xe1, 0x6e, 0x7a, 0xe1, 0x20, 0x79, 0x61, 0x20, 0x6d, 0x6f, 0x74, 0xf3, 0x62, 0xe1, 0x3b, 0x73, 0xe1, 0x6e, 0x7a,
-0xe1, 0x20, 0x79, 0x61, 0x20, 0x6e, 0x73, 0x61, 0x6d, 0x62, 0x6f, 0x3b, 0x73, 0xe1, 0x6e, 0x7a, 0xe1, 0x20, 0x79, 0x61,
-0x20, 0x6d, 0x77, 0x61, 0x6d, 0x62, 0x65, 0x3b, 0x73, 0xe1, 0x6e, 0x7a, 0xe1, 0x20, 0x79, 0x61, 0x20, 0x6c, 0x69, 0x62,
-0x77, 0x61, 0x3b, 0x73, 0xe1, 0x6e, 0x7a, 0xe1, 0x20, 0x79, 0x61, 0x20, 0x7a, 0xf3, 0x6d, 0x69, 0x3b, 0x73, 0xe1, 0x6e,
-0x7a, 0xe1, 0x20, 0x79, 0x61, 0x20, 0x7a, 0xf3, 0x6d, 0x69, 0x20, 0x6e, 0x61, 0x20, 0x6d, 0x254, 0x30c, 0x6b, 0x254, 0x301,
-0x3b, 0x73, 0xe1, 0x6e, 0x7a, 0xe1, 0x20, 0x79, 0x61, 0x20, 0x7a, 0xf3, 0x6d, 0x69, 0x20, 0x6e, 0x61, 0x20, 0x6d, 0xed,
-0x62, 0x61, 0x6c, 0xe9, 0x3b, 0x79, 0x3b, 0x66, 0x3b, 0x6d, 0x3b, 0x61, 0x3b, 0x6d, 0x3b, 0x79, 0x3b, 0x79, 0x3b, 0x61,
-0x3b, 0x73, 0x3b, 0x254, 0x3b, 0x6e, 0x3b, 0x64, 0x3b, 0x73, 0x61, 0x75, 0x73, 0x2e, 0x3b, 0x76, 0x61, 0x73, 0x2e, 0x3b,
-0x6b, 0x6f, 0x76, 0x2e, 0x3b, 0x62, 0x61, 0x6c, 0x2e, 0x3b, 0x67, 0x65, 0x67, 0x2e, 0x3b, 0x62, 0x69, 0x72, 0x17e, 0x2e,
-0x3b, 0x6c, 0x69, 0x65, 0x70, 0x2e, 0x3b, 0x72, 0x75, 0x67, 0x70, 0x2e, 0x3b, 0x72, 0x75, 0x67, 0x73, 0x2e, 0x3b, 0x73,
-0x70, 0x61, 0x6c, 0x2e, 0x3b, 0x6c, 0x61, 0x70, 0x6b, 0x72, 0x2e, 0x3b, 0x67, 0x72, 0x75, 0x6f, 0x64, 0x2e, 0x3b, 0x73,
-0x61, 0x75, 0x73, 0x69, 0x73, 0x3b, 0x76, 0x61, 0x73, 0x61, 0x72, 0x69, 0x73, 0x3b, 0x6b, 0x6f, 0x76, 0x61, 0x73, 0x3b,
-0x62, 0x61, 0x6c, 0x61, 0x6e, 0x64, 0x69, 0x73, 0x3b, 0x67, 0x65, 0x67, 0x75, 0x17e, 0x117, 0x3b, 0x62, 0x69, 0x72, 0x17e,
-0x65, 0x6c, 0x69, 0x73, 0x3b, 0x6c, 0x69, 0x65, 0x70, 0x61, 0x3b, 0x72, 0x75, 0x67, 0x70, 0x6a, 0x16b, 0x74, 0x69, 0x73,
-0x3b, 0x72, 0x75, 0x67, 0x73, 0x117, 0x6a, 0x69, 0x73, 0x3b, 0x73, 0x70, 0x61, 0x6c, 0x69, 0x73, 0x3b, 0x6c, 0x61, 0x70,
-0x6b, 0x72, 0x69, 0x74, 0x69, 0x73, 0x3b, 0x67, 0x72, 0x75, 0x6f, 0x64, 0x69, 0x73, 0x3b, 0x53, 0x3b, 0x56, 0x3b, 0x4b,
-0x3b, 0x42, 0x3b, 0x47, 0x3b, 0x42, 0x3b, 0x4c, 0x3b, 0x52, 0x3b, 0x52, 0x3b, 0x53, 0x3b, 0x4c, 0x3b, 0x47, 0x3b, 0x73,
-0x61, 0x75, 0x73, 0x69, 0x6f, 0x3b, 0x76, 0x61, 0x73, 0x61, 0x72, 0x69, 0x6f, 0x3b, 0x6b, 0x6f, 0x76, 0x6f, 0x3b, 0x62,
-0x61, 0x6c, 0x61, 0x6e, 0x64, 0x17e, 0x69, 0x6f, 0x3b, 0x67, 0x65, 0x67, 0x75, 0x17e, 0x117, 0x73, 0x3b, 0x62, 0x69, 0x72,
-0x17e, 0x65, 0x6c, 0x69, 0x6f, 0x3b, 0x6c, 0x69, 0x65, 0x70, 0x6f, 0x73, 0x3b, 0x72, 0x75, 0x67, 0x70, 0x6a, 0x16b, 0x10d,
-0x69, 0x6f, 0x3b, 0x72, 0x75, 0x67, 0x73, 0x117, 0x6a, 0x6f, 0x3b, 0x73, 0x70, 0x61, 0x6c, 0x69, 0x6f, 0x3b, 0x6c, 0x61,
-0x70, 0x6b, 0x72, 0x69, 0x10d, 0x69, 0x6f, 0x3b, 0x67, 0x72, 0x75, 0x6f, 0x64, 0x17e, 0x69, 0x6f, 0x3b, 0x458, 0x430, 0x43d,
-0x2e, 0x3b, 0x444, 0x435, 0x432, 0x2e, 0x3b, 0x43c, 0x430, 0x440, 0x2e, 0x3b, 0x430, 0x43f, 0x440, 0x2e, 0x3b, 0x43c, 0x430, 0x458,
-0x3b, 0x458, 0x443, 0x43d, 0x2e, 0x3b, 0x458, 0x443, 0x43b, 0x2e, 0x3b, 0x430, 0x432, 0x433, 0x2e, 0x3b, 0x441, 0x435, 0x43f, 0x442,
-0x2e, 0x3b, 0x43e, 0x43a, 0x442, 0x2e, 0x3b, 0x43d, 0x43e, 0x435, 0x43c, 0x2e, 0x3b, 0x434, 0x435, 0x43a, 0x2e, 0x3b, 0x458, 0x430,
-0x43d, 0x443, 0x430, 0x440, 0x438, 0x3b, 0x444, 0x435, 0x432, 0x440, 0x443, 0x430, 0x440, 0x438, 0x3b, 0x43c, 0x430, 0x440, 0x442, 0x3b,
-0x430, 0x43f, 0x440, 0x438, 0x43b, 0x3b, 0x43c, 0x430, 0x458, 0x3b, 0x458, 0x443, 0x43d, 0x438, 0x3b, 0x458, 0x443, 0x43b, 0x438, 0x3b,
-0x430, 0x432, 0x433, 0x443, 0x441, 0x442, 0x3b, 0x441, 0x435, 0x43f, 0x442, 0x435, 0x43c, 0x432, 0x440, 0x438, 0x3b, 0x43e, 0x43a, 0x442,
-0x43e, 0x43c, 0x432, 0x440, 0x438, 0x3b, 0x43d, 0x43e, 0x435, 0x43c, 0x432, 0x440, 0x438, 0x3b, 0x434, 0x435, 0x43a, 0x435, 0x43c, 0x432,
-0x440, 0x438, 0x3b, 0x458, 0x3b, 0x444, 0x3b, 0x43c, 0x3b, 0x430, 0x3b, 0x43c, 0x3b, 0x458, 0x3b, 0x458, 0x3b, 0x430, 0x3b, 0x441,
-0x3b, 0x43e, 0x3b, 0x43d, 0x3b, 0x434, 0x3b, 0x4a, 0x61, 0x6e, 0x3b, 0x46, 0x65, 0x62, 0x3b, 0x4d, 0x61, 0x72, 0x3b, 0x41,
-0x70, 0x72, 0x3b, 0x4d, 0x65, 0x79, 0x3b, 0x4a, 0x6f, 0x6e, 0x3b, 0x4a, 0x6f, 0x6c, 0x3b, 0x41, 0x6f, 0x67, 0x3b, 0x53,
-0x65, 0x70, 0x3b, 0x4f, 0x6b, 0x74, 0x3b, 0x4e, 0x6f, 0x76, 0x3b, 0x44, 0x65, 0x73, 0x3b, 0x4a, 0x61, 0x6e, 0x6f, 0x61,
-0x72, 0x79, 0x3b, 0x46, 0x65, 0x62, 0x72, 0x6f, 0x61, 0x72, 0x79, 0x3b, 0x4d, 0x61, 0x72, 0x74, 0x73, 0x61, 0x3b, 0x41,
-0x70, 0x72, 0x69, 0x6c, 0x79, 0x3b, 0x4d, 0x65, 0x79, 0x3b, 0x4a, 0x6f, 0x6e, 0x61, 0x3b, 0x4a, 0x6f, 0x6c, 0x61, 0x79,
-0x3b, 0x41, 0x6f, 0x67, 0x6f, 0x73, 0x69, 0x74, 0x72, 0x61, 0x3b, 0x53, 0x65, 0x70, 0x74, 0x61, 0x6d, 0x62, 0x72, 0x61,
-0x3b, 0x4f, 0x6b, 0x74, 0x6f, 0x62, 0x72, 0x61, 0x3b, 0x4e, 0x6f, 0x76, 0x61, 0x6d, 0x62, 0x72, 0x61, 0x3b, 0x44, 0x65,
-0x73, 0x61, 0x6d, 0x62, 0x72, 0x61, 0x3b, 0x4a, 0x61, 0x6e, 0x3b, 0x46, 0x65, 0x62, 0x3b, 0x4d, 0x61, 0x63, 0x3b, 0x41,
-0x70, 0x72, 0x3b, 0x4d, 0x65, 0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x3b, 0x4a, 0x75, 0x6c, 0x3b, 0x4f, 0x67, 0x6f, 0x3b, 0x53,
-0x65, 0x70, 0x3b, 0x4f, 0x6b, 0x74, 0x3b, 0x4e, 0x6f, 0x76, 0x3b, 0x44, 0x69, 0x73, 0x3b, 0x4a, 0x61, 0x6e, 0x75, 0x61,
-0x72, 0x69, 0x3b, 0x46, 0x65, 0x62, 0x72, 0x75, 0x61, 0x72, 0x69, 0x3b, 0x4d, 0x61, 0x63, 0x3b, 0x41, 0x70, 0x72, 0x69,
-0x6c, 0x3b, 0x4d, 0x65, 0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x3b, 0x4a, 0x75, 0x6c, 0x61, 0x69, 0x3b, 0x4f, 0x67, 0x6f, 0x73,
-0x3b, 0x53, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x4f, 0x6b, 0x74, 0x6f, 0x62, 0x65, 0x72, 0x3b, 0x4e,
-0x6f, 0x76, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x44, 0x69, 0x73, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x4a, 0x3b, 0x46,
-0x3b, 0x4d, 0x3b, 0x41, 0x3b, 0x4d, 0x3b, 0x4a, 0x3b, 0x4a, 0x3b, 0x4f, 0x3b, 0x53, 0x3b, 0x4f, 0x3b, 0x4e, 0x3b, 0x44,
-0x3b, 0xd1c, 0xd28, 0xd41, 0x3b, 0xd2b, 0xd46, 0xd2c, 0xd4d, 0xd30, 0xd41, 0x3b, 0xd2e, 0xd3e, 0xd7c, 0x3b, 0xd0f, 0xd2a, 0xd4d, 0xd30,
-0xd3f, 0x3b, 0xd2e, 0xd47, 0xd2f, 0xd4d, 0x3b, 0xd1c, 0xd42, 0xd7a, 0x3b, 0xd1c, 0xd42, 0xd32, 0xd48, 0x3b, 0xd13, 0xd17, 0x3b, 0xd38,
-0xd46, 0xd2a, 0xd4d, 0xd31, 0xd4d, 0xd31, 0xd02, 0x3b, 0xd12, 0xd15, 0xd4d, 0xd1f, 0xd4b, 0x3b, 0xd28, 0xd35, 0xd02, 0x3b, 0xd21, 0xd3f,
-0xd38, 0xd02, 0x3b, 0xd1c, 0xd28, 0xd41, 0xd35, 0xd30, 0xd3f, 0x3b, 0xd2b, 0xd46, 0xd2c, 0xd4d, 0xd30, 0xd41, 0xd35, 0xd30, 0xd3f, 0x3b,
-0xd2e, 0xd3e, 0xd7c, 0xd1a, 0xd4d, 0xd1a, 0xd4d, 0x3b, 0xd0f, 0xd2a, 0xd4d, 0xd30, 0xd3f, 0xd7d, 0x3b, 0xd2e, 0xd47, 0xd2f, 0xd4d, 0x3b,
-0xd1c, 0xd42, 0xd7a, 0x3b, 0xd1c, 0xd42, 0xd32, 0xd48, 0x3b, 0xd13, 0xd17, 0xd38, 0xd4d, 0xd31, 0xd4d, 0xd31, 0xd4d, 0x3b, 0xd38, 0xd46,
-0xd2a, 0xd4d, 0xd31, 0xd4d, 0xd31, 0xd02, 0xd2c, 0xd7c, 0x3b, 0xd12, 0xd15, 0xd4d, 0x200c, 0xd1f, 0xd4b, 0xd2c, 0xd7c, 0x3b, 0xd28, 0xd35,
-0xd02, 0xd2c, 0xd7c, 0x3b, 0xd21, 0xd3f, 0xd38, 0xd02, 0xd2c, 0xd7c, 0x3b, 0xd1c, 0x3b, 0xd2b, 0xd46, 0x3b, 0xd2e, 0xd3e, 0x3b, 0xd0f,
-0x3b, 0xd2e, 0xd46, 0x3b, 0xd1c, 0xd42, 0xd7a, 0x3b, 0xd1c, 0xd42, 0x3b, 0xd13, 0x3b, 0xd38, 0xd46, 0x3b, 0xd12, 0x3b, 0xd28, 0x3b,
-0xd21, 0xd3f, 0x3b, 0x4a, 0x61, 0x6e, 0x3b, 0x46, 0x72, 0x61, 0x3b, 0x4d, 0x61, 0x72, 0x3b, 0x41, 0x70, 0x72, 0x3b, 0x4d,
-0x65, 0x6a, 0x3b, 0x120, 0x75, 0x6e, 0x3b, 0x4c, 0x75, 0x6c, 0x3b, 0x41, 0x77, 0x77, 0x3b, 0x53, 0x65, 0x74, 0x3b, 0x4f,
-0x74, 0x74, 0x3b, 0x4e, 0x6f, 0x76, 0x3b, 0x44, 0x69, 0x10b, 0x3b, 0x4a, 0x61, 0x6e, 0x6e, 0x61, 0x72, 0x3b, 0x46, 0x72,
-0x61, 0x72, 0x3b, 0x4d, 0x61, 0x72, 0x7a, 0x75, 0x3b, 0x41, 0x70, 0x72, 0x69, 0x6c, 0x3b, 0x4d, 0x65, 0x6a, 0x6a, 0x75,
-0x3b, 0x120, 0x75, 0x6e, 0x6a, 0x75, 0x3b, 0x4c, 0x75, 0x6c, 0x6a, 0x75, 0x3b, 0x41, 0x77, 0x77, 0x69, 0x73, 0x73, 0x75,
-0x3b, 0x53, 0x65, 0x74, 0x74, 0x65, 0x6d, 0x62, 0x72, 0x75, 0x3b, 0x4f, 0x74, 0x74, 0x75, 0x62, 0x72, 0x75, 0x3b, 0x4e,
-0x6f, 0x76, 0x65, 0x6d, 0x62, 0x72, 0x75, 0x3b, 0x44, 0x69, 0x10b, 0x65, 0x6d, 0x62, 0x72, 0x75, 0x3b, 0x4a, 0x6e, 0x3b,
-0x46, 0x72, 0x3b, 0x4d, 0x7a, 0x3b, 0x41, 0x70, 0x3b, 0x4d, 0x6a, 0x3b, 0x120, 0x6e, 0x3b, 0x4c, 0x6a, 0x3b, 0x41, 0x77,
-0x3b, 0x53, 0x74, 0x3b, 0x4f, 0x62, 0x3b, 0x4e, 0x76, 0x3b, 0x44, 0x10b, 0x3b, 0x4a, 0x3b, 0x46, 0x3b, 0x4d, 0x3b, 0x41,
-0x3b, 0x4d, 0x3b, 0x120, 0x3b, 0x4c, 0x3b, 0x41, 0x3b, 0x53, 0x3b, 0x4f, 0x3b, 0x4e, 0x3b, 0x44, 0x3b, 0x4b, 0x6f, 0x68,
-0x69, 0x3b, 0x48, 0x75, 0x69, 0x3b, 0x50, 0x6f, 0x75, 0x3b, 0x50, 0x61, 0x65, 0x3b, 0x48, 0x61, 0x72, 0x61, 0x3b, 0x50,
-0x69, 0x70, 0x69, 0x3b, 0x48, 0x14d, 0x6e, 0x67, 0x6f, 0x3b, 0x48, 0x65, 0x72, 0x65, 0x3b, 0x4d, 0x61, 0x68, 0x75, 0x3b,
-0x4e, 0x75, 0x6b, 0x75, 0x3b, 0x52, 0x61, 0x6e, 0x67, 0x69, 0x3b, 0x48, 0x61, 0x6b, 0x69, 0x3b, 0x4b, 0x6f, 0x68, 0x69,
+0x70, 0x3b, 0x6f, 0x6b, 0x74, 0x3b, 0x6e, 0x6f, 0x76, 0x3b, 0x64, 0x65, 0x73, 0x6a, 0x61, 0x6e, 0x2e, 0x3b, 0x66, 0x65,
+0x62, 0x2e, 0x3b, 0x6d, 0x61, 0x72, 0x2e, 0x3b, 0x61, 0x70, 0x72, 0x2e, 0x3b, 0x6d, 0x61, 0x69, 0x3b, 0x6a, 0x75, 0x6e,
+0x2e, 0x3b, 0x6a, 0x75, 0x6c, 0x2e, 0x3b, 0x61, 0x75, 0x67, 0x2e, 0x3b, 0x73, 0x65, 0x70, 0x2e, 0x3b, 0x6f, 0x6b, 0x74,
+0x2e, 0x3b, 0x6e, 0x6f, 0x76, 0x2e, 0x3b, 0x64, 0x65, 0x73, 0x2e, 0x74, 0x61, 0x6d, 0x6d, 0x69, 0x6b, 0x75, 0x75, 0x3b,
+0x68, 0x65, 0x6c, 0x6d, 0x69, 0x6b, 0x75, 0x75, 0x3b, 0x6d, 0x61, 0x61, 0x6c, 0x69, 0x73, 0x6b, 0x75, 0x75, 0x3b, 0x68,
+0x75, 0x68, 0x74, 0x69, 0x6b, 0x75, 0x75, 0x3b, 0x74, 0x6f, 0x75, 0x6b, 0x6f, 0x6b, 0x75, 0x75, 0x3b, 0x6b, 0x65, 0x73,
+0xe4, 0x6b, 0x75, 0x75, 0x3b, 0x68, 0x65, 0x69, 0x6e, 0xe4, 0x6b, 0x75, 0x75, 0x3b, 0x65, 0x6c, 0x6f, 0x6b, 0x75, 0x75,
+0x3b, 0x73, 0x79, 0x79, 0x73, 0x6b, 0x75, 0x75, 0x3b, 0x6c, 0x6f, 0x6b, 0x61, 0x6b, 0x75, 0x75, 0x3b, 0x6d, 0x61, 0x72,
+0x72, 0x61, 0x73, 0x6b, 0x75, 0x75, 0x3b, 0x6a, 0x6f, 0x75, 0x6c, 0x75, 0x6b, 0x75, 0x75, 0x74, 0x61, 0x6d, 0x6d, 0x69,
+0x6b, 0x75, 0x75, 0x74, 0x61, 0x3b, 0x68, 0x65, 0x6c, 0x6d, 0x69, 0x6b, 0x75, 0x75, 0x74, 0x61, 0x3b, 0x6d, 0x61, 0x61,
+0x6c, 0x69, 0x73, 0x6b, 0x75, 0x75, 0x74, 0x61, 0x3b, 0x68, 0x75, 0x68, 0x74, 0x69, 0x6b, 0x75, 0x75, 0x74, 0x61, 0x3b,
+0x74, 0x6f, 0x75, 0x6b, 0x6f, 0x6b, 0x75, 0x75, 0x74, 0x61, 0x3b, 0x6b, 0x65, 0x73, 0xe4, 0x6b, 0x75, 0x75, 0x74, 0x61,
+0x3b, 0x68, 0x65, 0x69, 0x6e, 0xe4, 0x6b, 0x75, 0x75, 0x74, 0x61, 0x3b, 0x65, 0x6c, 0x6f, 0x6b, 0x75, 0x75, 0x74, 0x61,
+0x3b, 0x73, 0x79, 0x79, 0x73, 0x6b, 0x75, 0x75, 0x74, 0x61, 0x3b, 0x6c, 0x6f, 0x6b, 0x61, 0x6b, 0x75, 0x75, 0x74, 0x61,
+0x3b, 0x6d, 0x61, 0x72, 0x72, 0x61, 0x73, 0x6b, 0x75, 0x75, 0x74, 0x61, 0x3b, 0x6a, 0x6f, 0x75, 0x6c, 0x75, 0x6b, 0x75,
+0x75, 0x74, 0x61, 0x74, 0x61, 0x6d, 0x6d, 0x69, 0x3b, 0x68, 0x65, 0x6c, 0x6d, 0x69, 0x3b, 0x6d, 0x61, 0x61, 0x6c, 0x69,
+0x73, 0x3b, 0x68, 0x75, 0x68, 0x74, 0x69, 0x3b, 0x74, 0x6f, 0x75, 0x6b, 0x6f, 0x3b, 0x6b, 0x65, 0x73, 0xe4, 0x3b, 0x68,
+0x65, 0x69, 0x6e, 0xe4, 0x3b, 0x65, 0x6c, 0x6f, 0x3b, 0x73, 0x79, 0x79, 0x73, 0x3b, 0x6c, 0x6f, 0x6b, 0x61, 0x3b, 0x6d,
+0x61, 0x72, 0x72, 0x61, 0x73, 0x3b, 0x6a, 0x6f, 0x75, 0x6c, 0x75, 0x74, 0x61, 0x6d, 0x6d, 0x69, 0x6b, 0x2e, 0x3b, 0x68,
+0x65, 0x6c, 0x6d, 0x69, 0x6b, 0x2e, 0x3b, 0x6d, 0x61, 0x61, 0x6c, 0x69, 0x73, 0x6b, 0x2e, 0x3b, 0x68, 0x75, 0x68, 0x74,
+0x69, 0x6b, 0x2e, 0x3b, 0x74, 0x6f, 0x75, 0x6b, 0x6f, 0x6b, 0x2e, 0x3b, 0x6b, 0x65, 0x73, 0xe4, 0x6b, 0x2e, 0x3b, 0x68,
+0x65, 0x69, 0x6e, 0xe4, 0x6b, 0x2e, 0x3b, 0x65, 0x6c, 0x6f, 0x6b, 0x2e, 0x3b, 0x73, 0x79, 0x79, 0x73, 0x6b, 0x2e, 0x3b,
+0x6c, 0x6f, 0x6b, 0x61, 0x6b, 0x2e, 0x3b, 0x6d, 0x61, 0x72, 0x72, 0x61, 0x73, 0x6b, 0x2e, 0x3b, 0x6a, 0x6f, 0x75, 0x6c,
+0x75, 0x6b, 0x2e, 0x54, 0x3b, 0x48, 0x3b, 0x4d, 0x3b, 0x48, 0x3b, 0x54, 0x3b, 0x4b, 0x3b, 0x48, 0x3b, 0x45, 0x3b, 0x53,
+0x3b, 0x4c, 0x3b, 0x4d, 0x3b, 0x4a, 0x6a, 0x61, 0x6e, 0x76, 0x69, 0x65, 0x72, 0x3b, 0x66, 0xe9, 0x76, 0x72, 0x69, 0x65,
+0x72, 0x3b, 0x6d, 0x61, 0x72, 0x73, 0x3b, 0x61, 0x76, 0x72, 0x69, 0x6c, 0x3b, 0x6d, 0x61, 0x69, 0x3b, 0x6a, 0x75, 0x69,
+0x6e, 0x3b, 0x6a, 0x75, 0x69, 0x6c, 0x6c, 0x65, 0x74, 0x3b, 0x61, 0x6f, 0xfb, 0x74, 0x3b, 0x73, 0x65, 0x70, 0x74, 0x65,
+0x6d, 0x62, 0x72, 0x65, 0x3b, 0x6f, 0x63, 0x74, 0x6f, 0x62, 0x72, 0x65, 0x3b, 0x6e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x72,
+0x65, 0x3b, 0x64, 0xe9, 0x63, 0x65, 0x6d, 0x62, 0x72, 0x65, 0x6a, 0x61, 0x6e, 0x76, 0x2e, 0x3b, 0x66, 0xe9, 0x76, 0x72,
+0x2e, 0x3b, 0x6d, 0x61, 0x72, 0x73, 0x3b, 0x61, 0x76, 0x72, 0x2e, 0x3b, 0x6d, 0x61, 0x69, 0x3b, 0x6a, 0x75, 0x69, 0x6e,
+0x3b, 0x6a, 0x75, 0x69, 0x6c, 0x2e, 0x3b, 0x61, 0x6f, 0xfb, 0x74, 0x3b, 0x73, 0x65, 0x70, 0x74, 0x2e, 0x3b, 0x6f, 0x63,
+0x74, 0x2e, 0x3b, 0x6e, 0x6f, 0x76, 0x2e, 0x3b, 0x64, 0xe9, 0x63, 0x2e, 0x6a, 0x61, 0x6e, 0x76, 0x2e, 0x3b, 0x66, 0xe9,
+0x76, 0x72, 0x2e, 0x3b, 0x6d, 0x61, 0x72, 0x73, 0x3b, 0x61, 0x76, 0x72, 0x2e, 0x3b, 0x6d, 0x61, 0x69, 0x3b, 0x6a, 0x75,
+0x69, 0x6e, 0x3b, 0x6a, 0x75, 0x69, 0x6c, 0x6c, 0x2e, 0x3b, 0x61, 0x6f, 0xfb, 0x74, 0x3b, 0x73, 0x65, 0x70, 0x74, 0x2e,
+0x3b, 0x6f, 0x63, 0x74, 0x2e, 0x3b, 0x6e, 0x6f, 0x76, 0x2e, 0x3b, 0x64, 0xe9, 0x63, 0x2e, 0x6a, 0x61, 0x6e, 0x2e, 0x3b,
+0x66, 0xe9, 0x76, 0x2e, 0x3b, 0x6d, 0x61, 0x72, 0x2e, 0x3b, 0x61, 0x76, 0x72, 0x2e, 0x3b, 0x6d, 0x61, 0x69, 0x3b, 0x6a,
+0x75, 0x69, 0x2e, 0x3b, 0x6a, 0x75, 0x69, 0x6c, 0x2e, 0x3b, 0x61, 0x6f, 0xfb, 0x74, 0x3b, 0x73, 0x65, 0x70, 0x74, 0x2e,
+0x3b, 0x6f, 0x63, 0x74, 0x2e, 0x3b, 0x6e, 0x6f, 0x76, 0x2e, 0x3b, 0x64, 0xe9, 0x63, 0x2e, 0x4a, 0x61, 0x6e, 0x6e, 0x65,
+0x77, 0x61, 0x72, 0x69, 0x73, 0x3b, 0x46, 0x65, 0x62, 0x72, 0x65, 0x77, 0x61, 0x72, 0x69, 0x73, 0x3b, 0x4d, 0x61, 0x61,
+0x72, 0x74, 0x3b, 0x41, 0x70, 0x72, 0x69, 0x6c, 0x3b, 0x4d, 0x61, 0x61, 0x69, 0x65, 0x3b, 0x4a, 0x75, 0x6e, 0x79, 0x3b,
+0x4a, 0x75, 0x6c, 0x79, 0x3b, 0x41, 0x75, 0x67, 0x75, 0x73, 0x74, 0x75, 0x73, 0x3b, 0x53, 0x65, 0x70, 0x74, 0x69, 0x6d,
+0x62, 0x65, 0x72, 0x3b, 0x4f, 0x6b, 0x74, 0x6f, 0x62, 0x65, 0x72, 0x3b, 0x4e, 0x6f, 0x76, 0x69, 0x6d, 0x62, 0x65, 0x72,
+0x3b, 0x44, 0x65, 0x73, 0x69, 0x6d, 0x62, 0x65, 0x72, 0x4a, 0x61, 0x6e, 0x3b, 0x46, 0x65, 0x62, 0x3b, 0x4d, 0x72, 0x74,
+0x3b, 0x41, 0x70, 0x72, 0x3b, 0x4d, 0x61, 0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x3b, 0x4a, 0x75, 0x6c, 0x3b, 0x41, 0x75, 0x67,
+0x3b, 0x53, 0x65, 0x70, 0x3b, 0x4f, 0x6b, 0x74, 0x3b, 0x4e, 0x6f, 0x76, 0x3b, 0x44, 0x65, 0x73, 0x41, 0x6d, 0x20, 0x46,
+0x61, 0x6f, 0x69, 0x6c, 0x6c, 0x65, 0x61, 0x63, 0x68, 0x3b, 0x41, 0x6e, 0x20, 0x47, 0x65, 0x61, 0x72, 0x72, 0x61, 0x6e,
+0x3b, 0x41, 0x6d, 0x20, 0x4d, 0xe0, 0x72, 0x74, 0x3b, 0x41, 0x6e, 0x20, 0x47, 0x69, 0x62, 0x6c, 0x65, 0x61, 0x6e, 0x3b,
+0x41, 0x6e, 0x20, 0x43, 0xe8, 0x69, 0x74, 0x65, 0x61, 0x6e, 0x3b, 0x41, 0x6e, 0x20, 0x74, 0x2d, 0xd2, 0x67, 0x6d, 0x68,
+0x69, 0x6f, 0x73, 0x3b, 0x41, 0x6e, 0x20, 0x74, 0x2d, 0x49, 0x75, 0x63, 0x68, 0x61, 0x72, 0x3b, 0x41, 0x6e, 0x20, 0x4c,
+0xf9, 0x6e, 0x61, 0x73, 0x74, 0x61, 0x6c, 0x3b, 0x41, 0x6e, 0x20, 0x74, 0x2d, 0x53, 0x75, 0x6c, 0x74, 0x61, 0x69, 0x6e,
+0x3b, 0x41, 0x6e, 0x20, 0x44, 0xe0, 0x6d, 0x68, 0x61, 0x69, 0x72, 0x3b, 0x41, 0x6e, 0x20, 0x74, 0x2d, 0x53, 0x61, 0x6d,
+0x68, 0x61, 0x69, 0x6e, 0x3b, 0x41, 0x6e, 0x20, 0x44, 0xf9, 0x62, 0x68, 0x6c, 0x61, 0x63, 0x68, 0x64, 0x64, 0x68, 0x65,
+0x6e, 0x20, 0x46, 0x68, 0x61, 0x6f, 0x69, 0x6c, 0x6c, 0x65, 0x61, 0x63, 0x68, 0x3b, 0x64, 0x68, 0x65, 0x6e, 0x20, 0x47,
+0x68, 0x65, 0x61, 0x72, 0x72, 0x61, 0x6e, 0x3b, 0x64, 0x68, 0x65, 0x6e, 0x20, 0x4d, 0x68, 0xe0, 0x72, 0x74, 0x3b, 0x64,
+0x68, 0x65, 0x6e, 0x20, 0x47, 0x68, 0x69, 0x62, 0x6c, 0x65, 0x61, 0x6e, 0x3b, 0x64, 0x68, 0x65, 0x6e, 0x20, 0x43, 0x68,
+0xe8, 0x69, 0x74, 0x65, 0x61, 0x6e, 0x3b, 0x64, 0x68, 0x65, 0x6e, 0x20, 0xd2, 0x67, 0x6d, 0x68, 0x69, 0x6f, 0x73, 0x3b,
+0x64, 0x68, 0x65, 0x6e, 0x20, 0x49, 0x75, 0x63, 0x68, 0x61, 0x72, 0x3b, 0x64, 0x68, 0x65, 0x6e, 0x20, 0x4c, 0xf9, 0x6e,
+0x61, 0x73, 0x74, 0x61, 0x6c, 0x3b, 0x64, 0x68, 0x65, 0x6e, 0x20, 0x74, 0x2d, 0x53, 0x75, 0x6c, 0x74, 0x61, 0x69, 0x6e,
+0x3b, 0x64, 0x68, 0x65, 0x6e, 0x20, 0x44, 0xe0, 0x6d, 0x68, 0x61, 0x69, 0x72, 0x3b, 0x64, 0x68, 0x65, 0x6e, 0x20, 0x74,
+0x2d, 0x53, 0x61, 0x6d, 0x68, 0x61, 0x69, 0x6e, 0x3b, 0x64, 0x68, 0x65, 0x6e, 0x20, 0x44, 0xf9, 0x62, 0x68, 0x6c, 0x61,
+0x63, 0x68, 0x64, 0x46, 0x61, 0x6f, 0x69, 0x3b, 0x47, 0x65, 0x61, 0x72, 0x72, 0x3b, 0x4d, 0xe0, 0x72, 0x74, 0x3b, 0x47,
+0x69, 0x62, 0x6c, 0x3b, 0x43, 0xe8, 0x69, 0x74, 0x3b, 0xd2, 0x67, 0x6d, 0x68, 0x3b, 0x49, 0x75, 0x63, 0x68, 0x3b, 0x4c,
+0xf9, 0x6e, 0x61, 0x3b, 0x53, 0x75, 0x6c, 0x74, 0x3b, 0x44, 0xe0, 0x6d, 0x68, 0x3b, 0x53, 0x61, 0x6d, 0x68, 0x3b, 0x44,
+0xf9, 0x62, 0x68, 0x46, 0x3b, 0x47, 0x3b, 0x4d, 0x3b, 0x47, 0x3b, 0x43, 0x3b, 0xd2, 0x3b, 0x49, 0x3b, 0x4c, 0x3b, 0x53,
+0x3b, 0x44, 0x3b, 0x53, 0x3b, 0x44, 0x58, 0x61, 0x6e, 0x65, 0x69, 0x72, 0x6f, 0x3b, 0x46, 0x65, 0x62, 0x72, 0x65, 0x69,
+0x72, 0x6f, 0x3b, 0x4d, 0x61, 0x72, 0x7a, 0x6f, 0x3b, 0x41, 0x62, 0x72, 0x69, 0x6c, 0x3b, 0x4d, 0x61, 0x69, 0x6f, 0x3b,
+0x58, 0x75, 0xf1, 0x6f, 0x3b, 0x58, 0x75, 0x6c, 0x6c, 0x6f, 0x3b, 0x41, 0x67, 0x6f, 0x73, 0x74, 0x6f, 0x3b, 0x53, 0x65,
+0x74, 0x65, 0x6d, 0x62, 0x72, 0x6f, 0x3b, 0x4f, 0x75, 0x74, 0x75, 0x62, 0x72, 0x6f, 0x3b, 0x4e, 0x6f, 0x76, 0x65, 0x6d,
+0x62, 0x72, 0x6f, 0x3b, 0x44, 0x65, 0x63, 0x65, 0x6d, 0x62, 0x72, 0x6f, 0x78, 0x61, 0x6e, 0x65, 0x69, 0x72, 0x6f, 0x3b,
+0x66, 0x65, 0x62, 0x72, 0x65, 0x69, 0x72, 0x6f, 0x3b, 0x6d, 0x61, 0x72, 0x7a, 0x6f, 0x3b, 0x61, 0x62, 0x72, 0x69, 0x6c,
+0x3b, 0x6d, 0x61, 0x69, 0x6f, 0x3b, 0x78, 0x75, 0xf1, 0x6f, 0x3b, 0x78, 0x75, 0x6c, 0x6c, 0x6f, 0x3b, 0x61, 0x67, 0x6f,
+0x73, 0x74, 0x6f, 0x3b, 0x73, 0x65, 0x74, 0x65, 0x6d, 0x62, 0x72, 0x6f, 0x3b, 0x6f, 0x75, 0x74, 0x75, 0x62, 0x72, 0x6f,
+0x3b, 0x6e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x72, 0x6f, 0x3b, 0x64, 0x65, 0x63, 0x65, 0x6d, 0x62, 0x72, 0x6f, 0x58, 0x61,
+0x6e, 0x2e, 0x3b, 0x46, 0x65, 0x62, 0x2e, 0x3b, 0x4d, 0x61, 0x72, 0x2e, 0x3b, 0x41, 0x62, 0x72, 0x2e, 0x3b, 0x4d, 0x61,
+0x69, 0x6f, 0x3b, 0x58, 0x75, 0xf1, 0x6f, 0x3b, 0x58, 0x75, 0x6c, 0x2e, 0x3b, 0x41, 0x67, 0x6f, 0x2e, 0x3b, 0x53, 0x65,
+0x74, 0x2e, 0x3b, 0x4f, 0x75, 0x74, 0x2e, 0x3b, 0x4e, 0x6f, 0x76, 0x2e, 0x3b, 0x44, 0x65, 0x63, 0x2e, 0x78, 0x61, 0x6e,
+0x2e, 0x3b, 0x66, 0x65, 0x62, 0x2e, 0x3b, 0x6d, 0x61, 0x72, 0x2e, 0x3b, 0x61, 0x62, 0x72, 0x2e, 0x3b, 0x6d, 0x61, 0x69,
+0x6f, 0x3b, 0x78, 0x75, 0xf1, 0x6f, 0x3b, 0x78, 0x75, 0x6c, 0x2e, 0x3b, 0x61, 0x67, 0x6f, 0x2e, 0x3b, 0x73, 0x65, 0x74,
+0x2e, 0x3b, 0x6f, 0x75, 0x74, 0x2e, 0x3b, 0x6e, 0x6f, 0x76, 0x2e, 0x3b, 0x64, 0x65, 0x63, 0x2e, 0x58, 0x3b, 0x46, 0x3b,
+0x4d, 0x3b, 0x41, 0x3b, 0x4d, 0x3b, 0x58, 0x3b, 0x58, 0x3b, 0x41, 0x3b, 0x53, 0x3b, 0x4f, 0x3b, 0x4e, 0x3b, 0x44, 0x78,
+0x2e, 0x3b, 0x66, 0x2e, 0x3b, 0x6d, 0x2e, 0x3b, 0x61, 0x2e, 0x3b, 0x6d, 0x2e, 0x3b, 0x78, 0x2e, 0x3b, 0x78, 0x2e, 0x3b,
+0x61, 0x2e, 0x3b, 0x73, 0x2e, 0x3b, 0x6f, 0x2e, 0x3b, 0x6e, 0x2e, 0x3b, 0x64, 0x2e, 0x10d8, 0x10d0, 0x10dc, 0x10d5, 0x10d0, 0x10e0,
+0x10d8, 0x3b, 0x10d7, 0x10d4, 0x10d1, 0x10d4, 0x10e0, 0x10d5, 0x10d0, 0x10da, 0x10d8, 0x3b, 0x10db, 0x10d0, 0x10e0, 0x10e2, 0x10d8, 0x3b, 0x10d0, 0x10de,
+0x10e0, 0x10d8, 0x10da, 0x10d8, 0x3b, 0x10db, 0x10d0, 0x10d8, 0x10e1, 0x10d8, 0x3b, 0x10d8, 0x10d5, 0x10dc, 0x10d8, 0x10e1, 0x10d8, 0x3b, 0x10d8, 0x10d5,
+0x10da, 0x10d8, 0x10e1, 0x10d8, 0x3b, 0x10d0, 0x10d2, 0x10d5, 0x10d8, 0x10e1, 0x10e2, 0x10dd, 0x3b, 0x10e1, 0x10d4, 0x10e5, 0x10e2, 0x10d4, 0x10db, 0x10d1,
+0x10d4, 0x10e0, 0x10d8, 0x3b, 0x10dd, 0x10e5, 0x10e2, 0x10dd, 0x10db, 0x10d1, 0x10d4, 0x10e0, 0x10d8, 0x3b, 0x10dc, 0x10dd, 0x10d4, 0x10db, 0x10d1, 0x10d4,
+0x10e0, 0x10d8, 0x3b, 0x10d3, 0x10d4, 0x10d9, 0x10d4, 0x10db, 0x10d1, 0x10d4, 0x10e0, 0x10d8, 0x10d8, 0x10d0, 0x10dc, 0x3b, 0x10d7, 0x10d4, 0x10d1, 0x3b,
+0x10db, 0x10d0, 0x10e0, 0x3b, 0x10d0, 0x10de, 0x10e0, 0x3b, 0x10db, 0x10d0, 0x10d8, 0x3b, 0x10d8, 0x10d5, 0x10dc, 0x3b, 0x10d8, 0x10d5, 0x10da, 0x3b,
+0x10d0, 0x10d2, 0x10d5, 0x3b, 0x10e1, 0x10d4, 0x10e5, 0x3b, 0x10dd, 0x10e5, 0x10e2, 0x3b, 0x10dc, 0x10dd, 0x10d4, 0x3b, 0x10d3, 0x10d4, 0x10d9, 0x10d8,
+0x3b, 0x10d7, 0x3b, 0x10db, 0x3b, 0x10d0, 0x3b, 0x10db, 0x3b, 0x10d8, 0x3b, 0x10d8, 0x3b, 0x10d0, 0x3b, 0x10e1, 0x3b, 0x10dd, 0x3b, 0x10dc,
+0x3b, 0x10d3, 0x4a, 0x61, 0x6e, 0x75, 0x61, 0x72, 0x3b, 0x46, 0x65, 0x62, 0x72, 0x75, 0x61, 0x72, 0x3b, 0x4d, 0xe4, 0x72,
+0x7a, 0x3b, 0x41, 0x70, 0x72, 0x69, 0x6c, 0x3b, 0x4d, 0x61, 0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x69, 0x3b, 0x4a, 0x75, 0x6c,
+0x69, 0x3b, 0x41, 0x75, 0x67, 0x75, 0x73, 0x74, 0x3b, 0x53, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x4f,
+0x6b, 0x74, 0x6f, 0x62, 0x65, 0x72, 0x3b, 0x4e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x44, 0x65, 0x7a, 0x65,
+0x6d, 0x62, 0x65, 0x72, 0x4a, 0x61, 0x6e, 0x3b, 0x46, 0x65, 0x62, 0x3b, 0x4d, 0xe4, 0x72, 0x3b, 0x41, 0x70, 0x72, 0x3b,
+0x4d, 0x61, 0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x3b, 0x4a, 0x75, 0x6c, 0x3b, 0x41, 0x75, 0x67, 0x3b, 0x53, 0x65, 0x70, 0x3b,
+0x4f, 0x6b, 0x74, 0x3b, 0x4e, 0x6f, 0x76, 0x3b, 0x44, 0x65, 0x7a, 0x4a, 0x61, 0x6e, 0x2e, 0x3b, 0x46, 0x65, 0x62, 0x2e,
+0x3b, 0x4d, 0xe4, 0x72, 0x7a, 0x3b, 0x41, 0x70, 0x72, 0x2e, 0x3b, 0x4d, 0x61, 0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x69, 0x3b,
+0x4a, 0x75, 0x6c, 0x69, 0x3b, 0x41, 0x75, 0x67, 0x2e, 0x3b, 0x53, 0x65, 0x70, 0x74, 0x2e, 0x3b, 0x4f, 0x6b, 0x74, 0x2e,
+0x3b, 0x4e, 0x6f, 0x76, 0x2e, 0x3b, 0x44, 0x65, 0x7a, 0x2e, 0x4a, 0xe4, 0x6e, 0x6e, 0x65, 0x72, 0x3b, 0x46, 0x65, 0x62,
+0x72, 0x75, 0x61, 0x72, 0x3b, 0x4d, 0xe4, 0x72, 0x7a, 0x3b, 0x41, 0x70, 0x72, 0x69, 0x6c, 0x3b, 0x4d, 0x61, 0x69, 0x3b,
+0x4a, 0x75, 0x6e, 0x69, 0x3b, 0x4a, 0x75, 0x6c, 0x69, 0x3b, 0x41, 0x75, 0x67, 0x75, 0x73, 0x74, 0x3b, 0x53, 0x65, 0x70,
+0x74, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x4f, 0x6b, 0x74, 0x6f, 0x62, 0x65, 0x72, 0x3b, 0x4e, 0x6f, 0x76, 0x65, 0x6d,
+0x62, 0x65, 0x72, 0x3b, 0x44, 0x65, 0x7a, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x4a, 0xe4, 0x6e, 0x3b, 0x46, 0x65, 0x62, 0x3b,
+0x4d, 0xe4, 0x72, 0x3b, 0x41, 0x70, 0x72, 0x3b, 0x4d, 0x61, 0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x3b, 0x4a, 0x75, 0x6c, 0x3b,
+0x41, 0x75, 0x67, 0x3b, 0x53, 0x65, 0x70, 0x3b, 0x4f, 0x6b, 0x74, 0x3b, 0x4e, 0x6f, 0x76, 0x3b, 0x44, 0x65, 0x7a, 0x4a,
+0xe4, 0x6e, 0x2e, 0x3b, 0x46, 0x65, 0x62, 0x2e, 0x3b, 0x4d, 0xe4, 0x72, 0x7a, 0x3b, 0x41, 0x70, 0x72, 0x2e, 0x3b, 0x4d,
+0x61, 0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x69, 0x3b, 0x4a, 0x75, 0x6c, 0x69, 0x3b, 0x41, 0x75, 0x67, 0x2e, 0x3b, 0x53, 0x65,
+0x70, 0x2e, 0x3b, 0x4f, 0x6b, 0x74, 0x2e, 0x3b, 0x4e, 0x6f, 0x76, 0x2e, 0x3b, 0x44, 0x65, 0x7a, 0x2e, 0x399, 0x3b1, 0x3bd,
+0x3bf, 0x3c5, 0x3ac, 0x3c1, 0x3b9, 0x3bf, 0x3c2, 0x3b, 0x3a6, 0x3b5, 0x3b2, 0x3c1, 0x3bf, 0x3c5, 0x3ac, 0x3c1, 0x3b9, 0x3bf, 0x3c2, 0x3b,
+0x39c, 0x3ac, 0x3c1, 0x3c4, 0x3b9, 0x3bf, 0x3c2, 0x3b, 0x391, 0x3c0, 0x3c1, 0x3af, 0x3bb, 0x3b9, 0x3bf, 0x3c2, 0x3b, 0x39c, 0x3ac, 0x3b9,
+0x3bf, 0x3c2, 0x3b, 0x399, 0x3bf, 0x3cd, 0x3bd, 0x3b9, 0x3bf, 0x3c2, 0x3b, 0x399, 0x3bf, 0x3cd, 0x3bb, 0x3b9, 0x3bf, 0x3c2, 0x3b, 0x391,
+0x3cd, 0x3b3, 0x3bf, 0x3c5, 0x3c3, 0x3c4, 0x3bf, 0x3c2, 0x3b, 0x3a3, 0x3b5, 0x3c0, 0x3c4, 0x3ad, 0x3bc, 0x3b2, 0x3c1, 0x3b9, 0x3bf, 0x3c2,
+0x3b, 0x39f, 0x3ba, 0x3c4, 0x3ce, 0x3b2, 0x3c1, 0x3b9, 0x3bf, 0x3c2, 0x3b, 0x39d, 0x3bf, 0x3ad, 0x3bc, 0x3b2, 0x3c1, 0x3b9, 0x3bf, 0x3c2,
+0x3b, 0x394, 0x3b5, 0x3ba, 0x3ad, 0x3bc, 0x3b2, 0x3c1, 0x3b9, 0x3bf, 0x3c2, 0x399, 0x3b1, 0x3bd, 0x3bf, 0x3c5, 0x3b1, 0x3c1, 0x3af, 0x3bf,
+0x3c5, 0x3b, 0x3a6, 0x3b5, 0x3b2, 0x3c1, 0x3bf, 0x3c5, 0x3b1, 0x3c1, 0x3af, 0x3bf, 0x3c5, 0x3b, 0x39c, 0x3b1, 0x3c1, 0x3c4, 0x3af, 0x3bf,
+0x3c5, 0x3b, 0x391, 0x3c0, 0x3c1, 0x3b9, 0x3bb, 0x3af, 0x3bf, 0x3c5, 0x3b, 0x39c, 0x3b1, 0x390, 0x3bf, 0x3c5, 0x3b, 0x399, 0x3bf, 0x3c5,
+0x3bd, 0x3af, 0x3bf, 0x3c5, 0x3b, 0x399, 0x3bf, 0x3c5, 0x3bb, 0x3af, 0x3bf, 0x3c5, 0x3b, 0x391, 0x3c5, 0x3b3, 0x3bf, 0x3cd, 0x3c3, 0x3c4,
+0x3bf, 0x3c5, 0x3b, 0x3a3, 0x3b5, 0x3c0, 0x3c4, 0x3b5, 0x3bc, 0x3b2, 0x3c1, 0x3af, 0x3bf, 0x3c5, 0x3b, 0x39f, 0x3ba, 0x3c4, 0x3c9, 0x3b2,
+0x3c1, 0x3af, 0x3bf, 0x3c5, 0x3b, 0x39d, 0x3bf, 0x3b5, 0x3bc, 0x3b2, 0x3c1, 0x3af, 0x3bf, 0x3c5, 0x3b, 0x394, 0x3b5, 0x3ba, 0x3b5, 0x3bc,
+0x3b2, 0x3c1, 0x3af, 0x3bf, 0x3c5, 0x399, 0x3b1, 0x3bd, 0x3b, 0x3a6, 0x3b5, 0x3b2, 0x3b, 0x39c, 0x3ac, 0x3c1, 0x3b, 0x391, 0x3c0, 0x3c1,
+0x3b, 0x39c, 0x3ac, 0x3b9, 0x3b, 0x399, 0x3bf, 0x3cd, 0x3bd, 0x3b, 0x399, 0x3bf, 0x3cd, 0x3bb, 0x3b, 0x391, 0x3cd, 0x3b3, 0x3b, 0x3a3,
+0x3b5, 0x3c0, 0x3b, 0x39f, 0x3ba, 0x3c4, 0x3b, 0x39d, 0x3bf, 0x3ad, 0x3b, 0x394, 0x3b5, 0x3ba, 0x399, 0x3b1, 0x3bd, 0x3b, 0x3a6, 0x3b5,
+0x3b2, 0x3b, 0x39c, 0x3b1, 0x3c1, 0x3b, 0x391, 0x3c0, 0x3c1, 0x3b, 0x39c, 0x3b1, 0x390, 0x3b, 0x399, 0x3bf, 0x3c5, 0x3bd, 0x3b, 0x399,
+0x3bf, 0x3c5, 0x3bb, 0x3b, 0x391, 0x3c5, 0x3b3, 0x3b, 0x3a3, 0x3b5, 0x3c0, 0x3b, 0x39f, 0x3ba, 0x3c4, 0x3b, 0x39d, 0x3bf, 0x3b5, 0x3b,
+0x394, 0x3b5, 0x3ba, 0x399, 0x3b, 0x3a6, 0x3b, 0x39c, 0x3b, 0x391, 0x3b, 0x39c, 0x3b, 0x399, 0x3b, 0x399, 0x3b, 0x391, 0x3b, 0x3a3,
+0x3b, 0x39f, 0x3b, 0x39d, 0x3b, 0x394, 0x6a, 0x61, 0x6e, 0x75, 0x61, 0x61, 0x72, 0x69, 0x3b, 0x66, 0x65, 0x62, 0x72, 0x75,
+0x61, 0x61, 0x72, 0x69, 0x3b, 0x6d, 0x61, 0x72, 0x73, 0x69, 0x3b, 0x61, 0x70, 0x72, 0x69, 0x69, 0x6c, 0x69, 0x3b, 0x6d,
+0x61, 0x61, 0x6a, 0x69, 0x3b, 0x6a, 0x75, 0x75, 0x6e, 0x69, 0x3b, 0x6a, 0x75, 0x75, 0x6c, 0x69, 0x3b, 0x61, 0x67, 0x67,
+0x75, 0x73, 0x74, 0x69, 0x3b, 0x73, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x61, 0x72, 0x69, 0x3b, 0x6f, 0x6b, 0x74, 0x6f,
+0x62, 0x61, 0x72, 0x69, 0x3b, 0x6e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x61, 0x72, 0x69, 0x3b, 0x64, 0x65, 0x63, 0x65, 0x6d,
+0x62, 0x61, 0x72, 0x69, 0x6a, 0x61, 0x6e, 0x75, 0x61, 0x61, 0x72, 0x69, 0x70, 0x3b, 0x66, 0x65, 0x62, 0x72, 0x75, 0x61,
+0x61, 0x72, 0x69, 0x70, 0x3b, 0x6d, 0x61, 0x72, 0x73, 0x69, 0x70, 0x3b, 0x61, 0x70, 0x72, 0x69, 0x69, 0x6c, 0x69, 0x70,
+0x3b, 0x6d, 0x61, 0x61, 0x6a, 0x69, 0x70, 0x3b, 0x6a, 0x75, 0x75, 0x6e, 0x69, 0x70, 0x3b, 0x6a, 0x75, 0x75, 0x6c, 0x69,
+0x70, 0x3b, 0x61, 0x67, 0x67, 0x75, 0x73, 0x74, 0x69, 0x70, 0x3b, 0x73, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x61, 0x72,
+0x69, 0x70, 0x3b, 0x6f, 0x6b, 0x74, 0x6f, 0x62, 0x61, 0x72, 0x69, 0x70, 0x3b, 0x6e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x61,
+0x72, 0x69, 0x70, 0x3b, 0x64, 0x65, 0x63, 0x65, 0x6d, 0x62, 0x61, 0x72, 0x69, 0x70, 0x6a, 0x61, 0x6e, 0x3b, 0x66, 0x65,
+0x62, 0x72, 0x3b, 0x6d, 0x61, 0x72, 0x3b, 0x61, 0x70, 0x72, 0x3b, 0x6d, 0x61, 0x6a, 0x3b, 0x6a, 0x75, 0x6e, 0x3b, 0x6a,
+0x75, 0x6c, 0x3b, 0x61, 0x75, 0x67, 0x3b, 0x73, 0x65, 0x70, 0x74, 0x3b, 0x6f, 0x6b, 0x74, 0x3b, 0x6e, 0x6f, 0x76, 0x3b,
+0x64, 0x65, 0x63, 0xa9c, 0xabe, 0xaa8, 0xacd, 0xaaf, 0xac1, 0xa86, 0xab0, 0xac0, 0x3b, 0xaab, 0xac7, 0xaac, 0xacd, 0xab0, 0xac1, 0xa86,
+0xab0, 0xac0, 0x3b, 0xaae, 0xabe, 0xab0, 0xacd, 0xa9a, 0x3b, 0xa8f, 0xaaa, 0xacd, 0xab0, 0xabf, 0xab2, 0x3b, 0xaae, 0xac7, 0x3b, 0xa9c,
+0xac2, 0xaa8, 0x3b, 0xa9c, 0xac1, 0xab2, 0xabe, 0xa88, 0x3b, 0xa91, 0xa97, 0xab8, 0xacd, 0xa9f, 0x3b, 0xab8, 0xaaa, 0xacd, 0xa9f, 0xac7,
+0xaae, 0xacd, 0xaac, 0xab0, 0x3b, 0xa91, 0xa95, 0xacd, 0xa9f, 0xacb, 0xaac, 0xab0, 0x3b, 0xaa8, 0xab5, 0xac7, 0xaae, 0xacd, 0xaac, 0xab0,
+0x3b, 0xaa1, 0xabf, 0xab8, 0xac7, 0xaae, 0xacd, 0xaac, 0xab0, 0xa9c, 0xabe, 0xaa8, 0xacd, 0xaaf, 0xac1, 0x3b, 0xaab, 0xac7, 0xaac, 0xacd,
+0xab0, 0xac1, 0x3b, 0xaae, 0xabe, 0xab0, 0xacd, 0xa9a, 0x3b, 0xa8f, 0xaaa, 0xacd, 0xab0, 0xabf, 0xab2, 0x3b, 0xaae, 0xac7, 0x3b, 0xa9c,
+0xac2, 0xaa8, 0x3b, 0xa9c, 0xac1, 0xab2, 0xabe, 0xa88, 0x3b, 0xa91, 0xa97, 0xab8, 0xacd, 0xa9f, 0x3b, 0xab8, 0xaaa, 0xacd, 0xa9f, 0xac7,
+0x3b, 0xa91, 0xa95, 0xacd, 0xa9f, 0xacb, 0x3b, 0xaa8, 0xab5, 0xac7, 0x3b, 0xaa1, 0xabf, 0xab8, 0xac7, 0xa9c, 0xabe, 0x3b, 0xaab, 0xac7,
+0x3b, 0xaae, 0xabe, 0x3b, 0xa8f, 0x3b, 0xaae, 0xac7, 0x3b, 0xa9c, 0xac2, 0x3b, 0xa9c, 0xac1, 0x3b, 0xa91, 0x3b, 0xab8, 0x3b, 0xa91,
+0x3b, 0xaa8, 0x3b, 0xaa1, 0xabf, 0x4a, 0x61, 0x6e, 0x61, 0x69, 0x72, 0x75, 0x3b, 0x46, 0x61, 0x62, 0x75, 0x72, 0x61, 0x69,
+0x72, 0x75, 0x3b, 0x4d, 0x61, 0x72, 0x69, 0x73, 0x3b, 0x41, 0x66, 0x69, 0x72, 0x69, 0x6c, 0x75, 0x3b, 0x4d, 0x61, 0x79,
+0x75, 0x3b, 0x59, 0x75, 0x6e, 0x69, 0x3b, 0x59, 0x75, 0x6c, 0x69, 0x3b, 0x41, 0x67, 0x75, 0x73, 0x74, 0x61, 0x3b, 0x53,
+0x61, 0x74, 0x75, 0x6d, 0x62, 0x61, 0x3b, 0x4f, 0x6b, 0x74, 0x6f, 0x62, 0x61, 0x3b, 0x4e, 0x75, 0x77, 0x61, 0x6d, 0x62,
+0x61, 0x3b, 0x44, 0x69, 0x73, 0x61, 0x6d, 0x62, 0x61, 0x4a, 0x61, 0x6e, 0x3b, 0x46, 0x61, 0x62, 0x3b, 0x4d, 0x61, 0x72,
+0x3b, 0x41, 0x66, 0x69, 0x3b, 0x4d, 0x61, 0x79, 0x3b, 0x59, 0x75, 0x6e, 0x3b, 0x59, 0x75, 0x6c, 0x3b, 0x41, 0x67, 0x75,
+0x3b, 0x53, 0x61, 0x74, 0x3b, 0x4f, 0x6b, 0x74, 0x3b, 0x4e, 0x75, 0x77, 0x3b, 0x44, 0x69, 0x73, 0x4a, 0x3b, 0x46, 0x3b,
+0x4d, 0x3b, 0x41, 0x3b, 0x4d, 0x3b, 0x59, 0x3b, 0x59, 0x3b, 0x41, 0x3b, 0x53, 0x3b, 0x4f, 0x3b, 0x4e, 0x3b, 0x44, 0x5d9,
+0x5e0, 0x5d5, 0x5d0, 0x5e8, 0x3b, 0x5e4, 0x5d1, 0x5e8, 0x5d5, 0x5d0, 0x5e8, 0x3b, 0x5de, 0x5e8, 0x5e5, 0x3b, 0x5d0, 0x5e4, 0x5e8, 0x5d9,
+0x5dc, 0x3b, 0x5de, 0x5d0, 0x5d9, 0x3b, 0x5d9, 0x5d5, 0x5e0, 0x5d9, 0x3b, 0x5d9, 0x5d5, 0x5dc, 0x5d9, 0x3b, 0x5d0, 0x5d5, 0x5d2, 0x5d5,
+0x5e1, 0x5d8, 0x3b, 0x5e1, 0x5e4, 0x5d8, 0x5de, 0x5d1, 0x5e8, 0x3b, 0x5d0, 0x5d5, 0x5e7, 0x5d8, 0x5d5, 0x5d1, 0x5e8, 0x3b, 0x5e0, 0x5d5,
+0x5d1, 0x5de, 0x5d1, 0x5e8, 0x3b, 0x5d3, 0x5e6, 0x5de, 0x5d1, 0x5e8, 0x5d9, 0x5e0, 0x5d5, 0x5f3, 0x3b, 0x5e4, 0x5d1, 0x5e8, 0x5f3, 0x3b,
+0x5de, 0x5e8, 0x5e5, 0x3b, 0x5d0, 0x5e4, 0x5e8, 0x5f3, 0x3b, 0x5de, 0x5d0, 0x5d9, 0x3b, 0x5d9, 0x5d5, 0x5e0, 0x5d9, 0x3b, 0x5d9, 0x5d5,
+0x5dc, 0x5d9, 0x3b, 0x5d0, 0x5d5, 0x5d2, 0x5f3, 0x3b, 0x5e1, 0x5e4, 0x5d8, 0x5f3, 0x3b, 0x5d0, 0x5d5, 0x5e7, 0x5f3, 0x3b, 0x5e0, 0x5d5,
+0x5d1, 0x5f3, 0x3b, 0x5d3, 0x5e6, 0x5de, 0x5f3, 0x91c, 0x928, 0x935, 0x930, 0x940, 0x3b, 0x92b, 0x93c, 0x930, 0x935, 0x930, 0x940, 0x3b,
+0x92e, 0x93e, 0x930, 0x94d, 0x91a, 0x3b, 0x905, 0x92a, 0x94d, 0x930, 0x948, 0x932, 0x3b, 0x92e, 0x908, 0x3b, 0x91c, 0x942, 0x928, 0x3b,
+0x91c, 0x941, 0x932, 0x93e, 0x908, 0x3b, 0x905, 0x917, 0x938, 0x94d, 0x924, 0x3b, 0x938, 0x93f, 0x924, 0x902, 0x92c, 0x930, 0x3b, 0x905,
+0x915, 0x94d, 0x924, 0x942, 0x92c, 0x930, 0x3b, 0x928, 0x935, 0x902, 0x92c, 0x930, 0x3b, 0x926, 0x93f, 0x938, 0x902, 0x92c, 0x930, 0x91c,
+0x928, 0x970, 0x3b, 0x92b, 0x93c, 0x930, 0x970, 0x3b, 0x92e, 0x93e, 0x930, 0x94d, 0x91a, 0x3b, 0x905, 0x92a, 0x94d, 0x930, 0x948, 0x932,
+0x3b, 0x92e, 0x908, 0x3b, 0x91c, 0x942, 0x928, 0x3b, 0x91c, 0x941, 0x932, 0x970, 0x3b, 0x905, 0x917, 0x970, 0x3b, 0x938, 0x93f, 0x924,
+0x970, 0x3b, 0x905, 0x915, 0x94d, 0x924, 0x942, 0x970, 0x3b, 0x928, 0x935, 0x970, 0x3b, 0x926, 0x93f, 0x938, 0x970, 0x91c, 0x3b, 0x92b,
+0x93c, 0x3b, 0x92e, 0x93e, 0x3b, 0x905, 0x3b, 0x92e, 0x3b, 0x91c, 0x942, 0x3b, 0x91c, 0x941, 0x3b, 0x905, 0x3b, 0x938, 0x93f, 0x3b,
+0x905, 0x3b, 0x928, 0x3b, 0x926, 0x93f, 0x6a, 0x61, 0x6e, 0x75, 0xe1, 0x72, 0x3b, 0x66, 0x65, 0x62, 0x72, 0x75, 0xe1, 0x72,
+0x3b, 0x6d, 0xe1, 0x72, 0x63, 0x69, 0x75, 0x73, 0x3b, 0xe1, 0x70, 0x72, 0x69, 0x6c, 0x69, 0x73, 0x3b, 0x6d, 0xe1, 0x6a,
+0x75, 0x73, 0x3b, 0x6a, 0xfa, 0x6e, 0x69, 0x75, 0x73, 0x3b, 0x6a, 0xfa, 0x6c, 0x69, 0x75, 0x73, 0x3b, 0x61, 0x75, 0x67,
+0x75, 0x73, 0x7a, 0x74, 0x75, 0x73, 0x3b, 0x73, 0x7a, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x6f, 0x6b,
+0x74, 0xf3, 0x62, 0x65, 0x72, 0x3b, 0x6e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x64, 0x65, 0x63, 0x65, 0x6d,
+0x62, 0x65, 0x72, 0x6a, 0x61, 0x6e, 0x2e, 0x3b, 0x66, 0x65, 0x62, 0x72, 0x2e, 0x3b, 0x6d, 0xe1, 0x72, 0x63, 0x2e, 0x3b,
+0xe1, 0x70, 0x72, 0x2e, 0x3b, 0x6d, 0xe1, 0x6a, 0x2e, 0x3b, 0x6a, 0xfa, 0x6e, 0x2e, 0x3b, 0x6a, 0xfa, 0x6c, 0x2e, 0x3b,
+0x61, 0x75, 0x67, 0x2e, 0x3b, 0x73, 0x7a, 0x65, 0x70, 0x74, 0x2e, 0x3b, 0x6f, 0x6b, 0x74, 0x2e, 0x3b, 0x6e, 0x6f, 0x76,
+0x2e, 0x3b, 0x64, 0x65, 0x63, 0x2e, 0x4a, 0x3b, 0x46, 0x3b, 0x4d, 0x3b, 0xc1, 0x3b, 0x4d, 0x3b, 0x4a, 0x3b, 0x4a, 0x3b,
+0x41, 0x3b, 0x53, 0x7a, 0x3b, 0x4f, 0x3b, 0x4e, 0x3b, 0x44, 0x6a, 0x61, 0x6e, 0xfa, 0x61, 0x72, 0x3b, 0x66, 0x65, 0x62,
+0x72, 0xfa, 0x61, 0x72, 0x3b, 0x6d, 0x61, 0x72, 0x73, 0x3b, 0x61, 0x70, 0x72, 0xed, 0x6c, 0x3b, 0x6d, 0x61, 0xed, 0x3b,
+0x6a, 0xfa, 0x6e, 0xed, 0x3b, 0x6a, 0xfa, 0x6c, 0xed, 0x3b, 0xe1, 0x67, 0xfa, 0x73, 0x74, 0x3b, 0x73, 0x65, 0x70, 0x74,
+0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x6f, 0x6b, 0x74, 0xf3, 0x62, 0x65, 0x72, 0x3b, 0x6e, 0xf3, 0x76, 0x65, 0x6d, 0x62,
+0x65, 0x72, 0x3b, 0x64, 0x65, 0x73, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x6a, 0x61, 0x6e, 0x2e, 0x3b, 0x66, 0x65, 0x62, 0x2e,
+0x3b, 0x6d, 0x61, 0x72, 0x2e, 0x3b, 0x61, 0x70, 0x72, 0x2e, 0x3b, 0x6d, 0x61, 0xed, 0x3b, 0x6a, 0xfa, 0x6e, 0x2e, 0x3b,
+0x6a, 0xfa, 0x6c, 0x2e, 0x3b, 0xe1, 0x67, 0xfa, 0x2e, 0x3b, 0x73, 0x65, 0x70, 0x2e, 0x3b, 0x6f, 0x6b, 0x74, 0x2e, 0x3b,
+0x6e, 0xf3, 0x76, 0x2e, 0x3b, 0x64, 0x65, 0x73, 0x2e, 0x4a, 0x3b, 0x46, 0x3b, 0x4d, 0x3b, 0x41, 0x3b, 0x4d, 0x3b, 0x4a,
+0x3b, 0x4a, 0x3b, 0xc1, 0x3b, 0x53, 0x3b, 0x4f, 0x3b, 0x4e, 0x3b, 0x44, 0x4a, 0x61, 0x6e, 0x75, 0x61, 0x72, 0x69, 0x3b,
+0x46, 0x65, 0x62, 0x72, 0x75, 0x61, 0x72, 0x69, 0x3b, 0x4d, 0x61, 0x72, 0x65, 0x74, 0x3b, 0x41, 0x70, 0x72, 0x69, 0x6c,
+0x3b, 0x4d, 0x65, 0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x69, 0x3b, 0x4a, 0x75, 0x6c, 0x69, 0x3b, 0x41, 0x67, 0x75, 0x73, 0x74,
+0x75, 0x73, 0x3b, 0x53, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x4f, 0x6b, 0x74, 0x6f, 0x62, 0x65, 0x72,
+0x3b, 0x4e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x44, 0x65, 0x73, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x4a, 0x61,
+0x6e, 0x3b, 0x46, 0x65, 0x62, 0x3b, 0x4d, 0x61, 0x72, 0x3b, 0x41, 0x70, 0x72, 0x3b, 0x4d, 0x65, 0x69, 0x3b, 0x4a, 0x75,
+0x6e, 0x3b, 0x4a, 0x75, 0x6c, 0x3b, 0x41, 0x67, 0x75, 0x3b, 0x53, 0x65, 0x70, 0x3b, 0x4f, 0x6b, 0x74, 0x3b, 0x4e, 0x6f,
+0x76, 0x3b, 0x44, 0x65, 0x73, 0x6a, 0x61, 0x6e, 0x75, 0x61, 0x72, 0x69, 0x6f, 0x3b, 0x66, 0x65, 0x62, 0x72, 0x75, 0x61,
+0x72, 0x69, 0x6f, 0x3b, 0x6d, 0x61, 0x72, 0x74, 0x69, 0x6f, 0x3b, 0x61, 0x70, 0x72, 0x69, 0x6c, 0x3b, 0x6d, 0x61, 0x69,
+0x6f, 0x3b, 0x6a, 0x75, 0x6e, 0x69, 0x6f, 0x3b, 0x6a, 0x75, 0x6c, 0x69, 0x6f, 0x3b, 0x61, 0x75, 0x67, 0x75, 0x73, 0x74,
+0x6f, 0x3b, 0x73, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x72, 0x65, 0x3b, 0x6f, 0x63, 0x74, 0x6f, 0x62, 0x72, 0x65, 0x3b,
+0x6e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x72, 0x65, 0x3b, 0x64, 0x65, 0x63, 0x65, 0x6d, 0x62, 0x72, 0x65, 0x6a, 0x61, 0x6e,
+0x3b, 0x66, 0x65, 0x62, 0x3b, 0x6d, 0x61, 0x72, 0x3b, 0x61, 0x70, 0x72, 0x3b, 0x6d, 0x61, 0x69, 0x3b, 0x6a, 0x75, 0x6e,
+0x3b, 0x6a, 0x75, 0x6c, 0x3b, 0x61, 0x75, 0x67, 0x3b, 0x73, 0x65, 0x70, 0x3b, 0x6f, 0x63, 0x74, 0x3b, 0x6e, 0x6f, 0x76,
+0x3b, 0x64, 0x65, 0x63, 0x6a, 0x3b, 0x66, 0x3b, 0x6d, 0x3b, 0x61, 0x3b, 0x6d, 0x3b, 0x6a, 0x3b, 0x6a, 0x3b, 0x61, 0x3b,
+0x73, 0x3b, 0x6f, 0x3b, 0x6e, 0x3b, 0x64, 0x45, 0x61, 0x6e, 0xe1, 0x69, 0x72, 0x3b, 0x46, 0x65, 0x61, 0x62, 0x68, 0x72,
+0x61, 0x3b, 0x4d, 0xe1, 0x72, 0x74, 0x61, 0x3b, 0x41, 0x69, 0x62, 0x72, 0x65, 0xe1, 0x6e, 0x3b, 0x42, 0x65, 0x61, 0x6c,
+0x74, 0x61, 0x69, 0x6e, 0x65, 0x3b, 0x4d, 0x65, 0x69, 0x74, 0x68, 0x65, 0x61, 0x6d, 0x68, 0x3b, 0x49, 0xfa, 0x69, 0x6c,
+0x3b, 0x4c, 0xfa, 0x6e, 0x61, 0x73, 0x61, 0x3b, 0x4d, 0x65, 0xe1, 0x6e, 0x20, 0x46, 0xf3, 0x6d, 0x68, 0x61, 0x69, 0x72,
+0x3b, 0x44, 0x65, 0x69, 0x72, 0x65, 0x61, 0x64, 0x68, 0x20, 0x46, 0xf3, 0x6d, 0x68, 0x61, 0x69, 0x72, 0x3b, 0x53, 0x61,
+0x6d, 0x68, 0x61, 0x69, 0x6e, 0x3b, 0x4e, 0x6f, 0x6c, 0x6c, 0x61, 0x69, 0x67, 0x45, 0x61, 0x6e, 0x3b, 0x46, 0x65, 0x61,
+0x62, 0x68, 0x3b, 0x4d, 0xe1, 0x72, 0x74, 0x61, 0x3b, 0x41, 0x69, 0x62, 0x3b, 0x42, 0x65, 0x61, 0x6c, 0x3b, 0x4d, 0x65,
+0x69, 0x74, 0x68, 0x3b, 0x49, 0xfa, 0x69, 0x6c, 0x3b, 0x4c, 0xfa, 0x6e, 0x3b, 0x4d, 0x46, 0xf3, 0x6d, 0x68, 0x3b, 0x44,
+0x46, 0xf3, 0x6d, 0x68, 0x3b, 0x53, 0x61, 0x6d, 0x68, 0x3b, 0x4e, 0x6f, 0x6c, 0x6c, 0x45, 0x3b, 0x46, 0x3b, 0x4d, 0x3b,
+0x41, 0x3b, 0x42, 0x3b, 0x4d, 0x3b, 0x49, 0x3b, 0x4c, 0x3b, 0x4d, 0x3b, 0x44, 0x3b, 0x53, 0x3b, 0x4e, 0x67, 0x65, 0x6e,
+0x6e, 0x61, 0x69, 0x6f, 0x3b, 0x66, 0x65, 0x62, 0x62, 0x72, 0x61, 0x69, 0x6f, 0x3b, 0x6d, 0x61, 0x72, 0x7a, 0x6f, 0x3b,
+0x61, 0x70, 0x72, 0x69, 0x6c, 0x65, 0x3b, 0x6d, 0x61, 0x67, 0x67, 0x69, 0x6f, 0x3b, 0x67, 0x69, 0x75, 0x67, 0x6e, 0x6f,
+0x3b, 0x6c, 0x75, 0x67, 0x6c, 0x69, 0x6f, 0x3b, 0x61, 0x67, 0x6f, 0x73, 0x74, 0x6f, 0x3b, 0x73, 0x65, 0x74, 0x74, 0x65,
+0x6d, 0x62, 0x72, 0x65, 0x3b, 0x6f, 0x74, 0x74, 0x6f, 0x62, 0x72, 0x65, 0x3b, 0x6e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x72,
+0x65, 0x3b, 0x64, 0x69, 0x63, 0x65, 0x6d, 0x62, 0x72, 0x65, 0x67, 0x65, 0x6e, 0x3b, 0x66, 0x65, 0x62, 0x3b, 0x6d, 0x61,
+0x72, 0x3b, 0x61, 0x70, 0x72, 0x3b, 0x6d, 0x61, 0x67, 0x3b, 0x67, 0x69, 0x75, 0x3b, 0x6c, 0x75, 0x67, 0x3b, 0x61, 0x67,
+0x6f, 0x3b, 0x73, 0x65, 0x74, 0x3b, 0x6f, 0x74, 0x74, 0x3b, 0x6e, 0x6f, 0x76, 0x3b, 0x64, 0x69, 0x63, 0x47, 0x3b, 0x46,
+0x3b, 0x4d, 0x3b, 0x41, 0x3b, 0x4d, 0x3b, 0x47, 0x3b, 0x4c, 0x3b, 0x41, 0x3b, 0x53, 0x3b, 0x4f, 0x3b, 0x4e, 0x3b, 0x44,
+0x4a, 0x61, 0x6e, 0x3b, 0x46, 0x65, 0x62, 0x3b, 0x4d, 0x61, 0x72, 0x3b, 0x41, 0x70, 0x72, 0x3b, 0x4d, 0x65, 0x69, 0x3b,
+0x4a, 0x75, 0x6e, 0x3b, 0x4a, 0x75, 0x6c, 0x3b, 0x41, 0x67, 0x74, 0x3b, 0x53, 0x65, 0x70, 0x3b, 0x4f, 0x6b, 0x74, 0x3b,
+0x4e, 0x6f, 0x76, 0x3b, 0x44, 0x65, 0x73, 0xc9c, 0xca8, 0xcb5, 0xcb0, 0xcbf, 0x3b, 0xcab, 0xcc6, 0xcac, 0xccd, 0xcb0, 0xcb5, 0xcb0,
+0xcbf, 0x3b, 0xcae, 0xcbe, 0xcb0, 0xccd, 0xc9a, 0xccd, 0x3b, 0xc8f, 0xcaa, 0xccd, 0xcb0, 0xcbf, 0xcb2, 0xccd, 0x3b, 0xcae, 0xcc7, 0x3b,
+0xc9c, 0xcc2, 0xca8, 0xccd, 0x3b, 0xc9c, 0xcc1, 0xcb2, 0xcc8, 0x3b, 0xc86, 0xc97, 0xcb8, 0xccd, 0xc9f, 0xccd, 0x3b, 0xcb8, 0xcc6, 0xcaa,
+0xccd, 0xc9f, 0xcc6, 0xc82, 0xcac, 0xcb0, 0xccd, 0x3b, 0xc85, 0xc95, 0xccd, 0xc9f, 0xccb, 0xcac, 0xcb0, 0xccd, 0x3b, 0xca8, 0xcb5, 0xcc6,
+0xc82, 0xcac, 0xcb0, 0xccd, 0x3b, 0xca1, 0xcbf, 0xcb8, 0xcc6, 0xc82, 0xcac, 0xcb0, 0xccd, 0xc9c, 0xca8, 0x3b, 0xcab, 0xcc6, 0xcac, 0xccd,
+0xcb0, 0x3b, 0xcae, 0xcbe, 0xcb0, 0xccd, 0xc9a, 0xccd, 0x3b, 0xc8f, 0xcaa, 0xccd, 0xcb0, 0xcbf, 0x3b, 0xcae, 0xcc7, 0x3b, 0xc9c, 0xcc2,
+0xca8, 0xccd, 0x3b, 0xc9c, 0xcc1, 0xcb2, 0xcc8, 0x3b, 0xc86, 0xc97, 0x3b, 0xcb8, 0xcc6, 0xcaa, 0xccd, 0xc9f, 0xcc6, 0xc82, 0x3b, 0xc85,
+0xc95, 0xccd, 0xc9f, 0xccb, 0x3b, 0xca8, 0xcb5, 0xcc6, 0xc82, 0x3b, 0xca1, 0xcbf, 0xcb8, 0xcc6, 0xc82, 0xc9c, 0xca8, 0xcb5, 0xcb0, 0xcbf,
+0x3b, 0xcab, 0xcc6, 0xcac, 0xccd, 0xcb0, 0xcb5, 0xcb0, 0xcbf, 0x3b, 0xcae, 0xcbe, 0xcb0, 0xccd, 0xc9a, 0xccd, 0x3b, 0xc8f, 0xcaa, 0xccd,
+0xcb0, 0xcbf, 0x3b, 0xcae, 0xcc7, 0x3b, 0xc9c, 0xcc2, 0xca8, 0xccd, 0x3b, 0xc9c, 0xcc1, 0xcb2, 0xcc8, 0x3b, 0xc86, 0xc97, 0x3b, 0xcb8,
+0xcc6, 0xcaa, 0xccd, 0xc9f, 0xcc6, 0xc82, 0x3b, 0xc85, 0xc95, 0xccd, 0xc9f, 0xccb, 0x3b, 0xca8, 0xcb5, 0xcc6, 0xc82, 0x3b, 0xca1, 0xcbf,
+0xcb8, 0xcc6, 0xc82, 0xc9c, 0x3b, 0xcab, 0xcc6, 0x3b, 0xcae, 0xcbe, 0x3b, 0xc8f, 0x3b, 0xcae, 0xcc7, 0x3b, 0xc9c, 0xcc2, 0x3b, 0xc9c,
+0xcc1, 0x3b, 0xc86, 0x3b, 0xcb8, 0xcc6, 0x3b, 0xc85, 0x3b, 0xca8, 0x3b, 0xca1, 0xcbf, 0x62c, 0x646, 0x624, 0x631, 0x6cc, 0x3b, 0x641,
+0x631, 0x624, 0x631, 0x6cc, 0x3b, 0x645, 0x627, 0x631, 0x655, 0x686, 0x3b, 0x627, 0x67e, 0x631, 0x6cc, 0x644, 0x3b, 0x645, 0x6cc, 0x654,
+0x3b, 0x62c, 0x648, 0x657, 0x646, 0x3b, 0x62c, 0x648, 0x657, 0x644, 0x627, 0x6cc, 0x6cc, 0x3b, 0x627, 0x6af, 0x633, 0x62a, 0x3b, 0x633,
+0x62a, 0x645, 0x628, 0x631, 0x3b, 0x627, 0x6a9, 0x62a, 0x648, 0x657, 0x628, 0x631, 0x3b, 0x646, 0x648, 0x645, 0x628, 0x631, 0x3b, 0x62f,
+0x633, 0x645, 0x628, 0x631, 0x62c, 0x3b, 0x641, 0x3b, 0x645, 0x3b, 0x627, 0x3b, 0x645, 0x3b, 0x62c, 0x3b, 0x62c, 0x3b, 0x627, 0x3b,
+0x633, 0x3b, 0x633, 0x3b, 0x627, 0x3b, 0x646, 0x49a, 0x430, 0x4a3, 0x442, 0x430, 0x440, 0x3b, 0x410, 0x49b, 0x43f, 0x430, 0x43d, 0x3b,
+0x41d, 0x430, 0x443, 0x440, 0x44b, 0x437, 0x3b, 0x421, 0x4d9, 0x443, 0x456, 0x440, 0x3b, 0x41c, 0x430, 0x43c, 0x44b, 0x440, 0x3b, 0x41c,
+0x430, 0x443, 0x441, 0x44b, 0x43c, 0x3b, 0x428, 0x456, 0x43b, 0x434, 0x435, 0x3b, 0x422, 0x430, 0x43c, 0x44b, 0x437, 0x3b, 0x49a, 0x44b,
+0x440, 0x43a, 0x4af, 0x439, 0x435, 0x43a, 0x3b, 0x49a, 0x430, 0x437, 0x430, 0x43d, 0x3b, 0x49a, 0x430, 0x440, 0x430, 0x448, 0x430, 0x3b,
+0x416, 0x435, 0x43b, 0x442, 0x43e, 0x49b, 0x441, 0x430, 0x43d, 0x49b, 0x430, 0x4a3, 0x442, 0x430, 0x440, 0x3b, 0x430, 0x49b, 0x43f, 0x430,
+0x43d, 0x3b, 0x43d, 0x430, 0x443, 0x440, 0x44b, 0x437, 0x3b, 0x441, 0x4d9, 0x443, 0x456, 0x440, 0x3b, 0x43c, 0x430, 0x43c, 0x44b, 0x440,
+0x3b, 0x43c, 0x430, 0x443, 0x441, 0x44b, 0x43c, 0x3b, 0x448, 0x456, 0x43b, 0x434, 0x435, 0x3b, 0x442, 0x430, 0x43c, 0x44b, 0x437, 0x3b,
+0x49b, 0x44b, 0x440, 0x43a, 0x4af, 0x439, 0x435, 0x43a, 0x3b, 0x49b, 0x430, 0x437, 0x430, 0x43d, 0x3b, 0x49b, 0x430, 0x440, 0x430, 0x448,
+0x430, 0x3b, 0x436, 0x435, 0x43b, 0x442, 0x43e, 0x49b, 0x441, 0x430, 0x43d, 0x49b, 0x430, 0x4a3, 0x2e, 0x3b, 0x430, 0x49b, 0x43f, 0x2e,
+0x3b, 0x43d, 0x430, 0x443, 0x2e, 0x3b, 0x441, 0x4d9, 0x443, 0x2e, 0x3b, 0x43c, 0x430, 0x43c, 0x2e, 0x3b, 0x43c, 0x430, 0x443, 0x2e,
+0x3b, 0x448, 0x456, 0x43b, 0x2e, 0x3b, 0x442, 0x430, 0x43c, 0x2e, 0x3b, 0x49b, 0x44b, 0x440, 0x2e, 0x3b, 0x49b, 0x430, 0x437, 0x2e,
+0x3b, 0x49b, 0x430, 0x440, 0x2e, 0x3b, 0x436, 0x435, 0x43b, 0x2e, 0x49a, 0x3b, 0x410, 0x3b, 0x41d, 0x3b, 0x421, 0x3b, 0x41c, 0x3b,
+0x41c, 0x3b, 0x428, 0x3b, 0x422, 0x3b, 0x49a, 0x3b, 0x49a, 0x3b, 0x49a, 0x3b, 0x416, 0x4d, 0x75, 0x74, 0x61, 0x72, 0x61, 0x6d,
+0x61, 0x3b, 0x47, 0x61, 0x73, 0x68, 0x79, 0x61, 0x6e, 0x74, 0x61, 0x72, 0x65, 0x3b, 0x57, 0x65, 0x72, 0x75, 0x72, 0x77,
+0x65, 0x3b, 0x4d, 0x61, 0x74, 0x61, 0x3b, 0x47, 0x69, 0x63, 0x75, 0x72, 0x61, 0x6e, 0x73, 0x69, 0x3b, 0x4b, 0x61, 0x6d,
+0x65, 0x6e, 0x61, 0x3b, 0x4e, 0x79, 0x61, 0x6b, 0x61, 0x6e, 0x67, 0x61, 0x3b, 0x4b, 0x61, 0x6e, 0x61, 0x6d, 0x61, 0x3b,
+0x4e, 0x7a, 0x65, 0x6c, 0x69, 0x3b, 0x55, 0x6b, 0x77, 0x61, 0x6b, 0x69, 0x72, 0x61, 0x3b, 0x55, 0x67, 0x75, 0x73, 0x68,
+0x79, 0x69, 0x6e, 0x67, 0x6f, 0x3b, 0x55, 0x6b, 0x75, 0x62, 0x6f, 0x7a, 0x61, 0x6d, 0x75, 0x74, 0x2e, 0x3b, 0x67, 0x61,
+0x73, 0x2e, 0x3b, 0x77, 0x65, 0x72, 0x2e, 0x3b, 0x6d, 0x61, 0x74, 0x2e, 0x3b, 0x67, 0x69, 0x63, 0x2e, 0x3b, 0x6b, 0x61,
+0x6d, 0x2e, 0x3b, 0x6e, 0x79, 0x61, 0x2e, 0x3b, 0x6b, 0x61, 0x6e, 0x2e, 0x3b, 0x6e, 0x7a, 0x65, 0x2e, 0x3b, 0x75, 0x6b,
+0x77, 0x2e, 0x3b, 0x75, 0x67, 0x75, 0x2e, 0x3b, 0x75, 0x6b, 0x75, 0x2e, 0x42f, 0x43d, 0x432, 0x430, 0x440, 0x44c, 0x3b, 0x424,
+0x435, 0x432, 0x440, 0x430, 0x43b, 0x44c, 0x3b, 0x41c, 0x430, 0x440, 0x442, 0x3b, 0x410, 0x43f, 0x440, 0x435, 0x43b, 0x44c, 0x3b, 0x41c,
+0x430, 0x439, 0x3b, 0x418, 0x44e, 0x43d, 0x44c, 0x3b, 0x418, 0x44e, 0x43b, 0x44c, 0x3b, 0x410, 0x432, 0x433, 0x443, 0x441, 0x442, 0x3b,
+0x421, 0x435, 0x43d, 0x442, 0x44f, 0x431, 0x440, 0x44c, 0x3b, 0x41e, 0x43a, 0x442, 0x44f, 0x431, 0x440, 0x44c, 0x3b, 0x41d, 0x43e, 0x44f,
+0x431, 0x440, 0x44c, 0x3b, 0x414, 0x435, 0x43a, 0x430, 0x431, 0x440, 0x44c, 0x44f, 0x43d, 0x432, 0x430, 0x440, 0x44c, 0x3b, 0x444, 0x435,
+0x432, 0x440, 0x430, 0x43b, 0x44c, 0x3b, 0x43c, 0x430, 0x440, 0x442, 0x3b, 0x430, 0x43f, 0x440, 0x435, 0x43b, 0x44c, 0x3b, 0x43c, 0x430,
+0x439, 0x3b, 0x438, 0x44e, 0x43d, 0x44c, 0x3b, 0x438, 0x44e, 0x43b, 0x44c, 0x3b, 0x430, 0x432, 0x433, 0x443, 0x441, 0x442, 0x3b, 0x441,
+0x435, 0x43d, 0x442, 0x44f, 0x431, 0x440, 0x44c, 0x3b, 0x43e, 0x43a, 0x442, 0x44f, 0x431, 0x440, 0x44c, 0x3b, 0x43d, 0x43e, 0x44f, 0x431,
+0x440, 0x44c, 0x3b, 0x434, 0x435, 0x43a, 0x430, 0x431, 0x440, 0x44c, 0x42f, 0x43d, 0x432, 0x3b, 0x424, 0x435, 0x432, 0x3b, 0x41c, 0x430,
+0x440, 0x3b, 0x410, 0x43f, 0x440, 0x3b, 0x41c, 0x430, 0x439, 0x3b, 0x418, 0x44e, 0x43d, 0x3b, 0x418, 0x44e, 0x43b, 0x3b, 0x410, 0x432,
+0x433, 0x3b, 0x421, 0x435, 0x43d, 0x3b, 0x41e, 0x43a, 0x442, 0x3b, 0x41d, 0x43e, 0x44f, 0x3b, 0x414, 0x435, 0x43a, 0x44f, 0x43d, 0x432,
+0x2e, 0x3b, 0x444, 0x435, 0x432, 0x2e, 0x3b, 0x43c, 0x430, 0x440, 0x2e, 0x3b, 0x430, 0x43f, 0x440, 0x2e, 0x3b, 0x43c, 0x430, 0x439,
+0x3b, 0x438, 0x44e, 0x43d, 0x2e, 0x3b, 0x438, 0x44e, 0x43b, 0x2e, 0x3b, 0x430, 0x432, 0x433, 0x2e, 0x3b, 0x441, 0x435, 0x43d, 0x2e,
+0x3b, 0x43e, 0x43a, 0x442, 0x2e, 0x3b, 0x43d, 0x43e, 0x44f, 0x2e, 0x3b, 0x434, 0x435, 0x43a, 0x2e, 0x42f, 0x3b, 0x424, 0x3b, 0x41c,
+0x3b, 0x410, 0x3b, 0x41c, 0x3b, 0x418, 0x3b, 0x418, 0x3b, 0x410, 0x3b, 0x421, 0x3b, 0x41e, 0x3b, 0x41d, 0x3b, 0x414, 0x31, 0xc6d4,
+0x3b, 0x32, 0xc6d4, 0x3b, 0x33, 0xc6d4, 0x3b, 0x34, 0xc6d4, 0x3b, 0x35, 0xc6d4, 0x3b, 0x36, 0xc6d4, 0x3b, 0x37, 0xc6d4, 0x3b, 0x38,
+0xc6d4, 0x3b, 0x39, 0xc6d4, 0x3b, 0x31, 0x30, 0xc6d4, 0x3b, 0x31, 0x31, 0xc6d4, 0x3b, 0x31, 0x32, 0xc6d4, 0x72, 0xea, 0x62, 0x65,
+0x6e, 0x64, 0x61, 0x6e, 0x3b, 0x72, 0x65, 0x15f, 0x65, 0x6d, 0xee, 0x3b, 0x61, 0x64, 0x61, 0x72, 0x3b, 0x61, 0x76, 0x72,
+0xea, 0x6c, 0x3b, 0x67, 0x75, 0x6c, 0x61, 0x6e, 0x3b, 0x70, 0xfb, 0x15f, 0x70, 0x65, 0x72, 0x3b, 0x74, 0xee, 0x72, 0x6d,
+0x65, 0x68, 0x3b, 0x67, 0x65, 0x6c, 0x61, 0x77, 0xea, 0x6a, 0x3b, 0x72, 0x65, 0x7a, 0x62, 0x65, 0x72, 0x3b, 0x6b, 0x65,
+0x77, 0xe7, 0xea, 0x72, 0x3b, 0x73, 0x65, 0x72, 0x6d, 0x61, 0x77, 0x65, 0x7a, 0x3b, 0x62, 0x65, 0x72, 0x66, 0x61, 0x6e,
+0x62, 0x61, 0x72, 0x72, 0xea, 0x62, 0x65, 0x6e, 0x64, 0x61, 0x6e, 0xea, 0x3b, 0x72, 0x65, 0x15f, 0x65, 0x6d, 0x69, 0x79,
+0xea, 0x3b, 0x61, 0x64, 0x61, 0x72, 0xea, 0x3b, 0x61, 0x76, 0x72, 0xea, 0x6c, 0xea, 0x3b, 0x67, 0x75, 0x6c, 0x61, 0x6e,
+0xea, 0x3b, 0x70, 0xfb, 0x15f, 0x70, 0x65, 0x72, 0xea, 0x3b, 0x74, 0xee, 0x72, 0x6d, 0x65, 0x68, 0xea, 0x3b, 0x67, 0x65,
+0x6c, 0x61, 0x77, 0xea, 0x6a, 0xea, 0x3b, 0x72, 0x65, 0x7a, 0x62, 0x65, 0x72, 0xea, 0x3b, 0x6b, 0x65, 0x77, 0xe7, 0xea,
+0x72, 0xea, 0x3b, 0x73, 0x65, 0x72, 0x6d, 0x61, 0x77, 0x65, 0x7a, 0xea, 0x3b, 0x62, 0x65, 0x72, 0x66, 0x61, 0x6e, 0x62,
+0x61, 0x72, 0xea, 0x72, 0xea, 0x62, 0x3b, 0x72, 0x65, 0x15f, 0x3b, 0x61, 0x64, 0x61, 0x3b, 0x61, 0x76, 0x72, 0x3b, 0x67,
+0x75, 0x6c, 0x3b, 0x70, 0xfb, 0x15f, 0x3b, 0x74, 0xee, 0x72, 0x3b, 0x67, 0x65, 0x6c, 0x3b, 0x72, 0x65, 0x7a, 0x3b, 0x6b,
+0x65, 0x77, 0x3b, 0x73, 0x65, 0x72, 0x3b, 0x62, 0x65, 0x72, 0x52, 0x3b, 0x52, 0x3b, 0x41, 0x3b, 0x41, 0x3b, 0x47, 0x3b,
+0x50, 0x3b, 0x54, 0x3b, 0x47, 0x3b, 0x52, 0x3b, 0x4b, 0x3b, 0x53, 0x3b, 0x42, 0x4e, 0x7a, 0x65, 0x72, 0x6f, 0x3b, 0x52,
+0x75, 0x68, 0x75, 0x68, 0x75, 0x6d, 0x61, 0x3b, 0x4e, 0x74, 0x77, 0x61, 0x72, 0x61, 0x6e, 0x74, 0x65, 0x3b, 0x4e, 0x64,
+0x61, 0x6d, 0x75, 0x6b, 0x69, 0x7a, 0x61, 0x3b, 0x52, 0x75, 0x73, 0x61, 0x6d, 0x61, 0x3b, 0x52, 0x75, 0x68, 0x65, 0x73,
+0x68, 0x69, 0x3b, 0x4d, 0x75, 0x6b, 0x61, 0x6b, 0x61, 0x72, 0x6f, 0x3b, 0x4e, 0x79, 0x61, 0x6e, 0x64, 0x61, 0x67, 0x61,
+0x72, 0x6f, 0x3b, 0x4e, 0x79, 0x61, 0x6b, 0x61, 0x6e, 0x67, 0x61, 0x3b, 0x47, 0x69, 0x74, 0x75, 0x67, 0x75, 0x74, 0x75,
+0x3b, 0x4d, 0x75, 0x6e, 0x79, 0x6f, 0x6e, 0x79, 0x6f, 0x3b, 0x4b, 0x69, 0x67, 0x61, 0x72, 0x61, 0x6d, 0x61, 0x4d, 0x75,
+0x74, 0x2e, 0x3b, 0x47, 0x61, 0x73, 0x2e, 0x3b, 0x57, 0x65, 0x72, 0x2e, 0x3b, 0x4d, 0x61, 0x74, 0x2e, 0x3b, 0x47, 0x69,
+0x63, 0x2e, 0x3b, 0x4b, 0x61, 0x6d, 0x2e, 0x3b, 0x4e, 0x79, 0x61, 0x2e, 0x3b, 0x4b, 0x61, 0x6e, 0x2e, 0x3b, 0x4e, 0x7a,
+0x65, 0x2e, 0x3b, 0x55, 0x6b, 0x77, 0x2e, 0x3b, 0x55, 0x67, 0x75, 0x2e, 0x3b, 0x55, 0x6b, 0x75, 0x2e, 0xea1, 0xeb1, 0xe87,
+0xe81, 0xead, 0xe99, 0x3b, 0xe81, 0xeb8, 0xea1, 0xe9e, 0xeb2, 0x3b, 0xea1, 0xeb5, 0xe99, 0xeb2, 0x3b, 0xec0, 0xea1, 0xeaa, 0xeb2, 0x3b,
+0xe9e, 0xeb6, 0xe94, 0xeaa, 0xeb0, 0xe9e, 0xeb2, 0x3b, 0xea1, 0xeb4, 0xe96, 0xeb8, 0xe99, 0xeb2, 0x3b, 0xe81, 0xecd, 0xea5, 0xeb0, 0xe81,
+0xebb, 0xe94, 0x3b, 0xeaa, 0xeb4, 0xe87, 0xeab, 0xeb2, 0x3b, 0xe81, 0xeb1, 0xe99, 0xe8d, 0xeb2, 0x3b, 0xe95, 0xeb8, 0xea5, 0xeb2, 0x3b,
+0xe9e, 0xeb0, 0xe88, 0xeb4, 0xe81, 0x3b, 0xe97, 0xeb1, 0xe99, 0xea7, 0xeb2, 0xea1, 0x2e, 0xe81, 0x2e, 0x3b, 0xe81, 0x2e, 0xe9e, 0x2e,
+0x3b, 0xea1, 0x2e, 0xe99, 0x2e, 0x3b, 0xea1, 0x2e, 0xeaa, 0x2e, 0x3b, 0xe9e, 0x2e, 0xe9e, 0x2e, 0x3b, 0xea1, 0xeb4, 0x2e, 0xe96,
+0x2e, 0x3b, 0xe81, 0x2e, 0xea5, 0x2e, 0x3b, 0xeaa, 0x2e, 0xeab, 0x2e, 0x3b, 0xe81, 0x2e, 0xe8d, 0x2e, 0x3b, 0xe95, 0x2e, 0xea5,
+0x2e, 0x3b, 0xe9e, 0x2e, 0xe88, 0x2e, 0x3b, 0xe97, 0x2e, 0xea7, 0x2e, 0x6a, 0x61, 0x6e, 0x76, 0x101, 0x72, 0x69, 0x73, 0x3b,
+0x66, 0x65, 0x62, 0x72, 0x75, 0x101, 0x72, 0x69, 0x73, 0x3b, 0x6d, 0x61, 0x72, 0x74, 0x73, 0x3b, 0x61, 0x70, 0x72, 0x12b,
+0x6c, 0x69, 0x73, 0x3b, 0x6d, 0x61, 0x69, 0x6a, 0x73, 0x3b, 0x6a, 0x16b, 0x6e, 0x69, 0x6a, 0x73, 0x3b, 0x6a, 0x16b, 0x6c,
+0x69, 0x6a, 0x73, 0x3b, 0x61, 0x75, 0x67, 0x75, 0x73, 0x74, 0x73, 0x3b, 0x73, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x72,
+0x69, 0x73, 0x3b, 0x6f, 0x6b, 0x74, 0x6f, 0x62, 0x72, 0x69, 0x73, 0x3b, 0x6e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x72, 0x69,
+0x73, 0x3b, 0x64, 0x65, 0x63, 0x65, 0x6d, 0x62, 0x72, 0x69, 0x73, 0x6a, 0x61, 0x6e, 0x76, 0x2e, 0x3b, 0x66, 0x65, 0x62,
+0x72, 0x2e, 0x3b, 0x6d, 0x61, 0x72, 0x74, 0x73, 0x3b, 0x61, 0x70, 0x72, 0x2e, 0x3b, 0x6d, 0x61, 0x69, 0x6a, 0x73, 0x3b,
+0x6a, 0x16b, 0x6e, 0x2e, 0x3b, 0x6a, 0x16b, 0x6c, 0x2e, 0x3b, 0x61, 0x75, 0x67, 0x2e, 0x3b, 0x73, 0x65, 0x70, 0x74, 0x2e,
+0x3b, 0x6f, 0x6b, 0x74, 0x2e, 0x3b, 0x6e, 0x6f, 0x76, 0x2e, 0x3b, 0x64, 0x65, 0x63, 0x2e, 0x73, 0xe1, 0x6e, 0x7a, 0xe1,
+0x20, 0x79, 0x61, 0x20, 0x79, 0x61, 0x6d, 0x62, 0x6f, 0x3b, 0x73, 0xe1, 0x6e, 0x7a, 0xe1, 0x20, 0x79, 0x61, 0x20, 0x6d,
+0xed, 0x62, 0x61, 0x6c, 0xe9, 0x3b, 0x73, 0xe1, 0x6e, 0x7a, 0xe1, 0x20, 0x79, 0x61, 0x20, 0x6d, 0xed, 0x73, 0xe1, 0x74,
+0x6f, 0x3b, 0x73, 0xe1, 0x6e, 0x7a, 0xe1, 0x20, 0x79, 0x61, 0x20, 0x6d, 0xed, 0x6e, 0x65, 0x69, 0x3b, 0x73, 0xe1, 0x6e,
+0x7a, 0xe1, 0x20, 0x79, 0x61, 0x20, 0x6d, 0xed, 0x74, 0xe1, 0x6e, 0x6f, 0x3b, 0x73, 0xe1, 0x6e, 0x7a, 0xe1, 0x20, 0x79,
+0x61, 0x20, 0x6d, 0x6f, 0x74, 0xf3, 0x62, 0xe1, 0x3b, 0x73, 0xe1, 0x6e, 0x7a, 0xe1, 0x20, 0x79, 0x61, 0x20, 0x6e, 0x73,
+0x61, 0x6d, 0x62, 0x6f, 0x3b, 0x73, 0xe1, 0x6e, 0x7a, 0xe1, 0x20, 0x79, 0x61, 0x20, 0x6d, 0x77, 0x61, 0x6d, 0x62, 0x65,
+0x3b, 0x73, 0xe1, 0x6e, 0x7a, 0xe1, 0x20, 0x79, 0x61, 0x20, 0x6c, 0x69, 0x62, 0x77, 0x61, 0x3b, 0x73, 0xe1, 0x6e, 0x7a,
+0xe1, 0x20, 0x79, 0x61, 0x20, 0x7a, 0xf3, 0x6d, 0x69, 0x3b, 0x73, 0xe1, 0x6e, 0x7a, 0xe1, 0x20, 0x79, 0x61, 0x20, 0x7a,
+0xf3, 0x6d, 0x69, 0x20, 0x6e, 0x61, 0x20, 0x6d, 0x254, 0x30c, 0x6b, 0x254, 0x301, 0x3b, 0x73, 0xe1, 0x6e, 0x7a, 0xe1, 0x20,
+0x79, 0x61, 0x20, 0x7a, 0xf3, 0x6d, 0x69, 0x20, 0x6e, 0x61, 0x20, 0x6d, 0xed, 0x62, 0x61, 0x6c, 0xe9, 0x79, 0x61, 0x6e,
+0x3b, 0x66, 0x62, 0x6c, 0x3b, 0x6d, 0x73, 0x69, 0x3b, 0x61, 0x70, 0x6c, 0x3b, 0x6d, 0x61, 0x69, 0x3b, 0x79, 0x75, 0x6e,
+0x3b, 0x79, 0x75, 0x6c, 0x3b, 0x61, 0x67, 0x74, 0x3b, 0x73, 0x74, 0x62, 0x3b, 0x254, 0x74, 0x62, 0x3b, 0x6e, 0x76, 0x62,
+0x3b, 0x64, 0x73, 0x62, 0x79, 0x3b, 0x66, 0x3b, 0x6d, 0x3b, 0x61, 0x3b, 0x6d, 0x3b, 0x79, 0x3b, 0x79, 0x3b, 0x61, 0x3b,
+0x73, 0x3b, 0x254, 0x3b, 0x6e, 0x3b, 0x64, 0x73, 0x61, 0x75, 0x73, 0x69, 0x73, 0x3b, 0x76, 0x61, 0x73, 0x61, 0x72, 0x69,
+0x73, 0x3b, 0x6b, 0x6f, 0x76, 0x61, 0x73, 0x3b, 0x62, 0x61, 0x6c, 0x61, 0x6e, 0x64, 0x69, 0x73, 0x3b, 0x67, 0x65, 0x67,
+0x75, 0x17e, 0x117, 0x3b, 0x62, 0x69, 0x72, 0x17e, 0x65, 0x6c, 0x69, 0x73, 0x3b, 0x6c, 0x69, 0x65, 0x70, 0x61, 0x3b, 0x72,
+0x75, 0x67, 0x70, 0x6a, 0x16b, 0x74, 0x69, 0x73, 0x3b, 0x72, 0x75, 0x67, 0x73, 0x117, 0x6a, 0x69, 0x73, 0x3b, 0x73, 0x70,
+0x61, 0x6c, 0x69, 0x73, 0x3b, 0x6c, 0x61, 0x70, 0x6b, 0x72, 0x69, 0x74, 0x69, 0x73, 0x3b, 0x67, 0x72, 0x75, 0x6f, 0x64,
+0x69, 0x73, 0x73, 0x61, 0x75, 0x73, 0x69, 0x6f, 0x3b, 0x76, 0x61, 0x73, 0x61, 0x72, 0x69, 0x6f, 0x3b, 0x6b, 0x6f, 0x76,
+0x6f, 0x3b, 0x62, 0x61, 0x6c, 0x61, 0x6e, 0x64, 0x17e, 0x69, 0x6f, 0x3b, 0x67, 0x65, 0x67, 0x75, 0x17e, 0x117, 0x73, 0x3b,
+0x62, 0x69, 0x72, 0x17e, 0x65, 0x6c, 0x69, 0x6f, 0x3b, 0x6c, 0x69, 0x65, 0x70, 0x6f, 0x73, 0x3b, 0x72, 0x75, 0x67, 0x70,
+0x6a, 0x16b, 0x10d, 0x69, 0x6f, 0x3b, 0x72, 0x75, 0x67, 0x73, 0x117, 0x6a, 0x6f, 0x3b, 0x73, 0x70, 0x61, 0x6c, 0x69, 0x6f,
+0x3b, 0x6c, 0x61, 0x70, 0x6b, 0x72, 0x69, 0x10d, 0x69, 0x6f, 0x3b, 0x67, 0x72, 0x75, 0x6f, 0x64, 0x17e, 0x69, 0x6f, 0x73,
+0x61, 0x75, 0x73, 0x2e, 0x3b, 0x76, 0x61, 0x73, 0x2e, 0x3b, 0x6b, 0x6f, 0x76, 0x2e, 0x3b, 0x62, 0x61, 0x6c, 0x2e, 0x3b,
+0x67, 0x65, 0x67, 0x2e, 0x3b, 0x62, 0x69, 0x72, 0x17e, 0x2e, 0x3b, 0x6c, 0x69, 0x65, 0x70, 0x2e, 0x3b, 0x72, 0x75, 0x67,
+0x70, 0x2e, 0x3b, 0x72, 0x75, 0x67, 0x73, 0x2e, 0x3b, 0x73, 0x70, 0x61, 0x6c, 0x2e, 0x3b, 0x6c, 0x61, 0x70, 0x6b, 0x72,
+0x2e, 0x3b, 0x67, 0x72, 0x75, 0x6f, 0x64, 0x2e, 0x53, 0x3b, 0x56, 0x3b, 0x4b, 0x3b, 0x42, 0x3b, 0x47, 0x3b, 0x42, 0x3b,
+0x4c, 0x3b, 0x52, 0x3b, 0x52, 0x3b, 0x53, 0x3b, 0x4c, 0x3b, 0x47, 0x458, 0x430, 0x43d, 0x443, 0x430, 0x440, 0x438, 0x3b, 0x444,
+0x435, 0x432, 0x440, 0x443, 0x430, 0x440, 0x438, 0x3b, 0x43c, 0x430, 0x440, 0x442, 0x3b, 0x430, 0x43f, 0x440, 0x438, 0x43b, 0x3b, 0x43c,
+0x430, 0x458, 0x3b, 0x458, 0x443, 0x43d, 0x438, 0x3b, 0x458, 0x443, 0x43b, 0x438, 0x3b, 0x430, 0x432, 0x433, 0x443, 0x441, 0x442, 0x3b,
+0x441, 0x435, 0x43f, 0x442, 0x435, 0x43c, 0x432, 0x440, 0x438, 0x3b, 0x43e, 0x43a, 0x442, 0x43e, 0x43c, 0x432, 0x440, 0x438, 0x3b, 0x43d,
+0x43e, 0x435, 0x43c, 0x432, 0x440, 0x438, 0x3b, 0x434, 0x435, 0x43a, 0x435, 0x43c, 0x432, 0x440, 0x438, 0x458, 0x430, 0x43d, 0x2e, 0x3b,
+0x444, 0x435, 0x432, 0x2e, 0x3b, 0x43c, 0x430, 0x440, 0x2e, 0x3b, 0x430, 0x43f, 0x440, 0x2e, 0x3b, 0x43c, 0x430, 0x458, 0x3b, 0x458,
+0x443, 0x43d, 0x2e, 0x3b, 0x458, 0x443, 0x43b, 0x2e, 0x3b, 0x430, 0x432, 0x433, 0x2e, 0x3b, 0x441, 0x435, 0x43f, 0x442, 0x2e, 0x3b,
+0x43e, 0x43a, 0x442, 0x2e, 0x3b, 0x43d, 0x43e, 0x435, 0x43c, 0x2e, 0x3b, 0x434, 0x435, 0x43a, 0x2e, 0x458, 0x3b, 0x444, 0x3b, 0x43c,
+0x3b, 0x430, 0x3b, 0x43c, 0x3b, 0x458, 0x3b, 0x458, 0x3b, 0x430, 0x3b, 0x441, 0x3b, 0x43e, 0x3b, 0x43d, 0x3b, 0x434, 0x4a, 0x61,
+0x6e, 0x6f, 0x61, 0x72, 0x79, 0x3b, 0x46, 0x65, 0x62, 0x72, 0x6f, 0x61, 0x72, 0x79, 0x3b, 0x4d, 0x61, 0x72, 0x74, 0x73,
+0x61, 0x3b, 0x41, 0x70, 0x72, 0x69, 0x6c, 0x79, 0x3b, 0x4d, 0x65, 0x79, 0x3b, 0x4a, 0x6f, 0x6e, 0x61, 0x3b, 0x4a, 0x6f,
+0x6c, 0x61, 0x79, 0x3b, 0x41, 0x6f, 0x67, 0x6f, 0x73, 0x69, 0x74, 0x72, 0x61, 0x3b, 0x53, 0x65, 0x70, 0x74, 0x61, 0x6d,
+0x62, 0x72, 0x61, 0x3b, 0x4f, 0x6b, 0x74, 0x6f, 0x62, 0x72, 0x61, 0x3b, 0x4e, 0x6f, 0x76, 0x61, 0x6d, 0x62, 0x72, 0x61,
+0x3b, 0x44, 0x65, 0x73, 0x61, 0x6d, 0x62, 0x72, 0x61, 0x4a, 0x61, 0x6e, 0x3b, 0x46, 0x65, 0x62, 0x3b, 0x4d, 0x61, 0x72,
+0x3b, 0x41, 0x70, 0x72, 0x3b, 0x4d, 0x65, 0x79, 0x3b, 0x4a, 0x6f, 0x6e, 0x3b, 0x4a, 0x6f, 0x6c, 0x3b, 0x41, 0x6f, 0x67,
+0x3b, 0x53, 0x65, 0x70, 0x3b, 0x4f, 0x6b, 0x74, 0x3b, 0x4e, 0x6f, 0x76, 0x3b, 0x44, 0x65, 0x73, 0x4a, 0x61, 0x6e, 0x75,
+0x61, 0x72, 0x69, 0x3b, 0x46, 0x65, 0x62, 0x72, 0x75, 0x61, 0x72, 0x69, 0x3b, 0x4d, 0x61, 0x63, 0x3b, 0x41, 0x70, 0x72,
+0x69, 0x6c, 0x3b, 0x4d, 0x65, 0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x3b, 0x4a, 0x75, 0x6c, 0x61, 0x69, 0x3b, 0x4f, 0x67, 0x6f,
+0x73, 0x3b, 0x53, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x4f, 0x6b, 0x74, 0x6f, 0x62, 0x65, 0x72, 0x3b,
+0x4e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x44, 0x69, 0x73, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x4a, 0x61, 0x6e,
+0x3b, 0x46, 0x65, 0x62, 0x3b, 0x4d, 0x61, 0x63, 0x3b, 0x41, 0x70, 0x72, 0x3b, 0x4d, 0x65, 0x69, 0x3b, 0x4a, 0x75, 0x6e,
+0x3b, 0x4a, 0x75, 0x6c, 0x3b, 0x4f, 0x67, 0x6f, 0x3b, 0x53, 0x65, 0x70, 0x3b, 0x4f, 0x6b, 0x74, 0x3b, 0x4e, 0x6f, 0x76,
+0x3b, 0x44, 0x69, 0x73, 0x4a, 0x3b, 0x46, 0x3b, 0x4d, 0x3b, 0x41, 0x3b, 0x4d, 0x3b, 0x4a, 0x3b, 0x4a, 0x3b, 0x4f, 0x3b,
+0x53, 0x3b, 0x4f, 0x3b, 0x4e, 0x3b, 0x44, 0xd1c, 0xd28, 0xd41, 0xd35, 0xd30, 0xd3f, 0x3b, 0xd2b, 0xd46, 0xd2c, 0xd4d, 0xd30, 0xd41,
+0xd35, 0xd30, 0xd3f, 0x3b, 0xd2e, 0xd3e, 0xd7c, 0xd1a, 0xd4d, 0xd1a, 0xd4d, 0x3b, 0xd0f, 0xd2a, 0xd4d, 0xd30, 0xd3f, 0xd7d, 0x3b, 0xd2e,
+0xd47, 0xd2f, 0xd4d, 0x3b, 0xd1c, 0xd42, 0xd7a, 0x3b, 0xd1c, 0xd42, 0xd32, 0xd48, 0x3b, 0xd13, 0xd17, 0xd38, 0xd4d, 0xd31, 0xd4d, 0xd31,
+0xd4d, 0x3b, 0xd38, 0xd46, 0xd2a, 0xd4d, 0xd31, 0xd4d, 0xd31, 0xd02, 0xd2c, 0xd7c, 0x3b, 0xd12, 0xd15, 0xd4d, 0x200c, 0xd1f, 0xd4b, 0xd2c,
+0xd7c, 0x3b, 0xd28, 0xd35, 0xd02, 0xd2c, 0xd7c, 0x3b, 0xd21, 0xd3f, 0xd38, 0xd02, 0xd2c, 0xd7c, 0xd1c, 0xd28, 0xd41, 0x3b, 0xd2b, 0xd46,
+0xd2c, 0xd4d, 0xd30, 0xd41, 0x3b, 0xd2e, 0xd3e, 0xd7c, 0x3b, 0xd0f, 0xd2a, 0xd4d, 0xd30, 0xd3f, 0x3b, 0xd2e, 0xd47, 0xd2f, 0xd4d, 0x3b,
+0xd1c, 0xd42, 0xd7a, 0x3b, 0xd1c, 0xd42, 0xd32, 0xd48, 0x3b, 0xd13, 0xd17, 0x3b, 0xd38, 0xd46, 0xd2a, 0xd4d, 0xd31, 0xd4d, 0xd31, 0xd02,
+0x3b, 0xd12, 0xd15, 0xd4d, 0xd1f, 0xd4b, 0x3b, 0xd28, 0xd35, 0xd02, 0x3b, 0xd21, 0xd3f, 0xd38, 0xd02, 0xd1c, 0x3b, 0xd2b, 0xd46, 0x3b,
+0xd2e, 0xd3e, 0x3b, 0xd0f, 0x3b, 0xd2e, 0xd46, 0x3b, 0xd1c, 0xd42, 0xd7a, 0x3b, 0xd1c, 0xd42, 0x3b, 0xd13, 0x3b, 0xd38, 0xd46, 0x3b,
+0xd12, 0x3b, 0xd28, 0x3b, 0xd21, 0xd3f, 0x4a, 0x61, 0x6e, 0x6e, 0x61, 0x72, 0x3b, 0x46, 0x72, 0x61, 0x72, 0x3b, 0x4d, 0x61,
+0x72, 0x7a, 0x75, 0x3b, 0x41, 0x70, 0x72, 0x69, 0x6c, 0x3b, 0x4d, 0x65, 0x6a, 0x6a, 0x75, 0x3b, 0x120, 0x75, 0x6e, 0x6a,
+0x75, 0x3b, 0x4c, 0x75, 0x6c, 0x6a, 0x75, 0x3b, 0x41, 0x77, 0x77, 0x69, 0x73, 0x73, 0x75, 0x3b, 0x53, 0x65, 0x74, 0x74,
+0x65, 0x6d, 0x62, 0x72, 0x75, 0x3b, 0x4f, 0x74, 0x74, 0x75, 0x62, 0x72, 0x75, 0x3b, 0x4e, 0x6f, 0x76, 0x65, 0x6d, 0x62,
+0x72, 0x75, 0x3b, 0x44, 0x69, 0x10b, 0x65, 0x6d, 0x62, 0x72, 0x75, 0x4a, 0x61, 0x6e, 0x3b, 0x46, 0x72, 0x61, 0x3b, 0x4d,
+0x61, 0x72, 0x3b, 0x41, 0x70, 0x72, 0x3b, 0x4d, 0x65, 0x6a, 0x3b, 0x120, 0x75, 0x6e, 0x3b, 0x4c, 0x75, 0x6c, 0x3b, 0x41,
+0x77, 0x77, 0x3b, 0x53, 0x65, 0x74, 0x3b, 0x4f, 0x74, 0x74, 0x3b, 0x4e, 0x6f, 0x76, 0x3b, 0x44, 0x69, 0x10b, 0x4a, 0x6e,
+0x3b, 0x46, 0x72, 0x3b, 0x4d, 0x7a, 0x3b, 0x41, 0x70, 0x3b, 0x4d, 0x6a, 0x3b, 0x120, 0x6e, 0x3b, 0x4c, 0x6a, 0x3b, 0x41,
+0x77, 0x3b, 0x53, 0x74, 0x3b, 0x4f, 0x62, 0x3b, 0x4e, 0x76, 0x3b, 0x44, 0x10b, 0x4a, 0x3b, 0x46, 0x3b, 0x4d, 0x3b, 0x41,
+0x3b, 0x4d, 0x3b, 0x120, 0x3b, 0x4c, 0x3b, 0x41, 0x3b, 0x53, 0x3b, 0x4f, 0x3b, 0x4e, 0x3b, 0x44, 0x4b, 0x6f, 0x68, 0x69,
 0x74, 0x101, 0x74, 0x65, 0x61, 0x3b, 0x48, 0x75, 0x69, 0x74, 0x61, 0x6e, 0x67, 0x75, 0x72, 0x75, 0x3b, 0x50, 0x6f, 0x75,
 0x74, 0x16b, 0x74, 0x65, 0x72, 0x61, 0x6e, 0x67, 0x69, 0x3b, 0x50, 0x61, 0x65, 0x6e, 0x67, 0x61, 0x77, 0x68, 0x101, 0x77,
 0x68, 0x101, 0x3b, 0x48, 0x61, 0x72, 0x61, 0x74, 0x75, 0x61, 0x3b, 0x50, 0x69, 0x70, 0x69, 0x72, 0x69, 0x3b, 0x48, 0x14d,
 0x6e, 0x67, 0x6f, 0x6e, 0x67, 0x6f, 0x69, 0x3b, 0x48, 0x65, 0x72, 0x65, 0x74, 0x75, 0x72, 0x69, 0x6b, 0x14d, 0x6b, 0x101,
 0x3b, 0x4d, 0x61, 0x68, 0x75, 0x72, 0x75, 0x3b, 0x57, 0x68, 0x69, 0x72, 0x69, 0x6e, 0x67, 0x61, 0x2d, 0x101, 0x2d, 0x6e,
 0x75, 0x6b, 0x75, 0x3b, 0x57, 0x68, 0x69, 0x72, 0x69, 0x6e, 0x67, 0x61, 0x2d, 0x101, 0x2d, 0x72, 0x61, 0x6e, 0x67, 0x69,
-0x3b, 0x48, 0x61, 0x6b, 0x69, 0x68, 0x65, 0x61, 0x3b, 0x4b, 0x3b, 0x48, 0x3b, 0x50, 0x3b, 0x50, 0x3b, 0x48, 0x3b, 0x50,
-0x3b, 0x48, 0x3b, 0x48, 0x3b, 0x4d, 0x3b, 0x4e, 0x3b, 0x52, 0x3b, 0x48, 0x3b, 0x91c, 0x93e, 0x928, 0x947, 0x3b, 0x92b, 0x947,
-0x92c, 0x94d, 0x930, 0x941, 0x3b, 0x92e, 0x93e, 0x930, 0x94d, 0x91a, 0x3b, 0x90f, 0x92a, 0x94d, 0x930, 0x93f, 0x3b, 0x92e, 0x947, 0x3b,
-0x91c, 0x942, 0x928, 0x3b, 0x91c, 0x941, 0x932, 0x948, 0x3b, 0x911, 0x917, 0x3b, 0x938, 0x92a, 0x94d, 0x91f, 0x947, 0x902, 0x3b, 0x911,
-0x915, 0x94d, 0x91f, 0x94b, 0x3b, 0x928, 0x94b, 0x935, 0x94d, 0x939, 0x947, 0x902, 0x3b, 0x921, 0x93f, 0x938, 0x947, 0x902, 0x3b, 0x91c,
-0x93e, 0x928, 0x947, 0x935, 0x93e, 0x930, 0x940, 0x3b, 0x92b, 0x947, 0x92c, 0x94d, 0x930, 0x941, 0x935, 0x93e, 0x930, 0x940, 0x3b, 0x92e,
-0x93e, 0x930, 0x94d, 0x91a, 0x3b, 0x90f, 0x92a, 0x94d, 0x930, 0x93f, 0x932, 0x3b, 0x92e, 0x947, 0x3b, 0x91c, 0x942, 0x928, 0x3b, 0x91c,
-0x941, 0x932, 0x948, 0x3b, 0x911, 0x917, 0x938, 0x94d, 0x91f, 0x3b, 0x938, 0x92a, 0x94d, 0x91f, 0x947, 0x902, 0x92c, 0x930, 0x3b, 0x911,
-0x915, 0x94d, 0x91f, 0x94b, 0x92c, 0x930, 0x3b, 0x928, 0x94b, 0x935, 0x94d, 0x939, 0x947, 0x902, 0x92c, 0x930, 0x3b, 0x921, 0x93f, 0x938,
-0x947, 0x902, 0x92c, 0x930, 0x3b, 0x91c, 0x93e, 0x3b, 0x92b, 0x947, 0x3b, 0x92e, 0x93e, 0x3b, 0x90f, 0x3b, 0x92e, 0x947, 0x3b, 0x91c,
-0x942, 0x3b, 0x91c, 0x941, 0x3b, 0x911, 0x3b, 0x938, 0x3b, 0x911, 0x3b, 0x928, 0x94b, 0x3b, 0x921, 0x93f, 0x3b, 0x31, 0x2d, 0x440,
-0x20, 0x441, 0x430, 0x440, 0x3b, 0x32, 0x2d, 0x440, 0x20, 0x441, 0x430, 0x440, 0x3b, 0x33, 0x2d, 0x440, 0x20, 0x441, 0x430, 0x440,
-0x3b, 0x34, 0x2d, 0x440, 0x20, 0x441, 0x430, 0x440, 0x3b, 0x35, 0x2d, 0x440, 0x20, 0x441, 0x430, 0x440, 0x3b, 0x36, 0x2d, 0x440,
-0x20, 0x441, 0x430, 0x440, 0x3b, 0x37, 0x2d, 0x440, 0x20, 0x441, 0x430, 0x440, 0x3b, 0x38, 0x2d, 0x440, 0x20, 0x441, 0x430, 0x440,
-0x3b, 0x39, 0x2d, 0x440, 0x20, 0x441, 0x430, 0x440, 0x3b, 0x31, 0x30, 0x2d, 0x440, 0x20, 0x441, 0x430, 0x440, 0x3b, 0x31, 0x31,
-0x2d, 0x440, 0x20, 0x441, 0x430, 0x440, 0x3b, 0x31, 0x32, 0x2d, 0x440, 0x20, 0x441, 0x430, 0x440, 0x3b, 0x41d, 0x44d, 0x433, 0x434,
-0x4af, 0x433, 0x44d, 0x44d, 0x440, 0x20, 0x441, 0x430, 0x440, 0x3b, 0x425, 0x43e, 0x451, 0x440, 0x434, 0x443, 0x433, 0x430, 0x430, 0x440,
-0x20, 0x441, 0x430, 0x440, 0x3b, 0x413, 0x443, 0x440, 0x430, 0x432, 0x434, 0x443, 0x433, 0x430, 0x430, 0x440, 0x20, 0x441, 0x430, 0x440,
-0x3b, 0x414, 0x4e9, 0x440, 0x4e9, 0x432, 0x434, 0x4af, 0x433, 0x44d, 0x44d, 0x440, 0x20, 0x441, 0x430, 0x440, 0x3b, 0x422, 0x430, 0x432,
-0x434, 0x443, 0x433, 0x430, 0x430, 0x440, 0x20, 0x441, 0x430, 0x440, 0x3b, 0x417, 0x443, 0x440, 0x433, 0x430, 0x430, 0x434, 0x443, 0x433,
-0x430, 0x430, 0x440, 0x20, 0x441, 0x430, 0x440, 0x3b, 0x414, 0x43e, 0x43b, 0x43e, 0x43e, 0x434, 0x443, 0x433, 0x430, 0x430, 0x440, 0x20,
-0x441, 0x430, 0x440, 0x3b, 0x41d, 0x430, 0x439, 0x43c, 0x434, 0x443, 0x433, 0x430, 0x430, 0x440, 0x20, 0x441, 0x430, 0x440, 0x3b, 0x415,
-0x441, 0x434, 0x4af, 0x433, 0x44d, 0x44d, 0x440, 0x20, 0x441, 0x430, 0x440, 0x3b, 0x410, 0x440, 0x430, 0x432, 0x434, 0x443, 0x433, 0x430,
-0x430, 0x440, 0x20, 0x441, 0x430, 0x440, 0x3b, 0x410, 0x440, 0x432, 0x430, 0x43d, 0x20, 0x43d, 0x44d, 0x433, 0x434, 0x4af, 0x433, 0x44d,
-0x44d, 0x440, 0x20, 0x441, 0x430, 0x440, 0x3b, 0x410, 0x440, 0x432, 0x430, 0x43d, 0x20, 0x445, 0x43e, 0x451, 0x440, 0x434, 0x443, 0x433,
-0x430, 0x430, 0x440, 0x20, 0x441, 0x430, 0x440, 0x3b, 0x49, 0x3b, 0x49, 0x49, 0x3b, 0x49, 0x49, 0x49, 0x3b, 0x49, 0x56, 0x3b,
-0x56, 0x3b, 0x56, 0x49, 0x3b, 0x56, 0x49, 0x49, 0x3b, 0x56, 0x49, 0x49, 0x49, 0x3b, 0x49, 0x58, 0x3b, 0x58, 0x3b, 0x58,
-0x49, 0x3b, 0x58, 0x49, 0x49, 0x3b, 0x43d, 0x44d, 0x433, 0x434, 0x4af, 0x433, 0x44d, 0x44d, 0x440, 0x20, 0x441, 0x430, 0x440, 0x3b,
-0x445, 0x43e, 0x451, 0x440, 0x434, 0x443, 0x433, 0x430, 0x430, 0x440, 0x20, 0x441, 0x430, 0x440, 0x3b, 0x433, 0x443, 0x440, 0x430, 0x432,
-0x434, 0x443, 0x433, 0x430, 0x430, 0x440, 0x20, 0x441, 0x430, 0x440, 0x3b, 0x434, 0x4e9, 0x440, 0x4e9, 0x432, 0x434, 0x4af, 0x433, 0x44d,
-0x44d, 0x440, 0x20, 0x441, 0x430, 0x440, 0x3b, 0x442, 0x430, 0x432, 0x434, 0x443, 0x433, 0x430, 0x430, 0x440, 0x20, 0x441, 0x430, 0x440,
-0x3b, 0x437, 0x443, 0x440, 0x433, 0x430, 0x430, 0x434, 0x443, 0x433, 0x430, 0x430, 0x440, 0x20, 0x441, 0x430, 0x440, 0x3b, 0x434, 0x43e,
-0x43b, 0x43e, 0x43e, 0x434, 0x443, 0x433, 0x430, 0x430, 0x440, 0x20, 0x441, 0x430, 0x440, 0x3b, 0x43d, 0x430, 0x439, 0x43c, 0x434, 0x443,
-0x433, 0x430, 0x430, 0x440, 0x20, 0x441, 0x430, 0x440, 0x3b, 0x435, 0x441, 0x434, 0x4af, 0x433, 0x44d, 0x44d, 0x440, 0x20, 0x441, 0x430,
-0x440, 0x3b, 0x430, 0x440, 0x430, 0x432, 0x434, 0x443, 0x433, 0x430, 0x430, 0x440, 0x20, 0x441, 0x430, 0x440, 0x3b, 0x430, 0x440, 0x432,
-0x430, 0x43d, 0x20, 0x43d, 0x44d, 0x433, 0x434, 0x4af, 0x433, 0x44d, 0x44d, 0x440, 0x20, 0x441, 0x430, 0x440, 0x3b, 0x430, 0x440, 0x432,
-0x430, 0x43d, 0x20, 0x445, 0x43e, 0x451, 0x440, 0x434, 0x443, 0x433, 0x430, 0x430, 0x440, 0x20, 0x441, 0x430, 0x440, 0x3b, 0x91c, 0x928,
-0x935, 0x930, 0x940, 0x3b, 0x92b, 0x947, 0x92c, 0x94d, 0x930, 0x941, 0x905, 0x930, 0x940, 0x3b, 0x92e, 0x93e, 0x930, 0x94d, 0x91a, 0x3b,
-0x905, 0x92a, 0x94d, 0x930, 0x93f, 0x932, 0x3b, 0x92e, 0x947, 0x3b, 0x91c, 0x941, 0x928, 0x3b, 0x91c, 0x941, 0x932, 0x93e, 0x908, 0x3b,
-0x905, 0x917, 0x938, 0x94d, 0x91f, 0x3b, 0x938, 0x947, 0x92a, 0x94d, 0x91f, 0x947, 0x92e, 0x94d, 0x92c, 0x930, 0x3b, 0x905, 0x915, 0x94d,
-0x91f, 0x94b, 0x92c, 0x930, 0x3b, 0x928, 0x94b, 0x92d, 0x947, 0x92e, 0x94d, 0x92c, 0x930, 0x3b, 0x921, 0x93f, 0x938, 0x947, 0x92e, 0x94d,
-0x92c, 0x930, 0x3b, 0x91c, 0x928, 0x3b, 0x92b, 0x947, 0x947, 0x92c, 0x3b, 0x92e, 0x93e, 0x930, 0x94d, 0x91a, 0x3b, 0x905, 0x92a, 0x94d,
-0x930, 0x3b, 0x92e, 0x947, 0x3b, 0x91c, 0x941, 0x928, 0x3b, 0x91c, 0x941, 0x932, 0x3b, 0x905, 0x917, 0x3b, 0x938, 0x947, 0x92a, 0x3b,
-0x905, 0x915, 0x94d, 0x91f, 0x94b, 0x3b, 0x928, 0x94b, 0x92d, 0x947, 0x3b, 0x921, 0x93f, 0x938, 0x947, 0x3b, 0x91c, 0x928, 0x3b, 0x92b,
-0x947, 0x92c, 0x3b, 0x92e, 0x93e, 0x930, 0x94d, 0x91a, 0x3b, 0x905, 0x92a, 0x94d, 0x930, 0x3b, 0x92e, 0x947, 0x3b, 0x91c, 0x941, 0x928,
-0x3b, 0x91c, 0x941, 0x932, 0x3b, 0x905, 0x917, 0x3b, 0x938, 0x947, 0x92a, 0x3b, 0x905, 0x915, 0x94d, 0x91f, 0x94b, 0x3b, 0x928, 0x94b,
-0x92d, 0x947, 0x3b, 0x921, 0x93f, 0x938, 0x947, 0x3b, 0x6a, 0x61, 0x6e, 0x75, 0x61, 0x72, 0x3b, 0x66, 0x65, 0x62, 0x72, 0x75,
-0x61, 0x72, 0x3b, 0x6d, 0x61, 0x72, 0x73, 0x3b, 0x61, 0x70, 0x72, 0x69, 0x6c, 0x3b, 0x6d, 0x61, 0x69, 0x3b, 0x6a, 0x75,
-0x6e, 0x69, 0x3b, 0x6a, 0x75, 0x6c, 0x69, 0x3b, 0x61, 0x75, 0x67, 0x75, 0x73, 0x74, 0x3b, 0x73, 0x65, 0x70, 0x74, 0x65,
-0x6d, 0x62, 0x65, 0x72, 0x3b, 0x6f, 0x6b, 0x74, 0x6f, 0x62, 0x65, 0x72, 0x3b, 0x6e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x65,
-0x72, 0x3b, 0x64, 0x65, 0x73, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0xb1c, 0xb3e, 0xb28, 0xb41, 0xb06, 0xb30, 0xb40, 0x3b, 0xb2b,
-0xb47, 0xb2c, 0xb43, 0xb06, 0xb30, 0xb40, 0x3b, 0xb2e, 0xb3e, 0xb30, 0xb4d, 0xb1a, 0xb4d, 0xb1a, 0x3b, 0xb05, 0xb2a, 0xb4d, 0xb30, 0xb47,
-0xb32, 0x3b, 0xb2e, 0xb07, 0x3b, 0xb1c, 0xb41, 0xb28, 0x3b, 0xb1c, 0xb41, 0xb32, 0xb3e, 0xb07, 0x3b, 0xb05, 0xb17, 0xb37, 0xb4d, 0xb1f,
-0x3b, 0xb38, 0xb47, 0xb2a, 0xb4d, 0xb1f, 0xb47, 0xb2e, 0xb4d, 0xb2c, 0xb30, 0x3b, 0xb05, 0xb15, 0xb4d, 0xb1f, 0xb4b, 0xb2c, 0xb30, 0x3b,
-0xb28, 0xb2d, 0xb47, 0xb2e, 0xb4d, 0xb2c, 0xb30, 0x3b, 0xb21, 0xb3f, 0xb38, 0xb47, 0xb2e, 0xb4d, 0xb2c, 0xb30, 0x3b, 0xb1c, 0xb3e, 0x3b,
-0xb2b, 0xb47, 0x3b, 0xb2e, 0xb3e, 0x3b, 0xb05, 0x3b, 0xb2e, 0xb07, 0x3b, 0xb1c, 0xb41, 0x3b, 0xb1c, 0xb41, 0x3b, 0xb05, 0x3b, 0xb38,
-0xb47, 0x3b, 0xb05, 0x3b, 0xb28, 0x3b, 0xb21, 0xb3f, 0x3b, 0x62c, 0x646, 0x648, 0x631, 0x64a, 0x3b, 0x641, 0x628, 0x631, 0x648, 0x631,
-0x64a, 0x3b, 0x645, 0x627, 0x631, 0x686, 0x3b, 0x627, 0x67e, 0x631, 0x6cc, 0x644, 0x3b, 0x645, 0x6cd, 0x3b, 0x62c, 0x648, 0x646, 0x3b,
-0x62c, 0x648, 0x644, 0x627, 0x6cc, 0x3b, 0x627, 0x6ab, 0x633, 0x62a, 0x3b, 0x633, 0x67e, 0x62a, 0x645, 0x628, 0x631, 0x3b, 0x627, 0x6a9,
-0x62a, 0x648, 0x628, 0x631, 0x3b, 0x646, 0x648, 0x645, 0x628, 0x631, 0x3b, 0x62f, 0x633, 0x645, 0x628, 0x631, 0x3b, 0x62c, 0x646, 0x648,
-0x631, 0x64a, 0x3b, 0x641, 0x6d0, 0x628, 0x631, 0x648, 0x631, 0x64a, 0x3b, 0x645, 0x627, 0x631, 0x686, 0x3b, 0x627, 0x67e, 0x631, 0x6cc,
-0x644, 0x3b, 0x645, 0x6cd, 0x3b, 0x62c, 0x648, 0x646, 0x3b, 0x62c, 0x648, 0x644, 0x627, 0x6cc, 0x3b, 0x627, 0x6ab, 0x633, 0x62a, 0x3b,
-0x633, 0x67e, 0x62a, 0x645, 0x628, 0x631, 0x3b, 0x627, 0x6a9, 0x62a, 0x648, 0x628, 0x631, 0x3b, 0x646, 0x648, 0x645, 0x628, 0x631, 0x3b,
-0x62f, 0x633, 0x645, 0x628, 0x631, 0x3b, 0x62c, 0x646, 0x648, 0x631, 0x64a, 0x3b, 0x641, 0x628, 0x631, 0x648, 0x631, 0x64a, 0x3b, 0x645,
-0x627, 0x631, 0x686, 0x3b, 0x627, 0x67e, 0x631, 0x6cc, 0x644, 0x3b, 0x645, 0x6cd, 0x3b, 0x62c, 0x648, 0x646, 0x3b, 0x62c, 0x648, 0x644,
-0x627, 0x6cc, 0x3b, 0x627, 0x6ab, 0x633, 0x62a, 0x3b, 0x633, 0x6d0, 0x67e, 0x62a, 0x645, 0x628, 0x631, 0x3b, 0x627, 0x6a9, 0x62a, 0x648,
-0x628, 0x631, 0x3b, 0x646, 0x648, 0x645, 0x628, 0x631, 0x3b, 0x62f, 0x633, 0x645, 0x628, 0x631, 0x3b, 0x62c, 0x3b, 0x641, 0x3b, 0x645,
-0x3b, 0x627, 0x3b, 0x645, 0x3b, 0x62c, 0x3b, 0x62c, 0x3b, 0x627, 0x3b, 0x633, 0x3b, 0x627, 0x3b, 0x646, 0x3b, 0x62f, 0x3b, 0x698,
-0x627, 0x646, 0x648, 0x6cc, 0x647, 0x3b, 0x641, 0x648, 0x631, 0x6cc, 0x647, 0x3b, 0x645, 0x627, 0x631, 0x633, 0x3b, 0x622, 0x648, 0x631,
-0x6cc, 0x644, 0x3b, 0x645, 0x647, 0x3b, 0x698, 0x648, 0x626, 0x646, 0x3b, 0x698, 0x648, 0x626, 0x6cc, 0x647, 0x3b, 0x627, 0x648, 0x62a,
-0x3b, 0x633, 0x67e, 0x62a, 0x627, 0x645, 0x628, 0x631, 0x3b, 0x627, 0x6a9, 0x62a, 0x628, 0x631, 0x3b, 0x646, 0x648, 0x627, 0x645, 0x628,
-0x631, 0x3b, 0x62f, 0x633, 0x627, 0x645, 0x628, 0x631, 0x3b, 0x698, 0x3b, 0x641, 0x3b, 0x645, 0x3b, 0x622, 0x3b, 0x645, 0x3b, 0x698,
-0x3b, 0x698, 0x3b, 0x627, 0x3b, 0x633, 0x3b, 0x627, 0x3b, 0x646, 0x3b, 0x62f, 0x3b, 0x698, 0x627, 0x646, 0x648, 0x6cc, 0x647, 0x654,
-0x3b, 0x641, 0x648, 0x631, 0x6cc, 0x647, 0x654, 0x3b, 0x645, 0x627, 0x631, 0x633, 0x3b, 0x622, 0x648, 0x631, 0x6cc, 0x644, 0x3b, 0x645,
-0x647, 0x654, 0x3b, 0x698, 0x648, 0x626, 0x646, 0x3b, 0x698, 0x648, 0x626, 0x6cc, 0x647, 0x654, 0x3b, 0x627, 0x648, 0x62a, 0x3b, 0x633,
-0x67e, 0x62a, 0x627, 0x645, 0x628, 0x631, 0x3b, 0x627, 0x6a9, 0x62a, 0x628, 0x631, 0x3b, 0x646, 0x648, 0x627, 0x645, 0x628, 0x631, 0x3b,
-0x62f, 0x633, 0x627, 0x645, 0x628, 0x631, 0x3b, 0x62c, 0x646, 0x648, 0x631, 0x6cc, 0x3b, 0x641, 0x628, 0x631, 0x648, 0x631, 0x6cc, 0x3b,
-0x645, 0x627, 0x631, 0x686, 0x3b, 0x627, 0x67e, 0x631, 0x6cc, 0x644, 0x3b, 0x645, 0x6cc, 0x3b, 0x62c, 0x648, 0x646, 0x3b, 0x62c, 0x648,
-0x644, 0x627, 0x6cc, 0x3b, 0x627, 0x6af, 0x633, 0x62a, 0x3b, 0x633, 0x67e, 0x62a, 0x645, 0x628, 0x631, 0x3b, 0x627, 0x6a9, 0x62a, 0x648,
-0x628, 0x631, 0x3b, 0x646, 0x648, 0x645, 0x628, 0x631, 0x3b, 0x62f, 0x633, 0x645, 0x628, 0x631, 0x3b, 0x62c, 0x646, 0x648, 0x3b, 0x641,
-0x628, 0x631, 0x648, 0x631, 0x6cc, 0x3b, 0x645, 0x627, 0x631, 0x686, 0x3b, 0x627, 0x67e, 0x631, 0x6cc, 0x644, 0x3b, 0x645, 0x6cc, 0x3b,
-0x62c, 0x648, 0x646, 0x3b, 0x62c, 0x648, 0x644, 0x3b, 0x627, 0x6af, 0x633, 0x62a, 0x3b, 0x633, 0x67e, 0x62a, 0x645, 0x628, 0x631, 0x3b,
-0x627, 0x6a9, 0x62a, 0x648, 0x628, 0x631, 0x3b, 0x646, 0x648, 0x645, 0x628, 0x631, 0x3b, 0x62f, 0x633, 0x645, 0x3b, 0x73, 0x74, 0x79,
-0x3b, 0x6c, 0x75, 0x74, 0x3b, 0x6d, 0x61, 0x72, 0x3b, 0x6b, 0x77, 0x69, 0x3b, 0x6d, 0x61, 0x6a, 0x3b, 0x63, 0x7a, 0x65,
-0x3b, 0x6c, 0x69, 0x70, 0x3b, 0x73, 0x69, 0x65, 0x3b, 0x77, 0x72, 0x7a, 0x3b, 0x70, 0x61, 0x17a, 0x3b, 0x6c, 0x69, 0x73,
-0x3b, 0x67, 0x72, 0x75, 0x3b, 0x73, 0x74, 0x79, 0x63, 0x7a, 0x65, 0x144, 0x3b, 0x6c, 0x75, 0x74, 0x79, 0x3b, 0x6d, 0x61,
-0x72, 0x7a, 0x65, 0x63, 0x3b, 0x6b, 0x77, 0x69, 0x65, 0x63, 0x69, 0x65, 0x144, 0x3b, 0x6d, 0x61, 0x6a, 0x3b, 0x63, 0x7a,
-0x65, 0x72, 0x77, 0x69, 0x65, 0x63, 0x3b, 0x6c, 0x69, 0x70, 0x69, 0x65, 0x63, 0x3b, 0x73, 0x69, 0x65, 0x72, 0x70, 0x69,
-0x65, 0x144, 0x3b, 0x77, 0x72, 0x7a, 0x65, 0x73, 0x69, 0x65, 0x144, 0x3b, 0x70, 0x61, 0x17a, 0x64, 0x7a, 0x69, 0x65, 0x72,
-0x6e, 0x69, 0x6b, 0x3b, 0x6c, 0x69, 0x73, 0x74, 0x6f, 0x70, 0x61, 0x64, 0x3b, 0x67, 0x72, 0x75, 0x64, 0x7a, 0x69, 0x65,
-0x144, 0x3b, 0x53, 0x3b, 0x4c, 0x3b, 0x4d, 0x3b, 0x4b, 0x3b, 0x4d, 0x3b, 0x43, 0x3b, 0x4c, 0x3b, 0x53, 0x3b, 0x57, 0x3b,
-0x50, 0x3b, 0x4c, 0x3b, 0x47, 0x3b, 0x73, 0x74, 0x79, 0x63, 0x7a, 0x6e, 0x69, 0x61, 0x3b, 0x6c, 0x75, 0x74, 0x65, 0x67,
-0x6f, 0x3b, 0x6d, 0x61, 0x72, 0x63, 0x61, 0x3b, 0x6b, 0x77, 0x69, 0x65, 0x74, 0x6e, 0x69, 0x61, 0x3b, 0x6d, 0x61, 0x6a,
-0x61, 0x3b, 0x63, 0x7a, 0x65, 0x72, 0x77, 0x63, 0x61, 0x3b, 0x6c, 0x69, 0x70, 0x63, 0x61, 0x3b, 0x73, 0x69, 0x65, 0x72,
-0x70, 0x6e, 0x69, 0x61, 0x3b, 0x77, 0x72, 0x7a, 0x65, 0x15b, 0x6e, 0x69, 0x61, 0x3b, 0x70, 0x61, 0x17a, 0x64, 0x7a, 0x69,
-0x65, 0x72, 0x6e, 0x69, 0x6b, 0x61, 0x3b, 0x6c, 0x69, 0x73, 0x74, 0x6f, 0x70, 0x61, 0x64, 0x61, 0x3b, 0x67, 0x72, 0x75,
-0x64, 0x6e, 0x69, 0x61, 0x3b, 0x73, 0x3b, 0x6c, 0x3b, 0x6d, 0x3b, 0x6b, 0x3b, 0x6d, 0x3b, 0x63, 0x3b, 0x6c, 0x3b, 0x73,
-0x3b, 0x77, 0x3b, 0x70, 0x3b, 0x6c, 0x3b, 0x67, 0x3b, 0x6a, 0x61, 0x6e, 0x2e, 0x3b, 0x66, 0x65, 0x76, 0x2e, 0x3b, 0x6d,
-0x61, 0x72, 0x2e, 0x3b, 0x61, 0x62, 0x72, 0x2e, 0x3b, 0x6d, 0x61, 0x69, 0x2e, 0x3b, 0x6a, 0x75, 0x6e, 0x2e, 0x3b, 0x6a,
-0x75, 0x6c, 0x2e, 0x3b, 0x61, 0x67, 0x6f, 0x2e, 0x3b, 0x73, 0x65, 0x74, 0x2e, 0x3b, 0x6f, 0x75, 0x74, 0x2e, 0x3b, 0x6e,
-0x6f, 0x76, 0x2e, 0x3b, 0x64, 0x65, 0x7a, 0x2e, 0x3b, 0x6a, 0x61, 0x6e, 0x65, 0x69, 0x72, 0x6f, 0x3b, 0x66, 0x65, 0x76,
-0x65, 0x72, 0x65, 0x69, 0x72, 0x6f, 0x3b, 0x6d, 0x61, 0x72, 0xe7, 0x6f, 0x3b, 0x61, 0x62, 0x72, 0x69, 0x6c, 0x3b, 0x6d,
-0x61, 0x69, 0x6f, 0x3b, 0x6a, 0x75, 0x6e, 0x68, 0x6f, 0x3b, 0x6a, 0x75, 0x6c, 0x68, 0x6f, 0x3b, 0x61, 0x67, 0x6f, 0x73,
-0x74, 0x6f, 0x3b, 0x73, 0x65, 0x74, 0x65, 0x6d, 0x62, 0x72, 0x6f, 0x3b, 0x6f, 0x75, 0x74, 0x75, 0x62, 0x72, 0x6f, 0x3b,
-0x6e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x72, 0x6f, 0x3b, 0x64, 0x65, 0x7a, 0x65, 0x6d, 0x62, 0x72, 0x6f, 0x3b, 0xa1c, 0xa28,
-0x3b, 0xa2b, 0xa3c, 0xa30, 0x3b, 0xa2e, 0xa3e, 0xa30, 0xa1a, 0x3b, 0xa05, 0xa2a, 0xa4d, 0xa30, 0xa48, 0x3b, 0xa2e, 0xa08, 0x3b, 0xa1c,
-0xa42, 0xa28, 0x3b, 0xa1c, 0xa41, 0xa32, 0xa3e, 0x3b, 0xa05, 0xa17, 0x3b, 0xa38, 0xa24, 0xa70, 0x3b, 0xa05, 0xa15, 0xa24, 0xa42, 0x3b,
-0xa28, 0xa35, 0xa70, 0x3b, 0xa26, 0xa38, 0xa70, 0x3b, 0xa1c, 0xa28, 0xa35, 0xa30, 0xa40, 0x3b, 0xa2b, 0xa3c, 0xa30, 0xa35, 0xa30, 0xa40,
-0x3b, 0xa2e, 0xa3e, 0xa30, 0xa1a, 0x3b, 0xa05, 0xa2a, 0xa4d, 0xa30, 0xa48, 0xa32, 0x3b, 0xa2e, 0xa08, 0x3b, 0xa1c, 0xa42, 0xa28, 0x3b,
-0xa1c, 0xa41, 0xa32, 0xa3e, 0xa08, 0x3b, 0xa05, 0xa17, 0xa38, 0xa24, 0x3b, 0xa38, 0xa24, 0xa70, 0xa2c, 0xa30, 0x3b, 0xa05, 0xa15, 0xa24,
-0xa42, 0xa2c, 0xa30, 0x3b, 0xa28, 0xa35, 0xa70, 0xa2c, 0xa30, 0x3b, 0xa26, 0xa38, 0xa70, 0xa2c, 0xa30, 0x3b, 0xa1c, 0x3b, 0xa2b, 0xa3c,
-0x3b, 0xa2e, 0xa3e, 0x3b, 0xa05, 0x3b, 0xa2e, 0x3b, 0xa1c, 0xa42, 0x3b, 0xa1c, 0xa41, 0x3b, 0xa05, 0x3b, 0xa38, 0x3b, 0xa05, 0x3b,
-0xa28, 0x3b, 0xa26, 0x3b, 0x62c, 0x646, 0x648, 0x631, 0x6cc, 0x3b, 0x641, 0x631, 0x648, 0x631, 0x6cc, 0x3b, 0x645, 0x627, 0x631, 0x686,
-0x3b, 0x627, 0x67e, 0x631, 0x6cc, 0x644, 0x3b, 0x645, 0x626, 0x3b, 0x62c, 0x648, 0x646, 0x3b, 0x62c, 0x648, 0x644, 0x627, 0x626, 0x6cc,
-0x3b, 0x627, 0x6af, 0x633, 0x62a, 0x3b, 0x633, 0x62a, 0x645, 0x628, 0x631, 0x3b, 0x627, 0x6a9, 0x62a, 0x648, 0x628, 0x631, 0x3b, 0x646,
-0x648, 0x645, 0x628, 0x631, 0x3b, 0x62f, 0x633, 0x645, 0x628, 0x631, 0x3b, 0x45, 0x6e, 0x65, 0x3b, 0x46, 0x65, 0x62, 0x3b, 0x4d,
-0x61, 0x72, 0x3b, 0x41, 0x62, 0x72, 0x3b, 0x4d, 0x61, 0x79, 0x3b, 0x4a, 0x75, 0x6e, 0x3b, 0x4a, 0x75, 0x6c, 0x3b, 0x41,
-0x67, 0x6f, 0x3b, 0x53, 0x65, 0x74, 0x3b, 0x4f, 0x63, 0x74, 0x3b, 0x4e, 0x6f, 0x76, 0x3b, 0x44, 0x69, 0x63, 0x3b, 0x45,
-0x6e, 0x65, 0x72, 0x6f, 0x3b, 0x46, 0x65, 0x62, 0x72, 0x65, 0x72, 0x6f, 0x3b, 0x4d, 0x61, 0x72, 0x7a, 0x6f, 0x3b, 0x41,
-0x62, 0x72, 0x69, 0x6c, 0x3b, 0x4d, 0x61, 0x79, 0x6f, 0x3b, 0x4a, 0x75, 0x6e, 0x69, 0x6f, 0x3b, 0x4a, 0x75, 0x6c, 0x69,
-0x6f, 0x3b, 0x41, 0x67, 0x6f, 0x73, 0x74, 0x6f, 0x3b, 0x53, 0x65, 0x74, 0x69, 0x65, 0x6d, 0x62, 0x72, 0x65, 0x3b, 0x4f,
-0x63, 0x74, 0x75, 0x62, 0x72, 0x65, 0x3b, 0x4e, 0x6f, 0x76, 0x69, 0x65, 0x6d, 0x62, 0x72, 0x65, 0x3b, 0x44, 0x69, 0x63,
-0x69, 0x65, 0x6d, 0x62, 0x72, 0x65, 0x3b, 0x73, 0x63, 0x68, 0x61, 0x6e, 0x2e, 0x3b, 0x66, 0x61, 0x76, 0x72, 0x2e, 0x3b,
-0x6d, 0x61, 0x72, 0x73, 0x3b, 0x61, 0x76, 0x72, 0x2e, 0x3b, 0x6d, 0x61, 0x74, 0x67, 0x3b, 0x7a, 0x65, 0x72, 0x63, 0x6c,
-0x2e, 0x3b, 0x66, 0x61, 0x6e, 0x2e, 0x3b, 0x61, 0x76, 0x75, 0x73, 0x74, 0x3b, 0x73, 0x65, 0x74, 0x74, 0x2e, 0x3b, 0x6f,
-0x63, 0x74, 0x2e, 0x3b, 0x6e, 0x6f, 0x76, 0x2e, 0x3b, 0x64, 0x65, 0x63, 0x2e, 0x3b, 0x73, 0x63, 0x68, 0x61, 0x6e, 0x65,
-0x72, 0x3b, 0x66, 0x61, 0x76, 0x72, 0x65, 0x72, 0x3b, 0x6d, 0x61, 0x72, 0x73, 0x3b, 0x61, 0x76, 0x72, 0x69, 0x67, 0x6c,
-0x3b, 0x6d, 0x61, 0x74, 0x67, 0x3b, 0x7a, 0x65, 0x72, 0x63, 0x6c, 0x61, 0x64, 0x75, 0x72, 0x3b, 0x66, 0x61, 0x6e, 0x61,
-0x64, 0x75, 0x72, 0x3b, 0x61, 0x76, 0x75, 0x73, 0x74, 0x3b, 0x73, 0x65, 0x74, 0x74, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b,
-0x6f, 0x63, 0x74, 0x6f, 0x62, 0x65, 0x72, 0x3b, 0x6e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x64, 0x65, 0x63,
-0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x53, 0x3b, 0x46, 0x3b, 0x4d, 0x3b, 0x41, 0x3b, 0x4d, 0x3b, 0x5a, 0x3b, 0x46, 0x3b,
-0x41, 0x3b, 0x53, 0x3b, 0x4f, 0x3b, 0x4e, 0x3b, 0x44, 0x3b, 0x64, 0x61, 0x20, 0x73, 0x63, 0x68, 0x61, 0x6e, 0x65, 0x72,
-0x3b, 0x64, 0x61, 0x20, 0x66, 0x61, 0x76, 0x72, 0x65, 0x72, 0x3b, 0x64, 0x61, 0x20, 0x6d, 0x61, 0x72, 0x73, 0x3b, 0x64,
-0x2019, 0x61, 0x76, 0x72, 0x69, 0x67, 0x6c, 0x3b, 0x64, 0x61, 0x20, 0x6d, 0x61, 0x74, 0x67, 0x3b, 0x64, 0x61, 0x20, 0x7a,
-0x65, 0x72, 0x63, 0x6c, 0x61, 0x64, 0x75, 0x72, 0x3b, 0x64, 0x61, 0x20, 0x66, 0x61, 0x6e, 0x61, 0x64, 0x75, 0x72, 0x3b,
-0x64, 0x2019, 0x61, 0x76, 0x75, 0x73, 0x74, 0x3b, 0x64, 0x61, 0x20, 0x73, 0x65, 0x74, 0x74, 0x65, 0x6d, 0x62, 0x65, 0x72,
-0x3b, 0x64, 0x2019, 0x6f, 0x63, 0x74, 0x6f, 0x62, 0x65, 0x72, 0x3b, 0x64, 0x61, 0x20, 0x6e, 0x6f, 0x76, 0x65, 0x6d, 0x62,
-0x65, 0x72, 0x3b, 0x64, 0x61, 0x20, 0x64, 0x65, 0x63, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x69, 0x61, 0x6e, 0x2e, 0x3b,
-0x66, 0x65, 0x62, 0x2e, 0x3b, 0x6d, 0x61, 0x72, 0x2e, 0x3b, 0x61, 0x70, 0x72, 0x2e, 0x3b, 0x6d, 0x61, 0x69, 0x3b, 0x69,
-0x75, 0x6e, 0x2e, 0x3b, 0x69, 0x75, 0x6c, 0x2e, 0x3b, 0x61, 0x75, 0x67, 0x2e, 0x3b, 0x73, 0x65, 0x70, 0x74, 0x2e, 0x3b,
-0x6f, 0x63, 0x74, 0x2e, 0x3b, 0x6e, 0x6f, 0x76, 0x2e, 0x3b, 0x64, 0x65, 0x63, 0x2e, 0x3b, 0x69, 0x61, 0x6e, 0x75, 0x61,
-0x72, 0x69, 0x65, 0x3b, 0x66, 0x65, 0x62, 0x72, 0x75, 0x61, 0x72, 0x69, 0x65, 0x3b, 0x6d, 0x61, 0x72, 0x74, 0x69, 0x65,
-0x3b, 0x61, 0x70, 0x72, 0x69, 0x6c, 0x69, 0x65, 0x3b, 0x6d, 0x61, 0x69, 0x3b, 0x69, 0x75, 0x6e, 0x69, 0x65, 0x3b, 0x69,
-0x75, 0x6c, 0x69, 0x65, 0x3b, 0x61, 0x75, 0x67, 0x75, 0x73, 0x74, 0x3b, 0x73, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x72,
-0x69, 0x65, 0x3b, 0x6f, 0x63, 0x74, 0x6f, 0x6d, 0x62, 0x72, 0x69, 0x65, 0x3b, 0x6e, 0x6f, 0x69, 0x65, 0x6d, 0x62, 0x72,
-0x69, 0x65, 0x3b, 0x64, 0x65, 0x63, 0x65, 0x6d, 0x62, 0x72, 0x69, 0x65, 0x3b, 0x49, 0x3b, 0x46, 0x3b, 0x4d, 0x3b, 0x41,
-0x3b, 0x4d, 0x3b, 0x49, 0x3b, 0x49, 0x3b, 0x41, 0x3b, 0x53, 0x3b, 0x4f, 0x3b, 0x4e, 0x3b, 0x44, 0x3b, 0x44f, 0x43d, 0x432,
-0x2e, 0x3b, 0x444, 0x435, 0x432, 0x440, 0x2e, 0x3b, 0x43c, 0x430, 0x440, 0x442, 0x3b, 0x430, 0x43f, 0x440, 0x2e, 0x3b, 0x43c, 0x430,
-0x439, 0x3b, 0x438, 0x44e, 0x43d, 0x44c, 0x3b, 0x438, 0x44e, 0x43b, 0x44c, 0x3b, 0x430, 0x432, 0x433, 0x2e, 0x3b, 0x441, 0x435, 0x43d,
-0x442, 0x2e, 0x3b, 0x43e, 0x43a, 0x442, 0x2e, 0x3b, 0x43d, 0x43e, 0x44f, 0x431, 0x2e, 0x3b, 0x434, 0x435, 0x43a, 0x2e, 0x3b, 0x44f,
-0x43d, 0x432, 0x2e, 0x3b, 0x444, 0x435, 0x432, 0x440, 0x2e, 0x3b, 0x43c, 0x430, 0x440, 0x2e, 0x3b, 0x430, 0x43f, 0x440, 0x2e, 0x3b,
-0x43c, 0x430, 0x44f, 0x3b, 0x438, 0x44e, 0x43d, 0x2e, 0x3b, 0x438, 0x44e, 0x43b, 0x2e, 0x3b, 0x430, 0x432, 0x433, 0x2e, 0x3b, 0x441,
-0x435, 0x43d, 0x442, 0x2e, 0x3b, 0x43e, 0x43a, 0x442, 0x2e, 0x3b, 0x43d, 0x43e, 0x44f, 0x431, 0x2e, 0x3b, 0x434, 0x435, 0x43a, 0x2e,
-0x3b, 0x44f, 0x43d, 0x432, 0x430, 0x440, 0x44f, 0x3b, 0x444, 0x435, 0x432, 0x440, 0x430, 0x43b, 0x44f, 0x3b, 0x43c, 0x430, 0x440, 0x442,
-0x430, 0x3b, 0x430, 0x43f, 0x440, 0x435, 0x43b, 0x44f, 0x3b, 0x43c, 0x430, 0x44f, 0x3b, 0x438, 0x44e, 0x43d, 0x44f, 0x3b, 0x438, 0x44e,
-0x43b, 0x44f, 0x3b, 0x430, 0x432, 0x433, 0x443, 0x441, 0x442, 0x430, 0x3b, 0x441, 0x435, 0x43d, 0x442, 0x44f, 0x431, 0x440, 0x44f, 0x3b,
-0x43e, 0x43a, 0x442, 0x44f, 0x431, 0x440, 0x44f, 0x3b, 0x43d, 0x43e, 0x44f, 0x431, 0x440, 0x44f, 0x3b, 0x434, 0x435, 0x43a, 0x430, 0x431,
-0x440, 0x44f, 0x3b, 0x4e, 0x79, 0x65, 0x3b, 0x46, 0x75, 0x6c, 0x3b, 0x4d, 0x62, 0xe4, 0x3b, 0x4e, 0x67, 0x75, 0x3b, 0x42,
-0xea, 0x6c, 0x3b, 0x46, 0xf6, 0x6e, 0x3b, 0x4c, 0x65, 0x6e, 0x3b, 0x4b, 0xfc, 0x6b, 0x3b, 0x4d, 0x76, 0x75, 0x3b, 0x4e,
-0x67, 0x62, 0x3b, 0x4e, 0x61, 0x62, 0x3b, 0x4b, 0x61, 0x6b, 0x3b, 0x4e, 0x79, 0x65, 0x6e, 0x79, 0x65, 0x3b, 0x46, 0x75,
-0x6c, 0x75, 0x6e, 0x64, 0xef, 0x67, 0x69, 0x3b, 0x4d, 0x62, 0xe4, 0x6e, 0x67, 0xfc, 0x3b, 0x4e, 0x67, 0x75, 0x62, 0xf9,
-0x65, 0x3b, 0x42, 0xea, 0x6c, 0xe4, 0x77, 0xfc, 0x3b, 0x46, 0xf6, 0x6e, 0x64, 0x6f, 0x3b, 0x4c, 0x65, 0x6e, 0x67, 0x75,
-0x61, 0x3b, 0x4b, 0xfc, 0x6b, 0xfc, 0x72, 0xfc, 0x3b, 0x4d, 0x76, 0x75, 0x6b, 0x61, 0x3b, 0x4e, 0x67, 0x62, 0x65, 0x72,
-0x65, 0x72, 0x65, 0x3b, 0x4e, 0x61, 0x62, 0xe4, 0x6e, 0x64, 0xfc, 0x72, 0x75, 0x3b, 0x4b, 0x61, 0x6b, 0x61, 0x75, 0x6b,
-0x61, 0x3b, 0x4e, 0x3b, 0x46, 0x3b, 0x4d, 0x3b, 0x4e, 0x3b, 0x42, 0x3b, 0x46, 0x3b, 0x4c, 0x3b, 0x4b, 0x3b, 0x4d, 0x3b,
-0x4e, 0x3b, 0x4e, 0x3b, 0x4b, 0x3b, 0x458, 0x430, 0x43d, 0x3b, 0x444, 0x435, 0x431, 0x3b, 0x43c, 0x430, 0x440, 0x3b, 0x430, 0x43f,
-0x440, 0x3b, 0x43c, 0x430, 0x458, 0x3b, 0x458, 0x443, 0x43d, 0x3b, 0x458, 0x443, 0x43b, 0x3b, 0x430, 0x432, 0x433, 0x3b, 0x441, 0x435,
-0x43f, 0x3b, 0x43e, 0x43a, 0x442, 0x3b, 0x43d, 0x43e, 0x432, 0x3b, 0x434, 0x435, 0x446, 0x3b, 0x458, 0x430, 0x43d, 0x443, 0x430, 0x440,
+0x3b, 0x48, 0x61, 0x6b, 0x69, 0x68, 0x65, 0x61, 0x4b, 0x6f, 0x68, 0x69, 0x3b, 0x48, 0x75, 0x69, 0x3b, 0x50, 0x6f, 0x75,
+0x3b, 0x50, 0x61, 0x65, 0x3b, 0x48, 0x61, 0x72, 0x61, 0x3b, 0x50, 0x69, 0x70, 0x69, 0x3b, 0x48, 0x14d, 0x6e, 0x67, 0x6f,
+0x3b, 0x48, 0x65, 0x72, 0x65, 0x3b, 0x4d, 0x61, 0x68, 0x75, 0x3b, 0x4e, 0x75, 0x6b, 0x75, 0x3b, 0x52, 0x61, 0x6e, 0x67,
+0x69, 0x3b, 0x48, 0x61, 0x6b, 0x69, 0x4b, 0x3b, 0x48, 0x3b, 0x50, 0x3b, 0x50, 0x3b, 0x48, 0x3b, 0x50, 0x3b, 0x48, 0x3b,
+0x48, 0x3b, 0x4d, 0x3b, 0x4e, 0x3b, 0x52, 0x3b, 0x48, 0x91c, 0x93e, 0x928, 0x947, 0x935, 0x93e, 0x930, 0x940, 0x3b, 0x92b, 0x947,
+0x92c, 0x94d, 0x930, 0x941, 0x935, 0x93e, 0x930, 0x940, 0x3b, 0x92e, 0x93e, 0x930, 0x94d, 0x91a, 0x3b, 0x90f, 0x92a, 0x94d, 0x930, 0x93f,
+0x932, 0x3b, 0x92e, 0x947, 0x3b, 0x91c, 0x942, 0x928, 0x3b, 0x91c, 0x941, 0x932, 0x948, 0x3b, 0x911, 0x917, 0x938, 0x94d, 0x91f, 0x3b,
+0x938, 0x92a, 0x94d, 0x91f, 0x947, 0x902, 0x92c, 0x930, 0x3b, 0x911, 0x915, 0x94d, 0x91f, 0x94b, 0x92c, 0x930, 0x3b, 0x928, 0x94b, 0x935,
+0x94d, 0x939, 0x947, 0x902, 0x92c, 0x930, 0x3b, 0x921, 0x93f, 0x938, 0x947, 0x902, 0x92c, 0x930, 0x91c, 0x93e, 0x928, 0x947, 0x3b, 0x92b,
+0x947, 0x92c, 0x94d, 0x930, 0x941, 0x3b, 0x92e, 0x93e, 0x930, 0x94d, 0x91a, 0x3b, 0x90f, 0x92a, 0x94d, 0x930, 0x93f, 0x3b, 0x92e, 0x947,
+0x3b, 0x91c, 0x942, 0x928, 0x3b, 0x91c, 0x941, 0x932, 0x948, 0x3b, 0x911, 0x917, 0x3b, 0x938, 0x92a, 0x94d, 0x91f, 0x947, 0x902, 0x3b,
+0x911, 0x915, 0x94d, 0x91f, 0x94b, 0x3b, 0x928, 0x94b, 0x935, 0x94d, 0x939, 0x947, 0x902, 0x3b, 0x921, 0x93f, 0x938, 0x947, 0x902, 0x91c,
+0x93e, 0x3b, 0x92b, 0x947, 0x3b, 0x92e, 0x93e, 0x3b, 0x90f, 0x3b, 0x92e, 0x947, 0x3b, 0x91c, 0x942, 0x3b, 0x91c, 0x941, 0x3b, 0x911,
+0x3b, 0x938, 0x3b, 0x911, 0x3b, 0x928, 0x94b, 0x3b, 0x921, 0x93f, 0x41d, 0x44d, 0x433, 0x434, 0x4af, 0x433, 0x44d, 0x44d, 0x440, 0x20,
+0x441, 0x430, 0x440, 0x3b, 0x425, 0x43e, 0x451, 0x440, 0x434, 0x443, 0x433, 0x430, 0x430, 0x440, 0x20, 0x441, 0x430, 0x440, 0x3b, 0x413,
+0x443, 0x440, 0x430, 0x432, 0x434, 0x443, 0x433, 0x430, 0x430, 0x440, 0x20, 0x441, 0x430, 0x440, 0x3b, 0x414, 0x4e9, 0x440, 0x4e9, 0x432,
+0x434, 0x4af, 0x433, 0x44d, 0x44d, 0x440, 0x20, 0x441, 0x430, 0x440, 0x3b, 0x422, 0x430, 0x432, 0x434, 0x443, 0x433, 0x430, 0x430, 0x440,
+0x20, 0x441, 0x430, 0x440, 0x3b, 0x417, 0x443, 0x440, 0x433, 0x430, 0x430, 0x434, 0x443, 0x433, 0x430, 0x430, 0x440, 0x20, 0x441, 0x430,
+0x440, 0x3b, 0x414, 0x43e, 0x43b, 0x43e, 0x43e, 0x434, 0x443, 0x433, 0x430, 0x430, 0x440, 0x20, 0x441, 0x430, 0x440, 0x3b, 0x41d, 0x430,
+0x439, 0x43c, 0x434, 0x443, 0x433, 0x430, 0x430, 0x440, 0x20, 0x441, 0x430, 0x440, 0x3b, 0x415, 0x441, 0x434, 0x4af, 0x433, 0x44d, 0x44d,
+0x440, 0x20, 0x441, 0x430, 0x440, 0x3b, 0x410, 0x440, 0x430, 0x432, 0x434, 0x443, 0x433, 0x430, 0x430, 0x440, 0x20, 0x441, 0x430, 0x440,
+0x3b, 0x410, 0x440, 0x432, 0x430, 0x43d, 0x20, 0x43d, 0x44d, 0x433, 0x434, 0x4af, 0x433, 0x44d, 0x44d, 0x440, 0x20, 0x441, 0x430, 0x440,
+0x3b, 0x410, 0x440, 0x432, 0x430, 0x43d, 0x20, 0x445, 0x43e, 0x451, 0x440, 0x434, 0x443, 0x433, 0x430, 0x430, 0x440, 0x20, 0x441, 0x430,
+0x440, 0x43d, 0x44d, 0x433, 0x434, 0x4af, 0x433, 0x44d, 0x44d, 0x440, 0x20, 0x441, 0x430, 0x440, 0x3b, 0x445, 0x43e, 0x451, 0x440, 0x434,
+0x443, 0x433, 0x430, 0x430, 0x440, 0x20, 0x441, 0x430, 0x440, 0x3b, 0x433, 0x443, 0x440, 0x430, 0x432, 0x434, 0x443, 0x433, 0x430, 0x430,
+0x440, 0x20, 0x441, 0x430, 0x440, 0x3b, 0x434, 0x4e9, 0x440, 0x4e9, 0x432, 0x434, 0x4af, 0x433, 0x44d, 0x44d, 0x440, 0x20, 0x441, 0x430,
+0x440, 0x3b, 0x442, 0x430, 0x432, 0x434, 0x443, 0x433, 0x430, 0x430, 0x440, 0x20, 0x441, 0x430, 0x440, 0x3b, 0x437, 0x443, 0x440, 0x433,
+0x430, 0x430, 0x434, 0x443, 0x433, 0x430, 0x430, 0x440, 0x20, 0x441, 0x430, 0x440, 0x3b, 0x434, 0x43e, 0x43b, 0x43e, 0x43e, 0x434, 0x443,
+0x433, 0x430, 0x430, 0x440, 0x20, 0x441, 0x430, 0x440, 0x3b, 0x43d, 0x430, 0x439, 0x43c, 0x434, 0x443, 0x433, 0x430, 0x430, 0x440, 0x20,
+0x441, 0x430, 0x440, 0x3b, 0x435, 0x441, 0x434, 0x4af, 0x433, 0x44d, 0x44d, 0x440, 0x20, 0x441, 0x430, 0x440, 0x3b, 0x430, 0x440, 0x430,
+0x432, 0x434, 0x443, 0x433, 0x430, 0x430, 0x440, 0x20, 0x441, 0x430, 0x440, 0x3b, 0x430, 0x440, 0x432, 0x430, 0x43d, 0x20, 0x43d, 0x44d,
+0x433, 0x434, 0x4af, 0x433, 0x44d, 0x44d, 0x440, 0x20, 0x441, 0x430, 0x440, 0x3b, 0x430, 0x440, 0x432, 0x430, 0x43d, 0x20, 0x445, 0x43e,
+0x451, 0x440, 0x434, 0x443, 0x433, 0x430, 0x430, 0x440, 0x20, 0x441, 0x430, 0x440, 0x31, 0x2d, 0x440, 0x20, 0x441, 0x430, 0x440, 0x3b,
+0x32, 0x2d, 0x440, 0x20, 0x441, 0x430, 0x440, 0x3b, 0x33, 0x2d, 0x440, 0x20, 0x441, 0x430, 0x440, 0x3b, 0x34, 0x2d, 0x440, 0x20,
+0x441, 0x430, 0x440, 0x3b, 0x35, 0x2d, 0x440, 0x20, 0x441, 0x430, 0x440, 0x3b, 0x36, 0x2d, 0x440, 0x20, 0x441, 0x430, 0x440, 0x3b,
+0x37, 0x2d, 0x440, 0x20, 0x441, 0x430, 0x440, 0x3b, 0x38, 0x2d, 0x440, 0x20, 0x441, 0x430, 0x440, 0x3b, 0x39, 0x2d, 0x440, 0x20,
+0x441, 0x430, 0x440, 0x3b, 0x31, 0x30, 0x2d, 0x440, 0x20, 0x441, 0x430, 0x440, 0x3b, 0x31, 0x31, 0x2d, 0x440, 0x20, 0x441, 0x430,
+0x440, 0x3b, 0x31, 0x32, 0x2d, 0x440, 0x20, 0x441, 0x430, 0x440, 0x49, 0x3b, 0x49, 0x49, 0x3b, 0x49, 0x49, 0x49, 0x3b, 0x49,
+0x56, 0x3b, 0x56, 0x3b, 0x56, 0x49, 0x3b, 0x56, 0x49, 0x49, 0x3b, 0x56, 0x49, 0x49, 0x49, 0x3b, 0x49, 0x58, 0x3b, 0x58,
+0x3b, 0x58, 0x49, 0x3b, 0x58, 0x49, 0x49, 0x91c, 0x928, 0x935, 0x930, 0x940, 0x3b, 0x92b, 0x947, 0x92c, 0x94d, 0x930, 0x941, 0x905,
+0x930, 0x940, 0x3b, 0x92e, 0x93e, 0x930, 0x94d, 0x91a, 0x3b, 0x905, 0x92a, 0x94d, 0x930, 0x93f, 0x932, 0x3b, 0x92e, 0x947, 0x3b, 0x91c,
+0x941, 0x928, 0x3b, 0x91c, 0x941, 0x932, 0x93e, 0x908, 0x3b, 0x905, 0x917, 0x938, 0x94d, 0x91f, 0x3b, 0x938, 0x947, 0x92a, 0x94d, 0x91f,
+0x947, 0x92e, 0x94d, 0x92c, 0x930, 0x3b, 0x905, 0x915, 0x94d, 0x91f, 0x94b, 0x92c, 0x930, 0x3b, 0x928, 0x94b, 0x92d, 0x947, 0x92e, 0x94d,
+0x92c, 0x930, 0x3b, 0x921, 0x93f, 0x938, 0x947, 0x92e, 0x94d, 0x92c, 0x930, 0x91c, 0x928, 0x3b, 0x92b, 0x947, 0x947, 0x92c, 0x3b, 0x92e,
+0x93e, 0x930, 0x94d, 0x91a, 0x3b, 0x905, 0x92a, 0x94d, 0x930, 0x3b, 0x92e, 0x947, 0x3b, 0x91c, 0x941, 0x928, 0x3b, 0x91c, 0x941, 0x932,
+0x3b, 0x905, 0x917, 0x3b, 0x938, 0x947, 0x92a, 0x3b, 0x905, 0x915, 0x94d, 0x91f, 0x94b, 0x3b, 0x928, 0x94b, 0x92d, 0x947, 0x3b, 0x921,
+0x93f, 0x938, 0x947, 0x91c, 0x928, 0x3b, 0x92b, 0x947, 0x92c, 0x3b, 0x92e, 0x93e, 0x930, 0x94d, 0x91a, 0x3b, 0x905, 0x92a, 0x94d, 0x930,
+0x3b, 0x92e, 0x947, 0x3b, 0x91c, 0x941, 0x928, 0x3b, 0x91c, 0x941, 0x932, 0x3b, 0x905, 0x917, 0x3b, 0x938, 0x947, 0x92a, 0x3b, 0x905,
+0x915, 0x94d, 0x91f, 0x94b, 0x3b, 0x928, 0x94b, 0x92d, 0x947, 0x3b, 0x921, 0x93f, 0x938, 0x947, 0x6a, 0x61, 0x6e, 0x75, 0x61, 0x72,
+0x3b, 0x66, 0x65, 0x62, 0x72, 0x75, 0x61, 0x72, 0x3b, 0x6d, 0x61, 0x72, 0x73, 0x3b, 0x61, 0x70, 0x72, 0x69, 0x6c, 0x3b,
+0x6d, 0x61, 0x69, 0x3b, 0x6a, 0x75, 0x6e, 0x69, 0x3b, 0x6a, 0x75, 0x6c, 0x69, 0x3b, 0x61, 0x75, 0x67, 0x75, 0x73, 0x74,
+0x3b, 0x73, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x6f, 0x6b, 0x74, 0x6f, 0x62, 0x65, 0x72, 0x3b, 0x6e,
+0x6f, 0x76, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x64, 0x65, 0x73, 0x65, 0x6d, 0x62, 0x65, 0x72, 0xb1c, 0xb3e, 0xb28, 0xb41,
+0xb06, 0xb30, 0xb40, 0x3b, 0xb2b, 0xb47, 0xb2c, 0xb43, 0xb06, 0xb30, 0xb40, 0x3b, 0xb2e, 0xb3e, 0xb30, 0xb4d, 0xb1a, 0xb4d, 0xb1a, 0x3b,
+0xb05, 0xb2a, 0xb4d, 0xb30, 0xb47, 0xb32, 0x3b, 0xb2e, 0xb07, 0x3b, 0xb1c, 0xb41, 0xb28, 0x3b, 0xb1c, 0xb41, 0xb32, 0xb3e, 0xb07, 0x3b,
+0xb05, 0xb17, 0xb37, 0xb4d, 0xb1f, 0x3b, 0xb38, 0xb47, 0xb2a, 0xb4d, 0xb1f, 0xb47, 0xb2e, 0xb4d, 0xb2c, 0xb30, 0x3b, 0xb05, 0xb15, 0xb4d,
+0xb1f, 0xb4b, 0xb2c, 0xb30, 0x3b, 0xb28, 0xb2d, 0xb47, 0xb2e, 0xb4d, 0xb2c, 0xb30, 0x3b, 0xb21, 0xb3f, 0xb38, 0xb47, 0xb2e, 0xb4d, 0xb2c,
+0xb30, 0xb1c, 0xb3e, 0x3b, 0xb2b, 0xb47, 0x3b, 0xb2e, 0xb3e, 0x3b, 0xb05, 0x3b, 0xb2e, 0xb07, 0x3b, 0xb1c, 0xb41, 0x3b, 0xb1c, 0xb41,
+0x3b, 0xb05, 0x3b, 0xb38, 0xb47, 0x3b, 0xb05, 0x3b, 0xb28, 0x3b, 0xb21, 0xb3f, 0x62c, 0x646, 0x648, 0x631, 0x64a, 0x3b, 0x641, 0x6d0,
+0x628, 0x631, 0x648, 0x631, 0x64a, 0x3b, 0x645, 0x627, 0x631, 0x686, 0x3b, 0x627, 0x67e, 0x631, 0x6cc, 0x644, 0x3b, 0x645, 0x6cd, 0x3b,
+0x62c, 0x648, 0x646, 0x3b, 0x62c, 0x648, 0x644, 0x627, 0x6cc, 0x3b, 0x627, 0x6ab, 0x633, 0x62a, 0x3b, 0x633, 0x67e, 0x62a, 0x645, 0x628,
+0x631, 0x3b, 0x627, 0x6a9, 0x62a, 0x648, 0x628, 0x631, 0x3b, 0x646, 0x648, 0x645, 0x628, 0x631, 0x3b, 0x62f, 0x633, 0x645, 0x628, 0x631,
+0x62c, 0x646, 0x648, 0x631, 0x64a, 0x3b, 0x641, 0x628, 0x631, 0x648, 0x631, 0x64a, 0x3b, 0x645, 0x627, 0x631, 0x686, 0x3b, 0x627, 0x67e,
+0x631, 0x6cc, 0x644, 0x3b, 0x645, 0x6cd, 0x3b, 0x62c, 0x648, 0x646, 0x3b, 0x62c, 0x648, 0x644, 0x627, 0x6cc, 0x3b, 0x627, 0x6ab, 0x633,
+0x62a, 0x3b, 0x633, 0x6d0, 0x67e, 0x62a, 0x645, 0x628, 0x631, 0x3b, 0x627, 0x6a9, 0x62a, 0x648, 0x628, 0x631, 0x3b, 0x646, 0x648, 0x645,
+0x628, 0x631, 0x3b, 0x62f, 0x633, 0x645, 0x628, 0x631, 0x62c, 0x646, 0x648, 0x631, 0x64a, 0x3b, 0x641, 0x628, 0x631, 0x648, 0x631, 0x64a,
+0x3b, 0x645, 0x627, 0x631, 0x686, 0x3b, 0x627, 0x67e, 0x631, 0x6cc, 0x644, 0x3b, 0x645, 0x6cd, 0x3b, 0x62c, 0x648, 0x646, 0x3b, 0x62c,
+0x648, 0x644, 0x627, 0x6cc, 0x3b, 0x627, 0x6ab, 0x633, 0x62a, 0x3b, 0x633, 0x67e, 0x62a, 0x645, 0x628, 0x631, 0x3b, 0x627, 0x6a9, 0x62a,
+0x648, 0x628, 0x631, 0x3b, 0x646, 0x648, 0x645, 0x628, 0x631, 0x3b, 0x62f, 0x633, 0x645, 0x628, 0x631, 0x62c, 0x3b, 0x641, 0x3b, 0x645,
+0x3b, 0x627, 0x3b, 0x645, 0x3b, 0x62c, 0x3b, 0x62c, 0x3b, 0x627, 0x3b, 0x633, 0x3b, 0x627, 0x3b, 0x646, 0x3b, 0x62f, 0x698, 0x627,
+0x646, 0x648, 0x6cc, 0x647, 0x3b, 0x641, 0x648, 0x631, 0x6cc, 0x647, 0x3b, 0x645, 0x627, 0x631, 0x633, 0x3b, 0x622, 0x648, 0x631, 0x6cc,
+0x644, 0x3b, 0x645, 0x647, 0x3b, 0x698, 0x648, 0x626, 0x646, 0x3b, 0x698, 0x648, 0x626, 0x6cc, 0x647, 0x3b, 0x627, 0x648, 0x62a, 0x3b,
+0x633, 0x67e, 0x62a, 0x627, 0x645, 0x628, 0x631, 0x3b, 0x627, 0x6a9, 0x62a, 0x628, 0x631, 0x3b, 0x646, 0x648, 0x627, 0x645, 0x628, 0x631,
+0x3b, 0x62f, 0x633, 0x627, 0x645, 0x628, 0x631, 0x698, 0x627, 0x646, 0x648, 0x6cc, 0x647, 0x654, 0x3b, 0x641, 0x648, 0x631, 0x6cc, 0x647,
+0x654, 0x3b, 0x645, 0x627, 0x631, 0x633, 0x3b, 0x622, 0x648, 0x631, 0x6cc, 0x644, 0x3b, 0x645, 0x647, 0x654, 0x3b, 0x698, 0x648, 0x626,
+0x646, 0x3b, 0x698, 0x648, 0x626, 0x6cc, 0x647, 0x654, 0x3b, 0x627, 0x648, 0x62a, 0x3b, 0x633, 0x67e, 0x62a, 0x627, 0x645, 0x628, 0x631,
+0x3b, 0x627, 0x6a9, 0x62a, 0x628, 0x631, 0x3b, 0x646, 0x648, 0x627, 0x645, 0x628, 0x631, 0x3b, 0x62f, 0x633, 0x627, 0x645, 0x628, 0x631,
+0x698, 0x3b, 0x641, 0x3b, 0x645, 0x3b, 0x622, 0x3b, 0x645, 0x3b, 0x698, 0x3b, 0x698, 0x3b, 0x627, 0x3b, 0x633, 0x3b, 0x627, 0x3b,
+0x646, 0x3b, 0x62f, 0x62c, 0x646, 0x648, 0x631, 0x6cc, 0x3b, 0x641, 0x628, 0x631, 0x648, 0x631, 0x6cc, 0x3b, 0x645, 0x627, 0x631, 0x686,
+0x3b, 0x627, 0x67e, 0x631, 0x6cc, 0x644, 0x3b, 0x645, 0x6cc, 0x3b, 0x62c, 0x648, 0x646, 0x3b, 0x62c, 0x648, 0x644, 0x627, 0x6cc, 0x3b,
+0x627, 0x6af, 0x633, 0x62a, 0x3b, 0x633, 0x67e, 0x62a, 0x645, 0x628, 0x631, 0x3b, 0x627, 0x6a9, 0x62a, 0x648, 0x628, 0x631, 0x3b, 0x646,
+0x648, 0x645, 0x628, 0x631, 0x3b, 0x62f, 0x633, 0x645, 0x628, 0x631, 0x62c, 0x646, 0x648, 0x3b, 0x641, 0x628, 0x631, 0x648, 0x631, 0x6cc,
+0x3b, 0x645, 0x627, 0x631, 0x686, 0x3b, 0x627, 0x67e, 0x631, 0x6cc, 0x644, 0x3b, 0x645, 0x6cc, 0x3b, 0x62c, 0x648, 0x646, 0x3b, 0x62c,
+0x648, 0x644, 0x3b, 0x627, 0x6af, 0x633, 0x62a, 0x3b, 0x633, 0x67e, 0x62a, 0x645, 0x628, 0x631, 0x3b, 0x627, 0x6a9, 0x62a, 0x648, 0x628,
+0x631, 0x3b, 0x646, 0x648, 0x645, 0x628, 0x631, 0x3b, 0x62f, 0x633, 0x645, 0x73, 0x74, 0x79, 0x63, 0x7a, 0x65, 0x144, 0x3b, 0x6c,
+0x75, 0x74, 0x79, 0x3b, 0x6d, 0x61, 0x72, 0x7a, 0x65, 0x63, 0x3b, 0x6b, 0x77, 0x69, 0x65, 0x63, 0x69, 0x65, 0x144, 0x3b,
+0x6d, 0x61, 0x6a, 0x3b, 0x63, 0x7a, 0x65, 0x72, 0x77, 0x69, 0x65, 0x63, 0x3b, 0x6c, 0x69, 0x70, 0x69, 0x65, 0x63, 0x3b,
+0x73, 0x69, 0x65, 0x72, 0x70, 0x69, 0x65, 0x144, 0x3b, 0x77, 0x72, 0x7a, 0x65, 0x73, 0x69, 0x65, 0x144, 0x3b, 0x70, 0x61,
+0x17a, 0x64, 0x7a, 0x69, 0x65, 0x72, 0x6e, 0x69, 0x6b, 0x3b, 0x6c, 0x69, 0x73, 0x74, 0x6f, 0x70, 0x61, 0x64, 0x3b, 0x67,
+0x72, 0x75, 0x64, 0x7a, 0x69, 0x65, 0x144, 0x73, 0x74, 0x79, 0x63, 0x7a, 0x6e, 0x69, 0x61, 0x3b, 0x6c, 0x75, 0x74, 0x65,
+0x67, 0x6f, 0x3b, 0x6d, 0x61, 0x72, 0x63, 0x61, 0x3b, 0x6b, 0x77, 0x69, 0x65, 0x74, 0x6e, 0x69, 0x61, 0x3b, 0x6d, 0x61,
+0x6a, 0x61, 0x3b, 0x63, 0x7a, 0x65, 0x72, 0x77, 0x63, 0x61, 0x3b, 0x6c, 0x69, 0x70, 0x63, 0x61, 0x3b, 0x73, 0x69, 0x65,
+0x72, 0x70, 0x6e, 0x69, 0x61, 0x3b, 0x77, 0x72, 0x7a, 0x65, 0x15b, 0x6e, 0x69, 0x61, 0x3b, 0x70, 0x61, 0x17a, 0x64, 0x7a,
+0x69, 0x65, 0x72, 0x6e, 0x69, 0x6b, 0x61, 0x3b, 0x6c, 0x69, 0x73, 0x74, 0x6f, 0x70, 0x61, 0x64, 0x61, 0x3b, 0x67, 0x72,
+0x75, 0x64, 0x6e, 0x69, 0x61, 0x73, 0x74, 0x79, 0x3b, 0x6c, 0x75, 0x74, 0x3b, 0x6d, 0x61, 0x72, 0x3b, 0x6b, 0x77, 0x69,
+0x3b, 0x6d, 0x61, 0x6a, 0x3b, 0x63, 0x7a, 0x65, 0x3b, 0x6c, 0x69, 0x70, 0x3b, 0x73, 0x69, 0x65, 0x3b, 0x77, 0x72, 0x7a,
+0x3b, 0x70, 0x61, 0x17a, 0x3b, 0x6c, 0x69, 0x73, 0x3b, 0x67, 0x72, 0x75, 0x53, 0x3b, 0x4c, 0x3b, 0x4d, 0x3b, 0x4b, 0x3b,
+0x4d, 0x3b, 0x43, 0x3b, 0x4c, 0x3b, 0x53, 0x3b, 0x57, 0x3b, 0x50, 0x3b, 0x4c, 0x3b, 0x47, 0x73, 0x3b, 0x6c, 0x3b, 0x6d,
+0x3b, 0x6b, 0x3b, 0x6d, 0x3b, 0x63, 0x3b, 0x6c, 0x3b, 0x73, 0x3b, 0x77, 0x3b, 0x70, 0x3b, 0x6c, 0x3b, 0x67, 0x6a, 0x61,
+0x6e, 0x65, 0x69, 0x72, 0x6f, 0x3b, 0x66, 0x65, 0x76, 0x65, 0x72, 0x65, 0x69, 0x72, 0x6f, 0x3b, 0x6d, 0x61, 0x72, 0xe7,
+0x6f, 0x3b, 0x61, 0x62, 0x72, 0x69, 0x6c, 0x3b, 0x6d, 0x61, 0x69, 0x6f, 0x3b, 0x6a, 0x75, 0x6e, 0x68, 0x6f, 0x3b, 0x6a,
+0x75, 0x6c, 0x68, 0x6f, 0x3b, 0x61, 0x67, 0x6f, 0x73, 0x74, 0x6f, 0x3b, 0x73, 0x65, 0x74, 0x65, 0x6d, 0x62, 0x72, 0x6f,
+0x3b, 0x6f, 0x75, 0x74, 0x75, 0x62, 0x72, 0x6f, 0x3b, 0x6e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x72, 0x6f, 0x3b, 0x64, 0x65,
+0x7a, 0x65, 0x6d, 0x62, 0x72, 0x6f, 0x6a, 0x61, 0x6e, 0x2e, 0x3b, 0x66, 0x65, 0x76, 0x2e, 0x3b, 0x6d, 0x61, 0x72, 0x2e,
+0x3b, 0x61, 0x62, 0x72, 0x2e, 0x3b, 0x6d, 0x61, 0x69, 0x2e, 0x3b, 0x6a, 0x75, 0x6e, 0x2e, 0x3b, 0x6a, 0x75, 0x6c, 0x2e,
+0x3b, 0x61, 0x67, 0x6f, 0x2e, 0x3b, 0x73, 0x65, 0x74, 0x2e, 0x3b, 0x6f, 0x75, 0x74, 0x2e, 0x3b, 0x6e, 0x6f, 0x76, 0x2e,
+0x3b, 0x64, 0x65, 0x7a, 0x2e, 0xa1c, 0xa28, 0xa35, 0xa30, 0xa40, 0x3b, 0xa2b, 0xa3c, 0xa30, 0xa35, 0xa30, 0xa40, 0x3b, 0xa2e, 0xa3e,
+0xa30, 0xa1a, 0x3b, 0xa05, 0xa2a, 0xa4d, 0xa30, 0xa48, 0xa32, 0x3b, 0xa2e, 0xa08, 0x3b, 0xa1c, 0xa42, 0xa28, 0x3b, 0xa1c, 0xa41, 0xa32,
+0xa3e, 0xa08, 0x3b, 0xa05, 0xa17, 0xa38, 0xa24, 0x3b, 0xa38, 0xa24, 0xa70, 0xa2c, 0xa30, 0x3b, 0xa05, 0xa15, 0xa24, 0xa42, 0xa2c, 0xa30,
+0x3b, 0xa28, 0xa35, 0xa70, 0xa2c, 0xa30, 0x3b, 0xa26, 0xa38, 0xa70, 0xa2c, 0xa30, 0xa1c, 0xa28, 0x3b, 0xa2b, 0xa3c, 0xa30, 0x3b, 0xa2e,
+0xa3e, 0xa30, 0xa1a, 0x3b, 0xa05, 0xa2a, 0xa4d, 0xa30, 0xa48, 0x3b, 0xa2e, 0xa08, 0x3b, 0xa1c, 0xa42, 0xa28, 0x3b, 0xa1c, 0xa41, 0xa32,
+0xa3e, 0x3b, 0xa05, 0xa17, 0x3b, 0xa38, 0xa24, 0xa70, 0x3b, 0xa05, 0xa15, 0xa24, 0xa42, 0x3b, 0xa28, 0xa35, 0xa70, 0x3b, 0xa26, 0xa38,
+0xa70, 0xa1c, 0x3b, 0xa2b, 0xa3c, 0x3b, 0xa2e, 0xa3e, 0x3b, 0xa05, 0x3b, 0xa2e, 0x3b, 0xa1c, 0xa42, 0x3b, 0xa1c, 0xa41, 0x3b, 0xa05,
+0x3b, 0xa38, 0x3b, 0xa05, 0x3b, 0xa28, 0x3b, 0xa26, 0x62c, 0x646, 0x648, 0x631, 0x6cc, 0x3b, 0x641, 0x631, 0x648, 0x631, 0x6cc, 0x3b,
+0x645, 0x627, 0x631, 0x686, 0x3b, 0x627, 0x67e, 0x631, 0x6cc, 0x644, 0x3b, 0x645, 0x626, 0x3b, 0x62c, 0x648, 0x646, 0x3b, 0x62c, 0x648,
+0x644, 0x627, 0x626, 0x6cc, 0x3b, 0x627, 0x6af, 0x633, 0x62a, 0x3b, 0x633, 0x62a, 0x645, 0x628, 0x631, 0x3b, 0x627, 0x6a9, 0x62a, 0x648,
+0x628, 0x631, 0x3b, 0x646, 0x648, 0x645, 0x628, 0x631, 0x3b, 0x62f, 0x633, 0x645, 0x628, 0x631, 0x45, 0x6e, 0x65, 0x72, 0x6f, 0x3b,
+0x46, 0x65, 0x62, 0x72, 0x65, 0x72, 0x6f, 0x3b, 0x4d, 0x61, 0x72, 0x7a, 0x6f, 0x3b, 0x41, 0x62, 0x72, 0x69, 0x6c, 0x3b,
+0x4d, 0x61, 0x79, 0x6f, 0x3b, 0x4a, 0x75, 0x6e, 0x69, 0x6f, 0x3b, 0x4a, 0x75, 0x6c, 0x69, 0x6f, 0x3b, 0x41, 0x67, 0x6f,
+0x73, 0x74, 0x6f, 0x3b, 0x53, 0x65, 0x74, 0x69, 0x65, 0x6d, 0x62, 0x72, 0x65, 0x3b, 0x4f, 0x63, 0x74, 0x75, 0x62, 0x72,
+0x65, 0x3b, 0x4e, 0x6f, 0x76, 0x69, 0x65, 0x6d, 0x62, 0x72, 0x65, 0x3b, 0x44, 0x69, 0x63, 0x69, 0x65, 0x6d, 0x62, 0x72,
+0x65, 0x45, 0x6e, 0x65, 0x3b, 0x46, 0x65, 0x62, 0x3b, 0x4d, 0x61, 0x72, 0x3b, 0x41, 0x62, 0x72, 0x3b, 0x4d, 0x61, 0x79,
+0x3b, 0x4a, 0x75, 0x6e, 0x3b, 0x4a, 0x75, 0x6c, 0x3b, 0x41, 0x67, 0x6f, 0x3b, 0x53, 0x65, 0x74, 0x3b, 0x4f, 0x63, 0x74,
+0x3b, 0x4e, 0x6f, 0x76, 0x3b, 0x44, 0x69, 0x63, 0x73, 0x63, 0x68, 0x61, 0x6e, 0x65, 0x72, 0x3b, 0x66, 0x61, 0x76, 0x72,
+0x65, 0x72, 0x3b, 0x6d, 0x61, 0x72, 0x73, 0x3b, 0x61, 0x76, 0x72, 0x69, 0x67, 0x6c, 0x3b, 0x6d, 0x61, 0x74, 0x67, 0x3b,
+0x7a, 0x65, 0x72, 0x63, 0x6c, 0x61, 0x64, 0x75, 0x72, 0x3b, 0x66, 0x61, 0x6e, 0x61, 0x64, 0x75, 0x72, 0x3b, 0x61, 0x76,
+0x75, 0x73, 0x74, 0x3b, 0x73, 0x65, 0x74, 0x74, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x6f, 0x63, 0x74, 0x6f, 0x62, 0x65,
+0x72, 0x3b, 0x6e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x64, 0x65, 0x63, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x64,
+0x61, 0x20, 0x73, 0x63, 0x68, 0x61, 0x6e, 0x65, 0x72, 0x3b, 0x64, 0x61, 0x20, 0x66, 0x61, 0x76, 0x72, 0x65, 0x72, 0x3b,
+0x64, 0x61, 0x20, 0x6d, 0x61, 0x72, 0x73, 0x3b, 0x64, 0x2019, 0x61, 0x76, 0x72, 0x69, 0x67, 0x6c, 0x3b, 0x64, 0x61, 0x20,
+0x6d, 0x61, 0x74, 0x67, 0x3b, 0x64, 0x61, 0x20, 0x7a, 0x65, 0x72, 0x63, 0x6c, 0x61, 0x64, 0x75, 0x72, 0x3b, 0x64, 0x61,
+0x20, 0x66, 0x61, 0x6e, 0x61, 0x64, 0x75, 0x72, 0x3b, 0x64, 0x2019, 0x61, 0x76, 0x75, 0x73, 0x74, 0x3b, 0x64, 0x61, 0x20,
+0x73, 0x65, 0x74, 0x74, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x64, 0x2019, 0x6f, 0x63, 0x74, 0x6f, 0x62, 0x65, 0x72, 0x3b,
+0x64, 0x61, 0x20, 0x6e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x64, 0x61, 0x20, 0x64, 0x65, 0x63, 0x65, 0x6d,
+0x62, 0x65, 0x72, 0x73, 0x63, 0x68, 0x61, 0x6e, 0x2e, 0x3b, 0x66, 0x61, 0x76, 0x72, 0x2e, 0x3b, 0x6d, 0x61, 0x72, 0x73,
+0x3b, 0x61, 0x76, 0x72, 0x2e, 0x3b, 0x6d, 0x61, 0x74, 0x67, 0x3b, 0x7a, 0x65, 0x72, 0x63, 0x6c, 0x2e, 0x3b, 0x66, 0x61,
+0x6e, 0x2e, 0x3b, 0x61, 0x76, 0x75, 0x73, 0x74, 0x3b, 0x73, 0x65, 0x74, 0x74, 0x2e, 0x3b, 0x6f, 0x63, 0x74, 0x2e, 0x3b,
+0x6e, 0x6f, 0x76, 0x2e, 0x3b, 0x64, 0x65, 0x63, 0x2e, 0x53, 0x3b, 0x46, 0x3b, 0x4d, 0x3b, 0x41, 0x3b, 0x4d, 0x3b, 0x5a,
+0x3b, 0x46, 0x3b, 0x41, 0x3b, 0x53, 0x3b, 0x4f, 0x3b, 0x4e, 0x3b, 0x44, 0x69, 0x61, 0x6e, 0x75, 0x61, 0x72, 0x69, 0x65,
+0x3b, 0x66, 0x65, 0x62, 0x72, 0x75, 0x61, 0x72, 0x69, 0x65, 0x3b, 0x6d, 0x61, 0x72, 0x74, 0x69, 0x65, 0x3b, 0x61, 0x70,
+0x72, 0x69, 0x6c, 0x69, 0x65, 0x3b, 0x6d, 0x61, 0x69, 0x3b, 0x69, 0x75, 0x6e, 0x69, 0x65, 0x3b, 0x69, 0x75, 0x6c, 0x69,
+0x65, 0x3b, 0x61, 0x75, 0x67, 0x75, 0x73, 0x74, 0x3b, 0x73, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x72, 0x69, 0x65, 0x3b,
+0x6f, 0x63, 0x74, 0x6f, 0x6d, 0x62, 0x72, 0x69, 0x65, 0x3b, 0x6e, 0x6f, 0x69, 0x65, 0x6d, 0x62, 0x72, 0x69, 0x65, 0x3b,
+0x64, 0x65, 0x63, 0x65, 0x6d, 0x62, 0x72, 0x69, 0x65, 0x69, 0x61, 0x6e, 0x2e, 0x3b, 0x66, 0x65, 0x62, 0x2e, 0x3b, 0x6d,
+0x61, 0x72, 0x2e, 0x3b, 0x61, 0x70, 0x72, 0x2e, 0x3b, 0x6d, 0x61, 0x69, 0x3b, 0x69, 0x75, 0x6e, 0x2e, 0x3b, 0x69, 0x75,
+0x6c, 0x2e, 0x3b, 0x61, 0x75, 0x67, 0x2e, 0x3b, 0x73, 0x65, 0x70, 0x74, 0x2e, 0x3b, 0x6f, 0x63, 0x74, 0x2e, 0x3b, 0x6e,
+0x6f, 0x76, 0x2e, 0x3b, 0x64, 0x65, 0x63, 0x2e, 0x49, 0x3b, 0x46, 0x3b, 0x4d, 0x3b, 0x41, 0x3b, 0x4d, 0x3b, 0x49, 0x3b,
+0x49, 0x3b, 0x41, 0x3b, 0x53, 0x3b, 0x4f, 0x3b, 0x4e, 0x3b, 0x44, 0x44f, 0x43d, 0x432, 0x430, 0x440, 0x44f, 0x3b, 0x444, 0x435,
+0x432, 0x440, 0x430, 0x43b, 0x44f, 0x3b, 0x43c, 0x430, 0x440, 0x442, 0x430, 0x3b, 0x430, 0x43f, 0x440, 0x435, 0x43b, 0x44f, 0x3b, 0x43c,
+0x430, 0x44f, 0x3b, 0x438, 0x44e, 0x43d, 0x44f, 0x3b, 0x438, 0x44e, 0x43b, 0x44f, 0x3b, 0x430, 0x432, 0x433, 0x443, 0x441, 0x442, 0x430,
+0x3b, 0x441, 0x435, 0x43d, 0x442, 0x44f, 0x431, 0x440, 0x44f, 0x3b, 0x43e, 0x43a, 0x442, 0x44f, 0x431, 0x440, 0x44f, 0x3b, 0x43d, 0x43e,
+0x44f, 0x431, 0x440, 0x44f, 0x3b, 0x434, 0x435, 0x43a, 0x430, 0x431, 0x440, 0x44f, 0x44f, 0x43d, 0x432, 0x2e, 0x3b, 0x444, 0x435, 0x432,
+0x440, 0x2e, 0x3b, 0x43c, 0x430, 0x440, 0x442, 0x3b, 0x430, 0x43f, 0x440, 0x2e, 0x3b, 0x43c, 0x430, 0x439, 0x3b, 0x438, 0x44e, 0x43d,
+0x44c, 0x3b, 0x438, 0x44e, 0x43b, 0x44c, 0x3b, 0x430, 0x432, 0x433, 0x2e, 0x3b, 0x441, 0x435, 0x43d, 0x442, 0x2e, 0x3b, 0x43e, 0x43a,
+0x442, 0x2e, 0x3b, 0x43d, 0x43e, 0x44f, 0x431, 0x2e, 0x3b, 0x434, 0x435, 0x43a, 0x2e, 0x44f, 0x43d, 0x432, 0x2e, 0x3b, 0x444, 0x435,
+0x432, 0x440, 0x2e, 0x3b, 0x43c, 0x430, 0x440, 0x2e, 0x3b, 0x430, 0x43f, 0x440, 0x2e, 0x3b, 0x43c, 0x430, 0x44f, 0x3b, 0x438, 0x44e,
+0x43d, 0x2e, 0x3b, 0x438, 0x44e, 0x43b, 0x2e, 0x3b, 0x430, 0x432, 0x433, 0x2e, 0x3b, 0x441, 0x435, 0x43d, 0x442, 0x2e, 0x3b, 0x43e,
+0x43a, 0x442, 0x2e, 0x3b, 0x43d, 0x43e, 0x44f, 0x431, 0x2e, 0x3b, 0x434, 0x435, 0x43a, 0x2e, 0x4e, 0x79, 0x65, 0x6e, 0x79, 0x65,
+0x3b, 0x46, 0x75, 0x6c, 0x75, 0x6e, 0x64, 0xef, 0x67, 0x69, 0x3b, 0x4d, 0x62, 0xe4, 0x6e, 0x67, 0xfc, 0x3b, 0x4e, 0x67,
+0x75, 0x62, 0xf9, 0x65, 0x3b, 0x42, 0xea, 0x6c, 0xe4, 0x77, 0xfc, 0x3b, 0x46, 0xf6, 0x6e, 0x64, 0x6f, 0x3b, 0x4c, 0x65,
+0x6e, 0x67, 0x75, 0x61, 0x3b, 0x4b, 0xfc, 0x6b, 0xfc, 0x72, 0xfc, 0x3b, 0x4d, 0x76, 0x75, 0x6b, 0x61, 0x3b, 0x4e, 0x67,
+0x62, 0x65, 0x72, 0x65, 0x72, 0x65, 0x3b, 0x4e, 0x61, 0x62, 0xe4, 0x6e, 0x64, 0xfc, 0x72, 0x75, 0x3b, 0x4b, 0x61, 0x6b,
+0x61, 0x75, 0x6b, 0x61, 0x4e, 0x79, 0x65, 0x3b, 0x46, 0x75, 0x6c, 0x3b, 0x4d, 0x62, 0xe4, 0x3b, 0x4e, 0x67, 0x75, 0x3b,
+0x42, 0xea, 0x6c, 0x3b, 0x46, 0xf6, 0x6e, 0x3b, 0x4c, 0x65, 0x6e, 0x3b, 0x4b, 0xfc, 0x6b, 0x3b, 0x4d, 0x76, 0x75, 0x3b,
+0x4e, 0x67, 0x62, 0x3b, 0x4e, 0x61, 0x62, 0x3b, 0x4b, 0x61, 0x6b, 0x4e, 0x3b, 0x46, 0x3b, 0x4d, 0x3b, 0x4e, 0x3b, 0x42,
+0x3b, 0x46, 0x3b, 0x4c, 0x3b, 0x4b, 0x3b, 0x4d, 0x3b, 0x4e, 0x3b, 0x4e, 0x3b, 0x4b, 0x458, 0x430, 0x43d, 0x443, 0x430, 0x440,
 0x3b, 0x444, 0x435, 0x431, 0x440, 0x443, 0x430, 0x440, 0x3b, 0x43c, 0x430, 0x440, 0x442, 0x3b, 0x430, 0x43f, 0x440, 0x438, 0x43b, 0x3b,
 0x43c, 0x430, 0x458, 0x3b, 0x458, 0x443, 0x43d, 0x3b, 0x458, 0x443, 0x43b, 0x3b, 0x430, 0x432, 0x433, 0x443, 0x441, 0x442, 0x3b, 0x441,
 0x435, 0x43f, 0x442, 0x435, 0x43c, 0x431, 0x430, 0x440, 0x3b, 0x43e, 0x43a, 0x442, 0x43e, 0x431, 0x430, 0x440, 0x3b, 0x43d, 0x43e, 0x432,
-0x435, 0x43c, 0x431, 0x430, 0x440, 0x3b, 0x434, 0x435, 0x446, 0x435, 0x43c, 0x431, 0x430, 0x440, 0x3b, 0x458, 0x430, 0x43d, 0x3b, 0x444,
-0x435, 0x431, 0x3b, 0x43c, 0x430, 0x440, 0x442, 0x3b, 0x430, 0x43f, 0x440, 0x3b, 0x43c, 0x430, 0x458, 0x3b, 0x458, 0x443, 0x43d, 0x3b,
-0x458, 0x443, 0x43b, 0x3b, 0x430, 0x432, 0x433, 0x3b, 0x441, 0x435, 0x43f, 0x442, 0x3b, 0x43e, 0x43a, 0x442, 0x3b, 0x43d, 0x43e, 0x432,
-0x3b, 0x434, 0x435, 0x446, 0x3b, 0x6a, 0x61, 0x6e, 0x3b, 0x66, 0x65, 0x62, 0x3b, 0x6d, 0x61, 0x72, 0x3b, 0x61, 0x70, 0x72,
-0x3b, 0x6d, 0x61, 0x6a, 0x3b, 0x6a, 0x75, 0x6e, 0x3b, 0x6a, 0x75, 0x6c, 0x3b, 0x61, 0x76, 0x67, 0x3b, 0x73, 0x65, 0x70,
-0x3b, 0x6f, 0x6b, 0x74, 0x3b, 0x6e, 0x6f, 0x76, 0x3b, 0x64, 0x65, 0x63, 0x3b, 0x6a, 0x61, 0x6e, 0x75, 0x61, 0x72, 0x3b,
-0x66, 0x65, 0x62, 0x72, 0x75, 0x61, 0x72, 0x3b, 0x6d, 0x61, 0x72, 0x74, 0x3b, 0x61, 0x70, 0x72, 0x69, 0x6c, 0x3b, 0x6d,
-0x61, 0x6a, 0x3b, 0x6a, 0x75, 0x6e, 0x3b, 0x6a, 0x75, 0x6c, 0x3b, 0x61, 0x76, 0x67, 0x75, 0x73, 0x74, 0x3b, 0x73, 0x65,
-0x70, 0x74, 0x65, 0x6d, 0x62, 0x61, 0x72, 0x3b, 0x6f, 0x6b, 0x74, 0x6f, 0x62, 0x61, 0x72, 0x3b, 0x6e, 0x6f, 0x76, 0x65,
-0x6d, 0x62, 0x61, 0x72, 0x3b, 0x64, 0x65, 0x63, 0x65, 0x6d, 0x62, 0x61, 0x72, 0x3b, 0x6a, 0x61, 0x6e, 0x3b, 0x66, 0x65,
-0x62, 0x3b, 0x6d, 0x61, 0x72, 0x74, 0x3b, 0x61, 0x70, 0x72, 0x3b, 0x6d, 0x61, 0x6a, 0x3b, 0x6a, 0x75, 0x6e, 0x3b, 0x6a,
-0x75, 0x6c, 0x3b, 0x61, 0x76, 0x67, 0x3b, 0x73, 0x65, 0x70, 0x74, 0x3b, 0x6f, 0x6b, 0x74, 0x3b, 0x6e, 0x6f, 0x76, 0x3b,
-0x64, 0x65, 0x63, 0x3b, 0x42f, 0x43d, 0x432, 0x2e, 0x3b, 0x424, 0x435, 0x432, 0x440, 0x2e, 0x3b, 0x41c, 0x430, 0x440, 0x442, 0x2e,
-0x3b, 0x410, 0x43f, 0x440, 0x2e, 0x3b, 0x41c, 0x430, 0x439, 0x3b, 0x418, 0x44e, 0x43d, 0x44c, 0x3b, 0x418, 0x44e, 0x43b, 0x44c, 0x3b,
-0x410, 0x432, 0x433, 0x2e, 0x3b, 0x421, 0x435, 0x43d, 0x442, 0x2e, 0x3b, 0x41e, 0x43a, 0x442, 0x2e, 0x3b, 0x41d, 0x43e, 0x44f, 0x431,
-0x2e, 0x3b, 0x414, 0x435, 0x43a, 0x2e, 0x3b, 0x42f, 0x43d, 0x432, 0x430, 0x440, 0x44c, 0x3b, 0x424, 0x435, 0x432, 0x440, 0x430, 0x43b,
-0x44c, 0x3b, 0x41c, 0x430, 0x440, 0x442, 0x44a, 0x438, 0x3b, 0x410, 0x43f, 0x440, 0x435, 0x43b, 0x44c, 0x3b, 0x41c, 0x430, 0x439, 0x3b,
-0x418, 0x44e, 0x43d, 0x44c, 0x3b, 0x418, 0x44e, 0x43b, 0x44c, 0x3b, 0x410, 0x432, 0x433, 0x443, 0x441, 0x442, 0x3b, 0x421, 0x435, 0x43d,
-0x442, 0x44f, 0x431, 0x440, 0x44c, 0x3b, 0x41e, 0x43a, 0x442, 0x44f, 0x431, 0x440, 0x44c, 0x3b, 0x41d, 0x43e, 0x44f, 0x431, 0x440, 0x44c,
-0x3b, 0x414, 0x435, 0x43a, 0x430, 0x431, 0x440, 0x44c, 0x3b, 0x44f, 0x43d, 0x432, 0x2e, 0x3b, 0x444, 0x435, 0x432, 0x2e, 0x3b, 0x43c,
-0x430, 0x440, 0x2e, 0x3b, 0x430, 0x43f, 0x440, 0x2e, 0x3b, 0x43c, 0x430, 0x439, 0x44b, 0x3b, 0x438, 0x44e, 0x43d, 0x44b, 0x3b, 0x438,
-0x44e, 0x43b, 0x44b, 0x3b, 0x430, 0x432, 0x433, 0x2e, 0x3b, 0x441, 0x435, 0x43d, 0x2e, 0x3b, 0x43e, 0x43a, 0x442, 0x2e, 0x3b, 0x43d,
-0x43e, 0x44f, 0x2e, 0x3b, 0x434, 0x435, 0x43a, 0x2e, 0x3b, 0x44f, 0x43d, 0x432, 0x430, 0x440, 0x44b, 0x3b, 0x444, 0x435, 0x432, 0x440,
-0x430, 0x43b, 0x44b, 0x3b, 0x43c, 0x430, 0x440, 0x442, 0x44a, 0x438, 0x439, 0x44b, 0x3b, 0x430, 0x43f, 0x440, 0x435, 0x43b, 0x44b, 0x3b,
-0x43c, 0x430, 0x439, 0x44b, 0x3b, 0x438, 0x44e, 0x43d, 0x44b, 0x3b, 0x438, 0x44e, 0x43b, 0x44b, 0x3b, 0x430, 0x432, 0x433, 0x443, 0x441,
-0x442, 0x44b, 0x3b, 0x441, 0x435, 0x43d, 0x442, 0x44f, 0x431, 0x440, 0x44b, 0x3b, 0x43e, 0x43a, 0x442, 0x44f, 0x431, 0x440, 0x44b, 0x3b,
-0x43d, 0x43e, 0x44f, 0x431, 0x440, 0x44b, 0x3b, 0x434, 0x435, 0x43a, 0x430, 0x431, 0x440, 0x44b, 0x3b, 0x4e, 0x64, 0x69, 0x3b, 0x4b,
-0x75, 0x6b, 0x3b, 0x4b, 0x75, 0x72, 0x3b, 0x4b, 0x75, 0x62, 0x3b, 0x43, 0x68, 0x76, 0x3b, 0x43, 0x68, 0x6b, 0x3b, 0x43,
-0x68, 0x67, 0x3b, 0x4e, 0x79, 0x61, 0x3b, 0x47, 0x75, 0x6e, 0x3b, 0x47, 0x75, 0x6d, 0x3b, 0x4d, 0x62, 0x75, 0x3b, 0x5a,
-0x76, 0x69, 0x3b, 0x4e, 0x64, 0x69, 0x72, 0x61, 0x3b, 0x4b, 0x75, 0x6b, 0x61, 0x64, 0x7a, 0x69, 0x3b, 0x4b, 0x75, 0x72,
-0x75, 0x6d, 0x65, 0x3b, 0x4b, 0x75, 0x62, 0x76, 0x75, 0x6d, 0x62, 0x69, 0x3b, 0x43, 0x68, 0x69, 0x76, 0x61, 0x62, 0x76,
-0x75, 0x3b, 0x43, 0x68, 0x69, 0x6b, 0x75, 0x6d, 0x69, 0x3b, 0x43, 0x68, 0x69, 0x6b, 0x75, 0x6e, 0x67, 0x75, 0x72, 0x75,
-0x3b, 0x4e, 0x79, 0x61, 0x6d, 0x61, 0x76, 0x68, 0x75, 0x76, 0x68, 0x75, 0x3b, 0x47, 0x75, 0x6e, 0x79, 0x61, 0x6e, 0x61,
-0x3b, 0x47, 0x75, 0x6d, 0x69, 0x67, 0x75, 0x72, 0x75, 0x3b, 0x4d, 0x62, 0x75, 0x64, 0x7a, 0x69, 0x3b, 0x5a, 0x76, 0x69,
-0x74, 0x61, 0x3b, 0x4e, 0x3b, 0x4b, 0x3b, 0x4b, 0x3b, 0x4b, 0x3b, 0x43, 0x3b, 0x43, 0x3b, 0x43, 0x3b, 0x4e, 0x3b, 0x47,
-0x3b, 0x47, 0x3b, 0x4d, 0x3b, 0x5a, 0x3b, 0x62c, 0x646, 0x648, 0x631, 0x64a, 0x3b, 0x641, 0x64a, 0x628, 0x631, 0x648, 0x631, 0x64a,
-0x3b, 0x645, 0x627, 0x631, 0x686, 0x3b, 0x627, 0x67e, 0x631, 0x64a, 0x644, 0x3b, 0x645, 0x626, 0x64a, 0x3b, 0x62c, 0x648, 0x646, 0x3b,
-0x62c, 0x648, 0x644, 0x627, 0x621, 0x650, 0x3b, 0x622, 0x6af, 0x633, 0x67d, 0x3b, 0x633, 0x64a, 0x67e, 0x67d, 0x645, 0x628, 0x631, 0x3b,
-0x622, 0x6aa, 0x67d, 0x648, 0x628, 0x631, 0x3b, 0x646, 0x648, 0x645, 0x628, 0x631, 0x3b, 0x68a, 0x633, 0x645, 0x628, 0x631, 0x3b, 0xda2,
-0xdb1, 0x3b, 0xdb4, 0xdd9, 0xdb6, 0x3b, 0xdb8, 0xdcf, 0xdbb, 0xdca, 0x3b, 0xd85, 0xdb4, 0xdca, 0x200d, 0xdbb, 0xdda, 0xdbd, 0xdca, 0x3b,
-0xdb8, 0xdd0, 0xdba, 0xdd2, 0x3b, 0xda2, 0xdd6, 0xdb1, 0xdd2, 0x3b, 0xda2, 0xdd6, 0xdbd, 0xdd2, 0x3b, 0xd85, 0xd9c, 0xddd, 0x3b, 0xdc3,
-0xdd0, 0xdb4, 0xdca, 0x3b, 0xd94, 0xd9a, 0xdca, 0x3b, 0xdb1, 0xddc, 0xdc0, 0xdd0, 0x3b, 0xdaf, 0xdd9, 0xdc3, 0xdd0, 0x3b, 0xda2, 0xdb1,
-0xdc0, 0xdcf, 0xdbb, 0xdd2, 0x3b, 0xdb4, 0xdd9, 0xdb6, 0xdbb, 0xdc0, 0xdcf, 0xdbb, 0xdd2, 0x3b, 0xdb8, 0xdcf, 0xdbb, 0xdca, 0xdad, 0xdd4,
-0x3b, 0xd85, 0xdb4, 0xdca, 0x200d, 0xdbb, 0xdda, 0xdbd, 0xdca, 0x3b, 0xdb8, 0xdd0, 0xdba, 0xdd2, 0x3b, 0xda2, 0xdd6, 0xdb1, 0xdd2, 0x3b,
-0xda2, 0xdd6, 0xdbd, 0xdd2, 0x3b, 0xd85, 0xd9c, 0xddd, 0xdc3, 0xdca, 0xdad, 0xdd4, 0x3b, 0xdc3, 0xdd0, 0xdb4, 0xdca, 0xdad, 0xdd0, 0xdb8,
-0xdca, 0xdb6, 0xdbb, 0xdca, 0x3b, 0xd94, 0xd9a, 0xdca, 0xdad, 0xddd, 0xdb6, 0xdbb, 0xdca, 0x3b, 0xdb1, 0xddc, 0xdc0, 0xdd0, 0xdb8, 0xdca,
-0xdb6, 0xdbb, 0xdca, 0x3b, 0xdaf, 0xdd9, 0xdc3, 0xdd0, 0xdb8, 0xdca, 0xdb6, 0xdbb, 0xdca, 0x3b, 0xda2, 0x3b, 0xdb4, 0xdd9, 0x3b, 0xdb8,
-0xdcf, 0x3b, 0xd85, 0x3b, 0xdb8, 0xdd0, 0x3b, 0xda2, 0xdd6, 0x3b, 0xda2, 0xdd6, 0x3b, 0xd85, 0x3b, 0xdc3, 0xdd0, 0x3b, 0xd94, 0x3b,
-0xdb1, 0xdd9, 0x3b, 0xdaf, 0xdd9, 0x3b, 0xda2, 0xdb1, 0x3b, 0xdb4, 0xdd9, 0xdb6, 0x3b, 0xdb8, 0xdcf, 0xdbb, 0xdca, 0xdad, 0xdd4, 0x3b,
+0x435, 0x43c, 0x431, 0x430, 0x440, 0x3b, 0x434, 0x435, 0x446, 0x435, 0x43c, 0x431, 0x430, 0x440, 0x458, 0x430, 0x43d, 0x3b, 0x444, 0x435,
+0x431, 0x3b, 0x43c, 0x430, 0x440, 0x3b, 0x430, 0x43f, 0x440, 0x3b, 0x43c, 0x430, 0x458, 0x3b, 0x458, 0x443, 0x43d, 0x3b, 0x458, 0x443,
+0x43b, 0x3b, 0x430, 0x432, 0x433, 0x3b, 0x441, 0x435, 0x43f, 0x3b, 0x43e, 0x43a, 0x442, 0x3b, 0x43d, 0x43e, 0x432, 0x3b, 0x434, 0x435,
+0x446, 0x6a, 0x61, 0x6e, 0x75, 0x61, 0x72, 0x3b, 0x66, 0x65, 0x62, 0x72, 0x75, 0x61, 0x72, 0x3b, 0x6d, 0x61, 0x72, 0x74,
+0x3b, 0x61, 0x70, 0x72, 0x69, 0x6c, 0x3b, 0x6d, 0x61, 0x6a, 0x3b, 0x6a, 0x75, 0x6e, 0x3b, 0x6a, 0x75, 0x6c, 0x3b, 0x61,
+0x76, 0x67, 0x75, 0x73, 0x74, 0x3b, 0x73, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x61, 0x72, 0x3b, 0x6f, 0x6b, 0x74, 0x6f,
+0x62, 0x61, 0x72, 0x3b, 0x6e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x61, 0x72, 0x3b, 0x64, 0x65, 0x63, 0x65, 0x6d, 0x62, 0x61,
+0x72, 0x6a, 0x61, 0x6e, 0x3b, 0x66, 0x65, 0x62, 0x3b, 0x6d, 0x61, 0x72, 0x3b, 0x61, 0x70, 0x72, 0x3b, 0x6d, 0x61, 0x6a,
+0x3b, 0x6a, 0x75, 0x6e, 0x3b, 0x6a, 0x75, 0x6c, 0x3b, 0x61, 0x76, 0x67, 0x3b, 0x73, 0x65, 0x70, 0x3b, 0x6f, 0x6b, 0x74,
+0x3b, 0x6e, 0x6f, 0x76, 0x3b, 0x64, 0x65, 0x63, 0x6a, 0x61, 0x6e, 0x3b, 0x66, 0x65, 0x62, 0x3b, 0x6d, 0x61, 0x72, 0x74,
+0x3b, 0x61, 0x70, 0x72, 0x3b, 0x6d, 0x61, 0x6a, 0x3b, 0x6a, 0x75, 0x6e, 0x3b, 0x6a, 0x75, 0x6c, 0x3b, 0x61, 0x76, 0x67,
+0x3b, 0x73, 0x65, 0x70, 0x74, 0x3b, 0x6f, 0x6b, 0x74, 0x3b, 0x6e, 0x6f, 0x76, 0x3b, 0x64, 0x65, 0x63, 0x458, 0x430, 0x43d,
+0x3b, 0x444, 0x435, 0x431, 0x3b, 0x43c, 0x430, 0x440, 0x442, 0x3b, 0x430, 0x43f, 0x440, 0x3b, 0x43c, 0x430, 0x458, 0x3b, 0x458, 0x443,
+0x43d, 0x3b, 0x458, 0x443, 0x43b, 0x3b, 0x430, 0x432, 0x433, 0x3b, 0x441, 0x435, 0x43f, 0x442, 0x3b, 0x43e, 0x43a, 0x442, 0x3b, 0x43d,
+0x43e, 0x432, 0x3b, 0x434, 0x435, 0x446, 0x42f, 0x43d, 0x432, 0x430, 0x440, 0x44c, 0x3b, 0x424, 0x435, 0x432, 0x440, 0x430, 0x43b, 0x44c,
+0x3b, 0x41c, 0x430, 0x440, 0x442, 0x44a, 0x438, 0x3b, 0x410, 0x43f, 0x440, 0x435, 0x43b, 0x44c, 0x3b, 0x41c, 0x430, 0x439, 0x3b, 0x418,
+0x44e, 0x43d, 0x44c, 0x3b, 0x418, 0x44e, 0x43b, 0x44c, 0x3b, 0x410, 0x432, 0x433, 0x443, 0x441, 0x442, 0x3b, 0x421, 0x435, 0x43d, 0x442,
+0x44f, 0x431, 0x440, 0x44c, 0x3b, 0x41e, 0x43a, 0x442, 0x44f, 0x431, 0x440, 0x44c, 0x3b, 0x41d, 0x43e, 0x44f, 0x431, 0x440, 0x44c, 0x3b,
+0x414, 0x435, 0x43a, 0x430, 0x431, 0x440, 0x44c, 0x44f, 0x43d, 0x432, 0x430, 0x440, 0x44b, 0x3b, 0x444, 0x435, 0x432, 0x440, 0x430, 0x43b,
+0x44b, 0x3b, 0x43c, 0x430, 0x440, 0x442, 0x44a, 0x438, 0x439, 0x44b, 0x3b, 0x430, 0x43f, 0x440, 0x435, 0x43b, 0x44b, 0x3b, 0x43c, 0x430,
+0x439, 0x44b, 0x3b, 0x438, 0x44e, 0x43d, 0x44b, 0x3b, 0x438, 0x44e, 0x43b, 0x44b, 0x3b, 0x430, 0x432, 0x433, 0x443, 0x441, 0x442, 0x44b,
+0x3b, 0x441, 0x435, 0x43d, 0x442, 0x44f, 0x431, 0x440, 0x44b, 0x3b, 0x43e, 0x43a, 0x442, 0x44f, 0x431, 0x440, 0x44b, 0x3b, 0x43d, 0x43e,
+0x44f, 0x431, 0x440, 0x44b, 0x3b, 0x434, 0x435, 0x43a, 0x430, 0x431, 0x440, 0x44b, 0x42f, 0x43d, 0x432, 0x2e, 0x3b, 0x424, 0x435, 0x432,
+0x440, 0x2e, 0x3b, 0x41c, 0x430, 0x440, 0x442, 0x2e, 0x3b, 0x410, 0x43f, 0x440, 0x2e, 0x3b, 0x41c, 0x430, 0x439, 0x3b, 0x418, 0x44e,
+0x43d, 0x44c, 0x3b, 0x418, 0x44e, 0x43b, 0x44c, 0x3b, 0x410, 0x432, 0x433, 0x2e, 0x3b, 0x421, 0x435, 0x43d, 0x442, 0x2e, 0x3b, 0x41e,
+0x43a, 0x442, 0x2e, 0x3b, 0x41d, 0x43e, 0x44f, 0x431, 0x2e, 0x3b, 0x414, 0x435, 0x43a, 0x2e, 0x44f, 0x43d, 0x432, 0x2e, 0x3b, 0x444,
+0x435, 0x432, 0x2e, 0x3b, 0x43c, 0x430, 0x440, 0x2e, 0x3b, 0x430, 0x43f, 0x440, 0x2e, 0x3b, 0x43c, 0x430, 0x439, 0x44b, 0x3b, 0x438,
+0x44e, 0x43d, 0x44b, 0x3b, 0x438, 0x44e, 0x43b, 0x44b, 0x3b, 0x430, 0x432, 0x433, 0x2e, 0x3b, 0x441, 0x435, 0x43d, 0x2e, 0x3b, 0x43e,
+0x43a, 0x442, 0x2e, 0x3b, 0x43d, 0x43e, 0x44f, 0x2e, 0x3b, 0x434, 0x435, 0x43a, 0x2e, 0x4e, 0x64, 0x69, 0x72, 0x61, 0x3b, 0x4b,
+0x75, 0x6b, 0x61, 0x64, 0x7a, 0x69, 0x3b, 0x4b, 0x75, 0x72, 0x75, 0x6d, 0x65, 0x3b, 0x4b, 0x75, 0x62, 0x76, 0x75, 0x6d,
+0x62, 0x69, 0x3b, 0x43, 0x68, 0x69, 0x76, 0x61, 0x62, 0x76, 0x75, 0x3b, 0x43, 0x68, 0x69, 0x6b, 0x75, 0x6d, 0x69, 0x3b,
+0x43, 0x68, 0x69, 0x6b, 0x75, 0x6e, 0x67, 0x75, 0x72, 0x75, 0x3b, 0x4e, 0x79, 0x61, 0x6d, 0x61, 0x76, 0x68, 0x75, 0x76,
+0x68, 0x75, 0x3b, 0x47, 0x75, 0x6e, 0x79, 0x61, 0x6e, 0x61, 0x3b, 0x47, 0x75, 0x6d, 0x69, 0x67, 0x75, 0x72, 0x75, 0x3b,
+0x4d, 0x62, 0x75, 0x64, 0x7a, 0x69, 0x3b, 0x5a, 0x76, 0x69, 0x74, 0x61, 0x4e, 0x64, 0x69, 0x3b, 0x4b, 0x75, 0x6b, 0x3b,
+0x4b, 0x75, 0x72, 0x3b, 0x4b, 0x75, 0x62, 0x3b, 0x43, 0x68, 0x76, 0x3b, 0x43, 0x68, 0x6b, 0x3b, 0x43, 0x68, 0x67, 0x3b,
+0x4e, 0x79, 0x61, 0x3b, 0x47, 0x75, 0x6e, 0x3b, 0x47, 0x75, 0x6d, 0x3b, 0x4d, 0x62, 0x75, 0x3b, 0x5a, 0x76, 0x69, 0x4e,
+0x3b, 0x4b, 0x3b, 0x4b, 0x3b, 0x4b, 0x3b, 0x43, 0x3b, 0x43, 0x3b, 0x43, 0x3b, 0x4e, 0x3b, 0x47, 0x3b, 0x47, 0x3b, 0x4d,
+0x3b, 0x5a, 0x62c, 0x646, 0x648, 0x631, 0x64a, 0x3b, 0x641, 0x64a, 0x628, 0x631, 0x648, 0x631, 0x64a, 0x3b, 0x645, 0x627, 0x631, 0x686,
+0x3b, 0x627, 0x67e, 0x631, 0x64a, 0x644, 0x3b, 0x645, 0x626, 0x64a, 0x3b, 0x62c, 0x648, 0x646, 0x3b, 0x62c, 0x648, 0x644, 0x627, 0x621,
+0x650, 0x3b, 0x622, 0x6af, 0x633, 0x67d, 0x3b, 0x633, 0x64a, 0x67e, 0x67d, 0x645, 0x628, 0x631, 0x3b, 0x622, 0x6aa, 0x67d, 0x648, 0x628,
+0x631, 0x3b, 0x646, 0x648, 0x645, 0x628, 0x631, 0x3b, 0x68a, 0x633, 0x645, 0x628, 0x631, 0xda2, 0xdb1, 0xdc0, 0xdcf, 0xdbb, 0xdd2, 0x3b,
+0xdb4, 0xdd9, 0xdb6, 0xdbb, 0xdc0, 0xdcf, 0xdbb, 0xdd2, 0x3b, 0xdb8, 0xdcf, 0xdbb, 0xdca, 0xdad, 0xdd4, 0x3b, 0xd85, 0xdb4, 0xdca, 0x200d,
+0xdbb, 0xdda, 0xdbd, 0xdca, 0x3b, 0xdb8, 0xdd0, 0xdba, 0xdd2, 0x3b, 0xda2, 0xdd6, 0xdb1, 0xdd2, 0x3b, 0xda2, 0xdd6, 0xdbd, 0xdd2, 0x3b,
+0xd85, 0xd9c, 0xddd, 0xdc3, 0xdca, 0xdad, 0xdd4, 0x3b, 0xdc3, 0xdd0, 0xdb4, 0xdca, 0xdad, 0xdd0, 0xdb8, 0xdca, 0xdb6, 0xdbb, 0xdca, 0x3b,
+0xd94, 0xd9a, 0xdca, 0xdad, 0xddd, 0xdb6, 0xdbb, 0xdca, 0x3b, 0xdb1, 0xddc, 0xdc0, 0xdd0, 0xdb8, 0xdca, 0xdb6, 0xdbb, 0xdca, 0x3b, 0xdaf,
+0xdd9, 0xdc3, 0xdd0, 0xdb8, 0xdca, 0xdb6, 0xdbb, 0xdca, 0xda2, 0xdb1, 0x3b, 0xdb4, 0xdd9, 0xdb6, 0x3b, 0xdb8, 0xdcf, 0xdbb, 0xdca, 0x3b,
+0xd85, 0xdb4, 0xdca, 0x200d, 0xdbb, 0xdda, 0xdbd, 0xdca, 0x3b, 0xdb8, 0xdd0, 0xdba, 0xdd2, 0x3b, 0xda2, 0xdd6, 0xdb1, 0xdd2, 0x3b, 0xda2,
+0xdd6, 0xdbd, 0xdd2, 0x3b, 0xd85, 0xd9c, 0xddd, 0x3b, 0xdc3, 0xdd0, 0xdb4, 0xdca, 0x3b, 0xd94, 0xd9a, 0xdca, 0x3b, 0xdb1, 0xddc, 0xdc0,
+0xdd0, 0x3b, 0xdaf, 0xdd9, 0xdc3, 0xdd0, 0xda2, 0xdb1, 0x3b, 0xdb4, 0xdd9, 0xdb6, 0x3b, 0xdb8, 0xdcf, 0xdbb, 0xdca, 0xdad, 0xdd4, 0x3b,
 0xd85, 0xdb4, 0xdca, 0x200d, 0xdbb, 0xdda, 0xdbd, 0xdca, 0x3b, 0xdb8, 0xdd0, 0xdba, 0xdd2, 0x3b, 0xda2, 0xdd6, 0xdb1, 0xdd2, 0x3b, 0xda2,
 0xdd6, 0xdbd, 0xdd2, 0x3b, 0xd85, 0xd9c, 0xddd, 0x3b, 0xdc3, 0xdd0, 0xdb4, 0xdca, 0x3b, 0xd94, 0xd9a, 0xdca, 0x3b, 0xdb1, 0xddc, 0xdc0,
-0xdd0, 0x3b, 0xdaf, 0xdd9, 0xdc3, 0xdd0, 0x3b, 0x6a, 0x61, 0x6e, 0x3b, 0x66, 0x65, 0x62, 0x3b, 0x6d, 0x61, 0x72, 0x3b, 0x61,
-0x70, 0x72, 0x3b, 0x6d, 0xe1, 0x6a, 0x3b, 0x6a, 0xfa, 0x6e, 0x3b, 0x6a, 0xfa, 0x6c, 0x3b, 0x61, 0x75, 0x67, 0x3b, 0x73,
-0x65, 0x70, 0x3b, 0x6f, 0x6b, 0x74, 0x3b, 0x6e, 0x6f, 0x76, 0x3b, 0x64, 0x65, 0x63, 0x3b, 0x6a, 0x61, 0x6e, 0x75, 0xe1,
-0x72, 0x3b, 0x66, 0x65, 0x62, 0x72, 0x75, 0xe1, 0x72, 0x3b, 0x6d, 0x61, 0x72, 0x65, 0x63, 0x3b, 0x61, 0x70, 0x72, 0xed,
-0x6c, 0x3b, 0x6d, 0xe1, 0x6a, 0x3b, 0x6a, 0xfa, 0x6e, 0x3b, 0x6a, 0xfa, 0x6c, 0x3b, 0x61, 0x75, 0x67, 0x75, 0x73, 0x74,
-0x3b, 0x73, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x6f, 0x6b, 0x74, 0xf3, 0x62, 0x65, 0x72, 0x3b, 0x6e,
-0x6f, 0x76, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x64, 0x65, 0x63, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x6a, 0x61, 0x6e,
-0x75, 0xe1, 0x72, 0x61, 0x3b, 0x66, 0x65, 0x62, 0x72, 0x75, 0xe1, 0x72, 0x61, 0x3b, 0x6d, 0x61, 0x72, 0x63, 0x61, 0x3b,
-0x61, 0x70, 0x72, 0xed, 0x6c, 0x61, 0x3b, 0x6d, 0xe1, 0x6a, 0x61, 0x3b, 0x6a, 0xfa, 0x6e, 0x61, 0x3b, 0x6a, 0xfa, 0x6c,
-0x61, 0x3b, 0x61, 0x75, 0x67, 0x75, 0x73, 0x74, 0x61, 0x3b, 0x73, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x72, 0x61, 0x3b,
-0x6f, 0x6b, 0x74, 0xf3, 0x62, 0x72, 0x61, 0x3b, 0x6e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x72, 0x61, 0x3b, 0x64, 0x65, 0x63,
-0x65, 0x6d, 0x62, 0x72, 0x61, 0x3b, 0x6a, 0x61, 0x6e, 0x2e, 0x3b, 0x66, 0x65, 0x62, 0x2e, 0x3b, 0x6d, 0x61, 0x72, 0x2e,
-0x3b, 0x61, 0x70, 0x72, 0x2e, 0x3b, 0x6d, 0x61, 0x6a, 0x3b, 0x6a, 0x75, 0x6e, 0x2e, 0x3b, 0x6a, 0x75, 0x6c, 0x2e, 0x3b,
-0x61, 0x76, 0x67, 0x2e, 0x3b, 0x73, 0x65, 0x70, 0x2e, 0x3b, 0x6f, 0x6b, 0x74, 0x2e, 0x3b, 0x6e, 0x6f, 0x76, 0x2e, 0x3b,
-0x64, 0x65, 0x63, 0x2e, 0x3b, 0x6a, 0x61, 0x6e, 0x75, 0x61, 0x72, 0x3b, 0x66, 0x65, 0x62, 0x72, 0x75, 0x61, 0x72, 0x3b,
-0x6d, 0x61, 0x72, 0x65, 0x63, 0x3b, 0x61, 0x70, 0x72, 0x69, 0x6c, 0x3b, 0x6d, 0x61, 0x6a, 0x3b, 0x6a, 0x75, 0x6e, 0x69,
-0x6a, 0x3b, 0x6a, 0x75, 0x6c, 0x69, 0x6a, 0x3b, 0x61, 0x76, 0x67, 0x75, 0x73, 0x74, 0x3b, 0x73, 0x65, 0x70, 0x74, 0x65,
-0x6d, 0x62, 0x65, 0x72, 0x3b, 0x6f, 0x6b, 0x74, 0x6f, 0x62, 0x65, 0x72, 0x3b, 0x6e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x65,
-0x72, 0x3b, 0x64, 0x65, 0x63, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x4a, 0x61, 0x6e, 0x3b, 0x46, 0x65, 0x62, 0x3b, 0x4d,
-0x61, 0x72, 0x3b, 0x41, 0x62, 0x72, 0x3b, 0x4d, 0x61, 0x79, 0x3b, 0x4a, 0x75, 0x6e, 0x3b, 0x4c, 0x75, 0x6c, 0x3b, 0x4f,
-0x67, 0x73, 0x3b, 0x53, 0x65, 0x62, 0x3b, 0x4f, 0x6b, 0x74, 0x3b, 0x4e, 0x6f, 0x66, 0x3b, 0x44, 0x69, 0x73, 0x3b, 0x4a,
-0x61, 0x6e, 0x6e, 0x61, 0x61, 0x79, 0x6f, 0x3b, 0x46, 0x65, 0x62, 0x72, 0x61, 0x61, 0x79, 0x6f, 0x3b, 0x4d, 0x61, 0x61,
-0x72, 0x73, 0x6f, 0x3b, 0x41, 0x62, 0x72, 0x69, 0x69, 0x6c, 0x3b, 0x4d, 0x61, 0x79, 0x3b, 0x4a, 0x75, 0x75, 0x6e, 0x3b,
-0x4c, 0x75, 0x75, 0x6c, 0x69, 0x79, 0x6f, 0x3b, 0x4f, 0x67, 0x6f, 0x73, 0x74, 0x3b, 0x53, 0x65, 0x62, 0x74, 0x65, 0x6d,
-0x62, 0x61, 0x72, 0x3b, 0x4f, 0x6b, 0x74, 0x6f, 0x6f, 0x62, 0x61, 0x72, 0x3b, 0x4e, 0x6f, 0x66, 0x65, 0x6d, 0x62, 0x61,
-0x72, 0x3b, 0x44, 0x65, 0x73, 0x65, 0x6d, 0x62, 0x61, 0x72, 0x3b, 0x4a, 0x3b, 0x46, 0x3b, 0x4d, 0x3b, 0x41, 0x3b, 0x4d,
-0x3b, 0x4a, 0x3b, 0x4c, 0x3b, 0x4f, 0x3b, 0x53, 0x3b, 0x4f, 0x3b, 0x4e, 0x3b, 0x44, 0x3b, 0x42, 0x69, 0x73, 0x68, 0x61,
-0x20, 0x4b, 0x6f, 0x6f, 0x62, 0x61, 0x61, 0x64, 0x3b, 0x42, 0x69, 0x73, 0x68, 0x61, 0x20, 0x4c, 0x61, 0x62, 0x61, 0x61,
-0x64, 0x3b, 0x42, 0x69, 0x73, 0x68, 0x61, 0x20, 0x53, 0x61, 0x64, 0x64, 0x65, 0x78, 0x61, 0x61, 0x64, 0x3b, 0x42, 0x69,
-0x73, 0x68, 0x61, 0x20, 0x41, 0x66, 0x72, 0x61, 0x61, 0x64, 0x3b, 0x42, 0x69, 0x73, 0x68, 0x61, 0x20, 0x53, 0x68, 0x61,
-0x6e, 0x61, 0x61, 0x64, 0x3b, 0x42, 0x69, 0x73, 0x68, 0x61, 0x20, 0x4c, 0x69, 0x78, 0x61, 0x61, 0x64, 0x3b, 0x42, 0x69,
-0x73, 0x68, 0x61, 0x20, 0x54, 0x6f, 0x64, 0x6f, 0x62, 0x61, 0x61, 0x64, 0x3b, 0x42, 0x69, 0x73, 0x68, 0x61, 0x20, 0x53,
-0x69, 0x64, 0x65, 0x65, 0x64, 0x61, 0x61, 0x64, 0x3b, 0x42, 0x69, 0x73, 0x68, 0x61, 0x20, 0x53, 0x61, 0x67, 0x61, 0x61,
-0x6c, 0x61, 0x61, 0x64, 0x3b, 0x42, 0x69, 0x73, 0x68, 0x61, 0x20, 0x54, 0x6f, 0x62, 0x6e, 0x61, 0x61, 0x64, 0x3b, 0x42,
-0x69, 0x73, 0x68, 0x61, 0x20, 0x4b, 0x6f, 0x77, 0x20, 0x69, 0x79, 0x6f, 0x20, 0x54, 0x6f, 0x62, 0x6e, 0x61, 0x61, 0x64,
-0x3b, 0x42, 0x69, 0x73, 0x68, 0x61, 0x20, 0x4c, 0x61, 0x62, 0x61, 0x20, 0x69, 0x79, 0x6f, 0x20, 0x54, 0x6f, 0x62, 0x6e,
-0x61, 0x61, 0x64, 0x3b, 0x65, 0x6e, 0x65, 0x2e, 0x3b, 0x66, 0x65, 0x62, 0x2e, 0x3b, 0x6d, 0x61, 0x72, 0x2e, 0x3b, 0x61,
-0x62, 0x72, 0x2e, 0x3b, 0x6d, 0x61, 0x79, 0x2e, 0x3b, 0x6a, 0x75, 0x6e, 0x2e, 0x3b, 0x6a, 0x75, 0x6c, 0x2e, 0x3b, 0x61,
-0x67, 0x6f, 0x2e, 0x3b, 0x73, 0x65, 0x70, 0x74, 0x2e, 0x3b, 0x6f, 0x63, 0x74, 0x2e, 0x3b, 0x6e, 0x6f, 0x76, 0x2e, 0x3b,
-0x64, 0x69, 0x63, 0x2e, 0x3b, 0x65, 0x6e, 0x65, 0x72, 0x6f, 0x3b, 0x66, 0x65, 0x62, 0x72, 0x65, 0x72, 0x6f, 0x3b, 0x6d,
+0xdd0, 0x3b, 0xdaf, 0xdd9, 0xdc3, 0xdd0, 0xda2, 0x3b, 0xdb4, 0xdd9, 0x3b, 0xdb8, 0xdcf, 0x3b, 0xd85, 0x3b, 0xdb8, 0xdd0, 0x3b, 0xda2,
+0xdd6, 0x3b, 0xda2, 0xdd6, 0x3b, 0xd85, 0x3b, 0xdc3, 0xdd0, 0x3b, 0xd94, 0x3b, 0xdb1, 0xdd9, 0x3b, 0xdaf, 0xdd9, 0x6a, 0x61, 0x6e,
+0x75, 0xe1, 0x72, 0x3b, 0x66, 0x65, 0x62, 0x72, 0x75, 0xe1, 0x72, 0x3b, 0x6d, 0x61, 0x72, 0x65, 0x63, 0x3b, 0x61, 0x70,
+0x72, 0xed, 0x6c, 0x3b, 0x6d, 0xe1, 0x6a, 0x3b, 0x6a, 0xfa, 0x6e, 0x3b, 0x6a, 0xfa, 0x6c, 0x3b, 0x61, 0x75, 0x67, 0x75,
+0x73, 0x74, 0x3b, 0x73, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x6f, 0x6b, 0x74, 0xf3, 0x62, 0x65, 0x72,
+0x3b, 0x6e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x64, 0x65, 0x63, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x6a, 0x61,
+0x6e, 0x75, 0xe1, 0x72, 0x61, 0x3b, 0x66, 0x65, 0x62, 0x72, 0x75, 0xe1, 0x72, 0x61, 0x3b, 0x6d, 0x61, 0x72, 0x63, 0x61,
+0x3b, 0x61, 0x70, 0x72, 0xed, 0x6c, 0x61, 0x3b, 0x6d, 0xe1, 0x6a, 0x61, 0x3b, 0x6a, 0xfa, 0x6e, 0x61, 0x3b, 0x6a, 0xfa,
+0x6c, 0x61, 0x3b, 0x61, 0x75, 0x67, 0x75, 0x73, 0x74, 0x61, 0x3b, 0x73, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x72, 0x61,
+0x3b, 0x6f, 0x6b, 0x74, 0xf3, 0x62, 0x72, 0x61, 0x3b, 0x6e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x72, 0x61, 0x3b, 0x64, 0x65,
+0x63, 0x65, 0x6d, 0x62, 0x72, 0x61, 0x6a, 0x61, 0x6e, 0x3b, 0x66, 0x65, 0x62, 0x3b, 0x6d, 0x61, 0x72, 0x3b, 0x61, 0x70,
+0x72, 0x3b, 0x6d, 0xe1, 0x6a, 0x3b, 0x6a, 0xfa, 0x6e, 0x3b, 0x6a, 0xfa, 0x6c, 0x3b, 0x61, 0x75, 0x67, 0x3b, 0x73, 0x65,
+0x70, 0x3b, 0x6f, 0x6b, 0x74, 0x3b, 0x6e, 0x6f, 0x76, 0x3b, 0x64, 0x65, 0x63, 0x6a, 0x61, 0x6e, 0x75, 0x61, 0x72, 0x3b,
+0x66, 0x65, 0x62, 0x72, 0x75, 0x61, 0x72, 0x3b, 0x6d, 0x61, 0x72, 0x65, 0x63, 0x3b, 0x61, 0x70, 0x72, 0x69, 0x6c, 0x3b,
+0x6d, 0x61, 0x6a, 0x3b, 0x6a, 0x75, 0x6e, 0x69, 0x6a, 0x3b, 0x6a, 0x75, 0x6c, 0x69, 0x6a, 0x3b, 0x61, 0x76, 0x67, 0x75,
+0x73, 0x74, 0x3b, 0x73, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x6f, 0x6b, 0x74, 0x6f, 0x62, 0x65, 0x72,
+0x3b, 0x6e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x64, 0x65, 0x63, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x6a, 0x61,
+0x6e, 0x2e, 0x3b, 0x66, 0x65, 0x62, 0x2e, 0x3b, 0x6d, 0x61, 0x72, 0x2e, 0x3b, 0x61, 0x70, 0x72, 0x2e, 0x3b, 0x6d, 0x61,
+0x6a, 0x3b, 0x6a, 0x75, 0x6e, 0x2e, 0x3b, 0x6a, 0x75, 0x6c, 0x2e, 0x3b, 0x61, 0x76, 0x67, 0x2e, 0x3b, 0x73, 0x65, 0x70,
+0x2e, 0x3b, 0x6f, 0x6b, 0x74, 0x2e, 0x3b, 0x6e, 0x6f, 0x76, 0x2e, 0x3b, 0x64, 0x65, 0x63, 0x2e, 0x4a, 0x61, 0x6e, 0x6e,
+0x61, 0x61, 0x79, 0x6f, 0x3b, 0x46, 0x65, 0x62, 0x72, 0x61, 0x61, 0x79, 0x6f, 0x3b, 0x4d, 0x61, 0x61, 0x72, 0x73, 0x6f,
+0x3b, 0x41, 0x62, 0x72, 0x69, 0x69, 0x6c, 0x3b, 0x4d, 0x61, 0x79, 0x3b, 0x4a, 0x75, 0x75, 0x6e, 0x3b, 0x4c, 0x75, 0x75,
+0x6c, 0x69, 0x79, 0x6f, 0x3b, 0x4f, 0x67, 0x6f, 0x73, 0x74, 0x3b, 0x53, 0x65, 0x62, 0x74, 0x65, 0x6d, 0x62, 0x61, 0x72,
+0x3b, 0x4f, 0x6b, 0x74, 0x6f, 0x6f, 0x62, 0x61, 0x72, 0x3b, 0x4e, 0x6f, 0x66, 0x65, 0x6d, 0x62, 0x61, 0x72, 0x3b, 0x44,
+0x65, 0x73, 0x65, 0x6d, 0x62, 0x61, 0x72, 0x42, 0x69, 0x73, 0x68, 0x61, 0x20, 0x4b, 0x6f, 0x6f, 0x62, 0x61, 0x61, 0x64,
+0x3b, 0x42, 0x69, 0x73, 0x68, 0x61, 0x20, 0x4c, 0x61, 0x62, 0x61, 0x61, 0x64, 0x3b, 0x42, 0x69, 0x73, 0x68, 0x61, 0x20,
+0x53, 0x61, 0x64, 0x64, 0x65, 0x78, 0x61, 0x61, 0x64, 0x3b, 0x42, 0x69, 0x73, 0x68, 0x61, 0x20, 0x41, 0x66, 0x72, 0x61,
+0x61, 0x64, 0x3b, 0x42, 0x69, 0x73, 0x68, 0x61, 0x20, 0x53, 0x68, 0x61, 0x6e, 0x61, 0x61, 0x64, 0x3b, 0x42, 0x69, 0x73,
+0x68, 0x61, 0x20, 0x4c, 0x69, 0x78, 0x61, 0x61, 0x64, 0x3b, 0x42, 0x69, 0x73, 0x68, 0x61, 0x20, 0x54, 0x6f, 0x64, 0x6f,
+0x62, 0x61, 0x61, 0x64, 0x3b, 0x42, 0x69, 0x73, 0x68, 0x61, 0x20, 0x53, 0x69, 0x64, 0x65, 0x65, 0x64, 0x61, 0x61, 0x64,
+0x3b, 0x42, 0x69, 0x73, 0x68, 0x61, 0x20, 0x53, 0x61, 0x67, 0x61, 0x61, 0x6c, 0x61, 0x61, 0x64, 0x3b, 0x42, 0x69, 0x73,
+0x68, 0x61, 0x20, 0x54, 0x6f, 0x62, 0x6e, 0x61, 0x61, 0x64, 0x3b, 0x42, 0x69, 0x73, 0x68, 0x61, 0x20, 0x4b, 0x6f, 0x77,
+0x20, 0x69, 0x79, 0x6f, 0x20, 0x54, 0x6f, 0x62, 0x6e, 0x61, 0x61, 0x64, 0x3b, 0x42, 0x69, 0x73, 0x68, 0x61, 0x20, 0x4c,
+0x61, 0x62, 0x61, 0x20, 0x69, 0x79, 0x6f, 0x20, 0x54, 0x6f, 0x62, 0x6e, 0x61, 0x61, 0x64, 0x4a, 0x61, 0x6e, 0x3b, 0x46,
+0x65, 0x62, 0x3b, 0x4d, 0x61, 0x72, 0x3b, 0x41, 0x62, 0x72, 0x3b, 0x4d, 0x61, 0x79, 0x3b, 0x4a, 0x75, 0x6e, 0x3b, 0x4c,
+0x75, 0x6c, 0x3b, 0x4f, 0x67, 0x73, 0x3b, 0x53, 0x65, 0x62, 0x3b, 0x4f, 0x6b, 0x74, 0x3b, 0x4e, 0x6f, 0x66, 0x3b, 0x44,
+0x69, 0x73, 0x4a, 0x3b, 0x46, 0x3b, 0x4d, 0x3b, 0x41, 0x3b, 0x4d, 0x3b, 0x4a, 0x3b, 0x4c, 0x3b, 0x4f, 0x3b, 0x53, 0x3b,
+0x4f, 0x3b, 0x4e, 0x3b, 0x44, 0x65, 0x6e, 0x65, 0x72, 0x6f, 0x3b, 0x66, 0x65, 0x62, 0x72, 0x65, 0x72, 0x6f, 0x3b, 0x6d,
 0x61, 0x72, 0x7a, 0x6f, 0x3b, 0x61, 0x62, 0x72, 0x69, 0x6c, 0x3b, 0x6d, 0x61, 0x79, 0x6f, 0x3b, 0x6a, 0x75, 0x6e, 0x69,
 0x6f, 0x3b, 0x6a, 0x75, 0x6c, 0x69, 0x6f, 0x3b, 0x61, 0x67, 0x6f, 0x73, 0x74, 0x6f, 0x3b, 0x73, 0x65, 0x70, 0x74, 0x69,
 0x65, 0x6d, 0x62, 0x72, 0x65, 0x3b, 0x6f, 0x63, 0x74, 0x75, 0x62, 0x72, 0x65, 0x3b, 0x6e, 0x6f, 0x76, 0x69, 0x65, 0x6d,
-0x62, 0x72, 0x65, 0x3b, 0x64, 0x69, 0x63, 0x69, 0x65, 0x6d, 0x62, 0x72, 0x65, 0x3b, 0x45, 0x3b, 0x46, 0x3b, 0x4d, 0x3b,
-0x41, 0x3b, 0x4d, 0x3b, 0x4a, 0x3b, 0x4a, 0x3b, 0x41, 0x3b, 0x53, 0x3b, 0x4f, 0x3b, 0x4e, 0x3b, 0x44, 0x3b, 0x65, 0x6e,
-0x65, 0x2e, 0x3b, 0x66, 0x65, 0x62, 0x2e, 0x3b, 0x6d, 0x61, 0x72, 0x2e, 0x3b, 0x61, 0x62, 0x72, 0x2e, 0x3b, 0x6d, 0x61,
-0x79, 0x2e, 0x3b, 0x6a, 0x75, 0x6e, 0x2e, 0x3b, 0x6a, 0x75, 0x6c, 0x2e, 0x3b, 0x61, 0x67, 0x6f, 0x2e, 0x3b, 0x73, 0x65,
-0x70, 0x2e, 0x3b, 0x6f, 0x63, 0x74, 0x2e, 0x3b, 0x6e, 0x6f, 0x76, 0x2e, 0x3b, 0x64, 0x69, 0x63, 0x2e, 0x3b, 0x45, 0x6e,
-0x65, 0x2e, 0x3b, 0x46, 0x65, 0x62, 0x2e, 0x3b, 0x4d, 0x61, 0x72, 0x2e, 0x3b, 0x41, 0x62, 0x72, 0x2e, 0x3b, 0x4d, 0x61,
-0x79, 0x2e, 0x3b, 0x4a, 0x75, 0x6e, 0x2e, 0x3b, 0x4a, 0x75, 0x6c, 0x2e, 0x3b, 0x41, 0x67, 0x6f, 0x2e, 0x3b, 0x53, 0x65,
-0x74, 0x2e, 0x3b, 0x4f, 0x63, 0x74, 0x2e, 0x3b, 0x4e, 0x6f, 0x76, 0x2e, 0x3b, 0x44, 0x69, 0x63, 0x2e, 0x3b, 0x65, 0x6e,
-0x65, 0x2e, 0x3b, 0x66, 0x65, 0x62, 0x2e, 0x3b, 0x6d, 0x61, 0x72, 0x2e, 0x3b, 0x61, 0x62, 0x72, 0x2e, 0x3b, 0x6d, 0x61,
-0x79, 0x2e, 0x3b, 0x6a, 0x75, 0x6e, 0x2e, 0x3b, 0x6a, 0x75, 0x6c, 0x2e, 0x3b, 0x61, 0x67, 0x6f, 0x2e, 0x3b, 0x73, 0x65,
-0x74, 0x2e, 0x3b, 0x6f, 0x63, 0x74, 0x2e, 0x3b, 0x6e, 0x6f, 0x76, 0x2e, 0x3b, 0x64, 0x69, 0x63, 0x2e, 0x3b, 0x65, 0x6e,
-0x65, 0x72, 0x6f, 0x3b, 0x66, 0x65, 0x62, 0x72, 0x65, 0x72, 0x6f, 0x3b, 0x6d, 0x61, 0x72, 0x7a, 0x6f, 0x3b, 0x61, 0x62,
-0x72, 0x69, 0x6c, 0x3b, 0x6d, 0x61, 0x79, 0x6f, 0x3b, 0x6a, 0x75, 0x6e, 0x69, 0x6f, 0x3b, 0x6a, 0x75, 0x6c, 0x69, 0x6f,
-0x3b, 0x61, 0x67, 0x6f, 0x73, 0x74, 0x6f, 0x3b, 0x73, 0x65, 0x74, 0x69, 0x65, 0x6d, 0x62, 0x72, 0x65, 0x3b, 0x6f, 0x63,
-0x74, 0x75, 0x62, 0x72, 0x65, 0x3b, 0x6e, 0x6f, 0x76, 0x69, 0x65, 0x6d, 0x62, 0x72, 0x65, 0x3b, 0x64, 0x69, 0x63, 0x69,
-0x65, 0x6d, 0x62, 0x72, 0x65, 0x3b, 0x4a, 0x61, 0x6e, 0x3b, 0x46, 0x65, 0x62, 0x3b, 0x4d, 0x61, 0x63, 0x3b, 0x41, 0x70,
-0x72, 0x3b, 0x4d, 0x65, 0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x3b, 0x4a, 0x75, 0x6c, 0x3b, 0x41, 0x67, 0x6f, 0x3b, 0x53, 0x65,
-0x70, 0x3b, 0x4f, 0x6b, 0x74, 0x3b, 0x4e, 0x6f, 0x76, 0x3b, 0x44, 0x65, 0x73, 0x3b, 0x4a, 0x61, 0x6e, 0x75, 0x61, 0x72,
-0x69, 0x3b, 0x46, 0x65, 0x62, 0x72, 0x75, 0x61, 0x72, 0x69, 0x3b, 0x4d, 0x61, 0x63, 0x68, 0x69, 0x3b, 0x41, 0x70, 0x72,
-0x69, 0x6c, 0x69, 0x3b, 0x4d, 0x65, 0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x69, 0x3b, 0x4a, 0x75, 0x6c, 0x61, 0x69, 0x3b, 0x41,
-0x67, 0x6f, 0x73, 0x74, 0x69, 0x3b, 0x53, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x4f, 0x6b, 0x74, 0x6f, 0x62,
-0x61, 0x3b, 0x4e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x44, 0x65, 0x73, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x6a, 0x61,
-0x6e, 0x2e, 0x3b, 0x66, 0x65, 0x62, 0x2e, 0x3b, 0x6d, 0x61, 0x72, 0x73, 0x3b, 0x61, 0x70, 0x72, 0x2e, 0x3b, 0x6d, 0x61,
-0x6a, 0x3b, 0x6a, 0x75, 0x6e, 0x69, 0x3b, 0x6a, 0x75, 0x6c, 0x69, 0x3b, 0x61, 0x75, 0x67, 0x2e, 0x3b, 0x73, 0x65, 0x70,
-0x2e, 0x3b, 0x6f, 0x6b, 0x74, 0x2e, 0x3b, 0x6e, 0x6f, 0x76, 0x2e, 0x3b, 0x64, 0x65, 0x63, 0x2e, 0x3b, 0x6a, 0x61, 0x6e,
-0x75, 0x61, 0x72, 0x69, 0x3b, 0x66, 0x65, 0x62, 0x72, 0x75, 0x61, 0x72, 0x69, 0x3b, 0x6d, 0x61, 0x72, 0x73, 0x3b, 0x61,
-0x70, 0x72, 0x69, 0x6c, 0x3b, 0x6d, 0x61, 0x6a, 0x3b, 0x6a, 0x75, 0x6e, 0x69, 0x3b, 0x6a, 0x75, 0x6c, 0x69, 0x3b, 0x61,
-0x75, 0x67, 0x75, 0x73, 0x74, 0x69, 0x3b, 0x73, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x6f, 0x6b, 0x74,
-0x6f, 0x62, 0x65, 0x72, 0x3b, 0x6e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x64, 0x65, 0x63, 0x65, 0x6d, 0x62,
-0x65, 0x72, 0x3b, 0x42f, 0x43d, 0x432, 0x430, 0x440, 0x3b, 0x424, 0x435, 0x432, 0x440, 0x430, 0x43b, 0x3b, 0x41c, 0x430, 0x440, 0x442,
-0x3b, 0x410, 0x43f, 0x440, 0x435, 0x43b, 0x3b, 0x41c, 0x430, 0x439, 0x3b, 0x418, 0x44e, 0x43d, 0x3b, 0x418, 0x44e, 0x43b, 0x3b, 0x410,
-0x432, 0x433, 0x443, 0x441, 0x442, 0x3b, 0x421, 0x435, 0x43d, 0x442, 0x44f, 0x431, 0x440, 0x3b, 0x41e, 0x43a, 0x442, 0x44f, 0x431, 0x440,
-0x3b, 0x41d, 0x43e, 0x44f, 0x431, 0x440, 0x3b, 0x414, 0x435, 0x43a, 0x430, 0x431, 0x440, 0x3b, 0xb9c, 0xba9, 0x2e, 0x3b, 0xbaa, 0xbbf,
-0xbaa, 0xbcd, 0x2e, 0x3b, 0xbae, 0xbbe, 0xbb0, 0xbcd, 0x2e, 0x3b, 0xb8f, 0xbaa, 0xbcd, 0x2e, 0x3b, 0xbae, 0xbc7, 0x3b, 0xb9c, 0xbc2,
-0xba9, 0xbcd, 0x3b, 0xb9c, 0xbc2, 0xbb2, 0xbc8, 0x3b, 0xb86, 0xb95, 0x2e, 0x3b, 0xb9a, 0xbc6, 0xbaa, 0xbcd, 0x2e, 0x3b, 0xb85, 0xb95,
-0xbcd, 0x2e, 0x3b, 0xba8, 0xbb5, 0x2e, 0x3b, 0xb9f, 0xbbf, 0xb9a, 0x2e, 0x3b, 0xb9c, 0xba9, 0xbb5, 0xbb0, 0xbbf, 0x3b, 0xbaa, 0xbbf,
-0xbaa, 0xbcd, 0xbb0, 0xbb5, 0xbb0, 0xbbf, 0x3b, 0xbae, 0xbbe, 0xbb0, 0xbcd, 0xb9a, 0xbcd, 0x3b, 0xb8f, 0xbaa, 0xbcd, 0xbb0, 0xbb2, 0xbcd,
-0x3b, 0xbae, 0xbc7, 0x3b, 0xb9c, 0xbc2, 0xba9, 0xbcd, 0x3b, 0xb9c, 0xbc2, 0xbb2, 0xbc8, 0x3b, 0xb86, 0xb95, 0xbb8, 0xbcd, 0xb9f, 0xbcd,
-0x3b, 0xb9a, 0xbc6, 0xbaa, 0xbcd, 0xb9f, 0xbae, 0xbcd, 0xbaa, 0xbb0, 0xbcd, 0x3b, 0xb85, 0xb95, 0xbcd, 0xb9f, 0xbcb, 0xbaa, 0xbb0, 0xbcd,
-0x3b, 0xba8, 0xbb5, 0xbae, 0xbcd, 0xbaa, 0xbb0, 0xbcd, 0x3b, 0xb9f, 0xbbf, 0xb9a, 0xbae, 0xbcd, 0xbaa, 0xbb0, 0xbcd, 0x3b, 0xb9c, 0x3b,
-0xbaa, 0xbbf, 0x3b, 0xbae, 0xbbe, 0x3b, 0xb8f, 0x3b, 0xbae, 0xbc7, 0x3b, 0xb9c, 0xbc2, 0x3b, 0xb9c, 0xbc2, 0x3b, 0xb86, 0x3b, 0xb9a,
-0xbc6, 0x3b, 0xb85, 0x3b, 0xba8, 0x3b, 0xb9f, 0xbbf, 0x3b, 0x433, 0x44b, 0x439, 0x43d, 0x2e, 0x3b, 0x444, 0x435, 0x432, 0x2e, 0x3b,
-0x43c, 0x430, 0x440, 0x2e, 0x3b, 0x430, 0x43f, 0x440, 0x2e, 0x3b, 0x43c, 0x430, 0x439, 0x3b, 0x438, 0x44e, 0x43d, 0x44c, 0x3b, 0x438,
-0x44e, 0x43b, 0x44c, 0x3b, 0x430, 0x432, 0x433, 0x2e, 0x3b, 0x441, 0x435, 0x43d, 0x442, 0x2e, 0x3b, 0x43e, 0x43a, 0x442, 0x2e, 0x3b,
-0x43d, 0x43e, 0x44f, 0x431, 0x2e, 0x3b, 0x434, 0x435, 0x43a, 0x2e, 0x3b, 0x433, 0x44b, 0x439, 0x43d, 0x432, 0x430, 0x440, 0x3b, 0x444,
-0x435, 0x432, 0x440, 0x430, 0x43b, 0x44c, 0x3b, 0x43c, 0x430, 0x440, 0x442, 0x3b, 0x430, 0x43f, 0x440, 0x435, 0x43b, 0x44c, 0x3b, 0x43c,
-0x430, 0x439, 0x3b, 0x438, 0x44e, 0x43d, 0x44c, 0x3b, 0x438, 0x44e, 0x43b, 0x44c, 0x3b, 0x430, 0x432, 0x433, 0x443, 0x441, 0x442, 0x3b,
-0x441, 0x435, 0x43d, 0x442, 0x44f, 0x431, 0x440, 0x44c, 0x3b, 0x43e, 0x43a, 0x442, 0x44f, 0x431, 0x440, 0x44c, 0x3b, 0x43d, 0x43e, 0x44f,
-0x431, 0x440, 0x44c, 0x3b, 0x434, 0x435, 0x43a, 0x430, 0x431, 0x440, 0x44c, 0x3b, 0xc1c, 0xc28, 0x3b, 0xc2b, 0xc3f, 0xc2c, 0xc4d, 0xc30,
-0x3b, 0xc2e, 0xc3e, 0xc30, 0xc4d, 0xc1a, 0xc3f, 0x3b, 0xc0f, 0xc2a, 0xc4d, 0xc30, 0xc3f, 0x3b, 0xc2e, 0xc47, 0x3b, 0xc1c, 0xc42, 0xc28,
-0xc4d, 0x3b, 0xc1c, 0xc41, 0xc32, 0xc48, 0x3b, 0xc06, 0xc17, 0x3b, 0xc38, 0xc46, 0xc2a, 0xc4d, 0xc1f, 0xc46, 0xc02, 0x3b, 0xc05, 0xc15,
-0xc4d, 0xc1f, 0xc4b, 0x3b, 0xc28, 0xc35, 0xc02, 0x3b, 0xc21, 0xc3f, 0xc38, 0xc46, 0xc02, 0x3b, 0xc1c, 0xc28, 0xc35, 0xc30, 0xc3f, 0x3b,
-0xc2b, 0xc3f, 0xc2c, 0xc4d, 0xc30, 0xc35, 0xc30, 0xc3f, 0x3b, 0xc2e, 0xc3e, 0xc30, 0xc4d, 0xc1a, 0xc3f, 0x3b, 0xc0f, 0xc2a, 0xc4d, 0xc30,
-0xc3f, 0xc32, 0xc4d, 0x3b, 0xc2e, 0xc47, 0x3b, 0xc1c, 0xc42, 0xc28, 0xc4d, 0x3b, 0xc1c, 0xc41, 0xc32, 0xc48, 0x3b, 0xc06, 0xc17, 0xc38,
-0xc4d, 0xc1f, 0xc41, 0x3b, 0xc38, 0xc46, 0xc2a, 0xc4d, 0xc1f, 0xc46, 0xc02, 0xc2c, 0xc30, 0xc4d, 0x3b, 0xc05, 0xc15, 0xc4d, 0xc1f, 0xc4b,
-0xc2c, 0xc30, 0xc4d, 0x3b, 0xc28, 0xc35, 0xc02, 0xc2c, 0xc30, 0xc4d, 0x3b, 0xc21, 0xc3f, 0xc38, 0xc46, 0xc02, 0xc2c, 0xc30, 0xc4d, 0x3b,
-0xc1c, 0x3b, 0xc2b, 0xc3f, 0x3b, 0xc2e, 0xc3e, 0x3b, 0xc0f, 0x3b, 0xc2e, 0xc47, 0x3b, 0xc1c, 0xc42, 0x3b, 0xc1c, 0xc41, 0x3b, 0xc06,
-0x3b, 0xc38, 0xc46, 0x3b, 0xc05, 0x3b, 0xc28, 0x3b, 0xc21, 0xc3f, 0x3b, 0xe21, 0x2e, 0xe04, 0x2e, 0x3b, 0xe01, 0x2e, 0xe1e, 0x2e,
-0x3b, 0xe21, 0xe35, 0x2e, 0xe04, 0x2e, 0x3b, 0xe40, 0xe21, 0x2e, 0xe22, 0x2e, 0x3b, 0xe1e, 0x2e, 0xe04, 0x2e, 0x3b, 0xe21, 0xe34,
-0x2e, 0xe22, 0x2e, 0x3b, 0xe01, 0x2e, 0xe04, 0x2e, 0x3b, 0xe2a, 0x2e, 0xe04, 0x2e, 0x3b, 0xe01, 0x2e, 0xe22, 0x2e, 0x3b, 0xe15,
-0x2e, 0xe04, 0x2e, 0x3b, 0xe1e, 0x2e, 0xe22, 0x2e, 0x3b, 0xe18, 0x2e, 0xe04, 0x2e, 0x3b, 0xe21, 0xe01, 0xe23, 0xe32, 0xe04, 0xe21,
-0x3b, 0xe01, 0xe38, 0xe21, 0xe20, 0xe32, 0xe1e, 0xe31, 0xe19, 0xe18, 0xe4c, 0x3b, 0xe21, 0xe35, 0xe19, 0xe32, 0xe04, 0xe21, 0x3b, 0xe40,
-0xe21, 0xe29, 0xe32, 0xe22, 0xe19, 0x3b, 0xe1e, 0xe24, 0xe29, 0xe20, 0xe32, 0xe04, 0xe21, 0x3b, 0xe21, 0xe34, 0xe16, 0xe38, 0xe19, 0xe32,
-0xe22, 0xe19, 0x3b, 0xe01, 0xe23, 0xe01, 0xe0e, 0xe32, 0xe04, 0xe21, 0x3b, 0xe2a, 0xe34, 0xe07, 0xe2b, 0xe32, 0xe04, 0xe21, 0x3b, 0xe01,
-0xe31, 0xe19, 0xe22, 0xe32, 0xe22, 0xe19, 0x3b, 0xe15, 0xe38, 0xe25, 0xe32, 0xe04, 0xe21, 0x3b, 0xe1e, 0xe24, 0xe28, 0xe08, 0xe34, 0xe01,
-0xe32, 0xe22, 0xe19, 0x3b, 0xe18, 0xe31, 0xe19, 0xe27, 0xe32, 0xe04, 0xe21, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf0b, 0xf51, 0xf44, 0xf0b,
-0xf54, 0xf7c, 0xf0b, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf0b, 0xf42, 0xf49, 0xf72, 0xf66, 0xf0b, 0xf54, 0xf0b, 0x3b, 0xf5f, 0xfb3, 0xf0b,
-0xf56, 0xf0b, 0xf42, 0xf66, 0xf74, 0xf58, 0xf0b, 0xf54, 0xf0b, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf0b, 0xf56, 0xf5e, 0xf72, 0xf0b, 0xf54,
-0xf0b, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf0b, 0xf63, 0xf94, 0xf0b, 0xf54, 0xf0b, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf0b, 0xf51, 0xfb2,
-0xf74, 0xf42, 0xf0b, 0xf54, 0xf0b, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf0b, 0xf56, 0xf51, 0xf74, 0xf53, 0xf0b, 0xf54, 0xf0b, 0x3b, 0xf5f,
-0xfb3, 0xf0b, 0xf56, 0xf0b, 0xf56, 0xf62, 0xf92, 0xfb1, 0xf51, 0xf0b, 0xf54, 0xf0b, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf0b, 0xf51, 0xf42,
-0xf74, 0xf0b, 0xf54, 0xf0b, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf0b, 0xf56, 0xf45, 0xf74, 0xf0b, 0xf54, 0xf0b, 0x3b, 0xf5f, 0xfb3, 0xf0b,
-0xf56, 0xf0b, 0xf56, 0xf45, 0xf74, 0xf0b, 0xf42, 0xf45, 0xf72, 0xf42, 0xf0b, 0xf54, 0xf0b, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf0b, 0xf56,
-0xf45, 0xf74, 0xf0b, 0xf42, 0xf49, 0xf72, 0xf66, 0xf0b, 0xf54, 0xf0b, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf0b, 0xf51, 0xf44, 0xf0b, 0xf54,
-0xf7c, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf0b, 0xf42, 0xf49, 0xf72, 0xf66, 0xf0b, 0xf54, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf0b, 0xf42,
-0xf66, 0xf74, 0xf58, 0xf0b, 0xf54, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf0b, 0xf56, 0xf5e, 0xf72, 0xf0b, 0xf54, 0x3b, 0xf5f, 0xfb3, 0xf0b,
-0xf56, 0xf0b, 0xf63, 0xf94, 0xf0b, 0xf54, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf0b, 0xf51, 0xfb2, 0xf74, 0xf42, 0xf0b, 0xf54, 0x3b, 0xf5f,
-0xfb3, 0xf0b, 0xf56, 0xf0b, 0xf56, 0xf51, 0xf74, 0xf53, 0xf0b, 0xf54, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf0b, 0xf56, 0xf62, 0xf92, 0xfb1,
-0xf51, 0xf0b, 0xf54, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf0b, 0xf51, 0xf42, 0xf74, 0xf0b, 0xf54, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf0b,
-0xf56, 0xf45, 0xf74, 0xf0b, 0xf54, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf0b, 0xf56, 0xf45, 0xf74, 0xf0b, 0xf42, 0xf45, 0xf72, 0xf42, 0xf0b,
-0xf54, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf0b, 0xf56, 0xf45, 0xf74, 0xf0b, 0xf42, 0xf49, 0xf72, 0xf66, 0xf0b, 0xf54, 0x3b, 0x1325, 0x122a,
-0x3b, 0x1208, 0x12ab, 0x3b, 0x1218, 0x130b, 0x3b, 0x121a, 0x12eb, 0x3b, 0x130d, 0x1295, 0x3b, 0x1230, 0x1290, 0x3b, 0x1213, 0x121d, 0x3b, 0x1290,
-0x1213, 0x3b, 0x1218, 0x1235, 0x3b, 0x1325, 0x1245, 0x3b, 0x1215, 0x12f3, 0x3b, 0x1273, 0x1215, 0x3b, 0x1325, 0x122a, 0x3b, 0x1208, 0x12ab, 0x1272,
-0x1275, 0x3b, 0x1218, 0x130b, 0x1262, 0x1275, 0x3b, 0x121a, 0x12eb, 0x12dd, 0x12eb, 0x3b, 0x130d, 0x1295, 0x1266, 0x1275, 0x3b, 0x1230, 0x1290, 0x3b,
-0x1213, 0x121d, 0x1208, 0x3b, 0x1290, 0x1213, 0x1230, 0x3b, 0x1218, 0x1235, 0x12a8, 0x1228, 0x121d, 0x3b, 0x1325, 0x1245, 0x121d, 0x1272, 0x3b, 0x1215,
-0x12f3, 0x122d, 0x3b, 0x1273, 0x1215, 0x1233, 0x1235, 0x3b, 0x1325, 0x3b, 0x1208, 0x3b, 0x1218, 0x3b, 0x121a, 0x3b, 0x130d, 0x3b, 0x1230, 0x3b,
-0x1213, 0x3b, 0x1290, 0x3b, 0x1218, 0x3b, 0x1325, 0x3b, 0x1215, 0x3b, 0x1273, 0x3b, 0x53, 0x101, 0x6e, 0x3b, 0x46, 0x113, 0x70, 0x3b,
+0x62, 0x72, 0x65, 0x3b, 0x64, 0x69, 0x63, 0x69, 0x65, 0x6d, 0x62, 0x72, 0x65, 0x65, 0x6e, 0x65, 0x2e, 0x3b, 0x66, 0x65,
+0x62, 0x2e, 0x3b, 0x6d, 0x61, 0x72, 0x2e, 0x3b, 0x61, 0x62, 0x72, 0x2e, 0x3b, 0x6d, 0x61, 0x79, 0x2e, 0x3b, 0x6a, 0x75,
+0x6e, 0x2e, 0x3b, 0x6a, 0x75, 0x6c, 0x2e, 0x3b, 0x61, 0x67, 0x6f, 0x2e, 0x3b, 0x73, 0x65, 0x70, 0x74, 0x2e, 0x3b, 0x6f,
+0x63, 0x74, 0x2e, 0x3b, 0x6e, 0x6f, 0x76, 0x2e, 0x3b, 0x64, 0x69, 0x63, 0x2e, 0x45, 0x3b, 0x46, 0x3b, 0x4d, 0x3b, 0x41,
+0x3b, 0x4d, 0x3b, 0x4a, 0x3b, 0x4a, 0x3b, 0x41, 0x3b, 0x53, 0x3b, 0x4f, 0x3b, 0x4e, 0x3b, 0x44, 0x65, 0x6e, 0x65, 0x2e,
+0x3b, 0x66, 0x65, 0x62, 0x2e, 0x3b, 0x6d, 0x61, 0x72, 0x2e, 0x3b, 0x61, 0x62, 0x72, 0x2e, 0x3b, 0x6d, 0x61, 0x79, 0x2e,
+0x3b, 0x6a, 0x75, 0x6e, 0x2e, 0x3b, 0x6a, 0x75, 0x6c, 0x2e, 0x3b, 0x61, 0x67, 0x6f, 0x2e, 0x3b, 0x73, 0x65, 0x70, 0x2e,
+0x3b, 0x6f, 0x63, 0x74, 0x2e, 0x3b, 0x6e, 0x6f, 0x76, 0x2e, 0x3b, 0x64, 0x69, 0x63, 0x2e, 0x65, 0x6e, 0x65, 0x72, 0x6f,
+0x3b, 0x66, 0x65, 0x62, 0x72, 0x65, 0x72, 0x6f, 0x3b, 0x6d, 0x61, 0x72, 0x7a, 0x6f, 0x3b, 0x61, 0x62, 0x72, 0x69, 0x6c,
+0x3b, 0x6d, 0x61, 0x79, 0x6f, 0x3b, 0x6a, 0x75, 0x6e, 0x69, 0x6f, 0x3b, 0x6a, 0x75, 0x6c, 0x69, 0x6f, 0x3b, 0x61, 0x67,
+0x6f, 0x73, 0x74, 0x6f, 0x3b, 0x73, 0x65, 0x74, 0x69, 0x65, 0x6d, 0x62, 0x72, 0x65, 0x3b, 0x6f, 0x63, 0x74, 0x75, 0x62,
+0x72, 0x65, 0x3b, 0x6e, 0x6f, 0x76, 0x69, 0x65, 0x6d, 0x62, 0x72, 0x65, 0x3b, 0x64, 0x69, 0x63, 0x69, 0x65, 0x6d, 0x62,
+0x72, 0x65, 0x45, 0x6e, 0x65, 0x2e, 0x3b, 0x46, 0x65, 0x62, 0x2e, 0x3b, 0x4d, 0x61, 0x72, 0x2e, 0x3b, 0x41, 0x62, 0x72,
+0x2e, 0x3b, 0x4d, 0x61, 0x79, 0x2e, 0x3b, 0x4a, 0x75, 0x6e, 0x2e, 0x3b, 0x4a, 0x75, 0x6c, 0x2e, 0x3b, 0x41, 0x67, 0x6f,
+0x2e, 0x3b, 0x53, 0x65, 0x74, 0x2e, 0x3b, 0x4f, 0x63, 0x74, 0x2e, 0x3b, 0x4e, 0x6f, 0x76, 0x2e, 0x3b, 0x44, 0x69, 0x63,
+0x2e, 0x65, 0x6e, 0x65, 0x2e, 0x3b, 0x66, 0x65, 0x62, 0x2e, 0x3b, 0x6d, 0x61, 0x72, 0x2e, 0x3b, 0x61, 0x62, 0x72, 0x2e,
+0x3b, 0x6d, 0x61, 0x79, 0x2e, 0x3b, 0x6a, 0x75, 0x6e, 0x2e, 0x3b, 0x6a, 0x75, 0x6c, 0x2e, 0x3b, 0x61, 0x67, 0x6f, 0x2e,
+0x3b, 0x73, 0x65, 0x74, 0x2e, 0x3b, 0x6f, 0x63, 0x74, 0x2e, 0x3b, 0x6e, 0x6f, 0x76, 0x2e, 0x3b, 0x64, 0x69, 0x63, 0x2e,
+0x4a, 0x61, 0x6e, 0x75, 0x61, 0x72, 0x69, 0x3b, 0x46, 0x65, 0x62, 0x72, 0x75, 0x61, 0x72, 0x69, 0x3b, 0x4d, 0x61, 0x63,
+0x68, 0x69, 0x3b, 0x41, 0x70, 0x72, 0x69, 0x6c, 0x69, 0x3b, 0x4d, 0x65, 0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x69, 0x3b, 0x4a,
+0x75, 0x6c, 0x61, 0x69, 0x3b, 0x41, 0x67, 0x6f, 0x73, 0x74, 0x69, 0x3b, 0x53, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x61,
+0x3b, 0x4f, 0x6b, 0x74, 0x6f, 0x62, 0x61, 0x3b, 0x4e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x44, 0x65, 0x73, 0x65,
+0x6d, 0x62, 0x61, 0x4a, 0x61, 0x6e, 0x3b, 0x46, 0x65, 0x62, 0x3b, 0x4d, 0x61, 0x63, 0x3b, 0x41, 0x70, 0x72, 0x3b, 0x4d,
+0x65, 0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x3b, 0x4a, 0x75, 0x6c, 0x3b, 0x41, 0x67, 0x6f, 0x3b, 0x53, 0x65, 0x70, 0x3b, 0x4f,
+0x6b, 0x74, 0x3b, 0x4e, 0x6f, 0x76, 0x3b, 0x44, 0x65, 0x73, 0x6a, 0x61, 0x6e, 0x75, 0x61, 0x72, 0x69, 0x3b, 0x66, 0x65,
+0x62, 0x72, 0x75, 0x61, 0x72, 0x69, 0x3b, 0x6d, 0x61, 0x72, 0x73, 0x3b, 0x61, 0x70, 0x72, 0x69, 0x6c, 0x3b, 0x6d, 0x61,
+0x6a, 0x3b, 0x6a, 0x75, 0x6e, 0x69, 0x3b, 0x6a, 0x75, 0x6c, 0x69, 0x3b, 0x61, 0x75, 0x67, 0x75, 0x73, 0x74, 0x69, 0x3b,
+0x73, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x6f, 0x6b, 0x74, 0x6f, 0x62, 0x65, 0x72, 0x3b, 0x6e, 0x6f,
+0x76, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x64, 0x65, 0x63, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x6a, 0x61, 0x6e, 0x2e, 0x3b,
+0x66, 0x65, 0x62, 0x2e, 0x3b, 0x6d, 0x61, 0x72, 0x73, 0x3b, 0x61, 0x70, 0x72, 0x2e, 0x3b, 0x6d, 0x61, 0x6a, 0x3b, 0x6a,
+0x75, 0x6e, 0x69, 0x3b, 0x6a, 0x75, 0x6c, 0x69, 0x3b, 0x61, 0x75, 0x67, 0x2e, 0x3b, 0x73, 0x65, 0x70, 0x2e, 0x3b, 0x6f,
+0x6b, 0x74, 0x2e, 0x3b, 0x6e, 0x6f, 0x76, 0x2e, 0x3b, 0x64, 0x65, 0x63, 0x2e, 0x42f, 0x43d, 0x432, 0x430, 0x440, 0x3b, 0x424,
+0x435, 0x432, 0x440, 0x430, 0x43b, 0x3b, 0x41c, 0x430, 0x440, 0x442, 0x3b, 0x410, 0x43f, 0x440, 0x435, 0x43b, 0x3b, 0x41c, 0x430, 0x439,
+0x3b, 0x418, 0x44e, 0x43d, 0x3b, 0x418, 0x44e, 0x43b, 0x3b, 0x410, 0x432, 0x433, 0x443, 0x441, 0x442, 0x3b, 0x421, 0x435, 0x43d, 0x442,
+0x44f, 0x431, 0x440, 0x3b, 0x41e, 0x43a, 0x442, 0x44f, 0x431, 0x440, 0x3b, 0x41d, 0x43e, 0x44f, 0x431, 0x440, 0x3b, 0x414, 0x435, 0x43a,
+0x430, 0x431, 0x440, 0xb9c, 0xba9, 0xbb5, 0xbb0, 0xbbf, 0x3b, 0xbaa, 0xbbf, 0xbaa, 0xbcd, 0xbb0, 0xbb5, 0xbb0, 0xbbf, 0x3b, 0xbae, 0xbbe,
+0xbb0, 0xbcd, 0xb9a, 0xbcd, 0x3b, 0xb8f, 0xbaa, 0xbcd, 0xbb0, 0xbb2, 0xbcd, 0x3b, 0xbae, 0xbc7, 0x3b, 0xb9c, 0xbc2, 0xba9, 0xbcd, 0x3b,
+0xb9c, 0xbc2, 0xbb2, 0xbc8, 0x3b, 0xb86, 0xb95, 0xbb8, 0xbcd, 0xb9f, 0xbcd, 0x3b, 0xb9a, 0xbc6, 0xbaa, 0xbcd, 0xb9f, 0xbae, 0xbcd, 0xbaa,
+0xbb0, 0xbcd, 0x3b, 0xb85, 0xb95, 0xbcd, 0xb9f, 0xbcb, 0xbaa, 0xbb0, 0xbcd, 0x3b, 0xba8, 0xbb5, 0xbae, 0xbcd, 0xbaa, 0xbb0, 0xbcd, 0x3b,
+0xb9f, 0xbbf, 0xb9a, 0xbae, 0xbcd, 0xbaa, 0xbb0, 0xbcd, 0xb9c, 0xba9, 0x2e, 0x3b, 0xbaa, 0xbbf, 0xbaa, 0xbcd, 0x2e, 0x3b, 0xbae, 0xbbe,
+0xbb0, 0xbcd, 0x2e, 0x3b, 0xb8f, 0xbaa, 0xbcd, 0x2e, 0x3b, 0xbae, 0xbc7, 0x3b, 0xb9c, 0xbc2, 0xba9, 0xbcd, 0x3b, 0xb9c, 0xbc2, 0xbb2,
+0xbc8, 0x3b, 0xb86, 0xb95, 0x2e, 0x3b, 0xb9a, 0xbc6, 0xbaa, 0xbcd, 0x2e, 0x3b, 0xb85, 0xb95, 0xbcd, 0x2e, 0x3b, 0xba8, 0xbb5, 0x2e,
+0x3b, 0xb9f, 0xbbf, 0xb9a, 0x2e, 0xb9c, 0x3b, 0xbaa, 0xbbf, 0x3b, 0xbae, 0xbbe, 0x3b, 0xb8f, 0x3b, 0xbae, 0xbc7, 0x3b, 0xb9c, 0xbc2,
+0x3b, 0xb9c, 0xbc2, 0x3b, 0xb86, 0x3b, 0xb9a, 0xbc6, 0x3b, 0xb85, 0x3b, 0xba8, 0x3b, 0xb9f, 0xbbf, 0x433, 0x44b, 0x439, 0x43d, 0x432,
+0x430, 0x440, 0x3b, 0x444, 0x435, 0x432, 0x440, 0x430, 0x43b, 0x44c, 0x3b, 0x43c, 0x430, 0x440, 0x442, 0x3b, 0x430, 0x43f, 0x440, 0x435,
+0x43b, 0x44c, 0x3b, 0x43c, 0x430, 0x439, 0x3b, 0x438, 0x44e, 0x43d, 0x44c, 0x3b, 0x438, 0x44e, 0x43b, 0x44c, 0x3b, 0x430, 0x432, 0x433,
+0x443, 0x441, 0x442, 0x3b, 0x441, 0x435, 0x43d, 0x442, 0x44f, 0x431, 0x440, 0x44c, 0x3b, 0x43e, 0x43a, 0x442, 0x44f, 0x431, 0x440, 0x44c,
+0x3b, 0x43d, 0x43e, 0x44f, 0x431, 0x440, 0x44c, 0x3b, 0x434, 0x435, 0x43a, 0x430, 0x431, 0x440, 0x44c, 0x433, 0x44b, 0x439, 0x43d, 0x2e,
+0x3b, 0x444, 0x435, 0x432, 0x2e, 0x3b, 0x43c, 0x430, 0x440, 0x2e, 0x3b, 0x430, 0x43f, 0x440, 0x2e, 0x3b, 0x43c, 0x430, 0x439, 0x3b,
+0x438, 0x44e, 0x43d, 0x44c, 0x3b, 0x438, 0x44e, 0x43b, 0x44c, 0x3b, 0x430, 0x432, 0x433, 0x2e, 0x3b, 0x441, 0x435, 0x43d, 0x442, 0x2e,
+0x3b, 0x43e, 0x43a, 0x442, 0x2e, 0x3b, 0x43d, 0x43e, 0x44f, 0x431, 0x2e, 0x3b, 0x434, 0x435, 0x43a, 0x2e, 0xc1c, 0xc28, 0xc35, 0xc30,
+0xc3f, 0x3b, 0xc2b, 0xc3f, 0xc2c, 0xc4d, 0xc30, 0xc35, 0xc30, 0xc3f, 0x3b, 0xc2e, 0xc3e, 0xc30, 0xc4d, 0xc1a, 0xc3f, 0x3b, 0xc0f, 0xc2a,
+0xc4d, 0xc30, 0xc3f, 0xc32, 0xc4d, 0x3b, 0xc2e, 0xc47, 0x3b, 0xc1c, 0xc42, 0xc28, 0xc4d, 0x3b, 0xc1c, 0xc41, 0xc32, 0xc48, 0x3b, 0xc06,
+0xc17, 0xc38, 0xc4d, 0xc1f, 0xc41, 0x3b, 0xc38, 0xc46, 0xc2a, 0xc4d, 0xc1f, 0xc46, 0xc02, 0xc2c, 0xc30, 0xc4d, 0x3b, 0xc05, 0xc15, 0xc4d,
+0xc1f, 0xc4b, 0xc2c, 0xc30, 0xc4d, 0x3b, 0xc28, 0xc35, 0xc02, 0xc2c, 0xc30, 0xc4d, 0x3b, 0xc21, 0xc3f, 0xc38, 0xc46, 0xc02, 0xc2c, 0xc30,
+0xc4d, 0xc1c, 0xc28, 0x3b, 0xc2b, 0xc3f, 0xc2c, 0xc4d, 0xc30, 0x3b, 0xc2e, 0xc3e, 0xc30, 0xc4d, 0xc1a, 0xc3f, 0x3b, 0xc0f, 0xc2a, 0xc4d,
+0xc30, 0xc3f, 0x3b, 0xc2e, 0xc47, 0x3b, 0xc1c, 0xc42, 0xc28, 0xc4d, 0x3b, 0xc1c, 0xc41, 0xc32, 0xc48, 0x3b, 0xc06, 0xc17, 0x3b, 0xc38,
+0xc46, 0xc2a, 0xc4d, 0xc1f, 0xc46, 0xc02, 0x3b, 0xc05, 0xc15, 0xc4d, 0xc1f, 0xc4b, 0x3b, 0xc28, 0xc35, 0xc02, 0x3b, 0xc21, 0xc3f, 0xc38,
+0xc46, 0xc02, 0xc1c, 0x3b, 0xc2b, 0xc3f, 0x3b, 0xc2e, 0xc3e, 0x3b, 0xc0f, 0x3b, 0xc2e, 0xc47, 0x3b, 0xc1c, 0xc42, 0x3b, 0xc1c, 0xc41,
+0x3b, 0xc06, 0x3b, 0xc38, 0xc46, 0x3b, 0xc05, 0x3b, 0xc28, 0x3b, 0xc21, 0xc3f, 0xe21, 0xe01, 0xe23, 0xe32, 0xe04, 0xe21, 0x3b, 0xe01,
+0xe38, 0xe21, 0xe20, 0xe32, 0xe1e, 0xe31, 0xe19, 0xe18, 0xe4c, 0x3b, 0xe21, 0xe35, 0xe19, 0xe32, 0xe04, 0xe21, 0x3b, 0xe40, 0xe21, 0xe29,
+0xe32, 0xe22, 0xe19, 0x3b, 0xe1e, 0xe24, 0xe29, 0xe20, 0xe32, 0xe04, 0xe21, 0x3b, 0xe21, 0xe34, 0xe16, 0xe38, 0xe19, 0xe32, 0xe22, 0xe19,
+0x3b, 0xe01, 0xe23, 0xe01, 0xe0e, 0xe32, 0xe04, 0xe21, 0x3b, 0xe2a, 0xe34, 0xe07, 0xe2b, 0xe32, 0xe04, 0xe21, 0x3b, 0xe01, 0xe31, 0xe19,
+0xe22, 0xe32, 0xe22, 0xe19, 0x3b, 0xe15, 0xe38, 0xe25, 0xe32, 0xe04, 0xe21, 0x3b, 0xe1e, 0xe24, 0xe28, 0xe08, 0xe34, 0xe01, 0xe32, 0xe22,
+0xe19, 0x3b, 0xe18, 0xe31, 0xe19, 0xe27, 0xe32, 0xe04, 0xe21, 0xe21, 0x2e, 0xe04, 0x2e, 0x3b, 0xe01, 0x2e, 0xe1e, 0x2e, 0x3b, 0xe21,
+0xe35, 0x2e, 0xe04, 0x2e, 0x3b, 0xe40, 0xe21, 0x2e, 0xe22, 0x2e, 0x3b, 0xe1e, 0x2e, 0xe04, 0x2e, 0x3b, 0xe21, 0xe34, 0x2e, 0xe22,
+0x2e, 0x3b, 0xe01, 0x2e, 0xe04, 0x2e, 0x3b, 0xe2a, 0x2e, 0xe04, 0x2e, 0x3b, 0xe01, 0x2e, 0xe22, 0x2e, 0x3b, 0xe15, 0x2e, 0xe04,
+0x2e, 0x3b, 0xe1e, 0x2e, 0xe22, 0x2e, 0x3b, 0xe18, 0x2e, 0xe04, 0x2e, 0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf0b, 0xf51, 0xf44, 0xf0b, 0xf54,
+0xf7c, 0xf0b, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf0b, 0xf42, 0xf49, 0xf72, 0xf66, 0xf0b, 0xf54, 0xf0b, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf56,
+0xf0b, 0xf42, 0xf66, 0xf74, 0xf58, 0xf0b, 0xf54, 0xf0b, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf0b, 0xf56, 0xf5e, 0xf72, 0xf0b, 0xf54, 0xf0b,
+0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf0b, 0xf63, 0xf94, 0xf0b, 0xf54, 0xf0b, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf0b, 0xf51, 0xfb2, 0xf74,
+0xf42, 0xf0b, 0xf54, 0xf0b, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf0b, 0xf56, 0xf51, 0xf74, 0xf53, 0xf0b, 0xf54, 0xf0b, 0x3b, 0xf5f, 0xfb3,
+0xf0b, 0xf56, 0xf0b, 0xf56, 0xf62, 0xf92, 0xfb1, 0xf51, 0xf0b, 0xf54, 0xf0b, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf0b, 0xf51, 0xf42, 0xf74,
+0xf0b, 0xf54, 0xf0b, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf0b, 0xf56, 0xf45, 0xf74, 0xf0b, 0xf54, 0xf0b, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf56,
+0xf0b, 0xf56, 0xf45, 0xf74, 0xf0b, 0xf42, 0xf45, 0xf72, 0xf42, 0xf0b, 0xf54, 0xf0b, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf0b, 0xf56, 0xf45,
+0xf74, 0xf0b, 0xf42, 0xf49, 0xf72, 0xf66, 0xf0b, 0xf54, 0xf0b, 0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf0b, 0xf51, 0xf44, 0xf0b, 0xf54, 0xf7c, 0x3b,
+0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf0b, 0xf42, 0xf49, 0xf72, 0xf66, 0xf0b, 0xf54, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf0b, 0xf42, 0xf66, 0xf74,
+0xf58, 0xf0b, 0xf54, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf0b, 0xf56, 0xf5e, 0xf72, 0xf0b, 0xf54, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf0b,
+0xf63, 0xf94, 0xf0b, 0xf54, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf0b, 0xf51, 0xfb2, 0xf74, 0xf42, 0xf0b, 0xf54, 0x3b, 0xf5f, 0xfb3, 0xf0b,
+0xf56, 0xf0b, 0xf56, 0xf51, 0xf74, 0xf53, 0xf0b, 0xf54, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf0b, 0xf56, 0xf62, 0xf92, 0xfb1, 0xf51, 0xf0b,
+0xf54, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf0b, 0xf51, 0xf42, 0xf74, 0xf0b, 0xf54, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf0b, 0xf56, 0xf45,
+0xf74, 0xf0b, 0xf54, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf0b, 0xf56, 0xf45, 0xf74, 0xf0b, 0xf42, 0xf45, 0xf72, 0xf42, 0xf0b, 0xf54, 0x3b,
+0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf0b, 0xf56, 0xf45, 0xf74, 0xf0b, 0xf42, 0xf49, 0xf72, 0xf66, 0xf0b, 0xf54, 0x1325, 0x122a, 0x3b, 0x1208, 0x12ab,
+0x1272, 0x1275, 0x3b, 0x1218, 0x130b, 0x1262, 0x1275, 0x3b, 0x121a, 0x12eb, 0x12dd, 0x12eb, 0x3b, 0x130d, 0x1295, 0x1266, 0x1275, 0x3b, 0x1230, 0x1290,
+0x3b, 0x1213, 0x121d, 0x1208, 0x3b, 0x1290, 0x1213, 0x1230, 0x3b, 0x1218, 0x1235, 0x12a8, 0x1228, 0x121d, 0x3b, 0x1325, 0x1245, 0x121d, 0x1272, 0x3b,
+0x1215, 0x12f3, 0x122d, 0x3b, 0x1273, 0x1215, 0x1233, 0x1235, 0x1325, 0x122a, 0x3b, 0x1208, 0x12ab, 0x3b, 0x1218, 0x130b, 0x3b, 0x121a, 0x12eb, 0x3b,
+0x130d, 0x1295, 0x3b, 0x1230, 0x1290, 0x3b, 0x1213, 0x121d, 0x3b, 0x1290, 0x1213, 0x3b, 0x1218, 0x1235, 0x3b, 0x1325, 0x1245, 0x3b, 0x1215, 0x12f3,
+0x3b, 0x1273, 0x1215, 0x1325, 0x3b, 0x1208, 0x3b, 0x1218, 0x3b, 0x121a, 0x3b, 0x130d, 0x3b, 0x1230, 0x3b, 0x1213, 0x3b, 0x1290, 0x3b, 0x1218,
+0x3b, 0x1325, 0x3b, 0x1215, 0x3b, 0x1273, 0x53, 0x101, 0x6e, 0x75, 0x61, 0x6c, 0x69, 0x3b, 0x46, 0x113, 0x70, 0x75, 0x65, 0x6c,
+0x69, 0x3b, 0x4d, 0x61, 0x2bb, 0x61, 0x73, 0x69, 0x3b, 0x2bb, 0x45, 0x70, 0x65, 0x6c, 0x65, 0x6c, 0x69, 0x3b, 0x4d, 0x113,
+0x3b, 0x53, 0x75, 0x6e, 0x65, 0x3b, 0x53, 0x69, 0x75, 0x6c, 0x61, 0x69, 0x3b, 0x2bb, 0x41, 0x6f, 0x6b, 0x6f, 0x73, 0x69,
+0x3b, 0x53, 0x65, 0x70, 0x69, 0x74, 0x65, 0x6d, 0x61, 0x3b, 0x2bb, 0x4f, 0x6b, 0x61, 0x74, 0x6f, 0x70, 0x61, 0x3b, 0x4e,
+0x14d, 0x76, 0x65, 0x6d, 0x61, 0x3b, 0x54, 0x12b, 0x73, 0x65, 0x6d, 0x61, 0x53, 0x101, 0x6e, 0x3b, 0x46, 0x113, 0x70, 0x3b,
 0x4d, 0x61, 0x2bb, 0x61, 0x3b, 0x2bb, 0x45, 0x70, 0x65, 0x3b, 0x4d, 0x113, 0x3b, 0x53, 0x75, 0x6e, 0x3b, 0x53, 0x69, 0x75,
 0x3b, 0x2bb, 0x41, 0x6f, 0x6b, 0x3b, 0x53, 0x65, 0x70, 0x3b, 0x2bb, 0x4f, 0x6b, 0x61, 0x3b, 0x4e, 0x14d, 0x76, 0x3b, 0x54,
-0x12b, 0x73, 0x3b, 0x53, 0x101, 0x6e, 0x75, 0x61, 0x6c, 0x69, 0x3b, 0x46, 0x113, 0x70, 0x75, 0x65, 0x6c, 0x69, 0x3b, 0x4d,
-0x61, 0x2bb, 0x61, 0x73, 0x69, 0x3b, 0x2bb, 0x45, 0x70, 0x65, 0x6c, 0x65, 0x6c, 0x69, 0x3b, 0x4d, 0x113, 0x3b, 0x53, 0x75,
-0x6e, 0x65, 0x3b, 0x53, 0x69, 0x75, 0x6c, 0x61, 0x69, 0x3b, 0x2bb, 0x41, 0x6f, 0x6b, 0x6f, 0x73, 0x69, 0x3b, 0x53, 0x65,
-0x70, 0x69, 0x74, 0x65, 0x6d, 0x61, 0x3b, 0x2bb, 0x4f, 0x6b, 0x61, 0x74, 0x6f, 0x70, 0x61, 0x3b, 0x4e, 0x14d, 0x76, 0x65,
-0x6d, 0x61, 0x3b, 0x54, 0x12b, 0x73, 0x65, 0x6d, 0x61, 0x3b, 0x53, 0x3b, 0x46, 0x3b, 0x4d, 0x3b, 0x45, 0x3b, 0x4d, 0x3b,
-0x53, 0x3b, 0x53, 0x3b, 0x41, 0x3b, 0x53, 0x3b, 0x4f, 0x3b, 0x4e, 0x3b, 0x54, 0x3b, 0x4f, 0x63, 0x61, 0x3b, 0x15e, 0x75,
-0x62, 0x3b, 0x4d, 0x61, 0x72, 0x3b, 0x4e, 0x69, 0x73, 0x3b, 0x4d, 0x61, 0x79, 0x3b, 0x48, 0x61, 0x7a, 0x3b, 0x54, 0x65,
-0x6d, 0x3b, 0x41, 0x11f, 0x75, 0x3b, 0x45, 0x79, 0x6c, 0x3b, 0x45, 0x6b, 0x69, 0x3b, 0x4b, 0x61, 0x73, 0x3b, 0x41, 0x72,
-0x61, 0x3b, 0x4f, 0x63, 0x61, 0x6b, 0x3b, 0x15e, 0x75, 0x62, 0x61, 0x74, 0x3b, 0x4d, 0x61, 0x72, 0x74, 0x3b, 0x4e, 0x69,
-0x73, 0x61, 0x6e, 0x3b, 0x4d, 0x61, 0x79, 0x131, 0x73, 0x3b, 0x48, 0x61, 0x7a, 0x69, 0x72, 0x61, 0x6e, 0x3b, 0x54, 0x65,
-0x6d, 0x6d, 0x75, 0x7a, 0x3b, 0x41, 0x11f, 0x75, 0x73, 0x74, 0x6f, 0x73, 0x3b, 0x45, 0x79, 0x6c, 0xfc, 0x6c, 0x3b, 0x45,
-0x6b, 0x69, 0x6d, 0x3b, 0x4b, 0x61, 0x73, 0x131, 0x6d, 0x3b, 0x41, 0x72, 0x61, 0x6c, 0x131, 0x6b, 0x3b, 0x4f, 0x3b, 0x15e,
-0x3b, 0x4d, 0x3b, 0x4e, 0x3b, 0x4d, 0x3b, 0x48, 0x3b, 0x54, 0x3b, 0x41, 0x3b, 0x45, 0x3b, 0x45, 0x3b, 0x4b, 0x3b, 0x41,
-0x3b, 0xdd, 0x61, 0x6e, 0x3b, 0x46, 0x65, 0x77, 0x3b, 0x4d, 0x61, 0x72, 0x3b, 0x41, 0x70, 0x72, 0x3b, 0x4d, 0x61, 0xfd,
+0x12b, 0x73, 0x53, 0x3b, 0x46, 0x3b, 0x4d, 0x3b, 0x45, 0x3b, 0x4d, 0x3b, 0x53, 0x3b, 0x53, 0x3b, 0x41, 0x3b, 0x53, 0x3b,
+0x4f, 0x3b, 0x4e, 0x3b, 0x54, 0x4f, 0x63, 0x61, 0x6b, 0x3b, 0x15e, 0x75, 0x62, 0x61, 0x74, 0x3b, 0x4d, 0x61, 0x72, 0x74,
+0x3b, 0x4e, 0x69, 0x73, 0x61, 0x6e, 0x3b, 0x4d, 0x61, 0x79, 0x131, 0x73, 0x3b, 0x48, 0x61, 0x7a, 0x69, 0x72, 0x61, 0x6e,
+0x3b, 0x54, 0x65, 0x6d, 0x6d, 0x75, 0x7a, 0x3b, 0x41, 0x11f, 0x75, 0x73, 0x74, 0x6f, 0x73, 0x3b, 0x45, 0x79, 0x6c, 0xfc,
+0x6c, 0x3b, 0x45, 0x6b, 0x69, 0x6d, 0x3b, 0x4b, 0x61, 0x73, 0x131, 0x6d, 0x3b, 0x41, 0x72, 0x61, 0x6c, 0x131, 0x6b, 0x4f,
+0x63, 0x61, 0x3b, 0x15e, 0x75, 0x62, 0x3b, 0x4d, 0x61, 0x72, 0x3b, 0x4e, 0x69, 0x73, 0x3b, 0x4d, 0x61, 0x79, 0x3b, 0x48,
+0x61, 0x7a, 0x3b, 0x54, 0x65, 0x6d, 0x3b, 0x41, 0x11f, 0x75, 0x3b, 0x45, 0x79, 0x6c, 0x3b, 0x45, 0x6b, 0x69, 0x3b, 0x4b,
+0x61, 0x73, 0x3b, 0x41, 0x72, 0x61, 0x4f, 0x3b, 0x15e, 0x3b, 0x4d, 0x3b, 0x4e, 0x3b, 0x4d, 0x3b, 0x48, 0x3b, 0x54, 0x3b,
+0x41, 0x3b, 0x45, 0x3b, 0x45, 0x3b, 0x4b, 0x3b, 0x41, 0xdd, 0x61, 0x6e, 0x77, 0x61, 0x72, 0x3b, 0x46, 0x65, 0x77, 0x72,
+0x61, 0x6c, 0x3b, 0x4d, 0x61, 0x72, 0x74, 0x3b, 0x41, 0x70, 0x72, 0x65, 0x6c, 0x3b, 0x4d, 0x61, 0xfd, 0x3b, 0x49, 0xfd,
+0x75, 0x6e, 0x3b, 0x49, 0xfd, 0x75, 0x6c, 0x3b, 0x41, 0x77, 0x67, 0x75, 0x73, 0x74, 0x3b, 0x53, 0x65, 0x6e, 0x74, 0xfd,
+0x61, 0x62, 0x72, 0x3b, 0x4f, 0x6b, 0x74, 0xfd, 0x61, 0x62, 0x72, 0x3b, 0x4e, 0x6f, 0xfd, 0x61, 0x62, 0x72, 0x3b, 0x44,
+0x65, 0x6b, 0x61, 0x62, 0x72, 0xfd, 0x61, 0x6e, 0x77, 0x61, 0x72, 0x3b, 0x66, 0x65, 0x77, 0x72, 0x61, 0x6c, 0x3b, 0x6d,
+0x61, 0x72, 0x74, 0x3b, 0x61, 0x70, 0x72, 0x65, 0x6c, 0x3b, 0x6d, 0x61, 0xfd, 0x3b, 0x69, 0xfd, 0x75, 0x6e, 0x3b, 0x69,
+0xfd, 0x75, 0x6c, 0x3b, 0x61, 0x77, 0x67, 0x75, 0x73, 0x74, 0x3b, 0x73, 0x65, 0x6e, 0x74, 0xfd, 0x61, 0x62, 0x72, 0x3b,
+0x6f, 0x6b, 0x74, 0xfd, 0x61, 0x62, 0x72, 0x3b, 0x6e, 0x6f, 0xfd, 0x61, 0x62, 0x72, 0x3b, 0x64, 0x65, 0x6b, 0x61, 0x62,
+0x72, 0xdd, 0x61, 0x6e, 0x3b, 0x46, 0x65, 0x77, 0x3b, 0x4d, 0x61, 0x72, 0x3b, 0x41, 0x70, 0x72, 0x3b, 0x4d, 0x61, 0xfd,
 0x3b, 0x49, 0xfd, 0x75, 0x6e, 0x3b, 0x49, 0xfd, 0x75, 0x6c, 0x3b, 0x41, 0x77, 0x67, 0x3b, 0x53, 0x65, 0x6e, 0x3b, 0x4f,
-0x6b, 0x74, 0x3b, 0x4e, 0x6f, 0xfd, 0x3b, 0x44, 0x65, 0x6b, 0x3b, 0xdd, 0x61, 0x6e, 0x77, 0x61, 0x72, 0x3b, 0x46, 0x65,
-0x77, 0x72, 0x61, 0x6c, 0x3b, 0x4d, 0x61, 0x72, 0x74, 0x3b, 0x41, 0x70, 0x72, 0x65, 0x6c, 0x3b, 0x4d, 0x61, 0xfd, 0x3b,
-0x49, 0xfd, 0x75, 0x6e, 0x3b, 0x49, 0xfd, 0x75, 0x6c, 0x3b, 0x41, 0x77, 0x67, 0x75, 0x73, 0x74, 0x3b, 0x53, 0x65, 0x6e,
-0x74, 0xfd, 0x61, 0x62, 0x72, 0x3b, 0x4f, 0x6b, 0x74, 0xfd, 0x61, 0x62, 0x72, 0x3b, 0x4e, 0x6f, 0xfd, 0x61, 0x62, 0x72,
-0x3b, 0x44, 0x65, 0x6b, 0x61, 0x62, 0x72, 0x3b, 0xdd, 0x3b, 0x46, 0x3b, 0x4d, 0x3b, 0x41, 0x3b, 0x4d, 0x3b, 0x49, 0x3b,
-0x49, 0x3b, 0x41, 0x3b, 0x53, 0x3b, 0x4f, 0x3b, 0x4e, 0x3b, 0x44, 0x3b, 0xfd, 0x61, 0x6e, 0x3b, 0x66, 0x65, 0x77, 0x3b,
-0x6d, 0x61, 0x72, 0x74, 0x3b, 0x61, 0x70, 0x72, 0x3b, 0x6d, 0x61, 0xfd, 0x3b, 0x69, 0xfd, 0x75, 0x6e, 0x3b, 0x69, 0xfd,
-0x75, 0x6c, 0x3b, 0x61, 0x77, 0x67, 0x3b, 0x73, 0x65, 0x6e, 0x3b, 0x6f, 0x6b, 0x74, 0x3b, 0x6e, 0x6f, 0xfd, 0x3b, 0x64,
-0x65, 0x6b, 0x3b, 0xfd, 0x61, 0x6e, 0x77, 0x61, 0x72, 0x3b, 0x66, 0x65, 0x77, 0x72, 0x61, 0x6c, 0x3b, 0x6d, 0x61, 0x72,
-0x74, 0x3b, 0x61, 0x70, 0x72, 0x65, 0x6c, 0x3b, 0x6d, 0x61, 0xfd, 0x3b, 0x69, 0xfd, 0x75, 0x6e, 0x3b, 0x69, 0xfd, 0x75,
-0x6c, 0x3b, 0x61, 0x77, 0x67, 0x75, 0x73, 0x74, 0x3b, 0x73, 0x65, 0x6e, 0x74, 0xfd, 0x61, 0x62, 0x72, 0x3b, 0x6f, 0x6b,
-0x74, 0xfd, 0x61, 0x62, 0x72, 0x3b, 0x6e, 0x6f, 0xfd, 0x61, 0x62, 0x72, 0x3b, 0x64, 0x65, 0x6b, 0x61, 0x62, 0x72, 0x3b,
-0x64a, 0x627, 0x646, 0x6cb, 0x627, 0x631, 0x3b, 0x641, 0x6d0, 0x6cb, 0x631, 0x627, 0x644, 0x3b, 0x645, 0x627, 0x631, 0x62a, 0x3b, 0x626,
-0x627, 0x67e, 0x631, 0x6d0, 0x644, 0x3b, 0x645, 0x627, 0x64a, 0x3b, 0x626, 0x649, 0x64a, 0x6c7, 0x646, 0x3b, 0x626, 0x649, 0x64a, 0x6c7,
-0x644, 0x3b, 0x626, 0x627, 0x6cb, 0x63a, 0x6c7, 0x633, 0x62a, 0x3b, 0x633, 0x6d0, 0x646, 0x62a, 0x6d5, 0x628, 0x649, 0x631, 0x3b, 0x626,
-0x6c6, 0x643, 0x62a, 0x6d5, 0x628, 0x649, 0x631, 0x3b, 0x646, 0x648, 0x64a, 0x627, 0x628, 0x649, 0x631, 0x3b, 0x62f, 0x6d0, 0x643, 0x627,
-0x628, 0x649, 0x631, 0x3b, 0x441, 0x456, 0x447, 0x3b, 0x43b, 0x44e, 0x442, 0x3b, 0x431, 0x435, 0x440, 0x3b, 0x43a, 0x432, 0x456, 0x3b,
-0x442, 0x440, 0x430, 0x3b, 0x447, 0x435, 0x440, 0x3b, 0x43b, 0x438, 0x43f, 0x3b, 0x441, 0x435, 0x440, 0x3b, 0x432, 0x435, 0x440, 0x3b,
-0x436, 0x43e, 0x432, 0x3b, 0x43b, 0x438, 0x441, 0x3b, 0x433, 0x440, 0x443, 0x3b, 0x441, 0x456, 0x447, 0x435, 0x43d, 0x44c, 0x3b, 0x43b,
-0x44e, 0x442, 0x438, 0x439, 0x3b, 0x431, 0x435, 0x440, 0x435, 0x437, 0x435, 0x43d, 0x44c, 0x3b, 0x43a, 0x432, 0x456, 0x442, 0x435, 0x43d,
-0x44c, 0x3b, 0x442, 0x440, 0x430, 0x432, 0x435, 0x43d, 0x44c, 0x3b, 0x447, 0x435, 0x440, 0x432, 0x435, 0x43d, 0x44c, 0x3b, 0x43b, 0x438,
-0x43f, 0x435, 0x43d, 0x44c, 0x3b, 0x441, 0x435, 0x440, 0x43f, 0x435, 0x43d, 0x44c, 0x3b, 0x432, 0x435, 0x440, 0x435, 0x441, 0x435, 0x43d,
-0x44c, 0x3b, 0x436, 0x43e, 0x432, 0x442, 0x435, 0x43d, 0x44c, 0x3b, 0x43b, 0x438, 0x441, 0x442, 0x43e, 0x43f, 0x430, 0x434, 0x3b, 0x433,
-0x440, 0x443, 0x434, 0x435, 0x43d, 0x44c, 0x3b, 0x421, 0x3b, 0x41b, 0x3b, 0x411, 0x3b, 0x41a, 0x3b, 0x422, 0x3b, 0x427, 0x3b, 0x41b,
-0x3b, 0x421, 0x3b, 0x412, 0x3b, 0x416, 0x3b, 0x41b, 0x3b, 0x413, 0x3b, 0x441, 0x456, 0x447, 0x2e, 0x3b, 0x43b, 0x44e, 0x442, 0x2e,
-0x3b, 0x431, 0x435, 0x440, 0x2e, 0x3b, 0x43a, 0x432, 0x456, 0x442, 0x2e, 0x3b, 0x442, 0x440, 0x430, 0x432, 0x2e, 0x3b, 0x447, 0x435,
-0x440, 0x432, 0x2e, 0x3b, 0x43b, 0x438, 0x43f, 0x2e, 0x3b, 0x441, 0x435, 0x440, 0x43f, 0x2e, 0x3b, 0x432, 0x435, 0x440, 0x2e, 0x3b,
-0x436, 0x43e, 0x432, 0x442, 0x2e, 0x3b, 0x43b, 0x438, 0x441, 0x442, 0x2e, 0x3b, 0x433, 0x440, 0x443, 0x434, 0x2e, 0x3b, 0x441, 0x456,
-0x447, 0x43d, 0x44f, 0x3b, 0x43b, 0x44e, 0x442, 0x43e, 0x433, 0x43e, 0x3b, 0x431, 0x435, 0x440, 0x435, 0x437, 0x43d, 0x44f, 0x3b, 0x43a,
-0x432, 0x456, 0x442, 0x43d, 0x44f, 0x3b, 0x442, 0x440, 0x430, 0x432, 0x43d, 0x44f, 0x3b, 0x447, 0x435, 0x440, 0x432, 0x43d, 0x44f, 0x3b,
-0x43b, 0x438, 0x43f, 0x43d, 0x44f, 0x3b, 0x441, 0x435, 0x440, 0x43f, 0x43d, 0x44f, 0x3b, 0x432, 0x435, 0x440, 0x435, 0x441, 0x43d, 0x44f,
-0x3b, 0x436, 0x43e, 0x432, 0x442, 0x43d, 0x44f, 0x3b, 0x43b, 0x438, 0x441, 0x442, 0x43e, 0x43f, 0x430, 0x434, 0x430, 0x3b, 0x433, 0x440,
-0x443, 0x434, 0x43d, 0x44f, 0x3b, 0x441, 0x3b, 0x43b, 0x3b, 0x431, 0x3b, 0x43a, 0x3b, 0x442, 0x3b, 0x447, 0x3b, 0x43b, 0x3b, 0x441,
-0x3b, 0x432, 0x3b, 0x436, 0x3b, 0x43b, 0x3b, 0x433, 0x3b, 0x62c, 0x646, 0x648, 0x631, 0x6cc, 0x3b, 0x641, 0x631, 0x648, 0x631, 0x6cc,
-0x3b, 0x645, 0x627, 0x631, 0x686, 0x3b, 0x627, 0x67e, 0x631, 0x6cc, 0x644, 0x3b, 0x645, 0x626, 0x6cc, 0x3b, 0x62c, 0x648, 0x646, 0x3b,
-0x62c, 0x648, 0x644, 0x627, 0x626, 0x6cc, 0x3b, 0x627, 0x6af, 0x633, 0x62a, 0x3b, 0x633, 0x62a, 0x645, 0x628, 0x631, 0x3b, 0x627, 0x6a9,
-0x62a, 0x648, 0x628, 0x631, 0x3b, 0x646, 0x648, 0x645, 0x628, 0x631, 0x3b, 0x62f, 0x633, 0x645, 0x628, 0x631, 0x3b, 0x59, 0x61, 0x6e,
-0x3b, 0x46, 0x65, 0x76, 0x3b, 0x4d, 0x61, 0x72, 0x3b, 0x41, 0x70, 0x72, 0x3b, 0x4d, 0x61, 0x79, 0x3b, 0x49, 0x79, 0x6e,
-0x3b, 0x49, 0x79, 0x6c, 0x3b, 0x41, 0x76, 0x67, 0x3b, 0x53, 0x65, 0x6e, 0x3b, 0x4f, 0x6b, 0x74, 0x3b, 0x4e, 0x6f, 0x79,
-0x3b, 0x44, 0x65, 0x6b, 0x3b, 0x59, 0x61, 0x6e, 0x76, 0x61, 0x72, 0x3b, 0x46, 0x65, 0x76, 0x72, 0x61, 0x6c, 0x3b, 0x4d,
-0x61, 0x72, 0x74, 0x3b, 0x41, 0x70, 0x72, 0x65, 0x6c, 0x3b, 0x4d, 0x61, 0x79, 0x3b, 0x49, 0x79, 0x75, 0x6e, 0x3b, 0x49,
-0x79, 0x75, 0x6c, 0x3b, 0x41, 0x76, 0x67, 0x75, 0x73, 0x74, 0x3b, 0x53, 0x65, 0x6e, 0x74, 0x61, 0x62, 0x72, 0x3b, 0x4f,
-0x6b, 0x74, 0x61, 0x62, 0x72, 0x3b, 0x4e, 0x6f, 0x79, 0x61, 0x62, 0x72, 0x3b, 0x44, 0x65, 0x6b, 0x61, 0x62, 0x72, 0x3b,
-0x59, 0x3b, 0x46, 0x3b, 0x4d, 0x3b, 0x41, 0x3b, 0x4d, 0x3b, 0x49, 0x3b, 0x49, 0x3b, 0x41, 0x3b, 0x53, 0x3b, 0x4f, 0x3b,
-0x4e, 0x3b, 0x44, 0x3b, 0x79, 0x61, 0x6e, 0x3b, 0x66, 0x65, 0x76, 0x3b, 0x6d, 0x61, 0x72, 0x3b, 0x61, 0x70, 0x72, 0x3b,
-0x6d, 0x61, 0x79, 0x3b, 0x69, 0x79, 0x6e, 0x3b, 0x69, 0x79, 0x6c, 0x3b, 0x61, 0x76, 0x67, 0x3b, 0x73, 0x65, 0x6e, 0x3b,
-0x6f, 0x6b, 0x74, 0x3b, 0x6e, 0x6f, 0x79, 0x3b, 0x64, 0x65, 0x6b, 0x3b, 0x79, 0x61, 0x6e, 0x76, 0x61, 0x72, 0x3b, 0x66,
-0x65, 0x76, 0x72, 0x61, 0x6c, 0x3b, 0x6d, 0x61, 0x72, 0x74, 0x3b, 0x61, 0x70, 0x72, 0x65, 0x6c, 0x3b, 0x6d, 0x61, 0x79,
-0x3b, 0x69, 0x79, 0x75, 0x6e, 0x3b, 0x69, 0x79, 0x75, 0x6c, 0x3b, 0x61, 0x76, 0x67, 0x75, 0x73, 0x74, 0x3b, 0x73, 0x65,
-0x6e, 0x74, 0x61, 0x62, 0x72, 0x3b, 0x6f, 0x6b, 0x74, 0x61, 0x62, 0x72, 0x3b, 0x6e, 0x6f, 0x79, 0x61, 0x62, 0x72, 0x3b,
-0x64, 0x65, 0x6b, 0x61, 0x62, 0x72, 0x3b, 0x62c, 0x646, 0x648, 0x3b, 0x641, 0x628, 0x631, 0x3b, 0x645, 0x627, 0x631, 0x3b, 0x627,
-0x67e, 0x631, 0x3b, 0x645, 0x6cc, 0x3b, 0x62c, 0x648, 0x646, 0x3b, 0x62c, 0x648, 0x644, 0x3b, 0x627, 0x6af, 0x633, 0x3b, 0x633, 0x67e,
-0x62a, 0x3b, 0x627, 0x6a9, 0x62a, 0x3b, 0x646, 0x648, 0x645, 0x3b, 0x62f, 0x633, 0x645, 0x3b, 0x44f, 0x43d, 0x432, 0x3b, 0x444, 0x435,
-0x432, 0x3b, 0x43c, 0x430, 0x440, 0x3b, 0x430, 0x43f, 0x440, 0x3b, 0x43c, 0x430, 0x439, 0x3b, 0x438, 0x44e, 0x43d, 0x3b, 0x438, 0x44e,
-0x43b, 0x3b, 0x430, 0x432, 0x433, 0x3b, 0x441, 0x435, 0x43d, 0x3b, 0x43e, 0x43a, 0x442, 0x3b, 0x43d, 0x43e, 0x44f, 0x3b, 0x434, 0x435,
-0x43a, 0x3b, 0x44f, 0x43d, 0x432, 0x430, 0x440, 0x3b, 0x444, 0x435, 0x432, 0x440, 0x430, 0x43b, 0x3b, 0x43c, 0x430, 0x440, 0x442, 0x3b,
-0x430, 0x43f, 0x440, 0x435, 0x43b, 0x3b, 0x43c, 0x430, 0x439, 0x3b, 0x438, 0x44e, 0x43d, 0x3b, 0x438, 0x44e, 0x43b, 0x3b, 0x430, 0x432,
-0x433, 0x443, 0x441, 0x442, 0x3b, 0x441, 0x435, 0x43d, 0x442, 0x44f, 0x431, 0x440, 0x3b, 0x43e, 0x43a, 0x442, 0x44f, 0x431, 0x440, 0x3b,
-0x43d, 0x43e, 0x44f, 0x431, 0x440, 0x3b, 0x434, 0x435, 0x43a, 0x430, 0x431, 0x440, 0x3b, 0x54, 0x68, 0x67, 0x20, 0x31, 0x3b, 0x54,
-0x68, 0x67, 0x20, 0x32, 0x3b, 0x54, 0x68, 0x67, 0x20, 0x33, 0x3b, 0x54, 0x68, 0x67, 0x20, 0x34, 0x3b, 0x54, 0x68, 0x67,
-0x20, 0x35, 0x3b, 0x54, 0x68, 0x67, 0x20, 0x36, 0x3b, 0x54, 0x68, 0x67, 0x20, 0x37, 0x3b, 0x54, 0x68, 0x67, 0x20, 0x38,
-0x3b, 0x54, 0x68, 0x67, 0x20, 0x39, 0x3b, 0x54, 0x68, 0x67, 0x20, 0x31, 0x30, 0x3b, 0x54, 0x68, 0x67, 0x20, 0x31, 0x31,
-0x3b, 0x54, 0x68, 0x67, 0x20, 0x31, 0x32, 0x3b, 0x54, 0x68, 0xe1, 0x6e, 0x67, 0x20, 0x31, 0x3b, 0x54, 0x68, 0xe1, 0x6e,
-0x67, 0x20, 0x32, 0x3b, 0x54, 0x68, 0xe1, 0x6e, 0x67, 0x20, 0x33, 0x3b, 0x54, 0x68, 0xe1, 0x6e, 0x67, 0x20, 0x34, 0x3b,
-0x54, 0x68, 0xe1, 0x6e, 0x67, 0x20, 0x35, 0x3b, 0x54, 0x68, 0xe1, 0x6e, 0x67, 0x20, 0x36, 0x3b, 0x54, 0x68, 0xe1, 0x6e,
-0x67, 0x20, 0x37, 0x3b, 0x54, 0x68, 0xe1, 0x6e, 0x67, 0x20, 0x38, 0x3b, 0x54, 0x68, 0xe1, 0x6e, 0x67, 0x20, 0x39, 0x3b,
-0x54, 0x68, 0xe1, 0x6e, 0x67, 0x20, 0x31, 0x30, 0x3b, 0x54, 0x68, 0xe1, 0x6e, 0x67, 0x20, 0x31, 0x31, 0x3b, 0x54, 0x68,
-0xe1, 0x6e, 0x67, 0x20, 0x31, 0x32, 0x3b, 0x74, 0x68, 0x67, 0x20, 0x31, 0x3b, 0x74, 0x68, 0x67, 0x20, 0x32, 0x3b, 0x74,
-0x68, 0x67, 0x20, 0x33, 0x3b, 0x74, 0x68, 0x67, 0x20, 0x34, 0x3b, 0x74, 0x68, 0x67, 0x20, 0x35, 0x3b, 0x74, 0x68, 0x67,
-0x20, 0x36, 0x3b, 0x74, 0x68, 0x67, 0x20, 0x37, 0x3b, 0x74, 0x68, 0x67, 0x20, 0x38, 0x3b, 0x74, 0x68, 0x67, 0x20, 0x39,
-0x3b, 0x74, 0x68, 0x67, 0x20, 0x31, 0x30, 0x3b, 0x74, 0x68, 0x67, 0x20, 0x31, 0x31, 0x3b, 0x74, 0x68, 0x67, 0x20, 0x31,
-0x32, 0x3b, 0x74, 0x68, 0xe1, 0x6e, 0x67, 0x20, 0x31, 0x3b, 0x74, 0x68, 0xe1, 0x6e, 0x67, 0x20, 0x32, 0x3b, 0x74, 0x68,
-0xe1, 0x6e, 0x67, 0x20, 0x33, 0x3b, 0x74, 0x68, 0xe1, 0x6e, 0x67, 0x20, 0x34, 0x3b, 0x74, 0x68, 0xe1, 0x6e, 0x67, 0x20,
-0x35, 0x3b, 0x74, 0x68, 0xe1, 0x6e, 0x67, 0x20, 0x36, 0x3b, 0x74, 0x68, 0xe1, 0x6e, 0x67, 0x20, 0x37, 0x3b, 0x74, 0x68,
-0xe1, 0x6e, 0x67, 0x20, 0x38, 0x3b, 0x74, 0x68, 0xe1, 0x6e, 0x67, 0x20, 0x39, 0x3b, 0x74, 0x68, 0xe1, 0x6e, 0x67, 0x20,
-0x31, 0x30, 0x3b, 0x74, 0x68, 0xe1, 0x6e, 0x67, 0x20, 0x31, 0x31, 0x3b, 0x74, 0x68, 0xe1, 0x6e, 0x67, 0x20, 0x31, 0x32,
-0x3b, 0x79, 0x61, 0x6e, 0x3b, 0x66, 0x65, 0x62, 0x3b, 0x6d, 0xe4, 0x7a, 0x3b, 0x70, 0x72, 0x6c, 0x3b, 0x6d, 0x61, 0x79,
-0x3b, 0x79, 0x75, 0x6e, 0x3b, 0x79, 0x75, 0x6c, 0x3b, 0x67, 0x73, 0x74, 0x3b, 0x73, 0x65, 0x74, 0x3b, 0x74, 0x6f, 0x62,
-0x3b, 0x6e, 0x6f, 0x76, 0x3b, 0x64, 0x65, 0x6b, 0x3b, 0x79, 0x61, 0x6e, 0x75, 0x6c, 0x3b, 0x66, 0x65, 0x62, 0x75, 0x6c,
-0x3b, 0x6d, 0xe4, 0x7a, 0x75, 0x6c, 0x3b, 0x70, 0x72, 0x69, 0x6c, 0x75, 0x6c, 0x3b, 0x6d, 0x61, 0x79, 0x75, 0x6c, 0x3b,
-0x79, 0x75, 0x6e, 0x75, 0x6c, 0x3b, 0x79, 0x75, 0x6c, 0x75, 0x6c, 0x3b, 0x67, 0x75, 0x73, 0x74, 0x75, 0x6c, 0x3b, 0x73,
-0x65, 0x74, 0x75, 0x6c, 0x3b, 0x74, 0x6f, 0x62, 0x75, 0x6c, 0x3b, 0x6e, 0x6f, 0x76, 0x75, 0x6c, 0x3b, 0x64, 0x65, 0x6b,
-0x75, 0x6c, 0x3b, 0x59, 0x3b, 0x46, 0x3b, 0x4d, 0x3b, 0x50, 0x3b, 0x4d, 0x3b, 0x59, 0x3b, 0x59, 0x3b, 0x47, 0x3b, 0x53,
-0x3b, 0x54, 0x3b, 0x4e, 0x3b, 0x44, 0x3b, 0x79, 0x61, 0x6e, 0x3b, 0x66, 0x65, 0x62, 0x3b, 0x6d, 0xe4, 0x7a, 0x3b, 0x70,
-0x72, 0x6c, 0x3b, 0x6d, 0x61, 0x79, 0x3b, 0x79, 0x75, 0x6e, 0x3b, 0x79, 0x75, 0x6c, 0x3b, 0x67, 0x73, 0x74, 0x3b, 0x73,
-0x65, 0x74, 0x3b, 0x74, 0x6f, 0x6e, 0x3b, 0x6e, 0x6f, 0x76, 0x3b, 0x64, 0x65, 0x6b, 0x3b, 0x49, 0x6f, 0x6e, 0x3b, 0x43,
-0x68, 0x77, 0x3b, 0x4d, 0x61, 0x77, 0x3b, 0x45, 0x62, 0x72, 0x3b, 0x4d, 0x61, 0x69, 0x3b, 0x4d, 0x65, 0x68, 0x3b, 0x47,
-0x6f, 0x72, 0x3b, 0x41, 0x77, 0x73, 0x74, 0x3b, 0x4d, 0x65, 0x64, 0x69, 0x3b, 0x48, 0x79, 0x64, 0x3b, 0x54, 0x61, 0x63,
-0x68, 0x3b, 0x52, 0x68, 0x61, 0x67, 0x3b, 0x49, 0x6f, 0x6e, 0x61, 0x77, 0x72, 0x3b, 0x43, 0x68, 0x77, 0x65, 0x66, 0x72,
-0x6f, 0x72, 0x3b, 0x4d, 0x61, 0x77, 0x72, 0x74, 0x68, 0x3b, 0x45, 0x62, 0x72, 0x69, 0x6c, 0x6c, 0x3b, 0x4d, 0x61, 0x69,
-0x3b, 0x4d, 0x65, 0x68, 0x65, 0x66, 0x69, 0x6e, 0x3b, 0x47, 0x6f, 0x72, 0x66, 0x66, 0x65, 0x6e, 0x6e, 0x61, 0x66, 0x3b,
-0x41, 0x77, 0x73, 0x74, 0x3b, 0x4d, 0x65, 0x64, 0x69, 0x3b, 0x48, 0x79, 0x64, 0x72, 0x65, 0x66, 0x3b, 0x54, 0x61, 0x63,
-0x68, 0x77, 0x65, 0x64, 0x64, 0x3b, 0x52, 0x68, 0x61, 0x67, 0x66, 0x79, 0x72, 0x3b, 0x49, 0x3b, 0x43, 0x68, 0x3b, 0x4d,
-0x3b, 0x45, 0x3b, 0x4d, 0x3b, 0x4d, 0x3b, 0x47, 0x3b, 0x41, 0x3b, 0x4d, 0x3b, 0x48, 0x3b, 0x54, 0x3b, 0x52, 0x68, 0x3b,
-0x49, 0x6f, 0x6e, 0x3b, 0x43, 0x68, 0x77, 0x65, 0x66, 0x3b, 0x4d, 0x61, 0x77, 0x3b, 0x45, 0x62, 0x72, 0x3b, 0x4d, 0x61,
-0x69, 0x3b, 0x4d, 0x65, 0x68, 0x3b, 0x47, 0x6f, 0x72, 0x66, 0x66, 0x3b, 0x41, 0x77, 0x73, 0x74, 0x3b, 0x4d, 0x65, 0x64,
-0x69, 0x3b, 0x48, 0x79, 0x64, 0x3b, 0x54, 0x61, 0x63, 0x68, 0x3b, 0x52, 0x68, 0x61, 0x67, 0x3b, 0x53, 0x61, 0x6d, 0x3b,
-0x46, 0x65, 0x77, 0x3b, 0x4d, 0x61, 0x72, 0x3b, 0x41, 0x77, 0x72, 0x3b, 0x4d, 0x65, 0x65, 0x3b, 0x53, 0x75, 0x77, 0x3b,
-0x53, 0x75, 0x6c, 0x3b, 0x55, 0x74, 0x3b, 0x53, 0xe0, 0x74, 0x3b, 0x4f, 0x6b, 0x74, 0x3b, 0x4e, 0x6f, 0x77, 0x3b, 0x44,
-0x65, 0x73, 0x3b, 0x53, 0x61, 0x6d, 0x77, 0x69, 0x79, 0x65, 0x65, 0x3b, 0x46, 0x65, 0x77, 0x72, 0x69, 0x79, 0x65, 0x65,
-0x3b, 0x4d, 0x61, 0x72, 0x73, 0x3b, 0x41, 0x77, 0x72, 0x69, 0x6c, 0x3b, 0x4d, 0x65, 0x65, 0x3b, 0x53, 0x75, 0x77, 0x65,
-0x3b, 0x53, 0x75, 0x6c, 0x65, 0x74, 0x3b, 0x55, 0x74, 0x3b, 0x53, 0xe0, 0x74, 0x74, 0x75, 0x6d, 0x62, 0x61, 0x72, 0x3b,
-0x4f, 0x6b, 0x74, 0x6f, 0x6f, 0x62, 0x61, 0x72, 0x3b, 0x4e, 0x6f, 0x77, 0xe0, 0x6d, 0x62, 0x61, 0x72, 0x3b, 0x44, 0x65,
-0x73, 0xe0, 0x6d, 0x62, 0x61, 0x72, 0x3b, 0x4a, 0x61, 0x6e, 0x3b, 0x46, 0x65, 0x62, 0x3b, 0x4d, 0x61, 0x74, 0x3b, 0x45,
-0x70, 0x72, 0x3b, 0x4d, 0x65, 0x79, 0x3b, 0x4a, 0x75, 0x6e, 0x3b, 0x4a, 0x75, 0x6c, 0x3b, 0x41, 0x67, 0x61, 0x3b, 0x53,
-0x65, 0x70, 0x3b, 0x4f, 0x6b, 0x74, 0x3b, 0x4e, 0x6f, 0x76, 0x3b, 0x44, 0x69, 0x73, 0x3b, 0x4a, 0x61, 0x6e, 0x79, 0x75,
-0x77, 0x61, 0x72, 0x69, 0x3b, 0x46, 0x65, 0x62, 0x72, 0x75, 0x77, 0x61, 0x72, 0x69, 0x3b, 0x4d, 0x61, 0x74, 0x73, 0x68,
-0x69, 0x3b, 0x45, 0x70, 0x72, 0x65, 0x6c, 0x69, 0x3b, 0x4d, 0x65, 0x79, 0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x69, 0x3b, 0x4a,
-0x75, 0x6c, 0x61, 0x79, 0x69, 0x3b, 0x41, 0x67, 0x61, 0x73, 0x74, 0x69, 0x3b, 0x53, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62,
-0x61, 0x3b, 0x4f, 0x6b, 0x74, 0x68, 0x6f, 0x62, 0x61, 0x3b, 0x4e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x44, 0x69,
-0x73, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x5d9, 0x5d0, 0x5b7, 0x5e0, 0x3b, 0x5e4, 0x5bf, 0x5e2, 0x5d1, 0x3b, 0x5de, 0x5e2, 0x5e8, 0x5e5,
-0x3b, 0x5d0, 0x5b7, 0x5e4, 0x5bc, 0x5e8, 0x3b, 0x5de, 0x5d9, 0x5d9, 0x3b, 0x5d9, 0x5d5, 0x5e0, 0x5d9, 0x3b, 0x5d9, 0x5d5, 0x5dc, 0x5d9,
-0x3b, 0x5d0, 0x5d5, 0x5d9, 0x5d2, 0x3b, 0x5e1, 0x5e2, 0x5e4, 0x5bc, 0x3b, 0x5d0, 0x5e7, 0x5d8, 0x3b, 0x5e0, 0x5d0, 0x5d5, 0x5d5, 0x3b,
-0x5d3, 0x5e2, 0x5e6, 0x3b, 0x5d9, 0x5d0, 0x5b7, 0x5e0, 0x5d5, 0x5d0, 0x5b7, 0x5e8, 0x3b, 0x5e4, 0x5bf, 0x5e2, 0x5d1, 0x5e8, 0x5d5, 0x5d0,
-0x5b7, 0x5e8, 0x3b, 0x5de, 0x5e2, 0x5e8, 0x5e5, 0x3b, 0x5d0, 0x5b7, 0x5e4, 0x5bc, 0x5e8, 0x5d9, 0x5dc, 0x3b, 0x5de, 0x5d9, 0x5d9, 0x3b,
-0x5d9, 0x5d5, 0x5e0, 0x5d9, 0x3b, 0x5d9, 0x5d5, 0x5dc, 0x5d9, 0x3b, 0x5d0, 0x5d5, 0x5d9, 0x5d2, 0x5d5, 0x5e1, 0x5d8, 0x3b, 0x5e1, 0x5e2,
-0x5e4, 0x5bc, 0x5d8, 0x5e2, 0x5de, 0x5d1, 0x5e2, 0x5e8, 0x3b, 0x5d0, 0x5e7, 0x5d8, 0x5d0, 0x5d1, 0x5e2, 0x5e8, 0x3b, 0x5e0, 0x5d0, 0x5d5,
-0x5d5, 0x5e2, 0x5de, 0x5d1, 0x5e2, 0x5e8, 0x3b, 0x5d3, 0x5e2, 0x5e6, 0x5e2, 0x5de, 0x5d1, 0x5e2, 0x5e8, 0x3b, 0x1e62, 0x1eb9, 0x301, 0x3b,
-0xc8, 0x72, 0x3b, 0x1eb8, 0x72, 0x3b, 0xcc, 0x67, 0x3b, 0x1eb8, 0x300, 0x62, 0x3b, 0xd2, 0x6b, 0x3b, 0x41, 0x67, 0x3b, 0xd2,
-0x67, 0x3b, 0x4f, 0x77, 0x3b, 0x1ecc, 0x300, 0x77, 0x3b, 0x42, 0xe9, 0x3b, 0x1ecc, 0x300, 0x70, 0x3b, 0x1e62, 0x1eb9, 0x301, 0x72,
-0x1eb9, 0x301, 0x3b, 0xc8, 0x72, 0xe8, 0x6c, 0xe8, 0x3b, 0x1eb8, 0x72, 0x1eb9, 0x300, 0x6e, 0xe0, 0x3b, 0xcc, 0x67, 0x62, 0xe9,
-0x3b, 0x1eb8, 0x300, 0x62, 0x69, 0x62, 0x69, 0x3b, 0xd2, 0x6b, 0xfa, 0x64, 0x75, 0x3b, 0x41, 0x67, 0x1eb9, 0x6d, 0x1ecd, 0x3b,
-0xd2, 0x67, 0xfa, 0x6e, 0x3b, 0x4f, 0x77, 0x65, 0x77, 0x65, 0x3b, 0x1ecc, 0x300, 0x77, 0xe0, 0x72, 0xe0, 0x3b, 0x42, 0xe9,
-0x6c, 0xfa, 0x3b, 0x1ecc, 0x300, 0x70, 0x1eb9, 0x300, 0x3b, 0x53, 0x3b, 0xc8, 0x3b, 0x1eb8, 0x3b, 0xcc, 0x3b, 0x1eb8, 0x300, 0x3b,
-0xd2, 0x3b, 0x41, 0x3b, 0xd2, 0x3b, 0x4f, 0x3b, 0x1ecc, 0x300, 0x3b, 0x42, 0x3b, 0x1ecc, 0x300, 0x3b, 0x1e62, 0x1eb9, 0x301, 0x72,
+0x6b, 0x74, 0x3b, 0x4e, 0x6f, 0xfd, 0x3b, 0x44, 0x65, 0x6b, 0xfd, 0x61, 0x6e, 0x3b, 0x66, 0x65, 0x77, 0x3b, 0x6d, 0x61,
+0x72, 0x74, 0x3b, 0x61, 0x70, 0x72, 0x3b, 0x6d, 0x61, 0xfd, 0x3b, 0x69, 0xfd, 0x75, 0x6e, 0x3b, 0x69, 0xfd, 0x75, 0x6c,
+0x3b, 0x61, 0x77, 0x67, 0x3b, 0x73, 0x65, 0x6e, 0x3b, 0x6f, 0x6b, 0x74, 0x3b, 0x6e, 0x6f, 0xfd, 0x3b, 0x64, 0x65, 0x6b,
+0xdd, 0x3b, 0x46, 0x3b, 0x4d, 0x3b, 0x41, 0x3b, 0x4d, 0x3b, 0x49, 0x3b, 0x49, 0x3b, 0x41, 0x3b, 0x53, 0x3b, 0x4f, 0x3b,
+0x4e, 0x3b, 0x44, 0x64a, 0x627, 0x646, 0x6cb, 0x627, 0x631, 0x3b, 0x641, 0x6d0, 0x6cb, 0x631, 0x627, 0x644, 0x3b, 0x645, 0x627, 0x631,
+0x62a, 0x3b, 0x626, 0x627, 0x67e, 0x631, 0x6d0, 0x644, 0x3b, 0x645, 0x627, 0x64a, 0x3b, 0x626, 0x649, 0x64a, 0x6c7, 0x646, 0x3b, 0x626,
+0x649, 0x64a, 0x6c7, 0x644, 0x3b, 0x626, 0x627, 0x6cb, 0x63a, 0x6c7, 0x633, 0x62a, 0x3b, 0x633, 0x6d0, 0x646, 0x62a, 0x6d5, 0x628, 0x649,
+0x631, 0x3b, 0x626, 0x6c6, 0x643, 0x62a, 0x6d5, 0x628, 0x649, 0x631, 0x3b, 0x646, 0x648, 0x64a, 0x627, 0x628, 0x649, 0x631, 0x3b, 0x62f,
+0x6d0, 0x643, 0x627, 0x628, 0x649, 0x631, 0x441, 0x456, 0x447, 0x435, 0x43d, 0x44c, 0x3b, 0x43b, 0x44e, 0x442, 0x438, 0x439, 0x3b, 0x431,
+0x435, 0x440, 0x435, 0x437, 0x435, 0x43d, 0x44c, 0x3b, 0x43a, 0x432, 0x456, 0x442, 0x435, 0x43d, 0x44c, 0x3b, 0x442, 0x440, 0x430, 0x432,
+0x435, 0x43d, 0x44c, 0x3b, 0x447, 0x435, 0x440, 0x432, 0x435, 0x43d, 0x44c, 0x3b, 0x43b, 0x438, 0x43f, 0x435, 0x43d, 0x44c, 0x3b, 0x441,
+0x435, 0x440, 0x43f, 0x435, 0x43d, 0x44c, 0x3b, 0x432, 0x435, 0x440, 0x435, 0x441, 0x435, 0x43d, 0x44c, 0x3b, 0x436, 0x43e, 0x432, 0x442,
+0x435, 0x43d, 0x44c, 0x3b, 0x43b, 0x438, 0x441, 0x442, 0x43e, 0x43f, 0x430, 0x434, 0x3b, 0x433, 0x440, 0x443, 0x434, 0x435, 0x43d, 0x44c,
+0x441, 0x456, 0x447, 0x43d, 0x44f, 0x3b, 0x43b, 0x44e, 0x442, 0x43e, 0x433, 0x43e, 0x3b, 0x431, 0x435, 0x440, 0x435, 0x437, 0x43d, 0x44f,
+0x3b, 0x43a, 0x432, 0x456, 0x442, 0x43d, 0x44f, 0x3b, 0x442, 0x440, 0x430, 0x432, 0x43d, 0x44f, 0x3b, 0x447, 0x435, 0x440, 0x432, 0x43d,
+0x44f, 0x3b, 0x43b, 0x438, 0x43f, 0x43d, 0x44f, 0x3b, 0x441, 0x435, 0x440, 0x43f, 0x43d, 0x44f, 0x3b, 0x432, 0x435, 0x440, 0x435, 0x441,
+0x43d, 0x44f, 0x3b, 0x436, 0x43e, 0x432, 0x442, 0x43d, 0x44f, 0x3b, 0x43b, 0x438, 0x441, 0x442, 0x43e, 0x43f, 0x430, 0x434, 0x430, 0x3b,
+0x433, 0x440, 0x443, 0x434, 0x43d, 0x44f, 0x441, 0x456, 0x447, 0x3b, 0x43b, 0x44e, 0x442, 0x3b, 0x431, 0x435, 0x440, 0x3b, 0x43a, 0x432,
+0x456, 0x3b, 0x442, 0x440, 0x430, 0x3b, 0x447, 0x435, 0x440, 0x3b, 0x43b, 0x438, 0x43f, 0x3b, 0x441, 0x435, 0x440, 0x3b, 0x432, 0x435,
+0x440, 0x3b, 0x436, 0x43e, 0x432, 0x3b, 0x43b, 0x438, 0x441, 0x3b, 0x433, 0x440, 0x443, 0x441, 0x456, 0x447, 0x2e, 0x3b, 0x43b, 0x44e,
+0x442, 0x2e, 0x3b, 0x431, 0x435, 0x440, 0x2e, 0x3b, 0x43a, 0x432, 0x456, 0x442, 0x2e, 0x3b, 0x442, 0x440, 0x430, 0x432, 0x2e, 0x3b,
+0x447, 0x435, 0x440, 0x432, 0x2e, 0x3b, 0x43b, 0x438, 0x43f, 0x2e, 0x3b, 0x441, 0x435, 0x440, 0x43f, 0x2e, 0x3b, 0x432, 0x435, 0x440,
+0x2e, 0x3b, 0x436, 0x43e, 0x432, 0x442, 0x2e, 0x3b, 0x43b, 0x438, 0x441, 0x442, 0x2e, 0x3b, 0x433, 0x440, 0x443, 0x434, 0x2e, 0x421,
+0x3b, 0x41b, 0x3b, 0x411, 0x3b, 0x41a, 0x3b, 0x422, 0x3b, 0x427, 0x3b, 0x41b, 0x3b, 0x421, 0x3b, 0x412, 0x3b, 0x416, 0x3b, 0x41b,
+0x3b, 0x413, 0x441, 0x3b, 0x43b, 0x3b, 0x431, 0x3b, 0x43a, 0x3b, 0x442, 0x3b, 0x447, 0x3b, 0x43b, 0x3b, 0x441, 0x3b, 0x432, 0x3b,
+0x436, 0x3b, 0x43b, 0x3b, 0x433, 0x62c, 0x646, 0x648, 0x631, 0x6cc, 0x3b, 0x641, 0x631, 0x648, 0x631, 0x6cc, 0x3b, 0x645, 0x627, 0x631,
+0x686, 0x3b, 0x627, 0x67e, 0x631, 0x6cc, 0x644, 0x3b, 0x645, 0x626, 0x6cc, 0x3b, 0x62c, 0x648, 0x646, 0x3b, 0x62c, 0x648, 0x644, 0x627,
+0x626, 0x6cc, 0x3b, 0x627, 0x6af, 0x633, 0x62a, 0x3b, 0x633, 0x62a, 0x645, 0x628, 0x631, 0x3b, 0x627, 0x6a9, 0x62a, 0x648, 0x628, 0x631,
+0x3b, 0x646, 0x648, 0x645, 0x628, 0x631, 0x3b, 0x62f, 0x633, 0x645, 0x628, 0x631, 0x59, 0x61, 0x6e, 0x76, 0x61, 0x72, 0x3b, 0x46,
+0x65, 0x76, 0x72, 0x61, 0x6c, 0x3b, 0x4d, 0x61, 0x72, 0x74, 0x3b, 0x41, 0x70, 0x72, 0x65, 0x6c, 0x3b, 0x4d, 0x61, 0x79,
+0x3b, 0x49, 0x79, 0x75, 0x6e, 0x3b, 0x49, 0x79, 0x75, 0x6c, 0x3b, 0x41, 0x76, 0x67, 0x75, 0x73, 0x74, 0x3b, 0x53, 0x65,
+0x6e, 0x74, 0x61, 0x62, 0x72, 0x3b, 0x4f, 0x6b, 0x74, 0x61, 0x62, 0x72, 0x3b, 0x4e, 0x6f, 0x79, 0x61, 0x62, 0x72, 0x3b,
+0x44, 0x65, 0x6b, 0x61, 0x62, 0x72, 0x79, 0x61, 0x6e, 0x76, 0x61, 0x72, 0x3b, 0x66, 0x65, 0x76, 0x72, 0x61, 0x6c, 0x3b,
+0x6d, 0x61, 0x72, 0x74, 0x3b, 0x61, 0x70, 0x72, 0x65, 0x6c, 0x3b, 0x6d, 0x61, 0x79, 0x3b, 0x69, 0x79, 0x75, 0x6e, 0x3b,
+0x69, 0x79, 0x75, 0x6c, 0x3b, 0x61, 0x76, 0x67, 0x75, 0x73, 0x74, 0x3b, 0x73, 0x65, 0x6e, 0x74, 0x61, 0x62, 0x72, 0x3b,
+0x6f, 0x6b, 0x74, 0x61, 0x62, 0x72, 0x3b, 0x6e, 0x6f, 0x79, 0x61, 0x62, 0x72, 0x3b, 0x64, 0x65, 0x6b, 0x61, 0x62, 0x72,
+0x59, 0x61, 0x6e, 0x3b, 0x46, 0x65, 0x76, 0x3b, 0x4d, 0x61, 0x72, 0x3b, 0x41, 0x70, 0x72, 0x3b, 0x4d, 0x61, 0x79, 0x3b,
+0x49, 0x79, 0x6e, 0x3b, 0x49, 0x79, 0x6c, 0x3b, 0x41, 0x76, 0x67, 0x3b, 0x53, 0x65, 0x6e, 0x3b, 0x4f, 0x6b, 0x74, 0x3b,
+0x4e, 0x6f, 0x79, 0x3b, 0x44, 0x65, 0x6b, 0x79, 0x61, 0x6e, 0x3b, 0x66, 0x65, 0x76, 0x3b, 0x6d, 0x61, 0x72, 0x3b, 0x61,
+0x70, 0x72, 0x3b, 0x6d, 0x61, 0x79, 0x3b, 0x69, 0x79, 0x6e, 0x3b, 0x69, 0x79, 0x6c, 0x3b, 0x61, 0x76, 0x67, 0x3b, 0x73,
+0x65, 0x6e, 0x3b, 0x6f, 0x6b, 0x74, 0x3b, 0x6e, 0x6f, 0x79, 0x3b, 0x64, 0x65, 0x6b, 0x59, 0x3b, 0x46, 0x3b, 0x4d, 0x3b,
+0x41, 0x3b, 0x4d, 0x3b, 0x49, 0x3b, 0x49, 0x3b, 0x41, 0x3b, 0x53, 0x3b, 0x4f, 0x3b, 0x4e, 0x3b, 0x44, 0x62c, 0x646, 0x648,
+0x3b, 0x641, 0x628, 0x631, 0x3b, 0x645, 0x627, 0x631, 0x3b, 0x627, 0x67e, 0x631, 0x3b, 0x645, 0x6cc, 0x3b, 0x62c, 0x648, 0x646, 0x3b,
+0x62c, 0x648, 0x644, 0x3b, 0x627, 0x6af, 0x633, 0x3b, 0x633, 0x67e, 0x62a, 0x3b, 0x627, 0x6a9, 0x62a, 0x3b, 0x646, 0x648, 0x645, 0x3b,
+0x62f, 0x633, 0x645, 0x44f, 0x43d, 0x432, 0x430, 0x440, 0x3b, 0x444, 0x435, 0x432, 0x440, 0x430, 0x43b, 0x3b, 0x43c, 0x430, 0x440, 0x442,
+0x3b, 0x430, 0x43f, 0x440, 0x435, 0x43b, 0x3b, 0x43c, 0x430, 0x439, 0x3b, 0x438, 0x44e, 0x43d, 0x3b, 0x438, 0x44e, 0x43b, 0x3b, 0x430,
+0x432, 0x433, 0x443, 0x441, 0x442, 0x3b, 0x441, 0x435, 0x43d, 0x442, 0x44f, 0x431, 0x440, 0x3b, 0x43e, 0x43a, 0x442, 0x44f, 0x431, 0x440,
+0x3b, 0x43d, 0x43e, 0x44f, 0x431, 0x440, 0x3b, 0x434, 0x435, 0x43a, 0x430, 0x431, 0x440, 0x44f, 0x43d, 0x432, 0x3b, 0x444, 0x435, 0x432,
+0x3b, 0x43c, 0x430, 0x440, 0x3b, 0x430, 0x43f, 0x440, 0x3b, 0x43c, 0x430, 0x439, 0x3b, 0x438, 0x44e, 0x43d, 0x3b, 0x438, 0x44e, 0x43b,
+0x3b, 0x430, 0x432, 0x433, 0x3b, 0x441, 0x435, 0x43d, 0x3b, 0x43e, 0x43a, 0x442, 0x3b, 0x43d, 0x43e, 0x44f, 0x3b, 0x434, 0x435, 0x43a,
+0x54, 0x68, 0xe1, 0x6e, 0x67, 0x20, 0x31, 0x3b, 0x54, 0x68, 0xe1, 0x6e, 0x67, 0x20, 0x32, 0x3b, 0x54, 0x68, 0xe1, 0x6e,
+0x67, 0x20, 0x33, 0x3b, 0x54, 0x68, 0xe1, 0x6e, 0x67, 0x20, 0x34, 0x3b, 0x54, 0x68, 0xe1, 0x6e, 0x67, 0x20, 0x35, 0x3b,
+0x54, 0x68, 0xe1, 0x6e, 0x67, 0x20, 0x36, 0x3b, 0x54, 0x68, 0xe1, 0x6e, 0x67, 0x20, 0x37, 0x3b, 0x54, 0x68, 0xe1, 0x6e,
+0x67, 0x20, 0x38, 0x3b, 0x54, 0x68, 0xe1, 0x6e, 0x67, 0x20, 0x39, 0x3b, 0x54, 0x68, 0xe1, 0x6e, 0x67, 0x20, 0x31, 0x30,
+0x3b, 0x54, 0x68, 0xe1, 0x6e, 0x67, 0x20, 0x31, 0x31, 0x3b, 0x54, 0x68, 0xe1, 0x6e, 0x67, 0x20, 0x31, 0x32, 0x74, 0x68,
+0xe1, 0x6e, 0x67, 0x20, 0x31, 0x3b, 0x74, 0x68, 0xe1, 0x6e, 0x67, 0x20, 0x32, 0x3b, 0x74, 0x68, 0xe1, 0x6e, 0x67, 0x20,
+0x33, 0x3b, 0x74, 0x68, 0xe1, 0x6e, 0x67, 0x20, 0x34, 0x3b, 0x74, 0x68, 0xe1, 0x6e, 0x67, 0x20, 0x35, 0x3b, 0x74, 0x68,
+0xe1, 0x6e, 0x67, 0x20, 0x36, 0x3b, 0x74, 0x68, 0xe1, 0x6e, 0x67, 0x20, 0x37, 0x3b, 0x74, 0x68, 0xe1, 0x6e, 0x67, 0x20,
+0x38, 0x3b, 0x74, 0x68, 0xe1, 0x6e, 0x67, 0x20, 0x39, 0x3b, 0x74, 0x68, 0xe1, 0x6e, 0x67, 0x20, 0x31, 0x30, 0x3b, 0x74,
+0x68, 0xe1, 0x6e, 0x67, 0x20, 0x31, 0x31, 0x3b, 0x74, 0x68, 0xe1, 0x6e, 0x67, 0x20, 0x31, 0x32, 0x54, 0x68, 0x67, 0x20,
+0x31, 0x3b, 0x54, 0x68, 0x67, 0x20, 0x32, 0x3b, 0x54, 0x68, 0x67, 0x20, 0x33, 0x3b, 0x54, 0x68, 0x67, 0x20, 0x34, 0x3b,
+0x54, 0x68, 0x67, 0x20, 0x35, 0x3b, 0x54, 0x68, 0x67, 0x20, 0x36, 0x3b, 0x54, 0x68, 0x67, 0x20, 0x37, 0x3b, 0x54, 0x68,
+0x67, 0x20, 0x38, 0x3b, 0x54, 0x68, 0x67, 0x20, 0x39, 0x3b, 0x54, 0x68, 0x67, 0x20, 0x31, 0x30, 0x3b, 0x54, 0x68, 0x67,
+0x20, 0x31, 0x31, 0x3b, 0x54, 0x68, 0x67, 0x20, 0x31, 0x32, 0x74, 0x68, 0x67, 0x20, 0x31, 0x3b, 0x74, 0x68, 0x67, 0x20,
+0x32, 0x3b, 0x74, 0x68, 0x67, 0x20, 0x33, 0x3b, 0x74, 0x68, 0x67, 0x20, 0x34, 0x3b, 0x74, 0x68, 0x67, 0x20, 0x35, 0x3b,
+0x74, 0x68, 0x67, 0x20, 0x36, 0x3b, 0x74, 0x68, 0x67, 0x20, 0x37, 0x3b, 0x74, 0x68, 0x67, 0x20, 0x38, 0x3b, 0x74, 0x68,
+0x67, 0x20, 0x39, 0x3b, 0x74, 0x68, 0x67, 0x20, 0x31, 0x30, 0x3b, 0x74, 0x68, 0x67, 0x20, 0x31, 0x31, 0x3b, 0x74, 0x68,
+0x67, 0x20, 0x31, 0x32, 0x79, 0x61, 0x6e, 0x75, 0x6c, 0x3b, 0x66, 0x65, 0x62, 0x75, 0x6c, 0x3b, 0x6d, 0xe4, 0x7a, 0x75,
+0x6c, 0x3b, 0x70, 0x72, 0x69, 0x6c, 0x75, 0x6c, 0x3b, 0x6d, 0x61, 0x79, 0x75, 0x6c, 0x3b, 0x79, 0x75, 0x6e, 0x75, 0x6c,
+0x3b, 0x79, 0x75, 0x6c, 0x75, 0x6c, 0x3b, 0x67, 0x75, 0x73, 0x74, 0x75, 0x6c, 0x3b, 0x73, 0x65, 0x74, 0x75, 0x6c, 0x3b,
+0x74, 0x6f, 0x62, 0x75, 0x6c, 0x3b, 0x6e, 0x6f, 0x76, 0x75, 0x6c, 0x3b, 0x64, 0x65, 0x6b, 0x75, 0x6c, 0x79, 0x61, 0x6e,
+0x3b, 0x66, 0x65, 0x62, 0x3b, 0x6d, 0xe4, 0x7a, 0x3b, 0x70, 0x72, 0x6c, 0x3b, 0x6d, 0x61, 0x79, 0x3b, 0x79, 0x75, 0x6e,
+0x3b, 0x79, 0x75, 0x6c, 0x3b, 0x67, 0x73, 0x74, 0x3b, 0x73, 0x65, 0x74, 0x3b, 0x74, 0x6f, 0x62, 0x3b, 0x6e, 0x6f, 0x76,
+0x3b, 0x64, 0x65, 0x6b, 0x79, 0x61, 0x6e, 0x3b, 0x66, 0x65, 0x62, 0x3b, 0x6d, 0xe4, 0x7a, 0x3b, 0x70, 0x72, 0x6c, 0x3b,
+0x6d, 0x61, 0x79, 0x3b, 0x79, 0x75, 0x6e, 0x3b, 0x79, 0x75, 0x6c, 0x3b, 0x67, 0x73, 0x74, 0x3b, 0x73, 0x65, 0x74, 0x3b,
+0x74, 0x6f, 0x6e, 0x3b, 0x6e, 0x6f, 0x76, 0x3b, 0x64, 0x65, 0x6b, 0x59, 0x3b, 0x46, 0x3b, 0x4d, 0x3b, 0x50, 0x3b, 0x4d,
+0x3b, 0x59, 0x3b, 0x59, 0x3b, 0x47, 0x3b, 0x53, 0x3b, 0x54, 0x3b, 0x4e, 0x3b, 0x44, 0x49, 0x6f, 0x6e, 0x61, 0x77, 0x72,
+0x3b, 0x43, 0x68, 0x77, 0x65, 0x66, 0x72, 0x6f, 0x72, 0x3b, 0x4d, 0x61, 0x77, 0x72, 0x74, 0x68, 0x3b, 0x45, 0x62, 0x72,
+0x69, 0x6c, 0x6c, 0x3b, 0x4d, 0x61, 0x69, 0x3b, 0x4d, 0x65, 0x68, 0x65, 0x66, 0x69, 0x6e, 0x3b, 0x47, 0x6f, 0x72, 0x66,
+0x66, 0x65, 0x6e, 0x6e, 0x61, 0x66, 0x3b, 0x41, 0x77, 0x73, 0x74, 0x3b, 0x4d, 0x65, 0x64, 0x69, 0x3b, 0x48, 0x79, 0x64,
+0x72, 0x65, 0x66, 0x3b, 0x54, 0x61, 0x63, 0x68, 0x77, 0x65, 0x64, 0x64, 0x3b, 0x52, 0x68, 0x61, 0x67, 0x66, 0x79, 0x72,
+0x49, 0x6f, 0x6e, 0x3b, 0x43, 0x68, 0x77, 0x3b, 0x4d, 0x61, 0x77, 0x3b, 0x45, 0x62, 0x72, 0x3b, 0x4d, 0x61, 0x69, 0x3b,
+0x4d, 0x65, 0x68, 0x3b, 0x47, 0x6f, 0x72, 0x3b, 0x41, 0x77, 0x73, 0x74, 0x3b, 0x4d, 0x65, 0x64, 0x69, 0x3b, 0x48, 0x79,
+0x64, 0x3b, 0x54, 0x61, 0x63, 0x68, 0x3b, 0x52, 0x68, 0x61, 0x67, 0x49, 0x6f, 0x6e, 0x3b, 0x43, 0x68, 0x77, 0x65, 0x66,
+0x3b, 0x4d, 0x61, 0x77, 0x3b, 0x45, 0x62, 0x72, 0x3b, 0x4d, 0x61, 0x69, 0x3b, 0x4d, 0x65, 0x68, 0x3b, 0x47, 0x6f, 0x72,
+0x66, 0x66, 0x3b, 0x41, 0x77, 0x73, 0x74, 0x3b, 0x4d, 0x65, 0x64, 0x69, 0x3b, 0x48, 0x79, 0x64, 0x3b, 0x54, 0x61, 0x63,
+0x68, 0x3b, 0x52, 0x68, 0x61, 0x67, 0x49, 0x3b, 0x43, 0x68, 0x3b, 0x4d, 0x3b, 0x45, 0x3b, 0x4d, 0x3b, 0x4d, 0x3b, 0x47,
+0x3b, 0x41, 0x3b, 0x4d, 0x3b, 0x48, 0x3b, 0x54, 0x3b, 0x52, 0x68, 0x53, 0x61, 0x6d, 0x77, 0x69, 0x79, 0x65, 0x65, 0x3b,
+0x46, 0x65, 0x77, 0x72, 0x69, 0x79, 0x65, 0x65, 0x3b, 0x4d, 0x61, 0x72, 0x73, 0x3b, 0x41, 0x77, 0x72, 0x69, 0x6c, 0x3b,
+0x4d, 0x65, 0x65, 0x3b, 0x53, 0x75, 0x77, 0x65, 0x3b, 0x53, 0x75, 0x6c, 0x65, 0x74, 0x3b, 0x55, 0x74, 0x3b, 0x53, 0xe0,
+0x74, 0x74, 0x75, 0x6d, 0x62, 0x61, 0x72, 0x3b, 0x4f, 0x6b, 0x74, 0x6f, 0x6f, 0x62, 0x61, 0x72, 0x3b, 0x4e, 0x6f, 0x77,
+0xe0, 0x6d, 0x62, 0x61, 0x72, 0x3b, 0x44, 0x65, 0x73, 0xe0, 0x6d, 0x62, 0x61, 0x72, 0x53, 0x61, 0x6d, 0x3b, 0x46, 0x65,
+0x77, 0x3b, 0x4d, 0x61, 0x72, 0x3b, 0x41, 0x77, 0x72, 0x3b, 0x4d, 0x65, 0x65, 0x3b, 0x53, 0x75, 0x77, 0x3b, 0x53, 0x75,
+0x6c, 0x3b, 0x55, 0x74, 0x3b, 0x53, 0xe0, 0x74, 0x3b, 0x4f, 0x6b, 0x74, 0x3b, 0x4e, 0x6f, 0x77, 0x3b, 0x44, 0x65, 0x73,
+0x4a, 0x61, 0x6e, 0x79, 0x75, 0x77, 0x61, 0x72, 0x69, 0x3b, 0x46, 0x65, 0x62, 0x72, 0x75, 0x77, 0x61, 0x72, 0x69, 0x3b,
+0x4d, 0x61, 0x74, 0x73, 0x68, 0x69, 0x3b, 0x45, 0x70, 0x72, 0x65, 0x6c, 0x69, 0x3b, 0x4d, 0x65, 0x79, 0x69, 0x3b, 0x4a,
+0x75, 0x6e, 0x69, 0x3b, 0x4a, 0x75, 0x6c, 0x61, 0x79, 0x69, 0x3b, 0x41, 0x67, 0x61, 0x73, 0x74, 0x69, 0x3b, 0x53, 0x65,
+0x70, 0x74, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x4f, 0x6b, 0x74, 0x68, 0x6f, 0x62, 0x61, 0x3b, 0x4e, 0x6f, 0x76, 0x65, 0x6d,
+0x62, 0x61, 0x3b, 0x44, 0x69, 0x73, 0x65, 0x6d, 0x62, 0x61, 0x4a, 0x61, 0x6e, 0x3b, 0x46, 0x65, 0x62, 0x3b, 0x4d, 0x61,
+0x74, 0x3b, 0x45, 0x70, 0x72, 0x3b, 0x4d, 0x65, 0x79, 0x3b, 0x4a, 0x75, 0x6e, 0x3b, 0x4a, 0x75, 0x6c, 0x3b, 0x41, 0x67,
+0x61, 0x3b, 0x53, 0x65, 0x70, 0x3b, 0x4f, 0x6b, 0x74, 0x3b, 0x4e, 0x6f, 0x76, 0x3b, 0x44, 0x69, 0x73, 0x5d9, 0x5d0, 0x5b7,
+0x5e0, 0x5d5, 0x5d0, 0x5b7, 0x5e8, 0x3b, 0x5e4, 0x5bf, 0x5e2, 0x5d1, 0x5e8, 0x5d5, 0x5d0, 0x5b7, 0x5e8, 0x3b, 0x5de, 0x5e2, 0x5e8, 0x5e5,
+0x3b, 0x5d0, 0x5b7, 0x5e4, 0x5bc, 0x5e8, 0x5d9, 0x5dc, 0x3b, 0x5de, 0x5d9, 0x5d9, 0x3b, 0x5d9, 0x5d5, 0x5e0, 0x5d9, 0x3b, 0x5d9, 0x5d5,
+0x5dc, 0x5d9, 0x3b, 0x5d0, 0x5d5, 0x5d9, 0x5d2, 0x5d5, 0x5e1, 0x5d8, 0x3b, 0x5e1, 0x5e2, 0x5e4, 0x5bc, 0x5d8, 0x5e2, 0x5de, 0x5d1, 0x5e2,
+0x5e8, 0x3b, 0x5d0, 0x5e7, 0x5d8, 0x5d0, 0x5d1, 0x5e2, 0x5e8, 0x3b, 0x5e0, 0x5d0, 0x5d5, 0x5d5, 0x5e2, 0x5de, 0x5d1, 0x5e2, 0x5e8, 0x3b,
+0x5d3, 0x5e2, 0x5e6, 0x5e2, 0x5de, 0x5d1, 0x5e2, 0x5e8, 0x5d9, 0x5d0, 0x5b7, 0x5e0, 0x3b, 0x5e4, 0x5bf, 0x5e2, 0x5d1, 0x3b, 0x5de, 0x5e2,
+0x5e8, 0x5e5, 0x3b, 0x5d0, 0x5b7, 0x5e4, 0x5bc, 0x5e8, 0x3b, 0x5de, 0x5d9, 0x5d9, 0x3b, 0x5d9, 0x5d5, 0x5e0, 0x5d9, 0x3b, 0x5d9, 0x5d5,
+0x5dc, 0x5d9, 0x3b, 0x5d0, 0x5d5, 0x5d9, 0x5d2, 0x3b, 0x5e1, 0x5e2, 0x5e4, 0x5bc, 0x3b, 0x5d0, 0x5e7, 0x5d8, 0x3b, 0x5e0, 0x5d0, 0x5d5,
+0x5d5, 0x3b, 0x5d3, 0x5e2, 0x5e6, 0x1e62, 0x1eb9, 0x301, 0x72, 0x1eb9, 0x301, 0x3b, 0xc8, 0x72, 0xe8, 0x6c, 0xe8, 0x3b, 0x1eb8, 0x72,
+0x1eb9, 0x300, 0x6e, 0xe0, 0x3b, 0xcc, 0x67, 0x62, 0xe9, 0x3b, 0x1eb8, 0x300, 0x62, 0x69, 0x62, 0x69, 0x3b, 0xd2, 0x6b, 0xfa,
+0x64, 0x75, 0x3b, 0x41, 0x67, 0x1eb9, 0x6d, 0x1ecd, 0x3b, 0xd2, 0x67, 0xfa, 0x6e, 0x3b, 0x4f, 0x77, 0x65, 0x77, 0x65, 0x3b,
+0x1ecc, 0x300, 0x77, 0xe0, 0x72, 0xe0, 0x3b, 0x42, 0xe9, 0x6c, 0xfa, 0x3b, 0x1ecc, 0x300, 0x70, 0x1eb9, 0x300, 0x4f, 0x1e63, 0xf9,
+0x20, 0x1e62, 0x1eb9, 0x301, 0x72, 0x1eb9, 0x301, 0x3b, 0x4f, 0x1e63, 0xf9, 0x20, 0xc8, 0x72, 0xe8, 0x6c, 0xe8, 0x3b, 0x4f, 0x1e63,
+0xf9, 0x20, 0x1eb8, 0x72, 0x1eb9, 0x300, 0x6e, 0xe0, 0x3b, 0x4f, 0x1e63, 0xf9, 0x20, 0xcc, 0x67, 0x62, 0xe9, 0x3b, 0x4f, 0x1e63,
+0xf9, 0x20, 0x1eb8, 0x300, 0x62, 0x69, 0x62, 0x69, 0x3b, 0x4f, 0x1e63, 0xf9, 0x20, 0xd2, 0x6b, 0xfa, 0x64, 0x75, 0x3b, 0x4f,
+0x1e63, 0xf9, 0x20, 0x41, 0x67, 0x1eb9, 0x6d, 0x1ecd, 0x3b, 0x4f, 0x1e63, 0xf9, 0x20, 0xd2, 0x67, 0xfa, 0x6e, 0x3b, 0x4f, 0x1e63,
+0xf9, 0x20, 0x4f, 0x77, 0x65, 0x77, 0x65, 0x3b, 0x4f, 0x1e63, 0xf9, 0x20, 0x1ecc, 0x300, 0x77, 0xe0, 0x72, 0xe0, 0x3b, 0x4f,
+0x1e63, 0xf9, 0x20, 0x42, 0xe9, 0x6c, 0xfa, 0x3b, 0x4f, 0x1e63, 0xf9, 0x20, 0x1ecc, 0x300, 0x70, 0x1eb9, 0x300, 0x1e62, 0x1eb9, 0x301,
+0x3b, 0xc8, 0x72, 0x3b, 0x1eb8, 0x72, 0x3b, 0xcc, 0x67, 0x3b, 0x1eb8, 0x300, 0x62, 0x3b, 0xd2, 0x6b, 0x3b, 0x41, 0x67, 0x3b,
+0xd2, 0x67, 0x3b, 0x4f, 0x77, 0x3b, 0x1ecc, 0x300, 0x77, 0x3b, 0x42, 0xe9, 0x3b, 0x1ecc, 0x300, 0x70, 0x1e62, 0x1eb9, 0x301, 0x72,
 0x3b, 0xc8, 0x72, 0xe8, 0x6c, 0x3b, 0x1eb8, 0x72, 0x1eb9, 0x300, 0x6e, 0x3b, 0xcc, 0x67, 0x62, 0x3b, 0x1eb8, 0x300, 0x62, 0x69,
 0x3b, 0xd2, 0x6b, 0xfa, 0x3b, 0x41, 0x67, 0x1eb9, 0x3b, 0xd2, 0x67, 0xfa, 0x3b, 0x4f, 0x77, 0x65, 0x3b, 0x1ecc, 0x300, 0x77,
-0xe0, 0x3b, 0x42, 0xe9, 0x6c, 0x3b, 0x1ecc, 0x300, 0x70, 0x1eb9, 0x3b, 0x4f, 0x1e63, 0xf9, 0x20, 0x1e62, 0x1eb9, 0x301, 0x72, 0x1eb9,
-0x301, 0x3b, 0x4f, 0x1e63, 0xf9, 0x20, 0xc8, 0x72, 0xe8, 0x6c, 0xe8, 0x3b, 0x4f, 0x1e63, 0xf9, 0x20, 0x1eb8, 0x72, 0x1eb9, 0x300,
-0x6e, 0xe0, 0x3b, 0x4f, 0x1e63, 0xf9, 0x20, 0xcc, 0x67, 0x62, 0xe9, 0x3b, 0x4f, 0x1e63, 0xf9, 0x20, 0x1eb8, 0x300, 0x62, 0x69,
-0x62, 0x69, 0x3b, 0x4f, 0x1e63, 0xf9, 0x20, 0xd2, 0x6b, 0xfa, 0x64, 0x75, 0x3b, 0x4f, 0x1e63, 0xf9, 0x20, 0x41, 0x67, 0x1eb9,
-0x6d, 0x1ecd, 0x3b, 0x4f, 0x1e63, 0xf9, 0x20, 0xd2, 0x67, 0xfa, 0x6e, 0x3b, 0x4f, 0x1e63, 0xf9, 0x20, 0x4f, 0x77, 0x65, 0x77,
-0x65, 0x3b, 0x4f, 0x1e63, 0xf9, 0x20, 0x1ecc, 0x300, 0x77, 0xe0, 0x72, 0xe0, 0x3b, 0x4f, 0x1e63, 0xf9, 0x20, 0x42, 0xe9, 0x6c,
-0xfa, 0x3b, 0x4f, 0x1e63, 0xf9, 0x20, 0x1ecc, 0x300, 0x70, 0x1eb9, 0x300, 0x3b, 0x53, 0x68, 0x25b, 0x301, 0x3b, 0xc8, 0x72, 0x3b,
-0x190, 0x72, 0x3b, 0xcc, 0x67, 0x3b, 0x190, 0x300, 0x62, 0x3b, 0xd2, 0x6b, 0x3b, 0x41, 0x67, 0x3b, 0xd2, 0x67, 0x3b, 0x4f,
-0x77, 0x3b, 0x186, 0x300, 0x77, 0x3b, 0x42, 0xe9, 0x3b, 0x186, 0x300, 0x70, 0x3b, 0x53, 0x68, 0x25b, 0x301, 0x72, 0x25b, 0x301,
-0x3b, 0xc8, 0x72, 0xe8, 0x6c, 0xe8, 0x3b, 0x190, 0x72, 0x25b, 0x300, 0x6e, 0xe0, 0x3b, 0xcc, 0x67, 0x62, 0xe9, 0x3b, 0x190,
-0x300, 0x62, 0x69, 0x62, 0x69, 0x3b, 0xd2, 0x6b, 0xfa, 0x64, 0x75, 0x3b, 0x41, 0x67, 0x25b, 0x6d, 0x254, 0x3b, 0xd2, 0x67,
-0xfa, 0x6e, 0x3b, 0x4f, 0x77, 0x65, 0x77, 0x65, 0x3b, 0x186, 0x300, 0x77, 0xe0, 0x72, 0xe0, 0x3b, 0x42, 0xe9, 0x6c, 0xfa,
-0x3b, 0x186, 0x300, 0x70, 0x25b, 0x300, 0x3b, 0x53, 0x3b, 0xc8, 0x3b, 0x190, 0x3b, 0xcc, 0x3b, 0x190, 0x300, 0x3b, 0xd2, 0x3b,
-0x41, 0x3b, 0xd2, 0x3b, 0x4f, 0x3b, 0x186, 0x300, 0x3b, 0x42, 0x3b, 0x186, 0x300, 0x3b, 0x53, 0x68, 0x25b, 0x301, 0x72, 0x3b,
-0xc8, 0x72, 0xe8, 0x6c, 0x3b, 0x190, 0x72, 0x25b, 0x300, 0x6e, 0x3b, 0xcc, 0x67, 0x62, 0x3b, 0x190, 0x300, 0x62, 0x69, 0x3b,
-0xd2, 0x6b, 0xfa, 0x3b, 0x41, 0x67, 0x25b, 0x3b, 0xd2, 0x67, 0xfa, 0x3b, 0x4f, 0x77, 0x65, 0x3b, 0x186, 0x300, 0x77, 0xe0,
-0x3b, 0x42, 0xe9, 0x6c, 0x3b, 0x186, 0x300, 0x70, 0x25b, 0x3b, 0x4f, 0x73, 0x68, 0xf9, 0x20, 0x53, 0x68, 0x25b, 0x301, 0x72,
-0x25b, 0x301, 0x3b, 0x4f, 0x73, 0x68, 0xf9, 0x20, 0xc8, 0x72, 0xe8, 0x6c, 0xe8, 0x3b, 0x4f, 0x73, 0x68, 0xf9, 0x20, 0x190,
-0x72, 0x25b, 0x300, 0x6e, 0xe0, 0x3b, 0x4f, 0x73, 0x68, 0xf9, 0x20, 0xcc, 0x67, 0x62, 0xe9, 0x3b, 0x4f, 0x73, 0x68, 0xf9,
-0x20, 0x190, 0x300, 0x62, 0x69, 0x62, 0x69, 0x3b, 0x4f, 0x73, 0x68, 0xf9, 0x20, 0xd2, 0x6b, 0xfa, 0x64, 0x75, 0x3b, 0x4f,
-0x73, 0x68, 0xf9, 0x20, 0x41, 0x67, 0x25b, 0x6d, 0x254, 0x3b, 0x4f, 0x73, 0x68, 0xf9, 0x20, 0xd2, 0x67, 0xfa, 0x6e, 0x3b,
-0x4f, 0x73, 0x68, 0xf9, 0x20, 0x4f, 0x77, 0x65, 0x77, 0x65, 0x3b, 0x4f, 0x73, 0x68, 0xf9, 0x20, 0x186, 0x300, 0x77, 0xe0,
-0x72, 0xe0, 0x3b, 0x4f, 0x73, 0x68, 0xf9, 0x20, 0x42, 0xe9, 0x6c, 0xfa, 0x3b, 0x4f, 0x73, 0x68, 0xf9, 0x20, 0x186, 0x300,
-0x70, 0x25b, 0x300, 0x3b, 0x4a, 0x61, 0x6e, 0x3b, 0x46, 0x65, 0x62, 0x3b, 0x4d, 0x61, 0x73, 0x3b, 0x45, 0x70, 0x68, 0x3b,
-0x4d, 0x65, 0x79, 0x3b, 0x4a, 0x75, 0x6e, 0x3b, 0x4a, 0x75, 0x6c, 0x3b, 0x41, 0x67, 0x61, 0x3b, 0x53, 0x65, 0x70, 0x3b,
-0x4f, 0x6b, 0x74, 0x3b, 0x4e, 0x6f, 0x76, 0x3b, 0x44, 0x69, 0x73, 0x3b, 0x4a, 0x61, 0x6e, 0x75, 0x77, 0x61, 0x72, 0x69,
-0x3b, 0x46, 0x65, 0x62, 0x72, 0x75, 0x77, 0x61, 0x72, 0x69, 0x3b, 0x4d, 0x61, 0x73, 0x68, 0x69, 0x3b, 0x45, 0x70, 0x68,
-0x72, 0x65, 0x6c, 0x69, 0x3b, 0x4d, 0x65, 0x79, 0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x69, 0x3b, 0x4a, 0x75, 0x6c, 0x61, 0x79,
-0x69, 0x3b, 0x41, 0x67, 0x61, 0x73, 0x74, 0x69, 0x3b, 0x53, 0x65, 0x70, 0x74, 0x68, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x4f,
-0x6b, 0x74, 0x68, 0x6f, 0x62, 0x61, 0x3b, 0x4e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x44, 0x69, 0x73, 0x65, 0x6d,
-0x62, 0x61, 0x3b, 0x4a, 0x3b, 0x46, 0x3b, 0x4d, 0x3b, 0x45, 0x3b, 0x4d, 0x3b, 0x4a, 0x3b, 0x4a, 0x3b, 0x41, 0x3b, 0x53,
-0x3b, 0x4f, 0x3b, 0x4e, 0x3b, 0x44, 0x3b, 0x6a, 0x61, 0x6e, 0x2e, 0x3b, 0x66, 0x65, 0x62, 0x2e, 0x3b, 0x6d, 0x61, 0x72,
-0x73, 0x3b, 0x61, 0x70, 0x72, 0x2e, 0x3b, 0x6d, 0x61, 0x69, 0x3b, 0x6a, 0x75, 0x6e, 0x69, 0x3b, 0x6a, 0x75, 0x6c, 0x69,
-0x3b, 0x61, 0x75, 0x67, 0x2e, 0x3b, 0x73, 0x65, 0x70, 0x2e, 0x3b, 0x6f, 0x6b, 0x74, 0x2e, 0x3b, 0x6e, 0x6f, 0x76, 0x2e,
-0x3b, 0x64, 0x65, 0x73, 0x2e, 0x3b, 0x6a, 0x61, 0x6e, 0x3b, 0x66, 0x65, 0x62, 0x3b, 0x6d, 0x61, 0x72, 0x3b, 0x61, 0x70,
-0x72, 0x3b, 0x6d, 0x61, 0x6a, 0x3b, 0x6a, 0x75, 0x6e, 0x3b, 0x6a, 0x75, 0x6c, 0x3b, 0x61, 0x75, 0x67, 0x3b, 0x73, 0x65,
-0x70, 0x3b, 0x6f, 0x6b, 0x74, 0x3b, 0x6e, 0x6f, 0x76, 0x3b, 0x64, 0x65, 0x63, 0x3b, 0x6a, 0x61, 0x6e, 0x75, 0x61, 0x72,
-0x3b, 0x66, 0x65, 0x62, 0x72, 0x75, 0x61, 0x72, 0x3b, 0x6d, 0x61, 0x72, 0x74, 0x3b, 0x61, 0x70, 0x72, 0x69, 0x6c, 0x3b,
-0x6d, 0x61, 0x6a, 0x3b, 0x6a, 0x75, 0x6e, 0x69, 0x3b, 0x6a, 0x75, 0x6c, 0x69, 0x3b, 0x61, 0x75, 0x67, 0x75, 0x73, 0x74,
-0x3b, 0x73, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x61, 0x72, 0x3b, 0x6f, 0x6b, 0x74, 0x6f, 0x62, 0x61, 0x72, 0x3b, 0x6e,
-0x6f, 0x76, 0x65, 0x6d, 0x62, 0x61, 0x72, 0x3b, 0x64, 0x65, 0x63, 0x65, 0x6d, 0x62, 0x61, 0x72, 0x3b, 0x458, 0x430, 0x43d,
-0x3b, 0x444, 0x435, 0x431, 0x3b, 0x43c, 0x430, 0x440, 0x3b, 0x430, 0x43f, 0x440, 0x3b, 0x43c, 0x430, 0x458, 0x3b, 0x458, 0x443, 0x43d,
-0x3b, 0x458, 0x443, 0x43b, 0x3b, 0x430, 0x443, 0x433, 0x3b, 0x441, 0x435, 0x43f, 0x3b, 0x43e, 0x43a, 0x442, 0x3b, 0x43d, 0x43e, 0x432,
-0x3b, 0x434, 0x435, 0x446, 0x3b, 0x458, 0x430, 0x43d, 0x443, 0x430, 0x440, 0x3b, 0x444, 0x435, 0x431, 0x440, 0x443, 0x430, 0x440, 0x3b,
-0x43c, 0x430, 0x440, 0x442, 0x3b, 0x430, 0x43f, 0x440, 0x438, 0x43b, 0x3b, 0x43c, 0x430, 0x458, 0x3b, 0x458, 0x443, 0x43d, 0x438, 0x3b,
-0x458, 0x443, 0x43b, 0x438, 0x3b, 0x430, 0x443, 0x433, 0x443, 0x441, 0x442, 0x3b, 0x441, 0x435, 0x43f, 0x442, 0x435, 0x43c, 0x431, 0x430,
-0x440, 0x3b, 0x43e, 0x43a, 0x442, 0x43e, 0x431, 0x430, 0x440, 0x3b, 0x43d, 0x43e, 0x432, 0x435, 0x43c, 0x431, 0x430, 0x440, 0x3b, 0x434,
-0x435, 0x446, 0x435, 0x43c, 0x431, 0x430, 0x440, 0x3b, 0x4a, 0x2d, 0x67, 0x75, 0x65, 0x72, 0x3b, 0x54, 0x2d, 0x61, 0x72, 0x72,
-0x65, 0x65, 0x3b, 0x4d, 0x61, 0x79, 0x72, 0x6e, 0x74, 0x3b, 0x41, 0x76, 0x72, 0x72, 0x69, 0x6c, 0x3b, 0x42, 0x6f, 0x61,
-0x6c, 0x64, 0x79, 0x6e, 0x3b, 0x4d, 0x2d, 0x73, 0x6f, 0x75, 0x72, 0x65, 0x65, 0x3b, 0x4a, 0x2d, 0x73, 0x6f, 0x75, 0x72,
-0x65, 0x65, 0x3b, 0x4c, 0x75, 0x61, 0x6e, 0x69, 0x73, 0x74, 0x79, 0x6e, 0x3b, 0x4d, 0x2d, 0x66, 0x6f, 0x75, 0x79, 0x69,
-0x72, 0x3b, 0x4a, 0x2d, 0x66, 0x6f, 0x75, 0x79, 0x69, 0x72, 0x3b, 0x4d, 0x2d, 0x48, 0x6f, 0x75, 0x6e, 0x65, 0x79, 0x3b,
-0x4d, 0x2d, 0x4e, 0x6f, 0x6c, 0x6c, 0x69, 0x63, 0x6b, 0x3b, 0x4a, 0x65, 0x72, 0x72, 0x65, 0x79, 0x2d, 0x67, 0x65, 0x75,
-0x72, 0x65, 0x65, 0x3b, 0x54, 0x6f, 0x73, 0x68, 0x69, 0x61, 0x67, 0x68, 0x74, 0x2d, 0x61, 0x72, 0x72, 0x65, 0x65, 0x3b,
-0x4d, 0x61, 0x79, 0x72, 0x6e, 0x74, 0x3b, 0x41, 0x76, 0x65, 0x72, 0x69, 0x6c, 0x3b, 0x42, 0x6f, 0x61, 0x6c, 0x64, 0x79,
-0x6e, 0x3b, 0x4d, 0x65, 0x61, 0x6e, 0x2d, 0x73, 0x6f, 0x75, 0x72, 0x65, 0x65, 0x3b, 0x4a, 0x65, 0x72, 0x72, 0x65, 0x79,
-0x2d, 0x73, 0x6f, 0x75, 0x72, 0x65, 0x65, 0x3b, 0x4c, 0x75, 0x61, 0x6e, 0x69, 0x73, 0x74, 0x79, 0x6e, 0x3b, 0x4d, 0x65,
-0x61, 0x6e, 0x2d, 0x66, 0x6f, 0x75, 0x79, 0x69, 0x72, 0x3b, 0x4a, 0x65, 0x72, 0x72, 0x65, 0x79, 0x2d, 0x66, 0x6f, 0x75,
-0x79, 0x69, 0x72, 0x3b, 0x4d, 0x65, 0x65, 0x20, 0x48, 0x6f, 0x75, 0x6e, 0x65, 0x79, 0x3b, 0x4d, 0x65, 0x65, 0x20, 0x6e,
-0x79, 0x20, 0x4e, 0x6f, 0x6c, 0x6c, 0x69, 0x63, 0x6b, 0x3b, 0x47, 0x65, 0x6e, 0x3b, 0x48, 0x77, 0x65, 0x3b, 0x4d, 0x65,
-0x75, 0x3b, 0x45, 0x62, 0x72, 0x3b, 0x4d, 0x65, 0x3b, 0x4d, 0x65, 0x74, 0x3b, 0x47, 0x6f, 0x72, 0x3b, 0x45, 0x73, 0x74,
-0x3b, 0x47, 0x77, 0x6e, 0x3b, 0x48, 0x65, 0x64, 0x3b, 0x44, 0x75, 0x3b, 0x4b, 0x65, 0x76, 0x3b, 0x6d, 0x69, 0x73, 0x20,
-0x47, 0x65, 0x6e, 0x76, 0x65, 0x72, 0x3b, 0x6d, 0x69, 0x73, 0x20, 0x48, 0x77, 0x65, 0x76, 0x72, 0x65, 0x72, 0x3b, 0x6d,
-0x69, 0x73, 0x20, 0x4d, 0x65, 0x75, 0x72, 0x74, 0x68, 0x3b, 0x6d, 0x69, 0x73, 0x20, 0x45, 0x62, 0x72, 0x65, 0x6c, 0x3b,
-0x6d, 0x69, 0x73, 0x20, 0x4d, 0x65, 0x3b, 0x6d, 0x69, 0x73, 0x20, 0x4d, 0x65, 0x74, 0x68, 0x65, 0x76, 0x65, 0x6e, 0x3b,
-0x6d, 0x69, 0x73, 0x20, 0x47, 0x6f, 0x72, 0x74, 0x68, 0x65, 0x72, 0x65, 0x6e, 0x3b, 0x6d, 0x69, 0x73, 0x20, 0x45, 0x73,
-0x74, 0x3b, 0x6d, 0x69, 0x73, 0x20, 0x47, 0x77, 0x79, 0x6e, 0x6e, 0x67, 0x61, 0x6c, 0x61, 0x3b, 0x6d, 0x69, 0x73, 0x20,
-0x48, 0x65, 0x64, 0x72, 0x61, 0x3b, 0x6d, 0x69, 0x73, 0x20, 0x44, 0x75, 0x3b, 0x6d, 0x69, 0x73, 0x20, 0x4b, 0x65, 0x76,
-0x61, 0x72, 0x64, 0x68, 0x75, 0x3b, 0x53, 0x2d, 0x186, 0x3b, 0x4b, 0x2d, 0x186, 0x3b, 0x45, 0x2d, 0x186, 0x3b, 0x45, 0x2d,
-0x4f, 0x3b, 0x45, 0x2d, 0x4b, 0x3b, 0x4f, 0x2d, 0x41, 0x3b, 0x41, 0x2d, 0x4b, 0x3b, 0x44, 0x2d, 0x186, 0x3b, 0x46, 0x2d,
-0x190, 0x3b, 0x186, 0x2d, 0x41, 0x3b, 0x186, 0x2d, 0x4f, 0x3b, 0x4d, 0x2d, 0x186, 0x3b, 0x53, 0x61, 0x6e, 0x64, 0x61, 0x2d,
-0x186, 0x70, 0x25b, 0x70, 0x254, 0x6e, 0x3b, 0x4b, 0x77, 0x61, 0x6b, 0x77, 0x61, 0x72, 0x2d, 0x186, 0x67, 0x79, 0x65, 0x66,
-0x75, 0x6f, 0x3b, 0x45, 0x62, 0x254, 0x77, 0x2d, 0x186, 0x62, 0x65, 0x6e, 0x65, 0x6d, 0x3b, 0x45, 0x62, 0x254, 0x62, 0x69,
-0x72, 0x61, 0x2d, 0x4f, 0x66, 0x6f, 0x72, 0x69, 0x73, 0x75, 0x6f, 0x3b, 0x45, 0x73, 0x75, 0x73, 0x6f, 0x77, 0x20, 0x41,
-0x6b, 0x65, 0x74, 0x73, 0x65, 0x61, 0x62, 0x61, 0x2d, 0x4b, 0x254, 0x74, 0x254, 0x6e, 0x69, 0x6d, 0x62, 0x61, 0x3b, 0x4f,
-0x62, 0x69, 0x72, 0x61, 0x64, 0x65, 0x2d, 0x41, 0x79, 0x25b, 0x77, 0x6f, 0x68, 0x6f, 0x6d, 0x75, 0x6d, 0x75, 0x3b, 0x41,
-0x79, 0x25b, 0x77, 0x6f, 0x68, 0x6f, 0x2d, 0x4b, 0x69, 0x74, 0x61, 0x77, 0x6f, 0x6e, 0x73, 0x61, 0x3b, 0x44, 0x69, 0x66,
-0x75, 0x75, 0x2d, 0x186, 0x73, 0x61, 0x6e, 0x64, 0x61, 0x61, 0x3b, 0x46, 0x61, 0x6e, 0x6b, 0x77, 0x61, 0x2d, 0x190, 0x62,
-0x254, 0x3b, 0x186, 0x62, 0x25b, 0x73, 0x25b, 0x2d, 0x41, 0x68, 0x69, 0x6e, 0x69, 0x6d, 0x65, 0x3b, 0x186, 0x62, 0x65, 0x72,
-0x25b, 0x66, 0x25b, 0x77, 0x2d, 0x4f, 0x62, 0x75, 0x62, 0x75, 0x6f, 0x3b, 0x4d, 0x75, 0x6d, 0x75, 0x2d, 0x186, 0x70, 0x25b,
-0x6e, 0x69, 0x6d, 0x62, 0x61, 0x3b, 0x91c, 0x93e, 0x928, 0x947, 0x935, 0x93e, 0x930, 0x940, 0x3b, 0x92b, 0x947, 0x92c, 0x94d, 0x930,
-0x941, 0x935, 0x93e, 0x930, 0x940, 0x3b, 0x92e, 0x93e, 0x930, 0x94d, 0x91a, 0x3b, 0x90f, 0x92a, 0x94d, 0x930, 0x93f, 0x932, 0x3b, 0x92e,
-0x947, 0x3b, 0x91c, 0x942, 0x928, 0x3b, 0x91c, 0x941, 0x932, 0x93e, 0x92f, 0x3b, 0x906, 0x917, 0x94b, 0x938, 0x94d, 0x924, 0x3b, 0x938,
-0x92a, 0x94d, 0x91f, 0x947, 0x902, 0x92c, 0x930, 0x3b, 0x911, 0x915, 0x94d, 0x91f, 0x94b, 0x92c, 0x930, 0x3b, 0x928, 0x94b, 0x935, 0x94d,
-0x939, 0x947, 0x902, 0x92c, 0x930, 0x3b, 0x921, 0x93f, 0x938, 0x947, 0x902, 0x92c, 0x930, 0x3b, 0x4a, 0x65, 0x6e, 0x3b, 0x46, 0x65,
-0x62, 0x3b, 0x4d, 0x61, 0x61, 0x3b, 0x45, 0x70, 0x72, 0x3b, 0x4d, 0x65, 0x65, 0x3b, 0x4a, 0x75, 0x75, 0x3b, 0x4a, 0x75,
-0x6c, 0x3b, 0x1ecc, 0x67, 0x1ecd, 0x3b, 0x53, 0x65, 0x70, 0x3b, 0x1ecc, 0x6b, 0x74, 0x3b, 0x4e, 0x6f, 0x76, 0x3b, 0x44, 0x69,
-0x73, 0x3b, 0x4a, 0x65, 0x6e, 0x1ee5, 0x77, 0x61, 0x72, 0x1ecb, 0x3b, 0x46, 0x65, 0x62, 0x72, 0x1ee5, 0x77, 0x61, 0x72, 0x1ecb,
-0x3b, 0x4d, 0x61, 0x61, 0x63, 0x68, 0x1ecb, 0x3b, 0x45, 0x70, 0x72, 0x65, 0x65, 0x6c, 0x3b, 0x4d, 0x65, 0x65, 0x3b, 0x4a,
-0x75, 0x75, 0x6e, 0x3b, 0x4a, 0x75, 0x6c, 0x61, 0x1ecb, 0x3b, 0x1ecc, 0x67, 0x1ecd, 0x1ecd, 0x73, 0x74, 0x3b, 0x53, 0x65, 0x70,
-0x74, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x1ecc, 0x6b, 0x74, 0x6f, 0x62, 0x61, 0x3b, 0x4e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x61,
-0x3b, 0x44, 0x69, 0x73, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x4a, 0x3b, 0x46, 0x3b, 0x4d, 0x3b, 0x45, 0x3b, 0x4d, 0x3b, 0x4a,
-0x3b, 0x4a, 0x3b, 0x1ecc, 0x3b, 0x53, 0x3b, 0x1ecc, 0x3b, 0x4e, 0x3b, 0x44, 0x3b, 0x4d, 0x62, 0x65, 0x3b, 0x4b, 0x65, 0x6c,
-0x3b, 0x4b, 0x74, 0x169, 0x3b, 0x4b, 0x61, 0x6e, 0x3b, 0x4b, 0x74, 0x6e, 0x3b, 0x54, 0x68, 0x61, 0x3b, 0x4d, 0x6f, 0x6f,
-0x3b, 0x4e, 0x79, 0x61, 0x3b, 0x4b, 0x6e, 0x64, 0x3b, 0x128, 0x6b, 0x75, 0x3b, 0x128, 0x6b, 0x6d, 0x3b, 0x128, 0x6b, 0x6c,
-0x3b, 0x4d, 0x77, 0x61, 0x69, 0x20, 0x77, 0x61, 0x20, 0x6d, 0x62, 0x65, 0x65, 0x3b, 0x4d, 0x77, 0x61, 0x69, 0x20, 0x77,
-0x61, 0x20, 0x6b, 0x65, 0x6c, 0x129, 0x3b, 0x4d, 0x77, 0x61, 0x69, 0x20, 0x77, 0x61, 0x20, 0x6b, 0x61, 0x74, 0x61, 0x74,
-0x169, 0x3b, 0x4d, 0x77, 0x61, 0x69, 0x20, 0x77, 0x61, 0x20, 0x6b, 0x61, 0x6e, 0x61, 0x3b, 0x4d, 0x77, 0x61, 0x69, 0x20,
-0x77, 0x61, 0x20, 0x6b, 0x61, 0x74, 0x61, 0x6e, 0x6f, 0x3b, 0x4d, 0x77, 0x61, 0x69, 0x20, 0x77, 0x61, 0x20, 0x74, 0x68,
-0x61, 0x6e, 0x74, 0x68, 0x61, 0x74, 0x169, 0x3b, 0x4d, 0x77, 0x61, 0x69, 0x20, 0x77, 0x61, 0x20, 0x6d, 0x75, 0x6f, 0x6e,
-0x7a, 0x61, 0x3b, 0x4d, 0x77, 0x61, 0x69, 0x20, 0x77, 0x61, 0x20, 0x6e, 0x79, 0x61, 0x61, 0x6e, 0x79, 0x61, 0x3b, 0x4d,
-0x77, 0x61, 0x69, 0x20, 0x77, 0x61, 0x20, 0x6b, 0x65, 0x6e, 0x64, 0x61, 0x3b, 0x4d, 0x77, 0x61, 0x69, 0x20, 0x77, 0x61,
-0x20, 0x129, 0x6b, 0x75, 0x6d, 0x69, 0x3b, 0x4d, 0x77, 0x61, 0x69, 0x20, 0x77, 0x61, 0x20, 0x129, 0x6b, 0x75, 0x6d, 0x69,
-0x20, 0x6e, 0x61, 0x20, 0x129, 0x6d, 0x77, 0x65, 0x3b, 0x4d, 0x77, 0x61, 0x69, 0x20, 0x77, 0x61, 0x20, 0x129, 0x6b, 0x75,
-0x6d, 0x69, 0x20, 0x6e, 0x61, 0x20, 0x69, 0x6c, 0x129, 0x3b, 0x4d, 0x3b, 0x4b, 0x3b, 0x4b, 0x3b, 0x4b, 0x3b, 0x4b, 0x3b,
-0x54, 0x3b, 0x4d, 0x3b, 0x4e, 0x3b, 0x4b, 0x3b, 0x128, 0x3b, 0x128, 0x3b, 0x128, 0x3b, 0x5a, 0x65, 0x6e, 0x3b, 0x46, 0x65,
-0x76, 0x3b, 0x4d, 0x61, 0x72, 0x3b, 0x41, 0x76, 0x72, 0x3b, 0x4d, 0x61, 0x69, 0x3b, 0x4a, 0x75, 0x67, 0x3b, 0x4c, 0x75,
-0x69, 0x3b, 0x41, 0x76, 0x6f, 0x3b, 0x53, 0x65, 0x74, 0x3b, 0x4f, 0x74, 0x75, 0x3b, 0x4e, 0x6f, 0x76, 0x3b, 0x44, 0x69,
-0x63, 0x3b, 0x5a, 0x65, 0x6e, 0xe2, 0x72, 0x3b, 0x46, 0x65, 0x76, 0x72, 0xe2, 0x72, 0x3b, 0x4d, 0x61, 0x72, 0xe7, 0x3b,
-0x41, 0x76, 0x72, 0xee, 0x6c, 0x3b, 0x4d, 0x61, 0x69, 0x3b, 0x4a, 0x75, 0x67, 0x6e, 0x3b, 0x4c, 0x75, 0x69, 0x3b, 0x41,
-0x76, 0x6f, 0x73, 0x74, 0x3b, 0x53, 0x65, 0x74, 0x65, 0x6d, 0x62, 0x61, 0x72, 0x3b, 0x4f, 0x74, 0x75, 0x62, 0x61, 0x72,
-0x3b, 0x4e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x61, 0x72, 0x3b, 0x44, 0x69, 0x63, 0x65, 0x6d, 0x62, 0x61, 0x72, 0x3b, 0x5a,
-0x3b, 0x46, 0x3b, 0x4d, 0x3b, 0x41, 0x3b, 0x4d, 0x3b, 0x4a, 0x3b, 0x4c, 0x3b, 0x41, 0x3b, 0x53, 0x3b, 0x4f, 0x3b, 0x4e,
-0x3b, 0x44, 0x3b, 0x64, 0x7a, 0x76, 0x3b, 0x64, 0x7a, 0x64, 0x3b, 0x74, 0x65, 0x64, 0x3b, 0x61, 0x66, 0x254, 0x3b, 0x64,
-0x61, 0x6d, 0x3b, 0x6d, 0x61, 0x73, 0x3b, 0x73, 0x69, 0x61, 0x3b, 0x64, 0x65, 0x61, 0x3b, 0x61, 0x6e, 0x79, 0x3b, 0x6b,
-0x65, 0x6c, 0x3b, 0x61, 0x64, 0x65, 0x3b, 0x64, 0x7a, 0x6d, 0x3b, 0x64, 0x7a, 0x6f, 0x76, 0x65, 0x3b, 0x64, 0x7a, 0x6f,
-0x64, 0x7a, 0x65, 0x3b, 0x74, 0x65, 0x64, 0x6f, 0x78, 0x65, 0x3b, 0x61, 0x66, 0x254, 0x66, 0x129, 0x65, 0x3b, 0x64, 0x61,
-0x6d, 0x61, 0x3b, 0x6d, 0x61, 0x73, 0x61, 0x3b, 0x73, 0x69, 0x61, 0x6d, 0x6c, 0x254, 0x6d, 0x3b, 0x64, 0x65, 0x61, 0x73,
-0x69, 0x61, 0x6d, 0x69, 0x6d, 0x65, 0x3b, 0x61, 0x6e, 0x79, 0x254, 0x6e, 0x79, 0x254, 0x3b, 0x6b, 0x65, 0x6c, 0x65, 0x3b,
-0x61, 0x64, 0x65, 0x25b, 0x6d, 0x65, 0x6b, 0x70, 0x254, 0x78, 0x65, 0x3b, 0x64, 0x7a, 0x6f, 0x6d, 0x65, 0x3b, 0x64, 0x3b,
-0x64, 0x3b, 0x74, 0x3b, 0x61, 0x3b, 0x64, 0x3b, 0x6d, 0x3b, 0x73, 0x3b, 0x64, 0x3b, 0x61, 0x3b, 0x6b, 0x3b, 0x61, 0x3b,
-0x64, 0x3b, 0x49, 0x61, 0x6e, 0x2e, 0x3b, 0x50, 0x65, 0x70, 0x2e, 0x3b, 0x4d, 0x61, 0x6c, 0x2e, 0x3b, 0x2bb, 0x41, 0x70,
-0x2e, 0x3b, 0x4d, 0x65, 0x69, 0x3b, 0x49, 0x75, 0x6e, 0x2e, 0x3b, 0x49, 0x75, 0x6c, 0x2e, 0x3b, 0x2bb, 0x41, 0x75, 0x2e,
-0x3b, 0x4b, 0x65, 0x70, 0x2e, 0x3b, 0x2bb, 0x4f, 0x6b, 0x2e, 0x3b, 0x4e, 0x6f, 0x77, 0x2e, 0x3b, 0x4b, 0x65, 0x6b, 0x2e,
-0x3b, 0x49, 0x61, 0x6e, 0x75, 0x61, 0x6c, 0x69, 0x3b, 0x50, 0x65, 0x70, 0x65, 0x6c, 0x75, 0x61, 0x6c, 0x69, 0x3b, 0x4d,
-0x61, 0x6c, 0x61, 0x6b, 0x69, 0x3b, 0x2bb, 0x41, 0x70, 0x65, 0x6c, 0x69, 0x6c, 0x61, 0x3b, 0x4d, 0x65, 0x69, 0x3b, 0x49,
-0x75, 0x6e, 0x65, 0x3b, 0x49, 0x75, 0x6c, 0x61, 0x69, 0x3b, 0x2bb, 0x41, 0x75, 0x6b, 0x61, 0x6b, 0x65, 0x3b, 0x4b, 0x65,
-0x70, 0x61, 0x6b, 0x65, 0x6d, 0x61, 0x70, 0x61, 0x3b, 0x2bb, 0x4f, 0x6b, 0x61, 0x6b, 0x6f, 0x70, 0x61, 0x3b, 0x4e, 0x6f,
-0x77, 0x65, 0x6d, 0x61, 0x70, 0x61, 0x3b, 0x4b, 0x65, 0x6b, 0x65, 0x6d, 0x61, 0x70, 0x61, 0x3b, 0x45, 0x6e, 0x65, 0x3b,
-0x50, 0x65, 0x62, 0x3b, 0x4d, 0x61, 0x72, 0x3b, 0x41, 0x62, 0x72, 0x3b, 0x4d, 0x61, 0x79, 0x3b, 0x48, 0x75, 0x6e, 0x3b,
-0x48, 0x75, 0x6c, 0x3b, 0x41, 0x67, 0x6f, 0x3b, 0x53, 0x65, 0x74, 0x3b, 0x4f, 0x6b, 0x74, 0x3b, 0x4e, 0x6f, 0x62, 0x3b,
-0x44, 0x69, 0x73, 0x3b, 0x45, 0x6e, 0x65, 0x72, 0x6f, 0x3b, 0x50, 0x65, 0x62, 0x72, 0x65, 0x72, 0x6f, 0x3b, 0x4d, 0x61,
-0x72, 0x73, 0x6f, 0x3b, 0x41, 0x62, 0x72, 0x69, 0x6c, 0x3b, 0x4d, 0x61, 0x79, 0x6f, 0x3b, 0x48, 0x75, 0x6e, 0x79, 0x6f,
-0x3b, 0x48, 0x75, 0x6c, 0x79, 0x6f, 0x3b, 0x41, 0x67, 0x6f, 0x73, 0x74, 0x6f, 0x3b, 0x53, 0x65, 0x74, 0x79, 0x65, 0x6d,
-0x62, 0x72, 0x65, 0x3b, 0x4f, 0x6b, 0x74, 0x75, 0x62, 0x72, 0x65, 0x3b, 0x4e, 0x6f, 0x62, 0x79, 0x65, 0x6d, 0x62, 0x72,
-0x65, 0x3b, 0x44, 0x69, 0x73, 0x79, 0x65, 0x6d, 0x62, 0x72, 0x65, 0x3b, 0x45, 0x3b, 0x50, 0x3b, 0x4d, 0x3b, 0x41, 0x3b,
-0x4d, 0x3b, 0x48, 0x75, 0x6e, 0x3b, 0x48, 0x75, 0x6c, 0x3b, 0x41, 0x67, 0x6f, 0x3b, 0x53, 0x65, 0x74, 0x3b, 0x4f, 0x6b,
-0x74, 0x3b, 0x4e, 0x6f, 0x62, 0x3b, 0x44, 0x69, 0x73, 0x3b, 0x4a, 0x61, 0x6e, 0x75, 0x61, 0x72, 0x3b, 0x46, 0x65, 0x62,
-0x72, 0x75, 0x61, 0x72, 0x3b, 0x4d, 0xe4, 0x72, 0x7a, 0x3b, 0x41, 0x70, 0x72, 0x69, 0x6c, 0x3b, 0x4d, 0x61, 0x69, 0x3b,
-0x4a, 0x75, 0x6e, 0x69, 0x3b, 0x4a, 0x75, 0x6c, 0x69, 0x3b, 0x41, 0x75, 0x67, 0x75, 0x73, 0x63, 0x68, 0x74, 0x3b, 0x53,
-0x65, 0x70, 0x74, 0xe4, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x4f, 0x6b, 0x74, 0x6f, 0x6f, 0x62, 0x65, 0x72, 0x3b, 0x4e, 0x6f,
-0x76, 0xe4, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x44, 0x65, 0x7a, 0xe4, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0xa2cd, 0xa1aa, 0x3b, 0xa44d,
-0xa1aa, 0x3b, 0xa315, 0xa1aa, 0x3b, 0xa1d6, 0xa1aa, 0x3b, 0xa26c, 0xa1aa, 0x3b, 0xa0d8, 0xa1aa, 0x3b, 0xa3c3, 0xa1aa, 0x3b, 0xa246, 0xa1aa, 0x3b,
-0xa22c, 0xa1aa, 0x3b, 0xa2b0, 0xa1aa, 0x3b, 0xa2b0, 0xa2aa, 0xa1aa, 0x3b, 0xa2b0, 0xa44b, 0xa1aa, 0x3b, 0x4a, 0x61, 0x6e, 0x2e, 0x3b, 0x46,
-0x65, 0x62, 0x2e, 0x3b, 0x4d, 0xe4, 0x72, 0x7a, 0x3b, 0x41, 0x70, 0x72, 0x2e, 0x3b, 0x4d, 0x61, 0x69, 0x3b, 0x4a, 0x75,
-0x6e, 0x69, 0x3b, 0x4a, 0x75, 0x6c, 0x69, 0x3b, 0x41, 0x75, 0x67, 0x2e, 0x3b, 0x53, 0x65, 0x70, 0x2e, 0x3b, 0x4f, 0x6b,
-0x74, 0x2e, 0x3b, 0x4e, 0x6f, 0x76, 0x2e, 0x3b, 0x44, 0x65, 0x7a, 0x2e, 0x3b, 0x4a, 0x61, 0x6e, 0x75, 0x61, 0x61, 0x72,
-0x3b, 0x46, 0x65, 0x62, 0x72, 0x75, 0x61, 0x61, 0x72, 0x3b, 0x4d, 0xe4, 0x72, 0x7a, 0x3b, 0x41, 0x70, 0x72, 0x69, 0x6c,
-0x3b, 0x4d, 0x61, 0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x69, 0x3b, 0x4a, 0x75, 0x6c, 0x69, 0x3b, 0x41, 0x75, 0x67, 0x75, 0x73,
-0x74, 0x3b, 0x53, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x4f, 0x6b, 0x74, 0x6f, 0x76, 0x65, 0x72, 0x3b,
-0x4e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x44, 0x65, 0x7a, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x6f, 0x111,
-0x111, 0x6a, 0x3b, 0x67, 0x75, 0x6f, 0x76, 0x3b, 0x6e, 0x6a, 0x75, 0x6b, 0x3b, 0x63, 0x75, 0x6f, 0x3b, 0x6d, 0x69, 0x65,
-0x73, 0x3b, 0x67, 0x65, 0x61, 0x73, 0x3b, 0x73, 0x75, 0x6f, 0x69, 0x3b, 0x62, 0x6f, 0x72, 0x67, 0x3b, 0x10d, 0x61, 0x6b,
-0x10d, 0x3b, 0x67, 0x6f, 0x6c, 0x67, 0x3b, 0x73, 0x6b, 0xe1, 0x62, 0x3b, 0x6a, 0x75, 0x6f, 0x76, 0x3b, 0x6f, 0x111, 0x111,
-0x61, 0x6a, 0x61, 0x67, 0x65, 0x6d, 0xe1, 0x6e, 0x6e, 0x75, 0x3b, 0x67, 0x75, 0x6f, 0x76, 0x76, 0x61, 0x6d, 0xe1, 0x6e,
-0x6e, 0x75, 0x3b, 0x6e, 0x6a, 0x75, 0x6b, 0x10d, 0x61, 0x6d, 0xe1, 0x6e, 0x6e, 0x75, 0x3b, 0x63, 0x75, 0x6f, 0x14b, 0x6f,
-0x6d, 0xe1, 0x6e, 0x6e, 0x75, 0x3b, 0x6d, 0x69, 0x65, 0x73, 0x73, 0x65, 0x6d, 0xe1, 0x6e, 0x6e, 0x75, 0x3b, 0x67, 0x65,
-0x61, 0x73, 0x73, 0x65, 0x6d, 0xe1, 0x6e, 0x6e, 0x75, 0x3b, 0x73, 0x75, 0x6f, 0x69, 0x64, 0x6e, 0x65, 0x6d, 0xe1, 0x6e,
-0x6e, 0x75, 0x3b, 0x62, 0x6f, 0x72, 0x67, 0x65, 0x6d, 0xe1, 0x6e, 0x6e, 0x75, 0x3b, 0x10d, 0x61, 0x6b, 0x10d, 0x61, 0x6d,
-0xe1, 0x6e, 0x6e, 0x75, 0x3b, 0x67, 0x6f, 0x6c, 0x67, 0x67, 0x6f, 0x74, 0x6d, 0xe1, 0x6e, 0x6e, 0x75, 0x3b, 0x73, 0x6b,
-0xe1, 0x62, 0x6d, 0x61, 0x6d, 0xe1, 0x6e, 0x6e, 0x75, 0x3b, 0x6a, 0x75, 0x6f, 0x76, 0x6c, 0x61, 0x6d, 0xe1, 0x6e, 0x6e,
-0x75, 0x3b, 0x4f, 0x3b, 0x47, 0x3b, 0x4e, 0x3b, 0x43, 0x3b, 0x4d, 0x3b, 0x47, 0x3b, 0x53, 0x3b, 0x42, 0x3b, 0x10c, 0x3b,
-0x47, 0x3b, 0x53, 0x3b, 0x4a, 0x3b, 0x6f, 0x111, 0x111, 0x6a, 0x3b, 0x67, 0x75, 0x6f, 0x76, 0x3b, 0x6e, 0x6a, 0x75, 0x6b,
+0xe0, 0x3b, 0x42, 0xe9, 0x6c, 0x3b, 0x1ecc, 0x300, 0x70, 0x1eb9, 0x53, 0x3b, 0xc8, 0x3b, 0x1eb8, 0x3b, 0xcc, 0x3b, 0x1eb8, 0x300,
+0x3b, 0xd2, 0x3b, 0x41, 0x3b, 0xd2, 0x3b, 0x4f, 0x3b, 0x1ecc, 0x300, 0x3b, 0x42, 0x3b, 0x1ecc, 0x300, 0x53, 0x68, 0x25b, 0x301,
+0x72, 0x25b, 0x301, 0x3b, 0xc8, 0x72, 0xe8, 0x6c, 0xe8, 0x3b, 0x190, 0x72, 0x25b, 0x300, 0x6e, 0xe0, 0x3b, 0xcc, 0x67, 0x62,
+0xe9, 0x3b, 0x190, 0x300, 0x62, 0x69, 0x62, 0x69, 0x3b, 0xd2, 0x6b, 0xfa, 0x64, 0x75, 0x3b, 0x41, 0x67, 0x25b, 0x6d, 0x254,
+0x3b, 0xd2, 0x67, 0xfa, 0x6e, 0x3b, 0x4f, 0x77, 0x65, 0x77, 0x65, 0x3b, 0x186, 0x300, 0x77, 0xe0, 0x72, 0xe0, 0x3b, 0x42,
+0xe9, 0x6c, 0xfa, 0x3b, 0x186, 0x300, 0x70, 0x25b, 0x300, 0x4f, 0x73, 0x68, 0xf9, 0x20, 0x53, 0x68, 0x25b, 0x301, 0x72, 0x25b,
+0x301, 0x3b, 0x4f, 0x73, 0x68, 0xf9, 0x20, 0xc8, 0x72, 0xe8, 0x6c, 0xe8, 0x3b, 0x4f, 0x73, 0x68, 0xf9, 0x20, 0x190, 0x72,
+0x25b, 0x300, 0x6e, 0xe0, 0x3b, 0x4f, 0x73, 0x68, 0xf9, 0x20, 0xcc, 0x67, 0x62, 0xe9, 0x3b, 0x4f, 0x73, 0x68, 0xf9, 0x20,
+0x190, 0x300, 0x62, 0x69, 0x62, 0x69, 0x3b, 0x4f, 0x73, 0x68, 0xf9, 0x20, 0xd2, 0x6b, 0xfa, 0x64, 0x75, 0x3b, 0x4f, 0x73,
+0x68, 0xf9, 0x20, 0x41, 0x67, 0x25b, 0x6d, 0x254, 0x3b, 0x4f, 0x73, 0x68, 0xf9, 0x20, 0xd2, 0x67, 0xfa, 0x6e, 0x3b, 0x4f,
+0x73, 0x68, 0xf9, 0x20, 0x4f, 0x77, 0x65, 0x77, 0x65, 0x3b, 0x4f, 0x73, 0x68, 0xf9, 0x20, 0x186, 0x300, 0x77, 0xe0, 0x72,
+0xe0, 0x3b, 0x4f, 0x73, 0x68, 0xf9, 0x20, 0x42, 0xe9, 0x6c, 0xfa, 0x3b, 0x4f, 0x73, 0x68, 0xf9, 0x20, 0x186, 0x300, 0x70,
+0x25b, 0x300, 0x53, 0x68, 0x25b, 0x301, 0x3b, 0xc8, 0x72, 0x3b, 0x190, 0x72, 0x3b, 0xcc, 0x67, 0x3b, 0x190, 0x300, 0x62, 0x3b,
+0xd2, 0x6b, 0x3b, 0x41, 0x67, 0x3b, 0xd2, 0x67, 0x3b, 0x4f, 0x77, 0x3b, 0x186, 0x300, 0x77, 0x3b, 0x42, 0xe9, 0x3b, 0x186,
+0x300, 0x70, 0x53, 0x68, 0x25b, 0x301, 0x72, 0x3b, 0xc8, 0x72, 0xe8, 0x6c, 0x3b, 0x190, 0x72, 0x25b, 0x300, 0x6e, 0x3b, 0xcc,
+0x67, 0x62, 0x3b, 0x190, 0x300, 0x62, 0x69, 0x3b, 0xd2, 0x6b, 0xfa, 0x3b, 0x41, 0x67, 0x25b, 0x3b, 0xd2, 0x67, 0xfa, 0x3b,
+0x4f, 0x77, 0x65, 0x3b, 0x186, 0x300, 0x77, 0xe0, 0x3b, 0x42, 0xe9, 0x6c, 0x3b, 0x186, 0x300, 0x70, 0x25b, 0x53, 0x3b, 0xc8,
+0x3b, 0x190, 0x3b, 0xcc, 0x3b, 0x190, 0x300, 0x3b, 0xd2, 0x3b, 0x41, 0x3b, 0xd2, 0x3b, 0x4f, 0x3b, 0x186, 0x300, 0x3b, 0x42,
+0x3b, 0x186, 0x300, 0x4a, 0x61, 0x6e, 0x75, 0x77, 0x61, 0x72, 0x69, 0x3b, 0x46, 0x65, 0x62, 0x72, 0x75, 0x77, 0x61, 0x72,
+0x69, 0x3b, 0x4d, 0x61, 0x73, 0x68, 0x69, 0x3b, 0x45, 0x70, 0x68, 0x72, 0x65, 0x6c, 0x69, 0x3b, 0x4d, 0x65, 0x79, 0x69,
+0x3b, 0x4a, 0x75, 0x6e, 0x69, 0x3b, 0x4a, 0x75, 0x6c, 0x61, 0x79, 0x69, 0x3b, 0x41, 0x67, 0x61, 0x73, 0x74, 0x69, 0x3b,
+0x53, 0x65, 0x70, 0x74, 0x68, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x4f, 0x6b, 0x74, 0x68, 0x6f, 0x62, 0x61, 0x3b, 0x4e, 0x6f,
+0x76, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x44, 0x69, 0x73, 0x65, 0x6d, 0x62, 0x61, 0x4a, 0x61, 0x6e, 0x3b, 0x46, 0x65, 0x62,
+0x3b, 0x4d, 0x61, 0x73, 0x3b, 0x45, 0x70, 0x68, 0x3b, 0x4d, 0x65, 0x79, 0x3b, 0x4a, 0x75, 0x6e, 0x3b, 0x4a, 0x75, 0x6c,
+0x3b, 0x41, 0x67, 0x61, 0x3b, 0x53, 0x65, 0x70, 0x3b, 0x4f, 0x6b, 0x74, 0x3b, 0x4e, 0x6f, 0x76, 0x3b, 0x44, 0x69, 0x73,
+0x4a, 0x3b, 0x46, 0x3b, 0x4d, 0x3b, 0x45, 0x3b, 0x4d, 0x3b, 0x4a, 0x3b, 0x4a, 0x3b, 0x41, 0x3b, 0x53, 0x3b, 0x4f, 0x3b,
+0x4e, 0x3b, 0x44, 0x6a, 0x61, 0x6e, 0x2e, 0x3b, 0x66, 0x65, 0x62, 0x2e, 0x3b, 0x6d, 0x61, 0x72, 0x73, 0x3b, 0x61, 0x70,
+0x72, 0x2e, 0x3b, 0x6d, 0x61, 0x69, 0x3b, 0x6a, 0x75, 0x6e, 0x69, 0x3b, 0x6a, 0x75, 0x6c, 0x69, 0x3b, 0x61, 0x75, 0x67,
+0x2e, 0x3b, 0x73, 0x65, 0x70, 0x2e, 0x3b, 0x6f, 0x6b, 0x74, 0x2e, 0x3b, 0x6e, 0x6f, 0x76, 0x2e, 0x3b, 0x64, 0x65, 0x73,
+0x2e, 0x6a, 0x61, 0x6e, 0x75, 0x61, 0x72, 0x3b, 0x66, 0x65, 0x62, 0x72, 0x75, 0x61, 0x72, 0x3b, 0x6d, 0x61, 0x72, 0x74,
+0x3b, 0x61, 0x70, 0x72, 0x69, 0x6c, 0x3b, 0x6d, 0x61, 0x6a, 0x3b, 0x6a, 0x75, 0x6e, 0x69, 0x3b, 0x6a, 0x75, 0x6c, 0x69,
+0x3b, 0x61, 0x75, 0x67, 0x75, 0x73, 0x74, 0x3b, 0x73, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x61, 0x72, 0x3b, 0x6f, 0x6b,
+0x74, 0x6f, 0x62, 0x61, 0x72, 0x3b, 0x6e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x61, 0x72, 0x3b, 0x64, 0x65, 0x63, 0x65, 0x6d,
+0x62, 0x61, 0x72, 0x6a, 0x61, 0x6e, 0x3b, 0x66, 0x65, 0x62, 0x3b, 0x6d, 0x61, 0x72, 0x3b, 0x61, 0x70, 0x72, 0x3b, 0x6d,
+0x61, 0x6a, 0x3b, 0x6a, 0x75, 0x6e, 0x3b, 0x6a, 0x75, 0x6c, 0x3b, 0x61, 0x75, 0x67, 0x3b, 0x73, 0x65, 0x70, 0x3b, 0x6f,
+0x6b, 0x74, 0x3b, 0x6e, 0x6f, 0x76, 0x3b, 0x64, 0x65, 0x63, 0x458, 0x430, 0x43d, 0x443, 0x430, 0x440, 0x3b, 0x444, 0x435, 0x431,
+0x440, 0x443, 0x430, 0x440, 0x3b, 0x43c, 0x430, 0x440, 0x442, 0x3b, 0x430, 0x43f, 0x440, 0x438, 0x43b, 0x3b, 0x43c, 0x430, 0x458, 0x3b,
+0x458, 0x443, 0x43d, 0x438, 0x3b, 0x458, 0x443, 0x43b, 0x438, 0x3b, 0x430, 0x443, 0x433, 0x443, 0x441, 0x442, 0x3b, 0x441, 0x435, 0x43f,
+0x442, 0x435, 0x43c, 0x431, 0x430, 0x440, 0x3b, 0x43e, 0x43a, 0x442, 0x43e, 0x431, 0x430, 0x440, 0x3b, 0x43d, 0x43e, 0x432, 0x435, 0x43c,
+0x431, 0x430, 0x440, 0x3b, 0x434, 0x435, 0x446, 0x435, 0x43c, 0x431, 0x430, 0x440, 0x458, 0x430, 0x43d, 0x3b, 0x444, 0x435, 0x431, 0x3b,
+0x43c, 0x430, 0x440, 0x3b, 0x430, 0x43f, 0x440, 0x3b, 0x43c, 0x430, 0x458, 0x3b, 0x458, 0x443, 0x43d, 0x3b, 0x458, 0x443, 0x43b, 0x3b,
+0x430, 0x443, 0x433, 0x3b, 0x441, 0x435, 0x43f, 0x3b, 0x43e, 0x43a, 0x442, 0x3b, 0x43d, 0x43e, 0x432, 0x3b, 0x434, 0x435, 0x446, 0x4a,
+0x65, 0x72, 0x72, 0x65, 0x79, 0x2d, 0x67, 0x65, 0x75, 0x72, 0x65, 0x65, 0x3b, 0x54, 0x6f, 0x73, 0x68, 0x69, 0x61, 0x67,
+0x68, 0x74, 0x2d, 0x61, 0x72, 0x72, 0x65, 0x65, 0x3b, 0x4d, 0x61, 0x79, 0x72, 0x6e, 0x74, 0x3b, 0x41, 0x76, 0x65, 0x72,
+0x69, 0x6c, 0x3b, 0x42, 0x6f, 0x61, 0x6c, 0x64, 0x79, 0x6e, 0x3b, 0x4d, 0x65, 0x61, 0x6e, 0x2d, 0x73, 0x6f, 0x75, 0x72,
+0x65, 0x65, 0x3b, 0x4a, 0x65, 0x72, 0x72, 0x65, 0x79, 0x2d, 0x73, 0x6f, 0x75, 0x72, 0x65, 0x65, 0x3b, 0x4c, 0x75, 0x61,
+0x6e, 0x69, 0x73, 0x74, 0x79, 0x6e, 0x3b, 0x4d, 0x65, 0x61, 0x6e, 0x2d, 0x66, 0x6f, 0x75, 0x79, 0x69, 0x72, 0x3b, 0x4a,
+0x65, 0x72, 0x72, 0x65, 0x79, 0x2d, 0x66, 0x6f, 0x75, 0x79, 0x69, 0x72, 0x3b, 0x4d, 0x65, 0x65, 0x20, 0x48, 0x6f, 0x75,
+0x6e, 0x65, 0x79, 0x3b, 0x4d, 0x65, 0x65, 0x20, 0x6e, 0x79, 0x20, 0x4e, 0x6f, 0x6c, 0x6c, 0x69, 0x63, 0x6b, 0x4a, 0x2d,
+0x67, 0x75, 0x65, 0x72, 0x3b, 0x54, 0x2d, 0x61, 0x72, 0x72, 0x65, 0x65, 0x3b, 0x4d, 0x61, 0x79, 0x72, 0x6e, 0x74, 0x3b,
+0x41, 0x76, 0x72, 0x72, 0x69, 0x6c, 0x3b, 0x42, 0x6f, 0x61, 0x6c, 0x64, 0x79, 0x6e, 0x3b, 0x4d, 0x2d, 0x73, 0x6f, 0x75,
+0x72, 0x65, 0x65, 0x3b, 0x4a, 0x2d, 0x73, 0x6f, 0x75, 0x72, 0x65, 0x65, 0x3b, 0x4c, 0x75, 0x61, 0x6e, 0x69, 0x73, 0x74,
+0x79, 0x6e, 0x3b, 0x4d, 0x2d, 0x66, 0x6f, 0x75, 0x79, 0x69, 0x72, 0x3b, 0x4a, 0x2d, 0x66, 0x6f, 0x75, 0x79, 0x69, 0x72,
+0x3b, 0x4d, 0x2d, 0x48, 0x6f, 0x75, 0x6e, 0x65, 0x79, 0x3b, 0x4d, 0x2d, 0x4e, 0x6f, 0x6c, 0x6c, 0x69, 0x63, 0x6b, 0x6d,
+0x69, 0x73, 0x20, 0x47, 0x65, 0x6e, 0x76, 0x65, 0x72, 0x3b, 0x6d, 0x69, 0x73, 0x20, 0x48, 0x77, 0x65, 0x76, 0x72, 0x65,
+0x72, 0x3b, 0x6d, 0x69, 0x73, 0x20, 0x4d, 0x65, 0x75, 0x72, 0x74, 0x68, 0x3b, 0x6d, 0x69, 0x73, 0x20, 0x45, 0x62, 0x72,
+0x65, 0x6c, 0x3b, 0x6d, 0x69, 0x73, 0x20, 0x4d, 0x65, 0x3b, 0x6d, 0x69, 0x73, 0x20, 0x4d, 0x65, 0x74, 0x68, 0x65, 0x76,
+0x65, 0x6e, 0x3b, 0x6d, 0x69, 0x73, 0x20, 0x47, 0x6f, 0x72, 0x74, 0x68, 0x65, 0x72, 0x65, 0x6e, 0x3b, 0x6d, 0x69, 0x73,
+0x20, 0x45, 0x73, 0x74, 0x3b, 0x6d, 0x69, 0x73, 0x20, 0x47, 0x77, 0x79, 0x6e, 0x6e, 0x67, 0x61, 0x6c, 0x61, 0x3b, 0x6d,
+0x69, 0x73, 0x20, 0x48, 0x65, 0x64, 0x72, 0x61, 0x3b, 0x6d, 0x69, 0x73, 0x20, 0x44, 0x75, 0x3b, 0x6d, 0x69, 0x73, 0x20,
+0x4b, 0x65, 0x76, 0x61, 0x72, 0x64, 0x68, 0x75, 0x47, 0x65, 0x6e, 0x3b, 0x48, 0x77, 0x65, 0x3b, 0x4d, 0x65, 0x75, 0x3b,
+0x45, 0x62, 0x72, 0x3b, 0x4d, 0x65, 0x3b, 0x4d, 0x65, 0x74, 0x3b, 0x47, 0x6f, 0x72, 0x3b, 0x45, 0x73, 0x74, 0x3b, 0x47,
+0x77, 0x6e, 0x3b, 0x48, 0x65, 0x64, 0x3b, 0x44, 0x75, 0x3b, 0x4b, 0x65, 0x76, 0x53, 0x61, 0x6e, 0x64, 0x61, 0x2d, 0x186,
+0x70, 0x25b, 0x70, 0x254, 0x6e, 0x3b, 0x4b, 0x77, 0x61, 0x6b, 0x77, 0x61, 0x72, 0x2d, 0x186, 0x67, 0x79, 0x65, 0x66, 0x75,
+0x6f, 0x3b, 0x45, 0x62, 0x254, 0x77, 0x2d, 0x186, 0x62, 0x65, 0x6e, 0x65, 0x6d, 0x3b, 0x45, 0x62, 0x254, 0x62, 0x69, 0x72,
+0x61, 0x2d, 0x4f, 0x66, 0x6f, 0x72, 0x69, 0x73, 0x75, 0x6f, 0x3b, 0x45, 0x73, 0x75, 0x73, 0x6f, 0x77, 0x20, 0x41, 0x6b,
+0x65, 0x74, 0x73, 0x65, 0x61, 0x62, 0x61, 0x2d, 0x4b, 0x254, 0x74, 0x254, 0x6e, 0x69, 0x6d, 0x62, 0x61, 0x3b, 0x4f, 0x62,
+0x69, 0x72, 0x61, 0x64, 0x65, 0x2d, 0x41, 0x79, 0x25b, 0x77, 0x6f, 0x68, 0x6f, 0x6d, 0x75, 0x6d, 0x75, 0x3b, 0x41, 0x79,
+0x25b, 0x77, 0x6f, 0x68, 0x6f, 0x2d, 0x4b, 0x69, 0x74, 0x61, 0x77, 0x6f, 0x6e, 0x73, 0x61, 0x3b, 0x44, 0x69, 0x66, 0x75,
+0x75, 0x2d, 0x186, 0x73, 0x61, 0x6e, 0x64, 0x61, 0x61, 0x3b, 0x46, 0x61, 0x6e, 0x6b, 0x77, 0x61, 0x2d, 0x190, 0x62, 0x254,
+0x3b, 0x186, 0x62, 0x25b, 0x73, 0x25b, 0x2d, 0x41, 0x68, 0x69, 0x6e, 0x69, 0x6d, 0x65, 0x3b, 0x186, 0x62, 0x65, 0x72, 0x25b,
+0x66, 0x25b, 0x77, 0x2d, 0x4f, 0x62, 0x75, 0x62, 0x75, 0x6f, 0x3b, 0x4d, 0x75, 0x6d, 0x75, 0x2d, 0x186, 0x70, 0x25b, 0x6e,
+0x69, 0x6d, 0x62, 0x61, 0x53, 0x2d, 0x186, 0x3b, 0x4b, 0x2d, 0x186, 0x3b, 0x45, 0x2d, 0x186, 0x3b, 0x45, 0x2d, 0x4f, 0x3b,
+0x45, 0x2d, 0x4b, 0x3b, 0x4f, 0x2d, 0x41, 0x3b, 0x41, 0x2d, 0x4b, 0x3b, 0x44, 0x2d, 0x186, 0x3b, 0x46, 0x2d, 0x190, 0x3b,
+0x186, 0x2d, 0x41, 0x3b, 0x186, 0x2d, 0x4f, 0x3b, 0x4d, 0x2d, 0x186, 0x91c, 0x93e, 0x928, 0x947, 0x935, 0x93e, 0x930, 0x940, 0x3b,
+0x92b, 0x947, 0x92c, 0x94d, 0x930, 0x941, 0x935, 0x93e, 0x930, 0x940, 0x3b, 0x92e, 0x93e, 0x930, 0x94d, 0x91a, 0x3b, 0x90f, 0x92a, 0x94d,
+0x930, 0x93f, 0x932, 0x3b, 0x92e, 0x947, 0x3b, 0x91c, 0x942, 0x928, 0x3b, 0x91c, 0x941, 0x932, 0x93e, 0x92f, 0x3b, 0x906, 0x917, 0x94b,
+0x938, 0x94d, 0x924, 0x3b, 0x938, 0x92a, 0x94d, 0x91f, 0x947, 0x902, 0x92c, 0x930, 0x3b, 0x911, 0x915, 0x94d, 0x91f, 0x94b, 0x92c, 0x930,
+0x3b, 0x928, 0x94b, 0x935, 0x94d, 0x939, 0x947, 0x902, 0x92c, 0x930, 0x3b, 0x921, 0x93f, 0x938, 0x947, 0x902, 0x92c, 0x930, 0x4a, 0x65,
+0x6e, 0x1ee5, 0x77, 0x61, 0x72, 0x1ecb, 0x3b, 0x46, 0x65, 0x62, 0x72, 0x1ee5, 0x77, 0x61, 0x72, 0x1ecb, 0x3b, 0x4d, 0x61, 0x61,
+0x63, 0x68, 0x1ecb, 0x3b, 0x45, 0x70, 0x72, 0x65, 0x65, 0x6c, 0x3b, 0x4d, 0x65, 0x65, 0x3b, 0x4a, 0x75, 0x75, 0x6e, 0x3b,
+0x4a, 0x75, 0x6c, 0x61, 0x1ecb, 0x3b, 0x1ecc, 0x67, 0x1ecd, 0x1ecd, 0x73, 0x74, 0x3b, 0x53, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62,
+0x61, 0x3b, 0x1ecc, 0x6b, 0x74, 0x6f, 0x62, 0x61, 0x3b, 0x4e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x44, 0x69, 0x73,
+0x65, 0x6d, 0x62, 0x61, 0x4a, 0x65, 0x6e, 0x3b, 0x46, 0x65, 0x62, 0x3b, 0x4d, 0x61, 0x61, 0x3b, 0x45, 0x70, 0x72, 0x3b,
+0x4d, 0x65, 0x65, 0x3b, 0x4a, 0x75, 0x75, 0x3b, 0x4a, 0x75, 0x6c, 0x3b, 0x1ecc, 0x67, 0x1ecd, 0x3b, 0x53, 0x65, 0x70, 0x3b,
+0x1ecc, 0x6b, 0x74, 0x3b, 0x4e, 0x6f, 0x76, 0x3b, 0x44, 0x69, 0x73, 0x4a, 0x3b, 0x46, 0x3b, 0x4d, 0x3b, 0x45, 0x3b, 0x4d,
+0x3b, 0x4a, 0x3b, 0x4a, 0x3b, 0x1ecc, 0x3b, 0x53, 0x3b, 0x1ecc, 0x3b, 0x4e, 0x3b, 0x44, 0x4d, 0x77, 0x61, 0x69, 0x20, 0x77,
+0x61, 0x20, 0x6d, 0x62, 0x65, 0x65, 0x3b, 0x4d, 0x77, 0x61, 0x69, 0x20, 0x77, 0x61, 0x20, 0x6b, 0x65, 0x6c, 0x129, 0x3b,
+0x4d, 0x77, 0x61, 0x69, 0x20, 0x77, 0x61, 0x20, 0x6b, 0x61, 0x74, 0x61, 0x74, 0x169, 0x3b, 0x4d, 0x77, 0x61, 0x69, 0x20,
+0x77, 0x61, 0x20, 0x6b, 0x61, 0x6e, 0x61, 0x3b, 0x4d, 0x77, 0x61, 0x69, 0x20, 0x77, 0x61, 0x20, 0x6b, 0x61, 0x74, 0x61,
+0x6e, 0x6f, 0x3b, 0x4d, 0x77, 0x61, 0x69, 0x20, 0x77, 0x61, 0x20, 0x74, 0x68, 0x61, 0x6e, 0x74, 0x68, 0x61, 0x74, 0x169,
+0x3b, 0x4d, 0x77, 0x61, 0x69, 0x20, 0x77, 0x61, 0x20, 0x6d, 0x75, 0x6f, 0x6e, 0x7a, 0x61, 0x3b, 0x4d, 0x77, 0x61, 0x69,
+0x20, 0x77, 0x61, 0x20, 0x6e, 0x79, 0x61, 0x61, 0x6e, 0x79, 0x61, 0x3b, 0x4d, 0x77, 0x61, 0x69, 0x20, 0x77, 0x61, 0x20,
+0x6b, 0x65, 0x6e, 0x64, 0x61, 0x3b, 0x4d, 0x77, 0x61, 0x69, 0x20, 0x77, 0x61, 0x20, 0x129, 0x6b, 0x75, 0x6d, 0x69, 0x3b,
+0x4d, 0x77, 0x61, 0x69, 0x20, 0x77, 0x61, 0x20, 0x129, 0x6b, 0x75, 0x6d, 0x69, 0x20, 0x6e, 0x61, 0x20, 0x129, 0x6d, 0x77,
+0x65, 0x3b, 0x4d, 0x77, 0x61, 0x69, 0x20, 0x77, 0x61, 0x20, 0x129, 0x6b, 0x75, 0x6d, 0x69, 0x20, 0x6e, 0x61, 0x20, 0x69,
+0x6c, 0x129, 0x4d, 0x62, 0x65, 0x3b, 0x4b, 0x65, 0x6c, 0x3b, 0x4b, 0x74, 0x169, 0x3b, 0x4b, 0x61, 0x6e, 0x3b, 0x4b, 0x74,
+0x6e, 0x3b, 0x54, 0x68, 0x61, 0x3b, 0x4d, 0x6f, 0x6f, 0x3b, 0x4e, 0x79, 0x61, 0x3b, 0x4b, 0x6e, 0x64, 0x3b, 0x128, 0x6b,
+0x75, 0x3b, 0x128, 0x6b, 0x6d, 0x3b, 0x128, 0x6b, 0x6c, 0x4d, 0x3b, 0x4b, 0x3b, 0x4b, 0x3b, 0x4b, 0x3b, 0x4b, 0x3b, 0x54,
+0x3b, 0x4d, 0x3b, 0x4e, 0x3b, 0x4b, 0x3b, 0x128, 0x3b, 0x128, 0x3b, 0x128, 0x5a, 0x65, 0x6e, 0xe2, 0x72, 0x3b, 0x46, 0x65,
+0x76, 0x72, 0xe2, 0x72, 0x3b, 0x4d, 0x61, 0x72, 0xe7, 0x3b, 0x41, 0x76, 0x72, 0xee, 0x6c, 0x3b, 0x4d, 0x61, 0x69, 0x3b,
+0x4a, 0x75, 0x67, 0x6e, 0x3b, 0x4c, 0x75, 0x69, 0x3b, 0x41, 0x76, 0x6f, 0x73, 0x74, 0x3b, 0x53, 0x65, 0x74, 0x65, 0x6d,
+0x62, 0x61, 0x72, 0x3b, 0x4f, 0x74, 0x75, 0x62, 0x61, 0x72, 0x3b, 0x4e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x61, 0x72, 0x3b,
+0x44, 0x69, 0x63, 0x65, 0x6d, 0x62, 0x61, 0x72, 0x5a, 0x65, 0x6e, 0x3b, 0x46, 0x65, 0x76, 0x3b, 0x4d, 0x61, 0x72, 0x3b,
+0x41, 0x76, 0x72, 0x3b, 0x4d, 0x61, 0x69, 0x3b, 0x4a, 0x75, 0x67, 0x3b, 0x4c, 0x75, 0x69, 0x3b, 0x41, 0x76, 0x6f, 0x3b,
+0x53, 0x65, 0x74, 0x3b, 0x4f, 0x74, 0x75, 0x3b, 0x4e, 0x6f, 0x76, 0x3b, 0x44, 0x69, 0x63, 0x5a, 0x3b, 0x46, 0x3b, 0x4d,
+0x3b, 0x41, 0x3b, 0x4d, 0x3b, 0x4a, 0x3b, 0x4c, 0x3b, 0x41, 0x3b, 0x53, 0x3b, 0x4f, 0x3b, 0x4e, 0x3b, 0x44, 0x64, 0x7a,
+0x6f, 0x76, 0x65, 0x3b, 0x64, 0x7a, 0x6f, 0x64, 0x7a, 0x65, 0x3b, 0x74, 0x65, 0x64, 0x6f, 0x78, 0x65, 0x3b, 0x61, 0x66,
+0x254, 0x66, 0x129, 0x65, 0x3b, 0x64, 0x61, 0x6d, 0x61, 0x3b, 0x6d, 0x61, 0x73, 0x61, 0x3b, 0x73, 0x69, 0x61, 0x6d, 0x6c,
+0x254, 0x6d, 0x3b, 0x64, 0x65, 0x61, 0x73, 0x69, 0x61, 0x6d, 0x69, 0x6d, 0x65, 0x3b, 0x61, 0x6e, 0x79, 0x254, 0x6e, 0x79,
+0x254, 0x3b, 0x6b, 0x65, 0x6c, 0x65, 0x3b, 0x61, 0x64, 0x65, 0x25b, 0x6d, 0x65, 0x6b, 0x70, 0x254, 0x78, 0x65, 0x3b, 0x64,
+0x7a, 0x6f, 0x6d, 0x65, 0x64, 0x7a, 0x76, 0x3b, 0x64, 0x7a, 0x64, 0x3b, 0x74, 0x65, 0x64, 0x3b, 0x61, 0x66, 0x254, 0x3b,
+0x64, 0x61, 0x6d, 0x3b, 0x6d, 0x61, 0x73, 0x3b, 0x73, 0x69, 0x61, 0x3b, 0x64, 0x65, 0x61, 0x3b, 0x61, 0x6e, 0x79, 0x3b,
+0x6b, 0x65, 0x6c, 0x3b, 0x61, 0x64, 0x65, 0x3b, 0x64, 0x7a, 0x6d, 0x64, 0x3b, 0x64, 0x3b, 0x74, 0x3b, 0x61, 0x3b, 0x64,
+0x3b, 0x6d, 0x3b, 0x73, 0x3b, 0x64, 0x3b, 0x61, 0x3b, 0x6b, 0x3b, 0x61, 0x3b, 0x64, 0x49, 0x61, 0x6e, 0x75, 0x61, 0x6c,
+0x69, 0x3b, 0x50, 0x65, 0x70, 0x65, 0x6c, 0x75, 0x61, 0x6c, 0x69, 0x3b, 0x4d, 0x61, 0x6c, 0x61, 0x6b, 0x69, 0x3b, 0x2bb,
+0x41, 0x70, 0x65, 0x6c, 0x69, 0x6c, 0x61, 0x3b, 0x4d, 0x65, 0x69, 0x3b, 0x49, 0x75, 0x6e, 0x65, 0x3b, 0x49, 0x75, 0x6c,
+0x61, 0x69, 0x3b, 0x2bb, 0x41, 0x75, 0x6b, 0x61, 0x6b, 0x65, 0x3b, 0x4b, 0x65, 0x70, 0x61, 0x6b, 0x65, 0x6d, 0x61, 0x70,
+0x61, 0x3b, 0x2bb, 0x4f, 0x6b, 0x61, 0x6b, 0x6f, 0x70, 0x61, 0x3b, 0x4e, 0x6f, 0x77, 0x65, 0x6d, 0x61, 0x70, 0x61, 0x3b,
+0x4b, 0x65, 0x6b, 0x65, 0x6d, 0x61, 0x70, 0x61, 0x49, 0x61, 0x6e, 0x2e, 0x3b, 0x50, 0x65, 0x70, 0x2e, 0x3b, 0x4d, 0x61,
+0x6c, 0x2e, 0x3b, 0x2bb, 0x41, 0x70, 0x2e, 0x3b, 0x4d, 0x65, 0x69, 0x3b, 0x49, 0x75, 0x6e, 0x2e, 0x3b, 0x49, 0x75, 0x6c,
+0x2e, 0x3b, 0x2bb, 0x41, 0x75, 0x2e, 0x3b, 0x4b, 0x65, 0x70, 0x2e, 0x3b, 0x2bb, 0x4f, 0x6b, 0x2e, 0x3b, 0x4e, 0x6f, 0x77,
+0x2e, 0x3b, 0x4b, 0x65, 0x6b, 0x2e, 0x45, 0x6e, 0x65, 0x72, 0x6f, 0x3b, 0x50, 0x65, 0x62, 0x72, 0x65, 0x72, 0x6f, 0x3b,
+0x4d, 0x61, 0x72, 0x73, 0x6f, 0x3b, 0x41, 0x62, 0x72, 0x69, 0x6c, 0x3b, 0x4d, 0x61, 0x79, 0x6f, 0x3b, 0x48, 0x75, 0x6e,
+0x79, 0x6f, 0x3b, 0x48, 0x75, 0x6c, 0x79, 0x6f, 0x3b, 0x41, 0x67, 0x6f, 0x73, 0x74, 0x6f, 0x3b, 0x53, 0x65, 0x74, 0x79,
+0x65, 0x6d, 0x62, 0x72, 0x65, 0x3b, 0x4f, 0x6b, 0x74, 0x75, 0x62, 0x72, 0x65, 0x3b, 0x4e, 0x6f, 0x62, 0x79, 0x65, 0x6d,
+0x62, 0x72, 0x65, 0x3b, 0x44, 0x69, 0x73, 0x79, 0x65, 0x6d, 0x62, 0x72, 0x65, 0x45, 0x6e, 0x65, 0x3b, 0x50, 0x65, 0x62,
+0x3b, 0x4d, 0x61, 0x72, 0x3b, 0x41, 0x62, 0x72, 0x3b, 0x4d, 0x61, 0x79, 0x3b, 0x48, 0x75, 0x6e, 0x3b, 0x48, 0x75, 0x6c,
+0x3b, 0x41, 0x67, 0x6f, 0x3b, 0x53, 0x65, 0x74, 0x3b, 0x4f, 0x6b, 0x74, 0x3b, 0x4e, 0x6f, 0x62, 0x3b, 0x44, 0x69, 0x73,
+0x45, 0x3b, 0x50, 0x3b, 0x4d, 0x3b, 0x41, 0x3b, 0x4d, 0x3b, 0x48, 0x75, 0x6e, 0x3b, 0x48, 0x75, 0x6c, 0x3b, 0x41, 0x67,
+0x6f, 0x3b, 0x53, 0x65, 0x74, 0x3b, 0x4f, 0x6b, 0x74, 0x3b, 0x4e, 0x6f, 0x62, 0x3b, 0x44, 0x69, 0x73, 0x4a, 0x61, 0x6e,
+0x75, 0x61, 0x72, 0x3b, 0x46, 0x65, 0x62, 0x72, 0x75, 0x61, 0x72, 0x3b, 0x4d, 0xe4, 0x72, 0x7a, 0x3b, 0x41, 0x70, 0x72,
+0x69, 0x6c, 0x3b, 0x4d, 0x61, 0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x69, 0x3b, 0x4a, 0x75, 0x6c, 0x69, 0x3b, 0x41, 0x75, 0x67,
+0x75, 0x73, 0x63, 0x68, 0x74, 0x3b, 0x53, 0x65, 0x70, 0x74, 0xe4, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x4f, 0x6b, 0x74, 0x6f,
+0x6f, 0x62, 0x65, 0x72, 0x3b, 0x4e, 0x6f, 0x76, 0xe4, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x44, 0x65, 0x7a, 0xe4, 0x6d, 0x62,
+0x65, 0x72, 0xa2cd, 0xa1aa, 0x3b, 0xa44d, 0xa1aa, 0x3b, 0xa315, 0xa1aa, 0x3b, 0xa1d6, 0xa1aa, 0x3b, 0xa26c, 0xa1aa, 0x3b, 0xa0d8, 0xa1aa, 0x3b,
+0xa3c3, 0xa1aa, 0x3b, 0xa246, 0xa1aa, 0x3b, 0xa22c, 0xa1aa, 0x3b, 0xa2b0, 0xa1aa, 0x3b, 0xa2b0, 0xa2aa, 0xa1aa, 0x3b, 0xa2b0, 0xa44b, 0xa1aa, 0x4a,
+0x61, 0x6e, 0x75, 0x61, 0x61, 0x72, 0x3b, 0x46, 0x65, 0x62, 0x72, 0x75, 0x61, 0x61, 0x72, 0x3b, 0x4d, 0xe4, 0x72, 0x7a,
+0x3b, 0x41, 0x70, 0x72, 0x69, 0x6c, 0x3b, 0x4d, 0x61, 0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x69, 0x3b, 0x4a, 0x75, 0x6c, 0x69,
+0x3b, 0x41, 0x75, 0x67, 0x75, 0x73, 0x74, 0x3b, 0x53, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x4f, 0x6b,
+0x74, 0x6f, 0x76, 0x65, 0x72, 0x3b, 0x4e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x44, 0x65, 0x7a, 0x65, 0x6d,
+0x62, 0x65, 0x72, 0x4a, 0x61, 0x6e, 0x2e, 0x3b, 0x46, 0x65, 0x62, 0x2e, 0x3b, 0x4d, 0xe4, 0x72, 0x7a, 0x3b, 0x41, 0x70,
+0x72, 0x2e, 0x3b, 0x4d, 0x61, 0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x69, 0x3b, 0x4a, 0x75, 0x6c, 0x69, 0x3b, 0x41, 0x75, 0x67,
+0x2e, 0x3b, 0x53, 0x65, 0x70, 0x2e, 0x3b, 0x4f, 0x6b, 0x74, 0x2e, 0x3b, 0x4e, 0x6f, 0x76, 0x2e, 0x3b, 0x44, 0x65, 0x7a,
+0x2e, 0x6f, 0x111, 0x111, 0x61, 0x6a, 0x61, 0x67, 0x65, 0x6d, 0xe1, 0x6e, 0x6e, 0x75, 0x3b, 0x67, 0x75, 0x6f, 0x76, 0x76,
+0x61, 0x6d, 0xe1, 0x6e, 0x6e, 0x75, 0x3b, 0x6e, 0x6a, 0x75, 0x6b, 0x10d, 0x61, 0x6d, 0xe1, 0x6e, 0x6e, 0x75, 0x3b, 0x63,
+0x75, 0x6f, 0x14b, 0x6f, 0x6d, 0xe1, 0x6e, 0x6e, 0x75, 0x3b, 0x6d, 0x69, 0x65, 0x73, 0x73, 0x65, 0x6d, 0xe1, 0x6e, 0x6e,
+0x75, 0x3b, 0x67, 0x65, 0x61, 0x73, 0x73, 0x65, 0x6d, 0xe1, 0x6e, 0x6e, 0x75, 0x3b, 0x73, 0x75, 0x6f, 0x69, 0x64, 0x6e,
+0x65, 0x6d, 0xe1, 0x6e, 0x6e, 0x75, 0x3b, 0x62, 0x6f, 0x72, 0x67, 0x65, 0x6d, 0xe1, 0x6e, 0x6e, 0x75, 0x3b, 0x10d, 0x61,
+0x6b, 0x10d, 0x61, 0x6d, 0xe1, 0x6e, 0x6e, 0x75, 0x3b, 0x67, 0x6f, 0x6c, 0x67, 0x67, 0x6f, 0x74, 0x6d, 0xe1, 0x6e, 0x6e,
+0x75, 0x3b, 0x73, 0x6b, 0xe1, 0x62, 0x6d, 0x61, 0x6d, 0xe1, 0x6e, 0x6e, 0x75, 0x3b, 0x6a, 0x75, 0x6f, 0x76, 0x6c, 0x61,
+0x6d, 0xe1, 0x6e, 0x6e, 0x75, 0x6f, 0x111, 0x111, 0x6a, 0x3b, 0x67, 0x75, 0x6f, 0x76, 0x3b, 0x6e, 0x6a, 0x75, 0x6b, 0x3b,
+0x63, 0x75, 0x6f, 0x3b, 0x6d, 0x69, 0x65, 0x73, 0x3b, 0x67, 0x65, 0x61, 0x73, 0x3b, 0x73, 0x75, 0x6f, 0x69, 0x3b, 0x62,
+0x6f, 0x72, 0x67, 0x3b, 0x10d, 0x61, 0x6b, 0x10d, 0x3b, 0x67, 0x6f, 0x6c, 0x67, 0x3b, 0x73, 0x6b, 0xe1, 0x62, 0x3b, 0x6a,
+0x75, 0x6f, 0x76, 0x4f, 0x3b, 0x47, 0x3b, 0x4e, 0x3b, 0x43, 0x3b, 0x4d, 0x3b, 0x47, 0x3b, 0x53, 0x3b, 0x42, 0x3b, 0x10c,
+0x3b, 0x47, 0x3b, 0x53, 0x3b, 0x4a, 0x6f, 0x111, 0x111, 0x6a, 0x3b, 0x67, 0x75, 0x6f, 0x76, 0x3b, 0x6e, 0x6a, 0x75, 0x6b,
 0x3b, 0x63, 0x75, 0x6f, 0x14b, 0x3b, 0x6d, 0x69, 0x65, 0x73, 0x3b, 0x67, 0x65, 0x61, 0x73, 0x3b, 0x73, 0x75, 0x6f, 0x69,
 0x3b, 0x62, 0x6f, 0x72, 0x67, 0x3b, 0x10d, 0x61, 0x6b, 0x10d, 0x3b, 0x67, 0x6f, 0x6c, 0x67, 0x3b, 0x73, 0x6b, 0xe1, 0x62,
-0x3b, 0x6a, 0x75, 0x6f, 0x76, 0x3b, 0x43, 0x61, 0x6e, 0x3b, 0x46, 0x65, 0x62, 0x3b, 0x4d, 0x61, 0x63, 0x3b, 0x41, 0x70,
-0x72, 0x3b, 0x4d, 0x65, 0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x3b, 0x43, 0x75, 0x6c, 0x3b, 0x41, 0x67, 0x74, 0x3b, 0x53, 0x65,
-0x70, 0x3b, 0x4f, 0x6b, 0x74, 0x3b, 0x4e, 0x6f, 0x62, 0x3b, 0x44, 0x69, 0x73, 0x3b, 0x43, 0x68, 0x61, 0x6e, 0x75, 0x61,
-0x72, 0x69, 0x3b, 0x46, 0x65, 0x62, 0x75, 0x72, 0x61, 0x72, 0x69, 0x3b, 0x4d, 0x61, 0x63, 0x68, 0x69, 0x3b, 0x41, 0x70,
-0x69, 0x72, 0x69, 0x72, 0x69, 0x3b, 0x4d, 0x65, 0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x69, 0x3b, 0x43, 0x68, 0x75, 0x6c, 0x61,
-0x69, 0x3b, 0x41, 0x67, 0x6f, 0x73, 0x74, 0x69, 0x3b, 0x53, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x4f, 0x6b,
-0x69, 0x74, 0x6f, 0x62, 0x61, 0x3b, 0x4e, 0x6f, 0x62, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x44, 0x69, 0x73, 0x65, 0x6d, 0x62,
-0x61, 0x3b, 0x43, 0x3b, 0x46, 0x3b, 0x4d, 0x3b, 0x41, 0x3b, 0x4d, 0x3b, 0x4a, 0x3b, 0x43, 0x3b, 0x41, 0x3b, 0x53, 0x3b,
-0x4f, 0x3b, 0x4e, 0x3b, 0x44, 0x3b, 0x49, 0x6d, 0x62, 0x3b, 0x4b, 0x61, 0x77, 0x3b, 0x4b, 0x61, 0x64, 0x3b, 0x4b, 0x61,
-0x6e, 0x3b, 0x4b, 0x61, 0x73, 0x3b, 0x4b, 0x61, 0x72, 0x3b, 0x4d, 0x66, 0x75, 0x3b, 0x57, 0x75, 0x6e, 0x3b, 0x49, 0x6b,
-0x65, 0x3b, 0x49, 0x6b, 0x75, 0x3b, 0x49, 0x6d, 0x77, 0x3b, 0x49, 0x77, 0x69, 0x3b, 0x4d, 0x6f, 0x72, 0x69, 0x20, 0x67,
-0x68, 0x77, 0x61, 0x20, 0x69, 0x6d, 0x62, 0x69, 0x72, 0x69, 0x3b, 0x4d, 0x6f, 0x72, 0x69, 0x20, 0x67, 0x68, 0x77, 0x61,
-0x20, 0x6b, 0x61, 0x77, 0x69, 0x3b, 0x4d, 0x6f, 0x72, 0x69, 0x20, 0x67, 0x68, 0x77, 0x61, 0x20, 0x6b, 0x61, 0x64, 0x61,
-0x64, 0x75, 0x3b, 0x4d, 0x6f, 0x72, 0x69, 0x20, 0x67, 0x68, 0x77, 0x61, 0x20, 0x6b, 0x61, 0x6e, 0x61, 0x3b, 0x4d, 0x6f,
-0x72, 0x69, 0x20, 0x67, 0x68, 0x77, 0x61, 0x20, 0x6b, 0x61, 0x73, 0x61, 0x6e, 0x75, 0x3b, 0x4d, 0x6f, 0x72, 0x69, 0x20,
-0x67, 0x68, 0x77, 0x61, 0x20, 0x6b, 0x61, 0x72, 0x61, 0x6e, 0x64, 0x61, 0x64, 0x75, 0x3b, 0x4d, 0x6f, 0x72, 0x69, 0x20,
-0x67, 0x68, 0x77, 0x61, 0x20, 0x6d, 0x66, 0x75, 0x6e, 0x67, 0x61, 0x64, 0x65, 0x3b, 0x4d, 0x6f, 0x72, 0x69, 0x20, 0x67,
-0x68, 0x77, 0x61, 0x20, 0x77, 0x75, 0x6e, 0x79, 0x61, 0x6e, 0x79, 0x61, 0x3b, 0x4d, 0x6f, 0x72, 0x69, 0x20, 0x67, 0x68,
-0x77, 0x61, 0x20, 0x69, 0x6b, 0x65, 0x6e, 0x64, 0x61, 0x3b, 0x4d, 0x6f, 0x72, 0x69, 0x20, 0x67, 0x68, 0x77, 0x61, 0x20,
-0x69, 0x6b, 0x75, 0x6d, 0x69, 0x3b, 0x4d, 0x6f, 0x72, 0x69, 0x20, 0x67, 0x68, 0x77, 0x61, 0x20, 0x69, 0x6b, 0x75, 0x6d,
-0x69, 0x20, 0x6e, 0x61, 0x20, 0x69, 0x6d, 0x77, 0x65, 0x72, 0x69, 0x3b, 0x4d, 0x6f, 0x72, 0x69, 0x20, 0x67, 0x68, 0x77,
-0x61, 0x20, 0x69, 0x6b, 0x75, 0x6d, 0x69, 0x20, 0x6e, 0x61, 0x20, 0x69, 0x77, 0x69, 0x3b, 0x49, 0x3b, 0x4b, 0x3b, 0x4b,
-0x3b, 0x4b, 0x3b, 0x4b, 0x3b, 0x4b, 0x3b, 0x4d, 0x3b, 0x57, 0x3b, 0x49, 0x3b, 0x49, 0x3b, 0x49, 0x3b, 0x49, 0x3b, 0x73,
-0x69, 0x69, 0x3b, 0x63, 0x6f, 0x6c, 0x3b, 0x6d, 0x62, 0x6f, 0x3b, 0x73, 0x65, 0x65, 0x3b, 0x64, 0x75, 0x75, 0x3b, 0x6b,
-0x6f, 0x72, 0x3b, 0x6d, 0x6f, 0x72, 0x3b, 0x6a, 0x75, 0x6b, 0x3b, 0x73, 0x6c, 0x74, 0x3b, 0x79, 0x61, 0x72, 0x3b, 0x6a,
-0x6f, 0x6c, 0x3b, 0x62, 0x6f, 0x77, 0x3b, 0x73, 0x69, 0x69, 0x6c, 0x6f, 0x3b, 0x63, 0x6f, 0x6c, 0x74, 0x65, 0x3b, 0x6d,
-0x62, 0x6f, 0x6f, 0x79, 0x3b, 0x73, 0x65, 0x65, 0x257, 0x74, 0x6f, 0x3b, 0x64, 0x75, 0x75, 0x6a, 0x61, 0x6c, 0x3b, 0x6b,
-0x6f, 0x72, 0x73, 0x65, 0x3b, 0x6d, 0x6f, 0x72, 0x73, 0x6f, 0x3b, 0x6a, 0x75, 0x6b, 0x6f, 0x3b, 0x73, 0x69, 0x69, 0x6c,
-0x74, 0x6f, 0x3b, 0x79, 0x61, 0x72, 0x6b, 0x6f, 0x6d, 0x61, 0x61, 0x3b, 0x6a, 0x6f, 0x6c, 0x61, 0x6c, 0x3b, 0x62, 0x6f,
-0x77, 0x74, 0x65, 0x3b, 0x73, 0x3b, 0x63, 0x3b, 0x6d, 0x3b, 0x73, 0x3b, 0x64, 0x3b, 0x6b, 0x3b, 0x6d, 0x3b, 0x6a, 0x3b,
-0x73, 0x3b, 0x79, 0x3b, 0x6a, 0x3b, 0x62, 0x3b, 0x4a, 0x45, 0x4e, 0x3b, 0x57, 0x4b, 0x52, 0x3b, 0x57, 0x47, 0x54, 0x3b,
-0x57, 0x4b, 0x4e, 0x3b, 0x57, 0x54, 0x4e, 0x3b, 0x57, 0x54, 0x44, 0x3b, 0x57, 0x4d, 0x4a, 0x3b, 0x57, 0x4e, 0x4e, 0x3b,
-0x57, 0x4b, 0x44, 0x3b, 0x57, 0x49, 0x4b, 0x3b, 0x57, 0x4d, 0x57, 0x3b, 0x44, 0x49, 0x54, 0x3b, 0x4e, 0x6a, 0x65, 0x6e,
-0x75, 0x61, 0x72, 0x129, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x65, 0x20, 0x77, 0x61, 0x20, 0x6b, 0x65, 0x72, 0x129, 0x3b, 0x4d,
-0x77, 0x65, 0x72, 0x65, 0x20, 0x77, 0x61, 0x20, 0x67, 0x61, 0x74, 0x61, 0x74, 0x169, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x65,
-0x20, 0x77, 0x61, 0x20, 0x6b, 0x61, 0x6e, 0x61, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x65, 0x20, 0x77, 0x61, 0x20, 0x67, 0x61,
-0x74, 0x61, 0x6e, 0x6f, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x65, 0x20, 0x77, 0x61, 0x20, 0x67, 0x61, 0x74, 0x61, 0x6e, 0x64,
-0x61, 0x74, 0x169, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x65, 0x20, 0x77, 0x61, 0x20, 0x6d, 0x169, 0x67, 0x77, 0x61, 0x6e, 0x6a,
-0x61, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x65, 0x20, 0x77, 0x61, 0x20, 0x6b, 0x61, 0x6e, 0x61, 0x6e, 0x61, 0x3b, 0x4d, 0x77,
-0x65, 0x72, 0x65, 0x20, 0x77, 0x61, 0x20, 0x6b, 0x65, 0x6e, 0x64, 0x61, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x65, 0x20, 0x77,
-0x61, 0x20, 0x69, 0x6b, 0x169, 0x6d, 0x69, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x65, 0x20, 0x77, 0x61, 0x20, 0x69, 0x6b, 0x169,
-0x6d, 0x69, 0x20, 0x6e, 0x61, 0x20, 0x169, 0x6d, 0x77, 0x65, 0x3b, 0x4e, 0x64, 0x69, 0x74, 0x68, 0x65, 0x6d, 0x62, 0x61,
-0x3b, 0x4a, 0x3b, 0x4b, 0x3b, 0x47, 0x3b, 0x4b, 0x3b, 0x47, 0x3b, 0x47, 0x3b, 0x4d, 0x3b, 0x4b, 0x3b, 0x4b, 0x3b, 0x49,
-0x3b, 0x49, 0x3b, 0x44, 0x3b, 0x4f, 0x62, 0x6f, 0x3b, 0x57, 0x61, 0x61, 0x3b, 0x4f, 0x6b, 0x75, 0x3b, 0x4f, 0x6e, 0x67,
-0x3b, 0x49, 0x6d, 0x65, 0x3b, 0x49, 0x6c, 0x65, 0x3b, 0x53, 0x61, 0x70, 0x3b, 0x49, 0x73, 0x69, 0x3b, 0x53, 0x61, 0x61,
-0x3b, 0x54, 0x6f, 0x6d, 0x3b, 0x54, 0x6f, 0x62, 0x3b, 0x54, 0x6f, 0x77, 0x3b, 0x4c, 0x61, 0x70, 0x61, 0x20, 0x6c, 0x65,
-0x20, 0x6f, 0x62, 0x6f, 0x3b, 0x4c, 0x61, 0x70, 0x61, 0x20, 0x6c, 0x65, 0x20, 0x77, 0x61, 0x61, 0x72, 0x65, 0x3b, 0x4c,
-0x61, 0x70, 0x61, 0x20, 0x6c, 0x65, 0x20, 0x6f, 0x6b, 0x75, 0x6e, 0x69, 0x3b, 0x4c, 0x61, 0x70, 0x61, 0x20, 0x6c, 0x65,
-0x20, 0x6f, 0x6e, 0x67, 0x2019, 0x77, 0x61, 0x6e, 0x3b, 0x4c, 0x61, 0x70, 0x61, 0x20, 0x6c, 0x65, 0x20, 0x69, 0x6d, 0x65,
-0x74, 0x3b, 0x4c, 0x61, 0x70, 0x61, 0x20, 0x6c, 0x65, 0x20, 0x69, 0x6c, 0x65, 0x3b, 0x4c, 0x61, 0x70, 0x61, 0x20, 0x6c,
-0x65, 0x20, 0x73, 0x61, 0x70, 0x61, 0x3b, 0x4c, 0x61, 0x70, 0x61, 0x20, 0x6c, 0x65, 0x20, 0x69, 0x73, 0x69, 0x65, 0x74,
-0x3b, 0x4c, 0x61, 0x70, 0x61, 0x20, 0x6c, 0x65, 0x20, 0x73, 0x61, 0x61, 0x6c, 0x3b, 0x4c, 0x61, 0x70, 0x61, 0x20, 0x6c,
-0x65, 0x20, 0x74, 0x6f, 0x6d, 0x6f, 0x6e, 0x3b, 0x4c, 0x61, 0x70, 0x61, 0x20, 0x6c, 0x65, 0x20, 0x74, 0x6f, 0x6d, 0x6f,
-0x6e, 0x20, 0x6f, 0x62, 0x6f, 0x3b, 0x4c, 0x61, 0x70, 0x61, 0x20, 0x6c, 0x65, 0x20, 0x74, 0x6f, 0x6d, 0x6f, 0x6e, 0x20,
-0x77, 0x61, 0x61, 0x72, 0x65, 0x3b, 0x4f, 0x3b, 0x57, 0x3b, 0x4f, 0x3b, 0x4f, 0x3b, 0x49, 0x3b, 0x49, 0x3b, 0x53, 0x3b,
-0x49, 0x3b, 0x53, 0x3b, 0x54, 0x3b, 0x54, 0x3b, 0x54, 0x3b, 0x4a, 0x61, 0x6e, 0x3b, 0x46, 0x65, 0x76, 0x3b, 0x4d, 0x61,
-0x72, 0x3b, 0x41, 0x62, 0x72, 0x3b, 0x4d, 0x61, 0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x3b, 0x4a, 0x75, 0x6c, 0x3b, 0x41, 0x75,
-0x67, 0x3b, 0x53, 0x65, 0x74, 0x3b, 0x4f, 0x74, 0x75, 0x3b, 0x4e, 0x6f, 0x76, 0x3b, 0x44, 0x65, 0x63, 0x3b, 0x4a, 0x61,
-0x6e, 0x65, 0x69, 0x72, 0x6f, 0x3b, 0x46, 0x65, 0x76, 0x72, 0x65, 0x69, 0x72, 0x6f, 0x3b, 0x4d, 0x61, 0x72, 0x63, 0x6f,
-0x3b, 0x41, 0x62, 0x72, 0x69, 0x6c, 0x3b, 0x4d, 0x61, 0x69, 0x6f, 0x3b, 0x4a, 0x75, 0x6e, 0x68, 0x6f, 0x3b, 0x4a, 0x75,
-0x6c, 0x68, 0x6f, 0x3b, 0x41, 0x75, 0x67, 0x75, 0x73, 0x74, 0x6f, 0x3b, 0x53, 0x65, 0x74, 0x65, 0x6d, 0x62, 0x72, 0x6f,
-0x3b, 0x4f, 0x74, 0x75, 0x62, 0x72, 0x6f, 0x3b, 0x4e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x72, 0x6f, 0x3b, 0x44, 0x65, 0x63,
-0x65, 0x6d, 0x62, 0x72, 0x6f, 0x3b, 0x5a, 0x69, 0x62, 0x3b, 0x4e, 0x68, 0x6c, 0x6f, 0x3b, 0x4d, 0x62, 0x69, 0x3b, 0x4d,
-0x61, 0x62, 0x3b, 0x4e, 0x6b, 0x77, 0x3b, 0x4e, 0x68, 0x6c, 0x61, 0x3b, 0x4e, 0x74, 0x75, 0x3b, 0x4e, 0x63, 0x77, 0x3b,
-0x4d, 0x70, 0x61, 0x6e, 0x3b, 0x4d, 0x66, 0x75, 0x3b, 0x4c, 0x77, 0x65, 0x3b, 0x4d, 0x70, 0x61, 0x6c, 0x3b, 0x5a, 0x69,
-0x62, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x6c, 0x61, 0x3b, 0x4e, 0x68, 0x6c, 0x6f, 0x6c, 0x61, 0x6e, 0x6a, 0x61, 0x3b, 0x4d,
-0x62, 0x69, 0x6d, 0x62, 0x69, 0x74, 0x68, 0x6f, 0x3b, 0x4d, 0x61, 0x62, 0x61, 0x73, 0x61, 0x3b, 0x4e, 0x6b, 0x77, 0x65,
-0x6e, 0x6b, 0x77, 0x65, 0x7a, 0x69, 0x3b, 0x4e, 0x68, 0x6c, 0x61, 0x6e, 0x67, 0x75, 0x6c, 0x61, 0x3b, 0x4e, 0x74, 0x75,
-0x6c, 0x69, 0x6b, 0x61, 0x7a, 0x69, 0x3b, 0x4e, 0x63, 0x77, 0x61, 0x62, 0x61, 0x6b, 0x61, 0x7a, 0x69, 0x3b, 0x4d, 0x70,
-0x61, 0x6e, 0x64, 0x75, 0x6c, 0x61, 0x3b, 0x4d, 0x66, 0x75, 0x6d, 0x66, 0x75, 0x3b, 0x4c, 0x77, 0x65, 0x7a, 0x69, 0x3b,
-0x4d, 0x70, 0x61, 0x6c, 0x61, 0x6b, 0x61, 0x7a, 0x69, 0x3b, 0x5a, 0x3b, 0x4e, 0x3b, 0x4d, 0x3b, 0x4d, 0x3b, 0x4e, 0x3b,
-0x4e, 0x3b, 0x4e, 0x3b, 0x4e, 0x3b, 0x4d, 0x3b, 0x4d, 0x3b, 0x4c, 0x3b, 0x4d, 0x3b, 0x4d, 0x31, 0x3b, 0x4d, 0x32, 0x3b,
-0x4d, 0x33, 0x3b, 0x4d, 0x34, 0x3b, 0x4d, 0x35, 0x3b, 0x4d, 0x36, 0x3b, 0x4d, 0x37, 0x3b, 0x4d, 0x38, 0x3b, 0x4d, 0x39,
-0x3b, 0x4d, 0x31, 0x30, 0x3b, 0x4d, 0x31, 0x31, 0x3b, 0x4d, 0x31, 0x32, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x69, 0x20, 0x77,
+0x3b, 0x6a, 0x75, 0x6f, 0x76, 0x43, 0x68, 0x61, 0x6e, 0x75, 0x61, 0x72, 0x69, 0x3b, 0x46, 0x65, 0x62, 0x75, 0x72, 0x61,
+0x72, 0x69, 0x3b, 0x4d, 0x61, 0x63, 0x68, 0x69, 0x3b, 0x41, 0x70, 0x69, 0x72, 0x69, 0x72, 0x69, 0x3b, 0x4d, 0x65, 0x69,
+0x3b, 0x4a, 0x75, 0x6e, 0x69, 0x3b, 0x43, 0x68, 0x75, 0x6c, 0x61, 0x69, 0x3b, 0x41, 0x67, 0x6f, 0x73, 0x74, 0x69, 0x3b,
+0x53, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x4f, 0x6b, 0x69, 0x74, 0x6f, 0x62, 0x61, 0x3b, 0x4e, 0x6f, 0x62,
+0x65, 0x6d, 0x62, 0x61, 0x3b, 0x44, 0x69, 0x73, 0x65, 0x6d, 0x62, 0x61, 0x43, 0x61, 0x6e, 0x3b, 0x46, 0x65, 0x62, 0x3b,
+0x4d, 0x61, 0x63, 0x3b, 0x41, 0x70, 0x72, 0x3b, 0x4d, 0x65, 0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x3b, 0x43, 0x75, 0x6c, 0x3b,
+0x41, 0x67, 0x74, 0x3b, 0x53, 0x65, 0x70, 0x3b, 0x4f, 0x6b, 0x74, 0x3b, 0x4e, 0x6f, 0x62, 0x3b, 0x44, 0x69, 0x73, 0x43,
+0x3b, 0x46, 0x3b, 0x4d, 0x3b, 0x41, 0x3b, 0x4d, 0x3b, 0x4a, 0x3b, 0x43, 0x3b, 0x41, 0x3b, 0x53, 0x3b, 0x4f, 0x3b, 0x4e,
+0x3b, 0x44, 0x4d, 0x6f, 0x72, 0x69, 0x20, 0x67, 0x68, 0x77, 0x61, 0x20, 0x69, 0x6d, 0x62, 0x69, 0x72, 0x69, 0x3b, 0x4d,
+0x6f, 0x72, 0x69, 0x20, 0x67, 0x68, 0x77, 0x61, 0x20, 0x6b, 0x61, 0x77, 0x69, 0x3b, 0x4d, 0x6f, 0x72, 0x69, 0x20, 0x67,
+0x68, 0x77, 0x61, 0x20, 0x6b, 0x61, 0x64, 0x61, 0x64, 0x75, 0x3b, 0x4d, 0x6f, 0x72, 0x69, 0x20, 0x67, 0x68, 0x77, 0x61,
+0x20, 0x6b, 0x61, 0x6e, 0x61, 0x3b, 0x4d, 0x6f, 0x72, 0x69, 0x20, 0x67, 0x68, 0x77, 0x61, 0x20, 0x6b, 0x61, 0x73, 0x61,
+0x6e, 0x75, 0x3b, 0x4d, 0x6f, 0x72, 0x69, 0x20, 0x67, 0x68, 0x77, 0x61, 0x20, 0x6b, 0x61, 0x72, 0x61, 0x6e, 0x64, 0x61,
+0x64, 0x75, 0x3b, 0x4d, 0x6f, 0x72, 0x69, 0x20, 0x67, 0x68, 0x77, 0x61, 0x20, 0x6d, 0x66, 0x75, 0x6e, 0x67, 0x61, 0x64,
+0x65, 0x3b, 0x4d, 0x6f, 0x72, 0x69, 0x20, 0x67, 0x68, 0x77, 0x61, 0x20, 0x77, 0x75, 0x6e, 0x79, 0x61, 0x6e, 0x79, 0x61,
+0x3b, 0x4d, 0x6f, 0x72, 0x69, 0x20, 0x67, 0x68, 0x77, 0x61, 0x20, 0x69, 0x6b, 0x65, 0x6e, 0x64, 0x61, 0x3b, 0x4d, 0x6f,
+0x72, 0x69, 0x20, 0x67, 0x68, 0x77, 0x61, 0x20, 0x69, 0x6b, 0x75, 0x6d, 0x69, 0x3b, 0x4d, 0x6f, 0x72, 0x69, 0x20, 0x67,
+0x68, 0x77, 0x61, 0x20, 0x69, 0x6b, 0x75, 0x6d, 0x69, 0x20, 0x6e, 0x61, 0x20, 0x69, 0x6d, 0x77, 0x65, 0x72, 0x69, 0x3b,
+0x4d, 0x6f, 0x72, 0x69, 0x20, 0x67, 0x68, 0x77, 0x61, 0x20, 0x69, 0x6b, 0x75, 0x6d, 0x69, 0x20, 0x6e, 0x61, 0x20, 0x69,
+0x77, 0x69, 0x49, 0x6d, 0x62, 0x3b, 0x4b, 0x61, 0x77, 0x3b, 0x4b, 0x61, 0x64, 0x3b, 0x4b, 0x61, 0x6e, 0x3b, 0x4b, 0x61,
+0x73, 0x3b, 0x4b, 0x61, 0x72, 0x3b, 0x4d, 0x66, 0x75, 0x3b, 0x57, 0x75, 0x6e, 0x3b, 0x49, 0x6b, 0x65, 0x3b, 0x49, 0x6b,
+0x75, 0x3b, 0x49, 0x6d, 0x77, 0x3b, 0x49, 0x77, 0x69, 0x49, 0x3b, 0x4b, 0x3b, 0x4b, 0x3b, 0x4b, 0x3b, 0x4b, 0x3b, 0x4b,
+0x3b, 0x4d, 0x3b, 0x57, 0x3b, 0x49, 0x3b, 0x49, 0x3b, 0x49, 0x3b, 0x49, 0x73, 0x69, 0x69, 0x6c, 0x6f, 0x3b, 0x63, 0x6f,
+0x6c, 0x74, 0x65, 0x3b, 0x6d, 0x62, 0x6f, 0x6f, 0x79, 0x3b, 0x73, 0x65, 0x65, 0x257, 0x74, 0x6f, 0x3b, 0x64, 0x75, 0x75,
+0x6a, 0x61, 0x6c, 0x3b, 0x6b, 0x6f, 0x72, 0x73, 0x65, 0x3b, 0x6d, 0x6f, 0x72, 0x73, 0x6f, 0x3b, 0x6a, 0x75, 0x6b, 0x6f,
+0x3b, 0x73, 0x69, 0x69, 0x6c, 0x74, 0x6f, 0x3b, 0x79, 0x61, 0x72, 0x6b, 0x6f, 0x6d, 0x61, 0x61, 0x3b, 0x6a, 0x6f, 0x6c,
+0x61, 0x6c, 0x3b, 0x62, 0x6f, 0x77, 0x74, 0x65, 0x73, 0x69, 0x69, 0x3b, 0x63, 0x6f, 0x6c, 0x3b, 0x6d, 0x62, 0x6f, 0x3b,
+0x73, 0x65, 0x65, 0x3b, 0x64, 0x75, 0x75, 0x3b, 0x6b, 0x6f, 0x72, 0x3b, 0x6d, 0x6f, 0x72, 0x3b, 0x6a, 0x75, 0x6b, 0x3b,
+0x73, 0x6c, 0x74, 0x3b, 0x79, 0x61, 0x72, 0x3b, 0x6a, 0x6f, 0x6c, 0x3b, 0x62, 0x6f, 0x77, 0x73, 0x3b, 0x63, 0x3b, 0x6d,
+0x3b, 0x73, 0x3b, 0x64, 0x3b, 0x6b, 0x3b, 0x6d, 0x3b, 0x6a, 0x3b, 0x73, 0x3b, 0x79, 0x3b, 0x6a, 0x3b, 0x62, 0x4e, 0x6a,
+0x65, 0x6e, 0x75, 0x61, 0x72, 0x129, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x65, 0x20, 0x77, 0x61, 0x20, 0x6b, 0x65, 0x72, 0x129,
+0x3b, 0x4d, 0x77, 0x65, 0x72, 0x65, 0x20, 0x77, 0x61, 0x20, 0x67, 0x61, 0x74, 0x61, 0x74, 0x169, 0x3b, 0x4d, 0x77, 0x65,
+0x72, 0x65, 0x20, 0x77, 0x61, 0x20, 0x6b, 0x61, 0x6e, 0x61, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x65, 0x20, 0x77, 0x61, 0x20,
+0x67, 0x61, 0x74, 0x61, 0x6e, 0x6f, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x65, 0x20, 0x77, 0x61, 0x20, 0x67, 0x61, 0x74, 0x61,
+0x6e, 0x64, 0x61, 0x74, 0x169, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x65, 0x20, 0x77, 0x61, 0x20, 0x6d, 0x169, 0x67, 0x77, 0x61,
+0x6e, 0x6a, 0x61, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x65, 0x20, 0x77, 0x61, 0x20, 0x6b, 0x61, 0x6e, 0x61, 0x6e, 0x61, 0x3b,
+0x4d, 0x77, 0x65, 0x72, 0x65, 0x20, 0x77, 0x61, 0x20, 0x6b, 0x65, 0x6e, 0x64, 0x61, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x65,
+0x20, 0x77, 0x61, 0x20, 0x69, 0x6b, 0x169, 0x6d, 0x69, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x65, 0x20, 0x77, 0x61, 0x20, 0x69,
+0x6b, 0x169, 0x6d, 0x69, 0x20, 0x6e, 0x61, 0x20, 0x169, 0x6d, 0x77, 0x65, 0x3b, 0x4e, 0x64, 0x69, 0x74, 0x68, 0x65, 0x6d,
+0x62, 0x61, 0x4a, 0x45, 0x4e, 0x3b, 0x57, 0x4b, 0x52, 0x3b, 0x57, 0x47, 0x54, 0x3b, 0x57, 0x4b, 0x4e, 0x3b, 0x57, 0x54,
+0x4e, 0x3b, 0x57, 0x54, 0x44, 0x3b, 0x57, 0x4d, 0x4a, 0x3b, 0x57, 0x4e, 0x4e, 0x3b, 0x57, 0x4b, 0x44, 0x3b, 0x57, 0x49,
+0x4b, 0x3b, 0x57, 0x4d, 0x57, 0x3b, 0x44, 0x49, 0x54, 0x4a, 0x3b, 0x4b, 0x3b, 0x47, 0x3b, 0x4b, 0x3b, 0x47, 0x3b, 0x47,
+0x3b, 0x4d, 0x3b, 0x4b, 0x3b, 0x4b, 0x3b, 0x49, 0x3b, 0x49, 0x3b, 0x44, 0x4c, 0x61, 0x70, 0x61, 0x20, 0x6c, 0x65, 0x20,
+0x6f, 0x62, 0x6f, 0x3b, 0x4c, 0x61, 0x70, 0x61, 0x20, 0x6c, 0x65, 0x20, 0x77, 0x61, 0x61, 0x72, 0x65, 0x3b, 0x4c, 0x61,
+0x70, 0x61, 0x20, 0x6c, 0x65, 0x20, 0x6f, 0x6b, 0x75, 0x6e, 0x69, 0x3b, 0x4c, 0x61, 0x70, 0x61, 0x20, 0x6c, 0x65, 0x20,
+0x6f, 0x6e, 0x67, 0x2019, 0x77, 0x61, 0x6e, 0x3b, 0x4c, 0x61, 0x70, 0x61, 0x20, 0x6c, 0x65, 0x20, 0x69, 0x6d, 0x65, 0x74,
+0x3b, 0x4c, 0x61, 0x70, 0x61, 0x20, 0x6c, 0x65, 0x20, 0x69, 0x6c, 0x65, 0x3b, 0x4c, 0x61, 0x70, 0x61, 0x20, 0x6c, 0x65,
+0x20, 0x73, 0x61, 0x70, 0x61, 0x3b, 0x4c, 0x61, 0x70, 0x61, 0x20, 0x6c, 0x65, 0x20, 0x69, 0x73, 0x69, 0x65, 0x74, 0x3b,
+0x4c, 0x61, 0x70, 0x61, 0x20, 0x6c, 0x65, 0x20, 0x73, 0x61, 0x61, 0x6c, 0x3b, 0x4c, 0x61, 0x70, 0x61, 0x20, 0x6c, 0x65,
+0x20, 0x74, 0x6f, 0x6d, 0x6f, 0x6e, 0x3b, 0x4c, 0x61, 0x70, 0x61, 0x20, 0x6c, 0x65, 0x20, 0x74, 0x6f, 0x6d, 0x6f, 0x6e,
+0x20, 0x6f, 0x62, 0x6f, 0x3b, 0x4c, 0x61, 0x70, 0x61, 0x20, 0x6c, 0x65, 0x20, 0x74, 0x6f, 0x6d, 0x6f, 0x6e, 0x20, 0x77,
+0x61, 0x61, 0x72, 0x65, 0x4f, 0x62, 0x6f, 0x3b, 0x57, 0x61, 0x61, 0x3b, 0x4f, 0x6b, 0x75, 0x3b, 0x4f, 0x6e, 0x67, 0x3b,
+0x49, 0x6d, 0x65, 0x3b, 0x49, 0x6c, 0x65, 0x3b, 0x53, 0x61, 0x70, 0x3b, 0x49, 0x73, 0x69, 0x3b, 0x53, 0x61, 0x61, 0x3b,
+0x54, 0x6f, 0x6d, 0x3b, 0x54, 0x6f, 0x62, 0x3b, 0x54, 0x6f, 0x77, 0x4f, 0x3b, 0x57, 0x3b, 0x4f, 0x3b, 0x4f, 0x3b, 0x49,
+0x3b, 0x49, 0x3b, 0x53, 0x3b, 0x49, 0x3b, 0x53, 0x3b, 0x54, 0x3b, 0x54, 0x3b, 0x54, 0x4a, 0x61, 0x6e, 0x65, 0x69, 0x72,
+0x6f, 0x3b, 0x46, 0x65, 0x76, 0x72, 0x65, 0x69, 0x72, 0x6f, 0x3b, 0x4d, 0x61, 0x72, 0x63, 0x6f, 0x3b, 0x41, 0x62, 0x72,
+0x69, 0x6c, 0x3b, 0x4d, 0x61, 0x69, 0x6f, 0x3b, 0x4a, 0x75, 0x6e, 0x68, 0x6f, 0x3b, 0x4a, 0x75, 0x6c, 0x68, 0x6f, 0x3b,
+0x41, 0x75, 0x67, 0x75, 0x73, 0x74, 0x6f, 0x3b, 0x53, 0x65, 0x74, 0x65, 0x6d, 0x62, 0x72, 0x6f, 0x3b, 0x4f, 0x74, 0x75,
+0x62, 0x72, 0x6f, 0x3b, 0x4e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x72, 0x6f, 0x3b, 0x44, 0x65, 0x63, 0x65, 0x6d, 0x62, 0x72,
+0x6f, 0x4a, 0x61, 0x6e, 0x3b, 0x46, 0x65, 0x76, 0x3b, 0x4d, 0x61, 0x72, 0x3b, 0x41, 0x62, 0x72, 0x3b, 0x4d, 0x61, 0x69,
+0x3b, 0x4a, 0x75, 0x6e, 0x3b, 0x4a, 0x75, 0x6c, 0x3b, 0x41, 0x75, 0x67, 0x3b, 0x53, 0x65, 0x74, 0x3b, 0x4f, 0x74, 0x75,
+0x3b, 0x4e, 0x6f, 0x76, 0x3b, 0x44, 0x65, 0x63, 0x5a, 0x69, 0x62, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x6c, 0x61, 0x3b, 0x4e,
+0x68, 0x6c, 0x6f, 0x6c, 0x61, 0x6e, 0x6a, 0x61, 0x3b, 0x4d, 0x62, 0x69, 0x6d, 0x62, 0x69, 0x74, 0x68, 0x6f, 0x3b, 0x4d,
+0x61, 0x62, 0x61, 0x73, 0x61, 0x3b, 0x4e, 0x6b, 0x77, 0x65, 0x6e, 0x6b, 0x77, 0x65, 0x7a, 0x69, 0x3b, 0x4e, 0x68, 0x6c,
+0x61, 0x6e, 0x67, 0x75, 0x6c, 0x61, 0x3b, 0x4e, 0x74, 0x75, 0x6c, 0x69, 0x6b, 0x61, 0x7a, 0x69, 0x3b, 0x4e, 0x63, 0x77,
+0x61, 0x62, 0x61, 0x6b, 0x61, 0x7a, 0x69, 0x3b, 0x4d, 0x70, 0x61, 0x6e, 0x64, 0x75, 0x6c, 0x61, 0x3b, 0x4d, 0x66, 0x75,
+0x6d, 0x66, 0x75, 0x3b, 0x4c, 0x77, 0x65, 0x7a, 0x69, 0x3b, 0x4d, 0x70, 0x61, 0x6c, 0x61, 0x6b, 0x61, 0x7a, 0x69, 0x5a,
+0x69, 0x62, 0x3b, 0x4e, 0x68, 0x6c, 0x6f, 0x3b, 0x4d, 0x62, 0x69, 0x3b, 0x4d, 0x61, 0x62, 0x3b, 0x4e, 0x6b, 0x77, 0x3b,
+0x4e, 0x68, 0x6c, 0x61, 0x3b, 0x4e, 0x74, 0x75, 0x3b, 0x4e, 0x63, 0x77, 0x3b, 0x4d, 0x70, 0x61, 0x6e, 0x3b, 0x4d, 0x66,
+0x75, 0x3b, 0x4c, 0x77, 0x65, 0x3b, 0x4d, 0x70, 0x61, 0x6c, 0x5a, 0x3b, 0x4e, 0x3b, 0x4d, 0x3b, 0x4d, 0x3b, 0x4e, 0x3b,
+0x4e, 0x3b, 0x4e, 0x3b, 0x4e, 0x3b, 0x4d, 0x3b, 0x4d, 0x3b, 0x4c, 0x3b, 0x4d, 0x4d, 0x77, 0x65, 0x72, 0x69, 0x20, 0x77,
 0x61, 0x20, 0x6b, 0x77, 0x61, 0x6e, 0x7a, 0x61, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x69, 0x20, 0x77, 0x61, 0x20, 0x6b, 0x61,
 0x69, 0x6c, 0x69, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x69, 0x20, 0x77, 0x61, 0x20, 0x6b, 0x61, 0x74, 0x61, 0x74, 0x75, 0x3b,
 0x4d, 0x77, 0x65, 0x72, 0x69, 0x20, 0x77, 0x61, 0x20, 0x6b, 0x61, 0x61, 0x6e, 0x61, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x69,
@@ -2097,562 +2074,586 @@ static const ushort months_data[] = {
 0x74, 0x69, 0x73, 0x61, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x69, 0x20, 0x77, 0x61, 0x20, 0x69, 0x6b, 0x75, 0x6d, 0x69, 0x3b,
 0x4d, 0x77, 0x65, 0x72, 0x69, 0x20, 0x77, 0x61, 0x20, 0x69, 0x6b, 0x75, 0x6d, 0x69, 0x20, 0x6e, 0x61, 0x20, 0x6d, 0x6f,
 0x6a, 0x61, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x69, 0x20, 0x77, 0x61, 0x20, 0x69, 0x6b, 0x75, 0x6d, 0x69, 0x20, 0x6e, 0x61,
-0x20, 0x6d, 0x62, 0x69, 0x6c, 0x69, 0x3b, 0x4b, 0x3b, 0x4b, 0x3b, 0x4b, 0x3b, 0x4b, 0x3b, 0x54, 0x3b, 0x53, 0x3b, 0x53,
-0x3b, 0x4e, 0x3b, 0x54, 0x3b, 0x49, 0x3b, 0x49, 0x3b, 0x49, 0x3b, 0x2d49, 0x2d4f, 0x2d4f, 0x3b, 0x2d31, 0x2d55, 0x2d30, 0x3b, 0x2d4e,
-0x2d30, 0x2d55, 0x3b, 0x2d49, 0x2d31, 0x2d54, 0x3b, 0x2d4e, 0x2d30, 0x2d62, 0x3b, 0x2d62, 0x2d53, 0x2d4f, 0x3b, 0x2d62, 0x2d53, 0x2d4d, 0x3b, 0x2d56,
-0x2d53, 0x2d5b, 0x3b, 0x2d5b, 0x2d53, 0x2d5c, 0x3b, 0x2d3d, 0x2d5c, 0x2d53, 0x3b, 0x2d4f, 0x2d53, 0x2d61, 0x3b, 0x2d37, 0x2d53, 0x2d4a, 0x3b, 0x2d49,
-0x2d4f, 0x2d4f, 0x2d30, 0x2d62, 0x2d54, 0x3b, 0x2d31, 0x2d55, 0x2d30, 0x2d62, 0x2d55, 0x3b, 0x2d4e, 0x2d30, 0x2d55, 0x2d5a, 0x3b, 0x2d49, 0x2d31, 0x2d54,
-0x2d49, 0x2d54, 0x3b, 0x2d4e, 0x2d30, 0x2d62, 0x2d62, 0x2d53, 0x3b, 0x2d62, 0x2d53, 0x2d4f, 0x2d62, 0x2d53, 0x3b, 0x2d62, 0x2d53, 0x2d4d, 0x2d62, 0x2d53,
-0x2d63, 0x3b, 0x2d56, 0x2d53, 0x2d5b, 0x2d5c, 0x3b, 0x2d5b, 0x2d53, 0x2d5c, 0x2d30, 0x2d4f, 0x2d31, 0x2d49, 0x2d54, 0x3b, 0x2d3d, 0x2d5c, 0x2d53, 0x2d31,
-0x2d54, 0x3b, 0x2d4f, 0x2d53, 0x2d61, 0x2d30, 0x2d4f, 0x2d31, 0x2d49, 0x2d54, 0x3b, 0x2d37, 0x2d53, 0x2d4a, 0x2d30, 0x2d4f, 0x2d31, 0x2d49, 0x2d54, 0x3b,
-0x2d49, 0x3b, 0x2d31, 0x3b, 0x2d4e, 0x3b, 0x2d49, 0x3b, 0x2d4e, 0x3b, 0x2d62, 0x3b, 0x2d62, 0x3b, 0x2d56, 0x3b, 0x2d5b, 0x3b, 0x2d3d, 0x3b,
-0x2d4f, 0x3b, 0x2d37, 0x3b, 0x69, 0x6e, 0x6e, 0x3b, 0x62, 0x1e5b, 0x61, 0x3b, 0x6d, 0x61, 0x1e5b, 0x3b, 0x69, 0x62, 0x72, 0x3b,
-0x6d, 0x61, 0x79, 0x3b, 0x79, 0x75, 0x6e, 0x3b, 0x79, 0x75, 0x6c, 0x3b, 0x263, 0x75, 0x63, 0x3b, 0x63, 0x75, 0x74, 0x3b,
-0x6b, 0x74, 0x75, 0x3b, 0x6e, 0x75, 0x77, 0x3b, 0x64, 0x75, 0x6a, 0x3b, 0x69, 0x6e, 0x6e, 0x61, 0x79, 0x72, 0x3b, 0x62,
-0x1e5b, 0x61, 0x79, 0x1e5b, 0x3b, 0x6d, 0x61, 0x1e5b, 0x1e63, 0x3b, 0x69, 0x62, 0x72, 0x69, 0x72, 0x3b, 0x6d, 0x61, 0x79, 0x79,
-0x75, 0x3b, 0x79, 0x75, 0x6e, 0x79, 0x75, 0x3b, 0x79, 0x75, 0x6c, 0x79, 0x75, 0x7a, 0x3b, 0x263, 0x75, 0x63, 0x74, 0x3b,
-0x63, 0x75, 0x74, 0x61, 0x6e, 0x62, 0x69, 0x72, 0x3b, 0x6b, 0x74, 0x75, 0x62, 0x72, 0x3b, 0x6e, 0x75, 0x77, 0x61, 0x6e,
-0x62, 0x69, 0x72, 0x3b, 0x64, 0x75, 0x6a, 0x61, 0x6e, 0x62, 0x69, 0x72, 0x3b, 0x69, 0x3b, 0x62, 0x3b, 0x6d, 0x3b, 0x69,
-0x3b, 0x6d, 0x3b, 0x79, 0x3b, 0x79, 0x3b, 0x263, 0x3b, 0x63, 0x3b, 0x6b, 0x3b, 0x6e, 0x3b, 0x64, 0x3b, 0x59, 0x65, 0x6e,
-0x3b, 0x46, 0x75, 0x72, 0x3b, 0x4d, 0x65, 0x263, 0x3b, 0x59, 0x65, 0x62, 0x3b, 0x4d, 0x61, 0x79, 0x3b, 0x59, 0x75, 0x6e,
-0x3b, 0x59, 0x75, 0x6c, 0x3b, 0x194, 0x75, 0x63, 0x3b, 0x43, 0x74, 0x65, 0x3b, 0x54, 0x75, 0x62, 0x3b, 0x57, 0x61, 0x6d,
-0x3b, 0x44, 0x75, 0x6a, 0x3b, 0x59, 0x65, 0x6e, 0x6e, 0x61, 0x79, 0x65, 0x72, 0x3b, 0x46, 0x75, 0x1e5b, 0x61, 0x72, 0x3b,
-0x4d, 0x65, 0x263, 0x72, 0x65, 0x73, 0x3b, 0x59, 0x65, 0x62, 0x72, 0x69, 0x72, 0x3b, 0x4d, 0x61, 0x79, 0x79, 0x75, 0x3b,
-0x59, 0x75, 0x6e, 0x79, 0x75, 0x3b, 0x59, 0x75, 0x6c, 0x79, 0x75, 0x3b, 0x194, 0x75, 0x63, 0x74, 0x3b, 0x43, 0x74, 0x65,
-0x6d, 0x62, 0x65, 0x1e5b, 0x3b, 0x54, 0x75, 0x62, 0x65, 0x1e5b, 0x3b, 0x57, 0x61, 0x6d, 0x62, 0x65, 0x1e5b, 0x3b, 0x44, 0x75,
-0x1e7, 0x65, 0x6d, 0x62, 0x65, 0x1e5b, 0x3b, 0x59, 0x3b, 0x46, 0x3b, 0x4d, 0x3b, 0x59, 0x3b, 0x4d, 0x3b, 0x59, 0x3b, 0x59,
-0x3b, 0x194, 0x3b, 0x43, 0x3b, 0x54, 0x3b, 0x4e, 0x3b, 0x44, 0x3b, 0x59, 0x65, 0x6e, 0x3b, 0x46, 0x75, 0x72, 0x3b, 0x4d,
+0x20, 0x6d, 0x62, 0x69, 0x6c, 0x69, 0x4d, 0x31, 0x3b, 0x4d, 0x32, 0x3b, 0x4d, 0x33, 0x3b, 0x4d, 0x34, 0x3b, 0x4d, 0x35,
+0x3b, 0x4d, 0x36, 0x3b, 0x4d, 0x37, 0x3b, 0x4d, 0x38, 0x3b, 0x4d, 0x39, 0x3b, 0x4d, 0x31, 0x30, 0x3b, 0x4d, 0x31, 0x31,
+0x3b, 0x4d, 0x31, 0x32, 0x4b, 0x3b, 0x4b, 0x3b, 0x4b, 0x3b, 0x4b, 0x3b, 0x54, 0x3b, 0x53, 0x3b, 0x53, 0x3b, 0x4e, 0x3b,
+0x54, 0x3b, 0x49, 0x3b, 0x49, 0x3b, 0x49, 0x2d49, 0x2d4f, 0x2d4f, 0x2d30, 0x2d62, 0x2d54, 0x3b, 0x2d31, 0x2d55, 0x2d30, 0x2d62, 0x2d55, 0x3b,
+0x2d4e, 0x2d30, 0x2d55, 0x2d5a, 0x3b, 0x2d49, 0x2d31, 0x2d54, 0x2d49, 0x2d54, 0x3b, 0x2d4e, 0x2d30, 0x2d62, 0x2d62, 0x2d53, 0x3b, 0x2d62, 0x2d53, 0x2d4f,
+0x2d62, 0x2d53, 0x3b, 0x2d62, 0x2d53, 0x2d4d, 0x2d62, 0x2d53, 0x2d63, 0x3b, 0x2d56, 0x2d53, 0x2d5b, 0x2d5c, 0x3b, 0x2d5b, 0x2d53, 0x2d5c, 0x2d30, 0x2d4f,
+0x2d31, 0x2d49, 0x2d54, 0x3b, 0x2d3d, 0x2d5c, 0x2d53, 0x2d31, 0x2d54, 0x3b, 0x2d4f, 0x2d53, 0x2d61, 0x2d30, 0x2d4f, 0x2d31, 0x2d49, 0x2d54, 0x3b, 0x2d37,
+0x2d53, 0x2d4a, 0x2d30, 0x2d4f, 0x2d31, 0x2d49, 0x2d54, 0x2d49, 0x2d4f, 0x2d4f, 0x3b, 0x2d31, 0x2d55, 0x2d30, 0x3b, 0x2d4e, 0x2d30, 0x2d55, 0x3b, 0x2d49,
+0x2d31, 0x2d54, 0x3b, 0x2d4e, 0x2d30, 0x2d62, 0x3b, 0x2d62, 0x2d53, 0x2d4f, 0x3b, 0x2d62, 0x2d53, 0x2d4d, 0x3b, 0x2d56, 0x2d53, 0x2d5b, 0x3b, 0x2d5b,
+0x2d53, 0x2d5c, 0x3b, 0x2d3d, 0x2d5c, 0x2d53, 0x3b, 0x2d4f, 0x2d53, 0x2d61, 0x3b, 0x2d37, 0x2d53, 0x2d4a, 0x2d49, 0x3b, 0x2d31, 0x3b, 0x2d4e, 0x3b,
+0x2d49, 0x3b, 0x2d4e, 0x3b, 0x2d62, 0x3b, 0x2d62, 0x3b, 0x2d56, 0x3b, 0x2d5b, 0x3b, 0x2d3d, 0x3b, 0x2d4f, 0x3b, 0x2d37, 0x69, 0x6e, 0x6e,
+0x61, 0x79, 0x72, 0x3b, 0x62, 0x1e5b, 0x61, 0x79, 0x1e5b, 0x3b, 0x6d, 0x61, 0x1e5b, 0x1e63, 0x3b, 0x69, 0x62, 0x72, 0x69, 0x72,
+0x3b, 0x6d, 0x61, 0x79, 0x79, 0x75, 0x3b, 0x79, 0x75, 0x6e, 0x79, 0x75, 0x3b, 0x79, 0x75, 0x6c, 0x79, 0x75, 0x7a, 0x3b,
+0x263, 0x75, 0x63, 0x74, 0x3b, 0x63, 0x75, 0x74, 0x61, 0x6e, 0x62, 0x69, 0x72, 0x3b, 0x6b, 0x74, 0x75, 0x62, 0x72, 0x3b,
+0x6e, 0x75, 0x77, 0x61, 0x6e, 0x62, 0x69, 0x72, 0x3b, 0x64, 0x75, 0x6a, 0x61, 0x6e, 0x62, 0x69, 0x72, 0x69, 0x6e, 0x6e,
+0x3b, 0x62, 0x1e5b, 0x61, 0x3b, 0x6d, 0x61, 0x1e5b, 0x3b, 0x69, 0x62, 0x72, 0x3b, 0x6d, 0x61, 0x79, 0x3b, 0x79, 0x75, 0x6e,
+0x3b, 0x79, 0x75, 0x6c, 0x3b, 0x263, 0x75, 0x63, 0x3b, 0x63, 0x75, 0x74, 0x3b, 0x6b, 0x74, 0x75, 0x3b, 0x6e, 0x75, 0x77,
+0x3b, 0x64, 0x75, 0x6a, 0x69, 0x3b, 0x62, 0x3b, 0x6d, 0x3b, 0x69, 0x3b, 0x6d, 0x3b, 0x79, 0x3b, 0x79, 0x3b, 0x263, 0x3b,
+0x63, 0x3b, 0x6b, 0x3b, 0x6e, 0x3b, 0x64, 0x59, 0x65, 0x6e, 0x6e, 0x61, 0x79, 0x65, 0x72, 0x3b, 0x46, 0x75, 0x1e5b, 0x61,
+0x72, 0x3b, 0x4d, 0x65, 0x263, 0x72, 0x65, 0x73, 0x3b, 0x59, 0x65, 0x62, 0x72, 0x69, 0x72, 0x3b, 0x4d, 0x61, 0x79, 0x79,
+0x75, 0x3b, 0x59, 0x75, 0x6e, 0x79, 0x75, 0x3b, 0x59, 0x75, 0x6c, 0x79, 0x75, 0x3b, 0x194, 0x75, 0x63, 0x74, 0x3b, 0x43,
+0x74, 0x65, 0x6d, 0x62, 0x65, 0x1e5b, 0x3b, 0x54, 0x75, 0x62, 0x65, 0x1e5b, 0x3b, 0x57, 0x61, 0x6d, 0x62, 0x65, 0x1e5b, 0x3b,
+0x44, 0x75, 0x1e7, 0x65, 0x6d, 0x62, 0x65, 0x1e5b, 0x59, 0x65, 0x6e, 0x6e, 0x61, 0x79, 0x65, 0x72, 0x3b, 0x46, 0x75, 0x1e5b,
+0x61, 0x72, 0x3b, 0x4d, 0x65, 0x263, 0x72, 0x65, 0x73, 0x3b, 0x59, 0x65, 0x62, 0x72, 0x69, 0x72, 0x3b, 0x4d, 0x61, 0x79,
+0x79, 0x75, 0x3b, 0x59, 0x75, 0x6e, 0x79, 0x75, 0x3b, 0x59, 0x75, 0x6c, 0x79, 0x75, 0x3b, 0x194, 0x75, 0x63, 0x74, 0x3b,
+0x43, 0x74, 0x65, 0x6d, 0x62, 0x65, 0x1e5b, 0x3b, 0x54, 0x75, 0x62, 0x65, 0x1e5b, 0x3b, 0x4e, 0x75, 0x6e, 0x65, 0x6d, 0x62,
+0x65, 0x1e5b, 0x3b, 0x44, 0x75, 0x1e7, 0x65, 0x6d, 0x62, 0x65, 0x1e5b, 0x59, 0x65, 0x6e, 0x3b, 0x46, 0x75, 0x72, 0x3b, 0x4d,
 0x65, 0x263, 0x3b, 0x59, 0x65, 0x62, 0x3b, 0x4d, 0x61, 0x79, 0x3b, 0x59, 0x75, 0x6e, 0x3b, 0x59, 0x75, 0x6c, 0x3b, 0x194,
-0x75, 0x63, 0x3b, 0x43, 0x74, 0x65, 0x3b, 0x54, 0x75, 0x62, 0x3b, 0x4e, 0x75, 0x6e, 0x3b, 0x44, 0x75, 0x1e7, 0x3b, 0x59,
-0x65, 0x6e, 0x6e, 0x61, 0x79, 0x65, 0x72, 0x3b, 0x46, 0x75, 0x1e5b, 0x61, 0x72, 0x3b, 0x4d, 0x65, 0x263, 0x72, 0x65, 0x73,
-0x3b, 0x59, 0x65, 0x62, 0x72, 0x69, 0x72, 0x3b, 0x4d, 0x61, 0x79, 0x79, 0x75, 0x3b, 0x59, 0x75, 0x6e, 0x79, 0x75, 0x3b,
-0x59, 0x75, 0x6c, 0x79, 0x75, 0x3b, 0x194, 0x75, 0x63, 0x74, 0x3b, 0x43, 0x74, 0x65, 0x6d, 0x62, 0x65, 0x1e5b, 0x3b, 0x54,
-0x75, 0x62, 0x65, 0x1e5b, 0x3b, 0x4e, 0x75, 0x6e, 0x65, 0x6d, 0x62, 0x65, 0x1e5b, 0x3b, 0x44, 0x75, 0x1e7, 0x65, 0x6d, 0x62,
-0x65, 0x1e5b, 0x3b, 0x59, 0x3b, 0x46, 0x3b, 0x194, 0x3b, 0x42, 0x3b, 0x4d, 0x3b, 0x4e, 0x3b, 0x4c, 0x3b, 0x43, 0x3b, 0x54,
-0x3b, 0x52, 0x3b, 0x57, 0x3b, 0x44, 0x3b, 0x4b, 0x42, 0x5a, 0x3b, 0x4b, 0x42, 0x52, 0x3b, 0x4b, 0x53, 0x54, 0x3b, 0x4b,
-0x4b, 0x4e, 0x3b, 0x4b, 0x54, 0x4e, 0x3b, 0x4b, 0x4d, 0x4b, 0x3b, 0x4b, 0x4d, 0x53, 0x3b, 0x4b, 0x4d, 0x4e, 0x3b, 0x4b,
-0x4d, 0x57, 0x3b, 0x4b, 0x4b, 0x4d, 0x3b, 0x4b, 0x4e, 0x4b, 0x3b, 0x4b, 0x4e, 0x42, 0x3b, 0x4f, 0x6b, 0x77, 0x6f, 0x6b,
-0x75, 0x62, 0x61, 0x6e, 0x7a, 0x61, 0x3b, 0x4f, 0x6b, 0x77, 0x61, 0x6b, 0x61, 0x62, 0x69, 0x72, 0x69, 0x3b, 0x4f, 0x6b,
-0x77, 0x61, 0x6b, 0x61, 0x73, 0x68, 0x61, 0x74, 0x75, 0x3b, 0x4f, 0x6b, 0x77, 0x61, 0x6b, 0x61, 0x6e, 0x61, 0x3b, 0x4f,
-0x6b, 0x77, 0x61, 0x6b, 0x61, 0x74, 0x61, 0x61, 0x6e, 0x61, 0x3b, 0x4f, 0x6b, 0x77, 0x61, 0x6d, 0x75, 0x6b, 0x61, 0x61,
-0x67, 0x61, 0x3b, 0x4f, 0x6b, 0x77, 0x61, 0x6d, 0x75, 0x73, 0x68, 0x61, 0x6e, 0x6a, 0x75, 0x3b, 0x4f, 0x6b, 0x77, 0x61,
-0x6d, 0x75, 0x6e, 0x61, 0x61, 0x6e, 0x61, 0x3b, 0x4f, 0x6b, 0x77, 0x61, 0x6d, 0x77, 0x65, 0x6e, 0x64, 0x61, 0x3b, 0x4f,
-0x6b, 0x77, 0x61, 0x69, 0x6b, 0x75, 0x6d, 0x69, 0x3b, 0x4f, 0x6b, 0x77, 0x61, 0x69, 0x6b, 0x75, 0x6d, 0x69, 0x20, 0x6e,
-0x61, 0x20, 0x6b, 0x75, 0x6d, 0x77, 0x65, 0x3b, 0x4f, 0x6b, 0x77, 0x61, 0x69, 0x6b, 0x75, 0x6d, 0x69, 0x20, 0x6e, 0x61,
-0x20, 0x69, 0x62, 0x69, 0x72, 0x69, 0x3b, 0x48, 0x75, 0x74, 0x3b, 0x56, 0x69, 0x6c, 0x3b, 0x44, 0x61, 0x74, 0x3b, 0x54,
-0x61, 0x69, 0x3b, 0x48, 0x61, 0x6e, 0x3b, 0x53, 0x69, 0x74, 0x3b, 0x53, 0x61, 0x62, 0x3b, 0x4e, 0x61, 0x6e, 0x3b, 0x54,
-0x69, 0x73, 0x3b, 0x4b, 0x75, 0x6d, 0x3b, 0x4b, 0x6d, 0x6a, 0x3b, 0x4b, 0x6d, 0x62, 0x3b, 0x70, 0x61, 0x20, 0x6d, 0x77,
-0x65, 0x64, 0x7a, 0x69, 0x20, 0x67, 0x77, 0x61, 0x20, 0x68, 0x75, 0x74, 0x61, 0x6c, 0x61, 0x3b, 0x70, 0x61, 0x20, 0x6d,
-0x77, 0x65, 0x64, 0x7a, 0x69, 0x20, 0x67, 0x77, 0x61, 0x20, 0x77, 0x75, 0x76, 0x69, 0x6c, 0x69, 0x3b, 0x70, 0x61, 0x20,
-0x6d, 0x77, 0x65, 0x64, 0x7a, 0x69, 0x20, 0x67, 0x77, 0x61, 0x20, 0x77, 0x75, 0x64, 0x61, 0x74, 0x75, 0x3b, 0x70, 0x61,
-0x20, 0x6d, 0x77, 0x65, 0x64, 0x7a, 0x69, 0x20, 0x67, 0x77, 0x61, 0x20, 0x77, 0x75, 0x74, 0x61, 0x69, 0x3b, 0x70, 0x61,
-0x20, 0x6d, 0x77, 0x65, 0x64, 0x7a, 0x69, 0x20, 0x67, 0x77, 0x61, 0x20, 0x77, 0x75, 0x68, 0x61, 0x6e, 0x75, 0x3b, 0x70,
-0x61, 0x20, 0x6d, 0x77, 0x65, 0x64, 0x7a, 0x69, 0x20, 0x67, 0x77, 0x61, 0x20, 0x73, 0x69, 0x74, 0x61, 0x3b, 0x70, 0x61,
-0x20, 0x6d, 0x77, 0x65, 0x64, 0x7a, 0x69, 0x20, 0x67, 0x77, 0x61, 0x20, 0x73, 0x61, 0x62, 0x61, 0x3b, 0x70, 0x61, 0x20,
-0x6d, 0x77, 0x65, 0x64, 0x7a, 0x69, 0x20, 0x67, 0x77, 0x61, 0x20, 0x6e, 0x61, 0x6e, 0x65, 0x3b, 0x70, 0x61, 0x20, 0x6d,
-0x77, 0x65, 0x64, 0x7a, 0x69, 0x20, 0x67, 0x77, 0x61, 0x20, 0x74, 0x69, 0x73, 0x61, 0x3b, 0x70, 0x61, 0x20, 0x6d, 0x77,
-0x65, 0x64, 0x7a, 0x69, 0x20, 0x67, 0x77, 0x61, 0x20, 0x6b, 0x75, 0x6d, 0x69, 0x3b, 0x70, 0x61, 0x20, 0x6d, 0x77, 0x65,
-0x64, 0x7a, 0x69, 0x20, 0x67, 0x77, 0x61, 0x20, 0x6b, 0x75, 0x6d, 0x69, 0x20, 0x6e, 0x61, 0x20, 0x6d, 0x6f, 0x6a, 0x61,
-0x3b, 0x70, 0x61, 0x20, 0x6d, 0x77, 0x65, 0x64, 0x7a, 0x69, 0x20, 0x67, 0x77, 0x61, 0x20, 0x6b, 0x75, 0x6d, 0x69, 0x20,
-0x6e, 0x61, 0x20, 0x6d, 0x62, 0x69, 0x6c, 0x69, 0x3b, 0x48, 0x3b, 0x56, 0x3b, 0x44, 0x3b, 0x54, 0x3b, 0x48, 0x3b, 0x53,
-0x3b, 0x53, 0x3b, 0x4e, 0x3b, 0x54, 0x3b, 0x4b, 0x3b, 0x4b, 0x3b, 0x4b, 0x3b, 0x4a, 0x61, 0x6e, 0x75, 0x61, 0x72, 0x69,
-0x3b, 0x46, 0x65, 0x62, 0x72, 0x75, 0x61, 0x72, 0x69, 0x3b, 0x4d, 0x61, 0x63, 0x68, 0x69, 0x3b, 0x41, 0x70, 0x72, 0x69,
-0x6c, 0x79, 0x69, 0x3b, 0x4d, 0x65, 0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x79, 0x69, 0x3b, 0x4a, 0x75, 0x6c, 0x79, 0x61, 0x69,
-0x3b, 0x41, 0x67, 0x75, 0x73, 0x74, 0x69, 0x3b, 0x53, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x4f, 0x6b, 0x74,
-0x6f, 0x62, 0x61, 0x3b, 0x4e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x44, 0x65, 0x73, 0x65, 0x6d, 0x62, 0x61, 0x3b,
-0x7a, 0x61, 0x6e, 0x3b, 0x66, 0x65, 0x62, 0x3b, 0x6d, 0x61, 0x72, 0x3b, 0x61, 0x77, 0x69, 0x3b, 0x6d, 0x25b, 0x3b, 0x7a,
-0x75, 0x77, 0x3b, 0x7a, 0x75, 0x6c, 0x3b, 0x75, 0x74, 0x69, 0x3b, 0x73, 0x25b, 0x74, 0x3b, 0x254, 0x6b, 0x75, 0x3b, 0x6e,
-0x6f, 0x77, 0x3b, 0x64, 0x65, 0x73, 0x3b, 0x7a, 0x61, 0x6e, 0x77, 0x75, 0x79, 0x65, 0x3b, 0x66, 0x65, 0x62, 0x75, 0x72,
-0x75, 0x79, 0x65, 0x3b, 0x6d, 0x61, 0x72, 0x69, 0x73, 0x69, 0x3b, 0x61, 0x77, 0x69, 0x72, 0x69, 0x6c, 0x69, 0x3b, 0x6d,
-0x25b, 0x3b, 0x7a, 0x75, 0x77, 0x25b, 0x6e, 0x3b, 0x7a, 0x75, 0x6c, 0x75, 0x79, 0x65, 0x3b, 0x75, 0x74, 0x69, 0x3b, 0x73,
-0x25b, 0x74, 0x61, 0x6e, 0x62, 0x75, 0x72, 0x75, 0x3b, 0x254, 0x6b, 0x75, 0x74, 0x254, 0x62, 0x75, 0x72, 0x75, 0x3b, 0x6e,
-0x6f, 0x77, 0x61, 0x6e, 0x62, 0x75, 0x72, 0x75, 0x3b, 0x64, 0x65, 0x73, 0x61, 0x6e, 0x62, 0x75, 0x72, 0x75, 0x3b, 0x5a,
-0x3b, 0x46, 0x3b, 0x4d, 0x3b, 0x41, 0x3b, 0x4d, 0x3b, 0x5a, 0x3b, 0x5a, 0x3b, 0x55, 0x3b, 0x53, 0x3b, 0x186, 0x3b, 0x4e,
-0x3b, 0x44, 0x3b, 0x4d, 0x62, 0x65, 0x3b, 0x4b, 0x61, 0x69, 0x3b, 0x4b, 0x61, 0x74, 0x3b, 0x4b, 0x61, 0x6e, 0x3b, 0x47,
-0x61, 0x74, 0x3b, 0x47, 0x61, 0x6e, 0x3b, 0x4d, 0x75, 0x67, 0x3b, 0x4b, 0x6e, 0x6e, 0x3b, 0x4b, 0x65, 0x6e, 0x3b, 0x49,
-0x6b, 0x75, 0x3b, 0x49, 0x6d, 0x77, 0x3b, 0x49, 0x67, 0x69, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x69, 0x20, 0x77, 0x61, 0x20,
-0x6d, 0x62, 0x65, 0x72, 0x65, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x69, 0x20, 0x77, 0x61, 0x20, 0x6b, 0x61, 0x129, 0x72, 0x69,
-0x3b, 0x4d, 0x77, 0x65, 0x72, 0x69, 0x20, 0x77, 0x61, 0x20, 0x6b, 0x61, 0x74, 0x68, 0x61, 0x74, 0x169, 0x3b, 0x4d, 0x77,
-0x65, 0x72, 0x69, 0x20, 0x77, 0x61, 0x20, 0x6b, 0x61, 0x6e, 0x61, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x69, 0x20, 0x77, 0x61,
-0x20, 0x67, 0x61, 0x74, 0x61, 0x6e, 0x6f, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x69, 0x20, 0x77, 0x61, 0x20, 0x67, 0x61, 0x74,
-0x61, 0x6e, 0x74, 0x61, 0x74, 0x169, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x69, 0x20, 0x77, 0x61, 0x20, 0x6d, 0x169, 0x67, 0x77,
-0x61, 0x6e, 0x6a, 0x61, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x69, 0x20, 0x77, 0x61, 0x20, 0x6b, 0x61, 0x6e, 0x61, 0x6e, 0x61,
-0x3b, 0x4d, 0x77, 0x65, 0x72, 0x69, 0x20, 0x77, 0x61, 0x20, 0x6b, 0x65, 0x6e, 0x64, 0x61, 0x3b, 0x4d, 0x77, 0x65, 0x72,
-0x69, 0x20, 0x77, 0x61, 0x20, 0x69, 0x6b, 0x169, 0x6d, 0x69, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x69, 0x20, 0x77, 0x61, 0x20,
-0x69, 0x6b, 0x169, 0x6d, 0x69, 0x20, 0x6e, 0x61, 0x20, 0x169, 0x6d, 0x77, 0x65, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x69, 0x20,
-0x77, 0x61, 0x20, 0x69, 0x6b, 0x169, 0x6d, 0x69, 0x20, 0x6e, 0x61, 0x20, 0x4b, 0x61, 0x129, 0x72, 0x129, 0x3b, 0x4d, 0x3b,
-0x4b, 0x3b, 0x4b, 0x3b, 0x4b, 0x3b, 0x47, 0x3b, 0x47, 0x3b, 0x4d, 0x3b, 0x4b, 0x3b, 0x4b, 0x3b, 0x49, 0x3b, 0x49, 0x3b,
-0x49, 0x3b, 0x13a4, 0x13c3, 0x3b, 0x13a7, 0x13a6, 0x3b, 0x13a0, 0x13c5, 0x3b, 0x13a7, 0x13ec, 0x3b, 0x13a0, 0x13c2, 0x3b, 0x13d5, 0x13ad, 0x3b,
-0x13ab, 0x13f0, 0x3b, 0x13a6, 0x13b6, 0x3b, 0x13da, 0x13b5, 0x3b, 0x13da, 0x13c2, 0x3b, 0x13c5, 0x13d3, 0x3b, 0x13a5, 0x13cd, 0x3b, 0x13a4, 0x13c3,
-0x13b8, 0x13d4, 0x13c5, 0x3b, 0x13a7, 0x13a6, 0x13b5, 0x3b, 0x13a0, 0x13c5, 0x13f1, 0x3b, 0x13a7, 0x13ec, 0x13c2, 0x3b, 0x13a0, 0x13c2, 0x13cd, 0x13ac,
-0x13d8, 0x3b, 0x13d5, 0x13ad, 0x13b7, 0x13f1, 0x3b, 0x13ab, 0x13f0, 0x13c9, 0x13c2, 0x3b, 0x13a6, 0x13b6, 0x13c2, 0x3b, 0x13da, 0x13b5, 0x13cd, 0x13d7,
-0x3b, 0x13da, 0x13c2, 0x13c5, 0x13d7, 0x3b, 0x13c5, 0x13d3, 0x13d5, 0x13c6, 0x3b, 0x13a5, 0x13cd, 0x13a9, 0x13f1, 0x3b, 0x13a4, 0x3b, 0x13a7, 0x3b,
-0x13a0, 0x3b, 0x13a7, 0x3b, 0x13a0, 0x3b, 0x13d5, 0x3b, 0x13ab, 0x3b, 0x13a6, 0x3b, 0x13da, 0x3b, 0x13da, 0x3b, 0x13c5, 0x3b, 0x13a5, 0x3b,
-0x7a, 0x61, 0x6e, 0x3b, 0x66, 0x65, 0x76, 0x3b, 0x6d, 0x61, 0x72, 0x3b, 0x61, 0x76, 0x72, 0x3b, 0x6d, 0x65, 0x3b, 0x7a,
-0x69, 0x6e, 0x3b, 0x7a, 0x69, 0x6c, 0x3b, 0x6f, 0x75, 0x74, 0x3b, 0x73, 0x65, 0x70, 0x3b, 0x6f, 0x6b, 0x74, 0x3b, 0x6e,
-0x6f, 0x76, 0x3b, 0x64, 0x65, 0x73, 0x3b, 0x7a, 0x61, 0x6e, 0x76, 0x69, 0x65, 0x3b, 0x66, 0x65, 0x76, 0x72, 0x69, 0x79,
-0x65, 0x3b, 0x6d, 0x61, 0x72, 0x73, 0x3b, 0x61, 0x76, 0x72, 0x69, 0x6c, 0x3b, 0x6d, 0x65, 0x3b, 0x7a, 0x69, 0x6e, 0x3b,
-0x7a, 0x69, 0x6c, 0x79, 0x65, 0x3b, 0x6f, 0x75, 0x74, 0x3b, 0x73, 0x65, 0x70, 0x74, 0x61, 0x6d, 0x3b, 0x6f, 0x6b, 0x74,
-0x6f, 0x62, 0x3b, 0x6e, 0x6f, 0x76, 0x61, 0x6d, 0x3b, 0x64, 0x65, 0x73, 0x61, 0x6d, 0x3b, 0x7a, 0x3b, 0x66, 0x3b, 0x6d,
-0x3b, 0x61, 0x3b, 0x6d, 0x3b, 0x7a, 0x3b, 0x7a, 0x3b, 0x6f, 0x3b, 0x73, 0x3b, 0x6f, 0x3b, 0x6e, 0x3b, 0x64, 0x3b, 0x4d,
-0x77, 0x65, 0x64, 0x69, 0x20, 0x4e, 0x74, 0x61, 0x6e, 0x64, 0x69, 0x3b, 0x4d, 0x77, 0x65, 0x64, 0x69, 0x20, 0x77, 0x61,
-0x20, 0x50, 0x69, 0x6c, 0x69, 0x3b, 0x4d, 0x77, 0x65, 0x64, 0x69, 0x20, 0x77, 0x61, 0x20, 0x54, 0x61, 0x74, 0x75, 0x3b,
-0x4d, 0x77, 0x65, 0x64, 0x69, 0x20, 0x77, 0x61, 0x20, 0x4e, 0x63, 0x68, 0x65, 0x63, 0x68, 0x69, 0x3b, 0x4d, 0x77, 0x65,
-0x64, 0x69, 0x20, 0x77, 0x61, 0x20, 0x4e, 0x6e, 0x79, 0x61, 0x6e, 0x6f, 0x3b, 0x4d, 0x77, 0x65, 0x64, 0x69, 0x20, 0x77,
-0x61, 0x20, 0x4e, 0x6e, 0x79, 0x61, 0x6e, 0x6f, 0x20, 0x6e, 0x61, 0x20, 0x55, 0x6d, 0x6f, 0x3b, 0x4d, 0x77, 0x65, 0x64,
-0x69, 0x20, 0x77, 0x61, 0x20, 0x4e, 0x6e, 0x79, 0x61, 0x6e, 0x6f, 0x20, 0x6e, 0x61, 0x20, 0x4d, 0x69, 0x76, 0x69, 0x6c,
-0x69, 0x3b, 0x4d, 0x77, 0x65, 0x64, 0x69, 0x20, 0x77, 0x61, 0x20, 0x4e, 0x6e, 0x79, 0x61, 0x6e, 0x6f, 0x20, 0x6e, 0x61,
-0x20, 0x4d, 0x69, 0x74, 0x61, 0x74, 0x75, 0x3b, 0x4d, 0x77, 0x65, 0x64, 0x69, 0x20, 0x77, 0x61, 0x20, 0x4e, 0x6e, 0x79,
-0x61, 0x6e, 0x6f, 0x20, 0x6e, 0x61, 0x20, 0x4e, 0x63, 0x68, 0x65, 0x63, 0x68, 0x69, 0x3b, 0x4d, 0x77, 0x65, 0x64, 0x69,
-0x20, 0x77, 0x61, 0x20, 0x4e, 0x6e, 0x79, 0x61, 0x6e, 0x6f, 0x20, 0x6e, 0x61, 0x20, 0x4e, 0x6e, 0x79, 0x61, 0x6e, 0x6f,
+0x75, 0x63, 0x3b, 0x43, 0x74, 0x65, 0x3b, 0x54, 0x75, 0x62, 0x3b, 0x57, 0x61, 0x6d, 0x3b, 0x44, 0x75, 0x6a, 0x59, 0x65,
+0x6e, 0x3b, 0x46, 0x75, 0x72, 0x3b, 0x4d, 0x65, 0x263, 0x3b, 0x59, 0x65, 0x62, 0x3b, 0x4d, 0x61, 0x79, 0x3b, 0x59, 0x75,
+0x6e, 0x3b, 0x59, 0x75, 0x6c, 0x3b, 0x194, 0x75, 0x63, 0x3b, 0x43, 0x74, 0x65, 0x3b, 0x54, 0x75, 0x62, 0x3b, 0x4e, 0x75,
+0x6e, 0x3b, 0x44, 0x75, 0x1e7, 0x59, 0x3b, 0x46, 0x3b, 0x4d, 0x3b, 0x59, 0x3b, 0x4d, 0x3b, 0x59, 0x3b, 0x59, 0x3b, 0x194,
+0x3b, 0x43, 0x3b, 0x54, 0x3b, 0x4e, 0x3b, 0x44, 0x59, 0x3b, 0x46, 0x3b, 0x194, 0x3b, 0x42, 0x3b, 0x4d, 0x3b, 0x4e, 0x3b,
+0x4c, 0x3b, 0x43, 0x3b, 0x54, 0x3b, 0x52, 0x3b, 0x57, 0x3b, 0x44, 0x4f, 0x6b, 0x77, 0x6f, 0x6b, 0x75, 0x62, 0x61, 0x6e,
+0x7a, 0x61, 0x3b, 0x4f, 0x6b, 0x77, 0x61, 0x6b, 0x61, 0x62, 0x69, 0x72, 0x69, 0x3b, 0x4f, 0x6b, 0x77, 0x61, 0x6b, 0x61,
+0x73, 0x68, 0x61, 0x74, 0x75, 0x3b, 0x4f, 0x6b, 0x77, 0x61, 0x6b, 0x61, 0x6e, 0x61, 0x3b, 0x4f, 0x6b, 0x77, 0x61, 0x6b,
+0x61, 0x74, 0x61, 0x61, 0x6e, 0x61, 0x3b, 0x4f, 0x6b, 0x77, 0x61, 0x6d, 0x75, 0x6b, 0x61, 0x61, 0x67, 0x61, 0x3b, 0x4f,
+0x6b, 0x77, 0x61, 0x6d, 0x75, 0x73, 0x68, 0x61, 0x6e, 0x6a, 0x75, 0x3b, 0x4f, 0x6b, 0x77, 0x61, 0x6d, 0x75, 0x6e, 0x61,
+0x61, 0x6e, 0x61, 0x3b, 0x4f, 0x6b, 0x77, 0x61, 0x6d, 0x77, 0x65, 0x6e, 0x64, 0x61, 0x3b, 0x4f, 0x6b, 0x77, 0x61, 0x69,
+0x6b, 0x75, 0x6d, 0x69, 0x3b, 0x4f, 0x6b, 0x77, 0x61, 0x69, 0x6b, 0x75, 0x6d, 0x69, 0x20, 0x6e, 0x61, 0x20, 0x6b, 0x75,
+0x6d, 0x77, 0x65, 0x3b, 0x4f, 0x6b, 0x77, 0x61, 0x69, 0x6b, 0x75, 0x6d, 0x69, 0x20, 0x6e, 0x61, 0x20, 0x69, 0x62, 0x69,
+0x72, 0x69, 0x4b, 0x42, 0x5a, 0x3b, 0x4b, 0x42, 0x52, 0x3b, 0x4b, 0x53, 0x54, 0x3b, 0x4b, 0x4b, 0x4e, 0x3b, 0x4b, 0x54,
+0x4e, 0x3b, 0x4b, 0x4d, 0x4b, 0x3b, 0x4b, 0x4d, 0x53, 0x3b, 0x4b, 0x4d, 0x4e, 0x3b, 0x4b, 0x4d, 0x57, 0x3b, 0x4b, 0x4b,
+0x4d, 0x3b, 0x4b, 0x4e, 0x4b, 0x3b, 0x4b, 0x4e, 0x42, 0x70, 0x61, 0x20, 0x6d, 0x77, 0x65, 0x64, 0x7a, 0x69, 0x20, 0x67,
+0x77, 0x61, 0x20, 0x68, 0x75, 0x74, 0x61, 0x6c, 0x61, 0x3b, 0x70, 0x61, 0x20, 0x6d, 0x77, 0x65, 0x64, 0x7a, 0x69, 0x20,
+0x67, 0x77, 0x61, 0x20, 0x77, 0x75, 0x76, 0x69, 0x6c, 0x69, 0x3b, 0x70, 0x61, 0x20, 0x6d, 0x77, 0x65, 0x64, 0x7a, 0x69,
+0x20, 0x67, 0x77, 0x61, 0x20, 0x77, 0x75, 0x64, 0x61, 0x74, 0x75, 0x3b, 0x70, 0x61, 0x20, 0x6d, 0x77, 0x65, 0x64, 0x7a,
+0x69, 0x20, 0x67, 0x77, 0x61, 0x20, 0x77, 0x75, 0x74, 0x61, 0x69, 0x3b, 0x70, 0x61, 0x20, 0x6d, 0x77, 0x65, 0x64, 0x7a,
+0x69, 0x20, 0x67, 0x77, 0x61, 0x20, 0x77, 0x75, 0x68, 0x61, 0x6e, 0x75, 0x3b, 0x70, 0x61, 0x20, 0x6d, 0x77, 0x65, 0x64,
+0x7a, 0x69, 0x20, 0x67, 0x77, 0x61, 0x20, 0x73, 0x69, 0x74, 0x61, 0x3b, 0x70, 0x61, 0x20, 0x6d, 0x77, 0x65, 0x64, 0x7a,
+0x69, 0x20, 0x67, 0x77, 0x61, 0x20, 0x73, 0x61, 0x62, 0x61, 0x3b, 0x70, 0x61, 0x20, 0x6d, 0x77, 0x65, 0x64, 0x7a, 0x69,
+0x20, 0x67, 0x77, 0x61, 0x20, 0x6e, 0x61, 0x6e, 0x65, 0x3b, 0x70, 0x61, 0x20, 0x6d, 0x77, 0x65, 0x64, 0x7a, 0x69, 0x20,
+0x67, 0x77, 0x61, 0x20, 0x74, 0x69, 0x73, 0x61, 0x3b, 0x70, 0x61, 0x20, 0x6d, 0x77, 0x65, 0x64, 0x7a, 0x69, 0x20, 0x67,
+0x77, 0x61, 0x20, 0x6b, 0x75, 0x6d, 0x69, 0x3b, 0x70, 0x61, 0x20, 0x6d, 0x77, 0x65, 0x64, 0x7a, 0x69, 0x20, 0x67, 0x77,
+0x61, 0x20, 0x6b, 0x75, 0x6d, 0x69, 0x20, 0x6e, 0x61, 0x20, 0x6d, 0x6f, 0x6a, 0x61, 0x3b, 0x70, 0x61, 0x20, 0x6d, 0x77,
+0x65, 0x64, 0x7a, 0x69, 0x20, 0x67, 0x77, 0x61, 0x20, 0x6b, 0x75, 0x6d, 0x69, 0x20, 0x6e, 0x61, 0x20, 0x6d, 0x62, 0x69,
+0x6c, 0x69, 0x48, 0x75, 0x74, 0x3b, 0x56, 0x69, 0x6c, 0x3b, 0x44, 0x61, 0x74, 0x3b, 0x54, 0x61, 0x69, 0x3b, 0x48, 0x61,
+0x6e, 0x3b, 0x53, 0x69, 0x74, 0x3b, 0x53, 0x61, 0x62, 0x3b, 0x4e, 0x61, 0x6e, 0x3b, 0x54, 0x69, 0x73, 0x3b, 0x4b, 0x75,
+0x6d, 0x3b, 0x4b, 0x6d, 0x6a, 0x3b, 0x4b, 0x6d, 0x62, 0x48, 0x3b, 0x56, 0x3b, 0x44, 0x3b, 0x54, 0x3b, 0x48, 0x3b, 0x53,
+0x3b, 0x53, 0x3b, 0x4e, 0x3b, 0x54, 0x3b, 0x4b, 0x3b, 0x4b, 0x3b, 0x4b, 0x4a, 0x61, 0x6e, 0x75, 0x61, 0x72, 0x69, 0x3b,
+0x46, 0x65, 0x62, 0x72, 0x75, 0x61, 0x72, 0x69, 0x3b, 0x4d, 0x61, 0x63, 0x68, 0x69, 0x3b, 0x41, 0x70, 0x72, 0x69, 0x6c,
+0x79, 0x69, 0x3b, 0x4d, 0x65, 0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x79, 0x69, 0x3b, 0x4a, 0x75, 0x6c, 0x79, 0x61, 0x69, 0x3b,
+0x41, 0x67, 0x75, 0x73, 0x74, 0x69, 0x3b, 0x53, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x4f, 0x6b, 0x74, 0x6f,
+0x62, 0x61, 0x3b, 0x4e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x44, 0x65, 0x73, 0x65, 0x6d, 0x62, 0x61, 0x7a, 0x61,
+0x6e, 0x77, 0x75, 0x79, 0x65, 0x3b, 0x66, 0x65, 0x62, 0x75, 0x72, 0x75, 0x79, 0x65, 0x3b, 0x6d, 0x61, 0x72, 0x69, 0x73,
+0x69, 0x3b, 0x61, 0x77, 0x69, 0x72, 0x69, 0x6c, 0x69, 0x3b, 0x6d, 0x25b, 0x3b, 0x7a, 0x75, 0x77, 0x25b, 0x6e, 0x3b, 0x7a,
+0x75, 0x6c, 0x75, 0x79, 0x65, 0x3b, 0x75, 0x74, 0x69, 0x3b, 0x73, 0x25b, 0x74, 0x61, 0x6e, 0x62, 0x75, 0x72, 0x75, 0x3b,
+0x254, 0x6b, 0x75, 0x74, 0x254, 0x62, 0x75, 0x72, 0x75, 0x3b, 0x6e, 0x6f, 0x77, 0x61, 0x6e, 0x62, 0x75, 0x72, 0x75, 0x3b,
+0x64, 0x65, 0x73, 0x61, 0x6e, 0x62, 0x75, 0x72, 0x75, 0x7a, 0x61, 0x6e, 0x3b, 0x66, 0x65, 0x62, 0x3b, 0x6d, 0x61, 0x72,
+0x3b, 0x61, 0x77, 0x69, 0x3b, 0x6d, 0x25b, 0x3b, 0x7a, 0x75, 0x77, 0x3b, 0x7a, 0x75, 0x6c, 0x3b, 0x75, 0x74, 0x69, 0x3b,
+0x73, 0x25b, 0x74, 0x3b, 0x254, 0x6b, 0x75, 0x3b, 0x6e, 0x6f, 0x77, 0x3b, 0x64, 0x65, 0x73, 0x5a, 0x3b, 0x46, 0x3b, 0x4d,
+0x3b, 0x41, 0x3b, 0x4d, 0x3b, 0x5a, 0x3b, 0x5a, 0x3b, 0x55, 0x3b, 0x53, 0x3b, 0x186, 0x3b, 0x4e, 0x3b, 0x44, 0x4d, 0x77,
+0x65, 0x72, 0x69, 0x20, 0x77, 0x61, 0x20, 0x6d, 0x62, 0x65, 0x72, 0x65, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x69, 0x20, 0x77,
+0x61, 0x20, 0x6b, 0x61, 0x129, 0x72, 0x69, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x69, 0x20, 0x77, 0x61, 0x20, 0x6b, 0x61, 0x74,
+0x68, 0x61, 0x74, 0x169, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x69, 0x20, 0x77, 0x61, 0x20, 0x6b, 0x61, 0x6e, 0x61, 0x3b, 0x4d,
+0x77, 0x65, 0x72, 0x69, 0x20, 0x77, 0x61, 0x20, 0x67, 0x61, 0x74, 0x61, 0x6e, 0x6f, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x69,
+0x20, 0x77, 0x61, 0x20, 0x67, 0x61, 0x74, 0x61, 0x6e, 0x74, 0x61, 0x74, 0x169, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x69, 0x20,
+0x77, 0x61, 0x20, 0x6d, 0x169, 0x67, 0x77, 0x61, 0x6e, 0x6a, 0x61, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x69, 0x20, 0x77, 0x61,
+0x20, 0x6b, 0x61, 0x6e, 0x61, 0x6e, 0x61, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x69, 0x20, 0x77, 0x61, 0x20, 0x6b, 0x65, 0x6e,
+0x64, 0x61, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x69, 0x20, 0x77, 0x61, 0x20, 0x69, 0x6b, 0x169, 0x6d, 0x69, 0x3b, 0x4d, 0x77,
+0x65, 0x72, 0x69, 0x20, 0x77, 0x61, 0x20, 0x69, 0x6b, 0x169, 0x6d, 0x69, 0x20, 0x6e, 0x61, 0x20, 0x169, 0x6d, 0x77, 0x65,
+0x3b, 0x4d, 0x77, 0x65, 0x72, 0x69, 0x20, 0x77, 0x61, 0x20, 0x69, 0x6b, 0x169, 0x6d, 0x69, 0x20, 0x6e, 0x61, 0x20, 0x4b,
+0x61, 0x129, 0x72, 0x129, 0x4d, 0x62, 0x65, 0x3b, 0x4b, 0x61, 0x69, 0x3b, 0x4b, 0x61, 0x74, 0x3b, 0x4b, 0x61, 0x6e, 0x3b,
+0x47, 0x61, 0x74, 0x3b, 0x47, 0x61, 0x6e, 0x3b, 0x4d, 0x75, 0x67, 0x3b, 0x4b, 0x6e, 0x6e, 0x3b, 0x4b, 0x65, 0x6e, 0x3b,
+0x49, 0x6b, 0x75, 0x3b, 0x49, 0x6d, 0x77, 0x3b, 0x49, 0x67, 0x69, 0x4d, 0x3b, 0x4b, 0x3b, 0x4b, 0x3b, 0x4b, 0x3b, 0x47,
+0x3b, 0x47, 0x3b, 0x4d, 0x3b, 0x4b, 0x3b, 0x4b, 0x3b, 0x49, 0x3b, 0x49, 0x3b, 0x49, 0x13a4, 0x13c3, 0x13b8, 0x13d4, 0x13c5, 0x3b,
+0x13a7, 0x13a6, 0x13b5, 0x3b, 0x13a0, 0x13c5, 0x13f1, 0x3b, 0x13a7, 0x13ec, 0x13c2, 0x3b, 0x13a0, 0x13c2, 0x13cd, 0x13ac, 0x13d8, 0x3b, 0x13d5, 0x13ad,
+0x13b7, 0x13f1, 0x3b, 0x13ab, 0x13f0, 0x13c9, 0x13c2, 0x3b, 0x13a6, 0x13b6, 0x13c2, 0x3b, 0x13da, 0x13b5, 0x13cd, 0x13d7, 0x3b, 0x13da, 0x13c2, 0x13c5,
+0x13d7, 0x3b, 0x13c5, 0x13d3, 0x13d5, 0x13c6, 0x3b, 0x13a5, 0x13cd, 0x13a9, 0x13f1, 0x13a4, 0x13c3, 0x3b, 0x13a7, 0x13a6, 0x3b, 0x13a0, 0x13c5, 0x3b,
+0x13a7, 0x13ec, 0x3b, 0x13a0, 0x13c2, 0x3b, 0x13d5, 0x13ad, 0x3b, 0x13ab, 0x13f0, 0x3b, 0x13a6, 0x13b6, 0x3b, 0x13da, 0x13b5, 0x3b, 0x13da, 0x13c2,
+0x3b, 0x13c5, 0x13d3, 0x3b, 0x13a5, 0x13cd, 0x13a4, 0x3b, 0x13a7, 0x3b, 0x13a0, 0x3b, 0x13a7, 0x3b, 0x13a0, 0x3b, 0x13d5, 0x3b, 0x13ab, 0x3b,
+0x13a6, 0x3b, 0x13da, 0x3b, 0x13da, 0x3b, 0x13c5, 0x3b, 0x13a5, 0x7a, 0x61, 0x6e, 0x76, 0x69, 0x65, 0x3b, 0x66, 0x65, 0x76, 0x72,
+0x69, 0x79, 0x65, 0x3b, 0x6d, 0x61, 0x72, 0x73, 0x3b, 0x61, 0x76, 0x72, 0x69, 0x6c, 0x3b, 0x6d, 0x65, 0x3b, 0x7a, 0x69,
+0x6e, 0x3b, 0x7a, 0x69, 0x6c, 0x79, 0x65, 0x3b, 0x6f, 0x75, 0x74, 0x3b, 0x73, 0x65, 0x70, 0x74, 0x61, 0x6d, 0x3b, 0x6f,
+0x6b, 0x74, 0x6f, 0x62, 0x3b, 0x6e, 0x6f, 0x76, 0x61, 0x6d, 0x3b, 0x64, 0x65, 0x73, 0x61, 0x6d, 0x7a, 0x61, 0x6e, 0x3b,
+0x66, 0x65, 0x76, 0x3b, 0x6d, 0x61, 0x72, 0x3b, 0x61, 0x76, 0x72, 0x3b, 0x6d, 0x65, 0x3b, 0x7a, 0x69, 0x6e, 0x3b, 0x7a,
+0x69, 0x6c, 0x3b, 0x6f, 0x75, 0x74, 0x3b, 0x73, 0x65, 0x70, 0x3b, 0x6f, 0x6b, 0x74, 0x3b, 0x6e, 0x6f, 0x76, 0x3b, 0x64,
+0x65, 0x73, 0x7a, 0x3b, 0x66, 0x3b, 0x6d, 0x3b, 0x61, 0x3b, 0x6d, 0x3b, 0x7a, 0x3b, 0x7a, 0x3b, 0x6f, 0x3b, 0x73, 0x3b,
+0x6f, 0x3b, 0x6e, 0x3b, 0x64, 0x4d, 0x77, 0x65, 0x64, 0x69, 0x20, 0x4e, 0x74, 0x61, 0x6e, 0x64, 0x69, 0x3b, 0x4d, 0x77,
+0x65, 0x64, 0x69, 0x20, 0x77, 0x61, 0x20, 0x50, 0x69, 0x6c, 0x69, 0x3b, 0x4d, 0x77, 0x65, 0x64, 0x69, 0x20, 0x77, 0x61,
+0x20, 0x54, 0x61, 0x74, 0x75, 0x3b, 0x4d, 0x77, 0x65, 0x64, 0x69, 0x20, 0x77, 0x61, 0x20, 0x4e, 0x63, 0x68, 0x65, 0x63,
+0x68, 0x69, 0x3b, 0x4d, 0x77, 0x65, 0x64, 0x69, 0x20, 0x77, 0x61, 0x20, 0x4e, 0x6e, 0x79, 0x61, 0x6e, 0x6f, 0x3b, 0x4d,
+0x77, 0x65, 0x64, 0x69, 0x20, 0x77, 0x61, 0x20, 0x4e, 0x6e, 0x79, 0x61, 0x6e, 0x6f, 0x20, 0x6e, 0x61, 0x20, 0x55, 0x6d,
+0x6f, 0x3b, 0x4d, 0x77, 0x65, 0x64, 0x69, 0x20, 0x77, 0x61, 0x20, 0x4e, 0x6e, 0x79, 0x61, 0x6e, 0x6f, 0x20, 0x6e, 0x61,
+0x20, 0x4d, 0x69, 0x76, 0x69, 0x6c, 0x69, 0x3b, 0x4d, 0x77, 0x65, 0x64, 0x69, 0x20, 0x77, 0x61, 0x20, 0x4e, 0x6e, 0x79,
+0x61, 0x6e, 0x6f, 0x20, 0x6e, 0x61, 0x20, 0x4d, 0x69, 0x74, 0x61, 0x74, 0x75, 0x3b, 0x4d, 0x77, 0x65, 0x64, 0x69, 0x20,
+0x77, 0x61, 0x20, 0x4e, 0x6e, 0x79, 0x61, 0x6e, 0x6f, 0x20, 0x6e, 0x61, 0x20, 0x4e, 0x63, 0x68, 0x65, 0x63, 0x68, 0x69,
 0x3b, 0x4d, 0x77, 0x65, 0x64, 0x69, 0x20, 0x77, 0x61, 0x20, 0x4e, 0x6e, 0x79, 0x61, 0x6e, 0x6f, 0x20, 0x6e, 0x61, 0x20,
-0x4e, 0x6e, 0x79, 0x61, 0x6e, 0x6f, 0x20, 0x6e, 0x61, 0x20, 0x55, 0x3b, 0x4d, 0x77, 0x65, 0x64, 0x69, 0x20, 0x77, 0x61,
-0x20, 0x4e, 0x6e, 0x79, 0x61, 0x6e, 0x6f, 0x20, 0x6e, 0x61, 0x20, 0x4e, 0x6e, 0x79, 0x61, 0x6e, 0x6f, 0x20, 0x6e, 0x61,
-0x20, 0x4d, 0x3b, 0x46, 0xfa, 0x6e, 0x67, 0x61, 0x74, 0x268, 0x3b, 0x4e, 0x61, 0x61, 0x6e, 0x268, 0x3b, 0x4b, 0x65, 0x65,
-0x6e, 0x64, 0x61, 0x3b, 0x49, 0x6b, 0xfa, 0x6d, 0x69, 0x3b, 0x49, 0x6e, 0x79, 0x61, 0x6d, 0x62, 0x61, 0x6c, 0x61, 0x3b,
-0x49, 0x64, 0x77, 0x61, 0x61, 0x74, 0x61, 0x3b, 0x4d, 0x289, 0x289, 0x6e, 0x63, 0x68, 0x268, 0x3b, 0x56, 0x268, 0x268, 0x72,
-0x268, 0x3b, 0x53, 0x61, 0x61, 0x74, 0x289, 0x3b, 0x49, 0x6e, 0x79, 0x69, 0x3b, 0x53, 0x61, 0x61, 0x6e, 0x6f, 0x3b, 0x53,
-0x61, 0x73, 0x61, 0x74, 0x289, 0x3b, 0x4b, 0x289, 0x66, 0xfa, 0x6e, 0x67, 0x61, 0x74, 0x268, 0x3b, 0x4b, 0x289, 0x6e, 0x61,
-0x61, 0x6e, 0x268, 0x3b, 0x4b, 0x289, 0x6b, 0x65, 0x65, 0x6e, 0x64, 0x61, 0x3b, 0x4b, 0x77, 0x69, 0x69, 0x6b, 0x75, 0x6d,
-0x69, 0x3b, 0x4b, 0x77, 0x69, 0x69, 0x6e, 0x79, 0x61, 0x6d, 0x62, 0xe1, 0x6c, 0x61, 0x3b, 0x4b, 0x77, 0x69, 0x69, 0x64,
-0x77, 0x61, 0x61, 0x74, 0x61, 0x3b, 0x4b, 0x289, 0x6d, 0x289, 0x289, 0x6e, 0x63, 0x68, 0x268, 0x3b, 0x4b, 0x289, 0x76, 0x268,
-0x268, 0x72, 0x268, 0x3b, 0x4b, 0x289, 0x73, 0x61, 0x61, 0x74, 0x289, 0x3b, 0x4b, 0x77, 0x69, 0x69, 0x6e, 0x79, 0x69, 0x3b,
-0x4b, 0x289, 0x73, 0x61, 0x61, 0x6e, 0x6f, 0x3b, 0x4b, 0x289, 0x73, 0x61, 0x73, 0x61, 0x74, 0x289, 0x3b, 0x46, 0x3b, 0x4e,
-0x3b, 0x4b, 0x3b, 0x49, 0x3b, 0x49, 0x3b, 0x49, 0x3b, 0x4d, 0x3b, 0x56, 0x3b, 0x53, 0x3b, 0x49, 0x3b, 0x53, 0x3b, 0x53,
-0x3b, 0x4a, 0x61, 0x6e, 0x3b, 0x46, 0x65, 0x62, 0x3b, 0x4d, 0x61, 0x72, 0x3b, 0x41, 0x70, 0x75, 0x3b, 0x4d, 0x61, 0x61,
-0x3b, 0x4a, 0x75, 0x75, 0x3b, 0x4a, 0x75, 0x6c, 0x3b, 0x41, 0x67, 0x75, 0x3b, 0x53, 0x65, 0x62, 0x3b, 0x4f, 0x6b, 0x69,
-0x3b, 0x4e, 0x6f, 0x76, 0x3b, 0x44, 0x65, 0x73, 0x3b, 0x4a, 0x61, 0x6e, 0x77, 0x61, 0x6c, 0x69, 0x79, 0x6f, 0x3b, 0x46,
-0x65, 0x62, 0x77, 0x61, 0x6c, 0x69, 0x79, 0x6f, 0x3b, 0x4d, 0x61, 0x72, 0x69, 0x73, 0x69, 0x3b, 0x41, 0x70, 0x75, 0x6c,
-0x69, 0x3b, 0x4d, 0x61, 0x61, 0x79, 0x69, 0x3b, 0x4a, 0x75, 0x75, 0x6e, 0x69, 0x3b, 0x4a, 0x75, 0x6c, 0x61, 0x61, 0x79,
-0x69, 0x3b, 0x41, 0x67, 0x75, 0x73, 0x69, 0x74, 0x6f, 0x3b, 0x53, 0x65, 0x62, 0x75, 0x74, 0x74, 0x65, 0x6d, 0x62, 0x61,
-0x3b, 0x4f, 0x6b, 0x69, 0x74, 0x6f, 0x62, 0x62, 0x61, 0x3b, 0x4e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x44, 0x65,
-0x73, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x4a, 0x61, 0x6e, 0x3b, 0x46, 0x65, 0x62, 0x3b, 0x4d, 0x61, 0x63, 0x3b, 0x45, 0x70,
-0x72, 0x3b, 0x4d, 0x65, 0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x3b, 0x4a, 0x75, 0x6c, 0x3b, 0x4f, 0x67, 0x61, 0x3b, 0x53, 0x65,
-0x70, 0x3b, 0x4f, 0x6b, 0x74, 0x3b, 0x4e, 0x6f, 0x76, 0x3b, 0x44, 0x69, 0x73, 0x3b, 0x4a, 0x61, 0x6e, 0x75, 0x61, 0x72,
-0x69, 0x3b, 0x46, 0x65, 0x62, 0x72, 0x75, 0x61, 0x72, 0x69, 0x3b, 0x4d, 0x61, 0x63, 0x68, 0x69, 0x3b, 0x45, 0x70, 0x72,
-0x65, 0x6f, 0x3b, 0x4d, 0x65, 0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x69, 0x3b, 0x4a, 0x75, 0x6c, 0x61, 0x69, 0x3b, 0x4f, 0x67,
-0x61, 0x73, 0x74, 0x69, 0x3b, 0x53, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x4f, 0x6b, 0x74, 0x6f, 0x62, 0x61,
-0x3b, 0x4e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x44, 0x69, 0x73, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x4a, 0x3b, 0x46,
-0x3b, 0x4d, 0x3b, 0x45, 0x3b, 0x4d, 0x3b, 0x4a, 0x3b, 0x4a, 0x3b, 0x4f, 0x3b, 0x53, 0x3b, 0x4f, 0x3b, 0x4e, 0x3b, 0x44,
-0x3b, 0x4a, 0x61, 0x6e, 0x3b, 0x46, 0x65, 0x62, 0x3b, 0x4d, 0x61, 0x72, 0x3b, 0x41, 0x62, 0x72, 0x3b, 0x4d, 0x61, 0x69,
-0x3b, 0x4a, 0x75, 0x6e, 0x3b, 0x4a, 0x75, 0x6c, 0x3b, 0x41, 0x67, 0x6f, 0x3b, 0x53, 0x65, 0x74, 0x3b, 0x4f, 0x74, 0x75,
-0x3b, 0x4e, 0x75, 0x76, 0x3b, 0x44, 0x69, 0x7a, 0x3b, 0x4a, 0x61, 0x6e, 0x65, 0x72, 0x75, 0x3b, 0x46, 0x65, 0x62, 0x72,
-0x65, 0x72, 0x75, 0x3b, 0x4d, 0x61, 0x72, 0x73, 0x75, 0x3b, 0x41, 0x62, 0x72, 0x69, 0x6c, 0x3b, 0x4d, 0x61, 0x69, 0x75,
-0x3b, 0x4a, 0x75, 0x6e, 0x68, 0x75, 0x3b, 0x4a, 0x75, 0x6c, 0x68, 0x75, 0x3b, 0x41, 0x67, 0x6f, 0x73, 0x74, 0x75, 0x3b,
-0x53, 0x65, 0x74, 0x65, 0x6e, 0x62, 0x72, 0x75, 0x3b, 0x4f, 0x74, 0x75, 0x62, 0x72, 0x75, 0x3b, 0x4e, 0x75, 0x76, 0x65,
-0x6e, 0x62, 0x72, 0x75, 0x3b, 0x44, 0x69, 0x7a, 0x65, 0x6e, 0x62, 0x72, 0x75, 0x3b, 0x4a, 0x41, 0x4e, 0x3b, 0x46, 0x45,
+0x4e, 0x6e, 0x79, 0x61, 0x6e, 0x6f, 0x3b, 0x4d, 0x77, 0x65, 0x64, 0x69, 0x20, 0x77, 0x61, 0x20, 0x4e, 0x6e, 0x79, 0x61,
+0x6e, 0x6f, 0x20, 0x6e, 0x61, 0x20, 0x4e, 0x6e, 0x79, 0x61, 0x6e, 0x6f, 0x20, 0x6e, 0x61, 0x20, 0x55, 0x3b, 0x4d, 0x77,
+0x65, 0x64, 0x69, 0x20, 0x77, 0x61, 0x20, 0x4e, 0x6e, 0x79, 0x61, 0x6e, 0x6f, 0x20, 0x6e, 0x61, 0x20, 0x4e, 0x6e, 0x79,
+0x61, 0x6e, 0x6f, 0x20, 0x6e, 0x61, 0x20, 0x4d, 0x4b, 0x289, 0x66, 0xfa, 0x6e, 0x67, 0x61, 0x74, 0x268, 0x3b, 0x4b, 0x289,
+0x6e, 0x61, 0x61, 0x6e, 0x268, 0x3b, 0x4b, 0x289, 0x6b, 0x65, 0x65, 0x6e, 0x64, 0x61, 0x3b, 0x4b, 0x77, 0x69, 0x69, 0x6b,
+0x75, 0x6d, 0x69, 0x3b, 0x4b, 0x77, 0x69, 0x69, 0x6e, 0x79, 0x61, 0x6d, 0x62, 0xe1, 0x6c, 0x61, 0x3b, 0x4b, 0x77, 0x69,
+0x69, 0x64, 0x77, 0x61, 0x61, 0x74, 0x61, 0x3b, 0x4b, 0x289, 0x6d, 0x289, 0x289, 0x6e, 0x63, 0x68, 0x268, 0x3b, 0x4b, 0x289,
+0x76, 0x268, 0x268, 0x72, 0x268, 0x3b, 0x4b, 0x289, 0x73, 0x61, 0x61, 0x74, 0x289, 0x3b, 0x4b, 0x77, 0x69, 0x69, 0x6e, 0x79,
+0x69, 0x3b, 0x4b, 0x289, 0x73, 0x61, 0x61, 0x6e, 0x6f, 0x3b, 0x4b, 0x289, 0x73, 0x61, 0x73, 0x61, 0x74, 0x289, 0x46, 0xfa,
+0x6e, 0x67, 0x61, 0x74, 0x268, 0x3b, 0x4e, 0x61, 0x61, 0x6e, 0x268, 0x3b, 0x4b, 0x65, 0x65, 0x6e, 0x64, 0x61, 0x3b, 0x49,
+0x6b, 0xfa, 0x6d, 0x69, 0x3b, 0x49, 0x6e, 0x79, 0x61, 0x6d, 0x62, 0x61, 0x6c, 0x61, 0x3b, 0x49, 0x64, 0x77, 0x61, 0x61,
+0x74, 0x61, 0x3b, 0x4d, 0x289, 0x289, 0x6e, 0x63, 0x68, 0x268, 0x3b, 0x56, 0x268, 0x268, 0x72, 0x268, 0x3b, 0x53, 0x61, 0x61,
+0x74, 0x289, 0x3b, 0x49, 0x6e, 0x79, 0x69, 0x3b, 0x53, 0x61, 0x61, 0x6e, 0x6f, 0x3b, 0x53, 0x61, 0x73, 0x61, 0x74, 0x289,
+0x46, 0x3b, 0x4e, 0x3b, 0x4b, 0x3b, 0x49, 0x3b, 0x49, 0x3b, 0x49, 0x3b, 0x4d, 0x3b, 0x56, 0x3b, 0x53, 0x3b, 0x49, 0x3b,
+0x53, 0x3b, 0x53, 0x4a, 0x61, 0x6e, 0x77, 0x61, 0x6c, 0x69, 0x79, 0x6f, 0x3b, 0x46, 0x65, 0x62, 0x77, 0x61, 0x6c, 0x69,
+0x79, 0x6f, 0x3b, 0x4d, 0x61, 0x72, 0x69, 0x73, 0x69, 0x3b, 0x41, 0x70, 0x75, 0x6c, 0x69, 0x3b, 0x4d, 0x61, 0x61, 0x79,
+0x69, 0x3b, 0x4a, 0x75, 0x75, 0x6e, 0x69, 0x3b, 0x4a, 0x75, 0x6c, 0x61, 0x61, 0x79, 0x69, 0x3b, 0x41, 0x67, 0x75, 0x73,
+0x69, 0x74, 0x6f, 0x3b, 0x53, 0x65, 0x62, 0x75, 0x74, 0x74, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x4f, 0x6b, 0x69, 0x74, 0x6f,
+0x62, 0x62, 0x61, 0x3b, 0x4e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x44, 0x65, 0x73, 0x65, 0x6d, 0x62, 0x61, 0x4a,
+0x61, 0x6e, 0x3b, 0x46, 0x65, 0x62, 0x3b, 0x4d, 0x61, 0x72, 0x3b, 0x41, 0x70, 0x75, 0x3b, 0x4d, 0x61, 0x61, 0x3b, 0x4a,
+0x75, 0x75, 0x3b, 0x4a, 0x75, 0x6c, 0x3b, 0x41, 0x67, 0x75, 0x3b, 0x53, 0x65, 0x62, 0x3b, 0x4f, 0x6b, 0x69, 0x3b, 0x4e,
+0x6f, 0x76, 0x3b, 0x44, 0x65, 0x73, 0x4a, 0x61, 0x6e, 0x75, 0x61, 0x72, 0x69, 0x3b, 0x46, 0x65, 0x62, 0x72, 0x75, 0x61,
+0x72, 0x69, 0x3b, 0x4d, 0x61, 0x63, 0x68, 0x69, 0x3b, 0x45, 0x70, 0x72, 0x65, 0x6f, 0x3b, 0x4d, 0x65, 0x69, 0x3b, 0x4a,
+0x75, 0x6e, 0x69, 0x3b, 0x4a, 0x75, 0x6c, 0x61, 0x69, 0x3b, 0x4f, 0x67, 0x61, 0x73, 0x74, 0x69, 0x3b, 0x53, 0x65, 0x70,
+0x74, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x4f, 0x6b, 0x74, 0x6f, 0x62, 0x61, 0x3b, 0x4e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x61,
+0x3b, 0x44, 0x69, 0x73, 0x65, 0x6d, 0x62, 0x61, 0x4a, 0x61, 0x6e, 0x3b, 0x46, 0x65, 0x62, 0x3b, 0x4d, 0x61, 0x63, 0x3b,
+0x45, 0x70, 0x72, 0x3b, 0x4d, 0x65, 0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x3b, 0x4a, 0x75, 0x6c, 0x3b, 0x4f, 0x67, 0x61, 0x3b,
+0x53, 0x65, 0x70, 0x3b, 0x4f, 0x6b, 0x74, 0x3b, 0x4e, 0x6f, 0x76, 0x3b, 0x44, 0x69, 0x73, 0x4a, 0x3b, 0x46, 0x3b, 0x4d,
+0x3b, 0x45, 0x3b, 0x4d, 0x3b, 0x4a, 0x3b, 0x4a, 0x3b, 0x4f, 0x3b, 0x53, 0x3b, 0x4f, 0x3b, 0x4e, 0x3b, 0x44, 0x4a, 0x61,
+0x6e, 0x65, 0x72, 0x75, 0x3b, 0x46, 0x65, 0x62, 0x72, 0x65, 0x72, 0x75, 0x3b, 0x4d, 0x61, 0x72, 0x73, 0x75, 0x3b, 0x41,
+0x62, 0x72, 0x69, 0x6c, 0x3b, 0x4d, 0x61, 0x69, 0x75, 0x3b, 0x4a, 0x75, 0x6e, 0x68, 0x75, 0x3b, 0x4a, 0x75, 0x6c, 0x68,
+0x75, 0x3b, 0x41, 0x67, 0x6f, 0x73, 0x74, 0x75, 0x3b, 0x53, 0x65, 0x74, 0x65, 0x6e, 0x62, 0x72, 0x75, 0x3b, 0x4f, 0x74,
+0x75, 0x62, 0x72, 0x75, 0x3b, 0x4e, 0x75, 0x76, 0x65, 0x6e, 0x62, 0x72, 0x75, 0x3b, 0x44, 0x69, 0x7a, 0x65, 0x6e, 0x62,
+0x72, 0x75, 0x4a, 0x61, 0x6e, 0x3b, 0x46, 0x65, 0x62, 0x3b, 0x4d, 0x61, 0x72, 0x3b, 0x41, 0x62, 0x72, 0x3b, 0x4d, 0x61,
+0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x3b, 0x4a, 0x75, 0x6c, 0x3b, 0x41, 0x67, 0x6f, 0x3b, 0x53, 0x65, 0x74, 0x3b, 0x4f, 0x74,
+0x75, 0x3b, 0x4e, 0x75, 0x76, 0x3b, 0x44, 0x69, 0x7a, 0x4a, 0x61, 0x6e, 0x75, 0x61, 0x72, 0x129, 0x3b, 0x46, 0x65, 0x62,
+0x75, 0x72, 0x75, 0x61, 0x72, 0x129, 0x3b, 0x4d, 0x61, 0x63, 0x68, 0x69, 0x3b, 0x128, 0x70, 0x75, 0x72, 0x169, 0x3b, 0x4d,
+0x129, 0x129, 0x3b, 0x4e, 0x6a, 0x75, 0x6e, 0x69, 0x3b, 0x4e, 0x6a, 0x75, 0x72, 0x61, 0x129, 0x3b, 0x41, 0x67, 0x61, 0x73,
+0x74, 0x69, 0x3b, 0x53, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x4f, 0x6b, 0x74, 0x169, 0x62, 0x61, 0x3b, 0x4e,
+0x6f, 0x76, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x44, 0x69, 0x63, 0x65, 0x6d, 0x62, 0x61, 0x4a, 0x41, 0x4e, 0x3b, 0x46, 0x45,
 0x42, 0x3b, 0x4d, 0x41, 0x43, 0x3b, 0x128, 0x50, 0x55, 0x3b, 0x4d, 0x128, 0x128, 0x3b, 0x4e, 0x4a, 0x55, 0x3b, 0x4e, 0x4a,
 0x52, 0x3b, 0x41, 0x47, 0x41, 0x3b, 0x53, 0x50, 0x54, 0x3b, 0x4f, 0x4b, 0x54, 0x3b, 0x4e, 0x4f, 0x56, 0x3b, 0x44, 0x45,
-0x43, 0x3b, 0x4a, 0x61, 0x6e, 0x75, 0x61, 0x72, 0x129, 0x3b, 0x46, 0x65, 0x62, 0x75, 0x72, 0x75, 0x61, 0x72, 0x129, 0x3b,
-0x4d, 0x61, 0x63, 0x68, 0x69, 0x3b, 0x128, 0x70, 0x75, 0x72, 0x169, 0x3b, 0x4d, 0x129, 0x129, 0x3b, 0x4e, 0x6a, 0x75, 0x6e,
-0x69, 0x3b, 0x4e, 0x6a, 0x75, 0x72, 0x61, 0x129, 0x3b, 0x41, 0x67, 0x61, 0x73, 0x74, 0x69, 0x3b, 0x53, 0x65, 0x70, 0x74,
-0x65, 0x6d, 0x62, 0x61, 0x3b, 0x4f, 0x6b, 0x74, 0x169, 0x62, 0x61, 0x3b, 0x4e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x61, 0x3b,
-0x44, 0x69, 0x63, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x4a, 0x3b, 0x46, 0x3b, 0x4d, 0x3b, 0x128, 0x3b, 0x4d, 0x3b, 0x4e, 0x3b,
-0x4e, 0x3b, 0x41, 0x3b, 0x53, 0x3b, 0x4f, 0x3b, 0x4e, 0x3b, 0x44, 0x3b, 0x4d, 0x75, 0x6c, 0x3b, 0x4e, 0x67, 0x61, 0x74,
-0x3b, 0x54, 0x61, 0x61, 0x3b, 0x49, 0x77, 0x6f, 0x3b, 0x4d, 0x61, 0x6d, 0x3b, 0x50, 0x61, 0x61, 0x3b, 0x4e, 0x67, 0x65,
-0x3b, 0x52, 0x6f, 0x6f, 0x3b, 0x42, 0x75, 0x72, 0x3b, 0x45, 0x70, 0x65, 0x3b, 0x4b, 0x70, 0x74, 0x3b, 0x4b, 0x70, 0x61,
-0x3b, 0x4d, 0x75, 0x6c, 0x67, 0x75, 0x6c, 0x3b, 0x4e, 0x67, 0x2019, 0x61, 0x74, 0x79, 0x61, 0x61, 0x74, 0x6f, 0x3b, 0x4b,
-0x69, 0x70, 0x74, 0x61, 0x61, 0x6d, 0x6f, 0x3b, 0x49, 0x77, 0x6f, 0x6f, 0x74, 0x6b, 0x75, 0x75, 0x74, 0x3b, 0x4d, 0x61,
-0x6d, 0x75, 0x75, 0x74, 0x3b, 0x50, 0x61, 0x61, 0x67, 0x69, 0x3b, 0x4e, 0x67, 0x2019, 0x65, 0x69, 0x79, 0x65, 0x65, 0x74,
-0x3b, 0x52, 0x6f, 0x6f, 0x70, 0x74, 0x75, 0x69, 0x3b, 0x42, 0x75, 0x72, 0x65, 0x65, 0x74, 0x3b, 0x45, 0x70, 0x65, 0x65,
-0x73, 0x6f, 0x3b, 0x4b, 0x69, 0x70, 0x73, 0x75, 0x75, 0x6e, 0x64, 0x65, 0x20, 0x6e, 0x65, 0x20, 0x74, 0x61, 0x61, 0x69,
-0x3b, 0x4b, 0x69, 0x70, 0x73, 0x75, 0x75, 0x6e, 0x64, 0x65, 0x20, 0x6e, 0x65, 0x62, 0x6f, 0x20, 0x61, 0x65, 0x6e, 0x67,
-0x2019, 0x3b, 0x4d, 0x3b, 0x4e, 0x3b, 0x54, 0x3b, 0x49, 0x3b, 0x4d, 0x3b, 0x50, 0x3b, 0x4e, 0x3b, 0x52, 0x3b, 0x42, 0x3b,
-0x45, 0x3b, 0x4b, 0x3b, 0x4b, 0x3b, 0x1c3, 0x4b, 0x68, 0x61, 0x6e, 0x6e, 0x69, 0x3b, 0x1c3, 0x4b, 0x68, 0x61, 0x6e, 0x1c0,
-0x67, 0xf4, 0x61, 0x62, 0x3b, 0x1c0, 0x4b, 0x68, 0x75, 0x75, 0x1c1, 0x6b, 0x68, 0xe2, 0x62, 0x3b, 0x1c3, 0x48, 0xf4, 0x61,
-0x1c2, 0x6b, 0x68, 0x61, 0x69, 0x62, 0x3b, 0x1c3, 0x4b, 0x68, 0x61, 0x69, 0x74, 0x73, 0xe2, 0x62, 0x3b, 0x47, 0x61, 0x6d,
-0x61, 0x1c0, 0x61, 0x65, 0x62, 0x3b, 0x1c2, 0x4b, 0x68, 0x6f, 0x65, 0x73, 0x61, 0x6f, 0x62, 0x3b, 0x41, 0x6f, 0x1c1, 0x6b,
-0x68, 0x75, 0x75, 0x6d, 0xfb, 0x1c1, 0x6b, 0x68, 0xe2, 0x62, 0x3b, 0x54, 0x61, 0x72, 0x61, 0x1c0, 0x6b, 0x68, 0x75, 0x75,
-0x6d, 0xfb, 0x1c1, 0x6b, 0x68, 0xe2, 0x62, 0x3b, 0x1c2, 0x4e, 0xfb, 0x1c1, 0x6e, 0xe2, 0x69, 0x73, 0x65, 0x62, 0x3b, 0x1c0,
-0x48, 0x6f, 0x6f, 0x1c2, 0x67, 0x61, 0x65, 0x62, 0x3b, 0x48, 0xf4, 0x61, 0x73, 0x6f, 0x72, 0x65, 0x1c1, 0x6b, 0x68, 0xe2,
-0x62, 0x3b, 0x4a, 0x61, 0x6e, 0x2e, 0x3b, 0x46, 0xe4, 0x62, 0x2e, 0x3b, 0x4d, 0xe4, 0x7a, 0x2e, 0x3b, 0x41, 0x70, 0x72,
-0x2e, 0x3b, 0x4d, 0x61, 0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x2e, 0x3b, 0x4a, 0x75, 0x6c, 0x2e, 0x3b, 0x4f, 0x75, 0x6a, 0x2e,
-0x3b, 0x53, 0xe4, 0x70, 0x2e, 0x3b, 0x4f, 0x6b, 0x74, 0x2e, 0x3b, 0x4e, 0x6f, 0x76, 0x2e, 0x3b, 0x44, 0x65, 0x7a, 0x2e,
-0x3b, 0x4a, 0x61, 0x6e, 0x6e, 0x65, 0x77, 0x61, 0x3b, 0x46, 0xe4, 0x62, 0x72, 0x6f, 0x77, 0x61, 0x3b, 0x4d, 0xe4, 0xe4,
-0x7a, 0x3b, 0x41, 0x70, 0x72, 0x65, 0x6c, 0x6c, 0x3b, 0x4d, 0x61, 0x69, 0x3b, 0x4a, 0x75, 0x75, 0x6e, 0x69, 0x3b, 0x4a,
-0x75, 0x75, 0x6c, 0x69, 0x3b, 0x4f, 0x75, 0x6a, 0x6f, 0xdf, 0x3b, 0x53, 0x65, 0x70, 0x74, 0xe4, 0x6d, 0x62, 0x65, 0x72,
-0x3b, 0x4f, 0x6b, 0x74, 0x6f, 0x68, 0x62, 0x65, 0x72, 0x3b, 0x4e, 0x6f, 0x76, 0xe4, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x44,
-0x65, 0x7a, 0xe4, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x4a, 0x61, 0x6e, 0x3b, 0x46, 0xe4, 0x62, 0x3b, 0x4d, 0xe4, 0x7a, 0x3b,
-0x41, 0x70, 0x72, 0x3b, 0x4d, 0x61, 0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x3b, 0x4a, 0x75, 0x6c, 0x3b, 0x4f, 0x75, 0x6a, 0x3b,
-0x53, 0xe4, 0x70, 0x3b, 0x4f, 0x6b, 0x74, 0x3b, 0x4e, 0x6f, 0x76, 0x3b, 0x44, 0x65, 0x7a, 0x3b, 0x44, 0x61, 0x6c, 0x3b,
-0x41, 0x72, 0xe1, 0x3b, 0x186, 0x25b, 0x6e, 0x3b, 0x44, 0x6f, 0x79, 0x3b, 0x4c, 0xe9, 0x70, 0x3b, 0x52, 0x6f, 0x6b, 0x3b,
-0x53, 0xe1, 0x73, 0x3b, 0x42, 0x254, 0x301, 0x72, 0x3b, 0x4b, 0xfa, 0x73, 0x3b, 0x47, 0xed, 0x73, 0x3b, 0x53, 0x68, 0x289,
-0x301, 0x3b, 0x4e, 0x74, 0x289, 0x301, 0x3b, 0x4f, 0x6c, 0x61, 0x64, 0x61, 0x6c, 0x289, 0x301, 0x3b, 0x41, 0x72, 0xe1, 0x74,
-0x3b, 0x186, 0x25b, 0x6e, 0x268, 0x301, 0x254, 0x268, 0x14b, 0x254, 0x6b, 0x3b, 0x4f, 0x6c, 0x6f, 0x64, 0x6f, 0x79, 0xed, 0xf3,
-0x72, 0xed, 0xea, 0x20, 0x69, 0x6e, 0x6b, 0xf3, 0x6b, 0xfa, 0xe2, 0x3b, 0x4f, 0x6c, 0x6f, 0x69, 0x6c, 0xe9, 0x70, 0x16b,
-0x6e, 0x79, 0x12b, 0x113, 0x20, 0x69, 0x6e, 0x6b, 0xf3, 0x6b, 0xfa, 0xe2, 0x3b, 0x4b, 0xfa, 0x6a, 0xfa, 0x254, 0x72, 0x254,
-0x6b, 0x3b, 0x4d, 0xf3, 0x72, 0x75, 0x73, 0xe1, 0x73, 0x69, 0x6e, 0x3b, 0x186, 0x6c, 0x254, 0x301, 0x268, 0x301, 0x62, 0x254,
-0x301, 0x72, 0xe1, 0x72, 0x25b, 0x3b, 0x4b, 0xfa, 0x73, 0x68, 0xee, 0x6e, 0x3b, 0x4f, 0x6c, 0x67, 0xed, 0x73, 0x61, 0x6e,
-0x3b, 0x50, 0x289, 0x73, 0x68, 0x289, 0x301, 0x6b, 0x61, 0x3b, 0x4e, 0x74, 0x289, 0x301, 0x14b, 0x289, 0x301, 0x73, 0x3b, 0x4a,
-0x61, 0x6e, 0x3b, 0x46, 0x65, 0x62, 0x3b, 0x4d, 0x61, 0x72, 0x3b, 0x41, 0x70, 0x72, 0x3b, 0x4d, 0x65, 0x69, 0x3b, 0x4a,
-0x75, 0x6e, 0x3b, 0x4a, 0x75, 0x6c, 0x3b, 0x41, 0x67, 0x6f, 0x3b, 0x53, 0x65, 0x70, 0x3b, 0x4f, 0x6b, 0x74, 0x3b, 0x4e,
-0x6f, 0x76, 0x3b, 0x44, 0x65, 0x73, 0x3b, 0x4a, 0x61, 0x6e, 0x3b, 0x46, 0x65, 0x62, 0x3b, 0x4d, 0x61, 0x63, 0x3b, 0x41,
-0x70, 0x72, 0x3b, 0x4d, 0x65, 0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x3b, 0x4a, 0x75, 0x6c, 0x3b, 0x41, 0x67, 0x6f, 0x3b, 0x53,
-0x65, 0x70, 0x3b, 0x4f, 0x6b, 0x74, 0x3b, 0x4e, 0x6f, 0x76, 0x3b, 0x44, 0x65, 0x63, 0x3b, 0x52, 0x61, 0x72, 0x3b, 0x4d,
-0x75, 0x6b, 0x3b, 0x4b, 0x77, 0x61, 0x3b, 0x44, 0x75, 0x6e, 0x3b, 0x4d, 0x61, 0x72, 0x3b, 0x4d, 0x6f, 0x64, 0x3b, 0x4a,
-0x6f, 0x6c, 0x3b, 0x50, 0x65, 0x64, 0x3b, 0x53, 0x6f, 0x6b, 0x3b, 0x54, 0x69, 0x62, 0x3b, 0x4c, 0x61, 0x62, 0x3b, 0x50,
-0x6f, 0x6f, 0x3b, 0x4f, 0x72, 0x61, 0x72, 0x61, 0x3b, 0x4f, 0x6d, 0x75, 0x6b, 0x3b, 0x4f, 0x6b, 0x77, 0x61, 0x6d, 0x67,
-0x2019, 0x3b, 0x4f, 0x64, 0x75, 0x6e, 0x67, 0x2019, 0x65, 0x6c, 0x3b, 0x4f, 0x6d, 0x61, 0x72, 0x75, 0x6b, 0x3b, 0x4f, 0x6d,
-0x6f, 0x64, 0x6f, 0x6b, 0x2019, 0x6b, 0x69, 0x6e, 0x67, 0x2019, 0x6f, 0x6c, 0x3b, 0x4f, 0x6a, 0x6f, 0x6c, 0x61, 0x3b, 0x4f,
-0x70, 0x65, 0x64, 0x65, 0x6c, 0x3b, 0x4f, 0x73, 0x6f, 0x6b, 0x6f, 0x73, 0x6f, 0x6b, 0x6f, 0x6d, 0x61, 0x3b, 0x4f, 0x74,
-0x69, 0x62, 0x61, 0x72, 0x3b, 0x4f, 0x6c, 0x61, 0x62, 0x6f, 0x72, 0x3b, 0x4f, 0x70, 0x6f, 0x6f, 0x3b, 0x52, 0x3b, 0x4d,
-0x3b, 0x4b, 0x3b, 0x44, 0x3b, 0x4d, 0x3b, 0x4d, 0x3b, 0x4a, 0x3b, 0x50, 0x3b, 0x53, 0x3b, 0x54, 0x3b, 0x4c, 0x3b, 0x50,
-0x3b, 0x17d, 0x61, 0x6e, 0x3b, 0x46, 0x65, 0x65, 0x3b, 0x4d, 0x61, 0x72, 0x3b, 0x41, 0x77, 0x69, 0x3b, 0x4d, 0x65, 0x3b,
-0x17d, 0x75, 0x77, 0x3b, 0x17d, 0x75, 0x79, 0x3b, 0x55, 0x74, 0x3b, 0x53, 0x65, 0x6b, 0x3b, 0x4f, 0x6b, 0x74, 0x3b, 0x4e,
-0x6f, 0x6f, 0x3b, 0x44, 0x65, 0x65, 0x3b, 0x17d, 0x61, 0x6e, 0x77, 0x69, 0x79, 0x65, 0x3b, 0x46, 0x65, 0x65, 0x77, 0x69,
-0x72, 0x69, 0x79, 0x65, 0x3b, 0x4d, 0x61, 0x72, 0x73, 0x69, 0x3b, 0x41, 0x77, 0x69, 0x72, 0x69, 0x6c, 0x3b, 0x4d, 0x65,
-0x3b, 0x17d, 0x75, 0x77, 0x65, 0x14b, 0x3b, 0x17d, 0x75, 0x79, 0x79, 0x65, 0x3b, 0x55, 0x74, 0x3b, 0x53, 0x65, 0x6b, 0x74,
-0x61, 0x6e, 0x62, 0x75, 0x72, 0x3b, 0x4f, 0x6b, 0x74, 0x6f, 0x6f, 0x62, 0x75, 0x72, 0x3b, 0x4e, 0x6f, 0x6f, 0x77, 0x61,
-0x6e, 0x62, 0x75, 0x72, 0x3b, 0x44, 0x65, 0x65, 0x73, 0x61, 0x6e, 0x62, 0x75, 0x72, 0x3b, 0x17d, 0x3b, 0x46, 0x3b, 0x4d,
-0x3b, 0x41, 0x3b, 0x4d, 0x3b, 0x17d, 0x3b, 0x17d, 0x3b, 0x55, 0x3b, 0x53, 0x3b, 0x4f, 0x3b, 0x4e, 0x3b, 0x44, 0x3b, 0x44,
+0x43, 0x4a, 0x3b, 0x46, 0x3b, 0x4d, 0x3b, 0x128, 0x3b, 0x4d, 0x3b, 0x4e, 0x3b, 0x4e, 0x3b, 0x41, 0x3b, 0x53, 0x3b, 0x4f,
+0x3b, 0x4e, 0x3b, 0x44, 0x4d, 0x75, 0x6c, 0x67, 0x75, 0x6c, 0x3b, 0x4e, 0x67, 0x2019, 0x61, 0x74, 0x79, 0x61, 0x61, 0x74,
+0x6f, 0x3b, 0x4b, 0x69, 0x70, 0x74, 0x61, 0x61, 0x6d, 0x6f, 0x3b, 0x49, 0x77, 0x6f, 0x6f, 0x74, 0x6b, 0x75, 0x75, 0x74,
+0x3b, 0x4d, 0x61, 0x6d, 0x75, 0x75, 0x74, 0x3b, 0x50, 0x61, 0x61, 0x67, 0x69, 0x3b, 0x4e, 0x67, 0x2019, 0x65, 0x69, 0x79,
+0x65, 0x65, 0x74, 0x3b, 0x52, 0x6f, 0x6f, 0x70, 0x74, 0x75, 0x69, 0x3b, 0x42, 0x75, 0x72, 0x65, 0x65, 0x74, 0x3b, 0x45,
+0x70, 0x65, 0x65, 0x73, 0x6f, 0x3b, 0x4b, 0x69, 0x70, 0x73, 0x75, 0x75, 0x6e, 0x64, 0x65, 0x20, 0x6e, 0x65, 0x20, 0x74,
+0x61, 0x61, 0x69, 0x3b, 0x4b, 0x69, 0x70, 0x73, 0x75, 0x75, 0x6e, 0x64, 0x65, 0x20, 0x6e, 0x65, 0x62, 0x6f, 0x20, 0x61,
+0x65, 0x6e, 0x67, 0x2019, 0x4d, 0x75, 0x6c, 0x3b, 0x4e, 0x67, 0x61, 0x74, 0x3b, 0x54, 0x61, 0x61, 0x3b, 0x49, 0x77, 0x6f,
+0x3b, 0x4d, 0x61, 0x6d, 0x3b, 0x50, 0x61, 0x61, 0x3b, 0x4e, 0x67, 0x65, 0x3b, 0x52, 0x6f, 0x6f, 0x3b, 0x42, 0x75, 0x72,
+0x3b, 0x45, 0x70, 0x65, 0x3b, 0x4b, 0x70, 0x74, 0x3b, 0x4b, 0x70, 0x61, 0x4d, 0x3b, 0x4e, 0x3b, 0x54, 0x3b, 0x49, 0x3b,
+0x4d, 0x3b, 0x50, 0x3b, 0x4e, 0x3b, 0x52, 0x3b, 0x42, 0x3b, 0x45, 0x3b, 0x4b, 0x3b, 0x4b, 0x1c3, 0x4b, 0x68, 0x61, 0x6e,
+0x6e, 0x69, 0x3b, 0x1c3, 0x4b, 0x68, 0x61, 0x6e, 0x1c0, 0x67, 0xf4, 0x61, 0x62, 0x3b, 0x1c0, 0x4b, 0x68, 0x75, 0x75, 0x1c1,
+0x6b, 0x68, 0xe2, 0x62, 0x3b, 0x1c3, 0x48, 0xf4, 0x61, 0x1c2, 0x6b, 0x68, 0x61, 0x69, 0x62, 0x3b, 0x1c3, 0x4b, 0x68, 0x61,
+0x69, 0x74, 0x73, 0xe2, 0x62, 0x3b, 0x47, 0x61, 0x6d, 0x61, 0x1c0, 0x61, 0x65, 0x62, 0x3b, 0x1c2, 0x4b, 0x68, 0x6f, 0x65,
+0x73, 0x61, 0x6f, 0x62, 0x3b, 0x41, 0x6f, 0x1c1, 0x6b, 0x68, 0x75, 0x75, 0x6d, 0xfb, 0x1c1, 0x6b, 0x68, 0xe2, 0x62, 0x3b,
+0x54, 0x61, 0x72, 0x61, 0x1c0, 0x6b, 0x68, 0x75, 0x75, 0x6d, 0xfb, 0x1c1, 0x6b, 0x68, 0xe2, 0x62, 0x3b, 0x1c2, 0x4e, 0xfb,
+0x1c1, 0x6e, 0xe2, 0x69, 0x73, 0x65, 0x62, 0x3b, 0x1c0, 0x48, 0x6f, 0x6f, 0x1c2, 0x67, 0x61, 0x65, 0x62, 0x3b, 0x48, 0xf4,
+0x61, 0x73, 0x6f, 0x72, 0x65, 0x1c1, 0x6b, 0x68, 0xe2, 0x62, 0x4a, 0x61, 0x6e, 0x6e, 0x65, 0x77, 0x61, 0x3b, 0x46, 0xe4,
+0x62, 0x72, 0x6f, 0x77, 0x61, 0x3b, 0x4d, 0xe4, 0xe4, 0x7a, 0x3b, 0x41, 0x70, 0x72, 0x65, 0x6c, 0x6c, 0x3b, 0x4d, 0x61,
+0x69, 0x3b, 0x4a, 0x75, 0x75, 0x6e, 0x69, 0x3b, 0x4a, 0x75, 0x75, 0x6c, 0x69, 0x3b, 0x4f, 0x75, 0x6a, 0x6f, 0xdf, 0x3b,
+0x53, 0x65, 0x70, 0x74, 0xe4, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x4f, 0x6b, 0x74, 0x6f, 0x68, 0x62, 0x65, 0x72, 0x3b, 0x4e,
+0x6f, 0x76, 0xe4, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x44, 0x65, 0x7a, 0xe4, 0x6d, 0x62, 0x65, 0x72, 0x4a, 0x61, 0x6e, 0x2e,
+0x3b, 0x46, 0xe4, 0x62, 0x2e, 0x3b, 0x4d, 0xe4, 0x7a, 0x2e, 0x3b, 0x41, 0x70, 0x72, 0x2e, 0x3b, 0x4d, 0x61, 0x69, 0x3b,
+0x4a, 0x75, 0x6e, 0x2e, 0x3b, 0x4a, 0x75, 0x6c, 0x2e, 0x3b, 0x4f, 0x75, 0x6a, 0x2e, 0x3b, 0x53, 0xe4, 0x70, 0x2e, 0x3b,
+0x4f, 0x6b, 0x74, 0x2e, 0x3b, 0x4e, 0x6f, 0x76, 0x2e, 0x3b, 0x44, 0x65, 0x7a, 0x2e, 0x4a, 0x61, 0x6e, 0x3b, 0x46, 0xe4,
+0x62, 0x3b, 0x4d, 0xe4, 0x7a, 0x3b, 0x41, 0x70, 0x72, 0x3b, 0x4d, 0x61, 0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x3b, 0x4a, 0x75,
+0x6c, 0x3b, 0x4f, 0x75, 0x6a, 0x3b, 0x53, 0xe4, 0x70, 0x3b, 0x4f, 0x6b, 0x74, 0x3b, 0x4e, 0x6f, 0x76, 0x3b, 0x44, 0x65,
+0x7a, 0x4f, 0x6c, 0x61, 0x64, 0x61, 0x6c, 0x289, 0x301, 0x3b, 0x41, 0x72, 0xe1, 0x74, 0x3b, 0x186, 0x25b, 0x6e, 0x268, 0x301,
+0x254, 0x268, 0x14b, 0x254, 0x6b, 0x3b, 0x4f, 0x6c, 0x6f, 0x64, 0x6f, 0x79, 0xed, 0xf3, 0x72, 0xed, 0xea, 0x20, 0x69, 0x6e,
+0x6b, 0xf3, 0x6b, 0xfa, 0xe2, 0x3b, 0x4f, 0x6c, 0x6f, 0x69, 0x6c, 0xe9, 0x70, 0x16b, 0x6e, 0x79, 0x12b, 0x113, 0x20, 0x69,
+0x6e, 0x6b, 0xf3, 0x6b, 0xfa, 0xe2, 0x3b, 0x4b, 0xfa, 0x6a, 0xfa, 0x254, 0x72, 0x254, 0x6b, 0x3b, 0x4d, 0xf3, 0x72, 0x75,
+0x73, 0xe1, 0x73, 0x69, 0x6e, 0x3b, 0x186, 0x6c, 0x254, 0x301, 0x268, 0x301, 0x62, 0x254, 0x301, 0x72, 0xe1, 0x72, 0x25b, 0x3b,
+0x4b, 0xfa, 0x73, 0x68, 0xee, 0x6e, 0x3b, 0x4f, 0x6c, 0x67, 0xed, 0x73, 0x61, 0x6e, 0x3b, 0x50, 0x289, 0x73, 0x68, 0x289,
+0x301, 0x6b, 0x61, 0x3b, 0x4e, 0x74, 0x289, 0x301, 0x14b, 0x289, 0x301, 0x73, 0x44, 0x61, 0x6c, 0x3b, 0x41, 0x72, 0xe1, 0x3b,
+0x186, 0x25b, 0x6e, 0x3b, 0x44, 0x6f, 0x79, 0x3b, 0x4c, 0xe9, 0x70, 0x3b, 0x52, 0x6f, 0x6b, 0x3b, 0x53, 0xe1, 0x73, 0x3b,
+0x42, 0x254, 0x301, 0x72, 0x3b, 0x4b, 0xfa, 0x73, 0x3b, 0x47, 0xed, 0x73, 0x3b, 0x53, 0x68, 0x289, 0x301, 0x3b, 0x4e, 0x74,
+0x289, 0x301, 0x4a, 0x61, 0x6e, 0x3b, 0x46, 0x65, 0x62, 0x3b, 0x4d, 0x61, 0x72, 0x3b, 0x41, 0x70, 0x72, 0x3b, 0x4d, 0x65,
+0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x3b, 0x4a, 0x75, 0x6c, 0x3b, 0x41, 0x67, 0x6f, 0x3b, 0x53, 0x65, 0x70, 0x3b, 0x4f, 0x6b,
+0x74, 0x3b, 0x4e, 0x6f, 0x76, 0x3b, 0x44, 0x65, 0x73, 0x4a, 0x61, 0x6e, 0x3b, 0x46, 0x65, 0x62, 0x3b, 0x4d, 0x61, 0x63,
+0x3b, 0x41, 0x70, 0x72, 0x3b, 0x4d, 0x65, 0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x3b, 0x4a, 0x75, 0x6c, 0x3b, 0x41, 0x67, 0x6f,
+0x3b, 0x53, 0x65, 0x70, 0x3b, 0x4f, 0x6b, 0x74, 0x3b, 0x4e, 0x6f, 0x76, 0x3b, 0x44, 0x65, 0x63, 0x4f, 0x72, 0x61, 0x72,
+0x61, 0x3b, 0x4f, 0x6d, 0x75, 0x6b, 0x3b, 0x4f, 0x6b, 0x77, 0x61, 0x6d, 0x67, 0x2019, 0x3b, 0x4f, 0x64, 0x75, 0x6e, 0x67,
+0x2019, 0x65, 0x6c, 0x3b, 0x4f, 0x6d, 0x61, 0x72, 0x75, 0x6b, 0x3b, 0x4f, 0x6d, 0x6f, 0x64, 0x6f, 0x6b, 0x2019, 0x6b, 0x69,
+0x6e, 0x67, 0x2019, 0x6f, 0x6c, 0x3b, 0x4f, 0x6a, 0x6f, 0x6c, 0x61, 0x3b, 0x4f, 0x70, 0x65, 0x64, 0x65, 0x6c, 0x3b, 0x4f,
+0x73, 0x6f, 0x6b, 0x6f, 0x73, 0x6f, 0x6b, 0x6f, 0x6d, 0x61, 0x3b, 0x4f, 0x74, 0x69, 0x62, 0x61, 0x72, 0x3b, 0x4f, 0x6c,
+0x61, 0x62, 0x6f, 0x72, 0x3b, 0x4f, 0x70, 0x6f, 0x6f, 0x52, 0x61, 0x72, 0x3b, 0x4d, 0x75, 0x6b, 0x3b, 0x4b, 0x77, 0x61,
+0x3b, 0x44, 0x75, 0x6e, 0x3b, 0x4d, 0x61, 0x72, 0x3b, 0x4d, 0x6f, 0x64, 0x3b, 0x4a, 0x6f, 0x6c, 0x3b, 0x50, 0x65, 0x64,
+0x3b, 0x53, 0x6f, 0x6b, 0x3b, 0x54, 0x69, 0x62, 0x3b, 0x4c, 0x61, 0x62, 0x3b, 0x50, 0x6f, 0x6f, 0x52, 0x3b, 0x4d, 0x3b,
+0x4b, 0x3b, 0x44, 0x3b, 0x4d, 0x3b, 0x4d, 0x3b, 0x4a, 0x3b, 0x50, 0x3b, 0x53, 0x3b, 0x54, 0x3b, 0x4c, 0x3b, 0x50, 0x17d,
+0x61, 0x6e, 0x77, 0x69, 0x79, 0x65, 0x3b, 0x46, 0x65, 0x65, 0x77, 0x69, 0x72, 0x69, 0x79, 0x65, 0x3b, 0x4d, 0x61, 0x72,
+0x73, 0x69, 0x3b, 0x41, 0x77, 0x69, 0x72, 0x69, 0x6c, 0x3b, 0x4d, 0x65, 0x3b, 0x17d, 0x75, 0x77, 0x65, 0x14b, 0x3b, 0x17d,
+0x75, 0x79, 0x79, 0x65, 0x3b, 0x55, 0x74, 0x3b, 0x53, 0x65, 0x6b, 0x74, 0x61, 0x6e, 0x62, 0x75, 0x72, 0x3b, 0x4f, 0x6b,
+0x74, 0x6f, 0x6f, 0x62, 0x75, 0x72, 0x3b, 0x4e, 0x6f, 0x6f, 0x77, 0x61, 0x6e, 0x62, 0x75, 0x72, 0x3b, 0x44, 0x65, 0x65,
+0x73, 0x61, 0x6e, 0x62, 0x75, 0x72, 0x17d, 0x61, 0x6e, 0x3b, 0x46, 0x65, 0x65, 0x3b, 0x4d, 0x61, 0x72, 0x3b, 0x41, 0x77,
+0x69, 0x3b, 0x4d, 0x65, 0x3b, 0x17d, 0x75, 0x77, 0x3b, 0x17d, 0x75, 0x79, 0x3b, 0x55, 0x74, 0x3b, 0x53, 0x65, 0x6b, 0x3b,
+0x4f, 0x6b, 0x74, 0x3b, 0x4e, 0x6f, 0x6f, 0x3b, 0x44, 0x65, 0x65, 0x17d, 0x3b, 0x46, 0x3b, 0x4d, 0x3b, 0x41, 0x3b, 0x4d,
+0x3b, 0x17d, 0x3b, 0x17d, 0x3b, 0x55, 0x3b, 0x53, 0x3b, 0x4f, 0x3b, 0x4e, 0x3b, 0x44, 0x44, 0x77, 0x65, 0x20, 0x6d, 0x61,
+0x72, 0x20, 0x41, 0x63, 0x68, 0x69, 0x65, 0x6c, 0x3b, 0x44, 0x77, 0x65, 0x20, 0x6d, 0x61, 0x72, 0x20, 0x41, 0x72, 0x69,
+0x79, 0x6f, 0x3b, 0x44, 0x77, 0x65, 0x20, 0x6d, 0x61, 0x72, 0x20, 0x41, 0x64, 0x65, 0x6b, 0x3b, 0x44, 0x77, 0x65, 0x20,
+0x6d, 0x61, 0x72, 0x20, 0x41, 0x6e, 0x67, 0x2019, 0x77, 0x65, 0x6e, 0x3b, 0x44, 0x77, 0x65, 0x20, 0x6d, 0x61, 0x72, 0x20,
+0x41, 0x62, 0x69, 0x63, 0x68, 0x3b, 0x44, 0x77, 0x65, 0x20, 0x6d, 0x61, 0x72, 0x20, 0x41, 0x75, 0x63, 0x68, 0x69, 0x65,
+0x6c, 0x3b, 0x44, 0x77, 0x65, 0x20, 0x6d, 0x61, 0x72, 0x20, 0x41, 0x62, 0x69, 0x72, 0x69, 0x79, 0x6f, 0x3b, 0x44, 0x77,
+0x65, 0x20, 0x6d, 0x61, 0x72, 0x20, 0x41, 0x62, 0x6f, 0x72, 0x6f, 0x3b, 0x44, 0x77, 0x65, 0x20, 0x6d, 0x61, 0x72, 0x20,
+0x4f, 0x63, 0x68, 0x69, 0x6b, 0x6f, 0x3b, 0x44, 0x77, 0x65, 0x20, 0x6d, 0x61, 0x72, 0x20, 0x41, 0x70, 0x61, 0x72, 0x3b,
+0x44, 0x77, 0x65, 0x20, 0x6d, 0x61, 0x72, 0x20, 0x67, 0x69, 0x20, 0x61, 0x63, 0x68, 0x69, 0x65, 0x6c, 0x3b, 0x44, 0x77,
+0x65, 0x20, 0x6d, 0x61, 0x72, 0x20, 0x41, 0x70, 0x61, 0x72, 0x20, 0x67, 0x69, 0x20, 0x61, 0x72, 0x69, 0x79, 0x6f, 0x44,
 0x41, 0x43, 0x3b, 0x44, 0x41, 0x52, 0x3b, 0x44, 0x41, 0x44, 0x3b, 0x44, 0x41, 0x4e, 0x3b, 0x44, 0x41, 0x48, 0x3b, 0x44,
 0x41, 0x55, 0x3b, 0x44, 0x41, 0x4f, 0x3b, 0x44, 0x41, 0x42, 0x3b, 0x44, 0x4f, 0x43, 0x3b, 0x44, 0x41, 0x50, 0x3b, 0x44,
-0x47, 0x49, 0x3b, 0x44, 0x41, 0x47, 0x3b, 0x44, 0x77, 0x65, 0x20, 0x6d, 0x61, 0x72, 0x20, 0x41, 0x63, 0x68, 0x69, 0x65,
-0x6c, 0x3b, 0x44, 0x77, 0x65, 0x20, 0x6d, 0x61, 0x72, 0x20, 0x41, 0x72, 0x69, 0x79, 0x6f, 0x3b, 0x44, 0x77, 0x65, 0x20,
-0x6d, 0x61, 0x72, 0x20, 0x41, 0x64, 0x65, 0x6b, 0x3b, 0x44, 0x77, 0x65, 0x20, 0x6d, 0x61, 0x72, 0x20, 0x41, 0x6e, 0x67,
-0x2019, 0x77, 0x65, 0x6e, 0x3b, 0x44, 0x77, 0x65, 0x20, 0x6d, 0x61, 0x72, 0x20, 0x41, 0x62, 0x69, 0x63, 0x68, 0x3b, 0x44,
-0x77, 0x65, 0x20, 0x6d, 0x61, 0x72, 0x20, 0x41, 0x75, 0x63, 0x68, 0x69, 0x65, 0x6c, 0x3b, 0x44, 0x77, 0x65, 0x20, 0x6d,
-0x61, 0x72, 0x20, 0x41, 0x62, 0x69, 0x72, 0x69, 0x79, 0x6f, 0x3b, 0x44, 0x77, 0x65, 0x20, 0x6d, 0x61, 0x72, 0x20, 0x41,
-0x62, 0x6f, 0x72, 0x6f, 0x3b, 0x44, 0x77, 0x65, 0x20, 0x6d, 0x61, 0x72, 0x20, 0x4f, 0x63, 0x68, 0x69, 0x6b, 0x6f, 0x3b,
-0x44, 0x77, 0x65, 0x20, 0x6d, 0x61, 0x72, 0x20, 0x41, 0x70, 0x61, 0x72, 0x3b, 0x44, 0x77, 0x65, 0x20, 0x6d, 0x61, 0x72,
-0x20, 0x67, 0x69, 0x20, 0x61, 0x63, 0x68, 0x69, 0x65, 0x6c, 0x3b, 0x44, 0x77, 0x65, 0x20, 0x6d, 0x61, 0x72, 0x20, 0x41,
-0x70, 0x61, 0x72, 0x20, 0x67, 0x69, 0x20, 0x61, 0x72, 0x69, 0x79, 0x6f, 0x3b, 0x43, 0x3b, 0x52, 0x3b, 0x44, 0x3b, 0x4e,
-0x3b, 0x42, 0x3b, 0x55, 0x3b, 0x42, 0x3b, 0x42, 0x3b, 0x43, 0x3b, 0x50, 0x3b, 0x43, 0x3b, 0x50, 0x3b, 0x59, 0x65, 0x6e,
-0x3b, 0x59, 0x65, 0x62, 0x3b, 0x4d, 0x61, 0x72, 0x3b, 0x49, 0x62, 0x72, 0x3b, 0x4d, 0x61, 0x79, 0x3b, 0x59, 0x75, 0x6e,
-0x3b, 0x59, 0x75, 0x6c, 0x3b, 0x194, 0x75, 0x63, 0x3b, 0x43, 0x75, 0x74, 0x3b, 0x4b, 0x1e6d, 0x75, 0x3b, 0x4e, 0x77, 0x61,
-0x3b, 0x44, 0x75, 0x6a, 0x3b, 0x59, 0x65, 0x6e, 0x6e, 0x61, 0x79, 0x65, 0x72, 0x3b, 0x59, 0x65, 0x62, 0x72, 0x61, 0x79,
-0x65, 0x72, 0x3b, 0x4d, 0x61, 0x72, 0x73, 0x3b, 0x49, 0x62, 0x72, 0x69, 0x72, 0x3b, 0x4d, 0x61, 0x79, 0x79, 0x75, 0x3b,
-0x59, 0x75, 0x6e, 0x79, 0x75, 0x3b, 0x59, 0x75, 0x6c, 0x79, 0x75, 0x7a, 0x3b, 0x194, 0x75, 0x63, 0x74, 0x3b, 0x43, 0x75,
-0x74, 0x61, 0x6e, 0x62, 0x69, 0x72, 0x3b, 0x4b, 0x1e6d, 0x75, 0x62, 0x65, 0x72, 0x3b, 0x4e, 0x77, 0x61, 0x6e, 0x62, 0x69,
-0x72, 0x3b, 0x44, 0x75, 0x6a, 0x61, 0x6e, 0x62, 0x69, 0x72, 0x3b, 0x59, 0x3b, 0x59, 0x3b, 0x4d, 0x3b, 0x49, 0x3b, 0x4d,
-0x3b, 0x59, 0x3b, 0x59, 0x3b, 0x194, 0x3b, 0x43, 0x3b, 0x4b, 0x3b, 0x4e, 0x3b, 0x44, 0x3b, 0x4a, 0x61, 0x6e, 0x75, 0x61,
-0x6c, 0x69, 0x3b, 0x46, 0x65, 0x62, 0x6c, 0x75, 0x61, 0x6c, 0x69, 0x3b, 0x4d, 0x61, 0x63, 0x68, 0x69, 0x3b, 0x41, 0x70,
-0x6c, 0x69, 0x6c, 0x69, 0x3b, 0x4d, 0x65, 0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x69, 0x3b, 0x4a, 0x75, 0x6c, 0x61, 0x69, 0x3b,
-0x41, 0x67, 0x6f, 0x73, 0x74, 0x69, 0x3b, 0x53, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x4f, 0x6b, 0x74, 0x6f,
-0x62, 0x61, 0x3b, 0x4e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x44, 0x65, 0x73, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x91c,
-0x93e, 0x928, 0x941, 0x935, 0x93e, 0x930, 0x940, 0x3b, 0x92b, 0x947, 0x92c, 0x94d, 0x930, 0x941, 0x935, 0x93e, 0x930, 0x940, 0x3b, 0x92e,
-0x93e, 0x930, 0x94d, 0x938, 0x3b, 0x90f, 0x92b, 0x94d, 0x930, 0x93f, 0x932, 0x3b, 0x92e, 0x947, 0x3b, 0x91c, 0x941, 0x928, 0x3b, 0x91c,
-0x941, 0x932, 0x93e, 0x907, 0x3b, 0x906, 0x917, 0x938, 0x94d, 0x925, 0x3b, 0x938, 0x947, 0x92c, 0x925, 0x947, 0x91c, 0x94d, 0x92c, 0x93c,
-0x930, 0x3b, 0x905, 0x916, 0x925, 0x92c, 0x930, 0x3b, 0x928, 0x92c, 0x947, 0x91c, 0x94d, 0x92c, 0x93c, 0x930, 0x3b, 0x926, 0x93f, 0x938,
-0x947, 0x91c, 0x94d, 0x92c, 0x93c, 0x930, 0x3b, 0x91c, 0x3b, 0x92b, 0x947, 0x3b, 0x92e, 0x93e, 0x3b, 0x90f, 0x3b, 0x92e, 0x947, 0x3b,
-0x91c, 0x941, 0x3b, 0x91c, 0x941, 0x3b, 0x906, 0x3b, 0x938, 0x947, 0x3b, 0x905, 0x3b, 0x928, 0x3b, 0x926, 0x93f, 0x3b, 0x456, 0x486,
-0x430, 0x2de9, 0x487, 0x3b, 0x444, 0x435, 0x2de1, 0x487, 0x3b, 0x43c, 0x430, 0x2dec, 0x487, 0x3b, 0x430, 0x486, 0x43f, 0x2dec, 0x487, 0x3b,
-0x43c, 0x430, 0xa675, 0x3b, 0x456, 0x486, 0xa64b, 0x2de9, 0x487, 0x3b, 0x456, 0x486, 0xa64b, 0x2de7, 0x487, 0x3b, 0x430, 0x486, 0x301, 0x475,
-0x2de2, 0x487, 0x3b, 0x441, 0x435, 0x2deb, 0x487, 0x3b, 0x47b, 0x486, 0x43a, 0x2dee, 0x3b, 0x43d, 0x43e, 0x435, 0x2de8, 0x3b, 0x434, 0x435,
-0x2de6, 0x487, 0x3b, 0x456, 0x486, 0x430, 0x43d, 0x43d, 0xa64b, 0x430, 0x301, 0x440, 0x457, 0x439, 0x3b, 0x444, 0x435, 0x432, 0x440, 0xa64b,
-0x430, 0x301, 0x440, 0x457, 0x439, 0x3b, 0x43c, 0x430, 0x301, 0x440, 0x442, 0x44a, 0x3b, 0x430, 0x486, 0x43f, 0x440, 0x456, 0x301, 0x43b,
-0x43b, 0x457, 0x439, 0x3b, 0x43c, 0x430, 0x301, 0x457, 0x439, 0x3b, 0x456, 0x486, 0xa64b, 0x301, 0x43d, 0x457, 0x439, 0x3b, 0x456, 0x486,
-0xa64b, 0x301, 0x43b, 0x457, 0x439, 0x3b, 0x430, 0x486, 0x301, 0x475, 0x433, 0xa64b, 0x441, 0x442, 0x44a, 0x3b, 0x441, 0x435, 0x43f, 0x442,
-0x435, 0x301, 0x43c, 0x432, 0x440, 0x457, 0x439, 0x3b, 0x47b, 0x486, 0x43a, 0x442, 0x461, 0x301, 0x432, 0x440, 0x457, 0x439, 0x3b, 0x43d,
-0x43e, 0x435, 0x301, 0x43c, 0x432, 0x440, 0x457, 0x439, 0x3b, 0x434, 0x435, 0x43a, 0x435, 0x301, 0x43c, 0x432, 0x440, 0x457, 0x439, 0x3b,
+0x47, 0x49, 0x3b, 0x44, 0x41, 0x47, 0x43, 0x3b, 0x52, 0x3b, 0x44, 0x3b, 0x4e, 0x3b, 0x42, 0x3b, 0x55, 0x3b, 0x42, 0x3b,
+0x42, 0x3b, 0x43, 0x3b, 0x50, 0x3b, 0x43, 0x3b, 0x50, 0x59, 0x65, 0x6e, 0x6e, 0x61, 0x79, 0x65, 0x72, 0x3b, 0x59, 0x65,
+0x62, 0x72, 0x61, 0x79, 0x65, 0x72, 0x3b, 0x4d, 0x61, 0x72, 0x73, 0x3b, 0x49, 0x62, 0x72, 0x69, 0x72, 0x3b, 0x4d, 0x61,
+0x79, 0x79, 0x75, 0x3b, 0x59, 0x75, 0x6e, 0x79, 0x75, 0x3b, 0x59, 0x75, 0x6c, 0x79, 0x75, 0x7a, 0x3b, 0x194, 0x75, 0x63,
+0x74, 0x3b, 0x43, 0x75, 0x74, 0x61, 0x6e, 0x62, 0x69, 0x72, 0x3b, 0x4b, 0x1e6d, 0x75, 0x62, 0x65, 0x72, 0x3b, 0x4e, 0x77,
+0x61, 0x6e, 0x62, 0x69, 0x72, 0x3b, 0x44, 0x75, 0x6a, 0x61, 0x6e, 0x62, 0x69, 0x72, 0x59, 0x65, 0x6e, 0x3b, 0x59, 0x65,
+0x62, 0x3b, 0x4d, 0x61, 0x72, 0x3b, 0x49, 0x62, 0x72, 0x3b, 0x4d, 0x61, 0x79, 0x3b, 0x59, 0x75, 0x6e, 0x3b, 0x59, 0x75,
+0x6c, 0x3b, 0x194, 0x75, 0x63, 0x3b, 0x43, 0x75, 0x74, 0x3b, 0x4b, 0x1e6d, 0x75, 0x3b, 0x4e, 0x77, 0x61, 0x3b, 0x44, 0x75,
+0x6a, 0x59, 0x3b, 0x59, 0x3b, 0x4d, 0x3b, 0x49, 0x3b, 0x4d, 0x3b, 0x59, 0x3b, 0x59, 0x3b, 0x194, 0x3b, 0x43, 0x3b, 0x4b,
+0x3b, 0x4e, 0x3b, 0x44, 0x4a, 0x61, 0x6e, 0x75, 0x61, 0x6c, 0x69, 0x3b, 0x46, 0x65, 0x62, 0x6c, 0x75, 0x61, 0x6c, 0x69,
+0x3b, 0x4d, 0x61, 0x63, 0x68, 0x69, 0x3b, 0x41, 0x70, 0x6c, 0x69, 0x6c, 0x69, 0x3b, 0x4d, 0x65, 0x69, 0x3b, 0x4a, 0x75,
+0x6e, 0x69, 0x3b, 0x4a, 0x75, 0x6c, 0x61, 0x69, 0x3b, 0x41, 0x67, 0x6f, 0x73, 0x74, 0x69, 0x3b, 0x53, 0x65, 0x70, 0x74,
+0x65, 0x6d, 0x62, 0x61, 0x3b, 0x4f, 0x6b, 0x74, 0x6f, 0x62, 0x61, 0x3b, 0x4e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x61, 0x3b,
+0x44, 0x65, 0x73, 0x65, 0x6d, 0x62, 0x61, 0x91c, 0x93e, 0x928, 0x941, 0x935, 0x93e, 0x930, 0x940, 0x3b, 0x92b, 0x947, 0x92c, 0x94d,
+0x930, 0x941, 0x935, 0x93e, 0x930, 0x940, 0x3b, 0x92e, 0x93e, 0x930, 0x94d, 0x938, 0x3b, 0x90f, 0x92b, 0x94d, 0x930, 0x93f, 0x932, 0x3b,
+0x92e, 0x947, 0x3b, 0x91c, 0x941, 0x928, 0x3b, 0x91c, 0x941, 0x932, 0x93e, 0x907, 0x3b, 0x906, 0x917, 0x938, 0x94d, 0x925, 0x3b, 0x938,
+0x947, 0x92c, 0x925, 0x947, 0x91c, 0x94d, 0x92c, 0x93c, 0x930, 0x3b, 0x905, 0x916, 0x925, 0x92c, 0x930, 0x3b, 0x928, 0x92c, 0x947, 0x91c,
+0x94d, 0x92c, 0x93c, 0x930, 0x3b, 0x926, 0x93f, 0x938, 0x947, 0x91c, 0x94d, 0x92c, 0x93c, 0x930, 0x91c, 0x3b, 0x92b, 0x947, 0x3b, 0x92e,
+0x93e, 0x3b, 0x90f, 0x3b, 0x92e, 0x947, 0x3b, 0x91c, 0x941, 0x3b, 0x91c, 0x941, 0x3b, 0x906, 0x3b, 0x938, 0x947, 0x3b, 0x905, 0x3b,
+0x928, 0x3b, 0x926, 0x93f, 0x456, 0x486, 0x430, 0x43d, 0x43d, 0xa64b, 0x430, 0x301, 0x440, 0x457, 0x439, 0x3b, 0x444, 0x435, 0x432, 0x440,
+0xa64b, 0x430, 0x301, 0x440, 0x457, 0x439, 0x3b, 0x43c, 0x430, 0x301, 0x440, 0x442, 0x44a, 0x3b, 0x430, 0x486, 0x43f, 0x440, 0x456, 0x301,
+0x43b, 0x43b, 0x457, 0x439, 0x3b, 0x43c, 0x430, 0x301, 0x457, 0x439, 0x3b, 0x456, 0x486, 0xa64b, 0x301, 0x43d, 0x457, 0x439, 0x3b, 0x456,
+0x486, 0xa64b, 0x301, 0x43b, 0x457, 0x439, 0x3b, 0x430, 0x486, 0x301, 0x475, 0x433, 0xa64b, 0x441, 0x442, 0x44a, 0x3b, 0x441, 0x435, 0x43f,
+0x442, 0x435, 0x301, 0x43c, 0x432, 0x440, 0x457, 0x439, 0x3b, 0x47b, 0x486, 0x43a, 0x442, 0x461, 0x301, 0x432, 0x440, 0x457, 0x439, 0x3b,
+0x43d, 0x43e, 0x435, 0x301, 0x43c, 0x432, 0x440, 0x457, 0x439, 0x3b, 0x434, 0x435, 0x43a, 0x435, 0x301, 0x43c, 0x432, 0x440, 0x457, 0x439,
+0x456, 0x486, 0x430, 0x43d, 0x43d, 0xa64b, 0x430, 0x301, 0x440, 0x457, 0x430, 0x3b, 0x444, 0x435, 0x432, 0x440, 0xa64b, 0x430, 0x301, 0x440,
+0x457, 0x430, 0x3b, 0x43c, 0x430, 0x301, 0x440, 0x442, 0x430, 0x3b, 0x430, 0x486, 0x43f, 0x440, 0x456, 0x301, 0x43b, 0x43b, 0x457, 0x430,
+0x3b, 0x43c, 0x430, 0x301, 0x457, 0x430, 0x3b, 0x456, 0x486, 0xa64b, 0x301, 0x43d, 0x457, 0x430, 0x3b, 0x456, 0x486, 0xa64b, 0x301, 0x43b,
+0x457, 0x430, 0x3b, 0x430, 0x486, 0x301, 0x475, 0x433, 0xa64b, 0x441, 0x442, 0x430, 0x3b, 0x441, 0x435, 0x43f, 0x442, 0x435, 0x301, 0x43c,
+0x432, 0x440, 0x457, 0x430, 0x3b, 0x47b, 0x486, 0x43a, 0x442, 0x461, 0x301, 0x432, 0x440, 0x457, 0x430, 0x3b, 0x43d, 0x43e, 0x435, 0x301,
+0x43c, 0x432, 0x440, 0x457, 0x430, 0x3b, 0x434, 0x435, 0x43a, 0x435, 0x301, 0x43c, 0x432, 0x440, 0x457, 0x430, 0x456, 0x486, 0x430, 0x2de9,
+0x487, 0x3b, 0x444, 0x435, 0x2de1, 0x487, 0x3b, 0x43c, 0x430, 0x2dec, 0x487, 0x3b, 0x430, 0x486, 0x43f, 0x2dec, 0x487, 0x3b, 0x43c, 0x430,
+0xa675, 0x3b, 0x456, 0x486, 0xa64b, 0x2de9, 0x487, 0x3b, 0x456, 0x486, 0xa64b, 0x2de7, 0x487, 0x3b, 0x430, 0x486, 0x301, 0x475, 0x2de2, 0x487,
+0x3b, 0x441, 0x435, 0x2deb, 0x487, 0x3b, 0x47b, 0x486, 0x43a, 0x2dee, 0x3b, 0x43d, 0x43e, 0x435, 0x2de8, 0x3b, 0x434, 0x435, 0x2de6, 0x487,
 0x406, 0x486, 0x3b, 0x424, 0x3b, 0x41c, 0x3b, 0x410, 0x486, 0x3b, 0x41c, 0x3b, 0x406, 0x486, 0x3b, 0x406, 0x486, 0x3b, 0x410, 0x486,
-0x3b, 0x421, 0x3b, 0x47a, 0x486, 0x3b, 0x41d, 0x3b, 0x414, 0x3b, 0x456, 0x486, 0x430, 0x43d, 0x43d, 0xa64b, 0x430, 0x301, 0x440, 0x457,
-0x430, 0x3b, 0x444, 0x435, 0x432, 0x440, 0xa64b, 0x430, 0x301, 0x440, 0x457, 0x430, 0x3b, 0x43c, 0x430, 0x301, 0x440, 0x442, 0x430, 0x3b,
-0x430, 0x486, 0x43f, 0x440, 0x456, 0x301, 0x43b, 0x43b, 0x457, 0x430, 0x3b, 0x43c, 0x430, 0x301, 0x457, 0x430, 0x3b, 0x456, 0x486, 0xa64b,
-0x301, 0x43d, 0x457, 0x430, 0x3b, 0x456, 0x486, 0xa64b, 0x301, 0x43b, 0x457, 0x430, 0x3b, 0x430, 0x486, 0x301, 0x475, 0x433, 0xa64b, 0x441,
-0x442, 0x430, 0x3b, 0x441, 0x435, 0x43f, 0x442, 0x435, 0x301, 0x43c, 0x432, 0x440, 0x457, 0x430, 0x3b, 0x47b, 0x486, 0x43a, 0x442, 0x461,
-0x301, 0x432, 0x440, 0x457, 0x430, 0x3b, 0x43d, 0x43e, 0x435, 0x301, 0x43c, 0x432, 0x440, 0x457, 0x430, 0x3b, 0x434, 0x435, 0x43a, 0x435,
-0x301, 0x43c, 0x432, 0x440, 0x457, 0x430, 0x3b, 0x43, 0x69, 0x6f, 0x3b, 0x4c, 0x75, 0x69, 0x3b, 0x4c, 0x75, 0x73, 0x3b, 0x4d,
+0x3b, 0x421, 0x3b, 0x47a, 0x486, 0x3b, 0x41d, 0x3b, 0x414, 0x43, 0x69, 0x6f, 0x6e, 0x67, 0x6f, 0x3b, 0x4c, 0xf9, 0x69, 0x73,
+0x68, 0x69, 0x3b, 0x4c, 0x75, 0x73, 0xf2, 0x6c, 0x6f, 0x3b, 0x4d, 0xf9, 0x75, 0x79, 0xe0, 0x3b, 0x4c, 0x75, 0x6d, 0xf9,
+0x6e, 0x67, 0xf9, 0x6c, 0xf9, 0x3b, 0x4c, 0x75, 0x66, 0x75, 0x69, 0x6d, 0x69, 0x3b, 0x4b, 0x61, 0x62, 0xe0, 0x6c, 0xe0,
+0x73, 0x68, 0xec, 0x70, 0xf9, 0x3b, 0x4c, 0xf9, 0x73, 0x68, 0xec, 0x6b, 0xe0, 0x3b, 0x4c, 0x75, 0x74, 0x6f, 0x6e, 0x67,
+0x6f, 0x6c, 0x6f, 0x3b, 0x4c, 0x75, 0x6e, 0x67, 0xf9, 0x64, 0x69, 0x3b, 0x4b, 0x61, 0x73, 0x77, 0xe8, 0x6b, 0xe8, 0x73,
+0xe8, 0x3b, 0x43, 0x69, 0x73, 0x77, 0xe0, 0x43, 0x69, 0x6f, 0x3b, 0x4c, 0x75, 0x69, 0x3b, 0x4c, 0x75, 0x73, 0x3b, 0x4d,
 0x75, 0x75, 0x3b, 0x4c, 0x75, 0x6d, 0x3b, 0x4c, 0x75, 0x66, 0x3b, 0x4b, 0x61, 0x62, 0x3b, 0x4c, 0x75, 0x73, 0x68, 0x3b,
-0x4c, 0x75, 0x74, 0x3b, 0x4c, 0x75, 0x6e, 0x3b, 0x4b, 0x61, 0x73, 0x3b, 0x43, 0x69, 0x73, 0x3b, 0x43, 0x69, 0x6f, 0x6e,
-0x67, 0x6f, 0x3b, 0x4c, 0xf9, 0x69, 0x73, 0x68, 0x69, 0x3b, 0x4c, 0x75, 0x73, 0xf2, 0x6c, 0x6f, 0x3b, 0x4d, 0xf9, 0x75,
-0x79, 0xe0, 0x3b, 0x4c, 0x75, 0x6d, 0xf9, 0x6e, 0x67, 0xf9, 0x6c, 0xf9, 0x3b, 0x4c, 0x75, 0x66, 0x75, 0x69, 0x6d, 0x69,
-0x3b, 0x4b, 0x61, 0x62, 0xe0, 0x6c, 0xe0, 0x73, 0x68, 0xec, 0x70, 0xf9, 0x3b, 0x4c, 0xf9, 0x73, 0x68, 0xec, 0x6b, 0xe0,
-0x3b, 0x4c, 0x75, 0x74, 0x6f, 0x6e, 0x67, 0x6f, 0x6c, 0x6f, 0x3b, 0x4c, 0x75, 0x6e, 0x67, 0xf9, 0x64, 0x69, 0x3b, 0x4b,
-0x61, 0x73, 0x77, 0xe8, 0x6b, 0xe8, 0x73, 0xe8, 0x3b, 0x43, 0x69, 0x73, 0x77, 0xe0, 0x3b, 0x43, 0x3b, 0x4c, 0x3b, 0x4c,
-0x3b, 0x4d, 0x3b, 0x4c, 0x3b, 0x4c, 0x3b, 0x4b, 0x3b, 0x4c, 0x3b, 0x4c, 0x3b, 0x4c, 0x3b, 0x4b, 0x3b, 0x43, 0x3b, 0x4a,
-0x61, 0x6e, 0x3b, 0x46, 0x65, 0x62, 0x3b, 0x4d, 0xe4, 0x65, 0x3b, 0x41, 0x62, 0x72, 0x3b, 0x4d, 0x65, 0x65, 0x3b, 0x4a,
-0x75, 0x6e, 0x3b, 0x4a, 0x75, 0x6c, 0x3b, 0x41, 0x75, 0x67, 0x3b, 0x53, 0x65, 0x70, 0x3b, 0x4f, 0x6b, 0x74, 0x3b, 0x4e,
-0x6f, 0x76, 0x3b, 0x44, 0x65, 0x7a, 0x3b, 0x4a, 0x61, 0x6e, 0x75, 0x61, 0x72, 0x3b, 0x46, 0x65, 0x62, 0x72, 0x75, 0x61,
-0x72, 0x3b, 0x4d, 0xe4, 0x65, 0x72, 0x7a, 0x3b, 0x41, 0x62, 0x72, 0xeb, 0x6c, 0x6c, 0x3b, 0x4d, 0x65, 0x65, 0x3b, 0x4a,
-0x75, 0x6e, 0x69, 0x3b, 0x4a, 0x75, 0x6c, 0x69, 0x3b, 0x41, 0x75, 0x67, 0x75, 0x73, 0x74, 0x3b, 0x53, 0x65, 0x70, 0x74,
-0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x4f, 0x6b, 0x74, 0x6f, 0x62, 0x65, 0x72, 0x3b, 0x4e, 0x6f, 0x76, 0x65, 0x6d, 0x62,
-0x65, 0x72, 0x3b, 0x44, 0x65, 0x7a, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x4a, 0x61, 0x6e, 0x2e, 0x3b, 0x46, 0x65, 0x62,
-0x2e, 0x3b, 0x4d, 0xe4, 0x65, 0x2e, 0x3b, 0x41, 0x62, 0x72, 0x2e, 0x3b, 0x4d, 0x65, 0x65, 0x3b, 0x4a, 0x75, 0x6e, 0x69,
-0x3b, 0x4a, 0x75, 0x6c, 0x69, 0x3b, 0x41, 0x75, 0x67, 0x2e, 0x3b, 0x53, 0x65, 0x70, 0x2e, 0x3b, 0x4f, 0x6b, 0x74, 0x2e,
-0x3b, 0x4e, 0x6f, 0x76, 0x2e, 0x3b, 0x44, 0x65, 0x7a, 0x2e, 0x3b, 0x6e, 0xf9, 0x6d, 0x3b, 0x6b, 0x268, 0x7a, 0x3b, 0x74,
-0x268, 0x64, 0x3b, 0x74, 0x61, 0x61, 0x3b, 0x73, 0x65, 0x65, 0x3b, 0x6e, 0x7a, 0x75, 0x3b, 0x64, 0x75, 0x6d, 0x3b, 0x66,
-0x254, 0x65, 0x3b, 0x64, 0x7a, 0x75, 0x3b, 0x6c, 0x254, 0x6d, 0x3b, 0x6b, 0x61, 0x61, 0x3b, 0x66, 0x77, 0x6f, 0x3b, 0x6e,
-0x64, 0x7a, 0x254, 0x300, 0x14b, 0x254, 0x300, 0x6e, 0xf9, 0x6d, 0x3b, 0x6e, 0x64, 0x7a, 0x254, 0x300, 0x14b, 0x254, 0x300, 0x6b,
-0x197, 0x300, 0x7a, 0xf9, 0x294, 0x3b, 0x6e, 0x64, 0x7a, 0x254, 0x300, 0x14b, 0x254, 0x300, 0x74, 0x197, 0x300, 0x64, 0x289, 0x300,
-0x67, 0x68, 0xe0, 0x3b, 0x6e, 0x64, 0x7a, 0x254, 0x300, 0x14b, 0x254, 0x300, 0x74, 0x1ce, 0x61, 0x66, 0x289, 0x304, 0x67, 0x68,
-0x101, 0x3b, 0x6e, 0x64, 0x7a, 0x254, 0x300, 0x14b, 0xe8, 0x73, 0xe8, 0x65, 0x3b, 0x6e, 0x64, 0x7a, 0x254, 0x300, 0x14b, 0x254,
-0x300, 0x6e, 0x7a, 0xf9, 0x67, 0x68, 0xf2, 0x3b, 0x6e, 0x64, 0x7a, 0x254, 0x300, 0x14b, 0x254, 0x300, 0x64, 0xf9, 0x6d, 0x6c,
-0x6f, 0x3b, 0x6e, 0x64, 0x7a, 0x254, 0x300, 0x14b, 0x254, 0x300, 0x6b, 0x77, 0xee, 0x66, 0x254, 0x300, 0x65, 0x3b, 0x6e, 0x64,
-0x7a, 0x254, 0x300, 0x14b, 0x254, 0x300, 0x74, 0x197, 0x300, 0x66, 0x289, 0x300, 0x67, 0x68, 0xe0, 0x64, 0x7a, 0x75, 0x67, 0x68,
-0xf9, 0x3b, 0x6e, 0x64, 0x7a, 0x254, 0x300, 0x14b, 0x254, 0x300, 0x67, 0x68, 0x1d4, 0x75, 0x77, 0x65, 0x6c, 0x254, 0x300, 0x6d,
-0x3b, 0x6e, 0x64, 0x7a, 0x254, 0x300, 0x14b, 0x254, 0x300, 0x63, 0x68, 0x77, 0x61, 0x294, 0xe0, 0x6b, 0x61, 0x61, 0x20, 0x77,
-0x6f, 0x3b, 0x6e, 0x64, 0x7a, 0x254, 0x300, 0x14b, 0xe8, 0x66, 0x77, 0xf2, 0x6f, 0x3b, 0x6e, 0x3b, 0x6b, 0x3b, 0x74, 0x3b,
-0x74, 0x3b, 0x73, 0x3b, 0x7a, 0x3b, 0x6b, 0x3b, 0x66, 0x3b, 0x64, 0x3b, 0x6c, 0x3b, 0x63, 0x3b, 0x66, 0x3b, 0x6b, 0x254,
-0x6e, 0x3b, 0x6d, 0x61, 0x63, 0x3b, 0x6d, 0x61, 0x74, 0x3b, 0x6d, 0x74, 0x6f, 0x3b, 0x6d, 0x70, 0x75, 0x3b, 0x68, 0x69,
-0x6c, 0x3b, 0x6e, 0x6a, 0x65, 0x3b, 0x68, 0x69, 0x6b, 0x3b, 0x64, 0x69, 0x70, 0x3b, 0x62, 0x69, 0x6f, 0x3b, 0x6d, 0x61,
-0x79, 0x3b, 0x6c, 0x69, 0x253, 0x3b, 0x4b, 0x254, 0x6e, 0x64, 0x254, 0x14b, 0x3b, 0x4d, 0xe0, 0x63, 0x25b, 0x302, 0x6c, 0x3b,
-0x4d, 0xe0, 0x74, 0xf9, 0x6d, 0x62, 0x3b, 0x4d, 0xe0, 0x74, 0x6f, 0x70, 0x3b, 0x4d, 0x300, 0x70, 0x75, 0x79, 0x25b, 0x3b,
-0x48, 0xec, 0x6c, 0xf2, 0x6e, 0x64, 0x25b, 0x300, 0x3b, 0x4e, 0x6a, 0xe8, 0x62, 0xe0, 0x3b, 0x48, 0xec, 0x6b, 0x61, 0x14b,
-0x3b, 0x44, 0xec, 0x70, 0x254, 0x300, 0x73, 0x3b, 0x42, 0xec, 0xf2, 0xf4, 0x6d, 0x3b, 0x4d, 0xe0, 0x79, 0x25b, 0x73, 0xe8,
-0x70, 0x3b, 0x4c, 0xec, 0x62, 0x75, 0x79, 0x20, 0x6c, 0x69, 0x20, 0x144, 0x79, 0xe8, 0x65, 0x3b, 0x6b, 0x3b, 0x6d, 0x3b,
-0x6d, 0x3b, 0x6d, 0x3b, 0x6d, 0x3b, 0x68, 0x3b, 0x6e, 0x3b, 0x68, 0x3b, 0x64, 0x3b, 0x62, 0x3b, 0x6d, 0x3b, 0x6c, 0x3b,
-0x64, 0x69, 0x3b, 0x14b, 0x67, 0x254, 0x6e, 0x3b, 0x73, 0x254, 0x14b, 0x3b, 0x64, 0x69, 0x253, 0x3b, 0x65, 0x6d, 0x69, 0x3b,
-0x65, 0x73, 0x254, 0x3b, 0x6d, 0x61, 0x64, 0x3b, 0x64, 0x69, 0x14b, 0x3b, 0x6e, 0x79, 0x25b, 0x74, 0x3b, 0x6d, 0x61, 0x79,
-0x3b, 0x74, 0x69, 0x6e, 0x3b, 0x65, 0x6c, 0xe1, 0x3b, 0x64, 0x69, 0x6d, 0x254, 0x301, 0x64, 0x69, 0x3b, 0x14b, 0x67, 0x254,
-0x6e, 0x64, 0x25b, 0x3b, 0x73, 0x254, 0x14b, 0x25b, 0x3b, 0x64, 0x69, 0x253, 0xe1, 0x253, 0xe1, 0x3b, 0x65, 0x6d, 0x69, 0x61,
-0x73, 0x65, 0x6c, 0x65, 0x3b, 0x65, 0x73, 0x254, 0x70, 0x25b, 0x73, 0x254, 0x70, 0x25b, 0x3b, 0x6d, 0x61, 0x64, 0x69, 0x253,
-0x25b, 0x301, 0x64, 0xed, 0x253, 0x25b, 0x301, 0x3b, 0x64, 0x69, 0x14b, 0x67, 0x69, 0x6e, 0x64, 0x69, 0x3b, 0x6e, 0x79, 0x25b,
-0x74, 0x25b, 0x6b, 0x69, 0x3b, 0x6d, 0x61, 0x79, 0xe9, 0x73, 0x25b, 0x301, 0x3b, 0x74, 0x69, 0x6e, 0xed, 0x6e, 0xed, 0x3b,
-0x65, 0x6c, 0xe1, 0x14b, 0x67, 0x25b, 0x301, 0x3b, 0x64, 0x3b, 0x14b, 0x3b, 0x73, 0x3b, 0x64, 0x3b, 0x65, 0x3b, 0x65, 0x3b,
-0x6d, 0x3b, 0x64, 0x3b, 0x6e, 0x3b, 0x6d, 0x3b, 0x74, 0x3b, 0x65, 0x3b, 0x53, 0x61, 0x3b, 0x46, 0x65, 0x3b, 0x4d, 0x61,
-0x3b, 0x41, 0x62, 0x3b, 0x4d, 0x65, 0x3b, 0x53, 0x75, 0x3b, 0x53, 0xfa, 0x3b, 0x55, 0x74, 0x3b, 0x53, 0x65, 0x3b, 0x4f,
-0x6b, 0x3b, 0x4e, 0x6f, 0x3b, 0x44, 0x65, 0x3b, 0x53, 0x61, 0x6e, 0x76, 0x69, 0x65, 0x3b, 0x46, 0xe9, 0x62, 0x69, 0x72,
-0x69, 0x65, 0x3b, 0x4d, 0x61, 0x72, 0x73, 0x3b, 0x41, 0x62, 0x75, 0x72, 0x69, 0x6c, 0x3b, 0x4d, 0x65, 0x65, 0x3b, 0x53,
-0x75, 0x65, 0x14b, 0x3b, 0x53, 0xfa, 0x75, 0x79, 0x65, 0x65, 0x3b, 0x55, 0x74, 0x3b, 0x53, 0x65, 0x74, 0x74, 0x65, 0x6d,
-0x62, 0x61, 0x72, 0x3b, 0x4f, 0x6b, 0x74, 0x6f, 0x62, 0x61, 0x72, 0x3b, 0x4e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x61, 0x72,
-0x3b, 0x44, 0x69, 0x73, 0x61, 0x6d, 0x62, 0x61, 0x72, 0x3b, 0x53, 0x3b, 0x46, 0x3b, 0x4d, 0x3b, 0x41, 0x3b, 0x4d, 0x3b,
-0x53, 0x3b, 0x53, 0x3b, 0x55, 0x3b, 0x53, 0x3b, 0x4f, 0x3b, 0x4e, 0x3b, 0x44, 0x3b, 0x6e, 0x67, 0x6f, 0x3b, 0x6e, 0x67,
-0x62, 0x3b, 0x6e, 0x67, 0x6c, 0x3b, 0x6e, 0x67, 0x6e, 0x3b, 0x6e, 0x67, 0x74, 0x3b, 0x6e, 0x67, 0x73, 0x3b, 0x6e, 0x67,
-0x7a, 0x3b, 0x6e, 0x67, 0x6d, 0x3b, 0x6e, 0x67, 0x65, 0x3b, 0x6e, 0x67, 0x61, 0x3b, 0x6e, 0x67, 0x61, 0x64, 0x3b, 0x6e,
-0x67, 0x61, 0x62, 0x3b, 0x6e, 0x67, 0x254, 0x6e, 0x20, 0x6f, 0x73, 0xfa, 0x3b, 0x6e, 0x67, 0x254, 0x6e, 0x20, 0x62, 0x25b,
-0x30c, 0x3b, 0x6e, 0x67, 0x254, 0x6e, 0x20, 0x6c, 0xe1, 0x6c, 0x61, 0x3b, 0x6e, 0x67, 0x254, 0x6e, 0x20, 0x6e, 0x79, 0x69,
-0x6e, 0x61, 0x3b, 0x6e, 0x67, 0x254, 0x6e, 0x20, 0x74, 0xe1, 0x6e, 0x61, 0x3b, 0x6e, 0x67, 0x254, 0x6e, 0x20, 0x73, 0x61,
-0x6d, 0x259, 0x6e, 0x61, 0x3b, 0x6e, 0x67, 0x254, 0x6e, 0x20, 0x7a, 0x61, 0x6d, 0x67, 0x62, 0xe1, 0x6c, 0x61, 0x3b, 0x6e,
-0x67, 0x254, 0x6e, 0x20, 0x6d, 0x77, 0x6f, 0x6d, 0x3b, 0x6e, 0x67, 0x254, 0x6e, 0x20, 0x65, 0x62, 0x75, 0x6c, 0xfa, 0x3b,
-0x6e, 0x67, 0x254, 0x6e, 0x20, 0x61, 0x77, 0xf3, 0x6d, 0x3b, 0x6e, 0x67, 0x254, 0x6e, 0x20, 0x61, 0x77, 0xf3, 0x6d, 0x20,
-0x61, 0x69, 0x20, 0x64, 0x7a, 0x69, 0xe1, 0x3b, 0x6e, 0x67, 0x254, 0x6e, 0x20, 0x61, 0x77, 0xf3, 0x6d, 0x20, 0x61, 0x69,
-0x20, 0x62, 0x25b, 0x30c, 0x3b, 0x6f, 0x3b, 0x62, 0x3b, 0x6c, 0x3b, 0x6e, 0x3b, 0x74, 0x3b, 0x73, 0x3b, 0x7a, 0x3b, 0x6d,
-0x3b, 0x65, 0x3b, 0x61, 0x3b, 0x64, 0x3b, 0x62, 0x3b, 0x14b, 0x31, 0x3b, 0x14b, 0x32, 0x3b, 0x14b, 0x33, 0x3b, 0x14b, 0x34,
-0x3b, 0x14b, 0x35, 0x3b, 0x14b, 0x36, 0x3b, 0x14b, 0x37, 0x3b, 0x14b, 0x38, 0x3b, 0x14b, 0x39, 0x3b, 0x14b, 0x31, 0x30, 0x3b,
-0x14b, 0x31, 0x31, 0x3b, 0x14b, 0x31, 0x32, 0x3b, 0x14b, 0x77, 0xed, 0xed, 0x20, 0x61, 0x20, 0x6e, 0x74, 0x254, 0x301, 0x6e,
-0x74, 0x254, 0x3b, 0x14b, 0x77, 0xed, 0xed, 0x20, 0x61, 0x6b, 0x1dd, 0x20, 0x62, 0x25b, 0x301, 0x25b, 0x3b, 0x14b, 0x77, 0xed,
-0xed, 0x20, 0x61, 0x6b, 0x1dd, 0x20, 0x72, 0xe1, 0xe1, 0x3b, 0x14b, 0x77, 0xed, 0xed, 0x20, 0x61, 0x6b, 0x1dd, 0x20, 0x6e,
-0x69, 0x6e, 0x3b, 0x14b, 0x77, 0xed, 0xed, 0x20, 0x61, 0x6b, 0x1dd, 0x20, 0x74, 0xe1, 0x61, 0x6e, 0x3b, 0x14b, 0x77, 0xed,
-0xed, 0x20, 0x61, 0x6b, 0x1dd, 0x20, 0x74, 0xe1, 0x61, 0x66, 0x254, 0x6b, 0x3b, 0x14b, 0x77, 0xed, 0xed, 0x20, 0x61, 0x6b,
-0x1dd, 0x20, 0x74, 0xe1, 0x61, 0x62, 0x25b, 0x25b, 0x3b, 0x14b, 0x77, 0xed, 0xed, 0x20, 0x61, 0x6b, 0x1dd, 0x20, 0x74, 0xe1,
-0x61, 0x72, 0x61, 0x61, 0x3b, 0x14b, 0x77, 0xed, 0xed, 0x20, 0x61, 0x6b, 0x1dd, 0x20, 0x74, 0xe1, 0x61, 0x6e, 0x69, 0x6e,
-0x3b, 0x14b, 0x77, 0xed, 0xed, 0x20, 0x61, 0x6b, 0x1dd, 0x20, 0x6e, 0x74, 0x25b, 0x6b, 0x3b, 0x14b, 0x77, 0xed, 0xed, 0x20,
-0x61, 0x6b, 0x1dd, 0x20, 0x6e, 0x74, 0x25b, 0x6b, 0x20, 0x64, 0x69, 0x20, 0x62, 0x254, 0x301, 0x6b, 0x3b, 0x14b, 0x77, 0xed,
-0xed, 0x20, 0x61, 0x6b, 0x1dd, 0x20, 0x6e, 0x74, 0x25b, 0x6b, 0x20, 0x64, 0x69, 0x20, 0x62, 0x25b, 0x301, 0x25b, 0x3b, 0x4b,
-0x77, 0x61, 0x3b, 0x55, 0x6e, 0x61, 0x3b, 0x52, 0x61, 0x72, 0x3b, 0x43, 0x68, 0x65, 0x3b, 0x54, 0x68, 0x61, 0x3b, 0x4d,
-0x6f, 0x63, 0x3b, 0x53, 0x61, 0x62, 0x3b, 0x4e, 0x61, 0x6e, 0x3b, 0x54, 0x69, 0x73, 0x3b, 0x4b, 0x75, 0x6d, 0x3b, 0x4d,
-0x6f, 0x6a, 0x3b, 0x59, 0x65, 0x6c, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x69, 0x20, 0x77, 0x6f, 0x20, 0x6b, 0x77, 0x61, 0x6e,
-0x7a, 0x61, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x69, 0x20, 0x77, 0x6f, 0x20, 0x75, 0x6e, 0x61, 0x79, 0x65, 0x6c, 0x69, 0x3b,
-0x4d, 0x77, 0x65, 0x72, 0x69, 0x20, 0x77, 0x6f, 0x20, 0x75, 0x6e, 0x65, 0x72, 0x61, 0x72, 0x75, 0x3b, 0x4d, 0x77, 0x65,
-0x72, 0x69, 0x20, 0x77, 0x6f, 0x20, 0x75, 0x6e, 0x65, 0x63, 0x68, 0x65, 0x73, 0x68, 0x65, 0x3b, 0x4d, 0x77, 0x65, 0x72,
-0x69, 0x20, 0x77, 0x6f, 0x20, 0x75, 0x6e, 0x65, 0x74, 0x68, 0x61, 0x6e, 0x75, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x69, 0x20,
-0x77, 0x6f, 0x20, 0x74, 0x68, 0x61, 0x6e, 0x75, 0x20, 0x6e, 0x61, 0x20, 0x6d, 0x6f, 0x63, 0x68, 0x61, 0x3b, 0x4d, 0x77,
-0x65, 0x72, 0x69, 0x20, 0x77, 0x6f, 0x20, 0x73, 0x61, 0x62, 0x61, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x69, 0x20, 0x77, 0x6f,
-0x20, 0x6e, 0x61, 0x6e, 0x65, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x69, 0x20, 0x77, 0x6f, 0x20, 0x74, 0x69, 0x73, 0x61, 0x3b,
-0x4d, 0x77, 0x65, 0x72, 0x69, 0x20, 0x77, 0x6f, 0x20, 0x6b, 0x75, 0x6d, 0x69, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x69, 0x20,
-0x77, 0x6f, 0x20, 0x6b, 0x75, 0x6d, 0x69, 0x20, 0x6e, 0x61, 0x20, 0x6d, 0x6f, 0x6a, 0x61, 0x3b, 0x4d, 0x77, 0x65, 0x72,
-0x69, 0x20, 0x77, 0x6f, 0x20, 0x6b, 0x75, 0x6d, 0x69, 0x20, 0x6e, 0x61, 0x20, 0x79, 0x65, 0x6c, 0x2019, 0x6c, 0x69, 0x3b,
-0x4b, 0x3b, 0x55, 0x3b, 0x52, 0x3b, 0x43, 0x3b, 0x54, 0x3b, 0x4d, 0x3b, 0x53, 0x3b, 0x4e, 0x3b, 0x54, 0x3b, 0x4b, 0x3b,
-0x4d, 0x3b, 0x59, 0x3b, 0x46, 0x4c, 0x4f, 0x3b, 0x43, 0x4c, 0x41, 0x3b, 0x43, 0x4b, 0x49, 0x3b, 0x46, 0x4d, 0x46, 0x3b,
-0x4d, 0x41, 0x44, 0x3b, 0x4d, 0x42, 0x49, 0x3b, 0x4d, 0x4c, 0x49, 0x3b, 0x4d, 0x41, 0x4d, 0x3b, 0x46, 0x44, 0x45, 0x3b,
-0x46, 0x4d, 0x55, 0x3b, 0x46, 0x47, 0x57, 0x3b, 0x46, 0x59, 0x55, 0x3b, 0x46, 0x129, 0x69, 0x20, 0x4c, 0x6f, 0x6f, 0x3b,
-0x43, 0x6f, 0x6b, 0x63, 0x77, 0x61, 0x6b, 0x6c, 0x61, 0x14b, 0x6e, 0x65, 0x3b, 0x43, 0x6f, 0x6b, 0x63, 0x77, 0x61, 0x6b,
-0x6c, 0x69, 0x69, 0x3b, 0x46, 0x129, 0x69, 0x20, 0x4d, 0x61, 0x72, 0x66, 0x6f, 0x6f, 0x3b, 0x4d, 0x61, 0x64, 0x1dd, 0x1dd,
-0x75, 0x75, 0x74, 0x1dd, 0x62, 0x69, 0x6a, 0x61, 0x14b, 0x3b, 0x4d, 0x61, 0x6d, 0x1dd, 0x14b, 0x67, 0x77, 0xe3, 0x61, 0x66,
-0x61, 0x68, 0x62, 0x69, 0x69, 0x3b, 0x4d, 0x61, 0x6d, 0x1dd, 0x14b, 0x67, 0x77, 0xe3, 0x61, 0x6c, 0x69, 0x69, 0x3b, 0x4d,
-0x61, 0x64, 0x1dd, 0x6d, 0x62, 0x69, 0x69, 0x3b, 0x46, 0x129, 0x69, 0x20, 0x44, 0x1dd, 0x253, 0x6c, 0x69, 0x69, 0x3b, 0x46,
-0x129, 0x69, 0x20, 0x4d, 0x75, 0x6e, 0x64, 0x61, 0x14b, 0x3b, 0x46, 0x129, 0x69, 0x20, 0x47, 0x77, 0x61, 0x68, 0x6c, 0x6c,
-0x65, 0x3b, 0x46, 0x129, 0x69, 0x20, 0x59, 0x75, 0x72, 0x75, 0x3b, 0x4f, 0x3b, 0x41, 0x3b, 0x49, 0x3b, 0x46, 0x3b, 0x44,
-0x3b, 0x42, 0x3b, 0x4c, 0x3b, 0x4d, 0x3b, 0x45, 0x3b, 0x55, 0x3b, 0x57, 0x3b, 0x59, 0x3b, 0x6e, 0x67, 0x31, 0x3b, 0x6e,
-0x67, 0x32, 0x3b, 0x6e, 0x67, 0x33, 0x3b, 0x6e, 0x67, 0x34, 0x3b, 0x6e, 0x67, 0x35, 0x3b, 0x6e, 0x67, 0x36, 0x3b, 0x6e,
-0x67, 0x37, 0x3b, 0x6e, 0x67, 0x38, 0x3b, 0x6e, 0x67, 0x39, 0x3b, 0x6e, 0x67, 0x31, 0x30, 0x3b, 0x6e, 0x67, 0x31, 0x31,
-0x3b, 0x6b, 0x72, 0x69, 0x73, 0x3b, 0x6e, 0x67, 0x77, 0x25b, 0x6e, 0x20, 0x6d, 0x61, 0x74, 0xe1, 0x68, 0x72, 0x61, 0x3b,
-0x6e, 0x67, 0x77, 0x25b, 0x6e, 0x20, 0x144, 0x6d, 0x62, 0x61, 0x3b, 0x6e, 0x67, 0x77, 0x25b, 0x6e, 0x20, 0x144, 0x6c, 0x61,
-0x6c, 0x3b, 0x6e, 0x67, 0x77, 0x25b, 0x6e, 0x20, 0x144, 0x6e, 0x61, 0x3b, 0x6e, 0x67, 0x77, 0x25b, 0x6e, 0x20, 0x144, 0x74,
-0x61, 0x6e, 0x3b, 0x6e, 0x67, 0x77, 0x25b, 0x6e, 0x20, 0x144, 0x74, 0x75, 0xf3, 0x3b, 0x6e, 0x67, 0x77, 0x25b, 0x6e, 0x20,
-0x68, 0x25b, 0x6d, 0x62, 0x75, 0x25b, 0x72, 0xed, 0x3b, 0x6e, 0x67, 0x77, 0x25b, 0x6e, 0x20, 0x6c, 0x254, 0x6d, 0x62, 0x69,
-0x3b, 0x6e, 0x67, 0x77, 0x25b, 0x6e, 0x20, 0x72, 0x25b, 0x62, 0x76, 0x75, 0xe2, 0x3b, 0x6e, 0x67, 0x77, 0x25b, 0x6e, 0x20,
-0x77, 0x75, 0x6d, 0x3b, 0x6e, 0x67, 0x77, 0x25b, 0x6e, 0x20, 0x77, 0x75, 0x6d, 0x20, 0x6e, 0x61, 0x76, 0x1d4, 0x72, 0x3b,
-0x6b, 0x72, 0xed, 0x73, 0x69, 0x6d, 0x69, 0x6e, 0x3b, 0x54, 0x69, 0x6f, 0x70, 0x3b, 0x50, 0x25b, 0x74, 0x3b, 0x44, 0x75,
-0x254, 0x331, 0x254, 0x331, 0x3b, 0x47, 0x75, 0x61, 0x6b, 0x3b, 0x44, 0x75, 0xe4, 0x3b, 0x4b, 0x6f, 0x72, 0x3b, 0x50, 0x61,
-0x79, 0x3b, 0x54, 0x68, 0x6f, 0x6f, 0x3b, 0x54, 0x25b, 0x25b, 0x3b, 0x4c, 0x61, 0x61, 0x3b, 0x4b, 0x75, 0x72, 0x3b, 0x54,
-0x69, 0x64, 0x3b, 0x54, 0x69, 0x6f, 0x70, 0x20, 0x74, 0x68, 0x61, 0x72, 0x20, 0x70, 0x25b, 0x74, 0x3b, 0x50, 0x25b, 0x74,
-0x3b, 0x44, 0x75, 0x254, 0x331, 0x254, 0x331, 0x14b, 0x3b, 0x47, 0x75, 0x61, 0x6b, 0x3b, 0x44, 0x75, 0xe4, 0x74, 0x3b, 0x4b,
-0x6f, 0x72, 0x6e, 0x79, 0x6f, 0x6f, 0x74, 0x3b, 0x50, 0x61, 0x79, 0x20, 0x79, 0x69, 0x65, 0x331, 0x74, 0x6e, 0x69, 0x3b,
-0x54, 0x68, 0x6f, 0x331, 0x6f, 0x331, 0x72, 0x3b, 0x54, 0x25b, 0x25b, 0x72, 0x3b, 0x4c, 0x61, 0x61, 0x74, 0x68, 0x3b, 0x4b,
-0x75, 0x72, 0x3b, 0x54, 0x69, 0x6f, 0x331, 0x70, 0x20, 0x69, 0x6e, 0x20, 0x64, 0x69, 0x331, 0x69, 0x331, 0x74, 0x3b, 0x54,
-0x3b, 0x50, 0x3b, 0x44, 0x3b, 0x47, 0x3b, 0x44, 0x3b, 0x4b, 0x3b, 0x50, 0x3b, 0x54, 0x3b, 0x54, 0x3b, 0x4c, 0x3b, 0x4b,
-0x3b, 0x54, 0x3b, 0x422, 0x43e, 0x445, 0x441, 0x3b, 0x41e, 0x43b, 0x443, 0x43d, 0x3b, 0x41a, 0x43b, 0x43d, 0x3b, 0x41c, 0x441, 0x443,
-0x3b, 0x42b, 0x430, 0x43c, 0x3b, 0x411, 0x44d, 0x441, 0x3b, 0x41e, 0x442, 0x439, 0x3b, 0x410, 0x442, 0x440, 0x3b, 0x411, 0x43b, 0x495,
-0x3b, 0x410, 0x43b, 0x442, 0x3b, 0x421, 0x44d, 0x442, 0x3b, 0x410, 0x445, 0x441, 0x3b, 0x442, 0x43e, 0x445, 0x441, 0x443, 0x43d, 0x43d,
-0x44c, 0x443, 0x3b, 0x43e, 0x43b, 0x443, 0x43d, 0x43d, 0x44c, 0x443, 0x3b, 0x43a, 0x443, 0x43b, 0x443, 0x43d, 0x20, 0x442, 0x443, 0x442,
-0x430, 0x440, 0x3b, 0x43c, 0x443, 0x443, 0x441, 0x20, 0x443, 0x441, 0x442, 0x430, 0x440, 0x3b, 0x44b, 0x430, 0x43c, 0x20, 0x44b, 0x439,
-0x430, 0x3b, 0x431, 0x44d, 0x441, 0x20, 0x44b, 0x439, 0x430, 0x3b, 0x43e, 0x442, 0x20, 0x44b, 0x439, 0x430, 0x3b, 0x430, 0x442, 0x44b,
-0x440, 0x434, 0x44c, 0x44b, 0x445, 0x20, 0x44b, 0x439, 0x430, 0x3b, 0x431, 0x430, 0x43b, 0x430, 0x495, 0x430, 0x43d, 0x20, 0x44b, 0x439,
-0x430, 0x3b, 0x430, 0x43b, 0x442, 0x44b, 0x43d, 0x43d, 0x44c, 0x44b, 0x3b, 0x441, 0x44d, 0x442, 0x438, 0x43d, 0x43d, 0x44c, 0x438, 0x3b,
-0x430, 0x445, 0x441, 0x44b, 0x43d, 0x43d, 0x44c, 0x44b, 0x3b, 0x422, 0x3b, 0x41e, 0x3b, 0x41a, 0x3b, 0x41c, 0x3b, 0x42b, 0x3b, 0x411,
-0x3b, 0x41e, 0x3b, 0x410, 0x3b, 0x411, 0x3b, 0x410, 0x3b, 0x421, 0x3b, 0x410, 0x3b, 0x422, 0x43e, 0x445, 0x441, 0x443, 0x43d, 0x43d,
-0x44c, 0x443, 0x3b, 0x41e, 0x43b, 0x443, 0x43d, 0x43d, 0x44c, 0x443, 0x3b, 0x41a, 0x443, 0x43b, 0x443, 0x43d, 0x20, 0x442, 0x443, 0x442,
-0x430, 0x440, 0x3b, 0x41c, 0x443, 0x443, 0x441, 0x20, 0x443, 0x441, 0x442, 0x430, 0x440, 0x3b, 0x42b, 0x430, 0x43c, 0x20, 0x44b, 0x439,
-0x44b, 0x43d, 0x3b, 0x411, 0x44d, 0x441, 0x20, 0x44b, 0x439, 0x44b, 0x43d, 0x3b, 0x41e, 0x442, 0x20, 0x44b, 0x439, 0x44b, 0x43d, 0x3b,
-0x410, 0x442, 0x44b, 0x440, 0x434, 0x44c, 0x44b, 0x445, 0x20, 0x44b, 0x439, 0x44b, 0x43d, 0x3b, 0x411, 0x430, 0x43b, 0x430, 0x495, 0x430,
-0x43d, 0x20, 0x44b, 0x439, 0x44b, 0x43d, 0x3b, 0x410, 0x43b, 0x442, 0x44b, 0x43d, 0x43d, 0x44c, 0x44b, 0x3b, 0x421, 0x44d, 0x442, 0x438,
-0x43d, 0x43d, 0x44c, 0x438, 0x3b, 0x430, 0x445, 0x441, 0x44b, 0x43d, 0x43d, 0x44c, 0x44b, 0x3b, 0x4d, 0x75, 0x70, 0x3b, 0x4d, 0x77,
+0x4c, 0x75, 0x74, 0x3b, 0x4c, 0x75, 0x6e, 0x3b, 0x4b, 0x61, 0x73, 0x3b, 0x43, 0x69, 0x73, 0x43, 0x3b, 0x4c, 0x3b, 0x4c,
+0x3b, 0x4d, 0x3b, 0x4c, 0x3b, 0x4c, 0x3b, 0x4b, 0x3b, 0x4c, 0x3b, 0x4c, 0x3b, 0x4c, 0x3b, 0x4b, 0x3b, 0x43, 0x4a, 0x61,
+0x6e, 0x75, 0x61, 0x72, 0x3b, 0x46, 0x65, 0x62, 0x72, 0x75, 0x61, 0x72, 0x3b, 0x4d, 0xe4, 0x65, 0x72, 0x7a, 0x3b, 0x41,
+0x62, 0x72, 0xeb, 0x6c, 0x6c, 0x3b, 0x4d, 0x65, 0x65, 0x3b, 0x4a, 0x75, 0x6e, 0x69, 0x3b, 0x4a, 0x75, 0x6c, 0x69, 0x3b,
+0x41, 0x75, 0x67, 0x75, 0x73, 0x74, 0x3b, 0x53, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x4f, 0x6b, 0x74,
+0x6f, 0x62, 0x65, 0x72, 0x3b, 0x4e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x44, 0x65, 0x7a, 0x65, 0x6d, 0x62,
+0x65, 0x72, 0x4a, 0x61, 0x6e, 0x3b, 0x46, 0x65, 0x62, 0x3b, 0x4d, 0xe4, 0x65, 0x3b, 0x41, 0x62, 0x72, 0x3b, 0x4d, 0x65,
+0x65, 0x3b, 0x4a, 0x75, 0x6e, 0x3b, 0x4a, 0x75, 0x6c, 0x3b, 0x41, 0x75, 0x67, 0x3b, 0x53, 0x65, 0x70, 0x3b, 0x4f, 0x6b,
+0x74, 0x3b, 0x4e, 0x6f, 0x76, 0x3b, 0x44, 0x65, 0x7a, 0x4a, 0x61, 0x6e, 0x2e, 0x3b, 0x46, 0x65, 0x62, 0x2e, 0x3b, 0x4d,
+0xe4, 0x65, 0x2e, 0x3b, 0x41, 0x62, 0x72, 0x2e, 0x3b, 0x4d, 0x65, 0x65, 0x3b, 0x4a, 0x75, 0x6e, 0x69, 0x3b, 0x4a, 0x75,
+0x6c, 0x69, 0x3b, 0x41, 0x75, 0x67, 0x2e, 0x3b, 0x53, 0x65, 0x70, 0x2e, 0x3b, 0x4f, 0x6b, 0x74, 0x2e, 0x3b, 0x4e, 0x6f,
+0x76, 0x2e, 0x3b, 0x44, 0x65, 0x7a, 0x2e, 0x6e, 0x64, 0x7a, 0x254, 0x300, 0x14b, 0x254, 0x300, 0x6e, 0xf9, 0x6d, 0x3b, 0x6e,
+0x64, 0x7a, 0x254, 0x300, 0x14b, 0x254, 0x300, 0x6b, 0x197, 0x300, 0x7a, 0xf9, 0x294, 0x3b, 0x6e, 0x64, 0x7a, 0x254, 0x300, 0x14b,
+0x254, 0x300, 0x74, 0x197, 0x300, 0x64, 0x289, 0x300, 0x67, 0x68, 0xe0, 0x3b, 0x6e, 0x64, 0x7a, 0x254, 0x300, 0x14b, 0x254, 0x300,
+0x74, 0x1ce, 0x61, 0x66, 0x289, 0x304, 0x67, 0x68, 0x101, 0x3b, 0x6e, 0x64, 0x7a, 0x254, 0x300, 0x14b, 0xe8, 0x73, 0xe8, 0x65,
+0x3b, 0x6e, 0x64, 0x7a, 0x254, 0x300, 0x14b, 0x254, 0x300, 0x6e, 0x7a, 0xf9, 0x67, 0x68, 0xf2, 0x3b, 0x6e, 0x64, 0x7a, 0x254,
+0x300, 0x14b, 0x254, 0x300, 0x64, 0xf9, 0x6d, 0x6c, 0x6f, 0x3b, 0x6e, 0x64, 0x7a, 0x254, 0x300, 0x14b, 0x254, 0x300, 0x6b, 0x77,
+0xee, 0x66, 0x254, 0x300, 0x65, 0x3b, 0x6e, 0x64, 0x7a, 0x254, 0x300, 0x14b, 0x254, 0x300, 0x74, 0x197, 0x300, 0x66, 0x289, 0x300,
+0x67, 0x68, 0xe0, 0x64, 0x7a, 0x75, 0x67, 0x68, 0xf9, 0x3b, 0x6e, 0x64, 0x7a, 0x254, 0x300, 0x14b, 0x254, 0x300, 0x67, 0x68,
+0x1d4, 0x75, 0x77, 0x65, 0x6c, 0x254, 0x300, 0x6d, 0x3b, 0x6e, 0x64, 0x7a, 0x254, 0x300, 0x14b, 0x254, 0x300, 0x63, 0x68, 0x77,
+0x61, 0x294, 0xe0, 0x6b, 0x61, 0x61, 0x20, 0x77, 0x6f, 0x3b, 0x6e, 0x64, 0x7a, 0x254, 0x300, 0x14b, 0xe8, 0x66, 0x77, 0xf2,
+0x6f, 0x6e, 0xf9, 0x6d, 0x3b, 0x6b, 0x268, 0x7a, 0x3b, 0x74, 0x268, 0x64, 0x3b, 0x74, 0x61, 0x61, 0x3b, 0x73, 0x65, 0x65,
+0x3b, 0x6e, 0x7a, 0x75, 0x3b, 0x64, 0x75, 0x6d, 0x3b, 0x66, 0x254, 0x65, 0x3b, 0x64, 0x7a, 0x75, 0x3b, 0x6c, 0x254, 0x6d,
+0x3b, 0x6b, 0x61, 0x61, 0x3b, 0x66, 0x77, 0x6f, 0x6e, 0x3b, 0x6b, 0x3b, 0x74, 0x3b, 0x74, 0x3b, 0x73, 0x3b, 0x7a, 0x3b,
+0x6b, 0x3b, 0x66, 0x3b, 0x64, 0x3b, 0x6c, 0x3b, 0x63, 0x3b, 0x66, 0x4b, 0x254, 0x6e, 0x64, 0x254, 0x14b, 0x3b, 0x4d, 0xe0,
+0x63, 0x25b, 0x302, 0x6c, 0x3b, 0x4d, 0xe0, 0x74, 0xf9, 0x6d, 0x62, 0x3b, 0x4d, 0xe0, 0x74, 0x6f, 0x70, 0x3b, 0x4d, 0x300,
+0x70, 0x75, 0x79, 0x25b, 0x3b, 0x48, 0xec, 0x6c, 0xf2, 0x6e, 0x64, 0x25b, 0x300, 0x3b, 0x4e, 0x6a, 0xe8, 0x62, 0xe0, 0x3b,
+0x48, 0xec, 0x6b, 0x61, 0x14b, 0x3b, 0x44, 0xec, 0x70, 0x254, 0x300, 0x73, 0x3b, 0x42, 0xec, 0xf2, 0xf4, 0x6d, 0x3b, 0x4d,
+0xe0, 0x79, 0x25b, 0x73, 0xe8, 0x70, 0x3b, 0x4c, 0xec, 0x62, 0x75, 0x79, 0x20, 0x6c, 0x69, 0x20, 0x144, 0x79, 0xe8, 0x65,
+0x6b, 0x254, 0x6e, 0x3b, 0x6d, 0x61, 0x63, 0x3b, 0x6d, 0x61, 0x74, 0x3b, 0x6d, 0x74, 0x6f, 0x3b, 0x6d, 0x70, 0x75, 0x3b,
+0x68, 0x69, 0x6c, 0x3b, 0x6e, 0x6a, 0x65, 0x3b, 0x68, 0x69, 0x6b, 0x3b, 0x64, 0x69, 0x70, 0x3b, 0x62, 0x69, 0x6f, 0x3b,
+0x6d, 0x61, 0x79, 0x3b, 0x6c, 0x69, 0x253, 0x6b, 0x3b, 0x6d, 0x3b, 0x6d, 0x3b, 0x6d, 0x3b, 0x6d, 0x3b, 0x68, 0x3b, 0x6e,
+0x3b, 0x68, 0x3b, 0x64, 0x3b, 0x62, 0x3b, 0x6d, 0x3b, 0x6c, 0x64, 0x69, 0x6d, 0x254, 0x301, 0x64, 0x69, 0x3b, 0x14b, 0x67,
+0x254, 0x6e, 0x64, 0x25b, 0x3b, 0x73, 0x254, 0x14b, 0x25b, 0x3b, 0x64, 0x69, 0x253, 0xe1, 0x253, 0xe1, 0x3b, 0x65, 0x6d, 0x69,
+0x61, 0x73, 0x65, 0x6c, 0x65, 0x3b, 0x65, 0x73, 0x254, 0x70, 0x25b, 0x73, 0x254, 0x70, 0x25b, 0x3b, 0x6d, 0x61, 0x64, 0x69,
+0x253, 0x25b, 0x301, 0x64, 0xed, 0x253, 0x25b, 0x301, 0x3b, 0x64, 0x69, 0x14b, 0x67, 0x69, 0x6e, 0x64, 0x69, 0x3b, 0x6e, 0x79,
+0x25b, 0x74, 0x25b, 0x6b, 0x69, 0x3b, 0x6d, 0x61, 0x79, 0xe9, 0x73, 0x25b, 0x301, 0x3b, 0x74, 0x69, 0x6e, 0xed, 0x6e, 0xed,
+0x3b, 0x65, 0x6c, 0xe1, 0x14b, 0x67, 0x25b, 0x301, 0x64, 0x69, 0x3b, 0x14b, 0x67, 0x254, 0x6e, 0x3b, 0x73, 0x254, 0x14b, 0x3b,
+0x64, 0x69, 0x253, 0x3b, 0x65, 0x6d, 0x69, 0x3b, 0x65, 0x73, 0x254, 0x3b, 0x6d, 0x61, 0x64, 0x3b, 0x64, 0x69, 0x14b, 0x3b,
+0x6e, 0x79, 0x25b, 0x74, 0x3b, 0x6d, 0x61, 0x79, 0x3b, 0x74, 0x69, 0x6e, 0x3b, 0x65, 0x6c, 0xe1, 0x64, 0x3b, 0x14b, 0x3b,
+0x73, 0x3b, 0x64, 0x3b, 0x65, 0x3b, 0x65, 0x3b, 0x6d, 0x3b, 0x64, 0x3b, 0x6e, 0x3b, 0x6d, 0x3b, 0x74, 0x3b, 0x65, 0x53,
+0x61, 0x6e, 0x76, 0x69, 0x65, 0x3b, 0x46, 0xe9, 0x62, 0x69, 0x72, 0x69, 0x65, 0x3b, 0x4d, 0x61, 0x72, 0x73, 0x3b, 0x41,
+0x62, 0x75, 0x72, 0x69, 0x6c, 0x3b, 0x4d, 0x65, 0x65, 0x3b, 0x53, 0x75, 0x65, 0x14b, 0x3b, 0x53, 0xfa, 0x75, 0x79, 0x65,
+0x65, 0x3b, 0x55, 0x74, 0x3b, 0x53, 0x65, 0x74, 0x74, 0x65, 0x6d, 0x62, 0x61, 0x72, 0x3b, 0x4f, 0x6b, 0x74, 0x6f, 0x62,
+0x61, 0x72, 0x3b, 0x4e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x61, 0x72, 0x3b, 0x44, 0x69, 0x73, 0x61, 0x6d, 0x62, 0x61, 0x72,
+0x53, 0x61, 0x3b, 0x46, 0x65, 0x3b, 0x4d, 0x61, 0x3b, 0x41, 0x62, 0x3b, 0x4d, 0x65, 0x3b, 0x53, 0x75, 0x3b, 0x53, 0xfa,
+0x3b, 0x55, 0x74, 0x3b, 0x53, 0x65, 0x3b, 0x4f, 0x6b, 0x3b, 0x4e, 0x6f, 0x3b, 0x44, 0x65, 0x53, 0x3b, 0x46, 0x3b, 0x4d,
+0x3b, 0x41, 0x3b, 0x4d, 0x3b, 0x53, 0x3b, 0x53, 0x3b, 0x55, 0x3b, 0x53, 0x3b, 0x4f, 0x3b, 0x4e, 0x3b, 0x44, 0x6e, 0x67,
+0x254, 0x6e, 0x20, 0x6f, 0x73, 0xfa, 0x3b, 0x6e, 0x67, 0x254, 0x6e, 0x20, 0x62, 0x25b, 0x30c, 0x3b, 0x6e, 0x67, 0x254, 0x6e,
+0x20, 0x6c, 0xe1, 0x6c, 0x61, 0x3b, 0x6e, 0x67, 0x254, 0x6e, 0x20, 0x6e, 0x79, 0x69, 0x6e, 0x61, 0x3b, 0x6e, 0x67, 0x254,
+0x6e, 0x20, 0x74, 0xe1, 0x6e, 0x61, 0x3b, 0x6e, 0x67, 0x254, 0x6e, 0x20, 0x73, 0x61, 0x6d, 0x259, 0x6e, 0x61, 0x3b, 0x6e,
+0x67, 0x254, 0x6e, 0x20, 0x7a, 0x61, 0x6d, 0x67, 0x62, 0xe1, 0x6c, 0x61, 0x3b, 0x6e, 0x67, 0x254, 0x6e, 0x20, 0x6d, 0x77,
+0x6f, 0x6d, 0x3b, 0x6e, 0x67, 0x254, 0x6e, 0x20, 0x65, 0x62, 0x75, 0x6c, 0xfa, 0x3b, 0x6e, 0x67, 0x254, 0x6e, 0x20, 0x61,
+0x77, 0xf3, 0x6d, 0x3b, 0x6e, 0x67, 0x254, 0x6e, 0x20, 0x61, 0x77, 0xf3, 0x6d, 0x20, 0x61, 0x69, 0x20, 0x64, 0x7a, 0x69,
+0xe1, 0x3b, 0x6e, 0x67, 0x254, 0x6e, 0x20, 0x61, 0x77, 0xf3, 0x6d, 0x20, 0x61, 0x69, 0x20, 0x62, 0x25b, 0x30c, 0x6e, 0x67,
+0x6f, 0x3b, 0x6e, 0x67, 0x62, 0x3b, 0x6e, 0x67, 0x6c, 0x3b, 0x6e, 0x67, 0x6e, 0x3b, 0x6e, 0x67, 0x74, 0x3b, 0x6e, 0x67,
+0x73, 0x3b, 0x6e, 0x67, 0x7a, 0x3b, 0x6e, 0x67, 0x6d, 0x3b, 0x6e, 0x67, 0x65, 0x3b, 0x6e, 0x67, 0x61, 0x3b, 0x6e, 0x67,
+0x61, 0x64, 0x3b, 0x6e, 0x67, 0x61, 0x62, 0x6f, 0x3b, 0x62, 0x3b, 0x6c, 0x3b, 0x6e, 0x3b, 0x74, 0x3b, 0x73, 0x3b, 0x7a,
+0x3b, 0x6d, 0x3b, 0x65, 0x3b, 0x61, 0x3b, 0x64, 0x3b, 0x62, 0x14b, 0x77, 0xed, 0xed, 0x20, 0x61, 0x20, 0x6e, 0x74, 0x254,
+0x301, 0x6e, 0x74, 0x254, 0x3b, 0x14b, 0x77, 0xed, 0xed, 0x20, 0x61, 0x6b, 0x1dd, 0x20, 0x62, 0x25b, 0x301, 0x25b, 0x3b, 0x14b,
+0x77, 0xed, 0xed, 0x20, 0x61, 0x6b, 0x1dd, 0x20, 0x72, 0xe1, 0xe1, 0x3b, 0x14b, 0x77, 0xed, 0xed, 0x20, 0x61, 0x6b, 0x1dd,
+0x20, 0x6e, 0x69, 0x6e, 0x3b, 0x14b, 0x77, 0xed, 0xed, 0x20, 0x61, 0x6b, 0x1dd, 0x20, 0x74, 0xe1, 0x61, 0x6e, 0x3b, 0x14b,
+0x77, 0xed, 0xed, 0x20, 0x61, 0x6b, 0x1dd, 0x20, 0x74, 0xe1, 0x61, 0x66, 0x254, 0x6b, 0x3b, 0x14b, 0x77, 0xed, 0xed, 0x20,
+0x61, 0x6b, 0x1dd, 0x20, 0x74, 0xe1, 0x61, 0x62, 0x25b, 0x25b, 0x3b, 0x14b, 0x77, 0xed, 0xed, 0x20, 0x61, 0x6b, 0x1dd, 0x20,
+0x74, 0xe1, 0x61, 0x72, 0x61, 0x61, 0x3b, 0x14b, 0x77, 0xed, 0xed, 0x20, 0x61, 0x6b, 0x1dd, 0x20, 0x74, 0xe1, 0x61, 0x6e,
+0x69, 0x6e, 0x3b, 0x14b, 0x77, 0xed, 0xed, 0x20, 0x61, 0x6b, 0x1dd, 0x20, 0x6e, 0x74, 0x25b, 0x6b, 0x3b, 0x14b, 0x77, 0xed,
+0xed, 0x20, 0x61, 0x6b, 0x1dd, 0x20, 0x6e, 0x74, 0x25b, 0x6b, 0x20, 0x64, 0x69, 0x20, 0x62, 0x254, 0x301, 0x6b, 0x3b, 0x14b,
+0x77, 0xed, 0xed, 0x20, 0x61, 0x6b, 0x1dd, 0x20, 0x6e, 0x74, 0x25b, 0x6b, 0x20, 0x64, 0x69, 0x20, 0x62, 0x25b, 0x301, 0x25b,
+0x14b, 0x31, 0x3b, 0x14b, 0x32, 0x3b, 0x14b, 0x33, 0x3b, 0x14b, 0x34, 0x3b, 0x14b, 0x35, 0x3b, 0x14b, 0x36, 0x3b, 0x14b, 0x37,
+0x3b, 0x14b, 0x38, 0x3b, 0x14b, 0x39, 0x3b, 0x14b, 0x31, 0x30, 0x3b, 0x14b, 0x31, 0x31, 0x3b, 0x14b, 0x31, 0x32, 0x4d, 0x77,
+0x65, 0x72, 0x69, 0x20, 0x77, 0x6f, 0x20, 0x6b, 0x77, 0x61, 0x6e, 0x7a, 0x61, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x69, 0x20,
+0x77, 0x6f, 0x20, 0x75, 0x6e, 0x61, 0x79, 0x65, 0x6c, 0x69, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x69, 0x20, 0x77, 0x6f, 0x20,
+0x75, 0x6e, 0x65, 0x72, 0x61, 0x72, 0x75, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x69, 0x20, 0x77, 0x6f, 0x20, 0x75, 0x6e, 0x65,
+0x63, 0x68, 0x65, 0x73, 0x68, 0x65, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x69, 0x20, 0x77, 0x6f, 0x20, 0x75, 0x6e, 0x65, 0x74,
+0x68, 0x61, 0x6e, 0x75, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x69, 0x20, 0x77, 0x6f, 0x20, 0x74, 0x68, 0x61, 0x6e, 0x75, 0x20,
+0x6e, 0x61, 0x20, 0x6d, 0x6f, 0x63, 0x68, 0x61, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x69, 0x20, 0x77, 0x6f, 0x20, 0x73, 0x61,
+0x62, 0x61, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x69, 0x20, 0x77, 0x6f, 0x20, 0x6e, 0x61, 0x6e, 0x65, 0x3b, 0x4d, 0x77, 0x65,
+0x72, 0x69, 0x20, 0x77, 0x6f, 0x20, 0x74, 0x69, 0x73, 0x61, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x69, 0x20, 0x77, 0x6f, 0x20,
+0x6b, 0x75, 0x6d, 0x69, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x69, 0x20, 0x77, 0x6f, 0x20, 0x6b, 0x75, 0x6d, 0x69, 0x20, 0x6e,
+0x61, 0x20, 0x6d, 0x6f, 0x6a, 0x61, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x69, 0x20, 0x77, 0x6f, 0x20, 0x6b, 0x75, 0x6d, 0x69,
+0x20, 0x6e, 0x61, 0x20, 0x79, 0x65, 0x6c, 0x2019, 0x6c, 0x69, 0x4b, 0x77, 0x61, 0x3b, 0x55, 0x6e, 0x61, 0x3b, 0x52, 0x61,
+0x72, 0x3b, 0x43, 0x68, 0x65, 0x3b, 0x54, 0x68, 0x61, 0x3b, 0x4d, 0x6f, 0x63, 0x3b, 0x53, 0x61, 0x62, 0x3b, 0x4e, 0x61,
+0x6e, 0x3b, 0x54, 0x69, 0x73, 0x3b, 0x4b, 0x75, 0x6d, 0x3b, 0x4d, 0x6f, 0x6a, 0x3b, 0x59, 0x65, 0x6c, 0x4b, 0x3b, 0x55,
+0x3b, 0x52, 0x3b, 0x43, 0x3b, 0x54, 0x3b, 0x4d, 0x3b, 0x53, 0x3b, 0x4e, 0x3b, 0x54, 0x3b, 0x4b, 0x3b, 0x4d, 0x3b, 0x59,
+0x46, 0x129, 0x69, 0x20, 0x4c, 0x6f, 0x6f, 0x3b, 0x43, 0x6f, 0x6b, 0x63, 0x77, 0x61, 0x6b, 0x6c, 0x61, 0x14b, 0x6e, 0x65,
+0x3b, 0x43, 0x6f, 0x6b, 0x63, 0x77, 0x61, 0x6b, 0x6c, 0x69, 0x69, 0x3b, 0x46, 0x129, 0x69, 0x20, 0x4d, 0x61, 0x72, 0x66,
+0x6f, 0x6f, 0x3b, 0x4d, 0x61, 0x64, 0x1dd, 0x1dd, 0x75, 0x75, 0x74, 0x1dd, 0x62, 0x69, 0x6a, 0x61, 0x14b, 0x3b, 0x4d, 0x61,
+0x6d, 0x1dd, 0x14b, 0x67, 0x77, 0xe3, 0x61, 0x66, 0x61, 0x68, 0x62, 0x69, 0x69, 0x3b, 0x4d, 0x61, 0x6d, 0x1dd, 0x14b, 0x67,
+0x77, 0xe3, 0x61, 0x6c, 0x69, 0x69, 0x3b, 0x4d, 0x61, 0x64, 0x1dd, 0x6d, 0x62, 0x69, 0x69, 0x3b, 0x46, 0x129, 0x69, 0x20,
+0x44, 0x1dd, 0x253, 0x6c, 0x69, 0x69, 0x3b, 0x46, 0x129, 0x69, 0x20, 0x4d, 0x75, 0x6e, 0x64, 0x61, 0x14b, 0x3b, 0x46, 0x129,
+0x69, 0x20, 0x47, 0x77, 0x61, 0x68, 0x6c, 0x6c, 0x65, 0x3b, 0x46, 0x129, 0x69, 0x20, 0x59, 0x75, 0x72, 0x75, 0x46, 0x4c,
+0x4f, 0x3b, 0x43, 0x4c, 0x41, 0x3b, 0x43, 0x4b, 0x49, 0x3b, 0x46, 0x4d, 0x46, 0x3b, 0x4d, 0x41, 0x44, 0x3b, 0x4d, 0x42,
+0x49, 0x3b, 0x4d, 0x4c, 0x49, 0x3b, 0x4d, 0x41, 0x4d, 0x3b, 0x46, 0x44, 0x45, 0x3b, 0x46, 0x4d, 0x55, 0x3b, 0x46, 0x47,
+0x57, 0x3b, 0x46, 0x59, 0x55, 0x4f, 0x3b, 0x41, 0x3b, 0x49, 0x3b, 0x46, 0x3b, 0x44, 0x3b, 0x42, 0x3b, 0x4c, 0x3b, 0x4d,
+0x3b, 0x45, 0x3b, 0x55, 0x3b, 0x57, 0x3b, 0x59, 0x6e, 0x67, 0x77, 0x25b, 0x6e, 0x20, 0x6d, 0x61, 0x74, 0xe1, 0x68, 0x72,
+0x61, 0x3b, 0x6e, 0x67, 0x77, 0x25b, 0x6e, 0x20, 0x144, 0x6d, 0x62, 0x61, 0x3b, 0x6e, 0x67, 0x77, 0x25b, 0x6e, 0x20, 0x144,
+0x6c, 0x61, 0x6c, 0x3b, 0x6e, 0x67, 0x77, 0x25b, 0x6e, 0x20, 0x144, 0x6e, 0x61, 0x3b, 0x6e, 0x67, 0x77, 0x25b, 0x6e, 0x20,
+0x144, 0x74, 0x61, 0x6e, 0x3b, 0x6e, 0x67, 0x77, 0x25b, 0x6e, 0x20, 0x144, 0x74, 0x75, 0xf3, 0x3b, 0x6e, 0x67, 0x77, 0x25b,
+0x6e, 0x20, 0x68, 0x25b, 0x6d, 0x62, 0x75, 0x25b, 0x72, 0xed, 0x3b, 0x6e, 0x67, 0x77, 0x25b, 0x6e, 0x20, 0x6c, 0x254, 0x6d,
+0x62, 0x69, 0x3b, 0x6e, 0x67, 0x77, 0x25b, 0x6e, 0x20, 0x72, 0x25b, 0x62, 0x76, 0x75, 0xe2, 0x3b, 0x6e, 0x67, 0x77, 0x25b,
+0x6e, 0x20, 0x77, 0x75, 0x6d, 0x3b, 0x6e, 0x67, 0x77, 0x25b, 0x6e, 0x20, 0x77, 0x75, 0x6d, 0x20, 0x6e, 0x61, 0x76, 0x1d4,
+0x72, 0x3b, 0x6b, 0x72, 0xed, 0x73, 0x69, 0x6d, 0x69, 0x6e, 0x6e, 0x67, 0x31, 0x3b, 0x6e, 0x67, 0x32, 0x3b, 0x6e, 0x67,
+0x33, 0x3b, 0x6e, 0x67, 0x34, 0x3b, 0x6e, 0x67, 0x35, 0x3b, 0x6e, 0x67, 0x36, 0x3b, 0x6e, 0x67, 0x37, 0x3b, 0x6e, 0x67,
+0x38, 0x3b, 0x6e, 0x67, 0x39, 0x3b, 0x6e, 0x67, 0x31, 0x30, 0x3b, 0x6e, 0x67, 0x31, 0x31, 0x3b, 0x6b, 0x72, 0x69, 0x73,
+0x54, 0x69, 0x6f, 0x70, 0x20, 0x74, 0x68, 0x61, 0x72, 0x20, 0x70, 0x25b, 0x74, 0x3b, 0x50, 0x25b, 0x74, 0x3b, 0x44, 0x75,
+0x254, 0x331, 0x254, 0x331, 0x14b, 0x3b, 0x47, 0x75, 0x61, 0x6b, 0x3b, 0x44, 0x75, 0xe4, 0x74, 0x3b, 0x4b, 0x6f, 0x72, 0x6e,
+0x79, 0x6f, 0x6f, 0x74, 0x3b, 0x50, 0x61, 0x79, 0x20, 0x79, 0x69, 0x65, 0x331, 0x74, 0x6e, 0x69, 0x3b, 0x54, 0x68, 0x6f,
+0x331, 0x6f, 0x331, 0x72, 0x3b, 0x54, 0x25b, 0x25b, 0x72, 0x3b, 0x4c, 0x61, 0x61, 0x74, 0x68, 0x3b, 0x4b, 0x75, 0x72, 0x3b,
+0x54, 0x69, 0x6f, 0x331, 0x70, 0x20, 0x69, 0x6e, 0x20, 0x64, 0x69, 0x331, 0x69, 0x331, 0x74, 0x54, 0x69, 0x6f, 0x70, 0x3b,
+0x50, 0x25b, 0x74, 0x3b, 0x44, 0x75, 0x254, 0x331, 0x254, 0x331, 0x3b, 0x47, 0x75, 0x61, 0x6b, 0x3b, 0x44, 0x75, 0xe4, 0x3b,
+0x4b, 0x6f, 0x72, 0x3b, 0x50, 0x61, 0x79, 0x3b, 0x54, 0x68, 0x6f, 0x6f, 0x3b, 0x54, 0x25b, 0x25b, 0x3b, 0x4c, 0x61, 0x61,
+0x3b, 0x4b, 0x75, 0x72, 0x3b, 0x54, 0x69, 0x64, 0x54, 0x3b, 0x50, 0x3b, 0x44, 0x3b, 0x47, 0x3b, 0x44, 0x3b, 0x4b, 0x3b,
+0x50, 0x3b, 0x54, 0x3b, 0x54, 0x3b, 0x4c, 0x3b, 0x4b, 0x3b, 0x54, 0x442, 0x43e, 0x445, 0x441, 0x443, 0x43d, 0x43d, 0x44c, 0x443,
+0x3b, 0x43e, 0x43b, 0x443, 0x43d, 0x43d, 0x44c, 0x443, 0x3b, 0x43a, 0x443, 0x43b, 0x443, 0x43d, 0x20, 0x442, 0x443, 0x442, 0x430, 0x440,
+0x3b, 0x43c, 0x443, 0x443, 0x441, 0x20, 0x443, 0x441, 0x442, 0x430, 0x440, 0x3b, 0x44b, 0x430, 0x43c, 0x20, 0x44b, 0x439, 0x430, 0x3b,
+0x431, 0x44d, 0x441, 0x20, 0x44b, 0x439, 0x430, 0x3b, 0x43e, 0x442, 0x20, 0x44b, 0x439, 0x430, 0x3b, 0x430, 0x442, 0x44b, 0x440, 0x434,
+0x44c, 0x44b, 0x445, 0x20, 0x44b, 0x439, 0x430, 0x3b, 0x431, 0x430, 0x43b, 0x430, 0x495, 0x430, 0x43d, 0x20, 0x44b, 0x439, 0x430, 0x3b,
+0x430, 0x43b, 0x442, 0x44b, 0x43d, 0x43d, 0x44c, 0x44b, 0x3b, 0x441, 0x44d, 0x442, 0x438, 0x43d, 0x43d, 0x44c, 0x438, 0x3b, 0x430, 0x445,
+0x441, 0x44b, 0x43d, 0x43d, 0x44c, 0x44b, 0x422, 0x43e, 0x445, 0x441, 0x443, 0x43d, 0x43d, 0x44c, 0x443, 0x3b, 0x41e, 0x43b, 0x443, 0x43d,
+0x43d, 0x44c, 0x443, 0x3b, 0x41a, 0x443, 0x43b, 0x443, 0x43d, 0x20, 0x442, 0x443, 0x442, 0x430, 0x440, 0x3b, 0x41c, 0x443, 0x443, 0x441,
+0x20, 0x443, 0x441, 0x442, 0x430, 0x440, 0x3b, 0x42b, 0x430, 0x43c, 0x20, 0x44b, 0x439, 0x44b, 0x43d, 0x3b, 0x411, 0x44d, 0x441, 0x20,
+0x44b, 0x439, 0x44b, 0x43d, 0x3b, 0x41e, 0x442, 0x20, 0x44b, 0x439, 0x44b, 0x43d, 0x3b, 0x410, 0x442, 0x44b, 0x440, 0x434, 0x44c, 0x44b,
+0x445, 0x20, 0x44b, 0x439, 0x44b, 0x43d, 0x3b, 0x411, 0x430, 0x43b, 0x430, 0x495, 0x430, 0x43d, 0x20, 0x44b, 0x439, 0x44b, 0x43d, 0x3b,
+0x410, 0x43b, 0x442, 0x44b, 0x43d, 0x43d, 0x44c, 0x44b, 0x3b, 0x421, 0x44d, 0x442, 0x438, 0x43d, 0x43d, 0x44c, 0x438, 0x3b, 0x430, 0x445,
+0x441, 0x44b, 0x43d, 0x43d, 0x44c, 0x44b, 0x422, 0x43e, 0x445, 0x441, 0x3b, 0x41e, 0x43b, 0x443, 0x43d, 0x3b, 0x41a, 0x43b, 0x43d, 0x3b,
+0x41c, 0x441, 0x443, 0x3b, 0x42b, 0x430, 0x43c, 0x3b, 0x411, 0x44d, 0x441, 0x3b, 0x41e, 0x442, 0x439, 0x3b, 0x410, 0x442, 0x440, 0x3b,
+0x411, 0x43b, 0x495, 0x3b, 0x410, 0x43b, 0x442, 0x3b, 0x421, 0x44d, 0x442, 0x3b, 0x410, 0x445, 0x441, 0x422, 0x3b, 0x41e, 0x3b, 0x41a,
+0x3b, 0x41c, 0x3b, 0x42b, 0x3b, 0x411, 0x3b, 0x41e, 0x3b, 0x410, 0x3b, 0x411, 0x3b, 0x410, 0x3b, 0x421, 0x3b, 0x410, 0x4d, 0x75,
+0x70, 0x61, 0x6c, 0x61, 0x6e, 0x67, 0x75, 0x6c, 0x77, 0x61, 0x3b, 0x4d, 0x77, 0x69, 0x74, 0x6f, 0x70, 0x65, 0x3b, 0x4d,
+0x75, 0x73, 0x68, 0x65, 0x6e, 0x64, 0x65, 0x3b, 0x4d, 0x75, 0x6e, 0x79, 0x69, 0x3b, 0x4d, 0x75, 0x73, 0x68, 0x65, 0x6e,
+0x64, 0x65, 0x20, 0x4d, 0x61, 0x67, 0x61, 0x6c, 0x69, 0x3b, 0x4d, 0x75, 0x6a, 0x69, 0x6d, 0x62, 0x69, 0x3b, 0x4d, 0x75,
+0x73, 0x68, 0x69, 0x70, 0x65, 0x70, 0x6f, 0x3b, 0x4d, 0x75, 0x70, 0x75, 0x67, 0x75, 0x74, 0x6f, 0x3b, 0x4d, 0x75, 0x6e,
+0x79, 0x65, 0x6e, 0x73, 0x65, 0x3b, 0x4d, 0x6f, 0x6b, 0x68, 0x75, 0x3b, 0x4d, 0x75, 0x73, 0x6f, 0x6e, 0x67, 0x61, 0x6e,
+0x64, 0x65, 0x6d, 0x62, 0x77, 0x65, 0x3b, 0x4d, 0x75, 0x68, 0x61, 0x61, 0x6e, 0x6f, 0x4d, 0x75, 0x70, 0x3b, 0x4d, 0x77,
 0x69, 0x3b, 0x4d, 0x73, 0x68, 0x3b, 0x4d, 0x75, 0x6e, 0x3b, 0x4d, 0x61, 0x67, 0x3b, 0x4d, 0x75, 0x6a, 0x3b, 0x4d, 0x73,
 0x70, 0x3b, 0x4d, 0x70, 0x67, 0x3b, 0x4d, 0x79, 0x65, 0x3b, 0x4d, 0x6f, 0x6b, 0x3b, 0x4d, 0x75, 0x73, 0x3b, 0x4d, 0x75,
-0x68, 0x3b, 0x4d, 0x75, 0x70, 0x61, 0x6c, 0x61, 0x6e, 0x67, 0x75, 0x6c, 0x77, 0x61, 0x3b, 0x4d, 0x77, 0x69, 0x74, 0x6f,
-0x70, 0x65, 0x3b, 0x4d, 0x75, 0x73, 0x68, 0x65, 0x6e, 0x64, 0x65, 0x3b, 0x4d, 0x75, 0x6e, 0x79, 0x69, 0x3b, 0x4d, 0x75,
-0x73, 0x68, 0x65, 0x6e, 0x64, 0x65, 0x20, 0x4d, 0x61, 0x67, 0x61, 0x6c, 0x69, 0x3b, 0x4d, 0x75, 0x6a, 0x69, 0x6d, 0x62,
-0x69, 0x3b, 0x4d, 0x75, 0x73, 0x68, 0x69, 0x70, 0x65, 0x70, 0x6f, 0x3b, 0x4d, 0x75, 0x70, 0x75, 0x67, 0x75, 0x74, 0x6f,
-0x3b, 0x4d, 0x75, 0x6e, 0x79, 0x65, 0x6e, 0x73, 0x65, 0x3b, 0x4d, 0x6f, 0x6b, 0x68, 0x75, 0x3b, 0x4d, 0x75, 0x73, 0x6f,
-0x6e, 0x67, 0x61, 0x6e, 0x64, 0x65, 0x6d, 0x62, 0x77, 0x65, 0x3b, 0x4d, 0x75, 0x68, 0x61, 0x61, 0x6e, 0x6f, 0x3b, 0xa5a8,
-0xa595, 0xa51e, 0x3b, 0xa552, 0xa561, 0x3b, 0xa57e, 0xa5ba, 0x3b, 0xa5a2, 0xa595, 0x3b, 0xa591, 0xa571, 0x3b, 0xa5b1, 0xa60b, 0x3b, 0xa5b1, 0xa55e,
-0x3b, 0xa5db, 0xa515, 0x3b, 0xa562, 0xa54c, 0x3b, 0xa56d, 0xa583, 0x3b, 0xa51e, 0xa60b, 0x3b, 0xa5a8, 0xa595, 0xa5cf, 0x3b, 0xa5a8, 0xa595, 0x20,
-0xa56a, 0xa574, 0x20, 0xa51e, 0xa500, 0xa56e, 0xa54a, 0x3b, 0xa552, 0xa561, 0xa59d, 0xa595, 0x3b, 0xa57e, 0xa5ba, 0x3b, 0xa5a2, 0xa595, 0x3b, 0xa591,
-0xa571, 0x3b, 0xa5b1, 0xa60b, 0x3b, 0xa5b1, 0xa55e, 0xa524, 0x3b, 0xa5db, 0xa515, 0x3b, 0xa562, 0xa54c, 0x3b, 0xa56d, 0xa583, 0x3b, 0xa51e, 0xa60b,
-0xa554, 0xa57f, 0x20, 0xa578, 0xa583, 0xa5cf, 0x3b, 0xa5a8, 0xa595, 0x20, 0xa56a, 0xa574, 0x20, 0xa5cf, 0xa5ba, 0xa56e, 0xa54a, 0x3b, 0x6c, 0x75,
+0x68, 0xa5a8, 0xa595, 0x20, 0xa56a, 0xa574, 0x20, 0xa51e, 0xa500, 0xa56e, 0xa54a, 0x3b, 0xa552, 0xa561, 0xa59d, 0xa595, 0x3b, 0xa57e, 0xa5ba, 0x3b,
+0xa5a2, 0xa595, 0x3b, 0xa591, 0xa571, 0x3b, 0xa5b1, 0xa60b, 0x3b, 0xa5b1, 0xa55e, 0xa524, 0x3b, 0xa5db, 0xa515, 0x3b, 0xa562, 0xa54c, 0x3b, 0xa56d,
+0xa583, 0x3b, 0xa51e, 0xa60b, 0xa554, 0xa57f, 0x20, 0xa578, 0xa583, 0xa5cf, 0x3b, 0xa5a8, 0xa595, 0x20, 0xa56a, 0xa574, 0x20, 0xa5cf, 0xa5ba, 0xa56e,
+0xa54a, 0xa5a8, 0xa595, 0xa51e, 0x3b, 0xa552, 0xa561, 0x3b, 0xa57e, 0xa5ba, 0x3b, 0xa5a2, 0xa595, 0x3b, 0xa591, 0xa571, 0x3b, 0xa5b1, 0xa60b, 0x3b,
+0xa5b1, 0xa55e, 0x3b, 0xa5db, 0xa515, 0x3b, 0xa562, 0xa54c, 0x3b, 0xa56d, 0xa583, 0x3b, 0xa51e, 0xa60b, 0x3b, 0xa5a8, 0xa595, 0xa5cf, 0x6c, 0x75,
 0x75, 0x6b, 0x61, 0x6f, 0x20, 0x6b, 0x65, 0x6d, 0xe3, 0x3b, 0x253, 0x61, 0x6e, 0x64, 0x61, 0x253, 0x75, 0x3b, 0x76, 0x254,
 0x254, 0x3b, 0x66, 0x75, 0x6c, 0x75, 0x3b, 0x67, 0x6f, 0x6f, 0x3b, 0x36, 0x3b, 0x37, 0x3b, 0x6b, 0x254, 0x6e, 0x64, 0x65,
 0x3b, 0x73, 0x61, 0x61, 0x68, 0x3b, 0x67, 0x61, 0x6c, 0x6f, 0x3b, 0x6b, 0x65, 0x6e, 0x70, 0x6b, 0x61, 0x74, 0x6f, 0x20,
-0x253, 0x6f, 0x6c, 0x6f, 0x6c, 0x254, 0x3b, 0x6c, 0x75, 0x75, 0x6b, 0x61, 0x6f, 0x20, 0x6c, 0x254, 0x6d, 0x61, 0x3b, 0x4a,
-0x65, 0x6e, 0x3b, 0x48, 0x6f, 0x72, 0x3b, 0x4d, 0xe4, 0x72, 0x3b, 0x41, 0x62, 0x72, 0x3b, 0x4d, 0x65, 0x69, 0x3b, 0x42,
-0x72, 0xe1, 0x3b, 0x48, 0x65, 0x69, 0x3b, 0xd6, 0x69, 0x67, 0x3b, 0x48, 0x65, 0x72, 0x3b, 0x57, 0xed, 0x6d, 0x3b, 0x57,
-0x69, 0x6e, 0x3b, 0x43, 0x68, 0x72, 0x3b, 0x4a, 0x65, 0x6e, 0x6e, 0x65, 0x72, 0x3b, 0x48, 0x6f, 0x72, 0x6e, 0x69, 0x67,
-0x3b, 0x4d, 0xe4, 0x72, 0x7a, 0x65, 0x3b, 0x41, 0x62, 0x72, 0x69, 0x6c, 0x6c, 0x65, 0x3b, 0x4d, 0x65, 0x69, 0x6a, 0x65,
-0x3b, 0x42, 0x72, 0xe1, 0x10d, 0x65, 0x74, 0x3b, 0x48, 0x65, 0x69, 0x77, 0x65, 0x74, 0x3b, 0xd6, 0x69, 0x67, 0x161, 0x74,
-0x65, 0x3b, 0x48, 0x65, 0x72, 0x62, 0x161, 0x74, 0x6d, 0xe1, 0x6e, 0x65, 0x74, 0x3b, 0x57, 0xed, 0x6d, 0xe1, 0x6e, 0x65,
-0x74, 0x3b, 0x57, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6d, 0xe1, 0x6e, 0x65, 0x74, 0x3b, 0x43, 0x68, 0x72, 0x69, 0x161, 0x74,
-0x6d, 0xe1, 0x6e, 0x65, 0x74, 0x3b, 0x4a, 0x3b, 0x48, 0x3b, 0x4d, 0x3b, 0x41, 0x3b, 0x4d, 0x3b, 0x42, 0x3b, 0x48, 0x3b,
-0xd6, 0x3b, 0x48, 0x3b, 0x57, 0x3b, 0x57, 0x3b, 0x43, 0x3b, 0x6f, 0x2e, 0x31, 0x3b, 0x6f, 0x2e, 0x32, 0x3b, 0x6f, 0x2e,
-0x33, 0x3b, 0x6f, 0x2e, 0x34, 0x3b, 0x6f, 0x2e, 0x35, 0x3b, 0x6f, 0x2e, 0x36, 0x3b, 0x6f, 0x2e, 0x37, 0x3b, 0x6f, 0x2e,
-0x38, 0x3b, 0x6f, 0x2e, 0x39, 0x3b, 0x6f, 0x2e, 0x31, 0x30, 0x3b, 0x6f, 0x2e, 0x31, 0x31, 0x3b, 0x6f, 0x2e, 0x31, 0x32,
-0x3b, 0x70, 0x69, 0x6b, 0xed, 0x74, 0xed, 0x6b, 0xed, 0x74, 0x69, 0x65, 0x2c, 0x20, 0x6f, 0xf3, 0x6c, 0xed, 0x20, 0xfa,
-0x20, 0x6b, 0x75, 0x74, 0xfa, 0x61, 0x6e, 0x3b, 0x73, 0x69, 0x25b, 0x79, 0x25b, 0x301, 0x2c, 0x20, 0x6f, 0xf3, 0x6c, 0x69,
-0x20, 0xfa, 0x20, 0x6b, 0xe1, 0x6e, 0x64, 0xed, 0x25b, 0x3b, 0x254, 0x6e, 0x73, 0xfa, 0x6d, 0x62, 0x254, 0x6c, 0x2c, 0x20,
-0x6f, 0xf3, 0x6c, 0x69, 0x20, 0xfa, 0x20, 0x6b, 0xe1, 0x74, 0xe1, 0x74, 0xfa, 0x25b, 0x3b, 0x6d, 0x65, 0x73, 0x69, 0x14b,
-0x2c, 0x20, 0x6f, 0xf3, 0x6c, 0x69, 0x20, 0xfa, 0x20, 0x6b, 0xe9, 0x6e, 0x69, 0x65, 0x3b, 0x65, 0x6e, 0x73, 0x69, 0x6c,
-0x2c, 0x20, 0x6f, 0xf3, 0x6c, 0x69, 0x20, 0xfa, 0x20, 0x6b, 0xe1, 0x74, 0xe1, 0x6e, 0x75, 0x25b, 0x3b, 0x254, 0x73, 0x254,
-0x6e, 0x3b, 0x65, 0x66, 0x75, 0x74, 0x65, 0x3b, 0x70, 0x69, 0x73, 0x75, 0x79, 0xfa, 0x3b, 0x69, 0x6d, 0x25b, 0x14b, 0x20,
-0x69, 0x20, 0x70, 0x75, 0x254, 0x73, 0x3b, 0x69, 0x6d, 0x25b, 0x14b, 0x20, 0x69, 0x20, 0x70, 0x75, 0x74, 0xfa, 0x6b, 0x2c,
-0x6f, 0xf3, 0x6c, 0x69, 0x20, 0xfa, 0x20, 0x6b, 0xe1, 0x74, 0xed, 0x25b, 0x3b, 0x6d, 0x61, 0x6b, 0x61, 0x6e, 0x64, 0x69,
-0x6b, 0x25b, 0x3b, 0x70, 0x69, 0x6c, 0x254, 0x6e, 0x64, 0x254, 0x301, 0x3b, 0x58, 0x69, 0x6e, 0x3b, 0x46, 0x65, 0x62, 0x3b,
-0x4d, 0x61, 0x72, 0x3b, 0x41, 0x62, 0x72, 0x3b, 0x4d, 0x61, 0x79, 0x3b, 0x58, 0x75, 0x6e, 0x3b, 0x58, 0x6e, 0x74, 0x3b,
-0x41, 0x67, 0x6f, 0x3b, 0x53, 0x65, 0x74, 0x3b, 0x4f, 0x63, 0x68, 0x3b, 0x50, 0x61, 0x79, 0x3b, 0x41, 0x76, 0x69, 0x3b,
-0x78, 0x69, 0x6e, 0x65, 0x72, 0x75, 0x3b, 0x66, 0x65, 0x62, 0x72, 0x65, 0x72, 0x75, 0x3b, 0x6d, 0x61, 0x72, 0x7a, 0x75,
-0x3b, 0x61, 0x62, 0x72, 0x69, 0x6c, 0x3b, 0x6d, 0x61, 0x79, 0x75, 0x3b, 0x78, 0x75, 0x6e, 0x75, 0x3b, 0x78, 0x75, 0x6e,
-0x65, 0x74, 0x75, 0x3b, 0x61, 0x67, 0x6f, 0x73, 0x74, 0x75, 0x3b, 0x73, 0x65, 0x74, 0x69, 0x65, 0x6d, 0x62, 0x72, 0x65,
-0x3b, 0x6f, 0x63, 0x68, 0x6f, 0x62, 0x72, 0x65, 0x3b, 0x70, 0x61, 0x79, 0x61, 0x72, 0x65, 0x73, 0x3b, 0x61, 0x76, 0x69,
-0x65, 0x6e, 0x74, 0x75, 0x3b, 0x58, 0x3b, 0x46, 0x3b, 0x4d, 0x3b, 0x41, 0x3b, 0x4d, 0x3b, 0x58, 0x3b, 0x58, 0x3b, 0x41,
-0x3b, 0x53, 0x3b, 0x4f, 0x3b, 0x50, 0x3b, 0x41, 0x3b, 0x78, 0x69, 0x6e, 0x3b, 0x66, 0x65, 0x62, 0x3b, 0x6d, 0x61, 0x72,
-0x3b, 0x61, 0x62, 0x72, 0x3b, 0x6d, 0x61, 0x79, 0x3b, 0x78, 0x75, 0x6e, 0x3b, 0x78, 0x6e, 0x74, 0x3b, 0x61, 0x67, 0x6f,
-0x3b, 0x73, 0x65, 0x74, 0x3b, 0x6f, 0x63, 0x68, 0x3b, 0x70, 0x61, 0x79, 0x3b, 0x61, 0x76, 0x69, 0x3b, 0x64, 0x65, 0x20,
-0x78, 0x69, 0x6e, 0x65, 0x72, 0x75, 0x3b, 0x64, 0x65, 0x20, 0x66, 0x65, 0x62, 0x72, 0x65, 0x72, 0x75, 0x3b, 0x64, 0x65,
-0x20, 0x6d, 0x61, 0x72, 0x7a, 0x75, 0x3b, 0x64, 0x2019, 0x61, 0x62, 0x72, 0x69, 0x6c, 0x3b, 0x64, 0x65, 0x20, 0x6d, 0x61,
-0x79, 0x75, 0x3b, 0x64, 0x65, 0x20, 0x78, 0x75, 0x6e, 0x75, 0x3b, 0x64, 0x65, 0x20, 0x78, 0x75, 0x6e, 0x65, 0x74, 0x75,
-0x3b, 0x64, 0x2019, 0x61, 0x67, 0x6f, 0x73, 0x74, 0x75, 0x3b, 0x64, 0x65, 0x20, 0x73, 0x65, 0x74, 0x69, 0x65, 0x6d, 0x62,
-0x72, 0x65, 0x3b, 0x64, 0x2019, 0x6f, 0x63, 0x68, 0x6f, 0x62, 0x72, 0x65, 0x3b, 0x64, 0x65, 0x20, 0x70, 0x61, 0x79, 0x61,
-0x72, 0x65, 0x73, 0x3b, 0x64, 0x2019, 0x61, 0x76, 0x69, 0x65, 0x6e, 0x74, 0x75, 0x3b, 0x4e, 0x64, 0x75, 0x14b, 0x6d, 0x62,
-0x69, 0x20, 0x53, 0x61, 0x14b, 0x3b, 0x50, 0x25b, 0x73, 0x61, 0x14b, 0x20, 0x50, 0x25b, 0x301, 0x70, 0xe1, 0x3b, 0x50, 0x25b,
-0x73, 0x61, 0x14b, 0x20, 0x50, 0x25b, 0x301, 0x74, 0xe1, 0x74, 0x3b, 0x50, 0x25b, 0x73, 0x61, 0x14b, 0x20, 0x50, 0x25b, 0x301,
-0x6e, 0x25b, 0x301, 0x6b, 0x77, 0x61, 0x3b, 0x50, 0x25b, 0x73, 0x61, 0x14b, 0x20, 0x50, 0x61, 0x74, 0x61, 0x61, 0x3b, 0x50,
-0x25b, 0x73, 0x61, 0x14b, 0x20, 0x50, 0x25b, 0x301, 0x6e, 0x25b, 0x301, 0x6e, 0x74, 0xfa, 0x6b, 0xfa, 0x3b, 0x50, 0x25b, 0x73,
-0x61, 0x14b, 0x20, 0x53, 0x61, 0x61, 0x6d, 0x62, 0xe1, 0x3b, 0x50, 0x25b, 0x73, 0x61, 0x14b, 0x20, 0x50, 0x25b, 0x301, 0x6e,
-0x25b, 0x301, 0x66, 0x254, 0x6d, 0x3b, 0x50, 0x25b, 0x73, 0x61, 0x14b, 0x20, 0x50, 0x25b, 0x301, 0x6e, 0x25b, 0x301, 0x70, 0x66,
-0xfa, 0xa78b, 0xfa, 0x3b, 0x50, 0x25b, 0x73, 0x61, 0x14b, 0x20, 0x4e, 0x25b, 0x67, 0x25b, 0x301, 0x6d, 0x3b, 0x50, 0x25b, 0x73,
-0x61, 0x14b, 0x20, 0x4e, 0x74, 0x73, 0x254, 0x30c, 0x70, 0x6d, 0x254, 0x301, 0x3b, 0x50, 0x25b, 0x73, 0x61, 0x14b, 0x20, 0x4e,
-0x74, 0x73, 0x254, 0x30c, 0x70, 0x70, 0xe1, 0x3b, 0x70, 0x61, 0x6d, 0x62, 0x61, 0x3b, 0x77, 0x61, 0x6e, 0x6a, 0x61, 0x3b,
-0x6d, 0x62, 0x69, 0x79, 0x254, 0x20, 0x6d, 0x25b, 0x6e, 0x64, 0x6f, 0x14b, 0x67, 0x254, 0x3b, 0x4e, 0x79, 0x254, 0x6c, 0x254,
-0x6d, 0x62, 0x254, 0x14b, 0x67, 0x254, 0x3b, 0x4d, 0x254, 0x6e, 0x254, 0x20, 0x14b, 0x67, 0x62, 0x61, 0x6e, 0x6a, 0x61, 0x3b,
-0x4e, 0x79, 0x61, 0x14b, 0x67, 0x77, 0x25b, 0x20, 0x14b, 0x67, 0x62, 0x61, 0x6e, 0x6a, 0x61, 0x3b, 0x6b, 0x75, 0x14b, 0x67,
-0x77, 0x25b, 0x3b, 0x66, 0x25b, 0x3b, 0x6e, 0x6a, 0x61, 0x70, 0x69, 0x3b, 0x6e, 0x79, 0x75, 0x6b, 0x75, 0x6c, 0x3b, 0x31,
-0x31, 0x3b, 0x253, 0x75, 0x6c, 0x253, 0x75, 0x73, 0x25b, 0x3b, 0x6d, 0x62, 0x65, 0x67, 0x74, 0x75, 0x67, 0x3b, 0x69, 0x6d,
-0x65, 0x67, 0x20, 0xe0, 0x62, 0xf9, 0x62, 0xec, 0x3b, 0x69, 0x6d, 0x65, 0x67, 0x20, 0x6d, 0x62, 0x259, 0x14b, 0x63, 0x68,
-0x75, 0x62, 0x69, 0x3b, 0x69, 0x6d, 0x259, 0x67, 0x20, 0x6e, 0x67, 0x77, 0x259, 0x300, 0x74, 0x3b, 0x69, 0x6d, 0x259, 0x67,
-0x20, 0x66, 0x6f, 0x67, 0x3b, 0x69, 0x6d, 0x259, 0x67, 0x20, 0x69, 0x63, 0x68, 0x69, 0x69, 0x62, 0x254, 0x64, 0x3b, 0x69,
-0x6d, 0x259, 0x67, 0x20, 0xe0, 0x64, 0xf9, 0x6d, 0x62, 0x259, 0x300, 0x14b, 0x3b, 0x69, 0x6d, 0x259, 0x67, 0x20, 0x69, 0x63,
-0x68, 0x69, 0x6b, 0x61, 0x3b, 0x69, 0x6d, 0x259, 0x67, 0x20, 0x6b, 0x75, 0x64, 0x3b, 0x69, 0x6d, 0x259, 0x67, 0x20, 0x74,
-0xe8, 0x73, 0x69, 0x2bc, 0x65, 0x3b, 0x69, 0x6d, 0x259, 0x67, 0x20, 0x7a, 0xf2, 0x3b, 0x69, 0x6d, 0x259, 0x67, 0x20, 0x6b,
-0x72, 0x69, 0x7a, 0x6d, 0x65, 0x64, 0x3b, 0x69, 0x6d, 0x259, 0x67, 0x20, 0x6d, 0x62, 0x65, 0x67, 0x74, 0x75, 0x67, 0x3b,
-0x69, 0x6d, 0x65, 0x67, 0x20, 0xe0, 0x62, 0xf9, 0x62, 0xec, 0x3b, 0x69, 0x6d, 0x65, 0x67, 0x20, 0x6d, 0x62, 0x259, 0x14b,
-0x63, 0x68, 0x75, 0x62, 0x69, 0x3b, 0x69, 0x6d, 0x259, 0x67, 0x20, 0x6e, 0x67, 0x77, 0x259, 0x300, 0x74, 0x3b, 0x69, 0x6d,
-0x259, 0x67, 0x20, 0x66, 0x6f, 0x67, 0x3b, 0x69, 0x6d, 0x259, 0x67, 0x20, 0x69, 0x63, 0x68, 0x69, 0x69, 0x62, 0x254, 0x64,
-0x3b, 0x69, 0x6d, 0x259, 0x67, 0x20, 0xe0, 0x64, 0xf9, 0x6d, 0x62, 0x259, 0x300, 0x14b, 0x3b, 0x69, 0x6d, 0x259, 0x67, 0x20,
-0x69, 0x63, 0x68, 0x69, 0x6b, 0x61, 0x3b, 0x69, 0x6d, 0x259, 0x67, 0x20, 0x6b, 0x75, 0x64, 0x3b, 0x69, 0x6d, 0x259, 0x67,
-0x20, 0x74, 0xe8, 0x73, 0x69, 0x2bc, 0x65, 0x3b, 0x69, 0x6d, 0x259, 0x67, 0x20, 0x7a, 0xf2, 0x3b, 0x69, 0x6d, 0x259, 0x67,
-0x20, 0x6b, 0x72, 0x69, 0x7a, 0x6d, 0x65, 0x64, 0x3b, 0x4d, 0x31, 0x3b, 0x41, 0x32, 0x3b, 0x4d, 0x33, 0x3b, 0x4e, 0x34,
-0x3b, 0x46, 0x35, 0x3b, 0x49, 0x36, 0x3b, 0x41, 0x37, 0x3b, 0x49, 0x38, 0x3b, 0x4b, 0x39, 0x3b, 0x31, 0x30, 0x3b, 0x31,
-0x31, 0x3b, 0x31, 0x32, 0x3b, 0x73, 0x61, 0x14b, 0x20, 0x74, 0x73, 0x65, 0x74, 0x73, 0x25b, 0x300, 0x25b, 0x20, 0x6c, 0xf9,
-0x6d, 0x3b, 0x73, 0x61, 0x14b, 0x20, 0x6b, 0xe0, 0x67, 0x20, 0x6e, 0x67, 0x77, 0xf3, 0x14b, 0x3b, 0x73, 0x61, 0x14b, 0x20,
-0x6c, 0x65, 0x70, 0x79, 0xe8, 0x20, 0x73, 0x68, 0xfa, 0x6d, 0x3b, 0x73, 0x61, 0x14b, 0x20, 0x63, 0xff, 0xf3, 0x3b, 0x73,
-0x61, 0x14b, 0x20, 0x74, 0x73, 0x25b, 0x300, 0x25b, 0x20, 0x63, 0xff, 0xf3, 0x3b, 0x73, 0x61, 0x14b, 0x20, 0x6e, 0x6a, 0xff,
-0x6f, 0x6c, 0xe1, 0x2bc, 0x3b, 0x73, 0x61, 0x14b, 0x20, 0x74, 0x79, 0x25b, 0x300, 0x62, 0x20, 0x74, 0x79, 0x25b, 0x300, 0x62,
-0x20, 0x6d, 0x62, 0x289, 0x300, 0x14b, 0x3b, 0x73, 0x61, 0x14b, 0x20, 0x6d, 0x62, 0x289, 0x300, 0x14b, 0x3b, 0x73, 0x61, 0x14b,
-0x20, 0x6e, 0x67, 0x77, 0x254, 0x300, 0x2bc, 0x20, 0x6d, 0x62, 0xff, 0x25b, 0x3b, 0x73, 0x61, 0x14b, 0x20, 0x74, 0xe0, 0x14b,
-0x61, 0x20, 0x74, 0x73, 0x65, 0x74, 0x73, 0xe1, 0x2bc, 0x3b, 0x73, 0x61, 0x14b, 0x20, 0x6d, 0x65, 0x6a, 0x77, 0x6f, 0x14b,
-0xf3, 0x3b, 0x73, 0x61, 0x14b, 0x20, 0x6c, 0xf9, 0x6d, 0x3b, 0x57, 0x69, 0xf3, 0x74, 0x68, 0x65, 0x21f, 0x69, 0x6b, 0x61,
-0x20, 0x57, 0xed, 0x3b, 0x54, 0x68, 0x69, 0x79, 0xf3, 0x21f, 0x65, 0x79, 0x75, 0x14b, 0x6b, 0x61, 0x20, 0x57, 0xed, 0x3b,
-0x49, 0x161, 0x74, 0xe1, 0x77, 0x69, 0x10d, 0x68, 0x61, 0x79, 0x61, 0x7a, 0x61, 0x14b, 0x20, 0x57, 0xed, 0x3b, 0x50, 0x21f,
-0x65, 0x17e, 0xed, 0x74, 0x21f, 0x6f, 0x20, 0x57, 0xed, 0x3b, 0x10c, 0x68, 0x61, 0x14b, 0x77, 0xe1, 0x70, 0x65, 0x74, 0x21f,
-0x6f, 0x20, 0x57, 0xed, 0x3b, 0x57, 0xed, 0x70, 0x61, 0x7a, 0x75, 0x6b, 0x21f, 0x61, 0x2d, 0x77, 0x61, 0x161, 0x74, 0xe9,
-0x20, 0x57, 0xed, 0x3b, 0x10c, 0x68, 0x61, 0x14b, 0x70, 0x21f, 0xe1, 0x73, 0x61, 0x70, 0x61, 0x20, 0x57, 0xed, 0x3b, 0x57,
-0x61, 0x73, 0xfa, 0x74, 0x21f, 0x75, 0x14b, 0x20, 0x57, 0xed, 0x3b, 0x10c, 0x68, 0x61, 0x14b, 0x77, 0xe1, 0x70, 0x65, 0x1e7,
-0x69, 0x20, 0x57, 0xed, 0x3b, 0x10c, 0x68, 0x61, 0x14b, 0x77, 0xe1, 0x70, 0x65, 0x2d, 0x6b, 0x61, 0x73, 0x6e, 0xe1, 0x20,
-0x57, 0xed, 0x3b, 0x57, 0x61, 0x6e, 0xed, 0x79, 0x65, 0x74, 0x75, 0x20, 0x57, 0xed, 0x3b, 0x54, 0x21f, 0x61, 0x68, 0xe9,
-0x6b, 0x61, 0x70, 0x161, 0x75, 0x14b, 0x20, 0x57, 0xed, 0x3b, 0x6a9, 0x627, 0x646, 0x648, 0x648, 0x646, 0x6cc, 0x20, 0x62f, 0x648,
-0x648, 0x6d5, 0x645, 0x3b, 0x634, 0x648, 0x628, 0x627, 0x62a, 0x3b, 0x626, 0x627, 0x632, 0x627, 0x631, 0x3b, 0x646, 0x6cc, 0x633, 0x627,
-0x646, 0x3b, 0x626, 0x627, 0x6cc, 0x627, 0x631, 0x3b, 0x62d, 0x648, 0x632, 0x6d5, 0x6cc, 0x631, 0x627, 0x646, 0x3b, 0x62a, 0x6d5, 0x645,
-0x648, 0x648, 0x632, 0x3b, 0x626, 0x627, 0x628, 0x3b, 0x626, 0x6d5, 0x6cc, 0x644, 0x648, 0x648, 0x644, 0x3b, 0x62a, 0x634, 0x631, 0x6cc,
-0x646, 0x6cc, 0x20, 0x6cc, 0x6d5, 0x6a9, 0x6d5, 0x645, 0x3b, 0x62a, 0x634, 0x631, 0x6cc, 0x646, 0x6cc, 0x20, 0x62f, 0x648, 0x648, 0x6d5,
-0x645, 0x3b, 0x6a9, 0x627, 0x646, 0x648, 0x646, 0x6cc, 0x20, 0x6cc, 0x6d5, 0x6a9, 0x6d5, 0x645, 0x3b, 0x6a9, 0x3b, 0x634, 0x3b, 0x626,
-0x3b, 0x646, 0x3b, 0x626, 0x3b, 0x62d, 0x3b, 0x62a, 0x3b, 0x626, 0x3b, 0x626, 0x3b, 0x62a, 0x3b, 0x62a, 0x3b, 0x6a9, 0x3b, 0x6a,
-0x61, 0x6e, 0x3b, 0x66, 0x65, 0x62, 0x3b, 0x6d, 0x11b, 0x72, 0x3b, 0x61, 0x70, 0x72, 0x3b, 0x6d, 0x61, 0x6a, 0x3b, 0x6a,
-0x75, 0x6e, 0x3b, 0x6a, 0x75, 0x6c, 0x3b, 0x61, 0x77, 0x67, 0x3b, 0x73, 0x65, 0x70, 0x3b, 0x6f, 0x6b, 0x74, 0x3b, 0x6e,
-0x6f, 0x77, 0x3b, 0x64, 0x65, 0x63, 0x3b, 0x6a, 0x61, 0x6e, 0x75, 0x61, 0x72, 0x3b, 0x66, 0x65, 0x62, 0x72, 0x75, 0x61,
-0x72, 0x3b, 0x6d, 0x11b, 0x72, 0x63, 0x3b, 0x61, 0x70, 0x72, 0x79, 0x6c, 0x3b, 0x6d, 0x61, 0x6a, 0x3b, 0x6a, 0x75, 0x6e,
-0x69, 0x6a, 0x3b, 0x6a, 0x75, 0x6c, 0x69, 0x6a, 0x3b, 0x61, 0x77, 0x67, 0x75, 0x73, 0x74, 0x3b, 0x73, 0x65, 0x70, 0x74,
-0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x6f, 0x6b, 0x74, 0x6f, 0x62, 0x65, 0x72, 0x3b, 0x6e, 0x6f, 0x77, 0x65, 0x6d, 0x62,
-0x65, 0x72, 0x3b, 0x64, 0x65, 0x63, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x6a, 0x61, 0x6e, 0x2e, 0x3b, 0x66, 0x65, 0x62,
-0x2e, 0x3b, 0x6d, 0x11b, 0x72, 0x2e, 0x3b, 0x61, 0x70, 0x72, 0x2e, 0x3b, 0x6d, 0x61, 0x6a, 0x2e, 0x3b, 0x6a, 0x75, 0x6e,
-0x2e, 0x3b, 0x6a, 0x75, 0x6c, 0x2e, 0x3b, 0x61, 0x77, 0x67, 0x2e, 0x3b, 0x73, 0x65, 0x70, 0x2e, 0x3b, 0x6f, 0x6b, 0x74,
-0x2e, 0x3b, 0x6e, 0x6f, 0x77, 0x2e, 0x3b, 0x64, 0x65, 0x63, 0x2e, 0x3b, 0x6a, 0x61, 0x6e, 0x75, 0x61, 0x72, 0x61, 0x3b,
-0x66, 0x65, 0x62, 0x72, 0x75, 0x61, 0x72, 0x61, 0x3b, 0x6d, 0x11b, 0x72, 0x63, 0x61, 0x3b, 0x61, 0x70, 0x72, 0x79, 0x6c,
-0x61, 0x3b, 0x6d, 0x61, 0x6a, 0x61, 0x3b, 0x6a, 0x75, 0x6e, 0x69, 0x6a, 0x61, 0x3b, 0x6a, 0x75, 0x6c, 0x69, 0x6a, 0x61,
-0x3b, 0x61, 0x77, 0x67, 0x75, 0x73, 0x74, 0x61, 0x3b, 0x73, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x72, 0x61, 0x3b, 0x6f,
-0x6b, 0x74, 0x6f, 0x62, 0x72, 0x61, 0x3b, 0x6e, 0x6f, 0x77, 0x65, 0x6d, 0x62, 0x72, 0x61, 0x3b, 0x64, 0x65, 0x63, 0x65,
-0x6d, 0x62, 0x72, 0x61, 0x3b, 0x6a, 0x61, 0x6e, 0x3b, 0x66, 0x65, 0x62, 0x3b, 0x6d, 0x11b, 0x72, 0x3b, 0x61, 0x70, 0x72,
-0x3b, 0x6d, 0x65, 0x6a, 0x3b, 0x6a, 0x75, 0x6e, 0x3b, 0x6a, 0x75, 0x6c, 0x3b, 0x61, 0x77, 0x67, 0x3b, 0x73, 0x65, 0x70,
-0x3b, 0x6f, 0x6b, 0x74, 0x3b, 0x6e, 0x6f, 0x77, 0x3b, 0x64, 0x65, 0x63, 0x3b, 0x6a, 0x61, 0x6e, 0x75, 0x61, 0x72, 0x3b,
-0x66, 0x65, 0x62, 0x72, 0x75, 0x61, 0x72, 0x3b, 0x6d, 0x11b, 0x72, 0x63, 0x3b, 0x61, 0x70, 0x72, 0x79, 0x6c, 0x3b, 0x6d,
-0x65, 0x6a, 0x61, 0x3b, 0x6a, 0x75, 0x6e, 0x69, 0x6a, 0x3b, 0x6a, 0x75, 0x6c, 0x69, 0x6a, 0x3b, 0x61, 0x77, 0x67, 0x75,
-0x73, 0x74, 0x3b, 0x73, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x6f, 0x6b, 0x74, 0x6f, 0x62, 0x65, 0x72,
-0x3b, 0x6e, 0x6f, 0x77, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x64, 0x65, 0x63, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x6a,
-0x61, 0x6e, 0x2e, 0x3b, 0x66, 0x65, 0x62, 0x2e, 0x3b, 0x6d, 0x11b, 0x72, 0x2e, 0x3b, 0x61, 0x70, 0x72, 0x2e, 0x3b, 0x6d,
-0x65, 0x6a, 0x2e, 0x3b, 0x6a, 0x75, 0x6e, 0x2e, 0x3b, 0x6a, 0x75, 0x6c, 0x2e, 0x3b, 0x61, 0x77, 0x67, 0x2e, 0x3b, 0x73,
-0x65, 0x70, 0x2e, 0x3b, 0x6f, 0x6b, 0x74, 0x2e, 0x3b, 0x6e, 0x6f, 0x77, 0x2e, 0x3b, 0x64, 0x65, 0x63, 0x2e, 0x3b, 0x6a,
-0x61, 0x6e, 0x75, 0x61, 0x72, 0x61, 0x3b, 0x66, 0x65, 0x62, 0x72, 0x75, 0x61, 0x72, 0x61, 0x3b, 0x6d, 0x11b, 0x72, 0x63,
-0x61, 0x3b, 0x61, 0x70, 0x72, 0x79, 0x6c, 0x61, 0x3b, 0x6d, 0x65, 0x6a, 0x65, 0x3b, 0x6a, 0x75, 0x6e, 0x69, 0x6a, 0x61,
-0x3b, 0x6a, 0x75, 0x6c, 0x69, 0x6a, 0x61, 0x3b, 0x61, 0x77, 0x67, 0x75, 0x73, 0x74, 0x61, 0x3b, 0x73, 0x65, 0x70, 0x74,
-0x65, 0x6d, 0x62, 0x72, 0x61, 0x3b, 0x6f, 0x6b, 0x74, 0x6f, 0x62, 0x72, 0x61, 0x3b, 0x6e, 0x6f, 0x77, 0x65, 0x6d, 0x62,
-0x72, 0x61, 0x3b, 0x64, 0x65, 0x63, 0x65, 0x6d, 0x62, 0x72, 0x61, 0x3b, 0x72, 0x61, 0x67, 0x3b, 0x77, 0x61, 0x73, 0x3b,
-0x70, 0x16b, 0x6c, 0x3b, 0x73, 0x61, 0x6b, 0x3b, 0x7a, 0x61, 0x6c, 0x3b, 0x73, 0x12b, 0x6d, 0x3b, 0x6c, 0x12b, 0x70, 0x3b,
-0x64, 0x61, 0x67, 0x3b, 0x73, 0x69, 0x6c, 0x3b, 0x73, 0x70, 0x61, 0x3b, 0x6c, 0x61, 0x70, 0x3b, 0x73, 0x61, 0x6c, 0x3b,
-0x72, 0x61, 0x67, 0x73, 0x3b, 0x77, 0x61, 0x73, 0x73, 0x61, 0x72, 0x69, 0x6e, 0x73, 0x3b, 0x70, 0x16b, 0x6c, 0x69, 0x73,
-0x3b, 0x73, 0x61, 0x6b, 0x6b, 0x69, 0x73, 0x3b, 0x7a, 0x61, 0x6c, 0x6c, 0x61, 0x77, 0x73, 0x3b, 0x73, 0x12b, 0x6d, 0x65,
-0x6e, 0x69, 0x73, 0x3b, 0x6c, 0x12b, 0x70, 0x61, 0x3b, 0x64, 0x61, 0x67, 0x67, 0x69, 0x73, 0x3b, 0x73, 0x69, 0x6c, 0x6c,
-0x69, 0x6e, 0x73, 0x3b, 0x73, 0x70, 0x61, 0x6c, 0x6c, 0x69, 0x6e, 0x73, 0x3b, 0x6c, 0x61, 0x70, 0x6b, 0x72, 0x16b, 0x74,
-0x69, 0x73, 0x3b, 0x73, 0x61, 0x6c, 0x6c, 0x61, 0x77, 0x73, 0x3b, 0x52, 0x3b, 0x57, 0x3b, 0x50, 0x3b, 0x53, 0x3b, 0x5a,
-0x3b, 0x53, 0x3b, 0x4c, 0x3b, 0x44, 0x3b, 0x53, 0x3b, 0x53, 0x3b, 0x4c, 0x3b, 0x53, 0x3b, 0x75, 0x111, 0x69, 0x76, 0x3b,
-0x6b, 0x75, 0x6f, 0x76, 0xe2, 0x3b, 0x6e, 0x6a, 0x75, 0x68, 0x10d, 0xe2, 0x3b, 0x63, 0x75, 0xe1, 0x14b, 0x75, 0x69, 0x3b,
-0x76, 0x79, 0x65, 0x73, 0x69, 0x3b, 0x6b, 0x65, 0x73, 0x69, 0x3b, 0x73, 0x79, 0x65, 0x69, 0x6e, 0x69, 0x3b, 0x70, 0x6f,
-0x72, 0x67, 0x65, 0x3b, 0x10d, 0x6f, 0x68, 0x10d, 0xe2, 0x3b, 0x72, 0x6f, 0x6f, 0x76, 0x76, 0xe2, 0x64, 0x3b, 0x73, 0x6b,
-0x61, 0x6d, 0x6d, 0xe2, 0x3b, 0x6a, 0x75, 0x6f, 0x76, 0x6c, 0xe2, 0x3b, 0x75, 0x111, 0x111, 0xe2, 0x69, 0x76, 0x65, 0x6d,
-0xe1, 0xe1, 0x6e, 0x75, 0x3b, 0x6b, 0x75, 0x6f, 0x76, 0xe2, 0x6d, 0xe1, 0xe1, 0x6e, 0x75, 0x3b, 0x6e, 0x6a, 0x75, 0x68,
-0x10d, 0xe2, 0x6d, 0xe1, 0xe1, 0x6e, 0x75, 0x3b, 0x63, 0x75, 0xe1, 0x14b, 0x75, 0x69, 0x6d, 0xe1, 0xe1, 0x6e, 0x75, 0x3b,
-0x76, 0x79, 0x65, 0x73, 0x69, 0x6d, 0xe1, 0xe1, 0x6e, 0x75, 0x3b, 0x6b, 0x65, 0x73, 0x69, 0x6d, 0xe1, 0xe1, 0x6e, 0x75,
-0x3b, 0x73, 0x79, 0x65, 0x69, 0x6e, 0x69, 0x6d, 0xe1, 0xe1, 0x6e, 0x75, 0x3b, 0x70, 0x6f, 0x72, 0x67, 0x65, 0x6d, 0xe1,
-0xe1, 0x6e, 0x75, 0x3b, 0x10d, 0x6f, 0x68, 0x10d, 0xe2, 0x6d, 0xe1, 0xe1, 0x6e, 0x75, 0x3b, 0x72, 0x6f, 0x6f, 0x76, 0x76,
-0xe2, 0x64, 0x6d, 0xe1, 0xe1, 0x6e, 0x75, 0x3b, 0x73, 0x6b, 0x61, 0x6d, 0x6d, 0xe2, 0x6d, 0xe1, 0xe1, 0x6e, 0x75, 0x3b,
-0x6a, 0x75, 0x6f, 0x76, 0x6c, 0xe2, 0x6d, 0xe1, 0xe1, 0x6e, 0x75, 0x3b, 0x55, 0x3b, 0x4b, 0x3b, 0x4e, 0x4a, 0x3b, 0x43,
-0x3b, 0x56, 0x3b, 0x4b, 0x3b, 0x53, 0x3b, 0x50, 0x3b, 0x10c, 0x3b, 0x52, 0x3b, 0x53, 0x3b, 0x4a, 0x3b, 0x62c, 0x627, 0x646,
-0x6a4, 0x6cc, 0x6d5, 0x3b, 0x641, 0x626, 0x6a4, 0x631, 0x6cc, 0x6d5, 0x3b, 0x645, 0x627, 0x631, 0x633, 0x3b, 0x622, 0x6a4, 0x631, 0x6cc,
-0x644, 0x3b, 0x645, 0x626, 0x6cc, 0x3b, 0x62c, 0x648, 0x659, 0x623, 0x646, 0x3b, 0x62c, 0x648, 0x659, 0x644, 0x627, 0x3b, 0x622, 0x6af,
-0x648, 0x633, 0x62a, 0x3b, 0x633, 0x626, 0x67e, 0x62a, 0x627, 0x645, 0x631, 0x3b, 0x626, 0x648, 0x6a9, 0x62a, 0x648, 0x6a4, 0x631, 0x3b,
-0x646, 0x648, 0x6a4, 0x627, 0x645, 0x631, 0x3b, 0x62f, 0x626, 0x633, 0x627, 0x645, 0x631, 0x3b, 0x45, 0x6e, 0x3b, 0x50, 0x65, 0x62,
-0x3b, 0x4d, 0x61, 0x72, 0x3b, 0x41, 0x70, 0x72, 0x3b, 0x4d, 0x61, 0x79, 0x3b, 0x48, 0x75, 0x6e, 0x3b, 0x48, 0x75, 0x6c,
-0x3b, 0x41, 0x67, 0x3b, 0x53, 0x65, 0x74, 0x3b, 0x4f, 0x6b, 0x74, 0x3b, 0x4e, 0x6f, 0x62, 0x3b, 0x44, 0x69, 0x73, 0x3b,
-0x45, 0x3b, 0x50, 0x3b, 0x4d, 0x3b, 0x41, 0x3b, 0x4d, 0x3b, 0x48, 0x3b, 0x48, 0x3b, 0x41, 0x3b, 0x53, 0x3b, 0x4f, 0x3b,
-0x4e, 0x3b, 0x44, 0x3b
+0x253, 0x6f, 0x6c, 0x6f, 0x6c, 0x254, 0x3b, 0x6c, 0x75, 0x75, 0x6b, 0x61, 0x6f, 0x20, 0x6c, 0x254, 0x6d, 0x61, 0x4a, 0x65,
+0x6e, 0x6e, 0x65, 0x72, 0x3b, 0x48, 0x6f, 0x72, 0x6e, 0x69, 0x67, 0x3b, 0x4d, 0xe4, 0x72, 0x7a, 0x65, 0x3b, 0x41, 0x62,
+0x72, 0x69, 0x6c, 0x6c, 0x65, 0x3b, 0x4d, 0x65, 0x69, 0x6a, 0x65, 0x3b, 0x42, 0x72, 0xe1, 0x10d, 0x65, 0x74, 0x3b, 0x48,
+0x65, 0x69, 0x77, 0x65, 0x74, 0x3b, 0xd6, 0x69, 0x67, 0x161, 0x74, 0x65, 0x3b, 0x48, 0x65, 0x72, 0x62, 0x161, 0x74, 0x6d,
+0xe1, 0x6e, 0x65, 0x74, 0x3b, 0x57, 0xed, 0x6d, 0xe1, 0x6e, 0x65, 0x74, 0x3b, 0x57, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6d,
+0xe1, 0x6e, 0x65, 0x74, 0x3b, 0x43, 0x68, 0x72, 0x69, 0x161, 0x74, 0x6d, 0xe1, 0x6e, 0x65, 0x74, 0x4a, 0x65, 0x6e, 0x3b,
+0x48, 0x6f, 0x72, 0x3b, 0x4d, 0xe4, 0x72, 0x3b, 0x41, 0x62, 0x72, 0x3b, 0x4d, 0x65, 0x69, 0x3b, 0x42, 0x72, 0xe1, 0x3b,
+0x48, 0x65, 0x69, 0x3b, 0xd6, 0x69, 0x67, 0x3b, 0x48, 0x65, 0x72, 0x3b, 0x57, 0xed, 0x6d, 0x3b, 0x57, 0x69, 0x6e, 0x3b,
+0x43, 0x68, 0x72, 0x4a, 0x3b, 0x48, 0x3b, 0x4d, 0x3b, 0x41, 0x3b, 0x4d, 0x3b, 0x42, 0x3b, 0x48, 0x3b, 0xd6, 0x3b, 0x48,
+0x3b, 0x57, 0x3b, 0x57, 0x3b, 0x43, 0x70, 0x69, 0x6b, 0xed, 0x74, 0xed, 0x6b, 0xed, 0x74, 0x69, 0x65, 0x2c, 0x20, 0x6f,
+0xf3, 0x6c, 0xed, 0x20, 0xfa, 0x20, 0x6b, 0x75, 0x74, 0xfa, 0x61, 0x6e, 0x3b, 0x73, 0x69, 0x25b, 0x79, 0x25b, 0x301, 0x2c,
+0x20, 0x6f, 0xf3, 0x6c, 0x69, 0x20, 0xfa, 0x20, 0x6b, 0xe1, 0x6e, 0x64, 0xed, 0x25b, 0x3b, 0x254, 0x6e, 0x73, 0xfa, 0x6d,
+0x62, 0x254, 0x6c, 0x2c, 0x20, 0x6f, 0xf3, 0x6c, 0x69, 0x20, 0xfa, 0x20, 0x6b, 0xe1, 0x74, 0xe1, 0x74, 0xfa, 0x25b, 0x3b,
+0x6d, 0x65, 0x73, 0x69, 0x14b, 0x2c, 0x20, 0x6f, 0xf3, 0x6c, 0x69, 0x20, 0xfa, 0x20, 0x6b, 0xe9, 0x6e, 0x69, 0x65, 0x3b,
+0x65, 0x6e, 0x73, 0x69, 0x6c, 0x2c, 0x20, 0x6f, 0xf3, 0x6c, 0x69, 0x20, 0xfa, 0x20, 0x6b, 0xe1, 0x74, 0xe1, 0x6e, 0x75,
+0x25b, 0x3b, 0x254, 0x73, 0x254, 0x6e, 0x3b, 0x65, 0x66, 0x75, 0x74, 0x65, 0x3b, 0x70, 0x69, 0x73, 0x75, 0x79, 0xfa, 0x3b,
+0x69, 0x6d, 0x25b, 0x14b, 0x20, 0x69, 0x20, 0x70, 0x75, 0x254, 0x73, 0x3b, 0x69, 0x6d, 0x25b, 0x14b, 0x20, 0x69, 0x20, 0x70,
+0x75, 0x74, 0xfa, 0x6b, 0x2c, 0x6f, 0xf3, 0x6c, 0x69, 0x20, 0xfa, 0x20, 0x6b, 0xe1, 0x74, 0xed, 0x25b, 0x3b, 0x6d, 0x61,
+0x6b, 0x61, 0x6e, 0x64, 0x69, 0x6b, 0x25b, 0x3b, 0x70, 0x69, 0x6c, 0x254, 0x6e, 0x64, 0x254, 0x301, 0x6f, 0x2e, 0x31, 0x3b,
+0x6f, 0x2e, 0x32, 0x3b, 0x6f, 0x2e, 0x33, 0x3b, 0x6f, 0x2e, 0x34, 0x3b, 0x6f, 0x2e, 0x35, 0x3b, 0x6f, 0x2e, 0x36, 0x3b,
+0x6f, 0x2e, 0x37, 0x3b, 0x6f, 0x2e, 0x38, 0x3b, 0x6f, 0x2e, 0x39, 0x3b, 0x6f, 0x2e, 0x31, 0x30, 0x3b, 0x6f, 0x2e, 0x31,
+0x31, 0x3b, 0x6f, 0x2e, 0x31, 0x32, 0x78, 0x69, 0x6e, 0x65, 0x72, 0x75, 0x3b, 0x66, 0x65, 0x62, 0x72, 0x65, 0x72, 0x75,
+0x3b, 0x6d, 0x61, 0x72, 0x7a, 0x75, 0x3b, 0x61, 0x62, 0x72, 0x69, 0x6c, 0x3b, 0x6d, 0x61, 0x79, 0x75, 0x3b, 0x78, 0x75,
+0x6e, 0x75, 0x3b, 0x78, 0x75, 0x6e, 0x65, 0x74, 0x75, 0x3b, 0x61, 0x67, 0x6f, 0x73, 0x74, 0x75, 0x3b, 0x73, 0x65, 0x74,
+0x69, 0x65, 0x6d, 0x62, 0x72, 0x65, 0x3b, 0x6f, 0x63, 0x68, 0x6f, 0x62, 0x72, 0x65, 0x3b, 0x70, 0x61, 0x79, 0x61, 0x72,
+0x65, 0x73, 0x3b, 0x61, 0x76, 0x69, 0x65, 0x6e, 0x74, 0x75, 0x64, 0x65, 0x20, 0x78, 0x69, 0x6e, 0x65, 0x72, 0x75, 0x3b,
+0x64, 0x65, 0x20, 0x66, 0x65, 0x62, 0x72, 0x65, 0x72, 0x75, 0x3b, 0x64, 0x65, 0x20, 0x6d, 0x61, 0x72, 0x7a, 0x75, 0x3b,
+0x64, 0x2019, 0x61, 0x62, 0x72, 0x69, 0x6c, 0x3b, 0x64, 0x65, 0x20, 0x6d, 0x61, 0x79, 0x75, 0x3b, 0x64, 0x65, 0x20, 0x78,
+0x75, 0x6e, 0x75, 0x3b, 0x64, 0x65, 0x20, 0x78, 0x75, 0x6e, 0x65, 0x74, 0x75, 0x3b, 0x64, 0x2019, 0x61, 0x67, 0x6f, 0x73,
+0x74, 0x75, 0x3b, 0x64, 0x65, 0x20, 0x73, 0x65, 0x74, 0x69, 0x65, 0x6d, 0x62, 0x72, 0x65, 0x3b, 0x64, 0x2019, 0x6f, 0x63,
+0x68, 0x6f, 0x62, 0x72, 0x65, 0x3b, 0x64, 0x65, 0x20, 0x70, 0x61, 0x79, 0x61, 0x72, 0x65, 0x73, 0x3b, 0x64, 0x2019, 0x61,
+0x76, 0x69, 0x65, 0x6e, 0x74, 0x75, 0x58, 0x69, 0x6e, 0x3b, 0x46, 0x65, 0x62, 0x3b, 0x4d, 0x61, 0x72, 0x3b, 0x41, 0x62,
+0x72, 0x3b, 0x4d, 0x61, 0x79, 0x3b, 0x58, 0x75, 0x6e, 0x3b, 0x58, 0x6e, 0x74, 0x3b, 0x41, 0x67, 0x6f, 0x3b, 0x53, 0x65,
+0x74, 0x3b, 0x4f, 0x63, 0x68, 0x3b, 0x50, 0x61, 0x79, 0x3b, 0x41, 0x76, 0x69, 0x78, 0x69, 0x6e, 0x3b, 0x66, 0x65, 0x62,
+0x3b, 0x6d, 0x61, 0x72, 0x3b, 0x61, 0x62, 0x72, 0x3b, 0x6d, 0x61, 0x79, 0x3b, 0x78, 0x75, 0x6e, 0x3b, 0x78, 0x6e, 0x74,
+0x3b, 0x61, 0x67, 0x6f, 0x3b, 0x73, 0x65, 0x74, 0x3b, 0x6f, 0x63, 0x68, 0x3b, 0x70, 0x61, 0x79, 0x3b, 0x61, 0x76, 0x69,
+0x58, 0x3b, 0x46, 0x3b, 0x4d, 0x3b, 0x41, 0x3b, 0x4d, 0x3b, 0x58, 0x3b, 0x58, 0x3b, 0x41, 0x3b, 0x53, 0x3b, 0x4f, 0x3b,
+0x50, 0x3b, 0x41, 0x4e, 0x64, 0x75, 0x14b, 0x6d, 0x62, 0x69, 0x20, 0x53, 0x61, 0x14b, 0x3b, 0x50, 0x25b, 0x73, 0x61, 0x14b,
+0x20, 0x50, 0x25b, 0x301, 0x70, 0xe1, 0x3b, 0x50, 0x25b, 0x73, 0x61, 0x14b, 0x20, 0x50, 0x25b, 0x301, 0x74, 0xe1, 0x74, 0x3b,
+0x50, 0x25b, 0x73, 0x61, 0x14b, 0x20, 0x50, 0x25b, 0x301, 0x6e, 0x25b, 0x301, 0x6b, 0x77, 0x61, 0x3b, 0x50, 0x25b, 0x73, 0x61,
+0x14b, 0x20, 0x50, 0x61, 0x74, 0x61, 0x61, 0x3b, 0x50, 0x25b, 0x73, 0x61, 0x14b, 0x20, 0x50, 0x25b, 0x301, 0x6e, 0x25b, 0x301,
+0x6e, 0x74, 0xfa, 0x6b, 0xfa, 0x3b, 0x50, 0x25b, 0x73, 0x61, 0x14b, 0x20, 0x53, 0x61, 0x61, 0x6d, 0x62, 0xe1, 0x3b, 0x50,
+0x25b, 0x73, 0x61, 0x14b, 0x20, 0x50, 0x25b, 0x301, 0x6e, 0x25b, 0x301, 0x66, 0x254, 0x6d, 0x3b, 0x50, 0x25b, 0x73, 0x61, 0x14b,
+0x20, 0x50, 0x25b, 0x301, 0x6e, 0x25b, 0x301, 0x70, 0x66, 0xfa, 0xa78b, 0xfa, 0x3b, 0x50, 0x25b, 0x73, 0x61, 0x14b, 0x20, 0x4e,
+0x25b, 0x67, 0x25b, 0x301, 0x6d, 0x3b, 0x50, 0x25b, 0x73, 0x61, 0x14b, 0x20, 0x4e, 0x74, 0x73, 0x254, 0x30c, 0x70, 0x6d, 0x254,
+0x301, 0x3b, 0x50, 0x25b, 0x73, 0x61, 0x14b, 0x20, 0x4e, 0x74, 0x73, 0x254, 0x30c, 0x70, 0x70, 0xe1, 0x70, 0x61, 0x6d, 0x62,
+0x61, 0x3b, 0x77, 0x61, 0x6e, 0x6a, 0x61, 0x3b, 0x6d, 0x62, 0x69, 0x79, 0x254, 0x20, 0x6d, 0x25b, 0x6e, 0x64, 0x6f, 0x14b,
+0x67, 0x254, 0x3b, 0x4e, 0x79, 0x254, 0x6c, 0x254, 0x6d, 0x62, 0x254, 0x14b, 0x67, 0x254, 0x3b, 0x4d, 0x254, 0x6e, 0x254, 0x20,
+0x14b, 0x67, 0x62, 0x61, 0x6e, 0x6a, 0x61, 0x3b, 0x4e, 0x79, 0x61, 0x14b, 0x67, 0x77, 0x25b, 0x20, 0x14b, 0x67, 0x62, 0x61,
+0x6e, 0x6a, 0x61, 0x3b, 0x6b, 0x75, 0x14b, 0x67, 0x77, 0x25b, 0x3b, 0x66, 0x25b, 0x3b, 0x6e, 0x6a, 0x61, 0x70, 0x69, 0x3b,
+0x6e, 0x79, 0x75, 0x6b, 0x75, 0x6c, 0x3b, 0x31, 0x31, 0x3b, 0x253, 0x75, 0x6c, 0x253, 0x75, 0x73, 0x25b, 0x69, 0x6d, 0x259,
+0x67, 0x20, 0x6d, 0x62, 0x65, 0x67, 0x74, 0x75, 0x67, 0x3b, 0x69, 0x6d, 0x65, 0x67, 0x20, 0xe0, 0x62, 0xf9, 0x62, 0xec,
+0x3b, 0x69, 0x6d, 0x65, 0x67, 0x20, 0x6d, 0x62, 0x259, 0x14b, 0x63, 0x68, 0x75, 0x62, 0x69, 0x3b, 0x69, 0x6d, 0x259, 0x67,
+0x20, 0x6e, 0x67, 0x77, 0x259, 0x300, 0x74, 0x3b, 0x69, 0x6d, 0x259, 0x67, 0x20, 0x66, 0x6f, 0x67, 0x3b, 0x69, 0x6d, 0x259,
+0x67, 0x20, 0x69, 0x63, 0x68, 0x69, 0x69, 0x62, 0x254, 0x64, 0x3b, 0x69, 0x6d, 0x259, 0x67, 0x20, 0xe0, 0x64, 0xf9, 0x6d,
+0x62, 0x259, 0x300, 0x14b, 0x3b, 0x69, 0x6d, 0x259, 0x67, 0x20, 0x69, 0x63, 0x68, 0x69, 0x6b, 0x61, 0x3b, 0x69, 0x6d, 0x259,
+0x67, 0x20, 0x6b, 0x75, 0x64, 0x3b, 0x69, 0x6d, 0x259, 0x67, 0x20, 0x74, 0xe8, 0x73, 0x69, 0x2bc, 0x65, 0x3b, 0x69, 0x6d,
+0x259, 0x67, 0x20, 0x7a, 0xf2, 0x3b, 0x69, 0x6d, 0x259, 0x67, 0x20, 0x6b, 0x72, 0x69, 0x7a, 0x6d, 0x65, 0x64, 0x6d, 0x62,
+0x65, 0x67, 0x74, 0x75, 0x67, 0x3b, 0x69, 0x6d, 0x65, 0x67, 0x20, 0xe0, 0x62, 0xf9, 0x62, 0xec, 0x3b, 0x69, 0x6d, 0x65,
+0x67, 0x20, 0x6d, 0x62, 0x259, 0x14b, 0x63, 0x68, 0x75, 0x62, 0x69, 0x3b, 0x69, 0x6d, 0x259, 0x67, 0x20, 0x6e, 0x67, 0x77,
+0x259, 0x300, 0x74, 0x3b, 0x69, 0x6d, 0x259, 0x67, 0x20, 0x66, 0x6f, 0x67, 0x3b, 0x69, 0x6d, 0x259, 0x67, 0x20, 0x69, 0x63,
+0x68, 0x69, 0x69, 0x62, 0x254, 0x64, 0x3b, 0x69, 0x6d, 0x259, 0x67, 0x20, 0xe0, 0x64, 0xf9, 0x6d, 0x62, 0x259, 0x300, 0x14b,
+0x3b, 0x69, 0x6d, 0x259, 0x67, 0x20, 0x69, 0x63, 0x68, 0x69, 0x6b, 0x61, 0x3b, 0x69, 0x6d, 0x259, 0x67, 0x20, 0x6b, 0x75,
+0x64, 0x3b, 0x69, 0x6d, 0x259, 0x67, 0x20, 0x74, 0xe8, 0x73, 0x69, 0x2bc, 0x65, 0x3b, 0x69, 0x6d, 0x259, 0x67, 0x20, 0x7a,
+0xf2, 0x3b, 0x69, 0x6d, 0x259, 0x67, 0x20, 0x6b, 0x72, 0x69, 0x7a, 0x6d, 0x65, 0x64, 0x4d, 0x31, 0x3b, 0x41, 0x32, 0x3b,
+0x4d, 0x33, 0x3b, 0x4e, 0x34, 0x3b, 0x46, 0x35, 0x3b, 0x49, 0x36, 0x3b, 0x41, 0x37, 0x3b, 0x49, 0x38, 0x3b, 0x4b, 0x39,
+0x3b, 0x31, 0x30, 0x3b, 0x31, 0x31, 0x3b, 0x31, 0x32, 0x73, 0x61, 0x14b, 0x20, 0x74, 0x73, 0x65, 0x74, 0x73, 0x25b, 0x300,
+0x25b, 0x20, 0x6c, 0xf9, 0x6d, 0x3b, 0x73, 0x61, 0x14b, 0x20, 0x6b, 0xe0, 0x67, 0x20, 0x6e, 0x67, 0x77, 0xf3, 0x14b, 0x3b,
+0x73, 0x61, 0x14b, 0x20, 0x6c, 0x65, 0x70, 0x79, 0xe8, 0x20, 0x73, 0x68, 0xfa, 0x6d, 0x3b, 0x73, 0x61, 0x14b, 0x20, 0x63,
+0xff, 0xf3, 0x3b, 0x73, 0x61, 0x14b, 0x20, 0x74, 0x73, 0x25b, 0x300, 0x25b, 0x20, 0x63, 0xff, 0xf3, 0x3b, 0x73, 0x61, 0x14b,
+0x20, 0x6e, 0x6a, 0xff, 0x6f, 0x6c, 0xe1, 0x2bc, 0x3b, 0x73, 0x61, 0x14b, 0x20, 0x74, 0x79, 0x25b, 0x300, 0x62, 0x20, 0x74,
+0x79, 0x25b, 0x300, 0x62, 0x20, 0x6d, 0x62, 0x289, 0x300, 0x14b, 0x3b, 0x73, 0x61, 0x14b, 0x20, 0x6d, 0x62, 0x289, 0x300, 0x14b,
+0x3b, 0x73, 0x61, 0x14b, 0x20, 0x6e, 0x67, 0x77, 0x254, 0x300, 0x2bc, 0x20, 0x6d, 0x62, 0xff, 0x25b, 0x3b, 0x73, 0x61, 0x14b,
+0x20, 0x74, 0xe0, 0x14b, 0x61, 0x20, 0x74, 0x73, 0x65, 0x74, 0x73, 0xe1, 0x2bc, 0x3b, 0x73, 0x61, 0x14b, 0x20, 0x6d, 0x65,
+0x6a, 0x77, 0x6f, 0x14b, 0xf3, 0x3b, 0x73, 0x61, 0x14b, 0x20, 0x6c, 0xf9, 0x6d, 0xd804, 0xdd0e, 0xd804, 0xdd1a, 0xd804, 0xdd2a, 0xd804,
+0xdd20, 0xd804, 0xdd22, 0xd804, 0xdd28, 0x3b, 0xd804, 0xdd1c, 0xd804, 0xdd2c, 0xd804, 0xdd1b, 0xd804, 0xdd34, 0xd804, 0xdd1d, 0xd804, 0xdd33, 0xd804, 0xdd22,
+0xd804, 0xdd2a, 0xd804, 0xdd20, 0xd804, 0xdd22, 0xd804, 0xdd28, 0x3b, 0xd804, 0xdd1f, 0xd804, 0xdd22, 0xd804, 0xdd34, 0xd804, 0xdd0c, 0xd804, 0xdd27, 0x3b,
+0xd804, 0xdd03, 0xd804, 0xdd2c, 0xd804, 0xdd1b, 0xd804, 0xdd33, 0xd804, 0xdd22, 0xd804, 0xdd28, 0xd804, 0xdd23, 0xd804, 0xdd34, 0x3b, 0xd804, 0xdd1f, 0xd804,
+0xdd2c, 0x3b, 0xd804, 0xdd0e, 0xd804, 0xdd2a, 0xd804, 0xdd1a, 0xd804, 0xdd34, 0x3b, 0xd804, 0xdd0e, 0xd804, 0xdd2a, 0xd804, 0xdd23, 0xd804, 0xdd2d, 0x3b,
+0xd804, 0xdd03, 0xd804, 0xdd09, 0xd804, 0xdd27, 0xd804, 0xdd0c, 0xd804, 0xdd34, 0xd804, 0xdd11, 0xd804, 0xdd34, 0x3b, 0xd804, 0xdd25, 0xd804, 0xdd2c, 0xd804,
+0xdd1b, 0xd804, 0xdd34, 0xd804, 0xdd11, 0xd804, 0xdd2c, 0xd804, 0xdd1f, 0xd804, 0xdd34, 0xd804, 0xdd1d, 0xd804, 0xdd27, 0xd804, 0xdd22, 0xd804, 0xdd34, 0x3b,
+0xd804, 0xdd03, 0xd804, 0xdd27, 0xd804, 0xdd07, 0xd804, 0xdd34, 0xd804, 0xdd11, 0xd804, 0xdd2e, 0xd804, 0xdd1d, 0xd804, 0xdd27, 0xd804, 0xdd22, 0xd804, 0xdd34,
+0x3b, 0xd804, 0xdd1a, 0xd804, 0xdd27, 0xd804, 0xdd1e, 0xd804, 0xdd2c, 0xd804, 0xdd1f, 0xd804, 0xdd34, 0xd804, 0xdd1d, 0xd804, 0xdd27, 0xd804, 0xdd22, 0xd804,
+0xdd34, 0x3b, 0xd804, 0xdd13, 0xd804, 0xdd28, 0xd804, 0xdd25, 0xd804, 0xdd2c, 0xd804, 0xdd1f, 0xd804, 0xdd34, 0xd804, 0xdd1d, 0xd804, 0xdd27, 0xd804, 0xdd22,
+0xd804, 0xdd34, 0xd804, 0xdd0e, 0xd804, 0xdd1a, 0xd804, 0xdd2a, 0xd804, 0xdd20, 0xd804, 0xdd22, 0xd804, 0xdd28, 0x3b, 0xd804, 0xdd1c, 0xd804, 0xdd2c, 0xd804,
+0xdd1b, 0xd804, 0xdd34, 0xd804, 0xdd1d, 0xd804, 0xdd33, 0xd804, 0xdd22, 0xd804, 0xdd2a, 0xd804, 0xdd20, 0xd804, 0xdd22, 0xd804, 0xdd28, 0x3b, 0xd804, 0xdd1f,
+0xd804, 0xdd22, 0xd804, 0xdd34, 0xd804, 0xdd0c, 0xd804, 0xdd27, 0x3b, 0xd804, 0xdd03, 0xd804, 0xdd2c, 0xd804, 0xdd1b, 0xd804, 0xdd33, 0xd804, 0xdd22, 0xd804,
+0xdd28, 0xd804, 0xdd23, 0xd804, 0xdd34, 0x3b, 0xd804, 0xdd1f, 0xd804, 0xdd2c, 0x3b, 0xd804, 0xdd0e, 0xd804, 0xdd2a, 0xd804, 0xdd1a, 0xd804, 0xdd34, 0x3b,
+0xd804, 0xdd0e, 0xd804, 0xdd2a, 0xd804, 0xdd23, 0xd804, 0xdd2d, 0x3b, 0xd804, 0xdd03, 0xd804, 0xdd09, 0xd804, 0xdd27, 0xd804, 0xdd0c, 0xd804, 0xdd34, 0xd804,
+0xdd11, 0xd804, 0xdd34, 0x3b, 0xd804, 0xdd25, 0xd804, 0xdd2c, 0xd804, 0xdd1b, 0xd804, 0xdd34, 0xd804, 0xdd11, 0xd804, 0xdd2c, 0xd804, 0xdd1f, 0xd804, 0xdd34,
+0xd804, 0xdd1d, 0xd804, 0xdd27, 0xd804, 0xdd22, 0xd804, 0xdd34, 0x3b, 0xd804, 0xdd03, 0xd804, 0xdd27, 0xd804, 0xdd07, 0xd804, 0xdd34, 0xd804, 0xdd11, 0xd804,
+0xdd2c, 0xd804, 0xdd1d, 0xd804, 0xdd27, 0xd804, 0xdd22, 0xd804, 0xdd34, 0x3b, 0xd804, 0xdd1a, 0xd804, 0xdd27, 0xd804, 0xdd1e, 0xd804, 0xdd2c, 0xd804, 0xdd1f,
+0xd804, 0xdd34, 0xd804, 0xdd1d, 0xd804, 0xdd27, 0xd804, 0xdd22, 0xd804, 0xdd34, 0x3b, 0xd804, 0xdd13, 0xd804, 0xdd28, 0xd804, 0xdd25, 0xd804, 0xdd2c, 0xd804,
+0xdd1f, 0xd804, 0xdd34, 0xd804, 0xdd1d, 0xd804, 0xdd27, 0xd804, 0xdd22, 0xd804, 0xdd34, 0xd804, 0xdd0e, 0xd804, 0xdd1a, 0xd804, 0xdd2a, 0x3b, 0xd804, 0xdd1c,
+0xd804, 0xdd2c, 0xd804, 0xdd1b, 0xd804, 0xdd34, 0x3b, 0xd804, 0xdd1f, 0xd804, 0xdd22, 0xd804, 0xdd34, 0xd804, 0xdd0c, 0xd804, 0xdd27, 0x3b, 0xd804, 0xdd03,
+0xd804, 0xdd2c, 0xd804, 0xdd1b, 0xd804, 0xdd33, 0xd804, 0xdd22, 0xd804, 0xdd28, 0xd804, 0xdd23, 0xd804, 0xdd34, 0x3b, 0xd804, 0xdd1f, 0xd804, 0xdd2c, 0x3b,
+0xd804, 0xdd0e, 0xd804, 0xdd2a, 0xd804, 0xdd1a, 0xd804, 0xdd34, 0x3b, 0xd804, 0xdd0e, 0xd804, 0xdd2a, 0xd804, 0xdd23, 0xd804, 0xdd2d, 0x3b, 0xd804, 0xdd03,
+0xd804, 0xdd09, 0xd804, 0xdd27, 0xd804, 0xdd0c, 0xd804, 0xdd34, 0xd804, 0xdd11, 0xd804, 0xdd34, 0x3b, 0xd804, 0xdd25, 0xd804, 0xdd2c, 0xd804, 0xdd1b, 0xd804,
+0xdd34, 0xd804, 0xdd11, 0xd804, 0xdd2c, 0xd804, 0xdd1f, 0xd804, 0xdd34, 0xd804, 0xdd1d, 0xd804, 0xdd27, 0xd804, 0xdd22, 0xd804, 0xdd34, 0x3b, 0xd804, 0xdd03,
+0xd804, 0xdd27, 0xd804, 0xdd07, 0xd804, 0xdd34, 0xd804, 0xdd11, 0xd804, 0xdd2e, 0xd804, 0xdd1d, 0xd804, 0xdd27, 0xd804, 0xdd22, 0xd804, 0xdd34, 0x3b, 0xd804,
+0xdd1a, 0xd804, 0xdd27, 0xd804, 0xdd1e, 0xd804, 0xdd2c, 0xd804, 0xdd1f, 0xd804, 0xdd34, 0xd804, 0xdd1d, 0xd804, 0xdd27, 0xd804, 0xdd22, 0xd804, 0xdd34, 0x3b,
+0xd804, 0xdd13, 0xd804, 0xdd28, 0xd804, 0xdd25, 0xd804, 0xdd2c, 0xd804, 0xdd1f, 0xd804, 0xdd34, 0xd804, 0xdd1d, 0xd804, 0xdd22, 0xd804, 0xdd34, 0xd804, 0xdd0e,
+0x3b, 0xd804, 0xdd1c, 0xd804, 0xdd2c, 0x3b, 0xd804, 0xdd1f, 0x3b, 0xd804, 0xdd03, 0xd804, 0xdd2c, 0x3b, 0xd804, 0xdd1f, 0xd804, 0xdd2c, 0x3b, 0xd804,
+0xdd0e, 0xd804, 0xdd2a, 0xd804, 0xdd1a, 0xd804, 0xdd34, 0x3b, 0xd804, 0xdd0e, 0xd804, 0xdd2a, 0x3b, 0xd804, 0xdd03, 0x3b, 0xd804, 0xdd25, 0xd804, 0xdd2c,
+0x3b, 0xd804, 0xdd03, 0xd804, 0xdd27, 0x3b, 0xd804, 0xdd1a, 0xd804, 0xdd27, 0x3b, 0xd804, 0xdd13, 0xd804, 0xdd28, 0x57, 0x69, 0xf3, 0x74, 0x68,
+0x65, 0x21f, 0x69, 0x6b, 0x61, 0x20, 0x57, 0xed, 0x3b, 0x54, 0x68, 0x69, 0x79, 0xf3, 0x21f, 0x65, 0x79, 0x75, 0x14b, 0x6b,
+0x61, 0x20, 0x57, 0xed, 0x3b, 0x49, 0x161, 0x74, 0xe1, 0x77, 0x69, 0x10d, 0x68, 0x61, 0x79, 0x61, 0x7a, 0x61, 0x14b, 0x20,
+0x57, 0xed, 0x3b, 0x50, 0x21f, 0x65, 0x17e, 0xed, 0x74, 0x21f, 0x6f, 0x20, 0x57, 0xed, 0x3b, 0x10c, 0x68, 0x61, 0x14b, 0x77,
+0xe1, 0x70, 0x65, 0x74, 0x21f, 0x6f, 0x20, 0x57, 0xed, 0x3b, 0x57, 0xed, 0x70, 0x61, 0x7a, 0x75, 0x6b, 0x21f, 0x61, 0x2d,
+0x77, 0x61, 0x161, 0x74, 0xe9, 0x20, 0x57, 0xed, 0x3b, 0x10c, 0x68, 0x61, 0x14b, 0x70, 0x21f, 0xe1, 0x73, 0x61, 0x70, 0x61,
+0x20, 0x57, 0xed, 0x3b, 0x57, 0x61, 0x73, 0xfa, 0x74, 0x21f, 0x75, 0x14b, 0x20, 0x57, 0xed, 0x3b, 0x10c, 0x68, 0x61, 0x14b,
+0x77, 0xe1, 0x70, 0x65, 0x1e7, 0x69, 0x20, 0x57, 0xed, 0x3b, 0x10c, 0x68, 0x61, 0x14b, 0x77, 0xe1, 0x70, 0x65, 0x2d, 0x6b,
+0x61, 0x73, 0x6e, 0xe1, 0x20, 0x57, 0xed, 0x3b, 0x57, 0x61, 0x6e, 0xed, 0x79, 0x65, 0x74, 0x75, 0x20, 0x57, 0xed, 0x3b,
+0x54, 0x21f, 0x61, 0x68, 0xe9, 0x6b, 0x61, 0x70, 0x161, 0x75, 0x14b, 0x20, 0x57, 0xed, 0x6a9, 0x627, 0x646, 0x648, 0x648, 0x646,
+0x6cc, 0x20, 0x62f, 0x648, 0x648, 0x6d5, 0x645, 0x3b, 0x634, 0x648, 0x628, 0x627, 0x62a, 0x3b, 0x626, 0x627, 0x632, 0x627, 0x631, 0x3b,
+0x646, 0x6cc, 0x633, 0x627, 0x646, 0x3b, 0x626, 0x627, 0x6cc, 0x627, 0x631, 0x3b, 0x62d, 0x648, 0x632, 0x6d5, 0x6cc, 0x631, 0x627, 0x646,
+0x3b, 0x62a, 0x6d5, 0x645, 0x648, 0x648, 0x632, 0x3b, 0x626, 0x627, 0x628, 0x3b, 0x626, 0x6d5, 0x6cc, 0x644, 0x648, 0x648, 0x644, 0x3b,
+0x62a, 0x634, 0x631, 0x6cc, 0x646, 0x6cc, 0x20, 0x6cc, 0x6d5, 0x6a9, 0x6d5, 0x645, 0x3b, 0x62a, 0x634, 0x631, 0x6cc, 0x646, 0x6cc, 0x20,
+0x62f, 0x648, 0x648, 0x6d5, 0x645, 0x3b, 0x6a9, 0x627, 0x646, 0x648, 0x646, 0x6cc, 0x20, 0x6cc, 0x6d5, 0x6a9, 0x6d5, 0x645, 0x6a9, 0x3b,
+0x634, 0x3b, 0x626, 0x3b, 0x646, 0x3b, 0x626, 0x3b, 0x62d, 0x3b, 0x62a, 0x3b, 0x626, 0x3b, 0x626, 0x3b, 0x62a, 0x3b, 0x62a, 0x3b,
+0x6a9, 0x6a, 0x61, 0x6e, 0x75, 0x61, 0x72, 0x3b, 0x66, 0x65, 0x62, 0x72, 0x75, 0x61, 0x72, 0x3b, 0x6d, 0x11b, 0x72, 0x63,
+0x3b, 0x61, 0x70, 0x72, 0x79, 0x6c, 0x3b, 0x6d, 0x61, 0x6a, 0x3b, 0x6a, 0x75, 0x6e, 0x69, 0x6a, 0x3b, 0x6a, 0x75, 0x6c,
+0x69, 0x6a, 0x3b, 0x61, 0x77, 0x67, 0x75, 0x73, 0x74, 0x3b, 0x73, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b,
+0x6f, 0x6b, 0x74, 0x6f, 0x62, 0x65, 0x72, 0x3b, 0x6e, 0x6f, 0x77, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x64, 0x65, 0x63,
+0x65, 0x6d, 0x62, 0x65, 0x72, 0x6a, 0x61, 0x6e, 0x75, 0x61, 0x72, 0x61, 0x3b, 0x66, 0x65, 0x62, 0x72, 0x75, 0x61, 0x72,
+0x61, 0x3b, 0x6d, 0x11b, 0x72, 0x63, 0x61, 0x3b, 0x61, 0x70, 0x72, 0x79, 0x6c, 0x61, 0x3b, 0x6d, 0x61, 0x6a, 0x61, 0x3b,
+0x6a, 0x75, 0x6e, 0x69, 0x6a, 0x61, 0x3b, 0x6a, 0x75, 0x6c, 0x69, 0x6a, 0x61, 0x3b, 0x61, 0x77, 0x67, 0x75, 0x73, 0x74,
+0x61, 0x3b, 0x73, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x72, 0x61, 0x3b, 0x6f, 0x6b, 0x74, 0x6f, 0x62, 0x72, 0x61, 0x3b,
+0x6e, 0x6f, 0x77, 0x65, 0x6d, 0x62, 0x72, 0x61, 0x3b, 0x64, 0x65, 0x63, 0x65, 0x6d, 0x62, 0x72, 0x61, 0x6a, 0x61, 0x6e,
+0x3b, 0x66, 0x65, 0x62, 0x3b, 0x6d, 0x11b, 0x72, 0x3b, 0x61, 0x70, 0x72, 0x3b, 0x6d, 0x61, 0x6a, 0x3b, 0x6a, 0x75, 0x6e,
+0x3b, 0x6a, 0x75, 0x6c, 0x3b, 0x61, 0x77, 0x67, 0x3b, 0x73, 0x65, 0x70, 0x3b, 0x6f, 0x6b, 0x74, 0x3b, 0x6e, 0x6f, 0x77,
+0x3b, 0x64, 0x65, 0x63, 0x6a, 0x61, 0x6e, 0x2e, 0x3b, 0x66, 0x65, 0x62, 0x2e, 0x3b, 0x6d, 0x11b, 0x72, 0x2e, 0x3b, 0x61,
+0x70, 0x72, 0x2e, 0x3b, 0x6d, 0x61, 0x6a, 0x2e, 0x3b, 0x6a, 0x75, 0x6e, 0x2e, 0x3b, 0x6a, 0x75, 0x6c, 0x2e, 0x3b, 0x61,
+0x77, 0x67, 0x2e, 0x3b, 0x73, 0x65, 0x70, 0x2e, 0x3b, 0x6f, 0x6b, 0x74, 0x2e, 0x3b, 0x6e, 0x6f, 0x77, 0x2e, 0x3b, 0x64,
+0x65, 0x63, 0x2e, 0x6a, 0x61, 0x6e, 0x75, 0x61, 0x72, 0x3b, 0x66, 0x65, 0x62, 0x72, 0x75, 0x61, 0x72, 0x3b, 0x6d, 0x11b,
+0x72, 0x63, 0x3b, 0x61, 0x70, 0x72, 0x79, 0x6c, 0x3b, 0x6d, 0x65, 0x6a, 0x61, 0x3b, 0x6a, 0x75, 0x6e, 0x69, 0x6a, 0x3b,
+0x6a, 0x75, 0x6c, 0x69, 0x6a, 0x3b, 0x61, 0x77, 0x67, 0x75, 0x73, 0x74, 0x3b, 0x73, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62,
+0x65, 0x72, 0x3b, 0x6f, 0x6b, 0x74, 0x6f, 0x62, 0x65, 0x72, 0x3b, 0x6e, 0x6f, 0x77, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b,
+0x64, 0x65, 0x63, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x6a, 0x61, 0x6e, 0x75, 0x61, 0x72, 0x61, 0x3b, 0x66, 0x65, 0x62, 0x72,
+0x75, 0x61, 0x72, 0x61, 0x3b, 0x6d, 0x11b, 0x72, 0x63, 0x61, 0x3b, 0x61, 0x70, 0x72, 0x79, 0x6c, 0x61, 0x3b, 0x6d, 0x65,
+0x6a, 0x65, 0x3b, 0x6a, 0x75, 0x6e, 0x69, 0x6a, 0x61, 0x3b, 0x6a, 0x75, 0x6c, 0x69, 0x6a, 0x61, 0x3b, 0x61, 0x77, 0x67,
+0x75, 0x73, 0x74, 0x61, 0x3b, 0x73, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x72, 0x61, 0x3b, 0x6f, 0x6b, 0x74, 0x6f, 0x62,
+0x72, 0x61, 0x3b, 0x6e, 0x6f, 0x77, 0x65, 0x6d, 0x62, 0x72, 0x61, 0x3b, 0x64, 0x65, 0x63, 0x65, 0x6d, 0x62, 0x72, 0x61,
+0x6a, 0x61, 0x6e, 0x3b, 0x66, 0x65, 0x62, 0x3b, 0x6d, 0x11b, 0x72, 0x3b, 0x61, 0x70, 0x72, 0x3b, 0x6d, 0x65, 0x6a, 0x3b,
+0x6a, 0x75, 0x6e, 0x3b, 0x6a, 0x75, 0x6c, 0x3b, 0x61, 0x77, 0x67, 0x3b, 0x73, 0x65, 0x70, 0x3b, 0x6f, 0x6b, 0x74, 0x3b,
+0x6e, 0x6f, 0x77, 0x3b, 0x64, 0x65, 0x63, 0x6a, 0x61, 0x6e, 0x2e, 0x3b, 0x66, 0x65, 0x62, 0x2e, 0x3b, 0x6d, 0x11b, 0x72,
+0x2e, 0x3b, 0x61, 0x70, 0x72, 0x2e, 0x3b, 0x6d, 0x65, 0x6a, 0x2e, 0x3b, 0x6a, 0x75, 0x6e, 0x2e, 0x3b, 0x6a, 0x75, 0x6c,
+0x2e, 0x3b, 0x61, 0x77, 0x67, 0x2e, 0x3b, 0x73, 0x65, 0x70, 0x2e, 0x3b, 0x6f, 0x6b, 0x74, 0x2e, 0x3b, 0x6e, 0x6f, 0x77,
+0x2e, 0x3b, 0x64, 0x65, 0x63, 0x2e, 0x72, 0x61, 0x67, 0x73, 0x3b, 0x77, 0x61, 0x73, 0x73, 0x61, 0x72, 0x69, 0x6e, 0x73,
+0x3b, 0x70, 0x16b, 0x6c, 0x69, 0x73, 0x3b, 0x73, 0x61, 0x6b, 0x6b, 0x69, 0x73, 0x3b, 0x7a, 0x61, 0x6c, 0x6c, 0x61, 0x77,
+0x73, 0x3b, 0x73, 0x12b, 0x6d, 0x65, 0x6e, 0x69, 0x73, 0x3b, 0x6c, 0x12b, 0x70, 0x61, 0x3b, 0x64, 0x61, 0x67, 0x67, 0x69,
+0x73, 0x3b, 0x73, 0x69, 0x6c, 0x6c, 0x69, 0x6e, 0x73, 0x3b, 0x73, 0x70, 0x61, 0x6c, 0x6c, 0x69, 0x6e, 0x73, 0x3b, 0x6c,
+0x61, 0x70, 0x6b, 0x72, 0x16b, 0x74, 0x69, 0x73, 0x3b, 0x73, 0x61, 0x6c, 0x6c, 0x61, 0x77, 0x73, 0x72, 0x61, 0x67, 0x3b,
+0x77, 0x61, 0x73, 0x3b, 0x70, 0x16b, 0x6c, 0x3b, 0x73, 0x61, 0x6b, 0x3b, 0x7a, 0x61, 0x6c, 0x3b, 0x73, 0x12b, 0x6d, 0x3b,
+0x6c, 0x12b, 0x70, 0x3b, 0x64, 0x61, 0x67, 0x3b, 0x73, 0x69, 0x6c, 0x3b, 0x73, 0x70, 0x61, 0x3b, 0x6c, 0x61, 0x70, 0x3b,
+0x73, 0x61, 0x6c, 0x52, 0x3b, 0x57, 0x3b, 0x50, 0x3b, 0x53, 0x3b, 0x5a, 0x3b, 0x53, 0x3b, 0x4c, 0x3b, 0x44, 0x3b, 0x53,
+0x3b, 0x53, 0x3b, 0x4c, 0x3b, 0x53, 0x75, 0x111, 0x111, 0xe2, 0x69, 0x76, 0x65, 0x6d, 0xe1, 0xe1, 0x6e, 0x75, 0x3b, 0x6b,
+0x75, 0x6f, 0x76, 0xe2, 0x6d, 0xe1, 0xe1, 0x6e, 0x75, 0x3b, 0x6e, 0x6a, 0x75, 0x68, 0x10d, 0xe2, 0x6d, 0xe1, 0xe1, 0x6e,
+0x75, 0x3b, 0x63, 0x75, 0xe1, 0x14b, 0x75, 0x69, 0x6d, 0xe1, 0xe1, 0x6e, 0x75, 0x3b, 0x76, 0x79, 0x65, 0x73, 0x69, 0x6d,
+0xe1, 0xe1, 0x6e, 0x75, 0x3b, 0x6b, 0x65, 0x73, 0x69, 0x6d, 0xe1, 0xe1, 0x6e, 0x75, 0x3b, 0x73, 0x79, 0x65, 0x69, 0x6e,
+0x69, 0x6d, 0xe1, 0xe1, 0x6e, 0x75, 0x3b, 0x70, 0x6f, 0x72, 0x67, 0x65, 0x6d, 0xe1, 0xe1, 0x6e, 0x75, 0x3b, 0x10d, 0x6f,
+0x68, 0x10d, 0xe2, 0x6d, 0xe1, 0xe1, 0x6e, 0x75, 0x3b, 0x72, 0x6f, 0x6f, 0x76, 0x76, 0xe2, 0x64, 0x6d, 0xe1, 0xe1, 0x6e,
+0x75, 0x3b, 0x73, 0x6b, 0x61, 0x6d, 0x6d, 0xe2, 0x6d, 0xe1, 0xe1, 0x6e, 0x75, 0x3b, 0x6a, 0x75, 0x6f, 0x76, 0x6c, 0xe2,
+0x6d, 0xe1, 0xe1, 0x6e, 0x75, 0x75, 0x111, 0x69, 0x76, 0x3b, 0x6b, 0x75, 0x6f, 0x76, 0xe2, 0x3b, 0x6e, 0x6a, 0x75, 0x68,
+0x10d, 0xe2, 0x3b, 0x63, 0x75, 0xe1, 0x14b, 0x75, 0x69, 0x3b, 0x76, 0x79, 0x65, 0x73, 0x69, 0x3b, 0x6b, 0x65, 0x73, 0x69,
+0x3b, 0x73, 0x79, 0x65, 0x69, 0x6e, 0x69, 0x3b, 0x70, 0x6f, 0x72, 0x67, 0x65, 0x3b, 0x10d, 0x6f, 0x68, 0x10d, 0xe2, 0x3b,
+0x72, 0x6f, 0x6f, 0x76, 0x76, 0xe2, 0x64, 0x3b, 0x73, 0x6b, 0x61, 0x6d, 0x6d, 0xe2, 0x3b, 0x6a, 0x75, 0x6f, 0x76, 0x6c,
+0xe2, 0x55, 0x3b, 0x4b, 0x3b, 0x4e, 0x4a, 0x3b, 0x43, 0x3b, 0x56, 0x3b, 0x4b, 0x3b, 0x53, 0x3b, 0x50, 0x3b, 0x10c, 0x3b,
+0x52, 0x3b, 0x53, 0x3b, 0x4a, 0x62c, 0x627, 0x646, 0x6a4, 0x6cc, 0x6d5, 0x3b, 0x641, 0x626, 0x6a4, 0x631, 0x6cc, 0x6d5, 0x3b, 0x645,
+0x627, 0x631, 0x633, 0x3b, 0x622, 0x6a4, 0x631, 0x6cc, 0x644, 0x3b, 0x645, 0x626, 0x6cc, 0x3b, 0x62c, 0x648, 0x659, 0x623, 0x646, 0x3b,
+0x62c, 0x648, 0x659, 0x644, 0x627, 0x3b, 0x622, 0x6af, 0x648, 0x633, 0x62a, 0x3b, 0x633, 0x626, 0x67e, 0x62a, 0x627, 0x645, 0x631, 0x3b,
+0x626, 0x648, 0x6a9, 0x62a, 0x648, 0x6a4, 0x631, 0x3b, 0x646, 0x648, 0x6a4, 0x627, 0x645, 0x631, 0x3b, 0x62f, 0x626, 0x633, 0x627, 0x645,
+0x631, 0x45, 0x6e, 0x3b, 0x50, 0x65, 0x62, 0x3b, 0x4d, 0x61, 0x72, 0x3b, 0x41, 0x70, 0x72, 0x3b, 0x4d, 0x61, 0x79, 0x3b,
+0x48, 0x75, 0x6e, 0x3b, 0x48, 0x75, 0x6c, 0x3b, 0x41, 0x67, 0x3b, 0x53, 0x65, 0x74, 0x3b, 0x4f, 0x6b, 0x74, 0x3b, 0x4e,
+0x6f, 0x62, 0x3b, 0x44, 0x69, 0x73, 0x45, 0x3b, 0x50, 0x3b, 0x4d, 0x3b, 0x41, 0x3b, 0x4d, 0x3b, 0x48, 0x3b, 0x48, 0x3b,
+0x41, 0x3b, 0x53, 0x3b, 0x4f, 0x3b, 0x4e, 0x3b, 0x44
 };
 // GENERATED PART ENDS HERE
 
diff --git a/src/corelib/time/qromancalendar_p.h b/src/corelib/time/qromancalendar_p.h
index 49efb3df89..4ba699ffa6 100644
--- a/src/corelib/time/qromancalendar_p.h
+++ b/src/corelib/time/qromancalendar_p.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2019 The Qt Company Ltd.
+** Copyright (C) 2020 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtCore module of the Qt Toolkit.
@@ -68,7 +68,7 @@ public:
 protected:
     // locale support:
     const QCalendarLocale *localeMonthIndexData() const override;
-    const ushort *localeMonthData() const override;
+    const char16_t *localeMonthData() const override;
     // (The INTEGRITY compiler got upset at: using QCalendarBackend:QCalendarBackend;)
     QRomanCalendar(const QString &name, QCalendar::System id = QCalendar::System::User)
         : QCalendarBackend(name, id) {}
diff --git a/src/corelib/tools/qalgorithms.qdoc b/src/corelib/tools/qalgorithms.qdoc
index c86e69f9c3..a4a30cc798 100644
--- a/src/corelib/tools/qalgorithms.qdoc
+++ b/src/corelib/tools/qalgorithms.qdoc
@@ -39,7 +39,7 @@
     on all items in a given container or in a given range.
     You can use these algorithms with any \l {container
     class} that provides STL-style iterators, including Qt's QList,
-    QLinkedList, QVector, QMap, and QHash classes.
+    QVector, QMap, and QHash classes.
 
     Most algorithms take \l {STL-style iterators} as parameters. The
     algorithms are generic in the sense that they aren't bound to a
diff --git a/src/corelib/tools/qarraydata.cpp b/src/corelib/tools/qarraydata.cpp
index 3879b48cbb..497eae1f7f 100644
--- a/src/corelib/tools/qarraydata.cpp
+++ b/src/corelib/tools/qarraydata.cpp
@@ -153,18 +153,16 @@ 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
+    { Q_BASIC_ATOMIC_INITIALIZER(-1), QArrayData::StaticDataFlags, 0 }, // shared null
     /* 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
+static const QArrayData emptyNotNullShared[2] = {
+    { Q_BASIC_ATOMIC_INITIALIZER(-1), QArrayData::StaticDataFlags, 0 }, // shared empty
     /* 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];
+static const QArrayData &qt_array_empty = emptyNotNullShared[0];
 
 static inline size_t calculateBlockSize(size_t &capacity, size_t objectSize, size_t headerSize,
                                         uint options)
@@ -172,7 +170,7 @@ static inline size_t calculateBlockSize(size_t &capacity, size_t objectSize, siz
     // Calculate the byte size
     // allocSize = objectSize * capacity + headerSize, but checked for overflow
     // plus padded to grow in size
-    if (options & QArrayData::Grow) {
+    if (options & QArrayData::GrowsForward) {
         auto r = qCalculateGrowingBlockSize(capacity, objectSize, headerSize);
         capacity = r.elementCount;
         return r.size;
@@ -181,91 +179,104 @@ static inline size_t calculateBlockSize(size_t &capacity, size_t objectSize, siz
     }
 }
 
+static QArrayData *allocateData(size_t allocSize, uint options)
+{
+    QArrayData *header = static_cast<QArrayData *>(::malloc(allocSize));
+    if (header) {
+        header->ref_.storeRelaxed(1);
+        header->flags = options;
+        header->alloc = 0;
+    }
+    return header;
+}
+
 static QArrayData *reallocateData(QArrayData *header, size_t allocSize, uint options)
 {
     header = static_cast<QArrayData *>(::realloc(header, allocSize));
     if (header)
-        header->capacityReserved = bool(options & QArrayData::CapacityReserved);
+        header->flags = options;
     return header;
 }
 
-QArrayData *QArrayData::allocate(size_t objectSize, size_t alignment,
-        size_t capacity, AllocationOptions options) noexcept
+void *QArrayData::allocate(QArrayData **dptr, size_t objectSize, size_t alignment,
+        size_t capacity, ArrayOptions options) noexcept
 {
+    Q_ASSERT(dptr);
     // Alignment is a power of two
-    Q_ASSERT(alignment >= Q_ALIGNOF(QArrayData)
+    Q_ASSERT(alignment >= alignof(QArrayData)
             && !(alignment & (alignment - 1)));
 
-    // Don't allocate empty headers
-    if (!(options & RawData) && !capacity) {
-#if !defined(QT_NO_UNSHARABLE_CONTAINERS)
-        if (options & Unsharable)
-            return const_cast<QArrayData *>(&qt_array_unsharable_empty);
-#endif
-        return const_cast<QArrayData *>(&qt_array_empty);
+    if (capacity == 0) {
+        // optimization for empty headers
+        *dptr = const_cast<QArrayData *>(&qt_array_empty);
+        return sharedNullData();
     }
 
     size_t headerSize = sizeof(QArrayData);
 
-    // Allocate extra (alignment - Q_ALIGNOF(QArrayData)) padding bytes so we
-    // can properly align the data array. This assumes malloc is able to
-    // provide appropriate alignment for the header -- as it should!
-    // Padding is skipped when allocating a header for RawData.
-    if (!(options & RawData))
-        headerSize += (alignment - Q_ALIGNOF(QArrayData));
+    if (alignment > alignof(QArrayData)) {
+        // Allocate extra (alignment - Q_ALIGNOF(QArrayData)) padding bytes so we
+        // can properly align the data array. This assumes malloc is able to
+        // provide appropriate alignment for the header -- as it should!
+        headerSize += alignment - alignof(QArrayData);
+    }
 
     if (headerSize > size_t(MaxAllocSize))
         return nullptr;
 
     size_t allocSize = calculateBlockSize(capacity, objectSize, headerSize, options);
-    QArrayData *header = static_cast<QArrayData *>(::malloc(allocSize));
+    options |= AllocatedDataType | MutableData;
+    options &= ~ImmutableHeader;
+    QArrayData *header = allocateData(allocSize, options);
+    quintptr data = 0;
     if (header) {
-        quintptr data = (quintptr(header) + sizeof(QArrayData) + alignment - 1)
+        // find where offset should point to so that data() is aligned to alignment bytes
+        data = (quintptr(header) + sizeof(QArrayData) + alignment - 1)
                 & ~(alignment - 1);
-
-#if !defined(QT_NO_UNSHARABLE_CONTAINERS)
-        header->ref.atomic.storeRelaxed(bool(!(options & Unsharable)));
-#else
-        header->ref.atomic.storeRelaxed(1);
-#endif
-        header->size = 0;
-        header->alloc = capacity;
-        header->capacityReserved = bool(options & CapacityReserved);
-        header->offset = data - quintptr(header);
+        header->alloc = uint(capacity);
     }
 
+    *dptr = header;
+    return reinterpret_cast<void *>(data);
+}
+
+QArrayData *QArrayData::prepareRawData(ArrayOptions options) Q_DECL_NOTHROW
+{
+    QArrayData *header = allocateData(sizeof(QArrayData), (options & ~DataTypeBits) | RawDataType);
+    if (header)
+        header->alloc = 0;
     return header;
 }
 
-QArrayData *QArrayData::reallocateUnaligned(QArrayData *data, size_t objectSize, size_t capacity,
-                                            AllocationOptions options) noexcept
+QPair<QArrayData *, void *>
+QArrayData::reallocateUnaligned(QArrayData *data, void *dataPointer,
+                                size_t objectSize, size_t capacity, ArrayOptions options) noexcept
 {
     Q_ASSERT(data);
     Q_ASSERT(data->isMutable());
-    Q_ASSERT(!data->ref.isShared());
+    Q_ASSERT(!data->isShared());
 
     size_t headerSize = sizeof(QArrayData);
     size_t allocSize = calculateBlockSize(capacity, objectSize, headerSize, options);
-    QArrayData *header = static_cast<QArrayData *>(reallocateData(data, allocSize, options));
-    if (header)
-        header->alloc = capacity;
-    return header;
+    qptrdiff offset = reinterpret_cast<char *>(dataPointer) - reinterpret_cast<char *>(data);
+    options |= AllocatedDataType | MutableData;
+    QArrayData *header = reallocateData(data, allocSize, options);
+    if (header) {
+        header->alloc = uint(capacity);
+        dataPointer = reinterpret_cast<char *>(header) + offset;
+    }
+    return qMakePair(static_cast<QArrayData *>(header), dataPointer);
 }
 
 void QArrayData::deallocate(QArrayData *data, size_t objectSize,
         size_t alignment) noexcept
 {
     // Alignment is a power of two
-    Q_ASSERT(alignment >= Q_ALIGNOF(QArrayData)
+    Q_ASSERT(alignment >= alignof(QArrayData)
             && !(alignment & (alignment - 1)));
     Q_UNUSED(objectSize) Q_UNUSED(alignment)
 
-#if !defined(QT_NO_UNSHARABLE_CONTAINERS)
-    if (data == &qt_array_unsharable_empty)
-        return;
-#endif
-
-    Q_ASSERT_X(data == nullptr || !data->ref.isStatic(), "QArrayData::deallocate",
+    Q_ASSERT_X(data == nullptr || !data->isStatic(), "QArrayData::deallocate",
                "Static data cannot be deleted");
     ::free(data);
 }
diff --git a/src/corelib/tools/qarraydata.h b/src/corelib/tools/qarraydata.h
index dcd95924c1..483f6d5edb 100644
--- a/src/corelib/tools/qarraydata.h
+++ b/src/corelib/tools/qarraydata.h
@@ -1,6 +1,7 @@
 /****************************************************************************
 **
 ** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2019 Intel Corporation.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtCore module of the Qt Toolkit.
@@ -40,32 +41,64 @@
 #ifndef QARRAYDATA_H
 #define QARRAYDATA_H
 
-#include <QtCore/qrefcount.h>
+#include <QtCore/qpair.h>
+#include <QtCore/qatomic.h>
 #include <string.h>
 
 QT_BEGIN_NAMESPACE
 
+template <class T> struct QTypedArrayData;
+
 struct Q_CORE_EXPORT QArrayData
 {
-    QtPrivate::RefCount ref;
-    int size;
-    uint alloc : 31;
-    uint capacityReserved : 1;
+    enum ArrayOption {
+        RawDataType          = 0x0001,  //!< this class is really a QArrayData
+        AllocatedDataType    = 0x0002,  //!< this class is really a QArrayAllocatedData
+        DataTypeBits         = 0x000f,
+
+        CapacityReserved     = 0x0010,  //!< the capacity was reserved by the user, try to keep it
+        GrowsForward         = 0x0020,  //!< allocate with eyes towards growing through append()
+        GrowsBackwards       = 0x0040,  //!< allocate with eyes towards growing through prepend()
+        MutableData          = 0x0080,  //!< the data can be changed; doesn't say anything about the header
+        ImmutableHeader      = 0x0100,  //!< the header is static, it can't be changed
+
+        /// this option is used by the Q_ARRAY_LITERAL and similar macros
+        StaticDataFlags = RawDataType | ImmutableHeader,
+        /// this option is used by the allocate() function
+        DefaultAllocationFlags = MutableData,
+        /// this option is used by the prepareRawData() function
+        DefaultRawFlags = 0
+    };
+    Q_DECLARE_FLAGS(ArrayOptions, ArrayOption)
 
-    qptrdiff offset; // in bytes from beginning of header
+    QBasicAtomicInt ref_;
+    uint flags;
+    uint alloc;
+
+    inline size_t allocatedCapacity()
+    {
+        return alloc;
+    }
+
+    inline size_t constAllocatedCapacity() const
+    {
+        return alloc;
+    }
 
-    void *data()
+    /// Returns true if sharing took place
+    bool ref()
     {
-        Q_ASSERT(size == 0
-                || offset < 0 || size_t(offset) >= sizeof(QArrayData));
-        return reinterpret_cast<char *>(this) + offset;
+        if (!isStatic())
+            ref_.ref();
+        return true;
     }
 
-    const void *data() const
+    /// Returns false if deallocation is necessary
+    bool deref()
     {
-        Q_ASSERT(size == 0
-                || offset < 0 || size_t(offset) >= sizeof(QArrayData));
-        return reinterpret_cast<const char *>(this) + offset;
+        if (isStatic())
+            return true;
+        return ref_.deref();
     }
 
     // This refers to array data mutability, not "header data" represented by
@@ -73,57 +106,93 @@ struct Q_CORE_EXPORT QArrayData
     // follow COW principles.
     bool isMutable() const
     {
-        return alloc != 0;
+        return flags & MutableData;
     }
 
-    enum AllocationOption {
-        CapacityReserved    = 0x1,
-#if !defined(QT_NO_UNSHARABLE_CONTAINERS)
-        Unsharable          = 0x2,
-#endif
-        RawData             = 0x4,
-        Grow                = 0x8,
+    bool isStatic() const
+    {
+        return flags & ImmutableHeader;
+    }
 
-        Default = 0
-    };
+    bool isShared() const
+    {
+        return ref_.loadRelaxed() != 1;
+    }
 
-    Q_DECLARE_FLAGS(AllocationOptions, AllocationOption)
+    // Returns true if a detach is necessary before modifying the data
+    // This method is intentionally not const: if you want to know whether
+    // detaching is necessary, you should be in a non-const function already
+    bool needsDetach()
+    {
+        // requires two conditionals
+        return !isMutable() || isShared();
+    }
 
     size_t detachCapacity(size_t newSize) const
     {
-        if (capacityReserved && newSize < alloc)
-            return alloc;
+        if (flags & CapacityReserved && newSize < constAllocatedCapacity())
+            return constAllocatedCapacity();
         return newSize;
     }
 
-    AllocationOptions detachFlags() const
+    ArrayOptions detachFlags() const
     {
-        AllocationOptions result;
-        if (capacityReserved)
+        ArrayOptions result = DefaultAllocationFlags;
+        if (flags & CapacityReserved)
             result |= CapacityReserved;
         return result;
     }
 
-    AllocationOptions cloneFlags() const
+    ArrayOptions cloneFlags() const
     {
-        AllocationOptions result;
-        if (capacityReserved)
+        ArrayOptions result = DefaultAllocationFlags;
+        if (flags & CapacityReserved)
             result |= CapacityReserved;
         return result;
     }
 
-    Q_REQUIRED_RESULT static QArrayData *allocate(size_t objectSize, size_t alignment,
-            size_t capacity, AllocationOptions options = Default) noexcept;
+    Q_REQUIRED_RESULT
+#if defined(Q_CC_GNU)
+    __attribute__((__malloc__))
+#endif
+    static void *allocate(QArrayData **pdata, size_t objectSize, size_t alignment,
+            size_t capacity, ArrayOptions options = DefaultAllocationFlags) noexcept;
     Q_REQUIRED_RESULT static QArrayData *reallocateUnaligned(QArrayData *data, size_t objectSize,
-            size_t newCapacity, AllocationOptions newOptions = Default) noexcept;
+            size_t newCapacity, ArrayOptions newOptions = DefaultAllocationFlags) noexcept;
+    Q_REQUIRED_RESULT static QPair<QArrayData *, void *> reallocateUnaligned(QArrayData *data, void *dataPointer,
+            size_t objectSize, size_t newCapacity, ArrayOptions newOptions = DefaultAllocationFlags) Q_DECL_NOTHROW;
+    Q_REQUIRED_RESULT static QArrayData *prepareRawData(ArrayOptions options = ArrayOptions(RawDataType))
+        Q_DECL_NOTHROW;
     static void deallocate(QArrayData *data, size_t objectSize,
             size_t alignment) noexcept;
 
     static const QArrayData shared_null[2];
     static QArrayData *sharedNull() noexcept { return const_cast<QArrayData*>(shared_null); }
+    static void *sharedNullData()
+    {
+        QArrayData *const null = const_cast<QArrayData *>(&shared_null[1]);
+        return null;
+    }
+};
+
+Q_DECLARE_OPERATORS_FOR_FLAGS(QArrayData::ArrayOptions)
+
+template <class T, size_t N>
+struct QStaticArrayData
+{
+    // static arrays are of type RawDataType
+    QArrayData header;
+    T data[N];
 };
 
-Q_DECLARE_OPERATORS_FOR_FLAGS(QArrayData::AllocationOptions)
+// Support for returning QArrayDataPointer<T> from functions
+template <class T>
+struct QArrayDataPointerRef
+{
+    QTypedArrayData<T> *ptr;
+    T *data;
+    uint size;
+};
 
 template <class T>
 struct QTypedArrayData
@@ -205,51 +274,45 @@ struct QTypedArrayData
     typedef const T* const_iterator;
 #endif
 
-    T *data() { return static_cast<T *>(QArrayData::data()); }
-    const T *data() const { return static_cast<const T *>(QArrayData::data()); }
-
-    iterator begin(iterator = iterator()) { return data(); }
-    iterator end(iterator = iterator()) { return data() + size; }
-    const_iterator begin(const_iterator = const_iterator()) const { return data(); }
-    const_iterator end(const_iterator = const_iterator()) const { return data() + size; }
-    const_iterator constBegin(const_iterator = const_iterator()) const { return data(); }
-    const_iterator constEnd(const_iterator = const_iterator()) const { return data() + size; }
-
     class AlignmentDummy { QArrayData header; T data; };
 
-    Q_REQUIRED_RESULT static QTypedArrayData *allocate(size_t capacity,
-            AllocationOptions options = Default)
+    Q_REQUIRED_RESULT static QPair<QTypedArrayData *, T *> allocate(size_t capacity,
+            ArrayOptions options = DefaultAllocationFlags)
     {
         Q_STATIC_ASSERT(sizeof(QTypedArrayData) == sizeof(QArrayData));
-        return static_cast<QTypedArrayData *>(QArrayData::allocate(sizeof(T),
-                    Q_ALIGNOF(AlignmentDummy), capacity, options));
+        QArrayData *d;
+        void *result = QArrayData::allocate(&d, sizeof(T), alignof(AlignmentDummy), capacity, options);
+#if (defined(Q_CC_GNU) && Q_CC_GNU >= 407) || QT_HAS_BUILTIN(__builtin_assume_aligned)
+        result = __builtin_assume_aligned(result, Q_ALIGNOF(AlignmentDummy));
+#endif
+        return qMakePair(static_cast<QTypedArrayData *>(d), static_cast<T *>(result));
     }
 
-    static QTypedArrayData *reallocateUnaligned(QTypedArrayData *data, size_t capacity,
-            AllocationOptions options = Default)
+    static QPair<QTypedArrayData *, T *>
+    reallocateUnaligned(QTypedArrayData *data, T *dataPointer, size_t capacity,
+            ArrayOptions options = DefaultAllocationFlags)
     {
         Q_STATIC_ASSERT(sizeof(QTypedArrayData) == sizeof(QArrayData));
-        return static_cast<QTypedArrayData *>(QArrayData::reallocateUnaligned(data, sizeof(T),
-                    capacity, options));
+        QPair<QArrayData *, void *> pair =
+                QArrayData::reallocateUnaligned(data, dataPointer, sizeof(T), capacity, options);
+        return qMakePair(static_cast<QTypedArrayData *>(pair.first), static_cast<T *>(pair.second));
     }
 
     static void deallocate(QArrayData *data)
     {
         Q_STATIC_ASSERT(sizeof(QTypedArrayData) == sizeof(QArrayData));
-        QArrayData::deallocate(data, sizeof(T), Q_ALIGNOF(AlignmentDummy));
+        QArrayData::deallocate(data, sizeof(T), alignof(AlignmentDummy));
     }
 
-    static QTypedArrayData *fromRawData(const T *data, size_t n,
-            AllocationOptions options = Default)
+    static QArrayDataPointerRef<T> fromRawData(const T *data, size_t n,
+            ArrayOptions options = DefaultRawFlags)
     {
         Q_STATIC_ASSERT(sizeof(QTypedArrayData) == sizeof(QArrayData));
-        QTypedArrayData *result = allocate(0, options | RawData);
-        if (result) {
-            Q_ASSERT(!result->ref.isShared()); // No shared empty, please!
-
-            result->offset = reinterpret_cast<const char *>(data)
-                - reinterpret_cast<const char *>(result);
-            result->size = int(n);
+        QArrayDataPointerRef<T> result = {
+            static_cast<QTypedArrayData *>(prepareRawData(options)), const_cast<T *>(data), uint(n)
+        };
+        if (result.ptr) {
+            Q_ASSERT(!result.ptr->isShared()); // No shared empty, please!
         }
         return result;
     }
@@ -266,38 +329,13 @@ struct QTypedArrayData
         return allocate(/* capacity */ 0);
     }
 
-#if !defined(QT_NO_UNSHARABLE_CONTAINERS)
-    static QTypedArrayData *unsharableEmpty()
+    static T *sharedNullData()
     {
         Q_STATIC_ASSERT(sizeof(QTypedArrayData) == sizeof(QArrayData));
-        return allocate(/* capacity */ 0, Unsharable);
+        return static_cast<T *>(QArrayData::sharedNullData());
     }
-#endif
-};
-
-template <class T, size_t N>
-struct QStaticArrayData
-{
-    QArrayData header;
-    T data[N];
-};
-
-// Support for returning QArrayDataPointer<T> from functions
-template <class T>
-struct QArrayDataPointerRef
-{
-    QTypedArrayData<T> *ptr;
 };
 
-#define Q_STATIC_ARRAY_DATA_HEADER_INITIALIZER_WITH_OFFSET(size, offset) \
-    { Q_REFCOUNT_INITIALIZE_STATIC, size, 0, 0, offset } \
-    /**/
-
-#define Q_STATIC_ARRAY_DATA_HEADER_INITIALIZER(type, size) \
-    Q_STATIC_ARRAY_DATA_HEADER_INITIALIZER_WITH_OFFSET(size,\
-        ((sizeof(QArrayData) + (Q_ALIGNOF(type) - 1)) & ~(Q_ALIGNOF(type) - 1) )) \
-    /**/
-
 ////////////////////////////////////////////////////////////////////////////////
 //  Q_ARRAY_LITERAL
 
@@ -333,15 +371,16 @@ struct QArrayDataPointerRef
     Q_ARRAY_LITERAL_CHECK_LITERAL_TYPE(Type);                                   \
                                                                                 \
     /* Portable compile-time array size computation */                          \
-    Q_CONSTEXPR Type data[] = { __VA_ARGS__ }; Q_UNUSED(data);                  \
+    static Type const data[] = { __VA_ARGS__ };                                 \
     enum { Size = sizeof(data) / sizeof(data[0]) };                             \
                                                                                 \
-    static const QStaticArrayData<Type, Size> literal = {                       \
-        Q_STATIC_ARRAY_DATA_HEADER_INITIALIZER(Type, Size), { __VA_ARGS__ } };  \
+    static const QArrayData literal = { Q_BASIC_ATOMIC_INITIALIZER(-1), QArrayData::StaticDataFlags, 0 };          \
                                                                                 \
     QArrayDataPointerRef<Type> ref =                                            \
         { static_cast<QTypedArrayData<Type> *>(                                 \
-            const_cast<QArrayData *>(&literal.header)) };                       \
+            const_cast<QArrayData *>(&literal)),                                \
+          const_cast<Type *>(data),                                             \
+          Size };                                                               \
     /**/
 
 namespace QtPrivate {
diff --git a/src/corelib/tools/qarraydataops.h b/src/corelib/tools/qarraydataops.h
index 8e19525f07..1d74f49993 100644
--- a/src/corelib/tools/qarraydataops.h
+++ b/src/corelib/tools/qarraydataops.h
@@ -1,6 +1,7 @@
 /****************************************************************************
 **
 ** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2016 Intel Corporation.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtCore module of the Qt Toolkit.
@@ -41,12 +42,15 @@
 #define QARRAYDATAOPS_H
 
 #include <QtCore/qarraydata.h>
+#include <QtCore/qcontainertools_impl.h>
 
 #include <new>
 #include <string.h>
 
 QT_BEGIN_NAMESPACE
 
+template <class T> struct QArrayDataPointer;
+
 namespace QtPrivate {
 
 QT_WARNING_PUSH
@@ -56,48 +60,70 @@ QT_WARNING_DISABLE_GCC("-Wstringop-overflow")
 
 template <class T>
 struct QPodArrayOps
-    : QTypedArrayData<T>
+        : public QArrayDataPointer<T>
 {
+    typedef typename QArrayDataPointer<T>::parameter_type parameter_type;
+
     void appendInitialize(size_t newSize)
     {
         Q_ASSERT(this->isMutable());
-        Q_ASSERT(!this->ref.isShared());
+        Q_ASSERT(!this->isShared());
         Q_ASSERT(newSize > uint(this->size));
-        Q_ASSERT(newSize <= this->alloc);
+        Q_ASSERT(newSize <= this->allocatedCapacity());
 
         ::memset(static_cast<void *>(this->end()), 0, (newSize - this->size) * sizeof(T));
         this->size = int(newSize);
     }
 
+    template<typename iterator>
+    void copyAppend(iterator b, iterator e, QtPrivate::IfIsForwardIterator<iterator> = true)
+    {
+        Q_ASSERT(this->isMutable() || b == e);
+        Q_ASSERT(!this->isShared() || b == e);
+        Q_ASSERT(std::distance(b, e) >= 0 && size_t(std::distance(b, e)) <= this->allocatedCapacity() - this->size);
+
+        T *iter = this->end();
+        for (; b != e; ++iter, ++b) {
+            new (iter) T(*b);
+            ++this->size;
+        }
+    }
+
     void copyAppend(const T *b, const T *e)
     {
-        Q_ASSERT(this->isMutable());
-        Q_ASSERT(!this->ref.isShared());
-        Q_ASSERT(b < e);
-        Q_ASSERT(size_t(e - b) <= this->alloc - uint(this->size));
+        Q_ASSERT(this->isMutable() || b == e);
+        Q_ASSERT(!this->isShared() || b == e);
+        Q_ASSERT(b <= e);
+        Q_ASSERT(size_t(e - b) <= this->allocatedCapacity() - this->size);
 
         ::memcpy(static_cast<void *>(this->end()), static_cast<const void *>(b),
                  (e - b) * sizeof(T));
         this->size += e - b;
     }
 
-    void copyAppend(size_t n, const T &t)
+    void moveAppend(T *b, T *e)
+    { copyAppend(b, e); }
+
+    void copyAppend(size_t n, parameter_type t)
     {
-        Q_ASSERT(this->isMutable());
-        Q_ASSERT(!this->ref.isShared());
-        Q_ASSERT(n <= this->alloc - uint(this->size));
+        Q_ASSERT(this->isMutable() || n == 0);
+        Q_ASSERT(!this->isShared() || n == 0);
+        Q_ASSERT(n <= uint(this->allocatedCapacity() - this->size));
 
         T *iter = this->end();
         const T *const end = iter + n;
         for (; iter != end; ++iter)
-            ::memcpy(iter, &t, sizeof(T));
+            *iter = t;
         this->size += int(n);
     }
 
+    template <typename ...Args>
+    void emplaceBack(Args&&... args) { this->emplace(this->end(), T(std::forward<Args>(args)...)); }
+
     void truncate(size_t newSize)
     {
         Q_ASSERT(this->isMutable());
-        Q_ASSERT(!this->ref.isShared());
+        Q_ASSERT(!this->isShared());
         Q_ASSERT(newSize < size_t(this->size));
 
         this->size = int(newSize);
@@ -106,7 +132,7 @@ struct QPodArrayOps
     void destroyAll() // Call from destructors, ONLY!
     {
         Q_ASSERT(this->isMutable());
-        Q_ASSERT(this->ref.atomic.loadRelaxed() == 0);
+        Q_ASSERT(this->d->ref_.loadRelaxed() == 0);
 
         // As this is to be called only from destructor, it doesn't need to be
         // exception safe; size not updated.
@@ -115,11 +141,11 @@ struct QPodArrayOps
     void insert(T *where, const T *b, const T *e)
     {
         Q_ASSERT(this->isMutable());
-        Q_ASSERT(!this->ref.isShared());
+        Q_ASSERT(!this->isShared());
         Q_ASSERT(where >= this->begin() && where < this->end()); // Use copyAppend at end
-        Q_ASSERT(b < e);
+        Q_ASSERT(b <= e);
         Q_ASSERT(e <= where || b > this->end()); // No overlap
-        Q_ASSERT(size_t(e - b) <= this->alloc - uint(this->size));
+        Q_ASSERT(size_t(e - b) <= this->allocatedCapacity() - this->size);
 
         ::memmove(static_cast<void *>(where + (e - b)), static_cast<void *>(where),
                   (static_cast<const T*>(this->end()) - where) * sizeof(T));
@@ -127,43 +153,109 @@ struct QPodArrayOps
         this->size += (e - b);
     }
 
+    void insert(T *where, size_t n, parameter_type t)
+    {
+        Q_ASSERT(!this->isShared());
+        Q_ASSERT(where >= this->begin() && where < this->end()); // Use copyAppend at end
+        Q_ASSERT(this->allocatedCapacity() - this->size >= n);
+
+        ::memmove(static_cast<void *>(where + n), static_cast<void *>(where),
+                  (static_cast<const T*>(this->end()) - where) * sizeof(T));
+        this->size += int(n); // PODs can't throw on copy
+        while (n--)
+            *where++ = t;
+    }
+
+    template <typename ...Args>
+    void createInPlace(T *where, Args&&... args) { new (where) T(std::forward<Args>(args)...); }
+
+    template <typename ...Args>
+    void emplace(T *where, Args&&... args)
+    {
+        Q_ASSERT(!this->isShared());
+        Q_ASSERT(where >= this->begin() && where <= this->end());
+        Q_ASSERT(this->allocatedCapacity() - this->size >= 1);
+
+        if (where == this->end()) {
+            new (this->end()) T(std::forward<Args>(args)...);
+        } else {
+            // Preserve the value, because it might be a reference to some part of the moved chunk
+            T t(std::forward<Args>(args)...);
+
+            ::memmove(static_cast<void *>(where + 1), static_cast<void *>(where),
+                      (static_cast<const T*>(this->end()) - where) * sizeof(T));
+            *where = t;
+        }
+
+        ++this->size;
+    }
+
+
     void erase(T *b, T *e)
     {
         Q_ASSERT(this->isMutable());
         Q_ASSERT(b < e);
         Q_ASSERT(b >= this->begin() && b < this->end());
-        Q_ASSERT(e > this->begin() && e < this->end());
+        Q_ASSERT(e > this->begin() && e <= this->end());
 
         ::memmove(static_cast<void *>(b), static_cast<void *>(e),
                   (static_cast<T *>(this->end()) - e) * sizeof(T));
         this->size -= (e - b);
     }
+
+    void assign(T *b, T *e, parameter_type t)
+    {
+        Q_ASSERT(b <= e);
+        Q_ASSERT(b >= this->begin() && e <= this->end());
+
+        while (b != e)
+            ::memcpy(static_cast<void *>(b++), static_cast<const void *>(&t), sizeof(T));
+    }
+
+    bool compare(const T *begin1, const T *begin2, size_t n) const
+    {
+        // only use memcmp for fundamental types or pointers.
+        // Other types could have padding in the data structure or custom comparison
+        // operators that would break the comparison using memcmp
+        if (QArrayDataPointer<T>::pass_parameter_by_value)
+            return ::memcmp(begin1, begin2, n * sizeof(T)) == 0;
+        const T *end1 = begin1 + n;
+        while (begin1 != end1) {
+            if (*begin1 == *begin2)
+                ++begin1, ++begin2;
+            else
+                return false;
+        }
+        return true;
+    }
 };
 QT_WARNING_POP
 
 template <class T>
 struct QGenericArrayOps
-    : QTypedArrayData<T>
+        : public QArrayDataPointer<T>
 {
+    typedef typename QArrayDataPointer<T>::parameter_type parameter_type;
+
     void appendInitialize(size_t newSize)
     {
         Q_ASSERT(this->isMutable());
-        Q_ASSERT(!this->ref.isShared());
+        Q_ASSERT(!this->isShared());
         Q_ASSERT(newSize > uint(this->size));
-        Q_ASSERT(newSize <= this->alloc);
+        Q_ASSERT(newSize <= this->allocatedCapacity());
 
-        T *const begin = this->begin();
+        T *const b = this->begin();
         do {
-            new (begin + this->size) T;
+            new (b + this->size) T;
         } while (uint(++this->size) != newSize);
     }
 
-    void copyAppend(const T *b, const T *e)
+    template<typename iterator>
+    void copyAppend(iterator b, iterator e, QtPrivate::IfIsForwardIterator<iterator> = true)
     {
-        Q_ASSERT(this->isMutable());
-        Q_ASSERT(!this->ref.isShared());
-        Q_ASSERT(b < e);
-        Q_ASSERT(size_t(e - b) <= this->alloc - uint(this->size));
+        Q_ASSERT(this->isMutable() || b == e);
+        Q_ASSERT(!this->isShared() || b == e);
+        Q_ASSERT(std::distance(b, e) >= 0 && size_t(std::distance(b, e)) <= this->allocatedCapacity() - this->size);
 
         T *iter = this->end();
         for (; b != e; ++iter, ++b) {
@@ -172,11 +264,37 @@ struct QGenericArrayOps
         }
     }
 
-    void copyAppend(size_t n, const T &t)
+    void copyAppend(const T *b, const T *e)
     {
-        Q_ASSERT(this->isMutable());
-        Q_ASSERT(!this->ref.isShared());
-        Q_ASSERT(n <= this->alloc - uint(this->size));
+        Q_ASSERT(this->isMutable() || b == e);
+        Q_ASSERT(!this->isShared() || b == e);
+        Q_ASSERT(std::distance(b, e) >= 0 && size_t(std::distance(b, e)) <= this->allocatedCapacity() - this->size);
+
+        T *iter = this->end();
+        this->size += e - b;
+        for (; b != e; ++iter, ++b)
+            new (iter) T(*b);
+    }
+
+    void moveAppend(T *b, T *e)
+    {
+        Q_ASSERT(this->isMutable() || b == e);
+        Q_ASSERT(!this->isShared() || b == e);
+        Q_ASSERT(b <= e);
+        Q_ASSERT(size_t(e - b) <= this->allocatedCapacity() - this->size);
+
+        T *iter = this->end();
+        for (; b != e; ++iter, ++b) {
+            new (iter) T(std::move(*b));
+            ++this->size;
+        }
+    }
+
+    void copyAppend(size_t n, parameter_type t)
+    {
+        Q_ASSERT(this->isMutable() || n == 0);
+        Q_ASSERT(!this->isShared() || n == 0);
+        Q_ASSERT(n <= size_t(this->allocatedCapacity() - this->size));
 
         T *iter = this->end();
         const T *const end = iter + n;
@@ -186,10 +304,16 @@ struct QGenericArrayOps
         }
     }
 
+    template <typename ...Args>
+    void emplaceBack(Args&&... args)
+    {
+        this->emplace(this->end(), std::forward<Args>(args)...);
+    }
+
     void truncate(size_t newSize)
     {
         Q_ASSERT(this->isMutable());
-        Q_ASSERT(!this->ref.isShared());
+        Q_ASSERT(!this->isShared());
         Q_ASSERT(newSize < size_t(this->size));
 
         const T *const b = this->begin();
@@ -204,7 +328,7 @@ struct QGenericArrayOps
         // As this is to be called only from destructor, it doesn't need to be
         // exception safe; size not updated.
 
-        Q_ASSERT(this->ref.atomic.loadRelaxed() == 0);
+        Q_ASSERT(this->d->ref_.loadRelaxed() == 0);
 
         const T *const b = this->begin();
         const T *i = this->end();
@@ -216,11 +340,11 @@ struct QGenericArrayOps
     void insert(T *where, const T *b, const T *e)
     {
         Q_ASSERT(this->isMutable());
-        Q_ASSERT(!this->ref.isShared());
+        Q_ASSERT(!this->isShared());
         Q_ASSERT(where >= this->begin() && where < this->end()); // Use copyAppend at end
-        Q_ASSERT(b < e);
+        Q_ASSERT(b <= e);
         Q_ASSERT(e <= where || b > this->end()); // No overlap
-        Q_ASSERT(size_t(e - b) <= this->alloc - uint(this->size));
+        Q_ASSERT(size_t(e - b) <= this->allocatedCapacity() - this->size);
 
         // Array may be truncated at where in case of exceptions
 
@@ -279,25 +403,128 @@ struct QGenericArrayOps
         }
     }
 
+    void insert(T *where, size_t n, parameter_type t)
+    {
+        Q_ASSERT(!this->isShared());
+        Q_ASSERT(where >= this->begin() && where <= this->end());
+        Q_ASSERT(this->allocatedCapacity() - this->size >= n);
+
+        // Array may be truncated at where in case of exceptions
+        T *const end = this->end();
+        const T *readIter = end;
+        T *writeIter = end + n;
+
+        const T *const step1End = where + qMax<size_t>(n, end - where);
+
+        struct Destructor
+        {
+            Destructor(T *&it)
+                : iter(&it)
+                , end(it)
+            {
+            }
+
+            void commit()
+            {
+                iter = &end;
+            }
+
+            ~Destructor()
+            {
+                for (; *iter != end; --*iter)
+                    (*iter)->~T();
+            }
+
+            T **iter;
+            T *end;
+        } destroyer(writeIter);
+
+        // Construct new elements in array
+        do {
+            --readIter, --writeIter;
+            new (writeIter) T(*readIter);
+        } while (writeIter != step1End);
+
+        while (writeIter != end) {
+            --n, --writeIter;
+            new (writeIter) T(t);
+        }
+
+        destroyer.commit();
+        this->size += destroyer.end - end;
+
+        // Copy assign over existing elements
+        while (readIter != where) {
+            --readIter, --writeIter;
+            *writeIter = *readIter;
+        }
+
+        while (writeIter != where) {
+            --n, --writeIter;
+            *writeIter = t;
+        }
+    }
+
+    template <typename ...Args>
+    void createInPlace(T *where, Args&&... args) { new (where) T(std::forward<Args>(args)...); }
+
+    template <typename iterator, typename ...Args>
+    void emplace(iterator where, Args&&... args)
+    {
+        Q_ASSERT(!this->isShared());
+        Q_ASSERT(where >= this->begin() && where <= this->end());
+        Q_ASSERT(this->allocatedCapacity() - this->size >= 1);
+
+        createInPlace(this->end(), std::forward<Args>(args)...);
+        ++this->size;
+
+        std::rotate(where, this->end() - 1, this->end());
+    }
+
     void erase(T *b, T *e)
     {
         Q_ASSERT(this->isMutable());
         Q_ASSERT(b < e);
         Q_ASSERT(b >= this->begin() && b < this->end());
-        Q_ASSERT(e > this->begin() && e < this->end());
+        Q_ASSERT(e > this->begin() && e <= this->end());
 
         const T *const end = this->end();
 
-        do {
+        // move (by assignment) the elements from e to end
+        // onto b to the new end
+        while (e != end) {
             *b = *e;
             ++b, ++e;
-        } while (e != end);
+        }
 
+        // destroy the final elements at the end
+        // here, b points to the new end and e to the actual end
         do {
             (--e)->~T();
             --this->size;
         } while (e != b);
     }
+
+    void assign(T *b, T *e, parameter_type t)
+    {
+        Q_ASSERT(b <= e);
+        Q_ASSERT(b >= this->begin() && e <= this->end());
+
+        while (b != e)
+            *b++ = t;
+    }
+
+    bool compare(const T *begin1, const T *begin2, size_t n) const
+    {
+        const T *end1 = begin1 + n;
+        while (begin1 != end1) {
+            if (*begin1 == *begin2)
+                ++begin1, ++begin2;
+            else
+                return false;
+        }
+        return true;
+    }
 };
 
 template <class T>
@@ -308,15 +535,16 @@ struct QMovableArrayOps
     // using QGenericArrayOps<T>::copyAppend;
     // using QGenericArrayOps<T>::truncate;
     // using QGenericArrayOps<T>::destroyAll;
+    typedef typename QGenericArrayOps<T>::parameter_type parameter_type;
 
     void insert(T *where, const T *b, const T *e)
     {
         Q_ASSERT(this->isMutable());
-        Q_ASSERT(!this->ref.isShared());
+        Q_ASSERT(!this->isShared());
         Q_ASSERT(where >= this->begin() && where < this->end()); // Use copyAppend at end
-        Q_ASSERT(b < e);
+        Q_ASSERT(b <= e);
         Q_ASSERT(e <= where || b > this->end()); // No overlap
-        Q_ASSERT(size_t(e - b) <= this->alloc - uint(this->size));
+        Q_ASSERT(size_t(e - b) <= this->allocatedCapacity() - this->size);
 
         // Provides strong exception safety guarantee,
         // provided T::~T() nothrow
@@ -376,12 +604,79 @@ struct QMovableArrayOps
         this->size += (e - b);
     }
 
+    void insert(T *where, size_t n, parameter_type t)
+    {
+        Q_ASSERT(!this->isShared());
+        Q_ASSERT(where >= this->begin() && where <= this->end());
+        Q_ASSERT(this->allocatedCapacity() - this->size >= n);
+
+        // Provides strong exception safety guarantee,
+        // provided T::~T() nothrow
+
+        struct ReversibleDisplace
+        {
+            ReversibleDisplace(T *start, T *finish, size_t diff)
+                : begin(start)
+                , end(finish)
+                , displace(diff)
+            {
+                ::memmove(static_cast<void *>(begin + displace), static_cast<void *>(begin),
+                          (end - begin) * sizeof(T));
+            }
+
+            void commit() { displace = 0; }
+
+            ~ReversibleDisplace()
+            {
+                if (displace)
+                    ::memmove(static_cast<void *>(begin), static_cast<void *>(begin + displace),
+                              (end - begin) * sizeof(T));
+            }
+
+            T *const begin;
+            T *const end;
+            size_t displace;
+
+        } displace(where, this->end(), n);
+
+        struct CopyConstructor
+        {
+            CopyConstructor(T *w) : where(w) {}
+
+            void copy(size_t count, parameter_type proto)
+            {
+                n = 0;
+                while (count--) {
+                    new (where + n) T(proto);
+                    ++n;
+                }
+                n = 0;
+            }
+
+            ~CopyConstructor()
+            {
+                while (n)
+                    where[--n].~T();
+            }
+
+            T *const where;
+            size_t n;
+        } copier(where);
+
+        copier.copy(n, t);
+        displace.commit();
+        this->size += int(n);
+    }
+
+    // use moving insert
+    using QGenericArrayOps<T>::insert;
+
     void erase(T *b, T *e)
     {
         Q_ASSERT(this->isMutable());
         Q_ASSERT(b < e);
         Q_ASSERT(b >= this->begin() && b < this->end());
-        Q_ASSERT(e > this->begin() && e < this->end());
+        Q_ASSERT(e > this->begin() && e <= this->end());
 
         struct Mover
         {
@@ -405,11 +700,51 @@ struct QMovableArrayOps
             int &size;
         } mover(e, this->end(), this->size);
 
+        // destroy the elements we're erasing
         do {
             // Exceptions or not, dtor called once per instance
             (--e)->~T();
         } while (e != b);
     }
+
+    void moveAppend(T *b, T *e)
+    {
+        Q_ASSERT(this->isMutable());
+        Q_ASSERT(!this->isShared());
+        Q_ASSERT(b <= e);
+        Q_ASSERT(e <= this->begin() || b > this->end()); // No overlap
+        Q_ASSERT(size_t(e - b) <= this->allocatedCapacity() - this->size);
+
+        // Provides strong exception safety guarantee,
+        // provided T::~T() nothrow
+
+        struct CopyConstructor
+        {
+            CopyConstructor(T *w) : where(w) {}
+
+            void copy(T *src, const T *const srcEnd)
+            {
+                n = 0;
+                for (; src != srcEnd; ++src) {
+                    new (where + n) T(std::move(*src));
+                    ++n;
+                }
+                n = 0;
+            }
+
+            ~CopyConstructor()
+            {
+                while (n)
+                    where[--n].~T();
+            }
+
+            T *const where;
+            size_t n;
+        } copier(this->end());
+
+        copier.copy(b, e);
+        this->size += (e - b);
+    }
 };
 
 template <class T, class = void>
diff --git a/src/corelib/tools/qarraydatapointer.h b/src/corelib/tools/qarraydatapointer.h
index af5173c9ad..a17cf4a101 100644
--- a/src/corelib/tools/qarraydatapointer.h
+++ b/src/corelib/tools/qarraydatapointer.h
@@ -41,6 +41,7 @@
 #define QARRAYDATAPOINTER_H
 
 #include <QtCore/qarraydataops.h>
+#include <QtCore/qcontainertools_impl.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -52,30 +53,40 @@ private:
     typedef QArrayDataOps<T> DataOps;
 
 public:
+    typedef typename Data::iterator iterator;
+    typedef typename Data::const_iterator const_iterator;
+    enum { pass_parameter_by_value = std::is_fundamental<T>::value || std::is_pointer<T>::value };
+
+    typedef typename std::conditional<pass_parameter_by_value, T, const T &>::type parameter_type;
+
     QArrayDataPointer() noexcept
-        : d(Data::sharedNull())
+        : d(Data::sharedNull()), ptr(Data::sharedNullData()), size(0)
     {
     }
 
-    QArrayDataPointer(const QArrayDataPointer &other)
-        : d(other.d->ref.ref()
-            ? other.d
-            : other.clone(other.d->cloneFlags()))
+    QArrayDataPointer(const QArrayDataPointer &other) noexcept
+        : d(other.d), ptr(other.ptr), size(other.size)
     {
+        other.d->ref();
     }
 
-    explicit QArrayDataPointer(QTypedArrayData<T> *ptr)
-        : d(ptr)
+    QArrayDataPointer(Data *header, T *adata, size_t n = 0) noexcept
+        : d(header), ptr(adata), size(int(n))
     {
-        Q_CHECK_PTR(ptr);
     }
 
-    QArrayDataPointer(QArrayDataPointerRef<T> ref)
-        : d(ref.ptr)
+    explicit QArrayDataPointer(QPair<QTypedArrayData<T> *, T *> adata, size_t n = 0)
+        : d(adata.first), ptr(adata.second), size(int(n))
     {
+        Q_CHECK_PTR(d);
     }
 
-    QArrayDataPointer &operator=(const QArrayDataPointer &other)
+    QArrayDataPointer(QArrayDataPointerRef<T> dd) noexcept
+        : d(dd.ptr), ptr(dd.data), size(dd.size)
+    {
+    }
+
+    QArrayDataPointer &operator=(const QArrayDataPointer &other) noexcept
     {
         QArrayDataPointer tmp(other);
         this->swap(tmp);
@@ -83,9 +94,11 @@ public:
     }
 
     QArrayDataPointer(QArrayDataPointer &&other) noexcept
-        : d(other.d)
+        : d(other.d), ptr(other.ptr), size(other.size)
     {
         other.d = Data::sharedNull();
+        other.ptr = Data::sharedNullData();
+        other.size = 0;
     }
 
     QArrayDataPointer &operator=(QArrayDataPointer &&other) noexcept
@@ -95,114 +108,142 @@ public:
         return *this;
     }
 
-    DataOps &operator*() const
+    DataOps &operator*() noexcept
     {
         Q_ASSERT(d);
-        return *static_cast<DataOps *>(d);
+        return *static_cast<DataOps *>(this);
     }
 
-    DataOps *operator->() const
+    DataOps *operator->() noexcept
     {
         Q_ASSERT(d);
-        return static_cast<DataOps *>(d);
+        return static_cast<DataOps *>(this);
     }
 
-    ~QArrayDataPointer()
+    const DataOps &operator*() const noexcept
     {
-        if (!d->ref.deref()) {
-            if (d->isMutable())
-                (*this)->destroyAll();
-            Data::deallocate(d);
-        }
+        Q_ASSERT(d);
+        return *static_cast<const DataOps *>(this);
     }
 
-    bool isNull() const
+    const DataOps *operator->() const noexcept
     {
-        return d == Data::sharedNull();
+        Q_ASSERT(d);
+        return static_cast<const DataOps *>(this);
     }
 
-    Data *data() const
+    ~QArrayDataPointer()
     {
-        return d;
+        if (!deref()) {
+            if (isMutable())
+                (*this)->destroyAll();
+            Data::deallocate(d);
+        }
     }
 
-    bool needsDetach() const
+    bool isNull() const noexcept
     {
-        return (!d->isMutable() || d->ref.isShared());
+        return d == Data::sharedNull();
     }
 
-#if !defined(QT_NO_UNSHARABLE_CONTAINERS)
-    void setSharable(bool sharable)
-    {
-        if (needsDetach()) {
-            Data *detached = clone(sharable
-                    ? d->detachFlags() & ~QArrayData::Unsharable
-                    : d->detachFlags() | QArrayData::Unsharable);
-            QArrayDataPointer old(d);
-            d = detached;
-        } else {
-            d->ref.setSharable(sharable);
-        }
-    }
+    T *data() noexcept { return ptr; }
+    const T *data() const noexcept { return ptr; }
 
-    bool isSharable() const { return d->isSharable(); }
-#endif
+    iterator begin(iterator = iterator()) noexcept { return data(); }
+    iterator end(iterator = iterator()) noexcept { return data() + size; }
+    const_iterator begin(const_iterator = const_iterator()) const noexcept { return data(); }
+    const_iterator end(const_iterator = const_iterator()) const noexcept { return data() + size; }
+    const_iterator constBegin(const_iterator = const_iterator()) const noexcept { return data(); }
+    const_iterator constEnd(const_iterator = const_iterator()) const noexcept { return data() + size; }
 
     void swap(QArrayDataPointer &other) noexcept
     {
         qSwap(d, other.d);
+        qSwap(ptr, other.ptr);
+        qSwap(size, other.size);
     }
 
-    void clear()
+    void clear() Q_DECL_NOEXCEPT_EXPR(std::is_nothrow_destructible<T>::value)
     {
-        QArrayDataPointer tmp(d);
-        d = Data::sharedNull();
+        QArrayDataPointer tmp;
+        swap(tmp);
     }
 
     bool detach()
     {
-        if (needsDetach()) {
-            Data *copy = clone(d->detachFlags());
-            QArrayDataPointer old(d);
-            d = copy;
+        if (d->needsDetach()) {
+            QPair<Data *, T *> copy = clone(d->detachFlags());
+            QArrayDataPointer old(d, ptr, size);
+            d = copy.first;
+            ptr = copy.second;
             return true;
         }
 
         return false;
     }
 
-private:
-    Q_REQUIRED_RESULT Data *clone(QArrayData::AllocationOptions options) const
+    // forwards from QArrayData
+    size_t allocatedCapacity() noexcept { return d->allocatedCapacity(); }
+    size_t constAllocatedCapacity() const noexcept { return d->constAllocatedCapacity(); }
+    int refCounterValue() const noexcept { return d->refCounterValue(); }
+    bool ref() noexcept { return d->ref(); }
+    bool deref() noexcept { return d->deref(); }
+    bool isMutable() const noexcept { return d->isMutable(); }
+    bool isStatic() const noexcept { return d->isStatic(); }
+    bool isShared() const noexcept { return d->isShared(); }
+    bool isSharedWith(const QArrayDataPointer &other) const noexcept { return d && d == other.d; }
+    bool needsDetach() const noexcept { return d->needsDetach(); }
+    size_t detachCapacity(size_t newSize) const noexcept { return d->detachCapacity(newSize); }
+    typename Data::ArrayOptions &flags() noexcept { return reinterpret_cast<typename Data::ArrayOptions &>(d->flags); }
+    typename Data::ArrayOptions flags() const noexcept { return typename Data::ArrayOption(d->flags); }
+    typename Data::ArrayOptions detachFlags() const noexcept { return d->detachFlags(); }
+    typename Data::ArrayOptions cloneFlags() const noexcept { return d->cloneFlags(); }
+
+    void reallocate(uint alloc, typename Data::ArrayOptions options)
     {
-        Data *x = Data::allocate(d->detachCapacity(d->size), options);
-        Q_CHECK_PTR(x);
-        QArrayDataPointer copy(x);
+        auto pair = Data::reallocateUnaligned(d, ptr, alloc, options);
+        d = pair.first;
+        ptr = pair.second;
+    }
+    Data *d_ptr() { return d; }
 
-        if (d->size)
-            copy->copyAppend(d->begin(), d->end());
+private:
+    Q_REQUIRED_RESULT QPair<Data *, T *> clone(QArrayData::ArrayOptions options) const
+    {
+        QPair<Data *, T *> pair = Data::allocate(d->detachCapacity(size),
+                    options);
+        Q_CHECK_PTR(pair.first);
+        QArrayDataPointer copy(pair.first, pair.second, 0);
+        if (size)
+            copy->copyAppend(begin(), end());
 
-        Data *result = copy.d;
+        pair.first = copy.d;
         copy.d = Data::sharedNull();
-        return result;
+        return pair;
     }
 
+protected:
     Data *d;
+    T *ptr;
+
+public:
+    int size;
 };
 
 template <class T>
-inline bool operator==(const QArrayDataPointer<T> &lhs, const QArrayDataPointer<T> &rhs)
+inline bool operator==(const QArrayDataPointer<T> &lhs, const QArrayDataPointer<T> &rhs) noexcept
 {
-    return lhs.data() == rhs.data();
+    return lhs.data() == rhs.data() && lhs.size == rhs.size;
 }
 
 template <class T>
-inline bool operator!=(const QArrayDataPointer<T> &lhs, const QArrayDataPointer<T> &rhs)
+inline bool operator!=(const QArrayDataPointer<T> &lhs, const QArrayDataPointer<T> &rhs) noexcept
 {
-    return lhs.data() != rhs.data();
+    return lhs.data() != rhs.data() || lhs.size != rhs.size;
 }
 
 template <class T>
-inline void swap(QArrayDataPointer<T> &p1, QArrayDataPointer<T> &p2)
+inline void qSwap(QArrayDataPointer<T> &p1, QArrayDataPointer<T> &p2) noexcept
 {
     p1.swap(p2);
 }
diff --git a/src/corelib/tools/qbitarray.cpp b/src/corelib/tools/qbitarray.cpp
index ab3054d5be..12ad6f4573 100644
--- a/src/corelib/tools/qbitarray.cpp
+++ b/src/corelib/tools/qbitarray.cpp
@@ -342,6 +342,38 @@ QBitArray QBitArray::fromBits(const char *data, qsizetype size)
     return result;
 }
 
+/*!
+    \since 6.0
+
+    Returns the array of bit converted to an int. The conversion is based on \a endianness.
+    Converts up to the first 32 bits of the array to \c quint32 and returns it,
+    obeying \a endianness. If \a ok is not a null pointer, and the array has more
+    than 32 bits, \a ok is set to false and this function returns zero; otherwise,
+    it's set to true.
+*/
+quint32 QBitArray::toUInt32(QSysInfo::Endian endianness, bool *ok) const noexcept
+{
+    const qsizetype _size = size();
+    if (_size > 32) {
+        if (ok)
+            *ok = false;
+        return 0;
+    }
+
+    if (ok)
+        *ok = true;
+
+    quint32 factor = 1;
+    quint32 total = 0;
+    for (qsizetype i = 0; i < _size; ++i, factor *= 2) {
+        const auto index = endianness == QSysInfo::Endian::LittleEndian ? i : (_size - i - 1);
+        if (testBit(index))
+            total += factor;
+    }
+
+    return total;
+}
+
 /*! \fn bool QBitArray::isDetached() const
 
     \internal
diff --git a/src/corelib/tools/qbitarray.h b/src/corelib/tools/qbitarray.h
index 9b0e931aca..ac3a8771d9 100644
--- a/src/corelib/tools/qbitarray.h
+++ b/src/corelib/tools/qbitarray.h
@@ -105,8 +105,10 @@ public:
     const char *bits() const { return isEmpty() ? nullptr : d.constData() + 1; }
     static QBitArray fromBits(const char *data, qsizetype len);
 
+    quint32 toUInt32(QSysInfo::Endian endianness, bool *ok = nullptr) const noexcept;
+
 public:
-    typedef QByteArray::DataPtr DataPtr;
+    typedef QByteArray::DataPointer DataPtr;
     inline DataPtr &data_ptr() { return d.data_ptr(); }
 };
 
diff --git a/src/corelib/tools/qcontainerfwd.h b/src/corelib/tools/qcontainerfwd.h
index 00a8c85b66..0ace4473ec 100644
--- a/src/corelib/tools/qcontainerfwd.h
+++ b/src/corelib/tools/qcontainerfwd.h
@@ -47,10 +47,6 @@ QT_BEGIN_NAMESPACE
 
 template <class Key, class T> class QCache;
 template <class Key, class T> class QHash;
-#if !defined(QT_NO_LINKED_LIST) && QT_DEPRECATED_SINCE(5, 15)
-template <class T> class QLinkedList;
-#endif
-template <class T> class QList;
 template <class Key, class T> class QMap;
 template <class Key, class T> class QMultiHash;
 template <class Key, class T> class QMultiMap;
@@ -60,6 +56,7 @@ template <class T> class QSet;
 template <class T> class QStack;
 template<class T, int Prealloc = 256> class QVarLengthArray;
 template <class T> class QVector;
+template<typename T> using QList = QVector<T>;
 
 QT_END_NAMESPACE
 
diff --git a/src/corelib/tools/qcontiguouscache.h b/src/corelib/tools/qcontiguouscache.h
index 7b74b4f526..451ba3e8de 100644
--- a/src/corelib/tools/qcontiguouscache.h
+++ b/src/corelib/tools/qcontiguouscache.h
@@ -56,8 +56,6 @@ struct Q_CORE_EXPORT QContiguousCacheData
     int count;
     int start;
     int offset;
-    uint sharable : 1;
-    uint reserved : 31;
 
     // total is 24 bytes (HP-UX aCC: 40 bytes)
     // the next entry is already aligned to 8 bytes
@@ -96,15 +94,12 @@ public:
     typedef int size_type;
 
     explicit QContiguousCache(int capacity = 0);
-    QContiguousCache(const QContiguousCache<T> &v) : d(v.d) { d->ref.ref(); if (!d->sharable) detach_helper(); }
+    QContiguousCache(const QContiguousCache<T> &v) : d(v.d) { d->ref.ref(); }
 
     inline ~QContiguousCache() { if (!d) return; if (!d->ref.deref()) freeData(p); }
 
     inline void detach() { if (d->ref.loadRelaxed() != 1) detach_helper(); }
     inline bool isDetached() const { return d->ref.loadRelaxed() == 1; }
-#if !defined(QT_NO_UNSHARABLE_CONTAINERS)
-    inline void setSharable(bool sharable) { if (!sharable) detach(); d->sharable = sharable; }
-#endif
 
     QContiguousCache<T> &operator=(const QContiguousCache<T> &other);
     inline QContiguousCache<T> &operator=(QContiguousCache<T> &&other) noexcept
@@ -166,7 +161,7 @@ private:
     }
     int alignOfTypedData() const
     {
-        return qMax<int>(sizeof(void*), Q_ALIGNOF(Data));
+        return qMax<int>(sizeof(void*), alignof(Data));
     }
 };
 
@@ -181,8 +176,6 @@ void QContiguousCache<T>::detach_helper()
     x.d->start = d->start;
     x.d->offset = d->offset;
     x.d->alloc = d->alloc;
-    x.d->sharable = true;
-    x.d->reserved = 0;
 
     T *dest = x.p->array + x.d->start;
     T *src = p->array + d->start;
@@ -270,7 +263,6 @@ void QContiguousCache<T>::clear()
         x.d->ref.storeRelaxed(1);
         x.d->alloc = d->alloc;
         x.d->count = x.d->start = x.d->offset = 0;
-        x.d->sharable = true;
         if (!d->ref.deref()) freeData(p);
         d = x.d;
     }
@@ -290,7 +282,6 @@ QContiguousCache<T>::QContiguousCache(int cap)
     d->ref.storeRelaxed(1);
     d->alloc = cap;
     d->count = d->start = d->offset = 0;
-    d->sharable = true;
 }
 
 template <typename T>
@@ -300,8 +291,6 @@ QContiguousCache<T> &QContiguousCache<T>::operator=(const QContiguousCache<T> &o
     if (!d->ref.deref())
         freeData(p);
     d = other.d;
-    if (!d->sharable)
-        detach_helper();
     return *this;
 }
 
diff --git a/src/corelib/tools/qcryptographichash.cpp b/src/corelib/tools/qcryptographichash.cpp
index fa8d21e07a..1d4afabedd 100644
--- a/src/corelib/tools/qcryptographichash.cpp
+++ b/src/corelib/tools/qcryptographichash.cpp
@@ -359,53 +359,67 @@ void QCryptographicHash::reset()
     Adds the first \a length chars of \a data to the cryptographic
     hash.
 */
-void QCryptographicHash::addData(const char *data, int length)
+void QCryptographicHash::addData(const char *data, qsizetype length)
 {
-    switch (d->method) {
-    case Sha1:
-        sha1Update(&d->sha1Context, (const unsigned char *)data, length);
-        break;
+    Q_ASSERT(length >= 0);
+
+#if QT_POINTER_SIZE == 8
+    // feed the data UINT_MAX bytes at a time, as some of the methods below
+    // take a uint (of course, feeding more than 4G of data into the hashing
+    // functions will be pretty slow anyway)
+    qsizetype remaining = length;
+    while (remaining) {
+        length = qMin(qsizetype(std::numeric_limits<uint>::max()), remaining);
+        remaining -= length;
+#else
+    {
+#endif
+        switch (d->method) {
+        case Sha1:
+            sha1Update(&d->sha1Context, (const unsigned char *)data, length);
+            break;
 #ifdef QT_CRYPTOGRAPHICHASH_ONLY_SHA1
-    default:
-        Q_ASSERT_X(false, "QCryptographicHash", "Method not compiled in");
-        Q_UNREACHABLE();
-        break;
+        default:
+            Q_ASSERT_X(false, "QCryptographicHash", "Method not compiled in");
+            Q_UNREACHABLE();
+            break;
 #else
-    case Md4:
-        md4_update(&d->md4Context, (const unsigned char *)data, length);
-        break;
-    case Md5:
-        MD5Update(&d->md5Context, (const unsigned char *)data, length);
-        break;
-    case Sha224:
-        SHA224Input(&d->sha224Context, reinterpret_cast<const unsigned char *>(data), length);
-        break;
-    case Sha256:
-        SHA256Input(&d->sha256Context, reinterpret_cast<const unsigned char *>(data), length);
-        break;
-    case Sha384:
-        SHA384Input(&d->sha384Context, reinterpret_cast<const unsigned char *>(data), length);
-        break;
-    case Sha512:
-        SHA512Input(&d->sha512Context, reinterpret_cast<const unsigned char *>(data), length);
-        break;
-    case RealSha3_224:
-    case Keccak_224:
-        sha3Update(&d->sha3Context, reinterpret_cast<const BitSequence *>(data), quint64(length) * 8);
-        break;
-    case RealSha3_256:
-    case Keccak_256:
-        sha3Update(&d->sha3Context, reinterpret_cast<const BitSequence *>(data), quint64(length) * 8);
-        break;
-    case RealSha3_384:
-    case Keccak_384:
-        sha3Update(&d->sha3Context, reinterpret_cast<const BitSequence *>(data), quint64(length) * 8);
-        break;
-    case RealSha3_512:
-    case Keccak_512:
-        sha3Update(&d->sha3Context, reinterpret_cast<const BitSequence *>(data), quint64(length) * 8);
-        break;
+        case Md4:
+            md4_update(&d->md4Context, (const unsigned char *)data, length);
+            break;
+        case Md5:
+            MD5Update(&d->md5Context, (const unsigned char *)data, length);
+            break;
+        case Sha224:
+            SHA224Input(&d->sha224Context, reinterpret_cast<const unsigned char *>(data), length);
+            break;
+        case Sha256:
+            SHA256Input(&d->sha256Context, reinterpret_cast<const unsigned char *>(data), length);
+            break;
+        case Sha384:
+            SHA384Input(&d->sha384Context, reinterpret_cast<const unsigned char *>(data), length);
+            break;
+        case Sha512:
+            SHA512Input(&d->sha512Context, reinterpret_cast<const unsigned char *>(data), length);
+            break;
+        case RealSha3_224:
+        case Keccak_224:
+            sha3Update(&d->sha3Context, reinterpret_cast<const BitSequence *>(data), quint64(length) * 8);
+            break;
+        case RealSha3_256:
+        case Keccak_256:
+            sha3Update(&d->sha3Context, reinterpret_cast<const BitSequence *>(data), quint64(length) * 8);
+            break;
+        case RealSha3_384:
+        case Keccak_384:
+            sha3Update(&d->sha3Context, reinterpret_cast<const BitSequence *>(data), quint64(length) * 8);
+            break;
+        case RealSha3_512:
+        case Keccak_512:
+            sha3Update(&d->sha3Context, reinterpret_cast<const BitSequence *>(data), quint64(length) * 8);
+            break;
 #endif
+        }
     }
     d->result.clear();
 }
diff --git a/src/corelib/tools/qcryptographichash.h b/src/corelib/tools/qcryptographichash.h
index ad1de7c756..f76fe2d013 100644
--- a/src/corelib/tools/qcryptographichash.h
+++ b/src/corelib/tools/qcryptographichash.h
@@ -94,7 +94,7 @@ public:
 
     void reset();
 
-    void addData(const char *data, int length);
+    void addData(const char *data, qsizetype length);
     void addData(const QByteArray &data);
     bool addData(QIODevice* device);
 
diff --git a/src/corelib/tools/qeasingcurve.cpp b/src/corelib/tools/qeasingcurve.cpp
index 84430ae49a..1207ce0659 100644
--- a/src/corelib/tools/qeasingcurve.cpp
+++ b/src/corelib/tools/qeasingcurve.cpp
@@ -1382,11 +1382,6 @@ void QEasingCurve::addTCBSegment(const QPointF &nextPoint, qreal t, qreal c, qre
 }
 
 /*!
-    \fn QList<QPointF> QEasingCurve::cubicBezierSpline() const
-    \obsolete Use toCubicSpline() instead.
- */
-
-/*!
     \since 5.0
 
     Returns the cubicBezierSpline that defines a custom easing curve.
diff --git a/src/corelib/tools/qeasingcurve.h b/src/corelib/tools/qeasingcurve.h
index d3a468bb22..81833a758f 100644
--- a/src/corelib/tools/qeasingcurve.h
+++ b/src/corelib/tools/qeasingcurve.h
@@ -46,10 +46,6 @@ QT_REQUIRE_CONFIG(easingcurve);
 
 #include <QtCore/qobjectdefs.h>
 #include <QtCore/qvector.h>
-#if QT_DEPRECATED_SINCE(5, 0)
-# include <QtCore/qlist.h>
-# include <QtCore/qpoint.h>
-#endif
 
 QT_BEGIN_NAMESPACE
 
@@ -105,9 +101,6 @@ public:
     void addCubicBezierSegment(const QPointF & c1, const QPointF & c2, const QPointF & endPoint);
     void addTCBSegment(const QPointF &nextPoint, qreal t, qreal c, qreal b);
     QVector<QPointF> toCubicSpline() const;
-#if QT_DEPRECATED_SINCE(5, 0)
-    QT_DEPRECATED QList<QPointF> cubicBezierSpline() const { return toCubicSpline().toList(); }
-#endif
 
     Type type() const;
     void setType(Type type);
diff --git a/src/corelib/tools/qflatmap_p.h b/src/corelib/tools/qflatmap_p.h
new file mode 100644
index 0000000000..590b0d942f
--- /dev/null
+++ b/src/corelib/tools/qflatmap_p.h
@@ -0,0 +1,982 @@
+/****************************************************************************
+**
+** Copyright (C) 2020 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtCore module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QFLATMAP_P_H
+#define QFLATMAP_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists for the convenience
+// of a number of Qt sources files.  This header file may change from
+// version to version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include "qvector.h"
+
+#include <algorithm>
+#include <functional>
+#include <initializer_list>
+#include <iterator>
+#include <numeric>
+#include <type_traits>
+#include <utility>
+
+QT_BEGIN_NAMESPACE
+
+/*
+  QFlatMap provides an associative container backed by sorted sequential
+  containers. By default, QVector is used.
+
+  Keys and values are stored in two separate containers. This provides improved
+  cache locality for key iteration and makes keys() and values() fast
+  operations.
+
+  One can customize the underlying container type by passing the KeyContainer
+  and MappedContainer template arguments:
+      QFlatMap<float, int, std::less<float>, std::vector<float>, std::vector<int>>
+*/
+
+namespace Qt {
+
+struct OrderedUniqueRange_t {};
+constexpr OrderedUniqueRange_t OrderedUniqueRange = {};
+
+} // namespace Qt
+
+template <class Key, class T, class Compare>
+class QFlatMapValueCompare : protected Compare
+{
+public:
+    QFlatMapValueCompare() = default;
+    QFlatMapValueCompare(const Compare &key_compare)
+        : Compare(key_compare)
+    {
+    }
+
+    using value_type = std::pair<const Key, T>;
+    static constexpr bool is_comparator_noexcept = noexcept(
+        std::declval<Compare>()(std::declval<Key>(), std::declval<Key>()));
+
+    bool operator()(const value_type &lhs, const value_type &rhs) const
+        noexcept(is_comparator_noexcept)
+    {
+        return Compare::operator()(lhs.first, rhs.first);
+    }
+};
+
+template <class Key, class T,
+          class Compare = std::less<Key>,
+          class KeyContainer = QVector<Key>,
+          class MappedContainer = QVector<T>>
+class QFlatMap : private QFlatMapValueCompare<Key, T, Compare>
+{
+    using full_map_t = QFlatMap<Key, T, Compare, KeyContainer, MappedContainer>;
+
+    template <class U>
+    class mock_pointer
+    {
+        U ref;
+    public:
+        mock_pointer(U r)
+            : ref(r)
+        {
+        }
+
+        U *operator->()
+        {
+            return &ref;
+        }
+    };
+
+public:
+    using key_type = Key;
+    using mapped_type = T;
+    using value_compare = QFlatMapValueCompare<Key, T, Compare>;
+    using value_type = typename value_compare::value_type;
+    using key_container_type = KeyContainer;
+    using mapped_container_type = MappedContainer;
+    using size_type = typename key_container_type::size_type;
+    using key_compare = Compare;
+
+    struct containers
+    {
+        key_container_type keys;
+        mapped_container_type values;
+    };
+
+    class iterator
+    {
+    public:
+        using difference_type = ptrdiff_t;
+        using value_type = std::pair<const Key, T>;
+        using reference = std::pair<const Key &, T &>;
+        using pointer = mock_pointer<reference>;
+        using iterator_category = std::random_access_iterator_tag;
+
+        iterator() = default;
+
+        iterator(containers *ac, size_type ai)
+            : c(ac), i(ai)
+        {
+        }
+
+        reference operator*()
+        {
+            return { c->keys[i], c->values[i] };
+        }
+
+        pointer operator->()
+        {
+            return { operator*() };
+        }
+
+        bool operator==(const iterator &o) const
+        {
+            return c == o.c && i == o.i;
+        }
+
+        bool operator!=(const iterator &o) const
+        {
+            return !operator==(o);
+        }
+
+        iterator &operator++()
+        {
+            ++i;
+            return *this;
+        }
+
+        iterator operator++(int)
+        {
+
+            iterator r = *this;
+            i++;
+            return r;
+        }
+
+        iterator &operator--()
+        {
+            --i;
+            return *this;
+        }
+
+        iterator operator--(int)
+        {
+            iterator r = *this;
+            i--;
+            return r;
+        }
+
+        iterator &operator+=(size_type n)
+        {
+            i += n;
+            return *this;
+        }
+
+        friend iterator operator+(size_type n, const iterator a)
+        {
+            iterator ret = a;
+            return ret += n;
+        }
+
+        friend iterator operator+(const iterator a, size_type n)
+        {
+            return n + a;
+        }
+
+        iterator &operator-=(size_type n)
+        {
+            i -= n;
+            return *this;
+        }
+
+        friend iterator operator-(const iterator a, size_type n)
+        {
+            iterator ret = a;
+            return ret -= n;
+        }
+
+        friend difference_type operator-(const iterator b, const iterator a)
+        {
+            return b.i - a.i;
+        }
+
+        reference operator[](size_type n)
+        {
+            size_type k = i + n;
+            return { c->keys[k], c->values[k] };
+        }
+
+        bool operator<(const iterator &other) const
+        {
+            return i < other.i;
+        }
+
+        bool operator>(const iterator &other) const
+        {
+            return i > other.i;
+        }
+
+        bool operator<=(const iterator &other) const
+        {
+            return i <= other.i;
+        }
+
+        bool operator>=(const iterator &other) const
+        {
+            return i >= other.i;
+        }
+
+        const Key &key() const { return c->keys[i]; }
+        T &value() { return c->values[i]; }
+
+    private:
+        containers *c = nullptr;
+        size_type i = 0;
+        friend full_map_t;
+    };
+
+    class const_iterator
+    {
+    public:
+        using difference_type = ptrdiff_t;
+        using value_type = std::pair<const Key, const T>;
+        using reference = std::pair<const Key &, const T &>;
+        using pointer = mock_pointer<reference>;
+        using iterator_category = std::random_access_iterator_tag;
+
+        const_iterator() = default;
+
+        const_iterator(const containers *ac, size_type ai)
+            : c(ac), i(ai)
+        {
+        }
+
+        const_iterator(iterator o)
+            : c(o.c), i(o.i)
+        {
+        }
+
+        reference operator*()
+        {
+            return { c->keys[i], c->values[i] };
+        }
+
+        pointer operator->()
+        {
+            return { operator*() };
+        }
+
+        bool operator==(const const_iterator &o) const
+        {
+            return c == o.c && i == o.i;
+        }
+
+        bool operator!=(const const_iterator &o) const
+        {
+            return !operator==(o);
+        }
+
+        const_iterator &operator++()
+        {
+            ++i;
+            return *this;
+        }
+
+        const_iterator operator++(int)
+        {
+
+            const_iterator r = *this;
+            i++;
+            return r;
+        }
+
+        const_iterator &operator--()
+        {
+            --i;
+            return *this;
+        }
+
+        const_iterator operator--(int)
+        {
+            const_iterator r = *this;
+            i--;
+            return r;
+        }
+
+        const_iterator &operator+=(size_type n)
+        {
+            i += n;
+            return *this;
+        }
+
+        friend const_iterator operator+(size_type n, const const_iterator a)
+        {
+            const_iterator ret = a;
+            return ret += n;
+        }
+
+        friend const_iterator operator+(const const_iterator a, size_type n)
+        {
+            return n + a;
+        }
+
+        const_iterator &operator-=(size_type n)
+        {
+            i -= n;
+            return *this;
+        }
+
+        friend const_iterator operator-(const const_iterator a, size_type n)
+        {
+            const_iterator ret = a;
+            return ret -= n;
+        }
+
+        friend difference_type operator-(const const_iterator b, const const_iterator a)
+        {
+            return b.i - a.i;
+        }
+
+        reference operator[](size_type n)
+        {
+            size_type k = i + n;
+            return { c->keys[k], c->values[k] };
+        }
+
+        bool operator<(const const_iterator &other) const
+        {
+            return i < other.i;
+        }
+
+        bool operator>(const const_iterator &other) const
+        {
+            return i > other.i;
+        }
+
+        bool operator<=(const const_iterator &other) const
+        {
+            return i <= other.i;
+        }
+
+        bool operator>=(const const_iterator &other) const
+        {
+            return i >= other.i;
+        }
+
+        const Key &key() const { return c->keys[i]; }
+        const T &value() { return c->values[i]; }
+
+    private:
+        const containers *c = nullptr;
+        size_type i = 0;
+        friend full_map_t;
+    };
+
+private:
+    template <class, class = void>
+    struct is_marked_transparent_type : std::false_type { };
+
+    template <class X>
+    struct is_marked_transparent_type<X, typename X::is_transparent> : std::true_type { };
+
+    template <class X>
+    using is_marked_transparent = typename std::enable_if<
+        is_marked_transparent_type<X>::value>::type *;
+
+    template <typename It>
+    using is_compatible_iterator = typename std::enable_if<
+        std::is_same<value_type, typename std::iterator_traits<It>::value_type>::value>::type *;
+
+public:
+    QFlatMap() = default;
+
+    explicit QFlatMap(const key_container_type &keys, const mapped_container_type &values)
+        : c{keys, values}
+    {
+        ensureOrderedUnique();
+    }
+
+    explicit QFlatMap(key_container_type &&keys, const mapped_container_type &values)
+    {
+        c.keys = std::move(keys);
+        c.values = values;
+        ensureOrderedUnique();
+    }
+
+    explicit QFlatMap(const key_container_type &keys, mapped_container_type &&values)
+    {
+        c.keys = keys;
+        c.values = std::move(values);
+        ensureOrderedUnique();
+    }
+
+    explicit QFlatMap(key_container_type &&keys, mapped_container_type &&values)
+    {
+        c.keys = std::move(keys);
+        c.values = std::move(values);
+        ensureOrderedUnique();
+    }
+
+    explicit QFlatMap(std::initializer_list<value_type> lst)
+        : QFlatMap(lst.begin(), lst.end())
+    {
+    }
+
+    template <class InputIt, is_compatible_iterator<InputIt> = nullptr>
+    explicit QFlatMap(InputIt first, InputIt last)
+    {
+        initWithRange(first, last);
+        ensureOrderedUnique();
+    }
+
+    explicit QFlatMap(Qt::OrderedUniqueRange_t, const key_container_type &keys,
+                      const mapped_container_type &values)
+    {
+        c.keys = keys;
+        c.values = values;
+    }
+
+    explicit QFlatMap(Qt::OrderedUniqueRange_t, key_container_type &&keys,
+                      const mapped_container_type &values)
+    {
+        c.keys = std::move(keys);
+        c.values = values;
+    }
+
+    explicit QFlatMap(Qt::OrderedUniqueRange_t, const key_container_type &keys,
+                      mapped_container_type &&values)
+    {
+        c.keys = keys;
+        c.values = std::move(values);
+    }
+
+    explicit QFlatMap(Qt::OrderedUniqueRange_t, key_container_type &&keys,
+                      mapped_container_type &&values)
+    {
+        c.keys = std::move(keys);
+        c.values = std::move(values);
+    }
+
+    explicit QFlatMap(Qt::OrderedUniqueRange_t, std::initializer_list<value_type> lst)
+        : QFlatMap(lst.begin(), lst.end())
+    {
+    }
+
+    template <class InputIt, is_compatible_iterator<InputIt> = nullptr>
+    explicit QFlatMap(Qt::OrderedUniqueRange_t, InputIt first, InputIt last)
+    {
+        initWithRange(first, last);
+    }
+
+    explicit QFlatMap(const Compare &compare)
+        : value_compare(compare)
+    {
+    }
+
+    explicit QFlatMap(const key_container_type &keys, const mapped_container_type &values,
+                      const Compare &compare)
+        : value_compare(compare), c{keys, values}
+    {
+        ensureOrderedUnique();
+    }
+
+    explicit QFlatMap(key_container_type &&keys, const mapped_container_type &values,
+                      const Compare &compare)
+        : value_compare(compare), c{std::move(keys), values}
+    {
+        ensureOrderedUnique();
+    }
+
+    explicit QFlatMap(const key_container_type &keys, mapped_container_type &&values,
+                      const Compare &compare)
+        : value_compare(compare), c{keys, std::move(values)}
+    {
+        ensureOrderedUnique();
+    }
+
+    explicit QFlatMap(key_container_type &&keys, mapped_container_type &&values,
+                      const Compare &compare)
+        : value_compare(compare), c{std::move(keys), std::move(values)}
+    {
+        ensureOrderedUnique();
+    }
+
+    explicit QFlatMap(std::initializer_list<value_type> lst, const Compare &compare)
+        : QFlatMap(lst.begin(), lst.end(), compare)
+    {
+    }
+
+    template <class InputIt, is_compatible_iterator<InputIt> = nullptr>
+    explicit QFlatMap(InputIt first, InputIt last, const Compare &compare)
+        : value_compare(compare)
+    {
+        initWithRange(first, last);
+        ensureOrderedUnique();
+    }
+
+    explicit QFlatMap(Qt::OrderedUniqueRange_t, const key_container_type &keys,
+                      const mapped_container_type &values, const Compare &compare)
+        : value_compare(compare), c{keys, values}
+    {
+    }
+
+    explicit QFlatMap(Qt::OrderedUniqueRange_t, key_container_type &&keys,
+                      const mapped_container_type &values, const Compare &compare)
+        : value_compare(compare), c{std::move(keys), values}
+    {
+    }
+
+    explicit QFlatMap(Qt::OrderedUniqueRange_t, const key_container_type &keys,
+                      mapped_container_type &&values, const Compare &compare)
+        : value_compare(compare), c{keys, std::move(values)}
+    {
+    }
+
+    explicit QFlatMap(Qt::OrderedUniqueRange_t, key_container_type &&keys,
+                      mapped_container_type &&values, const Compare &compare)
+        : value_compare(compare), c{std::move(keys), std::move(values)}
+    {
+    }
+
+    explicit QFlatMap(Qt::OrderedUniqueRange_t, std::initializer_list<value_type> lst,
+                      const Compare &compare)
+        : QFlatMap(Qt::OrderedUniqueRange, lst.begin(), lst.end(), compare)
+    {
+    }
+
+    template <class InputIt, is_compatible_iterator<InputIt> = nullptr>
+    explicit QFlatMap(Qt::OrderedUniqueRange_t, InputIt first, InputIt last, const Compare &compare)
+        : value_compare(compare)
+    {
+        initWithRange(first, last);
+    }
+
+    size_type count() const noexcept { return c.keys.size(); }
+    size_type size() const noexcept { return c.keys.size(); }
+    size_type capacity() const noexcept { return c.keys.capacity(); }
+    bool isEmpty() const noexcept { return c.keys.empty(); }
+    bool empty() const noexcept { return c.keys.empty(); }
+    containers extract() && { return std::move(c); }
+    const key_container_type &keys() const noexcept { return c.keys; }
+    const mapped_container_type &values() const noexcept { return c.values; }
+
+    void reserve(size_type s)
+    {
+        c.keys.reserve(s);
+        c.values.reserve(s);
+    }
+
+    void clear()
+    {
+        c.keys.clear();
+        c.values.clear();
+    }
+
+    bool remove(const Key &key)
+    {
+        auto it = binary_find(key);
+        if (it != end()) {
+            c.keys.erase(toKeysIterator(it));
+            c.values.erase(toValuesIterator(it));
+            return true;
+        }
+        return false;
+    }
+
+    iterator erase(iterator it)
+    {
+        c.values.erase(toValuesIterator(it));
+        return fromKeysIterator(c.keys.erase(toKeysIterator(it)));
+    }
+
+    T take(const Key &key)
+    {
+        auto it = binary_find(key);
+        if (it != end()) {
+            T result = std::move(it.value());
+            erase(it);
+            return result;
+        }
+        return {};
+    }
+
+    bool contains(const Key &key) const
+    {
+        return binary_find(key) != end();
+    }
+
+    T value(const Key &key, const T &defaultValue) const
+    {
+        auto it = binary_find(key);
+        return it == end() ? defaultValue : it.value();
+    }
+
+    T value(const Key &key) const
+    {
+        auto it = binary_find(key);
+        return it == end() ? T() : it.value();
+    }
+
+    T &operator[](const Key &key)
+    {
+        auto it = lower_bound(key);
+        if (it == end() || key_compare::operator()(key, it.key())) {
+            c.keys.insert(toKeysIterator(it), key);
+            return *c.values.insert(toValuesIterator(it), T());
+        }
+        return it.value();
+    }
+
+    T &operator[](Key &&key)
+    {
+        auto it = lower_bound(key);
+        if (it == end() || key_compare::operator()(key, it.key())) {
+            c.keys.insert(toKeysIterator(it), key);
+            return *c.values.insert(toValuesIterator(it), T());
+        }
+        return it.value();
+    }
+
+    T operator[](const Key &key) const
+    {
+        return value(key);
+    }
+
+    std::pair<iterator, bool> insert(const Key &key, const T &value)
+    {
+        auto it = lower_bound(key);
+        if (it == end() || key_compare::operator()(key, it.key())) {
+            c.values.insert(toValuesIterator(it), value);
+            auto k = c.keys.insert(toKeysIterator(it), key);
+            return { fromKeysIterator(k), true };
+        } else {
+            it.value() = value;
+            return {it, false};
+        }
+    }
+
+    std::pair<iterator, bool> insert(Key &&key, const T &value)
+    {
+        auto it = lower_bound(key);
+        if (it == end() || key_compare::operator()(key, it.key())) {
+            c.values.insert(toValuesIterator(it), value);
+            return { c.keys.insert(it, std::move(key)), true };
+        } else {
+            *toValuesIterator(it) = value;
+            return {it, false};
+        }
+    }
+
+    std::pair<iterator, bool> insert(const Key &key, T &&value)
+    {
+        auto it = lower_bound(key);
+        if (it == end() || key_compare::operator()(key, it.key())) {
+            c.values.insert(toValuesIterator(it), std::move(value));
+            return { c.keys.insert(it, key), true };
+        } else {
+            *toValuesIterator(it) = std::move(value);
+            return {it, false};
+        }
+    }
+
+    std::pair<iterator, bool> insert(Key &&key, T &&value)
+    {
+        auto it = lower_bound(key);
+        if (it == end() || key_compare::operator()(key, it.key())) {
+            c.values.insert(toValuesIterator(it), std::move(value));
+            return { fromKeysIterator(c.keys.insert(toKeysIterator(it), std::move(key))), true };
+        } else {
+            *toValuesIterator(it) = std::move(value);
+            return {it, false};
+        }
+    }
+
+    template <class InputIt, is_compatible_iterator<InputIt> = nullptr>
+    void insert(InputIt first, InputIt last)
+    {
+        insertRange(first, last);
+    }
+
+    // ### Merge with the templated version above
+    //     once we can use std::disjunction in is_compatible_iterator.
+    void insert(const value_type *first, const value_type *last)
+    {
+        insertRange(first, last);
+    }
+
+    template <class InputIt, is_compatible_iterator<InputIt> = nullptr>
+    void insert(Qt::OrderedUniqueRange_t, InputIt first, InputIt last)
+    {
+        insertOrderedUniqueRange(first, last);
+    }
+
+    // ### Merge with the templated version above
+    //     once we can use std::disjunction in is_compatible_iterator.
+    void insert(Qt::OrderedUniqueRange_t, const value_type *first, const value_type *last)
+    {
+        insertOrderedUniqueRange(first, last);
+    }
+
+    iterator begin() { return { &c, 0 }; }
+    const_iterator begin() const { return { &c, 0 }; }
+    const_iterator cbegin() const { return begin(); }
+    const_iterator constBegin() const { return cbegin(); }
+    iterator end() { return { &c, c.keys.size() }; }
+    const_iterator end() const { return { &c, c.keys.size() }; }
+    const_iterator cend() const { return end(); }
+    const_iterator constEnd() const { return cend(); }
+    std::reverse_iterator<iterator> rbegin() { return std::reverse_iterator<iterator>(end()); }
+    std::reverse_iterator<const_iterator> rbegin() const
+    {
+        return std::reverse_iterator<const_iterator>(end());
+    }
+    std::reverse_iterator<const_iterator> crbegin() const { return rbegin(); }
+    std::reverse_iterator<iterator> rend() {
+        return std::reverse_iterator<iterator>(begin());
+    }
+    std::reverse_iterator<const_iterator> rend() const
+    {
+        return std::reverse_iterator<const_iterator>(begin());
+    }
+    std::reverse_iterator<const_iterator> crend() const { return rend(); }
+
+    iterator lower_bound(const Key &key)
+    {
+        auto cit = const_cast<const full_map_t *>(this)->lower_bound(key);
+        return { &c, cit.i };
+    }
+
+    template <class X, class Y = Compare, is_marked_transparent<Y> = nullptr>
+    iterator lower_bound(const X &key)
+    {
+        auto cit = const_cast<const full_map_t *>(this)->lower_bound(key);
+        return { &c, cit.i };
+    }
+
+    const_iterator lower_bound(const Key &key) const
+    {
+        return fromKeysIterator(std::lower_bound(c.keys.begin(), c.keys.end(), key, key_comp()));
+    }
+
+    template <class X, class Y = Compare, is_marked_transparent<Y> = nullptr>
+    const_iterator lower_bound(const X &key) const
+    {
+        return fromKeysIterator(std::lower_bound(c.keys.begin(), c.keys.end(), key, key_comp()));
+    }
+
+    iterator find(const key_type &k)
+    {
+        return binary_find(k);
+    }
+
+    const_iterator find(const key_type &k) const
+    {
+        return binary_find(k);
+    }
+
+    key_compare key_comp() const noexcept
+    {
+        return static_cast<key_compare>(*this);
+    }
+
+    value_compare value_comp() const noexcept
+    {
+        return static_cast<value_compare>(*this);
+    }
+
+private:
+    template <class InputIt, is_compatible_iterator<InputIt> = nullptr>
+    void initWithRange(InputIt first, InputIt last)
+    {
+        QtPrivate::reserveIfForwardIterator(this, first, last);
+        while (first != last) {
+            c.keys.push_back(first->first);
+            c.values.push_back(first->second);
+            ++first;
+        }
+    }
+
+    iterator fromKeysIterator(typename key_container_type::iterator kit)
+    {
+        return { &c, static_cast<size_type>(std::distance(c.keys.begin(), kit)) };
+    }
+
+    const_iterator fromKeysIterator(typename key_container_type::const_iterator kit) const
+    {
+        return { &c, static_cast<size_type>(std::distance(c.keys.begin(), kit)) };
+    }
+
+    typename key_container_type::iterator toKeysIterator(iterator it)
+    {
+        return c.keys.begin() + it.i;
+    }
+
+    typename mapped_container_type::iterator toValuesIterator(iterator it)
+    {
+        return c.values.begin() + it.i;
+    }
+
+    template <class InputIt>
+    void insertRange(InputIt first, InputIt last)
+    {
+        size_type i = c.keys.size();
+        c.keys.resize(i + std::distance(first, last));
+        c.values.resize(c.keys.size());
+        for (; first != last; ++first, ++i) {
+            c.keys[i] = first->first;
+            c.values[i] = first->second;
+        }
+        ensureOrderedUnique();
+    }
+
+    class IndexedKeyComparator
+    {
+    public:
+        IndexedKeyComparator(const full_map_t *am)
+            : m(am)
+        {
+        }
+
+        bool operator()(size_type i, size_type k) const
+        {
+            return m->key_comp()(m->c.keys[i], m->c.keys[k]);
+        }
+
+    private:
+        const full_map_t *m;
+    };
+
+    template <class InputIt>
+    void insertOrderedUniqueRange(InputIt first, InputIt last)
+    {
+        const size_type s = c.keys.size();
+        c.keys.resize(s + std::distance(first, last));
+        c.values.resize(c.keys.size());
+        for (size_type i = s; first != last; ++first, ++i) {
+            c.keys[i] = first->first;
+            c.values[i] = first->second;
+        }
+
+        std::vector<size_type> p(size_t(c.keys.size()));
+        std::iota(p.begin(), p.end(), 0);
+        std::inplace_merge(p.begin(), p.begin() + s, p.end(), IndexedKeyComparator(this));
+        applyPermutation(p);
+        makeUnique();
+    }
+
+    iterator binary_find(const Key &key)
+    {
+        return { &c, const_cast<const full_map_t *>(this)->binary_find(key).i };
+    }
+
+    const_iterator binary_find(const Key &key) const
+    {
+        auto it = lower_bound(key);
+        if (it != end()) {
+            if (!key_compare::operator()(key, it.key()))
+                return it;
+            it = end();
+        }
+        return it;
+    }
+
+    void ensureOrderedUnique()
+    {
+        std::vector<size_type> p(size_t(c.keys.size()));
+        std::iota(p.begin(), p.end(), 0);
+        std::stable_sort(p.begin(), p.end(), IndexedKeyComparator(this));
+        applyPermutation(p);
+        makeUnique();
+    }
+
+    void applyPermutation(const std::vector<size_type> &p)
+    {
+        const size_type s = c.keys.size();
+        std::vector<bool> done(s);
+        for (size_type i = 0; i < s; ++i) {
+            if (done[i])
+                continue;
+            done[i] = true;
+            size_type j = i;
+            size_type k = p[i];
+            while (i != k) {
+                qSwap(c.keys[j], c.keys[k]);
+                qSwap(c.values[j], c.values[k]);
+                done[k] = true;
+                j = k;
+                k = p[j];
+            }
+        }
+    }
+
+    void makeUnique()
+    {
+        if (c.keys.size() < 2)
+            return;
+        auto k = std::end(c.keys) - 1;
+        auto i = k - 1;
+        for (;;) {
+            if (key_compare::operator()(*i, *k) || key_compare::operator()(*k, *i)) {
+                if (i == std::begin(c.keys))
+                    break;
+                --i;
+                --k;
+            } else {
+                c.values.erase(std::begin(c.values) + std::distance(std::begin(c.keys), i));
+                i = c.keys.erase(i);
+                if (i == std::begin(c.keys))
+                    break;
+                k = i + 1;
+            }
+        }
+        c.keys.shrink_to_fit();
+        c.values.shrink_to_fit();
+    }
+
+    containers c;
+};
+
+QT_END_NAMESPACE
+
+#endif // QFLATMAP_P_H
diff --git a/src/corelib/tools/qhash.h b/src/corelib/tools/qhash.h
index 9144405501..59883e3968 100644
--- a/src/corelib/tools/qhash.h
+++ b/src/corelib/tools/qhash.h
@@ -235,7 +235,7 @@ class QHash
         return reinterpret_cast<Node *>(node);
     }
 
-    static inline int alignOfNode() { return qMax<int>(sizeof(void*), Q_ALIGNOF(Node)); }
+    static inline int alignOfNode() { return qMax<int>(sizeof(void*), alignof(Node)); }
 
 public:
     inline QHash() noexcept : d(const_cast<QHashData *>(&QHashData::shared_null)) { }
@@ -290,9 +290,6 @@ public:
 
     inline void detach() { if (d->ref.isShared()) detach_helper(); }
     inline bool isDetached() const { return !d->ref.isShared(); }
-#if !defined(QT_NO_UNSHARABLE_CONTAINERS)
-    inline void setSharable(bool sharable) { if (!sharable) detach(); if (d != &QHashData::shared_null) d->sharable = sharable; }
-#endif
     bool isSharedWith(const QHash &other) const { return d == other.d; }
 
     void clear();
@@ -376,13 +373,8 @@ public:
         friend inline QT_DEPRECATED_VERSION_5_15 iterator operator+(int j, iterator k) { return k + j; }
 #endif
 
-#ifndef QT_STRICT_ITERATORS
-    public:
-        inline bool operator==(const const_iterator &o) const
-            { return i == o.i; }
-        inline bool operator!=(const const_iterator &o) const
-            { return i != o.i; }
-#endif
+        inline bool operator==(const const_iterator &o) const { return i == o.i; }
+        inline bool operator!=(const const_iterator &o) const { return i != o.i; }
     };
     friend class iterator;
 
@@ -408,11 +400,7 @@ public:
         Q_DECL_CONSTEXPR inline const_iterator() : i(nullptr) { }
         explicit inline const_iterator(void *node)
             : i(reinterpret_cast<QHashData::Node *>(node)) { }
-#ifdef QT_STRICT_ITERATORS
-        explicit inline const_iterator(const iterator &o)
-#else
         inline const_iterator(const iterator &o)
-#endif
         { i = o.i; }
 
         inline const Key &key() const { return concrete(i)->key; }
@@ -453,13 +441,6 @@ public:
             return k + j;
         }
 #endif
-
-        // ### Qt 5: not sure this is necessary anymore
-#ifdef QT_STRICT_ITERATORS
-    private:
-        inline bool operator==(const iterator &o) const { return operator==(const_iterator(o)); }
-        inline bool operator!=(const iterator &o) const { return operator!=(const_iterator(o)); }
-#endif
     };
     friend class const_iterator;
 
diff --git a/src/corelib/tools/qhashfunctions.h b/src/corelib/tools/qhashfunctions.h
index 2ff3464912..2e62e93ac4 100644
--- a/src/corelib/tools/qhashfunctions.h
+++ b/src/corelib/tools/qhashfunctions.h
@@ -68,25 +68,55 @@ class QLatin1String;
 Q_CORE_EXPORT int qGlobalQHashSeed();
 Q_CORE_EXPORT void qSetGlobalQHashSeed(int newSeed);
 
-Q_CORE_EXPORT Q_DECL_PURE_FUNCTION uint qHashBits(const void *p, size_t size, uint seed = 0) noexcept;
+namespace QHashPrivate {
 
-Q_DECL_CONST_FUNCTION Q_DECL_CONSTEXPR inline uint qHash(char key, uint seed = 0) noexcept { return uint(key) ^ seed; }
-Q_DECL_CONST_FUNCTION Q_DECL_CONSTEXPR inline uint qHash(uchar key, uint seed = 0) noexcept { return uint(key) ^ seed; }
-Q_DECL_CONST_FUNCTION Q_DECL_CONSTEXPR inline uint qHash(signed char key, uint seed = 0) noexcept { return uint(key) ^ seed; }
-Q_DECL_CONST_FUNCTION Q_DECL_CONSTEXPR inline uint qHash(ushort key, uint seed = 0) noexcept { return uint(key) ^ seed; }
-Q_DECL_CONST_FUNCTION Q_DECL_CONSTEXPR inline uint qHash(short key, uint seed = 0) noexcept { return uint(key) ^ seed; }
-Q_DECL_CONST_FUNCTION Q_DECL_CONSTEXPR inline uint qHash(uint key, uint seed = 0) noexcept { return key ^ seed; }
-Q_DECL_CONST_FUNCTION Q_DECL_CONSTEXPR inline uint qHash(int key, uint seed = 0) noexcept { return uint(key) ^ seed; }
-Q_DECL_CONST_FUNCTION Q_DECL_CONSTEXPR inline uint qHash(ulong key, uint seed = 0) noexcept
+Q_DECL_CONST_FUNCTION constexpr uint hash(size_t key, uint seed) noexcept
 {
-    return (sizeof(ulong) > sizeof(uint))
-        ? (uint(((key >> (8 * sizeof(uint) - 1)) ^ key) & (~0U)) ^ seed)
-        : (uint(key & (~0U)) ^ seed);
+    key ^= seed;
+    if constexpr (sizeof(size_t) == 4) {
+        key ^= key >> 16;
+        key *= UINT32_C(0x45d9f3b);
+        key ^= key >> 16;
+        key *= UINT32_C(0x45d9f3b);
+        key ^= key >> 16;
+        return key;
+    } else {
+        key ^= key >> 32;
+        key *= UINT64_C(0xd6e8feb86659fd93);
+        key ^= key >> 32;
+        key *= UINT64_C(0xd6e8feb86659fd93);
+        key ^= key >> 32;
+        return uint(key);
+    }
+}
+
 }
-Q_DECL_CONST_FUNCTION Q_DECL_CONSTEXPR inline uint qHash(long key, uint seed = 0) noexcept { return qHash(ulong(key), seed); }
+
+Q_CORE_EXPORT Q_DECL_PURE_FUNCTION uint qHashBits(const void *p, size_t size, uint seed = 0) noexcept;
+
+Q_DECL_CONST_FUNCTION Q_DECL_CONSTEXPR inline uint qHash(char key, uint seed = 0) noexcept
+{ return QHashPrivate::hash(size_t(key), seed); }
+Q_DECL_CONST_FUNCTION Q_DECL_CONSTEXPR inline uint qHash(uchar key, uint seed = 0) noexcept
+{ return QHashPrivate::hash(size_t(key), seed); }
+Q_DECL_CONST_FUNCTION Q_DECL_CONSTEXPR inline uint qHash(signed char key, uint seed = 0) noexcept
+{ return QHashPrivate::hash(size_t(key), seed); }
+Q_DECL_CONST_FUNCTION Q_DECL_CONSTEXPR inline uint qHash(ushort key, uint seed = 0) noexcept
+{ return QHashPrivate::hash(size_t(key), seed); }
+Q_DECL_CONST_FUNCTION Q_DECL_CONSTEXPR inline uint qHash(short key, uint seed = 0) noexcept
+{ return QHashPrivate::hash(size_t(key), seed); }
+Q_DECL_CONST_FUNCTION Q_DECL_CONSTEXPR inline uint qHash(uint key, uint seed = 0) noexcept
+{ return QHashPrivate::hash(size_t(key), seed); }
+Q_DECL_CONST_FUNCTION Q_DECL_CONSTEXPR inline uint qHash(int key, uint seed = 0) noexcept
+{ return QHashPrivate::hash(size_t(key), seed); }
+Q_DECL_CONST_FUNCTION Q_DECL_CONSTEXPR inline uint qHash(ulong key, uint seed = 0) noexcept
+{ return QHashPrivate::hash(size_t(key), seed); }
+Q_DECL_CONST_FUNCTION Q_DECL_CONSTEXPR inline uint qHash(long key, uint seed = 0) noexcept
+{ return QHashPrivate::hash(size_t(key), seed); }
 Q_DECL_CONST_FUNCTION Q_DECL_CONSTEXPR inline uint qHash(quint64 key, uint seed = 0) noexcept
 {
-    return uint(((key >> (8 * sizeof(uint) - 1)) ^ key) & (~0U)) ^ seed;
+    if (sizeof(quint64) > sizeof(size_t))
+        key ^= (key >> 32);
+    return QHashPrivate::hash(size_t(key), seed);
 }
 Q_DECL_CONST_FUNCTION Q_DECL_CONSTEXPR inline uint qHash(qint64 key, uint seed = 0) noexcept { return qHash(quint64(key), seed); }
 Q_CORE_EXPORT Q_DECL_CONST_FUNCTION uint qHash(float key, uint seed = 0) noexcept;
diff --git a/src/corelib/tools/qiterator.qdoc b/src/corelib/tools/qiterator.qdoc
index 3531fb202c..69f9d52ce5 100644
--- a/src/corelib/tools/qiterator.qdoc
+++ b/src/corelib/tools/qiterator.qdoc
@@ -201,55 +201,6 @@
 */
 
 /*!
-    \class QLinkedListIterator
-    \inmodule QtCore
-    \obsolete
-
-    \brief The QLinkedListIterator class provides a Java-style const iterator for QLinkedList.
-
-    QLinkedList has both \l{Java-style iterators} and
-    \l{STL-style iterators}. The Java-style iterators are more
-    high-level and easier to use than the STL-style iterators; on the
-    other hand, they are slightly less efficient.
-
-    QLinkedListIterator\<T\> allows you to iterate over a
-    QLinkedList\<T\>. If you want to modify the list as you iterate
-    over it, use QMutableLinkedListIterator\<T\> instead.
-
-    The QLinkedListIterator constructor takes a QLinkedList as
-    argument. After construction, the iterator is located at the very
-    beginning of the list (before the first item). Here's how to
-    iterate over all the elements sequentially:
-
-    \snippet code/doc_src_qiterator.cpp 2
-
-    The next() function returns the next item in the list and
-    advances the iterator. Unlike STL-style iterators, Java-style
-    iterators point \e between items rather than directly \e at
-    items. The first call to next() advances the iterator to the
-    position between the first and second item, and returns the first
-    item; the second call to next() advances the iterator to the
-    position between the second and third item, and returns the second
-    item; and so on.
-
-    \image javaiterators1.png
-
-    Here's how to iterate over the elements in reverse order:
-
-    \snippet code/doc_src_qiterator.cpp 3
-
-    If you want to find all occurrences of a particular value, use
-    findNext() or findPrevious() in a loop.
-
-    Multiple iterators can be used on the same list. If the list is
-    modified while a QLinkedListIterator is active, the
-    QLinkedListIterator will continue iterating over the original
-    list, ignoring the modified copy.
-
-    \sa QMutableLinkedListIterator, QLinkedList::const_iterator
-*/
-
-/*!
     \class QVectorIterator
     \inmodule QtCore
     \brief The QVectorIterator class provides a Java-style const iterator for QVector and QStack.
@@ -415,68 +366,6 @@
 */
 
 /*!
-    \class QMutableLinkedListIterator
-    \inmodule QtCore
-    \obsolete
-
-    \brief The QMutableLinkedListIterator class provides a Java-style non-const iterator for QLinkedList.
-
-    QLinkedList has both \l{Java-style iterators} and
-    \l{STL-style iterators}. The Java-style iterators are more
-    high-level and easier to use than the STL-style iterators; on the
-    other hand, they are slightly less efficient.
-
-    QMutableLinkedListIterator\<T\> allows you to iterate over a
-    QLinkedList\<T\> and modify the list. If you don't want to modify
-    the list (or have a const QLinkedList), use the slightly faster
-    QLinkedListIterator\<T\> instead.
-
-    The QMutableLinkedListIterator constructor takes a QLinkedList as
-    argument. After construction, the iterator is located at the very
-    beginning of the list (before the first item). Here's how to
-    iterate over all the elements sequentially:
-
-    \snippet code/doc_src_qiterator.cpp 11
-
-    The next() function returns the next item in the list and
-    advances the iterator. Unlike STL-style iterators, Java-style
-    iterators point \e between items rather than directly \e at
-    items. The first call to next() advances the iterator to the
-    position between the first and second item, and returns the first
-    item; the second call to next() advances the iterator to the
-    position between the second and third item, returning the second
-    item; and so on.
-
-    \image javaiterators1.png
-
-    Here's how to iterate over the elements in reverse order:
-
-    \snippet code/doc_src_qiterator.cpp 12
-
-    If you want to find all occurrences of a particular value, use
-    findNext() or findPrevious() in a loop.
-
-    If you want to remove items as you iterate over the list, use
-    remove(). If you want to modify the value of an item, use
-    setValue(). If you want to insert a new item in the list, use
-    insert().
-
-    Example:
-    \snippet code/doc_src_qiterator.cpp 13
-
-    The example traverses a list, replacing negative numbers with
-    their absolute values, and eliminating zeroes.
-
-    Only one mutable iterator can be active on a given list at any
-    time. Furthermore, no changes should be done directly to the list
-    while the iterator is active (as opposed to through the
-    iterator), since this could invalidate the iterator and lead to
-    undefined behavior.
-
-    \sa QLinkedListIterator, QLinkedList::iterator
-*/
-
-/*!
     \class QMutableVectorIterator
     \inmodule QtCore
 
@@ -595,9 +484,7 @@
 
 /*!
     \fn template <class T> QListIterator<T>::QListIterator(const QList<T> &list)
-    \fn template <class T> QLinkedListIterator<T>::QLinkedListIterator(const QLinkedList<T> &list)
     \fn template <class T> QMutableListIterator<T>::QMutableListIterator(QList<T> &list)
-    \fn template <class T> QMutableLinkedListIterator<T>::QMutableLinkedListIterator(QLinkedList<T> &list)
 
     Constructs an iterator for traversing \a list. The iterator is
     set to be at the front of the list (before the first item).
@@ -626,9 +513,7 @@
 */
 
 /*! \fn template <class T> QMutableListIterator &QMutableListIterator<T>::operator=(QList<T> &list)
-    \fn template <class T> QMutableLinkedListIterator &QMutableLinkedListIterator<T>::operator=(QLinkedList<T> &list)
     \fn template <class T> QListIterator &QListIterator<T>::operator=(const QList<T> &list)
-    \fn template <class T> QLinkedListIterator &QLinkedListIterator<T>::operator=(const QLinkedList<T> &list)
 
     Makes the iterator operate on \a list. The iterator is set to be
     at the front of the list (before the first item).
@@ -655,11 +540,9 @@
 */
 
 /*! \fn template <class T> void QListIterator<T>::toFront()
-    \fn template <class T> void QLinkedListIterator<T>::toFront()
     \fn template <class T> void QVectorIterator<T>::toFront()
     \fn template <class T> void QSetIterator<T>::toFront()
     \fn template <class T> void QMutableListIterator<T>::toFront()
-    \fn template <class T> void QMutableLinkedListIterator<T>::toFront()
     \fn template <class T> void QMutableVectorIterator<T>::toFront()
     \fn template <class T> void QMutableSetIterator<T>::toFront()
 
@@ -670,11 +553,9 @@
 */
 
 /*! \fn template <class T> void QListIterator<T>::toBack()
-    \fn template <class T> void QLinkedListIterator<T>::toBack()
     \fn template <class T> void QVectorIterator<T>::toBack()
     \fn template <class T> void QSetIterator<T>::toBack()
     \fn template <class T> void QMutableListIterator<T>::toBack()
-    \fn template <class T> void QMutableLinkedListIterator<T>::toBack()
     \fn template <class T> void QMutableVectorIterator<T>::toBack()
     \fn template <class T> void QMutableSetIterator<T>::toBack()
 
@@ -685,11 +566,9 @@
 */
 
 /*! \fn template <class T> bool QListIterator<T>::hasNext() const
-    \fn template <class T> bool QLinkedListIterator<T>::hasNext() const
     \fn template <class T> bool QVectorIterator<T>::hasNext() const
     \fn template <class T> bool QSetIterator<T>::hasNext() const
     \fn template <class T> bool QMutableListIterator<T>::hasNext() const
-    \fn template <class T> bool QMutableLinkedListIterator<T>::hasNext() const
     \fn template <class T> bool QMutableVectorIterator<T>::hasNext() const
     \fn template <class T> bool QMutableSetIterator<T>::hasNext() const
 
@@ -701,7 +580,6 @@
 */
 
 /*! \fn template <class T> const T &QListIterator<T>::next()
-    \fn template <class T> const T &QLinkedListIterator<T>::next()
     \fn template <class T> const T &QVectorIterator<T>::next()
     \fn template <class T> const T &QSetIterator<T>::next()
     \fn template <class T> const T &QMutableSetIterator<T>::next()
@@ -715,7 +593,6 @@
 */
 
 /*! \fn template <class T> T &QMutableListIterator<T>::next()
-    \fn template <class T> T &QMutableLinkedListIterator<T>::next()
     \fn template <class T> T &QMutableVectorIterator<T>::next()
 
     Returns a reference to the next item, and advances the iterator
@@ -728,7 +605,6 @@
 */
 
 /*! \fn template <class T> const T &QListIterator<T>::peekNext() const
-    \fn template <class T> const T &QLinkedListIterator<T>::peekNext() const
     \fn template <class T> const T &QVectorIterator<T>::peekNext() const
     \fn template <class T> const T &QSetIterator<T>::peekNext() const
     \fn template <class T> const T &QMutableSetIterator<T>::peekNext() const
@@ -742,7 +618,6 @@
 */
 
 /*! \fn template <class T> T &QMutableListIterator<T>::peekNext() const
-    \fn template <class T> T &QMutableLinkedListIterator<T>::peekNext() const
     \fn template <class T> T &QMutableVectorIterator<T>::peekNext() const
 
     Returns a reference to the next item, without moving the iterator.
@@ -754,11 +629,9 @@
 */
 
 /*! \fn template <class T> bool QListIterator<T>::hasPrevious() const
-    \fn template <class T> bool QLinkedListIterator<T>::hasPrevious() const
     \fn template <class T> bool QVectorIterator<T>::hasPrevious() const
     \fn template <class T> bool QSetIterator<T>::hasPrevious() const
     \fn template <class T> bool QMutableListIterator<T>::hasPrevious() const
-    \fn template <class T> bool QMutableLinkedListIterator<T>::hasPrevious() const
     \fn template <class T> bool QMutableVectorIterator<T>::hasPrevious() const
     \fn template <class T> bool QMutableSetIterator<T>::hasPrevious() const
 
@@ -770,7 +643,6 @@
 */
 
 /*! \fn template <class T> const T &QListIterator<T>::previous()
-    \fn template <class T> const T &QLinkedListIterator<T>::previous()
     \fn template <class T> const T &QVectorIterator<T>::previous()
     \fn template <class T> const T &QSetIterator<T>::previous()
     \fn template <class T> const T &QMutableSetIterator<T>::previous()
@@ -785,7 +657,6 @@
 */
 
 /*! \fn template <class T> T &QMutableListIterator<T>::previous()
-    \fn template <class T> T &QMutableLinkedListIterator<T>::previous()
     \fn template <class T> T &QMutableVectorIterator<T>::previous()
 
     Returns a reference to the previous item and moves the iterator
@@ -798,7 +669,6 @@
 */
 
 /*! \fn template <class T> const T &QListIterator<T>::peekPrevious() const
-    \fn template <class T> const T &QLinkedListIterator<T>::peekPrevious() const
     \fn template <class T> const T &QVectorIterator<T>::peekPrevious() const
     \fn template <class T> const T &QSetIterator<T>::peekPrevious() const
     \fn template <class T> const T &QMutableSetIterator<T>::peekPrevious() const
@@ -812,7 +682,6 @@
 */
 
 /*! \fn template <class T> T &QMutableListIterator<T>::peekPrevious() const
-    \fn template <class T> T &QMutableLinkedListIterator<T>::peekPrevious() const
     \fn template <class T> T &QMutableVectorIterator<T>::peekPrevious() const
 
     Returns a reference to the previous item, without moving the iterator.
@@ -824,11 +693,9 @@
 */
 
 /*! \fn template <class T> bool QListIterator<T>::findNext(const T &value)
-    \fn template <class T> bool QLinkedListIterator<T>::findNext(const T &value)
     \fn template <class T> bool QVectorIterator<T>::findNext(const T &value)
     \fn template <class T> bool QSetIterator<T>::findNext(const T &value)
     \fn template <class T> bool QMutableListIterator<T>::findNext(const T &value)
-    \fn template <class T> bool QMutableLinkedListIterator<T>::findNext(const T &value)
     \fn template <class T> bool QMutableVectorIterator<T>::findNext(const T &value)
     \fn template <class T> bool QMutableSetIterator<T>::findNext(const T &value)
 
@@ -843,11 +710,9 @@
 */
 
 /*! \fn template <class T> bool QListIterator<T>::findPrevious(const T &value)
-    \fn template <class T> bool QLinkedListIterator<T>::findPrevious(const T &value)
     \fn template <class T> bool QVectorIterator<T>::findPrevious(const T &value)
     \fn template <class T> bool QSetIterator<T>::findPrevious(const T &value)
     \fn template <class T> bool QMutableListIterator<T>::findPrevious(const T &value)
-    \fn template <class T> bool QMutableLinkedListIterator<T>::findPrevious(const T &value)
     \fn template <class T> bool QMutableVectorIterator<T>::findPrevious(const T &value)
     \fn template <class T> bool QMutableSetIterator<T>::findPrevious(const T &value)
 
@@ -873,17 +738,6 @@
     \sa insert(), setValue()
 */
 
-/*! \fn template <class T> void QMutableLinkedListIterator<T>::remove()
-
-    Removes the last item that was jumped over using one of the
-    traversal functions (next(), previous(), findNext(), findPrevious()).
-
-    Example:
-    \snippet code/doc_src_qiterator.cpp 20
-
-    \sa insert(), setValue()
-*/
-
 /*! \fn template <class T> void QMutableVectorIterator<T>::remove()
 
     Removes the last item that was jumped over using one of the
@@ -920,20 +774,6 @@
     \sa value(), remove(), insert()
 */
 
-/*! \fn template <class T> void QMutableLinkedListIterator<T>::setValue(const T &value) const
-
-    Replaces the value of the last item that was jumped over using
-    one of the traversal functions with \a value.
-
-    The traversal functions are next(), previous(), findNext(), and
-    findPrevious().
-
-    Example:
-    \snippet code/doc_src_qiterator.cpp 24
-
-    \sa value(), remove(), insert()
-*/
-
 /*! \fn template <class T> void QMutableVectorIterator<T>::setValue(const T &value) const
 
     Replaces the value of the last item that was jumped over using
@@ -949,7 +789,6 @@
 */
 
 /*! \fn template <class T> const T &QMutableListIterator<T>::value() const
-    \fn template <class T> const T &QMutableLinkedListIterator<T>::value() const
     \fn template <class T> const T &QMutableVectorIterator<T>::value() const
     \fn template <class T> const T &QMutableSetIterator<T>::value() const
 
@@ -964,7 +803,6 @@
 
 /*!
     \fn template <class T> T &QMutableListIterator<T>::value()
-    \fn template <class T> T &QMutableLinkedListIterator<T>::value()
     \fn template <class T> T &QMutableVectorIterator<T>::value()
     \overload
 
@@ -973,7 +811,6 @@
 */
 
 /*! \fn template <class T> void QMutableListIterator<T>::insert(const T &value)
-    \fn template <class T> void QMutableLinkedListIterator<T>::insert(const T &value)
     \fn template <class T> void QMutableVectorIterator<T>::insert(const T &value)
 
     Inserts \a value at the current iterator position. After the
diff --git a/src/corelib/tools/qlinkedlist.cpp b/src/corelib/tools/qlinkedlist.cpp
deleted file mode 100644
index 6a423545da..0000000000
--- a/src/corelib/tools/qlinkedlist.cpp
+++ /dev/null
@@ -1,1238 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtCore module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifdef QT_NO_LINKED_LIST
-# undef QT_NO_LINKED_LIST
-#endif
-
-#include "qlinkedlist.h"
-
-QT_BEGIN_NAMESPACE
-
-#if QT_DEPRECATED_SINCE(5, 15)
-
-QT_WARNING_PUSH
-QT_WARNING_DISABLE_DEPRECATED
-
-const QLinkedListData QLinkedListData::shared_null = {
-    const_cast<QLinkedListData *>(&QLinkedListData::shared_null),
-    const_cast<QLinkedListData *>(&QLinkedListData::shared_null),
-    Q_REFCOUNT_INITIALIZE_STATIC, 0, true
-};
-
-/*! \class QLinkedList
-    \inmodule QtCore
-    \obsolete
-    \brief The QLinkedList class is a template class that provides linked lists.
-
-    \ingroup tools
-    \ingroup shared
-
-    \reentrant
-
-    \note This class is obsolete, please use std::list instead.
-
-    QLinkedList\<T\> is one of Qt's generic \l{container classes}. It
-    stores a list of values and provides iterator-based access as
-    well as \l{constant time} insertions and removals.
-
-    QList\<T\>, QLinkedList\<T\>, and QVector\<T\> provide similar
-    functionality. Here's an overview:
-
-    \list
-    \li For most purposes, QList is the right class to use. Its
-       index-based API is more convenient than QLinkedList's
-       iterator-based API, and it is usually faster than
-       QVector because of the way it stores its items in
-       memory (see \l{Algorithmic Complexity} for details).
-       It also expands to less code in your executable.
-    \li If you need a real linked list, with guarantees of \l{constant
-       time} insertions in the middle of the list and iterators to
-       items rather than indexes, use QLinkedList.
-    \li If you want the items to occupy adjacent memory positions,
-       use QVector.
-    \endlist
-
-    Here's an example of a QLinkedList that stores integers and a
-    QLinkedList that stores QTime values:
-
-    \snippet code/src_corelib_tools_qlinkedlist.cpp 0
-
-    QLinkedList stores a list of items. The default constructor
-    creates an empty list. To insert items into the list, you can use
-    operator<<():
-
-    \snippet code/src_corelib_tools_qlinkedlist.cpp 1
-
-    If you want to get the first or last item in a linked list, use
-    first() or last(). If you want to remove an item from either end
-    of the list, use removeFirst() or removeLast(). If you want to
-    remove all occurrences of a given value in the list, use
-    removeAll().
-
-    A common requirement is to remove the first or last item in the
-    list and do something with it. For this, QLinkedList provides
-    takeFirst() and takeLast(). Here's a loop that removes the items
-    from a list one at a time and calls \c delete on them:
-    \snippet code/src_corelib_tools_qlinkedlist.cpp 2
-
-    QLinkedList's value type must be an \l {assignable data type}. This
-    covers most data types that are commonly used, but the compiler
-    won't let you, for example, store a QWidget as a value; instead,
-    store a QWidget *. A few functions have additional requirements;
-    for example, contains() and removeAll() expect the value type to
-    support \c operator==().  These requirements are documented on a
-    per-function basis.
-
-    If you want to insert, modify, or remove items in the middle of
-    the list, you must use an iterator. QLinkedList provides both
-    \l{Java-style iterators} (QLinkedListIterator and
-    QMutableLinkedListIterator) and \l{STL-style iterators}
-    (QLinkedList::const_iterator and QLinkedList::iterator). See the
-    documentation for these classes for details.
-
-    \sa QLinkedListIterator, QMutableLinkedListIterator, QList, QVector
-*/
-
-/*! \fn template <class T> QLinkedList<T>::QLinkedList()
-
-    Constructs an empty list.
-*/
-
-/*!
-    \fn template <class T> QLinkedList<T>::QLinkedList(QLinkedList<T> &&other)
-
-    Move-constructs a QLinkedList instance, making it point at the same
-    object that \a other was pointing to.
-
-    \since 5.2
-*/
-
-/*! \fn template <class T> QLinkedList<T>::QLinkedList(const QLinkedList<T> &other)
-
-    Constructs a copy of \a other.
-
-    This operation occurs in \l{constant time}, because QLinkedList
-    is \l{implicitly shared}. This makes returning a QLinkedList from
-    a function very fast. If a shared instance is modified, it will
-    be copied (copy-on-write), and this takes \l{linear time}.
-
-    \sa operator=()
-*/
-
-/*! \fn template <class T> QLinkedList<T>::QLinkedList(std::initializer_list<T> list)
-    \since 5.2
-
-    Constructs a list from the std::initializer_list specified by \a list.
-
-    This constructor is only enabled if the compiler supports C++11
-    initializer lists.
-*/
-
-/*! \fn template <class T> template<typename InputIterator> QLinkedList<T>::QLinkedList(InputIterator first, InputIterator last)
-    \since 5.14
-
-    Constructs a list with the contents in the iterator range [\a first, \a last).
-
-    The value type of \c InputIterator must be convertible to \c T.
-*/
-
-/*! \fn template <class T> QLinkedList<T>::~QLinkedList()
-
-    Destroys the list. References to the values in the list, and all
-    iterators over this list, become invalid.
-*/
-
-/*! \fn template <class T> QLinkedList<T> &QLinkedList<T>::operator=(const QLinkedList<T> &other)
-
-    Assigns \a other to this list and returns a reference to this
-    list.
-*/
-
-/*! \fn template <class T> void QLinkedList<T>::swap(QLinkedList<T> &other)
-    \since 4.8
-
-    Swaps list \a other with this list. This operation is very
-    fast and never fails.
-*/
-
-/*! \fn template <class T> bool QLinkedList<T>::operator==(const QLinkedList<T> &other) const
-
-    Returns \c true if \a other is equal to this list; otherwise returns
-    false.
-
-    Two lists are considered equal if they contain the same values in
-    the same order.
-
-    This function requires the value type to implement \c
-    operator==().
-
-    \sa operator!=()
-*/
-
-/*! \fn template <class T> bool QLinkedList<T>::operator!=(const QLinkedList<T> &other) const
-
-    Returns \c true if \a other is not equal to this list; otherwise
-    returns \c false.
-
-    Two lists are considered equal if they contain the same values in
-    the same order.
-
-    This function requires the value type to implement \c
-    operator==().
-
-    \sa operator==()
-*/
-
-/*! \fn template <class T> int QLinkedList<T>::size() const
-
-    Returns the number of items in the list.
-
-    \sa isEmpty(), count()
-*/
-
-/*! \fn template <class T> void QLinkedList<T>::detach()
-
-    \internal
-*/
-
-/*! \fn template <class T> bool QLinkedList<T>::isDetached() const
-
-    \internal
-*/
-
-/*! \fn template <class T> void QLinkedList<T>::setSharable(bool sharable)
-
-    \internal
-*/
-
-/*! \fn template <class T> bool QLinkedList<T>::isSharedWith(const QLinkedList<T> &other) const
-
-    \internal
-*/
-
-/*! \fn template <class T> bool QLinkedList<T>::isEmpty() const
-
-    Returns \c true if the list contains no items; otherwise returns
-    false.
-
-    \sa size()
-*/
-
-/*! \fn template <class T> void QLinkedList<T>::clear()
-
-    Removes all the items in the list.
-
-    \sa removeAll()
-*/
-
-/*! \fn template <class T> void QLinkedList<T>::append(const T &value)
-
-    Inserts \a value at the end of the list.
-
-    Example:
-    \snippet code/src_corelib_tools_qlinkedlist.cpp 3
-
-    This is the same as list.insert(end(), \a value).
-
-    \sa operator<<(), prepend(), insert()
-*/
-
-/*! \fn template <class T> void QLinkedList<T>::prepend(const T &value)
-
-    Inserts \a value at the beginning of the list.
-
-    Example:
-    \snippet code/src_corelib_tools_qlinkedlist.cpp 4
-
-    This is the same as list.insert(begin(), \a value).
-
-    \sa append(), insert()
-*/
-
-/*! \fn template <class T> int QLinkedList<T>::removeAll(const T &value)
-
-    Removes all occurrences of \a value in the list.
-
-    Example:
-    \snippet code/src_corelib_tools_qlinkedlist.cpp 5
-
-    This function requires the value type to have an implementation of
-    \c operator==().
-
-    \sa insert()
-*/
-
-/*!
-    \fn template <class T> bool QLinkedList<T>::removeOne(const T &value)
-    \since 4.4
-
-    Removes the first occurrences of \a value in the list. Returns \c true on
-    success; otherwise returns \c false.
-
-    Example:
-    \snippet code/src_corelib_tools_qlinkedlist.cpp 6
-
-    This function requires the value type to have an implementation of
-    \c operator==().
-
-    \sa insert()
-*/
-
-/*! \fn template <class T> bool QLinkedList<T>::contains(const T &value) const
-
-    Returns \c true if the list contains an occurrence of \a value;
-    otherwise returns \c false.
-
-    This function requires the value type to have an implementation of
-    \c operator==().
-
-    \sa QLinkedListIterator::findNext(), QLinkedListIterator::findPrevious()
-*/
-
-/*! \fn template <class T> int QLinkedList<T>::count(const T &value) const
-
-    Returns the number of occurrences of \a value in the list.
-
-    This function requires the value type to have an implementation of
-    \c operator==().
-
-    \sa contains()
-*/
-
-/*! \fn template <class T> bool QLinkedList<T>::startsWith(const T &value) const
-    \since 4.5
-
-    Returns \c true if the list is not empty and its first
-    item is equal to \a value; otherwise returns \c false.
-
-    \sa isEmpty(), first()
-*/
-
-/*! \fn template <class T> bool QLinkedList<T>::endsWith(const T &value) const
-    \since 4.5
-
-    Returns \c true if the list is not empty and its last
-    item is equal to \a value; otherwise returns \c false.
-
-    \sa isEmpty(), last()
-*/
-
-/*! \fn template <class T> QLinkedList<T>::iterator QLinkedList<T>::begin()
-
-    Returns an \l{STL-style iterators}{STL-style iterator} pointing to the first item in
-    the list.
-
-    \sa constBegin(), end()
-*/
-
-/*! \fn template <class T> QLinkedList<T>::const_iterator QLinkedList<T>::begin() const
-
-    \overload
-*/
-
-/*! \fn template <class T> QLinkedList<T>::const_iterator QLinkedList<T>::cbegin() const
-    \since 5.0
-
-    Returns a const \l{STL-style iterators}{STL-style iterator} pointing to the first item
-    in the list.
-
-    \sa begin(), cend()
-*/
-
-/*! \fn template <class T> QLinkedList<T>::const_iterator QLinkedList<T>::constBegin() const
-
-    Returns a const \l{STL-style iterators}{STL-style iterator} pointing to the first item
-    in the list.
-
-    \sa begin(), constEnd()
-*/
-
-/*! \fn template <class T> QLinkedList<T>::iterator QLinkedList<T>::end()
-
-    Returns an \l{STL-style iterators}{STL-style iterator} pointing to the imaginary item
-    after the last item in the list.
-
-    \sa begin(), constEnd()
-*/
-
-/*! \fn template <class T> QLinkedList<T>::const_iterator QLinkedList<T>::end() const
-
-    \overload
-*/
-
-/*! \fn template <class T> QLinkedList<T>::const_iterator QLinkedList<T>::cend() const
-    \since 5.0
-
-    Returns a const \l{STL-style iterators}{STL-style iterator} pointing to the imaginary
-    item after the last item in the list.
-
-    \sa cbegin(), end()
-*/
-
-/*! \fn template <class T> QLinkedList<T>::const_iterator QLinkedList<T>::constEnd() const
-
-    Returns a const \l{STL-style iterators}{STL-style iterator} pointing to the imaginary
-    item after the last item in the list.
-
-    \sa constBegin(), end()
-*/
-
-/*! \fn template <class T> QLinkedList<T>::reverse_iterator QLinkedList<T>::rbegin()
-    \since 5.6
-
-    Returns a \l{STL-style iterators}{STL-style} reverse iterator pointing to the first
-    item in the list, in reverse order.
-
-    \sa begin(), crbegin(), rend()
-*/
-
-/*! \fn template <class T> QLinkedList<T>::const_reverse_iterator QLinkedList<T>::rbegin() const
-    \since 5.6
-    \overload
-*/
-
-/*! \fn template <class T> QLinkedList<T>::const_reverse_iterator QLinkedList<T>::crbegin() const
-    \since 5.6
-
-    Returns a const \l{STL-style iterators}{STL-style} reverse iterator pointing to the first
-    item in the list, in reverse order.
-
-    \sa begin(), rbegin(), rend()
-*/
-
-/*! \fn template <class T> QLinkedList<T>::reverse_iterator QLinkedList<T>::rend()
-    \since 5.6
-
-    Returns a \l{STL-style iterators}{STL-style} reverse iterator pointing to one past
-    the last item in the list, in reverse order.
-
-    \sa end(), crend(), rbegin()
-*/
-
-/*! \fn template <class T> QLinkedList<T>::const_reverse_iterator QLinkedList<T>::rend() const
-    \since 5.6
-    \overload
-*/
-
-/*! \fn template <class T> QLinkedList<T>::const_reverse_iterator QLinkedList<T>::crend() const
-    \since 5.6
-
-    Returns a const \l{STL-style iterators}{STL-style} reverse iterator pointing to one
-    past the last item in the list, in reverse order.
-
-    \sa end(), rend(), rbegin()
-*/
-
-/*! \fn template <class T> QLinkedList<T>::iterator QLinkedList<T>::insert(iterator before, const T &value)
-
-    Inserts \a value in front of the item pointed to by the iterator
-    \a before. Returns an iterator pointing at the inserted item.
-
-    \sa erase()
-*/
-
-/*! \fn template <class T> QLinkedList<T>::iterator QLinkedList<T>::erase(iterator pos)
-
-    Removes the item pointed to by the iterator \a pos from the list,
-    and returns an iterator to the next item in the list (which may be
-    end()).
-
-    \sa insert()
-*/
-
-/*! \fn template <class T> QLinkedList<T>::iterator QLinkedList<T>::erase(iterator begin, iterator end)
-
-    \overload
-
-    Removes all the items from \a begin up to (but not including) \a
-    end.
-*/
-
-/*! \typedef QLinkedList::Iterator
-
-    Qt-style synonym for QLinkedList::iterator.
-*/
-
-/*! \typedef QLinkedList::ConstIterator
-
-    Qt-style synonym for QLinkedList::const_iterator.
-*/
-
-/*! \typedef QLinkedList::reverse_iterator
-    \since 5.6
-
-    The QLinkedList::reverse_iterator typedef provides an STL-style non-const
-    reverse iterator for QLinkedList.
-
-    It is simply a typedef for \c{std::reverse_iterator<QLinkedList::iterator>}.
-
-    \warning Iterators on implicitly shared containers do not work
-    exactly like STL-iterators. You should avoid copying a container
-    while iterators are active on that container. For more information,
-    read \l{Implicit sharing iterator problem}.
-
-    \sa QLinkedList::rbegin(), QLinkedList::rend(), QLinkedList::const_reverse_iterator, QLinkedList::iterator
-*/
-
-/*! \typedef QLinkedList::const_reverse_iterator
-    \since 5.6
-
-    The QLinkedList::const_reverse_iterator typedef provides an STL-style const
-    reverse iterator for QLinkedList.
-
-    It is simply a typedef for \c{std::reverse_iterator<QLinkedList::const_iterator>}.
-
-    \warning Iterators on implicitly shared containers do not work
-    exactly like STL-iterators. You should avoid copying a container
-    while iterators are active on that container. For more information,
-    read \l{Implicit sharing iterator problem}.
-
-    \sa QLinkedList::rbegin(), QLinkedList::rend(), QLinkedList::reverse_iterator, QLinkedList::const_iterator
-*/
-
-/*!
-    \typedef QLinkedList::size_type
-
-    Typedef for int. Provided for STL compatibility.
-*/
-
-/*!
-    \typedef QLinkedList::value_type
-
-    Typedef for T. Provided for STL compatibility.
-*/
-
-/*!
-    \typedef QLinkedList::pointer
-
-    Typedef for T *. Provided for STL compatibility.
-*/
-
-/*!
-    \typedef QLinkedList::const_pointer
-
-    Typedef for const T *. Provided for STL compatibility.
-*/
-
-/*!
-    \typedef QLinkedList::reference
-
-    Typedef for T &. Provided for STL compatibility.
-*/
-
-/*!
-    \typedef QLinkedList::const_reference
-
-    Typedef for const T &. Provided for STL compatibility.
-*/
-
-/*!
-    \typedef QLinkedList::difference_type
-
-    Typedef for ptrdiff_t. Provided for STL compatibility.
-*/
-
-/*! \fn template <class T> int QLinkedList<T>::count() const
-
-    Same as size().
-*/
-
-/*! \fn template <class T> T& QLinkedList<T>::first()
-
-    Returns a reference to the first item in the list. This function
-    assumes that the list isn't empty.
-
-    \sa last(), isEmpty()
-*/
-
-/*! \fn template <class T> const T& QLinkedList<T>::first() const
-
-    \overload
-*/
-
-/*! \fn template <class T> T& QLinkedList<T>::last()
-
-    Returns a reference to the last item in the list. This function
-    assumes that the list isn't empty.
-
-    \sa first(), isEmpty()
-*/
-
-/*! \fn template <class T> const T& QLinkedList<T>::last() const
-
-    \overload
-*/
-
-/*! \fn template <class T> void QLinkedList<T>::removeFirst()
-
-    Removes the first item in the list.
-
-    This is the same as erase(begin()).
-
-    \sa removeLast(), erase()
-*/
-
-/*! \fn template <class T> void QLinkedList<T>::removeLast()
-
-    Removes the last item in the list.
-
-    \sa removeFirst(), erase()
-*/
-
-/*! \fn template <class T> T QLinkedList<T>::takeFirst()
-
-    Removes the first item in the list and returns it.
-
-    If you don't use the return value, removeFirst() is more
-    efficient.
-
-    \sa takeLast(), removeFirst()
-*/
-
-/*! \fn template <class T> T QLinkedList<T>::takeLast()
-
-    Removes the last item in the list and returns it.
-
-    If you don't use the return value, removeLast() is more
-    efficient.
-
-    \sa takeFirst(), removeLast()
-*/
-
-/*! \fn template <class T> void QLinkedList<T>::push_back(const T &value)
-
-    This function is provided for STL compatibility. It is equivalent
-    to append(\a value).
-*/
-
-/*! \fn template <class T> void QLinkedList<T>::push_front(const T &value)
-
-    This function is provided for STL compatibility. It is equivalent
-    to prepend(\a value).
-*/
-
-/*! \fn template <class T> T& QLinkedList<T>::front()
-
-    This function is provided for STL compatibility. It is equivalent
-    to first().
-*/
-
-/*! \fn template <class T> const T& QLinkedList<T>::front() const
-
-    \overload
-*/
-
-/*! \fn template <class T> T& QLinkedList<T>::back()
-
-    This function is provided for STL compatibility. It is equivalent
-    to last().
-*/
-
-/*! \fn template <class T> const T& QLinkedList<T>::back() const
-
-    \overload
-*/
-
-/*! \fn template <class T> void QLinkedList<T>::pop_front()
-
-    This function is provided for STL compatibility. It is equivalent
-    to removeFirst().
-*/
-
-/*! \fn template <class T> void QLinkedList<T>::pop_back()
-
-    This function is provided for STL compatibility. It is equivalent
-    to removeLast().
-*/
-
-/*! \fn template <class T> bool QLinkedList<T>::empty() const
-
-    This function is provided for STL compatibility. It is equivalent
-    to isEmpty() and returns \c true if the list is empty.
-*/
-
-/*! \fn template <class T> QLinkedList<T> &QLinkedList<T>::operator+=(const QLinkedList<T> &other)
-
-    Appends the items of the \a other list to this list and returns a
-    reference to this list.
-
-    \sa operator+(), append()
-*/
-
-/*! \fn template <class T> void QLinkedList<T>::operator+=(const T &value)
-
-    \overload
-
-    Appends \a value to the list.
-*/
-
-/*! \fn template <class T> QLinkedList<T> QLinkedList<T>::operator+(const QLinkedList<T> &other) const
-
-    Returns a list that contains all the items in this list followed
-    by all the items in the \a other list.
-
-    \sa operator+=()
-*/
-
-/*! \fn template <class T> QLinkedList<T> &QLinkedList<T>::operator<<(const QLinkedList<T> &other)
-
-    Appends the items of the \a other list to this list and returns a
-    reference to this list.
-
-    \sa operator+=(), append()
-*/
-
-/*! \fn template <class T> QLinkedList<T> &QLinkedList<T>::operator<<(const T &value)
-
-    \overload
-
-    Appends \a value to the list.
-*/
-
-/*! \class QLinkedList::iterator
-    \inmodule QtCore
-    \obsolete
-    \brief The QLinkedList::iterator class provides an STL-style non-const iterator for QLinkedList.
-
-    QLinkedList features both \l{STL-style iterators} and
-    \l{Java-style iterators}. The STL-style iterators are more
-    low-level and more cumbersome to use; on the other hand, they are
-    slightly faster and, for developers who already know STL, have
-    the advantage of familiarity.
-
-    QLinkedList\<T\>::iterator allows you to iterate over a
-    QLinkedList\<T\> and to modify the list item associated with the
-    iterator. If you want to iterate over a const QLinkedList, use
-    QLinkedList::const_iterator instead. It is generally good
-    practice to use QLinkedList::const_iterator on a non-const
-    QLinkedList as well, unless you need to change the QLinkedList
-    through the iterator. Const iterators are slightly faster, and
-    can improve code readability.
-
-    The default QLinkedList::iterator constructor creates an
-    uninitialized iterator. You must initialize it using a
-    function like QLinkedList::begin(), QLinkedList::end(), or
-    QLinkedList::insert() before you can start iterating. Here's a
-    typical loop that prints all the items stored in a list:
-
-    \snippet code/src_corelib_tools_qlinkedlist.cpp 7
-
-    STL-style iterators can be used as arguments to \l{generic
-    algorithms}. For example, here's how to find an item in the list:
-
-    \snippet code/src_corelib_tools_qlinkedlist.cpp 8
-
-    Let's see a few examples of things we can do with a
-    QLinkedList::iterator that we cannot do with a QLinkedList::const_iterator.
-    Here's an example that increments every value stored in a
-    QLinkedList\<int\> by 2:
-
-    \snippet code/src_corelib_tools_qlinkedlist.cpp 9
-
-    Here's an example that removes all the items that start with an
-    underscore character in a QLinkedList\<QString\>:
-
-    \snippet code/src_corelib_tools_qlinkedlist.cpp 10
-
-    The call to QLinkedList::erase() removes the item pointed to by
-    the iterator from the list, and returns an iterator to the next
-    item. Here's another way of removing an item while iterating:
-
-    \snippet code/src_corelib_tools_qlinkedlist.cpp 11
-
-    It might be tempting to write code like this:
-
-    \snippet code/src_corelib_tools_qlinkedlist.cpp 12
-
-    However, this will potentially crash in \c{++i}, because \c i is
-    a dangling iterator after the call to erase().
-
-    Multiple iterators can be used on the same list. If you add items
-    to the list, existing iterators will remain valid. If you remove
-    items from the list, iterators that point to the removed items
-    will become dangling iterators.
-
-    \warning Iterators on implicitly shared containers do not work
-    exactly like STL-iterators. You should avoid copying a container
-    while iterators are active on that container. For more information,
-    read \l{Implicit sharing iterator problem}.
-
-    \sa QLinkedList::const_iterator, QMutableLinkedListIterator
-*/
-
-/*! \fn template <class T> QLinkedList<T>::iterator::iterator()
-
-    Constructs an uninitialized iterator.
-
-    Functions like operator*() and operator++() should not be called
-    on an uninitialized iterator. Use operator=() to assign a value
-    to it before using it.
-
-    \sa QLinkedList::begin(), QLinkedList::end()
-*/
-
-/*! \fn template <class T> QLinkedList<T>::iterator::iterator(Node *node)
-
-    \internal
-*/
-
-/*! \typedef QLinkedList::iterator::iterator_category
-
-    \internal
-*/
-
-/*! \typedef QLinkedList::iterator::difference_type
-
-    \internal
-*/
-
-/*! \typedef QLinkedList::iterator::value_type
-
-    \internal
-*/
-
-/*! \typedef QLinkedList::iterator::pointer
-
-    \internal
-*/
-
-/*! \typedef QLinkedList::iterator::reference
-
-    \internal
-*/
-
-/*! \fn template <class T> QLinkedList<T>::iterator::iterator(const iterator &other)
-
-    Constructs a copy of \a other.
-*/
-
-/*! \fn template <class T> QLinkedList<T>::iterator &QLinkedList<T>::iterator::operator=(const iterator &other)
-
-    Assigns \a other to this iterator.
-*/
-
-/*!
-    \fn template <class T> QLinkedList<T> &QLinkedList<T>::operator=(QLinkedList<T> &&other)
-
-    Move-assigns \a other to this QLinkedList instance.
-
-    \since 5.2
-*/
-
-/*! \fn template <class T> T &QLinkedList<T>::iterator::operator*() const
-
-    Returns a modifiable reference to the current item.
-
-    You can change the value of an item by using operator*() on the
-    left side of an assignment, for example:
-
-    \snippet code/src_corelib_tools_qlinkedlist.cpp 13
-
-    \sa operator->()
-*/
-
-/*! \fn template <class T> T *QLinkedList<T>::iterator::operator->() const
-
-    Returns a pointer to the current item.
-
-    \sa operator*()
-*/
-
-/*!
-    \fn template <class T> bool QLinkedList<T>::iterator::operator==(const iterator &other) const
-    \fn template <class T> bool QLinkedList<T>::iterator::operator==(const const_iterator &other) const
-
-    Returns \c true if \a other points to the same item as this
-    iterator; otherwise returns \c false.
-
-    \sa operator!=()
-*/
-
-/*!
-    \fn template <class T> bool QLinkedList<T>::iterator::operator!=(const iterator &other) const
-    \fn template <class T> bool QLinkedList<T>::iterator::operator!=(const const_iterator &other) const
-
-    Returns \c true if \a other points to a different item than this
-    iterator; otherwise returns \c false.
-
-    \sa operator==()
-*/
-
-/*! \fn template <class T> QLinkedList<T>::iterator &QLinkedList<T>::iterator::operator++()
-
-    The prefix ++ operator (\c{++it}) advances the iterator to the
-    next item in the list and returns an iterator to the new current
-    item.
-
-    Calling this function on QLinkedList::end() leads to undefined
-    results.
-
-    \sa operator--()
-*/
-
-/*! \fn template <class T> QLinkedList<T>::iterator QLinkedList<T>::iterator::operator++(int)
-
-    \overload
-
-    The postfix ++ operator (\c{it++}) advances the iterator to the
-    next item in the list and returns an iterator to the previously
-    current item.
-*/
-
-/*! \fn template <class T> QLinkedList<T>::iterator &QLinkedList<T>::iterator::operator--()
-
-    The prefix -- operator (\c{--it}) makes the preceding item
-    current and returns an iterator to the new current item.
-
-    Calling this function on QLinkedList::begin() leads to undefined
-    results.
-
-    \sa operator++()
-*/
-
-/*! \fn template <class T> QLinkedList<T>::iterator QLinkedList<T>::iterator::operator--(int)
-
-    \overload
-
-    The postfix -- operator (\c{it--}) makes the preceding item
-    current and returns an iterator to the previously current item.
-*/
-
-/*! \fn template <class T> QLinkedList<T>::iterator QLinkedList<T>::iterator::operator+(int j) const
-
-    Returns an iterator to the item at \a j positions forward from
-    this iterator. (If \a j is negative, the iterator goes backward.)
-
-    This operation can be slow for large \a j values.
-
-    \sa operator-()
-
-*/
-
-/*! \fn template <class T> QLinkedList<T>::iterator QLinkedList<T>::iterator::operator-(int j) const
-
-    Returns an iterator to the item at \a j positions backward from
-    this iterator. (If \a j is negative, the iterator goes forward.)
-
-    This operation can be slow for large \a j values.
-
-    \sa operator+()
-*/
-
-/*! \fn template <class T> QLinkedList<T>::iterator &QLinkedList<T>::iterator::operator+=(int j)
-
-    Advances the iterator by \a j items. (If \a j is negative, the
-    iterator goes backward.)
-
-    \sa operator-=(), operator+()
-*/
-
-/*! \fn template <class T> QLinkedList<T>::iterator &QLinkedList<T>::iterator::operator-=(int j)
-
-    Makes the iterator go back by \a j items. (If \a j is negative,
-    the iterator goes forward.)
-
-    \sa operator+=(), operator-()
-*/
-
-/*! \class QLinkedList::const_iterator
-    \inmodule QtCore
-    \obsolete
-    \brief The QLinkedList::const_iterator class provides an STL-style const iterator for QLinkedList.
-
-    QLinkedList features both \l{STL-style iterators} and
-    \l{Java-style iterators}. The STL-style iterators are more
-    low-level and more cumbersome to use; on the other hand, they are
-    slightly faster and, for developers who already know STL, have
-    the advantage of familiarity.
-
-    QLinkedList\<T\>::const_iterator allows you to iterate over a
-    QLinkedList\<T\>. If you want modify the QLinkedList as you iterate
-    over it, you must use QLinkedList::iterator instead. It is
-    generally good practice to use QLinkedList::const_iterator on a
-    non-const QLinkedList as well, unless you need to change the
-    QLinkedList through the iterator. Const iterators are slightly
-    faster, and can improve code readability.
-
-    The default QLinkedList::const_iterator constructor creates an
-    uninitialized iterator. You must initialize it using a function
-    like QLinkedList::constBegin(), QLinkedList::constEnd(), or
-    QLinkedList::insert() before you can start iterating. Here's a
-    typical loop that prints all the items stored in a list:
-
-    \snippet code/src_corelib_tools_qlinkedlist.cpp 14
-
-    STL-style iterators can be used as arguments to \l{generic
-    algorithms}. For example, here's how to find an item in the list:
-
-    \snippet code/src_corelib_tools_qlinkedlist.cpp 15
-
-    Multiple iterators can be used on the same list. If you add items
-    to the list, existing iterators will remain valid. If you remove
-    items from the list, iterators that point to the removed items
-    will become dangling iterators.
-
-    \warning Iterators on implicitly shared containers do not work
-    exactly like STL-iterators. You should avoid copying a container
-    while iterators are active on that container. For more information,
-    read \l{Implicit sharing iterator problem}.
-
-    \sa QLinkedList::iterator, QLinkedListIterator
-*/
-
-/*! \fn template <class T> QLinkedList<T>::const_iterator::const_iterator()
-
-    Constructs an uninitialized iterator.
-
-    Functions like operator*() and operator++() should not be called
-    on an uninitialized iterator. Use operator=() to assign a value
-    to it before using it.
-
-    \sa QLinkedList::constBegin(), QLinkedList::constEnd()
-*/
-
-/*! \fn template <class T> QLinkedList<T>::const_iterator::const_iterator(Node *node)
-
-    \internal
-*/
-
-/*! \typedef QLinkedList::const_iterator::iterator_category
-
-    \internal
-*/
-
-/*! \typedef QLinkedList::const_iterator::difference_type
-
-    \internal
-*/
-
-/*! \typedef QLinkedList::const_iterator::value_type
-
-    \internal
-*/
-
-/*! \typedef QLinkedList::const_iterator::pointer
-
-    \internal
-*/
-
-/*! \typedef QLinkedList::const_iterator::reference
-
-    \internal
-*/
-
-/*! \fn template <class T> QLinkedList<T>::const_iterator::const_iterator(const const_iterator &other)
-
-    Constructs a copy of \a other.
-*/
-
-/*! \fn template <class T> QLinkedList<T>::const_iterator::const_iterator(iterator other)
-
-    Constructs a copy of \a other.
-*/
-
-/*! \fn template <class T> typename QLinkedList<T>::const_iterator &QLinkedList<T>::const_iterator::operator=(const const_iterator &other)
-
-    Assigns \a other to this iterator.
-*/
-
-/*! \fn template <class T> const T &QLinkedList<T>::const_iterator::operator*() const
-
-    Returns a reference to the current item.
-
-    \sa operator->()
-*/
-
-/*! \fn template <class T> const T *QLinkedList<T>::const_iterator::operator->() const
-
-    Returns a pointer to the current item.
-
-    \sa operator*()
-*/
-
-/*! \fn template <class T> bool QLinkedList<T>::const_iterator::operator==(const const_iterator &other) const
-
-    Returns \c true if \a other points to the same item as this
-    iterator; otherwise returns \c false.
-
-    \sa operator!=()
-*/
-
-/*! \fn template <class T> bool QLinkedList<T>::const_iterator::operator!=(const const_iterator &other) const
-
-    Returns \c true if \a other points to a different item than this
-    iterator; otherwise returns \c false.
-
-    \sa operator==()
-*/
-
-/*! \fn template <class T> QLinkedList<T>::const_iterator &QLinkedList<T>::const_iterator::operator++()
-
-    The prefix ++ operator (\c{++it}) advances the iterator to the
-    next item in the list and returns an iterator to the new current
-    item.
-
-    Calling this function on QLinkedList<T>::constEnd() leads to
-    undefined results.
-
-    \sa operator--()
-*/
-
-/*! \fn template <class T> QLinkedList<T>::const_iterator QLinkedList<T>::const_iterator::operator++(int)
-
-    \overload
-
-    The postfix ++ operator (\c{it++}) advances the iterator to the
-    next item in the list and returns an iterator to the previously
-    current item.
-*/
-
-/*! \fn template <class T> QLinkedList<T>::const_iterator &QLinkedList<T>::const_iterator::operator--()
-
-    The prefix -- operator (\c{--it}) makes the preceding item
-    current and returns an iterator to the new current item.
-
-    Calling this function on QLinkedList::begin() leads to undefined
-    results.
-
-    \sa operator++()
-*/
-
-/*! \fn template <class T> QLinkedList<T>::const_iterator QLinkedList<T>::const_iterator::operator--(int)
-
-    \overload
-
-    The postfix -- operator (\c{it--}) makes the preceding item
-    current and returns an iterator to the previously current item.
-*/
-
-/*! \fn template <class T> QLinkedList<T>::const_iterator QLinkedList<T>::const_iterator::operator+(int j) const
-
-    Returns an iterator to the item at \a j positions forward from
-    this iterator. (If \a j is negative, the iterator goes backward.)
-
-    This operation can be slow for large \a j values.
-
-    \sa operator-()
-*/
-
-/*! \fn template <class T> QLinkedList<T>::const_iterator QLinkedList<T>::const_iterator::operator-(int j) const
-
-    This function returns an iterator to the item at \a j positions backward from
-    this iterator. (If \a j is negative, the iterator goes forward.)
-
-    This operation can be slow for large \a j values.
-
-    \sa operator+()
-*/
-
-/*! \fn template <class T> QLinkedList<T>::const_iterator &QLinkedList<T>::const_iterator::operator+=(int j)
-
-    Advances the iterator by \a j items. (If \a j is negative, the
-    iterator goes backward.)
-
-    This operation can be slow for large \a j values.
-
-    \sa operator-=(), operator+()
-*/
-
-/*! \fn template <class T> QLinkedList<T>::const_iterator &QLinkedList<T>::const_iterator::operator-=(int j)
-
-    Makes the iterator go back by \a j items. (If \a j is negative,
-    the iterator goes forward.)
-
-    This operation can be slow for large \a j values.
-
-    \sa operator+=(), operator-()
-*/
-
-/*! \fn template <class T> QDataStream &operator<<(QDataStream &out, const QLinkedList<T> &list)
-    \relates QLinkedList
-
-    Writes the linked list \a list to stream \a out.
-
-    This function requires the value type to implement \c
-    operator<<().
-
-    \sa{Serializing Qt Data Types}{Format of the QDataStream operators}
-*/
-
-/*! \fn template <class T> QDataStream &operator>>(QDataStream &in, QLinkedList<T> &list)
-    \relates QLinkedList
-
-    Reads a linked list from stream \a in into \a list.
-
-    This function requires the value type to implement \c operator>>().
-
-    \sa{Serializing Qt Data Types}{Format of the QDataStream operators}
-*/
-
-/*!
-    \since 4.1
-    \fn template <class T> QLinkedList<T> QLinkedList<T>::fromStdList(const std::list<T> &list)
-
-    Returns a QLinkedList object with the data contained in \a list.
-    The order of the elements in the QLinkedList is the same as in \a
-    list.
-
-    Example:
-
-    \snippet code/src_corelib_tools_qlinkedlist.cpp 16
-
-    \sa toStdList()
-*/
-
-/*!
-    \since 4.1
-    \fn template <class T> std::list<T> QLinkedList<T>::toStdList() const
-
-    Returns a std::list object with the data contained in this
-    QLinkedList. Example:
-
-    \snippet code/src_corelib_tools_qlinkedlist.cpp 17
-
-    \sa fromStdList()
-*/
-
-QT_WARNING_POP
-
-#endif // QT_DEPRECATED_SINCE(5, 15)
-
-QT_END_NAMESPACE
diff --git a/src/corelib/tools/qlinkedlist.h b/src/corelib/tools/qlinkedlist.h
deleted file mode 100644
index 14fbc34b9d..0000000000
--- a/src/corelib/tools/qlinkedlist.h
+++ /dev/null
@@ -1,615 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtCore module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QLINKEDLIST_H
-#define QLINKEDLIST_H
-
-#include <QtCore/qglobal.h>
-
-#ifndef QT_NO_LINKED_LIST
-
-#include <QtCore/qiterator.h>
-#include <QtCore/qrefcount.h>
-#include <QtCore/qcontainertools_impl.h>
-#include <QtCore/qdatastream.h>
-#include <QtCore/qtypeinfo.h>
-
-#include <algorithm>
-#include <initializer_list>
-#include <iterator>
-#include <list>
-
-
-#if 0
-// This is needed because of QTBUG-80347
-#pragma qt_class(QLinkedList)
-#pragma qt_class(QLinkedListData)
-#pragma qt_class(QLinkedListNode)
-#endif
-
-#if QT_DEPRECATED_SINCE(5, 15)
-
-QT_WARNING_PUSH
-QT_WARNING_DISABLE_DEPRECATED
-
-QT_BEGIN_NAMESPACE
-
-struct QT_DEPRECATED_VERSION_5_15 QLinkedListData
-{
-    QLinkedListData *n, *p;
-    QtPrivate::RefCount ref;
-    int size;
-    uint sharable : 1;
-
-    Q_CORE_EXPORT static const QLinkedListData shared_null;
-};
-
-template <typename T>
-struct QT_DEPRECATED_VERSION_5_15 QLinkedListNode
-{
-    inline QLinkedListNode(const T &arg): t(arg) { }
-    QLinkedListNode *n, *p;
-    T t;
-};
-
-template <class T>
-class QT_DEPRECATED_VERSION_X_5_15("Use std::list instead") QLinkedList
-{
-    typedef QLinkedListNode<T> Node;
-    union { QLinkedListData *d; QLinkedListNode<T> *e; };
-
-public:
-    inline QLinkedList() noexcept : d(const_cast<QLinkedListData *>(&QLinkedListData::shared_null)) { }
-    inline QLinkedList(const QLinkedList<T> &l) : d(l.d) { d->ref.ref(); if (!d->sharable) detach(); }
-    inline QLinkedList(std::initializer_list<T> list)
-        : QLinkedList(list.begin(), list.end()) {}
-    template <typename InputIterator, QtPrivate::IfIsInputIterator<InputIterator> = true>
-    inline QLinkedList(InputIterator first, InputIterator last)
-        : QLinkedList()
-    {
-        std::copy(first, last, std::back_inserter(*this));
-    }
-    ~QLinkedList();
-    QLinkedList<T> &operator=(const QLinkedList<T> &);
-    QLinkedList(QLinkedList<T> &&other) noexcept
-        : d(other.d) { other.d = const_cast<QLinkedListData *>(&QLinkedListData::shared_null); }
-    QLinkedList<T> &operator=(QLinkedList<T> &&other) noexcept
-    { QLinkedList moved(std::move(other)); swap(moved); return *this; }
-    inline void swap(QLinkedList<T> &other) noexcept { qSwap(d, other.d); }
-    bool operator==(const QLinkedList<T> &l) const;
-    inline bool operator!=(const QLinkedList<T> &l) const { return !(*this == l); }
-
-    inline int size() const { return d->size; }
-    inline void detach()
-    { if (d->ref.isShared()) detach_helper2(this->e); }
-    inline bool isDetached() const { return !d->ref.isShared(); }
-#if !defined(QT_NO_UNSHARABLE_CONTAINERS)
-    inline void setSharable(bool sharable) { if (!sharable) detach(); if (d != &QLinkedListData::shared_null) d->sharable = sharable; }
-#endif
-    inline bool isSharedWith(const QLinkedList<T> &other) const { return d == other.d; }
-
-    inline bool isEmpty() const { return d->size == 0; }
-
-    void clear();
-
-    void append(const T &);
-    void prepend(const T &);
-    T takeFirst();
-    T takeLast();
-    int removeAll(const T &t);
-    bool removeOne(const T &t);
-    bool contains(const T &t) const;
-    int count(const T &t) const;
-
-    class const_iterator;
-
-    class iterator
-    {
-    public:
-        typedef std::bidirectional_iterator_tag  iterator_category;
-        typedef qptrdiff difference_type;
-        typedef T value_type;
-        typedef T *pointer;
-        typedef T &reference;
-        Node *i;
-        inline iterator() : i(nullptr) {}
-        inline iterator(Node *n) : i(n) {}
-#if QT_VERSION < QT_VERSION_CHECK(6,0,0)
-        iterator(const iterator &other) noexcept : i(other.i) {}
-        iterator &operator=(const iterator &other) noexcept { i = other.i; return *this; }
-        iterator(iterator &&other) noexcept : i(other.i) {}
-        iterator &operator=(iterator &&other) noexcept { return *this = other; }
-#endif
-        inline T &operator*() const { return i->t; }
-        inline T *operator->() const { return &i->t; }
-        inline bool operator==(const iterator &o) const { return i == o.i; }
-        inline bool operator!=(const iterator &o) const { return i != o.i; }
-        inline bool operator==(const const_iterator &o) const
-            { return i == o.i; }
-        inline bool operator!=(const const_iterator &o) const
-            { return i != o.i; }
-        inline iterator &operator++() { i = i->n; return *this; }
-        inline iterator operator++(int) { Node *n = i; i = i->n; return n; }
-        inline iterator &operator--() { i = i->p; return *this; }
-        inline iterator operator--(int) { Node *n = i; i = i->p; return n; }
-        inline iterator operator+(int j) const
-        { Node *n = i; if (j > 0) while (j--) n = n->n; else while (j++) n = n->p; return n; }
-        inline iterator operator-(int j) const { return operator+(-j); }
-        inline iterator &operator+=(int j) { return *this = *this + j; }
-        inline iterator &operator-=(int j) { return *this = *this - j; }
-        friend inline iterator operator+(int j, iterator k) { return k + j; }
-    };
-    friend class iterator;
-
-    class const_iterator
-    {
-    public:
-        typedef std::bidirectional_iterator_tag  iterator_category;
-        typedef qptrdiff difference_type;
-        typedef T value_type;
-        typedef const T *pointer;
-        typedef const T &reference;
-        Node *i;
-        inline const_iterator() : i(nullptr) {}
-        inline const_iterator(Node *n) : i(n) {}
-        inline const_iterator(iterator ci) : i(ci.i){}
-#if QT_VERSION < QT_VERSION_CHECK(6,0,0)
-        const_iterator(const const_iterator &other) noexcept : i(other.i) {}
-        const_iterator &operator=(const const_iterator &other) noexcept { i = other.i; return *this; }
-        const_iterator(const_iterator &&other) noexcept : i(other.i) {}
-        const_iterator &operator=(const_iterator &&other) noexcept { return *this = other; }
-#endif
-        inline const T &operator*() const { return i->t; }
-        inline const T *operator->() const { return &i->t; }
-        inline bool operator==(const const_iterator &o) const { return i == o.i; }
-        inline bool operator!=(const const_iterator &o) const { return i != o.i; }
-        inline const_iterator &operator++() { i = i->n; return *this; }
-        inline const_iterator operator++(int) { Node *n = i; i = i->n; return n; }
-        inline const_iterator &operator--() { i = i->p; return *this; }
-        inline const_iterator operator--(int) { Node *n = i; i = i->p; return n; }
-        inline const_iterator operator+(int j) const
-        { Node *n = i; if (j > 0) while (j--) n = n->n; else while (j++) n = n->p; return n; }
-        inline const_iterator operator-(int j) const { return operator+(-j); }
-        inline const_iterator &operator+=(int j) { return *this = *this + j; }
-        inline const_iterator &operator-=(int j) { return *this = *this - j; }
-        friend inline const_iterator operator+(int j, const_iterator k) { return k + j; }
-    };
-    friend class const_iterator;
-
-    // stl style
-    typedef std::reverse_iterator<iterator> reverse_iterator;
-    typedef std::reverse_iterator<const_iterator> const_reverse_iterator;
-
-    inline iterator begin() { detach(); return e->n; }
-    inline const_iterator begin() const noexcept { return e->n; }
-    inline const_iterator cbegin() const noexcept { return e->n; }
-    inline const_iterator constBegin() const noexcept { return e->n; }
-    inline iterator end() { detach(); return e; }
-    inline const_iterator end() const noexcept { return e; }
-    inline const_iterator cend() const noexcept { return e; }
-    inline const_iterator constEnd() const noexcept { return e; }
-
-    reverse_iterator rbegin() { return reverse_iterator(end()); }
-    reverse_iterator rend() { return reverse_iterator(begin()); }
-    const_reverse_iterator rbegin() const noexcept { return const_reverse_iterator(end()); }
-    const_reverse_iterator rend() const noexcept { return const_reverse_iterator(begin()); }
-    const_reverse_iterator crbegin() const noexcept { return const_reverse_iterator(end()); }
-    const_reverse_iterator crend() const noexcept { return const_reverse_iterator(begin()); }
-
-    iterator insert(iterator before, const T &t);
-    iterator erase(iterator pos);
-    iterator erase(iterator first, iterator last);
-
-    // more Qt
-    typedef iterator Iterator;
-    typedef const_iterator ConstIterator;
-    inline int count() const { return d->size; }
-    inline T& first() { Q_ASSERT(!isEmpty()); return *begin(); }
-    inline const T& first() const { Q_ASSERT(!isEmpty()); return *begin(); }
-    T& last() { Q_ASSERT(!isEmpty()); return *(--end()); }
-    const T& last() const { Q_ASSERT(!isEmpty()); return *(--end()); }
-    inline void removeFirst() { Q_ASSERT(!isEmpty()); erase(begin()); }
-    inline void removeLast() { Q_ASSERT(!isEmpty()); erase(--end()); }
-    inline bool startsWith(const T &t) const { return !isEmpty() && first() == t; }
-    inline bool endsWith(const T &t) const { return !isEmpty() && last() == t; }
-
-    // stl compatibility
-    inline void push_back(const T &t) { append(t); }
-    inline void push_front(const T &t) { prepend(t); }
-    inline T& front() { return first(); }
-    inline const T& front() const { return first(); }
-    inline T& back() { return last(); }
-    inline const T& back() const { return last(); }
-    inline void pop_front() { removeFirst(); }
-    inline void pop_back() { removeLast(); }
-    inline bool empty() const { return isEmpty(); }
-    typedef int size_type;
-    typedef T value_type;
-    typedef value_type *pointer;
-    typedef const value_type *const_pointer;
-    typedef value_type &reference;
-    typedef const value_type &const_reference;
-    typedef qptrdiff difference_type;
-
-    static inline QLinkedList<T> fromStdList(const std::list<T> &list)
-    { QLinkedList<T> tmp; std::copy(list.begin(), list.end(), std::back_inserter(tmp)); return tmp; }
-    inline std::list<T> toStdList() const
-    { std::list<T> tmp; std::copy(constBegin(), constEnd(), std::back_inserter(tmp)); return tmp; }
-
-    // comfort
-    QLinkedList<T> &operator+=(const QLinkedList<T> &l);
-    QLinkedList<T> operator+(const QLinkedList<T> &l) const;
-    inline QLinkedList<T> &operator+=(const T &t) { append(t); return *this; }
-    inline QLinkedList<T> &operator<< (const T &t) { append(t); return *this; }
-    inline QLinkedList<T> &operator<<(const QLinkedList<T> &l) { *this += l; return *this; }
-
-private:
-    void detach_helper();
-    iterator detach_helper2(iterator);
-    void freeData(QLinkedListData*);
-};
-template <typename T>
-Q_DECLARE_TYPEINFO_BODY(QLinkedList<T>, Q_MOVABLE_TYPE|Q_RELOCATABLE_TYPE);
-
-#if defined(__cpp_deduction_guides) && __cpp_deduction_guides >= 201606
-template <typename InputIterator,
-          typename ValueType = typename std::iterator_traits<InputIterator>::value_type,
-          QtPrivate::IfIsInputIterator<InputIterator> = true>
-QLinkedList(InputIterator, InputIterator) -> QLinkedList<ValueType>;
-#endif
-
-template <typename T>
-inline QLinkedList<T>::~QLinkedList()
-{
-    if (!d->ref.deref())
-        freeData(d);
-}
-
-template <typename T>
-void QLinkedList<T>::detach_helper()
-{
-    detach_helper2(this->e);
-}
-
-template <typename T>
-typename QLinkedList<T>::iterator QLinkedList<T>::detach_helper2(iterator orgite)
-{
-    // detach and convert orgite to an iterator in the detached instance
-    bool isEndIterator = (orgite.i == this->e);
-    union { QLinkedListData *d; Node *e; } x;
-    x.d = new QLinkedListData;
-    x.d->ref.initializeOwned();
-    x.d->size = d->size;
-    x.d->sharable = true;
-    Node *original = e->n;
-    Node *copy = x.e;
-    Node *org = orgite.i;
-
-    while (original != org) {
-        QT_TRY {
-            copy->n = new Node(original->t);
-            copy->n->p = copy;
-            original = original->n;
-            copy = copy->n;
-        } QT_CATCH(...) {
-            copy->n = x.e;
-            Q_ASSERT(!x.d->ref.deref()); // Don't trigger assert in free
-            freeData(x.d);
-            QT_RETHROW;
-        }
-    }
-    iterator r(copy);
-    while (original != e) {
-        QT_TRY {
-            copy->n = new Node(original->t);
-            copy->n->p = copy;
-            original = original->n;
-            copy = copy->n;
-        } QT_CATCH(...) {
-            copy->n = x.e;
-            Q_ASSERT(!x.d->ref.deref()); // Don't trigger assert in free
-            freeData(x.d);
-            QT_RETHROW;
-        }
-    }
-    copy->n = x.e;
-    x.e->p = copy;
-    if (!d->ref.deref())
-        freeData(d);
-    d = x.d;
-    if (!isEndIterator)
-        ++r; // since we stored the element right before the original node.
-    return r;
-}
-
-template <typename T>
-void QLinkedList<T>::freeData(QLinkedListData *x)
-{
-    Node *y = reinterpret_cast<Node*>(x);
-    Node *i = y->n;
-    Q_ASSERT(x->ref.atomic.loadRelaxed() == 0);
-    while (i != y) {
-        Node *n = i;
-        i = i->n;
-        delete n;
-    }
-    delete x;
-}
-
-template <typename T>
-void QLinkedList<T>::clear()
-{
-    *this = QLinkedList<T>();
-}
-
-template <typename T>
-QLinkedList<T> &QLinkedList<T>::operator=(const QLinkedList<T> &l)
-{
-    if (d != l.d) {
-        QLinkedListData *o = l.d;
-        o->ref.ref();
-        if (!d->ref.deref())
-            freeData(d);
-        d = o;
-        if (!d->sharable)
-            detach_helper();
-    }
-    return *this;
-}
-
-template <typename T>
-bool QLinkedList<T>::operator== (const QLinkedList<T> &l) const
-{
-    if (d->size != l.d->size)
-        return false;
-    if (e == l.e)
-        return true;
-    Node *i = e->n;
-    Node *il = l.e->n;
-    while (i != e) {
-        if (! (i->t == il->t))
-            return false;
-        i = i->n;
-        il = il->n;
-    }
-    return true;
-}
-
-template <typename T>
-void QLinkedList<T>::append(const T &t)
-{
-    detach();
-    Node *i = new Node(t);
-    i->n = e;
-    i->p = e->p;
-    i->p->n = i;
-    e->p = i;
-    d->size++;
-}
-
-template <typename T>
-void QLinkedList<T>::prepend(const T &t)
-{
-    detach();
-    Node *i = new Node(t);
-    i->n = e->n;
-    i->p = e;
-    i->n->p = i;
-    e->n = i;
-    d->size++;
-}
-
-template <typename T>
-int QLinkedList<T>::removeAll(const T &_t)
-{
-    detach();
-    const T t = _t;
-    Node *i = e->n;
-    int c = 0;
-    while (i != e) {
-        if (i->t == t) {
-            Node *n = i;
-            i->n->p = i->p;
-            i->p->n = i->n;
-            i = i->n;
-            delete n;
-            c++;
-        } else {
-            i = i->n;
-        }
-    }
-    d->size-=c;
-    return c;
-}
-
-template <typename T>
-bool QLinkedList<T>::removeOne(const T &_t)
-{
-    detach();
-    iterator it = std::find(begin(), end(), _t);
-    if (it != end()) {
-        erase(it);
-        return true;
-    }
-    return false;
-}
-
-template <typename T>
-inline T QLinkedList<T>::takeFirst()
-{
-    T t = std::move(first());
-    removeFirst();
-    return t;
-}
-
-template <typename T>
-inline T QLinkedList<T>::takeLast()
-{
-    T t = std::move(last());
-    removeLast();
-    return t;
-}
-
-template <typename T>
-bool QLinkedList<T>::contains(const T &t) const
-{
-    Node *i = e;
-    while ((i = i->n) != e)
-        if (i->t == t)
-            return true;
-    return false;
-}
-
-template <typename T>
-int QLinkedList<T>::count(const T &t) const
-{
-    Node *i = e;
-    int c = 0;
-    while ((i = i->n) != e)
-        if (i->t == t)
-            c++;
-    return c;
-}
-
-
-template <typename T>
-typename QLinkedList<T>::iterator QLinkedList<T>::insert(iterator before, const T &t)
-{
-    if (d->ref.isShared())
-        before = detach_helper2(before);
-
-    Node *i = before.i;
-    Node *m = new Node(t);
-    m->n = i;
-    m->p = i->p;
-    m->p->n = m;
-    i->p = m;
-    d->size++;
-    return m;
-}
-
-template <typename T>
-typename QLinkedList<T>::iterator QLinkedList<T>::erase(typename QLinkedList<T>::iterator afirst,
-                                                         typename QLinkedList<T>::iterator alast)
-{
-    while (afirst != alast)
-        erase(afirst++);
-    return alast;
-}
-
-
-template <typename T>
-typename QLinkedList<T>::iterator QLinkedList<T>::erase(iterator pos)
-{
-    if (d->ref.isShared())
-        pos = detach_helper2(pos);
-
-    Node *i = pos.i;
-    if (i != e) {
-        Node *n = i;
-        i->n->p = i->p;
-        i->p->n = i->n;
-        i = i->n;
-        delete n;
-        d->size--;
-    }
-    return i;
-}
-
-template <typename T>
-QLinkedList<T> &QLinkedList<T>::operator+=(const QLinkedList<T> &l)
-{
-    detach();
-    int n = l.d->size;
-    d->size += n;
-    Node *original = l.e->n;
-    while (n--) {
-        QT_TRY {
-            Node *copy = new Node(original->t);
-            original = original->n;
-            copy->n = e;
-            copy->p = e->p;
-            copy->p->n = copy;
-            e->p = copy;
-        } QT_CATCH(...) {
-            // restore the original list
-            while (n++<d->size)
-                removeLast();
-            QT_RETHROW;
-        }
-    }
-    return *this;
-}
-
-template <typename T>
-QLinkedList<T> QLinkedList<T>::operator+(const QLinkedList<T> &l) const
-{
-    QLinkedList<T> n = *this;
-    n += l;
-    return n;
-}
-
-Q_DECLARE_SEQUENTIAL_ITERATOR(LinkedList)
-Q_DECLARE_MUTABLE_SEQUENTIAL_ITERATOR(LinkedList)
-
-#ifndef QT_NO_DATASTREAM
-template <typename T>
-inline QDataStream &operator>>(QDataStream &s, QLinkedList<T> &l)
-{
-    return QtPrivate::readListBasedContainer(s, l);
-}
-
-template <typename T>
-inline QDataStream &operator<<(QDataStream &s, const QLinkedList<T> &l)
-{
-    return QtPrivate::writeSequentialContainer(s, l);
-}
-#endif
-
-QT_END_NAMESPACE
-
-Q_DECLARE_SEQUENTIAL_CONTAINER_METATYPE(QLinkedList)
-
-QT_WARNING_POP
-
-#endif // QT_DEPRECATED_SINCE(5, 15)
-
-#endif // QT_NO_LINKED_LIST
-
-#endif // QLINKEDLIST_H
diff --git a/src/corelib/tools/qlist.cpp b/src/corelib/tools/qlist.cpp
index 5d5da20752..62201fd5d6 100644
--- a/src/corelib/tools/qlist.cpp
+++ b/src/corelib/tools/qlist.cpp
@@ -63,2029 +63,4 @@ template class Q_CORE_EXPORT QVector<QPointF>;
 template class Q_CORE_EXPORT QVector<QPoint>;
 #endif
 
-
-/*
-    QList as an array-list combines the easy-of-use of a random
-    access interface with fast list operations and the low memory
-    management overhead of an array. Accessing elements by index,
-    appending, prepending, and removing elements from both the front
-    and the back all happen in constant time O(1). Inserting or
-    removing elements at random index positions \ai happens in linear
-    time, or more precisly in O(min{i,n-i}) <= O(n/2), with n being
-    the number of elements in the list.
-*/
-
-const QListData::Data QListData::shared_null = { Q_REFCOUNT_INITIALIZE_STATIC, 0, 0, 0, { nullptr } };
-
-/*!
- *  Detaches the QListData by allocating new memory for a list which will be bigger
- *  than the copied one and is expected to grow further.
- *  *idx is the desired insertion point and is clamped to the actual size of the list.
- *  num is the number of new elements to insert at the insertion point.
- *  Returns the old (shared) data, it is up to the caller to deref() and free().
- *  For the new data node_copy needs to be called.
- *
- *  \internal
- */
-QListData::Data *QListData::detach_grow(int *idx, int num)
-{
-    Data *x = d;
-    int l = x->end - x->begin;
-    int nl = l + num;
-    auto blockInfo = qCalculateGrowingBlockSize(nl, sizeof(void *), DataHeaderSize);
-    Data* t = static_cast<Data *>(::malloc(blockInfo.size));
-    Q_CHECK_PTR(t);
-    t->alloc = int(uint(blockInfo.elementCount));
-
-    t->ref.initializeOwned();
-    // The space reservation algorithm's optimization is biased towards appending:
-    // Something which looks like an append will put the data at the beginning,
-    // while something which looks like a prepend will put it in the middle
-    // instead of at the end. That's based on the assumption that prepending
-    // is uncommon and even an initial prepend will eventually be followed by
-    // at least some appends.
-    int bg;
-    if (*idx < 0) {
-        *idx = 0;
-        bg = (t->alloc - nl) >> 1;
-    } else if (*idx > l) {
-        *idx = l;
-        bg = 0;
-    } else if (*idx < (l >> 1)) {
-        bg = (t->alloc - nl) >> 1;
-    } else {
-        bg = 0;
-    }
-    t->begin = bg;
-    t->end = bg + nl;
-    d = t;
-
-    return x;
-}
-
-/*!
- *  Detaches the QListData by allocating new memory for a list which possibly
- *  has a different size than the copied one.
- *  Returns the old (shared) data, it is up to the caller to deref() and free()
- *  For the new data node_copy needs to be called.
- *
- *  \internal
- */
-QListData::Data *QListData::detach(int alloc)
-{
-    Data *x = d;
-    Data* t = static_cast<Data *>(::malloc(qCalculateBlockSize(alloc, sizeof(void*), DataHeaderSize)));
-    Q_CHECK_PTR(t);
-
-    t->ref.initializeOwned();
-    t->alloc = alloc;
-    if (!alloc) {
-        t->begin = 0;
-        t->end = 0;
-    } else {
-        t->begin = x->begin;
-        t->end   = x->end;
-    }
-    d = t;
-
-    return x;
-}
-
-void QListData::realloc(int alloc)
-{
-    Q_ASSERT(!d->ref.isShared());
-    Data *x = static_cast<Data *>(::realloc(d, qCalculateBlockSize(alloc, sizeof(void *), DataHeaderSize)));
-    Q_CHECK_PTR(x);
-
-    d = x;
-    d->alloc = alloc;
-    if (!alloc)
-        d->begin = d->end = 0;
-}
-
-void QListData::realloc_grow(int growth)
-{
-    Q_ASSERT(!d->ref.isShared());
-    auto r = qCalculateGrowingBlockSize(d->alloc + growth, sizeof(void *), DataHeaderSize);
-    Data *x = static_cast<Data *>(::realloc(d, r.size));
-    Q_CHECK_PTR(x);
-
-    d = x;
-    d->alloc = int(uint(r.elementCount));
-}
-
-void QListData::dispose(Data *d)
-{
-    Q_ASSERT(!d->ref.isShared());
-    free(d);
-}
-
-// ensures that enough space is available to append n elements
-void **QListData::append(int n)
-{
-    Q_ASSERT(!d->ref.isShared());
-    int e = d->end;
-    if (e + n > d->alloc) {
-        int b = d->begin;
-        if (b - n >= 2 * d->alloc / 3) {
-            // we have enough space. Just not at the end -> move it.
-            e -= b;
-            ::memcpy(d->array, d->array + b, e * sizeof(void *));
-            d->begin = 0;
-        } else {
-            realloc_grow(n);
-        }
-    }
-    d->end = e + n;
-    return d->array + e;
-}
-
-// ensures that enough space is available to append one element
-void **QListData::append()
-{
-    return append(1);
-}
-
-// ensures that enough space is available to append the list
-void **QListData::append(const QListData& l)
-{
-    return append(l.d->end - l.d->begin);
-}
-
-void **QListData::prepend()
-{
-    Q_ASSERT(!d->ref.isShared());
-    if (d->begin == 0) {
-        if (d->end >= d->alloc / 3)
-            realloc_grow(1);
-
-        if (d->end < d->alloc / 3)
-            d->begin = d->alloc - 2 * d->end;
-        else
-            d->begin = d->alloc - d->end;
-
-        ::memmove(d->array + d->begin, d->array, d->end * sizeof(void *));
-        d->end += d->begin;
-    }
-    return d->array + --d->begin;
-}
-
-void **QListData::insert(int i)
-{
-    Q_ASSERT(!d->ref.isShared());
-    if (i <= 0)
-        return prepend();
-    int size = d->end - d->begin;
-    if (i >= size)
-        return append();
-
-    bool leftward = false;
-
-    if (d->begin == 0) {
-        if (d->end == d->alloc) {
-            // If the array is full, we expand it and move some items rightward
-            realloc_grow(1);
-        } else {
-            // If there is free space at the end of the array, we move some items rightward
-        }
-    } else {
-        if (d->end == d->alloc) {
-            // If there is free space at the beginning of the array, we move some items leftward
-            leftward = true;
-        } else {
-            // If there is free space at both ends, we move as few items as possible
-            leftward = (i < size - i);
-        }
-    }
-
-    if (leftward) {
-        --d->begin;
-        ::memmove(d->array + d->begin, d->array + d->begin + 1, i * sizeof(void *));
-    } else {
-        ::memmove(d->array + d->begin + i + 1, d->array + d->begin + i,
-                  (size - i) * sizeof(void *));
-        ++d->end;
-    }
-    return d->array + d->begin + i;
-}
-
-void QListData::remove(int i)
-{
-    Q_ASSERT(!d->ref.isShared());
-    i += d->begin;
-    if (i - d->begin < d->end - i) {
-        if (int offset = i - d->begin)
-            ::memmove(d->array + d->begin + 1, d->array + d->begin, offset * sizeof(void *));
-        d->begin++;
-    } else {
-        if (int offset = d->end - i - 1)
-            ::memmove(d->array + i, d->array + i + 1, offset * sizeof(void *));
-        d->end--;
-    }
-}
-
-void QListData::remove(int i, int n)
-{
-    Q_ASSERT(!d->ref.isShared());
-    i += d->begin;
-    int middle = i + n/2;
-    if (middle - d->begin < d->end - middle) {
-        ::memmove(d->array + d->begin + n, d->array + d->begin,
-                   (i - d->begin) * sizeof(void*));
-        d->begin += n;
-    } else {
-        ::memmove(d->array + i, d->array + i + n,
-                   (d->end - i - n) * sizeof(void*));
-        d->end -= n;
-    }
-}
-
-void QListData::move(int from, int to)
-{
-    Q_ASSERT(!d->ref.isShared());
-    if (from == to)
-        return;
-
-    from += d->begin;
-    to += d->begin;
-    void *t = d->array[from];
-
-    if (from < to) {
-        if (d->end == d->alloc || 3 * (to - from) < 2 * (d->end - d->begin)) {
-            ::memmove(d->array + from, d->array + from + 1, (to - from) * sizeof(void *));
-        } else {
-            // optimization
-            if (int offset = from - d->begin)
-                ::memmove(d->array + d->begin + 1, d->array + d->begin, offset * sizeof(void *));
-            if (int offset = d->end - (to + 1))
-                ::memmove(d->array + to + 2, d->array + to + 1, offset * sizeof(void *));
-            ++d->begin;
-            ++d->end;
-            ++to;
-        }
-    } else {
-        if (d->begin == 0 || 3 * (from - to) < 2 * (d->end - d->begin)) {
-            ::memmove(d->array + to + 1, d->array + to, (from - to) * sizeof(void *));
-        } else {
-            // optimization
-            if (int offset = to - d->begin)
-                ::memmove(d->array + d->begin - 1, d->array + d->begin, offset * sizeof(void *));
-            if (int offset = d->end - (from + 1))
-                ::memmove(d->array + from, d->array + from + 1, offset * sizeof(void *));
-            --d->begin;
-            --d->end;
-            --to;
-        }
-    }
-    d->array[to] = t;
-}
-
-void **QListData::erase(void **xi)
-{
-    Q_ASSERT(!d->ref.isShared());
-    int i = xi - (d->array + d->begin);
-    remove(i);
-    return d->array + d->begin + i;
-}
-
-/*! \class QList
-    \inmodule QtCore
-    \brief The QList class is a template class that provides lists.
-
-    \ingroup tools
-    \ingroup shared
-
-    \reentrant
-
-    QList\<T\> is one of Qt's generic \l{container classes}. It
-    stores items in a list that provides fast index-based access
-    and index-based insertions and removals.
-
-    QList\<T\>, QLinkedList\<T\>, and QVector\<T\> provide similar
-    APIs and functionality. They are often interchangeable, but there
-    are performance consequences. Here is an overview of use cases:
-
-    \list
-    \li QVector should be your default first choice.
-        QVector\<T\> will usually give better performance than QList\<T\>,
-        because QVector\<T\> always stores its items sequentially in memory,
-        where QList\<T\> will allocate its items on the heap unless
-        \c {sizeof(T) <= sizeof(void*)} and T has been declared to be
-        either a \c{Q_MOVABLE_TYPE} or a \c{Q_PRIMITIVE_TYPE} using
-        \l {Q_DECLARE_TYPEINFO}. See the \l {Pros and Cons of Using QList}
-        for an explanation.
-    \li However, QList is used throughout the Qt APIs for passing
-        parameters and for returning values. Use QList to interface with
-        those APIs.
-    \li If you need a real linked list, which guarantees
-        \l {Algorithmic Complexity}{constant time} insertions mid-list and
-        uses iterators to items rather than indexes, use QLinkedList.
-    \endlist
-
-    \note QVector and QVarLengthArray both guarantee C-compatible
-    array layout. QList does not. This might be important if your
-    application must interface with a C API.
-
-    \note Iterators into a QLinkedList and references into
-    heap-allocating QLists remain valid as long as the referenced items
-    remain in the container. This is not true for iterators and
-    references into a QVector and non-heap-allocating QLists.
-
-    Internally, QList\<T\> is represented as an array of T if
-    \c{sizeof(T) <= sizeof(void*)} and T has been declared to be
-    either a \c{Q_MOVABLE_TYPE} or a \c{Q_PRIMITIVE_TYPE} using
-    \l {Q_DECLARE_TYPEINFO}. Otherwise, QList\<T\> is represented
-    as an array of T* and the items are allocated on the heap.
-
-    The array representation allows very fast insertions and
-    index-based access. The prepend() and append() operations are
-    also very fast because QList preallocates memory at both
-    ends of its internal array. (See \l{Algorithmic Complexity} for
-    details.
-
-    Note, however, that when the conditions specified above are not met,
-    each append or insert of a new item requires allocating the new item
-    on the heap, and this per item allocation will make QVector a better
-    choice for use cases that do a lot of appending or inserting, because
-    QVector can allocate memory for many items in a single heap allocation.
-
-    Note that the internal array only ever gets bigger over the life
-    of the list. It never shrinks. The internal array is deallocated
-    by the destructor and by the assignment operator, when one list
-    is assigned to another.
-
-    Here's an example of a QList that stores integers and
-    a QList that stores QDate values:
-
-    \snippet code/src_corelib_tools_qlistdata.cpp 0
-
-    Qt includes a QStringList class that inherits QList\<QString\>
-    and adds a few convenience functions, such as QStringList::join()
-    and QStringList::filter().  QString::split() creates QStringLists
-    from strings.
-
-    QList stores a list of items. The default constructor creates an
-    empty list. You can use the initializer-list constructor to create
-    a list with elements:
-
-    \snippet code/src_corelib_tools_qlistdata.cpp 1a
-
-    QList provides these basic functions to add, move, and remove
-    items: insert(), replace(), removeAt(), move(), and swap(). In
-    addition, it provides the following convenience functions:
-    append(), \l{operator<<()}, \l{operator+=()}, prepend(), removeFirst(),
-    and removeLast().
-
-    \l{operator<<()} allows to conveniently add multiple elements to a list:
-
-    \snippet code/src_corelib_tools_qlistdata.cpp 1b
-
-    QList uses 0-based indexes, just like C++ arrays. To access the
-    item at a particular index position, you can use operator[](). On
-    non-const lists, operator[]() returns a reference to the item and
-    can be used on the left side of an assignment:
-
-    \snippet code/src_corelib_tools_qlistdata.cpp 2
-
-    Because QList is implemented as an array of pointers for types
-    that are larger than a pointer or are not movable, this operation
-    requires (\l{Algorithmic Complexity}{constant time}). For read-only
-    access, an alternative syntax is to use at():
-
-    \snippet code/src_corelib_tools_qlistdata.cpp 3
-
-    at() can be faster than operator[](), because it never causes a
-    \l{deep copy} to occur.
-
-    A common requirement is to remove an item from a list and do
-    something with it. For this, QList provides takeAt(), takeFirst(),
-    and takeLast(). Here's a loop that removes the items from a list
-    one at a time and calls \c delete on them:
-
-    \snippet code/src_corelib_tools_qlistdata.cpp 4
-
-    Inserting and removing items at either end of the list is very
-    fast (\l{Algorithmic Complexity}{constant time} in most cases),
-    because QList preallocates extra space on both sides of its
-    internal buffer to allow for fast growth at both ends of the list.
-
-    If you want to find all occurrences of a particular value in a
-    list, use indexOf() or lastIndexOf(). The former searches forward
-    starting from a given index position, the latter searches
-    backward. Both return the index of a matching item if they find
-    it; otherwise, they return -1. For example:
-
-    \snippet code/src_corelib_tools_qlistdata.cpp 5
-
-    If you simply want to check whether a list contains a particular
-    value, use contains(). If you want to find out how many times a
-    particular value occurs in the list, use count(). If you want to
-    replace all occurrences of a particular value with another, use
-    replace().
-
-    QList's value type must be an \l{assignable data type}. This
-    covers most data types that are commonly used, but the compiler
-    won't let you, for example, store a QWidget as a value; instead,
-    store a QWidget *. A few functions have additional requirements;
-    for example, indexOf() and lastIndexOf() expect the value type to
-    support \c operator==().  These requirements are documented on a
-    per-function basis.
-
-    Like the other container classes, QList provides \l{Java-style
-    iterators} (QListIterator and QMutableListIterator) and
-    \l{STL-style iterators} (QList::const_iterator and
-    QList::iterator). In practice, these are rarely used, because you
-    can use indexes into the QList. QList is implemented in such a way
-    that direct index-based access is just as fast as using iterators.
-
-    QList does \e not support inserting, prepending, appending or
-    replacing with references to its own values. Doing so will cause
-    your application to abort with an error message.
-
-    To make QList as efficient as possible, its member functions don't
-    validate their input before using it. Except for isEmpty(), member
-    functions always assume the list is \e not empty. Member functions
-    that take index values as parameters always assume their index
-    value parameters are in the valid range. This means QList member
-    functions can fail. If you define QT_NO_DEBUG when you compile,
-    failures will not be detected. If you \e don't define QT_NO_DEBUG,
-    failures will be detected using Q_ASSERT() or Q_ASSERT_X() with an
-    appropriate message.
-
-    To avoid failures when your list can be empty, call isEmpty()
-    before calling other member functions. If you must pass an index
-    value that might not be in the valid range, check that it is less
-    than the value returned by size() but \e not less than 0.
-
-    \section1 More Members
-
-    If T is a QByteArray, this class has a couple more members that can be
-    used. See the documentation for QByteArrayList for more information.
-
-    If T is QString, this class has the following additional members:
-    \l{QStringList::filter()}{filter},
-    \l{QStringList::join()}{join},
-    \l{QStringList::removeDuplicates()}{removeDuplicates},
-    \l{QStringList::sort()}{sort}.
-
-    \section1 More Information on Using Qt Containers
-
-    For a detailed discussion comparing Qt containers with each other and
-    with STL containers, see \l {Understand the Qt Containers}.
-
-    \sa QListIterator, QMutableListIterator, QLinkedList, QVector
-*/
-
-/*!
-    \fn template <class T> QList<T>::QList(QList<T> &&other)
-
-    Move-constructs a QList instance, making it point at the same
-    object that \a other was pointing to.
-
-    \since 5.2
-*/
-
-/*! \fn template <class T> template<typename InputIterator> QList<T>::QList(InputIterator first, InputIterator last)
-    \since 5.14
-
-    Constructs a QList with the contents in the iterator range [\a first, \a last).
-
-    The value type of \c InputIterator must be convertible to \c T.
-*/
-
-/*!
-    \fn template <class T> QList<T> QList<T>::mid(int pos, int length) const
-
-    Returns a sub-list which includes elements from this list,
-    starting at position \a pos. If \a length is -1 (the default), all
-    elements from \a pos are included; otherwise \a length elements (or
-    all remaining elements if there are less than \a length elements)
-    are included.
-*/
-
-/*! \fn template <class T> QList<T>::QList()
-
-    Constructs an empty list.
-*/
-
-/*! \fn template <class T> QList<T>::QList(const QList<T> &other)
-
-    Constructs a copy of \a other.
-
-    This operation takes \l{Algorithmic Complexity}{constant time},
-    because QList is \l{implicitly shared}. This makes returning a
-    QList from a function very fast. If a shared instance is modified,
-    it will be copied (copy-on-write), and that takes
-    \l{Algorithmic Complexity}{linear time}.
-
-    \sa operator=()
-*/
-
-/*! \fn template <class T> QList<T>::QList(std::initializer_list<T> args)
-    \since 4.8
-
-    Construct a list from the std::initializer_list specified by \a args.
-
-    This constructor is only enabled if the compiler supports C++11 initializer
-    lists.
-*/
-
-/*! \fn template <class T> QList<T>::~QList()
-
-    Destroys the list. References to the values in the list and all
-    iterators of this list become invalid.
-*/
-
-/*! \fn template <class T> QList<T> &QList<T>::operator=(const QList<T> &other)
-
-    Assigns \a other to this list and returns a reference to this
-    list.
-*/
-
-/*!
-    \fn template <class T> QList &QList<T>::operator=(QList<T> &&other)
-
-    Move-assigns \a other to this QList instance.
-
-    \since 5.2
-*/
-
-/*! \fn template <class T> void QList<T>::swap(QList<T> &other)
-    \since 4.8
-
-    Swaps list \a other with this list. This operation is very
-    fast and never fails.
-*/
-
-/*! \fn template <class T> bool QList<T>::operator==(const QList<T> &other) const
-
-    Returns \c true if \a other is equal to this list; otherwise returns
-    false.
-
-    Two lists are considered equal if they contain the same values in
-    the same order.
-
-    This function requires the value type to have an implementation of
-    \c operator==().
-
-    \sa operator!=()
-*/
-
-/*! \fn template <class T> bool QList<T>::operator!=(const QList<T> &other) const
-
-    Returns \c true if \a other is not equal to this list; otherwise
-    returns \c false.
-
-    Two lists are considered equal if they contain the same values in
-    the same order.
-
-    This function requires the value type to have an implementation of
-    \c operator==().
-
-    \sa operator==()
-*/
-
-/*! \fn template <class T> bool operator<(const QList<T> &lhs, const QList<T> &rhs)
-    \since 5.6
-    \relates QList
-
-    Returns \c true if list \a lhs is
-    \l{http://en.cppreference.com/w/cpp/algorithm/lexicographical_compare}
-    {lexicographically less than} \a rhs; otherwise returns \c false.
-
-    This function requires the value type to have an implementation
-    of \c operator<().
-*/
-
-/*! \fn template <class T> bool operator<=(const QList<T> &lhs, const QList<T> &rhs)
-    \since 5.6
-    \relates QList
-
-    Returns \c true if list \a lhs is
-    \l{http://en.cppreference.com/w/cpp/algorithm/lexicographical_compare}
-    {lexicographically less than or equal to} \a rhs; otherwise returns \c false.
-
-    This function requires the value type to have an implementation
-    of \c operator<().
-*/
-
-/*! \fn template <class T> bool operator>(const QList<T> &lhs, const QList<T> &rhs)
-    \since 5.6
-    \relates QList
-
-    Returns \c true if list \a lhs is
-    \l{http://en.cppreference.com/w/cpp/algorithm/lexicographical_compare}
-    {lexicographically greater than} \a rhs; otherwise returns \c false.
-
-    This function requires the value type to have an implementation
-    of \c operator<().
-*/
-
-/*! \fn template <class T> bool operator>=(const QList<T> &lhs, const QList<T> &rhs)
-    \since 5.6
-    \relates QList
-
-    Returns \c true if list \a lhs is
-    \l{http://en.cppreference.com/w/cpp/algorithm/lexicographical_compare}
-    {lexicographically greater than or equal to} \a rhs; otherwise returns \c false.
-
-    This function requires the value type to have an implementation
-    of \c operator<().
-*/
-
-/*!
-    \fn template <class T> uint qHash(const QList<T> &key, uint seed = 0)
-    \since 5.6
-    \relates QList
-
-    Returns the hash value for \a key,
-    using \a seed to seed the calculation.
-
-    This function requires qHash() to be overloaded for the value type \c T.
-*/
-
-/*!
-    \fn template <class T> int QList<T>::size() const
-
-    Returns the number of items in the list.
-
-    \sa isEmpty(), count()
-*/
-
-/*! \fn template <class T> void QList<T>::detach()
-
-    \internal
-*/
-
-/*! \fn template <class T> void QList<T>::detachShared()
-
-    \internal
-
-    like detach(), but does nothing if we're shared_null.
-    This prevents needless mallocs, and makes QList more exception safe
-    in case of cleanup work done in destructors on empty lists.
-*/
-
-/*! \fn template <class T> bool QList<T>::isDetached() const
-
-    \internal
-*/
-
-/*! \fn template <class T> void QList<T>::setSharable(bool sharable)
-
-    \internal
-*/
-
-/*! \fn template <class T> bool QList<T>::isSharedWith(const QList<T> &other) const
-
-    \internal
-*/
-
-/*! \fn template <class T> bool QList<T>::isEmpty() const
-
-    Returns \c true if the list contains no items; otherwise returns
-    false.
-
-    \sa size()
-*/
-
-/*! \fn template <class T> void QList<T>::clear()
-
-    Removes all items from the list.
-
-    \sa removeAll()
-*/
-
-/*! \fn template <class T> const T &QList<T>::at(int i) const
-
-    Returns the item at index position \a i in the list. \a i must be
-    a valid index position in the list (i.e., 0 <= \a i < size()).
-
-    This function is very fast (\l{Algorithmic Complexity}{constant time}).
-
-    \sa value(), operator[]()
-*/
-
-/*! \fn template <class T> T &QList<T>::operator[](int i)
-
-    Returns the item at index position \a i as a modifiable reference.
-    \a i must be a valid index position in the list (i.e., 0 <= \a i <
-    size()).
-
-    If this function is called on a list that is currently being shared, it
-    will trigger a copy of all elements. Otherwise, this function runs in
-    \l{Algorithmic Complexity}{constant time}. If you do not want to modify
-    the list you should use QList::at().
-
-    \sa at(), value()
-*/
-
-/*! \fn template <class T> const T &QList<T>::operator[](int i) const
-
-    \overload
-
-    Same as at(). This function runs in \l{Algorithmic Complexity}{constant time}.
-*/
-
-/*! \fn template <class T> void QList<T>::reserve(int alloc)
-
-    Reserve space for \a alloc elements.
-
-    If \a alloc is smaller than the current size of the list, nothing will happen.
-
-    Use this function to avoid repetetive reallocation of QList's internal
-    data if you can predict how many elements will be appended.
-    Note that the reservation applies only to the internal pointer array.
-
-    \since 4.7
-*/
-
-/*! \fn template <class T> void QList<T>::append(const T &value)
-
-    Inserts \a value at the end of the list.
-
-    Example:
-    \snippet code/src_corelib_tools_qlistdata.cpp 6
-
-    This is the same as list.insert(size(), \a value).
-
-    If this list is not shared, this operation is typically
-    very fast (amortized \l{Algorithmic Complexity}{constant time}),
-    because QList preallocates extra space on both sides of its
-    internal buffer to allow for fast growth at both ends of the list.
-
-    \sa operator<<(), prepend(), insert()
-*/
-
-/*! \fn template <class T> void QList<T>::append(const QList<T> &value)
-
-    \overload
-
-    \since 4.5
-
-    Appends the items of the \a value list to this list.
-
-    \sa operator<<(), operator+=()
-*/
-
-/*! \fn template <class T> void QList<T>::prepend(const T &value)
-
-    Inserts \a value at the beginning of the list.
-
-    Example:
-    \snippet code/src_corelib_tools_qlistdata.cpp 7
-
-    This is the same as list.insert(0, \a value).
-
-    If this list is not shared, this operation is typically
-    very fast (amortized \l{Algorithmic Complexity}{constant time}),
-    because QList preallocates extra space on both sides of its
-    internal buffer to allow for fast growth at both ends of the list.
-
-    \sa append(), insert()
-*/
-
-/*! \fn template <class T> void QList<T>::insert(int i, const T &value)
-
-    Inserts \a value at index position \a i in the list.
-
-    If \a i == 0, the value is prepended to the list. If \a i == size(),
-    the value is appended to the list.
-
-    Example:
-    \snippet code/src_corelib_tools_qlistdata.cpp 8
-
-    \sa append(), prepend(), replace(), removeAt()
-*/
-
-/*! \fn template <class T> QList<T>::iterator QList<T>::insert(iterator before, const T &value)
-
-    \overload
-
-    Inserts \a value in front of the item pointed to by the
-    iterator \a before. Returns an iterator pointing at the inserted
-    item. Note that the iterator passed to the function will be
-    invalid after the call; the returned iterator should be used
-    instead.
-*/
-
-/*! \fn template <class T> void QList<T>::replace(int i, const T &value)
-
-    Replaces the item at index position \a i with \a value. \a i must
-    be a valid index position in the list (i.e., 0 <= \a i < size()).
-
-    \sa operator[](), removeAt()
-*/
-
-/*!
-    \fn template <class T> int QList<T>::removeAll(const T &value)
-
-    Removes all occurrences of \a value in the list and returns the
-    number of entries removed.
-
-    Example:
-    \snippet code/src_corelib_tools_qlistdata.cpp 9
-
-    This function requires the value type to have an implementation of
-    \c operator==().
-
-    \sa removeOne(), removeAt(), takeAt(), replace()
-*/
-
-/*!
-    \fn template <class T> bool QList<T>::removeOne(const T &value)
-    \since 4.4
-
-    Removes the first occurrence of \a value in the list and returns
-    true on success; otherwise returns \c false.
-
-    Example:
-    \snippet code/src_corelib_tools_qlistdata.cpp 10
-
-    This function requires the value type to have an implementation of
-    \c operator==().
-
-    \sa removeAll(), removeAt(), takeAt(), replace()
-*/
-
-/*! \fn template <class T> void QList<T>::removeAt(int i)
-
-    Removes the item at index position \a i. \a i must be a valid
-    index position in the list (i.e., 0 <= \a i < size()).
-
-    \sa takeAt(), removeFirst(), removeLast(), removeOne()
-*/
-
-/*! \fn template <class T> T QList<T>::takeAt(int i)
-
-    Removes the item at index position \a i and returns it. \a i must
-    be a valid index position in the list (i.e., 0 <= \a i < size()).
-
-    If you don't use the return value, removeAt() is more efficient.
-
-    \sa removeAt(), takeFirst(), takeLast()
-*/
-
-/*! \fn template <class T> T QList<T>::takeFirst()
-
-    Removes the first item in the list and returns it. This is the
-    same as takeAt(0). This function assumes the list is not empty. To
-    avoid failure, call isEmpty() before calling this function.
-
-    If this list is not shared, this operation takes
-    \l {Algorithmic Complexity}{constant time}.
-
-    If you don't use the return value, removeFirst() is more
-    efficient.
-
-    \sa takeLast(), takeAt(), removeFirst()
-*/
-
-/*! \fn template <class T> T QList<T>::takeLast()
-
-    Removes the last item in the list and returns it. This is the
-    same as takeAt(size() - 1). This function assumes the list is
-    not empty. To avoid failure, call isEmpty() before calling this
-    function.
-
-    If this list is not shared, this operation takes
-    \l {Algorithmic Complexity}{constant time}.
-
-    If you don't use the return value, removeLast() is more
-    efficient.
-
-    \sa takeFirst(), takeAt(), removeLast()
-*/
-
-/*! \fn template <class T> void QList<T>::move(int from, int to)
-
-    Moves the item at index position \a from to index position \a to.
-
-    Example:
-    \snippet code/src_corelib_tools_qlistdata.cpp 11
-
-    This is the same as insert(\a{to}, takeAt(\a{from})).This function
-    assumes that both \a from and \a to are at least 0 but less than
-    size(). To avoid failure, test that both \a from and \a to are at
-    least 0 and less than size().
-
-    \sa swap(), insert(), takeAt()
-*/
-
-/*! \fn template <class T> void QList<T>::swap(int i, int j)
-
-    \obsolete Use swapItemsAt()
-
-    \sa move(), swapItemsAt()
-*/
-
-/*! \fn template <class T> void QList<T>::swapItemsAt(int i, int j)
-    \since 5.13
-
-    Exchange the item at index position \a i with the item at index
-    position \a j. This function assumes that both \a i and \a j are
-    at least 0 but less than size(). To avoid failure, test that both
-    \a i and \a j are at least 0 and less than size().
-
-    Example:
-    \snippet code/src_corelib_tools_qlistdata.cpp 12
-
-    \sa move()
-*/
-
-/*! \fn template <class T> int QList<T>::indexOf(const T &value, int from = 0) const
-
-    Returns the index position of the first occurrence of \a value in
-    the list, searching forward from index position \a from. Returns
-    -1 if no item matched.
-
-    Example:
-    \snippet code/src_corelib_tools_qlistdata.cpp 13
-
-    This function requires the value type to have an implementation of
-    \c operator==().
-
-    Note that QList uses 0-based indexes, just like C++ arrays. Negative
-    indexes are not supported with the exception of the value mentioned
-    above.
-
-    \sa lastIndexOf(), contains()
-*/
-
-/*! \fn template <class T> int QList<T>::lastIndexOf(const T &value, int from = -1) const
-
-    Returns the index position of the last occurrence of \a value in
-    the list, searching backward from index position \a from. If \a
-    from is -1 (the default), the search starts at the last item.
-    Returns -1 if no item matched.
-
-    Example:
-    \snippet code/src_corelib_tools_qlistdata.cpp 14
-
-    This function requires the value type to have an implementation of
-    \c operator==().
-
-    Note that QList uses 0-based indexes, just like C++ arrays. Negative
-    indexes are not supported with the exception of the value mentioned
-    above.
-
-    \sa indexOf()
-*/
-
-/*! \fn template <class T> bool QList<T>::contains(const T &value) const
-
-    Returns \c true if the list contains an occurrence of \a value;
-    otherwise returns \c false.
-
-    This function requires the value type to have an implementation of
-    \c operator==().
-
-    \sa indexOf(), count()
-*/
-
-/*! \fn template <class T> int QList<T>::count(const T &value) const
-
-    Returns the number of occurrences of \a value in the list.
-
-    This function requires the value type to have an implementation of
-    \c operator==().
-
-    \sa contains(), indexOf()
-*/
-
-/*! \fn template <class T> bool QList<T>::startsWith(const T &value) const
-    \since 4.5
-
-    Returns \c true if this list is not empty and its first
-    item is equal to \a value; otherwise returns \c false.
-
-    \sa isEmpty(), contains()
-*/
-
-/*! \fn template <class T> bool QList<T>::endsWith(const T &value) const
-    \since 4.5
-
-    Returns \c true if this list is not empty and its last
-    item is equal to \a value; otherwise returns \c false.
-
-    \sa isEmpty(), contains()
-*/
-
-/*! \fn template <class T> QList<T>::iterator QList<T>::begin()
-
-    Returns an \l{STL-style iterators}{STL-style iterator} pointing to the first item in
-    the list.
-
-    \sa constBegin(), end()
-*/
-
-/*! \fn template <class T> QList<T>::const_iterator QList<T>::begin() const
-
-    \overload
-*/
-
-/*! \fn template <class T> QList<T>::const_iterator QList<T>::cbegin() const
-    \since 5.0
-
-    Returns a const \l{STL-style iterators}{STL-style iterator} pointing to the first item
-    in the list.
-
-    \sa begin(), cend()
-*/
-
-/*! \fn template <class T> QList<T>::const_iterator QList<T>::constBegin() const
-
-    Returns a const \l{STL-style iterators}{STL-style iterator} pointing to the first item
-    in the list.
-
-    \sa begin(), constEnd()
-*/
-
-/*! \fn template <class T> QList<T>::iterator QList<T>::end()
-
-    Returns an \l{STL-style iterators}{STL-style iterator} pointing to the imaginary item
-    after the last item in the list.
-
-    \sa begin(), constEnd()
-*/
-
-/*! \fn template <class T> const_iterator QList<T>::end() const
-
-    \overload
-*/
-
-/*! \fn template <class T> QList<T>::const_iterator QList<T>::cend() const
-    \since 5.0
-
-    Returns a const \l{STL-style iterators}{STL-style iterator} pointing to the imaginary
-    item after the last item in the list.
-
-    \sa cbegin(), end()
-*/
-
-/*! \fn template <class T> QList<T>::const_iterator QList<T>::constEnd() const
-
-    Returns a const \l{STL-style iterators}{STL-style iterator} pointing to the imaginary
-    item after the last item in the list.
-
-    \sa constBegin(), end()
-*/
-
-/*! \fn template <class T> QList<T>::reverse_iterator QList<T>::rbegin()
-    \since 5.6
-
-    Returns a \l{STL-style iterators}{STL-style} reverse iterator pointing to the first
-    item in the list, in reverse order.
-
-    \sa begin(), crbegin(), rend()
-*/
-
-/*! \fn template <class T> QList<T>::const_reverse_iterator QList<T>::rbegin() const
-    \since 5.6
-    \overload
-*/
-
-/*! \fn template <class T> QList<T>::const_reverse_iterator QList<T>::crbegin() const
-    \since 5.6
-
-    Returns a const \l{STL-style iterators}{STL-style} reverse iterator pointing to the first
-    item in the list, in reverse order.
-
-    \sa begin(), rbegin(), rend()
-*/
-
-/*! \fn template <class T> QList<T>::reverse_iterator QList<T>::rend()
-    \since 5.6
-
-    Returns a \l{STL-style iterators}{STL-style} reverse iterator pointing to one past
-    the last item in the list, in reverse order.
-
-    \sa end(), crend(), rbegin()
-*/
-
-/*! \fn template <class T> QList<T>::const_reverse_iterator QList<T>::rend() const
-    \since 5.6
-    \overload
-*/
-
-/*! \fn template <class T> QList<T>::const_reverse_iterator QList<T>::crend() const
-    \since 5.6
-
-    Returns a const \l{STL-style iterators}{STL-style} reverse iterator pointing to one
-    past the last item in the list, in reverse order.
-
-    \sa end(), rend(), rbegin()
-*/
-
-/*! \fn template <class T> QList<T>::iterator QList<T>::erase(iterator pos)
-
-    Removes the item associated with the iterator \a pos from the
-    list, and returns an iterator to the next item in the list (which
-    may be end()).
-
-    \sa insert(), removeAt()
-*/
-
-/*! \fn template <class T> QList<T>::iterator QList<T>::erase(iterator begin, iterator end)
-
-    \overload
-
-    Removes all the items from \a begin up to (but not including) \a
-    end. Returns an iterator to the same item that \a end referred to
-    before the call.
-*/
-
-/*! \typedef QList::Iterator
-
-    Qt-style synonym for QList::iterator.
-*/
-
-/*! \typedef QList::ConstIterator
-
-    Qt-style synonym for QList::const_iterator.
-*/
-
-/*!
-    \typedef QList::size_type
-
-    Typedef for int. Provided for STL compatibility.
-*/
-
-/*!
-    \typedef QList::value_type
-
-    Typedef for T. Provided for STL compatibility.
-*/
-
-/*!
-    \typedef QList::difference_type
-
-    Typedef for ptrdiff_t. Provided for STL compatibility.
-*/
-
-/*!
-    \typedef QList::pointer
-
-    Typedef for T *. Provided for STL compatibility.
-*/
-
-/*!
-    \typedef QList::const_pointer
-
-    Typedef for const T *. Provided for STL compatibility.
-*/
-
-/*!
-    \typedef QList::reference
-
-    Typedef for T &. Provided for STL compatibility.
-*/
-
-/*!
-    \typedef QList::const_reference
-
-    Typedef for const T &. Provided for STL compatibility.
-*/
-
-/*! \typedef QList::reverse_iterator
-    \since 5.6
-
-    The QList::reverse_iterator typedef provides an STL-style non-const
-    reverse iterator for QList.
-
-    It is simply a typedef for \c{std::reverse_iterator<iterator>}.
-
-    \warning Iterators on implicitly shared containers do not work
-    exactly like STL-iterators. You should avoid copying a container
-    while iterators are active on that container. For more information,
-    read \l{Implicit sharing iterator problem}.
-
-    \sa QList::rbegin(), QList::rend(), QList::const_reverse_iterator, QList::iterator
-*/
-
-/*! \typedef QList::const_reverse_iterator
-    \since 5.6
-
-    The QList::const_reverse_iterator typedef provides an STL-style const
-    reverse iterator for QList.
-
-    It is simply a typedef for \c{std::reverse_iterator<const_iterator>}.
-
-    \warning Iterators on implicitly shared containers do not work
-    exactly like STL-iterators. You should avoid copying a container
-    while iterators are active on that container. For more information,
-    read \l{Implicit sharing iterator problem}.
-
-    \sa QList::rbegin(), QList::rend(), QList::reverse_iterator, QList::const_iterator
-*/
-
-/*! \fn template <class T> int QList<T>::count() const
-
-    Returns the number of items in the list. This is effectively the
-    same as size().
-*/
-
-/*! \fn template <class T> int QList<T>::length() const
-    \since 4.5
-
-    This function is identical to count().
-
-    \sa count()
-*/
-
-/*! \fn template <class T> T& QList<T>::first()
-
-    Returns a reference to the first item in the list. The list must
-    not be empty. If the list can be empty, call isEmpty() before
-    calling this function.
-
-    \sa constFirst(), last(), isEmpty()
-*/
-
-/*! \fn template <class T> const T& QList<T>::first() const
-
-    \overload
-*/
-
-/*! \fn template <class T> const T& QList<T>::constFirst() const
-    \since 5.6
-
-    Returns a const reference to the first item in the list. The list must
-    not be empty. If the list can be empty, call isEmpty() before
-    calling this function.
-
-    \sa constLast(), isEmpty(), first()
-*/
-
-/*! \fn template <class T> T& QList<T>::last()
-
-    Returns a reference to the last item in the list.  The list must
-    not be empty. If the list can be empty, call isEmpty() before
-    calling this function.
-
-    \sa constLast(), first(), isEmpty()
-*/
-
-/*! \fn template <class T> const T& QList<T>::last() const
-
-    \overload
-*/
-
-/*! \fn template <class T> const T& QList<T>::constLast() const
-    \since 5.6
-
-    Returns a reference to the last item in the list. The list must
-    not be empty. If the list can be empty, call isEmpty() before
-    calling this function.
-
-    \sa constFirst(), isEmpty(), last()
-*/
-
-/*! \fn template <class T> void QList<T>::removeFirst()
-
-    Removes the first item in the list. Calling this function is
-    equivalent to calling removeAt(0). The list must not be empty. If
-    the list can be empty, call isEmpty() before calling this
-    function.
-
-    \sa removeAt(), takeFirst()
-*/
-
-/*! \fn template <class T> void QList<T>::removeLast()
-
-    Removes the last item in the list. Calling this function is
-    equivalent to calling removeAt(size() - 1). The list must not be
-    empty. If the list can be empty, call isEmpty() before calling
-    this function.
-
-    \sa removeAt(), takeLast()
-*/
-
-/*! \fn template <class T> T QList<T>::value(int i) const
-
-    Returns the value at index position \a i in the list.
-
-    If the index \a i is out of bounds, the function returns a
-    \l{default-constructed value}. If you are certain that the index
-    is going to be within bounds, you can use at() instead, which is
-    slightly faster.
-
-    \sa at(), operator[]()
-*/
-
-/*! \fn template <class T> T QList<T>::value(int i, const T &defaultValue) const
-
-    \overload
-
-    If the index \a i is out of bounds, the function returns
-    \a defaultValue.
-*/
-
-/*! \fn template <class T> void QList<T>::push_back(const T &value)
-
-    This function is provided for STL compatibility. It is equivalent
-    to \l{QList::append()}{append(\a value)}.
-*/
-
-/*! \fn template <class T> void QList<T>::push_front(const T &value)
-
-    This function is provided for STL compatibility. It is equivalent
-    to \l{QList::prepend()}{prepend(\a value)}.
-*/
-
-/*! \fn template <class T> T& QList<T>::front()
-
-    This function is provided for STL compatibility. It is equivalent
-    to first(). The list must not be empty. If the list can be empty,
-    call isEmpty() before calling this function.
-*/
-
-/*! \fn template <class T> const T& QList<T>::front() const
-
-    \overload
-*/
-
-/*! \fn template <class T> T& QList<T>::back()
-
-    This function is provided for STL compatibility. It is equivalent
-    to last(). The list must not be empty. If the list can be empty,
-    call isEmpty() before calling this function.
-*/
-
-/*! \fn template <class T> const T& QList<T>::back() const
-
-    \overload
-*/
-
-/*! \fn template <class T> void QList<T>::pop_front()
-
-    This function is provided for STL compatibility. It is equivalent
-    to removeFirst(). The list must not be empty. If the list can be
-    empty, call isEmpty() before calling this function.
-*/
-
-/*! \fn template <class T> void QList<T>::pop_back()
-
-    This function is provided for STL compatibility. It is equivalent
-    to removeLast(). The list must not be empty. If the list can be
-    empty, call isEmpty() before calling this function.
-*/
-
-/*! \fn template <class T> bool QList<T>::empty() const
-
-    This function is provided for STL compatibility. It is equivalent
-    to isEmpty() and returns \c true if the list is empty.
-*/
-
-/*! \fn template <class T> QList<T> &QList<T>::operator+=(const QList<T> &other)
-
-    Appends the items of the \a other list to this list and returns a
-    reference to this list.
-
-    \sa operator+(), append()
-*/
-
-/*! \fn template <class T> void QList<T>::operator+=(const T &value)
-
-    \overload
-
-    Appends \a value to the list.
-
-    \sa append(), operator<<()
-*/
-
-/*! \fn template <class T> QList<T> QList<T>::operator+(const QList<T> &other) const
-
-    Returns a list that contains all the items in this list followed
-    by all the items in the \a other list.
-
-    \sa operator+=()
-*/
-
-/*! \fn template <class T> QList<T> &QList<T>::operator<<(const QList<T> &other)
-
-    Appends the items of the \a other list to this list and returns a
-    reference to this list.
-
-    \sa operator+=(), append()
-*/
-
-/*! \fn template <class T> void QList<T>::operator<<(const T &value)
-
-    \overload
-
-    Appends \a value to the list.
-*/
-
-/*! \class QList::iterator
-    \inmodule QtCore
-    \brief The QList::iterator class provides an STL-style non-const iterator for QList and QQueue.
-
-    QList features both \l{STL-style iterators} and \l{Java-style
-    iterators}. The STL-style iterators are more low-level and more
-    cumbersome to use; on the other hand, they are slightly faster
-    and, for developers who already know STL, have the advantage of
-    familiarity.
-
-    QList\<T\>::iterator allows you to iterate over a QList\<T\> (or
-    QQueue\<T\>) and to modify the list item associated with the
-    iterator. If you want to iterate over a const QList, use
-    QList::const_iterator instead. It is generally good practice to
-    use QList::const_iterator on a non-const QList as well, unless
-    you need to change the QList through the iterator. Const
-    iterators are slightly faster, and can improve code readability.
-
-    The default QList::iterator constructor creates an uninitialized
-    iterator. You must initialize it using a QList function like
-    QList::begin(), QList::end(), or QList::insert() before you can
-    start iterating. Here's a typical loop that prints all the items
-    stored in a list:
-
-    \snippet code/src_corelib_tools_qlistdata.cpp 15
-
-    Let's see a few examples of things we can do with a
-    QList::iterator that we cannot do with a QList::const_iterator.
-    Here's an example that increments every value stored in a
-    QList\<int\> by 2:
-
-    \snippet code/src_corelib_tools_qlistdata.cpp 16
-
-    Most QList functions accept an integer index rather than an
-    iterator. For that reason, iterators are rarely useful in
-    connection with QList. One place where STL-style iterators do
-    make sense is as arguments to \l{generic algorithms}.
-
-    For example, here's how to delete all the widgets stored in a
-    QList\<QWidget *\>:
-
-    \snippet code/src_corelib_tools_qlistdata.cpp 17
-
-    Multiple iterators can be used on the same list. However, be
-    aware that any non-const function call performed on the QList
-    will render all existing iterators undefined. If you need to keep
-    iterators over a long period of time, we recommend that you use
-    QLinkedList rather than QList.
-
-    \warning Iterators on implicitly shared containers do not work
-    exactly like STL-iterators. You should avoid copying a container
-    while iterators are active on that container. For more information,
-    read \l{Implicit sharing iterator problem}.
-
-    \sa QList::const_iterator, QMutableListIterator
-*/
-
-/*! \typedef QList::iterator::iterator_category
-
-  A synonym for \e {std::random_access_iterator_tag} indicating
-  this iterator is a random access iterator.
-*/
-
-/*! \typedef QList::iterator::difference_type
-
-    \internal
-*/
-
-/*! \typedef QList::iterator::value_type
-
-    \internal
-*/
-
-/*! \typedef QList::iterator::pointer
-
-    \internal
-*/
-
-/*! \typedef QList::iterator::reference
-
-    \internal
-*/
-
-/*! \fn template <class T> QList<T>::iterator::iterator()
-
-    Constructs an uninitialized iterator.
-
-    Functions like operator*() and operator++() should not be called
-    on an uninitialized iterator. Use operator=() to assign a value
-    to it before using it.
-
-    \sa QList::begin(), QList::end()
-*/
-
-/*! \fn template <class T> QList<T>::iterator::iterator(Node *node)
-
-    \internal
-*/
-
-/*! \fn template <class T> QList<T>::iterator::iterator(const iterator &other)
-
-    Constructs a copy of \a other.
-*/
-
-/*! \fn template <class T> T &QList<T>::iterator::operator*() const
-
-    Returns a modifiable reference to the current item.
-
-    You can change the value of an item by using operator*() on the
-    left side of an assignment, for example:
-
-    \snippet code/src_corelib_tools_qlistdata.cpp 18
-
-    \sa operator->()
-*/
-
-/*! \fn template <class T> T *QList<T>::iterator::operator->() const
-
-    Returns a pointer to the current item.
-
-    \sa operator*()
-*/
-
-/*! \fn template <class T> T &QList<T>::iterator::operator[](difference_type j) const
-
-    Returns a modifiable reference to the item at position *this +
-    \a{j}.
-
-    This function is provided to make QList iterators behave like C++
-    pointers.
-
-    \sa operator+()
-*/
-
-/*!
-    \fn template <class T> bool QList<T>::iterator::operator==(const iterator &other) const
-    \fn template <class T> bool QList<T>::iterator::operator==(const const_iterator &other) const
-
-    Returns \c true if \a other points to the same item as this
-    iterator; otherwise returns \c false.
-
-    \sa operator!=()
-*/
-
-/*!
-    \fn template <class T> bool QList<T>::iterator::operator!=(const iterator &other) const
-    \fn template <class T> bool QList<T>::iterator::operator!=(const const_iterator &other) const
-
-    Returns \c true if \a other points to a different item than this
-    iterator; otherwise returns \c false.
-
-    \sa operator==()
-*/
-
-/*!
-    \fn template <class T> bool QList<T>::iterator::operator<(const iterator& other) const
-    \fn template <class T> bool QList<T>::iterator::operator<(const const_iterator& other) const
-
-    Returns \c true if the item pointed to by this iterator is less than
-    the item pointed to by the \a other iterator.
-*/
-
-/*!
-    \fn template <class T> bool QList<T>::iterator::operator<=(const iterator& other) const
-    \fn template <class T> bool QList<T>::iterator::operator<=(const const_iterator& other) const
-
-    Returns \c true if the item pointed to by this iterator is less than
-    or equal to the item pointed to by the \a other iterator.
-*/
-
-/*!
-    \fn template <class T> bool QList<T>::iterator::operator>(const iterator& other) const
-    \fn template <class T> bool QList<T>::iterator::operator>(const const_iterator& other) const
-
-    Returns \c true if the item pointed to by this iterator is greater
-    than the item pointed to by the \a other iterator.
-*/
-
-/*!
-    \fn template <class T> bool QList<T>::iterator::operator>=(const iterator& other) const
-    \fn template <class T> bool QList<T>::iterator::operator>=(const const_iterator& other) const
-
-    Returns \c true if the item pointed to by this iterator is greater
-    than or equal to the item pointed to by the \a other iterator.
-*/
-
-/*! \fn template <class T> QList<T>::iterator &QList<T>::iterator::operator++()
-
-    The prefix ++ operator (\c{++it}) advances the iterator to the
-    next item in the list and returns an iterator to the new current
-    item.
-
-    Calling this function on QList::end() leads to undefined results.
-
-    \sa operator--()
-*/
-
-/*! \fn template <class T> QList<T>::iterator QList<T>::iterator::operator++(int)
-
-    \overload
-
-    The postfix ++ operator (\c{it++}) advances the iterator to the
-    next item in the list and returns an iterator to the previously
-    current item.
-*/
-
-/*! \fn template <class T> QList<T>::iterator &QList<T>::iterator::operator--()
-
-    The prefix -- operator (\c{--it}) makes the preceding item
-    current and returns an iterator to the new current item.
-
-    Calling this function on QList::begin() leads to undefined results.
-
-    \sa operator++()
-*/
-
-/*! \fn template <class T> QList<T>::iterator QList<T>::iterator::operator--(int)
-
-    \overload
-
-    The postfix -- operator (\c{it--}) makes the preceding item
-    current and returns an iterator to the previously current item.
-*/
-
-/*! \fn template <class T> QList<T>::iterator &QList<T>::iterator::operator+=(difference_type j)
-
-    Advances the iterator by \a j items. (If \a j is negative, the
-    iterator goes backward.)
-
-    \sa operator-=(), operator+()
-*/
-
-/*! \fn template <class T> QList<T>::iterator &QList<T>::iterator::operator-=(difference_type j)
-
-    Makes the iterator go back by \a j items. (If \a j is negative,
-    the iterator goes forward.)
-
-    \sa operator+=(), operator-()
-*/
-
-/*! \fn template <class T> QList<T>::iterator QList<T>::iterator::operator+(difference_type j) const
-
-    Returns an iterator to the item at \a j positions forward from
-    this iterator. (If \a j is negative, the iterator goes backward.)
-
-    \sa operator-(), operator+=()
-*/
-
-/*! \fn template <class T> QList<T>::iterator QList<T>::iterator::operator-(difference_type j) const
-
-    Returns an iterator to the item at \a j positions backward from
-    this iterator. (If \a j is negative, the iterator goes forward.)
-
-    \sa operator+(), operator-=()
-*/
-
-/*! \fn template <class T> int QList<T>::iterator::operator-(iterator other) const
-
-    Returns the number of items between the item pointed to by \a
-    other and the item pointed to by this iterator.
-*/
-
-/*! \class QList::const_iterator
-    \inmodule QtCore
-    \brief The QList::const_iterator class provides an STL-style const iterator for QList and QQueue.
-
-    QList provides both \l{STL-style iterators} and \l{Java-style
-    iterators}. The STL-style iterators are more low-level and more
-    cumbersome to use; on the other hand, they are slightly faster
-    and, for developers who already know STL, have the advantage of
-    familiarity.
-
-    QList\<T\>::const_iterator allows you to iterate over a
-    QList\<T\> (or a QQueue\<T\>). If you want to modify the QList as
-    you iterate over it, use QList::iterator instead. It is generally
-    good practice to use QList::const_iterator on a non-const QList
-    as well, unless you need to change the QList through the
-    iterator. Const iterators are slightly faster, and can improve
-    code readability.
-
-    The default QList::const_iterator constructor creates an
-    uninitialized iterator. You must initialize it using a QList
-    function like QList::constBegin(), QList::constEnd(), or
-    QList::insert() before you can start iterating. Here's a typical
-    loop that prints all the items stored in a list:
-
-    \snippet code/src_corelib_tools_qlistdata.cpp 19
-
-    Most QList functions accept an integer index rather than an
-    iterator. For that reason, iterators are rarely useful in
-    connection with QList. One place where STL-style iterators do
-    make sense is as arguments to \l{generic algorithms}.
-
-    For example, here's how to delete all the widgets stored in a
-    QList\<QWidget *\>:
-
-    \snippet code/src_corelib_tools_qlistdata.cpp 20
-
-    Multiple iterators can be used on the same list. However, be
-    aware that any non-const function call performed on the QList
-    will render all existing iterators undefined. If you need to keep
-    iterators over a long period of time, we recommend that you use
-    QLinkedList rather than QList.
-
-    \warning Iterators on implicitly shared containers do not work
-    exactly like STL-iterators. You should avoid copying a container
-    while iterators are active on that container. For more information,
-    read \l{Implicit sharing iterator problem}.
-
-    \sa QList::iterator, QListIterator
-*/
-
-/*! \fn template <class T> QList<T>::const_iterator::const_iterator()
-
-    Constructs an uninitialized iterator.
-
-    Functions like operator*() and operator++() should not be called
-    on an uninitialized iterator. Use operator=() to assign a value
-    to it before using it.
-
-    \sa QList::constBegin(), QList::constEnd()
-*/
-
-/*! \typedef QList::const_iterator::iterator_category
-
-  A synonym for \e {std::random_access_iterator_tag} indicating
-  this iterator is a random access iterator.
-*/
-
-/*! \typedef QList::const_iterator::difference_type
-
-    \internal
-*/
-
-/*! \typedef QList::const_iterator::value_type
-
-    \internal
-*/
-
-/*! \typedef QList::const_iterator::pointer
-
-    \internal
-*/
-
-/*! \typedef QList::const_iterator::reference
-
-    \internal
-*/
-
-/*! \fn template <class T> QList<T>::const_iterator::const_iterator(Node *node)
-
-    \internal
-*/
-
-/*! \fn template <class T> QList<T>::const_iterator::const_iterator(const const_iterator &other)
-
-    Constructs a copy of \a other.
-*/
-
-/*! \fn template <class T> QList<T>::const_iterator::const_iterator(const iterator &other)
-
-    Constructs a copy of \a other.
-*/
-
-/*! \fn template <class T> const T &QList<T>::const_iterator::operator*() const
-
-    Returns the current item.
-
-    \sa operator->()
-*/
-
-/*! \fn template <class T> const T *QList<T>::const_iterator::operator->() const
-
-    Returns a pointer to the current item.
-
-    \sa operator*()
-*/
-
-/*! \fn template <class T> const T &QList<T>::const_iterator::operator[](difference_type j) const
-
-    Returns the item at position *this + \a{j}.
-
-    This function is provided to make QList iterators behave like C++
-    pointers.
-
-    \sa operator+()
-*/
-
-/*! \fn template <class T> bool QList<T>::const_iterator::operator==(const const_iterator &other) const
-
-    Returns \c true if \a other points to the same item as this
-    iterator; otherwise returns \c false.
-
-    \sa operator!=()
-*/
-
-/*! \fn template <class T> bool QList<T>::const_iterator::operator!=(const const_iterator &other) const
-
-    Returns \c true if \a other points to a different item than this
-    iterator; otherwise returns \c false.
-
-    \sa operator==()
-*/
-
-/*!
-    \fn template <class T> bool QList<T>::const_iterator::operator<(const const_iterator& other) const
-
-    Returns \c true if the item pointed to by this iterator is less than
-    the item pointed to by the \a other iterator.
-*/
-
-/*!
-    \fn template <class T> bool QList<T>::const_iterator::operator<=(const const_iterator& other) const
-
-    Returns \c true if the item pointed to by this iterator is less than
-    or equal to the item pointed to by the \a other iterator.
-*/
-
-/*!
-    \fn template <class T> bool QList<T>::const_iterator::operator>(const const_iterator& other) const
-
-    Returns \c true if the item pointed to by this iterator is greater
-    than the item pointed to by the \a other iterator.
-*/
-
-/*!
-    \fn template <class T> bool QList<T>::const_iterator::operator>=(const const_iterator& other) const
-
-    Returns \c true if the item pointed to by this iterator is greater
-    than or equal to the item pointed to by the \a other iterator.
-*/
-
-/*! \fn template <class T> QList<T>::const_iterator &QList<T>::const_iterator::operator++()
-
-    The prefix ++ operator (\c{++it}) advances the iterator to the
-    next item in the list and returns an iterator to the new current
-    item.
-
-    Calling this function on QList::end() leads to undefined results.
-
-    \sa operator--()
-*/
-
-/*! \fn template <class T> QList<T>::const_iterator QList<T>::const_iterator::operator++(int)
-
-    \overload
-
-    The postfix ++ operator (\c{it++}) advances the iterator to the
-    next item in the list and returns an iterator to the previously
-    current item.
-*/
-
-/*! \fn template <class T> QList<T>::const_iterator &QList<T>::const_iterator::operator--()
-
-    The prefix -- operator (\c{--it}) makes the preceding item
-    current and returns an iterator to the new current item.
-
-    Calling this function on QList::begin() leads to undefined results.
-
-    \sa operator++()
-*/
-
-/*! \fn template <class T> QList<T>::const_iterator QList<T>::const_iterator::operator--(int)
-
-    \overload
-
-    The postfix -- operator (\c{it--}) makes the preceding item
-    current and returns an iterator to the previously current item.
-*/
-
-/*! \fn template <class T> QList<T>::const_iterator &QList<T>::const_iterator::operator+=(difference_type j)
-
-    Advances the iterator by \a j items. (If \a j is negative, the
-    iterator goes backward.)
-
-    \sa operator-=(), operator+()
-*/
-
-/*! \fn template <class T> QList<T>::const_iterator &QList<T>::const_iterator::operator-=(difference_type j)
-
-    Makes the iterator go back by \a j items. (If \a j is negative,
-    the iterator goes forward.)
-
-    \sa operator+=(), operator-()
-*/
-
-/*! \fn template <class T> QList<T>::const_iterator QList<T>::const_iterator::operator+(difference_type j) const
-
-    Returns an iterator to the item at \a j positions forward from
-    this iterator. (If \a j is negative, the iterator goes backward.)
-
-    \sa operator-(), operator+=()
-*/
-
-/*! \fn template <class T> QList<T>::const_iterator QList<T>::const_iterator::operator-(difference_type j) const
-
-    Returns an iterator to the item at \a j positions backward from
-    this iterator. (If \a j is negative, the iterator goes forward.)
-
-    \sa operator+(), operator-=()
-*/
-
-/*! \fn template <class T> int QList<T>::const_iterator::operator-(const_iterator other) const
-
-    Returns the number of items between the item pointed to by \a
-    other and the item pointed to by this iterator.
-*/
-
-/*! \fn template <class T> QDataStream &operator<<(QDataStream &out, const QList<T> &list)
-    \relates QList
-
-    Writes the list \a list to stream \a out.
-
-    This function requires the value type to implement \c
-    operator<<().
-
-    \sa{Serializing Qt Data Types}{Format of the QDataStream operators}
-*/
-
-/*! \fn template <class T> QDataStream &operator>>(QDataStream &in, QList<T> &list)
-    \relates QList
-
-    Reads a list from stream \a in into \a list.
-
-    This function requires the value type to implement \c
-    operator>>().
-
-    \sa{Serializing Qt Data Types}{Format of the QDataStream operators}
-*/
-
-/*! \fn template <class T> QList<T> QList<T>::fromVector(const QVector<T> &vector)
-
-    Returns a QList object with the data contained in \a vector.
-
-    Example:
-
-    \snippet code/src_corelib_tools_qlistdata.cpp 21
-
-    \include containers-range-constructor.qdocinc
-
-    \sa fromSet(), toVector(), QVector::toList()
-*/
-
-/*! \fn template <class T> QVector<T> QList<T>::toVector() const
-
-    Returns a QVector object with the data contained in this QList.
-
-    Example:
-
-    \snippet code/src_corelib_tools_qlistdata.cpp 22
-
-    \include containers-range-constructor.qdocinc
-
-    \sa toSet(), fromVector(), QVector::fromList()
-*/
-
-/*! \fn template <class T> QList<T> QList<T>::fromSet(const QSet<T> &set)
-
-    Returns a QList object with the data contained in \a set. The
-    order of the elements in the QList is undefined.
-
-    Example:
-
-    \snippet code/src_corelib_tools_qlistdata.cpp 23
-
-    \include containers-range-constructor.qdocinc
-
-    \sa fromVector(), toSet(), QSet::toList()
-*/
-
-/*! \fn template <class T> QSet<T> QList<T>::toSet() const
-
-    Returns a QSet object with the data contained in this QList.
-    Since QSet doesn't allow duplicates, the resulting QSet might be
-    smaller than the original list was.
-
-    Example:
-
-    \snippet code/src_corelib_tools_qlistdata.cpp 24
-
-    \include containers-range-constructor.qdocinc
-
-    \sa toVector(), fromSet(), QSet::fromList()
-*/
-
-/*! \fn template <class T> QList<T> QList<T>::fromStdList(const std::list<T> &list)
-
-    Returns a QList object with the data contained in \a list. The
-    order of the elements in the QList is the same as in \a list.
-
-    Example:
-
-    \snippet code/src_corelib_tools_qlistdata.cpp 25
-
-    \include containers-range-constructor.qdocinc
-
-    \sa toStdList(), QVector::fromStdVector()
-*/
-
-/*! \fn template <class T> std::list<T> QList<T>::toStdList() const
-
-    Returns a std::list object with the data contained in this QList.
-    Example:
-
-    \snippet code/src_corelib_tools_qlistdata.cpp 26
-
-    \include containers-range-constructor.qdocinc
-
-    \sa fromStdList(), QVector::toStdVector()
-*/
-
 QT_END_NAMESPACE
diff --git a/src/corelib/tools/qlist.h b/src/corelib/tools/qlist.h
index 37258cc66f..515fba6530 100644
--- a/src/corelib/tools/qlist.h
+++ b/src/corelib/tools/qlist.h
@@ -40,1160 +40,19 @@
 #ifndef QLIST_H
 #define QLIST_H
 
-#include <QtCore/qalgorithms.h>
-#include <QtCore/qiterator.h>
-#include <QtCore/qrefcount.h>
-#include <QtCore/qarraydata.h>
-#include <QtCore/qhashfunctions.h>
 #include <QtCore/qvector.h>
-#include <QtCore/qcontainertools_impl.h>
-
-#include <algorithm>
-#include <initializer_list>
-#include <iterator>
-#if QT_VERSION < QT_VERSION_CHECK(6,0,0)
-#include <list>
-#endif
-
-#include <stdlib.h>
-#include <new>
-#include <limits.h>
-#include <string.h>
-
-#ifdef Q_CC_MSVC
-#pragma warning( push )
-#pragma warning( disable : 4127 ) // "conditional expression is constant"
-#endif
+#include <QtCore/qcontainerfwd.h>
 
+#if !defined(QT_NO_JAVA_STYLE_ITERATORS)
 QT_BEGIN_NAMESPACE
-
-
-template <typename T> class QVector;
-template <typename T> class QSet;
-
-template <typename T> struct QListSpecialMethods
-{
-protected:
-    ~QListSpecialMethods() = default;
-};
-template <> struct QListSpecialMethods<QByteArray>;
-template <> struct QListSpecialMethods<QString>;
-
-struct Q_CORE_EXPORT QListData {
-    // tags for tag-dispatching of QList implementations,
-    // based on QList's three different memory layouts:
-    struct NotArrayCompatibleLayout {};
-    struct NotIndirectLayout {};
-    struct ArrayCompatibleLayout   : NotIndirectLayout {};                           // data laid out like a C array
-    struct InlineWithPaddingLayout : NotArrayCompatibleLayout, NotIndirectLayout {}; // data laid out like a C array with padding
-    struct IndirectLayout          : NotArrayCompatibleLayout {};                    // data allocated on the heap
-
-    struct Data {
-        QtPrivate::RefCount ref;
-        int alloc, begin, end;
-        void *array[1];
-    };
-    enum { DataHeaderSize = sizeof(Data) - sizeof(void *) };
-
-    Data *detach(int alloc);
-    Data *detach_grow(int *i, int n);
-    void realloc(int alloc);
-    void realloc_grow(int growth);
-    inline void dispose() { dispose(d); }
-    static void dispose(Data *d);
-    static const Data shared_null;
-    Data *d;
-    void **erase(void **xi);
-    void **append(int n);
-    void **append();
-    void **append(const QListData &l);
-    void **prepend();
-    void **insert(int i);
-    void remove(int i);
-    void remove(int i, int n);
-    void move(int from, int to);
-    inline int size() const noexcept { return int(d->end - d->begin); }   // q6sizetype
-    inline bool isEmpty() const noexcept { return d->end  == d->begin; }
-    inline void **at(int i) const noexcept { return d->array + d->begin + i; }
-    inline void **begin() const noexcept { return d->array + d->begin; }
-    inline void **end() const noexcept { return d->array + d->end; }
-};
-
-namespace QtPrivate {
-    template <typename V, typename U> int indexOf(const QList<V> &list, const U &u, int from);
-    template <typename V, typename U> int lastIndexOf(const QList<V> &list, const U &u, int from);
-}
-
-template <typename T>
-class QList
-#ifndef Q_QDOC
-    : public QListSpecialMethods<T>
-#endif
-{
-public:
-    struct MemoryLayout
-        : std::conditional<
-            // must stay isStatic until ### Qt 6 for BC reasons (don't use !isRelocatable)!
-            QTypeInfo<T>::isStatic || QTypeInfo<T>::isLarge,
-            QListData::IndirectLayout,
-            typename std::conditional<
-                sizeof(T) == sizeof(void*),
-                QListData::ArrayCompatibleLayout,
-                QListData::InlineWithPaddingLayout
-             >::type>::type {};
-private:
-    template <typename V, typename U> friend int QtPrivate::indexOf(const QList<V> &list, const U &u, int from);
-    template <typename V, typename U> friend int QtPrivate::lastIndexOf(const QList<V> &list, const U &u, int from);
-    struct Node { void *v;
-#if defined(Q_CC_BOR)
-        Q_INLINE_TEMPLATE T &t();
-#else
-        Q_INLINE_TEMPLATE T &t()
-        { return *reinterpret_cast<T*>(QTypeInfo<T>::isLarge || QTypeInfo<T>::isStatic
-                                       ? v : this); }
-#endif
-    };
-
-    union { QListData p; QListData::Data *d; };
-
-public:
-    inline QList() noexcept : d(const_cast<QListData::Data *>(&QListData::shared_null)) { }
-    QList(const QList<T> &l);
-    ~QList();
-    QList<T> &operator=(const QList<T> &l);
-    inline QList(QList<T> &&other) noexcept
-        : d(other.d) { other.d = const_cast<QListData::Data *>(&QListData::shared_null); }
-    inline QList &operator=(QList<T> &&other) noexcept
-    { QList moved(std::move(other)); swap(moved); return *this; }
-    inline void swap(QList<T> &other) noexcept { qSwap(d, other.d); }
-    inline QList(std::initializer_list<T> args)
-        : QList(args.begin(), args.end()) {}
-    template <typename InputIterator, QtPrivate::IfIsInputIterator<InputIterator> = true>
-    QList(InputIterator first, InputIterator last);
-    bool operator==(const QList<T> &l) const;
-    inline bool operator!=(const QList<T> &l) const { return !(*this == l); }
-
-    inline int size() const noexcept { return p.size(); }
-
-    inline void detach() { if (d->ref.isShared()) detach_helper(); }
-
-    inline void detachShared()
-    {
-        // The "this->" qualification is needed for GCCE.
-        if (d->ref.isShared() && this->d != &QListData::shared_null)
-            detach_helper();
-    }
-
-    inline bool isDetached() const { return !d->ref.isShared(); }
-#if !defined(QT_NO_UNSHARABLE_CONTAINERS)
-    inline void setSharable(bool sharable)
-    {
-        if (sharable == d->ref.isSharable())
-            return;
-        if (!sharable)
-            detach();
-        if (d != &QListData::shared_null)
-            d->ref.setSharable(sharable);
-    }
-#endif
-    inline bool isSharedWith(const QList<T> &other) const noexcept { return d == other.d; }
-
-    inline bool isEmpty() const noexcept { return p.isEmpty(); }
-
-    void clear();
-
-    const T &at(int i) const;
-    const T &operator[](int i) const;
-    T &operator[](int i);
-
-    void reserve(int size);
-    void append(const T &t);
-    void append(const QList<T> &t);
-    void prepend(const T &t);
-    void insert(int i, const T &t);
-    void replace(int i, const T &t);
-    void removeAt(int i);
-    int removeAll(const T &t);
-    bool removeOne(const T &t);
-    T takeAt(int i);
-    T takeFirst();
-    T takeLast();
-    void move(int from, int to);
-    void swapItemsAt(int i, int j);
-#if QT_DEPRECATED_SINCE(5, 13) && QT_VERSION < QT_VERSION_CHECK(6,0,0)
-    QT_DEPRECATED_X("Use QList<T>::swapItemsAt()")
-    void swap(int i, int j) { swapItemsAt(i, j); }
-#endif
-    int indexOf(const T &t, int from = 0) const;
-    int lastIndexOf(const T &t, int from = -1) const;
-    bool contains(const T &t) const;
-    int count(const T &t) const;
-
-    class const_iterator;
-
-    class iterator {
-    public:
-        Node *i;
-        typedef std::random_access_iterator_tag  iterator_category;
-        // ### Qt6: use int
-        typedef qptrdiff difference_type;
-        typedef T value_type;
-        typedef T *pointer;
-        typedef T &reference;
-
-        inline iterator() noexcept : i(nullptr) {}
-        inline iterator(Node *n) noexcept : i(n) {}
-#if QT_VERSION < QT_VERSION_CHECK(6,0,0)
-        // can't remove it in Qt 5, since doing so would make the type trivial,
-        // which changes the way it's passed to functions by value.
-        inline iterator(const iterator &o) noexcept : i(o.i){}
-        inline iterator &operator=(const iterator &o) noexcept
-        { i = o.i; return *this; }
-#endif
-        inline T &operator*() const { return i->t(); }
-        inline T *operator->() const { return &i->t(); }
-        inline T &operator[](difference_type j) const { return i[j].t(); }
-        inline bool operator==(const iterator &o) const noexcept { return i == o.i; }
-        inline bool operator!=(const iterator &o) const noexcept { return i != o.i; }
-        inline bool operator<(const iterator& other) const noexcept { return i < other.i; }
-        inline bool operator<=(const iterator& other) const noexcept { return i <= other.i; }
-        inline bool operator>(const iterator& other) const noexcept { return i > other.i; }
-        inline bool operator>=(const iterator& other) const noexcept { return i >= other.i; }
-#ifndef QT_STRICT_ITERATORS
-        inline bool operator==(const const_iterator &o) const noexcept
-            { return i == o.i; }
-        inline bool operator!=(const const_iterator &o) const noexcept
-            { return i != o.i; }
-        inline bool operator<(const const_iterator& other) const noexcept
-            { return i < other.i; }
-        inline bool operator<=(const const_iterator& other) const noexcept
-            { return i <= other.i; }
-        inline bool operator>(const const_iterator& other) const noexcept
-            { return i > other.i; }
-        inline bool operator>=(const const_iterator& other) const noexcept
-            { return i >= other.i; }
-#endif
-        inline iterator &operator++() { ++i; return *this; }
-        inline iterator operator++(int) { Node *n = i; ++i; return n; }
-        inline iterator &operator--() { i--; return *this; }
-        inline iterator operator--(int) { Node *n = i; i--; return n; }
-        inline iterator &operator+=(difference_type j) { i+=j; return *this; }
-        inline iterator &operator-=(difference_type j) { i-=j; return *this; }
-        inline iterator operator+(difference_type j) const { return iterator(i+j); }
-        inline iterator operator-(difference_type j) const { return iterator(i-j); }
-        friend inline iterator operator+(difference_type j, iterator k) { return k + j; }
-        inline int operator-(iterator j) const { return int(i - j.i); }
-    };
-    friend class iterator;
-
-    class const_iterator {
-    public:
-        Node *i;
-        typedef std::random_access_iterator_tag  iterator_category;
-        // ### Qt6: use int
-        typedef qptrdiff difference_type;
-        typedef T value_type;
-        typedef const T *pointer;
-        typedef const T &reference;
-
-        inline const_iterator() noexcept : i(nullptr) {}
-        inline const_iterator(Node *n) noexcept : i(n) {}
-#if QT_VERSION < QT_VERSION_CHECK(6,0,0)
-        // can't remove it in Qt 5, since doing so would make the type trivial,
-        // which changes the way it's passed to functions by value.
-        inline const_iterator(const const_iterator &o) noexcept : i(o.i) {}
-        inline const_iterator &operator=(const const_iterator &o) noexcept
-        { i = o.i; return *this; }
-#endif
-#ifdef QT_STRICT_ITERATORS
-        inline explicit const_iterator(const iterator &o) noexcept : i(o.i) {}
-#else
-        inline const_iterator(const iterator &o) noexcept : i(o.i) {}
-#endif
-        inline const T &operator*() const { return i->t(); }
-        inline const T *operator->() const { return &i->t(); }
-        inline const T &operator[](difference_type j) const { return i[j].t(); }
-        inline bool operator==(const const_iterator &o) const noexcept { return i == o.i; }
-        inline bool operator!=(const const_iterator &o) const noexcept { return i != o.i; }
-        inline bool operator<(const const_iterator& other) const noexcept { return i < other.i; }
-        inline bool operator<=(const const_iterator& other) const noexcept { return i <= other.i; }
-        inline bool operator>(const const_iterator& other) const noexcept { return i > other.i; }
-        inline bool operator>=(const const_iterator& other) const noexcept { return i >= other.i; }
-        inline const_iterator &operator++() { ++i; return *this; }
-        inline const_iterator operator++(int) { Node *n = i; ++i; return n; }
-        inline const_iterator &operator--() { i--; return *this; }
-        inline const_iterator operator--(int) { Node *n = i; i--; return n; }
-        inline const_iterator &operator+=(difference_type j) { i+=j; return *this; }
-        inline const_iterator &operator-=(difference_type j) { i-=j; return *this; }
-        inline const_iterator operator+(difference_type j) const { return const_iterator(i+j); }
-        inline const_iterator operator-(difference_type j) const { return const_iterator(i-j); }
-        friend inline const_iterator operator+(difference_type j, const_iterator k) { return k + j; }
-        inline int operator-(const_iterator j) const { return int(i - j.i); }
-    };
-    friend class const_iterator;
-
-    // stl style
-    typedef std::reverse_iterator<iterator> reverse_iterator;
-    typedef std::reverse_iterator<const_iterator> const_reverse_iterator;
-    inline iterator begin() { detach(); return reinterpret_cast<Node *>(p.begin()); }
-    inline const_iterator begin() const noexcept { return reinterpret_cast<Node *>(p.begin()); }
-    inline const_iterator cbegin() const noexcept { return reinterpret_cast<Node *>(p.begin()); }
-    inline const_iterator constBegin() const noexcept { return reinterpret_cast<Node *>(p.begin()); }
-    inline iterator end() { detach(); return reinterpret_cast<Node *>(p.end()); }
-    inline const_iterator end() const noexcept { return reinterpret_cast<Node *>(p.end()); }
-    inline const_iterator cend() const noexcept { return reinterpret_cast<Node *>(p.end()); }
-    inline const_iterator constEnd() const noexcept { return reinterpret_cast<Node *>(p.end()); }
-    reverse_iterator rbegin() { return reverse_iterator(end()); }
-    reverse_iterator rend() { return reverse_iterator(begin()); }
-    const_reverse_iterator rbegin() const noexcept { return const_reverse_iterator(end()); }
-    const_reverse_iterator rend() const noexcept { return const_reverse_iterator(begin()); }
-    const_reverse_iterator crbegin() const noexcept { return const_reverse_iterator(end()); }
-    const_reverse_iterator crend() const noexcept { return const_reverse_iterator(begin()); }
-    iterator insert(iterator before, const T &t);
-    iterator erase(iterator pos);
-    iterator erase(iterator first, iterator last);
-
-    // more Qt
-    typedef iterator Iterator;
-    typedef const_iterator ConstIterator;
-    inline int count() const { return p.size(); }
-    inline int length() const { return p.size(); } // Same as count()
-    inline T& first() { Q_ASSERT(!isEmpty()); return *begin(); }
-    inline const T& constFirst() const { return first(); }
-    inline const T& first() const { Q_ASSERT(!isEmpty()); return at(0); }
-    T& last() { Q_ASSERT(!isEmpty()); return *(--end()); }
-    const T& last() const { Q_ASSERT(!isEmpty()); return at(count() - 1); }
-    inline const T& constLast() const { return last(); }
-    inline void removeFirst() { Q_ASSERT(!isEmpty()); erase(begin()); }
-    inline void removeLast() { Q_ASSERT(!isEmpty()); erase(--end()); }
-    inline bool startsWith(const T &t) const { return !isEmpty() && first() == t; }
-    inline bool endsWith(const T &t) const { return !isEmpty() && last() == t; }
-    QList<T> mid(int pos, int length = -1) const;
-
-    T value(int i) const;
-    T value(int i, const T &defaultValue) const;
-
-    // stl compatibility
-    inline void push_back(const T &t) { append(t); }
-    inline void push_front(const T &t) { prepend(t); }
-    inline T& front() { return first(); }
-    inline const T& front() const { return first(); }
-    inline T& back() { return last(); }
-    inline const T& back() const { return last(); }
-    inline void pop_front() { removeFirst(); }
-    inline void pop_back() { removeLast(); }
-    inline bool empty() const { return isEmpty(); }
-    typedef int size_type;
-    typedef T value_type;
-    typedef value_type *pointer;
-    typedef const value_type *const_pointer;
-    typedef value_type &reference;
-    typedef const value_type &const_reference;
-    // ### Qt6: use int
-    typedef qptrdiff difference_type;
-
-    // comfort
-    QList<T> &operator+=(const QList<T> &l);
-    inline QList<T> operator+(const QList<T> &l) const
-    { QList n = *this; n += l; return n; }
-    inline QList<T> &operator+=(const T &t)
-    { append(t); return *this; }
-    inline QList<T> &operator<< (const T &t)
-    { append(t); return *this; }
-    inline QList<T> &operator<<(const QList<T> &l)
-    { *this += l; return *this; }
-
-    static QList<T> fromVector(const QVector<T> &vector);
-    QVector<T> toVector() const;
-
-#if QT_DEPRECATED_SINCE(5, 14) && QT_VERSION < QT_VERSION_CHECK(6,0,0)
-    QT_DEPRECATED_X("Use QList<T>(set.begin(), set.end()) instead.")
-    static QList<T> fromSet(const QSet<T> &set);
-    QT_DEPRECATED_X("Use QSet<T>(list.begin(), list.end()) instead.")
-    QSet<T> toSet() const;
-
-    QT_DEPRECATED_X("Use QList<T>(list.begin(), list.end()) instead.")
-    static inline QList<T> fromStdList(const std::list<T> &list)
-    { return QList<T>(list.begin(), list.end()); }
-    QT_DEPRECATED_X("Use std::list<T>(list.begin(), list.end()) instead.")
-    inline std::list<T> toStdList() const
-    { return std::list<T>(begin(), end()); }
-#endif
-
-private:
-    Node *detach_helper_grow(int i, int n);
-    void detach_helper(int alloc);
-    void detach_helper();
-    void dealloc(QListData::Data *d);
-
-    void node_construct(Node *n, const T &t);
-    void node_destruct(Node *n);
-    void node_copy(Node *from, Node *to, Node *src);
-    void node_destruct(Node *from, Node *to);
-
-    bool isValidIterator(const iterator &i) const noexcept
-    {
-        const std::less<const Node *> less = {};
-        return !less(i.i, cbegin().i) && !less(cend().i, i.i);
-    }
-
-private:
-    inline bool op_eq_impl(const QList &other, QListData::NotArrayCompatibleLayout) const;
-    inline bool op_eq_impl(const QList &other, QListData::ArrayCompatibleLayout) const;
-    inline bool contains_impl(const T &, QListData::NotArrayCompatibleLayout) const;
-    inline bool contains_impl(const T &, QListData::ArrayCompatibleLayout) const;
-    inline int count_impl(const T &, QListData::NotArrayCompatibleLayout) const;
-    inline int count_impl(const T &, QListData::ArrayCompatibleLayout) const;
-};
-
-#if defined(__cpp_deduction_guides) && __cpp_deduction_guides >= 201606
-template <typename InputIterator,
-          typename ValueType = typename std::iterator_traits<InputIterator>::value_type,
-          QtPrivate::IfIsInputIterator<InputIterator> = true>
-QList(InputIterator, InputIterator) -> QList<ValueType>;
-#endif
-
-#if defined(Q_CC_BOR)
-template <typename T>
-Q_INLINE_TEMPLATE T &QList<T>::Node::t()
-{ return QTypeInfo<T>::isLarge || QTypeInfo<T>::isStatic ? *(T*)v:*(T*)this; }
-#endif
-
-template <typename T>
-Q_INLINE_TEMPLATE void QList<T>::node_construct(Node *n, const T &t)
-{
-    if (QTypeInfo<T>::isLarge || QTypeInfo<T>::isStatic) n->v = new T(t);
-    else if (QTypeInfo<T>::isComplex) new (n) T(t);
-#if (defined(__GNUC__) || defined(__INTEL_COMPILER) || defined(__IBMCPP__)) && !defined(__OPTIMIZE__)
-    // This violates pointer aliasing rules, but it is known to be safe (and silent)
-    // in unoptimized GCC builds (-fno-strict-aliasing). The other compilers which
-    // set the same define are assumed to be safe.
-    else *reinterpret_cast<T*>(n) = t;
-#else
-    // This is always safe, but penaltizes unoptimized builds a lot.
-    else ::memcpy(n, static_cast<const void *>(&t), sizeof(T));
-#endif
-}
-
-template <typename T>
-Q_INLINE_TEMPLATE void QList<T>::node_destruct(Node *n)
-{
-    if (QTypeInfo<T>::isLarge || QTypeInfo<T>::isStatic) delete reinterpret_cast<T*>(n->v);
-    else if (QTypeInfo<T>::isComplex) reinterpret_cast<T*>(n)->~T();
-}
-
-template <typename T>
-Q_INLINE_TEMPLATE void QList<T>::node_copy(Node *from, Node *to, Node *src)
-{
-    Node *current = from;
-    if (QTypeInfo<T>::isLarge || QTypeInfo<T>::isStatic) {
-        QT_TRY {
-            while(current != to) {
-                current->v = new T(*reinterpret_cast<T*>(src->v));
-                ++current;
-                ++src;
-            }
-        } QT_CATCH(...) {
-            while (current-- != from)
-                delete reinterpret_cast<T*>(current->v);
-            QT_RETHROW;
-        }
-
-    } else if (QTypeInfo<T>::isComplex) {
-        QT_TRY {
-            while(current != to) {
-                new (current) T(*reinterpret_cast<T*>(src));
-                ++current;
-                ++src;
-            }
-        } QT_CATCH(...) {
-            while (current-- != from)
-                (reinterpret_cast<T*>(current))->~T();
-            QT_RETHROW;
-        }
-    } else {
-        if (src != from && to - from > 0)
-            memcpy(from, src, (to - from) * sizeof(Node));
-    }
-}
-
-template <typename T>
-Q_INLINE_TEMPLATE void QList<T>::node_destruct(Node *from, Node *to)
-{
-    if (QTypeInfo<T>::isLarge || QTypeInfo<T>::isStatic)
-        while(from != to) --to, delete reinterpret_cast<T*>(to->v);
-    else if (QTypeInfo<T>::isComplex)
-        while (from != to) --to, reinterpret_cast<T*>(to)->~T();
-}
-
-template <typename T>
-Q_INLINE_TEMPLATE QList<T> &QList<T>::operator=(const QList<T> &l)
-{
-    if (d != l.d) {
-        QList<T> tmp(l);
-        tmp.swap(*this);
-    }
-    return *this;
-}
-template <typename T>
-inline typename QList<T>::iterator QList<T>::insert(iterator before, const T &t)
-{
-    Q_ASSERT_X(isValidIterator(before), "QList::insert", "The specified iterator argument 'before' is invalid");
-
-    int iBefore = int(before.i - reinterpret_cast<Node *>(p.begin()));
-    Node *n = nullptr;
-    if (d->ref.isShared())
-        n = detach_helper_grow(iBefore, 1);
-    else
-        n = reinterpret_cast<Node *>(p.insert(iBefore));
-    QT_TRY {
-        node_construct(n, t);
-    } QT_CATCH(...) {
-        p.remove(iBefore);
-        QT_RETHROW;
-    }
-    return n;
-}
-template <typename T>
-inline typename QList<T>::iterator QList<T>::erase(iterator it)
-{
-    Q_ASSERT_X(isValidIterator(it), "QList::erase", "The specified iterator argument 'it' is invalid");
-    if (d->ref.isShared()) {
-        int offset = int(it.i - reinterpret_cast<Node *>(p.begin()));
-        it = begin(); // implies detach()
-        it += offset;
-    }
-    node_destruct(it.i);
-    return reinterpret_cast<Node *>(p.erase(reinterpret_cast<void**>(it.i)));
-}
-template <typename T>
-inline const T &QList<T>::at(int i) const
-{ Q_ASSERT_X(i >= 0 && i < p.size(), "QList<T>::at", "index out of range");
- return reinterpret_cast<Node *>(p.at(i))->t(); }
-template <typename T>
-inline const T &QList<T>::operator[](int i) const
-{ Q_ASSERT_X(i >= 0 && i < p.size(), "QList<T>::operator[]", "index out of range");
- return reinterpret_cast<Node *>(p.at(i))->t(); }
-template <typename T>
-inline T &QList<T>::operator[](int i)
-{ Q_ASSERT_X(i >= 0 && i < p.size(), "QList<T>::operator[]", "index out of range");
-  detach(); return reinterpret_cast<Node *>(p.at(i))->t(); }
-template <typename T>
-inline void QList<T>::removeAt(int i)
-{
-#if !QT_DEPRECATED_SINCE(5, 15)
-    Q_ASSERT_X(i >= 0 && i < p.size(), "QList<T>::removeAt", "index out of range");
-#elif !defined(QT_NO_DEBUG)
-    if (i < 0 || i >= p.size())
-        qWarning("QList::removeAt(): Index out of range.");
-#endif
-    detach();
-    node_destruct(reinterpret_cast<Node *>(p.at(i))); p.remove(i);
-}
-template <typename T>
-inline T QList<T>::takeAt(int i)
-{ Q_ASSERT_X(i >= 0 && i < p.size(), "QList<T>::take", "index out of range");
- detach(); Node *n = reinterpret_cast<Node *>(p.at(i)); T t = std::move(n->t()); node_destruct(n);
- p.remove(i); return t; }
-template <typename T>
-inline T QList<T>::takeFirst()
-{ T t = std::move(first()); removeFirst(); return t; }
-template <typename T>
-inline T QList<T>::takeLast()
-{ T t = std::move(last()); removeLast(); return t; }
-
-template <typename T>
-Q_OUTOFLINE_TEMPLATE void QList<T>::reserve(int alloc)
-{
-    if (d->alloc < alloc) {
-        if (d->ref.isShared())
-            detach_helper(alloc);
-        else
-            p.realloc(alloc);
-    }
-}
-
-template <typename T>
-Q_OUTOFLINE_TEMPLATE void QList<T>::append(const T &t)
-{
-    if (d->ref.isShared()) {
-        Node *n = detach_helper_grow(INT_MAX, 1);
-        QT_TRY {
-            node_construct(n, t);
-        } QT_CATCH(...) {
-            --d->end;
-            QT_RETHROW;
-        }
-    } else {
-        if (QTypeInfo<T>::isLarge || QTypeInfo<T>::isStatic) {
-            Node *n = reinterpret_cast<Node *>(p.append());
-            QT_TRY {
-                node_construct(n, t);
-            } QT_CATCH(...) {
-                --d->end;
-                QT_RETHROW;
-            }
-        } else {
-            Node *n, copy;
-            node_construct(&copy, t); // t might be a reference to an object in the array
-            QT_TRY {
-                n = reinterpret_cast<Node *>(p.append());;
-            } QT_CATCH(...) {
-                node_destruct(&copy);
-                QT_RETHROW;
-            }
-            *n = copy;
-        }
-    }
-}
-
-template <typename T>
-inline void QList<T>::prepend(const T &t)
-{
-    if (d->ref.isShared()) {
-        Node *n = detach_helper_grow(0, 1);
-        QT_TRY {
-            node_construct(n, t);
-        } QT_CATCH(...) {
-            ++d->begin;
-            QT_RETHROW;
-        }
-    } else {
-        if (QTypeInfo<T>::isLarge || QTypeInfo<T>::isStatic) {
-            Node *n = reinterpret_cast<Node *>(p.prepend());
-            QT_TRY {
-                node_construct(n, t);
-            } QT_CATCH(...) {
-                ++d->begin;
-                QT_RETHROW;
-            }
-        } else {
-            Node *n, copy;
-            node_construct(&copy, t); // t might be a reference to an object in the array
-            QT_TRY {
-                n = reinterpret_cast<Node *>(p.prepend());;
-            } QT_CATCH(...) {
-                node_destruct(&copy);
-                QT_RETHROW;
-            }
-            *n = copy;
-        }
-    }
-}
-
-template <typename T>
-inline void QList<T>::insert(int i, const T &t)
-{
-#if !QT_DEPRECATED_SINCE(5, 15)
-    Q_ASSERT_X(i >= 0 && i <= p.size(), "QList<T>::insert", "index out of range");
-#elif !defined(QT_NO_DEBUG)
-    if (i < 0 || i > p.size())
-        qWarning("QList::insert(): Index out of range.");
-#endif
-    if (d->ref.isShared()) {
-        Node *n = detach_helper_grow(i, 1);
-        QT_TRY {
-            node_construct(n, t);
-        } QT_CATCH(...) {
-            p.remove(i);
-            QT_RETHROW;
-        }
-    } else {
-        if (QTypeInfo<T>::isLarge || QTypeInfo<T>::isStatic) {
-            Node *n = reinterpret_cast<Node *>(p.insert(i));
-            QT_TRY {
-                node_construct(n, t);
-            } QT_CATCH(...) {
-                p.remove(i);
-                QT_RETHROW;
-            }
-        } else {
-            Node *n, copy;
-            node_construct(&copy, t); // t might be a reference to an object in the array
-            QT_TRY {
-                n = reinterpret_cast<Node *>(p.insert(i));;
-            } QT_CATCH(...) {
-                node_destruct(&copy);
-                QT_RETHROW;
-            }
-            *n = copy;
-        }
-    }
-}
-
-template <typename T>
-inline void QList<T>::replace(int i, const T &t)
-{
-    Q_ASSERT_X(i >= 0 && i < p.size(), "QList<T>::replace", "index out of range");
-    detach();
-    reinterpret_cast<Node *>(p.at(i))->t() = t;
-}
-
-template <typename T>
-inline void QList<T>::swapItemsAt(int i, int j)
-{
-    Q_ASSERT_X(i >= 0 && i < p.size() && j >= 0 && j < p.size(),
-                "QList<T>::swap", "index out of range");
-    detach();
-    qSwap(d->array[d->begin + i], d->array[d->begin + j]);
-}
-
-template <typename T>
-inline void QList<T>::move(int from, int to)
-{
-    Q_ASSERT_X(from >= 0 && from < p.size() && to >= 0 && to < p.size(),
-               "QList<T>::move", "index out of range");
-    detach();
-    p.move(from, to);
-}
-
-template<typename T>
-Q_OUTOFLINE_TEMPLATE QList<T> QList<T>::mid(int pos, int alength) const
-{
-    using namespace QtPrivate;
-    switch (QContainerImplHelper::mid(size(), &pos, &alength)) {
-    case QContainerImplHelper::Null:
-    case QContainerImplHelper::Empty:
-        return QList<T>();
-    case QContainerImplHelper::Full:
-        return *this;
-    case QContainerImplHelper::Subset:
-        break;
-    }
-
-    QList<T> cpy;
-    if (alength <= 0)
-        return cpy;
-    cpy.reserve(alength);
-    cpy.d->end = alength;
-    QT_TRY {
-        cpy.node_copy(reinterpret_cast<Node *>(cpy.p.begin()),
-                      reinterpret_cast<Node *>(cpy.p.end()),
-                      reinterpret_cast<Node *>(p.begin() + pos));
-    } QT_CATCH(...) {
-        // restore the old end
-        cpy.d->end = 0;
-        QT_RETHROW;
-    }
-    return cpy;
-}
-
 template<typename T>
-Q_OUTOFLINE_TEMPLATE T QList<T>::value(int i) const
-{
-    if (i < 0 || i >= p.size()) {
-        return T();
-    }
-    return reinterpret_cast<Node *>(p.at(i))->t();
-}
-
+using QMutableListIterator = QMutableVectorIterator<T>;
 template<typename T>
-Q_OUTOFLINE_TEMPLATE T QList<T>::value(int i, const T& defaultValue) const
-{
-    return ((i < 0 || i >= p.size()) ? defaultValue : reinterpret_cast<Node *>(p.at(i))->t());
-}
-
-template <typename T>
-Q_OUTOFLINE_TEMPLATE typename QList<T>::Node *QList<T>::detach_helper_grow(int i, int c)
-{
-    Node *n = reinterpret_cast<Node *>(p.begin());
-    QListData::Data *x = p.detach_grow(&i, c);
-    QT_TRY {
-        node_copy(reinterpret_cast<Node *>(p.begin()),
-                  reinterpret_cast<Node *>(p.begin() + i), n);
-    } QT_CATCH(...) {
-        p.dispose();
-        d = x;
-        QT_RETHROW;
-    }
-    QT_TRY {
-        node_copy(reinterpret_cast<Node *>(p.begin() + i + c),
-                  reinterpret_cast<Node *>(p.end()), n + i);
-    } QT_CATCH(...) {
-        node_destruct(reinterpret_cast<Node *>(p.begin()),
-                      reinterpret_cast<Node *>(p.begin() + i));
-        p.dispose();
-        d = x;
-        QT_RETHROW;
-    }
-
-    if (!x->ref.deref())
-        dealloc(x);
-
-    return reinterpret_cast<Node *>(p.begin() + i);
-}
-
-template <typename T>
-Q_OUTOFLINE_TEMPLATE void QList<T>::detach_helper(int alloc)
-{
-    Node *n = reinterpret_cast<Node *>(p.begin());
-    QListData::Data *x = p.detach(alloc);
-    QT_TRY {
-        node_copy(reinterpret_cast<Node *>(p.begin()), reinterpret_cast<Node *>(p.end()), n);
-    } QT_CATCH(...) {
-        p.dispose();
-        d = x;
-        QT_RETHROW;
-    }
-
-    if (!x->ref.deref())
-        dealloc(x);
-}
-
-template <typename T>
-Q_OUTOFLINE_TEMPLATE void QList<T>::detach_helper()
-{
-    detach_helper(d->alloc);
-}
-
-template <typename T>
-Q_OUTOFLINE_TEMPLATE QList<T>::QList(const QList<T> &l)
-    : QListSpecialMethods<T>(l), d(l.d)
-{
-    if (!d->ref.ref()) {
-        p.detach(d->alloc);
-
-        QT_TRY {
-            node_copy(reinterpret_cast<Node *>(p.begin()),
-                    reinterpret_cast<Node *>(p.end()),
-                    reinterpret_cast<Node *>(l.p.begin()));
-        } QT_CATCH(...) {
-            QListData::dispose(d);
-            QT_RETHROW;
-        }
-    }
-}
-
-template <typename T>
-Q_OUTOFLINE_TEMPLATE QList<T>::~QList()
-{
-    if (!d->ref.deref())
-        dealloc(d);
-}
-
-template <typename T>
-template <typename InputIterator, QtPrivate::IfIsInputIterator<InputIterator>>
-QList<T>::QList(InputIterator first, InputIterator last)
-    : QList()
-{
-    QtPrivate::reserveIfForwardIterator(this, first, last);
-    std::copy(first, last, std::back_inserter(*this));
-}
-
-template <typename T>
-Q_OUTOFLINE_TEMPLATE bool QList<T>::operator==(const QList<T> &l) const
-{
-    if (d == l.d)
-        return true;
-    if (p.size() != l.p.size())
-        return false;
-    return this->op_eq_impl(l, MemoryLayout());
-}
-
-template <typename T>
-inline bool QList<T>::op_eq_impl(const QList &l, QListData::NotArrayCompatibleLayout) const
-{
-    Node *i = reinterpret_cast<Node *>(p.begin());
-    Node *e = reinterpret_cast<Node *>(p.end());
-    Node *li = reinterpret_cast<Node *>(l.p.begin());
-    for (; i != e; ++i, ++li) {
-        if (!(i->t() == li->t()))
-            return false;
-    }
-    return true;
-}
-
-template <typename T>
-inline bool QList<T>::op_eq_impl(const QList &l, QListData::ArrayCompatibleLayout) const
-{
-    const T *lb = reinterpret_cast<const T*>(l.p.begin());
-    const T *b  = reinterpret_cast<const T*>(p.begin());
-    const T *e  = reinterpret_cast<const T*>(p.end());
-    return std::equal(b, e, QT_MAKE_CHECKED_ARRAY_ITERATOR(lb, l.p.size()));
-}
-
-template <typename T>
-Q_OUTOFLINE_TEMPLATE void QList<T>::dealloc(QListData::Data *data)
-{
-    node_destruct(reinterpret_cast<Node *>(data->array + data->begin),
-                  reinterpret_cast<Node *>(data->array + data->end));
-    QListData::dispose(data);
-}
-
-
-template <typename T>
-Q_OUTOFLINE_TEMPLATE void QList<T>::clear()
-{
-    *this = QList<T>();
-}
-
-template <typename T>
-Q_OUTOFLINE_TEMPLATE int QList<T>::removeAll(const T &_t)
-{
-    int index = indexOf(_t);
-    if (index == -1)
-        return 0;
-
-    const T t = _t;
-    detach();
-
-    Node *i = reinterpret_cast<Node *>(p.at(index));
-    Node *e = reinterpret_cast<Node *>(p.end());
-    Node *n = i;
-    node_destruct(i);
-    while (++i != e) {
-        if (i->t() == t)
-            node_destruct(i);
-        else
-            *n++ = *i;
-    }
-
-    int removedCount = int(e - n);
-    d->end -= removedCount;
-    return removedCount;
-}
-
-template <typename T>
-Q_OUTOFLINE_TEMPLATE bool QList<T>::removeOne(const T &_t)
-{
-    int index = indexOf(_t);
-    if (index != -1) {
-        removeAt(index);
-        return true;
-    }
-    return false;
-}
-
-template <typename T>
-Q_OUTOFLINE_TEMPLATE typename QList<T>::iterator QList<T>::erase(typename QList<T>::iterator afirst,
-                                                                 typename QList<T>::iterator alast)
-{
-    Q_ASSERT_X(isValidIterator(afirst), "QList::erase", "The specified iterator argument 'afirst' is invalid");
-    Q_ASSERT_X(isValidIterator(alast), "QList::erase", "The specified iterator argument 'alast' is invalid");
-
-    if (d->ref.isShared()) {
-        // ### A block is erased and a detach is needed. We should shrink and only copy relevant items.
-        int offsetfirst = int(afirst.i - reinterpret_cast<Node *>(p.begin()));
-        int offsetlast = int(alast.i - reinterpret_cast<Node *>(p.begin()));
-        afirst = begin(); // implies detach()
-        alast = afirst;
-        afirst += offsetfirst;
-        alast += offsetlast;
-    }
-
-    for (Node *n = afirst.i; n < alast.i; ++n)
-        node_destruct(n);
-    int idx = afirst - begin();
-    p.remove(idx, alast - afirst);
-    return begin() + idx;
-}
-
-template <typename T>
-Q_OUTOFLINE_TEMPLATE QList<T> &QList<T>::operator+=(const QList<T> &l)
-{
-    if (!l.isEmpty()) {
-        if (d == &QListData::shared_null) {
-            *this = l;
-        } else {
-            Node *n = (d->ref.isShared())
-                      ? detach_helper_grow(INT_MAX, l.size())
-                      : reinterpret_cast<Node *>(p.append(l.p));
-            QT_TRY {
-                node_copy(n, reinterpret_cast<Node *>(p.end()),
-                          reinterpret_cast<Node *>(l.p.begin()));
-            } QT_CATCH(...) {
-                // restore the old end
-                d->end -= int(reinterpret_cast<Node *>(p.end()) - n);
-                QT_RETHROW;
-            }
-        }
-    }
-    return *this;
-}
-
-template <typename T>
-inline void QList<T>::append(const QList<T> &t)
-{
-    *this += t;
-}
-
-template <typename T>
-Q_OUTOFLINE_TEMPLATE int QList<T>::indexOf(const T &t, int from) const
-{
-    return QtPrivate::indexOf<T, T>(*this, t, from);
-}
-
-namespace QtPrivate
-{
-template <typename T, typename U>
-int indexOf(const QList<T> &list, const U &u, int from)
-{
-    typedef typename QList<T>::Node Node;
-
-    if (from < 0)
-        from = qMax(from + list.p.size(), 0);
-    if (from < list.p.size()) {
-        Node *n = reinterpret_cast<Node *>(list.p.at(from -1));
-        Node *e = reinterpret_cast<Node *>(list.p.end());
-        while (++n != e)
-            if (n->t() == u)
-                return int(n - reinterpret_cast<Node *>(list.p.begin()));
-    }
-    return -1;
-}
-}
-
-template <typename T>
-Q_OUTOFLINE_TEMPLATE int QList<T>::lastIndexOf(const T &t, int from) const
-{
-    return QtPrivate::lastIndexOf<T, T>(*this, t, from);
-}
-
-namespace QtPrivate
-{
-template <typename T, typename U>
-int lastIndexOf(const QList<T> &list, const U &u, int from)
-{
-    typedef typename QList<T>::Node Node;
-
-    if (from < 0)
-        from += list.p.size();
-    else if (from >= list.p.size())
-        from = list.p.size()-1;
-    if (from >= 0) {
-        Node *b = reinterpret_cast<Node *>(list.p.begin());
-        Node *n = reinterpret_cast<Node *>(list.p.at(from + 1));
-        while (n-- != b) {
-            if (n->t() == u)
-                return int(n - b);
-        }
-    }
-    return -1;
-}
-}
-
-template <typename T>
-Q_OUTOFLINE_TEMPLATE bool QList<T>::contains(const T &t) const
-{
-    return contains_impl(t, MemoryLayout());
-}
-
-template <typename T>
-inline bool QList<T>::contains_impl(const T &t, QListData::NotArrayCompatibleLayout) const
-{
-    Node *e = reinterpret_cast<Node *>(p.end());
-    Node *i = reinterpret_cast<Node *>(p.begin());
-    for (; i != e; ++i)
-        if (i->t() == t)
-            return true;
-    return false;
-}
-
-template <typename T>
-inline bool QList<T>::contains_impl(const T &t, QListData::ArrayCompatibleLayout) const
-{
-    const T *b = reinterpret_cast<const T*>(p.begin());
-    const T *e = reinterpret_cast<const T*>(p.end());
-    return std::find(b, e, t) != e;
-}
-
-template <typename T>
-Q_OUTOFLINE_TEMPLATE int QList<T>::count(const T &t) const
-{
-    return this->count_impl(t, MemoryLayout());
-}
-
-template <typename T>
-inline int QList<T>::count_impl(const T &t, QListData::NotArrayCompatibleLayout) const
-{
-    int c = 0;
-    Node *e = reinterpret_cast<Node *>(p.end());
-    Node *i = reinterpret_cast<Node *>(p.begin());
-    for (; i != e; ++i)
-        if (i->t() == t)
-            ++c;
-    return c;
-}
-
-template <typename T>
-inline int QList<T>::count_impl(const T &t, QListData::ArrayCompatibleLayout) const
-{
-    return int(std::count(reinterpret_cast<const T*>(p.begin()),
-                          reinterpret_cast<const T*>(p.end()),
-                          t));
-}
-
-template <typename T>
-Q_OUTOFLINE_TEMPLATE QVector<T> QList<T>::toVector() const
-{
-    return QVector<T>(begin(), end());
-}
-
-template <typename T>
-QList<T> QList<T>::fromVector(const QVector<T> &vector)
-{
-    return vector.toList();
-}
-
-template <typename T>
-Q_OUTOFLINE_TEMPLATE QList<T> QVector<T>::toList() const
-{
-    return QList<T>(begin(), end());
-}
-
-template <typename T>
-QVector<T> QVector<T>::fromList(const QList<T> &list)
-{
-    return list.toVector();
-}
-
-Q_DECLARE_SEQUENTIAL_ITERATOR(List)
-Q_DECLARE_MUTABLE_SEQUENTIAL_ITERATOR(List)
-
-template <typename T>
-uint qHash(const QList<T> &key, uint seed = 0)
-    noexcept(noexcept(qHashRange(key.cbegin(), key.cend(), seed)))
-{
-    return qHashRange(key.cbegin(), key.cend(), seed);
-}
-
-template <typename T>
-bool operator<(const QList<T> &lhs, const QList<T> &rhs)
-    noexcept(noexcept(std::lexicographical_compare(lhs.begin(), lhs.end(),
-                                                               rhs.begin(), rhs.end())))
-{
-    return std::lexicographical_compare(lhs.begin(), lhs.end(),
-                                        rhs.begin(), rhs.end());
-}
-
-template <typename T>
-inline bool operator>(const QList<T> &lhs, const QList<T> &rhs)
-    noexcept(noexcept(lhs < rhs))
-{
-    return rhs < lhs;
-}
-
-template <typename T>
-inline bool operator<=(const QList<T> &lhs, const QList<T> &rhs)
-    noexcept(noexcept(lhs < rhs))
-{
-    return !(lhs > rhs);
-}
-
-template <typename T>
-inline bool operator>=(const QList<T> &lhs, const QList<T> &rhs)
-    noexcept(noexcept(lhs < rhs))
-{
-    return !(lhs < rhs);
-}
-
+using QListIterator = QVectorIterator<T>;
 QT_END_NAMESPACE
+#endif
 
 #include <QtCore/qbytearraylist.h>
 #include <QtCore/qstringlist.h>
 
-#ifdef Q_CC_MSVC
-#pragma warning( pop )
-#endif
-
 #endif // QLIST_H
diff --git a/src/corelib/tools/qmap.h b/src/corelib/tools/qmap.h
index 427a4ad5a0..a971919e54 100644
--- a/src/corelib/tools/qmap.h
+++ b/src/corelib/tools/qmap.h
@@ -219,7 +219,7 @@ struct QMapData : public QMapDataBase
 
     Node *createNode(const Key &k, const T &v, Node *parent = nullptr, bool left = false)
     {
-        Node *n = static_cast<Node *>(QMapDataBase::createNode(sizeof(Node), Q_ALIGNOF(Node),
+        Node *n = static_cast<Node *>(QMapDataBase::createNode(sizeof(Node), alignof(Node),
                                       parent, left));
         QT_TRY {
             new (&n->key) Key(k);
@@ -243,7 +243,7 @@ struct QMapData : public QMapDataBase
     void destroy() {
         if (root()) {
             root()->destroySubTree();
-            freeTree(header.left, Q_ALIGNOF(Node));
+            freeTree(header.left, alignof(Node));
         }
         freeData(this);
     }
@@ -356,17 +356,6 @@ public:
 
     inline void detach() { if (d->ref.isShared()) detach_helper(); }
     inline bool isDetached() const { return !d->ref.isShared(); }
-#if !defined(QT_NO_UNSHARABLE_CONTAINERS)
-    inline void setSharable(bool sharable)
-    {
-        if (sharable == d->ref.isSharable())
-            return;
-        if (!sharable)
-            detach();
-        // Don't call on shared_null
-        d->ref.setSharable(sharable);
-    }
-#endif
     inline bool isSharedWith(const QMap<Key, T> &other) const { return d == other.d; }
 
     void clear();
@@ -447,13 +436,8 @@ public:
         inline iterator &operator-=(int j) { return *this = *this - j; }
         friend inline iterator operator+(int j, iterator k) { return k + j; }
 
-#ifndef QT_STRICT_ITERATORS
-    public:
-        inline bool operator==(const const_iterator &o) const
-            { return i == o.i; }
-        inline bool operator!=(const const_iterator &o) const
-            { return i != o.i; }
-#endif
+        inline bool operator==(const const_iterator &o) const { return i == o.i; }
+        inline bool operator!=(const const_iterator &o) const { return i != o.i; }
         friend class QMap<Key, T>;
         friend class QMultiMap<Key, T>;
     };
@@ -473,12 +457,7 @@ public:
 
         Q_DECL_CONSTEXPR inline const_iterator() : i(nullptr) { }
         inline const_iterator(const Node *node) : i(node) { }
-#ifdef QT_STRICT_ITERATORS
-        explicit inline const_iterator(const iterator &o)
-#else
-        inline const_iterator(const iterator &o)
-#endif
-        { i = o.i; }
+        inline const_iterator(const iterator &o) { i = o.i; }
 
         inline const Key &key() const { return i->key; }
         inline const T &value() const { return i->value; }
@@ -512,11 +491,6 @@ public:
         inline const_iterator &operator-=(int j) { return *this = *this - j; }
         friend inline const_iterator operator+(int j, const_iterator k) { return k + j; }
 
-#ifdef QT_STRICT_ITERATORS
-    private:
-        inline bool operator==(const iterator &o) const { return operator==(const_iterator(o)); }
-        inline bool operator!=(const iterator &o) const { return operator!=(const_iterator(o)); }
-#endif
         friend class QMap<Key, T>;
         friend class QMultiMap<Key, T>;
     };
diff --git a/src/corelib/tools/qpoint.h b/src/corelib/tools/qpoint.h
index f0a91c4ff8..1258e465dd 100644
--- a/src/corelib/tools/qpoint.h
+++ b/src/corelib/tools/qpoint.h
@@ -265,7 +265,6 @@ public:
 #endif
 
 private:
-    friend class QMatrix;
     friend class QTransform;
 
     qreal xp;
diff --git a/src/corelib/tools/qrefcount.h b/src/corelib/tools/qrefcount.h
index 2e5388ad9a..982a9c2bbf 100644
--- a/src/corelib/tools/qrefcount.h
+++ b/src/corelib/tools/qrefcount.h
@@ -53,10 +53,6 @@ class RefCount
 public:
     inline bool ref() noexcept {
         int count = atomic.loadRelaxed();
-#if !defined(QT_NO_UNSHARABLE_CONTAINERS)
-        if (count == 0) // !isSharable
-            return false;
-#endif
         if (count != -1) // !isStatic
             atomic.ref();
         return true;
@@ -64,32 +60,11 @@ public:
 
     inline bool deref() noexcept {
         int count = atomic.loadRelaxed();
-#if !defined(QT_NO_UNSHARABLE_CONTAINERS)
-        if (count == 0) // !isSharable
-            return false;
-#endif
         if (count == -1) // isStatic
             return true;
         return atomic.deref();
     }
 
-#if !defined(QT_NO_UNSHARABLE_CONTAINERS)
-    bool setSharable(bool sharable) noexcept
-    {
-        Q_ASSERT(!isShared());
-        if (sharable)
-            return atomic.testAndSetRelaxed(0, 1);
-        else
-            return atomic.testAndSetRelaxed(1, 0);
-    }
-
-    bool isSharable() const noexcept
-    {
-        // Sharable === Shared ownership.
-        return atomic.loadRelaxed() != 0;
-    }
-#endif
-
     bool isStatic() const noexcept
     {
         // Persistent object, never deleted
diff --git a/src/corelib/tools/qset.h b/src/corelib/tools/qset.h
index 4b2adcd851..ef363ed52d 100644
--- a/src/corelib/tools/qset.h
+++ b/src/corelib/tools/qset.h
@@ -86,9 +86,6 @@ public:
 
     inline void detach() { q_hash.detach(); }
     inline bool isDetached() const { return q_hash.isDetached(); }
-#if !defined(QT_NO_UNSHARABLE_CONTAINERS)
-    inline void setSharable(bool sharable) { q_hash.setSharable(sharable); }
-#endif
 
     inline void clear() { q_hash.clear(); }
 
@@ -108,11 +105,7 @@ public:
         friend class QSet<T>;
 
     public:
-#if QT_DEPRECATED_WARNINGS_SINCE < QT_VERSION_CHECK(5, 15, 0)
-        typedef std::bidirectional_iterator_tag iterator_category;
-#else
         typedef std::forward_iterator_tag iterator_category;
-#endif
         typedef qptrdiff difference_type;
         typedef T value_type;
         typedef const T *pointer;
@@ -132,15 +125,6 @@ public:
             { return i != o.i; }
         inline iterator &operator++() { ++i; return *this; }
         inline iterator operator++(int) { iterator r = *this; ++i; return r; }
-#if QT_DEPRECATED_SINCE(5, 15)
-        inline QT_DEPRECATED_VERSION_5_15 iterator &operator--() { --i; return *this; }
-        inline QT_DEPRECATED_VERSION_5_15 iterator operator--(int) { iterator r = *this; --i; return r; }
-        inline QT_DEPRECATED_VERSION_5_15 iterator operator+(int j) const { return i + j; }
-        inline QT_DEPRECATED_VERSION_5_15 iterator operator-(int j) const { return i - j; }
-        friend inline QT_DEPRECATED_VERSION_5_15 iterator operator+(int j, iterator k) { return k + j; }
-        inline QT_DEPRECATED_VERSION_5_15 iterator &operator+=(int j) { i += j; return *this; }
-        inline QT_DEPRECATED_VERSION_5_15 iterator &operator-=(int j) { i -= j; return *this; }
-#endif
     };
 
     class const_iterator
@@ -151,11 +135,7 @@ public:
         friend class QSet<T>;
 
     public:
-#if QT_DEPRECATED_WARNINGS_SINCE < QT_VERSION_CHECK(5, 15, 0)
-        typedef std::bidirectional_iterator_tag iterator_category;
-#else
         typedef std::forward_iterator_tag iterator_category;
-#endif
         typedef qptrdiff difference_type;
         typedef T value_type;
         typedef const T *pointer;
@@ -173,15 +153,6 @@ public:
         inline bool operator!=(const const_iterator &o) const { return i != o.i; }
         inline const_iterator &operator++() { ++i; return *this; }
         inline const_iterator operator++(int) { const_iterator r = *this; ++i; return r; }
-#if QT_DEPRECATED_SINCE(5, 15)
-        inline QT_DEPRECATED_VERSION_5_15 const_iterator &operator--() { --i; return *this; }
-        inline QT_DEPRECATED_VERSION_5_15 const_iterator operator--(int) { const_iterator r = *this; --i; return r; }
-        inline QT_DEPRECATED_VERSION_5_15 const_iterator operator+(int j) const { return i + j; }
-        inline QT_DEPRECATED_VERSION_5_15 const_iterator operator-(int j) const { return i - j; }
-        friend inline QT_DEPRECATED_VERSION_5_15 const_iterator operator+(int j, const_iterator k) { return k + j; }
-        inline QT_DEPRECATED_VERSION_5_15 const_iterator &operator+=(int j) { i += j; return *this; }
-        inline QT_DEPRECATED_VERSION_5_15 const_iterator &operator-=(int j) { i -= j; return *this; }
-#endif
     };
 
     // STL style
@@ -194,23 +165,10 @@ public:
     inline const_iterator cend() const noexcept { return q_hash.end(); }
     inline const_iterator constEnd() const noexcept { return q_hash.constEnd(); }
 
-#if QT_DEPRECATED_SINCE(5, 15)
-    typedef std::reverse_iterator<iterator> reverse_iterator;
-    typedef std::reverse_iterator<const_iterator> const_reverse_iterator;
-
-    reverse_iterator QT_DEPRECATED_VERSION_5_15 rbegin() { return reverse_iterator(end()); }
-    reverse_iterator QT_DEPRECATED_VERSION_5_15 rend() { return reverse_iterator(begin()); }
-    const_reverse_iterator QT_DEPRECATED_VERSION_5_15 rbegin() const noexcept { return const_reverse_iterator(end()); }
-    const_reverse_iterator QT_DEPRECATED_VERSION_5_15 rend() const noexcept { return const_reverse_iterator(begin()); }
-    const_reverse_iterator QT_DEPRECATED_VERSION_5_15 crbegin() const noexcept { return const_reverse_iterator(end()); }
-    const_reverse_iterator QT_DEPRECATED_VERSION_5_15 crend() const noexcept { return const_reverse_iterator(begin()); }
-#endif
-
     iterator erase(iterator i)
     { return erase(m2c(i)); }
     iterator erase(const_iterator i)
     {
-        Q_ASSERT_X(isValidIterator(i), "QSet::erase", "The specified const_iterator argument 'i' is invalid");
         return q_hash.erase(reinterpret_cast<typename Hash::const_iterator &>(i));
     }
 
@@ -260,27 +218,12 @@ public:
         { QSet<T> result = *this; result -= other; return result; }
 
     QList<T> values() const;
-#if QT_DEPRECATED_SINCE(5, 14) && QT_VERSION < QT_VERSION_CHECK(6,0,0)
-    QT_DEPRECATED_X("Use values() instead.")
-    QList<T> toList() const { return values(); }
-    QT_DEPRECATED_X("Use QSet<T>(list.begin(), list.end()) instead.")
-    static QSet<T> fromList(const QList<T> &list);
-#endif
 
 private:
     Hash q_hash;
 
     static const_iterator m2c(iterator it) noexcept
     { return const_iterator(typename Hash::const_iterator(it.i.i)); }
-
-    bool isValidIterator(const iterator &i) const
-    {
-        return q_hash.isValidIterator(reinterpret_cast<const typename Hash::iterator&>(i));
-    }
-    bool isValidIterator(const const_iterator &i) const noexcept
-    {
-        return q_hash.isValidIterator(reinterpret_cast<const typename Hash::const_iterator&>(i));
-    }
 };
 
 #if defined(__cpp_deduction_guides) && __cpp_deduction_guides >= 201606
@@ -397,30 +340,6 @@ Q_OUTOFLINE_TEMPLATE QList<T> QSet<T>::values() const
     return result;
 }
 
-#if QT_DEPRECATED_SINCE(5, 14) && QT_VERSION < QT_VERSION_CHECK(6,0,0)
-template <typename T>
-Q_OUTOFLINE_TEMPLATE QSet<T> QList<T>::toSet() const
-{
-    QSet<T> result;
-    result.reserve(size());
-    for (int i = 0; i < size(); ++i)
-        result.insert(at(i));
-    return result;
-}
-
-template <typename T>
-QSet<T> QSet<T>::fromList(const QList<T> &list)
-{
-    return list.toSet();
-}
-
-template <typename T>
-QList<T> QList<T>::fromSet(const QSet<T> &set)
-{
-    return set.toList();
-}
-#endif
-
 Q_DECLARE_SEQUENTIAL_ITERATOR(Set)
 
 #if !defined(QT_NO_JAVA_STYLE_ITERATORS)
@@ -448,14 +367,6 @@ public:
     inline const T &value() const { Q_ASSERT(item_exists()); return *n; }
     inline bool findNext(const T &t)
     { while (c->constEnd() != (n = i)) if (*i++ == t) return true; return false; }
-#if QT_DEPRECATED_SINCE(5, 15)
-    inline QT_DEPRECATED_VERSION_5_15 bool hasPrevious() const { return c->constBegin() != i; }
-    inline QT_DEPRECATED_VERSION_5_15 const T &previous() { n = --i; return *n; }
-    inline QT_DEPRECATED_VERSION_5_15 const T &peekPrevious() const { iterator p = i; return *--p; }
-    inline QT_DEPRECATED_VERSION_5_15 bool findPrevious(const T &t)
-    { while (c->constBegin() != i) if (*(n = --i) == t) return true;
-      n = c->end(); return false;  }
-#endif
 };
 #endif // QT_NO_JAVA_STYLE_ITERATORS
 
diff --git a/src/corelib/tools/qvarlengtharray.qdoc b/src/corelib/tools/qvarlengtharray.qdoc
index 3dab41dd22..d530e4358e 100644
--- a/src/corelib/tools/qvarlengtharray.qdoc
+++ b/src/corelib/tools/qvarlengtharray.qdoc
@@ -87,7 +87,7 @@
     places inside Qt and was added to Qt's public API for the
     convenience of advanced users.
 
-    \sa QVector, QList, QLinkedList
+    \sa QVector, QList
 */
 
 /*! \fn template<class T, int Prealloc> QVarLengthArray<T, Prealloc>::QVarLengthArray(int size)
@@ -537,8 +537,7 @@
     For large arrays, this operation can be slow (\l{linear time}),
     because it requires moving all the items in the vector by one
     position further in memory. If you want a container class that
-    provides a fast prepend() function, use QList or QLinkedList
-    instead.
+    provides a fast prepend() function, use std::list instead.
 
     \sa append(), insert()
 */
@@ -718,7 +717,7 @@
     For large arrays, this operation can be slow (\l{linear time}),
     because it requires moving all the items at indexes \a i and
     above by one position further in memory. If you want a container
-    class that provides a fast insert() function, use QLinkedList
+    class that provides a fast insert() function, use std::list
     instead.
 
     \sa remove()
diff --git a/src/corelib/tools/qvector.h b/src/corelib/tools/qvector.h
index 288c082c44..2d54cb1468 100644
--- a/src/corelib/tools/qvector.h
+++ b/src/corelib/tools/qvector.h
@@ -1,6 +1,7 @@
 /****************************************************************************
 **
 ** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2019 Intel Corporation
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtCore module of the Qt Toolkit.
@@ -40,127 +41,280 @@
 #ifndef QVECTOR_H
 #define QVECTOR_H
 
-#include <QtCore/qalgorithms.h>
-#include <QtCore/qiterator.h>
-#include <QtCore/qrefcount.h>
-#include <QtCore/qarraydata.h>
+#include <QtCore/qarraydatapointer.h>
+#include <QtCore/qnamespace.h>
 #include <QtCore/qhashfunctions.h>
-#include <QtCore/qcontainertools_impl.h>
+#include <QtCore/qiterator.h>
 
-#include <iterator>
+#include <functional>
+#include <limits>
 #include <initializer_list>
-#if QT_VERSION < QT_VERSION_CHECK(6,0,0)
-#include <vector>
-#endif
-#include <stdlib.h>
-#include <string.h>
-
-#include <algorithm>
+#include <type_traits>
 
 QT_BEGIN_NAMESPACE
 
+namespace QtPrivate {
+   template <typename V, typename U> int indexOf(const QVector<V> &list, const U &u, int from);
+   template <typename V, typename U> int lastIndexOf(const QVector<V> &list, const U &u, int from);
+}
+
+template <typename T> struct QVectorSpecialMethods
+{
+protected:
+    ~QVectorSpecialMethods() = default;
+};
+template <> struct QVectorSpecialMethods<QByteArray>;
+template <> struct QVectorSpecialMethods<QString>;
+
 template <typename T>
 class QVector
+#ifndef Q_QDOC
+    : public QVectorSpecialMethods<T>
+#endif
 {
     typedef QTypedArrayData<T> Data;
-    Data *d;
+    typedef QArrayDataOps<T> DataOps;
+    typedef QArrayDataPointer<T> DataPointer;
+    class DisableRValueRefs {};
+
+    DataPointer d;
+
+    template <typename V, typename U> friend int QtPrivate::indexOf(const QVector<V> &list, const U &u, int from);
+    template <typename V, typename U> friend int QtPrivate::lastIndexOf(const QVector<V> &list, const U &u, int from);
 
 public:
-    inline QVector() noexcept : d(Data::sharedNull()) { }
-    explicit QVector(int size);
-    QVector(int size, const T &t);
-    inline QVector(const QVector<T> &v);
-    inline ~QVector() { if (!d->ref.deref()) freeData(d); }
-    QVector<T> &operator=(const QVector<T> &v);
-    QVector(QVector<T> &&other) noexcept : d(other.d) { other.d = Data::sharedNull(); }
-    QVector<T> &operator=(QVector<T> &&other) noexcept
-    { QVector moved(std::move(other)); swap(moved); return *this; }
-    void swap(QVector<T> &other) noexcept { qSwap(d, other.d); }
-    inline QVector(std::initializer_list<T> args);
-    QVector<T> &operator=(std::initializer_list<T> args);
-    template <typename InputIterator, QtPrivate::IfIsInputIterator<InputIterator> = true>
-    inline QVector(InputIterator first, InputIterator last);
-    explicit QVector(QArrayDataPointerRef<T> ref) noexcept : d(ref.ptr) {}
+    typedef T Type;
+    typedef T value_type;
+    typedef value_type *pointer;
+    typedef const value_type *const_pointer;
+    typedef value_type &reference;
+    typedef const value_type &const_reference;
+    typedef int size_type;
+    typedef qptrdiff difference_type;
+    typedef typename Data::iterator iterator;
+    typedef typename Data::const_iterator const_iterator;
+    typedef iterator Iterator;
+    typedef const_iterator ConstIterator;
+    typedef std::reverse_iterator<iterator> reverse_iterator;
+    typedef std::reverse_iterator<const_iterator> const_reverse_iterator;
+    typedef typename DataPointer::parameter_type parameter_type;
+    using rvalue_ref = typename std::conditional<DataPointer::pass_parameter_by_value, DisableRValueRefs, T &&>::type;
 
-    bool operator==(const QVector<T> &v) const;
-    inline bool operator!=(const QVector<T> &v) const { return !(*this == v); }
+private:
+    void resize_internal(int i, Qt::Initialization);
+    bool isValidIterator(const_iterator i) const
+    {
+        const std::less<const T*> less = {};
+        return !less(d->end(), i) && !less(i, d->begin());
+    }
+public:
+    QVector(DataPointer dd) noexcept
+        : d(dd)
+    {
+    }
 
-    inline int size() const { return d->size; }
+public:
+    inline QVector() noexcept { }
+    explicit QVector(int size)
+        : d(Data::allocate(size))
+    {
+        if (size)
+            d->appendInitialize(size);
+    }
+    QVector(int size, const T &t)
+        : d(Data::allocate(size))
+    {
+        if (size)
+            d->copyAppend(size, t);
+    }
 
-    inline bool isEmpty() const { return d->size == 0; }
+    inline QVector(const QVector<T> &other) noexcept : d(other.d) {}
+    QVector(QVector<T> &&other) noexcept : d(std::move(other.d)) {}
+    inline QVector(std::initializer_list<T> args)
+        : d(Data::allocate(args.size()))
+    {
+        if (args.size())
+            d->copyAppend(args.begin(), args.end());
+    }
 
-    void resize(int size);
+    ~QVector() /*noexcept(std::is_nothrow_destructible<T>::value)*/ {}
+    QVector<T> &operator=(const QVector<T> &other) { d = other.d; return *this; }
+    QVector &operator=(QVector &&other) noexcept(std::is_nothrow_destructible<T>::value)
+    {
+        d = std::move(other.d);
+        return *this;
+    }
+    QVector<T> &operator=(std::initializer_list<T> args)
+    {
+        d = DataPointer(Data::allocate(args.size()));
+        if (args.size())
+            d->copyAppend(args.begin(), args.end());
+        return *this;
+    }
+    template <typename InputIterator, QtPrivate::IfIsForwardIterator<InputIterator> = true>
+    QVector(InputIterator i1, InputIterator i2)
+        : d(Data::allocate(std::distance(i1, i2)))
+    {
+        if (std::distance(i1, i2))
+            d->copyAppend(i1, i2);
+    }
 
-    inline int capacity() const { return int(d->alloc); }
-    void reserve(int size);
-    inline void squeeze()
+    template <typename InputIterator, QtPrivate::IfIsNotForwardIterator<InputIterator> = true>
+    QVector(InputIterator i1, InputIterator i2)
+        : QVector()
     {
-        if (d->size < int(d->alloc)) {
-            if (!d->size) {
-                *this = QVector<T>();
-                return;
-            }
-            realloc(d->size);
-        }
-        if (d->capacityReserved) {
-            // capacity reserved in a read only memory would be useless
-            // this checks avoid writing to such memory.
-            d->capacityReserved = 0;
-        }
+        QtPrivate::reserveIfForwardIterator(this, i1, i2);
+        std::copy(i1, i2, std::back_inserter(*this));
     }
 
-    inline void detach();
-    inline bool isDetached() const { return !d->ref.isShared(); }
-#if !defined(QT_NO_UNSHARABLE_CONTAINERS)
-    inline void setSharable(bool sharable)
+    void swap(QVector<T> &other) noexcept { qSwap(d, other.d); }
+
+    friend bool operator==(const QVector &l, const QVector &r)
     {
-        if (sharable == d->ref.isSharable())
-            return;
-        if (!sharable)
-            detach();
+        if (l.size() != r.size())
+            return false;
+        if (l.begin() == r.begin())
+            return true;
 
-        if (d == Data::unsharableEmpty()) {
-            if (sharable)
-                d = Data::sharedNull();
+        // do element-by-element comparison
+        return l.d->compare(l.begin(), r.begin(), l.size());
+    }
+    friend bool operator!=(const QVector &l, const QVector &r)
+    {
+        return !(l == r);
+    }
+
+    int size() const noexcept { return int(d->size); }
+    int count() const noexcept { return size(); }
+    int length() const noexcept { return size(); }
+
+    inline bool isEmpty() const noexcept { return d->size == 0; }
+
+    void resize(int size)
+    {
+        resize_internal(size, Qt::Uninitialized);
+        if (size > this->size())
+            d->appendInitialize(size);
+    }
+    void resize(int size, parameter_type c)
+    {
+        resize_internal(size, Qt::Uninitialized);
+        if (size > this->size())
+            d->copyAppend(size - this->size(), c);
+    }
+
+    inline int capacity() const { return int(d->constAllocatedCapacity()); }
+    void reserve(int size);
+    inline void squeeze();
+
+    void detach() { d.detach(); }
+    bool isDetached() const noexcept { return !d->isShared(); }
+
+    inline bool isSharedWith(const QVector<T> &other) const { return d == other.d; }
+
+    pointer data() { detach(); return d->data(); }
+    const_pointer data() const noexcept { return d->data(); }
+    const_pointer constData() const noexcept { return d->data(); }
+    void clear() {
+        if (!size())
+            return;
+        if (d->needsDetach()) {
+            // must allocate memory
+            DataPointer detached(Data::allocate(d.allocatedCapacity(), d->detachFlags()));
+            d.swap(detached);
         } else {
-            d->ref.setSharable(sharable);
+            d->truncate(0);
         }
-        Q_ASSERT(d->ref.isSharable() == sharable);
     }
+
+    const_reference at(int i) const noexcept
+    {
+        Q_ASSERT_X(size_t(i) < size_t(d->size), "QVector::at", "index out of range");
+        return data()[i];
+    }
+    reference operator[](int i)
+    {
+        Q_ASSERT_X(size_t(i) < size_t(d->size), "QVector::operator[]", "index out of range");
+        detach();
+        return data()[i];
+    }
+    const_reference operator[](int i) const noexcept { return at(i); }
+    void append(const_reference t)
+    { append(const_iterator(std::addressof(t)), const_iterator(std::addressof(t)) + 1); }
+    void append(const_iterator i1, const_iterator i2);
+    void append(rvalue_ref t) { emplaceBack(std::move(t)); }
+    void append(const QVector<T> &l) { append(l.constBegin(), l.constEnd()); }
+    void prepend(rvalue_ref t);
+    void prepend(const T &t);
+
+    template <typename ...Args>
+    reference emplaceBack(Args&&... args) { return *emplace(count(), std::forward<Args>(args)...); }
+
+    iterator insert(int i, parameter_type t)
+    { return insert(i, 1, t); }
+    iterator insert(int i, int n, parameter_type t);
+    iterator insert(const_iterator before, parameter_type t)
+    {
+        Q_ASSERT_X(isValidIterator(before),  "QVector::insert", "The specified iterator argument 'before' is invalid");
+        return insert(before, 1, t);
+    }
+    iterator insert(const_iterator before, int n, parameter_type t)
+    {
+        Q_ASSERT_X(isValidIterator(before),  "QVector::insert", "The specified iterator argument 'before' is invalid");
+        return insert(std::distance(constBegin(), before), n, t);
+    }
+    iterator insert(const_iterator before, rvalue_ref t)
+    {
+        Q_ASSERT_X(isValidIterator(before),  "QVector::insert", "The specified iterator argument 'before' is invalid");
+        return insert(std::distance(constBegin(), before), std::move(t));
+    }
+    iterator insert(int i, rvalue_ref t) { return emplace(i, std::move(t)); }
+
+    template <typename ...Args>
+    iterator emplace(const_iterator before, Args&&... args)
+    {
+        Q_ASSERT_X(isValidIterator(before),  "QVector::emplace", "The specified iterator argument 'before' is invalid");
+        return emplace(std::distance(constBegin(), before), std::forward<Args>(args)...);
+    }
+
+    template <typename ...Args>
+    iterator emplace(int i, Args&&... args);
+#if 0
+    template< class InputIt >
+    iterator insert( const_iterator pos, InputIt first, InputIt last );
+    iterator insert( const_iterator pos, std::initializer_list<T> ilist );
 #endif
+    void replace(int i, const T &t)
+    {
+        Q_ASSERT_X(i >= 0 && i < d->size, "QVector<T>::replace", "index out of range");
+        const T copy(t);
+        data()[i] = copy;
+    }
+    void replace(int i, rvalue_ref t)
+    {
+        Q_ASSERT_X(i >= 0 && i < d->size, "QVector<T>::replace", "index out of range");
+        const T copy(std::move(t));
+        data()[i] = std::move(copy);
+    }
 
-    inline bool isSharedWith(const QVector<T> &other) const { return d == other.d; }
+    void remove(int i, int n = 1);
+    void removeFirst() { Q_ASSERT(!isEmpty()); remove(0); }
+    void removeLast() { Q_ASSERT(!isEmpty()); remove(size() - 1); }
+    value_type takeFirst() { Q_ASSERT(!isEmpty()); value_type v = std::move(first()); remove(0); return v; }
+    value_type takeLast() { Q_ASSERT(!isEmpty()); value_type v = std::move(last()); remove(size() - 1); return v; }
 
-    inline T *data() { detach(); return d->begin(); }
-    inline const T *data() const { return d->begin(); }
-    inline const T *constData() const { return d->begin(); }
-    void clear();
-
-    const T &at(int i) const;
-    T &operator[](int i);
-    const T &operator[](int i) const;
-    void append(const T &t);
-    void append(T &&t);
-    inline void append(const QVector<T> &l) { *this += l; }
-    void prepend(T &&t);
-    void prepend(const T &t);
-    void insert(int i, T &&t);
-    void insert(int i, const T &t);
-    void insert(int i, int n, const T &t);
-    void replace(int i, const T &t);
-    void remove(int i);
-    void remove(int i, int n);
-    inline void removeFirst() { Q_ASSERT(!isEmpty()); erase(d->begin()); }
-    inline void removeLast();
-    T takeFirst() { Q_ASSERT(!isEmpty()); T r = std::move(first()); removeFirst(); return r; }
-    T takeLast()  { Q_ASSERT(!isEmpty()); T r = std::move(last()); removeLast(); return r; }
-
-    QVector<T> &fill(const T &t, int size = -1);
-
-    int indexOf(const T &t, int from = 0) const;
-    int lastIndexOf(const T &t, int from = -1) const;
-    bool contains(const T &t) const;
-    int count(const T &t) const;
+    QVector<T> &fill(parameter_type t, int size = -1);
+
+    int indexOf(const T &t, int from = 0) const noexcept;
+    int lastIndexOf(const T &t, int from = -1) const noexcept;
+    bool contains(const T &t) const noexcept
+    {
+        return indexOf(t) != -1;
+    }
+    int count(const T &t) const noexcept
+    {
+        return int(std::count(&*cbegin(), &*cend(), t));
+    }
 
     // QList compatibility
     void removeAt(int i) { remove(i); }
@@ -169,10 +323,10 @@ public:
         const const_iterator ce = this->cend(), cit = std::find(this->cbegin(), ce, t);
         if (cit == ce)
             return 0;
+        int index = cit - this->cbegin();
         // next operation detaches, so ce, cit, t may become invalidated:
         const T tCopy = t;
-        const int firstFoundIdx = std::distance(this->cbegin(), cit);
-        const iterator e = end(), it = std::remove(begin() + firstFoundIdx, e, tCopy);
+        const iterator e = end(), it = std::remove(begin() + index, e, tCopy);
         const int result = std::distance(it, e);
         erase(it, e);
         return result;
@@ -185,7 +339,6 @@ public:
         remove(i);
         return true;
     }
-    int length() const { return size(); }
     T takeAt(int i) { T t = std::move((*this)[i]); remove(i); return t; }
     void move(int from, int to)
     {
@@ -202,43 +355,26 @@ public:
     }
 
     // STL-style
-    typedef typename Data::iterator iterator;
-    typedef typename Data::const_iterator const_iterator;
-    typedef std::reverse_iterator<iterator> reverse_iterator;
-    typedef std::reverse_iterator<const_iterator> const_reverse_iterator;
-#if !defined(QT_STRICT_ITERATORS) || defined(Q_CLANG_QDOC)
-    inline iterator begin() { detach(); return d->begin(); }
-    inline const_iterator begin() const noexcept { return d->constBegin(); }
-    inline const_iterator cbegin() const noexcept { return d->constBegin(); }
-    inline const_iterator constBegin() const noexcept { return d->constBegin(); }
-    inline iterator end() { detach(); return d->end(); }
-    inline const_iterator end() const noexcept { return d->constEnd(); }
-    inline const_iterator cend() const noexcept { return d->constEnd(); }
-    inline const_iterator constEnd() const noexcept { return d->constEnd(); }
-#else
-    inline iterator begin(iterator = iterator()) { detach(); return d->begin(); }
-    inline const_iterator begin(const_iterator = const_iterator()) const noexcept { return d->constBegin(); }
-    inline const_iterator cbegin(const_iterator = const_iterator()) const noexcept { return d->constBegin(); }
-    inline const_iterator constBegin(const_iterator = const_iterator()) const noexcept { return d->constBegin(); }
-    inline iterator end(iterator = iterator()) { detach(); return d->end(); }
-    inline const_iterator end(const_iterator = const_iterator()) const noexcept { return d->constEnd(); }
-    inline const_iterator cend(const_iterator = const_iterator()) const noexcept { return d->constEnd(); }
-    inline const_iterator constEnd(const_iterator = const_iterator()) const noexcept { return d->constEnd(); }
-#endif
+    iterator begin() { detach(); return d->begin(); }
+    iterator end() { detach(); return d->end(); }
+
+    const_iterator begin() const noexcept { return d->constBegin(); }
+    const_iterator end() const noexcept { return d->constEnd(); }
+    const_iterator cbegin() const noexcept { return d->constBegin(); }
+    const_iterator cend() const noexcept { return d->constEnd(); }
+    const_iterator constBegin() const noexcept { return d->constBegin(); }
+    const_iterator constEnd() const noexcept { return d->constEnd(); }
     reverse_iterator rbegin() { return reverse_iterator(end()); }
     reverse_iterator rend() { return reverse_iterator(begin()); }
     const_reverse_iterator rbegin() const noexcept { return const_reverse_iterator(end()); }
     const_reverse_iterator rend() const noexcept { return const_reverse_iterator(begin()); }
     const_reverse_iterator crbegin() const noexcept { return const_reverse_iterator(end()); }
     const_reverse_iterator crend() const noexcept { return const_reverse_iterator(begin()); }
-    iterator insert(iterator before, int n, const T &x);
-    inline iterator insert(iterator before, const T &x) { return insert(before, 1, x); }
-    inline iterator insert(iterator before, T &&x);
-    iterator erase(iterator begin, iterator end);
-    inline iterator erase(iterator pos) { return erase(pos, pos+1); }
+
+    iterator erase(const_iterator begin, const_iterator end);
+    inline iterator erase(const_iterator pos) { return erase(pos, pos+1); }
 
     // more Qt
-    inline int count() const { return d->size; }
     inline T& first() { Q_ASSERT(!isEmpty()); return *begin(); }
     inline const T &first() const { Q_ASSERT(!isEmpty()); return *begin(); }
     inline const T &constFirst() const { Q_ASSERT(!isEmpty()); return *begin(); }
@@ -249,7 +385,7 @@ public:
     inline bool endsWith(const T &t) const { return !isEmpty() && last() == t; }
     QVector<T> mid(int pos, int len = -1) const;
 
-    T value(int i) const;
+    T value(int i) const { return value(i, T()); }
     T value(int i, const T &defaultValue) const;
 
     void swapItemsAt(int i, int j) {
@@ -260,31 +396,26 @@ public:
     }
 
     // STL compatibility
-    typedef T value_type;
-    typedef value_type* pointer;
-    typedef const value_type* const_pointer;
-    typedef value_type& reference;
-    typedef const value_type& const_reference;
-    typedef qptrdiff difference_type;
-    typedef iterator Iterator;
-    typedef const_iterator ConstIterator;
-    typedef int size_type;
     inline void push_back(const T &t) { append(t); }
-    void push_back(T &&t) { append(std::move(t)); }
-    void push_front(T &&t) { prepend(std::move(t)); }
+    void push_back(rvalue_ref t) { append(std::move(t)); }
+    void push_front(rvalue_ref t) { prepend(std::move(t)); }
     inline void push_front(const T &t) { prepend(t); }
     void pop_back() { removeLast(); }
     void pop_front() { removeFirst(); }
+
+    template <typename ...Args>
+    reference emplace_back(Args&&... args) { return emplaceBack(std::forward<Args>(args)...); }
+
     inline bool empty() const
     { return d->size == 0; }
-    inline T& front() { return first(); }
+    inline reference front() { return first(); }
     inline const_reference front() const { return first(); }
     inline reference back() { return last(); }
     inline const_reference back() const { return last(); }
     void shrink_to_fit() { squeeze(); }
 
     // comfort
-    QVector<T> &operator+=(const QVector<T> &l);
+    QVector<T> &operator+=(const QVector<T> &l) { append(l.cbegin(), l.cend()); return *this; }
     inline QVector<T> operator+(const QVector<T> &l) const
     { QVector n = *this; n += l; return n; }
     inline QVector<T> &operator+=(const T &t)
@@ -293,37 +424,17 @@ public:
     { append(t); return *this; }
     inline QVector<T> &operator<<(const QVector<T> &l)
     { *this += l; return *this; }
-    inline QVector<T> &operator+=(T &&t)
+    inline QVector<T> &operator+=(rvalue_ref t)
     { append(std::move(t)); return *this; }
-    inline QVector<T> &operator<<(T &&t)
+    inline QVector<T> &operator<<(rvalue_ref t)
     { append(std::move(t)); return *this; }
 
-    static QVector<T> fromList(const QList<T> &list);
-    QList<T> toList() const;
+    // Consider deprecating in 6.4 or later
+    static QVector<T> fromList(const QVector<T> &list) { return list; }
+    QVector<T> toList() const { return *this; }
 
-#if QT_DEPRECATED_SINCE(5, 14) && QT_VERSION < QT_VERSION_CHECK(6,0,0)
-    QT_DEPRECATED_X("Use QVector<T>(vector.begin(), vector.end()) instead.")
-    static inline QVector<T> fromStdVector(const std::vector<T> &vector)
-    { return QVector<T>(vector.begin(), vector.end()); }
-    QT_DEPRECATED_X("Use std::vector<T>(vector.begin(), vector.end()) instead.")
-    inline std::vector<T> toStdVector() const
-    { return std::vector<T>(d->begin(), d->end()); }
-#endif
-private:
-    // ### Qt6: remove methods, they are unused
-    void reallocData(const int size, const int alloc, QArrayData::AllocationOptions options = QArrayData::Default);
-    void reallocData(const int sz) { reallocData(sz, d->alloc); }
-    void realloc(int alloc, QArrayData::AllocationOptions options = QArrayData::Default);
-    void freeData(Data *d);
-    void defaultConstruct(T *from, T *to);
-    void copyConstruct(const T *srcFrom, const T *srcTo, T *dstFrom);
-    void destruct(T *from, T *to);
-    bool isValidIterator(const iterator &i) const
-    {
-        const std::less<const T*> less = {};
-        return !less(d->end(), i) && !less(i, d->begin());
-    }
-    class AlignmentDummy { Data header; T array[1]; };
+    static inline QVector<T> fromVector(const QVector<T> &vector) { return vector; }
+    inline QVector<T> toVector() const { return *this; }
 };
 
 #if defined(__cpp_deduction_guides) && __cpp_deduction_guides >= 201606
@@ -333,747 +444,287 @@ template <typename InputIterator,
 QVector(InputIterator, InputIterator) -> QVector<ValueType>;
 #endif
 
-#ifdef Q_CC_MSVC
-// behavior change: an object of POD type constructed with an initializer of the form ()
-// will be default-initialized
-#   pragma warning ( push )
-#   pragma warning ( disable : 4345 )
-#   pragma warning(disable : 4127) // conditional expression is constant
-#endif
-
 template <typename T>
-void QVector<T>::defaultConstruct(T *from, T *to)
+inline void QVector<T>::resize_internal(int newSize, Qt::Initialization)
 {
-    if (QTypeInfo<T>::isComplex) {
-        while (from != to) {
-            new (from++) T();
-        }
-    } else {
-        ::memset(static_cast<void *>(from), 0, (to - from) * sizeof(T));
-    }
-}
+    Q_ASSERT(newSize >= 0);
 
-template <typename T>
-void QVector<T>::copyConstruct(const T *srcFrom, const T *srcTo, T *dstFrom)
-{
-    if (QTypeInfo<T>::isComplex) {
-        while (srcFrom != srcTo)
-            new (dstFrom++) T(*srcFrom++);
-    } else {
-        ::memcpy(static_cast<void *>(dstFrom), static_cast<const void *>(srcFrom), (srcTo - srcFrom) * sizeof(T));
-    }
-}
-
-template <typename T>
-void QVector<T>::destruct(T *from, T *to)
-{
-    if (QTypeInfo<T>::isComplex) {
-        while (from != to) {
-            from++->~T();
+    if (d->needsDetach() || newSize > capacity()) {
+        // must allocate memory
+        DataPointer detached(Data::allocate(d->detachCapacity(newSize),
+                                            d->detachFlags()));
+        if (size() && newSize) {
+            detached->copyAppend(constBegin(), constBegin() + qMin(newSize, size()));
         }
+        d.swap(detached);
     }
-}
-
-template <typename T>
-inline QVector<T>::QVector(const QVector<T> &v)
-{
-    if (v.d->ref.ref()) {
-        d = v.d;
-    } else {
-        if (v.d->capacityReserved) {
-            d = Data::allocate(v.d->alloc);
-            Q_CHECK_PTR(d);
-            d->capacityReserved = true;
-        } else {
-            d = Data::allocate(v.d->size);
-            Q_CHECK_PTR(d);
-        }
-        if (d->alloc) {
-            copyConstruct(v.d->begin(), v.d->end(), d->begin());
-            d->size = v.d->size;
-        }
-    }
-}
 
-#if defined(Q_CC_MSVC)
-#pragma warning( pop )
-#endif
-
-template <typename T>
-void QVector<T>::detach()
-{
-    if (!isDetached()) {
-#if !defined(QT_NO_UNSHARABLE_CONTAINERS)
-        if (!d->alloc)
-            d = Data::unsharableEmpty();
-        else
-#endif
-            realloc(int(d->alloc));
-    }
-    Q_ASSERT(isDetached());
+    if (newSize < size())
+        d->truncate(newSize);
 }
 
 template <typename T>
 void QVector<T>::reserve(int asize)
 {
-    if (asize > int(d->alloc))
-        realloc(asize);
-    if (isDetached()
-#if !defined(QT_NO_UNSHARABLE_CONTAINERS)
-            && d != Data::unsharableEmpty()
-#endif
-            )
-        d->capacityReserved = 1;
-    Q_ASSERT(capacity() >= asize);
-}
-
-template <typename T>
-void QVector<T>::resize(int asize)
-{
-    if (asize == d->size)
-        return detach();
-    if (asize > int(d->alloc) || !isDetached()) { // there is not enough space
-        QArrayData::AllocationOptions opt = asize > int(d->alloc) ? QArrayData::Grow : QArrayData::Default;
-        realloc(qMax(int(d->alloc), asize), opt);
+    // capacity() == 0 for immutable data, so this will force a detaching below
+    if (asize <= capacity()) {
+        if (d->flags() & Data::CapacityReserved)
+            return;  // already reserved, don't shrink
+        if (!d->isShared()) {
+            // accept current allocation, don't shrink
+            d->flags() |= Data::CapacityReserved;
+            return;
+        }
     }
-    if (asize < d->size)
-        destruct(begin() + asize, end());
-    else
-        defaultConstruct(end(), begin() + asize);
-    d->size = asize;
-}
-template <typename T>
-inline void QVector<T>::clear()
-{
-    if (!d->size)
-        return;
-    destruct(begin(), end());
-    d->size = 0;
-}
-template <typename T>
-inline const T &QVector<T>::at(int i) const
-{ Q_ASSERT_X(i >= 0 && i < d->size, "QVector<T>::at", "index out of range");
-  return d->begin()[i]; }
-template <typename T>
-inline const T &QVector<T>::operator[](int i) const
-{ Q_ASSERT_X(i >= 0 && i < d->size, "QVector<T>::operator[]", "index out of range");
-  return d->begin()[i]; }
-template <typename T>
-inline T &QVector<T>::operator[](int i)
-{ Q_ASSERT_X(i >= 0 && i < d->size, "QVector<T>::operator[]", "index out of range");
-  return data()[i]; }
-template <typename T>
-inline void QVector<T>::insert(int i, const T &t)
-{ Q_ASSERT_X(i >= 0 && i <= d->size, "QVector<T>::insert", "index out of range");
-  insert(begin() + i, 1, t); }
-template <typename T>
-inline void QVector<T>::insert(int i, int n, const T &t)
-{ Q_ASSERT_X(i >= 0 && i <= d->size, "QVector<T>::insert", "index out of range");
-  insert(begin() + i, n, t); }
-template <typename T>
-inline void QVector<T>::insert(int i, T &&t)
-{ Q_ASSERT_X(i >= 0 && i <= d->size, "QVector<T>::insert", "index out of range");
-  insert(begin() + i, std::move(t)); }
-template <typename T>
-inline void QVector<T>::remove(int i, int n)
-{ Q_ASSERT_X(i >= 0 && n >= 0 && i + n <= d->size, "QVector<T>::remove", "index out of range");
-  erase(d->begin() + i, d->begin() + i + n); }
-template <typename T>
-inline void QVector<T>::remove(int i)
-{ Q_ASSERT_X(i >= 0 && i < d->size, "QVector<T>::remove", "index out of range");
-  erase(d->begin() + i, d->begin() + i + 1); }
-template <typename T>
-inline void QVector<T>::prepend(const T &t)
-{ insert(begin(), 1, t); }
-template <typename T>
-inline void QVector<T>::prepend(T &&t)
-{ insert(begin(), std::move(t)); }
 
-template <typename T>
-inline void QVector<T>::replace(int i, const T &t)
-{
-    Q_ASSERT_X(i >= 0 && i < d->size, "QVector<T>::replace", "index out of range");
-    const T copy(t);
-    data()[i] = copy;
+    DataPointer detached(Data::allocate(qMax(asize, size()),
+                                        d->detachFlags() | Data::CapacityReserved));
+    detached->copyAppend(constBegin(), constEnd());
+    d.swap(detached);
 }
 
 template <typename T>
-QVector<T> &QVector<T>::operator=(const QVector<T> &v)
+inline void QVector<T>::squeeze()
 {
-    if (v.d != d) {
-        QVector<T> tmp(v);
-        tmp.swap(*this);
-    }
-    return *this;
-}
-
-template <typename T>
-QVector<T>::QVector(int asize)
-{
-    Q_ASSERT_X(asize >= 0, "QVector::QVector", "Size must be greater than or equal to 0.");
-    if (Q_LIKELY(asize > 0)) {
-        d = Data::allocate(asize);
-        Q_CHECK_PTR(d);
-        d->size = asize;
-        defaultConstruct(d->begin(), d->end());
-    } else {
-        d = Data::sharedNull();
+    if (d->needsDetach() || size() != capacity()) {
+        // must allocate memory
+        DataPointer detached(Data::allocate(size(), d->detachFlags() & ~Data::CapacityReserved));
+        if (size()) {
+            detached->copyAppend(constBegin(), constEnd());
+        }
+        d.swap(detached);
     }
 }
 
 template <typename T>
-QVector<T>::QVector(int asize, const T &t)
+inline void QVector<T>::remove(int i, int n)
 {
-    Q_ASSERT_X(asize >= 0, "QVector::QVector", "Size must be greater than or equal to 0.");
-    if (asize > 0) {
-        d = Data::allocate(asize);
-        Q_CHECK_PTR(d);
-        d->size = asize;
-        T* i = d->end();
-        while (i != d->begin())
-            new (--i) T(t);
-    } else {
-        d = Data::sharedNull();
-    }
-}
+    Q_ASSERT_X(size_t(i) + size_t(n) <= size_t(d->size), "QVector::remove", "index out of range");
+    Q_ASSERT_X(n >= 0, "QVector::remove", "invalid count");
 
-#if defined(Q_CC_MSVC)
-QT_WARNING_PUSH
-QT_WARNING_DISABLE_MSVC(4127) // conditional expression is constant
-#endif // Q_CC_MSVC
+    if (n == 0)
+        return;
 
-template <typename T>
-QVector<T>::QVector(std::initializer_list<T> args)
-{
-    if (args.size() > 0) {
-        d = Data::allocate(args.size());
-        Q_CHECK_PTR(d);
-        // std::initializer_list<T>::iterator is guaranteed to be
-        // const T* ([support.initlist]/1), so can be memcpy'ed away from by copyConstruct
-        copyConstruct(args.begin(), args.end(), d->begin());
-        d->size = int(args.size());
+    const size_t newSize = size() - n;
+    if (d->needsDetach() ||
+            ((d->flags() & Data::CapacityReserved) == 0
+             && newSize < d->allocatedCapacity()/2)) {
+        // allocate memory
+        DataPointer detached(Data::allocate(d->detachCapacity(newSize),
+                             d->detachFlags() & ~(Data::GrowsBackwards | Data::GrowsForward)));
+        const_iterator where = constBegin() + i;
+        if (newSize) {
+            detached->copyAppend(constBegin(), where);
+            detached->copyAppend(where + n, constEnd());
+        }
+        d.swap(detached);
     } else {
-        d = Data::sharedNull();
+        // we're detached and we can just move data around
+        d->erase(d->begin() + i, d->begin() + i + n);
     }
 }
 
 template <typename T>
-QVector<T> &QVector<T>::operator=(std::initializer_list<T> args)
-{
-    QVector<T> tmp(args);
-    tmp.swap(*this);
-    return *this;
-}
-
-#if defined(Q_CC_MSVC)
-QT_WARNING_POP
-#endif // Q_CC_MSVC
-
+inline void QVector<T>::prepend(const T &t)
+{ insert(0, 1, t); }
 template <typename T>
-template <typename InputIterator, QtPrivate::IfIsInputIterator<InputIterator>>
-QVector<T>::QVector(InputIterator first, InputIterator last)
-    : QVector()
-{
-    QtPrivate::reserveIfForwardIterator(this, first, last);
-    std::copy(first, last, std::back_inserter(*this));
-}
+void QVector<T>::prepend(rvalue_ref t)
+{ insert(0, std::move(t)); }
 
-template <typename T>
-void QVector<T>::freeData(Data *x)
+template<typename T>
+inline T QVector<T>::value(int i, const T &defaultValue) const
 {
-    destruct(x->begin(), x->end());
-    Data::deallocate(x);
+    return size_t(i) < size_t(d->size) ? at(i) : defaultValue;
 }
 
-#if defined(Q_CC_MSVC)
-QT_WARNING_PUSH
-QT_WARNING_DISABLE_MSVC(4127) // conditional expression is constant
-#endif
-
 template <typename T>
-void QVector<T>::reallocData(const int asize, const int aalloc, QArrayData::AllocationOptions options)
+inline void QVector<T>::append(const_iterator i1, const_iterator i2)
 {
-    Q_ASSERT(asize >= 0 && asize <= aalloc);
-    Data *x = d;
-
-    const bool isShared = d->ref.isShared();
-
-    if (aalloc != 0) {
-        if (aalloc != int(d->alloc) || isShared) {
-            QT_TRY {
-                // allocate memory
-                x = Data::allocate(aalloc, options);
-                Q_CHECK_PTR(x);
-                // aalloc is bigger then 0 so it is not [un]sharedEmpty
-#if !defined(QT_NO_UNSHARABLE_CONTAINERS)
-                Q_ASSERT(x->ref.isSharable() || options.testFlag(QArrayData::Unsharable));
-#endif
-                Q_ASSERT(!x->ref.isStatic());
-                x->size = asize;
-
-                T *srcBegin = d->begin();
-                T *srcEnd = asize > d->size ? d->end() : d->begin() + asize;
-                T *dst = x->begin();
-
-                if (!QTypeInfoQuery<T>::isRelocatable || (isShared && QTypeInfo<T>::isComplex)) {
-                    QT_TRY {
-                        if (isShared || !std::is_nothrow_move_constructible<T>::value) {
-                            // we can not move the data, we need to copy construct it
-                            while (srcBegin != srcEnd)
-                                new (dst++) T(*srcBegin++);
-                        } else {
-                            while (srcBegin != srcEnd)
-                                new (dst++) T(std::move(*srcBegin++));
-                        }
-                    } QT_CATCH (...) {
-                        // destruct already copied objects
-                        destruct(x->begin(), dst);
-                        QT_RETHROW;
-                    }
-                } else {
-                    ::memcpy(static_cast<void *>(dst), static_cast<void *>(srcBegin), (srcEnd - srcBegin) * sizeof(T));
-                    dst += srcEnd - srcBegin;
-
-                    // destruct unused / not moved data
-                    if (asize < d->size)
-                        destruct(d->begin() + asize, d->end());
-                }
-
-                if (asize > d->size) {
-                    // construct all new objects when growing
-                    if (!QTypeInfo<T>::isComplex) {
-                        ::memset(static_cast<void *>(dst), 0, (static_cast<T *>(x->end()) - dst) * sizeof(T));
-                    } else {
-                        QT_TRY {
-                            while (dst != x->end())
-                                new (dst++) T();
-                        } QT_CATCH (...) {
-                            // destruct already copied objects
-                            destruct(x->begin(), dst);
-                            QT_RETHROW;
-                        }
-                    }
-                }
-            } QT_CATCH (...) {
-                Data::deallocate(x);
-                QT_RETHROW;
-            }
-            x->capacityReserved = d->capacityReserved;
-        } else {
-            Q_ASSERT(int(d->alloc) == aalloc); // resize, without changing allocation size
-            Q_ASSERT(isDetached());       // can be done only on detached d
-            Q_ASSERT(x == d);             // in this case we do not need to allocate anything
-            if (asize <= d->size) {
-                destruct(x->begin() + asize, x->end()); // from future end to current end
-            } else {
-                defaultConstruct(x->end(), x->begin() + asize); // from current end to future end
-            }
-            x->size = asize;
-        }
+    if (i1 == i2)
+        return;
+    const size_t newSize = size() + std::distance(i1, i2);
+    if (d->needsDetach() || newSize > d->allocatedCapacity()) {
+        DataPointer detached(Data::allocate(d->detachCapacity(newSize),
+                                            d->detachFlags() | Data::GrowsForward));
+        detached->copyAppend(constBegin(), constEnd());
+        detached->copyAppend(i1, i2);
+        d.swap(detached);
     } else {
-        x = Data::sharedNull();
-    }
-    if (d != x) {
-        if (!d->ref.deref()) {
-            if (!QTypeInfoQuery<T>::isRelocatable || !aalloc || (isShared && QTypeInfo<T>::isComplex)) {
-                // data was copy constructed, we need to call destructors
-                // or if !alloc we did nothing to the old 'd'.
-                freeData(d);
-            } else {
-                Data::deallocate(d);
-            }
-        }
-        d = x;
+        // we're detached and we can just move data around
+        d->copyAppend(i1, i2);
     }
-
-    Q_ASSERT(d->data());
-    Q_ASSERT(uint(d->size) <= d->alloc);
-#if !defined(QT_NO_UNSHARABLE_CONTAINERS)
-    Q_ASSERT(d != Data::unsharableEmpty());
-#endif
-    Q_ASSERT(aalloc ? d != Data::sharedNull() : d == Data::sharedNull());
-    Q_ASSERT(d->alloc >= uint(aalloc));
-    Q_ASSERT(d->size == asize);
 }
 
-template<typename T>
-void QVector<T>::realloc(int aalloc, QArrayData::AllocationOptions options)
+template <typename T>
+inline typename QVector<T>::iterator
+QVector<T>::insert(int i, int n, parameter_type t)
 {
-    Q_ASSERT(aalloc >= d->size);
-    Data *x = d;
+    Q_ASSERT_X(size_t(i) <= size_t(d->size), "QVector<T>::insert", "index out of range");
 
-    const bool isShared = d->ref.isShared();
+    // we don't have a quick exit for n == 0
+    // it's not worth wasting CPU cycles for that
 
-    QT_TRY {
-        // allocate memory
-        x = Data::allocate(aalloc, options);
-        Q_CHECK_PTR(x);
-        // aalloc is bigger then 0 so it is not [un]sharedEmpty
-#if !defined(QT_NO_UNSHARABLE_CONTAINERS)
-        Q_ASSERT(x->ref.isSharable() || options.testFlag(QArrayData::Unsharable));
-#endif
-        Q_ASSERT(!x->ref.isStatic());
-        x->size = d->size;
-
-        T *srcBegin = d->begin();
-        T *srcEnd = d->end();
-        T *dst = x->begin();
-
-        if (!QTypeInfoQuery<T>::isRelocatable || (isShared && QTypeInfo<T>::isComplex)) {
-            QT_TRY {
-                if (isShared || !std::is_nothrow_move_constructible<T>::value) {
-                    // we can not move the data, we need to copy construct it
-                    while (srcBegin != srcEnd)
-                        new (dst++) T(*srcBegin++);
-                } else {
-                    while (srcBegin != srcEnd)
-                        new (dst++) T(std::move(*srcBegin++));
-                }
-            } QT_CATCH (...) {
-                // destruct already copied objects
-                destruct(x->begin(), dst);
-                QT_RETHROW;
-            }
-        } else {
-            ::memcpy(static_cast<void *>(dst), static_cast<void *>(srcBegin), (srcEnd - srcBegin) * sizeof(T));
-            dst += srcEnd - srcBegin;
-        }
+    const size_t newSize = size() + n;
+    if (d->needsDetach() || newSize > d->allocatedCapacity()) {
+        typename Data::ArrayOptions flags = d->detachFlags() | Data::GrowsForward;
+        if (size_t(i) <= newSize / 4)
+            flags |= Data::GrowsBackwards;
 
-    } QT_CATCH (...) {
-        Data::deallocate(x);
-        QT_RETHROW;
-    }
-    x->capacityReserved = d->capacityReserved;
-
-    Q_ASSERT(d != x);
-    if (!d->ref.deref()) {
-        if (!QTypeInfoQuery<T>::isRelocatable || !aalloc || (isShared && QTypeInfo<T>::isComplex)) {
-            // data was copy constructed, we need to call destructors
-            // or if !alloc we did nothing to the old 'd'.
-            freeData(d);
+        DataPointer detached(Data::allocate(d->detachCapacity(newSize), flags));
+        const_iterator where = constBegin() + i;
+        detached->copyAppend(constBegin(), where);
+        detached->copyAppend(n, t);
+        detached->copyAppend(where, constEnd());
+        d.swap(detached);
+    } else {
+        // we're detached and we can just move data around
+        if (i == size()) {
+            d->copyAppend(n, t);
         } else {
-            Data::deallocate(d);
+            T copy(t);
+            d->insert(d.begin() + i, n, copy);
         }
     }
-    d = x;
-
-    Q_ASSERT(d->data());
-    Q_ASSERT(uint(d->size) <= d->alloc);
-#if !defined(QT_NO_UNSHARABLE_CONTAINERS)
-    Q_ASSERT(d != Data::unsharableEmpty());
-#endif
-    Q_ASSERT(d != Data::sharedNull());
-    Q_ASSERT(d->alloc >= uint(aalloc));
-}
-
-#if defined(Q_CC_MSVC)
-QT_WARNING_POP
-#endif
-
-template<typename T>
-Q_OUTOFLINE_TEMPLATE T QVector<T>::value(int i) const
-{
-    if (uint(i) >= uint(d->size)) {
-        return T();
-    }
-    return d->begin()[i];
-}
-template<typename T>
-Q_OUTOFLINE_TEMPLATE T QVector<T>::value(int i, const T &defaultValue) const
-{
-    return uint(i) >= uint(d->size) ? defaultValue : d->begin()[i];
+    return d.begin() + i;
 }
 
 template <typename T>
-void QVector<T>::append(const T &t)
+template <typename ...Args>
+typename QVector<T>::iterator
+QVector<T>::emplace(int i, Args&&... args)
 {
-    const bool isTooSmall = uint(d->size + 1) > d->alloc;
-    if (!isDetached() || isTooSmall) {
-        T copy(t);
-        QArrayData::AllocationOptions opt(isTooSmall ? QArrayData::Grow : QArrayData::Default);
-        realloc(isTooSmall ? d->size + 1 : d->alloc, opt);
-
-        if (QTypeInfo<T>::isComplex)
-            new (d->end()) T(std::move(copy));
-        else
-            *d->end() = std::move(copy);
+     Q_ASSERT_X(i >= 0 && i <= d->size, "QVector<T>::insert", "index out of range");
 
-    } else {
-        if (QTypeInfo<T>::isComplex)
-            new (d->end()) T(t);
-        else
-            *d->end() = t;
-    }
-    ++d->size;
-}
-
-template <typename T>
-void QVector<T>::append(T &&t)
-{
-    const bool isTooSmall = uint(d->size + 1) > d->alloc;
-    if (!isDetached() || isTooSmall) {
-        QArrayData::AllocationOptions opt(isTooSmall ? QArrayData::Grow : QArrayData::Default);
-        realloc(isTooSmall ? d->size + 1 : d->alloc, opt);
-    }
+    const size_t newSize = size() + 1;
+    if (d->needsDetach() || newSize > d->allocatedCapacity()) {
+        typename Data::ArrayOptions flags = d->detachFlags() | Data::GrowsForward;
+        if (size_t(i) <= newSize / 4)
+            flags |= Data::GrowsBackwards;
 
-    new (d->end()) T(std::move(t));
+        DataPointer detached(Data::allocate(d->detachCapacity(newSize), flags));
+        const_iterator where = constBegin() + i;
 
-    ++d->size;
-}
+        // First, create an element to handle cases, when a user moves
+        // the element from a container to the same container
+        detached->createInPlace(detached.begin() + i, std::forward<Args>(args)...);
 
-template <typename T>
-void QVector<T>::removeLast()
-{
-    Q_ASSERT(!isEmpty());
-    Q_ASSERT(d->alloc);
+        // Then, put the first part of the elements to the new location
+        detached->copyAppend(constBegin(), where);
 
-    if (d->ref.isShared())
-        detach();
-    --d->size;
-    if (QTypeInfo<T>::isComplex)
-        (d->data() + d->size)->~T();
-}
+        // After that, increase the actual size, because we created
+        // one extra element
+        ++detached.size;
 
-template <typename T>
-typename QVector<T>::iterator QVector<T>::insert(iterator before, size_type n, const T &t)
-{
-    Q_ASSERT_X(isValidIterator(before),  "QVector::insert", "The specified iterator argument 'before' is invalid");
+        // Finally, put the rest of the elements to the new location
+        detached->copyAppend(where, constEnd());
 
-    const auto offset = std::distance(d->begin(), before);
-    if (n != 0) {
-        const T copy(t);
-        if (!isDetached() || d->size + n > int(d->alloc))
-            realloc(d->size + n, QArrayData::Grow);
-        if (!QTypeInfoQuery<T>::isRelocatable) {
-            T *b = d->end();
-            T *i = d->end() + n;
-            while (i != b)
-                new (--i) T;
-            i = d->end();
-            T *j = i + n;
-            b = d->begin() + offset;
-            while (i != b)
-                *--j = *--i;
-            i = b+n;
-            while (i != b)
-                *--i = copy;
-        } else {
-            T *b = d->begin() + offset;
-            T *i = b + n;
-            memmove(static_cast<void *>(i), static_cast<const void *>(b), (d->size - offset) * sizeof(T));
-            while (i != b)
-                new (--i) T(copy);
-        }
-        d->size += n;
-    }
-    return d->begin() + offset;
-}
-
-template <typename T>
-typename QVector<T>::iterator QVector<T>::insert(iterator before, T &&t)
-{
-    Q_ASSERT_X(isValidIterator(before),  "QVector::insert", "The specified iterator argument 'before' is invalid");
-
-    const auto offset = std::distance(d->begin(), before);
-    if (!isDetached() || d->size + 1 > int(d->alloc))
-        realloc(d->size + 1, QArrayData::Grow);
-    if (!QTypeInfoQuery<T>::isRelocatable) {
-        T *i = d->end();
-        T *j = i + 1;
-        T *b = d->begin() + offset;
-        // The new end-element needs to be constructed, the rest must be move assigned
-        if (i != b) {
-            new (--j) T(std::move(*--i));
-            while (i != b)
-                *--j = std::move(*--i);
-            *b = std::move(t);
-        } else {
-            new (b) T(std::move(t));
-        }
+        d.swap(detached);
     } else {
-        T *b = d->begin() + offset;
-        memmove(static_cast<void *>(b + 1), static_cast<const void *>(b), (d->size - offset) * sizeof(T));
-        new (b) T(std::move(t));
+        d->emplace(d.begin() + i, std::forward<Args>(args)...);
     }
-    d->size += 1;
-    return d->begin() + offset;
+    return d.begin() + i;
 }
 
 template <typename T>
-typename QVector<T>::iterator QVector<T>::erase(iterator abegin, iterator aend)
+typename QVector<T>::iterator QVector<T>::erase(const_iterator abegin, const_iterator aend)
 {
     Q_ASSERT_X(isValidIterator(abegin), "QVector::erase", "The specified iterator argument 'abegin' is invalid");
     Q_ASSERT_X(isValidIterator(aend), "QVector::erase", "The specified iterator argument 'aend' is invalid");
+    Q_ASSERT(aend >= abegin);
 
-    const auto itemsToErase = aend - abegin;
+    int i = std::distance(d.constBegin(), abegin);
+    int n = std::distance(abegin, aend);
+    remove(i, n);
 
-    if (!itemsToErase)
-        return abegin;
-
-    Q_ASSERT(abegin >= d->begin());
-    Q_ASSERT(aend <= d->end());
-    Q_ASSERT(abegin <= aend);
-
-    const auto itemsUntouched = abegin - d->begin();
-
-    // FIXME we could do a proper realloc, which copy constructs only needed data.
-    // FIXME we are about to delete data - maybe it is good time to shrink?
-    // FIXME the shrink is also an issue in removeLast, that is just a copy + reduce of this.
-    if (d->alloc) {
-        detach();
-        abegin = d->begin() + itemsUntouched;
-        aend = abegin + itemsToErase;
-        if (!QTypeInfoQuery<T>::isRelocatable) {
-            iterator moveBegin = abegin + itemsToErase;
-            iterator moveEnd = d->end();
-            while (moveBegin != moveEnd) {
-                if (QTypeInfo<T>::isComplex)
-                    static_cast<T *>(abegin)->~T();
-                new (abegin++) T(*moveBegin++);
-            }
-            if (abegin < d->end()) {
-                // destroy rest of instances
-                destruct(abegin, d->end());
-            }
-        } else {
-            destruct(abegin, aend);
-            // QTBUG-53605: static_cast<void *> masks clang errors of the form
-            // error: destination for this 'memmove' call is a pointer to class containing a dynamic class
-            // FIXME maybe use std::is_polymorphic (as soon as allowed) to avoid the memmove
-            memmove(static_cast<void *>(abegin), static_cast<void *>(aend),
-                    (d->size - itemsToErase - itemsUntouched) * sizeof(T));
-        }
-        d->size -= int(itemsToErase);
-    }
-    return d->begin() + itemsUntouched;
+    return d.begin() + i;
 }
 
 template <typename T>
-bool QVector<T>::operator==(const QVector<T> &v) const
+inline QVector<T> &QVector<T>::fill(parameter_type t, int newSize)
 {
-    if (d == v.d)
-        return true;
-    if (d->size != v.d->size)
-        return false;
-    const T *vb = v.d->begin();
-    const T *b  = d->begin();
-    const T *e  = d->end();
-    return std::equal(b, e, QT_MAKE_CHECKED_ARRAY_ITERATOR(vb, v.d->size));
-}
-
-template <typename T>
-QVector<T> &QVector<T>::fill(const T &from, int asize)
-{
-    const T copy(from);
-    resize(asize < 0 ? d->size : asize);
-    if (d->size) {
-        T *i = d->end();
-        T *b = d->begin();
-        while (i != b)
-            *--i = copy;
-    }
-    return *this;
-}
-
-template <typename T>
-QVector<T> &QVector<T>::operator+=(const QVector &l)
-{
-    if (d->size == 0) {
-        *this = l;
+    if (newSize == -1)
+        newSize = size();
+    if (d->needsDetach() || newSize > capacity()) {
+        // must allocate memory
+        DataPointer detached(Data::allocate(d->detachCapacity(newSize),
+                                            d->detachFlags()));
+        detached->copyAppend(newSize, t);
+        d.swap(detached);
     } else {
-        uint newSize = d->size + l.d->size;
-        const bool isTooSmall = newSize > d->alloc;
-        if (!isDetached() || isTooSmall) {
-            QArrayData::AllocationOptions opt(isTooSmall ? QArrayData::Grow : QArrayData::Default);
-            realloc(isTooSmall ? newSize : d->alloc, opt);
-        }
-
-        if (d->alloc) {
-            T *w = d->begin() + newSize;
-            T *i = l.d->end();
-            T *b = l.d->begin();
-            while (i != b) {
-                if (QTypeInfo<T>::isComplex)
-                    new (--w) T(*--i);
-                else
-                    *--w = *--i;
-            }
-            d->size = newSize;
-        }
+        // we're detached
+        const T copy(t);
+        d->assign(d.begin(), d.begin() + qMin(size(), newSize), t);
+        if (newSize > size())
+            d->copyAppend(newSize - size(), copy);
     }
     return *this;
 }
 
-template <typename T>
-int QVector<T>::indexOf(const T &t, int from) const
+namespace QtPrivate {
+template <typename T, typename U>
+int indexOf(const QVector<T> &vector, const U &u, int from)
 {
     if (from < 0)
-        from = qMax(from + d->size, 0);
-    if (from < d->size) {
-        T* n = d->begin() + from - 1;
-        T* e = d->end();
+        from = qMax(from + vector.size(), 0);
+    if (from < vector.size()) {
+        auto n = vector.begin() + from - 1;
+        auto e = vector.end();
         while (++n != e)
-            if (*n == t)
-                return n - d->begin();
+            if (*n == u)
+                return n - vector.begin();
     }
     return -1;
 }
 
-template <typename T>
-int QVector<T>::lastIndexOf(const T &t, int from) const
+template <typename T, typename U>
+int lastIndexOf(const QVector<T> &vector, const U &u, int from)
 {
     if (from < 0)
-        from += d->size;
-    else if (from >= d->size)
-        from = d->size-1;
+        from += vector.d->size;
+    else if (from >= vector.size())
+        from = vector.size() - 1;
     if (from >= 0) {
-        T* b = d->begin();
-        T* n = d->begin() + from + 1;
+        auto b = vector.begin();
+        auto n = vector.begin() + from + 1;
         while (n != b) {
-            if (*--n == t)
+            if (*--n == u)
                 return n - b;
         }
     }
     return -1;
 }
+}
 
 template <typename T>
-bool QVector<T>::contains(const T &t) const
+int QVector<T>::indexOf(const T &t, int from) const noexcept
 {
-    const T *b = d->begin();
-    const T *e = d->end();
-    return std::find(b, e, t) != e;
+    return QtPrivate::indexOf<T, T>(*this, t, from);
 }
 
 template <typename T>
-int QVector<T>::count(const T &t) const
+int QVector<T>::lastIndexOf(const T &t, int from) const noexcept
 {
-    const T *b = d->begin();
-    const T *e = d->end();
-    return int(std::count(b, e, t));
+    return QtPrivate::lastIndexOf(*this, t, from);
 }
 
 template <typename T>
-Q_OUTOFLINE_TEMPLATE QVector<T> QVector<T>::mid(int pos, int len) const
+inline QVector<T> QVector<T>::mid(int pos, int len) const
 {
     using namespace QtPrivate;
-    switch (QContainerImplHelper::mid(d->size, &pos, &len)) {
+    switch (QContainerImplHelper::mid(d.size, &pos, &len)) {
     case QContainerImplHelper::Null:
     case QContainerImplHelper::Empty:
-        return QVector<T>();
+        return QVector();
     case QContainerImplHelper::Full:
         return *this;
     case QContainerImplHelper::Subset:
         break;
     }
 
-    QVector<T> midResult;
-    midResult.realloc(len);
-    T *srcFrom = d->begin() + pos;
-    T *srcTo = d->begin() + pos + len;
-    midResult.copyConstruct(srcFrom, srcTo, midResult.data());
-    midResult.d->size = len;
-    return midResult;
+    // Allocate memory
+    DataPointer copied(Data::allocate(len));
+    copied->copyAppend(constBegin() + pos, constBegin() + pos + len);
+    return copied;
 }
 
 Q_DECLARE_SEQUENTIAL_ITERATOR(Vector)
@@ -1135,4 +786,7 @@ QVector<uint> QStringView::toUcs4() const { return QtPrivate::convertToUcs4(*thi
 
 QT_END_NAMESPACE
 
+#include <QtCore/qbytearraylist.h>
+#include <QtCore/qstringlist.h>
+
 #endif // QVECTOR_H
diff --git a/src/corelib/tools/qvector.qdoc b/src/corelib/tools/qvector.qdoc
index 116d962411..daa6ff95e9 100644
--- a/src/corelib/tools/qvector.qdoc
+++ b/src/corelib/tools/qvector.qdoc
@@ -39,7 +39,7 @@
     stores its items in adjacent memory locations and provides fast
     index-based access.
 
-    QList\<T\>, QLinkedList\<T\>, QVector\<T\>, and QVarLengthArray\<T\>
+    QList\<T\>, QVector\<T\>, and QVarLengthArray\<T\>
     provide similar APIs and functionality. They are often interchangeable,
     but there are performance consequences. Here is an overview of use cases:
 
@@ -57,18 +57,13 @@
         those APIs.
     \li If you need a real linked list, which guarantees
         \l{Algorithmic Complexity}{constant time} insertions mid-list and
-        uses iterators to items rather than indexes, use QLinkedList.
+        uses iterators to items rather than indexes, use std::list.
     \endlist
 
     \note QVector and QVarLengthArray both guarantee C-compatible
     array layout. QList does not. This might be important if your
     application must interface with a C API.
 
-    \note Iterators into a QLinkedList and references into
-    heap-allocating QLists remain valid as long as the referenced items
-    remain in the container. This is not true for iterators and
-    references into a QVector and non-heap-allocating QLists.
-
     Here's an example of a QVector that stores integers and a QVector
     that stores QString values:
 
@@ -129,7 +124,7 @@
     (\l{linear time}) for large vectors, because they require moving many
     items in the vector by one position in memory. If you want a container
     class that provides fast insertion/removal in the middle, use
-    QList or QLinkedList instead.
+    std::list instead.
 
     Unlike plain C++ arrays, QVectors can be resized at any time by
     calling resize(). If the new size is larger than the old size,
@@ -190,8 +185,6 @@
     holding a lot of allocated memory, especially large, contiguous blocks.
     Such considerations, the configuration of such behavior or any mitigation
     are outside the scope of the Qt API.
-
-    \sa QVectorIterator, QMutableVectorIterator, QList, QLinkedList
 */
 
 /*!
@@ -640,12 +633,34 @@
     For large vectors, this operation can be slow (\l{linear time}),
     because it requires moving all the items in the vector by one
     position further in memory. If you want a container class that
-    provides a fast prepend() function, use QList or QLinkedList
+    provides a fast prepend operation, use std::list
     instead.
 
     \sa append(), insert()
 */
 
+/*!
+    \fn template <typename T> template <typename ...Args> T &QVector<T>::emplaceBack(Args&&... args)
+    \fn template <typename T> template <typename ...Args> T &QVector<T>::emplace_back(Args&&... args)
+
+    Adds a new element to the end for the container. This new element
+    is constructed in-place using \a args as the arguments for its
+    construction.
+
+    Returns a reference to the new element.
+
+    Example:
+    \snippet code/src_corelib_tools_qvector.cpp emplace-back
+
+    It is also possible to access a newly created object by using
+    returned reference:
+    \snippet code/src_corelib_tools_qvector.cpp emplace-back-ref
+
+    This is the same as vector.emplace(vector.size(), \a args).
+
+    \sa emplace
+*/
+
 /*! \fn template <typename T> void QVector<T>::insert(int i, const T &value)
     \fn template <typename T> void QVector<T>::insert(int i, T &&value)
 
@@ -659,7 +674,7 @@
     For large vectors, this operation can be slow (\l{linear time}),
     because it requires moving all the items at indexes \a i and
     above by one position further in memory. If you want a container
-    class that provides a fast insert() function, use QLinkedList
+    class that provides a fast insert() function, use std::list
     instead.
 
     \sa append(), prepend(), remove()
@@ -693,6 +708,26 @@
     first of the inserted items.
 */
 
+/*!
+    \fn template <typename T> template <typename ...Args> QVector<T>::iterator QVector<T>::emplace(int i, Args&&... args)
+
+    Extends the container by inserting a new element at position \a i.
+    This new element is constructed in-place using \a args as the
+    arguments for its construction.
+
+    Returns an iterator to the new element.
+
+    Example:
+    \snippet code/src_corelib_tools_qvector.cpp emplace
+
+    \note It is garanteed that the element will be created in place
+          at the beginning, but after that it might be copied or
+          moved to the right position.
+
+    \sa emplaceBack
+*/
+
+
 /*! \fn template <typename T> void QVector<T>::replace(int i, const T &value)
 
     Replaces the item at index position \a i with \a value.
@@ -838,6 +873,17 @@
     \sa takeFirst(), removeLast()
 */
 
+/*!
+    \fn template <typename T> template <typename ...Args> QVector<T>::iterator QVector<T>::emplace(QVector<T>::iterator before, Args&&... args)
+
+    \overload
+
+    Creates a new element in front of the item pointed to by the
+    iterator \a before. This new element is constructed in-place
+    using \a args as the arguments for its construction.
+
+    Returns an iterator to the new element.
+*/
 
 /*! \fn template <typename T> QVector<T> &QVector<T>::fill(const T &value, int size = -1)
 
diff --git a/src/corelib/tools/qvector_msvc.cpp b/src/corelib/tools/qvector_msvc.cpp
index cee343e72b..7e87467d42 100644
--- a/src/corelib/tools/qvector_msvc.cpp
+++ b/src/corelib/tools/qvector_msvc.cpp
@@ -47,12 +47,5 @@
 #  error "This file must be compiled with no precompiled headers"
 #endif
 
-// invert the setting of QT_STRICT_ITERATORS, whichever it was
-#ifdef QT_STRICT_ITERATORS
-#  undef QT_STRICT_ITERATORS
-#else
-#  define QT_STRICT_ITERATORS
-#endif
-
 // the Q_TEMPLATE_EXTERN at the bottom of qvector.h will do the trick
 #include <QtCore/qvector.h>
diff --git a/src/corelib/tools/qversionnumber.cpp b/src/corelib/tools/qversionnumber.cpp
index 58e3c15560..0883896751 100644
--- a/src/corelib/tools/qversionnumber.cpp
+++ b/src/corelib/tools/qversionnumber.cpp
@@ -556,5 +556,199 @@ uint qHash(const QVersionNumber &key, uint seed)
     return seed;
 }
 
-QT_END_NAMESPACE
+/*!
+    \class QTypeRevision
+    \inmodule QtCore
+    \since 6.0
+    \brief The QTypeRevision class contains a lightweight representation of
+           a version number with two 8-bit segments, major and minor, either
+           of which can be unknown.
+
+    Use this class to describe revisions of a type. Compatible revisions can be
+    expressed as increments of the minor version. Breaking changes can be
+    expressed as increments of the major version. The return values of
+    \l QMetaMethod::revision() and \l QMetaProperty::revision() can be passed to
+    \l QTypeRevision::fromEncodedVersion(). The resulting major and minor versions
+    specify in which Qt versions the properties and methods were added.
+
+    \sa QMetaMethod::revision(), QMetaProperty::revision()
+*/
+
+/*!
+    \fn template<typename Integer> static bool QTypeRevision::isValidSegment(Integer segment)
+
+    Returns true if the given number can be used as either major or minor
+    version in a QTypeRevision. Valid segments need to be \c {>= 0} and \c {< 255}.
+*/
+
+/*!
+    \fn QTypeRevision::QTypeRevision()
+
+    Produces an invalid revision.
+
+    \sa isValid()
+*/
+
+/*!
+    \fn template <typename Major, typename Minor> static QTypeRevision QTypeRevision::fromVersion(Major majorVersion, Minor minorVersion)
+
+    Produces a QTypeRevision from the given \a majorVersion and \a minorVersion,
+    both of which need to be a valid segments.
+
+    \sa isValidSegment()
+*/
+
+/*!
+    \fn template <typename Major> static QTypeRevision QTypeRevision::fromMajorVersion(Major majorVersion)
+
+    Produces a QTypeRevision from the given \a majorVersion with an invalid minor
+    version. \a majorVersion needs to be a valid segment.
+
+    \sa isValidSegment()
+*/
+
+/*!
+    \fn template <typename Minor> static QTypeRevision QTypeRevision::fromMinorVersion(Minor minorVersion)
+
+    Produces a QTypeRevision from the given \a minorVersion with an invalid major
+    version. \a minorVersion needs to be a valid segment.
+
+    \sa isValidSegment()
+*/
+
+/*!
+    \fn template <typename Integer> static QTypeRevision QTypeRevision::fromEncodedVersion(Integer value)
+
+    Produces a QTypeRevision from the given \a value. \a value encodes both the
+    minor and major versions in the least significant and second least
+    significant byte, respectively.
+
+    \a value must not have any bits outside the least significant two bytes set.
+    \c Integer needs to be at least 16 bits wide, and must not have a sign bit
+    in the least significant 16 bits.
+
+    \sa toEncodedVersion()
+*/
+
+/*!
+    \fn static QTypeRevision QTypeRevision::zero()
+
+    Produces a QTypeRevision with major and minor version \c{0}.
+*/
+
+/*!
+    \fn bool QTypeRevision::hasMajorVersion() const
+
+    Returns true if the major version is known, otherwise false.
+
+    \sa majorVersion(), hasMinorVersion()
+*/
+
+/*!
+    \fn quint8 QTypeRevision::majorVersion() const
+
+    Returns the major version encoded in the revision.
+
+    \sa hasMajorVersion(), minorVersion()
+*/
+
+/*!
+    \fn bool QTypeRevision::hasMinorVersion() const
+
+    Returns true if the minor version is known, otherwise false.
+
+    \sa minorVersion(), hasMajorVersion()
+*/
 
+/*!
+    \fn quint8 QTypeRevision::minorVersion() const
+
+    Returns the minor version encoded in the revision.
+
+    \sa hasMinorVersion(), majorVersion()
+*/
+
+/*!
+    \fn bool QTypeRevision::isValid() const
+
+    Returns true if the major version or the minor version is known,
+    otherwise false.
+
+    \sa hasMajorVersion(), hasMinorVersion()
+*/
+
+/*!
+    \fn template<typename Integer> Integer QTypeRevision::toEncodedVersion() const
+
+    Transforms the revision into an integer value, encoding the minor
+    version into the least significant byte, and the major version into
+    the second least significant byte.
+
+    \c Integer needs to be at  least 16 bits wide, and must not have a sign bit
+    in the least significant 16 bits.
+
+    \sa fromEncodedVersion()
+*/
+
+#ifndef QT_NO_DATASTREAM
+/*!
+   \fn QDataStream& operator<<(QDataStream &out, const QTypeRevision &revision)
+   \relates QTypeRevision
+   \since 6.0
+
+   Writes the revision \a revision to stream \a out.
+ */
+QDataStream& operator<<(QDataStream &out, const QTypeRevision &revision)
+{
+    return out << revision.toEncodedVersion<quint16>();
+}
+
+/*!
+   \fn QDataStream& operator>>(QDataStream &in, QTypeRevision &revision)
+   \relates QTypeRevision
+   \since 6.0
+
+   Reads a revision from stream \a in and stores it in \a revision.
+ */
+QDataStream& operator>>(QDataStream &in, QTypeRevision &revision)
+{
+    quint16 value;
+    in >> value;
+    revision = QTypeRevision::fromEncodedVersion(value);
+    return in;
+}
+#endif
+
+#ifndef QT_NO_DEBUG_STREAM
+QDebug operator<<(QDebug debug, const QTypeRevision &revision)
+{
+    QDebugStateSaver saver(debug);
+    if (revision.hasMajorVersion()) {
+        if (revision.hasMinorVersion())
+            debug.nospace() << revision.majorVersion() << '.' << revision.minorVersion();
+        else
+            debug.nospace().noquote() << revision.majorVersion() << ".x";
+    } else {
+        if (revision.hasMinorVersion())
+            debug << revision.minorVersion();
+        else
+            debug.noquote() << "invalid";
+    }
+    return debug;
+}
+#endif
+
+/*!
+    \fn uint qHash(const QTypeRevision &key, uint seed)
+    \relates QHash
+    \since 6.0
+
+    Returns the hash value for the \a key, using \a seed to seed the
+    calculation.
+*/
+uint qHash(const QTypeRevision &key, uint seed)
+{
+    return qHash(key.toEncodedVersion<quint16>(), seed);
+}
+
+QT_END_NAMESPACE
diff --git a/src/corelib/tools/qversionnumber.h b/src/corelib/tools/qversionnumber.h
index d43b86ba51..2f886346c9 100644
--- a/src/corelib/tools/qversionnumber.h
+++ b/src/corelib/tools/qversionnumber.h
@@ -47,6 +47,7 @@
 #include <QtCore/qvector.h>
 #include <QtCore/qmetatype.h>
 #include <QtCore/qtypeinfo.h>
+#include <limits>
 
 QT_BEGIN_NAMESPACE
 
@@ -309,8 +310,159 @@ Q_REQUIRED_RESULT inline bool operator==(const QVersionNumber &lhs, const QVersi
 Q_REQUIRED_RESULT inline bool operator!=(const QVersionNumber &lhs, const QVersionNumber &rhs) noexcept
 { return QVersionNumber::compare(lhs, rhs) != 0; }
 
+class QTypeRevision;
+Q_CORE_EXPORT uint qHash(const QTypeRevision &key, uint seed = 0);
+
+#ifndef QT_NO_DATASTREAM
+Q_CORE_EXPORT QDataStream& operator<<(QDataStream &out, const QTypeRevision &revision);
+Q_CORE_EXPORT QDataStream& operator>>(QDataStream &in, QTypeRevision &revision);
+#endif
+
+class QTypeRevision
+{
+public:
+    template<typename Integer>
+    using if_valid_segment_type = typename std::enable_if<
+            std::is_integral<Integer>::value, bool>::type;
+
+    template<typename Integer>
+    using if_valid_value_type = typename std::enable_if<
+            std::is_integral<Integer>::value
+            && (sizeof(Integer) > sizeof(quint16)
+                || (sizeof(Integer) == sizeof(quint16)
+                    && !std::is_signed<Integer>::value)), bool>::type;
+
+    template<typename Integer, if_valid_segment_type<Integer> = true>
+    static constexpr bool isValidSegment(Integer segment)
+    {
+        return segment >= Integer(0)
+                && (std::numeric_limits<Integer>::max() < Integer(SegmentUnknown)
+                    || segment < Integer(SegmentUnknown));
+    }
+
+    template<typename Major, typename Minor,
+             if_valid_segment_type<Major> = true,
+             if_valid_segment_type<Minor> = true>
+    static constexpr QTypeRevision fromVersion(Major majorVersion, Minor minorVersion)
+    {
+        return Q_ASSERT(isValidSegment(majorVersion)),
+               Q_ASSERT(isValidSegment(minorVersion)),
+               QTypeRevision(quint8(majorVersion), quint8(minorVersion));
+    }
+
+    template<typename Major, if_valid_segment_type<Major> = true>
+    static constexpr QTypeRevision fromMajorVersion(Major majorVersion)
+    {
+        return Q_ASSERT(isValidSegment(majorVersion)),
+               QTypeRevision(quint8(majorVersion), SegmentUnknown);
+    }
+
+    template<typename Minor, if_valid_segment_type<Minor> = true>
+    static constexpr QTypeRevision fromMinorVersion(Minor minorVersion)
+    {
+        return Q_ASSERT(isValidSegment(minorVersion)),
+               QTypeRevision(SegmentUnknown, quint8(minorVersion));
+    }
+
+    template<typename Integer, if_valid_value_type<Integer> = true>
+    static constexpr QTypeRevision fromEncodedVersion(Integer value)
+    {
+        return Q_ASSERT((value & ~Integer(0xffff)) == Integer(0)),
+               QTypeRevision((value & Integer(0xff00)) >> 8, value & Integer(0xff));
+    }
+
+    static constexpr QTypeRevision zero() { return QTypeRevision(0, 0); }
+
+    constexpr QTypeRevision() = default;
+
+    constexpr bool hasMajorVersion() const { return m_majorVersion != SegmentUnknown; }
+    constexpr quint8 majorVersion() const { return m_majorVersion; }
+
+    constexpr bool hasMinorVersion() const { return m_minorVersion != SegmentUnknown; }
+    constexpr quint8 minorVersion() const { return m_minorVersion; }
+
+    constexpr bool isValid() const { return hasMajorVersion() || hasMinorVersion(); }
+
+    template<typename Integer, if_valid_value_type<Integer> = true>
+    constexpr Integer toEncodedVersion() const
+    {
+        return Integer(m_majorVersion << 8) | Integer(m_minorVersion);
+    }
+
+private:
+    enum { SegmentUnknown = quint8(~0U) };
+
+#if Q_BYTE_ORDER == Q_LITTLE_ENDIAN
+    constexpr QTypeRevision(quint8 major, quint8 minor)
+        : m_minorVersion(minor), m_majorVersion(major) {}
+
+    quint8 m_minorVersion = SegmentUnknown;
+    quint8 m_majorVersion = SegmentUnknown;
+#else
+    constexpr QTypeRevision(quint8 major, quint8 minor)
+        : m_majorVersion(major), m_minorVersion(minor) {}
+
+    quint8 m_majorVersion = SegmentUnknown;
+    quint8 m_minorVersion = SegmentUnknown;
+#endif
+};
+
+inline constexpr bool operator==(QTypeRevision lhs, QTypeRevision rhs)
+{
+    return lhs.toEncodedVersion<quint16>() == rhs.toEncodedVersion<quint16>();
+}
+
+inline constexpr bool operator!=(QTypeRevision lhs, QTypeRevision rhs)
+{
+    return lhs.toEncodedVersion<quint16>() != rhs.toEncodedVersion<quint16>();
+}
+
+inline constexpr bool operator<(QTypeRevision lhs, QTypeRevision rhs)
+{
+    return (!lhs.hasMajorVersion() && rhs.hasMajorVersion())
+            // non-0 major > unspecified major > major 0
+            ? rhs.majorVersion() != 0
+            : ((lhs.hasMajorVersion() && !rhs.hasMajorVersion())
+               // major 0 < unspecified major < non-0 major
+               ? lhs.majorVersion() == 0
+               : (lhs.majorVersion() != rhs.majorVersion()
+                  // both majors specified and non-0
+                  ? lhs.majorVersion() < rhs.majorVersion()
+                  : ((!lhs.hasMinorVersion() && rhs.hasMinorVersion())
+                     // non-0 minor > unspecified minor > minor 0
+                     ? rhs.minorVersion() != 0
+                     : ((lhs.hasMinorVersion() && !rhs.hasMinorVersion())
+                        // minor 0 < unspecified minor < non-0 minor
+                        ? lhs.minorVersion() == 0
+                        // both minors specified and non-0
+                        : lhs.minorVersion() < rhs.minorVersion()))));
+}
+
+inline constexpr bool operator>(QTypeRevision lhs, QTypeRevision rhs)
+{
+    return lhs != rhs && !(lhs < rhs);
+}
+
+inline constexpr bool operator<=(QTypeRevision lhs, QTypeRevision rhs)
+{
+    return lhs == rhs || lhs < rhs;
+}
+
+inline constexpr bool operator>=(QTypeRevision lhs, QTypeRevision rhs)
+{
+    return lhs == rhs || !(lhs < rhs);
+}
+
+Q_STATIC_ASSERT(sizeof(QTypeRevision) == 2);
+Q_DECLARE_TYPEINFO(QTypeRevision, Q_MOVABLE_TYPE);
+
+#ifndef QT_NO_DEBUG_STREAM
+Q_CORE_EXPORT QDebug operator<<(QDebug, const QTypeRevision &revision);
+#endif
+
 QT_END_NAMESPACE
 
 Q_DECLARE_METATYPE(QVersionNumber)
+Q_DECLARE_METATYPE(QTypeRevision)
 
 #endif //QVERSIONNUMBER_H
diff --git a/src/corelib/tools/tools.pri b/src/corelib/tools/tools.pri
index e078ab4409..edf4248c44 100644
--- a/src/corelib/tools/tools.pri
+++ b/src/corelib/tools/tools.pri
@@ -13,12 +13,12 @@ HEADERS +=  \
         tools/qcontainertools_impl.h \
         tools/qcryptographichash.h \
         tools/qduplicatetracker_p.h \
+        tools/qflatmap_p.h \
         tools/qfreelist_p.h \
         tools/qhash.h \
         tools/qhashfunctions.h \
         tools/qiterator.h \
         tools/qline.h \
-        tools/qlinkedlist.h \
         tools/qlist.h \
         tools/qmakearray_p.h \
         tools/qmap.h \
@@ -48,7 +48,6 @@ HEADERS +=  \
         tools/qvector.h \
         tools/qversionnumber.h
 
-
 SOURCES += \
         tools/qarraydata.cpp \
         tools/qbitarray.cpp \
@@ -56,7 +55,6 @@ SOURCES += \
         tools/qfreelist.cpp \
         tools/qhash.cpp \
         tools/qline.cpp \
-        tools/qlinkedlist.cpp \
         tools/qlist.cpp \
         tools/qpoint.cpp \
         tools/qmap.cpp \
diff --git a/src/dbus/.prev_CMakeLists.txt b/src/dbus/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..1136ebe19b
--- /dev/null
+++ b/src/dbus/.prev_CMakeLists.txt
@@ -0,0 +1,76 @@
+# Generated from dbus.pro.
+
+#####################################################################
+## DBus Module:
+#####################################################################
+
+qt_add_module(DBus
+    QMAKE_MODULE_CONFIG dbusadaptors dbusinterfaces
+    SOURCES
+        dbus_minimal_p.h
+        qdbus_symbols.cpp qdbus_symbols_p.h
+        qdbusabstractadaptor.cpp qdbusabstractadaptor.h qdbusabstractadaptor_p.h
+        qdbusabstractinterface.cpp qdbusabstractinterface.h qdbusabstractinterface_p.h
+        qdbusargument.cpp qdbusargument.h qdbusargument_p.h
+        qdbusconnection.cpp qdbusconnection.h qdbusconnection_p.h
+        qdbusconnectioninterface.cpp qdbusconnectioninterface.h
+        qdbusconnectionmanager_p.h
+        qdbuscontext.cpp qdbuscontext.h qdbuscontext_p.h
+        qdbuserror.cpp qdbuserror.h
+        qdbusextratypes.cpp qdbusextratypes.h
+        qdbusintegrator.cpp qdbusintegrator_p.h
+        qdbusinterface.cpp qdbusinterface.h qdbusinterface_p.h
+        qdbusinternalfilters.cpp
+        qdbusintrospection.cpp qdbusintrospection_p.h
+        qdbusmarshaller.cpp
+        qdbusmessage.cpp qdbusmessage.h qdbusmessage_p.h
+        qdbusmetaobject.cpp
+        qdbusmetatype.cpp qdbusmetatype.h
+        qdbusmisc.cpp
+        qdbuspendingcall.cpp qdbuspendingcall.h qdbuspendingcall_p.h
+        qdbuspendingreply.cpp qdbuspendingreply.h
+        qdbusreply.cpp qdbusreply.h
+        qdbusserver.cpp qdbusserver.h
+        qdbusservicewatcher.cpp qdbusservicewatcher.h
+        qdbusthreaddebug_p.h
+        qdbusunixfiledescriptor.cpp qdbusunixfiledescriptor.h
+        qdbusutil.cpp qdbusutil_p.h
+        qdbusvirtualobject.cpp qdbusvirtualobject.h
+        qdbusxmlgenerator.cpp
+        qdbusxmlparser.cpp qdbusxmlparser_p.h
+        qtdbusglobal.h qtdbusglobal_p.h
+    DEFINES
+        DBUS_API_SUBJECT_TO_CHANGE
+        QT_NO_FOREACH
+    LIBRARIES
+        Qt::CorePrivate
+    PUBLIC_LIBRARIES
+        Qt::Core
+    PRIVATE_MODULE_INTERFACE
+        Qt::CorePrivate
+)
+
+#### Keys ignored in scope 1:.:.:dbus.pro:<TRUE>:
+# MODULE_CONFIG = "dbusadaptors" "dbusinterfaces"
+
+## Scopes:
+#####################################################################
+
+qt_extend_target(DBus CONDITION QT_FEATURE_dbus_linked
+    DEFINES
+        QT_LINKED_LIBDBUS
+    LIBRARIES
+        dbus-1
+)
+
+qt_extend_target(DBus CONDITION WIN32
+    LIBRARIES
+        advapi32
+        netapi32
+        user32
+        ws2_32
+)
+qt_add_docs(DBus
+    doc/qtdbus.qdocconf
+)
+
diff --git a/src/dbus/CMakeLists.txt b/src/dbus/CMakeLists.txt
new file mode 100644
index 0000000000..ea1d7abaa1
--- /dev/null
+++ b/src/dbus/CMakeLists.txt
@@ -0,0 +1,79 @@
+# Generated from dbus.pro.
+
+#####################################################################
+## DBus Module:
+#####################################################################
+
+qt_add_module(DBus
+    QMAKE_MODULE_CONFIG dbusadaptors dbusinterfaces
+    SOURCES
+        dbus_minimal_p.h
+        qdbus_symbols.cpp qdbus_symbols_p.h
+        qdbusabstractadaptor.cpp qdbusabstractadaptor.h qdbusabstractadaptor_p.h
+        qdbusabstractinterface.cpp qdbusabstractinterface.h qdbusabstractinterface_p.h
+        qdbusargument.cpp qdbusargument.h qdbusargument_p.h
+        qdbusconnection.cpp qdbusconnection.h qdbusconnection_p.h
+        qdbusconnectioninterface.cpp qdbusconnectioninterface.h
+        qdbusconnectionmanager_p.h
+        qdbuscontext.cpp qdbuscontext.h qdbuscontext_p.h
+        qdbuserror.cpp qdbuserror.h
+        qdbusextratypes.cpp qdbusextratypes.h
+        qdbusintegrator.cpp qdbusintegrator_p.h
+        qdbusinterface.cpp qdbusinterface.h qdbusinterface_p.h
+        qdbusinternalfilters.cpp
+        qdbusintrospection.cpp qdbusintrospection_p.h
+        qdbusmarshaller.cpp
+        qdbusmessage.cpp qdbusmessage.h qdbusmessage_p.h
+        qdbusmetaobject.cpp
+        qdbusmetatype.cpp qdbusmetatype.h
+        qdbusmisc.cpp
+        qdbuspendingcall.cpp qdbuspendingcall.h qdbuspendingcall_p.h
+        qdbuspendingreply.cpp qdbuspendingreply.h
+        qdbusreply.cpp qdbusreply.h
+        qdbusserver.cpp qdbusserver.h
+        qdbusservicewatcher.cpp qdbusservicewatcher.h
+        qdbusthreaddebug_p.h
+        qdbusunixfiledescriptor.cpp qdbusunixfiledescriptor.h
+        qdbusutil.cpp qdbusutil_p.h
+        qdbusvirtualobject.cpp qdbusvirtualobject.h
+        qdbusxmlgenerator.cpp
+        qdbusxmlparser.cpp qdbusxmlparser_p.h
+        qtdbusglobal.h qtdbusglobal_p.h
+    DEFINES
+        DBUS_API_SUBJECT_TO_CHANGE
+        QT_NO_FOREACH
+    LIBRARIES
+        Qt::CorePrivate
+    PUBLIC_LIBRARIES
+        Qt::Core
+    PRIVATE_MODULE_INTERFACE
+        Qt::CorePrivate
+)
+
+set_source_files_properties(qdbusmarshaller.cpp
+    PROPERTIES HEADER_FILE_ONLY ON)  # special case: This file is included by qdbusargument.cpp
+
+#### Keys ignored in scope 1:.:.:dbus.pro:<TRUE>:
+# MODULE_CONFIG = "dbusadaptors" "dbusinterfaces"
+
+## Scopes:
+#####################################################################
+
+qt_extend_target(DBus CONDITION QT_FEATURE_dbus_linked
+    DEFINES
+        QT_LINKED_LIBDBUS
+    LIBRARIES
+        dbus-1
+)
+
+qt_extend_target(DBus CONDITION WIN32
+    LIBRARIES
+        advapi32
+        netapi32
+        user32
+        ws2_32
+)
+qt_add_docs(DBus
+    doc/qtdbus.qdocconf
+)
+
diff --git a/src/dbus/Qt5DBusConfigExtras.cmake.in b/src/dbus/Qt5DBusConfigExtras.cmake.in
deleted file mode 100644
index a814678f7b..0000000000
--- a/src/dbus/Qt5DBusConfigExtras.cmake.in
+++ /dev/null
@@ -1,44 +0,0 @@
-
-if (NOT TARGET Qt5::qdbuscpp2xml)
-    add_executable(Qt5::qdbuscpp2xml IMPORTED)
-
-!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
-    set(imported_location \"${_qt5DBus_install_prefix}/$${CMAKE_BIN_DIR}qdbuscpp2xml$$CMAKE_BIN_SUFFIX\")
-!!ELSE
-    set(imported_location \"$${CMAKE_BIN_DIR}qdbuscpp2xml$$CMAKE_BIN_SUFFIX\")
-!!ENDIF
-    _qt5_DBus_check_file_exists(${imported_location})
-
-    set_target_properties(Qt5::qdbuscpp2xml PROPERTIES
-        IMPORTED_LOCATION ${imported_location}
-    )
-endif()
-
-if (NOT TARGET Qt5::qdbusxml2cpp)
-    add_executable(Qt5::qdbusxml2cpp IMPORTED)
-
-!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
-    set(imported_location \"${_qt5DBus_install_prefix}/$${CMAKE_BIN_DIR}qdbusxml2cpp$$CMAKE_BIN_SUFFIX\")
-!!ELSE
-    set(imported_location \"$${CMAKE_BIN_DIR}qdbusxml2cpp$$CMAKE_BIN_SUFFIX\")
-!!ENDIF
-    _qt5_DBus_check_file_exists(${imported_location})
-
-    set_target_properties(Qt5::qdbusxml2cpp PROPERTIES
-        IMPORTED_LOCATION ${imported_location}
-    )
-endif()
-
-set(Qt5DBus_QDBUSCPP2XML_EXECUTABLE Qt5::qdbuscpp2xml)
-set(Qt5DBus_QDBUSXML2CPP_EXECUTABLE Qt5::qdbusxml2cpp)
-
-# Create versionless tool targets.
-foreach(__qt_tool qdbuscpp2xml qdbusxml2cpp)
-    if(NOT \"${QT_NO_CREATE_VERSIONLESS_TARGETS}\" AND NOT TARGET Qt::${__qt_tool}
-       AND TARGET Qt5::${__qt_tool})
-        add_executable(Qt::${__qt_tool} IMPORTED)
-        get_target_property(__qt_imported_location Qt5::${__qt_tool} IMPORTED_LOCATION)
-        set_target_properties(Qt::${__qt_tool}
-                              PROPERTIES IMPORTED_LOCATION \"${__qt_imported_location}\")
-    endif()
-endforeach()
diff --git a/src/dbus/Qt5DBusMacros.cmake b/src/dbus/Qt5DBusMacros.cmake
deleted file mode 100644
index 1cacccdddd..0000000000
--- a/src/dbus/Qt5DBusMacros.cmake
+++ /dev/null
@@ -1,197 +0,0 @@
-#=============================================================================
-# Copyright 2005-2011 Kitware, Inc.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# * Redistributions of source code must retain the above copyright
-#   notice, this list of conditions and the following disclaimer.
-#
-# * Redistributions in binary form must reproduce the above copyright
-#   notice, this list of conditions and the following disclaimer in the
-#   documentation and/or other materials provided with the distribution.
-#
-# * Neither the name of Kitware, Inc. nor the names of its
-#   contributors may be used to endorse or promote products derived
-#   from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#=============================================================================
-
-include(MacroAddFileDependencies)
-
-include(CMakeParseArguments)
-
-function(qt5_add_dbus_interface _sources _interface _basename)
-    get_filename_component(_infile ${_interface} ABSOLUTE)
-    set(_header "${CMAKE_CURRENT_BINARY_DIR}/${_basename}.h")
-    set(_impl   "${CMAKE_CURRENT_BINARY_DIR}/${_basename}.cpp")
-    set(_moc    "${CMAKE_CURRENT_BINARY_DIR}/${_basename}.moc")
-
-    get_source_file_property(_nonamespace ${_interface} NO_NAMESPACE)
-    if(_nonamespace)
-        set(_params -N -m)
-    else()
-        set(_params -m)
-    endif()
-
-    get_source_file_property(_classname ${_interface} CLASSNAME)
-    if(_classname)
-        set(_params ${_params} -c ${_classname})
-    endif()
-
-    get_source_file_property(_include ${_interface} INCLUDE)
-    if(_include)
-        set(_params ${_params} -i ${_include})
-    endif()
-
-    add_custom_command(OUTPUT "${_impl}" "${_header}"
-        COMMAND ${Qt5DBus_QDBUSXML2CPP_EXECUTABLE} ${_params} -p ${_basename} ${_infile}
-        DEPENDS ${_infile} VERBATIM)
-
-    set_source_files_properties("${_impl}" "${_header}" PROPERTIES SKIP_AUTOMOC TRUE)
-
-    qt5_generate_moc("${_header}" "${_moc}")
-
-    list(APPEND ${_sources} "${_impl}" "${_header}" "${_moc}")
-    macro_add_file_dependencies("${_impl}" "${_moc}")
-    set(${_sources} ${${_sources}} PARENT_SCOPE)
-endfunction()
-
-if(NOT QT_NO_CREATE_VERSIONLESS_FUNCTIONS)
-    function(qt_add_dbus_interface sources)
-        if(QT_DEFAULT_MAJOR_VERSION EQUAL 5)
-            qt5_add_dbus_interface("${sources}" ${ARGN})
-        elseif(QT_DEFAULT_MAJOR_VERSION EQUAL 6)
-            qt6_add_dbus_interface("${sources}" ${ARGN})
-        endif()
-        set("${sources}" "${${sources}}" PARENT_SCOPE)
-    endfunction()
-endif()
-
-
-function(qt5_add_dbus_interfaces _sources)
-    foreach(_current_FILE ${ARGN})
-        get_filename_component(_infile ${_current_FILE} ABSOLUTE)
-        get_filename_component(_basename ${_current_FILE} NAME)
-        # get the part before the ".xml" suffix
-        string(TOLOWER ${_basename} _basename)
-        string(REGEX REPLACE "(.*\\.)?([^\\.]+)\\.xml" "\\2" _basename ${_basename})
-        qt5_add_dbus_interface(${_sources} ${_infile} ${_basename}interface)
-    endforeach()
-    set(${_sources} ${${_sources}} PARENT_SCOPE)
-endfunction()
-
-if(NOT QT_NO_CREATE_VERSIONLESS_FUNCTIONS)
-    function(qt_add_dbus_interfaces sources)
-        if(QT_DEFAULT_MAJOR_VERSION EQUAL 5)
-            qt5_add_dbus_interfaces("${sources}" ${ARGN})
-        elseif(QT_DEFAULT_MAJOR_VERSION EQUAL 6)
-            qt6_add_dbus_interfaces("${sources}" ${ARGN})
-        endif()
-        set("${sources}" "${${sources}}" PARENT_SCOPE)
-    endfunction()
-endif()
-
-
-function(qt5_generate_dbus_interface _header) # _customName OPTIONS -some -options )
-    set(options)
-    set(oneValueArgs)
-    set(multiValueArgs OPTIONS)
-
-    cmake_parse_arguments(_DBUS_INTERFACE "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
-
-    set(_customName ${_DBUS_INTERFACE_UNPARSED_ARGUMENTS})
-
-    get_filename_component(_in_file ${_header} ABSOLUTE)
-    get_filename_component(_basename ${_header} NAME_WE)
-
-    if(_customName)
-        if(IS_ABSOLUTE ${_customName})
-          get_filename_component(_containingDir ${_customName} PATH)
-          if(NOT EXISTS ${_containingDir})
-              file(MAKE_DIRECTORY "${_containingDir}")
-          endif()
-          set(_target ${_customName})
-        else()
-            set(_target ${CMAKE_CURRENT_BINARY_DIR}/${_customName})
-        endif()
-    else()
-        set(_target ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.xml)
-    endif()
-
-    add_custom_command(OUTPUT ${_target}
-        COMMAND ${Qt5DBus_QDBUSCPP2XML_EXECUTABLE} ${_DBUS_INTERFACE_OPTIONS} ${_in_file} -o ${_target}
-        DEPENDS ${_in_file} VERBATIM
-    )
-endfunction()
-
-if(NOT QT_NO_CREATE_VERSIONLESS_FUNCTIONS)
-    function(qt_generate_dbus_interface)
-        if(QT_DEFAULT_MAJOR_VERSION EQUAL 5)
-            qt5_generate_dbus_interface(${ARGV})
-        elseif(QT_DEFAULT_MAJOR_VERSION EQUAL 6)
-            qt6_generate_dbus_interface(${ARGV})
-        endif()
-    endfunction()
-endif()
-
-
-function(qt5_add_dbus_adaptor _sources _xml_file _include _parentClass) # _optionalBasename _optionalClassName)
-    get_filename_component(_infile ${_xml_file} ABSOLUTE)
-
-    set(_optionalBasename "${ARGV4}")
-    if(_optionalBasename)
-        set(_basename ${_optionalBasename} )
-    else()
-        string(REGEX REPLACE "(.*[/\\.])?([^\\.]+)\\.xml" "\\2adaptor" _basename ${_infile})
-        string(TOLOWER ${_basename} _basename)
-    endif()
-
-    set(_optionalClassName "${ARGV5}")
-    set(_header "${CMAKE_CURRENT_BINARY_DIR}/${_basename}.h")
-    set(_impl   "${CMAKE_CURRENT_BINARY_DIR}/${_basename}.cpp")
-    set(_moc    "${CMAKE_CURRENT_BINARY_DIR}/${_basename}.moc")
-
-    if(_optionalClassName)
-        add_custom_command(OUTPUT "${_impl}" "${_header}"
-          COMMAND ${Qt5DBus_QDBUSXML2CPP_EXECUTABLE} -m -a ${_basename} -c ${_optionalClassName} -i ${_include} -l ${_parentClass} ${_infile}
-          DEPENDS ${_infile} VERBATIM
-        )
-    else()
-        add_custom_command(OUTPUT "${_impl}" "${_header}"
-          COMMAND ${Qt5DBus_QDBUSXML2CPP_EXECUTABLE} -m -a ${_basename} -i ${_include} -l ${_parentClass} ${_infile}
-          DEPENDS ${_infile} VERBATIM
-        )
-    endif()
-
-    qt5_generate_moc("${_header}" "${_moc}")
-    set_source_files_properties("${_impl}" "${_header}" PROPERTIES SKIP_AUTOMOC TRUE)
-    macro_add_file_dependencies("${_impl}" "${_moc}")
-
-    list(APPEND ${_sources} "${_impl}" "${_header}" "${_moc}")
-    set(${_sources} ${${_sources}} PARENT_SCOPE)
-endfunction()
-
-if(NOT QT_NO_CREATE_VERSIONLESS_FUNCTIONS)
-    function(qt_add_dbus_adaptor sources)
-        if(QT_DEFAULT_MAJOR_VERSION EQUAL 5)
-            qt5_add_dbus_adaptor("${sources}" ${ARGN})
-        elseif(QT_DEFAULT_MAJOR_VERSION EQUAL 6)
-            qt6_add_dbus_adaptor("${sources}" ${ARGN})
-        endif()
-        set("${sources}" "${${sources}}" PARENT_SCOPE)
-    endfunction()
-endif()
diff --git a/src/dbus/Qt6DBusMacros.cmake b/src/dbus/Qt6DBusMacros.cmake
new file mode 100644
index 0000000000..d7bba30148
--- /dev/null
+++ b/src/dbus/Qt6DBusMacros.cmake
@@ -0,0 +1,202 @@
+#=============================================================================
+# Copyright 2005-2011 Kitware, Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# * Redistributions of source code must retain the above copyright
+#   notice, this list of conditions and the following disclaimer.
+#
+# * Redistributions in binary form must reproduce the above copyright
+#   notice, this list of conditions and the following disclaimer in the
+#   documentation and/or other materials provided with the distribution.
+#
+# * Neither the name of Kitware, Inc. nor the names of its
+#   contributors may be used to endorse or promote products derived
+#   from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#=============================================================================
+
+include(MacroAddFileDependencies)
+
+include(CMakeParseArguments)
+
+function(qt6_add_dbus_interface _sources _interface _basename)
+    get_filename_component(_infile ${_interface} ABSOLUTE)
+    set(_header "${CMAKE_CURRENT_BINARY_DIR}/${_basename}.h")
+    set(_impl   "${CMAKE_CURRENT_BINARY_DIR}/${_basename}.cpp")
+    set(_moc    "${CMAKE_CURRENT_BINARY_DIR}/${_basename}.moc")
+
+    get_source_file_property(_nonamespace ${_interface} NO_NAMESPACE)
+    if(_nonamespace)
+        set(_params -N -m)
+    else()
+        set(_params -m)
+    endif()
+
+    get_source_file_property(_classname ${_interface} CLASSNAME)
+    if(_classname)
+        set(_params ${_params} -c ${_classname})
+    endif()
+
+    get_source_file_property(_include ${_interface} INCLUDE)
+    if(_include)
+        set(_params ${_params} -i ${_include})
+    endif()
+
+    add_custom_command(OUTPUT "${_impl}" "${_header}"
+        COMMAND ${QT_CMAKE_EXPORT_NAMESPACE}::qdbusxml2cpp ${_params} -p ${_basename} ${_infile}
+        DEPENDS ${_infile} ${QT_CMAKE_EXPORT_NAMESPACE}::qdbuscpp2xml
+        VERBATIM
+    )
+
+    set_source_files_properties("${_impl}" "${_header}" PROPERTIES SKIP_AUTOMOC TRUE)
+
+    qt6_generate_moc("${_header}" "${_moc}")
+
+    list(APPEND ${_sources} "${_impl}" "${_header}" "${_moc}")
+    macro_add_file_dependencies("${_impl}" "${_moc}")
+    set(${_sources} ${${_sources}} PARENT_SCOPE)
+endfunction()
+
+if(NOT QT_NO_CREATE_VERSIONLESS_FUNCTIONS)
+    function(qt_add_dbus_interface sources)
+        if(QT_DEFAULT_MAJOR_VERSION EQUAL 5)
+            qt5_add_dbus_interface("${sources}" ${ARGN})
+        elseif(QT_DEFAULT_MAJOR_VERSION EQUAL 6)
+            qt6_add_dbus_interface("${sources}" ${ARGN})
+        endif()
+        set("${sources}" "${${sources}}" PARENT_SCOPE)
+    endfunction()
+endif()
+
+
+function(qt6_add_dbus_interfaces _sources)
+    foreach(_current_FILE ${ARGN})
+        get_filename_component(_infile ${_current_FILE} ABSOLUTE)
+        get_filename_component(_basename ${_current_FILE} NAME)
+        # get the part before the ".xml" suffix
+        string(TOLOWER ${_basename} _basename)
+        string(REGEX REPLACE "(.*\\.)?([^\\.]+)\\.xml" "\\2" _basename ${_basename})
+        qt6_add_dbus_interface(${_sources} ${_infile} ${_basename}interface)
+    endforeach()
+    set(${_sources} ${${_sources}} PARENT_SCOPE)
+endfunction()
+
+if(NOT QT_NO_CREATE_VERSIONLESS_FUNCTIONS)
+    function(qt_add_dbus_interfaces sources)
+        if(QT_DEFAULT_MAJOR_VERSION EQUAL 5)
+            qt5_add_dbus_interfaces("${sources}" ${ARGN})
+        elseif(QT_DEFAULT_MAJOR_VERSION EQUAL 6)
+            qt6_add_dbus_interfaces("${sources}" ${ARGN})
+        endif()
+        set("${sources}" "${${sources}}" PARENT_SCOPE)
+    endfunction()
+endif()
+
+
+function(qt6_generate_dbus_interface _header) # _customName OPTIONS -some -options )
+    set(options)
+    set(oneValueArgs)
+    set(multiValueArgs OPTIONS)
+
+    cmake_parse_arguments(_DBUS_INTERFACE "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
+
+    set(_customName ${_DBUS_INTERFACE_UNPARSED_ARGUMENTS})
+
+    get_filename_component(_in_file ${_header} ABSOLUTE)
+    get_filename_component(_basename ${_header} NAME_WE)
+
+    if(_customName)
+        if(IS_ABSOLUTE ${_customName})
+          get_filename_component(_containingDir ${_customName} PATH)
+          if(NOT EXISTS ${_containingDir})
+              file(MAKE_DIRECTORY "${_containingDir}")
+          endif()
+          set(_target ${_customName})
+        else()
+            set(_target ${CMAKE_CURRENT_BINARY_DIR}/${_customName})
+        endif()
+    else()
+        set(_target ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.xml)
+    endif()
+
+    add_custom_command(OUTPUT ${_target}
+        COMMAND ${QT_CMAKE_EXPORT_NAMESPACE}::qdbuscpp2xml ${_DBUS_INTERFACE_OPTIONS} ${_in_file} -o ${_target}
+        DEPENDS ${_in_file} ${QT_CMAKE_EXPORT_NAMESPACE}::qdbuscpp2xml
+        VERBATIM
+    )
+endfunction()
+
+if(NOT QT_NO_CREATE_VERSIONLESS_FUNCTIONS)
+    function(qt_generate_dbus_interface)
+        if(QT_DEFAULT_MAJOR_VERSION EQUAL 5)
+            qt5_generate_dbus_interface(${ARGV})
+        elseif(QT_DEFAULT_MAJOR_VERSION EQUAL 6)
+            qt6_generate_dbus_interface(${ARGV})
+        endif()
+    endfunction()
+endif()
+
+
+function(qt6_add_dbus_adaptor _sources _xml_file _include _parentClass) # _optionalBasename _optionalClassName)
+    get_filename_component(_infile ${_xml_file} ABSOLUTE)
+
+    set(_optionalBasename "${ARGV4}")
+    if(_optionalBasename)
+        set(_basename ${_optionalBasename} )
+    else()
+        string(REGEX REPLACE "(.*[/\\.])?([^\\.]+)\\.xml" "\\2adaptor" _basename ${_infile})
+        string(TOLOWER ${_basename} _basename)
+    endif()
+
+    set(_optionalClassName "${ARGV5}")
+    set(_header "${CMAKE_CURRENT_BINARY_DIR}/${_basename}.h")
+    set(_impl   "${CMAKE_CURRENT_BINARY_DIR}/${_basename}.cpp")
+    set(_moc    "${CMAKE_CURRENT_BINARY_DIR}/${_basename}.moc")
+
+    if(_optionalClassName)
+        add_custom_command(OUTPUT "${_impl}" "${_header}"
+          COMMAND ${QT_CMAKE_EXPORT_NAMESPACE}::qdbusxml2cpp -m -a ${_basename} -c ${_optionalClassName} -i ${_include} -l ${_parentClass} ${_infile}
+          DEPENDS ${_infile} ${QT_CMAKE_EXPORT_NAMESPACE}::qdbuscpp2xml
+          VERBATIM
+        )
+    else()
+        add_custom_command(OUTPUT "${_impl}" "${_header}"
+          COMMAND ${QT_CMAKE_EXPORT_NAMESPACE}::qdbusxml2cpp -m -a ${_basename} -i ${_include} -l ${_parentClass} ${_infile}
+          DEPENDS ${_infile} ${QT_CMAKE_EXPORT_NAMESPACE}::qdbuscpp2xml
+          VERBATIM
+        )
+    endif()
+
+    qt6_generate_moc("${_header}" "${_moc}")
+    set_source_files_properties("${_impl}" "${_header}" PROPERTIES SKIP_AUTOMOC TRUE)
+    macro_add_file_dependencies("${_impl}" "${_moc}")
+
+    list(APPEND ${_sources} "${_impl}" "${_header}" "${_moc}")
+    set(${_sources} ${${_sources}} PARENT_SCOPE)
+endfunction()
+
+if(NOT QT_NO_CREATE_VERSIONLESS_FUNCTIONS)
+    function(qt_add_dbus_adaptor sources)
+        if(QT_DEFAULT_MAJOR_VERSION EQUAL 5)
+            qt5_add_dbus_adaptor("${sources}" ${ARGN})
+        elseif(QT_DEFAULT_MAJOR_VERSION EQUAL 6)
+            qt6_add_dbus_adaptor("${sources}" ${ARGN})
+        endif()
+        set("${sources}" "${${sources}}" PARENT_SCOPE)
+    endfunction()
+endif()
diff --git a/src/dbus/doc/snippets/code/doc_src_qdbusadaptors.cpp b/src/dbus/doc/snippets/code/doc_src_qdbusadaptors.cpp
index 0fc7a2b26c..f5d9fe7889 100644
--- a/src/dbus/doc/snippets/code/doc_src_qdbusadaptors.cpp
+++ b/src/dbus/doc/snippets/code/doc_src_qdbusadaptors.cpp
@@ -62,7 +62,6 @@ QString processRequest(const QString &request, const QDBusMessage &message)
     data->request = request;
     message.setDelayedReply(true);
     data->reply = message.createReply();
-    QDBusConnection::sessionBus().send(data->reply);
 
     appendRequest(data);
     return QString();
diff --git a/src/dbus/doc/src/dbus-adaptors.qdoc b/src/dbus/doc/src/dbus-adaptors.qdoc
index 9ebf0cedf2..3398a45af7 100644
--- a/src/dbus/doc/src/dbus-adaptors.qdoc
+++ b/src/dbus/doc/src/dbus-adaptors.qdoc
@@ -174,9 +174,6 @@
 
     \snippet code/doc_src_qdbusadaptors.cpp 10
 
-    The use of
-    \l{QDBusConnection::send()}{QDBusConnection::sessionBus().send(data->reply)}
-    is needed to explicitly inform the caller that the response will be delayed.
     In this case, the return value is unimportant; we return an arbitrary value
     to satisfy the compiler.
 
diff --git a/src/dbus/qdbusabstractadaptor.cpp b/src/dbus/qdbusabstractadaptor.cpp
index bf0e33e26e..671f7f25d0 100644
--- a/src/dbus/qdbusabstractadaptor.cpp
+++ b/src/dbus/qdbusabstractadaptor.cpp
@@ -276,11 +276,11 @@ void QDBusAdaptorConnector::polish()
     std::sort(adaptors.begin(), adaptors.end());
 }
 
-void QDBusAdaptorConnector::relaySlot(void **argv)
+void QDBusAdaptorConnector::relaySlot(QMethodRawArguments argv)
 {
     QObject *sndr = sender();
     if (Q_LIKELY(sndr)) {
-        relay(sndr, senderSignalIndex(), argv);
+        relay(sndr, senderSignalIndex(), argv.arguments);
     } else {
         qWarning("QtDBus: cannot relay signals from parent %s(%p \"%s\") unless they are emitted in the object's thread %s(%p \"%s\"). "
                  "Current thread is %s(%p \"%s\").",
@@ -333,120 +333,6 @@ void QDBusAdaptorConnector::relay(QObject *senderObj, int lastSignalIdx, void **
     emit relaySignal(realObject, senderMetaObject, lastSignalIdx, args);
 }
 
-// our Meta Object
-// modify carefully: this has been hand-edited!
-// the relaySlot slot gets called with the void** array
-
-struct qt_meta_stringdata_QDBusAdaptorConnector_t {
-    QByteArrayData data[10];
-    char stringdata[96];
-};
-#define QT_MOC_LITERAL(idx, ofs, len) \
-    Q_STATIC_BYTE_ARRAY_DATA_HEADER_INITIALIZER_WITH_OFFSET(len, \
-        offsetof(qt_meta_stringdata_QDBusAdaptorConnector_t, stringdata) + ofs \
-        - idx * sizeof(QByteArrayData) \
-    )
-static const qt_meta_stringdata_QDBusAdaptorConnector_t qt_meta_stringdata_QDBusAdaptorConnector = {
-    {
-QT_MOC_LITERAL(0, 0, 21),
-QT_MOC_LITERAL(1, 22, 11),
-QT_MOC_LITERAL(2, 34, 0),
-QT_MOC_LITERAL(3, 35, 3),
-QT_MOC_LITERAL(4, 39, 18),
-QT_MOC_LITERAL(5, 58, 10),
-QT_MOC_LITERAL(6, 69, 3),
-QT_MOC_LITERAL(7, 73, 4),
-QT_MOC_LITERAL(8, 78, 9),
-QT_MOC_LITERAL(9, 88, 6)
-    },
-    "QDBusAdaptorConnector\0relaySignal\0\0"
-    "obj\0const QMetaObject*\0metaObject\0sid\0"
-    "args\0relaySlot\0polish\0"
-};
-#undef QT_MOC_LITERAL
-
-static const uint qt_meta_data_QDBusAdaptorConnector[] = {
-
- // content:
-       7,       // revision
-       0,       // classname
-       0,    0, // classinfo
-       3,   14, // methods
-       0,    0, // properties
-       0,    0, // enums/sets
-       0,    0, // constructors
-       0,       // flags
-       1,       // signalCount
-
- // signals: name, argc, parameters, tag, flags
-       1,    4,   29,    2, 0x05,
-
- // slots: name, argc, parameters, tag, flags
-       8,    0,   38,    2, 0x0a,
-       9,    0,   39,    2, 0x0a,
-
- // signals: parameters
-    QMetaType::Void, QMetaType::QObjectStar, 0x80000000 | 4, QMetaType::Int, QMetaType::QVariantList,    3,    5,    6,    7,
-
- // slots: parameters
-    QMetaType::Void,
-    QMetaType::Void,
-
-       0        // eod
-};
-
-void QDBusAdaptorConnector::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a)
-{
-    if (_c == QMetaObject::InvokeMetaMethod) {
-        Q_ASSERT(staticMetaObject.cast(_o));
-        QDBusAdaptorConnector *_t = static_cast<QDBusAdaptorConnector *>(_o);
-        switch (_id) {
-        case 0: _t->relaySignal((*reinterpret_cast< QObject*(*)>(_a[1])),(*reinterpret_cast< const QMetaObject*(*)>(_a[2])),(*reinterpret_cast< int(*)>(_a[3])),(*reinterpret_cast< const QVariantList(*)>(_a[4]))); break;
-        case 1: _t->relaySlot(_a); break; // HAND EDIT: add the _a parameter
-        case 2: _t->polish(); break;
-        default: ;
-        }
-    }
-}
-
-const QMetaObject QDBusAdaptorConnector::staticMetaObject = {
-    { &QObject::staticMetaObject, qt_meta_stringdata_QDBusAdaptorConnector.data,
-      qt_meta_data_QDBusAdaptorConnector, qt_static_metacall, nullptr, nullptr }
-};
-
-const QMetaObject *QDBusAdaptorConnector::metaObject() const
-{
-    return &staticMetaObject;
-}
-
-void *QDBusAdaptorConnector::qt_metacast(const char *_clname)
-{
-    if (!_clname) return nullptr;
-    if (!strcmp(_clname, qt_meta_stringdata_QDBusAdaptorConnector.stringdata))
-        return static_cast<void*>(const_cast< QDBusAdaptorConnector*>(this));
-    return QObject::qt_metacast(_clname);
-}
-
-int QDBusAdaptorConnector::qt_metacall(QMetaObject::Call _c, int _id, void **_a)
-{
-    _id = QObject::qt_metacall(_c, _id, _a);
-    if (_id < 0)
-        return _id;
-    if (_c == QMetaObject::InvokeMetaMethod) {
-        if (_id < 3)
-            qt_static_metacall(this, _c, _id, _a);
-        _id -= 3;
-    }
-    return _id;
-}
-
-// SIGNAL 0
-void QDBusAdaptorConnector::relaySignal(QObject * _t1, const QMetaObject * _t2, int _t3, const QVariantList & _t4)
-{
-    void *_a[] = { nullptr, const_cast<void*>(reinterpret_cast<const void*>(&_t1)), const_cast<void*>(reinterpret_cast<const void*>(&_t2)), const_cast<void*>(reinterpret_cast<const void*>(&_t3)), const_cast<void*>(reinterpret_cast<const void*>(&_t4)) };
-    QMetaObject::activate(this, &staticMetaObject, 0, _a);
-}
-
 QT_END_NAMESPACE
 
 #endif // QT_NO_DBUS
diff --git a/src/dbus/qdbusabstractadaptor_p.h b/src/dbus/qdbusabstractadaptor_p.h
index 023b3b1be2..404901381b 100644
--- a/src/dbus/qdbusabstractadaptor_p.h
+++ b/src/dbus/qdbusabstractadaptor_p.h
@@ -92,7 +92,7 @@ public:
 
 class QDBusAdaptorConnector: public QObject
 {
-    Q_OBJECT_FAKE
+    Q_OBJECT
 
 public: // typedefs
     struct AdaptorData
@@ -118,12 +118,11 @@ public: // methods
     void disconnectAllSignals(QObject *object);
     void relay(QObject *sender, int id, void **);
 
-//public slots:
-    void relaySlot(void **);
+public Q_SLOTS:
+    void relaySlot(QMethodRawArguments a);
     void polish();
 
-protected:
-//signals:
+Q_SIGNALS:
     void relaySignal(QObject *obj, const QMetaObject *metaObject, int sid, const QVariantList &args);
 
 public: // member variables
diff --git a/src/dbus/qdbusargument.cpp b/src/dbus/qdbusargument.cpp
index 5a0f0f013b..7e1d847982 100644
--- a/src/dbus/qdbusargument.cpp
+++ b/src/dbus/qdbusargument.cpp
@@ -908,9 +908,10 @@ void QDBusArgument::endArray()
 
     \snippet code/src_qdbus_qdbusargument.cpp 7
 
-    If the type you want to marshall is a QMap or QHash, you need not
-    declare an \c{operator<<} function for it, since Qt D-Bus provides
-    generic templates to do the job of marshalling the data.
+    You usually don't need to provide an \c{operator<<} or \c{operator>>}
+    function for associative containers such as QHash or std::map,
+    since Qt D-Bus provides generic templates to do the job of marshalling
+    the data.
 
     \sa endMap(), beginStructure(), beginArray(), beginMapEntry()
 */
diff --git a/src/dbus/qdbusargument.h b/src/dbus/qdbusargument.h
index 339f8c5dc8..f388a65bed 100644
--- a/src/dbus/qdbusargument.h
+++ b/src/dbus/qdbusargument.h
@@ -224,7 +224,8 @@ Q_DBUS_EXPORT const QDBusArgument &operator>>(const QDBusArgument &a, QLineF &li
 Q_DBUS_EXPORT QDBusArgument &operator<<(QDBusArgument &a, const QLineF &line);
 #endif
 
-template<template <typename> class Container, typename T>
+template<template <typename> class Container, typename T,
+         typename = typename Container<T>::iterator>
 inline QDBusArgument &operator<<(QDBusArgument &arg, const Container<T> &list)
 {
     int id = qMetaTypeId<T>();
@@ -237,7 +238,8 @@ inline QDBusArgument &operator<<(QDBusArgument &arg, const Container<T> &list)
     return arg;
 }
 
-template<template <typename> class Container, typename T>
+template<template <typename> class Container, typename T,
+         typename = typename Container<T>::iterator>
 inline const QDBusArgument &operator>>(const QDBusArgument &arg, Container<T> &list)
 {
     arg.beginArray();
@@ -252,35 +254,6 @@ inline const QDBusArgument &operator>>(const QDBusArgument &arg, Container<T> &l
     return arg;
 }
 
-// QList specializations
-template<typename T>
-inline QDBusArgument &operator<<(QDBusArgument &arg, const QList<T> &list)
-{
-    int id = qMetaTypeId<T>();
-    arg.beginArray(id);
-    typename QList<T>::ConstIterator it = list.constBegin();
-    typename QList<T>::ConstIterator end = list.constEnd();
-    for ( ; it != end; ++it)
-        arg << *it;
-    arg.endArray();
-    return arg;
-}
-
-template<typename T>
-inline const QDBusArgument &operator>>(const QDBusArgument &arg, QList<T> &list)
-{
-    arg.beginArray();
-    list.clear();
-    while (!arg.atEnd()) {
-        T item;
-        arg >> item;
-        list.push_back(item);
-    }
-    arg.endArray();
-
-    return arg;
-}
-
 inline QDBusArgument &operator<<(QDBusArgument &arg, const QVariantList &list)
 {
     int id = qMetaTypeId<QDBusVariant>();
@@ -293,15 +266,16 @@ inline QDBusArgument &operator<<(QDBusArgument &arg, const QVariantList &list)
     return arg;
 }
 
-// QMap specializations
-template<typename Key, typename T>
-inline QDBusArgument &operator<<(QDBusArgument &arg, const QMap<Key, T> &map)
+// Specializations for associative containers
+template <template <typename, typename> class Container, typename Key, typename T,
+         QtPrivate::IfAssociativeIteratorHasKeyAndValue<typename Container<Key, T>::iterator> = true>
+inline QDBusArgument &operator<<(QDBusArgument &arg, const Container<Key, T> &map)
 {
     int kid = qMetaTypeId<Key>();
     int vid = qMetaTypeId<T>();
     arg.beginMap(kid, vid);
-    typename QMap<Key, T>::ConstIterator it = map.constBegin();
-    typename QMap<Key, T>::ConstIterator end = map.constEnd();
+    auto it = map.begin();
+    auto end = map.end();
     for ( ; it != end; ++it) {
         arg.beginMapEntry();
         arg << it.key() << it.value();
@@ -311,8 +285,27 @@ inline QDBusArgument &operator<<(QDBusArgument &arg, const QMap<Key, T> &map)
     return arg;
 }
 
-template<typename Key, typename T>
-inline const QDBusArgument &operator>>(const QDBusArgument &arg, QMap<Key, T> &map)
+template <template <typename, typename> class Container, typename Key, typename T,
+         QtPrivate::IfAssociativeIteratorHasFirstAndSecond<typename Container<Key, T>::iterator> = true>
+inline QDBusArgument &operator<<(QDBusArgument &arg, const Container<Key, T> &map)
+{
+    int kid = qMetaTypeId<Key>();
+    int vid = qMetaTypeId<T>();
+    arg.beginMap(kid, vid);
+    auto it = map.begin();
+    auto end = map.end();
+    for ( ; it != end; ++it) {
+        arg.beginMapEntry();
+        arg << it->first << it->second;
+        arg.endMapEntry();
+    }
+    arg.endMap();
+    return arg;
+}
+
+template <template <typename, typename> class Container, typename Key, typename T,
+         typename = typename Container<Key, T>::iterator>
+inline const QDBusArgument &operator>>(const QDBusArgument &arg, Container<Key, T> &map)
 {
     arg.beginMap();
     map.clear();
@@ -321,7 +314,7 @@ inline const QDBusArgument &operator>>(const QDBusArgument &arg, QMap<Key, T> &m
         T value;
         arg.beginMapEntry();
         arg >> key >> value;
-        static_cast<QMultiMap<Key, T> &>(map).insert(key, value);
+        map.insert(key, value);
         arg.endMapEntry();
     }
     arg.endMap();
@@ -342,41 +335,6 @@ inline QDBusArgument &operator<<(QDBusArgument &arg, const QVariantMap &map)
     return arg;
 }
 
-// QHash specializations
-template<typename Key, typename T>
-inline QDBusArgument &operator<<(QDBusArgument &arg, const QHash<Key, T> &map)
-{
-    int kid = qMetaTypeId<Key>();
-    int vid = qMetaTypeId<T>();
-    arg.beginMap(kid, vid);
-    typename QHash<Key, T>::ConstIterator it = map.constBegin();
-    typename QHash<Key, T>::ConstIterator end = map.constEnd();
-    for ( ; it != end; ++it) {
-        arg.beginMapEntry();
-        arg << it.key() << it.value();
-        arg.endMapEntry();
-    }
-    arg.endMap();
-    return arg;
-}
-
-template<typename Key, typename T>
-inline const QDBusArgument &operator>>(const QDBusArgument &arg, QHash<Key, T> &map)
-{
-    arg.beginMap();
-    map.clear();
-    while (!arg.atEnd()) {
-        Key key;
-        T value;
-        arg.beginMapEntry();
-        arg >> key >> value;
-        static_cast<QMultiHash<Key, T> &>(map).insert(key, value);
-        arg.endMapEntry();
-    }
-    arg.endMap();
-    return arg;
-}
-
 inline QDBusArgument &operator<<(QDBusArgument &arg, const QVariantHash &map)
 {
     arg.beginMap(QMetaType::QString, qMetaTypeId<QDBusVariant>());
diff --git a/src/dbus/qdbusmetaobject.cpp b/src/dbus/qdbusmetaobject.cpp
index 5265568f42..dcbed5a6f8 100644
--- a/src/dbus/qdbusmetaobject.cpp
+++ b/src/dbus/qdbusmetaobject.cpp
@@ -127,27 +127,31 @@ QDBusMetaObjectGenerator::QDBusMetaObjectGenerator(const QString &interfaceName,
     }
 }
 
-static int registerComplexDBusType(const char *typeName)
+static int registerComplexDBusType(const QByteArray &typeName)
 {
-    struct QDBusRawTypeHandler {
-        static void destruct(void *)
-        {
-            qFatal("Cannot destruct placeholder type QDBusRawType");
-        }
-
-        static void *construct(void *, const void *)
-        {
-            qFatal("Cannot construct placeholder type QDBusRawType");
-            return nullptr;
-        }
+    struct QDBusRawTypeHandler : QtPrivate::QMetaTypeInterface
+    {
+        const QByteArray name;
+        QDBusRawTypeHandler(const QByteArray &name)
+            : QtPrivate::QMetaTypeInterface {
+                0, sizeof(void *), sizeof(void *), QMetaType::MovableType, nullptr,
+                name.constData(), 0, QtPrivate::RefCount{0},
+                [](QtPrivate::QMetaTypeInterface *self) {
+                    delete static_cast<QDBusRawTypeHandler *>(self);
+                },
+                nullptr, nullptr, nullptr, nullptr, nullptr
+            },
+            name(name)
+        {}
     };
 
-    return QMetaType::registerNormalizedType(typeName,
-                                             QDBusRawTypeHandler::destruct,
-                                             QDBusRawTypeHandler::construct,
-                                             sizeof(void *),
-                                             QMetaType::MovableType,
-                                             nullptr);
+    static QBasicMutex mutex;
+    static QHash<QByteArray, QMetaType> hash;
+    QMutexLocker lock(&mutex);
+    QMetaType &metatype = hash[typeName];
+    if (!metatype.isValid())
+        metatype = QMetaType(new QDBusRawTypeHandler(typeName));
+    return metatype.id();
 }
 
 Q_DBUS_EXPORT bool qt_dbus_metaobject_skip_annotations = false;
@@ -517,6 +521,9 @@ void QDBusMetaObjectGenerator::write(QDBusMetaObject *obj)
     offset += methodParametersDataSize;
     Q_ASSERT(offset == header->propertyData);
 
+    QMetaType *metaTypes = new QMetaType[properties.count()];
+    int propertyId = 0;
+
     // add each property
     signatureOffset = header->propertyDBusData;
     for (QMap<QByteArray, Property>::ConstIterator it = properties.constBegin();
@@ -531,6 +538,8 @@ void QDBusMetaObjectGenerator::write(QDBusMetaObject *obj)
 
         idata[signatureOffset++] = strings.enter(mp.signature);
         idata[signatureOffset++] = mp.type;
+
+        metaTypes[propertyId++] = QMetaType(mp.type);
     }
 
     Q_ASSERT(offset == header->propertyDBusData);
@@ -547,8 +556,9 @@ void QDBusMetaObjectGenerator::write(QDBusMetaObject *obj)
     obj->d.relatedMetaObjects = nullptr;
     obj->d.static_metacall = nullptr;
     obj->d.extradata = nullptr;
-    obj->d.stringdata = reinterpret_cast<const QByteArrayData *>(string_data);
+    obj->d.stringdata = reinterpret_cast<const uint *>(string_data);
     obj->d.superdata = &QDBusAbstractInterface::staticMetaObject;
+    obj->d.metaTypes = reinterpret_cast<QtPrivate::QMetaTypeInterface *const *>(metaTypes);
 }
 
 #if 0
diff --git a/src/dbus/qdbusmetaobject_p.h b/src/dbus/qdbusmetaobject_p.h
index 89fccf9046..a4ed3c355c 100644
--- a/src/dbus/qdbusmetaobject_p.h
+++ b/src/dbus/qdbusmetaobject_p.h
@@ -77,6 +77,7 @@ struct Q_DBUS_EXPORT QDBusMetaObject: public QMetaObject
     {
         delete [] reinterpret_cast<const char *>(d.stringdata);
         delete [] d.data;
+        delete [] reinterpret_cast<const QMetaType *>(d.metaTypes);
     }
 
     // methods (slots & signals):
diff --git a/src/dbus/qdbusmisc.cpp b/src/dbus/qdbusmisc.cpp
index 46cf857751..8443246e00 100644
--- a/src/dbus/qdbusmisc.cpp
+++ b/src/dbus/qdbusmisc.cpp
@@ -153,7 +153,7 @@ int qDBusParametersForMethod(const QList<QByteArray> &parameterTypes, QVector<in
     QList<QByteArray>::ConstIterator it = parameterTypes.constBegin();
     QList<QByteArray>::ConstIterator end = parameterTypes.constEnd();
     for ( ; it != end; ++it) {
-        const QByteArray &type = *it;
+        QByteArray type = *it;
         if (type.endsWith('*')) {
             errorMsg = QLatin1String("Pointers are not supported: ") + QLatin1String(type);
             return -1;
@@ -180,6 +180,9 @@ int qDBusParametersForMethod(const QList<QByteArray> &parameterTypes, QVector<in
             return -1;          // not allowed
         }
 
+        if (type.startsWith("QList<"))
+            type = "QVector<" + type.mid(sizeof("QList<") - 1);
+
         int id = QMetaType::type(type);
 #ifdef QT_BOOTSTRAPPED
         // in bootstrap mode QDBusMessage isn't included, thus we need to resolve it manually here
diff --git a/src/gui/.prev_CMakeLists.txt b/src/gui/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..36e53a0edc
--- /dev/null
+++ b/src/gui/.prev_CMakeLists.txt
@@ -0,0 +1,657 @@
+# Generated from gui.pro.
+
+#####################################################################
+## Gui Module:
+#####################################################################
+
+qt_add_module(Gui
+    GENERATE_METATYPES
+    PLUGIN_TYPES platforms platforms/darwin xcbglintegrations platformthemes platforminputcontexts generic iconengines imageformats egldeviceintegrations
+    SOURCES
+        image/qbitmap.cpp image/qbitmap.h
+        image/qbmphandler.cpp image/qbmphandler_p.h
+        image/qicon.cpp image/qicon.h image/qicon_p.h
+        image/qiconengine.cpp image/qiconengine.h
+        image/qiconengineplugin.cpp image/qiconengineplugin.h
+        image/qiconloader.cpp image/qiconloader_p.h
+        image/qimage.cpp image/qimage.h image/qimage_p.h
+        image/qimage_conversions.cpp
+        image/qimageiohandler.cpp image/qimageiohandler.h
+        image/qimagepixmapcleanuphooks.cpp image/qimagepixmapcleanuphooks_p.h
+        image/qimagereader.cpp image/qimagereader.h
+        image/qimagereaderwriterhelpers.cpp image/qimagereaderwriterhelpers_p.h
+        image/qimagewriter.cpp image/qimagewriter.h
+        image/qpaintengine_pic.cpp image/qpaintengine_pic_p.h
+        image/qpicture.cpp image/qpicture.h image/qpicture_p.h
+        image/qpixmap.cpp image/qpixmap.h
+        image/qpixmap_blitter.cpp image/qpixmap_blitter_p.h
+        image/qpixmap_raster.cpp image/qpixmap_raster_p.h
+        image/qpixmapcache.cpp image/qpixmapcache.h image/qpixmapcache_p.h
+        image/qplatformpixmap.cpp image/qplatformpixmap.h
+        image/qppmhandler.cpp image/qppmhandler_p.h
+        image/qxbmhandler.cpp image/qxbmhandler_p.h
+        image/qxpmhandler.cpp image/qxpmhandler_p.h
+        itemmodels/qstandarditemmodel.cpp itemmodels/qstandarditemmodel.h itemmodels/qstandarditemmodel_p.h
+        kernel/qclipboard.cpp kernel/qclipboard.h
+        kernel/qcursor.cpp kernel/qcursor.h kernel/qcursor_p.h
+        kernel/qevent.cpp kernel/qevent.h kernel/qevent_p.h
+        kernel/qgenericplugin.cpp kernel/qgenericplugin.h
+        kernel/qgenericpluginfactory.cpp kernel/qgenericpluginfactory.h
+        kernel/qguiapplication.cpp kernel/qguiapplication.h kernel/qguiapplication_p.h
+        kernel/qguivariant.cpp
+        kernel/qhighdpiscaling.cpp kernel/qhighdpiscaling_p.h
+        kernel/qinputdevicemanager.cpp kernel/qinputdevicemanager_p.h
+        kernel/qinputdevicemanager_p_p.h
+        kernel/qinputmethod.cpp kernel/qinputmethod.h kernel/qinputmethod_p.h
+        kernel/qinternalmimedata.cpp kernel/qinternalmimedata_p.h
+        kernel/qkeymapper.cpp kernel/qkeymapper_p.h
+        kernel/qoffscreensurface.cpp kernel/qoffscreensurface.h
+        kernel/qpaintdevicewindow.cpp kernel/qpaintdevicewindow.h kernel/qpaintdevicewindow_p.h
+        kernel/qpalette.cpp kernel/qpalette.h
+        kernel/qpixelformat.cpp kernel/qpixelformat.h
+        kernel/qplatformclipboard.cpp kernel/qplatformclipboard.h
+        kernel/qplatformcursor.cpp kernel/qplatformcursor.h
+        kernel/qplatformdialoghelper.cpp kernel/qplatformdialoghelper.h
+        kernel/qplatformgraphicsbuffer.cpp kernel/qplatformgraphicsbuffer.h
+        kernel/qplatformgraphicsbufferhelper.cpp kernel/qplatformgraphicsbufferhelper.h
+        kernel/qplatforminputcontext.cpp kernel/qplatforminputcontext.h kernel/qplatforminputcontext_p.h
+        kernel/qplatforminputcontextfactory.cpp kernel/qplatforminputcontextfactory_p.h
+        kernel/qplatforminputcontextplugin.cpp kernel/qplatforminputcontextplugin_p.h
+        kernel/qplatformintegration.cpp kernel/qplatformintegration.h
+        kernel/qplatformintegrationfactory.cpp kernel/qplatformintegrationfactory_p.h
+        kernel/qplatformintegrationplugin.cpp kernel/qplatformintegrationplugin.h
+        kernel/qplatformmenu.cpp kernel/qplatformmenu.h
+        kernel/qplatformnativeinterface.cpp kernel/qplatformnativeinterface.h
+        kernel/qplatformoffscreensurface.cpp kernel/qplatformoffscreensurface.h
+        kernel/qplatformscreen.cpp kernel/qplatformscreen.h kernel/qplatformscreen_p.h
+        kernel/qplatformservices.cpp kernel/qplatformservices.h
+        kernel/qplatformsessionmanager.cpp kernel/qplatformsessionmanager.h
+        kernel/qplatformsharedgraphicscache.cpp kernel/qplatformsharedgraphicscache.h
+        kernel/qplatformsurface.cpp kernel/qplatformsurface.h
+        kernel/qplatformsystemtrayicon.cpp kernel/qplatformsystemtrayicon.h
+        kernel/qplatformtheme.cpp kernel/qplatformtheme.h kernel/qplatformtheme_p.h
+        kernel/qplatformthemefactory.cpp kernel/qplatformthemefactory_p.h
+        kernel/qplatformthemeplugin.cpp kernel/qplatformthemeplugin.h
+        kernel/qplatformwindow.cpp kernel/qplatformwindow.h kernel/qplatformwindow_p.h
+        kernel/qrasterwindow.cpp kernel/qrasterwindow.h
+        kernel/qscreen.cpp kernel/qscreen.h kernel/qscreen_p.h
+        kernel/qsessionmanager.cpp kernel/qsessionmanager.h kernel/qsessionmanager_p.h
+        kernel/qstylehints.cpp kernel/qstylehints.h
+        kernel/qsurface.cpp kernel/qsurface.h
+        kernel/qsurfaceformat.cpp kernel/qsurfaceformat.h
+        kernel/qtestsupport_gui.cpp kernel/qtestsupport_gui.h
+        kernel/qtguiglobal.h kernel/qtguiglobal_p.h
+        kernel/qtouchdevice.cpp kernel/qtouchdevice.h kernel/qtouchdevice_p.h
+        kernel/qwindow.cpp kernel/qwindow.h kernel/qwindow_p.h
+        kernel/qwindowdefs.h
+        kernel/qwindowsysteminterface.cpp kernel/qwindowsysteminterface.h kernel/qwindowsysteminterface_p.h
+        math3d/qgenericmatrix.cpp math3d/qgenericmatrix.h
+        math3d/qmatrix4x4.cpp math3d/qmatrix4x4.h
+        math3d/qquaternion.cpp math3d/qquaternion.h
+        math3d/qvector2d.cpp math3d/qvector2d.h
+        math3d/qvector3d.cpp math3d/qvector3d.h
+        math3d/qvector4d.cpp math3d/qvector4d.h
+        painting/qbackingstore.cpp painting/qbackingstore.h
+        painting/qbezier.cpp painting/qbezier_p.h
+        painting/qblendfunctions.cpp painting/qblendfunctions_p.h
+        painting/qblittable.cpp painting/qblittable_p.h
+        painting/qbrush.cpp painting/qbrush.h
+        painting/qcolor.cpp painting/qcolor.h painting/qcolor_p.h
+        painting/qcolormatrix_p.h
+        painting/qcolorspace.cpp painting/qcolorspace.h painting/qcolorspace_p.h
+        painting/qcolortransferfunction_p.h
+        painting/qcolortransfertable_p.h
+        painting/qcolortransform.cpp painting/qcolortransform.h painting/qcolortransform_p.h
+        painting/qcolortrc_p.h
+        painting/qcolortrclut.cpp painting/qcolortrclut_p.h
+        painting/qcompositionfunctions.cpp
+        painting/qcosmeticstroker.cpp painting/qcosmeticstroker_p.h
+        painting/qdatabuffer_p.h
+        painting/qdrawhelper_p.h
+        painting/qdrawhelper_x86_p.h
+        painting/qdrawingprimitive_sse2_p.h
+        painting/qemulationpaintengine.cpp painting/qemulationpaintengine_p.h
+        painting/qfixed_p.h
+        painting/qgrayraster.c painting/qgrayraster_p.h
+        painting/qicc.cpp painting/qicc_p.h
+        painting/qimagescale.cpp
+        painting/qmatrix.cpp painting/qmatrix.h
+        painting/qmemrotate.cpp painting/qmemrotate_p.h
+        painting/qoutlinemapper.cpp painting/qoutlinemapper_p.h
+        painting/qpagedpaintdevice.cpp painting/qpagedpaintdevice.h painting/qpagedpaintdevice_p.h
+        painting/qpagelayout.cpp painting/qpagelayout.h
+        painting/qpagesize.cpp painting/qpagesize.h
+        painting/qpaintdevice.cpp painting/qpaintdevice.h
+        painting/qpaintengine.cpp painting/qpaintengine.h painting/qpaintengine_p.h
+        painting/qpaintengine_blitter.cpp painting/qpaintengine_blitter_p.h
+        painting/qpaintengine_raster.cpp painting/qpaintengine_raster_p.h
+        painting/qpaintengineex.cpp painting/qpaintengineex_p.h
+        painting/qpainter.cpp painting/qpainter.h painting/qpainter_p.h
+        painting/qpainterpath.cpp painting/qpainterpath.h painting/qpainterpath_p.h
+        painting/qpathclipper.cpp painting/qpathclipper_p.h
+        painting/qpathsimplifier.cpp painting/qpathsimplifier_p.h
+        painting/qpdf.cpp painting/qpdf_p.h
+        painting/qpdfwriter.cpp painting/qpdfwriter.h
+        painting/qpen.cpp painting/qpen.h
+        painting/qplatformbackingstore.cpp painting/qplatformbackingstore.h
+        painting/qpolygon.cpp painting/qpolygon.h
+        painting/qpolygonclipper_p.h
+        painting/qrasterdefs_p.h
+        painting/qrasterizer.cpp painting/qrasterizer_p.h
+        painting/qrbtree_p.h
+        painting/qregion.cpp painting/qregion.h
+        painting/qrgb.h
+        painting/qrgba64.h painting/qrgba64_p.h
+        painting/qstroker.cpp painting/qstroker_p.h
+        painting/qtextureglyphcache.cpp painting/qtextureglyphcache_p.h
+        painting/qtransform.cpp painting/qtransform.h
+        painting/qtriangulatingstroker.cpp painting/qtriangulatingstroker_p.h
+        painting/qtriangulator.cpp painting/qtriangulator_p.h
+        painting/qvectorpath_p.h
+        rhi/qrhi.cpp rhi/qrhi_p.h
+        rhi/qrhi_p_p.h
+        rhi/qrhinull.cpp rhi/qrhinull_p.h
+        rhi/qrhinull_p_p.h
+        rhi/qrhiprofiler.cpp rhi/qrhiprofiler_p.h
+        rhi/qrhiprofiler_p_p.h
+        rhi/qshader.cpp rhi/qshader_p.h
+        rhi/qshader_p_p.h
+        rhi/qshaderdescription.cpp rhi/qshaderdescription_p.h
+        rhi/qshaderdescription_p_p.h
+        text/qabstracttextdocumentlayout.cpp text/qabstracttextdocumentlayout.h text/qabstracttextdocumentlayout_p.h
+        text/qdistancefield.cpp text/qdistancefield_p.h
+        text/qfont.cpp text/qfont.h text/qfont_p.h
+        text/qfontdatabase.cpp text/qfontdatabase.h
+        text/qfontengine.cpp text/qfontengine_p.h
+        text/qfontengine_qpf2.cpp
+        text/qfontengineglyphcache.cpp text/qfontengineglyphcache_p.h
+        text/qfontinfo.h
+        text/qfontmetrics.cpp text/qfontmetrics.h
+        text/qfontsubset.cpp text/qfontsubset_p.h
+        text/qfragmentmap.cpp text/qfragmentmap_p.h
+        text/qglyphrun.cpp text/qglyphrun.h text/qglyphrun_p.h
+        text/qinputcontrol.cpp text/qinputcontrol_p.h
+        text/qplatformfontdatabase.cpp text/qplatformfontdatabase.h
+        text/qrawfont.cpp text/qrawfont.h text/qrawfont_p.h
+        text/qstatictext.cpp text/qstatictext.h text/qstatictext_p.h
+        text/qsyntaxhighlighter.cpp text/qsyntaxhighlighter.h
+        text/qtextcursor.cpp text/qtextcursor.h text/qtextcursor_p.h
+        text/qtextdocument.cpp text/qtextdocument.h text/qtextdocument_p.cpp text/qtextdocument_p.h
+        text/qtextdocumentfragment.cpp text/qtextdocumentfragment.h text/qtextdocumentfragment_p.h
+        text/qtextdocumentlayout.cpp text/qtextdocumentlayout_p.h
+        text/qtextdocumentwriter.cpp text/qtextdocumentwriter.h
+        text/qtextengine.cpp text/qtextengine_p.h
+        text/qtextformat.cpp text/qtextformat.h text/qtextformat_p.h
+        text/qtexthtmlparser.cpp text/qtexthtmlparser_p.h
+        text/qtextimagehandler.cpp text/qtextimagehandler_p.h
+        text/qtextlayout.cpp text/qtextlayout.h
+        text/qtextlist.cpp text/qtextlist.h
+        text/qtextobject.cpp text/qtextobject.h text/qtextobject_p.h
+        text/qtextoption.cpp text/qtextoption.h
+        text/qtexttable.cpp text/qtexttable.h text/qtexttable_p.h
+        util/qabstractlayoutstyleinfo.cpp util/qabstractlayoutstyleinfo_p.h
+        util/qastchandler.cpp util/qastchandler_p.h
+        util/qdesktopservices.cpp util/qdesktopservices.h
+        util/qgridlayoutengine.cpp util/qgridlayoutengine_p.h
+        util/qhexstring_p.h
+        util/qktxhandler.cpp util/qktxhandler_p.h
+        util/qlayoutpolicy.cpp util/qlayoutpolicy_p.h
+        util/qpkmhandler.cpp util/qpkmhandler_p.h
+        util/qshaderformat.cpp util/qshaderformat_p.h
+        util/qshadergraph.cpp util/qshadergraph_p.h
+        util/qshadergraphloader.cpp util/qshadergraphloader_p.h
+        util/qshaderlanguage.cpp util/qshaderlanguage_p.h
+        util/qshadernode.cpp util/qshadernode_p.h
+        util/qshadernodeport.cpp util/qshadernodeport_p.h
+        util/qshadernodesloader.cpp util/qshadernodesloader_p.h
+        util/qtexturefiledata.cpp util/qtexturefiledata_p.h
+        util/qtexturefilehandler_p.h
+        util/qtexturefilereader.cpp util/qtexturefilereader_p.h
+        util/qvalidator.cpp util/qvalidator.h
+    DEFINES
+        QT_NO_FOREACH
+        QT_NO_USING_NAMESPACE
+    INCLUDE_DIRECTORIES
+        ../3rdparty/VulkanMemoryAllocator
+    LIBRARIES
+        Qt::CorePrivate
+    PUBLIC_LIBRARIES
+        Qt::Core
+    PRIVATE_MODULE_INTERFACE
+        Qt::CorePrivate
+    PRECOMPILED_HEADER
+        "kernel/qt_gui_pch.h"
+)
+
+# Resources:
+set_source_files_properties("painting/../../3rdparty/icc/sRGB2014.icc"
+    PROPERTIES QT_RESOURCE_ALIAS "sRGB2014.icc"
+)
+set(qpdf_resource_files
+    "../../3rdparty/icc/sRGB2014.icc"
+    "qpdfa_metadata.xml"
+)
+
+qt_add_resource(Gui "qpdf"
+    PREFIX
+        "/qpdf/"
+    BASE
+        "painting"
+    FILES
+        ${qpdf_resource_files}
+)
+
+if(QT_FEATURE_reduce_relocations AND UNIX AND GCC)
+    target_link_options(Gui PRIVATE
+                        "LINKER:--dynamic-list=${CMAKE_CURRENT_LIST_DIR}/QtGui.dynlist")
+endif()
+
+#### Keys ignored in scope 1:.:.:gui.pro:<TRUE>:
+# QMAKE_LIBS = "$$QMAKE_LIBS_GUI"
+
+## Scopes:
+#####################################################################
+
+qt_extend_target(Gui CONDITION QT_FEATURE_opengl
+    SOURCES
+        kernel/qopenglcontext.cpp kernel/qopenglcontext.h kernel/qopenglcontext_p.h
+        kernel/qplatformopenglcontext.cpp kernel/qplatformopenglcontext.h
+        opengl/qopengl.cpp opengl/qopengl.h opengl/qopengl_p.h
+        opengl/qopenglextensions_p.h
+        opengl/qopenglextrafunctions.h
+        opengl/qopenglfunctions.cpp opengl/qopenglfunctions.h
+        opengl/qopenglprogrambinarycache.cpp opengl/qopenglprogrambinarycache_p.h
+        opengl/qopenglversionfunctions.cpp opengl/qopenglversionfunctions.h
+        opengl/qopenglversionfunctionsfactory.cpp opengl/qopenglversionfunctionsfactory_p.h
+        opengl/qopenglversionprofile.cpp opengl/qopenglversionprofile.h
+        rhi/qrhigles2.cpp rhi/qrhigles2_p.h
+        rhi/qrhigles2_p_p.h
+)
+
+#### Keys ignored in scope 2:.:.:gui.pro:QT_FEATURE_opengl:
+# MODULE_CONFIG = "opengl"
+
+#### Keys ignored in scope 3:.:.:gui.pro:QT_FEATURE_angle:
+# MODULE_AUX_INCLUDES = "\$\$QT_MODULE_INCLUDE_BASE/QtANGLE"
+
+qt_extend_target(Gui CONDITION APPLE_OSX
+    LIBRARIES
+        ${FWAppKit}
+    PUBLIC_LIBRARIES
+        ${FWAppKit}
+)
+
+qt_extend_target(Gui CONDITION APPLE
+    SOURCES
+        image/qimage_darwin.mm
+        painting/qcoregraphics.mm painting/qcoregraphics_p.h
+    LIBRARIES
+        ${FWCoreGraphics}
+)
+
+qt_extend_target(Gui CONDITION QT_FEATURE_animation
+    SOURCES
+        animation/qguivariantanimation.cpp
+)
+
+qt_extend_target(Gui CONDITION WIN32
+    SOURCES
+        kernel/qwindowdefs_win.h
+        rhi/qrhid3d11.cpp rhi/qrhid3d11_p.h
+        rhi/qrhid3d11_p_p.h
+    PUBLIC_LIBRARIES
+        d3d11
+        dxgi
+        dxguid
+)
+
+#### Keys ignored in scope 8:.:.:gui.pro:WIN32:
+# CMAKE_WINDOWS_BUILD = "True"
+
+#### Keys ignored in scope 11:.:.:gui.pro:QT_FEATURE_egl:
+# CMAKE_EGL_LIBS = "$$cmakeProcessLibs($$QMAKE_LIBS_EGL)"
+
+#### Keys ignored in scope 12:.:.:gui.pro:NOT QMAKE_LIBDIR_EGL_ISEMPTY:
+# CMAKE_EGL_LIBDIR = "$$cmakeTargetPath($$QMAKE_LIBDIR_EGL)"
+
+#### Keys ignored in scope 13:.:.:gui.pro:QT_FEATURE_opengles2:
+# CMAKE_GL_HEADER_NAME = "GLES2/gl2.h"
+# CMAKE_OPENGL_INCDIRS = "$$cmakePortablePaths($$QMAKE_INCDIR_OPENGL_ES2)"
+# CMAKE_OPENGL_LIBS = "$$cmakeProcessLibs($$QMAKE_LIBS_OPENGL_ES2)"
+# CMAKE_QT_OPENGL_IMPLEMENTATION = "GLESv2"
+
+#### Keys ignored in scope 14:.:.:gui.pro:NOT QMAKE_INCDIR_OPENGL_ES2_ISEMPTY:
+# CMAKE_GL_INCDIRS = "$$cmakeTargetPaths($$QMAKE_INCDIR_OPENGL_ES2)"
+
+#### Keys ignored in scope 15:.:.:gui.pro:NOT QMAKE_LIBDIR_OPENGL_ES2_ISEMPTY:
+# CMAKE_OPENGL_LIBDIR = "$$cmakePortablePaths($$QMAKE_LIBDIR_OPENGL_ES2)"
+
+#### Keys ignored in scope 17:.:.:gui.pro:QT_FEATURE_opengl:
+# CMAKE_GL_HEADER_NAME = "GL/gl.h"
+# CMAKE_OPENGL_INCDIRS = "$$cmakePortablePaths($$QMAKE_INCDIR_OPENGL)"
+# CMAKE_QT_OPENGL_IMPLEMENTATION = "GL"
+
+#### Keys ignored in scope 18:.:.:gui.pro:NOT QMAKE_INCDIR_OPENGL_ISEMPTY:
+# CMAKE_GL_INCDIRS = "$$cmakeTargetPaths($$QMAKE_INCDIR_OPENGL)"
+
+#### Keys ignored in scope 19:.:.:gui.pro:NOT QT_FEATURE_dynamicgl:
+# CMAKE_OPENGL_LIBS = "$$cmakeProcessLibs($$QMAKE_LIBS_OPENGL)"
+
+#### Keys ignored in scope 20:.:.:gui.pro:NOT QMAKE_LIBDIR_OPENGL_ISEMPTY:
+# CMAKE_OPENGL_LIBDIR = "$$cmakePortablePaths($$QMAKE_LIBDIR_OPENGL)"
+
+#### Keys ignored in scope 21:.:.:gui.pro:APPLE:
+# CMAKE_GL_HEADER_NAME = "gl.h"
+
+#### Keys ignored in scope 22:.:.:gui.pro:QT_FEATURE_egl:
+# CMAKE_EGL_INCDIRS = "$$cmakePortablePaths($$QMAKE_INCDIR_EGL)"
+
+qt_extend_target(Gui CONDITION QT_FEATURE_accessibility
+    SOURCES
+        accessible/qaccessible.cpp accessible/qaccessible.h
+        accessible/qaccessiblebridge.cpp accessible/qaccessiblebridge.h
+        accessible/qaccessiblecache.cpp accessible/qaccessiblecache_p.h
+        accessible/qaccessibleobject.cpp accessible/qaccessibleobject.h
+        accessible/qaccessibleplugin.cpp accessible/qaccessibleplugin.h
+        accessible/qplatformaccessibility.cpp accessible/qplatformaccessibility.h
+)
+
+qt_extend_target(Gui CONDITION APPLE AND QT_FEATURE_accessibility
+    SOURCES
+        accessible/qaccessiblecache_mac.mm
+    LIBRARIES
+        ${FWFoundation}
+)
+
+qt_extend_target(Gui CONDITION QT_FEATURE_action
+    SOURCES
+        kernel/qguiaction.cpp kernel/qguiaction.h kernel/qguiaction_p.h
+        kernel/qguiactiongroup.cpp kernel/qguiactiongroup.h kernel/qguiactiongroup_p.h
+)
+
+qt_extend_target(Gui CONDITION QT_FEATURE_draganddrop
+    SOURCES
+        kernel/qdnd.cpp kernel/qdnd_p.h
+        kernel/qdrag.cpp kernel/qdrag.h
+        kernel/qplatformdrag.cpp kernel/qplatformdrag.h
+        kernel/qshapedpixmapdndwindow.cpp kernel/qshapedpixmapdndwindow_p.h
+        kernel/qsimpledrag.cpp kernel/qsimpledrag_p.h
+)
+
+qt_extend_target(Gui CONDITION QT_FEATURE_shortcut
+    SOURCES
+        kernel/qguishortcut.cpp kernel/qguishortcut.h kernel/qguishortcut_p.h
+        kernel/qkeysequence.cpp kernel/qkeysequence.h kernel/qkeysequence_p.h
+        kernel/qshortcutmap.cpp kernel/qshortcutmap_p.h
+)
+
+qt_extend_target(Gui CONDITION QT_FEATURE_movie
+    SOURCES
+        image/qmovie.cpp image/qmovie.h
+)
+
+qt_extend_target(Gui CONDITION WIN32 AND NOT WINRT
+    SOURCES
+        image/qpixmap_win.cpp
+)
+
+qt_extend_target(Gui CONDITION QT_FEATURE_png
+    SOURCES
+        image/qpnghandler.cpp image/qpnghandler_p.h
+    LIBRARIES
+        WrapPNG::WrapPNG
+)
+
+#### Keys ignored in scope 38:.:image:image/image.pri:WIN32 AND mingw:
+# GCC_VERSION = "$${QMAKE_GCC_MAJOR_VERSION}.$${QMAKE_GCC_MINOR_VERSION}.$${QMAKE_GCC_PATCH_VERSION}"
+
+qt_extend_target(Gui CONDITION ((QT_FEATURE_png) AND (WIN32 AND mingw)) AND (GCC_VERSION___equals___8.1.0)
+    COMPILE_OPTIONS
+        -fno-reorder-blocks-and-partition
+)
+
+if(NOT ANDROID)
+    qt_add_simd_part(Gui SIMD sse2
+        SOURCES
+            painting/qdrawhelper_sse2.cpp
+    )
+
+    qt_add_simd_part(Gui SIMD ssse3
+        SOURCES
+            image/qimage_ssse3.cpp
+            painting/qdrawhelper_ssse3.cpp
+    )
+
+    qt_add_simd_part(Gui SIMD sse4_1
+        SOURCES
+            painting/qdrawhelper_sse4.cpp
+            painting/qimagescale_sse4.cpp
+    )
+
+    qt_add_simd_part(Gui SIMD neon
+        SOURCES
+            image/qimage_neon.cpp
+            painting/qdrawhelper_neon.cpp painting/qdrawhelper_neon_p.h
+            painting/qimagescale_neon.cpp
+    )
+
+    qt_add_simd_part(Gui SIMD mips_dsp
+        SOURCES
+            painting/qdrawhelper_mips_dsp.cpp painting/qdrawhelper_mips_dsp_p.h
+            painting/qdrawhelper_mips_dsp_asm.S
+            painting/qt_mips_asm_dsp_p.h
+    )
+
+    qt_add_simd_part(Gui SIMD mips_dspr2
+        SOURCES
+            image/qimage_mips_dspr2.cpp
+            image/qimage_mips_dspr2_asm.S
+            painting/qdrawhelper_mips_dspr2_asm.S
+    )
+
+    qt_add_simd_part(Gui SIMD arch_haswell
+        SOURCES
+            painting/qdrawhelper_avx2.cpp
+    )
+endif()
+
+qt_extend_target(Gui CONDITION (NOT (NOT ANDROID)) AND (TEST_architecture_arch STREQUAL arm64 ORTEST_architecture_arch STREQUAL arm)
+    SOURCES
+        image/qimage_neon.cpp
+        painting/qdrawhelper_neon.cpp painting/qdrawhelper_neon_p.h
+        painting/qimagescale_neon.cpp
+)
+
+qt_extend_target(Gui CONDITION ANDROID AND (TEST_architecture_arch STREQUAL i386 OR TEST_architecture_arch STREQUAL x86_64)
+    SOURCES
+        image/qimage_ssse3.cpp
+        painting/qdrawhelper_sse2.cpp
+        painting/qdrawhelper_ssse3.cpp
+    DEFINES
+        QT_COMPILER_SUPPORTS_SSE2 QT_COMPILER_SUPPORTS_SSE2
+        QT_COMPILER_SUPPORTS_SSE3 QT_COMPILER_SUPPORTS_SSE3
+        QT_COMPILER_SUPPORTS_SSSE3 QT_COMPILER_SUPPORTS_SSSE3
+)
+
+qt_extend_target(Gui CONDITION QT_FEATURE_harfbuzz
+    SOURCES
+        text/qharfbuzzng.cpp text/qharfbuzzng_p.h
+    LIBRARIES
+        WrapHarfbuzz::WrapHarfbuzz
+)
+
+qt_extend_target(Gui CONDITION QT_FEATURE_textodfwriter
+    SOURCES
+        text/qtextodfwriter.cpp text/qtextodfwriter_p.h
+        text/qzip.cpp
+        text/qzipreader_p.h
+        text/qzipwriter_p.h
+)
+
+qt_extend_target(Gui CONDITION QT_FEATURE_textmarkdownreader
+    SOURCES
+        text/qtextmarkdownimporter.cpp text/qtextmarkdownimporter_p.h
+)
+
+qt_extend_target(Gui CONDITION QT_FEATURE_system_textmarkdownreader AND QT_FEATURE_textmarkdownreader
+    LIBRARIES
+        libmd4c
+)
+
+qt_extend_target(Gui CONDITION QT_FEATURE_textmarkdownreader AND NOT QT_FEATURE_system_textmarkdownreader
+    SOURCES
+        ../3rdparty/md4c/md4c.c ../3rdparty/md4c/md4c.h
+    DEFINES
+        MD4C_USE_UTF8
+    INCLUDE_DIRECTORIES
+        ../3rdparty/md4c
+)
+
+qt_extend_target(Gui CONDITION QT_FEATURE_textmarkdownwriter
+    SOURCES
+        text/qtextmarkdownwriter.cpp text/qtextmarkdownwriter_p.h
+)
+
+qt_extend_target(Gui CONDITION QT_FEATURE_cssparser
+    SOURCES
+        painting/qcssutil.cpp
+        text/qcssparser.cpp text/qcssparser_p.h
+)
+
+qt_extend_target(Gui CONDITION UNIX AND NOT ANDROID AND NOT APPLE_UIKIT AND NOT INTEGRITY AND NOT (TEST_architecture_arch STREQUAL "arm64")
+    DEFINES
+        ENABLE_PIXMAN_DRAWHELPERS
+)
+
+if(UNIX AND NOT ANDROID AND NOT APPLE_UIKIT AND NOT INTEGRITY AND NOT (TEST_architecture_arch STREQUAL "arm64"))
+    qt_add_simd_part(Gui SIMD neon
+        SOURCES
+            ../3rdparty/pixman/pixman-arm-neon-asm.S
+            painting/qdrawhelper_neon_asm.S
+    )
+endif()
+
+qt_extend_target(Gui CONDITION ANDROID AND TEST_architecture_arch STREQUAL x86_64
+    SOURCES
+        painting/qdrawhelper_sse4.cpp
+        painting/qimagescale_sse4.cpp
+    DEFINES
+        QT_COMPILER_SUPPORTS_SSE4_1
+        QT_COMPILER_SUPPORTS_SSE4_2
+)
+
+qt_extend_target(Gui CONDITION QT_FEATURE_system_zlib
+    LIBRARIES
+        ZLIB::ZLIB
+)
+
+qt_extend_target(Gui CONDITION NOT QT_FEATURE_system_zlib
+    INCLUDE_DIRECTORIES
+        ../3rdparty/zlib/src
+)
+
+qt_extend_target(Gui CONDITION NOT QT_FEATURE_system_zlib AND NOT no_core_dep
+    LIBRARIES
+        Qt::Core
+)
+
+qt_extend_target(Gui CONDITION QT_FEATURE_regularexpression
+    SOURCES
+        util/qshadergenerator.cpp util/qshadergenerator_p.h
+)
+
+qt_extend_target(Gui CONDITION QT_FEATURE_opengl AND NOT QT_FEATURE_opengles2
+    SOURCES
+        opengl/qopenglfunctions_1_0.cpp opengl/qopenglfunctions_1_0.h
+        opengl/qopenglfunctions_1_1.cpp opengl/qopenglfunctions_1_1.h
+        opengl/qopenglfunctions_1_2.cpp opengl/qopenglfunctions_1_2.h
+        opengl/qopenglfunctions_1_3.cpp opengl/qopenglfunctions_1_3.h
+        opengl/qopenglfunctions_1_4.cpp opengl/qopenglfunctions_1_4.h
+        opengl/qopenglfunctions_1_5.cpp opengl/qopenglfunctions_1_5.h
+        opengl/qopenglfunctions_2_0.cpp opengl/qopenglfunctions_2_0.h
+        opengl/qopenglfunctions_2_1.cpp opengl/qopenglfunctions_2_1.h
+        opengl/qopenglfunctions_3_0.cpp opengl/qopenglfunctions_3_0.h
+        opengl/qopenglfunctions_3_1.cpp opengl/qopenglfunctions_3_1.h
+        opengl/qopenglfunctions_3_2_compatibility.cpp opengl/qopenglfunctions_3_2_compatibility.h
+        opengl/qopenglfunctions_3_2_core.cpp opengl/qopenglfunctions_3_2_core.h
+        opengl/qopenglfunctions_3_3_compatibility.cpp opengl/qopenglfunctions_3_3_compatibility.h
+        opengl/qopenglfunctions_3_3_core.cpp opengl/qopenglfunctions_3_3_core.h
+        opengl/qopenglfunctions_4_0_compatibility.cpp opengl/qopenglfunctions_4_0_compatibility.h
+        opengl/qopenglfunctions_4_0_core.cpp opengl/qopenglfunctions_4_0_core.h
+        opengl/qopenglfunctions_4_1_compatibility.cpp opengl/qopenglfunctions_4_1_compatibility.h
+        opengl/qopenglfunctions_4_1_core.cpp opengl/qopenglfunctions_4_1_core.h
+        opengl/qopenglfunctions_4_2_compatibility.cpp opengl/qopenglfunctions_4_2_compatibility.h
+        opengl/qopenglfunctions_4_2_core.cpp opengl/qopenglfunctions_4_2_core.h
+        opengl/qopenglfunctions_4_3_compatibility.cpp opengl/qopenglfunctions_4_3_compatibility.h
+        opengl/qopenglfunctions_4_3_core.cpp opengl/qopenglfunctions_4_3_core.h
+        opengl/qopenglfunctions_4_4_compatibility.cpp opengl/qopenglfunctions_4_4_compatibility.h
+        opengl/qopenglfunctions_4_4_core.cpp opengl/qopenglfunctions_4_4_core.h
+        opengl/qopenglfunctions_4_5_compatibility.cpp opengl/qopenglfunctions_4_5_compatibility.h
+        opengl/qopenglfunctions_4_5_core.cpp opengl/qopenglfunctions_4_5_core.h
+)
+
+qt_extend_target(Gui CONDITION QT_FEATURE_opengl AND QT_FEATURE_opengles2
+    SOURCES
+        opengl/qopenglfunctions_es2.cpp opengl/qopenglfunctions_es2.h
+)
+
+qt_extend_target(Gui CONDITION QT_FEATURE_vulkan
+    SOURCES
+        rhi/qrhivulkan.cpp rhi/qrhivulkan_p.h
+        rhi/qrhivulkan_p_p.h
+        vulkan/qplatformvulkaninstance.cpp vulkan/qplatformvulkaninstance.h
+        vulkan/qvulkanfunctions.cpp
+        vulkan/qvulkaninstance.cpp vulkan/qvulkaninstance.h
+        vulkan/qvulkanwindow.cpp vulkan/qvulkanwindow.h vulkan/qvulkanwindow_p.h
+    PUBLIC_LIBRARIES
+        Vulkan::Vulkan_nolink
+)
+
+#### Keys ignored in scope 82:.:vulkan:vulkan/vulkan.pri:QT_FEATURE_vkgen:
+# QMAKE_EXTRA_COMPILERS = "qvkgen_h" "qvkgen_ph" "qvkgen_pimpl"
+# QMAKE_QVKGEN_INPUT = "vulkan/vk.xml"
+# QMAKE_QVKGEN_LICENSE_HEADER = "$$QT_SOURCE_TREE/header.LGPL"
+# qvkgen_h.commands = "$$QMAKE_QVKGEN" "${QMAKE_FILE_IN}" "$$shell_quote($$QMAKE_QVKGEN_LICENSE_HEADER)" "${QMAKE_FILE_OUT_PATH}/${QMAKE_FILE_OUT_BASE}"
+# qvkgen_h.input = "QMAKE_QVKGEN_INPUT"
+# qvkgen_h.output = "$$OUT_PWD/vulkan/qvulkanfunctions.h"
+# qvkgen_ph.commands = "$$escape_expand(\\n)"
+# qvkgen_ph.depends = "$$OUT_PWD/vulkan/qvulkanfunctions.h"
+# qvkgen_ph.input = "QMAKE_QVKGEN_INPUT"
+# qvkgen_ph.output = "$$OUT_PWD/vulkan/qvulkanfunctions_p.h"
+# qvkgen_pimpl.commands = "$$escape_expand(\\n)"
+# qvkgen_pimpl.depends = "$$OUT_PWD/vulkan/qvulkanfunctions_p.h"
+# qvkgen_pimpl.input = "QMAKE_QVKGEN_INPUT"
+# qvkgen_pimpl.output = "$$OUT_PWD/vulkan/qvulkanfunctions_p.cpp"
+
+#### Keys ignored in scope 83:.:vulkan:vulkan/vulkan.pri:QT_FEATURE_vulkan:
+# qvkgen_h.variable_out = "HEADERS"
+
+#### Keys ignored in scope 84:.:vulkan:vulkan/vulkan.pri:else:
+# qvkgen_h.CONFIG = "target_predeps" "no_link"
+
+qt_extend_target(Gui CONDITION WASM
+    SOURCES
+        platform/wasm/qwasmlocalfileaccess.cpp platform/wasm/qwasmlocalfileaccess_p.h
+)
+
+qt_extend_target(Gui CONDITION APPLE_IOS OR APPLE_OSX
+    SOURCES
+        rhi/qrhimetal.mm rhi/qrhimetal_p.h
+        rhi/qrhimetal_p_p.h
+    PUBLIC_LIBRARIES
+        ${FWMetal}
+)
+
+qt_extend_target(Gui CONDITION NOT GCC OR NOT QT_COMPILER_VERSION_MAJOR STREQUAL 5
+    SOURCES
+        painting/qdrawhelper.cpp
+    NO_PCH_SOURCES
+        "painting/qdrawhelper.cpp"
+)
+
+
+qt_create_tracepoints(Gui qtgui.tracepoints)
+qt_add_docs(Gui
+    doc/qtgui.qdocconf
+)
+
diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
new file mode 100644
index 0000000000..b3108529c2
--- /dev/null
+++ b/src/gui/CMakeLists.txt
@@ -0,0 +1,801 @@
+# Generated from gui.pro.
+
+set(OpenGL_GL_PREFERENCE GLVND) # special case:
+
+#####################################################################
+## Gui Module:
+#####################################################################
+
+# special case begin
+qt_find_package(X11_XCB)
+qt_find_package(WrapHarfbuzz PROVIDED_TARGETS WrapHarfbuzz::WrapHarfbuzz)
+qt_find_package(WrapPNG PROVIDED_TARGETS WrapPNG::WrapPNG)
+
+if (QT_FEATURE_gui)
+    if (WINRT)
+        set(_default_platform "winrt")
+    elseif(WIN32)
+        set(_default_platform "windows")
+    elseif(ANDROID)
+        set(_default_platform "android")
+    elseif(APPLE_OSX)
+        set(_default_platform "cocoa")
+    elseif(APPLE_TVOS OR APPLE_IOS)
+        set(_default_platform "ios")
+    elseif(APPLE_WATCHOS)
+        set(_default_platform "minimal")
+    elseif(QNX)
+        set(_default_platform "qnx")
+    elseif(INTEGRITY)
+        set(_default_platform "integrityfb")
+    elseif(HAIKU)
+        set(_default_platform "haiku")
+    elseif(WASM)
+        set(_default_platform "wasm")
+    else()
+        set(_default_platform "xcb")
+    endif()
+
+    set(QT_QPA_DEFAULT_PLATFORM "${_default_platform}" CACHE STRING "QPA default platform")
+endif()
+
+if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
+    set_source_files_properties(../3rdparty/md4c/md4c.c PROPERTIES COMPILE_FLAGS "-Wno-error=unused-parameter -Wno-error=sign-compare -Wno-error=missing-field-initializers")
+elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "AppleClang")
+    set_source_files_properties(../3rdparty/md4c/md4c.c PROPERTIES COMPILE_FLAGS "-Wno-error=unused-parameter -Wno-error=sign-compare -Wno-error=missing-field-initializers -Wno-error=missing-braces")
+endif()
+
+# special case end
+
+qt_add_module(Gui
+    GENERATE_METATYPES
+    PLUGIN_TYPES platforms platforms/darwin xcbglintegrations platformthemes platforminputcontexts generic iconengines imageformats egldeviceintegrations
+    FEATURE_DEPENDENCIES  # special case:
+        Qt::Network # special case:
+    SOURCES
+        image/qbitmap.cpp image/qbitmap.h
+        image/qbmphandler.cpp image/qbmphandler_p.h
+        image/qicon.cpp image/qicon.h image/qicon_p.h
+        image/qiconengine.cpp image/qiconengine.h
+        image/qiconengineplugin.cpp image/qiconengineplugin.h
+        image/qiconloader.cpp image/qiconloader_p.h
+        image/qimage.cpp image/qimage.h image/qimage_p.h
+        image/qimage_conversions.cpp
+        image/qimageiohandler.cpp image/qimageiohandler.h
+        image/qimagepixmapcleanuphooks.cpp image/qimagepixmapcleanuphooks_p.h
+        image/qimagereader.cpp image/qimagereader.h
+        image/qimagereaderwriterhelpers.cpp image/qimagereaderwriterhelpers_p.h
+        image/qimagewriter.cpp image/qimagewriter.h
+        image/qpaintengine_pic.cpp image/qpaintengine_pic_p.h
+        image/qpicture.cpp image/qpicture.h image/qpicture_p.h
+        image/qpixmap.cpp image/qpixmap.h
+        image/qpixmap_blitter.cpp image/qpixmap_blitter_p.h
+        image/qpixmap_raster.cpp image/qpixmap_raster_p.h
+        image/qpixmapcache.cpp image/qpixmapcache.h image/qpixmapcache_p.h
+        image/qplatformpixmap.cpp image/qplatformpixmap.h
+        image/qppmhandler.cpp image/qppmhandler_p.h
+        image/qxbmhandler.cpp image/qxbmhandler_p.h
+        image/qxpmhandler.cpp image/qxpmhandler_p.h
+        # itemmodels/qstandarditemmodel.cpp itemmodels/qstandarditemmodel.h itemmodels/qstandarditemmodel_p.h # special case
+        kernel/qclipboard.cpp kernel/qclipboard.h
+        kernel/qcursor.cpp kernel/qcursor.h kernel/qcursor_p.h
+        kernel/qevent.cpp kernel/qevent.h kernel/qevent_p.h
+        kernel/qgenericplugin.cpp kernel/qgenericplugin.h
+        kernel/qgenericpluginfactory.cpp kernel/qgenericpluginfactory.h
+        kernel/qguiapplication.cpp kernel/qguiapplication.h kernel/qguiapplication_p.h
+        kernel/qguivariant.cpp
+        kernel/qhighdpiscaling.cpp kernel/qhighdpiscaling_p.h
+        kernel/qinputdevicemanager.cpp kernel/qinputdevicemanager_p.h
+        kernel/qinputdevicemanager_p_p.h
+        kernel/qinputmethod.cpp kernel/qinputmethod.h kernel/qinputmethod_p.h
+        kernel/qinternalmimedata.cpp kernel/qinternalmimedata_p.h
+        kernel/qkeymapper.cpp kernel/qkeymapper_p.h
+        kernel/qoffscreensurface.cpp kernel/qoffscreensurface.h
+        kernel/qpaintdevicewindow.cpp kernel/qpaintdevicewindow.h kernel/qpaintdevicewindow_p.h
+        kernel/qpalette.cpp kernel/qpalette.h
+        kernel/qpixelformat.cpp kernel/qpixelformat.h
+        kernel/qplatformclipboard.cpp kernel/qplatformclipboard.h
+        kernel/qplatformcursor.cpp kernel/qplatformcursor.h
+        kernel/qplatformdialoghelper.cpp kernel/qplatformdialoghelper.h
+        kernel/qplatformgraphicsbuffer.cpp kernel/qplatformgraphicsbuffer.h
+        kernel/qplatformgraphicsbufferhelper.cpp kernel/qplatformgraphicsbufferhelper.h
+        kernel/qplatforminputcontext.cpp kernel/qplatforminputcontext.h kernel/qplatforminputcontext_p.h
+        kernel/qplatforminputcontextfactory.cpp kernel/qplatforminputcontextfactory_p.h
+        kernel/qplatforminputcontextplugin.cpp kernel/qplatforminputcontextplugin_p.h
+        kernel/qplatformintegration.cpp kernel/qplatformintegration.h
+        kernel/qplatformintegrationfactory.cpp kernel/qplatformintegrationfactory_p.h
+        kernel/qplatformintegrationplugin.cpp kernel/qplatformintegrationplugin.h
+        kernel/qplatformmenu.cpp kernel/qplatformmenu.h
+        kernel/qplatformnativeinterface.cpp kernel/qplatformnativeinterface.h
+        kernel/qplatformoffscreensurface.cpp kernel/qplatformoffscreensurface.h
+        kernel/qplatformscreen.cpp kernel/qplatformscreen.h kernel/qplatformscreen_p.h
+        kernel/qplatformservices.cpp kernel/qplatformservices.h
+        kernel/qplatformsessionmanager.cpp kernel/qplatformsessionmanager.h
+        kernel/qplatformsharedgraphicscache.cpp kernel/qplatformsharedgraphicscache.h
+        kernel/qplatformsurface.cpp kernel/qplatformsurface.h
+        kernel/qplatformsystemtrayicon.cpp kernel/qplatformsystemtrayicon.h
+        kernel/qplatformtheme.cpp kernel/qplatformtheme.h kernel/qplatformtheme_p.h
+        kernel/qplatformthemefactory.cpp kernel/qplatformthemefactory_p.h
+        kernel/qplatformthemeplugin.cpp kernel/qplatformthemeplugin.h
+        kernel/qplatformwindow.cpp kernel/qplatformwindow.h kernel/qplatformwindow_p.h
+        kernel/qrasterwindow.cpp kernel/qrasterwindow.h
+        kernel/qscreen.cpp kernel/qscreen.h kernel/qscreen_p.h
+        kernel/qsessionmanager.cpp kernel/qsessionmanager.h kernel/qsessionmanager_p.h
+        kernel/qstylehints.cpp kernel/qstylehints.h
+        kernel/qsurface.cpp kernel/qsurface.h
+        kernel/qsurfaceformat.cpp kernel/qsurfaceformat.h
+        kernel/qtestsupport_gui.cpp kernel/qtestsupport_gui.h
+        kernel/qtguiglobal.h kernel/qtguiglobal_p.h
+        kernel/qtouchdevice.cpp kernel/qtouchdevice.h kernel/qtouchdevice_p.h
+        kernel/qwindow.cpp kernel/qwindow.h kernel/qwindow_p.h
+        kernel/qwindowdefs.h
+        kernel/qwindowsysteminterface.cpp kernel/qwindowsysteminterface.h kernel/qwindowsysteminterface_p.h
+        math3d/qgenericmatrix.cpp math3d/qgenericmatrix.h
+        math3d/qmatrix4x4.cpp math3d/qmatrix4x4.h
+        math3d/qquaternion.cpp math3d/qquaternion.h
+        math3d/qvector2d.cpp math3d/qvector2d.h
+        math3d/qvector3d.cpp math3d/qvector3d.h
+        math3d/qvector4d.cpp math3d/qvector4d.h
+        painting/qbackingstore.cpp painting/qbackingstore.h
+        painting/qbezier.cpp painting/qbezier_p.h
+        painting/qblendfunctions.cpp painting/qblendfunctions_p.h
+        painting/qblittable.cpp painting/qblittable_p.h
+        painting/qbrush.cpp painting/qbrush.h
+        painting/qcolor.cpp painting/qcolor.h painting/qcolor_p.h
+        painting/qcolormatrix_p.h
+        painting/qcolorspace.cpp painting/qcolorspace.h painting/qcolorspace_p.h
+        painting/qcolortransferfunction_p.h
+        painting/qcolortransfertable_p.h
+        painting/qcolortransform.cpp painting/qcolortransform.h painting/qcolortransform_p.h
+        painting/qcolortrc_p.h
+        painting/qcolortrclut.cpp painting/qcolortrclut_p.h
+        painting/qcompositionfunctions.cpp
+        painting/qcosmeticstroker.cpp painting/qcosmeticstroker_p.h
+        painting/qdatabuffer_p.h
+        painting/qdrawhelper_p.h
+        painting/qdrawhelper_x86_p.h
+        painting/qdrawingprimitive_sse2_p.h
+        painting/qemulationpaintengine.cpp painting/qemulationpaintengine_p.h
+        painting/qfixed_p.h
+        painting/qgrayraster.c painting/qgrayraster_p.h
+        painting/qicc.cpp painting/qicc_p.h
+        painting/qimagescale.cpp
+        painting/qmemrotate.cpp painting/qmemrotate_p.h
+        painting/qoutlinemapper.cpp painting/qoutlinemapper_p.h
+        painting/qpagedpaintdevice.cpp painting/qpagedpaintdevice.h painting/qpagedpaintdevice_p.h
+        painting/qpagelayout.cpp painting/qpagelayout.h
+        painting/qpagesize.cpp painting/qpagesize.h
+        painting/qpaintdevice.cpp painting/qpaintdevice.h
+        painting/qpaintengine.cpp painting/qpaintengine.h painting/qpaintengine_p.h
+        painting/qpaintengine_blitter.cpp painting/qpaintengine_blitter_p.h
+        painting/qpaintengine_raster.cpp painting/qpaintengine_raster_p.h
+        painting/qpaintengineex.cpp painting/qpaintengineex_p.h
+        painting/qpainter.cpp painting/qpainter.h painting/qpainter_p.h
+        painting/qpainterpath.cpp painting/qpainterpath.h painting/qpainterpath_p.h
+        painting/qpathclipper.cpp painting/qpathclipper_p.h
+        painting/qpathsimplifier.cpp painting/qpathsimplifier_p.h
+        painting/qpdf.cpp painting/qpdf_p.h
+        painting/qpdfwriter.cpp painting/qpdfwriter.h
+        painting/qpen.cpp painting/qpen.h
+        painting/qplatformbackingstore.cpp painting/qplatformbackingstore.h
+        painting/qpolygon.cpp painting/qpolygon.h
+        painting/qpolygonclipper_p.h
+        painting/qrasterdefs_p.h
+        painting/qrasterizer.cpp painting/qrasterizer_p.h
+        painting/qrbtree_p.h
+        painting/qregion.cpp painting/qregion.h
+        painting/qrgb.h
+        painting/qrgba64.h painting/qrgba64_p.h
+        painting/qstroker.cpp painting/qstroker_p.h
+        painting/qtextureglyphcache.cpp painting/qtextureglyphcache_p.h
+        painting/qtransform.cpp painting/qtransform.h
+        painting/qtriangulatingstroker.cpp painting/qtriangulatingstroker_p.h
+        painting/qtriangulator.cpp painting/qtriangulator_p.h
+        painting/qvectorpath_p.h
+        rhi/qrhi.cpp rhi/qrhi_p.h
+        rhi/qrhi_p_p.h
+        rhi/qrhinull.cpp rhi/qrhinull_p.h
+        rhi/qrhinull_p_p.h
+        rhi/qrhiprofiler.cpp rhi/qrhiprofiler_p.h
+        rhi/qrhiprofiler_p_p.h
+        rhi/qshader.cpp rhi/qshader_p.h
+        rhi/qshader_p_p.h
+        rhi/qshaderdescription.cpp rhi/qshaderdescription_p.h
+        rhi/qshaderdescription_p_p.h
+        text/qabstracttextdocumentlayout.cpp text/qabstracttextdocumentlayout.h text/qabstracttextdocumentlayout_p.h
+        text/qdistancefield.cpp text/qdistancefield_p.h
+        text/qfont.cpp text/qfont.h text/qfont_p.h
+        text/qfontdatabase.cpp text/qfontdatabase.h
+        text/qfontengine.cpp text/qfontengine_p.h
+        text/qfontengine_qpf2.cpp
+        text/qfontengineglyphcache.cpp text/qfontengineglyphcache_p.h
+        text/qfontinfo.h
+        text/qfontmetrics.cpp text/qfontmetrics.h
+        text/qfontsubset.cpp text/qfontsubset_p.h
+        text/qfragmentmap.cpp text/qfragmentmap_p.h
+        text/qglyphrun.cpp text/qglyphrun.h text/qglyphrun_p.h
+        text/qinputcontrol.cpp text/qinputcontrol_p.h
+        text/qplatformfontdatabase.cpp text/qplatformfontdatabase.h
+        text/qrawfont.cpp text/qrawfont.h text/qrawfont_p.h
+        text/qstatictext.cpp text/qstatictext.h text/qstatictext_p.h
+        text/qsyntaxhighlighter.cpp text/qsyntaxhighlighter.h
+        text/qtextcursor.cpp text/qtextcursor.h text/qtextcursor_p.h
+        text/qtextdocument.cpp text/qtextdocument.h text/qtextdocument_p.cpp text/qtextdocument_p.h
+        text/qtextdocumentfragment.cpp text/qtextdocumentfragment.h text/qtextdocumentfragment_p.h
+        text/qtextdocumentlayout.cpp text/qtextdocumentlayout_p.h
+        text/qtextdocumentwriter.cpp text/qtextdocumentwriter.h
+        text/qtextengine.cpp text/qtextengine_p.h
+        text/qtextformat.cpp text/qtextformat.h text/qtextformat_p.h
+        text/qtexthtmlparser.cpp text/qtexthtmlparser_p.h
+        text/qtextimagehandler.cpp text/qtextimagehandler_p.h
+        text/qtextlayout.cpp text/qtextlayout.h
+        text/qtextlist.cpp text/qtextlist.h
+        text/qtextobject.cpp text/qtextobject.h text/qtextobject_p.h
+        text/qtextoption.cpp text/qtextoption.h
+        text/qtexttable.cpp text/qtexttable.h text/qtexttable_p.h
+        util/qabstractlayoutstyleinfo.cpp util/qabstractlayoutstyleinfo_p.h
+        util/qastchandler.cpp util/qastchandler_p.h
+        util/qdesktopservices.cpp util/qdesktopservices.h
+        util/qgridlayoutengine.cpp util/qgridlayoutengine_p.h
+        util/qhexstring_p.h
+        util/qktxhandler.cpp util/qktxhandler_p.h
+        util/qlayoutpolicy.cpp util/qlayoutpolicy_p.h
+        util/qpkmhandler.cpp util/qpkmhandler_p.h
+        util/qshaderformat.cpp util/qshaderformat_p.h
+        util/qshadergraph.cpp util/qshadergraph_p.h
+        util/qshadergraphloader.cpp util/qshadergraphloader_p.h
+        util/qshaderlanguage.cpp util/qshaderlanguage_p.h
+        util/qshadernode.cpp util/qshadernode_p.h
+        util/qshadernodeport.cpp util/qshadernodeport_p.h
+        util/qshadernodesloader.cpp util/qshadernodesloader_p.h
+        util/qtexturefiledata.cpp util/qtexturefiledata_p.h
+        util/qtexturefilehandler_p.h
+        util/qtexturefilereader.cpp util/qtexturefilereader_p.h
+        util/qvalidator.cpp util/qvalidator.h
+    DEFINES
+        QT_NO_FOREACH
+        QT_NO_USING_NAMESPACE
+        QT_QPA_DEFAULT_PLATFORM_NAME="${QT_QPA_DEFAULT_PLATFORM}" # special case
+    INCLUDE_DIRECTORIES
+        ../3rdparty/VulkanMemoryAllocator
+    LIBRARIES
+        Qt::CorePrivate
+    PUBLIC_LIBRARIES
+        Qt::Core
+    PRIVATE_MODULE_INTERFACE
+        Qt::CorePrivate
+    NO_PCH_SOURCES # special case
+        "painting/qdrawhelper.cpp" # special case
+    PRECOMPILED_HEADER
+        "kernel/qt_gui_pch.h"
+)
+
+# Resources:
+
+set_source_files_properties("painting/../../3rdparty/icc/sRGB2014.icc"
+    PROPERTIES QT_RESOURCE_ALIAS "sRGB2014.icc"
+)
+set(qpdf_resource_files
+    "../../3rdparty/icc/sRGB2014.icc"
+    "qpdfa_metadata.xml"
+)
+
+qt_add_resource(Gui "qpdf"
+    PREFIX
+        "/qpdf/"
+    BASE
+        "painting"
+    FILES
+        ${qpdf_resource_files}
+)
+
+if(QT_FEATURE_reduce_relocations AND UNIX AND GCC)
+    target_link_options(Gui PRIVATE
+                        "LINKER:--dynamic-list=${CMAKE_CURRENT_LIST_DIR}/QtGui.dynlist")
+endif()
+
+# special case begin
+# Replace arch_haswell with avx2 feature. That is what is used in the code requireing
+# this file, too!
+qt_add_simd_part(Gui SIMD avx2
+    SOURCES
+        painting/qdrawhelper_avx2.cpp
+)
+# special case end
+
+# special case begin
+qt_extend_target(Gui CONDITION QT_FEATURE_standarditemmodel
+    SOURCES
+        itemmodels/qstandarditemmodel.cpp itemmodels/qstandarditemmodel.h itemmodels/qstandarditemmodel_p.h
+)
+# special case end
+
+
+#### Keys ignored in scope 1:.:.:gui.pro:<TRUE>:
+# MODULE_PLUGIN_TYPES = "platforms" "platforms/darwin" "xcbglintegrations" "platformthemes" "platforminputcontexts" "generic" "iconengines" "imageformats" "egldeviceintegrations"
+# QMAKE_DYNAMIC_LIST_FILE = "$$PWD/QtGui.dynlist"
+# QMAKE_LIBS = "$$QMAKE_LIBS_GUI"
+
+## Scopes:
+#####################################################################
+
+# special case begin
+# With qmake, gui's opengl.pri used CONFIG += opengl, where opengl.prf
+# used direct public linkage against either libGLESv2 or libGL, depending
+# on the opengl _feature_. This is done by hand now here (where the
+# feature is available).
+# DO NOT MOVE THIS TO THE BEGINNING OF THE FILE, the feature variables are not
+# available until the qt_add_module call.
+if(QT_FEATURE_opengl)
+    if(QT_FEATURE_opengles2)
+        find_package(GLESv2)
+        target_link_libraries(Gui PUBLIC GLESv2::GLESv2)
+    else()
+        find_package(OpenGL)
+        target_link_libraries(Gui PUBLIC OpenGL::GL)
+    endif()
+endif()
+# special case end
+
+qt_extend_target(Gui CONDITION QT_FEATURE_opengl
+    SOURCES
+        kernel/qopenglcontext.cpp kernel/qopenglcontext.h kernel/qopenglcontext_p.h
+        kernel/qplatformopenglcontext.cpp kernel/qplatformopenglcontext.h
+        opengl/qopengl.cpp opengl/qopengl.h opengl/qopengl_p.h
+        opengl/qopenglextensions_p.h
+        opengl/qopenglextrafunctions.h
+        opengl/qopenglfunctions.cpp opengl/qopenglfunctions.h
+        opengl/qopenglprogrambinarycache.cpp opengl/qopenglprogrambinarycache_p.h
+        opengl/qopenglversionfunctions.cpp opengl/qopenglversionfunctions.h
+        opengl/qopenglversionfunctionsfactory.cpp opengl/qopenglversionfunctionsfactory_p.h
+        opengl/qopenglversionprofile.cpp opengl/qopenglversionprofile.h
+        rhi/qrhigles2.cpp rhi/qrhigles2_p.h
+        rhi/qrhigles2_p_p.h
+)
+
+#### Keys ignored in scope 2:.:.:gui.pro:QT_FEATURE_opengl:
+# MODULE_CONFIG = "opengl"
+
+#### Keys ignored in scope 3:.:.:gui.pro:QT_FEATURE_angle:
+# MODULE_AUX_INCLUDES = "\$\$QT_MODULE_INCLUDE_BASE/QtANGLE"
+
+qt_extend_target(Gui CONDITION APPLE_OSX
+    LIBRARIES
+        ${FWAppKit}
+    PUBLIC_LIBRARIES
+        ${FWAppKit}
+)
+
+qt_extend_target(Gui CONDITION APPLE
+    SOURCES
+        image/qimage_darwin.mm
+        painting/qcoregraphics.mm painting/qcoregraphics_p.h
+    LIBRARIES
+        ${FWCoreGraphics}
+)
+
+qt_extend_target(Gui CONDITION QT_FEATURE_animation
+    SOURCES
+        animation/qguivariantanimation.cpp
+)
+
+qt_extend_target(Gui CONDITION WIN32
+    SOURCES
+        kernel/qwindowdefs_win.h
+        rhi/qrhid3d11.cpp rhi/qrhid3d11_p.h
+        rhi/qrhid3d11_p_p.h
+    PUBLIC_LIBRARIES
+        d3d11
+        dxgi
+        dxguid
+)
+
+#### Keys ignored in scope 8:.:.:gui.pro:WIN32:
+# CMAKE_WINDOWS_BUILD = "True"
+
+#### Keys ignored in scope 11:.:.:gui.pro:QT_FEATURE_egl:
+# CMAKE_EGL_LIBS = "$$cmakeProcessLibs($$QMAKE_LIBS_EGL)"
+
+#### Keys ignored in scope 12:.:.:gui.pro:NOT QMAKE_LIBDIR_EGL_ISEMPTY:
+# CMAKE_EGL_LIBDIR = "$$cmakeTargetPath($$QMAKE_LIBDIR_EGL)"
+
+#### Keys ignored in scope 13:.:.:gui.pro:QT_FEATURE_opengles2:
+# CMAKE_GL_HEADER_NAME = "GLES2/gl2.h"
+# CMAKE_OPENGL_INCDIRS = "$$cmakePortablePaths($$QMAKE_INCDIR_OPENGL_ES2)"
+# CMAKE_OPENGL_LIBS = "$$cmakeProcessLibs($$QMAKE_LIBS_OPENGL_ES2)"
+# CMAKE_QT_OPENGL_IMPLEMENTATION = "GLESv2"
+
+#### Keys ignored in scope 14:.:.:gui.pro:NOT QMAKE_INCDIR_OPENGL_ES2_ISEMPTY:
+# CMAKE_GL_INCDIRS = "$$cmakeTargetPaths($$QMAKE_INCDIR_OPENGL_ES2)"
+
+#### Keys ignored in scope 15:.:.:gui.pro:NOT QMAKE_LIBDIR_OPENGL_ES2_ISEMPTY:
+# CMAKE_OPENGL_LIBDIR = "$$cmakePortablePaths($$QMAKE_LIBDIR_OPENGL_ES2)"
+
+#### Keys ignored in scope 17:.:.:gui.pro:QT_FEATURE_opengl:
+# CMAKE_GL_HEADER_NAME = "GL/gl.h"
+# CMAKE_OPENGL_INCDIRS = "$$cmakePortablePaths($$QMAKE_INCDIR_OPENGL)"
+# CMAKE_QT_OPENGL_IMPLEMENTATION = "GL"
+
+#### Keys ignored in scope 18:.:.:gui.pro:NOT QMAKE_INCDIR_OPENGL_ISEMPTY:
+# CMAKE_GL_INCDIRS = "$$cmakeTargetPaths($$QMAKE_INCDIR_OPENGL)"
+
+#### Keys ignored in scope 19:.:.:gui.pro:NOT QT_FEATURE_dynamicgl:
+# CMAKE_OPENGL_LIBS = "$$cmakeProcessLibs($$QMAKE_LIBS_OPENGL)"
+
+#### Keys ignored in scope 20:.:.:gui.pro:NOT QMAKE_LIBDIR_OPENGL_ISEMPTY:
+# CMAKE_OPENGL_LIBDIR = "$$cmakePortablePaths($$QMAKE_LIBDIR_OPENGL)"
+
+#### Keys ignored in scope 21:.:.:gui.pro:APPLE:
+# CMAKE_GL_HEADER_NAME = "gl.h"
+
+#### Keys ignored in scope 22:.:.:gui.pro:QT_FEATURE_egl:
+# CMAKE_EGL_INCDIRS = "$$cmakePortablePaths($$QMAKE_INCDIR_EGL)"
+
+qt_extend_target(Gui CONDITION QT_FEATURE_accessibility
+    SOURCES
+        accessible/qaccessible.cpp accessible/qaccessible.h
+        accessible/qaccessiblebridge.cpp accessible/qaccessiblebridge.h
+        accessible/qaccessiblecache.cpp accessible/qaccessiblecache_p.h
+        accessible/qaccessibleobject.cpp accessible/qaccessibleobject.h
+        accessible/qaccessibleplugin.cpp accessible/qaccessibleplugin.h
+        accessible/qplatformaccessibility.cpp accessible/qplatformaccessibility.h
+)
+
+qt_extend_target(Gui CONDITION APPLE AND QT_FEATURE_accessibility
+    SOURCES
+        accessible/qaccessiblecache_mac.mm
+    LIBRARIES
+        ${FWFoundation}
+)
+
+qt_extend_target(Gui CONDITION QT_FEATURE_action
+    SOURCES
+        kernel/qguiaction.cpp kernel/qguiaction.h kernel/qguiaction_p.h
+        kernel/qguiactiongroup.cpp kernel/qguiactiongroup.h kernel/qguiactiongroup_p.h
+)
+
+qt_extend_target(Gui CONDITION QT_FEATURE_draganddrop
+    SOURCES
+        kernel/qdnd.cpp kernel/qdnd_p.h
+        kernel/qdrag.cpp kernel/qdrag.h
+        kernel/qplatformdrag.cpp kernel/qplatformdrag.h
+        kernel/qshapedpixmapdndwindow.cpp kernel/qshapedpixmapdndwindow_p.h
+        kernel/qsimpledrag.cpp kernel/qsimpledrag_p.h
+)
+
+qt_extend_target(Gui CONDITION QT_FEATURE_shortcut
+    SOURCES
+        kernel/qguishortcut.cpp kernel/qguishortcut.h kernel/qguishortcut_p.h
+        kernel/qkeysequence.cpp kernel/qkeysequence.h kernel/qkeysequence_p.h
+        kernel/qshortcutmap.cpp kernel/qshortcutmap_p.h
+)
+
+qt_extend_target(Gui CONDITION QT_FEATURE_movie
+    SOURCES
+        image/qmovie.cpp image/qmovie.h
+)
+
+qt_extend_target(Gui CONDITION WIN32 AND NOT WINRT
+    SOURCES
+        image/qpixmap_win.cpp
+)
+
+qt_extend_target(Gui CONDITION QT_FEATURE_png
+    SOURCES
+        image/qpnghandler.cpp image/qpnghandler_p.h
+    LIBRARIES
+        WrapPNG::WrapPNG
+)
+
+#### Keys ignored in scope 38:.:image:image/image.pri:WIN32 AND mingw:
+# GCC_VERSION = "$${QMAKE_GCC_MAJOR_VERSION}.$${QMAKE_GCC_MINOR_VERSION}.$${QMAKE_GCC_PATCH_VERSION}"
+
+qt_extend_target(Gui CONDITION ((QT_FEATURE_png) AND (WIN32 AND mingw)) AND (GCC_VERSION___equals___8.1.0)
+    COMPILE_OPTIONS
+        -fno-reorder-blocks-and-partition
+)
+
+if(NOT ANDROID)
+    qt_add_simd_part(Gui SIMD sse2
+        SOURCES
+            painting/qdrawhelper_sse2.cpp
+    )
+
+    qt_add_simd_part(Gui SIMD ssse3
+        SOURCES
+            image/qimage_ssse3.cpp
+            painting/qdrawhelper_ssse3.cpp
+    )
+
+    qt_add_simd_part(Gui SIMD sse4_1
+        SOURCES
+            painting/qdrawhelper_sse4.cpp
+            painting/qimagescale_sse4.cpp
+    )
+
+    qt_add_simd_part(Gui SIMD neon
+        SOURCES
+            image/qimage_neon.cpp
+            painting/qdrawhelper_neon.cpp painting/qdrawhelper_neon_p.h
+            painting/qimagescale_neon.cpp
+    )
+
+    qt_add_simd_part(Gui SIMD mips_dsp
+        SOURCES
+            painting/qdrawhelper_mips_dsp.cpp painting/qdrawhelper_mips_dsp_p.h
+            painting/qdrawhelper_mips_dsp_asm.S
+            painting/qt_mips_asm_dsp_p.h
+    )
+
+    qt_add_simd_part(Gui SIMD mips_dspr2
+        SOURCES
+            image/qimage_mips_dspr2.cpp
+            image/qimage_mips_dspr2_asm.S
+            painting/qdrawhelper_mips_dspr2_asm.S
+    )
+
+    qt_add_simd_part(Gui SIMD arch_haswell
+        SOURCES
+            painting/qdrawhelper_avx2.cpp
+    )
+endif()
+
+qt_extend_target(Gui CONDITION ANDROID AND (TEST_architecture_arch STREQUAL arm64 OR TEST_architecture_arch STREQUAL arm) # special case
+    SOURCES
+        image/qimage_neon.cpp
+        painting/qdrawhelper_neon.cpp painting/qdrawhelper_neon_p.h
+        painting/qimagescale_neon.cpp
+)
+
+qt_extend_target(Gui CONDITION ANDROID AND (TEST_architecture_arch STREQUAL i386 OR TEST_architecture_arch STREQUAL x86_64)
+    SOURCES
+        image/qimage_ssse3.cpp
+        painting/qdrawhelper_sse2.cpp
+        painting/qdrawhelper_ssse3.cpp
+    DEFINES
+        QT_COMPILER_SUPPORTS_SSE2 QT_COMPILER_SUPPORTS_SSE2
+        QT_COMPILER_SUPPORTS_SSE3 QT_COMPILER_SUPPORTS_SSE3
+        QT_COMPILER_SUPPORTS_SSSE3 QT_COMPILER_SUPPORTS_SSSE3
+)
+
+# special case begin
+if (MINGW AND CMAKE_CXX_COMPILER_VERSION VERSION_EQUAL 8.1.0)
+  # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=86048
+  set_source_files_properties(image/qpnghandler.cpp
+    PROPERTIES COMPILE_OPTIONS -fno-reorder-blocks-and-partition
+  )
+endif()
+# special case end
+
+qt_extend_target(Gui CONDITION QT_FEATURE_harfbuzz
+    SOURCES
+        text/qharfbuzzng.cpp text/qharfbuzzng_p.h
+    LIBRARIES
+        WrapHarfbuzz::WrapHarfbuzz
+)
+
+# special case begin
+# Replicate what src/3rdparty/harfbuzz-ng/harfbuzz-ng.pro does, which is link CoreText
+# when targeting uikit.
+
+qt_extend_target(Gui CONDITION QT_FEATURE_harfbuzz AND APPLE_UIKIT
+    LIBRARIES
+        ${FWCoreText}
+)
+# special case end
+
+qt_extend_target(Gui CONDITION QT_FEATURE_textodfwriter
+    SOURCES
+        text/qtextodfwriter.cpp text/qtextodfwriter_p.h
+        text/qzip.cpp
+        text/qzipreader_p.h
+        text/qzipwriter_p.h
+)
+
+qt_extend_target(Gui CONDITION QT_FEATURE_textmarkdownreader
+    SOURCES
+        text/qtextmarkdownimporter.cpp text/qtextmarkdownimporter_p.h
+)
+
+qt_extend_target(Gui CONDITION QT_FEATURE_system_textmarkdownreader AND QT_FEATURE_textmarkdownreader
+    LIBRARIES
+        libmd4c
+)
+
+qt_extend_target(Gui CONDITION QT_FEATURE_textmarkdownreader AND NOT QT_FEATURE_system_textmarkdownreader
+    SOURCES
+        ../3rdparty/md4c/md4c.c ../3rdparty/md4c/md4c.h
+    DEFINES
+        MD4C_USE_UTF8
+    INCLUDE_DIRECTORIES
+        ../3rdparty/md4c
+)
+
+qt_extend_target(Gui CONDITION QT_FEATURE_textmarkdownwriter
+    SOURCES
+        text/qtextmarkdownwriter.cpp text/qtextmarkdownwriter_p.h
+)
+
+qt_extend_target(Gui CONDITION QT_FEATURE_cssparser
+    SOURCES
+        painting/qcssutil.cpp
+        text/qcssparser.cpp text/qcssparser_p.h
+)
+
+qt_extend_target(Gui CONDITION UNIX AND NOT ANDROID AND NOT APPLE_UIKIT AND NOT INTEGRITY AND NOT (TEST_architecture_arch STREQUAL "arm64")
+    DEFINES
+        ENABLE_PIXMAN_DRAWHELPERS
+)
+
+if(UNIX AND NOT ANDROID AND NOT APPLE_UIKIT AND NOT INTEGRITY AND NOT (TEST_architecture_arch STREQUAL "arm64"))
+    qt_add_simd_part(Gui SIMD neon
+        SOURCES
+            ../3rdparty/pixman/pixman-arm-neon-asm.S
+            painting/qdrawhelper_neon_asm.S
+    )
+endif()
+
+qt_extend_target(Gui CONDITION ANDROID AND TEST_architecture_arch STREQUAL x86_64
+    SOURCES
+        painting/qdrawhelper_sse4.cpp
+        painting/qimagescale_sse4.cpp
+    DEFINES
+        QT_COMPILER_SUPPORTS_SSE4_1
+        QT_COMPILER_SUPPORTS_SSE4_2
+)
+
+qt_extend_target(Gui CONDITION QT_FEATURE_system_zlib
+    LIBRARIES
+        ZLIB::ZLIB
+)
+
+qt_extend_target(Gui CONDITION NOT QT_FEATURE_system_zlib
+    INCLUDE_DIRECTORIES
+        ../3rdparty/zlib/src
+)
+
+qt_extend_target(Gui CONDITION NOT QT_FEATURE_system_zlib AND NOT no_core_dep
+    LIBRARIES
+        Qt::Core
+)
+
+qt_extend_target(Gui CONDITION QT_FEATURE_regularexpression
+    SOURCES
+        util/qshadergenerator.cpp util/qshadergenerator_p.h
+)
+
+qt_extend_target(Gui CONDITION QT_FEATURE_opengl AND NOT QT_FEATURE_opengles2
+    SOURCES
+        opengl/qopenglfunctions_1_0.cpp opengl/qopenglfunctions_1_0.h
+        opengl/qopenglfunctions_1_1.cpp opengl/qopenglfunctions_1_1.h
+        opengl/qopenglfunctions_1_2.cpp opengl/qopenglfunctions_1_2.h
+        opengl/qopenglfunctions_1_3.cpp opengl/qopenglfunctions_1_3.h
+        opengl/qopenglfunctions_1_4.cpp opengl/qopenglfunctions_1_4.h
+        opengl/qopenglfunctions_1_5.cpp opengl/qopenglfunctions_1_5.h
+        opengl/qopenglfunctions_2_0.cpp opengl/qopenglfunctions_2_0.h
+        opengl/qopenglfunctions_2_1.cpp opengl/qopenglfunctions_2_1.h
+        opengl/qopenglfunctions_3_0.cpp opengl/qopenglfunctions_3_0.h
+        opengl/qopenglfunctions_3_1.cpp opengl/qopenglfunctions_3_1.h
+        opengl/qopenglfunctions_3_2_compatibility.cpp opengl/qopenglfunctions_3_2_compatibility.h
+        opengl/qopenglfunctions_3_2_core.cpp opengl/qopenglfunctions_3_2_core.h
+        opengl/qopenglfunctions_3_3_compatibility.cpp opengl/qopenglfunctions_3_3_compatibility.h
+        opengl/qopenglfunctions_3_3_core.cpp opengl/qopenglfunctions_3_3_core.h
+        opengl/qopenglfunctions_4_0_compatibility.cpp opengl/qopenglfunctions_4_0_compatibility.h
+        opengl/qopenglfunctions_4_0_core.cpp opengl/qopenglfunctions_4_0_core.h
+        opengl/qopenglfunctions_4_1_compatibility.cpp opengl/qopenglfunctions_4_1_compatibility.h
+        opengl/qopenglfunctions_4_1_core.cpp opengl/qopenglfunctions_4_1_core.h
+        opengl/qopenglfunctions_4_2_compatibility.cpp opengl/qopenglfunctions_4_2_compatibility.h
+        opengl/qopenglfunctions_4_2_core.cpp opengl/qopenglfunctions_4_2_core.h
+        opengl/qopenglfunctions_4_3_compatibility.cpp opengl/qopenglfunctions_4_3_compatibility.h
+        opengl/qopenglfunctions_4_3_core.cpp opengl/qopenglfunctions_4_3_core.h
+        opengl/qopenglfunctions_4_4_compatibility.cpp opengl/qopenglfunctions_4_4_compatibility.h
+        opengl/qopenglfunctions_4_4_core.cpp opengl/qopenglfunctions_4_4_core.h
+        opengl/qopenglfunctions_4_5_compatibility.cpp opengl/qopenglfunctions_4_5_compatibility.h
+        opengl/qopenglfunctions_4_5_core.cpp opengl/qopenglfunctions_4_5_core.h
+)
+
+qt_extend_target(Gui CONDITION QT_FEATURE_opengl AND QT_FEATURE_opengles2
+    SOURCES
+        opengl/qopenglfunctions_es2.cpp opengl/qopenglfunctions_es2.h
+)
+
+qt_extend_target(Gui CONDITION QT_FEATURE_vulkan
+    SOURCES
+        rhi/qrhivulkan.cpp rhi/qrhivulkan_p.h
+        rhi/qrhivulkan_p_p.h
+        vulkan/qplatformvulkaninstance.cpp vulkan/qplatformvulkaninstance.h
+        vulkan/qvulkanfunctions.cpp
+        vulkan/qvulkaninstance.cpp vulkan/qvulkaninstance.h
+        vulkan/qvulkanwindow.cpp vulkan/qvulkanwindow.h vulkan/qvulkanwindow_p.h
+    PUBLIC_LIBRARIES
+        Vulkan::Vulkan_nolink
+)
+
+#### Keys ignored in scope 82:.:vulkan:vulkan/vulkan.pri:QT_FEATURE_vkgen:
+# special case begin
+# We must always generate syncqt-injected header files,
+# because we added a custom command earlier for those for framework builds.
+set(vulkan_fun "qvulkanfunctions.h")
+set(vulkan_fun_p "qvulkanfunctions_p.h")
+set(vulkan_fun_outputs "vulkan/${vulkan_fun}" "vulkan/${vulkan_fun_p}")
+set(vulkan_fun_command_content COMMAND "${CMAKE_COMMAND}" -E make_directory "vulkan")
+if (QT_FEATURE_vulkan)
+    set(vulkan_fun_p_cpp "qvulkanfunctions_p.cpp")
+    list(APPEND vulkan_fun_outputs "vulkan/${vulkan_fun_p_cpp}")
+
+    list(APPEND vulkan_fun_command_content
+        COMMAND ${QT_CMAKE_EXPORT_NAMESPACE}::qvkgen
+            "${CMAKE_CURRENT_SOURCE_DIR}/vulkan/vk.xml"
+            "${PROJECT_SOURCE_DIR}/header.LGPL"
+            "${CMAKE_CURRENT_BINARY_DIR}/vulkan/qvulkanfunctions"
+        DEPENDS vulkan/vk.xml
+        COMMENT "Generating vulkan data"
+    )
+
+    extend_target(Gui
+        SOURCES
+            "${CMAKE_CURRENT_BINARY_DIR}/vulkan/${vulkan_fun}"
+            "${CMAKE_CURRENT_BINARY_DIR}/vulkan/${vulkan_fun_p}"
+            "${CMAKE_CURRENT_BINARY_DIR}/vulkan/${vulkan_fun_p_cpp}"
+    )
+else()
+    foreach(file ${vulkan_fun_outputs})
+        list(APPEND vulkan_fun_command_content
+            COMMAND "${CMAKE_COMMAND}" -E touch "${file}")
+    endforeach()
+endif()
+add_custom_command(
+    OUTPUT ${vulkan_fun_outputs}
+    ${vulkan_fun_command_content}
+    WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
+)
+# special case end
+
+#### Keys ignored in scope 68:.:vulkan:vulkan/vulkan.pri:QT_FEATURE_vkgen:
+# QMAKE_EXTRA_COMPILERS = "qvkgen_h" "qvkgen_ph" "qvkgen_pimpl"
+# QMAKE_QVKGEN_INPUT = "vulkan/vk.xml"
+# QMAKE_QVKGEN_LICENSE_HEADER = "$$QT_SOURCE_TREE/header.LGPL"
+# qvkgen_h.commands = "$$QMAKE_QVKGEN" "${QMAKE_FILE_IN}" "$$shell_quote($$QMAKE_QVKGEN_LICENSE_HEADER)" "${QMAKE_FILE_OUT_PATH}/${QMAKE_FILE_OUT_BASE}"
+# qvkgen_h.input = "QMAKE_QVKGEN_INPUT"
+# qvkgen_h.output = "$$OUT_PWD/vulkan/qvulkanfunctions.h"
+# qvkgen_ph.commands = "$$escape_expand(\\n)"
+# qvkgen_ph.depends = "$$OUT_PWD/vulkan/qvulkanfunctions.h"
+# qvkgen_ph.input = "QMAKE_QVKGEN_INPUT"
+# qvkgen_ph.output = "$$OUT_PWD/vulkan/qvulkanfunctions_p.h"
+# qvkgen_pimpl.commands = "$$escape_expand(\\n)"
+# qvkgen_pimpl.depends = "$$OUT_PWD/vulkan/qvulkanfunctions_p.h"
+# qvkgen_pimpl.input = "QMAKE_QVKGEN_INPUT"
+# qvkgen_pimpl.output = "$$OUT_PWD/vulkan/qvulkanfunctions_p.cpp"
+
+#### Keys ignored in scope 83:.:vulkan:vulkan/vulkan.pri:QT_FEATURE_vulkan:
+# qvkgen_h.variable_out = "HEADERS"
+
+#### Keys ignored in scope 84:.:vulkan:vulkan/vulkan.pri:else:
+# qvkgen_h.CONFIG = "target_predeps" "no_link"
+
+qt_extend_target(Gui CONDITION WASM
+    SOURCES
+        platform/wasm/qwasmlocalfileaccess.cpp platform/wasm/qwasmlocalfileaccess_p.h
+)
+
+qt_extend_target(Gui CONDITION APPLE_IOS OR APPLE_OSX
+    SOURCES
+        rhi/qrhimetal.mm rhi/qrhimetal_p.h
+        rhi/qrhimetal_p_p.h
+    PUBLIC_LIBRARIES
+        ${FWMetal}
+)
+
+qt_extend_target(Gui CONDITION NOT GCC OR NOT QT_COMPILER_VERSION_MAJOR STREQUAL 5
+    SOURCES
+        painting/qdrawhelper.cpp
+    NO_PCH_SOURCES
+        "painting/qdrawhelper.cpp"
+)
+
+
+qt_create_tracepoints(Gui qtgui.tracepoints)
+qt_add_docs(Gui
+    doc/qtgui.qdocconf
+)
+
diff --git a/src/gui/Qt5GuiConfigExtras.cmake.in b/src/gui/Qt5GuiConfigExtras.cmake.in
deleted file mode 100644
index 84dbbfebd4..0000000000
--- a/src/gui/Qt5GuiConfigExtras.cmake.in
+++ /dev/null
@@ -1,193 +0,0 @@
-
-!!IF !isEmpty(CMAKE_ANGLE_EGL_DLL_RELEASE)
-
-!!IF isEmpty(CMAKE_INCLUDE_DIR_IS_ABSOLUTE)
-set(Qt5Gui_EGL_INCLUDE_DIRS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$$CMAKE_INCLUDE_DIR/QtANGLE\")
-!!ELSE
-set(Qt5Gui_EGL_INCLUDE_DIRS \"$$CMAKE_INCLUDE_DIR/QtANGLE\")
-!!ENDIF
-
-_qt5_Gui_check_file_exists(${Qt5Gui_EGL_INCLUDE_DIRS})
-
-list(APPEND Qt5Gui_INCLUDE_DIRS ${Qt5Gui_EGL_INCLUDE_DIRS})
-set_property(TARGET Qt5::Gui APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${Qt5Gui_EGL_INCLUDE_DIRS})
-set(Qt5Gui_OPENGL_INCLUDE_DIRS ${Qt5Gui_EGL_INCLUDE_DIRS})
-
-macro(_populate_qt5gui_gl_target_properties TargetName Configuration LIB_LOCATION IMPLIB_LOCATION)
-    set_property(TARGET Qt5::${TargetName} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration})
-
-!!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE)
-    set(imported_location \"${_qt5Gui_install_prefix}/$${CMAKE_DLL_DIR}${LIB_LOCATION}\")
-!!ELSE
-    set(imported_location \"$${CMAKE_DLL_DIR}${LIB_LOCATION}\")
-!!ENDIF
-
-!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
-    set(imported_implib \"${_qt5Gui_install_prefix}/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\")
-!!ELSE
-    set(imported_implib \"$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\")
-!!ENDIF
-
-    set_target_properties(Qt5::${TargetName} PROPERTIES
-        \"IMPORTED_LOCATION_${Configuration}\" ${imported_location}
-        \"IMPORTED_IMPLIB_${Configuration}\" ${imported_implib}
-    )
-endmacro()
-
-add_library(Qt5::Gui_EGL SHARED IMPORTED)
-_populate_qt5gui_gl_target_properties(Gui_EGL RELEASE $${CMAKE_ANGLE_EGL_DLL_RELEASE} $${CMAKE_ANGLE_EGL_IMPLIB_RELEASE})
-add_library(Qt5::Gui_GLESv2 SHARED IMPORTED)
-_populate_qt5gui_gl_target_properties(Gui_GLESv2 RELEASE $${CMAKE_ANGLE_GLES2_DLL_RELEASE} $${CMAKE_ANGLE_GLES2_IMPLIB_RELEASE})
-
-set_property(TARGET Qt5::Gui_EGL APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${Qt5Gui_EGL_INCLUDE_DIRS})
-set_property(TARGET Qt5::Gui_GLESv2 APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${Qt5Gui_OPENGL_INCLUDE_DIRS})
-
-!!IF !isEmpty(CMAKE_DEBUG_TYPE)
-_populate_qt5gui_gl_target_properties(Gui_EGL DEBUG $${CMAKE_ANGLE_EGL_DLL_DEBUG} $${CMAKE_ANGLE_EGL_IMPLIB_DEBUG})
-_populate_qt5gui_gl_target_properties(Gui_GLESv2 DEBUG $${CMAKE_ANGLE_GLES2_DLL_DEBUG} $${CMAKE_ANGLE_GLES2_IMPLIB_DEBUG})
-!!ENDIF
-
-set(Qt5Gui_EGL_LIBRARIES Qt5::Gui_EGL)
-set(Qt5Gui_OPENGL_LIBRARIES Qt5::Gui_GLESv2)
-
-!!ELSE
-
-!!IF !isEmpty(CMAKE_GL_INCDIRS)
-
-set(_GL_INCDIRS $$CMAKE_GL_INCDIRS)
-find_path(_qt5gui_OPENGL_INCLUDE_DIR $$CMAKE_GL_HEADER_NAME
-    PATHS ${_GL_INCDIRS}
-)
-if (NOT _qt5gui_OPENGL_INCLUDE_DIR)
-    message(FATAL_ERROR \"Failed to find \\\"$$CMAKE_GL_HEADER_NAME\\\" in \\\"${_GL_INCDIRS}\\\".\")
-endif()
-unset(_GL_INCDIRS)
-
-# Don\'t check for existence of the "_qt5gui_OPENGL_INCLUDE_DIR" because it is
-# optional.
-
-list(APPEND Qt5Gui_INCLUDE_DIRS ${_qt5gui_OPENGL_INCLUDE_DIR})
-set_property(TARGET Qt5::Gui APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${_qt5gui_OPENGL_INCLUDE_DIR})
-
-unset(_qt5gui_OPENGL_INCLUDE_DIR CACHE)
-
-!!ENDIF
-
-macro(_qt5gui_find_extra_libs Name Libs LibDir IncDirs)
-    set(Qt5Gui_${Name}_LIBRARIES)
-!!IF !mac
-    set(Qt5Gui_${Name}_INCLUDE_DIRS ${IncDirs})
-!!ELSE
-    foreach(_dir ${IncDirs})
-      if (EXISTS ${_dir})
-        list(APPEND Qt5Gui_${Name}_INCLUDE_DIRS ${_dir})
-      else()
-        find_path(_actual_dir ${_dir}) # Look in sdk directories
-        if (_actual_dir)
-          list(APPEND Qt5Gui_${Name}_INCLUDE_DIRS ${_actual_dir})
-        endif()
-        unset(_actual_dir CACHE)
-      endif()
-    endforeach()
-!!ENDIF
-    foreach(_lib ${Libs})
-        if (IS_ABSOLUTE ${_lib})
-            get_filename_component(_libFile ${_lib} NAME_WE)
-            if (_libFile MATCHES \"^${CMAKE_SHARED_LIBRARY_PREFIX}(.*)\")
-                set(_libFile ${CMAKE_MATCH_1})
-            endif()
-        else()
-            set(_libFile ${_lib})
-        endif()
-
-        string(REGEX REPLACE "[^_A-Za-z0-9]" "_" _cmake_lib_name ${_libFile})
-        if (NOT TARGET Qt5::Gui_${_cmake_lib_name} AND NOT _Qt5Gui_${_cmake_lib_name}_LIBRARY_DONE)
-            if (IS_ABSOLUTE ${_lib})
-                set(Qt5Gui_${_cmake_lib_name}_LIBRARY ${_lib})
-            else()
-                find_library(Qt5Gui_${_cmake_lib_name}_LIBRARY ${_lib}
-!!IF !isEmpty(CROSS_COMPILE)
-                    PATHS \"${LibDir}\"
-!!IF !mac
-                    NO_DEFAULT_PATH
-!!ENDIF
-!!ENDIF
-                )
-            endif()
-!!IF mac
-            set(Qt5Gui_${_cmake_lib_name}_LIBRARY "${Qt5Gui_${_cmake_lib_name}_LIBRARY}/${_lib}")
-            if (NOT EXISTS "${Qt5Gui_${_cmake_lib_name}_LIBRARY}")
-                set(Qt5Gui_${_cmake_lib_name}_LIBRARY)
-            endif()
-!!ENDIF
-            if (NOT Qt5Gui_${_cmake_lib_name}_LIBRARY)
-                # The above find_library call doesn\'t work for finding
-                # libraries in Windows SDK paths outside of the proper
-                # environment, even if the libraries are present.  In other
-                # cases it is OK for the libraries to not be found
-                # because they are optional dependencies of Qt5Gui, needed
-                # only if the qopengl.h header is used.
-                # We try to find the libraries in the first place because Qt may be
-                # compiled with another set of GL libraries (such as coming
-                # from ANGLE).  The point of these find calls is to try to
-                # find the same binaries as Qt is compiled with (as they are
-                # in the interface of QtGui), so an effort is made to do so
-                # above with paths known to qmake.
-                set(_Qt5Gui_${_cmake_lib_name}_LIBRARY_DONE TRUE)
-                unset(Qt5Gui_${_cmake_lib_name}_LIBRARY CACHE)
-            else()
-                add_library(Qt5::Gui_${_cmake_lib_name} SHARED IMPORTED)
-                set_property(TARGET Qt5::Gui_${_cmake_lib_name} APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${Qt5Gui_${Name}_INCLUDE_DIRS})
-
-                set_property(TARGET Qt5::Gui_${_cmake_lib_name} APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
-                _qt5_Gui_check_file_exists(\"${Qt5Gui_${_cmake_lib_name}_LIBRARY}\")
-                set_property(TARGET Qt5::Gui_${_cmake_lib_name} PROPERTY IMPORTED_LOCATION_RELEASE \"${Qt5Gui_${_cmake_lib_name}_LIBRARY}\")
-
-!!IF !isEmpty(CMAKE_WINDOWS_BUILD)
-                set_property(TARGET Qt5::Gui_${_cmake_lib_name} PROPERTY IMPORTED_IMPLIB_RELEASE \"${Qt5Gui_${_cmake_lib_name}_LIBRARY}\")
-!!ENDIF
-                unset(Qt5Gui_${_cmake_lib_name}_LIBRARY CACHE)
-
-                find_library(Qt5Gui_${_cmake_lib_name}_LIBRARY_DEBUG ${_lib}d
-                    PATHS \"${LibDir}\"
-!!IF !mac
-                    NO_DEFAULT_PATH
-!!ENDIF
-                )
-                if (Qt5Gui_${_cmake_lib_name}_LIBRARY_DEBUG)
-                    set_property(TARGET Qt5::Gui_${_cmake_lib_name} APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG)
-                    _qt5_Gui_check_file_exists(\"${Qt5Gui_${_cmake_lib_name}_LIBRARY_DEBUG}\")
-                    set_property(TARGET Qt5::Gui_${_cmake_lib_name} PROPERTY IMPORTED_LOCATION_DEBUG \"${Qt5Gui_${_cmake_lib_name}_LIBRARY_DEBUG}\")
-!!IF !isEmpty(CMAKE_WINDOWS_BUILD)
-                    set_property(TARGET Qt5::Gui_${_cmake_lib_name} PROPERTY IMPORTED_IMPLIB_DEBUG \"${Qt5Gui_${_cmake_lib_name}_LIBRARY_DEBUG}\")
-!!ENDIF
-                endif()
-                unset(Qt5Gui_${_cmake_lib_name}_LIBRARY_DEBUG CACHE)
-                list(APPEND Qt5Gui_${Name}_LIBRARIES Qt5::Gui_${_cmake_lib_name})
-            endif()
-        endif()
-    endforeach()
-endmacro()
-
-
-!!IF !isEmpty(CMAKE_EGL_LIBS)
-_qt5gui_find_extra_libs(EGL \"$$CMAKE_EGL_LIBS\" \"$$CMAKE_EGL_LIBDIR\" \"$$CMAKE_EGL_INCDIRS\")
-!!ENDIF
-
-!!IF !isEmpty(CMAKE_OPENGL_LIBS)
-_qt5gui_find_extra_libs(OPENGL \"$$CMAKE_OPENGL_LIBS\" \"$$CMAKE_OPENGL_LIBDIR\" \"$$CMAKE_OPENGL_INCDIRS\")
-
-!!ENDIF
-
-!!ENDIF
-
-set(Qt5Gui_OPENGL_IMPLEMENTATION $$CMAKE_QT_OPENGL_IMPLEMENTATION)
-
-get_target_property(_configs Qt5::Gui IMPORTED_CONFIGURATIONS)
-foreach(_config ${_configs})
-    set_property(TARGET Qt5::Gui APPEND PROPERTY
-        IMPORTED_LINK_DEPENDENT_LIBRARIES_${_config}
-        ${Qt5Gui_EGL_LIBRARIES} ${Qt5Gui_OPENGL_LIBRARIES}
-    )
-endforeach()
-unset(_configs)
diff --git a/src/gui/accessible/qaccessible.cpp b/src/gui/accessible/qaccessible.cpp
index a789e65284..6edcd7befa 100644
--- a/src/gui/accessible/qaccessible.cpp
+++ b/src/gui/accessible/qaccessible.cpp
@@ -619,7 +619,6 @@ QAccessible::RootObjectHandler QAccessible::installRootObjectHandler(RootObjectH
 
 QAccessible::ActivationObserver::~ActivationObserver()
 {
-    // must be empty until ### Qt 6
 }
 
 /*!
@@ -1334,7 +1333,6 @@ QColor QAccessibleInterface::backgroundColor() const
 */
 QAccessibleEvent::~QAccessibleEvent()
 {
-    // must be empty until ### Qt 6
 }
 
 /*! \fn QAccessible::Event QAccessibleEvent::type() const
@@ -1414,7 +1412,6 @@ QAccessible::Id QAccessibleEvent::uniqueId() const
 */
 QAccessibleValueChangeEvent::~QAccessibleValueChangeEvent()
 {
-    // must be empty until ### Qt 6
 }
 
 /*!
@@ -1458,7 +1455,6 @@ QAccessibleValueChangeEvent::~QAccessibleValueChangeEvent()
 */
 QAccessibleStateChangeEvent::~QAccessibleStateChangeEvent()
 {
-    // must be empty until ### Qt 6
 }
 
 /*!
@@ -1538,7 +1534,6 @@ QAccessibleStateChangeEvent::~QAccessibleStateChangeEvent()
 */
 QAccessibleTableModelChangeEvent::~QAccessibleTableModelChangeEvent()
 {
-    // must be empty until ### Qt 6
 }
 /*!
     \class QAccessibleTextCursorEvent
@@ -1567,7 +1562,6 @@ QAccessibleTableModelChangeEvent::~QAccessibleTableModelChangeEvent()
 */
 QAccessibleTextCursorEvent::~QAccessibleTextCursorEvent()
 {
-    // must be empty until ### Qt 6
 }
 
 
@@ -1608,7 +1602,6 @@ QAccessibleTextCursorEvent::~QAccessibleTextCursorEvent()
 */
 QAccessibleTextInsertEvent::~QAccessibleTextInsertEvent()
 {
-    // must be empty until ### Qt 6
 }
 
 
@@ -1651,7 +1644,6 @@ QAccessibleTextInsertEvent::~QAccessibleTextInsertEvent()
 */
 QAccessibleTextRemoveEvent::~QAccessibleTextRemoveEvent()
 {
-    // must be empty until ### Qt 6
 }
 
 /*!
@@ -1713,7 +1705,6 @@ QAccessibleTextRemoveEvent::~QAccessibleTextRemoveEvent()
 */
 QAccessibleTextUpdateEvent::~QAccessibleTextUpdateEvent()
 {
-    // must be empty until ### Qt 6
 }
 
 
@@ -1748,7 +1739,6 @@ QAccessibleTextUpdateEvent::~QAccessibleTextUpdateEvent()
 */
 QAccessibleTextSelectionEvent::~QAccessibleTextSelectionEvent()
 {
-    // must be empty until ### Qt 6
 }
 
 
@@ -1978,7 +1968,6 @@ QDebug operator<<(QDebug d, const QAccessibleEvent &ev)
 */
 QAccessibleTextInterface::~QAccessibleTextInterface()
 {
-    // must be empty until ### Qt 6
 }
 
 /*!
@@ -2367,7 +2356,6 @@ QString QAccessibleTextInterface::textAtOffset(int offset, QAccessible::TextBoun
 */
 QAccessibleEditableTextInterface::~QAccessibleEditableTextInterface()
 {
-    // must be empty until ### Qt 6
 }
 
 /*!
@@ -2412,7 +2400,6 @@ QAccessibleEditableTextInterface::~QAccessibleEditableTextInterface()
 */
 QAccessibleValueInterface::~QAccessibleValueInterface()
 {
-    // must be empty until ### Qt 6
 }
 
 /*!
@@ -2476,7 +2463,6 @@ QAccessibleValueInterface::~QAccessibleValueInterface()
 */
 QAccessibleImageInterface::~QAccessibleImageInterface()
 {
-    // must be empty until ### Qt 6
 }
 
 /*!
@@ -2496,7 +2482,6 @@ QAccessibleImageInterface::~QAccessibleImageInterface()
 */
 QAccessibleTableCellInterface::~QAccessibleTableCellInterface()
 {
-    // must be empty until ### Qt 6
 }
 
 /*!
@@ -2564,7 +2549,6 @@ QAccessibleTableCellInterface::~QAccessibleTableCellInterface()
 */
 QAccessibleTableInterface::~QAccessibleTableInterface()
 {
-    // must be empty until ### Qt 6
 }
 
 /*!
@@ -2740,7 +2724,6 @@ QAccessibleTableInterface::~QAccessibleTableInterface()
 */
 QAccessibleActionInterface::~QAccessibleActionInterface()
 {
-    // must be empty until ### Qt 6
 }
 
 /*!
diff --git a/src/gui/configure.cmake b/src/gui/configure.cmake
new file mode 100644
index 0000000000..7b3cd14ce4
--- /dev/null
+++ b/src/gui/configure.cmake
@@ -0,0 +1,1144 @@
+
+
+#### Inputs
+
+# input freetype
+set(INPUT_freetype "undefined" CACHE STRING "")
+set_property(CACHE INPUT_freetype PROPERTY STRINGS undefined no qt system)
+
+# input libjpeg
+set(INPUT_libjpeg "undefined" CACHE STRING "")
+set_property(CACHE INPUT_libjpeg PROPERTY STRINGS undefined no qt system)
+
+# input libmd4c
+set(INPUT_libmd4c "undefined" CACHE STRING "")
+set_property(CACHE INPUT_libmd4c PROPERTY STRINGS undefined no qt system)
+
+# input libpng
+set(INPUT_libpng "undefined" CACHE STRING "")
+set_property(CACHE INPUT_libpng PROPERTY STRINGS undefined no qt system)
+
+
+
+#### Libraries
+
+qt_find_package(ATSPI2 PROVIDED_TARGETS PkgConfig::ATSPI2)
+qt_find_package(DirectFB PROVIDED_TARGETS PkgConfig::DirectFB)
+qt_find_package(Libdrm PROVIDED_TARGETS Libdrm::Libdrm)
+qt_find_package(EGL PROVIDED_TARGETS EGL::EGL)
+qt_find_package(WrapSystemFreetype PROVIDED_TARGETS WrapSystemFreetype::WrapSystemFreetype)
+set_package_properties(WrapFreetype PROPERTIES TYPE REQUIRED)
+qt_find_package(Fontconfig PROVIDED_TARGETS Fontconfig::Fontconfig)
+qt_find_package(gbm PROVIDED_TARGETS gbm::gbm)
+qt_find_package(WrapSystemHarfbuzz PROVIDED_TARGETS WrapSystemHarfbuzz::WrapSystemHarfbuzz)
+qt_find_package(Libinput PROVIDED_TARGETS Libinput::Libinput)
+qt_find_package(JPEG PROVIDED_TARGETS JPEG::JPEG)
+qt_find_package(WrapSystemPNG PROVIDED_TARGETS WrapSystemPNG::WrapSystemPNG)
+qt_find_package(Mtdev PROVIDED_TARGETS PkgConfig::Mtdev)
+qt_find_package(OpenGL PROVIDED_TARGETS OpenGL::GL)
+qt_find_package(GLESv2 PROVIDED_TARGETS GLESv2::GLESv2)
+qt_find_package(Tslib PROVIDED_TARGETS PkgConfig::Tslib)
+qt_find_package(Vulkan PROVIDED_TARGETS Vulkan::Vulkan)
+if((LINUX) OR QT_FIND_ALL_PACKAGES_ALWAYS)
+    qt_find_package(Wayland PROVIDED_TARGETS Wayland::Server)
+endif()
+if((LINUX) OR QT_FIND_ALL_PACKAGES_ALWAYS)
+    qt_find_package(X11 PROVIDED_TARGETS X11::X11)
+endif()
+if((LINUX) OR QT_FIND_ALL_PACKAGES_ALWAYS)
+    qt_find_package(X11 PROVIDED_TARGETS ${X11_SM_LIB} ${X11_ICE_LIB})
+endif()
+if((LINUX) OR QT_FIND_ALL_PACKAGES_ALWAYS)
+    qt_find_package(XCB 1.9 PROVIDED_TARGETS XCB::XCB)
+endif()
+if((LINUX) OR QT_FIND_ALL_PACKAGES_ALWAYS)
+    qt_find_package(XCB COMPONENTS ICCCM PROVIDED_TARGETS XCB::ICCCM)
+endif()
+if((LINUX) OR QT_FIND_ALL_PACKAGES_ALWAYS)
+    qt_find_package(XCB COMPONENTS IMAGE PROVIDED_TARGETS XCB::IMAGE)
+endif()
+if((LINUX) OR QT_FIND_ALL_PACKAGES_ALWAYS)
+    qt_find_package(XCB COMPONENTS KEYSYMS PROVIDED_TARGETS XCB::KEYSYMS)
+endif()
+if((LINUX) OR QT_FIND_ALL_PACKAGES_ALWAYS)
+    qt_find_package(XCB COMPONENTS RENDERUTIL PROVIDED_TARGETS XCB::RENDERUTIL)
+endif()
+if((LINUX) OR QT_FIND_ALL_PACKAGES_ALWAYS)
+    qt_find_package(XCB COMPONENTS RANDR PROVIDED_TARGETS XCB::RANDR)
+endif()
+if((LINUX) OR QT_FIND_ALL_PACKAGES_ALWAYS)
+    qt_find_package(XCB COMPONENTS SHAPE PROVIDED_TARGETS XCB::SHAPE)
+endif()
+if((LINUX) OR QT_FIND_ALL_PACKAGES_ALWAYS)
+    qt_find_package(XCB COMPONENTS SHM PROVIDED_TARGETS XCB::SHM)
+endif()
+if((LINUX) OR QT_FIND_ALL_PACKAGES_ALWAYS)
+    qt_find_package(XCB COMPONENTS SYNC PROVIDED_TARGETS XCB::SYNC)
+endif()
+if((LINUX) OR QT_FIND_ALL_PACKAGES_ALWAYS)
+    qt_find_package(XCB COMPONENTS XFIXES PROVIDED_TARGETS XCB::XFIXES)
+endif()
+if((LINUX) OR QT_FIND_ALL_PACKAGES_ALWAYS)
+    qt_find_package(XCB COMPONENTS XINERAMA PROVIDED_TARGETS XCB::XINERAMA)
+endif()
+if((LINUX) OR QT_FIND_ALL_PACKAGES_ALWAYS)
+    qt_find_package(X11_XCB PROVIDED_TARGETS X11::XCB)
+endif()
+if((LINUX) OR QT_FIND_ALL_PACKAGES_ALWAYS)
+    qt_find_package(XCB COMPONENTS XKB PROVIDED_TARGETS XCB::XKB)
+endif()
+if((LINUX) OR QT_FIND_ALL_PACKAGES_ALWAYS)
+    qt_find_package(XCB COMPONENTS RENDER PROVIDED_TARGETS XCB::RENDER)
+endif()
+if((LINUX) OR QT_FIND_ALL_PACKAGES_ALWAYS)
+    qt_find_package(XCB COMPONENTS GLX PROVIDED_TARGETS XCB::GLX)
+endif()
+if((LINUX) OR QT_FIND_ALL_PACKAGES_ALWAYS)
+    qt_find_package(XCB COMPONENTS XINPUT PROVIDED_TARGETS XCB::XINPUT)
+endif()
+if((LINUX) OR QT_FIND_ALL_PACKAGES_ALWAYS)
+    qt_find_package(XKB 0.4.1 PROVIDED_TARGETS XKB::XKB)
+endif()
+if((LINUX) OR QT_FIND_ALL_PACKAGES_ALWAYS)
+    qt_find_package(XKB_COMMON_X11 0.4.1 PROVIDED_TARGETS PkgConfig::XKB_COMMON_X11)
+endif()
+if((LINUX) OR QT_FIND_ALL_PACKAGES_ALWAYS)
+    qt_find_package(XRender PROVIDED_TARGETS PkgConfig::XRender)
+endif()
+
+
+#### Tests
+
+# angle_d3d11_qdtd
+qt_config_compile_test(angle_d3d11_qdtd
+    LABEL "D3D11_QUERY_DATA_TIMESTAMP_DISJOINT"
+    CODE
+"
+#include <d3d11.h>
+
+int main(int argc, char **argv)
+{
+    (void)argc; (void)argv;
+    /* BEGIN TEST: */
+D3D11_QUERY_DATA_TIMESTAMP_DISJOINT qdtd;
+(void) qdtd;
+    /* END TEST: */
+    return 0;
+}
+")
+
+# drm_atomic
+qt_config_compile_test(drm_atomic
+    LABEL "DRM Atomic API"
+    LIBRARIES
+        Libdrm::Libdrm
+    CODE
+"#include <stdlib.h>
+#include <stdint.h>
+extern \"C\" {
+#include <xf86drmMode.h>
+#include <xf86drm.h>
+}
+int main(int argc, char **argv)
+{
+    (void)argc; (void)argv;
+    /* BEGIN TEST: */
+drmModeAtomicReq *request;
+    /* END TEST: */
+    return 0;
+}
+")
+
+# egl-x11
+qt_config_compile_test(egl_x11
+    LABEL "EGL on X11"
+    LIBRARIES
+        EGL::EGL
+        X11::X11
+    CODE
+"// Check if EGL is compatible with X. Some EGL implementations, typically on
+// embedded devices, are not intended to be used together with X. EGL support
+// has to be disabled in plugins like xcb in this case since the native display,
+// window and pixmap types will be different than what an X-based platform
+// plugin would expect.
+#include <EGL/egl.h>
+#include <X11/Xlib.h>
+
+int main(int argc, char **argv)
+{
+    (void)argc; (void)argv;
+    /* BEGIN TEST: */
+Display *dpy = EGL_DEFAULT_DISPLAY;
+EGLNativeDisplayType egldpy = XOpenDisplay(\"\");
+dpy = egldpy;
+EGLNativeWindowType w = XCreateWindow(dpy, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
+XDestroyWindow(dpy, w);
+XCloseDisplay(dpy);
+    /* END TEST: */
+    return 0;
+}
+")
+
+# egl-brcm
+qt_config_compile_test(egl_brcm
+    LABEL "Broadcom EGL (Raspberry Pi)"
+    LIBRARIES
+        EGL::EGL
+    CODE
+"
+#include <EGL/egl.h>
+#include <bcm_host.h>
+
+int main(int argc, char **argv)
+{
+    (void)argc; (void)argv;
+    /* BEGIN TEST: */
+vc_dispmanx_display_open(0);
+    /* END TEST: */
+    return 0;
+}
+"# FIXME: use: unmapped library: bcm_host
+)
+
+# egl-egldevice
+qt_config_compile_test(egl_egldevice
+    LABEL "EGLDevice"
+    LIBRARIES
+        EGL::EGL
+    CODE
+"
+#include <EGL/egl.h>
+#include <EGL/eglext.h>
+
+int main(int argc, char **argv)
+{
+    (void)argc; (void)argv;
+    /* BEGIN TEST: */
+EGLDeviceEXT device = 0;
+EGLStreamKHR stream = 0;
+EGLOutputLayerEXT layer = 0;
+(void) EGL_DRM_CRTC_EXT;
+    /* END TEST: */
+    return 0;
+}
+")
+
+# egl-mali
+qt_config_compile_test(egl_mali
+    LABEL "Mali EGL"
+    LIBRARIES
+        EGL::EGL
+    CODE
+"
+#include <EGL/fbdev_window.h>
+#include <EGL/egl.h>
+#include <GLES2/gl2.h>
+
+int main(int argc, char **argv)
+{
+    (void)argc; (void)argv;
+    /* BEGIN TEST: */
+fbdev_window *w = 0;
+    /* END TEST: */
+    return 0;
+}
+")
+
+# egl-mali-2
+qt_config_compile_test(egl_mali_2
+    LABEL "Mali 2 EGL"
+    LIBRARIES
+        EGL::EGL
+    CODE
+"
+#include <EGL/egl.h>
+#include <GLES2/gl2.h>
+
+int main(int argc, char **argv)
+{
+    (void)argc; (void)argv;
+    /* BEGIN TEST: */
+mali_native_window *w = 0;
+    /* END TEST: */
+    return 0;
+}
+")
+
+# egl-viv
+qt_config_compile_test(egl_viv
+    LABEL "i.Mx6 EGL"
+    LIBRARIES
+        EGL::EGL
+    CODE
+"
+#include <EGL/egl.h>
+#include <EGL/eglvivante.h>
+
+int main(int argc, char **argv)
+{
+    (void)argc; (void)argv;
+    /* BEGIN TEST: */
+#ifdef __INTEGRITY
+fbGetDisplay();
+#else
+// Do not rely on fbGetDisplay(), since the signature has changed over time.
+// Stick to fbGetDisplayByIndex().
+fbGetDisplayByIndex(0);
+#endif
+    /* END TEST: */
+    return 0;
+}
+"# FIXME: qmake: ['DEFINES += EGL_API_FB=1', '!integrity: DEFINES += LINUX=1']
+)
+
+# egl-openwfd
+qt_config_compile_test(egl_openwfd
+    LABEL "OpenWFD EGL"
+    LIBRARIES
+        EGL::EGL
+    CODE
+"
+#include <wfd.h>
+
+int main(int argc, char **argv)
+{
+    (void)argc; (void)argv;
+    /* BEGIN TEST: */
+wfdEnumerateDevices(nullptr, 0, nullptr);
+    /* END TEST: */
+    return 0;
+}
+")
+
+# egl-rcar
+qt_config_compile_test(egl_rcar
+    LABEL "RCAR EGL"
+    LIBRARIES
+        EGL::EGL
+        GLESv2::GLESv2
+    CODE
+"
+#include <EGL/egl.h>
+extern \"C\" {
+extern unsigned long PVRGrfxServerInit(void);
+}
+int main(int argc, char **argv)
+{
+    (void)argc; (void)argv;
+    /* BEGIN TEST: */
+PVRGrfxServerInit();
+    /* END TEST: */
+    return 0;
+}
+")
+
+# evdev
+qt_config_compile_test(evdev
+    LABEL "evdev"
+    CODE
+"#if defined(__FreeBSD__)
+#  include <dev/evdev/input.h>
+#else
+#  include <linux/input.h>
+#  include <linux/kd.h>
+#endif
+enum {
+    e1 = ABS_PRESSURE,
+    e2 = ABS_X,
+    e3 = REL_X,
+    e4 = SYN_REPORT,
+};
+
+
+int main(int argc, char **argv)
+{
+    (void)argc; (void)argv;
+    /* BEGIN TEST: */
+input_event buf[32];
+(void) buf;
+    /* END TEST: */
+    return 0;
+}
+")
+
+# integrityfb
+qt_config_compile_test(integrityfb
+    LABEL "INTEGRITY framebuffer"
+    CODE
+"
+#include <device/fbdriver.h>
+
+int main(int argc, char **argv)
+{
+    (void)argc; (void)argv;
+    /* BEGIN TEST: */
+FBDriver *driver = 0;
+    /* END TEST: */
+    return 0;
+}
+")
+
+# linuxfb
+qt_config_compile_test(linuxfb
+    LABEL "LinuxFB"
+    CODE
+"
+#include <linux/fb.h>
+#include <sys/kd.h>
+#include <sys/ioctl.h>
+
+int main(int argc, char **argv)
+{
+    (void)argc; (void)argv;
+    /* BEGIN TEST: */
+fb_fix_screeninfo finfo;
+fb_var_screeninfo vinfo;
+int fd = 3;
+ioctl(fd, FBIOGET_FSCREENINFO, &finfo);
+ioctl(fd, FBIOGET_VSCREENINFO, &vinfo);
+    /* END TEST: */
+    return 0;
+}
+")
+
+# opengles3
+qt_config_compile_test(opengles3
+    LABEL "OpenGL ES 3.0"
+    LIBRARIES
+        GLESv2::GLESv2
+    CODE
+"#ifdef __APPLE__
+#  include <OpenGLES/ES3/gl.h>
+#else
+#  define GL_GLEXT_PROTOTYPES
+#  include <GLES3/gl3.h>
+#endif
+
+
+int main(int argc, char **argv)
+{
+    (void)argc; (void)argv;
+    /* BEGIN TEST: */
+static GLfloat f[6];
+glGetStringi(GL_EXTENSIONS, 0);
+glReadBuffer(GL_COLOR_ATTACHMENT1);
+glUniformMatrix2x3fv(0, 0, GL_FALSE, f);
+glMapBufferRange(GL_ARRAY_BUFFER, 0, 0, GL_MAP_READ_BIT);
+    /* END TEST: */
+    return 0;
+}
+")
+
+# opengles31
+qt_config_compile_test(opengles31
+    LABEL "OpenGL ES 3.1"
+    LIBRARIES
+        GLESv2::GLESv2
+    CODE
+"
+#include <GLES3/gl31.h>
+
+int main(int argc, char **argv)
+{
+    (void)argc; (void)argv;
+    /* BEGIN TEST: */
+glDispatchCompute(1, 1, 1);
+glProgramUniform1i(0, 0, 0);
+    /* END TEST: */
+    return 0;
+}
+")
+
+# opengles32
+qt_config_compile_test(opengles32
+    LABEL "OpenGL ES 3.2"
+    LIBRARIES
+        GLESv2::GLESv2
+    CODE
+"
+#include <GLES3/gl32.h>
+
+int main(int argc, char **argv)
+{
+    (void)argc; (void)argv;
+    /* BEGIN TEST: */
+glFramebufferTexture(GL_TEXTURE_2D, GL_DEPTH_STENCIL_ATTACHMENT, 1, 0);
+    /* END TEST: */
+    return 0;
+}
+")
+
+# xcb_syslibs
+qt_config_compile_test(xcb_syslibs
+    LABEL "XCB (extensions)"
+    LIBRARIES
+        XCB::ICCCM
+        XCB::IMAGE
+        XCB::KEYSYMS
+        XCB::RANDR
+        XCB::RENDER
+        XCB::RENDERUTIL
+        XCB::SHAPE
+        XCB::SHM
+        XCB::SYNC
+        XCB::XFIXES
+        XCB::XINERAMA
+        XCB::XKB
+        XCB::XCB
+    CODE
+"// xkb.h is using a variable called 'explicit', which is a reserved keyword in C++
+#define explicit dont_use_cxx_explicit
+#include <xcb/xcb.h>
+#include <xcb/xcb_image.h>
+#include <xcb/xcb_keysyms.h>
+#include <xcb/randr.h>
+#include <xcb/render.h>
+#include <xcb/shape.h>
+#include <xcb/shm.h>
+#include <xcb/sync.h>
+#include <xcb/xfixes.h>
+#include <xcb/xinerama.h>
+#include <xcb/xcb_icccm.h>
+#include <xcb/xcb_renderutil.h>
+#include <xcb/xkb.h>
+#undef explicit
+int main(int argc, char **argv)
+{
+    (void)argc; (void)argv;
+    /* BEGIN TEST: */
+int primaryScreen = 0;
+xcb_connection_t *c = xcb_connect(\"\", &primaryScreen);
+/* RENDER */
+xcb_generic_error_t *error = nullptr;
+xcb_render_query_pict_formats_cookie_t formatsCookie =
+    xcb_render_query_pict_formats(c);
+xcb_render_query_pict_formats_reply_t *formatsReply =
+    xcb_render_query_pict_formats_reply(c, formatsCookie, &error);
+/* RENDERUTIL: xcb_renderutil.h include won't compile unless version >= 0.3.9 */
+xcb_render_util_find_standard_format(nullptr, XCB_PICT_STANDARD_ARGB_32);
+/* XKB: This takes more arguments in xcb-xkb < 1.11 */
+xcb_xkb_get_kbd_by_name_replies_key_names_value_list_sizeof(nullptr, 0, 0, 0, 0, 0, 0, 0, 0);
+    /* END TEST: */
+    return 0;
+}
+")
+
+
+
+#### Features
+
+qt_feature("accessibility-atspi-bridge" PUBLIC PRIVATE
+    LABEL "ATSPI Bridge"
+    CONDITION QT_FEATURE_accessibility AND QT_FEATURE_xcb AND QT_FEATURE_dbus AND ATSPI2_FOUND
+)
+qt_feature_definition("accessibility-atspi-bridge" "QT_NO_ACCESSIBILITY_ATSPI_BRIDGE" NEGATE VALUE "1")
+qt_feature("angle" PUBLIC
+    LABEL "ANGLE"
+    AUTODETECT QT_FEATURE_opengles2 OR QT_FEATURE_opengl_dynamic
+    CONDITION NOT QT_FEATURE_opengl_desktop AND QT_FEATURE_dxguid AND tests.fxc AND ( QT_FEATURE_direct3d9 OR ( WINRT AND QT_FEATURE_direct3d11 AND libs.d3dcompiler ) ) OR FIXME
+)
+qt_feature_definition("angle" "QT_OPENGL_ES_2_ANGLE")
+qt_feature("angle_d3d11_qdtd" PRIVATE
+    LABEL "D3D11_QUERY_DATA_TIMESTAMP_DISJOINT"
+    CONDITION QT_FEATURE_angle AND TEST_angle_d3d11_qdtd
+)
+qt_feature("combined-angle-lib" PUBLIC
+    LABEL "Combined ANGLE Library"
+    AUTODETECT OFF
+    CONDITION QT_FEATURE_angle
+)
+qt_feature("directfb" PRIVATE
+    SECTION "Platform plugins"
+    LABEL "DirectFB"
+    AUTODETECT OFF
+    CONDITION DirectFB_FOUND
+)
+qt_feature("directwrite" PRIVATE
+    LABEL "DirectWrite"
+    CONDITION libs.dwrite OR FIXME
+    EMIT_IF WIN32
+)
+qt_feature("directwrite1" PRIVATE
+    LABEL "DirectWrite 1"
+    CONDITION libs.dwrite_1 OR FIXME
+    EMIT_IF WIN32
+)
+qt_feature("directwrite3" PRIVATE
+    LABEL "DirectWrite 3"
+    CONDITION QT_FEATURE_directwrite1 AND libs.dwrite_3 OR FIXME
+    EMIT_IF WIN32
+)
+qt_feature("directwrite2" PRIVATE
+    LABEL "DirectWrite 2"
+    CONDITION QT_FEATURE_directwrite1 AND libs.dwrite_2 OR FIXME
+    EMIT_IF WIN32
+)
+qt_feature("dxguid" PRIVATE
+    LABEL "DirectX GUID"
+    CONDITION WIN32 AND libs.dxguid OR FIXME
+)
+qt_feature("direct3d9" PRIVATE
+    LABEL "Direct 3D 9"
+    CONDITION WIN32 AND NOT WINRT AND libs.d3d9 OR FIXME
+)
+qt_feature("dxgi" PRIVATE
+    LABEL "DirectX GI"
+    CONDITION WIN32 AND libs.dxgi OR FIXME
+)
+qt_feature("dxgi1_2" PRIVATE
+    LABEL "DirectX GI 1.2"
+    CONDITION QT_FEATURE_dxgi AND libs.dxgi1_2 OR FIXME
+)
+qt_feature("direct3d11" PRIVATE
+    LABEL "Direct 3D 11"
+    CONDITION QT_FEATURE_dxgi AND libs.d3d11 OR FIXME
+)
+qt_feature("direct3d11_1" PRIVATE
+    LABEL "Direct 3D 11.1"
+    CONDITION QT_FEATURE_direct3d11 AND QT_FEATURE_dxgi1_2 AND libs.d3d11_1 OR FIXME
+)
+qt_feature("direct2d" PRIVATE
+    LABEL "Direct 2D"
+    CONDITION WIN32 AND NOT WINRT AND QT_FEATURE_direct3d11 AND libs.d2d1 OR FIXME
+)
+qt_feature("direct2d1_1" PRIVATE
+    LABEL "Direct 2D 1.1"
+    CONDITION QT_FEATURE_direct2d AND libs.d2d1_1 OR FIXME
+)
+qt_feature("evdev" PRIVATE
+    LABEL "evdev"
+    CONDITION QT_FEATURE_thread AND TEST_evdev
+)
+qt_feature("freetype" PUBLIC PRIVATE
+    SECTION "Fonts"
+    LABEL "FreeType"
+    PURPOSE "Supports the FreeType 2 font engine (and its supported font formats)."
+)
+qt_feature_definition("freetype" "QT_NO_FREETYPE" NEGATE VALUE "1")
+qt_feature("system-freetype" PRIVATE
+    LABEL "  Using system FreeType"
+    AUTODETECT NOT MSVC
+    CONDITION QT_FEATURE_freetype AND WrapSystemFreetype_FOUND
+    ENABLE INPUT_freetype STREQUAL 'system'
+    DISABLE INPUT_freetype STREQUAL 'qt'
+)
+qt_feature("fontconfig" PUBLIC PRIVATE
+    LABEL "Fontconfig"
+    AUTODETECT NOT APPLE
+    CONDITION NOT MSVC AND QT_FEATURE_system_freetype AND FONTCONFIG_FOUND
+)
+qt_feature_definition("fontconfig" "QT_NO_FONTCONFIG" NEGATE VALUE "1")
+qt_feature("gbm"
+    LABEL "GBM"
+    CONDITION gbm_FOUND
+)
+qt_feature_config("gbm" QMAKE_PUBLIC_QT_CONFIG)
+qt_feature("harfbuzz" PUBLIC PRIVATE
+    LABEL "HarfBuzz"
+    CONDITION harfbuzz_FOUND
+)
+qt_feature_definition("harfbuzz" "QT_NO_HARFBUZZ" NEGATE VALUE "1")
+qt_feature("system-harfbuzz" PRIVATE
+    LABEL "  Using system HarfBuzz"
+    AUTODETECT NOT APPLE AND NOT WIN32
+    CONDITION QT_FEATURE_harfbuzz AND WrapSystemHarfbuzz_FOUND
+    ENABLE INPUT_harfbuzz STREQUAL 'system'
+    DISABLE INPUT_harfbuzz STREQUAL 'qt'
+)
+qt_feature("qqnx_imf" PRIVATE
+    LABEL "IMF"
+    CONDITION libs.imf OR FIXME
+    EMIT_IF QNX
+)
+qt_feature("integrityfb" PRIVATE
+    SECTION "Platform plugins"
+    LABEL "INTEGRITY framebuffer"
+    CONDITION INTEGRITY AND TEST_integrityfb
+)
+qt_feature("kms" PRIVATE
+    LABEL "KMS"
+    CONDITION Libdrm_FOUND
+)
+qt_feature_config("kms" QMAKE_PUBLIC_QT_CONFIG)
+qt_feature("drm_atomic" PRIVATE
+    LABEL "DRM Atomic API"
+    CONDITION Libdrm_FOUND AND TEST_drm_atomic
+)
+qt_feature("libinput" PRIVATE
+    LABEL "libinput"
+    CONDITION QT_FEATURE_libudev AND Libinput_FOUND
+)
+qt_feature("integrityhid" PRIVATE
+    LABEL "INTEGRITY HID"
+    CONDITION INTEGRITY AND libs.integrityhid OR FIXME
+)
+qt_feature("libinput-axis-api" PRIVATE
+    LABEL "axis API in libinput"
+    CONDITION QT_FEATURE_libinput AND ON
+)
+qt_feature("lgmon"
+    LABEL "lgmon"
+    CONDITION libs.lgmon OR FIXME
+    EMIT_IF QNX
+)
+qt_feature_config("lgmon" QMAKE_PRIVATE_CONFIG)
+qt_feature("linuxfb" PRIVATE
+    SECTION "Platform plugins"
+    LABEL "LinuxFB"
+    CONDITION TEST_linuxfb AND QT_FEATURE_regularexpression
+)
+qt_feature("vsp2" PRIVATE
+    LABEL "VSP2"
+    AUTODETECT OFF
+    CONDITION libs.v4l2 OR FIXME
+)
+qt_feature("vnc" PRIVATE
+    SECTION "Platform plugins"
+    LABEL "VNC"
+    CONDITION ( UNIX AND NOT ANDROID AND NOT APPLE ) AND ( QT_FEATURE_regularexpression AND QT_FEATURE_network )
+)
+qt_feature("mtdev" PRIVATE
+    LABEL "mtdev"
+    CONDITION Mtdev_FOUND
+)
+qt_feature("opengles2" PUBLIC
+    LABEL "OpenGL ES 2.0"
+    CONDITION NOT WIN32 AND ( NOT APPLE_WATCHOS AND NOT QT_FEATURE_opengl_desktop AND GLESv2_FOUND )
+    ENABLE INPUT_opengl STREQUAL 'es2' OR INPUT_angle STREQUAL 'yes'
+    DISABLE INPUT_opengl STREQUAL 'desktop' OR INPUT_opengl STREQUAL 'dynamic' OR INPUT_opengl STREQUAL 'no'
+)
+qt_feature_definition("opengles2" "QT_OPENGL_ES")
+qt_feature_definition("opengles2" "QT_OPENGL_ES_2")
+qt_feature_config("opengles2" QMAKE_PUBLIC_QT_CONFIG)
+qt_feature("opengles3" PUBLIC
+    LABEL "OpenGL ES 3.0"
+    CONDITION QT_FEATURE_opengles2 AND NOT QT_FEATURE_angle AND TEST_opengles3
+)
+qt_feature_definition("opengles3" "QT_OPENGL_ES_3")
+qt_feature("opengles31" PUBLIC
+    LABEL "OpenGL ES 3.1"
+    CONDITION QT_FEATURE_opengles3 AND TEST_opengles31
+)
+qt_feature_definition("opengles31" "QT_OPENGL_ES_3_1")
+qt_feature("opengles32" PUBLIC
+    LABEL "OpenGL ES 3.2"
+    CONDITION QT_FEATURE_opengles31 AND TEST_opengles32
+)
+qt_feature_definition("opengles32" "QT_OPENGL_ES_3_2")
+qt_feature("opengl-desktop"
+    LABEL "Desktop OpenGL"
+    CONDITION ( WIN32 AND NOT WINRT AND NOT QT_FEATURE_opengles2 AND ( MSVC OR OpenGL_OpenGL_FOUND ) ) OR ( NOT APPLE_WATCHOS AND NOT WIN32 AND NOT WASM AND OpenGL_OpenGL_FOUND )
+    ENABLE INPUT_opengl STREQUAL 'desktop'
+    DISABLE INPUT_opengl STREQUAL 'es2' OR INPUT_opengl STREQUAL 'dynamic' OR INPUT_opengl STREQUAL 'no'
+)
+qt_feature("opengl-dynamic"
+    LABEL "Dynamic OpenGL"
+    AUTODETECT OFF
+    CONDITION WIN32 AND NOT WINRT
+    DISABLE INPUT_angle STREQUAL 'yes' OR INPUT_opengl STREQUAL 'no' OR INPUT_opengl STREQUAL 'desktop'
+)
+qt_feature("dynamicgl" PUBLIC
+    LABEL "Dynamic OpenGL: dynamicgl"
+    CONDITION QT_FEATURE_opengl_dynamic
+    DISABLE INPUT_angle STREQUAL 'yes' OR INPUT_opengl STREQUAL 'no' OR INPUT_opengl STREQUAL 'desktop'
+)
+qt_feature_definition("opengl-dynamic" "QT_OPENGL_DYNAMIC")
+qt_feature("opengl" PUBLIC
+    LABEL "OpenGL"
+    CONDITION QT_FEATURE_opengl_desktop OR QT_FEATURE_opengl_dynamic OR QT_FEATURE_opengles2
+)
+qt_feature_definition("opengl" "QT_NO_OPENGL" NEGATE VALUE "1")
+qt_feature("vkgen" PRIVATE
+    LABEL "vkgen"
+    CONDITION QT_FEATURE_xmlstreamreader
+)
+qt_feature("vulkan" PUBLIC
+    LABEL "Vulkan"
+    CONDITION QT_FEATURE_vkgen AND Vulkan_FOUND
+)
+qt_feature("openvg" PUBLIC
+    LABEL "OpenVG"
+    CONDITION libs.openvg OR FIXME
+)
+qt_feature("egl" PUBLIC PRIVATE
+    LABEL "EGL"
+    CONDITION ( QT_FEATURE_opengl OR QT_FEATURE_openvg ) AND ( QT_FEATURE_angle OR EGL_FOUND ) AND ( QT_FEATURE_dlopen OR NOT UNIX OR INTEGRITY )
+)
+qt_feature_definition("egl" "QT_NO_EGL" NEGATE VALUE "1")
+qt_feature("egl_x11" PRIVATE
+    LABEL "EGL on X11"
+    CONDITION QT_FEATURE_thread AND QT_FEATURE_egl AND TEST_egl_x11
+)
+qt_feature("eglfs" PRIVATE
+    SECTION "Platform plugins"
+    LABEL "EGLFS"
+    CONDITION NOT ANDROID AND NOT APPLE AND NOT WIN32 AND NOT WASM AND QT_FEATURE_egl
+)
+qt_feature("eglfs_brcm" PRIVATE
+    LABEL "EGLFS Raspberry Pi"
+    CONDITION QT_FEATURE_eglfs AND TEST_egl_brcm
+)
+qt_feature("eglfs_egldevice" PRIVATE
+    LABEL "EGLFS EGLDevice"
+    CONDITION QT_FEATURE_eglfs AND TEST_egl_egldevice AND QT_FEATURE_kms
+)
+qt_feature("eglfs_gbm" PRIVATE
+    LABEL "EGLFS GBM"
+    CONDITION QT_FEATURE_eglfs AND gbm_FOUND AND QT_FEATURE_kms
+)
+qt_feature("eglfs_vsp2" PRIVATE
+    LABEL "EGLFS VSP2"
+    CONDITION QT_FEATURE_eglfs AND gbm_FOUND AND QT_FEATURE_kms AND QT_FEATURE_vsp2
+)
+qt_feature("eglfs_mali" PRIVATE
+    LABEL "EGLFS Mali"
+    CONDITION QT_FEATURE_eglfs AND ( TEST_egl_mali OR TEST_egl_mali_2 )
+)
+qt_feature("eglfs_viv" PRIVATE
+    LABEL "EGLFS i.Mx6"
+    CONDITION QT_FEATURE_eglfs AND TEST_egl_viv
+)
+qt_feature("eglfs_rcar" PRIVATE
+    LABEL "EGLFS RCAR"
+    CONDITION INTEGRITY AND QT_FEATURE_eglfs AND TEST_egl_rcar
+)
+qt_feature("eglfs_viv_wl" PRIVATE
+    LABEL "EGLFS i.Mx6 Wayland"
+    CONDITION QT_FEATURE_eglfs_viv AND Wayland_FOUND
+)
+qt_feature("eglfs_openwfd" PRIVATE
+    LABEL "EGLFS OpenWFD"
+    CONDITION INTEGRITY AND QT_FEATURE_eglfs AND TEST_egl_openwfd
+)
+qt_feature("eglfs_x11" PRIVATE
+    LABEL "EGLFS X11"
+    CONDITION QT_FEATURE_eglfs AND QT_FEATURE_xcb_xlib AND QT_FEATURE_egl_x11
+)
+qt_feature("gif" PRIVATE
+    LABEL "GIF"
+    CONDITION QT_FEATURE_imageformatplugin
+)
+qt_feature_definition("gif" "QT_NO_IMAGEFORMAT_GIF" NEGATE)
+qt_feature("ico" PUBLIC PRIVATE
+    LABEL "ICO"
+    CONDITION QT_FEATURE_imageformatplugin
+)
+qt_feature_definition("ico" "QT_NO_ICO" NEGATE VALUE "1")
+qt_feature("jpeg" PRIVATE
+    LABEL "JPEG"
+    CONDITION QT_FEATURE_imageformatplugin AND JPEG_FOUND
+    DISABLE INPUT_libjpeg STREQUAL 'no'
+)
+qt_feature_definition("jpeg" "QT_NO_IMAGEFORMAT_JPEG" NEGATE)
+qt_feature("system-jpeg" PRIVATE
+    LABEL "  Using system libjpeg"
+    CONDITION QT_FEATURE_jpeg AND JPEG_FOUND
+    ENABLE INPUT_libjpeg STREQUAL 'system'
+    DISABLE INPUT_libjpeg STREQUAL 'qt'
+)
+qt_feature("png" PRIVATE
+    LABEL "PNG"
+    DISABLE INPUT_libpng STREQUAL 'no'
+)
+qt_feature_definition("png" "QT_NO_IMAGEFORMAT_PNG" NEGATE)
+qt_feature("system-png" PRIVATE
+    LABEL "  Using system libpng"
+    AUTODETECT QT_FEATURE_system_zlib
+    CONDITION QT_FEATURE_png AND WrapSystemPNG_FOUND
+    ENABLE INPUT_libpng STREQUAL 'system'
+    DISABLE INPUT_libpng STREQUAL 'qt'
+)
+qt_feature("sessionmanager" PUBLIC
+    SECTION "Kernel"
+    LABEL "Session Management"
+    PURPOSE "Provides an interface to the windowing system's session management."
+)
+qt_feature_definition("sessionmanager" "QT_NO_SESSIONMANAGER" NEGATE VALUE "1")
+qt_feature("tslib" PRIVATE
+    LABEL "tslib"
+    CONDITION Tslib_FOUND
+)
+qt_feature("tuiotouch" PRIVATE
+    LABEL "TuioTouch"
+    PURPOSE "Provides the TuioTouch input plugin."
+    CONDITION QT_FEATURE_network AND QT_FEATURE_udpsocket
+)
+qt_feature("xcb" PRIVATE
+    SECTION "Platform plugins"
+    LABEL "XCB"
+    AUTODETECT NOT APPLE
+    CONDITION QT_FEATURE_thread AND TARGET XCB::XCB AND TEST_xcb_syslibs AND QT_FEATURE_xkbcommon_x11
+)
+qt_feature("xcb-glx-plugin" PRIVATE
+    LABEL "GLX Plugin"
+    CONDITION QT_FEATURE_xcb_xlib AND QT_FEATURE_opengl AND NOT QT_FEATURE_opengles2
+    EMIT_IF QT_FEATURE_xcb
+)
+qt_feature("xcb-glx" PRIVATE
+    LABEL "  XCB GLX"
+    CONDITION XCB_GLX_FOUND
+    EMIT_IF QT_FEATURE_xcb AND QT_FEATURE_xcb_glx_plugin
+)
+qt_feature("xcb-egl-plugin" PRIVATE
+    LABEL "EGL-X11 Plugin"
+    CONDITION QT_FEATURE_egl_x11 AND QT_FEATURE_opengl
+    EMIT_IF QT_FEATURE_xcb
+)
+qt_feature("xcb-native-painting" PRIVATE
+    LABEL "Native painting (experimental)"
+    AUTODETECT OFF
+    CONDITION QT_FEATURE_xcb_xlib AND QT_FEATURE_fontconfig AND XRender_FOUND
+    EMIT_IF QT_FEATURE_xcb
+)
+qt_feature("xrender" PRIVATE
+    LABEL "XRender for native painting"
+    CONDITION QT_FEATURE_xcb_native_painting
+    EMIT_IF QT_FEATURE_xcb AND QT_FEATURE_xcb_native_painting
+)
+qt_feature("xcb-xlib" PRIVATE
+    LABEL "XCB Xlib"
+    CONDITION QT_FEATURE_xlib AND X11_XCB_FOUND
+)
+qt_feature("xcb-sm" PRIVATE
+    LABEL "xcb-sm"
+    CONDITION QT_FEATURE_sessionmanager AND X11_SM_FOUND
+    EMIT_IF QT_FEATURE_xcb
+)
+qt_feature("system-xcb-xinput" PRIVATE
+    LABEL "Using system-provided xcb-xinput"
+    CONDITION XCB_XINPUT_FOUND
+    ENABLE INPUT_bundled_xcb_xinput STREQUAL 'no'
+    DISABLE INPUT_bundled_xcb_xinput STREQUAL 'yes'
+    EMIT_IF QT_FEATURE_xcb
+)
+qt_feature("xkbcommon" PRIVATE
+    LABEL "xkbcommon"
+    CONDITION XKB_FOUND
+)
+qt_feature("xkbcommon-x11" PRIVATE
+    LABEL "xkbcommon-x11"
+    CONDITION QT_FEATURE_xkbcommon AND XKB_COMMON_X11_FOUND
+)
+qt_feature("xlib" PRIVATE
+    LABEL "XLib"
+    AUTODETECT NOT APPLE OR QT_FEATURE_xcb
+    CONDITION X11_FOUND
+)
+qt_feature("texthtmlparser" PUBLIC
+    SECTION "Kernel"
+    LABEL "HtmlParser"
+    PURPOSE "Provides a parser for HTML."
+)
+qt_feature_definition("texthtmlparser" "QT_NO_TEXTHTMLPARSER" NEGATE VALUE "1")
+qt_feature("textmarkdownreader" PUBLIC
+    SECTION "Kernel"
+    LABEL "MarkdownReader"
+    PURPOSE "Provides a Markdown (CommonMark and GitHub) reader"
+    ENABLE INPUT_libmd4c STREQUAL 'system' OR INPUT_libmd4c STREQUAL 'qt' OR INPUT_libmd4c STREQUAL 'yes'
+    DISABLE INPUT_libmd4c STREQUAL 'no'
+)
+qt_feature("system-textmarkdownreader" PUBLIC
+    SECTION "Kernel"
+    LABEL "  Using system libmd4c"
+    CONDITION libs.libmd4c OR FIXME
+    ENABLE INPUT_libmd4c STREQUAL 'system'
+    DISABLE INPUT_libmd4c STREQUAL 'qt'
+)
+qt_feature("textmarkdownwriter" PUBLIC
+    SECTION "Kernel"
+    LABEL "MarkdownWriter"
+    PURPOSE "Provides a Markdown (CommonMark) writer"
+)
+qt_feature("textodfwriter" PUBLIC
+    SECTION "Kernel"
+    LABEL "OdfWriter"
+    PURPOSE "Provides an ODF writer."
+    CONDITION QT_FEATURE_xmlstreamwriter
+)
+qt_feature_definition("textodfwriter" "QT_NO_TEXTODFWRITER" NEGATE VALUE "1")
+qt_feature("cssparser" PUBLIC
+    SECTION "Kernel"
+    LABEL "CssParser"
+    PURPOSE "Provides a parser for Cascading Style Sheets."
+)
+qt_feature_definition("cssparser" "QT_NO_CSSPARSER" NEGATE VALUE "1")
+qt_feature("draganddrop" PUBLIC
+    SECTION "Kernel"
+    LABEL "Drag and Drop"
+    PURPOSE "Supports the drag and drop mechansim."
+    CONDITION QT_FEATURE_imageformat_xpm
+)
+qt_feature_definition("draganddrop" "QT_NO_DRAGANDDROP" NEGATE VALUE "1")
+qt_feature("action" PUBLIC
+    SECTION "Kernel"
+    LABEL "Q(Gui)Action(Group)"
+    PURPOSE "Provides abstract user interface actions."
+)
+qt_feature_definition("action" "QT_NO_ACTION" NEGATE VALUE "1")
+qt_feature("cursor" PUBLIC
+    SECTION "Kernel"
+    LABEL "QCursor"
+    PURPOSE "Provides mouse cursors."
+)
+qt_feature_definition("cursor" "QT_NO_CURSOR" NEGATE VALUE "1")
+qt_feature("clipboard" PUBLIC
+    SECTION "Kernel"
+    LABEL "QClipboard"
+    PURPOSE "Provides cut and paste operations."
+    CONDITION NOT INTEGRITY AND NOT QNX AND NOT rtems
+)
+qt_feature_definition("clipboard" "QT_NO_CLIPBOARD" NEGATE VALUE "1")
+qt_feature("wheelevent" PUBLIC
+    SECTION "Kernel"
+    LABEL "QWheelEvent"
+    PURPOSE "Supports wheel events."
+)
+qt_feature_definition("wheelevent" "QT_NO_WHEELEVENT" NEGATE VALUE "1")
+qt_feature("tabletevent" PUBLIC
+    SECTION "Kernel"
+    LABEL "QTabletEvent"
+    PURPOSE "Supports tablet events."
+)
+qt_feature_definition("tabletevent" "QT_NO_TABLETEVENT" NEGATE VALUE "1")
+qt_feature("im" PUBLIC
+    SECTION "Kernel"
+    LABEL "QInputContext"
+    PURPOSE "Provides complex input methods."
+    CONDITION QT_FEATURE_library
+)
+qt_feature_definition("im" "QT_NO_IM" NEGATE VALUE "1")
+qt_feature("highdpiscaling" PUBLIC
+    SECTION "Kernel"
+    LABEL "High DPI Scaling"
+    PURPOSE "Provides automatic scaling of DPI-unaware applications on high-DPI displays."
+)
+qt_feature_definition("highdpiscaling" "QT_NO_HIGHDPISCALING" NEGATE VALUE "1")
+qt_feature("validator" PUBLIC
+    SECTION "Widgets"
+    LABEL "QValidator"
+    PURPOSE "Supports validation of input text."
+)
+qt_feature_definition("validator" "QT_NO_VALIDATOR" NEGATE VALUE "1")
+qt_feature("standarditemmodel" PUBLIC
+    SECTION "ItemViews"
+    LABEL "QStandardItemModel"
+    PURPOSE "Provides a generic model for storing custom data."
+    CONDITION QT_FEATURE_itemmodel
+)
+qt_feature_definition("standarditemmodel" "QT_NO_STANDARDITEMMODEL" NEGATE VALUE "1")
+qt_feature("imageformatplugin" PUBLIC
+    SECTION "Images"
+    LABEL "QImageIOPlugin"
+    PURPOSE "Provides a base for writing a image format plugins."
+)
+qt_feature_definition("imageformatplugin" "QT_NO_IMAGEFORMATPLUGIN" NEGATE VALUE "1")
+qt_feature("movie" PUBLIC
+    SECTION "Images"
+    LABEL "QMovie"
+    PURPOSE "Supports animated images."
+)
+qt_feature_definition("movie" "QT_NO_MOVIE" NEGATE VALUE "1")
+qt_feature("imageformat_bmp" PUBLIC
+    SECTION "Images"
+    LABEL "BMP Image Format"
+    PURPOSE "Supports Microsoft's Bitmap image file format."
+)
+qt_feature_definition("imageformat_bmp" "QT_NO_IMAGEFORMAT_BMP" NEGATE VALUE "1")
+qt_feature("imageformat_ppm" PUBLIC
+    SECTION "Images"
+    LABEL "PPM Image Format"
+    PURPOSE "Supports the Portable Pixmap image file format."
+)
+qt_feature_definition("imageformat_ppm" "QT_NO_IMAGEFORMAT_PPM" NEGATE VALUE "1")
+qt_feature("imageformat_xbm" PUBLIC
+    SECTION "Images"
+    LABEL "XBM Image Format"
+    PURPOSE "Supports the X11 Bitmap image file format."
+)
+qt_feature_definition("imageformat_xbm" "QT_NO_IMAGEFORMAT_XBM" NEGATE VALUE "1")
+qt_feature("imageformat_xpm" PUBLIC
+    SECTION "Images"
+    LABEL "XPM Image Format"
+    PURPOSE "Supports the X11 Pixmap image file format."
+)
+qt_feature_definition("imageformat_xpm" "QT_NO_IMAGEFORMAT_XPM" NEGATE VALUE "1")
+qt_feature("imageformat_png" PUBLIC
+    SECTION "Images"
+    LABEL "PNG Image Format"
+    PURPOSE "Supports the Portable Network Graphics image file format."
+)
+qt_feature_definition("imageformat_png" "QT_NO_IMAGEFORMAT_PNG" NEGATE VALUE "1")
+qt_feature("imageformat_jpeg" PUBLIC
+    SECTION "Images"
+    LABEL "JPEG Image Format"
+    PURPOSE "Supports the Joint Photographic Experts Group image file format."
+)
+qt_feature_definition("imageformat_jpeg" "QT_NO_IMAGEFORMAT_JPEG" NEGATE VALUE "1")
+qt_feature("image_heuristic_mask" PUBLIC
+    SECTION "Images"
+    LABEL "QImage::createHeuristicMask()"
+    PURPOSE "Supports creating a 1-bpp heuristic mask for images."
+)
+qt_feature_definition("image_heuristic_mask" "QT_NO_IMAGE_HEURISTIC_MASK" NEGATE VALUE "1")
+qt_feature("image_text" PUBLIC
+    SECTION "Images"
+    LABEL "Image Text"
+    PURPOSE "Supports image file text strings."
+)
+qt_feature_definition("image_text" "QT_NO_IMAGE_TEXT" NEGATE VALUE "1")
+qt_feature("picture" PUBLIC
+    SECTION "Painting"
+    LABEL "QPicture"
+    PURPOSE "Supports recording and replaying QPainter commands."
+)
+qt_feature_definition("picture" "QT_NO_PICTURE" NEGATE VALUE "1")
+qt_feature("colornames" PUBLIC
+    SECTION "Painting"
+    LABEL "Color Names"
+    PURPOSE "Supports color names such as \"red\", used by QColor and by some HTML documents."
+)
+qt_feature_definition("colornames" "QT_NO_COLORNAMES" NEGATE VALUE "1")
+qt_feature("pdf" PUBLIC
+    SECTION "Painting"
+    LABEL "QPdf"
+    PURPOSE "Provides a PDF backend for QPainter."
+    CONDITION QT_FEATURE_temporaryfile
+)
+qt_feature_definition("pdf" "QT_NO_PDF" NEGATE VALUE "1")
+qt_feature("desktopservices" PUBLIC
+    SECTION "Utilities"
+    LABEL "QDesktopServices"
+    PURPOSE "Provides methods for accessing common desktop services."
+)
+qt_feature_definition("desktopservices" "QT_NO_DESKTOPSERVICES" NEGATE VALUE "1")
+qt_feature("systemtrayicon" PUBLIC
+    SECTION "Utilities"
+    LABEL "QSystemTrayIcon"
+    PURPOSE "Provides an icon for an application in the system tray."
+    CONDITION QT_FEATURE_temporaryfile
+)
+qt_feature_definition("systemtrayicon" "QT_NO_SYSTEMTRAYICON" NEGATE VALUE "1")
+qt_feature("accessibility" PUBLIC
+    SECTION "Utilities"
+    LABEL "Accessibility"
+    PURPOSE "Provides accessibility support."
+    CONDITION QT_FEATURE_properties
+)
+qt_feature_definition("accessibility" "QT_NO_ACCESSIBILITY" NEGATE VALUE "1")
+qt_feature("multiprocess" PRIVATE
+    SECTION "Utilities"
+    LABEL "Multi process"
+    PURPOSE "Provides support for detecting the desktop environment, launching external processes and opening URLs."
+    CONDITION NOT INTEGRITY AND NOT rtems
+)
+qt_feature("whatsthis" PUBLIC
+    SECTION "Widget Support"
+    LABEL "QWhatsThis"
+    PURPOSE "Supports displaying \"What's this\" help."
+)
+qt_feature_definition("whatsthis" "QT_NO_WHATSTHIS" NEGATE VALUE "1")
+qt_feature("raster-64bit" PRIVATE
+    SECTION "Painting"
+    LABEL "QPainter - 64 bit raster"
+    PURPOSE "Internal painting support for 64 bit (16 bpc) rasterization."
+)
diff --git a/src/gui/configure.json b/src/gui/configure.json
index 4de159d97a..8bc3e8dc0c 100644
--- a/src/gui/configure.json
+++ b/src/gui/configure.json
@@ -189,6 +189,20 @@
                 "-ldwrite"
             ]
         },
+        "dwrite_3": {
+            "label": "DirectWrite 3",
+            "test": {
+                "main": [
+                    "IUnknown *factory = 0;",
+                    "DWriteCreateFactory(DWRITE_FACTORY_TYPE_SHARED, __uuidof(IDWriteFactory3),",
+                    "                    &factory);"
+                ]
+            },
+            "headers": "dwrite_3.h",
+            "sources": [
+                "-ldwrite"
+            ]
+        },
         "drm": {
             "label": "KMS",
             "test": {
@@ -1145,6 +1159,12 @@
             "condition": "libs.dwrite_1",
             "output": [ "privateFeature" ]
         },
+        "directwrite3": {
+            "label": "DirectWrite 3",
+            "emitIf": "config.win32",
+            "condition": "features.directwrite1 && libs.dwrite_3",
+            "output": [ "privateFeature" ]
+        },
         "directwrite2": {
             "label": "DirectWrite 2",
             "emitIf": "config.win32",
@@ -1343,8 +1363,7 @@
             "autoDetect": "!config.win32",
             "enable": "input.opengl == 'desktop'",
             "disable": "input.opengl == 'es2' || input.opengl == 'dynamic' || input.opengl == 'no'",
-            "condition": "(config.win32 && !config.winrt && !features.opengles2 && (config.msvc || libs.opengl))
-                          || (!config.watchos && !config.win32 && !config.wasm && libs.opengl)"
+            "condition": "(config.win32 && !config.winrt && !features.opengles2 && (config.msvc || libs.opengl)) || (!config.watchos && !config.win32 && !config.wasm && libs.opengl)"
         },
         "opengl-dynamic": {
             "label": "Dynamic OpenGL",
@@ -1638,15 +1657,9 @@
             "condition": "features.imageformat_xpm",
             "output": [ "publicFeature", "feature" ]
         },
-        "shortcut": {
-            "label": "QShortcut",
-            "purpose": "Provides keyboard accelerators and shortcuts.",
-            "section": "Kernel",
-            "output": [ "publicFeature", "feature" ]
-        },
         "action": {
-            "label": "QAction",
-            "purpose": "Provides widget actions.",
+            "label": "Q(Gui)Action(Group)",
+            "purpose": "Provides abstract user interface actions.",
             "section": "Kernel",
             "output": [ "publicFeature", "feature" ]
         },
@@ -1833,9 +1846,7 @@
         {
             "type": "note",
             "condition": "features.xcb && config.darwin",
-            "message": "XCB support on macOS is minimal and untested. Some features will
-not work properly or at all (e.g. OpenGL, desktop services or accessibility),
-or may depend on your system and XQuartz setup."
+            "message": "XCB support on macOS is minimal and untested. Some features will not work properly or at all (e.g. OpenGL, desktop services or accessibility), or may depend on your system and XQuartz setup."
         },
         {
             "type": "note",
@@ -1850,16 +1861,12 @@ or may depend on your system and XQuartz setup."
         {
             "type": "warning",
             "condition": "features.gui && config.linux && !config.android && !features.xcb && !features.eglfs && !features.directfb && !features.linuxfb",
-            "message": "No QPA platform plugin enabled! This will
-produce a Qt that cannot run GUI applications.
-See \"Platform backends\" in the output of --help."
+            "message": "No QPA platform plugin enabled! This will produce a Qt that cannot run GUI applications.  See \"Platform backends\" in the output of --help."
         },
         {
             "type": "warning",
             "condition": "config.win32 && (features.opengles2 || features.opengl-dynamic) && !features.angle",
-            "message": "Using OpenGL ES 2.0 on Windows without ANGLE.
-The build will most likely fail.
-Specify -opengl desktop to use regular OpenGL."
+            "message": "Using OpenGL ES 2.0 on Windows without ANGLE.  The build will most likely fail.  Specify -opengl desktop to use regular OpenGL."
         },
         {
             "type": "warning",
@@ -1869,9 +1876,7 @@ Specify -opengl desktop to use regular OpenGL."
         {
             "type": "error",
             "condition": "features.gui && !config.watchos && input.opengl != 'no' && !features.opengl-desktop && !features.opengles2 && !features.opengl-dynamic",
-            "message": "The OpenGL functionality tests failed!
-You might need to modify the include and library search paths by editing QMAKE_INCDIR_OPENGL[_ES2],
-QMAKE_LIBDIR_OPENGL[_ES2] and QMAKE_LIBS_OPENGL[_ES2] in the mkspec for your platform."
+            "message": "The OpenGL functionality tests failed!  You might need to modify the include and library search paths by editing QMAKE_INCDIR_OPENGL[_ES2], QMAKE_LIBDIR_OPENGL[_ES2] and QMAKE_LIBS_OPENGL[_ES2] in the mkspec for your platform."
         },
         {
             "type": "warning",
diff --git a/src/gui/doc/snippets/picture/picture.cpp b/src/gui/doc/snippets/picture/picture.cpp
index 863476fdbf..807c263b19 100644
--- a/src/gui/doc/snippets/picture/picture.cpp
+++ b/src/gui/doc/snippets/picture/picture.cpp
@@ -80,82 +80,3 @@ int main()
         painter.end();                         // painting done
 //! [1]
     }
-
-    QPicture myPicture;
-    {
-        // FORMATS
-//! [2]
-        const QStringList list = QPicture::inputFormatList();
-        for (const QString &string : list)
-            myProcessing(string);
-//! [2]
-    }
-
-    {
-        // OUTPUT
-//! [3]
-        const QStringList list = QPicture::outputFormatList();
-        for (const QString &string : list)
-            myProcessing(string);
-//! [3]
-    }
-
-    {
-        // PIC READ
-//! [4]
-        QPictureIO iio;
-        QPixmap  pixmap;
-        iio.setFileName("vegeburger.pic");
-        if (iio.read()) {        // OK
-            QPicture picture = iio.picture();
-            QPainter painter(&pixmap);
-            painter.drawPicture(0, 0, picture);
-        }
-//! [4]
-    }
-
-    {
-        QPixmap pixmap;
-        // PIC WRITE
-//! [5]
-        QPictureIO iio;
-        QPicture   picture;
-        QPainter painter(&picture);
-        painter.drawPixmap(0, 0, pixmap);
-        iio.setPicture(picture);
-        iio.setFileName("vegeburger.pic");
-        iio.setFormat("PIC");
-        if (iio.write())
-            return true; // returned true if written successfully
-//! [5]
-    }
-
-}
-
-// SVG READ
-//! [6]
-void readSVG(QPictureIO *picture)
-{
-    // read the picture using the picture->ioDevice()
-}
-//! [6]
-
-// SVG WRITE
-//! [7]
-void writeSVG(QPictureIO *picture)
-{
-    // write the picture using the picture->ioDevice()
-}
-//! [7]
-
-// USE SVG
-void foo() {
-
-//! [8]
-    // add the SVG picture handler
-    // ...
-//! [8]
-    QPictureIO::defineIOHandler("SVG", 0, 0, readSVG, writeSVG);
-    // ...
-
-}
diff --git a/src/gui/doc/src/dontdocument.qdoc b/src/gui/doc/src/dontdocument.qdoc
index b360acefc1..6b50daba88 100644
--- a/src/gui/doc/src/dontdocument.qdoc
+++ b/src/gui/doc/src/dontdocument.qdoc
@@ -27,7 +27,7 @@
 
 /*!
   \dontdocument (QTypeInfo QScreenOrientationChangeEvent QApplicationStateChangeEvent
-                 QImageTextKeyLang QMetaTypeId QAbstractUndoItem
+                 QMetaTypeId QAbstractUndoItem
                  QOpenGLVersionStatus
                  QOpenGLVersionFunctionsBackend
                  QOpenGLVersionFunctionsStorage
diff --git a/src/gui/image/image.pri b/src/gui/image/image.pri
index 01e48c17dd..0c033609c4 100644
--- a/src/gui/image/image.pri
+++ b/src/gui/image/image.pri
@@ -14,7 +14,6 @@ HEADERS += \
         image/qpaintengine_pic_p.h \
         image/qpicture.h \
         image/qpicture_p.h \
-        image/qpictureformatplugin.h \
         image/qpixmap.h \
         image/qpixmap_raster_p.h \
         image/qpixmap_blitter_p.h \
@@ -38,7 +37,6 @@ SOURCES += \
         image/qimagewriter.cpp \
         image/qpaintengine_pic.cpp \
         image/qpicture.cpp \
-        image/qpictureformatplugin.cpp \
         image/qpixmap.cpp \
         image/qpixmapcache.cpp \
         image/qplatformpixmap.cpp \
@@ -59,9 +57,6 @@ win32:!winrt: SOURCES += image/qpixmap_win.cpp
 
 darwin: OBJECTIVE_SOURCES += image/qimage_darwin.mm
 
-NO_PCH_SOURCES += image/qimage_compat.cpp
-false: SOURCES += $$NO_PCH_SOURCES # Hack for QtCreator
-
 # Built-in image format support
 HEADERS += \
         image/qbmphandler_p.h \
diff --git a/src/gui/image/qbitmap.cpp b/src/gui/image/qbitmap.cpp
index a44f7151b1..88af4073c8 100644
--- a/src/gui/image/qbitmap.cpp
+++ b/src/gui/image/qbitmap.cpp
@@ -310,18 +310,4 @@ QBitmap QBitmap::transformed(const QTransform &matrix) const
     return bm;
 }
 
-#if QT_DEPRECATED_SINCE(5, 13)
-/*!
-  \overload
-  \obsolete
-
-  This convenience function converts the \a matrix to a QTransform
-  and calls the overloaded function.
-*/
-QBitmap QBitmap::transformed(const QMatrix &matrix) const
-{
-    return transformed(QTransform(matrix));
-}
-#endif
-
 QT_END_NAMESPACE
diff --git a/src/gui/image/qbitmap.h b/src/gui/image/qbitmap.h
index 3cc360f670..2bdfa73bdf 100644
--- a/src/gui/image/qbitmap.h
+++ b/src/gui/image/qbitmap.h
@@ -76,10 +76,6 @@ public:
     static QBitmap fromData(const QSize &size, const uchar *bits,
                             QImage::Format monoFormat = QImage::Format_MonoLSB);
 
-#if QT_DEPRECATED_SINCE(5, 13)
-    QT_DEPRECATED_X("Use QBitmap::transformed(QTransform) instead")
-    QBitmap transformed(const QMatrix &) const;
-#endif
     QBitmap transformed(const QTransform &matrix) const;
 
     typedef QExplicitlySharedDataPointer<QPlatformPixmap> DataPtr;
diff --git a/src/gui/image/qbmphandler.cpp b/src/gui/image/qbmphandler.cpp
index 32b6131309..d447faaceb 100644
--- a/src/gui/image/qbmphandler.cpp
+++ b/src/gui/image/qbmphandler.cpp
@@ -777,9 +777,9 @@ bool QBmpHandler::write(const QImage &img)
     }
 
     int nbits;
-    int bpl_bmp;
+    qsizetype bpl_bmp;
     // Calculate a minimum bytes-per-line instead of using whatever value this QImage is using internally.
-    int bpl = ((image.width() * image.depth() + 31) >> 5) << 2;
+    qsizetype bpl = ((image.width() * image.depth() + 31) >> 5) << 2;
 
     if (image.depth() == 8 && image.colorCount() <= 16) {
         bpl_bmp = (((bpl+1)/2+3)/4)*4;
@@ -791,6 +791,8 @@ bool QBmpHandler::write(const QImage &img)
         bpl_bmp = bpl;
         nbits = image.depth();
     }
+    if (qsizetype(int(bpl_bmp)) != bpl_bmp)
+        return false;
 
     if (m_format == DibFormat) {
         QDataStream dibStream(device());
@@ -813,6 +815,8 @@ bool QBmpHandler::write(const QImage &img)
     bf.bfReserved2 = 0;
     bf.bfOffBits = BMP_FILEHDR_SIZE + BMP_WIN + image.colorCount() * 4;
     bf.bfSize = bf.bfOffBits + bpl_bmp*image.height();
+    if (qsizetype(bf.bfSize) != bf.bfOffBits + bpl_bmp*image.height())
+        return false;
     s << bf;
 
     // write image
diff --git a/src/gui/image/qimage.cpp b/src/gui/image/qimage.cpp
index ec72180f0d..ce0c6170c1 100644
--- a/src/gui/image/qimage.cpp
+++ b/src/gui/image/qimage.cpp
@@ -43,7 +43,6 @@
 #include "qdatastream.h"
 #include "qcolortransform.h"
 #include "qmap.h"
-#include "qmatrix.h"
 #include "qtransform.h"
 #include "qimagereader.h"
 #include "qimagewriter.h"
@@ -781,7 +780,7 @@ QImage::QImage(const QSize &size, Format format)
 
 
 
-QImageData *QImageData::create(uchar *data, int width, int height,  int bpl, QImage::Format format, bool readOnly, QImageCleanupFunction cleanupFunction, void *cleanupInfo)
+QImageData *QImageData::create(uchar *data, int width, int height,  qsizetype bpl, QImage::Format format, bool readOnly, QImageCleanupFunction cleanupFunction, void *cleanupInfo)
 {
     if (width <= 0 || height <= 0 || !data || format == QImage::Format_Invalid)
         return nullptr;
@@ -793,7 +792,7 @@ QImageData *QImageData::create(uchar *data, int width, int height,  int bpl, QIm
 
     if (bpl > 0) {
         // can't overflow, because has calculateImageParameters already done this multiplication
-        const int min_bytes_per_line = (width * depth + 7)/8;
+        const qsizetype min_bytes_per_line = (qsizetype(width) * depth + 7)/8;
         if (bpl < min_bytes_per_line)
             return nullptr;
 
@@ -894,13 +893,17 @@ QImage::QImage(const uchar* data, int width, int height, Format format, QImageCl
     initially empty and must be sufficiently expanded with
     setColorCount() or setColorTable() before the image is used.
 */
+
+#if QT_VERSION >= QT_VERSION_CHECK(6,0,0)
+QImage::QImage(uchar *data, int width, int height, qsizetype bytesPerLine, Format format, QImageCleanupFunction cleanupFunction, void *cleanupInfo)
+#else
 QImage::QImage(uchar *data, int width, int height, int bytesPerLine, Format format, QImageCleanupFunction cleanupFunction, void *cleanupInfo)
+#endif
     :QPaintDevice()
 {
     d = QImageData::create(data, width, height, bytesPerLine, format, false, cleanupFunction, cleanupInfo);
 }
 
-
 /*!
     Constructs an image with the given \a width, \a height and \a
     format, that uses an existing memory buffer, \a data. The \a width
@@ -926,7 +929,11 @@ QImage::QImage(uchar *data, int width, int height, int bytesPerLine, Format form
     data being changed.
 */
 
+#if QT_VERSION >= QT_VERSION_CHECK(6,0,0)
+QImage::QImage(const uchar *data, int width, int height, qsizetype bytesPerLine, Format format, QImageCleanupFunction cleanupFunction, void *cleanupInfo)
+#else
 QImage::QImage(const uchar *data, int width, int height, int bytesPerLine, Format format, QImageCleanupFunction cleanupFunction, void *cleanupInfo)
+#endif
     :QPaintDevice()
 {
     d = QImageData::create(const_cast<uchar*>(data), width, height, bytesPerLine, format, true, cleanupFunction, cleanupInfo);
@@ -1165,7 +1172,7 @@ QImage QImage::copy(const QRect& r) const
         // Qt for Embedded Linux can create images with non-default bpl
         // make sure we don't crash.
         if (image.d->nbytes != d->nbytes) {
-            int bpl = qMin(bytesPerLine(), image.bytesPerLine());
+            qsizetype bpl = qMin(bytesPerLine(), image.bytesPerLine());
             for (int i = 0; i < height(); i++)
                 memcpy(image.scanLine(i), scanLine(i), bpl);
         } else
@@ -1224,7 +1231,7 @@ QImage QImage::copy(const QRect& r) const
     if (byteAligned) {
         const uchar *src = d->data + ((x * d->depth) >> 3) + y * d->bytes_per_line;
         uchar *dest = image.d->data + ((dx * d->depth) >> 3) + dy * image.d->bytes_per_line;
-        const int bytes_to_copy = (pixels_to_copy * d->depth) >> 3;
+        const qsizetype bytes_to_copy = (qsizetype(pixels_to_copy) * d->depth) >> 3;
         for (int i = 0; i < lines_to_copy; ++i) {
             memcpy(dest, src, bytes_to_copy);
             src += d->bytes_per_line;
@@ -1381,11 +1388,7 @@ int QImage::colorCount() const
     \sa colorTable(), setColor(), {QImage#Image Transformations}{Image
     Transformations}
 */
-#if QT_VERSION >= QT_VERSION_CHECK(6,0,0)
 void QImage::setColorTable(const QVector<QRgb> &colors)
-#else
-void QImage::setColorTable(const QVector<QRgb> colors)
-#endif
 {
     if (!d)
         return;
@@ -1395,11 +1398,7 @@ void QImage::setColorTable(const QVector<QRgb> colors)
     if (!d)
         return;
 
-#if QT_VERSION >= QT_VERSION_CHECK(6,0,0)
     d->colortable = colors;
-#else
-    d->colortable = std::move(const_cast<QVector<QRgb>&>(colors));
-#endif
     d->has_alpha_clut = false;
     for (int i = 0; i < d->colortable.size(); ++i) {
         if (qAlpha(d->colortable.at(i)) != 255) {
@@ -1472,25 +1471,6 @@ void QImage::setDevicePixelRatio(qreal scaleFactor)
         d->devicePixelRatio = scaleFactor;
 }
 
-#if QT_DEPRECATED_SINCE(5, 10)
-/*!
-    \since 4.6
-    \obsolete
-    Returns the number of bytes occupied by the image data.
-
-    Note this method should never be called on an image larger than 2 gigabytes.
-    Instead use sizeInBytes().
-
-    \sa sizeInBytes(), bytesPerLine(), bits(), {QImage#Image Information}{Image
-    Information}
-*/
-int QImage::byteCount() const
-{
-    Q_ASSERT(!d || d->nbytes < std::numeric_limits<int>::max());
-    return d ? int(d->nbytes) : 0;
-}
-#endif
-
 /*!
     \since 5.10
     Returns the image data size in bytes.
@@ -1510,17 +1490,10 @@ qsizetype QImage::sizeInBytes() const
 
     \sa scanLine()
 */
-#if QT_VERSION >= QT_VERSION_CHECK(6,0,0)
 qsizetype QImage::bytesPerLine() const
 {
     return d ? d->bytes_per_line : 0;
 }
-#else
-int QImage::bytesPerLine() const
-{
-    return d ? d->bytes_per_line : 0;
-}
-#endif
 
 
 /*!
@@ -1924,11 +1897,11 @@ void QImage::invertPixels(InvertMode mode)
 
     if (depth() < 32) {
         // This assumes no alpha-channel as the only formats with non-premultipled alpha are 32bit.
-        int bpl = (d->width * d->depth + 7) / 8;
+        qsizetype bpl = (qsizetype(d->width) * d->depth + 7) / 8;
         int pad = d->bytes_per_line - bpl;
         uchar *sl = d->data;
         for (int y=0; y<d->height; ++y) {
-            for (int x=0; x<bpl; ++x)
+            for (qsizetype x=0; x<bpl; ++x)
                 *sl++ ^= 0xff;
             sl += pad;
         }
@@ -2882,65 +2855,6 @@ QImage QImage::scaledToHeight(int h, Qt::TransformationMode mode) const
     return transformed(wm, mode);
 }
 
-
-#if QT_DEPRECATED_SINCE(5, 15)
-
-/*!
-    \obsolete
-
-    Use trueMatrix(const QTransform &matrix, int w, int h) instead.
-
-    \fn QMatrix QImage::trueMatrix(const QMatrix &matrix, int width, int height)
-
-    Returns the actual matrix used for transforming an image with the
-    given \a width, \a height and \a matrix.
-
-    When transforming an image using the transformed() function, the
-    transformation matrix is internally adjusted to compensate for
-    unwanted translation, i.e. transformed() returns the smallest
-    image containing all transformed points of the original image.
-    This function returns the modified matrix, which maps points
-    correctly from the original image into the new image.
-
-    \sa transformed(), {QImage#Image Transformations}{Image
-    Transformations}
-*/
-QMatrix QImage::trueMatrix(const QMatrix &matrix, int w, int h)
-{
-    return trueMatrix(QTransform(matrix), w, h).toAffine();
-}
-
-/*!
-    \obsolete
-
-    Use transformed(const QTransform &matrix, Qt::TransformationMode mode) instead.
-
-    Returns a copy of the image that is transformed using the given
-    transformation \a matrix and transformation \a mode.
-
-    The returned image will normally have the same {Image Formats}{format} as
-    the original image. However, a complex transformation may result in an
-    image where not all pixels are covered by the transformed pixels of the
-    original image. In such cases, those background pixels will be assigned a
-    transparent color value, and the transformed image will be given a format
-    with an alpha channel, even if the orginal image did not have that.
-
-    The transformation \a matrix is internally adjusted to compensate
-    for unwanted translation; i.e. the image produced is the smallest
-    image that contains all the transformed points of the original
-    image. Use the trueMatrix() function to retrieve the actual matrix
-    used for transforming an image.
-
-    \sa trueMatrix(), {QImage#Image Transformations}{Image
-    Transformations}
-*/
-QImage QImage::transformed(const QMatrix &matrix, Qt::TransformationMode mode) const
-{
-    return transformed(QTransform(matrix), mode);
-}
-
-#endif // QT_DEPRECATED_SINCE(5, 15)
-
 /*!
     Builds and returns a 1-bpp mask from the alpha buffer in this
     image. Returns a null image if the image's format is
@@ -4068,71 +3982,10 @@ void QImage::setText(const QString &key, const QString &value)
 }
 
 /*!
-    \fn QString QImage::text(const char* key, const char* language) const
-    \obsolete
-
-    Returns the text recorded for the given \a key in the given \a
-    language, or in a default language if \a language is \nullptr.
-
-    Use text() instead.
-
-    The language the text is recorded in is no longer relevant since
-    the text is always set using QString and UTF-8 representation.
-*/
-
-/*!
-    \fn QString QImage::text(const QImageTextKeyLang& keywordAndLanguage) const
-    \overload
-    \obsolete
-
-    Returns the text recorded for the given \a keywordAndLanguage.
-
-    Use text() instead.
-
-    The language the text is recorded in is no longer relevant since
-    the text is always set using QString and UTF-8 representation.
-*/
-
-/*!
-    \fn void QImage::setText(const char* key, const char* language, const QString& text)
-    \obsolete
-
-    Sets the image text to the given \a text and associate it with the
-    given \a key. The text is recorded in the specified \a language,
-    or in a default language if \a language is \nullptr.
-
-    Use setText() instead.
-
-    The language the text is recorded in is no longer relevant since
-    the text is always set using QString and UTF-8 representation.
-
-    \omit
-    Records string \a  for the keyword \a key. The \a key should be
-    a portable keyword recognizable by other software - some suggested
-    values can be found in
-    \l{http://www.libpng.org/pub/png/spec/1.2/png-1.2-pdg.html#C.Anc-text}
-    {the PNG specification}. \a s can be any text. \a lang should
-    specify the language code (see
-    \l{http://www.rfc-editor.org/rfc/rfc1766.txt}{RFC 1766}) or \nullptr.
-    \endomit
-*/
-
-/*
-    Sets the image bits to the \a pixmap contents and returns a
-    reference to the image.
-
-    If the image shares data with other images, it will first
-    dereference the shared data.
-
-    Makes a call to QPixmap::convertToImage().
-*/
-
-/*!
     \internal
 
     Used by QPainter to retrieve a paint engine for the image.
 */
-
 QPaintEngine *QImage::paintEngine() const
 {
     if (!d)
@@ -4264,8 +4117,8 @@ int QImage::metric(PaintDeviceMetric metric) const
                         trigy += m12;
         // END OF MACRO
 bool qt_xForm_helper(const QTransform &trueMat, int xoffset, int type, int depth,
-                     uchar *dptr, int dbpl, int p_inc, int dHeight,
-                     const uchar *sptr, int sbpl, int sWidth, int sHeight)
+                     uchar *dptr, qsizetype dbpl, int p_inc, int dHeight,
+                     const uchar *sptr, qsizetype sbpl, int sWidth, int sHeight)
 {
     int m11 = int(trueMat.m11()*4096.0);
     int m12 = int(trueMat.m12()*4096.0);
@@ -4378,22 +4231,6 @@ bool qt_xForm_helper(const QTransform &trueMat, int xoffset, int type, int depth
 #undef IWX_LSB
 #undef IWX_PIX
 
-/*! \fn int QImage::serialNumber() const
-    \obsolete
-    Returns a number that identifies the contents of this
-    QImage object. Distinct QImage objects can only have the same
-    serial number if they refer to the same contents (but they don't
-    have to).
-
-    Use cacheKey() instead.
-
-    \warning The serial number doesn't necessarily change when the
-    image is altered. This means that it may be dangerous to use
-    it as a cache key.
-
-    \sa operator==()
-*/
-
 /*!
     Returns a number that identifies the contents of this QImage
     object. Distinct QImage objects can only have the same key if they
@@ -4823,7 +4660,7 @@ QImage QImage::transformed(const QTransform &matrix, Qt::TransformationMode mode
 
     int bpp = depth();
 
-    int sbpl = bytesPerLine();
+    qsizetype sbpl = bytesPerLine();
     const uchar *sptr = bits();
 
     QImage::Format target_format = d->format;
@@ -4878,7 +4715,7 @@ QImage QImage::transformed(const QTransform &matrix, Qt::TransformationMode mode
 
         // create target image (some of the code is from QImage::copy())
         int type = format() == Format_Mono ? QT_XFORM_TYPE_MSBFIRST : QT_XFORM_TYPE_LSBFIRST;
-        int dbpl = dImage.bytesPerLine();
+        qsizetype dbpl = dImage.bytesPerLine();
         qt_xForm_helper(mat, 0, type, bpp, dImage.bits(), dbpl, 0, hd, sptr, sbpl, ws, hs);
     }
     copyMetadata(dImage.d, d);
@@ -5099,50 +4936,6 @@ QDebug operator<<(QDebug dbg, const QImage &i)
 }
 #endif
 
-/*!
-    \fn void QImage::setNumColors(int n)
-    \obsolete
-
-    Resizes the color table to contain \a n entries.
-
-    \sa setColorCount()
- */
-
-/*!
-    \fn int QImage::numBytes() const
-    \obsolete
-
-    Returns the number of bytes occupied by the image data.
-
-    \sa sizeInBytes()
- */
-
-/*!
-    \fn QStringList QImage::textLanguages() const
-    \obsolete
-
-    Returns the language identifiers for which some texts are recorded.
-    Note that if you want to iterate over the list, you should iterate over a copy.
-
-    The language the text is recorded in is no longer relevant since the text is
-    always set using QString and UTF-8 representation.
-
-    \sa textKeys()
- */
-
-/*!
-    \fn QList<QImageTextKeyLang> QImage::textList() const
-    \obsolete
-
-    Returns a list of QImageTextKeyLang objects that enumerate all the texts
-    key/language pairs set for this image.
-
-    The language the text is recorded in is no longer relevant since the text
-    is always set using QString and UTF-8 representation.
-
-    \sa textKeys()
- */
-
 static Q_CONSTEXPR QPixelFormat pixelformats[] = {
         //QImage::Format_Invalid:
         QPixelFormat(),
diff --git a/src/gui/image/qimage.h b/src/gui/image/qimage.h
index 56824e5ee7..df8d2729ef 100644
--- a/src/gui/image/qimage.h
+++ b/src/gui/image/qimage.h
@@ -50,10 +50,6 @@
 #include <QtCore/qrect.h>
 #include <QtCore/qstring.h>
 
-#if QT_DEPRECATED_SINCE(5, 0)
-#include <QtCore/qstringlist.h>
-#endif
-
 #if defined(Q_OS_DARWIN) || defined(Q_QDOC)
 Q_FORWARD_DECLARE_MUTABLE_CG_TYPE(CGImage);
 #endif
@@ -64,35 +60,12 @@ QT_BEGIN_NAMESPACE
 class QColorSpace;
 class QColorTransform;
 class QIODevice;
-class QMatrix;
 class QStringList;
 class QTransform;
 class QVariant;
-template <class T> class QList;
 template <class T> class QVector;
 
 struct QImageData;
-class QImageDataMisc; // internal
-#if QT_DEPRECATED_SINCE(5, 0)
-class QImageTextKeyLang {
-public:
-    QT_DEPRECATED QImageTextKeyLang(const char* k, const char* l) : key(k), lang(l) { }
-    QT_DEPRECATED QImageTextKeyLang() { }
-
-    QByteArray key;
-    QByteArray lang;
-
-    bool operator< (const QImageTextKeyLang& other) const
-        { return key < other.key || (key==other.key && lang < other.lang); }
-    bool operator== (const QImageTextKeyLang& other) const
-        { return key==other.key && lang==other.lang; }
-    inline bool operator!= (const QImageTextKeyLang &other) const
-        { return !operator==(other); }
-private:
-    friend class QImage;
-    QImageTextKeyLang(bool /*dummy*/) {}
-};
-#endif
 
 typedef void (*QImageCleanupFunction)(void*);
 
@@ -143,8 +116,13 @@ public:
     QImage(int width, int height, Format format);
     QImage(uchar *data, int width, int height, Format format, QImageCleanupFunction cleanupFunction = nullptr, void *cleanupInfo = nullptr);
     QImage(const uchar *data, int width, int height, Format format, QImageCleanupFunction cleanupFunction = nullptr, void *cleanupInfo = nullptr);
+#if QT_VERSION >= QT_VERSION_CHECK(6,0,0)
+    QImage(uchar *data, int width, int height, qsizetype bytesPerLine, Format format, QImageCleanupFunction cleanupFunction = nullptr, void *cleanupInfo = nullptr);
+    QImage(const uchar *data, int width, int height, qsizetype bytesPerLine, Format format, QImageCleanupFunction cleanupFunction = nullptr, void *cleanupInfo = nullptr);
+#else
     QImage(uchar *data, int width, int height, int bytesPerLine, Format format, QImageCleanupFunction cleanupFunction = nullptr, void *cleanupInfo = nullptr);
     QImage(const uchar *data, int width, int height, int bytesPerLine, Format format, QImageCleanupFunction cleanupFunction = nullptr, void *cleanupInfo = nullptr);
+#endif
 
 #ifndef QT_NO_IMAGEFORMAT_XPM
     explicit QImage(const char * const xpm[]);
@@ -179,7 +157,6 @@ public:
 
     Format format() const;
 
-#if defined(Q_COMPILER_REF_QUALIFIERS) && !defined(QT_COMPILING_QIMAGE_COMPAT_CPP)
     Q_REQUIRED_RESULT Q_ALWAYS_INLINE QImage convertToFormat(Format f, Qt::ImageConversionFlags flags = Qt::AutoColor) const &
     { return convertToFormat_helper(f, flags); }
     Q_REQUIRED_RESULT Q_ALWAYS_INLINE QImage convertToFormat(Format f, Qt::ImageConversionFlags flags = Qt::AutoColor) &&
@@ -189,9 +166,6 @@ public:
         else
             return convertToFormat_helper(f, flags);
     }
-#else
-    Q_REQUIRED_RESULT QImage convertToFormat(Format f, Qt::ImageConversionFlags flags = Qt::AutoColor) const;
-#endif
     Q_REQUIRED_RESULT QImage convertToFormat(Format f, const QVector<QRgb> &colorTable, Qt::ImageConversionFlags flags = Qt::AutoColor) const;
     bool reinterpretAsFormat(Format f);
 
@@ -217,19 +191,12 @@ public:
     const uchar *bits() const;
     const uchar *constBits() const;
 
-#if QT_DEPRECATED_SINCE(5, 10)
-    QT_DEPRECATED_X("Use sizeInBytes") int byteCount() const;
-#endif
     qsizetype sizeInBytes() const;
 
     uchar *scanLine(int);
     const uchar *scanLine(int) const;
     const uchar *constScanLine(int) const;
-#if QT_VERSION >= QT_VERSION_CHECK(6,0,0)
     qsizetype bytesPerLine() const;
-#else
-    int bytesPerLine() const;
-#endif
 
     bool valid(int x, int y) const;
     bool valid(const QPoint &pt) const;
@@ -250,11 +217,7 @@ public:
     void setPixelColor(const QPoint &pt, const QColor &c);
 
     QVector<QRgb> colorTable() const;
-#if QT_VERSION >= QT_VERSION_CHECK(6,0,0)
     void setColorTable(const QVector<QRgb> &colors);
-#else
-    void setColorTable(const QVector<QRgb> colors);
-#endif
 
     qreal devicePixelRatio() const;
     void setDevicePixelRatio(qreal scaleFactor);
@@ -283,15 +246,8 @@ public:
                  Qt::TransformationMode mode = Qt::FastTransformation) const;
     QImage scaledToWidth(int w, Qt::TransformationMode mode = Qt::FastTransformation) const;
     QImage scaledToHeight(int h, Qt::TransformationMode mode = Qt::FastTransformation) const;
-#if QT_DEPRECATED_SINCE(5, 15)
-    QT_DEPRECATED_X("Use transformed(const QTransform &matrix, Qt::TransformationMode mode)")
-    QImage transformed(const QMatrix &matrix, Qt::TransformationMode mode = Qt::FastTransformation) const;
-    QT_DEPRECATED_X("trueMatrix(const QTransform &, int w, int h)")
-    static QMatrix trueMatrix(const QMatrix &, int w, int h);
-#endif // QT_DEPRECATED_SINCE(5, 15)
     QImage transformed(const QTransform &matrix, Qt::TransformationMode mode = Qt::FastTransformation) const;
     static QTransform trueMatrix(const QTransform &, int w, int h);
-#if defined(Q_COMPILER_REF_QUALIFIERS) && !defined(QT_COMPILING_QIMAGE_COMPAT_CPP)
     QImage mirrored(bool horizontally = false, bool vertically = true) const &
         { return mirrored_helper(horizontally, vertically); }
     QImage &&mirrored(bool horizontally = false, bool vertically = true) &&
@@ -300,10 +256,6 @@ public:
         { return rgbSwapped_helper(); }
     QImage &&rgbSwapped() &&
         { rgbSwapped_inplace(); return std::move(*this); }
-#else
-    QImage mirrored(bool horizontally = false, bool vertically = true) const;
-    QImage rgbSwapped() const;
-#endif
     void invertPixels(InvertMode = InvertRgb);
 
     QColorSpace colorSpace() const;
@@ -326,9 +278,6 @@ public:
     inline static QImage fromData(const QByteArray &data, const char *format = nullptr)
         { return fromData(reinterpret_cast<const uchar *>(data.constData()), data.size(), format); }
 
-#if QT_DEPRECATED_SINCE(5, 0)
-    QT_DEPRECATED inline int serialNumber() const { return cacheKey() >> 32; }
-#endif
     qint64 cacheKey() const;
 
     QPaintEngine *paintEngine() const override;
@@ -354,20 +303,6 @@ public:
     CGImageRef toCGImage() const Q_DECL_CF_RETURNS_RETAINED;
 #endif
 
-#if QT_DEPRECATED_SINCE(5, 0)
-    QT_DEPRECATED inline QString text(const char *key, const char *lang = nullptr) const;
-    QT_DEPRECATED inline QList<QImageTextKeyLang> textList() const;
-    QT_DEPRECATED inline QStringList textLanguages() const;
-    QT_DEPRECATED inline QString text(const QImageTextKeyLang&) const;
-    QT_DEPRECATED inline void setText(const char* key, const char* lang, const QString&);
-#endif
-
-#if QT_DEPRECATED_SINCE(5, 0)
-    QT_DEPRECATED inline int numColors() const;
-    QT_DEPRECATED inline void setNumColors(int);
-    QT_DEPRECATED inline int numBytes() const;
-#endif
-
 protected:
     virtual int metric(PaintDeviceMetric metric) const override;
     QImage mirrored_helper(bool horizontal, bool vertical) const;
@@ -402,99 +337,6 @@ inline void QImage::setPixel(const QPoint &pt, uint index_or_rgb) { setPixel(pt.
 inline QColor QImage::pixelColor(const QPoint &pt) const { return pixelColor(pt.x(), pt.y()); }
 inline void QImage::setPixelColor(const QPoint &pt, const QColor &c) { setPixelColor(pt.x(), pt.y(), c); }
 
-#if QT_DEPRECATED_SINCE(5, 0)
-
-QT_WARNING_PUSH
-QT_WARNING_DISABLE_DEPRECATED
-
-inline QString QImage::text(const char* key, const char* lang) const
-{
-    if (!d)
-        return QString();
-    QString k = QString::fromLatin1(key);
-    if (lang && *lang)
-        k += QLatin1Char('/') + QString::fromLatin1(lang);
-    return text(k);
-}
-
-inline QList<QImageTextKeyLang> QImage::textList() const
-{
-    QList<QImageTextKeyLang> imageTextKeys;
-    if (!d)
-        return imageTextKeys;
-    QStringList keys = textKeys();
-    for (int i = 0; i < keys.size(); ++i) {
-        int index = keys.at(i).indexOf(QLatin1Char('/'));
-        if (index > 0) {
-            QImageTextKeyLang tkl(true);
-            tkl.key = keys.at(i).left(index).toLatin1();
-            tkl.lang = keys.at(i).mid(index+1).toLatin1();
-            imageTextKeys += tkl;
-        }
-    }
-
-    return imageTextKeys;
-}
-
-inline QStringList QImage::textLanguages() const
-{
-    if (!d)
-        return QStringList();
-    QStringList keys = textKeys();
-    QStringList languages;
-    for (int i = 0; i < keys.size(); ++i) {
-        int index = keys.at(i).indexOf(QLatin1Char('/'));
-        if (index > 0)
-            languages += keys.at(i).mid(index+1);
-    }
-
-    return languages;
-}
-
-inline QString QImage::text(const QImageTextKeyLang&kl) const
-{
-    if (!d)
-        return QString();
-    QString k = QString::fromLatin1(kl.key.constData());
-    if (!kl.lang.isEmpty())
-        k += QLatin1Char('/') + QString::fromLatin1(kl.lang.constData());
-    return text(k);
-}
-
-inline void QImage::setText(const char* key, const char* lang, const QString &s)
-{
-    if (!d)
-        return;
-    detach();
-
-    // In case detach() ran out of memory
-    if (!d)
-        return;
-
-    QString k = QString::fromLatin1(key);
-    if (lang && *lang)
-        k += QLatin1Char('/') + QString::fromLatin1(lang);
-    setText(k, s);
-}
-
-QT_WARNING_POP
-
-inline int QImage::numColors() const
-{
-    return colorCount();
-}
-
-inline void QImage::setNumColors(int n)
-{
-    setColorCount(n);
-}
-
-inline int QImage::numBytes() const
-{
-    return int(sizeInBytes());
-}
-#endif
-
 // QImage stream functions
 
 #if !defined(QT_NO_DATASTREAM)
diff --git a/src/gui/image/qimage_compat.cpp b/src/gui/image/qimage_compat.cpp
deleted file mode 100644
index ba31a9ac9b..0000000000
--- a/src/gui/image/qimage_compat.cpp
+++ /dev/null
@@ -1,66 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtGui module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifdef QIMAGE_H
-#  error "This file cannot be used with precompiled headers"
-#endif
-#define QT_COMPILING_QIMAGE_COMPAT_CPP
-
-#include "qimage.h"
-
-QT_BEGIN_NAMESPACE
-
-// These implementations must be the same as the inline versions in qimage.h
-
-QImage QImage::convertToFormat(Format f, Qt::ImageConversionFlags flags) const
-{
-    return convertToFormat_helper(f, flags);
-}
-
-QImage QImage::mirrored(bool horizontally, bool vertically) const
-{
-    return mirrored_helper(horizontally, vertically);
-}
-
-QImage QImage::rgbSwapped() const
-{
-    return rgbSwapped_helper();
-}
-
-QT_END_NAMESPACE
diff --git a/src/gui/image/qimage_p.h b/src/gui/image/qimage_p.h
index 0930955f5a..6f6f626858 100644
--- a/src/gui/image/qimage_p.h
+++ b/src/gui/image/qimage_p.h
@@ -67,7 +67,7 @@ struct Q_GUI_EXPORT QImageData {        // internal image data
     QImageData();
     ~QImageData();
     static QImageData *create(const QSize &size, QImage::Format format);
-    static QImageData *create(uchar *data, int w, int h,  int bpl, QImage::Format format, bool readOnly, QImageCleanupFunction cleanupFunction = nullptr, void *cleanupInfo = nullptr);
+    static QImageData *create(uchar *data, int w, int h,  qsizetype bpl, QImage::Format format, bool readOnly, QImageCleanupFunction cleanupFunction = nullptr, void *cleanupInfo = nullptr);
 
     QAtomicInt ref;
 
@@ -140,7 +140,7 @@ QImageData::calculateImageParameters(qsizetype width, qsizetype height, qsizetyp
     qsizetype dummy;
     if (mul_overflow(height, qsizetype(sizeof(uchar *)), &dummy))
         return invalid;                                 // why is this here?
-#if QT_VERSION < QT_VERSION_CHECK(6,0,0)
+#if 1 || QT_VERSION < QT_VERSION_CHECK(6,0,0) // ### can only fix this if QImage dimensions are not int anymore
     // Disallow images where width * depth calculations might overflow
     if (width > (INT_MAX - 31) / depth)
         return invalid;
diff --git a/src/gui/image/qpicture.cpp b/src/gui/image/qpicture.cpp
index 3a32cc7f15..73c97f4436 100644
--- a/src/gui/image/qpicture.cpp
+++ b/src/gui/image/qpicture.cpp
@@ -264,14 +264,14 @@ void QPicture::setData(const char* data, uint size)
     \sa save()
 */
 
-bool QPicture::load(const QString &fileName, const char *format)
+bool QPicture::load(const QString &fileName)
 {
     QFile f(fileName);
     if (!f.open(QIODevice::ReadOnly)) {
         operator=(QPicture());
         return false;
     }
-    return load(&f, format);
+    return load(&f);
 }
 
 /*!
@@ -280,21 +280,8 @@ bool QPicture::load(const QString &fileName, const char *format)
     \a dev is the device to use for loading.
 */
 
-bool QPicture::load(QIODevice *dev, const char *format)
+bool QPicture::load(QIODevice *dev)
 {
-    if(format) {
-#ifndef QT_NO_PICTUREIO
-        QPictureIO io(dev, format);
-        if (io.read()) {
-            operator=(io.picture());
-            return true;
-        }
-#endif
-        qWarning("QPicture::load: No such picture format: %s", format);
-        operator=(QPicture());
-        return false;
-    }
-
     detach();
     QByteArray a = dev->readAll();
 
@@ -312,7 +299,7 @@ bool QPicture::load(QIODevice *dev, const char *format)
     \sa load()
 */
 
-bool QPicture::save(const QString &fileName, const char *format)
+bool QPicture::save(const QString &fileName)
 {
     if (paintingActive()) {
         qWarning("QPicture::save: still being painted on. "
@@ -320,27 +307,10 @@ bool QPicture::save(const QString &fileName, const char *format)
         return false;
     }
 
-
-    if(format) {
-#ifndef QT_NO_PICTUREIO
-        QPictureIO io(fileName, format);
-        bool result = io.write();
-        if (result) {
-            operator=(io.picture());
-        } else if (format)
-#else
-        bool result = false;
-#endif
-        {
-            qWarning("QPicture::save: No such picture format: %s", format);
-        }
-        return result;
-    }
-
     QFile f(fileName);
     if (!f.open(QIODevice::WriteOnly))
         return false;
-    return save(&f, format);
+    return save(&f);
 }
 
 /*!
@@ -349,7 +319,7 @@ bool QPicture::save(const QString &fileName, const char *format)
     \a dev is the device to use for saving.
 */
 
-bool QPicture::save(QIODevice *dev, const char *format)
+bool QPicture::save(QIODevice *dev)
 {
     if (paintingActive()) {
         qWarning("QPicture::save: still being painted on. "
@@ -357,22 +327,6 @@ bool QPicture::save(QIODevice *dev, const char *format)
         return false;
     }
 
-    if(format) {
-#ifndef QT_NO_PICTUREIO
-        QPictureIO io(dev, format);
-        bool result = io.write();
-        if (result) {
-            operator=(io.picture());
-        } else if (format)
-#else
-        bool result = false;
-#endif
-        {
-            qWarning("QPicture::save: No such picture format: %s", format);
-        }
-        return result;
-    }
-
     dev->write(d_func()->pictb.buffer(), d_func()->pictb.buffer().size());
     return true;
 }
@@ -511,7 +465,7 @@ bool QPicture::exec(QPainter *painter, QDataStream &s, int nrecords)
     QPen        pen;
     QBrush      brush;
     QRegion     rgn;
-    QMatrix     wmatrix;
+    qreal       wmatrix[6];
     QTransform  matrix;
 
     QTransform worldMatrix = painter->transform();
@@ -866,8 +820,12 @@ bool QPicture::exec(QPainter *painter, QDataStream &s, int nrecords)
             if (d->formatMajor >= 8) {
                 s >> matrix >> i_8;
             } else {
-                s >> wmatrix >> i_8;
-                matrix = QTransform(wmatrix);
+                s >> wmatrix[0] >> wmatrix[1]
+                  >> wmatrix[2] >> wmatrix[3]
+                  >> wmatrix[4] >> wmatrix[5] >> i_8;
+                matrix = QTransform(wmatrix[0], wmatrix[1],
+                                    wmatrix[2], wmatrix[3],
+                                    wmatrix[4], wmatrix[5]);
             }
             // i_8 is always false due to updateXForm() in qpaintengine_pic.cpp
             painter->setTransform(matrix * worldMatrix, i_8);
@@ -1189,780 +1147,6 @@ QDataStream &operator>>(QDataStream &s, QPicture &r)
 }
 #endif // QT_NO_DATASTREAM
 
-
-#ifndef QT_NO_PICTUREIO
-
-QT_BEGIN_INCLUDE_NAMESPACE
-#include "qregexp.h"
-#include "qpictureformatplugin.h"
-QT_END_INCLUDE_NAMESPACE
-
-#if QT_DEPRECATED_SINCE(5, 10)
-/*!
-    \obsolete
-
-    Returns a string that specifies the picture format of the file \a
-    fileName, or \nullptr if the file cannot be read or if the format
-    is not recognized.
-
-    \sa load(), save()
-*/
-
-const char* QPicture::pictureFormat(const QString &fileName)
-{
-    const QByteArray format = QPictureIO::pictureFormat(fileName);
-    // This function returns a const char * from a QByteArray.
-    // Double check that the QByteArray is not detached, otherwise
-    // we would return a dangling pointer.
-    Q_ASSERT(!format.isDetached());
-    return format;
-}
-
-/*!
-    \obsolete
-
-    Returns a list of picture formats that are supported for picture
-    input.
-
-    \sa outputFormats(), inputFormatList(), QPictureIO
-*/
-QList<QByteArray> QPicture::inputFormats()
-{
-    return QPictureIO::inputFormats();
-}
-
-static QStringList qToStringList(const QList<QByteArray> &arr)
-{
-    QStringList list;
-    const int count = arr.count();
-    list.reserve(count);
-    for (int i = 0; i < count; ++i)
-        list.append(QString::fromLatin1(arr.at(i)));
-    return list;
-}
-
-/*!
-    \obsolete
-
-    Returns a list of picture formats that are supported for picture
-    input.
-
-    Note that if you want to iterate over the list, you should iterate
-    over a copy, e.g.
-    \snippet picture/picture.cpp 2
-
-    \sa outputFormatList(), inputFormats(), QPictureIO
-*/
-QStringList QPicture::inputFormatList()
-{
-    return qToStringList(QPictureIO::inputFormats());
-}
-
-
-/*!
-    \obsolete
-
-    Returns a list of picture formats that are supported for picture
-    output.
-
-    Note that if you want to iterate over the list, you should iterate
-    over a copy, e.g.
-    \snippet picture/picture.cpp 3
-
-    \sa inputFormatList(), outputFormats(), QPictureIO
-*/
-QStringList QPicture::outputFormatList()
-{
-    return qToStringList(QPictureIO::outputFormats());
-}
-
-/*!
-    \obsolete
-
-    Returns a list of picture formats that are supported for picture
-    output.
-
-    \sa inputFormats(), outputFormatList(), QPictureIO
-*/
-QList<QByteArray> QPicture::outputFormats()
-{
-    return QPictureIO::outputFormats();
-}
-#endif // QT_DEPRECATED_SINCE(5, 10)
-
-/*****************************************************************************
-  QPictureIO member functions
- *****************************************************************************/
-
-/*!
-    \obsolete
-
-    \class QPictureIO
-
-    \brief The QPictureIO class contains parameters for loading and
-    saving pictures.
-
-    \ingroup painting
-    \ingroup io
-    \inmodule QtGui
-
-    QPictureIO contains a QIODevice object that is used for picture data
-    I/O. The programmer can install new picture file formats in addition
-    to those that Qt provides.
-
-    You don't normally need to use this class; QPicture::load(),
-    QPicture::save().
-
-    \sa QPicture, QPixmap, QFile
-*/
-
-struct QPictureIOData
-{
-    QPicture        pi;                                // picture
-    int                iostat;                                // IO status
-    QByteArray        frmt;                                // picture format
-    QIODevice  *iodev;                                // IO device
-    QString        fname;                                // file name
-    QString     descr;                                // picture description
-    const char *parameters;
-    int quality;
-    float gamma;
-};
-
-/*!
-    Constructs a QPictureIO object with all parameters set to zero.
-*/
-
-QPictureIO::QPictureIO()
-{
-    init();
-}
-
-/*!
-    Constructs a QPictureIO object with the I/O device \a ioDevice and a
-    \a format tag.
-*/
-
-QPictureIO::QPictureIO(QIODevice *ioDevice, const char *format)
-{
-    init();
-    d->iodev = ioDevice;
-    d->frmt = format;
-}
-
-/*!
-    Constructs a QPictureIO object with the file name \a fileName and a
-    \a format tag.
-*/
-
-QPictureIO::QPictureIO(const QString &fileName, const char* format)
-{
-    init();
-    d->frmt = format;
-    d->fname = fileName;
-}
-
-/*!
-    Contains initialization common to all QPictureIO constructors.
-*/
-
-void QPictureIO::init()
-{
-    d = new QPictureIOData();
-    d->parameters = nullptr;
-    d->quality = -1; // default quality of the current format
-    d->gamma=0.0f;
-    d->iostat = 0;
-    d->iodev  = nullptr;
-}
-
-/*!
-    Destroys the object and all related data.
-*/
-
-QPictureIO::~QPictureIO()
-{
-    if (d->parameters)
-        delete [] d->parameters;
-    delete d;
-}
-
-
-/*****************************************************************************
-  QPictureIO picture handler functions
- *****************************************************************************/
-
-class QPictureHandler
-{
-public:
-    QPictureHandler(const char *f, const char *h, const QByteArray& fl,
-                     picture_io_handler r, picture_io_handler w);
-    QByteArray              format;                        // picture format
-    QRegExp              header;                        // picture header pattern
-    enum TMode { Untranslated=0, TranslateIn, TranslateInOut } text_mode;
-    picture_io_handler  read_picture;                // picture read function
-    picture_io_handler  write_picture;                // picture write function
-    bool              obsolete;                        // support not "published"
-};
-
-QPictureHandler::QPictureHandler(const char *f, const char *h, const QByteArray& fl,
-                              picture_io_handler r, picture_io_handler w)
-    : format(f), header(QString::fromLatin1(h))
-{
-    text_mode = Untranslated;
-    if (fl.contains('t'))
-        text_mode = TranslateIn;
-    else if (fl.contains('T'))
-        text_mode = TranslateInOut;
-    obsolete = fl.contains('O');
-    read_picture  = r;
-    write_picture = w;
-}
-
-typedef QList<QPictureHandler *> QPHList;
-Q_GLOBAL_STATIC(QPHList, pictureHandlers)
-
-void qt_init_picture_plugins()
-{
-    typedef QMultiMap<int, QString> PluginKeyMap;
-    typedef PluginKeyMap::const_iterator PluginKeyMapConstIterator;
-
-    static QBasicMutex mutex;
-    const auto locker = qt_scoped_lock(mutex);
-    static QFactoryLoader loader(QPictureFormatInterface_iid,
-                                 QStringLiteral("/pictureformats"));
-
-    const PluginKeyMap keyMap = loader.keyMap();
-    const PluginKeyMapConstIterator cend = keyMap.constEnd();
-    for (PluginKeyMapConstIterator it = keyMap.constBegin(); it != cend; ++it) {
-        if (QPictureFormatPlugin *format = qobject_cast<QPictureFormatPlugin*>(loader.instance(it.key())))
-            format->installIOHandler(it.value());
-    }
-}
-
-static void cleanup()
-{
-    // make sure that picture handlers are delete before plugin manager
-    if (QPHList *list = pictureHandlers()) {
-        qDeleteAll(*list);
-        list->clear();
-    }
-}
-
-void qt_init_picture_handlers()                // initialize picture handlers
-{
-    static QBasicAtomicInt done = Q_BASIC_ATOMIC_INITIALIZER(0);
-    if (done.testAndSetRelaxed(0, 1)) {
-        qAddPostRoutine(cleanup);
-    }
-}
-
-static QPictureHandler *get_picture_handler(const char *format)
-{                                                // get pointer to handler
-    qt_init_picture_handlers();
-    qt_init_picture_plugins();
-    if (QPHList *list = pictureHandlers()) {
-        for (int i = 0; i < list->size(); ++i) {
-            if (list->at(i)->format == format)
-                return list->at(i);
-        }
-    }
-    return nullptr;                                        // no such handler
-}
-
-
-/*!
-    Defines a picture I/O handler for the picture format called \a
-    format, which is recognized using the regular
-    expression defined in \a header, read using \a readPicture and
-    written using \a writePicture.
-
-    \a flags is a string of single-character flags for this format.
-    The only flag defined currently is T (upper case), so the only
-    legal value for \a flags are "T" and the empty string. The "T"
-    flag means that the picture file is a text file, and Qt should treat
-    all newline conventions as equivalent. (XPM files and some PPM
-    files are text files for example.)
-
-    \a format is used to select a handler to write a QPicture; \a header
-    is used to select a handler to read an picture file.
-
-    If \a readPicture is \nullptr, the QPictureIO will not be able
-    to read pictures in \a format. If \a writePicture is \nullptr,
-    the QPictureIO will not be able to write pictures in \a format. If
-    both are null, the QPictureIO object is valid but useless.
-
-    Example:
-    \snippet picture/picture.cpp 6
-    \codeline
-    \snippet picture/picture.cpp 7
-    \codeline
-    \snippet picture/picture.cpp 8
-
-    Before the regular expression test, all the 0 bytes in the file header are
-    converted to 1 bytes. This is done because when Qt was ASCII-based, QRegExp
-    could not handle 0 bytes in strings.
-
-    The regexp is only applied on the first 14 bytes of the file.
-
-    (Note that if one handlerIO supports writing a format and another
-    supports reading it, Qt supports both reading and writing. If two
-    handlers support the same operation, Qt chooses one arbitrarily.)
-*/
-
-void QPictureIO::defineIOHandler(const char *format,
-                                 const char *header,
-                                 const char *flags,
-                                 picture_io_handler readPicture,
-                                 picture_io_handler writePicture)
-{
-    qt_init_picture_handlers();
-    if (QPHList *list = pictureHandlers()) {
-        QPictureHandler *p;
-        p = new QPictureHandler(format, header, QByteArray(flags), readPicture, writePicture);
-        list->prepend(p);
-    }
-}
-
-
-/*****************************************************************************
-  QPictureIO normal member functions
- *****************************************************************************/
-
-/*!
-    Returns the picture currently set.
-
-    \sa setPicture()
-*/
-const QPicture &QPictureIO::picture() const { return d->pi; }
-
-/*!
-    Returns the picture's IO status. A non-zero value indicates an
-    error, whereas 0 means that the IO operation was successful.
-
-    \sa setStatus()
-*/
-int QPictureIO::status() const { return d->iostat; }
-
-/*!
-    Returns the picture format string or \nullptr if no format has been
-    explicitly set.
-*/
-const char *QPictureIO::format() const { return d->frmt; }
-
-/*!
-    Returns the IO device currently set.
-
-    \sa setIODevice()
-*/
-QIODevice *QPictureIO::ioDevice() const { return d->iodev; }
-
-/*!
-    Returns the file name currently set.
-
-    \sa setFileName()
-*/
-QString QPictureIO::fileName() const { return d->fname; }
-
-
-/*!
-    Returns the picture description string.
-
-    \sa setDescription()
-*/
-QString QPictureIO::description() const { return d->descr; }
-
-/*!
-    Sets the picture to \a picture.
-
-    \sa picture()
-*/
-void QPictureIO::setPicture(const QPicture &picture)
-{
-    d->pi = picture;
-}
-
-/*!
-    Sets the picture IO status to \a status. A non-zero value indicates
-    an error, whereas 0 means that the IO operation was successful.
-
-    \sa status()
-*/
-void QPictureIO::setStatus(int status)
-{
-    d->iostat = status;
-}
-
-/*!
-    Sets the picture format to \a format for the picture to be read or
-    written.
-
-    It is necessary to specify a format before writing an picture, but
-    it is not necessary to specify a format before reading an picture.
-
-    If no format has been set, Qt guesses the picture format before
-    reading it. If a format is set the picture will only be read if it
-    has that format.
-
-    \sa read(), write(), format()
-*/
-void QPictureIO::setFormat(const char *format)
-{
-    d->frmt = format;
-}
-
-/*!
-    Sets the IO device to be used for reading or writing an picture.
-
-    Setting the IO device allows pictures to be read/written to any
-    block-oriented QIODevice.
-
-    If \a ioDevice is not null, this IO device will override file name
-    settings.
-
-    \sa setFileName()
-*/
-void QPictureIO::setIODevice(QIODevice *ioDevice)
-{
-    d->iodev = ioDevice;
-}
-
-/*!
-    Sets the name of the file to read or write an picture from to \a
-    fileName.
-
-    \sa setIODevice()
-*/
-void QPictureIO::setFileName(const QString &fileName)
-{
-    d->fname = fileName;
-}
-
-/*!
-    Returns the quality of the written picture, related to the
-    compression ratio.
-
-    \sa setQuality(), QPicture::save()
-*/
-int QPictureIO::quality() const
-{
-    return d->quality;
-}
-
-/*!
-    Sets the quality of the written picture to \a q, related to the
-    compression ratio.
-
-    \a q must be in the range -1..100. Specify 0 to obtain small
-    compressed files, 100 for large uncompressed files. (-1 signifies
-    the default compression.)
-
-    \sa quality(), QPicture::save()
-*/
-
-void QPictureIO::setQuality(int q)
-{
-    d->quality = q;
-}
-
-/*!
-    Returns the picture's parameters string.
-
-    \sa setParameters()
-*/
-
-const char *QPictureIO::parameters() const
-{
-    return d->parameters;
-}
-
-/*!
-    Sets the picture's parameter string to \a parameters. This is for
-    picture handlers that require special parameters.
-
-    Although the current picture formats supported by Qt ignore the
-    parameters string, it may be used in future extensions or by
-    contributions (for example, JPEG).
-
-    \sa parameters()
-*/
-
-void QPictureIO::setParameters(const char *parameters)
-{
-    if (d->parameters)
-        delete [] d->parameters;
-    d->parameters = qstrdup(parameters);
-}
-
-/*!
-    Sets the gamma value at which the picture will be viewed to \a
-    gamma. If the picture format stores a gamma value for which the
-    picture is intended to be used, then this setting will be used to
-    modify the picture. Setting to 0.0 will disable gamma correction
-    (i.e. any specification in the file will be ignored).
-
-    The default value is 0.0.
-
-    \sa gamma()
-*/
-void QPictureIO::setGamma(float gamma)
-{
-    d->gamma=gamma;
-}
-
-/*!
-    Returns the gamma value at which the picture will be viewed.
-
-    \sa setGamma()
-*/
-float QPictureIO::gamma() const
-{
-    return d->gamma;
-}
-
-/*!
-    Sets the picture description string for picture handlers that support
-    picture descriptions to \a description.
-
-    Currently, no picture format supported by Qt uses the description
-    string.
-*/
-
-void QPictureIO::setDescription(const QString &description)
-{
-    d->descr = description;
-}
-
-
-/*!
-    Returns a string that specifies the picture format of the file \a
-    fileName, or null if the file cannot be read or if the format is
-    not recognized.
-*/
-
-QByteArray QPictureIO::pictureFormat(const QString &fileName)
-{
-    QFile file(fileName);
-    QByteArray format;
-    if (!file.open(QIODevice::ReadOnly))
-        return format;
-    format = pictureFormat(&file);
-    file.close();
-    return format;
-}
-
-/*!
-    \overload
-
-    Returns a string that specifies the picture format of the picture read
-    from IO device \a d, or 0 if the device cannot be read or if the
-    format is not recognized.
-
-    Make sure that \a d is at the right position in the device (for
-    example, at the beginning of the file).
-
-    \sa QIODevice::pos()
-*/
-
-QByteArray QPictureIO::pictureFormat(QIODevice *d)
-{
-    // if you change this change the documentation for defineIOHandler()
-    const int buflen = 14;
-
-    char buf[buflen];
-    char buf2[buflen];
-    qt_init_picture_handlers();
-    qt_init_picture_plugins();
-    int pos = d->pos();                      // save position
-    int rdlen = d->read(buf, buflen);        // read a few bytes
-
-    QByteArray format;
-    if (rdlen != buflen)
-        return format;
-
-    memcpy(buf2, buf, buflen);
-
-    for (int n = 0; n < rdlen; n++)
-        if (buf[n] == '\0')
-            buf[n] = '\001';
-    if (rdlen > 0) {
-        buf[rdlen - 1] = '\0';
-        QString bufStr = QString::fromLatin1(buf);
-        if (QPHList *list = pictureHandlers()) {
-            for (int i = 0; i < list->size(); ++i) {
-                if (list->at(i)->header.indexIn(bufStr) != -1) { // try match with headers
-                    format = list->at(i)->format;
-                    break;
-                }
-            }
-        }
-    }
-    d->seek(pos);                                // restore position
-    return format;
-}
-
-/*!
-    Returns a sorted list of picture formats that are supported for
-    picture input.
-*/
-QList<QByteArray> QPictureIO::inputFormats()
-{
-    QList<QByteArray> result;
-
-    qt_init_picture_handlers();
-    qt_init_picture_plugins();
-
-    if (QPHList *list = pictureHandlers()) {
-        for (int i = 0; i < list->size(); ++i) {
-            QPictureHandler *p = list->at(i);
-            if (p->read_picture && !p->obsolete  && !result.contains(p->format))
-                result.append(p->format);
-        }
-    }
-    std::sort(result.begin(), result.end());
-
-    return result;
-}
-
-/*!
-    Returns a sorted list of picture formats that are supported for
-    picture output.
-*/
-QList<QByteArray> QPictureIO::outputFormats()
-{
-    qt_init_picture_handlers();
-    qt_init_picture_plugins();
-
-    QList<QByteArray> result;
-    if (QPHList *list = pictureHandlers()) {
-        for (int i = 0; i < list->size(); ++i) {
-            QPictureHandler *p = list->at(i);
-            if (p->write_picture && !p->obsolete && !result.contains(p->format))
-                result.append(p->format);
-        }
-    }
-    return result;
-}
-
-
-
-/*!
-    Reads an picture into memory and returns \c true if the picture was
-    successfully read; otherwise returns \c false.
-
-    Before reading an picture you must set an IO device or a file name.
-    If both an IO device and a file name have been set, the IO device
-    will be used.
-
-    Setting the picture file format string is optional.
-
-    Note that this function does \e not set the \l{format()}{format} used to read the picture. If you need that
-    information, use the pictureFormat() static functions.
-
-    Example:
-
-    \snippet picture/picture.cpp 4
-
-    \sa setIODevice(), setFileName(), setFormat(), write(), QPixmap::load()
-*/
-bool QPictureIO::read()
-{
-    QFile           file;
-    QByteArray      picture_format;
-    QPictureHandler *h;
-
-    if (d->iodev) {                                // read from io device
-        // ok, already open
-    } else if (!d->fname.isEmpty()) {                // read from file
-        file.setFileName(d->fname);
-        if (!file.open(QIODevice::ReadOnly))
-            return false;                        // cannot open file
-        d->iodev = &file;
-    } else {                                        // no file name or io device
-        return false;
-    }
-    if (d->frmt.isEmpty()) {
-        // Try to guess format
-        picture_format = pictureFormat(d->iodev);        // get picture format
-        if (picture_format.isEmpty()) {
-            if (file.isOpen()) {                        // unknown format
-                file.close();
-                d->iodev = nullptr;
-            }
-            return false;
-        }
-    } else {
-        picture_format = d->frmt;
-    }
-
-    h = get_picture_handler(picture_format);
-    if (file.isOpen()) {
-#if !defined(Q_OS_UNIX)
-        if (h && h->text_mode) {                // reopen in translated mode
-            file.close();
-            file.open(QIODevice::ReadOnly | QIODevice::Text);
-        }
-        else
-#endif
-            file.seek(0);                        // position to start
-    }
-    d->iostat = 1;                                        // assume error
-
-    if (h && h->read_picture)
-        (*h->read_picture)(this);
-
-    if (file.isOpen()) {                        // picture was read using file
-        file.close();
-        d->iodev = nullptr;
-    }
-    return d->iostat == 0;                                // picture successfully read?
-}
-
-
-/*!
-    Writes an picture to an IO device and returns \c true if the picture was
-    successfully written; otherwise returns \c false.
-
-    Before writing an picture you must set an IO device or a file name.
-    If both an IO device and a file name have been set, the IO device
-    will be used.
-
-    The picture will be written using the specified picture format.
-
-    Example:
-    \snippet picture/picture.cpp 5
-
-    \sa setIODevice(), setFileName(), setFormat(), read(), QPixmap::save()
-*/
-bool QPictureIO::write()
-{
-    if (d->frmt.isEmpty())
-        return false;
-    QPictureHandler *h = get_picture_handler(d->frmt);
-    if (!h || !h->write_picture) {
-        qWarning("QPictureIO::write: No such picture format handler: %s",
-                 format());
-        return false;
-    }
-    QFile file;
-    if (!d->iodev && !d->fname.isEmpty()) {
-        file.setFileName(d->fname);
-        bool translate = h->text_mode==QPictureHandler::TranslateInOut;
-        QIODevice::OpenMode fmode = translate ? QIODevice::WriteOnly | QIODevice::Text : QIODevice::OpenMode(QIODevice::WriteOnly);
-        if (!file.open(fmode))                // couldn't create file
-            return false;
-        d->iodev = &file;
-    }
-    d->iostat = 1;
-    (*h->write_picture)(this);
-    if (file.isOpen()) {                        // picture was written using file
-        file.close();
-        d->iodev = nullptr;
-    }
-    return d->iostat == 0;                                // picture successfully written?
-}
-#endif //QT_NO_PICTUREIO
-
 QT_END_NAMESPACE
 
 #endif // QT_NO_PICTURE
diff --git a/src/gui/image/qpicture.h b/src/gui/image/qpicture.h
index 189e57b9a3..34860985ed 100644
--- a/src/gui/image/qpicture.h
+++ b/src/gui/image/qpicture.h
@@ -48,7 +48,6 @@
 
 QT_BEGIN_NAMESPACE
 
-
 #ifndef QT_NO_PICTURE
 
 class QPicturePrivate;
@@ -69,10 +68,10 @@ public:
 
     bool play(QPainter *p);
 
-    bool load(QIODevice *dev, const char *format = nullptr);
-    bool load(const QString &fileName, const char *format = nullptr);
-    bool save(QIODevice *dev, const char *format = nullptr);
-    bool save(const QString &fileName, const char *format = nullptr);
+    bool load(QIODevice *dev);
+    bool load(const QString &fileName);
+    bool save(QIODevice *dev);
+    bool save(const QString &fileName);
 
     QRect boundingRect() const;
     void setBoundingRect(const QRect &r);
@@ -88,14 +87,6 @@ public:
     friend Q_GUI_EXPORT QDataStream &operator<<(QDataStream &in, const QPicture &p);
     friend Q_GUI_EXPORT QDataStream &operator>>(QDataStream &in, QPicture &p);
 
-#if QT_DEPRECATED_SINCE(5, 10)
-    static QT_DEPRECATED const char* pictureFormat(const QString &fileName);
-    static QT_DEPRECATED QList<QByteArray> inputFormats();
-    static QT_DEPRECATED QList<QByteArray> outputFormats();
-    static QT_DEPRECATED QStringList inputFormatList();
-    static QT_DEPRECATED QStringList outputFormatList();
-#endif // QT_DEPRECATED_SINCE(5, 10)
-
     QPaintEngine *paintEngine() const override;
 
 protected:
@@ -118,67 +109,6 @@ public:
 
 Q_DECLARE_SHARED(QPicture)
 
-
-#ifndef QT_NO_PICTUREIO
-class QIODevice;
-class QPictureIO;
-typedef void (*picture_io_handler)(QPictureIO *); // picture IO handler
-
-struct QPictureIOData;
-
-class Q_GUI_EXPORT QPictureIO
-{
-public:
-    QPictureIO();
-    QPictureIO(QIODevice *ioDevice, const char *format);
-    QPictureIO(const QString &fileName, const char *format);
-    ~QPictureIO();
-
-    const QPicture &picture() const;
-    int status() const;
-    const char *format() const;
-    QIODevice *ioDevice() const;
-    QString fileName() const;
-    int quality() const;
-    QString description() const;
-    const char *parameters() const;
-    float gamma() const;
-
-    void setPicture(const QPicture &);
-    void setStatus(int);
-    void setFormat(const char *);
-    void setIODevice(QIODevice *);
-    void setFileName(const QString &);
-    void setQuality(int);
-    void setDescription(const QString &);
-    void setParameters(const char *);
-    void setGamma(float);
-
-    bool read();
-    bool write();
-
-    static QByteArray pictureFormat(const QString &fileName);
-    static QByteArray pictureFormat(QIODevice *);
-    static QList<QByteArray> inputFormats();
-    static QList<QByteArray> outputFormats();
-
-    static void defineIOHandler(const char *format,
-                                const char *header,
-                                const char *flags,
-                                picture_io_handler read_picture,
-                                picture_io_handler write_picture);
-
-private:
-    Q_DISABLE_COPY(QPictureIO)
-
-    void init();
-
-    QPictureIOData *d;
-};
-
-#endif //QT_NO_PICTUREIO
-
-
 /*****************************************************************************
   QPicture stream functions
  *****************************************************************************/
diff --git a/src/gui/image/qpictureformatplugin.cpp b/src/gui/image/qpictureformatplugin.cpp
deleted file mode 100644
index ef57ad720f..0000000000
--- a/src/gui/image/qpictureformatplugin.cpp
+++ /dev/null
@@ -1,135 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtGui module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qpictureformatplugin.h"
-#if !defined(QT_NO_PICTURE)
-#include "qpicture.h"
-
-QT_BEGIN_NAMESPACE
-
-/*!
-    \obsolete
-
-    \class QPictureFormatPlugin
-    \brief The QPictureFormatPlugin class provides an abstract base
-    for custom picture format plugins.
-
-    \ingroup plugins
-    \inmodule QtGui
-
-    The picture format plugin is a simple plugin interface that makes
-    it easy to create custom picture formats that can be used
-    transparently by applications.
-
-    Writing an picture format plugin is achieved by subclassing this
-    base class, reimplementing the pure virtual functions
-    loadPicture(), savePicture(), and installIOHandler(), and
-    exporting the class with the Q_PLUGIN_METADATA() macro.
-
-    The json file containing the metadata should contain one entry
-    with the list of picture formats supported by the plugin:
-
-    \code
-    { "Keys": [ "mypictureformat" ] }
-    \endcode
-
-    \sa {How to Create Qt Plugins}
-*/
-
-/*!
-    \fn bool QPictureFormatPlugin::installIOHandler(const QString &format)
-
-    Installs a QPictureIO picture I/O handler for the picture format \a
-    format. Returns \c true on success.
-*/
-
-
-/*!
-    Constructs an picture format plugin with the given \a parent.
-    This is invoked automatically by the moc generated code that exports the plugin.
-*/
-QPictureFormatPlugin::QPictureFormatPlugin(QObject *parent)
-    : QObject(parent)
-{
-}
-
-/*!
-    Destroys the picture format plugin.
-
-    You never have to call this explicitly. Qt destroys a plugin
-    automatically when it is no longer used.
-*/
-QPictureFormatPlugin::~QPictureFormatPlugin()
-{
-}
-
-
-/*!
-    Loads the picture stored in the file called \a fileName, with the
-    given \a format, into *\a picture. Returns \c true on success;
-    otherwise returns \c false.
-
-    \sa savePicture()
-*/
-bool QPictureFormatPlugin::loadPicture(const QString &format, const QString &fileName, QPicture *picture)
-{
-    Q_UNUSED(format)
-    Q_UNUSED(fileName)
-    Q_UNUSED(picture)
-    return false;
-}
-
-/*!
-    Saves the given \a picture into the file called \a fileName,
-    using the specified \a format. Returns \c true on success; otherwise
-    returns \c false.
-
-    \sa loadPicture()
-*/
-bool QPictureFormatPlugin::savePicture(const QString &format, const QString &fileName, const QPicture &picture)
-{
-    Q_UNUSED(format)
-    Q_UNUSED(fileName)
-    Q_UNUSED(picture)
-    return false;
-}
-
-#endif // QT_NO_PICTURE
-
-QT_END_NAMESPACE
diff --git a/src/gui/image/qpictureformatplugin.h b/src/gui/image/qpictureformatplugin.h
deleted file mode 100644
index 3f59c04d79..0000000000
--- a/src/gui/image/qpictureformatplugin.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtGui module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QPICTUREFORMATPLUGIN_H
-#define QPICTUREFORMATPLUGIN_H
-
-#include <QtGui/qtguiglobal.h>
-#include <QtCore/qplugin.h>
-#include <QtCore/qfactoryinterface.h>
-
-QT_BEGIN_NAMESPACE
-
-
-#if !defined(QT_NO_PICTURE)
-
-class QPicture;
-class QImage;
-class QString;
-class QStringList;
-
-#define QPictureFormatInterface_iid "org.qt-project.Qt.QPictureFormatInterface"
-
-class Q_GUI_EXPORT QPictureFormatPlugin : public QObject
-{
-    Q_OBJECT
-public:
-    explicit QPictureFormatPlugin(QObject *parent = nullptr);
-    ~QPictureFormatPlugin();
-
-    virtual bool loadPicture(const QString &format, const QString &filename, QPicture *pic);
-    virtual bool savePicture(const QString &format, const QString &filename, const QPicture &pic);
-    virtual bool installIOHandler(const QString &format) = 0;
-
-};
-
-#endif // QT_NO_PICTURE
-
-QT_END_NAMESPACE
-
-#endif // QPICTUREFORMATPLUGIN_H
diff --git a/src/gui/image/qpixmap.cpp b/src/gui/image/qpixmap.cpp
index 269f236ecd..c162b706cb 100644
--- a/src/gui/image/qpixmap.cpp
+++ b/src/gui/image/qpixmap.cpp
@@ -458,24 +458,6 @@ QTransform QPixmap::trueMatrix(const QTransform &m, int w, int h)
     return QImage::trueMatrix(m, w, h);
 }
 
-#if QT_DEPRECATED_SINCE(5, 15)
-/*!
-  \overload
-  \obsolete
-
-  Use trueMatrix(const QTransform &m, int w, int h) instead.
-
-  This convenience function loads the matrix \a m into a
-  QTransform and calls the overloaded function with the
-  QTransform and the width \a w and the height \a h.
- */
-QMatrix QPixmap::trueMatrix(const QMatrix &m, int w, int h)
-{
-    return trueMatrix(QTransform(m), w, h).toAffine();
-}
-#endif // QT_DEPRECATED_SINCE(5, 15)
-
-
 /*!
     \fn bool QPixmap::isQBitmap() const
 
@@ -1238,29 +1220,6 @@ QPixmap QPixmap::transformed(const QTransform &transform,
     return data->transformed(transform, mode);
 }
 
-#if QT_DEPRECATED_SINCE(5, 15)
-/*!
-  \overload
-  \obsolete
-
-  Use transformed(const QTransform &transform, Qt::TransformationMode mode)() instead.
-
-  This convenience function loads the \a matrix into a
-  QTransform and calls the overloaded function.
- */
-QPixmap QPixmap::transformed(const QMatrix &matrix, Qt::TransformationMode mode) const
-{
-    return transformed(QTransform(matrix), mode);
-}
-#endif // QT_DEPRECATED_SINCE(5, 15)
-
-
-
-
-
-
-
-
 /*!
     \class QPixmap
     \inmodule QtGui
diff --git a/src/gui/image/qpixmap.h b/src/gui/image/qpixmap.h
index e47a9fe59e..2708d267b9 100644
--- a/src/gui/image/qpixmap.h
+++ b/src/gui/image/qpixmap.h
@@ -129,12 +129,6 @@ public:
                    Qt::TransformationMode mode = Qt::FastTransformation) const;
     QPixmap scaledToWidth(int w, Qt::TransformationMode mode = Qt::FastTransformation) const;
     QPixmap scaledToHeight(int h, Qt::TransformationMode mode = Qt::FastTransformation) const;
-#if QT_DEPRECATED_SINCE(5, 15)
-    QT_DEPRECATED_X("Use transformed(const QTransform &, Qt::TransformationMode mode)")
-    QPixmap transformed(const QMatrix &, Qt::TransformationMode mode = Qt::FastTransformation) const;
-    QT_DEPRECATED_X("Use trueMatrix(const QTransform &m, int w, int h)")
-    static QMatrix trueMatrix(const QMatrix &m, int w, int h);
-#endif // QT_DEPRECATED_SINCE(5, 15)
     QPixmap transformed(const QTransform &, Qt::TransformationMode mode = Qt::FastTransformation) const;
     static QTransform trueMatrix(const QTransform &m, int w, int h);
 
diff --git a/src/gui/image/qpixmap_win.cpp b/src/gui/image/qpixmap_win.cpp
index 8aad77b991..be6cd0c5fc 100644
--- a/src/gui/image/qpixmap_win.cpp
+++ b/src/gui/image/qpixmap_win.cpp
@@ -121,7 +121,7 @@ static inline void copyImageDataCreateAlpha(const uchar *data, QImage *target)
     const uint mask = target->format() == QImage::Format_RGB32 ? 0xff000000 : 0;
     const int height = target->height();
     const int width = target->width();
-    const int bytesPerLine = width * int(sizeof(QRgb));
+    const qsizetype bytesPerLine = width * sizeof(QRgb);
     for (int y = 0; y < height; ++y) {
         QRgb *dest = reinterpret_cast<QRgb *>(target->scanLine(y));
         const QRgb *src = reinterpret_cast<const QRgb *>(data + y * bytesPerLine);
diff --git a/src/gui/image/qplatformpixmap.cpp b/src/gui/image/qplatformpixmap.cpp
index 493f55514e..ea4243ba07 100644
--- a/src/gui/image/qplatformpixmap.cpp
+++ b/src/gui/image/qplatformpixmap.cpp
@@ -183,7 +183,7 @@ QBitmap QPlatformPixmap::mask() const
     mask.setColor(0, QColor(Qt::color0).rgba());
     mask.setColor(1, QColor(Qt::color1).rgba());
 
-    const int bpl = mask.bytesPerLine();
+    const qsizetype bpl = mask.bytesPerLine();
 
     for (int y = 0; y < h; ++y) {
         const QRgb *src = reinterpret_cast<const QRgb*>(image.scanLine(y));
@@ -216,7 +216,7 @@ void QPlatformPixmap::setMask(const QBitmap &mask)
             for (int y = 0; y < h; ++y) {
                 const uchar *mscan = imageMask.scanLine(y);
                 uchar *tscan = image.scanLine(y);
-                int bytesPerLine = image.bytesPerLine();
+                qsizetype bytesPerLine = image.bytesPerLine();
                 for (int i = 0; i < bytesPerLine; ++i)
                     tscan[i] &= mscan[i];
             }
diff --git a/src/gui/image/qplatformpixmap.h b/src/gui/image/qplatformpixmap.h
index 7635ac2949..9c7f5e5edf 100644
--- a/src/gui/image/qplatformpixmap.h
+++ b/src/gui/image/qplatformpixmap.h
@@ -163,7 +163,7 @@ private:
 
 #  define QT_XFORM_TYPE_MSBFIRST 0
 #  define QT_XFORM_TYPE_LSBFIRST 1
-Q_GUI_EXPORT bool qt_xForm_helper(const QTransform&, int, int, int, uchar*, int, int, int, const uchar*, int, int, int);
+Q_GUI_EXPORT bool qt_xForm_helper(const QTransform&, int, int, int, uchar*, qsizetype, int, int, const uchar*, qsizetype, int, int);
 
 QT_END_NAMESPACE
 
diff --git a/src/gui/image/qpnghandler.cpp b/src/gui/image/qpnghandler.cpp
index 8435e5a0fe..e6a3604ad4 100644
--- a/src/gui/image/qpnghandler.cpp
+++ b/src/gui/image/qpnghandler.cpp
@@ -455,7 +455,7 @@ static void read_image_scaled(QImage *outImage, png_structp png_ptr, png_infop i
     png_get_IHDR(png_ptr, info_ptr, &width, &height, &bit_depth, &color_type, nullptr, nullptr, nullptr);
     png_get_oFFs(png_ptr, info_ptr, &offset_x, &offset_y, &unit_type);
     uchar *data = outImage->bits();
-    int bpl = outImage->bytesPerLine();
+    qsizetype bpl = outImage->bytesPerLine();
 
     if (scaledSize.isEmpty() || !width || !height)
         return;
@@ -709,7 +709,7 @@ bool QPngHandlerPrivate::readPngImage(QImage *outImage)
         png_get_IHDR(png_ptr, info_ptr, &width, &height, &bit_depth, &color_type, nullptr, nullptr, nullptr);
         png_get_oFFs(png_ptr, info_ptr, &offset_x, &offset_y, &unit_type);
         uchar *data = outImage->bits();
-        int bpl = outImage->bytesPerLine();
+        qsizetype bpl = outImage->bytesPerLine();
         amp.row_pointers = new png_bytep[height];
 
         for (uint y = 0; y < height; y++)
diff --git a/src/gui/image/qppmhandler.cpp b/src/gui/image/qppmhandler.cpp
index 13ee2eadd2..195e58d283 100644
--- a/src/gui/image/qppmhandler.cpp
+++ b/src/gui/image/qppmhandler.cpp
@@ -135,7 +135,7 @@ static inline QRgb scale_pbm_color(quint16 mx, quint16 rv, quint16 gv, quint16 b
 static bool read_pbm_body(QIODevice *device, char type, int w, int h, int mcc, QImage *outImage)
 {
     int nbits, y;
-    int pbm_bpl;
+    qsizetype pbm_bpl;
     bool raw;
 
     QImage::Format format;
@@ -166,7 +166,7 @@ static bool read_pbm_body(QIODevice *device, char type, int w, int h, int mcc, Q
             return false;
     }
 
-    pbm_bpl = (nbits*w+7)/8;                        // bytes per scanline in PBM
+    pbm_bpl = (qsizetype(w) * nbits + 7) / 8;   // bytes per scanline in PBM
 
     if (raw) {                                // read raw data
         if (nbits == 32) {                        // type 6
@@ -225,14 +225,14 @@ static bool read_pbm_body(QIODevice *device, char type, int w, int h, int mcc, Q
                 if (device->read((char *)p, pbm_bpl) != pbm_bpl)
                     return false;
                 if (nbits == 8 && mcc < 255) {
-                    for (int i = 0; i < pbm_bpl; i++)
+                    for (qsizetype i = 0; i < pbm_bpl; i++)
                         p[i] = (p[i] * 255) / mcc;
                 }
             }
         }
     } else {                                        // read ascii data
         uchar *p;
-        int n;
+        qsizetype n;
         char buf;
         for (y = 0; (y < h) && (device->peek(&buf, 1) == 1); y++) {
             p = outImage->scanLine(y);
@@ -367,7 +367,7 @@ static bool write_pbm_image(QIODevice *out, const QImage &sourceImage, const QBy
             str.append("255\n");
             if (out->write(str, str.length()) != str.length())
                 return false;
-            uint bpl = w * (gray ? 1 : 3);
+            qsizetype bpl = qsizetype(w) * (gray ? 1 : 3);
             uchar *buf = new uchar[bpl];
             if (image.format() == QImage::Format_Indexed8) {
                 QVector<QRgb> color = image.colorTable();
@@ -388,7 +388,7 @@ static bool write_pbm_image(QIODevice *out, const QImage &sourceImage, const QBy
                             *p++ = qBlue(rgb);
                         }
                     }
-                    if (bpl != (uint)out->write((char*)buf, bpl))
+                    if (bpl != (qsizetype)out->write((char*)buf, bpl))
                         return false;
                 }
             } else {
@@ -407,7 +407,7 @@ static bool write_pbm_image(QIODevice *out, const QImage &sourceImage, const QBy
                             *p++ = color;
                         }
                     }
-                    if (bpl != (uint)out->write((char*)buf, bpl))
+                    if (bpl != (qsizetype)out->write((char*)buf, bpl))
                         return false;
                 }
             }
@@ -420,7 +420,7 @@ static bool write_pbm_image(QIODevice *out, const QImage &sourceImage, const QBy
             str.append("255\n");
             if (out->write(str, str.length()) != str.length())
                 return false;
-            uint bpl = w * 3;
+            qsizetype bpl = qsizetype(w) * 3;
             uchar *buf = new uchar[bpl];
             for (uint y=0; y<h; y++) {
                 const QRgb  *b = reinterpret_cast<const QRgb *>(image.constScanLine(y));
@@ -432,7 +432,7 @@ static bool write_pbm_image(QIODevice *out, const QImage &sourceImage, const QBy
                     *p++ = qGreen(rgb);
                     *p++ = qBlue(rgb);
                 }
-                if (bpl != (uint)out->write((char*)buf, bpl))
+                if (bpl != (qsizetype)out->write((char*)buf, bpl))
                     return false;
             }
             delete [] buf;
diff --git a/src/gui/itemmodels/qstandarditemmodel.h b/src/gui/itemmodels/qstandarditemmodel.h
index a9ee25da75..f1c6e6df5c 100644
--- a/src/gui/itemmodels/qstandarditemmodel.h
+++ b/src/gui/itemmodels/qstandarditemmodel.h
@@ -53,8 +53,6 @@ QT_REQUIRE_CONFIG(standarditemmodel);
 
 QT_BEGIN_NAMESPACE
 
-template <class T> class QList;
-
 class QStandardItemModel;
 
 class QStandardItemPrivate;
@@ -344,8 +342,11 @@ public:
 
     QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
     bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) override;
-    // Qt 6: add override keyword
-    bool clearItemData(const QModelIndex &index);
+    bool clearItemData(const QModelIndex &index)
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+    override
+#endif
+    ;
 
     QVariant headerData(int section, Qt::Orientation orientation,
                         int role = Qt::DisplayRole) const override;
diff --git a/src/gui/kernel/kernel.pri b/src/gui/kernel/kernel.pri
index 9c80f1e2cc..d47fd6e4e4 100644
--- a/src/gui/kernel/kernel.pri
+++ b/src/gui/kernel/kernel.pri
@@ -48,11 +48,8 @@ HEADERS += \
         kernel/qinputmethod.h \
         kernel/qinputmethod_p.h \
         kernel/qinternalmimedata_p.h \
-        kernel/qkeysequence.h \
-        kernel/qkeysequence_p.h \
         kernel/qkeymapper_p.h \
         kernel/qpalette.h \
-        kernel/qshortcutmap_p.h \
         kernel/qsessionmanager.h \
         kernel/qsessionmanager_p.h \
         kernel/qwindowdefs.h \
@@ -108,12 +105,10 @@ SOURCES += \
         kernel/qevent.cpp \
         kernel/qinputmethod.cpp \
         kernel/qinternalmimedata.cpp \
-        kernel/qkeysequence.cpp \
         kernel/qkeymapper.cpp \
         kernel/qpalette.cpp \
         kernel/qguivariant.cpp \
         kernel/qscreen.cpp \
-        kernel/qshortcutmap.cpp \
         kernel/qstylehints.cpp \
         kernel/qtouchdevice.cpp \
         kernel/qplatformsharedgraphicscache.cpp \
@@ -131,6 +126,18 @@ SOURCES += \
         kernel/qhighdpiscaling.cpp \
         kernel/qtestsupport_gui.cpp
 
+qtConfig(action) {
+    HEADERS += \
+        kernel/qguiaction.h \
+        kernel/qguiaction_p.h \
+        kernel/qguiactiongroup.h \
+        kernel/qguiactiongroup_p.h
+
+    SOURCES += \
+        kernel/qguiactiongroup.cpp \
+        kernel/qguiaction.cpp
+}
+
 qtConfig(draganddrop) {
     HEADERS += \
         kernel/qdnd_p.h \
@@ -151,13 +158,24 @@ qtConfig(opengl) {
     HEADERS += \
             kernel/qplatformopenglcontext.h \
             kernel/qopenglcontext.h \
-            kernel/qopenglcontext_p.h \
-            kernel/qopenglwindow.h
+            kernel/qopenglcontext_p.h
 
     SOURCES += \
             kernel/qplatformopenglcontext.cpp \
-            kernel/qopenglcontext.cpp \
-            kernel/qopenglwindow.cpp
+            kernel/qopenglcontext.cpp
+}
+
+qtConfig(shortcut) {
+    HEADERS += \
+            kernel/qguishortcut.h \
+            kernel/qguishortcut_p.h \
+            kernel/qshortcutmap_p.h \
+            kernel/qkeysequence.h \
+            kernel/qkeysequence_p.h
+    SOURCES += \
+            kernel/qguishortcut.cpp \
+            kernel/qshortcutmap.cpp \
+            kernel/qkeysequence.cpp
 }
 
 win32:HEADERS+=kernel/qwindowdefs_win.h
diff --git a/src/gui/kernel/qevent.cpp b/src/gui/kernel/qevent.cpp
index 17aa550606..edb602407a 100644
--- a/src/gui/kernel/qevent.cpp
+++ b/src/gui/kernel/qevent.cpp
@@ -1235,7 +1235,7 @@ Qt::KeyboardModifiers QKeyEvent::modifiers() const
     return QInputEvent::modifiers();
 }
 
-#ifndef QT_NO_SHORTCUT
+#if QT_CONFIG(shortcut)
 /*!
     \fn bool QKeyEvent::matches(QKeySequence::StandardKey key) const
     \since 4.2
@@ -1251,7 +1251,7 @@ bool QKeyEvent::matches(QKeySequence::StandardKey matchKey) const
     const QList<QKeySequence> bindings = QKeySequence::keyBindings(matchKey);
     return bindings.contains(QKeySequence(searchkey));
 }
-#endif // QT_NO_SHORTCUT
+#endif // QT_CONFIG(shortcut)
 
 
 /*!
@@ -2063,7 +2063,6 @@ QInputMethodEvent::QInputMethodEvent(const QInputMethodEvent &other)
 
 QInputMethodEvent::~QInputMethodEvent()
 {
-    // must be empty until ### Qt 6
 }
 
 /*!
@@ -2718,10 +2717,6 @@ QNativeGestureEvent::QNativeGestureEvent(Qt::NativeGestureType type, const QPoin
 { }
 #endif
 
-typedef QHash<const QNativeGestureEvent*, const QTouchDevice*> NativeGestureEventDataHash;
-// ### Qt6: move this to a member in QNativeGestureEvent
-Q_GLOBAL_STATIC(NativeGestureEventDataHash, g_nativeGestureEventDataHash)
-
 /*!
     Constructs a native gesture event of type \a type originating from \a device.
 
@@ -2736,27 +2731,20 @@ QNativeGestureEvent::QNativeGestureEvent(Qt::NativeGestureType type, const QTouc
                                          const QPointF &screenPos, qreal realValue, ulong sequenceId, quint64 intValue)
     : QInputEvent(QEvent::NativeGesture), mGestureType(type),
       mLocalPos(localPos), mWindowPos(windowPos), mScreenPos(screenPos), mRealValue(realValue),
-      mSequenceId(sequenceId), mIntValue(intValue)
+      mSequenceId(sequenceId), mIntValue(intValue), mDevice(device)
 {
-    g_nativeGestureEventDataHash->insert(this, device);
 }
 
 QNativeGestureEvent::~QNativeGestureEvent()
-{
-    g_nativeGestureEventDataHash->remove(this);
-}
+    = default;
 
 /*!
+    \fn const QTouchDevice *QNativeGestureEvent::device() const
     \since 5.10
 
     Returns the device.
 */
 
-const QTouchDevice *QNativeGestureEvent::device() const
-{
-    return g_nativeGestureEventDataHash->value(this);
-}
-
 /*!
     \fn QNativeGestureEvent::gestureType() const
     \since 5.2
@@ -3358,18 +3346,18 @@ QWhatsThisClickedEvent::~QWhatsThisClickedEvent()
 /*!
     \class QActionEvent
     \brief The QActionEvent class provides an event that is generated
-    when a QAction is added, removed, or changed.
+    when a QGuiAction is added, removed, or changed.
 
     \ingroup events
     \inmodule QtGui
 
-    Actions can be added to widgets using QWidget::addAction(). This
-    generates an \l ActionAdded event, which you can handle to provide
+    Actions can be added to controls, for example by using QWidget::addAction().
+    This generates an \l ActionAdded event, which you can handle to provide
     custom behavior. For example, QToolBar reimplements
     QWidget::actionEvent() to create \l{QToolButton}s for the
     actions.
 
-    \sa QAction, QWidget::addAction(), QWidget::removeAction(), QWidget::actions()
+    \sa QGuiAction, QWidget::addAction(), QWidget::removeAction(), QWidget::actions()
 */
 
 /*!
@@ -3380,7 +3368,7 @@ QWhatsThisClickedEvent::~QWhatsThisClickedEvent()
     type is ActionAdded, the action is to be inserted before the
     action \a before. If \a before is \nullptr, the action is appended.
 */
-QActionEvent::QActionEvent(int type, QAction *action, QAction *before)
+QActionEvent::QActionEvent(int type, QGuiAction *action, QGuiAction *before)
     : QEvent(static_cast<QEvent::Type>(type)), act(action), bef(before)
 {}
 
@@ -3615,7 +3603,7 @@ QToolBarChangeEvent::~QToolBarChangeEvent()
 
 #endif // QT_NO_TOOLBAR
 
-#ifndef QT_NO_SHORTCUT
+#if QT_CONFIG(shortcut)
 
 /*!
     Constructs a shortcut event for the given \a key press,
@@ -3636,7 +3624,7 @@ QShortcutEvent::~QShortcutEvent()
 {
 }
 
-#endif // QT_NO_SHORTCUT
+#endif // QT_CONFIG(shortcut)
 
 #ifndef QT_NO_DEBUG_STREAM
 
@@ -3990,7 +3978,7 @@ QT_WARNING_POP
         dbg << ')';
     }
         break;
-#ifndef QT_NO_SHORTCUT
+#if QT_CONFIG(shortcut)
     case QEvent::Shortcut: {
         const QShortcutEvent *se = static_cast<const QShortcutEvent *>(e);
         dbg << "QShortcutEvent(" << se->key().toString() << ", id=" << se->shortcutId();
diff --git a/src/gui/kernel/qevent.h b/src/gui/kernel/qevent.h
index cf596d8d45..87ec8e7bee 100644
--- a/src/gui/kernel/qevent.h
+++ b/src/gui/kernel/qevent.h
@@ -45,7 +45,9 @@
 #include <QtGui/qregion.h>
 #include <QtCore/qnamespace.h>
 #include <QtCore/qstring.h>
-#include <QtGui/qkeysequence.h>
+#if QT_CONFIG(shortcut)
+#  include <QtGui/qkeysequence.h>
+#endif
 #include <QtCore/qcoreevent.h>
 #include <QtCore/qvariant.h>
 #include <QtCore/qmap.h> // ### Qt 6: Remove
@@ -59,7 +61,7 @@
 QT_BEGIN_NAMESPACE
 
 
-class QAction;
+class QGuiAction;
 #ifndef QT_NO_GESTURES
 class QGesture;
 #endif
@@ -361,7 +363,7 @@ public:
     const QPointF &windowPos() const { return mWindowPos; }
     const QPointF &screenPos() const { return mScreenPos; }
 
-    const QTouchDevice *device() const;
+    const QTouchDevice *device() const { return mDevice; }
 
 protected:
     Qt::NativeGestureType mGestureType;
@@ -371,6 +373,7 @@ protected:
     qreal mRealValue;
     ulong mSequenceId;
     quint64 mIntValue;
+    const QTouchDevice *mDevice;
 };
 #endif // QT_NO_GESTURES
 
@@ -385,7 +388,7 @@ public:
     ~QKeyEvent();
 
     int key() const { return k; }
-#ifndef QT_NO_SHORTCUT
+#if QT_CONFIG(shortcut)
     bool matches(QKeySequence::StandardKey key) const;
 #endif
     Qt::KeyboardModifiers modifiers() const;
@@ -761,18 +764,18 @@ private:
 };
 #endif
 
-#ifndef QT_NO_ACTION
+#if QT_CONFIG(action)
 class Q_GUI_EXPORT QActionEvent : public QEvent
 {
-    QAction *act, *bef;
+    QGuiAction *act, *bef;
 public:
-    QActionEvent(int type, QAction *action, QAction *before = nullptr);
+    QActionEvent(int type, QGuiAction *action, QGuiAction *before = nullptr);
     ~QActionEvent();
 
-    inline QAction *action() const { return act; }
-    inline QAction *before() const { return bef; }
+    inline QGuiAction *action() const { return act; }
+    inline QGuiAction *before() const { return bef; }
 };
-#endif
+#endif // QT_CONFIG(action)
 
 class Q_GUI_EXPORT QFileOpenEvent : public QEvent
 {
@@ -802,7 +805,7 @@ private:
 };
 #endif
 
-#ifndef QT_NO_SHORTCUT
+#if QT_CONFIG(shortcut)
 class Q_GUI_EXPORT QShortcutEvent : public QEvent
 {
 public:
@@ -837,10 +840,10 @@ private:
 Q_GUI_EXPORT QDebug operator<<(QDebug, const QEvent *);
 #endif
 
-#ifndef QT_NO_SHORTCUT
+#if QT_CONFIG(shortcut)
 inline bool operator==(QKeyEvent *e, QKeySequence::StandardKey key){return (e ? e->matches(key) : false);}
 inline bool operator==(QKeySequence::StandardKey key, QKeyEvent *e){return (e ? e->matches(key) : false);}
-#endif // QT_NO_SHORTCUT
+#endif // QT_CONFIG(shortcut)
 
 class Q_GUI_EXPORT QPointingDeviceUniqueId
 {
@@ -865,14 +868,6 @@ private:
 };
 Q_DECLARE_TYPEINFO(QPointingDeviceUniqueId, Q_MOVABLE_TYPE);
 
-#if 0
-#pragma qt_sync_suspend_processing
-#endif
-template <> class QList<QPointingDeviceUniqueId> {}; // to prevent instantiation: use QVector instead
-#if 0
-#pragma qt_sync_resume_processing
-#endif
-
 Q_GUI_EXPORT bool operator==(QPointingDeviceUniqueId lhs, QPointingDeviceUniqueId rhs) noexcept;
 inline bool operator!=(QPointingDeviceUniqueId lhs, QPointingDeviceUniqueId rhs) noexcept
 { return !operator==(lhs, rhs); }
diff --git a/src/gui/kernel/qguiaction.cpp b/src/gui/kernel/qguiaction.cpp
new file mode 100644
index 0000000000..84750194b6
--- /dev/null
+++ b/src/gui/kernel/qguiaction.cpp
@@ -0,0 +1,1249 @@
+/****************************************************************************
+**
+** Copyright (C) 2019 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtGui module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qguiaction.h"
+#include "qguiactiongroup.h"
+
+#include "qguiaction_p.h"
+#include "qguiapplication.h"
+#include "qevent.h"
+#include "qlist.h"
+#include "qstylehints.h"
+#if QT_CONFIG(shortcut)
+#  include <private/qshortcutmap_p.h>
+#endif
+#include <private/qguiapplication_p.h>
+#include <private/qdebug_p.h>
+
+#define QAPP_CHECK(functionName) \
+    if (Q_UNLIKELY(!QCoreApplication::instance())) { \
+        qWarning("QGuiAction: Initialize Q(Gui)Application before calling '" functionName "'."); \
+        return; \
+    }
+
+QT_BEGIN_NAMESPACE
+
+/*
+  internal: guesses a descriptive text from a text suited for a menu entry
+ */
+static QString qt_strippedText(QString s)
+{
+    s.remove(QLatin1String("..."));
+    for (int i = 0; i < s.size(); ++i) {
+        if (s.at(i) == QLatin1Char('&'))
+            s.remove(i, 1);
+    }
+    return s.trimmed();
+}
+
+QGuiActionPrivate::QGuiActionPrivate() :
+#if QT_CONFIG(shortcut)
+    autorepeat(1),
+#endif
+    enabled(1), explicitEnabled(0), explicitEnabledValue(1), visible(1), forceInvisible(0), checkable(0),
+    checked(0), separator(0), fontSet(false),
+    iconVisibleInMenu(-1), shortcutVisibleInContextMenu(-1)
+{
+}
+
+#if QT_CONFIG(shortcut)
+static bool dummy(QObject *, Qt::ShortcutContext) { return false; } // only for GUI testing.
+
+QShortcutMap::ContextMatcher QGuiActionPrivate::contextMatcher() const
+{
+    return dummy;
+}
+#endif // QT_CONFIG(shortcut)
+
+QGuiActionPrivate::~QGuiActionPrivate() = default;
+
+void QGuiActionPrivate::sendDataChanged()
+{
+    Q_Q(QGuiAction);
+    QActionEvent e(QEvent::ActionChanged, q);
+    QCoreApplication::sendEvent(q, &e);
+
+    emit q->changed();
+}
+
+#if QT_CONFIG(shortcut)
+void QGuiActionPrivate::redoGrab(QShortcutMap &map)
+{
+    Q_Q(QGuiAction);
+    if (shortcutId)
+        map.removeShortcut(shortcutId, q);
+    if (shortcut.isEmpty())
+        return;
+    shortcutId = map.addShortcut(q, shortcut, shortcutContext, contextMatcher());
+    if (!enabled)
+        map.setShortcutEnabled(false, shortcutId, q);
+    if (!autorepeat)
+        map.setShortcutAutoRepeat(false, shortcutId, q);
+}
+
+void QGuiActionPrivate::redoGrabAlternate(QShortcutMap &map)
+{
+    Q_Q(QGuiAction);
+    for(int i = 0; i < alternateShortcutIds.count(); ++i) {
+        if (const int id = alternateShortcutIds.at(i))
+            map.removeShortcut(id, q);
+    }
+    alternateShortcutIds.clear();
+    if (alternateShortcuts.isEmpty())
+        return;
+    for(int i = 0; i < alternateShortcuts.count(); ++i) {
+        const QKeySequence& alternate = alternateShortcuts.at(i);
+        if (!alternate.isEmpty())
+            alternateShortcutIds.append(map.addShortcut(q, alternate, shortcutContext, contextMatcher()));
+        else
+            alternateShortcutIds.append(0);
+    }
+    if (!enabled) {
+        for(int i = 0; i < alternateShortcutIds.count(); ++i) {
+            const int id = alternateShortcutIds.at(i);
+            map.setShortcutEnabled(false, id, q);
+        }
+    }
+    if (!autorepeat) {
+        for(int i = 0; i < alternateShortcutIds.count(); ++i) {
+            const int id = alternateShortcutIds.at(i);
+            map.setShortcutAutoRepeat(false, id, q);
+        }
+    }
+}
+
+void QGuiActionPrivate::setShortcutEnabled(bool enable, QShortcutMap &map)
+{
+    Q_Q(QGuiAction);
+    if (shortcutId)
+        map.setShortcutEnabled(enable, shortcutId, q);
+    for(int i = 0; i < alternateShortcutIds.count(); ++i) {
+        if (const int id = alternateShortcutIds.at(i))
+            map.setShortcutEnabled(enable, id, q);
+    }
+}
+#endif // QT_NO_SHORTCUT
+
+
+/*!
+    \class QGuiAction
+    \brief QGuiAction is the base class for actions, an abstract user interface
+    action that can be inserted into widgets.
+    \since 6.0
+
+    \inmodule QtGui
+
+    In applications many common commands can be invoked via menus,
+    toolbar buttons, and keyboard shortcuts. Since the user expects
+    each command to be performed in the same way, regardless of the
+    user interface used, it is useful to represent each command as
+    an \e action.
+
+    Actions can be added to menus and toolbars, and will
+    automatically keep them in sync. For example, in a word processor,
+    if the user presses a Bold toolbar button, the Bold menu item
+    will automatically be checked.
+
+    Actions can be created as independent objects, but they may
+    also be created during the construction of menus; the QMenu class
+    contains convenience functions for creating actions suitable for
+    use as menu items.
+
+    A QGuiAction may contain an icon, menu text, a shortcut, status text,
+    "What's This?" text, and a tooltip. Most of these can be set in
+    the constructor. They can also be set independently with
+    setIcon(), setText(), setIconText(), setShortcut(),
+    setStatusTip(), setWhatsThis(), and setToolTip(). For menu items,
+    it is possible to set an individual font with setFont().
+
+    We recommend that actions are created as children of the window
+    they are used in. In most cases actions will be children of
+    the application's main window.
+
+    \sa QMenu, QToolBar, {Application Example}
+*/
+
+/*!
+    \fn void QGuiAction::trigger()
+
+    This is a convenience slot that calls activate(Trigger).
+*/
+
+/*!
+    \fn void QGuiAction::hover()
+
+    This is a convenience slot that calls activate(Hover).
+*/
+
+/*!
+    \enum QGuiAction::MenuRole
+
+    This enum describes how an action should be moved into the application menu on \macos.
+
+    \value NoRole This action should not be put into the application menu
+    \value TextHeuristicRole This action should be put in the application menu based on the action's text
+           as described in the QMenuBar documentation.
+    \value ApplicationSpecificRole This action should be put in the application menu with an application specific role
+    \value AboutQtRole This action handles the "About Qt" menu item.
+    \value AboutRole This action should be placed where the "About" menu item is in the application menu. The text of
+           the menu item will be set to "About <application name>". The application name is fetched from the
+           \c{Info.plist} file in the application's bundle (See \l{Qt for macOS - Deployment}).
+    \value PreferencesRole This action should be placed where the  "Preferences..." menu item is in the application menu.
+    \value QuitRole This action should be placed where the Quit menu item is in the application menu.
+
+    Setting this value only has effect on items that are in the immediate menus
+    of the menubar, not the submenus of those menus. For example, if you have
+    File menu in your menubar and the File menu has a submenu, setting the
+    MenuRole for the actions in that submenu have no effect. They will never be moved.
+*/
+
+/*!
+    Constructs an action with \a parent. If \a parent is an action
+    group the action will be automatically inserted into the group.
+
+    \note The \a parent argument is optional since Qt 5.7.
+*/
+QGuiAction::QGuiAction(QObject *parent)
+    : QGuiAction(*new QGuiActionPrivate, parent)
+{
+}
+
+/*!
+    Constructs an action with some \a text and \a parent. If \a
+    parent is an action group the action will be automatically
+    inserted into the group.
+
+    The action uses a stripped version of \a text (e.g. "\&Menu
+    Option..." becomes "Menu Option") as descriptive text for
+    tool buttons. You can override this by setting a specific
+    description with setText(). The same text will be used for
+    tooltips unless you specify a different text using
+    setToolTip().
+
+*/
+QGuiAction::QGuiAction(const QString &text, QObject *parent)
+    : QGuiAction(parent)
+{
+    Q_D(QGuiAction);
+    d->text = text;
+}
+
+/*!
+    Constructs an action with an \a icon and some \a text and \a
+    parent. If \a parent is an action group the action will be
+    automatically inserted into the group.
+
+    The action uses a stripped version of \a text (e.g. "\&Menu
+    Option..." becomes "Menu Option") as descriptive text for
+    tool buttons. You can override this by setting a specific
+    description with setText(). The same text will be used for
+    tooltips unless you specify a different text using
+    setToolTip().
+*/
+QGuiAction::QGuiAction(const QIcon &icon, const QString &text, QObject *parent)
+    : QGuiAction(text, parent)
+{
+    Q_D(QGuiAction);
+    d->icon = icon;
+}
+
+/*!
+    \internal
+*/
+QGuiAction::QGuiAction(QGuiActionPrivate &dd, QObject *parent)
+    : QObject(dd, parent)
+{
+    Q_D(QGuiAction);
+    d->group = qobject_cast<QGuiActionGroup *>(parent);
+    if (d->group)
+        d->group->addAction(this);
+}
+
+#if QT_CONFIG(shortcut)
+/*!
+    \property QGuiAction::shortcut
+    \brief the action's primary shortcut key
+
+    Valid keycodes for this property can be found in \l Qt::Key and
+    \l Qt::Modifier. There is no default shortcut key.
+*/
+void QGuiAction::setShortcut(const QKeySequence &shortcut)
+{
+    QAPP_CHECK("setShortcut");
+
+    Q_D(QGuiAction);
+    if (d->shortcut == shortcut)
+        return;
+
+    d->shortcut = shortcut;
+    d->redoGrab(QGuiApplicationPrivate::instance()->shortcutMap);
+    d->sendDataChanged();
+}
+
+/*!
+    Sets \a shortcuts as the list of shortcuts that trigger the
+    action. The first element of the list is the primary shortcut.
+
+    \sa shortcut
+*/
+void QGuiAction::setShortcuts(const QList<QKeySequence> &shortcuts)
+{
+    Q_D(QGuiAction);
+
+    QList <QKeySequence> listCopy = shortcuts;
+
+    QKeySequence primary;
+    if (!listCopy.isEmpty())
+        primary = listCopy.takeFirst();
+
+    if (d->shortcut == primary && d->alternateShortcuts == listCopy)
+        return;
+
+    QAPP_CHECK("setShortcuts");
+
+    d->shortcut = primary;
+    d->alternateShortcuts = listCopy;
+    d->redoGrab(QGuiApplicationPrivate::instance()->shortcutMap);
+    d->redoGrabAlternate(QGuiApplicationPrivate::instance()->shortcutMap);
+    d->sendDataChanged();
+}
+
+/*!
+    Sets a platform dependent list of shortcuts based on the \a key.
+    The result of calling this function will depend on the currently running platform.
+    Note that more than one shortcut can assigned by this action.
+    If only the primary shortcut is required, use setShortcut instead.
+
+    \sa QKeySequence::keyBindings()
+*/
+void QGuiAction::setShortcuts(QKeySequence::StandardKey key)
+{
+    QList <QKeySequence> list = QKeySequence::keyBindings(key);
+    setShortcuts(list);
+}
+
+/*!
+    Returns the primary shortcut.
+
+    \sa setShortcuts()
+*/
+QKeySequence QGuiAction::shortcut() const
+{
+    Q_D(const QGuiAction);
+    return d->shortcut;
+}
+
+/*!
+    Returns the list of shortcuts, with the primary shortcut as
+    the first element of the list.
+
+    \sa setShortcuts()
+*/
+QList<QKeySequence> QGuiAction::shortcuts() const
+{
+    Q_D(const QGuiAction);
+    QList <QKeySequence> shortcuts;
+    if (!d->shortcut.isEmpty())
+        shortcuts << d->shortcut;
+    if (!d->alternateShortcuts.isEmpty())
+        shortcuts << d->alternateShortcuts;
+    return shortcuts;
+}
+
+/*!
+    \property QGuiAction::shortcutContext
+    \brief the context for the action's shortcut
+
+    Valid values for this property can be found in \l Qt::ShortcutContext.
+    The default value is Qt::WindowShortcut.
+*/
+void QGuiAction::setShortcutContext(Qt::ShortcutContext context)
+{
+    Q_D(QGuiAction);
+    if (d->shortcutContext == context)
+        return;
+    QAPP_CHECK("setShortcutContext");
+    d->shortcutContext = context;
+    d->redoGrab(QGuiApplicationPrivate::instance()->shortcutMap);
+    d->redoGrabAlternate(QGuiApplicationPrivate::instance()->shortcutMap);
+    d->sendDataChanged();
+}
+
+Qt::ShortcutContext QGuiAction::shortcutContext() const
+{
+    Q_D(const QGuiAction);
+    return d->shortcutContext;
+}
+
+/*!
+    \property QGuiAction::autoRepeat
+    \brief whether the action can auto repeat
+
+    If true, the action will auto repeat when the keyboard shortcut
+    combination is held down, provided that keyboard auto repeat is
+    enabled on the system.
+    The default value is true.
+*/
+void QGuiAction::setAutoRepeat(bool on)
+{
+    Q_D(QGuiAction);
+    if (d->autorepeat == on)
+        return;
+    QAPP_CHECK("setAutoRepeat");
+    d->autorepeat = on;
+    d->redoGrab(QGuiApplicationPrivate::instance()->shortcutMap);
+    d->redoGrabAlternate(QGuiApplicationPrivate::instance()->shortcutMap);
+    d->sendDataChanged();
+}
+
+bool QGuiAction::autoRepeat() const
+{
+    Q_D(const QGuiAction);
+    return d->autorepeat;
+}
+#endif // QT_CONFIG(shortcut)
+
+/*!
+    \property QGuiAction::font
+    \brief the action's font
+
+    The font property is used to render the text set on the
+    QGuiAction. The font will can be considered a hint as it will not be
+    consulted in all cases based upon application and style.
+
+    By default, this property contains the application's default font.
+
+    \sa setText()
+*/
+void QGuiAction::setFont(const QFont &font)
+{
+    Q_D(QGuiAction);
+    if (d->font == font)
+        return;
+
+    d->fontSet = true;
+    d->font = font;
+    d->sendDataChanged();
+}
+
+QFont QGuiAction::font() const
+{
+    Q_D(const QGuiAction);
+    return d->font;
+}
+
+
+/*!
+    Destroys the object and frees allocated resources.
+*/
+QGuiAction::~QGuiAction()
+{
+    Q_D(QGuiAction);
+    if (d->group)
+        d->group->removeAction(this);
+#if QT_CONFIG(shortcut)
+    if (d->shortcutId && qApp) {
+        QGuiApplicationPrivate::instance()->shortcutMap.removeShortcut(d->shortcutId, this);
+        for (int id : qAsConst(d->alternateShortcutIds))
+            QGuiApplicationPrivate::instance()->shortcutMap.removeShortcut(id, this);
+    }
+#endif
+}
+
+/*!
+  Sets this action group to \a group. The action will be automatically
+  added to the group's list of actions.
+
+  Actions within the group will be mutually exclusive.
+
+  \sa QGuiActionGroup, guiActionGroup()
+*/
+void QGuiAction::setActionGroup(QGuiActionGroup *group)
+{
+    Q_D(QGuiAction);
+    if(group == d->group)
+        return;
+
+    if(d->group)
+        d->group->removeAction(this);
+    d->group = group;
+    if(group)
+        group->addAction(this);
+    d->sendDataChanged();
+}
+
+/*!
+  Returns the action group for this action. If no action group manages
+  this action, then \nullptr will be returned.
+
+  \sa QGuiActionGroup, setActionGroup()
+*/
+QGuiActionGroup *QGuiAction::guiActionGroup() const
+{
+    Q_D(const QGuiAction);
+    return d->group;
+}
+
+
+/*!
+    \property QGuiAction::icon
+    \brief the action's icon
+
+    In toolbars, the icon is used as the tool button icon; in menus,
+    it is displayed to the left of the menu text. There is no default
+    icon.
+
+    If a null icon (QIcon::isNull()) is passed into this function,
+    the icon of the action is cleared.
+*/
+void QGuiAction::setIcon(const QIcon &icon)
+{
+    Q_D(QGuiAction);
+    d->icon = icon;
+    d->sendDataChanged();
+}
+
+QIcon QGuiAction::icon() const
+{
+    Q_D(const QGuiAction);
+    return d->icon;
+}
+
+/*!
+  If \a b is true then this action will be considered a separator.
+
+  How a separator is represented depends on the widget it is inserted
+  into. Under most circumstances the text, submenu, and icon will be
+  ignored for separator actions.
+
+  \sa isSeparator()
+*/
+void QGuiAction::setSeparator(bool b)
+{
+    Q_D(QGuiAction);
+    if (d->separator == b)
+        return;
+
+    d->separator = b;
+    d->sendDataChanged();
+}
+
+/*!
+  Returns \c true if this action is a separator action; otherwise it
+  returns \c false.
+
+  \sa setSeparator()
+*/
+bool QGuiAction::isSeparator() const
+{
+    Q_D(const QGuiAction);
+    return d->separator;
+}
+
+/*!
+    \property QGuiAction::text
+    \brief the action's descriptive text
+
+    If the action is added to a menu, the menu option will consist of
+    the icon (if there is one), the text, and the shortcut (if there
+    is one). If the text is not explicitly set in the constructor, or
+    by using setText(), the action's description icon text will be
+    used as text. There is no default text.
+
+    \sa iconText
+*/
+void QGuiAction::setText(const QString &text)
+{
+    Q_D(QGuiAction);
+    if (d->text == text)
+        return;
+
+    d->text = text;
+    d->sendDataChanged();
+}
+
+QString QGuiAction::text() const
+{
+    Q_D(const QGuiAction);
+    QString s = d->text;
+    if(s.isEmpty()) {
+        s = d->iconText;
+        s.replace(QLatin1Char('&'), QLatin1String("&&"));
+    }
+    return s;
+}
+
+/*!
+    \property QGuiAction::iconText
+    \brief the action's descriptive icon text
+
+    If QToolBar::toolButtonStyle is set to a value that permits text to
+    be displayed, the text defined held in this property appears as a
+    label in the relevant tool button.
+
+    It also serves as the default text in menus and tooltips if the action
+    has not been defined with setText() or setToolTip(), and will
+    also be used in toolbar buttons if no icon has been defined using setIcon().
+
+    If the icon text is not explicitly set, the action's normal text will be
+    used for the icon text.
+
+    By default, this property contains an empty string.
+
+    \sa setToolTip(), setStatusTip()
+*/
+void QGuiAction::setIconText(const QString &text)
+{
+    Q_D(QGuiAction);
+    if (d->iconText == text)
+        return;
+
+    d->iconText = text;
+    d->sendDataChanged();
+}
+
+QString QGuiAction::iconText() const
+{
+    Q_D(const QGuiAction);
+    if (d->iconText.isEmpty())
+        return qt_strippedText(d->text);
+    return d->iconText;
+}
+
+/*!
+    \property QGuiAction::toolTip
+    \brief the action's tooltip
+
+    This text is used for the tooltip. If no tooltip is specified,
+    the action's text is used.
+
+    By default, this property contains the action's text.
+
+    \sa setStatusTip(), setShortcut()
+*/
+void QGuiAction::setToolTip(const QString &tooltip)
+{
+    Q_D(QGuiAction);
+    if (d->tooltip == tooltip)
+        return;
+
+    d->tooltip = tooltip;
+    d->sendDataChanged();
+}
+
+QString QGuiAction::toolTip() const
+{
+    Q_D(const QGuiAction);
+    if (d->tooltip.isEmpty()) {
+        if (!d->text.isEmpty())
+            return qt_strippedText(d->text);
+        return qt_strippedText(d->iconText);
+    }
+    return d->tooltip;
+}
+
+/*!
+    \property QGuiAction::statusTip
+    \brief the action's status tip
+
+    The status tip is displayed on all status bars provided by the
+    action's top-level parent widget.
+
+    By default, this property contains an empty string.
+
+    \sa setToolTip(), showStatusText()
+*/
+void QGuiAction::setStatusTip(const QString &statustip)
+{
+    Q_D(QGuiAction);
+    if (d->statustip == statustip)
+        return;
+
+    d->statustip = statustip;
+    d->sendDataChanged();
+}
+
+QString QGuiAction::statusTip() const
+{
+    Q_D(const QGuiAction);
+    return d->statustip;
+}
+
+/*!
+    \property QGuiAction::whatsThis
+    \brief the action's "What's This?" help text
+
+    The "What's This?" text is used to provide a brief description of
+    the action. The text may contain rich text. There is no default
+    "What's This?" text.
+
+    \sa QWhatsThis
+*/
+void QGuiAction::setWhatsThis(const QString &whatsthis)
+{
+    Q_D(QGuiAction);
+    if (d->whatsthis == whatsthis)
+        return;
+
+    d->whatsthis = whatsthis;
+    d->sendDataChanged();
+}
+
+QString QGuiAction::whatsThis() const
+{
+    Q_D(const QGuiAction);
+    return d->whatsthis;
+}
+
+/*!
+    \enum QGuiAction::Priority
+
+    This enum defines priorities for actions in user interface.
+
+    \value LowPriority The action should not be prioritized in
+    the user interface.
+
+    \value NormalPriority
+
+    \value HighPriority The action should be prioritized in
+    the user interface.
+
+    \sa priority
+*/
+
+
+/*!
+    \property QGuiAction::priority
+
+    \brief the actions's priority in the user interface.
+
+    This property can be set to indicate how the action should be prioritized
+    in the user interface.
+
+    For instance, when toolbars have the Qt::ToolButtonTextBesideIcon
+    mode set, then actions with LowPriority will not show the text
+    labels.
+*/
+void QGuiAction::setPriority(Priority priority)
+{
+    Q_D(QGuiAction);
+    if (d->priority == priority)
+        return;
+
+    d->priority = priority;
+    d->sendDataChanged();
+}
+
+QGuiAction::Priority QGuiAction::priority() const
+{
+    Q_D(const QGuiAction);
+    return d->priority;
+}
+
+/*!
+    \property QGuiAction::checkable
+    \brief whether the action is a checkable action
+
+    A checkable action is one which has an on/off state. For example,
+    in a word processor, a Bold toolbar button may be either on or
+    off. An action which is not a toggle action is a command action;
+    a command action is simply executed, e.g. file save.
+    By default, this property is \c false.
+
+    In some situations, the state of one toggle action should depend
+    on the state of others. For example, "Left Align", "Center" and
+    "Right Align" toggle actions are mutually exclusive. To achieve
+    exclusive toggling, add the relevant toggle actions to a
+    QGuiActionGroup with the QGuiActionGroup::exclusive property set to
+    true.
+
+    \sa setChecked()
+*/
+void QGuiAction::setCheckable(bool b)
+{
+    Q_D(QGuiAction);
+    if (d->checkable == b)
+        return;
+
+    d->checkable = b;
+    QPointer<QGuiAction> guard(this);
+    d->sendDataChanged();
+    if (guard)
+        emit checkableChanged(b);
+    if (guard && d->checked)
+        emit toggled(b);
+}
+
+bool QGuiAction::isCheckable() const
+{
+    Q_D(const QGuiAction);
+    return d->checkable;
+}
+
+/*!
+    \fn void QGuiAction::toggle()
+
+    This is a convenience function for the \l checked property.
+    Connect to it to change the checked state to its opposite state.
+*/
+void QGuiAction::toggle()
+{
+    Q_D(QGuiAction);
+    setChecked(!d->checked);
+}
+
+/*!
+    \property QGuiAction::checked
+    \brief whether the action is checked.
+
+    Only checkable actions can be checked.  By default, this is false
+    (the action is unchecked).
+
+    \note The notifier signal for this property is toggled(). As toggling
+    a QGuiAction changes its state, it will also emit a changed() signal.
+
+    \sa checkable, toggled()
+*/
+void QGuiAction::setChecked(bool b)
+{
+    Q_D(QGuiAction);
+    if (d->checked == b)
+        return;
+
+    d->checked = b;
+    if (!d->checkable)
+        return;
+    QPointer<QGuiAction> guard(this);
+    d->sendDataChanged();
+    if (guard)
+        emit toggled(b);
+}
+
+bool QGuiAction::isChecked() const
+{
+    Q_D(const QGuiAction);
+    return d->checked && d->checkable;
+}
+
+/*!
+    \fn void QGuiAction::setDisabled(bool b)
+
+    This is a convenience function for the \l enabled property, that
+    is useful for signals--slots connections. If \a b is true the
+    action is disabled; otherwise it is enabled.
+*/
+
+/*!
+    \property QGuiAction::enabled
+    \brief whether the action is enabled
+
+    Disabled actions cannot be chosen by the user. They do not
+    disappear from menus or toolbars, but they are displayed in a way
+    which indicates that they are unavailable. For example, they might
+    be displayed using only shades of gray.
+
+    \uicontrol{What's This?} help on disabled actions is still available, provided
+    that the QGuiAction::whatsThis property is set.
+
+    An action will be disabled when all widgets to which it is added
+    (with QWidget::addAction()) are disabled or not visible. When an
+    action is disabled, it is not possible to trigger it through its
+    shortcut.
+
+    By default, this property is \c true (actions are enabled).
+
+    \sa text
+*/
+void QGuiAction::setEnabled(bool b)
+{
+    Q_D(QGuiAction);
+    if (d->explicitEnabledValue == b && d->explicitEnabled)
+        return;
+    d->explicitEnabledValue = b;
+    d->explicitEnabled = true;
+    QAPP_CHECK("setEnabled");
+    d->setEnabled(b, false);
+}
+
+bool QGuiActionPrivate::setEnabled(bool b, bool byGroup)
+{
+    Q_Q(QGuiAction);
+    if (b && !visible)
+        b = false;
+    if (b && !byGroup && (group && !group->isEnabled()))
+        b = false;
+    if (b && byGroup && explicitEnabled)
+        b = explicitEnabledValue;
+
+    if (b == enabled)
+        return false;
+
+    enabled = b;
+#if QT_CONFIG(shortcut)
+    setShortcutEnabled(b, QGuiApplicationPrivate::instance()->shortcutMap);
+#endif
+    QPointer guard(q);
+    sendDataChanged();
+    if (guard)
+        emit q->enabledChanged(b);
+    return true;
+}
+
+void QGuiAction::resetEnabled()
+{
+    Q_D(QGuiAction);
+    if (!d->explicitEnabled)
+        return;
+    d->explicitEnabled = false;
+    d->setEnabled(true, false);
+}
+
+bool QGuiAction::isEnabled() const
+{
+    Q_D(const QGuiAction);
+    return d->enabled;
+}
+
+/*!
+    \property QGuiAction::visible
+    \brief whether the action can be seen (e.g. in menus and toolbars)
+
+    If \e visible is true the action can be seen (e.g. in menus and
+    toolbars) and chosen by the user; if \e visible is false the
+    action cannot be seen or chosen by the user.
+
+    Actions which are not visible are \e not grayed out; they do not
+    appear at all.
+
+    By default, this property is \c true (actions are visible).
+*/
+void QGuiAction::setVisible(bool b)
+{
+    Q_D(QGuiAction);
+    if (b == d->visible && b != d->forceInvisible)
+        return;
+    QAPP_CHECK("setVisible");
+    d->forceInvisible = !b;
+    d->visible = b;
+    bool enabled = d->visible;
+    if (enabled && d->explicitEnabled)
+        enabled = d->explicitEnabledValue;
+    if (!d->setEnabled(enabled, false))
+        d->sendDataChanged();
+}
+
+
+bool QGuiAction::isVisible() const
+{
+    Q_D(const QGuiAction);
+    return d->visible;
+}
+
+/*!
+  \reimp
+*/
+bool QGuiAction::event(QEvent *e)
+{
+#if QT_CONFIG(shortcut)
+    if (e->type() == QEvent::Shortcut) {
+        QShortcutEvent *se = static_cast<QShortcutEvent *>(e);
+        Q_ASSERT_X(se->key() == d_func()->shortcut || d_func()->alternateShortcuts.contains(se->key()),
+                   "QGuiAction::event",
+                   "Received shortcut event from incorrect shortcut");
+        if (se->isAmbiguous())
+            qWarning("QGuiAction::event: Ambiguous shortcut overload: %s", se->key().toString(QKeySequence::NativeText).toLatin1().constData());
+        else
+            activate(Trigger);
+        return true;
+    }
+#endif // QT_CONFIG(shortcut)
+    return QObject::event(e);
+}
+
+/*!
+  Returns the user data as set in QGuiAction::setData.
+
+  \sa setData()
+*/
+QVariant QGuiAction::data() const
+{
+    Q_D(const QGuiAction);
+    return d->userData;
+}
+
+/*!
+  Sets the action's internal data to the given \a userData.
+
+  \sa data()
+*/
+void QGuiAction::setData(const QVariant &data)
+{
+    Q_D(QGuiAction);
+    if (d->userData == data)
+        return;
+    d->userData = data;
+    d->sendDataChanged();
+}
+
+/*!
+  Sends the relevant signals for ActionEvent \a event.
+
+  Action based widgets use this API to cause the QGuiAction
+  to emit signals as well as emitting their own.
+*/
+void QGuiAction::activate(ActionEvent event)
+{
+    Q_D(QGuiAction);
+    if(event == Trigger) {
+        QPointer<QObject> guard = this;
+        if(d->checkable) {
+            // the checked action of an exclusive group may not be unchecked
+            if (d->checked && (d->group
+                               && d->group->exclusionPolicy() == QGuiActionGroup::ExclusionPolicy::Exclusive
+                               && d->group->checkedGuiAction() == this)) {
+                if (!guard.isNull())
+                    emit triggered(true);
+                return;
+            }
+            setChecked(!d->checked);
+        }
+        if (!guard.isNull())
+            emit triggered(d->checked);
+    } else if(event == Hover) {
+        emit hovered();
+    }
+}
+
+/*!
+    \fn void QGuiAction::triggered(bool checked)
+
+    This signal is emitted when an action is activated by the user;
+    for example, when the user clicks a menu option, toolbar button,
+    or presses an action's shortcut key combination, or when trigger()
+    was called. Notably, it is \e not emitted when setChecked() or
+    toggle() is called.
+
+    If the action is checkable, \a checked is true if the action is
+    checked, or false if the action is unchecked.
+
+    \sa activate(), toggled(), checked
+*/
+
+/*!
+    \fn void QGuiAction::toggled(bool checked)
+
+    This signal is emitted whenever a checkable action changes its
+    isChecked() status. This can be the result of a user interaction,
+    or because setChecked() was called. As setChecked() changes the
+    QGuiAction, it emits changed() in addition to toggled().
+
+    \a checked is true if the action is checked, or false if the
+    action is unchecked.
+
+    \sa activate(), triggered(), checked
+*/
+
+/*!
+    \fn void QGuiAction::hovered()
+
+    This signal is emitted when an action is highlighted by the user;
+    for example, when the user pauses with the cursor over a menu option,
+    toolbar button, or presses an action's shortcut key combination.
+
+    \sa activate()
+*/
+
+/*!
+    \fn void QGuiAction::changed()
+
+    This signal is emitted when an action has changed. If you
+    are only interested in actions in a given widget, you can
+    watch for QWidget::actionEvent() sent with an
+    QEvent::ActionChanged.
+
+    \sa QWidget::actionEvent()
+*/
+
+/*!
+    \enum QGuiAction::ActionEvent
+
+    This enum type is used when calling QGuiAction::activate()
+
+    \value Trigger this will cause the QGuiAction::triggered() signal to be emitted.
+
+    \value Hover this will cause the QGuiAction::hovered() signal to be emitted.
+*/
+
+/*!
+    \property QGuiAction::menuRole
+    \brief the action's menu role
+
+    This indicates what role the action serves in the application menu on
+    \macos. By default all actions have the TextHeuristicRole, which means that
+    the action is added based on its text (see QMenuBar for more information).
+
+    The menu role can only be changed before the actions are put into the menu
+    bar in \macos (usually just before the first application window is
+    shown).
+*/
+void QGuiAction::setMenuRole(MenuRole menuRole)
+{
+    Q_D(QGuiAction);
+    if (d->menuRole == menuRole)
+        return;
+
+    d->menuRole = menuRole;
+    d->sendDataChanged();
+}
+
+QGuiAction::MenuRole QGuiAction::menuRole() const
+{
+    Q_D(const QGuiAction);
+    return d->menuRole;
+}
+
+/*!
+    \property QGuiAction::iconVisibleInMenu
+    \brief Whether or not an action should show an icon in a menu
+
+    In some applications, it may make sense to have actions with icons in the
+    toolbar, but not in menus. If true, the icon (if valid) is shown in the menu, when it
+    is false, it is not shown.
+
+    The default is to follow whether the Qt::AA_DontShowIconsInMenus attribute
+    is set for the application. Explicitly settings this property overrides
+    the presence (or abscence) of the attribute.
+
+    For example:
+    \snippet code/src_gui_kernel_qaction.cpp 0
+
+    \sa icon, QCoreApplication::setAttribute()
+*/
+void QGuiAction::setIconVisibleInMenu(bool visible)
+{
+    Q_D(QGuiAction);
+    if (d->iconVisibleInMenu == -1 || visible != bool(d->iconVisibleInMenu)) {
+        int oldValue = d->iconVisibleInMenu;
+        d->iconVisibleInMenu = visible;
+        // Only send data changed if we really need to.
+        if (oldValue != -1
+            || visible == !QCoreApplication::testAttribute(Qt::AA_DontShowIconsInMenus)) {
+            d->sendDataChanged();
+        }
+    }
+}
+
+bool QGuiAction::isIconVisibleInMenu() const
+{
+    Q_D(const QGuiAction);
+    if (d->iconVisibleInMenu == -1) {
+        return !QCoreApplication::testAttribute(Qt::AA_DontShowIconsInMenus);
+    }
+    return d->iconVisibleInMenu;
+}
+
+/*!
+    \property QGuiAction::shortcutVisibleInContextMenu
+    \brief Whether or not an action should show a shortcut in a context menu
+
+    In some applications, it may make sense to have actions with shortcuts in
+    context menus. If true, the shortcut (if valid) is shown when the action is
+    shown via a context menu, when it is false, it is not shown.
+
+    The default is to follow whether the Qt::AA_DontShowShortcutsInContextMenus attribute
+    is set for the application, falling back to the widget style hint.
+    Explicitly setting this property overrides the presence (or abscence) of the attribute.
+
+    \sa shortcut, QCoreApplication::setAttribute()
+*/
+void QGuiAction::setShortcutVisibleInContextMenu(bool visible)
+{
+    Q_D(QGuiAction);
+    if (d->shortcutVisibleInContextMenu == -1 || visible != bool(d->shortcutVisibleInContextMenu)) {
+        int oldValue = d->shortcutVisibleInContextMenu;
+        d->shortcutVisibleInContextMenu = visible;
+        // Only send data changed if we really need to.
+        if (oldValue != -1
+            || visible == !QCoreApplication::testAttribute(Qt::AA_DontShowShortcutsInContextMenus)) {
+            d->sendDataChanged();
+        }
+    }
+}
+
+bool QGuiAction::isShortcutVisibleInContextMenu() const
+{
+    Q_D(const QGuiAction);
+    if (d->shortcutVisibleInContextMenu == -1) {
+        return !QCoreApplication::testAttribute(Qt::AA_DontShowShortcutsInContextMenus)
+            && QGuiApplication::styleHints()->showShortcutsInContextMenus();
+    }
+    return d->shortcutVisibleInContextMenu;
+}
+
+#ifndef QT_NO_DEBUG_STREAM
+Q_GUI_EXPORT QDebug operator<<(QDebug d, const QGuiAction *action)
+{
+    QDebugStateSaver saver(d);
+    d.nospace();
+    d << "QGuiAction(" << static_cast<const void *>(action);
+    if (action) {
+        d << " text=" << action->text();
+        if (!action->toolTip().isEmpty())
+            d << " toolTip=" << action->toolTip();
+        if (action->isCheckable())
+            d << " checked=" << action->isChecked();
+#if QT_CONFIG(shortcut)
+        if (!action->shortcut().isEmpty())
+            d << " shortcut=" << action->shortcut();
+#endif
+        d << " menuRole=";
+        QtDebugUtils::formatQEnum(d, action->menuRole());
+        d << " enabled=" << action->isEnabled();
+        d << " visible=" << action->isVisible();
+    } else {
+        d << '0';
+    }
+    d << ')';
+    return d;
+}
+#endif // QT_NO_DEBUG_STREAM
+
+QT_END_NAMESPACE
+
+#include "moc_qguiaction.cpp"
diff --git a/src/gui/kernel/qguiaction.h b/src/gui/kernel/qguiaction.h
new file mode 100644
index 0000000000..1306c3cf94
--- /dev/null
+++ b/src/gui/kernel/qguiaction.h
@@ -0,0 +1,201 @@
+/****************************************************************************
+**
+** Copyright (C) 2019 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtGui module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QGUIACTION_H
+#define QGUIACTION_H
+
+#include <QtGui/qtguiglobal.h>
+#if QT_CONFIG(shortcut)
+#  include <QtGui/qkeysequence.h>
+#endif
+#include <QtGui/qicon.h>
+#include <QtCore/qstring.h>
+#include <QtCore/qvariant.h>
+
+QT_REQUIRE_CONFIG(action);
+
+QT_BEGIN_NAMESPACE
+
+class QActionEvent;
+class QGuiActionGroup;
+class QGuiActionPrivate;
+
+class Q_GUI_EXPORT QGuiAction : public QObject
+{
+    Q_OBJECT
+    Q_DECLARE_PRIVATE(QGuiAction)
+
+    Q_PROPERTY(bool checkable READ isCheckable WRITE setCheckable NOTIFY checkableChanged FINAL)
+    Q_PROPERTY(bool checked READ isChecked WRITE setChecked NOTIFY toggled)
+    Q_PROPERTY(bool enabled READ isEnabled WRITE setEnabled NOTIFY enabledChanged RESET resetEnabled FINAL)
+    Q_PROPERTY(QIcon icon READ icon WRITE setIcon NOTIFY changed)
+    Q_PROPERTY(QString text READ text WRITE setText NOTIFY changed)
+    Q_PROPERTY(QString iconText READ iconText WRITE setIconText NOTIFY changed)
+    Q_PROPERTY(QString toolTip READ toolTip WRITE setToolTip NOTIFY changed)
+    Q_PROPERTY(QString statusTip READ statusTip WRITE setStatusTip NOTIFY changed)
+    Q_PROPERTY(QString whatsThis READ whatsThis WRITE setWhatsThis NOTIFY changed)
+    Q_PROPERTY(QFont font READ font WRITE setFont NOTIFY changed)
+#if QT_CONFIG(shortcut)
+    Q_PROPERTY(QKeySequence shortcut READ shortcut WRITE setShortcut NOTIFY changed)
+    Q_PROPERTY(Qt::ShortcutContext shortcutContext READ shortcutContext WRITE setShortcutContext NOTIFY changed)
+    Q_PROPERTY(bool autoRepeat READ autoRepeat WRITE setAutoRepeat NOTIFY changed)
+#endif // QT_CONFIG(shortcut)
+    Q_PROPERTY(bool visible READ isVisible WRITE setVisible NOTIFY changed)
+    Q_PROPERTY(MenuRole menuRole READ menuRole WRITE setMenuRole NOTIFY changed)
+    Q_PROPERTY(bool iconVisibleInMenu READ isIconVisibleInMenu WRITE setIconVisibleInMenu NOTIFY changed)
+    Q_PROPERTY(bool shortcutVisibleInContextMenu READ isShortcutVisibleInContextMenu WRITE setShortcutVisibleInContextMenu NOTIFY changed)
+    Q_PROPERTY(Priority priority READ priority WRITE setPriority)
+
+public:
+    // note this is copied into qplatformmenu.h, which must stay in sync
+    enum MenuRole { NoRole = 0, TextHeuristicRole, ApplicationSpecificRole, AboutQtRole,
+                    AboutRole, PreferencesRole, QuitRole };
+    Q_ENUM(MenuRole)
+    enum Priority { LowPriority = 0,
+                    NormalPriority = 128,
+                    HighPriority = 256};
+    Q_ENUM(Priority)
+    explicit QGuiAction(QObject *parent = nullptr);
+    explicit QGuiAction(const QString &text, QObject *parent = nullptr);
+    explicit QGuiAction(const QIcon &icon, const QString &text, QObject *parent = nullptr);
+
+    ~QGuiAction();
+
+    void setActionGroup(QGuiActionGroup *group);
+    QGuiActionGroup *guiActionGroup() const;
+    void setIcon(const QIcon &icon);
+    QIcon icon() const;
+
+    void setText(const QString &text);
+    QString text() const;
+
+    void setIconText(const QString &text);
+    QString iconText() const;
+
+    void setToolTip(const QString &tip);
+    QString toolTip() const;
+
+    void setStatusTip(const QString &statusTip);
+    QString statusTip() const;
+
+    void setWhatsThis(const QString &what);
+    QString whatsThis() const;
+
+    void setPriority(Priority priority);
+    Priority priority() const;
+
+    void setSeparator(bool b);
+    bool isSeparator() const;
+
+#if QT_CONFIG(shortcut)
+    void setShortcut(const QKeySequence &shortcut);
+    QKeySequence shortcut() const;
+
+    void setShortcuts(const QList<QKeySequence> &shortcuts);
+    void setShortcuts(QKeySequence::StandardKey);
+    QList<QKeySequence> shortcuts() const;
+
+    void setShortcutContext(Qt::ShortcutContext context);
+    Qt::ShortcutContext shortcutContext() const;
+
+    void setAutoRepeat(bool);
+    bool autoRepeat() const;
+#endif // QT_CONFIG(shortcut)
+
+    void setFont(const QFont &font);
+    QFont font() const;
+
+    void setCheckable(bool);
+    bool isCheckable() const;
+
+    QVariant data() const;
+    void setData(const QVariant &var);
+
+    bool isChecked() const;
+
+    bool isEnabled() const;
+
+    bool isVisible() const;
+
+    enum ActionEvent { Trigger, Hover };
+    void activate(ActionEvent event);
+
+    void setMenuRole(MenuRole menuRole);
+    MenuRole menuRole() const;
+
+    void setIconVisibleInMenu(bool visible);
+    bool isIconVisibleInMenu() const;
+
+    void setShortcutVisibleInContextMenu(bool show);
+    bool isShortcutVisibleInContextMenu() const;
+
+protected:
+    bool event(QEvent *) override;
+    QGuiAction(QGuiActionPrivate &dd, QObject *parent);
+
+public Q_SLOTS:
+    void trigger() { activate(Trigger); }
+    void hover() { activate(Hover); }
+    void setChecked(bool);
+    void toggle();
+    void setEnabled(bool);
+    void resetEnabled();
+    inline void setDisabled(bool b) { setEnabled(!b); }
+    void setVisible(bool);
+
+Q_SIGNALS:
+    void changed();
+    void enabledChanged(bool enabled);
+    void checkableChanged(bool checkable);
+    void triggered(bool checked = false);
+    void hovered();
+    void toggled(bool);
+
+private:
+    Q_DISABLE_COPY(QGuiAction)
+    friend class QGuiActionGroup;
+};
+
+#ifndef QT_NO_DEBUG_STREAM
+Q_GUI_EXPORT QDebug operator<<(QDebug, const QGuiAction *);
+#endif
+
+QT_END_NAMESPACE
+
+#endif // QGUIACTION_H
diff --git a/src/gui/kernel/qguiaction_p.h b/src/gui/kernel/qguiaction_p.h
new file mode 100644
index 0000000000..08d9708a7e
--- /dev/null
+++ b/src/gui/kernel/qguiaction_p.h
@@ -0,0 +1,129 @@
+/****************************************************************************
+**
+** Copyright (C) 2019 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtGui module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QGUIACTION_P_H
+#define QGUIACTION_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists for the convenience
+// of other Qt classes.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <QtGui/private/qtguiglobal_p.h>
+#include <QtGui/qguiaction.h>
+#include <QtGui/qfont.h>
+#if QT_CONFIG(shortcut)
+#  include <QtGui/private/qshortcutmap_p.h>
+#endif
+#include "private/qobject_p.h"
+
+QT_REQUIRE_CONFIG(action);
+
+QT_BEGIN_NAMESPACE
+
+class QShortcutMap;
+
+class Q_GUI_EXPORT QGuiActionPrivate : public QObjectPrivate
+{
+    Q_DECLARE_PUBLIC(QGuiAction)
+public:
+    QGuiActionPrivate();
+    ~QGuiActionPrivate();
+
+#if QT_CONFIG(shortcut)
+    virtual QShortcutMap::ContextMatcher contextMatcher() const;
+#endif
+
+    static QGuiActionPrivate *get(QGuiAction *q)
+    {
+        return q->d_func();
+    }
+
+    bool setEnabled(bool enable, bool byGroup);
+
+    QPointer<QGuiActionGroup> group;
+    QString text;
+    QString iconText;
+    QIcon icon;
+    QString tooltip;
+    QString statustip;
+    QString whatsthis;
+#if QT_CONFIG(shortcut)
+    QKeySequence shortcut;
+    QList<QKeySequence> alternateShortcuts;
+#endif
+    QVariant userData;
+#if QT_CONFIG(shortcut)
+    int shortcutId = 0;
+    QVector<int> alternateShortcutIds;
+    Qt::ShortcutContext shortcutContext = Qt::WindowShortcut;
+    uint autorepeat : 1;
+#endif
+    QFont font;
+    uint enabled : 1, explicitEnabled : 1, explicitEnabledValue : 1;
+    uint visible : 1, forceInvisible : 1;
+    uint checkable : 1;
+    uint checked : 1;
+    uint separator : 1;
+    uint fontSet : 1;
+
+    int iconVisibleInMenu : 2;  // Only has values -1, 0, and 1
+    int shortcutVisibleInContextMenu : 2; // Only has values -1, 0, and 1
+
+    QGuiAction::MenuRole menuRole = QGuiAction::TextHeuristicRole;
+    QGuiAction::Priority priority = QGuiAction::NormalPriority;
+
+#if QT_CONFIG(shortcut)
+    void redoGrab(QShortcutMap &map);
+    void redoGrabAlternate(QShortcutMap &map);
+    void setShortcutEnabled(bool enable, QShortcutMap &map);
+#endif // QT_NO_SHORTCUT
+
+    void sendDataChanged();
+};
+
+QT_END_NAMESPACE
+
+#endif // QACTION_P_H
diff --git a/src/gui/kernel/qguiactiongroup.cpp b/src/gui/kernel/qguiactiongroup.cpp
new file mode 100644
index 0000000000..defa5f15aa
--- /dev/null
+++ b/src/gui/kernel/qguiactiongroup.cpp
@@ -0,0 +1,340 @@
+/****************************************************************************
+**
+** Copyright (C) 2019 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtGui module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qguiactiongroup.h"
+
+#include "qguiaction.h"
+#include "qguiaction_p.h"
+#include "qguiactiongroup_p.h"
+#include "qevent.h"
+#include "qlist.h"
+
+QT_BEGIN_NAMESPACE
+
+QGuiActionGroupPrivate::QGuiActionGroupPrivate() :
+    enabled(1), visible(1)
+{
+}
+
+QGuiActionGroupPrivate::~QGuiActionGroupPrivate() = default;
+
+void QGuiActionGroup::_q_actionChanged()
+{
+    Q_D(QGuiActionGroup);
+    auto action = qobject_cast<QGuiAction*>(sender());
+    Q_ASSERT_X(action != nullptr, "QGuiActionGroup::_q_actionChanged", "internal error");
+    if (d->exclusionPolicy != QGuiActionGroup::ExclusionPolicy::None) {
+        if (action->isChecked()) {
+            if (action != d->current) {
+                if (!d->current.isNull())
+                    d->current->setChecked(false);
+                d->current = action;
+            }
+        } else if (action == d->current) {
+            d->current = nullptr;
+        }
+    }
+}
+
+void QGuiActionGroup::_q_actionTriggered()
+{
+    Q_D(QGuiActionGroup);
+    auto action = qobject_cast<QGuiAction*>(sender());
+    Q_ASSERT_X(action != nullptr, "QGuiActionGroup::_q_actionTriggered", "internal error");
+    d->emitSignal(QGuiActionGroupPrivate::Triggered, action);
+}
+
+void QGuiActionGroup::_q_actionHovered()
+{
+    Q_D(QGuiActionGroup);
+    auto action = qobject_cast<QGuiAction*>(sender());
+    Q_ASSERT_X(action != nullptr, "QGuiActionGroup::_q_actionHovered", "internal error");
+    d->emitSignal(QGuiActionGroupPrivate::Hovered, action);
+}
+
+/*!
+    \class QGuiActionGroup
+    \brief The QGuiActionGroup class groups actions together.
+    \since 6.0
+
+    \inmodule QtGui
+
+    QGuiActionGroup is a base class for classes grouping
+    classes inhheriting QGuiAction objects together.
+
+    In some situations it is useful to group QGuiAction objects together.
+    For example, if you have a \uicontrol{Left Align} action, a \uicontrol{Right
+    Align} action, a \uicontrol{Justify} action, and a \uicontrol{Center} action,
+    only one of these actions should be active at any one time. One
+    simple way of achieving this is to group the actions together in
+    an action group, inheriting QGuiActionGroup.
+
+    \sa QGuiAction
+*/
+
+/*!
+    \enum QGuiActionGroup::ExclusionPolicy
+
+    This enum specifies the different policies that can be used to
+    control how the group performs exclusive checking on checkable actions.
+
+    \value None
+           The actions in the group can be checked independently of each other.
+
+    \value Exclusive
+           Exactly one action can be checked at any one time.
+           This is the default policy.
+
+    \value ExclusiveOptional
+           At most one action can be checked at any one time. The actions
+           can also be all unchecked.
+
+    \sa exclusionPolicy
+*/
+
+/*!
+    Constructs an action group for the \a parent object.
+
+    The action group is exclusive by default. Call setExclusive(false)
+    to make the action group non-exclusive. To make the group exclusive
+    but allow unchecking the active action call instead
+    setExclusionPolicy(QGuiActionGroup::ExclusionPolicy::ExclusiveOptional)
+*/
+QGuiActionGroup::QGuiActionGroup(QObject* parent) :
+    QGuiActionGroup(*new QGuiActionGroupPrivate, parent)
+{
+}
+
+QGuiActionGroup::QGuiActionGroup(QGuiActionGroupPrivate &dd, QObject *parent) :
+    QObject(dd, parent)
+{
+}
+
+/*!
+    Destroys the action group.
+*/
+QGuiActionGroup::~QGuiActionGroup() = default;
+
+/*!
+    \fn QGuiAction *QGuiActionGroup::addAction(QGuiAction *action)
+
+    Adds the \a action to this group, and returns it.
+
+    Normally an action is added to a group by creating it with the
+    group as its parent, so this function is not usually used.
+
+    \sa QGuiAction::setActionGroup()
+*/
+QGuiAction *QGuiActionGroup::addAction(QGuiAction* a)
+{
+    Q_D(QGuiActionGroup);
+    if (!d->actions.contains(a)) {
+        d->actions.append(a);
+        QObject::connect(a, &QGuiAction::triggered, this, &QGuiActionGroup::_q_actionTriggered);
+        QObject::connect(a, &QGuiAction::changed, this, &QGuiActionGroup::_q_actionChanged);
+        QObject::connect(a, &QGuiAction::hovered, this, &QGuiActionGroup::_q_actionHovered);
+    }
+    a->d_func()->setEnabled(d->enabled, true);
+    if (!a->d_func()->forceInvisible) {
+        a->setVisible(d->visible);
+        a->d_func()->forceInvisible = false;
+    }
+    if (a->isChecked())
+        d->current = a;
+    QGuiActionGroup *oldGroup = a->d_func()->group;
+    if (oldGroup != this) {
+        if (oldGroup)
+            oldGroup->removeAction(a);
+        a->d_func()->group = this;
+        a->d_func()->sendDataChanged();
+    }
+    return a;
+}
+
+/*!
+  Removes the \a action from this group. The action will have no
+  parent as a result.
+
+  \sa QGuiAction::setActionGroup()
+*/
+void QGuiActionGroup::removeAction(QGuiAction *action)
+{
+    Q_D(QGuiActionGroup);
+    if (d->actions.removeAll(action)) {
+        if (action == d->current)
+            d->current = nullptr;
+        QObject::disconnect(action, &QGuiAction::triggered, this, &QGuiActionGroup::_q_actionTriggered);
+        QObject::disconnect(action, &QGuiAction::changed, this, &QGuiActionGroup::_q_actionChanged);
+        QObject::disconnect(action, &QGuiAction::hovered, this, &QGuiActionGroup::_q_actionHovered);
+        action->d_func()->group = nullptr;
+    }
+}
+
+/*!
+    Returns the list of this groups's actions. This may be empty.
+*/
+QList<QGuiAction*> QGuiActionGroup::guiActions() const
+{
+    Q_D(const QGuiActionGroup);
+    return d->actions;
+}
+
+/*!
+    \brief Enable or disable the group exclusion checking
+
+    This is a convenience method that calls
+    setExclusionPolicy(ExclusionPolicy::Exclusive) when \a b is true,
+    else setExclusionPolicy(QActionGroup::ExclusionPolicy::None).
+
+    \sa QGuiActionGroup::exclusionPolicy
+*/
+void QGuiActionGroup::setExclusive(bool b)
+{
+    setExclusionPolicy(b ? QGuiActionGroup::ExclusionPolicy::Exclusive
+                         : QGuiActionGroup::ExclusionPolicy::None);
+}
+
+/*!
+    \brief Returns true if the group is exclusive
+
+    The group is exclusive if the ExclusionPolicy is either Exclusive
+    or ExclusionOptional.
+
+*/
+bool QGuiActionGroup::isExclusive() const
+{
+    return exclusionPolicy() != QGuiActionGroup::ExclusionPolicy::None;
+}
+
+/*!
+    \property QGuiActionGroup::exclusionPolicy
+    \brief This property holds the group exclusive checking policy
+
+    If exclusionPolicy is set to Exclusive, only one checkable
+    action in the action group can ever be active at any time. If the user
+    chooses another checkable action in the group, the one they chose becomes
+    active and the one that was active becomes inactive. If exclusionPolicy is
+    set to ExclusionOptional the group is exclusive but the active checkable
+    action in the group can be unchecked leaving the group with no actions
+    checked.
+
+    \sa QGuiAction::checkable
+*/
+void QGuiActionGroup::setExclusionPolicy(QGuiActionGroup::ExclusionPolicy policy)
+{
+    Q_D(QGuiActionGroup);
+    d->exclusionPolicy = policy;
+}
+
+QGuiActionGroup::ExclusionPolicy QGuiActionGroup::exclusionPolicy() const
+{
+    Q_D(const QGuiActionGroup);
+    return d->exclusionPolicy;
+}
+
+/*!
+    \fn void QGuiActionGroup::setDisabled(bool b)
+
+    This is a convenience function for the \l enabled property, that
+    is useful for signals--slots connections. If \a b is true the
+    action group is disabled; otherwise it is enabled.
+*/
+
+/*!
+    \property QGuiActionGroup::enabled
+    \brief whether the action group is enabled
+
+    Each action in the group will be enabled or disabled unless it
+    has been explicitly disabled.
+
+    \sa QGuiAction::setEnabled()
+*/
+void QGuiActionGroup::setEnabled(bool b)
+{
+    Q_D(QGuiActionGroup);
+    d->enabled = b;
+    for (auto action : qAsConst(d->actions)) {
+        action->d_func()->setEnabled(b, true);
+    }
+}
+
+bool QGuiActionGroup::isEnabled() const
+{
+    Q_D(const QGuiActionGroup);
+    return d->enabled;
+}
+
+/*!
+  Returns the currently checked action in the group, or \nullptr if
+  none are checked.
+*/
+QGuiAction *QGuiActionGroup::checkedGuiAction() const
+{
+    Q_D(const QGuiActionGroup);
+    return d->current.data();
+}
+
+/*!
+    \property QGuiActionGroup::visible
+    \brief whether the action group is visible
+
+    Each action in the action group will match the visible state of
+    this group unless it has been explicitly hidden.
+
+    \sa QGuiAction::setEnabled()
+*/
+void QGuiActionGroup::setVisible(bool b)
+{
+    Q_D(QGuiActionGroup);
+    d->visible = b;
+    for (auto action : qAsConst(d->actions)) {
+        if (!action->d_func()->forceInvisible) {
+            action->setVisible(b);
+            action->d_func()->forceInvisible = false;
+        }
+    }
+}
+
+bool QGuiActionGroup::isVisible() const
+{
+    Q_D(const QGuiActionGroup);
+    return d->visible;
+}
+
+QT_END_NAMESPACE
diff --git a/src/gui/kernel/qguiactiongroup.h b/src/gui/kernel/qguiactiongroup.h
new file mode 100644
index 0000000000..ef08fb2e04
--- /dev/null
+++ b/src/gui/kernel/qguiactiongroup.h
@@ -0,0 +1,104 @@
+/****************************************************************************
+**
+** Copyright (C) 2019 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtGui module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QGUIACTIONGROUP_H
+#define QGUIACTIONGROUP_H
+
+#include <QtGui/qtguiglobal.h>
+#include <QtGui/qguiaction.h>
+
+QT_REQUIRE_CONFIG(action);
+
+QT_BEGIN_NAMESPACE
+
+class QGuiActionGroupPrivate;
+
+class Q_GUI_EXPORT QGuiActionGroup : public QObject
+{
+    Q_OBJECT
+    Q_DECLARE_PRIVATE(QGuiActionGroup)
+
+    Q_PROPERTY(QGuiActionGroup::ExclusionPolicy exclusionPolicy READ exclusionPolicy WRITE setExclusionPolicy)
+    Q_PROPERTY(bool enabled READ isEnabled WRITE setEnabled)
+    Q_PROPERTY(bool visible READ isVisible WRITE setVisible)
+
+public:
+    enum class ExclusionPolicy {
+        None,
+        Exclusive,
+        ExclusiveOptional
+    };
+    Q_ENUM(ExclusionPolicy)
+
+    explicit QGuiActionGroup(QObject *parent);
+    ~QGuiActionGroup();
+
+    QGuiAction *addAction(QGuiAction *a);
+    void removeAction(QGuiAction *a);
+    QList<QGuiAction*> guiActions() const;
+    QGuiAction *checkedGuiAction() const;
+
+    bool isExclusive() const;
+    bool isEnabled() const;
+    bool isVisible() const;
+    ExclusionPolicy exclusionPolicy() const;
+
+
+public Q_SLOTS:
+    void setEnabled(bool);
+    inline void setDisabled(bool b) { setEnabled(!b); }
+    void setVisible(bool);
+    void setExclusive(bool);
+    void setExclusionPolicy(ExclusionPolicy policy);
+
+private Q_SLOTS:
+    void _q_actionTriggered();
+    void _q_actionHovered();
+    void _q_actionChanged();
+
+protected:
+     QGuiActionGroup(QGuiActionGroupPrivate &dd, QObject *parent);
+
+private:
+    Q_DISABLE_COPY(QGuiActionGroup)
+};
+
+QT_END_NAMESPACE
+
+#endif // QGUIACTIONGROUP_H
diff --git a/src/gui/kernel/qguiactiongroup_p.h b/src/gui/kernel/qguiactiongroup_p.h
new file mode 100644
index 0000000000..99a58262c9
--- /dev/null
+++ b/src/gui/kernel/qguiactiongroup_p.h
@@ -0,0 +1,91 @@
+/****************************************************************************
+**
+** Copyright (C) 2019 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtGui module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QGUIACTIONGROUP_P_H
+#define QGUIACTIONGROUP_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API. It exists for the convenience
+// of other Qt classes. This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <QtGui/private/qtguiglobal_p.h>
+#include <QtGui/qguiactiongroup.h>
+#include <QtGui/qfont.h>
+#if QT_CONFIG(shortcut)
+#  include <QtGui/private/qshortcutmap_p.h>
+#endif
+#include "private/qobject_p.h"
+
+QT_REQUIRE_CONFIG(action);
+
+QT_BEGIN_NAMESPACE
+
+class Q_GUI_EXPORT QGuiActionGroupPrivate : public QObjectPrivate
+{
+    Q_DECLARE_PUBLIC(QGuiActionGroup)
+public:
+    enum Signal { Triggered, Hovered };
+
+    QGuiActionGroupPrivate();
+    ~QGuiActionGroupPrivate();
+
+    virtual void emitSignal(Signal, QGuiAction *) {}
+
+    QList<QGuiAction *> actions;
+    QPointer<QGuiAction> current;
+    uint enabled : 1;
+    uint visible : 1;
+    QGuiActionGroup::ExclusionPolicy exclusionPolicy = QGuiActionGroup::ExclusionPolicy::Exclusive;
+
+private:
+    void _q_actionTriggered();  //private slot
+    void _q_actionChanged();    //private slot
+    void _q_actionHovered();    //private slot
+};
+
+QT_END_NAMESPACE
+
+#endif // QACTIONGROUP_P_H
diff --git a/src/gui/kernel/qguiapplication.cpp b/src/gui/kernel/qguiapplication.cpp
index 469563c415..0ad6272a7c 100644
--- a/src/gui/kernel/qguiapplication.cpp
+++ b/src/gui/kernel/qguiapplication.cpp
@@ -613,6 +613,13 @@ static QWindowGeometrySpecification windowGeometrySpecification = Q_WINDOW_GEOME
         \li \c {dpiawareness=[0|1|2]} Sets the DPI awareness of the process
                (see \l{High DPI Displays}, since Qt 5.4).
         \li \c {fontengine=freetype}, uses the FreeType font engine.
+        \li \c {fontengine=directwrite}, uses the experimental DirectWrite
+               font database and defaults to using the DirectWrite font
+               engine (which is otherwise only used for some font types
+               or font properties.) This affects font selection and aims
+               to provide font naming more consistent with other platforms,
+               but does not support all font formats, such as Postscript
+               Type-1 or Microsoft FNT fonts.
         \li \c {menus=[native|none]}, controls the use of native menus.
 
                Native menus are implemented using Win32 API and are simpler than
@@ -1205,14 +1212,18 @@ Q_LOGGING_CATEGORY(lcQpaPluginLoading, "qt.qpa.plugin");
 
 static void init_platform(const QString &pluginNamesWithArguments, const QString &platformPluginPath, const QString &platformThemeName, int &argc, char **argv)
 {
-    QStringList plugins = pluginNamesWithArguments.split(QLatin1Char(';'));
+    QStringList plugins = pluginNamesWithArguments.split(QLatin1Char(';'), Qt::SkipEmptyParts);
     QStringList platformArguments;
     QStringList availablePlugins = QPlatformIntegrationFactory::keys(platformPluginPath);
     for (const auto &pluginArgument : plugins) {
         // Split into platform name and arguments
-        QStringList arguments = pluginArgument.split(QLatin1Char(':'));
+        QStringList arguments = pluginArgument.split(QLatin1Char(':'), Qt::SkipEmptyParts);
+        if (arguments.isEmpty())
+            continue;
         const QString name = arguments.takeFirst().toLower();
         QString argumentsKey = name;
+        if (name.isEmpty())
+            continue;
         argumentsKey[0] = argumentsKey.at(0).toUpper();
         arguments.append(QLibraryInfo::platformPluginArguments(argumentsKey));
 
diff --git a/src/gui/kernel/qguiapplication_p.h b/src/gui/kernel/qguiapplication_p.h
index 5239b58c97..dc2963aee7 100644
--- a/src/gui/kernel/qguiapplication_p.h
+++ b/src/gui/kernel/qguiapplication_p.h
@@ -62,7 +62,10 @@
 
 #include <qpa/qwindowsysteminterface.h>
 #include <qpa/qwindowsysteminterface_p.h>
-#include "private/qshortcutmap_p.h"
+#if QT_CONFIG(shortcut)
+#  include "private/qshortcutmap_p.h"
+#endif
+
 #include <qicon.h>
 
 QT_BEGIN_NAMESPACE
@@ -263,7 +266,7 @@ public:
     QIcon forcedWindowIcon;
 
     static QList<QObject *> generic_plugin_list;
-#ifndef QT_NO_SHORTCUT
+#if QT_CONFIG(shortcut)
     QShortcutMap shortcutMap;
 #endif
 
diff --git a/src/gui/kernel/qguishortcut.cpp b/src/gui/kernel/qguishortcut.cpp
new file mode 100644
index 0000000000..add1dce12e
--- /dev/null
+++ b/src/gui/kernel/qguishortcut.cpp
@@ -0,0 +1,354 @@
+/****************************************************************************
+**
+** Copyright (C) 2019 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtGui module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qguishortcut.h"
+#include "qguishortcut_p.h"
+
+#include <qevent.h>
+#include <qguiapplication.h>
+#include <qwindow.h>
+#include <private/qguiapplication_p.h>
+#include <qpa/qplatformmenu.h>
+
+QT_BEGIN_NAMESPACE
+
+#define QAPP_CHECK(functionName) \
+    if (Q_UNLIKELY(!qApp)) {                                            \
+        qWarning("QGuiShortcut: Initialize QGuiApplication before calling '" functionName "'."); \
+        return; \
+    }
+
+/*!
+    \class QGuiShortcut
+    \brief The QGuiShortcut class is a base class for handling keyboard shortcuts.
+
+    \ingroup events
+    \inmodule QtGui
+    \since 6.0
+
+    The QGuiShortcut class is a base class for classes providing a way of
+    connecting keyboard shortcuts to Qt's \l{signals and slots} mechanism,
+    so that objects can be informed when a shortcut is executed. The shortcut
+    can be set up to contain all the key presses necessary to
+    describe a keyboard shortcut, including the states of modifier
+    keys such as \uicontrol Shift, \uicontrol Ctrl, and \uicontrol Alt.
+
+    \target mnemonic
+
+    \sa QShortcutEvent, QKeySequence, QAction
+*/
+
+/*!
+    \fn void QGuiShortcut::activated()
+
+    This signal is emitted when the user types the shortcut's key
+    sequence.
+
+    \sa activatedAmbiguously()
+*/
+
+/*!
+    \fn void QGuiShortcut::activatedAmbiguously()
+
+    When a key sequence is being typed at the keyboard, it is said to
+    be ambiguous as long as it matches the start of more than one
+    shortcut.
+
+    When a shortcut's key sequence is completed,
+    activatedAmbiguously() is emitted if the key sequence is still
+    ambiguous (i.e., it is the start of one or more other shortcuts).
+    The activated() signal is not emitted in this case.
+
+    \sa activated()
+*/
+
+static bool simpleContextMatcher(QObject *object, Qt::ShortcutContext context)
+{
+    auto guiShortcut = qobject_cast<QGuiShortcut *>(object);
+    if (QGuiApplication::applicationState() != Qt::ApplicationActive || guiShortcut == nullptr)
+        return false;
+    if (context == Qt::ApplicationShortcut)
+        return true;
+    auto focusWindow = QGuiApplication::focusWindow();
+    if (!focusWindow)
+        return false;
+    auto window = qobject_cast<const QWindow *>(guiShortcut->parent());
+    if (!window)
+        return false;
+    if (focusWindow == window && focusWindow->isTopLevel())
+        return context == Qt::WindowShortcut || context == Qt::WidgetWithChildrenShortcut;
+    return focusWindow->isAncestorOf(window, QWindow::ExcludeTransients);
+}
+
+QShortcutMap::ContextMatcher QGuiShortcutPrivate::contextMatcher() const
+{
+    return simpleContextMatcher;
+}
+
+void QGuiShortcutPrivate::redoGrab(QShortcutMap &map)
+{
+    Q_Q(QGuiShortcut);
+    if (Q_UNLIKELY(!parent)) {
+        qWarning("QGuiShortcut: No window parent defined");
+        return;
+    }
+
+    if (sc_id)
+        map.removeShortcut(sc_id, q);
+    if (sc_sequence.isEmpty())
+        return;
+    sc_id = map.addShortcut(q, sc_sequence, sc_context, contextMatcher());
+    if (!sc_enabled)
+        map.setShortcutEnabled(false, sc_id, q);
+    if (!sc_autorepeat)
+        map.setShortcutAutoRepeat(false, sc_id, q);
+}
+
+/*!
+    Constructs a QGuiShortcut object for the \a parent window. Since no
+    shortcut key sequence is specified, the shortcut will not emit any
+    signals.
+
+    \sa setKey()
+*/
+QGuiShortcut::QGuiShortcut(QWindow *parent)
+    : QGuiShortcut(*new QGuiShortcutPrivate, parent)
+{
+}
+
+/*!
+    Constructs a QGuiShortcut object for the \a parent window. The shortcut
+    operates on its parent, listening for \l{QShortcutEvent}s that
+    match the \a key sequence. Depending on the ambiguity of the
+    event, the shortcut will call the \a member function, or the \a
+    ambiguousMember function, if the key press was in the shortcut's
+    \a context.
+*/
+QGuiShortcut::QGuiShortcut(const QKeySequence &key, QWindow *parent,
+                           const char *member, const char *ambiguousMember,
+                           Qt::ShortcutContext context)
+    : QGuiShortcut(*new QGuiShortcutPrivate, key, parent, member, ambiguousMember, context)
+{
+}
+
+/*!
+    \internal
+*/
+QGuiShortcut::QGuiShortcut(QGuiShortcutPrivate &dd, QObject *parent)
+     : QObject(dd, parent)
+{
+    Q_ASSERT(parent != nullptr);
+}
+
+/*!
+    \internal
+*/
+QGuiShortcut::QGuiShortcut(QGuiShortcutPrivate &dd,
+                           const QKeySequence &key, QObject *parent,
+                           const char *member, const char *ambiguousMember,
+                           Qt::ShortcutContext context)
+    : QGuiShortcut(dd, parent)
+{
+    QAPP_CHECK("QGuiShortcut");
+
+    Q_D(QGuiShortcut);
+    d->sc_context = context;
+    d->sc_sequence = key;
+    d->redoGrab(QGuiApplicationPrivate::instance()->shortcutMap);
+    if (member)
+        connect(this, SIGNAL(activated()), parent, member);
+    if (ambiguousMember)
+        connect(this, SIGNAL(activatedAmbiguously()), parent, ambiguousMember);
+}
+
+/*!
+    Destroys the shortcut.
+*/
+QGuiShortcut::~QGuiShortcut()
+{
+    Q_D(QGuiShortcut);
+    if (qApp)
+        QGuiApplicationPrivate::instance()->shortcutMap.removeShortcut(d->sc_id, this);
+}
+
+/*!
+    \property QGuiShortcut::key
+    \brief the shortcut's key sequence
+
+    This is a key sequence with an optional combination of Shift, Ctrl,
+    and Alt. The key sequence may be supplied in a number of ways:
+
+    \snippet code/src_gui_kernel_qshortcut.cpp 1
+
+    By default, this property contains an empty key sequence.
+*/
+void QGuiShortcut::setKey(const QKeySequence &key)
+{
+    Q_D(QGuiShortcut);
+    if (d->sc_sequence == key)
+        return;
+    QAPP_CHECK("setKey");
+    d->sc_sequence = key;
+    d->redoGrab(QGuiApplicationPrivate::instance()->shortcutMap);
+}
+
+QKeySequence QGuiShortcut::key() const
+{
+    Q_D(const QGuiShortcut);
+    return d->sc_sequence;
+}
+
+/*!
+    \property QGuiShortcut::enabled
+    \brief whether the shortcut is enabled
+
+    An enabled shortcut emits the activated() or activatedAmbiguously()
+    signal when a QShortcutEvent occurs that matches the shortcut's
+    key() sequence.
+
+    If the application is in \c WhatsThis mode the shortcut will not emit
+    the signals, but will show the "What's This?" text instead.
+
+    By default, this property is \c true.
+
+    \sa whatsThis
+*/
+void QGuiShortcut::setEnabled(bool enable)
+{
+    Q_D(QGuiShortcut);
+    if (d->sc_enabled == enable)
+        return;
+    QAPP_CHECK("setEnabled");
+    d->sc_enabled = enable;
+    QGuiApplicationPrivate::instance()->shortcutMap.setShortcutEnabled(enable, d->sc_id, this);
+}
+
+bool QGuiShortcut::isEnabled() const
+{
+    Q_D(const QGuiShortcut);
+    return d->sc_enabled;
+}
+
+/*!
+    \property QGuiShortcut::context
+    \brief the context in which the shortcut is valid
+
+    A shortcut's context decides in which circumstances a shortcut is
+    allowed to be triggered. The normal context is Qt::WindowShortcut,
+    which allows the shortcut to trigger if the parent (the widget
+    containing the shortcut) is a subwidget of the active top-level
+    window.
+
+    By default, this property is set to Qt::WindowShortcut.
+*/
+void QGuiShortcut::setContext(Qt::ShortcutContext context)
+{
+    Q_D(QGuiShortcut);
+    if (d->sc_context == context)
+        return;
+    QAPP_CHECK("setContext");
+    d->sc_context = context;
+    d->redoGrab(QGuiApplicationPrivate::instance()->shortcutMap);
+}
+
+Qt::ShortcutContext QGuiShortcut::context() const
+{
+    Q_D(const QGuiShortcut);
+    return d->sc_context;
+}
+
+/*!
+    \property QGuiShortcut::autoRepeat
+    \brief whether the shortcut can auto repeat
+
+    If true, the shortcut will auto repeat when the keyboard shortcut
+    combination is held down, provided that keyboard auto repeat is
+    enabled on the system.
+    The default value is true.
+*/
+void QGuiShortcut::setAutoRepeat(bool on)
+{
+    Q_D(QGuiShortcut);
+    if (d->sc_autorepeat == on)
+        return;
+    QAPP_CHECK("setAutoRepeat");
+    d->sc_autorepeat = on;
+    QGuiApplicationPrivate::instance()->shortcutMap.setShortcutAutoRepeat(on, d->sc_id, this);
+}
+
+bool QGuiShortcut::autoRepeat() const
+{
+    Q_D(const QGuiShortcut);
+    return d->sc_autorepeat;
+}
+
+/*!
+    Returns the shortcut's ID.
+
+    \sa QShortcutEvent::shortcutId()
+*/
+int QGuiShortcut::id() const
+{
+    Q_D(const QGuiShortcut);
+    return d->sc_id;
+}
+
+/*!
+    \internal
+*/
+bool QGuiShortcut::event(QEvent *e)
+{
+    Q_D(QGuiShortcut);
+    if (d->sc_enabled && e->type() == QEvent::Shortcut) {
+        auto se = static_cast<QShortcutEvent *>(e);
+        if (se->shortcutId() == d->sc_id && se->key() == d->sc_sequence
+            && !d->handleWhatsThis()) {
+            if (se->isAmbiguous())
+                emit activatedAmbiguously();
+            else
+                emit activated();
+            return true;
+        }
+    }
+    return QObject::event(e);
+}
+
+QT_END_NAMESPACE
+
+#include "moc_qguishortcut.cpp"
diff --git a/src/gui/kernel/qguishortcut.h b/src/gui/kernel/qguishortcut.h
new file mode 100644
index 0000000000..fb64f10c84
--- /dev/null
+++ b/src/gui/kernel/qguishortcut.h
@@ -0,0 +1,98 @@
+/****************************************************************************
+**
+** Copyright (C) 2019 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtGui module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QGUISHORTCUT_H
+#define QGUISHORTCUT_H
+
+#include <QtGui/qtguiglobal.h>
+#include <QtGui/qkeysequence.h>
+#include <QtCore/qobject.h>
+
+QT_REQUIRE_CONFIG(shortcut);
+
+QT_BEGIN_NAMESPACE
+
+class QGuiShortcutPrivate;
+class QWindow;
+
+class Q_GUI_EXPORT QGuiShortcut : public QObject
+{
+    Q_OBJECT
+    Q_DECLARE_PRIVATE(QGuiShortcut)
+    Q_PROPERTY(QKeySequence key READ key WRITE setKey)
+    Q_PROPERTY(bool enabled READ isEnabled WRITE setEnabled)
+    Q_PROPERTY(bool autoRepeat READ autoRepeat WRITE setAutoRepeat)
+    Q_PROPERTY(Qt::ShortcutContext context READ context WRITE setContext)
+public:
+    explicit QGuiShortcut(QWindow *parent);
+    explicit QGuiShortcut(const QKeySequence& key, QWindow *parent,
+                          const char *member = nullptr, const char *ambiguousMember = nullptr,
+                          Qt::ShortcutContext context = Qt::WindowShortcut);
+    ~QGuiShortcut();
+
+    void setKey(const QKeySequence& key);
+    QKeySequence key() const;
+
+    void setEnabled(bool enable);
+    bool isEnabled() const;
+
+    void setContext(Qt::ShortcutContext context);
+    Qt::ShortcutContext context() const;
+
+    void setAutoRepeat(bool on);
+    bool autoRepeat() const;
+
+    int id() const;
+
+Q_SIGNALS:
+    void activated();
+    void activatedAmbiguously();
+
+protected:
+    QGuiShortcut(QGuiShortcutPrivate &dd, QObject *parent);
+    QGuiShortcut(QGuiShortcutPrivate &dd, const QKeySequence& key, QObject *parent,
+                 const char *member, const char *ambiguousMember,
+                 Qt::ShortcutContext context);
+
+    bool event(QEvent *e) override;
+};
+
+QT_END_NAMESPACE
+
+#endif // QGUISHORTCUT_H
diff --git a/src/gui/kernel/qguishortcut_p.h b/src/gui/kernel/qguishortcut_p.h
new file mode 100644
index 0000000000..420b02ef1a
--- /dev/null
+++ b/src/gui/kernel/qguishortcut_p.h
@@ -0,0 +1,92 @@
+/****************************************************************************
+**
+** Copyright (C) 2019 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtGui module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QGUISHORTCUT_P_H
+#define QGUISHORTCUT_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API. It exists purely as an
+// implementation detail. This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <QtGui/private/qtguiglobal_p.h>
+#include "qguishortcut.h"
+#include <QtGui/qkeysequence.h>
+
+#include <QtCore/qstring.h>
+#include <QtCore/private/qobject_p.h>
+
+#include <private/qshortcutmap_p.h>
+
+
+
+QT_BEGIN_NAMESPACE
+
+class QShortcutMap;
+
+/*
+    \internal
+    Private data accessed through d-pointer.
+*/
+class Q_GUI_EXPORT QGuiShortcutPrivate : public QObjectPrivate
+{
+    Q_DECLARE_PUBLIC(QGuiShortcut)
+public:
+    QGuiShortcutPrivate() = default;
+
+    virtual QShortcutMap::ContextMatcher contextMatcher() const;
+    virtual bool handleWhatsThis() { return false; }
+
+    QKeySequence sc_sequence;
+    Qt::ShortcutContext sc_context = Qt::WindowShortcut;
+    bool sc_enabled = true;
+    bool sc_autorepeat = true;
+    int sc_id = 0;
+    void redoGrab(QShortcutMap &map);
+};
+
+QT_END_NAMESPACE
+
+#endif // QGUISHORTCUT_P_H
diff --git a/src/gui/kernel/qguivariant.cpp b/src/gui/kernel/qguivariant.cpp
index c9c45ba815..e0e0d11ae3 100644
--- a/src/gui/kernel/qguivariant.cpp
+++ b/src/gui/kernel/qguivariant.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2020 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
@@ -45,7 +45,9 @@
 #include "qcursor.h"
 #include "qfont.h"
 #include "qimage.h"
-#include "qkeysequence.h"
+#if QT_CONFIG(shortcut)
+#  include "qkeysequence.h"
+#endif
 #include "qtransform.h"
 #include "qpalette.h"
 #include "qpen.h"
@@ -99,19 +101,6 @@ struct GuiTypesFilter {
     };
 };
 
-static void construct(QVariant::Private *x, const void *copy)
-{
-    const int type = x->type;
-    QVariantConstructor<GuiTypesFilter> constructor(x, copy);
-    QMetaTypeSwitcher::switcher<void>(constructor, type, nullptr);
-}
-
-static void clear(QVariant::Private *d)
-{
-    QVariantDestructor<GuiTypesFilter> destructor(d);
-    QMetaTypeSwitcher::switcher<void>(destructor, d->type, nullptr);
-}
-
 // This class is a hack that customizes access to QPolygon and QPolygonF
 template<class Filter>
 class QGuiVariantIsNull : public QVariantIsNull<Filter> {
@@ -129,7 +118,7 @@ public:
 static bool isNull(const QVariant::Private *d)
 {
     QGuiVariantIsNull<GuiTypesFilter> isNull(d);
-    return QMetaTypeSwitcher::switcher<bool>(isNull, d->type, nullptr);
+    return QMetaTypeSwitcher::switcher<bool>(isNull, d->type().id(), nullptr);
 }
 
 // This class is a hack that customizes access to QPixmap, QBitmap, QCursor and QIcon
@@ -171,7 +160,7 @@ public:
 static bool compare(const QVariant::Private *a, const QVariant::Private *b)
 {
     QGuiVariantComparator<GuiTypesFilter> comparator(a, b);
-    return QMetaTypeSwitcher::switcher<bool>(comparator, a->type, nullptr);
+    return QMetaTypeSwitcher::switcher<bool>(comparator, a->type().id(), nullptr);
 }
 
 static bool convert(const QVariant::Private *d, int t,
@@ -179,7 +168,7 @@ static bool convert(const QVariant::Private *d, int t,
 {
     switch (t) {
     case QMetaType::QByteArray:
-        if (d->type == QMetaType::QColor) {
+        if (d->type().id() == QMetaType::QColor) {
             const QColor *c = v_cast<QColor>(d);
             *static_cast<QByteArray *>(result) = c->name(c->alpha() != 255 ? QColor::HexArgb : QColor::HexRgb).toLatin1();
             return true;
@@ -187,8 +176,8 @@ static bool convert(const QVariant::Private *d, int t,
         break;
     case QMetaType::QString: {
         QString *str = static_cast<QString *>(result);
-        switch (d->type) {
-#ifndef QT_NO_SHORTCUT
+        switch (d->type().id()) {
+#if QT_CONFIG(shortcut)
         case QMetaType::QKeySequence:
             *str = (*v_cast<QKeySequence>(d)).toString(QKeySequence::NativeText);
             return true;
@@ -207,13 +196,13 @@ static bool convert(const QVariant::Private *d, int t,
         break;
     }
     case QMetaType::QPixmap:
-        if (d->type == QMetaType::QImage) {
+        if (d->type().id() == QMetaType::QImage) {
             *static_cast<QPixmap *>(result) = QPixmap::fromImage(*v_cast<QImage>(d));
             return true;
-        } else if (d->type == QMetaType::QBitmap) {
+        } else if (d->type().id() == QMetaType::QBitmap) {
             *static_cast<QPixmap *>(result) = *v_cast<QBitmap>(d);
             return true;
-        } else if (d->type == QMetaType::QBrush) {
+        } else if (d->type().id() == QMetaType::QBrush) {
             if (v_cast<QBrush>(d)->style() == Qt::TexturePattern) {
                 *static_cast<QPixmap *>(result) = v_cast<QBrush>(d)->texture();
                 return true;
@@ -221,26 +210,26 @@ static bool convert(const QVariant::Private *d, int t,
         }
         break;
     case QMetaType::QImage:
-        if (d->type == QMetaType::QPixmap) {
+        if (d->type().id() == QMetaType::QPixmap) {
             *static_cast<QImage *>(result) = v_cast<QPixmap>(d)->toImage();
             return true;
-        } else if (d->type == QMetaType::QBitmap) {
+        } else if (d->type().id() == QMetaType::QBitmap) {
             *static_cast<QImage *>(result) = v_cast<QBitmap>(d)->toImage();
             return true;
         }
         break;
     case QMetaType::QBitmap:
-        if (d->type == QMetaType::QPixmap) {
+        if (d->type().id() == QMetaType::QPixmap) {
             *static_cast<QBitmap *>(result) = *v_cast<QPixmap>(d);
             return true;
-        } else if (d->type == QMetaType::QImage) {
+        } else if (d->type().id() == QMetaType::QImage) {
             *static_cast<QBitmap *>(result) = QBitmap::fromImage(*v_cast<QImage>(d));
             return true;
         }
         break;
-#ifndef QT_NO_SHORTCUT
+#if QT_CONFIG(shortcut)
     case QMetaType::Int:
-        if (d->type == QMetaType::QKeySequence) {
+        if (d->type().id() == QMetaType::QKeySequence) {
             const QKeySequence &seq = *v_cast<QKeySequence>(d);
             *static_cast<int *>(result) = seq.isEmpty() ? 0 : seq[0];
             return true;
@@ -248,20 +237,20 @@ static bool convert(const QVariant::Private *d, int t,
         break;
 #endif
     case QMetaType::QFont:
-        if (d->type == QMetaType::QString) {
+        if (d->type().id() == QMetaType::QString) {
             QFont *f = static_cast<QFont *>(result);
             f->fromString(*v_cast<QString>(d));
             return true;
         }
         break;
     case QMetaType::QColor:
-        if (d->type == QMetaType::QString) {
+        if (d->type().id() == QMetaType::QString) {
             static_cast<QColor *>(result)->setNamedColor(*v_cast<QString>(d));
             return static_cast<QColor *>(result)->isValid();
-        } else if (d->type == QMetaType::QByteArray) {
+        } else if (d->type().id() == QMetaType::QByteArray) {
             static_cast<QColor *>(result)->setNamedColor(QLatin1String(*v_cast<QByteArray>(d)));
             return true;
-        } else if (d->type == QMetaType::QBrush) {
+        } else if (d->type().id() == QMetaType::QBrush) {
             if (v_cast<QBrush>(d)->style() == Qt::SolidPattern) {
                 *static_cast<QColor *>(result) = v_cast<QBrush>(d)->color();
                 return true;
@@ -269,18 +258,18 @@ static bool convert(const QVariant::Private *d, int t,
         }
         break;
     case QMetaType::QBrush:
-        if (d->type == QMetaType::QColor) {
+        if (d->type().id() == QMetaType::QColor) {
             *static_cast<QBrush *>(result) = QBrush(*v_cast<QColor>(d));
             return true;
-        } else if (d->type == QMetaType::QPixmap) {
+        } else if (d->type().id() == QMetaType::QPixmap) {
             *static_cast<QBrush *>(result) = QBrush(*v_cast<QPixmap>(d));
             return true;
         }
         break;
-#ifndef QT_NO_SHORTCUT
+#if QT_CONFIG(shortcut)
     case QMetaType::QKeySequence: {
         QKeySequence *seq = static_cast<QKeySequence *>(result);
-        switch (d->type) {
+        switch (d->type().id()) {
         case QMetaType::QString:
             *seq = QKeySequence(*v_cast<QString>(d));
             return true;
@@ -311,13 +300,11 @@ static void streamDebug(QDebug dbg, const QVariant &v)
 {
     QVariant::Private *d = const_cast<QVariant::Private *>(&v.data_ptr());
     QVariantDebugStream<GuiTypesFilter> stream(dbg, d);
-    QMetaTypeSwitcher::switcher<void>(stream, d->type, nullptr);
+    QMetaTypeSwitcher::switcher<void>(stream, d->type().id(), nullptr);
 }
 #endif
 
 const QVariant::Handler qt_gui_variant_handler = {
-    construct,
-    clear,
     isNull,
 #ifndef QT_NO_DATASTREAM
     nullptr,
@@ -336,19 +323,41 @@ const QVariant::Handler qt_gui_variant_handler = {
 #define QT_IMPL_METATYPEINTERFACE_GUI_TYPES(MetaTypeName, MetaTypeId, RealName) \
     QT_METATYPE_INTERFACE_INIT(RealName),
 
-static const QMetaTypeInterface qVariantGuiHelper[] = {
-    QT_FOR_EACH_STATIC_GUI_CLASS(QT_IMPL_METATYPEINTERFACE_GUI_TYPES)
-};
+static const struct : QMetaTypeModuleHelper
+{
+    QtPrivate::QMetaTypeInterface *interfaceForType(int type) const override {
+        switch (type) {
+            QT_FOR_EACH_STATIC_GUI_CLASS(QT_METATYPE_CONVERT_ID_TO_TYPE)
+            default: return nullptr;
+        }
+    }
+#ifndef QT_NO_DATASTREAM
+    bool save(QDataStream &stream, int type, const void *data) const override {
+        switch (type) {
+            QT_FOR_EACH_STATIC_GUI_CLASS(QT_METATYPE_DATASTREAM_SAVE)
+            default: return false;
+        }
+    }
+    bool load(QDataStream &stream, int type, void *data) const override {
+        switch (type) {
+            QT_FOR_EACH_STATIC_GUI_CLASS(QT_METATYPE_DATASTREAM_LOAD)
+            default: return false;
+        }
+    }
+#endif
+
+} qVariantGuiHelper;
+
 
 #undef QT_IMPL_METATYPEINTERFACE_GUI_TYPES
 } // namespace used to hide QVariant handler
 
-extern Q_CORE_EXPORT const QMetaTypeInterface *qMetaTypeGuiHelper;
+extern Q_CORE_EXPORT const QMetaTypeModuleHelper *qMetaTypeGuiHelper;
 
 void qRegisterGuiVariant()
 {
     QVariantPrivate::registerHandler(QModulesPrivate::Gui, &qt_gui_variant_handler);
-    qMetaTypeGuiHelper = qVariantGuiHelper;
+    qMetaTypeGuiHelper = &qVariantGuiHelper;
 }
 Q_CONSTRUCTOR_FUNCTION(qRegisterGuiVariant)
 
diff --git a/src/gui/kernel/qkeymapper_p.h b/src/gui/kernel/qkeymapper_p.h
index 8364557020..fd53747fdd 100644
--- a/src/gui/kernel/qkeymapper_p.h
+++ b/src/gui/kernel/qkeymapper_p.h
@@ -53,7 +53,6 @@
 #include <QtGui/private/qtguiglobal_p.h>
 #include <qobject.h>
 #include <private/qobject_p.h>
-#include <qkeysequence.h>
 #include <qlist.h>
 #include <qlocale.h>
 #include <qevent.h>
diff --git a/src/gui/kernel/qkeysequence.cpp b/src/gui/kernel/qkeysequence.cpp
index 3a3dd42cae..57a89bb8c2 100644
--- a/src/gui/kernel/qkeysequence.cpp
+++ b/src/gui/kernel/qkeysequence.cpp
@@ -42,8 +42,6 @@
 #include <qpa/qplatformtheme.h>
 #include "private/qguiapplication_p.h"
 
-#if !defined(QT_NO_SHORTCUT) || defined(Q_CLANG_QDOC)
-
 #include "qdebug.h"
 #include <QtCore/qhashfunctions.h>
 #ifndef QT_NO_DATASTREAM
@@ -1679,9 +1677,6 @@ QDebug operator<<(QDebug dbg, const QKeySequence &p)
 }
 #endif
 
-#endif // QT_NO_SHORTCUT
-
-
 /*!
     \typedef QKeySequence::DataPtr
     \internal
diff --git a/src/gui/kernel/qkeysequence.h b/src/gui/kernel/qkeysequence.h
index 3dcbbe5941..68f256c37a 100644
--- a/src/gui/kernel/qkeysequence.h
+++ b/src/gui/kernel/qkeysequence.h
@@ -44,10 +44,9 @@
 #include <QtCore/qstring.h>
 #include <QtCore/qobjectdefs.h>
 
-QT_BEGIN_NAMESPACE
-
+QT_REQUIRE_CONFIG(shortcut);
 
-#if !defined(QT_NO_SHORTCUT) || defined(Q_CLANG_QDOC)
+QT_BEGIN_NAMESPACE
 
 class QKeySequence;
 
@@ -227,17 +226,6 @@ Q_DECLARE_SHARED(QKeySequence)
 Q_GUI_EXPORT QDebug operator<<(QDebug, const QKeySequence &);
 #endif
 
-#else
-
-class Q_GUI_EXPORT QKeySequence
-{
-public:
-    QKeySequence() {}
-    QKeySequence(int) {}
-};
-
-#endif // QT_NO_SHORTCUT
-
 QT_END_NAMESPACE
 
 #endif // QKEYSEQUENCE_H
diff --git a/src/gui/kernel/qkeysequence_p.h b/src/gui/kernel/qkeysequence_p.h
index fbcab5d34e..8c59505561 100644
--- a/src/gui/kernel/qkeysequence_p.h
+++ b/src/gui/kernel/qkeysequence_p.h
@@ -56,9 +56,10 @@
 
 #include <algorithm>
 
+QT_REQUIRE_CONFIG(shortcut);
+
 QT_BEGIN_NAMESPACE
 
-#ifndef QT_NO_SHORTCUT
 struct QKeyBinding
 {
     QKeySequence::StandardKey standardKey;
@@ -87,7 +88,6 @@ public:
     Q_GUI_EXPORT static QString keyName(int key, QKeySequence::SequenceFormat format);
     static int decodeString(QString accel, QKeySequence::SequenceFormat format);
 };
-#endif // QT_NO_SHORTCUT
 
 QT_END_NAMESPACE
 
diff --git a/src/gui/kernel/qopenglcontext.cpp b/src/gui/kernel/qopenglcontext.cpp
index ac5e279a79..b0474ceb3d 100644
--- a/src/gui/kernel/qopenglcontext.cpp
+++ b/src/gui/kernel/qopenglcontext.cpp
@@ -56,8 +56,6 @@
 #include <private/qopenglextensions_p.h>
 #include <private/qopenglversionfunctionsfactory_p.h>
 
-#include <private/qopengltexturehelper_p.h>
-
 #include <QDebug>
 
 #ifndef QT_OPENGL_ES_2
@@ -67,158 +65,6 @@
 
 QT_BEGIN_NAMESPACE
 
-class QOpenGLVersionProfilePrivate
-{
-public:
-    QOpenGLVersionProfilePrivate()
-        : majorVersion(0),
-          minorVersion(0),
-          profile(QSurfaceFormat::NoProfile)
-    {}
-
-    int majorVersion;
-    int minorVersion;
-    QSurfaceFormat::OpenGLContextProfile profile;
-};
-
-
-/*!
-    \class QOpenGLVersionProfile
-    \inmodule QtGui
-    \since 5.1
-    \brief The QOpenGLVersionProfile class represents the version and if applicable
-           the profile of an OpenGL context.
-
-    An object of this class can be passed to QOpenGLContext::versionFunctions() to
-    request a functions object for a specific version and profile of OpenGL.
-
-    It also contains some helper functions to check if a version supports profiles
-    or is a legacy version.
-*/
-
-/*!
-    Creates a default invalid QOpenGLVersionProfile object.
-*/
-QOpenGLVersionProfile::QOpenGLVersionProfile()
-    : d(new QOpenGLVersionProfilePrivate)
-{
-}
-
-/*!
-    Creates a QOpenGLVersionProfile object initialised with the version and profile
-    from \a format.
-*/
-QOpenGLVersionProfile::QOpenGLVersionProfile(const QSurfaceFormat &format)
-    : d(new QOpenGLVersionProfilePrivate)
-{
-    d->majorVersion = format.majorVersion();
-    d->minorVersion = format.minorVersion();
-    d->profile = format.profile();
-}
-
-/*!
-    Constructs a copy of \a other.
-*/
-QOpenGLVersionProfile::QOpenGLVersionProfile(const QOpenGLVersionProfile &other)
-    : d(new QOpenGLVersionProfilePrivate)
-{
-    *d = *(other.d);
-}
-
-/*!
-    Destroys the QOpenGLVersionProfile object.
-*/
-QOpenGLVersionProfile::~QOpenGLVersionProfile()
-{
-    delete d;
-}
-
-/*!
-    Assigns the version and profile of \a rhs to this QOpenGLVersionProfile object.
-*/
-QOpenGLVersionProfile &QOpenGLVersionProfile::operator=(const QOpenGLVersionProfile &rhs)
-{
-    if (this == &rhs)
-        return *this;
-    *d = *(rhs.d);
-    return *this;
-}
-
-/*!
-    Returns a QPair<int,int> where the components represent the major and minor OpenGL
-    version numbers respectively.
-
-    \sa setVersion()
-*/
-QPair<int, int> QOpenGLVersionProfile::version() const
-{
-    return qMakePair( d->majorVersion, d->minorVersion);
-}
-
-/*!
-    Sets the major and minor version numbers to \a majorVersion and \a minorVersion respectively.
-
-    \sa version()
-*/
-void QOpenGLVersionProfile::setVersion(int majorVersion, int minorVersion)
-{
-    d->majorVersion = majorVersion;
-    d->minorVersion = minorVersion;
-}
-
-/*!
-    Returns the OpenGL profile. Only makes sense if profiles are supported by this version.
-
-    \sa setProfile()
-*/
-QSurfaceFormat::OpenGLContextProfile QOpenGLVersionProfile::profile() const
-{
-    return d->profile;
-}
-
-/*!
-    Sets the OpenGL profile \a profile. Only makes sense if profiles are supported by
-    this version.
-
-    \sa profile()
-*/
-void QOpenGLVersionProfile::setProfile(QSurfaceFormat::OpenGLContextProfile profile)
-{
-    d->profile = profile;
-}
-
-/*!
-    Returns \c true if profiles are supported by the OpenGL version returned by version(). Only
-    OpenGL versions >= 3.2 support profiles.
-
-    \sa profile(), version()
-*/
-bool QOpenGLVersionProfile::hasProfiles() const
-{
-    return ( d->majorVersion > 3
-             || (d->majorVersion == 3 && d->minorVersion > 1));
-}
-
-/*!
-    Returns \c true is the OpenGL version returned by version() contains deprecated functions
-    and does not support profiles i.e. if the OpenGL version is <= 3.1.
-*/
-bool QOpenGLVersionProfile::isLegacyVersion() const
-{
-    return (d->majorVersion < 3 || (d->majorVersion == 3 && d->minorVersion == 0));
-}
-
-/*!
-    Returns \c true if the version number is valid. Note that for a default constructed
-    QOpenGLVersionProfile object this function will return \c false.
-
-    \sa setVersion(), version()
-*/
-bool QOpenGLVersionProfile::isValid() const
-{
-    return d->majorVersion > 0 && d->minorVersion >= 0;
-}
-
 class QGuiGLThreadContext
 {
 public:
@@ -374,20 +220,8 @@ int QOpenGLContextPrivate::maxTextureSize()
         GLint next = 64;
         funcs->glTexImage2D(proxy, 0, GL_RGBA, next, next, 0, GL_RGBA, GL_UNSIGNED_BYTE, nullptr);
 
-        QOpenGLFunctions_1_0 *gl1funcs = nullptr;
-        QOpenGLFunctions_3_2_Core *gl3funcs = nullptr;
-
-        if (q->format().profile() == QSurfaceFormat::CoreProfile)
-            gl3funcs = q->versionFunctions<QOpenGLFunctions_3_2_Core>();
-        else
-            gl1funcs = q->versionFunctions<QOpenGLFunctions_1_0>();
-
-        Q_ASSERT(gl1funcs || gl3funcs);
-
-        if (gl1funcs)
-            gl1funcs->glGetTexLevelParameteriv(proxy, 0, GL_TEXTURE_WIDTH, &size);
-        else
-            gl3funcs->glGetTexLevelParameteriv(proxy, 0, GL_TEXTURE_WIDTH, &size);
+        QOpenGLExtraFunctions *extraFuncs = q->extraFunctions();
+        extraFuncs->glGetTexLevelParameteriv(proxy, 0, GL_TEXTURE_WIDTH, &size);
 
         if (size == 0) {
             return max_texture_size;
@@ -399,11 +233,7 @@ int QOpenGLContextPrivate::maxTextureSize()
             if (next > max_texture_size)
                 break;
             funcs->glTexImage2D(proxy, 0, GL_RGBA, next, next, 0, GL_RGBA, GL_UNSIGNED_BYTE, nullptr);
-            if (gl1funcs)
-                gl1funcs->glGetTexLevelParameteriv(proxy, 0, GL_TEXTURE_WIDTH, &next);
-            else
-                gl3funcs->glGetTexLevelParameteriv(proxy, 0, GL_TEXTURE_WIDTH, &next);
-
+            extraFuncs->glGetTexLevelParameteriv(proxy, 0, GL_TEXTURE_WIDTH, &next);
         } while (next > size);
 
         max_texture_size = size;
@@ -641,7 +471,6 @@ bool QOpenGLContext::create()
 */
 void QOpenGLContext::destroy()
 {
-    deleteQGLContext();
     Q_D(QOpenGLContext);
     if (d->platformGLContext)
         emit aboutToBeDestroyed();
@@ -664,7 +493,10 @@ void QOpenGLContext::destroy()
     qDeleteAll(d->versionFunctions);
     d->versionFunctions.clear();
 
-    delete d->textureFunctions;
+    if (d->textureFunctionsDestroyCallback) {
+        d->textureFunctionsDestroyCallback();
+        d->textureFunctionsDestroyCallback = nullptr;
+    }
     d->textureFunctions = nullptr;
 
     d->nativeHandle = QVariant();
@@ -1192,44 +1024,6 @@ QScreen *QOpenGLContext::screen() const
 }
 
 /*!
-    internal: Needs to have a pointer to qGLContext. But since this is in Qt GUI we can't
-    have any type information.
-
-    \internal
-*/
-void *QOpenGLContext::qGLContextHandle() const
-{
-    Q_D(const QOpenGLContext);
-    return d->qGLContextHandle;
-}
-
-/*!
-    internal: If the delete function is specified QOpenGLContext "owns"
-    the passed context handle and will use the delete function to destroy it.
-
-    \internal
-*/
-void QOpenGLContext::setQGLContextHandle(void *handle,void (*qGLContextDeleteFunction)(void *))
-{
-    Q_D(QOpenGLContext);
-    d->qGLContextHandle = handle;
-    d->qGLContextDeleteFunction = qGLContextDeleteFunction;
-}
-
-/*!
-    \internal
-*/
-void QOpenGLContext::deleteQGLContext()
-{
-    Q_D(QOpenGLContext);
-    if (d->qGLContextDeleteFunction && d->qGLContextHandle) {
-        d->qGLContextDeleteFunction(d->qGLContextHandle);
-        d->qGLContextDeleteFunction = nullptr;
-        d->qGLContextHandle = nullptr;
-    }
-}
-
-/*!
   Returns the platform-specific handle for the OpenGL implementation that
   is currently in use. (for example, a HMODULE on Windows)
 
@@ -1388,10 +1182,11 @@ QOpenGLTextureHelper* QOpenGLContext::textureFunctions() const
 /*!
     \internal
 */
-void QOpenGLContext::setTextureFunctions(QOpenGLTextureHelper* textureFuncs)
+void QOpenGLContext::setTextureFunctions(QOpenGLTextureHelper* textureFuncs, std::function<void()> destroyCallback)
 {
     Q_D(QOpenGLContext);
     d->textureFunctions = textureFuncs;
+    d->textureFunctionsDestroyCallback = destroyCallback;
 }
 
 /*!
@@ -1682,21 +1477,6 @@ void QOpenGLMultiGroupSharedResource::cleanup(QOpenGLContextGroup *group, QOpenG
 }
 
 #ifndef QT_NO_DEBUG_STREAM
-QDebug operator<<(QDebug debug, const QOpenGLVersionProfile &vp)
-{
-    QDebugStateSaver saver(debug);
-    debug.nospace();
-    debug << "QOpenGLVersionProfile(";
-    if (vp.isValid()) {
-        debug << vp.version().first << '.' << vp.version().second
-            << ", profile=" << vp.profile();
-    } else {
-        debug << "invalid";
-    }
-    debug << ')';
-    return debug;
-}
-
 QDebug operator<<(QDebug debug, const QOpenGLContext *ctx)
 {
     QDebugStateSaver saver(debug);
diff --git a/src/gui/kernel/qopenglcontext.h b/src/gui/kernel/qopenglcontext.h
index 9cfaa52f17..b26a3e2ede 100644
--- a/src/gui/kernel/qopenglcontext.h
+++ b/src/gui/kernel/qopenglcontext.h
@@ -59,12 +59,9 @@
 
 #include <QtGui/qopengl.h>
 #include <QtGui/qopenglversionfunctions.h>
+// TODO: ideally get rid of this include
+#include <QtGui/qopenglversionprofile.h>
 
-#if QT_DEPRECATED_SINCE(5, 6)
-#include <QtCore/qhash.h>
-#endif
-#include <QtCore/qhashfunctions.h>
-#include <QtCore/qpair.h>
 #include <QtCore/qvariant.h>
 
 QT_BEGIN_NAMESPACE
@@ -79,50 +76,6 @@ class QPlatformOpenGLContext;
 class QScreen;
 class QSurface;
 
-class QOpenGLVersionProfilePrivate;
-
-class Q_GUI_EXPORT QOpenGLVersionProfile
-{
-public:
-    QOpenGLVersionProfile();
-    explicit QOpenGLVersionProfile(const QSurfaceFormat &format);
-    QOpenGLVersionProfile(const QOpenGLVersionProfile &other);
-    ~QOpenGLVersionProfile();
-
-    QOpenGLVersionProfile &operator=(const QOpenGLVersionProfile &rhs);
-
-    QPair<int, int> version() const;
-    void setVersion(int majorVersion, int minorVersion);
-
-    QSurfaceFormat::OpenGLContextProfile profile() const;
-    void setProfile(QSurfaceFormat::OpenGLContextProfile profile);
-
-    bool hasProfiles() const;
-    bool isLegacyVersion() const;
-    bool isValid() const;
-
-private:
-    QOpenGLVersionProfilePrivate* d;
-};
-
-inline uint qHash(const QOpenGLVersionProfile &v, uint seed = 0)
-{
-    return qHash(static_cast<int>(v.profile() * 1000)
-               + v.version().first * 100 + v.version().second * 10, seed);
-}
-
-inline bool operator==(const QOpenGLVersionProfile &lhs, const QOpenGLVersionProfile &rhs)
-{
-    if (lhs.profile() != rhs.profile())
-        return false;
-    return lhs.version() == rhs.version();
-}
-
-inline bool operator!=(const QOpenGLVersionProfile &lhs, const QOpenGLVersionProfile &rhs)
-{
-    return !operator==(lhs, rhs);
-}
-
 class Q_GUI_EXPORT QOpenGLContextGroup : public QObject
 {
     Q_OBJECT
@@ -218,8 +171,6 @@ Q_SIGNALS:
     void aboutToBeDestroyed();
 
 private:
-    friend class QGLContext;
-    friend class QGLPixelBuffer;
     friend class QOpenGLContextResourceBase;
     friend class QOpenGLPaintDevice;
     friend class QOpenGLGlyphTexture;
@@ -234,16 +185,12 @@ private:
     friend class QAbstractOpenGLFunctionsPrivate;
     friend class QOpenGLTexturePrivate;
 
-    void *qGLContextHandle() const;
-    void setQGLContextHandle(void *handle,void (*qGLContextDeleteFunction)(void *));
-    void deleteQGLContext();
-
     QOpenGLVersionFunctionsStorage* functionsBackendStorage() const;
     void insertExternalFunctions(QAbstractOpenGLFunctions *f);
     void removeExternalFunctions(QAbstractOpenGLFunctions *f);
 
     QOpenGLTextureHelper* textureFunctions() const;
-    void setTextureFunctions(QOpenGLTextureHelper* textureFuncs);
+    void setTextureFunctions(QOpenGLTextureHelper* textureFuncs, std::function<void()> destroyCallback);
 
     void destroy();
 
@@ -251,7 +198,6 @@ private:
 };
 
 #ifndef QT_NO_DEBUG_STREAM
-Q_GUI_EXPORT QDebug operator<<(QDebug debug, const QOpenGLVersionProfile &vp);
 Q_GUI_EXPORT QDebug operator<<(QDebug debug, const QOpenGLContext *ctx);
 Q_GUI_EXPORT QDebug operator<<(QDebug debug, const QOpenGLContextGroup *cg);
 #endif // !QT_NO_DEBUG_STREAM
diff --git a/src/gui/kernel/qopenglcontext_p.h b/src/gui/kernel/qopenglcontext_p.h
index 833cfb20c3..d769f03fd3 100644
--- a/src/gui/kernel/qopenglcontext_p.h
+++ b/src/gui/kernel/qopenglcontext_p.h
@@ -197,9 +197,7 @@ class Q_GUI_EXPORT QOpenGLContextPrivate : public QObjectPrivate
     Q_DECLARE_PUBLIC(QOpenGLContext)
 public:
     QOpenGLContextPrivate()
-        : qGLContextHandle(nullptr)
-        , qGLContextDeleteFunction(nullptr)
-        , platformGLContext(nullptr)
+        : platformGLContext(nullptr)
         , shareContext(nullptr)
         , shareGroup(nullptr)
         , screen(nullptr)
@@ -228,9 +226,6 @@ public:
     mutable QOpenGLVersionFunctionsStorage versionFunctionsStorage;
     mutable QSet<QAbstractOpenGLFunctions *> externalVersionFunctions;
 
-    void *qGLContextHandle;
-    void (*qGLContextDeleteFunction)(void *handle);
-
     QSurfaceFormat requestedFormat;
     QPlatformOpenGLContext *platformGLContext;
     QOpenGLContext *shareContext;
@@ -240,6 +235,7 @@ public:
     QOpenGLFunctions *functions;
     mutable QSet<QByteArray> extensionNames;
     QOpenGLTextureHelper* textureFunctions;
+    std::function<void()> textureFunctionsDestroyCallback;
 
     GLint max_texture_size;
 
diff --git a/src/gui/kernel/qopenglwindow.cpp b/src/gui/kernel/qopenglwindow.cpp
deleted file mode 100644
index 2ea8f43711..0000000000
--- a/src/gui/kernel/qopenglwindow.cpp
+++ /dev/null
@@ -1,698 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtGui module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qopenglwindow.h"
-#include "qpaintdevicewindow_p.h"
-#include <QtGui/QOpenGLFramebufferObject>
-#include <QtGui/QOpenGLPaintDevice>
-#include <QtGui/QOpenGLFunctions>
-#include <QtGui/QOpenGLTextureBlitter>
-#include <QtGui/private/qopenglextensions_p.h>
-#include <QtGui/private/qopenglcontext_p.h>
-#include <QtGui/QMatrix4x4>
-#include <QtGui/QOffscreenSurface>
-
-QT_BEGIN_NAMESPACE
-
-/*!
-  \class QOpenGLWindow
-  \inmodule QtGui
-  \since 5.4
-  \brief The QOpenGLWindow class is a convenience subclass of QWindow to perform OpenGL painting.
-
-  QOpenGLWindow is an enhanced QWindow that allows easily creating windows that
-  perform OpenGL rendering using an API that is compatible with QOpenGLWidget
-  and is similar to the legacy QGLWidget. Unlike QOpenGLWidget, QOpenGLWindow
-  has no dependency on the widgets module and offers better performance.
-
-  A typical application will subclass QOpenGLWindow and reimplement the following
-  virtual functions:
-
-  \list
-
-  \li initializeGL() to perform OpenGL resource initialization
-
-  \li resizeGL() to set up the transformation matrices and other window size dependent resources
-
-  \li paintGL() to issue OpenGL commands or draw using QPainter
-
-  \endlist
-
-  To schedule a repaint, call the update() function. Note that this will not
-  immediately result in a call to paintGL(). Calling update() multiple times in
-  a row will not change the behavior in any way.
-
-  This is a slot so it can be connected to a \l QTimer::timeout() signal to
-  perform animation. Note however that in the modern OpenGL world it is a much
-  better choice to rely on synchronization to the vertical refresh rate of the
-  display. See \l{QSurfaceFormat::setSwapInterval()}{setSwapInterval()} on a
-  description of the swap interval. With a swap interval of \c 1, which is the
-  case on most systems by default, the
-  \l{QOpenGLContext::swapBuffers()}{swapBuffers()} call, that is executed
-  internally by QOpenGLWindow after each repaint, will block and wait for
-  vsync. This means that whenever the swap is done, an update can be scheduled
-  again by calling update(), without relying on timers.
-
-  To request a specific configuration for the context, use setFormat()
-  like for any other QWindow. This allows, among others, requesting a
-  given OpenGL version and profile, or enabling depth and stencil
-  buffers.
-
-  Unlike QWindow, QOpenGLWindow allows opening a painter on itself and perform
-  QPainter-based drawing.
-
-  QOpenGLWindow supports multiple update behaviors. The default,
-  \c NoPartialUpdate is equivalent to a regular, OpenGL-based QWindow or the
-  legacy QGLWidget. In contrast, \c PartialUpdateBlit and \c PartialUpdateBlend are
-  more in line with QOpenGLWidget's way of working, where there is always an
-  extra, dedicated framebuffer object present. These modes allow, by
-  sacrificing some performance, redrawing only a smaller area on each paint and
-  having the rest of the content preserved from of the previous frame. This is
-  useful for applications than render incrementally using QPainter, because
-  this way they do not have to redraw the entire window content on each
-  paintGL() call.
-
-  Similarly to QOpenGLWidget, QOpenGLWindow supports the Qt::AA_ShareOpenGLContexts
-  attribute. When enabled, the OpenGL contexts of all QOpenGLWindow instances will share
-  with each other. This allows accessing each other's shareable OpenGL resources.
-
-  For more information on graphics in Qt, see \l {Graphics}.
- */
-
-/*!
-  \enum QOpenGLWindow::UpdateBehavior
-
-  This enum describes the update strategy of the QOpenGLWindow.
-
-  \value NoPartialUpdate Indicates that the entire window surface will
-  redrawn on each update and so no additional framebuffers are needed.
-  This is the setting used in most cases and is equivalent to how drawing
-  directly via QWindow would function.
-
-  \value PartialUpdateBlit Indicates that the drawing performed in paintGL()
-  does not cover the entire window. In this case an extra framebuffer object
-  is created under the hood, and rendering performed in paintGL() will target
-  this framebuffer. This framebuffer is then blitted onto the window surface's
-  default framebuffer after each paint. This allows having QPainter-based drawing
-  code in paintGL() which only repaints a smaller area at a time, because, unlike
-  NoPartialUpdate, the previous content is preserved.
-
-  \value PartialUpdateBlend Similar to PartialUpdateBlit, but instead of using
-  framebuffer blits, the contents of the extra framebuffer is rendered by
-  drawing a textured quad with blending enabled. This, unlike PartialUpdateBlit,
-  allows alpha blended content and works even when the glBlitFramebuffer is
-  not available. Performance-wise this setting is likely to be somewhat slower
-  than PartialUpdateBlit.
- */
-
-/*!
-    \fn void QOpenGLWindow::frameSwapped()
-
-    This signal is emitted after the potentially blocking
-    \l{QOpenGLContext::swapBuffers()}{buffer swap} has been done. Applications
-    that wish to continuously repaint synchronized to the vertical refresh,
-    should issue an update() upon this signal. This allows for a much smoother
-    experience compared to the traditional usage of timers.
-*/
-
-// GLES2 builds won't have these constants with the suffixless names
-#ifndef GL_READ_FRAMEBUFFER
-#define GL_READ_FRAMEBUFFER 0x8CA8
-#endif
-#ifndef GL_DRAW_FRAMEBUFFER
-#define GL_DRAW_FRAMEBUFFER 0x8CA9
-#endif
-
-class QOpenGLWindowPaintDevice : public QOpenGLPaintDevice
-{
-public:
-    QOpenGLWindowPaintDevice(QOpenGLWindow *window) : m_window(window) { }
-    void ensureActiveTarget() override;
-
-    QOpenGLWindow *m_window;
-};
-
-class QOpenGLWindowPrivate : public QPaintDeviceWindowPrivate
-{
-    Q_DECLARE_PUBLIC(QOpenGLWindow)
-public:
-    QOpenGLWindowPrivate(QOpenGLContext *shareContext, QOpenGLWindow::UpdateBehavior updateBehavior)
-        : updateBehavior(updateBehavior)
-        , hasFboBlit(false)
-        , shareContext(shareContext)
-    {
-        if (!shareContext)
-            this->shareContext = qt_gl_global_share_context();
-    }
-
-    ~QOpenGLWindowPrivate();
-
-    static QOpenGLWindowPrivate *get(QOpenGLWindow *w) { return w->d_func(); }
-
-    void bindFBO();
-    void initialize();
-
-    void beginPaint(const QRegion &region) override;
-    void endPaint() override;
-    void flush(const QRegion &region) override;
-
-    QOpenGLWindow::UpdateBehavior updateBehavior;
-    bool hasFboBlit;
-    QScopedPointer<QOpenGLContext> context;
-    QOpenGLContext *shareContext;
-    QScopedPointer<QOpenGLFramebufferObject> fbo;
-    QScopedPointer<QOpenGLWindowPaintDevice> paintDevice;
-    QOpenGLTextureBlitter blitter;
-    QColor backgroundColor;
-    QScopedPointer<QOffscreenSurface> offscreenSurface;
-};
-
-QOpenGLWindowPrivate::~QOpenGLWindowPrivate()
-{
-    Q_Q(QOpenGLWindow);
-    if (q->isValid()) {
-        q->makeCurrent(); // this works even when the platformwindow is destroyed
-        paintDevice.reset(nullptr);
-        fbo.reset(nullptr);
-        blitter.destroy();
-        q->doneCurrent();
-    }
-}
-
-void QOpenGLWindowPrivate::initialize()
-{
-    Q_Q(QOpenGLWindow);
-
-    if (context)
-        return;
-
-    if (!q->handle())
-        qWarning("Attempted to initialize QOpenGLWindow without a platform window");
-
-    context.reset(new QOpenGLContext);
-    context->setShareContext(shareContext);
-    context->setFormat(q->requestedFormat());
-    if (!context->create())
-        qWarning("QOpenGLWindow::beginPaint: Failed to create context");
-    if (!context->makeCurrent(q))
-        qWarning("QOpenGLWindow::beginPaint: Failed to make context current");
-
-    paintDevice.reset(new QOpenGLWindowPaintDevice(q));
-    if (updateBehavior == QOpenGLWindow::PartialUpdateBlit)
-        hasFboBlit = QOpenGLFramebufferObject::hasOpenGLFramebufferBlit();
-
-    q->initializeGL();
-}
-
-void QOpenGLWindowPrivate::beginPaint(const QRegion &region)
-{
-    Q_UNUSED(region);
-    Q_Q(QOpenGLWindow);
-
-    initialize();
-    context->makeCurrent(q);
-
-    const int deviceWidth = q->width() * q->devicePixelRatio();
-    const int deviceHeight = q->height() * q->devicePixelRatio();
-    const QSize deviceSize(deviceWidth, deviceHeight);
-    if (updateBehavior > QOpenGLWindow::NoPartialUpdate) {
-        if (!fbo || fbo->size() != deviceSize) {
-            QOpenGLFramebufferObjectFormat fboFormat;
-            fboFormat.setAttachment(QOpenGLFramebufferObject::CombinedDepthStencil);
-            const int samples = q->requestedFormat().samples();
-            if (samples > 0) {
-                if (updateBehavior != QOpenGLWindow::PartialUpdateBlend)
-                    fboFormat.setSamples(samples);
-                else
-                    qWarning("QOpenGLWindow: PartialUpdateBlend does not support multisampling");
-            }
-            fbo.reset(new QOpenGLFramebufferObject(deviceSize, fboFormat));
-            markWindowAsDirty();
-        }
-    } else {
-        markWindowAsDirty();
-    }
-
-    paintDevice->setSize(QSize(deviceWidth, deviceHeight));
-    paintDevice->setDevicePixelRatio(q->devicePixelRatio());
-    context->functions()->glViewport(0, 0, deviceWidth, deviceHeight);
-
-    context->functions()->glBindFramebuffer(GL_FRAMEBUFFER, context->defaultFramebufferObject());
-
-    q->paintUnderGL();
-
-    if (updateBehavior > QOpenGLWindow::NoPartialUpdate)
-        fbo->bind();
-}
-
-void QOpenGLWindowPrivate::endPaint()
-{
-    Q_Q(QOpenGLWindow);
-
-    if (updateBehavior > QOpenGLWindow::NoPartialUpdate)
-        fbo->release();
-
-    context->functions()->glBindFramebuffer(GL_FRAMEBUFFER, context->defaultFramebufferObject());
-
-    if (updateBehavior == QOpenGLWindow::PartialUpdateBlit && hasFboBlit) {
-        const int deviceWidth = q->width() * q->devicePixelRatio();
-        const int deviceHeight = q->height() * q->devicePixelRatio();
-        QOpenGLExtensions extensions(context.data());
-        extensions.glBindFramebuffer(GL_READ_FRAMEBUFFER, fbo->handle());
-        extensions.glBindFramebuffer(GL_DRAW_FRAMEBUFFER, context->defaultFramebufferObject());
-        extensions.glBlitFramebuffer(0, 0, deviceWidth, deviceHeight,
-                                     0, 0, deviceWidth, deviceHeight,
-                                     GL_COLOR_BUFFER_BIT, GL_NEAREST);
-    } else if (updateBehavior > QOpenGLWindow::NoPartialUpdate) {
-        if (updateBehavior == QOpenGLWindow::PartialUpdateBlend) {
-            context->functions()->glEnable(GL_BLEND);
-            context->functions()->glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-        }
-        if (!blitter.isCreated())
-            blitter.create();
-
-        QRect windowRect(QPoint(0, 0), fbo->size());
-        QMatrix4x4 target = QOpenGLTextureBlitter::targetTransform(windowRect, windowRect);
-        blitter.bind();
-        blitter.blit(fbo->texture(), target, QOpenGLTextureBlitter::OriginBottomLeft);
-        blitter.release();
-
-        if (updateBehavior == QOpenGLWindow::PartialUpdateBlend)
-            context->functions()->glDisable(GL_BLEND);
-    }
-
-    q->paintOverGL();
-}
-
-void QOpenGLWindowPrivate::bindFBO()
-{
-    if (updateBehavior > QOpenGLWindow::NoPartialUpdate)
-        fbo->bind();
-    else
-        QOpenGLFramebufferObject::bindDefault();
-}
-
-void QOpenGLWindowPrivate::flush(const QRegion &region)
-{
-    Q_UNUSED(region);
-    Q_Q(QOpenGLWindow);
-    context->swapBuffers(q);
-    emit q->frameSwapped();
-}
-
-void QOpenGLWindowPaintDevice::ensureActiveTarget()
-{
-    QOpenGLWindowPrivate::get(m_window)->bindFBO();
-}
-
-/*!
-  Constructs a new QOpenGLWindow with the given \a parent and \a updateBehavior.
-
-  \sa QOpenGLWindow::UpdateBehavior
- */
-QOpenGLWindow::QOpenGLWindow(QOpenGLWindow::UpdateBehavior updateBehavior, QWindow *parent)
-    : QPaintDeviceWindow(*(new QOpenGLWindowPrivate(nullptr, updateBehavior)), parent)
-{
-    setSurfaceType(QSurface::OpenGLSurface);
-}
-
-/*!
-  Constructs a new QOpenGLWindow with the given \a parent and \a updateBehavior. The QOpenGLWindow's context will share with \a shareContext.
-
-  \sa QOpenGLWindow::UpdateBehavior shareContext
-*/
-QOpenGLWindow::QOpenGLWindow(QOpenGLContext *shareContext, UpdateBehavior updateBehavior, QWindow *parent)
-    : QPaintDeviceWindow(*(new QOpenGLWindowPrivate(shareContext, updateBehavior)), parent)
-{
-    setSurfaceType(QSurface::OpenGLSurface);
-}
-
-/*!
-  Destroys the QOpenGLWindow instance, freeing its resources.
-
-  The OpenGLWindow's context is made current in the destructor, allowing for
-  safe destruction of any child object that may need to release OpenGL
-  resources belonging to the context provided by this window.
-
-  \warning if you have objects wrapping OpenGL resources (such as
-  QOpenGLBuffer, QOpenGLShaderProgram, etc.) as members of a QOpenGLWindow
-  subclass, you may need to add a call to makeCurrent() in that subclass'
-  destructor as well. Due to the rules of C++ object destruction, those objects
-  will be destroyed \e{before} calling this function (but after that the
-  destructor of the subclass has run), therefore making the OpenGL context
-  current in this function happens too late for their safe disposal.
-
-  \sa makeCurrent
-
-  \since 5.5
-*/
-QOpenGLWindow::~QOpenGLWindow()
-{
-    makeCurrent();
-}
-
-/*!
-  \return the update behavior for this QOpenGLWindow.
-*/
-QOpenGLWindow::UpdateBehavior QOpenGLWindow::updateBehavior() const
-{
-    Q_D(const QOpenGLWindow);
-    return d->updateBehavior;
-}
-
-/*!
-  \return \c true if the window's OpenGL resources, like the context, have
-  been successfully initialized. Note that the return value is always \c false
-  until the window becomes exposed (shown).
-*/
-bool QOpenGLWindow::isValid() const
-{
-    Q_D(const QOpenGLWindow);
-    return d->context && d->context->isValid();
-}
-
-/*!
-  Prepares for rendering OpenGL content for this window by making the
-  corresponding context current and binding the framebuffer object, if there is
-  one, in that context context.
-
-  It is not necessary to call this function in most cases, because it is called
-  automatically before invoking paintGL(). It is provided nonetheless to support
-  advanced, multi-threaded scenarios where a thread different than the GUI or main
-  thread may want to update the surface or framebuffer contents. See QOpenGLContext
-  for more information on threading related issues.
-
-  This function is suitable for calling also when the underlying platform window
-  is already destroyed. This means that it is safe to call this function from
-  a QOpenGLWindow subclass' destructor. If there is no native window anymore,
-  an offscreen surface is used instead. This ensures that OpenGL resource
-  cleanup operations in the destructor will always work, as long as
-  this function is called first.
-
-  \sa QOpenGLContext, context(), paintGL(), doneCurrent()
- */
-void QOpenGLWindow::makeCurrent()
-{
-    Q_D(QOpenGLWindow);
-
-    if (!isValid())
-        return;
-
-    // The platform window may be destroyed at this stage and therefore
-    // makeCurrent() may not safely be called with 'this'.
-    if (handle()) {
-        d->context->makeCurrent(this);
-    } else {
-        if (!d->offscreenSurface) {
-            d->offscreenSurface.reset(new QOffscreenSurface(screen()));
-            d->offscreenSurface->setFormat(d->context->format());
-            d->offscreenSurface->create();
-        }
-        d->context->makeCurrent(d->offscreenSurface.data());
-    }
-
-    d->bindFBO();
-}
-
-/*!
-  Releases the context.
-
-  It is not necessary to call this function in most cases, since the widget
-  will make sure the context is bound and released properly when invoking
-  paintGL().
-
-  \sa makeCurrent()
- */
-void QOpenGLWindow::doneCurrent()
-{
-    Q_D(QOpenGLWindow);
-
-    if (!isValid())
-        return;
-
-    d->context->doneCurrent();
-}
-
-/*!
-  \return The QOpenGLContext used by this window or \c 0 if not yet initialized.
- */
-QOpenGLContext *QOpenGLWindow::context() const
-{
-    Q_D(const QOpenGLWindow);
-    return d->context.data();
-}
-
-/*!
-  \return The QOpenGLContext requested to be shared with this window's QOpenGLContext.
-*/
-QOpenGLContext *QOpenGLWindow::shareContext() const
-{
-    Q_D(const QOpenGLWindow);
-    return d->shareContext;
-}
-
-/*!
-  The framebuffer object handle used by this window.
-
-  When the update behavior is set to \c NoPartialUpdate, there is no separate
-  framebuffer object. In this case the returned value is the ID of the
-  default framebuffer.
-
-  Otherwise the value of the ID of the framebuffer object or \c 0 if not
-  yet initialized.
- */
-GLuint QOpenGLWindow::defaultFramebufferObject() const
-{
-    Q_D(const QOpenGLWindow);
-    if (d->updateBehavior > NoPartialUpdate && d->fbo)
-        return d->fbo->handle();
-    else if (QOpenGLContext *ctx = QOpenGLContext::currentContext())
-        return ctx->defaultFramebufferObject();
-    else
-        return 0;
-}
-
-extern Q_GUI_EXPORT QImage qt_gl_read_framebuffer(const QSize &size, bool alpha_format, bool include_alpha);
-
-/*!
-  Returns a copy of the framebuffer.
-
-  \note This is a potentially expensive operation because it relies on
-  glReadPixels() to read back the pixels. This may be slow and can stall the
-  GPU pipeline.
-
-  \note When used together with update behavior \c NoPartialUpdate, the returned
-  image may not contain the desired content when called after the front and back
-  buffers have been swapped (unless preserved swap is enabled in the underlying
-  windowing system interface). In this mode the function reads from the back
-  buffer and the contents of that may not match the content on the screen (the
-  front buffer). In this case the only place where this function can safely be
-  used is paintGL() or paintOverGL().
- */
-QImage QOpenGLWindow::grabFramebuffer()
-{
-    if (!isValid())
-        return QImage();
-
-    makeCurrent();
-
-    const bool hasAlpha = format().hasAlpha();
-    QImage img = qt_gl_read_framebuffer(size() * devicePixelRatio(), hasAlpha, hasAlpha);
-    img.setDevicePixelRatio(devicePixelRatio());
-    return img;
-}
-
-/*!
-  This virtual function is called once before the first call to paintGL() or
-  resizeGL(). Reimplement it in a subclass.
-
-  This function should set up any required OpenGL resources and state.
-
-  There is no need to call makeCurrent() because this has already been done
-  when this function is called. Note however that the framebuffer, in case
-  partial update mode is used, is not yet available at this stage, so avoid
-  issuing draw calls from here. Defer such calls to paintGL() instead.
-
-  \sa paintGL(), resizeGL()
- */
-void QOpenGLWindow::initializeGL()
-{
-}
-
-/*!
-  This virtual function is called whenever the widget has been resized.
-  Reimplement it in a subclass. The new size is passed in \a w and \a h.
-
-  \note This is merely a convenience function in order to provide an API that is
-  compatible with QOpenGLWidget. Unlike with QOpenGLWidget, derived classes are
-  free to choose to override resizeEvent() instead of this function.
-
-  \note Avoid issuing OpenGL commands from this function as there may not be a
-  context current when it is invoked. If it cannot be avoided, call makeCurrent().
-
-  \note Scheduling updates from here is not necessary. The windowing systems
-  will send expose events that trigger an update automatically.
-
-  \sa initializeGL(), paintGL()
- */
-void QOpenGLWindow::resizeGL(int w, int h)
-{
-    Q_UNUSED(w);
-    Q_UNUSED(h);
-}
-
-/*!
-  This virtual function is called whenever the window contents needs to be
-  painted. Reimplement it in a subclass.
-
-  There is no need to call makeCurrent() because this has already
-  been done when this function is called.
-
-  Before invoking this function, the context and the framebuffer, if there is
-  one, are bound, and the viewport is set up by a call to glViewport(). No
-  other state is set and no clearing or drawing is performed by the framework.
-
-  \note When using a partial update behavior, like \c PartialUpdateBlend, the
-  output of the previous paintGL() call is preserved and, after the additional
-  drawing perfomed in the current invocation of the function, the content is
-  blitted or blended over the content drawn directly to the window in
-  paintUnderGL().
-
-  \sa initializeGL(), resizeGL(), paintUnderGL(), paintOverGL(), UpdateBehavior
- */
-void QOpenGLWindow::paintGL()
-{
-}
-
-/*!
-  The virtual function is called before each invocation of paintGL().
-
-  When the update mode is set to \c NoPartialUpdate, there is no difference
-  between this function and paintGL(), performing rendering in either of them
-  leads to the same result.
-
-  The difference becomes significant when using \c PartialUpdateBlend, where an
-  extra framebuffer object is used. There, paintGL() targets this additional
-  framebuffer object, which preserves its contents, while paintUnderGL() and
-  paintOverGL() target the default framebuffer, i.e. directly the window
-  surface, the contents of which is lost after each displayed frame.
-
-  \note Avoid relying on this function when the update behavior is
-  \c PartialUpdateBlit. This mode involves blitting the extra framebuffer used by
-  paintGL() onto the default framebuffer after each invocation of paintGL(),
-  thus overwriting all drawing generated in this function.
-
-  \sa paintGL(), paintOverGL(), UpdateBehavior
- */
-void QOpenGLWindow::paintUnderGL()
-{
-}
-
-/*!
-  This virtual function is called after each invocation of paintGL().
-
-  When the update mode is set to NoPartialUpdate, there is no difference
-  between this function and paintGL(), performing rendering in either of them
-  leads to the same result.
-
-  Like paintUnderGL(), rendering in this function targets the default
-  framebuffer of the window, regardless of the update behavior. It gets called
-  after paintGL() has returned and the blit (PartialUpdateBlit) or quad drawing
-  (PartialUpdateBlend) has been done.
-
-  \sa paintGL(), paintUnderGL(), UpdateBehavior
- */
-void QOpenGLWindow::paintOverGL()
-{
-}
-
-/*!
-  Paint \a event handler. Calls paintGL().
-
-  \sa paintGL()
- */
-void QOpenGLWindow::paintEvent(QPaintEvent *event)
-{
-    Q_UNUSED(event);
-    paintGL();
-}
-
-/*!
-  Resize \a event handler. Calls resizeGL().
-
-  \sa resizeGL()
- */
-void QOpenGLWindow::resizeEvent(QResizeEvent *event)
-{
-    Q_UNUSED(event);
-    Q_D(QOpenGLWindow);
-    d->initialize();
-    resizeGL(width(), height());
-}
-
-/*!
-  \internal
- */
-int QOpenGLWindow::metric(PaintDeviceMetric metric) const
-{
-    Q_D(const QOpenGLWindow);
-
-    switch (metric) {
-        case PdmDepth:
-            if (d->paintDevice)
-                return d->paintDevice->depth();
-            break;
-        default:
-            break;
-    }
-    return QPaintDeviceWindow::metric(metric);
-}
-
-/*!
-  \internal
- */
-QPaintDevice *QOpenGLWindow::redirected(QPoint *) const
-{
-    Q_D(const QOpenGLWindow);
-    if (QOpenGLContext::currentContext() == d->context.data())
-        return d->paintDevice.data();
-    return nullptr;
-}
-
-QT_END_NAMESPACE
diff --git a/src/gui/kernel/qopenglwindow.h b/src/gui/kernel/qopenglwindow.h
deleted file mode 100644
index 7b3bf004a3..0000000000
--- a/src/gui/kernel/qopenglwindow.h
+++ /dev/null
@@ -1,107 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtGui module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QOPENGLWINDOW_H
-#define QOPENGLWINDOW_H
-
-#include <QtGui/qtguiglobal.h>
-
-#ifndef QT_NO_OPENGL
-
-#include <QtGui/QPaintDeviceWindow>
-#include <QtGui/QOpenGLContext>
-#include <QtGui/QImage>
-
-QT_BEGIN_NAMESPACE
-
-class QOpenGLWindowPrivate;
-
-class Q_GUI_EXPORT QOpenGLWindow : public QPaintDeviceWindow
-{
-    Q_OBJECT
-    Q_DECLARE_PRIVATE(QOpenGLWindow)
-
-public:
-    enum UpdateBehavior {
-        NoPartialUpdate,
-        PartialUpdateBlit,
-        PartialUpdateBlend
-    };
-
-    explicit QOpenGLWindow(UpdateBehavior updateBehavior = NoPartialUpdate, QWindow *parent = nullptr);
-    explicit QOpenGLWindow(QOpenGLContext *shareContext, UpdateBehavior updateBehavior = NoPartialUpdate, QWindow *parent = nullptr);
-    ~QOpenGLWindow();
-
-    UpdateBehavior updateBehavior() const;
-    bool isValid() const;
-
-    void makeCurrent();
-    void doneCurrent();
-
-    QOpenGLContext *context() const;
-    QOpenGLContext *shareContext() const;
-
-    GLuint defaultFramebufferObject() const;
-
-    QImage grabFramebuffer();
-
-Q_SIGNALS:
-    void frameSwapped();
-
-protected:
-    virtual void initializeGL();
-    virtual void resizeGL(int w, int h);
-    virtual void paintGL();
-    virtual void paintUnderGL();
-    virtual void paintOverGL();
-
-    void paintEvent(QPaintEvent *event) override;
-    void resizeEvent(QResizeEvent *event) override;
-    int metric(PaintDeviceMetric metric) const override;
-    QPaintDevice *redirected(QPoint *) const override;
-
-private:
-    Q_DISABLE_COPY(QOpenGLWindow)
-};
-
-QT_END_NAMESPACE
-
-#endif // QT_NO_OPENGL
-
-#endif
diff --git a/src/gui/kernel/qpalette.cpp b/src/gui/kernel/qpalette.cpp
index 397c50f3dc..f6180be8a8 100644
--- a/src/gui/kernel/qpalette.cpp
+++ b/src/gui/kernel/qpalette.cpp
@@ -44,10 +44,28 @@
 #include "qvariant.h"
 #include "qdebug.h"
 
+#include <QtCore/qmetaobject.h>
+
 QT_BEGIN_NAMESPACE
 
 static int qt_palette_count = 1;
 
+static constexpr QPalette::ResolveMask colorRoleOffset(QPalette::ColorGroup colorGroup)
+{
+    return QPalette::NColorRoles * colorGroup;
+}
+
+static constexpr QPalette::ResolveMask bitPosition(QPalette::ColorGroup colorGroup,
+                                                   QPalette::ColorRole colorRole)
+{
+    return colorRole + colorRoleOffset(colorGroup);
+}
+
+Q_STATIC_ASSERT_X(bitPosition(QPalette::ColorGroup(QPalette::NColorGroups - 1),
+                              QPalette::ColorRole(QPalette::NColorRoles - 1))
+                  < sizeof(QPalette::ResolveMask) * CHAR_BIT,
+                  "The resolve mask type is not wide enough to fit the entire bit mask.");
+
 class QPalettePrivate {
 public:
     QPalettePrivate() : ref(1), ser_no(qt_palette_count++), detach_no(0) { }
@@ -321,11 +339,8 @@ static void qt_palette_from_color(QPalette &pal, const QColor &button)
 
     Returns the placeholder text brush of the current color group.
 
-    \note Before Qt 5.12, the placeholder text color was hard-coded in the code as
-    QPalette::text().color() where an alpha of 128 was applied.
-    We continue to support this behavior by default, unless you set your own brush.
-    One can get back the original placeholder color setting the special QBrush default
-    constructor as placeholder brush.
+    \note Before Qt 5.12, the placeholder text color was hard-coded as QPalette::text().color()
+    with an alpha of 128 applied. In Qt 6, it is an independent color.
 
     \sa ColorRole, brush()
 */
@@ -538,8 +553,6 @@ static void qt_palette_from_color(QPalette &pal, const QColor &button)
 QPalette::QPalette()
     : d(nullptr)
 {
-    data.current_group = Active;
-    data.resolve_mask = 0;
     // Initialize to application palette if present, else default to black.
     // This makes it possible to instantiate QPalette outside QGuiApplication,
     // for example in the platform plugins.
@@ -549,7 +562,7 @@ QPalette::QPalette()
     } else {
         init();
         qt_palette_from_color(*this, Qt::black);
-        data.resolve_mask = 0;
+        data.resolveMask = 0;
     }
 }
 
@@ -681,8 +694,6 @@ QPalette::~QPalette()
 /*!\internal*/
 void QPalette::init() {
     d = new QPalettePrivate;
-    data.resolve_mask = 0;
-    data.current_group = Active; //as a default..
 }
 
 /*!
@@ -739,7 +750,7 @@ const QBrush &QPalette::brush(ColorGroup gr, ColorRole cr) const
     Q_ASSERT(cr < NColorRoles);
     if(gr >= (int)NColorGroups) {
         if(gr == Current) {
-            gr = (ColorGroup)data.current_group;
+            gr = data.currentGroup;
         } else {
             qWarning("QPalette::brush: Unknown ColorGroup: %d", (int)gr);
             gr = Active;
@@ -777,38 +788,18 @@ void QPalette::setBrush(ColorGroup cg, ColorRole cr, const QBrush &b)
     }
 
     if (cg == Current) {
-        cg = ColorGroup(data.current_group);
+        cg = data.currentGroup;
     } else if (cg >= NColorGroups) {
         qWarning("QPalette::setBrush: Unknown ColorGroup: %d", cg);
         cg = Active;
     }
 
-    // For placeholder we want to continue to respect the original behavior, which is
-    // derivating the text color, but only if user has not yet set his own brush.
-    // We then use Qt::NoBrush as an inernal way to know if the brush is customized or not.
-
-    // ### Qt 6 - remove this special case
-    // Part 1 - Restore initial color to the given color group
-    if (cr == PlaceholderText && b == QBrush()) {
-        QColor col = brush(Text).color();
-        col.setAlpha(128);
-        setBrush(cg, PlaceholderText, QBrush(col, Qt::NoBrush));
-        return;
-    }
-
     if (d->br[cg][cr] != b) {
         detach();
         d->br[cg][cr] = b;
     }
-    data.resolve_mask |= (1<<cr);
-
-    // ### Qt 6 - remove this special case
-    // Part 2 - Update initial color to the given color group
-    if (cr == Text && d->br[cg][PlaceholderText].style() == Qt::NoBrush) {
-        QColor col = brush(Text).color();
-        col.setAlpha(128);
-        setBrush(cg, PlaceholderText, QBrush(col, Qt::NoBrush));
-    }
+
+    data.resolveMask |= ResolveMask(1) << bitPosition(cg, cr);
 }
 
 /*!
@@ -817,12 +808,30 @@ void QPalette::setBrush(ColorGroup cg, ColorRole cr, const QBrush &b)
     Returns \c true if the ColorGroup \a cg and ColorRole \a cr has been
     set previously on this palette; otherwise returns \c false.
 
-    \sa setBrush()
+    The ColorGroup \a cg should be less than QPalette::NColorGroups,
+    but you can use QPalette::Current. In this case, the previously
+    set current color group will be used.
+
+    The ColorRole \a cr should be less than QPalette::NColorRoles.
+
+    \sa setBrush(), currentColorGroup()
 */
 bool QPalette::isBrushSet(ColorGroup cg, ColorRole cr) const
 {
-    Q_UNUSED(cg);
-    return (data.resolve_mask & (1<<cr));
+    if (cg == Current)
+        cg = data.currentGroup;
+
+    if (cg >= NColorGroups) {
+        qWarning() << "Wrong color group:" << cg;
+        return false;
+    }
+
+    if (cr >= NColorRoles) {
+        qWarning() << "Wrong color role:" << cr;
+        return false;
+    }
+
+    return data.resolveMask & (ResolveMask(1) << bitPosition(cg, cr));
 }
 
 /*!
@@ -887,7 +896,7 @@ bool QPalette::isEqual(QPalette::ColorGroup group1, QPalette::ColorGroup group2)
 {
     if(group1 >= (int)NColorGroups) {
         if(group1 == Current) {
-            group1 = (ColorGroup)data.current_group;
+            group1 = data.currentGroup;
         } else {
             qWarning("QPalette::brush: Unknown ColorGroup(1): %d", (int)group1);
             group1 = Active;
@@ -895,7 +904,7 @@ bool QPalette::isEqual(QPalette::ColorGroup group1, QPalette::ColorGroup group2)
     }
     if(group2 >= (int)NColorGroups) {
         if(group2 == Current) {
-            group2 = (ColorGroup)data.current_group;
+            group2 = data.currentGroup;
         } else {
             qWarning("QPalette::brush: Unknown ColorGroup(2): %d", (int)group2);
             group2 = Active;
@@ -946,21 +955,25 @@ qint64 QPalette::cacheKey() const
 */
 QPalette QPalette::resolve(const QPalette &other) const
 {
-    if ((*this == other && data.resolve_mask == other.data.resolve_mask)
-        || data.resolve_mask == 0) {
+    if ((*this == other && data.resolveMask == other.data.resolveMask)
+        || data.resolveMask == 0) {
         QPalette o = other;
-        o.data.resolve_mask = data.resolve_mask;
+        o.data.resolveMask = data.resolveMask;
         return o;
     }
 
     QPalette palette(*this);
     palette.detach();
 
-    for(int role = 0; role < (int)NColorRoles; role++)
-        if (!(data.resolve_mask & (1<<role)))
-            for(int grp = 0; grp < (int)NColorGroups; grp++)
+    for (int role = 0; role < int(NColorRoles); ++role) {
+        for (int grp = 0; grp < int(NColorGroups); ++grp) {
+            if (!(data.resolveMask & (ResolveMask(1) << bitPosition(ColorGroup(grp), ColorRole(role))))) {
                 palette.d->br[grp][role] = other.d->br[grp][role];
-    palette.data.resolve_mask |= other.data.resolve_mask;
+            }
+        }
+    }
+
+    palette.data.resolveMask |= other.data.resolveMask;
 
     return palette;
 }
@@ -971,7 +984,12 @@ QPalette QPalette::resolve(const QPalette &other) const
 */
 
 /*!
-    \fn void QPalette::resolve(uint mask)
+    \typedef ResolveMaskType
+    \internal
+ */
+
+/*!
+    \fn void QPalette::resolve(ResolveMaskType mask)
     \internal
 */
 
@@ -1105,10 +1123,15 @@ void QPalette::setColorGroup(ColorGroup cg, const QBrush &windowText, const QBru
                   QBrush(Qt::blue), QBrush(Qt::magenta), QBrush(toolTipBase),
                   QBrush(toolTipText));
 
-    data.resolve_mask &= ~(1 << Highlight);
-    data.resolve_mask &= ~(1 << HighlightedText);
-    data.resolve_mask &= ~(1 << LinkVisited);
-    data.resolve_mask &= ~(1 << Link);
+    for (int cr = Highlight; cr <= LinkVisited; ++cr) {
+        if (cg == All) {
+            for (int group = Active; group < NColorGroups; ++group) {
+                data.resolveMask &= ~(ResolveMask(1) << bitPosition(ColorGroup(group), ColorRole(cr)));
+            }
+        } else {
+            data.resolveMask &= ~(ResolveMask(1) << bitPosition(ColorGroup(cg), ColorRole(cr)));
+        }
+    }
 }
 
 
@@ -1177,6 +1200,8 @@ Q_GUI_EXPORT QPalette qt_fusionPalette()
     QColor button = backGround;
     QColor shadow = dark.darker(135);
     QColor disabledShadow = shadow.lighter(150);
+    QColor placeholder = text;
+    placeholder.setAlpha(128);
 
     QPalette fusionPalette(Qt::black,backGround,light,dark,mid,text,base);
     fusionPalette.setBrush(QPalette::Midlight, midLight);
@@ -1194,40 +1219,65 @@ Q_GUI_EXPORT QPalette qt_fusionPalette()
     fusionPalette.setBrush(QPalette::Active, QPalette::Highlight, QColor(48, 140, 198));
     fusionPalette.setBrush(QPalette::Inactive, QPalette::Highlight, QColor(48, 140, 198));
     fusionPalette.setBrush(QPalette::Disabled, QPalette::Highlight, QColor(145, 145, 145));
+
+    fusionPalette.setBrush(QPalette::PlaceholderText, placeholder);
+
     return fusionPalette;
 }
 
 #ifndef QT_NO_DEBUG_STREAM
-QDebug operator<<(QDebug dbg, const QPalette &p)
+static QString groupsToString(const QPalette &p, QPalette::ColorRole cr)
 {
-    const char *colorGroupNames[] = {"Active", "Disabled", "Inactive"};
-    const char *colorRoleNames[] =
-        {"WindowText", "Button", "Light", "Midlight", "Dark", "Mid", "Text",
-         "BrightText", "ButtonText", "Base", "Window", "Shadow", "Highlight",
-         "HighlightedText", "Link", "LinkVisited", "AlternateBase", "NoRole",
-         "ToolTipBase","ToolTipText", "PlaceholderText" };
-    QDebugStateSaver saver(dbg);
-    QDebug nospace = dbg.nospace();
-    const uint mask = p.resolve();
-    nospace << "QPalette(resolve=" << Qt::hex << Qt::showbase << mask << ',';
-    for (int role = 0; role < (int)QPalette::NColorRoles; ++role) {
-        if (mask & (1<<role)) {
-            if (role)
-                nospace << ',';
-            nospace << colorRoleNames[role] << ":[";
-            for (int group = 0; group < (int)QPalette::NColorGroups; ++group) {
-                if (group)
-                    nospace << ',';
-                const QRgb color = p.color(static_cast<QPalette::ColorGroup>(group),
-                                           static_cast<QPalette::ColorRole>(role)).rgba();
-                nospace << colorGroupNames[group] << ':' << color;
-            }
-            nospace << ']';
+    const auto groupEnum = QMetaEnum::fromType<QPalette::ColorGroup>();
+
+    QString groupString;
+    for (int group = 0; group < QPalette::NColorGroups; ++group) {
+        const auto cg = QPalette::ColorGroup(group);
+
+        if (p.isBrushSet(cg, cr)) {
+            const auto &color = p.color(cg, cr);
+            groupString += QString::fromUtf8(groupEnum.valueToKey(cg)) + QLatin1Char(':') +
+                           color.name(QColor::HexArgb) + QLatin1Char(',');
         }
     }
-    nospace << ')' << Qt::noshowbase << Qt::dec;
-    return dbg;
+    groupString.chop(1);
+
+    return groupString;
 }
+
+static QString rolesToString(const QPalette &p)
+{
+    const auto roleEnum = QMetaEnum::fromType<QPalette::ColorRole>();
+
+    QString roleString;
+    for (int role = 0; role < QPalette::NColorRoles; ++role) {
+        const auto cr = QPalette::ColorRole(role);
+
+        auto groupString = groupsToString(p, cr);
+        if (!groupString.isEmpty())
+            roleString += QString::fromUtf8(roleEnum.valueToKey(cr)) + QStringLiteral(":[") +
+                          groupString + QStringLiteral("],");
+    }
+    roleString.chop(1);
+
+    return roleString;
+}
+
+QDebug operator<<(QDebug dbg, const QPalette &p)
+{
+    QDebugStateSaver saver(dbg);
+    dbg.nospace();
+
+    dbg << "QPalette(resolve=" << Qt::hex << Qt::showbase << p.resolve();
+
+    auto roleString = rolesToString(p);
+    if (!roleString.isEmpty())
+        dbg << ',' << roleString;
+
+    dbg << ')';
+
+    return dbg;
+ }
 #endif
 
 QT_END_NAMESPACE
diff --git a/src/gui/kernel/qpalette.h b/src/gui/kernel/qpalette.h
index d3a840d9ad..fd0ef2e2d9 100644
--- a/src/gui/kernel/qpalette.h
+++ b/src/gui/kernel/qpalette.h
@@ -72,14 +72,13 @@ public:
     { other.d = nullptr; }
     inline QPalette &operator=(QPalette &&other) noexcept
     {
-        for_faster_swapping_dont_use = other.for_faster_swapping_dont_use;
-        qSwap(d, other.d); return *this;
+        swap(other); return *this;
     }
 
     void swap(QPalette &other) noexcept
     {
+        qSwap(data, other.data);
         qSwap(d, other.d);
-        qSwap(for_faster_swapping_dont_use, other.for_faster_swapping_dont_use);
     }
 
     operator QVariant() const;
@@ -103,8 +102,8 @@ public:
                    };
     Q_ENUM(ColorRole)
 
-    inline ColorGroup currentColorGroup() const { return static_cast<ColorGroup>(data.current_group); }
-    inline void setCurrentColorGroup(ColorGroup cg) { data.current_group = cg; }
+    inline ColorGroup currentColorGroup() const { return data.currentGroup; }
+    inline void setCurrentColorGroup(ColorGroup cg) { data.currentGroup = cg; }
 
     inline const QColor &color(ColorGroup cg, ColorRole cr) const
     { return brush(cg, cr).color(); }
@@ -158,9 +157,11 @@ public:
 #endif
     qint64 cacheKey() const;
 
-    QPalette resolve(const QPalette &) const;
-    inline uint resolve() const { return data.resolve_mask; }
-    inline void resolve(uint mask) { data.resolve_mask = mask; }
+    QPalette resolve(const QPalette &other) const;
+
+    using ResolveMask = quint64;
+    inline ResolveMask resolve() const { return data.resolveMask; }
+    inline void resolve(ResolveMask mask) { data.resolveMask = mask; }
 
 private:
     void setColorGroup(ColorGroup cr, const QBrush &windowText, const QBrush &button,
@@ -185,13 +186,11 @@ private:
 
     QPalettePrivate *d;
     struct Data {
-        uint current_group : 4;
-        uint resolve_mask : 28;
-    };
-    union {
-        Data data;
-        quint32 for_faster_swapping_dont_use;
+        ResolveMask resolveMask{0};
+        ColorGroup currentGroup{Active};
     };
+    Data data;
+
     friend Q_GUI_EXPORT QDataStream &operator<<(QDataStream &s, const QPalette &p);
 };
 
diff --git a/src/gui/kernel/qplatformcursor.cpp b/src/gui/kernel/qplatformcursor.cpp
index 5a438a54a2..1330b5bf31 100644
--- a/src/gui/kernel/qplatformcursor.cpp
+++ b/src/gui/kernel/qplatformcursor.cpp
@@ -622,7 +622,7 @@ void QPlatformCursorImage::set(const uchar *data, const uchar *mask,
     int x = -1, w = 0;
 
     uchar *cursor_data = cursorImage.bits();
-    int bpl = cursorImage.bytesPerLine();
+    qsizetype bpl = cursorImage.bytesPerLine();
     for (int i = 0; i < height; i++)
     {
         for (int j = 0; j < bytesPerLine; j++, data++, mask++)
diff --git a/src/gui/kernel/qplatformgraphicsbufferhelper.h b/src/gui/kernel/qplatformgraphicsbufferhelper.h
index bfe61713d4..36afd4877b 100644
--- a/src/gui/kernel/qplatformgraphicsbufferhelper.h
+++ b/src/gui/kernel/qplatformgraphicsbufferhelper.h
@@ -46,7 +46,7 @@
 QT_BEGIN_NAMESPACE
 
 namespace QPlatformGraphicsBufferHelper {
-    bool lockAndBindToTexture(QPlatformGraphicsBuffer *graphicsBuffer, bool *swizzleRandB, bool *premultipliedB, const QRect &rect = QRect());
+    Q_GUI_EXPORT bool lockAndBindToTexture(QPlatformGraphicsBuffer *graphicsBuffer, bool *swizzleRandB, bool *premultipliedB, const QRect &rect = QRect());
     bool bindSWToTexture(const QPlatformGraphicsBuffer *graphicsBuffer, bool *swizzleRandB = nullptr, bool *premultipliedB = nullptr, const QRect &rect = QRect());
 }
 
diff --git a/src/gui/kernel/qplatformmenu.h b/src/gui/kernel/qplatformmenu.h
index 28c29a704c..8e470aefd3 100644
--- a/src/gui/kernel/qplatformmenu.h
+++ b/src/gui/kernel/qplatformmenu.h
@@ -52,7 +52,9 @@
 #include <QtGui/qtguiglobal.h>
 #include <QtCore/qpointer.h>
 #include <QtGui/QFont>
-#include <QtGui/QKeySequence>
+#if QT_CONFIG(shortcut)
+#  include <QtGui/QKeySequence>
+#endif
 #include <QtGui/QIcon>
 
 QT_BEGIN_NAMESPACE
@@ -85,7 +87,7 @@ public:
     virtual void setRole(MenuRole role) = 0;
     virtual void setCheckable(bool checkable) = 0;
     virtual void setChecked(bool isChecked) = 0;
-#ifndef QT_NO_SHORTCUT
+#if QT_CONFIG(shortcut)
     virtual void setShortcut(const QKeySequence& shortcut) = 0;
 #endif
     virtual void setEnabled(bool enabled) = 0;
diff --git a/src/gui/kernel/qplatformtheme.cpp b/src/gui/kernel/qplatformtheme.cpp
index 71521c0339..93fd59e53f 100644
--- a/src/gui/kernel/qplatformtheme.cpp
+++ b/src/gui/kernel/qplatformtheme.cpp
@@ -167,7 +167,7 @@ QT_BEGIN_NAMESPACE
 */
 
 
-#ifndef QT_NO_SHORTCUT
+#if QT_CONFIG(shortcut)
 // Table of key bindings. It must be sorted on key sequence:
 // The integer value of VK_KEY | Modifier Keys (e.g., VK_META, and etc.)
 // A priority of 1 indicates that this is the primary key binding when multiple are defined.
@@ -623,7 +623,7 @@ static inline int maybeSwapShortcut(int shortcut)
 }
 #endif
 
-#ifndef QT_NO_SHORTCUT
+#if QT_CONFIG(shortcut)
 // mixed-mode predicate: all of these overloads are actually needed (but not all for every compiler)
 struct ByStandardKey {
     typedef bool result_type;
@@ -688,6 +688,7 @@ QString QPlatformTheme::standardButtonText(int button) const
     return QPlatformTheme::defaultStandardButtonText(button);
 }
 
+#if QT_CONFIG(shortcut)
 /*!
    Returns the mnemonic that should be used for a standard \a button.
 
@@ -700,6 +701,7 @@ QKeySequence QPlatformTheme::standardButtonShortcut(int button) const
     Q_UNUSED(button)
     return QKeySequence();
 }
+#endif // QT_CONFIG(shortcut)
 
 QString QPlatformTheme::defaultStandardButtonText(int button)
 {
@@ -784,7 +786,7 @@ unsigned QPlatformThemePrivate::currentKeyPlatforms()
 {
     const uint keyboardScheme = QGuiApplicationPrivate::platformTheme()->themeHint(QPlatformTheme::KeyboardScheme).toInt();
     unsigned result = 1u << keyboardScheme;
-#ifndef QT_NO_SHORTCUT
+#if QT_CONFIG(shortcut)
     if (keyboardScheme == QPlatformTheme::KdeKeyboardScheme
         || keyboardScheme == QPlatformTheme::GnomeKeyboardScheme
         || keyboardScheme == QPlatformTheme::CdeKeyboardScheme)
diff --git a/src/gui/kernel/qplatformtheme.h b/src/gui/kernel/qplatformtheme.h
index 3185fc4541..6ed612b785 100644
--- a/src/gui/kernel/qplatformtheme.h
+++ b/src/gui/kernel/qplatformtheme.h
@@ -51,7 +51,9 @@
 
 #include <QtGui/qtguiglobal.h>
 #include <QtCore/QScopedPointer>
-#include <QtGui/QKeySequence>
+#if QT_CONFIG(shortcut)
+#  include <QtGui/QKeySequence>
+#endif
 
 QT_BEGIN_NAMESPACE
 
@@ -312,12 +314,14 @@ public:
                            QPlatformTheme::IconOptions iconOptions = { }) const;
     virtual QIconEngine *createIconEngine(const QString &iconName) const;
 
-#ifndef QT_NO_SHORTCUT
+#if QT_CONFIG(shortcut)
     virtual QList<QKeySequence> keyBindings(QKeySequence::StandardKey key) const;
 #endif
 
     virtual QString standardButtonText(int button) const;
+#if QT_CONFIG(shortcut)
     virtual QKeySequence standardButtonShortcut(int button) const;
+#endif
 
     static QVariant defaultThemeHint(ThemeHint hint);
     static QString defaultStandardButtonText(int button);
diff --git a/src/gui/kernel/qplatformtheme_p.h b/src/gui/kernel/qplatformtheme_p.h
index 73deb890bb..2c16fec141 100644
--- a/src/gui/kernel/qplatformtheme_p.h
+++ b/src/gui/kernel/qplatformtheme_p.h
@@ -52,7 +52,9 @@
 //
 
 #include <QtGui/private/qtguiglobal_p.h>
-#include "private/qkeysequence_p.h"
+#if QT_CONFIG(shortcut)
+#  include "private/qkeysequence_p.h"
+#endif
 
 QT_BEGIN_NAMESPACE
 
@@ -67,7 +69,7 @@ public:
 
     void initializeSystemPalette();
 
-#ifndef QT_NO_SHORTCUT
+#if QT_CONFIG(shortcut)
     static const QKeyBinding keyBindings[];
     static const uint numberOfKeyBindings;
 #endif
diff --git a/src/gui/kernel/qshortcutmap.cpp b/src/gui/kernel/qshortcutmap.cpp
index a7ea20266b..6039101cf4 100644
--- a/src/gui/kernel/qshortcutmap.cpp
+++ b/src/gui/kernel/qshortcutmap.cpp
@@ -49,8 +49,6 @@
 
 #include <algorithm>
 
-#ifndef QT_NO_SHORTCUT
-
 QT_BEGIN_NAMESPACE
 
 Q_LOGGING_CATEGORY(lcShortcutMap, "qt.gui.shortcutmap")
@@ -689,5 +687,3 @@ void QShortcutMap::dumpMap() const
 #endif
 
 QT_END_NAMESPACE
-
-#endif // QT_NO_SHORTCUT
diff --git a/src/gui/kernel/qshortcutmap_p.h b/src/gui/kernel/qshortcutmap_p.h
index 8fc68229fb..aa3dd969f0 100644
--- a/src/gui/kernel/qshortcutmap_p.h
+++ b/src/gui/kernel/qshortcutmap_p.h
@@ -56,9 +56,9 @@
 #include "QtCore/qvector.h"
 #include "QtCore/qscopedpointer.h"
 
-QT_BEGIN_NAMESPACE
+QT_REQUIRE_CONFIG(shortcut);
 
-#ifndef QT_NO_SHORTCUT
+QT_BEGIN_NAMESPACE
 
 // To enable dump output uncomment below
 //#define Dump_QShortcutMap
@@ -106,8 +106,6 @@ private:
     QScopedPointer<QShortcutMapPrivate> d_ptr;
 };
 
-#endif // QT_NO_SHORTCUT
-
 QT_END_NAMESPACE
 
 #endif // QSHORTCUTMAP_P_H
diff --git a/src/gui/kernel/qwindow.h b/src/gui/kernel/qwindow.h
index 7aae7ffffa..de6d7ffd31 100644
--- a/src/gui/kernel/qwindow.h
+++ b/src/gui/kernel/qwindow.h
@@ -119,11 +119,11 @@ class Q_GUI_EXPORT QWindow : public QObject, public QSurface
     Q_PROPERTY(int maximumWidth READ maximumWidth WRITE setMaximumWidth NOTIFY maximumWidthChanged)
     Q_PROPERTY(int maximumHeight READ maximumHeight WRITE setMaximumHeight NOTIFY maximumHeightChanged)
     Q_PROPERTY(bool visible READ isVisible WRITE setVisible NOTIFY visibleChanged)
-    Q_PROPERTY(bool active READ isActive NOTIFY activeChanged REVISION 1)
-    Q_PROPERTY(Visibility visibility READ visibility WRITE setVisibility NOTIFY visibilityChanged REVISION 1)
+    Q_PROPERTY(bool active READ isActive NOTIFY activeChanged REVISION(2, 1))
+    Q_PROPERTY(Visibility visibility READ visibility WRITE setVisibility NOTIFY visibilityChanged REVISION(2, 1))
     Q_PROPERTY(Qt::ScreenOrientation contentOrientation READ contentOrientation WRITE reportContentOrientationChange NOTIFY contentOrientationChanged)
-    Q_PROPERTY(qreal opacity READ opacity WRITE setOpacity NOTIFY opacityChanged REVISION 1)
-    Q_PRIVATE_PROPERTY(QWindow::d_func(), QWindow* transientParent MEMBER transientParent WRITE setTransientParent NOTIFY transientParentChanged REVISION 13)
+    Q_PROPERTY(qreal opacity READ opacity WRITE setOpacity NOTIFY opacityChanged REVISION(2, 1))
+    Q_PRIVATE_PROPERTY(QWindow::d_func(), QWindow* transientParent MEMBER transientParent WRITE setTransientParent NOTIFY transientParentChanged REVISION(2, 13))
 
 public:
     enum Visibility {
@@ -277,7 +277,7 @@ public:
 #endif
 
 public Q_SLOTS:
-    Q_REVISION(1) void requestActivate();
+    Q_REVISION(2, 1) void requestActivate();
 
     void setVisible(bool visible);
 
@@ -309,15 +309,15 @@ public Q_SLOTS:
     void setMaximumWidth(int w);
     void setMaximumHeight(int h);
 
-    Q_REVISION(1) void alert(int msec);
+    Q_REVISION(2, 1) void alert(int msec);
 
-    Q_REVISION(3) void requestUpdate();
+    Q_REVISION(2 ,3) void requestUpdate();
 
 Q_SIGNALS:
     void screenChanged(QScreen *screen);
     void modalityChanged(Qt::WindowModality modality);
     void windowStateChanged(Qt::WindowState windowState);
-    Q_REVISION(2) void windowTitleChanged(const QString &title);
+    Q_REVISION(2, 2) void windowTitleChanged(const QString &title);
 
     void xChanged(int arg);
     void yChanged(int arg);
@@ -331,15 +331,15 @@ Q_SIGNALS:
     void maximumHeightChanged(int arg);
 
     void visibleChanged(bool arg);
-    Q_REVISION(1) void visibilityChanged(QWindow::Visibility visibility);
-    Q_REVISION(1) void activeChanged();
+    Q_REVISION(2, 1) void visibilityChanged(QWindow::Visibility visibility);
+    Q_REVISION(2, 1) void activeChanged();
     void contentOrientationChanged(Qt::ScreenOrientation orientation);
 
     void focusObjectChanged(QObject *object);
 
-    Q_REVISION(1) void opacityChanged(qreal opacity);
+    Q_REVISION(2, 1) void opacityChanged(qreal opacity);
 
-    Q_REVISION(13) void transientParentChanged(QWindow *transientParent);
+    Q_REVISION(2, 13) void transientParentChanged(QWindow *transientParent);
 
 protected:
     virtual void exposeEvent(QExposeEvent *);
diff --git a/src/gui/kernel/qwindowdefs.h b/src/gui/kernel/qwindowdefs.h
index b4f3ed4712..5d4955c436 100644
--- a/src/gui/kernel/qwindowdefs.h
+++ b/src/gui/kernel/qwindowdefs.h
@@ -43,6 +43,7 @@
 #include <QtGui/qtguiglobal.h>
 #include <QtCore/qobjectdefs.h>
 #include <QtCore/qnamespace.h>
+#include <QtCore/qcontainerfwd.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -67,7 +68,6 @@ class QFontMetrics;
 class QFontInfo;
 class QPen;
 class QBrush;
-class QMatrix;
 class QPixmap;
 class QBitmap;
 class QMovie;
@@ -80,7 +80,6 @@ class QString;
 class QByteArray;
 class QApplication;
 
-template<typename T> class QList;
 typedef QList<QWidget *> QWidgetList;
 typedef QList<QWindow *> QWindowList;
 
diff --git a/src/gui/kernel/qwindowsysteminterface.cpp b/src/gui/kernel/qwindowsysteminterface.cpp
index 3e7d592016..2de0131640 100644
--- a/src/gui/kernel/qwindowsysteminterface.cpp
+++ b/src/gui/kernel/qwindowsysteminterface.cpp
@@ -442,7 +442,7 @@ void QWindowSystemInterface::handleFrameStrutMouseEvent(QWindow *window, ulong t
 bool QWindowSystemInterface::handleShortcutEvent(QWindow *window, ulong timestamp, int keyCode, Qt::KeyboardModifiers modifiers, quint32 nativeScanCode,
                                       quint32 nativeVirtualKey, quint32 nativeModifiers, const QString &text, bool autorepeat, ushort count)
 {
-#ifndef QT_NO_SHORTCUT
+#if QT_CONFIG(shortcut)
     if (!window)
         window = QGuiApplication::focusWindow();
 
@@ -1247,7 +1247,7 @@ Q_GUI_EXPORT void qt_handleKeyEvent(QWindow *window, QEvent::Type t, int k, Qt::
 
 Q_GUI_EXPORT bool qt_sendShortcutOverrideEvent(QObject *o, ulong timestamp, int k, Qt::KeyboardModifiers mods, const QString &text = QString(), bool autorep = false, ushort count = 1)
 {
-#ifndef QT_NO_SHORTCUT
+#if QT_CONFIG(shortcut)
 
     // FIXME: This method should not allow targeting a specific object, but should
     // instead forward the event to a window, which then takes care of normal event
diff --git a/src/gui/math3d/qmatrix4x4.cpp b/src/gui/math3d/qmatrix4x4.cpp
index cdaed788e9..2297342be7 100644
--- a/src/gui/math3d/qmatrix4x4.cpp
+++ b/src/gui/math3d/qmatrix4x4.cpp
@@ -40,7 +40,6 @@
 #include "qmatrix4x4.h"
 #include <QtCore/qmath.h>
 #include <QtCore/qvariant.h>
-#include <QtGui/qmatrix.h>
 #include <QtGui/qtransform.h>
 
 #include <cmath>
@@ -106,7 +105,6 @@ QMatrix4x4::QMatrix4x4(const float *values)
     for (int row = 0; row < 4; ++row)
         for (int col = 0; col < 4; ++col)
             m[col][row] = values[row * 4 + col];
-    flagBits = General;
 }
 
 /*!
@@ -184,45 +182,8 @@ QMatrix4x4::QMatrix4x4(const float *values, int cols, int rows)
                 m[col][row] = 0.0f;
         }
     }
-    flagBits = General;
 }
 
-#if QT_DEPRECATED_SINCE(5, 15)
-/*!
-    \obsolete
-
-    Constructs a 4x4 matrix from a conventional Qt 2D affine
-    transformation \a matrix.
-
-    If \a matrix has a special type (identity, translate, scale, etc),
-    the programmer should follow this constructor with a call to
-    optimize() if they wish QMatrix4x4 to optimize further
-    calls to translate(), scale(), etc.
-
-    \sa toAffine(), optimize()
-*/
-QMatrix4x4::QMatrix4x4(const QMatrix& matrix)
-{
-    m[0][0] = matrix.m11();
-    m[0][1] = matrix.m12();
-    m[0][2] = 0.0f;
-    m[0][3] = 0.0f;
-    m[1][0] = matrix.m21();
-    m[1][1] = matrix.m22();
-    m[1][2] = 0.0f;
-    m[1][3] = 0.0f;
-    m[2][0] = 0.0f;
-    m[2][1] = 0.0f;
-    m[2][2] = 1.0f;
-    m[2][3] = 0.0f;
-    m[3][0] = matrix.dx();
-    m[3][1] = matrix.dy();
-    m[3][2] = 0.0f;
-    m[3][3] = 1.0f;
-    flagBits = Translation | Scale | Rotation2D;
-}
-#endif // QT_DEPRECATED_SINCE(5, 15)
-
 /*!
     Constructs a 4x4 matrix from the conventional Qt 2D
     transformation matrix \a transform.
@@ -252,7 +213,6 @@ QMatrix4x4::QMatrix4x4(const QTransform& transform)
     m[3][1] = transform.dy();
     m[3][2] = 0.0f;
     m[3][3] = transform.m33();
-    flagBits = General;
 }
 
 /*!
@@ -386,15 +346,11 @@ static inline void copyToDoubles(const float m[4][4], double mm[4][4])
 */
 double QMatrix4x4::determinant() const
 {
-    if ((flagBits & ~(Translation | Rotation2D | Rotation)) == Identity)
+    if (isIdentity())
         return 1.0;
 
     double mm[4][4];
     copyToDoubles(m, mm);
-    if (flagBits < Rotation2D)
-        return mm[0][0] * mm[1][1] * mm[2][2]; // Translation | Scale
-    if (flagBits < Perspective)
-        return matrixDet3(mm, 0, 1, 2, 0, 1, 2);
     return matrixDet4(mm);
 }
 
@@ -413,77 +369,10 @@ double QMatrix4x4::determinant() const
 QMatrix4x4 QMatrix4x4::inverted(bool *invertible) const
 {
     // Handle some of the easy cases first.
-    if (flagBits == Identity) {
+    if (isIdentity()) {
         if (invertible)
             *invertible = true;
         return QMatrix4x4();
-    } else if (flagBits == Translation) {
-        QMatrix4x4 inv;
-        inv.m[3][0] = -m[3][0];
-        inv.m[3][1] = -m[3][1];
-        inv.m[3][2] = -m[3][2];
-        inv.flagBits = Translation;
-        if (invertible)
-            *invertible = true;
-        return inv;
-    } else if (flagBits < Rotation2D) {
-        // Translation | Scale
-        if (m[0][0] == 0 || m[1][1] == 0 || m[2][2] == 0) {
-            if (invertible)
-                *invertible = false;
-            return QMatrix4x4();
-        }
-        QMatrix4x4 inv;
-        inv.m[0][0] = 1.0f / m[0][0];
-        inv.m[1][1] = 1.0f / m[1][1];
-        inv.m[2][2] = 1.0f / m[2][2];
-        inv.m[3][0] = -m[3][0] * inv.m[0][0];
-        inv.m[3][1] = -m[3][1] * inv.m[1][1];
-        inv.m[3][2] = -m[3][2] * inv.m[2][2];
-        inv.flagBits = flagBits;
-
-        if (invertible)
-            *invertible = true;
-        return inv;
-    } else if ((flagBits & ~(Translation | Rotation2D | Rotation)) == Identity) {
-        if (invertible)
-            *invertible = true;
-        return orthonormalInverse();
-    } else if (flagBits < Perspective) {
-        QMatrix4x4 inv(1); // The "1" says to not load the identity.
-
-        double mm[4][4];
-        copyToDoubles(m, mm);
-
-        double det = matrixDet3(mm, 0, 1, 2, 0, 1, 2);
-        if (det == 0.0f) {
-            if (invertible)
-                *invertible = false;
-            return QMatrix4x4();
-        }
-        det = 1.0f / det;
-
-        inv.m[0][0] =  matrixDet2(mm, 1, 2, 1, 2) * det;
-        inv.m[0][1] = -matrixDet2(mm, 0, 2, 1, 2) * det;
-        inv.m[0][2] =  matrixDet2(mm, 0, 1, 1, 2) * det;
-        inv.m[0][3] = 0;
-        inv.m[1][0] = -matrixDet2(mm, 1, 2, 0, 2) * det;
-        inv.m[1][1] =  matrixDet2(mm, 0, 2, 0, 2) * det;
-        inv.m[1][2] = -matrixDet2(mm, 0, 1, 0, 2) * det;
-        inv.m[1][3] = 0;
-        inv.m[2][0] =  matrixDet2(mm, 1, 2, 0, 1) * det;
-        inv.m[2][1] = -matrixDet2(mm, 0, 2, 0, 1) * det;
-        inv.m[2][2] =  matrixDet2(mm, 0, 1, 0, 1) * det;
-        inv.m[2][3] = 0;
-        inv.m[3][0] = -inv.m[0][0] * m[3][0] - inv.m[1][0] * m[3][1] - inv.m[2][0] * m[3][2];
-        inv.m[3][1] = -inv.m[0][1] * m[3][0] - inv.m[1][1] * m[3][1] - inv.m[2][1] * m[3][2];
-        inv.m[3][2] = -inv.m[0][2] * m[3][0] - inv.m[1][2] * m[3][1] - inv.m[2][2] * m[3][2];
-        inv.m[3][3] = 1;
-        inv.flagBits = flagBits;
-
-        if (invertible)
-            *invertible = true;
-        return inv;
     }
 
     QMatrix4x4 inv(1); // The "1" says to not load the identity.
@@ -515,7 +404,6 @@ QMatrix4x4 QMatrix4x4::inverted(bool *invertible) const
     inv.m[3][1] =  matrixDet3(mm, 0, 2, 3, 0, 1, 2) * det;
     inv.m[3][2] = -matrixDet3(mm, 0, 1, 3, 0, 1, 2) * det;
     inv.m[3][3] =  matrixDet3(mm, 0, 1, 2, 0, 1, 2) * det;
-    inv.flagBits = flagBits;
 
     if (invertible)
         *invertible = true;
@@ -534,32 +422,6 @@ QMatrix3x3 QMatrix4x4::normalMatrix() const
 {
     QMatrix3x3 inv;
 
-    // Handle the simple cases first.
-    if (flagBits < Scale) {
-        // Translation
-        return inv;
-    } else if (flagBits < Rotation2D) {
-        // Translation | Scale
-        if (m[0][0] == 0.0f || m[1][1] == 0.0f || m[2][2] == 0.0f)
-            return inv;
-        inv.data()[0] = 1.0f / m[0][0];
-        inv.data()[4] = 1.0f / m[1][1];
-        inv.data()[8] = 1.0f / m[2][2];
-        return inv;
-    } else if ((flagBits & ~(Translation | Rotation2D | Rotation)) == Identity) {
-        float *invm = inv.data();
-        invm[0 + 0 * 3] = m[0][0];
-        invm[1 + 0 * 3] = m[0][1];
-        invm[2 + 0 * 3] = m[0][2];
-        invm[0 + 1 * 3] = m[1][0];
-        invm[1 + 1 * 3] = m[1][1];
-        invm[2 + 1 * 3] = m[1][2];
-        invm[0 + 2 * 3] = m[2][0];
-        invm[1 + 2 * 3] = m[2][1];
-        invm[2 + 2 * 3] = m[2][2];
-        return inv;
-    }
-
     double mm[4][4];
     copyToDoubles(m, mm);
     double det = matrixDet3(mm, 0, 1, 2, 0, 1, 2);
@@ -594,8 +456,6 @@ QMatrix4x4 QMatrix4x4::transposed() const
             result.m[col][row] = m[row][col];
         }
     }
-    // When a translation is transposed, it becomes a perspective transformation.
-    result.flagBits = (flagBits & Translation ? General : flagBits);
     return result;
 }
 
@@ -647,7 +507,6 @@ QMatrix4x4& QMatrix4x4::operator/=(float divisor)
     m[3][1] /= divisor;
     m[3][2] /= divisor;
     m[3][3] /= divisor;
-    flagBits = General;
     return *this;
 }
 
@@ -804,7 +663,6 @@ QMatrix4x4 operator/(const QMatrix4x4& matrix, float divisor)
     m.m[3][1] = matrix.m[3][1] / divisor;
     m.m[3][2] = matrix.m[3][2] / divisor;
     m.m[3][3] = matrix.m[3][3] / divisor;
-    m.flagBits = QMatrix4x4::General;
     return m;
 }
 
@@ -826,38 +684,21 @@ QMatrix4x4 operator/(const QMatrix4x4& matrix, float divisor)
 */
 void QMatrix4x4::scale(const QVector3D& vector)
 {
-    float vx = vector.x();
-    float vy = vector.y();
-    float vz = vector.z();
-    if (flagBits < Scale) {
-        m[0][0] = vx;
-        m[1][1] = vy;
-        m[2][2] = vz;
-    } else if (flagBits < Rotation2D) {
-        m[0][0] *= vx;
-        m[1][1] *= vy;
-        m[2][2] *= vz;
-    } else if (flagBits < Rotation) {
-        m[0][0] *= vx;
-        m[0][1] *= vx;
-        m[1][0] *= vy;
-        m[1][1] *= vy;
-        m[2][2] *= vz;
-    } else {
-        m[0][0] *= vx;
-        m[0][1] *= vx;
-        m[0][2] *= vx;
-        m[0][3] *= vx;
-        m[1][0] *= vy;
-        m[1][1] *= vy;
-        m[1][2] *= vy;
-        m[1][3] *= vy;
-        m[2][0] *= vz;
-        m[2][1] *= vz;
-        m[2][2] *= vz;
-        m[2][3] *= vz;
-    }
-    flagBits |= Scale;
+    const float vx = vector.x();
+    const float vy = vector.y();
+    const float vz = vector.z();
+    m[0][0] *= vx;
+    m[0][1] *= vx;
+    m[0][2] *= vx;
+    m[0][3] *= vx;
+    m[1][0] *= vy;
+    m[1][1] *= vy;
+    m[1][2] *= vy;
+    m[1][3] *= vy;
+    m[2][0] *= vz;
+    m[2][1] *= vz;
+    m[2][2] *= vz;
+    m[2][3] *= vz;
 }
 
 #endif
@@ -872,28 +713,14 @@ void QMatrix4x4::scale(const QVector3D& vector)
 */
 void QMatrix4x4::scale(float x, float y)
 {
-    if (flagBits < Scale) {
-        m[0][0] = x;
-        m[1][1] = y;
-    } else if (flagBits < Rotation2D) {
-        m[0][0] *= x;
-        m[1][1] *= y;
-    } else if (flagBits < Rotation) {
-        m[0][0] *= x;
-        m[0][1] *= x;
-        m[1][0] *= y;
-        m[1][1] *= y;
-    } else {
-        m[0][0] *= x;
-        m[0][1] *= x;
-        m[0][2] *= x;
-        m[0][3] *= x;
-        m[1][0] *= y;
-        m[1][1] *= y;
-        m[1][2] *= y;
-        m[1][3] *= y;
-    }
-    flagBits |= Scale;
+    m[0][0] *= x;
+    m[0][1] *= x;
+    m[0][2] *= x;
+    m[0][3] *= x;
+    m[1][0] *= y;
+    m[1][1] *= y;
+    m[1][2] *= y;
+    m[1][3] *= y;
 }
 
 /*!
@@ -906,35 +733,18 @@ void QMatrix4x4::scale(float x, float y)
 */
 void QMatrix4x4::scale(float x, float y, float z)
 {
-    if (flagBits < Scale) {
-        m[0][0] = x;
-        m[1][1] = y;
-        m[2][2] = z;
-    } else if (flagBits < Rotation2D) {
-        m[0][0] *= x;
-        m[1][1] *= y;
-        m[2][2] *= z;
-    } else if (flagBits < Rotation) {
-        m[0][0] *= x;
-        m[0][1] *= x;
-        m[1][0] *= y;
-        m[1][1] *= y;
-        m[2][2] *= z;
-    } else {
-        m[0][0] *= x;
-        m[0][1] *= x;
-        m[0][2] *= x;
-        m[0][3] *= x;
-        m[1][0] *= y;
-        m[1][1] *= y;
-        m[1][2] *= y;
-        m[1][3] *= y;
-        m[2][0] *= z;
-        m[2][1] *= z;
-        m[2][2] *= z;
-        m[2][3] *= z;
-    }
-    flagBits |= Scale;
+    m[0][0] *= x;
+    m[0][1] *= x;
+    m[0][2] *= x;
+    m[0][3] *= x;
+    m[1][0] *= y;
+    m[1][1] *= y;
+    m[1][2] *= y;
+    m[1][3] *= y;
+    m[2][0] *= z;
+    m[2][1] *= z;
+    m[2][2] *= z;
+    m[2][3] *= z;
 }
 
 /*!
@@ -947,35 +757,18 @@ void QMatrix4x4::scale(float x, float y, float z)
 */
 void QMatrix4x4::scale(float factor)
 {
-    if (flagBits < Scale) {
-        m[0][0] = factor;
-        m[1][1] = factor;
-        m[2][2] = factor;
-    } else if (flagBits < Rotation2D) {
-        m[0][0] *= factor;
-        m[1][1] *= factor;
-        m[2][2] *= factor;
-    } else if (flagBits < Rotation) {
-        m[0][0] *= factor;
-        m[0][1] *= factor;
-        m[1][0] *= factor;
-        m[1][1] *= factor;
-        m[2][2] *= factor;
-    } else {
-        m[0][0] *= factor;
-        m[0][1] *= factor;
-        m[0][2] *= factor;
-        m[0][3] *= factor;
-        m[1][0] *= factor;
-        m[1][1] *= factor;
-        m[1][2] *= factor;
-        m[1][3] *= factor;
-        m[2][0] *= factor;
-        m[2][1] *= factor;
-        m[2][2] *= factor;
-        m[2][3] *= factor;
-    }
-    flagBits |= Scale;
+    m[0][0] *= factor;
+    m[0][1] *= factor;
+    m[0][2] *= factor;
+    m[0][3] *= factor;
+    m[1][0] *= factor;
+    m[1][1] *= factor;
+    m[1][2] *= factor;
+    m[1][3] *= factor;
+    m[2][0] *= factor;
+    m[2][1] *= factor;
+    m[2][2] *= factor;
+    m[2][3] *= factor;
 }
 
 #ifndef QT_NO_VECTOR3D
@@ -988,36 +781,13 @@ void QMatrix4x4::scale(float factor)
 
 void QMatrix4x4::translate(const QVector3D& vector)
 {
-    float vx = vector.x();
-    float vy = vector.y();
-    float vz = vector.z();
-    if (flagBits == Identity) {
-        m[3][0] = vx;
-        m[3][1] = vy;
-        m[3][2] = vz;
-    } else if (flagBits == Translation) {
-        m[3][0] += vx;
-        m[3][1] += vy;
-        m[3][2] += vz;
-    } else if (flagBits == Scale) {
-        m[3][0] = m[0][0] * vx;
-        m[3][1] = m[1][1] * vy;
-        m[3][2] = m[2][2] * vz;
-    } else if (flagBits == (Translation | Scale)) {
-        m[3][0] += m[0][0] * vx;
-        m[3][1] += m[1][1] * vy;
-        m[3][2] += m[2][2] * vz;
-    } else if (flagBits < Rotation) {
-        m[3][0] += m[0][0] * vx + m[1][0] * vy;
-        m[3][1] += m[0][1] * vx + m[1][1] * vy;
-        m[3][2] += m[2][2] * vz;
-    } else {
-        m[3][0] += m[0][0] * vx + m[1][0] * vy + m[2][0] * vz;
-        m[3][1] += m[0][1] * vx + m[1][1] * vy + m[2][1] * vz;
-        m[3][2] += m[0][2] * vx + m[1][2] * vy + m[2][2] * vz;
-        m[3][3] += m[0][3] * vx + m[1][3] * vy + m[2][3] * vz;
-    }
-    flagBits |= Translation;
+    const float vx = vector.x();
+    const float vy = vector.y();
+    const float vz = vector.z();
+    m[3][0] += m[0][0] * vx + m[1][0] * vy + m[2][0] * vz;
+    m[3][1] += m[0][1] * vx + m[1][1] * vy + m[2][1] * vz;
+    m[3][2] += m[0][2] * vx + m[1][2] * vy + m[2][2] * vz;
+    m[3][3] += m[0][3] * vx + m[1][3] * vy + m[2][3] * vz;
 }
 #endif
 
@@ -1031,28 +801,10 @@ void QMatrix4x4::translate(const QVector3D& vector)
 */
 void QMatrix4x4::translate(float x, float y)
 {
-    if (flagBits == Identity) {
-        m[3][0] = x;
-        m[3][1] = y;
-    } else if (flagBits == Translation) {
-        m[3][0] += x;
-        m[3][1] += y;
-    } else if (flagBits == Scale) {
-        m[3][0] = m[0][0] * x;
-        m[3][1] = m[1][1] * y;
-    } else if (flagBits == (Translation | Scale)) {
-        m[3][0] += m[0][0] * x;
-        m[3][1] += m[1][1] * y;
-    } else if (flagBits < Rotation) {
-        m[3][0] += m[0][0] * x + m[1][0] * y;
-        m[3][1] += m[0][1] * x + m[1][1] * y;
-    } else {
-        m[3][0] += m[0][0] * x + m[1][0] * y;
-        m[3][1] += m[0][1] * x + m[1][1] * y;
-        m[3][2] += m[0][2] * x + m[1][2] * y;
-        m[3][3] += m[0][3] * x + m[1][3] * y;
-    }
-    flagBits |= Translation;
+    m[3][0] += m[0][0] * x + m[1][0] * y;
+    m[3][1] += m[0][1] * x + m[1][1] * y;
+    m[3][2] += m[0][2] * x + m[1][2] * y;
+    m[3][3] += m[0][3] * x + m[1][3] * y;
 }
 
 /*!
@@ -1065,33 +817,10 @@ void QMatrix4x4::translate(float x, float y)
 */
 void QMatrix4x4::translate(float x, float y, float z)
 {
-    if (flagBits == Identity) {
-        m[3][0] = x;
-        m[3][1] = y;
-        m[3][2] = z;
-    } else if (flagBits == Translation) {
-        m[3][0] += x;
-        m[3][1] += y;
-        m[3][2] += z;
-    } else if (flagBits == Scale) {
-        m[3][0] = m[0][0] * x;
-        m[3][1] = m[1][1] * y;
-        m[3][2] = m[2][2] * z;
-    } else if (flagBits == (Translation | Scale)) {
-        m[3][0] += m[0][0] * x;
-        m[3][1] += m[1][1] * y;
-        m[3][2] += m[2][2] * z;
-    } else if (flagBits < Rotation) {
-        m[3][0] += m[0][0] * x + m[1][0] * y;
-        m[3][1] += m[0][1] * x + m[1][1] * y;
-        m[3][2] += m[2][2] * z;
-    } else {
-        m[3][0] += m[0][0] * x + m[1][0] * y + m[2][0] * z;
-        m[3][1] += m[0][1] * x + m[1][1] * y + m[2][1] * z;
-        m[3][2] += m[0][2] * x + m[1][2] * y + m[2][2] * z;
-        m[3][3] += m[0][3] * x + m[1][3] * y + m[2][3] * z;
-    }
-    flagBits |= Translation;
+    m[3][0] += m[0][0] * x + m[1][0] * y + m[2][0] * z;
+    m[3][1] += m[0][1] * x + m[1][1] * y + m[2][1] * z;
+    m[3][2] += m[0][2] * x + m[1][2] * y + m[2][2] * z;
+    m[3][3] += m[0][3] * x + m[1][3] * y + m[2][3] * z;
 }
 
 #ifndef QT_NO_VECTOR3D
@@ -1152,7 +881,6 @@ void QMatrix4x4::rotate(float angle, float x, float y, float z)
                 m[0][3] = (tmp = m[0][3]) * c + m[1][3] * s;
                 m[1][3] = m[1][3] * c - tmp * s;
 
-                flagBits |= Rotation2D;
                 return;
             }
         } else if (z == 0.0f) {
@@ -1169,7 +897,6 @@ void QMatrix4x4::rotate(float angle, float x, float y, float z)
             m[2][3] = (tmp = m[2][3]) * c + m[0][3] * s;
             m[0][3] = m[0][3] * c - tmp * s;
 
-            flagBits |= Rotation;
             return;
         }
     } else if (y == 0.0f && z == 0.0f) {
@@ -1186,7 +913,6 @@ void QMatrix4x4::rotate(float angle, float x, float y, float z)
         m[1][3] = (tmp = m[1][3]) * c + m[2][3] * s;
         m[2][3] = m[2][3] * c - tmp * s;
 
-        flagBits |= Rotation;
         return;
     }
 
@@ -1217,7 +943,6 @@ void QMatrix4x4::rotate(float angle, float x, float y, float z)
     rot.m[1][3] = 0.0f;
     rot.m[2][3] = 0.0f;
     rot.m[3][3] = 1.0f;
-    rot.flagBits = Rotation;
     *this *= rot;
 }
 
@@ -1241,7 +966,7 @@ void QMatrix4x4::projectedRotate(float angle, float x, float y, float z)
         s = 0.0f;
         c = -1.0f;
     } else {
-        float a = qDegreesToRadians(angle);
+        const float a = qDegreesToRadians(angle);
         c = std::cos(a);
         s = std::sin(a);
     }
@@ -1261,7 +986,6 @@ void QMatrix4x4::projectedRotate(float angle, float x, float y, float z)
                 m[0][3] = (tmp = m[0][3]) * c + m[1][3] * s;
                 m[1][3] = m[1][3] * c - tmp * s;
 
-                flagBits |= Rotation2D;
                 return;
             }
         } else if (z == 0.0f) {
@@ -1272,7 +996,6 @@ void QMatrix4x4::projectedRotate(float angle, float x, float y, float z)
             m[0][1] = m[0][1] * c + m[3][1] * s * inv_dist_to_plane;
             m[0][2] = m[0][2] * c + m[3][2] * s * inv_dist_to_plane;
             m[0][3] = m[0][3] * c + m[3][3] * s * inv_dist_to_plane;
-            flagBits = General;
             return;
         }
     } else if (y == 0.0f && z == 0.0f) {
@@ -1283,7 +1006,6 @@ void QMatrix4x4::projectedRotate(float angle, float x, float y, float z)
         m[1][1] = m[1][1] * c - m[3][1] * s * inv_dist_to_plane;
         m[1][2] = m[1][2] * c - m[3][2] * s * inv_dist_to_plane;
         m[1][3] = m[1][3] * c - m[3][3] * s * inv_dist_to_plane;
-        flagBits = General;
         return;
     }
     double len = double(x) * double(x) +
@@ -1295,7 +1017,7 @@ void QMatrix4x4::projectedRotate(float angle, float x, float y, float z)
         y = float(double(y) / len);
         z = float(double(z) / len);
     }
-    float ic = 1.0f - c;
+    const float ic = 1.0f - c;
     QMatrix4x4 rot(1); // The "1" says to not load the identity.
     rot.m[0][0] = x * x * ic + c;
     rot.m[1][0] = x * y * ic - z * s;
@@ -1313,7 +1035,6 @@ void QMatrix4x4::projectedRotate(float angle, float x, float y, float z)
     rot.m[1][3] = (y * z * ic + x * s) * -inv_dist_to_plane;
     rot.m[2][3] = 0.0f;
     rot.m[3][3] = 1.0f;
-    rot.flagBits = General;
     *this *= rot;
 }
 
@@ -1362,7 +1083,6 @@ void QMatrix4x4::rotate(const QQuaternion& quaternion)
     m.m[1][3] = 0.0f;
     m.m[2][3] = 0.0f;
     m.m[3][3] = 1.0f;
-    m.flagBits = Rotation;
     *this *= m;
 }
 
@@ -1415,9 +1135,9 @@ void QMatrix4x4::ortho(float left, float right, float bottom, float top, float n
         return;
 
     // Construct the projection.
-    float width = right - left;
-    float invheight = top - bottom;
-    float clip = farPlane - nearPlane;
+    const float width = right - left;
+    const float invheight = top - bottom;
+    const float clip = farPlane - nearPlane;
     QMatrix4x4 m(1);
     m.m[0][0] = 2.0f / width;
     m.m[1][0] = 0.0f;
@@ -1435,7 +1155,6 @@ void QMatrix4x4::ortho(float left, float right, float bottom, float top, float n
     m.m[1][3] = 0.0f;
     m.m[2][3] = 0.0f;
     m.m[3][3] = 1.0f;
-    m.flagBits = Translation | Scale;
 
     // Apply the projection.
     *this *= m;
@@ -1457,9 +1176,9 @@ void QMatrix4x4::frustum(float left, float right, float bottom, float top, float
 
     // Construct the projection.
     QMatrix4x4 m(1);
-    float width = right - left;
-    float invheight = top - bottom;
-    float clip = farPlane - nearPlane;
+    const float width = right - left;
+    const float invheight = top - bottom;
+    const float clip = farPlane - nearPlane;
     m.m[0][0] = 2.0f * nearPlane / width;
     m.m[1][0] = 0.0f;
     m.m[2][0] = (left + right) / width;
@@ -1476,7 +1195,6 @@ void QMatrix4x4::frustum(float left, float right, float bottom, float top, float
     m.m[1][3] = 0.0f;
     m.m[2][3] = -1.0f;
     m.m[3][3] = 0.0f;
-    m.flagBits = General;
 
     // Apply the projection.
     *this *= m;
@@ -1500,12 +1218,12 @@ void QMatrix4x4::perspective(float verticalAngle, float aspectRatio, float nearP
 
     // Construct the projection.
     QMatrix4x4 m(1);
-    float radians = qDegreesToRadians(verticalAngle / 2.0f);
-    float sine = std::sin(radians);
+    const float radians = qDegreesToRadians(verticalAngle / 2.0f);
+    const float sine = std::sin(radians);
     if (sine == 0.0f)
         return;
-    float cotan = std::cos(radians) / sine;
-    float clip = farPlane - nearPlane;
+    const float cotan = std::cos(radians) / sine;
+    const float clip = farPlane - nearPlane;
     m.m[0][0] = cotan / aspectRatio;
     m.m[1][0] = 0.0f;
     m.m[2][0] = 0.0f;
@@ -1522,7 +1240,6 @@ void QMatrix4x4::perspective(float verticalAngle, float aspectRatio, float nearP
     m.m[1][3] = 0.0f;
     m.m[2][3] = -1.0f;
     m.m[3][3] = 0.0f;
-    m.flagBits = General;
 
     // Apply the projection.
     *this *= m;
@@ -1566,7 +1283,6 @@ void QMatrix4x4::lookAt(const QVector3D& eye, const QVector3D& center, const QVe
     m.m[1][3] = 0.0f;
     m.m[2][3] = 0.0f;
     m.m[3][3] = 1.0f;
-    m.flagBits = Rotation;
 
     *this *= m;
     translate(-eye);
@@ -1615,7 +1331,6 @@ void QMatrix4x4::viewport(float left, float bottom, float width, float height, f
     m.m[1][3] = 0.0f;
     m.m[2][3] = 0.0f;
     m.m[3][3] = 1.0f;
-    m.flagBits = General;
 
     *this *= m;
 }
@@ -1635,21 +1350,14 @@ void QMatrix4x4::flipCoordinates()
     // Multiplying the y and z coordinates with -1 does NOT flip between right-handed and
     // left-handed coordinate systems, it just rotates 180 degrees around the x axis, so
     // I'm deprecating this function.
-    if (flagBits < Rotation2D) {
-        // Translation | Scale
-        m[1][1] = -m[1][1];
-        m[2][2] = -m[2][2];
-    } else {
-        m[1][0] = -m[1][0];
-        m[1][1] = -m[1][1];
-        m[1][2] = -m[1][2];
-        m[1][3] = -m[1][3];
-        m[2][0] = -m[2][0];
-        m[2][1] = -m[2][1];
-        m[2][2] = -m[2][2];
-        m[2][3] = -m[2][3];
-    }
-    flagBits |= Scale;
+    m[1][0] = -m[1][0];
+    m[1][1] = -m[1][1];
+    m[1][2] = -m[1][2];
+    m[1][3] = -m[1][3];
+    m[2][0] = -m[2][0];
+    m[2][1] = -m[2][1];
+    m[2][2] = -m[2][2];
+    m[2][3] = -m[2][3];
 }
 
 /*!
@@ -1663,26 +1371,6 @@ void QMatrix4x4::copyDataTo(float *values) const
             values[row * 4 + col] = float(m[col][row]);
 }
 
-#if QT_DEPRECATED_SINCE(5, 15)
-/*!
-    \obsolete
-
-    Use toTransform() instead.
-
-    Returns the conventional Qt 2D affine transformation matrix that
-    corresponds to this matrix.  It is assumed that this matrix
-    only contains 2D affine transformation elements.
-
-    \sa toTransform()
-*/
-QMatrix QMatrix4x4::toAffine() const
-{
-    return QMatrix(m[0][0], m[0][1],
-                   m[1][0], m[1][1],
-                   m[3][0], m[3][1]);
-}
-#endif // QT_DEPRECATED_SINCE(5, 15)
-
 /*!
     Returns the conventional Qt 2D transformation matrix that
     corresponds to this matrix.
@@ -1733,7 +1421,7 @@ QTransform QMatrix4x4::toTransform(float distanceToPlane) const
         //      | 0 0 d 1 |
         // where d = -1 / distanceToPlane.  After projection, row 3 and
         // column 3 are dropped to form the final QTransform.
-        float d = 1.0f / distanceToPlane;
+        const float d = 1.0f / distanceToPlane;
         return QTransform(m[0][0], m[0][1], m[0][3] - m[0][2] * d,
                           m[1][0], m[1][1], m[1][3] - m[1][2] * d,
                           m[3][0], m[3][1], m[3][3] - m[3][2] * d);
@@ -1805,38 +1493,16 @@ QTransform QMatrix4x4::toTransform(float distanceToPlane) const
 */
 QRect QMatrix4x4::mapRect(const QRect& rect) const
 {
-    if (flagBits < Scale) {
-        // Translation
-        return QRect(qRound(rect.x() + m[3][0]),
-                     qRound(rect.y() + m[3][1]),
-                     rect.width(), rect.height());
-    } else if (flagBits < Rotation2D) {
-        // Translation | Scale
-        float x = rect.x() * m[0][0] + m[3][0];
-        float y = rect.y() * m[1][1] + m[3][1];
-        float w = rect.width() * m[0][0];
-        float h = rect.height() * m[1][1];
-        if (w < 0) {
-            w = -w;
-            x -= w;
-        }
-        if (h < 0) {
-            h = -h;
-            y -= h;
-        }
-        return QRect(qRound(x), qRound(y), qRound(w), qRound(h));
-    }
+    const QPoint tl = map(rect.topLeft());
+    const QPoint tr = map(QPoint(rect.x() + rect.width(), rect.y()));
+    const QPoint bl = map(QPoint(rect.x(), rect.y() + rect.height()));
+    const QPoint br = map(QPoint(rect.x() + rect.width(),
+                                 rect.y() + rect.height()));
 
-    QPoint tl = map(rect.topLeft());
-    QPoint tr = map(QPoint(rect.x() + rect.width(), rect.y()));
-    QPoint bl = map(QPoint(rect.x(), rect.y() + rect.height()));
-    QPoint br = map(QPoint(rect.x() + rect.width(),
-                           rect.y() + rect.height()));
-
-    int xmin = qMin(qMin(tl.x(), tr.x()), qMin(bl.x(), br.x()));
-    int xmax = qMax(qMax(tl.x(), tr.x()), qMax(bl.x(), br.x()));
-    int ymin = qMin(qMin(tl.y(), tr.y()), qMin(bl.y(), br.y()));
-    int ymax = qMax(qMax(tl.y(), tr.y()), qMax(bl.y(), br.y()));
+    const int xmin = qMin(qMin(tl.x(), tr.x()), qMin(bl.x(), br.x()));
+    const int xmax = qMax(qMax(tl.x(), tr.x()), qMax(bl.x(), br.x()));
+    const int ymin = qMin(qMin(tl.y(), tr.y()), qMin(bl.y(), br.y()));
+    const int ymax = qMax(qMax(tl.y(), tr.y()), qMax(bl.y(), br.y()));
 
     return QRect(xmin, ymin, xmax - xmin, ymax - ymin);
 }
@@ -1851,33 +1517,13 @@ QRect QMatrix4x4::mapRect(const QRect& rect) const
 */
 QRectF QMatrix4x4::mapRect(const QRectF& rect) const
 {
-    if (flagBits < Scale) {
-        // Translation
-        return rect.translated(m[3][0], m[3][1]);
-    } else if (flagBits < Rotation2D) {
-        // Translation | Scale
-        float x = rect.x() * m[0][0] + m[3][0];
-        float y = rect.y() * m[1][1] + m[3][1];
-        float w = rect.width() * m[0][0];
-        float h = rect.height() * m[1][1];
-        if (w < 0) {
-            w = -w;
-            x -= w;
-        }
-        if (h < 0) {
-            h = -h;
-            y -= h;
-        }
-        return QRectF(x, y, w, h);
-    }
-
-    QPointF tl = map(rect.topLeft()); QPointF tr = map(rect.topRight());
-    QPointF bl = map(rect.bottomLeft()); QPointF br = map(rect.bottomRight());
+    const QPointF tl = map(rect.topLeft()); QPointF tr = map(rect.topRight());
+    const QPointF bl = map(rect.bottomLeft()); QPointF br = map(rect.bottomRight());
 
-    float xmin = qMin(qMin(tl.x(), tr.x()), qMin(bl.x(), br.x()));
-    float xmax = qMax(qMax(tl.x(), tr.x()), qMax(bl.x(), br.x()));
-    float ymin = qMin(qMin(tl.y(), tr.y()), qMin(bl.y(), br.y()));
-    float ymax = qMax(qMax(tl.y(), tr.y()), qMax(bl.y(), br.y()));
+    const float xmin = qMin(qMin(tl.x(), tr.x()), qMin(bl.x(), br.x()));
+    const float xmax = qMax(qMax(tl.x(), tr.x()), qMax(bl.x(), br.x()));
+    const float ymin = qMin(qMin(tl.y(), tr.y()), qMin(bl.y(), br.y()));
+    const float ymax = qMax(qMax(tl.y(), tr.y()), qMax(bl.y(), br.y()));
 
     return QRectF(QPointF(xmin, ymin), QPointF(xmax, ymax));
 }
@@ -1935,8 +1581,6 @@ QMatrix4x4 QMatrix4x4::orthonormalInverse() const
     result.m[3][2] = -(result.m[0][2] * m[3][0] + result.m[1][2] * m[3][1] + result.m[2][2] * m[3][2]);
     result.m[3][3] = 1.0f;
 
-    result.flagBits = flagBits;
-
     return result;
 }
 
@@ -1962,54 +1606,6 @@ QMatrix4x4 QMatrix4x4::orthonormalInverse() const
 */
 void QMatrix4x4::optimize()
 {
-    // If the last row is not (0, 0, 0, 1), the matrix is not a special type.
-    flagBits = General;
-    if (m[0][3] != 0 || m[1][3] != 0 || m[2][3] != 0 || m[3][3] != 1)
-        return;
-
-    flagBits &= ~Perspective;
-
-    // If the last column is (0, 0, 0, 1), then there is no translation.
-    if (m[3][0] == 0 && m[3][1] == 0 && m[3][2] == 0)
-        flagBits &= ~Translation;
-
-    // If the two first elements of row 3 and column 3 are 0, then any rotation must be about Z.
-    if (!m[0][2] && !m[1][2] && !m[2][0] && !m[2][1]) {
-        flagBits &= ~Rotation;
-        // If the six non-diagonal elements in the top left 3x3 matrix are 0, there is no rotation.
-        if (!m[0][1] && !m[1][0]) {
-            flagBits &= ~Rotation2D;
-            // Check for identity.
-            if (m[0][0] == 1 && m[1][1] == 1 && m[2][2] == 1)
-                flagBits &= ~Scale;
-        } else {
-            // If the columns are orthonormal and form a right-handed system, then there is no scale.
-            double mm[4][4];
-            copyToDoubles(m, mm);
-            double det = matrixDet2(mm, 0, 1, 0, 1);
-            double lenX = mm[0][0] * mm[0][0] + mm[0][1] * mm[0][1];
-            double lenY = mm[1][0] * mm[1][0] + mm[1][1] * mm[1][1];
-            double lenZ = mm[2][2];
-            if (qFuzzyCompare(det, 1.0) && qFuzzyCompare(lenX, 1.0)
-                    && qFuzzyCompare(lenY, 1.0) && qFuzzyCompare(lenZ, 1.0))
-            {
-                flagBits &= ~Scale;
-            }
-        }
-    } else {
-        // If the columns are orthonormal and form a right-handed system, then there is no scale.
-        double mm[4][4];
-        copyToDoubles(m, mm);
-        double det = matrixDet3(mm, 0, 1, 2, 0, 1, 2);
-        double lenX = mm[0][0] * mm[0][0] + mm[0][1] * mm[0][1] + mm[0][2] * mm[0][2];
-        double lenY = mm[1][0] * mm[1][0] + mm[1][1] * mm[1][1] + mm[1][2] * mm[1][2];
-        double lenZ = mm[2][0] * mm[2][0] + mm[2][1] * mm[2][1] + mm[2][2] * mm[2][2];
-        if (qFuzzyCompare(det, 1.0) && qFuzzyCompare(lenX, 1.0)
-                && qFuzzyCompare(lenY, 1.0) && qFuzzyCompare(lenZ, 1.0))
-        {
-            flagBits &= ~Scale;
-        }
-    }
 }
 
 /*!
@@ -2027,23 +1623,10 @@ QDebug operator<<(QDebug dbg, const QMatrix4x4 &m)
     QDebugStateSaver saver(dbg);
     // Create a string that represents the matrix type.
     QByteArray bits;
-    if (m.flagBits == QMatrix4x4::Identity) {
+    if (m.isIdentity()) {
         bits = "Identity";
-    } else if (m.flagBits == QMatrix4x4::General) {
-        bits = "General";
     } else {
-        if ((m.flagBits & QMatrix4x4::Translation) != 0)
-            bits += "Translation,";
-        if ((m.flagBits & QMatrix4x4::Scale) != 0)
-            bits += "Scale,";
-        if ((m.flagBits & QMatrix4x4::Rotation2D) != 0)
-            bits += "Rotation2D,";
-        if ((m.flagBits & QMatrix4x4::Rotation) != 0)
-            bits += "Rotation,";
-        if ((m.flagBits & QMatrix4x4::Perspective) != 0)
-            bits += "Perspective,";
-        if (bits.size() > 0)
-            bits = bits.left(bits.size() - 1);
+        bits = "General";
     }
 
     // Output in row-major order because it is more human-readable.
diff --git a/src/gui/math3d/qmatrix4x4.h b/src/gui/math3d/qmatrix4x4.h
index 6a726a197c..198a47c51b 100644
--- a/src/gui/math3d/qmatrix4x4.h
+++ b/src/gui/math3d/qmatrix4x4.h
@@ -52,7 +52,6 @@ QT_BEGIN_NAMESPACE
 
 #ifndef QT_NO_MATRIX4X4
 
-class QMatrix;
 class QTransform;
 class QVariant;
 
@@ -60,7 +59,7 @@ class Q_GUI_EXPORT QMatrix4x4
 {
 public:
     inline QMatrix4x4() { setToIdentity(); }
-    explicit QMatrix4x4(Qt::Initialization) : flagBits(General) {}
+    explicit QMatrix4x4(Qt::Initialization) {}
     explicit QMatrix4x4(const float *values);
     inline QMatrix4x4(float m11, float m12, float m13, float m14,
                       float m21, float m22, float m23, float m24,
@@ -72,9 +71,6 @@ public:
 
     QMatrix4x4(const float *values, int cols, int rows);
     QMatrix4x4(const QTransform& transform);
-#if QT_DEPRECATED_SINCE(5, 15)
-    QMatrix4x4(const QMatrix& matrix);
-#endif // QT_DEPRECATED_SINCE(5, 15)
 
     inline const float& operator()(int row, int column) const;
     inline float& operator()(int row, int column);
@@ -158,9 +154,6 @@ public:
 
     void copyDataTo(float *values) const;
 
-#if QT_DEPRECATED_SINCE(5, 15)
-    QT_DEPRECATED_X("Use toTransform()") QMatrix toAffine() const;
-#endif // QT_DEPRECATED_SINCE(5, 15)
     QTransform toTransform() const;
     QTransform toTransform(float distanceToPlane) const;
 
@@ -191,29 +184,16 @@ public:
     friend Q_GUI_EXPORT QDebug operator<<(QDebug dbg, const QMatrix4x4 &m);
 #endif
 
+    void projectedRotate(float angle, float x, float y, float z);
 private:
-    float m[4][4];          // Column-major order to match OpenGL.
-    int flagBits;           // Flag bits from the enum below.
-
-    // When matrices are multiplied, the flag bits are or-ed together.
-    enum {
-        Identity        = 0x0000, // Identity matrix
-        Translation     = 0x0001, // Contains a translation
-        Scale           = 0x0002, // Contains a scale
-        Rotation2D      = 0x0004, // Contains a rotation about the Z axis
-        Rotation        = 0x0008, // Contains an arbitrary rotation
-        Perspective     = 0x0010, // Last row is different from (0, 0, 0, 1)
-        General         = 0x001f  // General matrix, unknown contents
-    };
+
+    // No other members are allowed in order to ensure a size of 16 * sizeof(float)
+    float m[4][4]; // Column-major order to match OpenGL.
 
     // Construct without initializing identity matrix.
     explicit QMatrix4x4(int) { }
 
     QMatrix4x4 orthonormalInverse() const;
-
-    void projectedRotate(float angle, float x, float y, float z);
-
-    friend class QGraphicsRotation;
 };
 
 QT_WARNING_PUSH
@@ -232,7 +212,6 @@ inline QMatrix4x4::QMatrix4x4
     m[1][0] = m12; m[1][1] = m22; m[1][2] = m32; m[1][3] = m42;
     m[2][0] = m13; m[2][1] = m23; m[2][2] = m33; m[2][3] = m43;
     m[3][0] = m14; m[3][1] = m24; m[3][2] = m34; m[3][3] = m44;
-    flagBits = General;
 }
 
 template <int N, int M>
@@ -250,7 +229,6 @@ Q_INLINE_TEMPLATE QMatrix4x4::QMatrix4x4
                 m[matrixCol][matrixRow] = 0.0f;
         }
     }
-    flagBits = General;
 }
 
 template <int N, int M>
@@ -280,7 +258,6 @@ inline const float& QMatrix4x4::operator()(int aRow, int aColumn) const
 inline float& QMatrix4x4::operator()(int aRow, int aColumn)
 {
     Q_ASSERT(aRow >= 0 && aRow < 4 && aColumn >= 0 && aColumn < 4);
-    flagBits = General;
     return m[aColumn][aRow];
 }
 
@@ -298,7 +275,6 @@ inline void QMatrix4x4::setColumn(int index, const QVector4D& value)
     m[index][1] = value.y();
     m[index][2] = value.z();
     m[index][3] = value.w();
-    flagBits = General;
 }
 
 inline QVector4D QMatrix4x4::row(int index) const
@@ -314,7 +290,6 @@ inline void QMatrix4x4::setRow(int index, const QVector4D& value)
     m[1][index] = value.y();
     m[2][index] = value.z();
     m[3][index] = value.w();
-    flagBits = General;
 }
 #endif
 
@@ -327,8 +302,6 @@ inline bool QMatrix4x4::isAffine() const
 
 inline bool QMatrix4x4::isIdentity() const
 {
-    if (flagBits == Identity)
-        return true;
     if (m[0][0] != 1.0f || m[0][1] != 0.0f || m[0][2] != 0.0f)
         return false;
     if (m[0][3] != 0.0f || m[1][0] != 0.0f || m[1][1] != 1.0f)
@@ -360,7 +333,6 @@ inline void QMatrix4x4::setToIdentity()
     m[3][1] = 0.0f;
     m[3][2] = 0.0f;
     m[3][3] = 1.0f;
-    flagBits = Identity;
 }
 
 inline void QMatrix4x4::fill(float value)
@@ -381,7 +353,6 @@ inline void QMatrix4x4::fill(float value)
     m[3][1] = value;
     m[3][2] = value;
     m[3][3] = value;
-    flagBits = General;
 }
 
 inline QMatrix4x4& QMatrix4x4::operator+=(const QMatrix4x4& other)
@@ -402,7 +373,6 @@ inline QMatrix4x4& QMatrix4x4::operator+=(const QMatrix4x4& other)
     m[3][1] += other.m[3][1];
     m[3][2] += other.m[3][2];
     m[3][3] += other.m[3][3];
-    flagBits = General;
     return *this;
 }
 
@@ -424,25 +394,12 @@ inline QMatrix4x4& QMatrix4x4::operator-=(const QMatrix4x4& other)
     m[3][1] -= other.m[3][1];
     m[3][2] -= other.m[3][2];
     m[3][3] -= other.m[3][3];
-    flagBits = General;
     return *this;
 }
 
 inline QMatrix4x4& QMatrix4x4::operator*=(const QMatrix4x4& o)
 {
     const QMatrix4x4 other = o; // prevent aliasing when &o == this ### Qt 6: take o by value
-    flagBits |= other.flagBits;
-
-    if (flagBits < Rotation2D) {
-        m[3][0] += m[0][0] * other.m[3][0];
-        m[3][1] += m[1][1] * other.m[3][1];
-        m[3][2] += m[2][2] * other.m[3][2];
-
-        m[0][0] *= other.m[0][0];
-        m[1][1] *= other.m[1][1];
-        m[2][2] *= other.m[2][2];
-        return *this;
-    }
 
     float m0, m1, m2;
     m0 = m[0][0] * other.m[0][0]
@@ -545,7 +502,6 @@ inline QMatrix4x4& QMatrix4x4::operator*=(float factor)
     m[3][1] *= factor;
     m[3][2] *= factor;
     m[3][3] *= factor;
-    flagBits = General;
     return *this;
 }
 
@@ -608,7 +564,6 @@ inline QMatrix4x4 operator+(const QMatrix4x4& m1, const QMatrix4x4& m2)
     m.m[3][1] = m1.m[3][1] + m2.m[3][1];
     m.m[3][2] = m1.m[3][2] + m2.m[3][2];
     m.m[3][3] = m1.m[3][3] + m2.m[3][3];
-    m.flagBits = QMatrix4x4::General;
     return m;
 }
 
@@ -631,26 +586,11 @@ inline QMatrix4x4 operator-(const QMatrix4x4& m1, const QMatrix4x4& m2)
     m.m[3][1] = m1.m[3][1] - m2.m[3][1];
     m.m[3][2] = m1.m[3][2] - m2.m[3][2];
     m.m[3][3] = m1.m[3][3] - m2.m[3][3];
-    m.flagBits = QMatrix4x4::General;
     return m;
 }
 
 inline QMatrix4x4 operator*(const QMatrix4x4& m1, const QMatrix4x4& m2)
 {
-    int flagBits = m1.flagBits | m2.flagBits;
-    if (flagBits < QMatrix4x4::Rotation2D) {
-        QMatrix4x4 m = m1;
-        m.m[3][0] += m.m[0][0] * m2.m[3][0];
-        m.m[3][1] += m.m[1][1] * m2.m[3][1];
-        m.m[3][2] += m.m[2][2] * m2.m[3][2];
-
-        m.m[0][0] *= m2.m[0][0];
-        m.m[1][1] *= m2.m[1][1];
-        m.m[2][2] *= m2.m[2][2];
-        m.flagBits = flagBits;
-        return m;
-    }
-
     QMatrix4x4 m(1);
     m.m[0][0] = m1.m[0][0] * m2.m[0][0]
               + m1.m[1][0] * m2.m[0][1]
@@ -719,7 +659,6 @@ inline QMatrix4x4 operator*(const QMatrix4x4& m1, const QMatrix4x4& m2)
               + m1.m[1][3] * m2.m[3][1]
               + m1.m[2][3] * m2.m[3][2]
               + m1.m[3][3] * m2.m[3][3];
-    m.flagBits = flagBits;
     return m;
 }
 
@@ -727,20 +666,19 @@ inline QMatrix4x4 operator*(const QMatrix4x4& m1, const QMatrix4x4& m2)
 
 inline QVector3D operator*(const QVector3D& vector, const QMatrix4x4& matrix)
 {
-    float x, y, z, w;
-    x = vector.x() * matrix.m[0][0] +
+    const float x = vector.x() * matrix.m[0][0] +
         vector.y() * matrix.m[0][1] +
         vector.z() * matrix.m[0][2] +
         matrix.m[0][3];
-    y = vector.x() * matrix.m[1][0] +
+    const float y = vector.x() * matrix.m[1][0] +
         vector.y() * matrix.m[1][1] +
         vector.z() * matrix.m[1][2] +
         matrix.m[1][3];
-    z = vector.x() * matrix.m[2][0] +
+    const float z = vector.x() * matrix.m[2][0] +
         vector.y() * matrix.m[2][1] +
         vector.z() * matrix.m[2][2] +
         matrix.m[2][3];
-    w = vector.x() * matrix.m[3][0] +
+    const float w = vector.x() * matrix.m[3][0] +
         vector.y() * matrix.m[3][1] +
         vector.z() * matrix.m[3][2] +
         matrix.m[3][3];
@@ -752,41 +690,29 @@ inline QVector3D operator*(const QVector3D& vector, const QMatrix4x4& matrix)
 
 inline QVector3D operator*(const QMatrix4x4& matrix, const QVector3D& vector)
 {
-    float x, y, z, w;
-    if (matrix.flagBits == QMatrix4x4::Identity) {
+    if (matrix.isIdentity())
         return vector;
-    } else if (matrix.flagBits < QMatrix4x4::Rotation2D) {
-        // Translation | Scale
-        return QVector3D(vector.x() * matrix.m[0][0] + matrix.m[3][0],
-                         vector.y() * matrix.m[1][1] + matrix.m[3][1],
-                         vector.z() * matrix.m[2][2] + matrix.m[3][2]);
-    } else if (matrix.flagBits < QMatrix4x4::Rotation) {
-        // Translation | Scale | Rotation2D
-        return QVector3D(vector.x() * matrix.m[0][0] + vector.y() * matrix.m[1][0] + matrix.m[3][0],
-                         vector.x() * matrix.m[0][1] + vector.y() * matrix.m[1][1] + matrix.m[3][1],
-                         vector.z() * matrix.m[2][2] + matrix.m[3][2]);
-    } else {
-        x = vector.x() * matrix.m[0][0] +
-            vector.y() * matrix.m[1][0] +
-            vector.z() * matrix.m[2][0] +
-            matrix.m[3][0];
-        y = vector.x() * matrix.m[0][1] +
-            vector.y() * matrix.m[1][1] +
-            vector.z() * matrix.m[2][1] +
-            matrix.m[3][1];
-        z = vector.x() * matrix.m[0][2] +
-            vector.y() * matrix.m[1][2] +
-            vector.z() * matrix.m[2][2] +
-            matrix.m[3][2];
-        w = vector.x() * matrix.m[0][3] +
-            vector.y() * matrix.m[1][3] +
-            vector.z() * matrix.m[2][3] +
-            matrix.m[3][3];
-        if (w == 1.0f)
-            return QVector3D(x, y, z);
-        else
-            return QVector3D(x / w, y / w, z / w);
-    }
+
+    const float x = vector.x() * matrix.m[0][0] +
+        vector.y() * matrix.m[1][0] +
+        vector.z() * matrix.m[2][0] +
+        matrix.m[3][0];
+    const float y = vector.x() * matrix.m[0][1] +
+        vector.y() * matrix.m[1][1] +
+        vector.z() * matrix.m[2][1] +
+        matrix.m[3][1];
+    const float z = vector.x() * matrix.m[0][2] +
+        vector.y() * matrix.m[1][2] +
+        vector.z() * matrix.m[2][2] +
+        matrix.m[3][2];
+    const float w = vector.x() * matrix.m[0][3] +
+        vector.y() * matrix.m[1][3] +
+        vector.z() * matrix.m[2][3] +
+        matrix.m[3][3];
+    if (w == 1.0f)
+        return QVector3D(x, y, z);
+    else
+        return QVector3D(x / w, y / w, z / w);
 }
 
 #endif
@@ -795,20 +721,19 @@ inline QVector3D operator*(const QMatrix4x4& matrix, const QVector3D& vector)
 
 inline QVector4D operator*(const QVector4D& vector, const QMatrix4x4& matrix)
 {
-    float x, y, z, w;
-    x = vector.x() * matrix.m[0][0] +
+    const float x = vector.x() * matrix.m[0][0] +
         vector.y() * matrix.m[0][1] +
         vector.z() * matrix.m[0][2] +
         vector.w() * matrix.m[0][3];
-    y = vector.x() * matrix.m[1][0] +
+    const float y = vector.x() * matrix.m[1][0] +
         vector.y() * matrix.m[1][1] +
         vector.z() * matrix.m[1][2] +
         vector.w() * matrix.m[1][3];
-    z = vector.x() * matrix.m[2][0] +
+    const float z = vector.x() * matrix.m[2][0] +
         vector.y() * matrix.m[2][1] +
         vector.z() * matrix.m[2][2] +
         vector.w() * matrix.m[2][3];
-    w = vector.x() * matrix.m[3][0] +
+    const float w = vector.x() * matrix.m[3][0] +
         vector.y() * matrix.m[3][1] +
         vector.z() * matrix.m[3][2] +
         vector.w() * matrix.m[3][3];
@@ -817,20 +742,19 @@ inline QVector4D operator*(const QVector4D& vector, const QMatrix4x4& matrix)
 
 inline QVector4D operator*(const QMatrix4x4& matrix, const QVector4D& vector)
 {
-    float x, y, z, w;
-    x = vector.x() * matrix.m[0][0] +
+    const float x = vector.x() * matrix.m[0][0] +
         vector.y() * matrix.m[1][0] +
         vector.z() * matrix.m[2][0] +
         vector.w() * matrix.m[3][0];
-    y = vector.x() * matrix.m[0][1] +
+    const float y = vector.x() * matrix.m[0][1] +
         vector.y() * matrix.m[1][1] +
         vector.z() * matrix.m[2][1] +
         vector.w() * matrix.m[3][1];
-    z = vector.x() * matrix.m[0][2] +
+    const float z = vector.x() * matrix.m[0][2] +
         vector.y() * matrix.m[1][2] +
         vector.z() * matrix.m[2][2] +
         vector.w() * matrix.m[3][2];
-    w = vector.x() * matrix.m[0][3] +
+    const float w = vector.x() * matrix.m[0][3] +
         vector.y() * matrix.m[1][3] +
         vector.z() * matrix.m[2][3] +
         vector.w() * matrix.m[3][3];
@@ -841,17 +765,15 @@ inline QVector4D operator*(const QMatrix4x4& matrix, const QVector4D& vector)
 
 inline QPoint operator*(const QPoint& point, const QMatrix4x4& matrix)
 {
-    float xin, yin;
-    float x, y, w;
-    xin = point.x();
-    yin = point.y();
-    x = xin * matrix.m[0][0] +
+    const float xin = point.x();
+    const float yin = point.y();
+    const float x = xin * matrix.m[0][0] +
         yin * matrix.m[0][1] +
         matrix.m[0][3];
-    y = xin * matrix.m[1][0] +
+    const float y = xin * matrix.m[1][0] +
         yin * matrix.m[1][1] +
         matrix.m[1][3];
-    w = xin * matrix.m[3][0] +
+    const float w = xin * matrix.m[3][0] +
         yin * matrix.m[3][1] +
         matrix.m[3][3];
     if (w == 1.0f)
@@ -862,17 +784,15 @@ inline QPoint operator*(const QPoint& point, const QMatrix4x4& matrix)
 
 inline QPointF operator*(const QPointF& point, const QMatrix4x4& matrix)
 {
-    float xin, yin;
-    float x, y, w;
-    xin = float(point.x());
-    yin = float(point.y());
-    x = xin * matrix.m[0][0] +
+    const float xin = float(point.x());
+    const float yin = float(point.y());
+    const float x = xin * matrix.m[0][0] +
         yin * matrix.m[0][1] +
         matrix.m[0][3];
-    y = xin * matrix.m[1][0] +
+    const float y = xin * matrix.m[1][0] +
         yin * matrix.m[1][1] +
         matrix.m[1][3];
-    w = xin * matrix.m[3][0] +
+    const float w = xin * matrix.m[3][0] +
         yin * matrix.m[3][1] +
         matrix.m[3][3];
     if (w == 1.0f) {
@@ -884,69 +804,46 @@ inline QPointF operator*(const QPointF& point, const QMatrix4x4& matrix)
 
 inline QPoint operator*(const QMatrix4x4& matrix, const QPoint& point)
 {
-    float xin, yin;
-    float x, y, w;
-    xin = point.x();
-    yin = point.y();
-    if (matrix.flagBits == QMatrix4x4::Identity) {
+    if (matrix.isIdentity())
         return point;
-    } else if (matrix.flagBits < QMatrix4x4::Rotation2D) {
-        // Translation | Scale
-        return QPoint(qRound(xin * matrix.m[0][0] + matrix.m[3][0]),
-                      qRound(yin * matrix.m[1][1] + matrix.m[3][1]));
-    } else if (matrix.flagBits < QMatrix4x4::Perspective) {
-        return QPoint(qRound(xin * matrix.m[0][0] + yin * matrix.m[1][0] + matrix.m[3][0]),
-                      qRound(xin * matrix.m[0][1] + yin * matrix.m[1][1] + matrix.m[3][1]));
-    } else {
-        x = xin * matrix.m[0][0] +
-            yin * matrix.m[1][0] +
-            matrix.m[3][0];
-        y = xin * matrix.m[0][1] +
-            yin * matrix.m[1][1] +
-            matrix.m[3][1];
-        w = xin * matrix.m[0][3] +
-            yin * matrix.m[1][3] +
-            matrix.m[3][3];
-        if (w == 1.0f)
-            return QPoint(qRound(x), qRound(y));
-        else
-            return QPoint(qRound(x / w), qRound(y / w));
-    }
+
+    const float xin = point.x();
+    const float yin = point.y();
+    const float x = xin * matrix.m[0][0] +
+                    yin * matrix.m[1][0] +
+                    matrix.m[3][0];
+    const float y = xin * matrix.m[0][1] +
+                    yin * matrix.m[1][1] +
+                    matrix.m[3][1];
+    const float w = xin * matrix.m[0][3] +
+                    yin * matrix.m[1][3] +
+                    matrix.m[3][3];
+    if (w == 1.0f)
+        return QPoint(qRound(x), qRound(y));
+
+    return QPoint(qRound(x / w), qRound(y / w));
 }
 
 inline QPointF operator*(const QMatrix4x4& matrix, const QPointF& point)
 {
-    qreal xin, yin;
-    qreal x, y, w;
-    xin = point.x();
-    yin = point.y();
-    if (matrix.flagBits == QMatrix4x4::Identity) {
+    if (matrix.isIdentity())
         return point;
-    } else if (matrix.flagBits < QMatrix4x4::Rotation2D) {
-        // Translation | Scale
-        return QPointF(xin * qreal(matrix.m[0][0]) + qreal(matrix.m[3][0]),
-                       yin * qreal(matrix.m[1][1]) + qreal(matrix.m[3][1]));
-    } else if (matrix.flagBits < QMatrix4x4::Perspective) {
-        return QPointF(xin * qreal(matrix.m[0][0]) + yin * qreal(matrix.m[1][0]) +
-                       qreal(matrix.m[3][0]),
-                       xin * qreal(matrix.m[0][1]) + yin * qreal(matrix.m[1][1]) +
-                       qreal(matrix.m[3][1]));
-    } else {
-        x = xin * qreal(matrix.m[0][0]) +
+
+    const qreal xin = point.x();
+    const qreal yin = point.y();
+    const qreal x = xin * qreal(matrix.m[0][0]) +
             yin * qreal(matrix.m[1][0]) +
             qreal(matrix.m[3][0]);
-        y = xin * qreal(matrix.m[0][1]) +
+    const qreal y = xin * qreal(matrix.m[0][1]) +
             yin * qreal(matrix.m[1][1]) +
             qreal(matrix.m[3][1]);
-        w = xin * qreal(matrix.m[0][3]) +
+    const qreal w = xin * qreal(matrix.m[0][3]) +
             yin * qreal(matrix.m[1][3]) +
             qreal(matrix.m[3][3]);
-        if (w == 1.0) {
-            return QPointF(qreal(x), qreal(y));
-        } else {
-            return QPointF(qreal(x / w), qreal(y / w));
-        }
-    }
+    if (w == 1.0)
+        return QPointF(qreal(x), qreal(y));
+
+    return QPointF(qreal(x / w), qreal(y / w));
 }
 
 inline QMatrix4x4 operator-(const QMatrix4x4& matrix)
@@ -968,7 +865,6 @@ inline QMatrix4x4 operator-(const QMatrix4x4& matrix)
     m.m[3][1] = -matrix.m[3][1];
     m.m[3][2] = -matrix.m[3][2];
     m.m[3][3] = -matrix.m[3][3];
-    m.flagBits = QMatrix4x4::General;
     return m;
 }
 
@@ -991,7 +887,6 @@ inline QMatrix4x4 operator*(float factor, const QMatrix4x4& matrix)
     m.m[3][1] = matrix.m[3][1] * factor;
     m.m[3][2] = matrix.m[3][2] * factor;
     m.m[3][3] = matrix.m[3][3] * factor;
-    m.flagBits = QMatrix4x4::General;
     return m;
 }
 
@@ -1014,7 +909,6 @@ inline QMatrix4x4 operator*(const QMatrix4x4& matrix, float factor)
     m.m[3][1] = matrix.m[3][1] * factor;
     m.m[3][2] = matrix.m[3][2] * factor;
     m.m[3][3] = matrix.m[3][3] * factor;
-    m.flagBits = QMatrix4x4::General;
     return m;
 }
 
@@ -1057,25 +951,9 @@ inline QVector3D QMatrix4x4::map(const QVector3D& point) const
 
 inline QVector3D QMatrix4x4::mapVector(const QVector3D& vector) const
 {
-    if (flagBits < Scale) {
-        // Translation
-        return vector;
-    } else if (flagBits < Rotation2D) {
-        // Translation | Scale
-        return QVector3D(vector.x() * m[0][0],
-                         vector.y() * m[1][1],
-                         vector.z() * m[2][2]);
-    } else {
-        return QVector3D(vector.x() * m[0][0] +
-                         vector.y() * m[1][0] +
-                         vector.z() * m[2][0],
-                         vector.x() * m[0][1] +
-                         vector.y() * m[1][1] +
-                         vector.z() * m[2][1],
-                         vector.x() * m[0][2] +
-                         vector.y() * m[1][2] +
-                         vector.z() * m[2][2]);
-    }
+    return QVector3D(vector.x() * m[0][0] + vector.y() * m[1][0] + vector.z() * m[2][0],
+                     vector.x() * m[0][1] + vector.y() * m[1][1] + vector.z() * m[2][1],
+                     vector.x() * m[0][2] + vector.y() * m[1][2] + vector.z() * m[2][2]);
 }
 
 #endif
@@ -1093,7 +971,6 @@ inline float *QMatrix4x4::data()
 {
     // We have to assume that the caller will modify the matrix elements,
     // so we flip it over to "General" mode.
-    flagBits = General;
     return *m;
 }
 
diff --git a/src/gui/opengl/opengl.pri b/src/gui/opengl/opengl.pri
index 24758afdeb..2ca3809b4b 100644
--- a/src/gui/opengl/opengl.pri
+++ b/src/gui/opengl/opengl.pri
@@ -8,57 +8,18 @@ qtConfig(opengl) {
     HEADERS += opengl/qopengl.h \
                opengl/qopengl_p.h \
                opengl/qopenglfunctions.h \
-               opengl/qopenglframebufferobject.h  \
-               opengl/qopenglframebufferobject_p.h  \
-               opengl/qopenglpaintdevice.h \
-               opengl/qopenglpaintdevice_p.h \
-               opengl/qopenglbuffer.h \
-               opengl/qopenglshaderprogram.h \
                opengl/qopenglextensions_p.h \
-               opengl/qopenglgradientcache_p.h \
-               opengl/qopengltexturecache_p.h \
-               opengl/qopenglengineshadermanager_p.h \
-               opengl/qopengl2pexvertexarray_p.h \
-               opengl/qopenglpaintengine_p.h \
-               opengl/qopenglengineshadersource_p.h \
-               opengl/qopenglcustomshaderstage_p.h \
-               opengl/qopengltextureglyphcache_p.h \
-               opengl/qopenglshadercache_p.h \
                opengl/qopenglversionfunctions.h \
                opengl/qopenglversionfunctionsfactory_p.h \
-               opengl/qopenglvertexarrayobject.h \
-               opengl/qopengldebug.h \
-               opengl/qopengltextureblitter.h \
-               opengl/qopengltexture.h \
-               opengl/qopengltexture_p.h \
-               opengl/qopengltexturehelper_p.h \
-               opengl/qopengltextureuploader_p.h \
-               opengl/qopenglpixeltransferoptions.h \
+               opengl/qopenglversionprofile.h \
                opengl/qopenglextrafunctions.h \
                opengl/qopenglprogrambinarycache_p.h
 
     SOURCES += opengl/qopengl.cpp \
                opengl/qopenglfunctions.cpp \
-               opengl/qopenglframebufferobject.cpp \
-               opengl/qopenglpaintdevice.cpp \
-               opengl/qopenglbuffer.cpp \
-               opengl/qopenglshaderprogram.cpp \
-               opengl/qopenglgradientcache.cpp \
-               opengl/qopengltexturecache.cpp \
-               opengl/qopenglengineshadermanager.cpp \
-               opengl/qopengl2pexvertexarray.cpp \
-               opengl/qopenglpaintengine.cpp \
-               opengl/qopenglcustomshaderstage.cpp \
-               opengl/qopengltextureglyphcache.cpp \
                opengl/qopenglversionfunctions.cpp \
                opengl/qopenglversionfunctionsfactory.cpp \
-               opengl/qopenglvertexarrayobject.cpp \
-               opengl/qopengldebug.cpp \
-               opengl/qopengltextureblitter.cpp \
-               opengl/qopengltexture.cpp \
-               opengl/qopengltexturehelper.cpp \
-               opengl/qopengltextureuploader.cpp \
-               opengl/qopenglpixeltransferoptions.cpp \
+               opengl/qopenglversionprofile.cpp \
                opengl/qopenglprogrambinarycache.cpp
 
     !qtConfig(opengles2) {
@@ -87,9 +48,7 @@ qtConfig(opengl) {
                    opengl/qopenglfunctions_4_2_compatibility.h \
                    opengl/qopenglfunctions_4_3_compatibility.h \
                    opengl/qopenglfunctions_4_4_compatibility.h \
-                   opengl/qopenglfunctions_4_5_compatibility.h \
-                   opengl/qopenglqueryhelper_p.h \
-                   opengl/qopengltimerquery.h
+                   opengl/qopenglfunctions_4_5_compatibility.h
 
         SOURCES += opengl/qopenglfunctions_1_0.cpp \
                    opengl/qopenglfunctions_1_1.cpp \
@@ -116,8 +75,7 @@ qtConfig(opengl) {
                    opengl/qopenglfunctions_4_2_compatibility.cpp \
                    opengl/qopenglfunctions_4_3_compatibility.cpp \
                    opengl/qopenglfunctions_4_4_compatibility.cpp \
-                   opengl/qopenglfunctions_4_5_compatibility.cpp \
-                   opengl/qopengltimerquery.cpp
+                   opengl/qopenglfunctions_4_5_compatibility.cpp
     }
 
     qtConfig(opengles2) {
diff --git a/src/gui/opengl/qopengl2pexvertexarray.cpp b/src/gui/opengl/qopengl2pexvertexarray.cpp
deleted file mode 100644
index 04781f63c7..0000000000
--- a/src/gui/opengl/qopengl2pexvertexarray.cpp
+++ /dev/null
@@ -1,173 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtGui module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qopengl2pexvertexarray_p.h"
-
-#include <private/qbezier_p.h>
-
-QT_BEGIN_NAMESPACE
-
-void QOpenGL2PEXVertexArray::clear()
-{
-    vertexArray.reset();
-    vertexArrayStops.reset();
-    boundingRectDirty = true;
-}
-
-
-QOpenGLRect QOpenGL2PEXVertexArray::boundingRect() const
-{
-    if (boundingRectDirty)
-        return QOpenGLRect(0.0, 0.0, 0.0, 0.0);
-    else
-        return QOpenGLRect(minX, minY, maxX, maxY);
-}
-
-void QOpenGL2PEXVertexArray::addClosingLine(int index)
-{
-    QPointF point(vertexArray.at(index));
-    if (point != QPointF(vertexArray.last()))
-        vertexArray.add(point);
-}
-
-void QOpenGL2PEXVertexArray::addCentroid(const QVectorPath &path, int subPathIndex)
-{
-    const QPointF *const points = reinterpret_cast<const QPointF *>(path.points());
-    const QPainterPath::ElementType *const elements = path.elements();
-
-    QPointF sum = points[subPathIndex];
-    int count = 1;
-
-    for (int i = subPathIndex + 1; i < path.elementCount() && (!elements || elements[i] != QPainterPath::MoveToElement); ++i) {
-        sum += points[i];
-        ++count;
-    }
-
-    const QPointF centroid = sum / qreal(count);
-    vertexArray.add(centroid);
-}
-
-void QOpenGL2PEXVertexArray::addPath(const QVectorPath &path, GLfloat curveInverseScale, bool outline)
-{
-    const QPointF* const points = reinterpret_cast<const QPointF*>(path.points());
-    const QPainterPath::ElementType* const elements = path.elements();
-
-    if (boundingRectDirty) {
-        minX = maxX = points[0].x();
-        minY = maxY = points[0].y();
-        boundingRectDirty = false;
-    }
-
-    if (!outline && !path.isConvex())
-        addCentroid(path, 0);
-
-    int lastMoveTo = vertexArray.size();
-    vertexArray.add(points[0]); // The first element is always a moveTo
-
-    do {
-        if (!elements) {
-//             qDebug("QVectorPath has no elements");
-            // If the path has a null elements pointer, the elements implicitly
-            // start with a moveTo (already added) and continue with lineTos:
-            for (int i=1; i<path.elementCount(); ++i)
-                lineToArray(points[i].x(), points[i].y());
-
-            break;
-        }
-//         qDebug("QVectorPath has element types");
-
-        for (int i=1; i<path.elementCount(); ++i) {
-            switch (elements[i]) {
-            case QPainterPath::MoveToElement:
-                if (!outline)
-                    addClosingLine(lastMoveTo);
-//                qDebug("element[%d] is a MoveToElement", i);
-                vertexArrayStops.add(vertexArray.size());
-                if (!outline) {
-                    if (!path.isConvex()) addCentroid(path, i);
-                    lastMoveTo = vertexArray.size();
-                }
-                lineToArray(points[i].x(), points[i].y()); // Add the moveTo as a new vertex
-                break;
-            case QPainterPath::LineToElement:
-//                qDebug("element[%d] is a LineToElement", i);
-                lineToArray(points[i].x(), points[i].y());
-                break;
-            case QPainterPath::CurveToElement: {
-                QBezier b = QBezier::fromPoints(*(((const QPointF *) points) + i - 1),
-                                                points[i],
-                                                points[i+1],
-                                                points[i+2]);
-                QRectF bounds = b.bounds();
-                // threshold based on same algorithm as in qtriangulatingstroker.cpp
-                int threshold = qMin<float>(64, qMax(bounds.width(), bounds.height()) * 3.14f / (curveInverseScale * 6));
-                if (threshold < 3) threshold = 3;
-                qreal one_over_threshold_minus_1 = qreal(1) / (threshold - 1);
-                for (int t=0; t<threshold; ++t) {
-                    QPointF pt = b.pointAt(t * one_over_threshold_minus_1);
-                    lineToArray(pt.x(), pt.y());
-                }
-                i += 2;
-                break; }
-            default:
-                break;
-            }
-        }
-    } while (0);
-
-    if (!outline)
-        addClosingLine(lastMoveTo);
-    vertexArrayStops.add(vertexArray.size());
-}
-
-void QOpenGL2PEXVertexArray::lineToArray(const GLfloat x, const GLfloat y)
-{
-    vertexArray.add(QOpenGLPoint(x, y));
-
-    if (x > maxX)
-        maxX = x;
-    else if (x < minX)
-        minX = x;
-    if (y > maxY)
-        maxY = y;
-    else if (y < minY)
-        minY = y;
-}
-
-QT_END_NAMESPACE
diff --git a/src/gui/opengl/qopengl2pexvertexarray_p.h b/src/gui/opengl/qopengl2pexvertexarray_p.h
deleted file mode 100644
index 5dc060ff3d..0000000000
--- a/src/gui/opengl/qopengl2pexvertexarray_p.h
+++ /dev/null
@@ -1,168 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtGui module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#ifndef QOPENGL2PEXVERTEXARRAY_P_H
-#define QOPENGL2PEXVERTEXARRAY_P_H
-
-#include <QtGui/private/qtguiglobal_p.h>
-#include <QRectF>
-
-#include <private/qdatabuffer_p.h>
-#include <private/qvectorpath_p.h>
-#include <private/qopenglcontext_p.h>
-
-QT_BEGIN_NAMESPACE
-
-class QOpenGLPoint
-{
-public:
-    QOpenGLPoint(GLfloat new_x, GLfloat new_y) :
-        x(new_x), y(new_y) {};
-
-    QOpenGLPoint(const QPointF &p) :
-        x(p.x()), y(p.y()) {};
-
-    QOpenGLPoint(const QPointF* p) :
-        x(p->x()), y(p->y()) {};
-
-    GLfloat x;
-    GLfloat y;
-
-    operator QPointF() {return QPointF(x,y);}
-    operator QPointF() const {return QPointF(x,y);}
-};
-
-struct QOpenGLRect
-{
-    QOpenGLRect(const QRectF &r)
-        :  left(r.left()), top(r.top()), right(r.right()), bottom(r.bottom()) {}
-
-    QOpenGLRect(GLfloat l, GLfloat t, GLfloat r, GLfloat b)
-        : left(l), top(t), right(r), bottom(b) {}
-
-    GLfloat left;
-    GLfloat top;
-    GLfloat right;
-    GLfloat bottom;
-
-    operator QRectF() const {return QRectF(left, top, right-left, bottom-top);}
-};
-
-class QOpenGL2PEXVertexArray
-{
-public:
-    QOpenGL2PEXVertexArray() :
-        vertexArray(0), vertexArrayStops(0),
-        maxX(-2e10), maxY(-2e10), minX(2e10), minY(2e10),
-        boundingRectDirty(true)
-    { }
-
-    inline void addRect(const QRectF &rect)
-    {
-        qreal top = rect.top();
-        qreal left = rect.left();
-        qreal bottom = rect.bottom();
-        qreal right = rect.right();
-
-        vertexArray << QOpenGLPoint(left, top)
-                    << QOpenGLPoint(right, top)
-                    << QOpenGLPoint(right, bottom)
-                    << QOpenGLPoint(right, bottom)
-                    << QOpenGLPoint(left, bottom)
-                    << QOpenGLPoint(left, top);
-    }
-
-    inline void addQuad(const QRectF &rect)
-    {
-        qreal top = rect.top();
-        qreal left = rect.left();
-        qreal bottom = rect.bottom();
-        qreal right = rect.right();
-
-        vertexArray << QOpenGLPoint(left, top)
-                    << QOpenGLPoint(right, top)
-                    << QOpenGLPoint(left, bottom)
-                    << QOpenGLPoint(right, bottom);
-
-    }
-
-    inline void addVertex(const GLfloat x, const GLfloat y)
-    {
-        vertexArray.add(QOpenGLPoint(x, y));
-    }
-
-    void addPath(const QVectorPath &path, GLfloat curveInverseScale, bool outline = true);
-    void clear();
-
-    QOpenGLPoint*        data() {return vertexArray.data();}
-    int *stops() const { return vertexArrayStops.data(); }
-    int stopCount() const { return vertexArrayStops.size(); }
-    QOpenGLRect         boundingRect() const;
-
-    int vertexCount() const { return vertexArray.size(); }
-
-    void lineToArray(const GLfloat x, const GLfloat y);
-
-private:
-    QDataBuffer<QOpenGLPoint> vertexArray;
-    QDataBuffer<int>      vertexArrayStops;
-
-    GLfloat     maxX;
-    GLfloat     maxY;
-    GLfloat     minX;
-    GLfloat     minY;
-    bool        boundingRectDirty;
-    void addClosingLine(int index);
-    void addCentroid(const QVectorPath &path, int subPathIndex);
-};
-
-QT_END_NAMESPACE
-
-#endif
diff --git a/src/gui/opengl/qopenglbuffer.cpp b/src/gui/opengl/qopenglbuffer.cpp
deleted file mode 100644
index 5387cc06e3..0000000000
--- a/src/gui/opengl/qopenglbuffer.cpp
+++ /dev/null
@@ -1,618 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtGui module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <QtGui/qopengl.h>
-#include <QtGui/private/qopenglcontext_p.h>
-#include <QtCore/qatomic.h>
-#include "qopenglbuffer.h"
-#include <private/qopenglextensions_p.h>
-
-#ifndef GL_CONTEXT_LOST
-#define GL_CONTEXT_LOST                   0x0507
-#endif
-
-QT_BEGIN_NAMESPACE
-
-/*!
-    \class QOpenGLBuffer
-    \brief The QOpenGLBuffer class provides functions for creating and managing OpenGL buffer objects.
-    \since 5.0
-    \ingroup painting-3D
-    \inmodule QtGui
-
-    Buffer objects are created in the OpenGL server so that the
-    client application can avoid uploading vertices, indices,
-    texture image data, etc every time they are needed.
-
-    QOpenGLBuffer objects can be copied around as a reference to the
-    underlying OpenGL buffer object:
-
-    \snippet code/src_gui_opengl_qopenglbuffer.cpp 0
-
-    QOpenGLBuffer performs a shallow copy when objects are copied in this
-    manner, but does not implement copy-on-write semantics.  The original
-    object will be affected whenever the copy is modified.
-*/
-
-/*!
-    \enum QOpenGLBuffer::Type
-    This enum defines the type of OpenGL buffer object to create with QOpenGLBuffer.
-
-    \value VertexBuffer Vertex buffer object for use when specifying
-           vertex arrays.
-    \value IndexBuffer Index buffer object for use with \c{glDrawElements()}.
-    \value PixelPackBuffer Pixel pack buffer object for reading pixel
-           data from the OpenGL server (for example, with \c{glReadPixels()}).
-           Not supported under OpenGL/ES.
-    \value PixelUnpackBuffer Pixel unpack buffer object for writing pixel
-           data to the OpenGL server (for example, with \c{glTexImage2D()}).
-           Not supported under OpenGL/ES.
-*/
-
-/*!
-    \enum QOpenGLBuffer::UsagePattern
-    This enum defines the usage pattern of a QOpenGLBuffer object.
-
-    \value StreamDraw The data will be set once and used a few times
-           for drawing operations.  Under OpenGL/ES 1.1 this is identical
-           to StaticDraw.
-    \value StreamRead The data will be set once and used a few times
-           for reading data back from the OpenGL server.  Not supported
-           under OpenGL/ES.
-    \value StreamCopy The data will be set once and used a few times
-           for reading data back from the OpenGL server for use in further
-           drawing operations.  Not supported under OpenGL/ES.
-    \value StaticDraw The data will be set once and used many times
-           for drawing operations.
-    \value StaticRead The data will be set once and used many times
-           for reading data back from the OpenGL server.  Not supported
-           under OpenGL/ES.
-    \value StaticCopy The data will be set once and used many times
-           for reading data back from the OpenGL server for use in further
-           drawing operations.  Not supported under OpenGL/ES.
-    \value DynamicDraw The data will be modified repeatedly and used
-           many times for drawing operations.
-    \value DynamicRead The data will be modified repeatedly and used
-           many times for reading data back from the OpenGL server.
-           Not supported under OpenGL/ES.
-    \value DynamicCopy The data will be modified repeatedly and used
-           many times for reading data back from the OpenGL server for
-           use in further drawing operations.  Not supported under OpenGL/ES.
-*/
-
-/*!
-    \enum QOpenGLBuffer::Access
-    This enum defines the access mode for QOpenGLBuffer::map().
-
-    \value ReadOnly The buffer will be mapped for reading only.
-    \value WriteOnly The buffer will be mapped for writing only.
-    \value ReadWrite The buffer will be mapped for reading and writing.
-*/
-
-/*!
-    \enum QOpenGLBuffer::RangeAccessFlag
-    This enum defines the access mode bits for QOpenGLBuffer::mapRange().
-
-    \value RangeRead The buffer will be mapped for reading.
-    \value RangeWrite The buffer will be mapped for writing.
-    \value RangeInvalidate Discard the previous contents of the specified range.
-    \value RangeInvalidateBuffer Discard the previous contents of the entire buffer.
-    \value RangeFlushExplicit Indicates that modifications are to be flushed explicitly via \c glFlushMappedBufferRange.
-    \value RangeUnsynchronized Indicates that pending operations should not be synchronized before returning from mapRange().
-*/
-
-class QOpenGLBufferPrivate
-{
-public:
-    QOpenGLBufferPrivate(QOpenGLBuffer::Type t)
-        : ref(1),
-          type(t),
-          guard(nullptr),
-          usagePattern(QOpenGLBuffer::StaticDraw),
-          actualUsagePattern(QOpenGLBuffer::StaticDraw),
-          funcs(nullptr)
-    {
-    }
-
-    QAtomicInt ref;
-    QOpenGLBuffer::Type type;
-    QOpenGLSharedResourceGuard *guard;
-    QOpenGLBuffer::UsagePattern usagePattern;
-    QOpenGLBuffer::UsagePattern actualUsagePattern;
-    QOpenGLExtensions *funcs;
-};
-
-/*!
-    Constructs a new buffer object of type QOpenGLBuffer::VertexBuffer.
-
-    Note: this constructor just creates the QOpenGLBuffer instance.  The actual
-    buffer object in the OpenGL server is not created until create() is called.
-
-    \sa create()
-*/
-QOpenGLBuffer::QOpenGLBuffer()
-    : d_ptr(new QOpenGLBufferPrivate(QOpenGLBuffer::VertexBuffer))
-{
-}
-
-/*!
-    Constructs a new buffer object of \a type.
-
-    Note: this constructor just creates the QOpenGLBuffer instance.  The actual
-    buffer object in the OpenGL server is not created until create() is called.
-
-    \sa create()
-*/
-QOpenGLBuffer::QOpenGLBuffer(QOpenGLBuffer::Type type)
-    : d_ptr(new QOpenGLBufferPrivate(type))
-{
-}
-
-/*!
-    Constructs a shallow copy of \a other.
-
-    Note: QOpenGLBuffer does not implement copy-on-write semantics,
-    so \a other will be affected whenever the copy is modified.
-*/
-QOpenGLBuffer::QOpenGLBuffer(const QOpenGLBuffer &other)
-    : d_ptr(other.d_ptr)
-{
-    d_ptr->ref.ref();
-}
-
-/*!
-    Destroys this buffer object, including the storage being
-    used in the OpenGL server.
-*/
-QOpenGLBuffer::~QOpenGLBuffer()
-{
-    if (!d_ptr->ref.deref()) {
-        destroy();
-        delete d_ptr;
-    }
-}
-
-/*!
-    Assigns a shallow copy of \a other to this object.
-
-    Note: QOpenGLBuffer does not implement copy-on-write semantics,
-    so \a other will be affected whenever the copy is modified.
-*/
-QOpenGLBuffer &QOpenGLBuffer::operator=(const QOpenGLBuffer &other)
-{
-    if (d_ptr != other.d_ptr) {
-        other.d_ptr->ref.ref();
-        if (!d_ptr->ref.deref()) {
-            destroy();
-            delete d_ptr;
-        }
-        d_ptr = other.d_ptr;
-    }
-    return *this;
-}
-
-/*!
-    Returns the type of buffer represented by this object.
-*/
-QOpenGLBuffer::Type QOpenGLBuffer::type() const
-{
-    Q_D(const QOpenGLBuffer);
-    return d->type;
-}
-
-/*!
-    Returns the usage pattern for this buffer object.
-    The default value is StaticDraw.
-
-    \sa setUsagePattern()
-*/
-QOpenGLBuffer::UsagePattern QOpenGLBuffer::usagePattern() const
-{
-    Q_D(const QOpenGLBuffer);
-    return d->usagePattern;
-}
-
-/*!
-    Sets the usage pattern for this buffer object to \a value.
-    This function must be called before allocate() or write().
-
-    \sa usagePattern(), allocate(), write()
-*/
-void QOpenGLBuffer::setUsagePattern(QOpenGLBuffer::UsagePattern value)
-{
-    Q_D(QOpenGLBuffer);
-    d->usagePattern = d->actualUsagePattern = value;
-}
-
-namespace {
-    void freeBufferFunc(QOpenGLFunctions *funcs, GLuint id)
-    {
-        funcs->glDeleteBuffers(1, &id);
-    }
-}
-
-/*!
-    Creates the buffer object in the OpenGL server.  Returns \c true if
-    the object was created; false otherwise.
-
-    This function must be called with a current QOpenGLContext.
-    The buffer will be bound to and can only be used in
-    that context (or any other context that is shared with it).
-
-    This function will return false if the OpenGL implementation
-    does not support buffers, or there is no current QOpenGLContext.
-
-    \sa isCreated(), allocate(), write(), destroy()
-*/
-bool QOpenGLBuffer::create()
-{
-    Q_D(QOpenGLBuffer);
-    if (d->guard && d->guard->id())
-        return true;
-    QOpenGLContext *ctx = QOpenGLContext::currentContext();
-    if (ctx) {
-        delete d->funcs;
-        d->funcs = new QOpenGLExtensions(ctx);
-        GLuint bufferId = 0;
-        d->funcs->glGenBuffers(1, &bufferId);
-        if (bufferId) {
-            if (d->guard)
-                d->guard->free();
-
-            d->guard = new QOpenGLSharedResourceGuard(ctx, bufferId, freeBufferFunc);
-            return true;
-        }
-    }
-    return false;
-}
-
-/*!
-    Returns \c true if this buffer has been created; false otherwise.
-
-    \sa create(), destroy()
-*/
-bool QOpenGLBuffer::isCreated() const
-{
-    Q_D(const QOpenGLBuffer);
-    return d->guard && d->guard->id();
-}
-
-/*!
-    Destroys this buffer object, including the storage being
-    used in the OpenGL server.  All references to the buffer will
-    become invalid.
-*/
-void QOpenGLBuffer::destroy()
-{
-    Q_D(QOpenGLBuffer);
-    if (d->guard) {
-        d->guard->free();
-        d->guard = nullptr;
-    }
-    delete d->funcs;
-    d->funcs = nullptr;
-}
-
-/*!
-    Reads the \a count bytes in this buffer starting at \a offset
-    into \a data.  Returns \c true on success; false if reading from
-    the buffer is not supported.  Buffer reading is not supported
-    under OpenGL/ES.
-
-    It is assumed that this buffer has been bound to the current context.
-
-    \sa write(), bind()
-*/
-bool QOpenGLBuffer::read(int offset, void *data, int count)
-{
-#if !defined(QT_OPENGL_ES)
-    Q_D(QOpenGLBuffer);
-    if (!d->funcs->hasOpenGLFeature(QOpenGLFunctions::Buffers) || !d->guard->id())
-        return false;
-
-    while (true) { // Clear error state.
-        GLenum error = d->funcs->glGetError();
-        if (error == GL_NO_ERROR)
-            break;
-        if (error == GL_CONTEXT_LOST)
-            return false;
-    };
-    d->funcs->glGetBufferSubData(d->type, offset, count, data);
-    return d->funcs->glGetError() == GL_NO_ERROR;
-#else
-    Q_UNUSED(offset);
-    Q_UNUSED(data);
-    Q_UNUSED(count);
-    return false;
-#endif
-}
-
-/*!
-    Replaces the \a count bytes of this buffer starting at \a offset
-    with the contents of \a data.  Any other bytes in the buffer
-    will be left unmodified.
-
-    It is assumed that create() has been called on this buffer and that
-    it has been bound to the current context.
-
-    \sa create(), read(), allocate()
-*/
-void QOpenGLBuffer::write(int offset, const void *data, int count)
-{
-#ifndef QT_NO_DEBUG
-    if (!isCreated())
-        qWarning("QOpenGLBuffer::write(): buffer not created");
-#endif
-    Q_D(QOpenGLBuffer);
-    if (d->guard && d->guard->id())
-        d->funcs->glBufferSubData(d->type, offset, count, data);
-}
-
-/*!
-    Allocates \a count bytes of space to the buffer, initialized to
-    the contents of \a data.  Any previous contents will be removed.
-
-    It is assumed that create() has been called on this buffer and that
-    it has been bound to the current context.
-
-    \sa create(), read(), write()
-*/
-void QOpenGLBuffer::allocate(const void *data, int count)
-{
-#ifndef QT_NO_DEBUG
-    if (!isCreated())
-        qWarning("QOpenGLBuffer::allocate(): buffer not created");
-#endif
-    Q_D(QOpenGLBuffer);
-    if (d->guard && d->guard->id())
-        d->funcs->glBufferData(d->type, count, data, d->actualUsagePattern);
-}
-
-/*!
-    \fn void QOpenGLBuffer::allocate(int count)
-    \overload
-
-    Allocates \a count bytes of space to the buffer.  Any previous
-    contents will be removed.
-
-    It is assumed that create() has been called on this buffer and that
-    it has been bound to the current context.
-
-    \sa create(), write()
-*/
-
-/*!
-    Binds the buffer associated with this object to the current
-    OpenGL context.  Returns \c false if binding was not possible, usually because
-    type() is not supported on this OpenGL implementation.
-
-    The buffer must be bound to the same QOpenGLContext current when create()
-    was called, or to another QOpenGLContext that is sharing with it.
-    Otherwise, false will be returned from this function.
-
-    \sa release(), create()
-*/
-bool QOpenGLBuffer::bind()
-{
-#ifndef QT_NO_DEBUG
-    if (!isCreated())
-        qWarning("QOpenGLBuffer::bind(): buffer not created");
-#endif
-    Q_D(const QOpenGLBuffer);
-    GLuint bufferId = d->guard ? d->guard->id() : 0;
-    if (bufferId) {
-        if (d->guard->group() != QOpenGLContextGroup::currentContextGroup()) {
-#ifndef QT_NO_DEBUG
-            qWarning("QOpenGLBuffer::bind: buffer is not valid in the current context");
-#endif
-            return false;
-        }
-        d->funcs->glBindBuffer(d->type, bufferId);
-        return true;
-    } else {
-        return false;
-    }
-}
-
-/*!
-    Releases the buffer associated with this object from the
-    current OpenGL context.
-
-    This function must be called with the same QOpenGLContext current
-    as when bind() was called on the buffer.
-
-    \sa bind()
-*/
-void QOpenGLBuffer::release()
-{
-#ifndef QT_NO_DEBUG
-    if (!isCreated())
-        qWarning("QOpenGLBuffer::release(): buffer not created");
-#endif
-    Q_D(const QOpenGLBuffer);
-    if (d->guard && d->guard->id())
-        d->funcs->glBindBuffer(d->type, 0);
-}
-
-/*!
-    Releases the buffer associated with \a type in the current
-    QOpenGLContext.
-
-    This function is a direct call to \c{glBindBuffer(type, 0)}
-    for use when the caller does not know which QOpenGLBuffer has
-    been bound to the context but wants to make sure that it
-    is released.
-
-    \snippet code/src_gui_opengl_qopenglbuffer.cpp 1
-*/
-void QOpenGLBuffer::release(QOpenGLBuffer::Type type)
-{
-    QOpenGLContext *ctx = QOpenGLContext::currentContext();
-    if (ctx)
-        ctx->functions()->glBindBuffer(GLenum(type), 0);
-}
-
-/*!
-    Returns the OpenGL identifier associated with this buffer; zero if
-    the buffer has not been created.
-
-    \sa isCreated()
-*/
-GLuint QOpenGLBuffer::bufferId() const
-{
-    Q_D(const QOpenGLBuffer);
-    return d->guard ? d->guard->id() : 0;
-}
-
-/*!
-    Returns the size of the data in this buffer, for reading operations.
-    Returns -1 if fetching the buffer size is not supported, or the
-    buffer has not been created.
-
-    It is assumed that this buffer has been bound to the current context.
-
-    \sa isCreated(), bind()
-*/
-int QOpenGLBuffer::size() const
-{
-    Q_D(const QOpenGLBuffer);
-    if (!d->guard || !d->guard->id())
-        return -1;
-    GLint value = -1;
-    d->funcs->glGetBufferParameteriv(d->type, GL_BUFFER_SIZE, &value);
-    return value;
-}
-
-/*!
-    Maps the contents of this buffer into the application's memory
-    space and returns a pointer to it.  Returns null if memory
-    mapping is not possible.  The \a access parameter indicates the
-    type of access to be performed.
-
-    It is assumed that create() has been called on this buffer and that
-    it has been bound to the current context.
-
-    \note This function is only supported under OpenGL ES 2.0 or
-    earlier if the \c GL_OES_mapbuffer extension is present.
-
-    \note On OpenGL ES 3.0 and newer, or, in case if desktop OpenGL,
-    if \c GL_ARB_map_buffer_range is supported, this function uses
-    \c glMapBufferRange instead of \c glMapBuffer.
-
-    \sa unmap(), create(), bind(), mapRange()
-*/
-void *QOpenGLBuffer::map(QOpenGLBuffer::Access access)
-{
-    Q_D(QOpenGLBuffer);
-#ifndef QT_NO_DEBUG
-    if (!isCreated())
-        qWarning("QOpenGLBuffer::map(): buffer not created");
-#endif
-    if (!d->guard || !d->guard->id())
-        return nullptr;
-    if (d->funcs->hasOpenGLExtension(QOpenGLExtensions::MapBufferRange)) {
-        QOpenGLBuffer::RangeAccessFlags rangeAccess;
-        switch (access) {
-        case QOpenGLBuffer::ReadOnly:
-            rangeAccess = QOpenGLBuffer::RangeRead;
-            break;
-        case QOpenGLBuffer::WriteOnly:
-            rangeAccess = QOpenGLBuffer::RangeWrite;
-            break;
-        case QOpenGLBuffer::ReadWrite:
-            rangeAccess = QOpenGLBuffer::RangeRead | QOpenGLBuffer::RangeWrite;
-            break;
-        }
-        return d->funcs->glMapBufferRange(d->type, 0, size(), rangeAccess);
-    } else {
-        return d->funcs->glMapBuffer(d->type, access);
-    }
-}
-
-/*!
-    Maps the range specified by \a offset and \a count of the contents
-    of this buffer into the application's memory space and returns a
-    pointer to it.  Returns null if memory mapping is not possible.
-    The \a access parameter specifies a combination of access flags.
-
-    It is assumed that create() has been called on this buffer and that
-    it has been bound to the current context.
-
-    \note This function is not available on OpenGL ES 2.0 and earlier.
-
-    \sa unmap(), create(), bind()
- */
-void *QOpenGLBuffer::mapRange(int offset, int count, QOpenGLBuffer::RangeAccessFlags access)
-{
-    Q_D(QOpenGLBuffer);
-#ifndef QT_NO_DEBUG
-    if (!isCreated())
-        qWarning("QOpenGLBuffer::mapRange(): buffer not created");
-#endif
-    if (!d->guard || !d->guard->id())
-        return nullptr;
-    return d->funcs->glMapBufferRange(d->type, offset, count, access);
-}
-
-/*!
-    Unmaps the buffer after it was mapped into the application's
-    memory space with a previous call to map().  Returns \c true if
-    the unmap succeeded; false otherwise.
-
-    It is assumed that this buffer has been bound to the current context,
-    and that it was previously mapped with map().
-
-    \note This function is only supported under OpenGL ES 2.0 and
-    earlier if the \c{GL_OES_mapbuffer} extension is present.
-
-    \sa map()
-*/
-bool QOpenGLBuffer::unmap()
-{
-    Q_D(QOpenGLBuffer);
-#ifndef QT_NO_DEBUG
-    if (!isCreated())
-        qWarning("QOpenGLBuffer::unmap(): buffer not created");
-#endif
-    if (!d->guard || !d->guard->id())
-        return false;
-    return d->funcs->glUnmapBuffer(d->type) == GL_TRUE;
-}
-
-QT_END_NAMESPACE
diff --git a/src/gui/opengl/qopenglbuffer.h b/src/gui/opengl/qopenglbuffer.h
deleted file mode 100644
index a810783731..0000000000
--- a/src/gui/opengl/qopenglbuffer.h
+++ /dev/null
@@ -1,145 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtGui module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QOPENGLBUFFER_H
-#define QOPENGLBUFFER_H
-
-#include <QtGui/qtguiglobal.h>
-
-#ifndef QT_NO_OPENGL
-
-#include <QtCore/qscopedpointer.h>
-#include <QtGui/qopengl.h>
-
-QT_BEGIN_NAMESPACE
-
-
-class QOpenGLBufferPrivate;
-
-class Q_GUI_EXPORT QOpenGLBuffer
-{
-public:
-    enum Type
-    {
-        VertexBuffer        = 0x8892, // GL_ARRAY_BUFFER
-        IndexBuffer         = 0x8893, // GL_ELEMENT_ARRAY_BUFFER
-        PixelPackBuffer     = 0x88EB, // GL_PIXEL_PACK_BUFFER
-        PixelUnpackBuffer   = 0x88EC  // GL_PIXEL_UNPACK_BUFFER
-    };
-
-    QOpenGLBuffer();
-    explicit QOpenGLBuffer(QOpenGLBuffer::Type type);
-    QOpenGLBuffer(const QOpenGLBuffer &other);
-    ~QOpenGLBuffer();
-
-    QOpenGLBuffer &operator=(const QOpenGLBuffer &other);
-
-    enum UsagePattern
-    {
-        StreamDraw          = 0x88E0, // GL_STREAM_DRAW
-        StreamRead          = 0x88E1, // GL_STREAM_READ
-        StreamCopy          = 0x88E2, // GL_STREAM_COPY
-        StaticDraw          = 0x88E4, // GL_STATIC_DRAW
-        StaticRead          = 0x88E5, // GL_STATIC_READ
-        StaticCopy          = 0x88E6, // GL_STATIC_COPY
-        DynamicDraw         = 0x88E8, // GL_DYNAMIC_DRAW
-        DynamicRead         = 0x88E9, // GL_DYNAMIC_READ
-        DynamicCopy         = 0x88EA  // GL_DYNAMIC_COPY
-    };
-
-    enum Access
-    {
-        ReadOnly            = 0x88B8, // GL_READ_ONLY
-        WriteOnly           = 0x88B9, // GL_WRITE_ONLY
-        ReadWrite           = 0x88BA  // GL_READ_WRITE
-    };
-
-    enum RangeAccessFlag
-    {
-        RangeRead             = 0x0001, // GL_MAP_READ_BIT
-        RangeWrite            = 0x0002, // GL_MAP_WRITE_BIT
-        RangeInvalidate       = 0x0004, // GL_MAP_INVALIDATE_RANGE_BIT
-        RangeInvalidateBuffer = 0x0008, // GL_MAP_INVALIDATE_BUFFER_BIT
-        RangeFlushExplicit    = 0x0010, // GL_MAP_FLUSH_EXPLICIT_BIT
-        RangeUnsynchronized   = 0x0020  // GL_MAP_UNSYNCHRONIZED_BIT
-    };
-    Q_DECLARE_FLAGS(RangeAccessFlags, RangeAccessFlag)
-
-    QOpenGLBuffer::Type type() const;
-
-    QOpenGLBuffer::UsagePattern usagePattern() const;
-    void setUsagePattern(QOpenGLBuffer::UsagePattern value);
-
-    bool create();
-    bool isCreated() const;
-
-    void destroy();
-
-    bool bind();
-    void release();
-
-    static void release(QOpenGLBuffer::Type type);
-
-    GLuint bufferId() const;
-
-    int size() const;
-
-    bool read(int offset, void *data, int count);
-    void write(int offset, const void *data, int count);
-
-    void allocate(const void *data, int count);
-    inline void allocate(int count) { allocate(nullptr, count); }
-
-    void *map(QOpenGLBuffer::Access access);
-    void *mapRange(int offset, int count, QOpenGLBuffer::RangeAccessFlags access);
-    bool unmap();
-
-private:
-    QOpenGLBufferPrivate *d_ptr;
-
-    Q_DECLARE_PRIVATE(QOpenGLBuffer)
-};
-
-Q_DECLARE_OPERATORS_FOR_FLAGS(QOpenGLBuffer::RangeAccessFlags)
-
-QT_END_NAMESPACE
-
-#endif // QT_NO_OPENGL
-
-#endif
diff --git a/src/gui/opengl/qopenglcustomshaderstage.cpp b/src/gui/opengl/qopenglcustomshaderstage.cpp
deleted file mode 100644
index a95a0a5767..0000000000
--- a/src/gui/opengl/qopenglcustomshaderstage.cpp
+++ /dev/null
@@ -1,137 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtGui module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qopenglcustomshaderstage_p.h"
-#include "qopenglengineshadermanager_p.h"
-#include "qopenglpaintengine_p.h"
-#include <private/qpainter_p.h>
-
-QT_BEGIN_NAMESPACE
-
-class QOpenGLCustomShaderStagePrivate
-{
-public:
-    QOpenGLCustomShaderStagePrivate() :
-        m_manager(nullptr) {}
-
-    QPointer<QOpenGLEngineShaderManager> m_manager;
-    QByteArray              m_source;
-};
-
-
-
-
-QOpenGLCustomShaderStage::QOpenGLCustomShaderStage()
-    : d_ptr(new QOpenGLCustomShaderStagePrivate)
-{
-}
-
-QOpenGLCustomShaderStage::~QOpenGLCustomShaderStage()
-{
-    Q_D(QOpenGLCustomShaderStage);
-    if (d->m_manager) {
-        d->m_manager->removeCustomStage();
-        d->m_manager->sharedShaders->cleanupCustomStage(this);
-    }
-    delete d_ptr;
-}
-
-void QOpenGLCustomShaderStage::setUniformsDirty()
-{
-    Q_D(QOpenGLCustomShaderStage);
-    if (d->m_manager)
-        d->m_manager->setDirty(); // ### Probably a bit overkill!
-}
-
-bool QOpenGLCustomShaderStage::setOnPainter(QPainter* p)
-{
-    Q_D(QOpenGLCustomShaderStage);
-    if (p->paintEngine()->type() != QPaintEngine::OpenGL2) {
-        qWarning("QOpenGLCustomShaderStage::setOnPainter() - paint engine not OpenGL2");
-        return false;
-    }
-    if (d->m_manager)
-        qWarning("Custom shader is already set on a painter");
-
-    QOpenGL2PaintEngineEx *engine = static_cast<QOpenGL2PaintEngineEx*>(p->paintEngine());
-    d->m_manager = QOpenGL2PaintEngineExPrivate::shaderManagerForEngine(engine);
-    Q_ASSERT(d->m_manager);
-
-    d->m_manager->setCustomStage(this);
-    return true;
-}
-
-void QOpenGLCustomShaderStage::removeFromPainter(QPainter* p)
-{
-    Q_D(QOpenGLCustomShaderStage);
-    if (p->paintEngine()->type() != QPaintEngine::OpenGL2)
-        return;
-
-    QOpenGL2PaintEngineEx *engine = static_cast<QOpenGL2PaintEngineEx*>(p->paintEngine());
-    d->m_manager = QOpenGL2PaintEngineExPrivate::shaderManagerForEngine(engine);
-    Q_ASSERT(d->m_manager);
-
-    // Just set the stage to null, don't call removeCustomStage().
-    // This should leave the program in a compiled/linked state
-    // if the next custom shader stage is this one again.
-    d->m_manager->setCustomStage(nullptr);
-    d->m_manager = nullptr;
-}
-
-QByteArray QOpenGLCustomShaderStage::source() const
-{
-    Q_D(const QOpenGLCustomShaderStage);
-    return d->m_source;
-}
-
-// Called by the shader manager if another custom shader is attached or
-// the manager is deleted
-void QOpenGLCustomShaderStage::setInactive()
-{
-    Q_D(QOpenGLCustomShaderStage);
-    d->m_manager = nullptr;
-}
-
-void QOpenGLCustomShaderStage::setSource(const QByteArray& s)
-{
-    Q_D(QOpenGLCustomShaderStage);
-    d->m_source = s;
-}
-
-QT_END_NAMESPACE
diff --git a/src/gui/opengl/qopenglcustomshaderstage_p.h b/src/gui/opengl/qopenglcustomshaderstage_p.h
deleted file mode 100644
index ce3e9efd23..0000000000
--- a/src/gui/opengl/qopenglcustomshaderstage_p.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtGui module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QOPENGL_CUSTOM_SHADER_STAGE_H
-#define QOPENGL_CUSTOM_SHADER_STAGE_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include <QtGui/private/qtguiglobal_p.h>
-#include <QOpenGLShaderProgram>
-
-QT_BEGIN_NAMESPACE
-
-
-class QPainter;
-class QOpenGLCustomShaderStagePrivate;
-class Q_GUI_EXPORT QOpenGLCustomShaderStage
-{
-    Q_DECLARE_PRIVATE(QOpenGLCustomShaderStage)
-public:
-    QOpenGLCustomShaderStage();
-    virtual ~QOpenGLCustomShaderStage();
-    virtual void setUniforms(QOpenGLShaderProgram*) {}
-
-    void setUniformsDirty();
-
-    bool setOnPainter(QPainter*);
-    void removeFromPainter(QPainter*);
-    QByteArray source() const;
-
-    void setInactive();
-protected:
-    void setSource(const QByteArray&);
-
-private:
-    QOpenGLCustomShaderStagePrivate* d_ptr;
-
-    Q_DISABLE_COPY_MOVE(QOpenGLCustomShaderStage)
-};
-
-
-QT_END_NAMESPACE
-
-
-#endif
diff --git a/src/gui/opengl/qopengldebug.cpp b/src/gui/opengl/qopengldebug.cpp
deleted file mode 100644
index 310006feaf..0000000000
--- a/src/gui/opengl/qopengldebug.cpp
+++ /dev/null
@@ -1,1826 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2013 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtGui module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <QtCore/private/qobject_p.h>
-#include <QtCore/qglobal.h>
-#include <QtCore/qvarlengtharray.h>
-#include <QtGui/qopengl.h>
-#include <QtGui/qopenglfunctions.h>
-#include <QtGui/qoffscreensurface.h>
-
-#include "qopengldebug.h"
-
-QT_BEGIN_NAMESPACE
-
-/*!
-    \class QOpenGLDebugMessage
-    \brief The QOpenGLDebugMessage class wraps an OpenGL debug message.
-    \inmodule QtGui
-    \reentrant
-    \since 5.1
-    \ingroup shared
-    \ingroup painting-3D
-
-    Debug messages are usually created by the OpenGL server and then read by
-    OpenGL clients (either from the OpenGL internal debug log, or logged in real-time).
-    A debug message has a textual representation, a vendor-specific numeric id,
-    a source, a type and a severity.
-
-    It's also possible for applications or third-party libraries and toolkits
-    to create and insert messages in the debug log. In order to do so, you can use
-    the createApplicationMessage() or the createThirdPartyMessage() static functions.
-
-    \sa QOpenGLDebugLogger
-*/
-
-/*!
-    \class QOpenGLDebugLogger
-    \brief The QOpenGLDebugLogger enables logging of OpenGL debugging messages.
-    \inmodule QtGui
-    \since 5.1
-    \ingroup painting-3D
-
-    \tableofcontents
-
-    \section1 Introduction
-
-    OpenGL programming can be very error prone. Most of the time, a single
-    failing call to OpenGL can cause an entire portion of an application to
-    stop working, with nothing being drawn on the screen.
-
-    The only way to be sure that no errors are being returned from the OpenGL
-    implementation is checking with \c{glGetError} after each and every API
-    call. Moreover, OpenGL errors stack up, therefore glGetError should always
-    be used in a loop like this:
-
-    \snippet code/src_gui_opengl_qopengldebug.cpp 0
-
-    If you try to clear the error stack, make sure not just keep going until
-    GL_NO_ERROR is returned but also break on GL_CONTEXT_LOST as that error
-    value will keep repeating.
-
-    There are also many other information we are interested in (as application
-    developers), for instance performance issues, or warnings about using
-    deprecated APIs. Those kind of messages are not reported through the
-    ordinary OpenGL error reporting mechanisms.
-
-    QOpenGLDebugLogger aims at addressing these issues by providing access to
-    the \e{OpenGL debug log}. If your OpenGL implementation supports it (by
-    exposing the \c{GL_KHR_debug} extension), messages from the OpenGL server
-    will be either logged in an internal OpenGL log, or passed in "real-time"
-    to listeners as they're generated from OpenGL.
-
-    QOpenGLDebugLogger supports both these modes of operation. Refer to the
-    following sections to find out the differences between them.
-
-    \section1 Creating an OpenGL Debug Context
-
-    For efficiency reasons, OpenGL implementations are allowed not to create
-    any debug output at all, unless the OpenGL context is a debug context. In order
-    to create a debug context from Qt, you must set the QSurfaceFormat::DebugContext
-    format option on the QSurfaceFormat used to create the QOpenGLContext object:
-
-    \snippet code/src_gui_opengl_qopengldebug.cpp 1
-
-    Note that requesting a 3.2 OpenGL Core Profile is just for the example's
-    purposes; this class is not tied to any specific OpenGL or OpenGL ES
-    version, as it relies on the availability of the \c{GL_KHR_debug} extension
-    (see below).
-
-    \section1 Creating and Initializing a QOpenGLDebugLogger
-
-    QOpenGLDebugLogger is a simple QObject-derived class. Just like all QObject
-    subclasses, you create an instance (and optionally specify a parent
-    object), and like the other OpenGL functions in Qt you \e{must} initialize
-    it before usage by calling initialize() whilst there is a current OpenGL context:
-
-    \snippet code/src_gui_opengl_qopengldebug.cpp 2
-
-    Note that the \c{GL_KHR_debug} extension \e{must} be available in the context
-    in order to access the messages logged by OpenGL. You can check the
-    presence of this extension by calling:
-
-    \snippet code/src_gui_opengl_qopengldebug.cpp 3
-
-    where \c{ctx} is a valid QOpenGLContext. If the extension is not available,
-    initialize() will return false.
-
-    \section1 Reading the Internal OpenGL Debug Log
-
-    OpenGL implementations keep an internal log of debug messages. Messages
-    stored in this log can be retrieved by using the loggedMessages() function:
-
-    \snippet code/src_gui_opengl_qopengldebug.cpp 4
-
-    The internal log has a limited size; when it fills up, older messages will
-    get discarded to make room for the new incoming messages. When you call
-    loggedMessages(), the internal log will be emptied as well.
-
-    If you want to be sure not to lose any debug message, you must use real-time
-    logging instead of calling this function. However, debug messages might
-    still be generated in the timespan between context creation and activation
-    of real-time logging (or, in general, when the real-time logging is disabled).
-
-    \section1 Real-time logging of messages
-
-    It is also possible to receive a stream of debug messages from the OpenGL
-    server \e{as they are generated} by the implementation. In order to do so,
-    you need to connect a suitable slot to the messageLogged() signal, and
-    start logging by calling startLogging():
-
-    \snippet code/src_gui_opengl_qopengldebug.cpp 5
-
-    Similarly, logging can be disabled at any time by calling the stopLogging()
-    function.
-
-    Real-time logging can be either asynchronous or synchronous, depending on
-    the parameter passed to startLogging(). When logging in asynchronous mode
-    (the default, as it has a very small overhead), the OpenGL implementation
-    can generate messages at any time, and/or in an order which is different from the
-    order of the OpenGL commands which caused those messages to be logged.
-    The messages could also be generated from a thread that it's different from
-    the thread the context is currently bound to. This is because OpenGL
-    implementations are usually highly threaded and asynchronous, and therefore
-    no warranties are made about the relative order and the timings of the
-    debug messages.
-
-    On the other hand, logging in synchronous mode has a high overhead, but
-    the OpenGL implementation guarantees that all the messages caused by a
-    certain command are received in order, before the command returns,
-    and from the same thread the OpenGL context is bound to.
-
-    This means that when logging in synchronous mode you will be able to run
-    your OpenGL application in a debugger, put a breakpoint on a slot connected
-    to the messageLogged() signal, and see in the backtrace the exact call
-    that caused the logged message. This can be extremely useful to debug
-    an OpenGL problem. Note that if OpenGL rendering is happening in another
-    thread, you must force the signal/slot connection type to Qt::DirectConnection
-    in order to be able to see the actual backtrace.
-
-    Refer to the LoggingMode enum documentation for more information about
-    logging modes.
-
-    \note When real-time logging is enabled, debug messages will \e{not} be
-    inserted in the internal OpenGL debug log any more; messages already
-    present in the internal log will not be deleted, nor they will be emitted
-    through the messageLogged() signal. Since some messages might be generated
-    before real-time logging is started (and therefore be kept in the internal
-    OpenGL log), it is important to always check if it contains any message
-    after calling startLogging().
-
-    \section1 Inserting Messages in the Debug Log
-
-    It is possible for applications and libraries to insert custom messages in
-    the debug log, for instance for marking a group of related OpenGL commands
-    and therefore being then able to identify eventual messages coming from them.
-
-    In order to do so, you can create a QOpenGLDebugMessage object by calling
-    \l{QOpenGLDebugMessage::}{createApplicationMessage()} or
-    \l{QOpenGLDebugMessage::}{createThirdPartyMessage()}, and then inserting it
-    into the log by calling logMessage():
-
-    \snippet code/src_gui_opengl_qopengldebug.cpp 6
-
-    Note that OpenGL implementations have a vendor-specific limit to the length
-    of the messages that can be inserted in the debug log. You can retrieve
-    this length by calling the maximumMessageLength() method; messages longer
-    than the limit will automatically get truncated.
-
-    \section1 Controlling the Debug Output
-
-    QOpenGLDebugMessage is also able to apply filters to the debug messages, and
-    therefore limit the amount of messages logged. You can enable or disable
-    logging of messages by calling enableMessages() and disableMessages()
-    respectively. By default, all messages are logged.
-
-    It is possible to enable or disable messages by selecting them by:
-
-    \list
-    \li source, type and severity (and including all ids in the selection);
-    \li id, source and type (and including all severities in the selection).
-    \endlist
-
-    Note that the "enabled" status for a given message is a property of the
-    (id, source, type, severity) tuple; the message attributes \e{do not} form
-    a hierarchy of any kind. You should be careful about the order of the calls
-    to enableMessages() and disableMessages(), as it will change which
-    messages will are enabled / disabled.
-
-    It's not possible to filter by the message text itself; applications
-    have to do that on their own (in slots connected to the messageLogged()
-    signal, or after fetching the messages in the internal debug log
-    through loggedMessages()).
-
-    In order to simplify the management of the enabled / disabled statuses,
-    QOpenGLDebugMessage also supports the concept of \c{debug groups}. A debug
-    group contains the group of enabled / disabled configurations of debug
-    messages. Moreover, debug groups are organized in a stack: it is possible
-    to push and pop groups by calling pushGroup() and popGroup() respectively.
-    (When an OpenGL context is created, there is already a group in the stack).
-
-    The enableMessages() and disableMessages() functions will modify the
-    configuration in the current debug group, that is, the one at the top of
-    the debug groups stack.
-
-    When a new group is pushed onto the debug groups stack, it will inherit
-    the configuration of the group that was previously on the top of the stack.
-    Vice versa, popping a debug group will restore the configuration of
-    the debug group that becomes the new top.
-
-    Pushing (respectively popping) debug groups will also automatically generate
-    a debug message of type QOpenGLDebugMessage::GroupPushType (respectively
-    \l{QOpenGLDebugMessage::}{GroupPopType}).
-
-    \sa QOpenGLDebugMessage
-*/
-
-/*!
-    \enum QOpenGLDebugMessage::Source
-
-    The Source enum defines the source of the debug message.
-
-    \value InvalidSource
-        The source of the message is invalid; this is the source of a
-        default-constructed QOpenGLDebugMessage object.
-
-    \value APISource
-        The message was generated in response to OpenGL API calls.
-
-    \value WindowSystemSource
-        The message was generated by the window system.
-
-    \value ShaderCompilerSource
-        The message was generated by the shader compiler.
-
-    \value ThirdPartySource
-        The message was generated by a third party, for instance an OpenGL
-        framework a or debugging toolkit.
-
-    \value ApplicationSource
-        The message was generated by the application itself.
-
-    \value OtherSource
-        The message was generated by a source not included in this
-        enumeration.
-
-    \omitvalue LastSource
-
-    \value AnySource
-        This value corresponds to a mask of all possible message sources.
-*/
-
-/*!
-    \enum QOpenGLDebugMessage::Type
-
-    The Type enum defines the type of the debug message.
-
-    \value InvalidType
-        The type of the message is invalid; this is the type of a
-        default-constructed QOpenGLDebugMessage object.
-
-    \value ErrorType
-        The message represents an error.
-
-    \value DeprecatedBehaviorType
-        The message represents an usage of deprecated behavior.
-
-    \value UndefinedBehaviorType
-        The message represents an usage of undefined behavior.
-
-    \value PortabilityType
-        The message represents an usage of vendor-specific behavior,
-        that might pose portability concerns.
-
-    \value PerformanceType
-        The message represents a performance issue.
-
-    \value OtherType
-        The message represents a type not included in this
-        enumeration.
-
-    \value MarkerType
-        The message represents a marker in the debug log.
-
-    \value GroupPushType
-        The message represents a debug group push operation.
-
-    \value GroupPopType
-        The message represents a debug group pop operation.
-
-    \omitvalue LastType
-
-    \value AnyType
-        This value corresponds to a mask of all possible message types.
-*/
-
-/*!
-    \enum QOpenGLDebugMessage::Severity
-
-    The Severity enum defines the severity of the debug message.
-
-    \value InvalidSeverity
-        The severity of the message is invalid; this is the severity of a
-        default-constructed QOpenGLDebugMessage object.
-
-    \value HighSeverity
-        The message has a high severity.
-
-    \value MediumSeverity
-        The message has a medium severity.
-
-    \value LowSeverity
-        The message has a low severity.
-
-    \value NotificationSeverity
-        The message is a notification.
-
-    \omitvalue LastSeverity
-
-    \value AnySeverity
-        This value corresponds to a mask of all possible message severities.
-*/
-
-/*!
-    \property QOpenGLDebugLogger::loggingMode
-
-    \brief the logging mode passed to startLogging().
-
-    Note that logging must have been started or the value of this property
-    will be meaningless.
-
-    \sa startLogging(), isLogging()
-*/
-/*!
-    \enum QOpenGLDebugLogger::LoggingMode
-
-    The LoggingMode enum defines the logging mode of the logger object.
-
-    \value AsynchronousLogging
-        Messages from the OpenGL server are logged asynchronously. This means
-        that messages can be logged some time after the corresponding OpenGL
-        actions that caused them, and even be received in an out-of-order
-        fashion, depending on the OpenGL implementation. This mode has a very low
-        performance penalty, as OpenGL implementations are heavily threaded
-        and asynchronous by nature.
-
-    \value SynchronousLogging
-        Messages from the OpenGL server are logged synchronously and
-        sequentially. This has a severe performance hit, as OpenGL
-        implementations are very asynchronous by nature; but it's very useful
-        to debug OpenGL problems, as OpenGL guarantees that the messages
-        generated by a OpenGL command will be logged before the corresponding
-        command execution has returned. Therefore, you can install a breakpoint
-        on the messageLogged() signal and see in the backtrace which OpenGL
-        command caused it; the only caveat is that if you are using OpenGL from
-        multiple threads you may need to force direct connection when
-        connecting to the messageLogged() signal.
-*/
-
-// When using OpenGL ES 2.0, all the necessary GL_KHR_debug constants are
-// provided in qopengles2ext.h. Unfortunately, newer versions of that file
-// suffix everything with _KHR which causes extra headache when the goal is
-// to have a single piece of code that builds in all our target
-// environments. Therefore, try to detect this and use our custom defines
-// instead, which we anyway need for OS X.
-
-#if defined(GL_KHR_debug) && defined(GL_DEBUG_SOURCE_API_KHR)
-#define USE_MANUAL_DEFS
-#endif
-
-// Under OSX (at least up to 10.8) we cannot include our copy of glext.h,
-// but we use the system-wide one, which unfortunately lacks all the needed
-// defines/typedefs. In order to make the code compile, we just add here
-// the GL_KHR_debug defines.
-
-#ifndef GL_KHR_debug
-#define GL_KHR_debug 1
-#define USE_MANUAL_DEFS
-#endif
-
-#ifdef USE_MANUAL_DEFS
-
-#ifndef GL_DEBUG_OUTPUT_SYNCHRONOUS
-#define GL_DEBUG_OUTPUT_SYNCHRONOUS       0x8242
-#endif
-#ifndef GL_DEBUG_NEXT_LOGGED_MESSAGE_LENGTH
-#define GL_DEBUG_NEXT_LOGGED_MESSAGE_LENGTH 0x8243
-#endif
-#ifndef GL_DEBUG_CALLBACK_FUNCTION
-#define GL_DEBUG_CALLBACK_FUNCTION        0x8244
-#endif
-#ifndef GL_DEBUG_CALLBACK_USER_PARAM
-#define GL_DEBUG_CALLBACK_USER_PARAM      0x8245
-#endif
-#ifndef GL_DEBUG_SOURCE_API
-#define GL_DEBUG_SOURCE_API               0x8246
-#endif
-#ifndef GL_DEBUG_SOURCE_WINDOW_SYSTEM
-#define GL_DEBUG_SOURCE_WINDOW_SYSTEM     0x8247
-#endif
-#ifndef GL_DEBUG_SOURCE_SHADER_COMPILER
-#define GL_DEBUG_SOURCE_SHADER_COMPILER   0x8248
-#endif
-#ifndef GL_DEBUG_SOURCE_THIRD_PARTY
-#define GL_DEBUG_SOURCE_THIRD_PARTY       0x8249
-#endif
-#ifndef GL_DEBUG_SOURCE_APPLICATION
-#define GL_DEBUG_SOURCE_APPLICATION       0x824A
-#endif
-#ifndef GL_DEBUG_SOURCE_OTHER
-#define GL_DEBUG_SOURCE_OTHER             0x824B
-#endif
-#ifndef GL_DEBUG_TYPE_ERROR
-#define GL_DEBUG_TYPE_ERROR               0x824C
-#endif
-#ifndef GL_DEBUG_TYPE_DEPRECATED_BEHAVIOR
-#define GL_DEBUG_TYPE_DEPRECATED_BEHAVIOR 0x824D
-#endif
-#ifndef GL_DEBUG_TYPE_UNDEFINED_BEHAVIOR
-#define GL_DEBUG_TYPE_UNDEFINED_BEHAVIOR  0x824E
-#endif
-#ifndef GL_DEBUG_TYPE_PORTABILITY
-#define GL_DEBUG_TYPE_PORTABILITY         0x824F
-#endif
-#ifndef GL_DEBUG_TYPE_PERFORMANCE
-#define GL_DEBUG_TYPE_PERFORMANCE         0x8250
-#endif
-#ifndef GL_DEBUG_TYPE_OTHER
-#define GL_DEBUG_TYPE_OTHER               0x8251
-#endif
-#ifndef GL_DEBUG_TYPE_MARKER
-#define GL_DEBUG_TYPE_MARKER              0x8268
-#endif
-#ifndef GL_DEBUG_TYPE_PUSH_GROUP
-#define GL_DEBUG_TYPE_PUSH_GROUP          0x8269
-#endif
-#ifndef GL_DEBUG_TYPE_POP_GROUP
-#define GL_DEBUG_TYPE_POP_GROUP           0x826A
-#endif
-#ifndef GL_DEBUG_SEVERITY_NOTIFICATION
-#define GL_DEBUG_SEVERITY_NOTIFICATION    0x826B
-#endif
-#ifndef GL_MAX_DEBUG_GROUP_STACK_DEPTH
-#define GL_MAX_DEBUG_GROUP_STACK_DEPTH    0x826C
-#endif
-#ifndef GL_DEBUG_GROUP_STACK_DEPTH
-#define GL_DEBUG_GROUP_STACK_DEPTH        0x826D
-#endif
-#ifndef GL_BUFFER
-#define GL_BUFFER                         0x82E0
-#endif
-#ifndef GL_SHADER
-#define GL_SHADER                         0x82E1
-#endif
-#ifndef GL_PROGRAM
-#define GL_PROGRAM                        0x82E2
-#endif
-#ifndef GL_QUERY
-#define GL_QUERY                          0x82E3
-#endif
-#ifndef GL_PROGRAM_PIPELINE
-#define GL_PROGRAM_PIPELINE               0x82E4
-#endif
-#ifndef GL_SAMPLER
-#define GL_SAMPLER                        0x82E6
-#endif
-#ifndef GL_DISPLAY_LIST
-#define GL_DISPLAY_LIST                   0x82E7
-#endif
-#ifndef GL_MAX_LABEL_LENGTH
-#define GL_MAX_LABEL_LENGTH               0x82E8
-#endif
-#ifndef GL_MAX_DEBUG_MESSAGE_LENGTH
-#define GL_MAX_DEBUG_MESSAGE_LENGTH       0x9143
-#endif
-#ifndef GL_MAX_DEBUG_LOGGED_MESSAGES
-#define GL_MAX_DEBUG_LOGGED_MESSAGES      0x9144
-#endif
-#ifndef GL_DEBUG_LOGGED_MESSAGES
-#define GL_DEBUG_LOGGED_MESSAGES          0x9145
-#endif
-#ifndef GL_DEBUG_SEVERITY_HIGH
-#define GL_DEBUG_SEVERITY_HIGH            0x9146
-#endif
-#ifndef GL_DEBUG_SEVERITY_MEDIUM
-#define GL_DEBUG_SEVERITY_MEDIUM          0x9147
-#endif
-#ifndef GL_DEBUG_SEVERITY_LOW
-#define GL_DEBUG_SEVERITY_LOW             0x9148
-#endif
-#ifndef GL_DEBUG_OUTPUT
-#define GL_DEBUG_OUTPUT                   0x92E0
-#endif
-#ifndef GL_CONTEXT_FLAG_DEBUG_BIT
-#define GL_CONTEXT_FLAG_DEBUG_BIT         0x00000002
-#endif
-#ifndef GL_STACK_OVERFLOW
-#define GL_STACK_OVERFLOW                 0x0503
-#endif
-#ifndef GL_STACK_UNDERFLOW
-#define GL_STACK_UNDERFLOW                0x0504
-#endif
-
-typedef void (QOPENGLF_APIENTRY *GLDEBUGPROC)(GLenum source,GLenum type,GLuint id,GLenum severity,GLsizei length,const GLchar *message,const GLvoid *userParam);
-
-#endif /* USE_MANUAL_DEFS */
-
-
-/*!
-    \internal
-*/
-static QOpenGLDebugMessage::Source qt_messageSourceFromGL(GLenum source)
-{
-    switch (source) {
-    case GL_DEBUG_SOURCE_API:
-        return QOpenGLDebugMessage::APISource;
-    case GL_DEBUG_SOURCE_WINDOW_SYSTEM:
-        return QOpenGLDebugMessage::WindowSystemSource;
-    case GL_DEBUG_SOURCE_SHADER_COMPILER:
-        return QOpenGLDebugMessage::ShaderCompilerSource;
-    case GL_DEBUG_SOURCE_THIRD_PARTY:
-        return QOpenGLDebugMessage::ThirdPartySource;
-    case GL_DEBUG_SOURCE_APPLICATION:
-        return QOpenGLDebugMessage::ApplicationSource;
-    case GL_DEBUG_SOURCE_OTHER:
-        return QOpenGLDebugMessage::OtherSource;
-    }
-
-    Q_ASSERT_X(false, Q_FUNC_INFO, "Unknown message source from GL");
-    return QOpenGLDebugMessage::OtherSource;
-}
-
-/*!
-    \internal
-*/
-static GLenum qt_messageSourceToGL(QOpenGLDebugMessage::Source source)
-{
-    switch (source) {
-    case QOpenGLDebugMessage::InvalidSource:
-        break;
-    case QOpenGLDebugMessage::APISource:
-        return GL_DEBUG_SOURCE_API;
-    case QOpenGLDebugMessage::WindowSystemSource:
-        return GL_DEBUG_SOURCE_WINDOW_SYSTEM;
-    case QOpenGLDebugMessage::ShaderCompilerSource:
-        return GL_DEBUG_SOURCE_SHADER_COMPILER;
-    case QOpenGLDebugMessage::ThirdPartySource:
-        return GL_DEBUG_SOURCE_THIRD_PARTY;
-    case QOpenGLDebugMessage::ApplicationSource:
-        return GL_DEBUG_SOURCE_APPLICATION;
-    case QOpenGLDebugMessage::OtherSource:
-        return GL_DEBUG_SOURCE_OTHER;
-    case QOpenGLDebugMessage::AnySource:
-        break;
-    }
-
-    Q_ASSERT_X(false, Q_FUNC_INFO, "Invalid message source");
-    return GL_DEBUG_SOURCE_OTHER;
-}
-
-/*!
-    \internal
-*/
-static QString qt_messageSourceToString(QOpenGLDebugMessage::Source source)
-{
-    switch (source) {
-    case QOpenGLDebugMessage::InvalidSource:
-        return QStringLiteral("InvalidSource");
-    case QOpenGLDebugMessage::APISource:
-        return QStringLiteral("APISource");
-    case QOpenGLDebugMessage::WindowSystemSource:
-        return QStringLiteral("WindowSystemSource");
-    case QOpenGLDebugMessage::ShaderCompilerSource:
-        return QStringLiteral("ShaderCompilerSource");
-    case QOpenGLDebugMessage::ThirdPartySource:
-        return QStringLiteral("ThirdPartySource");
-    case QOpenGLDebugMessage::ApplicationSource:
-        return QStringLiteral("ApplicationSource");
-    case QOpenGLDebugMessage::OtherSource:
-        return QStringLiteral("OtherSource");
-    case QOpenGLDebugMessage::AnySource:
-        return QStringLiteral("AnySource");
-    }
-
-    Q_ASSERT_X(false, Q_FUNC_INFO, "Unknown message source");
-    return QString();
-}
-
-/*!
-    \internal
-*/
-static QOpenGLDebugMessage::Type qt_messageTypeFromGL(GLenum type)
-{
-    switch (type) {
-    case GL_DEBUG_TYPE_ERROR:
-        return QOpenGLDebugMessage::ErrorType;
-    case GL_DEBUG_TYPE_DEPRECATED_BEHAVIOR:
-    return QOpenGLDebugMessage::DeprecatedBehaviorType;
-    case GL_DEBUG_TYPE_UNDEFINED_BEHAVIOR:
-        return QOpenGLDebugMessage::UndefinedBehaviorType;
-    case GL_DEBUG_TYPE_PORTABILITY:
-        return QOpenGLDebugMessage::PortabilityType;
-    case GL_DEBUG_TYPE_PERFORMANCE:
-        return QOpenGLDebugMessage::PerformanceType;
-    case GL_DEBUG_TYPE_OTHER:
-        return QOpenGLDebugMessage::OtherType;
-    case GL_DEBUG_TYPE_MARKER:
-        return QOpenGLDebugMessage::MarkerType;
-    case GL_DEBUG_TYPE_PUSH_GROUP:
-        return QOpenGLDebugMessage::GroupPushType;
-    case GL_DEBUG_TYPE_POP_GROUP:
-        return QOpenGLDebugMessage::GroupPopType;
-    }
-
-    Q_ASSERT_X(false, Q_FUNC_INFO, "Unknown message type from GL");
-    return QOpenGLDebugMessage::OtherType;
-}
-
-/*!
-    \internal
-*/
-static GLenum qt_messageTypeToGL(QOpenGLDebugMessage::Type type)
-{
-    switch (type) {
-    case QOpenGLDebugMessage::InvalidType:
-        break;
-    case QOpenGLDebugMessage::ErrorType:
-        return GL_DEBUG_TYPE_ERROR;
-    case QOpenGLDebugMessage::DeprecatedBehaviorType:
-        return GL_DEBUG_TYPE_DEPRECATED_BEHAVIOR;
-    case QOpenGLDebugMessage::UndefinedBehaviorType:
-        return GL_DEBUG_TYPE_UNDEFINED_BEHAVIOR;
-    case QOpenGLDebugMessage::PortabilityType:
-        return GL_DEBUG_TYPE_PORTABILITY;
-    case QOpenGLDebugMessage::PerformanceType:
-        return GL_DEBUG_TYPE_PERFORMANCE;
-    case QOpenGLDebugMessage::OtherType:
-        return GL_DEBUG_TYPE_OTHER;
-    case QOpenGLDebugMessage::MarkerType:
-        return GL_DEBUG_TYPE_MARKER;
-    case QOpenGLDebugMessage::GroupPushType:
-        return GL_DEBUG_TYPE_PUSH_GROUP;
-    case QOpenGLDebugMessage::GroupPopType:
-        return GL_DEBUG_TYPE_POP_GROUP;
-    case QOpenGLDebugMessage::AnyType:
-        break;
-    }
-
-    Q_ASSERT_X(false, Q_FUNC_INFO, "Invalid message type");
-    return GL_DEBUG_TYPE_OTHER;
-}
-
-/*!
-    \internal
-*/
-static QString qt_messageTypeToString(QOpenGLDebugMessage::Type type)
-{
-    switch (type) {
-    case QOpenGLDebugMessage::InvalidType:
-        return QStringLiteral("InvalidType");
-    case QOpenGLDebugMessage::ErrorType:
-        return QStringLiteral("ErrorType");
-    case QOpenGLDebugMessage::DeprecatedBehaviorType:
-        return QStringLiteral("DeprecatedBehaviorType");
-    case QOpenGLDebugMessage::UndefinedBehaviorType:
-        return QStringLiteral("UndefinedBehaviorType");
-    case QOpenGLDebugMessage::PortabilityType:
-        return QStringLiteral("PortabilityType");
-    case QOpenGLDebugMessage::PerformanceType:
-        return QStringLiteral("PerformanceType");
-    case QOpenGLDebugMessage::OtherType:
-        return QStringLiteral("OtherType");
-    case QOpenGLDebugMessage::MarkerType:
-        return QStringLiteral("MarkerType");
-    case QOpenGLDebugMessage::GroupPushType:
-        return QStringLiteral("GroupPushType");
-    case QOpenGLDebugMessage::GroupPopType:
-        return QStringLiteral("GroupPopType");
-    case QOpenGLDebugMessage::AnyType:
-        return QStringLiteral("AnyType");
-    }
-
-    Q_ASSERT_X(false, Q_FUNC_INFO, "Unknown message type");
-    return QString();
-}
-
-/*!
-    \internal
-*/
-static QOpenGLDebugMessage::Severity qt_messageSeverityFromGL(GLenum severity)
-{
-    switch (severity) {
-    case GL_DEBUG_SEVERITY_HIGH:
-        return QOpenGLDebugMessage::HighSeverity;
-    case GL_DEBUG_SEVERITY_MEDIUM:
-        return QOpenGLDebugMessage::MediumSeverity;
-    case GL_DEBUG_SEVERITY_LOW:
-        return QOpenGLDebugMessage::LowSeverity;
-    case GL_DEBUG_SEVERITY_NOTIFICATION:
-        return QOpenGLDebugMessage::NotificationSeverity;
-    }
-
-    Q_ASSERT_X(false, Q_FUNC_INFO, "Unknown message severity from GL");
-    return QOpenGLDebugMessage::NotificationSeverity;
-}
-
-/*!
-    \internal
-*/
-static GLenum qt_messageSeverityToGL(QOpenGLDebugMessage::Severity severity)
-{
-    switch (severity) {
-    case QOpenGLDebugMessage::InvalidSeverity:
-        break;
-    case QOpenGLDebugMessage::HighSeverity:
-        return GL_DEBUG_SEVERITY_HIGH;
-    case QOpenGLDebugMessage::MediumSeverity:
-        return GL_DEBUG_SEVERITY_MEDIUM;
-    case QOpenGLDebugMessage::LowSeverity:
-        return GL_DEBUG_SEVERITY_LOW;
-    case QOpenGLDebugMessage::NotificationSeverity:
-        return GL_DEBUG_SEVERITY_NOTIFICATION;
-    case QOpenGLDebugMessage::AnySeverity:
-        break;
-    }
-
-    Q_ASSERT_X(false, Q_FUNC_INFO, "Invalid message severity");
-    return GL_DEBUG_SEVERITY_NOTIFICATION;
-}
-
-/*!
-    \internal
-*/
-static QString qt_messageSeverityToString(QOpenGLDebugMessage::Severity severity)
-{
-    switch (severity) {
-    case QOpenGLDebugMessage::InvalidSeverity:
-        return QStringLiteral("InvalidSeverity");
-    case QOpenGLDebugMessage::HighSeverity:
-        return QStringLiteral("HighSeverity");
-    case QOpenGLDebugMessage::MediumSeverity:
-        return QStringLiteral("MediumSeverity");
-    case QOpenGLDebugMessage::LowSeverity:
-        return QStringLiteral("LowSeverity");
-    case QOpenGLDebugMessage::NotificationSeverity:
-        return QStringLiteral("NotificationSeverity");
-    case QOpenGLDebugMessage::AnySeverity:
-        return QStringLiteral("AnySeverity");
-    }
-
-    Q_ASSERT_X(false, Q_FUNC_INFO, "Unknown message severity");
-    return QString();
-}
-
-class QOpenGLDebugMessagePrivate : public QSharedData
-{
-public:
-    QOpenGLDebugMessagePrivate();
-
-    QString message;
-    GLuint id;
-    QOpenGLDebugMessage::Source source;
-    QOpenGLDebugMessage::Type type;
-    QOpenGLDebugMessage::Severity severity;
-};
-
-/*!
-    \internal
-*/
-QOpenGLDebugMessagePrivate::QOpenGLDebugMessagePrivate()
-    : message(),
-      id(0),
-      source(QOpenGLDebugMessage::InvalidSource),
-      type(QOpenGLDebugMessage::InvalidType),
-      severity(QOpenGLDebugMessage::InvalidSeverity)
-{
-}
-
-
-/*!
-    Constructs a debug message with an empty message string, id set to 0,
-    source set to InvalidSource, type set to InvalidType, and severity set to
-    InvalidSeverity.
-
-    \note This constructor should not be used to create a debug message;
-    instead, use the createApplicationMessage() or the createThirdPartyMessage()
-    static functions.
-
-    \sa createApplicationMessage(), createThirdPartyMessage()
-*/
-QOpenGLDebugMessage::QOpenGLDebugMessage()
-    : d(new QOpenGLDebugMessagePrivate)
-{
-}
-
-/*!
-    Constructs a debug message as a copy of \a debugMessage.
-
-    \sa operator=()
-*/
-QOpenGLDebugMessage::QOpenGLDebugMessage(const QOpenGLDebugMessage &debugMessage)
-    : d(debugMessage.d)
-{
-}
-
-/*!
-    Destroys this debug message.
-*/
-QOpenGLDebugMessage::~QOpenGLDebugMessage()
-{
-}
-
-/*!
-    Assigns the message \a debugMessage to this object, and returns a reference
-    to the copy.
-*/
-QOpenGLDebugMessage &QOpenGLDebugMessage::operator=(const QOpenGLDebugMessage &debugMessage)
-{
-    d = debugMessage.d;
-    return *this;
-}
-
-/*!
-   \fn QOpenGLDebugMessage &QOpenGLDebugMessage::operator=(QOpenGLDebugMessage &&debugMessage)
-
-   Move-assigns \a debugMessage to this object.
-*/
-
-/*!
-    \fn void QOpenGLDebugMessage::swap(QOpenGLDebugMessage &debugMessage)
-
-    Swaps the message \a debugMessage with this message. This operation is very
-    fast and never fails.
-*/
-
-/*!
-    Returns the source of the debug message.
-*/
-QOpenGLDebugMessage::Source QOpenGLDebugMessage::source() const
-{
-    return d->source;
-}
-
-/*!
-    Returns the type of the debug message.
-*/
-QOpenGLDebugMessage::Type QOpenGLDebugMessage::type() const
-{
-    return d->type;
-}
-
-/*!
-    Returns the severity of the debug message.
-*/
-QOpenGLDebugMessage::Severity QOpenGLDebugMessage::severity() const
-{
-    return d->severity;
-}
-
-/*!
-    Returns the id of the debug message. Ids are generally vendor-specific.
-*/
-GLuint QOpenGLDebugMessage::id() const
-{
-    return d->id;
-}
-
-/*!
-    Returns the textual message contained by this debug message.
-*/
-QString QOpenGLDebugMessage::message() const
-{
-    return d->message;
-}
-
-/*!
-    Constructs and returns a debug message with \a text as its text, \a id
-    as id, \a severity as severity, and \a type as type. The message source
-    will be set to ApplicationSource.
-
-    \sa QOpenGLDebugLogger::logMessage(), createThirdPartyMessage()
-*/
-QOpenGLDebugMessage QOpenGLDebugMessage::createApplicationMessage(const QString &text,
-                                                                  GLuint id,
-                                                                  QOpenGLDebugMessage::Severity severity,
-                                                                  QOpenGLDebugMessage::Type type)
-{
-    QOpenGLDebugMessage m;
-    m.d->message = text;
-    m.d->id = id;
-    m.d->severity = severity;
-    m.d->type = type;
-    m.d->source = ApplicationSource;
-    return m;
-}
-
-/*!
-    Constructs and returns a debug message with \a text as its text, \a id
-    as id, \a severity as severity, and \a type as type. The message source
-    will be set to ThirdPartySource.
-
-    \sa QOpenGLDebugLogger::logMessage(), createApplicationMessage()
-*/
-QOpenGLDebugMessage QOpenGLDebugMessage::createThirdPartyMessage(const QString &text,
-                                                                 GLuint id,
-                                                                 QOpenGLDebugMessage::Severity severity,
-                                                                 QOpenGLDebugMessage::Type type)
-{
-    QOpenGLDebugMessage m;
-    m.d->message = text;
-    m.d->id = id;
-    m.d->severity = severity;
-    m.d->type = type;
-    m.d->source = ThirdPartySource;
-    return m;
-}
-
-/*!
-    Returns \c true if this debug message is equal to \a debugMessage, or false
-    otherwise. Two debugging messages are equal if they have the same textual
-    message, the same id, the same source, the same type and the same severity.
-
-    \sa operator!=()
-*/
-bool QOpenGLDebugMessage::operator==(const QOpenGLDebugMessage &debugMessage) const
-{
-    return (d == debugMessage.d)
-            || (d->id == debugMessage.d->id
-                && d->source == debugMessage.d->source
-                && d->type == debugMessage.d->type
-                && d->severity == debugMessage.d->severity
-                && d->message == debugMessage.d->message);
-}
-
-/*!
-    \fn bool QOpenGLDebugMessage::operator!=(const QOpenGLDebugMessage &debugMessage) const
-
-    Returns \c true if this message is different from \a debugMessage, or false
-    otherwise.
-
-    \sa operator==()
-*/
-
-#ifndef QT_NO_DEBUG_STREAM
-/*!
-    \relates QOpenGLDebugMessage
-
-    Writes the source \a source into the debug object \a debug for debugging
-    purposes.
-*/
-QDebug operator<<(QDebug debug, QOpenGLDebugMessage::Source source)
-{
-    QDebugStateSaver saver(debug);
-    debug.nospace() << "QOpenGLDebugMessage::Source("
-                    << qt_messageSourceToString(source)
-                    << ')';
-    return debug;
-}
-
-/*!
-    \relates QOpenGLDebugMessage
-
-    Writes the type \a type into the debug object \a debug for debugging
-    purposes.
-*/
-QDebug operator<<(QDebug debug, QOpenGLDebugMessage::Type type)
-{
-    QDebugStateSaver saver(debug);
-    debug.nospace() << "QOpenGLDebugMessage::Type("
-                    << qt_messageTypeToString(type)
-                    << ')';
-    return debug;
-}
-
-/*!
-    \relates QOpenGLDebugMessage
-
-    Writes the severity \a severity into the debug object \a debug for debugging
-    purposes.
-*/
-QDebug operator<<(QDebug debug, QOpenGLDebugMessage::Severity severity)
-{
-    QDebugStateSaver saver(debug);
-    debug.nospace() << "QOpenGLDebugMessage::Severity("
-                    << qt_messageSeverityToString(severity)
-                    << ')';
-    return debug;
-}
-
-/*!
-    \relates QOpenGLDebugMessage
-
-    Writes the message \a message into the debug object \a debug for debugging
-    purposes.
-*/
-QDebug operator<<(QDebug debug, const QOpenGLDebugMessage &message)
-{
-    QDebugStateSaver saver(debug);
-    debug.nospace() << "QOpenGLDebugMessage("
-                    << qt_messageSourceToString(message.source()) << ", "
-                    << message.id() << ", "
-                    << message.message() << ", "
-                    << qt_messageSeverityToString(message.severity()) << ", "
-                    << qt_messageTypeToString(message.type()) << ')';
-    return debug;
-
-}
-#endif // QT_NO_DEBUG_STREAM
-
-typedef void (QOPENGLF_APIENTRYP qt_glDebugMessageControl_t)(GLenum source, GLenum type, GLenum severity, GLsizei count, const GLuint *ids, GLboolean enabled);
-typedef void (QOPENGLF_APIENTRYP qt_glDebugMessageInsert_t)(GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar *buf);
-typedef void (QOPENGLF_APIENTRYP qt_glDebugMessageCallback_t)(GLDEBUGPROC callback, const void *userParam);
-typedef GLuint (QOPENGLF_APIENTRYP qt_glGetDebugMessageLog_t)(GLuint count, GLsizei bufsize, GLenum *sources, GLenum *types, GLuint *ids, GLenum *severities, GLsizei *lengths, GLchar *messageLog);
-typedef void (QOPENGLF_APIENTRYP qt_glPushDebugGroup_t)(GLenum source, GLuint id, GLsizei length, const GLchar *message);
-typedef void (QOPENGLF_APIENTRYP qt_glPopDebugGroup_t)();
-typedef void (QOPENGLF_APIENTRYP qt_glGetPointerv_t)(GLenum pname, GLvoid **params);
-
-class QOpenGLDebugLoggerPrivate : public QObjectPrivate
-{
-    Q_DECLARE_PUBLIC(QOpenGLDebugLogger)
-public:
-    QOpenGLDebugLoggerPrivate();
-
-    void handleMessage(GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar *rawMessage);
-    void controlDebugMessages(QOpenGLDebugMessage::Sources sources,
-                              QOpenGLDebugMessage::Types types,
-                              QOpenGLDebugMessage::Severities severities,
-                              const QVector<GLuint> &ids,
-                              const QByteArray &callerName,
-                              bool enable);
-    void _q_contextAboutToBeDestroyed();
-
-    qt_glDebugMessageControl_t glDebugMessageControl;
-    qt_glDebugMessageInsert_t glDebugMessageInsert;
-    qt_glDebugMessageCallback_t glDebugMessageCallback;
-    qt_glGetDebugMessageLog_t glGetDebugMessageLog;
-    qt_glPushDebugGroup_t glPushDebugGroup;
-    qt_glPopDebugGroup_t glPopDebugGroup;
-    qt_glGetPointerv_t glGetPointerv;
-
-    GLDEBUGPROC oldDebugCallbackFunction;
-    void *oldDebugCallbackParameter;
-    QOpenGLContext *context;
-    GLint maxMessageLength;
-    QOpenGLDebugLogger::LoggingMode loggingMode;
-    bool initialized : 1;
-    bool isLogging : 1;
-    bool debugWasEnabled : 1;
-    bool syncDebugWasEnabled : 1;
-};
-
-/*!
-    \internal
-*/
-QOpenGLDebugLoggerPrivate::QOpenGLDebugLoggerPrivate()
-    : glDebugMessageControl(nullptr),
-      glDebugMessageInsert(nullptr),
-      glDebugMessageCallback(nullptr),
-      glGetDebugMessageLog(nullptr),
-      glPushDebugGroup(nullptr),
-      glPopDebugGroup(nullptr),
-      oldDebugCallbackFunction(nullptr),
-      context(nullptr),
-      maxMessageLength(0),
-      loggingMode(QOpenGLDebugLogger::AsynchronousLogging),
-      initialized(false),
-      isLogging(false),
-      debugWasEnabled(false),
-      syncDebugWasEnabled(false)
-{
-}
-
-/*!
-    \internal
-*/
-void QOpenGLDebugLoggerPrivate::handleMessage(GLenum source,
-                                              GLenum type,
-                                              GLuint id,
-                                              GLenum severity,
-                                              GLsizei length,
-                                              const GLchar *rawMessage)
-{
-    if (oldDebugCallbackFunction)
-        oldDebugCallbackFunction(source, type, id, severity, length, rawMessage, oldDebugCallbackParameter);
-
-    QOpenGLDebugMessage message;
-
-    QOpenGLDebugMessagePrivate *messagePrivate = message.d.data();
-    messagePrivate->source = qt_messageSourceFromGL(source);
-    messagePrivate->type = qt_messageTypeFromGL(type);
-    messagePrivate->id = id;
-    messagePrivate->severity = qt_messageSeverityFromGL(severity);
-    // not passing the length to fromUtf8, as some bugged OpenGL drivers
-    // do not handle the length correctly. Just rely on the message to be NUL terminated.
-    messagePrivate->message = QString::fromUtf8(rawMessage);
-
-    Q_Q(QOpenGLDebugLogger);
-    emit q->messageLogged(message);
-}
-
-/*!
-    \internal
-*/
-void QOpenGLDebugLoggerPrivate::controlDebugMessages(QOpenGLDebugMessage::Sources sources,
-                                                     QOpenGLDebugMessage::Types types,
-                                                     QOpenGLDebugMessage::Severities severities,
-                                                     const QVector<GLuint> &ids,
-                                                     const QByteArray &callerName,
-                                                     bool enable)
-{
-    if (!initialized) {
-        qWarning("QOpenGLDebugLogger::%s(): object must be initialized before enabling/disabling messages", callerName.constData());
-        return;
-    }
-    if (sources == QOpenGLDebugMessage::InvalidSource) {
-        qWarning("QOpenGLDebugLogger::%s(): invalid source specified", callerName.constData());
-        return;
-    }
-    if (types == QOpenGLDebugMessage::InvalidType) {
-        qWarning("QOpenGLDebugLogger::%s(): invalid type specified", callerName.constData());
-        return;
-    }
-    if (severities == QOpenGLDebugMessage::InvalidSeverity) {
-        qWarning("QOpenGLDebugLogger::%s(): invalid severity specified", callerName.constData());
-        return;
-    }
-
-    QVarLengthArray<GLenum, 8> glSources;
-    QVarLengthArray<GLenum, 8> glTypes;
-    QVarLengthArray<GLenum, 8> glSeverities;
-
-    if (ids.count() > 0) {
-        Q_ASSERT(severities == QOpenGLDebugMessage::AnySeverity);
-
-        // The GL_KHR_debug extension says:
-        //
-        //        - If <count> is greater than zero, then <ids> is an array of <count>
-        //          message IDs for the specified combination of <source> and <type>. In
-        //          this case, if <source> or <type> is DONT_CARE, or <severity> is not
-        //          DONT_CARE, the error INVALID_OPERATION is generated. If <count> is
-        //          zero, the value if <ids> is ignored.
-        //
-        // This means we can't convert AnySource or AnyType into DONT_CARE, but we have to roll
-        // them into individual sources/types.
-
-        if (sources == QOpenGLDebugMessage::AnySource) {
-            sources = QOpenGLDebugMessage::InvalidSource;
-            for (uint i = 1; i <= QOpenGLDebugMessage::LastSource; i = i << 1)
-                sources |= QOpenGLDebugMessage::Source(i);
-        }
-
-        if (types == QOpenGLDebugMessage::AnyType) {
-            types = QOpenGLDebugMessage::InvalidType;
-            for (uint i = 1; i <= QOpenGLDebugMessage::LastType; i = i << 1)
-                types |= QOpenGLDebugMessage::Type(i);
-        }
-    }
-
-#define CONVERT_TO_GL_DEBUG_MESSAGE_CONTROL_PARAMETERS(type, source, target) \
-    if (source == QOpenGLDebugMessage::Any ## type) { \
-        target << GL_DONT_CARE; \
-    } else { \
-        for (uint i = 1; i <= QOpenGLDebugMessage::Last ## type; i = i << 1) \
-            if (source.testFlag(QOpenGLDebugMessage:: type (i))) \
-                target << qt_message ## type ## ToGL (QOpenGLDebugMessage:: type (i)); \
-    }
-
-    CONVERT_TO_GL_DEBUG_MESSAGE_CONTROL_PARAMETERS(Source, sources, glSources)
-    CONVERT_TO_GL_DEBUG_MESSAGE_CONTROL_PARAMETERS(Type, types, glTypes)
-    CONVERT_TO_GL_DEBUG_MESSAGE_CONTROL_PARAMETERS(Severity, severities, glSeverities)
-#undef CONVERT_TO_GL_DEBUG_MESSAGE_CONTROL_PARAMETERS
-
-    const GLsizei idCount = ids.count();
-    // The GL_KHR_debug extension says that if idCount is 0, idPtr must be ignored.
-    // Unfortunately, some bugged drivers do NOT ignore it, so pass NULL in case.
-    const GLuint * const idPtr = idCount ? ids.constData() : nullptr;
-
-    for (GLenum source : glSources)
-        for (GLenum type : glTypes)
-            for (GLenum severity : glSeverities)
-                glDebugMessageControl(source, type, severity, idCount, idPtr, GLboolean(enable));
-}
-
-/*!
-    \internal
-*/
-void QOpenGLDebugLoggerPrivate::_q_contextAboutToBeDestroyed()
-{
-    Q_ASSERT(context);
-
-    // Re-make our context current somehow, otherwise stopLogging will fail.
-
-    // Save the current context and its surface in case we need to set them back
-    QOpenGLContext *currentContext = QOpenGLContext::currentContext();
-    QSurface *currentSurface = nullptr;
-
-    QScopedPointer<QOffscreenSurface> offscreenSurface;
-
-    if (context != currentContext) {
-        // Make our old context current on a temporary surface
-        if (currentContext)
-            currentSurface = currentContext->surface();
-
-        offscreenSurface.reset(new QOffscreenSurface);
-        offscreenSurface->setFormat(context->format());
-        offscreenSurface->create();
-        if (!context->makeCurrent(offscreenSurface.data()))
-            qWarning("QOpenGLDebugLoggerPrivate::_q_contextAboutToBeDestroyed(): could not make the owning GL context current for cleanup");
-    }
-
-    Q_Q(QOpenGLDebugLogger);
-    q->stopLogging();
-
-    if (offscreenSurface) {
-        // We did change the current context: set it back
-        if (currentContext)
-            currentContext->makeCurrent(currentSurface);
-        else
-            context->doneCurrent();
-    }
-
-    QObject::disconnect(context, SIGNAL(aboutToBeDestroyed()), q, SLOT(_q_contextAboutToBeDestroyed()));
-    context = nullptr;
-    initialized = false;
-}
-
-extern "C" {
-static void QOPENGLF_APIENTRY qt_opengl_debug_callback(GLenum source,
-                                                       GLenum type,
-                                                       GLuint id,
-                                                       GLenum severity,
-                                                       GLsizei length,
-                                                       const GLchar *rawMessage,
-                                                       const GLvoid *userParam)
-{
-    QOpenGLDebugLoggerPrivate *loggerPrivate = static_cast<QOpenGLDebugLoggerPrivate *>(const_cast<GLvoid *>(userParam));
-    loggerPrivate->handleMessage(source, type, id, severity, length, rawMessage);
-}
-}
-
-/*!
-    Constructs a new logger object with the given \a parent.
-
-    \note The object must be initialized before logging can happen.
-
-    \sa initialize()
-*/
-QOpenGLDebugLogger::QOpenGLDebugLogger(QObject *parent)
-    : QObject(*new QOpenGLDebugLoggerPrivate, parent)
-{
-    // QOpenGLDebugMessage is going to be mostly used as an argument
-    // of a cross thread connection, therefore let's ease the life for the users
-    // and register the type for them.
-    qRegisterMetaType<QOpenGLDebugMessage>();
-}
-
-/*!
-    Destroys the logger object.
-*/
-QOpenGLDebugLogger::~QOpenGLDebugLogger()
-{
-    stopLogging();
-}
-
-/*!
-    Initializes the object in the current OpenGL context. The context must
-    support the \c{GL_KHR_debug} extension for the initialization to succeed.
-    The object must be initialized before any logging can happen.
-
-    It is safe to call this function multiple times from the same context.
-
-    This function can also be used to change the context of a previously
-    initialized object; note that in this case the object must not be logging
-    when you call this function.
-
-    Returns \c true if the logger is successfully initialized; false otherwise.
-
-    \sa QOpenGLContext
-*/
-bool QOpenGLDebugLogger::initialize()
-{
-    QOpenGLContext *context = QOpenGLContext::currentContext();
-    if (!context) {
-        qWarning("QOpenGLDebugLogger::initialize(): no current OpenGL context found.");
-        return false;
-    }
-
-    Q_D(QOpenGLDebugLogger);
-    if (d->context == context) {
-        // context is non-NULL, d->context is non NULL only on successful initialization.
-        Q_ASSERT(d->initialized);
-        return true;
-    }
-
-    if (d->isLogging) {
-        qWarning("QOpenGLDebugLogger::initialize(): cannot initialize the object while logging. Please stop the logging first.");
-        return false;
-    }
-
-    if (d->context)
-        disconnect(d->context, SIGNAL(aboutToBeDestroyed()), this, SLOT(_q_contextAboutToBeDestroyed()));
-
-    d->initialized = false;
-    d->context = nullptr;
-
-    if (!context->hasExtension(QByteArrayLiteral("GL_KHR_debug")))
-        return false;
-
-    d->context = context;
-    connect(d->context, SIGNAL(aboutToBeDestroyed()), this, SLOT(_q_contextAboutToBeDestroyed()));
-
-#define GET_DEBUG_PROC_ADDRESS(procName) \
-    d->procName = reinterpret_cast< qt_ ## procName ## _t >( \
-        d->context->getProcAddress(d->context->isOpenGLES() ? (#procName "KHR") : (#procName)) \
-    );
-
-    GET_DEBUG_PROC_ADDRESS(glDebugMessageControl);
-    GET_DEBUG_PROC_ADDRESS(glDebugMessageInsert);
-    GET_DEBUG_PROC_ADDRESS(glDebugMessageCallback);
-    GET_DEBUG_PROC_ADDRESS(glGetDebugMessageLog);
-    GET_DEBUG_PROC_ADDRESS(glPushDebugGroup);
-    GET_DEBUG_PROC_ADDRESS(glPopDebugGroup);
-    GET_DEBUG_PROC_ADDRESS(glGetPointerv)
-
-#undef GET_DEBUG_PROC_ADDRESS
-
-    QOpenGLContext::currentContext()->functions()->glGetIntegerv(GL_MAX_DEBUG_MESSAGE_LENGTH, &d->maxMessageLength);
-
-#ifndef QT_NO_DEBUG
-    if (!d->context->format().testOption(QSurfaceFormat::DebugContext)) {
-        qWarning("QOpenGLDebugLogger::initialize(): the current context is not a debug context:\n"
-                 "    this means that the GL may not generate any debug output at all.\n"
-                 "    To avoid this warning, try creating the context with the\n"
-                 "    QSurfaceFormat::DebugContext surface format option.");
-    }
-#endif // QT_NO_DEBUG
-
-    d->initialized = true;
-    return true;
-}
-
-/*!
-    Returns \c true if this object is currently logging, false otherwise.
-
-    \sa startLogging()
-*/
-bool QOpenGLDebugLogger::isLogging() const
-{
-    Q_D(const QOpenGLDebugLogger);
-    return d->isLogging;
-}
-
-/*!
-    Starts logging messages coming from the OpenGL server. When a new message
-    is received, the signal messageLogged() is emitted, carrying the logged
-    message as argument.
-
-    \a loggingMode specifies whether the logging must be asynchronous (the default)
-    or synchronous.
-
-    QOpenGLDebugLogger will record the values of \c{GL_DEBUG_OUTPUT} and
-    \c{GL_DEBUG_OUTPUT_SYNCHRONOUS} when logging is started, and set them back
-    when logging is stopped. Moreover, any user-defined OpenGL debug callback
-    installed when this function is invoked will be restored when logging is
-    stopped; QOpenGLDebugLogger will ensure that the pre-existing callback will
-    still be invoked when logging.
-
-    \note It's not possible to change the logging mode without stopping and
-    starting logging again. This might change in a future version of Qt.
-
-    \note The object must be initialized before logging can happen.
-
-    \sa stopLogging(), initialize()
-*/
-void QOpenGLDebugLogger::startLogging(QOpenGLDebugLogger::LoggingMode loggingMode)
-{
-    Q_D(QOpenGLDebugLogger);
-    if (!d->initialized) {
-        qWarning("QOpenGLDebugLogger::startLogging(): object must be initialized before logging can start");
-        return;
-    }
-    if (d->isLogging) {
-        qWarning("QOpenGLDebugLogger::startLogging(): this object is already logging");
-        return;
-    }
-
-    d->isLogging = true;
-    d->loggingMode = loggingMode;
-
-    d->glGetPointerv(GL_DEBUG_CALLBACK_FUNCTION, reinterpret_cast<void **>(&d->oldDebugCallbackFunction));
-    d->glGetPointerv(GL_DEBUG_CALLBACK_USER_PARAM, &d->oldDebugCallbackParameter);
-
-    d->glDebugMessageCallback(&qt_opengl_debug_callback, d);
-
-    QOpenGLFunctions *funcs = QOpenGLContext::currentContext()->functions();
-    d->debugWasEnabled = funcs->glIsEnabled(GL_DEBUG_OUTPUT);
-    d->syncDebugWasEnabled = funcs->glIsEnabled(GL_DEBUG_OUTPUT_SYNCHRONOUS);
-
-    if (d->loggingMode == SynchronousLogging)
-        funcs->glEnable(GL_DEBUG_OUTPUT_SYNCHRONOUS);
-    else
-        funcs->glDisable(GL_DEBUG_OUTPUT_SYNCHRONOUS);
-
-    funcs->glEnable(GL_DEBUG_OUTPUT);
-}
-
-/*!
-    Returns the logging mode of the object.
-
-    \sa startLogging()
-*/
-QOpenGLDebugLogger::LoggingMode QOpenGLDebugLogger::loggingMode() const
-{
-    Q_D(const QOpenGLDebugLogger);
-    return d->loggingMode;
-}
-
-/*!
-    Stops logging messages from the OpenGL server.
-
-    \sa startLogging()
-*/
-void QOpenGLDebugLogger::stopLogging()
-{
-    Q_D(QOpenGLDebugLogger);
-    if (!d->isLogging)
-        return;
-
-    QOpenGLContext *currentContext = QOpenGLContext::currentContext();
-    if (!currentContext || currentContext != d->context) {
-        qWarning("QOpenGLDebugLogger::stopLogging(): attempting to stop logging with the wrong OpenGL context current");
-        return;
-    }
-
-    d->isLogging = false;
-
-    d->glDebugMessageCallback(d->oldDebugCallbackFunction, d->oldDebugCallbackParameter);
-
-    QOpenGLFunctions *funcs = QOpenGLContext::currentContext()->functions();
-    if (!d->debugWasEnabled)
-        funcs->glDisable(GL_DEBUG_OUTPUT);
-
-    if (d->syncDebugWasEnabled)
-        funcs->glEnable(GL_DEBUG_OUTPUT_SYNCHRONOUS);
-    else
-        funcs->glDisable(GL_DEBUG_OUTPUT_SYNCHRONOUS);
-}
-
-/*!
-    Inserts the message \a debugMessage into the OpenGL debug log. This provides
-    a way for applications or libraries to insert custom messages that can
-    ease the debugging of OpenGL applications.
-
-    \note \a debugMessage must have QOpenGLDebugMessage::ApplicationSource or
-    QOpenGLDebugMessage::ThirdPartySource as its source, and a valid
-    type and severity, otherwise it will not be inserted into the log.
-
-    \note The object must be initialized before logging can happen.
-
-    \sa initialize()
-*/
-void QOpenGLDebugLogger::logMessage(const QOpenGLDebugMessage &debugMessage)
-{
-    Q_D(QOpenGLDebugLogger);
-    if (!d->initialized) {
-        qWarning("QOpenGLDebugLogger::logMessage(): object must be initialized before logging messages");
-        return;
-    }
-    if (debugMessage.source() != QOpenGLDebugMessage::ApplicationSource
-            && debugMessage.source() != QOpenGLDebugMessage::ThirdPartySource) {
-        qWarning("QOpenGLDebugLogger::logMessage(): using a message source different from ApplicationSource\n"
-                 "    or ThirdPartySource is not supported by GL_KHR_debug. The message will not be logged.");
-        return;
-    }
-    if (debugMessage.type() == QOpenGLDebugMessage::InvalidType
-            || debugMessage.type() == QOpenGLDebugMessage::AnyType
-            || debugMessage.severity() == QOpenGLDebugMessage::InvalidSeverity
-            || debugMessage.severity() == QOpenGLDebugMessage::AnySeverity) {
-        qWarning("QOpenGLDebugLogger::logMessage(): the message has a non-valid type and/or severity. The message will not be logged.");
-        return;
-    }
-
-    const GLenum source = qt_messageSourceToGL(debugMessage.source());
-    const GLenum type = qt_messageTypeToGL(debugMessage.type());
-    const GLenum severity = qt_messageSeverityToGL(debugMessage.severity());
-    QByteArray rawMessage = debugMessage.message().toUtf8();
-    rawMessage.append('\0');
-
-    if (rawMessage.length() > d->maxMessageLength) {
-        qWarning("QOpenGLDebugLogger::logMessage(): message too long, truncating it\n"
-                 "    (%d bytes long, but the GL accepts up to %d bytes)", rawMessage.length(), d->maxMessageLength);
-        rawMessage.resize(d->maxMessageLength - 1);
-        rawMessage.append('\0');
-    }
-
-    // Don't pass rawMessage.length(), as unfortunately bugged
-    // OpenGL drivers will eat the trailing NUL in the message. Just rely
-    // on the message being NUL terminated.
-    d->glDebugMessageInsert(source,
-                            type,
-                            debugMessage.id(),
-                            severity,
-                            -1,
-                            rawMessage.constData());
-}
-
-/*!
-    Pushes a debug group with name \a name, id \a id, and source \a source onto
-    the debug groups stack. If the group is successfully pushed, OpenGL will
-    automatically log a message with message \a name, id \a id, source \a
-    source, type QOpenGLDebugMessage::GroupPushType and severity
-    QOpenGLDebugMessage::NotificationSeverity.
-
-    The newly pushed group will inherit the same filtering settings of the
-    group that was on the top of the stack; that is, the filtering will not be
-    changed by pushing a new group.
-
-    \note The \a source must either be QOpenGLDebugMessage::ApplicationSource or
-    QOpenGLDebugMessage::ThirdPartySource, otherwise the group will not be pushed.
-
-    \note The object must be initialized before managing debug groups.
-
-    \sa popGroup(), enableMessages(), disableMessages()
-*/
-void QOpenGLDebugLogger::pushGroup(const QString &name, GLuint id, QOpenGLDebugMessage::Source source)
-{
-    Q_D(QOpenGLDebugLogger);
-    if (!d->initialized) {
-        qWarning("QOpenGLDebugLogger::pushGroup(): object must be initialized before pushing a debug group");
-        return;
-    }
-    if (source != QOpenGLDebugMessage::ApplicationSource
-            && source != QOpenGLDebugMessage::ThirdPartySource) {
-        qWarning("QOpenGLDebugLogger::pushGroup(): using a source different from ApplicationSource\n"
-                 "    or ThirdPartySource is not supported by GL_KHR_debug. The group will not be pushed.");
-        return;
-    }
-
-    QByteArray rawName = name.toUtf8();
-    rawName.append('\0');
-    if (rawName.length() > d->maxMessageLength) {
-        qWarning("QOpenGLDebugLogger::pushGroup(): group name too long, truncating it\n"
-                 "    (%d bytes long, but the GL accepts up to %d bytes)", rawName.length(), d->maxMessageLength);
-        rawName.resize(d->maxMessageLength - 1);
-        rawName.append('\0');
-    }
-
-    // Don't pass rawMessage.length(), as unfortunately bugged
-    // OpenGL drivers will eat the trailing NUL in the name. Just rely
-    // on the name being NUL terminated.
-    d->glPushDebugGroup(qt_messageSourceToGL(source), id, -1, rawName.constData());
-}
-
-/*!
-    Pops the topmost debug group from the debug groups stack. If the group is
-    successfully popped, OpenGL will automatically log a message with message,
-    id and source matching those of the popped group, type
-    QOpenGLDebugMessage::GroupPopType and severity
-    QOpenGLDebugMessage::NotificationSeverity.
-
-    Popping a debug group will restore the message filtering settings of the
-    group that becomes the top of the debug groups stack.
-
-    \note The object must be initialized before managing debug groups.
-
-    \sa pushGroup()
-*/
-void QOpenGLDebugLogger::popGroup()
-{
-    Q_D(QOpenGLDebugLogger);
-    if (!d->initialized) {
-        qWarning("QOpenGLDebugLogger::pushGroup(): object must be initialized before popping a debug group");
-        return;
-    }
-
-    d->glPopDebugGroup();
-}
-
-/*!
-    Enables the logging of messages from the given \a sources, of the given \a
-    types and with the given \a severities and any message id.
-
-    The logging will be enabled in the current control group.
-
-    \sa disableMessages(), pushGroup(), popGroup()
-*/
-void QOpenGLDebugLogger::enableMessages(QOpenGLDebugMessage::Sources sources,
-                                        QOpenGLDebugMessage::Types types,
-                                        QOpenGLDebugMessage::Severities severities)
-{
-    Q_D(QOpenGLDebugLogger);
-    d->controlDebugMessages(sources,
-                            types,
-                            severities,
-                            QVector<GLuint>(),
-                            QByteArrayLiteral("enableMessages"),
-                            true);
-}
-
-/*!
-    Enables the logging of messages with the given \a ids, from the given \a
-    sources and of the given \a types and any severity.
-
-    The logging will be enabled in the current control group.
-
-    \sa disableMessages(), pushGroup(), popGroup()
-*/
-void QOpenGLDebugLogger::enableMessages(const QVector<GLuint> &ids,
-                                        QOpenGLDebugMessage::Sources sources,
-                                        QOpenGLDebugMessage::Types types)
-{
-    Q_D(QOpenGLDebugLogger);
-    d->controlDebugMessages(sources,
-                            types,
-                            QOpenGLDebugMessage::AnySeverity,
-                            ids,
-                            QByteArrayLiteral("enableMessages"),
-                            true);
-}
-
-/*!
-    Disables the logging of messages with the given \a sources, of the given \a
-    types and with the given \a severities and any message id.
-
-    The logging will be disabled in the current control group.
-
-    \sa enableMessages(), pushGroup(), popGroup()
-*/
-void QOpenGLDebugLogger::disableMessages(QOpenGLDebugMessage::Sources sources,
-                                         QOpenGLDebugMessage::Types types,
-                                         QOpenGLDebugMessage::Severities severities)
-{
-    Q_D(QOpenGLDebugLogger);
-    d->controlDebugMessages(sources,
-                            types,
-                            severities,
-                            QVector<GLuint>(),
-                            QByteArrayLiteral("disableMessages"),
-                            false);
-}
-
-/*!
-    Disables the logging of messages with the given \a ids, from the given \a
-    sources and of the given \a types and any severity.
-
-    The logging will be disabled in the current control group.
-
-    \sa enableMessages(), pushGroup(), popGroup()
-*/
-void QOpenGLDebugLogger::disableMessages(const QVector<GLuint> &ids,
-                                         QOpenGLDebugMessage::Sources sources,
-                                         QOpenGLDebugMessage::Types types)
-{
-    Q_D(QOpenGLDebugLogger);
-    d->controlDebugMessages(sources,
-                            types,
-                            QOpenGLDebugMessage::AnySeverity,
-                            ids,
-                            QByteArrayLiteral("disableMessages"),
-                            false);
-}
-
-/*!
-    Reads all the available messages in the OpenGL internal debug log and
-    returns them. Moreover, this function will clear the internal debug log,
-    so that subsequent invocations will not return messages that were
-    already returned.
-
-    \sa startLogging()
-*/
-QList<QOpenGLDebugMessage> QOpenGLDebugLogger::loggedMessages() const
-{
-    Q_D(const QOpenGLDebugLogger);
-    if (!d->initialized) {
-        qWarning("QOpenGLDebugLogger::loggedMessages(): object must be initialized before reading logged messages");
-        return QList<QOpenGLDebugMessage>();
-    }
-
-    static const GLuint maxMessageCount = 128;
-    GLuint messagesRead;
-    GLenum messageSources[maxMessageCount];
-    GLenum messageTypes[maxMessageCount];
-    GLuint messageIds[maxMessageCount];
-    GLenum messageSeverities[maxMessageCount];
-    GLsizei messageLengths[maxMessageCount];
-
-    QByteArray messagesBuffer;
-    messagesBuffer.resize(maxMessageCount * d->maxMessageLength);
-
-    QList<QOpenGLDebugMessage> messages;
-    do {
-        messagesRead = d->glGetDebugMessageLog(maxMessageCount,
-                                               GLsizei(messagesBuffer.size()),
-                                               messageSources,
-                                               messageTypes,
-                                               messageIds,
-                                               messageSeverities,
-                                               messageLengths,
-                                               messagesBuffer.data());
-
-        const char *messagesBufferPtr = messagesBuffer.constData();
-        for (GLuint i = 0; i < messagesRead; ++i) {
-            QOpenGLDebugMessage message;
-
-            QOpenGLDebugMessagePrivate *messagePrivate = message.d.data();
-            messagePrivate->source = qt_messageSourceFromGL(messageSources[i]);
-            messagePrivate->type = qt_messageTypeFromGL(messageTypes[i]);
-            messagePrivate->id = messageIds[i];
-            messagePrivate->severity = qt_messageSeverityFromGL(messageSeverities[i]);
-            messagePrivate->message = QString::fromUtf8(messagesBufferPtr, messageLengths[i] - 1);
-
-            messagesBufferPtr += messageLengths[i];
-            messages << message;
-        }
-    } while (messagesRead == maxMessageCount);
-
-    return messages;
-}
-
-/*!
-    \fn void QOpenGLDebugLogger::messageLogged(const QOpenGLDebugMessage &debugMessage)
-
-    This signal is emitted when a debug message (wrapped by the \a debugMessage
-    argument) is logged from the OpenGL server.
-
-    Depending on the OpenGL implementation, this signal can be emitted
-    from other threads than the one(s) the receiver(s) lives in, and even
-    different from the thread the QOpenGLContext in which this object has
-    been initialized lives in. Moreover, the signal could be emitted from
-    multiple threads at the same time. This is normally not a problem,
-    as Qt will utilize a queued connection for cross-thread signal emissions,
-    but if you force the connection type to Direct then you must be aware of
-    the potential races in the slots connected to this signal.
-
-    If logging have been started in SynchronousLogging mode, OpenGL guarantees
-    that this signal will be emitted from the same thread the QOpenGLContext
-    has been bound to, and no concurrent invocations will ever happen.
-
-    \note Logging must have been started, or this signal will not be emitted.
-
-    \sa startLogging()
-*/
-
-/*!
-    Returns the maximum supported length, in bytes, for the text of the messages
-    passed to logMessage(). This is also the maximum length of a debug group
-    name, as pushing or popping groups will automatically log a message with
-    the debug group name as the message text.
-
-    If a message text is too long, it will be automatically truncated by
-    QOpenGLDebugLogger.
-
-    \note Message texts are encoded in UTF-8 when they get passed to OpenGL, so
-    their size in bytes does not usually match the amount of UTF-16 code units,
-    as returned, for instance, by QString::length(). (It does if the message contains
-    7-bit ASCII only data, which is typical for debug messages.)
-*/
-qint64 QOpenGLDebugLogger::maximumMessageLength() const
-{
-    Q_D(const QOpenGLDebugLogger);
-    if (!d->initialized) {
-        qWarning("QOpenGLDebugLogger::maximumMessageLength(): object must be initialized before reading the maximum message length");
-        return -1;
-    }
-    return d->maxMessageLength;
-}
-
-
-QT_END_NAMESPACE
-
-#include "moc_qopengldebug.cpp"
diff --git a/src/gui/opengl/qopengldebug.h b/src/gui/opengl/qopengldebug.h
deleted file mode 100644
index 7363985d60..0000000000
--- a/src/gui/opengl/qopengldebug.h
+++ /dev/null
@@ -1,221 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2013 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtGui module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QOPENGLDEBUG_H
-#define QOPENGLDEBUG_H
-
-#include <QtGui/qtguiglobal.h>
-
-#ifndef QT_NO_OPENGL
-
-#include <QtCore/qshareddata.h>
-#include <QtCore/qflags.h>
-#include <QtCore/qlist.h>
-#include <QtCore/qvector.h>
-#include <QtCore/qmetatype.h>
-#include <QtCore/qdebug.h>
-#include <QtGui/qopenglcontext.h>
-
-#if defined(Q_CLANG_QDOC)
-#undef GLuint
-typedef unsigned int GLuint;
-#endif
-
-QT_BEGIN_NAMESPACE
-
-class QOpenGLDebugLogger;
-class QOpenGLDebugLoggerPrivate;
-class QOpenGLDebugMessagePrivate;
-
-class Q_GUI_EXPORT QOpenGLDebugMessage
-{
-public:
-    enum Source {
-        InvalidSource        = 0x00000000,
-        APISource            = 0x00000001,
-        WindowSystemSource   = 0x00000002,
-        ShaderCompilerSource = 0x00000004,
-        ThirdPartySource     = 0x00000008,
-        ApplicationSource    = 0x00000010,
-        OtherSource          = 0x00000020,
-        LastSource           = OtherSource, // private API
-        AnySource            = 0xffffffff
-    };
-    Q_DECLARE_FLAGS(Sources, Source)
-
-    enum Type {
-        InvalidType            = 0x00000000,
-        ErrorType              = 0x00000001,
-        DeprecatedBehaviorType = 0x00000002,
-        UndefinedBehaviorType  = 0x00000004,
-        PortabilityType        = 0x00000008,
-        PerformanceType        = 0x00000010,
-        OtherType              = 0x00000020,
-        MarkerType             = 0x00000040,
-        GroupPushType          = 0x00000080,
-        GroupPopType           = 0x00000100,
-        LastType               = GroupPopType, // private API
-        AnyType                = 0xffffffff
-    };
-    Q_DECLARE_FLAGS(Types, Type)
-
-    enum Severity {
-        InvalidSeverity      = 0x00000000,
-        HighSeverity         = 0x00000001,
-        MediumSeverity       = 0x00000002,
-        LowSeverity          = 0x00000004,
-        NotificationSeverity = 0x00000008,
-        LastSeverity         = NotificationSeverity, // private API
-        AnySeverity          = 0xffffffff
-    };
-    Q_DECLARE_FLAGS(Severities, Severity)
-
-    QOpenGLDebugMessage();
-    QOpenGLDebugMessage(const QOpenGLDebugMessage &debugMessage);
-
-    QOpenGLDebugMessage &operator=(const QOpenGLDebugMessage &debugMessage);
-    QOpenGLDebugMessage &operator=(QOpenGLDebugMessage &&other) noexcept { swap(other); return *this; }
-    ~QOpenGLDebugMessage();
-
-    void swap(QOpenGLDebugMessage &other) noexcept { qSwap(d, other.d); }
-
-    Source source() const;
-    Type type() const;
-    Severity severity() const;
-    GLuint id() const;
-    QString message() const;
-
-    static QOpenGLDebugMessage createApplicationMessage(const QString &text,
-                                                        GLuint id = 0,
-                                                        Severity severity = NotificationSeverity,
-                                                        Type type = OtherType);
-    static QOpenGLDebugMessage createThirdPartyMessage(const QString &text,
-                                                       GLuint id = 0,
-                                                       Severity severity = NotificationSeverity,
-                                                       Type type = OtherType);
-
-    bool operator==(const QOpenGLDebugMessage &debugMessage) const;
-    inline bool operator!=(const QOpenGLDebugMessage &debugMessage) const { return !operator==(debugMessage); }
-
-private:
-    friend class QOpenGLDebugLogger;
-    friend class QOpenGLDebugLoggerPrivate;
-    QSharedDataPointer<QOpenGLDebugMessagePrivate> d;
-};
-
-Q_DECLARE_SHARED(QOpenGLDebugMessage)
-Q_DECLARE_OPERATORS_FOR_FLAGS(QOpenGLDebugMessage::Sources)
-Q_DECLARE_OPERATORS_FOR_FLAGS(QOpenGLDebugMessage::Types)
-Q_DECLARE_OPERATORS_FOR_FLAGS(QOpenGLDebugMessage::Severities)
-
-#ifndef QT_NO_DEBUG_STREAM
-Q_GUI_EXPORT QDebug operator<<(QDebug debug, const QOpenGLDebugMessage &message);
-Q_GUI_EXPORT QDebug operator<<(QDebug debug, QOpenGLDebugMessage::Source source);
-Q_GUI_EXPORT QDebug operator<<(QDebug debug, QOpenGLDebugMessage::Type type);
-Q_GUI_EXPORT QDebug operator<<(QDebug debug, QOpenGLDebugMessage::Severity severity);
-#endif
-
-class QOpenGLDebugLoggerPrivate;
-
-class Q_GUI_EXPORT QOpenGLDebugLogger : public QObject
-{
-    Q_OBJECT
-    Q_PROPERTY(LoggingMode loggingMode READ loggingMode)
-
-public:
-    enum LoggingMode {
-        AsynchronousLogging,
-        SynchronousLogging
-    };
-    Q_ENUM(LoggingMode)
-
-    explicit QOpenGLDebugLogger(QObject *parent = nullptr);
-    ~QOpenGLDebugLogger();
-
-    bool initialize();
-
-    bool isLogging() const;
-    LoggingMode loggingMode() const;
-
-    qint64 maximumMessageLength() const;
-
-    void pushGroup(const QString &name,
-                   GLuint id = 0,
-                   QOpenGLDebugMessage::Source source = QOpenGLDebugMessage::ApplicationSource);
-    void popGroup();
-
-    void enableMessages(QOpenGLDebugMessage::Sources sources = QOpenGLDebugMessage::AnySource,
-                        QOpenGLDebugMessage::Types types = QOpenGLDebugMessage::AnyType,
-                        QOpenGLDebugMessage::Severities severities = QOpenGLDebugMessage::AnySeverity);
-
-    void enableMessages(const QVector<GLuint> &ids,
-                        QOpenGLDebugMessage::Sources sources = QOpenGLDebugMessage::AnySource,
-                        QOpenGLDebugMessage::Types types = QOpenGLDebugMessage::AnyType);
-
-    void disableMessages(QOpenGLDebugMessage::Sources sources = QOpenGLDebugMessage::AnySource,
-                         QOpenGLDebugMessage::Types types = QOpenGLDebugMessage::AnyType,
-                         QOpenGLDebugMessage::Severities severities = QOpenGLDebugMessage::AnySeverity);
-
-    void disableMessages(const QVector<GLuint> &ids,
-                         QOpenGLDebugMessage::Sources sources = QOpenGLDebugMessage::AnySource,
-                         QOpenGLDebugMessage::Types types = QOpenGLDebugMessage::AnyType);
-
-    QList<QOpenGLDebugMessage> loggedMessages() const;
-
-public Q_SLOTS:
-    void logMessage(const QOpenGLDebugMessage &debugMessage);
-    void startLogging(LoggingMode loggingMode = AsynchronousLogging);
-    void stopLogging();
-
-Q_SIGNALS:
-    void messageLogged(const QOpenGLDebugMessage &debugMessage);
-
-private:
-    Q_DISABLE_COPY(QOpenGLDebugLogger)
-    Q_DECLARE_PRIVATE(QOpenGLDebugLogger)
-    Q_PRIVATE_SLOT(d_func(), void _q_contextAboutToBeDestroyed())
-};
-
-QT_END_NAMESPACE
-
-Q_DECLARE_METATYPE(QOpenGLDebugMessage)
-
-#endif // QT_NO_OPENGL
-
-#endif // QOPENGLDEBUG_H
diff --git a/src/gui/opengl/qopenglengineshadermanager.cpp b/src/gui/opengl/qopenglengineshadermanager.cpp
deleted file mode 100644
index a569975486..0000000000
--- a/src/gui/opengl/qopenglengineshadermanager.cpp
+++ /dev/null
@@ -1,898 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtGui module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qopenglengineshadermanager_p.h"
-#include "qopenglengineshadersource_p.h"
-#include "qopenglpaintengine_p.h"
-#include "qopenglshadercache_p.h"
-
-#include <QtGui/private/qopenglcontext_p.h>
-#include <QtCore/qthreadstorage.h>
-
-#include <algorithm>
-
-#if defined(QT_DEBUG)
-#include <QMetaEnum>
-#endif
-
-// #define QT_GL_SHARED_SHADER_DEBUG
-
-QT_BEGIN_NAMESPACE
-
-class QOpenGLEngineSharedShadersResource : public QOpenGLSharedResource
-{
-public:
-    QOpenGLEngineSharedShadersResource(QOpenGLContext *ctx)
-        : QOpenGLSharedResource(ctx->shareGroup())
-        , m_shaders(new QOpenGLEngineSharedShaders(ctx))
-    {
-    }
-
-    ~QOpenGLEngineSharedShadersResource()
-    {
-        delete m_shaders;
-    }
-
-    void invalidateResource() override
-    {
-        delete m_shaders;
-        m_shaders = nullptr;
-    }
-
-    void freeResource(QOpenGLContext *) override
-    {
-    }
-
-    QOpenGLEngineSharedShaders *shaders() const { return m_shaders; }
-
-private:
-    QOpenGLEngineSharedShaders *m_shaders;
-};
-
-class QOpenGLShaderStorage
-{
-public:
-    QOpenGLEngineSharedShaders *shadersForThread(QOpenGLContext *context) {
-        QOpenGLMultiGroupSharedResource *&shaders = m_storage.localData();
-        if (!shaders)
-            shaders = new QOpenGLMultiGroupSharedResource;
-        QOpenGLEngineSharedShadersResource *resource =
-            shaders->value<QOpenGLEngineSharedShadersResource>(context);
-        return resource ? resource->shaders() : nullptr;
-    }
-
-private:
-    QThreadStorage<QOpenGLMultiGroupSharedResource *> m_storage;
-};
-
-Q_GLOBAL_STATIC(QOpenGLShaderStorage, qt_shader_storage);
-
-QOpenGLEngineSharedShaders *QOpenGLEngineSharedShaders::shadersForContext(QOpenGLContext *context)
-{
-    return qt_shader_storage()->shadersForThread(context);
-}
-
-const char* QOpenGLEngineSharedShaders::qShaderSnippets[] = {
-    0,0,0,0,0,0,0,0,0,0,
-    0,0,0,0,0,0,0,0,0,0,
-    0,0,0,0,0,0,0,0,0,0,
-    0,0,0,0,0
-};
-
-QOpenGLEngineSharedShaders::QOpenGLEngineSharedShaders(QOpenGLContext* context)
-    : blitShaderProg(nullptr)
-    , simpleShaderProg(nullptr)
-{
-
-/*
-    Rather than having the shader source array statically initialised, it is initialised
-    here instead. This is to allow new shader names to be inserted or existing names moved
-    around without having to change the order of the glsl strings. It is hoped this will
-    make future hard-to-find runtime bugs more obvious and generally give more solid code.
-*/
-
-    // Check if the user has requested an OpenGL 3.2 Core Profile or higher
-    // and if so use GLSL 1.50 core shaders instead of legacy ones.
-    const QSurfaceFormat &fmt = context->format();
-    const bool isCoreProfile = fmt.profile() == QSurfaceFormat::CoreProfile && fmt.version() >= qMakePair(3,2);
-
-    const char** code = qShaderSnippets; // shortcut
-
-    if (isCoreProfile) {
-        code[MainVertexShader] = qopenglslMainVertexShader_core;
-        code[MainWithTexCoordsVertexShader] = qopenglslMainWithTexCoordsVertexShader_core;
-        code[MainWithTexCoordsAndOpacityVertexShader] = qopenglslMainWithTexCoordsAndOpacityVertexShader_core;
-
-        code[UntransformedPositionVertexShader] = qopenglslUntransformedPositionVertexShader_core;
-        code[PositionOnlyVertexShader] = qopenglslPositionOnlyVertexShader_core;
-        code[ComplexGeometryPositionOnlyVertexShader] = qopenglslComplexGeometryPositionOnlyVertexShader_core;
-        code[PositionWithPatternBrushVertexShader] = qopenglslPositionWithPatternBrushVertexShader_core;
-        code[PositionWithLinearGradientBrushVertexShader] = qopenglslPositionWithLinearGradientBrushVertexShader_core;
-        code[PositionWithConicalGradientBrushVertexShader] = qopenglslPositionWithConicalGradientBrushVertexShader_core;
-        code[PositionWithRadialGradientBrushVertexShader] = qopenglslPositionWithRadialGradientBrushVertexShader_core;
-        code[PositionWithTextureBrushVertexShader] = qopenglslPositionWithTextureBrushVertexShader_core;
-        code[AffinePositionWithPatternBrushVertexShader] = qopenglslAffinePositionWithPatternBrushVertexShader_core;
-        code[AffinePositionWithLinearGradientBrushVertexShader] = qopenglslAffinePositionWithLinearGradientBrushVertexShader_core;
-        code[AffinePositionWithConicalGradientBrushVertexShader] = qopenglslAffinePositionWithConicalGradientBrushVertexShader_core;
-        code[AffinePositionWithRadialGradientBrushVertexShader] = qopenglslAffinePositionWithRadialGradientBrushVertexShader_core;
-        code[AffinePositionWithTextureBrushVertexShader] = qopenglslAffinePositionWithTextureBrushVertexShader_core;
-
-        code[MainFragmentShader_MO] = qopenglslMainFragmentShader_MO_core;
-        code[MainFragmentShader_M] = qopenglslMainFragmentShader_M_core;
-        code[MainFragmentShader_O] = qopenglslMainFragmentShader_O_core;
-        code[MainFragmentShader] = qopenglslMainFragmentShader_core;
-        code[MainFragmentShader_ImageArrays] = qopenglslMainFragmentShader_ImageArrays_core;
-
-        code[ImageSrcFragmentShader] = qopenglslImageSrcFragmentShader_core;
-        code[ImageSrcWithPatternFragmentShader] = qopenglslImageSrcWithPatternFragmentShader_core;
-        code[NonPremultipliedImageSrcFragmentShader] = qopenglslNonPremultipliedImageSrcFragmentShader_core;
-        code[GrayscaleImageSrcFragmentShader] = qopenglslGrayscaleImageSrcFragmentShader_core;
-        code[AlphaImageSrcFragmentShader] = qopenglslAlphaImageSrcFragmentShader_core;
-        code[CustomImageSrcFragmentShader] = qopenglslCustomSrcFragmentShader_core; // Calls "customShader", which must be appended
-        code[SolidBrushSrcFragmentShader] = qopenglslSolidBrushSrcFragmentShader_core;
-
-        code[TextureBrushSrcFragmentShader] = qopenglslTextureBrushSrcFragmentShader_core;
-        code[TextureBrushSrcWithPatternFragmentShader] = qopenglslTextureBrushSrcWithPatternFragmentShader_core;
-        code[PatternBrushSrcFragmentShader] = qopenglslPatternBrushSrcFragmentShader_core;
-        code[LinearGradientBrushSrcFragmentShader] = qopenglslLinearGradientBrushSrcFragmentShader_core;
-        code[RadialGradientBrushSrcFragmentShader] = qopenglslRadialGradientBrushSrcFragmentShader_core;
-        code[ConicalGradientBrushSrcFragmentShader] = qopenglslConicalGradientBrushSrcFragmentShader_core;
-        code[ShockingPinkSrcFragmentShader] = qopenglslShockingPinkSrcFragmentShader_core;
-
-        code[NoMaskFragmentShader] = "";
-        code[MaskFragmentShader] = qopenglslMaskFragmentShader_core;
-        code[RgbMaskFragmentShaderPass1] = qopenglslRgbMaskFragmentShaderPass1_core;
-        code[RgbMaskFragmentShaderPass2] = qopenglslRgbMaskFragmentShaderPass2_core;
-        code[RgbMaskWithGammaFragmentShader] = ""; //###
-    } else {
-        code[MainVertexShader] = qopenglslMainVertexShader;
-        code[MainWithTexCoordsVertexShader] = qopenglslMainWithTexCoordsVertexShader;
-        code[MainWithTexCoordsAndOpacityVertexShader] = qopenglslMainWithTexCoordsAndOpacityVertexShader;
-
-        code[UntransformedPositionVertexShader] = qopenglslUntransformedPositionVertexShader;
-        code[PositionOnlyVertexShader] = qopenglslPositionOnlyVertexShader;
-        code[ComplexGeometryPositionOnlyVertexShader] = qopenglslComplexGeometryPositionOnlyVertexShader;
-        code[PositionWithPatternBrushVertexShader] = qopenglslPositionWithPatternBrushVertexShader;
-        code[PositionWithLinearGradientBrushVertexShader] = qopenglslPositionWithLinearGradientBrushVertexShader;
-        code[PositionWithConicalGradientBrushVertexShader] = qopenglslPositionWithConicalGradientBrushVertexShader;
-        code[PositionWithRadialGradientBrushVertexShader] = qopenglslPositionWithRadialGradientBrushVertexShader;
-        code[PositionWithTextureBrushVertexShader] = qopenglslPositionWithTextureBrushVertexShader;
-        code[AffinePositionWithPatternBrushVertexShader] = qopenglslAffinePositionWithPatternBrushVertexShader;
-        code[AffinePositionWithLinearGradientBrushVertexShader] = qopenglslAffinePositionWithLinearGradientBrushVertexShader;
-        code[AffinePositionWithConicalGradientBrushVertexShader] = qopenglslAffinePositionWithConicalGradientBrushVertexShader;
-        code[AffinePositionWithRadialGradientBrushVertexShader] = qopenglslAffinePositionWithRadialGradientBrushVertexShader;
-        code[AffinePositionWithTextureBrushVertexShader] = qopenglslAffinePositionWithTextureBrushVertexShader;
-
-        code[MainFragmentShader_MO] = qopenglslMainFragmentShader_MO;
-        code[MainFragmentShader_M] = qopenglslMainFragmentShader_M;
-        code[MainFragmentShader_O] = qopenglslMainFragmentShader_O;
-        code[MainFragmentShader] = qopenglslMainFragmentShader;
-        code[MainFragmentShader_ImageArrays] = qopenglslMainFragmentShader_ImageArrays;
-
-        code[ImageSrcFragmentShader] = qopenglslImageSrcFragmentShader;
-        code[ImageSrcWithPatternFragmentShader] = qopenglslImageSrcWithPatternFragmentShader;
-        code[NonPremultipliedImageSrcFragmentShader] = qopenglslNonPremultipliedImageSrcFragmentShader;
-        code[GrayscaleImageSrcFragmentShader] = qopenglslGrayscaleImageSrcFragmentShader;
-        code[AlphaImageSrcFragmentShader] = qopenglslAlphaImageSrcFragmentShader;
-        code[CustomImageSrcFragmentShader] = qopenglslCustomSrcFragmentShader; // Calls "customShader", which must be appended
-        code[SolidBrushSrcFragmentShader] = qopenglslSolidBrushSrcFragmentShader;
-        code[TextureBrushSrcFragmentShader] = qopenglslTextureBrushSrcFragmentShader;
-        code[TextureBrushSrcWithPatternFragmentShader] = qopenglslTextureBrushSrcWithPatternFragmentShader;
-        code[PatternBrushSrcFragmentShader] = qopenglslPatternBrushSrcFragmentShader;
-        code[LinearGradientBrushSrcFragmentShader] = qopenglslLinearGradientBrushSrcFragmentShader;
-        code[RadialGradientBrushSrcFragmentShader] = qopenglslRadialGradientBrushSrcFragmentShader;
-        code[ConicalGradientBrushSrcFragmentShader] = qopenglslConicalGradientBrushSrcFragmentShader;
-        code[ShockingPinkSrcFragmentShader] = qopenglslShockingPinkSrcFragmentShader;
-
-        code[NoMaskFragmentShader] = "";
-        code[MaskFragmentShader] = qopenglslMaskFragmentShader;
-        code[RgbMaskFragmentShaderPass1] = qopenglslRgbMaskFragmentShaderPass1;
-        code[RgbMaskFragmentShaderPass2] = qopenglslRgbMaskFragmentShaderPass2;
-        code[RgbMaskWithGammaFragmentShader] = ""; //###
-    }
-
-    // The composition shaders are just layout qualifiers and the same
-    // for all profiles that support them.
-    code[NoCompositionModeFragmentShader] = "";
-    code[MultiplyCompositionModeFragmentShader] = qopenglslMultiplyCompositionModeFragmentShader;
-    code[ScreenCompositionModeFragmentShader] = qopenglslScreenCompositionModeFragmentShader;
-    code[OverlayCompositionModeFragmentShader] = qopenglslOverlayCompositionModeFragmentShader;
-    code[DarkenCompositionModeFragmentShader] = qopenglslDarkenCompositionModeFragmentShader;
-    code[LightenCompositionModeFragmentShader] = qopenglslLightenCompositionModeFragmentShader;
-    code[ColorDodgeCompositionModeFragmentShader] = qopenglslColorDodgeCompositionModeFragmentShader;
-    code[ColorBurnCompositionModeFragmentShader] = qopenglslColorBurnCompositionModeFragmentShader;
-    code[HardLightCompositionModeFragmentShader] = qopenglslHardLightCompositionModeFragmentShader;
-    code[SoftLightCompositionModeFragmentShader] = qopenglslSoftLightCompositionModeFragmentShader;
-    code[DifferenceCompositionModeFragmentShader] = qopenglslDifferenceCompositionModeFragmentShader;
-    code[ExclusionCompositionModeFragmentShader] = qopenglslExclusionCompositionModeFragmentShader;
-
-#if defined(QT_DEBUG)
-    // Check that all the elements have been filled:
-    for (int i = 0; i < TotalSnippetCount; ++i) {
-        if (Q_UNLIKELY(!qShaderSnippets[i])) {
-            qFatal("Shader snippet for %s (#%d) is missing!",
-                   snippetNameStr(SnippetName(i)).constData(), i);
-        }
-    }
-#endif
-
-    QByteArray vertexSource;
-    QByteArray fragSource;
-
-    // Compile up the simple shader:
-#ifdef Q_OS_WASM
-    vertexSource.append(qShaderSnippets[PositionOnlyVertexShader]);
-    vertexSource.append(qShaderSnippets[MainVertexShader]);
-#else
-    vertexSource.append(qShaderSnippets[MainVertexShader]);
-    vertexSource.append(qShaderSnippets[PositionOnlyVertexShader]);
-#endif
-    fragSource.append(qShaderSnippets[MainFragmentShader]);
-    fragSource.append(qShaderSnippets[ShockingPinkSrcFragmentShader]);
-
-    simpleShaderProg = new QOpenGLShaderProgram;
-
-    CachedShader simpleShaderCache(fragSource, vertexSource);
-
-    bool inCache = simpleShaderCache.load(simpleShaderProg, context);
-
-    if (!inCache) {
-        if (!simpleShaderProg->addCacheableShaderFromSourceCode(QOpenGLShader::Vertex, vertexSource))
-            qWarning("Vertex shader for simpleShaderProg (MainVertexShader & PositionOnlyVertexShader) failed to compile");
-        if (!simpleShaderProg->addCacheableShaderFromSourceCode(QOpenGLShader::Fragment, fragSource))
-            qWarning("Fragment shader for simpleShaderProg (MainFragmentShader & ShockingPinkSrcFragmentShader) failed to compile");
-
-        simpleShaderProg->bindAttributeLocation("vertexCoordsArray", QT_VERTEX_COORDS_ATTR);
-        simpleShaderProg->bindAttributeLocation("pmvMatrix1", QT_PMV_MATRIX_1_ATTR);
-        simpleShaderProg->bindAttributeLocation("pmvMatrix2", QT_PMV_MATRIX_2_ATTR);
-        simpleShaderProg->bindAttributeLocation("pmvMatrix3", QT_PMV_MATRIX_3_ATTR);
-    }
-
-    simpleShaderProg->link();
-
-    if (Q_UNLIKELY(!simpleShaderProg->isLinked())) {
-        qCritical("Errors linking simple shader: %s", qPrintable(simpleShaderProg->log()));
-    } else {
-        if (!inCache)
-            simpleShaderCache.store(simpleShaderProg, context);
-    }
-
-    // Compile the blit shader:
-    vertexSource.clear();
-    vertexSource.append(qShaderSnippets[MainWithTexCoordsVertexShader]);
-    vertexSource.append(qShaderSnippets[UntransformedPositionVertexShader]);
-
-    fragSource.clear();
-    fragSource.append(qShaderSnippets[MainFragmentShader]);
-    fragSource.append(qShaderSnippets[ImageSrcFragmentShader]);
-
-    blitShaderProg = new QOpenGLShaderProgram;
-
-    CachedShader blitShaderCache(fragSource, vertexSource);
-
-    inCache = blitShaderCache.load(blitShaderProg, context);
-
-    if (!inCache) {
-        if (!blitShaderProg->addCacheableShaderFromSourceCode(QOpenGLShader::Vertex, vertexSource))
-            qWarning("Vertex shader for blitShaderProg (MainWithTexCoordsVertexShader & UntransformedPositionVertexShader) failed to compile");
-        if (!blitShaderProg->addCacheableShaderFromSourceCode(QOpenGLShader::Fragment, fragSource))
-            qWarning("Fragment shader for blitShaderProg (MainFragmentShader & ImageSrcFragmentShader) failed to compile");
-
-        blitShaderProg->bindAttributeLocation("textureCoordArray", QT_TEXTURE_COORDS_ATTR);
-        blitShaderProg->bindAttributeLocation("vertexCoordsArray", QT_VERTEX_COORDS_ATTR);
-    }
-
-    blitShaderProg->link();
-    if (Q_UNLIKELY(!blitShaderProg->isLinked())) {
-        qCritical("Errors linking blit shader: %s", qPrintable(blitShaderProg->log()));
-    } else {
-        if (!inCache)
-            blitShaderCache.store(blitShaderProg, context);
-    }
-
-#ifdef QT_GL_SHARED_SHADER_DEBUG
-    qDebug(" -> QOpenGLEngineSharedShaders() %p for thread %p.", this, QThread::currentThread());
-#endif
-}
-
-QOpenGLEngineSharedShaders::~QOpenGLEngineSharedShaders()
-{
-#ifdef QT_GL_SHARED_SHADER_DEBUG
-    qDebug(" -> ~QOpenGLEngineSharedShaders() %p for thread %p.", this, QThread::currentThread());
-#endif
-    qDeleteAll(cachedPrograms);
-    cachedPrograms.clear();
-
-    if (blitShaderProg) {
-        delete blitShaderProg;
-        blitShaderProg = nullptr;
-    }
-
-    if (simpleShaderProg) {
-        delete simpleShaderProg;
-        simpleShaderProg = nullptr;
-    }
-}
-
-#if defined (QT_DEBUG)
-QByteArray QOpenGLEngineSharedShaders::snippetNameStr(SnippetName name)
-{
-    QMetaEnum m = staticMetaObject.enumerator(staticMetaObject.indexOfEnumerator("SnippetName"));
-    return QByteArray(m.valueToKey(name));
-}
-#endif
-
-// The address returned here will only be valid until next time this function is called.
-// The program is return bound.
-QOpenGLEngineShaderProg *QOpenGLEngineSharedShaders::findProgramInCache(const QOpenGLEngineShaderProg &prog)
-{
-    for (int i = 0; i < cachedPrograms.size(); ++i) {
-        QOpenGLEngineShaderProg *cachedProg = cachedPrograms[i];
-        if (*cachedProg == prog) {
-            // Move the program to the top of the list as a poor-man's cache algo
-            cachedPrograms.move(i, 0);
-            cachedProg->program->bind();
-            return cachedProg;
-        }
-    }
-
-    QScopedPointer<QOpenGLEngineShaderProg> newProg;
-
-    do {
-        QByteArray fragSource;
-        // Insert the custom stage before the srcPixel shader to work around an ATI driver bug
-        // where you cannot forward declare a function that takes a sampler as argument.
-        if (prog.srcPixelFragShader == CustomImageSrcFragmentShader)
-            fragSource.append(prog.customStageSource);
-        fragSource.append(qShaderSnippets[prog.mainFragShader]);
-        fragSource.append(qShaderSnippets[prog.srcPixelFragShader]);
-        if (prog.compositionFragShader)
-            fragSource.append(qShaderSnippets[prog.compositionFragShader]);
-        if (prog.maskFragShader)
-            fragSource.append(qShaderSnippets[prog.maskFragShader]);
-
-        QByteArray vertexSource;
-#ifdef Q_OS_WASM
-        vertexSource.append(qShaderSnippets[prog.positionVertexShader]);
-        vertexSource.append(qShaderSnippets[prog.mainVertexShader]);
-#else
-        vertexSource.append(qShaderSnippets[prog.mainVertexShader]);
-        vertexSource.append(qShaderSnippets[prog.positionVertexShader]);
-#endif
-        QScopedPointer<QOpenGLShaderProgram> shaderProgram(new QOpenGLShaderProgram);
-
-        CachedShader shaderCache(fragSource, vertexSource);
-        bool inCache = shaderCache.load(shaderProgram.data(), QOpenGLContext::currentContext());
-
-        if (!inCache) {
-            if (!shaderProgram->addCacheableShaderFromSourceCode(QOpenGLShader::Vertex, vertexSource)) {
-                QByteArray description;
-#if defined(QT_DEBUG)
-                description.append("Vertex shader: main=");
-                description.append(snippetNameStr(prog.mainVertexShader));
-                description.append(", position=");
-                description.append(snippetNameStr(prog.positionVertexShader));
-#endif
-                qWarning("Warning: \"%s\" failed to compile!", description.constData());
-                break;
-            }
-            if (!shaderProgram->addCacheableShaderFromSourceCode(QOpenGLShader::Fragment, fragSource)) {
-                QByteArray description;
-#if defined(QT_DEBUG)
-                description.append("Fragment shader: main=");
-                description.append(snippetNameStr(prog.mainFragShader));
-                description.append(", srcPixel=");
-                description.append(snippetNameStr(prog.srcPixelFragShader));
-                if (prog.compositionFragShader) {
-                    description.append(", composition=");
-                    description.append(snippetNameStr(prog.compositionFragShader));
-                }
-                if (prog.maskFragShader) {
-                    description.append(", mask=");
-                    description.append(snippetNameStr(prog.maskFragShader));
-                }
-#endif
-                qWarning("Warning: \"%s\" failed to compile!", description.constData());
-                break;
-            }
-
-            // We have to bind the vertex attribute names before the program is linked:
-            shaderProgram->bindAttributeLocation("vertexCoordsArray", QT_VERTEX_COORDS_ATTR);
-            if (prog.useTextureCoords)
-                shaderProgram->bindAttributeLocation("textureCoordArray", QT_TEXTURE_COORDS_ATTR);
-            if (prog.useOpacityAttribute)
-                shaderProgram->bindAttributeLocation("opacityArray", QT_OPACITY_ATTR);
-            if (prog.usePmvMatrixAttribute) {
-                shaderProgram->bindAttributeLocation("pmvMatrix1", QT_PMV_MATRIX_1_ATTR);
-                shaderProgram->bindAttributeLocation("pmvMatrix2", QT_PMV_MATRIX_2_ATTR);
-                shaderProgram->bindAttributeLocation("pmvMatrix3", QT_PMV_MATRIX_3_ATTR);
-            }
-        }
-
-        newProg.reset(new QOpenGLEngineShaderProg(prog));
-        newProg->program = shaderProgram.take();
-
-        newProg->program->link();
-        if (newProg->program->isLinked()) {
-            if (!inCache)
-                shaderCache.store(newProg->program, QOpenGLContext::currentContext());
-        } else {
-            QString error;
-            error = QLatin1String("Shader program failed to link")
-                    + QLatin1String("  Error Log:\n")
-                    + QLatin1String("    ") + newProg->program->log();
-            qWarning() << error;
-            break;
-        }
-
-        newProg->program->bind();
-
-        if (newProg->maskFragShader != QOpenGLEngineSharedShaders::NoMaskFragmentShader) {
-            GLuint location = newProg->program->uniformLocation("maskTexture");
-            newProg->program->setUniformValue(location, QT_MASK_TEXTURE_UNIT);
-        }
-
-        if (cachedPrograms.count() > 30) {
-            // The cache is full, so delete the last 5 programs in the list.
-            // These programs will be least used, as a program us bumped to
-            // the top of the list when it's used.
-            for (int i = 0; i < 5; ++i) {
-                delete cachedPrograms.last();
-                cachedPrograms.removeLast();
-            }
-        }
-
-        cachedPrograms.insert(0, newProg.data());
-    } while (false);
-
-    return newProg.take();
-}
-
-void QOpenGLEngineSharedShaders::cleanupCustomStage(QOpenGLCustomShaderStage* stage)
-{
-    auto hasStageAsCustomShaderSouce = [stage](QOpenGLEngineShaderProg *cachedProg) -> bool {
-        if (cachedProg->customStageSource == stage->source()) {
-            delete cachedProg;
-            return true;
-        }
-        return false;
-    };
-    cachedPrograms.erase(std::remove_if(cachedPrograms.begin(), cachedPrograms.end(),
-                                        hasStageAsCustomShaderSouce),
-                         cachedPrograms.end());
-}
-
-
-QOpenGLEngineShaderManager::QOpenGLEngineShaderManager(QOpenGLContext* context)
-    : ctx(context),
-      shaderProgNeedsChanging(true),
-      complexGeometry(false),
-      srcPixelType(Qt::NoBrush),
-      opacityMode(NoOpacity),
-      maskType(NoMask),
-      compositionMode(QPainter::CompositionMode_SourceOver),
-      customSrcStage(nullptr),
-      currentShaderProg(nullptr)
-{
-    sharedShaders = QOpenGLEngineSharedShaders::shadersForContext(context);
-}
-
-QOpenGLEngineShaderManager::~QOpenGLEngineShaderManager()
-{
-    //###
-    removeCustomStage();
-}
-
-GLuint QOpenGLEngineShaderManager::getUniformLocation(Uniform id)
-{
-    if (!currentShaderProg)
-        return 0;
-
-    QVector<uint> &uniformLocations = currentShaderProg->uniformLocations;
-    if (uniformLocations.isEmpty())
-        uniformLocations.fill(GLuint(-1), NumUniforms);
-
-    const char uniformNames[][26] = {
-        "imageTexture",
-        "patternColor",
-        "globalOpacity",
-        "depth",
-        "maskTexture",
-        "fragmentColor",
-        "linearData",
-        "angle",
-        "halfViewportSize",
-        "fmp",
-        "fmp2_m_radius2",
-        "inverse_2_fmp2_m_radius2",
-        "sqrfr",
-        "bradius",
-        "invertedTextureSize",
-        "brushTransform",
-        "brushTexture",
-        "matrix"
-    };
-
-    if (uniformLocations.at(id) == GLuint(-1))
-        uniformLocations[id] = currentShaderProg->program->uniformLocation(uniformNames[id]);
-
-    return uniformLocations.at(id);
-}
-
-
-void QOpenGLEngineShaderManager::optimiseForBrushTransform(QTransform::TransformationType transformType)
-{
-    Q_UNUSED(transformType); // Currently ignored
-}
-
-void QOpenGLEngineShaderManager::setDirty()
-{
-    shaderProgNeedsChanging = true;
-}
-
-void QOpenGLEngineShaderManager::setSrcPixelType(Qt::BrushStyle style)
-{
-    Q_ASSERT(style != Qt::NoBrush);
-    if (srcPixelType == PixelSrcType(style))
-        return;
-
-    srcPixelType = style;
-    shaderProgNeedsChanging = true; //###
-}
-
-void QOpenGLEngineShaderManager::setSrcPixelType(PixelSrcType type)
-{
-    if (srcPixelType == type)
-        return;
-
-    srcPixelType = type;
-    shaderProgNeedsChanging = true; //###
-}
-
-void QOpenGLEngineShaderManager::setOpacityMode(OpacityMode mode)
-{
-    if (opacityMode == mode)
-        return;
-
-    opacityMode = mode;
-    shaderProgNeedsChanging = true; //###
-}
-
-void QOpenGLEngineShaderManager::setMaskType(MaskType type)
-{
-    if (maskType == type)
-        return;
-
-    maskType = type;
-    shaderProgNeedsChanging = true; //###
-}
-
-void QOpenGLEngineShaderManager::setCompositionMode(QPainter::CompositionMode mode)
-{
-    if (compositionMode == mode)
-        return;
-
-    bool wasAdvanced = compositionMode > QPainter::CompositionMode_Plus;
-    bool isAdvanced = mode > QPainter::CompositionMode_Plus;
-
-    compositionMode = mode;
-    shaderProgNeedsChanging = shaderProgNeedsChanging || wasAdvanced || isAdvanced;
-}
-
-void QOpenGLEngineShaderManager::setCustomStage(QOpenGLCustomShaderStage* stage)
-{
-    if (customSrcStage)
-        removeCustomStage();
-    customSrcStage = stage;
-    shaderProgNeedsChanging = true;
-}
-
-void QOpenGLEngineShaderManager::removeCustomStage()
-{
-    if (customSrcStage)
-        customSrcStage->setInactive();
-    customSrcStage = nullptr;
-    shaderProgNeedsChanging = true;
-}
-
-QOpenGLShaderProgram* QOpenGLEngineShaderManager::currentProgram()
-{
-    if (currentShaderProg)
-        return currentShaderProg->program;
-    else
-        return sharedShaders->simpleProgram();
-}
-
-void QOpenGLEngineShaderManager::useSimpleProgram()
-{
-    sharedShaders->simpleProgram()->bind();
-    QOpenGLContextPrivate* ctx_d = ctx->d_func();
-    Q_UNUSED(ctx_d);
-
-    QOpenGL2PaintEngineEx *active_engine = static_cast<QOpenGL2PaintEngineEx *>(ctx_d->active_engine);
-
-    active_engine->d_func()->setVertexAttribArrayEnabled(QT_VERTEX_COORDS_ATTR, true);
-    active_engine->d_func()->setVertexAttribArrayEnabled(QT_TEXTURE_COORDS_ATTR, false);
-    active_engine->d_func()->setVertexAttribArrayEnabled(QT_OPACITY_ATTR, false);
-
-    shaderProgNeedsChanging = true;
-}
-
-void QOpenGLEngineShaderManager::useBlitProgram()
-{
-    sharedShaders->blitProgram()->bind();
-    QOpenGLContextPrivate* ctx_d = ctx->d_func();
-    QOpenGL2PaintEngineEx *active_engine = static_cast<QOpenGL2PaintEngineEx *>(ctx_d->active_engine);
-    active_engine->d_func()->setVertexAttribArrayEnabled(QT_VERTEX_COORDS_ATTR, true);
-    active_engine->d_func()->setVertexAttribArrayEnabled(QT_TEXTURE_COORDS_ATTR, true);
-    active_engine->d_func()->setVertexAttribArrayEnabled(QT_OPACITY_ATTR, false);
-    shaderProgNeedsChanging = true;
-}
-
-QOpenGLShaderProgram* QOpenGLEngineShaderManager::simpleProgram()
-{
-    return sharedShaders->simpleProgram();
-}
-
-QOpenGLShaderProgram* QOpenGLEngineShaderManager::blitProgram()
-{
-    return sharedShaders->blitProgram();
-}
-
-
-
-// Select & use the correct shader program using the current state.
-// Returns \c true if program needed changing.
-bool QOpenGLEngineShaderManager::useCorrectShaderProg()
-{
-    if (!shaderProgNeedsChanging)
-        return false;
-
-    bool useCustomSrc = customSrcStage != nullptr;
-    if (useCustomSrc && srcPixelType != QOpenGLEngineShaderManager::ImageSrc && srcPixelType != Qt::TexturePattern) {
-        useCustomSrc = false;
-        qWarning("QOpenGLEngineShaderManager - Ignoring custom shader stage for non image src");
-    }
-
-    QOpenGLEngineShaderProg requiredProgram;
-
-    bool texCoords = false;
-
-    // Choose vertex shader shader position function (which typically also sets
-    // varyings) and the source pixel (srcPixel) fragment shader function:
-    requiredProgram.positionVertexShader = QOpenGLEngineSharedShaders::InvalidSnippetName;
-    requiredProgram.srcPixelFragShader = QOpenGLEngineSharedShaders::InvalidSnippetName;
-    bool isAffine = brushTransform.isAffine();
-    if ( (srcPixelType >= Qt::Dense1Pattern) && (srcPixelType <= Qt::DiagCrossPattern) ) {
-        if (isAffine)
-            requiredProgram.positionVertexShader = QOpenGLEngineSharedShaders::AffinePositionWithPatternBrushVertexShader;
-        else
-            requiredProgram.positionVertexShader = QOpenGLEngineSharedShaders::PositionWithPatternBrushVertexShader;
-
-        requiredProgram.srcPixelFragShader = QOpenGLEngineSharedShaders::PatternBrushSrcFragmentShader;
-    }
-    else switch (srcPixelType) {
-        default:
-        case Qt::NoBrush:
-            qFatal("QOpenGLEngineShaderManager::useCorrectShaderProg() - Qt::NoBrush style is set");
-            break;
-        case QOpenGLEngineShaderManager::ImageSrc:
-            requiredProgram.srcPixelFragShader = QOpenGLEngineSharedShaders::ImageSrcFragmentShader;
-            requiredProgram.positionVertexShader = QOpenGLEngineSharedShaders::PositionOnlyVertexShader;
-            texCoords = true;
-            break;
-        case QOpenGLEngineShaderManager::NonPremultipliedImageSrc:
-            requiredProgram.srcPixelFragShader = QOpenGLEngineSharedShaders::NonPremultipliedImageSrcFragmentShader;
-            requiredProgram.positionVertexShader = QOpenGLEngineSharedShaders::PositionOnlyVertexShader;
-            texCoords = true;
-            break;
-        case QOpenGLEngineShaderManager::GrayscaleImageSrc:
-            requiredProgram.srcPixelFragShader = QOpenGLEngineSharedShaders::GrayscaleImageSrcFragmentShader;
-            requiredProgram.positionVertexShader = QOpenGLEngineSharedShaders::PositionOnlyVertexShader;
-            texCoords = true;
-            break;
-        case QOpenGLEngineShaderManager::AlphaImageSrc:
-            requiredProgram.srcPixelFragShader = QOpenGLEngineSharedShaders::AlphaImageSrcFragmentShader;
-            requiredProgram.positionVertexShader = QOpenGLEngineSharedShaders::PositionOnlyVertexShader;
-            texCoords = true;
-            break;
-        case QOpenGLEngineShaderManager::PatternSrc:
-            requiredProgram.srcPixelFragShader = QOpenGLEngineSharedShaders::ImageSrcWithPatternFragmentShader;
-            requiredProgram.positionVertexShader = QOpenGLEngineSharedShaders::PositionOnlyVertexShader;
-            texCoords = true;
-            break;
-        case QOpenGLEngineShaderManager::TextureSrcWithPattern:
-            requiredProgram.srcPixelFragShader = QOpenGLEngineSharedShaders::TextureBrushSrcWithPatternFragmentShader;
-            requiredProgram.positionVertexShader = isAffine ? QOpenGLEngineSharedShaders::AffinePositionWithTextureBrushVertexShader
-                                                : QOpenGLEngineSharedShaders::PositionWithTextureBrushVertexShader;
-            break;
-        case Qt::SolidPattern:
-            requiredProgram.srcPixelFragShader = QOpenGLEngineSharedShaders::SolidBrushSrcFragmentShader;
-            requiredProgram.positionVertexShader = QOpenGLEngineSharedShaders::PositionOnlyVertexShader;
-            break;
-        case Qt::LinearGradientPattern:
-            requiredProgram.srcPixelFragShader = QOpenGLEngineSharedShaders::LinearGradientBrushSrcFragmentShader;
-            requiredProgram.positionVertexShader = isAffine ? QOpenGLEngineSharedShaders::AffinePositionWithLinearGradientBrushVertexShader
-                                                : QOpenGLEngineSharedShaders::PositionWithLinearGradientBrushVertexShader;
-            break;
-        case Qt::ConicalGradientPattern:
-            requiredProgram.srcPixelFragShader = QOpenGLEngineSharedShaders::ConicalGradientBrushSrcFragmentShader;
-            requiredProgram.positionVertexShader = isAffine ? QOpenGLEngineSharedShaders::AffinePositionWithConicalGradientBrushVertexShader
-                                                : QOpenGLEngineSharedShaders::PositionWithConicalGradientBrushVertexShader;
-            break;
-        case Qt::RadialGradientPattern:
-            requiredProgram.srcPixelFragShader = QOpenGLEngineSharedShaders::RadialGradientBrushSrcFragmentShader;
-            requiredProgram.positionVertexShader = isAffine ? QOpenGLEngineSharedShaders::AffinePositionWithRadialGradientBrushVertexShader
-                                                : QOpenGLEngineSharedShaders::PositionWithRadialGradientBrushVertexShader;
-            break;
-        case Qt::TexturePattern:
-            requiredProgram.srcPixelFragShader = QOpenGLEngineSharedShaders::TextureBrushSrcFragmentShader;
-            requiredProgram.positionVertexShader = isAffine ? QOpenGLEngineSharedShaders::AffinePositionWithTextureBrushVertexShader
-                                                : QOpenGLEngineSharedShaders::PositionWithTextureBrushVertexShader;
-            break;
-    };
-
-    if (useCustomSrc) {
-        requiredProgram.srcPixelFragShader = QOpenGLEngineSharedShaders::CustomImageSrcFragmentShader;
-        requiredProgram.customStageSource = customSrcStage->source();
-    }
-
-    const bool hasCompose = compositionMode > QPainter::CompositionMode_Plus;
-    const bool hasMask = maskType != QOpenGLEngineShaderManager::NoMask;
-
-    // Choose fragment shader main function:
-    if (opacityMode == AttributeOpacity) {
-        Q_ASSERT(!hasCompose && !hasMask);
-        requiredProgram.mainFragShader = QOpenGLEngineSharedShaders::MainFragmentShader_ImageArrays;
-    } else {
-        bool useGlobalOpacity = (opacityMode == UniformOpacity);
-        if (hasMask && useGlobalOpacity)
-            requiredProgram.mainFragShader = QOpenGLEngineSharedShaders::MainFragmentShader_MO;
-        if (hasMask && !useGlobalOpacity)
-            requiredProgram.mainFragShader = QOpenGLEngineSharedShaders::MainFragmentShader_M;
-        if (!hasMask && useGlobalOpacity)
-            requiredProgram.mainFragShader = QOpenGLEngineSharedShaders::MainFragmentShader_O;
-        if (!hasMask && !useGlobalOpacity)
-            requiredProgram.mainFragShader = QOpenGLEngineSharedShaders::MainFragmentShader;
-    }
-
-    if (hasMask) {
-        if (maskType == PixelMask) {
-            requiredProgram.maskFragShader = QOpenGLEngineSharedShaders::MaskFragmentShader;
-            texCoords = true;
-        } else if (maskType == SubPixelMaskPass1) {
-            requiredProgram.maskFragShader = QOpenGLEngineSharedShaders::RgbMaskFragmentShaderPass1;
-            texCoords = true;
-        } else if (maskType == SubPixelMaskPass2) {
-            requiredProgram.maskFragShader = QOpenGLEngineSharedShaders::RgbMaskFragmentShaderPass2;
-            texCoords = true;
-        } else if (maskType == SubPixelWithGammaMask) {
-            requiredProgram.maskFragShader = QOpenGLEngineSharedShaders::RgbMaskWithGammaFragmentShader;
-            texCoords = true;
-        } else {
-            qCritical("QOpenGLEngineShaderManager::useCorrectShaderProg() - Unknown mask type");
-        }
-    } else {
-        requiredProgram.maskFragShader = QOpenGLEngineSharedShaders::NoMaskFragmentShader;
-    }
-
-    if (hasCompose) {
-        switch (compositionMode) {
-            case QPainter::CompositionMode_Multiply:
-                requiredProgram.compositionFragShader = QOpenGLEngineSharedShaders::MultiplyCompositionModeFragmentShader;
-                break;
-            case QPainter::CompositionMode_Screen:
-                requiredProgram.compositionFragShader = QOpenGLEngineSharedShaders::ScreenCompositionModeFragmentShader;
-                break;
-            case QPainter::CompositionMode_Overlay:
-                requiredProgram.compositionFragShader = QOpenGLEngineSharedShaders::OverlayCompositionModeFragmentShader;
-                break;
-            case QPainter::CompositionMode_Darken:
-                requiredProgram.compositionFragShader = QOpenGLEngineSharedShaders::DarkenCompositionModeFragmentShader;
-                break;
-            case QPainter::CompositionMode_Lighten:
-                requiredProgram.compositionFragShader = QOpenGLEngineSharedShaders::LightenCompositionModeFragmentShader;
-                break;
-            case QPainter::CompositionMode_ColorDodge:
-                requiredProgram.compositionFragShader = QOpenGLEngineSharedShaders::ColorDodgeCompositionModeFragmentShader;
-                break;
-            case QPainter::CompositionMode_ColorBurn:
-                requiredProgram.compositionFragShader = QOpenGLEngineSharedShaders::ColorBurnCompositionModeFragmentShader;
-                break;
-            case QPainter::CompositionMode_HardLight:
-                requiredProgram.compositionFragShader = QOpenGLEngineSharedShaders::HardLightCompositionModeFragmentShader;
-                break;
-            case QPainter::CompositionMode_SoftLight:
-                requiredProgram.compositionFragShader = QOpenGLEngineSharedShaders::SoftLightCompositionModeFragmentShader;
-                break;
-            case QPainter::CompositionMode_Difference:
-                requiredProgram.compositionFragShader = QOpenGLEngineSharedShaders::DifferenceCompositionModeFragmentShader;
-                break;
-            case QPainter::CompositionMode_Exclusion:
-                requiredProgram.compositionFragShader = QOpenGLEngineSharedShaders::ExclusionCompositionModeFragmentShader;
-                break;
-            default:
-                qWarning("QOpenGLEngineShaderManager::useCorrectShaderProg() - Unsupported composition mode");
-        }
-    } else {
-        requiredProgram.compositionFragShader = QOpenGLEngineSharedShaders::NoCompositionModeFragmentShader;
-    }
-
-    // Choose vertex shader main function
-    if (opacityMode == AttributeOpacity) {
-        Q_ASSERT(texCoords);
-        requiredProgram.mainVertexShader = QOpenGLEngineSharedShaders::MainWithTexCoordsAndOpacityVertexShader;
-    } else if (texCoords) {
-        requiredProgram.mainVertexShader = QOpenGLEngineSharedShaders::MainWithTexCoordsVertexShader;
-    } else {
-        requiredProgram.mainVertexShader = QOpenGLEngineSharedShaders::MainVertexShader;
-    }
-    requiredProgram.useTextureCoords = texCoords;
-    requiredProgram.useOpacityAttribute = (opacityMode == AttributeOpacity);
-    if (complexGeometry && srcPixelType == Qt::SolidPattern) {
-        requiredProgram.positionVertexShader = QOpenGLEngineSharedShaders::ComplexGeometryPositionOnlyVertexShader;
-        requiredProgram.usePmvMatrixAttribute = false;
-    } else {
-        requiredProgram.usePmvMatrixAttribute = true;
-
-        // Force complexGeometry off, since we currently don't support that mode for
-        // non-solid brushes
-        complexGeometry = false;
-    }
-
-    // At this point, requiredProgram is fully populated so try to find the program in the cache
-    currentShaderProg = sharedShaders->findProgramInCache(requiredProgram);
-
-    if (currentShaderProg && useCustomSrc) {
-        customSrcStage->setUniforms(currentShaderProg->program);
-    }
-
-    // Make sure all the vertex attribute arrays the program uses are enabled (and the ones it
-    // doesn't use are disabled)
-    QOpenGLContextPrivate* ctx_d = ctx->d_func();
-    QOpenGL2PaintEngineEx *active_engine = static_cast<QOpenGL2PaintEngineEx *>(ctx_d->active_engine);
-    active_engine->d_func()->setVertexAttribArrayEnabled(QT_VERTEX_COORDS_ATTR, true);
-    active_engine->d_func()->setVertexAttribArrayEnabled(QT_TEXTURE_COORDS_ATTR, currentShaderProg && currentShaderProg->useTextureCoords);
-    active_engine->d_func()->setVertexAttribArrayEnabled(QT_OPACITY_ATTR, currentShaderProg && currentShaderProg->useOpacityAttribute);
-
-    shaderProgNeedsChanging = false;
-    return true;
-}
-
-QT_END_NAMESPACE
diff --git a/src/gui/opengl/qopenglengineshadermanager_p.h b/src/gui/opengl/qopenglengineshadermanager_p.h
deleted file mode 100644
index 14c79f5de3..0000000000
--- a/src/gui/opengl/qopenglengineshadermanager_p.h
+++ /dev/null
@@ -1,507 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtGui module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-/*
-    VERTEX SHADERS
-    ==============
-
-    Vertex shaders are specified as multiple (partial) shaders. On desktop,
-    this works fine. On ES, QOpenGLShader & QOpenGLShaderProgram will make partial
-    shaders work by concatenating the source in each QOpenGLShader and compiling
-    it as a single shader. This is abstracted nicely by QOpenGLShaderProgram and
-    the GL2 engine doesn't need to worry about it.
-
-    Generally, there's two vertex shader objects. The position shaders are
-    the ones which set gl_Position. There's also two "main" vertex shaders,
-    one which just calls the position shader and another which also passes
-    through some texture coordinates from a vertex attribute array to a
-    varying. These texture coordinates are used for mask position in text
-    rendering and for the source coordinates in drawImage/drawPixmap. There's
-    also a "Simple" vertex shader for rendering a solid colour (used to render
-    into the stencil buffer where the actual colour value is discarded).
-
-    The position shaders for brushes look scary. This is because many of the
-    calculations which logically belong in the fragment shader have been moved
-    into the vertex shader to improve performance. This is why the position
-    calculation is in a separate shader. Not only does it calculate the
-    position, but it also calculates some data to be passed to the fragment
-    shader as a varying. It is optimal to move as much of the calculation as
-    possible into the vertex shader as this is executed less often.
-
-    The varyings passed to the fragment shaders are interpolated (which is
-    cheap). Unfortunately, GL will apply perspective correction to the
-    interpolation calusing errors. To get around this, the vertex shader must
-    apply perspective correction itself and set the w-value of gl_Position to
-    zero. That way, GL will be tricked into thinking it doesn't need to apply a
-    perspective correction and use linear interpolation instead (which is what
-    we want). Of course, if the brush transform is affeine, no perspective
-    correction is needed and a simpler vertex shader can be used instead.
-
-    So there are the following "main" vertex shaders:
-        qopenglslMainVertexShader
-        qopenglslMainWithTexCoordsVertexShader
-
-    And the following position vertex shaders:
-        qopenglslPositionOnlyVertexShader
-        qopenglslPositionWithTextureBrushVertexShader
-        qopenglslPositionWithPatternBrushVertexShader
-        qopenglslPositionWithLinearGradientBrushVertexShader
-        qopenglslPositionWithRadialGradientBrushVertexShader
-        qopenglslPositionWithConicalGradientBrushVertexShader
-        qopenglslAffinePositionWithTextureBrushVertexShader
-        qopenglslAffinePositionWithPatternBrushVertexShader
-        qopenglslAffinePositionWithLinearGradientBrushVertexShader
-        qopenglslAffinePositionWithRadialGradientBrushVertexShader
-        qopenglslAffinePositionWithConicalGradientBrushVertexShader
-
-    Leading to 23 possible vertex shaders
-
-
-    FRAGMENT SHADERS
-    ================
-
-    Fragment shaders are also specified as multiple (partial) shaders. The
-    different fragment shaders represent the different stages in Qt's fragment
-    pipeline. There are 1-3 stages in this pipeline: First stage is to get the
-    fragment's colour value. The next stage is to get the fragment's mask value
-    (coverage value for anti-aliasing) and the final stage is to blend the
-    incoming fragment with the background (for composition modes not supported
-    by GL).
-
-    Of these, the first stage will always be present. If Qt doesn't need to
-    apply anti-aliasing (because it's off or handled by multisampling) then
-    the coverage value doesn't need to be applied. (Note: There are two types
-    of mask, one for regular anti-aliasing and one for sub-pixel anti-
-    aliasing.) If the composition mode is one which GL supports natively then
-    the blending stage doesn't need to be applied.
-
-    As eash stage can have multiple implementations, they are abstracted as
-    GLSL function calls with the following signatures:
-
-    Brushes & image drawing are implementations of "qcolorp vec4 srcPixel()":
-        qopenglslImageSrcFragShader
-        qopenglslImageSrcWithPatternFragShader
-        qopenglslNonPremultipliedImageSrcFragShader
-        qopenglslSolidBrushSrcFragShader
-        qopenglslTextureBrushSrcFragShader
-        qopenglslTextureBrushWithPatternFragShader
-        qopenglslPatternBrushSrcFragShader
-        qopenglslLinearGradientBrushSrcFragShader
-        qopenglslRadialGradientBrushSrcFragShader
-        qopenglslConicalGradientBrushSrcFragShader
-    NOTE: It is assumed the colour returned by srcPixel() is pre-multiplied
-
-    Masks are implementations of "qcolorp vec4 applyMask(qcolorp vec4 src)":
-        qopenglslMaskFragmentShader
-        qopenglslRgbMaskFragmentShaderPass1
-        qopenglslRgbMaskFragmentShaderPass2
-        qopenglslRgbMaskWithGammaFragmentShader
-
-    Composition modes are "qcolorp vec4 compose(qcolorp vec4 src)":
-        qopenglslColorBurnCompositionModeFragmentShader
-        qopenglslColorDodgeCompositionModeFragmentShader
-        qopenglslDarkenCompositionModeFragmentShader
-        qopenglslDifferenceCompositionModeFragmentShader
-        qopenglslExclusionCompositionModeFragmentShader
-        qopenglslHardLightCompositionModeFragmentShader
-        qopenglslLightenCompositionModeFragmentShader
-        qopenglslMultiplyCompositionModeFragmentShader
-        qopenglslOverlayCompositionModeFragmentShader
-        qopenglslScreenCompositionModeFragmentShader
-        qopenglslSoftLightCompositionModeFragmentShader
-
-
-    Note: In the future, some GLSL compilers will support an extension allowing
-          a new 'color' precision specifier. To support this, qcolorp is used for
-          all color components so it can be defined to colorp or lowp depending upon
-          the implementation.
-
-    So there are differnt frament shader main functions, depending on the
-    number & type of pipelines the fragment needs to go through.
-
-    The choice of which main() fragment shader string to use depends on:
-        - Use of global opacity
-        - Brush style (some brushes apply opacity themselves)
-        - Use & type of mask (TODO: Need to support high quality anti-aliasing & text)
-        - Use of non-GL Composition mode
-
-    Leading to the following fragment shader main functions:
-        gl_FragColor = compose(applyMask(srcPixel()*globalOpacity));
-        gl_FragColor = compose(applyMask(srcPixel()));
-        gl_FragColor = applyMask(srcPixel()*globalOpacity);
-        gl_FragColor = applyMask(srcPixel());
-        gl_FragColor = compose(srcPixel()*globalOpacity);
-        gl_FragColor = compose(srcPixel());
-        gl_FragColor = srcPixel()*globalOpacity;
-        gl_FragColor = srcPixel();
-
-    Called:
-        qopenglslMainFragmentShader_CMO
-        qopenglslMainFragmentShader_CM
-        qopenglslMainFragmentShader_MO
-        qopenglslMainFragmentShader_M
-        qopenglslMainFragmentShader_CO
-        qopenglslMainFragmentShader_C
-        qopenglslMainFragmentShader_O
-        qopenglslMainFragmentShader
-
-    Where:
-        M = Mask
-        C = Composition
-        O = Global Opacity
-
-
-    CUSTOM SHADER CODE
-    ==================
-
-    The use of custom shader code is supported by the engine for drawImage and
-    drawPixmap calls. This is implemented via hooks in the fragment pipeline.
-
-    The custom shader is passed to the engine as a partial fragment shader
-    (QOpenGLCustomShaderStage). The shader will implement a pre-defined method name
-    which Qt's fragment pipeline will call:
-
-        lowp vec4 customShader(lowp sampler2d imageTexture, highp vec2 textureCoords)
-
-    The provided src and srcCoords parameters can be used to sample from the
-    source image.
-
-    Transformations, clipping, opacity, and composition modes set using QPainter
-    will be respected when using the custom shader hook.
-*/
-
-#ifndef QOPENGLENGINE_SHADER_MANAGER_H
-#define QOPENGLENGINE_SHADER_MANAGER_H
-
-#include <QtGui/private/qtguiglobal_p.h>
-#include <QOpenGLShader>
-#include <QOpenGLShaderProgram>
-#include <QPainter>
-#include <private/qopenglcontext_p.h>
-#include <private/qopenglcustomshaderstage_p.h>
-
-QT_BEGIN_NAMESPACE
-
-
-
-/*
-struct QOpenGLEngineCachedShaderProg
-{
-    QOpenGLEngineCachedShaderProg(QOpenGLEngineShaderManager::ShaderName vertexMain,
-                              QOpenGLEngineShaderManager::ShaderName vertexPosition,
-                              QOpenGLEngineShaderManager::ShaderName fragMain,
-                              QOpenGLEngineShaderManager::ShaderName pixelSrc,
-                              QOpenGLEngineShaderManager::ShaderName mask,
-                              QOpenGLEngineShaderManager::ShaderName composition);
-
-    int cacheKey;
-    QOpenGLShaderProgram* program;
-}
-*/
-
-static const GLuint QT_VERTEX_COORDS_ATTR  = 0;
-static const GLuint QT_TEXTURE_COORDS_ATTR = 1;
-static const GLuint QT_OPACITY_ATTR = 2;
-static const GLuint QT_PMV_MATRIX_1_ATTR = 3;
-static const GLuint QT_PMV_MATRIX_2_ATTR = 4;
-static const GLuint QT_PMV_MATRIX_3_ATTR = 5;
-
-class QOpenGLEngineShaderProg;
-
-class Q_GUI_EXPORT QOpenGLEngineSharedShaders
-{
-    Q_GADGET
-public:
-
-    enum SnippetName {
-        MainVertexShader,
-        MainWithTexCoordsVertexShader,
-        MainWithTexCoordsAndOpacityVertexShader,
-
-        // UntransformedPositionVertexShader must be first in the list:
-        UntransformedPositionVertexShader,
-        PositionOnlyVertexShader,
-        ComplexGeometryPositionOnlyVertexShader,
-        PositionWithPatternBrushVertexShader,
-        PositionWithLinearGradientBrushVertexShader,
-        PositionWithConicalGradientBrushVertexShader,
-        PositionWithRadialGradientBrushVertexShader,
-        PositionWithTextureBrushVertexShader,
-        AffinePositionWithPatternBrushVertexShader,
-        AffinePositionWithLinearGradientBrushVertexShader,
-        AffinePositionWithConicalGradientBrushVertexShader,
-        AffinePositionWithRadialGradientBrushVertexShader,
-        AffinePositionWithTextureBrushVertexShader,
-
-        // MainFragmentShader_CMO must be first in the list:
-        MainFragmentShader_MO,
-        MainFragmentShader_M,
-        MainFragmentShader_O,
-        MainFragmentShader,
-        MainFragmentShader_ImageArrays,
-
-        // ImageSrcFragmentShader must be first in the list::
-        ImageSrcFragmentShader,
-        ImageSrcWithPatternFragmentShader,
-        NonPremultipliedImageSrcFragmentShader,
-        GrayscaleImageSrcFragmentShader,
-        AlphaImageSrcFragmentShader,
-        CustomImageSrcFragmentShader,
-        SolidBrushSrcFragmentShader,
-        TextureBrushSrcFragmentShader,
-        TextureBrushSrcWithPatternFragmentShader,
-        PatternBrushSrcFragmentShader,
-        LinearGradientBrushSrcFragmentShader,
-        RadialGradientBrushSrcFragmentShader,
-        ConicalGradientBrushSrcFragmentShader,
-        ShockingPinkSrcFragmentShader,
-
-        // NoMaskFragmentShader must be first in the list:
-        NoMaskFragmentShader,
-        MaskFragmentShader,
-        RgbMaskFragmentShaderPass1,
-        RgbMaskFragmentShaderPass2,
-        RgbMaskWithGammaFragmentShader,
-
-        // NoCompositionModeFragmentShader must be first in the list:
-        NoCompositionModeFragmentShader,
-        MultiplyCompositionModeFragmentShader,
-        ScreenCompositionModeFragmentShader,
-        OverlayCompositionModeFragmentShader,
-        DarkenCompositionModeFragmentShader,
-        LightenCompositionModeFragmentShader,
-        ColorDodgeCompositionModeFragmentShader,
-        ColorBurnCompositionModeFragmentShader,
-        HardLightCompositionModeFragmentShader,
-        SoftLightCompositionModeFragmentShader,
-        DifferenceCompositionModeFragmentShader,
-        ExclusionCompositionModeFragmentShader,
-
-        TotalSnippetCount, InvalidSnippetName
-    };
-#if defined (QT_DEBUG)
-    Q_ENUM(SnippetName)
-    static QByteArray snippetNameStr(SnippetName snippetName);
-#endif
-
-/*
-    // These allow the ShaderName enum to be used as a cache key
-    const int mainVertexOffset = 0;
-    const int positionVertexOffset = (1<<2) - PositionOnlyVertexShader;
-    const int mainFragOffset = (1<<6) - MainFragmentShader_CMO;
-    const int srcPixelOffset = (1<<10) - ImageSrcFragmentShader;
-    const int maskOffset = (1<<14) - NoMaskShader;
-    const int compositionOffset = (1 << 16) - MultiplyCompositionModeFragmentShader;
-*/
-
-    QOpenGLEngineSharedShaders(QOpenGLContext *context);
-    ~QOpenGLEngineSharedShaders();
-
-    QOpenGLShaderProgram *simpleProgram() { return simpleShaderProg; }
-    QOpenGLShaderProgram *blitProgram() { return blitShaderProg; }
-    // Compile the program if it's not already in the cache, return the item in the cache.
-    QOpenGLEngineShaderProg *findProgramInCache(const QOpenGLEngineShaderProg &prog);
-    // Compile the custom shader if it's not already in the cache, return the item in the cache.
-
-    static QOpenGLEngineSharedShaders *shadersForContext(QOpenGLContext *context);
-
-    // Ideally, this would be static and cleanup all programs in all contexts which
-    // contain the custom code. Currently it is just a hint and we rely on deleted
-    // custom shaders being cleaned up by being kicked out of the cache when it's
-    // full.
-    void cleanupCustomStage(QOpenGLCustomShaderStage* stage);
-
-private:
-    QOpenGLShaderProgram *blitShaderProg;
-    QOpenGLShaderProgram *simpleShaderProg;
-    QList<QOpenGLEngineShaderProg*> cachedPrograms;
-
-    static const char* qShaderSnippets[TotalSnippetCount];
-};
-
-
-class QOpenGLEngineShaderProg
-{
-public:
-    QOpenGLEngineShaderProg() : program(nullptr) {}
-
-    ~QOpenGLEngineShaderProg() {
-        if (program)
-            delete program;
-    }
-
-    QOpenGLEngineSharedShaders::SnippetName mainVertexShader;
-    QOpenGLEngineSharedShaders::SnippetName positionVertexShader;
-    QOpenGLEngineSharedShaders::SnippetName mainFragShader;
-    QOpenGLEngineSharedShaders::SnippetName srcPixelFragShader;
-    QOpenGLEngineSharedShaders::SnippetName maskFragShader;
-    QOpenGLEngineSharedShaders::SnippetName compositionFragShader;
-
-    QByteArray          customStageSource; //TODO: Decent cache key for custom stages
-    QOpenGLShaderProgram*   program;
-
-    QVector<uint> uniformLocations;
-
-    bool                useTextureCoords;
-    bool                useOpacityAttribute;
-    bool                usePmvMatrixAttribute;
-
-    bool operator==(const QOpenGLEngineShaderProg& other) const {
-        // We don't care about the program
-        return ( mainVertexShader      == other.mainVertexShader &&
-                 positionVertexShader  == other.positionVertexShader &&
-                 mainFragShader        == other.mainFragShader &&
-                 srcPixelFragShader    == other.srcPixelFragShader &&
-                 maskFragShader        == other.maskFragShader &&
-                 compositionFragShader == other.compositionFragShader &&
-                 customStageSource     == other.customStageSource
-               );
-    }
-};
-
-class Q_GUI_EXPORT QOpenGLEngineShaderManager : public QObject
-{
-    Q_OBJECT
-public:
-    QOpenGLEngineShaderManager(QOpenGLContext* context);
-    ~QOpenGLEngineShaderManager();
-
-    enum MaskType {NoMask, PixelMask, SubPixelMaskPass1, SubPixelMaskPass2, SubPixelWithGammaMask};
-    enum PixelSrcType {
-        ImageSrc = Qt::TexturePattern+1,
-        NonPremultipliedImageSrc = Qt::TexturePattern+2,
-        PatternSrc = Qt::TexturePattern+3,
-        TextureSrcWithPattern = Qt::TexturePattern+4,
-        GrayscaleImageSrc = Qt::TexturePattern+5,
-        AlphaImageSrc = Qt::TexturePattern+6,
-    };
-
-    enum Uniform {
-        ImageTexture,
-        PatternColor,
-        GlobalOpacity,
-        Depth,
-        MaskTexture,
-        FragmentColor,
-        LinearData,
-        Angle,
-        HalfViewportSize,
-        Fmp,
-        Fmp2MRadius2,
-        Inverse2Fmp2MRadius2,
-        SqrFr,
-        BRadius,
-        InvertedTextureSize,
-        BrushTransform,
-        BrushTexture,
-        Matrix,
-        NumUniforms
-    };
-
-    enum OpacityMode {
-        NoOpacity,
-        UniformOpacity,
-        AttributeOpacity
-    };
-
-    // There are optimizations we can do, depending on the brush transform:
-    //    1) May not have to apply perspective-correction
-    //    2) Can use lower precision for matrix
-    void optimiseForBrushTransform(QTransform::TransformationType transformType);
-    void setSrcPixelType(Qt::BrushStyle);
-    void setSrcPixelType(PixelSrcType); // For non-brush sources, like pixmaps & images
-    void setOpacityMode(OpacityMode);
-    void setMaskType(MaskType);
-    void setCompositionMode(QPainter::CompositionMode);
-    void setCustomStage(QOpenGLCustomShaderStage* stage);
-    void removeCustomStage();
-
-    GLuint getUniformLocation(Uniform id);
-
-    void setDirty(); // someone has manually changed the current shader program
-    bool useCorrectShaderProg(); // returns true if the shader program needed to be changed
-
-    void useSimpleProgram();
-    void useBlitProgram();
-    void setHasComplexGeometry(bool hasComplexGeometry)
-    {
-        complexGeometry = hasComplexGeometry;
-        shaderProgNeedsChanging = true;
-    }
-    bool hasComplexGeometry() const
-    {
-        return complexGeometry;
-    }
-
-    QOpenGLShaderProgram* currentProgram(); // Returns pointer to the shader the manager has chosen
-    QOpenGLShaderProgram* simpleProgram(); // Used to draw into e.g. stencil buffers
-    QOpenGLShaderProgram* blitProgram(); // Used to blit a texture into the framebuffer
-
-    QOpenGLEngineSharedShaders* sharedShaders;
-
-private:
-    QOpenGLContext*     ctx;
-    bool            shaderProgNeedsChanging;
-    bool            complexGeometry;
-
-    // Current state variables which influence the choice of shader:
-    QTransform                  brushTransform;
-    int                         srcPixelType;
-    OpacityMode                 opacityMode;
-    MaskType                    maskType;
-    QPainter::CompositionMode   compositionMode;
-    QOpenGLCustomShaderStage*       customSrcStage;
-
-    QOpenGLEngineShaderProg*    currentShaderProg;
-};
-
-QT_END_NAMESPACE
-
-#endif //QOPENGLENGINE_SHADER_MANAGER_H
diff --git a/src/gui/opengl/qopenglengineshadersource_p.h b/src/gui/opengl/qopenglengineshadersource_p.h
deleted file mode 100644
index 3ac599b6c2..0000000000
--- a/src/gui/opengl/qopenglengineshadersource_p.h
+++ /dev/null
@@ -1,970 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtGui module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-
-#ifndef QOPENGL_ENGINE_SHADER_SOURCE_H
-#define QOPENGL_ENGINE_SHADER_SOURCE_H
-
-#include <QtGui/private/qtguiglobal_p.h>
-#include "qopenglengineshadermanager_p.h"
-
-QT_BEGIN_NAMESPACE
-
-
-static const char* const qopenglslMainVertexShader = "\n\
-    void setPosition(); \n\
-    void main(void) \n\
-    { \n\
-        setPosition(); \n\
-    }\n";
-
-static const char* const qopenglslMainWithTexCoordsVertexShader = "\n\
-    attribute highp   vec2      textureCoordArray; \n\
-    varying   highp   vec2      textureCoords; \n\
-    void setPosition(); \n\
-    void main(void) \n\
-    { \n\
-        setPosition(); \n\
-        textureCoords = textureCoordArray; \n\
-    }\n";
-
-static const char* const qopenglslMainWithTexCoordsAndOpacityVertexShader = "\n\
-    attribute highp   vec2      textureCoordArray; \n\
-    attribute lowp    float     opacityArray; \n\
-    varying   highp   vec2      textureCoords; \n\
-    varying   lowp    float     opacity; \n\
-    void setPosition(); \n\
-    void main(void) \n\
-    { \n\
-        setPosition(); \n\
-        textureCoords = textureCoordArray; \n\
-        opacity = opacityArray; \n\
-    }\n";
-
-// NOTE: We let GL do the perspective correction so texture lookups in the fragment
-//       shader are also perspective corrected.
-static const char* const qopenglslPositionOnlyVertexShader = "\n\
-    attribute highp   vec2      vertexCoordsArray; \n\
-    attribute highp   vec3      pmvMatrix1; \n\
-    attribute highp   vec3      pmvMatrix2; \n\
-    attribute highp   vec3      pmvMatrix3; \n\
-    void setPosition(void) \n\
-    { \n\
-        highp mat3 pmvMatrix = mat3(pmvMatrix1, pmvMatrix2, pmvMatrix3); \n\
-        vec3 transformedPos = pmvMatrix * vec3(vertexCoordsArray.xy, 1.0); \n\
-        gl_Position = vec4(transformedPos.xy, 0.0, transformedPos.z); \n\
-    }\n";
-
-static const char* const qopenglslComplexGeometryPositionOnlyVertexShader = "\n\
-    uniform highp mat3 matrix; \n\
-    attribute highp vec2 vertexCoordsArray; \n\
-    void setPosition(void) \n\
-    { \n\
-      gl_Position = vec4(matrix * vec3(vertexCoordsArray, 1), 1);\n\
-    } \n";
-
-static const char* const qopenglslUntransformedPositionVertexShader = "\n\
-    attribute highp   vec4      vertexCoordsArray; \n\
-    void setPosition(void) \n\
-    { \n\
-        gl_Position = vertexCoordsArray; \n\
-    }\n";
-
-// Pattern Brush - This assumes the texture size is 8x8 and thus, the inverted size is 0.125
-static const char* const qopenglslPositionWithPatternBrushVertexShader = "\n\
-    attribute highp   vec2      vertexCoordsArray; \n\
-    attribute highp   vec3      pmvMatrix1; \n\
-    attribute highp   vec3      pmvMatrix2; \n\
-    attribute highp   vec3      pmvMatrix3; \n\
-    uniform   mediump vec2      halfViewportSize; \n\
-    uniform   highp   vec2      invertedTextureSize; \n\
-    uniform   highp   mat3      brushTransform; \n\
-    varying   highp   vec2      patternTexCoords; \n\
-    void setPosition(void) \n\
-    { \n\
-        highp mat3 pmvMatrix = mat3(pmvMatrix1, pmvMatrix2, pmvMatrix3); \n\
-        vec3 transformedPos = pmvMatrix * vec3(vertexCoordsArray.xy, 1.0); \n\
-        gl_Position.xy = transformedPos.xy / transformedPos.z; \n\
-        mediump vec2 viewportCoords = (gl_Position.xy + 1.0) * halfViewportSize; \n\
-        mediump vec3 hTexCoords = brushTransform * vec3(viewportCoords, 1.0); \n\
-        mediump float invertedHTexCoordsZ = 1.0 / hTexCoords.z; \n\
-        gl_Position = vec4(gl_Position.xy * invertedHTexCoordsZ, 0.0, invertedHTexCoordsZ); \n\
-        patternTexCoords.xy = (hTexCoords.xy * 0.125) * invertedHTexCoordsZ; \n\
-    }\n";
-
-static const char* const qopenglslAffinePositionWithPatternBrushVertexShader
-                 = qopenglslPositionWithPatternBrushVertexShader;
-
-static const char* const qopenglslPatternBrushSrcFragmentShader = "\n\
-    uniform           sampler2D brushTexture; \n\
-    uniform   lowp    vec4      patternColor; \n\
-    varying   highp   vec2      patternTexCoords;\n\
-    lowp vec4 srcPixel() \n\
-    { \n\
-        return patternColor * (1.0 - texture2D(brushTexture, patternTexCoords).r); \n\
-    }\n";
-
-
-// Linear Gradient Brush
-static const char* const qopenglslPositionWithLinearGradientBrushVertexShader = "\n\
-    attribute highp   vec2      vertexCoordsArray; \n\
-    attribute highp   vec3      pmvMatrix1; \n\
-    attribute highp   vec3      pmvMatrix2; \n\
-    attribute highp   vec3      pmvMatrix3; \n\
-    uniform   mediump vec2      halfViewportSize; \n\
-    uniform   highp   vec3      linearData; \n\
-    uniform   highp   mat3      brushTransform; \n\
-    varying   mediump float     index; \n\
-    void setPosition() \n\
-    { \n\
-        highp mat3 pmvMatrix = mat3(pmvMatrix1, pmvMatrix2, pmvMatrix3); \n\
-        vec3 transformedPos = pmvMatrix * vec3(vertexCoordsArray.xy, 1.0); \n\
-        gl_Position.xy = transformedPos.xy / transformedPos.z; \n\
-        mediump vec2 viewportCoords = (gl_Position.xy + 1.0) * halfViewportSize; \n\
-        mediump vec3 hTexCoords = brushTransform * vec3(viewportCoords, 1); \n\
-        mediump float invertedHTexCoordsZ = 1.0 / hTexCoords.z; \n\
-        gl_Position = vec4(gl_Position.xy * invertedHTexCoordsZ, 0.0, invertedHTexCoordsZ); \n\
-        index = (dot(linearData.xy, hTexCoords.xy) * linearData.z) * invertedHTexCoordsZ; \n\
-    }\n";
-
-static const char* const qopenglslAffinePositionWithLinearGradientBrushVertexShader
-                 = qopenglslPositionWithLinearGradientBrushVertexShader;
-
-static const char* const qopenglslLinearGradientBrushSrcFragmentShader = "\n\
-    uniform           sampler2D brushTexture; \n\
-    varying   mediump float     index; \n\
-    lowp vec4 srcPixel() \n\
-    { \n\
-        mediump vec2 val = vec2(index, 0.5); \n\
-        return texture2D(brushTexture, val); \n\
-    }\n";
-
-
-// Conical Gradient Brush
-static const char* const qopenglslPositionWithConicalGradientBrushVertexShader = "\n\
-    attribute highp   vec2      vertexCoordsArray; \n\
-    attribute highp   vec3      pmvMatrix1; \n\
-    attribute highp   vec3      pmvMatrix2; \n\
-    attribute highp   vec3      pmvMatrix3; \n\
-    uniform   mediump vec2      halfViewportSize; \n\
-    uniform   highp   mat3      brushTransform; \n\
-    varying   highp   vec2      A; \n\
-    void setPosition(void) \n\
-    { \n\
-        highp mat3 pmvMatrix = mat3(pmvMatrix1, pmvMatrix2, pmvMatrix3); \n\
-        vec3 transformedPos = pmvMatrix * vec3(vertexCoordsArray.xy, 1.0); \n\
-        gl_Position.xy = transformedPos.xy / transformedPos.z; \n\
-        mediump vec2  viewportCoords = (gl_Position.xy + 1.0) * halfViewportSize; \n\
-        mediump vec3 hTexCoords = brushTransform * vec3(viewportCoords, 1); \n\
-        mediump float invertedHTexCoordsZ = 1.0 / hTexCoords.z; \n\
-        gl_Position = vec4(gl_Position.xy * invertedHTexCoordsZ, 0.0, invertedHTexCoordsZ); \n\
-        A = hTexCoords.xy * invertedHTexCoordsZ; \n\
-    }\n";
-
-static const char* const qopenglslAffinePositionWithConicalGradientBrushVertexShader
-                 = qopenglslPositionWithConicalGradientBrushVertexShader;
-
-static const char* const qopenglslConicalGradientBrushSrcFragmentShader = "\n\
-    #define INVERSE_2PI 0.1591549430918953358 \n\
-    uniform           sampler2D brushTexture; \n\
-    uniform   mediump float     angle; \n\
-    varying   highp   vec2      A; \n\
-    lowp vec4 srcPixel() \n\
-    { \n\
-        highp float t; \n\
-        if (abs(A.y) == abs(A.x)) \n\
-            t = (atan(-A.y + 0.002, A.x) + angle) * INVERSE_2PI; \n\
-        else \n\
-            t = (atan(-A.y, A.x) + angle) * INVERSE_2PI; \n\
-        return texture2D(brushTexture, vec2(t - floor(t), 0.5)); \n\
-    }\n";
-
-
-// Radial Gradient Brush
-static const char* const qopenglslPositionWithRadialGradientBrushVertexShader = "\n\
-    attribute highp   vec2      vertexCoordsArray;\n\
-    attribute highp   vec3      pmvMatrix1; \n\
-    attribute highp   vec3      pmvMatrix2; \n\
-    attribute highp   vec3      pmvMatrix3; \n\
-    uniform   mediump vec2      halfViewportSize; \n\
-    uniform   highp   mat3      brushTransform; \n\
-    uniform   highp   vec2      fmp; \n\
-    uniform   mediump vec3      bradius; \n\
-    varying   highp   float     b; \n\
-    varying   highp   vec2      A; \n\
-    void setPosition(void) \n\
-    {\n\
-        highp mat3 pmvMatrix = mat3(pmvMatrix1, pmvMatrix2, pmvMatrix3); \n\
-        vec3 transformedPos = pmvMatrix * vec3(vertexCoordsArray.xy, 1.0); \n\
-        gl_Position.xy = transformedPos.xy / transformedPos.z; \n\
-        mediump vec2 viewportCoords = (gl_Position.xy + 1.0) * halfViewportSize; \n\
-        mediump vec3 hTexCoords = brushTransform * vec3(viewportCoords, 1); \n\
-        mediump float invertedHTexCoordsZ = 1.0 / hTexCoords.z; \n\
-        gl_Position = vec4(gl_Position.xy * invertedHTexCoordsZ, 0.0, invertedHTexCoordsZ); \n\
-        A = hTexCoords.xy * invertedHTexCoordsZ; \n\
-        b = bradius.x + 2.0 * dot(A, fmp); \n\
-    }\n";
-
-static const char* const qopenglslAffinePositionWithRadialGradientBrushVertexShader
-                 = qopenglslPositionWithRadialGradientBrushVertexShader;
-
-static const char* const qopenglslRadialGradientBrushSrcFragmentShader = "\n\
-    uniform           sampler2D brushTexture; \n\
-    uniform   highp   float     fmp2_m_radius2; \n\
-    uniform   highp   float     inverse_2_fmp2_m_radius2; \n\
-    uniform   highp   float     sqrfr; \n\
-    varying   highp   float     b; \n\
-    varying   highp   vec2      A; \n\
-    uniform   mediump vec3      bradius; \n\
-    lowp vec4 srcPixel() \n\
-    { \n\
-        highp float c = sqrfr-dot(A, A); \n\
-        highp float det = b*b - 4.0*fmp2_m_radius2*c; \n\
-        lowp vec4 result = vec4(0.0); \n\
-        if (det >= 0.0) { \n\
-            highp float detSqrt = sqrt(det); \n\
-            highp float w = max((-b - detSqrt) * inverse_2_fmp2_m_radius2, (-b + detSqrt) * inverse_2_fmp2_m_radius2); \n\
-            if (bradius.y + w * bradius.z >= 0.0) \n\
-                result = texture2D(brushTexture, vec2(w, 0.5)); \n\
-        } \n\
-        return result; \n\
-    }\n";
-
-
-// Texture Brush
-static const char* const qopenglslPositionWithTextureBrushVertexShader = "\n\
-    attribute highp   vec2      vertexCoordsArray; \n\
-    attribute highp   vec3      pmvMatrix1; \n\
-    attribute highp   vec3      pmvMatrix2; \n\
-    attribute highp   vec3      pmvMatrix3; \n\
-    uniform   mediump vec2      halfViewportSize; \n\
-    uniform   highp   vec2      invertedTextureSize; \n\
-    uniform   highp   mat3      brushTransform; \n\
-    varying   highp   vec2      brushTextureCoords; \n\
-    void setPosition(void) \n\
-    { \n\
-        highp mat3 pmvMatrix = mat3(pmvMatrix1, pmvMatrix2, pmvMatrix3); \n\
-        vec3 transformedPos = pmvMatrix * vec3(vertexCoordsArray.xy, 1.0); \n\
-        gl_Position.xy = transformedPos.xy / transformedPos.z; \n\
-        mediump vec2 viewportCoords = (gl_Position.xy + 1.0) * halfViewportSize; \n\
-        mediump vec3 hTexCoords = brushTransform * vec3(viewportCoords, 1); \n\
-        mediump float invertedHTexCoordsZ = 1.0 / hTexCoords.z; \n\
-        gl_Position = vec4(gl_Position.xy * invertedHTexCoordsZ, 0.0, invertedHTexCoordsZ); \n\
-        brushTextureCoords.xy = (hTexCoords.xy * invertedTextureSize) * gl_Position.w; \n\
-    }\n";
-
-static const char* const qopenglslAffinePositionWithTextureBrushVertexShader
-                 = qopenglslPositionWithTextureBrushVertexShader;
-
-static const char* const qopenglslTextureBrushSrcFragmentShader = "\n\
-    varying   highp   vec2      brushTextureCoords; \n\
-    uniform           sampler2D brushTexture; \n\
-    lowp vec4 srcPixel() \n\
-    { \n\
-        return texture2D(brushTexture, brushTextureCoords); \n\
-    }\n";
-
-static const char* const qopenglslTextureBrushSrcWithPatternFragmentShader = "\n\
-    varying   highp   vec2      brushTextureCoords; \n\
-    uniform   lowp    vec4      patternColor; \n\
-    uniform           sampler2D brushTexture; \n\
-    lowp vec4 srcPixel() \n\
-    { \n\
-        return patternColor * (1.0 - texture2D(brushTexture, brushTextureCoords).r); \n\
-    }\n";
-
-// Solid Fill Brush
-static const char* const qopenglslSolidBrushSrcFragmentShader = "\n\
-    uniform   lowp    vec4      fragmentColor; \n\
-    lowp vec4 srcPixel() \n\
-    { \n\
-        return fragmentColor; \n\
-    }\n";
-
-static const char* const qopenglslImageSrcFragmentShader = "\n\
-    varying   highp   vec2      textureCoords; \n\
-    uniform           sampler2D imageTexture; \n\
-    lowp vec4 srcPixel() \n\
-    { \n"
-        "return texture2D(imageTexture, textureCoords); \n"
-    "}\n";
-
-static const char* const qopenglslCustomSrcFragmentShader = "\n\
-    varying   highp   vec2      textureCoords; \n\
-    uniform           sampler2D imageTexture; \n\
-    lowp vec4 srcPixel() \n\
-    { \n\
-        return customShader(imageTexture, textureCoords); \n\
-    }\n";
-
-static const char* const qopenglslImageSrcWithPatternFragmentShader = "\n\
-    varying   highp   vec2      textureCoords; \n\
-    uniform   lowp    vec4      patternColor; \n\
-    uniform           sampler2D imageTexture; \n\
-    lowp vec4 srcPixel() \n\
-    { \n\
-        return patternColor * (1.0 - texture2D(imageTexture, textureCoords).r); \n\
-    }\n";
-
-static const char* const qopenglslNonPremultipliedImageSrcFragmentShader = "\n\
-    varying   highp   vec2      textureCoords; \n\
-    uniform          sampler2D imageTexture; \n\
-    lowp vec4 srcPixel() \n\
-    { \n\
-        lowp vec4 sample = texture2D(imageTexture, textureCoords); \n\
-        sample.rgb = sample.rgb * sample.a; \n\
-        return sample; \n\
-    }\n";
-
-static const char* const qopenglslGrayscaleImageSrcFragmentShader = "\n\
-    varying   highp   vec2      textureCoords; \n\
-    uniform          sampler2D imageTexture; \n\
-    lowp vec4 srcPixel() \n\
-    { \n\
-        return texture2D(imageTexture, textureCoords).rrra; \n\
-    }\n";
-
-static const char* const qopenglslAlphaImageSrcFragmentShader = "\n\
-    varying   highp   vec2      textureCoords; \n\
-    uniform          sampler2D imageTexture; \n\
-    lowp vec4 srcPixel() \n\
-    { \n\
-        return vec4(0, 0, 0, texture2D(imageTexture, textureCoords).r); \n\
-    }\n";
-
-static const char* const qopenglslShockingPinkSrcFragmentShader = "\n\
-    lowp vec4 srcPixel() \n\
-    { \n\
-        return vec4(0.98, 0.06, 0.75, 1.0); \n\
-    }\n";
-
-static const char* const qopenglslMainFragmentShader_ImageArrays = "\n\
-    varying   lowp    float     opacity; \n\
-    lowp vec4 srcPixel(); \n\
-    void main() \n\
-    { \n\
-        gl_FragColor = srcPixel() * opacity; \n\
-    }\n";
-
-static const char* const qopenglslMainFragmentShader_MO = "\n\
-    uniform   lowp    float     globalOpacity; \n\
-    lowp vec4 srcPixel(); \n\
-    lowp vec4 applyMask(lowp vec4); \n\
-    void main() \n\
-    { \n\
-        gl_FragColor = applyMask(srcPixel()*globalOpacity); \n\
-    }\n";
-
-static const char* const qopenglslMainFragmentShader_M = "\n\
-    lowp vec4 srcPixel(); \n\
-    lowp vec4 applyMask(lowp vec4); \n\
-    void main() \n\
-    { \n\
-        gl_FragColor = applyMask(srcPixel()); \n\
-    }\n";
-
-static const char* const qopenglslMainFragmentShader_O = "\n\
-    uniform   lowp    float     globalOpacity; \n\
-    lowp vec4 srcPixel(); \n\
-    void main() \n\
-    { \n\
-        gl_FragColor = srcPixel()*globalOpacity; \n\
-    }\n";
-
-static const char* const qopenglslMainFragmentShader = "\n\
-    lowp vec4 srcPixel(); \n\
-    void main() \n\
-    { \n\
-        gl_FragColor = srcPixel(); \n\
-    }\n";
-
-static const char* const qopenglslMaskFragmentShader = "\n\
-    varying   highp   vec2      textureCoords;\n\
-    uniform           sampler2D maskTexture;\n\
-    lowp vec4 applyMask(lowp vec4 src) \n\
-    {\n\
-        lowp vec4 mask = texture2D(maskTexture, textureCoords); \n\
-        return src * mask.a; \n\
-    }\n";
-
-// For source over with subpixel antialiasing, the final color is calculated per component as follows
-// (.a is alpha component, .c is red, green or blue component):
-// alpha = src.a * mask.c * opacity
-// dest.c = dest.c * (1 - alpha) + src.c * alpha
-//
-// In the first pass, calculate: dest.c = dest.c * (1 - alpha) with blend funcs: zero, 1 - source color
-// In the second pass, calculate: dest.c = dest.c + src.c * alpha with blend funcs: one, one
-//
-// If source is a solid color (src is constant), only the first pass is needed, with blend funcs: constant, 1 - source color
-
-// For source composition with subpixel antialiasing, the final color is calculated per component as follows:
-// alpha = src.a * mask.c * opacity
-// dest.c = dest.c * (1 - mask.c) + src.c * alpha
-//
-
-static const char* const qopenglslRgbMaskFragmentShaderPass1 = "\n\
-    varying   highp   vec2      textureCoords;\n\
-    uniform           sampler2D maskTexture;\n\
-    lowp vec4 applyMask(lowp vec4 src) \n\
-    { \n\
-        lowp vec4 mask = texture2D(maskTexture, textureCoords); \n\
-        return src.a * mask; \n\
-    }\n";
-
-static const char* const qopenglslRgbMaskFragmentShaderPass2 = "\n\
-    varying   highp   vec2      textureCoords;\n\
-    uniform           sampler2D maskTexture;\n\
-    lowp vec4 applyMask(lowp vec4 src) \n\
-    { \n\
-        lowp vec4 mask = texture2D(maskTexture, textureCoords); \n\
-        return src * mask; \n\
-    }\n";
-
-static const char* const qopenglslMultiplyCompositionModeFragmentShader = "\n\
-    #ifdef GL_KHR_blend_equation_advanced\n\
-    layout(blend_support_multiply) out;\n\
-    #endif\n";
-
-static const char* const qopenglslScreenCompositionModeFragmentShader = "\n\
-    #ifdef GL_KHR_blend_equation_advanced\n\
-    layout(blend_support_screen) out;\n\
-    #endif\n";
-
-static const char* const qopenglslOverlayCompositionModeFragmentShader = "\n\
-    #ifdef GL_KHR_blend_equation_advanced\n\
-    layout(blend_support_overlay) out;\n\
-    #endif\n";
-
-static const char* const qopenglslDarkenCompositionModeFragmentShader = "\n\
-    #ifdef GL_KHR_blend_equation_advanced\n\
-    layout(blend_support_darken) out;\n\
-    #endif\n";
-
-static const char* const qopenglslLightenCompositionModeFragmentShader = "\n\
-    #ifdef GL_KHR_blend_equation_advanced\n\
-    layout(blend_support_lighten) out;\n\
-    #endif\n";
-
-static const char* const qopenglslColorDodgeCompositionModeFragmentShader = "\n\
-    #ifdef GL_KHR_blend_equation_advanced\n\
-    layout(blend_support_colordodge) out;\n\
-    #endif\n";
-
-static const char* const qopenglslColorBurnCompositionModeFragmentShader = "\n\
-    #ifdef GL_KHR_blend_equation_advanced\n\
-    layout(blend_support_colorburn) out;\n\
-    #endif\n";
-
-static const char* const qopenglslHardLightCompositionModeFragmentShader = "\n\
-    #ifdef GL_KHR_blend_equation_advanced\n\
-    layout(blend_support_hardlight) out;\n\
-    #endif\n";
-
-static const char* const qopenglslSoftLightCompositionModeFragmentShader = "\n\
-    #ifdef GL_KHR_blend_equation_advanced\n\
-    layout(blend_support_softlight) out;\n\
-    #endif\n";
-
-static const char* const qopenglslDifferenceCompositionModeFragmentShader = "\n\
-    #ifdef GL_KHR_blend_equation_advanced\n\
-    layout(blend_support_difference) out;\n\
-    #endif\n";
-
-static const char* const qopenglslExclusionCompositionModeFragmentShader = "\n\
-    #ifdef GL_KHR_blend_equation_advanced\n\
-    layout(blend_support_exclusion) out;\n\
-    #endif\n";
-
-/*
-    Left to implement:
-        RgbMaskFragmentShader,
-        RgbMaskWithGammaFragmentShader,
-*/
-
-/*
-    OpenGL 3.2+ Core Profile shaders
-    The following shader snippets are copies of the snippets above
-    but use the modern GLSL 1.5 keywords. New shaders should make
-    a snippet for both profiles and add them appropriately in the
-    shader manager.
-*/
-static const char* const qopenglslMainVertexShader_core =
-    "#version 150 core\n\
-    void setPosition(); \n\
-    void main(void) \n\
-    { \n\
-        setPosition(); \n\
-    }\n";
-
-static const char* const qopenglslMainWithTexCoordsVertexShader_core =
-    "#version 150 core\n\
-    in      vec2      textureCoordArray; \n\
-    out     vec2      textureCoords; \n\
-    void setPosition(); \n\
-    void main(void) \n\
-    { \n\
-        setPosition(); \n\
-        textureCoords = textureCoordArray; \n\
-    }\n";
-
-static const char* const qopenglslMainWithTexCoordsAndOpacityVertexShader_core =
-    "#version 150 core\n\
-    in      vec2      textureCoordArray; \n\
-    in      float     opacityArray; \n\
-    out     vec2      textureCoords; \n\
-    out     float     opacity; \n\
-    void setPosition(); \n\
-    void main(void) \n\
-    { \n\
-        setPosition(); \n\
-        textureCoords = textureCoordArray; \n\
-        opacity = opacityArray; \n\
-    }\n";
-
-// NOTE: We let GL do the perspective correction so texture lookups in the fragment
-//       shader are also perspective corrected.
-static const char* const qopenglslPositionOnlyVertexShader_core = "\n\
-    in      vec2      vertexCoordsArray; \n\
-    in      vec3      pmvMatrix1; \n\
-    in      vec3      pmvMatrix2; \n\
-    in      vec3      pmvMatrix3; \n\
-    void setPosition(void) \n\
-    { \n\
-        mat3 pmvMatrix = mat3(pmvMatrix1, pmvMatrix2, pmvMatrix3); \n\
-        vec3 transformedPos = pmvMatrix * vec3(vertexCoordsArray.xy, 1.0); \n\
-        gl_Position = vec4(transformedPos.xy, 0.0, transformedPos.z); \n\
-    }\n";
-
-static const char* const qopenglslComplexGeometryPositionOnlyVertexShader_core = "\n\
-    in      vec2      vertexCoordsArray; \n\
-    uniform mat3      matrix; \n\
-    void setPosition(void) \n\
-    { \n\
-      gl_Position = vec4(matrix * vec3(vertexCoordsArray, 1), 1);\n\
-    } \n";
-
-static const char* const qopenglslUntransformedPositionVertexShader_core = "\n\
-    in      vec4      vertexCoordsArray; \n\
-    void setPosition(void) \n\
-    { \n\
-        gl_Position = vertexCoordsArray; \n\
-    }\n";
-
-// Pattern Brush - This assumes the texture size is 8x8 and thus, the inverted size is 0.125
-static const char* const qopenglslPositionWithPatternBrushVertexShader_core = "\n\
-    in      vec2      vertexCoordsArray; \n\
-    in      vec3      pmvMatrix1; \n\
-    in      vec3      pmvMatrix2; \n\
-    in      vec3      pmvMatrix3; \n\
-    out     vec2      patternTexCoords; \n\
-    uniform vec2      halfViewportSize; \n\
-    uniform vec2      invertedTextureSize; \n\
-    uniform mat3      brushTransform; \n\
-    void setPosition(void) \n\
-    { \n\
-        mat3 pmvMatrix = mat3(pmvMatrix1, pmvMatrix2, pmvMatrix3); \n\
-        vec3 transformedPos = pmvMatrix * vec3(vertexCoordsArray.xy, 1.0); \n\
-        gl_Position.xy = transformedPos.xy / transformedPos.z; \n\
-        vec2 viewportCoords = (gl_Position.xy + 1.0) * halfViewportSize; \n\
-        vec3 hTexCoords = brushTransform * vec3(viewportCoords, 1.0); \n\
-        float invertedHTexCoordsZ = 1.0 / hTexCoords.z; \n\
-        gl_Position = vec4(gl_Position.xy * invertedHTexCoordsZ, 0.0, invertedHTexCoordsZ); \n\
-        patternTexCoords.xy = (hTexCoords.xy * 0.125) * invertedHTexCoordsZ; \n\
-    }\n";
-
-static const char* const qopenglslAffinePositionWithPatternBrushVertexShader_core
-                 = qopenglslPositionWithPatternBrushVertexShader_core;
-
-static const char* const qopenglslPatternBrushSrcFragmentShader_core = "\n\
-    in      vec2      patternTexCoords;\n\
-    uniform sampler2D brushTexture; \n\
-    uniform vec4      patternColor; \n\
-    vec4 srcPixel() \n\
-    { \n\
-        return patternColor * (1.0 - texture(brushTexture, patternTexCoords).r); \n\
-    }\n";
-
-
-// Linear Gradient Brush
-static const char* const qopenglslPositionWithLinearGradientBrushVertexShader_core = "\n\
-    in      vec2      vertexCoordsArray; \n\
-    in      vec3      pmvMatrix1; \n\
-    in      vec3      pmvMatrix2; \n\
-    in      vec3      pmvMatrix3; \n\
-    out     float     index; \n\
-    uniform vec2      halfViewportSize; \n\
-    uniform vec3      linearData; \n\
-    uniform mat3      brushTransform; \n\
-    void setPosition() \n\
-    { \n\
-        mat3 pmvMatrix = mat3(pmvMatrix1, pmvMatrix2, pmvMatrix3); \n\
-        vec3 transformedPos = pmvMatrix * vec3(vertexCoordsArray.xy, 1.0); \n\
-        gl_Position.xy = transformedPos.xy / transformedPos.z; \n\
-        vec2 viewportCoords = (gl_Position.xy + 1.0) * halfViewportSize; \n\
-        vec3 hTexCoords = brushTransform * vec3(viewportCoords, 1); \n\
-        float invertedHTexCoordsZ = 1.0 / hTexCoords.z; \n\
-        gl_Position = vec4(gl_Position.xy * invertedHTexCoordsZ, 0.0, invertedHTexCoordsZ); \n\
-        index = (dot(linearData.xy, hTexCoords.xy) * linearData.z) * invertedHTexCoordsZ; \n\
-    }\n";
-
-static const char* const qopenglslAffinePositionWithLinearGradientBrushVertexShader_core
-                 = qopenglslPositionWithLinearGradientBrushVertexShader_core;
-
-static const char* const qopenglslLinearGradientBrushSrcFragmentShader_core = "\n\
-    uniform sampler2D brushTexture; \n\
-    in      float     index; \n\
-    vec4 srcPixel() \n\
-    { \n\
-        vec2 val = vec2(index, 0.5); \n\
-        return texture(brushTexture, val); \n\
-    }\n";
-
-
-// Conical Gradient Brush
-static const char* const qopenglslPositionWithConicalGradientBrushVertexShader_core = "\n\
-    in      vec2      vertexCoordsArray; \n\
-    in      vec3      pmvMatrix1; \n\
-    in      vec3      pmvMatrix2; \n\
-    in      vec3      pmvMatrix3; \n\
-    out     vec2      A; \n\
-    uniform vec2      halfViewportSize; \n\
-    uniform mat3      brushTransform; \n\
-    void setPosition(void) \n\
-    { \n\
-        mat3 pmvMatrix = mat3(pmvMatrix1, pmvMatrix2, pmvMatrix3); \n\
-        vec3 transformedPos = pmvMatrix * vec3(vertexCoordsArray.xy, 1.0); \n\
-        gl_Position.xy = transformedPos.xy / transformedPos.z; \n\
-        vec2  viewportCoords = (gl_Position.xy + 1.0) * halfViewportSize; \n\
-        vec3 hTexCoords = brushTransform * vec3(viewportCoords, 1); \n\
-        float invertedHTexCoordsZ = 1.0 / hTexCoords.z; \n\
-        gl_Position = vec4(gl_Position.xy * invertedHTexCoordsZ, 0.0, invertedHTexCoordsZ); \n\
-        A = hTexCoords.xy * invertedHTexCoordsZ; \n\
-    }\n";
-
-static const char* const qopenglslAffinePositionWithConicalGradientBrushVertexShader_core
-                 = qopenglslPositionWithConicalGradientBrushVertexShader_core;
-
-static const char* const qopenglslConicalGradientBrushSrcFragmentShader_core = "\n\
-    #define INVERSE_2PI 0.1591549430918953358 \n\
-    in      vec2      A; \n\
-    uniform sampler2D brushTexture; \n\
-    uniform float     angle; \n\
-    vec4 srcPixel() \n\
-    { \n\
-        float t; \n\
-        if (abs(A.y) == abs(A.x)) \n\
-            t = (atan(-A.y + 0.002, A.x) + angle) * INVERSE_2PI; \n\
-        else \n\
-            t = (atan(-A.y, A.x) + angle) * INVERSE_2PI; \n\
-        return texture(brushTexture, vec2(t - floor(t), 0.5)); \n\
-    }\n";
-
-
-// Radial Gradient Brush
-static const char* const qopenglslPositionWithRadialGradientBrushVertexShader_core = "\n\
-    in      vec2      vertexCoordsArray;\n\
-    in      vec3      pmvMatrix1; \n\
-    in      vec3      pmvMatrix2; \n\
-    in      vec3      pmvMatrix3; \n\
-    out     float     b; \n\
-    out     vec2      A; \n\
-    uniform vec2      halfViewportSize; \n\
-    uniform mat3      brushTransform; \n\
-    uniform vec2      fmp; \n\
-    uniform vec3      bradius; \n\
-    void setPosition(void) \n\
-    {\n\
-        mat3 pmvMatrix = mat3(pmvMatrix1, pmvMatrix2, pmvMatrix3); \n\
-        vec3 transformedPos = pmvMatrix * vec3(vertexCoordsArray.xy, 1.0); \n\
-        gl_Position.xy = transformedPos.xy / transformedPos.z; \n\
-        vec2 viewportCoords = (gl_Position.xy + 1.0) * halfViewportSize; \n\
-        vec3 hTexCoords = brushTransform * vec3(viewportCoords, 1); \n\
-        float invertedHTexCoordsZ = 1.0 / hTexCoords.z; \n\
-        gl_Position = vec4(gl_Position.xy * invertedHTexCoordsZ, 0.0, invertedHTexCoordsZ); \n\
-        A = hTexCoords.xy * invertedHTexCoordsZ; \n\
-        b = bradius.x + 2.0 * dot(A, fmp); \n\
-    }\n";
-
-static const char* const qopenglslAffinePositionWithRadialGradientBrushVertexShader_core
-                 = qopenglslPositionWithRadialGradientBrushVertexShader_core;
-
-static const char* const qopenglslRadialGradientBrushSrcFragmentShader_core = "\n\
-    in      float     b; \n\
-    in      vec2      A; \n\
-    uniform sampler2D brushTexture; \n\
-    uniform float     fmp2_m_radius2; \n\
-    uniform float     inverse_2_fmp2_m_radius2; \n\
-    uniform float     sqrfr; \n\
-    uniform vec3      bradius; \n\
-    \n\
-    vec4 srcPixel() \n\
-    { \n\
-        float c = sqrfr-dot(A, A); \n\
-        float det = b*b - 4.0*fmp2_m_radius2*c; \n\
-        vec4 result = vec4(0.0); \n\
-        if (det >= 0.0) { \n\
-            float detSqrt = sqrt(det); \n\
-            float w = max((-b - detSqrt) * inverse_2_fmp2_m_radius2, (-b + detSqrt) * inverse_2_fmp2_m_radius2); \n\
-            if (bradius.y + w * bradius.z >= 0.0) \n\
-                result = texture(brushTexture, vec2(w, 0.5)); \n\
-        } \n\
-        return result; \n\
-    }\n";
-
-
-// Texture Brush
-static const char* const qopenglslPositionWithTextureBrushVertexShader_core = "\n\
-    in      vec2      vertexCoordsArray; \n\
-    in      vec3      pmvMatrix1; \n\
-    in      vec3      pmvMatrix2; \n\
-    in      vec3      pmvMatrix3; \n\
-    out     vec2      brushTextureCoords; \n\
-    uniform vec2      halfViewportSize; \n\
-    uniform vec2      invertedTextureSize; \n\
-    uniform mat3      brushTransform; \n\
-    \n\
-    void setPosition(void) \n\
-    { \n\
-        mat3 pmvMatrix = mat3(pmvMatrix1, pmvMatrix2, pmvMatrix3); \n\
-        vec3 transformedPos = pmvMatrix * vec3(vertexCoordsArray.xy, 1.0); \n\
-        gl_Position.xy = transformedPos.xy / transformedPos.z; \n\
-        vec2 viewportCoords = (gl_Position.xy + 1.0) * halfViewportSize; \n\
-        vec3 hTexCoords = brushTransform * vec3(viewportCoords, 1); \n\
-        float invertedHTexCoordsZ = 1.0 / hTexCoords.z; \n\
-        gl_Position = vec4(gl_Position.xy * invertedHTexCoordsZ, 0.0, invertedHTexCoordsZ); \n\
-        brushTextureCoords.xy = (hTexCoords.xy * invertedTextureSize) * gl_Position.w; \n\
-    }\n";
-
-static const char* const qopenglslAffinePositionWithTextureBrushVertexShader_core
-                 = qopenglslPositionWithTextureBrushVertexShader_core;
-
-static const char* const qopenglslTextureBrushSrcFragmentShader_core = "\n\
-    in      vec2      brushTextureCoords; \n\
-    uniform sampler2D brushTexture; \n\
-    vec4 srcPixel() \n\
-    { \n\
-        return texture(brushTexture, brushTextureCoords); \n\
-    }\n";
-
-static const char* const qopenglslTextureBrushSrcWithPatternFragmentShader_core = "\n\
-    in      vec2      brushTextureCoords; \n\
-    uniform vec4      patternColor; \n\
-    uniform sampler2D brushTexture; \n\
-    vec4 srcPixel() \n\
-    { \n\
-        return patternColor * (1.0 - texture(brushTexture, brushTextureCoords).r); \n\
-    }\n";
-
-// Solid Fill Brush
-static const char* const qopenglslSolidBrushSrcFragmentShader_core = "\n\
-    uniform vec4      fragmentColor; \n\
-    vec4 srcPixel() \n\
-    { \n\
-        return fragmentColor; \n\
-    }\n";
-
-static const char* const qopenglslImageSrcFragmentShader_core = "\n\
-    in      vec2      textureCoords; \n\
-    uniform sampler2D imageTexture; \n\
-    vec4 srcPixel() \n\
-    { \n\
-        return texture(imageTexture, textureCoords); \n\
-    }\n";
-
-static const char* const qopenglslCustomSrcFragmentShader_core = "\n\
-    in      vec2      textureCoords; \n\
-    uniform sampler2D imageTexture; \n\
-    vec4 srcPixel() \n\
-    { \n\
-        return customShader(imageTexture, textureCoords); \n\
-    }\n";
-
-static const char* const qopenglslImageSrcWithPatternFragmentShader_core = "\n\
-    in      vec2      textureCoords; \n\
-    uniform vec4      patternColor; \n\
-    uniform sampler2D imageTexture; \n\
-    vec4 srcPixel() \n\
-    { \n\
-        return patternColor * (1.0 - texture(imageTexture, textureCoords).r); \n\
-    }\n";
-
-static const char* const qopenglslNonPremultipliedImageSrcFragmentShader_core = "\n\
-    in      vec2      textureCoords; \n\
-    uniform sampler2D imageTexture; \n\
-    vec4 srcPixel() \n\
-    { \n\
-        vec4 sample = texture(imageTexture, textureCoords); \n\
-        sample.rgb = sample.rgb * sample.a; \n\
-        return sample; \n\
-    }\n";
-
-static const char* const qopenglslGrayscaleImageSrcFragmentShader_core = "\n\
-    in      vec2      textureCoords; \n\
-    uniform sampler2D imageTexture; \n\
-    vec4 srcPixel() \n\
-    { \n\
-        return texture(imageTexture, textureCoords).rrra; \n\
-    }\n";
-
-static const char* const qopenglslAlphaImageSrcFragmentShader_core = "\n\
-    in      vec2      textureCoords; \n\
-    uniform sampler2D imageTexture; \n\
-    vec4 srcPixel() \n\
-    { \n\
-        return vec4(0, 0, 0, texture(imageTexture, textureCoords).r); \n\
-    }\n";
-
-static const char* const qopenglslShockingPinkSrcFragmentShader_core = "\n\
-    vec4 srcPixel() \n\
-    { \n\
-        return vec4(0.98, 0.06, 0.75, 1.0); \n\
-    }\n";
-
-static const char* const qopenglslMainFragmentShader_ImageArrays_core =
-    "#version 150 core\n\
-    in      float     opacity; \n\
-    out     vec4      fragColor; \n\
-    vec4 srcPixel(); \n\
-    void main() \n\
-    { \n\
-        fragColor = srcPixel() * opacity; \n\
-    }\n";
-
-static const char* const qopenglslMainFragmentShader_MO_core =
-    "#version 150 core\n\
-    out     vec4      fragColor; \n\
-    uniform float     globalOpacity; \n\
-    vec4 srcPixel(); \n\
-    vec4 applyMask(vec4); \n\
-    void main() \n\
-    { \n\
-        fragColor = applyMask(srcPixel()*globalOpacity); \n\
-    }\n";
-
-static const char* const qopenglslMainFragmentShader_M_core =
-    "#version 150 core\n\
-    out     vec4      fragColor; \n\
-    vec4 srcPixel(); \n\
-    vec4 applyMask(vec4); \n\
-    void main() \n\
-    { \n\
-        fragColor = applyMask(srcPixel()); \n\
-    }\n";
-
-static const char* const qopenglslMainFragmentShader_O_core =
-    "#version 150 core\n\
-    out     vec4      fragColor; \n\
-    uniform float     globalOpacity; \n\
-    vec4 srcPixel(); \n\
-    void main() \n\
-    { \n\
-        fragColor = srcPixel()*globalOpacity; \n\
-    }\n";
-
-static const char* const qopenglslMainFragmentShader_core =
-    "#version 150 core\n\
-    out     vec4      fragColor; \n\
-    vec4 srcPixel(); \n\
-    void main() \n\
-    { \n\
-        fragColor = srcPixel(); \n\
-    }\n";
-
-static const char* const qopenglslMaskFragmentShader_core = "\n\
-    in      vec2      textureCoords;\n\
-    uniform sampler2D maskTexture;\n\
-    vec4 applyMask(vec4 src) \n\
-    {\n\
-        vec4 mask = texture(maskTexture, textureCoords); \n\
-        return src * mask.r; \n\
-    }\n";
-
-// For source over with subpixel antialiasing, the final color is calculated per component as follows
-// (.a is alpha component, .c is red, green or blue component):
-// alpha = src.a * mask.c * opacity
-// dest.c = dest.c * (1 - alpha) + src.c * alpha
-//
-// In the first pass, calculate: dest.c = dest.c * (1 - alpha) with blend funcs: zero, 1 - source color
-// In the second pass, calculate: dest.c = dest.c + src.c * alpha with blend funcs: one, one
-//
-// If source is a solid color (src is constant), only the first pass is needed, with blend funcs: constant, 1 - source color
-
-// For source composition with subpixel antialiasing, the final color is calculated per component as follows:
-// alpha = src.a * mask.c * opacity
-// dest.c = dest.c * (1 - mask.c) + src.c * alpha
-//
-
-static const char* const qopenglslRgbMaskFragmentShaderPass1_core = "\n\
-    in      vec2      textureCoords;\n\
-    uniform sampler2D maskTexture;\n\
-    vec4 applyMask(vec4 src) \n\
-    { \n\
-        vec4 mask = texture(maskTexture, textureCoords); \n\
-        return src.a * mask; \n\
-    }\n";
-
-static const char* const qopenglslRgbMaskFragmentShaderPass2_core = "\n\
-    in      vec2      textureCoords;\n\
-    uniform sampler2D maskTexture;\n\
-    vec4 applyMask(vec4 src) \n\
-    { \n\
-        vec4 mask = texture(maskTexture, textureCoords); \n\
-        return src * mask; \n\
-    }\n";
-
-/*
-    Left to implement:
-        RgbMaskFragmentShader_core,
-        RgbMaskWithGammaFragmentShader_core,
-*/
-
-QT_END_NAMESPACE
-
-#endif // GLGC_SHADER_SOURCE_H
diff --git a/src/gui/opengl/qopenglframebufferobject.cpp b/src/gui/opengl/qopenglframebufferobject.cpp
deleted file mode 100644
index d7a6d32218..0000000000
--- a/src/gui/opengl/qopenglframebufferobject.cpp
+++ /dev/null
@@ -1,1857 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtGui module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qopenglframebufferobject.h"
-#include "qopenglframebufferobject_p.h"
-
-#include <qdebug.h>
-#include <private/qopengl_p.h>
-#include <private/qopenglcontext_p.h>
-#include <private/qopenglextensions_p.h>
-#include <private/qfont_p.h>
-
-#include <qwindow.h>
-#include <qimage.h>
-#include <QtCore/qbytearray.h>
-
-QT_BEGIN_NAMESPACE
-
-#ifndef QT_NO_DEBUG
-#define QT_RESET_GLERROR()                                \
-{                                                         \
-    while (true) {\
-        GLenum error = QOpenGLContext::currentContext()->functions()->glGetError(); \
-        if (error == GL_NO_ERROR || error == GL_CONTEXT_LOST) \
-            break; \
-    } \
-}
-#define QT_CHECK_GLERROR()                                \
-{                                                         \
-    GLenum err = QOpenGLContext::currentContext()->functions()->glGetError(); \
-    if (err != GL_NO_ERROR && err != GL_CONTEXT_LOST) {                             \
-        qDebug("[%s line %d] OpenGL Error: %d",           \
-               __FILE__, __LINE__, (int)err);             \
-    }                                                     \
-}
-#else
-#define QT_RESET_GLERROR() {}
-#define QT_CHECK_GLERROR() {}
-#endif
-
-#ifndef GL_MAX_SAMPLES
-#define GL_MAX_SAMPLES 0x8D57
-#endif
-
-#ifndef GL_RENDERBUFFER_SAMPLES
-#define GL_RENDERBUFFER_SAMPLES 0x8CAB
-#endif
-
-#ifndef GL_DEPTH24_STENCIL8
-#define GL_DEPTH24_STENCIL8 0x88F0
-#endif
-
-#ifndef GL_DEPTH_COMPONENT24
-#define GL_DEPTH_COMPONENT24 0x81A6
-#endif
-
-#ifndef GL_DEPTH_COMPONENT24_OES
-#define GL_DEPTH_COMPONENT24_OES 0x81A6
-#endif
-
-#ifndef GL_READ_FRAMEBUFFER
-#define GL_READ_FRAMEBUFFER 0x8CA8
-#endif
-
-#ifndef GL_DRAW_FRAMEBUFFER
-#define GL_DRAW_FRAMEBUFFER 0x8CA9
-#endif
-
-#ifndef GL_RGB8
-#define GL_RGB8                           0x8051
-#endif
-
-#ifndef GL_RGB10
-#define GL_RGB10                          0x8052
-#endif
-
-#ifndef GL_RGB16
-#define GL_RGB16                          0x8054
-#endif
-
-#ifndef GL_RGBA8
-#define GL_RGBA8                          0x8058
-#endif
-
-#ifndef GL_RGB10_A2
-#define GL_RGB10_A2                       0x8059
-#endif
-
-#ifndef GL_RGBA16
-#define GL_RGBA16                         0x805B
-#endif
-
-#ifndef GL_BGRA
-#define GL_BGRA                           0x80E1
-#endif
-
-#ifndef GL_UNSIGNED_INT_8_8_8_8_REV
-#define GL_UNSIGNED_INT_8_8_8_8_REV       0x8367
-#endif
-
-#ifndef GL_UNSIGNED_INT_2_10_10_10_REV
-#define GL_UNSIGNED_INT_2_10_10_10_REV    0x8368
-#endif
-
-#ifndef GL_CONTEXT_LOST
-#define GL_CONTEXT_LOST                   0x0507
-#endif
-
-#ifndef GL_DEPTH_STENCIL_ATTACHMENT
-#define GL_DEPTH_STENCIL_ATTACHMENT       0x821A
-#endif
-
-#ifndef GL_DEPTH_STENCIL
-#define GL_DEPTH_STENCIL                  0x84F9
-#endif
-
-
-
-/*!
-    \class QOpenGLFramebufferObjectFormat
-    \brief The QOpenGLFramebufferObjectFormat class specifies the format of an OpenGL
-    framebuffer object.
-    \inmodule QtGui
-
-    \since 5.0
-
-    \ingroup painting-3D
-
-    A framebuffer object has several characteristics:
-    \list
-    \li \l{setSamples()}{Number of samples per pixels.}
-    \li \l{setAttachment()}{Depth and/or stencil attachments.}
-    \li \l{setTextureTarget()}{Texture target.}
-    \li \l{setInternalTextureFormat()}{Internal texture format.}
-    \endlist
-
-    Note that the desired attachments or number of samples per pixels might not
-    be supported by the hardware driver. Call QOpenGLFramebufferObject::format()
-    after creating a QOpenGLFramebufferObject to find the exact format that was
-    used to create the frame buffer object.
-
-    \sa QOpenGLFramebufferObject
-*/
-
-/*!
-    \internal
-*/
-void QOpenGLFramebufferObjectFormat::detach()
-{
-    if (d->ref.loadRelaxed() != 1) {
-        QOpenGLFramebufferObjectFormatPrivate *newd
-            = new QOpenGLFramebufferObjectFormatPrivate(d);
-        if (!d->ref.deref())
-            delete d;
-        d = newd;
-    }
-}
-
-/*!
-    Creates a QOpenGLFramebufferObjectFormat object for specifying
-    the format of an OpenGL framebuffer object.
-
-    By default the format specifies a non-multisample framebuffer object with no
-    depth/stencil attachments, texture target \c GL_TEXTURE_2D, and internal format \c GL_RGBA8.
-    On OpenGL/ES systems, the default internal format is \c GL_RGBA.
-
-    \sa samples(), attachment(), internalTextureFormat()
-*/
-
-QOpenGLFramebufferObjectFormat::QOpenGLFramebufferObjectFormat()
-{
-    d = new QOpenGLFramebufferObjectFormatPrivate;
-}
-
-/*!
-    Constructs a copy of \a other.
-*/
-
-QOpenGLFramebufferObjectFormat::QOpenGLFramebufferObjectFormat(const QOpenGLFramebufferObjectFormat &other)
-{
-    d = other.d;
-    d->ref.ref();
-}
-
-/*!
-    Assigns \a other to this object.
-*/
-
-QOpenGLFramebufferObjectFormat &QOpenGLFramebufferObjectFormat::operator=(const QOpenGLFramebufferObjectFormat &other)
-{
-    if (d != other.d) {
-        other.d->ref.ref();
-        if (!d->ref.deref())
-            delete d;
-        d = other.d;
-    }
-    return *this;
-}
-
-/*!
-    Destroys the QOpenGLFramebufferObjectFormat.
-*/
-QOpenGLFramebufferObjectFormat::~QOpenGLFramebufferObjectFormat()
-{
-    if (!d->ref.deref())
-        delete d;
-}
-
-/*!
-    Sets the number of samples per pixel for a multisample framebuffer object
-    to \a samples.  The default sample count of 0 represents a regular
-    non-multisample framebuffer object.
-
-    If the desired amount of samples per pixel is not supported by the hardware
-    then the maximum number of samples per pixel will be used. Note that
-    multisample framebuffer objects cannot be bound as textures. Also, the
-    \c{GL_EXT_framebuffer_multisample} extension is required to create a
-    framebuffer with more than one sample per pixel.
-
-    \sa samples()
-*/
-void QOpenGLFramebufferObjectFormat::setSamples(int samples)
-{
-    detach();
-    d->samples = samples;
-}
-
-/*!
-    Returns the number of samples per pixel if a framebuffer object
-    is a multisample framebuffer object. Otherwise, returns 0.
-    The default value is 0.
-
-    \sa setSamples()
-*/
-int QOpenGLFramebufferObjectFormat::samples() const
-{
-    return d->samples;
-}
-
-/*!
-    Enables mipmapping if \a enabled is true; otherwise disables it.
-
-    Mipmapping is disabled by default.
-
-    If mipmapping is enabled, additional memory will be allocated for
-    the mipmap levels. The mipmap levels can be updated by binding the
-    texture and calling glGenerateMipmap(). Mipmapping cannot be enabled
-    for multisampled framebuffer objects.
-
-    \sa mipmap(), QOpenGLFramebufferObject::texture()
-*/
-void QOpenGLFramebufferObjectFormat::setMipmap(bool enabled)
-{
-    detach();
-    d->mipmap = enabled;
-}
-
-/*!
-    Returns \c true if mipmapping is enabled.
-
-    \sa setMipmap()
-*/
-bool QOpenGLFramebufferObjectFormat::mipmap() const
-{
-    return d->mipmap;
-}
-
-/*!
-    Sets the attachment configuration of a framebuffer object to \a attachment.
-
-    \sa attachment()
-*/
-void QOpenGLFramebufferObjectFormat::setAttachment(QOpenGLFramebufferObject::Attachment attachment)
-{
-    detach();
-    d->attachment = attachment;
-}
-
-/*!
-    Returns the configuration of the depth and stencil buffers attached to
-    a framebuffer object.  The default is QOpenGLFramebufferObject::NoAttachment.
-
-    \sa setAttachment()
-*/
-QOpenGLFramebufferObject::Attachment QOpenGLFramebufferObjectFormat::attachment() const
-{
-    return d->attachment;
-}
-
-/*!
-    Sets the texture target of the texture attached to a framebuffer object to
-    \a target. Ignored for multisample framebuffer objects.
-
-    \sa textureTarget(), samples()
-*/
-void QOpenGLFramebufferObjectFormat::setTextureTarget(GLenum target)
-{
-    detach();
-    d->target = target;
-}
-
-/*!
-    Returns the texture target of the texture attached to a framebuffer object.
-    Ignored for multisample framebuffer objects.  The default is
-    \c GL_TEXTURE_2D.
-
-    \sa setTextureTarget(), samples()
-*/
-GLenum QOpenGLFramebufferObjectFormat::textureTarget() const
-{
-    return d->target;
-}
-
-/*!
-    Sets the internal format of a framebuffer object's texture or
-    multisample framebuffer object's color buffer to
-    \a internalTextureFormat.
-
-    \sa internalTextureFormat()
-*/
-void QOpenGLFramebufferObjectFormat::setInternalTextureFormat(GLenum internalTextureFormat)
-{
-    detach();
-    d->internal_format = internalTextureFormat;
-}
-
-/*!
-    Returns the internal format of a framebuffer object's texture or
-    multisample framebuffer object's color buffer.  The default is
-    \c GL_RGBA8 on desktop OpenGL systems, and \c GL_RGBA on
-    OpenGL/ES systems.
-
-    \sa setInternalTextureFormat()
-*/
-GLenum QOpenGLFramebufferObjectFormat::internalTextureFormat() const
-{
-    return d->internal_format;
-}
-
-/*!
-    Returns \c true if all the options of this framebuffer object format
-    are the same as \a other; otherwise returns \c false.
-*/
-bool QOpenGLFramebufferObjectFormat::operator==(const QOpenGLFramebufferObjectFormat& other) const
-{
-    if (d == other.d)
-        return true;
-    else
-        return d->equals(other.d);
-}
-
-/*!
-    Returns \c false if all the options of this framebuffer object format
-    are the same as \a other; otherwise returns \c true.
-*/
-bool QOpenGLFramebufferObjectFormat::operator!=(const QOpenGLFramebufferObjectFormat& other) const
-{
-    return !(*this == other);
-}
-
-bool QOpenGLFramebufferObjectPrivate::checkFramebufferStatus(QOpenGLContext *ctx) const
-{
-    if (!ctx)
-        return false;   // Context no longer exists.
-    GLenum status = ctx->functions()->glCheckFramebufferStatus(GL_FRAMEBUFFER);
-    switch(status) {
-    case GL_NO_ERROR:
-    case GL_FRAMEBUFFER_COMPLETE:
-        return true;
-    case GL_FRAMEBUFFER_UNSUPPORTED:
-        qDebug("QOpenGLFramebufferObject: Unsupported framebuffer format.");
-        break;
-    case GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT:
-        qDebug("QOpenGLFramebufferObject: Framebuffer incomplete attachment.");
-        break;
-    case GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT:
-        qDebug("QOpenGLFramebufferObject: Framebuffer incomplete, missing attachment.");
-        break;
-#ifdef GL_FRAMEBUFFER_INCOMPLETE_DUPLICATE_ATTACHMENT
-    case GL_FRAMEBUFFER_INCOMPLETE_DUPLICATE_ATTACHMENT:
-        qDebug("QOpenGLFramebufferObject: Framebuffer incomplete, duplicate attachment.");
-        break;
-#endif
-#ifdef GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS
-    case GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS:
-        qDebug("QOpenGLFramebufferObject: Framebuffer incomplete, attached images must have same dimensions.");
-        break;
-#endif
-#ifdef GL_FRAMEBUFFER_INCOMPLETE_FORMATS
-    case GL_FRAMEBUFFER_INCOMPLETE_FORMATS:
-        qDebug("QOpenGLFramebufferObject: Framebuffer incomplete, attached images must have same format.");
-        break;
-#endif
-#ifdef GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER
-    case GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER:
-        qDebug("QOpenGLFramebufferObject: Framebuffer incomplete, missing draw buffer.");
-        break;
-#endif
-#ifdef GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER
-    case GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER:
-        qDebug("QOpenGLFramebufferObject: Framebuffer incomplete, missing read buffer.");
-        break;
-#endif
-#ifdef GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE
-    case GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE:
-        qDebug("QOpenGLFramebufferObject: Framebuffer incomplete, attachments must have same number of samples per pixel.");
-        break;
-#endif
-    default:
-        qDebug() <<"QOpenGLFramebufferObject: An undefined error has occurred: "<< status;
-        break;
-    }
-    return false;
-}
-
-namespace
-{
-    void freeFramebufferFunc(QOpenGLFunctions *funcs, GLuint id)
-    {
-        funcs->glDeleteFramebuffers(1, &id);
-    }
-
-    void freeRenderbufferFunc(QOpenGLFunctions *funcs, GLuint id)
-    {
-        funcs->glDeleteRenderbuffers(1, &id);
-    }
-
-    void freeTextureFunc(QOpenGLFunctions *funcs, GLuint id)
-    {
-        funcs->glDeleteTextures(1, &id);
-    }
-}
-
-void QOpenGLFramebufferObjectPrivate::init(QOpenGLFramebufferObject *, const QSize &size,
-                                           QOpenGLFramebufferObject::Attachment attachment,
-                                           GLenum texture_target, GLenum internal_format,
-                                           GLint samples, bool mipmap)
-{
-    QOpenGLContext *ctx = QOpenGLContext::currentContext();
-
-    funcs.initializeOpenGLFunctions();
-
-    if (!funcs.hasOpenGLFeature(QOpenGLFunctions::Framebuffers))
-        return;
-
-    // Fall back to using a normal non-msaa FBO if we don't have support for MSAA
-    if (!funcs.hasOpenGLExtension(QOpenGLExtensions::FramebufferMultisample)
-            || !funcs.hasOpenGLExtension(QOpenGLExtensions::FramebufferBlit)) {
-        samples = 0;
-    } else if (!ctx->isOpenGLES() || ctx->format().majorVersion() >= 3) {
-        GLint maxSamples;
-        funcs.glGetIntegerv(GL_MAX_SAMPLES, &maxSamples);
-        samples = qBound(0, int(samples), int(maxSamples));
-    }
-
-    colorAttachments.append(ColorAttachment(size, internal_format));
-
-    dsSize = size;
-
-    samples = qMax(0, samples);
-    requestedSamples = samples;
-
-    target = texture_target;
-
-    QT_RESET_GLERROR(); // reset error state
-    GLuint fbo = 0;
-
-    funcs.glGenFramebuffers(1, &fbo);
-    funcs.glBindFramebuffer(GL_FRAMEBUFFER, fbo);
-
-    QOpenGLContextPrivate::get(ctx)->qgl_current_fbo_invalid = true;
-
-    QT_CHECK_GLERROR();
-
-    format.setTextureTarget(target);
-    format.setInternalTextureFormat(internal_format);
-    format.setMipmap(mipmap);
-
-    if (samples == 0)
-        initTexture(0);
-    else
-        initColorBuffer(0, &samples);
-
-    format.setSamples(int(samples));
-
-    initDepthStencilAttachments(ctx, attachment);
-
-    if (valid)
-        fbo_guard = new QOpenGLSharedResourceGuard(ctx, fbo, freeFramebufferFunc);
-    else
-        funcs.glDeleteFramebuffers(1, &fbo);
-
-    QT_CHECK_GLERROR();
-}
-
-void QOpenGLFramebufferObjectPrivate::initTexture(int idx)
-{
-    QOpenGLContext *ctx = QOpenGLContext::currentContext();
-    GLuint texture = 0;
-
-    funcs.glGenTextures(1, &texture);
-    funcs.glBindTexture(target, texture);
-
-    funcs.glTexParameteri(target, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
-    funcs.glTexParameteri(target, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
-    funcs.glTexParameteri(target, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-    funcs.glTexParameteri(target, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-
-    ColorAttachment &color(colorAttachments[idx]);
-
-    GLuint pixelType = GL_UNSIGNED_BYTE;
-    if (color.internalFormat == GL_RGB10_A2 || color.internalFormat == GL_RGB10)
-        pixelType = GL_UNSIGNED_INT_2_10_10_10_REV;
-    else if (color.internalFormat == GL_RGB16  || color.internalFormat == GL_RGBA16)
-        pixelType = GL_UNSIGNED_SHORT;
-
-    funcs.glTexImage2D(target, 0, color.internalFormat, color.size.width(), color.size.height(), 0,
-                       GL_RGBA, pixelType, nullptr);
-    if (format.mipmap()) {
-        int width = color.size.width();
-        int height = color.size.height();
-        int level = 0;
-        while (width > 1 || height > 1) {
-            width = qMax(1, width >> 1);
-            height = qMax(1, height >> 1);
-            ++level;
-            funcs.glTexImage2D(target, level, color.internalFormat, width, height, 0,
-                               GL_RGBA, pixelType, nullptr);
-        }
-    }
-    funcs.glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0 + idx,
-                                 target, texture, 0);
-
-    QT_CHECK_GLERROR();
-    funcs.glBindTexture(target, 0);
-    valid = checkFramebufferStatus(ctx);
-    if (valid) {
-        color.guard = new QOpenGLSharedResourceGuard(ctx, texture, freeTextureFunc);
-    } else {
-        funcs.glDeleteTextures(1, &texture);
-    }
-}
-
-void QOpenGLFramebufferObjectPrivate::initColorBuffer(int idx, GLint *samples)
-{
-    QOpenGLContext *ctx = QOpenGLContext::currentContext();
-    GLuint color_buffer = 0;
-
-    ColorAttachment &color(colorAttachments[idx]);
-
-    GLenum storageFormat = color.internalFormat;
-    // ES requires a sized format. The older desktop extension does not. Correct the format on ES.
-    if (ctx->isOpenGLES()) {
-        if (color.internalFormat == GL_RGBA) {
-            if (funcs.hasOpenGLExtension(QOpenGLExtensions::Sized8Formats))
-                storageFormat = GL_RGBA8;
-            else
-                storageFormat = GL_RGBA4;
-        } else if (color.internalFormat == GL_RGB10) {
-            // GL_RGB10 is not allowed in ES for glRenderbufferStorage.
-            storageFormat = GL_RGB10_A2;
-        }
-    }
-
-    funcs.glGenRenderbuffers(1, &color_buffer);
-    funcs.glBindRenderbuffer(GL_RENDERBUFFER, color_buffer);
-    funcs.glRenderbufferStorageMultisample(GL_RENDERBUFFER, *samples, storageFormat, color.size.width(), color.size.height());
-    funcs.glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0 + idx,
-                                    GL_RENDERBUFFER, color_buffer);
-
-    QT_CHECK_GLERROR();
-    valid = checkFramebufferStatus(ctx);
-    if (valid) {
-        // Query the actual number of samples. This can be greater than the requested
-        // value since the typically supported values are 0, 4, 8, ..., and the
-        // requests are mapped to the next supported value.
-        funcs.glGetRenderbufferParameteriv(GL_RENDERBUFFER, GL_RENDERBUFFER_SAMPLES, samples);
-        color.guard = new QOpenGLSharedResourceGuard(ctx, color_buffer, freeRenderbufferFunc);
-    } else {
-        funcs.glDeleteRenderbuffers(1, &color_buffer);
-    }
-}
-
-void QOpenGLFramebufferObjectPrivate::initDepthStencilAttachments(QOpenGLContext *ctx,
-                                                                  QOpenGLFramebufferObject::Attachment attachment)
-{
-    // Use the same sample count for all attachments. format.samples() already contains
-    // the actual number of samples for the color attachment and is not suitable. Use
-    // requestedSamples instead.
-    const int samples = requestedSamples;
-
-    // free existing attachments
-    if (depth_buffer_guard) {
-#ifdef Q_OS_WASM
-        funcs.glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_STENCIL_ATTACHMENT, GL_RENDERBUFFER, 0);
-#else
-        funcs.glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_RENDERBUFFER, 0);
-#endif
-        depth_buffer_guard->free();
-    }
-    if (stencil_buffer_guard) {
-        funcs.glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_STENCIL_ATTACHMENT, GL_RENDERBUFFER, 0);
-        if (stencil_buffer_guard != depth_buffer_guard)
-            stencil_buffer_guard->free();
-    }
-
-    depth_buffer_guard = nullptr;
-    stencil_buffer_guard = nullptr;
-
-    GLuint depth_buffer = 0;
-    GLuint stencil_buffer = 0;
-
-    // In practice, a combined depth-stencil buffer is supported by all desktop platforms, while a
-    // separate stencil buffer is not. On embedded devices however, a combined depth-stencil buffer
-    // might not be supported while separate buffers are, according to QTBUG-12861.
-#ifdef Q_OS_WASM
-    // WebGL doesn't allow separately attach buffers to
-    // STENCIL_ATTACHMENT and DEPTH_ATTACHMENT
-    // QTBUG-69913
-    if (attachment == QOpenGLFramebufferObject::CombinedDepthStencil) {
-        funcs.glGenRenderbuffers(1, &depth_buffer);
-        funcs.glBindRenderbuffer(GL_RENDERBUFFER, depth_buffer);
-        Q_ASSERT(funcs.glIsRenderbuffer(depth_buffer));
-
-        if (samples != 0 ) {
-            funcs.glRenderbufferStorageMultisample(GL_RENDERBUFFER, samples,
-                                                   GL_DEPTH24_STENCIL8, dsSize.width(), dsSize.height());
-        } else {
-            funcs.glRenderbufferStorage(GL_RENDERBUFFER, GL_DEPTH_STENCIL,
-                                        dsSize.width(), dsSize.height());
-        }
-
-        funcs.glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_STENCIL_ATTACHMENT,
-                                        GL_RENDERBUFFER, depth_buffer);
-
-        valid = checkFramebufferStatus(ctx);
-        if (!valid) {
-            funcs.glDeleteRenderbuffers(1, &depth_buffer);
-            depth_buffer = 0;
-        }
-    }
-#else
-    if (attachment == QOpenGLFramebufferObject::CombinedDepthStencil
-        && funcs.hasOpenGLExtension(QOpenGLExtensions::PackedDepthStencil))
-    {
-        // depth and stencil buffer needs another extension
-        funcs.glGenRenderbuffers(1, &depth_buffer);
-        funcs.glBindRenderbuffer(GL_RENDERBUFFER, depth_buffer);
-        Q_ASSERT(funcs.glIsRenderbuffer(depth_buffer));
-        if (samples != 0 && funcs.hasOpenGLExtension(QOpenGLExtensions::FramebufferMultisample))
-            funcs.glRenderbufferStorageMultisample(GL_RENDERBUFFER, samples,
-                GL_DEPTH24_STENCIL8, dsSize.width(), dsSize.height());
-        else
-            funcs.glRenderbufferStorage(GL_RENDERBUFFER,
-                GL_DEPTH24_STENCIL8, dsSize.width(), dsSize.height());
-
-        stencil_buffer = depth_buffer;
-        funcs.glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT,
-                                     GL_RENDERBUFFER, depth_buffer);
-        funcs.glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_STENCIL_ATTACHMENT,
-                                     GL_RENDERBUFFER, stencil_buffer);
-
-        valid = checkFramebufferStatus(ctx);
-        if (!valid) {
-            funcs.glDeleteRenderbuffers(1, &depth_buffer);
-            stencil_buffer = depth_buffer = 0;
-        }
-    }
-
-    if (depth_buffer == 0 && (attachment == QOpenGLFramebufferObject::CombinedDepthStencil
-        || (attachment == QOpenGLFramebufferObject::Depth)))
-    {
-        funcs.glGenRenderbuffers(1, &depth_buffer);
-        funcs.glBindRenderbuffer(GL_RENDERBUFFER, depth_buffer);
-        Q_ASSERT(funcs.glIsRenderbuffer(depth_buffer));
-        if (samples != 0 && funcs.hasOpenGLExtension(QOpenGLExtensions::FramebufferMultisample)) {
-            if (ctx->isOpenGLES()) {
-                if (funcs.hasOpenGLExtension(QOpenGLExtensions::Depth24))
-                    funcs.glRenderbufferStorageMultisample(GL_RENDERBUFFER, samples,
-                                                           GL_DEPTH_COMPONENT24, dsSize.width(), dsSize.height());
-                else
-                    funcs.glRenderbufferStorageMultisample(GL_RENDERBUFFER, samples,
-                                                           GL_DEPTH_COMPONENT16, dsSize.width(), dsSize.height());
-            } else {
-                funcs.glRenderbufferStorageMultisample(GL_RENDERBUFFER, samples,
-                                                       GL_DEPTH_COMPONENT, dsSize.width(), dsSize.height());
-            }
-        } else {
-            if (ctx->isOpenGLES()) {
-                if (funcs.hasOpenGLExtension(QOpenGLExtensions::Depth24)) {
-                    funcs.glRenderbufferStorage(GL_RENDERBUFFER, GL_DEPTH_COMPONENT24,
-                                                dsSize.width(), dsSize.height());
-                } else {
-                    funcs.glRenderbufferStorage(GL_RENDERBUFFER, GL_DEPTH_COMPONENT16,
-                                                dsSize.width(), dsSize.height());
-                }
-            } else {
-                funcs.glRenderbufferStorage(GL_RENDERBUFFER, GL_DEPTH_COMPONENT, dsSize.width(), dsSize.height());
-            }
-        }
-        funcs.glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT,
-                                     GL_RENDERBUFFER, depth_buffer);
-        valid = checkFramebufferStatus(ctx);
-        if (!valid) {
-            funcs.glDeleteRenderbuffers(1, &depth_buffer);
-            depth_buffer = 0;
-        }
-    }
-
-    if (stencil_buffer == 0 && (attachment == QOpenGLFramebufferObject::CombinedDepthStencil)) {
-        funcs.glGenRenderbuffers(1, &stencil_buffer);
-        funcs.glBindRenderbuffer(GL_RENDERBUFFER, stencil_buffer);
-        Q_ASSERT(funcs.glIsRenderbuffer(stencil_buffer));
-
-#ifdef QT_OPENGL_ES
-        GLenum storage = GL_STENCIL_INDEX8;
-#else
-        GLenum storage = ctx->isOpenGLES() ? GL_STENCIL_INDEX8 : GL_STENCIL_INDEX;
-#endif
-
-        if (samples != 0 && funcs.hasOpenGLExtension(QOpenGLExtensions::FramebufferMultisample))
-            funcs.glRenderbufferStorageMultisample(GL_RENDERBUFFER, samples, storage, dsSize.width(), dsSize.height());
-        else
-            funcs.glRenderbufferStorage(GL_RENDERBUFFER, storage, dsSize.width(), dsSize.height());
-
-        funcs.glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_STENCIL_ATTACHMENT,
-                                  GL_RENDERBUFFER, stencil_buffer);
-        valid = checkFramebufferStatus(ctx);
-        if (!valid) {
-            funcs.glDeleteRenderbuffers(1, &stencil_buffer);
-            stencil_buffer = 0;
-        }
-    }
-#endif //Q_OS_WASM
-
-    // The FBO might have become valid after removing the depth or stencil buffer.
-    valid = checkFramebufferStatus(ctx);
-
-#ifdef Q_OS_WASM
-    if (depth_buffer) {
-#else
-    if (depth_buffer && stencil_buffer) {
-#endif
-        fbo_attachment = QOpenGLFramebufferObject::CombinedDepthStencil;
-    } else if (depth_buffer) {
-        fbo_attachment = QOpenGLFramebufferObject::Depth;
-    } else {
-        fbo_attachment = QOpenGLFramebufferObject::NoAttachment;
-    }
-
-    if (valid) {
-        if (depth_buffer)
-            depth_buffer_guard = new QOpenGLSharedResourceGuard(ctx, depth_buffer, freeRenderbufferFunc);
-        if (stencil_buffer) {
-            if (stencil_buffer == depth_buffer)
-                stencil_buffer_guard = depth_buffer_guard;
-            else
-                stencil_buffer_guard = new QOpenGLSharedResourceGuard(ctx, stencil_buffer, freeRenderbufferFunc);
-        }
-    } else {
-        if (depth_buffer)
-            funcs.glDeleteRenderbuffers(1, &depth_buffer);
-        if (stencil_buffer && depth_buffer != stencil_buffer)
-            funcs.glDeleteRenderbuffers(1, &stencil_buffer);
-    }
-    QT_CHECK_GLERROR();
-
-    format.setAttachment(fbo_attachment);
-}
-
-/*!
-    \class QOpenGLFramebufferObject
-    \brief The QOpenGLFramebufferObject class encapsulates an OpenGL framebuffer object.
-    \since 5.0
-    \inmodule QtGui
-
-    \ingroup painting-3D
-
-    The QOpenGLFramebufferObject class encapsulates an OpenGL framebuffer
-    object, defined by the \c{GL_EXT_framebuffer_object} extension. It provides
-    a rendering surface that can be painted on with a QPainter with the help of
-    QOpenGLPaintDevice, or rendered to using native OpenGL calls. This surface
-    can be bound and used as a regular texture in your own OpenGL drawing code.
-    By default, the QOpenGLFramebufferObject class generates a 2D OpenGL
-    texture (using the \c{GL_TEXTURE_2D} target), which is used as the internal
-    rendering target.
-
-    \b{It is important to have a current OpenGL context when creating a
-    QOpenGLFramebufferObject, otherwise initialization will fail.}
-
-    Create the QOpenGLFrameBufferObject instance with the CombinedDepthStencil
-    attachment if you want QPainter to render correctly. Note that you need to
-    create a QOpenGLFramebufferObject with more than one sample per pixel for
-    primitives to be antialiased when drawing using a QPainter. To create a
-    multisample framebuffer object you should use one of the constructors that
-    take a QOpenGLFramebufferObjectFormat parameter, and set the
-    QOpenGLFramebufferObjectFormat::samples() property to a non-zero value.
-
-    For multisample framebuffer objects a color render buffer is created,
-    otherwise a texture with the specified texture target is created.
-    The color render buffer or texture will have the specified internal
-    format, and will be bound to the \c GL_COLOR_ATTACHMENT0
-    attachment in the framebuffer object.
-
-    Multiple render targets are also supported, in case the OpenGL
-    implementation supports this. Here there will be multiple textures (or, in
-    case of multisampling, renderbuffers) present and each of them will get
-    attached to \c GL_COLOR_ATTACHMENT0, \c 1, \c 2, ...
-
-    If you want to use a framebuffer object with multisampling enabled
-    as a texture, you first need to copy from it to a regular framebuffer
-    object using QOpenGLContext::blitFramebuffer().
-
-    It is possible to draw into a QOpenGLFramebufferObject using QPainter and
-    QOpenGLPaintDevice in a separate thread.
-*/
-
-
-/*!
-    \enum QOpenGLFramebufferObject::Attachment
-
-    This enum type is used to configure the depth and stencil buffers
-    attached to the framebuffer object when it is created.
-
-    \value NoAttachment         No attachment is added to the framebuffer object. Note that the
-                                OpenGL depth and stencil tests won't work when rendering to a
-                                framebuffer object without any depth or stencil buffers.
-                                This is the default value.
-
-    \value CombinedDepthStencil If the \c GL_EXT_packed_depth_stencil extension is present,
-                                a combined depth and stencil buffer is attached.
-                                If the extension is not present, only a depth buffer is attached.
-
-    \value Depth                A depth buffer is attached to the framebuffer object.
-
-    \sa attachment()
-*/
-
-static inline GLenum effectiveInternalFormat(GLenum internalFormat)
-{
-    if (!internalFormat)
-#ifdef QT_OPENGL_ES_2
-        internalFormat = GL_RGBA;
-#else
-        internalFormat = QOpenGLContext::currentContext()->isOpenGLES() ? GL_RGBA : GL_RGBA8;
-#endif
-    return internalFormat;
-}
-
-/*!
-
-    Constructs an OpenGL framebuffer object and binds a 2D OpenGL texture
-    to the buffer of the size \a size. The texture is bound to the
-    \c GL_COLOR_ATTACHMENT0 target in the framebuffer object.
-
-    The \a target parameter is used to specify the OpenGL texture
-    target. The default target is \c GL_TEXTURE_2D. Keep in mind that
-    \c GL_TEXTURE_2D textures must have a power of 2 width and height
-    (e.g. 256x512), unless you are using OpenGL 2.0 or higher.
-
-    By default, no depth and stencil buffers are attached. This behavior
-    can be toggled using one of the overloaded constructors.
-
-    The default internal texture format is \c GL_RGBA8 for desktop
-    OpenGL, and \c GL_RGBA for OpenGL/ES.
-
-    It is important that you have a current OpenGL context set when
-    creating the QOpenGLFramebufferObject, otherwise the initialization
-    will fail.
-
-    \sa size(), texture(), attachment()
-*/
-
-QOpenGLFramebufferObject::QOpenGLFramebufferObject(const QSize &size, GLenum target)
-    : d_ptr(new QOpenGLFramebufferObjectPrivate)
-{
-    Q_D(QOpenGLFramebufferObject);
-    d->init(this, size, NoAttachment, target, effectiveInternalFormat(0));
-}
-
-/*!
-
-    Constructs an OpenGL framebuffer object and binds a 2D OpenGL texture
-    to the buffer of the given \a width and \a height.
-
-    \sa size(), texture()
-*/
-QOpenGLFramebufferObject::QOpenGLFramebufferObject(int width, int height, GLenum target)
-    : QOpenGLFramebufferObject(QSize(width, height), target)
-{
-}
-
-/*!
-
-    Constructs an OpenGL framebuffer object of the given \a size based on the
-    supplied \a format.
-*/
-
-QOpenGLFramebufferObject::QOpenGLFramebufferObject(const QSize &size, const QOpenGLFramebufferObjectFormat &format)
-    : d_ptr(new QOpenGLFramebufferObjectPrivate)
-{
-    Q_D(QOpenGLFramebufferObject);
-    d->init(this, size, format.attachment(), format.textureTarget(), format.internalTextureFormat(),
-            format.samples(), format.mipmap());
-}
-
-/*!
-
-    Constructs an OpenGL framebuffer object of the given \a width and \a height
-    based on the supplied \a format.
-*/
-
-QOpenGLFramebufferObject::QOpenGLFramebufferObject(int width, int height, const QOpenGLFramebufferObjectFormat &format)
-    : QOpenGLFramebufferObject(QSize(width, height), format)
-{
-}
-
-/*!
-
-    Constructs an OpenGL framebuffer object and binds a texture to the
-    buffer of the given \a width and \a height.
-
-    The \a attachment parameter describes the depth/stencil buffer
-    configuration, \a target the texture target and \a internalFormat
-    the internal texture format. The default texture target is \c
-    GL_TEXTURE_2D, while the default internal format is \c GL_RGBA8
-    for desktop OpenGL and \c GL_RGBA for OpenGL/ES.
-
-    \sa size(), texture(), attachment()
-*/
-QOpenGLFramebufferObject::QOpenGLFramebufferObject(int width, int height, Attachment attachment,
-                                           GLenum target, GLenum internalFormat)
-    : d_ptr(new QOpenGLFramebufferObjectPrivate)
-{
-    Q_D(QOpenGLFramebufferObject);
-    d->init(this, QSize(width, height), attachment, target, effectiveInternalFormat(internalFormat));
-}
-
-/*!
-
-    Constructs an OpenGL framebuffer object and binds a texture to the
-    buffer of the given \a size.
-
-    The \a attachment parameter describes the depth/stencil buffer
-    configuration, \a target the texture target and \a internalFormat
-    the internal texture format. The default texture target is \c
-    GL_TEXTURE_2D, while the default internal format is \c GL_RGBA8
-    for desktop OpenGL and \c GL_RGBA for OpenGL/ES.
-
-    \sa size(), texture(), attachment()
-*/
-QOpenGLFramebufferObject::QOpenGLFramebufferObject(const QSize &size, Attachment attachment,
-                                           GLenum target, GLenum internalFormat)
-    : d_ptr(new QOpenGLFramebufferObjectPrivate)
-{
-    Q_D(QOpenGLFramebufferObject);
-    d->init(this, size, attachment, target, effectiveInternalFormat(internalFormat));
-}
-
-/*!
-
-    Destroys the framebuffer object and frees any allocated resources.
-*/
-QOpenGLFramebufferObject::~QOpenGLFramebufferObject()
-{
-    Q_D(QOpenGLFramebufferObject);
-    if (isBound())
-        release();
-
-    for (const auto &color : qAsConst(d->colorAttachments)) {
-        if (color.guard)
-            color.guard->free();
-    }
-    d->colorAttachments.clear();
-
-    if (d->depth_buffer_guard)
-        d->depth_buffer_guard->free();
-    if (d->stencil_buffer_guard && d->stencil_buffer_guard != d->depth_buffer_guard)
-        d->stencil_buffer_guard->free();
-    if (d->fbo_guard)
-        d->fbo_guard->free();
-
-    QOpenGLContextPrivate *contextPrv = QOpenGLContextPrivate::get(QOpenGLContext::currentContext());
-    if (contextPrv && contextPrv->qgl_current_fbo == this) {
-        contextPrv->qgl_current_fbo_invalid = true;
-        contextPrv->qgl_current_fbo = nullptr;
-    }
-}
-
-/*!
-    Creates and attaches an additional texture or renderbuffer of \a size width
-    and height.
-
-    There is always an attachment at GL_COLOR_ATTACHMENT0. Call this function
-    to set up additional attachments at GL_COLOR_ATTACHMENT1,
-    GL_COLOR_ATTACHMENT2, ...
-
-    When \a internalFormat is not \c 0, it specifies the internal format of the
-    texture or renderbuffer. Otherwise a default of GL_RGBA or GL_RGBA8 is
-    used.
-
-    \note This is only functional when multiple render targets are supported by
-    the OpenGL implementation. When that is not the case, the function will not
-    add any additional color attachments. Call
-    QOpenGLFunctions::hasOpenGLFeature() with
-    QOpenGLFunctions::MultipleRenderTargets at runtime to check if MRT is
-    supported.
-
-    \note The internal format of the color attachments may differ but there may
-    be limitations on the supported combinations, depending on the drivers.
-
-    \note The size of the color attachments may differ but rendering is limited
-    to the area that fits all the attachments, according to the OpenGL
-    specification. Some drivers may not be fully conformant in this respect,
-    however.
-
-    \since 5.6
- */
-void QOpenGLFramebufferObject::addColorAttachment(const QSize &size, GLenum internalFormat)
-{
-    Q_D(QOpenGLFramebufferObject);
-
-    if (!QOpenGLContext::currentContext()->functions()->hasOpenGLFeature(QOpenGLFunctions::MultipleRenderTargets)) {
-        qWarning("Multiple render targets not supported, ignoring extra color attachment request");
-        return;
-    }
-
-    QOpenGLFramebufferObjectPrivate::ColorAttachment color(size, effectiveInternalFormat(internalFormat));
-    d->colorAttachments.append(color);
-    const int idx = d->colorAttachments.count() - 1;
-
-    if (d->requestedSamples == 0) {
-        d->initTexture(idx);
-    } else {
-        GLint samples = d->requestedSamples;
-        d->initColorBuffer(idx, &samples);
-    }
-}
-
-/*! \overload
-
-    Creates and attaches an additional texture or renderbuffer of size \a width and \a height.
-
-    When \a internalFormat is not \c 0, it specifies the internal format of the texture or
-    renderbuffer. Otherwise a default of GL_RGBA or GL_RGBA8 is used.
-
-    \since 5.6
- */
-void QOpenGLFramebufferObject::addColorAttachment(int width, int height, GLenum internalFormat)
-{
-    addColorAttachment(QSize(width, height), internalFormat);
-}
-
-/*!
-    \fn bool QOpenGLFramebufferObject::isValid() const
-
-    Returns \c true if the framebuffer object is valid.
-
-    The framebuffer can become invalid if the initialization process
-    fails, the user attaches an invalid buffer to the framebuffer
-    object, or a non-power of two width/height is specified as the
-    texture size if the texture target is \c{GL_TEXTURE_2D}.
-    The non-power of two limitation does not apply if the OpenGL version
-    is 2.0 or higher, or if the GL_ARB_texture_non_power_of_two extension
-    is present.
-
-    The framebuffer can also become invalid if the QOpenGLContext that
-    the framebuffer was created within is destroyed and there are
-    no other shared contexts that can take over ownership of the
-    framebuffer.
-*/
-bool QOpenGLFramebufferObject::isValid() const
-{
-    Q_D(const QOpenGLFramebufferObject);
-    return d->valid && d->fbo_guard && d->fbo_guard->id();
-}
-
-/*!
-    \fn bool QOpenGLFramebufferObject::bind()
-
-    Switches rendering from the default, windowing system provided
-    framebuffer to this framebuffer object.
-    Returns \c true upon success, false otherwise.
-
-    \note If takeTexture() was called, a new texture is created and associated
-    with the framebuffer object. This is potentially expensive and changes the
-    context state (the currently bound texture).
-
-    \sa release()
-*/
-bool QOpenGLFramebufferObject::bind()
-{
-    if (!isValid())
-        return false;
-    Q_D(QOpenGLFramebufferObject);
-    QOpenGLContext *current = QOpenGLContext::currentContext();
-    if (!current)
-        return false;
-#ifdef QT_DEBUG
-    if (current->shareGroup() != d->fbo_guard->group())
-        qWarning("QOpenGLFramebufferObject::bind() called from incompatible context");
-#endif
-
-    d->funcs.glBindFramebuffer(GL_FRAMEBUFFER, d->fbo());
-
-    QOpenGLContextPrivate::get(current)->qgl_current_fbo_invalid = true;
-    QOpenGLContextPrivate::get(current)->qgl_current_fbo = this;
-
-    if (d->format.samples() == 0) {
-        // Create new textures to replace the ones stolen via takeTexture().
-        for (int i = 0; i < d->colorAttachments.count(); ++i) {
-            if (!d->colorAttachments.at(i).guard)
-                d->initTexture(i);
-        }
-    }
-
-    return d->valid;
-}
-
-/*!
-    \fn bool QOpenGLFramebufferObject::release()
-
-    Switches rendering back to the default, windowing system provided
-    framebuffer.
-    Returns \c true upon success, false otherwise.
-
-    \sa bind()
-*/
-bool QOpenGLFramebufferObject::release()
-{
-    if (!isValid())
-        return false;
-
-    QOpenGLContext *current = QOpenGLContext::currentContext();
-    if (!current)
-        return false;
-
-    Q_D(QOpenGLFramebufferObject);
-#ifdef QT_DEBUG
-    if (current->shareGroup() != d->fbo_guard->group())
-        qWarning("QOpenGLFramebufferObject::release() called from incompatible context");
-#endif
-
-    if (current) {
-        d->funcs.glBindFramebuffer(GL_FRAMEBUFFER, current->defaultFramebufferObject());
-
-        QOpenGLContextPrivate *contextPrv = QOpenGLContextPrivate::get(current);
-        contextPrv->qgl_current_fbo_invalid = true;
-        contextPrv->qgl_current_fbo = nullptr;
-    }
-
-    return true;
-}
-
-/*!
-    \fn GLuint QOpenGLFramebufferObject::texture() const
-
-    Returns the texture id for the texture attached as the default
-    rendering target in this framebuffer object. This texture id can
-    be bound as a normal texture in your own OpenGL code.
-
-    If a multisample framebuffer object is used then the value returned
-    from this function will be invalid.
-
-    When multiple textures are attached, the return value is the ID of
-    the first one.
-
-    \sa takeTexture(), textures()
-*/
-GLuint QOpenGLFramebufferObject::texture() const
-{
-    Q_D(const QOpenGLFramebufferObject);
-    return d->colorAttachments[0].guard ? d->colorAttachments[0].guard->id() : 0;
-}
-
-/*!
-    Returns the texture id for all attached textures.
-
-    If a multisample framebuffer object is used, then an empty vector is returned.
-
-    \since 5.6
-
-    \sa takeTexture(), texture()
-*/
-QVector<GLuint> QOpenGLFramebufferObject::textures() const
-{
-    Q_D(const QOpenGLFramebufferObject);
-    QVector<GLuint> ids;
-    if (d->format.samples() != 0)
-        return ids;
-    ids.reserve(d->colorAttachments.count());
-    for (const auto &color : d->colorAttachments)
-        ids.append(color.guard ? color.guard->id() : 0);
-    return ids;
-}
-
-/*!
-   \fn GLuint QOpenGLFramebufferObject::takeTexture()
-
-   Returns the texture id for the texture attached to this framebuffer
-   object. The ownership of the texture is transferred to the caller.
-
-   If the framebuffer object is currently bound, an implicit release()
-   will be done. During the next call to bind() a new texture will be
-   created.
-
-   If a multisample framebuffer object is used, then there is no
-   texture and the return value from this function will be invalid.
-   Similarly, incomplete framebuffer objects will also return 0.
-
-   \since 5.3
-
-   \sa texture(), bind(), release()
- */
-GLuint QOpenGLFramebufferObject::takeTexture()
-{
-    return takeTexture(0);
-}
-
-/*! \overload
-
-   Returns the texture id for the texture attached to the color attachment of
-   index \a colorAttachmentIndex of this framebuffer object. The ownership of
-   the texture is transferred to the caller.
-
-   When \a colorAttachmentIndex is \c 0, the behavior is identical to the
-   parameter-less variant of this function.
-
-   If the framebuffer object is currently bound, an implicit release()
-   will be done. During the next call to bind() a new texture will be
-   created.
-
-   If a multisample framebuffer object is used, then there is no
-   texture and the return value from this function will be invalid.
-   Similarly, incomplete framebuffer objects will also return 0.
-
-   \since 5.6
- */
-GLuint QOpenGLFramebufferObject::takeTexture(int colorAttachmentIndex)
-{
-    Q_D(QOpenGLFramebufferObject);
-    GLuint id = 0;
-    if (isValid() && d->format.samples() == 0 && d->colorAttachments.count() > colorAttachmentIndex) {
-        QOpenGLContext *current = QOpenGLContext::currentContext();
-        if (current && current->shareGroup() == d->fbo_guard->group() && isBound())
-            release();
-        auto &guard = d->colorAttachments[colorAttachmentIndex].guard;
-        id = guard ? guard->id() : 0;
-        // Do not call free() on texture_guard, just null it out.
-        // This way the texture will not be deleted when the guard is destroyed.
-        guard = nullptr;
-    }
-    return id;
-}
-
-/*!
-    \return the size of the color and depth/stencil attachments attached to
-    this framebuffer object.
-*/
-QSize QOpenGLFramebufferObject::size() const
-{
-    Q_D(const QOpenGLFramebufferObject);
-    return d->dsSize;
-}
-
-/*!
-    \return the sizes of all color attachments attached to this framebuffer
-    object.
-
-    \since 5.6
-*/
-QVector<QSize> QOpenGLFramebufferObject::sizes() const
-{
-    Q_D(const QOpenGLFramebufferObject);
-    QVector<QSize> sz;
-    sz.reserve(d->colorAttachments.size());
-    for (const auto &color : d->colorAttachments)
-        sz.append(color.size);
-    return sz;
-}
-
-/*!
-    \fn int QOpenGLFramebufferObject::width() const
-
-    Returns the width of the framebuffer object attachments.
-*/
-
-/*!
-    \fn int QOpenGLFramebufferObject::height() const
-
-    Returns the height of the framebuffer object attachments.
-*/
-
-/*!
-    Returns the format of this framebuffer object.
-*/
-QOpenGLFramebufferObjectFormat QOpenGLFramebufferObject::format() const
-{
-    Q_D(const QOpenGLFramebufferObject);
-    return d->format;
-}
-
-static inline QImage qt_gl_read_framebuffer_rgba8(const QSize &size, bool include_alpha, QOpenGLContext *context)
-{
-    QOpenGLFunctions *funcs = context->functions();
-    const int w = size.width();
-    const int h = size.height();
-    bool isOpenGL12orBetter = !context->isOpenGLES() && (context->format().majorVersion() >= 2 || context->format().minorVersion() >= 2);
-    if (isOpenGL12orBetter) {
-        QImage img(size, include_alpha ? QImage::Format_ARGB32_Premultiplied : QImage::Format_RGB32);
-        funcs->glReadPixels(0, 0, w, h, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, img.bits());
-        return img;
-    }
-
-    // For OpenGL ES stick with the byte ordered format / RGBA readback format
-    // since that is the only spec mandated way. (also, skip the
-    // GL_IMPLEMENTATION_COLOR_READ_FORMAT mess since there is nothing saying a
-    // BGRA capable impl would return BGRA from there)
-
-    QImage rgbaImage(size, include_alpha ? QImage::Format_RGBA8888_Premultiplied : QImage::Format_RGBX8888);
-    funcs->glReadPixels(0, 0, w, h, GL_RGBA, GL_UNSIGNED_BYTE, rgbaImage.bits());
-    return rgbaImage;
-}
-
-static inline QImage qt_gl_read_framebuffer_rgb10a2(const QSize &size, bool include_alpha, QOpenGLContext *context)
-{
-    // We assume OpenGL 1.2+ or ES 3.0+ here.
-    QImage img(size, include_alpha ? QImage::Format_A2BGR30_Premultiplied : QImage::Format_BGR30);
-    context->functions()->glReadPixels(0, 0, size.width(), size.height(), GL_RGBA, GL_UNSIGNED_INT_2_10_10_10_REV, img.bits());
-    return img;
-}
-
-static inline QImage qt_gl_read_framebuffer_rgba16(const QSize &size, bool include_alpha, QOpenGLContext *context)
-{
-    // We assume OpenGL 1.2+ or ES 3.0+ here.
-    QImage img(size, include_alpha ? QImage::Format_RGBA64_Premultiplied : QImage::Format_RGBX64);
-    context->functions()->glReadPixels(0, 0, size.width(), size.height(), GL_RGBA, GL_UNSIGNED_SHORT, img.bits());
-    return img;
-}
-
-static QImage qt_gl_read_framebuffer(const QSize &size, GLenum internal_format, bool include_alpha, bool flip)
-{
-    QOpenGLContext *ctx = QOpenGLContext::currentContext();
-    QOpenGLFunctions *funcs = ctx->functions();
-    while (true) {
-        GLenum error = funcs->glGetError();
-        if (error == GL_NO_ERROR || error == GL_CONTEXT_LOST)
-            break;
-    }
-    switch (internal_format) {
-    case GL_RGB:
-    case GL_RGB8:
-        return qt_gl_read_framebuffer_rgba8(size, false, ctx).mirrored(false, flip);
-    case GL_RGB10:
-        return qt_gl_read_framebuffer_rgb10a2(size, false, ctx).mirrored(false, flip);
-    case GL_RGB10_A2:
-        return qt_gl_read_framebuffer_rgb10a2(size, include_alpha, ctx).mirrored(false, flip);
-    case GL_RGB16:
-        return qt_gl_read_framebuffer_rgba16(size, false, ctx).mirrored(false, flip);
-    case GL_RGBA16:
-        return qt_gl_read_framebuffer_rgba16(size, include_alpha, ctx).mirrored(false, flip);
-    case GL_RGBA:
-    case GL_RGBA8:
-    default:
-        return qt_gl_read_framebuffer_rgba8(size, include_alpha, ctx).mirrored(false, flip);
-    }
-
-    Q_UNREACHABLE();
-    return QImage();
-}
-
-Q_GUI_EXPORT QImage qt_gl_read_framebuffer(const QSize &size, bool alpha_format, bool include_alpha)
-{
-    return qt_gl_read_framebuffer(size, alpha_format ? GL_RGBA : GL_RGB, include_alpha, true);
-}
-
-/*!
-    \fn QImage QOpenGLFramebufferObject::toImage(bool flipped) const
-
-    Returns the contents of this framebuffer object as a QImage.
-
-    If \a flipped is true the image is flipped from OpenGL coordinates to raster coordinates.
-    If used together with QOpenGLPaintDevice, \a flipped should be the opposite of the value
-    of QOpenGLPaintDevice::paintFlipped().
-
-    The returned image has a format of premultiplied ARGB32 or RGB32. The latter
-    is used only when internalTextureFormat() is set to \c GL_RGB. Since Qt 5.2
-    the function will fall back to premultiplied RGBA8888 or RGBx8888 when
-    reading to (A)RGB32 is not supported, and this includes OpenGL ES. Since Qt
-    5.4 an A2BGR30 image is returned if the internal format is RGB10_A2, and since
-    Qt 5.12 a RGBA64 image is return if the internal format is RGBA16.
-
-    If the rendering in the framebuffer was not done with premultiplied alpha in mind,
-    create a wrapper QImage with a non-premultiplied format. This is necessary before
-    performing operations like QImage::save() because otherwise the image data would get
-    unpremultiplied, even though it was not premultiplied in the first place. To create
-    such a wrapper without performing a copy of the pixel data, do the following:
-
-    \code
-    QImage fboImage(fbo.toImage());
-    QImage image(fboImage.constBits(), fboImage.width(), fboImage.height(), QImage::Format_ARGB32);
-    \endcode
-
-    For multisampled framebuffer objects the samples are resolved using the
-    \c{GL_EXT_framebuffer_blit} extension. If the extension is not available, the contents
-    of the returned image is undefined.
-
-    For singlesampled framebuffers the contents is retrieved via \c glReadPixels. This is
-    a potentially expensive and inefficient operation. Therefore it is recommended that
-    this function is used as seldom as possible.
-
-    \sa QOpenGLPaintDevice::paintFlipped()
-*/
-
-QImage QOpenGLFramebufferObject::toImage(bool flipped) const
-{
-    return toImage(flipped, 0);
-}
-
-/*!
-    \fn QImage QOpenGLFramebufferObject::toImage() const
-    \overload
-
-    Returns the contents of this framebuffer object as a QImage. This method flips
-    the image from OpenGL coordinates to raster coordinates.
-*/
-// ### Qt 6: Remove this method and make it a default argument instead.
-QImage QOpenGLFramebufferObject::toImage() const
-{
-    return toImage(true, 0);
-}
-
-/*! \overload
-
-    Returns the contents of the color attachment of index \a
-    colorAttachmentIndex of this framebuffer object as a QImage. This method
-    flips the image from OpenGL coordinates to raster coordinates when \a
-    flipped is set to \c true.
-
-    \note This overload is only fully functional when multiple render targets are
-    supported by the OpenGL implementation. When that is not the case, only one
-    color attachment will be set up.
-
-    \since 5.6
-*/
-QImage QOpenGLFramebufferObject::toImage(bool flipped, int colorAttachmentIndex) const
-{
-    Q_D(const QOpenGLFramebufferObject);
-    if (!d->valid)
-        return QImage();
-
-    QOpenGLContext *ctx = QOpenGLContext::currentContext();
-    if (!ctx) {
-        qWarning("QOpenGLFramebufferObject::toImage() called without a current context");
-        return QImage();
-    }
-
-    if (d->colorAttachments.count() <= colorAttachmentIndex) {
-        qWarning("QOpenGLFramebufferObject::toImage() called for missing color attachment");
-        return QImage();
-    }
-
-    GLuint prevFbo = 0;
-    ctx->functions()->glGetIntegerv(GL_FRAMEBUFFER_BINDING, (GLint *) &prevFbo);
-
-    if (prevFbo != d->fbo())
-        const_cast<QOpenGLFramebufferObject *>(this)->bind();
-
-    QImage image;
-    QOpenGLExtraFunctions *extraFuncs = ctx->extraFunctions();
-    // qt_gl_read_framebuffer doesn't work on a multisample FBO
-    if (format().samples() != 0) {
-        QRect rect(QPoint(0, 0), size());
-        QOpenGLFramebufferObjectFormat fmt;
-        if (extraFuncs->hasOpenGLFeature(QOpenGLFunctions::MultipleRenderTargets)) {
-            fmt.setInternalTextureFormat(d->colorAttachments[colorAttachmentIndex].internalFormat);
-            QOpenGLFramebufferObject temp(d->colorAttachments[colorAttachmentIndex].size, fmt);
-            blitFramebuffer(&temp, rect, const_cast<QOpenGLFramebufferObject *>(this), rect,
-                            GL_COLOR_BUFFER_BIT, GL_NEAREST,
-                            colorAttachmentIndex, 0);
-            image = temp.toImage(flipped);
-        } else {
-            fmt.setInternalTextureFormat(d->colorAttachments[0].internalFormat);
-            QOpenGLFramebufferObject temp(size(), fmt);
-            blitFramebuffer(&temp, rect, const_cast<QOpenGLFramebufferObject *>(this), rect);
-            image = temp.toImage(flipped);
-        }
-    } else {
-        if (extraFuncs->hasOpenGLFeature(QOpenGLFunctions::MultipleRenderTargets)) {
-            extraFuncs->glReadBuffer(GL_COLOR_ATTACHMENT0 + colorAttachmentIndex);
-            image = qt_gl_read_framebuffer(d->colorAttachments[colorAttachmentIndex].size,
-                                           d->colorAttachments[colorAttachmentIndex].internalFormat,
-                                           true, flipped);
-            extraFuncs->glReadBuffer(GL_COLOR_ATTACHMENT0);
-        } else {
-            image = qt_gl_read_framebuffer(d->colorAttachments[0].size,
-                                           d->colorAttachments[0].internalFormat,
-                                           true, flipped);
-        }
-    }
-
-    if (prevFbo != d->fbo())
-        ctx->functions()->glBindFramebuffer(GL_FRAMEBUFFER, prevFbo);
-
-    return image;
-}
-
-/*!
-    \fn bool QOpenGLFramebufferObject::bindDefault()
-
-    Switches rendering back to the default, windowing system provided
-    framebuffer.
-    Returns \c true upon success, false otherwise.
-
-    \sa bind(), release()
-*/
-bool QOpenGLFramebufferObject::bindDefault()
-{
-    QOpenGLContext *ctx = const_cast<QOpenGLContext *>(QOpenGLContext::currentContext());
-
-    if (ctx) {
-        ctx->functions()->glBindFramebuffer(GL_FRAMEBUFFER, ctx->defaultFramebufferObject());
-        QOpenGLContextPrivate::get(ctx)->qgl_current_fbo_invalid = true;
-        QOpenGLContextPrivate::get(ctx)->qgl_current_fbo = nullptr;
-    }
-#ifdef QT_DEBUG
-    else
-        qWarning("QOpenGLFramebufferObject::bindDefault() called without current context.");
-#endif
-
-    return ctx != nullptr;
-}
-
-/*!
-    \fn bool QOpenGLFramebufferObject::hasOpenGLFramebufferObjects()
-
-    Returns \c true if the OpenGL \c{GL_EXT_framebuffer_object} extension
-    is present on this system; otherwise returns \c false.
-*/
-bool QOpenGLFramebufferObject::hasOpenGLFramebufferObjects()
-{
-    return QOpenGLContext::currentContext()->functions()->hasOpenGLFeature(QOpenGLFunctions::Framebuffers);
-}
-
-/*!
-    \fn GLuint QOpenGLFramebufferObject::handle() const
-
-    Returns the OpenGL framebuffer object handle for this framebuffer
-    object (returned by the \c{glGenFrameBuffersEXT()} function). This
-    handle can be used to attach new images or buffers to the
-    framebuffer. The user is responsible for cleaning up and
-    destroying these objects.
-*/
-GLuint QOpenGLFramebufferObject::handle() const
-{
-    Q_D(const QOpenGLFramebufferObject);
-    return d->fbo();
-}
-
-/*!
-    Returns the status of the depth and stencil buffers attached to
-    this framebuffer object.
-*/
-
-QOpenGLFramebufferObject::Attachment QOpenGLFramebufferObject::attachment() const
-{
-    Q_D(const QOpenGLFramebufferObject);
-    if (d->valid)
-        return d->fbo_attachment;
-    return NoAttachment;
-}
-
-/*!
-    Sets the attachments of the framebuffer object to \a attachment.
-
-    This can be used to free or reattach the depth and stencil buffer
-    attachments as needed.
-
-    \note This function alters the current framebuffer binding.
- */
-void QOpenGLFramebufferObject::setAttachment(QOpenGLFramebufferObject::Attachment attachment)
-{
-    Q_D(QOpenGLFramebufferObject);
-    if (attachment == d->fbo_attachment || !isValid())
-        return;
-    QOpenGLContext *current = QOpenGLContext::currentContext();
-    if (!current)
-        return;
-#ifdef QT_DEBUG
-    if (current->shareGroup() != d->fbo_guard->group())
-        qWarning("QOpenGLFramebufferObject::setAttachment() called from incompatible context");
-#endif
-    d->funcs.glBindFramebuffer(GL_FRAMEBUFFER, d->fbo());
-    QOpenGLContextPrivate::get(current)->qgl_current_fbo_invalid = true;
-    d->initDepthStencilAttachments(current, attachment);
-}
-
-/*!
-    Returns \c true if the framebuffer object is currently bound to the current context,
-    otherwise false is returned.
-*/
-bool QOpenGLFramebufferObject::isBound() const
-{
-    Q_D(const QOpenGLFramebufferObject);
-    QOpenGLContext *ctx = QOpenGLContext::currentContext();
-    if (!ctx)
-        return false;
-    GLint fbo = 0;
-    ctx->functions()->glGetIntegerv(GL_FRAMEBUFFER_BINDING, &fbo);
-    return GLuint(fbo) == d->fbo();
-}
-
-/*!
-    \fn bool QOpenGLFramebufferObject::hasOpenGLFramebufferBlit()
-
-    Returns \c true if the OpenGL \c{GL_EXT_framebuffer_blit} extension
-    is present on this system; otherwise returns \c false.
-
-    \sa blitFramebuffer()
-*/
-bool QOpenGLFramebufferObject::hasOpenGLFramebufferBlit()
-{
-    return QOpenGLExtensions(QOpenGLContext::currentContext()).hasOpenGLExtension(QOpenGLExtensions::FramebufferBlit);
-}
-
-
-/*!
-    \overload
-
-    Convenience overload to blit between two framebuffer objects.
-*/
-void QOpenGLFramebufferObject::blitFramebuffer(QOpenGLFramebufferObject *target,
-                                               QOpenGLFramebufferObject *source,
-                                               GLbitfield buffers, GLenum filter)
-{
-    if (!target && !source)
-        return;
-
-    QSize targetSize;
-    QSize sourceSize;
-
-    if (target)
-        targetSize = target->size();
-    if (source)
-        sourceSize = source->size();
-
-    if (targetSize.isEmpty())
-        targetSize = sourceSize;
-    else if (sourceSize.isEmpty())
-        sourceSize = targetSize;
-
-    blitFramebuffer(target, QRect(QPoint(0, 0), targetSize),
-                    source, QRect(QPoint(0, 0), sourceSize),
-                    buffers, filter);
-}
-
-/*! \overload
- *
-    Convenience overload to blit between two framebuffer objects.
-*/
-void QOpenGLFramebufferObject::blitFramebuffer(QOpenGLFramebufferObject *target, const QRect &targetRect,
-                                               QOpenGLFramebufferObject *source, const QRect &sourceRect,
-                                               GLbitfield buffers,
-                                               GLenum filter)
-{
-    blitFramebuffer(target, targetRect, source, sourceRect, buffers, filter, 0, 0);
-}
-
-/*!
-    \enum QOpenGLFramebufferObject::FramebufferRestorePolicy
-    \since 5.7
-
-    This enum type is used to configure the behavior related to restoring
-    framebuffer bindings when calling blitFramebuffer().
-
-    \value DontRestoreFramebufferBinding        Do not restore the previous framebuffer binding.
-                                                The caller is responsible for tracking and setting
-                                                the framebuffer binding as needed.
-
-    \value RestoreFramebufferBindingToDefault   After the blit operation, bind the default
-                                                framebuffer.
-
-    \value RestoreFrameBufferBinding            Restore the previously bound framebuffer. This is
-                                                potentially expensive because of the need to
-                                                query the currently bound framebuffer.
-
-    \sa blitFramebuffer()
-*/
-
-/*!
-    \since 5.7
-
-    Blits from the \a sourceRect rectangle in the \a source framebuffer
-    object to the \a targetRect rectangle in the \a target framebuffer object.
-
-    If \a source or \a target is 0, the default framebuffer will be used
-    instead of a framebuffer object as source or target respectively.
-
-    This function will have no effect unless hasOpenGLFramebufferBlit() returns
-    true.
-
-    The \a buffers parameter should be a mask consisting of any combination of
-    \c GL_COLOR_BUFFER_BIT, \c GL_DEPTH_BUFFER_BIT, and
-    \c GL_STENCIL_BUFFER_BIT.  Any buffer type that is not present both
-    in the source and target buffers is ignored.
-
-    The \a sourceRect and \a targetRect rectangles may have different sizes;
-    in this case \a buffers should not contain \c GL_DEPTH_BUFFER_BIT or
-    \c GL_STENCIL_BUFFER_BIT. The \a filter parameter should be set to
-    \c GL_LINEAR or \c GL_NEAREST, and specifies whether linear or nearest
-    interpolation should be used when scaling is performed.
-
-    If \a source equals \a target a copy is performed within the same buffer.
-    Results are undefined if the source and target rectangles overlap and
-    have different sizes. The sizes must also be the same if any of the
-    framebuffer objects are multisample framebuffers.
-
-    \note The scissor test will restrict the blit area if enabled.
-
-    When multiple render targets are in use, \a readColorAttachmentIndex and \a
-    drawColorAttachmentIndex specify the index of the color attachments in the
-    source and destination framebuffers.
-
-    The \a restorePolicy determines if the framebuffer that was bound prior to
-    calling this function should be restored, or if the default framebuffer
-    should be bound before returning, of if the caller is responsible for
-    tracking and setting the bound framebuffer. Restoring the previous
-    framebuffer can be relatively expensive due to the call to \c{glGetIntegerv}
-    which on some OpenGL drivers may imply a pipeline stall.
-
-    \sa hasOpenGLFramebufferBlit()
-*/
-void QOpenGLFramebufferObject::blitFramebuffer(QOpenGLFramebufferObject *target, const QRect &targetRect,
-                                               QOpenGLFramebufferObject *source, const QRect &sourceRect,
-                                               GLbitfield buffers,
-                                               GLenum filter,
-                                               int readColorAttachmentIndex,
-                                               int drawColorAttachmentIndex,
-                                               QOpenGLFramebufferObject::FramebufferRestorePolicy restorePolicy)
-{
-    QOpenGLContext *ctx = QOpenGLContext::currentContext();
-    if (!ctx)
-        return;
-
-    QOpenGLExtensions extensions(ctx);
-    if (!extensions.hasOpenGLExtension(QOpenGLExtensions::FramebufferBlit))
-        return;
-
-    GLuint prevFbo = 0;
-    if (restorePolicy == RestoreFrameBufferBinding)
-        ctx->functions()->glGetIntegerv(GL_FRAMEBUFFER_BINDING, (GLint *) &prevFbo);
-
-    const int sx0 = sourceRect.left();
-    const int sx1 = sourceRect.left() + sourceRect.width();
-    const int sy0 = sourceRect.top();
-    const int sy1 = sourceRect.top() + sourceRect.height();
-
-    const int tx0 = targetRect.left();
-    const int tx1 = targetRect.left() + targetRect.width();
-    const int ty0 = targetRect.top();
-    const int ty1 = targetRect.top() + targetRect.height();
-
-    const GLuint defaultFboId = ctx->defaultFramebufferObject();
-
-    extensions.glBindFramebuffer(GL_READ_FRAMEBUFFER, source ? source->handle() : defaultFboId);
-    extensions.glBindFramebuffer(GL_DRAW_FRAMEBUFFER, target ? target->handle() : defaultFboId);
-
-    const bool supportsMRT = extensions.hasOpenGLFeature(QOpenGLFunctions::MultipleRenderTargets);
-    if (supportsMRT) {
-        extensions.glReadBuffer(GL_COLOR_ATTACHMENT0 + readColorAttachmentIndex);
-        if (target) {
-            GLenum drawBuf = GL_COLOR_ATTACHMENT0 + drawColorAttachmentIndex;
-            extensions.glDrawBuffers(1, &drawBuf);
-        }
-    }
-
-    extensions.glBlitFramebuffer(sx0, sy0, sx1, sy1,
-                                 tx0, ty0, tx1, ty1,
-                                 buffers, filter);
-
-    if (supportsMRT)
-        extensions.glReadBuffer(GL_COLOR_ATTACHMENT0);
-
-    switch (restorePolicy) {
-    case RestoreFrameBufferBinding:
-        ctx->functions()->glBindFramebuffer(GL_FRAMEBUFFER, prevFbo); // sets both READ and DRAW
-        break;
-
-    case RestoreFramebufferBindingToDefault:
-        ctx->functions()->glBindFramebuffer(GL_FRAMEBUFFER, ctx->defaultFramebufferObject()); // sets both READ and DRAW
-        break;
-
-    case DontRestoreFramebufferBinding:
-        break;
-    }
-}
-
-/*!
-   \overload
-
-    Convenience overload to blit between two framebuffer objects and
-    to restore the previous framebuffer binding. Equivalent to calling
-    blitFramebuffer(target, targetRect, source, sourceRect, buffers, filter,
-    readColorAttachmentIndex, drawColorAttachmentIndex,
-    RestoreFrameBufferBinding).
-*/
-void QOpenGLFramebufferObject::blitFramebuffer(QOpenGLFramebufferObject *target, const QRect &targetRect,
-                                               QOpenGLFramebufferObject *source, const QRect &sourceRect,
-                                               GLbitfield buffers,
-                                               GLenum filter,
-                                               int readColorAttachmentIndex,
-                                               int drawColorAttachmentIndex)
-{
-    blitFramebuffer(target, targetRect, source, sourceRect,
-                    buffers, filter,
-                    readColorAttachmentIndex,
-                    drawColorAttachmentIndex,
-                    RestoreFrameBufferBinding);
-}
-
-QT_END_NAMESPACE
diff --git a/src/gui/opengl/qopenglframebufferobject.h b/src/gui/opengl/qopenglframebufferobject.h
deleted file mode 100644
index 161054d1bf..0000000000
--- a/src/gui/opengl/qopenglframebufferobject.h
+++ /dev/null
@@ -1,200 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtGui module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QOPENGLFRAMEBUFFEROBJECT_H
-#define QOPENGLFRAMEBUFFEROBJECT_H
-
-#include <QtGui/qtguiglobal.h>
-
-#ifndef QT_NO_OPENGL
-
-#include <QtGui/qopengl.h>
-#include <QtGui/qpaintdevice.h>
-
-#include <QtCore/qscopedpointer.h>
-
-#if defined(Q_CLANG_QDOC)
-#undef GLuint
-typedef unsigned int GLuint;
-#undef GLenum
-typedef unsigned int GLenum;
-#undef GL_TEXTURE_2D
-#define GL_TEXTURE_2D 0x0DE1
-#undef GLbitfield
-typedef unsigned int GLbitfield;
-#endif
-
-QT_BEGIN_NAMESPACE
-
-class QOpenGLFramebufferObjectPrivate;
-class QOpenGLFramebufferObjectFormat;
-
-class Q_GUI_EXPORT QOpenGLFramebufferObject
-{
-    Q_DECLARE_PRIVATE(QOpenGLFramebufferObject)
-public:
-    enum Attachment {
-        NoAttachment,
-        CombinedDepthStencil,
-        Depth
-    };
-
-    explicit QOpenGLFramebufferObject(const QSize &size, GLenum target = GL_TEXTURE_2D);
-    QOpenGLFramebufferObject(int width, int height, GLenum target = GL_TEXTURE_2D);
-
-    QOpenGLFramebufferObject(const QSize &size, Attachment attachment,
-                         GLenum target = GL_TEXTURE_2D, GLenum internalFormat = 0);
-    QOpenGLFramebufferObject(int width, int height, Attachment attachment,
-                         GLenum target = GL_TEXTURE_2D, GLenum internalFormat = 0);
-
-    QOpenGLFramebufferObject(const QSize &size, const QOpenGLFramebufferObjectFormat &format);
-    QOpenGLFramebufferObject(int width, int height, const QOpenGLFramebufferObjectFormat &format);
-
-    virtual ~QOpenGLFramebufferObject();
-
-    void addColorAttachment(const QSize &size, GLenum internalFormat = 0);
-    void addColorAttachment(int width, int height, GLenum internalFormat = 0);
-
-    QOpenGLFramebufferObjectFormat format() const;
-
-    bool isValid() const;
-    bool isBound() const;
-    bool bind();
-    bool release();
-
-    int width() const { return size().width(); }
-    int height() const { return size().height(); }
-
-    GLuint texture() const;
-    QVector<GLuint> textures() const;
-
-    GLuint takeTexture();
-    GLuint takeTexture(int colorAttachmentIndex);
-
-    QSize size() const;
-    QVector<QSize> sizes() const;
-
-    QImage toImage() const;
-    QImage toImage(bool flipped) const;
-    QImage toImage(bool flipped, int colorAttachmentIndex) const;
-
-    Attachment attachment() const;
-    void setAttachment(Attachment attachment);
-
-    GLuint handle() const;
-
-    static bool bindDefault();
-
-    static bool hasOpenGLFramebufferObjects();
-
-    static bool hasOpenGLFramebufferBlit();
-
-    enum FramebufferRestorePolicy {
-        DontRestoreFramebufferBinding,
-        RestoreFramebufferBindingToDefault,
-        RestoreFrameBufferBinding
-    };
-
-    static void blitFramebuffer(QOpenGLFramebufferObject *target, const QRect &targetRect,
-                                QOpenGLFramebufferObject *source, const QRect &sourceRect,
-                                GLbitfield buffers,
-                                GLenum filter,
-                                int readColorAttachmentIndex,
-                                int drawColorAttachmentIndex,
-                                FramebufferRestorePolicy restorePolicy);
-    static void blitFramebuffer(QOpenGLFramebufferObject *target, const QRect &targetRect,
-                                QOpenGLFramebufferObject *source, const QRect &sourceRect,
-                                GLbitfield buffers,
-                                GLenum filter,
-                                int readColorAttachmentIndex,
-                                int drawColorAttachmentIndex);
-    static void blitFramebuffer(QOpenGLFramebufferObject *target, const QRect &targetRect,
-                                QOpenGLFramebufferObject *source, const QRect &sourceRect,
-                                GLbitfield buffers = GL_COLOR_BUFFER_BIT,
-                                GLenum filter = GL_NEAREST);
-    static void blitFramebuffer(QOpenGLFramebufferObject *target,
-                                QOpenGLFramebufferObject *source,
-                                GLbitfield buffers = GL_COLOR_BUFFER_BIT,
-                                GLenum filter = GL_NEAREST);
-
-private:
-    Q_DISABLE_COPY(QOpenGLFramebufferObject)
-    QScopedPointer<QOpenGLFramebufferObjectPrivate> d_ptr;
-    friend class QOpenGLPaintDevice;
-    friend class QOpenGLFBOGLPaintDevice;
-};
-
-class QOpenGLFramebufferObjectFormatPrivate;
-class Q_GUI_EXPORT QOpenGLFramebufferObjectFormat
-{
-public:
-    QOpenGLFramebufferObjectFormat();
-    QOpenGLFramebufferObjectFormat(const QOpenGLFramebufferObjectFormat &other);
-    QOpenGLFramebufferObjectFormat &operator=(const QOpenGLFramebufferObjectFormat &other);
-    ~QOpenGLFramebufferObjectFormat();
-
-    void setSamples(int samples);
-    int samples() const;
-
-    void setMipmap(bool enabled);
-    bool mipmap() const;
-
-    void setAttachment(QOpenGLFramebufferObject::Attachment attachment);
-    QOpenGLFramebufferObject::Attachment attachment() const;
-
-    void setTextureTarget(GLenum target);
-    GLenum textureTarget() const;
-
-    void setInternalTextureFormat(GLenum internalTextureFormat);
-    GLenum internalTextureFormat() const;
-
-    bool operator==(const QOpenGLFramebufferObjectFormat& other) const;
-    bool operator!=(const QOpenGLFramebufferObjectFormat& other) const;
-
-private:
-    QOpenGLFramebufferObjectFormatPrivate *d;
-
-    void detach();
-};
-
-QT_END_NAMESPACE
-
-#endif // QT_NO_OPENGL
-
-#endif // QOPENGLFRAMEBUFFEROBJECT_H
diff --git a/src/gui/opengl/qopenglframebufferobject_p.h b/src/gui/opengl/qopenglframebufferobject_p.h
deleted file mode 100644
index 644bb6c59b..0000000000
--- a/src/gui/opengl/qopenglframebufferobject_p.h
+++ /dev/null
@@ -1,153 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtGui module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QOPENGLFRAMEBUFFEROBJECT_P_H
-#define QOPENGLFRAMEBUFFEROBJECT_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API. It exists purely as an
-// implementation detail. This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include <QtGui/private/qtguiglobal_p.h>
-#include <qopenglframebufferobject.h>
-#include <private/qopenglcontext_p.h>
-#include <private/qopenglextensions_p.h>
-
-QT_BEGIN_NAMESPACE
-
-class QOpenGLFramebufferObjectFormatPrivate
-{
-public:
-    QOpenGLFramebufferObjectFormatPrivate()
-        : ref(1),
-          samples(0),
-          attachment(QOpenGLFramebufferObject::NoAttachment),
-          target(GL_TEXTURE_2D),
-          mipmap(false)
-    {
-#ifndef QT_OPENGL_ES_2
-        // There is nothing that says QOpenGLFramebufferObjectFormat needs a current
-        // context, so we need a fallback just to be safe, even though in pratice there
-        // will usually be a context current.
-        QOpenGLContext *ctx = QOpenGLContext::currentContext();
-        const bool isES = ctx ? ctx->isOpenGLES() : QOpenGLContext::openGLModuleType() != QOpenGLContext::LibGL;
-        internal_format = isES ? GL_RGBA : GL_RGBA8;
-#else
-        internal_format = GL_RGBA;
-#endif
-    }
-    QOpenGLFramebufferObjectFormatPrivate
-            (const QOpenGLFramebufferObjectFormatPrivate *other)
-        : ref(1),
-          samples(other->samples),
-          attachment(other->attachment),
-          target(other->target),
-          internal_format(other->internal_format),
-          mipmap(other->mipmap)
-    {
-    }
-    bool equals(const QOpenGLFramebufferObjectFormatPrivate *other)
-    {
-        return samples == other->samples &&
-               attachment == other->attachment &&
-               target == other->target &&
-               internal_format == other->internal_format &&
-               mipmap == other->mipmap;
-    }
-
-    QAtomicInt ref;
-    int samples;
-    QOpenGLFramebufferObject::Attachment attachment;
-    GLenum target;
-    GLenum internal_format;
-    uint mipmap : 1;
-};
-
-class QOpenGLFramebufferObjectPrivate
-{
-public:
-    QOpenGLFramebufferObjectPrivate() : fbo_guard(nullptr), depth_buffer_guard(nullptr)
-                                  , stencil_buffer_guard(nullptr)
-                                  , valid(false) {}
-    ~QOpenGLFramebufferObjectPrivate() {}
-
-    void init(QOpenGLFramebufferObject *q, const QSize &size,
-              QOpenGLFramebufferObject::Attachment attachment,
-              GLenum texture_target, GLenum internal_format,
-              GLint samples = 0, bool mipmap = false);
-    void initTexture(int idx);
-    void initColorBuffer(int idx, GLint *samples);
-    void initDepthStencilAttachments(QOpenGLContext *ctx, QOpenGLFramebufferObject::Attachment attachment);
-
-    bool checkFramebufferStatus(QOpenGLContext *ctx) const;
-    QOpenGLSharedResourceGuard *fbo_guard;
-    QOpenGLSharedResourceGuard *depth_buffer_guard;
-    QOpenGLSharedResourceGuard *stencil_buffer_guard;
-    GLenum target;
-    QSize dsSize;
-    QOpenGLFramebufferObjectFormat format;
-    int requestedSamples;
-    uint valid : 1;
-    QOpenGLFramebufferObject::Attachment fbo_attachment;
-    QOpenGLExtensions funcs;
-
-    struct ColorAttachment {
-        ColorAttachment() : internalFormat(0), guard(nullptr) { }
-        ColorAttachment(const QSize &size, GLenum internalFormat)
-            : size(size), internalFormat(internalFormat), guard(nullptr) { }
-        QSize size;
-        GLenum internalFormat;
-        QOpenGLSharedResourceGuard *guard;
-    };
-    QVector<ColorAttachment> colorAttachments;
-
-    inline GLuint fbo() const { return fbo_guard ? fbo_guard->id() : 0; }
-};
-
-
-QT_END_NAMESPACE
-
-#endif // QOPENGLFRAMEBUFFEROBJECT_P_H
diff --git a/src/gui/opengl/qopenglgradientcache.cpp b/src/gui/opengl/qopenglgradientcache.cpp
deleted file mode 100644
index 3aa4c0d2e6..0000000000
--- a/src/gui/opengl/qopenglgradientcache.cpp
+++ /dev/null
@@ -1,276 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtGui module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qopenglgradientcache_p.h"
-#include <private/qdrawhelper_p.h>
-#include <private/qopenglcontext_p.h>
-#include <private/qrgba64_p.h>
-#include <QtCore/qmutex.h>
-#include <QtCore/qrandom.h>
-#include "qopenglfunctions.h"
-#include "qopenglextensions_p.h"
-
-#ifndef GL_RGBA16
-#define GL_RGBA16   0x805B
-#endif
-
-QT_BEGIN_NAMESPACE
-
-class QOpenGL2GradientCacheWrapper
-{
-public:
-    QOpenGL2GradientCache *cacheForContext(QOpenGLContext *context) {
-        QMutexLocker lock(&m_mutex);
-        return m_resource.value<QOpenGL2GradientCache>(context);
-    }
-
-private:
-    QOpenGLMultiGroupSharedResource m_resource;
-    QMutex m_mutex;
-};
-
-Q_GLOBAL_STATIC(QOpenGL2GradientCacheWrapper, qt_gradient_caches)
-
-QOpenGL2GradientCache::QOpenGL2GradientCache(QOpenGLContext *ctx)
-    : QOpenGLSharedResource(ctx->shareGroup())
-{
-}
-
-QOpenGL2GradientCache::~QOpenGL2GradientCache()
-{
-    cache.clear();
-}
-
-QOpenGL2GradientCache *QOpenGL2GradientCache::cacheForContext(QOpenGLContext *context)
-{
-    return qt_gradient_caches()->cacheForContext(context);
-}
-
-void QOpenGL2GradientCache::invalidateResource()
-{
-    QMutexLocker lock(&m_mutex);
-    cache.clear();
-}
-
-void QOpenGL2GradientCache::freeResource(QOpenGLContext *)
-{
-    cleanCache();
-}
-
-void QOpenGL2GradientCache::cleanCache()
-{
-    QMutexLocker lock(&m_mutex);
-    QOpenGLGradientColorTableHash::const_iterator it = cache.constBegin();
-    QOpenGLFunctions *funcs = QOpenGLContext::currentContext()->functions();
-    for (; it != cache.constEnd(); ++it) {
-        const CacheInfo &cache_info = it.value();
-        funcs->glDeleteTextures(1, &cache_info.texId);
-    }
-    cache.clear();
-}
-
-GLuint QOpenGL2GradientCache::getBuffer(const QGradient &gradient, qreal opacity)
-{
-    quint64 hash_val = 0;
-
-    const QGradientStops stops = gradient.stops();
-    for (int i = 0; i < stops.size() && i <= 2; i++)
-        hash_val += stops[i].second.rgba();
-
-    const QMutexLocker lock(&m_mutex);
-    QOpenGLGradientColorTableHash::const_iterator it = cache.constFind(hash_val);
-
-    if (it == cache.constEnd())
-        return addCacheElement(hash_val, gradient, opacity);
-    else {
-        do {
-            const CacheInfo &cache_info = it.value();
-            if (cache_info.stops == stops && cache_info.opacity == opacity
-                && cache_info.interpolationMode == gradient.interpolationMode())
-            {
-                return cache_info.texId;
-            }
-            ++it;
-        } while (it != cache.constEnd() && it.key() == hash_val);
-        // an exact match for these stops and opacity was not found, create new cache
-        return addCacheElement(hash_val, gradient, opacity);
-    }
-}
-
-
-GLuint QOpenGL2GradientCache::addCacheElement(quint64 hash_val, const QGradient &gradient, qreal opacity)
-{
-    QOpenGLFunctions *funcs = QOpenGLContext::currentContext()->functions();
-    if (cache.size() == maxCacheSize()) {
-        int elem_to_remove = QRandomGenerator::global()->bounded(maxCacheSize());
-        quint64 key = cache.keys()[elem_to_remove];
-
-        // need to call glDeleteTextures on each removed cache entry:
-        QOpenGLGradientColorTableHash::const_iterator it = cache.constFind(key);
-        do {
-            funcs->glDeleteTextures(1, &it.value().texId);
-        } while (++it != cache.constEnd() && it.key() == key);
-        cache.remove(key); // may remove more than 1, but OK
-    }
-
-    CacheInfo cache_entry(gradient.stops(), opacity, gradient.interpolationMode());
-    funcs->glGenTextures(1, &cache_entry.texId);
-    funcs->glBindTexture(GL_TEXTURE_2D, cache_entry.texId);
-    if (static_cast<QOpenGLExtensions *>(funcs)->hasOpenGLExtension(QOpenGLExtensions::Sized16Formats)) {
-        QRgba64 buffer[1024];
-        generateGradientColorTable(gradient, buffer, paletteSize(), opacity);
-        funcs->glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA16, paletteSize(), 1,
-                            0, GL_RGBA, GL_UNSIGNED_SHORT, buffer);
-    } else {
-        uint buffer[1024];
-        generateGradientColorTable(gradient, buffer, paletteSize(), opacity);
-        funcs->glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, paletteSize(), 1,
-                            0, GL_RGBA, GL_UNSIGNED_BYTE, buffer);
-    }
-    return cache.insert(hash_val, cache_entry).value().texId;
-}
-
-
-//TODO: Let GL generate the texture using an FBO
-void QOpenGL2GradientCache::generateGradientColorTable(const QGradient& gradient, QRgba64 *colorTable, int size, qreal opacity) const
-{
-    int pos = 0;
-    const QGradientStops s = gradient.stops();
-
-    bool colorInterpolation = (gradient.interpolationMode() == QGradient::ColorInterpolation);
-
-    uint alpha = qRound(opacity * 256);
-    QRgba64 current_color = combineAlpha256(s[0].second.rgba64(), alpha);
-    qreal incr = 1.0 / qreal(size);
-    qreal fpos = 1.5 * incr;
-    colorTable[pos++] = qPremultiply(current_color);
-
-    while (fpos <= s.first().first) {
-        colorTable[pos] = colorTable[pos - 1];
-        pos++;
-        fpos += incr;
-    }
-
-    if (colorInterpolation)
-        current_color = qPremultiply(current_color);
-
-    const int sLast = s.size() - 1;
-    for (int i = 0; i < sLast; ++i) {
-        qreal delta = 1/(s[i+1].first - s[i].first);
-        QRgba64 next_color = combineAlpha256(s[i + 1].second.rgba64(), alpha);
-        if (colorInterpolation)
-            next_color = qPremultiply(next_color);
-
-        while (fpos < s[i+1].first && pos < size) {
-            int dist = int(256 * ((fpos - s[i].first) * delta));
-            int idist = 256 - dist;
-            if (colorInterpolation)
-                colorTable[pos] = interpolate256(current_color, idist, next_color, dist);
-            else
-                colorTable[pos] = qPremultiply(interpolate256(current_color, idist, next_color, dist));
-            ++pos;
-            fpos += incr;
-        }
-        current_color = next_color;
-    }
-
-    Q_ASSERT(s.size() > 0);
-
-    QRgba64 last_color = qPremultiply(combineAlpha256(s[sLast].second.rgba64(), alpha));
-    for (;pos < size; ++pos)
-        colorTable[pos] = last_color;
-
-    // Make sure the last color stop is represented at the end of the table
-    colorTable[size-1] = last_color;
-}
-
-void QOpenGL2GradientCache::generateGradientColorTable(const QGradient& gradient, uint *colorTable, int size, qreal opacity) const
-{
-    int pos = 0;
-    const QGradientStops s = gradient.stops();
-
-    bool colorInterpolation = (gradient.interpolationMode() == QGradient::ColorInterpolation);
-
-    uint alpha = qRound(opacity * 256);
-    // Qt LIES! It returns ARGB (on little-endian AND on big-endian)
-    uint current_color = ARGB_COMBINE_ALPHA(s[0].second.rgba(), alpha);
-    qreal incr = 1.0 / qreal(size);
-    qreal fpos = 1.5 * incr;
-    colorTable[pos++] = ARGB2RGBA(qPremultiply(current_color));
-
-    while (fpos <= s.first().first) {
-        colorTable[pos] = colorTable[pos - 1];
-        pos++;
-        fpos += incr;
-    }
-
-    if (colorInterpolation)
-        current_color = qPremultiply(current_color);
-
-    const int sLast = s.size() - 1;
-    for (int i = 0; i < sLast; ++i) {
-        qreal delta = 1/(s[i+1].first - s[i].first);
-        uint next_color = ARGB_COMBINE_ALPHA(s[i + 1].second.rgba(), alpha);
-        if (colorInterpolation)
-            next_color = qPremultiply(next_color);
-
-        while (fpos < s[i+1].first && pos < size) {
-            int dist = int(256 * ((fpos - s[i].first) * delta));
-            int idist = 256 - dist;
-            if (colorInterpolation)
-                colorTable[pos] = ARGB2RGBA(INTERPOLATE_PIXEL_256(current_color, idist, next_color, dist));
-            else
-                colorTable[pos] = ARGB2RGBA(qPremultiply(INTERPOLATE_PIXEL_256(current_color, idist, next_color, dist)));
-            ++pos;
-            fpos += incr;
-        }
-        current_color = next_color;
-    }
-
-    Q_ASSERT(s.size() > 0);
-
-    uint last_color = ARGB2RGBA(qPremultiply(ARGB_COMBINE_ALPHA(s[sLast].second.rgba(), alpha)));
-    for (;pos < size; ++pos)
-        colorTable[pos] = last_color;
-
-    // Make sure the last color stop is represented at the end of the table
-    colorTable[size-1] = last_color;
-}
-
-QT_END_NAMESPACE
diff --git a/src/gui/opengl/qopenglgradientcache_p.h b/src/gui/opengl/qopenglgradientcache_p.h
deleted file mode 100644
index 1d34223bdd..0000000000
--- a/src/gui/opengl/qopenglgradientcache_p.h
+++ /dev/null
@@ -1,108 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtGui module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QOPENGLGRADIENTCACHE_P_H
-#define QOPENGLGRADIENTCACHE_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include <QtGui/private/qtguiglobal_p.h>
-#include <QMultiHash>
-#include <QObject>
-#include <private/qopenglcontext_p.h>
-#include <QtCore/qmutex.h>
-#include <QGradient>
-#include <qrgba64.h>
-
-QT_BEGIN_NAMESPACE
-
-class QOpenGL2GradientCache : public QOpenGLSharedResource
-{
-    struct CacheInfo
-    {
-        inline CacheInfo(QGradientStops s, qreal op, QGradient::InterpolationMode mode) :
-            stops(std::move(s)), opacity(op), interpolationMode(mode) {}
-
-        GLuint texId;
-        QGradientStops stops;
-        qreal opacity;
-        QGradient::InterpolationMode interpolationMode;
-    };
-
-    typedef QMultiHash<quint64, CacheInfo> QOpenGLGradientColorTableHash;
-
-public:
-    static QOpenGL2GradientCache *cacheForContext(QOpenGLContext *context);
-
-    QOpenGL2GradientCache(QOpenGLContext *);
-    ~QOpenGL2GradientCache();
-
-    GLuint getBuffer(const QGradient &gradient, qreal opacity);
-    inline int paletteSize() const { return 1024; }
-
-    void invalidateResource() override;
-    void freeResource(QOpenGLContext *ctx) override;
-
-private:
-    inline int maxCacheSize() const { return 60; }
-    inline void generateGradientColorTable(const QGradient& gradient,
-                                           QRgba64 *colorTable,
-                                           int size, qreal opacity) const;
-    inline void generateGradientColorTable(const QGradient& gradient,
-                                           uint *colorTable,
-                                           int size, qreal opacity) const;
-    GLuint addCacheElement(quint64 hash_val, const QGradient &gradient, qreal opacity);
-    void cleanCache();
-
-    QOpenGLGradientColorTableHash cache;
-    QMutex m_mutex;
-};
-
-QT_END_NAMESPACE
-
-#endif // QOPENGLGRADIENTCACHE_P_H
diff --git a/src/gui/opengl/qopenglpaintdevice.cpp b/src/gui/opengl/qopenglpaintdevice.cpp
deleted file mode 100644
index 3920a10467..0000000000
--- a/src/gui/opengl/qopenglpaintdevice.cpp
+++ /dev/null
@@ -1,372 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtGui module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <qopenglpaintdevice.h>
-#include <qpaintengine.h>
-#include <qthreadstorage.h>
-
-#include <private/qopenglpaintdevice_p.h>
-#include <private/qobject_p.h>
-#include <private/qopenglcontext_p.h>
-#include <private/qopenglframebufferobject_p.h>
-#include <private/qopenglpaintengine_p.h>
-
-// for qt_defaultDpiX/Y
-#include <private/qfont_p.h>
-
-#include <qopenglfunctions.h>
-
-QT_BEGIN_NAMESPACE
-
-/*!
-    \class QOpenGLPaintDevice
-    \brief The QOpenGLPaintDevice class enables painting to an OpenGL context using QPainter.
-    \since 5.0
-    \inmodule QtGui
-
-    \ingroup painting-3D
-
-    The QOpenGLPaintDevice uses the \b current QOpenGL context to render
-    QPainter draw commands. The context is captured upon construction. It
-    requires support for OpenGL (ES) 2.0 or higher.
-
-    \section1 Performance
-
-    The QOpenGLPaintDevice is almost always hardware accelerated and
-    has the potential of being much faster than software
-    rasterization. However, it is more sensitive to state changes, and
-    therefore requires the drawing commands to be carefully ordered to
-    achieve optimal performance.
-
-    \section1 Antialiasing and Quality
-
-    Antialiasing in the OpenGL paint engine is done using
-    multisampling. Most hardware require significantly more memory to
-    do multisampling and the resulting quality is not on par with the
-    quality of the software paint engine. The OpenGL paint engine's
-    strength lies in its performance, not its visual rendering
-    quality.
-
-    \section1 State Changes
-
-    When painting to a QOpenGLPaintDevice using QPainter, the state of
-    the current OpenGL context will be altered by the paint engine to
-    reflect its needs.  Applications should not rely upon the OpenGL
-    state being reset to its original conditions, particularly the
-    current shader program, OpenGL viewport, texture units, and
-    drawing modes.
-
-    \section1 Mixing QPainter and OpenGL
-
-    When intermixing QPainter and OpenGL, it is important to notify
-    QPainter that the OpenGL state may have been cluttered so it can
-    restore its internal state. This is achieved by calling \l
-    QPainter::beginNativePainting() before starting the OpenGL
-    rendering and calling \l QPainter::endNativePainting() after
-    finishing.
-
-    \sa {OpenGL Window Example}
-
-*/
-
-/*!
-    Constructs a QOpenGLPaintDevice.
-
-    The QOpenGLPaintDevice is only valid for the current context.
-
-    \sa QOpenGLContext::currentContext()
-*/
-QOpenGLPaintDevice::QOpenGLPaintDevice()
-    : d_ptr(new QOpenGLPaintDevicePrivate(QSize()))
-{
-}
-
-/*!
-    Constructs a QOpenGLPaintDevice with the given \a size.
-
-    The QOpenGLPaintDevice is only valid for the current context.
-
-    \sa QOpenGLContext::currentContext()
-*/
-QOpenGLPaintDevice::QOpenGLPaintDevice(const QSize &size)
-    : d_ptr(new QOpenGLPaintDevicePrivate(size))
-{
-}
-
-/*!
-    Constructs a QOpenGLPaintDevice with the given \a width and \a height.
-
-    The QOpenGLPaintDevice is only valid for the current context.
-
-    \sa QOpenGLContext::currentContext()
-*/
-QOpenGLPaintDevice::QOpenGLPaintDevice(int width, int height)
-    : QOpenGLPaintDevice(QSize(width, height))
-{
-}
-
-/*!
-    \internal
- */
-QOpenGLPaintDevice::QOpenGLPaintDevice(QOpenGLPaintDevicePrivate &dd)
-    : d_ptr(&dd)
-{
-}
-
-/*!
-    Destroys the QOpenGLPaintDevice.
-*/
-
-QOpenGLPaintDevice::~QOpenGLPaintDevice()
-{
-    delete d_ptr->engine;
-}
-
-/*!
-    \fn int QOpenGLPaintDevice::devType() const
-    \internal
-    \reimp
-*/
-
-QOpenGLPaintDevicePrivate::QOpenGLPaintDevicePrivate(const QSize &sz)
-    : size(sz)
-    , ctx(QOpenGLContext::currentContext())
-    , dpmx(qt_defaultDpiX() * 100. / 2.54)
-    , dpmy(qt_defaultDpiY() * 100. / 2.54)
-    , devicePixelRatio(1.0)
-    , flipped(false)
-    , engine(nullptr)
-{
-}
-
-QOpenGLPaintDevicePrivate::~QOpenGLPaintDevicePrivate()
-{
-}
-
-class QOpenGLEngineThreadStorage
-{
-public:
-    QPaintEngine *engine() {
-        QPaintEngine *&localEngine = storage.localData();
-        if (!localEngine)
-            localEngine = new QOpenGL2PaintEngineEx;
-        return localEngine;
-    }
-
-private:
-    QThreadStorage<QPaintEngine *> storage;
-};
-
-Q_GLOBAL_STATIC(QOpenGLEngineThreadStorage, qt_opengl_engine)
-
-/*!
-    \reimp
-*/
-
-QPaintEngine *QOpenGLPaintDevice::paintEngine() const
-{
-    if (d_ptr->engine)
-        return d_ptr->engine;
-
-    QPaintEngine *engine = qt_opengl_engine()->engine();
-    if (engine->isActive() && engine->paintDevice() != this) {
-        d_ptr->engine = new QOpenGL2PaintEngineEx;
-        return d_ptr->engine;
-    }
-
-    return engine;
-}
-
-/*!
-    Returns the OpenGL context associated with the paint device.
-*/
-
-QOpenGLContext *QOpenGLPaintDevice::context() const
-{
-    return d_ptr->ctx;
-}
-
-/*!
-    Returns the pixel size of the paint device.
-
-    \sa setSize()
-*/
-
-QSize QOpenGLPaintDevice::size() const
-{
-    return d_ptr->size;
-}
-
-/*!
-    Sets the pixel size of the paint device to \a size.
-
-    \sa size()
-*/
-
-void QOpenGLPaintDevice::setSize(const QSize &size)
-{
-    d_ptr->size = size;
-}
-
-/*!
-    Sets the device pixel ratio for the paint device to \a devicePixelRatio.
-*/
-void QOpenGLPaintDevice::setDevicePixelRatio(qreal devicePixelRatio)
-{
-    d_ptr->devicePixelRatio = devicePixelRatio;
-}
-
-/*!
-    \reimp
-*/
-
-int QOpenGLPaintDevice::metric(QPaintDevice::PaintDeviceMetric metric) const
-{
-    switch (metric) {
-    case PdmWidth:
-        return d_ptr->size.width();
-    case PdmHeight:
-        return d_ptr->size.height();
-    case PdmDepth:
-        return 32;
-    case PdmWidthMM:
-        return qRound(d_ptr->size.width() * 1000 / d_ptr->dpmx);
-    case PdmHeightMM:
-        return qRound(d_ptr->size.height() * 1000 / d_ptr->dpmy);
-    case PdmNumColors:
-        return 0;
-    case PdmDpiX:
-        return qRound(d_ptr->dpmx * 0.0254);
-    case PdmDpiY:
-        return qRound(d_ptr->dpmy * 0.0254);
-    case PdmPhysicalDpiX:
-        return qRound(d_ptr->dpmx * 0.0254);
-    case PdmPhysicalDpiY:
-        return qRound(d_ptr->dpmy * 0.0254);
-    case PdmDevicePixelRatio:
-        return d_ptr->devicePixelRatio;
-    case PdmDevicePixelRatioScaled:
-        return d_ptr->devicePixelRatio * QPaintDevice::devicePixelRatioFScale();
-
-    default:
-        qWarning("QOpenGLPaintDevice::metric() - metric %d not known", metric);
-        return 0;
-    }
-}
-
-/*!
-    Returns the number of pixels per meter horizontally.
-
-    \sa setDotsPerMeterX()
-*/
-
-qreal QOpenGLPaintDevice::dotsPerMeterX() const
-{
-    return d_ptr->dpmx;
-}
-
-/*!
-    Returns the number of pixels per meter vertically.
-
-    \sa setDotsPerMeterY()
-*/
-
-qreal QOpenGLPaintDevice::dotsPerMeterY() const
-{
-    return d_ptr->dpmy;
-}
-
-/*!
-    Sets the number of pixels per meter horizontally to \a dpmx.
-
-    \sa dotsPerMeterX()
-*/
-
-void QOpenGLPaintDevice::setDotsPerMeterX(qreal dpmx)
-{
-    d_ptr->dpmx = dpmx;
-}
-
-/*!
-    Sets the number of pixels per meter vertically to \a dpmy.
-
-    \sa dotsPerMeterY()
-*/
-
-void QOpenGLPaintDevice::setDotsPerMeterY(qreal dpmy)
-{
-    d_ptr->dpmx = dpmy;
-}
-
-/*!
-    Sets whether painting should be flipped around the Y-axis or not to \a flipped.
-
-    \sa paintFlipped()
-*/
-void QOpenGLPaintDevice::setPaintFlipped(bool flipped)
-{
-    d_ptr->flipped = flipped;
-}
-
-/*!
-    Returns \c true if painting is flipped around the Y-axis.
-
-    \sa setPaintFlipped()
-*/
-
-bool QOpenGLPaintDevice::paintFlipped() const
-{
-    return d_ptr->flipped;
-}
-
-/*!
-    This virtual method is provided as a callback to allow re-binding a target
-    frame buffer object or context when different QOpenGLPaintDevice instances
-    are issuing draw calls alternately.
-
-    \l{QPainter::beginNativePainting()}{beginNativePainting()} will also trigger
-    this method.
-
-    The default implementation does nothing.
-*/
-void QOpenGLPaintDevice::ensureActiveTarget()
-{
-}
-
-QT_END_NAMESPACE
diff --git a/src/gui/opengl/qopenglpaintdevice.h b/src/gui/opengl/qopenglpaintdevice.h
deleted file mode 100644
index 54118f2926..0000000000
--- a/src/gui/opengl/qopenglpaintdevice.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtGui module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QOPENGLPAINTDEVICE_H
-#define QOPENGLPAINTDEVICE_H
-
-#include <QtGui/qtguiglobal.h>
-
-#ifndef QT_NO_OPENGL
-
-#include <QtGui/qpaintdevice.h>
-#include <QtGui/qopengl.h>
-#include <QtGui/qopenglcontext.h>
-
-QT_BEGIN_NAMESPACE
-
-class QOpenGLPaintDevicePrivate;
-
-class Q_GUI_EXPORT QOpenGLPaintDevice : public QPaintDevice
-{
-    Q_DECLARE_PRIVATE(QOpenGLPaintDevice)
-public:
-    QOpenGLPaintDevice();
-    explicit QOpenGLPaintDevice(const QSize &size);
-    QOpenGLPaintDevice(int width, int height);
-    ~QOpenGLPaintDevice();
-
-    int devType() const override { return QInternal::OpenGL; }
-    QPaintEngine *paintEngine() const override;
-
-    QOpenGLContext *context() const;
-    QSize size() const;
-    void setSize(const QSize &size);
-    void setDevicePixelRatio(qreal devicePixelRatio);
-
-    qreal dotsPerMeterX() const;
-    qreal dotsPerMeterY() const;
-
-    void setDotsPerMeterX(qreal);
-    void setDotsPerMeterY(qreal);
-
-    void setPaintFlipped(bool flipped);
-    bool paintFlipped() const;
-
-    virtual void ensureActiveTarget();
-
-protected:
-    QOpenGLPaintDevice(QOpenGLPaintDevicePrivate &dd);
-    int metric(QPaintDevice::PaintDeviceMetric metric) const override;
-
-    Q_DISABLE_COPY(QOpenGLPaintDevice)
-    QScopedPointer<QOpenGLPaintDevicePrivate> d_ptr;
-};
-
-QT_END_NAMESPACE
-
-#endif // QT_NO_OPENGL
-
-#endif // QOPENGLPAINTDEVICE_H
diff --git a/src/gui/opengl/qopenglpaintdevice_p.h b/src/gui/opengl/qopenglpaintdevice_p.h
deleted file mode 100644
index 3683ebebac..0000000000
--- a/src/gui/opengl/qopenglpaintdevice_p.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtGui module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QOPENGL_PAINTDEVICE_P_H
-#define QOPENGL_PAINTDEVICE_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists for the convenience
-// of the Qt OpenGL classes.  This header file may change from
-// version to version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include <QtGui/private/qtguiglobal_p.h>
-#include <qopenglpaintdevice.h>
-
-QT_BEGIN_NAMESPACE
-
-class QOpenGLContext;
-class QPaintEngine;
-
-class Q_GUI_EXPORT QOpenGLPaintDevicePrivate
-{
-public:
-    QOpenGLPaintDevicePrivate(const QSize &size);
-    virtual ~QOpenGLPaintDevicePrivate();
-
-    static QOpenGLPaintDevicePrivate *get(QOpenGLPaintDevice *dev) { return dev->d_func(); }
-
-    virtual void beginPaint() { }
-    virtual void endPaint() { }
-
-public:
-    QSize size;
-    QOpenGLContext *ctx;
-
-    qreal dpmx;
-    qreal dpmy;
-    qreal devicePixelRatio;
-
-    bool flipped;
-
-    QPaintEngine *engine;
-};
-
-QT_END_NAMESPACE
-
-#endif // QOPENGL_PAINTDEVICE_P_H
diff --git a/src/gui/opengl/qopenglpaintengine.cpp b/src/gui/opengl/qopenglpaintengine.cpp
deleted file mode 100644
index b53c9a3eab..0000000000
--- a/src/gui/opengl/qopenglpaintengine.cpp
+++ /dev/null
@@ -1,2702 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtGui module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-/*
-    When the active program changes, we need to update it's uniforms.
-    We could track state for each program and only update stale uniforms
-        - Could lead to lots of overhead if there's a lot of programs
-    We could update all the uniforms when the program changes
-        - Could end up updating lots of uniforms which don't need updating
-
-    Updating uniforms should be cheap, so the overhead of updating up-to-date
-    uniforms should be minimal. It's also less complex.
-
-    Things which _may_ cause a different program to be used:
-        - Change in brush/pen style
-        - Change in painter opacity
-        - Change in composition mode
-
-    Whenever we set a mode on the shader manager - it needs to tell us if it had
-    to switch to a different program.
-
-    The shader manager should only switch when we tell it to. E.g. if we set a new
-    brush style and then switch to transparent painter, we only want it to compile
-    and use the correct program when we really need it.
-*/
-
-// #define QT_OPENGL_CACHE_AS_VBOS
-
-#include "qopenglgradientcache_p.h"
-#include "qopengltexturecache_p.h"
-#include "qopenglpaintengine_p.h"
-#include "qopenglpaintdevice_p.h"
-
-#include <string.h> //for memcpy
-#include <qmath.h>
-
-#include <private/qopengl_p.h>
-#include <private/qopenglcontext_p.h>
-#include <private/qopenglextensions_p.h>
-#include <private/qpaintengineex_p.h>
-#include <QPaintEngine>
-#include <private/qpainter_p.h>
-#include <private/qfontengine_p.h>
-#include <private/qdatabuffer_p.h>
-#include <private/qstatictext_p.h>
-#include <private/qtriangulator_p.h>
-
-#include "qopenglengineshadermanager_p.h"
-#include "qopengl2pexvertexarray_p.h"
-#include "qopengltextureglyphcache_p.h"
-
-#include <QDebug>
-
-#ifndef GL_KHR_blend_equation_advanced
-#define GL_KHR_blend_equation_advanced 1
-#define GL_MULTIPLY_KHR                   0x9294
-#define GL_SCREEN_KHR                     0x9295
-#define GL_OVERLAY_KHR                    0x9296
-#define GL_DARKEN_KHR                     0x9297
-#define GL_LIGHTEN_KHR                    0x9298
-#define GL_COLORDODGE_KHR                 0x9299
-#define GL_COLORBURN_KHR                  0x929A
-#define GL_HARDLIGHT_KHR                  0x929B
-#define GL_SOFTLIGHT_KHR                  0x929C
-#define GL_DIFFERENCE_KHR                 0x929E
-#define GL_EXCLUSION_KHR                  0x92A0
-#endif /* GL_KHR_blend_equation_advanced */
-
-#ifndef GL_KHR_blend_equation_advanced_coherent
-#define GL_KHR_blend_equation_advanced_coherent 1
-#define GL_BLEND_ADVANCED_COHERENT_KHR    0x9285
-#endif /* GL_KHR_blend_equation_advanced_coherent */
-
-QT_BEGIN_NAMESPACE
-
-
-Q_GUI_EXPORT QImage qt_imageForBrush(int brushStyle, bool invert);
-
-////////////////////////////////// Private Methods //////////////////////////////////////////
-
-QOpenGL2PaintEngineExPrivate::~QOpenGL2PaintEngineExPrivate()
-{
-    delete shaderManager;
-
-    vertexBuffer.destroy();
-    texCoordBuffer.destroy();
-    opacityBuffer.destroy();
-    indexBuffer.destroy();
-    vao.destroy();
-
-    if (elementIndicesVBOId != 0) {
-        funcs.glDeleteBuffers(1, &elementIndicesVBOId);
-        elementIndicesVBOId = 0;
-    }
-}
-
-inline QColor qt_premultiplyColor(QColor c, GLfloat opacity)
-{
-    qreal alpha = c.alphaF() * opacity;
-    c.setAlphaF(alpha);
-    c.setRedF(c.redF() * alpha);
-    c.setGreenF(c.greenF() * alpha);
-    c.setBlueF(c.blueF() * alpha);
-    return c;
-}
-
-
-void QOpenGL2PaintEngineExPrivate::setBrush(const QBrush& brush)
-{
-    if (qbrush_fast_equals(currentBrush, brush))
-        return;
-
-    const Qt::BrushStyle newStyle = qbrush_style(brush);
-    Q_ASSERT(newStyle != Qt::NoBrush);
-
-    currentBrush = brush;
-    if (!currentBrushImage.isNull())
-        currentBrushImage = QImage();
-    brushUniformsDirty = true; // All brushes have at least one uniform
-
-    if (newStyle > Qt::SolidPattern)
-        brushTextureDirty = true;
-
-    if (currentBrush.style() == Qt::TexturePattern
-        && qHasPixmapTexture(brush) && brush.texture().isQBitmap())
-    {
-        shaderManager->setSrcPixelType(QOpenGLEngineShaderManager::TextureSrcWithPattern);
-    } else {
-        shaderManager->setSrcPixelType(newStyle);
-    }
-    shaderManager->optimiseForBrushTransform(currentBrush.transform().type());
-}
-
-
-void QOpenGL2PaintEngineExPrivate::useSimpleShader()
-{
-    shaderManager->useSimpleProgram();
-
-    if (matrixDirty)
-        updateMatrix();
-}
-
-/*
-    Single entry-point for activating, binding, and setting properties.
-
-    Allows keeping track of (caching) the latest texture unit and bound
-    texture in a central place, so that we can skip re-binding unless
-    needed.
-
-    \note Any code or Qt API that internally activates or binds will
-    not affect the cache used by this function, which means they will
-    lead to inconsisent state. QPainter::beginNativePainting() takes
-    care of resetting the cache, so for user–code this is fine, but
-    internally in the paint engine care must be taken to not call
-    functions that may activate or bind under our feet.
-*/
-template<typename T>
-void QOpenGL2PaintEngineExPrivate::updateTexture(GLenum textureUnit, const T &texture, GLenum wrapMode, GLenum filterMode, TextureUpdateMode updateMode)
-{
-    static const GLenum target = GL_TEXTURE_2D;
-
-    activateTextureUnit(textureUnit);
-
-    GLuint textureId = bindTexture(texture);
-
-    if (updateMode == UpdateIfNeeded && textureId == lastTextureUsed)
-        return;
-
-    lastTextureUsed = textureId;
-
-    funcs.glTexParameteri(target, GL_TEXTURE_WRAP_S, wrapMode);
-    funcs.glTexParameteri(target, GL_TEXTURE_WRAP_T, wrapMode);
-
-    funcs.glTexParameteri(target, GL_TEXTURE_MAG_FILTER, filterMode);
-    funcs.glTexParameteri(target, GL_TEXTURE_MIN_FILTER, filterMode);
-}
-
-void QOpenGL2PaintEngineExPrivate::activateTextureUnit(GLenum textureUnit)
-{
-    if (textureUnit != lastTextureUnitUsed) {
-        funcs.glActiveTexture(GL_TEXTURE0 + textureUnit);
-        lastTextureUnitUsed = textureUnit;
-
-        // We simplify things by keeping a single cached value of the last
-        // texture that was bound, instead of one per texture unit. This
-        // means that switching texture units could potentially mean we
-        // need a re-bind and corresponding parameter updates.
-        lastTextureUsed = GLuint(-1);
-    }
-}
-
-template<>
-GLuint QOpenGL2PaintEngineExPrivate::bindTexture(const GLuint &textureId)
-{
-    if (textureId != lastTextureUsed)
-        funcs.glBindTexture(GL_TEXTURE_2D, textureId);
-
-    return textureId;
-}
-
-template<>
-GLuint QOpenGL2PaintEngineExPrivate::bindTexture(const QImage &image)
-{
-    return QOpenGLTextureCache::cacheForContext(ctx)->bindTexture(ctx, image);
-}
-
-template<>
-GLuint QOpenGL2PaintEngineExPrivate::bindTexture(const QPixmap &pixmap)
-{
-    return QOpenGLTextureCache::cacheForContext(ctx)->bindTexture(ctx, pixmap);
-}
-
-template<>
-GLuint QOpenGL2PaintEngineExPrivate::bindTexture(const QGradient &gradient)
-{
-    // We apply global opacity in the fragment shaders, so we always pass 1.0
-    // for opacity to the cache.
-    GLuint textureId = QOpenGL2GradientCache::cacheForContext(ctx)->getBuffer(gradient, 1.0);
-
-    // QOpenGL2GradientCache::getBuffer() may bind and generate a new texture if it
-    // hasn't been cached yet, but will otherwise return an unbound texture id. To
-    // be sure that the texture is bound, we unfortunately have to bind again,
-    // which results in the initial generation of the texture doing two binds.
-    return bindTexture(textureId);
-}
-
-struct ImageWithBindOptions
-{
-    const QImage &image;
-    QOpenGLTextureUploader::BindOptions options;
-};
-
-template<>
-GLuint QOpenGL2PaintEngineExPrivate::bindTexture(const ImageWithBindOptions &imageWithOptions)
-{
-    return QOpenGLTextureCache::cacheForContext(ctx)->bindTexture(ctx, imageWithOptions.image, imageWithOptions.options);
-}
-
-inline static bool isPowerOfTwo(int x)
-{
-    // Assumption: x >= 1
-    return x == (x & -x);
-}
-
-void QOpenGL2PaintEngineExPrivate::updateBrushTexture()
-{
-    Q_Q(QOpenGL2PaintEngineEx);
-//     qDebug("QOpenGL2PaintEngineExPrivate::updateBrushTexture()");
-    Qt::BrushStyle style = currentBrush.style();
-
-    bool smoothPixmapTransform = q->state()->renderHints & QPainter::SmoothPixmapTransform;
-    GLenum filterMode = smoothPixmapTransform ? GL_LINEAR : GL_NEAREST;
-
-    if ( (style >= Qt::Dense1Pattern) && (style <= Qt::DiagCrossPattern) ) {
-        // Get the image data for the pattern
-        QImage textureImage = qt_imageForBrush(style, false);
-
-        updateTexture(QT_BRUSH_TEXTURE_UNIT, textureImage, GL_REPEAT, filterMode, ForceUpdate);
-    }
-    else if (style >= Qt::LinearGradientPattern && style <= Qt::ConicalGradientPattern) {
-        // Gradiant brush: All the gradiants use the same texture
-
-        const QGradient *gradient = currentBrush.gradient();
-
-        GLenum wrapMode = GL_CLAMP_TO_EDGE;
-        if (gradient->spread() == QGradient::RepeatSpread || gradient->type() == QGradient::ConicalGradient)
-            wrapMode = GL_REPEAT;
-        else if (gradient->spread() == QGradient::ReflectSpread)
-            wrapMode = GL_MIRRORED_REPEAT;
-
-        updateTexture(QT_BRUSH_TEXTURE_UNIT, *gradient, wrapMode, filterMode, ForceUpdate);
-    }
-    else if (style == Qt::TexturePattern) {
-        currentBrushImage = currentBrush.textureImage();
-
-        int max_texture_size = ctx->d_func()->maxTextureSize();
-        QSize newSize = currentBrushImage.size();
-        newSize = newSize.boundedTo(QSize(max_texture_size, max_texture_size));
-        if (!QOpenGLContext::currentContext()->functions()->hasOpenGLFeature(QOpenGLFunctions::NPOTTextureRepeat)) {
-            if (!isPowerOfTwo(newSize.width()) || !isPowerOfTwo(newSize.height())) {
-                newSize.setHeight(qNextPowerOfTwo(newSize.height() - 1));
-                newSize.setWidth(qNextPowerOfTwo(newSize.width() - 1));
-            }
-        }
-        if (currentBrushImage.size() != newSize)
-            currentBrushImage = currentBrushImage.scaled(newSize, Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
-
-        GLuint wrapMode = GL_REPEAT;
-
-        updateTexture(QT_BRUSH_TEXTURE_UNIT, currentBrushImage, wrapMode, filterMode, ForceUpdate);
-    }
-    brushTextureDirty = false;
-}
-
-
-void QOpenGL2PaintEngineExPrivate::updateBrushUniforms()
-{
-//     qDebug("QOpenGL2PaintEngineExPrivate::updateBrushUniforms()");
-    Qt::BrushStyle style = currentBrush.style();
-
-    if (style == Qt::NoBrush)
-        return;
-
-    QTransform brushQTransform = currentBrush.transform();
-
-    if (style == Qt::SolidPattern) {
-        QColor col = qt_premultiplyColor(currentBrush.color(), (GLfloat)q->state()->opacity);
-        shaderManager->currentProgram()->setUniformValue(location(QOpenGLEngineShaderManager::FragmentColor), col);
-    }
-    else {
-        // All other brushes have a transform and thus need the translation point:
-        QPointF translationPoint;
-
-        if (style <= Qt::DiagCrossPattern) {
-            QColor col = qt_premultiplyColor(currentBrush.color(), (GLfloat)q->state()->opacity);
-
-            shaderManager->currentProgram()->setUniformValue(location(QOpenGLEngineShaderManager::PatternColor), col);
-
-            QVector2D halfViewportSize(width*0.5, height*0.5);
-            shaderManager->currentProgram()->setUniformValue(location(QOpenGLEngineShaderManager::HalfViewportSize), halfViewportSize);
-        }
-        else if (style == Qt::LinearGradientPattern) {
-            const QLinearGradient *g = static_cast<const QLinearGradient *>(currentBrush.gradient());
-
-            QPointF realStart = g->start();
-            QPointF realFinal = g->finalStop();
-            translationPoint = realStart;
-
-            QPointF l = realFinal - realStart;
-
-            QVector3D linearData(
-                l.x(),
-                l.y(),
-                1.0f / (l.x() * l.x() + l.y() * l.y())
-            );
-
-            shaderManager->currentProgram()->setUniformValue(location(QOpenGLEngineShaderManager::LinearData), linearData);
-
-            QVector2D halfViewportSize(width*0.5, height*0.5);
-            shaderManager->currentProgram()->setUniformValue(location(QOpenGLEngineShaderManager::HalfViewportSize), halfViewportSize);
-        }
-        else if (style == Qt::ConicalGradientPattern) {
-            const QConicalGradient *g = static_cast<const QConicalGradient *>(currentBrush.gradient());
-            translationPoint   = g->center();
-
-            GLfloat angle = -qDegreesToRadians(g->angle());
-
-            shaderManager->currentProgram()->setUniformValue(location(QOpenGLEngineShaderManager::Angle), angle);
-
-            QVector2D halfViewportSize(width*0.5, height*0.5);
-            shaderManager->currentProgram()->setUniformValue(location(QOpenGLEngineShaderManager::HalfViewportSize), halfViewportSize);
-        }
-        else if (style == Qt::RadialGradientPattern) {
-            const QRadialGradient *g = static_cast<const QRadialGradient *>(currentBrush.gradient());
-            QPointF realCenter = g->center();
-            QPointF realFocal  = g->focalPoint();
-            qreal   realRadius = g->centerRadius() - g->focalRadius();
-            translationPoint   = realFocal;
-
-            QPointF fmp = realCenter - realFocal;
-            shaderManager->currentProgram()->setUniformValue(location(QOpenGLEngineShaderManager::Fmp), fmp);
-
-            GLfloat fmp2_m_radius2 = -fmp.x() * fmp.x() - fmp.y() * fmp.y() + realRadius*realRadius;
-            shaderManager->currentProgram()->setUniformValue(location(QOpenGLEngineShaderManager::Fmp2MRadius2), fmp2_m_radius2);
-            shaderManager->currentProgram()->setUniformValue(location(QOpenGLEngineShaderManager::Inverse2Fmp2MRadius2),
-                                                             GLfloat(1.0 / (2.0*fmp2_m_radius2)));
-            shaderManager->currentProgram()->setUniformValue(location(QOpenGLEngineShaderManager::SqrFr),
-                                                             GLfloat(g->focalRadius() * g->focalRadius()));
-            shaderManager->currentProgram()->setUniformValue(location(QOpenGLEngineShaderManager::BRadius),
-                                                             GLfloat(2 * (g->centerRadius() - g->focalRadius()) * g->focalRadius()),
-                                                             g->focalRadius(),
-                                                             g->centerRadius() - g->focalRadius());
-
-            QVector2D halfViewportSize(width*0.5, height*0.5);
-            shaderManager->currentProgram()->setUniformValue(location(QOpenGLEngineShaderManager::HalfViewportSize), halfViewportSize);
-        }
-        else if (style == Qt::TexturePattern) {
-            const QPixmap& texPixmap = currentBrush.texture();
-
-            if (qHasPixmapTexture(currentBrush) && currentBrush.texture().isQBitmap()) {
-                QColor col = qt_premultiplyColor(currentBrush.color(), (GLfloat)q->state()->opacity);
-                shaderManager->currentProgram()->setUniformValue(location(QOpenGLEngineShaderManager::PatternColor), col);
-            }
-
-            QSizeF invertedTextureSize(1.0 / texPixmap.width(), 1.0 / texPixmap.height());
-            shaderManager->currentProgram()->setUniformValue(location(QOpenGLEngineShaderManager::InvertedTextureSize), invertedTextureSize);
-
-            QVector2D halfViewportSize(width*0.5, height*0.5);
-            shaderManager->currentProgram()->setUniformValue(location(QOpenGLEngineShaderManager::HalfViewportSize), halfViewportSize);
-        }
-        else
-            qWarning("QOpenGL2PaintEngineEx: Unimplemented fill style");
-
-        const QPointF &brushOrigin = q->state()->brushOrigin;
-        QTransform matrix = q->state()->matrix;
-        matrix.translate(brushOrigin.x(), brushOrigin.y());
-
-        QTransform translate(1, 0, 0, 1, -translationPoint.x(), -translationPoint.y());
-        qreal m22 = -1;
-        qreal dy = height;
-        if (device->paintFlipped()) {
-            m22 = 1;
-            dy = 0;
-        }
-        QTransform gl_to_qt(1, 0, 0, m22, 0, dy);
-        QTransform inv_matrix = gl_to_qt * (brushQTransform * matrix).inverted() * translate;
-
-        shaderManager->currentProgram()->setUniformValue(location(QOpenGLEngineShaderManager::BrushTransform), inv_matrix);
-        shaderManager->currentProgram()->setUniformValue(location(QOpenGLEngineShaderManager::BrushTexture), QT_BRUSH_TEXTURE_UNIT);
-    }
-    brushUniformsDirty = false;
-}
-
-
-// This assumes the shader manager has already setup the correct shader program
-void QOpenGL2PaintEngineExPrivate::updateMatrix()
-{
-//     qDebug("QOpenGL2PaintEngineExPrivate::updateMatrix()");
-
-    const QTransform& transform = q->state()->matrix;
-
-    // The projection matrix converts from Qt's coordinate system to GL's coordinate system
-    //    * GL's viewport is 2x2, Qt's is width x height
-    //    * GL has +y -> -y going from bottom -> top, Qt is the other way round
-    //    * GL has [0,0] in the center, Qt has it in the top-left
-    //
-    // This results in the Projection matrix below, which is multiplied by the painter's
-    // transformation matrix, as shown below:
-    //
-    //                Projection Matrix                      Painter Transform
-    // ------------------------------------------------   ------------------------
-    // | 2.0 / width  |      0.0      |     -1.0      |   |  m11  |  m21  |  dx  |
-    // |     0.0      | -2.0 / height |      1.0      | * |  m12  |  m22  |  dy  |
-    // |     0.0      |      0.0      |      1.0      |   |  m13  |  m23  |  m33 |
-    // ------------------------------------------------   ------------------------
-    //
-    // NOTE: The resultant matrix is also transposed, as GL expects column-major matracies
-
-    const GLfloat wfactor = 2.0f / width;
-    GLfloat hfactor = -2.0f / height;
-
-    GLfloat dx = transform.dx();
-    GLfloat dy = transform.dy();
-
-    if (device->paintFlipped()) {
-        hfactor *= -1;
-        dy -= height;
-    }
-
-    // Non-integer translates can have strange effects for some rendering operations such as
-    // anti-aliased text rendering. In such cases, we snap the translate to the pixel grid.
-    if (snapToPixelGrid && transform.type() == QTransform::TxTranslate) {
-        // 0.50 needs to rounded down to 0.0 for consistency with raster engine:
-        dx = std::ceil(dx - 0.5f);
-        dy = std::ceil(dy - 0.5f);
-    }
-    pmvMatrix[0][0] = (wfactor * transform.m11())  - transform.m13();
-    pmvMatrix[1][0] = (wfactor * transform.m21())  - transform.m23();
-    pmvMatrix[2][0] = (wfactor * dx) - transform.m33();
-    pmvMatrix[0][1] = (hfactor * transform.m12())  + transform.m13();
-    pmvMatrix[1][1] = (hfactor * transform.m22())  + transform.m23();
-    pmvMatrix[2][1] = (hfactor * dy) + transform.m33();
-    pmvMatrix[0][2] = transform.m13();
-    pmvMatrix[1][2] = transform.m23();
-    pmvMatrix[2][2] = transform.m33();
-
-    // 1/10000 == 0.0001, so we have good enough res to cover curves
-    // that span the entire widget...
-    inverseScale = qMax(1 / qMax( qMax(qAbs(transform.m11()), qAbs(transform.m22())),
-                                  qMax(qAbs(transform.m12()), qAbs(transform.m21())) ),
-                        qreal(0.0001));
-
-    matrixDirty = false;
-    matrixUniformDirty = true;
-
-    // Set the PMV matrix attribute. As we use an attributes rather than uniforms, we only
-    // need to do this once for every matrix change and persists across all shader programs.
-    funcs.glVertexAttrib3fv(QT_PMV_MATRIX_1_ATTR, pmvMatrix[0]);
-    funcs.glVertexAttrib3fv(QT_PMV_MATRIX_2_ATTR, pmvMatrix[1]);
-    funcs.glVertexAttrib3fv(QT_PMV_MATRIX_3_ATTR, pmvMatrix[2]);
-
-    dasher.setInvScale(inverseScale);
-    stroker.setInvScale(inverseScale);
-}
-
-
-void QOpenGL2PaintEngineExPrivate::updateCompositionMode()
-{
-    // NOTE: The entire paint engine works on pre-multiplied data - which is why some of these
-    //       composition modes look odd.
-//     qDebug() << "QOpenGL2PaintEngineExPrivate::updateCompositionMode() - Setting GL composition mode for " << q->state()->composition_mode;
-    if (ctx->functions()->hasOpenGLFeature(QOpenGLFunctions::BlendEquationAdvanced)) {
-       if (q->state()->composition_mode <= QPainter::CompositionMode_Plus) {
-           funcs.glDisable(GL_BLEND_ADVANCED_COHERENT_KHR);
-           funcs.glBlendEquation(GL_FUNC_ADD);
-       } else {
-           funcs.glEnable(GL_BLEND_ADVANCED_COHERENT_KHR);
-       }
-       shaderManager->setCompositionMode(q->state()->composition_mode);
-    } else {
-        if (q->state()->composition_mode > QPainter::CompositionMode_Plus) {
-            qWarning("Unsupported composition mode");
-            compositionModeDirty = false;
-            return;
-        }
-    }
-    switch(q->state()->composition_mode) {
-    case QPainter::CompositionMode_SourceOver:
-        funcs.glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
-        break;
-    case QPainter::CompositionMode_DestinationOver:
-        funcs.glBlendFunc(GL_ONE_MINUS_DST_ALPHA, GL_ONE);
-        break;
-    case QPainter::CompositionMode_Clear:
-        funcs.glBlendFunc(GL_ZERO, GL_ZERO);
-        break;
-    case QPainter::CompositionMode_Source:
-        funcs.glBlendFunc(GL_ONE, GL_ZERO);
-        break;
-    case QPainter::CompositionMode_Destination:
-        funcs.glBlendFunc(GL_ZERO, GL_ONE);
-        break;
-    case QPainter::CompositionMode_SourceIn:
-        funcs.glBlendFunc(GL_DST_ALPHA, GL_ZERO);
-        break;
-    case QPainter::CompositionMode_DestinationIn:
-        funcs.glBlendFunc(GL_ZERO, GL_SRC_ALPHA);
-        break;
-    case QPainter::CompositionMode_SourceOut:
-        funcs.glBlendFunc(GL_ONE_MINUS_DST_ALPHA, GL_ZERO);
-        break;
-    case QPainter::CompositionMode_DestinationOut:
-        funcs.glBlendFunc(GL_ZERO, GL_ONE_MINUS_SRC_ALPHA);
-        break;
-    case QPainter::CompositionMode_SourceAtop:
-        funcs.glBlendFunc(GL_DST_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-        break;
-    case QPainter::CompositionMode_DestinationAtop:
-        funcs.glBlendFunc(GL_ONE_MINUS_DST_ALPHA, GL_SRC_ALPHA);
-        break;
-    case QPainter::CompositionMode_Xor:
-        funcs.glBlendFunc(GL_ONE_MINUS_DST_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-        break;
-    case QPainter::CompositionMode_Plus:
-        funcs.glBlendFunc(GL_ONE, GL_ONE);
-        break;
-    case QPainter::CompositionMode_Multiply:
-        funcs.glBlendEquation(GL_MULTIPLY_KHR);
-        break;
-    case QPainter::CompositionMode_Screen:
-        funcs.glBlendEquation(GL_SCREEN_KHR);
-        break;
-    case QPainter::CompositionMode_Overlay:
-        funcs.glBlendEquation(GL_OVERLAY_KHR);
-        break;
-    case QPainter::CompositionMode_Darken:
-        funcs.glBlendEquation(GL_DARKEN_KHR);
-        break;
-    case QPainter::CompositionMode_Lighten:
-        funcs.glBlendEquation(GL_LIGHTEN_KHR);
-        break;
-    case QPainter::CompositionMode_ColorDodge:
-        funcs.glBlendEquation(GL_COLORDODGE_KHR);
-        break;
-    case QPainter::CompositionMode_ColorBurn:
-        funcs.glBlendEquation(GL_COLORBURN_KHR);
-        break;
-    case QPainter::CompositionMode_HardLight:
-        funcs.glBlendEquation(GL_HARDLIGHT_KHR);
-        break;
-    case QPainter::CompositionMode_SoftLight:
-        funcs.glBlendEquation(GL_SOFTLIGHT_KHR);
-        break;
-    case QPainter::CompositionMode_Difference:
-        funcs.glBlendEquation(GL_DIFFERENCE_KHR);
-        break;
-    case QPainter::CompositionMode_Exclusion:
-        funcs.glBlendEquation(GL_EXCLUSION_KHR);
-        break;
-    default:
-        qWarning("Unsupported composition mode");
-        break;
-    }
-
-    compositionModeDirty = false;
-}
-
-static inline void setCoords(GLfloat *coords, const QOpenGLRect &rect)
-{
-    coords[0] = rect.left;
-    coords[1] = rect.top;
-    coords[2] = rect.right;
-    coords[3] = rect.top;
-    coords[4] = rect.right;
-    coords[5] = rect.bottom;
-    coords[6] = rect.left;
-    coords[7] = rect.bottom;
-}
-
-void QOpenGL2PaintEngineExPrivate::drawTexture(const QOpenGLRect& dest, const QOpenGLRect& src, const QSize &textureSize, bool opaque, bool pattern)
-{
-    // Setup for texture drawing
-    currentBrush = noBrush;
-
-    if (snapToPixelGrid) {
-        snapToPixelGrid = false;
-        matrixDirty = true;
-    }
-
-    if (prepareForDraw(opaque))
-        shaderManager->currentProgram()->setUniformValue(location(QOpenGLEngineShaderManager::ImageTexture), QT_IMAGE_TEXTURE_UNIT);
-
-    if (pattern) {
-        QColor col = qt_premultiplyColor(q->state()->pen.color(), (GLfloat)q->state()->opacity);
-        shaderManager->currentProgram()->setUniformValue(location(QOpenGLEngineShaderManager::PatternColor), col);
-    }
-
-    GLfloat dx = 1.0 / textureSize.width();
-    GLfloat dy = 1.0 / textureSize.height();
-
-    QOpenGLRect srcTextureRect(src.left*dx, src.top*dy, src.right*dx, src.bottom*dy);
-
-    setCoords(staticVertexCoordinateArray, dest);
-    setCoords(staticTextureCoordinateArray, srcTextureRect);
-
-    setVertexAttribArrayEnabled(QT_VERTEX_COORDS_ATTR, true);
-    setVertexAttribArrayEnabled(QT_TEXTURE_COORDS_ATTR, true);
-
-    uploadData(QT_VERTEX_COORDS_ATTR, staticVertexCoordinateArray, 8);
-    uploadData(QT_TEXTURE_COORDS_ATTR, staticTextureCoordinateArray, 8);
-
-    funcs.glDrawArrays(GL_TRIANGLE_FAN, 0, 4);
-}
-
-void QOpenGL2PaintEngineEx::beginNativePainting()
-{
-    Q_D(QOpenGL2PaintEngineEx);
-    ensureActive();
-    d->transferMode(BrushDrawingMode);
-
-    d->nativePaintingActive = true;
-
-    d->funcs.glUseProgram(0);
-
-    // Disable all the vertex attribute arrays:
-    for (int i = 0; i < QT_GL_VERTEX_ARRAY_TRACKED_COUNT; ++i)
-        d->funcs.glDisableVertexAttribArray(i);
-
-#if !defined(QT_OPENGL_ES_2) && !defined(QT_OPENGL_DYNAMIC)
-    Q_ASSERT(QOpenGLContext::currentContext());
-    const QOpenGLContext *ctx = d->ctx;
-    const QSurfaceFormat &fmt = d->device->context()->format();
-    if (fmt.majorVersion() < 3 || (fmt.majorVersion() == 3 && fmt.minorVersion() < 1)
-        || (fmt.majorVersion() == 3 && fmt.minorVersion() == 1 && ctx->hasExtension(QByteArrayLiteral("GL_ARB_compatibility")))
-        || fmt.profile() == QSurfaceFormat::CompatibilityProfile)
-    {
-        // be nice to people who mix OpenGL 1.x code with QPainter commands
-        // by setting modelview and projection matrices to mirror the GL 1
-        // paint engine
-        const QTransform& mtx = state()->matrix;
-
-        float mv_matrix[4][4] =
-            {
-                { float(mtx.m11()), float(mtx.m12()),     0, float(mtx.m13()) },
-                { float(mtx.m21()), float(mtx.m22()),     0, float(mtx.m23()) },
-                {                0,                0,     1,                0 },
-                {  float(mtx.dx()),  float(mtx.dy()),     0, float(mtx.m33()) }
-            };
-
-        const QSize sz = d->device->size();
-
-        glMatrixMode(GL_PROJECTION);
-        glLoadIdentity();
-        glOrtho(0, sz.width(), sz.height(), 0, -999999, 999999);
-
-        glMatrixMode(GL_MODELVIEW);
-        glLoadMatrixf(&mv_matrix[0][0]);
-    }
-#endif // QT_OPENGL_ES_2
-
-    d->resetGLState();
-
-    // We don't know what texture units and textures the native painting
-    // will activate and bind, so we can't assume anything when we return
-    // from the native painting.
-    d->lastTextureUnitUsed = QT_UNKNOWN_TEXTURE_UNIT;
-    d->lastTextureUsed = GLuint(-1);
-
-    d->dirtyStencilRegion = QRect(0, 0, d->width, d->height);
-
-    d->shaderManager->setDirty();
-
-    d->needsSync = true;
-}
-
-void QOpenGL2PaintEngineExPrivate::resetGLState()
-{
-    activateTextureUnit(QT_DEFAULT_TEXTURE_UNIT);
-
-    funcs.glDisable(GL_BLEND);
-    funcs.glDisable(GL_STENCIL_TEST);
-    funcs.glDisable(GL_DEPTH_TEST);
-    funcs.glDisable(GL_SCISSOR_TEST);
-    funcs.glDepthMask(true);
-    funcs.glDepthFunc(GL_LESS);
-    funcs.glClearDepthf(1);
-    funcs.glStencilMask(0xff);
-    funcs.glStencilOp(GL_KEEP, GL_KEEP, GL_KEEP);
-    funcs.glStencilFunc(GL_ALWAYS, 0, 0xff);
-    setVertexAttribArrayEnabled(QT_TEXTURE_COORDS_ATTR, false);
-    setVertexAttribArrayEnabled(QT_VERTEX_COORDS_ATTR, false);
-    setVertexAttribArrayEnabled(QT_OPACITY_ATTR, false);
-    if (!QOpenGLContext::currentContext()->isOpenGLES()) {
-        // gl_Color, corresponding to vertex attribute 3, may have been changed
-        float color[] = { 1.0f, 1.0f, 1.0f, 1.0f };
-        funcs.glVertexAttrib4fv(3, color);
-    }
-    if (vao.isCreated()) {
-        vao.release();
-        funcs.glBindBuffer(GL_ARRAY_BUFFER, 0);
-        funcs.glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0);
-    }
-}
-
-void QOpenGL2PaintEngineEx::endNativePainting()
-{
-    Q_D(QOpenGL2PaintEngineEx);
-    d->needsSync = true;
-    d->nativePaintingActive = false;
-}
-
-void QOpenGL2PaintEngineEx::invalidateState()
-{
-    Q_D(QOpenGL2PaintEngineEx);
-    d->needsSync = true;
-}
-
-bool QOpenGL2PaintEngineEx::isNativePaintingActive() const {
-    Q_D(const QOpenGL2PaintEngineEx);
-    return d->nativePaintingActive;
-}
-
-void QOpenGL2PaintEngineExPrivate::transferMode(EngineMode newMode)
-{
-    if (newMode == mode)
-        return;
-
-    if (newMode == TextDrawingMode) {
-        shaderManager->setHasComplexGeometry(true);
-    } else {
-        shaderManager->setHasComplexGeometry(false);
-    }
-
-    if (newMode == ImageDrawingMode) {
-        uploadData(QT_VERTEX_COORDS_ATTR, staticVertexCoordinateArray, 8);
-        uploadData(QT_TEXTURE_COORDS_ATTR, staticTextureCoordinateArray, 8);
-    }
-
-    if (newMode == ImageArrayDrawingMode || newMode == ImageOpacityArrayDrawingMode) {
-        uploadData(QT_VERTEX_COORDS_ATTR, (GLfloat*)vertexCoordinateArray.data(), vertexCoordinateArray.vertexCount() * 2);
-        uploadData(QT_TEXTURE_COORDS_ATTR, (GLfloat*)textureCoordinateArray.data(), textureCoordinateArray.vertexCount() * 2);
-
-        if (newMode == ImageOpacityArrayDrawingMode)
-            uploadData(QT_OPACITY_ATTR, (GLfloat*)opacityArray.data(), opacityArray.size());
-    }
-
-    // This needs to change when we implement high-quality anti-aliasing...
-    if (newMode != TextDrawingMode)
-        shaderManager->setMaskType(QOpenGLEngineShaderManager::NoMask);
-
-    mode = newMode;
-}
-
-struct QOpenGL2PEVectorPathCache
-{
-#ifdef QT_OPENGL_CACHE_AS_VBOS
-    GLuint vbo;
-    GLuint ibo;
-#else
-    float *vertices;
-    void *indices;
-#endif
-    int vertexCount;
-    int indexCount;
-    GLenum primitiveType;
-    qreal iscale;
-    QVertexIndexVector::Type indexType;
-};
-
-void QOpenGL2PaintEngineExPrivate::cleanupVectorPath(QPaintEngineEx *engine, void *data)
-{
-    QOpenGL2PEVectorPathCache *c = (QOpenGL2PEVectorPathCache *) data;
-#ifdef QT_OPENGL_CACHE_AS_VBOS
-    Q_ASSERT(engine->type() == QPaintEngine::OpenGL2);
-    static_cast<QOpenGL2PaintEngineEx *>(engine)->d_func()->unusedVBOSToClean << c->vbo;
-    if (c->ibo)
-        d->unusedIBOSToClean << c->ibo;
-#else
-    Q_UNUSED(engine);
-    free(c->vertices);
-    free(c->indices);
-#endif
-    delete c;
-}
-
-// Assumes everything is configured for the brush you want to use
-void QOpenGL2PaintEngineExPrivate::fill(const QVectorPath& path)
-{
-    transferMode(BrushDrawingMode);
-
-    if (snapToPixelGrid) {
-        snapToPixelGrid = false;
-        matrixDirty = true;
-    }
-
-    // Might need to call updateMatrix to re-calculate inverseScale
-    if (matrixDirty)
-        updateMatrix();
-
-    const bool supportsElementIndexUint = funcs.hasOpenGLExtension(QOpenGLExtensions::ElementIndexUint);
-
-    const QPointF* const points = reinterpret_cast<const QPointF*>(path.points());
-
-    // Check to see if there's any hints
-    if (path.shape() == QVectorPath::RectangleHint) {
-        QOpenGLRect rect(points[0].x(), points[0].y(), points[2].x(), points[2].y());
-        prepareForDraw(currentBrush.isOpaque());
-        composite(rect);
-    } else if (path.isConvex()) {
-
-        if (path.isCacheable()) {
-            QVectorPath::CacheEntry *data = path.lookupCacheData(q);
-            QOpenGL2PEVectorPathCache *cache;
-
-            bool updateCache = false;
-
-            if (data) {
-                cache = (QOpenGL2PEVectorPathCache *) data->data;
-                // Check if scale factor is exceeded and regenerate if so...
-                qreal scaleFactor = cache->iscale / inverseScale;
-                if (scaleFactor < 0.5 || scaleFactor > 2.0) {
-#ifdef QT_OPENGL_CACHE_AS_VBOS
-                    glDeleteBuffers(1, &cache->vbo);
-                    cache->vbo = 0;
-                    Q_ASSERT(cache->ibo == 0);
-#else
-                    free(cache->vertices);
-                    Q_ASSERT(cache->indices == nullptr);
-#endif
-                    updateCache = true;
-                }
-            } else {
-                cache = new QOpenGL2PEVectorPathCache;
-                data = const_cast<QVectorPath &>(path).addCacheData(q, cache, cleanupVectorPath);
-                updateCache = true;
-            }
-
-            // Flatten the path at the current scale factor and fill it into the cache struct.
-            if (updateCache) {
-                vertexCoordinateArray.clear();
-                vertexCoordinateArray.addPath(path, inverseScale, false);
-                int vertexCount = vertexCoordinateArray.vertexCount();
-                int floatSizeInBytes = vertexCount * 2 * sizeof(float);
-                cache->vertexCount = vertexCount;
-                cache->indexCount = 0;
-                cache->primitiveType = GL_TRIANGLE_FAN;
-                cache->iscale = inverseScale;
-#ifdef QT_OPENGL_CACHE_AS_VBOS
-                funcs.glGenBuffers(1, &cache->vbo);
-                funcs.glBindBuffer(GL_ARRAY_BUFFER, cache->vbo);
-                funcs.glBufferData(GL_ARRAY_BUFFER, floatSizeInBytes, vertexCoordinateArray.data(), GL_STATIC_DRAW);
-                cache->ibo = 0;
-#else
-                cache->vertices = (float *) malloc(floatSizeInBytes);
-                memcpy(cache->vertices, vertexCoordinateArray.data(), floatSizeInBytes);
-                cache->indices = nullptr;
-#endif
-            }
-
-            prepareForDraw(currentBrush.isOpaque());
-#ifdef QT_OPENGL_CACHE_AS_VBOS
-            funcs.glBindBuffer(GL_ARRAY_BUFFER, cache->vbo);
-            uploadData(QT_VERTEX_COORD_ATTR, 0, cache->vertexCount);
-            setVertexAttributePointer(QT_VERTEX_COORDS_ATTR, 0);
-#else
-            uploadData(QT_VERTEX_COORDS_ATTR, cache->vertices, cache->vertexCount * 2);
-#endif
-            funcs.glDrawArrays(cache->primitiveType, 0, cache->vertexCount);
-
-        } else {
-      //        printf(" - Marking path as cachable...\n");
-            // Tag it for later so that if the same path is drawn twice, it is assumed to be static and thus cachable
-            path.makeCacheable();
-            vertexCoordinateArray.clear();
-            vertexCoordinateArray.addPath(path, inverseScale, false);
-            prepareForDraw(currentBrush.isOpaque());
-            drawVertexArrays(vertexCoordinateArray, GL_TRIANGLE_FAN);
-        }
-
-    } else {
-        bool useCache = path.isCacheable();
-        if (useCache) {
-            QRectF bbox = path.controlPointRect();
-            // If the path doesn't fit within these limits, it is possible that the triangulation will fail.
-            useCache &= (bbox.left() > -0x8000 * inverseScale)
-                     && (bbox.right() < 0x8000 * inverseScale)
-                     && (bbox.top() > -0x8000 * inverseScale)
-                     && (bbox.bottom() < 0x8000 * inverseScale);
-        }
-
-        if (useCache) {
-            QVectorPath::CacheEntry *data = path.lookupCacheData(q);
-            QOpenGL2PEVectorPathCache *cache;
-
-            bool updateCache = false;
-
-            if (data) {
-                cache = (QOpenGL2PEVectorPathCache *) data->data;
-                // Check if scale factor is exceeded and regenerate if so...
-                qreal scaleFactor = cache->iscale / inverseScale;
-                if (scaleFactor < 0.5 || scaleFactor > 2.0) {
-#ifdef QT_OPENGL_CACHE_AS_VBOS
-                    glDeleteBuffers(1, &cache->vbo);
-                    glDeleteBuffers(1, &cache->ibo);
-#else
-                    free(cache->vertices);
-                    free(cache->indices);
-#endif
-                    updateCache = true;
-                }
-            } else {
-                cache = new QOpenGL2PEVectorPathCache;
-                data = const_cast<QVectorPath &>(path).addCacheData(q, cache, cleanupVectorPath);
-                updateCache = true;
-            }
-
-            // Flatten the path at the current scale factor and fill it into the cache struct.
-            if (updateCache) {
-                QTriangleSet polys = qTriangulate(path, QTransform().scale(1 / inverseScale, 1 / inverseScale), 1, supportsElementIndexUint);
-                cache->vertexCount = polys.vertices.size() / 2;
-                cache->indexCount = polys.indices.size();
-                cache->primitiveType = GL_TRIANGLES;
-                cache->iscale = inverseScale;
-                cache->indexType = polys.indices.type();
-#ifdef QT_OPENGL_CACHE_AS_VBOS
-                funcs.glGenBuffers(1, &cache->vbo);
-                funcs.glGenBuffers(1, &cache->ibo);
-                funcs.glBindBuffer(GL_ARRAY_BUFFER, cache->vbo);
-                funcs.glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, cache->ibo);
-
-                if (polys.indices.type() == QVertexIndexVector::UnsignedInt)
-                    funcs.glBufferData(GL_ELEMENT_ARRAY_BUFFER, sizeof(quint32) * polys.indices.size(), polys.indices.data(), GL_STATIC_DRAW);
-                else
-                    funcs.glBufferData(GL_ELEMENT_ARRAY_BUFFER, sizeof(quint16) * polys.indices.size(), polys.indices.data(), GL_STATIC_DRAW);
-
-                QVarLengthArray<float> vertices(polys.vertices.size());
-                for (int i = 0; i < polys.vertices.size(); ++i)
-                    vertices[i] = float(inverseScale * polys.vertices.at(i));
-                funcs.glBufferData(GL_ARRAY_BUFFER, sizeof(float) * vertices.size(), vertices.data(), GL_STATIC_DRAW);
-#else
-                cache->vertices = (float *) malloc(sizeof(float) * polys.vertices.size());
-                if (polys.indices.type() == QVertexIndexVector::UnsignedInt) {
-                    cache->indices = (quint32 *) malloc(sizeof(quint32) * polys.indices.size());
-                    memcpy(cache->indices, polys.indices.data(), sizeof(quint32) * polys.indices.size());
-                } else {
-                    cache->indices = (quint16 *) malloc(sizeof(quint16) * polys.indices.size());
-                    memcpy(cache->indices, polys.indices.data(), sizeof(quint16) * polys.indices.size());
-                }
-                for (int i = 0; i < polys.vertices.size(); ++i)
-                    cache->vertices[i] = float(inverseScale * polys.vertices.at(i));
-#endif
-            }
-
-            prepareForDraw(currentBrush.isOpaque());
-#ifdef QT_OPENGL_CACHE_AS_VBOS
-            funcs.glBindBuffer(GL_ARRAY_BUFFER, cache->vbo);
-            funcs.glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, cache->ibo);
-            uploadData(QT_VERTEX_COORDS_ATTR, 0, cache->vertexCount);
-            setVertexAttributePointer(QT_VERTEX_COORDS_ATTR, 0);
-            if (cache->indexType == QVertexIndexVector::UnsignedInt)
-                funcs.glDrawElements(cache->primitiveType, cache->indexCount, GL_UNSIGNED_INT, 0);
-            else
-                funcs.glDrawElements(cache->primitiveType, cache->indexCount, GL_UNSIGNED_SHORT, 0);
-            funcs.glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0);
-            funcs.glBindBuffer(GL_ARRAY_BUFFER, 0);
-#else
-            uploadData(QT_VERTEX_COORDS_ATTR, cache->vertices, cache->vertexCount * 2);
-            const GLenum indexValueType = cache->indexType == QVertexIndexVector::UnsignedInt ? GL_UNSIGNED_INT : GL_UNSIGNED_SHORT;
-            const bool useIndexVbo = uploadIndexData(cache->indices, indexValueType, cache->indexCount);
-            funcs.glDrawElements(cache->primitiveType, cache->indexCount, indexValueType, useIndexVbo ? nullptr : cache->indices);
-#endif
-
-        } else {
-      //        printf(" - Marking path as cachable...\n");
-            // Tag it for later so that if the same path is drawn twice, it is assumed to be static and thus cachable
-            path.makeCacheable();
-
-            if (device->context()->format().stencilBufferSize() <= 0) {
-                // If there is no stencil buffer, triangulate the path instead.
-
-                QRectF bbox = path.controlPointRect();
-                // If the path doesn't fit within these limits, it is possible that the triangulation will fail.
-                bool withinLimits = (bbox.left() > -0x8000 * inverseScale)
-                                  && (bbox.right() < 0x8000 * inverseScale)
-                                  && (bbox.top() > -0x8000 * inverseScale)
-                                  && (bbox.bottom() < 0x8000 * inverseScale);
-                if (withinLimits) {
-                    QTriangleSet polys = qTriangulate(path, QTransform().scale(1 / inverseScale, 1 / inverseScale), 1, supportsElementIndexUint);
-
-                    QVarLengthArray<float> vertices(polys.vertices.size());
-                    for (int i = 0; i < polys.vertices.size(); ++i)
-                        vertices[i] = float(inverseScale * polys.vertices.at(i));
-
-                    prepareForDraw(currentBrush.isOpaque());
-                    uploadData(QT_VERTEX_COORDS_ATTR, vertices.constData(), vertices.size());
-                    const GLenum indexValueType = funcs.hasOpenGLExtension(QOpenGLExtensions::ElementIndexUint) ? GL_UNSIGNED_INT : GL_UNSIGNED_SHORT;
-                    const bool useIndexVbo = uploadIndexData(polys.indices.data(), indexValueType, polys.indices.size());
-                    funcs.glDrawElements(GL_TRIANGLES, polys.indices.size(), indexValueType, useIndexVbo ? nullptr : polys.indices.data());
-                } else {
-                    // We can't handle big, concave painter paths with OpenGL without stencil buffer.
-                    qWarning("Painter path exceeds +/-32767 pixels.");
-                }
-                return;
-            }
-
-            // The path is too complicated & needs the stencil technique
-            vertexCoordinateArray.clear();
-            vertexCoordinateArray.addPath(path, inverseScale, false);
-
-            fillStencilWithVertexArray(vertexCoordinateArray, path.hasWindingFill());
-
-            funcs.glStencilMask(0xff);
-            funcs.glStencilOp(GL_KEEP, GL_REPLACE, GL_REPLACE);
-
-            if (q->state()->clipTestEnabled) {
-                // Pass when high bit is set, replace stencil value with current clip
-                funcs.glStencilFunc(GL_NOTEQUAL, q->state()->currentClip, GL_STENCIL_HIGH_BIT);
-            } else if (path.hasWindingFill()) {
-                // Pass when any bit is set, replace stencil value with 0
-                funcs.glStencilFunc(GL_NOTEQUAL, 0, 0xff);
-            } else {
-                // Pass when high bit is set, replace stencil value with 0
-                funcs.glStencilFunc(GL_NOTEQUAL, 0, GL_STENCIL_HIGH_BIT);
-            }
-            prepareForDraw(currentBrush.isOpaque());
-
-            // Stencil the brush onto the dest buffer
-            composite(vertexCoordinateArray.boundingRect());
-            funcs.glStencilMask(0);
-            updateClipScissorTest();
-        }
-    }
-}
-
-
-void QOpenGL2PaintEngineExPrivate::fillStencilWithVertexArray(const float *data,
-                                                          int count,
-                                                          int *stops,
-                                                          int stopCount,
-                                                          const QOpenGLRect &bounds,
-                                                          StencilFillMode mode)
-{
-    Q_ASSERT(count || stops);
-
-//     qDebug("QOpenGL2PaintEngineExPrivate::fillStencilWithVertexArray()");
-    funcs.glStencilMask(0xff); // Enable stencil writes
-
-    if (dirtyStencilRegion.intersects(currentScissorBounds)) {
-        const QRegion clearRegion = dirtyStencilRegion.intersected(currentScissorBounds);
-        funcs.glClearStencil(0); // Clear to zero
-        for (const QRect &rect : clearRegion) {
-#ifndef QT_GL_NO_SCISSOR_TEST
-            setScissor(rect);
-#endif
-            funcs.glClear(GL_STENCIL_BUFFER_BIT);
-        }
-
-        dirtyStencilRegion -= currentScissorBounds;
-
-#ifndef QT_GL_NO_SCISSOR_TEST
-        updateClipScissorTest();
-#endif
-    }
-
-    funcs.glColorMask(GL_FALSE, GL_FALSE, GL_FALSE, GL_FALSE); // Disable color writes
-    useSimpleShader();
-    funcs.glEnable(GL_STENCIL_TEST); // For some reason, this has to happen _after_ the simple shader is use()'d
-
-    if (mode == WindingFillMode) {
-        Q_ASSERT(stops && !count);
-        if (q->state()->clipTestEnabled) {
-            // Flatten clip values higher than current clip, and set high bit to match current clip
-            funcs.glStencilFunc(GL_LEQUAL, GL_STENCIL_HIGH_BIT | q->state()->currentClip, ~GL_STENCIL_HIGH_BIT);
-            funcs.glStencilOp(GL_KEEP, GL_REPLACE, GL_REPLACE);
-            composite(bounds);
-
-            funcs.glStencilFunc(GL_EQUAL, GL_STENCIL_HIGH_BIT, GL_STENCIL_HIGH_BIT);
-        } else if (!stencilClean) {
-            // Clear stencil buffer within bounding rect
-            funcs.glStencilFunc(GL_ALWAYS, 0, 0xff);
-            funcs.glStencilOp(GL_ZERO, GL_ZERO, GL_ZERO);
-            composite(bounds);
-        }
-
-        // Inc. for front-facing triangle
-        funcs.glStencilOpSeparate(GL_FRONT, GL_KEEP, GL_INCR_WRAP, GL_INCR_WRAP);
-        // Dec. for back-facing "holes"
-        funcs.glStencilOpSeparate(GL_BACK, GL_KEEP, GL_DECR_WRAP, GL_DECR_WRAP);
-        funcs.glStencilMask(~GL_STENCIL_HIGH_BIT);
-        drawVertexArrays(data, stops, stopCount, GL_TRIANGLE_FAN);
-
-        if (q->state()->clipTestEnabled) {
-            // Clear high bit of stencil outside of path
-            funcs.glStencilFunc(GL_EQUAL, q->state()->currentClip, ~GL_STENCIL_HIGH_BIT);
-            funcs.glStencilOp(GL_KEEP, GL_REPLACE, GL_REPLACE);
-            funcs.glStencilMask(GL_STENCIL_HIGH_BIT);
-            composite(bounds);
-        }
-    } else if (mode == OddEvenFillMode) {
-        funcs.glStencilMask(GL_STENCIL_HIGH_BIT);
-        funcs.glStencilOp(GL_KEEP, GL_KEEP, GL_INVERT); // Simply invert the stencil bit
-        drawVertexArrays(data, stops, stopCount, GL_TRIANGLE_FAN);
-
-    } else { // TriStripStrokeFillMode
-        Q_ASSERT(count && !stops); // tristrips generated directly, so no vertexArray or stops
-        funcs.glStencilMask(GL_STENCIL_HIGH_BIT);
-#if 0
-        funcs.glStencilOp(GL_KEEP, GL_KEEP, GL_INVERT); // Simply invert the stencil bit
-        setVertexAttributePointer(QT_VERTEX_COORDS_ATTR, data);
-        funcs.glDrawArrays(GL_TRIANGLE_STRIP, 0, count);
-#else
-
-        funcs.glStencilOp(GL_KEEP, GL_KEEP, GL_REPLACE);
-        if (q->state()->clipTestEnabled) {
-            funcs.glStencilFunc(GL_LEQUAL, q->state()->currentClip | GL_STENCIL_HIGH_BIT,
-                                ~GL_STENCIL_HIGH_BIT);
-        } else {
-            funcs.glStencilFunc(GL_ALWAYS, GL_STENCIL_HIGH_BIT, 0xff);
-        }
-
-        uploadData(QT_VERTEX_COORDS_ATTR, data, count * 2);
-        funcs.glDrawArrays(GL_TRIANGLE_STRIP, 0, count);
-#endif
-    }
-
-    // Enable color writes & disable stencil writes
-    funcs.glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
-}
-
-/*
-    If the maximum value in the stencil buffer is GL_STENCIL_HIGH_BIT - 1,
-    restore the stencil buffer to a pristine state.  The current clip region
-    is set to 1, and the rest to 0.
-*/
-void QOpenGL2PaintEngineExPrivate::resetClipIfNeeded()
-{
-    if (maxClip != (GL_STENCIL_HIGH_BIT - 1))
-        return;
-
-    Q_Q(QOpenGL2PaintEngineEx);
-
-    useSimpleShader();
-    funcs.glEnable(GL_STENCIL_TEST);
-    funcs.glColorMask(GL_FALSE, GL_FALSE, GL_FALSE, GL_FALSE);
-
-    QRectF bounds = q->state()->matrix.inverted().mapRect(QRectF(0, 0, width, height));
-    QOpenGLRect rect(bounds.left(), bounds.top(), bounds.right(), bounds.bottom());
-
-    // Set high bit on clip region
-    funcs.glStencilFunc(GL_LEQUAL, q->state()->currentClip, 0xff);
-    funcs.glStencilOp(GL_KEEP, GL_INVERT, GL_INVERT);
-    funcs.glStencilMask(GL_STENCIL_HIGH_BIT);
-    composite(rect);
-
-    // Reset clipping to 1 and everything else to zero
-    funcs.glStencilFunc(GL_NOTEQUAL, 0x01, GL_STENCIL_HIGH_BIT);
-    funcs.glStencilOp(GL_ZERO, GL_REPLACE, GL_REPLACE);
-    funcs.glStencilMask(0xff);
-    composite(rect);
-
-    q->state()->currentClip = 1;
-    q->state()->canRestoreClip = false;
-
-    maxClip = 1;
-
-    funcs.glStencilMask(0x0);
-    funcs.glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
-}
-
-bool QOpenGL2PaintEngineExPrivate::prepareForCachedGlyphDraw(const QFontEngineGlyphCache &cache)
-{
-    Q_Q(QOpenGL2PaintEngineEx);
-
-    Q_ASSERT(cache.transform().type() <= QTransform::TxScale);
-
-    QTransform &transform = q->state()->matrix;
-    transform.scale(1.0 / cache.transform().m11(), 1.0 / cache.transform().m22());
-    bool ret = prepareForDraw(false);
-    transform.scale(cache.transform().m11(), cache.transform().m22());
-
-    return ret;
-}
-
-bool QOpenGL2PaintEngineExPrivate::prepareForDraw(bool srcPixelsAreOpaque)
-{
-    if (brushTextureDirty && (mode == TextDrawingMode || mode == BrushDrawingMode))
-        updateBrushTexture();
-
-    if (compositionModeDirty)
-        updateCompositionMode();
-
-    if (matrixDirty)
-        updateMatrix();
-
-    const bool stateHasOpacity = q->state()->opacity < 0.99f;
-    if (q->state()->composition_mode == QPainter::CompositionMode_Source
-        || (q->state()->composition_mode == QPainter::CompositionMode_SourceOver
-            && srcPixelsAreOpaque && !stateHasOpacity))
-    {
-        funcs.glDisable(GL_BLEND);
-    } else {
-        funcs.glEnable(GL_BLEND);
-    }
-
-    QOpenGLEngineShaderManager::OpacityMode opacityMode;
-    if (mode == ImageOpacityArrayDrawingMode) {
-        opacityMode = QOpenGLEngineShaderManager::AttributeOpacity;
-    } else {
-        opacityMode = stateHasOpacity ? QOpenGLEngineShaderManager::UniformOpacity
-                                      : QOpenGLEngineShaderManager::NoOpacity;
-        if (stateHasOpacity && (mode != ImageDrawingMode && mode != ImageArrayDrawingMode)) {
-            // Using a brush
-            bool brushIsPattern = (currentBrush.style() >= Qt::Dense1Pattern) &&
-                                  (currentBrush.style() <= Qt::DiagCrossPattern);
-
-            if ((currentBrush.style() == Qt::SolidPattern) || brushIsPattern)
-                opacityMode = QOpenGLEngineShaderManager::NoOpacity; // Global opacity handled by srcPixel shader
-        }
-    }
-    shaderManager->setOpacityMode(opacityMode);
-
-    bool changed = shaderManager->useCorrectShaderProg();
-    // If the shader program needs changing, we change it and mark all uniforms as dirty
-    if (changed) {
-        // The shader program has changed so mark all uniforms as dirty:
-        brushUniformsDirty = true;
-        opacityUniformDirty = true;
-        matrixUniformDirty = true;
-    }
-
-    if (brushUniformsDirty && (mode == TextDrawingMode || mode == BrushDrawingMode))
-        updateBrushUniforms();
-
-    if (opacityMode == QOpenGLEngineShaderManager::UniformOpacity && opacityUniformDirty) {
-        shaderManager->currentProgram()->setUniformValue(location(QOpenGLEngineShaderManager::GlobalOpacity), (GLfloat)q->state()->opacity);
-        opacityUniformDirty = false;
-    }
-
-    if (matrixUniformDirty && shaderManager->hasComplexGeometry()) {
-        shaderManager->currentProgram()->setUniformValue(location(QOpenGLEngineShaderManager::Matrix),
-                                                         pmvMatrix);
-        matrixUniformDirty = false;
-    }
-
-    return changed;
-}
-
-void QOpenGL2PaintEngineExPrivate::composite(const QOpenGLRect& boundingRect)
-{
-    setCoords(staticVertexCoordinateArray, boundingRect);
-
-    uploadData(QT_VERTEX_COORDS_ATTR, staticVertexCoordinateArray, 8);
-    funcs.glDrawArrays(GL_TRIANGLE_FAN, 0, 4);
-}
-
-// Draws the vertex array as a set of <vertexArrayStops.size()> triangle fans.
-void QOpenGL2PaintEngineExPrivate::drawVertexArrays(const float *data, int *stops, int stopCount,
-                                                GLenum primitive)
-{
-    // Now setup the pointer to the vertex array:
-    uploadData(QT_VERTEX_COORDS_ATTR, data, stops[stopCount-1] * 2);
-
-    int previousStop = 0;
-    for (int i=0; i<stopCount; ++i) {
-        int stop = stops[i];
-
-        funcs.glDrawArrays(primitive, previousStop, stop - previousStop);
-        previousStop = stop;
-    }
-}
-
-/////////////////////////////////// Public Methods //////////////////////////////////////////
-
-QOpenGL2PaintEngineEx::QOpenGL2PaintEngineEx()
-    : QPaintEngineEx(*(new QOpenGL2PaintEngineExPrivate(this)))
-{
-    gccaps &= ~QPaintEngine::RasterOpModes;
-}
-
-QOpenGL2PaintEngineEx::~QOpenGL2PaintEngineEx()
-{
-}
-
-void QOpenGL2PaintEngineEx::fill(const QVectorPath &path, const QBrush &brush)
-{
-    Q_D(QOpenGL2PaintEngineEx);
-
-    if (qbrush_style(brush) == Qt::NoBrush)
-        return;
-    ensureActive();
-    d->setBrush(brush);
-    d->fill(path);
-}
-
-Q_GUI_EXPORT bool qt_scaleForTransform(const QTransform &transform, qreal *scale); // qtransform.cpp
-
-
-void QOpenGL2PaintEngineEx::stroke(const QVectorPath &path, const QPen &pen)
-{
-    Q_D(QOpenGL2PaintEngineEx);
-
-    const QBrush &penBrush = qpen_brush(pen);
-    if (qpen_style(pen) == Qt::NoPen || qbrush_style(penBrush) == Qt::NoBrush)
-        return;
-
-    QOpenGL2PaintEngineState *s = state();
-    if (qt_pen_is_cosmetic(pen, state()->renderHints) && !qt_scaleForTransform(s->transform(), nullptr)) {
-        // QTriangulatingStroker class is not meant to support cosmetically sheared strokes.
-        QPaintEngineEx::stroke(path, pen);
-        return;
-    }
-
-    ensureActive();
-    d->setBrush(penBrush);
-    d->stroke(path, pen);
-}
-
-void QOpenGL2PaintEngineExPrivate::stroke(const QVectorPath &path, const QPen &pen)
-{
-    const QOpenGL2PaintEngineState *s = q->state();
-    if (snapToPixelGrid) {
-        snapToPixelGrid = false;
-        matrixDirty = true;
-    }
-
-    const Qt::PenStyle penStyle = qpen_style(pen);
-    const QBrush &penBrush = qpen_brush(pen);
-    const bool opaque = penBrush.isOpaque() && s->opacity > 0.99;
-
-    transferMode(BrushDrawingMode);
-
-    // updateMatrix() is responsible for setting the inverse scale on
-    // the strokers, so we need to call it here and not wait for
-    // prepareForDraw() down below.
-    updateMatrix();
-
-    QRectF clip = q->state()->matrix.inverted().mapRect(q->state()->clipEnabled
-                                                        ? q->state()->rectangleClip
-                                                        : QRectF(0, 0, width, height));
-
-    if (penStyle == Qt::SolidLine) {
-        stroker.process(path, pen, clip, s->renderHints);
-
-    } else { // Some sort of dash
-        dasher.process(path, pen, clip, s->renderHints);
-
-        QVectorPath dashStroke(dasher.points(),
-                               dasher.elementCount(),
-                               dasher.elementTypes());
-        stroker.process(dashStroke, pen, clip, s->renderHints);
-    }
-
-    if (!stroker.vertexCount())
-        return;
-
-    if (opaque) {
-        prepareForDraw(opaque);
-
-        uploadData(QT_VERTEX_COORDS_ATTR, stroker.vertices(), stroker.vertexCount());
-        funcs.glDrawArrays(GL_TRIANGLE_STRIP, 0, stroker.vertexCount() / 2);
-    } else {
-        qreal width = qpen_widthf(pen) / 2;
-        if (width == 0)
-            width = 0.5;
-        qreal extra = pen.joinStyle() == Qt::MiterJoin
-                      ? qMax(pen.miterLimit() * width, width)
-                      : width;
-
-        if (qt_pen_is_cosmetic(pen, q->state()->renderHints))
-            extra = extra * inverseScale;
-
-        QRectF bounds = path.controlPointRect().adjusted(-extra, -extra, extra, extra);
-
-        fillStencilWithVertexArray(stroker.vertices(), stroker.vertexCount() / 2,
-                                      nullptr, 0, bounds, QOpenGL2PaintEngineExPrivate::TriStripStrokeFillMode);
-
-        funcs.glStencilOp(GL_KEEP, GL_REPLACE, GL_REPLACE);
-
-        // Pass when any bit is set, replace stencil value with 0
-        funcs.glStencilFunc(GL_NOTEQUAL, 0, GL_STENCIL_HIGH_BIT);
-        prepareForDraw(false);
-
-        // Stencil the brush onto the dest buffer
-        composite(bounds);
-
-        funcs.glStencilMask(0);
-
-        updateClipScissorTest();
-    }
-}
-
-void QOpenGL2PaintEngineEx::penChanged() { }
-void QOpenGL2PaintEngineEx::brushChanged() { }
-void QOpenGL2PaintEngineEx::brushOriginChanged() { }
-
-void QOpenGL2PaintEngineEx::opacityChanged()
-{
-//    qDebug("QOpenGL2PaintEngineEx::opacityChanged()");
-    Q_D(QOpenGL2PaintEngineEx);
-    state()->opacityChanged = true;
-
-    Q_ASSERT(d->shaderManager);
-    d->brushUniformsDirty = true;
-    d->opacityUniformDirty = true;
-}
-
-void QOpenGL2PaintEngineEx::compositionModeChanged()
-{
-//     qDebug("QOpenGL2PaintEngineEx::compositionModeChanged()");
-    Q_D(QOpenGL2PaintEngineEx);
-    state()->compositionModeChanged = true;
-    d->compositionModeDirty = true;
-}
-
-void QOpenGL2PaintEngineEx::renderHintsChanged()
-{
-    state()->renderHintsChanged = true;
-
-#ifndef QT_OPENGL_ES_2
-    if (!QOpenGLContext::currentContext()->isOpenGLES()) {
-        Q_D(QOpenGL2PaintEngineEx);
-QT_WARNING_PUSH
-QT_WARNING_DISABLE_DEPRECATED
-        if ((state()->renderHints & QPainter::Antialiasing)
-#if QT_DEPRECATED_SINCE(5, 14)
-            || (state()->renderHints & QPainter::HighQualityAntialiasing)
-#endif
-            )
-            d->funcs.glEnable(GL_MULTISAMPLE);
-        else
-            d->funcs.glDisable(GL_MULTISAMPLE);
-QT_WARNING_POP
-    }
-#endif // QT_OPENGL_ES_2
-
-    Q_D(QOpenGL2PaintEngineEx);
-
-    // This is a somewhat sneaky way of conceptually making the next call to
-    // updateTexture() use FoceUpdate for the TextureUpdateMode. We need this
-    // as new render hints may require updating the filter mode.
-    d->lastTextureUsed = GLuint(-1);
-
-    d->brushTextureDirty = true;
-//    qDebug("QOpenGL2PaintEngineEx::renderHintsChanged() not implemented!");
-}
-
-void QOpenGL2PaintEngineEx::transformChanged()
-{
-    Q_D(QOpenGL2PaintEngineEx);
-    d->matrixDirty = true;
-    state()->matrixChanged = true;
-}
-
-
-static const QRectF scaleRect(const QRectF &r, qreal sx, qreal sy)
-{
-    return QRectF(r.x() * sx, r.y() * sy, r.width() * sx, r.height() * sy);
-}
-
-void QOpenGL2PaintEngineEx::drawPixmap(const QRectF& dest, const QPixmap & pixmap, const QRectF & src)
-{
-    Q_D(QOpenGL2PaintEngineEx);
-    QOpenGLContext *ctx = d->ctx;
-
-    // Draw pixmaps that are really images as images since drawImage has
-    // better handling of non-default image formats.
-    if (pixmap.paintEngine()->type() == QPaintEngine::Raster && !pixmap.isQBitmap())
-        return drawImage(dest, pixmap.toImage(), src);
-
-    int max_texture_size = ctx->d_func()->maxTextureSize();
-    if (pixmap.width() > max_texture_size || pixmap.height() > max_texture_size) {
-        QPixmap scaled = pixmap.scaled(max_texture_size, max_texture_size, Qt::KeepAspectRatio);
-
-        const qreal sx = scaled.width() / qreal(pixmap.width());
-        const qreal sy = scaled.height() / qreal(pixmap.height());
-
-        drawPixmap(dest, scaled, scaleRect(src, sx, sy));
-        return;
-    }
-
-    ensureActive();
-    d->transferMode(ImageDrawingMode);
-
-    GLenum filterMode = state()->renderHints & QPainter::SmoothPixmapTransform ? GL_LINEAR : GL_NEAREST;
-    d->updateTexture(QT_IMAGE_TEXTURE_UNIT, pixmap, GL_CLAMP_TO_EDGE, filterMode);
-
-    bool isBitmap = pixmap.isQBitmap();
-    bool isOpaque = !isBitmap && !pixmap.hasAlpha();
-
-    d->shaderManager->setSrcPixelType(isBitmap ? QOpenGLEngineShaderManager::PatternSrc : QOpenGLEngineShaderManager::ImageSrc);
-
-    QOpenGLRect srcRect(src.left(), src.top(), src.right(), src.bottom());
-    d->drawTexture(dest, srcRect, pixmap.size(), isOpaque, isBitmap);
-}
-
-void QOpenGL2PaintEngineEx::drawImage(const QRectF& dest, const QImage& image, const QRectF& src,
-                        Qt::ImageConversionFlags)
-{
-    Q_D(QOpenGL2PaintEngineEx);
-    QOpenGLContext *ctx = d->ctx;
-
-    int max_texture_size = ctx->d_func()->maxTextureSize();
-    if (image.width() > max_texture_size || image.height() > max_texture_size) {
-        QImage scaled = image.scaled(max_texture_size, max_texture_size, Qt::KeepAspectRatio);
-
-        const qreal sx = scaled.width() / qreal(image.width());
-        const qreal sy = scaled.height() / qreal(image.height());
-
-        drawImage(dest, scaled, scaleRect(src, sx, sy));
-        return;
-    }
-
-    ensureActive();
-    d->transferMode(ImageDrawingMode);
-
-    QOpenGLTextureUploader::BindOptions bindOption = QOpenGLTextureUploader::PremultipliedAlphaBindOption;
-    // Use specialized bind for formats we have specialized shaders for.
-    switch (image.format()) {
-    case QImage::Format_RGBA8888:
-    case QImage::Format_ARGB32:
-    case QImage::Format_RGBA64:
-        d->shaderManager->setSrcPixelType(QOpenGLEngineShaderManager::NonPremultipliedImageSrc);
-        bindOption = { };
-        break;
-    case QImage::Format_Alpha8:
-        if (ctx->functions()->hasOpenGLFeature(QOpenGLFunctions::TextureRGFormats)) {
-            d->shaderManager->setSrcPixelType(QOpenGLEngineShaderManager::AlphaImageSrc);
-            bindOption = QOpenGLTextureUploader::UseRedForAlphaAndLuminanceBindOption;
-        } else
-            d->shaderManager->setSrcPixelType(QOpenGLEngineShaderManager::ImageSrc);
-        break;
-    case QImage::Format_Grayscale8:
-    case QImage::Format_Grayscale16:
-        if (ctx->functions()->hasOpenGLFeature(QOpenGLFunctions::TextureRGFormats)) {
-            d->shaderManager->setSrcPixelType(QOpenGLEngineShaderManager::GrayscaleImageSrc);
-            bindOption = QOpenGLTextureUploader::UseRedForAlphaAndLuminanceBindOption;
-        } else
-            d->shaderManager->setSrcPixelType(QOpenGLEngineShaderManager::ImageSrc);
-        break;
-    default:
-        d->shaderManager->setSrcPixelType(QOpenGLEngineShaderManager::ImageSrc);
-        break;
-    }
-
-    ImageWithBindOptions imageWithOptions = { image, bindOption };
-    GLenum filterMode = state()->renderHints & QPainter::SmoothPixmapTransform ? GL_LINEAR : GL_NEAREST;
-    d->updateTexture(QT_IMAGE_TEXTURE_UNIT, imageWithOptions, GL_CLAMP_TO_EDGE, filterMode);
-
-    d->drawTexture(dest, src, image.size(), !image.hasAlphaChannel());
-}
-
-void QOpenGL2PaintEngineEx::drawStaticTextItem(QStaticTextItem *textItem)
-{
-    Q_D(QOpenGL2PaintEngineEx);
-
-    ensureActive();
-
-    QPainterState *s = state();
-
-    QFontEngine *fontEngine = textItem->fontEngine();
-    if (shouldDrawCachedGlyphs(fontEngine, s->matrix)) {
-        QFontEngine::GlyphFormat glyphFormat = fontEngine->glyphFormat != QFontEngine::Format_None
-                                                ? fontEngine->glyphFormat : d->glyphCacheFormat;
-        if (glyphFormat == QFontEngine::Format_A32) {
-            if (d->device->context()->format().alphaBufferSize() > 0 || s->matrix.type() > QTransform::TxTranslate
-                || (s->composition_mode != QPainter::CompositionMode_Source
-                && s->composition_mode != QPainter::CompositionMode_SourceOver))
-            {
-                glyphFormat = QFontEngine::Format_A8;
-            }
-        }
-
-        d->drawCachedGlyphs(glyphFormat, textItem);
-    } else {
-        QPaintEngineEx::drawStaticTextItem(textItem);
-    }
-}
-
-bool QOpenGL2PaintEngineEx::drawTexture(const QRectF &dest, GLuint textureId, const QSize &size, const QRectF &src)
-{
-    Q_D(QOpenGL2PaintEngineEx);
-    if (!d->shaderManager)
-        return false;
-
-    ensureActive();
-    d->transferMode(ImageDrawingMode);
-
-    GLenum filterMode = state()->renderHints & QPainter::SmoothPixmapTransform ? GL_LINEAR : GL_NEAREST;
-    d->updateTexture(QT_IMAGE_TEXTURE_UNIT, textureId, GL_CLAMP_TO_EDGE, filterMode);
-
-    d->shaderManager->setSrcPixelType(QOpenGLEngineShaderManager::ImageSrc);
-
-    QOpenGLRect srcRect(src.left(), src.bottom(), src.right(), src.top());
-    d->drawTexture(dest, srcRect, size, false);
-
-    return true;
-}
-
-void QOpenGL2PaintEngineEx::drawTextItem(const QPointF &p, const QTextItem &textItem)
-{
-    Q_D(QOpenGL2PaintEngineEx);
-
-    ensureActive();
-    QOpenGL2PaintEngineState *s = state();
-
-    const QTextItemInt &ti = static_cast<const QTextItemInt &>(textItem);
-
-    QTransform::TransformationType txtype = s->matrix.type();
-
-    QFontEngine::GlyphFormat glyphFormat = ti.fontEngine->glyphFormat != QFontEngine::Format_None
-                                                ? ti.fontEngine->glyphFormat : d->glyphCacheFormat;
-
-    if (glyphFormat == QFontEngine::Format_A32) {
-        if (d->device->context()->format().alphaBufferSize() > 0 || txtype > QTransform::TxTranslate
-            || (state()->composition_mode != QPainter::CompositionMode_Source
-            && state()->composition_mode != QPainter::CompositionMode_SourceOver))
-        {
-            glyphFormat = QFontEngine::Format_A8;
-        }
-    }
-
-    if (shouldDrawCachedGlyphs(ti.fontEngine, s->matrix)) {
-        QVarLengthArray<QFixedPoint> positions;
-        QVarLengthArray<glyph_t> glyphs;
-        QTransform matrix = QTransform::fromTranslate(p.x(), p.y());
-        ti.fontEngine->getGlyphPositions(ti.glyphs, matrix, ti.flags, glyphs, positions);
-
-        {
-            QStaticTextItem staticTextItem;
-            staticTextItem.setFontEngine(ti.fontEngine);
-            staticTextItem.glyphs = glyphs.data();
-            staticTextItem.numGlyphs = glyphs.size();
-            staticTextItem.glyphPositions = positions.data();
-
-            d->drawCachedGlyphs(glyphFormat, &staticTextItem);
-        }
-        return;
-    }
-
-    QPaintEngineEx::drawTextItem(p, ti);
-}
-
-namespace {
-
-    class QOpenGLStaticTextUserData: public QStaticTextUserData
-    {
-    public:
-        QOpenGLStaticTextUserData()
-            : QStaticTextUserData(OpenGLUserData), cacheSize(0, 0), cacheSerialNumber(0)
-        {
-        }
-
-        ~QOpenGLStaticTextUserData()
-        {
-        }
-
-        QSize cacheSize;
-        QOpenGL2PEXVertexArray vertexCoordinateArray;
-        QOpenGL2PEXVertexArray textureCoordinateArray;
-        QFontEngine::GlyphFormat glyphFormat;
-        int cacheSerialNumber;
-    };
-
-}
-
-
-// #define QT_OPENGL_DRAWCACHEDGLYPHS_INDEX_ARRAY_VBO
-
-bool QOpenGL2PaintEngineEx::shouldDrawCachedGlyphs(QFontEngine *fontEngine, const QTransform &t) const
-{
-    // The paint engine does not support projected cached glyph drawing
-    if (t.type() == QTransform::TxProject)
-        return false;
-
-    // The font engine might not support filling the glyph cache
-    // with the given transform applied, in which case we need to
-    // fall back to the QPainterPath code-path.
-    if (!fontEngine->supportsTransformation(t)) {
-        // Except that drawing paths is slow, so for scales between
-        // 0.5 and 2.0 we leave the glyph cache untransformed and deal
-        // with the transform ourselves when painting, resulting in
-        // drawing 1x cached glyphs with a smooth-scale.
-        float det = t.determinant();
-        if (det >= 0.25f && det <= 4.f) {
-            // Assuming the baseclass still agrees
-            return QPaintEngineEx::shouldDrawCachedGlyphs(fontEngine, t);
-        }
-
-        return false; // Fall back to path-drawing
-    }
-
-    return QPaintEngineEx::shouldDrawCachedGlyphs(fontEngine, t);
-}
-
-void QOpenGL2PaintEngineExPrivate::drawCachedGlyphs(QFontEngine::GlyphFormat glyphFormat,
-                                                QStaticTextItem *staticTextItem)
-{
-    Q_Q(QOpenGL2PaintEngineEx);
-
-    QOpenGL2PaintEngineState *s = q->state();
-
-    void *cacheKey = ctx; // use context, not the shareGroup() -> the GL glyph cache uses FBOs which may not be shareable
-    bool recreateVertexArrays = false;
-
-    QTransform glyphCacheTransform;
-    QFontEngine *fe = staticTextItem->fontEngine();
-    if (fe->supportsTransformation(s->matrix)) {
-        // The font-engine supports rendering glyphs with the current transform, so we
-        // build a glyph-cache with the scale pre-applied, so that the cache contains
-        // glyphs with the appropriate resolution in the case of retina displays.
-        glyphCacheTransform = s->matrix.type() < QTransform::TxRotate ?
-            QTransform::fromScale(qAbs(s->matrix.m11()), qAbs(s->matrix.m22())) :
-            QTransform::fromScale(
-                QVector2D(s->matrix.m11(), s->matrix.m12()).length(),
-                QVector2D(s->matrix.m21(), s->matrix.m22()).length());
-    }
-
-    QOpenGLTextureGlyphCache *cache =
-            (QOpenGLTextureGlyphCache *) fe->glyphCache(cacheKey, glyphFormat, glyphCacheTransform);
-    if (!cache || cache->glyphFormat() != glyphFormat || cache->contextGroup() == nullptr) {
-        cache = new QOpenGLTextureGlyphCache(glyphFormat, glyphCacheTransform);
-        fe->setGlyphCache(cacheKey, cache);
-        recreateVertexArrays = true;
-    }
-
-    if (staticTextItem->userDataNeedsUpdate) {
-        recreateVertexArrays = true;
-    } else if (staticTextItem->userData() == nullptr) {
-        recreateVertexArrays = true;
-    } else if (staticTextItem->userData()->type != QStaticTextUserData::OpenGLUserData) {
-        recreateVertexArrays = true;
-    } else {
-        QOpenGLStaticTextUserData *userData = static_cast<QOpenGLStaticTextUserData *>(staticTextItem->userData());
-        if (userData->glyphFormat != glyphFormat) {
-            recreateVertexArrays = true;
-        } else if (userData->cacheSerialNumber != cache->serialNumber()) {
-            recreateVertexArrays = true;
-        }
-    }
-
-    // We only need to update the cache with new glyphs if we are actually going to recreate the vertex arrays.
-    // If the cache size has changed, we do need to regenerate the vertices, but we don't need to repopulate the
-    // cache so this text is performed before we test if the cache size has changed.
-    if (recreateVertexArrays) {
-        cache->setPaintEnginePrivate(this);
-        if (!cache->populate(fe, staticTextItem->numGlyphs,
-                             staticTextItem->glyphs, staticTextItem->glyphPositions)) {
-            // No space for glyphs in cache. We need to reset it and try again.
-            cache->clear();
-            cache->populate(fe, staticTextItem->numGlyphs,
-                            staticTextItem->glyphs, staticTextItem->glyphPositions);
-        }
-
-        if (cache->hasPendingGlyphs()) {
-            // Filling in the glyphs binds and sets parameters, so we need to
-            // ensure that the glyph cache doesn't mess with whatever unit
-            // is currently active. Note that the glyph cache internally
-            // uses the image texture unit for blitting to the cache, while
-            // we switch between image and mask units when drawing.
-            static const GLenum glypchCacheTextureUnit = QT_IMAGE_TEXTURE_UNIT;
-            activateTextureUnit(glypchCacheTextureUnit);
-
-            cache->fillInPendingGlyphs();
-
-            // We assume the cache can be trusted on which texture was bound
-            lastTextureUsed = cache->texture();
-
-            // But since the brush and image texture units are possibly shared
-            // we may have to re-bind brush textures after filling in the cache.
-            brushTextureDirty = (QT_BRUSH_TEXTURE_UNIT == glypchCacheTextureUnit);
-        }
-        cache->setPaintEnginePrivate(nullptr);
-    }
-
-    if (cache->width() == 0 || cache->height() == 0)
-        return;
-
-    if (glyphFormat == QFontEngine::Format_ARGB)
-        transferMode(ImageArrayDrawingMode);
-    else
-        transferMode(TextDrawingMode);
-
-    int margin = fe->glyphMargin(glyphFormat);
-
-    GLfloat dx = 1.0 / cache->width();
-    GLfloat dy = 1.0 / cache->height();
-
-    // Use global arrays by default
-    QOpenGL2PEXVertexArray *vertexCoordinates = &vertexCoordinateArray;
-    QOpenGL2PEXVertexArray *textureCoordinates = &textureCoordinateArray;
-
-    if (staticTextItem->useBackendOptimizations) {
-        QOpenGLStaticTextUserData *userData = nullptr;
-
-        if (staticTextItem->userData() == nullptr
-            || staticTextItem->userData()->type != QStaticTextUserData::OpenGLUserData) {
-
-            userData = new QOpenGLStaticTextUserData();
-            staticTextItem->setUserData(userData);
-
-        } else {
-            userData = static_cast<QOpenGLStaticTextUserData*>(staticTextItem->userData());
-        }
-
-        userData->glyphFormat = glyphFormat;
-        userData->cacheSerialNumber = cache->serialNumber();
-
-        // Use cache if backend optimizations is turned on
-        vertexCoordinates = &userData->vertexCoordinateArray;
-        textureCoordinates = &userData->textureCoordinateArray;
-
-        QSize size(cache->width(), cache->height());
-        if (userData->cacheSize != size) {
-            recreateVertexArrays = true;
-            userData->cacheSize = size;
-        }
-    }
-
-    if (recreateVertexArrays) {
-        vertexCoordinates->clear();
-        textureCoordinates->clear();
-
-        bool supportsSubPixelPositions = fe->supportsSubPixelPositions();
-        for (int i=0; i<staticTextItem->numGlyphs; ++i) {
-            QFixed subPixelPosition;
-            if (supportsSubPixelPositions)
-                subPixelPosition = fe->subPixelPositionForX(staticTextItem->glyphPositions[i].x);
-
-            QTextureGlyphCache::GlyphAndSubPixelPosition glyph(staticTextItem->glyphs[i], subPixelPosition);
-
-            const QTextureGlyphCache::Coord &c = cache->coords[glyph];
-            if (c.isNull())
-                continue;
-
-            int x = qFloor(staticTextItem->glyphPositions[i].x.toReal() * cache->transform().m11()) + c.baseLineX - margin;
-            int y = qRound(staticTextItem->glyphPositions[i].y.toReal() * cache->transform().m22()) - c.baseLineY - margin;
-
-            vertexCoordinates->addQuad(QRectF(x, y, c.w, c.h));
-            textureCoordinates->addQuad(QRectF(c.x*dx, c.y*dy, c.w * dx, c.h * dy));
-        }
-
-        staticTextItem->userDataNeedsUpdate = false;
-    }
-
-    int numGlyphs = vertexCoordinates->vertexCount() / 4;
-    if (numGlyphs == 0)
-        return;
-
-    if (elementIndices.size() < numGlyphs*6) {
-        Q_ASSERT(elementIndices.size() % 6 == 0);
-        int j = elementIndices.size() / 6 * 4;
-        while (j < numGlyphs*4) {
-            elementIndices.append(j + 0);
-            elementIndices.append(j + 0);
-            elementIndices.append(j + 1);
-            elementIndices.append(j + 2);
-            elementIndices.append(j + 3);
-            elementIndices.append(j + 3);
-
-            j += 4;
-        }
-
-#if defined(QT_OPENGL_DRAWCACHEDGLYPHS_INDEX_ARRAY_VBO)
-        if (elementIndicesVBOId == 0)
-            funcs.glGenBuffers(1, &elementIndicesVBOId);
-
-        funcs.glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, elementIndicesVBOId);
-        funcs.glBufferData(GL_ELEMENT_ARRAY_BUFFER, elementIndices.size() * sizeof(GLushort),
-                           elementIndices.constData(), GL_STATIC_DRAW);
-#endif
-    } else {
-#if defined(QT_OPENGL_DRAWCACHEDGLYPHS_INDEX_ARRAY_VBO)
-        funcs.glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, elementIndicesVBOId);
-#endif
-    }
-
-    if (glyphFormat != QFontEngine::Format_ARGB || recreateVertexArrays) {
-        uploadData(QT_VERTEX_COORDS_ATTR, (GLfloat*)vertexCoordinates->data(), vertexCoordinates->vertexCount() * 2);
-        uploadData(QT_TEXTURE_COORDS_ATTR, (GLfloat*)textureCoordinates->data(), textureCoordinates->vertexCount() * 2);
-    }
-
-    if (!snapToPixelGrid) {
-        snapToPixelGrid = true;
-        matrixDirty = true;
-    }
-
-    QBrush pensBrush = q->state()->pen.brush();
-    setBrush(pensBrush);
-
-    if (glyphFormat == QFontEngine::Format_A32) {
-
-        // Subpixel antialiasing without gamma correction
-
-        QPainter::CompositionMode compMode = q->state()->composition_mode;
-        Q_ASSERT(compMode == QPainter::CompositionMode_Source
-            || compMode == QPainter::CompositionMode_SourceOver);
-
-        shaderManager->setMaskType(QOpenGLEngineShaderManager::SubPixelMaskPass1);
-
-        if (pensBrush.style() == Qt::SolidPattern) {
-            // Solid patterns can get away with only one pass.
-            QColor c = pensBrush.color();
-            qreal oldOpacity = q->state()->opacity;
-            if (compMode == QPainter::CompositionMode_Source) {
-                c = qt_premultiplyColor(c, q->state()->opacity);
-                q->state()->opacity = 1;
-                opacityUniformDirty = true;
-            }
-
-            compositionModeDirty = false; // I can handle this myself, thank you very much
-            prepareForCachedGlyphDraw(*cache);
-
-            // prepareForCachedGlyphDraw() have set the opacity on the current shader, so the opacity state can now be reset.
-            if (compMode == QPainter::CompositionMode_Source) {
-                q->state()->opacity = oldOpacity;
-                opacityUniformDirty = true;
-            }
-
-            funcs.glEnable(GL_BLEND);
-            funcs.glBlendFunc(GL_CONSTANT_COLOR, GL_ONE_MINUS_SRC_COLOR);
-            funcs.glBlendColor(c.redF(), c.greenF(), c.blueF(), c.alphaF());
-        } else {
-            // Other brush styles need two passes.
-
-            qreal oldOpacity = q->state()->opacity;
-            if (compMode == QPainter::CompositionMode_Source) {
-                q->state()->opacity = 1;
-                opacityUniformDirty = true;
-                pensBrush = Qt::white;
-                setBrush(pensBrush);
-            }
-
-            compositionModeDirty = false; // I can handle this myself, thank you very much
-            prepareForCachedGlyphDraw(*cache);
-            funcs.glEnable(GL_BLEND);
-            funcs.glBlendFunc(GL_ZERO, GL_ONE_MINUS_SRC_COLOR);
-
-            updateTexture(QT_MASK_TEXTURE_UNIT, cache->texture(), GL_REPEAT, GL_NEAREST, ForceUpdate);
-
-#if defined(QT_OPENGL_DRAWCACHEDGLYPHS_INDEX_ARRAY_VBO)
-            funcs.glDrawElements(GL_TRIANGLE_STRIP, 6 * numGlyphs, GL_UNSIGNED_SHORT, 0);
-#else
-            const bool useIndexVbo = uploadIndexData(elementIndices.data(), GL_UNSIGNED_SHORT, 6 * numGlyphs);
-            funcs.glDrawElements(GL_TRIANGLE_STRIP, 6 * numGlyphs, GL_UNSIGNED_SHORT, useIndexVbo ? nullptr : elementIndices.data());
-#endif
-
-            shaderManager->setMaskType(QOpenGLEngineShaderManager::SubPixelMaskPass2);
-
-            if (compMode == QPainter::CompositionMode_Source) {
-                q->state()->opacity = oldOpacity;
-                opacityUniformDirty = true;
-                pensBrush = q->state()->pen.brush();
-                setBrush(pensBrush);
-            }
-
-            compositionModeDirty = false;
-            prepareForCachedGlyphDraw(*cache);
-            funcs.glEnable(GL_BLEND);
-            funcs.glBlendFunc(GL_ONE, GL_ONE);
-        }
-        compositionModeDirty = true;
-    } else if (glyphFormat == QFontEngine::Format_ARGB) {
-        currentBrush = noBrush;
-        shaderManager->setSrcPixelType(QOpenGLEngineShaderManager::ImageSrc);
-        if (prepareForCachedGlyphDraw(*cache))
-            shaderManager->currentProgram()->setUniformValue(location(QOpenGLEngineShaderManager::ImageTexture), QT_IMAGE_TEXTURE_UNIT);
-    } else {
-        // Grayscale/mono glyphs
-
-        shaderManager->setMaskType(QOpenGLEngineShaderManager::PixelMask);
-        prepareForCachedGlyphDraw(*cache);
-    }
-
-    GLenum textureUnit = QT_MASK_TEXTURE_UNIT;
-    if (glyphFormat == QFontEngine::Format_ARGB)
-        textureUnit = QT_IMAGE_TEXTURE_UNIT;
-
-    QOpenGLTextureGlyphCache::FilterMode filterMode = (s->matrix.type() > QTransform::TxTranslate) ?
-        QOpenGLTextureGlyphCache::Linear : QOpenGLTextureGlyphCache::Nearest;
-
-    GLenum glFilterMode = filterMode == QOpenGLTextureGlyphCache::Linear ? GL_LINEAR : GL_NEAREST;
-
-    TextureUpdateMode updateMode = UpdateIfNeeded;
-    if (cache->filterMode() != filterMode) {
-        updateMode = ForceUpdate;
-        cache->setFilterMode(filterMode);
-    }
-
-    updateTexture(textureUnit, cache->texture(), GL_REPEAT, glFilterMode, updateMode);
-
-#if defined(QT_OPENGL_DRAWCACHEDGLYPHS_INDEX_ARRAY_VBO)
-    funcs.glDrawElements(GL_TRIANGLE_STRIP, 6 * numGlyphs, GL_UNSIGNED_SHORT, 0);
-    funcs.glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0);
-#else
-    const bool useIndexVbo = uploadIndexData(elementIndices.data(), GL_UNSIGNED_SHORT, 6 * numGlyphs);
-    funcs.glDrawElements(GL_TRIANGLE_STRIP, 6 * numGlyphs, GL_UNSIGNED_SHORT, useIndexVbo ? nullptr : elementIndices.data());
-#endif
-}
-
-void QOpenGL2PaintEngineEx::drawPixmapFragments(const QPainter::PixmapFragment *fragments, int fragmentCount, const QPixmap &pixmap,
-                                            QPainter::PixmapFragmentHints hints)
-{
-    Q_D(QOpenGL2PaintEngineEx);
-    // Use fallback for extended composition modes.
-    if (state()->composition_mode > QPainter::CompositionMode_Plus) {
-        QPaintEngineEx::drawPixmapFragments(fragments, fragmentCount, pixmap, hints);
-        return;
-    }
-
-    ensureActive();
-    int max_texture_size = d->ctx->d_func()->maxTextureSize();
-    if (pixmap.width() > max_texture_size || pixmap.height() > max_texture_size) {
-        QPixmap scaled = pixmap.scaled(max_texture_size, max_texture_size, Qt::KeepAspectRatio);
-        d->drawPixmapFragments(fragments, fragmentCount, scaled, hints);
-    } else {
-        d->drawPixmapFragments(fragments, fragmentCount, pixmap, hints);
-    }
-}
-
-
-void QOpenGL2PaintEngineExPrivate::drawPixmapFragments(const QPainter::PixmapFragment *fragments,
-                                                   int fragmentCount, const QPixmap &pixmap,
-                                                   QPainter::PixmapFragmentHints hints)
-{
-    GLfloat dx = 1.0f / pixmap.size().width();
-    GLfloat dy = 1.0f / pixmap.size().height();
-
-    vertexCoordinateArray.clear();
-    textureCoordinateArray.clear();
-    opacityArray.reset();
-
-    if (snapToPixelGrid) {
-        snapToPixelGrid = false;
-        matrixDirty = true;
-    }
-
-    bool allOpaque = true;
-
-    for (int i = 0; i < fragmentCount; ++i) {
-        qreal s = 0;
-        qreal c = 1;
-        if (fragments[i].rotation != 0) {
-            s = qFastSin(qDegreesToRadians(fragments[i].rotation));
-            c = qFastCos(qDegreesToRadians(fragments[i].rotation));
-        }
-
-        qreal right = 0.5 * fragments[i].scaleX * fragments[i].width;
-        qreal bottom = 0.5 * fragments[i].scaleY * fragments[i].height;
-        QOpenGLPoint bottomRight(right * c - bottom * s, right * s + bottom * c);
-        QOpenGLPoint bottomLeft(-right * c - bottom * s, -right * s + bottom * c);
-
-        vertexCoordinateArray.addVertex(bottomRight.x + fragments[i].x, bottomRight.y + fragments[i].y);
-        vertexCoordinateArray.addVertex(-bottomLeft.x + fragments[i].x, -bottomLeft.y + fragments[i].y);
-        vertexCoordinateArray.addVertex(-bottomRight.x + fragments[i].x, -bottomRight.y + fragments[i].y);
-        vertexCoordinateArray.addVertex(-bottomRight.x + fragments[i].x, -bottomRight.y + fragments[i].y);
-        vertexCoordinateArray.addVertex(bottomLeft.x + fragments[i].x, bottomLeft.y + fragments[i].y);
-        vertexCoordinateArray.addVertex(bottomRight.x + fragments[i].x, bottomRight.y + fragments[i].y);
-
-        QOpenGLRect src(fragments[i].sourceLeft * dx, fragments[i].sourceTop * dy,
-                    (fragments[i].sourceLeft + fragments[i].width) * dx,
-                    (fragments[i].sourceTop + fragments[i].height) * dy);
-
-        textureCoordinateArray.addVertex(src.right, src.bottom);
-        textureCoordinateArray.addVertex(src.right, src.top);
-        textureCoordinateArray.addVertex(src.left, src.top);
-        textureCoordinateArray.addVertex(src.left, src.top);
-        textureCoordinateArray.addVertex(src.left, src.bottom);
-        textureCoordinateArray.addVertex(src.right, src.bottom);
-
-        qreal opacity = fragments[i].opacity * q->state()->opacity;
-        opacityArray << opacity << opacity << opacity << opacity << opacity << opacity;
-        allOpaque &= (opacity >= 0.99f);
-    }
-
-    transferMode(ImageOpacityArrayDrawingMode);
-
-    GLenum filterMode = q->state()->renderHints & QPainter::SmoothPixmapTransform ? GL_LINEAR : GL_NEAREST;
-    updateTexture(QT_IMAGE_TEXTURE_UNIT, pixmap, GL_CLAMP_TO_EDGE, filterMode);
-
-    bool isBitmap = pixmap.isQBitmap();
-    bool isOpaque = !isBitmap && (!pixmap.hasAlpha() || (hints & QPainter::OpaqueHint)) && allOpaque;
-
-    // Setup for texture drawing
-    currentBrush = noBrush;
-    shaderManager->setSrcPixelType(isBitmap ? QOpenGLEngineShaderManager::PatternSrc
-                                            : QOpenGLEngineShaderManager::ImageSrc);
-    if (prepareForDraw(isOpaque))
-        shaderManager->currentProgram()->setUniformValue(location(QOpenGLEngineShaderManager::ImageTexture), QT_IMAGE_TEXTURE_UNIT);
-
-    if (isBitmap) {
-        QColor col = qt_premultiplyColor(q->state()->pen.color(), (GLfloat)q->state()->opacity);
-        shaderManager->currentProgram()->setUniformValue(location(QOpenGLEngineShaderManager::PatternColor), col);
-    }
-
-    funcs.glDrawArrays(GL_TRIANGLES, 0, 6 * fragmentCount);
-}
-
-bool QOpenGL2PaintEngineEx::begin(QPaintDevice *pdev)
-{
-    Q_D(QOpenGL2PaintEngineEx);
-
-    Q_ASSERT(pdev->devType() == QInternal::OpenGL);
-    d->device = static_cast<QOpenGLPaintDevice*>(pdev);
-
-    if (!d->device)
-        return false;
-
-    d->device->ensureActiveTarget();
-
-    if (d->device->context() != QOpenGLContext::currentContext() || !d->device->context()) {
-        qWarning("QPainter::begin(): QOpenGLPaintDevice's context needs to be current");
-        return false;
-    }
-
-    if (d->ctx != QOpenGLContext::currentContext()
-            || (d->ctx && QOpenGLContext::currentContext() && d->ctx->format() != QOpenGLContext::currentContext()->format())) {
-        d->vertexBuffer.destroy();
-        d->texCoordBuffer.destroy();
-        d->opacityBuffer.destroy();
-        d->indexBuffer.destroy();
-        d->vao.destroy();
-    }
-
-    d->ctx = QOpenGLContext::currentContext();
-    d->ctx->d_func()->active_engine = this;
-
-    QOpenGLPaintDevicePrivate::get(d->device)->beginPaint();
-
-    d->funcs.initializeOpenGLFunctions();
-
-    // Generate a new Vertex Array Object if we don't have one already.  We can
-    // only hit the VAO-based path when using a core profile context.  This is
-    // because while non-core contexts can support VAOs via extensions, legacy
-    // components like the QtOpenGL module do not know about VAOs. There are
-    // still tests for QGL-QOpenGL paint engine interoperability, so keep the
-    // status quo for now, and avoid introducing a VAO in non-core contexts.
-    const bool needsVAO = d->ctx->format().profile() == QSurfaceFormat::CoreProfile
-        && d->ctx->format().version() >= qMakePair(3, 2);
-    if (needsVAO && !d->vao.isCreated()) {
-        bool created = d->vao.create();
-
-        // If we managed to create it then we have a profile that supports VAOs
-        if (created) {
-            d->vao.bind();
-
-            // Generate a new Vertex Buffer Object if we don't have one already
-            if (!d->vertexBuffer.isCreated()) {
-                d->vertexBuffer.create();
-                // Set its usage to StreamDraw, we will use this buffer only a few times before refilling it
-                d->vertexBuffer.setUsagePattern(QOpenGLBuffer::StreamDraw);
-            }
-            if (!d->texCoordBuffer.isCreated()) {
-                d->texCoordBuffer.create();
-                d->texCoordBuffer.setUsagePattern(QOpenGLBuffer::StreamDraw);
-            }
-            if (!d->opacityBuffer.isCreated()) {
-                d->opacityBuffer.create();
-                d->opacityBuffer.setUsagePattern(QOpenGLBuffer::StreamDraw);
-            }
-            if (!d->indexBuffer.isCreated()) {
-                d->indexBuffer.create();
-                d->indexBuffer.setUsagePattern(QOpenGLBuffer::StreamDraw);
-            }
-        }
-    }
-
-    for (int i = 0; i < QT_GL_VERTEX_ARRAY_TRACKED_COUNT; ++i)
-        d->vertexAttributeArraysEnabledState[i] = false;
-
-    const QSize sz = d->device->size();
-    d->width = sz.width();
-    d->height = sz.height();
-    d->mode = BrushDrawingMode;
-    d->brushTextureDirty = true;
-    d->brushUniformsDirty = true;
-    d->matrixUniformDirty = true;
-    d->matrixDirty = true;
-    d->compositionModeDirty = true;
-    d->opacityUniformDirty = true;
-    d->needsSync = true;
-    d->useSystemClip = !systemClip().isEmpty();
-    d->currentBrush = QBrush();
-
-    d->dirtyStencilRegion = QRect(0, 0, d->width, d->height);
-    d->stencilClean = true;
-
-    d->shaderManager = new QOpenGLEngineShaderManager(d->ctx);
-
-    d->funcs.glDisable(GL_STENCIL_TEST);
-    d->funcs.glDisable(GL_DEPTH_TEST);
-    d->funcs.glDisable(GL_SCISSOR_TEST);
-
-    d->glyphCacheFormat = QFontEngine::Format_A8;
-
-#ifndef QT_OPENGL_ES_2
-    if (!QOpenGLContext::currentContext()->isOpenGLES()) {
-        d->funcs.glDisable(GL_MULTISAMPLE);
-        d->glyphCacheFormat = QFontEngine::Format_A32;
-        d->multisamplingAlwaysEnabled = false;
-    } else
-#endif // QT_OPENGL_ES_2
-    {
-        // OpenGL ES can't switch MSAA off, so if the gl paint device is
-        // multisampled, it's always multisampled.
-        d->multisamplingAlwaysEnabled = d->device->context()->format().samples() > 1;
-    }
-
-    return true;
-}
-
-bool QOpenGL2PaintEngineEx::end()
-{
-    Q_D(QOpenGL2PaintEngineEx);
-
-    QOpenGLPaintDevicePrivate::get(d->device)->endPaint();
-
-    QOpenGLContext *ctx = d->ctx;
-    d->funcs.glUseProgram(0);
-    d->transferMode(BrushDrawingMode);
-
-    ctx->d_func()->active_engine = nullptr;
-
-    d->resetGLState();
-
-    delete d->shaderManager;
-    d->shaderManager = nullptr;
-    d->currentBrush = QBrush();
-
-#ifdef QT_OPENGL_CACHE_AS_VBOS
-    if (!d->unusedVBOSToClean.isEmpty()) {
-        glDeleteBuffers(d->unusedVBOSToClean.size(), d->unusedVBOSToClean.constData());
-        d->unusedVBOSToClean.clear();
-    }
-    if (!d->unusedIBOSToClean.isEmpty()) {
-        glDeleteBuffers(d->unusedIBOSToClean.size(), d->unusedIBOSToClean.constData());
-        d->unusedIBOSToClean.clear();
-    }
-#endif
-
-    return false;
-}
-
-void QOpenGL2PaintEngineEx::ensureActive()
-{
-    Q_D(QOpenGL2PaintEngineEx);
-    QOpenGLContext *ctx = d->ctx;
-
-    if (d->vao.isCreated())
-        d->vao.bind();
-
-    if (isActive() && ctx->d_func()->active_engine != this) {
-        ctx->d_func()->active_engine = this;
-        d->needsSync = true;
-    }
-
-    if (d->needsSync) {
-        d->device->ensureActiveTarget();
-
-        d->transferMode(BrushDrawingMode);
-        d->funcs.glViewport(0, 0, d->width, d->height);
-        d->needsSync = false;
-        d->shaderManager->setDirty();
-        d->syncGlState();
-        for (int i = 0; i < 3; ++i)
-            d->vertexAttribPointers[i] = (GLfloat*)-1; // Assume the pointers are clobbered
-        setState(state());
-    }
-}
-
-void QOpenGL2PaintEngineExPrivate::updateClipScissorTest()
-{
-    Q_Q(QOpenGL2PaintEngineEx);
-    if (q->state()->clipTestEnabled) {
-        funcs.glEnable(GL_STENCIL_TEST);
-        funcs.glStencilFunc(GL_LEQUAL, q->state()->currentClip, ~GL_STENCIL_HIGH_BIT);
-    } else {
-        funcs.glDisable(GL_STENCIL_TEST);
-        funcs.glStencilFunc(GL_ALWAYS, 0, 0xff);
-    }
-
-#ifdef QT_GL_NO_SCISSOR_TEST
-    currentScissorBounds = QRect(0, 0, width, height);
-#else
-    QRect bounds = q->state()->rectangleClip;
-    if (!q->state()->clipEnabled) {
-        if (useSystemClip)
-            bounds = systemClip.boundingRect();
-        else
-            bounds = QRect(0, 0, width, height);
-    } else {
-        if (useSystemClip)
-            bounds = bounds.intersected(systemClip.boundingRect());
-        else
-            bounds = bounds.intersected(QRect(0, 0, width, height));
-    }
-
-    currentScissorBounds = bounds;
-
-    if (bounds == QRect(0, 0, width, height)) {
-        funcs.glDisable(GL_SCISSOR_TEST);
-    } else {
-        funcs.glEnable(GL_SCISSOR_TEST);
-        setScissor(bounds);
-    }
-#endif
-}
-
-void QOpenGL2PaintEngineExPrivate::setScissor(const QRect &rect)
-{
-    const int left = rect.left();
-    const int width = rect.width();
-    int bottom = height - (rect.top() + rect.height());
-    if (device->paintFlipped()) {
-        bottom = rect.top();
-    }
-    const int height = rect.height();
-
-    funcs.glScissor(left, bottom, width, height);
-}
-
-void QOpenGL2PaintEngineEx::clipEnabledChanged()
-{
-    Q_D(QOpenGL2PaintEngineEx);
-
-    state()->clipChanged = true;
-
-    if (painter()->hasClipping())
-        d->regenerateClip();
-    else
-        d->systemStateChanged();
-}
-
-void QOpenGL2PaintEngineExPrivate::clearClip(uint value)
-{
-    dirtyStencilRegion -= currentScissorBounds;
-
-    funcs.glStencilMask(0xff);
-    funcs.glClearStencil(value);
-    funcs.glClear(GL_STENCIL_BUFFER_BIT);
-    funcs.glStencilMask(0x0);
-
-    q->state()->needsClipBufferClear = false;
-}
-
-void QOpenGL2PaintEngineExPrivate::writeClip(const QVectorPath &path, uint value)
-{
-    transferMode(BrushDrawingMode);
-
-    if (snapToPixelGrid) {
-        snapToPixelGrid = false;
-        matrixDirty = true;
-    }
-
-    if (matrixDirty)
-        updateMatrix();
-
-    stencilClean = false;
-
-    const bool singlePass = !path.hasWindingFill()
-        && (((q->state()->currentClip == maxClip - 1) && q->state()->clipTestEnabled)
-            || q->state()->needsClipBufferClear);
-    const uint referenceClipValue = q->state()->needsClipBufferClear ? 1 : q->state()->currentClip;
-
-    if (q->state()->needsClipBufferClear)
-        clearClip(1);
-
-    if (path.isEmpty()) {
-        funcs.glEnable(GL_STENCIL_TEST);
-        funcs.glStencilFunc(GL_LEQUAL, value, ~GL_STENCIL_HIGH_BIT);
-        return;
-    }
-
-    if (q->state()->clipTestEnabled)
-        funcs.glStencilFunc(GL_LEQUAL, q->state()->currentClip, ~GL_STENCIL_HIGH_BIT);
-    else
-        funcs.glStencilFunc(GL_ALWAYS, 0, 0xff);
-
-    vertexCoordinateArray.clear();
-    vertexCoordinateArray.addPath(path, inverseScale, false);
-
-    if (!singlePass)
-        fillStencilWithVertexArray(vertexCoordinateArray, path.hasWindingFill());
-
-    funcs.glColorMask(false, false, false, false);
-    funcs.glEnable(GL_STENCIL_TEST);
-    useSimpleShader();
-
-    if (singlePass) {
-        // Under these conditions we can set the new stencil value in a single
-        // pass, by using the current value and the "new value" as the toggles
-
-        funcs.glStencilFunc(GL_LEQUAL, referenceClipValue, ~GL_STENCIL_HIGH_BIT);
-        funcs.glStencilOp(GL_KEEP, GL_INVERT, GL_INVERT);
-        funcs.glStencilMask(value ^ referenceClipValue);
-
-        drawVertexArrays(vertexCoordinateArray, GL_TRIANGLE_FAN);
-    } else {
-        funcs.glStencilOp(GL_KEEP, GL_REPLACE, GL_REPLACE);
-        funcs.glStencilMask(0xff);
-
-        if (!q->state()->clipTestEnabled && path.hasWindingFill()) {
-            // Pass when any clip bit is set, set high bit
-            funcs.glStencilFunc(GL_NOTEQUAL, GL_STENCIL_HIGH_BIT, ~GL_STENCIL_HIGH_BIT);
-            composite(vertexCoordinateArray.boundingRect());
-        }
-
-        // Pass when high bit is set, replace stencil value with new clip value
-        funcs.glStencilFunc(GL_NOTEQUAL, value, GL_STENCIL_HIGH_BIT);
-
-        composite(vertexCoordinateArray.boundingRect());
-    }
-
-    funcs.glStencilFunc(GL_LEQUAL, value, ~GL_STENCIL_HIGH_BIT);
-    funcs.glStencilMask(0);
-
-    funcs.glColorMask(true, true, true, true);
-}
-
-void QOpenGL2PaintEngineEx::clip(const QVectorPath &path, Qt::ClipOperation op)
-{
-//     qDebug("QOpenGL2PaintEngineEx::clip()");
-    Q_D(QOpenGL2PaintEngineEx);
-
-    state()->clipChanged = true;
-
-    ensureActive();
-
-    if (op == Qt::ReplaceClip) {
-        op = Qt::IntersectClip;
-        if (d->hasClipOperations()) {
-            d->systemStateChanged();
-            state()->canRestoreClip = false;
-        }
-    }
-
-#ifndef QT_GL_NO_SCISSOR_TEST
-    if (!path.isEmpty() && op == Qt::IntersectClip && (path.shape() == QVectorPath::RectangleHint)) {
-        const QPointF* const points = reinterpret_cast<const QPointF*>(path.points());
-        QRectF rect(points[0], points[2]);
-
-        if (state()->matrix.type() <= QTransform::TxScale
-            || (state()->matrix.type() == QTransform::TxRotate
-                && qFuzzyIsNull(state()->matrix.m11())
-                && qFuzzyIsNull(state()->matrix.m22())))
-        {
-            state()->rectangleClip = state()->rectangleClip.intersected(state()->matrix.mapRect(rect).toRect());
-            d->updateClipScissorTest();
-            return;
-        }
-    }
-#endif
-
-    const QRect pathRect = state()->matrix.mapRect(path.controlPointRect()).toAlignedRect();
-
-    switch (op) {
-    case Qt::NoClip:
-        if (d->useSystemClip) {
-            state()->clipTestEnabled = true;
-            state()->currentClip = 1;
-        } else {
-            state()->clipTestEnabled = false;
-        }
-        state()->rectangleClip = QRect(0, 0, d->width, d->height);
-        state()->canRestoreClip = false;
-        d->updateClipScissorTest();
-        break;
-    case Qt::IntersectClip:
-        state()->rectangleClip = state()->rectangleClip.intersected(pathRect);
-        d->updateClipScissorTest();
-        d->resetClipIfNeeded();
-        ++d->maxClip;
-        d->writeClip(path, d->maxClip);
-        state()->currentClip = d->maxClip;
-        state()->clipTestEnabled = true;
-        break;
-    default:
-        break;
-    }
-}
-
-void QOpenGL2PaintEngineExPrivate::regenerateClip()
-{
-    systemStateChanged();
-    replayClipOperations();
-}
-
-void QOpenGL2PaintEngineExPrivate::systemStateChanged()
-{
-    Q_Q(QOpenGL2PaintEngineEx);
-
-    q->state()->clipChanged = true;
-
-    if (systemClip.isEmpty()) {
-        useSystemClip = false;
-    } else {
-        if (q->paintDevice()->devType() == QInternal::Widget && currentClipDevice) {
-            //QWidgetPrivate *widgetPrivate = qt_widget_private(static_cast<QWidget *>(currentClipDevice)->window());
-            //useSystemClip = widgetPrivate->extra && widgetPrivate->extra->inRenderWithPainter;
-            useSystemClip = true;
-        } else {
-            useSystemClip = true;
-        }
-    }
-
-    q->state()->clipTestEnabled = false;
-    q->state()->needsClipBufferClear = true;
-
-    q->state()->currentClip = 1;
-    maxClip = 1;
-
-    q->state()->rectangleClip = useSystemClip ? systemClip.boundingRect() : QRect(0, 0, width, height);
-    updateClipScissorTest();
-
-    if (systemClip.rectCount() == 1) {
-        if (systemClip.boundingRect() == QRect(0, 0, width, height))
-            useSystemClip = false;
-#ifndef QT_GL_NO_SCISSOR_TEST
-        // scissoring takes care of the system clip
-        return;
-#endif
-    }
-
-    if (useSystemClip) {
-        clearClip(0);
-
-        QPainterPath path;
-        path.addRegion(systemClip);
-
-        q->state()->currentClip = 0;
-        writeClip(qtVectorPathForPath(q->state()->matrix.inverted().map(path)), 1);
-        q->state()->currentClip = 1;
-        q->state()->clipTestEnabled = true;
-    }
-}
-
-void QOpenGL2PaintEngineEx::setState(QPainterState *new_state)
-{
-    //     qDebug("QOpenGL2PaintEngineEx::setState()");
-
-    Q_D(QOpenGL2PaintEngineEx);
-
-    QOpenGL2PaintEngineState *s = static_cast<QOpenGL2PaintEngineState *>(new_state);
-    QOpenGL2PaintEngineState *old_state = state();
-
-    QPaintEngineEx::setState(s);
-
-    if (s->isNew) {
-        // Newly created state object.  The call to setState()
-        // will either be followed by a call to begin(), or we are
-        // setting the state as part of a save().
-        s->isNew = false;
-        return;
-    }
-
-    // Setting the state as part of a restore().
-
-    if (old_state == s || old_state->renderHintsChanged)
-        renderHintsChanged();
-
-    if (old_state == s || old_state->matrixChanged)
-        d->matrixDirty = true;
-
-    if (old_state == s || old_state->compositionModeChanged)
-        d->compositionModeDirty = true;
-
-    if (old_state == s || old_state->opacityChanged)
-        d->opacityUniformDirty = true;
-
-    if (old_state == s || old_state->clipChanged) {
-        if (old_state && old_state != s && old_state->canRestoreClip) {
-            d->updateClipScissorTest();
-            d->funcs.glDepthFunc(GL_LEQUAL);
-        } else {
-            d->regenerateClip();
-        }
-    }
-}
-
-QPainterState *QOpenGL2PaintEngineEx::createState(QPainterState *orig) const
-{
-    if (orig)
-        const_cast<QOpenGL2PaintEngineEx *>(this)->ensureActive();
-
-    QOpenGL2PaintEngineState *s;
-    if (!orig)
-        s = new QOpenGL2PaintEngineState();
-    else
-        s = new QOpenGL2PaintEngineState(*static_cast<QOpenGL2PaintEngineState *>(orig));
-
-    s->matrixChanged = false;
-    s->compositionModeChanged = false;
-    s->opacityChanged = false;
-    s->renderHintsChanged = false;
-    s->clipChanged = false;
-
-    return s;
-}
-
-QOpenGL2PaintEngineState::QOpenGL2PaintEngineState(QOpenGL2PaintEngineState &other)
-    : QPainterState(other)
-{
-    isNew = true;
-    needsClipBufferClear = other.needsClipBufferClear;
-    clipTestEnabled = other.clipTestEnabled;
-    currentClip = other.currentClip;
-    canRestoreClip = other.canRestoreClip;
-    rectangleClip = other.rectangleClip;
-}
-
-QOpenGL2PaintEngineState::QOpenGL2PaintEngineState()
-{
-    isNew = true;
-    needsClipBufferClear = true;
-    clipTestEnabled = false;
-    canRestoreClip = true;
-}
-
-QOpenGL2PaintEngineState::~QOpenGL2PaintEngineState()
-{
-}
-
-void QOpenGL2PaintEngineExPrivate::setVertexAttribArrayEnabled(int arrayIndex, bool enabled)
-{
-    Q_ASSERT(arrayIndex < QT_GL_VERTEX_ARRAY_TRACKED_COUNT);
-
-    if (vertexAttributeArraysEnabledState[arrayIndex] && !enabled)
-        funcs.glDisableVertexAttribArray(arrayIndex);
-
-    if (!vertexAttributeArraysEnabledState[arrayIndex] && enabled)
-        funcs.glEnableVertexAttribArray(arrayIndex);
-
-    vertexAttributeArraysEnabledState[arrayIndex] = enabled;
-}
-
-void QOpenGL2PaintEngineExPrivate::syncGlState()
-{
-    for (int i = 0; i < QT_GL_VERTEX_ARRAY_TRACKED_COUNT; ++i) {
-        if (vertexAttributeArraysEnabledState[i])
-            funcs.glEnableVertexAttribArray(i);
-        else
-            funcs.glDisableVertexAttribArray(i);
-    }
-}
-
-
-QT_END_NAMESPACE
diff --git a/src/gui/opengl/qopenglpaintengine_p.h b/src/gui/opengl/qopenglpaintengine_p.h
deleted file mode 100644
index 81f17572b2..0000000000
--- a/src/gui/opengl/qopenglpaintengine_p.h
+++ /dev/null
@@ -1,396 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtGui module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QOPENGLPAINTENGINE_P_H
-#define QOPENGLPAINTENGINE_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include <QtGui/private/qtguiglobal_p.h>
-#include <QDebug>
-
-#include <qopenglpaintdevice.h>
-
-#include <private/qpaintengineex_p.h>
-#include <private/qopenglengineshadermanager_p.h>
-#include <private/qopengl2pexvertexarray_p.h>
-#include <private/qfontengine_p.h>
-#include <private/qdatabuffer_p.h>
-#include <private/qtriangulatingstroker_p.h>
-
-#include <private/qopenglextensions_p.h>
-
-#include <QOpenGLVertexArrayObject>
-#include <QOpenGLBuffer>
-
-enum EngineMode {
-    ImageDrawingMode,
-    TextDrawingMode,
-    BrushDrawingMode,
-    ImageArrayDrawingMode,
-    ImageOpacityArrayDrawingMode
-};
-
-QT_BEGIN_NAMESPACE
-
-#define GL_STENCIL_HIGH_BIT         GLuint(0x80)
-#define QT_UNKNOWN_TEXTURE_UNIT     GLuint(-1)
-#define QT_DEFAULT_TEXTURE_UNIT     GLuint(0)
-#define QT_BRUSH_TEXTURE_UNIT       GLuint(0)
-#define QT_IMAGE_TEXTURE_UNIT       GLuint(0) //Can be the same as brush texture unit
-#define QT_MASK_TEXTURE_UNIT        GLuint(1)
-#define QT_BACKGROUND_TEXTURE_UNIT  GLuint(2)
-
-class QOpenGL2PaintEngineExPrivate;
-
-class QOpenGL2PaintEngineState : public QPainterState
-{
-public:
-    QOpenGL2PaintEngineState(QOpenGL2PaintEngineState &other);
-    QOpenGL2PaintEngineState();
-    ~QOpenGL2PaintEngineState();
-
-    uint isNew : 1;
-    uint needsClipBufferClear : 1;
-    uint clipTestEnabled : 1;
-    uint canRestoreClip : 1;
-    uint matrixChanged : 1;
-    uint compositionModeChanged : 1;
-    uint opacityChanged : 1;
-    uint renderHintsChanged : 1;
-    uint clipChanged : 1;
-    uint currentClip : 8;
-
-    QRect rectangleClip;
-};
-
-class Q_GUI_EXPORT QOpenGL2PaintEngineEx : public QPaintEngineEx
-{
-    Q_DECLARE_PRIVATE(QOpenGL2PaintEngineEx)
-public:
-    QOpenGL2PaintEngineEx();
-    ~QOpenGL2PaintEngineEx();
-
-    bool begin(QPaintDevice *device) override;
-    void ensureActive();
-    bool end() override;
-
-    virtual void clipEnabledChanged() override;
-    virtual void penChanged() override;
-    virtual void brushChanged() override;
-    virtual void brushOriginChanged() override;
-    virtual void opacityChanged() override;
-    virtual void compositionModeChanged() override;
-    virtual void renderHintsChanged() override;
-    virtual void transformChanged() override;
-
-    virtual void drawPixmap(const QRectF &r, const QPixmap &pm, const QRectF &sr) override;
-    virtual void drawPixmapFragments(const QPainter::PixmapFragment *fragments, int fragmentCount, const QPixmap &pixmap,
-                                     QPainter::PixmapFragmentHints hints) override;
-    virtual void drawImage(const QRectF &r, const QImage &pm, const QRectF &sr,
-                           Qt::ImageConversionFlags flags = Qt::AutoColor) override;
-    virtual void drawTextItem(const QPointF &p, const QTextItem &textItem) override;
-    virtual void fill(const QVectorPath &path, const QBrush &brush) override;
-    virtual void stroke(const QVectorPath &path, const QPen &pen) override;
-    virtual void clip(const QVectorPath &path, Qt::ClipOperation op) override;
-
-    virtual void drawStaticTextItem(QStaticTextItem *textItem) override;
-
-    bool drawTexture(const QRectF &r, GLuint textureId, const QSize &size, const QRectF &sr);
-
-    Type type() const override { return OpenGL2; }
-
-    virtual void setState(QPainterState *s) override;
-    virtual QPainterState *createState(QPainterState *orig) const override;
-    inline QOpenGL2PaintEngineState *state() {
-        return static_cast<QOpenGL2PaintEngineState *>(QPaintEngineEx::state());
-    }
-    inline const QOpenGL2PaintEngineState *state() const {
-        return static_cast<const QOpenGL2PaintEngineState *>(QPaintEngineEx::state());
-    }
-
-    void beginNativePainting() override;
-    void endNativePainting() override;
-
-    void invalidateState();
-
-    void setRenderTextActive(bool);
-
-    bool isNativePaintingActive() const;
-    bool requiresPretransformedGlyphPositions(QFontEngine *, const QTransform &) const override { return false; }
-    bool shouldDrawCachedGlyphs(QFontEngine *, const QTransform &) const override;
-
-private:
-    Q_DISABLE_COPY_MOVE(QOpenGL2PaintEngineEx)
-
-    friend class QOpenGLEngineShaderManager;
-};
-
-// This probably needs to grow to GL_MAX_VERTEX_ATTRIBS, but 3 is ok for now as that's
-// all the GL2 engine uses:
-#define QT_GL_VERTEX_ARRAY_TRACKED_COUNT 3
-
-class QOpenGL2PaintEngineExPrivate : public QPaintEngineExPrivate
-{
-    Q_DECLARE_PUBLIC(QOpenGL2PaintEngineEx)
-public:
-    enum StencilFillMode {
-        OddEvenFillMode,
-        WindingFillMode,
-        TriStripStrokeFillMode
-    };
-
-    QOpenGL2PaintEngineExPrivate(QOpenGL2PaintEngineEx *q_ptr) :
-            q(q_ptr),
-            shaderManager(nullptr),
-            width(0), height(0),
-            ctx(nullptr),
-            useSystemClip(true),
-            elementIndicesVBOId(0),
-            opacityArray(0),
-            snapToPixelGrid(false),
-            nativePaintingActive(false),
-            inverseScale(1),
-            lastTextureUnitUsed(QT_UNKNOWN_TEXTURE_UNIT),
-            vertexBuffer(QOpenGLBuffer::VertexBuffer),
-            texCoordBuffer(QOpenGLBuffer::VertexBuffer),
-            opacityBuffer(QOpenGLBuffer::VertexBuffer),
-            indexBuffer(QOpenGLBuffer::IndexBuffer)
-    { }
-
-    ~QOpenGL2PaintEngineExPrivate();
-
-    void updateBrushTexture();
-    void updateBrushUniforms();
-    void updateMatrix();
-    void updateCompositionMode();
-
-    enum TextureUpdateMode { UpdateIfNeeded, ForceUpdate };
-    template<typename T>
-    void updateTexture(GLenum textureUnit, const T &texture, GLenum wrapMode, GLenum filterMode, TextureUpdateMode updateMode = UpdateIfNeeded);
-    template<typename T>
-    GLuint bindTexture(const T &texture);
-    void activateTextureUnit(GLenum textureUnit);
-
-    void resetGLState();
-
-    // fill, stroke, drawTexture, drawPixmaps & drawCachedGlyphs are the main rendering entry-points,
-    // however writeClip can also be thought of as en entry point as it does similar things.
-    void fill(const QVectorPath &path);
-    void stroke(const QVectorPath &path, const QPen &pen);
-    void drawTexture(const QOpenGLRect& dest, const QOpenGLRect& src, const QSize &textureSize, bool opaque, bool pattern = false);
-    void drawPixmapFragments(const QPainter::PixmapFragment *fragments, int fragmentCount, const QPixmap &pixmap,
-                             QPainter::PixmapFragmentHints hints);
-    void drawCachedGlyphs(QFontEngine::GlyphFormat glyphFormat, QStaticTextItem *staticTextItem);
-
-    // Calls glVertexAttributePointer if the pointer has changed
-    inline void uploadData(unsigned int arrayIndex, const GLfloat *data, GLuint count);
-    inline bool uploadIndexData(const void *data, GLenum indexValueType, GLuint count);
-
-    // draws whatever is in the vertex array:
-    void drawVertexArrays(const float *data, int *stops, int stopCount, GLenum primitive);
-    void drawVertexArrays(QOpenGL2PEXVertexArray &vertexArray, GLenum primitive) {
-        drawVertexArrays((const float *) vertexArray.data(), vertexArray.stops(), vertexArray.stopCount(), primitive);
-    }
-
-    // Composites the bounding rect onto dest buffer:
-    void composite(const QOpenGLRect& boundingRect);
-
-    // Calls drawVertexArrays to render into stencil buffer:
-    void fillStencilWithVertexArray(const float *data, int count, int *stops, int stopCount, const QOpenGLRect &bounds, StencilFillMode mode);
-    void fillStencilWithVertexArray(QOpenGL2PEXVertexArray& vertexArray, bool useWindingFill) {
-        fillStencilWithVertexArray((const float *) vertexArray.data(), 0, vertexArray.stops(), vertexArray.stopCount(),
-                                   vertexArray.boundingRect(),
-                                   useWindingFill ? WindingFillMode : OddEvenFillMode);
-    }
-
-    void setBrush(const QBrush& brush);
-    void transferMode(EngineMode newMode);
-    bool prepareForDraw(bool srcPixelsAreOpaque); // returns true if the program has changed
-    bool prepareForCachedGlyphDraw(const QFontEngineGlyphCache &cache);
-    inline void useSimpleShader();
-    inline GLuint location(const QOpenGLEngineShaderManager::Uniform uniform) {
-        return shaderManager->getUniformLocation(uniform);
-    }
-
-    void clearClip(uint value);
-    void writeClip(const QVectorPath &path, uint value);
-    void resetClipIfNeeded();
-
-    void updateClipScissorTest();
-    void setScissor(const QRect &rect);
-    void regenerateClip();
-    void systemStateChanged() override;
-
-    void setVertexAttribArrayEnabled(int arrayIndex, bool enabled = true);
-    void syncGlState();
-
-    static QOpenGLEngineShaderManager* shaderManagerForEngine(QOpenGL2PaintEngineEx *engine) { return engine->d_func()->shaderManager; }
-    static QOpenGL2PaintEngineExPrivate *getData(QOpenGL2PaintEngineEx *engine) { return engine->d_func(); }
-    static void cleanupVectorPath(QPaintEngineEx *engine, void *data);
-
-    QOpenGLExtensions funcs;
-
-    QOpenGL2PaintEngineEx* q;
-    QOpenGLEngineShaderManager* shaderManager;
-    QOpenGLPaintDevice* device;
-    int width, height;
-    QOpenGLContext *ctx;
-    EngineMode mode;
-    QFontEngine::GlyphFormat glyphCacheFormat;
-
-    bool vertexAttributeArraysEnabledState[QT_GL_VERTEX_ARRAY_TRACKED_COUNT];
-
-    // Dirty flags
-    bool matrixDirty; // Implies matrix uniforms are also dirty
-    bool compositionModeDirty;
-    bool brushTextureDirty;
-    bool brushUniformsDirty;
-    bool opacityUniformDirty;
-    bool matrixUniformDirty;
-
-    bool stencilClean; // Has the stencil not been used for clipping so far?
-    bool useSystemClip;
-    QRegion dirtyStencilRegion;
-    QRect currentScissorBounds;
-    uint maxClip;
-
-    QBrush currentBrush; // May not be the state's brush!
-    const QBrush noBrush;
-
-    QImage currentBrushImage;
-
-    QOpenGL2PEXVertexArray vertexCoordinateArray;
-    QOpenGL2PEXVertexArray textureCoordinateArray;
-    QVector<GLushort> elementIndices;
-    GLuint elementIndicesVBOId;
-    QDataBuffer<GLfloat> opacityArray;
-    GLfloat staticVertexCoordinateArray[8];
-    GLfloat staticTextureCoordinateArray[8];
-
-    bool snapToPixelGrid;
-    bool nativePaintingActive;
-    GLfloat pmvMatrix[3][3];
-    GLfloat inverseScale;
-
-    GLenum lastTextureUnitUsed;
-    GLuint lastTextureUsed;
-
-    QOpenGLVertexArrayObject vao;
-    QOpenGLBuffer vertexBuffer;
-    QOpenGLBuffer texCoordBuffer;
-    QOpenGLBuffer opacityBuffer;
-    QOpenGLBuffer indexBuffer;
-
-    bool needsSync;
-    bool multisamplingAlwaysEnabled;
-
-    QTriangulatingStroker stroker;
-    QDashedStrokeProcessor dasher;
-
-    QVector<GLuint> unusedVBOSToClean;
-    QVector<GLuint> unusedIBOSToClean;
-
-    const GLfloat *vertexAttribPointers[3];
-};
-
-
-void QOpenGL2PaintEngineExPrivate::uploadData(unsigned int arrayIndex, const GLfloat *data, GLuint count)
-{
-    Q_ASSERT(arrayIndex < 3);
-
-    // If a vertex array object is created we have a profile that supports them
-    // and we will upload the data via a QOpenGLBuffer. Otherwise we will use
-    // the legacy way of uploading the data via glVertexAttribPointer.
-    if (vao.isCreated()) {
-        if (arrayIndex == QT_VERTEX_COORDS_ATTR) {
-            vertexBuffer.bind();
-            vertexBuffer.allocate(data, count * sizeof(float));
-        }
-        if (arrayIndex == QT_TEXTURE_COORDS_ATTR) {
-            texCoordBuffer.bind();
-            texCoordBuffer.allocate(data, count * sizeof(float));
-        }
-        if (arrayIndex == QT_OPACITY_ATTR) {
-            opacityBuffer.bind();
-            opacityBuffer.allocate(data, count * sizeof(float));
-        }
-        if (arrayIndex == QT_OPACITY_ATTR)
-            funcs.glVertexAttribPointer(arrayIndex, 1, GL_FLOAT, GL_FALSE, 0, nullptr);
-        else
-            funcs.glVertexAttribPointer(arrayIndex, 2, GL_FLOAT, GL_FALSE, 0, nullptr);
-    } else {
-        // If we already uploaded the data we don't have to do it again
-        if (data == vertexAttribPointers[arrayIndex])
-            return;
-
-        // Store the data in cache and upload it to the graphics card.
-        vertexAttribPointers[arrayIndex] = data;
-        if (arrayIndex == QT_OPACITY_ATTR)
-            funcs.glVertexAttribPointer(arrayIndex, 1, GL_FLOAT, GL_FALSE, 0, data);
-        else
-            funcs.glVertexAttribPointer(arrayIndex, 2, GL_FLOAT, GL_FALSE, 0, data);
-    }
-}
-
-bool QOpenGL2PaintEngineExPrivate::uploadIndexData(const void *data, GLenum indexValueType, GLuint count)
-{
-    // Follow the uploadData() logic: VBOs are used only when VAO support is available.
-    // Otherwise the legacy client-side pointer path is used.
-    if (vao.isCreated()) {
-        Q_ASSERT(indexValueType == GL_UNSIGNED_SHORT || indexValueType == GL_UNSIGNED_INT);
-        indexBuffer.bind();
-        indexBuffer.allocate(data, count * (indexValueType == GL_UNSIGNED_SHORT ? sizeof(quint16) : sizeof(quint32)));
-        return true;
-    }
-    return false;
-}
-
-QT_END_NAMESPACE
-
-#endif
diff --git a/src/gui/opengl/qopenglpixeltransferoptions.cpp b/src/gui/opengl/qopenglpixeltransferoptions.cpp
deleted file mode 100644
index b0d953d76b..0000000000
--- a/src/gui/opengl/qopenglpixeltransferoptions.cpp
+++ /dev/null
@@ -1,263 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB).
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtGui module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qopenglpixeltransferoptions.h"
-#include <QSharedData>
-
-QT_BEGIN_NAMESPACE
-
-/*!
- * \class QOpenGLPixelTransferOptions
- *
- * \brief The QOpenGLPixelTransferOptions class describes the pixel storage
- * modes that affect the unpacking of pixels during texture upload.
- */
-
-/*!
- * \fn QOpenGLPixelTransferOptions & QOpenGLPixelTransferOptions::operator=(QOpenGLPixelTransferOptions &&other)
- * \internal
- */
-
-/*!
- * \fn void QOpenGLPixelTransferOptions::swap(QOpenGLPixelTransferOptions &other)
- * \internal
- */
-
-class QOpenGLPixelTransferOptionsData : public QSharedData
-{
-public:
-    QOpenGLPixelTransferOptionsData()
-        : alignment(4)
-        , skipImages(0)
-        , skipRows(0)
-        , skipPixels(0)
-        , imageHeight(0)
-        , rowLength(0)
-        , lsbFirst(false)
-        , swapBytes(false)
-    {}
-
-    int alignment;
-    int skipImages;
-    int skipRows;
-    int skipPixels;
-    int imageHeight;
-    int rowLength;
-    bool lsbFirst;
-    bool swapBytes;
-};
-
-/*!
- * Constructs a new QOpenGLPixelTransferOptions instance with the default settings.
- */
-QOpenGLPixelTransferOptions::QOpenGLPixelTransferOptions()
-    : data(new QOpenGLPixelTransferOptionsData)
-{
-}
-
-/*!
- * \internal
- */
-QOpenGLPixelTransferOptions::QOpenGLPixelTransferOptions(const QOpenGLPixelTransferOptions &rhs)
-    : data(rhs.data)
-{
-}
-
-/*!
- * \internal
- */
-QOpenGLPixelTransferOptions &QOpenGLPixelTransferOptions::operator=(const QOpenGLPixelTransferOptions &rhs)
-{
-    if (this != &rhs)
-        data.operator=(rhs.data);
-    return *this;
-}
-
-/*!
- * Destructor.
- */
-QOpenGLPixelTransferOptions::~QOpenGLPixelTransferOptions()
-{
-}
-
-/*!
- * Sets the \a alignment requirements for each pixel row. Corresponds to \c GL_UNPACK_ALIGNMENT.
- * The default value is 4, as specified by OpenGL.
- */
-void QOpenGLPixelTransferOptions::setAlignment(int alignment)
-{
-    data->alignment = alignment;
-}
-
-/*!
- * \return the current alignment requirement for each pixel row.
- */
-int QOpenGLPixelTransferOptions::alignment() const
-{
-    return data->alignment;
-}
-
-/*!
- * Sets the number of images that are skipped to \a skipImages.
- * Corresponds to \c GL_UNPACK_SKIP_IMAGES. Equivalent to incrementing the pointer
- * passed to QOpenGLTexture::setData(). The default value is 0.
- */
-void QOpenGLPixelTransferOptions::setSkipImages(int skipImages)
-{
-    data->skipImages = skipImages;
-}
-
-/*!
- * \return the number of images that are skipped.
- */
-int QOpenGLPixelTransferOptions::skipImages() const
-{
-    return data->skipImages;
-}
-
-/*!
- * Sets the number of rows that are skipped to \a skipRows.
- * Corresponds to \c GL_UNPACK_SKIP_ROWS. Equivalent to incrementing the pointer
- * passed to QOpenGLTexture::setData(). The default value is 0.
- */
-void QOpenGLPixelTransferOptions::setSkipRows(int skipRows)
-{
-    data->skipRows = skipRows;
-}
-
-/*!
- * \return the number of rows that are skipped.
- */
-int QOpenGLPixelTransferOptions::skipRows() const
-{
-    return data->skipRows;
-}
-
-/*!
- * Sets the number of pixels that are skipped to \a skipPixels.
- * Corresponds to \c GL_UNPACK_SKIP_PIXELS. Equivalent to incrementing the pointer
- * passed to QOpenGLTexture::setData(). The default value is 0.
- */
-void QOpenGLPixelTransferOptions::setSkipPixels(int skipPixels)
-{
-    data->skipPixels = skipPixels;
-}
-
-/*!
- * \return the number of pixels that are skipped.
- */
-int QOpenGLPixelTransferOptions::skipPixels() const
-{
-    return data->skipPixels;
-}
-
-/*!
- * Sets the image height for 3D textures to \a imageHeight.
- * Corresponds to \c GL_UNPACK_IMAGE_HEIGHT.
- * The default value is 0.
- */
-void QOpenGLPixelTransferOptions::setImageHeight(int imageHeight)
-{
-    data->imageHeight = imageHeight;
-}
-
-/*!
- * \return the currently set image height.
- */
-int QOpenGLPixelTransferOptions::imageHeight() const
-{
-    return data->imageHeight;
-}
-
-/*!
- * Sets the number of pixels in a row to \a rowLength.
- * Corresponds to \c GL_UNPACK_ROW_LENGTH.
- * The default value is 0.
- */
-void QOpenGLPixelTransferOptions::setRowLength(int rowLength)
-{
-    data->rowLength = rowLength;
-}
-
-/*!
- * \return the currently set row length.
- */
-int QOpenGLPixelTransferOptions::rowLength() const
-{
-    return data->rowLength;
-}
-
-/*!
- * \a lsbFirst specifies if bits within a byte are ordered from least to most significat.
- * The default value is \c false, meaning that the first bit in each byte is the
- * most significant one. This is significant for bitmap data only.
- * Corresponds to \c GL_UNPACK_LSB_FIRST.
- */
-void QOpenGLPixelTransferOptions::setLeastSignificantByteFirst(bool lsbFirst)
-{
-    data->lsbFirst = lsbFirst;
-}
-
-/*!
- * \return \c true if bits within a byte are ordered from least to most significant.
- */
-bool QOpenGLPixelTransferOptions::isLeastSignificantBitFirst() const
-{
-    return data->lsbFirst;
-}
-
-/*!
- * \a swapBytes specifies if the byte ordering for multibyte components is reversed.
- * The default value is \c false.
- * Corresponds to \c GL_UNPACK_SWAP_BYTES.
- */
-void QOpenGLPixelTransferOptions::setSwapBytesEnabled(bool swapBytes)
-{
-    data->swapBytes = swapBytes;
-}
-
-/*!
- * \return \c true if the byte ordering for multibyte components is reversed.
- */
-bool QOpenGLPixelTransferOptions::isSwapBytesEnabled() const
-{
-    return data->swapBytes;
-}
-
-QT_END_NAMESPACE
diff --git a/src/gui/opengl/qopenglpixeltransferoptions.h b/src/gui/opengl/qopenglpixeltransferoptions.h
deleted file mode 100644
index 195543ae90..0000000000
--- a/src/gui/opengl/qopenglpixeltransferoptions.h
+++ /dev/null
@@ -1,100 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB).
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtGui module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QOPENGLPIXELUPLOADOPTIONS_H
-#define QOPENGLPIXELUPLOADOPTIONS_H
-
-#include <QtGui/qtguiglobal.h>
-
-#if !defined(QT_NO_OPENGL)
-
-#include <QtCore/QSharedDataPointer>
-
-QT_BEGIN_NAMESPACE
-
-class QOpenGLPixelTransferOptionsData;
-
-class Q_GUI_EXPORT QOpenGLPixelTransferOptions
-{
-public:
-    QOpenGLPixelTransferOptions();
-    QOpenGLPixelTransferOptions(const QOpenGLPixelTransferOptions &);
-    QOpenGLPixelTransferOptions &operator=(QOpenGLPixelTransferOptions &&other) noexcept
-    { swap(other); return *this; }
-    QOpenGLPixelTransferOptions &operator=(const QOpenGLPixelTransferOptions &);
-    ~QOpenGLPixelTransferOptions();
-
-    void swap(QOpenGLPixelTransferOptions &other) noexcept
-    { data.swap(other.data); }
-
-    void setAlignment(int alignment);
-    int alignment() const;
-
-    void setSkipImages(int skipImages);
-    int skipImages() const;
-
-    void setSkipRows(int skipRows);
-    int skipRows() const;
-
-    void setSkipPixels(int skipPixels);
-    int skipPixels() const;
-
-    void setImageHeight(int imageHeight);
-    int imageHeight() const;
-
-    void setRowLength(int rowLength);
-    int rowLength() const;
-
-    void setLeastSignificantByteFirst(bool lsbFirst);
-    bool isLeastSignificantBitFirst() const;
-
-    void setSwapBytesEnabled(bool swapBytes);
-    bool isSwapBytesEnabled() const;
-
-private:
-    QSharedDataPointer<QOpenGLPixelTransferOptionsData> data;
-};
-
-Q_DECLARE_SHARED(QOpenGLPixelTransferOptions)
-
-QT_END_NAMESPACE
-
-#endif // QT_NO_OPENGL
-
-#endif // QOPENGLPIXELUPLOADOPTIONS_H
diff --git a/src/gui/opengl/qopenglprogrambinarycache.cpp b/src/gui/opengl/qopenglprogrambinarycache.cpp
index 72bdacf43f..89c44e72c0 100644
--- a/src/gui/opengl/qopenglprogrambinarycache.cpp
+++ b/src/gui/opengl/qopenglprogrambinarycache.cpp
@@ -45,7 +45,6 @@
 #include <QDir>
 #include <QSaveFile>
 #include <QCoreApplication>
-#include <QLoggingCategory>
 #include <QCryptographicHash>
 
 #ifdef Q_OS_UNIX
diff --git a/src/gui/opengl/qopenglprogrambinarycache_p.h b/src/gui/opengl/qopenglprogrambinarycache_p.h
index f1cf24cd87..873e9d7c00 100644
--- a/src/gui/opengl/qopenglprogrambinarycache_p.h
+++ b/src/gui/opengl/qopenglprogrambinarycache_p.h
@@ -54,6 +54,7 @@
 #include <QtGui/qtguiglobal.h>
 #include <QtCore/qcache.h>
 #include <QtCore/qmutex.h>
+#include <QtCore/QLoggingCategory>
 #include <QtGui/private/qopenglcontext_p.h>
 #include <QtGui/private/qshader_p.h>
 
@@ -63,10 +64,12 @@ QT_BEGIN_NAMESPACE
 // therefore stay independent from QOpenGLShader(Program). Must rely only on
 // QOpenGLContext/Functions.
 
-class QOpenGLProgramBinaryCache
+Q_GUI_EXPORT Q_DECLARE_LOGGING_CATEGORY(lcOpenGLProgramDiskCache)
+
+class Q_GUI_EXPORT QOpenGLProgramBinaryCache
 {
 public:
-    struct ShaderDesc {
+    struct Q_GUI_EXPORT ShaderDesc {
         ShaderDesc() { }
         ShaderDesc(QShader::Stage stage, const QByteArray &source = QByteArray())
           : stage(stage), source(source)
@@ -74,7 +77,7 @@ public:
         QShader::Stage stage;
         QByteArray source;
     };
-    struct ProgramDesc {
+    struct Q_GUI_EXPORT ProgramDesc {
         QVector<ShaderDesc> shaders;
         QByteArray cacheKey() const;
     };
@@ -114,7 +117,7 @@ private:
 // per-context basis, not just once per process. QOpenGLSharedResource enables this,
 // although it's once-per-sharing-context-group, not per-context. Still, this should
 // be good enough in practice.
-class QOpenGLProgramBinarySupportCheck : public QOpenGLSharedResource
+class Q_GUI_EXPORT QOpenGLProgramBinarySupportCheck : public QOpenGLSharedResource
 {
 public:
     QOpenGLProgramBinarySupportCheck(QOpenGLContext *context);
diff --git a/src/gui/opengl/qopenglqueryhelper_p.h b/src/gui/opengl/qopenglqueryhelper_p.h
deleted file mode 100644
index ad91ca9f96..0000000000
--- a/src/gui/opengl/qopenglqueryhelper_p.h
+++ /dev/null
@@ -1,186 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB).
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtGui module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QOPENGLQUERYHELPER_P_H
-#define QOPENGLQUERYHELPER_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include <QtGui/private/qtguiglobal_p.h>
-
-#if !defined(QT_OPENGL_ES_2)
-
-#include <QtGui/QOpenGLContext>
-
-QT_BEGIN_NAMESPACE
-
-// Helper class used by QOpenGLTimerQuery and later will be used by
-// QOpenGLOcclusionQuery
-class QOpenGLQueryHelper
-{
-public:
-    QOpenGLQueryHelper(QOpenGLContext *context)
-        : GetQueryObjectuiv(nullptr),
-          GetQueryObjectiv(nullptr),
-          GetQueryiv(nullptr),
-          EndQuery(nullptr),
-          BeginQuery(nullptr),
-          IsQuery(nullptr),
-          DeleteQueries(nullptr),
-          GenQueries(nullptr),
-          GetInteger64v(nullptr),
-          GetQueryObjectui64v(nullptr),
-          GetQueryObjecti64v(nullptr),
-          QueryCounter(nullptr)
-    {
-        Q_ASSERT(context);
-
-        // Core in OpenGL >=1.5
-        GetQueryObjectuiv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLuint *)>(context->getProcAddress("glGetQueryObjectuiv"));
-        GetQueryObjectiv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLint *)>(context->getProcAddress("glGetQueryObjectiv"));
-        GetQueryiv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , GLint *)>(context->getProcAddress("glGetQueryiv"));
-        EndQuery = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum )>(context->getProcAddress("glEndQuery"));
-        BeginQuery = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLuint )>(context->getProcAddress("glBeginQuery"));
-        IsQuery = reinterpret_cast<GLboolean (QOPENGLF_APIENTRYP)(GLuint )>(context->getProcAddress("glIsQuery"));
-        DeleteQueries = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLsizei , const GLuint *)>(context->getProcAddress("glDeleteQueries"));
-        GenQueries = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLsizei , GLuint *)>(context->getProcAddress("glGenQueries"));
-
-        // Core in OpenGL >=3.2
-        GetInteger64v = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLint64 *)>(context->getProcAddress("glGetInteger64v"));
-
-        // Core in OpenGL >=3.3 / ARB_timer_query
-        GetQueryObjectui64v = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLuint64 *)>(context->getProcAddress("glGetQueryObjectui64v"));
-        GetQueryObjecti64v = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLint64 *)>(context->getProcAddress("glGetQueryObjecti64v"));
-        QueryCounter = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum )>(context->getProcAddress("glQueryCounter"));
-    }
-
-    inline void glGetQueryObjectuiv(GLuint id, GLenum pname, GLuint *params)
-    {
-        GetQueryObjectuiv(id, pname, params);
-    }
-
-    inline void glGetQueryObjectiv(GLuint id, GLenum pname, GLint *params)
-    {
-        GetQueryObjectiv(id, pname, params);
-    }
-
-    inline void glGetQueryiv(GLenum target, GLenum pname, GLint *params)
-    {
-        GetQueryiv(target, pname, params);
-    }
-
-    inline void glEndQuery(GLenum target)
-    {
-        EndQuery(target);
-    }
-
-    inline void glBeginQuery(GLenum target, GLuint id)
-    {
-        BeginQuery(target, id);
-    }
-
-    inline GLboolean glIsQuery(GLuint id)
-    {
-        return IsQuery(id);
-    }
-
-    inline void glDeleteQueries(GLsizei n, const GLuint *ids)
-    {
-        DeleteQueries(n, ids);
-    }
-
-    inline void glGenQueries(GLsizei n, GLuint *ids)
-    {
-        GenQueries(n, ids);
-    }
-
-    inline void glGetInteger64v(GLenum pname, GLint64 *params)
-    {
-        GetInteger64v(pname, params);
-    }
-
-    inline void glGetQueryObjectui64v(GLuint id, GLenum pname, GLuint64 *params)
-    {
-        GetQueryObjectui64v(id, pname, params);
-    }
-
-    inline void glGetQueryObjecti64v(GLuint id, GLenum pname, GLint64 *params)
-    {
-        GetQueryObjecti64v(id, pname, params);
-    }
-
-    inline void glQueryCounter(GLuint id, GLenum target)
-    {
-        QueryCounter(id, target);
-    }
-
-private:
-    // Core in OpenGL >=1.5
-    void (QOPENGLF_APIENTRYP GetQueryObjectuiv)(GLuint id, GLenum pname, GLuint *params);
-    void (QOPENGLF_APIENTRYP GetQueryObjectiv)(GLuint id, GLenum pname, GLint *params);
-    void (QOPENGLF_APIENTRYP GetQueryiv)(GLenum target, GLenum pname, GLint *params);
-    void (QOPENGLF_APIENTRYP EndQuery)(GLenum target);
-    void (QOPENGLF_APIENTRYP BeginQuery)(GLenum target, GLuint id);
-    GLboolean (QOPENGLF_APIENTRYP IsQuery)(GLuint id);
-    void (QOPENGLF_APIENTRYP DeleteQueries)(GLsizei n, const GLuint *ids);
-    void (QOPENGLF_APIENTRYP GenQueries)(GLsizei n, GLuint *ids);
-
-    // Core in OpenGL >=3.2
-    void (QOPENGLF_APIENTRYP GetInteger64v)(GLenum pname, GLint64 *params);
-
-    // Core in OpenGL >=3.3 and provided by ARB_timer_query
-    void (QOPENGLF_APIENTRYP GetQueryObjectui64v)(GLuint id, GLenum pname, GLuint64 *params);
-    void (QOPENGLF_APIENTRYP GetQueryObjecti64v)(GLuint id, GLenum pname, GLint64 *params);
-    void (QOPENGLF_APIENTRYP QueryCounter)(GLuint id, GLenum target);
-};
-
-QT_END_NAMESPACE
-
-#endif
-
-#endif // QOPENGLQUERYHELPER_P_H
diff --git a/src/gui/opengl/qopenglshadercache_p.h b/src/gui/opengl/qopenglshadercache_p.h
deleted file mode 100644
index 0f730602b0..0000000000
--- a/src/gui/opengl/qopenglshadercache_p.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtGui module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#ifndef QOPENGLSHADERCACHE_P_H
-#define QOPENGLSHADERCACHE_P_H
-
-#include <QtGui/private/qtguiglobal_p.h>
-
-QT_BEGIN_NAMESPACE
-
-
-class QOpenGLShaderProgram;
-class QOpenGLContext;
-
-class CachedShader
-{
-public:
-    inline CachedShader(const QByteArray &, const QByteArray &)
-    {}
-
-    inline bool isCached()
-    {
-        return false;
-    }
-
-    inline bool load(QOpenGLShaderProgram *, QOpenGLContext *)
-    {
-        return false;
-    }
-
-    inline bool store(QOpenGLShaderProgram *, QOpenGLContext *)
-    {
-        return false;
-    }
-};
-
-QT_END_NAMESPACE
-
-#endif
diff --git a/src/gui/opengl/qopenglshaderprogram.cpp b/src/gui/opengl/qopenglshaderprogram.cpp
deleted file mode 100644
index 7e89d9c8d4..0000000000
--- a/src/gui/opengl/qopenglshaderprogram.cpp
+++ /dev/null
@@ -1,3812 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtGui module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qopenglshaderprogram.h"
-#include "qopenglprogrambinarycache_p.h"
-#include "qopenglextrafunctions.h"
-#include "private/qopenglcontext_p.h"
-#include <QtCore/private/qobject_p.h>
-#include <QtCore/qdebug.h>
-#include <QtCore/qfile.h>
-#include <QtCore/qvarlengtharray.h>
-#include <QtCore/qvector.h>
-#include <QtCore/qloggingcategory.h>
-#include <QtGui/qtransform.h>
-#include <QtGui/QColor>
-#include <QtGui/QSurfaceFormat>
-
-#if !defined(QT_OPENGL_ES_2)
-#include <QtGui/qopenglfunctions_4_0_core.h>
-#endif
-
-#include <algorithm>
-
-QT_BEGIN_NAMESPACE
-
-/*!
-    \class QOpenGLShaderProgram
-    \brief The QOpenGLShaderProgram class allows OpenGL shader programs to be linked and used.
-    \since 5.0
-    \ingroup painting-3D
-    \inmodule QtGui
-
-    \section1 Introduction
-
-    This class supports shader programs written in the OpenGL Shading
-    Language (GLSL) and in the OpenGL/ES Shading Language (GLSL/ES).
-
-    QOpenGLShader and QOpenGLShaderProgram shelter the programmer from the details of
-    compiling and linking vertex and fragment shaders.
-
-    The following example creates a vertex shader program using the
-    supplied source \c{code}.  Once compiled and linked, the shader
-    program is activated in the current QOpenGLContext by calling
-    QOpenGLShaderProgram::bind():
-
-    \snippet code/src_gui_qopenglshaderprogram.cpp 0
-
-    \section1 Writing Portable Shaders
-
-    Shader programs can be difficult to reuse across OpenGL implementations
-    because of varying levels of support for standard vertex attributes and
-    uniform variables.  In particular, GLSL/ES lacks all of the
-    standard variables that are present on desktop OpenGL systems:
-    \c{gl_Vertex}, \c{gl_Normal}, \c{gl_Color}, and so on.  Desktop OpenGL
-    lacks the variable qualifiers \c{highp}, \c{mediump}, and \c{lowp}.
-
-    The QOpenGLShaderProgram class makes the process of writing portable shaders
-    easier by prefixing all shader programs with the following lines on
-    desktop OpenGL:
-
-    \code
-    #define highp
-    #define mediump
-    #define lowp
-    \endcode
-
-    This makes it possible to run most GLSL/ES shader programs
-    on desktop systems.  The programmer should restrict themselves
-    to just features that are present in GLSL/ES, and avoid
-    standard variable names that only work on the desktop.
-
-    \section1 Simple Shader Example
-
-    \snippet code/src_gui_qopenglshaderprogram.cpp 1
-
-    With the above shader program active, we can draw a green triangle
-    as follows:
-
-    \snippet code/src_gui_qopenglshaderprogram.cpp 2
-
-    \section1 Binary Shaders and Programs
-
-    Binary shaders may be specified using \c{glShaderBinary()} on
-    the return value from QOpenGLShader::shaderId().  The QOpenGLShader instance
-    containing the binary can then be added to the shader program with
-    addShader() and linked in the usual fashion with link().
-
-    Binary programs may be specified using \c{glProgramBinaryOES()}
-    on the return value from programId().  Then the application should
-    call link(), which will notice that the program has already been
-    specified and linked, allowing other operations to be performed
-    on the shader program. The shader program's id can be explicitly
-    created using the create() function.
-
-    \section2 Caching Program Binaries
-
-    As of Qt 5.9, support for caching program binaries on disk is built in. To
-    enable this, switch to using addCacheableShaderFromSourceCode() and
-    addCacheableShaderFromSourceFile(). With an OpenGL ES 3.x context or support
-    for \c{GL_ARB_get_program_binary}, this will transparently cache program
-    binaries under QStandardPaths::GenericCacheLocation or
-    QStandardPaths::CacheLocation. When support is not available, calling the
-    cacheable function variants is equivalent to the normal ones.
-
-    \note Some drivers do not have any binary formats available, even though
-    they advertise the extension or offer OpenGL ES 3.0. In this case program
-    binary support will be disabled.
-
-    \sa QOpenGLShader
-*/
-
-/*!
-    \class QOpenGLShader
-    \brief The QOpenGLShader class allows OpenGL shaders to be compiled.
-    \since 5.0
-    \ingroup painting-3D
-    \inmodule QtGui
-
-    This class supports shaders written in the OpenGL Shading Language (GLSL)
-    and in the OpenGL/ES Shading Language (GLSL/ES).
-
-    QOpenGLShader and QOpenGLShaderProgram shelter the programmer from the details of
-    compiling and linking vertex and fragment shaders.
-
-    \sa QOpenGLShaderProgram
-*/
-
-/*!
-    \enum QOpenGLShader::ShaderTypeBit
-    This enum specifies the type of QOpenGLShader that is being created.
-
-    \value Vertex Vertex shader written in the OpenGL Shading Language (GLSL).
-    \value Fragment Fragment shader written in the OpenGL Shading Language (GLSL).
-    \value Geometry Geometry shaders written in the OpenGL Shading Language (GLSL)
-           (requires OpenGL >= 3.2 or OpenGL ES >= 3.2).
-    \value TessellationControl Tessellation control shaders written in the OpenGL
-           shading language (GLSL) (requires OpenGL >= 4.0 or OpenGL ES >= 3.2).
-    \value TessellationEvaluation Tessellation evaluation shaders written in the OpenGL
-           shading language (GLSL) (requires OpenGL >= 4.0 or OpenGL ES >= 3.2).
-    \value Compute Compute shaders written in the OpenGL shading language (GLSL)
-           (requires OpenGL >= 4.3 or OpenGL ES >= 3.1).
-*/
-
-Q_DECLARE_LOGGING_CATEGORY(lcOpenGLProgramDiskCache)
-
-// For GLES 3.1/3.2
-#ifndef GL_GEOMETRY_SHADER
-#define GL_GEOMETRY_SHADER         0x8DD9
-#endif
-#ifndef GL_TESS_CONTROL_SHADER
-#define GL_TESS_CONTROL_SHADER     0x8E88
-#endif
-#ifndef GL_TESS_EVALUATION_SHADER
-#define GL_TESS_EVALUATION_SHADER  0x8E87
-#endif
-#ifndef GL_COMPUTE_SHADER
-#define GL_COMPUTE_SHADER          0x91B9
-#endif
-#ifndef GL_MAX_GEOMETRY_OUTPUT_VERTICES
-#define GL_MAX_GEOMETRY_OUTPUT_VERTICES          0x8DE0
-#endif
-#ifndef GL_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS
-#define GL_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS  0x8DE1
-#endif
-#ifndef GL_PATCH_VERTICES
-#define GL_PATCH_VERTICES  0x8E72
-#endif
-#ifndef GL_PATCH_DEFAULT_OUTER_LEVEL
-#define GL_PATCH_DEFAULT_OUTER_LEVEL  0x8E74
-#endif
-#ifndef GL_PATCH_DEFAULT_INNER_LEVEL
-#define GL_PATCH_DEFAULT_INNER_LEVEL  0x8E73
-#endif
-
-#ifndef QT_OPENGL_ES_2
-static inline bool isFormatGLES(const QSurfaceFormat &f)
-{
-    return (f.renderableType() == QSurfaceFormat::OpenGLES);
-}
-#endif
-
-static inline bool supportsGeometry(const QSurfaceFormat &f)
-{
-    return f.version() >= qMakePair(3, 2);
-}
-
-static inline bool supportsCompute(const QSurfaceFormat &f)
-{
-#ifndef QT_OPENGL_ES_2
-    if (!isFormatGLES(f))
-        return f.version() >= qMakePair(4, 3);
-    else
-        return f.version() >= qMakePair(3, 1);
-#else
-    return f.version() >= qMakePair(3, 1);
-#endif
-}
-
-static inline bool supportsTessellation(const QSurfaceFormat &f)
-{
-#ifndef QT_OPENGL_ES_2
-    if (!isFormatGLES(f))
-        return f.version() >= qMakePair(4, 0);
-    else
-        return f.version() >= qMakePair(3, 2);
-#else
-    return f.version() >= qMakePair(3, 2);
-#endif
-}
-
-class QOpenGLShaderPrivate : public QObjectPrivate
-{
-    Q_DECLARE_PUBLIC(QOpenGLShader)
-public:
-    QOpenGLShaderPrivate(QOpenGLContext *ctx, QOpenGLShader::ShaderType type)
-        : shaderGuard(nullptr)
-        , shaderType(type)
-        , compiled(false)
-        , glfuncs(new QOpenGLExtraFunctions(ctx))
-        , supportsGeometryShaders(false)
-        , supportsTessellationShaders(false)
-        , supportsComputeShaders(false)
-    {
-        if (shaderType & QOpenGLShader::Geometry)
-            supportsGeometryShaders = supportsGeometry(ctx->format());
-        else if (shaderType & (QOpenGLShader::TessellationControl | QOpenGLShader::TessellationEvaluation))
-            supportsTessellationShaders = supportsTessellation(ctx->format());
-        else if (shaderType & QOpenGLShader::Compute)
-            supportsComputeShaders = supportsCompute(ctx->format());
-    }
-    ~QOpenGLShaderPrivate();
-
-    QOpenGLSharedResourceGuard *shaderGuard;
-    QOpenGLShader::ShaderType shaderType;
-    bool compiled;
-    QString log;
-
-    QOpenGLExtraFunctions *glfuncs;
-
-    // Support for geometry shaders
-    bool supportsGeometryShaders;
-    // Support for tessellation shaders
-    bool supportsTessellationShaders;
-    // Support for compute shaders
-    bool supportsComputeShaders;
-
-
-    bool create();
-    bool compile(QOpenGLShader *q);
-    void deleteShader();
-};
-
-namespace {
-    void freeShaderFunc(QOpenGLFunctions *funcs, GLuint id)
-    {
-        funcs->glDeleteShader(id);
-    }
-}
-
-QOpenGLShaderPrivate::~QOpenGLShaderPrivate()
-{
-    delete glfuncs;
-    if (shaderGuard)
-        shaderGuard->free();
-}
-
-bool QOpenGLShaderPrivate::create()
-{
-    QOpenGLContext *context = const_cast<QOpenGLContext *>(QOpenGLContext::currentContext());
-    if (!context)
-        return false;
-    GLuint shader = 0;
-    if (shaderType == QOpenGLShader::Vertex) {
-        shader = glfuncs->glCreateShader(GL_VERTEX_SHADER);
-    } else if (shaderType == QOpenGLShader::Geometry && supportsGeometryShaders) {
-        shader = glfuncs->glCreateShader(GL_GEOMETRY_SHADER);
-    } else if (shaderType == QOpenGLShader::TessellationControl && supportsTessellationShaders) {
-        shader = glfuncs->glCreateShader(GL_TESS_CONTROL_SHADER);
-    } else if (shaderType == QOpenGLShader::TessellationEvaluation && supportsTessellationShaders) {
-        shader = glfuncs->glCreateShader(GL_TESS_EVALUATION_SHADER);
-    } else if (shaderType == QOpenGLShader::Compute && supportsComputeShaders) {
-        shader = glfuncs->glCreateShader(GL_COMPUTE_SHADER);
-    } else if (shaderType == QOpenGLShader::Fragment) {
-        shader = glfuncs->glCreateShader(GL_FRAGMENT_SHADER);
-    }
-    if (!shader) {
-        qWarning("QOpenGLShader: could not create shader");
-        return false;
-    }
-    shaderGuard = new QOpenGLSharedResourceGuard(context, shader, freeShaderFunc);
-    return true;
-}
-
-bool QOpenGLShaderPrivate::compile(QOpenGLShader *q)
-{
-    GLuint shader = shaderGuard ? shaderGuard->id() : 0;
-    if (!shader)
-        return false;
-
-    // Try to compile shader
-    glfuncs->glCompileShader(shader);
-    GLint value = 0;
-
-    // Get compilation status
-    glfuncs->glGetShaderiv(shader, GL_COMPILE_STATUS, &value);
-    compiled = (value != 0);
-
-    if (!compiled) {
-        // Compilation failed, try to provide some information about the failure
-        QString name = q->objectName();
-
-        const char *types[] = {
-            "Fragment",
-            "Vertex",
-            "Geometry",
-            "Tessellation Control",
-            "Tessellation Evaluation",
-            "Compute",
-            ""
-        };
-
-        const char *type = types[6];
-        switch (shaderType) {
-        case QOpenGLShader::Fragment:
-            type = types[0]; break;
-        case QOpenGLShader::Vertex:
-            type = types[1]; break;
-        case QOpenGLShader::Geometry:
-            type = types[2]; break;
-        case QOpenGLShader::TessellationControl:
-            type = types[3]; break;
-        case QOpenGLShader::TessellationEvaluation:
-            type = types[4]; break;
-        case QOpenGLShader::Compute:
-            type = types[5]; break;
-        }
-
-        // Get info and source code lengths
-        GLint infoLogLength = 0;
-        GLint sourceCodeLength = 0;
-        char *logBuffer = nullptr;
-        char *sourceCodeBuffer = nullptr;
-
-        // Get the compilation info log
-        glfuncs->glGetShaderiv(shader, GL_INFO_LOG_LENGTH, &infoLogLength);
-
-        if (infoLogLength > 1) {
-            GLint temp;
-            logBuffer = new char [infoLogLength];
-            glfuncs->glGetShaderInfoLog(shader, infoLogLength, &temp, logBuffer);
-        }
-
-        // Get the source code
-        glfuncs->glGetShaderiv(shader, GL_SHADER_SOURCE_LENGTH, &sourceCodeLength);
-
-        if (sourceCodeLength > 1) {
-            GLint temp;
-            sourceCodeBuffer = new char [sourceCodeLength];
-            glfuncs->glGetShaderSource(shader, sourceCodeLength, &temp, sourceCodeBuffer);
-        }
-
-        if (logBuffer)
-            log = QString::fromLatin1(logBuffer);
-        else
-            log = QLatin1String("failed");
-
-        if (name.isEmpty())
-            qWarning("QOpenGLShader::compile(%s): %s", type, qPrintable(log));
-        else
-            qWarning("QOpenGLShader::compile(%s)[%s]: %s", type, qPrintable(name), qPrintable(log));
-
-        // Dump the source code if we got it
-        if (sourceCodeBuffer) {
-            qWarning("*** Problematic %s shader source code ***\n"
-                     "%ls\n"
-                     "***",
-                     type, qUtf16Printable(QString::fromLatin1(sourceCodeBuffer)));
-        }
-
-        // Cleanup
-        delete [] logBuffer;
-        delete [] sourceCodeBuffer;
-    }
-
-    return compiled;
-}
-
-void QOpenGLShaderPrivate::deleteShader()
-{
-    if (shaderGuard) {
-        shaderGuard->free();
-        shaderGuard = nullptr;
-    }
-}
-
-/*!
-    Constructs a new QOpenGLShader object of the specified \a type
-    and attaches it to \a parent.  If shader programs are not supported,
-    QOpenGLShaderProgram::hasOpenGLShaderPrograms() will return false.
-
-    This constructor is normally followed by a call to compileSourceCode()
-    or compileSourceFile().
-
-    The shader will be associated with the current QOpenGLContext.
-
-    \sa compileSourceCode(), compileSourceFile()
-*/
-QOpenGLShader::QOpenGLShader(QOpenGLShader::ShaderType type, QObject *parent)
-    : QObject(*new QOpenGLShaderPrivate(QOpenGLContext::currentContext(), type), parent)
-{
-    Q_D(QOpenGLShader);
-    d->create();
-}
-
-/*!
-    Deletes this shader.  If the shader has been attached to a
-    QOpenGLShaderProgram object, then the actual shader will stay around
-    until the QOpenGLShaderProgram is destroyed.
-*/
-QOpenGLShader::~QOpenGLShader()
-{
-}
-
-/*!
-    Returns the type of this shader.
-*/
-QOpenGLShader::ShaderType QOpenGLShader::shaderType() const
-{
-    Q_D(const QOpenGLShader);
-    return d->shaderType;
-}
-
-static const char qualifierDefines[] =
-    "#define lowp\n"
-    "#define mediump\n"
-    "#define highp\n";
-
-#if defined(QT_OPENGL_ES) && !defined(QT_OPENGL_FORCE_SHADER_DEFINES)
-// The "highp" qualifier doesn't exist in fragment shaders
-// on all ES platforms.  When it doesn't exist, use "mediump".
-#define QOpenGL_REDEFINE_HIGHP 1
-static const char redefineHighp[] =
-    "#ifndef GL_FRAGMENT_PRECISION_HIGH\n"
-    "#define highp mediump\n"
-    "#endif\n";
-#endif
-
-// Boiler-plate header to have the layout attributes available we need later
-static const char blendEquationAdvancedHeader[] =
-    "#ifdef GL_KHR_blend_equation_advanced\n"
-    "#extension GL_ARB_fragment_coord_conventions : enable\n"
-    "#extension GL_KHR_blend_equation_advanced : enable\n"
-    "#endif\n";
-
-struct QVersionDirectivePosition
-{
-    Q_DECL_CONSTEXPR QVersionDirectivePosition(int position = 0, int line = -1)
-        : position(position)
-        , line(line)
-    {
-    }
-
-    Q_DECL_CONSTEXPR bool hasPosition() const
-    {
-        return position > 0;
-    }
-
-    const int position;
-    const int line;
-};
-
-static QVersionDirectivePosition findVersionDirectivePosition(const char *source)
-{
-    Q_ASSERT(source);
-
-    // According to the GLSL spec the #version directive must not be
-    // preceded by anything but whitespace and comments.
-    // In order to not get confused by #version directives within a
-    // multiline comment, we need to do some minimal comment parsing
-    // while searching for the directive.
-    enum {
-        Normal,
-        StartOfLine,
-        PreprocessorDirective,
-        CommentStarting,
-        MultiLineComment,
-        SingleLineComment,
-        CommentEnding
-    } state = StartOfLine;
-
-    const char *c = source;
-    while (*c) {
-        switch (state) {
-        case PreprocessorDirective:
-            if (*c == ' ' || *c == '\t')
-                break;
-            if (!strncmp(c, "version", strlen("version"))) {
-                // Found version directive
-                c += strlen("version");
-                while (*c && *c != '\n')
-                    ++c;
-                int splitPosition = c - source + 1;
-                int linePosition = int(std::count(source, c, '\n')) + 1;
-                return QVersionDirectivePosition(splitPosition, linePosition);
-            } else if (*c == '/')
-                state = CommentStarting;
-            else if (*c == '\n')
-                state = StartOfLine;
-            else
-                state = Normal;
-            break;
-        case StartOfLine:
-            if (*c == ' ' || *c == '\t')
-                break;
-            else if (*c == '#') {
-                state = PreprocessorDirective;
-                break;
-            }
-            state = Normal;
-            Q_FALLTHROUGH();
-        case Normal:
-            if (*c == '/')
-                state = CommentStarting;
-            else if (*c == '\n')
-                state = StartOfLine;
-            break;
-        case CommentStarting:
-            if (*c == '*')
-                state = MultiLineComment;
-            else if (*c == '/')
-                state = SingleLineComment;
-            else
-                state = Normal;
-            break;
-        case MultiLineComment:
-            if (*c == '*')
-                state = CommentEnding;
-            break;
-        case SingleLineComment:
-            if (*c == '\n')
-                state = Normal;
-            break;
-        case CommentEnding:
-            if (*c == '/')
-                state = Normal;
-            else if (*c != QLatin1Char('*'))
-                state = MultiLineComment;
-            break;
-        }
-        ++c;
-    }
-
-    return QVersionDirectivePosition(0, 1);
-}
-
-/*!
-    Sets the \a source code for this shader and compiles it.
-    Returns \c true if the source was successfully compiled, false otherwise.
-
-    \sa compileSourceFile()
-*/
-bool QOpenGLShader::compileSourceCode(const char *source)
-{
-    Q_D(QOpenGLShader);
-    // This method breaks the shader code into two parts:
-    // 1. Up to and including an optional #version directive.
-    // 2. The rest.
-    // If a #version directive exists, qualifierDefines and redefineHighp
-    // are inserted after. Otherwise they are inserted right at the start.
-    // In both cases a #line directive is appended in order to compensate
-    // for line number changes in case of compiler errors.
-
-    if (d->shaderGuard && d->shaderGuard->id() && source) {
-        const QVersionDirectivePosition versionDirectivePosition = findVersionDirectivePosition(source);
-
-        QVarLengthArray<const char *, 5> sourceChunks;
-        QVarLengthArray<GLint, 5> sourceChunkLengths;
-        QOpenGLContext *ctx = QOpenGLContext::currentContext();
-
-        if (versionDirectivePosition.hasPosition()) {
-            // Append source up to and including the #version directive
-            sourceChunks.append(source);
-            sourceChunkLengths.append(GLint(versionDirectivePosition.position));
-        } else {
-            // QTBUG-55733: Intel on Windows with Compatibility profile requires a #version always
-            if (ctx->format().profile() == QSurfaceFormat::CompatibilityProfile) {
-                const char *vendor = reinterpret_cast<const char *>(ctx->functions()->glGetString(GL_VENDOR));
-                if (vendor && !strcmp(vendor, "Intel")) {
-                    static const char version110[] = "#version 110\n";
-                    sourceChunks.append(version110);
-                    sourceChunkLengths.append(GLint(sizeof(version110)) - 1);
-                }
-            }
-        }
-        if (d->shaderType == Fragment) {
-            sourceChunks.append(blendEquationAdvancedHeader);
-            sourceChunkLengths.append(GLint(sizeof(blendEquationAdvancedHeader) - 1));
-        }
-
-        // The precision qualifiers are useful on OpenGL/ES systems,
-        // but usually not present on desktop systems.
-        const QSurfaceFormat currentSurfaceFormat = ctx->format();
-        QOpenGLContextPrivate *ctx_d = QOpenGLContextPrivate::get(QOpenGLContext::currentContext());
-        if (currentSurfaceFormat.renderableType() == QSurfaceFormat::OpenGL
-                || ctx_d->workaround_missingPrecisionQualifiers
-#ifdef QT_OPENGL_FORCE_SHADER_DEFINES
-                || true
-#endif
-                ) {
-            sourceChunks.append(qualifierDefines);
-            sourceChunkLengths.append(GLint(sizeof(qualifierDefines) - 1));
-        }
-
-#ifdef QOpenGL_REDEFINE_HIGHP
-        if (d->shaderType == Fragment && !ctx_d->workaround_missingPrecisionQualifiers
-            && QOpenGLContext::currentContext()->isOpenGLES()) {
-            sourceChunks.append(redefineHighp);
-            sourceChunkLengths.append(GLint(sizeof(redefineHighp) - 1));
-        }
-#endif
-
-        QByteArray lineDirective;
-        // #line is rejected by some drivers:
-        // "2.1 Mesa 8.1-devel (git-48a3d4e)" or "MESA 2.1 Mesa 8.1-devel"
-        const char *version = reinterpret_cast<const char *>(ctx->functions()->glGetString(GL_VERSION));
-        if (!version || !strstr(version, "2.1 Mesa 8")) {
-            // Append #line directive in order to compensate for text insertion
-            lineDirective = QStringLiteral("#line %1\n").arg(versionDirectivePosition.line).toUtf8();
-            sourceChunks.append(lineDirective.constData());
-            sourceChunkLengths.append(GLint(lineDirective.length()));
-        }
-
-        // Append rest of shader code
-        sourceChunks.append(source + versionDirectivePosition.position);
-        sourceChunkLengths.append(GLint(qstrlen(source + versionDirectivePosition.position)));
-
-        d->glfuncs->glShaderSource(d->shaderGuard->id(), sourceChunks.size(), sourceChunks.data(), sourceChunkLengths.data());
-        return d->compile(this);
-    } else {
-        return false;
-    }
-}
-
-/*!
-    \overload
-
-    Sets the \a source code for this shader and compiles it.
-    Returns \c true if the source was successfully compiled, false otherwise.
-
-    \sa compileSourceFile()
-*/
-bool QOpenGLShader::compileSourceCode(const QByteArray& source)
-{
-    return compileSourceCode(source.constData());
-}
-
-/*!
-    \overload
-
-    Sets the \a source code for this shader and compiles it.
-    Returns \c true if the source was successfully compiled, false otherwise.
-
-    \sa compileSourceFile()
-*/
-bool QOpenGLShader::compileSourceCode(const QString& source)
-{
-    return compileSourceCode(source.toLatin1().constData());
-}
-
-/*!
-    Sets the source code for this shader to the contents of \a fileName
-    and compiles it.  Returns \c true if the file could be opened and the
-    source compiled, false otherwise.
-
-    \sa compileSourceCode()
-*/
-bool QOpenGLShader::compileSourceFile(const QString& fileName)
-{
-    QFile file(fileName);
-    if (!file.open(QFile::ReadOnly)) {
-        qWarning() << "QOpenGLShader: Unable to open file" << fileName;
-        return false;
-    }
-
-    QByteArray contents = file.readAll();
-    return compileSourceCode(contents.constData());
-}
-
-/*!
-    Returns the source code for this shader.
-
-    \sa compileSourceCode()
-*/
-QByteArray QOpenGLShader::sourceCode() const
-{
-    Q_D(const QOpenGLShader);
-    GLuint shader = d->shaderGuard ? d->shaderGuard->id() : 0;
-    if (!shader)
-        return QByteArray();
-    GLint size = 0;
-    d->glfuncs->glGetShaderiv(shader, GL_SHADER_SOURCE_LENGTH, &size);
-    if (size <= 0)
-        return QByteArray();
-    GLint len = 0;
-    char *source = new char [size];
-    d->glfuncs->glGetShaderSource(shader, size, &len, source);
-    QByteArray src(source);
-    delete [] source;
-    return src;
-}
-
-/*!
-    Returns \c true if this shader has been compiled; false otherwise.
-
-    \sa compileSourceCode(), compileSourceFile()
-*/
-bool QOpenGLShader::isCompiled() const
-{
-    Q_D(const QOpenGLShader);
-    return d->compiled;
-}
-
-/*!
-    Returns the errors and warnings that occurred during the last compile.
-
-    \sa compileSourceCode(), compileSourceFile()
-*/
-QString QOpenGLShader::log() const
-{
-    Q_D(const QOpenGLShader);
-    return d->log;
-}
-
-/*!
-    Returns the OpenGL identifier associated with this shader.
-
-    \sa QOpenGLShaderProgram::programId()
-*/
-GLuint QOpenGLShader::shaderId() const
-{
-    Q_D(const QOpenGLShader);
-    return d->shaderGuard ? d->shaderGuard->id() : 0;
-}
-
-class QOpenGLShaderProgramPrivate : public QObjectPrivate
-{
-    Q_DECLARE_PUBLIC(QOpenGLShaderProgram)
-public:
-    QOpenGLShaderProgramPrivate()
-        : programGuard(nullptr)
-        , linked(false)
-        , inited(false)
-        , removingShaders(false)
-        , glfuncs(new QOpenGLExtraFunctions)
-#ifndef QT_OPENGL_ES_2
-        , tessellationFuncs(nullptr)
-#endif
-        , linkBinaryRecursion(false)
-    {
-    }
-    ~QOpenGLShaderProgramPrivate();
-
-    QOpenGLSharedResourceGuard *programGuard;
-    bool linked;
-    bool inited;
-    bool removingShaders;
-
-    QString log;
-    QList<QOpenGLShader *> shaders;
-    QList<QOpenGLShader *> anonShaders;
-
-    QOpenGLExtraFunctions *glfuncs;
-#ifndef QT_OPENGL_ES_2
-    // for tessellation features not in GLES 3.2
-    QOpenGLFunctions_4_0_Core *tessellationFuncs;
-#endif
-
-    bool hasShader(QOpenGLShader::ShaderType type) const;
-
-    QOpenGLProgramBinaryCache::ProgramDesc binaryProgram;
-    bool isCacheDisabled() const;
-    bool compileCacheable();
-    bool linkBinary();
-
-    bool linkBinaryRecursion;
-};
-
-namespace {
-    void freeProgramFunc(QOpenGLFunctions *funcs, GLuint id)
-    {
-        funcs->glDeleteProgram(id);
-    }
-}
-
-
-QOpenGLShaderProgramPrivate::~QOpenGLShaderProgramPrivate()
-{
-    delete glfuncs;
-    if (programGuard)
-        programGuard->free();
-}
-
-bool QOpenGLShaderProgramPrivate::hasShader(QOpenGLShader::ShaderType type) const
-{
-    for (QOpenGLShader *shader : shaders) {
-        if (shader->shaderType() == type)
-            return true;
-    }
-    return false;
-}
-
-/*!
-    Constructs a new shader program and attaches it to \a parent.
-    The program will be invalid until addShader() is called.
-
-    The shader program will be associated with the current QOpenGLContext.
-
-    \sa addShader()
-*/
-QOpenGLShaderProgram::QOpenGLShaderProgram(QObject *parent)
-    : QObject(*new QOpenGLShaderProgramPrivate, parent)
-{
-}
-
-/*!
-    Deletes this shader program.
-*/
-QOpenGLShaderProgram::~QOpenGLShaderProgram()
-{
-}
-
-/*!
-    Requests the shader program's id to be created immediately. Returns \c true
-    if successful; \c false otherwise.
-
-    This function is primarily useful when combining QOpenGLShaderProgram
-    with other OpenGL functions that operate directly on the shader
-    program id, like \c {GL_OES_get_program_binary}.
-
-    When the shader program is used normally, the shader program's id will
-    be created on demand.
-
-    \sa programId()
-
-    \since 5.3
- */
-bool QOpenGLShaderProgram::create()
-{
-    return init();
-}
-
-bool QOpenGLShaderProgram::init()
-{
-    Q_D(QOpenGLShaderProgram);
-    if ((d->programGuard && d->programGuard->id()) || d->inited)
-        return true;
-    d->inited = true;
-    QOpenGLContext *context = const_cast<QOpenGLContext *>(QOpenGLContext::currentContext());
-    if (!context)
-        return false;
-    d->glfuncs->initializeOpenGLFunctions();
-
-#ifndef QT_OPENGL_ES_2
-    if (!context->isOpenGLES() && context->format().version() >= qMakePair(4, 0)) {
-        d->tessellationFuncs = context->versionFunctions<QOpenGLFunctions_4_0_Core>();
-        d->tessellationFuncs->initializeOpenGLFunctions();
-    }
-#endif
-
-    GLuint program = d->glfuncs->glCreateProgram();
-    if (!program) {
-        qWarning("QOpenGLShaderProgram: could not create shader program");
-        return false;
-    }
-    if (d->programGuard)
-        delete d->programGuard;
-    d->programGuard = new QOpenGLSharedResourceGuard(context, program, freeProgramFunc);
-    return true;
-}
-
-/*!
-    Adds a compiled \a shader to this shader program.  Returns \c true
-    if the shader could be added, or false otherwise.
-
-    Ownership of the \a shader object remains with the caller.
-    It will not be deleted when this QOpenGLShaderProgram instance
-    is deleted.  This allows the caller to add the same shader
-    to multiple shader programs.
-
-    \sa addShaderFromSourceCode(), addShaderFromSourceFile()
-    \sa removeShader(), link(), removeAllShaders()
-*/
-bool QOpenGLShaderProgram::addShader(QOpenGLShader *shader)
-{
-    Q_D(QOpenGLShaderProgram);
-    if (!init())
-        return false;
-    if (d->shaders.contains(shader))
-        return true;    // Already added to this shader program.
-    if (d->programGuard && d->programGuard->id() && shader) {
-        if (!shader->d_func()->shaderGuard || !shader->d_func()->shaderGuard->id())
-            return false;
-        if (d->programGuard->group() != shader->d_func()->shaderGuard->group()) {
-            qWarning("QOpenGLShaderProgram::addShader: Program and shader are not associated with same context.");
-            return false;
-        }
-        d->glfuncs->glAttachShader(d->programGuard->id(), shader->d_func()->shaderGuard->id());
-        d->linked = false;  // Program needs to be relinked.
-        d->shaders.append(shader);
-        connect(shader, SIGNAL(destroyed()), this, SLOT(shaderDestroyed()));
-        return true;
-    } else {
-        return false;
-    }
-}
-
-/*!
-    Compiles \a source as a shader of the specified \a type and
-    adds it to this shader program.  Returns \c true if compilation
-    was successful, false otherwise.  The compilation errors
-    and warnings will be made available via log().
-
-    This function is intended to be a short-cut for quickly
-    adding vertex and fragment shaders to a shader program without
-    creating an instance of QOpenGLShader first.
-
-    \sa addShader(), addShaderFromSourceFile()
-    \sa removeShader(), link(), log(), removeAllShaders()
-*/
-bool QOpenGLShaderProgram::addShaderFromSourceCode(QOpenGLShader::ShaderType type, const char *source)
-{
-    Q_D(QOpenGLShaderProgram);
-    if (!init())
-        return false;
-    QOpenGLShader *shader = new QOpenGLShader(type, this);
-    if (!shader->compileSourceCode(source)) {
-        d->log = shader->log();
-        delete shader;
-        return false;
-    }
-    d->anonShaders.append(shader);
-    return addShader(shader);
-}
-
-/*!
-    \overload
-
-    Compiles \a source as a shader of the specified \a type and
-    adds it to this shader program.  Returns \c true if compilation
-    was successful, false otherwise.  The compilation errors
-    and warnings will be made available via log().
-
-    This function is intended to be a short-cut for quickly
-    adding vertex and fragment shaders to a shader program without
-    creating an instance of QOpenGLShader first.
-
-    \sa addShader(), addShaderFromSourceFile()
-    \sa removeShader(), link(), log(), removeAllShaders()
-*/
-bool QOpenGLShaderProgram::addShaderFromSourceCode(QOpenGLShader::ShaderType type, const QByteArray& source)
-{
-    return addShaderFromSourceCode(type, source.constData());
-}
-
-/*!
-    \overload
-
-    Compiles \a source as a shader of the specified \a type and
-    adds it to this shader program.  Returns \c true if compilation
-    was successful, false otherwise.  The compilation errors
-    and warnings will be made available via log().
-
-    This function is intended to be a short-cut for quickly
-    adding vertex and fragment shaders to a shader program without
-    creating an instance of QOpenGLShader first.
-
-    \sa addShader(), addShaderFromSourceFile()
-    \sa removeShader(), link(), log(), removeAllShaders()
-*/
-bool QOpenGLShaderProgram::addShaderFromSourceCode(QOpenGLShader::ShaderType type, const QString& source)
-{
-    return addShaderFromSourceCode(type, source.toLatin1().constData());
-}
-
-/*!
-    Compiles the contents of \a fileName as a shader of the specified
-    \a type and adds it to this shader program.  Returns \c true if
-    compilation was successful, false otherwise.  The compilation errors
-    and warnings will be made available via log().
-
-    This function is intended to be a short-cut for quickly
-    adding vertex and fragment shaders to a shader program without
-    creating an instance of QOpenGLShader first.
-
-    \sa addShader(), addShaderFromSourceCode()
-*/
-bool QOpenGLShaderProgram::addShaderFromSourceFile
-    (QOpenGLShader::ShaderType type, const QString& fileName)
-{
-    Q_D(QOpenGLShaderProgram);
-    if (!init())
-        return false;
-    QOpenGLShader *shader = new QOpenGLShader(type, this);
-    if (!shader->compileSourceFile(fileName)) {
-        d->log = shader->log();
-        delete shader;
-        return false;
-    }
-    d->anonShaders.append(shader);
-    return addShader(shader);
-}
-
-/*!
-    Registers the shader of the specified \a type and \a source to this
-    program. Unlike addShaderFromSourceCode(), this function does not perform
-    compilation. Compilation is deferred to link(), and may not happen at all,
-    because link() may potentially use a program binary from Qt's shader disk
-    cache. This will typically lead to a significant increase in performance.
-
-    \return true if the shader has been registered or, in the non-cached case,
-    compiled successfully; false if there was an error. The compilation error
-    messages can be retrieved via log().
-
-    When the disk cache is disabled, via Qt::AA_DisableShaderDiskCache for
-    example, or the OpenGL context has no support for context binaries, calling
-    this function is equivalent to addShaderFromSourceCode().
-
-    \since 5.9
-    \sa addShaderFromSourceCode(), addCacheableShaderFromSourceFile()
- */
-bool QOpenGLShaderProgram::addCacheableShaderFromSourceCode(QOpenGLShader::ShaderType type, const char *source)
-{
-    Q_D(QOpenGLShaderProgram);
-    if (!init())
-        return false;
-    if (d->isCacheDisabled())
-        return addShaderFromSourceCode(type, source);
-
-    return addCacheableShaderFromSourceCode(type, QByteArray(source));
-}
-
-static inline QShader::Stage qt_shaderTypeToStage(QOpenGLShader::ShaderType type)
-{
-    switch (type) {
-    case QOpenGLShader::Vertex:
-        return QShader::VertexStage;
-    case QOpenGLShader::Fragment:
-        return QShader::FragmentStage;
-    case QOpenGLShader::Geometry:
-        return QShader::GeometryStage;
-    case QOpenGLShader::TessellationControl:
-        return QShader::TessellationControlStage;
-    case QOpenGLShader::TessellationEvaluation:
-        return QShader::TessellationEvaluationStage;
-    case QOpenGLShader::Compute:
-        return QShader::ComputeStage;
-    }
-    return QShader::VertexStage;
-}
-
-static inline QOpenGLShader::ShaderType qt_shaderStageToType(QShader::Stage stage)
-{
-    switch (stage) {
-    case QShader::VertexStage:
-        return QOpenGLShader::Vertex;
-    case QShader::TessellationControlStage:
-        return QOpenGLShader::TessellationControl;
-    case QShader::TessellationEvaluationStage:
-        return QOpenGLShader::TessellationEvaluation;
-    case QShader::GeometryStage:
-        return QOpenGLShader::Geometry;
-    case QShader::FragmentStage:
-        return QOpenGLShader::Fragment;
-    case QShader::ComputeStage:
-        return QOpenGLShader::Compute;
-    }
-    return QOpenGLShader::Vertex;
-}
-
-/*!
-    \overload
-
-    Registers the shader of the specified \a type and \a source to this
-    program. Unlike addShaderFromSourceCode(), this function does not perform
-    compilation. Compilation is deferred to link(), and may not happen at all,
-    because link() may potentially use a program binary from Qt's shader disk
-    cache. This will typically lead to a significant increase in performance.
-
-    \return true if the shader has been registered or, in the non-cached case,
-    compiled successfully; false if there was an error. The compilation error
-    messages can be retrieved via log().
-
-    When the disk cache is disabled, via Qt::AA_DisableShaderDiskCache for
-    example, or the OpenGL context has no support for context binaries, calling
-    this function is equivalent to addShaderFromSourceCode().
-
-    \since 5.9
-    \sa addShaderFromSourceCode(), addCacheableShaderFromSourceFile()
- */
-bool QOpenGLShaderProgram::addCacheableShaderFromSourceCode(QOpenGLShader::ShaderType type, const QByteArray &source)
-{
-    Q_D(QOpenGLShaderProgram);
-    if (!init())
-        return false;
-    if (d->isCacheDisabled())
-        return addShaderFromSourceCode(type, source);
-
-    d->binaryProgram.shaders.append(QOpenGLProgramBinaryCache::ShaderDesc(qt_shaderTypeToStage(type), source));
-    return true;
-}
-
-/*!
-    \overload
-
-    Registers the shader of the specified \a type and \a source to this
-    program. Unlike addShaderFromSourceCode(), this function does not perform
-    compilation. Compilation is deferred to link(), and may not happen at all,
-    because link() may potentially use a program binary from Qt's shader disk
-    cache. This will typically lead to a significant increase in performance.
-
-    When the disk cache is disabled, via Qt::AA_DisableShaderDiskCache for
-    example, or the OpenGL context has no support for context binaries, calling
-    this function is equivalent to addShaderFromSourceCode().
-
-    \since 5.9
-    \sa addShaderFromSourceCode(), addCacheableShaderFromSourceFile()
- */
-bool QOpenGLShaderProgram::addCacheableShaderFromSourceCode(QOpenGLShader::ShaderType type, const QString &source)
-{
-    Q_D(QOpenGLShaderProgram);
-    if (!init())
-        return false;
-    if (d->isCacheDisabled())
-        return addShaderFromSourceCode(type, source);
-
-    return addCacheableShaderFromSourceCode(type, source.toUtf8().constData());
-}
-
-/*!
-    Registers the shader of the specified \a type and \a fileName to this
-    program. Unlike addShaderFromSourceFile(), this function does not perform
-    compilation. Compilation is deferred to link(), and may not happen at all,
-    because link() may potentially use a program binary from Qt's shader disk
-    cache. This will typically lead to a significant increase in performance.
-
-    \return true if the file has been read successfully, false if the file could
-    not be opened or the normal, non-cached compilation of the shader has
-    failed. The compilation error messages can be retrieved via log().
-
-    When the disk cache is disabled, via Qt::AA_DisableShaderDiskCache for
-    example, or the OpenGL context has no support for context binaries, calling
-    this function is equivalent to addShaderFromSourceFile().
-
-    \since 5.9
-    \sa addShaderFromSourceFile(), addCacheableShaderFromSourceCode()
- */
-bool QOpenGLShaderProgram::addCacheableShaderFromSourceFile(QOpenGLShader::ShaderType type, const QString &fileName)
-{
-    Q_D(QOpenGLShaderProgram);
-    if (!init())
-        return false;
-    if (d->isCacheDisabled())
-        return addShaderFromSourceFile(type, fileName);
-
-    QOpenGLProgramBinaryCache::ShaderDesc shader(qt_shaderTypeToStage(type));
-    // NB! It could be tempting to defer reading the file contents and just
-    // hash the filename as the cache key, perhaps combined with last-modified
-    // timestamp checks. However, this would raise a number of issues (no
-    // timestamps for files in the resource system; preference for global, not
-    // per-application cache items (where filenames may clash); resource-based
-    // shaders from libraries like Qt Quick; etc.), so just avoid it.
-    QFile f(fileName);
-    if (f.open(QIODevice::ReadOnly | QIODevice::Text)) {
-        shader.source = f.readAll();
-        f.close();
-    } else {
-        qWarning("QOpenGLShaderProgram: Unable to open file %s", qPrintable(fileName));
-        return false;
-    }
-    d->binaryProgram.shaders.append(shader);
-    return true;
-}
-
-/*!
-    Removes \a shader from this shader program.  The object is not deleted.
-
-    The shader program must be valid in the current QOpenGLContext.
-
-    \sa addShader(), link(), removeAllShaders()
-*/
-void QOpenGLShaderProgram::removeShader(QOpenGLShader *shader)
-{
-    Q_D(QOpenGLShaderProgram);
-    if (d->programGuard && d->programGuard->id()
-        && shader && shader->d_func()->shaderGuard)
-    {
-        d->glfuncs->glDetachShader(d->programGuard->id(), shader->d_func()->shaderGuard->id());
-    }
-    d->linked = false;  // Program needs to be relinked.
-    if (shader) {
-        d->shaders.removeAll(shader);
-        d->anonShaders.removeAll(shader);
-        disconnect(shader, SIGNAL(destroyed()), this, SLOT(shaderDestroyed()));
-    }
-}
-
-/*!
-    Returns a list of all shaders that have been added to this shader
-    program using addShader().
-
-    \sa addShader(), removeShader()
-*/
-QList<QOpenGLShader *> QOpenGLShaderProgram::shaders() const
-{
-    Q_D(const QOpenGLShaderProgram);
-    return d->shaders;
-}
-
-/*!
-    Removes all of the shaders that were added to this program previously.
-    The QOpenGLShader objects for the shaders will not be deleted if they
-    were constructed externally.  QOpenGLShader objects that are constructed
-    internally by QOpenGLShaderProgram will be deleted.
-
-    \sa addShader(), removeShader()
-*/
-void QOpenGLShaderProgram::removeAllShaders()
-{
-    Q_D(QOpenGLShaderProgram);
-    d->removingShaders = true;
-    for (QOpenGLShader *shader : qAsConst(d->shaders)) {
-        if (d->programGuard && d->programGuard->id()
-            && shader && shader->d_func()->shaderGuard)
-        {
-            d->glfuncs->glDetachShader(d->programGuard->id(), shader->d_func()->shaderGuard->id());
-        }
-    }
-    // Delete shader objects that were created anonymously.
-    qDeleteAll(d->anonShaders);
-    d->shaders.clear();
-    d->anonShaders.clear();
-    d->binaryProgram = QOpenGLProgramBinaryCache::ProgramDesc();
-    d->linked = false;  // Program needs to be relinked.
-    d->removingShaders = false;
-}
-
-/*!
-    Links together the shaders that were added to this program with
-    addShader().  Returns \c true if the link was successful or
-    false otherwise.  If the link failed, the error messages can
-    be retrieved with log().
-
-    Subclasses can override this function to initialize attributes
-    and uniform variables for use in specific shader programs.
-
-    If the shader program was already linked, calling this
-    function again will force it to be re-linked.
-
-    When shaders were added to this program via
-    addCacheableShaderFromSourceCode() or addCacheableShaderFromSourceFile(),
-    program binaries are supported, and a cached binary is available on disk,
-    actual compilation and linking are skipped. Instead, link() will initialize
-    the program with the binary blob via glProgramBinary(). If there is no
-    cached version of the program or it was generated with a different driver
-    version, the shaders will be compiled from source and the program will get
-    linked normally. This allows seamless upgrading of the graphics drivers,
-    without having to worry about potentially incompatible binary formats.
-
-    \sa addShader(), log()
-*/
-bool QOpenGLShaderProgram::link()
-{
-    Q_D(QOpenGLShaderProgram);
-    GLuint program = d->programGuard ? d->programGuard->id() : 0;
-    if (!program)
-        return false;
-
-    if (!d->linkBinaryRecursion && d->shaders.isEmpty() && !d->binaryProgram.shaders.isEmpty())
-        return d->linkBinary();
-
-    GLint value;
-    if (d->shaders.isEmpty()) {
-        // If there are no explicit shaders, then it is possible that the
-        // application added a program binary with glProgramBinaryOES(), or
-        // otherwise populated the shaders itself. This is also the case when
-        // we are recursively called back from linkBinary() after a successful
-        // glProgramBinary(). Check to see if the program is already linked and
-        // bail out if so.
-        value = 0;
-        d->glfuncs->glGetProgramiv(program, GL_LINK_STATUS, &value);
-        d->linked = (value != 0);
-        if (d->linked)
-            return true;
-    }
-
-    d->glfuncs->glLinkProgram(program);
-    value = 0;
-    d->glfuncs->glGetProgramiv(program, GL_LINK_STATUS, &value);
-    d->linked = (value != 0);
-    value = 0;
-    d->glfuncs->glGetProgramiv(program, GL_INFO_LOG_LENGTH, &value);
-    d->log = QString();
-    if (value > 1) {
-        char *logbuf = new char [value];
-        GLint len;
-        d->glfuncs->glGetProgramInfoLog(program, value, &len, logbuf);
-        d->log = QString::fromLatin1(logbuf);
-        if (!d->linked && !d->linkBinaryRecursion) {
-            QString name = objectName();
-            if (name.isEmpty())
-                qWarning("QOpenGLShader::link: %ls", qUtf16Printable(d->log));
-            else
-                qWarning("QOpenGLShader::link[%ls]: %ls", qUtf16Printable(name), qUtf16Printable(d->log));
-        }
-        delete [] logbuf;
-    }
-    return d->linked;
-}
-
-/*!
-    Returns \c true if this shader program has been linked; false otherwise.
-
-    \sa link()
-*/
-bool QOpenGLShaderProgram::isLinked() const
-{
-    Q_D(const QOpenGLShaderProgram);
-    return d->linked;
-}
-
-/*!
-    Returns the errors and warnings that occurred during the last link()
-    or addShader() with explicitly specified source code.
-
-    \sa link()
-*/
-QString QOpenGLShaderProgram::log() const
-{
-    Q_D(const QOpenGLShaderProgram);
-    return d->log;
-}
-
-/*!
-    Binds this shader program to the active QOpenGLContext and makes
-    it the current shader program.  Any previously bound shader program
-    is released.  This is equivalent to calling \c{glUseProgram()} on
-    programId().  Returns \c true if the program was successfully bound;
-    false otherwise.  If the shader program has not yet been linked,
-    or it needs to be re-linked, this function will call link().
-
-    \sa link(), release()
-*/
-bool QOpenGLShaderProgram::bind()
-{
-    Q_D(QOpenGLShaderProgram);
-    GLuint program = d->programGuard ? d->programGuard->id() : 0;
-    if (!program)
-        return false;
-    if (!d->linked && !link())
-        return false;
-#ifndef QT_NO_DEBUG
-    if (d->programGuard->group() != QOpenGLContextGroup::currentContextGroup()) {
-        qWarning("QOpenGLShaderProgram::bind: program is not valid in the current context.");
-        return false;
-    }
-#endif
-    d->glfuncs->glUseProgram(program);
-    return true;
-}
-
-/*!
-    Releases the active shader program from the current QOpenGLContext.
-    This is equivalent to calling \c{glUseProgram(0)}.
-
-    \sa bind()
-*/
-void QOpenGLShaderProgram::release()
-{
-    Q_D(QOpenGLShaderProgram);
-#ifndef QT_NO_DEBUG
-    if (d->programGuard && d->programGuard->group() != QOpenGLContextGroup::currentContextGroup())
-        qWarning("QOpenGLShaderProgram::release: program is not valid in the current context.");
-#endif
-    d->glfuncs->glUseProgram(0);
-}
-
-/*!
-    Returns the OpenGL identifier associated with this shader program.
-
-    \sa QOpenGLShader::shaderId()
-*/
-GLuint QOpenGLShaderProgram::programId() const
-{
-    Q_D(const QOpenGLShaderProgram);
-    GLuint id = d->programGuard ? d->programGuard->id() : 0;
-    if (id)
-        return id;
-
-    // Create the identifier if we don't have one yet.  This is for
-    // applications that want to create the attached shader configuration
-    // themselves, particularly those using program binaries.
-    if (!const_cast<QOpenGLShaderProgram *>(this)->init())
-        return 0;
-    return d->programGuard ? d->programGuard->id() : 0;
-}
-
-/*!
-    Binds the attribute \a name to the specified \a location.  This
-    function can be called before or after the program has been linked.
-    Any attributes that have not been explicitly bound when the program
-    is linked will be assigned locations automatically.
-
-    When this function is called after the program has been linked,
-    the program will need to be relinked for the change to take effect.
-
-    \sa attributeLocation()
-*/
-void QOpenGLShaderProgram::bindAttributeLocation(const char *name, int location)
-{
-    Q_D(QOpenGLShaderProgram);
-    if (!init() || !d->programGuard || !d->programGuard->id())
-        return;
-    d->glfuncs->glBindAttribLocation(d->programGuard->id(), location, name);
-    d->linked = false;  // Program needs to be relinked.
-}
-
-/*!
-    \overload
-
-    Binds the attribute \a name to the specified \a location.  This
-    function can be called before or after the program has been linked.
-    Any attributes that have not been explicitly bound when the program
-    is linked will be assigned locations automatically.
-
-    When this function is called after the program has been linked,
-    the program will need to be relinked for the change to take effect.
-
-    \sa attributeLocation()
-*/
-void QOpenGLShaderProgram::bindAttributeLocation(const QByteArray& name, int location)
-{
-    bindAttributeLocation(name.constData(), location);
-}
-
-/*!
-    \overload
-
-    Binds the attribute \a name to the specified \a location.  This
-    function can be called before or after the program has been linked.
-    Any attributes that have not been explicitly bound when the program
-    is linked will be assigned locations automatically.
-
-    When this function is called after the program has been linked,
-    the program will need to be relinked for the change to take effect.
-
-    \sa attributeLocation()
-*/
-void QOpenGLShaderProgram::bindAttributeLocation(const QString& name, int location)
-{
-    bindAttributeLocation(name.toLatin1().constData(), location);
-}
-
-/*!
-    Returns the location of the attribute \a name within this shader
-    program's parameter list.  Returns -1 if \a name is not a valid
-    attribute for this shader program.
-
-    \sa uniformLocation(), bindAttributeLocation()
-*/
-int QOpenGLShaderProgram::attributeLocation(const char *name) const
-{
-    Q_D(const QOpenGLShaderProgram);
-    if (d->linked && d->programGuard && d->programGuard->id()) {
-        return d->glfuncs->glGetAttribLocation(d->programGuard->id(), name);
-    } else {
-        qWarning("QOpenGLShaderProgram::attributeLocation(%s): shader program is not linked", name);
-        return -1;
-    }
-}
-
-/*!
-    \overload
-
-    Returns the location of the attribute \a name within this shader
-    program's parameter list.  Returns -1 if \a name is not a valid
-    attribute for this shader program.
-
-    \sa uniformLocation(), bindAttributeLocation()
-*/
-int QOpenGLShaderProgram::attributeLocation(const QByteArray& name) const
-{
-    return attributeLocation(name.constData());
-}
-
-/*!
-    \overload
-
-    Returns the location of the attribute \a name within this shader
-    program's parameter list.  Returns -1 if \a name is not a valid
-    attribute for this shader program.
-
-    \sa uniformLocation(), bindAttributeLocation()
-*/
-int QOpenGLShaderProgram::attributeLocation(const QString& name) const
-{
-    return attributeLocation(name.toLatin1().constData());
-}
-
-/*!
-    Sets the attribute at \a location in the current context to \a value.
-
-    \sa setUniformValue()
-*/
-void QOpenGLShaderProgram::setAttributeValue(int location, GLfloat value)
-{
-    Q_D(QOpenGLShaderProgram);
-    if (location != -1)
-        d->glfuncs->glVertexAttrib1fv(location, &value);
-}
-
-/*!
-    \overload
-
-    Sets the attribute called \a name in the current context to \a value.
-
-    \sa setUniformValue()
-*/
-void QOpenGLShaderProgram::setAttributeValue(const char *name, GLfloat value)
-{
-    setAttributeValue(attributeLocation(name), value);
-}
-
-/*!
-    Sets the attribute at \a location in the current context to
-    the 2D vector (\a x, \a y).
-
-    \sa setUniformValue()
-*/
-void QOpenGLShaderProgram::setAttributeValue(int location, GLfloat x, GLfloat y)
-{
-    Q_D(QOpenGLShaderProgram);
-    if (location != -1) {
-        GLfloat values[2] = {x, y};
-        d->glfuncs->glVertexAttrib2fv(location, values);
-    }
-}
-
-/*!
-    \overload
-
-    Sets the attribute called \a name in the current context to
-    the 2D vector (\a x, \a y).
-
-    \sa setUniformValue()
-*/
-void QOpenGLShaderProgram::setAttributeValue(const char *name, GLfloat x, GLfloat y)
-{
-    setAttributeValue(attributeLocation(name), x, y);
-}
-
-/*!
-    Sets the attribute at \a location in the current context to
-    the 3D vector (\a x, \a y, \a z).
-
-    \sa setUniformValue()
-*/
-void QOpenGLShaderProgram::setAttributeValue
-        (int location, GLfloat x, GLfloat y, GLfloat z)
-{
-    Q_D(QOpenGLShaderProgram);
-    Q_UNUSED(d);
-    if (location != -1) {
-        GLfloat values[3] = {x, y, z};
-        d->glfuncs->glVertexAttrib3fv(location, values);
-    }
-}
-
-/*!
-    \overload
-
-    Sets the attribute called \a name in the current context to
-    the 3D vector (\a x, \a y, \a z).
-
-    \sa setUniformValue()
-*/
-void QOpenGLShaderProgram::setAttributeValue
-        (const char *name, GLfloat x, GLfloat y, GLfloat z)
-{
-    setAttributeValue(attributeLocation(name), x, y, z);
-}
-
-/*!
-    Sets the attribute at \a location in the current context to
-    the 4D vector (\a x, \a y, \a z, \a w).
-
-    \sa setUniformValue()
-*/
-void QOpenGLShaderProgram::setAttributeValue
-        (int location, GLfloat x, GLfloat y, GLfloat z, GLfloat w)
-{
-    Q_D(QOpenGLShaderProgram);
-    if (location != -1) {
-        GLfloat values[4] = {x, y, z, w};
-        d->glfuncs->glVertexAttrib4fv(location, values);
-    }
-}
-
-/*!
-    \overload
-
-    Sets the attribute called \a name in the current context to
-    the 4D vector (\a x, \a y, \a z, \a w).
-
-    \sa setUniformValue()
-*/
-void QOpenGLShaderProgram::setAttributeValue
-        (const char *name, GLfloat x, GLfloat y, GLfloat z, GLfloat w)
-{
-    setAttributeValue(attributeLocation(name), x, y, z, w);
-}
-
-/*!
-    Sets the attribute at \a location in the current context to \a value.
-
-    \sa setUniformValue()
-*/
-void QOpenGLShaderProgram::setAttributeValue(int location, const QVector2D& value)
-{
-    Q_D(QOpenGLShaderProgram);
-    if (location != -1)
-        d->glfuncs->glVertexAttrib2fv(location, reinterpret_cast<const GLfloat *>(&value));
-}
-
-/*!
-    \overload
-
-    Sets the attribute called \a name in the current context to \a value.
-
-    \sa setUniformValue()
-*/
-void QOpenGLShaderProgram::setAttributeValue(const char *name, const QVector2D& value)
-{
-    setAttributeValue(attributeLocation(name), value);
-}
-
-/*!
-    Sets the attribute at \a location in the current context to \a value.
-
-    \sa setUniformValue()
-*/
-void QOpenGLShaderProgram::setAttributeValue(int location, const QVector3D& value)
-{
-    Q_D(QOpenGLShaderProgram);
-    Q_UNUSED(d);
-    if (location != -1)
-        d->glfuncs->glVertexAttrib3fv(location, reinterpret_cast<const GLfloat *>(&value));
-}
-
-/*!
-    \overload
-
-    Sets the attribute called \a name in the current context to \a value.
-
-    \sa setUniformValue()
-*/
-void QOpenGLShaderProgram::setAttributeValue(const char *name, const QVector3D& value)
-{
-    setAttributeValue(attributeLocation(name), value);
-}
-
-/*!
-    Sets the attribute at \a location in the current context to \a value.
-
-    \sa setUniformValue()
-*/
-void QOpenGLShaderProgram::setAttributeValue(int location, const QVector4D& value)
-{
-    Q_D(QOpenGLShaderProgram);
-    Q_UNUSED(d);
-    if (location != -1)
-        d->glfuncs->glVertexAttrib4fv(location, reinterpret_cast<const GLfloat *>(&value));
-}
-
-/*!
-    \overload
-
-    Sets the attribute called \a name in the current context to \a value.
-
-    \sa setUniformValue()
-*/
-void QOpenGLShaderProgram::setAttributeValue(const char *name, const QVector4D& value)
-{
-    setAttributeValue(attributeLocation(name), value);
-}
-
-/*!
-    Sets the attribute at \a location in the current context to \a value.
-
-    \sa setUniformValue()
-*/
-void QOpenGLShaderProgram::setAttributeValue(int location, const QColor& value)
-{
-    Q_D(QOpenGLShaderProgram);
-    Q_UNUSED(d);
-    if (location != -1) {
-        GLfloat values[4] = {GLfloat(value.redF()), GLfloat(value.greenF()),
-                             GLfloat(value.blueF()), GLfloat(value.alphaF())};
-        d->glfuncs->glVertexAttrib4fv(location, values);
-    }
-}
-
-/*!
-    \overload
-
-    Sets the attribute called \a name in the current context to \a value.
-
-    \sa setUniformValue()
-*/
-void QOpenGLShaderProgram::setAttributeValue(const char *name, const QColor& value)
-{
-    setAttributeValue(attributeLocation(name), value);
-}
-
-/*!
-    Sets the attribute at \a location in the current context to the
-    contents of \a values, which contains \a columns elements, each
-    consisting of \a rows elements.  The \a rows value should be
-    1, 2, 3, or 4.  This function is typically used to set matrix
-    values and column vectors.
-
-    \sa setUniformValue()
-*/
-void QOpenGLShaderProgram::setAttributeValue
-    (int location, const GLfloat *values, int columns, int rows)
-{
-    Q_D(QOpenGLShaderProgram);
-    Q_UNUSED(d);
-    if (rows < 1 || rows > 4) {
-        qWarning("QOpenGLShaderProgram::setAttributeValue: rows %d not supported", rows);
-        return;
-    }
-    if (location != -1) {
-        while (columns-- > 0) {
-            if (rows == 1)
-                d->glfuncs->glVertexAttrib1fv(location, values);
-            else if (rows == 2)
-                d->glfuncs->glVertexAttrib2fv(location, values);
-            else if (rows == 3)
-                d->glfuncs->glVertexAttrib3fv(location, values);
-            else
-                d->glfuncs->glVertexAttrib4fv(location, values);
-            values += rows;
-            ++location;
-        }
-    }
-}
-
-/*!
-    \overload
-
-    Sets the attribute called \a name in the current context to the
-    contents of \a values, which contains \a columns elements, each
-    consisting of \a rows elements.  The \a rows value should be
-    1, 2, 3, or 4.  This function is typically used to set matrix
-    values and column vectors.
-
-    \sa setUniformValue()
-*/
-void QOpenGLShaderProgram::setAttributeValue
-    (const char *name, const GLfloat *values, int columns, int rows)
-{
-    setAttributeValue(attributeLocation(name), values, columns, rows);
-}
-
-/*!
-    Sets an array of vertex \a values on the attribute at \a location
-    in this shader program.  The \a tupleSize indicates the number of
-    components per vertex (1, 2, 3, or 4), and the \a stride indicates
-    the number of bytes between vertices.  A default \a stride value
-    of zero indicates that the vertices are densely packed in \a values.
-
-    The array will become active when enableAttributeArray() is called
-    on the \a location.  Otherwise the value specified with
-    setAttributeValue() for \a location will be used.
-
-    \sa setAttributeValue(), setUniformValue(), enableAttributeArray()
-    \sa disableAttributeArray()
-*/
-void QOpenGLShaderProgram::setAttributeArray
-    (int location, const GLfloat *values, int tupleSize, int stride)
-{
-    Q_D(QOpenGLShaderProgram);
-    Q_UNUSED(d);
-    if (location != -1) {
-        d->glfuncs->glVertexAttribPointer(location, tupleSize, GL_FLOAT, GL_FALSE,
-                              stride, values);
-    }
-}
-
-/*!
-    Sets an array of 2D vertex \a values on the attribute at \a location
-    in this shader program.  The \a stride indicates the number of bytes
-    between vertices.  A default \a stride value of zero indicates that
-    the vertices are densely packed in \a values.
-
-    The array will become active when enableAttributeArray() is called
-    on the \a location.  Otherwise the value specified with
-    setAttributeValue() for \a location will be used.
-
-    \sa setAttributeValue(), setUniformValue(), enableAttributeArray()
-    \sa disableAttributeArray()
-*/
-void QOpenGLShaderProgram::setAttributeArray
-        (int location, const QVector2D *values, int stride)
-{
-    Q_D(QOpenGLShaderProgram);
-    Q_UNUSED(d);
-    if (location != -1) {
-        d->glfuncs->glVertexAttribPointer(location, 2, GL_FLOAT, GL_FALSE,
-                              stride, values);
-    }
-}
-
-/*!
-    Sets an array of 3D vertex \a values on the attribute at \a location
-    in this shader program.  The \a stride indicates the number of bytes
-    between vertices.  A default \a stride value of zero indicates that
-    the vertices are densely packed in \a values.
-
-    The array will become active when enableAttributeArray() is called
-    on the \a location.  Otherwise the value specified with
-    setAttributeValue() for \a location will be used.
-
-    \sa setAttributeValue(), setUniformValue(), enableAttributeArray()
-    \sa disableAttributeArray()
-*/
-void QOpenGLShaderProgram::setAttributeArray
-        (int location, const QVector3D *values, int stride)
-{
-    Q_D(QOpenGLShaderProgram);
-    Q_UNUSED(d);
-    if (location != -1) {
-        d->glfuncs->glVertexAttribPointer(location, 3, GL_FLOAT, GL_FALSE,
-                              stride, values);
-    }
-}
-
-/*!
-    Sets an array of 4D vertex \a values on the attribute at \a location
-    in this shader program.  The \a stride indicates the number of bytes
-    between vertices.  A default \a stride value of zero indicates that
-    the vertices are densely packed in \a values.
-
-    The array will become active when enableAttributeArray() is called
-    on the \a location.  Otherwise the value specified with
-    setAttributeValue() for \a location will be used.
-
-    \sa setAttributeValue(), setUniformValue(), enableAttributeArray()
-    \sa disableAttributeArray()
-*/
-void QOpenGLShaderProgram::setAttributeArray
-        (int location, const QVector4D *values, int stride)
-{
-    Q_D(QOpenGLShaderProgram);
-    Q_UNUSED(d);
-    if (location != -1) {
-        d->glfuncs->glVertexAttribPointer(location, 4, GL_FLOAT, GL_FALSE,
-                              stride, values);
-    }
-}
-
-/*!
-    Sets an array of vertex \a values on the attribute at \a location
-    in this shader program.  The \a stride indicates the number of bytes
-    between vertices.  A default \a stride value of zero indicates that
-    the vertices are densely packed in \a values.
-
-    The \a type indicates the type of elements in the \a values array,
-    usually \c{GL_FLOAT}, \c{GL_UNSIGNED_BYTE}, etc.  The \a tupleSize
-    indicates the number of components per vertex: 1, 2, 3, or 4.
-
-    The array will become active when enableAttributeArray() is called
-    on the \a location.  Otherwise the value specified with
-    setAttributeValue() for \a location will be used.
-
-    The setAttributeBuffer() function can be used to set the attribute
-    array to an offset within a vertex buffer.
-
-    \note Normalization will be enabled. If this is not desired, call
-    glVertexAttribPointer directly through QOpenGLFunctions.
-
-    \sa setAttributeValue(), setUniformValue(), enableAttributeArray()
-    \sa disableAttributeArray(), setAttributeBuffer()
-*/
-void QOpenGLShaderProgram::setAttributeArray
-    (int location, GLenum type, const void *values, int tupleSize, int stride)
-{
-    Q_D(QOpenGLShaderProgram);
-    Q_UNUSED(d);
-    if (location != -1) {
-        d->glfuncs->glVertexAttribPointer(location, tupleSize, type, GL_TRUE,
-                              stride, values);
-    }
-}
-
-/*!
-    \overload
-
-    Sets an array of vertex \a values on the attribute called \a name
-    in this shader program.  The \a tupleSize indicates the number of
-    components per vertex (1, 2, 3, or 4), and the \a stride indicates
-    the number of bytes between vertices.  A default \a stride value
-    of zero indicates that the vertices are densely packed in \a values.
-
-    The array will become active when enableAttributeArray() is called
-    on \a name.  Otherwise the value specified with setAttributeValue()
-    for \a name will be used.
-
-    \sa setAttributeValue(), setUniformValue(), enableAttributeArray()
-    \sa disableAttributeArray()
-*/
-void QOpenGLShaderProgram::setAttributeArray
-    (const char *name, const GLfloat *values, int tupleSize, int stride)
-{
-    setAttributeArray(attributeLocation(name), values, tupleSize, stride);
-}
-
-/*!
-    \overload
-
-    Sets an array of 2D vertex \a values on the attribute called \a name
-    in this shader program.  The \a stride indicates the number of bytes
-    between vertices.  A default \a stride value of zero indicates that
-    the vertices are densely packed in \a values.
-
-    The array will become active when enableAttributeArray() is called
-    on \a name.  Otherwise the value specified with setAttributeValue()
-    for \a name will be used.
-
-    \sa setAttributeValue(), setUniformValue(), enableAttributeArray()
-    \sa disableAttributeArray()
-*/
-void QOpenGLShaderProgram::setAttributeArray
-        (const char *name, const QVector2D *values, int stride)
-{
-    setAttributeArray(attributeLocation(name), values, stride);
-}
-
-/*!
-    \overload
-
-    Sets an array of 3D vertex \a values on the attribute called \a name
-    in this shader program.  The \a stride indicates the number of bytes
-    between vertices.  A default \a stride value of zero indicates that
-    the vertices are densely packed in \a values.
-
-    The array will become active when enableAttributeArray() is called
-    on \a name.  Otherwise the value specified with setAttributeValue()
-    for \a name will be used.
-
-    \sa setAttributeValue(), setUniformValue(), enableAttributeArray()
-    \sa disableAttributeArray()
-*/
-void QOpenGLShaderProgram::setAttributeArray
-        (const char *name, const QVector3D *values, int stride)
-{
-    setAttributeArray(attributeLocation(name), values, stride);
-}
-
-/*!
-    \overload
-
-    Sets an array of 4D vertex \a values on the attribute called \a name
-    in this shader program.  The \a stride indicates the number of bytes
-    between vertices.  A default \a stride value of zero indicates that
-    the vertices are densely packed in \a values.
-
-    The array will become active when enableAttributeArray() is called
-    on \a name.  Otherwise the value specified with setAttributeValue()
-    for \a name will be used.
-
-    \sa setAttributeValue(), setUniformValue(), enableAttributeArray()
-    \sa disableAttributeArray()
-*/
-void QOpenGLShaderProgram::setAttributeArray
-        (const char *name, const QVector4D *values, int stride)
-{
-    setAttributeArray(attributeLocation(name), values, stride);
-}
-
-/*!
-    \overload
-
-    Sets an array of vertex \a values on the attribute called \a name
-    in this shader program.  The \a stride indicates the number of bytes
-    between vertices.  A default \a stride value of zero indicates that
-    the vertices are densely packed in \a values.
-
-    The \a type indicates the type of elements in the \a values array,
-    usually \c{GL_FLOAT}, \c{GL_UNSIGNED_BYTE}, etc.  The \a tupleSize
-    indicates the number of components per vertex: 1, 2, 3, or 4.
-
-    The array will become active when enableAttributeArray() is called
-    on the \a name.  Otherwise the value specified with
-    setAttributeValue() for \a name will be used.
-
-    The setAttributeBuffer() function can be used to set the attribute
-    array to an offset within a vertex buffer.
-
-    \sa setAttributeValue(), setUniformValue(), enableAttributeArray()
-    \sa disableAttributeArray(), setAttributeBuffer()
-*/
-void QOpenGLShaderProgram::setAttributeArray
-    (const char *name, GLenum type, const void *values, int tupleSize, int stride)
-{
-    setAttributeArray(attributeLocation(name), type, values, tupleSize, stride);
-}
-
-/*!
-    Sets an array of vertex values on the attribute at \a location in
-    this shader program, starting at a specific \a offset in the
-    currently bound vertex buffer.  The \a stride indicates the number
-    of bytes between vertices.  A default \a stride value of zero
-    indicates that the vertices are densely packed in the value array.
-
-    The \a type indicates the type of elements in the vertex value
-    array, usually \c{GL_FLOAT}, \c{GL_UNSIGNED_BYTE}, etc.  The \a
-    tupleSize indicates the number of components per vertex: 1, 2, 3,
-    or 4.
-
-    The array will become active when enableAttributeArray() is called
-    on the \a location.  Otherwise the value specified with
-    setAttributeValue() for \a location will be used.
-
-    \note Normalization will be enabled. If this is not desired, call
-    glVertexAttribPointer directly through QOpenGLFunctions.
-
-    \sa setAttributeArray()
-*/
-void QOpenGLShaderProgram::setAttributeBuffer
-    (int location, GLenum type, int offset, int tupleSize, int stride)
-{
-    Q_D(QOpenGLShaderProgram);
-    Q_UNUSED(d);
-    if (location != -1) {
-        d->glfuncs->glVertexAttribPointer(location, tupleSize, type, GL_TRUE, stride,
-                              reinterpret_cast<const void *>(qintptr(offset)));
-    }
-}
-
-/*!
-    \overload
-
-    Sets an array of vertex values on the attribute called \a name
-    in this shader program, starting at a specific \a offset in the
-    currently bound vertex buffer.  The \a stride indicates the number
-    of bytes between vertices.  A default \a stride value of zero
-    indicates that the vertices are densely packed in the value array.
-
-    The \a type indicates the type of elements in the vertex value
-    array, usually \c{GL_FLOAT}, \c{GL_UNSIGNED_BYTE}, etc.  The \a
-    tupleSize indicates the number of components per vertex: 1, 2, 3,
-    or 4.
-
-    The array will become active when enableAttributeArray() is called
-    on the \a name.  Otherwise the value specified with
-    setAttributeValue() for \a name will be used.
-
-    \sa setAttributeArray()
-*/
-void QOpenGLShaderProgram::setAttributeBuffer
-    (const char *name, GLenum type, int offset, int tupleSize, int stride)
-{
-    setAttributeBuffer(attributeLocation(name), type, offset, tupleSize, stride);
-}
-
-/*!
-    Enables the vertex array at \a location in this shader program
-    so that the value set by setAttributeArray() on \a location
-    will be used by the shader program.
-
-    \sa disableAttributeArray(), setAttributeArray(), setAttributeValue()
-    \sa setUniformValue()
-*/
-void QOpenGLShaderProgram::enableAttributeArray(int location)
-{
-    Q_D(QOpenGLShaderProgram);
-    Q_UNUSED(d);
-    if (location != -1)
-        d->glfuncs->glEnableVertexAttribArray(location);
-}
-
-/*!
-    \overload
-
-    Enables the vertex array called \a name in this shader program
-    so that the value set by setAttributeArray() on \a name
-    will be used by the shader program.
-
-    \sa disableAttributeArray(), setAttributeArray(), setAttributeValue()
-    \sa setUniformValue()
-*/
-void QOpenGLShaderProgram::enableAttributeArray(const char *name)
-{
-    enableAttributeArray(attributeLocation(name));
-}
-
-/*!
-    Disables the vertex array at \a location in this shader program
-    that was enabled by a previous call to enableAttributeArray().
-
-    \sa enableAttributeArray(), setAttributeArray(), setAttributeValue()
-    \sa setUniformValue()
-*/
-void QOpenGLShaderProgram::disableAttributeArray(int location)
-{
-    Q_D(QOpenGLShaderProgram);
-    Q_UNUSED(d);
-    if (location != -1)
-        d->glfuncs->glDisableVertexAttribArray(location);
-}
-
-/*!
-    \overload
-
-    Disables the vertex array called \a name in this shader program
-    that was enabled by a previous call to enableAttributeArray().
-
-    \sa enableAttributeArray(), setAttributeArray(), setAttributeValue()
-    \sa setUniformValue()
-*/
-void QOpenGLShaderProgram::disableAttributeArray(const char *name)
-{
-    disableAttributeArray(attributeLocation(name));
-}
-
-/*!
-    Returns the location of the uniform variable \a name within this shader
-    program's parameter list.  Returns -1 if \a name is not a valid
-    uniform variable for this shader program.
-
-    \sa attributeLocation()
-*/
-int QOpenGLShaderProgram::uniformLocation(const char *name) const
-{
-    Q_D(const QOpenGLShaderProgram);
-    Q_UNUSED(d);
-    if (d->linked && d->programGuard && d->programGuard->id()) {
-        return d->glfuncs->glGetUniformLocation(d->programGuard->id(), name);
-    } else {
-        qWarning("QOpenGLShaderProgram::uniformLocation(%s): shader program is not linked", name);
-        return -1;
-    }
-}
-
-/*!
-    \overload
-
-    Returns the location of the uniform variable \a name within this shader
-    program's parameter list.  Returns -1 if \a name is not a valid
-    uniform variable for this shader program.
-
-    \sa attributeLocation()
-*/
-int QOpenGLShaderProgram::uniformLocation(const QByteArray& name) const
-{
-    return uniformLocation(name.constData());
-}
-
-/*!
-    \overload
-
-    Returns the location of the uniform variable \a name within this shader
-    program's parameter list.  Returns -1 if \a name is not a valid
-    uniform variable for this shader program.
-
-    \sa attributeLocation()
-*/
-int QOpenGLShaderProgram::uniformLocation(const QString& name) const
-{
-    return uniformLocation(name.toLatin1().constData());
-}
-
-/*!
-    Sets the uniform variable at \a location in the current context to \a value.
-
-    \sa setAttributeValue()
-*/
-void QOpenGLShaderProgram::setUniformValue(int location, GLfloat value)
-{
-    Q_D(QOpenGLShaderProgram);
-    Q_UNUSED(d);
-    if (location != -1)
-        d->glfuncs->glUniform1fv(location, 1, &value);
-}
-
-/*!
-    \overload
-
-    Sets the uniform variable called \a name in the current context
-    to \a value.
-
-    \sa setAttributeValue()
-*/
-void QOpenGLShaderProgram::setUniformValue(const char *name, GLfloat value)
-{
-    setUniformValue(uniformLocation(name), value);
-}
-
-/*!
-    Sets the uniform variable at \a location in the current context to \a value.
-
-    \sa setAttributeValue()
-*/
-void QOpenGLShaderProgram::setUniformValue(int location, GLint value)
-{
-    Q_D(QOpenGLShaderProgram);
-    Q_UNUSED(d);
-    if (location != -1)
-        d->glfuncs->glUniform1i(location, value);
-}
-
-/*!
-    \overload
-
-    Sets the uniform variable called \a name in the current context
-    to \a value.
-
-    \sa setAttributeValue()
-*/
-void QOpenGLShaderProgram::setUniformValue(const char *name, GLint value)
-{
-    setUniformValue(uniformLocation(name), value);
-}
-
-/*!
-    Sets the uniform variable at \a location in the current context to \a value.
-    This function should be used when setting sampler values.
-
-    \note This function is not aware of unsigned int support in modern OpenGL
-    versions and therefore treats \a value as a GLint and calls glUniform1i.
-
-    \sa setAttributeValue()
-*/
-void QOpenGLShaderProgram::setUniformValue(int location, GLuint value)
-{
-    Q_D(QOpenGLShaderProgram);
-    Q_UNUSED(d);
-    if (location != -1)
-        d->glfuncs->glUniform1i(location, value);
-}
-
-/*!
-    \overload
-
-    Sets the uniform variable called \a name in the current context
-    to \a value.  This function should be used when setting sampler values.
-
-    \note This function is not aware of unsigned int support in modern OpenGL
-    versions and therefore treats \a value as a GLint and calls glUniform1i.
-
-    \sa setAttributeValue()
-*/
-void QOpenGLShaderProgram::setUniformValue(const char *name, GLuint value)
-{
-    setUniformValue(uniformLocation(name), value);
-}
-
-/*!
-    Sets the uniform variable at \a location in the current context to
-    the 2D vector (\a x, \a y).
-
-    \sa setAttributeValue()
-*/
-void QOpenGLShaderProgram::setUniformValue(int location, GLfloat x, GLfloat y)
-{
-    Q_D(QOpenGLShaderProgram);
-    Q_UNUSED(d);
-    if (location != -1) {
-        GLfloat values[2] = {x, y};
-        d->glfuncs->glUniform2fv(location, 1, values);
-    }
-}
-
-/*!
-    \overload
-
-    Sets the uniform variable called \a name in the current context to
-    the 2D vector (\a x, \a y).
-
-    \sa setAttributeValue()
-*/
-void QOpenGLShaderProgram::setUniformValue(const char *name, GLfloat x, GLfloat y)
-{
-    setUniformValue(uniformLocation(name), x, y);
-}
-
-/*!
-    Sets the uniform variable at \a location in the current context to
-    the 3D vector (\a x, \a y, \a z).
-
-    \sa setAttributeValue()
-*/
-void QOpenGLShaderProgram::setUniformValue
-        (int location, GLfloat x, GLfloat y, GLfloat z)
-{
-    Q_D(QOpenGLShaderProgram);
-    Q_UNUSED(d);
-    if (location != -1) {
-        GLfloat values[3] = {x, y, z};
-        d->glfuncs->glUniform3fv(location, 1, values);
-    }
-}
-
-/*!
-    \overload
-
-    Sets the uniform variable called \a name in the current context to
-    the 3D vector (\a x, \a y, \a z).
-
-    \sa setAttributeValue()
-*/
-void QOpenGLShaderProgram::setUniformValue
-        (const char *name, GLfloat x, GLfloat y, GLfloat z)
-{
-    setUniformValue(uniformLocation(name), x, y, z);
-}
-
-/*!
-    Sets the uniform variable at \a location in the current context to
-    the 4D vector (\a x, \a y, \a z, \a w).
-
-    \sa setAttributeValue()
-*/
-void QOpenGLShaderProgram::setUniformValue
-        (int location, GLfloat x, GLfloat y, GLfloat z, GLfloat w)
-{
-    Q_D(QOpenGLShaderProgram);
-    Q_UNUSED(d);
-    if (location != -1) {
-        GLfloat values[4] = {x, y, z, w};
-        d->glfuncs->glUniform4fv(location, 1, values);
-    }
-}
-
-/*!
-    \overload
-
-    Sets the uniform variable called \a name in the current context to
-    the 4D vector (\a x, \a y, \a z, \a w).
-
-    \sa setAttributeValue()
-*/
-void QOpenGLShaderProgram::setUniformValue
-        (const char *name, GLfloat x, GLfloat y, GLfloat z, GLfloat w)
-{
-    setUniformValue(uniformLocation(name), x, y, z, w);
-}
-
-/*!
-    Sets the uniform variable at \a location in the current context to \a value.
-
-    \sa setAttributeValue()
-*/
-void QOpenGLShaderProgram::setUniformValue(int location, const QVector2D& value)
-{
-    Q_D(QOpenGLShaderProgram);
-    Q_UNUSED(d);
-    if (location != -1)
-        d->glfuncs->glUniform2fv(location, 1, reinterpret_cast<const GLfloat *>(&value));
-}
-
-/*!
-    \overload
-
-    Sets the uniform variable called \a name in the current context
-    to \a value.
-
-    \sa setAttributeValue()
-*/
-void QOpenGLShaderProgram::setUniformValue(const char *name, const QVector2D& value)
-{
-    setUniformValue(uniformLocation(name), value);
-}
-
-/*!
-    Sets the uniform variable at \a location in the current context to \a value.
-
-    \sa setAttributeValue()
-*/
-void QOpenGLShaderProgram::setUniformValue(int location, const QVector3D& value)
-{
-    Q_D(QOpenGLShaderProgram);
-    Q_UNUSED(d);
-    if (location != -1)
-        d->glfuncs->glUniform3fv(location, 1, reinterpret_cast<const GLfloat *>(&value));
-}
-
-/*!
-    \overload
-
-    Sets the uniform variable called \a name in the current context
-    to \a value.
-
-    \sa setAttributeValue()
-*/
-void QOpenGLShaderProgram::setUniformValue(const char *name, const QVector3D& value)
-{
-    setUniformValue(uniformLocation(name), value);
-}
-
-/*!
-    Sets the uniform variable at \a location in the current context to \a value.
-
-    \sa setAttributeValue()
-*/
-void QOpenGLShaderProgram::setUniformValue(int location, const QVector4D& value)
-{
-    Q_D(QOpenGLShaderProgram);
-    Q_UNUSED(d);
-    if (location != -1)
-        d->glfuncs->glUniform4fv(location, 1, reinterpret_cast<const GLfloat *>(&value));
-}
-
-/*!
-    \overload
-
-    Sets the uniform variable called \a name in the current context
-    to \a value.
-
-    \sa setAttributeValue()
-*/
-void QOpenGLShaderProgram::setUniformValue(const char *name, const QVector4D& value)
-{
-    setUniformValue(uniformLocation(name), value);
-}
-
-/*!
-    Sets the uniform variable at \a location in the current context to
-    the red, green, blue, and alpha components of \a color.
-
-    \sa setAttributeValue()
-*/
-void QOpenGLShaderProgram::setUniformValue(int location, const QColor& color)
-{
-    Q_D(QOpenGLShaderProgram);
-    Q_UNUSED(d);
-    if (location != -1) {
-        GLfloat values[4] = {GLfloat(color.redF()), GLfloat(color.greenF()),
-                             GLfloat(color.blueF()), GLfloat(color.alphaF())};
-        d->glfuncs->glUniform4fv(location, 1, values);
-    }
-}
-
-/*!
-    \overload
-
-    Sets the uniform variable called \a name in the current context to
-    the red, green, blue, and alpha components of \a color.
-
-    \sa setAttributeValue()
-*/
-void QOpenGLShaderProgram::setUniformValue(const char *name, const QColor& color)
-{
-    setUniformValue(uniformLocation(name), color);
-}
-
-/*!
-    Sets the uniform variable at \a location in the current context to
-    the x and y coordinates of \a point.
-
-    \sa setAttributeValue()
-*/
-void QOpenGLShaderProgram::setUniformValue(int location, const QPoint& point)
-{
-    Q_D(QOpenGLShaderProgram);
-    Q_UNUSED(d);
-    if (location != -1) {
-        GLfloat values[4] = {GLfloat(point.x()), GLfloat(point.y())};
-        d->glfuncs->glUniform2fv(location, 1, values);
-    }
-}
-
-/*!
-    \overload
-
-    Sets the uniform variable associated with \a name in the current
-    context to the x and y coordinates of \a point.
-
-    \sa setAttributeValue()
-*/
-void QOpenGLShaderProgram::setUniformValue(const char *name, const QPoint& point)
-{
-    setUniformValue(uniformLocation(name), point);
-}
-
-/*!
-    Sets the uniform variable at \a location in the current context to
-    the x and y coordinates of \a point.
-
-    \sa setAttributeValue()
-*/
-void QOpenGLShaderProgram::setUniformValue(int location, const QPointF& point)
-{
-    Q_D(QOpenGLShaderProgram);
-    Q_UNUSED(d);
-    if (location != -1) {
-        GLfloat values[4] = {GLfloat(point.x()), GLfloat(point.y())};
-        d->glfuncs->glUniform2fv(location, 1, values);
-    }
-}
-
-/*!
-    \overload
-
-    Sets the uniform variable associated with \a name in the current
-    context to the x and y coordinates of \a point.
-
-    \sa setAttributeValue()
-*/
-void QOpenGLShaderProgram::setUniformValue(const char *name, const QPointF& point)
-{
-    setUniformValue(uniformLocation(name), point);
-}
-
-/*!
-    Sets the uniform variable at \a location in the current context to
-    the width and height of the given \a size.
-
-    \sa setAttributeValue()
-*/
-void QOpenGLShaderProgram::setUniformValue(int location, const QSize& size)
-{
-    Q_D(QOpenGLShaderProgram);
-    Q_UNUSED(d);
-    if (location != -1) {
-        GLfloat values[4] = {GLfloat(size.width()), GLfloat(size.height())};
-        d->glfuncs->glUniform2fv(location, 1, values);
-    }
-}
-
-/*!
-    \overload
-
-    Sets the uniform variable associated with \a name in the current
-    context to the width and height of the given \a size.
-
-    \sa setAttributeValue()
-*/
-void QOpenGLShaderProgram::setUniformValue(const char *name, const QSize& size)
-{
-    setUniformValue(uniformLocation(name), size);
-}
-
-/*!
-    Sets the uniform variable at \a location in the current context to
-    the width and height of the given \a size.
-
-    \sa setAttributeValue()
-*/
-void QOpenGLShaderProgram::setUniformValue(int location, const QSizeF& size)
-{
-    Q_D(QOpenGLShaderProgram);
-    Q_UNUSED(d);
-    if (location != -1) {
-        GLfloat values[4] = {GLfloat(size.width()), GLfloat(size.height())};
-        d->glfuncs->glUniform2fv(location, 1, values);
-    }
-}
-
-/*!
-    \overload
-
-    Sets the uniform variable associated with \a name in the current
-    context to the width and height of the given \a size.
-
-    \sa setAttributeValue()
-*/
-void QOpenGLShaderProgram::setUniformValue(const char *name, const QSizeF& size)
-{
-    setUniformValue(uniformLocation(name), size);
-}
-
-/*!
-    Sets the uniform variable at \a location in the current context
-    to a 2x2 matrix \a value.
-
-    \sa setAttributeValue()
-*/
-void QOpenGLShaderProgram::setUniformValue(int location, const QMatrix2x2& value)
-{
-    Q_D(QOpenGLShaderProgram);
-    Q_UNUSED(d);
-    d->glfuncs->glUniformMatrix2fv(location, 1, GL_FALSE, value.constData());
-}
-
-/*!
-    \overload
-
-    Sets the uniform variable called \a name in the current context
-    to a 2x2 matrix \a value.
-
-    \sa setAttributeValue()
-*/
-void QOpenGLShaderProgram::setUniformValue(const char *name, const QMatrix2x2& value)
-{
-    setUniformValue(uniformLocation(name), value);
-}
-
-/*!
-    Sets the uniform variable at \a location in the current context
-    to a 2x3 matrix \a value.
-
-    \note This function is not aware of non square matrix support,
-    that is, GLSL types like mat2x3, that is present in modern OpenGL
-    versions. Instead, it treats the uniform as an array of vec3.
-
-    \sa setAttributeValue()
-*/
-void QOpenGLShaderProgram::setUniformValue(int location, const QMatrix2x3& value)
-{
-    Q_D(QOpenGLShaderProgram);
-    Q_UNUSED(d);
-    d->glfuncs->glUniform3fv(location, 2, value.constData());
-}
-
-/*!
-    \overload
-
-    Sets the uniform variable called \a name in the current context
-    to a 2x3 matrix \a value.
-
-    \note This function is not aware of non square matrix support,
-    that is, GLSL types like mat2x3, that is present in modern OpenGL
-    versions. Instead, it treats the uniform as an array of vec3.
-
-    \sa setAttributeValue()
-*/
-void QOpenGLShaderProgram::setUniformValue(const char *name, const QMatrix2x3& value)
-{
-    setUniformValue(uniformLocation(name), value);
-}
-
-/*!
-    Sets the uniform variable at \a location in the current context
-    to a 2x4 matrix \a value.
-
-    \note This function is not aware of non square matrix support,
-    that is, GLSL types like mat2x4, that is present in modern OpenGL
-    versions. Instead, it treats the uniform as an array of vec4.
-
-    \sa setAttributeValue()
-*/
-void QOpenGLShaderProgram::setUniformValue(int location, const QMatrix2x4& value)
-{
-    Q_D(QOpenGLShaderProgram);
-    Q_UNUSED(d);
-    d->glfuncs->glUniform4fv(location, 2, value.constData());
-}
-
-/*!
-    \overload
-
-    Sets the uniform variable called \a name in the current context
-    to a 2x4 matrix \a value.
-
-    \note This function is not aware of non square matrix support,
-    that is, GLSL types like mat2x4, that is present in modern OpenGL
-    versions. Instead, it treats the uniform as an array of vec4.
-
-    \sa setAttributeValue()
-*/
-void QOpenGLShaderProgram::setUniformValue(const char *name, const QMatrix2x4& value)
-{
-    setUniformValue(uniformLocation(name), value);
-}
-
-/*!
-    Sets the uniform variable at \a location in the current context
-    to a 3x2 matrix \a value.
-
-    \note This function is not aware of non square matrix support,
-    that is, GLSL types like mat3x2, that is present in modern OpenGL
-    versions. Instead, it treats the uniform as an array of vec2.
-
-    \sa setAttributeValue()
-*/
-void QOpenGLShaderProgram::setUniformValue(int location, const QMatrix3x2& value)
-{
-    Q_D(QOpenGLShaderProgram);
-    Q_UNUSED(d);
-    d->glfuncs->glUniform2fv(location, 3, value.constData());
-}
-
-/*!
-    \overload
-
-    Sets the uniform variable called \a name in the current context
-    to a 3x2 matrix \a value.
-
-    \note This function is not aware of non square matrix support,
-    that is, GLSL types like mat3x2, that is present in modern OpenGL
-    versions. Instead, it treats the uniform as an array of vec2.
-
-    \sa setAttributeValue()
-*/
-void QOpenGLShaderProgram::setUniformValue(const char *name, const QMatrix3x2& value)
-{
-    setUniformValue(uniformLocation(name), value);
-}
-
-/*!
-    Sets the uniform variable at \a location in the current context
-    to a 3x3 matrix \a value.
-
-    \sa setAttributeValue()
-*/
-void QOpenGLShaderProgram::setUniformValue(int location, const QMatrix3x3& value)
-{
-    Q_D(QOpenGLShaderProgram);
-    Q_UNUSED(d);
-    d->glfuncs->glUniformMatrix3fv(location, 1, GL_FALSE, value.constData());
-}
-
-/*!
-    \overload
-
-    Sets the uniform variable called \a name in the current context
-    to a 3x3 matrix \a value.
-
-    \sa setAttributeValue()
-*/
-void QOpenGLShaderProgram::setUniformValue(const char *name, const QMatrix3x3& value)
-{
-    setUniformValue(uniformLocation(name), value);
-}
-
-/*!
-    Sets the uniform variable at \a location in the current context
-    to a 3x4 matrix \a value.
-
-    \note This function is not aware of non square matrix support,
-    that is, GLSL types like mat3x4, that is present in modern OpenGL
-    versions. Instead, it treats the uniform as an array of vec4.
-
-    \sa setAttributeValue()
-*/
-void QOpenGLShaderProgram::setUniformValue(int location, const QMatrix3x4& value)
-{
-    Q_D(QOpenGLShaderProgram);
-    Q_UNUSED(d);
-    d->glfuncs->glUniform4fv(location, 3, value.constData());
-}
-
-/*!
-    \overload
-
-    Sets the uniform variable called \a name in the current context
-    to a 3x4 matrix \a value.
-
-    \note This function is not aware of non square matrix support,
-    that is, GLSL types like mat3x4, that is present in modern OpenGL
-    versions. Instead, it treats the uniform as an array of vec4.
-
-    \sa setAttributeValue()
-*/
-void QOpenGLShaderProgram::setUniformValue(const char *name, const QMatrix3x4& value)
-{
-    setUniformValue(uniformLocation(name), value);
-}
-
-/*!
-    Sets the uniform variable at \a location in the current context
-    to a 4x2 matrix \a value.
-
-    \note This function is not aware of non square matrix support,
-    that is, GLSL types like mat4x2, that is present in modern OpenGL
-    versions. Instead, it treats the uniform as an array of vec2.
-
-    \sa setAttributeValue()
-*/
-void QOpenGLShaderProgram::setUniformValue(int location, const QMatrix4x2& value)
-{
-    Q_D(QOpenGLShaderProgram);
-    Q_UNUSED(d);
-    d->glfuncs->glUniform2fv(location, 4, value.constData());
-}
-
-/*!
-    \overload
-
-    Sets the uniform variable called \a name in the current context
-    to a 4x2 matrix \a value.
-
-    \note This function is not aware of non square matrix support,
-    that is, GLSL types like mat4x2, that is present in modern OpenGL
-    versions. Instead, it treats the uniform as an array of vec2.
-
-    \sa setAttributeValue()
-*/
-void QOpenGLShaderProgram::setUniformValue(const char *name, const QMatrix4x2& value)
-{
-    setUniformValue(uniformLocation(name), value);
-}
-
-/*!
-    Sets the uniform variable at \a location in the current context
-    to a 4x3 matrix \a value.
-
-    \note This function is not aware of non square matrix support,
-    that is, GLSL types like mat4x3, that is present in modern OpenGL
-    versions. Instead, it treats the uniform as an array of vec3.
-
-    \sa setAttributeValue()
-*/
-void QOpenGLShaderProgram::setUniformValue(int location, const QMatrix4x3& value)
-{
-    Q_D(QOpenGLShaderProgram);
-    Q_UNUSED(d);
-    d->glfuncs->glUniform3fv(location, 4, value.constData());
-}
-
-/*!
-    \overload
-
-    Sets the uniform variable called \a name in the current context
-    to a 4x3 matrix \a value.
-
-    \note This function is not aware of non square matrix support,
-    that is, GLSL types like mat4x3, that is present in modern OpenGL
-    versions. Instead, it treats the uniform as an array of vec3.
-
-    \sa setAttributeValue()
-*/
-void QOpenGLShaderProgram::setUniformValue(const char *name, const QMatrix4x3& value)
-{
-    setUniformValue(uniformLocation(name), value);
-}
-
-/*!
-    Sets the uniform variable at \a location in the current context
-    to a 4x4 matrix \a value.
-
-    \sa setAttributeValue()
-*/
-void QOpenGLShaderProgram::setUniformValue(int location, const QMatrix4x4& value)
-{
-    Q_D(QOpenGLShaderProgram);
-    Q_UNUSED(d);
-    d->glfuncs->glUniformMatrix4fv(location, 1, GL_FALSE, value.constData());
-}
-
-/*!
-    \overload
-
-    Sets the uniform variable called \a name in the current context
-    to a 4x4 matrix \a value.
-
-    \sa setAttributeValue()
-*/
-void QOpenGLShaderProgram::setUniformValue(const char *name, const QMatrix4x4& value)
-{
-    setUniformValue(uniformLocation(name), value);
-}
-
-/*!
-    \overload
-
-    Sets the uniform variable at \a location in the current context
-    to a 2x2 matrix \a value.  The matrix elements must be specified
-    in column-major order.
-
-    \sa setAttributeValue()
-*/
-void QOpenGLShaderProgram::setUniformValue(int location, const GLfloat value[2][2])
-{
-    Q_D(QOpenGLShaderProgram);
-    Q_UNUSED(d);
-    if (location != -1)
-        d->glfuncs->glUniformMatrix2fv(location, 1, GL_FALSE, value[0]);
-}
-
-/*!
-    \overload
-
-    Sets the uniform variable at \a location in the current context
-    to a 3x3 matrix \a value.  The matrix elements must be specified
-    in column-major order.
-
-    \sa setAttributeValue()
-*/
-void QOpenGLShaderProgram::setUniformValue(int location, const GLfloat value[3][3])
-{
-    Q_D(QOpenGLShaderProgram);
-    Q_UNUSED(d);
-    if (location != -1)
-        d->glfuncs->glUniformMatrix3fv(location, 1, GL_FALSE, value[0]);
-}
-
-/*!
-    \overload
-
-    Sets the uniform variable at \a location in the current context
-    to a 4x4 matrix \a value.  The matrix elements must be specified
-    in column-major order.
-
-    \sa setAttributeValue()
-*/
-void QOpenGLShaderProgram::setUniformValue(int location, const GLfloat value[4][4])
-{
-    Q_D(QOpenGLShaderProgram);
-    Q_UNUSED(d);
-    if (location != -1)
-        d->glfuncs->glUniformMatrix4fv(location, 1, GL_FALSE, value[0]);
-}
-
-
-/*!
-    \overload
-
-    Sets the uniform variable called \a name in the current context
-    to a 2x2 matrix \a value.  The matrix elements must be specified
-    in column-major order.
-
-    \sa setAttributeValue()
-*/
-void QOpenGLShaderProgram::setUniformValue(const char *name, const GLfloat value[2][2])
-{
-    setUniformValue(uniformLocation(name), value);
-}
-
-/*!
-    \overload
-
-    Sets the uniform variable called \a name in the current context
-    to a 3x3 matrix \a value.  The matrix elements must be specified
-    in column-major order.
-
-    \sa setAttributeValue()
-*/
-void QOpenGLShaderProgram::setUniformValue(const char *name, const GLfloat value[3][3])
-{
-    setUniformValue(uniformLocation(name), value);
-}
-
-/*!
-    \overload
-
-    Sets the uniform variable called \a name in the current context
-    to a 4x4 matrix \a value.  The matrix elements must be specified
-    in column-major order.
-
-    \sa setAttributeValue()
-*/
-void QOpenGLShaderProgram::setUniformValue(const char *name, const GLfloat value[4][4])
-{
-    setUniformValue(uniformLocation(name), value);
-}
-
-/*!
-    Sets the uniform variable at \a location in the current context to a
-    3x3 transformation matrix \a value that is specified as a QTransform value.
-
-    To set a QTransform value as a 4x4 matrix in a shader, use
-    \c{setUniformValue(location, QMatrix4x4(value))}.
-*/
-void QOpenGLShaderProgram::setUniformValue(int location, const QTransform& value)
-{
-    Q_D(QOpenGLShaderProgram);
-    Q_UNUSED(d);
-    if (location != -1) {
-        GLfloat mat[3][3] = {
-            {GLfloat(value.m11()), GLfloat(value.m12()), GLfloat(value.m13())},
-            {GLfloat(value.m21()), GLfloat(value.m22()), GLfloat(value.m23())},
-            {GLfloat(value.m31()), GLfloat(value.m32()), GLfloat(value.m33())}
-        };
-        d->glfuncs->glUniformMatrix3fv(location, 1, GL_FALSE, mat[0]);
-    }
-}
-
-/*!
-    \overload
-
-    Sets the uniform variable called \a name in the current context to a
-    3x3 transformation matrix \a value that is specified as a QTransform value.
-
-    To set a QTransform value as a 4x4 matrix in a shader, use
-    \c{setUniformValue(name, QMatrix4x4(value))}.
-*/
-void QOpenGLShaderProgram::setUniformValue
-        (const char *name, const QTransform& value)
-{
-    setUniformValue(uniformLocation(name), value);
-}
-
-/*!
-    Sets the uniform variable array at \a location in the current
-    context to the \a count elements of \a values.
-
-    \sa setAttributeValue()
-*/
-void QOpenGLShaderProgram::setUniformValueArray(int location, const GLint *values, int count)
-{
-    Q_D(QOpenGLShaderProgram);
-    Q_UNUSED(d);
-    if (location != -1)
-        d->glfuncs->glUniform1iv(location, count, values);
-}
-
-/*!
-    \overload
-
-    Sets the uniform variable array called \a name in the current
-    context to the \a count elements of \a values.
-
-    \sa setAttributeValue()
-*/
-void QOpenGLShaderProgram::setUniformValueArray
-        (const char *name, const GLint *values, int count)
-{
-    setUniformValueArray(uniformLocation(name), values, count);
-}
-
-/*!
-    Sets the uniform variable array at \a location in the current
-    context to the \a count elements of \a values.  This overload
-    should be used when setting an array of sampler values.
-
-    \note This function is not aware of unsigned int support in modern OpenGL
-    versions and therefore treats \a values as a GLint and calls glUniform1iv.
-
-    \sa setAttributeValue()
-*/
-void QOpenGLShaderProgram::setUniformValueArray(int location, const GLuint *values, int count)
-{
-    Q_D(QOpenGLShaderProgram);
-    Q_UNUSED(d);
-    if (location != -1)
-        d->glfuncs->glUniform1iv(location, count, reinterpret_cast<const GLint *>(values));
-}
-
-/*!
-    \overload
-
-    Sets the uniform variable array called \a name in the current
-    context to the \a count elements of \a values.  This overload
-    should be used when setting an array of sampler values.
-
-    \sa setAttributeValue()
-*/
-void QOpenGLShaderProgram::setUniformValueArray
-        (const char *name, const GLuint *values, int count)
-{
-    setUniformValueArray(uniformLocation(name), values, count);
-}
-
-/*!
-    Sets the uniform variable array at \a location in the current
-    context to the \a count elements of \a values.  Each element
-    has \a tupleSize components.  The \a tupleSize must be 1, 2, 3, or 4.
-
-    \sa setAttributeValue()
-*/
-void QOpenGLShaderProgram::setUniformValueArray(int location, const GLfloat *values, int count, int tupleSize)
-{
-    Q_D(QOpenGLShaderProgram);
-    Q_UNUSED(d);
-    if (location != -1) {
-        if (tupleSize == 1)
-            d->glfuncs->glUniform1fv(location, count, values);
-        else if (tupleSize == 2)
-            d->glfuncs->glUniform2fv(location, count, values);
-        else if (tupleSize == 3)
-            d->glfuncs->glUniform3fv(location, count, values);
-        else if (tupleSize == 4)
-            d->glfuncs->glUniform4fv(location, count, values);
-        else
-            qWarning("QOpenGLShaderProgram::setUniformValue: size %d not supported", tupleSize);
-    }
-}
-
-/*!
-    \overload
-
-    Sets the uniform variable array called \a name in the current
-    context to the \a count elements of \a values.  Each element
-    has \a tupleSize components.  The \a tupleSize must be 1, 2, 3, or 4.
-
-    \sa setAttributeValue()
-*/
-void QOpenGLShaderProgram::setUniformValueArray
-        (const char *name, const GLfloat *values, int count, int tupleSize)
-{
-    setUniformValueArray(uniformLocation(name), values, count, tupleSize);
-}
-
-/*!
-    Sets the uniform variable array at \a location in the current
-    context to the \a count 2D vector elements of \a values.
-
-    \sa setAttributeValue()
-*/
-void QOpenGLShaderProgram::setUniformValueArray(int location, const QVector2D *values, int count)
-{
-    Q_D(QOpenGLShaderProgram);
-    Q_UNUSED(d);
-    if (location != -1)
-        d->glfuncs->glUniform2fv(location, count, reinterpret_cast<const GLfloat *>(values));
-}
-
-/*!
-    \overload
-
-    Sets the uniform variable array called \a name in the current
-    context to the \a count 2D vector elements of \a values.
-
-    \sa setAttributeValue()
-*/
-void QOpenGLShaderProgram::setUniformValueArray(const char *name, const QVector2D *values, int count)
-{
-    setUniformValueArray(uniformLocation(name), values, count);
-}
-
-/*!
-    Sets the uniform variable array at \a location in the current
-    context to the \a count 3D vector elements of \a values.
-
-    \sa setAttributeValue()
-*/
-void QOpenGLShaderProgram::setUniformValueArray(int location, const QVector3D *values, int count)
-{
-    Q_D(QOpenGLShaderProgram);
-    Q_UNUSED(d);
-    if (location != -1)
-        d->glfuncs->glUniform3fv(location, count, reinterpret_cast<const GLfloat *>(values));
-}
-
-/*!
-    \overload
-
-    Sets the uniform variable array called \a name in the current
-    context to the \a count 3D vector elements of \a values.
-
-    \sa setAttributeValue()
-*/
-void QOpenGLShaderProgram::setUniformValueArray(const char *name, const QVector3D *values, int count)
-{
-    setUniformValueArray(uniformLocation(name), values, count);
-}
-
-/*!
-    Sets the uniform variable array at \a location in the current
-    context to the \a count 4D vector elements of \a values.
-
-    \sa setAttributeValue()
-*/
-void QOpenGLShaderProgram::setUniformValueArray(int location, const QVector4D *values, int count)
-{
-    Q_D(QOpenGLShaderProgram);
-    Q_UNUSED(d);
-    if (location != -1)
-        d->glfuncs->glUniform4fv(location, count, reinterpret_cast<const GLfloat *>(values));
-}
-
-/*!
-    \overload
-
-    Sets the uniform variable array called \a name in the current
-    context to the \a count 4D vector elements of \a values.
-
-    \sa setAttributeValue()
-*/
-void QOpenGLShaderProgram::setUniformValueArray(const char *name, const QVector4D *values, int count)
-{
-    setUniformValueArray(uniformLocation(name), values, count);
-}
-
-// We have to repack matrix arrays from qreal to GLfloat.
-#define setUniformMatrixArray(func,location,values,count,type,cols,rows) \
-    if (location == -1 || count <= 0) \
-        return; \
-    if (sizeof(type) == sizeof(GLfloat) * cols * rows) { \
-        func(location, count, GL_FALSE, \
-             reinterpret_cast<const GLfloat *>(values[0].constData())); \
-    } else { \
-        QVarLengthArray<GLfloat> temp(cols * rows * count); \
-        for (int index = 0; index < count; ++index) { \
-            for (int index2 = 0; index2 < (cols * rows); ++index2) { \
-                temp.data()[cols * rows * index + index2] = \
-                    values[index].constData()[index2]; \
-            } \
-        } \
-        func(location, count, GL_FALSE, temp.constData()); \
-    }
-#define setUniformGenericMatrixArray(colfunc,location,values,count,type,cols,rows) \
-    if (location == -1 || count <= 0) \
-        return; \
-    if (sizeof(type) == sizeof(GLfloat) * cols * rows) { \
-        const GLfloat *data = reinterpret_cast<const GLfloat *> \
-            (values[0].constData());  \
-        colfunc(location, count * cols, data); \
-    } else { \
-        QVarLengthArray<GLfloat> temp(cols * rows * count); \
-        for (int index = 0; index < count; ++index) { \
-            for (int index2 = 0; index2 < (cols * rows); ++index2) { \
-                temp.data()[cols * rows * index + index2] = \
-                    values[index].constData()[index2]; \
-            } \
-        } \
-        colfunc(location, count * cols, temp.constData()); \
-    }
-
-/*!
-    Sets the uniform variable array at \a location in the current
-    context to the \a count 2x2 matrix elements of \a values.
-
-    \sa setAttributeValue()
-*/
-void QOpenGLShaderProgram::setUniformValueArray(int location, const QMatrix2x2 *values, int count)
-{
-    Q_D(QOpenGLShaderProgram);
-    Q_UNUSED(d);
-    setUniformMatrixArray
-        (d->glfuncs->glUniformMatrix2fv, location, values, count, QMatrix2x2, 2, 2);
-}
-
-/*!
-    \overload
-
-    Sets the uniform variable array called \a name in the current
-    context to the \a count 2x2 matrix elements of \a values.
-
-    \sa setAttributeValue()
-*/
-void QOpenGLShaderProgram::setUniformValueArray(const char *name, const QMatrix2x2 *values, int count)
-{
-    setUniformValueArray(uniformLocation(name), values, count);
-}
-
-/*!
-    Sets the uniform variable array at \a location in the current
-    context to the \a count 2x3 matrix elements of \a values.
-
-    \sa setAttributeValue()
-*/
-void QOpenGLShaderProgram::setUniformValueArray(int location, const QMatrix2x3 *values, int count)
-{
-    Q_D(QOpenGLShaderProgram);
-    Q_UNUSED(d);
-    setUniformGenericMatrixArray
-        (d->glfuncs->glUniform3fv, location, values, count,
-         QMatrix2x3, 2, 3);
-}
-
-/*!
-    \overload
-
-    Sets the uniform variable array called \a name in the current
-    context to the \a count 2x3 matrix elements of \a values.
-
-    \sa setAttributeValue()
-*/
-void QOpenGLShaderProgram::setUniformValueArray(const char *name, const QMatrix2x3 *values, int count)
-{
-    setUniformValueArray(uniformLocation(name), values, count);
-}
-
-/*!
-    Sets the uniform variable array at \a location in the current
-    context to the \a count 2x4 matrix elements of \a values.
-
-    \sa setAttributeValue()
-*/
-void QOpenGLShaderProgram::setUniformValueArray(int location, const QMatrix2x4 *values, int count)
-{
-    Q_D(QOpenGLShaderProgram);
-    Q_UNUSED(d);
-    setUniformGenericMatrixArray
-        (d->glfuncs->glUniform4fv, location, values, count,
-         QMatrix2x4, 2, 4);
-}
-
-/*!
-    \overload
-
-    Sets the uniform variable array called \a name in the current
-    context to the \a count 2x4 matrix elements of \a values.
-
-    \sa setAttributeValue()
-*/
-void QOpenGLShaderProgram::setUniformValueArray(const char *name, const QMatrix2x4 *values, int count)
-{
-    setUniformValueArray(uniformLocation(name), values, count);
-}
-
-/*!
-    Sets the uniform variable array at \a location in the current
-    context to the \a count 3x2 matrix elements of \a values.
-
-    \sa setAttributeValue()
-*/
-void QOpenGLShaderProgram::setUniformValueArray(int location, const QMatrix3x2 *values, int count)
-{
-    Q_D(QOpenGLShaderProgram);
-    Q_UNUSED(d);
-    setUniformGenericMatrixArray
-        (d->glfuncs->glUniform2fv, location, values, count,
-         QMatrix3x2, 3, 2);
-}
-
-/*!
-    \overload
-
-    Sets the uniform variable array called \a name in the current
-    context to the \a count 3x2 matrix elements of \a values.
-
-    \sa setAttributeValue()
-*/
-void QOpenGLShaderProgram::setUniformValueArray(const char *name, const QMatrix3x2 *values, int count)
-{
-    setUniformValueArray(uniformLocation(name), values, count);
-}
-
-/*!
-    Sets the uniform variable array at \a location in the current
-    context to the \a count 3x3 matrix elements of \a values.
-
-    \sa setAttributeValue()
-*/
-void QOpenGLShaderProgram::setUniformValueArray(int location, const QMatrix3x3 *values, int count)
-{
-    Q_D(QOpenGLShaderProgram);
-    Q_UNUSED(d);
-    setUniformMatrixArray
-        (d->glfuncs->glUniformMatrix3fv, location, values, count, QMatrix3x3, 3, 3);
-}
-
-/*!
-    \overload
-
-    Sets the uniform variable array called \a name in the current
-    context to the \a count 3x3 matrix elements of \a values.
-
-    \sa setAttributeValue()
-*/
-void QOpenGLShaderProgram::setUniformValueArray(const char *name, const QMatrix3x3 *values, int count)
-{
-    setUniformValueArray(uniformLocation(name), values, count);
-}
-
-/*!
-    Sets the uniform variable array at \a location in the current
-    context to the \a count 3x4 matrix elements of \a values.
-
-    \sa setAttributeValue()
-*/
-void QOpenGLShaderProgram::setUniformValueArray(int location, const QMatrix3x4 *values, int count)
-{
-    Q_D(QOpenGLShaderProgram);
-    Q_UNUSED(d);
-    setUniformGenericMatrixArray
-        (d->glfuncs->glUniform4fv, location, values, count,
-         QMatrix3x4, 3, 4);
-}
-
-/*!
-    \overload
-
-    Sets the uniform variable array called \a name in the current
-    context to the \a count 3x4 matrix elements of \a values.
-
-    \sa setAttributeValue()
-*/
-void QOpenGLShaderProgram::setUniformValueArray(const char *name, const QMatrix3x4 *values, int count)
-{
-    setUniformValueArray(uniformLocation(name), values, count);
-}
-
-/*!
-    Sets the uniform variable array at \a location in the current
-    context to the \a count 4x2 matrix elements of \a values.
-
-    \sa setAttributeValue()
-*/
-void QOpenGLShaderProgram::setUniformValueArray(int location, const QMatrix4x2 *values, int count)
-{
-    Q_D(QOpenGLShaderProgram);
-    Q_UNUSED(d);
-    setUniformGenericMatrixArray
-        (d->glfuncs->glUniform2fv, location, values, count,
-         QMatrix4x2, 4, 2);
-}
-
-/*!
-    \overload
-
-    Sets the uniform variable array called \a name in the current
-    context to the \a count 4x2 matrix elements of \a values.
-
-    \sa setAttributeValue()
-*/
-void QOpenGLShaderProgram::setUniformValueArray(const char *name, const QMatrix4x2 *values, int count)
-{
-    setUniformValueArray(uniformLocation(name), values, count);
-}
-
-/*!
-    Sets the uniform variable array at \a location in the current
-    context to the \a count 4x3 matrix elements of \a values.
-
-    \sa setAttributeValue()
-*/
-void QOpenGLShaderProgram::setUniformValueArray(int location, const QMatrix4x3 *values, int count)
-{
-    Q_D(QOpenGLShaderProgram);
-    Q_UNUSED(d);
-    setUniformGenericMatrixArray
-        (d->glfuncs->glUniform3fv, location, values, count,
-         QMatrix4x3, 4, 3);
-}
-
-/*!
-    \overload
-
-    Sets the uniform variable array called \a name in the current
-    context to the \a count 4x3 matrix elements of \a values.
-
-    \sa setAttributeValue()
-*/
-void QOpenGLShaderProgram::setUniformValueArray(const char *name, const QMatrix4x3 *values, int count)
-{
-    setUniformValueArray(uniformLocation(name), values, count);
-}
-
-/*!
-    Sets the uniform variable array at \a location in the current
-    context to the \a count 4x4 matrix elements of \a values.
-
-    \sa setAttributeValue()
-*/
-void QOpenGLShaderProgram::setUniformValueArray(int location, const QMatrix4x4 *values, int count)
-{
-    Q_D(QOpenGLShaderProgram);
-    Q_UNUSED(d);
-    setUniformMatrixArray
-        (d->glfuncs->glUniformMatrix4fv, location, values, count, QMatrix4x4, 4, 4);
-}
-
-/*!
-    \overload
-
-    Sets the uniform variable array called \a name in the current
-    context to the \a count 4x4 matrix elements of \a values.
-
-    \sa setAttributeValue()
-*/
-void QOpenGLShaderProgram::setUniformValueArray(const char *name, const QMatrix4x4 *values, int count)
-{
-    setUniformValueArray(uniformLocation(name), values, count);
-}
-
-/*!
-    Returns the hardware limit for how many vertices a geometry shader
-    can output.
-*/
-int QOpenGLShaderProgram::maxGeometryOutputVertices() const
-{
-    GLint n = 0;
-    Q_D(const QOpenGLShaderProgram);
-    d->glfuncs->glGetIntegerv(GL_MAX_GEOMETRY_OUTPUT_VERTICES, &n);
-    return n;
-}
-
-/*!
-    Use this function to specify to OpenGL the number of vertices in
-    a patch to \a count. A patch is a custom OpenGL primitive whose interpretation
-    is entirely defined by the tessellation shader stages. Therefore, calling
-    this function only makes sense when using a QOpenGLShaderProgram
-    containing tessellation stage shaders. When using OpenGL tessellation,
-    the only primitive that can be rendered with \c{glDraw*()} functions is
-    \c{GL_PATCHES}.
-
-    This is equivalent to calling glPatchParameteri(GL_PATCH_VERTICES, count).
-
-    \note This modifies global OpenGL state and is not specific to this
-    QOpenGLShaderProgram instance. You should call this in your render
-    function when needed, as QOpenGLShaderProgram will not apply this for
-    you. This is purely a convenience function.
-
-    \sa patchVertexCount()
-*/
-void QOpenGLShaderProgram::setPatchVertexCount(int count)
-{
-    Q_D(QOpenGLShaderProgram);
-    d->glfuncs->glPatchParameteri(GL_PATCH_VERTICES, count);
-}
-
-/*!
-    Returns the number of vertices per-patch to be used when rendering.
-
-    \note This returns the global OpenGL state value. It is not specific to
-    this QOpenGLShaderProgram instance.
-
-    \sa setPatchVertexCount()
-*/
-int QOpenGLShaderProgram::patchVertexCount() const
-{
-    int patchVertices = 0;
-    Q_D(const QOpenGLShaderProgram);
-    d->glfuncs->glGetIntegerv(GL_PATCH_VERTICES, &patchVertices);
-    return patchVertices;
-}
-
-/*!
-    Sets the default outer tessellation levels to be used by the tessellation
-    primitive generator in the event that the tessellation control shader
-    does not output them to \a levels. For more details on OpenGL and Tessellation
-    shaders see \l{OpenGL Tessellation Shaders}.
-
-    The \a levels argument should be a QVector consisting of 4 floats. Not all
-    of the values make sense for all tessellation modes. If you specify a vector with
-    fewer than 4 elements, the remaining elements will be given a default value of 1.
-
-    \note This modifies global OpenGL state and is not specific to this
-    QOpenGLShaderProgram instance. You should call this in your render
-    function when needed, as QOpenGLShaderProgram will not apply this for
-    you. This is purely a convenience function.
-
-    \note This function is only available with OpenGL >= 4.0 and is not supported
-    with OpenGL ES 3.2.
-
-    \sa defaultOuterTessellationLevels(), setDefaultInnerTessellationLevels()
-*/
-void QOpenGLShaderProgram::setDefaultOuterTessellationLevels(const QVector<float> &levels)
-{
-#ifndef QT_OPENGL_ES_2
-    Q_D(QOpenGLShaderProgram);
-    if (d->tessellationFuncs) {
-        QVector<float> tessLevels = levels;
-
-        // Ensure we have the required 4 outer tessellation levels
-        // Use default of 1 for missing entries (same as spec)
-        const int argCount = 4;
-        if (tessLevels.size() < argCount) {
-            tessLevels.reserve(argCount);
-            for (int i = tessLevels.size(); i < argCount; ++i)
-                tessLevels.append(1.0f);
-        }
-        d->tessellationFuncs->glPatchParameterfv(GL_PATCH_DEFAULT_OUTER_LEVEL, tessLevels.data());
-    }
-#else
-    Q_UNUSED(levels);
-#endif
-}
-
-/*!
-    Returns the default outer tessellation levels to be used by the tessellation
-    primitive generator in the event that the tessellation control shader
-    does not output them. For more details on OpenGL and Tessellation shaders see
-    \l{OpenGL Tessellation Shaders}.
-
-    Returns a QVector of floats describing the outer tessellation levels. The vector
-    will always have four elements but not all of them make sense for every mode
-    of tessellation.
-
-    \note This returns the global OpenGL state value. It is not specific to
-    this QOpenGLShaderProgram instance.
-
-    \note This function is only supported with OpenGL >= 4.0 and will not
-    return valid results with OpenGL ES 3.2.
-
-    \sa setDefaultOuterTessellationLevels(), defaultInnerTessellationLevels()
-*/
-QVector<float> QOpenGLShaderProgram::defaultOuterTessellationLevels() const
-{
-#ifndef QT_OPENGL_ES_2
-    QVector<float> tessLevels(4, 1.0f);
-    Q_D(const QOpenGLShaderProgram);
-    if (d->tessellationFuncs)
-        d->tessellationFuncs->glGetFloatv(GL_PATCH_DEFAULT_OUTER_LEVEL, tessLevels.data());
-    return tessLevels;
-#else
-    return QVector<float>();
-#endif
-}
-
-/*!
-    Sets the default outer tessellation levels to be used by the tessellation
-    primitive generator in the event that the tessellation control shader
-    does not output them to \a levels. For more details on OpenGL and Tessellation shaders see
-    \l{OpenGL Tessellation Shaders}.
-
-    The \a levels argument should be a QVector consisting of 2 floats. Not all
-    of the values make sense for all tessellation modes. If you specify a vector with
-    fewer than 2 elements, the remaining elements will be given a default value of 1.
-
-    \note This modifies global OpenGL state and is not specific to this
-    QOpenGLShaderProgram instance. You should call this in your render
-    function when needed, as QOpenGLShaderProgram will not apply this for
-    you. This is purely a convenience function.
-
-    \note This function is only available with OpenGL >= 4.0 and is not supported
-    with OpenGL ES 3.2.
-
-    \sa defaultInnerTessellationLevels(), setDefaultOuterTessellationLevels()
-*/
-void QOpenGLShaderProgram::setDefaultInnerTessellationLevels(const QVector<float> &levels)
-{
-#ifndef QT_OPENGL_ES_2
-    Q_D(QOpenGLShaderProgram);
-    if (d->tessellationFuncs) {
-        QVector<float> tessLevels = levels;
-
-        // Ensure we have the required 2 inner tessellation levels
-        // Use default of 1 for missing entries (same as spec)
-        const int argCount = 2;
-        if (tessLevels.size() < argCount) {
-            tessLevels.reserve(argCount);
-            for (int i = tessLevels.size(); i < argCount; ++i)
-                tessLevels.append(1.0f);
-        }
-        d->tessellationFuncs->glPatchParameterfv(GL_PATCH_DEFAULT_INNER_LEVEL, tessLevels.data());
-    }
-#else
-    Q_UNUSED(levels);
-#endif
-}
-
-/*!
-    Returns the default inner tessellation levels to be used by the tessellation
-    primitive generator in the event that the tessellation control shader
-    does not output them. For more details on OpenGL and Tessellation shaders see
-    \l{OpenGL Tessellation Shaders}.
-
-    Returns a QVector of floats describing the inner tessellation levels. The vector
-    will always have two elements but not all of them make sense for every mode
-    of tessellation.
-
-    \note This returns the global OpenGL state value. It is not specific to
-    this QOpenGLShaderProgram instance.
-
-    \note This function is only supported with OpenGL >= 4.0 and will not
-    return valid results with OpenGL ES 3.2.
-
-    \sa setDefaultInnerTessellationLevels(), defaultOuterTessellationLevels()
-*/
-QVector<float> QOpenGLShaderProgram::defaultInnerTessellationLevels() const
-{
-#ifndef QT_OPENGL_ES_2
-    QVector<float> tessLevels(2, 1.0f);
-    Q_D(const QOpenGLShaderProgram);
-    if (d->tessellationFuncs)
-        d->tessellationFuncs->glGetFloatv(GL_PATCH_DEFAULT_INNER_LEVEL, tessLevels.data());
-    return tessLevels;
-#else
-    return QVector<float>();
-#endif
-}
-
-
-/*!
-    Returns \c true if shader programs written in the OpenGL Shading
-    Language (GLSL) are supported on this system; false otherwise.
-
-    The \a context is used to resolve the GLSL extensions.
-    If \a context is \nullptr, then QOpenGLContext::currentContext()
-    is used.
-*/
-bool QOpenGLShaderProgram::hasOpenGLShaderPrograms(QOpenGLContext *context)
-{
-    if (!context)
-        context = QOpenGLContext::currentContext();
-    if (!context)
-        return false;
-    return QOpenGLFunctions(context).hasOpenGLFeature(QOpenGLFunctions::Shaders);
-}
-
-/*!
-    \internal
-*/
-void QOpenGLShaderProgram::shaderDestroyed()
-{
-    Q_D(QOpenGLShaderProgram);
-    QOpenGLShader *shader = qobject_cast<QOpenGLShader *>(sender());
-    if (shader && !d->removingShaders)
-        removeShader(shader);
-}
-
-/*!
-    Returns \c true if shader programs of type \a type are supported on
-    this system; false otherwise.
-
-    The \a context is used to resolve the GLSL extensions.
-    If \a context is \nullptr, then QOpenGLContext::currentContext()
-    is used.
-*/
-bool QOpenGLShader::hasOpenGLShaders(ShaderType type, QOpenGLContext *context)
-{
-    if (!context)
-        context = QOpenGLContext::currentContext();
-    if (!context)
-        return false;
-
-    if ((type & ~(Geometry | Vertex | Fragment | TessellationControl | TessellationEvaluation | Compute)) || type == 0)
-        return false;
-
-    if (type & QOpenGLShader::Geometry)
-        return supportsGeometry(context->format());
-    else if (type & (QOpenGLShader::TessellationControl | QOpenGLShader::TessellationEvaluation))
-        return supportsTessellation(context->format());
-    else if (type & QOpenGLShader::Compute)
-        return supportsCompute(context->format());
-
-    // Unconditional support of vertex and fragment shaders implicitly assumes
-    // a minimum OpenGL version of 2.0
-    return true;
-}
-
-bool QOpenGLShaderProgramPrivate::isCacheDisabled() const
-{
-    static QOpenGLProgramBinarySupportCheckWrapper binSupportCheck;
-    return !binSupportCheck.get(QOpenGLContext::currentContext())->isSupported();
-}
-
-bool QOpenGLShaderProgramPrivate::compileCacheable()
-{
-    Q_Q(QOpenGLShaderProgram);
-    for (const QOpenGLProgramBinaryCache::ShaderDesc &shader : qAsConst(binaryProgram.shaders)) {
-        QScopedPointer<QOpenGLShader> s(new QOpenGLShader(qt_shaderStageToType(shader.stage), q));
-        if (!s->compileSourceCode(shader.source)) {
-            log = s->log();
-            return false;
-        }
-        anonShaders.append(s.take());
-        if (!q->addShader(anonShaders.last()))
-            return false;
-    }
-    return true;
-}
-
-bool QOpenGLShaderProgramPrivate::linkBinary()
-{
-    static QOpenGLProgramBinaryCache binCache;
-
-    Q_Q(QOpenGLShaderProgram);
-
-    const QByteArray cacheKey = binaryProgram.cacheKey();
-    if (lcOpenGLProgramDiskCache().isEnabled(QtDebugMsg))
-        qCDebug(lcOpenGLProgramDiskCache, "program with %d shaders, cache key %s",
-                binaryProgram.shaders.count(), cacheKey.constData());
-
-    bool needsCompile = true;
-    if (binCache.load(cacheKey, q->programId())) {
-        qCDebug(lcOpenGLProgramDiskCache, "Program binary received from cache");
-        needsCompile = false;
-    }
-
-    bool needsSave = false;
-    if (needsCompile) {
-        qCDebug(lcOpenGLProgramDiskCache, "Program binary not in cache, compiling");
-        if (compileCacheable())
-            needsSave = true;
-        else
-            return false;
-    }
-
-    linkBinaryRecursion = true;
-    bool ok = q->link();
-    linkBinaryRecursion = false;
-    if (ok && needsSave)
-        binCache.save(cacheKey, q->programId());
-
-    return ok;
-}
-
-QT_END_NAMESPACE
diff --git a/src/gui/opengl/qopenglshaderprogram.h b/src/gui/opengl/qopenglshaderprogram.h
deleted file mode 100644
index c79101fd4d..0000000000
--- a/src/gui/opengl/qopenglshaderprogram.h
+++ /dev/null
@@ -1,318 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtGui module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QOPENGLSHADERPROGRAM_H
-#define QOPENGLSHADERPROGRAM_H
-
-#include <QtGui/qtguiglobal.h>
-
-#ifndef QT_NO_OPENGL
-
-#include <QtGui/qopengl.h>
-#include <QtGui/qvector2d.h>
-#include <QtGui/qvector3d.h>
-#include <QtGui/qvector4d.h>
-#include <QtGui/qmatrix4x4.h>
-
-QT_BEGIN_NAMESPACE
-
-
-class QOpenGLContext;
-class QOpenGLShaderProgram;
-class QOpenGLShaderPrivate;
-
-class Q_GUI_EXPORT QOpenGLShader : public QObject
-{
-    Q_OBJECT
-public:
-    enum ShaderTypeBit
-    {
-        Vertex                 = 0x0001,
-        Fragment               = 0x0002,
-        Geometry               = 0x0004,
-        TessellationControl    = 0x0008,
-        TessellationEvaluation = 0x0010,
-        Compute                = 0x0020
-    };
-    Q_DECLARE_FLAGS(ShaderType, ShaderTypeBit)
-
-    explicit QOpenGLShader(QOpenGLShader::ShaderType type, QObject *parent = nullptr);
-    ~QOpenGLShader();
-
-    QOpenGLShader::ShaderType shaderType() const;
-
-    bool compileSourceCode(const char *source);
-    bool compileSourceCode(const QByteArray& source);
-    bool compileSourceCode(const QString& source);
-    bool compileSourceFile(const QString& fileName);
-
-    QByteArray sourceCode() const;
-
-    bool isCompiled() const;
-    QString log() const;
-
-    GLuint shaderId() const;
-
-    static bool hasOpenGLShaders(ShaderType type, QOpenGLContext *context = nullptr);
-
-private:
-    friend class QOpenGLShaderProgram;
-
-    Q_DISABLE_COPY(QOpenGLShader)
-    Q_DECLARE_PRIVATE(QOpenGLShader)
-};
-
-Q_DECLARE_OPERATORS_FOR_FLAGS(QOpenGLShader::ShaderType)
-
-
-class QOpenGLShaderProgramPrivate;
-
-class Q_GUI_EXPORT QOpenGLShaderProgram : public QObject
-{
-    Q_OBJECT
-public:
-    explicit QOpenGLShaderProgram(QObject *parent = nullptr);
-    ~QOpenGLShaderProgram();
-
-    bool addShader(QOpenGLShader *shader);
-    void removeShader(QOpenGLShader *shader);
-    QList<QOpenGLShader *> shaders() const;
-
-    bool addShaderFromSourceCode(QOpenGLShader::ShaderType type, const char *source);
-    bool addShaderFromSourceCode(QOpenGLShader::ShaderType type, const QByteArray& source);
-    bool addShaderFromSourceCode(QOpenGLShader::ShaderType type, const QString& source);
-    bool addShaderFromSourceFile(QOpenGLShader::ShaderType type, const QString& fileName);
-
-    bool addCacheableShaderFromSourceCode(QOpenGLShader::ShaderType type, const char *source);
-    bool addCacheableShaderFromSourceCode(QOpenGLShader::ShaderType type, const QByteArray &source);
-    bool addCacheableShaderFromSourceCode(QOpenGLShader::ShaderType type, const QString &source);
-    bool addCacheableShaderFromSourceFile(QOpenGLShader::ShaderType type, const QString &fileName);
-
-    void removeAllShaders();
-
-    virtual bool link();
-    bool isLinked() const;
-    QString log() const;
-
-    bool bind();
-    void release();
-
-    bool create();
-
-    GLuint programId() const;
-
-    int maxGeometryOutputVertices() const;
-
-    void setPatchVertexCount(int count);
-    int patchVertexCount() const;
-
-    void setDefaultOuterTessellationLevels(const QVector<float> &levels);
-    QVector<float> defaultOuterTessellationLevels() const;
-
-    void setDefaultInnerTessellationLevels(const QVector<float> &levels);
-    QVector<float> defaultInnerTessellationLevels() const;
-
-    void bindAttributeLocation(const char *name, int location);
-    void bindAttributeLocation(const QByteArray& name, int location);
-    void bindAttributeLocation(const QString& name, int location);
-
-    int attributeLocation(const char *name) const;
-    int attributeLocation(const QByteArray& name) const;
-    int attributeLocation(const QString& name) const;
-
-    void setAttributeValue(int location, GLfloat value);
-    void setAttributeValue(int location, GLfloat x, GLfloat y);
-    void setAttributeValue(int location, GLfloat x, GLfloat y, GLfloat z);
-    void setAttributeValue(int location, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-    void setAttributeValue(int location, const QVector2D& value);
-    void setAttributeValue(int location, const QVector3D& value);
-    void setAttributeValue(int location, const QVector4D& value);
-    void setAttributeValue(int location, const QColor& value);
-    void setAttributeValue(int location, const GLfloat *values, int columns, int rows);
-
-    void setAttributeValue(const char *name, GLfloat value);
-    void setAttributeValue(const char *name, GLfloat x, GLfloat y);
-    void setAttributeValue(const char *name, GLfloat x, GLfloat y, GLfloat z);
-    void setAttributeValue(const char *name, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-    void setAttributeValue(const char *name, const QVector2D& value);
-    void setAttributeValue(const char *name, const QVector3D& value);
-    void setAttributeValue(const char *name, const QVector4D& value);
-    void setAttributeValue(const char *name, const QColor& value);
-    void setAttributeValue(const char *name, const GLfloat *values, int columns, int rows);
-
-    void setAttributeArray
-        (int location, const GLfloat *values, int tupleSize, int stride = 0);
-    void setAttributeArray
-        (int location, const QVector2D *values, int stride = 0);
-    void setAttributeArray
-        (int location, const QVector3D *values, int stride = 0);
-    void setAttributeArray
-        (int location, const QVector4D *values, int stride = 0);
-    void setAttributeArray
-        (int location, GLenum type, const void *values, int tupleSize, int stride = 0);
-    void setAttributeArray
-        (const char *name, const GLfloat *values, int tupleSize, int stride = 0);
-    void setAttributeArray
-        (const char *name, const QVector2D *values, int stride = 0);
-    void setAttributeArray
-        (const char *name, const QVector3D *values, int stride = 0);
-    void setAttributeArray
-        (const char *name, const QVector4D *values, int stride = 0);
-    void setAttributeArray
-        (const char *name, GLenum type, const void *values, int tupleSize, int stride = 0);
-
-    void setAttributeBuffer
-        (int location, GLenum type, int offset, int tupleSize, int stride = 0);
-    void setAttributeBuffer
-        (const char *name, GLenum type, int offset, int tupleSize, int stride = 0);
-
-    void enableAttributeArray(int location);
-    void enableAttributeArray(const char *name);
-    void disableAttributeArray(int location);
-    void disableAttributeArray(const char *name);
-
-    int uniformLocation(const char *name) const;
-    int uniformLocation(const QByteArray& name) const;
-    int uniformLocation(const QString& name) const;
-
-    void setUniformValue(int location, GLfloat value);
-    void setUniformValue(int location, GLint value);
-    void setUniformValue(int location, GLuint value);
-    void setUniformValue(int location, GLfloat x, GLfloat y);
-    void setUniformValue(int location, GLfloat x, GLfloat y, GLfloat z);
-    void setUniformValue(int location, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-    void setUniformValue(int location, const QVector2D& value);
-    void setUniformValue(int location, const QVector3D& value);
-    void setUniformValue(int location, const QVector4D& value);
-    void setUniformValue(int location, const QColor& color);
-    void setUniformValue(int location, const QPoint& point);
-    void setUniformValue(int location, const QPointF& point);
-    void setUniformValue(int location, const QSize& size);
-    void setUniformValue(int location, const QSizeF& size);
-    void setUniformValue(int location, const QMatrix2x2& value);
-    void setUniformValue(int location, const QMatrix2x3& value);
-    void setUniformValue(int location, const QMatrix2x4& value);
-    void setUniformValue(int location, const QMatrix3x2& value);
-    void setUniformValue(int location, const QMatrix3x3& value);
-    void setUniformValue(int location, const QMatrix3x4& value);
-    void setUniformValue(int location, const QMatrix4x2& value);
-    void setUniformValue(int location, const QMatrix4x3& value);
-    void setUniformValue(int location, const QMatrix4x4& value);
-    void setUniformValue(int location, const GLfloat value[2][2]);
-    void setUniformValue(int location, const GLfloat value[3][3]);
-    void setUniformValue(int location, const GLfloat value[4][4]);
-    void setUniformValue(int location, const QTransform& value);
-
-    void setUniformValue(const char *name, GLfloat value);
-    void setUniformValue(const char *name, GLint value);
-    void setUniformValue(const char *name, GLuint value);
-    void setUniformValue(const char *name, GLfloat x, GLfloat y);
-    void setUniformValue(const char *name, GLfloat x, GLfloat y, GLfloat z);
-    void setUniformValue(const char *name, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-    void setUniformValue(const char *name, const QVector2D& value);
-    void setUniformValue(const char *name, const QVector3D& value);
-    void setUniformValue(const char *name, const QVector4D& value);
-    void setUniformValue(const char *name, const QColor& color);
-    void setUniformValue(const char *name, const QPoint& point);
-    void setUniformValue(const char *name, const QPointF& point);
-    void setUniformValue(const char *name, const QSize& size);
-    void setUniformValue(const char *name, const QSizeF& size);
-    void setUniformValue(const char *name, const QMatrix2x2& value);
-    void setUniformValue(const char *name, const QMatrix2x3& value);
-    void setUniformValue(const char *name, const QMatrix2x4& value);
-    void setUniformValue(const char *name, const QMatrix3x2& value);
-    void setUniformValue(const char *name, const QMatrix3x3& value);
-    void setUniformValue(const char *name, const QMatrix3x4& value);
-    void setUniformValue(const char *name, const QMatrix4x2& value);
-    void setUniformValue(const char *name, const QMatrix4x3& value);
-    void setUniformValue(const char *name, const QMatrix4x4& value);
-    void setUniformValue(const char *name, const GLfloat value[2][2]);
-    void setUniformValue(const char *name, const GLfloat value[3][3]);
-    void setUniformValue(const char *name, const GLfloat value[4][4]);
-    void setUniformValue(const char *name, const QTransform& value);
-
-    void setUniformValueArray(int location, const GLfloat *values, int count, int tupleSize);
-    void setUniformValueArray(int location, const GLint *values, int count);
-    void setUniformValueArray(int location, const GLuint *values, int count);
-    void setUniformValueArray(int location, const QVector2D *values, int count);
-    void setUniformValueArray(int location, const QVector3D *values, int count);
-    void setUniformValueArray(int location, const QVector4D *values, int count);
-    void setUniformValueArray(int location, const QMatrix2x2 *values, int count);
-    void setUniformValueArray(int location, const QMatrix2x3 *values, int count);
-    void setUniformValueArray(int location, const QMatrix2x4 *values, int count);
-    void setUniformValueArray(int location, const QMatrix3x2 *values, int count);
-    void setUniformValueArray(int location, const QMatrix3x3 *values, int count);
-    void setUniformValueArray(int location, const QMatrix3x4 *values, int count);
-    void setUniformValueArray(int location, const QMatrix4x2 *values, int count);
-    void setUniformValueArray(int location, const QMatrix4x3 *values, int count);
-    void setUniformValueArray(int location, const QMatrix4x4 *values, int count);
-
-    void setUniformValueArray(const char *name, const GLfloat *values, int count, int tupleSize);
-    void setUniformValueArray(const char *name, const GLint *values, int count);
-    void setUniformValueArray(const char *name, const GLuint *values, int count);
-    void setUniformValueArray(const char *name, const QVector2D *values, int count);
-    void setUniformValueArray(const char *name, const QVector3D *values, int count);
-    void setUniformValueArray(const char *name, const QVector4D *values, int count);
-    void setUniformValueArray(const char *name, const QMatrix2x2 *values, int count);
-    void setUniformValueArray(const char *name, const QMatrix2x3 *values, int count);
-    void setUniformValueArray(const char *name, const QMatrix2x4 *values, int count);
-    void setUniformValueArray(const char *name, const QMatrix3x2 *values, int count);
-    void setUniformValueArray(const char *name, const QMatrix3x3 *values, int count);
-    void setUniformValueArray(const char *name, const QMatrix3x4 *values, int count);
-    void setUniformValueArray(const char *name, const QMatrix4x2 *values, int count);
-    void setUniformValueArray(const char *name, const QMatrix4x3 *values, int count);
-    void setUniformValueArray(const char *name, const QMatrix4x4 *values, int count);
-
-    static bool hasOpenGLShaderPrograms(QOpenGLContext *context = nullptr);
-
-private Q_SLOTS:
-    void shaderDestroyed();
-
-private:
-    Q_DISABLE_COPY(QOpenGLShaderProgram)
-    Q_DECLARE_PRIVATE(QOpenGLShaderProgram)
-
-    bool init();
-};
-
-QT_END_NAMESPACE
-
-#endif // QT_NO_OPENGL
-
-#endif
diff --git a/src/gui/opengl/qopengltexture.cpp b/src/gui/opengl/qopengltexture.cpp
deleted file mode 100644
index 5490ad8025..0000000000
--- a/src/gui/opengl/qopengltexture.cpp
+++ /dev/null
@@ -1,4988 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB).
-** Copyright (C) 2020 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtGui module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qopengltexture.h"
-#include "qopengltexture_p.h"
-#include "qopengltexturehelper_p.h"
-#include "qopenglfunctions.h"
-#include <QtGui/qcolor.h>
-#include <QtGui/qopenglcontext.h>
-#include <QtCore/qdebug.h>
-#include <private/qobject_p.h>
-#include <private/qopenglcontext_p.h>
-
-QT_BEGIN_NAMESPACE
-
-//this is to work around GL_TEXTURE_WRAP_R_OES which also has 0x8072 as value
-#if !defined(GL_TEXTURE_WRAP_R)
-    #define GL_TEXTURE_WRAP_R 0x8072
-#endif
-
-QOpenGLTexturePrivate::QOpenGLTexturePrivate(QOpenGLTexture::Target textureTarget,
-                                             QOpenGLTexture *qq)
-    : q_ptr(qq),
-      context(nullptr),
-      target(textureTarget),
-      textureId(0),
-      format(QOpenGLTexture::NoFormat),
-      formatClass(QOpenGLTexture::NoFormatClass),
-      requestedMipLevels(1),
-      mipLevels(-1),
-      layers(1),
-      faces(1),
-      samples(0),
-      fixedSamplePositions(true),
-      baseLevel(0),
-      maxLevel(1000),
-      depthStencilMode(QOpenGLTexture::DepthMode),
-      comparisonFunction(QOpenGLTexture::CompareLessEqual),
-      comparisonMode(QOpenGLTexture::CompareNone),
-      minFilter(QOpenGLTexture::Nearest),
-      magFilter(QOpenGLTexture::Nearest),
-      maxAnisotropy(1.0f),
-      minLevelOfDetail(-1000.0f),
-      maxLevelOfDetail(1000.0f),
-      levelOfDetailBias(0.0f),
-      textureView(false),
-      autoGenerateMipMaps(true),
-      storageAllocated(false),
-      texFuncs(nullptr),
-      functions(nullptr)
-{
-    dimensions[0] = dimensions[1] = dimensions[2] = 1;
-
-    switch (target) {
-    case QOpenGLTexture::Target1D:
-        bindingTarget = QOpenGLTexture::BindingTarget1D;
-        break;
-    case QOpenGLTexture::Target1DArray:
-        bindingTarget = QOpenGLTexture::BindingTarget1DArray;
-        break;
-    case QOpenGLTexture::Target2D:
-        bindingTarget = QOpenGLTexture::BindingTarget2D;
-        break;
-    case QOpenGLTexture::Target2DArray:
-        bindingTarget = QOpenGLTexture::BindingTarget2DArray;
-        break;
-    case QOpenGLTexture::Target3D:
-        bindingTarget = QOpenGLTexture::BindingTarget3D;
-        break;
-    case QOpenGLTexture::TargetCubeMap:
-        bindingTarget = QOpenGLTexture::BindingTargetCubeMap;
-        faces = 6;
-        break;
-    case QOpenGLTexture::TargetCubeMapArray:
-        bindingTarget = QOpenGLTexture::BindingTargetCubeMapArray;
-        faces = 6;
-        break;
-    case QOpenGLTexture::Target2DMultisample:
-        bindingTarget = QOpenGLTexture::BindingTarget2DMultisample;
-        break;
-    case QOpenGLTexture::Target2DMultisampleArray:
-        bindingTarget = QOpenGLTexture::BindingTarget2DMultisampleArray;
-        break;
-    case QOpenGLTexture::TargetRectangle:
-        bindingTarget = QOpenGLTexture::BindingTargetRectangle;
-        break;
-    case QOpenGLTexture::TargetBuffer:
-        bindingTarget = QOpenGLTexture::BindingTargetBuffer;
-        break;
-    }
-
-    swizzleMask[0] = QOpenGLTexture::RedValue;
-    swizzleMask[1] = QOpenGLTexture::GreenValue;
-    swizzleMask[2] = QOpenGLTexture::BlueValue;
-    swizzleMask[3] = QOpenGLTexture::AlphaValue;
-
-    wrapModes[0] = wrapModes[1] = wrapModes[2] = target == QOpenGLTexture::TargetRectangle
-        ? QOpenGLTexture::ClampToEdge : QOpenGLTexture::Repeat;
-}
-
-QOpenGLTexturePrivate::~QOpenGLTexturePrivate()
-{
-    destroy();
-}
-
-void QOpenGLTexturePrivate::initializeOpenGLFunctions()
-{
-    // If we already have a functions object, there is nothing to do
-    if (texFuncs)
-        return;
-
-    // See if the context already has a suitable resource we can use.
-    // If not create a functions object and add it to the context in case
-    // others wish to use it too
-    texFuncs = context->textureFunctions();
-    if (!texFuncs) {
-        texFuncs = new QOpenGLTextureHelper(context);
-        context->setTextureFunctions(texFuncs);
-    }
-}
-
-bool QOpenGLTexturePrivate::create()
-{
-    if (textureId != 0)
-        return true;
-
-    QOpenGLContext *ctx = QOpenGLContext::currentContext();
-    if (!ctx) {
-        qWarning("Requires a valid current OpenGL context.\n"
-                 "Texture has not been created");
-        return false;
-    }
-    context = ctx;
-    functions = ctx->functions();
-
-    // Resolve any functions we will need based upon context version and create the texture
-    initializeOpenGLFunctions();
-
-    // What features do we have?
-    QOpenGLTexture::Feature feature = QOpenGLTexture::ImmutableStorage;
-    while (feature != QOpenGLTexture::MaxFeatureFlag) {
-        if (QOpenGLTexture::hasFeature(feature))
-            features |= feature;
-        feature = static_cast<QOpenGLTexture::Feature>(feature << 1);
-    }
-
-    functions->glGenTextures(1, &textureId);
-    return textureId != 0;
-}
-
-void QOpenGLTexturePrivate::destroy()
-{
-    if (!textureId) {
-        // not created or already destroyed
-        return;
-    }
-    QOpenGLContext *currentContext = QOpenGLContext::currentContext();
-    if (!currentContext) {
-        qWarning("QOpenGLTexturePrivate::destroy() called without a current context.\n"
-                 "Texture has not been destroyed");
-        return;
-    }
-    if (!QOpenGLContext::areSharing(currentContext, context)) {
-
-        qWarning("QOpenGLTexturePrivate::destroy() called but texture context %p"
-                 " is not shared with current context %p.\n"
-                 "Texture has not been destroyed",
-                 static_cast<const void *>(context),
-                 static_cast<const void *>(currentContext));
-        return;
-    }
-
-    functions->glDeleteTextures(1, &textureId);
-
-    context = nullptr;
-    functions = nullptr;
-    textureId = 0;
-    format = QOpenGLTexture::NoFormat;
-    formatClass = QOpenGLTexture::NoFormatClass;
-    requestedMipLevels = 1;
-    mipLevels = -1;
-    layers = 1;
-    faces = 1;
-    samples = 0;
-    fixedSamplePositions = true,
-    baseLevel = 0;
-    maxLevel = 1000;
-    depthStencilMode = QOpenGLTexture::DepthMode;
-    minFilter = QOpenGLTexture::Nearest;
-    magFilter = QOpenGLTexture::Nearest;
-    maxAnisotropy = 1.0f;
-    minLevelOfDetail = -1000.0f;
-    maxLevelOfDetail = 1000.0f;
-    levelOfDetailBias = 0.0f;
-    textureView = false;
-    autoGenerateMipMaps = true;
-    storageAllocated = false;
-    texFuncs = nullptr;
-
-    swizzleMask[0] = QOpenGLTexture::RedValue;
-    swizzleMask[1] = QOpenGLTexture::GreenValue;
-    swizzleMask[2] = QOpenGLTexture::BlueValue;
-    swizzleMask[3] = QOpenGLTexture::AlphaValue;
-
-    wrapModes[0] = wrapModes[1] = wrapModes[2] = target == QOpenGLTexture::TargetRectangle
-        ? QOpenGLTexture::ClampToEdge : QOpenGLTexture::Repeat;
-}
-
-void QOpenGLTexturePrivate::bind()
-{
-    functions->glBindTexture(target, textureId);
-}
-
-void QOpenGLTexturePrivate::bind(uint unit, QOpenGLTexture::TextureUnitReset reset)
-{
-    GLint oldTextureUnit = 0;
-    if (reset == QOpenGLTexture::ResetTextureUnit)
-        functions->glGetIntegerv(GL_ACTIVE_TEXTURE, &oldTextureUnit);
-
-    texFuncs->glActiveTexture(GL_TEXTURE0 + unit);
-    functions->glBindTexture(target, textureId);
-
-    if (reset == QOpenGLTexture::ResetTextureUnit)
-        texFuncs->glActiveTexture(GL_TEXTURE0 + oldTextureUnit);
-}
-
-void QOpenGLTexturePrivate::release()
-{
-    functions->glBindTexture(target, 0);
-}
-
-void QOpenGLTexturePrivate::release(uint unit, QOpenGLTexture::TextureUnitReset reset)
-{
-    GLint oldTextureUnit = 0;
-    if (reset == QOpenGLTexture::ResetTextureUnit)
-        functions->glGetIntegerv(GL_ACTIVE_TEXTURE, &oldTextureUnit);
-
-    texFuncs->glActiveTexture(GL_TEXTURE0 + unit);
-    functions->glBindTexture(target, 0);
-
-    if (reset == QOpenGLTexture::ResetTextureUnit)
-        texFuncs->glActiveTexture(GL_TEXTURE0 + oldTextureUnit);
-}
-
-bool QOpenGLTexturePrivate::isBound() const
-{
-    GLint boundTextureId = 0;
-    functions->glGetIntegerv(bindingTarget, &boundTextureId);
-    return (static_cast<GLuint>(boundTextureId) == textureId);
-}
-
-bool QOpenGLTexturePrivate::isBound(uint unit) const
-{
-    GLint oldTextureUnit = 0;
-    functions->glGetIntegerv(GL_ACTIVE_TEXTURE, &oldTextureUnit);
-
-    GLint boundTextureId = 0;
-    texFuncs->glActiveTexture(GL_TEXTURE0 + unit);
-    functions->glGetIntegerv(bindingTarget, &boundTextureId);
-    bool result = (static_cast<GLuint>(boundTextureId) == textureId);
-
-    texFuncs->glActiveTexture(GL_TEXTURE0 + oldTextureUnit);
-    return result;
-}
-
-int QOpenGLTexturePrivate::evaluateMipLevels() const
-{
-    switch (target) {
-    case QOpenGLTexture::Target1D:
-    case QOpenGLTexture::Target1DArray:
-    case QOpenGLTexture::Target2D:
-    case QOpenGLTexture::Target2DArray:
-    case QOpenGLTexture::Target3D:
-    case QOpenGLTexture::TargetCubeMap:
-    case QOpenGLTexture::TargetCubeMapArray:
-        return qMin(maximumMipLevelCount(), qMax(1, requestedMipLevels));
-
-    case QOpenGLTexture::TargetRectangle:
-    case QOpenGLTexture::Target2DMultisample:
-    case QOpenGLTexture::Target2DMultisampleArray:
-    case QOpenGLTexture::TargetBuffer:
-    default:
-        return 1;
-    }
-}
-
-static bool isSizedTextureFormat(QOpenGLTexture::TextureFormat internalFormat)
-{
-    switch (internalFormat) {
-    case QOpenGLTexture::NoFormat:
-        return false;
-
-    case QOpenGLTexture::R8_UNorm:
-    case QOpenGLTexture::RG8_UNorm:
-    case QOpenGLTexture::RGB8_UNorm:
-    case QOpenGLTexture::RGBA8_UNorm:
-    case QOpenGLTexture::R16_UNorm:
-    case QOpenGLTexture::RG16_UNorm:
-    case QOpenGLTexture::RGB16_UNorm:
-    case QOpenGLTexture::RGBA16_UNorm:
-    case QOpenGLTexture::R8_SNorm:
-    case QOpenGLTexture::RG8_SNorm:
-    case QOpenGLTexture::RGB8_SNorm:
-    case QOpenGLTexture::RGBA8_SNorm:
-    case QOpenGLTexture::R16_SNorm:
-    case QOpenGLTexture::RG16_SNorm:
-    case QOpenGLTexture::RGB16_SNorm:
-    case QOpenGLTexture::RGBA16_SNorm:
-    case QOpenGLTexture::R8U:
-    case QOpenGLTexture::RG8U:
-    case QOpenGLTexture::RGB8U:
-    case QOpenGLTexture::RGBA8U:
-    case QOpenGLTexture::R16U:
-    case QOpenGLTexture::RG16U:
-    case QOpenGLTexture::RGB16U:
-    case QOpenGLTexture::RGBA16U:
-    case QOpenGLTexture::R32U:
-    case QOpenGLTexture::RG32U:
-    case QOpenGLTexture::RGB32U:
-    case QOpenGLTexture::RGBA32U:
-    case QOpenGLTexture::R8I:
-    case QOpenGLTexture::RG8I:
-    case QOpenGLTexture::RGB8I:
-    case QOpenGLTexture::RGBA8I:
-    case QOpenGLTexture::R16I:
-    case QOpenGLTexture::RG16I:
-    case QOpenGLTexture::RGB16I:
-    case QOpenGLTexture::RGBA16I:
-    case QOpenGLTexture::R32I:
-    case QOpenGLTexture::RG32I:
-    case QOpenGLTexture::RGB32I:
-    case QOpenGLTexture::RGBA32I:
-    case QOpenGLTexture::R16F:
-    case QOpenGLTexture::RG16F:
-    case QOpenGLTexture::RGB16F:
-    case QOpenGLTexture::RGBA16F:
-    case QOpenGLTexture::R32F:
-    case QOpenGLTexture::RG32F:
-    case QOpenGLTexture::RGB32F:
-    case QOpenGLTexture::RGBA32F:
-    case QOpenGLTexture::RGB9E5:
-    case QOpenGLTexture::RG11B10F:
-    case QOpenGLTexture::RG3B2:
-    case QOpenGLTexture::R5G6B5:
-    case QOpenGLTexture::RGB5A1:
-    case QOpenGLTexture::RGBA4:
-    case QOpenGLTexture::RGB10A2:
-
-    case QOpenGLTexture::D16:
-    case QOpenGLTexture::D24:
-    case QOpenGLTexture::D32:
-    case QOpenGLTexture::D32F:
-
-    case QOpenGLTexture::D24S8:
-    case QOpenGLTexture::D32FS8X24:
-
-    case QOpenGLTexture::S8:
-
-    case QOpenGLTexture::RGB_DXT1:
-    case QOpenGLTexture::RGBA_DXT1:
-    case QOpenGLTexture::RGBA_DXT3:
-    case QOpenGLTexture::RGBA_DXT5:
-    case QOpenGLTexture::R_ATI1N_UNorm:
-    case QOpenGLTexture::R_ATI1N_SNorm:
-    case QOpenGLTexture::RG_ATI2N_UNorm:
-    case QOpenGLTexture::RG_ATI2N_SNorm:
-    case QOpenGLTexture::RGB_BP_UNSIGNED_FLOAT:
-    case QOpenGLTexture::RGB_BP_SIGNED_FLOAT:
-    case QOpenGLTexture::RGB_BP_UNorm:
-    case QOpenGLTexture::SRGB8:
-    case QOpenGLTexture::SRGB8_Alpha8:
-    case QOpenGLTexture::SRGB_DXT1:
-    case QOpenGLTexture::SRGB_Alpha_DXT1:
-    case QOpenGLTexture::SRGB_Alpha_DXT3:
-    case QOpenGLTexture::SRGB_Alpha_DXT5:
-    case QOpenGLTexture::SRGB_BP_UNorm:
-    case QOpenGLTexture::R11_EAC_UNorm:
-    case QOpenGLTexture::R11_EAC_SNorm:
-    case QOpenGLTexture::RG11_EAC_UNorm:
-    case QOpenGLTexture::RG11_EAC_SNorm:
-    case QOpenGLTexture::RGB8_ETC2:
-    case QOpenGLTexture::SRGB8_ETC2:
-    case QOpenGLTexture::RGB8_PunchThrough_Alpha1_ETC2:
-    case QOpenGLTexture::SRGB8_PunchThrough_Alpha1_ETC2:
-    case QOpenGLTexture::RGBA8_ETC2_EAC:
-    case QOpenGLTexture::SRGB8_Alpha8_ETC2_EAC:
-    case QOpenGLTexture::RGBA_ASTC_4x4:
-    case QOpenGLTexture::RGBA_ASTC_5x4:
-    case QOpenGLTexture::RGBA_ASTC_5x5:
-    case QOpenGLTexture::RGBA_ASTC_6x5:
-    case QOpenGLTexture::RGBA_ASTC_6x6:
-    case QOpenGLTexture::RGBA_ASTC_8x5:
-    case QOpenGLTexture::RGBA_ASTC_8x6:
-    case QOpenGLTexture::RGBA_ASTC_8x8:
-    case QOpenGLTexture::RGBA_ASTC_10x5:
-    case QOpenGLTexture::RGBA_ASTC_10x6:
-    case QOpenGLTexture::RGBA_ASTC_10x8:
-    case QOpenGLTexture::RGBA_ASTC_10x10:
-    case QOpenGLTexture::RGBA_ASTC_12x10:
-    case QOpenGLTexture::RGBA_ASTC_12x12:
-    case QOpenGLTexture::SRGB8_Alpha8_ASTC_4x4:
-    case QOpenGLTexture::SRGB8_Alpha8_ASTC_5x4:
-    case QOpenGLTexture::SRGB8_Alpha8_ASTC_5x5:
-    case QOpenGLTexture::SRGB8_Alpha8_ASTC_6x5:
-    case QOpenGLTexture::SRGB8_Alpha8_ASTC_6x6:
-    case QOpenGLTexture::SRGB8_Alpha8_ASTC_8x5:
-    case QOpenGLTexture::SRGB8_Alpha8_ASTC_8x6:
-    case QOpenGLTexture::SRGB8_Alpha8_ASTC_8x8:
-    case QOpenGLTexture::SRGB8_Alpha8_ASTC_10x5:
-    case QOpenGLTexture::SRGB8_Alpha8_ASTC_10x6:
-    case QOpenGLTexture::SRGB8_Alpha8_ASTC_10x8:
-    case QOpenGLTexture::SRGB8_Alpha8_ASTC_10x10:
-    case QOpenGLTexture::SRGB8_Alpha8_ASTC_12x10:
-    case QOpenGLTexture::SRGB8_Alpha8_ASTC_12x12:
-        return true;
-
-    case QOpenGLTexture::RGB8_ETC1:
-        return false;
-
-    case QOpenGLTexture::DepthFormat:
-    case QOpenGLTexture::AlphaFormat:
-
-    case QOpenGLTexture::RGBFormat:
-    case QOpenGLTexture::RGBAFormat:
-
-    case QOpenGLTexture::LuminanceFormat:
-
-    case QOpenGLTexture::LuminanceAlphaFormat:
-        return false;
-    }
-
-    Q_UNREACHABLE();
-    return false;
-}
-
-static bool isTextureTargetMultisample(QOpenGLTexture::Target target)
-{
-    switch (target) {
-    case QOpenGLTexture::Target1D:
-    case QOpenGLTexture::Target1DArray:
-    case QOpenGLTexture::Target2D:
-    case QOpenGLTexture::Target2DArray:
-    case QOpenGLTexture::Target3D:
-    case QOpenGLTexture::TargetCubeMap:
-    case QOpenGLTexture::TargetCubeMapArray:
-        return false;
-
-    case QOpenGLTexture::Target2DMultisample:
-    case QOpenGLTexture::Target2DMultisampleArray:
-        return true;
-
-    case QOpenGLTexture::TargetRectangle:
-    case QOpenGLTexture::TargetBuffer:
-        return false;
-    }
-
-    Q_UNREACHABLE();
-    return false;
-}
-
-bool QOpenGLTexturePrivate::isUsingImmutableStorage() const
-{
-    // Use immutable storage whenever possible, falling back to mutable
-    // Note that if multisample textures are not supported at all, we'll still fail into
-    // the mutable storage allocation
-    return isSizedTextureFormat(format)
-            && (isTextureTargetMultisample(target)
-                ? features.testFlag(QOpenGLTexture::ImmutableMultisampleStorage)
-                : features.testFlag(QOpenGLTexture::ImmutableStorage));
-}
-
-void QOpenGLTexturePrivate::allocateStorage(QOpenGLTexture::PixelFormat pixelFormat, QOpenGLTexture::PixelType pixelType)
-{
-    // Resolve the actual number of mipmap levels we can use
-    mipLevels = evaluateMipLevels();
-
-    if (isUsingImmutableStorage())
-        allocateImmutableStorage();
-    else
-        allocateMutableStorage(pixelFormat, pixelType);
-}
-
-static QOpenGLTexture::PixelFormat pixelFormatCompatibleWithInternalFormat(QOpenGLTexture::TextureFormat internalFormat)
-{
-    switch (internalFormat) {
-    case QOpenGLTexture::NoFormat:
-        return QOpenGLTexture::NoSourceFormat;
-
-    case QOpenGLTexture::R8_UNorm:
-        return QOpenGLTexture::Red;
-
-    case QOpenGLTexture::RG8_UNorm:
-        return QOpenGLTexture::RG;
-
-    case QOpenGLTexture::RGB8_UNorm:
-        return QOpenGLTexture::RGB;
-
-    case QOpenGLTexture::RGBA8_UNorm:
-        return QOpenGLTexture::RGBA;
-
-    case QOpenGLTexture::R16_UNorm:
-        return QOpenGLTexture::Red;
-
-    case QOpenGLTexture::RG16_UNorm:
-        return QOpenGLTexture::RG;
-
-    case QOpenGLTexture::RGB16_UNorm:
-        return QOpenGLTexture::RGB;
-
-    case QOpenGLTexture::RGBA16_UNorm:
-        return QOpenGLTexture::RGBA;
-
-    case QOpenGLTexture::R8_SNorm:
-        return QOpenGLTexture::Red;
-
-    case QOpenGLTexture::RG8_SNorm:
-        return QOpenGLTexture::RG;
-
-    case QOpenGLTexture::RGB8_SNorm:
-        return QOpenGLTexture::RGB;
-
-    case QOpenGLTexture::RGBA8_SNorm:
-        return QOpenGLTexture::RGBA;
-
-    case QOpenGLTexture::R16_SNorm:
-        return QOpenGLTexture::Red;
-
-    case QOpenGLTexture::RG16_SNorm:
-        return QOpenGLTexture::RG;
-
-    case QOpenGLTexture::RGB16_SNorm:
-        return QOpenGLTexture::RGB;
-
-    case QOpenGLTexture::RGBA16_SNorm:
-        return QOpenGLTexture::RGBA;
-
-    case QOpenGLTexture::R8U:
-        return QOpenGLTexture::Red_Integer;
-
-    case QOpenGLTexture::RG8U:
-        return QOpenGLTexture::RG_Integer;
-
-    case QOpenGLTexture::RGB8U:
-        return QOpenGLTexture::RGB_Integer;
-
-    case QOpenGLTexture::RGBA8U:
-        return QOpenGLTexture::RGBA_Integer;
-
-    case QOpenGLTexture::R16U:
-        return QOpenGLTexture::Red_Integer;
-
-    case QOpenGLTexture::RG16U:
-        return QOpenGLTexture::RG_Integer;
-
-    case QOpenGLTexture::RGB16U:
-        return QOpenGLTexture::RGB_Integer;
-
-    case QOpenGLTexture::RGBA16U:
-        return QOpenGLTexture::RGBA_Integer;
-
-    case QOpenGLTexture::R32U:
-        return QOpenGLTexture::Red_Integer;
-
-    case QOpenGLTexture::RG32U:
-        return QOpenGLTexture::RG_Integer;
-
-    case QOpenGLTexture::RGB32U:
-        return QOpenGLTexture::RGB_Integer;
-
-    case QOpenGLTexture::RGBA32U:
-        return QOpenGLTexture::RGBA_Integer;
-
-    case QOpenGLTexture::R8I:
-        return QOpenGLTexture::Red_Integer;
-
-    case QOpenGLTexture::RG8I:
-        return QOpenGLTexture::RG_Integer;
-
-    case QOpenGLTexture::RGB8I:
-        return QOpenGLTexture::RGB_Integer;
-
-    case QOpenGLTexture::RGBA8I:
-        return QOpenGLTexture::RGBA_Integer;
-
-    case QOpenGLTexture::R16I:
-        return QOpenGLTexture::Red_Integer;
-
-    case QOpenGLTexture::RG16I:
-        return QOpenGLTexture::RG_Integer;
-
-    case QOpenGLTexture::RGB16I:
-        return QOpenGLTexture::RGB_Integer;
-
-    case QOpenGLTexture::RGBA16I:
-        return QOpenGLTexture::RGBA_Integer;
-
-    case QOpenGLTexture::R32I:
-        return QOpenGLTexture::Red_Integer;
-
-    case QOpenGLTexture::RG32I:
-        return QOpenGLTexture::RG_Integer;
-
-    case QOpenGLTexture::RGB32I:
-        return QOpenGLTexture::RGB_Integer;
-
-    case QOpenGLTexture::RGBA32I:
-        return QOpenGLTexture::RGBA_Integer;
-
-    case QOpenGLTexture::R16F:
-        return QOpenGLTexture::Red;
-
-    case QOpenGLTexture::RG16F:
-        return QOpenGLTexture::RG;
-
-    case QOpenGLTexture::RGB16F:
-        return QOpenGLTexture::RGB;
-
-    case QOpenGLTexture::RGBA16F:
-        return QOpenGLTexture::RGBA;
-
-    case QOpenGLTexture::R32F:
-        return QOpenGLTexture::Red;
-
-    case QOpenGLTexture::RG32F:
-        return QOpenGLTexture::RG;
-
-    case QOpenGLTexture::RGB32F:
-        return QOpenGLTexture::RGB;
-
-    case QOpenGLTexture::RGBA32F:
-        return QOpenGLTexture::RGBA;
-
-    case QOpenGLTexture::RGB9E5:
-        return QOpenGLTexture::RGB;
-
-    case QOpenGLTexture::RG11B10F:
-        return QOpenGLTexture::RGB;
-
-    case QOpenGLTexture::RG3B2:
-        return QOpenGLTexture::RGB;
-
-    case QOpenGLTexture::R5G6B5:
-        return QOpenGLTexture::RGB;
-
-    case QOpenGLTexture::RGB5A1:
-        return QOpenGLTexture::RGBA;
-
-    case QOpenGLTexture::RGBA4:
-        return QOpenGLTexture::RGBA;
-
-    case QOpenGLTexture::RGB10A2:
-        return QOpenGLTexture::RGBA;
-
-    case QOpenGLTexture::D16:
-    case QOpenGLTexture::D24:
-    case QOpenGLTexture::D32:
-    case QOpenGLTexture::D32F:
-        return QOpenGLTexture::Depth;
-
-    case QOpenGLTexture::D24S8:
-    case QOpenGLTexture::D32FS8X24:
-        return QOpenGLTexture::DepthStencil;
-
-    case QOpenGLTexture::S8:
-        return QOpenGLTexture::Stencil;
-
-    case QOpenGLTexture::RGB_DXT1:
-    case QOpenGLTexture::RGBA_DXT1:
-    case QOpenGLTexture::RGBA_DXT3:
-    case QOpenGLTexture::RGBA_DXT5:
-    case QOpenGLTexture::R_ATI1N_UNorm:
-    case QOpenGLTexture::R_ATI1N_SNorm:
-    case QOpenGLTexture::RG_ATI2N_UNorm:
-    case QOpenGLTexture::RG_ATI2N_SNorm:
-    case QOpenGLTexture::RGB_BP_UNSIGNED_FLOAT:
-    case QOpenGLTexture::RGB_BP_SIGNED_FLOAT:
-    case QOpenGLTexture::RGB_BP_UNorm:
-    case QOpenGLTexture::SRGB8:
-    case QOpenGLTexture::SRGB8_Alpha8:
-    case QOpenGLTexture::SRGB_DXT1:
-    case QOpenGLTexture::SRGB_Alpha_DXT1:
-    case QOpenGLTexture::SRGB_Alpha_DXT3:
-    case QOpenGLTexture::SRGB_Alpha_DXT5:
-    case QOpenGLTexture::SRGB_BP_UNorm:
-    case QOpenGLTexture::RGB8_ETC1:
-        return QOpenGLTexture::RGBA;
-
-    case QOpenGLTexture::R11_EAC_UNorm:
-    case QOpenGLTexture::R11_EAC_SNorm:
-        return QOpenGLTexture::Red;
-
-    case QOpenGLTexture::RG11_EAC_UNorm:
-    case QOpenGLTexture::RG11_EAC_SNorm:
-        return QOpenGLTexture::RG;
-
-    case QOpenGLTexture::RGB8_ETC2:
-    case QOpenGLTexture::SRGB8_ETC2:
-        return QOpenGLTexture::RGB;
-
-    case QOpenGLTexture::RGB8_PunchThrough_Alpha1_ETC2:
-    case QOpenGLTexture::SRGB8_PunchThrough_Alpha1_ETC2:
-        return QOpenGLTexture::RGBA;
-
-    case QOpenGLTexture::RGBA8_ETC2_EAC:
-    case QOpenGLTexture::SRGB8_Alpha8_ETC2_EAC:
-        return QOpenGLTexture::RGBA;
-
-    case QOpenGLTexture::RGBA_ASTC_4x4:
-    case QOpenGLTexture::RGBA_ASTC_5x4:
-    case QOpenGLTexture::RGBA_ASTC_5x5:
-    case QOpenGLTexture::RGBA_ASTC_6x5:
-    case QOpenGLTexture::RGBA_ASTC_6x6:
-    case QOpenGLTexture::RGBA_ASTC_8x5:
-    case QOpenGLTexture::RGBA_ASTC_8x6:
-    case QOpenGLTexture::RGBA_ASTC_8x8:
-    case QOpenGLTexture::RGBA_ASTC_10x5:
-    case QOpenGLTexture::RGBA_ASTC_10x6:
-    case QOpenGLTexture::RGBA_ASTC_10x8:
-    case QOpenGLTexture::RGBA_ASTC_10x10:
-    case QOpenGLTexture::RGBA_ASTC_12x10:
-    case QOpenGLTexture::RGBA_ASTC_12x12:
-    case QOpenGLTexture::SRGB8_Alpha8_ASTC_4x4:
-    case QOpenGLTexture::SRGB8_Alpha8_ASTC_5x4:
-    case QOpenGLTexture::SRGB8_Alpha8_ASTC_5x5:
-    case QOpenGLTexture::SRGB8_Alpha8_ASTC_6x5:
-    case QOpenGLTexture::SRGB8_Alpha8_ASTC_6x6:
-    case QOpenGLTexture::SRGB8_Alpha8_ASTC_8x5:
-    case QOpenGLTexture::SRGB8_Alpha8_ASTC_8x6:
-    case QOpenGLTexture::SRGB8_Alpha8_ASTC_8x8:
-    case QOpenGLTexture::SRGB8_Alpha8_ASTC_10x5:
-    case QOpenGLTexture::SRGB8_Alpha8_ASTC_10x6:
-    case QOpenGLTexture::SRGB8_Alpha8_ASTC_10x8:
-    case QOpenGLTexture::SRGB8_Alpha8_ASTC_10x10:
-    case QOpenGLTexture::SRGB8_Alpha8_ASTC_12x10:
-    case QOpenGLTexture::SRGB8_Alpha8_ASTC_12x12:
-        return QOpenGLTexture::RGBA;
-
-    case QOpenGLTexture::DepthFormat:
-        return QOpenGLTexture::Depth;
-
-    case QOpenGLTexture::AlphaFormat:
-        return QOpenGLTexture::Alpha;
-
-    case QOpenGLTexture::RGBFormat:
-        return QOpenGLTexture::RGB;
-
-    case QOpenGLTexture::RGBAFormat:
-        return QOpenGLTexture::RGBA;
-
-    case QOpenGLTexture::LuminanceFormat:
-        return QOpenGLTexture::Luminance;
-
-    case QOpenGLTexture::LuminanceAlphaFormat:
-        return QOpenGLTexture::LuminanceAlpha;
-    }
-
-    Q_UNREACHABLE();
-    return QOpenGLTexture::NoSourceFormat;
-}
-
-static QOpenGLTexture::PixelType pixelTypeCompatibleWithInternalFormat(QOpenGLTexture::TextureFormat internalFormat)
-{
-    switch (internalFormat) {
-    case QOpenGLTexture::NoFormat:
-        return QOpenGLTexture::NoPixelType;
-
-    case QOpenGLTexture::R8_UNorm:
-    case QOpenGLTexture::RG8_UNorm:
-    case QOpenGLTexture::RGB8_UNorm:
-    case QOpenGLTexture::RGBA8_UNorm:
-    case QOpenGLTexture::R16_UNorm:
-    case QOpenGLTexture::RG16_UNorm:
-    case QOpenGLTexture::RGB16_UNorm:
-    case QOpenGLTexture::RGBA16_UNorm:
-        return QOpenGLTexture::UInt8;
-
-    case QOpenGLTexture::R8_SNorm:
-    case QOpenGLTexture::RG8_SNorm:
-    case QOpenGLTexture::RGB8_SNorm:
-    case QOpenGLTexture::RGBA8_SNorm:
-    case QOpenGLTexture::R16_SNorm:
-    case QOpenGLTexture::RG16_SNorm:
-    case QOpenGLTexture::RGB16_SNorm:
-    case QOpenGLTexture::RGBA16_SNorm:
-        return QOpenGLTexture::Int8;
-
-    case QOpenGLTexture::R8U:
-    case QOpenGLTexture::RG8U:
-    case QOpenGLTexture::RGB8U:
-    case QOpenGLTexture::RGBA8U:
-    case QOpenGLTexture::R16U:
-    case QOpenGLTexture::RG16U:
-    case QOpenGLTexture::RGB16U:
-    case QOpenGLTexture::RGBA16U:
-    case QOpenGLTexture::R32U:
-    case QOpenGLTexture::RG32U:
-    case QOpenGLTexture::RGB32U:
-    case QOpenGLTexture::RGBA32U:
-        return QOpenGLTexture::UInt8;
-
-    case QOpenGLTexture::R8I:
-    case QOpenGLTexture::RG8I:
-    case QOpenGLTexture::RGB8I:
-    case QOpenGLTexture::RGBA8I:
-    case QOpenGLTexture::R16I:
-    case QOpenGLTexture::RG16I:
-    case QOpenGLTexture::RGB16I:
-    case QOpenGLTexture::RGBA16I:
-    case QOpenGLTexture::R32I:
-    case QOpenGLTexture::RG32I:
-    case QOpenGLTexture::RGB32I:
-    case QOpenGLTexture::RGBA32I:
-        return QOpenGLTexture::Int8;
-
-    case QOpenGLTexture::R16F:
-    case QOpenGLTexture::RG16F:
-    case QOpenGLTexture::RGB16F:
-    case QOpenGLTexture::RGBA16F:
-        return QOpenGLTexture::Float16;
-
-    case QOpenGLTexture::R32F:
-    case QOpenGLTexture::RG32F:
-    case QOpenGLTexture::RGB32F:
-    case QOpenGLTexture::RGBA32F:
-        return QOpenGLTexture::Float32;
-
-    case QOpenGLTexture::RGB9E5:
-        return QOpenGLTexture::UInt16_RGB5A1_Rev;
-
-    case QOpenGLTexture::RG11B10F:
-        return QOpenGLTexture::UInt32_RG11B10F;
-
-    case QOpenGLTexture::RG3B2:
-        return QOpenGLTexture::UInt8_RG3B2;
-
-    case QOpenGLTexture::R5G6B5:
-        return QOpenGLTexture::UInt16_R5G6B5;
-
-    case QOpenGLTexture::RGB5A1:
-        return QOpenGLTexture::UInt16_RGB5A1;
-
-    case QOpenGLTexture::RGBA4:
-        return QOpenGLTexture::UInt16_RGBA4;
-
-    case QOpenGLTexture::RGB10A2:
-        return QOpenGLTexture::UInt32_RGB10A2;
-
-    case QOpenGLTexture::D16:
-        return QOpenGLTexture::UInt16;
-
-    case QOpenGLTexture::D24:
-    case QOpenGLTexture::D32:
-        return QOpenGLTexture::UInt32;
-
-    case QOpenGLTexture::D32F:
-        return QOpenGLTexture::Float32;
-
-    case QOpenGLTexture::D24S8:
-        return QOpenGLTexture::UInt32_D24S8;
-
-    case QOpenGLTexture::D32FS8X24:
-        return QOpenGLTexture::Float32_D32_UInt32_S8_X24;
-
-    case QOpenGLTexture::S8:
-        return QOpenGLTexture::UInt8;
-
-    case QOpenGLTexture::RGB_DXT1:
-    case QOpenGLTexture::RGBA_DXT1:
-    case QOpenGLTexture::RGBA_DXT3:
-    case QOpenGLTexture::RGBA_DXT5:
-    case QOpenGLTexture::R_ATI1N_UNorm:
-    case QOpenGLTexture::R_ATI1N_SNorm:
-    case QOpenGLTexture::RG_ATI2N_UNorm:
-    case QOpenGLTexture::RG_ATI2N_SNorm:
-    case QOpenGLTexture::RGB_BP_UNSIGNED_FLOAT:
-    case QOpenGLTexture::RGB_BP_SIGNED_FLOAT:
-    case QOpenGLTexture::RGB_BP_UNorm:
-    case QOpenGLTexture::SRGB8:
-    case QOpenGLTexture::SRGB8_Alpha8:
-    case QOpenGLTexture::SRGB_DXT1:
-    case QOpenGLTexture::SRGB_Alpha_DXT1:
-    case QOpenGLTexture::SRGB_Alpha_DXT3:
-    case QOpenGLTexture::SRGB_Alpha_DXT5:
-    case QOpenGLTexture::SRGB_BP_UNorm:
-    case QOpenGLTexture::R11_EAC_UNorm:
-    case QOpenGLTexture::R11_EAC_SNorm:
-    case QOpenGLTexture::RG11_EAC_UNorm:
-    case QOpenGLTexture::RG11_EAC_SNorm:
-    case QOpenGLTexture::RGB8_ETC2:
-    case QOpenGLTexture::SRGB8_ETC2:
-    case QOpenGLTexture::RGB8_PunchThrough_Alpha1_ETC2:
-    case QOpenGLTexture::SRGB8_PunchThrough_Alpha1_ETC2:
-    case QOpenGLTexture::RGBA8_ETC2_EAC:
-    case QOpenGLTexture::SRGB8_Alpha8_ETC2_EAC:
-    case QOpenGLTexture::RGB8_ETC1:
-    case QOpenGLTexture::RGBA_ASTC_4x4:
-    case QOpenGLTexture::RGBA_ASTC_5x4:
-    case QOpenGLTexture::RGBA_ASTC_5x5:
-    case QOpenGLTexture::RGBA_ASTC_6x5:
-    case QOpenGLTexture::RGBA_ASTC_6x6:
-    case QOpenGLTexture::RGBA_ASTC_8x5:
-    case QOpenGLTexture::RGBA_ASTC_8x6:
-    case QOpenGLTexture::RGBA_ASTC_8x8:
-    case QOpenGLTexture::RGBA_ASTC_10x5:
-    case QOpenGLTexture::RGBA_ASTC_10x6:
-    case QOpenGLTexture::RGBA_ASTC_10x8:
-    case QOpenGLTexture::RGBA_ASTC_10x10:
-    case QOpenGLTexture::RGBA_ASTC_12x10:
-    case QOpenGLTexture::RGBA_ASTC_12x12:
-    case QOpenGLTexture::SRGB8_Alpha8_ASTC_4x4:
-    case QOpenGLTexture::SRGB8_Alpha8_ASTC_5x4:
-    case QOpenGLTexture::SRGB8_Alpha8_ASTC_5x5:
-    case QOpenGLTexture::SRGB8_Alpha8_ASTC_6x5:
-    case QOpenGLTexture::SRGB8_Alpha8_ASTC_6x6:
-    case QOpenGLTexture::SRGB8_Alpha8_ASTC_8x5:
-    case QOpenGLTexture::SRGB8_Alpha8_ASTC_8x6:
-    case QOpenGLTexture::SRGB8_Alpha8_ASTC_8x8:
-    case QOpenGLTexture::SRGB8_Alpha8_ASTC_10x5:
-    case QOpenGLTexture::SRGB8_Alpha8_ASTC_10x6:
-    case QOpenGLTexture::SRGB8_Alpha8_ASTC_10x8:
-    case QOpenGLTexture::SRGB8_Alpha8_ASTC_10x10:
-    case QOpenGLTexture::SRGB8_Alpha8_ASTC_12x10:
-    case QOpenGLTexture::SRGB8_Alpha8_ASTC_12x12:
-        return QOpenGLTexture::UInt8;
-
-    case QOpenGLTexture::DepthFormat:
-        return QOpenGLTexture::UInt32;
-
-    case QOpenGLTexture::AlphaFormat:
-    case QOpenGLTexture::RGBFormat:
-    case QOpenGLTexture::RGBAFormat:
-    case QOpenGLTexture::LuminanceFormat:
-    case QOpenGLTexture::LuminanceAlphaFormat:
-        return QOpenGLTexture::UInt8;
-    }
-
-    Q_UNREACHABLE();
-    return QOpenGLTexture::NoPixelType;
-}
-
-static bool isCompressedFormat(QOpenGLTexture::TextureFormat internalFormat)
-{
-    switch (internalFormat) {
-    case QOpenGLTexture::NoFormat:
-
-    case QOpenGLTexture::R8_UNorm:
-    case QOpenGLTexture::RG8_UNorm:
-    case QOpenGLTexture::RGB8_UNorm:
-    case QOpenGLTexture::RGBA8_UNorm:
-    case QOpenGLTexture::R16_UNorm:
-    case QOpenGLTexture::RG16_UNorm:
-    case QOpenGLTexture::RGB16_UNorm:
-    case QOpenGLTexture::RGBA16_UNorm:
-    case QOpenGLTexture::R8_SNorm:
-    case QOpenGLTexture::RG8_SNorm:
-    case QOpenGLTexture::RGB8_SNorm:
-    case QOpenGLTexture::RGBA8_SNorm:
-    case QOpenGLTexture::R16_SNorm:
-    case QOpenGLTexture::RG16_SNorm:
-    case QOpenGLTexture::RGB16_SNorm:
-    case QOpenGLTexture::RGBA16_SNorm:
-    case QOpenGLTexture::R8U:
-    case QOpenGLTexture::RG8U:
-    case QOpenGLTexture::RGB8U:
-    case QOpenGLTexture::RGBA8U:
-    case QOpenGLTexture::R16U:
-    case QOpenGLTexture::RG16U:
-    case QOpenGLTexture::RGB16U:
-    case QOpenGLTexture::RGBA16U:
-    case QOpenGLTexture::R32U:
-    case QOpenGLTexture::RG32U:
-    case QOpenGLTexture::RGB32U:
-    case QOpenGLTexture::RGBA32U:
-    case QOpenGLTexture::R8I:
-    case QOpenGLTexture::RG8I:
-    case QOpenGLTexture::RGB8I:
-    case QOpenGLTexture::RGBA8I:
-    case QOpenGLTexture::R16I:
-    case QOpenGLTexture::RG16I:
-    case QOpenGLTexture::RGB16I:
-    case QOpenGLTexture::RGBA16I:
-    case QOpenGLTexture::R32I:
-    case QOpenGLTexture::RG32I:
-    case QOpenGLTexture::RGB32I:
-    case QOpenGLTexture::RGBA32I:
-    case QOpenGLTexture::R16F:
-    case QOpenGLTexture::RG16F:
-    case QOpenGLTexture::RGB16F:
-    case QOpenGLTexture::RGBA16F:
-    case QOpenGLTexture::R32F:
-    case QOpenGLTexture::RG32F:
-    case QOpenGLTexture::RGB32F:
-    case QOpenGLTexture::RGBA32F:
-    case QOpenGLTexture::RGB9E5:
-    case QOpenGLTexture::RG11B10F:
-    case QOpenGLTexture::RG3B2:
-    case QOpenGLTexture::R5G6B5:
-    case QOpenGLTexture::RGB5A1:
-    case QOpenGLTexture::RGBA4:
-    case QOpenGLTexture::RGB10A2:
-
-    case QOpenGLTexture::D16:
-    case QOpenGLTexture::D24:
-    case QOpenGLTexture::D32:
-    case QOpenGLTexture::D32F:
-
-    case QOpenGLTexture::D24S8:
-    case QOpenGLTexture::D32FS8X24:
-
-    case QOpenGLTexture::S8:
-        return false;
-
-    case QOpenGLTexture::RGB_DXT1:
-    case QOpenGLTexture::RGBA_DXT1:
-    case QOpenGLTexture::RGBA_DXT3:
-    case QOpenGLTexture::RGBA_DXT5:
-    case QOpenGLTexture::R_ATI1N_UNorm:
-    case QOpenGLTexture::R_ATI1N_SNorm:
-    case QOpenGLTexture::RG_ATI2N_UNorm:
-    case QOpenGLTexture::RG_ATI2N_SNorm:
-    case QOpenGLTexture::RGB_BP_UNSIGNED_FLOAT:
-    case QOpenGLTexture::RGB_BP_SIGNED_FLOAT:
-    case QOpenGLTexture::RGB_BP_UNorm:
-    case QOpenGLTexture::SRGB8:
-    case QOpenGLTexture::SRGB8_Alpha8:
-    case QOpenGLTexture::SRGB_DXT1:
-    case QOpenGLTexture::SRGB_Alpha_DXT1:
-    case QOpenGLTexture::SRGB_Alpha_DXT3:
-    case QOpenGLTexture::SRGB_Alpha_DXT5:
-    case QOpenGLTexture::SRGB_BP_UNorm:
-    case QOpenGLTexture::R11_EAC_UNorm:
-    case QOpenGLTexture::R11_EAC_SNorm:
-    case QOpenGLTexture::RG11_EAC_UNorm:
-    case QOpenGLTexture::RG11_EAC_SNorm:
-    case QOpenGLTexture::RGB8_ETC2:
-    case QOpenGLTexture::SRGB8_ETC2:
-    case QOpenGLTexture::RGB8_PunchThrough_Alpha1_ETC2:
-    case QOpenGLTexture::SRGB8_PunchThrough_Alpha1_ETC2:
-    case QOpenGLTexture::RGBA8_ETC2_EAC:
-    case QOpenGLTexture::SRGB8_Alpha8_ETC2_EAC:
-    case QOpenGLTexture::RGB8_ETC1:
-    case QOpenGLTexture::RGBA_ASTC_4x4:
-    case QOpenGLTexture::RGBA_ASTC_5x4:
-    case QOpenGLTexture::RGBA_ASTC_5x5:
-    case QOpenGLTexture::RGBA_ASTC_6x5:
-    case QOpenGLTexture::RGBA_ASTC_6x6:
-    case QOpenGLTexture::RGBA_ASTC_8x5:
-    case QOpenGLTexture::RGBA_ASTC_8x6:
-    case QOpenGLTexture::RGBA_ASTC_8x8:
-    case QOpenGLTexture::RGBA_ASTC_10x5:
-    case QOpenGLTexture::RGBA_ASTC_10x6:
-    case QOpenGLTexture::RGBA_ASTC_10x8:
-    case QOpenGLTexture::RGBA_ASTC_10x10:
-    case QOpenGLTexture::RGBA_ASTC_12x10:
-    case QOpenGLTexture::RGBA_ASTC_12x12:
-    case QOpenGLTexture::SRGB8_Alpha8_ASTC_4x4:
-    case QOpenGLTexture::SRGB8_Alpha8_ASTC_5x4:
-    case QOpenGLTexture::SRGB8_Alpha8_ASTC_5x5:
-    case QOpenGLTexture::SRGB8_Alpha8_ASTC_6x5:
-    case QOpenGLTexture::SRGB8_Alpha8_ASTC_6x6:
-    case QOpenGLTexture::SRGB8_Alpha8_ASTC_8x5:
-    case QOpenGLTexture::SRGB8_Alpha8_ASTC_8x6:
-    case QOpenGLTexture::SRGB8_Alpha8_ASTC_8x8:
-    case QOpenGLTexture::SRGB8_Alpha8_ASTC_10x5:
-    case QOpenGLTexture::SRGB8_Alpha8_ASTC_10x6:
-    case QOpenGLTexture::SRGB8_Alpha8_ASTC_10x8:
-    case QOpenGLTexture::SRGB8_Alpha8_ASTC_10x10:
-    case QOpenGLTexture::SRGB8_Alpha8_ASTC_12x10:
-    case QOpenGLTexture::SRGB8_Alpha8_ASTC_12x12:
-        return true;
-
-    case QOpenGLTexture::DepthFormat:
-    case QOpenGLTexture::AlphaFormat:
-    case QOpenGLTexture::RGBFormat:
-    case QOpenGLTexture::RGBAFormat:
-    case QOpenGLTexture::LuminanceFormat:
-    case QOpenGLTexture::LuminanceAlphaFormat:
-        return false;
-    }
-
-    Q_UNREACHABLE();
-    return false;
-}
-
-void QOpenGLTexturePrivate::allocateMutableStorage(QOpenGLTexture::PixelFormat pixelFormat, QOpenGLTexture::PixelType pixelType)
-{
-    // There is no way to allocate mutable storage for compressed textures in in
-    // versions older than OpenGL 3.1 and OpenGL ES 3.0, because the older specs
-    // do not mandate accepting null data pointers for glCompressedTexImage*D,
-    // unlike glTexImage*D (which in turn does not accept compressed formats).
-    if (isCompressedFormat(format)) {
-        storageAllocated = true;
-        return;
-    }
-
-    switch (target) {
-    case QOpenGLTexture::TargetBuffer:
-        // Buffer textures get their storage from an external OpenGL buffer
-        qWarning("Buffer textures do not allocate storage");
-        return;
-
-    case QOpenGLTexture::Target1D:
-        if (features.testFlag(QOpenGLTexture::Texture1D)) {
-            for (int level = 0; level < mipLevels; ++level)
-                texFuncs->glTextureImage1D(textureId, target, bindingTarget, level, format,
-                                           mipLevelSize(level, dimensions[0]),
-                                           0,
-                                           pixelFormat, pixelType, nullptr);
-        } else {
-            qWarning("1D textures are not supported");
-            return;
-        }
-        break;
-
-    case QOpenGLTexture::Target1DArray:
-        if (features.testFlag(QOpenGLTexture::Texture1D)
-                && features.testFlag(QOpenGLTexture::TextureArrays)) {
-            for (int level = 0; level < mipLevels; ++level)
-                texFuncs->glTextureImage2D(textureId, target, bindingTarget, level, format,
-                                           mipLevelSize(level, dimensions[0]),
-                                           layers,
-                                           0,
-                                           pixelFormat, pixelType, nullptr);
-        } else {
-            qWarning("1D array textures are not supported");
-            return;
-        }
-        break;
-
-    case QOpenGLTexture::Target2D:
-    case QOpenGLTexture::TargetRectangle:
-        for (int level = 0; level < mipLevels; ++level)
-            texFuncs->glTextureImage2D(textureId, target, bindingTarget, level, format,
-                                       mipLevelSize(level, dimensions[0]),
-                                       mipLevelSize(level, dimensions[1]),
-                                       0,
-                                       pixelFormat, pixelType, nullptr);
-        break;
-
-    case QOpenGLTexture::TargetCubeMap: {
-        // Cubemaps are the odd one out. We have to allocate storage for each
-        // face and miplevel using the special cubemap face targets rather than
-        // GL_TARGET_CUBEMAP.
-        const QOpenGLTexture::CubeMapFace faceTargets[] = {
-            QOpenGLTexture::CubeMapPositiveX, QOpenGLTexture::CubeMapNegativeX,
-            QOpenGLTexture::CubeMapPositiveY, QOpenGLTexture::CubeMapNegativeY,
-            QOpenGLTexture::CubeMapPositiveZ, QOpenGLTexture::CubeMapNegativeZ
-        };
-
-        for (int faceTarget = 0; faceTarget < 6; ++faceTarget) {
-            for (int level = 0; level < mipLevels; ++level) {
-                texFuncs->glTextureImage2D(textureId, faceTargets[faceTarget], bindingTarget,
-                                           level, format,
-                                           mipLevelSize(level, dimensions[0]),
-                                           mipLevelSize(level, dimensions[1]),
-                                           0,
-                                           pixelFormat, pixelType, nullptr);
-            }
-        }
-        break;
-    }
-
-    case QOpenGLTexture::Target2DArray:
-        if (features.testFlag(QOpenGLTexture::TextureArrays)) {
-            for (int level = 0; level < mipLevels; ++level)
-                texFuncs->glTextureImage3D(textureId, target, bindingTarget, level, format,
-                                           mipLevelSize(level, dimensions[0]),
-                                           mipLevelSize(level, dimensions[1]),
-                                           layers,
-                                           0,
-                                           pixelFormat, pixelType, nullptr);
-        } else {
-            qWarning("Array textures are not supported");
-            return;
-        }
-        break;
-
-    case QOpenGLTexture::TargetCubeMapArray:
-        // Cubemap arrays must specify number of layer-faces (6 * layers) as depth parameter
-        if (features.testFlag(QOpenGLTexture::TextureCubeMapArrays)) {
-            for (int level = 0; level < mipLevels; ++level)
-                texFuncs->glTextureImage3D(textureId, target, bindingTarget, level, format,
-                                           mipLevelSize(level, dimensions[0]),
-                                           mipLevelSize(level, dimensions[1]),
-                                           6 * layers,
-                                           0,
-                                           pixelFormat, pixelType, nullptr);
-        } else {
-            qWarning("Cubemap Array textures are not supported");
-            return;
-        }
-        break;
-
-    case QOpenGLTexture::Target3D:
-        if (features.testFlag(QOpenGLTexture::Texture3D)) {
-            for (int level = 0; level < mipLevels; ++level)
-                texFuncs->glTextureImage3D(textureId, target, bindingTarget, level, format,
-                                           mipLevelSize(level, dimensions[0]),
-                                           mipLevelSize(level, dimensions[1]),
-                                           mipLevelSize(level, dimensions[2]),
-                                           0,
-                                           pixelFormat, pixelType, nullptr);
-        } else {
-            qWarning("3D textures are not supported");
-            return;
-        }
-        break;
-
-    case QOpenGLTexture::Target2DMultisample:
-        if (features.testFlag(QOpenGLTexture::TextureMultisample)) {
-            texFuncs->glTextureImage2DMultisample(textureId, target, bindingTarget, samples, format,
-                                                  dimensions[0], dimensions[1],
-                                                  fixedSamplePositions);
-        } else {
-            qWarning("Multisample textures are not supported");
-            return;
-        }
-        break;
-
-    case QOpenGLTexture::Target2DMultisampleArray:
-        if (features.testFlag(QOpenGLTexture::TextureMultisample)
-                && features.testFlag(QOpenGLTexture::TextureArrays)) {
-            texFuncs->glTextureImage3DMultisample(textureId, target, bindingTarget, samples, format,
-                                                  dimensions[0], dimensions[1], layers,
-                                                  fixedSamplePositions);
-        } else {
-            qWarning("Multisample array textures are not supported");
-            return;
-        }
-        break;
-    }
-
-    storageAllocated = true;
-}
-
-void QOpenGLTexturePrivate::allocateImmutableStorage()
-{
-    switch (target) {
-    case QOpenGLTexture::TargetBuffer:
-        // Buffer textures get their storage from an external OpenGL buffer
-        qWarning("Buffer textures do not allocate storage");
-        return;
-
-    case QOpenGLTexture::Target1D:
-        if (features.testFlag(QOpenGLTexture::Texture1D)) {
-            texFuncs->glTextureStorage1D(textureId, target, bindingTarget, mipLevels, format,
-                                         dimensions[0]);
-        } else {
-            qWarning("1D textures are not supported");
-            return;
-        }
-        break;
-
-    case QOpenGLTexture::Target1DArray:
-        if (features.testFlag(QOpenGLTexture::Texture1D)
-                && features.testFlag(QOpenGLTexture::TextureArrays)) {
-            texFuncs->glTextureStorage2D(textureId, target, bindingTarget, mipLevels, format,
-                                         dimensions[0], layers);
-        } else {
-            qWarning("1D array textures are not supported");
-            return;
-        }
-        break;
-
-    case QOpenGLTexture::Target2D:
-    case QOpenGLTexture::TargetCubeMap:
-    case QOpenGLTexture::TargetRectangle:
-        texFuncs->glTextureStorage2D(textureId, target, bindingTarget, mipLevels, format,
-                                     dimensions[0], dimensions[1]);
-        break;
-
-    case QOpenGLTexture::Target2DArray:
-        if (features.testFlag(QOpenGLTexture::TextureArrays)) {
-            texFuncs->glTextureStorage3D(textureId, target, bindingTarget, mipLevels, format,
-                                         dimensions[0], dimensions[1], layers);
-        } else {
-            qWarning("Array textures are not supported");
-            return;
-        }
-        break;
-
-    case QOpenGLTexture::TargetCubeMapArray:
-        // Cubemap arrays must specify number of layer-faces (6 * layers) as depth parameter
-        if (features.testFlag(QOpenGLTexture::TextureCubeMapArrays)) {
-            texFuncs->glTextureStorage3D(textureId, target, bindingTarget, mipLevels, format,
-                                         dimensions[0], dimensions[1], 6 * layers);
-        } else {
-            qWarning("Cubemap Array textures are not supported");
-            return;
-        }
-        break;
-
-    case QOpenGLTexture::Target3D:
-        if (features.testFlag(QOpenGLTexture::Texture3D)) {
-            texFuncs->glTextureStorage3D(textureId, target, bindingTarget, mipLevels, format,
-                                         dimensions[0], dimensions[1], dimensions[2]);
-        } else {
-            qWarning("3D textures are not supported");
-            return;
-        }
-        break;
-
-    case QOpenGLTexture::Target2DMultisample:
-        if (features.testFlag(QOpenGLTexture::ImmutableMultisampleStorage)) {
-            texFuncs->glTextureStorage2DMultisample(textureId, target, bindingTarget, samples, format,
-                                                    dimensions[0], dimensions[1],
-                                                    fixedSamplePositions);
-        } else {
-            qWarning("Multisample textures are not supported");
-            return;
-        }
-        break;
-
-    case QOpenGLTexture::Target2DMultisampleArray:
-        if (features.testFlag(QOpenGLTexture::ImmutableMultisampleStorage)
-                && features.testFlag(QOpenGLTexture::TextureArrays)) {
-            texFuncs->glTextureStorage3DMultisample(textureId, target, bindingTarget, samples, format,
-                                                    dimensions[0], dimensions[1], layers,
-                                                    fixedSamplePositions);
-        } else {
-            qWarning("Multisample array textures are not supported");
-            return;
-        }
-        break;
-    }
-
-    storageAllocated = true;
-}
-
-void QOpenGLTexturePrivate::setData(int mipLevel, int layer, int layerCount, QOpenGLTexture::CubeMapFace cubeFace,
-                                    QOpenGLTexture::PixelFormat sourceFormat, QOpenGLTexture::PixelType sourceType,
-                                    const void *data, const QOpenGLPixelTransferOptions * const options)
-{
-    switch (target) {
-    case QOpenGLTexture::Target1D:
-        Q_UNUSED(layer);
-        Q_UNUSED(cubeFace);
-        Q_UNUSED(layerCount);
-        texFuncs->glTextureSubImage1D(textureId, target, bindingTarget, mipLevel,
-                                      0, mipLevelSize( mipLevel, dimensions[0] ),
-                                      sourceFormat, sourceType, data, options);
-        break;
-
-    case QOpenGLTexture::Target1DArray:
-        Q_UNUSED(cubeFace);
-        texFuncs->glTextureSubImage2D(textureId, target, bindingTarget, mipLevel,
-                                      0, layer,
-                                      mipLevelSize(mipLevel, dimensions[0]),
-                                      layerCount,
-                                      sourceFormat, sourceType, data, options);
-        break;
-
-    case QOpenGLTexture::Target2D:
-        Q_UNUSED(layer);
-        Q_UNUSED(cubeFace);
-        Q_UNUSED(layerCount);
-        texFuncs->glTextureSubImage2D(textureId, target, bindingTarget, mipLevel,
-                                      0, 0,
-                                      mipLevelSize(mipLevel, dimensions[0]),
-                                      mipLevelSize(mipLevel, dimensions[1]),
-                                      sourceFormat, sourceType, data, options);
-        break;
-
-    case QOpenGLTexture::Target2DArray:
-        Q_UNUSED(cubeFace);
-        texFuncs->glTextureSubImage3D(textureId, target, bindingTarget, mipLevel,
-                                      0, 0, layer,
-                                      mipLevelSize(mipLevel, dimensions[0]),
-                                      mipLevelSize(mipLevel, dimensions[1]),
-                                      layerCount,
-                                      sourceFormat, sourceType, data, options);
-        break;
-
-    case QOpenGLTexture::Target3D:
-        Q_UNUSED(cubeFace);
-        Q_UNUSED(layerCount);
-        texFuncs->glTextureSubImage3D(textureId, target, bindingTarget, mipLevel,
-                                      0, 0, layer,
-                                      mipLevelSize(mipLevel, dimensions[0]),
-                                      mipLevelSize(mipLevel, dimensions[1]),
-                                      mipLevelSize(mipLevel, dimensions[2]),
-                                      sourceFormat, sourceType, data, options);
-        break;
-
-    case QOpenGLTexture::TargetCubeMap:
-        Q_UNUSED(layer);
-        Q_UNUSED(layerCount);
-        texFuncs->glTextureSubImage2D(textureId, cubeFace, bindingTarget, mipLevel,
-                                      0, 0,
-                                      mipLevelSize(mipLevel, dimensions[0]),
-                                      mipLevelSize(mipLevel, dimensions[1]),
-                                      sourceFormat, sourceType, data, options);
-        break;
-
-    case QOpenGLTexture::TargetCubeMapArray: {
-        int faceIndex = cubeFace - QOpenGLTexture::CubeMapPositiveX;
-        int layerFace = 6 * layer + faceIndex;
-        texFuncs->glTextureSubImage3D(textureId, target, bindingTarget, mipLevel,
-                                      0, 0, layerFace,
-                                      mipLevelSize(mipLevel, dimensions[0]),
-                                      mipLevelSize(mipLevel, dimensions[1]),
-                                      layerCount,
-                                      sourceFormat, sourceType, data, options);
-        break;
-    }
-
-    case QOpenGLTexture::TargetRectangle:
-        Q_UNUSED(mipLevel);
-        Q_UNUSED(layer);
-        Q_UNUSED(cubeFace);
-        Q_UNUSED(layerCount);
-        texFuncs->glTextureSubImage2D(textureId, target, bindingTarget, 0,
-                                      0, 0,
-                                      dimensions[0],
-                                      dimensions[1],
-                                      sourceFormat, sourceType, data, options);
-        break;
-
-    case QOpenGLTexture::Target2DMultisample:
-    case QOpenGLTexture::Target2DMultisampleArray:
-    case QOpenGLTexture::TargetBuffer:
-        // We don't upload pixel data for these targets
-        qWarning("QOpenGLTexture::setData(): Texture target does not support pixel data upload");
-        break;
-    }
-
-    // If requested perform automatic mip map generation
-    if (mipLevel == 0 && autoGenerateMipMaps && mipLevels > 1) {
-        Q_Q(QOpenGLTexture);
-        q->generateMipMaps();
-    }
-}
-
-void QOpenGLTexturePrivate::setData(int xOffset, int yOffset, int zOffset, int width, int height, int depth,
-                                    int mipLevel, int layer, int layerCount, QOpenGLTexture::CubeMapFace cubeFace,
-                                    QOpenGLTexture::PixelFormat sourceFormat, QOpenGLTexture::PixelType sourceType,
-                                    const void *data, const QOpenGLPixelTransferOptions * const options)
-{
-    switch (target) {
-    case QOpenGLTexture::Target1D:
-        Q_UNUSED(layer);
-        Q_UNUSED(cubeFace);
-        Q_UNUSED(layerCount);
-        Q_UNUSED(yOffset);
-        Q_UNUSED(zOffset);
-        Q_UNUSED(height);
-        Q_UNUSED(depth);
-        texFuncs->glTextureSubImage1D(textureId, target, bindingTarget, mipLevel,
-                                      xOffset, width,
-                                      sourceFormat, sourceType, data, options);
-        break;
-
-    case QOpenGLTexture::Target1DArray:
-        Q_UNUSED(cubeFace);
-        Q_UNUSED(yOffset);
-        Q_UNUSED(zOffset);
-        Q_UNUSED(height);
-        Q_UNUSED(depth);
-        texFuncs->glTextureSubImage2D(textureId, target, bindingTarget, mipLevel,
-                                      xOffset, layer,
-                                      width,
-                                      layerCount,
-                                      sourceFormat, sourceType, data, options);
-        break;
-
-    case QOpenGLTexture::Target2D:
-        Q_UNUSED(layer);
-        Q_UNUSED(cubeFace);
-        Q_UNUSED(layerCount);
-        Q_UNUSED(zOffset);
-        Q_UNUSED(depth);
-        texFuncs->glTextureSubImage2D(textureId, target, bindingTarget, mipLevel,
-                                      xOffset, yOffset,
-                                      width, height,
-                                      sourceFormat, sourceType, data, options);
-        break;
-
-    case QOpenGLTexture::Target2DArray:
-        Q_UNUSED(cubeFace);
-        Q_UNUSED(zOffset);
-        Q_UNUSED(depth);
-        texFuncs->glTextureSubImage3D(textureId, target, bindingTarget, mipLevel,
-                                      xOffset, yOffset, layer,
-                                      width, height, layerCount,
-                                      sourceFormat, sourceType, data, options);
-        break;
-
-    case QOpenGLTexture::Target3D:
-        Q_UNUSED(cubeFace);
-        Q_UNUSED(layerCount);
-        texFuncs->glTextureSubImage3D(textureId, target, bindingTarget, mipLevel,
-                                      xOffset, yOffset, zOffset,
-                                      width, height, depth,
-                                      sourceFormat, sourceType, data, options);
-        break;
-
-    case QOpenGLTexture::TargetCubeMap:
-        Q_UNUSED(layer);
-        Q_UNUSED(layerCount);
-        Q_UNUSED(zOffset);
-        Q_UNUSED(depth);
-        texFuncs->glTextureSubImage2D(textureId, cubeFace, bindingTarget, mipLevel,
-                                      xOffset, yOffset,
-                                      width, height,
-                                      sourceFormat, sourceType, data, options);
-        break;
-
-    case QOpenGLTexture::TargetCubeMapArray: {
-        Q_UNUSED(zOffset);
-        Q_UNUSED(depth);
-        int faceIndex = cubeFace - QOpenGLTexture::CubeMapPositiveX;
-        int layerFace = 6 * layer + faceIndex;
-        texFuncs->glTextureSubImage3D(textureId, target, bindingTarget, mipLevel,
-                                      xOffset, yOffset, layerFace,
-                                      width, height,
-                                      layerCount,
-                                      sourceFormat, sourceType, data, options);
-        break;
-    }
-
-    case QOpenGLTexture::TargetRectangle:
-        Q_UNUSED(mipLevel);
-        Q_UNUSED(layer);
-        Q_UNUSED(cubeFace);
-        Q_UNUSED(layerCount);
-        Q_UNUSED(zOffset);
-        Q_UNUSED(depth);
-        texFuncs->glTextureSubImage2D(textureId, target, bindingTarget, 0,
-                                      xOffset, yOffset,
-                                      width, height,
-                                      sourceFormat, sourceType, data, options);
-        break;
-
-    case QOpenGLTexture::Target2DMultisample:
-    case QOpenGLTexture::Target2DMultisampleArray:
-    case QOpenGLTexture::TargetBuffer:
-        // We don't upload pixel data for these targets
-        qWarning("QOpenGLTexture::setData(): Texture target does not support pixel data upload");
-        break;
-    }
-
-    // If requested perform automatic mip map generation
-    if (mipLevel == 0 && autoGenerateMipMaps && mipLevels > 1) {
-        Q_Q(QOpenGLTexture);
-        q->generateMipMaps();
-    }
-}
-
-
-void QOpenGLTexturePrivate::setCompressedData(int mipLevel, int layer, int layerCount,
-                                              QOpenGLTexture::CubeMapFace cubeFace,
-                                              int dataSize, const void *data,
-                                              const QOpenGLPixelTransferOptions * const options)
-{
-    if (!isCompressedFormat(format)) {
-        qWarning("Cannot set compressed data for non-compressed format 0x%x", format);
-        return;
-    }
-
-    const bool needsFullSpec = !isUsingImmutableStorage(); // was allocateStorage() a no-op?
-
-    switch (target) {
-    case QOpenGLTexture::Target1D:
-        Q_UNUSED(layer);
-        Q_UNUSED(cubeFace);
-        Q_UNUSED(layerCount);
-        if (needsFullSpec) {
-            texFuncs->glCompressedTextureImage1D(textureId, target, bindingTarget, mipLevel,
-                                                 format,
-                                                 mipLevelSize(mipLevel, dimensions[0]),
-                                                 0, dataSize, data, options);
-        } else {
-            texFuncs->glCompressedTextureSubImage1D(textureId, target, bindingTarget, mipLevel,
-                                                    0, mipLevelSize( mipLevel, dimensions[0] ),
-                                                    format, dataSize, data, options);
-        }
-        break;
-
-    case QOpenGLTexture::Target1DArray:
-        Q_UNUSED(cubeFace);
-        if (!needsFullSpec) {
-            texFuncs->glCompressedTextureSubImage2D(textureId, target, bindingTarget, mipLevel,
-                                                    0, layer,
-                                                    mipLevelSize(mipLevel, dimensions[0]),
-                                                    layerCount,
-                                                    format, dataSize, data, options);
-        }
-        break;
-
-    case QOpenGLTexture::Target2D:
-        Q_UNUSED(layer);
-        Q_UNUSED(cubeFace);
-        Q_UNUSED(layerCount);
-        if (needsFullSpec) {
-            texFuncs->glCompressedTextureImage2D(textureId, target, bindingTarget, mipLevel,
-                                                 format,
-                                                 mipLevelSize(mipLevel, dimensions[0]),
-                                                 mipLevelSize(mipLevel, dimensions[1]),
-                                                 0, dataSize, data, options);
-        } else {
-            texFuncs->glCompressedTextureSubImage2D(textureId, target, bindingTarget, mipLevel,
-                                                    0, 0,
-                                                    mipLevelSize(mipLevel, dimensions[0]),
-                                                    mipLevelSize(mipLevel, dimensions[1]),
-                                                    format, dataSize, data, options);
-        }
-        break;
-
-    case QOpenGLTexture::Target2DArray:
-        Q_UNUSED(cubeFace);
-        if (!needsFullSpec) {
-            texFuncs->glCompressedTextureSubImage3D(textureId, target, bindingTarget, mipLevel,
-                                                    0, 0, layer,
-                                                    mipLevelSize(mipLevel, dimensions[0]),
-                                                    mipLevelSize(mipLevel, dimensions[1]),
-                                                    layerCount,
-                                                    format, dataSize, data, options);
-        }
-        break;
-
-    case QOpenGLTexture::Target3D:
-        Q_UNUSED(cubeFace);
-        Q_UNUSED(layerCount);
-        if (needsFullSpec) {
-            texFuncs->glCompressedTextureImage3D(textureId, target, bindingTarget, mipLevel,
-                                                 format,
-                                                 mipLevelSize(mipLevel, dimensions[0]),
-                                                 mipLevelSize(mipLevel, dimensions[1]),
-                                                 mipLevelSize(mipLevel, dimensions[2]),
-                                                 0, dataSize, data, options);
-        } else {
-            texFuncs->glCompressedTextureSubImage3D(textureId, target, bindingTarget, mipLevel,
-                                                    0, 0, layer,
-                                                    mipLevelSize(mipLevel, dimensions[0]),
-                                                    mipLevelSize(mipLevel, dimensions[1]),
-                                                    mipLevelSize(mipLevel, dimensions[2]),
-                                                    format, dataSize, data, options);
-        }
-        break;
-
-    case QOpenGLTexture::TargetCubeMap:
-        Q_UNUSED(layer);
-        Q_UNUSED(layerCount);
-        if (needsFullSpec) {
-            texFuncs->glCompressedTextureImage2D(textureId, cubeFace, bindingTarget, mipLevel,
-                                                 format,
-                                                 mipLevelSize(mipLevel, dimensions[0]),
-                                                 mipLevelSize(mipLevel, dimensions[1]),
-                                                 0, dataSize, data, options);
-        } else {
-            texFuncs->glCompressedTextureSubImage2D(textureId, cubeFace, bindingTarget, mipLevel,
-                                                    0, 0,
-                                                    mipLevelSize(mipLevel, dimensions[0]),
-                                                    mipLevelSize(mipLevel, dimensions[1]),
-                                                    format, dataSize, data, options);
-        }
-        break;
-
-    case QOpenGLTexture::TargetCubeMapArray: {
-        int faceIndex = cubeFace - QOpenGLTexture::CubeMapPositiveX;
-        int layerFace = 6 * layer + faceIndex;
-        if (!needsFullSpec) {
-            texFuncs->glCompressedTextureSubImage3D(textureId, target, bindingTarget, mipLevel,
-                                                    0, 0, layerFace,
-                                                    mipLevelSize(mipLevel, dimensions[0]),
-                                                    mipLevelSize(mipLevel, dimensions[1]),
-                                                    layerCount,
-                                                    format, dataSize, data, options);
-        }
-        break;
-    }
-
-    case QOpenGLTexture::TargetRectangle:
-    case QOpenGLTexture::Target2DMultisample:
-    case QOpenGLTexture::Target2DMultisampleArray:
-    case QOpenGLTexture::TargetBuffer:
-        // We don't upload pixel data for these targets
-        qWarning("QOpenGLTexture::setCompressedData(): Texture target does not support pixel data upload");
-        break;
-    }
-
-    // If requested perform automatic mip map generation
-    if (mipLevel == 0 && autoGenerateMipMaps && mipLevels > 1) {
-        Q_Q(QOpenGLTexture);
-        q->generateMipMaps();
-    }
-}
-
-void QOpenGLTexturePrivate::setWrapMode(QOpenGLTexture::WrapMode mode)
-{
-    switch (target) {
-    case QOpenGLTexture::Target1D:
-    case QOpenGLTexture::Target1DArray:
-    case QOpenGLTexture::TargetBuffer:
-        wrapModes[0] = mode;
-        texFuncs->glTextureParameteri(textureId, target, bindingTarget, GL_TEXTURE_WRAP_S, mode);
-        break;
-
-    case QOpenGLTexture::Target2D:
-    case QOpenGLTexture::Target2DArray:
-    case QOpenGLTexture::TargetCubeMap:
-    case QOpenGLTexture::TargetCubeMapArray:
-    case QOpenGLTexture::Target2DMultisample:
-    case QOpenGLTexture::Target2DMultisampleArray:
-    case QOpenGLTexture::TargetRectangle:
-        wrapModes[0] = wrapModes[1] = mode;
-        texFuncs->glTextureParameteri(textureId, target, bindingTarget, GL_TEXTURE_WRAP_S, mode);
-        texFuncs->glTextureParameteri(textureId, target, bindingTarget, GL_TEXTURE_WRAP_T, mode);
-        break;
-
-    case QOpenGLTexture::Target3D:
-        wrapModes[0] = wrapModes[1] = wrapModes[2] = mode;
-        texFuncs->glTextureParameteri(textureId, target, bindingTarget, GL_TEXTURE_WRAP_S, mode);
-        texFuncs->glTextureParameteri(textureId, target, bindingTarget, GL_TEXTURE_WRAP_T, mode);
-        texFuncs->glTextureParameteri(textureId, target, bindingTarget, GL_TEXTURE_WRAP_R, mode);
-        break;
-    }
-}
-
-void QOpenGLTexturePrivate::setWrapMode(QOpenGLTexture::CoordinateDirection direction, QOpenGLTexture::WrapMode mode)
-{
-    switch (target) {
-    case QOpenGLTexture::Target1D:
-    case QOpenGLTexture::Target1DArray:
-    case QOpenGLTexture::TargetBuffer:
-        switch (direction) {
-        case QOpenGLTexture::DirectionS:
-            wrapModes[0] = mode;
-            texFuncs->glTextureParameteri(textureId, target, bindingTarget, GL_TEXTURE_WRAP_S, mode);
-            break;
-
-        case QOpenGLTexture::DirectionT:
-        case QOpenGLTexture::DirectionR:
-            qWarning("QOpenGLTexture::setWrapMode() direction not valid for this texture target");
-            break;
-        }
-        break;
-
-    case QOpenGLTexture::Target2D:
-    case QOpenGLTexture::Target2DArray:
-    case QOpenGLTexture::TargetCubeMap:
-    case QOpenGLTexture::TargetCubeMapArray:
-    case QOpenGLTexture::Target2DMultisample:
-    case QOpenGLTexture::Target2DMultisampleArray:
-    case QOpenGLTexture::TargetRectangle:
-        switch (direction) {
-        case QOpenGLTexture::DirectionS:
-            wrapModes[0] = mode;
-            texFuncs->glTextureParameteri(textureId, target, bindingTarget, GL_TEXTURE_WRAP_S, mode);
-            break;
-
-        case QOpenGLTexture::DirectionT:
-            wrapModes[1] = mode;
-            texFuncs->glTextureParameteri(textureId, target, bindingTarget, GL_TEXTURE_WRAP_T, mode);
-            break;
-
-        case QOpenGLTexture::DirectionR:
-            qWarning("QOpenGLTexture::setWrapMode() direction not valid for this texture target");
-            break;
-        }
-        break;
-
-    case QOpenGLTexture::Target3D:
-        switch (direction) {
-        case QOpenGLTexture::DirectionS:
-            wrapModes[0] = mode;
-            texFuncs->glTextureParameteri(textureId, target, bindingTarget, direction, mode);
-            break;
-
-        case QOpenGLTexture::DirectionT:
-            wrapModes[1] = mode;
-            texFuncs->glTextureParameteri(textureId, target, bindingTarget, direction, mode);
-            break;
-
-        case QOpenGLTexture::DirectionR:
-            wrapModes[2] = mode;
-            texFuncs->glTextureParameteri(textureId, target, bindingTarget, direction, mode);
-            break;
-        }
-        break;
-    }
-}
-
-QOpenGLTexture::WrapMode QOpenGLTexturePrivate::wrapMode(QOpenGLTexture::CoordinateDirection direction) const
-{
-    switch (target) {
-    case QOpenGLTexture::Target1D:
-    case QOpenGLTexture::Target1DArray:
-    case QOpenGLTexture::TargetBuffer:
-        switch (direction) {
-        case QOpenGLTexture::DirectionS:
-            return wrapModes[0];
-
-        case QOpenGLTexture::DirectionT:
-        case QOpenGLTexture::DirectionR:
-            qWarning("QOpenGLTexture::wrapMode() direction not valid for this texture target");
-            return QOpenGLTexture::Repeat;
-        }
-        break;
-
-    case QOpenGLTexture::Target2D:
-    case QOpenGLTexture::Target2DArray:
-    case QOpenGLTexture::TargetCubeMap:
-    case QOpenGLTexture::TargetCubeMapArray:
-    case QOpenGLTexture::Target2DMultisample:
-    case QOpenGLTexture::Target2DMultisampleArray:
-    case QOpenGLTexture::TargetRectangle:
-        switch (direction) {
-        case QOpenGLTexture::DirectionS:
-            return wrapModes[0];
-
-        case QOpenGLTexture::DirectionT:
-            return wrapModes[1];
-
-        case QOpenGLTexture::DirectionR:
-            qWarning("QOpenGLTexture::wrapMode() direction not valid for this texture target");
-            return QOpenGLTexture::Repeat;
-        }
-        break;
-
-    case QOpenGLTexture::Target3D:
-        switch (direction) {
-        case QOpenGLTexture::DirectionS:
-            return wrapModes[0];
-
-        case QOpenGLTexture::DirectionT:
-            return wrapModes[1];
-
-        case QOpenGLTexture::DirectionR:
-            return wrapModes[2];
-        }
-        break;
-    }
-    // Should never get here
-    Q_ASSERT(false);
-    return QOpenGLTexture::Repeat;
-}
-
-QOpenGLTexture *QOpenGLTexturePrivate::createTextureView(QOpenGLTexture::Target viewTarget,
-                                                         QOpenGLTexture::TextureFormat viewFormat,
-                                                         int minimumMipmapLevel, int maximumMipmapLevel,
-                                                         int minimumLayer, int maximumLayer) const
-{
-    // Do sanity checks - see http://www.opengl.org/wiki/GLAPI/glTextureView
-
-    // Check the targets are compatible
-    bool viewTargetCompatible = false;
-    switch (target) {
-    case QOpenGLTexture::Target1D:
-    case QOpenGLTexture::Target1DArray:
-        viewTargetCompatible = (viewTarget == QOpenGLTexture::Target1D
-                             || viewTarget == QOpenGLTexture::Target1DArray);
-        break;
-
-
-    case QOpenGLTexture::Target2D:
-    case QOpenGLTexture::Target2DArray:
-        viewTargetCompatible = (viewTarget == QOpenGLTexture::Target2D
-                             || viewTarget == QOpenGLTexture::Target2DArray);
-        break;
-
-    case QOpenGLTexture::Target3D:
-        viewTargetCompatible = (viewTarget == QOpenGLTexture::Target3D);
-        break;
-
-    case QOpenGLTexture::TargetCubeMap:
-    case QOpenGLTexture::TargetCubeMapArray:
-        viewTargetCompatible = (viewTarget == QOpenGLTexture::TargetCubeMap
-                             || viewTarget == QOpenGLTexture::Target2D
-                             || viewTarget == QOpenGLTexture::Target2DArray
-                             || viewTarget == QOpenGLTexture::TargetCubeMapArray);
-        break;
-
-    case QOpenGLTexture::Target2DMultisample:
-    case QOpenGLTexture::Target2DMultisampleArray:
-        viewTargetCompatible = (viewTarget == QOpenGLTexture::Target2DMultisample
-                             || viewTarget == QOpenGLTexture::Target2DMultisampleArray);
-        break;
-
-    case QOpenGLTexture::TargetRectangle:
-        viewTargetCompatible = (viewTarget == QOpenGLTexture::TargetRectangle);
-        break;
-
-    case QOpenGLTexture::TargetBuffer:
-        // Cannot be used with texture views
-        break;
-    }
-
-    if (!viewTargetCompatible) {
-        qWarning("QOpenGLTexture::createTextureView(): Incompatible source and view targets");
-        return nullptr;
-    }
-
-    // Check the formats are compatible
-    bool viewFormatCompatible = false;
-    switch (formatClass) {
-    case QOpenGLTexture::NoFormatClass:
-        break;
-
-    case QOpenGLTexture::FormatClass_128Bit:
-        viewFormatCompatible = (viewFormat == QOpenGLTexture::RGBA32F
-                             || viewFormat == QOpenGLTexture::RGBA32U
-                             || viewFormat == QOpenGLTexture::RGBA32I);
-        break;
-
-    case QOpenGLTexture::FormatClass_96Bit:
-        viewFormatCompatible = (viewFormat == QOpenGLTexture::RGB32F
-                             || viewFormat == QOpenGLTexture::RGB32U
-                             || viewFormat == QOpenGLTexture::RGB32I);
-        break;
-
-    case QOpenGLTexture::FormatClass_64Bit:
-        viewFormatCompatible = (viewFormat == QOpenGLTexture::RGBA16F
-                             || viewFormat == QOpenGLTexture::RG32F
-                             || viewFormat == QOpenGLTexture::RGBA16U
-                             || viewFormat == QOpenGLTexture::RG32U
-                             || viewFormat == QOpenGLTexture::RGBA16I
-                             || viewFormat == QOpenGLTexture::RG32I
-                             || viewFormat == QOpenGLTexture::RGBA16_UNorm
-                             || viewFormat == QOpenGLTexture::RGBA16_SNorm);
-        break;
-
-    case QOpenGLTexture::FormatClass_48Bit:
-        viewFormatCompatible = (viewFormat == QOpenGLTexture::RGB16_UNorm
-                             || viewFormat == QOpenGLTexture::RGB16_SNorm
-                             || viewFormat == QOpenGLTexture::RGB16F
-                             || viewFormat == QOpenGLTexture::RGB16U
-                             || viewFormat == QOpenGLTexture::RGB16I);
-        break;
-
-    case QOpenGLTexture::FormatClass_32Bit:
-        viewFormatCompatible = (viewFormat == QOpenGLTexture::RG16F
-                             || viewFormat == QOpenGLTexture::RG11B10F
-                             || viewFormat == QOpenGLTexture::R32F
-                             || viewFormat == QOpenGLTexture::RGB10A2
-                             || viewFormat == QOpenGLTexture::RGBA8U
-                             || viewFormat == QOpenGLTexture::RG16U
-                             || viewFormat == QOpenGLTexture::R32U
-                             || viewFormat == QOpenGLTexture::RGBA8I
-                             || viewFormat == QOpenGLTexture::RG16I
-                             || viewFormat == QOpenGLTexture::R32I
-                             || viewFormat == QOpenGLTexture::RGBA8_UNorm
-                             || viewFormat == QOpenGLTexture::RG16_UNorm
-                             || viewFormat == QOpenGLTexture::RGBA8_SNorm
-                             || viewFormat == QOpenGLTexture::RG16_SNorm
-                             || viewFormat == QOpenGLTexture::SRGB8_Alpha8
-                             || viewFormat == QOpenGLTexture::RGB9E5);
-        break;
-
-    case QOpenGLTexture::FormatClass_24Bit:
-        viewFormatCompatible = (viewFormat == QOpenGLTexture::RGB8_UNorm
-                             || viewFormat == QOpenGLTexture::RGB8_SNorm
-                             || viewFormat == QOpenGLTexture::SRGB8
-                             || viewFormat == QOpenGLTexture::RGB8U
-                             || viewFormat == QOpenGLTexture::RGB8I);
-        break;
-
-    case QOpenGLTexture::FormatClass_16Bit:
-        viewFormatCompatible = (viewFormat == QOpenGLTexture::R16F
-                             || viewFormat == QOpenGLTexture::RG8U
-                             || viewFormat == QOpenGLTexture::R16U
-                             || viewFormat == QOpenGLTexture::RG8I
-                             || viewFormat == QOpenGLTexture::R16I
-                             || viewFormat == QOpenGLTexture::RG8_UNorm
-                             || viewFormat == QOpenGLTexture::R16_UNorm
-                             || viewFormat == QOpenGLTexture::RG8_SNorm
-                             || viewFormat == QOpenGLTexture::R16_SNorm);
-        break;
-
-    case QOpenGLTexture::FormatClass_8Bit:
-        viewFormatCompatible = (viewFormat == QOpenGLTexture::R8U
-                             || viewFormat == QOpenGLTexture::R8I
-                             || viewFormat == QOpenGLTexture::R8_UNorm
-                             || viewFormat == QOpenGLTexture::R8_SNorm);
-        break;
-
-    case QOpenGLTexture::FormatClass_RGTC1_R:
-        viewFormatCompatible = (viewFormat == QOpenGLTexture::R_ATI1N_UNorm
-                             || viewFormat == QOpenGLTexture::R_ATI1N_SNorm);
-        break;
-
-    case QOpenGLTexture::FormatClass_RGTC2_RG:
-        viewFormatCompatible = (viewFormat == QOpenGLTexture::RG_ATI2N_UNorm
-                             || viewFormat == QOpenGLTexture::RG_ATI2N_SNorm);
-        break;
-
-    case QOpenGLTexture::FormatClass_BPTC_Unorm:
-        viewFormatCompatible = (viewFormat == QOpenGLTexture::RGB_BP_UNorm
-                             || viewFormat == QOpenGLTexture::SRGB_BP_UNorm);
-        break;
-
-    case QOpenGLTexture::FormatClass_BPTC_Float:
-        viewFormatCompatible = (viewFormat == QOpenGLTexture::RGB_BP_UNSIGNED_FLOAT
-                             || viewFormat == QOpenGLTexture::RGB_BP_SIGNED_FLOAT);
-        break;
-
-    case QOpenGLTexture::FormatClass_S3TC_DXT1_RGB:
-        viewFormatCompatible = (viewFormat == QOpenGLTexture::RGB_DXT1
-                             || viewFormat == QOpenGLTexture::SRGB_DXT1);
-        break;
-
-    case QOpenGLTexture::FormatClass_S3TC_DXT1_RGBA:
-        viewFormatCompatible = (viewFormat == QOpenGLTexture::RGBA_DXT1
-                             || viewFormat == QOpenGLTexture::SRGB_Alpha_DXT1);
-        break;
-
-    case QOpenGLTexture::FormatClass_S3TC_DXT3_RGBA:
-        viewFormatCompatible = (viewFormat == QOpenGLTexture::RGBA_DXT3
-                             || viewFormat == QOpenGLTexture::SRGB_Alpha_DXT3);
-        break;
-
-    case QOpenGLTexture::FormatClass_S3TC_DXT5_RGBA:
-        viewFormatCompatible = (viewFormat == QOpenGLTexture::RGBA_DXT5
-                             || viewFormat == QOpenGLTexture::SRGB_Alpha_DXT5);
-        break;
-
-    case QOpenGLTexture::FormatClass_Unique:
-        viewFormatCompatible = (viewFormat == format);
-        break;
-    }
-
-    if (!viewFormatCompatible) {
-        qWarning("QOpenGLTexture::createTextureView(): Incompatible source and view formats");
-        return nullptr;
-    }
-
-
-    // Create a view
-    QOpenGLTexture *view = new QOpenGLTexture(viewTarget);
-    view->setFormat(viewFormat);
-    view->create();
-    view->d_ptr->textureView = true;
-    texFuncs->glTextureView(view->textureId(), viewTarget, textureId, viewFormat,
-                            minimumMipmapLevel, maximumMipmapLevel - minimumMipmapLevel + 1,
-                            minimumLayer, maximumLayer - minimumLayer + 1);
-    return view;
-}
-
-
-/*!
-    \class QOpenGLTexture
-    \inmodule QtGui
-    \since 5.2
-    \wrapper
-    \brief The QOpenGLTexture class encapsulates an OpenGL texture object.
-
-    QOpenGLTexture makes it easy to work with OpenGL textures and the myriad features
-    and targets that they offer depending upon the capabilities of your OpenGL implementation.
-
-    The typical usage pattern for QOpenGLTexture is
-    \list
-        \li Instantiate the object specifying the texture target type
-        \li Set properties that affect the storage requirements e.g. storage format, dimensions
-        \li Allocate the server-side storage
-        \li Optionally upload pixel data
-        \li Optionally set any additional properties e.g. filtering and border options
-        \li Render with texture or render to texture
-    \endlist
-
-    In the common case of simply using a QImage as the source of texture pixel data
-    most of the above steps are performed automatically.
-
-    \code
-    // Prepare texture
-    QOpenGLTexture *texture = new QOpenGLTexture(QImage(fileName).mirrored());
-    texture->setMinificationFilter(QOpenGLTexture::LinearMipMapLinear);
-    texture->setMagnificationFilter(QOpenGLTexture::Linear);
-    ...
-    // Render with texture
-    texture->bind();
-    glDrawArrays(...);
-    \endcode
-
-    Note that the QImage is mirrored vertically to account for the fact that
-    OpenGL and QImage use opposite directions for the y axis. Another option
-    would be to transform your texture coordinates.
-*/
-
-/*!
-    \enum QOpenGLTexture::Filter
-    This enum defines the filtering parameters for a QOpenGLTexture object.
-    \value Nearest Equivalent to GL_NEAREST
-    \value Linear Equivalent to GL_LINEAR
-    \value NearestMipMapNearest Equivalent to GL_NEAREST_MIPMAP_NEAREST
-    \value NearestMipMapLinear Equivalent to GL_NEAREST_MIPMAP_LINEAR
-    \value LinearMipMapNearest Equivalent to GL_LINEAR_MIPMAP_NEAREST
-    \value LinearMipMapLinear Equivalent to GL_LINEAR_MIPMAP_LINEAR
-*/
-
-/*!
-    \enum QOpenGLTexture::Target
-    This enum defines the texture target of a QOpenGLTexture object.
-    For more information on creating array textures, see \l{Array Texture}.
-
-    \value Target1D A 1-dimensional texture.
-           Equivalent to GL_TEXTURE_1D.
-    \value Target1DArray An array of 1-dimensional textures.
-           Equivalent to GL_TEXTURE_1D_ARRAY
-    \value Target2D A 2-dimensional texture.
-           Equivalent to GL_TEXTURE_2D
-    \value Target2DArray An array of 2-dimensional textures.
-           Equivalent to GL_TEXTURE_2D_ARRAY
-    \value Target3D A 3-dimensional texture.
-           Equivalent to GL_TEXTURE_3D
-    \value TargetCubeMap A cubemap texture.
-           Equivalent to GL_TEXTURE_CUBE_MAP
-    \value TargetCubeMapArray An array of cubemap textures.
-           Equivalent to GL_TEXTURE_CUBE_MAP_ARRAY
-    \value Target2DMultisample A 2-dimensional texture with multisample support.
-           Equivalent to GL_TEXTURE_2D_MULTISAMPLE
-    \value Target2DMultisampleArray An array of 2-dimensional textures with multisample support.
-           Equivalent to GL_TEXTURE_2D_MULTISAMPLE_ARRAY
-    \value TargetRectangle A rectangular 2-dimensional texture.
-           Equivalent to GL_TEXTURE_RECTANGLE
-    \value TargetBuffer A texture with data from an OpenGL buffer object.
-           Equivalent to GL_TEXTURE_BUFFER
-*/
-
-/*!
-    \enum QOpenGLTexture::BindingTarget
-    This enum defines the possible binding targets of texture units.
-
-    \value BindingTarget1D Equivalent to GL_TEXTURE_BINDING_1D
-    \value BindingTarget1DArray Equivalent to GL_TEXTURE_BINDING_1D_ARRAY
-    \value BindingTarget2D Equivalent to GL_TEXTURE_BINDING_2D
-    \value BindingTarget2DArray Equivalent to GL_TEXTURE_BINDING_2D_ARRAY
-    \value BindingTarget3D Equivalent to GL_TEXTURE_BINDING_3D
-    \value BindingTargetCubeMap Equivalent to GL_TEXTURE_BINDING_CUBE_MAP
-    \value BindingTargetCubeMapArray Equivalent to GL_TEXTURE_BINDING_CUBE_MAP_ARRAY
-    \value BindingTarget2DMultisample Equivalent to GL_TEXTURE_BINDING_2D_MULTISAMPLE
-    \value BindingTarget2DMultisampleArray Equivalent to GL_TEXTURE_BINDING_2D_MULTISAMPLE_ARRAY
-    \value BindingTargetRectangle Equivalent to GL_TEXTURE_BINDING_RECTANGLE
-    \value BindingTargetBuffer Equivalent to GL_TEXTURE_BINDING_BUFFER
-*/
-
-/*!
-    \enum QOpenGLTexture::MipMapGeneration
-    This enum defines the options to control mipmap generation.
-
-    \value GenerateMipMaps Mipmaps should be generated
-    \value DontGenerateMipMaps Mipmaps should not be generated
-*/
-
-/*!
-    \enum QOpenGLTexture::TextureUnitReset
-    This enum defines options ot control texture unit activation.
-
-    \value ResetTextureUnit The previous active texture unit will be reset
-    \value DontResetTextureUnit The previous active texture unit will not be rest
-*/
-
-/*!
-    \enum QOpenGLTexture::TextureFormat
-    This enum defines the possible texture formats. Depending upon your OpenGL
-    implementation only a subset of these may be supported.
-
-    \value NoFormat Equivalent to GL_NONE
-
-    \value R8_UNorm Equivalent to GL_R8
-    \value RG8_UNorm Equivalent to GL_RG8
-    \value RGB8_UNorm Equivalent to GL_RGB8
-    \value RGBA8_UNorm Equivalent to GL_RGBA8
-
-    \value R16_UNorm Equivalent to GL_R16
-    \value RG16_UNorm Equivalent to GL_RG16
-    \value RGB16_UNorm Equivalent to GL_RGB16
-    \value RGBA16_UNorm Equivalent to GL_RGBA16
-
-    \value R8_SNorm Equivalent to GL_R8_SNORM
-    \value RG8_SNorm Equivalent to GL_RG8_SNORM
-    \value RGB8_SNorm Equivalent to GL_RGB8_SNORM
-    \value RGBA8_SNorm Equivalent to GL_RGBA8_SNORM
-
-    \value R16_SNorm Equivalent to GL_R16_SNORM
-    \value RG16_SNorm Equivalent to GL_RG16_SNORM
-    \value RGB16_SNorm Equivalent to GL_RGB16_SNORM
-    \value RGBA16_SNorm Equivalent to GL_RGBA16_SNORM
-
-    \value R8U Equivalent to GL_R8UI
-    \value RG8U Equivalent to GL_RG8UI
-    \value RGB8U Equivalent to GL_RGB8UI
-    \value RGBA8U Equivalent to GL_RGBA8UI
-
-    \value R16U Equivalent to GL_R16UI
-    \value RG16U Equivalent to GL_RG16UI
-    \value RGB16U Equivalent to GL_RGB16UI
-    \value RGBA16U Equivalent to GL_RGBA16UI
-
-    \value R32U Equivalent to GL_R32UI
-    \value RG32U Equivalent to GL_RG32UI
-    \value RGB32U Equivalent to GL_RGB32UI
-    \value RGBA32U Equivalent to GL_RGBA32UI
-
-    \value R8I Equivalent to GL_R8I
-    \value RG8I Equivalent to GL_RG8I
-    \value RGB8I Equivalent to GL_RGB8I
-    \value RGBA8I Equivalent to GL_RGBA8I
-
-    \value R16I Equivalent to GL_R16I
-    \value RG16I Equivalent to GL_RG16I
-    \value RGB16I Equivalent to GL_RGB16I
-    \value RGBA16I Equivalent to GL_RGBA16I
-
-    \value R32I Equivalent to GL_R32I
-    \value RG32I Equivalent to GL_RG32I
-    \value RGB32I Equivalent to GL_RGB32I
-    \value RGBA32I Equivalent to GL_RGBA32I
-
-    \value R16F Equivalent to GL_R16F
-    \value RG16F Equivalent to GL_RG16F
-    \value RGB16F Equivalent to GL_RGB16F
-    \value RGBA16F Equivalent to GL_RGBA16F
-
-    \value R32F Equivalent to GL_R32F
-    \value RG32F Equivalent to GL_RG32F
-    \value RGB32F Equivalent to GL_RGB32F
-    \value RGBA32F Equivalent to GL_RGBA32F
-
-    \value RGB9E5 Equivalent to GL_RGB9_E5
-    \value RG11B10F Equivalent to GL_R11F_G11F_B10F
-    \value RG3B2 Equivalent to GL_R3_G3_B2
-    \value R5G6B5 Equivalent to GL_RGB565
-    \value RGB5A1 Equivalent to GL_RGB5_A1
-    \value RGBA4 Equivalent to GL_RGBA4
-    \value RGB10A2 Equivalent to GL_RGB10_A2UI
-
-    \value D16 Equivalent to GL_DEPTH_COMPONENT16
-    \value D24 Equivalent to GL_DEPTH_COMPONENT24
-    \value D24S8 Equivalent to GL_DEPTH24_STENCIL8
-    \value D32 Equivalent to GL_DEPTH_COMPONENT32
-    \value D32F Equivalent to GL_DEPTH_COMPONENT32F
-    \value D32FS8X24 Equivalent to GL_DEPTH32F_STENCIL8
-    \value S8 Equivalent to GL_STENCIL_INDEX8. Introduced in Qt 5.4
-
-    \value RGB_DXT1 Equivalent to GL_COMPRESSED_RGB_S3TC_DXT1_EXT
-    \value RGBA_DXT1 Equivalent to GL_COMPRESSED_RGBA_S3TC_DXT1_EXT
-    \value RGBA_DXT3 Equivalent to GL_COMPRESSED_RGBA_S3TC_DXT3_EXT
-    \value RGBA_DXT5 Equivalent to GL_COMPRESSED_RGBA_S3TC_DXT5_EXT
-    \value R_ATI1N_UNorm Equivalent to GL_COMPRESSED_RED_RGTC1
-    \value R_ATI1N_SNorm Equivalent to GL_COMPRESSED_SIGNED_RED_RGTC1
-    \value RG_ATI2N_UNorm Equivalent to GL_COMPRESSED_RG_RGTC2
-    \value RG_ATI2N_SNorm Equivalent to GL_COMPRESSED_SIGNED_RG_RGTC2
-    \value RGB_BP_UNSIGNED_FLOAT Equivalent to GL_COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT_ARB
-    \value RGB_BP_SIGNED_FLOAT Equivalent to GL_COMPRESSED_RGB_BPTC_SIGNED_FLOAT_ARB
-    \value RGB_BP_UNorm Equivalent to GL_COMPRESSED_RGBA_BPTC_UNORM_ARB
-    \value R11_EAC_UNorm Equivalent to GL_COMPRESSED_R11_EAC
-    \value R11_EAC_SNorm Equivalent to GL_COMPRESSED_SIGNED_R11_EAC
-    \value RG11_EAC_UNorm Equivalent to GL_COMPRESSED_RG11_EAC
-    \value RG11_EAC_SNorm Equivalent to GL_COMPRESSED_SIGNED_RG11_EAC
-    \value RGB8_ETC2 Equivalent to GL_COMPRESSED_RGB8_ETC2
-    \value SRGB8_ETC2 Equivalent to GL_COMPRESSED_SRGB8_ETC2
-    \value RGB8_PunchThrough_Alpha1_ETC2 Equivalent to GL_COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_ETC2
-    \value SRGB8_PunchThrough_Alpha1_ETC2 Equivalent to GL_COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_ETC2
-    \value RGBA8_ETC2_EAC Equivalent to GL_COMPRESSED_RGBA8_ETC2_EAC
-    \value SRGB8_Alpha8_ETC2_EAC Equivalent to GL_COMPRESSED_SRGB8_ALPHA8_ETC2_EAC
-    \value RGB8_ETC1 Equivalent to GL_ETC1_RGB8_OES
-    \value RGBA_ASTC_4x4 Equivalent to GL_COMPRESSED_RGBA_ASTC_4x4_KHR
-    \value RGBA_ASTC_5x4 Equivalent to GL_COMPRESSED_RGBA_ASTC_5x4_KHR
-    \value RGBA_ASTC_5x5 Equivalent to GL_COMPRESSED_RGBA_ASTC_5x5_KHR
-    \value RGBA_ASTC_6x5 Equivalent to GL_COMPRESSED_RGBA_ASTC_6x5_KHR
-    \value RGBA_ASTC_6x6 Equivalent to GL_COMPRESSED_RGBA_ASTC_6x6_KHR
-    \value RGBA_ASTC_8x5 Equivalent to GL_COMPRESSED_RGBA_ASTC_8x5_KHR
-    \value RGBA_ASTC_8x6 Equivalent to GL_COMPRESSED_RGBA_ASTC_8x6_KHR
-    \value RGBA_ASTC_8x8 Equivalent to GL_COMPRESSED_RGBA_ASTC_8x8_KHR
-    \value RGBA_ASTC_10x5 Equivalent to GL_COMPRESSED_RGBA_ASTC_10x5_KHR
-    \value RGBA_ASTC_10x6 Equivalent to GL_COMPRESSED_RGBA_ASTC_10x6_KHR
-    \value RGBA_ASTC_10x8 Equivalent to GL_COMPRESSED_RGBA_ASTC_10x8_KHR
-    \value RGBA_ASTC_10x10 Equivalent to GL_COMPRESSED_RGBA_ASTC_10x10_KHR
-    \value RGBA_ASTC_12x10 Equivalent to GL_COMPRESSED_RGBA_ASTC_12x10_KHR
-    \value RGBA_ASTC_12x12 Equivalent to GL_COMPRESSED_RGBA_ASTC_12x12_KHR
-    \value SRGB8_Alpha8_ASTC_4x4 Equivalent to GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x4_KHR
-    \value SRGB8_Alpha8_ASTC_5x4 Equivalent to GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x4_KHR
-    \value SRGB8_Alpha8_ASTC_5x5 Equivalent to GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x5_KHR
-    \value SRGB8_Alpha8_ASTC_6x5 Equivalent to GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x5_KHR
-    \value SRGB8_Alpha8_ASTC_6x6 Equivalent to GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x6_KHR
-    \value SRGB8_Alpha8_ASTC_8x5 Equivalent to GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x5_KHR
-    \value SRGB8_Alpha8_ASTC_8x6 Equivalent to GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x6_KHR
-    \value SRGB8_Alpha8_ASTC_8x8 Equivalent to GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x8_KHR
-    \value SRGB8_Alpha8_ASTC_10x5 Equivalent to GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x5_KHR
-    \value SRGB8_Alpha8_ASTC_10x6 Equivalent to GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x6_KHR
-    \value SRGB8_Alpha8_ASTC_10x8 Equivalent to GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x8_KHR
-    \value SRGB8_Alpha8_ASTC_10x10 Equivalent to GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x10_KHR
-    \value SRGB8_Alpha8_ASTC_12x10 Equivalent to GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x10_KHR
-    \value SRGB8_Alpha8_ASTC_12x12 Equivalent to GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x12_KHR
-
-    \value SRGB8 Equivalent to GL_SRGB8
-    \value SRGB8_Alpha8 Equivalent to GL_SRGB8_ALPHA8
-    \value SRGB_DXT1 Equivalent to GL_COMPRESSED_SRGB_S3TC_DXT1_EXT
-    \value SRGB_Alpha_DXT1 Equivalent to GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT
-    \value SRGB_Alpha_DXT3 Equivalent to GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT
-    \value SRGB_Alpha_DXT5 Equivalent to GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT
-    \value SRGB_BP_UNorm Equivalent to GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM_ARB
-
-    \value DepthFormat Equivalent to GL_DEPTH_COMPONENT (only OpenGL ES 3 or ES 2 with OES_depth_texture)
-    \value AlphaFormat Equivalent to GL_ALPHA (OpenGL ES 2 only)
-    \value RGBFormat Equivalent to GL_RGB (OpenGL ES 2 only)
-    \value RGBAFormat Equivalent to GL_RGBA (OpenGL ES 2 only)
-    \value LuminanceFormat Equivalent to GL_LUMINANCE (OpenGL ES 2 only)
-    \value LuminanceAlphaFormat Equivalent to GL_LUMINANCE_ALPHA (OpenGL ES 2 only)
-*/
-
-/*!
-    \enum QOpenGLTexture::CubeMapFace
-    This enum defines the possible CubeMap faces.
-
-    \value CubeMapPositiveX Equivalent to GL_TEXTURE_CUBE_MAP_POSITIVE_X
-    \value CubeMapNegativeX Equivalent to GL_TEXTURE_CUBE_MAP_NEGATIVE_X
-    \value CubeMapPositiveY Equivalent to GL_TEXTURE_CUBE_MAP_POSITIVE_Y
-    \value CubeMapNegativeY Equivalent to GL_TEXTURE_CUBE_MAP_NEGATIVE_Y
-    \value CubeMapPositiveZ Equivalent to GL_TEXTURE_CUBE_MAP_POSITIVE_Z
-    \value CubeMapNegativeZ Equivalent to GL_TEXTURE_CUBE_MAP_NEGATIVE_Z
-*/
-
-/*!
-    \enum QOpenGLTexture::PixelFormat
-    This enum defines the possible client-side pixel formats for a pixel
-    transfer operation.
-
-    \value NoSourceFormat Equivalent to GL_NONE
-    \value Red Equivalent to GL_RED
-    \value RG Equivalent to GL_RG
-    \value RGB Equivalent to GL_RGB
-    \value BGR Equivalent to GL_BGR
-    \value RGBA Equivalent to GL_RGBA
-    \value BGRA Equivalent to GL_BGRA
-    \value Red_Integer Equivalent to GL_RED_INTEGER
-    \value RG_Integer Equivalent to GL_RG_INTEGER
-    \value RGB_Integer Equivalent to GL_RGB_INTEGER
-    \value BGR_Integer Equivalent to GL_BGR_INTEGER
-    \value RGBA_Integer Equivalent to GL_RGBA_INTEGER
-    \value BGRA_Integer Equivalent to GL_BGRA_INTEGER
-    \value Stencil Equivalent to GL_STENCIL_INDEX. Introduced in Qt 5.4
-    \value Depth Equivalent to GL_DEPTH_COMPONENT
-    \value DepthStencil Equivalent to GL_DEPTH_STENCIL
-    \value Alpha Equivalent to GL_ALPHA (OpenGL ES 2 only)
-    \value Luminance Equivalent to GL_LUMINANCE (OpenGL ES 2 only)
-    \value LuminanceAlpha Equivalent to GL_LUMINANCE_ALPHA (OpenGL ES 2 only)
-
-*/
-
-/*!
-    \enum QOpenGLTexture::PixelType
-    This enum defines the possible pixel data types for a pixel transfer operation
-
-    \value NoPixelType Equivalent to GL_NONE
-    \value Int8 Equivalent to GL_BYTE
-    \value UInt8 Equivalent to GL_UNSIGNED_BYTE
-    \value Int16 Equivalent to GL_SHORT
-    \value UInt16 Equivalent to GL_UNSIGNED_SHORT
-    \value Int32 Equivalent to GL_INT
-    \value UInt32 Equivalent to GL_UNSIGNED_INT
-    \value Float16 Equivalent to GL_HALF_FLOAT
-    \value Float16OES Equivalent to GL_HALF_FLOAT_OES
-    \value Float32 Equivalent to GL_FLOAT
-    \value UInt32_RGB9_E5 Equivalent to GL_UNSIGNED_INT_5_9_9_9_REV
-    \value UInt32_RG11B10F Equivalent to GL_UNSIGNED_INT_10F_11F_11F_REV
-    \value UInt8_RG3B2 Equivalent to GL_UNSIGNED_BYTE_3_3_2
-    \value UInt8_RG3B2_Rev Equivalent to GL_UNSIGNED_BYTE_2_3_3_REV
-    \value UInt16_RGB5A1 Equivalent to GL_UNSIGNED_SHORT_5_5_5_1
-    \value UInt16_RGB5A1_Rev Equivalent to GL_UNSIGNED_SHORT_1_5_5_5_REV
-    \value UInt16_R5G6B5 Equivalent to GL_UNSIGNED_SHORT_5_6_5
-    \value UInt16_R5G6B5_Rev Equivalent to GL_UNSIGNED_SHORT_5_6_5_REV
-    \value UInt16_RGBA4 Equivalent to GL_UNSIGNED_SHORT_4_4_4_4
-    \value UInt16_RGBA4_Rev Equivalent to GL_UNSIGNED_SHORT_4_4_4_4_REV
-    \value UInt32_RGBA8 Equivalent to GL_UNSIGNED_INT_8_8_8_8
-    \value UInt32_RGBA8_Rev Equivalent to GL_UNSIGNED_INT_8_8_8_8_REV
-    \value UInt32_RGB10A2 Equivalent to GL_UNSIGNED_INT_10_10_10_2
-    \value UInt32_RGB10A2_Rev Equivalent to GL_UNSIGNED_INT_2_10_10_10_REV
-    \value UInt32_D24S8 Equivalent to GL_UNSIGNED_INT_24_8. Introduced in Qt 5.4
-    \value Float32_D32_UInt32_S8_X24 Equivalent to GL_FLOAT_32_UNSIGNED_INT_24_8_REV. Introduced in Qt 5.4
-*/
-
-/*!
-    \enum QOpenGLTexture::Feature
-    This enum defines the OpenGL texture-related features that can be tested for.
-
-    \value ImmutableStorage Support for immutable texture storage
-    \value ImmutableMultisampleStorage Support for immutable texture storage with
-           multisample targets
-    \value TextureRectangle Support for the GL_TEXTURE_RECTANGLE target
-    \value TextureArrays Support for texture targets with array layers
-    \value Texture3D Support for the 3 dimensional texture target
-    \value TextureMultisample Support for texture targets that have multisample capabilities
-    \value TextureBuffer Support for textures that use OpenGL buffer objects
-           as their data source
-    \value TextureCubeMapArrays Support for cubemap array texture target
-    \value Swizzle Support for texture component swizzle masks
-    \value StencilTexturing Support for stencil texturing (i.e. looking up depth or stencil
-           components of a combined depth/stencil format texture in GLSL shaders).
-    \value AnisotropicFiltering Support for anisotropic texture filtering
-    \value NPOTTextures Basic support for non-power-of-two textures
-    \value NPOTTextureRepeat Full support for non-power-of-two textures including texture
-           repeat modes
-    \value Texture1D Support for the 1 dimensional texture target
-    \value TextureComparisonOperators Support for texture comparison operators
-    \value TextureMipMapLevel Support for setting the base and maximum mipmap levels
-*/
-
-/*!
-    \enum QOpenGLTexture::SwizzleComponent
-    This enum defines the texture color components that can be assigned a swizzle mask.
-
-    \value SwizzleRed The red component. Equivalent to GL_TEXTURE_SWIZZLE_R
-    \value SwizzleGreen The green component. Equivalent to GL_TEXTURE_SWIZZLE_G
-    \value SwizzleBlue The blue component. Equivalent to GL_TEXTURE_SWIZZLE_B
-    \value SwizzleAlpha The alpha component. Equivalent to GL_TEXTURE_SWIZZLE_A
-*/
-
-/*!
-    \enum QOpenGLTexture::SwizzleValue
-    This enum defines the possible mask values for texture swizzling.
-
-    \value RedValue Maps the component to the red channel. Equivalent to GL_RED
-    \value GreenValue Maps the component to the green channel. Equivalent to GL_GREEN
-    \value BlueValue Maps the component to the blue channel. Equivalent to GL_BLUE
-    \value AlphaValue Maps the component to the alpha channel. Equivalent to GL_ALPHA
-    \value ZeroValue Maps the component to a fixed value of 0. Equivalent to GL_ZERO
-    \value OneValue Maps the component to a fixed value of 1. Equivalent to GL_ONE
-*/
-
-/*!
-    \enum QOpenGLTexture::WrapMode
-    This enum defines the possible texture coordinate wrapping modes.
-
-    \value Repeat Texture coordinate is repeated. Equivalent to GL_REPEAT
-    \value MirroredRepeat Texture coordinate is reflected about 0 and 1. Equivalent to GL_MIRRORED_REPEAT
-    \value ClampToEdge Clamps the texture coordinates to [0,1]. Equivalent to GL_CLAMP_TO_EDGE
-    \value ClampToBorder As for ClampToEdge but also blends samples at 0 and 1 with a
-           fixed border color. Equivalent to GL_CLAMP_TO_BORDER
-*/
-
-/*!
-    \enum QOpenGLTexture::CoordinateDirection
-    This enum defines the possible texture coordinate directions
-
-    \value DirectionS The horizontal direction. Equivalent to GL_TEXTURE_WRAP_S
-    \value DirectionT The vertical direction. Equivalent to GL_TEXTURE_WRAP_T
-    \value DirectionR The depth direction. Equivalent to GL_TEXTURE_WRAP_R
-*/
-
-/*!
-    Creates a QOpenGLTexture object that can later be bound to \a target.
-
-    This does not create the underlying OpenGL texture object. Therefore,
-    construction using this constructor does not require a valid current
-    OpenGL context.
-*/
-QOpenGLTexture::QOpenGLTexture(Target target)
-    : d_ptr(new QOpenGLTexturePrivate(target, this))
-{
-}
-
-/*!
-    Creates a QOpenGLTexture object that can later be bound to the 2D texture
-    target and contains the pixel data contained in \a image. If you wish
-    to have a chain of mipmaps generated then set \a genMipMaps to \c true (this
-    is the default).
-
-    This does create the underlying OpenGL texture object. Therefore,
-    construction using this constructor does require a valid current
-    OpenGL context.
-*/
-QOpenGLTexture::QOpenGLTexture(const QImage& image, MipMapGeneration genMipMaps)
-    : QOpenGLTexture(QOpenGLTexture::Target2D)
-{
-    setData(image, genMipMaps);
-}
-
-QOpenGLTexture::~QOpenGLTexture()
-{
-}
-
-/*!
-    Returns the binding target of this texture.
-
-    \since 5.4
-*/
-QOpenGLTexture::Target QOpenGLTexture::target() const
-{
-    Q_D(const QOpenGLTexture);
-    return d->target;
-}
-
-/*!
-    Creates the underlying OpenGL texture object. This requires a current valid
-    OpenGL context. If the texture object already exists, this function does
-    nothing.
-
-    Once the texture object is created you can obtain the object
-    name from the textureId() function. This may be useful if you wish to make
-    some raw OpenGL calls related to this texture.
-
-    Normally it should not be necessary to call this function directly as all
-    functions that set properties of the texture object implicitly call create()
-    on your behalf.
-
-    Returns \c true if the creation succeeded, otherwise returns \c false.
-
-    \sa destroy(), isCreated(), textureId()
-*/
-bool QOpenGLTexture::create()
-{
-    Q_D(QOpenGLTexture);
-    return d->create();
-}
-
-/*!
-    Destroys the underlying OpenGL texture object. This requires a current valid
-    OpenGL context.
-
-    \sa create(), isCreated(), textureId()
-*/
-void QOpenGLTexture::destroy()
-{
-    Q_D(QOpenGLTexture);
-    return d->destroy();
-}
-
-/*!
-    Returns \c true if the underlying OpenGL texture object has been created.
-
-    \sa create(), destroy(), textureId()
-*/
-bool QOpenGLTexture::isCreated() const
-{
-    Q_D(const QOpenGLTexture);
-    return d->textureId != 0;
-}
-
-/*!
-    Returns the name of the underlying OpenGL texture object or 0 if it has
-    not yet been created.
-
-    \sa create(), destroy(), isCreated()
-*/
-GLuint QOpenGLTexture::textureId() const
-{
-    Q_D(const QOpenGLTexture);
-    return d->textureId;
-}
-
-/*!
-    Binds this texture to the currently active texture unit ready for
-    rendering. Note that you do not need to bind QOpenGLTexture objects
-    in order to modify them as the implementation makes use of the
-    EXT_direct_state_access extension where available and simulates it
-    where it is not.
-
-    \sa release()
-*/
-void QOpenGLTexture::bind()
-{
-    Q_D(QOpenGLTexture);
-    Q_ASSERT(d->textureId);
-    d->bind();
-}
-
-/*!
-    Binds this texture to texture unit \a unit ready for
-    rendering. Note that you do not need to bind QOpenGLTexture objects
-    in order to modify them as the implementation makes use of the
-    EXT_direct_state_access extension where available and simulates it
-    where it is not.
-
-    If parameter \a reset is \c true then this function will restore
-    the active unit to the texture unit that was active upon entry.
-
-    \sa release()
-*/
-void QOpenGLTexture::bind(uint unit, TextureUnitReset reset)
-{
-    Q_D(QOpenGLTexture);
-    Q_ASSERT(d->textureId);
-    d->bind(unit, reset);
-}
-
-/*!
-    Unbinds this texture from the currently active texture unit.
-
-    \sa bind()
-*/
-void QOpenGLTexture::release()
-{
-    Q_D(QOpenGLTexture);
-    d->release();
-}
-
-/*!
-    Unbinds this texture from texture unit \a unit.
-
-    If parameter \a reset is \c true then this function
-    will restore the active unit to the texture unit that was active
-    upon entry.
-*/
-void QOpenGLTexture::release(uint unit, TextureUnitReset reset)
-{
-    Q_D(QOpenGLTexture);
-    d->release(unit, reset);
-}
-
-/*!
-    Returns \c true if this texture is bound to the corresponding target
-    of the currently active texture unit.
-
-    \sa bind(), release()
-*/
-bool QOpenGLTexture::isBound() const
-{
-    Q_D(const QOpenGLTexture);
-    Q_ASSERT(d->textureId);
-    return d->isBound();
-}
-
-/*!
-    Returns \c true if this texture is bound to the corresponding target
-    of texture unit \a unit.
-
-    \sa bind(), release()
-*/
-bool QOpenGLTexture::isBound(uint unit)
-{
-    Q_D(const QOpenGLTexture);
-    Q_ASSERT(d->textureId);
-    return d->isBound(unit);
-}
-
-/*!
-    Returns the textureId of the texture that is bound to the \a target
-    of the currently active texture unit.
-*/
-GLuint QOpenGLTexture::boundTextureId(BindingTarget target)
-{
-    QOpenGLContext *ctx = QOpenGLContext::currentContext();
-    if (!ctx) {
-        qWarning("QOpenGLTexture::boundTextureId() requires a valid current context");
-        return 0;
-    }
-
-    GLint textureId = 0;
-    ctx->functions()->glGetIntegerv(target, &textureId);
-    return static_cast<GLuint>(textureId);
-}
-
-/*!
-    Returns the textureId of the texture that is bound to the \a target
-    of the texture unit \a unit.
-*/
-GLuint QOpenGLTexture::boundTextureId(uint unit, BindingTarget target)
-{
-    QOpenGLContext *ctx = QOpenGLContext::currentContext();
-    if (!ctx) {
-        qWarning("QOpenGLTexture::boundTextureId() requires a valid current context");
-        return 0;
-    }
-
-    QOpenGLFunctions *funcs = ctx->functions();
-    funcs->initializeOpenGLFunctions();
-
-    GLint oldTextureUnit = 0;
-    funcs->glGetIntegerv(GL_ACTIVE_TEXTURE, &oldTextureUnit);
-
-    funcs->glActiveTexture(unit);
-    GLint textureId = 0;
-    funcs->glGetIntegerv(target, &textureId);
-    funcs->glActiveTexture(oldTextureUnit);
-
-    return static_cast<GLuint>(textureId);
-}
-
-/*!
-    Sets the format of this texture object to \a format. This function
-    must be called before texture storage is allocated.
-
-    Note that all formats may not be supported. The exact set of supported
-    formats is dependent upon your OpenGL implementation and version.
-
-    \sa format(), allocateStorage()
-*/
-void QOpenGLTexture::setFormat(TextureFormat format)
-{
-    Q_D(QOpenGLTexture);
-    d->create();
-    if (isStorageAllocated()) {
-        qWarning("QOpenGLTexture::setFormat(): Cannot change format once storage has been allocated");
-        return;
-    }
-
-    d->format = format;
-
-    switch (format) {
-    case NoFormat:
-        d->formatClass = NoFormatClass;
-        break;
-
-    case RGBA32F:
-    case RGBA32U:
-    case RGBA32I:
-        d->formatClass = FormatClass_128Bit;
-        break;
-
-    case RGB32F:
-    case RGB32U:
-    case RGB32I:
-        d->formatClass = FormatClass_96Bit;
-        break;
-
-    case RGBA16F:
-    case RG32F:
-    case RGBA16U:
-    case RG32U:
-    case RGBA16I:
-    case RG32I:
-    case RGBA16_UNorm:
-    case RGBA16_SNorm:
-        d->formatClass = FormatClass_64Bit;
-        break;
-
-    case RGB16_UNorm:
-    case RGB16_SNorm:
-    case RGB16F:
-    case RGB16U:
-    case RGB16I:
-        d->formatClass = FormatClass_48Bit;
-        break;
-
-    case RG16F:
-    case RG11B10F:
-    case R32F:
-    case RGB10A2:
-    case RGBA8U:
-    case RG16U:
-    case R32U:
-    case RGBA8I:
-    case RG16I:
-    case R32I:
-    case RGBA8_UNorm:
-    case RG16_UNorm:
-    case RGBA8_SNorm:
-    case RG16_SNorm:
-    case SRGB8_Alpha8:
-    case RGB9E5:
-        d->formatClass = FormatClass_32Bit;
-        break;
-
-    case RGB8_UNorm:
-    case RGB8_SNorm:
-    case SRGB8:
-    case RGB8U:
-    case RGB8I:
-        d->formatClass = FormatClass_24Bit;
-        break;
-
-    case R16F:
-    case RG8U:
-    case R16U:
-    case RG8I:
-    case R16I:
-    case RG8_UNorm:
-    case R16_UNorm:
-    case RG8_SNorm:
-    case R16_SNorm:
-        d->formatClass = FormatClass_16Bit;
-        break;
-
-    case R8U:
-    case R8I:
-    case R8_UNorm:
-    case R8_SNorm:
-        d->formatClass = FormatClass_8Bit;
-        break;
-
-    case R_ATI1N_UNorm:
-    case R_ATI1N_SNorm:
-        d->formatClass = FormatClass_RGTC1_R;
-        break;
-
-    case RG_ATI2N_UNorm:
-    case RG_ATI2N_SNorm:
-        d->formatClass = FormatClass_RGTC2_RG;
-        break;
-
-    case RGB_BP_UNorm:
-    case SRGB_BP_UNorm:
-        d->formatClass = FormatClass_BPTC_Unorm;
-        break;
-
-    case RGB_BP_UNSIGNED_FLOAT:
-    case RGB_BP_SIGNED_FLOAT:
-        d->formatClass = FormatClass_BPTC_Float;
-        break;
-
-    case RGB_DXT1:
-    case SRGB_DXT1:
-        d->formatClass = FormatClass_S3TC_DXT1_RGB;
-        break;
-
-    case RGBA_DXT1:
-    case SRGB_Alpha_DXT1:
-        d->formatClass = FormatClass_S3TC_DXT1_RGBA;
-        break;
-
-    case RGBA_DXT3:
-    case SRGB_Alpha_DXT3:
-        d->formatClass = FormatClass_S3TC_DXT3_RGBA;
-        break;
-
-    case RGBA_DXT5:
-    case SRGB_Alpha_DXT5:
-        d->formatClass = FormatClass_S3TC_DXT5_RGBA;
-        break;
-
-    case QOpenGLTexture::R11_EAC_UNorm:
-    case QOpenGLTexture::R11_EAC_SNorm:
-    case QOpenGLTexture::RG11_EAC_UNorm:
-    case QOpenGLTexture::RG11_EAC_SNorm:
-    case QOpenGLTexture::RGB8_ETC2:
-    case QOpenGLTexture::SRGB8_ETC2:
-    case QOpenGLTexture::RGB8_PunchThrough_Alpha1_ETC2:
-    case QOpenGLTexture::SRGB8_PunchThrough_Alpha1_ETC2:
-    case QOpenGLTexture::RGBA8_ETC2_EAC:
-    case QOpenGLTexture::SRGB8_Alpha8_ETC2_EAC:
-    case QOpenGLTexture::RGB8_ETC1:
-    case RG3B2:
-    case R5G6B5:
-    case RGB5A1:
-    case RGBA4:
-    case D16:
-    case D24:
-    case D24S8:
-    case D32:
-    case D32F:
-    case D32FS8X24:
-    case S8:
-    case DepthFormat:
-    case AlphaFormat:
-    case RGBFormat:
-    case RGBAFormat:
-    case LuminanceFormat:
-    case LuminanceAlphaFormat:
-    case QOpenGLTexture::RGBA_ASTC_4x4:
-    case QOpenGLTexture::RGBA_ASTC_5x4:
-    case QOpenGLTexture::RGBA_ASTC_5x5:
-    case QOpenGLTexture::RGBA_ASTC_6x5:
-    case QOpenGLTexture::RGBA_ASTC_6x6:
-    case QOpenGLTexture::RGBA_ASTC_8x5:
-    case QOpenGLTexture::RGBA_ASTC_8x6:
-    case QOpenGLTexture::RGBA_ASTC_8x8:
-    case QOpenGLTexture::RGBA_ASTC_10x5:
-    case QOpenGLTexture::RGBA_ASTC_10x6:
-    case QOpenGLTexture::RGBA_ASTC_10x8:
-    case QOpenGLTexture::RGBA_ASTC_10x10:
-    case QOpenGLTexture::RGBA_ASTC_12x10:
-    case QOpenGLTexture::RGBA_ASTC_12x12:
-    case QOpenGLTexture::SRGB8_Alpha8_ASTC_4x4:
-    case QOpenGLTexture::SRGB8_Alpha8_ASTC_5x4:
-    case QOpenGLTexture::SRGB8_Alpha8_ASTC_5x5:
-    case QOpenGLTexture::SRGB8_Alpha8_ASTC_6x5:
-    case QOpenGLTexture::SRGB8_Alpha8_ASTC_6x6:
-    case QOpenGLTexture::SRGB8_Alpha8_ASTC_8x5:
-    case QOpenGLTexture::SRGB8_Alpha8_ASTC_8x6:
-    case QOpenGLTexture::SRGB8_Alpha8_ASTC_8x8:
-    case QOpenGLTexture::SRGB8_Alpha8_ASTC_10x5:
-    case QOpenGLTexture::SRGB8_Alpha8_ASTC_10x6:
-    case QOpenGLTexture::SRGB8_Alpha8_ASTC_10x8:
-    case QOpenGLTexture::SRGB8_Alpha8_ASTC_10x10:
-    case QOpenGLTexture::SRGB8_Alpha8_ASTC_12x10:
-    case QOpenGLTexture::SRGB8_Alpha8_ASTC_12x12:
-        d->formatClass = FormatClass_Unique;
-        break;
-    }
-}
-
-/*!
-    Returns the format of this texture object.
-
-    \sa setFormat()
-*/
-QOpenGLTexture::TextureFormat QOpenGLTexture::format() const
-{
-    Q_D(const QOpenGLTexture);
-    return d->format;
-}
-
-static bool isNpot(int width, int height = 1, int depth = 1)
-{
-    return width & (width-1) || height & (height-1) || depth & (depth-1);
-}
-
-/*!
-    Sets the dimensions of this texture object to \a width,
-    \a height, and \a depth. The default for each dimension is 1.
-    The maximum allowable texture size is dependent upon your OpenGL
-    implementation. Allocating storage for a texture less than the
-    maximum size can still fail if your system is low on resources.
-
-    If a non-power-of-two \a width, \a height or \a depth is provided and your
-    OpenGL implementation doesn't have support for repeating non-power-of-two
-    textures, then the wrap mode is automatically set to ClampToEdge.
-
-    \sa width(), height(), depth()
-*/
-void QOpenGLTexture::setSize(int width, int height, int depth)
-{
-    Q_D(QOpenGLTexture);
-    d->create();
-    if (isStorageAllocated()) {
-        qWarning("Cannot resize a texture that already has storage allocated.\n"
-                 "To do so, destroy() the texture and then create() and setSize()");
-        return;
-    }
-
-    if (isNpot(width, height, depth) && !hasFeature(Feature::NPOTTextureRepeat) && d->target != Target::TargetRectangle)
-        d->setWrapMode(WrapMode::ClampToEdge);
-
-    switch (d->target) {
-    case QOpenGLTexture::Target1D:
-    case QOpenGLTexture::Target1DArray:
-    case QOpenGLTexture::TargetBuffer:
-        d->dimensions[0] = width;
-        Q_UNUSED(height);
-        Q_UNUSED(depth);
-        break;
-
-    case QOpenGLTexture::Target2D:
-    case QOpenGLTexture::Target2DArray:
-    case QOpenGLTexture::TargetRectangle:
-    case QOpenGLTexture::Target2DMultisample:
-    case QOpenGLTexture::Target2DMultisampleArray:
-        d->dimensions[0] = width;
-        d->dimensions[1] = height;
-        Q_UNUSED(depth);
-        break;
-
-    case QOpenGLTexture::TargetCubeMap:
-    case QOpenGLTexture::TargetCubeMapArray:
-        if (width != height)
-            qWarning("QAbstractOpenGLTexture::setSize(): Cube map textures must be square");
-        d->dimensions[0] = d->dimensions[1] = width;
-        Q_UNUSED(depth);
-        break;
-
-    case QOpenGLTexture::Target3D:
-        d->dimensions[0] = width;
-        d->dimensions[1] = height;
-        d->dimensions[2] = depth;
-        break;
-    }
-}
-
-/*!
-    Returns the width of a 1D, 2D or 3D texture.
-
-    \sa height(), depth(), setSize()
-*/
-int QOpenGLTexture::width() const
-{
-    Q_D(const QOpenGLTexture);
-    return d->dimensions[0];
-}
-
-/*!
-    Returns the height of a 2D or 3D texture.
-
-    \sa width(), depth(), setSize()
-*/
-int QOpenGLTexture::height() const
-{
-    Q_D(const QOpenGLTexture);
-    return d->dimensions[1];
-}
-
-/*!
-    Returns the depth of a 3D texture.
-
-    \sa width(), height(), setSize()
-*/
-int QOpenGLTexture::depth() const
-{
-    Q_D(const QOpenGLTexture);
-    return d->dimensions[2];
-}
-
-/*!
-    For texture targets that support mipmaps, this function
-    sets the requested number of mipmap \a levels to allocate storage
-    for. This function should be called before storage is allocated
-    for the texture.
-
-    If the texture target does not support mipmaps this function
-    has no effect.
-
-    \sa mipLevels(), maximumMipLevels(), isStorageAllocated()
-*/
-void QOpenGLTexture::setMipLevels(int levels)
-{
-    Q_D(QOpenGLTexture);
-    d->create();
-    if (isStorageAllocated()) {
-        qWarning("Cannot set mip levels on a texture that already has storage allocated.\n"
-                 "To do so, destroy() the texture and then create() and setMipLevels()");
-        return;
-    }
-
-    switch (d->target) {
-    case QOpenGLTexture::Target1D:
-    case QOpenGLTexture::Target1DArray:
-    case QOpenGLTexture::Target2D:
-    case QOpenGLTexture::Target2DArray:
-    case QOpenGLTexture::TargetCubeMap:
-    case QOpenGLTexture::TargetCubeMapArray:
-    case QOpenGLTexture::Target3D:
-        d->requestedMipLevels = levels;
-        break;
-
-    case QOpenGLTexture::TargetBuffer:
-    case QOpenGLTexture::TargetRectangle:
-    case QOpenGLTexture::Target2DMultisample:
-    case QOpenGLTexture::Target2DMultisampleArray:
-        qWarning("QAbstractOpenGLTexture::setMipLevels(): This texture target does not support mipmaps");
-        break;
-    }
-}
-
-/*!
-    Returns the number of mipmap levels for this texture. If storage
-    has not yet been allocated for this texture it returns the
-    requested number of mipmap levels.
-
-    \sa setMipLevels(), maximumMipLevels(), isStorageAllocated()
-*/
-int QOpenGLTexture::mipLevels() const
-{
-    Q_D(const QOpenGLTexture);
-    return isStorageAllocated() ? d->mipLevels : d->requestedMipLevels;
-}
-
-/*!
-    Returns the maximum number of mipmap levels that this texture
-    can have given the current dimensions.
-
-    \sa setMipLevels(), mipLevels(), setSize()
-*/
-int QOpenGLTexture::maximumMipLevels() const
-{
-    Q_D(const QOpenGLTexture);
-    return d->maximumMipLevelCount();
-}
-
-/*!
-    Sets the number of array \a layers to allocate storage for. This
-    function should be called before storage is allocated for the texture.
-
-    For targets that do not support array layers this function has
-    no effect.
-
-    \sa layers(), isStorageAllocated()
-*/
-void QOpenGLTexture::setLayers(int layers)
-{
-    Q_D(QOpenGLTexture);
-    d->create();
-    if (isStorageAllocated()) {
-        qWarning("Cannot set layers on a texture that already has storage allocated.\n"
-                 "To do so, destroy() the texture and then create() and setLayers()");
-        return;
-    }
-
-    switch (d->target) {
-    case QOpenGLTexture::Target1DArray:
-    case QOpenGLTexture::Target2DArray:
-    case QOpenGLTexture::TargetCubeMapArray:
-    case QOpenGLTexture::Target2DMultisampleArray:
-        d->layers = layers;
-        break;
-
-    case QOpenGLTexture::Target1D:
-    case QOpenGLTexture::Target2D:
-    case QOpenGLTexture::Target3D:
-    case QOpenGLTexture::TargetCubeMap:
-    case QOpenGLTexture::TargetBuffer:
-    case QOpenGLTexture::TargetRectangle:
-    case QOpenGLTexture::Target2DMultisample:
-        qWarning("Texture target does not support array layers");
-        break;
-    }
-}
-
-/*!
-    Returns the number of array layers for this texture. If
-    storage has not yet been allocated for this texture then
-    this function returns the requested number of array layers.
-
-    For texture targets that do not support array layers this
-    will return 1.
-
-    \sa setLayers(), isStorageAllocated()
-*/
-int QOpenGLTexture::layers() const
-{
-    Q_D(const QOpenGLTexture);
-    return d->layers;
-}
-
-/*!
-    Returns the number of faces for this texture. For cubemap
-    and cubemap array type targets this will be 6.
-
-    For non-cubemap type targets this will return 1.
-*/
-int QOpenGLTexture::faces() const
-{
-    Q_D(const QOpenGLTexture);
-    return d->faces;
-}
-
-/*!
-    Sets the number of \a samples to allocate storage for when rendering to
-    a multisample capable texture target. This function should
-    be called before storage is allocated for the texture.
-
-    For targets that do not support multisampling this function has
-    no effect.
-
-    \sa samples(), isStorageAllocated()
-*/
-void QOpenGLTexture::setSamples(int samples)
-{
-    Q_D(QOpenGLTexture);
-    d->create();
-    if (isStorageAllocated()) {
-        qWarning("Cannot set sample count on a texture that already has storage allocated.\n"
-                 "To do so, destroy() the texture and then create() and setSamples()");
-        return;
-    }
-
-    switch (d->target) {
-    case QOpenGLTexture::Target2DMultisample:
-    case QOpenGLTexture::Target2DMultisampleArray:
-        d->samples = samples;
-        break;
-
-    case QOpenGLTexture::Target1D:
-    case QOpenGLTexture::Target2D:
-    case QOpenGLTexture::Target3D:
-    case QOpenGLTexture::Target1DArray:
-    case QOpenGLTexture::Target2DArray:
-    case QOpenGLTexture::TargetCubeMap:
-    case QOpenGLTexture::TargetCubeMapArray:
-    case QOpenGLTexture::TargetBuffer:
-    case QOpenGLTexture::TargetRectangle:
-
-        qWarning("Texture target does not support multisampling");
-        break;
-    }
-}
-
-/*!
-    Returns the number of multisample sample points for this texture.
-    If storage has not yet been allocated for this texture then
-    this function returns the requested number of samples.
-
-    For texture targets that do not support multisampling this
-    will return 0.
-
-    \sa setSamples(), isStorageAllocated()
-*/
-int QOpenGLTexture::samples() const
-{
-    Q_D(const QOpenGLTexture);
-    return d->samples;
-}
-
-/*!
-    Sets whether the sample positions and number of samples used with
-    a multisample capable texture target to \a fixed. If set to \c true
-    the sample positions and number of samples used are the same for
-    all texels in the image and will not depend upon the image size or
-    internal format. This function should be called before storage is allocated
-    for the texture.
-
-    For targets that do not support multisampling this function has
-    no effect.
-
-    The default value is \c true.
-
-    \sa isFixedSamplePositions(), isStorageAllocated()
-*/
-void QOpenGLTexture::setFixedSamplePositions(bool fixed)
-{
-    Q_D(QOpenGLTexture);
-    d->create();
-    if (isStorageAllocated()) {
-        qWarning("Cannot set sample positions on a texture that already has storage allocated.\n"
-                 "To do so, destroy() the texture and then create() and setFixedSamplePositions()");
-        return;
-    }
-
-    switch (d->target) {
-    case QOpenGLTexture::Target2DMultisample:
-    case QOpenGLTexture::Target2DMultisampleArray:
-        d->fixedSamplePositions = fixed;
-        break;
-
-    case QOpenGLTexture::Target1D:
-    case QOpenGLTexture::Target2D:
-    case QOpenGLTexture::Target3D:
-    case QOpenGLTexture::Target1DArray:
-    case QOpenGLTexture::Target2DArray:
-    case QOpenGLTexture::TargetCubeMap:
-    case QOpenGLTexture::TargetCubeMapArray:
-    case QOpenGLTexture::TargetBuffer:
-    case QOpenGLTexture::TargetRectangle:
-
-        qWarning("Texture target does not support multisampling");
-        break;
-    }
-}
-
-/*!
-    Returns whether this texture uses a fixed pattern of multisample
-    samples. If storage has not yet been allocated for this texture then
-    this function returns the requested fixed sample position setting.
-
-    For texture targets that do not support multisampling this
-    will return \c true.
-
-    \sa setFixedSamplePositions(), isStorageAllocated()
-*/
-bool QOpenGLTexture::isFixedSamplePositions() const
-{
-    Q_D(const QOpenGLTexture);
-    return d->fixedSamplePositions;
-}
-
-/*!
-    Allocates server-side storage for this texture object taking
-    into account, the format, dimensions, mipmap levels, array
-    layers and cubemap faces.
-
-    Once storage has been allocated it is no longer possible to change
-    these properties.
-
-    If supported QOpenGLTexture makes use of immutable texture
-    storage.
-
-    Once storage has been allocated for the texture then pixel data
-    can be uploaded via one of the setData() overloads.
-
-    \note If immutable texture storage is not available,
-    then a default pixel format and pixel type will be used to
-    create the mutable storage. You can use the other
-    allocateStorage() overload to specify exactly the pixel format
-    and the pixel type to use when allocating mutable storage;
-    this is particulary useful under certain OpenGL ES implementations
-    (notably, OpenGL ES 2), where the pixel format and the pixel type
-    used at allocation time must perfectly match the format
-    and the type passed to any subsequent setData() call.
-
-    \sa isStorageAllocated(), setData()
-*/
-void QOpenGLTexture::allocateStorage()
-{
-    Q_D(QOpenGLTexture);
-    if (d->create()) {
-        const QOpenGLTexture::PixelFormat pixelFormat = pixelFormatCompatibleWithInternalFormat(d->format);
-        const QOpenGLTexture::PixelType pixelType = pixelTypeCompatibleWithInternalFormat(d->format);
-        d->allocateStorage(pixelFormat, pixelType);
-    }
-}
-
-/*!
-    \since 5.5
-
-    Allocates server-side storage for this texture object taking
-    into account, the format, dimensions, mipmap levels, array
-    layers and cubemap faces.
-
-    Once storage has been allocated it is no longer possible to change
-    these properties.
-
-    If supported QOpenGLTexture makes use of immutable texture
-    storage. However, if immutable texture storage is not available,
-    then the specified \a pixelFormat and \a pixelType will be used
-    to allocate mutable storage; note that in certain OpenGL implementations
-    (notably, OpenGL ES 2) they must perfectly match the format
-    and the type passed to any subsequent setData() call.
-
-    Once storage has been allocated for the texture then pixel data
-    can be uploaded via one of the setData() overloads.
-
-    \sa isStorageAllocated(), setData()
-*/
-void QOpenGLTexture::allocateStorage(QOpenGLTexture::PixelFormat pixelFormat, QOpenGLTexture::PixelType pixelType)
-{
-    Q_D(QOpenGLTexture);
-    if (d->create())
-        d->allocateStorage(pixelFormat, pixelType);
-}
-
-/*!
-    Returns \c true if server-side storage for this texture as been
-    allocated.
-
-    The texture format, dimensions, mipmap levels and array layers
-    cannot be altered once storage ihas been allocated.
-
-    \sa allocateStorage(), setSize(), setMipLevels(), setLayers(), setFormat()
-*/
-bool QOpenGLTexture::isStorageAllocated() const
-{
-    Q_D(const QOpenGLTexture);
-    return d->storageAllocated;
-}
-
-/*!
-    Attempts to create a texture view onto this texture. A texture
-    view is somewhat analogous to a view in SQL in that it presents
-    a restricted or reinterpreted view of the original data. Texture
-    views do not allocate any more server-side storage, insted relying
-    on the storage buffer of the source texture.
-
-    Texture views are only available when using immutable storage. For
-    more information on texture views see
-    http://www.opengl.org/wiki/Texture_Storage#Texture_views.
-
-    The \a target argument specifies the target to use for the view.
-    Only some targets can be used depending upon the target of the original
-    target. For e.g. a view onto a Target1DArray texture can specify
-    either Target1DArray or Target1D but for the latter the number of
-    array layers specified with \a minimumLayer and \a maximumLayer must
-    be exactly 1.
-
-    Simpliar constraints apply for the \a viewFormat. See the above link
-    and the specification for more details.
-
-    The \a minimumMipmapLevel, \a maximumMipmapLevel, \a minimumLayer,
-    and \a maximumLayer arguments serve to restrict the parts of the
-    texture accessible by the texture view.
-
-    If creation of the texture view fails this function will return
-    0. If the function succeeds it will return a pointer to a new
-    QOpenGLTexture object that will return \c true from its isTextureView()
-    function.
-
-    \sa isTextureView()
-*/
-QOpenGLTexture *QOpenGLTexture::createTextureView(Target target,
-                                                  TextureFormat viewFormat,
-                                                  int minimumMipmapLevel, int maximumMipmapLevel,
-                                                  int minimumLayer, int maximumLayer) const
-{
-    Q_D(const QOpenGLTexture);
-    if (!isStorageAllocated()) {
-        qWarning("Cannot set create a texture view of a texture that does not have storage allocated.");
-        return nullptr;
-    }
-    Q_ASSERT(maximumMipmapLevel >= minimumMipmapLevel);
-    Q_ASSERT(maximumLayer >= minimumLayer);
-    return d->createTextureView(target, viewFormat,
-                                minimumMipmapLevel, maximumMipmapLevel,
-                                minimumLayer, maximumLayer);
-}
-
-/*!
-    Returns \c true if this texture object is actually a view onto another
-    texture object.
-
-    \sa createTextureView()
-*/
-bool QOpenGLTexture::isTextureView() const
-{
-    Q_D(const QOpenGLTexture);
-    Q_ASSERT(d->textureId);
-    return d->textureView;
-}
-
-/*!
-    Uploads pixel \a data for this texture object \a mipLevel, array \a layer, and \a cubeFace.
-    Storage must have been allocated before uploading pixel data. Some overloads of setData()
-    will set appropriate dimensions, mipmap levels, and array layers and then allocate storage
-    for you if they have enough information to do so. This will be noted in the function
-    documentation.
-
-    The structure of the pixel data pointed to by \a data is specified by \a sourceFormat
-    and \a sourceType. The pixel data upload can optionally be controlled by \a options.
-
-    If using a compressed format() then you should use setCompressedData() instead of this
-    function.
-
-    \since 5.3
-    \sa setCompressedData()
-*/
-void QOpenGLTexture::setData(int mipLevel, int layer, CubeMapFace cubeFace,
-                             PixelFormat sourceFormat, PixelType sourceType,
-                             const void *data, const QOpenGLPixelTransferOptions * const options)
-{
-    Q_D(QOpenGLTexture);
-    Q_ASSERT(d->textureId);
-    if (!isStorageAllocated()) {
-        qWarning("Cannot set data on a texture that does not have storage allocated.\n"
-                 "To do so call allocateStorage() before this function");
-        return;
-    }
-    d->setData(mipLevel, layer, 1, cubeFace, sourceFormat, sourceType, data, options);
-}
-
-/*!
-    \since 5.9
-    \overload
-
-    Parameter \a layerCount is the number of layers in a texture array
-    that are being uploaded/populated by this call.
-*/
-void QOpenGLTexture::setData(int mipLevel, int layer, int layerCount, QOpenGLTexture::CubeMapFace cubeFace, QOpenGLTexture::PixelFormat sourceFormat, QOpenGLTexture::PixelType sourceType, const void *data, const QOpenGLPixelTransferOptions * const options)
-{
-    Q_D(QOpenGLTexture);
-    Q_ASSERT(d->textureId);
-    if (!isStorageAllocated()) {
-        qWarning("Cannot set data on a texture that does not have storage allocated.\n"
-                 "To do so call allocateStorage() before this function");
-        return;
-    }
-    d->setData(mipLevel, layer, layerCount, cubeFace, sourceFormat, sourceType, data, options);
-}
-
-/*!
-    \since 5.3
-    \overload
-*/
-void QOpenGLTexture::setData(int mipLevel, int layer,
-                             PixelFormat sourceFormat, PixelType sourceType,
-                             const void *data, const QOpenGLPixelTransferOptions * const options)
-{
-    Q_D(QOpenGLTexture);
-    Q_ASSERT(d->textureId);
-    d->setData(mipLevel, layer, 1, QOpenGLTexture::CubeMapPositiveX, sourceFormat, sourceType, data, options);
-}
-
-/*!
-    \since 5.3
-    \overload
-*/
-void QOpenGLTexture::setData(int mipLevel,
-                             PixelFormat sourceFormat, PixelType sourceType,
-                             const void *data, const QOpenGLPixelTransferOptions * const options)
-{
-    Q_D(QOpenGLTexture);
-    Q_ASSERT(d->textureId);
-    d->setData(mipLevel, 0, 1, QOpenGLTexture::CubeMapPositiveX, sourceFormat, sourceType, data, options);
-}
-
-/*!
-    \since 5.3
-    \overload
-*/
-void QOpenGLTexture::setData(PixelFormat sourceFormat, PixelType sourceType,
-                             const void *data, const QOpenGLPixelTransferOptions * const options)
-{
-    Q_D(QOpenGLTexture);
-    Q_ASSERT(d->textureId);
-    d->setData(0, 0, 1, QOpenGLTexture::CubeMapPositiveX, sourceFormat, sourceType, data, options);
-}
-
-/*!
-    \since 5.14
-    \overload
-
-    This overload is to be used to update a part of the texture. Parameters \a
-    xOffset, \a yOffset, \a zOffset specify the texel offsets within the
-    texture. Parameters \a width, \a height and \a depth specify the dimensions
-    of the sub image.
-
-    The structure of the pixel data pointed to by \a data is specified by \a
-    sourceFormat and \a sourceType. The pixel data upload can optionally be
-    controlled by \a options.
-*/
-void QOpenGLTexture::setData(int xOffset, int yOffset, int zOffset,
-                             int width, int height, int depth,
-                             PixelFormat sourceFormat, PixelType sourceType,
-                             const void *data, const QOpenGLPixelTransferOptions * const options)
-{
-    Q_D(QOpenGLTexture);
-    Q_ASSERT(d->textureId);
-    d->setData(xOffset, yOffset, zOffset,
-               width, height, depth,
-               0, 0, 1,
-               QOpenGLTexture::CubeMapPositiveX, sourceFormat,
-               sourceType, data, options);
-}
-
-/*!
-    \since 5.14
-    \overload
-
-    This overload is to be used to update a part of the texture. Parameters \a
-    xOffset, \a yOffset, \a zOffset specify the texel offsets within the
-    texture. Parameters \a width, \a height and \a depth specify the dimensions
-    of the sub image. The mip map level the sub image we want to
-    update is specified with \a mipLevel.
-
-    The structure of the pixel data pointed to by \a data is specified by \a
-    sourceFormat and \a sourceType. The pixel data upload can optionally be
-    controlled by \a options.
-*/
-void QOpenGLTexture::setData(int xOffset, int yOffset, int zOffset,
-                             int width, int height, int depth,
-                             int mipLevel,
-                             PixelFormat sourceFormat, PixelType sourceType,
-                             const void *data, const QOpenGLPixelTransferOptions * const options)
-{
-    Q_D(QOpenGLTexture);
-    Q_ASSERT(d->textureId);
-    d->setData(xOffset, yOffset, zOffset,
-               width, height, depth,
-               mipLevel, 0, 1,
-               QOpenGLTexture::CubeMapPositiveX, sourceFormat,
-               sourceType, data, options);
-}
-
-/*!
-    \since 5.14
-    \overload
-
-    This overload is to be used to update a part of the texture. Parameters \a
-    xOffset, \a yOffset, \a zOffset specify the texel offsets within the
-    texture. Parameters \a width, \a height and \a depth specify the dimensions
-    of the sub image. The mip map level and layerof the sub image we want to
-    update are specified with \a mipLevel and \a layer.
-
-    The structure of the pixel data pointed to by \a data is specified by \a
-    sourceFormat and \a sourceType. The pixel data upload can optionally be
-    controlled by \a options.
-*/
-void QOpenGLTexture::setData(int xOffset, int yOffset, int zOffset,
-                             int width, int height, int depth,
-                             int mipLevel, int layer,
-                             PixelFormat sourceFormat, PixelType sourceType,
-                             const void *data, const QOpenGLPixelTransferOptions * const options)
-{
-    Q_D(QOpenGLTexture);
-    Q_ASSERT(d->textureId);
-    d->setData(xOffset, yOffset, zOffset,
-               width, height, depth,
-               mipLevel, layer, 1,
-               QOpenGLTexture::CubeMapPositiveX, sourceFormat,
-               sourceType, data, options);
-}
-
-/*!
-    \since 5.14
-    \overload
-
-    This overload is to be used to update a part of the texture. Parameters \a
-    xOffset, \a yOffset, \a zOffset specify the texel offsets within the
-    texture. Parameters \a width, \a height and \a depth specify the dimensions
-    of the sub image.The mip map level, layer and cube map face of the sub
-    image we want to update are specified with \a mipLevel, \a layer and \a
-    face.
-
-    The structure of the pixel data pointed to by \a data is specified by \a
-    sourceFormat and \a sourceType. The pixel data upload can optionally be
-    controlled by \a options.
-*/
-void QOpenGLTexture::setData(int xOffset, int yOffset, int zOffset,
-                             int width, int height, int depth,
-                             int mipLevel, int layer,
-                             CubeMapFace face,
-                             PixelFormat sourceFormat, PixelType sourceType,
-                             const void *data, const QOpenGLPixelTransferOptions * const options)
-{
-    Q_D(QOpenGLTexture);
-    Q_ASSERT(d->textureId);
-    d->setData(xOffset, yOffset, zOffset,
-               width, height, depth,
-               mipLevel, layer, 1,
-               face, sourceFormat,
-               sourceType, data, options);
-}
-
-/*!
-    \since 5.14
-    \overload
-
-    This overload is to be used to update a part of the texture. Parameters \a
-    xOffset, \a yOffset, \a zOffset specify the texel offsets within the
-    texture. Parameters \a width, \a height and \a depth specify the dimensions
-    of the sub image.The mip map level, starting layer, cube map face and
-    number of layers of the sub image we want to update are specified with \a
-    mipLevel, \a layer, \a face and \a layerCount.
-
-    The structure of the pixel data pointed to by \a data is specified by \a
-    sourceFormat and \a sourceType. The pixel data upload can optionally be
-    controlled by \a options.
-*/
-void QOpenGLTexture::setData(int xOffset, int yOffset, int zOffset,
-                             int width, int height, int depth,
-                             int mipLevel, int layer,
-                             CubeMapFace face, int layerCount,
-                             PixelFormat sourceFormat, PixelType sourceType,
-                             const void *data, const QOpenGLPixelTransferOptions * const options)
-{
-    Q_D(QOpenGLTexture);
-    Q_ASSERT(d->textureId);
-    d->setData(xOffset, yOffset, zOffset,
-               width, height, depth,
-               mipLevel, layer, layerCount,
-               face, sourceFormat,
-               sourceType, data, options);
-}
-
-#if QT_DEPRECATED_SINCE(5, 3)
-/*!
-    \obsolete
-    \overload
-
-    \sa setCompressedData()
-*/
-void QOpenGLTexture::setData(int mipLevel, int layer, CubeMapFace cubeFace,
-                             PixelFormat sourceFormat, PixelType sourceType,
-                             void *data, const QOpenGLPixelTransferOptions * const options)
-{
-    Q_D(QOpenGLTexture);
-    Q_ASSERT(d->textureId);
-    if (!isStorageAllocated()) {
-        qWarning("Cannot set data on a texture that does not have storage allocated.\n"
-                 "To do so call allocateStorage() before this function");
-        return;
-    }
-    d->setData(mipLevel, layer, 1, cubeFace, sourceFormat, sourceType, data, options);
-}
-
-/*!
-    \obsolete
-    \overload
-*/
-void QOpenGLTexture::setData(int mipLevel, int layer,
-                             PixelFormat sourceFormat, PixelType sourceType,
-                             void *data, const QOpenGLPixelTransferOptions * const options)
-{
-    Q_D(QOpenGLTexture);
-    Q_ASSERT(d->textureId);
-    d->setData(mipLevel, layer, 1, QOpenGLTexture::CubeMapPositiveX, sourceFormat, sourceType, data, options);
-}
-
-/*!
-    \obsolete
-    \overload
-*/
-void QOpenGLTexture::setData(int mipLevel,
-                             PixelFormat sourceFormat, PixelType sourceType,
-                             void *data, const QOpenGLPixelTransferOptions * const options)
-{
-    Q_D(QOpenGLTexture);
-    Q_ASSERT(d->textureId);
-    d->setData(mipLevel, 0, 1, QOpenGLTexture::CubeMapPositiveX, sourceFormat, sourceType, data, options);
-}
-
-/*!
-    \obsolete
-    \overload
-*/
-void QOpenGLTexture::setData(PixelFormat sourceFormat, PixelType sourceType,
-                             void *data, const QOpenGLPixelTransferOptions * const options)
-{
-    Q_D(QOpenGLTexture);
-    Q_ASSERT(d->textureId);
-    d->setData(0, 0, 1, QOpenGLTexture::CubeMapPositiveX, sourceFormat, sourceType, data, options);
-}
-#endif
-
-/*!
-    This overload of setData() will allocate storage for you.
-    The pixel data is contained in \a image. Mipmaps are generated by default.
-    Set \a genMipMaps to \l DontGenerateMipMaps to turn off mipmap generation.
-
-    \overload
-*/
-void QOpenGLTexture::setData(const QImage& image, MipMapGeneration genMipMaps)
-{
-    QOpenGLContext *context = QOpenGLContext::currentContext();
-    if (!context) {
-        qWarning("QOpenGLTexture::setData() requires a valid current context");
-        return;
-    }
-
-    if (image.isNull()) {
-        qWarning("QOpenGLTexture::setData() tried to set a null image");
-        return;
-    }
-
-    if (context->isOpenGLES() && context->format().majorVersion() < 3)
-        setFormat(QOpenGLTexture::RGBAFormat);
-    else
-        setFormat(QOpenGLTexture::RGBA8_UNorm);
-
-    setSize(image.width(), image.height());
-    setMipLevels(genMipMaps == GenerateMipMaps ? maximumMipLevels() : 1);
-    allocateStorage(QOpenGLTexture::RGBA, QOpenGLTexture::UInt8);
-
-    // Upload pixel data and generate mipmaps
-    QImage glImage = image.convertToFormat(QImage::Format_RGBA8888);
-    QOpenGLPixelTransferOptions uploadOptions;
-    uploadOptions.setAlignment(1);
-    setData(0, QOpenGLTexture::RGBA, QOpenGLTexture::UInt8, glImage.constBits(), &uploadOptions);
-}
-
-/*!
-    Uploads compressed pixel \a data to \a mipLevel, array \a layer, and \a cubeFace.
-    The pixel transfer can optionally be controlled with \a options. The \a dataSize
-    argument should specify the size of the data pointed to by \a data.
-
-    If not using a compressed format() then you should use setData() instead of this
-    function.
-
-    \since 5.3
-*/
-void QOpenGLTexture::setCompressedData(int mipLevel, int layer, CubeMapFace cubeFace,
-                                       int dataSize, const void *data,
-                                       const QOpenGLPixelTransferOptions * const options)
-{
-    Q_D(QOpenGLTexture);
-    Q_ASSERT(d->textureId);
-    if (!isStorageAllocated()) {
-        qWarning("Cannot set data on a texture that does not have storage allocated.\n"
-                 "To do so call allocateStorage() before this function");
-        return;
-    }
-    d->setCompressedData(mipLevel, layer, 1, cubeFace, dataSize, data, options);
-}
-
-/*!
-    \since 5.9
-    \overload
-
-    Parameter \a layerCount is the number of layers in a texture array
-    that are being uploaded/populated by this call.
-*/
-void QOpenGLTexture::setCompressedData(int mipLevel, int layer, int layerCount, QOpenGLTexture::CubeMapFace cubeFace, int dataSize, const void *data, const QOpenGLPixelTransferOptions * const options)
-{
-    Q_D(QOpenGLTexture);
-    Q_ASSERT(d->textureId);
-    if (!isStorageAllocated()) {
-        qWarning("Cannot set data on a texture that does not have storage allocated.\n"
-                 "To do so call allocateStorage() before this function");
-        return;
-    }
-    d->setCompressedData(mipLevel, layer, layerCount, cubeFace, dataSize, data, options);
-}
-
-/*!
-    \overload
-*/
-void QOpenGLTexture::setCompressedData(int mipLevel, int layer, int dataSize, const void *data,
-                                       const QOpenGLPixelTransferOptions * const options)
-{
-    Q_D(QOpenGLTexture);
-    Q_ASSERT(d->textureId);
-    d->setCompressedData(mipLevel, layer, 1, QOpenGLTexture::CubeMapPositiveX, dataSize, data, options);
-}
-
-/*!
-    \overload
-*/
-void QOpenGLTexture::setCompressedData(int mipLevel, int dataSize, const void *data,
-                                       const QOpenGLPixelTransferOptions * const options)
-{
-    Q_D(QOpenGLTexture);
-    Q_ASSERT(d->textureId);
-    d->setCompressedData(mipLevel, 0, 1, QOpenGLTexture::CubeMapPositiveX, dataSize, data, options);
-}
-
-/*!
-    \overload
-*/
-void QOpenGLTexture::setCompressedData(int dataSize, const void *data,
-                                       const QOpenGLPixelTransferOptions * const options)
-{
-    Q_D(QOpenGLTexture);
-    Q_ASSERT(d->textureId);
-    d->setCompressedData(0, 0, 1, QOpenGLTexture::CubeMapPositiveX, dataSize, data, options);
-}
-
-#if QT_DEPRECATED_SINCE(5, 3)
-/*!
-    \obsolete
-    \overload
-*/
-void QOpenGLTexture::setCompressedData(int mipLevel, int layer, CubeMapFace cubeFace,
-                                       int dataSize, void *data,
-                                       const QOpenGLPixelTransferOptions * const options)
-{
-    Q_D(QOpenGLTexture);
-    Q_ASSERT(d->textureId);
-    if (!isStorageAllocated()) {
-        qWarning("Cannot set data on a texture that does not have storage allocated.\n"
-                 "To do so call allocateStorage() before this function");
-        return;
-    }
-    d->setCompressedData(mipLevel, layer, 1, cubeFace, dataSize, data, options);
-}
-
-/*!
-    \obsolete
-    \overload
-*/
-void QOpenGLTexture::setCompressedData(int mipLevel, int layer, int dataSize, void *data,
-                                       const QOpenGLPixelTransferOptions * const options)
-{
-    Q_D(QOpenGLTexture);
-    Q_ASSERT(d->textureId);
-    d->setCompressedData(mipLevel, layer, 1, QOpenGLTexture::CubeMapPositiveX, dataSize, data, options);
-}
-
-/*!
-    \obsolete
-    \overload
-*/
-void QOpenGLTexture::setCompressedData(int mipLevel, int dataSize, void *data,
-                                       const QOpenGLPixelTransferOptions * const options)
-{
-    Q_D(QOpenGLTexture);
-    Q_ASSERT(d->textureId);
-    d->setCompressedData(mipLevel, 0, 1, QOpenGLTexture::CubeMapPositiveX, dataSize, data, options);
-}
-
-/*!
-    \obsolete
-    \overload
-*/
-void QOpenGLTexture::setCompressedData(int dataSize, void *data,
-                                       const QOpenGLPixelTransferOptions * const options)
-{
-    Q_D(QOpenGLTexture);
-    Q_ASSERT(d->textureId);
-    d->setCompressedData(0, 0, 1, QOpenGLTexture::CubeMapPositiveX, dataSize, data, options);
-}
-#endif
-
-/*!
-    Returns \c true if your OpenGL implementation and version supports the texture
-    feature \a feature.
-*/
-bool QOpenGLTexture::hasFeature(Feature feature)
-{
-    QOpenGLContext *ctx = QOpenGLContext::currentContext();
-    if (!ctx) {
-        qWarning("QOpenGLTexture::hasFeature() requires a valid current context");
-        return false;
-    }
-
-    QSurfaceFormat f = ctx->format();
-
-    bool supported = false;
-
-#if !defined(QT_OPENGL_ES_2)
-    if (!ctx->isOpenGLES()) {
-        switch (feature) {
-        case ImmutableMultisampleStorage:
-            supported = f.version() >= qMakePair(4, 3)
-                    || ctx->hasExtension(QByteArrayLiteral("GL_ARB_texture_storage_multisample"));
-            break;
-
-        case TextureBuffer:
-            supported = f.version() >= qMakePair(3, 0)
-                    || ctx->hasExtension(QByteArrayLiteral("GL_ARB_texture_buffer_object"));
-            break;
-
-        case StencilTexturing:
-            supported = f.version() >= qMakePair(4, 3)
-                    || ctx->hasExtension(QByteArrayLiteral("GL_ARB_stencil_texturing"));
-            break;
-
-        case ImmutableStorage:
-            supported = f.version() >= qMakePair(4, 2)
-                    || ctx->hasExtension(QByteArrayLiteral("GL_ARB_texture_storage"))
-                    || ctx->hasExtension(QByteArrayLiteral("GL_EXT_texture_storage"));
-            break;
-
-        case TextureCubeMapArrays:
-            supported = f.version() >= qMakePair(4, 0)
-                    || ctx->hasExtension(QByteArrayLiteral("ARB_texture_cube_map_array"));
-            break;
-
-        case Swizzle:
-            supported = f.version() >= qMakePair(3, 3)
-                    || ctx->hasExtension(QByteArrayLiteral("GL_ARB_texture_swizzle"));
-            break;
-
-        case TextureMultisample:
-            supported = f.version() >= qMakePair(3, 2)
-                    || ctx->hasExtension(QByteArrayLiteral("GL_ARB_texture_multisample"));
-            break;
-
-        case TextureArrays:
-            supported = f.version() >= qMakePair(3, 0)
-                    || ctx->hasExtension(QByteArrayLiteral("GL_EXT_texture_array"));
-            break;
-
-        case TextureRectangle:
-            supported = f.version() >= qMakePair(2, 1)
-                    || ctx->hasExtension(QByteArrayLiteral("ARB_texture_rectangle"));
-            break;
-
-        case Texture3D:
-            supported = f.version() >= qMakePair(1, 3);
-            break;
-
-        case AnisotropicFiltering:
-            supported = ctx->hasExtension(QByteArrayLiteral("GL_EXT_texture_filter_anisotropic"));
-            break;
-
-        case NPOTTextures:
-        case NPOTTextureRepeat:
-            supported = ctx->hasExtension(QByteArrayLiteral("GL_ARB_texture_non_power_of_two"));
-            break;
-
-        case Texture1D:
-            supported = f.version() >= qMakePair(1, 1);
-            break;
-
-        case TextureComparisonOperators:
-            // GL 1.4 and GL_ARB_shadow alone support only LEQUAL and GEQUAL;
-            // since we're talking about history anyhow avoid to be extra pedantic
-            // in the feature set, and simply claim supported if we have the full set of operators
-            // (which has been added into 1.5 / GL_EXT_shadow_funcs).
-            supported = f.version() >= qMakePair(1, 5)
-                    || (ctx->hasExtension(QByteArrayLiteral("GL_ARB_shadow"))
-                        && ctx->hasExtension(QByteArrayLiteral("GL_EXT_shadow_funcs")));
-            break;
-
-        case TextureMipMapLevel:
-            supported = f.version() >= qMakePair(1, 2);
-            break;
-
-        case MaxFeatureFlag:
-            break;
-        }
-    }
-
-    if (ctx->isOpenGLES())
-#endif
-    {
-        const char *renderer = reinterpret_cast<const char *>(ctx->functions()->glGetString(GL_RENDERER));
-        switch (feature) {
-        case ImmutableStorage:
-            supported = (f.version() >= qMakePair(3, 0) || ctx->hasExtension(QByteArrayLiteral("GL_EXT_texture_storage")))
-                && !(renderer && strstr(renderer, "Mali")); // do not use on Mali: QTBUG-45106
-            break;
-
-        case ImmutableMultisampleStorage:
-            supported = f.version() >= qMakePair(3, 1);
-            break;
-
-        case TextureRectangle:
-            break;
-
-        case TextureArrays:
-            supported = f.version() >= qMakePair(3, 0);
-            break;
-
-        case Texture3D:
-            supported = f.version() >= qMakePair(3, 0)
-                    || ctx->hasExtension(QByteArrayLiteral("GL_OES_texture_3D"));
-            break;
-
-        case TextureMultisample:
-            supported = f.version() >= qMakePair(3, 1);
-            break;
-
-        case TextureBuffer:
-            break;
-
-        case TextureCubeMapArrays:
-            break;
-
-        case Swizzle:
-            supported = f.version() >= qMakePair(3, 0);
-            break;
-
-        case StencilTexturing:
-            break;
-
-        case AnisotropicFiltering:
-            supported = ctx->hasExtension(QByteArrayLiteral("GL_EXT_texture_filter_anisotropic"));
-            break;
-
-        case NPOTTextures:
-        case NPOTTextureRepeat:
-            supported = f.version() >= qMakePair(3,0)
-                    || ctx->hasExtension(QByteArrayLiteral("GL_OES_texture_npot"))
-                    || ctx->hasExtension(QByteArrayLiteral("GL_ARB_texture_non_power_of_two"));
-            break;
-
-        case Texture1D:
-            break;
-
-        case TextureComparisonOperators:
-            supported = f.version() >= qMakePair(3, 0)
-                    || ctx->hasExtension(QByteArrayLiteral("GL_EXT_shadow_samplers"));
-            break;
-
-        case TextureMipMapLevel:
-            supported = f.version() >= qMakePair(3, 0);
-            break;
-
-        case MaxFeatureFlag:
-            break;
-        }
-    }
-
-    return supported;
-}
-
-/*!
-    Sets the base mipmap level used for all texture lookups with this texture to \a baseLevel.
-
-    \note This function has no effect on Qt built for OpenGL ES 2.
-    \sa mipBaseLevel(), setMipMaxLevel(), setMipLevelRange()
-*/
-void QOpenGLTexture::setMipBaseLevel(int baseLevel)
-{
-    Q_D(QOpenGLTexture);
-    d->create();
-    if (!d->features.testFlag(TextureMipMapLevel)) {
-        qWarning("QOpenGLTexture::setMipBaseLevel: requires OpenGL >= 1.2 or OpenGL ES >= 3.0");
-        return;
-    }
-    Q_ASSERT(d->textureId);
-    Q_ASSERT(d->texFuncs);
-    Q_ASSERT(baseLevel <= d->maxLevel);
-    d->baseLevel = baseLevel;
-    d->texFuncs->glTextureParameteri(d->textureId, d->target, d->bindingTarget, GL_TEXTURE_BASE_LEVEL, baseLevel);
-}
-
-/*!
-    Returns the mipmap base level used for all texture lookups with this texture.
-    The default is 0.
-
-    \sa setMipBaseLevel(), mipMaxLevel(), mipLevelRange()
-*/
-int QOpenGLTexture::mipBaseLevel() const
-{
-    Q_D(const QOpenGLTexture);
-    return d->baseLevel;
-}
-
-/*!
-    Sets the maximum mipmap level used for all texture lookups with this texture to \a maxLevel.
-
-    \note This function has no effect on Qt built for OpenGL ES 2.
-    \sa mipMaxLevel(), setMipBaseLevel(), setMipLevelRange()
-*/
-void QOpenGLTexture::setMipMaxLevel(int maxLevel)
-{
-    Q_D(QOpenGLTexture);
-    d->create();
-    if (!d->features.testFlag(TextureMipMapLevel)) {
-        qWarning("QOpenGLTexture::setMipMaxLevel: requires OpenGL >= 1.2 or OpenGL ES >= 3.0");
-        return;
-    }
-    Q_ASSERT(d->textureId);
-    Q_ASSERT(d->texFuncs);
-    Q_ASSERT(d->baseLevel <= maxLevel);
-    d->maxLevel = maxLevel;
-    d->texFuncs->glTextureParameteri(d->textureId, d->target, d->bindingTarget, GL_TEXTURE_MAX_LEVEL, maxLevel);
-}
-
-/*!
-    Returns the mipmap maximum level used for all texture lookups with this texture.
-
-    \sa setMipMaxLevel(), mipBaseLevel(), mipLevelRange()
-*/
-int QOpenGLTexture::mipMaxLevel() const
-{
-    Q_D(const QOpenGLTexture);
-    return d->maxLevel;
-}
-
-/*!
-    Sets the range of mipmap levels that can be used for texture lookups with this texture
-    to range from \a baseLevel to \a maxLevel.
-
-    \note This function has no effect on Qt built for OpenGL ES 2.
-    \sa setMipBaseLevel(), setMipMaxLevel(), mipLevelRange()
-*/
-void QOpenGLTexture::setMipLevelRange(int baseLevel, int maxLevel)
-{
-    Q_D(QOpenGLTexture);
-    d->create();
-    if (!d->features.testFlag(TextureMipMapLevel)) {
-        qWarning("QOpenGLTexture::setMipLevelRange: requires OpenGL >= 1.2 or OpenGL ES >= 3.0");
-        return;
-    }
-    Q_ASSERT(d->textureId);
-    Q_ASSERT(d->texFuncs);
-    Q_ASSERT(baseLevel <= maxLevel);
-    d->texFuncs->glTextureParameteri(d->textureId, d->target, d->bindingTarget, GL_TEXTURE_BASE_LEVEL, baseLevel);
-    d->texFuncs->glTextureParameteri(d->textureId, d->target, d->bindingTarget, GL_TEXTURE_MAX_LEVEL, maxLevel);
-}
-
-/*!
-    Returns the range of mipmap levels that can be used for texture lookups with this texture.
-
-    \sa mipBaseLevel(), mipMaxLevel()
-*/
-QPair<int, int> QOpenGLTexture::mipLevelRange() const
-{
-    Q_D(const QOpenGLTexture);
-    return qMakePair(d->baseLevel, d->maxLevel);
-}
-
-/*!
-    If \a enabled is \c true, enables automatic mipmap generation for this texture object
-    to occur whenever the level 0 mipmap data is set via setData().
-
-    The automatic mipmap generation is enabled by default.
-
-    \note Mipmap generation is not supported for compressed textures with OpenGL ES 2.0.
-
-    \sa isAutoMipMapGenerationEnabled(), generateMipMaps()
-*/
-void QOpenGLTexture::setAutoMipMapGenerationEnabled(bool enabled)
-{
-    Q_D(QOpenGLTexture);
-    d->autoGenerateMipMaps = enabled;
-}
-
-/*!
-    Returns whether auto mipmap generation is enabled for this texture object.
-
-    \sa setAutoMipMapGenerationEnabled(), generateMipMaps()
-*/
-bool QOpenGLTexture::isAutoMipMapGenerationEnabled() const
-{
-    Q_D(const QOpenGLTexture);
-    return d->autoGenerateMipMaps;
-}
-
-/*!
-    Generates mipmaps for this texture object from mipmap level 0. If you are
-    using a texture target and filtering option that requires mipmaps and you
-    have disabled automatic mipmap generation then you need to call this function
-    or the overload to create the mipmap chain.
-
-    \note Mipmap generation is not supported for compressed textures with OpenGL ES.
-
-    \sa setAutoMipMapGenerationEnabled(), setMipLevels(), mipLevels()
-*/
-void QOpenGLTexture::generateMipMaps()
-{
-    Q_D(QOpenGLTexture);
-    Q_ASSERT(d->texFuncs);
-    Q_ASSERT(d->textureId);
-    if (isCompressedFormat(d->format)) {
-        if (QOpenGLContext *ctx = QOpenGLContext::currentContext())
-            if (ctx->isOpenGLES())
-                return;
-    }
-    d->texFuncs->glGenerateTextureMipmap(d->textureId, d->target, d->bindingTarget);
-}
-
-/*!
-    Generates mipmaps for this texture object from mipmap level \a baseLevel. If you are
-    using a texture target and filtering option that requires mipmaps and you
-    have disabled automatic mipmap generation then you need to call this function
-    or the overload to create the mipmap chain.
-
-    The generation of mipmaps to above \a baseLevel is achieved by setting the mipmap
-    base level to \a baseLevel and then generating the mipmap chain. If \a resetBaseLevel
-    is \c true, then the baseLevel of the texture will be reset to its previous value.
-
-    \sa setAutoMipMapGenerationEnabled(), setMipLevels(), mipLevels()
-*/
-void QOpenGLTexture::generateMipMaps(int baseLevel, bool resetBaseLevel)
-{
-    Q_D(QOpenGLTexture);
-    Q_ASSERT(d->texFuncs);
-    Q_ASSERT(d->textureId);
-    if (isCompressedFormat(d->format)) {
-        if (QOpenGLContext *ctx = QOpenGLContext::currentContext())
-            if (ctx->isOpenGLES())
-                return;
-    }
-    int oldBaseLevel;
-    if (resetBaseLevel)
-        oldBaseLevel = mipBaseLevel();
-    setMipBaseLevel(baseLevel);
-    d->texFuncs->glGenerateTextureMipmap(d->textureId, d->target, d->bindingTarget);
-    if (resetBaseLevel)
-        setMipBaseLevel(oldBaseLevel);
-}
-
-/*!
-    GLSL shaders are able to reorder the components of the vec4 returned by texture
-    functions. It is also desirable to be able to control this reordering from CPU
-    side code. This is made possible by swizzle masks since OpenGL 3.3.
-
-    Each component of the texture can be mapped to one of the SwizzleValue options.
-
-    This function maps \a component to the output \a value.
-
-    \note This function has no effect on Mac and Qt built for OpenGL ES 2.
-    \sa swizzleMask()
-*/
-void QOpenGLTexture::setSwizzleMask(SwizzleComponent component, SwizzleValue value)
-{
-#if !defined(Q_OS_MAC) && !defined(QT_OPENGL_ES_2)
-    if (!QOpenGLContext::currentContext()->isOpenGLES()) {
-        Q_D(QOpenGLTexture);
-        d->create();
-        Q_ASSERT(d->texFuncs);
-        Q_ASSERT(d->textureId);
-        if (!d->features.testFlag(Swizzle)) {
-            qWarning("QOpenGLTexture::setSwizzleMask() requires OpenGL >= 3.3");
-            return;
-        }
-        d->swizzleMask[component - SwizzleRed] = value;
-        d->texFuncs->glTextureParameteri(d->textureId, d->target, d->bindingTarget, component, value);
-        return;
-    }
-#else
-    Q_UNUSED(component);
-    Q_UNUSED(value);
-#endif
-    qWarning("QOpenGLTexture: Texture swizzling is not supported");
-}
-
-/*!
-    Parameters \a {r}, \a {g}, \a {b}, and \a {a}  are values used for setting
-    the colors red, green, blue, and the alpha value.
-    \overload
-*/
-void QOpenGLTexture::setSwizzleMask(SwizzleValue r, SwizzleValue g,
-                                    SwizzleValue b, SwizzleValue a)
-{
-#if !defined(Q_OS_MAC) && !defined(QT_OPENGL_ES_2)
-    if (!QOpenGLContext::currentContext()->isOpenGLES()) {
-        Q_D(QOpenGLTexture);
-        d->create();
-        Q_ASSERT(d->texFuncs);
-        Q_ASSERT(d->textureId);
-        if (!d->features.testFlag(Swizzle)) {
-            qWarning("QOpenGLTexture::setSwizzleMask() requires OpenGL >= 3.3");
-            return;
-        }
-        GLint swizzleMask[] = {GLint(r), GLint(g), GLint(b), GLint(a)};
-        d->swizzleMask[0] = r;
-        d->swizzleMask[1] = g;
-        d->swizzleMask[2] = b;
-        d->swizzleMask[3] = a;
-        d->texFuncs->glTextureParameteriv(d->textureId, d->target, d->bindingTarget, GL_TEXTURE_SWIZZLE_RGBA, swizzleMask);
-        return;
-    }
-#else
-    Q_UNUSED(r);
-    Q_UNUSED(g);
-    Q_UNUSED(b);
-    Q_UNUSED(a);
-#endif
-    qWarning("QOpenGLTexture: Texture swizzling is not supported");
-}
-
-/*!
-    Returns the swizzle mask for texture \a component.
-*/
-QOpenGLTexture::SwizzleValue QOpenGLTexture::swizzleMask(SwizzleComponent component) const
-{
-    Q_D(const QOpenGLTexture);
-    return d->swizzleMask[component - SwizzleRed];
-}
-
-/*!
-    \enum QOpenGLTexture::DepthStencilMode
-    \since 5.4
-    This enum specifies which component of a depth/stencil texture is
-    accessed when the texture is sampled.
-
-    \value DepthMode Equivalent to GL_DEPTH_COMPONENT.
-    \value StencilMode Equivalent to GL_STENCIL_INDEX.
-*/
-
-/*!
-    If using a texture that has a combined depth/stencil format this function sets
-    which component of the texture is accessed to \a mode.
-
-    When the parameter is set to DepthMode, then accessing it from the
-    shader will access the depth component as a single float, as normal. But when
-    the parameter is set to StencilMode, the shader will access the stencil component.
-
-    \note This function has no effect on Mac and Qt built for OpenGL ES 2.
-    \since 5.4
-    \sa depthStencilMode()
-*/
-void QOpenGLTexture::setDepthStencilMode(QOpenGLTexture::DepthStencilMode mode)
-{
-#if !defined(Q_OS_MAC) && !defined(QT_OPENGL_ES_2)
-    if (!QOpenGLContext::currentContext()->isOpenGLES()) {
-        Q_D(QOpenGLTexture);
-        d->create();
-        Q_ASSERT(d->texFuncs);
-        Q_ASSERT(d->textureId);
-        if (!d->features.testFlag(StencilTexturing)) {
-            qWarning("QOpenGLTexture::setDepthStencilMode() requires OpenGL >= 4.3 or GL_ARB_stencil_texturing");
-            return;
-        }
-        d->depthStencilMode = mode;
-        d->texFuncs->glTextureParameteri(d->textureId, d->target, d->bindingTarget, GL_DEPTH_STENCIL_TEXTURE_MODE, mode);
-        return;
-    }
-#else
-    Q_UNUSED(mode);
-#endif
-    qWarning("QOpenGLTexture: DepthStencil Mode is not supported");
-}
-
-/*!
-    Returns the depth stencil mode for textures using a combined depth/stencil format.
-
-    \since 5.4
-    \sa setDepthStencilMode()
-*/
-QOpenGLTexture::DepthStencilMode QOpenGLTexture::depthStencilMode() const
-{
-    Q_D(const QOpenGLTexture);
-    return d->depthStencilMode;
-}
-
-/*!
-    \enum QOpenGLTexture::ComparisonFunction
-    \since 5.5
-    This enum specifies which comparison operator is used when texture comparison
-    is enabled on this texture.
-
-    \value CompareLessEqual Equivalent to GL_LEQUAL.
-    \value CompareGreaterEqual Equivalent to GL_GEQUAL.
-    \value CompareLess Equivalent to GL_LESS.
-    \value CompareGreater Equivalent to GL_GREATER.
-    \value CompareEqual Equivalent to GL_EQUAL.
-    \value CommpareNotEqual Equivalent to GL_NOTEQUAL.
-    \value CompareAlways Equivalent to GL_ALWAYS.
-    \value CompareNever Equivalent to GL_NEVER.
-
-*/
-
-/*!
-    \since 5.5
-
-    Sets the texture comparison function on this texture to \a function. The texture
-    comparison function is used by shadow samplers when sampling a depth texture.
-
-    \sa comparisonFunction()
-*/
-void QOpenGLTexture::setComparisonFunction(QOpenGLTexture::ComparisonFunction function)
-{
-    Q_D(QOpenGLTexture);
-    d->create();
-    if (!d->features.testFlag(TextureComparisonOperators)) {
-        qWarning("QOpenGLTexture::setComparisonFunction: requires OpenGL >= 1.5 or OpenGL ES >= 3.0");
-        return;
-    }
-    d->comparisonFunction = function;
-    d->texFuncs->glTextureParameteri(d->textureId, d->target, d->bindingTarget, GL_TEXTURE_COMPARE_FUNC, function);
-}
-
-/*!
-    \since 5.5
-
-    Returns the texture comparison operator set on this texture. By default, a
-    texture has a CompareLessEqual comparison function.
-
-    \sa setComparisonFunction()
-*/
-QOpenGLTexture::ComparisonFunction QOpenGLTexture::comparisonFunction() const
-{
-    Q_D(const QOpenGLTexture);
-    return d->comparisonFunction;
-}
-
-/*!
-    \enum QOpenGLTexture::ComparisonMode
-    \since 5.5
-    This enum specifies which comparison mode is used when sampling this texture.
-
-    \value CompareRefToTexture Equivalent to GL_COMPARE_REF_TO_TEXTURE.
-    \value CompareNone Equivalent to GL_NONE.
-*/
-
-/*!
-    \since 5.5
-
-    Sets the texture comparison mode on this texture to \a mode. The texture
-    comparison mode is used by shadow samplers when sampling a depth texture.
-
-    \sa comparisonMode()
-*/
-void QOpenGLTexture::setComparisonMode(QOpenGLTexture::ComparisonMode mode)
-{
-    Q_D(QOpenGLTexture);
-    d->create();
-    if (!d->features.testFlag(TextureComparisonOperators)) {
-        qWarning("QOpenGLTexture::setComparisonMode: requires OpenGL >= 1.5 or OpenGL ES >= 3.0");
-        return;
-    }
-    d->comparisonMode = mode;
-    d->texFuncs->glTextureParameteri(d->textureId, d->target, d->bindingTarget, GL_TEXTURE_COMPARE_MODE, mode);
-}
-
-/*!
-    \since 5.5
-
-    Returns the texture comparison mode set on this texture. By default, a
-    texture has a CompareNone comparison mode (i.e. comparisons are disabled).
-
-    \sa setComparisonMode()
-*/
-QOpenGLTexture::ComparisonMode QOpenGLTexture::comparisonMode() const
-{
-    Q_D(const QOpenGLTexture);
-    return d->comparisonMode;
-}
-
-/*!
-    Sets the filter used for minification to \a filter.
-
-    \sa minificationFilter(), setMagnificationFilter(), setMinMagFilters()
-*/
-void QOpenGLTexture::setMinificationFilter(QOpenGLTexture::Filter filter)
-{
-    Q_D(QOpenGLTexture);
-    d->create();
-    Q_ASSERT(d->texFuncs);
-    Q_ASSERT(d->textureId);
-    d->minFilter = filter;
-    d->texFuncs->glTextureParameteri(d->textureId, d->target, d->bindingTarget, GL_TEXTURE_MIN_FILTER, filter);
-}
-
-/*!
-    Returns the minification filter.
-
-    \sa setMinificationFilter()
-*/
-QOpenGLTexture::Filter QOpenGLTexture::minificationFilter() const
-{
-    Q_D(const QOpenGLTexture);
-    return d->minFilter;
-}
-
-/*!
-    Sets the magnification filter to \a filter.
-
-    \sa magnificationFilter(), setMinificationFilter(), setMinMagFilters()
-*/
-void QOpenGLTexture::setMagnificationFilter(QOpenGLTexture::Filter filter)
-{
-    Q_D(QOpenGLTexture);
-    d->create();
-    Q_ASSERT(d->texFuncs);
-    Q_ASSERT(d->textureId);
-    d->magFilter = filter;
-    d->texFuncs->glTextureParameteri(d->textureId, d->target, d->bindingTarget, GL_TEXTURE_MAG_FILTER, filter);
-}
-
-/*!
-    Returns the magnification filter.
-
-    \sa setMagnificationFilter()
-*/
-QOpenGLTexture::Filter QOpenGLTexture::magnificationFilter() const
-{
-    Q_D(const QOpenGLTexture);
-    return d->magFilter;
-}
-
-/*!
-    Sets the minification filter to \a minificationFilter and the magnification filter
-    to \a magnificationFilter.
-
-    \sa minMagFilters(), setMinificationFilter(), setMagnificationFilter()
-*/
-void QOpenGLTexture::setMinMagFilters(QOpenGLTexture::Filter minificationFilter,
-                                      QOpenGLTexture::Filter magnificationFilter)
-{
-    Q_D(QOpenGLTexture);
-    d->create();
-    Q_ASSERT(d->texFuncs);
-    Q_ASSERT(d->textureId);
-    d->minFilter = minificationFilter;
-    d->magFilter = magnificationFilter;
-    d->texFuncs->glTextureParameteri(d->textureId, d->target, d->bindingTarget, GL_TEXTURE_MIN_FILTER, minificationFilter);
-    d->texFuncs->glTextureParameteri(d->textureId, d->target, d->bindingTarget, GL_TEXTURE_MAG_FILTER, magnificationFilter);
-}
-
-/*!
-    Returns the current minification and magnification filters.
-
-    \sa setMinMagFilters()
-*/
-QPair<QOpenGLTexture::Filter, QOpenGLTexture::Filter> QOpenGLTexture::minMagFilters() const
-{
-    Q_D(const QOpenGLTexture);
-    return QPair<QOpenGLTexture::Filter, QOpenGLTexture::Filter>(d->minFilter, d->magFilter);
-}
-
-/*!
-    If your OpenGL implementation supports the GL_EXT_texture_filter_anisotropic extension
-    this function sets the maximum anisotropy level to \a anisotropy.
-
-    \sa maximumAnisotropy()
-*/
-void QOpenGLTexture::setMaximumAnisotropy(float anisotropy)
-{
-    Q_D(QOpenGLTexture);
-    d->create();
-    Q_ASSERT(d->texFuncs);
-    Q_ASSERT(d->textureId);
-    if (!d->features.testFlag(AnisotropicFiltering)) {
-        qWarning("QOpenGLTexture::setMaximumAnisotropy() requires GL_EXT_texture_filter_anisotropic");
-        return;
-    }
-    d->maxAnisotropy = anisotropy;
-    d->texFuncs->glTextureParameteri(d->textureId, d->target, d->bindingTarget, GL_TEXTURE_MAX_ANISOTROPY_EXT, anisotropy);
-}
-
-/*!
-    Returns the maximum level of anisotropy to be accounted for when performing texture lookups.
-    This requires the GL_EXT_texture_filter_anisotropic extension.
-
-    \sa setMaximumAnisotropy()
-*/
-float QOpenGLTexture::maximumAnisotropy() const
-{
-    Q_D(const QOpenGLTexture);
-    return d->maxAnisotropy;
-}
-
-/*!
-    Sets the wrap (or repeat mode) for all texture dimentions to \a mode.
-
-    \sa wrapMode()
-*/
-void QOpenGLTexture::setWrapMode(QOpenGLTexture::WrapMode mode)
-{
-    Q_D(QOpenGLTexture);
-    d->create();
-    Q_ASSERT(d->texFuncs);
-    Q_ASSERT(d->textureId);
-    d->setWrapMode(mode);
-}
-
-/*!
-    Holds the texture dimension \a direction.
-    \overload
-*/
-void QOpenGLTexture::setWrapMode(QOpenGLTexture::CoordinateDirection direction, QOpenGLTexture::WrapMode mode)
-{
-    Q_D(QOpenGLTexture);
-    d->create();
-    Q_ASSERT(d->texFuncs);
-    Q_ASSERT(d->textureId);
-    d->setWrapMode(direction, mode);
-}
-
-/*!
-    Returns the wrap mode for the texture dimension \a direction.
-
-    \sa setWrapMode()
-*/
-QOpenGLTexture::WrapMode QOpenGLTexture::wrapMode(QOpenGLTexture::CoordinateDirection direction) const
-{
-    Q_D(const QOpenGLTexture);
-    return d->wrapMode(direction);
-}
-
-/*!
-    Sets the border color of the texture to \a color.
-
-    \note This function has no effect on Mac and Qt built for OpenGL ES 2.
-    \sa borderColor()
-*/
-void QOpenGLTexture::setBorderColor(QColor color)
-{
-    setBorderColor(static_cast<float>(color.redF()), static_cast<float>(color.greenF()),
-                   static_cast<float>(color.blueF()), static_cast<float>(color.alphaF()));
-}
-
-/*!
-    Sets the color red to \a {r}, green to \a {g}, blue to \a {b}, and \a {a} to the
-    alpha value.
-    \overload
-*/
-void QOpenGLTexture::setBorderColor(float r, float g, float b, float a)
-{
-#if !defined(QT_OPENGL_ES_2)
-    if (!QOpenGLContext::currentContext()->isOpenGLES()) {
-        Q_D(QOpenGLTexture);
-        d->create();
-        Q_ASSERT(d->texFuncs);
-        Q_ASSERT(d->textureId);
-        float values[4];
-        values[0] = r;
-        values[1] = g;
-        values[2] = b;
-        values[3] = a;
-        d->borderColor.clear();
-        for (int i = 0; i < 4; ++i)
-            d->borderColor.append(QVariant(values[i]));
-        d->texFuncs->glTextureParameterfv(d->textureId, d->target, d->bindingTarget, GL_TEXTURE_BORDER_COLOR, values);
-        return;
-    }
-#else
-    Q_UNUSED(r);
-    Q_UNUSED(g);
-    Q_UNUSED(b);
-    Q_UNUSED(a);
-#endif
-    qWarning("QOpenGLTexture: Border color is not supported");
-}
-
-/*!
-    Sets the color red to \a {r}, green to \a {g}, blue to \a {b}, and the alpha
-    value to \a {a}.
-    \overload
-*/
-void QOpenGLTexture::setBorderColor(int r, int g, int b, int a)
-{
-#if !defined(QT_OPENGL_ES_2)
-    if (!QOpenGLContext::currentContext()->isOpenGLES()) {
-        Q_D(QOpenGLTexture);
-        d->create();
-        Q_ASSERT(d->texFuncs);
-        Q_ASSERT(d->textureId);
-        int values[4];
-        values[0] = r;
-        values[1] = g;
-        values[2] = b;
-        values[3] = a;
-        d->borderColor.clear();
-        for (int i = 0; i < 4; ++i)
-            d->borderColor.append(QVariant(values[i]));
-        d->texFuncs->glTextureParameteriv(d->textureId, d->target, d->bindingTarget, GL_TEXTURE_BORDER_COLOR, values);
-        return;
-    }
-#else
-    Q_UNUSED(r);
-    Q_UNUSED(g);
-    Q_UNUSED(b);
-    Q_UNUSED(a);
-#endif
-    qWarning("QOpenGLTexture: Border color is not supported");
-
-    // TODO Handle case of using glTextureParameterIiv() based on format
-}
-
-/*!
-    Sets the color red to \a {r}, green to \a {g}, blue to \a {b}, and the alpha
-    value to \a {a}.
-    \overload
-*/
-void QOpenGLTexture::setBorderColor(uint r, uint g, uint b, uint a)
-{
-#if !defined(QT_OPENGL_ES_2)
-    if (!QOpenGLContext::currentContext()->isOpenGLES()) {
-        Q_D(QOpenGLTexture);
-        d->create();
-        Q_ASSERT(d->texFuncs);
-        Q_ASSERT(d->textureId);
-        int values[4];
-        values[0] = int(r);
-        values[1] = int(g);
-        values[2] = int(b);
-        values[3] = int(a);
-        d->borderColor.clear();
-        for (int i = 0; i < 4; ++i)
-            d->borderColor.append(QVariant(values[i]));
-        d->texFuncs->glTextureParameteriv(d->textureId, d->target, d->bindingTarget, GL_TEXTURE_BORDER_COLOR, values);
-        return;
-    }
-#else
-    Q_UNUSED(r);
-    Q_UNUSED(g);
-    Q_UNUSED(b);
-    Q_UNUSED(a);
-#endif
-    qWarning("QOpenGLTexture: Border color is not supported");
-
-    // TODO Handle case of using glTextureParameterIuiv() based on format
-}
-
-/*!
-    Returns the borderColor of this texture.
-
-    \sa setBorderColor()
-*/
-QColor QOpenGLTexture::borderColor() const
-{
-    Q_D(const QOpenGLTexture);
-    QColor c(0.0f, 0.0f, 0.0f, 0.0f);
-    if (!d->borderColor.isEmpty()) {
-        c.setRedF(d->borderColor.at(0).toFloat());
-        c.setGreenF(d->borderColor.at(1).toFloat());
-        c.setBlueF(d->borderColor.at(2).toFloat());
-        c.setAlphaF(d->borderColor.at(3).toFloat());
-    }
-    return c;
-}
-
-/*!
-    Writes the texture border color into the first four elements
-    of the array pointed to by \a border.
-
-    \sa setBorderColor()
-*/
-void QOpenGLTexture::borderColor(float *border) const
-{
-    Q_D(const QOpenGLTexture);
-    Q_ASSERT(border);
-    if (d->borderColor.isEmpty()) {
-        for (int i = 0; i < 4; ++i)
-            border[i] = 0.0f;
-    } else {
-        for (int i = 0; i < 4; ++i)
-            border[i] = d->borderColor.at(i).toFloat();
-    }
-}
-
-/*!
-    Writes the texture border color into the first four elements
-    of the array pointed to by \a border.
-
-    \overload
-*/
-void QOpenGLTexture::borderColor(int *border) const
-{
-    Q_D(const QOpenGLTexture);
-    Q_ASSERT(border);
-    if (d->borderColor.isEmpty()) {
-        for (int i = 0; i < 4; ++i)
-            border[i] = 0;
-    } else {
-        for (int i = 0; i < 4; ++i)
-            border[i] = d->borderColor.at(i).toInt();
-    }
-}
-
-/*!
-    Writes the texture border color into the first four elements
-    of the array pointed to by \a border.
-
-    \overload
-*/
-void QOpenGLTexture::borderColor(unsigned int *border) const
-{
-    Q_D(const QOpenGLTexture);
-    Q_ASSERT(border);
-    if (d->borderColor.isEmpty()) {
-        for (int i = 0; i < 4; ++i)
-            border[i] = 0;
-    } else {
-        for (int i = 0; i < 4; ++i)
-            border[i] = d->borderColor.at(i).toUInt();
-    }
-}
-
-/*!
-    Sets the minimum level of detail to \a value. This limits the selection of highest
-    resolution mipmap (lowest mipmap level). The default value is -1000.
-
-    \note This function has no effect on Qt built for OpenGL ES 2.
-    \sa minimumLevelOfDetail(), setMaximumLevelOfDetail(), setLevelOfDetailRange()
-*/
-void QOpenGLTexture::setMinimumLevelOfDetail(float value)
-{
-#if !defined(QT_OPENGL_ES_2)
-    if (!QOpenGLContext::currentContext()->isOpenGLES()) {
-        Q_D(QOpenGLTexture);
-        d->create();
-        Q_ASSERT(d->texFuncs);
-        Q_ASSERT(d->textureId);
-        Q_ASSERT(value < d->maxLevelOfDetail);
-        d->minLevelOfDetail = value;
-        d->texFuncs->glTextureParameterf(d->textureId, d->target, d->bindingTarget, GL_TEXTURE_MIN_LOD, value);
-        return;
-    }
-#else
-    Q_UNUSED(value);
-#endif
-    qWarning("QOpenGLTexture: Detail level is not supported");
-}
-
-/*!
-    Returns the minimum level of detail parameter.
-
-    \sa setMinimumLevelOfDetail(), maximumLevelOfDetail(), levelOfDetailRange()
-*/
-float QOpenGLTexture::minimumLevelOfDetail() const
-{
-    Q_D(const QOpenGLTexture);
-    return d->minLevelOfDetail;
-}
-
-/*!
-    Sets the maximum level of detail to \a value. This limits the selection of lowest
-    resolution mipmap (highest mipmap level). The default value is 1000.
-
-    \note This function has no effect on Qt built for OpenGL ES 2.
-    \sa maximumLevelOfDetail(), setMinimumLevelOfDetail(), setLevelOfDetailRange()
-*/
-void QOpenGLTexture::setMaximumLevelOfDetail(float value)
-{
-#if !defined(QT_OPENGL_ES_2)
-    if (!QOpenGLContext::currentContext()->isOpenGLES()) {
-        Q_D(QOpenGLTexture);
-        d->create();
-        Q_ASSERT(d->texFuncs);
-        Q_ASSERT(d->textureId);
-        Q_ASSERT(value > d->minLevelOfDetail);
-        d->maxLevelOfDetail = value;
-        d->texFuncs->glTextureParameterf(d->textureId, d->target, d->bindingTarget, GL_TEXTURE_MAX_LOD, value);
-        return;
-    }
-#else
-    Q_UNUSED(value);
-#endif
-    qWarning("QOpenGLTexture: Detail level is not supported");
-}
-
-/*!
-    Returns the maximum level of detail parameter.
-
-    \sa setMaximumLevelOfDetail(), minimumLevelOfDetail(), levelOfDetailRange()
-*/
-float QOpenGLTexture::maximumLevelOfDetail() const
-{
-    Q_D(const QOpenGLTexture);
-    return d->maxLevelOfDetail;
-}
-
-/*!
-    Sets the minimum level of detail parameters to \a min and the maximum level
-    to \a max.
-    \note This function has no effect on Qt built for OpenGL ES 2.
-    \sa levelOfDetailRange(), setMinimumLevelOfDetail(), setMaximumLevelOfDetail()
-*/
-void QOpenGLTexture::setLevelOfDetailRange(float min, float max)
-{
-#if !defined(QT_OPENGL_ES_2)
-    if (!QOpenGLContext::currentContext()->isOpenGLES()) {
-        Q_D(QOpenGLTexture);
-        d->create();
-        Q_ASSERT(d->texFuncs);
-        Q_ASSERT(d->textureId);
-        Q_ASSERT(min < max);
-        d->minLevelOfDetail = min;
-        d->maxLevelOfDetail = max;
-        d->texFuncs->glTextureParameterf(d->textureId, d->target, d->bindingTarget, GL_TEXTURE_MIN_LOD, min);
-        d->texFuncs->glTextureParameterf(d->textureId, d->target, d->bindingTarget, GL_TEXTURE_MAX_LOD, max);
-        return;
-    }
-#else
-    Q_UNUSED(min);
-    Q_UNUSED(max);
-#endif
-    qWarning("QOpenGLTexture: Detail level is not supported");
-}
-
-/*!
-    Returns the minimum and maximum level of detail parameters.
-
-    \sa setLevelOfDetailRange(), minimumLevelOfDetail(), maximumLevelOfDetail()
-*/
-QPair<float, float> QOpenGLTexture::levelOfDetailRange() const
-{
-    Q_D(const QOpenGLTexture);
-    return qMakePair(d->minLevelOfDetail, d->maxLevelOfDetail);
-}
-
-/*!
-    Sets the level of detail bias to \a bias.
-    Level of detail bias affects the point at which mipmapping levels change.
-    Increasing values for level of detail bias makes the overall images blurrier
-    or smoother. Decreasing values make the overall images sharper.
-
-    \note This function has no effect on Qt built for OpenGL ES 2.
-    \sa levelofDetailBias()
-*/
-void QOpenGLTexture::setLevelofDetailBias(float bias)
-{
-#if !defined(QT_OPENGL_ES_2)
-    if (!QOpenGLContext::currentContext()->isOpenGLES()) {
-        Q_D(QOpenGLTexture);
-        d->create();
-        Q_ASSERT(d->texFuncs);
-        Q_ASSERT(d->textureId);
-        d->levelOfDetailBias = bias;
-        d->texFuncs->glTextureParameterf(d->textureId, d->target, d->bindingTarget, GL_TEXTURE_LOD_BIAS, bias);
-        return;
-    }
-#else
-    Q_UNUSED(bias);
-#endif
-    qWarning("QOpenGLTexture: Detail level is not supported");
-}
-
-/*!
-    Returns the level of detail bias parameter.
-
-    \sa setLevelofDetailBias()
-*/
-float QOpenGLTexture::levelofDetailBias() const
-{
-    Q_D(const QOpenGLTexture);
-    return d->levelOfDetailBias;
-}
-
-#ifndef QT_NO_DEBUG_STREAM
-QDebug operator<<(QDebug debug, const QOpenGLTexture *t)
-{
-    QDebugStateSaver saver(debug);
-    debug.nospace();
-    debug << "QOpenGLTexture(";
-    if (t) {
-        const QOpenGLTexturePrivate *d = t->d_ptr.data();
-        debug << d->target << ", bindingTarget=" << d->bindingTarget
-            << ", size=[" << d->dimensions[0]
-            << ", " << d->dimensions[1];
-        if (d->target == QOpenGLTexture::Target3D)
-            debug << ", " << d->dimensions[2];
-        debug << "], format=" << d->format << ", formatClass=" << d->formatClass;
-        if (t->isCreated())
-            debug << ", textureId=" << d->textureId;
-        if (t->isBound())
-            debug << ", [bound]";
-        if (t->isTextureView())
-            debug << ", [view]";
-        if (d->fixedSamplePositions)
-            debug << ", [fixedSamplePositions]";
-        debug << ", mipLevels=" << d->requestedMipLevels << ", layers=" << d->layers
-            << ", faces=" << d->faces << ", samples=" << d->samples
-            << ", depthStencilMode=" << d->depthStencilMode << ", comparisonFunction="
-            << d->comparisonFunction << ", comparisonMode=" << d->comparisonMode
-            << ", features=" << d->features << ", minificationFilter=" << d->minFilter
-            << ", magnificationFilter=" << d->magFilter << ", wrapMode=" << d->wrapModes[0];
-    } else {
-        debug << '0';
-    }
-    debug << ')';
-    return debug;
-}
-#endif // QT_NO_DEBUG_STREAM
-
-QT_END_NAMESPACE
diff --git a/src/gui/opengl/qopengltexture.h b/src/gui/opengl/qopengltexture.h
deleted file mode 100644
index 7d984babc8..0000000000
--- a/src/gui/opengl/qopengltexture.h
+++ /dev/null
@@ -1,663 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB).
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtGui module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QOPENGLABSTRACTTEXTURE_H
-#define QOPENGLABSTRACTTEXTURE_H
-
-#include <QtGui/qtguiglobal.h>
-
-#ifndef QT_NO_OPENGL
-
-#include <QtGui/qopengl.h>
-#include <QtGui/qimage.h>
-#include <QtCore/QScopedPointer>
-
-QT_BEGIN_NAMESPACE
-
-class QDebug;
-class QOpenGLTexturePrivate;
-class QOpenGLPixelTransferOptions;
-
-class Q_GUI_EXPORT QOpenGLTexture
-{
-    Q_GADGET
-public:
-    enum Target {
-        Target1D                   = 0x0DE0,    // GL_TEXTURE_1D
-        Target1DArray              = 0x8C18,    // GL_TEXTURE_1D_ARRAY
-        Target2D                   = 0x0DE1,    // GL_TEXTURE_2D
-        Target2DArray              = 0x8C1A,    // GL_TEXTURE_2D_ARRAY
-        Target3D                   = 0x806F,    // GL_TEXTURE_3D
-        TargetCubeMap              = 0x8513,    // GL_TEXTURE_CUBE_MAP
-        TargetCubeMapArray         = 0x9009,    // GL_TEXTURE_CUBE_MAP_ARRAY
-        Target2DMultisample        = 0x9100,    // GL_TEXTURE_2D_MULTISAMPLE
-        Target2DMultisampleArray   = 0x9102,    // GL_TEXTURE_2D_MULTISAMPLE_ARRAY
-        TargetRectangle            = 0x84F5,    // GL_TEXTURE_RECTANGLE
-        TargetBuffer               = 0x8C2A     // GL_TEXTURE_BUFFER
-    };
-    Q_ENUM(Target)
-
-    enum BindingTarget {
-        BindingTarget1D                    = 0x8068,   // GL_TEXTURE_BINDING_1D
-        BindingTarget1DArray               = 0x8C1C,   // GL_TEXTURE_BINDING_1D_ARRAY
-        BindingTarget2D                    = 0x8069,   // GL_TEXTURE_BINDING_2D
-        BindingTarget2DArray               = 0x8C1D,   // GL_TEXTURE_BINDING_2D_ARRAY
-        BindingTarget3D                    = 0x806A,   // GL_TEXTURE_BINDING_3D
-        BindingTargetCubeMap               = 0x8514,   // GL_TEXTURE_BINDING_CUBE_MAP
-        BindingTargetCubeMapArray          = 0x900A,   // GL_TEXTURE_BINDING_CUBE_MAP_ARRAY
-        BindingTarget2DMultisample         = 0x9104,   // GL_TEXTURE_BINDING_2D_MULTISAMPLE
-        BindingTarget2DMultisampleArray    = 0x9105,   // GL_TEXTURE_BINDING_2D_MULTISAMPLE_ARRAY
-        BindingTargetRectangle             = 0x84F6,   // GL_TEXTURE_BINDING_RECTANGLE
-        BindingTargetBuffer                = 0x8C2C    // GL_TEXTURE_BINDING_BUFFER
-    };
-    Q_ENUM(BindingTarget)
-
-    enum MipMapGeneration {
-        GenerateMipMaps,
-        DontGenerateMipMaps
-    };
-    Q_ENUM(MipMapGeneration)
-
-    enum TextureUnitReset {
-        ResetTextureUnit,
-        DontResetTextureUnit
-    };
-    Q_ENUM(TextureUnitReset)
-
-    enum TextureFormat {
-        NoFormat               = 0,         // GL_NONE
-
-        // Unsigned normalized formats
-        R8_UNorm               = 0x8229,    // GL_R8
-        RG8_UNorm              = 0x822B,    // GL_RG8
-        RGB8_UNorm             = 0x8051,    // GL_RGB8
-        RGBA8_UNorm            = 0x8058,    // GL_RGBA8
-
-        R16_UNorm              = 0x822A,    // GL_R16
-        RG16_UNorm             = 0x822C,    // GL_RG16
-        RGB16_UNorm            = 0x8054,    // GL_RGB16
-        RGBA16_UNorm           = 0x805B,    // GL_RGBA16
-
-        // Signed normalized formats
-        R8_SNorm               = 0x8F94,    // GL_R8_SNORM
-        RG8_SNorm              = 0x8F95,    // GL_RG8_SNORM
-        RGB8_SNorm             = 0x8F96,    // GL_RGB8_SNORM
-        RGBA8_SNorm            = 0x8F97,    // GL_RGBA8_SNORM
-
-        R16_SNorm              = 0x8F98,    // GL_R16_SNORM
-        RG16_SNorm             = 0x8F99,    // GL_RG16_SNORM
-        RGB16_SNorm            = 0x8F9A,    // GL_RGB16_SNORM
-        RGBA16_SNorm           = 0x8F9B,    // GL_RGBA16_SNORM
-
-        // Unsigned integer formats
-        R8U                    = 0x8232,    // GL_R8UI
-        RG8U                   = 0x8238,    // GL_RG8UI
-        RGB8U                  = 0x8D7D,    // GL_RGB8UI
-        RGBA8U                 = 0x8D7C,    // GL_RGBA8UI
-
-        R16U                   = 0x8234,    // GL_R16UI
-        RG16U                  = 0x823A,    // GL_RG16UI
-        RGB16U                 = 0x8D77,    // GL_RGB16UI
-        RGBA16U                = 0x8D76,    // GL_RGBA16UI
-
-        R32U                   = 0x8236,    // GL_R32UI
-        RG32U                  = 0x823C,    // GL_RG32UI
-        RGB32U                 = 0x8D71,    // GL_RGB32UI
-        RGBA32U                = 0x8D70,    // GL_RGBA32UI
-
-        // Signed integer formats
-        R8I                    = 0x8231,    // GL_R8I
-        RG8I                   = 0x8237,    // GL_RG8I
-        RGB8I                  = 0x8D8F,    // GL_RGB8I
-        RGBA8I                 = 0x8D8E,    // GL_RGBA8I
-
-        R16I                   = 0x8233,    // GL_R16I
-        RG16I                  = 0x8239,    // GL_RG16I
-        RGB16I                 = 0x8D89,    // GL_RGB16I
-        RGBA16I                = 0x8D88,    // GL_RGBA16I
-
-        R32I                   = 0x8235,    // GL_R32I
-        RG32I                  = 0x823B,    // GL_RG32I
-        RGB32I                 = 0x8D83,    // GL_RGB32I
-        RGBA32I                = 0x8D82,    // GL_RGBA32I
-
-        // Floating point formats
-        R16F                   = 0x822D,    // GL_R16F
-        RG16F                  = 0x822F,    // GL_RG16F
-        RGB16F                 = 0x881B,    // GL_RGB16F
-        RGBA16F                = 0x881A,    // GL_RGBA16F
-
-        R32F                   = 0x822E,    // GL_R32F
-        RG32F                  = 0x8230,    // GL_RG32F
-        RGB32F                 = 0x8815,    // GL_RGB32F
-        RGBA32F                = 0x8814,    // GL_RGBA32F
-
-        // Packed formats
-        RGB9E5                 = 0x8C3D,    // GL_RGB9_E5
-        RG11B10F               = 0x8C3A,    // GL_R11F_G11F_B10F
-        RG3B2                  = 0x2A10,    // GL_R3_G3_B2
-        R5G6B5                 = 0x8D62,    // GL_RGB565
-        RGB5A1                 = 0x8057,    // GL_RGB5_A1
-        RGBA4                  = 0x8056,    // GL_RGBA4
-        RGB10A2                = 0x906F,    // GL_RGB10_A2UI
-
-        // Depth formats
-        D16                    = 0x81A5,    // GL_DEPTH_COMPONENT16
-        D24                    = 0x81A6,    // GL_DEPTH_COMPONENT24
-        D24S8                  = 0x88F0,    // GL_DEPTH24_STENCIL8
-        D32                    = 0x81A7,    // GL_DEPTH_COMPONENT32
-        D32F                   = 0x8CAC,    // GL_DEPTH_COMPONENT32F
-        D32FS8X24              = 0x8CAD,    // GL_DEPTH32F_STENCIL8
-        S8                     = 0x8D48,    // GL_STENCIL_INDEX8
-
-        // Compressed formats
-        RGB_DXT1               = 0x83F0,    // GL_COMPRESSED_RGB_S3TC_DXT1_EXT
-        RGBA_DXT1              = 0x83F1,    // GL_COMPRESSED_RGBA_S3TC_DXT1_EXT
-        RGBA_DXT3              = 0x83F2,    // GL_COMPRESSED_RGBA_S3TC_DXT3_EXT
-        RGBA_DXT5              = 0x83F3,    // GL_COMPRESSED_RGBA_S3TC_DXT5_EXT
-        R_ATI1N_UNorm          = 0x8DBB,    // GL_COMPRESSED_RED_RGTC1
-        R_ATI1N_SNorm          = 0x8DBC,    // GL_COMPRESSED_SIGNED_RED_RGTC1
-        RG_ATI2N_UNorm         = 0x8DBD,    // GL_COMPRESSED_RG_RGTC2
-        RG_ATI2N_SNorm         = 0x8DBE,    // GL_COMPRESSED_SIGNED_RG_RGTC2
-        RGB_BP_UNSIGNED_FLOAT  = 0x8E8F,    // GL_COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT_ARB
-        RGB_BP_SIGNED_FLOAT    = 0x8E8E,    // GL_COMPRESSED_RGB_BPTC_SIGNED_FLOAT_ARB
-        RGB_BP_UNorm           = 0x8E8C,    // GL_COMPRESSED_RGBA_BPTC_UNORM_ARB
-        R11_EAC_UNorm          = 0x9270,    // GL_COMPRESSED_R11_EAC
-        R11_EAC_SNorm          = 0x9271,    // GL_COMPRESSED_SIGNED_R11_EAC
-        RG11_EAC_UNorm         = 0x9272,    // GL_COMPRESSED_RG11_EAC
-        RG11_EAC_SNorm         = 0x9273,    // GL_COMPRESSED_SIGNED_RG11_EAC
-        RGB8_ETC2              = 0x9274,    // GL_COMPRESSED_RGB8_ETC2
-        SRGB8_ETC2             = 0x9275,    // GL_COMPRESSED_SRGB8_ETC2
-        RGB8_PunchThrough_Alpha1_ETC2 = 0x9276, // GL_COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_ETC2
-        SRGB8_PunchThrough_Alpha1_ETC2 = 0x9277, // GL_COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_ETC2
-        RGBA8_ETC2_EAC         = 0x9278,    // GL_COMPRESSED_RGBA8_ETC2_EAC
-        SRGB8_Alpha8_ETC2_EAC  = 0x9279,    // GL_COMPRESSED_SRGB8_ALPHA8_ETC2_EAC
-        RGB8_ETC1              = 0x8D64,    // GL_ETC1_RGB8_OES
-        RGBA_ASTC_4x4          = 0x93B0,    // GL_COMPRESSED_RGBA_ASTC_4x4_KHR
-        RGBA_ASTC_5x4          = 0x93B1,    // GL_COMPRESSED_RGBA_ASTC_5x4_KHR
-        RGBA_ASTC_5x5          = 0x93B2,    // GL_COMPRESSED_RGBA_ASTC_5x5_KHR
-        RGBA_ASTC_6x5          = 0x93B3,    // GL_COMPRESSED_RGBA_ASTC_6x5_KHR
-        RGBA_ASTC_6x6          = 0x93B4,    // GL_COMPRESSED_RGBA_ASTC_6x6_KHR
-        RGBA_ASTC_8x5          = 0x93B5,    // GL_COMPRESSED_RGBA_ASTC_8x5_KHR
-        RGBA_ASTC_8x6          = 0x93B6,    // GL_COMPRESSED_RGBA_ASTC_8x6_KHR
-        RGBA_ASTC_8x8          = 0x93B7,    // GL_COMPRESSED_RGBA_ASTC_8x8_KHR
-        RGBA_ASTC_10x5         = 0x93B8,    // GL_COMPRESSED_RGBA_ASTC_10x5_KHR
-        RGBA_ASTC_10x6         = 0x93B9,    // GL_COMPRESSED_RGBA_ASTC_10x6_KHR
-        RGBA_ASTC_10x8         = 0x93BA,    // GL_COMPRESSED_RGBA_ASTC_10x8_KHR
-        RGBA_ASTC_10x10        = 0x93BB,    // GL_COMPRESSED_RGBA_ASTC_10x10_KHR
-        RGBA_ASTC_12x10        = 0x93BC,    // GL_COMPRESSED_RGBA_ASTC_12x10_KHR
-        RGBA_ASTC_12x12        = 0x93BD,    // GL_COMPRESSED_RGBA_ASTC_12x12_KHR
-        SRGB8_Alpha8_ASTC_4x4  = 0x93D0,    // GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x4_KHR
-        SRGB8_Alpha8_ASTC_5x4  = 0x93D1,    // GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x4_KHR
-        SRGB8_Alpha8_ASTC_5x5  = 0x93D2,    // GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x5_KHR
-        SRGB8_Alpha8_ASTC_6x5  = 0x93D3,    // GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x5_KHR
-        SRGB8_Alpha8_ASTC_6x6  = 0x93D4,    // GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x6_KHR
-        SRGB8_Alpha8_ASTC_8x5  = 0x93D5,    // GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x5_KHR
-        SRGB8_Alpha8_ASTC_8x6  = 0x93D6,    // GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x6_KHR
-        SRGB8_Alpha8_ASTC_8x8  = 0x93D7,    // GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x8_KHR
-        SRGB8_Alpha8_ASTC_10x5 = 0x93D8,    // GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x5_KHR
-        SRGB8_Alpha8_ASTC_10x6 = 0x93D9,    // GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x6_KHR
-        SRGB8_Alpha8_ASTC_10x8 = 0x93DA,    // GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x8_KHR
-        SRGB8_Alpha8_ASTC_10x10 = 0x93DB,   // GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x10_KHR
-        SRGB8_Alpha8_ASTC_12x10 = 0x93DC,   // GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x10_KHR
-        SRGB8_Alpha8_ASTC_12x12 = 0x93DD,   // GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x12_KHR
-
-        // sRGB formats
-        SRGB8                  = 0x8C41,    // GL_SRGB8
-        SRGB8_Alpha8           = 0x8C43,    // GL_SRGB8_ALPHA8
-        SRGB_DXT1              = 0x8C4C,    // GL_COMPRESSED_SRGB_S3TC_DXT1_EXT
-        SRGB_Alpha_DXT1        = 0x8C4D,    // GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT
-        SRGB_Alpha_DXT3        = 0x8C4E,    // GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT
-        SRGB_Alpha_DXT5        = 0x8C4F,    // GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT
-        SRGB_BP_UNorm          = 0x8E8D,    // GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM_ARB
-
-        // ES 2 formats
-        DepthFormat            = 0x1902,    // GL_DEPTH_COMPONENT
-        AlphaFormat            = 0x1906,    // GL_ALPHA
-        RGBFormat              = 0x1907,    // GL_RGB
-        RGBAFormat             = 0x1908,    // GL_RGBA
-        LuminanceFormat        = 0x1909,    // GL_LUMINANCE
-        LuminanceAlphaFormat   = 0x190A
-
-    };
-    Q_ENUM(TextureFormat)
-
-    // This is not used externally yet but is reserved to allow checking of
-    // compatibility between texture formats
-#ifndef Q_QDOC
-    enum TextureFormatClass {
-        NoFormatClass,
-        FormatClass_128Bit,
-        FormatClass_96Bit,
-        FormatClass_64Bit,
-        FormatClass_48Bit,
-        FormatClass_32Bit,
-        FormatClass_24Bit,
-        FormatClass_16Bit,
-        FormatClass_8Bit,
-        FormatClass_RGTC1_R,
-        FormatClass_RGTC2_RG,
-        FormatClass_BPTC_Unorm,
-        FormatClass_BPTC_Float,
-        FormatClass_S3TC_DXT1_RGB,
-        FormatClass_S3TC_DXT1_RGBA,
-        FormatClass_S3TC_DXT3_RGBA,
-        FormatClass_S3TC_DXT5_RGBA,
-        FormatClass_Unique
-    };
-#endif
-
-    enum CubeMapFace {
-        CubeMapPositiveX = 0x8515,  // GL_TEXTURE_CUBE_MAP_POSITIVE_X
-        CubeMapNegativeX = 0x8516,  // GL_TEXTURE_CUBE_MAP_NEGATIVE_X
-        CubeMapPositiveY = 0x8517,  // GL_TEXTURE_CUBE_MAP_POSITIVE_Y
-        CubeMapNegativeY = 0x8518,  // GL_TEXTURE_CUBE_MAP_NEGATIVE_Y
-        CubeMapPositiveZ = 0x8519,  // GL_TEXTURE_CUBE_MAP_POSITIVE_Z
-        CubeMapNegativeZ = 0x851A   // GL_TEXTURE_CUBE_MAP_NEGATIVE_Z
-    };
-    Q_ENUM(CubeMapFace)
-
-    enum PixelFormat {
-        NoSourceFormat = 0,         // GL_NONE
-        Red            = 0x1903,    // GL_RED
-        RG             = 0x8227,    // GL_RG
-        RGB            = 0x1907,    // GL_RGB
-        BGR            = 0x80E0,    // GL_BGR
-        RGBA           = 0x1908,    // GL_RGBA
-        BGRA           = 0x80E1,    // GL_BGRA
-        Red_Integer    = 0x8D94,    // GL_RED_INTEGER
-        RG_Integer     = 0x8228,    // GL_RG_INTEGER
-        RGB_Integer    = 0x8D98,    // GL_RGB_INTEGER
-        BGR_Integer    = 0x8D9A,    // GL_BGR_INTEGER
-        RGBA_Integer   = 0x8D99,    // GL_RGBA_INTEGER
-        BGRA_Integer   = 0x8D9B,    // GL_BGRA_INTEGER
-        Stencil        = 0x1901,    // GL_STENCIL_INDEX
-        Depth          = 0x1902,    // GL_DEPTH_COMPONENT
-        DepthStencil   = 0x84F9,    // GL_DEPTH_STENCIL
-        Alpha          = 0x1906,    // GL_ALPHA
-        Luminance      = 0x1909,    // GL_LUMINANCE
-        LuminanceAlpha = 0x190A     // GL_LUMINANCE_ALPHA
-    };
-    Q_ENUM(PixelFormat)
-
-    enum PixelType {
-        NoPixelType        = 0,         // GL_NONE
-        Int8               = 0x1400,    // GL_BYTE
-        UInt8              = 0x1401,    // GL_UNSIGNED_BYTE
-        Int16              = 0x1402,    // GL_SHORT
-        UInt16             = 0x1403,    // GL_UNSIGNED_SHORT
-        Int32              = 0x1404,    // GL_INT
-        UInt32             = 0x1405,    // GL_UNSIGNED_INT
-        Float16            = 0x140B,    // GL_HALF_FLOAT
-        Float16OES         = 0x8D61,    // GL_HALF_FLOAT_OES
-        Float32            = 0x1406,    // GL_FLOAT
-        UInt32_RGB9_E5     = 0x8C3E,    // GL_UNSIGNED_INT_5_9_9_9_REV
-        UInt32_RG11B10F    = 0x8C3B,    // GL_UNSIGNED_INT_10F_11F_11F_REV
-        UInt8_RG3B2        = 0x8032,    // GL_UNSIGNED_BYTE_3_3_2
-        UInt8_RG3B2_Rev    = 0x8362,    // GL_UNSIGNED_BYTE_2_3_3_REV
-        UInt16_RGB5A1      = 0x8034,    // GL_UNSIGNED_SHORT_5_5_5_1
-        UInt16_RGB5A1_Rev  = 0x8366,    // GL_UNSIGNED_SHORT_1_5_5_5_REV
-        UInt16_R5G6B5      = 0x8363,    // GL_UNSIGNED_SHORT_5_6_5
-        UInt16_R5G6B5_Rev  = 0x8364,    // GL_UNSIGNED_SHORT_5_6_5_REV
-        UInt16_RGBA4       = 0x8033,    // GL_UNSIGNED_SHORT_4_4_4_4
-        UInt16_RGBA4_Rev   = 0x8365,    // GL_UNSIGNED_SHORT_4_4_4_4_REV
-        UInt32_RGBA8       = 0x8035,    // GL_UNSIGNED_INT_8_8_8_8
-        UInt32_RGBA8_Rev   = 0x8367,    // GL_UNSIGNED_INT_8_8_8_8_REV
-        UInt32_RGB10A2     = 0x8036,    // GL_UNSIGNED_INT_10_10_10_2
-        UInt32_RGB10A2_Rev = 0x8368,    // GL_UNSIGNED_INT_2_10_10_10_REV
-        UInt32_D24S8       = 0x84FA,    // GL_UNSIGNED_INT_24_8
-        Float32_D32_UInt32_S8_X24 = 0x8DAD // GL_FLOAT_32_UNSIGNED_INT_24_8_REV
-    };
-    Q_ENUM(PixelType)
-
-    enum SwizzleComponent {
-        SwizzleRed   = 0x8E42,  // GL_TEXTURE_SWIZZLE_R
-        SwizzleGreen = 0x8E43,  // GL_TEXTURE_SWIZZLE_G
-        SwizzleBlue  = 0x8E44,  // GL_TEXTURE_SWIZZLE_B
-        SwizzleAlpha = 0x8E45   // GL_TEXTURE_SWIZZLE_A
-    };
-    Q_ENUM(SwizzleComponent)
-
-    enum SwizzleValue {
-        RedValue   = 0x1903, // GL_RED
-        GreenValue = 0x1904, // GL_GREEN
-        BlueValue  = 0x1905, // GL_BLUE
-        AlphaValue = 0x1906, // GL_ALPHA
-        ZeroValue  = 0,      // GL_ZERO
-        OneValue   = 1       // GL_ONE
-    };
-    Q_ENUM(SwizzleValue)
-
-    enum WrapMode {
-        Repeat         = 0x2901, // GL_REPEAT
-        MirroredRepeat = 0x8370, // GL_MIRRORED_REPEAT
-        ClampToEdge    = 0x812F, // GL_CLAMP_TO_EDGE
-        ClampToBorder  = 0x812D  // GL_CLAMP_TO_BORDER
-    };
-    Q_ENUM(WrapMode)
-
-    enum CoordinateDirection {
-        DirectionS = 0x2802, // GL_TEXTURE_WRAP_S
-        DirectionT = 0x2803, // GL_TEXTURE_WRAP_T
-        DirectionR = 0x8072  // GL_TEXTURE_WRAP_R
-    };
-    Q_ENUM(CoordinateDirection)
-
-    // Features
-    enum Feature {
-        ImmutableStorage            = 0x00000001,
-        ImmutableMultisampleStorage = 0x00000002,
-        TextureRectangle            = 0x00000004,
-        TextureArrays               = 0x00000008,
-        Texture3D                   = 0x00000010,
-        TextureMultisample          = 0x00000020,
-        TextureBuffer               = 0x00000040,
-        TextureCubeMapArrays        = 0x00000080,
-        Swizzle                     = 0x00000100,
-        StencilTexturing            = 0x00000200,
-        AnisotropicFiltering        = 0x00000400,
-        NPOTTextures                = 0x00000800,
-        NPOTTextureRepeat           = 0x00001000,
-        Texture1D                   = 0x00002000,
-        TextureComparisonOperators  = 0x00004000,
-        TextureMipMapLevel          = 0x00008000,
-#ifndef Q_QDOC
-        MaxFeatureFlag              = 0x00010000
-#endif
-    };
-    Q_DECLARE_FLAGS(Features, Feature)
-    Q_ENUM(Feature)
-
-    explicit QOpenGLTexture(Target target);
-    explicit QOpenGLTexture(const QImage& image, MipMapGeneration genMipMaps = GenerateMipMaps);
-    ~QOpenGLTexture();
-
-    Target target() const;
-
-    // Creation and destruction
-    bool create();
-    void destroy();
-    bool isCreated() const;
-    GLuint textureId() const;
-
-    // Binding and releasing
-    void bind();
-    void bind(uint unit, TextureUnitReset reset = DontResetTextureUnit);
-    void release();
-    void release(uint unit, TextureUnitReset reset = DontResetTextureUnit);
-
-    bool isBound() const;
-    bool isBound(uint unit);
-    static GLuint boundTextureId(BindingTarget target);
-    static GLuint boundTextureId(uint unit, BindingTarget target);
-
-    // Storage allocation
-    void setFormat(TextureFormat format);
-    TextureFormat format() const;
-    void setSize(int width, int height = 1, int depth = 1);
-    int width() const;
-    int height() const;
-    int depth() const;
-    void setMipLevels(int levels);
-    int mipLevels() const;
-    int maximumMipLevels() const;
-    void setLayers(int layers);
-    int layers() const;
-    int faces() const;
-    void setSamples(int samples);
-    int samples() const;
-    void setFixedSamplePositions(bool fixed);
-    bool isFixedSamplePositions() const;
-    void allocateStorage();
-    void allocateStorage(PixelFormat pixelFormat, PixelType pixelType);
-    bool isStorageAllocated() const;
-
-    QOpenGLTexture *createTextureView(Target target,
-                                      TextureFormat viewFormat,
-                                      int minimumMipmapLevel, int maximumMipmapLevel,
-                                      int minimumLayer, int maximumLayer) const;
-    bool isTextureView() const;
-
-    // Pixel transfer
-    // ### Qt 6: remove the non-const void * overloads
-#if QT_DEPRECATED_SINCE(5, 3)
-    QT_DEPRECATED void setData(int mipLevel, int layer, CubeMapFace cubeFace,
-                               PixelFormat sourceFormat, PixelType sourceType,
-                               void *data, const QOpenGLPixelTransferOptions * const options = nullptr);
-    QT_DEPRECATED void setData(int mipLevel, int layer,
-                               PixelFormat sourceFormat, PixelType sourceType,
-                               void *data, const QOpenGLPixelTransferOptions * const options = nullptr);
-    QT_DEPRECATED void setData(int mipLevel,
-                               PixelFormat sourceFormat, PixelType sourceType,
-                               void *data, const QOpenGLPixelTransferOptions * const options = nullptr);
-    QT_DEPRECATED void setData(PixelFormat sourceFormat, PixelType sourceType,
-                               void *data, const QOpenGLPixelTransferOptions * const options = nullptr);
-#endif // QT_DEPRECATED_SINCE(5, 3)
-
-    void setData(int mipLevel, int layer, CubeMapFace cubeFace,
-                 PixelFormat sourceFormat, PixelType sourceType,
-                 const void *data, const QOpenGLPixelTransferOptions * const options = nullptr);
-    void setData(int mipLevel, int layer, int layerCount, CubeMapFace cubeFace,
-                 PixelFormat sourceFormat, PixelType sourceType,
-                 const void *data, const QOpenGLPixelTransferOptions * const options = nullptr);
-    void setData(int mipLevel, int layer,
-                 PixelFormat sourceFormat, PixelType sourceType,
-                 const void *data, const QOpenGLPixelTransferOptions * const options = nullptr);
-    void setData(int mipLevel,
-                 PixelFormat sourceFormat, PixelType sourceType,
-                 const void *data, const QOpenGLPixelTransferOptions * const options = nullptr);
-    void setData(PixelFormat sourceFormat, PixelType sourceType,
-                 const void *data, const QOpenGLPixelTransferOptions * const options = nullptr);
-
-    void setData(int xOffset, int yOffset, int zOffset,
-                 int width, int height, int depth,
-                 PixelFormat sourceFormat, PixelType sourceType,
-                 const void *data, const QOpenGLPixelTransferOptions * const options = nullptr);
-    void setData(int xOffset, int yOffset, int zOffset,
-                 int width, int height, int depth, int mipLevel,
-                 PixelFormat sourceFormat, PixelType sourceType,
-                 const void *data, const QOpenGLPixelTransferOptions * const options = nullptr);
-    void setData(int xOffset, int yOffset, int zOffset,
-                 int width, int height, int depth,
-                 int mipLevel, int layer,
-                 PixelFormat sourceFormat, PixelType sourceType,
-                 const void *data, const QOpenGLPixelTransferOptions * const options = nullptr);
-    void setData(int xOffset, int yOffset, int zOffset,
-                 int width, int height, int depth,
-                 int mipLevel, int layer,
-                 CubeMapFace cubeFace,
-                 PixelFormat sourceFormat, PixelType sourceType,
-                 const void *data, const QOpenGLPixelTransferOptions * const options = nullptr);
-    void setData(int xOffset, int yOffset, int zOffset,
-                 int width, int height, int depth,
-                 int mipLevel, int layer,
-                 CubeMapFace cubeFace, int layerCount,
-                 PixelFormat sourceFormat, PixelType sourceType,
-                 const void *data, const QOpenGLPixelTransferOptions * const options = nullptr);
-
-    // Compressed data upload
-    // ### Qt 6: remove the non-const void * overloads
-#if QT_DEPRECATED_SINCE(5, 3)
-    QT_DEPRECATED void setCompressedData(int mipLevel, int layer, CubeMapFace cubeFace,
-                                         int dataSize, void *data,
-                                         const QOpenGLPixelTransferOptions * const options = nullptr);
-    QT_DEPRECATED void setCompressedData(int mipLevel, int layer,
-                                         int dataSize, void *data,
-                                         const QOpenGLPixelTransferOptions * const options = nullptr);
-    QT_DEPRECATED void setCompressedData(int mipLevel, int dataSize, void *data,
-                                         const QOpenGLPixelTransferOptions * const options = nullptr);
-    QT_DEPRECATED void setCompressedData(int dataSize, void *data,
-                                         const QOpenGLPixelTransferOptions * const options = nullptr);
-#endif // QT_DEPRECATED_SINCE(5, 3)
-
-    void setCompressedData(int mipLevel, int layer, CubeMapFace cubeFace,
-                           int dataSize, const void *data,
-                           const QOpenGLPixelTransferOptions * const options = nullptr);
-    void setCompressedData(int mipLevel, int layer, int layerCount, CubeMapFace cubeFace,
-                           int dataSize, const void *data,
-                           const QOpenGLPixelTransferOptions * const options = nullptr);
-    void setCompressedData(int mipLevel, int layer,
-                           int dataSize, const void *data,
-                           const QOpenGLPixelTransferOptions * const options = nullptr);
-    void setCompressedData(int mipLevel, int dataSize, const void *data,
-                           const QOpenGLPixelTransferOptions * const options = nullptr);
-    void setCompressedData(int dataSize, const void *data,
-                           const QOpenGLPixelTransferOptions * const options = nullptr);
-
-    // Helpful overloads for setData
-    void setData(const QImage& image, MipMapGeneration genMipMaps = GenerateMipMaps);
-
-    static bool hasFeature(Feature feature);
-
-    // Texture Parameters
-    void setMipBaseLevel(int baseLevel);
-    int mipBaseLevel() const;
-    void setMipMaxLevel(int maxLevel);
-    int mipMaxLevel() const;
-    void setMipLevelRange(int baseLevel, int maxLevel);
-    QPair<int, int> mipLevelRange() const;
-
-    void setAutoMipMapGenerationEnabled(bool enabled);
-    bool isAutoMipMapGenerationEnabled() const;
-
-    void generateMipMaps();
-    void generateMipMaps(int baseLevel, bool resetBaseLevel = true);
-
-    void setSwizzleMask(SwizzleComponent component, SwizzleValue value);
-    void setSwizzleMask(SwizzleValue r, SwizzleValue g,
-                        SwizzleValue b, SwizzleValue a);
-    SwizzleValue swizzleMask(SwizzleComponent component) const;
-
-    enum DepthStencilMode {
-        DepthMode   = 0x1902,   // GL_DEPTH_COMPONENT
-        StencilMode = 0x1901    // GL_STENCIL_INDEX
-    };
-    Q_ENUM(DepthStencilMode)
-
-    void setDepthStencilMode(DepthStencilMode mode);
-    DepthStencilMode depthStencilMode() const;
-
-    enum ComparisonFunction {
-        CompareLessEqual    = 0x0203,   // GL_LEQUAL
-        CompareGreaterEqual = 0x0206,   // GL_GEQUAL
-        CompareLess         = 0x0201,   // GL_LESS
-        CompareGreater      = 0x0204,   // GL_GREATER
-        CompareEqual        = 0x0202,   // GL_EQUAL
-        CommpareNotEqual    = 0x0205,   // GL_NOTEQUAL
-        CompareAlways       = 0x0207,   // GL_ALWAYS
-        CompareNever        = 0x0200    // GL_NEVER
-    };
-    Q_ENUM(ComparisonFunction)
-
-    void setComparisonFunction(ComparisonFunction function);
-    ComparisonFunction comparisonFunction() const;
-
-    enum ComparisonMode {
-        CompareRefToTexture = 0x884E,   // GL_COMPARE_REF_TO_TEXTURE
-        CompareNone         = 0x0000    // GL_NONE
-    };
-
-    void setComparisonMode(ComparisonMode mode);
-    ComparisonMode comparisonMode() const;
-
-    // Sampling Parameters
-    enum Filter {
-        Nearest                 = 0x2600,   // GL_NEAREST
-        Linear                  = 0x2601,   // GL_LINEAR
-        NearestMipMapNearest    = 0x2700,   // GL_NEAREST_MIPMAP_NEAREST
-        NearestMipMapLinear     = 0x2702,   // GL_NEAREST_MIPMAP_LINEAR
-        LinearMipMapNearest     = 0x2701,   // GL_LINEAR_MIPMAP_NEAREST
-        LinearMipMapLinear      = 0x2703    // GL_LINEAR_MIPMAP_LINEAR
-    };
-    Q_ENUM(Filter)
-
-    void setMinificationFilter(Filter filter);
-    Filter minificationFilter() const;
-    void setMagnificationFilter(Filter filter);
-    Filter magnificationFilter() const;
-    void setMinMagFilters(Filter minificationFilter,
-                          Filter magnificationFilter);
-    QPair<Filter, Filter> minMagFilters() const;
-    void setMaximumAnisotropy(float anisotropy);
-    float maximumAnisotropy() const;
-
-    void setWrapMode(WrapMode mode);
-    void setWrapMode(CoordinateDirection direction, WrapMode mode);
-    WrapMode wrapMode(CoordinateDirection direction) const;
-
-    void setBorderColor(QColor color);
-    void setBorderColor(float r, float g, float b, float a);
-    void setBorderColor(int r, int g, int b, int a);
-    void setBorderColor(uint r, uint g, uint b, uint a);
-
-    QColor borderColor() const;
-    void borderColor(float *border) const;
-    void borderColor(int *border) const;
-    void borderColor(unsigned int *border) const;
-
-    void setMinimumLevelOfDetail(float value);
-    float minimumLevelOfDetail() const;
-    void setMaximumLevelOfDetail(float value);
-    float maximumLevelOfDetail() const;
-    void setLevelOfDetailRange(float min, float max);
-    QPair<float, float> levelOfDetailRange() const;
-    void setLevelofDetailBias(float bias);
-    float levelofDetailBias() const;
-
-#ifndef QT_NO_DEBUG_STREAM
-    friend Q_GUI_EXPORT QDebug operator<<(QDebug dbg, const QOpenGLTexture *t);
-#endif
-
-private:
-    Q_DISABLE_COPY(QOpenGLTexture)
-    Q_DECLARE_PRIVATE(QOpenGLTexture)
-    QScopedPointer<QOpenGLTexturePrivate> d_ptr;
-};
-
-Q_DECLARE_OPERATORS_FOR_FLAGS(QOpenGLTexture::Features)
-
-#ifndef QT_NO_DEBUG_STREAM
-Q_GUI_EXPORT QDebug operator<<(QDebug debug, const QOpenGLTexture *t);
-#endif
-
-QT_END_NAMESPACE
-
-#endif // QT_NO_OPENGL
-
-#endif // QOPENGLABSTRACTTEXTURE_H
diff --git a/src/gui/opengl/qopengltexture_p.h b/src/gui/opengl/qopengltexture_p.h
deleted file mode 100644
index 9f3457ad0a..0000000000
--- a/src/gui/opengl/qopengltexture_p.h
+++ /dev/null
@@ -1,184 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB).
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtGui module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QABSTRACTOPENGLTEXTURE_P_H
-#define QABSTRACTOPENGLTEXTURE_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#ifndef QT_NO_OPENGL
-
-#include <QtGui/private/qtguiglobal_p.h>
-#include "private/qobject_p.h"
-#include "qopengltexture.h"
-#include "qopengl.h"
-
-#include <cmath>
-
-namespace {
-inline double qLog2(const double x)
-{
-    return std::log(x) / std::log(2.0);
-}
-}
-
-QT_BEGIN_NAMESPACE
-
-class QOpenGLContext;
-class QOpenGLTextureHelper;
-class QOpenGLFunctions;
-
-class QOpenGLTexturePrivate
-{
-public:
-    QOpenGLTexturePrivate(QOpenGLTexture::Target textureTarget,
-                          QOpenGLTexture *qq);
-    ~QOpenGLTexturePrivate();
-
-    Q_DECLARE_PUBLIC(QOpenGLTexture)
-
-    void resetFuncs(QOpenGLTextureHelper *funcs);
-    void initializeOpenGLFunctions();
-
-    bool create();
-    void destroy();
-
-    void bind();
-    void bind(uint unit, QOpenGLTexture::TextureUnitReset reset = QOpenGLTexture::DontResetTextureUnit);
-    void release();
-    void release(uint unit, QOpenGLTexture::TextureUnitReset reset = QOpenGLTexture::DontResetTextureUnit);
-    bool isBound() const;
-    bool isBound(uint unit) const;
-
-    void allocateStorage(QOpenGLTexture::PixelFormat pixelFormat, QOpenGLTexture::PixelType pixelType);
-    void allocateMutableStorage(QOpenGLTexture::PixelFormat pixelFormat, QOpenGLTexture::PixelType pixelType);
-    void allocateImmutableStorage();
-    void setData(int mipLevel, int layer, int layerCount, QOpenGLTexture::CubeMapFace cubeFace,
-                 QOpenGLTexture::PixelFormat sourceFormat, QOpenGLTexture::PixelType sourceType,
-                 const void *data, const QOpenGLPixelTransferOptions * const options);
-    void setData(int xOffset, int yOffset, int zOffset, int width, int height, int depth,
-                 int mipLevel, int layer, int layerCount, QOpenGLTexture::CubeMapFace cubeFace,
-                 QOpenGLTexture::PixelFormat sourceFormat, QOpenGLTexture::PixelType sourceType,
-                 const void *data, const QOpenGLPixelTransferOptions * const options);
-    void setCompressedData(int mipLevel, int layer, int layerCount, QOpenGLTexture::CubeMapFace cubeFace,
-                           int dataSize, const void *data,
-                           const QOpenGLPixelTransferOptions * const options);
-
-
-    void setWrapMode(QOpenGLTexture::WrapMode mode);
-    void setWrapMode(QOpenGLTexture::CoordinateDirection direction, QOpenGLTexture::WrapMode mode);
-    QOpenGLTexture::WrapMode wrapMode(QOpenGLTexture::CoordinateDirection direction) const;
-
-    QOpenGLTexture *createTextureView(QOpenGLTexture::Target target, QOpenGLTexture::TextureFormat viewFormat,
-                                      int minimumMipmapLevel, int maximumMipmapLevel,
-                                      int minimumLayer, int maximumLayer) const;
-
-    int evaluateMipLevels() const;
-
-    inline int maximumMipLevelCount() const
-    {
-        return 1 + std::floor(qLog2(qMax(dimensions[0], qMax(dimensions[1], dimensions[2]))));
-    }
-
-    static inline int mipLevelSize(int mipLevel, int baseLevelSize)
-    {
-        return std::floor(double(qMax(1, baseLevelSize >> mipLevel)));
-    }
-
-    bool isUsingImmutableStorage() const;
-
-    QOpenGLTexture *q_ptr;
-    QOpenGLContext *context;
-    QOpenGLTexture::Target target;
-    QOpenGLTexture::BindingTarget bindingTarget;
-    GLuint textureId;
-    QOpenGLTexture::TextureFormat format;
-    QOpenGLTexture::TextureFormatClass formatClass;
-    int dimensions[3];
-    int requestedMipLevels;
-    int mipLevels;
-    int layers;
-    int faces;
-
-    int samples;
-    bool fixedSamplePositions;
-
-    int baseLevel;
-    int maxLevel;
-
-    QOpenGLTexture::SwizzleValue swizzleMask[4];
-    QOpenGLTexture::DepthStencilMode depthStencilMode;
-    QOpenGLTexture::ComparisonFunction comparisonFunction;
-    QOpenGLTexture::ComparisonMode comparisonMode;
-
-    QOpenGLTexture::Filter minFilter;
-    QOpenGLTexture::Filter magFilter;
-    float maxAnisotropy;
-    QOpenGLTexture::WrapMode wrapModes[3];
-    QVariantList borderColor;
-    float minLevelOfDetail;
-    float maxLevelOfDetail;
-    float levelOfDetailBias;
-
-    bool textureView;
-    bool autoGenerateMipMaps;
-    bool storageAllocated;
-
-    QOpenGLTextureHelper *texFuncs;
-    QOpenGLFunctions *functions;
-
-    QOpenGLTexture::Features features;
-};
-
-QT_END_NAMESPACE
-
-#undef Q_CALL_MEMBER_FUNCTION
-
-#endif // QT_NO_OPENGL
-
-#endif // QABSTRACTOPENGLTEXTURE_P_H
diff --git a/src/gui/opengl/qopengltextureblitter.cpp b/src/gui/opengl/qopengltextureblitter.cpp
deleted file mode 100644
index b709f2f639..0000000000
--- a/src/gui/opengl/qopengltextureblitter.cpp
+++ /dev/null
@@ -1,682 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtGui module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qopengltextureblitter.h"
-
-#include <QtGui/QOpenGLBuffer>
-#include <QtGui/QOpenGLShaderProgram>
-#include <QtGui/QOpenGLVertexArrayObject>
-#include <QtGui/QOpenGLContext>
-#include <QtGui/QOpenGLFunctions>
-
-#ifndef GL_TEXTURE_EXTERNAL_OES
-#define GL_TEXTURE_EXTERNAL_OES           0x8D65
-#endif
-
-QT_BEGIN_NAMESPACE
-
-/*!
-    \class QOpenGLTextureBlitter
-    \brief The QOpenGLTextureBlitter class provides a convenient way to draw textured quads via OpenGL.
-    \since 5.8
-    \ingroup painting-3D
-    \inmodule QtGui
-
-    Drawing textured quads, in order to get the contents of a texture
-    onto the screen, is a common operation when developing 2D user
-    interfaces. QOpenGLTextureBlitter provides a convenience class to
-    avoid repeating vertex data, shader sources, buffer and program
-    management and matrix calculations.
-
-    For example, a QOpenGLWidget subclass can do the following to draw
-    the contents rendered into a framebuffer at the pixel position \c{(x, y)}:
-
-    \code
-    void OpenGLWidget::initializeGL()
-    {
-        m_blitter.create();
-        m_fbo = new QOpenGLFramebufferObject(size);
-    }
-
-    void OpenGLWidget::paintGL()
-    {
-        m_fbo->bind();
-        // update offscreen content
-        m_fbo->release();
-
-        m_blitter.bind();
-        const QRect targetRect(QPoint(x, y), m_fbo->size());
-        const QMatrix4x4 target = QOpenGLTextureBlitter::targetTransform(targetRect, QRect(QPoint(0, 0), m_fbo->size()));
-        m_blitter.blit(m_fbo->texture(), target, QOpenGLTextureBlitter::OriginBottomLeft);
-        m_blitter.release();
-    }
-    \endcode
-
-    The blitter implements GLSL shaders both for GLSL 1.00 (suitable
-    for OpenGL (ES) 2.x and compatibility profiles of newer OpenGL
-    versions) and version 150 (suitable for core profile contexts with
-    OpenGL 3.2 and newer).
- */
-
-static const char vertex_shader150[] =
-    "#version 150 core\n"
-    "in vec3 vertexCoord;"
-    "in vec2 textureCoord;"
-    "out vec2 uv;"
-    "uniform mat4 vertexTransform;"
-    "uniform mat3 textureTransform;"
-    "void main() {"
-    "   uv = (textureTransform * vec3(textureCoord,1.0)).xy;"
-    "   gl_Position = vertexTransform * vec4(vertexCoord,1.0);"
-    "}";
-
-static const char fragment_shader150[] =
-    "#version 150 core\n"
-    "in vec2 uv;"
-    "out vec4 fragcolor;"
-    "uniform sampler2D textureSampler;"
-    "uniform bool swizzle;"
-    "uniform float opacity;"
-    "void main() {"
-    "   vec4 tmpFragColor = texture(textureSampler, uv);"
-    "   tmpFragColor.a *= opacity;"
-    "   fragcolor = swizzle ? tmpFragColor.bgra : tmpFragColor;"
-    "}";
-
-static const char vertex_shader[] =
-    "attribute highp vec3 vertexCoord;"
-    "attribute highp vec2 textureCoord;"
-    "varying highp vec2 uv;"
-    "uniform highp mat4 vertexTransform;"
-    "uniform highp mat3 textureTransform;"
-    "void main() {"
-    "   uv = (textureTransform * vec3(textureCoord,1.0)).xy;"
-    "   gl_Position = vertexTransform * vec4(vertexCoord,1.0);"
-    "}";
-
-static const char fragment_shader[] =
-    "varying highp vec2 uv;"
-    "uniform sampler2D textureSampler;"
-    "uniform bool swizzle;"
-    "uniform highp float opacity;"
-    "void main() {"
-    "   highp vec4 tmpFragColor = texture2D(textureSampler,uv);"
-    "   tmpFragColor.a *= opacity;"
-    "   gl_FragColor = swizzle ? tmpFragColor.bgra : tmpFragColor;"
-    "}";
-
-static const char fragment_shader_external_oes[] =
-    "#extension GL_OES_EGL_image_external : require\n"
-    "varying highp vec2 uv;"
-    "uniform samplerExternalOES textureSampler;\n"
-    "uniform bool swizzle;"
-    "uniform highp float opacity;"
-    "void main() {"
-    "   highp vec4 tmpFragColor = texture2D(textureSampler, uv);"
-    "   tmpFragColor.a *= opacity;"
-    "   gl_FragColor = swizzle ? tmpFragColor.bgra : tmpFragColor;"
-    "}";
-
-static const GLfloat vertex_buffer_data[] = {
-        -1,-1, 0,
-        -1, 1, 0,
-         1,-1, 0,
-        -1, 1, 0,
-         1,-1, 0,
-         1, 1, 0
-};
-
-static const GLfloat texture_buffer_data[] = {
-        0, 0,
-        0, 1,
-        1, 0,
-        0, 1,
-        1, 0,
-        1, 1
-};
-
-class TextureBinder
-{
-public:
-    TextureBinder(GLenum target, GLuint textureId) : m_target(target)
-    {
-        QOpenGLContext::currentContext()->functions()->glBindTexture(m_target, textureId);
-    }
-    ~TextureBinder()
-    {
-        QOpenGLContext::currentContext()->functions()->glBindTexture(m_target, 0);
-    }
-
-private:
-    GLenum m_target;
-};
-
-class QOpenGLTextureBlitterPrivate
-{
-public:
-    enum TextureMatrixUniform {
-        User,
-        Identity,
-        IdentityFlipped
-    };
-
-    enum ProgramIndex {
-        TEXTURE_2D,
-        TEXTURE_EXTERNAL_OES
-    };
-
-    QOpenGLTextureBlitterPrivate() :
-        swizzle(false),
-        opacity(1.0f),
-        vao(new QOpenGLVertexArrayObject),
-        currentTarget(TEXTURE_2D)
-    { }
-
-    bool buildProgram(ProgramIndex idx, const char *vs, const char *fs);
-
-    void blit(GLuint texture, const QMatrix4x4 &vertexTransform, const QMatrix3x3 &textureTransform);
-    void blit(GLuint texture, const QMatrix4x4 &vertexTransform, QOpenGLTextureBlitter::Origin origin);
-
-    void prepareProgram(const QMatrix4x4 &vertexTransform);
-
-    QOpenGLBuffer vertexBuffer;
-    QOpenGLBuffer textureBuffer;
-    struct Program {
-        Program() :
-            vertexCoordAttribPos(0),
-            vertexTransformUniformPos(0),
-            textureCoordAttribPos(0),
-            textureTransformUniformPos(0),
-            swizzleUniformPos(0),
-            opacityUniformPos(0),
-            swizzle(false),
-            opacity(0.0f),
-            textureMatrixUniformState(User)
-        { }
-        QScopedPointer<QOpenGLShaderProgram> glProgram;
-        GLuint vertexCoordAttribPos;
-        GLuint vertexTransformUniformPos;
-        GLuint textureCoordAttribPos;
-        GLuint textureTransformUniformPos;
-        GLuint swizzleUniformPos;
-        GLuint opacityUniformPos;
-        bool swizzle;
-        float opacity;
-        TextureMatrixUniform textureMatrixUniformState;
-    } programs[2];
-    bool swizzle;
-    float opacity;
-    QScopedPointer<QOpenGLVertexArrayObject> vao;
-    GLenum currentTarget;
-};
-
-static inline QOpenGLTextureBlitterPrivate::ProgramIndex targetToProgramIndex(GLenum target)
-{
-    switch (target) {
-    case GL_TEXTURE_2D:
-        return QOpenGLTextureBlitterPrivate::TEXTURE_2D;
-    case GL_TEXTURE_EXTERNAL_OES:
-        return QOpenGLTextureBlitterPrivate::TEXTURE_EXTERNAL_OES;
-    default:
-        qWarning("Unsupported texture target 0x%x", target);
-        return QOpenGLTextureBlitterPrivate::TEXTURE_2D;
-    }
-}
-
-void QOpenGLTextureBlitterPrivate::prepareProgram(const QMatrix4x4 &vertexTransform)
-{
-    Program *program = &programs[targetToProgramIndex(currentTarget)];
-
-    vertexBuffer.bind();
-    program->glProgram->setAttributeBuffer(program->vertexCoordAttribPos, GL_FLOAT, 0, 3, 0);
-    program->glProgram->enableAttributeArray(program->vertexCoordAttribPos);
-    vertexBuffer.release();
-
-    program->glProgram->setUniformValue(program->vertexTransformUniformPos, vertexTransform);
-
-    textureBuffer.bind();
-    program->glProgram->setAttributeBuffer(program->textureCoordAttribPos, GL_FLOAT, 0, 2, 0);
-    program->glProgram->enableAttributeArray(program->textureCoordAttribPos);
-    textureBuffer.release();
-
-    if (swizzle != program->swizzle) {
-        program->glProgram->setUniformValue(program->swizzleUniformPos, swizzle);
-        program->swizzle = swizzle;
-    }
-
-    if (opacity != program->opacity) {
-        program->glProgram->setUniformValue(program->opacityUniformPos, opacity);
-        program->opacity = opacity;
-    }
-}
-
-void QOpenGLTextureBlitterPrivate::blit(GLuint texture,
-                                        const QMatrix4x4 &vertexTransform,
-                                        const QMatrix3x3 &textureTransform)
-{
-    TextureBinder binder(currentTarget, texture);
-    prepareProgram(vertexTransform);
-
-    Program *program = &programs[targetToProgramIndex(currentTarget)];
-    program->glProgram->setUniformValue(program->textureTransformUniformPos, textureTransform);
-    program->textureMatrixUniformState = User;
-
-    QOpenGLContext::currentContext()->functions()->glDrawArrays(GL_TRIANGLES, 0, 6);
-}
-
-void QOpenGLTextureBlitterPrivate::blit(GLuint texture,
-                                        const QMatrix4x4 &vertexTransform,
-                                        QOpenGLTextureBlitter::Origin origin)
-{
-    TextureBinder binder(currentTarget, texture);
-    prepareProgram(vertexTransform);
-
-    Program *program = &programs[targetToProgramIndex(currentTarget)];
-    if (origin == QOpenGLTextureBlitter::OriginTopLeft) {
-        if (program->textureMatrixUniformState != IdentityFlipped) {
-            QMatrix3x3 flipped;
-            flipped(1,1) = -1;
-            flipped(1,2) = 1;
-            program->glProgram->setUniformValue(program->textureTransformUniformPos, flipped);
-            program->textureMatrixUniformState = IdentityFlipped;
-        }
-    } else if (program->textureMatrixUniformState != Identity) {
-        program->glProgram->setUniformValue(program->textureTransformUniformPos, QMatrix3x3());
-        program->textureMatrixUniformState = Identity;
-    }
-
-    QOpenGLContext::currentContext()->functions()->glDrawArrays(GL_TRIANGLES, 0, 6);
-}
-
-bool QOpenGLTextureBlitterPrivate::buildProgram(ProgramIndex idx, const char *vs, const char *fs)
-{
-    Program *p = &programs[idx];
-
-    p->glProgram.reset(new QOpenGLShaderProgram);
-
-    p->glProgram->addCacheableShaderFromSourceCode(QOpenGLShader::Vertex, vs);
-    p->glProgram->addCacheableShaderFromSourceCode(QOpenGLShader::Fragment, fs);
-    p->glProgram->link();
-    if (!p->glProgram->isLinked()) {
-        qWarning() << "Could not link shader program:\n" << p->glProgram->log();
-        return false;
-    }
-
-    p->glProgram->bind();
-
-    p->vertexCoordAttribPos = p->glProgram->attributeLocation("vertexCoord");
-    p->vertexTransformUniformPos = p->glProgram->uniformLocation("vertexTransform");
-    p->textureCoordAttribPos = p->glProgram->attributeLocation("textureCoord");
-    p->textureTransformUniformPos = p->glProgram->uniformLocation("textureTransform");
-    p->swizzleUniformPos = p->glProgram->uniformLocation("swizzle");
-    p->opacityUniformPos = p->glProgram->uniformLocation("opacity");
-
-    p->glProgram->setUniformValue(p->swizzleUniformPos, false);
-
-    // minmize state left set after a create()
-    p->glProgram->release();
-
-    return true;
-}
-
-/*!
-    Constructs a new QOpenGLTextureBlitter instance.
-
-    \note no graphics resources are initialized in the
-    constructor. This makes it safe to place plain
-    QOpenGLTextureBlitter members into classes because the actual
-    initialization that depends on the OpenGL context happens only in
-    create().
- */
-QOpenGLTextureBlitter::QOpenGLTextureBlitter()
-    : d_ptr(new QOpenGLTextureBlitterPrivate)
-{
-}
-
-/*!
-    Destructs the instance.
-
-    \note When the OpenGL context - or a context sharing resources
-    with it - that was current when calling create() is not current,
-    graphics resources will not be released. Therefore, it is
-    recommended to call destroy() manually instead of relying on the
-    destructor to perform OpenGL resource cleanup.
- */
-QOpenGLTextureBlitter::~QOpenGLTextureBlitter()
-{
-    destroy();
-}
-
-/*!
-    Initializes the graphics resources used by the blitter.
-
-    \return \c true if successful, \c false if there was a
-    failure. Failures can occur when there is no OpenGL context
-    current on the current thread, or when shader compilation fails
-    for some reason.
-
-    \sa isCreated(), destroy()
- */
-bool QOpenGLTextureBlitter::create()
-{
-    QOpenGLContext *currentContext = QOpenGLContext::currentContext();
-    if (!currentContext)
-        return false;
-
-    Q_D(QOpenGLTextureBlitter);
-
-    if (d->programs[QOpenGLTextureBlitterPrivate::TEXTURE_2D].glProgram)
-        return true;
-
-    QSurfaceFormat format = currentContext->format();
-    if (format.profile() == QSurfaceFormat::CoreProfile && format.version() >= qMakePair(3,2)) {
-        if (!d->buildProgram(QOpenGLTextureBlitterPrivate::TEXTURE_2D, vertex_shader150, fragment_shader150))
-            return false;
-    } else {
-        if (!d->buildProgram(QOpenGLTextureBlitterPrivate::TEXTURE_2D, vertex_shader, fragment_shader))
-            return false;
-        if (supportsExternalOESTarget())
-            if (!d->buildProgram(QOpenGLTextureBlitterPrivate::TEXTURE_EXTERNAL_OES, vertex_shader, fragment_shader_external_oes))
-                return false;
-    }
-
-    // Create and bind the VAO, if supported.
-    QOpenGLVertexArrayObject::Binder vaoBinder(d->vao.data());
-
-    d->vertexBuffer.create();
-    d->vertexBuffer.bind();
-    d->vertexBuffer.allocate(vertex_buffer_data, sizeof(vertex_buffer_data));
-    d->vertexBuffer.release();
-
-    d->textureBuffer.create();
-    d->textureBuffer.bind();
-    d->textureBuffer.allocate(texture_buffer_data, sizeof(texture_buffer_data));
-    d->textureBuffer.release();
-
-    return true;
-}
-
-/*!
-    \return \c true if create() was called and succeeded. \c false otherwise.
-
-    \sa create(), destroy()
- */
-bool QOpenGLTextureBlitter::isCreated() const
-{
-    Q_D(const QOpenGLTextureBlitter);
-    return d->programs[QOpenGLTextureBlitterPrivate::TEXTURE_2D].glProgram;
-}
-
-/*!
-    Frees all graphics resources held by the blitter. Assumes that
-    the OpenGL context, or another context sharing resources with it,
-    that was current on the thread when invoking create() is current.
-
-    The function has no effect when the blitter is not in created state.
-
-    \sa create()
- */
-void QOpenGLTextureBlitter::destroy()
-{
-    if (!isCreated())
-        return;
-    Q_D(QOpenGLTextureBlitter);
-    d->programs[QOpenGLTextureBlitterPrivate::TEXTURE_2D].glProgram.reset();
-    d->programs[QOpenGLTextureBlitterPrivate::TEXTURE_EXTERNAL_OES].glProgram.reset();
-    d->vertexBuffer.destroy();
-    d->textureBuffer.destroy();
-    d->vao.reset();
-}
-
-/*!
-    \return \c true when bind() accepts \c GL_TEXTURE_EXTERNAL_OES as
-    its target argument.
-
-    \sa bind(), blit()
- */
-bool QOpenGLTextureBlitter::supportsExternalOESTarget() const
-{
-    QOpenGLContext *ctx = QOpenGLContext::currentContext();
-    return ctx && ctx->isOpenGLES() && ctx->hasExtension("GL_OES_EGL_image_external");
-}
-
-/*!
-    Binds the graphics resources used by the blitter. This must be
-    called before calling blit(). Code modifying the OpenGL state
-    should be avoided between the call to bind() and blit() because
-    otherwise conflicts may arise.
-
-    \a target is the texture target for the source texture and must be
-    either \c GL_TEXTURE_2D or \c GL_OES_EGL_image_external.
-
-    \sa release(), blit()
- */
-void QOpenGLTextureBlitter::bind(GLenum target)
-{
-    Q_D(QOpenGLTextureBlitter);
-
-    if (d->vao->isCreated())
-        d->vao->bind();
-
-    d->currentTarget = target;
-    QOpenGLTextureBlitterPrivate::Program *p = &d->programs[targetToProgramIndex(target)];
-    p->glProgram->bind();
-
-    d->vertexBuffer.bind();
-    p->glProgram->setAttributeBuffer(p->vertexCoordAttribPos, GL_FLOAT, 0, 3, 0);
-    p->glProgram->enableAttributeArray(p->vertexCoordAttribPos);
-    d->vertexBuffer.release();
-
-    d->textureBuffer.bind();
-    p->glProgram->setAttributeBuffer(p->textureCoordAttribPos, GL_FLOAT, 0, 2, 0);
-    p->glProgram->enableAttributeArray(p->textureCoordAttribPos);
-    d->textureBuffer.release();
-}
-
-/*!
-    Unbinds the graphics resources used by the blitter.
-
-    \sa bind()
- */
-void QOpenGLTextureBlitter::release()
-{
-    Q_D(QOpenGLTextureBlitter);
-    d->programs[targetToProgramIndex(d->currentTarget)].glProgram->release();
-    if (d->vao->isCreated())
-        d->vao->release();
-}
-
-/*!
-    Sets whether swizzling is enabled for the red and blue color channels to
-    \a swizzle. An BGRA to RGBA conversion (occurring in the shader on
-    the GPU, instead of a slow CPU-side transformation) can be useful
-    when the source texture contains data from a QImage with a format
-    like QImage::Format_ARGB32 which maps to BGRA on little endian
-    systems.
-
-    By default the red-blue swizzle is disabled since this is what a
-    texture attached to an framebuffer object or a texture based on a
-    byte ordered QImage format (like QImage::Format_RGBA8888) needs.
- */
-void QOpenGLTextureBlitter::setRedBlueSwizzle(bool swizzle)
-{
-    Q_D(QOpenGLTextureBlitter);
-    d->swizzle = swizzle;
-}
-
-/*!
-    Changes the opacity to \a opacity. The default opacity is 1.0.
-
-    \note the blitter does not alter the blend state. It is up to the
-    caller of blit() to ensure the correct blend settings are active.
-
- */
-void QOpenGLTextureBlitter::setOpacity(float opacity)
-{
-    Q_D(QOpenGLTextureBlitter);
-    d->opacity = opacity;
-}
-
-/*!
-    \enum QOpenGLTextureBlitter::Origin
-
-    \value OriginBottomLeft Indicates that the data in the texture
-    follows the OpenGL convention of coordinate systems, meaning Y is
-    running from bottom to top.
-
-    \value OriginTopLeft Indicates that the data in the texture has Y
-    running from top to bottom, which is typical with regular,
-    unflipped image data.
-
-    \sa blit()
- */
-
-/*!
-    Performs the blit with the source texture \a texture.
-
-    \a targetTransform specifies the transformation applied. This is
-    usually generated by the targetTransform() helper function.
-
-    \a sourceOrigin specifies if the image data needs flipping. When
-    \a texture corresponds to a texture attached to an FBO pass
-    OriginBottomLeft. On the other hand, when \a texture is based on
-    unflipped image data, pass OriginTopLeft. This is more efficient
-    than using QImage::mirrored().
-
-    \sa targetTransform(), Origin, bind()
- */
-void QOpenGLTextureBlitter::blit(GLuint texture,
-                                 const QMatrix4x4 &targetTransform,
-                                 Origin sourceOrigin)
-{
-    Q_D(QOpenGLTextureBlitter);
-    d->blit(texture,targetTransform, sourceOrigin);
-}
-
-/*!
-    Performs the blit with the source texture \a texture.
-
-    \a targetTransform specifies the transformation applied. This is
-    usually generated by the targetTransform() helper function.
-
-    \a sourceTransform specifies the transformation applied to the
-    source. This allows using only a sub-rect of the source
-    texture. This is usually generated by the sourceTransform() helper
-    function.
-
-    \sa sourceTransform(), targetTransform(), Origin, bind()
- */
-void QOpenGLTextureBlitter::blit(GLuint texture,
-                                 const QMatrix4x4 &targetTransform,
-                                 const QMatrix3x3 &sourceTransform)
-{
-    Q_D(QOpenGLTextureBlitter);
-    d->blit(texture, targetTransform, sourceTransform);
-}
-
-/*!
-    Calculates a target transform suitable for blit().
-
-    \a target is the target rectangle in pixels. \a viewport describes
-    the source dimensions and will in most cases be set to (0, 0,
-    image width, image height).
-
-    For unscaled output the size of \a target and \a viewport should
-    match.
-
-    \sa blit()
- */
-QMatrix4x4 QOpenGLTextureBlitter::targetTransform(const QRectF &target,
-                                                  const QRect &viewport)
-{
-    qreal x_scale = target.width() / viewport.width();
-    qreal y_scale = target.height() / viewport.height();
-
-    const QPointF relative_to_viewport = target.topLeft() - viewport.topLeft();
-    qreal x_translate = x_scale - 1 + ((relative_to_viewport.x() / viewport.width()) * 2);
-    qreal y_translate = -y_scale + 1 - ((relative_to_viewport.y() / viewport.height()) * 2);
-
-    QMatrix4x4 matrix;
-    matrix(0,3) = x_translate;
-    matrix(1,3) = y_translate;
-
-    matrix(0,0) = x_scale;
-    matrix(1,1) = y_scale;
-
-    return matrix;
-}
-
-/*!
-    Calculates a 3x3 matrix suitable as the input to blit(). This is
-    used when only a part of the texture is to be used in the blit.
-
-    \a subTexture is the desired source rectangle in pixels, \a
-    textureSize is the full width and height of the texture data.  \a
-    origin specifies the orientation of the image data when it comes
-    to the Y axis.
-
-    \sa blit(), Origin
- */
-QMatrix3x3 QOpenGLTextureBlitter::sourceTransform(const QRectF &subTexture,
-                                                  const QSize &textureSize,
-                                                  Origin origin)
-{
-    qreal x_scale = subTexture.width() / textureSize.width();
-    qreal y_scale = subTexture.height() / textureSize.height();
-
-    const QPointF topLeft = subTexture.topLeft();
-    qreal x_translate = topLeft.x() / textureSize.width();
-    qreal y_translate = topLeft.y() / textureSize.height();
-
-    if (origin == OriginTopLeft) {
-        y_scale = -y_scale;
-        y_translate = 1 - y_translate;
-    }
-
-    QMatrix3x3 matrix;
-    matrix(0,2) = x_translate;
-    matrix(1,2) = y_translate;
-
-    matrix(0,0) = x_scale;
-    matrix(1,1) = y_scale;
-
-    return matrix;
-}
-
-QT_END_NAMESPACE
diff --git a/src/gui/opengl/qopengltextureblitter.h b/src/gui/opengl/qopengltextureblitter.h
deleted file mode 100644
index 2f7c6b1a0a..0000000000
--- a/src/gui/opengl/qopengltextureblitter.h
+++ /dev/null
@@ -1,94 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtGui module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QOPENGLTEXTUREBLITTER_H
-#define QOPENGLTEXTUREBLITTER_H
-
-#include <QtGui/qtguiglobal.h>
-
-#ifndef QT_NO_OPENGL
-
-#include <QtGui/qopengl.h>
-#include <QtGui/QMatrix3x3>
-#include <QtGui/QMatrix4x4>
-
-QT_BEGIN_NAMESPACE
-
-class QOpenGLTextureBlitterPrivate;
-
-class Q_GUI_EXPORT QOpenGLTextureBlitter
-{
-public:
-    QOpenGLTextureBlitter();
-    ~QOpenGLTextureBlitter();
-
-    enum Origin {
-        OriginBottomLeft,
-        OriginTopLeft
-    };
-
-    bool create();
-    bool isCreated() const;
-    void destroy();
-
-    bool supportsExternalOESTarget() const;
-
-    void bind(GLenum target = GL_TEXTURE_2D);
-    void release();
-
-    void setRedBlueSwizzle(bool swizzle);
-    void setOpacity(float opacity);
-
-    void blit(GLuint texture, const QMatrix4x4 &targetTransform, Origin sourceOrigin);
-    void blit(GLuint texture, const QMatrix4x4 &targetTransform, const QMatrix3x3 &sourceTransform);
-
-    static QMatrix4x4 targetTransform(const QRectF &target, const QRect &viewport);
-    static QMatrix3x3 sourceTransform(const QRectF &subTexture, const QSize &textureSize, Origin origin);
-
-private:
-    Q_DISABLE_COPY(QOpenGLTextureBlitter)
-    Q_DECLARE_PRIVATE(QOpenGLTextureBlitter)
-    QScopedPointer<QOpenGLTextureBlitterPrivate> d_ptr;
-};
-
-QT_END_NAMESPACE
-
-#endif
-
-#endif //QOPENGLTEXTUREBLITTER_H
diff --git a/src/gui/opengl/qopengltexturecache.cpp b/src/gui/opengl/qopengltexturecache.cpp
deleted file mode 100644
index ef07dbe109..0000000000
--- a/src/gui/opengl/qopengltexturecache.cpp
+++ /dev/null
@@ -1,198 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtGui module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qopengltexturecache_p.h"
-#include "qopengltextureuploader_p.h"
-#include <qmath.h>
-#include <qopenglfunctions.h>
-#include <private/qimagepixmapcleanuphooks_p.h>
-#include <qpa/qplatformpixmap.h>
-
-QT_BEGIN_NAMESPACE
-
-class QOpenGLTextureCacheWrapper
-{
-public:
-    QOpenGLTextureCacheWrapper()
-    {
-        QImagePixmapCleanupHooks::instance()->addPlatformPixmapModificationHook(cleanupTexturesForPixmapData);
-        QImagePixmapCleanupHooks::instance()->addPlatformPixmapDestructionHook(cleanupTexturesForPixmapData);
-        QImagePixmapCleanupHooks::instance()->addImageHook(cleanupTexturesForCacheKey);
-    }
-
-    ~QOpenGLTextureCacheWrapper()
-    {
-        QImagePixmapCleanupHooks::instance()->removePlatformPixmapModificationHook(cleanupTexturesForPixmapData);
-        QImagePixmapCleanupHooks::instance()->removePlatformPixmapDestructionHook(cleanupTexturesForPixmapData);
-        QImagePixmapCleanupHooks::instance()->removeImageHook(cleanupTexturesForCacheKey);
-    }
-
-    QOpenGLTextureCache *cacheForContext(QOpenGLContext *context) {
-        QMutexLocker lock(&m_mutex);
-        return m_resource.value<QOpenGLTextureCache>(context);
-    }
-
-    static void cleanupTexturesForCacheKey(qint64 key);
-    static void cleanupTexturesForPixmapData(QPlatformPixmap *pmd);
-
-private:
-    QOpenGLMultiGroupSharedResource m_resource;
-    QMutex m_mutex;
-};
-
-Q_GLOBAL_STATIC(QOpenGLTextureCacheWrapper, qt_texture_caches)
-
-QOpenGLTextureCache *QOpenGLTextureCache::cacheForContext(QOpenGLContext *context)
-{
-    return qt_texture_caches()->cacheForContext(context);
-}
-
-void QOpenGLTextureCacheWrapper::cleanupTexturesForCacheKey(qint64 key)
-{
-    QList<QOpenGLSharedResource *> resources = qt_texture_caches()->m_resource.resources();
-    for (QList<QOpenGLSharedResource *>::iterator it = resources.begin(); it != resources.end(); ++it)
-        static_cast<QOpenGLTextureCache *>(*it)->invalidate(key);
-}
-
-void QOpenGLTextureCacheWrapper::cleanupTexturesForPixmapData(QPlatformPixmap *pmd)
-{
-    cleanupTexturesForCacheKey(pmd->cacheKey());
-}
-
-QOpenGLTextureCache::QOpenGLTextureCache(QOpenGLContext *ctx)
-    : QOpenGLSharedResource(ctx->shareGroup())
-    , m_cache(256 * 1024) // 256 MB cache
-{
-}
-
-QOpenGLTextureCache::~QOpenGLTextureCache()
-{
-}
-
-GLuint QOpenGLTextureCache::bindTexture(QOpenGLContext *context, const QPixmap &pixmap, QOpenGLTextureUploader::BindOptions options)
-{
-    if (pixmap.isNull())
-        return 0;
-    QMutexLocker locker(&m_mutex);
-    qint64 key = pixmap.cacheKey();
-
-    // A QPainter is active on the image - take the safe route and replace the texture.
-    if (!pixmap.paintingActive()) {
-        QOpenGLCachedTexture *entry = m_cache.object(key);
-        if (entry && entry->options() == options) {
-            context->functions()->glBindTexture(GL_TEXTURE_2D, entry->id());
-            return entry->id();
-        }
-    }
-
-    GLuint id = bindTexture(context, key, pixmap.toImage(), options);
-    if (id > 0)
-        QImagePixmapCleanupHooks::enableCleanupHooks(pixmap);
-
-    return id;
-}
-
-GLuint QOpenGLTextureCache::bindTexture(QOpenGLContext *context, const QImage &image, QOpenGLTextureUploader::BindOptions options)
-{
-    if (image.isNull())
-        return 0;
-    QMutexLocker locker(&m_mutex);
-    qint64 key = image.cacheKey();
-
-    // A QPainter is active on the image - take the safe route and replace the texture.
-    if (!image.paintingActive()) {
-        QOpenGLCachedTexture *entry = m_cache.object(key);
-        if (entry && entry->options() == options) {
-            context->functions()->glBindTexture(GL_TEXTURE_2D, entry->id());
-            return entry->id();
-        }
-    }
-
-    QImage img = image;
-    if (!context->functions()->hasOpenGLFeature(QOpenGLFunctions::NPOTTextures))
-        options |= QOpenGLTextureUploader::PowerOfTwoBindOption;
-
-    GLuint id = bindTexture(context, key, img, options);
-    if (id > 0)
-        QImagePixmapCleanupHooks::enableCleanupHooks(image);
-
-    return id;
-}
-
-GLuint QOpenGLTextureCache::bindTexture(QOpenGLContext *context, qint64 key, const QImage &image, QOpenGLTextureUploader::BindOptions options)
-{
-    GLuint id;
-    QOpenGLFunctions *funcs = context->functions();
-    funcs->glGenTextures(1, &id);
-    funcs->glBindTexture(GL_TEXTURE_2D, id);
-
-    int cost = QOpenGLTextureUploader::textureImage(GL_TEXTURE_2D, image, options);
-
-    m_cache.insert(key, new QOpenGLCachedTexture(id, options, context), cost / 1024);
-
-    return id;
-}
-
-void QOpenGLTextureCache::invalidate(qint64 key)
-{
-    QMutexLocker locker(&m_mutex);
-    m_cache.remove(key);
-}
-
-void QOpenGLTextureCache::invalidateResource()
-{
-    m_cache.clear();
-}
-
-void QOpenGLTextureCache::freeResource(QOpenGLContext *)
-{
-    Q_ASSERT(false); // the texture cache lives until the context group disappears
-}
-
-static void freeTexture(QOpenGLFunctions *funcs, GLuint id)
-{
-    funcs->glDeleteTextures(1, &id);
-}
-
-QOpenGLCachedTexture::QOpenGLCachedTexture(GLuint id, QOpenGLTextureUploader::BindOptions options, QOpenGLContext *context) : m_options(options)
-{
-    m_resource = new QOpenGLSharedResourceGuard(context, id, freeTexture);
-}
-
-QT_END_NAMESPACE
diff --git a/src/gui/opengl/qopengltexturecache_p.h b/src/gui/opengl/qopengltexturecache_p.h
deleted file mode 100644
index 88ef06e744..0000000000
--- a/src/gui/opengl/qopengltexturecache_p.h
+++ /dev/null
@@ -1,108 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtGui module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#ifndef QOPENGLTEXTURECACHE_P_H
-#define QOPENGLTEXTURECACHE_P_H
-
-#include <QtGui/private/qtguiglobal_p.h>
-#include <QHash>
-#include <QObject>
-#include <QCache>
-#include <private/qopenglcontext_p.h>
-#include <private/qopengltextureuploader_p.h>
-#include <QtCore/qmutex.h>
-
-QT_BEGIN_NAMESPACE
-
-class QOpenGLCachedTexture;
-
-class Q_GUI_EXPORT QOpenGLTextureCache : public QOpenGLSharedResource
-{
-public:
-    static QOpenGLTextureCache *cacheForContext(QOpenGLContext *context);
-
-    QOpenGLTextureCache(QOpenGLContext *);
-    ~QOpenGLTextureCache();
-
-    GLuint bindTexture(QOpenGLContext *context, const QPixmap &pixmap,
-                       QOpenGLTextureUploader::BindOptions options = QOpenGLTextureUploader::PremultipliedAlphaBindOption);
-    GLuint bindTexture(QOpenGLContext *context, const QImage &image,
-                       QOpenGLTextureUploader::BindOptions options = QOpenGLTextureUploader::PremultipliedAlphaBindOption);
-
-    void invalidate(qint64 key);
-
-    void invalidateResource() override;
-    void freeResource(QOpenGLContext *ctx) override;
-
-private:
-    GLuint bindTexture(QOpenGLContext *context, qint64 key, const QImage &image, QOpenGLTextureUploader::BindOptions options);
-
-    QMutex m_mutex;
-    QCache<quint64, QOpenGLCachedTexture> m_cache;
-};
-
-class QOpenGLCachedTexture
-{
-public:
-    QOpenGLCachedTexture(GLuint id, QOpenGLTextureUploader::BindOptions options, QOpenGLContext *context);
-    ~QOpenGLCachedTexture() { m_resource->free(); }
-
-    GLuint id() const { return m_resource->id(); }
-    QOpenGLTextureUploader::BindOptions options() const { return m_options; }
-
-private:
-    QOpenGLSharedResourceGuard *m_resource;
-    QOpenGLTextureUploader::BindOptions m_options;
-};
-
-QT_END_NAMESPACE
-
-#endif
-
diff --git a/src/gui/opengl/qopengltextureglyphcache.cpp b/src/gui/opengl/qopengltextureglyphcache.cpp
deleted file mode 100644
index 41027d26e0..0000000000
--- a/src/gui/opengl/qopengltextureglyphcache.cpp
+++ /dev/null
@@ -1,485 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtGui module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qopengltextureglyphcache_p.h"
-#include "qopenglpaintengine_p.h"
-#include "private/qopenglengineshadersource_p.h"
-#include "qopenglextensions_p.h"
-#include <qrgb.h>
-#include <private/qdrawhelper_p.h>
-
-QT_BEGIN_NAMESPACE
-
-
-static int next_qopengltextureglyphcache_serial_number()
-{
-    static QBasicAtomicInt serial = Q_BASIC_ATOMIC_INITIALIZER(0);
-    return 1 + serial.fetchAndAddRelaxed(1);
-}
-
-QOpenGLTextureGlyphCache::QOpenGLTextureGlyphCache(QFontEngine::GlyphFormat format, const QTransform &matrix, const QColor &color)
-    : QImageTextureGlyphCache(format, matrix, color)
-    , m_textureResource(nullptr)
-    , pex(nullptr)
-    , m_blitProgram(nullptr)
-    , m_filterMode(Nearest)
-    , m_serialNumber(next_qopengltextureglyphcache_serial_number())
-    , m_buffer(QOpenGLBuffer::VertexBuffer)
-{
-#ifdef QT_GL_TEXTURE_GLYPH_CACHE_DEBUG
-    qDebug(" -> QOpenGLTextureGlyphCache() %p for context %p.", this, QOpenGLContext::currentContext());
-#endif
-    m_vertexCoordinateArray[0] = -1.0f;
-    m_vertexCoordinateArray[1] = -1.0f;
-    m_vertexCoordinateArray[2] =  1.0f;
-    m_vertexCoordinateArray[3] = -1.0f;
-    m_vertexCoordinateArray[4] =  1.0f;
-    m_vertexCoordinateArray[5] =  1.0f;
-    m_vertexCoordinateArray[6] = -1.0f;
-    m_vertexCoordinateArray[7] =  1.0f;
-
-    m_textureCoordinateArray[0] = 0.0f;
-    m_textureCoordinateArray[1] = 0.0f;
-    m_textureCoordinateArray[2] = 1.0f;
-    m_textureCoordinateArray[3] = 0.0f;
-    m_textureCoordinateArray[4] = 1.0f;
-    m_textureCoordinateArray[5] = 1.0f;
-    m_textureCoordinateArray[6] = 0.0f;
-    m_textureCoordinateArray[7] = 1.0f;
-}
-
-QOpenGLTextureGlyphCache::~QOpenGLTextureGlyphCache()
-{
-#ifdef QT_GL_TEXTURE_GLYPH_CACHE_DEBUG
-    qDebug(" -> ~QOpenGLTextureGlyphCache() %p.", this);
-#endif
-    clear();
-}
-
-#if !defined(QT_OPENGL_ES_2)
-static inline bool isCoreProfile()
-{
-    return QOpenGLContext::currentContext()->format().profile() == QSurfaceFormat::CoreProfile;
-}
-#endif
-
-void QOpenGLTextureGlyphCache::createTextureData(int width, int height)
-{
-    QOpenGLContext *ctx = const_cast<QOpenGLContext *>(QOpenGLContext::currentContext());
-    if (ctx == nullptr) {
-        qWarning("QOpenGLTextureGlyphCache::createTextureData: Called with no context");
-        return;
-    }
-
-    // create in QImageTextureGlyphCache baseclass is meant to be called
-    // only to create the initial image and does not preserve the content,
-    // so we don't call when this function is called from resize.
-    if (ctx->d_func()->workaround_brokenFBOReadBack && image().isNull())
-        QImageTextureGlyphCache::createTextureData(width, height);
-
-    // Make the lower glyph texture size 16 x 16.
-    if (width < 16)
-        width = 16;
-    if (height < 16)
-        height = 16;
-
-    if (m_textureResource && !m_textureResource->m_texture) {
-        delete m_textureResource;
-        m_textureResource = nullptr;
-    }
-
-    if (!m_textureResource)
-        m_textureResource = new QOpenGLGlyphTexture(ctx);
-
-    QOpenGLFunctions *funcs = ctx->functions();
-    funcs->glGenTextures(1, &m_textureResource->m_texture);
-    funcs->glBindTexture(GL_TEXTURE_2D, m_textureResource->m_texture);
-
-    m_textureResource->m_width = width;
-    m_textureResource->m_height = height;
-
-    if (m_format == QFontEngine::Format_A32 || m_format == QFontEngine::Format_ARGB) {
-        QVarLengthArray<uchar> data(width * height * 4);
-        for (int i = 0; i < data.size(); ++i)
-            data[i] = 0;
-        funcs->glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, width, height, 0, GL_RGBA, GL_UNSIGNED_BYTE, &data[0]);
-    } else {
-        QVarLengthArray<uchar> data(width * height);
-        for (int i = 0; i < data.size(); ++i)
-            data[i] = 0;
-#if !defined(QT_OPENGL_ES_2)
-        const GLint internalFormat = isCoreProfile() ? GL_R8 : GL_ALPHA;
-        const GLenum format = isCoreProfile() ? GL_RED : GL_ALPHA;
-#else
-        const GLint internalFormat = GL_ALPHA;
-        const GLenum format = GL_ALPHA;
-#endif
-        funcs->glTexImage2D(GL_TEXTURE_2D, 0, internalFormat, width, height, 0, format, GL_UNSIGNED_BYTE, &data[0]);
-    }
-
-    funcs->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
-    funcs->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
-    funcs->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-    funcs->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-    m_filterMode = Nearest;
-
-    if (!m_buffer.isCreated()) {
-        m_buffer.create();
-        m_buffer.bind();
-        static GLfloat buf[sizeof(m_vertexCoordinateArray) + sizeof(m_textureCoordinateArray)];
-        memcpy(buf, m_vertexCoordinateArray, sizeof(m_vertexCoordinateArray));
-        memcpy(buf + (sizeof(m_vertexCoordinateArray) / sizeof(GLfloat)),
-               m_textureCoordinateArray,
-               sizeof(m_textureCoordinateArray));
-        m_buffer.allocate(buf, sizeof(buf));
-        m_buffer.release();
-    }
-
-    if (!m_vao.isCreated())
-        m_vao.create();
-}
-
-void QOpenGLTextureGlyphCache::setupVertexAttribs()
-{
-    m_buffer.bind();
-    m_blitProgram->setAttributeBuffer(int(QT_VERTEX_COORDS_ATTR), GL_FLOAT, 0, 2);
-    m_blitProgram->setAttributeBuffer(int(QT_TEXTURE_COORDS_ATTR), GL_FLOAT, sizeof(m_vertexCoordinateArray), 2);
-    m_blitProgram->enableAttributeArray(int(QT_VERTEX_COORDS_ATTR));
-    m_blitProgram->enableAttributeArray(int(QT_TEXTURE_COORDS_ATTR));
-    m_buffer.release();
-}
-
-static void load_glyph_image_to_texture(QOpenGLContext *ctx,
-                                        QImage &img,
-                                        GLuint texture,
-                                        int tx, int ty)
-{
-    QOpenGLFunctions *funcs = ctx->functions();
-
-    const int imgWidth = img.width();
-    const int imgHeight = img.height();
-
-    if (img.format() == QImage::Format_Mono) {
-        img = img.convertToFormat(QImage::Format_Grayscale8);
-    } else if (img.depth() == 32) {
-        if (img.format() == QImage::Format_RGB32
-            // We need to make the alpha component equal to the average of the RGB values.
-            // This is needed when drawing sub-pixel antialiased text on translucent targets.
-#if Q_BYTE_ORDER == Q_BIG_ENDIAN
-            || img.format() == QImage::Format_ARGB32_Premultiplied
-#else
-            || (img.format() == QImage::Format_ARGB32_Premultiplied
-                && ctx->isOpenGLES())
-#endif
-            ) {
-            for (int y = 0; y < imgHeight; ++y) {
-                QRgb *src = (QRgb *) img.scanLine(y);
-                for (int x = 0; x < imgWidth; ++x) {
-                    int r = qRed(src[x]);
-                    int g = qGreen(src[x]);
-                    int b = qBlue(src[x]);
-                    int avg;
-                    if (img.format() == QImage::Format_RGB32)
-                        avg = (r + g + b + 1) / 3; // "+1" for rounding.
-                    else // Format_ARGB_Premultiplied
-                        avg = qAlpha(src[x]);
-
-                    src[x] = qRgba(r, g, b, avg);
-                    // swizzle the bits to accommodate for the GL_RGBA upload.
-#if Q_BYTE_ORDER != Q_BIG_ENDIAN
-                    if (ctx->isOpenGLES())
-#endif
-                        src[x] = ARGB2RGBA(src[x]);
-                }
-            }
-        }
-    }
-
-    funcs->glBindTexture(GL_TEXTURE_2D, texture);
-    if (img.depth() == 32) {
-#ifdef QT_OPENGL_ES_2
-        GLenum fmt = GL_RGBA;
-#else
-        GLenum fmt = ctx->isOpenGLES() ? GL_RGBA : GL_BGRA;
-#endif // QT_OPENGL_ES_2
-
-#if Q_BYTE_ORDER == Q_BIG_ENDIAN
-        fmt = GL_RGBA;
-#endif
-        funcs->glTexSubImage2D(GL_TEXTURE_2D, 0, tx, ty, imgWidth, imgHeight, fmt, GL_UNSIGNED_BYTE, img.constBits());
-    } else {
-        // The scanlines in image are 32-bit aligned, even for mono or 8-bit formats. This
-        // is good because it matches the default of 4 bytes for GL_UNPACK_ALIGNMENT.
-#if !defined(QT_OPENGL_ES_2)
-        const GLenum format = isCoreProfile() ? GL_RED : GL_ALPHA;
-#else
-        const GLenum format = GL_ALPHA;
-#endif
-        funcs->glTexSubImage2D(GL_TEXTURE_2D, 0, tx, ty, imgWidth, imgHeight, format, GL_UNSIGNED_BYTE, img.constBits());
-    }
-}
-
-static void load_glyph_image_region_to_texture(QOpenGLContext *ctx,
-                                               const QImage &srcImg,
-                                               int x, int y,
-                                               int w, int h,
-                                               GLuint texture,
-                                               int tx, int ty)
-{
-    Q_ASSERT(x + w <= srcImg.width() && y + h <= srcImg.height());
-
-    QImage img;
-    if (x != 0 || y != 0 || w != srcImg.width() || h != srcImg.height())
-        img = srcImg.copy(x, y, w, h);
-    else
-        img = srcImg;
-
-    load_glyph_image_to_texture(ctx, img, texture, tx, ty);
-}
-
-void QOpenGLTextureGlyphCache::resizeTextureData(int width, int height)
-{
-    QOpenGLContext *ctx = QOpenGLContext::currentContext();
-    if (ctx == nullptr) {
-        qWarning("QOpenGLTextureGlyphCache::resizeTextureData: Called with no context");
-        return;
-    }
-
-    QOpenGLFunctions *funcs = ctx->functions();
-    GLint oldFbo;
-    funcs->glGetIntegerv(GL_FRAMEBUFFER_BINDING, &oldFbo);
-
-    int oldWidth = m_textureResource->m_width;
-    int oldHeight = m_textureResource->m_height;
-
-    // Make the lower glyph texture size 16 x 16.
-    if (width < 16)
-        width = 16;
-    if (height < 16)
-        height = 16;
-
-    GLuint oldTexture = m_textureResource->m_texture;
-    createTextureData(width, height);
-
-    if (ctx->d_func()->workaround_brokenFBOReadBack) {
-        QImageTextureGlyphCache::resizeTextureData(width, height);
-        load_glyph_image_region_to_texture(ctx, image(), 0, 0, qMin(oldWidth, width), qMin(oldHeight, height),
-                                           m_textureResource->m_texture, 0, 0);
-        return;
-    }
-
-    // ### the QTextureGlyphCache API needs to be reworked to allow
-    // ### resizeTextureData to fail
-
-    funcs->glBindFramebuffer(GL_FRAMEBUFFER, m_textureResource->m_fbo);
-
-    GLuint tmp_texture;
-    funcs->glGenTextures(1, &tmp_texture);
-    funcs->glBindTexture(GL_TEXTURE_2D, tmp_texture);
-    funcs->glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, oldWidth, oldHeight, 0,
-                        GL_RGBA, GL_UNSIGNED_BYTE, nullptr);
-    funcs->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
-    funcs->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
-    funcs->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-    funcs->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-    m_filterMode = Nearest;
-    funcs->glBindTexture(GL_TEXTURE_2D, 0);
-    funcs->glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
-                                  GL_TEXTURE_2D, tmp_texture, 0);
-
-    funcs->glActiveTexture(GL_TEXTURE0 + QT_IMAGE_TEXTURE_UNIT);
-    funcs->glBindTexture(GL_TEXTURE_2D, oldTexture);
-
-    if (pex != nullptr)
-        pex->transferMode(BrushDrawingMode);
-
-    funcs->glDisable(GL_STENCIL_TEST);
-    funcs->glDisable(GL_DEPTH_TEST);
-    funcs->glDisable(GL_SCISSOR_TEST);
-    funcs->glDisable(GL_BLEND);
-
-    funcs->glViewport(0, 0, oldWidth, oldHeight);
-
-    QOpenGLShaderProgram *blitProgram = nullptr;
-    if (pex == nullptr) {
-        if (m_blitProgram == nullptr) {
-            m_blitProgram = new QOpenGLShaderProgram;
-            const bool isCoreProfile = ctx->format().profile() == QSurfaceFormat::CoreProfile;
-
-            {
-                QString source;
-#ifdef Q_OS_WASM
-                source.append(QLatin1String(isCoreProfile ? qopenglslUntransformedPositionVertexShader_core : qopenglslUntransformedPositionVertexShader));
-                source.append(QLatin1String(isCoreProfile ? qopenglslMainWithTexCoordsVertexShader_core : qopenglslMainWithTexCoordsVertexShader));
-#else
-                source.append(QLatin1String(isCoreProfile ? qopenglslMainWithTexCoordsVertexShader_core : qopenglslMainWithTexCoordsVertexShader));
-                source.append(QLatin1String(isCoreProfile ? qopenglslUntransformedPositionVertexShader_core : qopenglslUntransformedPositionVertexShader));
-#endif
-                m_blitProgram->addCacheableShaderFromSourceCode(QOpenGLShader::Vertex, source);
-            }
-
-            {
-                QString source;
-#ifdef Q_OS_WASM
-                source.append(QLatin1String(isCoreProfile ? qopenglslImageSrcFragmentShader_core : qopenglslImageSrcFragmentShader));
-                source.append(QLatin1String(isCoreProfile ? qopenglslMainFragmentShader_core : qopenglslMainFragmentShader));
-#else
-                source.append(QLatin1String(isCoreProfile ? qopenglslMainFragmentShader_core : qopenglslMainFragmentShader));
-                source.append(QLatin1String(isCoreProfile ? qopenglslImageSrcFragmentShader_core : qopenglslImageSrcFragmentShader));
-#endif
-                m_blitProgram->addCacheableShaderFromSourceCode(QOpenGLShader::Fragment, source);
-            }
-
-            m_blitProgram->bindAttributeLocation("vertexCoordsArray", QT_VERTEX_COORDS_ATTR);
-            m_blitProgram->bindAttributeLocation("textureCoordArray", QT_TEXTURE_COORDS_ATTR);
-
-            m_blitProgram->link();
-
-            if (m_vao.isCreated()) {
-                m_vao.bind();
-                setupVertexAttribs();
-            }
-        }
-
-        if (m_vao.isCreated())
-            m_vao.bind();
-        else
-            setupVertexAttribs();
-
-        m_blitProgram->bind();
-        blitProgram = m_blitProgram;
-
-    } else {
-        pex->uploadData(QT_VERTEX_COORDS_ATTR, m_vertexCoordinateArray, 8);
-        pex->uploadData(QT_TEXTURE_COORDS_ATTR, m_textureCoordinateArray, 8);
-
-        pex->shaderManager->useBlitProgram();
-        blitProgram = pex->shaderManager->blitProgram();
-    }
-
-    blitProgram->setUniformValue("imageTexture", QT_IMAGE_TEXTURE_UNIT);
-
-    funcs->glDrawArrays(GL_TRIANGLE_FAN, 0, 4);
-
-    funcs->glBindTexture(GL_TEXTURE_2D, m_textureResource->m_texture);
-
-    funcs->glCopyTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, 0, 0, oldWidth, oldHeight);
-
-    funcs->glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
-                                     GL_RENDERBUFFER, 0);
-    funcs->glDeleteTextures(1, &tmp_texture);
-    funcs->glDeleteTextures(1, &oldTexture);
-
-    funcs->glBindFramebuffer(GL_FRAMEBUFFER, (GLuint)oldFbo);
-
-    if (pex != nullptr) {
-        funcs->glViewport(0, 0, pex->width, pex->height);
-        pex->updateClipScissorTest();
-    } else {
-        if (m_vao.isCreated()) {
-            m_vao.release();
-        } else {
-            m_blitProgram->disableAttributeArray(int(QT_VERTEX_COORDS_ATTR));
-            m_blitProgram->disableAttributeArray(int(QT_TEXTURE_COORDS_ATTR));
-        }
-    }
-}
-
-void QOpenGLTextureGlyphCache::fillTexture(const Coord &c, glyph_t glyph, QFixed subPixelPosition)
-{
-    QOpenGLContext *ctx = QOpenGLContext::currentContext();
-    if (ctx == nullptr) {
-        qWarning("QOpenGLTextureGlyphCache::fillTexture: Called with no context");
-        return;
-    }
-
-    if (ctx->d_func()->workaround_brokenFBOReadBack) {
-        QImageTextureGlyphCache::fillTexture(c, glyph, subPixelPosition);
-        load_glyph_image_region_to_texture(ctx, image(), c.x, c.y, c.w, c.h, m_textureResource->m_texture, c.x, c.y);
-        return;
-    }
-
-    QImage mask = textureMapForGlyph(glyph, subPixelPosition);
-    load_glyph_image_to_texture(ctx, mask, m_textureResource->m_texture, c.x, c.y);
-}
-
-int QOpenGLTextureGlyphCache::glyphPadding() const
-{
-    return 1;
-}
-
-int QOpenGLTextureGlyphCache::maxTextureWidth() const
-{
-    QOpenGLContext *ctx = const_cast<QOpenGLContext *>(QOpenGLContext::currentContext());
-    if (ctx == nullptr)
-        return QImageTextureGlyphCache::maxTextureWidth();
-    else
-        return ctx->d_func()->maxTextureSize();
-}
-
-int QOpenGLTextureGlyphCache::maxTextureHeight() const
-{
-    QOpenGLContext *ctx = const_cast<QOpenGLContext *>(QOpenGLContext::currentContext());
-    if (ctx == nullptr)
-        return QImageTextureGlyphCache::maxTextureHeight();
-
-    if (ctx->d_func()->workaround_brokenTexSubImage)
-        return qMin(1024, ctx->d_func()->maxTextureSize());
-    else
-        return ctx->d_func()->maxTextureSize();
-}
-
-void QOpenGLTextureGlyphCache::clear()
-{
-    if (m_textureResource)
-        m_textureResource->free();
-    m_textureResource = nullptr;
-
-    delete m_blitProgram;
-    m_blitProgram = nullptr;
-
-    m_w = 0;
-    m_h = 0;
-    m_cx = 0;
-    m_cy = 0;
-    m_currentRowHeight = 0;
-    coords.clear();
-}
-
-QT_END_NAMESPACE
diff --git a/src/gui/opengl/qopengltextureglyphcache_p.h b/src/gui/opengl/qopengltextureglyphcache_p.h
deleted file mode 100644
index 4bea4a463a..0000000000
--- a/src/gui/opengl/qopengltextureglyphcache_p.h
+++ /dev/null
@@ -1,181 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtGui module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QOPENGLTEXTUREGLYPHCACHE_P_H
-#define QOPENGLTEXTUREGLYPHCACHE_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API. It exists purely as an
-// implementation detail. This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include <QtGui/private/qtguiglobal_p.h>
-#include <private/qtextureglyphcache_p.h>
-#include <private/qopenglcontext_p.h>
-#include <qopenglshaderprogram.h>
-#include <qopenglfunctions.h>
-#include <qopenglbuffer.h>
-#include <qopenglvertexarrayobject.h>
-
-// #define QT_GL_TEXTURE_GLYPH_CACHE_DEBUG
-
-QT_BEGIN_NAMESPACE
-
-class QOpenGL2PaintEngineExPrivate;
-
-class QOpenGLGlyphTexture : public QOpenGLSharedResource
-{
-public:
-    explicit QOpenGLGlyphTexture(QOpenGLContext *ctx)
-        : QOpenGLSharedResource(ctx->shareGroup())
-        , m_width(0)
-        , m_height(0)
-    {
-        if (!ctx->d_func()->workaround_brokenFBOReadBack)
-            QOpenGLFunctions(ctx).glGenFramebuffers(1, &m_fbo);
-
-#ifdef QT_GL_TEXTURE_GLYPH_CACHE_DEBUG
-        qDebug(" -> QOpenGLGlyphTexture() %p for context %p.", this, ctx);
-#endif
-    }
-
-    void freeResource(QOpenGLContext *context) override
-    {
-        QOpenGLContext *ctx = context;
-#ifdef QT_GL_TEXTURE_GLYPH_CACHE_DEBUG
-        qDebug("~QOpenGLGlyphTexture() %p for context %p.", this, ctx);
-#endif
-        if (!ctx->d_func()->workaround_brokenFBOReadBack)
-            ctx->functions()->glDeleteFramebuffers(1, &m_fbo);
-        if (m_width || m_height)
-            ctx->functions()->glDeleteTextures(1, &m_texture);
-    }
-
-    void invalidateResource() override
-    {
-        m_texture = 0;
-        m_fbo = 0;
-        m_width = 0;
-        m_height = 0;
-    }
-
-    GLuint m_texture;
-    GLuint m_fbo;
-    int m_width;
-    int m_height;
-};
-
-class Q_GUI_EXPORT QOpenGLTextureGlyphCache : public QImageTextureGlyphCache
-{
-public:
-    QOpenGLTextureGlyphCache(QFontEngine::GlyphFormat glyphFormat, const QTransform &matrix, const QColor &color = QColor());
-    ~QOpenGLTextureGlyphCache();
-
-    virtual void createTextureData(int width, int height) override;
-    virtual void resizeTextureData(int width, int height) override;
-    virtual void fillTexture(const Coord &c, glyph_t glyph, QFixed subPixelPosition) override;
-    virtual int glyphPadding() const override;
-    virtual int maxTextureWidth() const override;
-    virtual int maxTextureHeight() const override;
-
-    inline GLuint texture() const {
-        QOpenGLTextureGlyphCache *that = const_cast<QOpenGLTextureGlyphCache *>(this);
-        QOpenGLGlyphTexture *glyphTexture = that->m_textureResource;
-        return glyphTexture ? glyphTexture->m_texture : 0;
-    }
-
-    inline int width() const {
-        QOpenGLTextureGlyphCache *that = const_cast<QOpenGLTextureGlyphCache *>(this);
-        QOpenGLGlyphTexture *glyphTexture = that->m_textureResource;
-        return glyphTexture ? glyphTexture->m_width : 0;
-    }
-    inline int height() const {
-        QOpenGLTextureGlyphCache *that = const_cast<QOpenGLTextureGlyphCache *>(this);
-        QOpenGLGlyphTexture *glyphTexture = that->m_textureResource;
-        return glyphTexture ? glyphTexture->m_height : 0;
-    }
-
-    inline void setPaintEnginePrivate(QOpenGL2PaintEngineExPrivate *p) { pex = p; }
-
-    inline const QOpenGLContextGroup *contextGroup() const { return m_textureResource ? m_textureResource->group() : nullptr; }
-
-    inline int serialNumber() const { return m_serialNumber; }
-
-    enum FilterMode {
-        Nearest,
-        Linear
-    };
-    FilterMode filterMode() const { return m_filterMode; }
-    void setFilterMode(FilterMode m) { m_filterMode = m; }
-
-    void clear();
-
-    QOpenGL2PaintEngineExPrivate *paintEnginePrivate() const
-    {
-        return pex;
-    }
-
-private:
-    void setupVertexAttribs();
-
-    QOpenGLGlyphTexture *m_textureResource;
-
-    QOpenGL2PaintEngineExPrivate *pex;
-    QOpenGLShaderProgram *m_blitProgram;
-    FilterMode m_filterMode;
-
-    GLfloat m_vertexCoordinateArray[8];
-    GLfloat m_textureCoordinateArray[8];
-
-    int m_serialNumber;
-
-    QOpenGLBuffer m_buffer;
-    QOpenGLVertexArrayObject m_vao;
-};
-
-QT_END_NAMESPACE
-
-#endif // QOPENGLTEXTUREGLYPHCACHE_P_H
-
diff --git a/src/gui/opengl/qopengltexturehelper.cpp b/src/gui/opengl/qopengltexturehelper.cpp
deleted file mode 100644
index 6709edc4e2..0000000000
--- a/src/gui/opengl/qopengltexturehelper.cpp
+++ /dev/null
@@ -1,589 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB).
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtGui module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qopengltexturehelper_p.h"
-
-#include <QOpenGLContext>
-#include <private/qopenglextensions_p.h>
-
-QT_BEGIN_NAMESPACE
-
-QOpenGLTextureHelper::QOpenGLTextureHelper(QOpenGLContext *context)
-{
-    functions = context->functions();
-    // Resolve EXT_direct_state_access entry points if present.
-
-    // However, disable it on some systems where DSA is known to be unreliable.
-    bool allowDSA = true;
-    const char *renderer = reinterpret_cast<const char *>(context->functions()->glGetString(GL_RENDERER));
-    // QTBUG-40653, QTBUG-44988
-    if (renderer && strstr(renderer, "AMD Radeon HD"))
-        allowDSA = false;
-
-    if (allowDSA && !context->isOpenGLES()
-        && context->hasExtension(QByteArrayLiteral("GL_EXT_direct_state_access"))) {
-        TextureParameteriEXT = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLenum , GLint )>(context->getProcAddress("glTextureParameteriEXT"));
-        TextureParameterivEXT = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLenum , const GLint *)>(context->getProcAddress("glTextureParameterivEXT"));
-        TextureParameterfEXT = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLenum , GLfloat )>(context->getProcAddress("glTextureParameterfEXT"));
-        TextureParameterfvEXT = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLenum , const GLfloat *)>(context->getProcAddress("glTextureParameterfvEXT"));
-        GenerateTextureMipmapEXT = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum )>(context->getProcAddress("glGenerateTextureMipmapEXT"));
-        TextureStorage3DEXT = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLsizei , GLenum , GLsizei , GLsizei , GLsizei )>(context->getProcAddress("glTextureStorage3DEXT"));
-        TextureStorage2DEXT = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLsizei , GLenum , GLsizei , GLsizei )>(context->getProcAddress("glTextureStorage2DEXT"));
-        TextureStorage1DEXT = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLsizei , GLenum , GLsizei )>(context->getProcAddress("glTextureStorage1DEXT"));
-        TextureStorage3DMultisampleEXT = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLsizei , GLenum , GLsizei , GLsizei , GLsizei , GLboolean )>(context->getProcAddress("glTextureStorage3DMultisampleEXT"));
-        TextureStorage2DMultisampleEXT = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLsizei , GLenum , GLsizei , GLsizei , GLboolean )>(context->getProcAddress("glTextureStorage2DMultisampleEXT"));
-        TextureImage3DEXT = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLint , GLenum , GLsizei , GLsizei , GLsizei , GLint , GLenum , GLenum , const GLvoid *)>(context->getProcAddress("glTextureImage3DEXT"));
-        TextureImage2DEXT = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLint , GLenum , GLsizei , GLsizei , GLint , GLenum , GLenum , const GLvoid *)>(context->getProcAddress("glTextureImage2DEXT"));
-        TextureImage1DEXT = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLint , GLenum , GLsizei , GLint , GLenum , GLenum , const GLvoid *)>(context->getProcAddress("glTextureImage1DEXT"));
-        TextureSubImage3DEXT = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLint , GLint , GLint , GLint , GLsizei , GLsizei , GLsizei , GLenum , GLenum , const GLvoid *)>(context->getProcAddress("glTextureSubImage3DEXT"));
-        TextureSubImage2DEXT = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLint , GLint , GLint , GLsizei , GLsizei , GLenum , GLenum , const GLvoid *)>(context->getProcAddress("glTextureSubImage2DEXT"));
-        TextureSubImage1DEXT = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLint , GLint , GLsizei , GLenum , GLenum , const GLvoid *)>(context->getProcAddress("glTextureSubImage1DEXT"));
-        CompressedTextureSubImage1DEXT = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLint , GLint , GLsizei , GLenum , GLsizei , const GLvoid *)>(context->getProcAddress("glCompressedTextureSubImage1DEXT"));
-        CompressedTextureSubImage2DEXT = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLint , GLint , GLint , GLsizei , GLsizei , GLenum , GLsizei , const GLvoid *)>(context->getProcAddress("glCompressedTextureSubImage2DEXT"));
-        CompressedTextureSubImage3DEXT = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLint , GLint , GLint , GLint , GLsizei , GLsizei , GLsizei , GLenum , GLsizei , const GLvoid *)>(context->getProcAddress("glCompressedTextureSubImage3DEXT"));
-        CompressedTextureImage1DEXT = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLint , GLenum , GLsizei , GLint , GLsizei , const GLvoid *)>(context->getProcAddress("glCompressedTextureImage1DEXT"));
-        CompressedTextureImage2DEXT = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLint , GLenum , GLsizei , GLsizei , GLint , GLsizei , const GLvoid *)>(context->getProcAddress("glCompressedTextureImage2DEXT"));
-        CompressedTextureImage3DEXT = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLint , GLenum , GLsizei , GLsizei , GLsizei , GLint , GLsizei , const GLvoid *)>(context->getProcAddress("glCompressedTextureImage3DEXT"));
-
-        // Use the real DSA functions
-        TextureParameteri = &QOpenGLTextureHelper::dsa_TextureParameteri;
-        TextureParameteriv = &QOpenGLTextureHelper::dsa_TextureParameteriv;
-        TextureParameterf = &QOpenGLTextureHelper::dsa_TextureParameterf;
-        TextureParameterfv = &QOpenGLTextureHelper::dsa_TextureParameterfv;
-        GenerateTextureMipmap = &QOpenGLTextureHelper::dsa_GenerateTextureMipmap;
-        TextureStorage3D = &QOpenGLTextureHelper::dsa_TextureStorage3D;
-        TextureStorage2D = &QOpenGLTextureHelper::dsa_TextureStorage2D;
-        TextureStorage1D = &QOpenGLTextureHelper::dsa_TextureStorage1D;
-        TextureStorage3DMultisample = &QOpenGLTextureHelper::dsa_TextureStorage3DMultisample;
-        TextureStorage2DMultisample = &QOpenGLTextureHelper::dsa_TextureStorage2DMultisample;
-        TextureImage3D = &QOpenGLTextureHelper::dsa_TextureImage3D;
-        TextureImage2D = &QOpenGLTextureHelper::dsa_TextureImage2D;
-        TextureImage1D = &QOpenGLTextureHelper::dsa_TextureImage1D;
-        TextureSubImage3D = &QOpenGLTextureHelper::dsa_TextureSubImage3D;
-        TextureSubImage2D = &QOpenGLTextureHelper::dsa_TextureSubImage2D;
-        TextureSubImage1D = &QOpenGLTextureHelper::dsa_TextureSubImage1D;
-        CompressedTextureSubImage1D = &QOpenGLTextureHelper::dsa_CompressedTextureSubImage1D;
-        CompressedTextureSubImage2D = &QOpenGLTextureHelper::dsa_CompressedTextureSubImage2D;
-        CompressedTextureSubImage3D = &QOpenGLTextureHelper::dsa_CompressedTextureSubImage3D;
-        CompressedTextureImage1D = &QOpenGLTextureHelper::dsa_CompressedTextureImage1D;
-        CompressedTextureImage2D = &QOpenGLTextureHelper::dsa_CompressedTextureImage2D;
-        CompressedTextureImage3D = &QOpenGLTextureHelper::dsa_CompressedTextureImage3D;
-    } else {
-        // Use our own DSA emulation
-        TextureParameteri = &QOpenGLTextureHelper::qt_TextureParameteri;
-        TextureParameteriv = &QOpenGLTextureHelper::qt_TextureParameteriv;
-        TextureParameterf = &QOpenGLTextureHelper::qt_TextureParameterf;
-        TextureParameterfv = &QOpenGLTextureHelper::qt_TextureParameterfv;
-        GenerateTextureMipmap = &QOpenGLTextureHelper::qt_GenerateTextureMipmap;
-        TextureStorage3D = &QOpenGLTextureHelper::qt_TextureStorage3D;
-        TextureStorage2D = &QOpenGLTextureHelper::qt_TextureStorage2D;
-        TextureStorage1D = &QOpenGLTextureHelper::qt_TextureStorage1D;
-        TextureStorage3DMultisample = &QOpenGLTextureHelper::qt_TextureStorage3DMultisample;
-        TextureStorage2DMultisample = &QOpenGLTextureHelper::qt_TextureStorage2DMultisample;
-        TextureImage3D = &QOpenGLTextureHelper::qt_TextureImage3D;
-        TextureImage2D = &QOpenGLTextureHelper::qt_TextureImage2D;
-        TextureImage1D = &QOpenGLTextureHelper::qt_TextureImage1D;
-        TextureSubImage3D = &QOpenGLTextureHelper::qt_TextureSubImage3D;
-        TextureSubImage2D = &QOpenGLTextureHelper::qt_TextureSubImage2D;
-        TextureSubImage1D = &QOpenGLTextureHelper::qt_TextureSubImage1D;
-        CompressedTextureSubImage1D = &QOpenGLTextureHelper::qt_CompressedTextureSubImage1D;
-        CompressedTextureSubImage2D = &QOpenGLTextureHelper::qt_CompressedTextureSubImage2D;
-        CompressedTextureSubImage3D = &QOpenGLTextureHelper::qt_CompressedTextureSubImage3D;
-        CompressedTextureImage1D = &QOpenGLTextureHelper::qt_CompressedTextureImage1D;
-        CompressedTextureImage2D = &QOpenGLTextureHelper::qt_CompressedTextureImage2D;
-        CompressedTextureImage3D = &QOpenGLTextureHelper::qt_CompressedTextureImage3D;
-    }
-
-    // Some DSA functions are part of NV_texture_multisample instead
-    if (!context->isOpenGLES()
-        && context->hasExtension(QByteArrayLiteral("GL_NV_texture_multisample"))) {
-        TextureImage3DMultisampleNV = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLsizei , GLint , GLsizei , GLsizei , GLsizei , GLboolean )>(context->getProcAddress("glTextureImage3DMultisampleNV"));
-        TextureImage2DMultisampleNV = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLsizei , GLint , GLsizei , GLsizei , GLboolean )>(context->getProcAddress("glTextureImage2DMultisampleNV"));
-
-        TextureImage3DMultisample = &QOpenGLTextureHelper::dsa_TextureImage3DMultisample;
-        TextureImage2DMultisample = &QOpenGLTextureHelper::dsa_TextureImage2DMultisample;
-    } else {
-        TextureImage3DMultisample = &QOpenGLTextureHelper::qt_TextureImage3DMultisample;
-        TextureImage2DMultisample = &QOpenGLTextureHelper::qt_TextureImage2DMultisample;
-    }
-
-#if defined(QT_OPENGL_ES_2)
-    // Here we are targeting OpenGL ES 2.0+ only. This is likely using EGL, where,
-    // similarly to WGL, non-extension functions (i.e. any function that is part of the
-    // GLES spec) *may* not be queried via eglGetProcAddress.
-
-    // OpenGL 1.0
-    TexImage1D = 0;
-
-    // OpenGL 1.1
-    TexSubImage1D = 0;
-
-    // OpenGL 1.3
-    GetCompressedTexImage = 0;
-    CompressedTexSubImage1D = 0;
-    CompressedTexSubImage2D = ::glCompressedTexSubImage2D;
-    CompressedTexImage1D = 0;
-    CompressedTexImage2D = ::glCompressedTexImage2D;
-    ActiveTexture = ::glActiveTexture;
-
-    // OpenGL 3.0
-    GenerateMipmap = ::glGenerateMipmap;
-
-    // OpenGL 3.2
-    TexImage3DMultisample = 0;
-    TexImage2DMultisample = 0;
-
-    // OpenGL 4.2
-    QOpenGLContext *ctx = QOpenGLContext::currentContext();
-    if (ctx->format().majorVersion() >= 3) {
-        // OpenGL ES 3.0+ has immutable storage for 2D and 3D at least.
-        QOpenGLExtraFunctionsPrivate *extra = static_cast<QOpenGLExtensions *>(context->extraFunctions())->d();
-        TexStorage3D = extra->f.TexStorage3D;
-        TexStorage2D = extra->f.TexStorage2D;
-    } else {
-        TexStorage3D = 0;
-        TexStorage2D = 0;
-    }
-    TexStorage1D = 0;
-
-    // OpenGL 4.3
-    TexStorage3DMultisample = 0;
-    TexStorage2DMultisample = 0;
-    TexBufferRange = 0;
-    TextureView = 0;
-
-    // OpenGL ES 3.1+ has TexStorage2DMultisample
-    if (ctx->format().version() >= qMakePair(3, 1)) {
-        QOpenGLExtraFunctionsPrivate *extra = static_cast<QOpenGLExtensions *>(context->extraFunctions())->d();
-        TexStorage2DMultisample = extra->f.TexStorage2DMultisample;
-    }
-
-#endif
-
-    if (context->isOpenGLES() && context->hasExtension(QByteArrayLiteral("GL_OES_texture_3D"))) {
-        TexImage3D = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum, GLint, GLint, GLsizei, GLsizei, GLsizei, GLint, GLenum, GLenum, const GLvoid*)>(context->getProcAddress("glTexImage3DOES"));
-        TexSubImage3D = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLenum, GLenum, const GLvoid*)>(context->getProcAddress("glTexSubImage3DOES"));
-        CompressedTexImage3D = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum, GLint, GLenum, GLsizei, GLsizei, GLsizei, GLint, GLsizei, const GLvoid*)>(context->getProcAddress("glCompressedTexImage3DOES"));
-        CompressedTexSubImage3D = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLenum, GLsizei, const GLvoid*)>(context->getProcAddress("glCompressedTexSubImage3DOES"));
-    } else {
-        QOpenGLContext *ctx = QOpenGLContext::currentContext();
-        if (ctx->isOpenGLES() && ctx->format().majorVersion() >= 3) {
-            // OpenGL ES 3.0+ has glTexImage3D.
-            QOpenGLExtraFunctionsPrivate *extra = static_cast<QOpenGLExtensions *>(context->extraFunctions())->d();
-            TexImage3D = extra->f.TexImage3D;
-            TexSubImage3D = extra->f.TexSubImage3D;
-            CompressedTexImage3D = extra->f.CompressedTexImage3D;
-            CompressedTexSubImage3D = extra->f.CompressedTexSubImage3D;
-        } else {
-            // OpenGL 1.2
-            TexImage3D = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLint , GLint , GLsizei , GLsizei , GLsizei , GLint , GLenum , GLenum , const GLvoid *)>(context->getProcAddress("glTexImage3D"));
-            TexSubImage3D = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLint , GLint , GLint , GLint , GLsizei , GLsizei , GLsizei , GLenum , GLenum , const GLvoid *)>(context->getProcAddress("glTexSubImage3D"));
-
-            // OpenGL 1.3
-            CompressedTexImage3D = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLint , GLenum , GLsizei , GLsizei , GLsizei , GLint , GLsizei , const GLvoid *)>(context->getProcAddress("glCompressedTexImage3D"));
-            CompressedTexSubImage3D = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLint , GLint , GLint , GLint , GLsizei , GLsizei , GLsizei , GLenum , GLsizei , const GLvoid *)>(context->getProcAddress("glCompressedTexSubImage3D"));
-        }
-    }
-
-#ifndef QT_OPENGL_ES_2
-    // OpenGL 1.0 and 1.1
-    TexImage1D = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLint , GLint , GLsizei , GLint , GLenum , GLenum , const GLvoid *)>(context->getProcAddress("glTexImage1D"));
-    TexSubImage1D = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLint , GLint , GLsizei , GLenum , GLenum , const GLvoid *)>(context->getProcAddress("glTexSubImage1D"));\
-
-    // OpenGL 1.3
-    GetCompressedTexImage = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLint , GLvoid *)>(context->getProcAddress("glGetCompressedTexImage"));
-    CompressedTexSubImage1D = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLint , GLint , GLsizei , GLenum , GLsizei , const GLvoid *)>(context->getProcAddress("glCompressedTexSubImage1D"));
-    CompressedTexSubImage2D = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLint , GLint , GLint , GLsizei , GLsizei , GLenum , GLsizei , const GLvoid *)>(context->getProcAddress("glCompressedTexSubImage2D"));
-    CompressedTexImage1D = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLint , GLenum , GLsizei , GLint , GLsizei , const GLvoid *)>(context->getProcAddress("glCompressedTexImage1D"));
-    CompressedTexImage2D = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLint , GLenum , GLsizei , GLsizei , GLint , GLsizei , const GLvoid *)>(context->getProcAddress("glCompressedTexImage2D"));
-    ActiveTexture = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum )>(context->getProcAddress("glActiveTexture"));
-
-    // OpenGL 3.0
-    GenerateMipmap = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum )>(context->getProcAddress("glGenerateMipmap"));
-
-    // OpenGL 3.2
-    TexImage3DMultisample = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLsizei , GLint , GLsizei , GLsizei , GLsizei , GLboolean )>(context->getProcAddress("glTexImage3DMultisample"));
-    TexImage2DMultisample = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLsizei , GLint , GLsizei , GLsizei , GLboolean )>(context->getProcAddress("glTexImage2DMultisample"));
-
-    // OpenGL 4.2
-    TexStorage3D = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLsizei , GLenum , GLsizei , GLsizei , GLsizei )>(context->getProcAddress("glTexStorage3D"));
-    TexStorage2D = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLsizei , GLenum , GLsizei , GLsizei )>(context->getProcAddress("glTexStorage2D"));
-    TexStorage1D = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLsizei , GLenum , GLsizei )>(context->getProcAddress("glTexStorage1D"));
-
-    // OpenGL 4.3
-    TexStorage3DMultisample = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLsizei , GLenum , GLsizei , GLsizei , GLsizei , GLboolean )>(context->getProcAddress("glTexStorage3DMultisample"));
-    TexStorage2DMultisample = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLsizei , GLenum , GLsizei , GLsizei , GLboolean )>(context->getProcAddress("glTexStorage2DMultisample"));
-    TexBufferRange = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , GLuint , GLintptr , GLsizeiptr )>(context->getProcAddress("glTexBufferRange"));
-    TextureView = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLuint , GLenum , GLuint , GLuint , GLuint , GLuint )>(context->getProcAddress("glTextureView"));
-#endif
-}
-
-void QOpenGLTextureHelper::dsa_TextureParameteri(GLuint texture, GLenum target, GLenum bindingTarget, GLenum pname, GLint param)
-{
-    Q_UNUSED(bindingTarget);
-    TextureParameteriEXT(texture, target, pname, param);
-}
-
-void QOpenGLTextureHelper::dsa_TextureParameteriv(GLuint texture, GLenum target, GLenum bindingTarget, GLenum pname, const GLint *params)
-{
-    Q_UNUSED(bindingTarget);
-    TextureParameterivEXT(texture, target, pname, params);
-}
-
-void QOpenGLTextureHelper::dsa_TextureParameterf(GLuint texture, GLenum target, GLenum bindingTarget, GLenum pname, GLfloat param)
-{
-    Q_UNUSED(bindingTarget);
-    TextureParameterfEXT(texture, target, pname, param);
-}
-
-void QOpenGLTextureHelper::dsa_TextureParameterfv(GLuint texture, GLenum target, GLenum bindingTarget, GLenum pname, const GLfloat *params)
-{
-    Q_UNUSED(bindingTarget);
-    TextureParameterfvEXT(texture, target, pname, params);
-}
-
-void QOpenGLTextureHelper::dsa_GenerateTextureMipmap(GLuint texture, GLenum target, GLenum bindingTarget)
-{
-    Q_UNUSED(bindingTarget);
-    GenerateTextureMipmapEXT(texture, target);
-}
-
-void QOpenGLTextureHelper::dsa_TextureStorage3D(GLuint texture, GLenum target, GLenum bindingTarget, GLsizei levels, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth)
-{
-    Q_UNUSED(bindingTarget);
-    TextureStorage3DEXT(texture, target, levels, internalFormat, width, height, depth);
-}
-
-void QOpenGLTextureHelper::dsa_TextureStorage2D(GLuint texture, GLenum target, GLenum bindingTarget, GLsizei levels, GLenum internalFormat, GLsizei width, GLsizei height)
-{
-    Q_UNUSED(bindingTarget);
-    TextureStorage2DEXT(texture, target, levels, internalFormat, width, height);
-}
-
-void QOpenGLTextureHelper::dsa_TextureStorage1D(GLuint texture, GLenum target, GLenum bindingTarget, GLsizei levels, GLenum internalFormat, GLsizei width)
-{
-    Q_UNUSED(bindingTarget);
-    TextureStorage1DEXT(texture, target, levels, internalFormat, width);
-}
-
-void QOpenGLTextureHelper::dsa_TextureStorage3DMultisample(GLuint texture, GLenum target, GLenum bindingTarget, GLsizei samples, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedSampleLocations)
-{
-    Q_UNUSED(bindingTarget);
-    TextureStorage3DMultisampleEXT(texture, target, samples, internalFormat, width, height, depth, fixedSampleLocations);
-}
-
-void QOpenGLTextureHelper::dsa_TextureStorage2DMultisample(GLuint texture, GLenum target, GLenum bindingTarget, GLsizei samples, GLenum internalFormat, GLsizei width, GLsizei height, GLboolean fixedSampleLocations)
-{
-    Q_UNUSED(bindingTarget);
-    TextureStorage2DMultisampleEXT(texture, target, samples, internalFormat, width, height, fixedSampleLocations);
-}
-
-void QOpenGLTextureHelper::dsa_TextureImage3D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels)
-{
-    Q_UNUSED(bindingTarget);
-    TextureImage3DEXT(texture, target, level, internalFormat, width, height, depth, border, format, type, pixels);
-}
-
-void QOpenGLTextureHelper::dsa_TextureImage2D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level, GLenum internalFormat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid *pixels)
-{
-    Q_UNUSED(bindingTarget);
-    TextureImage2DEXT(texture, target, level, internalFormat, width, height, border, format, type, pixels);
-}
-
-void QOpenGLTextureHelper::dsa_TextureImage1D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level, GLenum internalFormat, GLsizei width, GLint border, GLenum format, GLenum type, const GLvoid *pixels)
-{
-    Q_UNUSED(bindingTarget);
-    TextureImage1DEXT(texture, target, level, internalFormat, width, border, format, type, pixels);
-}
-
-void QOpenGLTextureHelper::dsa_TextureSubImage3D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels)
-{
-    Q_UNUSED(bindingTarget);
-    TextureSubImage3DEXT(texture, target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels);
-}
-
-void QOpenGLTextureHelper::dsa_TextureSubImage2D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels)
-{
-    Q_UNUSED(bindingTarget);
-    TextureSubImage2DEXT(texture, target, level, xoffset, yoffset, width, height, format, type, pixels);
-}
-
-void QOpenGLTextureHelper::dsa_TextureSubImage1D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid *pixels)
-{
-    Q_UNUSED(bindingTarget);
-    TextureSubImage1DEXT(texture, target, level, xoffset, width, format, type, pixels);
-}
-
-void QOpenGLTextureHelper::dsa_TextureImage3DMultisample(GLuint texture, GLenum target, GLenum bindingTarget, GLsizei samples, GLint internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedSampleLocations)
-{
-    Q_UNUSED(bindingTarget);
-    TextureImage3DMultisampleNV(texture, target, samples, internalFormat, width, height, depth, fixedSampleLocations);
-}
-
-void QOpenGLTextureHelper::dsa_TextureImage2DMultisample(GLuint texture, GLenum target, GLenum bindingTarget, GLsizei samples, GLint internalFormat, GLsizei width, GLsizei height, GLboolean fixedSampleLocations)
-{
-    Q_UNUSED(bindingTarget);
-    TextureImage2DMultisampleNV(texture, target, samples, internalFormat, width, height, fixedSampleLocations);
-}
-
-void QOpenGLTextureHelper::dsa_CompressedTextureSubImage1D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *bits)
-{
-    Q_UNUSED(bindingTarget);
-    CompressedTextureSubImage1DEXT(texture, target, level, xoffset, width, format, imageSize, bits);
-}
-
-void QOpenGLTextureHelper::dsa_CompressedTextureSubImage2D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *bits)
-{
-    Q_UNUSED(bindingTarget);
-    CompressedTextureSubImage2DEXT(texture, target, level, xoffset, yoffset, width, height, format, imageSize, bits);
-}
-
-void QOpenGLTextureHelper::dsa_CompressedTextureSubImage3D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *bits)
-{
-    Q_UNUSED(bindingTarget);
-    CompressedTextureSubImage3DEXT(texture, target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, bits);
-}
-
-void QOpenGLTextureHelper::dsa_CompressedTextureImage1D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level, GLenum internalFormat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *bits)
-{
-    Q_UNUSED(bindingTarget);
-    CompressedTextureImage1DEXT(texture, target, level, internalFormat, width, border, imageSize, bits);
-}
-
-void QOpenGLTextureHelper::dsa_CompressedTextureImage2D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level, GLenum internalFormat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *bits)
-{
-    Q_UNUSED(bindingTarget);
-    CompressedTextureImage2DEXT(texture, target, level, internalFormat, width, height, border, imageSize, bits);
-}
-
-void QOpenGLTextureHelper::dsa_CompressedTextureImage3D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *bits)
-{
-    Q_UNUSED(bindingTarget);
-    CompressedTextureImage3DEXT(texture, target, level, internalFormat, width, height, depth, border, imageSize, bits);
-}
-
-namespace {
-
-class TextureBinder
-{
-public:
-    TextureBinder(QOpenGLFunctions *functions, GLuint texture, GLenum target, GLenum bindingTarget)
-    : m_functions(functions)
-    {
-        // For cubemaps we can't use the standard DSA emulation as it is illegal to
-        // try to bind a texture to one of the cubemap face targets. So we force the
-        // target and binding target to the cubemap values in this case.
-        switch (target) {
-        case GL_TEXTURE_CUBE_MAP_NEGATIVE_X:
-        case GL_TEXTURE_CUBE_MAP_POSITIVE_X:
-        case GL_TEXTURE_CUBE_MAP_NEGATIVE_Y:
-        case GL_TEXTURE_CUBE_MAP_POSITIVE_Y:
-        case GL_TEXTURE_CUBE_MAP_NEGATIVE_Z:
-        case GL_TEXTURE_CUBE_MAP_POSITIVE_Z:
-            bindingTarget = GL_TEXTURE_BINDING_CUBE_MAP;
-            m_target = GL_TEXTURE_CUBE_MAP;
-            break;
-
-        default:
-            m_target = target;
-            break;
-        }
-
-        m_functions->glGetIntegerv(bindingTarget, &m_oldTexture);
-        m_functions->glBindTexture(m_target, texture);
-    }
-
-    ~TextureBinder()
-    {
-        m_functions->glBindTexture(m_target, m_oldTexture);
-    }
-
-private:
-    QOpenGLFunctions *m_functions;
-    GLenum m_target;
-    GLint m_oldTexture;
-};
-
-} // namespace
-
-void QOpenGLTextureHelper::qt_TextureParameteri(GLuint texture, GLenum target, GLenum bindingTarget, GLenum pname, GLint param)
-{
-    TextureBinder binder(functions, texture, target, bindingTarget);
-    functions->glTexParameteri(target, pname, param);
-}
-
-void QOpenGLTextureHelper::qt_TextureParameteriv(GLuint texture, GLenum target, GLenum bindingTarget, GLenum pname, const GLint *params)
-{
-    TextureBinder binder(functions, texture, target, bindingTarget);
-    functions->glTexParameteriv(target, pname, params);
-}
-
-void QOpenGLTextureHelper::qt_TextureParameterf(GLuint texture, GLenum target, GLenum bindingTarget, GLenum pname, GLfloat param)
-{
-    TextureBinder binder(functions, texture, target, bindingTarget);
-    functions->glTexParameterf(target, pname, param);
-}
-
-void QOpenGLTextureHelper::qt_TextureParameterfv(GLuint texture, GLenum target, GLenum bindingTarget, GLenum pname, const GLfloat *params)
-{
-    TextureBinder binder(functions, texture, target, bindingTarget);
-    functions->glTexParameterfv(target, pname, params);
-}
-
-void QOpenGLTextureHelper::qt_GenerateTextureMipmap(GLuint texture, GLenum target, GLenum bindingTarget)
-{
-    TextureBinder binder(functions, texture, target, bindingTarget);
-    functions->glGenerateMipmap(target);
-}
-
-void QOpenGLTextureHelper::qt_TextureStorage3D(GLuint texture, GLenum target, GLenum bindingTarget, GLsizei levels, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth)
-{
-    TextureBinder binder(functions, texture, target, bindingTarget);
-    glTexStorage3D(target, levels, internalFormat, width, height, depth);
-}
-
-void QOpenGLTextureHelper::qt_TextureStorage2D(GLuint texture, GLenum target, GLenum bindingTarget, GLsizei levels, GLenum internalFormat, GLsizei width, GLsizei height)
-{
-    TextureBinder binder(functions, texture, target, bindingTarget);
-    glTexStorage2D(target, levels, internalFormat, width, height);
-}
-
-void QOpenGLTextureHelper::qt_TextureStorage1D(GLuint texture, GLenum target, GLenum bindingTarget, GLsizei levels, GLenum internalFormat, GLsizei width)
-{
-    TextureBinder binder(functions, texture, target, bindingTarget);
-    glTexStorage1D(target, levels, internalFormat, width);
-}
-
-void QOpenGLTextureHelper::qt_TextureStorage3DMultisample(GLuint texture, GLenum target, GLenum bindingTarget, GLsizei samples, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedSampleLocations)
-{
-    TextureBinder binder(functions, texture, target, bindingTarget);
-    glTexStorage3DMultisample(target, samples, internalFormat, width, height, depth, fixedSampleLocations);
-}
-
-void QOpenGLTextureHelper::qt_TextureStorage2DMultisample(GLuint texture, GLenum target, GLenum bindingTarget, GLsizei samples, GLenum internalFormat, GLsizei width, GLsizei height, GLboolean fixedSampleLocations)
-{
-    TextureBinder binder(functions, texture, target, bindingTarget);
-    glTexStorage2DMultisample(target, samples, internalFormat, width, height, fixedSampleLocations);
-}
-
-void QOpenGLTextureHelper::qt_TextureImage3D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels)
-{
-    TextureBinder binder(functions, texture, target, bindingTarget);
-    glTexImage3D(target, level, internalFormat, width, height, depth, border, format, type, pixels);
-}
-
-void QOpenGLTextureHelper::qt_TextureImage2D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level, GLenum internalFormat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid *pixels)
-{
-    TextureBinder binder(functions, texture, target, bindingTarget);
-    functions->glTexImage2D(target, level, internalFormat, width, height, border, format, type, pixels);
-}
-
-void QOpenGLTextureHelper::qt_TextureImage1D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level, GLenum internalFormat, GLsizei width, GLint border, GLenum format, GLenum type, const GLvoid *pixels)
-{
-    TextureBinder binder(functions, texture, target, bindingTarget);
-    glTexImage1D(target, level, internalFormat, width, border, format, type, pixels);
-}
-
-void QOpenGLTextureHelper::qt_TextureSubImage3D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels)
-{
-    TextureBinder binder(functions, texture, target, bindingTarget);
-    glTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels);
-}
-
-void QOpenGLTextureHelper::qt_TextureSubImage2D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels)
-{
-    TextureBinder binder(functions, texture, target, bindingTarget);
-    functions->glTexSubImage2D(target, level, xoffset, yoffset, width, height, format, type, pixels);
-}
-
-void QOpenGLTextureHelper::qt_TextureSubImage1D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid *pixels)
-{
-    TextureBinder binder(functions, texture, target, bindingTarget);
-    glTexSubImage1D(target, level, xoffset, width, format, type, pixels);
-}
-
-void QOpenGLTextureHelper::qt_TextureImage3DMultisample(GLuint texture, GLenum target, GLenum bindingTarget, GLsizei samples, GLint internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedSampleLocations)
-{
-    TextureBinder binder(functions, texture, target, bindingTarget);
-    glTexImage3DMultisample(target, samples, internalFormat, width, height, depth, fixedSampleLocations);
-}
-
-void QOpenGLTextureHelper::qt_TextureImage2DMultisample(GLuint texture, GLenum target, GLenum bindingTarget, GLsizei samples, GLint internalFormat, GLsizei width, GLsizei height, GLboolean fixedSampleLocations)
-{
-    TextureBinder binder(functions, texture, target, bindingTarget);
-    glTexImage2DMultisample(target, samples, internalFormat, width, height, fixedSampleLocations);
-}
-
-void QOpenGLTextureHelper::qt_CompressedTextureSubImage1D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *bits)
-{
-    TextureBinder binder(functions, texture, target, bindingTarget);
-    glCompressedTexSubImage1D(target, level, xoffset, width, format, imageSize, bits);
-}
-
-void QOpenGLTextureHelper::qt_CompressedTextureSubImage2D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *bits)
-{
-    TextureBinder binder(functions, texture, target, bindingTarget);
-    glCompressedTexSubImage2D(target, level, xoffset, yoffset, width, height, format, imageSize, bits);
-}
-
-void QOpenGLTextureHelper::qt_CompressedTextureSubImage3D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *bits)
-{
-    TextureBinder binder(functions, texture, target, bindingTarget);
-    glCompressedTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, bits);
-}
-
-void QOpenGLTextureHelper::qt_CompressedTextureImage1D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level, GLenum internalFormat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *bits)
-{
-    TextureBinder binder(functions, texture, target, bindingTarget);
-    glCompressedTexImage1D(target, level, internalFormat, width, border, imageSize, bits);
-}
-
-void QOpenGLTextureHelper::qt_CompressedTextureImage2D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level, GLenum internalFormat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *bits)
-{
-    TextureBinder binder(functions, texture, target, bindingTarget);
-    glCompressedTexImage2D(target, level, internalFormat, width, height, border, imageSize, bits);
-}
-
-void QOpenGLTextureHelper::qt_CompressedTextureImage3D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *bits)
-{
-    TextureBinder binder(functions, texture, target, bindingTarget);
-    glCompressedTexImage3D(target, level, internalFormat, width, height, depth, border, imageSize, bits);
-}
-
-QT_END_NAMESPACE
diff --git a/src/gui/opengl/qopengltexturehelper_p.h b/src/gui/opengl/qopengltexturehelper_p.h
deleted file mode 100644
index 62d0125daf..0000000000
--- a/src/gui/opengl/qopengltexturehelper_p.h
+++ /dev/null
@@ -1,797 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB).
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtGui module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QOPENGLTEXTUREHELPER_P_H
-#define QOPENGLTEXTUREHELPER_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include <QtGui/private/qtguiglobal_p.h>
-
-#ifndef QT_NO_OPENGL
-
-#include "qopengl.h"
-#include "qopenglpixeltransferoptions.h"
-#include "qopengltexture.h"
-#include "qopenglfunctions.h"
-
-QT_BEGIN_NAMESPACE
-
-// Constants for OpenGL and OpenGL ES 3.0+ which are not available with OpenGL ES 2.0.
-#ifndef GL_TEXTURE_BASE_LEVEL
-#define GL_TEXTURE_BASE_LEVEL 0x813C
-#endif
-#ifndef GL_TEXTURE_MAX_LEVEL
-#define GL_TEXTURE_MAX_LEVEL 0x813D
-#endif
-#ifndef GL_TEXTURE_COMPARE_MODE
-#define GL_TEXTURE_COMPARE_MODE 0x884C
-#endif
-#ifndef GL_TEXTURE_COMPARE_FUNC
-#define GL_TEXTURE_COMPARE_FUNC 0x884D
-#endif
-
-// use GL_APICALL only on Android + __clang__
-#if !defined(Q_OS_ANDROID) || !defined(__clang__)
-# undef GL_APICALL
-# define GL_APICALL
-#elif !defined(GL_APICALL)
-# define GL_APICALL
-#endif
-
-class QOpenGLContext;
-
-class QOpenGLTextureHelper
-{
-public:
-    QOpenGLTextureHelper(QOpenGLContext *context);
-
-    // DSA-like API. Will either use real DSA or our emulation
-    inline void glTextureParameteri(GLuint texture, GLenum target, GLenum bindingTarget, GLenum pname, GLint param)
-    {
-        (this->*TextureParameteri)(texture, target, bindingTarget, pname, param);
-    }
-
-    inline void glTextureParameteriv(GLuint texture, GLenum target, GLenum bindingTarget, GLenum pname, const GLint *params)
-    {
-        (this->*TextureParameteriv)(texture, target, bindingTarget, pname, params);
-    }
-
-    inline void glTextureParameterf(GLuint texture, GLenum target, GLenum bindingTarget, GLenum pname, GLfloat param)
-    {
-        (this->*TextureParameterf)(texture, target, bindingTarget, pname, param);
-    }
-
-    inline void glTextureParameterfv(GLuint texture, GLenum target, GLenum bindingTarget, GLenum pname, const GLfloat *params)
-    {
-        (this->*TextureParameterfv)(texture, target, bindingTarget, pname, params);
-    }
-
-    inline void glGenerateTextureMipmap(GLuint texture, GLenum target, GLenum bindingTarget)
-    {
-        (this->*GenerateTextureMipmap)(texture, target, bindingTarget);
-    }
-
-    inline void glTextureStorage3D(GLuint texture, GLenum target, GLenum bindingTarget, GLsizei levels, GLenum internalFormat,
-                                   GLsizei width, GLsizei height, GLsizei depth)
-    {
-        (this->*TextureStorage3D)(texture, target, bindingTarget, levels, internalFormat, width, height, depth);
-    }
-
-    inline void glTextureStorage2D(GLuint texture, GLenum target, GLenum bindingTarget, GLsizei levels, GLenum internalFormat,
-                                   GLsizei width, GLsizei height)
-    {
-        (this->*TextureStorage2D)(texture, target, bindingTarget, levels, internalFormat, width, height);
-    }
-
-    inline void glTextureStorage1D(GLuint texture, GLenum target, GLenum bindingTarget, GLsizei levels, GLenum internalFormat,
-                                   GLsizei width)
-    {
-        (this->*TextureStorage1D)(texture, target, bindingTarget, levels, internalFormat, width);
-    }
-
-    inline void glTextureStorage3DMultisample(GLuint texture, GLenum target, GLenum bindingTarget, GLsizei samples, GLenum internalFormat,
-                                              GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedSampleLocations)
-    {
-        (this->*TextureStorage3DMultisample)(texture, target, bindingTarget, samples, internalFormat, width, height, depth, fixedSampleLocations);
-    }
-
-    inline void glTextureStorage2DMultisample(GLuint texture, GLenum target, GLenum bindingTarget, GLsizei samples, GLenum internalFormat,
-                                              GLsizei width, GLsizei height, GLboolean fixedSampleLocations)
-    {
-        (this->*TextureStorage2DMultisample)(texture, target, bindingTarget, samples, internalFormat, width, height, fixedSampleLocations);
-    }
-
-    inline void glTextureImage3D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level, GLenum internalFormat,
-                                 GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels)
-    {
-        (this->*TextureImage3D)(texture, target, bindingTarget, level, internalFormat, width, height, depth, border, format, type, pixels);
-    }
-
-    inline void glTextureImage2D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level, GLenum internalFormat,
-                                 GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid *pixels)
-    {
-        (this->*TextureImage2D)(texture, target, bindingTarget, level, internalFormat, width, height, border, format, type, pixels);
-    }
-
-    inline void glTextureImage1D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level, GLenum internalFormat,
-                                 GLsizei width, GLint border, GLenum format, GLenum type, const GLvoid *pixels)
-    {
-        (this->*TextureImage1D)(texture, target, bindingTarget, level, internalFormat, width, border, format, type, pixels);
-    }
-
-    inline void glTextureSubImage3D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level, GLint xoffset, GLint yoffset, GLint zoffset,
-                                    GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type,
-                                    const GLvoid *pixels, const QOpenGLPixelTransferOptions * const options = nullptr)
-    {
-        if (options) {
-            QOpenGLPixelTransferOptions oldOptions = savePixelUploadOptions();
-            setPixelUploadOptions(*options);
-            (this->*TextureSubImage3D)(texture, target, bindingTarget, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels);
-            setPixelUploadOptions(oldOptions);
-        } else {
-            (this->*TextureSubImage3D)(texture, target, bindingTarget, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels);
-        }
-    }
-
-    inline void glTextureSubImage2D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level, GLint xoffset, GLint yoffset,
-                                    GLsizei width, GLsizei height, GLenum format, GLenum type,
-                                    const GLvoid *pixels, const QOpenGLPixelTransferOptions * const options = nullptr)
-    {
-        if (options) {
-            QOpenGLPixelTransferOptions oldOptions = savePixelUploadOptions();
-            setPixelUploadOptions(*options);
-            (this->*TextureSubImage2D)(texture, target, bindingTarget, level, xoffset, yoffset, width, height, format, type, pixels);
-            setPixelUploadOptions(oldOptions);
-        } else {
-            (this->*TextureSubImage2D)(texture, target, bindingTarget, level, xoffset, yoffset, width, height, format, type, pixels);
-        }
-    }
-
-    inline void glTextureSubImage1D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level, GLint xoffset,
-                                    GLsizei width, GLenum format, GLenum type,
-                                    const GLvoid *pixels, const QOpenGLPixelTransferOptions * const options = nullptr)
-    {
-        if (options) {
-            QOpenGLPixelTransferOptions oldOptions = savePixelUploadOptions();
-            setPixelUploadOptions(*options);
-            (this->*TextureSubImage1D)(texture, target, bindingTarget, level, xoffset, width, format, type, pixels);
-            setPixelUploadOptions(oldOptions);
-        } else {
-            (this->*TextureSubImage1D)(texture, target, bindingTarget, level, xoffset, width, format, type, pixels);
-        }
-    }
-
-    inline void glTextureImage3DMultisample(GLuint texture, GLenum target, GLenum bindingTarget, GLsizei samples, GLint internalFormat,
-                                            GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedSampleLocations)
-    {
-        (this->*TextureImage3DMultisample)(texture, target, bindingTarget, samples, internalFormat, width, height, depth, fixedSampleLocations);
-    }
-
-    inline void glTextureImage2DMultisample(GLuint texture, GLenum target, GLenum bindingTarget, GLsizei samples, GLint internalFormat,
-                                            GLsizei width, GLsizei height, GLboolean fixedSampleLocations)
-    {
-        (this->*TextureImage2DMultisample)(texture, target, bindingTarget, samples, internalFormat, width, height, fixedSampleLocations);
-    }
-
-    inline void glCompressedTextureSubImage1D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level,
-                                              GLint xoffset, GLsizei width,
-                                              GLenum format, GLsizei imageSize, const GLvoid *bits,
-                                              const QOpenGLPixelTransferOptions * const options = nullptr)
-    {
-        if (options) {
-            QOpenGLPixelTransferOptions oldOptions = savePixelUploadOptions();
-            setPixelUploadOptions(*options);
-            (this->*CompressedTextureSubImage1D)(texture, target, bindingTarget, level, xoffset, width, format, imageSize, bits);
-            setPixelUploadOptions(oldOptions);
-        } else {
-            (this->*CompressedTextureSubImage1D)(texture, target, bindingTarget, level, xoffset, width, format, imageSize, bits);
-        }
-    }
-
-    inline void glCompressedTextureSubImage2D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level,
-                                              GLint xoffset, GLint yoffset,
-                                              GLsizei width, GLsizei height,
-                                              GLenum format, GLsizei imageSize, const GLvoid *bits,
-                                              const QOpenGLPixelTransferOptions * const options = nullptr)
-    {
-        if (options) {
-            QOpenGLPixelTransferOptions oldOptions = savePixelUploadOptions();
-            setPixelUploadOptions(*options);
-            (this->*CompressedTextureSubImage2D)(texture, target, bindingTarget, level, xoffset, yoffset, width, height, format, imageSize, bits);
-            setPixelUploadOptions(oldOptions);
-        } else {
-            (this->*CompressedTextureSubImage2D)(texture, target, bindingTarget, level, xoffset, yoffset, width, height, format, imageSize, bits);
-        }
-    }
-
-    inline void glCompressedTextureSubImage3D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level,
-                                              GLint xoffset, GLint yoffset, GLint zoffset,
-                                              GLsizei width, GLsizei height, GLsizei depth,
-                                              GLenum format, GLsizei imageSize, const GLvoid *bits,
-                                              const QOpenGLPixelTransferOptions * const options = nullptr)
-    {
-        if (options) {
-            QOpenGLPixelTransferOptions oldOptions = savePixelUploadOptions();
-            setPixelUploadOptions(*options);
-            (this->*CompressedTextureSubImage3D)(texture, target, bindingTarget, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, bits);
-            setPixelUploadOptions(oldOptions);
-        } else {
-            (this->*CompressedTextureSubImage3D)(texture, target, bindingTarget, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, bits);
-        }
-    }
-
-    inline void glCompressedTextureImage1D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level,
-                                           GLenum internalFormat, GLsizei width,
-                                           GLint border, GLsizei imageSize, const GLvoid *bits,
-                                           const QOpenGLPixelTransferOptions * const options = nullptr)
-    {
-        if (options) {
-            QOpenGLPixelTransferOptions oldOptions = savePixelUploadOptions();
-            setPixelUploadOptions(*options);
-            (this->*CompressedTextureImage1D)(texture, target, bindingTarget, level, internalFormat, width, border, imageSize, bits);
-            setPixelUploadOptions(oldOptions);
-        } else {
-            (this->*CompressedTextureImage1D)(texture, target, bindingTarget, level, internalFormat, width, border, imageSize, bits);
-        }
-    }
-
-    inline void glCompressedTextureImage2D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level,
-                                           GLenum internalFormat, GLsizei width, GLsizei height,
-                                           GLint border, GLsizei imageSize, const GLvoid *bits,
-                                           const QOpenGLPixelTransferOptions * const options = nullptr)
-
-    {
-        if (options) {
-            QOpenGLPixelTransferOptions oldOptions = savePixelUploadOptions();
-            setPixelUploadOptions(*options);
-            (this->*CompressedTextureImage2D)(texture, target, bindingTarget, level, internalFormat, width, height, border, imageSize, bits);
-            setPixelUploadOptions(oldOptions);
-        } else {
-            (this->*CompressedTextureImage2D)(texture, target, bindingTarget, level, internalFormat, width, height, border, imageSize, bits);
-        }
-    }
-
-    inline void glCompressedTextureImage3D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level,
-                                           GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth,
-                                           GLint border, GLsizei imageSize, const GLvoid *bits,
-                                           const QOpenGLPixelTransferOptions * const options = nullptr)
-    {
-        if (options) {
-            QOpenGLPixelTransferOptions oldOptions = savePixelUploadOptions();
-            setPixelUploadOptions(*options);
-            (this->*CompressedTextureImage3D)(texture, target, bindingTarget, level, internalFormat, width, height, depth, border, imageSize, bits);
-            setPixelUploadOptions(oldOptions);
-        } else {
-            (this->*CompressedTextureImage3D)(texture, target, bindingTarget, level, internalFormat, width, height, depth, border, imageSize, bits);
-        }
-    }
-
-private:
-    // DSA wrapper (so we can use pointer to member function as switch)
-    void dsa_TextureParameteri(GLuint texture, GLenum target, GLenum bindingTarget, GLenum pname, GLint param);
-
-    void dsa_TextureParameteriv(GLuint texture, GLenum target, GLenum bindingTarget, GLenum pname, const GLint *params);
-
-    void dsa_TextureParameterf(GLuint texture, GLenum target, GLenum bindingTarget, GLenum pname, GLfloat param);
-
-    void dsa_TextureParameterfv(GLuint texture, GLenum target, GLenum bindingTarget, GLenum pname, const GLfloat *params);
-
-    void dsa_GenerateTextureMipmap(GLuint texture, GLenum target, GLenum bindingTarget);
-
-    void dsa_TextureStorage3D(GLuint texture, GLenum target, GLenum bindingTarget, GLsizei levels, GLenum internalFormat,
-                              GLsizei width, GLsizei height, GLsizei depth);
-
-    void dsa_TextureStorage2D(GLuint texture, GLenum target, GLenum bindingTarget, GLsizei levels, GLenum internalFormat,
-                              GLsizei width, GLsizei height);
-
-    void dsa_TextureStorage1D(GLuint texture, GLenum target, GLenum bindingTarget, GLsizei levels, GLenum internalFormat,
-                              GLsizei width);
-
-    void dsa_TextureStorage3DMultisample(GLuint texture, GLenum target, GLenum bindingTarget, GLsizei samples, GLenum internalFormat,
-                                         GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedSampleLocations);
-
-    void dsa_TextureStorage2DMultisample(GLuint texture, GLenum target, GLenum bindingTarget, GLsizei samples, GLenum internalFormat,
-                                         GLsizei width, GLsizei height, GLboolean fixedSampleLocations);
-
-    void dsa_TextureImage3D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level, GLenum internalFormat,
-                            GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
-
-    void dsa_TextureImage2D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level, GLenum internalFormat,
-                            GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
-
-    void dsa_TextureImage1D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level, GLenum internalFormat,
-                            GLsizei width, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
-
-    void dsa_TextureSubImage3D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level, GLint xoffset, GLint yoffset, GLint zoffset,
-                               GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels);
-
-    void dsa_TextureSubImage2D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level, GLint xoffset, GLint yoffset,
-                               GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels);
-
-    void dsa_TextureSubImage1D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level, GLint xoffset,
-                               GLsizei width, GLenum format, GLenum type, const GLvoid *pixels);
-
-    void dsa_TextureImage3DMultisample(GLuint texture, GLenum target, GLenum bindingTarget, GLsizei samples, GLint internalFormat,
-                                       GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedSampleLocations);
-
-    void dsa_TextureImage2DMultisample(GLuint texture, GLenum target, GLenum bindingTarget, GLsizei samples, GLint internalFormat,
-                                       GLsizei width, GLsizei height, GLboolean fixedSampleLocations);
-
-    void dsa_CompressedTextureSubImage1D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level,
-                                         GLint xoffset, GLsizei width,
-                                         GLenum format, GLsizei imageSize, const GLvoid *bits);
-
-    void dsa_CompressedTextureSubImage2D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level,
-                                         GLint xoffset, GLint yoffset,
-                                         GLsizei width, GLsizei height,
-                                         GLenum format, GLsizei imageSize, const GLvoid *bits);
-
-    void dsa_CompressedTextureSubImage3D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level,
-                                         GLint xoffset, GLint yoffset, GLint zoffset,
-                                         GLsizei width, GLsizei height, GLsizei depth,
-                                         GLenum format, GLsizei imageSize, const GLvoid *bits);
-
-    void dsa_CompressedTextureImage1D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level,
-                                      GLenum internalFormat, GLsizei width,
-                                      GLint border, GLsizei imageSize, const GLvoid *bits);
-
-    void dsa_CompressedTextureImage2D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level,
-                                      GLenum internalFormat, GLsizei width, GLsizei height,
-                                      GLint border, GLsizei imageSize, const GLvoid *bits);
-
-    void dsa_CompressedTextureImage3D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level,
-                                      GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth,
-                                      GLint border, GLsizei imageSize, const GLvoid *bits);
-
-    // DSA emulation API
-    void qt_TextureParameteri(GLuint texture, GLenum target, GLenum bindingTarget, GLenum pname, GLint param);
-
-    void qt_TextureParameteriv(GLuint texture, GLenum target, GLenum bindingTarget, GLenum pname, const GLint *params);
-
-    void qt_TextureParameterf(GLuint texture, GLenum target, GLenum bindingTarget, GLenum pname, GLfloat param);
-
-    void qt_TextureParameterfv(GLuint texture, GLenum target, GLenum bindingTarget, GLenum pname, const GLfloat *params);
-
-    void qt_GenerateTextureMipmap(GLuint texture, GLenum target, GLenum bindingTarget);
-
-    void qt_TextureStorage3D(GLuint texture, GLenum target, GLenum bindingTarget, GLsizei levels,
-                             GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth);
-
-    void qt_TextureStorage2D(GLuint texture, GLenum target, GLenum bindingTarget, GLsizei levels,
-                             GLenum internalFormat, GLsizei width, GLsizei height);
-
-    void qt_TextureStorage1D(GLuint texture, GLenum target, GLenum bindingTarget, GLsizei levels,
-                             GLenum internalFormat, GLsizei width);
-
-    void qt_TextureStorage3DMultisample(GLuint texture, GLenum target, GLenum bindingTarget, GLsizei samples,
-                                        GLenum internalFormat, GLsizei width, GLsizei height,
-                                        GLsizei depth, GLboolean fixedSampleLocations);
-
-    void qt_TextureStorage2DMultisample(GLuint texture, GLenum target, GLenum bindingTarget, GLsizei samples,
-                                        GLenum internalFormat, GLsizei width, GLsizei height,
-                                        GLboolean fixedSampleLocations);
-
-    void qt_TextureImage3D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level, GLenum internalFormat,
-                           GLsizei width, GLsizei height, GLsizei depth,
-                           GLint border, GLenum format, GLenum type,
-                           const GLvoid *pixels);
-
-    void qt_TextureImage2D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level, GLenum internalFormat,
-                           GLsizei width, GLsizei height,
-                           GLint border, GLenum format, GLenum type,
-                           const GLvoid *pixels);
-
-    void qt_TextureImage1D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level, GLenum internalFormat,
-                           GLsizei width, GLint border, GLenum format, GLenum type,
-                           const GLvoid *pixels);
-
-    void qt_TextureSubImage3D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level,
-                              GLint xoffset, GLint yoffset, GLint zoffset,
-                              GLsizei width, GLsizei height, GLsizei depth,
-                              GLenum format, GLenum type, const GLvoid *pixels);
-
-    void qt_TextureSubImage2D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level,
-                              GLint xoffset, GLint yoffset,
-                              GLsizei width, GLsizei height,
-                              GLenum format, GLenum type, const GLvoid *pixels);
-
-    void qt_TextureSubImage1D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level,
-                              GLint xoffset, GLsizei width,
-                              GLenum format, GLenum type, const GLvoid *pixels);
-
-    void qt_TextureImage3DMultisample(GLuint texture, GLenum target, GLenum bindingTarget, GLsizei samples,
-                                      GLint internalFormat, GLsizei width, GLsizei height, GLsizei depth,
-                                      GLboolean fixedSampleLocations);
-
-    void qt_TextureImage2DMultisample(GLuint texture, GLenum target, GLenum bindingTarget, GLsizei samples,
-                                      GLint internalFormat, GLsizei width, GLsizei height,
-                                      GLboolean fixedSampleLocations);
-
-    void qt_CompressedTextureSubImage1D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level,
-                                        GLint xoffset, GLsizei width, GLenum format,
-                                        GLsizei imageSize, const GLvoid *bits);
-
-    void qt_CompressedTextureSubImage2D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level,
-                                        GLint xoffset, GLint yoffset,
-                                        GLsizei width, GLsizei height,
-                                        GLenum format, GLsizei imageSize, const GLvoid *bits);
-
-    void qt_CompressedTextureSubImage3D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level,
-                                        GLint xoffset, GLint yoffset, GLint zoffset,
-                                        GLsizei width, GLsizei height, GLsizei depth,
-                                        GLenum format, GLsizei imageSize, const GLvoid *bits);
-
-    void qt_CompressedTextureImage1D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level, GLenum internalFormat,
-                                     GLsizei width, GLint border,
-                                     GLsizei imageSize, const GLvoid *bits);
-
-    void qt_CompressedTextureImage2D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level, GLenum internalFormat,
-                                     GLsizei width, GLsizei height, GLint border,
-                                     GLsizei imageSize, const GLvoid *bits);
-
-    void qt_CompressedTextureImage3D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level, GLenum internalFormat,
-                                     GLsizei width, GLsizei height, GLsizei depth, GLint border,
-                                     GLsizei imageSize, const GLvoid *bits);
-
-public:
-    // Raw OpenGL functions, resolved and used by our DSA-like static functions if no EXT_direct_state_access is available
-
-    // OpenGL 1.0
-    inline void glTexImage1D(GLenum target, GLint level, GLint internalFormat,
-                             GLsizei width, GLint border,
-                             GLenum format, GLenum type, const GLvoid *pixels)
-    {
-        TexImage1D(target, level, internalFormat, width, border, format, type, pixels);
-    }
-
-    // OpenGL 1.1
-    inline void glTexSubImage1D(GLenum target, GLint level, GLint xoffset, GLsizei width,
-                                GLenum format, GLenum type, const GLvoid *pixels)
-    {
-        TexSubImage1D(target, level, xoffset, width, format, type, pixels);
-    }
-
-    // OpenGL 1.2
-    inline void glTexImage3D(GLenum target, GLint level, GLint internalFormat,
-                             GLsizei width, GLsizei height, GLsizei depth, GLint border,
-                             GLenum format, GLenum type, const GLvoid *pixels)
-    {
-        TexImage3D(target, level, internalFormat, width, height, depth, border, format, type, pixels);
-    }
-
-    inline void glTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset,
-                                GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels)
-    {
-        TexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels);
-    }
-
-    // OpenGL 1.3
-    inline void glGetCompressedTexImage(GLenum target, GLint level, GLvoid *img)
-    {
-        GetCompressedTexImage(target, level, img);
-    }
-
-    inline void glCompressedTexSubImage1D(GLenum target, GLint level, GLint xoffset, GLsizei width,
-                                          GLenum format, GLsizei imageSize, const GLvoid *data)
-    {
-        CompressedTexSubImage1D(target, level, xoffset, width, format, imageSize, data);
-    }
-
-    inline void glCompressedTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset,
-                                          GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *data)
-    {
-        CompressedTexSubImage2D(target, level, xoffset, yoffset, width, height, format, imageSize, data);
-    }
-
-    inline void glCompressedTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset,
-                                          GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *data)
-    {
-        CompressedTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, data);
-    }
-
-    inline void glCompressedTexImage1D(GLenum target, GLint level, GLenum internalFormat, GLsizei width,
-                                       GLint border, GLsizei imageSize, const GLvoid *data)
-    {
-        CompressedTexImage1D(target, level, internalFormat, width, border, imageSize, data);
-    }
-
-    inline void glCompressedTexImage2D(GLenum target, GLint level, GLenum internalFormat, GLsizei width, GLsizei height,
-                                       GLint border, GLsizei imageSize, const GLvoid *data)
-    {
-        CompressedTexImage2D(target, level, internalFormat, width, height, border, imageSize, data);
-    }
-
-    inline void glCompressedTexImage3D(GLenum target, GLint level, GLenum internalFormat,
-                                       GLsizei width, GLsizei height, GLsizei depth,
-                                       GLint border, GLsizei imageSize, const GLvoid *data)
-    {
-        CompressedTexImage3D(target, level, internalFormat, width, height, depth, border, imageSize, data);
-    }
-
-    inline void glActiveTexture(GLenum texture)
-    {
-        ActiveTexture(texture);
-    }
-
-    // OpenGL 3.0
-    inline void glGenerateMipmap(GLenum target)
-    {
-        GenerateMipmap(target);
-    }
-
-    // OpenGL 3.2
-    inline void glTexImage3DMultisample(GLenum target, GLsizei samples, GLint internalFormat,
-                                        GLsizei width, GLsizei height, GLsizei depth,
-                                        GLboolean fixedSampleLocations)
-    {
-        TexImage3DMultisample(target, samples, internalFormat, width, height, depth, fixedSampleLocations);
-    }
-
-    inline void glTexImage2DMultisample(GLenum target, GLsizei samples, GLint internalFormat,
-                                        GLsizei width, GLsizei height,
-                                        GLboolean fixedSampleLocations)
-    {
-        TexImage2DMultisample(target, samples, internalFormat, width, height, fixedSampleLocations);
-    }
-
-    // OpenGL 4.2
-    inline void glTexStorage3D(GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth)
-    {
-        TexStorage3D(target, levels, internalFormat, width, height, depth);
-    }
-
-    inline void glTexStorage2D(GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width, GLsizei height)
-    {
-        TexStorage2D(target, levels, internalFormat, width, height);
-    }
-
-    inline void glTexStorage1D(GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width)
-    {
-        TexStorage1D(target, levels, internalFormat, width);
-    }
-
-    // OpenGL 4.3
-    inline void glTexStorage3DMultisample(GLenum target, GLsizei samples, GLenum internalFormat,
-                                          GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedSampleLocations)
-    {
-        TexStorage3DMultisample(target, samples, internalFormat, width, height, depth, fixedSampleLocations);
-    }
-
-    inline void glTexStorage2DMultisample(GLenum target, GLsizei samples, GLenum internalFormat,
-                                          GLsizei width, GLsizei height, GLboolean fixedSampleLocations)
-    {
-        TexStorage2DMultisample(target, samples, internalFormat, width, height, fixedSampleLocations);
-    }
-
-    inline void glTexBufferRange(GLenum target, GLenum internalFormat, GLuint buffer,
-                                 GLintptr offset, GLsizeiptr size)
-    {
-        TexBufferRange(target, internalFormat, buffer, offset, size);
-    }
-
-    inline void glTextureView(GLuint texture, GLenum target, GLuint origTexture, GLenum internalFormat,
-                              GLuint minLevel, GLuint numLevels, GLuint minLayer, GLuint numLayers)
-    {
-        TextureView(texture, target, origTexture, internalFormat, minLevel, numLevels, minLayer, numLayers);
-    }
-
-    // Helper functions
-    inline QOpenGLPixelTransferOptions savePixelUploadOptions()
-    {
-        QOpenGLPixelTransferOptions options;
-        int val = 0;
-        functions->glGetIntegerv(GL_UNPACK_ALIGNMENT, &val);
-        options.setAlignment(val);
-#if !defined(QT_OPENGL_ES_2)
-        functions->glGetIntegerv(GL_UNPACK_SKIP_IMAGES, &val);
-        options.setSkipImages(val);
-        functions->glGetIntegerv(GL_UNPACK_SKIP_ROWS, &val);
-        options.setSkipRows(val);
-        functions->glGetIntegerv(GL_UNPACK_SKIP_PIXELS, &val);
-        options.setSkipPixels(val);
-        functions->glGetIntegerv(GL_UNPACK_IMAGE_HEIGHT, &val);
-        options.setImageHeight(val);
-        functions->glGetIntegerv(GL_UNPACK_ROW_LENGTH, &val);
-        options.setRowLength(val);
-        GLboolean b = GL_FALSE;
-        functions->glGetBooleanv(GL_UNPACK_LSB_FIRST, &b);
-        options.setLeastSignificantByteFirst(b);
-        functions->glGetBooleanv(GL_UNPACK_SWAP_BYTES, &b);
-        options.setSwapBytesEnabled(b);
-#endif
-        return options;
-    }
-
-    inline void setPixelUploadOptions(const QOpenGLPixelTransferOptions &options)
-    {
-        functions->glPixelStorei(GL_UNPACK_ALIGNMENT, options.alignment());
-#if !defined(QT_OPENGL_ES_2)
-        functions->glPixelStorei(GL_UNPACK_SKIP_IMAGES, options.skipImages());
-        functions->glPixelStorei(GL_UNPACK_SKIP_ROWS, options.skipRows());
-        functions->glPixelStorei(GL_UNPACK_SKIP_PIXELS, options.skipPixels());
-        functions->glPixelStorei(GL_UNPACK_IMAGE_HEIGHT, options.imageHeight());
-        functions->glPixelStorei(GL_UNPACK_ROW_LENGTH, options.rowLength());
-        functions->glPixelStorei(GL_UNPACK_LSB_FIRST, options.isLeastSignificantBitFirst());
-        functions->glPixelStorei(GL_UNPACK_SWAP_BYTES, options.isSwapBytesEnabled());
-#endif
-    }
-
-    QOpenGLFunctions *functions;
-private:
-    // Typedefs and pointers to member functions used to switch between EXT_direct_state_access and our own emulated DSA.
-    // The argument match the corresponding GL function, but there's an extra "GLenum bindingTarget" which gets used with
-    // the DSA emulation -- it contains the right GL_BINDING_TEXTURE_X to use.
-    typedef void (QOpenGLTextureHelper::*TextureParameteriMemberFunc)(GLuint texture, GLenum target, GLenum bindingTarget, GLenum pname, GLint param);
-    typedef void (QOpenGLTextureHelper::*TextureParameterivMemberFunc)(GLuint texture, GLenum target, GLenum bindingTarget, GLenum pname, const GLint *params);
-    typedef void (QOpenGLTextureHelper::*TextureParameterfMemberFunc)(GLuint texture, GLenum target, GLenum bindingTarget, GLenum pname, GLfloat param);
-    typedef void (QOpenGLTextureHelper::*TextureParameterfvMemberFunc)(GLuint texture, GLenum target, GLenum bindingTarget, GLenum pname, const GLfloat *params);
-    typedef void (QOpenGLTextureHelper::*GenerateTextureMipmapMemberFunc)(GLuint texture, GLenum target, GLenum bindingTarget);
-    typedef void (QOpenGLTextureHelper::*TextureStorage3DMemberFunc)(GLuint texture, GLenum target, GLenum bindingTarget, GLsizei levels, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth);
-    typedef void (QOpenGLTextureHelper::*TextureStorage2DMemberFunc)(GLuint texture, GLenum target, GLenum bindingTarget, GLsizei levels, GLenum internalFormat, GLsizei width, GLsizei height);
-    typedef void (QOpenGLTextureHelper::*TextureStorage1DMemberFunc)(GLuint texture, GLenum target, GLenum bindingTarget, GLsizei levels, GLenum internalFormat, GLsizei width);
-    typedef void (QOpenGLTextureHelper::*TextureStorage3DMultisampleMemberFunc)(GLuint texture, GLenum target, GLenum bindingTarget, GLsizei samples, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedSampleLocations);
-    typedef void (QOpenGLTextureHelper::*TextureStorage2DMultisampleMemberFunc)(GLuint texture, GLenum target, GLenum bindingTarget, GLsizei samples, GLenum internalFormat, GLsizei width, GLsizei height, GLboolean fixedSampleLocations);
-    typedef void (QOpenGLTextureHelper::*TextureImage3DMemberFunc)(GLuint texture, GLenum target, GLenum bindingTarget, GLint level, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
-    typedef void (QOpenGLTextureHelper::*TextureImage2DMemberFunc)(GLuint texture, GLenum target, GLenum bindingTarget, GLint level, GLenum internalFormat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
-    typedef void (QOpenGLTextureHelper::*TextureImage1DMemberFunc)(GLuint texture, GLenum target, GLenum bindingTarget, GLint level, GLenum internalFormat, GLsizei width, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
-    typedef void (QOpenGLTextureHelper::*TextureSubImage3DMemberFunc)(GLuint texture, GLenum target, GLenum bindingTarget, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels);
-    typedef void (QOpenGLTextureHelper::*TextureSubImage2DMemberFunc)(GLuint texture, GLenum target, GLenum bindingTarget, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels);
-    typedef void (QOpenGLTextureHelper::*TextureSubImage1DMemberFunc)(GLuint texture, GLenum target, GLenum bindingTarget, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid *pixels);
-    typedef void (QOpenGLTextureHelper::*TextureImage3DMultisampleMemberFunc)(GLuint texture, GLenum target, GLenum bindingTarget, GLsizei samples, GLint internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedSampleLocations);
-    typedef void (QOpenGLTextureHelper::*TextureImage2DMultisampleMemberFunc)(GLuint texture, GLenum target, GLenum bindingTarget, GLsizei samples, GLint internalFormat, GLsizei width, GLsizei height, GLboolean fixedSampleLocations);
-    typedef void (QOpenGLTextureHelper::*CompressedTextureSubImage1DMemberFunc)(GLuint texture, GLenum target, GLenum bindingTarget, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *bits);
-    typedef void (QOpenGLTextureHelper::*CompressedTextureSubImage2DMemberFunc)(GLuint texture, GLenum target, GLenum bindingTarget, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *bits);
-    typedef void (QOpenGLTextureHelper::*CompressedTextureSubImage3DMemberFunc)(GLuint texture, GLenum target, GLenum bindingTarget, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *bits);
-    typedef void (QOpenGLTextureHelper::*CompressedTextureImage1DMemberFunc)(GLuint texture, GLenum target, GLenum bindingTarget, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *bits);
-    typedef void (QOpenGLTextureHelper::*CompressedTextureImage2DMemberFunc)(GLuint texture, GLenum target, GLenum bindingTarget, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *bits);
-    typedef void (QOpenGLTextureHelper::*CompressedTextureImage3DMemberFunc)(GLuint texture, GLenum target, GLenum bindingTarget, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *bits);
-
-
-    TextureParameteriMemberFunc TextureParameteri;
-    TextureParameterivMemberFunc TextureParameteriv;
-    TextureParameterfMemberFunc TextureParameterf;
-    TextureParameterfvMemberFunc TextureParameterfv;
-    GenerateTextureMipmapMemberFunc GenerateTextureMipmap;
-    TextureStorage3DMemberFunc TextureStorage3D;
-    TextureStorage2DMemberFunc TextureStorage2D;
-    TextureStorage1DMemberFunc TextureStorage1D;
-    TextureStorage3DMultisampleMemberFunc TextureStorage3DMultisample;
-    TextureStorage2DMultisampleMemberFunc TextureStorage2DMultisample;
-    TextureImage3DMemberFunc TextureImage3D;
-    TextureImage2DMemberFunc TextureImage2D;
-    TextureImage1DMemberFunc TextureImage1D;
-    TextureSubImage3DMemberFunc TextureSubImage3D;
-    TextureSubImage2DMemberFunc TextureSubImage2D;
-    TextureSubImage1DMemberFunc TextureSubImage1D;
-    TextureImage3DMultisampleMemberFunc TextureImage3DMultisample;
-    TextureImage2DMultisampleMemberFunc TextureImage2DMultisample;
-    CompressedTextureSubImage1DMemberFunc CompressedTextureSubImage1D;
-    CompressedTextureSubImage2DMemberFunc CompressedTextureSubImage2D;
-    CompressedTextureSubImage3DMemberFunc CompressedTextureSubImage3D;
-    CompressedTextureImage1DMemberFunc CompressedTextureImage1D;
-    CompressedTextureImage2DMemberFunc CompressedTextureImage2D;
-    CompressedTextureImage3DMemberFunc CompressedTextureImage3D;
-
-    // Raw function pointers for core and DSA functions
-
-    // EXT_direct_state_access used when DSA is available
-    void (QOPENGLF_APIENTRYP TextureParameteriEXT)(GLuint texture, GLenum target, GLenum pname, GLint param);
-    void (QOPENGLF_APIENTRYP TextureParameterivEXT)(GLuint texture, GLenum target, GLenum pname, const GLint *params);
-    void (QOPENGLF_APIENTRYP TextureParameterfEXT)(GLuint texture, GLenum target, GLenum pname, GLfloat param);
-    void (QOPENGLF_APIENTRYP TextureParameterfvEXT)(GLuint texture, GLenum target, GLenum pname, const GLfloat *params);
-    void (QOPENGLF_APIENTRYP GenerateTextureMipmapEXT)(GLuint texture, GLenum target);
-    void (QOPENGLF_APIENTRYP TextureStorage3DEXT)(GLuint texture, GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth);
-    void (QOPENGLF_APIENTRYP TextureStorage2DEXT)(GLuint texture, GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width, GLsizei height);
-    void (QOPENGLF_APIENTRYP TextureStorage1DEXT)(GLuint texture, GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width);
-    void (QOPENGLF_APIENTRYP TextureStorage3DMultisampleEXT)(GLuint texture, GLenum target, GLsizei samples, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedSampleLocations);
-    void (QOPENGLF_APIENTRYP TextureStorage2DMultisampleEXT)(GLuint texture, GLenum target, GLsizei samples, GLenum internalFormat, GLsizei width, GLsizei height, GLboolean fixedSampleLocations);
-    void (QOPENGLF_APIENTRYP TextureImage3DEXT)(GLuint texture, GLenum target, GLint level, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
-    void (QOPENGLF_APIENTRYP TextureImage2DEXT)(GLuint texture, GLenum target, GLint level, GLenum internalFormat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
-    void (QOPENGLF_APIENTRYP TextureImage1DEXT)(GLuint texture, GLenum target, GLint level, GLenum internalFormat, GLsizei width, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
-    void (QOPENGLF_APIENTRYP TextureSubImage3DEXT)(GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels);
-    void (QOPENGLF_APIENTRYP TextureSubImage2DEXT)(GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels);
-    void (QOPENGLF_APIENTRYP TextureSubImage1DEXT)(GLuint texture, GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid *pixels);
-    void (QOPENGLF_APIENTRYP CompressedTextureSubImage1DEXT)(GLuint texture, GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *bits);
-    void (QOPENGLF_APIENTRYP CompressedTextureSubImage2DEXT)(GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *bits);
-    void (QOPENGLF_APIENTRYP CompressedTextureSubImage3DEXT)(GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *bits);
-    void (QOPENGLF_APIENTRYP CompressedTextureImage1DEXT)(GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *bits);
-    void (QOPENGLF_APIENTRYP CompressedTextureImage2DEXT)(GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *bits);
-    void (QOPENGLF_APIENTRYP CompressedTextureImage3DEXT)(GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *bits);
-
-
-    // Plus some missing ones that are in the NV_texture_multisample extension instead
-    void (QOPENGLF_APIENTRYP TextureImage3DMultisampleNV)(GLuint texture, GLenum target, GLsizei samples, GLint internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedSampleLocations);
-    void (QOPENGLF_APIENTRYP TextureImage2DMultisampleNV)(GLuint texture, GLenum target, GLsizei samples, GLint internalFormat, GLsizei width, GLsizei height, GLboolean fixedSampleLocations);
-
-    // OpenGL 1.0
-    void (QOPENGLF_APIENTRYP TexImage1D)(GLenum target, GLint level, GLint internalFormat, GLsizei width, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
-
-    // OpenGL 1.1
-    void (QOPENGLF_APIENTRYP TexSubImage1D)(GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid *pixels);
-
-    // OpenGL 1.2
-    void (QOPENGLF_APIENTRYP TexImage3D)(GLenum target, GLint level, GLint internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
-    void (QOPENGLF_APIENTRYP TexSubImage3D)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels);
-
-    // OpenGL 1.3
-    void (QOPENGLF_APIENTRYP GetCompressedTexImage)(GLenum target, GLint level, GLvoid *img);
-    void (QOPENGLF_APIENTRYP CompressedTexSubImage1D)(GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *data);
-    GL_APICALL void (QOPENGLF_APIENTRYP CompressedTexSubImage2D)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *data);
-    void (QOPENGLF_APIENTRYP CompressedTexSubImage3D)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *data);
-    void (QOPENGLF_APIENTRYP CompressedTexImage1D)(GLenum target, GLint level, GLenum internalFormat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *data);
-    GL_APICALL void (QOPENGLF_APIENTRYP CompressedTexImage2D)(GLenum target, GLint level, GLenum internalFormat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *data);
-    void (QOPENGLF_APIENTRYP CompressedTexImage3D)(GLenum target, GLint level, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *data);
-    GL_APICALL void (QOPENGLF_APIENTRYP ActiveTexture)(GLenum texture);
-
-    // OpenGL 3.0
-    GL_APICALL void (QOPENGLF_APIENTRYP GenerateMipmap)(GLenum target);
-
-    // OpenGL 3.2
-    void (QOPENGLF_APIENTRYP TexImage3DMultisample)(GLenum target, GLsizei samples, GLint internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedSampleLocations);
-    void (QOPENGLF_APIENTRYP TexImage2DMultisample)(GLenum target, GLsizei samples, GLint internalFormat, GLsizei width, GLsizei height, GLboolean fixedSampleLocations);
-
-    // OpenGL 4.2
-    void (QOPENGLF_APIENTRYP TexStorage3D)(GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth);
-    void (QOPENGLF_APIENTRYP TexStorage2D)(GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width, GLsizei height);
-    void (QOPENGLF_APIENTRYP TexStorage1D)(GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width);
-
-    // OpenGL 4.3
-    void (QOPENGLF_APIENTRYP TexStorage3DMultisample)(GLenum target, GLsizei samples, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedSampleLocations);
-    void (QOPENGLF_APIENTRYP TexStorage2DMultisample)(GLenum target, GLsizei samples, GLenum internalFormat, GLsizei width, GLsizei height, GLboolean fixedSampleLocations);
-    void (QOPENGLF_APIENTRYP TexBufferRange)(GLenum target, GLenum internalFormat, GLuint buffer, GLintptr offset, GLsizeiptr size);
-    void (QOPENGLF_APIENTRYP TextureView)(GLuint texture, GLenum target, GLuint origtexture, GLenum internalformat, GLuint minlevel, GLuint numlevels, GLuint minlayer, GLuint numlayers);
-};
-
-QT_END_NAMESPACE
-
-#undef Q_CALL_MEMBER_FUNCTION
-
-#endif // QT_NO_OPENGL
-
-#endif // QOPENGLTEXTUREHELPER_P_H
diff --git a/src/gui/opengl/qopengltextureuploader.cpp b/src/gui/opengl/qopengltextureuploader.cpp
deleted file mode 100644
index 9e393bc47a..0000000000
--- a/src/gui/opengl/qopengltextureuploader.cpp
+++ /dev/null
@@ -1,381 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2018 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtGui module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qopengltextureuploader_p.h"
-
-#include <qimage.h>
-#include <qmath.h>
-#include <qopenglfunctions.h>
-#include <private/qopenglcontext_p.h>
-#include <private/qopenglextensions_p.h>
-
-#ifndef GL_RED
-#define GL_RED                            0x1903
-#endif
-
-#ifndef GL_GREEN
-#define GL_GREEN                          0x1904
-#endif
-
-#ifndef GL_BLUE
-#define GL_BLUE                           0x1905
-#endif
-
-#ifndef GL_RGB10_A2
-#define GL_RGB10_A2                       0x8059
-#endif
-
-#ifndef GL_RGBA16
-#define GL_RGBA16                         0x805B
-#endif
-
-#ifndef GL_BGR
-#define GL_BGR 0x80E0
-#endif
-
-#ifndef GL_BGRA
-#define GL_BGRA 0x80E1
-#endif
-
-#ifndef GL_UNSIGNED_INT_8_8_8_8_REV
-#define GL_UNSIGNED_INT_8_8_8_8_REV       0x8367
-#endif
-
-#ifndef GL_UNSIGNED_INT_2_10_10_10_REV
-#define GL_UNSIGNED_INT_2_10_10_10_REV    0x8368
-#endif
-
-#ifndef GL_TEXTURE_SWIZZLE_R
-#define GL_TEXTURE_SWIZZLE_R              0x8E42
-#endif
-
-#ifndef GL_TEXTURE_SWIZZLE_G
-#define GL_TEXTURE_SWIZZLE_G              0x8E43
-#endif
-
-#ifndef GL_TEXTURE_SWIZZLE_B
-#define GL_TEXTURE_SWIZZLE_B              0x8E44
-#endif
-
-#ifndef GL_TEXTURE_SWIZZLE_A
-#define GL_TEXTURE_SWIZZLE_A              0x8E45
-#endif
-
-#ifndef GL_SRGB
-#define GL_SRGB                           0x8C40
-#endif
-#ifndef GL_SRGB_ALPHA
-#define GL_SRGB_ALPHA                     0x8C42
-#endif
-
-QT_BEGIN_NAMESPACE
-
-qsizetype QOpenGLTextureUploader::textureImage(GLenum target, const QImage &image, QOpenGLTextureUploader::BindOptions options, QSize maxSize)
-{
-    QOpenGLContext *context = QOpenGLContext::currentContext();
-    QOpenGLExtensions *funcs = static_cast<QOpenGLExtensions*>(context->functions());
-
-    QImage tx;
-    GLenum externalFormat;
-    GLenum internalFormat;
-    GLuint pixelType;
-    QImage::Format targetFormat = QImage::Format_Invalid;
-    const bool isOpenGL12orBetter = !context->isOpenGLES() && (context->format().majorVersion() >= 2 || context->format().minorVersion() >= 2);
-    const bool isOpenGLES3orBetter = context->isOpenGLES() && context->format().majorVersion() >= 3;
-    const bool sRgbBinding = (options & SRgbBindOption);
-    Q_ASSERT(isOpenGL12orBetter || context->isOpenGLES());
-    Q_ASSERT((options & (SRgbBindOption | UseRedForAlphaAndLuminanceBindOption)) != (SRgbBindOption | UseRedForAlphaAndLuminanceBindOption));
-
-    switch (image.format()) {
-    case QImage::Format_RGB32:
-    case QImage::Format_ARGB32:
-    case QImage::Format_ARGB32_Premultiplied:
-        if (isOpenGL12orBetter) {
-            externalFormat = GL_BGRA;
-            internalFormat = GL_RGBA;
-            pixelType = GL_UNSIGNED_INT_8_8_8_8_REV;
-#if Q_BYTE_ORDER == Q_LITTLE_ENDIAN
-        // Without GL_UNSIGNED_INT_8_8_8_8_REV, BGRA only matches ARGB on little endian:
-        } else if (funcs->hasOpenGLExtension(QOpenGLExtensions::BGRATextureFormat) && !sRgbBinding) {
-            // The GL_EXT_texture_format_BGRA8888 extension requires the internal format to match the external.
-            externalFormat = internalFormat = GL_BGRA;
-            pixelType = GL_UNSIGNED_BYTE;
-        } else if (context->isOpenGLES() && context->hasExtension(QByteArrayLiteral("GL_APPLE_texture_format_BGRA8888"))) {
-            // Is only allowed as an external format like OpenGL.
-            externalFormat = GL_BGRA;
-            internalFormat = GL_RGBA;
-            pixelType = GL_UNSIGNED_BYTE;
-#endif
-        } else if (funcs->hasOpenGLExtension(QOpenGLExtensions::TextureSwizzle)) {
-#if Q_BYTE_ORDER == Q_LITTLE_ENDIAN
-            funcs->glTexParameteri(target, GL_TEXTURE_SWIZZLE_R, GL_BLUE);
-            funcs->glTexParameteri(target, GL_TEXTURE_SWIZZLE_B, GL_RED);
-#else
-            funcs->glTexParameteri(target, GL_TEXTURE_SWIZZLE_R, GL_GREEN);
-            funcs->glTexParameteri(target, GL_TEXTURE_SWIZZLE_G, GL_BLUE);
-            funcs->glTexParameteri(target, GL_TEXTURE_SWIZZLE_B, GL_ALPHA);
-            funcs->glTexParameteri(target, GL_TEXTURE_SWIZZLE_A, GL_RED);
-#endif
-            externalFormat = internalFormat = GL_RGBA;
-            pixelType = GL_UNSIGNED_BYTE;
-        } else {
-            // No support for direct ARGB32 upload.
-            break;
-        }
-        targetFormat = image.format();
-        break;
-    case QImage::Format_BGR30:
-    case QImage::Format_A2BGR30_Premultiplied:
-        if (sRgbBinding) {
-            // Always needs conversion
-            break;
-        } else if (isOpenGL12orBetter || isOpenGLES3orBetter) {
-            pixelType = GL_UNSIGNED_INT_2_10_10_10_REV;
-            externalFormat = GL_RGBA;
-            internalFormat = GL_RGB10_A2;
-            targetFormat =  image.format();
-        }
-        break;
-    case QImage::Format_RGB30:
-    case QImage::Format_A2RGB30_Premultiplied:
-        if (sRgbBinding) {
-            // Always needs conversion
-            break;
-        } else if (isOpenGL12orBetter) {
-            pixelType = GL_UNSIGNED_INT_2_10_10_10_REV;
-            externalFormat = GL_BGRA;
-            internalFormat = GL_RGB10_A2;
-            targetFormat = image.format();
-        } else if (funcs->hasOpenGLExtension(QOpenGLExtensions::TextureSwizzle)) {
-            funcs->glTexParameteri(target, GL_TEXTURE_SWIZZLE_B, GL_RED);
-            funcs->glTexParameteri(target, GL_TEXTURE_SWIZZLE_R, GL_BLUE);
-            pixelType = GL_UNSIGNED_INT_2_10_10_10_REV;
-            externalFormat = GL_RGBA;
-            internalFormat = GL_RGB10_A2;
-            targetFormat = image.format();
-        }
-        break;
-    case QImage::Format_RGB444:
-    case QImage::Format_RGB555:
-    case QImage::Format_RGB16:
-        if (isOpenGL12orBetter || context->isOpenGLES()) {
-            externalFormat = internalFormat = GL_RGB;
-            pixelType = GL_UNSIGNED_SHORT_5_6_5;
-            targetFormat = QImage::Format_RGB16;
-        }
-        break;
-    case QImage::Format_RGB666:
-    case QImage::Format_RGB888:
-        externalFormat = internalFormat = GL_RGB;
-        pixelType = GL_UNSIGNED_BYTE;
-        targetFormat = QImage::Format_RGB888;
-        break;
-    case QImage::Format_BGR888:
-        if (isOpenGL12orBetter) {
-            externalFormat = GL_BGR;
-            internalFormat = GL_RGB;
-            pixelType = GL_UNSIGNED_BYTE;
-            targetFormat = QImage::Format_BGR888;
-        } else if (funcs->hasOpenGLExtension(QOpenGLExtensions::TextureSwizzle)) {
-            funcs->glTexParameteri(target, GL_TEXTURE_SWIZZLE_B, GL_RED);
-            funcs->glTexParameteri(target, GL_TEXTURE_SWIZZLE_R, GL_BLUE);
-            externalFormat = internalFormat = GL_RGB;
-            pixelType = GL_UNSIGNED_BYTE;
-            targetFormat = QImage::Format_BGR888;
-        }
-        break;
-    case QImage::Format_RGBX8888:
-    case QImage::Format_RGBA8888:
-    case QImage::Format_RGBA8888_Premultiplied:
-        externalFormat = internalFormat = GL_RGBA;
-        pixelType = GL_UNSIGNED_BYTE;
-        targetFormat = image.format();
-        break;
-    case QImage::Format_RGBX64:
-    case QImage::Format_RGBA64:
-    case QImage::Format_RGBA64_Premultiplied:
-        externalFormat = internalFormat = GL_RGBA;
-        if (isOpenGL12orBetter || (context->isOpenGLES() && context->format().majorVersion() >= 3))
-            internalFormat = GL_RGBA16;
-        pixelType = GL_UNSIGNED_SHORT;
-        targetFormat =  image.format();
-        break;
-    case QImage::Format_Indexed8:
-        if (sRgbBinding) {
-            // Always needs conversion
-            break;
-        } else if (options & UseRedForAlphaAndLuminanceBindOption) {
-            externalFormat = internalFormat = GL_RED;
-            pixelType = GL_UNSIGNED_BYTE;
-            targetFormat = image.format();
-        }
-        break;
-    case QImage::Format_Alpha8:
-        if (sRgbBinding) {
-            // Always needs conversion
-            break;
-        } else if (options & UseRedForAlphaAndLuminanceBindOption) {
-            externalFormat = internalFormat = GL_RED;
-            pixelType = GL_UNSIGNED_BYTE;
-            targetFormat = image.format();
-        } else if (context->isOpenGLES() || context->format().profile() != QSurfaceFormat::CoreProfile) {
-            externalFormat = internalFormat = GL_ALPHA;
-            pixelType = GL_UNSIGNED_BYTE;
-            targetFormat = image.format();
-        } else if (funcs->hasOpenGLExtension(QOpenGLExtensions::TextureSwizzle)) {
-            funcs->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_SWIZZLE_R, GL_ALPHA);
-            funcs->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_SWIZZLE_G, GL_ZERO);
-            funcs->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_SWIZZLE_B, GL_ZERO);
-            funcs->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_SWIZZLE_A, GL_ZERO);
-            externalFormat = internalFormat = GL_RED;
-            pixelType = GL_UNSIGNED_BYTE;
-            targetFormat = image.format();
-        }
-        break;
-    case QImage::Format_Grayscale8:
-        if (sRgbBinding) {
-            // Always needs conversion
-            break;
-        } else if (options & UseRedForAlphaAndLuminanceBindOption) {
-            externalFormat = internalFormat = GL_RED;
-            pixelType = GL_UNSIGNED_BYTE;
-            targetFormat = image.format();
-        } else if (context->isOpenGLES() || context->format().profile() != QSurfaceFormat::CoreProfile) {
-            externalFormat = internalFormat = GL_LUMINANCE;
-            pixelType = GL_UNSIGNED_BYTE;
-            targetFormat = image.format();
-        } else if (funcs->hasOpenGLExtension(QOpenGLExtensions::TextureSwizzle)) {
-            funcs->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_SWIZZLE_R, GL_RED);
-            funcs->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_SWIZZLE_G, GL_RED);
-            funcs->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_SWIZZLE_B, GL_RED);
-            funcs->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_SWIZZLE_A, GL_ONE);
-            externalFormat = internalFormat = GL_RED;
-            pixelType = GL_UNSIGNED_BYTE;
-            targetFormat = image.format();
-        }
-        break;
-    case QImage::Format_Grayscale16:
-        if (sRgbBinding) {
-            // Always needs conversion
-            break;
-        } else if (options & UseRedForAlphaAndLuminanceBindOption) {
-            externalFormat = internalFormat = GL_RED;
-            pixelType = GL_UNSIGNED_SHORT;
-            targetFormat = image.format();
-        } else if (context->isOpenGLES() || context->format().profile() != QSurfaceFormat::CoreProfile) {
-            externalFormat = internalFormat = GL_LUMINANCE;
-            pixelType = GL_UNSIGNED_SHORT;
-            targetFormat = image.format();
-        } else if (funcs->hasOpenGLExtension(QOpenGLExtensions::TextureSwizzle)) {
-            funcs->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_SWIZZLE_R, GL_RED);
-            funcs->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_SWIZZLE_G, GL_RED);
-            funcs->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_SWIZZLE_B, GL_RED);
-            funcs->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_SWIZZLE_A, GL_ONE);
-            externalFormat = internalFormat = GL_RED;
-            pixelType = GL_UNSIGNED_SHORT;
-            targetFormat = image.format();
-        }
-        break;
-    default:
-        break;
-    }
-
-    // If no direct upload was detected above, convert to RGBA8888 and upload that
-    if (targetFormat == QImage::Format_Invalid) {
-        externalFormat = internalFormat = GL_RGBA;
-        pixelType = GL_UNSIGNED_BYTE;
-        if (!image.hasAlphaChannel())
-            targetFormat = QImage::Format_RGBX8888;
-        else
-            targetFormat = QImage::Format_RGBA8888;
-    }
-
-    if (options & PremultipliedAlphaBindOption) {
-        if (targetFormat == QImage::Format_ARGB32)
-            targetFormat = QImage::Format_ARGB32_Premultiplied;
-        else if (targetFormat == QImage::Format_RGBA8888)
-            targetFormat = QImage::Format_RGBA8888_Premultiplied;
-        else if (targetFormat == QImage::Format_RGBA64)
-            targetFormat = QImage::Format_RGBA64_Premultiplied;
-    } else {
-        if (targetFormat == QImage::Format_ARGB32_Premultiplied)
-            targetFormat = QImage::Format_ARGB32;
-        else if (targetFormat == QImage::Format_RGBA8888_Premultiplied)
-            targetFormat = QImage::Format_RGBA8888;
-        else if (targetFormat == QImage::Format_RGBA64_Premultiplied)
-            targetFormat = QImage::Format_RGBA64;
-    }
-
-    if (sRgbBinding) {
-        Q_ASSERT(internalFormat == GL_RGBA || internalFormat == GL_RGB);
-        if (image.hasAlphaChannel())
-            internalFormat = GL_SRGB_ALPHA;
-        else
-            internalFormat = GL_SRGB;
-    }
-
-    if (image.format() != targetFormat)
-        tx = image.convertToFormat(targetFormat);
-    else
-        tx = image;
-
-    QSize newSize = tx.size();
-    if (!maxSize.isEmpty())
-        newSize = newSize.boundedTo(maxSize);
-    if (options & PowerOfTwoBindOption) {
-        newSize.setWidth(qNextPowerOfTwo(newSize.width() - 1));
-        newSize.setHeight(qNextPowerOfTwo(newSize.height() - 1));
-    }
-
-    if (newSize != tx.size())
-        tx = tx.scaled(newSize, Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
-
-    // Handle cases where the QImage is actually a sub image of its image data:
-    qsizetype naturalBpl = ((qsizetype(tx.width()) * tx.depth() + 31) >> 5) << 2;
-    if (tx.bytesPerLine() != naturalBpl)
-        tx = tx.copy(tx.rect());
-
-    funcs->glTexImage2D(target, 0, internalFormat, tx.width(), tx.height(), 0, externalFormat, pixelType, tx.constBits());
-
-    qsizetype cost = qint64(tx.width()) * tx.height() * tx.depth() / 8;
-
-    return cost;
-}
-
-QT_END_NAMESPACE
diff --git a/src/gui/opengl/qopengltextureuploader_p.h b/src/gui/opengl/qopengltextureuploader_p.h
deleted file mode 100644
index 0dcf709d7e..0000000000
--- a/src/gui/opengl/qopengltextureuploader_p.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2018 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtGui module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#ifndef QOPENGLTEXTUREUPLOADER_P_H
-#define QOPENGLTEXTUREUPLOADER_P_H
-
-#include <QtCore/qsize.h>
-#include <QtGui/private/qtguiglobal_p.h>
-#include <QtGui/private/qopenglcontext_p.h>
-
-QT_BEGIN_NAMESPACE
-
-class QImage;
-
-class Q_GUI_EXPORT QOpenGLTextureUploader
-{
-public:
-    enum BindOption {
-        NoBindOption                            = 0x0000,
-        PremultipliedAlphaBindOption            = 0x0001,
-        UseRedForAlphaAndLuminanceBindOption    = 0x0002,
-        SRgbBindOption                          = 0x0004,
-        PowerOfTwoBindOption                    = 0x0008
-    };
-    Q_DECLARE_FLAGS(BindOptions, BindOption)
-    Q_FLAGS(BindOptions)
-
-    static qsizetype textureImage(GLenum target, const QImage &image, BindOptions options, QSize maxSize = QSize());
-
-};
-
-Q_DECLARE_OPERATORS_FOR_FLAGS(QOpenGLTextureUploader::BindOptions)
-
-QT_END_NAMESPACE
-
-#endif
-
diff --git a/src/gui/opengl/qopengltimerquery.cpp b/src/gui/opengl/qopengltimerquery.cpp
deleted file mode 100644
index a4e10b42f7..0000000000
--- a/src/gui/opengl/qopengltimerquery.cpp
+++ /dev/null
@@ -1,880 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB).
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtGui module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qopengltimerquery.h"
-
-#include "qopenglqueryhelper_p.h"
-#include <QtCore/private/qobject_p.h>
-#include <QtGui/QOpenGLContext>
-#include <QtGui/QOpenGLFunctions>
-
-QT_BEGIN_NAMESPACE
-
-// Helper class used as fallback if OpenGL <3.3 is being used with EXT_timer_query
-class QExtTimerQueryHelper
-{
-public:
-    QExtTimerQueryHelper(QOpenGLContext *context)
-    {
-        Q_ASSERT(context);
-        GetQueryObjectui64vEXT = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLuint64EXT *)>(context->getProcAddress("glGetQueryObjectui64vEXT"));
-        GetQueryObjecti64vEXT = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLint64EXT *)>(context->getProcAddress("glGetQueryObjecti64vEXT"));
-    }
-
-    inline void glGetQueryObjectui64vEXT(GLuint id, GLenum pname, GLuint64EXT *params)
-    {
-        GetQueryObjectui64vEXT(id, pname, params);
-    }
-
-    inline void glGetQueryObjecti64vEXT(GLuint id, GLenum pname, GLint64EXT *params)
-    {
-        GetQueryObjecti64vEXT(id, pname, params);
-    }
-
-private:
-    void (QOPENGLF_APIENTRYP GetQueryObjectui64vEXT)(GLuint id, GLenum pname, GLuint64EXT *params);
-    void (QOPENGLF_APIENTRYP GetQueryObjecti64vEXT)(GLuint id, GLenum pname, GLint64EXT *params);
-};
-
-class QOpenGLTimerQueryPrivate : public QObjectPrivate
-{
-public:
-    QOpenGLTimerQueryPrivate()
-        : QObjectPrivate(),
-          context(nullptr),
-          ext(nullptr),
-          timeInterval(0),
-          timer(0)
-    {
-    }
-
-    ~QOpenGLTimerQueryPrivate()
-    {
-        delete core;
-        delete ext;
-    }
-
-    bool create();
-    void destroy();
-    void begin();
-    void end();
-    GLuint64 waitForTimeStamp() const;
-    void recordTimestamp();
-    bool isResultAvailable() const;
-    GLuint64 result() const;
-
-    // There are several cases we must handle:
-    //   OpenGL >=3.3 includes timer queries as a core feature
-    //   ARB_timer_query has same functionality as above. Requires OpenGL 3.2
-    //   EXT_timer_query offers limited support. Can be used with OpenGL >=1.5
-    //
-    // Note that some implementations (OS X) provide OpenGL 3.2 but do not expose the
-    // ARB_timer_query extension. In such situations we must also be able to handle
-    // using the EXT_timer_query extension with any version of OpenGL.
-    //
-    // OpenGL 1.5 or above contains the generic query API and OpenGL 3.3 and
-    // ARB_timer_query provide the 64-bit query API. These are wrapped by
-    // QOpenGLQueryHelper. All we need to handle in addition is the EXT_timer_query
-    // case and to take care not to call the Core/ARB functions when we only
-    // have EXT_timer_query available.
-    QOpenGLContext *context;
-    QOpenGLQueryHelper *core;
-    QExtTimerQueryHelper *ext;
-    mutable GLuint64 timeInterval;
-    GLuint timer;
-};
-
-bool QOpenGLTimerQueryPrivate::create()
-{
-    QOpenGLContext *ctx = QOpenGLContext::currentContext();
-
-    if (timer && context == ctx)
-        return true;
-
-    context = ctx;
-    if (!context) {
-        qWarning("A current OpenGL context is required to create timer query objects");
-        return false;
-    }
-
-    if (context->isOpenGLES()) {
-        qWarning("QOpenGLTimerQuery: Not supported on OpenGL ES");
-        return false;
-    }
-
-    // Resolve the functions provided by OpenGL 1.5 and OpenGL 3.3 or ARB_timer_query
-    core = new QOpenGLQueryHelper(context);
-
-    // Check to see if we also need to resolve the functions for EXT_timer_query
-    QSurfaceFormat f = context->format();
-    if (f.version() <= qMakePair<int, int>(3, 2)
-        && !context->hasExtension(QByteArrayLiteral("GL_ARB_timer_query"))
-        && context->hasExtension(QByteArrayLiteral("GL_EXT_timer_query"))) {
-        ext = new QExtTimerQueryHelper(context);
-    } else if (f.version() <= qMakePair<int, int>(3, 2)
-               && !context->hasExtension(QByteArrayLiteral("GL_ARB_timer_query"))
-               && !context->hasExtension(QByteArrayLiteral("GL_EXT_timer_query"))) {
-        qWarning("QOpenGLTimerQuery requires one of:\n"
-                 "  OpenGL 3.3 or newer,\n"
-                 "  OpenGL 3.2 and the ARB_timer_query extension\n"
-                 "  or the EXT_timer query extension");
-        return false;
-    }
-
-    core->glGenQueries(1, &timer);
-    return (timer != 0);
-}
-
-void QOpenGLTimerQueryPrivate::destroy()
-{
-    if (!timer)
-        return;
-
-    core->glDeleteQueries(1, &timer);
-    timer = 0;
-    context = nullptr;
-}
-
-// GL_TIME_ELAPSED_EXT is not defined on OS X 10.6
-#if !defined(GL_TIME_ELAPSED_EXT)
-#define GL_TIME_ELAPSED_EXT 0x88BF
-#endif
-
-// GL_TIME_ELAPSED is not defined on OS X 10.7 or 10.8 yet
-#if !defined(GL_TIME_ELAPSED)
-#define GL_TIME_ELAPSED GL_TIME_ELAPSED_EXT
-#endif
-
-void QOpenGLTimerQueryPrivate::begin()
-{
-    core->glBeginQuery(GL_TIME_ELAPSED, timer);
-}
-
-void QOpenGLTimerQueryPrivate::end()
-{
-    core->glEndQuery(GL_TIME_ELAPSED);
-}
-
-void QOpenGLTimerQueryPrivate::recordTimestamp()
-{
-    // Don't call glQueryCounter if we only have EXT_timer_query
-#if defined(GL_TIMESTAMP)
-    if (!ext)
-        core->glQueryCounter(timer, GL_TIMESTAMP);
-    else
-        qWarning("QOpenGLTimerQuery::recordTimestamp() requires OpenGL 3.3 or GL_ARB_timer_query");
-#else
-    qWarning("QOpenGLTimerQuery::recordTimestamp() requires OpenGL 3.3 or GL_ARB_timer_query");
-#endif
-}
-
-GLuint64 QOpenGLTimerQueryPrivate::waitForTimeStamp() const
-{
-    GLint64 tmp = 0;
-#if defined(GL_TIMESTAMP)
-    if (!ext)
-        core->glGetInteger64v(GL_TIMESTAMP, &tmp);
-    else
-        qWarning("QOpenGLTimerQuery::waitForTimestamp() requires OpenGL 3.3 or GL_ARB_timer_query");
-#else
-    qWarning("QOpenGLTimerQuery::waitForTimestamp() requires OpenGL 3.3 or GL_ARB_timer_query");
-#endif
-    GLuint64 timestamp(tmp);
-    return timestamp;
-}
-
-bool QOpenGLTimerQueryPrivate::isResultAvailable() const
-{
-    GLuint available = GL_FALSE;
-    core->glGetQueryObjectuiv(timer, GL_QUERY_RESULT_AVAILABLE, &available);
-    return available;
-}
-
-GLuint64 QOpenGLTimerQueryPrivate::result() const
-{
-    if (!ext)
-        core->glGetQueryObjectui64v(timer, GL_QUERY_RESULT, &timeInterval);
-    else
-        ext->glGetQueryObjectui64vEXT(timer, GL_QUERY_RESULT, &timeInterval);
-    return timeInterval;
-}
-
-/*!
-    \class QOpenGLTimerQuery
-    \brief The QOpenGLTimerQuery class wraps an OpenGL timer query object.
-    \inmodule QtGui
-    \since 5.1
-    \ingroup painting-3D
-
-    OpenGL timer query objects are OpenGL managed resources to measure the
-    execution times of sequences of OpenGL commands on the GPU.
-
-    OpenGL offers various levels of support for timer queries, depending on
-    the version of OpenGL you have and the presence of the ARB_timer_query or
-    EXT_timer_query extensions. The support can be summarized as:
-
-    \list
-        \li OpenGL >=3.3 offers full support for all timer query functionality.
-        \li OpenGL 3.2 with the ARB_timer_query extension offers full support
-            for all timer query functionality.
-        \li OpenGL <=3.2 with the EXT_timer_query extension offers limited support
-            in that the timestamp of the GPU cannot be queried. Places where this
-            impacts functions provided by Qt classes will be highlighted in the
-            function documentation.
-        \li OpenGL ES 2 (and OpenGL ES 3) do not provide any support for OpenGL
-            timer queries.
-    \endlist
-
-    OpenGL represents time with a granularity of 1 nanosecond (1e-9 seconds). As a
-    consequence of this, 32-bit integers would only give a total possible duration
-    of approximately 4 seconds, which would not be difficult to exceed in poorly
-    performing or lengthy operations. OpenGL therefore uses 64 bit integer types
-    to represent times. A GLuint64 variable has enough width to contain a duration
-    of hundreds of years, which is plenty for real-time rendering needs.
-
-    As with the other Qt OpenGL classes, QOpenGLTimerQuery has a create()
-    function to create the underlying OpenGL object. This is to allow the developer to
-    ensure that there is a valid current OpenGL context at the time.
-
-    Once created, timer queries can be issued in one of several ways. The simplest
-    method is to delimit a block of commands with calls to begin() and end(). This
-    instructs OpenGL to measure the time taken from completing all commands issued
-    prior to begin() until the completion of all commands issued prior to end().
-
-    At the end of a frame we can retrieve the results by calling waitForResult().
-    As this function's name implies, it blocks CPU execution until OpenGL notifies
-    that the timer query result is available. To avoid blocking, you can check
-    if the query result is available by calling isResultAvailable(). Note that
-    modern GPUs are deeply pipelined and query results may not become available for
-    between 1-5 frames after they were issued.
-
-    Note that OpenGL does not permit nesting or interleaving of multiple timer queries
-    using begin() and end(). Using multiple timer queries and recordTimestamp() avoids
-    this limitation. When using recordTimestamp() the result can be obtained at
-    some later time using isResultAvailable() and waitForResult(). Qt provides the
-    convenience class QOpenGLTimeMonitor that helps with using multiple query objects.
-
-    \sa QOpenGLTimeMonitor
-*/
-
-/*!
-    Creates a QOpenGLTimerQuery instance with the given \a parent. You must call create()
-    with a valid OpenGL context before using.
-*/
-QOpenGLTimerQuery::QOpenGLTimerQuery(QObject *parent)
-    : QObject(*new QOpenGLTimerQueryPrivate, parent)
-{
-}
-
-/*!
-    Destroys the QOpenGLTimerQuery and the underlying OpenGL resource.
-*/
-QOpenGLTimerQuery::~QOpenGLTimerQuery()
-{
-    QOpenGLContext* ctx = QOpenGLContext::currentContext();
-
-    Q_D(QOpenGLTimerQuery);
-    QOpenGLContext *oldContext = nullptr;
-    if (d->context != ctx) {
-        oldContext = ctx;
-        if (d->context->makeCurrent(oldContext->surface())) {
-            ctx = d->context;
-        } else {
-            qWarning("QOpenGLTimerQuery::~QOpenGLTimerQuery() failed to make query objects's context current");
-            ctx = nullptr;
-        }
-    }
-
-    if (ctx)
-        destroy();
-
-    if (oldContext) {
-        if (!oldContext->makeCurrent(oldContext->surface()))
-            qWarning("QOpenGLTimerQuery::~QOpenGLTimerQuery() failed to restore current context");
-    }
-}
-
-/*!
-    Creates the underlying OpenGL timer query object. There must be a valid OpenGL context
-    that supports query objects current for this function to succeed.
-
-    Returns \c true if the OpenGL timer query object was successfully created.
-*/
-bool QOpenGLTimerQuery::create()
-{
-    Q_D(QOpenGLTimerQuery);
-    return d->create();
-}
-
-/*!
-    Destroys the underlying OpenGL timer query object. The context that was current when
-    create() was called must be current when calling this function.
-*/
-void QOpenGLTimerQuery::destroy()
-{
-    Q_D(QOpenGLTimerQuery);
-    d->destroy();
-}
-
-/*!
-    Returns \c true if the underlying OpenGL query object has been created. If this
-    returns \c true and the associated OpenGL context is current, then you are able to issue
-    queries with this object.
-*/
-bool QOpenGLTimerQuery::isCreated() const
-{
-    Q_D(const QOpenGLTimerQuery);
-    return (d->timer != 0);
-}
-
-/*!
-    Returns the id of the underlying OpenGL query object.
-*/
-GLuint QOpenGLTimerQuery::objectId() const
-{
-    Q_D(const QOpenGLTimerQuery);
-    return d->timer;
-}
-
-/*!
-    Marks the start point in the OpenGL command queue for a sequence of commands to
-    be timed by this query object.
-
-    This is useful for simple use-cases. Usually it is better to use recordTimestamp().
-
-    \sa end(), isResultAvailable(), waitForResult(), recordTimestamp()
-*/
-void QOpenGLTimerQuery::begin()
-{
-    Q_D(QOpenGLTimerQuery);
-    d->begin();
-}
-
-/*!
-    Marks the end point in the OpenGL command queue for a sequence of commands to
-    be timed by this query object.
-
-    This is useful for simple use-cases. Usually it is better to use recordTimestamp().
-
-    \sa begin(), isResultAvailable(), waitForResult(), recordTimestamp()
-*/
-void QOpenGLTimerQuery::end()
-{
-    Q_D(QOpenGLTimerQuery);
-    d->end();
-}
-
-/*!
-    Places a marker in the OpenGL command queue for the GPU to record the timestamp
-    when this marker is reached by the GPU. This function is non-blocking and the
-    result will become available at some later time.
-
-    The availability of the result can be checked with isResultAvailable(). The result
-    can be fetched with waitForResult() which will block if the result is not yet
-    available.
-
-    \sa waitForResult(), isResultAvailable(), begin(), end()
-*/
-void QOpenGLTimerQuery::recordTimestamp()
-{
-    Q_D(QOpenGLTimerQuery);
-    return d->recordTimestamp();
-}
-
-/*!
-    Returns the current timestamp of the GPU when all previously issued OpenGL
-    commands have been received but not necessarily executed by the GPU.
-
-    This function blocks until the result is returned.
-
-    \sa recordTimestamp()
-*/
-GLuint64 QOpenGLTimerQuery::waitForTimestamp() const
-{
-    Q_D(const QOpenGLTimerQuery);
-    return d->waitForTimeStamp();
-}
-
-/*!
-    Returns \c true if the OpenGL timer query result is available.
-
-    This function is non-blocking and ideally should be used to check for the
-    availability of the query result before calling waitForResult().
-
-    \sa waitForResult()
-*/
-bool QOpenGLTimerQuery::isResultAvailable() const
-{
-    Q_D(const QOpenGLTimerQuery);
-    return d->isResultAvailable();
-}
-
-/*!
-    Returns the result of the OpenGL timer query.
-
-    This function will block until the result is made available by OpenGL. It is
-    recommended to call isResultAvailable() to ensure that the result is available
-    to avoid unnecessary blocking and stalling.
-
-    \sa isResultAvailable()
-*/
-GLuint64 QOpenGLTimerQuery::waitForResult() const
-{
-    Q_D(const QOpenGLTimerQuery);
-    return d->result();
-}
-
-
-class QOpenGLTimeMonitorPrivate : public QObjectPrivate
-{
-public:
-    QOpenGLTimeMonitorPrivate()
-        : QObjectPrivate(),
-          timers(),
-          timeSamples(),
-          context(nullptr),
-          core(nullptr),
-          ext(nullptr),
-          requestedSampleCount(2),
-          currentSample(-1),
-          timerQueryActive(false)
-    {
-    }
-
-    ~QOpenGLTimeMonitorPrivate()
-    {
-        delete core;
-        delete ext;
-    }
-
-    bool create();
-    void destroy();
-    void recordSample();
-    bool isResultAvailable() const;
-    QVector<GLuint64> samples() const;
-    QVector<GLuint64> intervals() const;
-    void reset();
-
-    QVector<GLuint> timers;
-    mutable QVector<GLuint64> timeSamples;
-
-    QOpenGLContext *context;
-    QOpenGLQueryHelper *core;
-    QExtTimerQueryHelper *ext;
-
-    int requestedSampleCount;
-    int currentSample;
-    mutable bool timerQueryActive;
-};
-
-bool QOpenGLTimeMonitorPrivate::create()
-{
-    if (!timers.isEmpty() && timers.at(0) != 0 && timers.size() == requestedSampleCount)
-        return true;
-
-    QOpenGLContext *ctx = QOpenGLContext::currentContext();
-    if (context && context != ctx) {
-        qWarning("QTimeMonitor: Attempting to use different OpenGL context to recreate timers.\n"
-                 "Please call destroy() first or use the same context to previously create");
-        return false;
-    }
-
-    context = ctx;
-    if (!context) {
-        qWarning("A current OpenGL context is required to create timer query objects");
-        return false;
-    }
-
-    // Resize the vectors that hold the timers and the recorded samples
-    timers.resize(requestedSampleCount);
-    timeSamples.resize(requestedSampleCount);
-
-    // Resolve the functions provided by OpenGL 1.5 and OpenGL 3.3 or ARB_timer_query
-    core = new QOpenGLQueryHelper(context);
-
-    // Check to see if we also need to resolve the functions for EXT_timer_query
-    QSurfaceFormat f = context->format();
-    if (f.version() <= qMakePair<int, int>(3, 2)
-        && !context->hasExtension(QByteArrayLiteral("GL_ARB_timer_query"))
-        && context->hasExtension(QByteArrayLiteral("GL_EXT_timer_query"))) {
-        ext = new QExtTimerQueryHelper(context);
-    } else if (f.version() <= qMakePair<int, int>(3, 2)
-               && !context->hasExtension(QByteArrayLiteral("GL_ARB_timer_query"))
-               && !context->hasExtension(QByteArrayLiteral("GL_EXT_timer_query"))) {
-        qWarning("QOpenGLTimeMonitor requires one of:\n"
-                 "  OpenGL 3.3 or newer,\n"
-                 "  OpenGL 3.2 and the ARB_timer_query extension\n"
-                 "  or the EXT_timer query extension");
-        return false;
-    }
-
-    core->glGenQueries(requestedSampleCount, timers.data());
-    return (timers.at(0) != 0);
-}
-
-void QOpenGLTimeMonitorPrivate::destroy()
-{
-    if (timers.isEmpty() || timers.at(0) == 0)
-        return;
-
-    core->glDeleteQueries(timers.size(), timers.data());
-    timers.clear();
-    delete core;
-    core = nullptr;
-    delete ext;
-    ext = nullptr;
-    context = nullptr;
-}
-
-void QOpenGLTimeMonitorPrivate::recordSample()
-{
-    // Use glQueryCounter() and GL_TIMESTAMP where available.
-    // Otherwise, simulate it with glBeginQuery()/glEndQuery()
-    if (!ext) {
-#if defined(GL_TIMESTAMP)
-        core->glQueryCounter(timers.at(++currentSample), GL_TIMESTAMP);
-#endif
-    } else {
-        if (currentSample == -1) {
-            core->glBeginQuery(GL_TIME_ELAPSED_EXT, timers.at(++currentSample));
-            timerQueryActive = true;
-        } else if (currentSample < timers.size() - 1) {
-            core->glEndQuery(GL_TIME_ELAPSED_EXT);
-            core->glBeginQuery(GL_TIME_ELAPSED_EXT, timers.at(++currentSample));
-        } else {
-            if (timerQueryActive) {
-                core->glEndQuery(GL_TIME_ELAPSED_EXT);
-                timerQueryActive = false;
-            }
-        }
-    }
-}
-
-bool QOpenGLTimeMonitorPrivate::isResultAvailable() const
-{
-    // The OpenGL spec says that if a query result is ready then the results of all queries
-    // of the same type issued before it must also be ready. Therefore we only need to check
-    // the availability of the result for the last issued query
-    GLuint available = GL_FALSE;
-    core->glGetQueryObjectuiv(timers.at(currentSample), GL_QUERY_RESULT_AVAILABLE, &available);
-    return available;
-}
-
-QVector<GLuint64> QOpenGLTimeMonitorPrivate::samples() const
-{
-    // For the Core and ARB options just ask for the timestamp for each timer query.
-    // For the EXT implementation we cannot obtain timestamps so we defer any result
-    // collection to the intervals() function
-    if (!ext) {
-        for (int i = 0; i <= currentSample; ++i)
-            core->glGetQueryObjectui64v(timers.at(i), GL_QUERY_RESULT, &timeSamples[i]);
-    } else {
-        qWarning("QOpenGLTimeMonitor::samples() requires OpenGL >=3.3\n"
-                 "or OpenGL 3.2 and GL_ARB_timer_query");
-    }
-    return timeSamples;
-}
-
-QVector<GLuint64> QOpenGLTimeMonitorPrivate::intervals() const
-{
-    QVector<GLuint64> intervals(timers.size() - 1);
-    if (!ext) {
-        // Obtain the timestamp samples and calculate the interval durations
-        const QVector<GLuint64> timeStamps = samples();
-        for (int i = 0; i < intervals.size(); ++i)
-            intervals[i] = timeStamps[i+1] - timeStamps[i];
-    } else {
-        // Stop the last timer if needed
-        if (timerQueryActive) {
-            core->glEndQuery(GL_TIME_ELAPSED_EXT);
-            timerQueryActive = false;
-        }
-
-        // Obtain the results from all timers apart from the redundant last one. In this
-        // case the results actually are the intervals not timestamps
-        for (int i = 0; i < currentSample; ++i)
-            ext->glGetQueryObjectui64vEXT(timers.at(i), GL_QUERY_RESULT, &intervals[i]);
-    }
-
-    return intervals;
-}
-
-void QOpenGLTimeMonitorPrivate::reset()
-{
-    currentSample = -1;
-    timeSamples.fill(0);
-}
-
-
-/*!
-    \class QOpenGLTimeMonitor
-    \brief The QOpenGLTimeMonitor class wraps a sequence of OpenGL timer query objects.
-    \inmodule QtGui
-    \since 5.1
-    \ingroup painting-3D
-
-    The QOpenGLTimeMonitor class is a convenience wrapper around a collection of OpenGL
-    timer query objects used to measure intervals of time on the GPU to the level of
-    granularity required by your rendering application.
-
-    The OpenGL timer queries objects are queried in sequence to record the GPU
-    timestamps at positions of interest in your rendering code. Once the results for
-    all issues timer queries become available, the results can be fetched and
-    QOpenGLTimerMonitor will calculate the recorded time intervals for you.
-
-    The typical use case of this class is to either profile your application's rendering
-    algorithms or to adjust those algorithms in real-time for dynamic performance/quality
-    balancing.
-
-    Prior to using QOpenGLTimeMonitor in your rendering function you should set the
-    required number of sample points that you wish to record by calling setSamples(). Note
-    that measuring N sample points will produce N-1 time intervals. Once you have set the
-    number of sample points, call the create() function with a valid current OpenGL context
-    to create the necessary query timer objects. These steps are usually performed just
-    once in an initialization function.
-
-    Use the recordSample() function to delimit blocks of code containing OpenGL commands
-    that you wish to time. You can check availability of the resulting time
-    samples and time intervals with isResultAvailable(). The calculated time intervals and
-    the raw timestamp samples can be retrieved with the blocking waitForIntervals() and
-    waitForSamples() functions respectively.
-
-    After retrieving the results and before starting a new round of taking samples
-    (for example, in the next frame) be sure to call the reset() function which will clear
-    the cached results and reset the timer index back to the first timer object.
-
-    \sa QOpenGLTimerQuery
-*/
-
-/*!
-    Creates a QOpenGLTimeMonitor instance with the given \a parent. You must call create()
-    with a valid OpenGL context before using.
-
-    \sa setSampleCount(), create()
-*/
-QOpenGLTimeMonitor::QOpenGLTimeMonitor(QObject *parent)
-    : QObject(*new QOpenGLTimeMonitorPrivate, parent)
-{
-}
-
-/*!
-    Destroys the QOpenGLTimeMonitor and any underlying OpenGL resources.
-*/
-QOpenGLTimeMonitor::~QOpenGLTimeMonitor()
-{
-    QOpenGLContext* ctx = QOpenGLContext::currentContext();
-
-    Q_D(QOpenGLTimeMonitor);
-    QOpenGLContext *oldContext = nullptr;
-    if (d->context != ctx) {
-        oldContext = ctx;
-        if (d->context->makeCurrent(oldContext->surface())) {
-            ctx = d->context;
-        } else {
-            qWarning("QOpenGLTimeMonitor::~QOpenGLTimeMonitor() failed to make time monitor's context current");
-            ctx = nullptr;
-        }
-    }
-
-    if (ctx)
-        destroy();
-
-    if (oldContext) {
-        if (!oldContext->makeCurrent(oldContext->surface()))
-            qWarning("QOpenGLTimeMonitor::~QOpenGLTimeMonitor() failed to restore current context");
-    }
-}
-
-/*!
-    Sets the number of sample points to \a sampleCount. After setting the number
-    of samples with this function, you must call create() to instantiate the underlying
-    OpenGL timer query objects.
-
-    The new \a sampleCount must be at least 2.
-
-    \sa sampleCount(), create(), recordSample()
-*/
-void QOpenGLTimeMonitor::setSampleCount(int sampleCount)
-{
-    // We need at least 2 samples to get an interval
-    if (sampleCount < 2)
-        return;
-    Q_D(QOpenGLTimeMonitor);
-    d->requestedSampleCount = sampleCount;
-}
-
-/*!
-    Returns the number of sample points that have been requested with
-    setSampleCount(). If create was successfully called following setSampleCount(),
-    then the value returned will be the actual number of sample points
-    that can be used.
-
-    The default value for sample count is 2, leading to the measurement of a
-    single interval.
-
-    \sa setSampleCount()
-*/
-int QOpenGLTimeMonitor::sampleCount() const
-{
-    Q_D(const QOpenGLTimeMonitor);
-    return d->requestedSampleCount;
-}
-
-/*!
-    Instantiate sampleCount() OpenGL timer query objects that will be used
-    to track the amount of time taken to execute OpenGL commands between
-    successive calls to recordSample().
-
-    Returns \c true if the OpenGL timer query objects could be created.
-
-    \sa destroy(), setSampleCount(), recordSample()
-*/
-bool QOpenGLTimeMonitor::create()
-{
-    Q_D(QOpenGLTimeMonitor);
-    return d->create();
-}
-
-/*!
-    Destroys any OpenGL timer query objects used within this instance.
-
-    \sa create()
-*/
-void QOpenGLTimeMonitor::destroy()
-{
-    Q_D(QOpenGLTimeMonitor);
-    d->destroy();
-}
-
-/*!
-    Returns \c true if the underlying OpenGL query objects have been created. If this
-    returns \c true and the associated OpenGL context is current, then you are able to record
-    time samples with this object.
-*/
-bool QOpenGLTimeMonitor::isCreated() const
-{
-    Q_D(const QOpenGLTimeMonitor);
-    return (!d->timers.isEmpty() && d->timers.at(0) != 0);
-}
-
-/*!
-    Returns a QVector containing the object Ids of the OpenGL timer query objects.
-*/
-QVector<GLuint> QOpenGLTimeMonitor::objectIds() const
-{
-    Q_D(const QOpenGLTimeMonitor);
-    return d->timers;
-}
-
-/*!
-    Issues an OpenGL timer query at this point in the OpenGL command queue. Calling this
-    function in a sequence in your application's rendering function, will build up
-    details of the GPU time taken to execute the OpenGL commands between successive
-    calls to this function.
-
-    \sa setSampleCount(), isResultAvailable(), waitForSamples(), waitForIntervals()
-*/
-int QOpenGLTimeMonitor::recordSample()
-{
-    Q_D(QOpenGLTimeMonitor);
-    d->recordSample();
-    return d->currentSample;
-}
-
-/*!
-    Returns \c true if the OpenGL timer query results are available.
-
-    \sa waitForSamples(), waitForIntervals()
-*/
-bool QOpenGLTimeMonitor::isResultAvailable() const
-{
-    Q_D(const QOpenGLTimeMonitor);
-    return d->isResultAvailable();
-}
-
-/*!
-    Returns a QVector containing the GPU timestamps taken with recordSample().
-
-    This function will block until OpenGL indicates the results are available. It
-    is recommended to check the availability of the result prior to calling this
-    function with isResultAvailable().
-
-    \note This function only works on systems that have OpenGL >=3.3 or the
-          ARB_timer_query extension. See QOpenGLTimerQuery for more details.
-
-    \sa waitForIntervals(), isResultAvailable()
-*/
-QVector<GLuint64> QOpenGLTimeMonitor::waitForSamples() const
-{
-    Q_D(const QOpenGLTimeMonitor);
-    return d->samples();
-}
-
-/*!
-    Returns a QVector containing the time intervals delimited by the calls to
-    recordSample(). The resulting vector will contain one fewer element as
-    this represents the intervening intervals rather than the actual timestamp
-    samples.
-
-    This function will block until OpenGL indicates the results are available. It
-    is recommended to check the availability of the result prior to calling this
-    function with isResultAvailable().
-
-    \sa waitForSamples(), isResultAvailable()
-*/
-QVector<GLuint64> QOpenGLTimeMonitor::waitForIntervals() const
-{
-    Q_D(const QOpenGLTimeMonitor);
-    return d->intervals();
-}
-
-/*!
-    Resets the time monitor ready for use in another frame of rendering. Call
-    this once you have obtained the previous results and before calling
-    recordSample() for the first time on the next frame.
-
-    \sa recordSample()
-*/
-void QOpenGLTimeMonitor::reset()
-{
-    Q_D(QOpenGLTimeMonitor);
-    d->reset();
-}
-
-QT_END_NAMESPACE
diff --git a/src/gui/opengl/qopengltimerquery.h b/src/gui/opengl/qopengltimerquery.h
deleted file mode 100644
index 27da74a3fb..0000000000
--- a/src/gui/opengl/qopengltimerquery.h
+++ /dev/null
@@ -1,116 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB).
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtGui module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QOPENGLTIMERQUERY_H
-#define QOPENGLTIMERQUERY_H
-
-#include <QtGui/qtguiglobal.h>
-
-#if !defined(QT_NO_OPENGL) && !defined(QT_OPENGL_ES_2)
-
-#include <QtCore/QObject>
-#include <QtGui/qopengl.h>
-
-QT_BEGIN_NAMESPACE
-
-class QOpenGLTimerQueryPrivate;
-
-class Q_GUI_EXPORT QOpenGLTimerQuery : public QObject
-{
-    Q_OBJECT
-
-public:
-    explicit QOpenGLTimerQuery(QObject *parent = nullptr);
-    ~QOpenGLTimerQuery();
-
-    bool create();
-    void destroy();
-    bool isCreated() const;
-    GLuint objectId() const;
-
-    void begin();
-    void end();
-    GLuint64 waitForTimestamp() const;
-    void recordTimestamp();
-    bool isResultAvailable() const;
-    GLuint64 waitForResult() const;
-
-private:
-    Q_DECLARE_PRIVATE(QOpenGLTimerQuery)
-    Q_DISABLE_COPY(QOpenGLTimerQuery)
-};
-
-
-class QOpenGLTimeMonitorPrivate;
-
-class Q_GUI_EXPORT QOpenGLTimeMonitor : public QObject
-{
-    Q_OBJECT
-
-public:
-    explicit QOpenGLTimeMonitor(QObject *parent = nullptr);
-    ~QOpenGLTimeMonitor();
-
-    void setSampleCount(int sampleCount);
-    int sampleCount() const;
-
-    bool create();
-    void destroy();
-    bool isCreated() const;
-    QVector<GLuint> objectIds() const;
-
-    int recordSample();
-
-    bool isResultAvailable() const;
-
-    QVector<GLuint64> waitForSamples() const;
-    QVector<GLuint64> waitForIntervals() const;
-
-    void reset();
-
-private:
-    Q_DECLARE_PRIVATE(QOpenGLTimeMonitor)
-    Q_DISABLE_COPY(QOpenGLTimeMonitor)
-};
-
-QT_END_NAMESPACE
-
-#endif // QT_NO_OPENGL
-
-#endif // QOPENGLTIMERQUERY_H
diff --git a/src/gui/opengl/qopenglversionprofile.cpp b/src/gui/opengl/qopenglversionprofile.cpp
new file mode 100644
index 0000000000..4e728f9405
--- /dev/null
+++ b/src/gui/opengl/qopenglversionprofile.cpp
@@ -0,0 +1,214 @@
+/****************************************************************************
+**
+** Copyright (C) 2020 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtGui module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qopenglversionprofile.h"
+
+#include <QtCore/QDebug>
+
+QT_BEGIN_NAMESPACE
+
+class QOpenGLVersionProfilePrivate
+{
+public:
+    QOpenGLVersionProfilePrivate()
+        : majorVersion(0),
+          minorVersion(0),
+          profile(QSurfaceFormat::NoProfile)
+    {}
+
+    int majorVersion;
+    int minorVersion;
+    QSurfaceFormat::OpenGLContextProfile profile;
+};
+
+/*!
+    \class QOpenGLVersionProfile
+    \inmodule QtGui
+    \since 5.1
+    \brief The QOpenGLVersionProfile class represents the version and if applicable
+           the profile of an OpenGL context.
+
+    An object of this class can be passed to QOpenGLContext::versionFunctions() to
+    request a functions object for a specific version and profile of OpenGL.
+
+    It also contains some helper functions to check if a version supports profiles
+    or is a legacy version.
+*/
+
+/*!
+    Creates a default invalid QOpenGLVersionProfile object.
+*/
+QOpenGLVersionProfile::QOpenGLVersionProfile()
+    : d(new QOpenGLVersionProfilePrivate)
+{
+}
+
+/*!
+    Creates a QOpenGLVersionProfile object initialised with the version and profile
+    from \a format.
+*/
+QOpenGLVersionProfile::QOpenGLVersionProfile(const QSurfaceFormat &format)
+    : d(new QOpenGLVersionProfilePrivate)
+{
+    d->majorVersion = format.majorVersion();
+    d->minorVersion = format.minorVersion();
+    d->profile = format.profile();
+}
+
+/*!
+    Constructs a copy of \a other.
+*/
+QOpenGLVersionProfile::QOpenGLVersionProfile(const QOpenGLVersionProfile &other)
+    : d(new QOpenGLVersionProfilePrivate)
+{
+    *d = *(other.d);
+}
+
+/*!
+    Destroys the QOpenGLVersionProfile object.
+*/
+QOpenGLVersionProfile::~QOpenGLVersionProfile()
+{
+    delete d;
+}
+
+/*!
+    Assigns the version and profile of \a rhs to this QOpenGLVersionProfile object.
+*/
+QOpenGLVersionProfile &QOpenGLVersionProfile::operator=(const QOpenGLVersionProfile &rhs)
+{
+    if (this == &rhs)
+        return *this;
+    *d = *(rhs.d);
+    return *this;
+}
+
+/*!
+    Returns a QPair<int,int> where the components represent the major and minor OpenGL
+    version numbers respectively.
+
+    \sa setVersion()
+*/
+QPair<int, int> QOpenGLVersionProfile::version() const
+{
+    return qMakePair( d->majorVersion, d->minorVersion);
+}
+
+/*!
+    Sets the major and minor version numbers to \a majorVersion and \a minorVersion respectively.
+
+    \sa version()
+*/
+void QOpenGLVersionProfile::setVersion(int majorVersion, int minorVersion)
+{
+    d->majorVersion = majorVersion;
+    d->minorVersion = minorVersion;
+}
+
+/*!
+    Returns the OpenGL profile. Only makes sense if profiles are supported by this version.
+
+    \sa setProfile()
+*/
+QSurfaceFormat::OpenGLContextProfile QOpenGLVersionProfile::profile() const
+{
+    return d->profile;
+}
+
+/*!
+    Sets the OpenGL profile \a profile. Only makes sense if profiles are supported by
+    this version.
+
+    \sa profile()
+*/
+void QOpenGLVersionProfile::setProfile(QSurfaceFormat::OpenGLContextProfile profile)
+{
+    d->profile = profile;
+}
+
+/*!
+    Returns \c true if profiles are supported by the OpenGL version returned by version(). Only
+    OpenGL versions >= 3.2 support profiles.
+
+    \sa profile(), version()
+*/
+bool QOpenGLVersionProfile::hasProfiles() const
+{
+    return ( d->majorVersion > 3
+             || (d->majorVersion == 3 && d->minorVersion > 1));
+}
+
+/*!
+    Returns \c true is the OpenGL version returned by version() contains deprecated functions
+    and does not support profiles i.e. if the OpenGL version is <= 3.1.
+*/
+bool QOpenGLVersionProfile::isLegacyVersion() const
+{
+    return (d->majorVersion < 3 || (d->majorVersion == 3 && d->minorVersion == 0));
+}
+
+/*!
+    Returns \c true if the version number is valid. Note that for a default constructed
+    QOpenGLVersionProfile object this function will return \c false.
+
+    \sa setVersion(), version()
+*/
+bool QOpenGLVersionProfile::isValid() const
+{
+    return d->majorVersion > 0 && d->minorVersion >= 0;
+}
+
+#ifndef QT_NO_DEBUG_STREAM
+QDebug operator<<(QDebug debug, const QOpenGLVersionProfile &vp)
+{
+    QDebugStateSaver saver(debug);
+    debug.nospace();
+    debug << "QOpenGLVersionProfile(";
+    if (vp.isValid()) {
+        debug << vp.version().first << '.' << vp.version().second
+            << ", profile=" << vp.profile();
+    } else {
+        debug << "invalid";
+    }
+    debug << ')';
+    return debug;
+}
+
+#endif // QT_NO_DEBUG_STREAM
+QT_END_NAMESPACE
diff --git a/src/gui/opengl/qopenglversionprofile.h b/src/gui/opengl/qopenglversionprofile.h
new file mode 100644
index 0000000000..f3b67e4eb5
--- /dev/null
+++ b/src/gui/opengl/qopenglversionprofile.h
@@ -0,0 +1,110 @@
+/****************************************************************************
+**
+** Copyright (C) 2020 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtGui module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QOPENGLVERSIONPROFILE_H
+#define QOPENGLVERSIONPROFILE_H
+
+#include <QtGui/qtguiglobal.h>
+
+#include <QtGui/QSurfaceFormat>
+
+#include <QtCore/QPair>
+#if QT_DEPRECATED_SINCE(5, 6)
+#include <QtCore/qhash.h>
+#endif
+#include <QtCore/qhashfunctions.h>
+
+#ifndef QT_NO_OPENGL
+
+QT_BEGIN_NAMESPACE
+
+class QOpenGLVersionProfilePrivate;
+class QDebug;
+
+class Q_GUI_EXPORT QOpenGLVersionProfile
+{
+public:
+    QOpenGLVersionProfile();
+    explicit QOpenGLVersionProfile(const QSurfaceFormat &format);
+    QOpenGLVersionProfile(const QOpenGLVersionProfile &other);
+    ~QOpenGLVersionProfile();
+
+    QOpenGLVersionProfile &operator=(const QOpenGLVersionProfile &rhs);
+
+    QPair<int, int> version() const;
+    void setVersion(int majorVersion, int minorVersion);
+
+    QSurfaceFormat::OpenGLContextProfile profile() const;
+    void setProfile(QSurfaceFormat::OpenGLContextProfile profile);
+
+    bool hasProfiles() const;
+    bool isLegacyVersion() const;
+    bool isValid() const;
+
+private:
+    QOpenGLVersionProfilePrivate* d;
+};
+
+inline uint qHash(const QOpenGLVersionProfile &v, uint seed = 0)
+{
+    return qHash(static_cast<int>(v.profile() * 1000)
+               + v.version().first * 100 + v.version().second * 10, seed);
+}
+
+inline bool operator==(const QOpenGLVersionProfile &lhs, const QOpenGLVersionProfile &rhs)
+{
+    if (lhs.profile() != rhs.profile())
+        return false;
+    return lhs.version() == rhs.version();
+}
+
+inline bool operator!=(const QOpenGLVersionProfile &lhs, const QOpenGLVersionProfile &rhs)
+{
+    return !operator==(lhs, rhs);
+}
+
+#ifndef QT_NO_DEBUG_STREAM
+Q_GUI_EXPORT QDebug operator<<(QDebug debug, const QOpenGLVersionProfile &vp);
+#endif // !QT_NO_DEBUG_STREAM
+
+QT_END_NAMESPACE
+
+#endif // QT_NO_OPENGL
+
+#endif // QOPENGLVERSIONPROFILE_H
diff --git a/src/gui/opengl/qopenglvertexarrayobject.cpp b/src/gui/opengl/qopenglvertexarrayobject.cpp
deleted file mode 100644
index f15fe06ee8..0000000000
--- a/src/gui/opengl/qopenglvertexarrayobject.cpp
+++ /dev/null
@@ -1,531 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Sean Harmer <sean.harmer@kdab.com>
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtGui module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qopenglvertexarrayobject.h"
-
-#include <QtCore/private/qobject_p.h>
-#include <QtCore/qthread.h>
-#include <QtGui/qopenglcontext.h>
-#include <QtGui/qoffscreensurface.h>
-#include <QtGui/qguiapplication.h>
-
-#include <QtGui/qopenglfunctions_3_0.h>
-#include <QtGui/qopenglfunctions_3_2_core.h>
-
-#include <private/qopenglextensions_p.h>
-#include <private/qopenglvertexarrayobject_p.h>
-
-QT_BEGIN_NAMESPACE
-
-class QOpenGLFunctions_3_0;
-class QOpenGLFunctions_3_2_Core;
-
-void qtInitializeVertexArrayObjectHelper(QOpenGLVertexArrayObjectHelper *helper, QOpenGLContext *context)
-{
-    Q_ASSERT(helper);
-    Q_ASSERT(context);
-
-    bool tryARB = true;
-
-    if (context->isOpenGLES()) {
-        if (context->format().majorVersion() >= 3) {
-            QOpenGLExtraFunctionsPrivate *extra = static_cast<QOpenGLExtensions *>(context->extraFunctions())->d();
-            helper->GenVertexArrays = extra->f.GenVertexArrays;
-            helper->DeleteVertexArrays = extra->f.DeleteVertexArrays;
-            helper->BindVertexArray = extra->f.BindVertexArray;
-            helper->IsVertexArray = extra->f.IsVertexArray;
-            tryARB = false;
-        } else if (context->hasExtension(QByteArrayLiteral("GL_OES_vertex_array_object"))) {
-            helper->GenVertexArrays = reinterpret_cast<QOpenGLVertexArrayObjectHelper::qt_GenVertexArrays_t>(context->getProcAddress("glGenVertexArraysOES"));
-            helper->DeleteVertexArrays = reinterpret_cast<QOpenGLVertexArrayObjectHelper::qt_DeleteVertexArrays_t>(context->getProcAddress("glDeleteVertexArraysOES"));
-            helper->BindVertexArray = reinterpret_cast<QOpenGLVertexArrayObjectHelper::qt_BindVertexArray_t>(context->getProcAddress("glBindVertexArrayOES"));
-            helper->IsVertexArray = reinterpret_cast<QOpenGLVertexArrayObjectHelper::qt_IsVertexArray_t>(context->getProcAddress("glIsVertexArrayOES"));
-            tryARB = false;
-        }
-    } else if (context->hasExtension(QByteArrayLiteral("GL_APPLE_vertex_array_object")) &&
-               !context->hasExtension(QByteArrayLiteral("GL_ARB_vertex_array_object"))) {
-        helper->GenVertexArrays = reinterpret_cast<QOpenGLVertexArrayObjectHelper::qt_GenVertexArrays_t>(context->getProcAddress("glGenVertexArraysAPPLE"));
-        helper->DeleteVertexArrays = reinterpret_cast<QOpenGLVertexArrayObjectHelper::qt_DeleteVertexArrays_t>(context->getProcAddress("glDeleteVertexArraysAPPLE"));
-        helper->BindVertexArray = reinterpret_cast<QOpenGLVertexArrayObjectHelper::qt_BindVertexArray_t>(context->getProcAddress("glBindVertexArrayAPPLE"));
-        helper->IsVertexArray = reinterpret_cast<QOpenGLVertexArrayObjectHelper::qt_IsVertexArray_t>(context->getProcAddress("glIsVertexArrayAPPLE"));
-        tryARB = false;
-    }
-
-    if (tryARB && context->hasExtension(QByteArrayLiteral("GL_ARB_vertex_array_object"))) {
-        helper->GenVertexArrays = reinterpret_cast<QOpenGLVertexArrayObjectHelper::qt_GenVertexArrays_t>(context->getProcAddress("glGenVertexArrays"));
-        helper->DeleteVertexArrays = reinterpret_cast<QOpenGLVertexArrayObjectHelper::qt_DeleteVertexArrays_t>(context->getProcAddress("glDeleteVertexArrays"));
-        helper->BindVertexArray = reinterpret_cast<QOpenGLVertexArrayObjectHelper::qt_BindVertexArray_t>(context->getProcAddress("glBindVertexArray"));
-        helper->IsVertexArray = reinterpret_cast<QOpenGLVertexArrayObjectHelper::qt_IsVertexArray_t>(context->getProcAddress("glIsVertexArray"));
-    }
-}
-
-class QOpenGLVertexArrayObjectPrivate : public QObjectPrivate
-{
-public:
-    QOpenGLVertexArrayObjectPrivate()
-        : vao(0)
-        , vaoFuncsType(NotSupported)
-        , context(nullptr)
-    {
-    }
-
-    ~QOpenGLVertexArrayObjectPrivate()
-    {
-        if (vaoFuncsType == ARB || vaoFuncsType == APPLE || vaoFuncsType == OES)
-            delete vaoFuncs.helper;
-    }
-
-    bool create();
-    void destroy();
-    void bind();
-    void release();
-    void _q_contextAboutToBeDestroyed();
-
-    Q_DECLARE_PUBLIC(QOpenGLVertexArrayObject)
-
-    GLuint vao;
-
-    union {
-        QOpenGLFunctions_3_0 *core_3_0;
-        QOpenGLFunctions_3_2_Core *core_3_2;
-        QOpenGLVertexArrayObjectHelper *helper;
-    } vaoFuncs;
-    enum {
-        NotSupported,
-        Core_3_0,
-        Core_3_2,
-        ARB,
-        APPLE,
-        OES
-    } vaoFuncsType;
-
-    QOpenGLContext *context;
-};
-
-bool QOpenGLVertexArrayObjectPrivate::create()
-{
-    if (vao) {
-        qWarning("QOpenGLVertexArrayObject::create() VAO is already created");
-        return false;
-    }
-
-    Q_Q(QOpenGLVertexArrayObject);
-
-    QOpenGLContext *ctx = QOpenGLContext::currentContext();
-    if (!ctx) {
-        qWarning("QOpenGLVertexArrayObject::create() requires a valid current OpenGL context");
-        return false;
-    }
-
-    //Fail early, if context is the same as ctx, it means we have tried to initialize for this context and failed
-    if (ctx == context)
-        return false;
-
-    context = ctx;
-    QObject::connect(context, SIGNAL(aboutToBeDestroyed()), q, SLOT(_q_contextAboutToBeDestroyed()));
-
-    if (ctx->isOpenGLES()) {
-        if (ctx->format().majorVersion() >= 3 || ctx->hasExtension(QByteArrayLiteral("GL_OES_vertex_array_object"))) {
-            vaoFuncs.helper = new QOpenGLVertexArrayObjectHelper(ctx);
-            vaoFuncsType = OES;
-            vaoFuncs.helper->glGenVertexArrays(1, &vao);
-        }
-    } else {
-        vaoFuncs.core_3_0 = nullptr;
-        vaoFuncsType = NotSupported;
-        QSurfaceFormat format = ctx->format();
-#ifndef QT_OPENGL_ES_2
-        if (format.version() >= qMakePair<int, int>(3,2)) {
-            vaoFuncs.core_3_2 = ctx->versionFunctions<QOpenGLFunctions_3_2_Core>();
-            vaoFuncsType = Core_3_2;
-            vaoFuncs.core_3_2->glGenVertexArrays(1, &vao);
-        } else if (format.majorVersion() >= 3) {
-            vaoFuncs.core_3_0 = ctx->versionFunctions<QOpenGLFunctions_3_0>();
-            vaoFuncsType = Core_3_0;
-            vaoFuncs.core_3_0->glGenVertexArrays(1, &vao);
-        } else
-#endif
-        if (ctx->hasExtension(QByteArrayLiteral("GL_ARB_vertex_array_object"))) {
-            vaoFuncs.helper = new QOpenGLVertexArrayObjectHelper(ctx);
-            vaoFuncsType = ARB;
-            vaoFuncs.helper->glGenVertexArrays(1, &vao);
-        } else if (ctx->hasExtension(QByteArrayLiteral("GL_APPLE_vertex_array_object"))) {
-            vaoFuncs.helper = new QOpenGLVertexArrayObjectHelper(ctx);
-            vaoFuncsType = APPLE;
-            vaoFuncs.helper->glGenVertexArrays(1, &vao);
-        }
-    }
-
-    return (vao != 0);
-}
-
-void QOpenGLVertexArrayObjectPrivate::destroy()
-{
-    Q_Q(QOpenGLVertexArrayObject);
-
-    QOpenGLContext *ctx = QOpenGLContext::currentContext();
-    QOpenGLContext *oldContext = nullptr;
-    QSurface *oldContextSurface = nullptr;
-    QScopedPointer<QOffscreenSurface> offscreenSurface;
-    if (context && context != ctx) {
-        oldContext = ctx;
-        oldContextSurface = ctx ? ctx->surface() : nullptr;
-        // Before going through the effort of creating an offscreen surface
-        // check that we are on the GUI thread because otherwise many platforms
-        // will not able to create that offscreen surface.
-        if (QThread::currentThread() != qGuiApp->thread()) {
-            ctx = nullptr;
-        } else {
-            // Cannot just make the current surface current again with another context.
-            // The format may be incompatible and some platforms (iOS) may impose
-            // restrictions on using a window with different contexts. Create an
-            // offscreen surface (a pbuffer or a hidden window) instead to be safe.
-            offscreenSurface.reset(new QOffscreenSurface);
-            offscreenSurface->setFormat(context->format());
-            offscreenSurface->create();
-            if (context->makeCurrent(offscreenSurface.data())) {
-                ctx = context;
-            } else {
-                qWarning("QOpenGLVertexArrayObject::destroy() failed to make VAO's context current");
-                ctx = nullptr;
-            }
-        }
-    }
-
-    if (context) {
-        QObject::disconnect(context, SIGNAL(aboutToBeDestroyed()), q, SLOT(_q_contextAboutToBeDestroyed()));
-        context = nullptr;
-    }
-
-    if (vao && ctx) {
-        switch (vaoFuncsType) {
-#ifndef QT_OPENGL_ES_2
-        case Core_3_2:
-            vaoFuncs.core_3_2->glDeleteVertexArrays(1, &vao);
-            break;
-        case Core_3_0:
-            vaoFuncs.core_3_0->glDeleteVertexArrays(1, &vao);
-            break;
-#endif
-        case ARB:
-        case APPLE:
-        case OES:
-            vaoFuncs.helper->glDeleteVertexArrays(1, &vao);
-            break;
-        default:
-            break;
-        }
-
-        vao = 0;
-    }
-
-    if (oldContext && oldContextSurface) {
-        if (!oldContext->makeCurrent(oldContextSurface))
-            qWarning("QOpenGLVertexArrayObject::destroy() failed to restore current context");
-    }
-}
-
-/*!
-    \internal
-*/
-void QOpenGLVertexArrayObjectPrivate::_q_contextAboutToBeDestroyed()
-{
-    destroy();
-}
-
-void QOpenGLVertexArrayObjectPrivate::bind()
-{
-    switch (vaoFuncsType) {
-#ifndef QT_OPENGL_ES_2
-    case Core_3_2:
-        vaoFuncs.core_3_2->glBindVertexArray(vao);
-        break;
-    case Core_3_0:
-        vaoFuncs.core_3_0->glBindVertexArray(vao);
-        break;
-#endif
-    case ARB:
-    case APPLE:
-    case OES:
-        vaoFuncs.helper->glBindVertexArray(vao);
-        break;
-    default:
-        break;
-    }
-}
-
-void QOpenGLVertexArrayObjectPrivate::release()
-{
-    switch (vaoFuncsType) {
-#ifndef QT_OPENGL_ES_2
-    case Core_3_2:
-        vaoFuncs.core_3_2->glBindVertexArray(0);
-        break;
-    case Core_3_0:
-        vaoFuncs.core_3_0->glBindVertexArray(0);
-        break;
-#endif
-    case ARB:
-    case APPLE:
-    case OES:
-        vaoFuncs.helper->glBindVertexArray(0);
-        break;
-    default:
-        break;
-    }
-}
-
-
-/*!
-    \class QOpenGLVertexArrayObject
-    \brief The QOpenGLVertexArrayObject class wraps an OpenGL Vertex Array Object.
-    \inmodule QtGui
-    \since 5.1
-    \ingroup painting-3D
-
-    A Vertex Array Object (VAO) is an OpenGL container object that encapsulates
-    the state needed to specify per-vertex attribute data to the OpenGL pipeline.
-    To put it another way, a VAO remembers the states of buffer objects (see
-    QOpenGLBuffer) and their associated state (e.g. vertex attribute divisors).
-    This allows a very easy and efficient method of switching between OpenGL buffer
-    states for rendering different "objects" in a scene. The QOpenGLVertexArrayObject
-    class is a thin wrapper around an OpenGL VAO.
-
-    For the desktop, VAOs are supported as a core feature in OpenGL 3.0 or newer and by the
-    GL_ARB_vertex_array_object for older versions. On OpenGL ES 2, VAOs are provided by
-    the optional GL_OES_vertex_array_object extension. You can check the version of
-    OpenGL with QOpenGLContext::surfaceFormat() and check for the presence of extensions
-    with QOpenGLContext::hasExtension().
-
-    As with the other Qt OpenGL classes, QOpenGLVertexArrayObject has a create()
-    function to create the underlying OpenGL object. This is to allow the developer to
-    ensure that there is a valid current OpenGL context at the time.
-
-    Once you have successfully created a VAO the typical usage pattern is:
-
-    \list
-        \li In scene initialization function, for each visual object:
-        \list
-            \li Bind the VAO
-            \li Set vertex data state for this visual object (vertices, normals, texture coordinates etc.)
-            \li Unbind (release()) the VAO
-        \endlist
-        \li In render function, for each visual object:
-        \list
-            \li Bind the VAO (and shader program if needed)
-            \li Call a glDraw*() function
-            \li Unbind (release()) the VAO
-        \endlist
-    \endlist
-
-    The act of binding the VAO in the render function has the effect of restoring
-    all of the vertex data state setup in the initialization phase. In this way we can
-    set a great deal of state when setting up a VAO and efficiently switch between
-    state sets of objects to be rendered. Using VAOs also allows the OpenGL driver
-    to amortise the validation checks of the vertex data.
-
-    \note Vertex Array Objects, like all other OpenGL container objects, are specific
-    to the context for which they were created and cannot be shared amongst a
-    context group.
-
-    \sa QOpenGLVertexArrayObject::Binder, QOpenGLBuffer
-*/
-
-/*!
-    Creates a QOpenGLVertexArrayObject with the given \a parent. You must call create()
-    with a valid OpenGL context before using.
-*/
-QOpenGLVertexArrayObject::QOpenGLVertexArrayObject(QObject* parent)
-    : QObject(*new QOpenGLVertexArrayObjectPrivate, parent)
-{
-}
-
-/*!
-    \internal
-*/
-QOpenGLVertexArrayObject::QOpenGLVertexArrayObject(QOpenGLVertexArrayObjectPrivate &dd)
-    : QObject(dd)
-{
-}
-
-/*!
-    Destroys the QOpenGLVertexArrayObject and the underlying OpenGL resource.
-*/
-QOpenGLVertexArrayObject::~QOpenGLVertexArrayObject()
-{
-    destroy();
-}
-
-/*!
-    Creates the underlying OpenGL vertex array object. There must be a valid OpenGL context
-    that supports vertex array objects current for this function to succeed.
-
-    Returns \c true if the OpenGL vertex array object was successfully created.
-
-    When the return value is \c false, vertex array object support is not available. This
-    is not an error: on systems with OpenGL 2.x or OpenGL ES 2.0 vertex array objects may
-    not be supported. The application is free to continue execution in this case, but it
-    then has to be prepared to operate in a VAO-less manner too. This means that instead
-    of merely calling bind(), the value of isCreated() must be checked and the vertex
-    arrays has to be initialized in the traditional way when there is no vertex array
-    object present.
-
-    \sa isCreated()
-*/
-bool QOpenGLVertexArrayObject::create()
-{
-    Q_D(QOpenGLVertexArrayObject);
-    return d->create();
-}
-
-/*!
-    Destroys the underlying OpenGL vertex array object. There must be a valid OpenGL context
-    that supports vertex array objects current for this function to succeed.
-*/
-void QOpenGLVertexArrayObject::destroy()
-{
-    Q_D(QOpenGLVertexArrayObject);
-    d->destroy();
-}
-
-/*!
-    Returns \c true is the underlying OpenGL vertex array object has been created. If this
-    returns \c true and the associated OpenGL context is current, then you are able to bind()
-    this object.
-*/
-bool QOpenGLVertexArrayObject::isCreated() const
-{
-    Q_D(const QOpenGLVertexArrayObject);
-    return (d->vao != 0);
-}
-
-/*!
-    Returns the id of the underlying OpenGL vertex array object.
-*/
-GLuint QOpenGLVertexArrayObject::objectId() const
-{
-    Q_D(const QOpenGLVertexArrayObject);
-    return d->vao;
-}
-
-/*!
-    Binds this vertex array object to the OpenGL binding point. From this point on
-    and until release() is called or another vertex array object is bound, any
-    modifications made to vertex data state are stored inside this vertex array object.
-
-    If another vertex array object is then bound you can later restore the set of
-    state associated with this object by calling bind() on this object once again.
-    This allows efficient changes between vertex data states in rendering functions.
-*/
-void QOpenGLVertexArrayObject::bind()
-{
-    Q_D(QOpenGLVertexArrayObject);
-    d->bind();
-}
-
-/*!
-    Unbinds this vertex array object by binding the default vertex array object (id = 0).
-*/
-void QOpenGLVertexArrayObject::release()
-{
-    Q_D(QOpenGLVertexArrayObject);
-    d->release();
-}
-
-
-/*!
-    \class QOpenGLVertexArrayObject::Binder
-    \brief The QOpenGLVertexArrayObject::Binder class is a convenience class to help
-    with the binding and releasing of OpenGL Vertex Array Objects.
-    \inmodule QtGui
-    \reentrant
-    \since 5.1
-    \ingroup painting-3D
-
-    QOpenGLVertexArrayObject::Binder is a simple convenience class that can be used
-    to assist with the binding and releasing of QOpenGLVertexArrayObject instances.
-    This class is to QOpenGLVertexArrayObject as QMutexLocker is to QMutex.
-
-    This class implements the RAII principle which helps to ensure behavior in
-    complex code or in the presence of exceptions.
-
-    The constructor of this class accepts a QOpenGLVertexArrayObject (VAO) as an
-    argument and attempts to bind the VAO, calling QOpenGLVertexArrayObject::create()
-    if necessary. The destructor of this class calls QOpenGLVertexArrayObject::release()
-    which unbinds the VAO.
-
-    If needed the VAO can be temporarily unbound with the release() function and bound
-    once more with rebind().
-
-    \sa QOpenGLVertexArrayObject
-*/
-
-/*!
-    \fn QOpenGLVertexArrayObject::Binder::Binder(QOpenGLVertexArrayObject *v)
-
-    Creates a QOpenGLVertexArrayObject::Binder object and binds \a v by calling
-    QOpenGLVertexArrayObject::bind(). If necessary it first calls
-    QOpenGLVertexArrayObject::create().
-*/
-
-/*!
-    \fn QOpenGLVertexArrayObject::Binder::~Binder()
-
-    Destroys the QOpenGLVertexArrayObject::Binder and releases the associated vertex array object.
-*/
-
-/*!
-    \fn QOpenGLVertexArrayObject::Binder::release()
-
-    Can be used to temporarily release the associated vertex array object.
-
-    \sa rebind()
-*/
-
-/*!
-    \fn QOpenGLVertexArrayObject::Binder::rebind()
-
-    Can be used to rebind the associated vertex array object.
-
-    \sa release()
-*/
-
-QT_END_NAMESPACE
-
-#include "moc_qopenglvertexarrayobject.cpp"
diff --git a/src/gui/opengl/qopenglvertexarrayobject.h b/src/gui/opengl/qopenglvertexarrayobject.h
deleted file mode 100644
index b81ae6a2a9..0000000000
--- a/src/gui/opengl/qopenglvertexarrayobject.h
+++ /dev/null
@@ -1,111 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Sean Harmer <sean.harmer@kdab.com>
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtGui module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QOPENGLVERTEXARRAYOBJECT_H
-#define QOPENGLVERTEXARRAYOBJECT_H
-
-#include <QtGui/qtguiglobal.h>
-
-#ifndef QT_NO_OPENGL
-
-#include <QtCore/QObject>
-#include <QtGui/qopengl.h>
-
-QT_BEGIN_NAMESPACE
-
-class QOpenGLVertexArrayObjectPrivate;
-
-class Q_GUI_EXPORT QOpenGLVertexArrayObject : public QObject
-{
-    Q_OBJECT
-
-public:
-    explicit QOpenGLVertexArrayObject(QObject* parent = nullptr);
-    ~QOpenGLVertexArrayObject();
-
-    bool create();
-    void destroy();
-    bool isCreated() const;
-    GLuint objectId() const;
-    void bind();
-    void release();
-
-    class Q_GUI_EXPORT Binder
-    {
-    public:
-        inline Binder(QOpenGLVertexArrayObject *v)
-            : vao(v)
-        {
-            Q_ASSERT(v);
-            if (vao->isCreated() || vao->create())
-                vao->bind();
-        }
-
-        inline ~Binder()
-        {
-            release();
-        }
-
-        inline void release()
-        {
-            vao->release();
-        }
-
-        inline void rebind()
-        {
-            vao->bind();
-        }
-
-    private:
-        Q_DISABLE_COPY(Binder)
-        QOpenGLVertexArrayObject *vao;
-    };
-
-private:
-    Q_DISABLE_COPY(QOpenGLVertexArrayObject)
-    Q_DECLARE_PRIVATE(QOpenGLVertexArrayObject)
-    Q_PRIVATE_SLOT(d_func(), void _q_contextAboutToBeDestroyed())
-    QOpenGLVertexArrayObject(QOpenGLVertexArrayObjectPrivate &dd);
-};
-
-QT_END_NAMESPACE
-
-#endif
-
-#endif // QOPENGLVERTEXARRAYOBJECT_H
diff --git a/src/gui/opengl/qopenglvertexarrayobject_p.h b/src/gui/opengl/qopenglvertexarrayobject_p.h
deleted file mode 100644
index fd3a6f0f89..0000000000
--- a/src/gui/opengl/qopenglvertexarrayobject_p.h
+++ /dev/null
@@ -1,125 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Sean Harmer <sean.harmer@kdab.com>
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtGui module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QOPENGLVERTEXARRAYOBJECT_P_H
-#define QOPENGLVERTEXARRAYOBJECT_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists for the convenience
-// of the Qt OpenGL classes.  This header file may change from
-// version to version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include <QtCore/qglobal.h>
-
-#ifndef QT_NO_OPENGL
-
-#include <QtGui/qopengl.h>
-
-QT_BEGIN_NAMESPACE
-
-class QOpenGLVertexArrayObjectHelper;
-class QOpenGLContext;
-
-void Q_GUI_EXPORT qtInitializeVertexArrayObjectHelper(QOpenGLVertexArrayObjectHelper *helper, QOpenGLContext *context);
-
-class QOpenGLVertexArrayObjectHelper
-{
-    Q_DISABLE_COPY(QOpenGLVertexArrayObjectHelper)
-
-public:
-    explicit inline QOpenGLVertexArrayObjectHelper(QOpenGLContext *context)
-        : GenVertexArrays(nullptr)
-        , DeleteVertexArrays(nullptr)
-        , BindVertexArray(nullptr)
-        , IsVertexArray(nullptr)
-    {
-        qtInitializeVertexArrayObjectHelper(this, context);
-    }
-
-    inline bool isValid() const
-    {
-        return GenVertexArrays && DeleteVertexArrays && BindVertexArray && IsVertexArray;
-    }
-
-    inline void glGenVertexArrays(GLsizei n, GLuint *arrays) const
-    {
-        GenVertexArrays(n, arrays);
-    }
-
-    inline void glDeleteVertexArrays(GLsizei n, const GLuint *arrays) const
-    {
-        DeleteVertexArrays(n, arrays);
-    }
-
-    inline void glBindVertexArray(GLuint array) const
-    {
-        BindVertexArray(array);
-    }
-
-    inline GLboolean glIsVertexArray(GLuint array) const
-    {
-        return IsVertexArray(array);
-    }
-
-private:
-    friend void Q_GUI_EXPORT qtInitializeVertexArrayObjectHelper(QOpenGLVertexArrayObjectHelper *helper, QOpenGLContext *context);
-
-    // Function signatures are equivalent between desktop core, ARB, APPLE, ES 3 and ES 2 extensions
-    typedef void (QOPENGLF_APIENTRYP qt_GenVertexArrays_t)(GLsizei n, GLuint *arrays);
-    typedef void (QOPENGLF_APIENTRYP qt_DeleteVertexArrays_t)(GLsizei n, const GLuint *arrays);
-    typedef void (QOPENGLF_APIENTRYP qt_BindVertexArray_t)(GLuint array);
-    typedef GLboolean (QOPENGLF_APIENTRYP qt_IsVertexArray_t)(GLuint array);
-
-    qt_GenVertexArrays_t GenVertexArrays;
-    qt_DeleteVertexArrays_t DeleteVertexArrays;
-    qt_BindVertexArray_t BindVertexArray;
-    qt_IsVertexArray_t IsVertexArray;
-};
-
-QT_END_NAMESPACE
-
-#endif // QT_NO_OPENGL
-
-#endif // QOPENGLVERTEXARRAYOBJECT_P_H
diff --git a/src/gui/painting/painting.pri b/src/gui/painting/painting.pri
index 94a88f55dc..21a40540c4 100644
--- a/src/gui/painting/painting.pri
+++ b/src/gui/painting/painting.pri
@@ -26,7 +26,6 @@ HEADERS += \
         painting/qfixed_p.h \
         painting/qgrayraster_p.h \
         painting/qicc_p.h \
-        painting/qmatrix.h \
         painting/qmemrotate_p.h \
         painting/qoutlinemapper_p.h \
         painting/qpagedpaintdevice.h \
@@ -83,7 +82,6 @@ SOURCES += \
         painting/qgrayraster.c \
         painting/qicc.cpp \
         painting/qimagescale.cpp \
-        painting/qmatrix.cpp \
         painting/qmemrotate.cpp \
         painting/qoutlinemapper.cpp \
         painting/qpagedpaintdevice.cpp \
diff --git a/src/gui/painting/qbackingstore.cpp b/src/gui/painting/qbackingstore.cpp
index 2147d9d61d..5bbc03db80 100644
--- a/src/gui/painting/qbackingstore.cpp
+++ b/src/gui/painting/qbackingstore.cpp
@@ -322,7 +322,7 @@ void Q_GUI_EXPORT qt_scrollRectInImage(QImage &img, const QRect &rect, const QPo
     // make sure we don't detach
     uchar *mem = const_cast<uchar*>(const_cast<const QImage &>(img).bits());
 
-    int lineskip = img.bytesPerLine();
+    qsizetype lineskip = img.bytesPerLine();
     int depth = img.depth() >> 3;
 
     const QRect imageRect(0, 0, img.width(), img.height());
diff --git a/src/gui/painting/qbrush.cpp b/src/gui/painting/qbrush.cpp
index 28cc20bfc5..c8fc447446 100644
--- a/src/gui/painting/qbrush.cpp
+++ b/src/gui/painting/qbrush.cpp
@@ -892,26 +892,6 @@ bool QBrush::isOpaque() const
     return false;
 }
 
-
-#if QT_DEPRECATED_SINCE(5, 15)
-/*!
-    \since 4.2
-    \obsolete
-
-    Use setTransform() instead.
-
-    Sets \a matrix as an explicit transformation matrix on the
-    current brush. The brush transformation matrix is merged with
-    QPainter transformation matrix to produce the final result.
-
-    \sa matrix()
-*/
-void QBrush::setMatrix(const QMatrix &matrix)
-{
-    setTransform(QTransform(matrix));
-}
-#endif // QT_DEPRECATED_SINCE(5, 15)
-
 /*!
     \since 4.3
 
diff --git a/src/gui/painting/qbrush.h b/src/gui/painting/qbrush.h
index 3a01248c57..621387615b 100644
--- a/src/gui/painting/qbrush.h
+++ b/src/gui/painting/qbrush.h
@@ -46,7 +46,6 @@
 #include <QtCore/qvector.h>
 #include <QtCore/qscopedpointer.h>
 #include <QtGui/qcolor.h>
-#include <QtGui/qmatrix.h>
 #include <QtGui/qtransform.h>
 #include <QtGui/qimage.h>
 #include <QtGui/qpixmap.h>
@@ -89,11 +88,6 @@ public:
     inline Qt::BrushStyle style() const;
     void setStyle(Qt::BrushStyle);
 
-#if QT_DEPRECATED_SINCE(5, 15)
-    QT_DEPRECATED_X("Use transform()") inline const QMatrix &matrix() const;
-    QT_DEPRECATED_X("Use setTransform()") void setMatrix(const QMatrix &mat);
-#endif // QT_DEPRECATED_SINCE(5, 15)
-
     inline QTransform transform() const;
     void setTransform(const QTransform &);
 
@@ -159,10 +153,6 @@ struct QBrushData
 
 inline Qt::BrushStyle QBrush::style() const { return d->style; }
 inline const QColor &QBrush::color() const { return d->color; }
-#if QT_DEPRECATED_SINCE(5, 15)
-QT_DEPRECATED_X("Use transform()")
-inline const QMatrix &QBrush::matrix() const { return d->transform.toAffine(); }
-#endif // QT_DEPRECATED_SINCE(5, 15)
 inline QTransform QBrush::transform() const { return d->transform; }
 inline bool QBrush::isDetached() const { return d->ref.loadRelaxed() == 1; }
 
diff --git a/src/gui/painting/qcolor.cpp b/src/gui/painting/qcolor.cpp
index f15f6aeebd..eac2a50c8c 100644
--- a/src/gui/painting/qcolor.cpp
+++ b/src/gui/painting/qcolor.cpp
@@ -855,18 +855,6 @@ QColor::QColor(Spec spec) noexcept
 */
 
 /*!
-    Returns the name of the color in the format "#RRGGBB"; i.e. a "#"
-    character followed by three two-digit hexadecimal numbers.
-
-    \sa setNamedColor()
-*/
-
-QString QColor::name() const
-{
-    return name(HexRgb);
-}
-
-/*!
     \since 5.2
 
     Returns the name of the color in the specified \a format.
@@ -1086,6 +1074,7 @@ void QColor::setHsvF(qreal h, qreal s, qreal v, qreal a)
         || (v < qreal(0.0) || v > qreal(1.0))
         || (a < qreal(0.0) || a > qreal(1.0))) {
         qWarning("QColor::setHsvF: HSV parameters out of range");
+        invalidate();
         return;
     }
 
@@ -1198,7 +1187,8 @@ void QColor::setHslF(qreal h, qreal s, qreal l, qreal a)
         || (s < qreal(0.0) || s > qreal(1.0))
         || (l < qreal(0.0) || l > qreal(1.0))
         || (a < qreal(0.0) || a > qreal(1.0))) {
-        qWarning("QColor::setHsvF: HSV parameters out of range");
+        qWarning("QColor::setHslF: HSL parameters out of range");
+        invalidate();
         return;
     }
 
@@ -1224,7 +1214,7 @@ void QColor::setHslF(qreal h, qreal s, qreal l, qreal a)
 void QColor::setHsl(int h, int s, int l, int a)
 {
     if (h < -1 || (uint)s > 255 || (uint)l > 255 || (uint)a > 255) {
-        qWarning("QColor::setHsv: HSV parameters out of range");
+        qWarning("QColor::setHsl: HSL parameters out of range");
         invalidate();
         return;
     }
@@ -2626,16 +2616,6 @@ QColor QColor::fromHslF(qreal h, qreal s, qreal l, qreal a)
 }
 
 /*!
-   \obsolete
-
-   Use the \c const overload instead.
-*/
-void QColor::getCmyk(int *c, int *m, int *y, int *k, int *a)
-{
-    const_cast<const QColor *>(this)->getCmyk(c, m, y, k, a);
-}
-
-/*!
     Sets the contents pointed to by \a c, \a m, \a y, \a k, and \a a, to the
     cyan, magenta, yellow, black, and alpha-channel (transparency) components
     of the color's CMYK value.
@@ -2665,16 +2645,6 @@ void QColor::getCmyk(int *c, int *m, int *y, int *k, int *a) const
 }
 
 /*!
-   \obsolete
-
-   Use the \c const overload instead.
-*/
-void QColor::getCmykF(qreal *c, qreal *m, qreal *y, qreal *k, qreal *a)
-{
-    const_cast<const QColor *>(this)->getCmykF(c, m, y, k, a);
-}
-
-/*!
     Sets the contents pointed to by \a c, \a m, \a y, \a k, and \a a, to the
     cyan, magenta, yellow, black, and alpha-channel (transparency) components
     of the color's CMYK value.
@@ -2719,6 +2689,7 @@ void QColor::setCmyk(int c, int m, int y, int k, int a)
         || k < 0 || k > 255
         || a < 0 || a > 255) {
         qWarning("QColor::setCmyk: CMYK parameters out of range");
+        invalidate();
         return;
     }
 
@@ -2748,6 +2719,7 @@ void QColor::setCmykF(qreal c, qreal m, qreal y, qreal k, qreal a)
         || k < qreal(0.0) || k > qreal(1.0)
         || a < qreal(0.0) || a > qreal(1.0)) {
         qWarning("QColor::setCmykF: CMYK parameters out of range");
+        invalidate();
         return;
     }
 
@@ -2920,18 +2892,6 @@ QColor QColor::dark(int factor) const noexcept
 }
 #endif
 
-#if QT_VERSION < QT_VERSION_CHECK(6,0,0)
-/*!
-    Assigns a copy of \a color to this color, and returns a reference to it.
-*/
-QColor &QColor::operator=(const QColor &color) noexcept
-{
-    cspec = color.cspec;
-    ct.argb = color.ct.argb;
-    return *this;
-}
-#endif
-
 /*! \overload
     Assigns a copy of \a color and returns a reference to this color.
  */
diff --git a/src/gui/painting/qcolor.h b/src/gui/painting/qcolor.h
index 0189f4e5f1..ad624e6b60 100644
--- a/src/gui/painting/qcolor.h
+++ b/src/gui/painting/qcolor.h
@@ -46,6 +46,8 @@
 #include <QtCore/qstringlist.h>
 #include <QtGui/qrgba64.h>
 
+#include <limits.h>
+
 QT_BEGIN_NAMESPACE
 
 
@@ -87,24 +89,11 @@ public:
     inline QColor(QLatin1String name);
     QColor(Spec spec) noexcept;
 
-#if QT_VERSION < QT_VERSION_CHECK(6,0,0)
-    // ### Qt 6: remove all of these, the trivial ones are fine.
-    Q_DECL_CONSTEXPR QColor(const QColor &color) noexcept
-        : cspec(color.cspec), ct(color.ct)
-    {}
-    Q_DECL_CONSTEXPR QColor(QColor &&other) noexcept : cspec(other.cspec), ct(other.ct) {}
-    QColor &operator=(QColor &&other) noexcept
-    { cspec = other.cspec; ct = other.ct; return *this; }
-    QColor &operator=(const QColor &) noexcept;
-#endif // Qt < 6
-
     QColor &operator=(Qt::GlobalColor color) noexcept;
 
     bool isValid() const noexcept;
 
-    // ### Qt 6: merge overloads
-    QString name() const;
-    QString name(NameFormat format) const;
+    QString name(NameFormat format = HexRgb) const;
 
 #if QT_STRINGVIEW_LEVEL < 2
     void setNamedColor(const QString& name);
@@ -180,11 +169,9 @@ public:
     qreal yellowF() const noexcept;
     qreal blackF() const noexcept;
 
-    void getCmyk(int *c, int *m, int *y, int *k, int *a = nullptr); // ### Qt 6: remove
     void getCmyk(int *c, int *m, int *y, int *k, int *a = nullptr) const;
     void setCmyk(int c, int m, int y, int k, int a = 255);
 
-    void getCmykF(qreal *c, qreal *m, qreal *y, qreal *k, qreal *a = nullptr); // ### Qt 6: remove
     void getCmykF(qreal *c, qreal *m, qreal *y, qreal *k, qreal *a = nullptr) const;
     void setCmykF(qreal c, qreal m, qreal y, qreal k, qreal a = 1.0);
 
diff --git a/src/gui/painting/qcolormatrix_p.h b/src/gui/painting/qcolormatrix_p.h
index edb2d32258..749aad3b2c 100644
--- a/src/gui/painting/qcolormatrix_p.h
+++ b/src/gui/painting/qcolormatrix_p.h
@@ -112,7 +112,7 @@ inline bool operator!=(const QColorVector &v1, const QColorVector &v2)
 
 
 // A matrix mapping 3 value colors.
-// Not using QMatrix because only floats are needed and performance is critical.
+// Not using QTransform because only floats are needed and performance is critical.
 class QColorMatrix
 {
 public:
diff --git a/src/gui/painting/qdatabuffer_p.h b/src/gui/painting/qdatabuffer_p.h
index 181d19da0b..676750b716 100644
--- a/src/gui/painting/qdatabuffer_p.h
+++ b/src/gui/painting/qdatabuffer_p.h
@@ -116,7 +116,7 @@ public:
                 capacity = 1;
             while (capacity < size)
                 capacity *= 2;
-            buffer = (Type*) realloc(buffer, capacity * sizeof(Type));
+            buffer = (Type*) realloc(static_cast<void*>(buffer), capacity * sizeof(Type));
             Q_CHECK_PTR(buffer);
         }
     }
@@ -124,7 +124,7 @@ public:
     inline void shrink(int size) {
         capacity = size;
         if (size) {
-            buffer = (Type*) realloc(buffer, capacity * sizeof(Type));
+            buffer = (Type*) realloc(static_cast<void*>(buffer), capacity * sizeof(Type));
             Q_CHECK_PTR(buffer);
         } else {
             free(buffer);
diff --git a/src/gui/painting/qdrawhelper.cpp b/src/gui/painting/qdrawhelper.cpp
index 2d4045fe29..e4e8305620 100644
--- a/src/gui/painting/qdrawhelper.cpp
+++ b/src/gui/painting/qdrawhelper.cpp
@@ -2906,7 +2906,7 @@ static void QT_FASTCALL fetchTransformedBilinearARGB32PM_fast_rotate_helper(uint
         int32x4_t v_fdy = vdupq_n_s32(fdy * 4);
 
         const uchar *textureData = image.imageData;
-        const int bytesPerLine = image.bytesPerLine;
+        const qsizetype bytesPerLine = image.bytesPerLine;
 
         int32x4_t v_fx = vmovq_n_s32(fx);
         int32x4_t v_fy = vmovq_n_s32(fy);
diff --git a/src/gui/painting/qdrawhelper_ssse3.cpp b/src/gui/painting/qdrawhelper_ssse3.cpp
index 14d7047bb6..a175b591dd 100644
--- a/src/gui/painting/qdrawhelper_ssse3.cpp
+++ b/src/gui/painting/qdrawhelper_ssse3.cpp
@@ -197,7 +197,7 @@ void qt_memfill24_ssse3(quint24 *dest, quint24 color, qsizetype count)
     quint24 *end = dest + count;
 
     constexpr uchar x = 2, y = 1, z = 0;
-    Q_DECL_ALIGN(__m128i) static const uchar
+    alignas(__m128i) static const uchar
     shuffleMask[16 + 1] = { x, y, z, x,  y, z, x, y,  z, x, y, z,  x, y, z, x,  y };
 
     __m128i mval1 = _mm_shuffle_epi8(m, _mm_load_si128(reinterpret_cast<const __m128i *>(shuffleMask)));
diff --git a/src/gui/painting/qmatrix.cpp b/src/gui/painting/qmatrix.cpp
deleted file mode 100644
index 7ebd2dbd09..0000000000
--- a/src/gui/painting/qmatrix.cpp
+++ /dev/null
@@ -1,1191 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtGui module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qmatrix.h"
-
-#include "qdatastream.h"
-#include "qdebug.h"
-#include "qhashfunctions.h"
-#include "qregion.h"
-#include "qpainterpath.h"
-#include "qpainterpath_p.h"
-#include "qtransform.h"
-#include "qvariant.h"
-#include <qmath.h>
-
-#include <limits.h>
-
-QT_BEGIN_NAMESPACE
-
-/*!
-    \class QMatrix
-    \brief The QMatrix class specifies 2D transformations of a
-    coordinate system.
-    \obsolete
-
-    \ingroup painting
-    \inmodule QtGui
-
-    A matrix specifies how to translate, scale, shear or rotate the
-    coordinate system, and is typically used when rendering graphics.
-    QMatrix, in contrast to QTransform, does not allow perspective
-    transformations. QTransform is the recommended transformation
-    class in Qt.
-
-    A QMatrix object can be built using the setMatrix(), scale(),
-    rotate(), translate() and shear() functions.  Alternatively, it
-    can be built by applying \l {QMatrix#Basic Matrix
-    Operations}{basic matrix operations}. The matrix can also be
-    defined when constructed, and it can be reset to the identity
-    matrix (the default) using the reset() function.
-
-    The QMatrix class supports mapping of graphic primitives: A given
-    point, line, polygon, region, or painter path can be mapped to the
-    coordinate system defined by \e this matrix using the map()
-    function. In case of a rectangle, its coordinates can be
-    transformed using the mapRect() function. A rectangle can also be
-    transformed into a \e polygon (mapped to the coordinate system
-    defined by \e this matrix), using the mapToPolygon() function.
-
-    QMatrix provides the isIdentity() function which returns \c true if
-    the matrix is the identity matrix, and the isInvertible() function
-    which returns \c true if the matrix is non-singular (i.e. AB = BA =
-    I). The inverted() function returns an inverted copy of \e this
-    matrix if it is invertible (otherwise it returns the identity
-    matrix). In addition, QMatrix provides the determinant() function
-    returning the matrix's determinant.
-
-    Finally, the QMatrix class supports matrix multiplication, and
-    objects of the class can be streamed as well as compared.
-
-    \tableofcontents
-
-    \section1 Rendering Graphics
-
-    When rendering graphics, the matrix defines the transformations
-    but the actual transformation is performed by the drawing routines
-    in QPainter.
-
-    By default, QPainter operates on the associated device's own
-    coordinate system.  The standard coordinate system of a
-    QPaintDevice has its origin located at the top-left position. The
-    \e x values increase to the right; \e y values increase
-    downward. For a complete description, see the \l {Coordinate
-    System}{coordinate system} documentation.
-
-    QPainter has functions to translate, scale, shear and rotate the
-    coordinate system without using a QMatrix. For example:
-
-    \table 100%
-    \row
-    \li \inlineimage qmatrix-simpletransformation.png
-    \li
-    \snippet matrix/matrix.cpp 0
-    \endtable
-
-    Although these functions are very convenient, it can be more
-    efficient to build a QMatrix and call QPainter::setMatrix() if you
-    want to perform more than a single transform operation. For
-    example:
-
-    \table 100%
-    \row
-    \li \inlineimage qmatrix-combinedtransformation.png
-    \li
-    \snippet matrix/matrix.cpp 1
-    \endtable
-
-    \section1 Basic Matrix Operations
-
-    \image qmatrix-representation.png
-
-    A QMatrix object contains a 3 x 3 matrix.  The \c dx and \c dy
-    elements specify horizontal and vertical translation. The \c m11
-    and \c m22 elements specify horizontal and vertical scaling. And
-    finally, the \c m21 and \c m12 elements specify horizontal and
-    vertical \e shearing.
-
-    QMatrix transforms a point in the plane to another point using the
-    following formulas:
-
-    \snippet code/src_gui_painting_qmatrix.cpp 0
-
-    The point \e (x, y) is the original point, and \e (x', y') is the
-    transformed point. \e (x', y') can be transformed back to \e (x,
-    y) by performing the same operation on the inverted() matrix.
-
-    The various matrix elements can be set when constructing the
-    matrix, or by using the setMatrix() function later on. They can also
-    be manipulated using the translate(), rotate(), scale() and
-    shear() convenience functions, The currently set values can be
-    retrieved using the m11(), m12(), m21(), m22(), dx() and dy()
-    functions.
-
-    Translation is the simplest transformation. Setting \c dx and \c
-    dy will move the coordinate system \c dx units along the X axis
-    and \c dy units along the Y axis.  Scaling can be done by setting
-    \c m11 and \c m22. For example, setting \c m11 to 2 and \c m22 to
-    1.5 will double the height and increase the width by 50%.  The
-    identity matrix has \c m11 and \c m22 set to 1 (all others are set
-    to 0) mapping a point to itself. Shearing is controlled by \c m12
-    and \c m21. Setting these elements to values different from zero
-    will twist the coordinate system. Rotation is achieved by
-    carefully setting both the shearing factors and the scaling
-    factors.
-
-    Here's the combined transformations example using basic matrix
-    operations:
-
-    \table 100%
-    \row
-    \li \inlineimage qmatrix-combinedtransformation.png
-    \li
-    \snippet matrix/matrix.cpp 2
-    \endtable
-
-    \sa QPainter, QTransform, {Coordinate System},
-        {painting/affine}{Affine Transformations Example}, {Transformations Example}
-*/
-
-
-// some defines to inline some code
-#define MAPDOUBLE(x, y, nx, ny) \
-{ \
-    qreal fx = x; \
-    qreal fy = y; \
-    nx = _m11*fx + _m21*fy + _dx; \
-    ny = _m12*fx + _m22*fy + _dy; \
-}
-
-#define MAPINT(x, y, nx, ny) \
-{ \
-    qreal fx = x; \
-    qreal fy = y; \
-    nx = qRound(_m11*fx + _m21*fy + _dx); \
-    ny = qRound(_m12*fx + _m22*fy + _dy); \
-}
-
-/*****************************************************************************
-  QMatrix member functions
- *****************************************************************************/
-/*!
-    \fn QMatrix::QMatrix(Qt::Initialization)
-    \internal
-*/
-
-/*!
-    Constructs an identity matrix.
-
-    All elements are set to zero except \c m11 and \c m22 (specifying
-    the scale), which are set to 1.
-
-    \sa reset()
-*/
-
-QMatrix::QMatrix()
-    : _m11(1.)
-    , _m12(0.)
-    , _m21(0.)
-    , _m22(1.)
-    , _dx(0.)
-    , _dy(0.)
-{
-}
-
-/*!
-    Constructs a matrix with the elements, \a m11, \a m12, \a m21, \a
-    m22, \a dx and \a dy.
-
-    \sa setMatrix()
-*/
-
-QMatrix::QMatrix(qreal m11, qreal m12, qreal m21, qreal m22, qreal dx, qreal dy)
-    : _m11(m11)
-    , _m12(m12)
-    , _m21(m21)
-    , _m22(m22)
-    , _dx(dx)
-    , _dy(dy)
-{
-}
-
-#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
-/*!
-     Constructs a matrix that is a copy of the given \a matrix.
- */
-QMatrix::QMatrix(const QMatrix &matrix) noexcept
-    : _m11(matrix._m11)
-    , _m12(matrix._m12)
-    , _m21(matrix._m21)
-    , _m22(matrix._m22)
-    , _dx(matrix._dx)
-    , _dy(matrix._dy)
-{
-}
-#endif
-
-/*!
-    Sets the matrix elements to the specified values, \a m11, \a m12,
-    \a m21, \a m22, \a dx and \a dy.
-
-    Note that this function replaces the previous values. QMatrix
-    provide the translate(), rotate(), scale() and shear() convenience
-    functions to manipulate the various matrix elements based on the
-    currently defined coordinate system.
-
-    \sa QMatrix()
-*/
-
-void QMatrix::setMatrix(qreal m11, qreal m12, qreal m21, qreal m22, qreal dx, qreal dy)
-{
-    _m11 = m11;
-    _m12 = m12;
-    _m21 = m21;
-    _m22 = m22;
-    _dx  = dx;
-    _dy  = dy;
-}
-
-
-/*!
-    \fn qreal QMatrix::m11() const
-
-    Returns the horizontal scaling factor.
-
-    \sa scale(), {QMatrix#Basic Matrix Operations}{Basic Matrix
-    Operations}
-*/
-
-/*!
-    \fn qreal QMatrix::m12() const
-
-    Returns the vertical shearing factor.
-
-    \sa shear(), {QMatrix#Basic Matrix Operations}{Basic Matrix
-    Operations}
-*/
-
-/*!
-    \fn qreal QMatrix::m21() const
-
-    Returns the horizontal shearing factor.
-
-    \sa shear(), {QMatrix#Basic Matrix Operations}{Basic Matrix
-    Operations}
-*/
-
-/*!
-    \fn qreal QMatrix::m22() const
-
-    Returns the vertical scaling factor.
-
-    \sa scale(), {QMatrix#Basic Matrix Operations}{Basic Matrix
-    Operations}
-*/
-
-/*!
-    \fn qreal QMatrix::dx() const
-
-    Returns the horizontal translation factor.
-
-    \sa translate(), {QMatrix#Basic Matrix Operations}{Basic Matrix
-    Operations}
-*/
-
-/*!
-    \fn qreal QMatrix::dy() const
-
-    Returns the vertical translation factor.
-
-    \sa translate(), {QMatrix#Basic Matrix Operations}{Basic Matrix
-    Operations}
-*/
-
-
-/*!
-    Maps the given coordinates \a x and \a y into the coordinate
-    system defined by this matrix. The resulting values are put in *\a
-    tx and *\a ty, respectively.
-
-    The coordinates are transformed using the following formulas:
-
-    \snippet code/src_gui_painting_qmatrix.cpp 1
-
-    The point (x, y) is the original point, and (x', y') is the
-    transformed point.
-
-    \sa {QMatrix#Basic Matrix Operations}{Basic Matrix Operations}
-*/
-
-void QMatrix::map(qreal x, qreal y, qreal *tx, qreal *ty) const
-{
-    MAPDOUBLE(x, y, *tx, *ty);
-}
-
-
-
-/*!
-    \overload
-
-    Maps the given coordinates \a x and \a y into the coordinate
-    system defined by this matrix. The resulting values are put in *\a
-    tx and *\a ty, respectively. Note that the transformed coordinates
-    are rounded to the nearest integer.
-*/
-
-void QMatrix::map(int x, int y, int *tx, int *ty) const
-{
-    MAPINT(x, y, *tx, *ty);
-}
-
-QRect QMatrix::mapRect(const QRect &rect) const
-{
-    QRect result;
-    if (_m12 == 0.0F && _m21 == 0.0F) {
-        int x = qRound(_m11*rect.x() + _dx);
-        int y = qRound(_m22*rect.y() + _dy);
-        int w = qRound(_m11*rect.width());
-        int h = qRound(_m22*rect.height());
-        if (w < 0) {
-            w = -w;
-            x -= w;
-        }
-        if (h < 0) {
-            h = -h;
-            y -= h;
-        }
-        result = QRect(x, y, w, h);
-    } else {
-        // see mapToPolygon for explanations of the algorithm.
-        qreal x0, y0;
-        qreal x, y;
-        MAPDOUBLE(rect.left(), rect.top(), x0, y0);
-        qreal xmin = x0;
-        qreal ymin = y0;
-        qreal xmax = x0;
-        qreal ymax = y0;
-        MAPDOUBLE(rect.right() + 1, rect.top(), x, y);
-        xmin = qMin(xmin, x);
-        ymin = qMin(ymin, y);
-        xmax = qMax(xmax, x);
-        ymax = qMax(ymax, y);
-        MAPDOUBLE(rect.right() + 1, rect.bottom() + 1, x, y);
-        xmin = qMin(xmin, x);
-        ymin = qMin(ymin, y);
-        xmax = qMax(xmax, x);
-        ymax = qMax(ymax, y);
-        MAPDOUBLE(rect.left(), rect.bottom() + 1, x, y);
-        xmin = qMin(xmin, x);
-        ymin = qMin(ymin, y);
-        xmax = qMax(xmax, x);
-        ymax = qMax(ymax, y);
-        result = QRect(qRound(xmin), qRound(ymin), qRound(xmax)-qRound(xmin), qRound(ymax)-qRound(ymin));
-    }
-    return result;
-}
-
-/*!
-    \fn QRectF QMatrix::mapRect(const QRectF &rectangle) const
-
-    Creates and returns a QRectF object that is a copy of the given \a
-    rectangle, mapped into the coordinate system defined by this
-    matrix.
-
-    The rectangle's coordinates are transformed using the following
-    formulas:
-
-    \snippet code/src_gui_painting_qmatrix.cpp 2
-
-    If rotation or shearing has been specified, this function returns
-    the \e bounding rectangle. To retrieve the exact region the given
-    \a rectangle maps to, use the mapToPolygon() function instead.
-
-    \sa mapToPolygon(), {QMatrix#Basic Matrix Operations}{Basic Matrix
-    Operations}
-*/
-QRectF QMatrix::mapRect(const QRectF &rect) const
-{
-    QRectF result;
-    if (_m12 == 0.0F && _m21 == 0.0F) {
-        qreal x = _m11*rect.x() + _dx;
-        qreal y = _m22*rect.y() + _dy;
-        qreal w = _m11*rect.width();
-        qreal h = _m22*rect.height();
-        if (w < 0) {
-            w = -w;
-            x -= w;
-        }
-        if (h < 0) {
-            h = -h;
-            y -= h;
-        }
-        result = QRectF(x, y, w, h);
-    } else {
-        qreal x0, y0;
-        qreal x, y;
-        MAPDOUBLE(rect.x(), rect.y(), x0, y0);
-        qreal xmin = x0;
-        qreal ymin = y0;
-        qreal xmax = x0;
-        qreal ymax = y0;
-        MAPDOUBLE(rect.x() + rect.width(), rect.y(), x, y);
-        xmin = qMin(xmin, x);
-        ymin = qMin(ymin, y);
-        xmax = qMax(xmax, x);
-        ymax = qMax(ymax, y);
-        MAPDOUBLE(rect.x() + rect.width(), rect.y() + rect.height(), x, y);
-        xmin = qMin(xmin, x);
-        ymin = qMin(ymin, y);
-        xmax = qMax(xmax, x);
-        ymax = qMax(ymax, y);
-        MAPDOUBLE(rect.x(), rect.y() + rect.height(), x, y);
-        xmin = qMin(xmin, x);
-        ymin = qMin(ymin, y);
-        xmax = qMax(xmax, x);
-        ymax = qMax(ymax, y);
-        result = QRectF(xmin, ymin, xmax-xmin, ymax - ymin);
-    }
-    return result;
-}
-
-/*!
-    \fn QRect QMatrix::mapRect(const QRect &rectangle) const
-    \overload
-
-    Creates and returns a QRect object that is a copy of the given \a
-    rectangle, mapped into the coordinate system defined by this
-    matrix. Note that the transformed coordinates are rounded to the
-    nearest integer.
-*/
-
-
-/*!
-    \fn QPoint operator*(const QPoint &point, const QMatrix &matrix)
-    \relates QMatrix
-
-    This is the same as \a{matrix}.map(\a{point}).
-
-    \sa QMatrix::map()
-*/
-
-QPoint QMatrix::map(const QPoint &p) const
-{
-    qreal fx = p.x();
-    qreal fy = p.y();
-    return QPoint(qRound(_m11*fx + _m21*fy + _dx),
-                   qRound(_m12*fx + _m22*fy + _dy));
-}
-
-/*!
-    \fn QPointF operator*(const QPointF &point, const QMatrix &matrix)
-    \relates QMatrix
-
-    Same as \a{matrix}.map(\a{point}).
-
-    \sa QMatrix::map()
-*/
-
-/*!
-    \overload
-
-    Creates and returns a QPointF object that is a copy of the given
-    \a point, mapped into the coordinate system defined by this
-    matrix.
-*/
-QPointF QMatrix::map(const QPointF &point) const
-{
-    qreal fx = point.x();
-    qreal fy = point.y();
-    return QPointF(_m11*fx + _m21*fy + _dx, _m12*fx + _m22*fy + _dy);
-}
-
-/*!
-    \fn QPoint QMatrix::map(const QPoint &point) const
-    \overload
-
-    Creates and returns a QPoint object that is a copy of the given \a
-    point, mapped into the coordinate system defined by this
-    matrix. Note that the transformed coordinates are rounded to the
-    nearest integer.
-*/
-
-/*!
-    \fn QLineF operator*(const QLineF &line, const QMatrix &matrix)
-    \relates QMatrix
-
-    This is the same as \a{matrix}.map(\a{line}).
-
-    \sa QMatrix::map()
-*/
-
-/*!
-    \fn QLine operator*(const QLine &line, const QMatrix &matrix)
-    \relates QMatrix
-
-    This is the same as \a{matrix}.map(\a{line}).
-
-    \sa QMatrix::map()
-*/
-
-/*!
-    \overload
-
-    Creates and returns a QLineF object that is a copy of the given \a
-    line, mapped into the coordinate system defined by this matrix.
-*/
-QLineF QMatrix::map(const QLineF &line) const
-{
-    return QLineF(map(line.p1()), map(line.p2()));
-}
-
-/*!
-    \overload
-
-    Creates and returns a QLine object that is a copy of the given \a
-    line, mapped into the coordinate system defined by this matrix.
-    Note that the transformed coordinates are rounded to the nearest
-    integer.
-*/
-QLine QMatrix::map(const QLine &line) const
-{
-    return QLine(map(line.p1()), map(line.p2()));
-}
-
-/*!
-    \fn QPolygonF operator *(const QPolygonF &polygon, const QMatrix &matrix)
-    \relates QMatrix
-
-    This is the same as \a{matrix}.map(\a{polygon}).
-
-    \sa QMatrix::map()
-*/
-
-/*!
-    \fn QPolygon operator*(const QPolygon &polygon, const QMatrix &matrix)
-    \relates QMatrix
-
-    This is the same as \a{matrix}.map(\a{polygon}).
-
-    \sa QMatrix::map()
-*/
-
-QPolygon QMatrix::map(const QPolygon &a) const
-{
-    int size = a.size();
-    int i;
-    QPolygon p(size);
-    const QPoint *da = a.constData();
-    QPoint *dp = p.data();
-    for(i = 0; i < size; i++) {
-        MAPINT(da[i].x(), da[i].y(), dp[i].rx(), dp[i].ry());
-    }
-    return p;
-}
-
-/*!
-    \fn QPolygonF QMatrix::map(const QPolygonF &polygon) const
-    \overload
-
-    Creates and returns a QPolygonF object that is a copy of the given
-    \a polygon, mapped into the coordinate system defined by this
-    matrix.
-*/
-QPolygonF QMatrix::map(const QPolygonF &a) const
-{
-    int size = a.size();
-    int i;
-    QPolygonF p(size);
-    const QPointF *da = a.constData();
-    QPointF *dp = p.data();
-    for(i = 0; i < size; i++) {
-        MAPDOUBLE(da[i].xp, da[i].yp, dp[i].xp, dp[i].yp);
-    }
-    return p;
-}
-
-/*!
-    \fn QPolygon QMatrix::map(const QPolygon &polygon) const
-    \overload
-
-    Creates and returns a QPolygon object that is a copy of the given
-    \a polygon, mapped into the coordinate system defined by this
-    matrix. Note that the transformed coordinates are rounded to the
-    nearest integer.
-*/
-
-/*!
-    \fn QRegion operator*(const QRegion &region, const QMatrix &matrix)
-    \relates QMatrix
-
-    This is the same as \a{matrix}.map(\a{region}).
-
-    \sa QMatrix::map()
-*/
-
-extern QPainterPath qt_regionToPath(const QRegion &region);
-
-/*!
-    \fn QRegion QMatrix::map(const QRegion &region) const
-    \overload
-
-    Creates and returns a QRegion object that is a copy of the given
-    \a region, mapped into the coordinate system defined by this matrix.
-
-    Calling this method can be rather expensive if rotations or
-    shearing are used.
-*/
-QRegion QMatrix::map(const QRegion &r) const
-{
-    if (_m11 == 1.0 && _m22 == 1.0 && _m12 == 0.0 && _m21 == 0.0) { // translate or identity
-        if (_dx == 0.0 && _dy == 0.0) // Identity
-            return r;
-        QRegion copy(r);
-        copy.translate(qRound(_dx), qRound(_dy));
-        return copy;
-    }
-
-    QPainterPath p = map(qt_regionToPath(r));
-    return p.toFillPolygon(QTransform()).toPolygon();
-}
-
-/*!
-    \fn QPainterPath operator *(const QPainterPath &path, const QMatrix &matrix)
-    \relates QMatrix
-
-    This is the same as \a{matrix}.map(\a{path}).
-
-    \sa QMatrix::map()
-*/
-
-/*!
-    \overload
-
-    Creates and returns a QPainterPath object that is a copy of the
-    given \a path, mapped into the coordinate system defined by this
-    matrix.
-*/
-QPainterPath QMatrix::map(const QPainterPath &path) const
-{
-    if (path.isEmpty())
-        return QPainterPath();
-
-    QPainterPath copy = path;
-
-    // Translate or identity
-    if (_m11 == 1.0 && _m22 == 1.0 && _m12 == 0.0 && _m21 == 0.0) {
-
-        // Translate
-        if (_dx != 0.0 || _dy != 0.0) {
-            copy.detach();
-            for (int i=0; i<path.elementCount(); ++i) {
-                QPainterPath::Element &e = copy.d_ptr->elements[i];
-                e.x += _dx;
-                e.y += _dy;
-            }
-        }
-
-    // Full xform
-    } else {
-        copy.detach();
-        for (int i=0; i<path.elementCount(); ++i) {
-            QPainterPath::Element &e = copy.d_ptr->elements[i];
-            qreal fx = e.x, fy = e.y;
-            e.x = _m11*fx + _m21*fy + _dx;
-            e.y =  _m12*fx + _m22*fy + _dy;
-        }
-    }
-
-    return copy;
-}
-
-/*!
-    \fn QPolygon QMatrix::mapToPolygon(const QRect &rectangle) const
-
-    Creates and returns a QPolygon representation of the given \a
-    rectangle, mapped into the coordinate system defined by this
-    matrix.
-
-    The rectangle's coordinates are transformed using the following
-    formulas:
-
-    \snippet code/src_gui_painting_qmatrix.cpp 3
-
-    Polygons and rectangles behave slightly differently when
-    transformed (due to integer rounding), so
-    \c{matrix.map(QPolygon(rectangle))} is not always the same as
-    \c{matrix.mapToPolygon(rectangle)}.
-
-    \sa mapRect(), {QMatrix#Basic Matrix Operations}{Basic Matrix
-    Operations}
-*/
-QPolygon QMatrix::mapToPolygon(const QRect &rect) const
-{
-    QPolygon a(4);
-    qreal x[4], y[4];
-    if (_m12 == 0.0F && _m21 == 0.0F) {
-        x[0] = _m11*rect.x() + _dx;
-        y[0] = _m22*rect.y() + _dy;
-        qreal w = _m11*rect.width();
-        qreal h = _m22*rect.height();
-        if (w < 0) {
-            w = -w;
-            x[0] -= w;
-        }
-        if (h < 0) {
-            h = -h;
-            y[0] -= h;
-        }
-        x[1] = x[0]+w;
-        x[2] = x[1];
-        x[3] = x[0];
-        y[1] = y[0];
-        y[2] = y[0]+h;
-        y[3] = y[2];
-    } else {
-        qreal right = rect.x() + rect.width();
-        qreal bottom = rect.y() + rect.height();
-        MAPDOUBLE(rect.x(), rect.y(), x[0], y[0]);
-        MAPDOUBLE(right, rect.y(), x[1], y[1]);
-        MAPDOUBLE(right, bottom, x[2], y[2]);
-        MAPDOUBLE(rect.x(), bottom, x[3], y[3]);
-    }
-#if 0
-    int i;
-    for(i = 0; i< 4; i++)
-        qDebug("coords(%d) = (%f/%f) (%d/%d)", i, x[i], y[i], qRound(x[i]), qRound(y[i]));
-    qDebug("width=%f, height=%f", qSqrt((x[1]-x[0])*(x[1]-x[0]) + (y[1]-y[0])*(y[1]-y[0])),
-            qSqrt((x[0]-x[3])*(x[0]-x[3]) + (y[0]-y[3])*(y[0]-y[3])));
-#endif
-    // all coordinates are correctly, tranform to a pointarray
-    // (rounding to the next integer)
-    a.setPoints(4, qRound(x[0]), qRound(y[0]),
-                 qRound(x[1]), qRound(y[1]),
-                 qRound(x[2]), qRound(y[2]),
-                 qRound(x[3]), qRound(y[3]));
-    return a;
-}
-
-/*!
-    Resets the matrix to an identity matrix, i.e. all elements are set
-    to zero, except \c m11 and \c m22 (specifying the scale) which are
-    set to 1.
-
-    \sa QMatrix(), isIdentity(), {QMatrix#Basic Matrix
-    Operations}{Basic Matrix Operations}
-*/
-
-void QMatrix::reset()
-{
-    _m11 = _m22 = 1.0;
-    _m12 = _m21 = _dx = _dy = 0.0;
-}
-
-/*!
-    \fn bool QMatrix::isIdentity() const
-
-    Returns \c true if the matrix is the identity matrix, otherwise
-    returns \c false.
-
-    \sa reset()
-*/
-
-/*!
-    Moves the coordinate system \a dx along the x axis and \a dy along
-    the y axis, and returns a reference to the matrix.
-
-    \sa setMatrix()
-*/
-
-QMatrix &QMatrix::translate(qreal dx, qreal dy)
-{
-    _dx += dx*_m11 + dy*_m21;
-    _dy += dy*_m22 + dx*_m12;
-    return *this;
-}
-
-/*!
-    \fn QMatrix &QMatrix::scale(qreal sx, qreal sy)
-
-    Scales the coordinate system by \a sx horizontally and \a sy
-    vertically, and returns a reference to the matrix.
-
-    \sa setMatrix()
-*/
-
-QMatrix &QMatrix::scale(qreal sx, qreal sy)
-{
-    _m11 *= sx;
-    _m12 *= sx;
-    _m21 *= sy;
-    _m22 *= sy;
-    return *this;
-}
-
-/*!
-    Shears the coordinate system by \a sh horizontally and \a sv
-    vertically, and returns a reference to the matrix.
-
-    \sa setMatrix()
-*/
-
-QMatrix &QMatrix::shear(qreal sh, qreal sv)
-{
-    qreal tm11 = sv*_m21;
-    qreal tm12 = sv*_m22;
-    qreal tm21 = sh*_m11;
-    qreal tm22 = sh*_m12;
-    _m11 += tm11;
-    _m12 += tm12;
-    _m21 += tm21;
-    _m22 += tm22;
-    return *this;
-}
-
-const qreal deg2rad = qreal(0.017453292519943295769);        // pi/180
-
-/*!
-    \fn QMatrix &QMatrix::rotate(qreal degrees)
-
-    Rotates the coordinate system the given \a degrees
-    counterclockwise.
-
-    Note that if you apply a QMatrix to a point defined in widget
-    coordinates, the direction of the rotation will be clockwise
-    because the y-axis points downwards.
-
-    Returns a reference to the matrix.
-
-    \sa setMatrix()
-*/
-
-QMatrix &QMatrix::rotate(qreal a)
-{
-    qreal sina = 0;
-    qreal cosa = 0;
-    if (a == 90. || a == -270.)
-        sina = 1.;
-    else if (a == 270. || a == -90.)
-        sina = -1.;
-    else if (a == 180.)
-        cosa = -1.;
-    else{
-        qreal b = deg2rad*a;                        // convert to radians
-        sina = qSin(b);               // fast and convenient
-        cosa = qCos(b);
-    }
-    qreal tm11 = cosa*_m11 + sina*_m21;
-    qreal tm12 = cosa*_m12 + sina*_m22;
-    qreal tm21 = -sina*_m11 + cosa*_m21;
-    qreal tm22 = -sina*_m12 + cosa*_m22;
-    _m11 = tm11; _m12 = tm12;
-    _m21 = tm21; _m22 = tm22;
-    return *this;
-}
-
-/*!
-    \fn bool QMatrix::isInvertible() const
-
-    Returns \c true if the matrix is invertible, otherwise returns \c false.
-
-    \sa inverted()
-*/
-
-/*!
-    \since 4.6
-    \fn qreal QMatrix::determinant() const
-
-    Returns the matrix's determinant.
-*/
-
-/*!
-    Returns an inverted copy of this matrix.
-
-    If the matrix is singular (not invertible), the returned matrix is
-    the identity matrix. If \a invertible is valid (i.e. not 0), its
-    value is set to true if the matrix is invertible, otherwise it is
-    set to false.
-
-    \sa isInvertible()
-*/
-
-QMatrix QMatrix::inverted(bool *invertible) const
-{
-    qreal dtr = determinant();
-    if (dtr == 0.0) {
-        if (invertible)
-            *invertible = false;                // singular matrix
-        return QMatrix(true);
-    }
-    else {                                        // invertible matrix
-        if (invertible)
-            *invertible = true;
-        qreal dinv = 1.0/dtr;
-        return QMatrix((_m22*dinv),        (-_m12*dinv),
-                       (-_m21*dinv), (_m11*dinv),
-                       ((_m21*_dy - _m22*_dx)*dinv),
-                       ((_m12*_dx - _m11*_dy)*dinv),
-                       true);
-    }
-}
-
-
-/*!
-    \fn bool QMatrix::operator==(const QMatrix &matrix) const
-
-    Returns \c true if this matrix is equal to the given \a matrix,
-    otherwise returns \c false.
-*/
-
-bool QMatrix::operator==(const QMatrix &m) const
-{
-    return _m11 == m._m11 &&
-           _m12 == m._m12 &&
-           _m21 == m._m21 &&
-           _m22 == m._m22 &&
-           _dx == m._dx &&
-           _dy == m._dy;
-}
-
-
-/*!
-    \since 5.6
-    \relates QMatrix
-
-    Returns the hash value for \a key, using
-    \a seed to seed the calculation.
-*/
-uint qHash(const QMatrix &key, uint seed) noexcept
-{
-    QtPrivate::QHashCombine hash;
-    seed = hash(seed, key.m11());
-    seed = hash(seed, key.m12());
-    seed = hash(seed, key.m21());
-    seed = hash(seed, key.m22());
-    seed = hash(seed, key.dx());
-    seed = hash(seed, key.dy());
-    return seed;
-}
-
-/*!
-    \fn bool QMatrix::operator!=(const QMatrix &matrix) const
-
-    Returns \c true if this matrix is not equal to the given \a matrix,
-    otherwise returns \c false.
-*/
-
-bool QMatrix::operator!=(const QMatrix &m) const
-{
-    return _m11 != m._m11 ||
-           _m12 != m._m12 ||
-           _m21 != m._m21 ||
-           _m22 != m._m22 ||
-           _dx != m._dx ||
-           _dy != m._dy;
-}
-
-/*!
-    \fn QMatrix &QMatrix::operator *=(const QMatrix &matrix)
-    \overload
-
-    Returns the result of multiplying this matrix by the given \a
-    matrix.
-*/
-
-QMatrix &QMatrix::operator *=(const QMatrix &m)
-{
-    qreal tm11 = _m11*m._m11 + _m12*m._m21;
-    qreal tm12 = _m11*m._m12 + _m12*m._m22;
-    qreal tm21 = _m21*m._m11 + _m22*m._m21;
-    qreal tm22 = _m21*m._m12 + _m22*m._m22;
-
-    qreal tdx  = _dx*m._m11  + _dy*m._m21 + m._dx;
-    qreal tdy =  _dx*m._m12  + _dy*m._m22 + m._dy;
-
-    _m11 = tm11; _m12 = tm12;
-    _m21 = tm21; _m22 = tm22;
-    _dx = tdx; _dy = tdy;
-    return *this;
-}
-
-/*!
-    \fn QMatrix QMatrix::operator *(const QMatrix &matrix) const
-
-    Returns the result of multiplying this matrix by the given \a
-    matrix.
-
-    Note that matrix multiplication is not commutative, i.e. a*b !=
-    b*a.
-*/
-
-QMatrix QMatrix::operator *(const QMatrix &m) const
-{
-    qreal tm11 = _m11*m._m11 + _m12*m._m21;
-    qreal tm12 = _m11*m._m12 + _m12*m._m22;
-    qreal tm21 = _m21*m._m11 + _m22*m._m21;
-    qreal tm22 = _m21*m._m12 + _m22*m._m22;
-
-    qreal tdx  = _dx*m._m11  + _dy*m._m21 + m._dx;
-    qreal tdy =  _dx*m._m12  + _dy*m._m22 + m._dy;
-    return QMatrix(tm11, tm12, tm21, tm22, tdx, tdy, true);
-}
-
-#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
-/*!
-    Assigns the given \a matrix's values to this matrix.
-*/
-QMatrix &QMatrix::operator=(const QMatrix &matrix) noexcept
-{
-    _m11 = matrix._m11;
-    _m12 = matrix._m12;
-    _m21 = matrix._m21;
-    _m22 = matrix._m22;
-    _dx  = matrix._dx;
-    _dy  = matrix._dy;
-    return *this;
-}
-#endif
-
-/*!
-    \since 4.2
-
-    Returns the matrix as a QVariant.
-*/
-QMatrix::operator QVariant() const
-{
-    return QVariant(QMetaType::QMatrix, this);
-}
-
-Q_GUI_EXPORT QPainterPath operator *(const QPainterPath &p, const QMatrix &m)
-{
-    return m.map(p);
-}
-
-
-/*****************************************************************************
-  QMatrix stream functions
- *****************************************************************************/
-#ifndef QT_NO_DATASTREAM
-/*!
-    \fn QDataStream &operator<<(QDataStream &stream, const QMatrix &matrix)
-    \relates QMatrix
-
-    Writes the given \a matrix to the given \a stream and returns a
-    reference to the stream.
-
-    \sa {Serializing Qt Data Types}
-*/
-
-QDataStream &operator<<(QDataStream &s, const QMatrix &m)
-{
-    if (s.version() == 1) {
-        s << (float)m.m11() << (float)m.m12() << (float)m.m21()
-          << (float)m.m22() << (float)m.dx()  << (float)m.dy();
-    } else {
-        s << double(m.m11())
-          << double(m.m12())
-          << double(m.m21())
-          << double(m.m22())
-          << double(m.dx())
-          << double(m.dy());
-    }
-    return s;
-}
-
-/*!
-    \fn QDataStream &operator>>(QDataStream &stream, QMatrix &matrix)
-    \relates QMatrix
-
-    Reads the given \a matrix from the given \a stream and returns a
-    reference to the stream.
-
-    \sa {Serializing Qt Data Types}
-*/
-
-QDataStream &operator>>(QDataStream &s, QMatrix &m)
-{
-    if (s.version() == 1) {
-        float m11, m12, m21, m22, dx, dy;
-        s >> m11;  s >> m12;  s >> m21;  s >> m22;
-        s >> dx;   s >> dy;
-        m.setMatrix(m11, m12, m21, m22, dx, dy);
-    }
-    else {
-        double m11, m12, m21, m22, dx, dy;
-        s >> m11;
-        s >> m12;
-        s >> m21;
-        s >> m22;
-        s >> dx;
-        s >> dy;
-        m.setMatrix(m11, m12, m21, m22, dx, dy);
-    }
-    return s;
-}
-#endif // QT_NO_DATASTREAM
-
-#ifndef QT_NO_DEBUG_STREAM
-QDebug operator<<(QDebug dbg, const QMatrix &m)
-{
-    QDebugStateSaver saver(dbg);
-    dbg.nospace() << "QMatrix("
-                  << "11=" << m.m11()
-                  << " 12=" << m.m12()
-                  << " 21=" << m.m21()
-                  << " 22=" << m.m22()
-                  << " dx=" << m.dx()
-                  << " dy=" << m.dy()
-                  << ')';
-    return dbg;
-}
-#endif
-
-/*!
-    \fn bool qFuzzyCompare(const QMatrix& m1, const QMatrix& m2)
-
-    \relates QMatrix
-    \since 4.6
-
-    \brief The qFuzzyCompare function is for comparing two matrices
-    using a fuzziness factor.
-
-    Returns \c true if \a m1 and \a m2 are equal, allowing for a small
-    fuzziness factor for floating-point comparisons; false otherwise.
-*/
-
-QT_END_NAMESPACE
diff --git a/src/gui/painting/qmatrix.h b/src/gui/painting/qmatrix.h
deleted file mode 100644
index a167260ade..0000000000
--- a/src/gui/painting/qmatrix.h
+++ /dev/null
@@ -1,194 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtGui module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMATRIX_H
-#define QMATRIX_H
-
-#include <QtGui/qtguiglobal.h>
-#include <QtGui/qpolygon.h>
-#include <QtGui/qregion.h>
-#include <QtGui/qwindowdefs.h>
-#include <QtCore/qline.h>
-#include <QtCore/qpoint.h>
-#include <QtCore/qrect.h>
-
-QT_BEGIN_NAMESPACE
-
-
-class QPainterPath;
-class QVariant;
-
-class Q_GUI_EXPORT QMatrix // 2D transform matrix
-{
-public:
-    inline explicit QMatrix(Qt::Initialization) {}
-    QMatrix();
-    QMatrix(qreal m11, qreal m12, qreal m21, qreal m22,
-            qreal dx, qreal dy);
-
-#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
-    // ### Qt 6: remove; the compiler-generated ones are fine!
-    QMatrix &operator=(QMatrix &&other) noexcept // = default
-    { memcpy(static_cast<void *>(this), static_cast<void *>(&other), sizeof(QMatrix)); return *this; }
-    QMatrix &operator=(const QMatrix &) noexcept; // = default
-    QMatrix(QMatrix &&other) noexcept // = default
-    { memcpy(static_cast<void *>(this), static_cast<void *>(&other), sizeof(QMatrix)); }
-    QMatrix(const QMatrix &other) noexcept; // = default
-#endif
-
-    void setMatrix(qreal m11, qreal m12, qreal m21, qreal m22,
-                   qreal dx, qreal dy);
-
-    qreal m11() const { return _m11; }
-    qreal m12() const { return _m12; }
-    qreal m21() const { return _m21; }
-    qreal m22() const { return _m22; }
-    qreal dx() const { return _dx; }
-    qreal dy() const { return _dy; }
-
-    void map(int x, int y, int *tx, int *ty) const;
-    void map(qreal x, qreal y, qreal *tx, qreal *ty) const;
-    QRect mapRect(const QRect &) const;
-    QRectF mapRect(const QRectF &) const;
-
-    QPoint map(const QPoint &p) const;
-    QPointF map(const QPointF&p) const;
-    QLine map(const QLine &l) const;
-    QLineF map(const QLineF &l) const;
-    QPolygonF map(const QPolygonF &a) const;
-    QPolygon map(const QPolygon &a) const;
-    QRegion map(const QRegion &r) const;
-    QPainterPath map(const QPainterPath &p) const;
-    QPolygon mapToPolygon(const QRect &r) const;
-
-    void reset();
-    inline bool isIdentity() const;
-
-    QMatrix &translate(qreal dx, qreal dy);
-    QMatrix &scale(qreal sx, qreal sy);
-    QMatrix &shear(qreal sh, qreal sv);
-    QMatrix &rotate(qreal a);
-
-    bool isInvertible() const { return !qFuzzyIsNull(_m11*_m22 - _m12*_m21); }
-    qreal determinant() const { return _m11*_m22 - _m12*_m21; }
-
-    Q_REQUIRED_RESULT QMatrix inverted(bool *invertible = nullptr) const;
-
-    bool operator==(const QMatrix &) const;
-    bool operator!=(const QMatrix &) const;
-
-    QMatrix &operator*=(const QMatrix &);
-    QMatrix operator*(const QMatrix &o) const;
-
-    operator QVariant() const;
-
-private:
-    inline QMatrix(bool)
-            : _m11(1.)
-            , _m12(0.)
-            , _m21(0.)
-            , _m22(1.)
-            , _dx(0.)
-            , _dy(0.) {}
-    inline QMatrix(qreal am11, qreal am12, qreal am21, qreal am22, qreal adx, qreal ady, bool)
-            : _m11(am11)
-            , _m12(am12)
-            , _m21(am21)
-            , _m22(am22)
-            , _dx(adx)
-            , _dy(ady) {}
-    friend class QTransform;
-    qreal _m11, _m12;
-    qreal _m21, _m22;
-    qreal _dx, _dy;
-};
-Q_DECLARE_TYPEINFO(QMatrix, Q_MOVABLE_TYPE);
-
-Q_GUI_EXPORT Q_DECL_CONST_FUNCTION uint qHash(const QMatrix &key, uint seed = 0) noexcept;
-
-// mathematical semantics
-inline QPoint operator*(const QPoint &p, const QMatrix &m)
-{ return m.map(p); }
-inline QPointF operator*(const QPointF &p, const QMatrix &m)
-{ return m.map(p); }
-inline QLineF operator*(const QLineF &l, const QMatrix &m)
-{ return m.map(l); }
-inline QLine operator*(const QLine &l, const QMatrix &m)
-{ return m.map(l); }
-inline QPolygon operator *(const QPolygon &a, const QMatrix &m)
-{ return m.map(a); }
-inline QPolygonF operator *(const QPolygonF &a, const QMatrix &m)
-{ return m.map(a); }
-inline QRegion operator *(const QRegion &r, const QMatrix &m)
-{ return m.map(r); }
-Q_GUI_EXPORT QPainterPath operator *(const QPainterPath &p, const QMatrix &m);
-
-inline bool QMatrix::isIdentity() const
-{
-    return qFuzzyIsNull(_m11 - 1) && qFuzzyIsNull(_m22 - 1) && qFuzzyIsNull(_m12)
-           && qFuzzyIsNull(_m21) && qFuzzyIsNull(_dx) && qFuzzyIsNull(_dy);
-}
-
-inline bool qFuzzyCompare(const QMatrix& m1, const QMatrix& m2)
-{
-    return qFuzzyCompare(m1.m11(), m2.m11())
-        && qFuzzyCompare(m1.m12(), m2.m12())
-        && qFuzzyCompare(m1.m21(), m2.m21())
-        && qFuzzyCompare(m1.m22(), m2.m22())
-        && qFuzzyCompare(m1.dx(), m2.dx())
-        && qFuzzyCompare(m1.dy(), m2.dy());
-}
-
-
-/*****************************************************************************
- QMatrix stream functions
- *****************************************************************************/
-
-#ifndef QT_NO_DATASTREAM
-Q_GUI_EXPORT QDataStream &operator<<(QDataStream &, const QMatrix &);
-Q_GUI_EXPORT QDataStream &operator>>(QDataStream &, QMatrix &);
-#endif
-
-#ifndef QT_NO_DEBUG_STREAM
-Q_GUI_EXPORT QDebug operator<<(QDebug, const QMatrix &);
-#endif
-
-QT_END_NAMESPACE
-
-#endif // QMATRIX_H
diff --git a/src/gui/painting/qpaintdevice.qdoc b/src/gui/painting/qpaintdevice.qdoc
index 0cba864523..3b93faed84 100644
--- a/src/gui/painting/qpaintdevice.qdoc
+++ b/src/gui/painting/qpaintdevice.qdoc
@@ -39,8 +39,7 @@
     right and Y increases downwards. The unit is one pixel.
 
     The drawing capabilities of QPaintDevice are currently implemented
-    by the QWidget, QImage, QPixmap, QGLPixelBuffer, QPicture, and
-    QPrinter subclasses.
+    by the QWidget, QImage, QPixmap, QPicture, and QPrinter subclasses.
 
     To implement support for a new backend, you must derive from
     QPaintDevice and reimplement the virtual paintEngine() function to
diff --git a/src/gui/painting/qpaintengine.cpp b/src/gui/painting/qpaintengine.cpp
index 315bf0daf2..1785fcd12d 100644
--- a/src/gui/painting/qpaintengine.cpp
+++ b/src/gui/painting/qpaintengine.cpp
@@ -508,7 +508,7 @@ void QPaintEngine::drawEllipse(const QRectF &rect)
     if (hasFeature(PainterPaths)) {
         drawPath(path);
     } else {
-        QPolygonF polygon = path.toFillPolygon(QTransform());
+        QPolygonF polygon = path.toFillPolygon();
         drawPolygon(polygon.data(), polygon.size(), ConvexMode);
     }
 }
diff --git a/src/gui/painting/qpaintengine.h b/src/gui/painting/qpaintengine.h
index e90020dbbf..73727e463d 100644
--- a/src/gui/painting/qpaintengine.h
+++ b/src/gui/painting/qpaintengine.h
@@ -273,9 +273,6 @@ public:
     QBrush backgroundBrush() const;
     Qt::BGMode backgroundMode() const;
     QFont font() const;
-#if QT_DEPRECATED_SINCE(5, 15)
-    QT_DEPRECATED_X("Use transform()") QMatrix matrix() const;
-#endif // QT_DEPRECATED_SINCE(5, 15)
     QTransform transform() const;
 
     Qt::ClipOperation clipOperation() const;
diff --git a/src/gui/painting/qpaintengine_raster_p.h b/src/gui/painting/qpaintengine_raster_p.h
index 089aadc3f7..1244ea6709 100644
--- a/src/gui/painting/qpaintengine_raster_p.h
+++ b/src/gui/painting/qpaintengine_raster_p.h
@@ -434,14 +434,14 @@ public:
 
     QImage::Format prepare(QImage *image);
 
-    uchar *scanLine(int y) { Q_ASSERT(y>=0); Q_ASSERT(y<m_height); return m_buffer + y * qsizetype(bytes_per_line); }
+    uchar *scanLine(int y) { Q_ASSERT(y>=0); Q_ASSERT(y<m_height); return m_buffer + y * bytes_per_line; }
 
     int width() const { return m_width; }
     int height() const { return m_height; }
-    int bytesPerLine() const { return bytes_per_line; }
+    qsizetype bytesPerLine() const { return bytes_per_line; }
     int bytesPerPixel() const { return bytes_per_pixel; }
     template<typename T>
-    int stride() { return bytes_per_line / sizeof(T); }
+    int stride() { return static_cast<int>(bytes_per_line / sizeof(T)); }
 
     uchar *buffer() const { return m_buffer; }
 
@@ -456,7 +456,7 @@ public:
 private:
     int m_width;
     int m_height;
-    int bytes_per_line;
+    qsizetype bytes_per_line;
     int bytes_per_pixel;
     uchar *m_buffer;
 };
diff --git a/src/gui/painting/qpainter.cpp b/src/gui/painting/qpainter.cpp
index 390147463d..49f4d7be2e 100644
--- a/src/gui/painting/qpainter.cpp
+++ b/src/gui/painting/qpainter.cpp
@@ -96,10 +96,15 @@ static void drawTextItemDecoration(QPainter *painter, const QPointF &pos, const
                                    QTextItem::RenderFlags flags, qreal width,
                                    const QTextCharFormat &charFormat);
 // Helper function to calculate left most position, width and flags for decoration drawing
-Q_GUI_EXPORT void qt_draw_decoration_for_glyphs(QPainter *painter, const glyph_t *glyphArray,
-                                                const QFixedPoint *positions, int glyphCount,
-                                                QFontEngine *fontEngine, const QFont &font,
-                                                const QTextCharFormat &charFormat);
+static void qt_draw_decoration_for_glyphs(QPainter *painter,
+                                          const QPointF &decorationPosition,
+                                          const glyph_t *glyphArray,
+                                          const QFixedPoint *positions,
+                                          int glyphCount,
+                                          QFontEngine *fontEngine,
+                                          bool underline,
+                                          bool overline,
+                                          bool strikeOut);
 
 static inline QGradient::CoordinateMode coordinateMode(const QBrush &brush)
 {
@@ -2555,19 +2560,19 @@ QRegion QPainter::clipRegion() const
         case QPainterClipInfo::PathClip: {
             QTransform matrix = (info.matrix * d->invMatrix);
             if (lastWasNothing) {
-                region = QRegion((info.path * matrix).toFillPolygon(QTransform()).toPolygon(),
+                region = QRegion((info.path * matrix).toFillPolygon().toPolygon(),
                                  info.path.fillRule());
                 lastWasNothing = false;
                 continue;
             }
             if (info.operation == Qt::IntersectClip) {
-                region &= QRegion((info.path * matrix).toFillPolygon(QTransform()).toPolygon(),
+                region &= QRegion((info.path * matrix).toFillPolygon().toPolygon(),
                                   info.path.fillRule());
             } else if (info.operation == Qt::NoClip) {
                 lastWasNothing = true;
                 region = QRegion();
             } else {
-                region = QRegion((info.path * matrix).toFillPolygon(QTransform()).toPolygon(),
+                region = QRegion((info.path * matrix).toFillPolygon().toPolygon(),
                                  info.path.fillRule());
             }
             break;
@@ -2891,175 +2896,6 @@ void QPainter::setClipRegion(const QRegion &r, Qt::ClipOperation op)
     d->updateState(d->state);
 }
 
-#if QT_DEPRECATED_SINCE(5, 13)
-/*!
-    \since 4.2
-    \obsolete
-
-    Sets the transformation matrix to \a matrix and enables transformations.
-
-    \note It is advisable to use setWorldTransform() instead of this function to
-    preserve the properties of perspective transformations.
-
-    If \a combine is true, then \a matrix is combined with the current
-    transformation matrix; otherwise \a matrix replaces the current
-    transformation matrix.
-
-    If \a matrix is the identity matrix and \a combine is false, this
-    function calls setWorldMatrixEnabled(false). (The identity matrix is the
-    matrix where QMatrix::m11() and QMatrix::m22() are 1.0 and the
-    rest are 0.0.)
-
-    The following functions can transform the coordinate system without using
-    a QMatrix:
-    \list
-    \li translate()
-    \li scale()
-    \li shear()
-    \li rotate()
-    \endlist
-
-    They operate on the painter's worldMatrix() and are implemented like this:
-
-    \snippet code/src_gui_painting_qpainter.cpp 4
-
-    Note that when using setWorldMatrix() function you should always have
-    \a combine be true when you are drawing into a QPicture. Otherwise
-    it may not be possible to replay the picture with additional
-    transformations; using the translate(), scale(), etc. convenience
-    functions is safe.
-
-    For more information about the coordinate system, transformations
-    and window-viewport conversion, see \l {Coordinate System}.
-
-    \sa setWorldTransform(), QTransform
-*/
-
-void QPainter::setWorldMatrix(const QMatrix &matrix, bool combine)
-{
-    setWorldTransform(QTransform(matrix), combine);
-}
-
-/*!
-    \since 4.2
-    \obsolete
-
-    Returns the world transformation matrix.
-
-    It is advisable to use worldTransform() because worldMatrix() does not
-    preserve the properties of perspective transformations.
-
-    \sa {QPainter#Coordinate Transformations}{Coordinate Transformations},
-    {Coordinate System}
-*/
-
-const QMatrix &QPainter::worldMatrix() const
-{
-    Q_D(const QPainter);
-    if (!d->engine) {
-        qWarning("QPainter::worldMatrix: Painter not active");
-        return d->fakeState()->transform.toAffine();
-    }
-    return d->state->worldMatrix.toAffine();
-}
-
-/*!
-    \obsolete
-
-    Use setWorldTransform() instead.
-
-    \sa setWorldTransform()
-*/
-
-void QPainter::setMatrix(const QMatrix &matrix, bool combine)
-{
-    setWorldTransform(QTransform(matrix), combine);
-}
-
-/*!
-    \obsolete
-
-    Use worldTransform() instead.
-
-    \sa worldTransform()
-*/
-
-const QMatrix &QPainter::matrix() const
-{
-QT_WARNING_PUSH
-QT_WARNING_DISABLE_DEPRECATED
-    return worldMatrix();
-QT_WARNING_POP
-}
-
-
-/*!
-    \since 4.2
-    \obsolete
-
-    Returns the transformation matrix combining the current
-    window/viewport and world transformation.
-
-    It is advisable to use combinedTransform() instead of this
-    function to preserve the properties of perspective transformations.
-
-    \sa setWorldTransform(), setWindow(), setViewport()
-*/
-QMatrix QPainter::combinedMatrix() const
-{
-    return combinedTransform().toAffine();
-}
-
-
-/*!
-    \obsolete
-
-    Returns the matrix that transforms from logical coordinates to
-    device coordinates of the platform dependent paint device.
-
-    \note It is advisable to use deviceTransform() instead of this
-    function to preserve the properties of perspective transformations.
-
-    This function is \e only needed when using platform painting
-    commands on the platform dependent handle (Qt::HANDLE), and the
-    platform does not do transformations nativly.
-
-    The QPaintEngine::PaintEngineFeature enum can be queried to
-    determine whether the platform performs the transformations or
-    not.
-
-    \sa worldMatrix(), QPaintEngine::hasFeature(),
-*/
-const QMatrix &QPainter::deviceMatrix() const
-{
-    Q_D(const QPainter);
-    if (!d->engine) {
-        qWarning("QPainter::deviceMatrix: Painter not active");
-        return d->fakeState()->transform.toAffine();
-    }
-    return d->state->matrix.toAffine();
-}
-
-/*!
-    \obsolete
-
-    Resets any transformations that were made using translate(), scale(),
-    shear(), rotate(), setWorldMatrix(), setViewport() and
-    setWindow().
-
-    It is advisable to use resetTransform() instead of this function
-    to preserve the properties of perspective transformations.
-
-    \sa {QPainter#Coordinate Transformations}{Coordinate
-    Transformations}
-*/
-
-void QPainter::resetMatrix()
-{
-    resetTransform();
-}
-#endif
-
 /*!
     \since 4.2
 
@@ -3109,34 +2945,6 @@ bool QPainter::worldMatrixEnabled() const
     return d->state->WxF;
 }
 
-#if QT_DEPRECATED_SINCE(5, 13)
-/*!
-    \obsolete
-
-    Use setWorldMatrixEnabled() instead.
-
-    \sa setWorldMatrixEnabled()
-*/
-
-void QPainter::setMatrixEnabled(bool enable)
-{
-    setWorldMatrixEnabled(enable);
-}
-
-/*!
-    \obsolete
-
-    Use worldMatrixEnabled() instead
-
-    \sa worldMatrixEnabled()
-*/
-
-bool QPainter::matrixEnabled() const
-{
-    return worldMatrixEnabled();
-}
-#endif
-
 /*!
     Scales the coordinate system by (\a{sx}, \a{sy}).
 
@@ -5607,40 +5415,31 @@ void QPainter::drawGlyphRun(const QPointF &position, const QGlyphRun &glyphRun)
         fixedPointPositions[i] = QFixedPoint::fromPointF(processedPosition);
     }
 
-    d->drawGlyphs(glyphIndexes, fixedPointPositions.data(), count, fontD->fontEngine,
-                  glyphRun.overline(), glyphRun.underline(), glyphRun.strikeOut());
+    d->drawGlyphs(engineRequiresPretransformedGlyphPositions
+                    ? d->state->transform().map(position)
+                    : position,
+                  glyphIndexes,
+                  fixedPointPositions.data(),
+                  count,
+                  fontD->fontEngine,
+                  glyphRun.overline(),
+                  glyphRun.underline(),
+                  glyphRun.strikeOut());
 }
 
-void QPainterPrivate::drawGlyphs(const quint32 *glyphArray, QFixedPoint *positions,
+void QPainterPrivate::drawGlyphs(const QPointF &decorationPosition,
+                                 const quint32 *glyphArray,
+                                 QFixedPoint *positions,
                                  int glyphCount,
-                                 QFontEngine *fontEngine, bool overline, bool underline,
+                                 QFontEngine *fontEngine,
+                                 bool overline,
+                                 bool underline,
                                  bool strikeOut)
 {
     Q_Q(QPainter);
 
     updateState(state);
 
-    QFixed leftMost;
-    QFixed rightMost;
-    QFixed baseLine;
-    for (int i=0; i<glyphCount; ++i) {
-        glyph_metrics_t gm = fontEngine->boundingBox(glyphArray[i]);
-        if (i == 0 || leftMost > positions[i].x)
-            leftMost = positions[i].x;
-
-        // We don't support glyphs that do not share a common baseline. If this turns out to
-        // be a relevant use case, then we need to find clusters of glyphs that share a baseline
-        // and do a drawTextItemDecorations call per cluster.
-        if (i == 0 || baseLine < positions[i].y)
-            baseLine = positions[i].y;
-
-        // We use the advance rather than the actual bounds to match the algorithm in drawText()
-        if (i == 0 || rightMost < positions[i].x + gm.xoff)
-            rightMost = positions[i].x + gm.xoff;
-    }
-
-    QFixed width = rightMost - leftMost;
-
     if (extended != nullptr && state->matrix.isAffine()) {
         QStaticTextItem staticTextItem;
         staticTextItem.color = state->pen.color();
@@ -5674,21 +5473,15 @@ void QPainterPrivate::drawGlyphs(const quint32 *glyphArray, QFixedPoint *positio
         engine->drawTextItem(QPointF(0, 0), textItem);
     }
 
-    QTextItemInt::RenderFlags flags;
-    if (underline)
-        flags |= QTextItemInt::Underline;
-    if (overline)
-        flags |= QTextItemInt::Overline;
-    if (strikeOut)
-        flags |= QTextItemInt::StrikeOut;
-
-    drawTextItemDecoration(q, QPointF(leftMost.toReal(), baseLine.toReal()),
-                           fontEngine,
-                           nullptr, // textEngine
-                           (underline
-                              ? QTextCharFormat::SingleUnderline
-                              : QTextCharFormat::NoUnderline),
-                           flags, width.toReal(), QTextCharFormat());
+    qt_draw_decoration_for_glyphs(q,
+                                  decorationPosition,
+                                  glyphArray,
+                                  positions,
+                                  glyphCount,
+                                  fontEngine,
+                                  underline,
+                                  overline,
+                                  strikeOut);
 }
 #endif // QT_NO_RAWFONT
 
@@ -5868,9 +5661,15 @@ void QPainter::drawStaticText(const QPointF &topLeftPosition, const QStaticText
         }
         d->extended->drawStaticTextItem(item);
 
-        qt_draw_decoration_for_glyphs(this, item->glyphs, item->glyphPositions,
-                                      item->numGlyphs, item->fontEngine(), staticText_d->font,
-                                      QTextCharFormat());
+        qt_draw_decoration_for_glyphs(this,
+                                      topLeftPosition,
+                                      item->glyphs,
+                                      item->glyphPositions,
+                                      item->numGlyphs,
+                                      item->fontEngine(),
+                                      staticText_d->font.underline(),
+                                      staticText_d->font.overline(),
+                                      staticText_d->font.strikeOut());
     }
     if (currentColor != oldPen.color())
         setPen(oldPen);
@@ -6375,49 +6174,44 @@ static void drawTextItemDecoration(QPainter *painter, const QPointF &pos, const
         painter->setRenderHint(QPainter::Qt4CompatiblePainting);
 }
 
-Q_GUI_EXPORT void qt_draw_decoration_for_glyphs(QPainter *painter, const glyph_t *glyphArray,
-                                                const QFixedPoint *positions, int glyphCount,
-                                                QFontEngine *fontEngine, const QFont &font,
-                                                const QTextCharFormat &charFormat)
+static void qt_draw_decoration_for_glyphs(QPainter *painter,
+                                          const QPointF &decorationPosition,
+                                          const glyph_t *glyphArray,
+                                          const QFixedPoint *positions,
+                                          int glyphCount,
+                                          QFontEngine *fontEngine,
+                                          bool underline,
+                                          bool overline,
+                                          bool strikeOut)
 {
-    if (!(font.underline() || font.strikeOut() || font.overline()))
+    if (!underline && !overline && !strikeOut)
         return;
 
-    QFixed leftMost;
-    QFixed rightMost;
-    QFixed baseLine;
-    for (int i=0; i<glyphCount; ++i) {
-        glyph_metrics_t gm = fontEngine->boundingBox(glyphArray[i]);
-        if (i == 0 || leftMost > positions[i].x)
-            leftMost = positions[i].x;
-
-        // We don't support glyphs that do not share a common baseline. If this turns out to
-        // be a relevant use case, then we need to find clusters of glyphs that share a baseline
-        // and do a drawTextItemDecoration call per cluster.
-        if (i == 0 || baseLine < positions[i].y)
-            baseLine = positions[i].y;
-
-        // We use the advance rather than the actual bounds to match the algorithm in drawText()
-        if (i == 0 || rightMost < positions[i].x + gm.xoff)
-            rightMost = positions[i].x + gm.xoff;
-    }
-
-    QFixed width = rightMost - leftMost;
     QTextItem::RenderFlags flags;
-
-    if (font.underline())
+    if (underline)
         flags |= QTextItem::Underline;
-    if (font.overline())
+    if (overline)
         flags |= QTextItem::Overline;
-    if (font.strikeOut())
+    if (strikeOut)
         flags |= QTextItem::StrikeOut;
 
-    drawTextItemDecoration(painter, QPointF(leftMost.toReal(), baseLine.toReal()),
+    bool rtl = positions[glyphCount - 1].x < positions[0].x;
+    QFixed baseline = positions[0].y;
+    glyph_metrics_t gm = fontEngine->boundingBox(glyphArray[rtl ? 0 : glyphCount - 1]);
+
+    qreal width = rtl
+            ? (positions[0].x + gm.xoff - positions[glyphCount - 1].x).toReal()
+            : (positions[glyphCount - 1].x + gm.xoff - positions[0].x).toReal();
+
+    drawTextItemDecoration(painter,
+                           QPointF(decorationPosition.x(), baseline.toReal()),
                            fontEngine,
                            nullptr, // textEngine
-                           font.underline() ? QTextCharFormat::SingleUnderline
-                                            : QTextCharFormat::NoUnderline, flags,
-                           width.toReal(), charFormat);
+                           underline ? QTextCharFormat::SingleUnderline
+                                     : QTextCharFormat::NoUnderline,
+                           flags,
+                           width,
+                           QTextCharFormat());
 }
 
 void QPainter::drawTextItem(const QPointF &p, const QTextItem &ti)
@@ -8084,33 +7878,6 @@ QFont QPaintEngineState::font() const
     return static_cast<const QPainterState *>(this)->font;
 }
 
-#if QT_DEPRECATED_SINCE(5, 13)
-/*!
-    \since 4.2
-    \obsolete
-
-    Use transform() instead.
-
-    Returns the matrix in the current paint engine
-    state.
-
-    \note It is advisable to use transform() instead of this function to
-    preserve the properties of perspective transformations.
-
-    This variable should only be used when the state() returns a
-    combination which includes the QPaintEngine::DirtyTransform flag.
-
-    \sa state(), QPaintEngine::updateState()
-*/
-
-QMatrix QPaintEngineState::matrix() const
-{
-    const QPainterState *st = static_cast<const QPainterState *>(this);
-
-    return st->matrix.toAffine();
-}
-#endif
-
 /*!
     \since 4.3
 
diff --git a/src/gui/painting/qpainter.h b/src/gui/painting/qpainter.h
index 77c6504d2e..52de8b6839 100644
--- a/src/gui/painting/qpainter.h
+++ b/src/gui/painting/qpainter.h
@@ -53,7 +53,6 @@
 #include <QtGui/qpolygon.h>
 #include <QtGui/qpen.h>
 #include <QtGui/qbrush.h>
-#include <QtGui/qmatrix.h>
 #include <QtGui/qtransform.h>
 #include <QtGui/qfontinfo.h>
 #include <QtGui/qfontmetrics.h>
@@ -236,35 +235,11 @@ public:
     void restore();
 
     // XForm functions
-#if QT_DEPRECATED_SINCE(5, 13)
-    QT_DEPRECATED_X("Use setTransform() instead")
-    void setMatrix(const QMatrix &matrix, bool combine = false);
-    QT_DEPRECATED_X("Use transform() instead")
-    const QMatrix &matrix() const;
-    QT_DEPRECATED_X("Use deviceTransform() instead")
-    const QMatrix &deviceMatrix() const;
-    QT_DEPRECATED_X("Use resetTransform() instead")
-    void resetMatrix();
-#endif
-
     void setTransform(const QTransform &transform, bool combine = false);
     const QTransform &transform() const;
     const QTransform &deviceTransform() const;
     void resetTransform();
 
-#if QT_DEPRECATED_SINCE(5, 13)
-    QT_DEPRECATED_X("Use setWorldTransform() instead")
-    void setWorldMatrix(const QMatrix &matrix, bool combine = false);
-    QT_DEPRECATED_X("Use worldTransform() instead")
-    const QMatrix &worldMatrix() const;
-    QT_DEPRECATED_X("Use combinedTransform() instead")
-    QMatrix combinedMatrix() const;
-    QT_DEPRECATED_X("Use setWorldMatrixEnabled() instead")
-    void setMatrixEnabled(bool enabled);
-    QT_DEPRECATED_X("Use worldMatrixEnabled() instead")
-    bool matrixEnabled() const;
-#endif
-
     void setWorldTransform(const QTransform &matrix, bool combine = false);
     const QTransform &worldTransform() const;
 
diff --git a/src/gui/painting/qpainter_p.h b/src/gui/painting/qpainter_p.h
index dafd6e33be..870381d48a 100644
--- a/src/gui/painting/qpainter_p.h
+++ b/src/gui/painting/qpainter_p.h
@@ -235,7 +235,7 @@ public:
     void drawTextItem(const QPointF &p, const QTextItem &_ti, QTextEngine *textEngine);
 
 #if !defined(QT_NO_RAWFONT)
-    void drawGlyphs(const quint32 *glyphArray, QFixedPoint *positionArray, int glyphCount,
+    void drawGlyphs(const QPointF &decorationPosition, const quint32 *glyphArray, QFixedPoint *positionArray, int glyphCount,
                     QFontEngine *fontEngine, bool overline = false, bool underline = false,
                     bool strikeOut = false);
 #endif
diff --git a/src/gui/painting/qpainterpath.cpp b/src/gui/painting/qpainterpath.cpp
index ab60afd9cd..11623c78f0 100644
--- a/src/gui/painting/qpainterpath.cpp
+++ b/src/gui/painting/qpainterpath.cpp
@@ -44,7 +44,6 @@
 #include <qdebug.h>
 #include <qiodevice.h>
 #include <qlist.h>
-#include <qmatrix.h>
 #include <qpen.h>
 #include <qpolygon.h>
 #include <qtextlayout.h>
@@ -1604,6 +1603,25 @@ QPainterPath QPainterPath::toReversed() const
 }
 
 /*!
+    \overload
+
+    Converts the path into a list of polygons without any transformation,
+    and returns the list.
+
+    This function creates one polygon for each subpath regardless of
+    intersecting subpaths (i.e. overlapping bounding rectangles). To
+    make sure that such overlapping subpaths are filled correctly, use
+    the toFillPolygons() function instead.
+
+    \sa toFillPolygons(), toFillPolygon(), {QPainterPath#QPainterPath
+    Conversion}{QPainterPath Conversion}
+*/
+QList<QPolygonF> QPainterPath::toSubpathPolygons() const
+{
+    return toSubpathPolygons(QTransform());
+}
+
+/*!
     Converts the path into a list of polygons using the QTransform
     \a matrix, and returns the list.
 
@@ -1660,18 +1678,34 @@ QList<QPolygonF> QPainterPath::toSubpathPolygons(const QTransform &matrix) const
     return flatCurves;
 }
 
-#if QT_DEPRECATED_SINCE(5, 15)
 /*!
-  \overload
-  \obsolete
+    \overload
 
-  Use toSubpathPolygons(const QTransform &matrix) instead.
- */
-QList<QPolygonF> QPainterPath::toSubpathPolygons(const QMatrix &matrix) const
+    Converts the path into a list of polygons without any transformation,
+    and returns the list.
+
+    The function differs from the toFillPolygon() function in that it
+    creates several polygons. It is provided because it is usually
+    faster to draw several small polygons than to draw one large
+    polygon, even though the total number of points drawn is the same.
+
+    The toFillPolygons() function differs from the toSubpathPolygons()
+    function in that it create only polygon for subpaths that have
+    overlapping bounding rectangles.
+
+    Like the toFillPolygon() function, this function uses a rewinding
+    technique to make sure that overlapping subpaths can be filled
+    using the correct fill rule. Note that rewinding inserts addition
+    lines in the polygons so the outline of the fill polygon does not
+    match the outline of the path.
+
+    \sa toSubpathPolygons(), toFillPolygon(),
+    {QPainterPath#QPainterPath Conversion}{QPainterPath Conversion}
+*/
+QList<QPolygonF> QPainterPath::toFillPolygons() const
 {
-    return toSubpathPolygons(QTransform(matrix));
+    return toFillPolygons(QTransform());
 }
-#endif // QT_DEPRECATED_SINCE(5, 15)
 
 /*!
     Converts the path into a list of polygons using the
@@ -1792,19 +1826,6 @@ QList<QPolygonF> QPainterPath::toFillPolygons(const QTransform &matrix) const
     return polys;
 }
 
-#if QT_DEPRECATED_SINCE(5, 15)
-/*!
-  \overload
-  \obsolete
-
-  Use toFillPolygons(const QTransform &matrix) instead.
- */
-QList<QPolygonF> QPainterPath::toFillPolygons(const QMatrix &matrix) const
-{
-    return toFillPolygons(QTransform(matrix));
-}
-#endif // QT_DEPRECATED_SINCE(5, 15)
-
 //same as qt_polygon_isect_line in qpolygon.cpp
 static void qt_painterpath_isect_line(const QPointF &p1,
                                       const QPointF &p2,
@@ -2882,6 +2903,28 @@ void QPainterPathStroker::setDashOffset(qreal offset)
 }
 
 /*!
+  \overload
+
+  Converts the path into a polygon without any transformation,
+  and returns the polygon.
+
+  The polygon is created by first converting all subpaths to
+  polygons, then using a rewinding technique to make sure that
+  overlapping subpaths can be filled using the correct fill rule.
+
+  Note that rewinding inserts addition lines in the polygon so
+  the outline of the fill polygon does not match the outline of
+  the path.
+
+  \sa toSubpathPolygons(), toFillPolygons(),
+  {QPainterPath#QPainterPath Conversion}{QPainterPath Conversion}
+*/
+QPolygonF QPainterPath::toFillPolygon() const
+{
+    return toFillPolygon(QTransform());
+}
+
+/*!
   Converts the path into a polygon using the QTransform
   \a matrix, and returns the polygon.
 
@@ -2898,7 +2941,6 @@ void QPainterPathStroker::setDashOffset(qreal offset)
 */
 QPolygonF QPainterPath::toFillPolygon(const QTransform &matrix) const
 {
-
     const QList<QPolygonF> flats = toSubpathPolygons(matrix);
     QPolygonF polygon;
     if (flats.isEmpty())
@@ -2914,19 +2956,6 @@ QPolygonF QPainterPath::toFillPolygon(const QTransform &matrix) const
     return polygon;
 }
 
-#if QT_DEPRECATED_SINCE(5, 15)
-/*!
-  \overload
-  \obsolete
-
-  Use toFillPolygon(const QTransform &matrix) instead.
-*/
-QPolygonF QPainterPath::toFillPolygon(const QMatrix &matrix) const
-{
-    return toFillPolygon(QTransform(matrix));
-}
-#endif // QT_DEPRECATED_SINCE(5, 15)
-
 //derivative of the equation
 static inline qreal slopeAt(qreal t, qreal a, qreal b, qreal c, qreal d)
 {
diff --git a/src/gui/painting/qpainterpath.h b/src/gui/painting/qpainterpath.h
index 26b92dc6fa..078b665222 100644
--- a/src/gui/painting/qpainterpath.h
+++ b/src/gui/painting/qpainterpath.h
@@ -41,7 +41,6 @@
 #define QPAINTERPATH_H
 
 #include <QtGui/qtguiglobal.h>
-#include <QtGui/qmatrix.h>
 #include <QtCore/qglobal.h>
 #include <QtCore/qrect.h>
 #include <QtCore/qline.h>
@@ -59,6 +58,7 @@ class QPainterPathStrokerPrivate;
 class QPen;
 class QPolygonF;
 class QRegion;
+class QTransform;
 class QVectorPath;
 
 class Q_GUI_EXPORT QPainterPath
@@ -176,16 +176,11 @@ public:
 
     Q_REQUIRED_RESULT QPainterPath toReversed() const;
 
-#if QT_DEPRECATED_SINCE(5, 15)
-    QT_DEPRECATED_X("Use toSubpathPolygons(const QTransform &)")
-    QList<QPolygonF> toSubpathPolygons(const QMatrix &matrix = QMatrix()) const;
-    QT_DEPRECATED_X("Use toFillPolygons(const QTransform &")
-    QList<QPolygonF> toFillPolygons(const QMatrix &matrix = QMatrix()) const;
-    QT_DEPRECATED_X("Use toFillPolygon(const QTransform &)")
-    QPolygonF toFillPolygon(const QMatrix &matrix = QMatrix()) const;
-#endif // QT_DEPRECATED_SINCE(5, 15)
+    QList<QPolygonF> toSubpathPolygons() const;
     QList<QPolygonF> toSubpathPolygons(const QTransform &matrix) const;
+    QList<QPolygonF> toFillPolygons() const;
     QList<QPolygonF> toFillPolygons(const QTransform &matrix) const;
+    QPolygonF toFillPolygon() const;
     QPolygonF toFillPolygon(const QTransform &matrix) const;
 
     int elementCount() const;
@@ -238,7 +233,6 @@ private:
     friend class QPainterPathData;
     friend class QPainterPathStroker;
     friend class QPainterPathStrokerPrivate;
-    friend class QMatrix;
     friend class QTransform;
     friend class QVectorPath;
     friend Q_GUI_EXPORT const QVectorPath &qtVectorPathForPath(const QPainterPath &);
diff --git a/src/gui/painting/qpainterpath_p.h b/src/gui/painting/qpainterpath_p.h
index a420e0b3d9..d52243b0df 100644
--- a/src/gui/painting/qpainterpath_p.h
+++ b/src/gui/painting/qpainterpath_p.h
@@ -74,7 +74,6 @@ public:
     friend class QPainterPathData;
     friend class QPainterPathStroker;
     friend class QPainterPathStrokerPrivate;
-    friend class QMatrix;
     friend class QTransform;
     friend class QVectorPath;
     friend struct QPainterPathPrivateDeleter;
diff --git a/src/gui/painting/qplatformbackingstore.cpp b/src/gui/painting/qplatformbackingstore.cpp
index c092a7153f..e8ac494e04 100644
--- a/src/gui/painting/qplatformbackingstore.cpp
+++ b/src/gui/painting/qplatformbackingstore.cpp
@@ -40,43 +40,8 @@
 #include "qplatformbackingstore.h"
 #include <qwindow.h>
 #include <qpixmap.h>
-#include <private/qwindow_p.h>
-
-#include <qopengl.h>
-#include <qopenglcontext.h>
-#include <QtGui/QMatrix4x4>
-#include <QtGui/QOpenGLShaderProgram>
-#include <QtGui/QOpenGLContext>
-#include <QtGui/QOpenGLFunctions>
-#ifndef QT_NO_OPENGL
-#include <QtGui/qopengltextureblitter.h>
-#include <QtGui/qoffscreensurface.h>
-#endif
-#include <qpa/qplatformgraphicsbuffer.h>
-#include <qpa/qplatformgraphicsbufferhelper.h>
 
-#ifndef GL_TEXTURE_BASE_LEVEL
-#define GL_TEXTURE_BASE_LEVEL             0x813C
-#endif
-#ifndef GL_TEXTURE_MAX_LEVEL
-#define GL_TEXTURE_MAX_LEVEL              0x813D
-#endif
-#ifndef GL_UNPACK_ROW_LENGTH
-#define GL_UNPACK_ROW_LENGTH              0x0CF2
-#endif
-#ifndef GL_RGB10_A2
-#define GL_RGB10_A2                       0x8059
-#endif
-#ifndef GL_UNSIGNED_INT_2_10_10_10_REV
-#define GL_UNSIGNED_INT_2_10_10_10_REV    0x8368
-#endif
-
-#ifndef GL_FRAMEBUFFER_SRGB
-#define GL_FRAMEBUFFER_SRGB 0x8DB9
-#endif
-#ifndef GL_FRAMEBUFFER_SRGB_CAPABLE
-#define GL_FRAMEBUFFER_SRGB_CAPABLE 0x8DBA
-#endif
+#include <QtCore/private/qobject_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -88,38 +53,19 @@ public:
     QPlatformBackingStorePrivate(QWindow *w)
         : window(w)
         , backingStore(nullptr)
-#ifndef QT_NO_OPENGL
-        , textureId(0)
-        , blitter(nullptr)
-#endif
     {
     }
 
     ~QPlatformBackingStorePrivate()
     {
 #ifndef QT_NO_OPENGL
-        if (context) {
-            QOffscreenSurface offscreenSurface;
-            offscreenSurface.setFormat(context->format());
-            offscreenSurface.create();
-            context->makeCurrent(&offscreenSurface);
-            if (textureId)
-                context->functions()->glDeleteTextures(1, &textureId);
-            if (blitter)
-                blitter->destroy();
-        }
-        delete blitter;
+        delete openGLSupport;
 #endif
     }
     QWindow *window;
     QBackingStore *backingStore;
 #ifndef QT_NO_OPENGL
-    QScopedPointer<QOpenGLContext> context;
-    mutable GLuint textureId;
-    mutable QSize textureSize;
-    mutable bool needsSwizzle;
-    mutable bool premultiplied;
-    QOpenGLTextureBlitter *blitter;
+    QPlatformBackingStoreOpenGLSupportBase *openGLSupport = nullptr;
 #endif
 };
 
@@ -240,83 +186,20 @@ void QPlatformTextureList::clear()
 */
 
 #ifndef QT_NO_OPENGL
-
-static inline QRect deviceRect(const QRect &rect, QWindow *window)
-{
-    QRect deviceRect(rect.topLeft() * window->devicePixelRatio(),
-                     rect.size() * window->devicePixelRatio());
-    return deviceRect;
-}
-
-static inline QPoint deviceOffset(const QPoint &pt, QWindow *window)
-{
-    return pt * window->devicePixelRatio();
-}
-
-static QRegion deviceRegion(const QRegion &region, QWindow *window, const QPoint &offset)
-{
-    if (offset.isNull() && window->devicePixelRatio() <= 1)
-        return region;
-
-    QVector<QRect> rects;
-    rects.reserve(region.rectCount());
-    for (const QRect &rect : region)
-        rects.append(deviceRect(rect.translated(offset), window));
-
-    QRegion deviceRegion;
-    deviceRegion.setRects(rects.constData(), rects.count());
-    return deviceRegion;
-}
-
-static inline QRect toBottomLeftRect(const QRect &topLeftRect, int windowHeight)
-{
-    return QRect(topLeftRect.x(), windowHeight - topLeftRect.bottomRight().y() - 1,
-                 topLeftRect.width(), topLeftRect.height());
-}
-
-static void blitTextureForWidget(const QPlatformTextureList *textures, int idx, QWindow *window, const QRect &deviceWindowRect,
-                                 QOpenGLTextureBlitter *blitter, const QPoint &offset, bool canUseSrgb)
-{
-    const QRect clipRect = textures->clipRect(idx);
-    if (clipRect.isEmpty())
-        return;
-
-    QRect rectInWindow = textures->geometry(idx);
-    // relative to the TLW, not necessarily our window (if the flush is for a native child widget), have to adjust
-    rectInWindow.translate(-offset);
-
-    const QRect clippedRectInWindow = rectInWindow & clipRect.translated(rectInWindow.topLeft());
-    const QRect srcRect = toBottomLeftRect(clipRect, rectInWindow.height());
-
-    const QMatrix4x4 target = QOpenGLTextureBlitter::targetTransform(deviceRect(clippedRectInWindow, window),
-                                                                     deviceWindowRect);
-
-    const QMatrix3x3 source = QOpenGLTextureBlitter::sourceTransform(deviceRect(srcRect, window),
-                                                                     deviceRect(rectInWindow, window).size(),
-                                                                     QOpenGLTextureBlitter::OriginBottomLeft);
-
-    QOpenGLFunctions *funcs = QOpenGLContext::currentContext()->functions();
-    const bool srgb = textures->flags(idx).testFlag(QPlatformTextureList::TextureIsSrgb);
-    if (srgb && canUseSrgb)
-        funcs->glEnable(GL_FRAMEBUFFER_SRGB);
-
-    blitter->blit(textures->textureId(idx), target, source);
-
-    if (srgb && canUseSrgb)
-        funcs->glDisable(GL_FRAMEBUFFER_SRGB);
-}
-
 /*!
     Flushes the given \a region from the specified \a window onto the
     screen, and composes it with the specified \a textures.
 
-    The default implementation retrieves the contents using toTexture()
+    If OpenGLSupport has been enabled using \c setOpenGLSupport,
+    the default implementation retrieves the contents using toTexture()
     and composes using OpenGL. May be reimplemented in subclasses if there
     is a more efficient native way to do it.
 
     \note \a region is relative to the window which may not be top-level in case
     \a window corresponds to a native child widget. \a offset is the position of
     the native child relative to the top-level window.
+
+    \sa setOpenGLSupport()
  */
 
 void QPlatformBackingStore::composeAndFlush(QWindow *window, const QRegion &region,
@@ -324,162 +207,13 @@ void QPlatformBackingStore::composeAndFlush(QWindow *window, const QRegion &regi
                                             QPlatformTextureList *textures,
                                             bool translucentBackground)
 {
-    if (!qt_window_private(window)->receivedExpose)
-        return;
-
-    if (!d_ptr->context) {
-        d_ptr->context.reset(new QOpenGLContext);
-        d_ptr->context->setFormat(d_ptr->window->requestedFormat());
-        d_ptr->context->setScreen(d_ptr->window->screen());
-        d_ptr->context->setShareContext(qt_window_private(d_ptr->window)->shareContext());
-        if (!d_ptr->context->create()) {
-            qCWarning(lcQpaBackingStore, "composeAndFlush: QOpenGLContext creation failed");
-            return;
-        }
-    }
-
-    bool current = d_ptr->context->makeCurrent(window);
-
-    if (!current && !d_ptr->context->isValid()) {
-        delete d_ptr->blitter;
-        d_ptr->blitter = nullptr;
-        d_ptr->textureId = 0;
-        current = d_ptr->context->create() && d_ptr->context->makeCurrent(window);
-    }
-
-    if (!current) {
-        qCWarning(lcQpaBackingStore, "composeAndFlush: makeCurrent() failed");
-        return;
-    }
-
-    qCDebug(lcQpaBackingStore) << "Composing and flushing" << region << "of" << window
-        << "at offset" << offset << "with" << textures->count() << "texture(s) in" << textures;
-
-    QWindowPrivate::get(window)->lastComposeTime.start();
-
-    QOpenGLFunctions *funcs = d_ptr->context->functions();
-    funcs->glViewport(0, 0, qRound(window->width() * window->devicePixelRatio()), qRound(window->height() * window->devicePixelRatio()));
-    funcs->glClearColor(0, 0, 0, translucentBackground ? 0 : 1);
-    funcs->glClear(GL_COLOR_BUFFER_BIT);
-
-    if (!d_ptr->blitter) {
-        d_ptr->blitter = new QOpenGLTextureBlitter;
-        d_ptr->blitter->create();
-    }
-
-    d_ptr->blitter->bind();
-
-    const QRect deviceWindowRect = deviceRect(QRect(QPoint(), window->size()), window);
-    const QPoint deviceWindowOffset = deviceOffset(offset, window);
-
-    bool canUseSrgb = false;
-    // If there are any sRGB textures in the list, check if the destination
-    // framebuffer is sRGB capable.
-    for (int i = 0; i < textures->count(); ++i) {
-        if (textures->flags(i).testFlag(QPlatformTextureList::TextureIsSrgb)) {
-            GLint cap = 0;
-            funcs->glGetIntegerv(GL_FRAMEBUFFER_SRGB_CAPABLE, &cap);
-            if (cap)
-                canUseSrgb = true;
-            break;
-        }
-    }
-
-    // Textures for renderToTexture widgets.
-    for (int i = 0; i < textures->count(); ++i) {
-        if (!textures->flags(i).testFlag(QPlatformTextureList::StacksOnTop))
-            blitTextureForWidget(textures, i, window, deviceWindowRect, d_ptr->blitter, offset, canUseSrgb);
-    }
-
-    // Backingstore texture with the normal widgets.
-    GLuint textureId = 0;
-    QOpenGLTextureBlitter::Origin origin = QOpenGLTextureBlitter::OriginTopLeft;
-    if (QPlatformGraphicsBuffer *graphicsBuffer = this->graphicsBuffer()) {
-        if (graphicsBuffer->size() != d_ptr->textureSize) {
-            if (d_ptr->textureId)
-                funcs->glDeleteTextures(1, &d_ptr->textureId);
-            funcs->glGenTextures(1, &d_ptr->textureId);
-            funcs->glBindTexture(GL_TEXTURE_2D, d_ptr->textureId);
-            QOpenGLContext *ctx = QOpenGLContext::currentContext();
-            if (!ctx->isOpenGLES() || ctx->format().majorVersion() >= 3) {
-                funcs->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_BASE_LEVEL, 0);
-                funcs->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL, 0);
-            }
-            funcs->glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
-            funcs->glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
-            funcs->glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-            funcs->glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-
-            if (QPlatformGraphicsBufferHelper::lockAndBindToTexture(graphicsBuffer, &d_ptr->needsSwizzle, &d_ptr->premultiplied)) {
-                d_ptr->textureSize = graphicsBuffer->size();
-            } else {
-                d_ptr->textureSize = QSize(0,0);
-            }
-
-            graphicsBuffer->unlock();
-        } else if (!region.isEmpty()){
-            funcs->glBindTexture(GL_TEXTURE_2D, d_ptr->textureId);
-            QPlatformGraphicsBufferHelper::lockAndBindToTexture(graphicsBuffer, &d_ptr->needsSwizzle, &d_ptr->premultiplied);
-            graphicsBuffer->unlock();
-        }
-
-        if (graphicsBuffer->origin() == QPlatformGraphicsBuffer::OriginBottomLeft)
-            origin = QOpenGLTextureBlitter::OriginBottomLeft;
-        textureId = d_ptr->textureId;
-    } else {
-        TextureFlags flags;
-        textureId = toTexture(deviceRegion(region, window, offset), &d_ptr->textureSize, &flags);
-        d_ptr->needsSwizzle = (flags & TextureSwizzle) != 0;
-        d_ptr->premultiplied = (flags & TexturePremultiplied) != 0;
-        if (flags & TextureFlip)
-            origin = QOpenGLTextureBlitter::OriginBottomLeft;
-    }
-
-    funcs->glEnable(GL_BLEND);
-    if (d_ptr->premultiplied)
-        funcs->glBlendFuncSeparate(GL_ONE, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ONE);
+    if (auto *c = d_ptr->openGLSupport)
+        c->composeAndFlush(window, region, offset, textures, translucentBackground);
     else
-        funcs->glBlendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ONE);
-
-    if (textureId) {
-        if (d_ptr->needsSwizzle)
-            d_ptr->blitter->setRedBlueSwizzle(true);
-        // The backingstore is for the entire tlw.
-        // In case of native children offset tells the position relative to the tlw.
-        const QRect srcRect = toBottomLeftRect(deviceWindowRect.translated(deviceWindowOffset), d_ptr->textureSize.height());
-        const QMatrix3x3 source = QOpenGLTextureBlitter::sourceTransform(srcRect,
-                                                                         d_ptr->textureSize,
-                                                                         origin);
-        d_ptr->blitter->blit(textureId, QMatrix4x4(), source);
-        if (d_ptr->needsSwizzle)
-            d_ptr->blitter->setRedBlueSwizzle(false);
-    }
-
-    // Textures for renderToTexture widgets that have WA_AlwaysStackOnTop set.
-    bool blendIsPremultiplied = d_ptr->premultiplied;
-    for (int i = 0; i < textures->count(); ++i) {
-        const QPlatformTextureList::Flags flags = textures->flags(i);
-        if (flags.testFlag(QPlatformTextureList::NeedsPremultipliedAlphaBlending)) {
-            if (!blendIsPremultiplied) {
-                funcs->glBlendFuncSeparate(GL_ONE, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ONE);
-                blendIsPremultiplied = true;
-            }
-        } else {
-            if (blendIsPremultiplied) {
-                funcs->glBlendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ONE);
-                blendIsPremultiplied = false;
-            }
-        }
-        if (flags.testFlag(QPlatformTextureList::StacksOnTop))
-            blitTextureForWidget(textures, i, window, deviceWindowRect, d_ptr->blitter, offset, canUseSrgb);
-    }
-
-    funcs->glDisable(GL_BLEND);
-    d_ptr->blitter->release();
-
-    d_ptr->context->swapBuffers(window);
+        qWarning() << Q_FUNC_INFO << "no opengl support set";
 }
 #endif
+
 /*!
   Implemented in subclasses to return the content of the backingstore as a QImage.
 
@@ -504,7 +238,8 @@ QImage QPlatformBackingStore::toImage() const
   The ownership of the texture is not transferred. The caller must not store
   the return value between calls, but instead call this function before each use.
 
-  The default implementation returns a cached texture if \a dirtyRegion is empty and
+  If OpenGLSupport has been enabled using \c setOpenGLSupport,
+  the default implementation returns a cached texture if \a dirtyRegion is empty and
   \a textureSize matches the backingstore size, otherwise it retrieves the content using
   toImage() and performs a texture upload. This works only if the value of \a textureSize
   is preserved between the calls to this function.
@@ -520,141 +255,17 @@ QImage QPlatformBackingStore::toImage() const
   flags will be set to include \c TextureFlip.
 
   \note \a dirtyRegion is relative to the backingstore so no adjustment is needed.
+
+  \sa setOpenGLSupport()
  */
 GLuint QPlatformBackingStore::toTexture(const QRegion &dirtyRegion, QSize *textureSize, TextureFlags *flags) const
 {
-    Q_ASSERT(textureSize);
-    Q_ASSERT(flags);
-
-    QImage image = toImage();
-    QSize imageSize = image.size();
-
-    QOpenGLContext *ctx = QOpenGLContext::currentContext();
-    GLenum internalFormat = GL_RGBA;
-    GLuint pixelType = GL_UNSIGNED_BYTE;
-
-    bool needsConversion = false;
-    *flags = { };
-    switch (image.format()) {
-    case QImage::Format_ARGB32_Premultiplied:
-        *flags |= TexturePremultiplied;
-        Q_FALLTHROUGH();
-    case QImage::Format_RGB32:
-    case QImage::Format_ARGB32:
-        *flags |= TextureSwizzle;
-        break;
-    case QImage::Format_RGBA8888_Premultiplied:
-        *flags |= TexturePremultiplied;
-        Q_FALLTHROUGH();
-    case QImage::Format_RGBX8888:
-    case QImage::Format_RGBA8888:
-        break;
-    case QImage::Format_BGR30:
-    case QImage::Format_A2BGR30_Premultiplied:
-        if (!ctx->isOpenGLES() || ctx->format().majorVersion() >= 3) {
-            pixelType = GL_UNSIGNED_INT_2_10_10_10_REV;
-            internalFormat = GL_RGB10_A2;
-            *flags |= TexturePremultiplied;
-        } else {
-            needsConversion = true;
-        }
-        break;
-    case QImage::Format_RGB30:
-    case QImage::Format_A2RGB30_Premultiplied:
-        if (!ctx->isOpenGLES() || ctx->format().majorVersion() >= 3) {
-            pixelType = GL_UNSIGNED_INT_2_10_10_10_REV;
-            internalFormat = GL_RGB10_A2;
-            *flags |= TextureSwizzle | TexturePremultiplied;
-        } else {
-            needsConversion = true;
-        }
-        break;
-    default:
-        needsConversion = true;
-        break;
-    }
-    if (imageSize.isEmpty()) {
-        *textureSize = imageSize;
+    if (auto *c = d_ptr->openGLSupport)
+        return c->toTexture(dirtyRegion, textureSize, flags);
+    else {
+        qWarning() << Q_FUNC_INFO << "no opengl support set";
         return 0;
     }
-
-    // Must rely on the input only, not d_ptr.
-    // With the default composeAndFlush() textureSize is &d_ptr->textureSize.
-    bool resized = *textureSize != imageSize;
-    if (dirtyRegion.isEmpty() && !resized)
-        return d_ptr->textureId;
-
-    *textureSize = imageSize;
-
-    if (needsConversion)
-        image = image.convertToFormat(QImage::Format_RGBA8888);
-
-    // The image provided by the backingstore may have a stride larger than width * 4, for
-    // instance on platforms that manually implement client-side decorations.
-    static const int bytesPerPixel = 4;
-    const int strideInPixels = image.bytesPerLine() / bytesPerPixel;
-    const bool hasUnpackRowLength = !ctx->isOpenGLES() || ctx->format().majorVersion() >= 3;
-
-    QOpenGLFunctions *funcs = ctx->functions();
-
-    if (hasUnpackRowLength) {
-        funcs->glPixelStorei(GL_UNPACK_ROW_LENGTH, strideInPixels);
-    } else if (strideInPixels != image.width()) {
-        // No UNPACK_ROW_LENGTH on ES 2.0 and yet we would need it. This case is typically
-        // hit with QtWayland which is rarely used in combination with a ES2.0-only GL
-        // implementation.  Therefore, accept the performance hit and do a copy.
-        image = image.copy();
-    }
-
-    if (resized) {
-        if (d_ptr->textureId)
-            funcs->glDeleteTextures(1, &d_ptr->textureId);
-        funcs->glGenTextures(1, &d_ptr->textureId);
-        funcs->glBindTexture(GL_TEXTURE_2D, d_ptr->textureId);
-        if (!ctx->isOpenGLES() || ctx->format().majorVersion() >= 3) {
-            funcs->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_BASE_LEVEL, 0);
-            funcs->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL, 0);
-        }
-        funcs->glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
-        funcs->glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
-        funcs->glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-        funcs->glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-
-        funcs->glTexImage2D(GL_TEXTURE_2D, 0, internalFormat, imageSize.width(), imageSize.height(), 0, GL_RGBA, pixelType,
-                            const_cast<uchar*>(image.constBits()));
-    } else {
-        funcs->glBindTexture(GL_TEXTURE_2D, d_ptr->textureId);
-        QRect imageRect = image.rect();
-        QRect rect = dirtyRegion.boundingRect() & imageRect;
-
-        if (hasUnpackRowLength) {
-            funcs->glTexSubImage2D(GL_TEXTURE_2D, 0, rect.x(), rect.y(), rect.width(), rect.height(), GL_RGBA, pixelType,
-                                   image.constScanLine(rect.y()) + rect.x() * bytesPerPixel);
-        } else {
-            // if the rect is wide enough it's cheaper to just
-            // extend it instead of doing an image copy
-            if (rect.width() >= imageRect.width() / 2) {
-                rect.setX(0);
-                rect.setWidth(imageRect.width());
-            }
-
-            // if the sub-rect is full-width we can pass the image data directly to
-            // OpenGL instead of copying, since there's no gap between scanlines
-
-            if (rect.width() == imageRect.width()) {
-                funcs->glTexSubImage2D(GL_TEXTURE_2D, 0, 0, rect.y(), rect.width(), rect.height(), GL_RGBA, pixelType,
-                                       image.constScanLine(rect.y()));
-            } else {
-                funcs->glTexSubImage2D(GL_TEXTURE_2D, 0, rect.x(), rect.y(), rect.width(), rect.height(), GL_RGBA, pixelType,
-                                       image.copy(rect).constBits());
-            }
-        }
-    }
-
-    if (hasUnpackRowLength)
-        funcs->glPixelStorei(GL_UNPACK_ROW_LENGTH, 0);
-
-    return d_ptr->textureId;
 }
 #endif // QT_NO_OPENGL
 
@@ -706,6 +317,18 @@ QBackingStore *QPlatformBackingStore::backingStore() const
     return d_ptr->backingStore;
 }
 
+#ifndef QT_NO_OPENGL
+/*!
+    Injects an OpenGL implementation helper. Platform integrations need to
+    call this if they intend to use the default OpenGL implementations of
+    composeAndFlush or toTexture.
+*/
+void QPlatformBackingStore::setOpenGLSupport(QPlatformBackingStoreOpenGLSupportBase *openGLSupport)
+{
+    d_ptr->openGLSupport = openGLSupport;
+}
+#endif // QT_NO_OPENGL
+
 /*!
     This function is called before painting onto the surface begins,
     with the \a region in which the painting will occur.
diff --git a/src/gui/painting/qplatformbackingstore.h b/src/gui/painting/qplatformbackingstore.h
index 7aa054f1e2..2a3d7d20b5 100644
--- a/src/gui/painting/qplatformbackingstore.h
+++ b/src/gui/painting/qplatformbackingstore.h
@@ -67,11 +67,10 @@ class QRect;
 class QPoint;
 class QImage;
 class QPlatformBackingStorePrivate;
-class QPlatformWindow;
 class QPlatformTextureList;
 class QPlatformTextureListPrivate;
-class QOpenGLContext;
 class QPlatformGraphicsBuffer;
+class QPlatformBackingStoreOpenGLSupportBase;
 
 #ifndef QT_NO_OPENGL
 class Q_GUI_EXPORT QPlatformTextureList : public QObject
@@ -118,6 +117,8 @@ public:
     QWindow *window() const;
     QBackingStore *backingStore() const;
 
+    void setOpenGLSupport(QPlatformBackingStoreOpenGLSupportBase *openGLSupport);
+
     virtual QPaintDevice *paintDevice() = 0;
 
     virtual void flush(QWindow *window, const QRegion &region, const QPoint &offset) = 0;
@@ -154,6 +155,17 @@ private:
 };
 
 #ifndef QT_NO_OPENGL
+class Q_GUI_EXPORT QPlatformBackingStoreOpenGLSupportBase // pure interface
+{
+public:
+    virtual void composeAndFlush(QWindow *window, const QRegion &region, const QPoint &offset,
+                                 QPlatformTextureList *textures, bool translucentBackground) = 0;
+    virtual GLuint toTexture(const QRegion &dirtyRegion, QSize *textureSize, QPlatformBackingStore::TextureFlags *flags) const = 0;
+    virtual ~QPlatformBackingStoreOpenGLSupportBase() {}
+};
+#endif // QT_NO_OPENGL
+
+#ifndef QT_NO_OPENGL
 Q_DECLARE_OPERATORS_FOR_FLAGS(QPlatformBackingStore::TextureFlags)
 #endif
 
diff --git a/src/gui/painting/qpolygon.cpp b/src/gui/painting/qpolygon.cpp
index 4fe819cae0..e9a8793bd0 100644
--- a/src/gui/painting/qpolygon.cpp
+++ b/src/gui/painting/qpolygon.cpp
@@ -899,7 +899,7 @@ QPolygon QPolygon::united(const QPolygon &r) const
     QPainterPath subject; subject.addPolygon(*this);
     QPainterPath clip; clip.addPolygon(r);
 
-    return subject.united(clip).toFillPolygon(QTransform()).toPolygon();
+    return subject.united(clip).toFillPolygon().toPolygon();
 }
 
 /*!
@@ -918,7 +918,7 @@ QPolygon QPolygon::intersected(const QPolygon &r) const
     QPainterPath subject; subject.addPolygon(*this);
     QPainterPath clip; clip.addPolygon(r);
 
-    return subject.intersected(clip).toFillPolygon(QTransform()).toPolygon();
+    return subject.intersected(clip).toFillPolygon().toPolygon();
 }
 
 /*!
@@ -936,7 +936,7 @@ QPolygon QPolygon::subtracted(const QPolygon &r) const
     QPainterPath subject; subject.addPolygon(*this);
     QPainterPath clip; clip.addPolygon(r);
 
-    return subject.subtracted(clip).toFillPolygon(QTransform()).toPolygon();
+    return subject.subtracted(clip).toFillPolygon().toPolygon();
 }
 
 /*!
@@ -975,7 +975,7 @@ QPolygonF QPolygonF::united(const QPolygonF &r) const
     QPainterPath subject; subject.addPolygon(*this);
     QPainterPath clip; clip.addPolygon(r);
 
-    return subject.united(clip).toFillPolygon(QTransform());
+    return subject.united(clip).toFillPolygon();
 }
 
 /*!
@@ -994,7 +994,7 @@ QPolygonF QPolygonF::intersected(const QPolygonF &r) const
     QPainterPath subject; subject.addPolygon(*this);
     QPainterPath clip; clip.addPolygon(r);
 
-    return subject.intersected(clip).toFillPolygon(QTransform());
+    return subject.intersected(clip).toFillPolygon();
 }
 
 /*!
@@ -1011,7 +1011,7 @@ QPolygonF QPolygonF::subtracted(const QPolygonF &r) const
 {
     QPainterPath subject; subject.addPolygon(*this);
     QPainterPath clip; clip.addPolygon(r);
-    return subject.subtracted(clip).toFillPolygon(QTransform());
+    return subject.subtracted(clip).toFillPolygon();
 }
 
 /*!
diff --git a/src/gui/painting/qpolygon.h b/src/gui/painting/qpolygon.h
index 93fab55aa1..584965af3b 100644
--- a/src/gui/painting/qpolygon.h
+++ b/src/gui/painting/qpolygon.h
@@ -47,8 +47,6 @@
 
 QT_BEGIN_NAMESPACE
 
-
-class QMatrix;
 class QTransform;
 class QRect;
 class QVariant;
diff --git a/src/gui/painting/qregion.cpp b/src/gui/painting/qregion.cpp
index bac042c784..6409ab9528 100644
--- a/src/gui/painting/qregion.cpp
+++ b/src/gui/painting/qregion.cpp
@@ -3917,7 +3917,7 @@ QRegion::QRegion(const QRect &r, RegionType t)
         } else if (t == Ellipse) {
             QPainterPath path;
             path.addEllipse(r.x(), r.y(), r.width(), r.height());
-            QPolygon a = path.toSubpathPolygons(QTransform()).at(0).toPolygon();
+            QPolygon a = path.toSubpathPolygons().at(0).toPolygon();
             d->qt_rgn = PolygonRegion(a.constData(), a.size(), EvenOddRule);
         }
     }
diff --git a/src/gui/painting/qtextureglyphcache.cpp b/src/gui/painting/qtextureglyphcache.cpp
index 91214f27ca..e906397520 100644
--- a/src/gui/painting/qtextureglyphcache.cpp
+++ b/src/gui/painting/qtextureglyphcache.cpp
@@ -350,7 +350,7 @@ void QImageTextureGlyphCache::fillTexture(const Coord &c, glyph_t g, QFixed subP
         int mw = qMin(mask.width(), c.w);
         int mh = qMin(mask.height(), c.h);
         uchar *d = m_image.bits();
-        int dbpl = m_image.bytesPerLine();
+        qsizetype dbpl = m_image.bytesPerLine();
 
         for (int y = 0; y < c.h; ++y) {
             uchar *dest = d + (c.y + y) *dbpl + c.x/8;
@@ -372,7 +372,7 @@ void QImageTextureGlyphCache::fillTexture(const Coord &c, glyph_t g, QFixed subP
         int mw = qMin(mask.width(), c.w);
         int mh = qMin(mask.height(), c.h);
         uchar *d = m_image.bits();
-        int dbpl = m_image.bytesPerLine();
+        qsizetype dbpl = m_image.bytesPerLine();
 
         if (mask.depth() == 1) {
             for (int y = 0; y < c.h; ++y) {
diff --git a/src/gui/painting/qtransform.cpp b/src/gui/painting/qtransform.cpp
index 9d8bb0c3e2..4adc2b075e 100644
--- a/src/gui/painting/qtransform.cpp
+++ b/src/gui/painting/qtransform.cpp
@@ -41,7 +41,6 @@
 #include "qdatastream.h"
 #include "qdebug.h"
 #include "qhashfunctions.h"
-#include "qmatrix.h"
 #include "qregion.h"
 #include "qpainterpath.h"
 #include "qpainterpath_p.h"
@@ -76,20 +75,20 @@ static void nanWarning(const char *func)
             ny = FY_;   \
             break;    \
         case TxTranslate:    \
-            nx = FX_ + affine._dx;                \
-            ny = FY_ + affine._dy;                \
+            nx = FX_ + m_matrix[2][0];                \
+            ny = FY_ + m_matrix[2][1];                \
             break;                              \
         case TxScale:                           \
-            nx = affine._m11 * FX_ + affine._dx;  \
-            ny = affine._m22 * FY_ + affine._dy;  \
+            nx = m_matrix[0][0] * FX_ + m_matrix[2][0];  \
+            ny = m_matrix[1][1] * FY_ + m_matrix[2][1];  \
             break;                              \
         case TxRotate:                          \
         case TxShear:                           \
         case TxProject:                                      \
-            nx = affine._m11 * FX_ + affine._m21 * FY_ + affine._dx;        \
-            ny = affine._m12 * FX_ + affine._m22 * FY_ + affine._dy;        \
+            nx = m_matrix[0][0] * FX_ + m_matrix[1][0] * FY_ + m_matrix[2][0];        \
+            ny = m_matrix[0][1] * FX_ + m_matrix[1][1] * FY_ + m_matrix[2][1];        \
             if (t == TxProject) {                                       \
-                qreal w = (m_13 * FX_ + m_23 * FY_ + m_33);              \
+                qreal w = (m_matrix[0][2] * FX_ + m_matrix[1][2] * FY_ + m_matrix[2][2]);              \
                 if (w < qreal(Q_NEAR_CLIP)) w = qreal(Q_NEAR_CLIP);     \
                 w = 1./w;                                               \
                 nx *= w;                                                \
@@ -109,14 +108,6 @@ static void nanWarning(const char *func)
     or project the coordinate system, and is typically used when
     rendering graphics.
 
-    QTransform differs from QMatrix in that it is a true 3x3 matrix,
-    allowing perspective transformations. QTransform's toAffine()
-    method allows casting QTransform to QMatrix. If a perspective
-    transformation has been specified on the matrix, then the
-    conversion will cause loss of data.
-
-    QTransform is the recommended transformation class in Qt.
-
     A QTransform object can be built using the setMatrix(), scale(),
     rotate(), translate() and shear() functions.  Alternatively, it
     can be built by applying \l {QTransform#Basic Matrix
@@ -261,8 +252,7 @@ static void nanWarning(const char *func)
     \sa reset()
 */
 QTransform::QTransform()
-    : affine(true)
-    , m_13(0), m_23(0), m_33(1)
+    : m_matrix{ {1, 0, 0}, {0, 1, 0}, {0, 0, 1} }
     , m_type(TxNone)
     , m_dirty(TxNone)
 #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
@@ -282,8 +272,7 @@ QTransform::QTransform()
 QTransform::QTransform(qreal h11, qreal h12, qreal h13,
                        qreal h21, qreal h22, qreal h23,
                        qreal h31, qreal h32, qreal h33)
-    : affine(h11, h12, h21, h22, h31, h32, true)
-    , m_13(h13), m_23(h23), m_33(h33)
+    : m_matrix{ {h11, h12, h13}, {h21, h22, h23}, {h31, h32, h33} }
     , m_type(TxNone)
     , m_dirty(TxProject)
 #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
@@ -301,8 +290,7 @@ QTransform::QTransform(qreal h11, qreal h12, qreal h13,
 */
 QTransform::QTransform(qreal h11, qreal h12, qreal h21,
                        qreal h22, qreal dx, qreal dy)
-    : affine(h11, h12, h21, h22, dx, dy, true)
-    , m_13(0), m_23(0), m_33(1)
+    : m_matrix{ {h11, h12, 0}, {h21, h22, 0}, {dx, dy, 1} }
     , m_type(TxNone)
     , m_dirty(TxShear)
 #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
@@ -311,44 +299,23 @@ QTransform::QTransform(qreal h11, qreal h12, qreal h21,
 {
 }
 
-#if QT_DEPRECATED_SINCE(5, 15)
-/*!
-    \fn QTransform::QTransform(const QMatrix &matrix)
-    \obsolete
-
-    Constructs a matrix that is a copy of the given \a matrix.
-    Note that the \c m13, \c m23, and \c m33 elements are set to 0, 0,
-    and 1 respectively.
- */
-QTransform::QTransform(const QMatrix &mtx)
-    : affine(mtx._m11, mtx._m12, mtx._m21, mtx._m22, mtx._dx, mtx._dy, true),
-      m_13(0), m_23(0), m_33(1)
-    , m_type(TxNone)
-    , m_dirty(TxShear)
-#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
-    , d(nullptr)
-#endif
-{
-}
-#endif // QT_DEPRECATED_SINCE(5, 15)
-
 /*!
     Returns the adjoint of this matrix.
 */
 QTransform QTransform::adjoint() const
 {
     qreal h11, h12, h13,
-        h21, h22, h23,
-        h31, h32, h33;
-    h11 = affine._m22*m_33 - m_23*affine._dy;
-    h21 = m_23*affine._dx - affine._m21*m_33;
-    h31 = affine._m21*affine._dy - affine._m22*affine._dx;
-    h12 = m_13*affine._dy - affine._m12*m_33;
-    h22 = affine._m11*m_33 - m_13*affine._dx;
-    h32 = affine._m12*affine._dx - affine._m11*affine._dy;
-    h13 = affine._m12*m_23 - m_13*affine._m22;
-    h23 = m_13*affine._m21 - affine._m11*m_23;
-    h33 = affine._m11*affine._m22 - affine._m12*affine._m21;
+          h21, h22, h23,
+          h31, h32, h33;
+    h11 = m_matrix[1][1] * m_matrix[2][2] - m_matrix[1][2] * m_matrix[2][1];
+    h21 = m_matrix[1][2] * m_matrix[2][0] - m_matrix[1][0] * m_matrix[2][2];
+    h31 = m_matrix[1][0] * m_matrix[2][1] - m_matrix[1][1] * m_matrix[2][0];
+    h12 = m_matrix[0][2] * m_matrix[2][1] - m_matrix[0][1] * m_matrix[2][2];
+    h22 = m_matrix[0][0] * m_matrix[2][2] - m_matrix[0][2] * m_matrix[2][0];
+    h32 = m_matrix[0][1] * m_matrix[2][0] - m_matrix[0][0] * m_matrix[2][1];
+    h13 = m_matrix[0][1] * m_matrix[1][2] - m_matrix[0][2] * m_matrix[1][1];
+    h23 = m_matrix[0][2] * m_matrix[1][0] - m_matrix[0][0] * m_matrix[1][2];
+    h33 = m_matrix[0][0] * m_matrix[1][1] - m_matrix[0][1] * m_matrix[1][0];
 
     return QTransform(h11, h12, h13,
                       h21, h22, h23,
@@ -360,9 +327,9 @@ QTransform QTransform::adjoint() const
 */
 QTransform QTransform::transposed() const
 {
-    QTransform t(affine._m11, affine._m21, affine._dx,
-                 affine._m12, affine._m22, affine._dy,
-                 m_13, m_23, m_33, true);
+    QTransform t(m_matrix[0][0], m_matrix[1][0], m_matrix[2][0],
+                 m_matrix[0][1], m_matrix[1][1], m_matrix[2][1],
+                 m_matrix[0][2], m_matrix[1][2], m_matrix[2][2], true);
     return t;
 }
 
@@ -385,23 +352,23 @@ QTransform QTransform::inverted(bool *invertible) const
     case TxNone:
         break;
     case TxTranslate:
-        invert.affine._dx = -affine._dx;
-        invert.affine._dy = -affine._dy;
+        invert.m_matrix[2][0] = -m_matrix[2][0];
+        invert.m_matrix[2][1] = -m_matrix[2][1];
         break;
     case TxScale:
-        inv = !qFuzzyIsNull(affine._m11);
-        inv &= !qFuzzyIsNull(affine._m22);
+        inv = !qFuzzyIsNull(m_matrix[0][0]);
+        inv &= !qFuzzyIsNull(m_matrix[1][1]);
         if (inv) {
-            invert.affine._m11 = 1. / affine._m11;
-            invert.affine._m22 = 1. / affine._m22;
-            invert.affine._dx = -affine._dx * invert.affine._m11;
-            invert.affine._dy = -affine._dy * invert.affine._m22;
+            invert.m_matrix[0][0] = 1. / m_matrix[0][0];
+            invert.m_matrix[1][1] = 1. / m_matrix[1][1];
+            invert.m_matrix[2][0] = -m_matrix[2][0] * invert.m_matrix[0][0];
+            invert.m_matrix[2][1] = -m_matrix[2][1] * invert.m_matrix[1][1];
         }
         break;
-    case TxRotate:
-    case TxShear:
-        invert.affine = affine.inverted(&inv);
-        break;
+//    case TxRotate:
+//    case TxShear:
+//        invert.affine = affine.inverted(&inv);
+//        break;
     default:
         // general case
         qreal det = determinant();
@@ -442,24 +409,24 @@ QTransform &QTransform::translate(qreal dx, qreal dy)
 
     switch(inline_type()) {
     case TxNone:
-        affine._dx = dx;
-        affine._dy = dy;
+        m_matrix[2][0] = dx;
+        m_matrix[2][1] = dy;
         break;
     case TxTranslate:
-        affine._dx += dx;
-        affine._dy += dy;
+        m_matrix[2][0] += dx;
+        m_matrix[2][1] += dy;
         break;
     case TxScale:
-        affine._dx += dx*affine._m11;
-        affine._dy += dy*affine._m22;
+        m_matrix[2][0] += dx * m_matrix[0][0];
+        m_matrix[2][1] += dy * m_matrix[1][1];
         break;
     case TxProject:
-        m_33 += dx*m_13 + dy*m_23;
+        m_matrix[2][2] += dx * m_matrix[0][2] + dy * m_matrix[1][2];
         Q_FALLTHROUGH();
     case TxShear:
     case TxRotate:
-        affine._dx += dx*affine._m11 + dy*affine._m21;
-        affine._dy += dy*affine._m22 + dx*affine._m12;
+        m_matrix[2][0] += dx * m_matrix[0][0] + dy * m_matrix[1][0];
+        m_matrix[2][1] += dy * m_matrix[1][1] + dx * m_matrix[0][1];
         break;
     }
     if (m_dirty < TxTranslate)
@@ -511,21 +478,21 @@ QTransform & QTransform::scale(qreal sx, qreal sy)
     switch(inline_type()) {
     case TxNone:
     case TxTranslate:
-        affine._m11 = sx;
-        affine._m22 = sy;
+        m_matrix[0][0] = sx;
+        m_matrix[1][1] = sy;
         break;
     case TxProject:
-        m_13 *= sx;
-        m_23 *= sy;
+        m_matrix[0][2] *= sx;
+        m_matrix[1][2] *= sy;
         Q_FALLTHROUGH();
     case TxRotate:
     case TxShear:
-        affine._m12 *= sx;
-        affine._m21 *= sy;
+        m_matrix[0][1] *= sx;
+        m_matrix[1][0] *= sy;
         Q_FALLTHROUGH();
     case TxScale:
-        affine._m11 *= sx;
-        affine._m22 *= sy;
+        m_matrix[0][0] *= sx;
+        m_matrix[1][1] *= sy;
         break;
     }
     if (m_dirty < TxScale)
@@ -577,28 +544,30 @@ QTransform & QTransform::shear(qreal sh, qreal sv)
     switch(inline_type()) {
     case TxNone:
     case TxTranslate:
-        affine._m12 = sv;
-        affine._m21 = sh;
+        m_matrix[0][1] = sv;
+        m_matrix[1][0] = sh;
         break;
     case TxScale:
-        affine._m12 = sv*affine._m22;
-        affine._m21 = sh*affine._m11;
+        m_matrix[0][1] = sv*m_matrix[1][1];
+        m_matrix[1][0] = sh*m_matrix[0][0];
         break;
     case TxProject: {
-        qreal tm13 = sv*m_23;
-        qreal tm23 = sh*m_13;
-        m_13 += tm13;
-        m_23 += tm23;
+        qreal tm13 = sv * m_matrix[1][2];
+        qreal tm23 = sh * m_matrix[0][2];
+        m_matrix[0][2] += tm13;
+        m_matrix[1][2] += tm23;
     }
         Q_FALLTHROUGH();
     case TxRotate:
     case TxShear: {
-        qreal tm11 = sv*affine._m21;
-        qreal tm22 = sh*affine._m12;
-        qreal tm12 = sv*affine._m22;
-        qreal tm21 = sh*affine._m11;
-        affine._m11 += tm11; affine._m12 += tm12;
-        affine._m21 += tm21; affine._m22 += tm22;
+        qreal tm11 = sv * m_matrix[1][0];
+        qreal tm22 = sh * m_matrix[0][1];
+        qreal tm12 = sv * m_matrix[1][1];
+        qreal tm21 = sh * m_matrix[0][0];
+        m_matrix[0][0] += tm11;
+        m_matrix[0][1] += tm12;
+        m_matrix[1][0] += tm21;
+        m_matrix[1][1] += tm22;
         break;
     }
     }
@@ -653,35 +622,39 @@ QTransform & QTransform::rotate(qreal a, Qt::Axis axis)
         switch(inline_type()) {
         case TxNone:
         case TxTranslate:
-            affine._m11 = cosa;
-            affine._m12 = sina;
-            affine._m21 = -sina;
-            affine._m22 = cosa;
+            m_matrix[0][0] = cosa;
+            m_matrix[0][1] = sina;
+            m_matrix[1][0] = -sina;
+            m_matrix[1][1] = cosa;
             break;
         case TxScale: {
-            qreal tm11 = cosa*affine._m11;
-            qreal tm12 = sina*affine._m22;
-            qreal tm21 = -sina*affine._m11;
-            qreal tm22 = cosa*affine._m22;
-            affine._m11 = tm11; affine._m12 = tm12;
-            affine._m21 = tm21; affine._m22 = tm22;
+            qreal tm11 = cosa * m_matrix[0][0];
+            qreal tm12 = sina * m_matrix[1][1];
+            qreal tm21 = -sina * m_matrix[0][0];
+            qreal tm22 = cosa * m_matrix[1][1];
+            m_matrix[0][0] = tm11;
+            m_matrix[0][1] = tm12;
+            m_matrix[1][0] = tm21;
+            m_matrix[1][1] = tm22;
             break;
         }
         case TxProject: {
-            qreal tm13 = cosa*m_13 + sina*m_23;
-            qreal tm23 = -sina*m_13 + cosa*m_23;
-            m_13 = tm13;
-            m_23 = tm23;
+            qreal tm13 = cosa * m_matrix[0][2] + sina * m_matrix[1][2];
+            qreal tm23 = -sina * m_matrix[0][2] + cosa * m_matrix[1][2];
+            m_matrix[0][2] = tm13;
+            m_matrix[1][2] = tm23;
             Q_FALLTHROUGH();
         }
         case TxRotate:
         case TxShear: {
-            qreal tm11 = cosa*affine._m11 + sina*affine._m21;
-            qreal tm12 = cosa*affine._m12 + sina*affine._m22;
-            qreal tm21 = -sina*affine._m11 + cosa*affine._m21;
-            qreal tm22 = -sina*affine._m12 + cosa*affine._m22;
-            affine._m11 = tm11; affine._m12 = tm12;
-            affine._m21 = tm21; affine._m22 = tm22;
+            qreal tm11 = cosa * m_matrix[0][0] + sina * m_matrix[1][0];
+            qreal tm12 = cosa * m_matrix[0][1] + sina * m_matrix[1][1];
+            qreal tm21 = -sina * m_matrix[0][0] + cosa * m_matrix[1][0];
+            qreal tm22 = -sina * m_matrix[0][1] + cosa * m_matrix[1][1];
+            m_matrix[0][0] = tm11;
+            m_matrix[0][1] = tm12;
+            m_matrix[1][0] = tm21;
+            m_matrix[1][1] = tm22;
             break;
         }
         }
@@ -690,11 +663,11 @@ QTransform & QTransform::rotate(qreal a, Qt::Axis axis)
     } else {
         QTransform result;
         if (axis == Qt::YAxis) {
-            result.affine._m11 = cosa;
-            result.m_13 = -sina * inv_dist_to_plane;
+            result.m_matrix[0][0] = cosa;
+            result.m_matrix[0][2] = -sina * inv_dist_to_plane;
         } else {
-            result.affine._m22 = cosa;
-            result.m_23 = -sina * inv_dist_to_plane;
+            result.m_matrix[1][1] = cosa;
+            result.m_matrix[1][2] = -sina * inv_dist_to_plane;
         }
         result.m_type = TxProject;
         *this = result * *this;
@@ -732,35 +705,39 @@ QTransform & QTransform::rotateRadians(qreal a, Qt::Axis axis)
         switch(inline_type()) {
         case TxNone:
         case TxTranslate:
-            affine._m11 = cosa;
-            affine._m12 = sina;
-            affine._m21 = -sina;
-            affine._m22 = cosa;
+            m_matrix[0][0] = cosa;
+            m_matrix[0][1] = sina;
+            m_matrix[1][0] = -sina;
+            m_matrix[1][1] = cosa;
             break;
         case TxScale: {
-            qreal tm11 = cosa*affine._m11;
-            qreal tm12 = sina*affine._m22;
-            qreal tm21 = -sina*affine._m11;
-            qreal tm22 = cosa*affine._m22;
-            affine._m11 = tm11; affine._m12 = tm12;
-            affine._m21 = tm21; affine._m22 = tm22;
+            qreal tm11 = cosa * m_matrix[0][0];
+            qreal tm12 = sina * m_matrix[1][1];
+            qreal tm21 = -sina * m_matrix[0][0];
+            qreal tm22 = cosa * m_matrix[1][1];
+            m_matrix[0][0] = tm11;
+            m_matrix[0][1] = tm12;
+            m_matrix[1][0] = tm21;
+            m_matrix[1][1] = tm22;
             break;
         }
         case TxProject: {
-            qreal tm13 = cosa*m_13 + sina*m_23;
-            qreal tm23 = -sina*m_13 + cosa*m_23;
-            m_13 = tm13;
-            m_23 = tm23;
+            qreal tm13 = cosa * m_matrix[0][2] + sina * m_matrix[1][2];
+            qreal tm23 = -sina * m_matrix[0][2] + cosa * m_matrix[1][2];
+            m_matrix[0][2] = tm13;
+            m_matrix[1][2] = tm23;
             Q_FALLTHROUGH();
         }
         case TxRotate:
         case TxShear: {
-            qreal tm11 = cosa*affine._m11 + sina*affine._m21;
-            qreal tm12 = cosa*affine._m12 + sina*affine._m22;
-            qreal tm21 = -sina*affine._m11 + cosa*affine._m21;
-            qreal tm22 = -sina*affine._m12 + cosa*affine._m22;
-            affine._m11 = tm11; affine._m12 = tm12;
-            affine._m21 = tm21; affine._m22 = tm22;
+            qreal tm11 = cosa * m_matrix[0][0] + sina * m_matrix[1][0];
+            qreal tm12 = cosa * m_matrix[0][1] + sina * m_matrix[1][1];
+            qreal tm21 = -sina * m_matrix[0][0] + cosa * m_matrix[1][0];
+            qreal tm22 = -sina * m_matrix[0][1] + cosa * m_matrix[1][1];
+            m_matrix[0][0] = tm11;
+            m_matrix[0][1] = tm12;
+            m_matrix[1][0] = tm21;
+            m_matrix[1][1] = tm22;
             break;
         }
         }
@@ -769,11 +746,11 @@ QTransform & QTransform::rotateRadians(qreal a, Qt::Axis axis)
     } else {
         QTransform result;
         if (axis == Qt::YAxis) {
-            result.affine._m11 = cosa;
-            result.m_13 = -sina * inv_dist_to_plane;
+            result.m_matrix[0][0] = cosa;
+            result.m_matrix[0][2] = -sina * inv_dist_to_plane;
         } else {
-            result.affine._m22 = cosa;
-            result.m_23 = -sina * inv_dist_to_plane;
+            result.m_matrix[1][1] = cosa;
+            result.m_matrix[1][2] = -sina * inv_dist_to_plane;
         }
         result.m_type = TxProject;
         *this = result * *this;
@@ -788,15 +765,15 @@ QTransform & QTransform::rotateRadians(qreal a, Qt::Axis axis)
 */
 bool QTransform::operator==(const QTransform &o) const
 {
-    return affine._m11 == o.affine._m11 &&
-           affine._m12 == o.affine._m12 &&
-           affine._m21 == o.affine._m21 &&
-           affine._m22 == o.affine._m22 &&
-           affine._dx == o.affine._dx &&
-           affine._dy == o.affine._dy &&
-           m_13 == o.m_13 &&
-           m_23 == o.m_23 &&
-           m_33 == o.m_33;
+    return m_matrix[0][0] == o.m_matrix[0][0] &&
+           m_matrix[0][1] == o.m_matrix[0][1] &&
+           m_matrix[1][0] == o.m_matrix[1][0] &&
+           m_matrix[1][1] == o.m_matrix[1][1] &&
+           m_matrix[2][0] == o.m_matrix[2][0] &&
+           m_matrix[2][1] == o.m_matrix[2][1] &&
+           m_matrix[0][2] == o.m_matrix[0][2] &&
+           m_matrix[1][2] == o.m_matrix[1][2] &&
+           m_matrix[2][2] == o.m_matrix[2][2];
 }
 
 /*!
@@ -854,56 +831,59 @@ QTransform & QTransform::operator*=(const QTransform &o)
     case TxNone:
         break;
     case TxTranslate:
-        affine._dx += o.affine._dx;
-        affine._dy += o.affine._dy;
+        m_matrix[2][0] += o.m_matrix[2][0];
+        m_matrix[2][1] += o.m_matrix[2][1];
         break;
     case TxScale:
     {
-        qreal m11 = affine._m11*o.affine._m11;
-        qreal m22 = affine._m22*o.affine._m22;
+        qreal m11 = m_matrix[0][0] * o.m_matrix[0][0];
+        qreal m22 = m_matrix[1][1] * o.m_matrix[1][1];
 
-        qreal m31 = affine._dx*o.affine._m11 + o.affine._dx;
-        qreal m32 = affine._dy*o.affine._m22 + o.affine._dy;
+        qreal m31 = m_matrix[2][0] * o.m_matrix[0][0] + o.m_matrix[2][0];
+        qreal m32 = m_matrix[2][1] * o.m_matrix[1][1] + o.m_matrix[2][1];
 
-        affine._m11 = m11;
-        affine._m22 = m22;
-        affine._dx = m31; affine._dy = m32;
+        m_matrix[0][0] = m11;
+        m_matrix[1][1] = m22;
+        m_matrix[2][0] = m31; m_matrix[2][1] = m32;
         break;
     }
     case TxRotate:
     case TxShear:
     {
-        qreal m11 = affine._m11*o.affine._m11 + affine._m12*o.affine._m21;
-        qreal m12 = affine._m11*o.affine._m12 + affine._m12*o.affine._m22;
+        qreal m11 = m_matrix[0][0] * o.m_matrix[0][0] + m_matrix[0][1] * o.m_matrix[1][0];
+        qreal m12 = m_matrix[0][0] * o.m_matrix[0][1] + m_matrix[0][1] * o.m_matrix[1][1];
 
-        qreal m21 = affine._m21*o.affine._m11 + affine._m22*o.affine._m21;
-        qreal m22 = affine._m21*o.affine._m12 + affine._m22*o.affine._m22;
+        qreal m21 = m_matrix[1][0] * o.m_matrix[0][0] + m_matrix[1][1] * o.m_matrix[1][0];
+        qreal m22 = m_matrix[1][0] * o.m_matrix[0][1] + m_matrix[1][1] * o.m_matrix[1][1];
 
-        qreal m31 = affine._dx*o.affine._m11 + affine._dy*o.affine._m21 + o.affine._dx;
-        qreal m32 = affine._dx*o.affine._m12 + affine._dy*o.affine._m22 + o.affine._dy;
+        qreal m31 = m_matrix[2][0] * o.m_matrix[0][0] + m_matrix[2][1] * o.m_matrix[1][0] + o.m_matrix[2][0];
+        qreal m32 = m_matrix[2][0] * o.m_matrix[0][1] + m_matrix[2][1] * o.m_matrix[1][1] + o.m_matrix[2][1];
 
-        affine._m11 = m11; affine._m12 = m12;
-        affine._m21 = m21; affine._m22 = m22;
-        affine._dx = m31; affine._dy = m32;
+        m_matrix[0][0] = m11;
+        m_matrix[0][1] = m12;
+        m_matrix[1][0] = m21;
+        m_matrix[1][1] = m22;
+        m_matrix[2][0] = m31;
+        m_matrix[2][1] = m32;
         break;
     }
     case TxProject:
     {
-        qreal m11 = affine._m11*o.affine._m11 + affine._m12*o.affine._m21 + m_13*o.affine._dx;
-        qreal m12 = affine._m11*o.affine._m12 + affine._m12*o.affine._m22 + m_13*o.affine._dy;
-        qreal m13 = affine._m11*o.m_13 + affine._m12*o.m_23 + m_13*o.m_33;
+        qreal m11 = m_matrix[0][0] * o.m_matrix[0][0] + m_matrix[0][1] * o.m_matrix[1][0] + m_matrix[0][2] * o.m_matrix[2][0];
+        qreal m12 = m_matrix[0][0] * o.m_matrix[0][1] + m_matrix[0][1] * o.m_matrix[1][1] + m_matrix[0][2] * o.m_matrix[2][1];
+        qreal m13 = m_matrix[0][0] * o.m_matrix[0][2] + m_matrix[0][1] * o.m_matrix[1][2] + m_matrix[0][2] * o.m_matrix[2][2];
 
-        qreal m21 = affine._m21*o.affine._m11 + affine._m22*o.affine._m21 + m_23*o.affine._dx;
-        qreal m22 = affine._m21*o.affine._m12 + affine._m22*o.affine._m22 + m_23*o.affine._dy;
-        qreal m23 = affine._m21*o.m_13 + affine._m22*o.m_23 + m_23*o.m_33;
+        qreal m21 = m_matrix[1][0] * o.m_matrix[0][0] + m_matrix[1][1] * o.m_matrix[1][0] + m_matrix[1][2] * o.m_matrix[2][0];
+        qreal m22 = m_matrix[1][0] * o.m_matrix[0][1] + m_matrix[1][1] * o.m_matrix[1][1] + m_matrix[1][2] * o.m_matrix[2][1];
+        qreal m23 = m_matrix[1][0] * o.m_matrix[0][2] + m_matrix[1][1] * o.m_matrix[1][2] + m_matrix[1][2] * o.m_matrix[2][2];
 
-        qreal m31 = affine._dx*o.affine._m11 + affine._dy*o.affine._m21 + m_33*o.affine._dx;
-        qreal m32 = affine._dx*o.affine._m12 + affine._dy*o.affine._m22 + m_33*o.affine._dy;
-        qreal m33 = affine._dx*o.m_13 + affine._dy*o.m_23 + m_33*o.m_33;
+        qreal m31 = m_matrix[2][0] * o.m_matrix[0][0] + m_matrix[2][1] * o.m_matrix[1][0] + m_matrix[2][2] * o.m_matrix[2][0];
+        qreal m32 = m_matrix[2][0] * o.m_matrix[0][1] + m_matrix[2][1] * o.m_matrix[1][1] + m_matrix[2][2] * o.m_matrix[2][1];
+        qreal m33 = m_matrix[2][0] * o.m_matrix[0][2] + m_matrix[2][1] * o.m_matrix[1][2] + m_matrix[2][2] * o.m_matrix[2][2];
 
-        affine._m11 = m11; affine._m12 = m12; m_13 = m13;
-        affine._m21 = m21; affine._m22 = m22; m_23 = m23;
-        affine._dx = m31; affine._dy = m32; m_33 = m33;
+        m_matrix[0][0] = m11; m_matrix[0][1] = m12; m_matrix[0][2] = m13;
+        m_matrix[1][0] = m21; m_matrix[1][1] = m22; m_matrix[1][2] = m23;
+        m_matrix[2][0] = m31; m_matrix[2][1] = m32; m_matrix[2][2] = m33;
     }
     }
 
@@ -937,56 +917,57 @@ QTransform QTransform::operator*(const QTransform &m) const
     case TxNone:
         break;
     case TxTranslate:
-        t.affine._dx = affine._dx + m.affine._dx;
-        t.affine._dy += affine._dy + m.affine._dy;
+        t.m_matrix[2][0] = m_matrix[2][0] + m.m_matrix[2][0];
+        t.m_matrix[2][1] = m_matrix[2][1] + m.m_matrix[2][1];
         break;
     case TxScale:
     {
-        qreal m11 = affine._m11*m.affine._m11;
-        qreal m22 = affine._m22*m.affine._m22;
+        qreal m11 = m_matrix[0][0] * m.m_matrix[0][0];
+        qreal m22 = m_matrix[1][1] * m.m_matrix[1][1];
 
-        qreal m31 = affine._dx*m.affine._m11 + m.affine._dx;
-        qreal m32 = affine._dy*m.affine._m22 + m.affine._dy;
+        qreal m31 = m_matrix[2][0] * m.m_matrix[0][0] + m.m_matrix[2][0];
+        qreal m32 = m_matrix[2][1] * m.m_matrix[1][1] + m.m_matrix[2][1];
 
-        t.affine._m11 = m11;
-        t.affine._m22 = m22;
-        t.affine._dx = m31; t.affine._dy = m32;
+        t.m_matrix[0][0] = m11;
+        t.m_matrix[1][1] = m22;
+        t.m_matrix[2][0] = m31;
+        t.m_matrix[2][1] = m32;
         break;
     }
     case TxRotate:
     case TxShear:
     {
-        qreal m11 = affine._m11*m.affine._m11 + affine._m12*m.affine._m21;
-        qreal m12 = affine._m11*m.affine._m12 + affine._m12*m.affine._m22;
+        qreal m11 = m_matrix[0][0] * m.m_matrix[0][0] + m_matrix[0][1] * m.m_matrix[1][0];
+        qreal m12 = m_matrix[0][0] * m.m_matrix[0][1] + m_matrix[0][1] * m.m_matrix[1][1];
 
-        qreal m21 = affine._m21*m.affine._m11 + affine._m22*m.affine._m21;
-        qreal m22 = affine._m21*m.affine._m12 + affine._m22*m.affine._m22;
+        qreal m21 = m_matrix[1][0] * m.m_matrix[0][0] + m_matrix[1][1] * m.m_matrix[1][0];
+        qreal m22 = m_matrix[1][0] * m.m_matrix[0][1] + m_matrix[1][1] * m.m_matrix[1][1];
 
-        qreal m31 = affine._dx*m.affine._m11 + affine._dy*m.affine._m21 + m.affine._dx;
-        qreal m32 = affine._dx*m.affine._m12 + affine._dy*m.affine._m22 + m.affine._dy;
+        qreal m31 = m_matrix[2][0] * m.m_matrix[0][0] + m_matrix[2][1] * m.m_matrix[1][0] + m.m_matrix[2][0];
+        qreal m32 = m_matrix[2][0] * m.m_matrix[0][1] + m_matrix[2][1] * m.m_matrix[1][1] + m.m_matrix[2][1];
 
-        t.affine._m11 = m11; t.affine._m12 = m12;
-        t.affine._m21 = m21; t.affine._m22 = m22;
-        t.affine._dx = m31; t.affine._dy = m32;
+        t.m_matrix[0][0] = m11; t.m_matrix[0][1] = m12;
+        t.m_matrix[1][0] = m21; t.m_matrix[1][1] = m22;
+        t.m_matrix[2][0] = m31; t.m_matrix[2][1] = m32;
         break;
     }
     case TxProject:
     {
-        qreal m11 = affine._m11*m.affine._m11 + affine._m12*m.affine._m21 + m_13*m.affine._dx;
-        qreal m12 = affine._m11*m.affine._m12 + affine._m12*m.affine._m22 + m_13*m.affine._dy;
-        qreal m13 = affine._m11*m.m_13 + affine._m12*m.m_23 + m_13*m.m_33;
+        qreal m11 = m_matrix[0][0] * m.m_matrix[0][0] + m_matrix[0][1] * m.m_matrix[1][0] + m_matrix[0][2] * m.m_matrix[2][0];
+        qreal m12 = m_matrix[0][0] * m.m_matrix[0][1] + m_matrix[0][1] * m.m_matrix[1][1] + m_matrix[0][2] * m.m_matrix[2][1];
+        qreal m13 = m_matrix[0][0] * m.m_matrix[0][2] + m_matrix[0][1] * m.m_matrix[1][2] + m_matrix[0][2] * m.m_matrix[2][2];
 
-        qreal m21 = affine._m21*m.affine._m11 + affine._m22*m.affine._m21 + m_23*m.affine._dx;
-        qreal m22 = affine._m21*m.affine._m12 + affine._m22*m.affine._m22 + m_23*m.affine._dy;
-        qreal m23 = affine._m21*m.m_13 + affine._m22*m.m_23 + m_23*m.m_33;
+        qreal m21 = m_matrix[1][0] * m.m_matrix[0][0] + m_matrix[1][1] * m.m_matrix[1][0] + m_matrix[1][2] * m.m_matrix[2][0];
+        qreal m22 = m_matrix[1][0] * m.m_matrix[0][1] + m_matrix[1][1] * m.m_matrix[1][1] + m_matrix[1][2] * m.m_matrix[2][1];
+        qreal m23 = m_matrix[1][0] * m.m_matrix[0][2] + m_matrix[1][1] * m.m_matrix[1][2] + m_matrix[1][2] * m.m_matrix[2][2];
 
-        qreal m31 = affine._dx*m.affine._m11 + affine._dy*m.affine._m21 + m_33*m.affine._dx;
-        qreal m32 = affine._dx*m.affine._m12 + affine._dy*m.affine._m22 + m_33*m.affine._dy;
-        qreal m33 = affine._dx*m.m_13 + affine._dy*m.m_23 + m_33*m.m_33;
+        qreal m31 = m_matrix[2][0] * m.m_matrix[0][0] + m_matrix[2][1] * m.m_matrix[1][0] + m_matrix[2][2] * m.m_matrix[2][0];
+        qreal m32 = m_matrix[2][0] * m.m_matrix[0][1] + m_matrix[2][1] * m.m_matrix[1][1] + m_matrix[2][2] * m.m_matrix[2][1];
+        qreal m33 = m_matrix[2][0] * m.m_matrix[0][2] + m_matrix[2][1] * m.m_matrix[1][2] + m_matrix[2][2] * m.m_matrix[2][2];
 
-        t.affine._m11 = m11; t.affine._m12 = m12; t.m_13 = m13;
-        t.affine._m21 = m21; t.affine._m22 = m22; t.m_23 = m23;
-        t.affine._dx = m31; t.affine._dy = m32; t.m_33 = m33;
+        t.m_matrix[0][0] = m11; t.m_matrix[0][1] = m12; t.m_matrix[0][2] = m13;
+        t.m_matrix[1][0] = m21; t.m_matrix[1][1] = m22; t.m_matrix[1][2] = m23;
+        t.m_matrix[2][0] = m31; t.m_matrix[2][1] = m32; t.m_matrix[2][2] = m33;
     }
     }
 
@@ -1034,15 +1015,15 @@ QTransform QTransform::operator*(const QTransform &m) const
 */
 QTransform & QTransform::operator=(const QTransform &matrix) noexcept
 {
-    affine._m11 = matrix.affine._m11;
-    affine._m12 = matrix.affine._m12;
-    affine._m21 = matrix.affine._m21;
-    affine._m22 = matrix.affine._m22;
-    affine._dx = matrix.affine._dx;
-    affine._dy = matrix.affine._dy;
-    m_13 = matrix.m_13;
-    m_23 = matrix.m_23;
-    m_33 = matrix.m_33;
+    m_matrix[0][0] = matrix.m_matrix[0][0];
+    m_matrix[0][1] = matrix.m_matrix[0][1];
+    m_matrix[1][0] = matrix.m_matrix[1][0];
+    m_matrix[1][1] = matrix.m_matrix[1][1];
+    m_matrix[2][0] = matrix.m_matrix[2][0];
+    m_matrix[2][1] = matrix.m_matrix[2][1];
+    m_matrix[0][2] = matrix.m_matrix[0][2];
+    m_matrix[1][2] = matrix.m_matrix[1][2];
+    m_matrix[2][2] = matrix.m_matrix[2][2];
     m_type = matrix.m_type;
     m_dirty = matrix.m_dirty;
 
@@ -1060,8 +1041,8 @@ QTransform & QTransform::operator=(const QTransform &matrix) noexcept
 */
 void QTransform::reset()
 {
-    affine._m11 = affine._m22 = m_33 = 1.0;
-    affine._m12 = m_13 = affine._m21 = m_23 = affine._dx = affine._dy = 0;
+    m_matrix[0][0] = m_matrix[1][1] = m_matrix[2][2] = 1.0;
+    m_matrix[0][1] = m_matrix[0][2] = m_matrix[1][0] = m_matrix[1][2] = m_matrix[2][0] = m_matrix[2][1] = 0;
     m_type = TxNone;
     m_dirty = TxNone;
 }
@@ -1179,20 +1160,20 @@ QPoint QTransform::map(const QPoint &p) const
         y = fy;
         break;
     case TxTranslate:
-        x = fx + affine._dx;
-        y = fy + affine._dy;
+        x = fx + m_matrix[2][0];
+        y = fy + m_matrix[2][1];
         break;
     case TxScale:
-        x = affine._m11 * fx + affine._dx;
-        y = affine._m22 * fy + affine._dy;
+        x = m_matrix[0][0] * fx + m_matrix[2][0];
+        y = m_matrix[1][1] * fy + m_matrix[2][1];
         break;
     case TxRotate:
     case TxShear:
     case TxProject:
-        x = affine._m11 * fx + affine._m21 * fy + affine._dx;
-        y = affine._m12 * fx + affine._m22 * fy + affine._dy;
+        x = m_matrix[0][0] * fx + m_matrix[1][0] * fy + m_matrix[2][0];
+        y = m_matrix[0][1] * fx + m_matrix[1][1] * fy + m_matrix[2][1];
         if (t == TxProject) {
-            qreal w = 1./(m_13 * fx + m_23 * fy + m_33);
+            qreal w = 1./(m_matrix[0][2] * fx + m_matrix[1][2] * fy + m_matrix[2][2]);
             x *= w;
             y *= w;
         }
@@ -1230,20 +1211,20 @@ QPointF QTransform::map(const QPointF &p) const
         y = fy;
         break;
     case TxTranslate:
-        x = fx + affine._dx;
-        y = fy + affine._dy;
+        x = fx + m_matrix[2][0];
+        y = fy + m_matrix[2][1];
         break;
     case TxScale:
-        x = affine._m11 * fx + affine._dx;
-        y = affine._m22 * fy + affine._dy;
+        x = m_matrix[0][0] * fx + m_matrix[2][0];
+        y = m_matrix[1][1] * fy + m_matrix[2][1];
         break;
     case TxRotate:
     case TxShear:
     case TxProject:
-        x = affine._m11 * fx + affine._m21 * fy + affine._dx;
-        y = affine._m12 * fx + affine._m22 * fy + affine._dy;
+        x = m_matrix[0][0] * fx + m_matrix[1][0] * fy + m_matrix[2][0];
+        y = m_matrix[0][1] * fx + m_matrix[1][1] * fy + m_matrix[2][1];
         if (t == TxProject) {
-            qreal w = 1./(m_13 * fx + m_23 * fy + m_33);
+            qreal w = 1./(m_matrix[0][2] * fx + m_matrix[1][2] * fy + m_matrix[2][2]);
             x *= w;
             y *= w;
         }
@@ -1303,29 +1284,29 @@ QLine QTransform::map(const QLine &l) const
         y2 = fy2;
         break;
     case TxTranslate:
-        x1 = fx1 + affine._dx;
-        y1 = fy1 + affine._dy;
-        x2 = fx2 + affine._dx;
-        y2 = fy2 + affine._dy;
+        x1 = fx1 + m_matrix[2][0];
+        y1 = fy1 + m_matrix[2][1];
+        x2 = fx2 + m_matrix[2][0];
+        y2 = fy2 + m_matrix[2][1];
         break;
     case TxScale:
-        x1 = affine._m11 * fx1 + affine._dx;
-        y1 = affine._m22 * fy1 + affine._dy;
-        x2 = affine._m11 * fx2 + affine._dx;
-        y2 = affine._m22 * fy2 + affine._dy;
+        x1 = m_matrix[0][0] * fx1 + m_matrix[2][0];
+        y1 = m_matrix[1][1] * fy1 + m_matrix[2][1];
+        x2 = m_matrix[0][0] * fx2 + m_matrix[2][0];
+        y2 = m_matrix[1][1] * fy2 + m_matrix[2][1];
         break;
     case TxRotate:
     case TxShear:
     case TxProject:
-        x1 = affine._m11 * fx1 + affine._m21 * fy1 + affine._dx;
-        y1 = affine._m12 * fx1 + affine._m22 * fy1 + affine._dy;
-        x2 = affine._m11 * fx2 + affine._m21 * fy2 + affine._dx;
-        y2 = affine._m12 * fx2 + affine._m22 * fy2 + affine._dy;
+        x1 = m_matrix[0][0] * fx1 + m_matrix[1][0] * fy1 + m_matrix[2][0];
+        y1 = m_matrix[0][1] * fx1 + m_matrix[1][1] * fy1 + m_matrix[2][1];
+        x2 = m_matrix[0][0] * fx2 + m_matrix[1][0] * fy2 + m_matrix[2][0];
+        y2 = m_matrix[0][1] * fx2 + m_matrix[1][1] * fy2 + m_matrix[2][1];
         if (t == TxProject) {
-            qreal w = 1./(m_13 * fx1 + m_23 * fy1 + m_33);
+            qreal w = 1./(m_matrix[0][2] * fx1 + m_matrix[1][2] * fy1 + m_matrix[2][2]);
             x1 *= w;
             y1 *= w;
-            w = 1./(m_13 * fx2 + m_23 * fy2 + m_33);
+            w = 1./(m_matrix[0][2] * fx2 + m_matrix[1][2] * fy2 + m_matrix[2][2]);
             x2 *= w;
             y2 *= w;
         }
@@ -1362,29 +1343,29 @@ QLineF QTransform::map(const QLineF &l) const
         y2 = fy2;
         break;
     case TxTranslate:
-        x1 = fx1 + affine._dx;
-        y1 = fy1 + affine._dy;
-        x2 = fx2 + affine._dx;
-        y2 = fy2 + affine._dy;
+        x1 = fx1 + m_matrix[2][0];
+        y1 = fy1 + m_matrix[2][1];
+        x2 = fx2 + m_matrix[2][0];
+        y2 = fy2 + m_matrix[2][1];
         break;
     case TxScale:
-        x1 = affine._m11 * fx1 + affine._dx;
-        y1 = affine._m22 * fy1 + affine._dy;
-        x2 = affine._m11 * fx2 + affine._dx;
-        y2 = affine._m22 * fy2 + affine._dy;
+        x1 = m_matrix[0][0] * fx1 + m_matrix[2][0];
+        y1 = m_matrix[1][1] * fy1 + m_matrix[2][1];
+        x2 = m_matrix[0][0] * fx2 + m_matrix[2][0];
+        y2 = m_matrix[1][1] * fy2 + m_matrix[2][1];
         break;
     case TxRotate:
     case TxShear:
     case TxProject:
-        x1 = affine._m11 * fx1 + affine._m21 * fy1 + affine._dx;
-        y1 = affine._m12 * fx1 + affine._m22 * fy1 + affine._dy;
-        x2 = affine._m11 * fx2 + affine._m21 * fy2 + affine._dx;
-        y2 = affine._m12 * fx2 + affine._m22 * fy2 + affine._dy;
+        x1 = m_matrix[0][0] * fx1 + m_matrix[1][0] * fy1 + m_matrix[2][0];
+        y1 = m_matrix[0][1] * fx1 + m_matrix[1][1] * fy1 + m_matrix[2][1];
+        x2 = m_matrix[0][0] * fx2 + m_matrix[1][0] * fy2 + m_matrix[2][0];
+        y2 = m_matrix[0][1] * fx2 + m_matrix[1][1] * fy2 + m_matrix[2][1];
         if (t == TxProject) {
-            qreal w = 1./(m_13 * fx1 + m_23 * fy1 + m_33);
+            qreal w = 1./(m_matrix[0][2] * fx1 + m_matrix[1][2] * fy1 + m_matrix[2][2]);
             x1 *= w;
             y1 *= w;
-            w = 1./(m_13 * fx2 + m_23 * fy2 + m_33);
+            w = 1./(m_matrix[0][2] * fx2 + m_matrix[1][2] * fy2 + m_matrix[2][2]);
             x2 *= w;
             y2 *= w;
         }
@@ -1445,7 +1426,7 @@ QPolygonF QTransform::map(const QPolygonF &a) const
 {
     TransformationType t = inline_type();
     if (t <= TxTranslate)
-        return a.translated(affine._dx, affine._dy);
+        return a.translated(m_matrix[2][0], m_matrix[2][1]);
 
     if (t >= QTransform::TxProject)
         return mapProjective(*this, a);
@@ -1475,7 +1456,7 @@ QPolygon QTransform::map(const QPolygon &a) const
 {
     TransformationType t = inline_type();
     if (t <= TxTranslate)
-        return a.translated(qRound(affine._dx), qRound(affine._dy));
+        return a.translated(qRound(m_matrix[2][0]), qRound(m_matrix[2][1]));
 
     if (t >= QTransform::TxProject)
         return mapProjective(*this, QPolygonF(a)).toPolygon();
@@ -1524,7 +1505,7 @@ QRegion QTransform::map(const QRegion &r) const
 
     if (t == TxTranslate) {
         QRegion copy(r);
-        copy.translate(qRound(affine._dx), qRound(affine._dy));
+        copy.translate(qRound(m_matrix[2][0]), qRound(m_matrix[2][1]));
         return copy;
     }
 
@@ -1547,7 +1528,7 @@ QRegion QTransform::map(const QRegion &r) const
     }
 
     QPainterPath p = map(qt_regionToPath(r));
-    return p.toFillPolygon(QTransform()).toPolygon();
+    return p.toFillPolygon().toPolygon();
 }
 
 struct QHomogeneousCoordinate
@@ -1703,7 +1684,7 @@ QPainterPath QTransform::map(const QPainterPath &path) const
     QPainterPath copy = path;
 
     if (t == TxTranslate) {
-        copy.translate(affine._dx, affine._dy);
+        copy.translate(m_matrix[2][0], m_matrix[2][1]);
     } else {
         copy.detach();
         // Full xform
@@ -1743,10 +1724,10 @@ QPolygon QTransform::mapToPolygon(const QRect &rect) const
     QPolygon a(4);
     qreal x[4] = { 0, 0, 0, 0 }, y[4] = { 0, 0, 0, 0 };
     if (t <= TxScale) {
-        x[0] = affine._m11*rect.x() + affine._dx;
-        y[0] = affine._m22*rect.y() + affine._dy;
-        qreal w = affine._m11*rect.width();
-        qreal h = affine._m22*rect.height();
+        x[0] = m_matrix[0][0]*rect.x() + m_matrix[2][0];
+        y[0] = m_matrix[1][1]*rect.y() + m_matrix[2][1];
+        qreal w = m_matrix[0][0]*rect.width();
+        qreal h = m_matrix[1][1]*rect.height();
         if (w < 0) {
             w = -w;
             x[0] -= w;
@@ -1903,9 +1884,9 @@ void QTransform::setMatrix(qreal m11, qreal m12, qreal m13,
                            qreal m21, qreal m22, qreal m23,
                            qreal m31, qreal m32, qreal m33)
 {
-    affine._m11 = m11; affine._m12 = m12; m_13 = m13;
-    affine._m21 = m21; affine._m22 = m22; m_23 = m23;
-    affine._dx = m31; affine._dy = m32; m_33 = m33;
+    m_matrix[0][0] = m11; m_matrix[0][1] = m12; m_matrix[0][2] = m13;
+    m_matrix[1][0] = m21; m_matrix[1][1] = m22; m_matrix[1][2] = m23;
+    m_matrix[2][0] = m31; m_matrix[2][1] = m32; m_matrix[2][2] = m33;
     m_type = TxNone;
     m_dirty = TxProject;
 }
@@ -1922,13 +1903,13 @@ QRect QTransform::mapRect(const QRect &rect) const
 {
     TransformationType t = inline_type();
     if (t <= TxTranslate)
-        return rect.translated(qRound(affine._dx), qRound(affine._dy));
+        return rect.translated(qRound(m_matrix[2][0]), qRound(m_matrix[2][1]));
 
     if (t <= TxScale) {
-        int x = qRound(affine._m11*rect.x() + affine._dx);
-        int y = qRound(affine._m22*rect.y() + affine._dy);
-        int w = qRound(affine._m11*rect.width());
-        int h = qRound(affine._m22*rect.height());
+        int x = qRound(m_matrix[0][0] * rect.x() + m_matrix[2][0]);
+        int y = qRound(m_matrix[1][1] * rect.y() + m_matrix[2][1]);
+        int w = qRound(m_matrix[0][0] * rect.width());
+        int h = qRound(m_matrix[1][1] * rect.height());
         if (w < 0) {
             w = -w;
             x -= w;
@@ -1992,13 +1973,13 @@ QRectF QTransform::mapRect(const QRectF &rect) const
 {
     TransformationType t = inline_type();
     if (t <= TxTranslate)
-        return rect.translated(affine._dx, affine._dy);
+        return rect.translated(m_matrix[2][0], m_matrix[2][1]);
 
     if (t <= TxScale) {
-        qreal x = affine._m11*rect.x() + affine._dx;
-        qreal y = affine._m22*rect.y() + affine._dy;
-        qreal w = affine._m11*rect.width();
-        qreal h = affine._m22*rect.height();
+        qreal x = m_matrix[0][0] * rect.x() + m_matrix[2][0];
+        qreal y = m_matrix[1][1] * rect.y() + m_matrix[2][1];
+        qreal w = m_matrix[0][0] * rect.width();
+        qreal h = m_matrix[1][1] * rect.height();
         if (w < 0) {
             w = -w;
             x -= w;
@@ -2085,20 +2066,6 @@ void QTransform::map(int x, int y, int *tx, int *ty) const
     *ty = qRound(fy);
 }
 
-#if QT_DEPRECATED_SINCE(5, 15)
-/*!
-  \obsolete
-  Returns the QTransform as an affine matrix.
-
-  \warning If a perspective transformation has been specified,
-  then the conversion will cause loss of data.
-*/
-const QMatrix &QTransform::toAffine() const
-{
-    return affine;
-}
-#endif // QT_DEPRECATED_SINCE(5, 15)
-
 /*!
   Returns the transformation type of this matrix.
 
@@ -2118,15 +2085,15 @@ QTransform::TransformationType QTransform::type() const
 
     switch (static_cast<TransformationType>(m_dirty)) {
     case TxProject:
-        if (!qFuzzyIsNull(m_13) || !qFuzzyIsNull(m_23) || !qFuzzyIsNull(m_33 - 1)) {
+        if (!qFuzzyIsNull(m_matrix[0][2]) || !qFuzzyIsNull(m_matrix[1][2]) || !qFuzzyIsNull(m_matrix[2][2] - 1)) {
              m_type = TxProject;
              break;
         }
         Q_FALLTHROUGH();
     case TxShear:
     case TxRotate:
-        if (!qFuzzyIsNull(affine._m12) || !qFuzzyIsNull(affine._m21)) {
-            const qreal dot = affine._m11 * affine._m12 + affine._m21 * affine._m22;
+        if (!qFuzzyIsNull(m_matrix[0][1]) || !qFuzzyIsNull(m_matrix[1][0])) {
+            const qreal dot = m_matrix[0][0] * m_matrix[0][1] + m_matrix[1][0] * m_matrix[1][1];
             if (qFuzzyIsNull(dot))
                 m_type = TxRotate;
             else
@@ -2135,13 +2102,13 @@ QTransform::TransformationType QTransform::type() const
         }
         Q_FALLTHROUGH();
     case TxScale:
-        if (!qFuzzyIsNull(affine._m11 - 1) || !qFuzzyIsNull(affine._m22 - 1)) {
+        if (!qFuzzyIsNull(m_matrix[0][0] - 1) || !qFuzzyIsNull(m_matrix[1][1] - 1)) {
             m_type = TxScale;
             break;
         }
         Q_FALLTHROUGH();
     case TxTranslate:
-        if (!qFuzzyIsNull(affine._dx) || !qFuzzyIsNull(affine._dy)) {
+        if (!qFuzzyIsNull(m_matrix[2][0]) || !qFuzzyIsNull(m_matrix[2][1])) {
             m_type = TxTranslate;
             break;
         }
@@ -2390,4 +2357,50 @@ bool qt_scaleForTransform(const QTransform &transform, qreal *scale)
     }
 }
 
+QDataStream & operator>>(QDataStream &s, QTransform::Affine &m)
+{
+    if (s.version() == 1) {
+        float m11, m12, m21, m22, dx, dy;
+        s >> m11; s >> m12; s >> m21; s >> m22; s >> dx; s >> dy;
+
+        m.m_matrix[0][0] = m11;
+        m.m_matrix[0][1] = m12;
+        m.m_matrix[1][0] = m21;
+        m.m_matrix[1][1] = m22;
+        m.m_matrix[2][0] = dx;
+        m.m_matrix[2][1] = dy;
+    } else {
+        s >> m.m_matrix[0][0];
+        s >> m.m_matrix[0][1];
+        s >> m.m_matrix[1][0];
+        s >> m.m_matrix[1][1];
+        s >> m.m_matrix[2][0];
+        s >> m.m_matrix[2][1];
+    }
+    m.m_matrix[0][2] = 0;
+    m.m_matrix[1][2] = 0;
+    m.m_matrix[2][2] = 1;
+    return s;
+}
+
+QDataStream &operator<<(QDataStream &s, const QTransform::Affine &m)
+{
+    if (s.version() == 1) {
+        s << (float)m.m_matrix[0][0]
+          << (float)m.m_matrix[0][1]
+          << (float)m.m_matrix[1][0]
+          << (float)m.m_matrix[1][1]
+          << (float)m.m_matrix[2][0]
+          << (float)m.m_matrix[2][1];
+    } else {
+        s << m.m_matrix[0][0]
+          << m.m_matrix[0][1]
+          << m.m_matrix[1][0]
+          << m.m_matrix[1][1]
+          << m.m_matrix[2][0]
+          << m.m_matrix[2][1];
+    }
+    return s;
+}
+
 QT_END_NAMESPACE
diff --git a/src/gui/painting/qtransform.h b/src/gui/painting/qtransform.h
index 485caa5140..351f2b2e4e 100644
--- a/src/gui/painting/qtransform.h
+++ b/src/gui/painting/qtransform.h
@@ -40,7 +40,6 @@
 #define QTRANSFORM_H
 
 #include <QtGui/qtguiglobal.h>
-#include <QtGui/qmatrix.h>
 #include <QtGui/qpainterpath.h>
 #include <QtGui/qpolygon.h>
 #include <QtGui/qregion.h>
@@ -66,16 +65,13 @@ public:
         TxProject   = 0x10
     };
 
-    inline explicit QTransform(Qt::Initialization) : affine(Qt::Uninitialized) {}
+    inline explicit QTransform(Qt::Initialization) {}
     QTransform();
     QTransform(qreal h11, qreal h12, qreal h13,
                qreal h21, qreal h22, qreal h23,
                qreal h31, qreal h32, qreal h33 = 1.0);
     QTransform(qreal h11, qreal h12, qreal h21,
                qreal h22, qreal dx, qreal dy);
-#if QT_DEPRECATED_SINCE(5, 15)
-    explicit QTransform(const QMatrix &mtx);
-#endif // QT_DEPRECATED_SINCE(5, 15)
 
 #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
     // ### Qt 6: remove; the compiler-generated ones are fine!
@@ -160,10 +156,6 @@ public:
     void map(int x, int y, int *tx, int *ty) const;
     void map(qreal x, qreal y, qreal *tx, qreal *ty) const;
 
-#if QT_DEPRECATED_SINCE(5, 15)
-    const QMatrix &toAffine() const;
-#endif // QT_DEPRECATED_SINCE(5, 15)
-
     QTransform &operator*=(qreal div);
     QTransform &operator/=(qreal div);
     QTransform &operator+=(qreal div);
@@ -173,11 +165,20 @@ public:
     static QTransform fromScale(qreal dx, qreal dy);
 
 private:
+    struct Affine {
+             qreal (& m_matrix)[3][3];
+        };
+
+public:
+    auto asAffineMatrix() { return Affine { m_matrix }; }
+    friend Q_GUI_EXPORT QDataStream &operator>>(QDataStream &s, Affine &m);
+    friend Q_GUI_EXPORT QDataStream &operator<<(QDataStream &s, const Affine &m);
+
+private:
     inline QTransform(qreal h11, qreal h12, qreal h13,
                       qreal h21, qreal h22, qreal h23,
                       qreal h31, qreal h32, qreal h33, bool)
-        : affine(h11, h12, h21, h22, h31, h32, true)
-        , m_13(h13), m_23(h23), m_33(h33)
+        : m_matrix{ {h11, h12, h13}, {h21, h22, h23}, {h31, h32, h33} }
         , m_type(TxNone)
         , m_dirty(TxProject)
 #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
@@ -186,8 +187,7 @@ private:
     {
     }
     inline QTransform(bool)
-        : affine(true)
-        , m_13(0), m_23(0), m_33(1)
+        : m_matrix{ {1, 0, 0}, {0, 1, 0}, {0, 0, 1} }
         , m_type(TxNone)
         , m_dirty(TxNone)
 #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
@@ -196,10 +196,7 @@ private:
     {
     }
     inline TransformationType inline_type() const;
-    QMatrix affine;
-    qreal   m_13;
-    qreal   m_23;
-    qreal   m_33;
+    qreal m_matrix[3][3];
 
     mutable uint m_type : 5;
     mutable uint m_dirty : 5;
@@ -250,8 +247,9 @@ inline bool QTransform::isTranslating() const
 
 inline qreal QTransform::determinant() const
 {
-    return affine._m11*(m_33*affine._m22-affine._dy*m_23) -
-        affine._m21*(m_33*affine._m12-affine._dy*m_13)+affine._dx*(m_23*affine._m12-affine._m22*m_13);
+    return m_matrix[0][0] * (m_matrix[2][2] * m_matrix[1][1] - m_matrix[2][1] * m_matrix[1][2]) -
+           m_matrix[1][0] * (m_matrix[2][2] * m_matrix[0][1] - m_matrix[2][1] * m_matrix[0][2]) +
+           m_matrix[2][0] * (m_matrix[1][2] * m_matrix[0][1] - m_matrix[1][1] * m_matrix[0][2]);
 }
 #if QT_DEPRECATED_SINCE(5, 13)
 inline qreal QTransform::det() const
@@ -261,47 +259,47 @@ inline qreal QTransform::det() const
 #endif
 inline qreal QTransform::m11() const
 {
-    return affine._m11;
+    return m_matrix[0][0];
 }
 inline qreal QTransform::m12() const
 {
-    return affine._m12;
+    return m_matrix[0][1];
 }
 inline qreal QTransform::m13() const
 {
-    return m_13;
+    return m_matrix[0][2];
 }
 inline qreal QTransform::m21() const
 {
-    return affine._m21;
+    return m_matrix[1][0];
 }
 inline qreal QTransform::m22() const
 {
-    return affine._m22;
+    return m_matrix[1][1];
 }
 inline qreal QTransform::m23() const
 {
-    return m_23;
+    return m_matrix[1][2];
 }
 inline qreal QTransform::m31() const
 {
-    return affine._dx;
+    return m_matrix[2][0];
 }
 inline qreal QTransform::m32() const
 {
-    return affine._dy;
+    return m_matrix[2][1];
 }
 inline qreal QTransform::m33() const
 {
-    return m_33;
+    return m_matrix[2][2];
 }
 inline qreal QTransform::dx() const
 {
-    return affine._dx;
+    return m_matrix[2][0];
 }
 inline qreal QTransform::dy() const
 {
-    return affine._dy;
+    return m_matrix[2][1];
 }
 
 QT_WARNING_PUSH
@@ -313,15 +311,15 @@ inline QTransform &QTransform::operator*=(qreal num)
 {
     if (num == 1.)
         return *this;
-    affine._m11 *= num;
-    affine._m12 *= num;
-    m_13        *= num;
-    affine._m21 *= num;
-    affine._m22 *= num;
-    m_23        *= num;
-    affine._dx  *= num;
-    affine._dy  *= num;
-    m_33        *= num;
+    m_matrix[0][0] *= num;
+    m_matrix[0][1] *= num;
+    m_matrix[0][2] *= num;
+    m_matrix[1][0] *= num;
+    m_matrix[1][1] *= num;
+    m_matrix[1][2] *= num;
+    m_matrix[2][0] *= num;
+    m_matrix[2][1] *= num;
+    m_matrix[2][2] *= num;
     if (m_dirty < TxScale)
         m_dirty = TxScale;
     return *this;
@@ -337,15 +335,15 @@ inline QTransform &QTransform::operator+=(qreal num)
 {
     if (num == 0)
         return *this;
-    affine._m11 += num;
-    affine._m12 += num;
-    m_13        += num;
-    affine._m21 += num;
-    affine._m22 += num;
-    m_23        += num;
-    affine._dx  += num;
-    affine._dy  += num;
-    m_33        += num;
+    m_matrix[0][0] += num;
+    m_matrix[0][1] += num;
+    m_matrix[0][2] += num;
+    m_matrix[1][0] += num;
+    m_matrix[1][1] += num;
+    m_matrix[1][2] += num;
+    m_matrix[2][0] += num;
+    m_matrix[2][1] += num;
+    m_matrix[2][2] += num;
     m_dirty     = TxProject;
     return *this;
 }
@@ -353,15 +351,15 @@ inline QTransform &QTransform::operator-=(qreal num)
 {
     if (num == 0)
         return *this;
-    affine._m11 -= num;
-    affine._m12 -= num;
-    m_13        -= num;
-    affine._m21 -= num;
-    affine._m22 -= num;
-    m_23        -= num;
-    affine._dx  -= num;
-    affine._dy  -= num;
-    m_33        -= num;
+    m_matrix[0][0] -= num;
+    m_matrix[0][1] -= num;
+    m_matrix[0][2] -= num;
+    m_matrix[1][0] -= num;
+    m_matrix[1][1] -= num;
+    m_matrix[1][2] -= num;
+    m_matrix[2][0] -= num;
+    m_matrix[2][1] -= num;
+    m_matrix[2][2] -= num;
     m_dirty     = TxProject;
     return *this;
 }
diff --git a/src/gui/rhi/qrhigles2.cpp b/src/gui/rhi/qrhigles2.cpp
index feeb65137a..4a442bc582 100644
--- a/src/gui/rhi/qrhigles2.cpp
+++ b/src/gui/rhi/qrhigles2.cpp
@@ -289,8 +289,6 @@ QT_BEGIN_NAMESPACE
 #define GL_MAP_READ_BIT                   0x0001
 #endif
 
-Q_DECLARE_LOGGING_CATEGORY(lcOpenGLProgramDiskCache)
-
 /*!
     Constructs a new QRhiGles2InitParams.
 
diff --git a/src/gui/text/qabstracttextdocumentlayout.cpp b/src/gui/text/qabstracttextdocumentlayout.cpp
index 8528f59844..bfce38797a 100644
--- a/src/gui/text/qabstracttextdocumentlayout.cpp
+++ b/src/gui/text/qabstracttextdocumentlayout.cpp
@@ -53,7 +53,6 @@ QAbstractTextDocumentLayoutPrivate::~QAbstractTextDocumentLayoutPrivate()
 
 QTextObjectInterface::~QTextObjectInterface()
 {
-    // must be empty until ### Qt 6
 }
 
 /*!
diff --git a/src/gui/text/qfontdatabase.cpp b/src/gui/text/qfontdatabase.cpp
index f2fd585835..a43af37097 100644
--- a/src/gui/text/qfontdatabase.cpp
+++ b/src/gui/text/qfontdatabase.cpp
@@ -597,7 +597,32 @@ Q_GUI_EXPORT int qt_script_for_writing_system(QFontDatabase::WritingSystem writi
 }
 
 
+/*!
+    \internal
+
+    Tests if the given family \a family supports writing system \a writingSystem,
+    including the special case for Han script mapping to several subsequent writing systems
+*/
+static bool familySupportsWritingSystem(QtFontFamily *family, size_t writingSystem)
+{
+    Q_ASSERT(family != nullptr);
+    Q_ASSERT(writingSystem != QFontDatabase::Any && writingSystem < QFontDatabase::WritingSystemsCount);
+
+    size_t ws = writingSystem;
+    do {
+        if ((family->writingSystems[ws] & QtFontFamily::Supported) != 0)
+            return true;
+    } while (writingSystem >= QFontDatabase::SimplifiedChinese && writingSystem <= QFontDatabase::Japanese && ++ws <= QFontDatabase::Japanese);
+
+    return false;
+}
 
+Q_GUI_EXPORT QFontDatabase::WritingSystem qt_writing_system_for_script(int script)
+{
+    return QFontDatabase::WritingSystem(std::find(scriptForWritingSystem,
+                                                  scriptForWritingSystem + QFontDatabase::WritingSystemsCount,
+                                                  script) - scriptForWritingSystem);
+}
 
 /*!
   \internal
@@ -814,9 +839,7 @@ QStringList QPlatformFontDatabase::fallbacksForFamily(const QString &family, QFo
     QStringList preferredFallbacks;
     QStringList otherFallbacks;
 
-    size_t writingSystem = std::find(scriptForWritingSystem,
-                                     scriptForWritingSystem + QFontDatabase::WritingSystemsCount,
-                                     script) - scriptForWritingSystem;
+    auto writingSystem = qt_writing_system_for_script(script);
     if (writingSystem >= QFontDatabase::WritingSystemsCount)
         writingSystem = QFontDatabase::Any;
 
@@ -826,7 +849,7 @@ QStringList QPlatformFontDatabase::fallbacksForFamily(const QString &family, QFo
 
         f->ensurePopulated();
 
-        if (writingSystem > QFontDatabase::Any && f->writingSystems[writingSystem] != QtFontFamily::Supported)
+        if (writingSystem != QFontDatabase::Any && !familySupportsWritingSystem(f, writingSystem))
             continue;
 
         for (int j = 0; j < f->count; ++j) {
@@ -1253,8 +1276,7 @@ static int match(int script, const QFontDef &request,
 
     load(family_name, script);
 
-    size_t writingSystem = std::find(scriptForWritingSystem, scriptForWritingSystem +
-            QFontDatabase::WritingSystemsCount, script) - scriptForWritingSystem;
+    auto writingSystem = qt_writing_system_for_script(script);
     if (writingSystem >= QFontDatabase::WritingSystemsCount)
         writingSystem = QFontDatabase::Any;
 
@@ -1271,7 +1293,7 @@ static int match(int script, const QFontDef &request,
         test.family->ensurePopulated();
 
         // Check if family is supported in the script we want
-        if (writingSystem != QFontDatabase::Any && !(test.family->writingSystems[writingSystem] & QtFontFamily::Supported))
+        if (writingSystem != QFontDatabase::Any && !familySupportsWritingSystem(test.family, writingSystem))
             continue;
 
         // as we know the script is supported, we can be sure
@@ -2857,9 +2879,7 @@ QString QFontDatabase::resolveFontFamilyAlias(const QString &family)
 
 Q_GUI_EXPORT QStringList qt_sort_families_by_writing_system(QChar::Script script, const QStringList &families)
 {
-    size_t writingSystem = std::find(scriptForWritingSystem,
-                                     scriptForWritingSystem + QFontDatabase::WritingSystemsCount,
-                                     script) - scriptForWritingSystem;
+    size_t writingSystem = qt_writing_system_for_script(script);
     if (writingSystem == QFontDatabase::Any
             || writingSystem >= QFontDatabase::WritingSystemsCount) {
         return families;
@@ -2881,7 +2901,7 @@ Q_GUI_EXPORT QStringList qt_sort_families_by_writing_system(QChar::Script script
 
         uint order = i;
         if (testFamily == nullptr
-              || (testFamily->writingSystems[writingSystem] & QtFontFamily::Supported) == 0) {
+              || !familySupportsWritingSystem(testFamily, writingSystem)) {
             order |= 1u << 31;
         }
 
diff --git a/src/gui/text/qfontdatabase.h b/src/gui/text/qfontdatabase.h
index 80b092f177..63e6b48e4f 100644
--- a/src/gui/text/qfontdatabase.h
+++ b/src/gui/text/qfontdatabase.h
@@ -49,7 +49,6 @@ QT_BEGIN_NAMESPACE
 
 
 class QStringList;
-template <class T> class QList;
 struct QFontDef;
 class QFontEngine;
 
diff --git a/src/gui/text/qfontengine.cpp b/src/gui/text/qfontengine.cpp
index bffe1a10e0..ec90247feb 100644
--- a/src/gui/text/qfontengine.cpp
+++ b/src/gui/text/qfontengine.cpp
@@ -807,14 +807,14 @@ void QFontEngine::addBitmapFontToPath(qreal x, qreal y, const QGlyphLayout &glyp
 
         const int w = alphaMask.width();
         const int h = alphaMask.height();
-        const int srcBpl = alphaMask.bytesPerLine();
+        const qsizetype srcBpl = alphaMask.bytesPerLine();
         QImage bitmap;
         if (alphaMask.depth() == 1) {
             bitmap = alphaMask;
         } else {
             bitmap = QImage(w, h, QImage::Format_Mono);
             const uchar *imageData = alphaMask.bits();
-            const int destBpl = bitmap.bytesPerLine();
+            const qsizetype destBpl = bitmap.bytesPerLine();
             uchar *bitmapData = bitmap.bits();
 
             for (int yi = 0; yi < h; ++yi) {
diff --git a/src/gui/text/qfontengine_qpf2.cpp b/src/gui/text/qfontengine_qpf2.cpp
index e00f9d058c..d636bca510 100644
--- a/src/gui/text/qfontengine_qpf2.cpp
+++ b/src/gui/text/qfontengine_qpf2.cpp
@@ -168,7 +168,7 @@ const QFontEngineQPF2::Glyph *QFontEngineQPF2::findGlyph(glyph_t g) const
 
 bool QFontEngineQPF2::verifyHeader(const uchar *data, int size)
 {
-    VERIFY(quintptr(data) % Q_ALIGNOF(Header) == 0);
+    VERIFY(quintptr(data) % alignof(Header) == 0);
     VERIFY(size >= int(sizeof(Header)));
     const Header *header = reinterpret_cast<const Header *>(data);
     if (header->magic[0] != 'Q'
diff --git a/src/gui/text/qplatformfontdatabase.cpp b/src/gui/text/qplatformfontdatabase.cpp
index 48ba8987f3..4ff2ad3a41 100644
--- a/src/gui/text/qplatformfontdatabase.cpp
+++ b/src/gui/text/qplatformfontdatabase.cpp
@@ -534,6 +534,32 @@ enum CsbBits {
 };
 
 /*!
+    Helper function that determines the writing system support based on the contents of the OS/2 table
+    in the font.
+
+    \since 6.0
+*/
+QSupportedWritingSystems QPlatformFontDatabase::writingSystemsFromOS2Table(const char *os2Table, size_t length)
+{
+    if (length >= 86)  {
+        quint32 unicodeRange[4] = {
+            qFromBigEndian<quint32>(os2Table + 42),
+            qFromBigEndian<quint32>(os2Table + 46),
+            qFromBigEndian<quint32>(os2Table + 50),
+            qFromBigEndian<quint32>(os2Table + 54)
+        };
+        quint32 codePageRange[2] = {
+            qFromBigEndian<quint32>(os2Table + 78),
+            qFromBigEndian<quint32>(os2Table + 82)
+        };
+
+        return writingSystemsFromTrueTypeBits(unicodeRange, codePageRange);
+    }
+
+    return QSupportedWritingSystems();
+}
+
+/*!
     Helper function that determines the writing systems support by a given
     \a unicodeRange and \a codePageRange.
 
diff --git a/src/gui/text/qplatformfontdatabase.h b/src/gui/text/qplatformfontdatabase.h
index f79c5db625..d05bcb372b 100644
--- a/src/gui/text/qplatformfontdatabase.h
+++ b/src/gui/text/qplatformfontdatabase.h
@@ -127,6 +127,7 @@ public:
 
     // helper
     static QSupportedWritingSystems writingSystemsFromTrueTypeBits(quint32 unicodeRange[4], quint32 codePageRange[2]);
+    static QSupportedWritingSystems writingSystemsFromOS2Table(const char *os2Table, size_t length);
     static QFont::Weight weightFromInteger(int weight);
 
     //callback
diff --git a/src/gui/text/qtextoption.h b/src/gui/text/qtextoption.h
index 8b57278633..808076603a 100644
--- a/src/gui/text/qtextoption.h
+++ b/src/gui/text/qtextoption.h
@@ -48,8 +48,6 @@
 
 QT_BEGIN_NAMESPACE
 
-
-template <typename T> class QList;
 struct QTextOptionPrivate;
 
 class Q_GUI_EXPORT QTextOption
@@ -135,11 +133,11 @@ public:
     bool useDesignMetrics() const { return design; }
 
 private:
-    uint align : 8;
+    uint align : 9;
     uint wordWrap : 4;
     uint design : 1;
     uint direction : 2;
-    uint unused : 17;
+    uint unused : 16;
     uint unused2; // ### Qt 6: remove unnecessary, extra 32 bits
     uint f;
     qreal tab;
diff --git a/src/gui/util/qgridlayoutengine.cpp b/src/gui/util/qgridlayoutengine.cpp
index 4af5e47f8f..f2d549b48f 100644
--- a/src/gui/util/qgridlayoutengine.cpp
+++ b/src/gui/util/qgridlayoutengine.cpp
@@ -960,7 +960,7 @@ void QGridLayoutEngine::insertItem(QGridLayoutItem *item, int index)
 {
     maybeExpandGrid(item->lastRow(), item->lastColumn());
 
-    if (index == -1)
+    if (index < 0 || index >= q_items.size())
         q_items.append(item);
     else
         q_items.insert(index, item);
@@ -1336,7 +1336,7 @@ void QGridLayoutEngine::fillRowData(QGridLayoutRowData *rowData,
             if (rowIsIdenticalToPrevious && item != itemAt(row - 1, column, orientation))
                 rowIsIdenticalToPrevious = false;
 
-            if (item && !item->isIgnored())
+            if (item && !item->isEmpty())
                 rowIsEmpty = false;
         }
 
diff --git a/src/gui/util/qgridlayoutengine_p.h b/src/gui/util/qgridlayoutengine_p.h
index 181326103b..908aeda0c3 100644
--- a/src/gui/util/qgridlayoutengine_p.h
+++ b/src/gui/util/qgridlayoutengine_p.h
@@ -303,7 +303,7 @@ public:
 
     virtual QLayoutPolicy::Policy sizePolicy(Qt::Orientation orientation) const = 0;
     virtual QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint) const = 0;
-    virtual bool isIgnored() const { return false; }
+    virtual bool isEmpty() const { return false; }
 
     virtual void setGeometry(const QRectF &rect) = 0;
     /*
diff --git a/src/gui/util/qtexturefiledata.cpp b/src/gui/util/qtexturefiledata.cpp
index 41cbd1b15a..3c8130c229 100644
--- a/src/gui/util/qtexturefiledata.cpp
+++ b/src/gui/util/qtexturefiledata.cpp
@@ -38,11 +38,7 @@
 ****************************************************************************/
 
 #include "qtexturefiledata_p.h"
-#include <QMetaEnum>
 #include <QSize>
-#if QT_CONFIG(opengl)
-#include <QOpenGLTexture>
-#endif
 
 QT_BEGIN_NAMESPACE
 
@@ -247,13 +243,7 @@ void QTextureFileData::setLogName(const QByteArray &name)
 
 static QByteArray glFormatName(quint32 fmt)
 {
-    const char *id = nullptr;
-#if QT_CONFIG(opengl)
-    id = QMetaEnum::fromType<QOpenGLTexture::TextureFormat>().valueToKey(fmt);
-#endif
-    QByteArray res(id ? id : "(?)");
-    res += " [0x" + QByteArray::number(fmt, 16).rightJustified(4, '0') + ']';
-    return res;
+    return QByteArray("0x" + QByteArray::number(fmt, 16).rightJustified(4, '0'));
 }
 
 QDebug operator<<(QDebug dbg, const QTextureFileData &d)
diff --git a/src/network/.prev_CMakeLists.txt b/src/network/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..8f38d07e93
--- /dev/null
+++ b/src/network/.prev_CMakeLists.txt
@@ -0,0 +1,460 @@
+# Generated from network.pro.
+
+#####################################################################
+## Network Module:
+#####################################################################
+
+qt_add_module(Network
+    SOURCES
+        access/qabstractnetworkcache.cpp access/qabstractnetworkcache.h access/qabstractnetworkcache_p.h
+        access/qhsts.cpp access/qhsts_p.h
+        access/qhstspolicy.cpp access/qhstspolicy.h
+        access/qnetworkaccessauthenticationmanager.cpp access/qnetworkaccessauthenticationmanager_p.h
+        access/qnetworkaccessbackend.cpp access/qnetworkaccessbackend_p.h
+        access/qnetworkaccesscache.cpp access/qnetworkaccesscache_p.h
+        access/qnetworkaccesscachebackend.cpp access/qnetworkaccesscachebackend_p.h
+        access/qnetworkaccessdebugpipebackend.cpp access/qnetworkaccessdebugpipebackend_p.h
+        access/qnetworkaccessfilebackend.cpp access/qnetworkaccessfilebackend_p.h
+        access/qnetworkaccessmanager.cpp access/qnetworkaccessmanager.h access/qnetworkaccessmanager_p.h
+        access/qnetworkcookie.cpp access/qnetworkcookie.h access/qnetworkcookie_p.h
+        access/qnetworkcookiejar.cpp access/qnetworkcookiejar.h access/qnetworkcookiejar_p.h
+        access/qnetworkfile.cpp access/qnetworkfile_p.h
+        access/qnetworkreply.cpp access/qnetworkreply.h access/qnetworkreply_p.h
+        access/qnetworkreplydataimpl.cpp access/qnetworkreplydataimpl_p.h
+        access/qnetworkreplyfileimpl.cpp access/qnetworkreplyfileimpl_p.h
+        access/qnetworkreplyimpl.cpp access/qnetworkreplyimpl_p.h
+        access/qnetworkrequest.cpp access/qnetworkrequest.h access/qnetworkrequest_p.h
+        kernel/qauthenticator.cpp kernel/qauthenticator.h kernel/qauthenticator_p.h
+        kernel/qhostaddress.cpp kernel/qhostaddress.h kernel/qhostaddress_p.h
+        kernel/qhostinfo.cpp kernel/qhostinfo.h kernel/qhostinfo_p.h
+        kernel/qnetconmonitor_p.h
+        kernel/qnetworkdatagram.cpp kernel/qnetworkdatagram.h kernel/qnetworkdatagram_p.h
+        kernel/qnetworkinterface.cpp kernel/qnetworkinterface.h kernel/qnetworkinterface_p.h
+        kernel/qnetworkinterface_unix_p.h
+        kernel/qnetworkproxy.cpp kernel/qnetworkproxy.h
+        kernel/qtnetworkglobal.h kernel/qtnetworkglobal_p.h
+        socket/qabstractsocket.cpp socket/qabstractsocket.h socket/qabstractsocket_p.h
+        socket/qabstractsocketengine.cpp socket/qabstractsocketengine_p.h
+        socket/qtcpserver.cpp socket/qtcpserver.h socket/qtcpserver_p.h
+        socket/qtcpsocket.cpp socket/qtcpsocket.h socket/qtcpsocket_p.h
+        socket/qudpsocket.cpp socket/qudpsocket.h
+        ssl/qasn1element.cpp ssl/qasn1element_p.h
+        ssl/qpassworddigestor.cpp ssl/qpassworddigestor.h
+        ssl/qssl.cpp ssl/qssl.h ssl/qssl_p.h
+        ssl/qsslcertificate.cpp ssl/qsslcertificate.h ssl/qsslcertificate_p.h
+        ssl/qsslcertificateextension.cpp ssl/qsslcertificateextension.h ssl/qsslcertificateextension_p.h
+    DEFINES
+        QT_NO_FOREACH
+        QT_NO_USING_NAMESPACE
+    INCLUDE_DIRECTORIES
+        kernel
+    LIBRARIES
+        Qt::CorePrivate
+    PUBLIC_LIBRARIES
+        Qt::Core
+    PRIVATE_MODULE_INTERFACE
+        Qt::CorePrivate
+    PRECOMPILED_HEADER
+        "../corelib/global/qt_pch.h"
+)
+
+#### Keys ignored in scope 1:.:.:network.pro:<TRUE>:
+# MODULE_WINRT_CAPABILITIES = "internetClient" "internetClientServer" "privateNetworkClientServer"
+# QMAKE_LIBS = "$$QMAKE_LIBS_NETWORK"
+
+## Scopes:
+#####################################################################
+
+qt_extend_target(Network CONDITION MSVC AND (TEST_architecture_arch STREQUAL "i386")
+    LINK_OPTIONS
+        "/BASE:0x64000000"
+)
+
+if(ANDROID AND (QT_FEATURE_bearermanagement))
+    set_property(TARGET Network APPEND PROPERTY QT_ANDROID_BUNDLED_JAR_DEPENDENCIES
+        jar/QtAndroidBearer.jar
+    )
+    set_property(TARGET Network APPEND PROPERTY QT_ANDROID_LIB_DEPENDENCIES
+        plugins/bearer/libplugins_bearer_qandroidbearer.so
+    )
+    set_property(TARGET Network APPEND PROPERTY QT_ANDROID_PERMISSIONS
+        android.permission.ACCESS_NETWORK_STATE
+    )
+endif()
+
+qt_extend_target(Network CONDITION QT_FEATURE_bearermanagement
+    SOURCES
+        bearer/qbearerengine.cpp bearer/qbearerengine_p.h
+        bearer/qbearerengine_impl_p.h
+        bearer/qbearerplugin.cpp bearer/qbearerplugin_p.h
+        bearer/qnetworkconfigmanager.cpp bearer/qnetworkconfigmanager.h bearer/qnetworkconfigmanager_p.cpp bearer/qnetworkconfigmanager_p.h
+        bearer/qnetworkconfiguration.cpp bearer/qnetworkconfiguration.h bearer/qnetworkconfiguration_p.h
+        bearer/qnetworksession.cpp bearer/qnetworksession.h bearer/qnetworksession_p.h
+        bearer/qnetworksession_impl.cpp bearer/qnetworksession_impl_p.h
+        bearer/qsharednetworksession.cpp bearer/qsharednetworksession_p.h
+)
+
+qt_extend_target(Network CONDITION QT_FEATURE_ftp
+    SOURCES
+        access/qftp.cpp access/qftp_p.h
+        access/qnetworkaccessftpbackend.cpp access/qnetworkaccessftpbackend_p.h
+        kernel/qurlinfo.cpp kernel/qurlinfo_p.h
+)
+
+qt_extend_target(Network CONDITION QT_FEATURE_networkdiskcache
+    SOURCES
+        access/qnetworkdiskcache.cpp access/qnetworkdiskcache.h access/qnetworkdiskcache_p.h
+)
+
+qt_extend_target(Network CONDITION QT_FEATURE_settings
+    SOURCES
+        access/qhstsstore.cpp access/qhstsstore_p.h
+)
+
+qt_extend_target(Network CONDITION APPLE
+    LIBRARIES
+        ${FWCoreFoundation}
+        ${FWSecurity}
+)
+
+qt_extend_target(Network CONDITION WASM
+    SOURCES
+        access/qnetworkreplywasmimpl.cpp access/qnetworkreplywasmimpl_p.h
+)
+
+qt_extend_target(Network CONDITION QT_FEATURE_http
+    SOURCES
+        access/http2/bitstreams.cpp access/http2/bitstreams_p.h
+        access/http2/hpack.cpp access/http2/hpack_p.h
+        access/http2/hpacktable.cpp access/http2/hpacktable_p.h
+        access/http2/http2frames.cpp access/http2/http2frames_p.h
+        access/http2/http2protocol.cpp access/http2/http2protocol_p.h
+        access/http2/http2streams.cpp access/http2/http2streams_p.h
+        access/http2/huffman.cpp access/http2/huffman_p.h
+        access/qabstractprotocolhandler.cpp access/qabstractprotocolhandler_p.h
+        access/qhttp2configuration.cpp access/qhttp2configuration.h
+        access/qhttp2protocolhandler.cpp access/qhttp2protocolhandler_p.h
+        access/qhttpmultipart.cpp access/qhttpmultipart.h access/qhttpmultipart_p.h
+        access/qhttpnetworkconnection.cpp access/qhttpnetworkconnection_p.h
+        access/qhttpnetworkconnectionchannel.cpp access/qhttpnetworkconnectionchannel_p.h
+        access/qhttpnetworkheader.cpp access/qhttpnetworkheader_p.h
+        access/qhttpnetworkreply.cpp access/qhttpnetworkreply_p.h
+        access/qhttpnetworkrequest.cpp access/qhttpnetworkrequest_p.h
+        access/qhttpprotocolhandler.cpp access/qhttpprotocolhandler_p.h
+        access/qhttpthreaddelegate.cpp access/qhttpthreaddelegate_p.h
+        access/qnetworkreplyhttpimpl.cpp access/qnetworkreplyhttpimpl_p.h
+        socket/qhttpsocketengine.cpp socket/qhttpsocketengine_p.h
+)
+
+qt_extend_target(Network CONDITION QT_FEATURE_system_zlib
+    LIBRARIES
+        ZLIB::ZLIB
+)
+
+qt_extend_target(Network CONDITION NOT QT_FEATURE_system_zlib
+    INCLUDE_DIRECTORIES
+        ../3rdparty/zlib/src
+)
+
+qt_extend_target(Network CONDITION NOT QT_FEATURE_system_zlib AND NOT no_core_dep
+    LIBRARIES
+        Qt::Core
+)
+
+qt_extend_target(Network CONDITION QT_FEATURE_topleveldomain
+    SOURCES
+        kernel/qtldurl.cpp kernel/qtldurl_p.h
+        kernel/qurltlds_p.h
+)
+
+qt_extend_target(Network CONDITION QT_FEATURE_dnslookup
+    SOURCES
+        kernel/qdnslookup.cpp kernel/qdnslookup.h kernel/qdnslookup_p.h
+)
+
+qt_extend_target(Network CONDITION UNIX
+    SOURCES
+        kernel/qhostinfo_unix.cpp
+        socket/qnativesocketengine_unix.cpp
+        socket/qnet_unix_p.h
+)
+
+qt_extend_target(Network CONDITION QT_FEATURE_dlopen AND UNIX
+    LIBRARIES
+        ${CMAKE_DL_LIBS}
+)
+
+qt_extend_target(Network CONDITION QT_FEATURE_linux_netlink AND UNIX
+    SOURCES
+        kernel/qnetworkinterface_linux.cpp
+)
+
+qt_extend_target(Network CONDITION UNIX AND NOT QT_FEATURE_linux_netlink
+    SOURCES
+        kernel/qnetworkinterface_unix.cpp
+)
+
+qt_extend_target(Network CONDITION ANDROID AND QT_FEATURE_dnslookup
+    SOURCES
+        kernel/qdnslookup_android.cpp
+)
+
+qt_extend_target(Network CONDITION WIN32
+    SOURCES
+        kernel/qhostinfo_win.cpp
+)
+
+qt_extend_target(Network CONDITION WIN32 AND NOT WINRT
+    SOURCES
+        kernel/qnetworkinterface_win.cpp
+        kernel/qnetworkproxy_win.cpp
+        socket/qnativesocketengine_win.cpp
+    LIBRARIES
+        advapi32
+        dnsapi
+        iphlpapi
+)
+
+qt_extend_target(Network CONDITION QT_FEATURE_dnslookup AND WIN32 AND NOT WINRT
+    SOURCES
+        kernel/qdnslookup_win.cpp
+)
+
+qt_extend_target(Network CONDITION WINRT
+    SOURCES
+        kernel/qnetworkinterface_winrt.cpp
+        socket/qnativesocketengine_winrt.cpp socket/qnativesocketengine_winrt_p.h
+)
+
+qt_extend_target(Network CONDITION QT_FEATURE_dnslookup AND WINRT
+    SOURCES
+        kernel/qdnslookup_winrt.cpp
+)
+
+qt_extend_target(Network CONDITION APPLE AND NOT APPLE_UIKIT
+    LIBRARIES
+        ${FWCoreServices}
+        ${FWSystemConfiguration}
+)
+
+qt_extend_target(Network CONDITION APPLE_IOS OR APPLE_OSX
+    SOURCES
+        kernel/qnetconmonitor_darwin.mm
+    LIBRARIES
+        ${FWSystemConfiguration}
+)
+
+qt_extend_target(Network CONDITION QT_FEATURE_netlistmgr AND NOT APPLE_IOS AND NOT APPLE_OSX
+    SOURCES
+        kernel/qnetconmonitor_win.cpp
+)
+
+qt_extend_target(Network CONDITION NOT APPLE_IOS AND NOT APPLE_OSX AND NOT QT_FEATURE_netlistmgr
+    SOURCES
+        kernel/qnetconmonitor_stub.cpp
+)
+
+qt_extend_target(Network CONDITION QT_FEATURE_gssapi
+    LIBRARIES
+        GSSAPI::GSSAPI
+)
+
+qt_extend_target(Network CONDITION APPLE_UIKIT
+    SOURCES
+        kernel/qnetworkinterface_uikit_p.h
+)
+
+qt_extend_target(Network CONDITION APPLE_OSX
+    SOURCES
+        kernel/qnetworkproxy_mac.cpp
+)
+
+qt_extend_target(Network CONDITION QT_FEATURE_libproxy AND NOT APPLE_OSX AND (UNIX OR WINRT)
+    SOURCES
+        kernel/qnetworkproxy_libproxy.cpp
+    LIBRARIES
+        ${CMAKE_DL_LIBS}
+        PkgConfig::Libproxy
+)
+
+qt_extend_target(Network CONDITION NOT APPLE_OSX AND NOT QT_FEATURE_libproxy AND (UNIX OR WINRT)
+    SOURCES
+        kernel/qnetworkproxy_generic.cpp
+)
+
+qt_extend_target(Network CONDITION QT_FEATURE_socks5
+    SOURCES
+        socket/qsocks5socketengine.cpp socket/qsocks5socketengine_p.h
+)
+
+qt_extend_target(Network CONDITION QT_FEATURE_sctp
+    SOURCES
+        socket/qsctpserver.cpp socket/qsctpserver.h socket/qsctpserver_p.h
+        socket/qsctpsocket.cpp socket/qsctpsocket.h socket/qsctpsocket_p.h
+)
+
+qt_extend_target(Network CONDITION NOT WINRT
+    SOURCES
+        socket/qnativesocketengine.cpp socket/qnativesocketengine_p.h
+)
+
+qt_extend_target(Network CONDITION MSVC
+    MOC_OPTIONS
+        "-D_WINSOCK_DEPRECATED_NO_WARNINGS"
+)
+
+qt_extend_target(Network CONDITION QT_FEATURE_localserver
+    SOURCES
+        socket/qlocalserver.cpp socket/qlocalserver.h socket/qlocalserver_p.h
+        socket/qlocalsocket.cpp socket/qlocalsocket.h socket/qlocalsocket_p.h
+)
+
+qt_extend_target(Network CONDITION QT_FEATURE_localserver AND (INTEGRITY OR WINRT)
+    SOURCES
+        socket/qlocalserver_tcp.cpp
+        socket/qlocalsocket_tcp.cpp
+    DEFINES
+        QT_LOCALSOCKET_TCP
+)
+
+qt_extend_target(Network CONDITION QT_FEATURE_localserver AND UNIX AND NOT INTEGRITY AND NOT WINRT
+    SOURCES
+        socket/qlocalserver_unix.cpp
+        socket/qlocalsocket_unix.cpp
+)
+
+qt_extend_target(Network CONDITION QT_FEATURE_localserver AND WIN32 AND NOT WINRT
+    SOURCES
+        socket/qlocalserver_win.cpp
+        socket/qlocalsocket_win.cpp
+)
+
+qt_extend_target(Network CONDITION QT_FEATURE_system_proxies
+    DEFINES
+        QT_USE_SYSTEM_PROXIES
+)
+
+qt_extend_target(Network CONDITION NOT QT_FEATURE_openssl
+    SOURCES
+        ssl/qsslcertificate_qt.cpp
+)
+
+qt_extend_target(Network CONDITION QT_FEATURE_ssl
+    SOURCES
+        ssl/qocspresponse.cpp ssl/qocspresponse.h ssl/qocspresponse_p.h
+        ssl/qsslcipher.cpp ssl/qsslcipher.h ssl/qsslcipher_p.h
+        ssl/qsslconfiguration.cpp ssl/qsslconfiguration.h ssl/qsslconfiguration_p.h
+        ssl/qssldiffiehellmanparameters.cpp ssl/qssldiffiehellmanparameters.h ssl/qssldiffiehellmanparameters_p.h
+        ssl/qsslellipticcurve.cpp ssl/qsslellipticcurve.h
+        ssl/qsslerror.cpp ssl/qsslerror.h
+        ssl/qsslkey.h ssl/qsslkey_p.cpp ssl/qsslkey_p.h
+        ssl/qsslpresharedkeyauthenticator.cpp ssl/qsslpresharedkeyauthenticator.h ssl/qsslpresharedkeyauthenticator_p.h
+        ssl/qsslsocket.cpp ssl/qsslsocket.h ssl/qsslsocket_p.h
+)
+
+qt_extend_target(Network CONDITION QT_FEATURE_ssl AND WINRT
+    SOURCES
+        ssl/qsslcertificate_winrt.cpp
+        ssl/qssldiffiehellmanparameters_dummy.cpp
+        ssl/qsslellipticcurve_dummy.cpp
+        ssl/qsslkey_qt.cpp
+        ssl/qsslkey_winrt.cpp
+        ssl/qsslsocket_winrt.cpp ssl/qsslsocket_winrt_p.h
+)
+
+qt_extend_target(Network CONDITION QT_FEATURE_schannel AND QT_FEATURE_ssl
+    SOURCES
+        ssl/qsslcertificate_schannel.cpp
+        ssl/qssldiffiehellmanparameters_dummy.cpp
+        ssl/qsslellipticcurve_dummy.cpp
+        ssl/qsslkey_qt.cpp
+        ssl/qsslkey_schannel.cpp
+        ssl/qsslsocket_qt.cpp
+        ssl/qsslsocket_schannel.cpp ssl/qsslsocket_schannel_p.h
+    LIBRARIES
+        Crypt32
+        Secur32
+        bcrypt
+        ncrypt
+)
+
+qt_extend_target(Network CONDITION QT_FEATURE_securetransport AND QT_FEATURE_ssl
+    SOURCES
+        ssl/qssldiffiehellmanparameters_dummy.cpp
+        ssl/qsslellipticcurve_dummy.cpp
+        ssl/qsslkey_mac.cpp
+        ssl/qsslkey_qt.cpp
+        ssl/qsslsocket_mac.cpp ssl/qsslsocket_mac_p.h
+        ssl/qsslsocket_mac_shared.cpp
+        ssl/qsslsocket_qt.cpp
+)
+
+qt_extend_target(Network CONDITION QT_FEATURE_dtls AND QT_FEATURE_ssl
+    SOURCES
+        ssl/qdtls.cpp ssl/qdtls.h ssl/qdtls_p.h
+)
+
+qt_extend_target(Network CONDITION QT_FEATURE_openssl AND QT_FEATURE_ssl
+    SOURCES
+        ssl/qsslcertificate_openssl.cpp
+        ssl/qsslcontext_openssl.cpp ssl/qsslcontext_openssl_p.h
+        ssl/qssldiffiehellmanparameters_openssl.cpp
+        ssl/qsslellipticcurve_openssl.cpp
+        ssl/qsslkey_openssl.cpp
+        ssl/qsslsocket_openssl.cpp ssl/qsslsocket_openssl_p.h
+        ssl/qsslsocket_openssl_symbols.cpp ssl/qsslsocket_openssl_symbols_p.h
+    DEFINES
+        OPENSSL_API_COMPAT=0x10100000L
+)
+
+qt_extend_target(Network CONDITION QT_FEATURE_dtls AND QT_FEATURE_openssl AND QT_FEATURE_ssl
+    SOURCES
+        ssl/qdtls_openssl.cpp ssl/qdtls_openssl_p.h
+)
+
+qt_extend_target(Network CONDITION QT_FEATURE_ocsp AND QT_FEATURE_openssl AND QT_FEATURE_ssl
+    SOURCES
+        ssl/qocsp_p.h
+)
+
+qt_extend_target(Network CONDITION APPLE AND QT_FEATURE_openssl AND QT_FEATURE_ssl
+    SOURCES
+        ssl/qsslsocket_mac_shared.cpp
+)
+
+qt_extend_target(Network CONDITION ANDROID AND QT_FEATURE_openssl AND QT_FEATURE_ssl AND NOT ANDROID_EMBEDDED
+    SOURCES
+        ssl/qsslsocket_openssl_android.cpp
+)
+
+qt_extend_target(Network CONDITION ANDROID AND QT_FEATURE_openssl AND QT_FEATURE_openssl_linked AND QT_FEATURE_ssl AND build_pass
+    LIBRARIES
+        crypto_${CMAKE_SYSTEM_PROCESSOR}
+        ssl_${CMAKE_SYSTEM_PROCESSOR}
+)
+
+qt_extend_target(Network CONDITION QT_FEATURE_openssl AND QT_FEATURE_openssl_linked AND QT_FEATURE_ssl AND NOT ANDROID
+    LIBRARIES
+        OpenSSL::SSL
+)
+
+qt_extend_target(Network CONDITION QT_FEATURE_openssl AND QT_FEATURE_ssl AND NOT QT_FEATURE_openssl_linked
+    LIBRARIES
+        OpenSSL::SSL_nolink
+)
+
+qt_extend_target(Network CONDITION QT_FEATURE_openssl AND QT_FEATURE_ssl AND WIN32
+    SOURCES
+        ssl/qwindowscarootfetcher.cpp ssl/qwindowscarootfetcher_p.h
+    LIBRARIES
+        crypt32
+)
+
+qt_extend_target(Network CONDITION QT_FEATURE_dnslookup AND UNIX AND NOT ANDROID AND NOT INTEGRITY
+    SOURCES
+        kernel/qdnslookup_unix.cpp
+)
+qt_add_docs(Network
+    doc/qtnetwork.qdocconf
+)
+
diff --git a/src/network/CMakeLists.txt b/src/network/CMakeLists.txt
new file mode 100644
index 0000000000..c455a00121
--- /dev/null
+++ b/src/network/CMakeLists.txt
@@ -0,0 +1,474 @@
+# Generated from network.pro.
+
+# special case begin
+# Temporary fix for OpenSSL feature detection until we can provide a
+# proper implementation of additional compile tests for library dependencies
+# in configure.json
+
+find_package(OpenSSL)
+if (NOT OPENSSL_FOUND OR NOT OPENSSL_VERSION VERSION_GREATER_EQUAL "1.1.0")
+    set(QT_FEATURE_openssl_runtime OFF CACHE BOOL "" FORCE)
+    set(QT_FEATURE_openssl_linked OFF CACHE BOOL "" FORCE)
+    set(QT_FEATURE_openssl OFF CACHE BOOL "" FORCE)
+endif()
+# special case end
+
+#####################################################################
+## Network Module:
+#####################################################################
+
+qt_add_module(Network
+    SOURCES
+        access/qabstractnetworkcache.cpp access/qabstractnetworkcache.h access/qabstractnetworkcache_p.h
+        access/qhsts.cpp access/qhsts_p.h
+        access/qhstspolicy.cpp access/qhstspolicy.h
+        access/qnetworkaccessauthenticationmanager.cpp access/qnetworkaccessauthenticationmanager_p.h
+        access/qnetworkaccessbackend.cpp access/qnetworkaccessbackend_p.h
+        access/qnetworkaccesscache.cpp access/qnetworkaccesscache_p.h
+        access/qnetworkaccesscachebackend.cpp access/qnetworkaccesscachebackend_p.h
+        access/qnetworkaccessdebugpipebackend.cpp access/qnetworkaccessdebugpipebackend_p.h
+        access/qnetworkaccessfilebackend.cpp access/qnetworkaccessfilebackend_p.h
+        access/qnetworkaccessmanager.cpp access/qnetworkaccessmanager.h access/qnetworkaccessmanager_p.h
+        access/qnetworkcookie.cpp access/qnetworkcookie.h access/qnetworkcookie_p.h
+        access/qnetworkcookiejar.cpp access/qnetworkcookiejar.h access/qnetworkcookiejar_p.h
+        access/qnetworkfile.cpp access/qnetworkfile_p.h
+        access/qnetworkreply.cpp access/qnetworkreply.h access/qnetworkreply_p.h
+        access/qnetworkreplydataimpl.cpp access/qnetworkreplydataimpl_p.h
+        access/qnetworkreplyfileimpl.cpp access/qnetworkreplyfileimpl_p.h
+        access/qnetworkreplyimpl.cpp access/qnetworkreplyimpl_p.h
+        access/qnetworkrequest.cpp access/qnetworkrequest.h access/qnetworkrequest_p.h
+        kernel/qauthenticator.cpp kernel/qauthenticator.h kernel/qauthenticator_p.h
+        kernel/qhostaddress.cpp kernel/qhostaddress.h kernel/qhostaddress_p.h
+        kernel/qhostinfo.cpp kernel/qhostinfo.h kernel/qhostinfo_p.h
+        kernel/qnetconmonitor_p.h
+        kernel/qnetworkdatagram.cpp kernel/qnetworkdatagram.h kernel/qnetworkdatagram_p.h
+        kernel/qnetworkinterface.cpp kernel/qnetworkinterface.h kernel/qnetworkinterface_p.h
+        kernel/qnetworkinterface_unix_p.h
+        kernel/qnetworkproxy.cpp kernel/qnetworkproxy.h
+        kernel/qtnetworkglobal.h kernel/qtnetworkglobal_p.h
+        socket/qabstractsocket.cpp socket/qabstractsocket.h socket/qabstractsocket_p.h
+        socket/qabstractsocketengine.cpp socket/qabstractsocketengine_p.h
+        socket/qtcpserver.cpp socket/qtcpserver.h socket/qtcpserver_p.h
+        socket/qtcpsocket.cpp socket/qtcpsocket.h socket/qtcpsocket_p.h
+        socket/qudpsocket.cpp socket/qudpsocket.h
+        ssl/qasn1element.cpp ssl/qasn1element_p.h
+        ssl/qpassworddigestor.cpp ssl/qpassworddigestor.h
+        ssl/qssl.cpp ssl/qssl.h ssl/qssl_p.h
+        ssl/qsslcertificate.cpp ssl/qsslcertificate.h ssl/qsslcertificate_p.h
+        ssl/qsslcertificateextension.cpp ssl/qsslcertificateextension.h ssl/qsslcertificateextension_p.h
+    DEFINES
+        QT_NO_FOREACH
+        QT_NO_USING_NAMESPACE
+    INCLUDE_DIRECTORIES
+        kernel
+    LIBRARIES
+        Qt::CorePrivate
+    PUBLIC_LIBRARIES
+        Qt::Core
+    PRIVATE_MODULE_INTERFACE
+        Qt::CorePrivate
+    PRECOMPILED_HEADER
+        "../corelib/global/qt_pch.h"
+)
+
+#### Keys ignored in scope 1:.:.:network.pro:<TRUE>:
+# MODULE_WINRT_CAPABILITIES = "internetClient" "internetClientServer" "privateNetworkClientServer"
+# QMAKE_LIBS = "$$QMAKE_LIBS_NETWORK"
+
+## Scopes:
+#####################################################################
+
+qt_extend_target(Network CONDITION MSVC AND (TEST_architecture_arch STREQUAL "i386")
+    LINK_OPTIONS
+        "/BASE:0x64000000"
+)
+
+if(ANDROID AND (QT_FEATURE_bearermanagement))
+    set_property(TARGET Network APPEND PROPERTY QT_ANDROID_BUNDLED_JAR_DEPENDENCIES
+        jar/QtAndroidBearer.jar
+    )
+    set_property(TARGET Network APPEND PROPERTY QT_ANDROID_LIB_DEPENDENCIES
+        plugins/bearer/libplugins_bearer_qandroidbearer.so
+    )
+    set_property(TARGET Network APPEND PROPERTY QT_ANDROID_PERMISSIONS
+        android.permission.ACCESS_NETWORK_STATE
+    )
+endif()
+
+qt_extend_target(Network CONDITION QT_FEATURE_bearermanagement
+    SOURCES
+        bearer/qbearerengine.cpp bearer/qbearerengine_p.h
+        bearer/qbearerengine_impl_p.h
+        bearer/qbearerplugin.cpp bearer/qbearerplugin_p.h
+        bearer/qnetworkconfigmanager.cpp bearer/qnetworkconfigmanager.h bearer/qnetworkconfigmanager_p.cpp bearer/qnetworkconfigmanager_p.h
+        bearer/qnetworkconfiguration.cpp bearer/qnetworkconfiguration.h bearer/qnetworkconfiguration_p.h
+        bearer/qnetworksession.cpp bearer/qnetworksession.h bearer/qnetworksession_p.h
+        bearer/qnetworksession_impl.cpp bearer/qnetworksession_impl_p.h
+        bearer/qsharednetworksession.cpp bearer/qsharednetworksession_p.h
+)
+
+qt_extend_target(Network CONDITION QT_FEATURE_ftp
+    SOURCES
+        access/qftp.cpp access/qftp_p.h
+        access/qnetworkaccessftpbackend.cpp access/qnetworkaccessftpbackend_p.h
+        kernel/qurlinfo.cpp kernel/qurlinfo_p.h
+)
+
+qt_extend_target(Network CONDITION QT_FEATURE_networkdiskcache
+    SOURCES
+        access/qnetworkdiskcache.cpp access/qnetworkdiskcache.h access/qnetworkdiskcache_p.h
+)
+
+qt_extend_target(Network CONDITION QT_FEATURE_settings
+    SOURCES
+        access/qhstsstore.cpp access/qhstsstore_p.h
+)
+
+qt_extend_target(Network CONDITION APPLE
+    LIBRARIES
+        ${FWCoreFoundation}
+        ${FWSecurity}
+)
+
+qt_extend_target(Network CONDITION WASM
+    SOURCES
+        access/qnetworkreplywasmimpl.cpp access/qnetworkreplywasmimpl_p.h
+)
+
+qt_extend_target(Network CONDITION QT_FEATURE_http
+    SOURCES
+        access/http2/bitstreams.cpp access/http2/bitstreams_p.h
+        access/http2/hpack.cpp access/http2/hpack_p.h
+        access/http2/hpacktable.cpp access/http2/hpacktable_p.h
+        access/http2/http2frames.cpp access/http2/http2frames_p.h
+        access/http2/http2protocol.cpp access/http2/http2protocol_p.h
+        access/http2/http2streams.cpp access/http2/http2streams_p.h
+        access/http2/huffman.cpp access/http2/huffman_p.h
+        access/qabstractprotocolhandler.cpp access/qabstractprotocolhandler_p.h
+        access/qhttp2configuration.cpp access/qhttp2configuration.h
+        access/qhttp2protocolhandler.cpp access/qhttp2protocolhandler_p.h
+        access/qhttpmultipart.cpp access/qhttpmultipart.h access/qhttpmultipart_p.h
+        access/qhttpnetworkconnection.cpp access/qhttpnetworkconnection_p.h
+        access/qhttpnetworkconnectionchannel.cpp access/qhttpnetworkconnectionchannel_p.h
+        access/qhttpnetworkheader.cpp access/qhttpnetworkheader_p.h
+        access/qhttpnetworkreply.cpp access/qhttpnetworkreply_p.h
+        access/qhttpnetworkrequest.cpp access/qhttpnetworkrequest_p.h
+        access/qhttpprotocolhandler.cpp access/qhttpprotocolhandler_p.h
+        access/qhttpthreaddelegate.cpp access/qhttpthreaddelegate_p.h
+        access/qnetworkreplyhttpimpl.cpp access/qnetworkreplyhttpimpl_p.h
+        socket/qhttpsocketengine.cpp socket/qhttpsocketengine_p.h
+)
+
+qt_extend_target(Network CONDITION QT_FEATURE_system_zlib
+    LIBRARIES
+        ZLIB::ZLIB
+)
+
+qt_extend_target(Network CONDITION NOT QT_FEATURE_system_zlib
+    INCLUDE_DIRECTORIES
+        ../3rdparty/zlib/src
+)
+
+qt_extend_target(Network CONDITION NOT QT_FEATURE_system_zlib AND NOT no_core_dep
+    LIBRARIES
+        Qt::Core
+)
+
+qt_extend_target(Network CONDITION QT_FEATURE_topleveldomain
+    SOURCES
+        kernel/qtldurl.cpp kernel/qtldurl_p.h
+        kernel/qurltlds_p.h
+)
+
+qt_extend_target(Network CONDITION QT_FEATURE_dnslookup
+    SOURCES
+        kernel/qdnslookup.cpp kernel/qdnslookup.h kernel/qdnslookup_p.h
+)
+
+qt_extend_target(Network CONDITION UNIX
+    SOURCES
+        kernel/qhostinfo_unix.cpp
+        socket/qnativesocketengine_unix.cpp
+        socket/qnet_unix_p.h
+)
+
+qt_extend_target(Network CONDITION QT_FEATURE_dlopen AND UNIX
+    LIBRARIES
+        ${CMAKE_DL_LIBS}
+)
+
+qt_extend_target(Network CONDITION QT_FEATURE_linux_netlink AND UNIX
+    SOURCES
+        kernel/qnetworkinterface_linux.cpp
+)
+
+qt_extend_target(Network CONDITION UNIX AND NOT QT_FEATURE_linux_netlink
+    SOURCES
+        kernel/qnetworkinterface_unix.cpp
+)
+
+qt_extend_target(Network CONDITION ANDROID AND QT_FEATURE_dnslookup
+    SOURCES
+        kernel/qdnslookup_android.cpp
+)
+
+qt_extend_target(Network CONDITION WIN32
+    SOURCES
+        kernel/qhostinfo_win.cpp
+)
+
+qt_extend_target(Network CONDITION WIN32 AND NOT WINRT
+    SOURCES
+        kernel/qnetworkinterface_win.cpp
+        kernel/qnetworkproxy_win.cpp
+        socket/qnativesocketengine_win.cpp
+    LIBRARIES
+        advapi32
+        dnsapi
+        iphlpapi
+)
+
+qt_extend_target(Network CONDITION QT_FEATURE_dnslookup AND WIN32 AND NOT WINRT
+    SOURCES
+        kernel/qdnslookup_win.cpp
+)
+
+qt_extend_target(Network CONDITION WINRT
+    SOURCES
+        kernel/qnetworkinterface_winrt.cpp
+        socket/qnativesocketengine_winrt.cpp socket/qnativesocketengine_winrt_p.h
+)
+
+qt_extend_target(Network CONDITION QT_FEATURE_dnslookup AND WINRT
+    SOURCES
+        kernel/qdnslookup_winrt.cpp
+)
+
+qt_extend_target(Network CONDITION APPLE AND NOT APPLE_UIKIT
+    LIBRARIES
+        ${FWCoreServices}
+        ${FWSystemConfiguration}
+)
+
+qt_extend_target(Network CONDITION APPLE_IOS OR APPLE_OSX
+    SOURCES
+        kernel/qnetconmonitor_darwin.mm
+    LIBRARIES
+        ${FWSystemConfiguration}
+)
+
+qt_extend_target(Network CONDITION QT_FEATURE_netlistmgr AND NOT APPLE_IOS AND NOT APPLE_OSX
+    SOURCES
+        kernel/qnetconmonitor_win.cpp
+)
+
+qt_extend_target(Network CONDITION NOT APPLE_IOS AND NOT APPLE_OSX AND NOT QT_FEATURE_netlistmgr
+    SOURCES
+        kernel/qnetconmonitor_stub.cpp
+)
+
+qt_extend_target(Network CONDITION QT_FEATURE_gssapi
+    LIBRARIES
+        GSSAPI::GSSAPI
+)
+
+qt_extend_target(Network CONDITION APPLE_UIKIT
+    SOURCES
+        kernel/qnetworkinterface_uikit_p.h
+)
+
+qt_extend_target(Network CONDITION APPLE_OSX
+    SOURCES
+        kernel/qnetworkproxy_mac.cpp
+)
+
+qt_extend_target(Network CONDITION QT_FEATURE_libproxy AND NOT APPLE_OSX AND (UNIX OR WINRT)
+    SOURCES
+        kernel/qnetworkproxy_libproxy.cpp
+    LIBRARIES
+        ${CMAKE_DL_LIBS}
+        PkgConfig::Libproxy
+)
+
+qt_extend_target(Network CONDITION NOT APPLE_OSX AND NOT QT_FEATURE_libproxy AND (UNIX OR WINRT)
+    SOURCES
+        kernel/qnetworkproxy_generic.cpp
+)
+
+qt_extend_target(Network CONDITION QT_FEATURE_socks5
+    SOURCES
+        socket/qsocks5socketengine.cpp socket/qsocks5socketengine_p.h
+)
+
+qt_extend_target(Network CONDITION QT_FEATURE_sctp
+    SOURCES
+        socket/qsctpserver.cpp socket/qsctpserver.h socket/qsctpserver_p.h
+        socket/qsctpsocket.cpp socket/qsctpsocket.h socket/qsctpsocket_p.h
+)
+
+qt_extend_target(Network CONDITION NOT WINRT
+    SOURCES
+        socket/qnativesocketengine.cpp socket/qnativesocketengine_p.h
+)
+
+qt_extend_target(Network CONDITION MSVC
+    MOC_OPTIONS
+        "-D_WINSOCK_DEPRECATED_NO_WARNINGS"
+)
+
+qt_extend_target(Network CONDITION QT_FEATURE_localserver
+    SOURCES
+        socket/qlocalserver.cpp socket/qlocalserver.h socket/qlocalserver_p.h
+        socket/qlocalsocket.cpp socket/qlocalsocket.h socket/qlocalsocket_p.h
+)
+
+qt_extend_target(Network CONDITION QT_FEATURE_localserver AND (INTEGRITY OR WINRT)
+    SOURCES
+        socket/qlocalserver_tcp.cpp
+        socket/qlocalsocket_tcp.cpp
+    DEFINES
+        QT_LOCALSOCKET_TCP
+)
+
+qt_extend_target(Network CONDITION QT_FEATURE_localserver AND UNIX AND NOT INTEGRITY AND NOT WINRT
+    SOURCES
+        socket/qlocalserver_unix.cpp
+        socket/qlocalsocket_unix.cpp
+)
+
+qt_extend_target(Network CONDITION QT_FEATURE_localserver AND WIN32 AND NOT WINRT
+    SOURCES
+        socket/qlocalserver_win.cpp
+        socket/qlocalsocket_win.cpp
+)
+
+qt_extend_target(Network CONDITION QT_FEATURE_system_proxies
+    DEFINES
+        QT_USE_SYSTEM_PROXIES
+)
+
+qt_extend_target(Network CONDITION NOT QT_FEATURE_openssl
+    SOURCES
+        ssl/qsslcertificate_qt.cpp
+)
+
+qt_extend_target(Network CONDITION QT_FEATURE_ssl
+    SOURCES
+        ssl/qocspresponse.cpp ssl/qocspresponse.h ssl/qocspresponse_p.h
+        ssl/qsslcipher.cpp ssl/qsslcipher.h ssl/qsslcipher_p.h
+        ssl/qsslconfiguration.cpp ssl/qsslconfiguration.h ssl/qsslconfiguration_p.h
+        ssl/qssldiffiehellmanparameters.cpp ssl/qssldiffiehellmanparameters.h ssl/qssldiffiehellmanparameters_p.h
+        ssl/qsslellipticcurve.cpp ssl/qsslellipticcurve.h
+        ssl/qsslerror.cpp ssl/qsslerror.h
+        ssl/qsslkey.h ssl/qsslkey_p.cpp ssl/qsslkey_p.h
+        ssl/qsslpresharedkeyauthenticator.cpp ssl/qsslpresharedkeyauthenticator.h ssl/qsslpresharedkeyauthenticator_p.h
+        ssl/qsslsocket.cpp ssl/qsslsocket.h ssl/qsslsocket_p.h
+)
+
+qt_extend_target(Network CONDITION QT_FEATURE_ssl AND WINRT
+    SOURCES
+        ssl/qsslcertificate_winrt.cpp
+        ssl/qssldiffiehellmanparameters_dummy.cpp
+        ssl/qsslellipticcurve_dummy.cpp
+        ssl/qsslkey_qt.cpp
+        ssl/qsslkey_winrt.cpp
+        ssl/qsslsocket_winrt.cpp ssl/qsslsocket_winrt_p.h
+)
+
+qt_extend_target(Network CONDITION QT_FEATURE_schannel AND QT_FEATURE_ssl
+    SOURCES
+        ssl/qsslcertificate_schannel.cpp
+        ssl/qssldiffiehellmanparameters_dummy.cpp
+        ssl/qsslellipticcurve_dummy.cpp
+        ssl/qsslkey_qt.cpp
+        ssl/qsslkey_schannel.cpp
+        ssl/qsslsocket_qt.cpp
+        ssl/qsslsocket_schannel.cpp ssl/qsslsocket_schannel_p.h
+    LIBRARIES
+        Crypt32
+        Secur32
+        bcrypt
+        ncrypt
+)
+
+qt_extend_target(Network CONDITION QT_FEATURE_securetransport AND QT_FEATURE_ssl
+    SOURCES
+        ssl/qssldiffiehellmanparameters_dummy.cpp
+        ssl/qsslellipticcurve_dummy.cpp
+        ssl/qsslkey_mac.cpp
+        ssl/qsslkey_qt.cpp
+        ssl/qsslsocket_mac.cpp ssl/qsslsocket_mac_p.h
+        ssl/qsslsocket_mac_shared.cpp
+        ssl/qsslsocket_qt.cpp
+)
+
+qt_extend_target(Network CONDITION QT_FEATURE_dtls AND QT_FEATURE_ssl
+    SOURCES
+        ssl/qdtls.cpp ssl/qdtls.h ssl/qdtls_p.h
+)
+
+qt_extend_target(Network CONDITION QT_FEATURE_openssl AND QT_FEATURE_ssl
+    SOURCES
+        ssl/qsslcertificate_openssl.cpp
+        ssl/qsslcontext_openssl.cpp ssl/qsslcontext_openssl_p.h
+        ssl/qssldiffiehellmanparameters_openssl.cpp
+        ssl/qsslellipticcurve_openssl.cpp
+        ssl/qsslkey_openssl.cpp
+        ssl/qsslsocket_openssl.cpp ssl/qsslsocket_openssl_p.h
+        ssl/qsslsocket_openssl_symbols.cpp ssl/qsslsocket_openssl_symbols_p.h
+    DEFINES
+        OPENSSL_API_COMPAT=0x10100000L
+)
+
+qt_extend_target(Network CONDITION QT_FEATURE_dtls AND QT_FEATURE_openssl AND QT_FEATURE_ssl
+    SOURCES
+        ssl/qdtls_openssl.cpp ssl/qdtls_openssl_p.h
+)
+
+qt_extend_target(Network CONDITION QT_FEATURE_ocsp AND QT_FEATURE_openssl AND QT_FEATURE_ssl
+    SOURCES
+        ssl/qocsp_p.h
+)
+
+qt_extend_target(Network CONDITION APPLE AND QT_FEATURE_openssl AND QT_FEATURE_ssl
+    SOURCES
+        ssl/qsslsocket_mac_shared.cpp
+)
+
+qt_extend_target(Network CONDITION ANDROID AND QT_FEATURE_openssl AND QT_FEATURE_ssl AND NOT ANDROID_EMBEDDED
+    SOURCES
+        ssl/qsslsocket_openssl_android.cpp
+)
+
+qt_extend_target(Network CONDITION ANDROID AND QT_FEATURE_openssl AND QT_FEATURE_openssl_linked AND QT_FEATURE_ssl AND build_pass
+    LIBRARIES
+        crypto_${CMAKE_SYSTEM_PROCESSOR}
+        ssl_${CMAKE_SYSTEM_PROCESSOR}
+)
+
+qt_extend_target(Network CONDITION QT_FEATURE_openssl AND QT_FEATURE_openssl_linked AND QT_FEATURE_ssl AND NOT ANDROID
+    LIBRARIES
+        OpenSSL::SSL
+)
+
+qt_extend_target(Network CONDITION QT_FEATURE_openssl AND QT_FEATURE_ssl AND NOT QT_FEATURE_openssl_linked
+    LIBRARIES
+        OpenSSL::SSL_nolink
+)
+
+qt_extend_target(Network CONDITION QT_FEATURE_openssl AND QT_FEATURE_ssl AND WIN32
+    SOURCES
+        ssl/qwindowscarootfetcher.cpp ssl/qwindowscarootfetcher_p.h
+    LIBRARIES
+        crypt32
+)
+
+qt_extend_target(Network CONDITION QT_FEATURE_dnslookup AND UNIX AND NOT ANDROID AND NOT INTEGRITY
+    SOURCES
+        kernel/qdnslookup_unix.cpp
+)
+qt_add_docs(Network
+    doc/qtnetwork.qdocconf
+)
+
+qt_extend_target(Network CONDITION WIN32 PUBLIC_LIBRARIES ws2_32) # special case: mkspecs/common/msvc-desktop.conf
diff --git a/src/network/access/access.pri b/src/network/access/access.pri
index cfb20dcd71..083fbbf5fd 100644
--- a/src/network/access/access.pri
+++ b/src/network/access/access.pri
@@ -114,11 +114,4 @@ qtConfig(http) {
         access/qhttpthreaddelegate_p.h \
         access/qnetworkreplyhttpimpl_p.h \
         access/qhttp2configuration.h
-
-    qtConfig(ssl) {
-        SOURCES += \
-            access/qspdyprotocolhandler.cpp
-        HEADERS += \
-            access/qspdyprotocolhandler_p.h
-    }
 }
diff --git a/src/network/access/qabstractnetworkcache.h b/src/network/access/qabstractnetworkcache.h
index e357dfe58f..a4048c5b8f 100644
--- a/src/network/access/qabstractnetworkcache.h
+++ b/src/network/access/qabstractnetworkcache.h
@@ -52,7 +52,6 @@ QT_BEGIN_NAMESPACE
 class QIODevice;
 class QDateTime;
 class QUrl;
-template<class T> class QList;
 
 class QNetworkCacheMetaDataPrivate;
 class Q_NETWORK_EXPORT QNetworkCacheMetaData
diff --git a/src/network/access/qhsts_p.h b/src/network/access/qhsts_p.h
index c219d9eab5..b5be4ff455 100644
--- a/src/network/access/qhsts_p.h
+++ b/src/network/access/qhsts_p.h
@@ -66,7 +66,6 @@
 
 QT_BEGIN_NAMESPACE
 
-template<typename T> class QList;
 template <typename T> class QVector;
 
 class Q_AUTOTEST_EXPORT QHstsCache
diff --git a/src/network/access/qhttp2protocolhandler.cpp b/src/network/access/qhttp2protocolhandler.cpp
index dce51d4fd5..efbeb17d39 100644
--- a/src/network/access/qhttp2protocolhandler.cpp
+++ b/src/network/access/qhttp2protocolhandler.cpp
@@ -332,13 +332,13 @@ bool QHttp2ProtocolHandler::sendRequest()
         // so we cannot create new streams.
         m_channel->emitFinishedWithError(QNetworkReply::ProtocolUnknownError,
                                          "GOAWAY received, cannot start a request");
-        m_channel->spdyRequestsToSend.clear();
+        m_channel->h2RequestsToSend.clear();
         return false;
     }
 
     // Process 'fake' (created by QNetworkAccessManager::connectToHostEncrypted())
     // requests first:
-    auto &requests = m_channel->spdyRequestsToSend;
+    auto &requests = m_channel->h2RequestsToSend;
     for (auto it = requests.begin(), endIt = requests.end(); it != endIt;) {
         const auto &pair = *it;
         const QString scheme(pair.first.url().scheme());
@@ -862,7 +862,7 @@ void QHttp2ProtocolHandler::handleGOAWAY()
     m_channel->emitFinishedWithError(QNetworkReply::ProtocolUnknownError,
                                      "GOAWAY received, cannot start a request");
     // Also, prevent further calls to sendRequest:
-    m_channel->spdyRequestsToSend.clear();
+    m_channel->h2RequestsToSend.clear();
 
     QNetworkReply::NetworkError error = QNetworkReply::NoError;
     QString message;
@@ -1281,7 +1281,7 @@ quint32 QHttp2ProtocolHandler::createNewStream(const HttpMessagePair &message, b
     const auto replyPrivate = reply->d_func();
     replyPrivate->connection = m_connection;
     replyPrivate->connectionChannel = m_channel;
-    reply->setSpdyWasUsed(true);
+    reply->setHttp2WasUsed(true);
     streamIDs.insert(reply, newStreamID);
     connect(reply, SIGNAL(destroyed(QObject*)),
             this, SLOT(_q_replyDestroyed(QObject*)));
@@ -1387,7 +1387,7 @@ void QHttp2ProtocolHandler::deleteActiveStream(quint32 streamID)
     }
 
     removeFromSuspended(streamID);
-    if (m_channel->spdyRequestsToSend.size())
+    if (m_channel->h2RequestsToSend.size())
         QMetaObject::invokeMethod(this, "sendRequest", Qt::QueuedConnection);
 }
 
@@ -1506,7 +1506,7 @@ void QHttp2ProtocolHandler::initReplyFromPushPromise(const HttpMessagePair &mess
     Q_ASSERT(promisedData.contains(cacheKey));
     auto promise = promisedData.take(cacheKey);
     Q_ASSERT(message.second);
-    message.second->setSpdyWasUsed(true);
+    message.second->setHttp2WasUsed(true);
 
     qCDebug(QT_HTTP2) << "found cached/promised response on stream" << promise.reservedID;
 
diff --git a/src/network/access/qhttpnetworkconnection.cpp b/src/network/access/qhttpnetworkconnection.cpp
index fce01bf349..b64e4fde86 100644
--- a/src/network/access/qhttpnetworkconnection.cpp
+++ b/src/network/access/qhttpnetworkconnection.cpp
@@ -82,9 +82,6 @@ QHttpNetworkConnectionPrivate::QHttpNetworkConnectionPrivate(const QString &host
   hostName(hostName), port(port), encrypt(encrypt), delayIpv4(true)
   , activeChannelCount(type == QHttpNetworkConnection::ConnectionTypeHTTP2
                        || type == QHttpNetworkConnection::ConnectionTypeHTTP2Direct
-#ifndef QT_NO_SSL
-                       || type == QHttpNetworkConnection::ConnectionTypeSPDY
-#endif
                        ? 1 : defaultHttpChannelCount)
   , channelCount(defaultHttpChannelCount)
 #ifndef QT_NO_NETWORKPROXY
@@ -93,9 +90,9 @@ QHttpNetworkConnectionPrivate::QHttpNetworkConnectionPrivate(const QString &host
   , preConnectRequests(0)
   , connectionType(type)
 {
-    // We allocate all 6 channels even if it's SPDY or HTTP/2 enabled
-    // connection: in case the protocol negotiation via NPN/ALPN fails,
-    // we will have normally working HTTP/1.1.
+    // We allocate all 6 channels even if it's HTTP/2 enabled connection:
+    // in case the protocol negotiation via NPN/ALPN fails, we will have
+    // normally working HTTP/1.1.
     Q_ASSERT(channelCount >= activeChannelCount);
     channels = new QHttpNetworkConnectionChannel[channelCount];
 }
@@ -641,10 +638,10 @@ QHttpNetworkReply* QHttpNetworkConnectionPrivate::queueRequest(const QHttpNetwor
             break;
         }
     }
-    else { // SPDY, HTTP/2 ('h2' mode)
+    else { // HTTP/2 ('h2' mode)
         if (!pair.second->d_func()->requestIsPrepared)
             prepareRequest(pair);
-        channels[0].spdyRequestsToSend.insert(request.priority(), pair);
+        channels[0].h2RequestsToSend.insert(request.priority(), pair);
     }
 
 #ifndef Q_OS_WINRT
@@ -680,7 +677,7 @@ void QHttpNetworkConnectionPrivate::fillHttp2Queue()
     for (auto &pair : highPriorityQueue) {
         if (!pair.second->d_func()->requestIsPrepared)
             prepareRequest(pair);
-        channels[0].spdyRequestsToSend.insert(QHttpNetworkRequest::HighPriority, pair);
+        channels[0].h2RequestsToSend.insert(QHttpNetworkRequest::HighPriority, pair);
     }
 
     highPriorityQueue.clear();
@@ -688,7 +685,7 @@ void QHttpNetworkConnectionPrivate::fillHttp2Queue()
     for (auto &pair : lowPriorityQueue) {
         if (!pair.second->d_func()->requestIsPrepared)
             prepareRequest(pair);
-        channels[0].spdyRequestsToSend.insert(pair.first.priority(), pair);
+        channels[0].h2RequestsToSend.insert(pair.first.priority(), pair);
     }
 
     lowPriorityQueue.clear();
@@ -984,12 +981,12 @@ void QHttpNetworkConnectionPrivate::removeReply(QHttpNetworkReply *reply)
             }
         }
 #ifndef QT_NO_SSL
-        // is the reply inside the SPDY pipeline of this channel already?
-        QMultiMap<int, HttpMessagePair>::iterator it = channels[i].spdyRequestsToSend.begin();
-        QMultiMap<int, HttpMessagePair>::iterator end = channels[i].spdyRequestsToSend.end();
+        // is the reply inside the H2 pipeline of this channel already?
+        QMultiMap<int, HttpMessagePair>::iterator it = channels[i].h2RequestsToSend.begin();
+        QMultiMap<int, HttpMessagePair>::iterator end = channels[i].h2RequestsToSend.end();
         for (; it != end; ++it) {
             if (it.value().second == reply) {
-                channels[i].spdyRequestsToSend.remove(it.key());
+                channels[i].h2RequestsToSend.remove(it.key());
 
                 QMetaObject::invokeMethod(q, "_q_startNextRequest", Qt::QueuedConnection);
                 return;
@@ -1068,9 +1065,8 @@ void QHttpNetworkConnectionPrivate::_q_startNextRequest()
         break;
     }
     case QHttpNetworkConnection::ConnectionTypeHTTP2Direct:
-    case QHttpNetworkConnection::ConnectionTypeHTTP2:
-    case QHttpNetworkConnection::ConnectionTypeSPDY: {
-        if (channels[0].spdyRequestsToSend.isEmpty() && channels[0].switchedToHttp2)
+    case QHttpNetworkConnection::ConnectionTypeHTTP2: {
+        if (channels[0].h2RequestsToSend.isEmpty() && channels[0].switchedToHttp2)
             return;
 
         if (networkLayerState == IPv4)
@@ -1079,7 +1075,7 @@ void QHttpNetworkConnectionPrivate::_q_startNextRequest()
             channels[0].networkLayerPreference = QAbstractSocket::IPv6Protocol;
         channels[0].ensureConnection();
         if (channels[0].socket && channels[0].socket->state() == QAbstractSocket::ConnectedState
-                && !channels[0].pendingEncrypt && channels[0].spdyRequestsToSend.size())
+                && !channels[0].pendingEncrypt && channels[0].h2RequestsToSend.size())
             channels[0].sendRequest();
         break;
     }
@@ -1234,19 +1230,18 @@ void QHttpNetworkConnectionPrivate::_q_hostLookupFinished(const QHostInfo &info)
         if (dequeueRequest(channels[0].socket)) {
             emitReplyError(channels[0].socket, channels[0].reply, QNetworkReply::HostNotFoundError);
             networkLayerState = QHttpNetworkConnectionPrivate::Unknown;
-        } else if (connectionType == QHttpNetworkConnection::ConnectionTypeSPDY
-                   || connectionType == QHttpNetworkConnection::ConnectionTypeHTTP2
+        } else if (connectionType == QHttpNetworkConnection::ConnectionTypeHTTP2
                    || connectionType == QHttpNetworkConnection::ConnectionTypeHTTP2Direct) {
-            for (const HttpMessagePair &spdyPair : qAsConst(channels[0].spdyRequestsToSend)) {
+            for (const HttpMessagePair &h2Pair : qAsConst(channels[0].h2RequestsToSend)) {
                 // emit error for all replies
-                QHttpNetworkReply *currentReply = spdyPair.second;
+                QHttpNetworkReply *currentReply = h2Pair.second;
                 Q_ASSERT(currentReply);
                 emitReplyError(channels[0].socket, currentReply, QNetworkReply::HostNotFoundError);
             }
         } else {
             // Should not happen: we start a host lookup before sending a request,
-            // so it's natural to have requests either in SPDY/HTTP/2 queue,
-            // or in low/high priority queues.
+            // so it's natural to have requests either in HTTP/2 queue, or in low/high
+            // priority queues.
             qWarning("QHttpNetworkConnectionPrivate::_q_hostLookupFinished"
                      " could not de-queue request, failed to report HostNotFoundError");
             networkLayerState = QHttpNetworkConnectionPrivate::Unknown;
@@ -1576,17 +1571,12 @@ void QHttpNetworkConnectionPrivate::emitProxyAuthenticationRequired(const QHttpN
     pauseConnection();
     QHttpNetworkReply *reply;
     if (connectionType == QHttpNetworkConnection::ConnectionTypeHTTP2
-        || connectionType == QHttpNetworkConnection::ConnectionTypeHTTP2Direct
-#if QT_CONFIG(ssl)
-        || connectionType == QHttpNetworkConnection::ConnectionTypeSPDY
-#endif
-        ) {
-
+        || connectionType == QHttpNetworkConnection::ConnectionTypeHTTP2Direct) {
         // we choose the reply to emit the proxyAuth signal from somewhat arbitrarily,
         // but that does not matter because the signal will ultimately be emitted
         // by the QNetworkAccessManager.
-        Q_ASSERT(chan->spdyRequestsToSend.count() > 0);
-        reply = chan->spdyRequestsToSend.cbegin().value().second;
+        Q_ASSERT(chan->h2RequestsToSend.count() > 0);
+        reply = chan->h2RequestsToSend.cbegin().value().second;
     } else { // HTTP
         reply = chan->reply;
     }
diff --git a/src/network/access/qhttpnetworkconnection_p.h b/src/network/access/qhttpnetworkconnection_p.h
index 845b55bc5d..cfce3ecc00 100644
--- a/src/network/access/qhttpnetworkconnection_p.h
+++ b/src/network/access/qhttpnetworkconnection_p.h
@@ -96,7 +96,6 @@ public:
 
     enum ConnectionType {
         ConnectionTypeHTTP,
-        ConnectionTypeSPDY,
         ConnectionTypeHTTP2,
         ConnectionTypeHTTP2Direct
     };
@@ -172,7 +171,6 @@ private:
     friend class QHttpNetworkConnectionChannel;
     friend class QHttp2ProtocolHandler;
     friend class QHttpProtocolHandler;
-    friend class QSpdyProtocolHandler;
 
     Q_PRIVATE_SLOT(d_func(), void _q_startNextRequest())
     Q_PRIVATE_SLOT(d_func(), void _q_hostLookupFinished(QHostInfo))
diff --git a/src/network/access/qhttpnetworkconnectionchannel.cpp b/src/network/access/qhttpnetworkconnectionchannel.cpp
index 319c4953b1..c1bb19650f 100644
--- a/src/network/access/qhttpnetworkconnectionchannel.cpp
+++ b/src/network/access/qhttpnetworkconnectionchannel.cpp
@@ -48,7 +48,6 @@
 
 #include <private/qhttp2protocolhandler_p.h>
 #include <private/qhttpprotocolhandler_p.h>
-#include <private/qspdyprotocolhandler_p.h>
 #include <private/http2protocol_p.h>
 
 #ifndef QT_NO_SSL
@@ -931,7 +930,7 @@ void QHttpNetworkConnectionChannel::_q_connected()
     } else if (connection->connectionType() == QHttpNetworkConnection::ConnectionTypeHTTP2Direct) {
         state = QHttpNetworkConnectionChannel::IdleState;
         protocolHandler.reset(new QHttp2ProtocolHandler(this));
-        if (spdyRequestsToSend.count() > 0) {
+        if (h2RequestsToSend.count() > 0) {
             // In case our peer has sent us its settings (window size, max concurrent streams etc.)
             // let's give _q_receiveReply a chance to read them first ('invokeMethod', QueuedConnection).
             QMetaObject::invokeMethod(connection, "_q_startNextRequest", Qt::QueuedConnection);
@@ -1109,15 +1108,11 @@ void QHttpNetworkConnectionChannel::_q_error(QAbstractSocket::SocketError socket
              || !connection->d_func()->lowPriorityQueue.isEmpty());
 
     if (connection->connectionType() == QHttpNetworkConnection::ConnectionTypeHTTP2
-        || connection->connectionType() == QHttpNetworkConnection::ConnectionTypeHTTP2Direct
-#ifndef QT_NO_SSL
-        || connection->connectionType() == QHttpNetworkConnection::ConnectionTypeSPDY
-#endif
-       ) {
-        QList<HttpMessagePair> spdyPairs = spdyRequestsToSend.values();
-        for (int a = 0; a < spdyPairs.count(); ++a) {
+        || connection->connectionType() == QHttpNetworkConnection::ConnectionTypeHTTP2Direct) {
+        QList<HttpMessagePair> h2Pairs = h2RequestsToSend.values();
+        for (int a = 0; a < h2Pairs.count(); ++a) {
             // emit error for all replies
-            QHttpNetworkReply *currentReply = spdyPairs.at(a).second;
+            QHttpNetworkReply *currentReply = h2Pairs.at(a).second;
             Q_ASSERT(currentReply);
             emit currentReply->finishedWithError(errorCode, errorString);
         }
@@ -1144,12 +1139,8 @@ void QHttpNetworkConnectionChannel::_q_error(QAbstractSocket::SocketError socket
 void QHttpNetworkConnectionChannel::_q_proxyAuthenticationRequired(const QNetworkProxy &proxy, QAuthenticator* auth)
 {
     if (connection->connectionType() == QHttpNetworkConnection::ConnectionTypeHTTP2
-        || connection->connectionType() == QHttpNetworkConnection::ConnectionTypeHTTP2Direct
-#ifndef QT_NO_SSL
-        || connection->connectionType() == QHttpNetworkConnection::ConnectionTypeSPDY
-#endif
-        ) {
-        if (spdyRequestsToSend.count() > 0)
+        || connection->connectionType() == QHttpNetworkConnection::ConnectionTypeHTTP2Direct) {
+        if (h2RequestsToSend.count() > 0)
             connection->d_func()->emitProxyAuthenticationRequired(this, proxy, auth);
     } else { // HTTP
         // Need to dequeue the request before we can emit the error.
@@ -1172,9 +1163,9 @@ void QHttpNetworkConnectionChannel::emitFinishedWithError(QNetworkReply::Network
 {
     if (reply)
         emit reply->finishedWithError(error, QHttpNetworkConnectionChannel::tr(message));
-    QList<HttpMessagePair> spdyPairs = spdyRequestsToSend.values();
-    for (int a = 0; a < spdyPairs.count(); ++a) {
-        QHttpNetworkReply *currentReply = spdyPairs.at(a).second;
+    QList<HttpMessagePair> h2Pairs = h2RequestsToSend.values();
+    for (int a = 0; a < h2Pairs.count(); ++a) {
+        QHttpNetworkReply *currentReply = h2Pairs.at(a).second;
         Q_ASSERT(currentReply);
         emit currentReply->finishedWithError(error, QHttpNetworkConnectionChannel::tr(message));
     }
@@ -1196,12 +1187,6 @@ void QHttpNetworkConnectionChannel::_q_encrypted()
             QByteArray nextProtocol = sslSocket->sslConfiguration().nextNegotiatedProtocol();
             if (nextProtocol == QSslConfiguration::NextProtocolHttp1_1) {
                 // fall through to create a QHttpProtocolHandler
-            } else if (nextProtocol == QSslConfiguration::NextProtocolSpdy3_0) {
-                protocolHandler.reset(new QSpdyProtocolHandler(this));
-                connection->setConnectionType(QHttpNetworkConnection::ConnectionTypeSPDY);
-                // no need to re-queue requests, if SPDY was enabled on the request it
-                // has gone to the SPDY queue already
-                break;
             } else if (nextProtocol == QSslConfiguration::ALPNProtocolHTTP2) {
                 switchedToHttp2 = true;
                 protocolHandler.reset(new QHttp2ProtocolHandler(this));
@@ -1230,8 +1215,6 @@ void QHttpNetworkConnectionChannel::_q_encrypted()
             // it again on other channels that our connection can create/open.
             if (connection->connectionType() == QHttpNetworkConnection::ConnectionTypeHTTP2)
                 protocols.removeAll(QSslConfiguration::ALPNProtocolHTTP2);
-            else if (connection->connectionType() == QHttpNetworkConnection::ConnectionTypeSPDY)
-                protocols.removeAll(QSslConfiguration::NextProtocolSpdy3_0);
 
             if (nProtocols > protocols.size()) {
                 sslConfiguration->setAllowedNextProtocols(protocols);
@@ -1241,13 +1224,13 @@ void QHttpNetworkConnectionChannel::_q_encrypted()
             }
 
             connection->setConnectionType(QHttpNetworkConnection::ConnectionTypeHTTP);
-            // We use only one channel for SPDY or HTTP/2, but normally six for
+            // We use only one channel for HTTP/2, but normally six for
             // HTTP/1.1 - let's restore this number to the reserved number of
             // channels:
             if (connection->d_func()->activeChannelCount < connection->d_func()->channelCount) {
                 connection->d_func()->activeChannelCount = connection->d_func()->channelCount;
-                // re-queue requests from SPDY queue to HTTP queue, if any
-                requeueSpdyRequests();
+                // re-queue requests from HTTP/2 queue to HTTP queue, if any
+                requeueHttp2Requests();
             }
             break;
         }
@@ -1267,11 +1250,9 @@ void QHttpNetworkConnectionChannel::_q_encrypted()
     state = QHttpNetworkConnectionChannel::IdleState;
     pendingEncrypt = false;
 
-    if (connection->connectionType() == QHttpNetworkConnection::ConnectionTypeSPDY ||
-        connection->connectionType() == QHttpNetworkConnection::ConnectionTypeHTTP2 ||
+    if (connection->connectionType() == QHttpNetworkConnection::ConnectionTypeHTTP2 ||
         connection->connectionType() == QHttpNetworkConnection::ConnectionTypeHTTP2Direct) {
-        // we call setSpdyWasUsed(true) on the replies in the SPDY handler when the request is sent
-        if (spdyRequestsToSend.count() > 0) {
+        if (h2RequestsToSend.count() > 0) {
             // In case our peer has sent us its settings (window size, max concurrent streams etc.)
             // let's give _q_receiveReply a chance to read them first ('invokeMethod', QueuedConnection).
             QMetaObject::invokeMethod(connection, "_q_startNextRequest", Qt::QueuedConnection);
@@ -1280,7 +1261,7 @@ void QHttpNetworkConnectionChannel::_q_encrypted()
         if (!reply)
             connection->d_func()->dequeueRequest(socket);
         if (reply) {
-            reply->setSpdyWasUsed(false);
+            reply->setHttp2WasUsed(false);
             Q_ASSERT(reply->d_func()->connectionChannel == this);
             emit reply->encrypted();
         }
@@ -1289,13 +1270,12 @@ void QHttpNetworkConnectionChannel::_q_encrypted()
     }
 }
 
-void QHttpNetworkConnectionChannel::requeueSpdyRequests()
+void QHttpNetworkConnectionChannel::requeueHttp2Requests()
 {
-    QList<HttpMessagePair> spdyPairs = spdyRequestsToSend.values();
-    for (int a = 0; a < spdyPairs.count(); ++a) {
-        connection->d_func()->requeueRequest(spdyPairs.at(a));
-    }
-    spdyRequestsToSend.clear();
+    QList<HttpMessagePair> h2Pairs = h2RequestsToSend.values();
+    for (int a = 0; a < h2Pairs.count(); ++a)
+        connection->d_func()->requeueRequest(h2Pairs.at(a));
+    h2RequestsToSend.clear();
 }
 
 void QHttpNetworkConnectionChannel::_q_sslErrors(const QList<QSslError> &errors)
@@ -1313,11 +1293,11 @@ void QHttpNetworkConnectionChannel::_q_sslErrors(const QList<QSslError> &errors)
             emit reply->sslErrors(errors);
     }
 #ifndef QT_NO_SSL
-    else { // SPDY
-        QList<HttpMessagePair> spdyPairs = spdyRequestsToSend.values();
-        for (int a = 0; a < spdyPairs.count(); ++a) {
+    else { // HTTP/2
+        QList<HttpMessagePair> h2Pairs = h2RequestsToSend.values();
+        for (int a = 0; a < h2Pairs.count(); ++a) {
             // emit SSL errors for all replies
-            QHttpNetworkReply *currentReply = spdyPairs.at(a).second;
+            QHttpNetworkReply *currentReply = h2Pairs.at(a).second;
             Q_ASSERT(currentReply);
             emit currentReply->sslErrors(errors);
         }
@@ -1337,10 +1317,10 @@ void QHttpNetworkConnectionChannel::_q_preSharedKeyAuthenticationRequired(QSslPr
         if (reply)
             emit reply->preSharedKeyAuthenticationRequired(authenticator);
     } else {
-        QList<HttpMessagePair> spdyPairs = spdyRequestsToSend.values();
-        for (int a = 0; a < spdyPairs.count(); ++a) {
+        QList<HttpMessagePair> h2Pairs = h2RequestsToSend.values();
+        for (int a = 0; a < h2Pairs.count(); ++a) {
             // emit SSL errors for all replies
-            QHttpNetworkReply *currentReply = spdyPairs.at(a).second;
+            QHttpNetworkReply *currentReply = h2Pairs.at(a).second;
             Q_ASSERT(currentReply);
             emit currentReply->preSharedKeyAuthenticationRequired(authenticator);
         }
diff --git a/src/network/access/qhttpnetworkconnectionchannel_p.h b/src/network/access/qhttpnetworkconnectionchannel_p.h
index d8ac3979d1..c73c4c3bd5 100644
--- a/src/network/access/qhttpnetworkconnectionchannel_p.h
+++ b/src/network/access/qhttpnetworkconnectionchannel_p.h
@@ -123,10 +123,7 @@ public:
     bool authenticationCredentialsSent;
     bool proxyCredentialsSent;
     QScopedPointer<QAbstractProtocolHandler> protocolHandler;
-    // SPDY or HTTP/2 requests; SPDY is TLS-only, but
-    // HTTP/2 can be cleartext also, that's why it's
-    // outside of QT_NO_SSL section. Sorted by priority:
-    QMultiMap<int, HttpMessagePair> spdyRequestsToSend;
+    QMultiMap<int, HttpMessagePair> h2RequestsToSend;
     bool switchedToHttp2 = false;
 #ifndef QT_NO_SSL
     bool ignoreAllSslErrors;
@@ -135,7 +132,7 @@ public:
     void ignoreSslErrors();
     void ignoreSslErrors(const QList<QSslError> &errors);
     void setSslConfiguration(const QSslConfiguration &config);
-    void requeueSpdyRequests(); // when we wanted SPDY but got HTTP
+    void requeueHttp2Requests(); // when we wanted HTTP/2 but got HTTP/1.1
 #endif
     // to emit the signal for all in-flight replies:
     void emitFinishedWithError(QNetworkReply::NetworkError error, const char *message);
diff --git a/src/network/access/qhttpnetworkreply.cpp b/src/network/access/qhttpnetworkreply.cpp
index 2024c0fefb..78413062b4 100644
--- a/src/network/access/qhttpnetworkreply.cpp
+++ b/src/network/access/qhttpnetworkreply.cpp
@@ -292,14 +292,14 @@ bool QHttpNetworkReply::isPipeliningUsed() const
     return d_func()->pipeliningUsed;
 }
 
-bool QHttpNetworkReply::isSpdyUsed() const
+bool QHttpNetworkReply::isHttp2Used() const
 {
-    return d_func()->spdyUsed;
+    return d_func()->h2Used;
 }
 
-void QHttpNetworkReply::setSpdyWasUsed(bool spdy)
+void QHttpNetworkReply::setHttp2WasUsed(bool h2)
 {
-    d_func()->spdyUsed = spdy;
+    d_func()->h2Used = h2;
 }
 
 qint64 QHttpNetworkReply::removedContentLength() const
@@ -329,15 +329,11 @@ QHttpNetworkReplyPrivate::QHttpNetworkReplyPrivate(const QUrl &newUrl)
       forceConnectionCloseEnabled(false),
       lastChunkRead(false),
       currentChunkSize(0), currentChunkRead(0), readBufferMaxSize(0),
-      windowSizeDownload(65536), // 64K initial window size according to SPDY standard
-      windowSizeUpload(65536), // 64K initial window size according to SPDY standard
-      currentlyReceivedDataInWindow(0),
-      currentlyUploadedDataInWindow(0),
       totallyUploadedData(0),
       removedContentLength(-1),
       connection(nullptr),
       autoDecompress(false), responseData(), requestIsPrepared(false)
-      ,pipeliningUsed(false), spdyUsed(false), downstreamLimited(false)
+      ,pipeliningUsed(false), h2Used(false), downstreamLimited(false)
       ,userProvidedDownloadBuffer(nullptr)
 #ifndef QT_NO_COMPRESS
       ,inflateStrm(nullptr)
diff --git a/src/network/access/qhttpnetworkreply_p.h b/src/network/access/qhttpnetworkreply_p.h
index 9c03a403e1..4638d056de 100644
--- a/src/network/access/qhttpnetworkreply_p.h
+++ b/src/network/access/qhttpnetworkreply_p.h
@@ -139,8 +139,8 @@ public:
     bool isFinished() const;
 
     bool isPipeliningUsed() const;
-    bool isSpdyUsed() const;
-    void setSpdyWasUsed(bool spdy);
+    bool isHttp2Used() const;
+    void setHttp2WasUsed(bool h2Used);
     qint64 removedContentLength() const;
 
     bool isRedirecting() const;
@@ -253,11 +253,7 @@ public:
     qint64 currentChunkSize;
     qint64 currentChunkRead;
     qint64 readBufferMaxSize;
-    qint32 windowSizeDownload; // only for SPDY
-    qint32 windowSizeUpload; // only for SPDY
-    qint32 currentlyReceivedDataInWindow; // only for SPDY
-    qint32 currentlyUploadedDataInWindow; // only for SPDY
-    qint64 totallyUploadedData; // only for SPDY
+    qint64 totallyUploadedData; //  HTTP/2
     qint64 removedContentLength;
     QPointer<QHttpNetworkConnection> connection;
     QPointer<QHttpNetworkConnectionChannel> connectionChannel;
@@ -270,7 +266,7 @@ public:
     bool requestIsPrepared;
 
     bool pipeliningUsed;
-    bool spdyUsed;
+    bool h2Used;
     bool downstreamLimited;
 
     char* userProvidedDownloadBuffer;
diff --git a/src/network/access/qhttpnetworkrequest.cpp b/src/network/access/qhttpnetworkrequest.cpp
index 5fb8885bdf..0b03e6e69e 100644
--- a/src/network/access/qhttpnetworkrequest.cpp
+++ b/src/network/access/qhttpnetworkrequest.cpp
@@ -45,7 +45,7 @@ QT_BEGIN_NAMESPACE
 QHttpNetworkRequestPrivate::QHttpNetworkRequestPrivate(QHttpNetworkRequest::Operation op,
         QHttpNetworkRequest::Priority pri, const QUrl &newUrl)
     : QHttpNetworkHeaderPrivate(newUrl), operation(op), priority(pri), uploadByteDevice(nullptr),
-      autoDecompress(false), pipeliningAllowed(false), spdyAllowed(false), http2Allowed(false),
+      autoDecompress(false), pipeliningAllowed(false), http2Allowed(false),
       http2Direct(false), withCredentials(true), preConnect(false), redirectCount(0),
       redirectPolicy(QNetworkRequest::ManualRedirectPolicy)
 {
@@ -59,7 +59,6 @@ QHttpNetworkRequestPrivate::QHttpNetworkRequestPrivate(const QHttpNetworkRequest
       uploadByteDevice(other.uploadByteDevice),
       autoDecompress(other.autoDecompress),
       pipeliningAllowed(other.pipeliningAllowed),
-      spdyAllowed(other.spdyAllowed),
       http2Allowed(other.http2Allowed),
       http2Direct(other.http2Direct),
       withCredentials(other.withCredentials),
@@ -83,7 +82,6 @@ bool QHttpNetworkRequestPrivate::operator==(const QHttpNetworkRequestPrivate &ot
         && (uploadByteDevice == other.uploadByteDevice)
         && (autoDecompress == other.autoDecompress)
         && (pipeliningAllowed == other.pipeliningAllowed)
-        && (spdyAllowed == other.spdyAllowed)
         && (http2Allowed == other.http2Allowed)
         && (http2Direct == other.http2Direct)
         // we do not clear the customVerb in setOperation
@@ -339,16 +337,6 @@ void QHttpNetworkRequest::setPipeliningAllowed(bool b)
     d->pipeliningAllowed = b;
 }
 
-bool QHttpNetworkRequest::isSPDYAllowed() const
-{
-    return d->spdyAllowed;
-}
-
-void QHttpNetworkRequest::setSPDYAllowed(bool b)
-{
-    d->spdyAllowed = b;
-}
-
 bool QHttpNetworkRequest::isHTTP2Allowed() const
 {
     return d->http2Allowed;
diff --git a/src/network/access/qhttpnetworkrequest_p.h b/src/network/access/qhttpnetworkrequest_p.h
index fb4896195b..f263e348ef 100644
--- a/src/network/access/qhttpnetworkrequest_p.h
+++ b/src/network/access/qhttpnetworkrequest_p.h
@@ -116,9 +116,6 @@ public:
     bool isPipeliningAllowed() const;
     void setPipeliningAllowed(bool b);
 
-    bool isSPDYAllowed() const;
-    void setSPDYAllowed(bool b);
-
     bool isHTTP2Allowed() const;
     void setHTTP2Allowed(bool b);
 
@@ -176,7 +173,6 @@ public:
     mutable QNonContiguousByteDevice* uploadByteDevice;
     bool autoDecompress;
     bool pipeliningAllowed;
-    bool spdyAllowed;
     bool http2Allowed;
     bool http2Direct;
     bool withCredentials;
diff --git a/src/network/access/qhttpthreaddelegate.cpp b/src/network/access/qhttpthreaddelegate.cpp
index dcc8c9337e..fa03bf7a11 100644
--- a/src/network/access/qhttpthreaddelegate.cpp
+++ b/src/network/access/qhttpthreaddelegate.cpp
@@ -236,7 +236,7 @@ QHttpThreadDelegate::QHttpThreadDelegate(QObject *parent) :
     , synchronous(false)
     , incomingStatusCode(0)
     , isPipeliningUsed(false)
-    , isSpdyUsed(false)
+    , isHttp2Used(false)
     , incomingContentLength(-1)
     , removedContentLength(-1)
     , incomingErrorCode(QNetworkReply::NoError)
@@ -320,17 +320,6 @@ void QHttpThreadDelegate::startRequest()
         }
     }
 
-#ifndef QT_NO_SSL
-    if (!isH2 && httpRequest.isSPDYAllowed() && ssl) {
-        connectionType = QHttpNetworkConnection::ConnectionTypeSPDY;
-        urlCopy.setScheme(QStringLiteral("spdy")); // to differentiate SPDY requests from HTTPS requests
-        QList<QByteArray> nextProtocols;
-        nextProtocols << QSslConfiguration::NextProtocolSpdy3_0
-                      << QSslConfiguration::NextProtocolHttp1_1;
-        incomingSslConfiguration->setAllowedNextProtocols(nextProtocols);
-    }
-#endif // QT_NO_SSL
-
 #ifndef QT_NO_NETWORKPROXY
     if (transparentProxy.type() != QNetworkProxy::NoProxy)
         cacheKey = makeCacheKey(urlCopy, &transparentProxy, httpRequest.peerVerifyName());
@@ -658,7 +647,7 @@ void QHttpThreadDelegate::headerChangedSlot()
     isPipeliningUsed = httpReply->isPipeliningUsed();
     incomingContentLength = httpReply->contentLength();
     removedContentLength = httpReply->removedContentLength();
-    isSpdyUsed = httpReply->isSpdyUsed();
+    isHttp2Used = httpReply->isHttp2Used();
 
     emit downloadMetaData(incomingHeaders,
                           incomingStatusCode,
@@ -667,7 +656,7 @@ void QHttpThreadDelegate::headerChangedSlot()
                           downloadBuffer,
                           incomingContentLength,
                           removedContentLength,
-                          isSpdyUsed);
+                          isHttp2Used);
 }
 
 void QHttpThreadDelegate::synchronousHeaderChangedSlot()
@@ -683,7 +672,7 @@ void QHttpThreadDelegate::synchronousHeaderChangedSlot()
     incomingStatusCode = httpReply->statusCode();
     incomingReasonPhrase = httpReply->reasonPhrase();
     isPipeliningUsed = httpReply->isPipeliningUsed();
-    isSpdyUsed = httpReply->isSpdyUsed();
+    isHttp2Used = httpReply->isHttp2Used();
     incomingContentLength = httpReply->contentLength();
 }
 
diff --git a/src/network/access/qhttpthreaddelegate_p.h b/src/network/access/qhttpthreaddelegate_p.h
index a5272fc15c..8a197b0b98 100644
--- a/src/network/access/qhttpthreaddelegate_p.h
+++ b/src/network/access/qhttpthreaddelegate_p.h
@@ -112,7 +112,7 @@ public:
     int incomingStatusCode;
     QString incomingReasonPhrase;
     bool isPipeliningUsed;
-    bool isSpdyUsed;
+    bool isHttp2Used;
     qint64 incomingContentLength;
     qint64 removedContentLength;
     QNetworkReply::NetworkError incomingErrorCode;
diff --git a/src/network/access/qnetworkaccessmanager.cpp b/src/network/access/qnetworkaccessmanager.cpp
index 695f022e4b..21d46011d7 100644
--- a/src/network/access/qnetworkaccessmanager.cpp
+++ b/src/network/access/qnetworkaccessmanager.cpp
@@ -1226,12 +1226,10 @@ void QNetworkAccessManager::connectToHostEncrypted(const QString &hostName, quin
     if (sslConfiguration != QSslConfiguration::defaultConfiguration())
         request.setSslConfiguration(sslConfiguration);
 
-    // There is no way to enable SPDY/HTTP2 via a request, so we need to check
-    // the ssl configuration whether SPDY/HTTP2 is allowed here.
+    // There is no way to enable HTTP2 via a request, so we need to check
+    // the ssl configuration whether HTTP2 is allowed here.
     if (sslConfiguration.allowedNextProtocols().contains(QSslConfiguration::ALPNProtocolHTTP2))
         request.setAttribute(QNetworkRequest::Http2AllowedAttribute, true);
-    else if (sslConfiguration.allowedNextProtocols().contains(QSslConfiguration::NextProtocolSpdy3_0))
-        request.setAttribute(QNetworkRequest::SpdyAllowedAttribute, true);
 
     request.setPeerVerifyName(peerName);
     get(request);
diff --git a/src/network/access/qnetworkaccessmanager.h b/src/network/access/qnetworkaccessmanager.h
index a75b16a6ca..5194afb1be 100644
--- a/src/network/access/qnetworkaccessmanager.h
+++ b/src/network/access/qnetworkaccessmanager.h
@@ -56,7 +56,6 @@ class QIODevice;
 class QAbstractNetworkCache;
 class QAuthenticator;
 class QByteArray;
-template<typename T> class QList;
 class QNetworkCookie;
 class QNetworkCookieJar;
 class QNetworkReply;
diff --git a/src/network/access/qnetworkreplyhttpimpl.cpp b/src/network/access/qnetworkreplyhttpimpl.cpp
index 12f402cabd..c7d22be8f5 100644
--- a/src/network/access/qnetworkreplyhttpimpl.cpp
+++ b/src/network/access/qnetworkreplyhttpimpl.cpp
@@ -775,9 +775,6 @@ void QNetworkReplyHttpImplPrivate::postRequest(const QNetworkRequest &newHttpReq
     if (newHttpRequest.attribute(QNetworkRequest::HttpPipeliningAllowedAttribute).toBool())
         httpRequest.setPipeliningAllowed(true);
 
-    if (request.attribute(QNetworkRequest::SpdyAllowedAttribute).toBool())
-        httpRequest.setSPDYAllowed(true);
-
     if (request.attribute(QNetworkRequest::Http2AllowedAttribute).toBool())
         httpRequest.setHTTP2Allowed(true);
 
@@ -969,7 +966,7 @@ void QNetworkReplyHttpImplPrivate::postRequest(const QNetworkRequest &newHttpReq
                      QSharedPointer<char>(),
                      delegate->incomingContentLength,
                      delegate->removedContentLength,
-                     delegate->isSpdyUsed);
+                     delegate->isHttp2Used);
             replyDownloadData(delegate->synchronousDownloadData);
             httpError(delegate->incomingErrorCode, delegate->incomingErrorDetail);
         } else {
@@ -981,7 +978,7 @@ void QNetworkReplyHttpImplPrivate::postRequest(const QNetworkRequest &newHttpReq
                      QSharedPointer<char>(),
                      delegate->incomingContentLength,
                      delegate->removedContentLength,
-                     delegate->isSpdyUsed);
+                     delegate->isHttp2Used);
             replyDownloadData(delegate->synchronousDownloadData);
         }
 
@@ -1256,7 +1253,7 @@ void QNetworkReplyHttpImplPrivate::replyDownloadMetaData(const QList<QPair<QByte
                                                          QSharedPointer<char> db,
                                                          qint64 contentLength,
                                                          qint64 removedContentLength,
-                                                         bool spdyWasUsed)
+                                                         bool h2Used)
 {
     Q_Q(QNetworkReplyHttpImpl);
     Q_UNUSED(contentLength);
@@ -1282,16 +1279,7 @@ void QNetworkReplyHttpImplPrivate::replyDownloadMetaData(const QList<QPair<QByte
     }
 
     q->setAttribute(QNetworkRequest::HttpPipeliningWasUsedAttribute, pu);
-    const QVariant http2Allowed = request.attribute(QNetworkRequest::Http2AllowedAttribute);
-    const QVariant http2Direct = request.attribute(QNetworkRequest::Http2DirectAttribute);
-    if ((http2Allowed.isValid() && http2Allowed.toBool())
-        || (http2Direct.isValid() && http2Direct.toBool())) {
-        q->setAttribute(QNetworkRequest::Http2WasUsedAttribute, spdyWasUsed);
-        q->setAttribute(QNetworkRequest::SpdyWasUsedAttribute, false);
-    } else {
-        q->setAttribute(QNetworkRequest::SpdyWasUsedAttribute, spdyWasUsed);
-        q->setAttribute(QNetworkRequest::Http2WasUsedAttribute, false);
-    }
+    q->setAttribute(QNetworkRequest::Http2WasUsedAttribute, h2Used);
 
     // reconstruct the HTTP header
     QList<QPair<QByteArray, QByteArray> > headerMap = hm;
diff --git a/src/network/access/qnetworkrequest.cpp b/src/network/access/qnetworkrequest.cpp
index 6cd56499c5..33526bb7d5 100644
--- a/src/network/access/qnetworkrequest.cpp
+++ b/src/network/access/qnetworkrequest.cpp
@@ -272,18 +272,6 @@ QT_BEGIN_NAMESPACE
         The QNetworkSession ConnectInBackground property will be set according to
         this attribute.
 
-    \value SpdyAllowedAttribute
-        Requests only, type: QMetaType::Bool (default: false)
-        Indicates whether the QNetworkAccessManager code is
-        allowed to use SPDY with this request. This applies only
-        to SSL requests, and depends on the server supporting SPDY.
-        Obsolete, use Http2 instead of Spdy.
-
-    \value SpdyWasUsedAttribute
-        Replies only, type: QMetaType::Bool
-        Indicates whether SPDY was used for receiving
-        this reply. Obsolete, use Http2 instead of Spdy.
-
     \value Http2AllowedAttribute
         Requests only, type: QMetaType::Bool (default: false)
         Indicates whether the QNetworkAccessManager code is
@@ -295,12 +283,6 @@ QT_BEGIN_NAMESPACE
         Indicates whether HTTP/2 was used for receiving this reply.
         (This value was introduced in 5.9.)
 
-    \value HTTP2AllowedAttribute
-        Obsolete alias for Http2AllowedAttribute.
-
-    \value HTTP2WasUsedAttribute
-        Obsolete alias for Http2WasUsedAttribute.
-
     \value EmitAllUploadProgressSignalsAttribute
         Requests only, type: QMetaType::Bool (default: false)
         Indicates whether all upload signals should be emitted.
diff --git a/src/network/access/qnetworkrequest.h b/src/network/access/qnetworkrequest.h
index 66b9a43e01..035b5b378a 100644
--- a/src/network/access/qnetworkrequest.h
+++ b/src/network/access/qnetworkrequest.h
@@ -89,18 +89,10 @@ public:
         DownloadBufferAttribute, // internal
         SynchronousRequestAttribute, // internal
         BackgroundRequestAttribute,
-#if QT_DEPRECATED_SINCE(5, 15)
-        SpdyAllowedAttribute,
-        SpdyWasUsedAttribute,
-#endif // QT_DEPRECATED_SINCE(5, 15)
         EmitAllUploadProgressSignalsAttribute = BackgroundRequestAttribute + 3,
         FollowRedirectsAttribute,
         Http2AllowedAttribute,
         Http2WasUsedAttribute,
-#if QT_DEPRECATED_SINCE(5, 15)
-        HTTP2AllowedAttribute Q_DECL_ENUMERATOR_DEPRECATED_X("Use Http2AllowedAttribute") = Http2AllowedAttribute,
-        HTTP2WasUsedAttribute Q_DECL_ENUMERATOR_DEPRECATED_X("Use Http2WasUsedAttribute"),
-#endif // QT_DEPRECATED_SINCE(5, 15)
         OriginalContentLengthAttribute,
         RedirectPolicyAttribute,
         Http2DirectAttribute,
diff --git a/src/network/access/qspdyprotocolhandler_p.h b/src/network/access/qspdyprotocolhandler_p.h
deleted file mode 100644
index 14e2ff388a..0000000000
--- a/src/network/access/qspdyprotocolhandler_p.h
+++ /dev/null
@@ -1,232 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 BlackBerry Limited. All rights reserved.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtNetwork module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QSPDYPROTOCOLHANDLER_H
-#define QSPDYPROTOCOLHANDLER_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists for the convenience
-// of the Network Access API.  This header file may change from
-// version to version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include <QtNetwork/private/qtnetworkglobal_p.h>
-#include <private/qabstractprotocolhandler_p.h>
-#include <QtNetwork/qnetworkreply.h>
-#include <private/qbytedata_p.h>
-
-#include <zlib.h>
-
-QT_REQUIRE_CONFIG(http);
-
-#if !defined(QT_NO_SSL)
-
-QT_BEGIN_NAMESPACE
-
-class QHttpNetworkRequest;
-
-#ifndef HttpMessagePair
-typedef QPair<QHttpNetworkRequest, QHttpNetworkReply*> HttpMessagePair;
-#endif
-
-class QSpdyProtocolHandler : public QObject, public QAbstractProtocolHandler {
-    Q_OBJECT
-public:
-    QSpdyProtocolHandler(QHttpNetworkConnectionChannel *channel);
-    ~QSpdyProtocolHandler();
-
-    enum DataFrameFlag {
-        DataFrame_FLAG_FIN = 0x01,
-        DataFrame_FLAG_COMPRESS = 0x02
-    };
-
-    Q_DECLARE_FLAGS(DataFrameFlags, DataFrameFlag)
-
-    enum ControlFrameFlag {
-        ControlFrame_FLAG_FIN = 0x01,
-        ControlFrame_FLAG_UNIDIRECTIONAL = 0x02
-    };
-
-    Q_DECLARE_FLAGS(ControlFrameFlags, ControlFrameFlag)
-
-    enum SETTINGS_Flag {
-        FLAG_SETTINGS_CLEAR_SETTINGS = 0x01
-    };
-
-    Q_DECLARE_FLAGS(SETTINGS_Flags, SETTINGS_Flag)
-
-    enum SETTINGS_ID_Flag {
-        FLAG_SETTINGS_PERSIST_VALUE = 0x01,
-        FLAG_SETTINGS_PERSISTED = 0x02
-    };
-
-    Q_DECLARE_FLAGS(SETTINGS_ID_Flags, SETTINGS_ID_Flag)
-
-    virtual void _q_receiveReply() override;
-    virtual void _q_readyRead() override;
-    virtual bool sendRequest() override;
-
-private slots:
-    void _q_uploadDataReadyRead();
-    void _q_replyDestroyed(QObject*);
-    void _q_uploadDataDestroyed(QObject *);
-
-private:
-
-    enum FrameType {
-        FrameType_SYN_STREAM = 1,
-        FrameType_SYN_REPLY = 2,
-        FrameType_RST_STREAM = 3,
-        FrameType_SETTINGS = 4,
-        FrameType_PING = 6,
-        FrameType_GOAWAY = 7,
-        FrameType_HEADERS = 8,
-        FrameType_WINDOW_UPDATE = 9,
-        FrameType_CREDENTIAL // has a special type
-    };
-
-    enum StatusCode {
-        StatusCode_PROTOCOL_ERROR = 1,
-        StatusCode_INVALID_STREAM = 2,
-        StatusCode_REFUSED_STREAM = 3,
-        StatusCode_UNSUPPORTED_VERSION = 4,
-        StatusCode_CANCEL = 5,
-        StatusCode_INTERNAL_ERROR = 6,
-        StatusCode_FLOW_CONTROL_ERROR = 7,
-        StatusCode_STREAM_IN_USE = 8,
-        StatusCode_STREAM_ALREADY_CLOSED = 9,
-        StatusCode_INVALID_CREDENTIALS = 10,
-        StatusCode_FRAME_TOO_LARGE = 11
-    };
-
-    enum SETTINGS_ID {
-        SETTINGS_UPLOAD_BANDWIDTH = 1,
-        SETTINGS_DOWNLOAD_BANDWIDTH = 2,
-        SETTINGS_ROUND_TRIP_TIME = 3,
-        SETTINGS_MAX_CONCURRENT_STREAMS = 4,
-        SETTINGS_CURRENT_CWND = 5,
-        SETTINGS_DOWNLOAD_RETRANS_RATE = 6,
-        SETTINGS_INITIAL_WINDOW_SIZE = 7,
-        SETTINGS_CLIENT_CERTIFICATE_VECTOR_SIZE = 8
-    };
-
-    enum GOAWAY_STATUS {
-        GOAWAY_OK = 0,
-        GOAWAY_PROTOCOL_ERROR = 1,
-        GOAWAY_INTERNAL_ERROR = 11
-    };
-
-    enum RST_STREAM_STATUS_CODE {
-        RST_STREAM_PROTOCOL_ERROR = 1,
-        RST_STREAM_INVALID_STREAM = 2,
-        RST_STREAM_REFUSED_STREAM = 3,
-        RST_STREAM_UNSUPPORTED_VERSION = 4,
-        RST_STREAM_CANCEL = 5,
-        RST_STREAM_INTERNAL_ERROR = 6,
-        RST_STREAM_FLOW_CONTROL_ERROR = 7,
-        RST_STREAM_STREAM_IN_USE = 8,
-        RST_STREAM_STREAM_ALREADY_CLOSED = 9,
-        RST_STREAM_INVALID_CREDENTIALS = 10,
-        RST_STREAM_FRAME_TOO_LARGE = 11
-    };
-
-    quint64 bytesAvailable() const;
-    bool readNextChunk(qint64 length, char *sink);
-
-    void sendControlFrame(FrameType type, ControlFrameFlags flags, const char *data, quint32 length);
-
-    void sendSYN_STREAM(const HttpMessagePair &pair, qint32 streamID,
-                        qint32 associatedToStreamID);
-    void sendRST_STREAM(qint32 streamID, RST_STREAM_STATUS_CODE statusCode);
-    void sendPING(quint32 pingID);
-
-    bool uploadData(qint32 streamID);
-    Q_INVOKABLE void sendWINDOW_UPDATE(qint32 streamID, quint32 deltaWindowSize);
-
-    qint64 sendDataFrame(qint32 streamID, DataFrameFlags flags, quint32 length,
-                       const char *data);
-
-    QByteArray composeHeader(const QHttpNetworkRequest &request);
-    bool uncompressHeader(const QByteArray &input, QByteArray *output);
-
-    void handleControlFrame(const QByteArray &frameHeaders);
-    void handleDataFrame(const QByteArray &frameHeaders);
-
-    void handleSYN_STREAM(char, quint32, const QByteArray &frameData);
-    void handleSYN_REPLY(char flags, quint32, const QByteArray &frameData);
-    void handleRST_STREAM(char flags, quint32 length, const QByteArray &frameData);
-    void handleSETTINGS(char flags, quint32 length, const QByteArray &frameData);
-    void handlePING(char, quint32 length, const QByteArray &frameData);
-    void handleGOAWAY(char flags, quint32, const QByteArray &frameData);
-    void handleHEADERS(char flags, quint32, const QByteArray &frameData);
-    void handleWINDOW_UPDATE(char, quint32, const QByteArray &frameData);
-
-    qint32 generateNextStreamID();
-    void parseHttpHeaders(char flags, const QByteArray &frameData);
-
-    void replyFinished(QHttpNetworkReply *httpReply, qint32 streamID);
-    void replyFinishedWithError(QHttpNetworkReply *httpReply, qint32 streamID,
-                                QNetworkReply::NetworkError errorCode, const char *errorMessage);
-
-    qint32 m_nextStreamID;
-    QHash<quint32, HttpMessagePair> m_inFlightStreams;
-    qint32 m_maxConcurrentStreams;
-    quint32 m_initialWindowSize;
-    QByteDataBuffer m_spdyBuffer;
-    bool m_waitingForCompleteStream;
-    z_stream m_deflateStream;
-    z_stream m_inflateStream;
-    QHash<QObject *, qint32> m_streamIDs;
-};
-
-Q_DECLARE_OPERATORS_FOR_FLAGS(QSpdyProtocolHandler::DataFrameFlags)
-Q_DECLARE_OPERATORS_FOR_FLAGS(QSpdyProtocolHandler::ControlFrameFlags)
-Q_DECLARE_OPERATORS_FOR_FLAGS(QSpdyProtocolHandler::SETTINGS_Flags)
-Q_DECLARE_OPERATORS_FOR_FLAGS(QSpdyProtocolHandler::SETTINGS_ID_Flags)
-
-QT_END_NAMESPACE
-
-#endif // !defined(QT_NO_SSL)
-
-#endif // QSPDYPROTOCOLHANDLER_H
diff --git a/src/network/bearer/bearer.pri b/src/network/bearer/bearer.pri
index d58d5ec168..bcb7a5971e 100644
--- a/src/network/bearer/bearer.pri
+++ b/src/network/bearer/bearer.pri
@@ -6,11 +6,14 @@ HEADERS += bearer/qnetworkconfiguration.h \
            bearer/qnetworkconfigmanager_p.h \
            bearer/qnetworkconfiguration_p.h \
            bearer/qnetworksession_p.h \
+           bearer/qnetworksession_impl_p.h \
            bearer/qbearerengine_p.h \
+           bearer/qbearerengine_impl_p.h \
            bearer/qbearerplugin_p.h \
            bearer/qsharednetworksession_p.h
 
 SOURCES += bearer/qnetworksession.cpp \
+           bearer/qnetworksession_impl.cpp \
            bearer/qnetworkconfigmanager.cpp \
            bearer/qnetworkconfiguration.cpp \
            bearer/qnetworkconfigmanager_p.cpp \
diff --git a/src/network/bearer/qbearerengine_impl_p.h b/src/network/bearer/qbearerengine_impl_p.h
new file mode 100644
index 0000000000..4221b73276
--- /dev/null
+++ b/src/network/bearer/qbearerengine_impl_p.h
@@ -0,0 +1,85 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the plugins of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QBEARERENGINE_IMPL_H
+#define QBEARERENGINE_IMPL_H
+
+#include <QtNetwork/private/qbearerengine_p.h>
+
+#ifndef QT_NO_BEARERMANAGEMENT
+
+QT_BEGIN_NAMESPACE
+
+class Q_NETWORK_EXPORT QBearerEngineImpl : public QBearerEngine
+{
+    Q_OBJECT
+
+public:
+    enum ConnectionError {
+        InterfaceLookupError = 0,
+        ConnectError,
+        OperationNotSupported,
+        DisconnectionError,
+    };
+
+    QBearerEngineImpl(QObject *parent = nullptr) : QBearerEngine(parent) {}
+    ~QBearerEngineImpl() {}
+
+    virtual void connectToId(const QString &id) = 0;
+    virtual void disconnectFromId(const QString &id) = 0;
+
+    virtual QString getInterfaceFromId(const QString &id) = 0;
+
+    virtual QNetworkSession::State sessionStateForId(const QString &id) = 0;
+
+    virtual quint64 bytesWritten(const QString &) { return Q_UINT64_C(0); }
+    virtual quint64 bytesReceived(const QString &) { return Q_UINT64_C(0); }
+    virtual quint64 startTime(const QString &) { return Q_UINT64_C(0); }
+
+Q_SIGNALS:
+    void connectionError(const QString &id, QBearerEngineImpl::ConnectionError error);
+};
+
+QT_END_NAMESPACE
+
+Q_DECLARE_METATYPE(QBearerEngineImpl::ConnectionError)
+
+#endif // QT_NO_BEARERMANAGEMENT
+
+#endif // QBEARERENGINE_IMPL_H
diff --git a/src/network/bearer/qnetworksession_impl.cpp b/src/network/bearer/qnetworksession_impl.cpp
new file mode 100644
index 0000000000..45a00b45fd
--- /dev/null
+++ b/src/network/bearer/qnetworksession_impl.cpp
@@ -0,0 +1,439 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the plugins of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+// see comment in ../platformdefs_win.h.
+#define WIN32_LEAN_AND_MEAN 1
+
+#include "qnetworksession_impl_p.h"
+#include "qbearerengine_impl_p.h"
+
+#include <QtNetwork/qnetworksession.h>
+#include <QtNetwork/private/qnetworkconfigmanager_p.h>
+
+#include <QtCore/qdatetime.h>
+#include <QtCore/qdebug.h>
+#include <QtCore/qmutex.h>
+#include <QtCore/qstringlist.h>
+
+#ifndef QT_NO_BEARERMANAGEMENT
+
+QT_BEGIN_NAMESPACE
+
+static QBearerEngineImpl *getEngineFromId(const QString &id)
+{
+    QNetworkConfigurationManagerPrivate *priv = qNetworkConfigurationManagerPrivate();
+    if (priv) {
+        const auto engines = priv->engines();
+        for (QBearerEngine *engine : engines) {
+            QBearerEngineImpl *engineImpl = qobject_cast<QBearerEngineImpl *>(engine);
+            if (engineImpl && engineImpl->hasIdentifier(id))
+                return engineImpl;
+        }
+    }
+
+    return nullptr;
+}
+
+class QNetworkSessionManagerPrivate : public QObject
+{
+    Q_OBJECT
+
+public:
+    QNetworkSessionManagerPrivate(QObject *parent = nullptr) : QObject(parent) {}
+    ~QNetworkSessionManagerPrivate() {}
+
+    inline void forceSessionClose(const QNetworkConfiguration &config)
+    { emit forcedSessionClose(config); }
+
+Q_SIGNALS:
+    void forcedSessionClose(const QNetworkConfiguration &config);
+};
+
+Q_GLOBAL_STATIC(QNetworkSessionManagerPrivate, sessionManager);
+
+void QNetworkSessionPrivateImpl::syncStateWithInterface()
+{
+    connect(sessionManager(), SIGNAL(forcedSessionClose(QNetworkConfiguration)),
+            this, SLOT(forcedSessionClose(QNetworkConfiguration)));
+
+    opened = false;
+    isOpen = false;
+    state = QNetworkSession::Invalid;
+    lastError = QNetworkSession::UnknownSessionError;
+
+    qRegisterMetaType<QBearerEngineImpl::ConnectionError>();
+
+    switch (publicConfig.type()) {
+    case QNetworkConfiguration::InternetAccessPoint:
+        activeConfig = publicConfig;
+        engine = getEngineFromId(activeConfig.identifier());
+        if (engine) {
+            qRegisterMetaType<QNetworkConfigurationPrivatePointer>();
+            connect(engine, SIGNAL(configurationChanged(QNetworkConfigurationPrivatePointer)),
+                    this, SLOT(configurationChanged(QNetworkConfigurationPrivatePointer)),
+                    Qt::QueuedConnection);
+            connect(engine, SIGNAL(connectionError(QString,QBearerEngineImpl::ConnectionError)),
+                    this, SLOT(connectionError(QString,QBearerEngineImpl::ConnectionError)),
+                    Qt::QueuedConnection);
+        }
+        break;
+    case QNetworkConfiguration::ServiceNetwork:
+        serviceConfig = publicConfig;
+        // Defer setting engine and signals until open().
+        Q_FALLTHROUGH();
+    case QNetworkConfiguration::UserChoice:
+        // Defer setting serviceConfig and activeConfig until open().
+        Q_FALLTHROUGH();
+    default:
+        engine = nullptr;
+    }
+
+    networkConfigurationsChanged();
+}
+
+void QNetworkSessionPrivateImpl::open()
+{
+    if (serviceConfig.isValid()) {
+        lastError = QNetworkSession::OperationNotSupportedError;
+        emit QNetworkSessionPrivate::error(lastError);
+    } else if (!isOpen) {
+        if ((activeConfig.state() & QNetworkConfiguration::Discovered) != QNetworkConfiguration::Discovered) {
+            lastError = QNetworkSession::InvalidConfigurationError;
+            state = QNetworkSession::Invalid;
+            emit stateChanged(state);
+            emit QNetworkSessionPrivate::error(lastError);
+            return;
+        }
+        opened = true;
+
+        if ((activeConfig.state() & QNetworkConfiguration::Active) != QNetworkConfiguration::Active &&
+            (activeConfig.state() & QNetworkConfiguration::Discovered) == QNetworkConfiguration::Discovered) {
+            state = QNetworkSession::Connecting;
+            emit stateChanged(state);
+
+            engine->connectToId(activeConfig.identifier());
+        }
+
+        isOpen = (activeConfig.state() & QNetworkConfiguration::Active) == QNetworkConfiguration::Active;
+        if (isOpen)
+            emit quitPendingWaitsForOpened();
+    }
+}
+
+void QNetworkSessionPrivateImpl::close()
+{
+    if (serviceConfig.isValid()) {
+        lastError = QNetworkSession::OperationNotSupportedError;
+        emit QNetworkSessionPrivate::error(lastError);
+    } else if (isOpen) {
+        opened = false;
+        isOpen = false;
+        emit closed();
+    }
+}
+
+void QNetworkSessionPrivateImpl::stop()
+{
+    if (serviceConfig.isValid()) {
+        lastError = QNetworkSession::OperationNotSupportedError;
+        emit QNetworkSessionPrivate::error(lastError);
+    } else {
+        if ((activeConfig.state() & QNetworkConfiguration::Active) == QNetworkConfiguration::Active) {
+            state = QNetworkSession::Closing;
+            emit stateChanged(state);
+
+            engine->disconnectFromId(activeConfig.identifier());
+
+            sessionManager()->forceSessionClose(activeConfig);
+        }
+
+        opened = false;
+        isOpen = false;
+        emit closed();
+    }
+}
+
+void QNetworkSessionPrivateImpl::migrate()
+{
+}
+
+void QNetworkSessionPrivateImpl::accept()
+{
+}
+
+void QNetworkSessionPrivateImpl::ignore()
+{
+}
+
+void QNetworkSessionPrivateImpl::reject()
+{
+}
+
+#ifndef QT_NO_NETWORKINTERFACE
+QNetworkInterface QNetworkSessionPrivateImpl::currentInterface() const
+{
+    if (!engine || state != QNetworkSession::Connected || !publicConfig.isValid())
+        return QNetworkInterface();
+
+    QString iface = engine->getInterfaceFromId(activeConfig.identifier());
+    if (iface.isEmpty())
+        return QNetworkInterface();
+    return QNetworkInterface::interfaceFromName(iface);
+}
+#endif
+
+QVariant QNetworkSessionPrivateImpl::sessionProperty(const QString &key) const
+{
+    if (key == QLatin1String("AutoCloseSessionTimeout")) {
+        if (engine && engine->requiresPolling() &&
+            !(engine->capabilities() & QNetworkConfigurationManager::CanStartAndStopInterfaces)) {
+            return sessionTimeout >= 0 ? sessionTimeout * 10000 : -1;
+        }
+    }
+
+    return QVariant();
+}
+
+void QNetworkSessionPrivateImpl::setSessionProperty(const QString &key, const QVariant &value)
+{
+    if (key == QLatin1String("AutoCloseSessionTimeout")) {
+        if (engine && engine->requiresPolling() &&
+            !(engine->capabilities() & QNetworkConfigurationManager::CanStartAndStopInterfaces)) {
+            int timeout = value.toInt();
+            if (timeout >= 0) {
+                connect(engine, SIGNAL(updateCompleted()),
+                        this, SLOT(decrementTimeout()), Qt::UniqueConnection);
+                sessionTimeout = timeout / 10000;   // convert to poll intervals
+            } else {
+                disconnect(engine, SIGNAL(updateCompleted()), this, SLOT(decrementTimeout()));
+                sessionTimeout = -1;
+            }
+        }
+    }
+}
+
+QString QNetworkSessionPrivateImpl::errorString() const
+{
+    switch (lastError) {
+    case QNetworkSession::UnknownSessionError:
+        return tr("Unknown session error.");
+    case QNetworkSession::SessionAbortedError:
+        return tr("The session was aborted by the user or system.");
+    case QNetworkSession::OperationNotSupportedError:
+        return tr("The requested operation is not supported by the system.");
+    case QNetworkSession::InvalidConfigurationError:
+        return tr("The specified configuration cannot be used.");
+    case QNetworkSession::RoamingError:
+        return tr("Roaming was aborted or is not possible.");
+    default:
+        break;
+    }
+
+    return QString();
+}
+
+QNetworkSession::SessionError QNetworkSessionPrivateImpl::error() const
+{
+    return lastError;
+}
+
+quint64 QNetworkSessionPrivateImpl::bytesWritten() const
+{
+    if (engine && state == QNetworkSession::Connected)
+        return engine->bytesWritten(activeConfig.identifier());
+    return Q_UINT64_C(0);
+}
+
+quint64 QNetworkSessionPrivateImpl::bytesReceived() const
+{
+    if (engine && state == QNetworkSession::Connected)
+        return engine->bytesReceived(activeConfig.identifier());
+    return Q_UINT64_C(0);
+}
+
+quint64 QNetworkSessionPrivateImpl::activeTime() const
+{
+    if (state == QNetworkSession::Connected && startTime != Q_UINT64_C(0))
+        return QDateTime::currentSecsSinceEpoch() - startTime;
+    return Q_UINT64_C(0);
+}
+
+QNetworkSession::UsagePolicies QNetworkSessionPrivateImpl::usagePolicies() const
+{
+    return currentPolicies;
+}
+
+void QNetworkSessionPrivateImpl::setUsagePolicies(QNetworkSession::UsagePolicies newPolicies)
+{
+    if (newPolicies != currentPolicies) {
+        currentPolicies = newPolicies;
+        emit usagePoliciesChanged(currentPolicies);
+    }
+}
+
+void QNetworkSessionPrivateImpl::updateStateFromServiceNetwork()
+{
+    QNetworkSession::State oldState = state;
+
+    const auto configs = serviceConfig.children();
+    for (const QNetworkConfiguration &config : configs) {
+        if ((config.state() & QNetworkConfiguration::Active) != QNetworkConfiguration::Active)
+            continue;
+
+        if (activeConfig != config) {
+            if (engine) {
+                disconnect(engine, SIGNAL(connectionError(QString,QBearerEngineImpl::ConnectionError)),
+                           this, SLOT(connectionError(QString,QBearerEngineImpl::ConnectionError)));
+            }
+
+            activeConfig = config;
+            engine = getEngineFromId(activeConfig.identifier());
+
+            if (engine) {
+                connect(engine, SIGNAL(connectionError(QString,QBearerEngineImpl::ConnectionError)),
+                        this, SLOT(connectionError(QString,QBearerEngineImpl::ConnectionError)),
+                        Qt::QueuedConnection);
+            }
+            emit newConfigurationActivated();
+        }
+
+        state = QNetworkSession::Connected;
+        if (state != oldState)
+            emit stateChanged(state);
+
+        return;
+    }
+
+    if (serviceConfig.children().isEmpty())
+        state = QNetworkSession::NotAvailable;
+    else
+        state = QNetworkSession::Disconnected;
+
+    if (state != oldState)
+        emit stateChanged(state);
+}
+
+void QNetworkSessionPrivateImpl::updateStateFromActiveConfig()
+{
+    if (!engine)
+        return;
+
+    QNetworkSession::State oldState = state;
+    state = engine->sessionStateForId(activeConfig.identifier());
+
+    bool oldActive = isOpen;
+    isOpen = (state == QNetworkSession::Connected) ? opened : false;
+
+    if (!oldActive && isOpen)
+        emit quitPendingWaitsForOpened();
+    if (oldActive && !isOpen)
+        emit closed();
+
+    if (oldState != state)
+        emit stateChanged(state);
+}
+
+void QNetworkSessionPrivateImpl::networkConfigurationsChanged()
+{
+    if (serviceConfig.isValid())
+        updateStateFromServiceNetwork();
+    else
+        updateStateFromActiveConfig();
+
+    if (engine)
+        startTime = engine->startTime(activeConfig.identifier());
+}
+
+void QNetworkSessionPrivateImpl::configurationChanged(QNetworkConfigurationPrivatePointer config)
+{
+    if (serviceConfig.isValid() &&
+        (config->id == serviceConfig.identifier() || config->id == activeConfig.identifier())) {
+        updateStateFromServiceNetwork();
+    } else if (config->id == activeConfig.identifier()) {
+        updateStateFromActiveConfig();
+    }
+}
+
+void QNetworkSessionPrivateImpl::forcedSessionClose(const QNetworkConfiguration &config)
+{
+    if (activeConfig == config) {
+        opened = false;
+        isOpen = false;
+
+        emit closed();
+
+        lastError = QNetworkSession::SessionAbortedError;
+        emit QNetworkSessionPrivate::error(lastError);
+    }
+}
+
+void QNetworkSessionPrivateImpl::connectionError(const QString &id, QBearerEngineImpl::ConnectionError error)
+{
+    if (activeConfig.identifier() == id) {
+        networkConfigurationsChanged();
+        switch (error) {
+        case QBearerEngineImpl::OperationNotSupported:
+            lastError = QNetworkSession::OperationNotSupportedError;
+            opened = false;
+            break;
+        case QBearerEngineImpl::InterfaceLookupError:
+        case QBearerEngineImpl::ConnectError:
+        case QBearerEngineImpl::DisconnectionError:
+        default:
+            lastError = QNetworkSession::UnknownSessionError;
+        }
+
+        emit QNetworkSessionPrivate::error(lastError);
+    }
+}
+
+void QNetworkSessionPrivateImpl::decrementTimeout()
+{
+    if (--sessionTimeout <= 0) {
+        disconnect(engine, SIGNAL(updateCompleted()), this, SLOT(decrementTimeout()));
+        sessionTimeout = -1;
+        close();
+    }
+}
+
+QT_END_NAMESPACE
+
+#include "qnetworksession_impl.moc"
+
+#endif // QT_NO_BEARERMANAGEMENT
diff --git a/src/network/bearer/qnetworksession_impl_p.h b/src/network/bearer/qnetworksession_impl_p.h
new file mode 100644
index 0000000000..b174760152
--- /dev/null
+++ b/src/network/bearer/qnetworksession_impl_p.h
@@ -0,0 +1,134 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the plugins of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QNETWORKSESSION_IMPL_H
+#define QNETWORKSESSION_IMPL_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include "qbearerengine_impl_p.h"
+
+#include <QtNetwork/private/qnetworkconfigmanager_p.h>
+#include <QtNetwork/private/qnetworksession_p.h>
+
+#ifndef QT_NO_BEARERMANAGEMENT
+
+QT_BEGIN_NAMESPACE
+
+class QBearerEngineImpl;
+
+class Q_NETWORK_EXPORT QNetworkSessionPrivateImpl : public QNetworkSessionPrivate
+{
+    Q_OBJECT
+
+public:
+    QNetworkSessionPrivateImpl()
+        : engine(nullptr), startTime(0), lastError(QNetworkSession::UnknownSessionError), sessionTimeout(-1), currentPolicies(QNetworkSession::NoPolicy), opened(false)
+    {}
+    ~QNetworkSessionPrivateImpl()
+    {}
+
+    //called by QNetworkSession constructor and ensures
+    //that the state is immediately updated (w/o actually opening
+    //a session). Also this function should take care of
+    //notification hooks to discover future state changes.
+    void syncStateWithInterface() override;
+
+#ifndef QT_NO_NETWORKINTERFACE
+    QNetworkInterface currentInterface() const override;
+#endif
+    QVariant sessionProperty(const QString& key) const override;
+    void setSessionProperty(const QString& key, const QVariant& value) override;
+
+    void open() override;
+    void close() override;
+    void stop() override;
+    void migrate() override;
+    void accept() override;
+    void ignore() override;
+    void reject() override;
+
+    QString errorString() const override; //must return translated string
+    QNetworkSession::SessionError error() const override;
+
+    quint64 bytesWritten() const override;
+    quint64 bytesReceived() const override;
+    quint64 activeTime() const override;
+
+    QNetworkSession::UsagePolicies usagePolicies() const override;
+    void setUsagePolicies(QNetworkSession::UsagePolicies) override;
+
+private Q_SLOTS:
+    void networkConfigurationsChanged();
+    void configurationChanged(QNetworkConfigurationPrivatePointer config);
+    void forcedSessionClose(const QNetworkConfiguration &config);
+    void connectionError(const QString &id, QBearerEngineImpl::ConnectionError error);
+    void decrementTimeout();
+
+private:
+    void updateStateFromServiceNetwork();
+    void updateStateFromActiveConfig();
+
+private:
+    QBearerEngineImpl *engine;
+
+    quint64 startTime;
+
+    QNetworkSession::SessionError lastError;
+
+    int sessionTimeout;
+    QNetworkSession::UsagePolicies currentPolicies;
+
+    bool opened;
+};
+
+QT_END_NAMESPACE
+
+#endif // QT_NO_BEARERMANAGEMENT
+
+#endif // QNETWORKSESSION_IMPL_H
diff --git a/src/network/configure.cmake b/src/network/configure.cmake
new file mode 100644
index 0000000000..302a97da4f
--- /dev/null
+++ b/src/network/configure.cmake
@@ -0,0 +1,365 @@
+
+
+#### Inputs
+
+
+
+#### Libraries
+
+qt_find_package(Libproxy PROVIDED_TARGETS PkgConfig::Libproxy)
+qt_find_package(OpenSSL PROVIDED_TARGETS OpenSSL::SSL)
+qt_find_package(OpenSSL PROVIDED_TARGETS OpenSSL::SSL)
+qt_find_package(GSSAPI PROVIDED_TARGETS GSSAPI::GSSAPI)
+
+
+#### Tests
+
+# getifaddrs
+qt_config_compile_test(getifaddrs
+    LABEL "getifaddrs()"
+    CODE
+"
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <net/if.h>
+#include <ifaddrs.h>
+
+int main(int argc, char **argv)
+{
+    (void)argc; (void)argv;
+    /* BEGIN TEST: */
+ifaddrs *list;
+getifaddrs(&list);
+freeifaddrs(list);
+    /* END TEST: */
+    return 0;
+}
+"# FIXME: use: unmapped library: network
+)
+
+# ipv6ifname
+qt_config_compile_test(ipv6ifname
+    LABEL "IPv6 ifname"
+    CODE
+"
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <net/if.h>
+
+int main(int argc, char **argv)
+{
+    (void)argc; (void)argv;
+    /* BEGIN TEST: */
+char buf[IFNAMSIZ];
+if_nametoindex(\"eth0\");
+if_indextoname(1, buf);
+if_freenameindex(if_nameindex());
+    /* END TEST: */
+    return 0;
+}
+"# FIXME: use: unmapped library: network
+)
+
+# linux-netlink
+qt_config_compile_test(linux_netlink
+    LABEL "Linux AF_NETLINK sockets"
+    CODE
+"
+#include <asm/types.h>
+#include <linux/netlink.h>
+#include <linux/rtnetlink.h>
+#include <sys/socket.h>
+
+int main(int argc, char **argv)
+{
+    (void)argc; (void)argv;
+    /* BEGIN TEST: */
+struct rtattr rta = { };
+struct ifinfomsg ifi = {};
+struct ifaddrmsg ifa = {};
+struct ifa_cacheinfo ci;
+ci.ifa_prefered = ci.ifa_valid = 0;
+(void)RTM_NEWLINK; (void)RTM_NEWADDR;
+(void)IFLA_ADDRESS; (void)IFLA_IFNAME;
+(void)IFA_ADDRESS; (void)IFA_LABEL; (void)IFA_CACHEINFO;
+(void)(IFA_F_SECONDARY | IFA_F_DEPRECATED | IFA_F_PERMANENT | IFA_F_MANAGETEMPADDR);
+    /* END TEST: */
+    return 0;
+}
+")
+
+# sctp
+qt_config_compile_test(sctp
+    LABEL "SCTP support"
+    CODE
+"
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <netinet/sctp.h>
+
+int main(int argc, char **argv)
+{
+    (void)argc; (void)argv;
+    /* BEGIN TEST: */
+sctp_initmsg sctpInitMsg;
+socklen_t sctpInitMsgSize = sizeof(sctpInitMsg);
+(void) socket(PF_INET, SOCK_STREAM, IPPROTO_SCTP);
+(void) getsockopt(-1, SOL_SCTP, SCTP_INITMSG, &sctpInitMsg, &sctpInitMsgSize);
+    /* END TEST: */
+    return 0;
+}
+"# FIXME: use: unmapped library: network
+)
+
+# dtls
+qt_config_compile_test(dtls
+    LABEL "DTLS support in OpenSSL"
+    LIBRARIES
+        OpenSSL::SSL
+    CODE
+"
+#include <openssl/ssl.h>
+#if defined(OPENSSL_NO_DTLS) || !defined(DTLS1_2_VERSION)
+#  error OpenSSL without DTLS support
+#endif
+int main(int argc, char **argv)
+{
+    (void)argc; (void)argv;
+    /* BEGIN TEST: */
+
+    /* END TEST: */
+    return 0;
+}
+")
+
+# ocsp
+qt_config_compile_test(ocsp
+    LABEL "OCSP stapling support in OpenSSL"
+    LIBRARIES
+        OpenSSL::SSL
+    CODE
+"
+#include <openssl/ssl.h>
+#include <openssl/ocsp.h>
+#if defined(OPENSSL_NO_OCSP) || defined(OPENSSL_NO_TLSEXT)
+#  error OpenSSL without OCSP stapling
+#endif
+int main(int argc, char **argv)
+{
+    (void)argc; (void)argv;
+    /* BEGIN TEST: */
+
+    /* END TEST: */
+    return 0;
+}
+")
+
+# netlistmgr
+qt_config_compile_test(netlistmgr
+    LABEL "Network List Manager"
+    CODE
+"
+#include <netlistmgr.h>
+#include <wrl/client.h>
+
+int main(int argc, char **argv)
+{
+    (void)argc; (void)argv;
+    /* BEGIN TEST: */
+using namespace Microsoft::WRL;
+ComPtr<INetworkListManager> networkListManager;
+ComPtr<IConnectionPoint> connectionPoint;
+ComPtr<IConnectionPointContainer> connectionPointContainer;
+networkListManager.As(&connectionPointContainer);
+connectionPointContainer->FindConnectionPoint(IID_INetworkConnectionEvents, &connectionPoint);
+    /* END TEST: */
+    return 0;
+}
+"# FIXME: qmake: LIBS += -lOle32
+)
+
+
+
+#### Features
+
+qt_feature("corewlan" PUBLIC PRIVATE
+    LABEL "CoreWLan"
+    CONDITION libs.corewlan OR FIXME
+    EMIT_IF APPLE
+)
+qt_feature_definition("corewlan" "QT_NO_COREWLAN" NEGATE VALUE "1")
+qt_feature("getifaddrs" PUBLIC
+    LABEL "getifaddrs()"
+    CONDITION TEST_getifaddrs
+)
+qt_feature_definition("getifaddrs" "QT_NO_GETIFADDRS" NEGATE VALUE "1")
+qt_feature("ipv6ifname" PUBLIC
+    LABEL "IPv6 ifname"
+    CONDITION TEST_ipv6ifname
+)
+qt_feature_definition("ipv6ifname" "QT_NO_IPV6IFNAME" NEGATE VALUE "1")
+qt_feature("libproxy" PRIVATE
+    LABEL "libproxy"
+    AUTODETECT OFF
+    CONDITION Libproxy_FOUND
+)
+qt_feature("linux-netlink" PRIVATE
+    LABEL "Linux AF_NETLINK"
+    CONDITION LINUX AND TEST_linux_netlink
+)
+qt_feature("openssl" PRIVATE
+    LABEL "OpenSSL"
+    CONDITION QT_FEATURE_openssl_runtime OR QT_FEATURE_openssl_linked
+    ENABLE false
+)
+qt_feature_definition("openssl" "QT_NO_OPENSSL" NEGATE)
+qt_feature_config("openssl" QMAKE_PUBLIC_QT_CONFIG)
+qt_feature("openssl-runtime"
+    AUTODETECT NOT WINRT AND NOT WASM
+    CONDITION NOT QT_FEATURE_securetransport AND NOT QT_FEATURE_schannel AND OPENSSL_INCLUDE_DIR
+    ENABLE INPUT_openssl STREQUAL 'yes' OR INPUT_openssl STREQUAL 'runtime'
+    DISABLE INPUT_openssl STREQUAL 'no' OR INPUT_openssl STREQUAL 'linked' OR INPUT_ssl STREQUAL 'no'
+)
+qt_feature("openssl-linked" PRIVATE
+    LABEL "  Qt directly linked to OpenSSL"
+    AUTODETECT OFF
+    CONDITION NOT QT_FEATURE_securetransport AND NOT QT_FEATURE_schannel AND OpenSSL_FOUND
+    ENABLE INPUT_openssl STREQUAL 'linked'
+)
+qt_feature_definition("openssl-linked" "QT_LINKED_OPENSSL")
+qt_feature("securetransport" PUBLIC
+    LABEL "SecureTransport"
+    CONDITION APPLE AND ( INPUT_openssl STREQUAL '' OR INPUT_openssl STREQUAL 'no' )
+    DISABLE INPUT_securetransport STREQUAL 'no' OR INPUT_ssl STREQUAL 'no'
+)
+qt_feature_definition("securetransport" "QT_SECURETRANSPORT")
+qt_feature("schannel" PUBLIC
+    LABEL "Schannel"
+    CONDITION INPUT_schannel STREQUAL 'yes' AND WIN32 AND NOT WINRT AND ( INPUT_openssl STREQUAL '' OR INPUT_openssl STREQUAL 'no' )
+    DISABLE INPUT_schannel STREQUAL 'no' OR INPUT_ssl STREQUAL 'no'
+)
+qt_feature_definition("schannel" "QT_SCHANNEL")
+qt_feature("ssl" PUBLIC
+    LABEL "SSL"
+    CONDITION WINRT OR QT_FEATURE_securetransport OR QT_FEATURE_openssl OR QT_FEATURE_schannel
+)
+qt_feature_definition("ssl" "QT_NO_SSL" NEGATE VALUE "1")
+qt_feature("dtls" PUBLIC
+    SECTION "Networking"
+    LABEL "DTLS"
+    PURPOSE "Provides a DTLS implementation"
+    CONDITION QT_FEATURE_openssl AND QT_FEATURE_udpsocket AND TEST_dtls
+)
+qt_feature("ocsp" PUBLIC
+    SECTION "Networking"
+    LABEL "OCSP-stapling"
+    PURPOSE "Provides OCSP stapling support"
+    CONDITION QT_FEATURE_opensslv11 AND TEST_ocsp
+)
+qt_feature("opensslv11" PUBLIC
+    LABEL "OpenSSL 1.1"
+    CONDITION QT_FEATURE_openssl
+)
+qt_feature("sctp" PUBLIC
+    LABEL "SCTP"
+    AUTODETECT OFF
+    CONDITION TEST_sctp
+)
+qt_feature_definition("sctp" "QT_NO_SCTP" NEGATE VALUE "1")
+qt_feature("system-proxies" PRIVATE
+    LABEL "Use system proxies"
+)
+qt_feature("ftp" PUBLIC
+    SECTION "Networking"
+    LABEL "FTP"
+    PURPOSE "Provides support for the File Transfer Protocol in QNetworkAccessManager."
+    AUTODETECT OFF
+    CONDITION QT_FEATURE_textdate
+)
+qt_feature_definition("ftp" "QT_NO_FTP" NEGATE VALUE "1")
+qt_feature("http" PUBLIC
+    SECTION "Networking"
+    LABEL "HTTP"
+    PURPOSE "Provides support for the Hypertext Transfer Protocol in QNetworkAccessManager."
+    CONDITION QT_FEATURE_thread
+)
+qt_feature_definition("http" "QT_NO_HTTP" NEGATE VALUE "1")
+qt_feature("udpsocket" PUBLIC
+    SECTION "Networking"
+    LABEL "QUdpSocket"
+    PURPOSE "Provides access to UDP sockets."
+)
+qt_feature_definition("udpsocket" "QT_NO_UDPSOCKET" NEGATE VALUE "1")
+qt_feature("networkproxy" PUBLIC
+    SECTION "Networking"
+    LABEL "QNetworkProxy"
+    PURPOSE "Provides network proxy support."
+)
+qt_feature_definition("networkproxy" "QT_NO_NETWORKPROXY" NEGATE VALUE "1")
+qt_feature("socks5" PUBLIC
+    SECTION "Networking"
+    LABEL "SOCKS5"
+    PURPOSE "Provides SOCKS5 support in QNetworkProxy."
+    CONDITION QT_FEATURE_networkproxy
+)
+qt_feature_definition("socks5" "QT_NO_SOCKS5" NEGATE VALUE "1")
+qt_feature("networkinterface" PUBLIC
+    SECTION "Networking"
+    LABEL "QNetworkInterface"
+    PURPOSE "Supports enumerating a host's IP addresses and network interfaces."
+    CONDITION NOT WASM
+)
+qt_feature_definition("networkinterface" "QT_NO_NETWORKINTERFACE" NEGATE VALUE "1")
+qt_feature("networkdiskcache" PUBLIC
+    SECTION "Networking"
+    LABEL "QNetworkDiskCache"
+    PURPOSE "Provides a disk cache for network resources."
+    CONDITION QT_FEATURE_temporaryfile
+)
+qt_feature_definition("networkdiskcache" "QT_NO_NETWORKDISKCACHE" NEGATE VALUE "1")
+qt_feature("bearermanagement" PUBLIC
+    SECTION "Networking"
+    LABEL "Bearer management (deprecated)"
+    PURPOSE "Provides bearer management for the network stack."
+    CONDITION QT_FEATURE_thread AND QT_FEATURE_library AND QT_FEATURE_networkinterface AND QT_FEATURE_properties
+)
+qt_feature_definition("bearermanagement" "QT_NO_BEARERMANAGEMENT" NEGATE VALUE "1")
+qt_feature_definition("bearermanagement" "QT_NO_BEARERMANAGEMENT" NEGATE)
+qt_feature("localserver" PUBLIC
+    SECTION "Networking"
+    LABEL "QLocalServer"
+    PURPOSE "Provides a local socket based server."
+    CONDITION QT_FEATURE_temporaryfile
+)
+qt_feature_definition("localserver" "QT_NO_LOCALSERVER" NEGATE VALUE "1")
+qt_feature("dnslookup" PUBLIC
+    SECTION "Networking"
+    LABEL "QDnsLookup"
+    PURPOSE "Provides API for DNS lookups."
+)
+qt_feature("gssapi" PUBLIC
+    SECTION "Networking"
+    LABEL "GSSAPI"
+    PURPOSE "Enable SPNEGO authentication through GSSAPI"
+    CONDITION NOT WIN32 AND GSSAPI_FOUND
+)
+qt_feature_definition("gssapi" "QT_NO_GSSAPI" NEGATE VALUE "1")
+qt_feature("sspi" PUBLIC
+    SECTION "Networking"
+    LABEL "SSPI"
+    PURPOSE "Enable NTLM/SPNEGO authentication through SSPI"
+    CONDITION WIN32 AND NOT WINRT
+)
+qt_feature_definition("sspi" "QT_NO_SSPI" NEGATE VALUE "1")
+qt_feature("netlistmgr" PRIVATE
+    SECTION "Networking"
+    LABEL "Network List Manager"
+    PURPOSE "Use Network List Manager to keep track of network connectivity"
+    CONDITION WIN32 AND TEST_netlistmgr
+)
+qt_feature("topleveldomain" PUBLIC
+    SECTION "Networking"
+    LABEL "qTopLevelDomain()"
+    PURPOSE "Provides support for extracting the top level domain from URLs.  If enabled, a binary dump of the Public Suffix List (http://www.publicsuffix.org, Mozilla License) is included. The data is then also used in QNetworkCookieJar::validateCookie."
+)
diff --git a/src/network/configure.json b/src/network/configure.json
index d3e5009f45..d6be41128a 100644
--- a/src/network/configure.json
+++ b/src/network/configure.json
@@ -343,6 +343,7 @@
             "label": "FTP",
             "purpose": "Provides support for the File Transfer Protocol in QNetworkAccessManager.",
             "section": "Networking",
+            "autoDetect": false,
             "condition": "features.textdate",
             "output": [ "publicFeature", "feature" ]
         },
@@ -430,6 +431,12 @@
             "section": "Networking",
             "condition": "config.win32 && tests.netlistmgr",
             "output": [ "privateFeature" ]
+        },
+        "topleveldomain": {
+            "label": "qTopLevelDomain()",
+            "purpose": "Provides support for extracting the top level domain from URLs.  If enabled, a binary dump of the Public Suffix List (http://www.publicsuffix.org, Mozilla License) is included. The data is then also used in QNetworkCookieJar::validateCookie.",
+            "section": "Networking",
+            "output": [ "publicFeature" ]
         }
     },
 
@@ -446,15 +453,7 @@ For example:
         {
             "type": "warning",
             "condition": "features.libproxy && input.qt_namespace == ''",
-            "message": "Some of libproxy's plugins may use incompatible Qt versions.
-
-    Some platforms and distributions ship libproxy with plugins, such
-    as config_kde4.so, that are linked against old versions of Qt; and
-    libproxy loads these plugins automatically when initialized. If Qt
-    is not in a namespace, that loading causes a crash. Even if the
-    systems on which you build and test have no such plugins, your
-    users' systems may have them. We therefore recommend that you
-    combine -libproxy with -qtnamespace when configuring Qt."
+            "message": "Some of libproxy's plugins may use incompatible Qt versions.  Some platforms and distributions ship libproxy with plugins, such as config_kde4.so, that are linked against old versions of Qt; and libproxy loads these plugins automatically when initialized. If Qt is not in a namespace, that loading causes a crash. Even if the systems on which you build and test have no such plugins, your users' systems may have them. We therefore recommend that you combine -libproxy with -qtnamespace when configuring Qt."
         }
     ],
 
@@ -488,6 +487,7 @@ For example:
                 "opensslv11",
                 "dtls",
                 "ocsp",
+                "ftp",
                 "sctp",
                 "system-proxies",
                 "gssapi"
diff --git a/src/network/kernel/kernel.pri b/src/network/kernel/kernel.pri
index 110d9f56bf..7dd5b1d97e 100644
--- a/src/network/kernel/kernel.pri
+++ b/src/network/kernel/kernel.pri
@@ -26,6 +26,13 @@ SOURCES += kernel/qauthenticator.cpp \
            kernel/qnetworkinterface.cpp \
            kernel/qnetworkproxy.cpp
 
+
+qtConfig(topleveldomain) {
+    HEADERS += kernel/qurltlds_p.h \
+               kernel/qtldurl_p.h
+    SOURCES += kernel/qtldurl.cpp
+}
+
 qtConfig(ftp) {
     HEADERS += kernel/qurlinfo_p.h
     SOURCES += kernel/qurlinfo.cpp
diff --git a/src/network/kernel/qnetworkinterface.h b/src/network/kernel/qnetworkinterface.h
index 4caedaa38f..c65ea58860 100644
--- a/src/network/kernel/qnetworkinterface.h
+++ b/src/network/kernel/qnetworkinterface.h
@@ -50,7 +50,6 @@
 QT_BEGIN_NAMESPACE
 
 class QDeadlineTimer;
-template<typename T> class QList;
 
 class QNetworkAddressEntryPrivate;
 class Q_NETWORK_EXPORT QNetworkAddressEntry
diff --git a/src/network/kernel/qtldurl.cpp b/src/network/kernel/qtldurl.cpp
new file mode 100644
index 0000000000..c2f7d1de26
--- /dev/null
+++ b/src/network/kernel/qtldurl.cpp
@@ -0,0 +1,139 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtCore module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <qglobal.h>
+
+#include <QtNetwork/private/qtnetworkglobal_p.h>
+
+#if QT_CONFIG(topleveldomain)
+
+#include "qplatformdefs.h"
+#include "qurl.h"
+#include "private/qurltlds_p.h"
+#include "private/qtldurl_p.h"
+#include "QtCore/qstring.h"
+#include "QtCore/qvector.h"
+
+QT_BEGIN_NAMESPACE
+
+enum TLDMatchType {
+    ExactMatch,
+    SuffixMatch,
+    ExceptionMatch,
+};
+
+static bool containsTLDEntry(QStringView entry, TLDMatchType match)
+{
+    const QStringView matchSymbols[] = {
+        u"",
+        u"*",
+        u"!",
+    };
+    const auto symbol = matchSymbols[match];
+    int index = qt_hash(entry, qt_hash(symbol)) % tldCount;
+
+    // select the right chunk from the big table
+    short chunk = 0;
+    uint chunkIndex = tldIndices[index], offset = 0;
+    while (chunk < tldChunkCount && tldIndices[index] >= tldChunks[chunk]) {
+        chunkIndex -= tldChunks[chunk];
+        offset += tldChunks[chunk];
+        chunk++;
+    }
+
+    // check all the entries from the given index
+    while (chunkIndex < tldIndices[index+1] - offset) {
+        const auto utf8 = tldData[chunk] + chunkIndex;
+        if ((symbol.isEmpty() || QLatin1Char(*utf8) == symbol) && entry == QString::fromUtf8(utf8 + symbol.size()))
+            return true;
+        chunkIndex += qstrlen(utf8) + 1; // +1 for the ending \0
+    }
+    return false;
+}
+
+/*!
+    \internal
+
+    Return the top-level-domain per Qt's copy of the Mozilla public suffix list of
+    \a domain.
+*/
+
+Q_NETWORK_EXPORT QString qTopLevelDomain(const QString &domain)
+{
+    const QString domainLower = domain.toLower();
+    QVector<QStringRef> sections = domainLower.splitRef(QLatin1Char('.'), Qt::SkipEmptyParts);
+    if (sections.isEmpty())
+        return QString();
+
+    QString level, tld;
+    for (int j = sections.count() - 1; j >= 0; --j) {
+        level.prepend(QLatin1Char('.') + sections.at(j));
+        if (qIsEffectiveTLD(level.rightRef(level.size() - 1)))
+            tld = level;
+    }
+    return tld;
+}
+
+/*!
+    \internal
+
+    Return true if \a domain is a top-level-domain per Qt's copy of the Mozilla public suffix list.
+*/
+
+Q_NETWORK_EXPORT bool qIsEffectiveTLD(const QStringRef &domain)
+{
+    // for domain 'foo.bar.com':
+    // 1. return if TLD table contains 'foo.bar.com'
+    // 2. else if table contains '*.bar.com',
+    // 3. test that table does not contain '!foo.bar.com'
+
+    if (containsTLDEntry(domain, ExactMatch)) // 1
+        return true;
+
+    const int dot = domain.indexOf(QLatin1Char('.'));
+    if (dot < 0) // Actual TLD: may be effective if the subject of a wildcard rule:
+        return containsTLDEntry(QString(QLatin1Char('.') + domain), SuffixMatch);
+    if (containsTLDEntry(domain.mid(dot), SuffixMatch))   // 2
+        return !containsTLDEntry(domain, ExceptionMatch); // 3
+    return false;
+}
+
+QT_END_NAMESPACE
+
+#endif
diff --git a/src/network/kernel/qtldurl_p.h b/src/network/kernel/qtldurl_p.h
new file mode 100644
index 0000000000..a6948cfd48
--- /dev/null
+++ b/src/network/kernel/qtldurl_p.h
@@ -0,0 +1,71 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtNetwork module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QTLDURL_P_H
+#define QTLDURL_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists for the convenience
+// of qDecodeDataUrl. This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <QtNetwork/private/qtnetworkglobal_p.h>
+#include "QtCore/qurl.h"
+#include "QtCore/qstring.h"
+
+QT_REQUIRE_CONFIG(topleveldomain);
+
+QT_BEGIN_NAMESPACE
+
+Q_NETWORK_EXPORT QString qTopLevelDomain(const QString &domain);
+Q_NETWORK_EXPORT bool qIsEffectiveTLD(const QStringRef &domain);
+inline bool qIsEffectiveTLD(const QString &domain)
+{
+    return qIsEffectiveTLD(QStringRef(&domain));
+}
+
+QT_END_NAMESPACE
+
+#endif // QDATAURL_P_H
diff --git a/src/network/kernel/qurltlds_p.h b/src/network/kernel/qurltlds_p.h
new file mode 100644
index 0000000000..7d79797cd4
--- /dev/null
+++ b/src/network/kernel/qurltlds_p.h
@@ -0,0 +1,14363 @@
+// License: MPL 2.0/GPL 2.0/LGPL 3
+//
+// The contents of this file are subject to the Mozilla Public License Version
+// 2.0 (the "License"); you may not use this file except in compliance with
+// the License. You may obtain a copy of the License at
+// http://www.mozilla.org/MPL/
+//
+// Software distributed under the License is distributed on an "AS IS" basis,
+// WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+// for the specific language governing rights and limitations under the
+// License.
+//
+// The Original Code is the Public Suffix List.
+//
+// The Initial Developer of the Original Code is
+// Jo Hermans <jo.hermans@gmail.com>.
+// Portions created by the Initial Developer are Copyright (C) 2007
+// the Initial Developer. All Rights Reserved.
+//
+// Contributor(s):
+//   Ruben Arakelyan <ruben@wackomenace.co.uk>
+//   Gervase Markham <gerv@gerv.net>
+//   Pamela Greene <pamg.bugs@gmail.com>
+//   David Triendl <david@triendl.name>
+//   Jothan Frakes <jothan@gmail.com>
+//   The kind representatives of many TLD registries
+//
+// Alternatively, the contents of this file may be used under the terms of
+// either the GNU General Public License Version 2 or later (the "GPL"), or
+// the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+// in which case the provisions of the GPL or the LGPL are applicable instead
+// of those above. If you wish to allow use of your version of this file only
+// under the terms of either the GPL or the LGPL, and not to allow others to
+// use your version of this file under the terms of the MPL, indicate your
+// decision by deleting the provisions above and replace them with the notice
+// and other provisions required by the GPL or the LGPL. If you do not delete
+// the provisions above, a recipient may use your version of this file under
+// the terms of any one of the MPL, the GPL or the LGPL.
+//
+
+#ifndef QURLTLD_P_H
+#define QURLTLD_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists for the convenience
+// of the Network Access and Core framework.  This header file may change from
+// version to version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <QtNetwork/private/qtnetworkglobal_p.h>
+
+QT_BEGIN_NAMESPACE
+
+// note to maintainer:
+// this file should be updated before each release ->
+// for instructions see the program at
+// util/corelib/qurl-generateTLDs/
+
+static const quint16 tldCount = 8799;
+static const quint32 tldIndices[] = {
+0,
+29,
+29,
+36,
+36,
+69,
+83,
+97,
+116,
+123,
+133,
+140,
+171,
+186,
+193,
+200,
+200,
+200,
+200,
+225,
+263,
+272,
+305,
+332,
+332,
+378,
+388,
+395,
+425,
+444,
+449,
+449,
+459,
+459,
+459,
+459,
+484,
+513,
+538,
+538,
+538,
+563,
+563,
+580,
+599,
+618,
+618,
+660,
+670,
+670,
+670,
+670,
+682,
+712,
+718,
+750,
+790,
+790,
+812,
+834,
+851,
+869,
+912,
+937,
+977,
+977,
+977,
+977,
+977,
+987,
+987,
+1002,
+1015,
+1024,
+1030,
+1051,
+1051,
+1061,
+1070,
+1076,
+1076,
+1076,
+1094,
+1129,
+1158,
+1195,
+1195,
+1195,
+1215,
+1234,
+1234,
+1245,
+1245,
+1245,
+1245,
+1245,
+1268,
+1276,
+1291,
+1297,
+1304,
+1316,
+1337,
+1379,
+1397,
+1408,
+1413,
+1429,
+1429,
+1429,
+1429,
+1444,
+1467,
+1476,
+1476,
+1505,
+1505,
+1505,
+1523,
+1523,
+1547,
+1547,
+1566,
+1590,
+1590,
+1600,
+1612,
+1612,
+1612,
+1612,
+1631,
+1674,
+1712,
+1712,
+1722,
+1730,
+1751,
+1751,
+1769,
+1769,
+1769,
+1784,
+1784,
+1817,
+1817,
+1817,
+1817,
+1817,
+1817,
+1837,
+1837,
+1850,
+1850,
+1850,
+1850,
+1871,
+1914,
+1914,
+1932,
+1960,
+1960,
+1967,
+1977,
+1977,
+1977,
+1977,
+2015,
+2038,
+2071,
+2090,
+2090,
+2105,
+2121,
+2136,
+2157,
+2157,
+2209,
+2216,
+2231,
+2231,
+2231,
+2231,
+2231,
+2238,
+2238,
+2247,
+2271,
+2318,
+2331,
+2346,
+2359,
+2368,
+2368,
+2368,
+2377,
+2377,
+2377,
+2377,
+2386,
+2391,
+2391,
+2391,
+2398,
+2398,
+2405,
+2461,
+2485,
+2513,
+2513,
+2543,
+2550,
+2550,
+2579,
+2579,
+2579,
+2579,
+2590,
+2630,
+2630,
+2673,
+2673,
+2673,
+2673,
+2673,
+2700,
+2700,
+2700,
+2706,
+2706,
+2767,
+2786,
+2794,
+2818,
+2818,
+2824,
+2835,
+2850,
+2850,
+2868,
+2868,
+2868,
+2875,
+2875,
+2894,
+2912,
+2928,
+2928,
+2928,
+2946,
+2946,
+2956,
+2956,
+2956,
+2956,
+2956,
+2956,
+2974,
+2974,
+2995,
+2995,
+2995,
+3008,
+3014,
+3022,
+3060,
+3060,
+3073,
+3120,
+3127,
+3135,
+3145,
+3200,
+3210,
+3210,
+3210,
+3210,
+3210,
+3210,
+3210,
+3227,
+3244,
+3255,
+3276,
+3285,
+3285,
+3293,
+3293,
+3293,
+3293,
+3332,
+3377,
+3377,
+3384,
+3402,
+3416,
+3416,
+3442,
+3442,
+3442,
+3442,
+3461,
+3461,
+3461,
+3474,
+3474,
+3499,
+3529,
+3540,
+3591,
+3602,
+3602,
+3602,
+3602,
+3624,
+3661,
+3661,
+3668,
+3668,
+3700,
+3733,
+3737,
+3753,
+3799,
+3817,
+3839,
+3839,
+3839,
+3863,
+3894,
+3910,
+3920,
+3920,
+3936,
+3936,
+3947,
+3981,
+3993,
+3993,
+4019,
+4019,
+4023,
+4030,
+4038,
+4038,
+4038,
+4038,
+4038,
+4038,
+4038,
+4038,
+4038,
+4054,
+4054,
+4069,
+4082,
+4088,
+4116,
+4116,
+4120,
+4146,
+4160,
+4177,
+4177,
+4195,
+4204,
+4204,
+4204,
+4214,
+4214,
+4214,
+4229,
+4229,
+4229,
+4229,
+4244,
+4257,
+4265,
+4265,
+4279,
+4290,
+4329,
+4385,
+4385,
+4385,
+4385,
+4396,
+4400,
+4447,
+4465,
+4465,
+4471,
+4492,
+4507,
+4513,
+4513,
+4525,
+4531,
+4531,
+4558,
+4575,
+4591,
+4617,
+4653,
+4658,
+4658,
+4666,
+4712,
+4712,
+4718,
+4718,
+4735,
+4745,
+4745,
+4751,
+4751,
+4772,
+4812,
+4835,
+4835,
+4842,
+4864,
+4864,
+4881,
+4881,
+4897,
+4908,
+4917,
+4933,
+4948,
+4968,
+4968,
+4968,
+4968,
+4974,
+4998,
+5031,
+5038,
+5053,
+5067,
+5083,
+5116,
+5126,
+5133,
+5155,
+5155,
+5155,
+5155,
+5155,
+5155,
+5155,
+5168,
+5173,
+5173,
+5177,
+5188,
+5226,
+5226,
+5271,
+5271,
+5282,
+5282,
+5296,
+5313,
+5313,
+5313,
+5333,
+5333,
+5333,
+5342,
+5358,
+5358,
+5370,
+5374,
+5396,
+5396,
+5396,
+5413,
+5413,
+5413,
+5413,
+5413,
+5413,
+5413,
+5417,
+5417,
+5467,
+5473,
+5473,
+5524,
+5539,
+5578,
+5585,
+5585,
+5585,
+5600,
+5600,
+5600,
+5600,
+5631,
+5642,
+5642,
+5642,
+5642,
+5669,
+5676,
+5683,
+5690,
+5708,
+5721,
+5721,
+5734,
+5743,
+5758,
+5799,
+5817,
+5835,
+5835,
+5835,
+5841,
+5841,
+5872,
+5872,
+5888,
+5904,
+5917,
+5952,
+5952,
+5997,
+6010,
+6044,
+6054,
+6078,
+6078,
+6116,
+6128,
+6128,
+6128,
+6137,
+6137,
+6143,
+6143,
+6143,
+6155,
+6160,
+6160,
+6160,
+6160,
+6160,
+6173,
+6173,
+6173,
+6189,
+6189,
+6189,
+6205,
+6237,
+6237,
+6252,
+6252,
+6263,
+6263,
+6296,
+6321,
+6321,
+6321,
+6328,
+6343,
+6343,
+6373,
+6391,
+6391,
+6426,
+6426,
+6436,
+6475,
+6489,
+6507,
+6511,
+6511,
+6515,
+6530,
+6530,
+6548,
+6548,
+6552,
+6552,
+6572,
+6572,
+6622,
+6651,
+6651,
+6668,
+6668,
+6693,
+6731,
+6731,
+6746,
+6775,
+6787,
+6787,
+6787,
+6787,
+6787,
+6787,
+6787,
+6787,
+6787,
+6802,
+6806,
+6810,
+6823,
+6823,
+6834,
+6870,
+6874,
+6933,
+6954,
+6966,
+6966,
+6966,
+6966,
+6982,
+6982,
+6982,
+6988,
+6998,
+7028,
+7037,
+7037,
+7070,
+7070,
+7098,
+7098,
+7098,
+7127,
+7153,
+7153,
+7164,
+7164,
+7174,
+7174,
+7174,
+7205,
+7205,
+7224,
+7224,
+7240,
+7240,
+7284,
+7284,
+7284,
+7284,
+7284,
+7284,
+7301,
+7318,
+7364,
+7364,
+7374,
+7401,
+7424,
+7424,
+7443,
+7448,
+7448,
+7448,
+7448,
+7448,
+7462,
+7462,
+7462,
+7462,
+7462,
+7462,
+7462,
+7466,
+7466,
+7488,
+7488,
+7498,
+7502,
+7520,
+7530,
+7530,
+7530,
+7534,
+7540,
+7540,
+7540,
+7547,
+7547,
+7547,
+7561,
+7571,
+7571,
+7571,
+7582,
+7582,
+7603,
+7603,
+7617,
+7628,
+7647,
+7666,
+7666,
+7666,
+7694,
+7707,
+7738,
+7750,
+7768,
+7825,
+7864,
+7880,
+7880,
+7880,
+7880,
+7880,
+7893,
+7893,
+7893,
+7898,
+7911,
+7917,
+7944,
+7944,
+7989,
+7989,
+7989,
+7989,
+7989,
+7989,
+8006,
+8037,
+8037,
+8037,
+8063,
+8074,
+8091,
+8113,
+8135,
+8148,
+8148,
+8162,
+8162,
+8169,
+8169,
+8176,
+8197,
+8197,
+8197,
+8216,
+8216,
+8216,
+8230,
+8230,
+8240,
+8240,
+8246,
+8257,
+8262,
+8279,
+8279,
+8286,
+8286,
+8296,
+8313,
+8313,
+8334,
+8339,
+8339,
+8353,
+8353,
+8363,
+8363,
+8370,
+8370,
+8384,
+8384,
+8430,
+8458,
+8458,
+8492,
+8511,
+8511,
+8518,
+8565,
+8565,
+8565,
+8565,
+8565,
+8637,
+8665,
+8675,
+8701,
+8708,
+8708,
+8744,
+8754,
+8754,
+8766,
+8814,
+8826,
+8838,
+8865,
+8865,
+8882,
+8892,
+8892,
+8899,
+8899,
+8905,
+8918,
+8928,
+8935,
+8962,
+8975,
+8975,
+8986,
+9019,
+9019,
+9063,
+9071,
+9077,
+9089,
+9111,
+9118,
+9118,
+9118,
+9118,
+9139,
+9165,
+9202,
+9212,
+9225,
+9237,
+9267,
+9291,
+9291,
+9291,
+9322,
+9322,
+9330,
+9330,
+9330,
+9338,
+9355,
+9423,
+9423,
+9429,
+9447,
+9468,
+9480,
+9480,
+9480,
+9545,
+9600,
+9606,
+9615,
+9615,
+9640,
+9671,
+9671,
+9671,
+9744,
+9744,
+9783,
+9783,
+9783,
+9796,
+9814,
+9833,
+9838,
+9857,
+9857,
+9864,
+9902,
+9922,
+9944,
+9944,
+9976,
+9976,
+10001,
+10006,
+10023,
+10023,
+10029,
+10037,
+10054,
+10054,
+10054,
+10072,
+10072,
+10072,
+10094,
+10112,
+10144,
+10158,
+10174,
+10196,
+10213,
+10213,
+10235,
+10254,
+10279,
+10291,
+10311,
+10326,
+10366,
+10383,
+10393,
+10399,
+10399,
+10399,
+10431,
+10431,
+10431,
+10431,
+10431,
+10440,
+10459,
+10472,
+10472,
+10495,
+10507,
+10537,
+10582,
+10598,
+10612,
+10626,
+10666,
+10684,
+10690,
+10710,
+10725,
+10765,
+10783,
+10783,
+10802,
+10825,
+10825,
+10843,
+10853,
+10865,
+10902,
+10902,
+10953,
+10953,
+10984,
+10990,
+10990,
+10990,
+10990,
+11027,
+11036,
+11036,
+11036,
+11036,
+11057,
+11073,
+11073,
+11073,
+11082,
+11082,
+11082,
+11137,
+11142,
+11152,
+11168,
+11181,
+11181,
+11181,
+11181,
+11199,
+11199,
+11212,
+11226,
+11253,
+11271,
+11287,
+11311,
+11322,
+11340,
+11356,
+11380,
+11380,
+11401,
+11407,
+11420,
+11475,
+11514,
+11523,
+11529,
+11529,
+11547,
+11572,
+11572,
+11588,
+11588,
+11588,
+11602,
+11602,
+11602,
+11608,
+11625,
+11641,
+11676,
+11683,
+11683,
+11683,
+11699,
+11706,
+11706,
+11706,
+11723,
+11729,
+11729,
+11761,
+11767,
+11767,
+11767,
+11799,
+11810,
+11810,
+11810,
+11810,
+11810,
+11810,
+11810,
+11810,
+11810,
+11810,
+11810,
+11823,
+11838,
+11838,
+11846,
+11852,
+11871,
+11887,
+11905,
+11920,
+11936,
+11968,
+11968,
+11981,
+11981,
+11987,
+12004,
+12004,
+12030,
+12043,
+12059,
+12066,
+12066,
+12066,
+12096,
+12096,
+12096,
+12105,
+12136,
+12159,
+12159,
+12159,
+12174,
+12196,
+12232,
+12237,
+12237,
+12253,
+12269,
+12269,
+12269,
+12282,
+12289,
+12289,
+12306,
+12323,
+12333,
+12333,
+12349,
+12349,
+12384,
+12422,
+12440,
+12455,
+12472,
+12472,
+12472,
+12472,
+12491,
+12505,
+12511,
+12546,
+12569,
+12569,
+12573,
+12573,
+12595,
+12595,
+12605,
+12605,
+12605,
+12612,
+12636,
+12654,
+12691,
+12691,
+12713,
+12728,
+12744,
+12754,
+12772,
+12784,
+12810,
+12849,
+12849,
+12873,
+12887,
+12887,
+12887,
+12887,
+12887,
+12910,
+12930,
+12973,
+13002,
+13015,
+13058,
+13058,
+13069,
+13080,
+13080,
+13080,
+13080,
+13086,
+13086,
+13096,
+13114,
+13138,
+13160,
+13160,
+13160,
+13160,
+13160,
+13160,
+13160,
+13178,
+13188,
+13204,
+13224,
+13224,
+13224,
+13224,
+13234,
+13243,
+13260,
+13260,
+13260,
+13260,
+13266,
+13281,
+13315,
+13315,
+13340,
+13347,
+13347,
+13347,
+13378,
+13378,
+13378,
+13378,
+13404,
+13414,
+13430,
+13450,
+13471,
+13475,
+13479,
+13479,
+13494,
+13494,
+13494,
+13494,
+13494,
+13494,
+13494,
+13494,
+13513,
+13513,
+13513,
+13542,
+13551,
+13551,
+13551,
+13551,
+13551,
+13551,
+13560,
+13569,
+13569,
+13569,
+13569,
+13599,
+13599,
+13610,
+13623,
+13668,
+13676,
+13676,
+13683,
+13702,
+13702,
+13716,
+13716,
+13733,
+13733,
+13744,
+13766,
+13775,
+13775,
+13775,
+13790,
+13815,
+13822,
+13827,
+13827,
+13844,
+13844,
+13859,
+13875,
+13875,
+13919,
+13951,
+13972,
+14006,
+14006,
+14006,
+14015,
+14023,
+14039,
+14051,
+14079,
+14079,
+14092,
+14128,
+14143,
+14153,
+14153,
+14153,
+14153,
+14173,
+14188,
+14198,
+14198,
+14213,
+14246,
+14281,
+14287,
+14304,
+14304,
+14311,
+14321,
+14328,
+14338,
+14338,
+14370,
+14404,
+14448,
+14448,
+14473,
+14495,
+14502,
+14502,
+14539,
+14552,
+14559,
+14559,
+14576,
+14576,
+14576,
+14590,
+14590,
+14590,
+14590,
+14590,
+14590,
+14590,
+14590,
+14623,
+14641,
+14648,
+14655,
+14704,
+14742,
+14742,
+14742,
+14759,
+14780,
+14780,
+14780,
+14798,
+14798,
+14803,
+14821,
+14821,
+14861,
+14861,
+14870,
+14880,
+14880,
+14915,
+14934,
+14951,
+14976,
+14976,
+14976,
+14976,
+15005,
+15042,
+15057,
+15057,
+15057,
+15105,
+15131,
+15138,
+15149,
+15149,
+15173,
+15173,
+15183,
+15225,
+15241,
+15272,
+15278,
+15278,
+15312,
+15333,
+15354,
+15354,
+15354,
+15354,
+15354,
+15354,
+15354,
+15365,
+15365,
+15365,
+15391,
+15391,
+15391,
+15391,
+15391,
+15391,
+15406,
+15414,
+15414,
+15414,
+15414,
+15430,
+15450,
+15501,
+15501,
+15501,
+15501,
+15501,
+15515,
+15520,
+15520,
+15520,
+15520,
+15546,
+15546,
+15546,
+15546,
+15546,
+15576,
+15608,
+15630,
+15650,
+15650,
+15675,
+15675,
+15695,
+15706,
+15716,
+15716,
+15716,
+15716,
+15733,
+15741,
+15752,
+15752,
+15752,
+15752,
+15764,
+15764,
+15778,
+15778,
+15786,
+15817,
+15817,
+15833,
+15833,
+15852,
+15852,
+15867,
+15885,
+15935,
+15941,
+15961,
+15961,
+15977,
+15981,
+15988,
+15994,
+16015,
+16015,
+16054,
+16054,
+16054,
+16087,
+16113,
+16122,
+16122,
+16157,
+16188,
+16188,
+16212,
+16212,
+16212,
+16212,
+16230,
+16230,
+16246,
+16276,
+16287,
+16300,
+16316,
+16334,
+16353,
+16378,
+16401,
+16401,
+16421,
+16421,
+16421,
+16425,
+16450,
+16450,
+16450,
+16456,
+16465,
+16475,
+16491,
+16509,
+16509,
+16518,
+16530,
+16562,
+16562,
+16562,
+16571,
+16571,
+16571,
+16595,
+16595,
+16595,
+16610,
+16610,
+16610,
+16634,
+16661,
+16678,
+16684,
+16684,
+16691,
+16691,
+16706,
+16763,
+16792,
+16807,
+16827,
+16847,
+16847,
+16847,
+16859,
+16859,
+16859,
+16880,
+16902,
+16902,
+16922,
+16922,
+16922,
+16942,
+16949,
+16959,
+16974,
+16974,
+16980,
+16980,
+16993,
+17024,
+17037,
+17037,
+17044,
+17097,
+17097,
+17112,
+17112,
+17135,
+17150,
+17150,
+17155,
+17162,
+17190,
+17190,
+17210,
+17219,
+17219,
+17232,
+17232,
+17241,
+17254,
+17269,
+17292,
+17302,
+17302,
+17314,
+17314,
+17314,
+17314,
+17353,
+17371,
+17400,
+17418,
+17418,
+17444,
+17444,
+17466,
+17466,
+17466,
+17466,
+17466,
+17466,
+17466,
+17466,
+17466,
+17488,
+17488,
+17498,
+17498,
+17506,
+17506,
+17527,
+17552,
+17552,
+17562,
+17569,
+17587,
+17603,
+17603,
+17619,
+17628,
+17667,
+17674,
+17698,
+17706,
+17742,
+17795,
+17813,
+17813,
+17834,
+17844,
+17844,
+17844,
+17844,
+17866,
+17886,
+17917,
+17953,
+17953,
+17953,
+17984,
+17984,
+17984,
+17984,
+17984,
+18024,
+18024,
+18045,
+18077,
+18096,
+18102,
+18114,
+18114,
+18114,
+18136,
+18146,
+18170,
+18170,
+18170,
+18193,
+18193,
+18193,
+18211,
+18246,
+18253,
+18303,
+18303,
+18303,
+18324,
+18324,
+18344,
+18344,
+18344,
+18350,
+18373,
+18393,
+18401,
+18401,
+18421,
+18435,
+18469,
+18491,
+18491,
+18523,
+18546,
+18566,
+18566,
+18589,
+18610,
+18622,
+18646,
+18674,
+18689,
+18697,
+18721,
+18730,
+18730,
+18751,
+18765,
+18789,
+18805,
+18826,
+18842,
+18842,
+18846,
+18846,
+18856,
+18863,
+18881,
+18903,
+18928,
+18947,
+18950,
+18964,
+18967,
+18979,
+18987,
+19007,
+19026,
+19026,
+19029,
+19029,
+19044,
+19077,
+19107,
+19110,
+19131,
+19134,
+19140,
+19156,
+19179,
+19204,
+19222,
+19222,
+19236,
+19239,
+19251,
+19284,
+19299,
+19302,
+19318,
+19328,
+19332,
+19360,
+19389,
+19392,
+19419,
+19432,
+19442,
+19451,
+19463,
+19466,
+19469,
+19480,
+19507,
+19510,
+19543,
+19543,
+19554,
+19557,
+19578,
+19581,
+19584,
+19608,
+19611,
+19623,
+19644,
+19654,
+19673,
+19682,
+19682,
+19682,
+19685,
+19707,
+19710,
+19710,
+19727,
+19727,
+19733,
+19736,
+19736,
+19736,
+19736,
+19749,
+19749,
+19754,
+19777,
+19808,
+19811,
+19814,
+19817,
+19835,
+19860,
+19860,
+19863,
+19863,
+19863,
+19863,
+19872,
+19872,
+19906,
+19906,
+19916,
+19922,
+19936,
+19939,
+19942,
+19958,
+19968,
+19978,
+20000,
+20019,
+20019,
+20049,
+20065,
+20090,
+20090,
+20113,
+20148,
+20158,
+20196,
+20239,
+20255,
+20278,
+20310,
+20322,
+20331,
+20366,
+20369,
+20376,
+20389,
+20392,
+20392,
+20412,
+20438,
+20451,
+20451,
+20511,
+20517,
+20552,
+20570,
+20586,
+20593,
+20593,
+20605,
+20608,
+20621,
+20624,
+20627,
+20663,
+20666,
+20705,
+20720,
+20759,
+20762,
+20762,
+20762,
+20802,
+20809,
+20825,
+20830,
+20830,
+20830,
+20830,
+20854,
+20857,
+20857,
+20864,
+20917,
+20927,
+20930,
+20964,
+20967,
+20974,
+21013,
+21057,
+21057,
+21091,
+21119,
+21122,
+21141,
+21156,
+21176,
+21193,
+21196,
+21196,
+21196,
+21229,
+21245,
+21245,
+21251,
+21265,
+21290,
+21290,
+21290,
+21290,
+21314,
+21314,
+21317,
+21320,
+21326,
+21365,
+21371,
+21384,
+21387,
+21406,
+21409,
+21409,
+21417,
+21425,
+21440,
+21448,
+21451,
+21454,
+21467,
+21482,
+21492,
+21524,
+21530,
+21536,
+21546,
+21560,
+21615,
+21639,
+21639,
+21642,
+21660,
+21669,
+21672,
+21672,
+21689,
+21698,
+21705,
+21752,
+21769,
+21793,
+21793,
+21803,
+21803,
+21824,
+21831,
+21854,
+21857,
+21864,
+21897,
+21918,
+21939,
+21939,
+21939,
+21963,
+21973,
+21976,
+21976,
+22031,
+22031,
+22031,
+22046,
+22070,
+22080,
+22110,
+22139,
+22163,
+22166,
+22198,
+22213,
+22232,
+22240,
+22280,
+22315,
+22315,
+22332,
+22357,
+22357,
+22357,
+22357,
+22357,
+22401,
+22412,
+22424,
+22455,
+22466,
+22466,
+22469,
+22477,
+22485,
+22508,
+22530,
+22537,
+22546,
+22551,
+22562,
+22571,
+22574,
+22599,
+22627,
+22630,
+22643,
+22663,
+22699,
+22699,
+22705,
+22708,
+22721,
+22724,
+22738,
+22768,
+22771,
+22774,
+22789,
+22807,
+22819,
+22870,
+22886,
+22892,
+22903,
+22932,
+22944,
+22973,
+22976,
+22992,
+22995,
+23006,
+23029,
+23042,
+23058,
+23101,
+23121,
+23138,
+23138,
+23141,
+23161,
+23164,
+23188,
+23188,
+23188,
+23201,
+23231,
+23231,
+23231,
+23231,
+23241,
+23241,
+23244,
+23262,
+23320,
+23320,
+23356,
+23402,
+23405,
+23405,
+23440,
+23443,
+23452,
+23462,
+23471,
+23474,
+23474,
+23474,
+23485,
+23485,
+23500,
+23522,
+23546,
+23584,
+23591,
+23591,
+23591,
+23639,
+23639,
+23644,
+23644,
+23683,
+23683,
+23694,
+23712,
+23712,
+23740,
+23752,
+23775,
+23791,
+23791,
+23821,
+23844,
+23849,
+23872,
+23872,
+23879,
+23879,
+23939,
+23945,
+23959,
+23959,
+23959,
+24004,
+24010,
+24026,
+24042,
+24050,
+24067,
+24067,
+24098,
+24108,
+24108,
+24108,
+24108,
+24125,
+24144,
+24144,
+24160,
+24163,
+24163,
+24173,
+24177,
+24177,
+24188,
+24203,
+24203,
+24203,
+24206,
+24224,
+24253,
+24253,
+24253,
+24294,
+24294,
+24326,
+24341,
+24341,
+24354,
+24382,
+24401,
+24401,
+24419,
+24431,
+24442,
+24442,
+24457,
+24473,
+24473,
+24481,
+24512,
+24532,
+24532,
+24543,
+24550,
+24568,
+24607,
+24607,
+24628,
+24628,
+24634,
+24641,
+24662,
+24697,
+24712,
+24735,
+24745,
+24755,
+24769,
+24769,
+24786,
+24786,
+24786,
+24801,
+24809,
+24821,
+24835,
+24835,
+24835,
+24853,
+24872,
+24872,
+24872,
+24883,
+24901,
+24901,
+24905,
+24918,
+24918,
+24949,
+24949,
+24970,
+24970,
+24970,
+24981,
+24981,
+24981,
+24993,
+24993,
+24993,
+25005,
+25043,
+25050,
+25070,
+25099,
+25099,
+25110,
+25110,
+25110,
+25110,
+25115,
+25134,
+25134,
+25134,
+25141,
+25160,
+25167,
+25167,
+25179,
+25179,
+25179,
+25192,
+25238,
+25238,
+25282,
+25306,
+25316,
+25327,
+25339,
+25374,
+25374,
+25384,
+25384,
+25384,
+25384,
+25388,
+25388,
+25388,
+25388,
+25416,
+25453,
+25463,
+25463,
+25480,
+25536,
+25536,
+25536,
+25536,
+25536,
+25551,
+25567,
+25571,
+25591,
+25618,
+25631,
+25631,
+25650,
+25650,
+25650,
+25690,
+25707,
+25718,
+25743,
+25753,
+25753,
+25765,
+25765,
+25778,
+25802,
+25823,
+25823,
+25823,
+25840,
+25840,
+25840,
+25840,
+25870,
+25876,
+25897,
+25897,
+25897,
+25907,
+25907,
+25907,
+25907,
+25928,
+25928,
+25928,
+25961,
+25961,
+25961,
+25965,
+25965,
+25965,
+25975,
+26006,
+26006,
+26006,
+26006,
+26020,
+26020,
+26028,
+26028,
+26043,
+26075,
+26115,
+26124,
+26145,
+26145,
+26145,
+26145,
+26145,
+26145,
+26161,
+26161,
+26215,
+26234,
+26234,
+26234,
+26234,
+26254,
+26254,
+26259,
+26285,
+26299,
+26299,
+26316,
+26328,
+26381,
+26381,
+26381,
+26381,
+26402,
+26420,
+26438,
+26469,
+26469,
+26469,
+26481,
+26494,
+26502,
+26502,
+26502,
+26502,
+26502,
+26522,
+26522,
+26522,
+26535,
+26535,
+26556,
+26563,
+26563,
+26582,
+26604,
+26604,
+26614,
+26614,
+26619,
+26619,
+26619,
+26619,
+26644,
+26644,
+26644,
+26651,
+26667,
+26667,
+26667,
+26675,
+26675,
+26682,
+26682,
+26682,
+26693,
+26693,
+26693,
+26693,
+26699,
+26699,
+26715,
+26763,
+26772,
+26793,
+26793,
+26804,
+26804,
+26813,
+26813,
+26813,
+26840,
+26855,
+26865,
+26865,
+26882,
+26928,
+26938,
+26938,
+26938,
+26979,
+26979,
+27008,
+27008,
+27008,
+27008,
+27021,
+27037,
+27049,
+27060,
+27064,
+27085,
+27121,
+27121,
+27169,
+27169,
+27221,
+27253,
+27276,
+27294,
+27294,
+27342,
+27353,
+27353,
+27353,
+27371,
+27371,
+27375,
+27390,
+27390,
+27390,
+27395,
+27419,
+27426,
+27451,
+27471,
+27493,
+27493,
+27510,
+27510,
+27517,
+27529,
+27529,
+27542,
+27548,
+27548,
+27548,
+27576,
+27581,
+27597,
+27639,
+27653,
+27699,
+27716,
+27716,
+27742,
+27766,
+27785,
+27794,
+27794,
+27812,
+27812,
+27812,
+27812,
+27832,
+27832,
+27832,
+27832,
+27861,
+27861,
+27861,
+27867,
+27922,
+27922,
+27922,
+27922,
+27960,
+27960,
+27985,
+28026,
+28063,
+28063,
+28083,
+28090,
+28090,
+28104,
+28131,
+28177,
+28192,
+28196,
+28196,
+28196,
+28196,
+28228,
+28240,
+28271,
+28305,
+28305,
+28305,
+28322,
+28328,
+28341,
+28349,
+28388,
+28388,
+28388,
+28407,
+28411,
+28411,
+28411,
+28417,
+28427,
+28449,
+28463,
+28475,
+28516,
+28516,
+28525,
+28553,
+28553,
+28553,
+28578,
+28585,
+28626,
+28626,
+28663,
+28663,
+28669,
+28669,
+28690,
+28713,
+28713,
+28728,
+28728,
+28728,
+28734,
+28734,
+28751,
+28761,
+28775,
+28788,
+28794,
+28794,
+28812,
+28812,
+28823,
+28823,
+28834,
+28875,
+28928,
+28928,
+28928,
+28953,
+28983,
+28995,
+29012,
+29012,
+29012,
+29025,
+29056,
+29056,
+29080,
+29080,
+29092,
+29092,
+29092,
+29104,
+29104,
+29104,
+29104,
+29121,
+29121,
+29121,
+29121,
+29157,
+29157,
+29167,
+29186,
+29186,
+29186,
+29186,
+29186,
+29186,
+29195,
+29226,
+29241,
+29241,
+29257,
+29257,
+29270,
+29270,
+29270,
+29276,
+29276,
+29276,
+29276,
+29276,
+29282,
+29327,
+29327,
+29337,
+29349,
+29381,
+29381,
+29388,
+29388,
+29401,
+29401,
+29401,
+29411,
+29444,
+29483,
+29483,
+29529,
+29536,
+29549,
+29549,
+29549,
+29549,
+29549,
+29605,
+29605,
+29622,
+29622,
+29661,
+29661,
+29682,
+29691,
+29691,
+29691,
+29743,
+29743,
+29764,
+29764,
+29764,
+29764,
+29781,
+29796,
+29808,
+29819,
+29850,
+29863,
+29863,
+29876,
+29876,
+29876,
+29876,
+29885,
+29885,
+29897,
+29897,
+29934,
+29942,
+29942,
+29962,
+29976,
+29976,
+29976,
+29994,
+29994,
+29994,
+29994,
+29994,
+30010,
+30010,
+30025,
+30025,
+30025,
+30025,
+30035,
+30035,
+30042,
+30042,
+30055,
+30055,
+30055,
+30065,
+30082,
+30092,
+30101,
+30101,
+30123,
+30123,
+30134,
+30147,
+30147,
+30157,
+30176,
+30176,
+30193,
+30209,
+30217,
+30217,
+30259,
+30271,
+30277,
+30293,
+30328,
+30345,
+30378,
+30399,
+30425,
+30431,
+30431,
+30442,
+30453,
+30463,
+30469,
+30479,
+30493,
+30508,
+30518,
+30518,
+30533,
+30546,
+30546,
+30570,
+30589,
+30627,
+30648,
+30648,
+30673,
+30696,
+30708,
+30708,
+30708,
+30708,
+30708,
+30714,
+30714,
+30726,
+30736,
+30736,
+30754,
+30788,
+30788,
+30788,
+30814,
+30814,
+30814,
+30814,
+30814,
+30814,
+30814,
+30814,
+30820,
+30836,
+30836,
+30836,
+30836,
+30836,
+30836,
+30836,
+30836,
+30836,
+30855,
+30873,
+30886,
+30911,
+30921,
+30932,
+30932,
+30951,
+30957,
+31001,
+31007,
+31007,
+31022,
+31048,
+31055,
+31062,
+31079,
+31079,
+31118,
+31128,
+31128,
+31128,
+31146,
+31146,
+31146,
+31146,
+31162,
+31162,
+31177,
+31177,
+31195,
+31211,
+31282,
+31282,
+31290,
+31300,
+31363,
+31389,
+31406,
+31419,
+31439,
+31439,
+31439,
+31439,
+31443,
+31473,
+31481,
+31481,
+31508,
+31523,
+31569,
+31599,
+31621,
+31671,
+31680,
+31700,
+31741,
+31754,
+31775,
+31804,
+31804,
+31816,
+31825,
+31825,
+31850,
+31850,
+31850,
+31850,
+31866,
+31876,
+31876,
+31901,
+31911,
+31940,
+31950,
+31950,
+31957,
+31957,
+31957,
+31957,
+31976,
+31989,
+31996,
+31996,
+32010,
+32040,
+32061,
+32061,
+32080,
+32080,
+32080,
+32080,
+32093,
+32093,
+32093,
+32093,
+32115,
+32119,
+32119,
+32152,
+32152,
+32152,
+32164,
+32164,
+32174,
+32174,
+32174,
+32174,
+32237,
+32251,
+32287,
+32287,
+32295,
+32295,
+32310,
+32333,
+32342,
+32360,
+32360,
+32387,
+32409,
+32431,
+32431,
+32431,
+32448,
+32473,
+32523,
+32523,
+32541,
+32541,
+32563,
+32563,
+32575,
+32581,
+32581,
+32581,
+32581,
+32602,
+32622,
+32622,
+32676,
+32676,
+32676,
+32676,
+32676,
+32692,
+32711,
+32711,
+32711,
+32711,
+32752,
+32767,
+32797,
+32819,
+32846,
+32864,
+32864,
+32870,
+32887,
+32887,
+32898,
+32898,
+32898,
+32898,
+32898,
+32933,
+32997,
+32997,
+33007,
+33007,
+33007,
+33007,
+33024,
+33035,
+33035,
+33066,
+33090,
+33090,
+33090,
+33110,
+33110,
+33130,
+33150,
+33169,
+33169,
+33169,
+33207,
+33207,
+33207,
+33227,
+33251,
+33258,
+33258,
+33275,
+33285,
+33285,
+33285,
+33294,
+33310,
+33310,
+33323,
+33323,
+33323,
+33354,
+33361,
+33361,
+33361,
+33361,
+33368,
+33380,
+33403,
+33403,
+33419,
+33428,
+33428,
+33428,
+33444,
+33451,
+33451,
+33451,
+33476,
+33476,
+33483,
+33496,
+33496,
+33523,
+33558,
+33567,
+33567,
+33579,
+33592,
+33607,
+33615,
+33615,
+33615,
+33650,
+33650,
+33650,
+33650,
+33650,
+33720,
+33742,
+33742,
+33750,
+33758,
+33758,
+33769,
+33769,
+33779,
+33809,
+33809,
+33823,
+33823,
+33849,
+33857,
+33857,
+33857,
+33857,
+33857,
+33874,
+33874,
+33899,
+33910,
+33916,
+33916,
+33950,
+33957,
+33964,
+33970,
+33970,
+33970,
+33970,
+33993,
+34050,
+34050,
+34050,
+34071,
+34071,
+34108,
+34162,
+34162,
+34162,
+34162,
+34173,
+34173,
+34208,
+34225,
+34233,
+34264,
+34283,
+34291,
+34291,
+34291,
+34298,
+34307,
+34314,
+34338,
+34338,
+34378,
+34384,
+34402,
+34414,
+34414,
+34414,
+34423,
+34459,
+34459,
+34478,
+34494,
+34516,
+34528,
+34544,
+34544,
+34554,
+34566,
+34566,
+34583,
+34632,
+34640,
+34640,
+34654,
+34668,
+34668,
+34674,
+34674,
+34685,
+34685,
+34685,
+34701,
+34711,
+34711,
+34723,
+34734,
+34734,
+34751,
+34751,
+34751,
+34764,
+34786,
+34795,
+34795,
+34795,
+34795,
+34795,
+34826,
+34826,
+34826,
+34826,
+34826,
+34826,
+34826,
+34839,
+34839,
+34884,
+34884,
+34897,
+34897,
+34897,
+34930,
+34939,
+34939,
+34946,
+34989,
+35026,
+35038,
+35038,
+35038,
+35049,
+35049,
+35103,
+35103,
+35103,
+35103,
+35103,
+35103,
+35103,
+35103,
+35118,
+35118,
+35118,
+35135,
+35135,
+35163,
+35163,
+35163,
+35163,
+35191,
+35191,
+35213,
+35228,
+35234,
+35274,
+35284,
+35284,
+35284,
+35284,
+35290,
+35290,
+35300,
+35322,
+35353,
+35353,
+35353,
+35374,
+35387,
+35387,
+35393,
+35393,
+35448,
+35448,
+35460,
+35479,
+35479,
+35479,
+35501,
+35501,
+35531,
+35587,
+35593,
+35615,
+35615,
+35615,
+35615,
+35642,
+35653,
+35661,
+35680,
+35680,
+35680,
+35680,
+35680,
+35680,
+35688,
+35712,
+35712,
+35712,
+35718,
+35718,
+35724,
+35724,
+35724,
+35747,
+35747,
+35747,
+35753,
+35764,
+35764,
+35782,
+35802,
+35812,
+35832,
+35846,
+35867,
+35909,
+35909,
+35925,
+35935,
+35935,
+35935,
+35935,
+35935,
+35935,
+35976,
+35997,
+36014,
+36048,
+36048,
+36073,
+36106,
+36106,
+36112,
+36124,
+36124,
+36124,
+36148,
+36158,
+36158,
+36170,
+36170,
+36190,
+36190,
+36190,
+36194,
+36203,
+36221,
+36244,
+36269,
+36269,
+36285,
+36297,
+36321,
+36328,
+36328,
+36350,
+36378,
+36395,
+36405,
+36405,
+36412,
+36412,
+36425,
+36425,
+36425,
+36425,
+36444,
+36444,
+36444,
+36470,
+36492,
+36524,
+36541,
+36558,
+36558,
+36576,
+36614,
+36614,
+36638,
+36638,
+36660,
+36660,
+36664,
+36670,
+36717,
+36722,
+36741,
+36765,
+36765,
+36783,
+36783,
+36783,
+36783,
+36801,
+36811,
+36811,
+36825,
+36825,
+36856,
+36856,
+36868,
+36868,
+36868,
+36868,
+36868,
+36920,
+36920,
+36920,
+36932,
+36953,
+36953,
+36972,
+36988,
+36995,
+37007,
+37027,
+37033,
+37072,
+37089,
+37089,
+37089,
+37107,
+37137,
+37154,
+37154,
+37161,
+37167,
+37187,
+37187,
+37187,
+37187,
+37193,
+37199,
+37207,
+37231,
+37231,
+37231,
+37241,
+37241,
+37258,
+37280,
+37299,
+37299,
+37324,
+37338,
+37351,
+37351,
+37365,
+37371,
+37414,
+37420,
+37432,
+37451,
+37451,
+37457,
+37457,
+37488,
+37516,
+37516,
+37529,
+37538,
+37558,
+37580,
+37580,
+37614,
+37636,
+37650,
+37650,
+37662,
+37678,
+37710,
+37755,
+37762,
+37762,
+37771,
+37782,
+37816,
+37816,
+37838,
+37851,
+37889,
+37894,
+37894,
+37905,
+37914,
+37921,
+37921,
+37930,
+37957,
+37984,
+38029,
+38045,
+38061,
+38061,
+38061,
+38074,
+38082,
+38101,
+38108,
+38108,
+38115,
+38122,
+38122,
+38187,
+38187,
+38187,
+38210,
+38210,
+38214,
+38214,
+38241,
+38252,
+38274,
+38274,
+38274,
+38274,
+38284,
+38291,
+38291,
+38302,
+38313,
+38333,
+38333,
+38354,
+38354,
+38429,
+38429,
+38429,
+38429,
+38429,
+38464,
+38473,
+38503,
+38516,
+38555,
+38569,
+38569,
+38583,
+38603,
+38610,
+38619,
+38628,
+38638,
+38651,
+38656,
+38656,
+38662,
+38674,
+38704,
+38704,
+38739,
+38739,
+38739,
+38757,
+38757,
+38799,
+38833,
+38833,
+38855,
+38859,
+38893,
+38931,
+38931,
+38959,
+38977,
+38977,
+39000,
+39011,
+39011,
+39025,
+39060,
+39060,
+39070,
+39083,
+39089,
+39089,
+39093,
+39093,
+39100,
+39100,
+39123,
+39123,
+39123,
+39123,
+39123,
+39123,
+39150,
+39150,
+39168,
+39168,
+39168,
+39168,
+39198,
+39198,
+39198,
+39223,
+39246,
+39270,
+39280,
+39292,
+39292,
+39308,
+39308,
+39326,
+39326,
+39341,
+39341,
+39341,
+39341,
+39352,
+39365,
+39365,
+39372,
+39385,
+39405,
+39419,
+39436,
+39436,
+39436,
+39471,
+39489,
+39496,
+39523,
+39530,
+39530,
+39530,
+39544,
+39557,
+39564,
+39564,
+39605,
+39612,
+39629,
+39650,
+39679,
+39679,
+39679,
+39689,
+39699,
+39699,
+39706,
+39715,
+39734,
+39734,
+39734,
+39754,
+39789,
+39789,
+39806,
+39820,
+39879,
+39893,
+39904,
+39945,
+39945,
+39945,
+39945,
+39945,
+39945,
+39957,
+40010,
+40034,
+40074,
+40104,
+40104,
+40104,
+40104,
+40104,
+40111,
+40118,
+40138,
+40152,
+40182,
+40198,
+40198,
+40198,
+40198,
+40232,
+40236,
+40251,
+40251,
+40272,
+40279,
+40296,
+40327,
+40336,
+40336,
+40398,
+40405,
+40423,
+40474,
+40484,
+40501,
+40519,
+40519,
+40580,
+40631,
+40680,
+40720,
+40727,
+40727,
+40727,
+40734,
+40734,
+40734,
+40741,
+40761,
+40805,
+40825,
+40846,
+40864,
+40894,
+40906,
+40906,
+40906,
+40944,
+40951,
+40971,
+40980,
+40999,
+40999,
+41015,
+41029,
+41042,
+41042,
+41059,
+41093,
+41105,
+41125,
+41163,
+41163,
+41172,
+41183,
+41183,
+41183,
+41183,
+41183,
+41192,
+41207,
+41222,
+41222,
+41222,
+41228,
+41235,
+41241,
+41241,
+41260,
+41267,
+41267,
+41287,
+41294,
+41314,
+41319,
+41319,
+41326,
+41332,
+41346,
+41346,
+41346,
+41354,
+41361,
+41361,
+41368,
+41368,
+41387,
+41416,
+41426,
+41433,
+41462,
+41496,
+41496,
+41528,
+41528,
+41553,
+41558,
+41558,
+41565,
+41586,
+41586,
+41586,
+41603,
+41610,
+41610,
+41636,
+41656,
+41656,
+41675,
+41675,
+41728,
+41752,
+41752,
+41760,
+41760,
+41791,
+41791,
+41805,
+41840,
+41852,
+41869,
+41894,
+41894,
+41894,
+41907,
+41917,
+41917,
+41917,
+41926,
+41933,
+41933,
+41946,
+41946,
+41951,
+41951,
+41980,
+41996,
+41996,
+42017,
+42036,
+42052,
+42089,
+42114,
+42114,
+42121,
+42121,
+42145,
+42145,
+42157,
+42157,
+42157,
+42165,
+42183,
+42183,
+42214,
+42235,
+42262,
+42262,
+42276,
+42276,
+42276,
+42296,
+42327,
+42327,
+42327,
+42327,
+42327,
+42327,
+42327,
+42327,
+42327,
+42327,
+42327,
+42327,
+42362,
+42362,
+42369,
+42404,
+42411,
+42435,
+42463,
+42487,
+42513,
+42526,
+42555,
+42583,
+42583,
+42596,
+42612,
+42623,
+42634,
+42639,
+42670,
+42704,
+42704,
+42704,
+42727,
+42727,
+42734,
+42748,
+42772,
+42804,
+42804,
+42808,
+42821,
+42843,
+42892,
+42899,
+42909,
+42916,
+42956,
+42978,
+42987,
+42987,
+43012,
+43030,
+43037,
+43059,
+43075,
+43075,
+43089,
+43096,
+43123,
+43154,
+43168,
+43168,
+43168,
+43181,
+43205,
+43205,
+43212,
+43218,
+43250,
+43250,
+43257,
+43257,
+43264,
+43264,
+43271,
+43284,
+43304,
+43304,
+43318,
+43348,
+43355,
+43373,
+43394,
+43394,
+43419,
+43426,
+43430,
+43430,
+43443,
+43461,
+43478,
+43490,
+43490,
+43490,
+43537,
+43556,
+43556,
+43578,
+43604,
+43640,
+43640,
+43640,
+43645,
+43679,
+43705,
+43747,
+43769,
+43769,
+43769,
+43775,
+43803,
+43803,
+43810,
+43810,
+43844,
+43865,
+43872,
+43880,
+43886,
+43921,
+43921,
+43928,
+43928,
+43935,
+43985,
+43992,
+43992,
+44009,
+44022,
+44022,
+44038,
+44042,
+44049,
+44049,
+44056,
+44100,
+44100,
+44107,
+44121,
+44121,
+44121,
+44137,
+44197,
+44204,
+44236,
+44254,
+44286,
+44286,
+44307,
+44319,
+44329,
+44336,
+44343,
+44361,
+44361,
+44361,
+44377,
+44396,
+44423,
+44423,
+44449,
+44471,
+44471,
+44480,
+44480,
+44500,
+44514,
+44537,
+44560,
+44573,
+44606,
+44619,
+44642,
+44705,
+44705,
+44705,
+44711,
+44746,
+44753,
+44753,
+44765,
+44765,
+44765,
+44787,
+44794,
+44801,
+44851,
+44865,
+44884,
+44891,
+44915,
+44924,
+44924,
+44924,
+44960,
+44960,
+44967,
+45006,
+45013,
+45029,
+45036,
+45042,
+45042,
+45053,
+45060,
+45076,
+45108,
+45108,
+45131,
+45138,
+45161,
+45184,
+45261,
+45275,
+45288,
+45305,
+45352,
+45359,
+45403,
+45429,
+45457,
+45484,
+45497,
+45543,
+45574,
+45598,
+45625,
+45665,
+45679,
+45686,
+45691,
+45691,
+45717,
+45722,
+45737,
+45744,
+45744,
+45770,
+45770,
+45774,
+45774,
+45781,
+45815,
+45832,
+45839,
+45856,
+45863,
+45863,
+45896,
+45915,
+45950,
+45950,
+45967,
+45967,
+46016,
+46016,
+46023,
+46038,
+46038,
+46063,
+46063,
+46074,
+46087,
+46117,
+46117,
+46153,
+46153,
+46163,
+46195,
+46202,
+46275,
+46302,
+46320,
+46327,
+46343,
+46343,
+46360,
+46402,
+46402,
+46430,
+46441,
+46445,
+46445,
+46445,
+46461,
+46461,
+46461,
+46478,
+46478,
+46538,
+46538,
+46538,
+46552,
+46569,
+46569,
+46577,
+46585,
+46585,
+46602,
+46610,
+46649,
+46656,
+46670,
+46715,
+46734,
+46734,
+46760,
+46767,
+46767,
+46781,
+46781,
+46795,
+46813,
+46828,
+46835,
+46858,
+46858,
+46858,
+46884,
+46918,
+46930,
+46973,
+46984,
+46998,
+47009,
+47032,
+47038,
+47038,
+47064,
+47113,
+47133,
+47149,
+47156,
+47163,
+47178,
+47215,
+47224,
+47236,
+47263,
+47263,
+47287,
+47295,
+47333,
+47333,
+47343,
+47343,
+47365,
+47404,
+47433,
+47441,
+47448,
+47469,
+47508,
+47526,
+47532,
+47545,
+47584,
+47610,
+47610,
+47627,
+47627,
+47644,
+47644,
+47644,
+47649,
+47680,
+47699,
+47699,
+47721,
+47721,
+47721,
+47721,
+47749,
+47749,
+47785,
+47785,
+47785,
+47785,
+47785,
+47785,
+47824,
+47824,
+47839,
+47861,
+47906,
+47924,
+47924,
+47942,
+47946,
+47946,
+47980,
+47991,
+48009,
+48014,
+48035,
+48065,
+48075,
+48101,
+48112,
+48126,
+48148,
+48148,
+48148,
+48156,
+48239,
+48239,
+48244,
+48244,
+48281,
+48281,
+48291,
+48291,
+48306,
+48324,
+48340,
+48353,
+48366,
+48366,
+48366,
+48378,
+48378,
+48396,
+48396,
+48414,
+48421,
+48435,
+48435,
+48458,
+48522,
+48522,
+48534,
+48534,
+48548,
+48556,
+48571,
+48585,
+48593,
+48593,
+48611,
+48611,
+48616,
+48616,
+48629,
+48629,
+48629,
+48642,
+48654,
+48692,
+48700,
+48700,
+48700,
+48700,
+48700,
+48713,
+48713,
+48713,
+48730,
+48741,
+48741,
+48760,
+48760,
+48765,
+48765,
+48765,
+48777,
+48777,
+48777,
+48788,
+48809,
+48827,
+48827,
+48827,
+48827,
+48854,
+48888,
+48905,
+48919,
+48935,
+48935,
+48947,
+48960,
+48960,
+48982,
+49004,
+49020,
+49020,
+49043,
+49060,
+49060,
+49060,
+49074,
+49090,
+49096,
+49125,
+49146,
+49166,
+49191,
+49191,
+49191,
+49191,
+49191,
+49203,
+49213,
+49219,
+49245,
+49280,
+49288,
+49300,
+49307,
+49322,
+49329,
+49342,
+49367,
+49384,
+49391,
+49391,
+49414,
+49426,
+49446,
+49460,
+49460,
+49460,
+49489,
+49503,
+49503,
+49532,
+49539,
+49539,
+49539,
+49546,
+49546,
+49567,
+49567,
+49582,
+49589,
+49596,
+49603,
+49609,
+49609,
+49653,
+49660,
+49667,
+49692,
+49710,
+49736,
+49752,
+49777,
+49802,
+49808,
+49819,
+49826,
+49845,
+49861,
+49905,
+49905,
+49916,
+49916,
+49916,
+49938,
+49938,
+49962,
+49962,
+49969,
+49976,
+50026,
+50026,
+50088,
+50088,
+50110,
+50157,
+50191,
+50234,
+50261,
+50261,
+50278,
+50278,
+50285,
+50285,
+50289,
+50314,
+50324,
+50324,
+50324,
+50324,
+50324,
+50337,
+50337,
+50337,
+50351,
+50358,
+50358,
+50358,
+50358,
+50375,
+50375,
+50375,
+50383,
+50383,
+50383,
+50396,
+50432,
+50432,
+50432,
+50432,
+50432,
+50432,
+50439,
+50439,
+50446,
+50519,
+50533,
+50537,
+50548,
+50555,
+50581,
+50588,
+50599,
+50620,
+50647,
+50654,
+50665,
+50672,
+50688,
+50688,
+50699,
+50719,
+50742,
+50742,
+50749,
+50804,
+50810,
+50827,
+50849,
+50849,
+50849,
+50849,
+50887,
+50901,
+50910,
+50910,
+50933,
+50950,
+50950,
+50962,
+50962,
+51006,
+51013,
+51028,
+51028,
+51028,
+51035,
+51068,
+51075,
+51075,
+51082,
+51089,
+51089,
+51109,
+51125,
+51153,
+51160,
+51160,
+51179,
+51204,
+51211,
+51211,
+51228,
+51228,
+51241,
+51241,
+51241,
+51241,
+51248,
+51248,
+51276,
+51288,
+51302,
+51334,
+51342,
+51349,
+51349,
+51364,
+51394,
+51401,
+51426,
+51426,
+51426,
+51446,
+51453,
+51453,
+51479,
+51494,
+51526,
+51526,
+51536,
+51558,
+51567,
+51589,
+51639,
+51646,
+51661,
+51661,
+51678,
+51685,
+51685,
+51693,
+51715,
+51715,
+51722,
+51729,
+51739,
+51747,
+51754,
+51754,
+51777,
+51777,
+51784,
+51791,
+51826,
+51847,
+51868,
+51892,
+51912,
+51937,
+51968,
+51989,
+51989,
+51989,
+51989,
+51989,
+51997,
+52004,
+52020,
+52031,
+52031,
+52031,
+52047,
+52058,
+52066,
+52073,
+52093,
+52093,
+52113,
+52113,
+52113,
+52113,
+52134,
+52153,
+52163,
+52163,
+52178,
+52195,
+52208,
+52215,
+52215,
+52215,
+52227,
+52270,
+52285,
+52302,
+52311,
+52311,
+52362,
+52378,
+52416,
+52433,
+52458,
+52468,
+52468,
+52468,
+52491,
+52491,
+52504,
+52504,
+52513,
+52518,
+52518,
+52518,
+52534,
+52534,
+52542,
+52542,
+52559,
+52581,
+52610,
+52644,
+52657,
+52662,
+52685,
+52685,
+52690,
+52690,
+52708,
+52728,
+52747,
+52774,
+52788,
+52830,
+52837,
+52837,
+52876,
+52883,
+52911,
+52911,
+52921,
+52943,
+52943,
+52943,
+52967,
+52967,
+52981,
+53000,
+53014,
+53050,
+53050,
+53061,
+53061,
+53075,
+53082,
+53129,
+53129,
+53129,
+53145,
+53152,
+53159,
+53159,
+53179,
+53186,
+53192,
+53199,
+53199,
+53199,
+53234,
+53257,
+53262,
+53279,
+53298,
+53317,
+53341,
+53361,
+53361,
+53361,
+53372,
+53372,
+53411,
+53433,
+53444,
+53455,
+53476,
+53490,
+53504,
+53531,
+53531,
+53531,
+53545,
+53552,
+53568,
+53568,
+53568,
+53580,
+53580,
+53613,
+53635,
+53667,
+53677,
+53706,
+53706,
+53706,
+53726,
+53767,
+53774,
+53792,
+53805,
+53816,
+53824,
+53851,
+53869,
+53869,
+53869,
+53869,
+53869,
+53879,
+53893,
+53893,
+53903,
+53903,
+53912,
+53912,
+53912,
+53912,
+53912,
+53912,
+53924,
+53924,
+53931,
+53931,
+53950,
+53960,
+53960,
+53965,
+53986,
+53986,
+54018,
+54028,
+54036,
+54054,
+54061,
+54061,
+54080,
+54090,
+54098,
+54102,
+54106,
+54106,
+54122,
+54143,
+54143,
+54158,
+54165,
+54165,
+54175,
+54175,
+54175,
+54192,
+54204,
+54220,
+54265,
+54265,
+54265,
+54271,
+54271,
+54271,
+54271,
+54276,
+54276,
+54300,
+54306,
+54306,
+54315,
+54324,
+54329,
+54343,
+54365,
+54381,
+54381,
+54381,
+54381,
+54381,
+54381,
+54403,
+54403,
+54403,
+54429,
+54445,
+54445,
+54445,
+54458,
+54458,
+54471,
+54495,
+54495,
+54507,
+54514,
+54519,
+54526,
+54554,
+54571,
+54600,
+54607,
+54622,
+54622,
+54638,
+54656,
+54656,
+54665,
+54682,
+54682,
+54682,
+54703,
+54709,
+54709,
+54725,
+54749,
+54780,
+54780,
+54794,
+54799,
+54799,
+54799,
+54799,
+54804,
+54817,
+54840,
+54858,
+54858,
+54858,
+54858,
+54878,
+54890,
+54896,
+54904,
+54904,
+54911,
+54911,
+54924,
+54924,
+54924,
+54924,
+54924,
+54924,
+54924,
+54938,
+54946,
+54966,
+54984,
+54984,
+54984,
+54984,
+54984,
+54995,
+55002,
+55017,
+55017,
+55026,
+55051,
+55083,
+55083,
+55083,
+55083,
+55083,
+55100,
+55100,
+55100,
+55108,
+55116,
+55126,
+55126,
+55126,
+55126,
+55133,
+55137,
+55137,
+55137,
+55168,
+55168,
+55168,
+55168,
+55173,
+55173,
+55177,
+55177,
+55177,
+55205,
+55217,
+55241,
+55255,
+55287,
+55291,
+55324,
+55328,
+55336,
+55343,
+55361,
+55376,
+55376,
+55381,
+55409,
+55409,
+55409,
+55409,
+55409,
+55424,
+55424,
+55441,
+55441,
+55452,
+55470,
+55470,
+55515,
+55515,
+55533,
+55543,
+55543,
+55543,
+55543,
+55543,
+55543,
+55577,
+55577,
+55588,
+55603,
+55634,
+55634,
+55634,
+55645,
+55665,
+55665,
+55676,
+55693,
+55693,
+55701,
+55716,
+55734,
+55762,
+55772,
+55791,
+55791,
+55795,
+55795,
+55812,
+55812,
+55816,
+55820,
+55837,
+55837,
+55837,
+55837,
+55837,
+55850,
+55850,
+55850,
+55850,
+55878,
+55878,
+55883,
+55887,
+55887,
+55887,
+55908,
+55908,
+55932,
+55932,
+55945,
+55945,
+55958,
+55958,
+55969,
+56008,
+56029,
+56029,
+56045,
+56056,
+56086,
+56086,
+56120,
+56120,
+56149,
+56177,
+56177,
+56188,
+56188,
+56194,
+56194,
+56202,
+56202,
+56222,
+56222,
+56254,
+56254,
+56293,
+56313,
+56338,
+56338,
+56353,
+56378,
+56393,
+56393,
+56410,
+56410,
+56410,
+56410,
+56444,
+56444,
+56490,
+56490,
+56490,
+56511,
+56511,
+56525,
+56525,
+56537,
+56558,
+56578,
+56588,
+56588,
+56596,
+56604,
+56604,
+56604,
+56604,
+56604,
+56604,
+56604,
+56608,
+56634,
+56644,
+56644,
+56644,
+56663,
+56663,
+56671,
+56671,
+56671,
+56671,
+56697,
+56718,
+56718,
+56718,
+56748,
+56752,
+56752,
+56768,
+56810,
+56810,
+56810,
+56836,
+56882,
+56882,
+56882,
+56893,
+56893,
+56917,
+56917,
+56937,
+56967,
+56976,
+56996,
+56996,
+57031,
+57049,
+57071,
+57103,
+57103,
+57103,
+57121,
+57133,
+57151,
+57151,
+57165,
+57165,
+57165,
+57170,
+57185,
+57185,
+57185,
+57204,
+57214,
+57241,
+57286,
+57336,
+57336,
+57377,
+57397,
+57409,
+57439,
+57451,
+57451,
+57472,
+57486,
+57532,
+57556,
+57556,
+57562,
+57575,
+57590,
+57621,
+57654,
+57675,
+57675,
+57675,
+57689,
+57689,
+57695,
+57699,
+57716,
+57739,
+57748,
+57788,
+57806,
+57822,
+57828,
+57828,
+57838,
+57861,
+57894,
+57924,
+57924,
+57930,
+57930,
+57930,
+57941,
+57941,
+57966,
+57997,
+58022,
+58030,
+58050,
+58070,
+58107,
+58115,
+58158,
+58185,
+58217,
+58235,
+58266,
+58272,
+58298,
+58309,
+58349,
+58381,
+58381,
+58418,
+58432,
+58456,
+58468,
+58468,
+58489,
+58517,
+58517,
+58535,
+58561,
+58581,
+58618,
+58655,
+58655,
+58674,
+58680,
+58696,
+58701,
+58701,
+58701,
+58717,
+58717,
+58727,
+58739,
+58753,
+58762,
+58762,
+58762,
+58797,
+58809,
+58832,
+58847,
+58868,
+58868,
+58868,
+58880,
+58880,
+58880,
+58885,
+58885,
+58885,
+58885,
+58885,
+58885,
+58885,
+58912,
+58931,
+58931,
+58931,
+58951,
+58963,
+58985,
+58985,
+59003,
+59008,
+59017,
+59017,
+59027,
+59052,
+59058,
+59058,
+59058,
+59096,
+59130,
+59153,
+59153,
+59153,
+59153,
+59153,
+59153,
+59153,
+59153,
+59162,
+59162,
+59162,
+59162,
+59179,
+59225,
+59242,
+59248,
+59270,
+59318,
+59323,
+59340,
+59346,
+59360,
+59366,
+59382,
+59416,
+59445,
+59471,
+59495,
+59495,
+59513,
+59513,
+59541,
+59547,
+59553,
+59559,
+59583,
+59595,
+59607,
+59631,
+59631,
+59643,
+59649,
+59661,
+59714,
+59737,
+59737,
+59758,
+59758,
+59775,
+59784,
+59796,
+59815,
+59821,
+59821,
+59849,
+59856,
+59868,
+59881,
+59900,
+59907,
+59928,
+59940,
+59940,
+59955,
+59955,
+60014,
+60014,
+60045,
+60057,
+60057,
+60063,
+60075,
+60075,
+60079,
+60079,
+60096,
+60111,
+60111,
+60111,
+60156,
+60171,
+60183,
+60197,
+60223,
+60223,
+60229,
+60253,
+60259,
+60259,
+60274,
+60315,
+60342,
+60342,
+60386,
+60396,
+60406,
+60406,
+60433,
+60433,
+60433,
+60457,
+60474,
+60474,
+60492,
+60502,
+60508,
+60508,
+60514,
+60527,
+60545,
+60551,
+60588,
+60621,
+60645,
+60645,
+60663,
+60685,
+60711,
+60758,
+60758,
+60769,
+60781,
+60823,
+60842,
+60842,
+60842,
+60848,
+60848,
+60860,
+60866,
+60880,
+60880,
+60880,
+60898,
+60949,
+60975,
+60975,
+60997,
+60997,
+61059,
+61083,
+61083,
+61107,
+61107,
+61113,
+61117,
+61123,
+61140,
+61152,
+61174,
+61183,
+61183,
+61183,
+61235,
+61262,
+61268,
+61268,
+61268,
+61276,
+61289,
+61297,
+61297,
+61312,
+61327,
+61336,
+61350,
+61375,
+61383,
+61409,
+61422,
+61422,
+61457,
+61497,
+61497,
+61554,
+61594,
+61606,
+61606,
+61624,
+61624,
+61624,
+61633,
+61633,
+61658,
+61674,
+61682,
+61682,
+61696,
+61696,
+61696,
+61696,
+61706,
+61747,
+61768,
+61768,
+61768,
+61777,
+61777,
+61777,
+61781,
+61787,
+61800,
+61815,
+61820,
+61826,
+61834,
+61865,
+61871,
+61876,
+61889,
+61912,
+61912,
+61912,
+61918,
+61918,
+61946,
+61985,
+61985,
+61985,
+62004,
+62015,
+62015,
+62029,
+62044,
+62050,
+62064,
+62064,
+62087,
+62099,
+62099,
+62110,
+62116,
+62129,
+62142,
+62167,
+62179,
+62191,
+62212,
+62218,
+62218,
+62256,
+62256,
+62283,
+62304,
+62304,
+62329,
+62329,
+62351,
+62351,
+62351,
+62351,
+62368,
+62368,
+62386,
+62404,
+62442,
+62449,
+62449,
+62449,
+62469,
+62473,
+62488,
+62488,
+62502,
+62530,
+62549,
+62569,
+62569,
+62569,
+62600,
+62600,
+62609,
+62622,
+62639,
+62639,
+62639,
+62657,
+62657,
+62681,
+62681,
+62681,
+62688,
+62716,
+62716,
+62724,
+62724,
+62735,
+62743,
+62757,
+62769,
+62789,
+62809,
+62809,
+62815,
+62836,
+62853,
+62853,
+62863,
+62863,
+62863,
+62863,
+62863,
+62872,
+62885,
+62885,
+62914,
+62914,
+62914,
+62952,
+62952,
+62964,
+63000,
+63000,
+63000,
+63010,
+63016,
+63016,
+63016,
+63032,
+63039,
+63049,
+63063,
+63063,
+63099,
+63111,
+63119,
+63125,
+63145,
+63176,
+63188,
+63225,
+63231,
+63244,
+63244,
+63255,
+63255,
+63273,
+63273,
+63285,
+63285,
+63338,
+63352,
+63399,
+63399,
+63423,
+63423,
+63435,
+63449,
+63449,
+63457,
+63491,
+63491,
+63518,
+63518,
+63547,
+63565,
+63576,
+63594,
+63594,
+63594,
+63594,
+63600,
+63600,
+63616,
+63616,
+63642,
+63671,
+63671,
+63671,
+63677,
+63677,
+63691,
+63706,
+63720,
+63733,
+63755,
+63762,
+63779,
+63779,
+63795,
+63795,
+63795,
+63847,
+63879,
+63905,
+63921,
+63927,
+63965,
+63986,
+63986,
+64007,
+64007,
+64052,
+64052,
+64066,
+64079,
+64079,
+64134,
+64134,
+64140,
+64150,
+64150,
+64167,
+64192,
+64192,
+64192,
+64208,
+64224,
+64232,
+64243,
+64243,
+64278,
+64295,
+64314,
+64314,
+64314,
+64314,
+64314,
+64314,
+64314,
+64331,
+64360,
+64377,
+64395,
+64395,
+64395,
+64420,
+64463,
+64470,
+64486,
+64496,
+64509,
+64509,
+64519,
+64531,
+64548,
+64570,
+64597,
+64631,
+64631,
+64661,
+64671,
+64710,
+64710,
+64710,
+64751,
+64751,
+64761,
+64772,
+64772,
+64772,
+64772,
+64772,
+64792,
+64834,
+64846,
+64846,
+64862,
+64881,
+64893,
+64893,
+64911,
+64920,
+64937,
+64937,
+64954,
+64954,
+64954,
+64970,
+64970,
+64980,
+64980,
+64980,
+65004,
+65013,
+65013,
+65022,
+65022,
+65022,
+65047,
+65047,
+65054,
+65054,
+65061,
+65061,
+65061,
+65069,
+65081,
+65127,
+65136,
+65158,
+65158,
+65158,
+65188,
+65188,
+65188,
+65209,
+65227,
+65227,
+65227,
+65242,
+65246,
+65263,
+65289,
+65297,
+65314,
+65314,
+65347,
+65347,
+65347,
+65390,
+65390,
+65405,
+65412,
+65432,
+65432,
+65445,
+65445,
+65460,
+65460,
+65497,
+65497,
+65497,
+65497,
+65517,
+65526,
+65526,
+65547,
+65547,
+65553,
+65553,
+65569,
+65576,
+65576,
+65576,
+65586,
+65586,
+65586,
+65586,
+65603,
+65628,
+65628,
+65647,
+65647,
+65667,
+65677,
+65695,
+65704,
+65715,
+65715,
+65743,
+65743,
+65782,
+65802,
+65809,
+65818,
+65837,
+65837,
+65852,
+65856,
+65871,
+65875,
+65918,
+65918,
+65918,
+65944,
+65944,
+65951,
+65958,
+65980,
+65980,
+66007,
+66007,
+66007,
+66036,
+66059,
+66059,
+66059,
+66082,
+66082,
+66082,
+66082,
+66121,
+66121,
+66128,
+66128,
+66168,
+66168,
+66188,
+66203,
+66218,
+66251,
+66251,
+66270,
+66270,
+66270,
+66270,
+66296,
+66301,
+66328,
+66361,
+66387,
+66387,
+66416,
+66434,
+66448,
+66448,
+66448,
+66467,
+66467,
+66476,
+66476,
+66476,
+66493,
+66505,
+66505,
+66505,
+66513,
+66513,
+66513,
+66513,
+66528,
+66549,
+66549,
+66549,
+66566,
+66571,
+66593,
+66623,
+66623,
+66623,
+66623,
+66623,
+66623,
+66623,
+66623,
+66623,
+66646,
+66657,
+66681,
+66697,
+66727,
+66747,
+66754,
+66773,
+66795,
+66821,
+66833,
+66840,
+66861,
+66861,
+66861,
+66861,
+66861,
+66874,
+66874,
+66874,
+66880,
+66880,
+66880,
+66890,
+66903,
+66903,
+66918,
+66946,
+67028,
+67028,
+67035,
+67050,
+67050,
+67062,
+67077,
+67077,
+67091,
+67091,
+67108,
+67108,
+67136,
+67136,
+67136,
+67152,
+67173,
+67202,
+67221,
+67245,
+67245,
+67251,
+67260,
+67277,
+67277,
+67277,
+67277,
+67284,
+67311,
+67311,
+67311,
+67332,
+67332,
+67332,
+67353,
+67395,
+67421,
+67421,
+67446,
+67497,
+67519,
+67524,
+67549,
+67549,
+67565,
+67575,
+67593,
+67607,
+67612,
+67612,
+67612,
+67625,
+67675,
+67685,
+67694,
+67705,
+67705,
+67705,
+67725,
+67725,
+67772,
+67782,
+67782,
+67782,
+67782,
+67782,
+67811,
+67827,
+67827,
+67827,
+67835,
+67852,
+67857,
+67900,
+67900,
+67900,
+67904,
+67904,
+67904,
+67904,
+67921,
+67941,
+67952,
+67952,
+67969,
+67969,
+67969,
+67983,
+67983,
+68008,
+68008,
+68016,
+68035,
+68035,
+68035,
+68035,
+68035,
+68056,
+68076,
+68083,
+68104,
+68104,
+68104,
+68104,
+68122,
+68143,
+68167,
+68185,
+68185,
+68185,
+68202,
+68229,
+68238,
+68251,
+68274,
+68295,
+68300,
+68300,
+68338,
+68370,
+68392,
+68416,
+68416,
+68416,
+68416,
+68436,
+68458,
+68485,
+68508,
+68542,
+68542,
+68549,
+68549,
+68549,
+68549,
+68555,
+68555,
+68563,
+68575,
+68587,
+68606,
+68606,
+68606,
+68606,
+68606,
+68611,
+68611,
+68611,
+68630,
+68636,
+68673,
+68673,
+68686,
+68686,
+68686,
+68697,
+68706,
+68716,
+68728,
+68749,
+68754,
+68779,
+68784,
+68784,
+68784,
+68784,
+68794,
+68794,
+68799,
+68813,
+68813,
+68840,
+68840,
+68858,
+68858,
+68858,
+68880,
+68880,
+68902,
+68908,
+68908,
+68908,
+68908,
+68908,
+68934,
+68934,
+68941,
+68968,
+68968,
+68984,
+68984,
+69000,
+69000,
+69000,
+69000,
+69000,
+69000,
+69000,
+69018,
+69045,
+69083,
+69083,
+69083,
+69083,
+69100,
+69104,
+69104,
+69104,
+69167,
+69167,
+69181,
+69192,
+69192,
+69192,
+69203,
+69203,
+69203,
+69203,
+69203,
+69203,
+69203,
+69203,
+69203,
+69208,
+69230,
+69242,
+69242,
+69249,
+69249,
+69249,
+69249,
+69259,
+69266,
+69266,
+69266,
+69331,
+69331,
+69331,
+69358,
+69369,
+69408,
+69414,
+69433,
+69433,
+69441,
+69456,
+69482,
+69482,
+69492,
+69527,
+69536,
+69549,
+69549,
+69566,
+69566,
+69570,
+69570,
+69587,
+69592,
+69592,
+69635,
+69642,
+69642,
+69654,
+69654,
+69654,
+69670,
+69677,
+69689,
+69689,
+69689,
+69705,
+69724,
+69724,
+69744,
+69750,
+69762,
+69779,
+69798,
+69806,
+69806,
+69814,
+69814,
+69844,
+69858,
+69868,
+69877,
+69911,
+69925,
+69925,
+69948,
+69955,
+69964,
+69987,
+70016,
+70030,
+70030,
+70047,
+70052,
+70052,
+70052,
+70052,
+70057,
+70070,
+70070,
+70070,
+70070,
+70083,
+70089,
+70089,
+70099,
+70111,
+70125,
+70140,
+70140,
+70144,
+70144,
+70144,
+70170,
+70176,
+70188,
+70200,
+70200,
+70215,
+70233,
+70233,
+70238,
+70270,
+70292,
+70302,
+70302,
+70320,
+70320,
+70328,
+70362,
+70362,
+70379,
+70435,
+70445,
+70476,
+70483,
+70483,
+70483,
+70494,
+70521,
+70533,
+70533,
+70533,
+70533,
+70544,
+70544,
+70582,
+70598,
+70615,
+70615,
+70636,
+70684,
+70684,
+70704,
+70704,
+70704,
+70716,
+70744,
+70772,
+70772,
+70816,
+70831,
+70831,
+70865,
+70865,
+70876,
+70892,
+70907,
+70925,
+70925,
+70925,
+70934,
+70934,
+70934,
+70973,
+71002,
+71044,
+71044,
+71044,
+71044,
+71056,
+71073,
+71073,
+71097,
+71097,
+71108,
+71108,
+71113,
+71113,
+71132,
+71146,
+71146,
+71153,
+71160,
+71160,
+71179,
+71198,
+71212,
+71223,
+71230,
+71230,
+71244,
+71274,
+71286,
+71286,
+71304,
+71304,
+71304,
+71320,
+71320,
+71325,
+71325,
+71325,
+71359,
+71388,
+71388,
+71411,
+71416,
+71416,
+71438,
+71464,
+71464,
+71464,
+71471,
+71485,
+71505,
+71519,
+71526,
+71541,
+71563,
+71563,
+71583,
+71605,
+71612,
+71631,
+71663,
+71682,
+71682,
+71700,
+71714,
+71721,
+71721,
+71749,
+71774,
+71783,
+71790,
+71797,
+71804,
+71830,
+71830,
+71863,
+71882,
+71882,
+71882,
+71917,
+71924,
+71944,
+71985,
+71985,
+71985,
+71985,
+72004,
+72023,
+72037,
+72037,
+72049,
+72090,
+72119,
+72152,
+72152,
+72152,
+72152,
+72177,
+72194,
+72229,
+72229,
+72229,
+72246,
+72253,
+72279,
+72286,
+72291,
+72319,
+72332,
+72339,
+72339,
+72372,
+72379,
+72417,
+72417,
+72442,
+72442,
+72457,
+72466,
+72498,
+72505,
+72529,
+72538,
+72538,
+72555,
+72584,
+72584,
+72603,
+72603,
+72603,
+72635,
+72635,
+72635,
+72635,
+72635,
+72635,
+72652,
+72652,
+72652,
+72652,
+72682,
+72689,
+72696,
+72696,
+72725,
+72732,
+72732,
+72781,
+72781,
+72813,
+72820,
+72847,
+72854,
+72867,
+72867,
+72894,
+72901,
+72918,
+72953,
+72953,
+72995,
+73002,
+73002,
+73014,
+73014,
+73014,
+73048,
+73103,
+73135,
+73142,
+73149,
+73160,
+73160,
+73169,
+73169,
+73169,
+73200,
+73208,
+73262,
+73285,
+73296,
+73309,
+73317,
+73331,
+73331,
+73338,
+73354,
+73354,
+73379,
+73401,
+73421,
+73428,
+73435,
+73469,
+73487,
+73494,
+73494,
+73494,
+73494,
+73522,
+73522,
+73529,
+73545,
+73545,
+73551,
+73604,
+73612,
+73612,
+73619,
+73644,
+73655,
+73655,
+73655,
+73662,
+73684,
+73730,
+73745,
+73769,
+73769,
+73791,
+73798,
+73798,
+73805,
+73823,
+73830,
+73844,
+73844,
+73885,
+73902,
+73937,
+73961,
+73968,
+74012,
+74038,
+74038,
+74038,
+74054,
+74080,
+74095,
+74124,
+74150,
+74174,
+74181,
+74195,
+74202,
+74241,
+74241,
+74264,
+74284,
+74291,
+74298,
+74329,
+74349,
+74387,
+74408,
+74415,
+74422,
+74429,
+74429,
+74451,
+74458,
+74490,
+74490,
+74497,
+74504,
+74504,
+74511,
+74547,
+74566,
+74566,
+74586,
+74586,
+74610,
+74634,
+74634,
+74663,
+74667,
+74691,
+74691,
+74691,
+74706,
+74738,
+74738,
+74745,
+74745,
+74791,
+74791,
+74804,
+74823,
+74830,
+74856,
+74856,
+74875,
+74882,
+74893,
+74902,
+74909,
+74916,
+74976,
+74976,
+74983,
+75010,
+75017,
+75029,
+75036,
+75043,
+75060,
+75067,
+75067,
+75067,
+75106,
+75113,
+75129,
+75129,
+75129,
+75129,
+75129,
+75149,
+75163,
+75195,
+75222,
+75259,
+75259,
+75259,
+75280,
+75280,
+75280,
+75301,
+75319,
+75360,
+75360,
+75367,
+75379,
+75379,
+75397,
+75428,
+75466,
+75486,
+75510,
+75536,
+75552,
+75573,
+75603,
+75620,
+75643,
+75659,
+75694,
+75694,
+75711,
+75718,
+75718,
+75718,
+75734,
+75741,
+75763,
+75805,
+75805,
+75823,
+75837,
+75844,
+75851,
+75858,
+75899,
+75906,
+75931,
+75958,
+75958,
+76002,
+76009,
+76009,
+76016,
+76023,
+76065,
+76092,
+76140,
+76140,
+76147,
+76177,
+76187,
+76187,
+76224,
+76224,
+76230,
+76265,
+76265,
+76291,
+76291,
+76316,
+76354,
+76361,
+76361,
+76375,
+76382,
+76399,
+76399,
+76399,
+76425,
+76425,
+76425,
+76425,
+76435,
+76451,
+76451,
+76490,
+76490,
+76490,
+76506,
+76506,
+76506,
+76516,
+76516,
+76516,
+76540,
+76579,
+76579,
+76586,
+76599,
+76606,
+76606,
+76606,
+76641,
+76641,
+76666,
+76676,
+76676,
+76676,
+76683,
+76683,
+76700,
+76700,
+76700,
+76700,
+76717,
+76717,
+76737,
+76737,
+76737,
+76737,
+76737,
+76737,
+76737,
+76737,
+76771,
+76771,
+76782,
+76789,
+76799,
+76828,
+76845,
+76845,
+76893,
+76893,
+76908,
+76930,
+76930,
+76973,
+76980,
+76980,
+76980,
+77005,
+77005,
+77020,
+77032,
+77051,
+77060,
+77086,
+77086,
+77086,
+77086,
+77150,
+77150,
+77167,
+77172,
+77172,
+77176,
+77176,
+77191,
+77191,
+77218,
+77218,
+77218,
+77218,
+77227,
+77237,
+77253,
+77273,
+77294,
+77321,
+77337,
+77352,
+77380,
+77380,
+77404,
+77422,
+77422,
+77428,
+77428,
+77444,
+77485,
+77485,
+77499,
+77499,
+77520,
+77545,
+77550,
+77560,
+77567,
+77596,
+77615,
+77615,
+77615,
+77653,
+77653,
+77653,
+77674,
+77674,
+77674,
+77686,
+77686,
+77706,
+77719,
+77719,
+77727,
+77736,
+77767,
+77773,
+77802,
+77821,
+77837,
+77847,
+77870,
+77877,
+77877,
+77877,
+77877,
+77888,
+77903,
+77926,
+77946,
+77957,
+77961,
+77967,
+77967,
+77967,
+77983,
+78017,
+78035,
+78035,
+78035,
+78040,
+78040,
+78040,
+78050,
+78063,
+78099,
+78104,
+78110,
+78110,
+78110,
+78138,
+78198,
+78218,
+78231,
+78295,
+78306,
+78335,
+78335,
+78364,
+78364,
+78364,
+78377,
+78417,
+78427,
+78427,
+78459,
+78459,
+78466,
+78466,
+78473,
+78499,
+78499,
+78509,
+78509,
+78536,
+78587,
+78609,
+78609,
+78616,
+78616,
+78640,
+78653,
+78653,
+78653,
+78653,
+78660,
+78679,
+78689,
+78703,
+78703,
+78728,
+78741,
+78756,
+78765,
+78783,
+78814,
+78839,
+78839,
+78839,
+78839,
+78849,
+78854,
+78864,
+78894,
+78894,
+78914,
+78914,
+78914,
+78932,
+78932,
+78971,
+78989,
+78989,
+78989,
+78997,
+78997,
+78997,
+78997,
+78997,
+78997,
+78997,
+78997,
+79009,
+79009,
+79033,
+79033,
+79049,
+79049,
+79049,
+79049,
+79061,
+79066,
+79081,
+79086,
+79093,
+79098,
+79098,
+79098,
+79124,
+79124,
+79124,
+79134,
+79150,
+79163,
+79163,
+79163,
+79193,
+79209,
+79218,
+79224,
+79235,
+79235,
+79247,
+79247,
+79247,
+79247,
+79247,
+79253,
+79274,
+79289,
+79289,
+79320,
+79320,
+79320,
+79337,
+79337,
+79354,
+79360,
+79388,
+79400,
+79400,
+79436,
+79436,
+79444,
+79460,
+79483,
+79483,
+79517,
+79517,
+79535,
+79543,
+79543,
+79543,
+79543,
+79562,
+79562,
+79562,
+79591,
+79591,
+79607,
+79617,
+79617,
+79626,
+79641,
+79641,
+79662,
+79662,
+79678,
+79678,
+79704,
+79717,
+79738,
+79738,
+79756,
+79756,
+79763,
+79770,
+79791,
+79791,
+79798,
+79798,
+79798,
+79815,
+79815,
+79876,
+79876,
+79876,
+79894,
+79919,
+79924,
+79943,
+79943,
+79958,
+79958,
+79979,
+79979,
+79996,
+79996,
+79996,
+79996,
+79996,
+79996,
+80004,
+80023,
+80023,
+80023,
+80023,
+80023,
+80023,
+80023,
+80023,
+80023,
+80023,
+80023,
+80023,
+80023,
+80049,
+80060,
+80060,
+80060,
+80091,
+80091,
+80091,
+80098,
+80123,
+80123,
+80123,
+80163,
+80163,
+80199,
+80199,
+80199,
+80199,
+80199,
+80225,
+80225,
+80240,
+80240,
+80240,
+80268,
+80287,
+80287,
+80298,
+80298,
+80339,
+80387,
+80402,
+80411,
+80422,
+80422,
+80434,
+80458,
+80466,
+80471,
+80481,
+80527,
+80565,
+80571,
+80606,
+80606,
+80618,
+80618,
+80655,
+80669,
+80677,
+80677,
+80723,
+80735,
+80735,
+80757,
+80757,
+80770,
+80800,
+80810,
+80810,
+80810,
+80820,
+80843,
+80843,
+80843,
+80879,
+80879,
+80879,
+80919,
+80919,
+80928,
+80956,
+80973,
+80973,
+80990,
+80990,
+80990,
+80990,
+81000,
+81000,
+81010,
+81028,
+81028,
+81028,
+81028,
+81034,
+81034,
+81034,
+81034,
+81034,
+81034,
+81034,
+81050,
+81070,
+81070,
+81118,
+81135,
+81135,
+81145,
+81158,
+81158,
+81195,
+81222,
+81233,
+81271,
+81284,
+81319,
+81327,
+81327,
+81345,
+81345,
+81345,
+81358,
+81392,
+81392,
+81422,
+81437,
+81471,
+81471,
+81471,
+81471,
+81471,
+81471,
+81494,
+81494,
+81494,
+81494,
+81494,
+81494,
+81521,
+81536,
+81564,
+81564,
+81591,
+81591,
+81612,
+81623,
+81654,
+81654,
+81654,
+81673,
+81673,
+81673,
+81673,
+81716,
+81716,
+81728,
+81757,
+81757,
+81757,
+81757,
+81757,
+81767,
+81784,
+81784,
+81784,
+81803,
+81815,
+81836,
+81836,
+81865,
+81920,
+81929,
+81945,
+81945,
+81945,
+81945,
+81966,
+81966,
+81987,
+81992,
+82010,
+82019,
+82019,
+82088,
+82088,
+82088,
+82123,
+82123,
+82123,
+82134,
+82144,
+82144,
+82164,
+82179,
+82197,
+82248,
+82266,
+82266,
+82266,
+82301,
+82318,
+82352,
+82378,
+82378,
+82384,
+82384,
+82384,
+82402,
+82410,
+82410,
+82426,
+82426,
+82426,
+82426,
+82426,
+82437,
+82471,
+82489,
+82489,
+82515,
+82523,
+82544,
+82544,
+82544,
+82544,
+82544,
+82559,
+82559,
+82576,
+82591,
+82624,
+82634,
+82650,
+82650,
+82668,
+82668,
+82675,
+82703,
+82703,
+82719,
+82730,
+82755,
+82755,
+82755,
+82755,
+82755,
+82755,
+82755,
+82765,
+82765,
+82776,
+82791,
+82807,
+82833,
+82848,
+82848,
+82869,
+82869,
+82884,
+82884,
+82884,
+82927,
+82927,
+82946,
+82964,
+82975,
+82975,
+82975,
+82983,
+83005,
+83045,
+83045,
+83045,
+83045,
+83045,
+83065,
+83065,
+83065,
+83065,
+83089,
+83120,
+83120,
+83120,
+83158,
+83158,
+83187,
+83208,
+83230,
+83243,
+83243,
+83243,
+83243,
+83265,
+83265,
+83265,
+83265,
+83265,
+83284,
+83307,
+83307,
+83307,
+83312,
+83331,
+83331,
+83331,
+83331,
+83354,
+83393,
+83400,
+83400,
+83400,
+83438,
+83448,
+83448,
+83485,
+83485,
+83485,
+83485,
+83485,
+83485,
+83485,
+83485,
+83508,
+83524,
+83536,
+83536,
+83572,
+83572,
+83572,
+83581,
+83581,
+83648,
+83648,
+83663,
+83676,
+83711,
+83722,
+83731,
+83731,
+83731,
+83753,
+83772,
+83772,
+83785,
+83785,
+83795,
+83810,
+83818,
+83845,
+83870,
+83870,
+83870,
+83880,
+83880,
+83904,
+83904,
+83904,
+83916,
+83916,
+83945,
+83996,
+83996,
+84020,
+84020,
+84030,
+84030,
+84030,
+84030,
+84063,
+84063,
+84094,
+84107,
+84130,
+84130,
+84149,
+84149,
+84155,
+84180,
+84215,
+84235,
+84273,
+84273,
+84291,
+84297,
+84307,
+84313,
+84334,
+84350,
+84350,
+84350,
+84392,
+84392,
+84403,
+84403,
+84436,
+84448,
+84470,
+84470,
+84470,
+84470,
+84470,
+84506,
+84534,
+84587,
+84599,
+84617,
+84617,
+84630,
+84646,
+84646,
+84682,
+84682,
+84682,
+84691,
+84714,
+84731,
+84763,
+84763,
+84773,
+84809,
+84818,
+84818,
+84829,
+84874,
+84874,
+84908,
+84928,
+84928,
+84942,
+84959,
+84959,
+84968,
+84968,
+84977,
+85020,
+85040,
+85040,
+85053,
+85085,
+85085,
+85095,
+85100,
+85111,
+85111,
+85119,
+85119,
+85151,
+85173,
+85173,
+85173,
+85186,
+85186,
+85191,
+85219,
+85219,
+85226,
+85245,
+85245,
+85262,
+85269,
+85285,
+85298,
+85298,
+85311,
+85324,
+85341,
+85341,
+85356,
+85356,
+85363,
+85405,
+85452,
+85476,
+85483,
+85483,
+85506,
+85546,
+85562,
+85618,
+85618,
+85618,
+85641,
+85648,
+85668,
+85711,
+85711,
+85731,
+85738,
+85745,
+85776,
+85776,
+85776,
+85781,
+85795,
+85802,
+85802,
+85830,
+85864,
+85911,
+85925,
+85925,
+85925,
+85947,
+85996,
+86032,
+86071,
+86081,
+86088,
+86107,
+86121,
+86121,
+86141,
+86141,
+86163,
+86192,
+86199,
+86199,
+86199,
+86199,
+86224,
+86256,
+86292,
+86292,
+86312,
+86312,
+86341,
+86362,
+86372,
+86372,
+86372,
+86372,
+86381,
+86399,
+86409,
+86428,
+86442,
+86449,
+86487,
+86487,
+86503,
+86515,
+86515,
+86515,
+86515,
+86515,
+86526,
+86545,
+86545,
+86545,
+86545,
+86571,
+86571,
+86571,
+86618,
+86626,
+86673,
+86704,
+86730,
+86748,
+86760,
+86767,
+86767,
+86784,
+86784,
+86807,
+86825,
+86832,
+86856,
+86885,
+86917,
+86936,
+86936,
+86964,
+86971,
+86971,
+87009,
+87031,
+87031,
+87066,
+87096,
+87096,
+87096,
+87116,
+87116,
+87123,
+87150,
+87165,
+87192,
+87198,
+87198,
+87198,
+87224,
+87236,
+87263,
+87263,
+87270,
+87285,
+87297,
+87335,
+87395,
+87395,
+87395,
+87414,
+87423,
+87433,
+87433,
+87443,
+87455,
+87474,
+87490,
+87505,
+87512,
+87523,
+87539,
+87539,
+87539,
+87556,
+87556,
+87613,
+87669,
+87669,
+87676,
+87689,
+87709,
+87709,
+87716,
+87734,
+87771,
+87796,
+87803,
+87826,
+87833,
+87833,
+87861,
+87871,
+87895,
+87929,
+87936,
+87943,
+87980,
+87989,
+88003,
+88003,
+88013,
+88013,
+88020,
+88050,
+88066,
+88066,
+88088,
+88095,
+88152,
+88162,
+88169,
+88169,
+88197,
+88214,
+88237,
+88254,
+88267,
+88267,
+88274,
+88293,
+88326,
+88333,
+88358,
+88379,
+88393,
+88400,
+88414,
+88432,
+88450,
+88489,
+88497,
+88515,
+88521,
+88521,
+88521,
+88560,
+88560,
+88566,
+88574,
+88574,
+88595,
+88595,
+88595,
+88700,
+88700,
+88705,
+88718,
+88718,
+88732,
+88732,
+88745,
+88745,
+88758,
+88773,
+88780,
+88793,
+88822,
+88846,
+88846,
+88846,
+88860,
+88873,
+88873,
+88908,
+88908,
+88918,
+88925,
+88960,
+88998,
+89005,
+89005,
+89014,
+89014,
+89014,
+89038,
+89045,
+89066,
+89080,
+89080,
+89080,
+89080,
+89096,
+89096,
+89107,
+89107,
+89126,
+89143,
+89159,
+89181,
+89192,
+89231,
+89231,
+89248,
+89268,
+89297,
+89331,
+89338,
+89356,
+89363,
+89380,
+89387,
+89394,
+89408,
+89408,
+89426,
+89433,
+89433,
+89433,
+89453,
+89471,
+89477,
+89510,
+89517,
+89517,
+89517,
+89547,
+89573,
+89605,
+89639,
+89676,
+89676,
+89676,
+89683,
+89727,
+89781,
+89799,
+89806,
+89820,
+89853,
+89860,
+89873,
+89896,
+89901,
+89908,
+89908,
+89931,
+89976,
+90001,
+90034,
+90034,
+90056,
+90056,
+90080,
+90109,
+90109,
+90121,
+90131,
+90143,
+90178,
+90197,
+90204,
+90204,
+90214,
+90222,
+90236,
+90291,
+90304,
+90304,
+90321,
+90328,
+90328,
+90328,
+90343,
+90343,
+90358,
+90358,
+90365,
+90383,
+90383,
+90383,
+90389,
+90402,
+90402,
+90402,
+90418,
+90436,
+90436,
+90450,
+90462,
+90462,
+90469,
+90479,
+90488,
+90505,
+90518,
+90525,
+90525,
+90525,
+90543,
+90543,
+90550,
+90550,
+90550,
+90558,
+90570,
+90570,
+90570,
+90605,
+90631,
+90663,
+90680,
+90699,
+90705,
+90718,
+90727,
+90727,
+90727,
+90742,
+90761,
+90768,
+90789,
+90817,
+90837,
+90847,
+90847,
+90862,
+90862,
+90869,
+90869,
+90869,
+90869,
+90875,
+90882,
+90905,
+90945,
+90973,
+90973,
+90973,
+90986,
+90986,
+90991,
+91006,
+91060,
+91060,
+91060,
+91060,
+91060,
+91060,
+91090,
+91107,
+91107,
+91107,
+91107,
+91107,
+91127,
+91160,
+91170,
+91186,
+91186,
+91234,
+91234,
+91245,
+91245,
+91245,
+91289,
+91302,
+91302,
+91302,
+91340,
+91347,
+91347,
+91359,
+91376,
+91384,
+91384,
+91398,
+91412,
+91412,
+91431,
+91431,
+91431,
+91431,
+91431,
+91431,
+91451,
+91464,
+91472,
+91472,
+91490,
+91490,
+91502,
+91517,
+91534,
+91560,
+91569,
+91587,
+91603,
+91623,
+91663,
+91663,
+91681,
+91698,
+91698,
+91708,
+91720,
+91751,
+91751,
+91763,
+91779,
+91786,
+91786,
+91786,
+91786,
+91812,
+91812,
+91834,
+91859,
+91877,
+91886,
+91886,
+91908,
+91922,
+91951,
+91963,
+92005,
+92010,
+92059,
+92069,
+92100,
+92113,
+92132,
+92153,
+92176,
+92176,
+92193,
+92193,
+92211,
+92211,
+92220,
+92220,
+92220,
+92220,
+92220,
+92220,
+92220,
+92220,
+92220,
+92241,
+92283,
+92309,
+92316,
+92329,
+92329,
+92334,
+92350,
+92350,
+92372,
+92379,
+92379,
+92379,
+92398,
+92398,
+92398,
+92398,
+92406,
+92423,
+92436,
+92450,
+92499,
+92508,
+92544,
+92559,
+92571,
+92571,
+92571,
+92571,
+92571,
+92579,
+92579,
+92585,
+92585,
+92602,
+92613,
+92613,
+92637,
+92651,
+92651,
+92657,
+92657,
+92657,
+92657,
+92680,
+92680,
+92680,
+92680,
+92719,
+92734,
+92750,
+92750,
+92786,
+92786,
+92818,
+92828,
+92828,
+92828,
+92838,
+92838,
+92838,
+92838,
+92838,
+92845,
+92854,
+92854,
+92866,
+92875,
+92875,
+92898,
+92924,
+92924,
+92942,
+92942,
+92951,
+92951,
+92970,
+93007,
+93027,
+93027,
+93043,
+93080,
+93080,
+93093,
+93093,
+93093,
+93093,
+93125,
+93125,
+93142,
+93158,
+93180,
+93199,
+93199,
+93216,
+93216,
+93231,
+93241,
+93241,
+93241,
+93250,
+93250,
+93250,
+93278,
+93278,
+93278,
+93302,
+93314,
+93314,
+93314,
+93334,
+93334,
+93334,
+93352,
+93366,
+93389,
+93429,
+93448,
+93448,
+93457,
+93457,
+93457,
+93469,
+93469,
+93469,
+93493,
+93493,
+93570,
+93570,
+93570,
+93570,
+93578,
+93578,
+93606,
+93630,
+93642,
+93649,
+93649,
+93682,
+93710,
+93710,
+93710,
+93717,
+93732,
+93738,
+93738,
+93754,
+93754,
+93771,
+93771,
+93771,
+93787,
+93793,
+93793,
+93801,
+93812,
+93812,
+93812,
+93829,
+93829,
+93829,
+93870,
+93890,
+93890,
+93890,
+93917,
+93926,
+93926,
+93942,
+93960,
+93967,
+93974,
+93998,
+93998,
+94015,
+94021,
+94021,
+94021,
+94027,
+94027,
+94027,
+94027,
+94042,
+94061,
+94061,
+94061,
+94081,
+94081,
+94104,
+94118,
+94135,
+94153,
+94153,
+94171,
+94192,
+94202,
+94218,
+94218,
+94218,
+94218,
+94218,
+94251,
+94257,
+94257,
+94276,
+94276,
+94276,
+94282,
+94300,
+94300,
+94318,
+94318,
+94335,
+94349,
+94349,
+94349,
+94349,
+94361,
+94377,
+94377,
+94377,
+94397,
+94432,
+94432,
+94432,
+94452,
+94460,
+94460,
+94471,
+94471,
+94479,
+94496,
+94496,
+94496,
+94550,
+94612,
+94622,
+94640,
+94670,
+94670,
+94670,
+94682,
+94682,
+94682,
+94700,
+94720,
+94720,
+94735,
+94735,
+94735,
+94746,
+94757,
+94773,
+94773,
+94773,
+94773,
+94773,
+94785,
+94792,
+94792,
+94792,
+94808,
+94859,
+94859,
+94867,
+94883,
+94892,
+94892,
+94928,
+94938,
+94938,
+94938,
+94944,
+94969,
+94975,
+95013,
+95069,
+95069,
+95069,
+95084,
+95118,
+95131,
+95157,
+95169,
+95183,
+95252,
+95268,
+95294,
+95301,
+95317,
+95323,
+95340,
+95340,
+95358,
+95358,
+95364,
+95396,
+95396,
+95413,
+95423,
+95449,
+95449,
+95504,
+95550,
+95550,
+95566,
+95588,
+95588,
+95615,
+95654,
+95667,
+95667,
+95667,
+95667,
+95667,
+95694,
+95707,
+95721,
+95721,
+95764,
+95770,
+95770,
+95775,
+95789,
+95789,
+95789,
+95800,
+95800,
+95800,
+95800,
+95805,
+95811,
+95811,
+95811,
+95833,
+95833,
+95857,
+95889,
+95889,
+95889,
+95889,
+95889,
+95889,
+95895,
+95895,
+95926,
+95946,
+95957,
+95957,
+95974,
+95986,
+96002,
+96002,
+96034,
+96048,
+96066,
+96111,
+96111,
+96135,
+96149,
+96149,
+96149,
+96149,
+96156,
+96179,
+96179,
+96197,
+96197,
+96210,
+96226,
+96231,
+96264,
+96264,
+96281,
+96288,
+96288,
+96288,
+96322,
+96353,
+96368,
+96385,
+96404,
+96404,
+96415,
+96415,
+96415,
+96415,
+96415,
+96424,
+96472,
+96472,
+96472,
+96492,
+96511,
+96518,
+96524,
+96534,
+96549,
+96549,
+96571,
+96571,
+96571,
+96571,
+96571,
+96571,
+96590,
+96605,
+96605,
+96624,
+96624,
+96639,
+96639,
+96639,
+96654,
+96683,
+96683,
+96683,
+96683,
+96692,
+96692,
+96701,
+96701,
+96701,
+96701,
+96701,
+96701,
+96701,
+96711,
+96725,
+96732,
+96785,
+96795,
+96795,
+96832,
+96853,
+96853,
+96853,
+96853,
+96859,
+96888,
+96888,
+96888,
+96888,
+96894,
+96924,
+96931,
+96931,
+96945,
+97025,
+97049,
+97070,
+97070,
+97095,
+97095,
+97095,
+97095,
+97132,
+97132,
+97167,
+97178,
+97178,
+97178,
+97195,
+97195,
+97201,
+97201,
+97212,
+97212,
+97245,
+97254,
+97254,
+97264,
+97308,
+97322,
+97322,
+97322,
+97336,
+97371,
+97371,
+97371,
+97387,
+97399,
+97419,
+97435,
+97435,
+97459,
+97459,
+97459,
+97482,
+97523,
+97523,
+97533,
+97540,
+97540,
+97540,
+97559,
+97597,
+97606,
+97621,
+97627,
+97627,
+97674,
+97674,
+97674,
+97694,
+97694,
+97713,
+97730,
+97730,
+97730,
+97730,
+97737,
+97737,
+97737,
+97737,
+97753,
+97782,
+97782,
+97802,
+97842,
+97861,
+97861,
+97868,
+97878,
+97945,
+97945,
+97961,
+97971,
+97971,
+97971,
+97999,
+97999,
+97999,
+98016,
+98016,
+98029,
+98029,
+98029,
+98044,
+98059,
+98059,
+98077,
+98077,
+98077,
+98077,
+98077,
+98077,
+98077,
+98107,
+98117,
+98122,
+98130,
+98138,
+98138,
+98156,
+98156,
+98165,
+98185,
+98209,
+98249,
+98262,
+98281,
+98281,
+98296,
+98296,
+98309,
+98323,
+98323,
+98323,
+98323,
+98336,
+98336,
+98356,
+98356,
+98356,
+98356,
+98377,
+98389,
+98398,
+98398,
+98404,
+98422,
+98422,
+98422,
+98422,
+98427,
+98433,
+98433,
+98450,
+98450,
+98487,
+98500,
+98558,
+98577,
+98591,
+98603,
+98624,
+98624,
+98624,
+98624,
+98624,
+98641,
+98659,
+98659,
+98669,
+98669,
+98669,
+98669,
+98686,
+98707,
+98707,
+98729,
+98729,
+98745,
+98752,
+98752,
+98786,
+98786,
+98793,
+98793,
+98793,
+98793,
+98793,
+98793,
+98793,
+98803,
+98803,
+98809,
+98816,
+98816,
+98816,
+98816,
+98822,
+98822,
+98828,
+98850,
+98869,
+98869,
+98885,
+98906,
+98913,
+98925,
+98925,
+98935,
+98956,
+98956,
+98973,
+98982,
+98982,
+99001,
+99001,
+99013,
+99013,
+99026,
+99026,
+99045,
+99061,
+99070,
+99092,
+99099,
+99123,
+99134,
+99161,
+99161,
+99161,
+99161,
+99211,
+99242,
+99283,
+99283,
+99302,
+99315,
+99321,
+99328,
+99355,
+99367,
+99390,
+99450,
+99460,
+99460,
+99467,
+99492,
+99509,
+99509,
+99532,
+99548,
+99555,
+99575,
+99591,
+99599,
+99606,
+99613,
+99620,
+99620,
+99620,
+99620,
+99638,
+99645,
+99652,
+99689,
+99689,
+99689,
+99706,
+99713,
+99730,
+99776,
+99796,
+99796,
+99796,
+99803,
+99819,
+99826,
+99826,
+99838,
+99855,
+99884,
+99908,
+99928,
+99947,
+99973,
+99979,
+99988,
+99988,
+100017,
+100017,
+100024,
+100024,
+100031,
+100031,
+100031,
+100072,
+100079,
+100079,
+100079,
+100079,
+100095,
+100095,
+100095,
+100100,
+100107,
+100127,
+100127,
+100138,
+100138,
+100138,
+100148,
+100154,
+100154,
+100154,
+100154,
+100154,
+100154,
+100159,
+100172,
+100211,
+100243,
+100255,
+100281,
+100281,
+100309,
+100316,
+100343,
+100369,
+100374,
+100381,
+100409,
+100424,
+100424,
+100444,
+100444,
+100465,
+100498,
+100545,
+100552,
+100552,
+100552,
+100552,
+100559,
+100559,
+100574,
+100606,
+100611,
+100618,
+100618,
+100618,
+100633,
+100633,
+100652,
+100670,
+100691,
+100731,
+100731,
+100731,
+100744,
+100765,
+100765,
+100800,
+100828,
+100835,
+100835,
+100835,
+100842,
+100842,
+100854,
+100881,
+100898,
+100911,
+100911,
+100911,
+100911,
+100932,
+100948,
+100948,
+100948,
+100948,
+100977,
+100977,
+100977,
+100983,
+100992,
+100992,
+101016,
+101041,
+101063,
+101071,
+101088,
+101088,
+101088,
+101088,
+101113,
+101133,
+101133,
+101148,
+101170,
+101177,
+101206,
+101206,
+101214,
+101251,
+101273,
+101303,
+101345,
+101352,
+101359,
+101359,
+101359,
+101376,
+101387,
+101387,
+101405,
+101412,
+101419,
+101419,
+101426,
+101449,
+101456,
+101456,
+101463,
+101463,
+101470,
+101489,
+101497,
+101504,
+101511,
+101511,
+101516,
+101516,
+101523,
+101543,
+101543,
+101557,
+101586,
+101593,
+101607,
+101625,
+101635,
+101669,
+101689,
+101716,
+101728,
+101739,
+101746,
+101772,
+101772,
+101847,
+101847,
+101847,
+101853,
+101861,
+101888,
+101888,
+101940,
+101980,
+101987,
+102010,
+102021,
+102032,
+102055,
+102062,
+102062,
+102072,
+102079,
+102097,
+102111,
+102118,
+102118,
+102118,
+102146,
+102153,
+102171,
+102178,
+102178,
+102225,
+102244,
+102290,
+102313,
+102320,
+102331,
+102331,
+102331,
+102331,
+102362,
+102367,
+102382,
+102397,
+102438,
+102473,
+102473,
+102499,
+102508,
+102520,
+102538,
+102557,
+102571,
+102602,
+102629,
+102629,
+102629,
+102649,
+102649,
+102649,
+102661,
+102678,
+102717,
+102734,
+102753,
+102778,
+102792,
+102825,
+102832,
+102868,
+102888,
+102899,
+102930,
+102930,
+102930,
+102954,
+102954,
+102988,
+102995,
+102995,
+102995,
+103003,
+103010,
+103017,
+103025,
+103050,
+103050,
+103050,
+103057,
+103072,
+103082,
+103082,
+103095,
+103106,
+103138,
+103171,
+103198,
+103217,
+103265,
+103315,
+103339,
+103345,
+103352,
+103379,
+103379,
+103395
+};
+
+static const char *tldData[] = {
+"samegawa.fukushima.jp\0dupont\0"
+"alstom\0"
+"mashiki.kumamoto.jp\0neues.museum\0"
+"herokussl.com\0"
+"karate.museum\0"
+"vall\xc3\xa9""e-d-aoste.it\0"
+"edu.vc\0"
+"nz.eu.org\0"
+"edu.ve\0"
+"hirokawa.fukuoka.jp\0midsund.no\0"
+"bronnoysund.no\0"
+"gon.pk\0"
+"edu.uy\0"
+"ayabe.kyoto.jp\0\xe9\xa3\x9e\xe5\x88\xa9\xe6\xb5\xa6\0"
+"massacarrara.it\0edu.vn\0virtualuser.de\0"
+"bardu.no\0"
+"stateofdelaware.museum\0richardli\0"
+"k12.va.us\0is-a-blogger.com\0"
+"kitakami.iwate.jp\0botany.museum\0l\xc3\xb8renskog.no\0"
+"v\xc3\xa5g\xc3\xa5.no\0"
+"edu.vu\0"
+"chiropractic.museum\0powiat.pl\0"
+"kawazu.shizuoka.jp\0"
+"gbiz\0"
+"cyon.link\0"
+"tjmaxx\0a.prod.fastly.net\0"
+"mihama.fukui.jp\0myeffect.net\0"
+"yasu.shiga.jp\0tran\xc3\xb8y.no\0"
+"cc.ms.us\0cc.nc.us\0edu.ws\0"
+"australia.museum\0"
+"balsan-sudtirol.it\0"
+"shinonsen.hyogo.jp\0"
+"furukawa.miyagi.jp\0uscountryestate.museum\0"
+"k12.co.us\0"
+"unj\xc3\xa1rga.no\0"
+"seto.aichi.jp\0is-a-hunter.com\0"
+"sv.it\0"
+"kushiro.hokkaido.jp\0naustdal.no\0"
+"egersund.no\0boleslawiec.pl\0h\xc3\xa4kkinen.fi\0"
+"comunica\xc3\xa7\xc3\xb5""es.museum\0"
+"user.party.eus\0za.net\0"
+"vibo-valentia.it\0"
+"abr.it\0dvrdns.org\0"
+"kasuga.fukuoka.jp\0namegawa.saitama.jp\0spot\0"
+"wpdevcloud.com\0jambyl.su\0"
+"\xe7\xbb\x84\xe7\xbb\x87.hk\0mb.it\0kamikoani.akita.jp\0mini\0"
+"police.uk\0"
+"edu.za\0domains\0"
+"\xd8\xa7\xd9\x84\xd9\x85\xd8\xba\xd8\xb1\xd8\xa8\0"
+"software\0"
+"en.it\0"
+"wa.au\0\xe9\x9d\x99\xe5\xb2\xa1.jp\0mint\0"
+"recht.pro\0"
+"opole.pl\0"
+"at.it\0"
+"mima.tokushima.jp\0"
+"takahagi.ibaraki.jp\0bokn.no\0edu.zm\0"
+"hiraya.nagano.jp\0eaton.mi.us\0"
+"mibu.tochigi.jp\0newspaper.museum\0aaa\0"
+"field.museum\0jp.net\0"
+"f.bg\0loginline.dev\0"
+"pup.gov.pl\0"
+"youth.museum\0voagat.no\0"
+"mobi.gp\0"
+"baghdad.museum\0"
+"cc.ua\0"
+"abc.br\0"
+"honefoss.no\0"
+"arboretum.museum\0abb\0"
+"nabari.mie.jp\0abc\0diamonds\0simple-url.com\0"
+"us-4.evennode.com\0"
+"act.edu.au\0"
+"ieee\0"
+"kyonan.chiba.jp\0"
+"mus.br\0asso.re\0"
+"yamatsuri.fukushima.jp\0"
+"czest.pl\0"
+"friuli-vegiulia.it\0lib.ut.us\0"
+"katsuura.chiba.jp\0"
+"hi.cn\0manchester.museum\0"
+"tenei.fukushima.jp\0"
+"\xe3\x82\xb0\xe3\x83\xbc\xe3\x82\xb0\xe3\x83\xab\0selfip.biz\0"
+"lib.oh.us\0"
+"politica.bo\0"
+"iwaki.fukushima.jp\0"
+"akita.jp\0asahikawa.hokkaido.jp\0aco\0fashion\0"
+"s3-website.eu-central-1.amazonaws.com\0"
+"\xe3\x82\xb9\xe3\x83\x88\xe3\x82\xa2\0"
+"kiwi.nz\0"
+"takanabe.miyazaki.jp\0"
+"melbourne\0schwarz\0"
+"aoki.nagano.jp\0"
+"indian.museum\0travelersinsurance\0"
+"kunimi.fukushima.jp\0"
+"ads\0\xd9\x85\xd9\x88\xd9\x82\xd8\xb9\0"
+"yura.wakayama.jp\0aeg\0"
+"nsw.edu.au\0ciencia.bo\0nishihara.okinawa.jp\0"
+"sande.vestfold.no\0"
+"misugi.mie.jp\0\xe7\xb6\xb2\xe7\xb5\xa1.\xe9\xa6\x99\xe6\xb8\xaf\0"
+"jaguar\0"
+"lublin.pl\0"
+"nishiazai.shiga.jp\0\xe7\xbd\x91\xe5\xba\x97\0from-ks.com\0"
+"hizen.saga.jp\0risor.no\0"
+"vossevangen.no\0us-3.evennode.com\0"
+"siracusa.it\0fhs.no\0"
+"bergbau.museum\0"
+"sandnessjoen.no\0"
+"sld.do\0asso.nc\0"
+"takikawa.hokkaido.jp\0"
+"sodegaura.chiba.jp\0\xe0\xb8\x98\xe0\xb8\xb8\xe0\xb8\xa3\xe0\xb8\x81\xe0\xb8\xb4\xe0\xb8\x88.\xe0\xb9\x84\xe0\xb8\x97\xe0\xb8\xa2\0afl\0"
+"dental\0"
+"is-a-llama.com\0"
+"gda.pl\0"
+"deloitte\0"
+"inawashiro.fukushima.jp\0"
+"savannahga.museum\0kerryproperties\0\xe5\xa4\xa7\xe4\xbc\x97\xe6\xb1\xbd\xe8\xbd\xa6\0"
+"embaixada.st\0"
+"readthedocs.io\0"
+"sk\xc3\xa5nland.no\0"
+"frana.no\0"
+"cc.md.us\0"
+"selbu.no\0"
+"ollo\0"
+"biz.bb\0"
+"biz.at\0"
+"kinko.kagoshima.jp\0kushima.miyazaki.jp\0southwest.museum\0"
+"shiojiri.nagano.jp\0u.se\0"
+"ono.fukushima.jp\0ostroda.pl\0"
+"ce.gov.br\0orland.no\0snoasa.no\0"
+"biz.az\0"
+"charter.aero\0bunkyo.tokyo.jp\0"
+"shimane.jp\0"
+"maceio.br\0lc.it\0umaji.kochi.jp\0budapest\0"
+"higashi.okinawa.jp\0shimoda.shizuoka.jp\0aig\0"
+"higashi.fukushima.jp\0bd.se\0"
+"email\0"
+"shibata.niigata.jp\0kusatsu.shiga.jp\0columbia.museum\0vanguard\0"
+"trentinsudtirol.it\0"
+"and.mom\0"
+"pl.ua\0us-2.evennode.com\0"
+"nexus\0"
+"rennebu.no\0"
+"webspace.rocks\0"
+"maniwa.okayama.jp\0"
+"biz.cy\0"
+"taki.mie.jp\0biz.dk\0"
+"fujisawa.iwate.jp\0"
+"yosemite.museum\0"
+"datsun\0cloud66.ws\0"
+"half.host\0"
+"eniwa.hokkaido.jp\0"
+"circle\0worse-than.tv\0"
+"talk\0for.men\0"
+"cards\0"
+"asso.km\0"
+"izumi.kagoshima.jp\0kotoura.tottori.jp\0"
+"scholarships\0"
+"fujimino.saitama.jp\0jeonbuk.kr\0brussels.museum\0"
+"biz.et\0"
+"compare\0"
+"raholt.no\0"
+"usa.museum\0ap-southeast-1.elasticbeanstalk.com\0ng.city\0"
+"melhus.no\0"
+"coupons\0dynu.net\0"
+"kashiwa.chiba.jp\0"
+"bnpparibas\0"
+"moseushi.hokkaido.jp\0"
+"padua.it\0"
+"asso.mc\0"
+"bulsan-suedtirol.it\0rivne.ua\0my-wan.de\0"
+"historicalsociety.museum\0is-a-linux-user.org\0"
+"biz.gl\0"
+"hasuda.saitama.jp\0"
+"is-a-chef.org\0"
+"courses\0us-1.evennode.com\0"
+"shinjo.yamagata.jp\0"
+"stadt.museum\0"
+"trani-barletta-andria.it\0"
+"trader.aero\0cloudapps.digital\0"
+"mywire.org\0"
+"mashike.hokkaido.jp\0yamagata.ibaraki.jp\0unjarga.no\0"
+"sicilia.it\0"
+"morimachi.shizuoka.jp\0"
+"s3.dualstack.eu-west-2.amazonaws.com\0"
+"biz.id\0"
+"imageandsound.museum\0anz\0credit\0"
+"historical.museum\0jewelry.museum\0"
+"aol\0"
+"manno.kagawa.jp\0"
+"newyork.museum\0pubol.museum\0h\xc3\xa1mm\xc3\xa1rfeasta.no\0"
+"seihi.nagasaki.jp\0"
+"and.museum\0sdn.gov.pl\0"
+"bievat.no\0karasjohka.no\0"
+"us-east-2.elasticbeanstalk.com\0"
+"home.dyndns.org\0"
+"mt.eu.org\0"
+"government.aero\0"
+"selfip.com\0"
+"mitoyo.kagawa.jp\0kameoka.kyoto.jp\0"
+"vercelli.it\0"
+"geekgalaxy.com\0ptplus.fit\0"
+"app\0"
+"design\0"
+"tickets\0"
+"rodoy.no\0sld.pa\0"
+"biz.ki\0company\0"
+"kunst.museum\0"
+"vb.it\0"
+"higashimatsuyama.saitama.jp\0"
+"bar\0"
+"bizen.okayama.jp\0f.se\0bbc\0"
+"kirovograd.ua\0"
+"kaizuka.osaka.jp\0"
+"*.bzz.dapps.earth\0"
+"askoy.no\0"
+"rollag.no\0"
+"hara.nagano.jp\0"
+"aostavalley.it\0"
+"vinnytsia.ua\0"
+"art\0bbt\0"
+"j\xc3\xb8rpeland.no\0"
+"biz.ls\0bcg\0"
+"joinville.br\0dabur\0phone\0is-a-chef.com\0"
+"yahaba.iwate.jp\0isahaya.nagasaki.jp\0kitamoto.saitama.jp\0"
+"001www.com\0"
+"bcn\0"
+"tsukuba.ibaraki.jp\0akrehamn.no\0\xe0\xa4\xad\xe0\xa4\xbe\xe0\xa4\xb0\xe0\xa5\x8b\xe0\xa4\xa4\0"
+"yasugi.shimane.jp\0"
+"ks.ua\0"
+"ninomiya.kanagawa.jp\0"
+"ulsan.kr\0salon\0"
+"wa.us\0"
+"from-de.com\0"
+"audio\0"
+"yoshinogari.saga.jp\0biz.mv\0"
+"bulsan.it\0biz.mw\0"
+"freiburg.museum\0"
+"yusui.kagoshima.jp\0biz.ni\0"
+"s3-website.ap-south-1.amazonaws.com\0"
+"bofa\0"
+"2038.io\0"
+"boavista.br\0batsfjord.no\0from-ri.com\0ddns.net\0"
+"ks.us\0"
+"biz.nr\0marshalls\0"
+"crew.aero\0"
+"hi.us\0"
+"services.aero\0\xe8\xb4\xad\xe7\x89\xa9\0"
+"mo.cn\0yamato.kanagawa.jp\0masoy.no\0watch\0"
+"financial\0arvo.network\0"
+"agency\0"
+"myactivedirectory.com\0"
+"iide.yamagata.jp\0"
+"bet\0netlify.com\0"
+"tourism.tn\0"
+"cnpy.gdn\0"
+"pharmacy.museum\0"
+"nedre-eiker.no\0"
+"yugawa.fukushima.jp\0"
+"coach\0"
+"ujiie.tochigi.jp\0\xe4\xbc\x81\xe4\xb8\x9a\0"
+"nishinoomote.kagoshima.jp\0biz.pk\0"
+"biz.pl\0"
+"mobi.tt\0reisen\0"
+"tamaki.mie.jp\0"
+"okaya.nagano.jp\0"
+"okoppe.hokkaido.jp\0arita.saga.jp\0"
+"\xe5\xa4\xa7\xe9\x98\xaa.jp\0"
+"biz.pr\0"
+"living.museum\0mobi.tz\0"
+"dattoweb.com\0"
+"taxi\0"
+"axa\0"
+"dscloud.me\0"
+"owani.aomori.jp\0setagaya.tokyo.jp\0aws\0"
+"kaita.hiroshima.jp\0village.museum\0fuossko.no\0"
+"jfk.museum\0"
+"toei.aichi.jp\0"
+"maintenance.aero\0"
+"hatoyama.saitama.jp\0"
+"donna.no\0"
+"michigan.museum\0"
+"hjartdal.no\0"
+"bid\0"
+"gildeskal.no\0gulen.no\0"
+"tonami.toyama.jp\0"
+"bio\0"
+"sagamihara.kanagawa.jp\0tainai.niigata.jp\0cc.ut.us\0"
+"photo\0"
+"tokyo.jp\0marugame.kagawa.jp\0servecounterstrike.com\0"
+"bitballoon.com\0"
+"nishihara.kumamoto.jp\0voting\0my.eu.org\0"
+"biz.ss\0"
+"biz\0hasura.app\0"
+"ullensvang.no\0vard\xc3\xb8.no\0biz.tj\0"
+"okinawa.jp\0"
+"shimosuwa.nagano.jp\0madrid\0"
+"ven.it\0"
+"biz.ua\0"
+"biz.tr\0"
+"shiroishi.saga.jp\0"
+"ts.it\0biz.tt\0"
+"ricoh\0za.org\0"
+"trana.no\0"
+"on-aptible.com\0"
+"kakegawa.shizuoka.jp\0is-a-landscaper.com\0"
+"mobi.na\0lardal.no\0"
+"masuda.shimane.jp\0"
+"mo.it\0"
+"mobi.ng\0hammerfest.no\0stord.no\0"
+"database.museum\0"
+"aosta-valley.it\0"
+"is-a-cpa.com\0"
+"sakai.ibaraki.jp\0nakamura.kochi.jp\0"
+"tadotsu.kagawa.jp\0ethnology.museum\0ng.school\0"
+"aparecida.br\0"
+"go.gov.br\0emiliaromagna.it\0plc.ly\0"
+"bergen.no\0"
+"dyroy.no\0\xc3\xb8vre-eiker.no\0"
+"ca.it\0indianapolis.museum\0eidfjord.no\0"
+"biz.vn\0bond\0"
+"training\0"
+"oz.au\0"
+"mazowsze.pl\0"
+"s.bg\0"
+"9.bg\0for.mom\0"
+"bms\0scrysec.com\0"
+"misconfused.org\0"
+"asahi.toyama.jp\0bmw\0from-ga.com\0"
+"e164.arpa\0book\0"
+"\xc3\xb8ksnes.no\0"
+"volkenkunde.museum\0dynathome.net\0"
+"bergamo.it\0meeres.museum\0"
+"ngo.lk\0"
+"medical.museum\0"
+"mer\xc3\xa5ker.no\0\xc3\xb8rland.no\0\xe6\x9c\xba\xe6\x9e\x84\0"
+"lib.wi.us\0run.app\0"
+"tatebayashi.gunma.jp\0hjelmeland.no\0"
+"b\xc3\xb8mlo.no\0"
+"yabu.hyogo.jp\0gs.fm.no\0lib.sc.us\0trade\0"
+"mining.museum\0"
+"toride.ibaraki.jp\0"
+"bom\0"
+"boo\0"
+"birdart.museum\0"
+"of.work\0zapto.xyz\0"
+"bot\0"
+"nl.eu.org\0ybo.faith\0"
+"notogawa.shiga.jp\0denmark.museum\0bydgoszcz.pl\0box\0"
+"otofuke.hokkaido.jp\0dovre.no\0"
+"hemne.no\0abogado\0"
+"motobu.okinawa.jp\0gol.no\0"
+"toki.gifu.jp\0chattanooga.museum\0ca.na\0"
+"loseyourip.com\0"
+"iwamizawa.hokkaido.jp\0biz.zm\0"
+"mobi.ke\0cab\0"
+"fineart.museum\0"
+"cal\0"
+"cam\0"
+"samnanger.no\0"
+"commune.am\0"
+"lombardia.it\0cba\0*.quipelements.com\0"
+"car\0"
+"kitaaiki.nagano.jp\0nebraska.museum\0tourism.pl\0aetna\0co.com\0"
+"cat\0kitahata.saga.jp\0"
+"from-nj.com\0"
+"kyuragi.saga.jp\0"
+"apple\0"
+"ancona.it\0"
+"glas.museum\0ngo.ph\0cbn\0qc.com\0"
+"discount\0"
+"trentinos\xc3\xbc""d-tirol.it\0h\xc3\xa1pmir.no\0"
+"kokonoe.oita.jp\0amli.no\0cbs\0"
+"wada.nagano.jp\0dontexist.net\0"
+"versailles.museum\0latrobe\0"
+"kafjord.no\0"
+"\xe5\xb2\xa1\xe5\xb1\xb1.jp\0"
+"horonobe.hokkaido.jp\0lerdal.no\0"
+"kumakogen.ehime.jp\0"
+"r\xc3\xa5holt.no\0\xd0\xb1\xd0\xb3\0"
+"eq.edu.au\0contagem.br\0shimotsuke.tochigi.jp\0"
+"takagi.nagano.jp\0"
+"k12.de.us\0ar.com\0"
+"kitakata.miyazaki.jp\0telekommunikation.museum\0"
+"allfinanz\0"
+"sekikawa.niigata.jp\0plc.uk\0"
+"la-spezia.it\0k12.ak.us\0"
+"ceb\0mckinsey\0sling\0"
+"qpon\0"
+"hazu.aichi.jp\0"
+"ceo\0"
+"kawanishi.nara.jp\0cfa\0"
+"tromsa.no\0"
+"cfd\0"
+"kyowa.hokkaido.jp\0"
+"ng.eu.org\0"
+"buy\0"
+"ar.it\0"
+"mol.it\0"
+"leclerc\0skype\0"
+"sp.leg.br\0"
+"ac.ae\0d.bg\0"
+"*.bd\0kanzaki.saga.jp\0"
+"software.aero\0"
+"kartuzy.pl\0"
+"app.banzaicloud.io\0"
+"toyotsu.fukuoka.jp\0"
+"miyazaki.jp\0lima-city.rocks\0"
+"music.museum\0"
+"s3-us-gov-west-1.amazonaws.com\0"
+"mo.us\0vegas\0"
+"router.management\0"
+"ac.at\0ikeda.gifu.jp\0shobara.hiroshima.jp\0yamazoe.nara.jp\0"
+"ac.be\0naturalsciences.museum\0fairwinds\0"
+"ozu.kumamoto.jp\0"
+"baths.museum\0"
+"*.ck\0"
+"\xe0\xac\xad\xe0\xac\xbe\xe0\xac\xb0\xe0\xac\xa4\0"
+"cymru\0"
+"fukagawa.hokkaido.jp\0ca.us\0"
+"communications.museum\0berlevag.no\0int.eu.org\0"
+"ac.ci\0bolzano.it\0"
+"yakage.okayama.jp\0sarpsborg.no\0"
+"trentins\xc3\xbc""dtirol.it\0st.no\0"
+"ac.cn\0\xd0\xb5\xd1\x8e\0"
+"biella.it\0latino\0"
+"monster\0is-a-chef.net\0"
+"m\xc3\xa1latvuopmi.no\0ubank\0"
+"srv.br\0ac.cr\0"
+"tama.tokyo.jp\0"
+"aramco\0"
+"\xe5\xae\xb6\xe9\x9b\xbb\0"
+"ac.cy\0g\xc3\xa1ls\xc3\xa1.no\0bzh\0"
+"komagane.nagano.jp\0"
+"freeboxos.com\0"
+"\xe5\x95\x86\xe6\xa5\xad.tw\0"
+"sucks\0"
+"ybo.review\0"
+"*.er\0"
+"fujioka.gunma.jp\0"
+"leg.br\0"
+"algard.no\0"
+"suzu.ishikawa.jp\0"
+"*.fj\0sado.niigata.jp\0"
+"*.fk\0"
+"loginline.app\0"
+"napoli.it\0"
+"norton\0"
+"luzern.museum\0"
+"kitadaito.okinawa.jp\0ngo.za\0dyndns-office.com\0"
+"automotive.museum\0uw.gov.pl\0"
+"minowa.nagano.jp\0valer.hedmark.no\0"
+"takatsuki.shiga.jp\0"
+"casino\0"
+"kagoshima.kagoshima.jp\0vindafjord.no\0ntdll.top\0"
+"gs.oslo.no\0tvedestrand.no\0ap-south-1.elasticbeanstalk.com\0mein-vigor.de\0"
+"\xe5\xb1\xb1\xe5\xbd\xa2.jp\0uonuma.niigata.jp\0"
+"k12.mn.us\0"
+"oum.gov.pl\0kerrylogistics\0"
+"abarth\0"
+"education.tas.edu.au\0asahi.chiba.jp\0"
+"apigee.io\0"
+"uzhgorod.ua\0"
+"ac.gn\0enterprises\0sandvik\0health-carereform.com\0"
+"dsmynas.com\0"
+"from-ny.net\0"
+"ehime.jp\0tokoname.aichi.jp\0"
+"seiro.niigata.jp\0"
+"oksnes.no\0"
+"\xe3\x82\xb3\xe3\x83\xa0\0"
+"tools\0"
+"isa.us\0cloud\0"
+"s.se\0raid\0"
+"fam.pk\0"
+"lanbib.se\0kiwi\0*.dweb.link\0"
+"ako.hyogo.jp\0"
+"gwangju.kr\0"
+"aomori.aomori.jp\0wallonie.museum\0"
+"andria-barletta-trani.it\0ass.km\0sorreisa.no\0"
+"arna.no\0"
+"ac.id\0"
+"dagestan.ru\0"
+"futtsu.chiba.jp\0shell\0"
+"gr.com\0"
+"shikokuchuo.ehime.jp\0"
+"ac.il\0aibetsu.hokkaido.jp\0"
+"ac.im\0eu-west-2.elasticbeanstalk.com\0"
+"com\0ac.in\0"
+"money.museum\0"
+"art.br\0*.jm\0"
+"virtuel.museum\0vipsinaapp.com\0"
+"ac.ir\0\xd8\xa7\xdb\x8c\xd8\xb1\xd8\xa7\xd9\x86.ir\0cpa\0"
+"izumisano.osaka.jp\0dagestan.su\0"
+"como.it\0"
+"pisa.it\0"
+"*.kh\0from-fl.com\0"
+"trentino-suedtirol.it\0bauern.museum\0leitungsen.de\0*.ex.futurecms.at\0"
+"if.ua\0"
+"hiranai.aomori.jp\0"
+"ac.jp\0omachi.saga.jp\0"
+"holtalen.no\0"
+"xz.cn\0friuli-vgiulia.it\0mamurogawa.yamagata.jp\0artgallery.museum\0"
+"minamiuonuma.niigata.jp\0meguro.tokyo.jp\0ac.ke\0dad\0fund\0"
+"nl.ca\0"
+"etisalat\0"
+"namegata.ibaraki.jp\0star\0"
+"ikeda.osaka.jp\0is-an-actor.com\0"
+"art.do\0missoula.museum\0larvik.no\0us-east-1.amazonaws.com\0stuff-4-sale.us\0"
+"news.hu\0monza-brianza.it\0studio\0eu.com\0"
+"udi.br\0ac.kr\0"
+"taiji.wakayama.jp\0"
+"shimane.shimane.jp\0"
+"gent\0"
+"marumori.miyagi.jp\0"
+"art.dz\0"
+"toyoake.aichi.jp\0yokosuka.kanagawa.jp\0"
+"ar.us\0aquarelle\0day\0"
+"ac.lk\0fundacio.museum\0"
+"indiana.museum\0fr\xc3\xb8ya.no\0hiphop\0"
+"h\xc3\xa6gebostad.no\0warmia.pl\0"
+"*.mm\0"
+"trieste.it\0ac.ma\0"
+"ac.ls\0"
+"crs\0csc\0"
+"firenze.it\0ac.me\0"
+"misaki.okayama.jp\0"
+"\xe5\xb1\xb1\xe5\x8f\xa3.jp\0murmansk.su\0"
+"ikeda.hokkaido.jp\0"
+"ogawara.miyagi.jp\0koryo.nara.jp\0"
+"cloudeity.net\0"
+"olbia-tempio.it\0"
+"air-surveillance.aero\0"
+"koya.wakayama.jp\0"
+"kurotaki.nara.jp\0*.np\0"
+"\xd1\x80\xd1\x84\0xen.prgmr.com\0"
+"macapa.br\0ac.mu\0tjome.no\0"
+"now-dns.top\0"
+"ac.mw\0spjelkavik.no\0"
+"sologne.museum\0"
+"tokorozawa.saitama.jp\0ac.ni\0from-ne.com\0"
+"ac.mz\0meraker.no\0"
+"vagsoy.no\0"
+"loans\0"
+"yoshioka.gunma.jp\0prochowice.pl\0"
+"cafe\0dds\0"
+"schoenbrunn.museum\0"
+"kongsberg.no\0"
+"matsumoto.kagoshima.jp\0"
+"gets-it.net\0"
+"hioki.kagoshima.jp\0ac.nz\0*.pg\0"
+"padova.it\0kawasaki.miyagi.jp\0ohira.miyagi.jp\0"
+"mozilla-iot.org\0"
+"kita.osaka.jp\0"
+"cal.it\0lancia\0"
+"s3-website-ap-southeast-2.amazonaws.com\0"
+"tohma.hokkaido.jp\0"
+"ac.pa\0"
+"art.ht\0cyber.museum\0"
+"himi.toyama.jp\0"
+"s3.dualstack.ca-central-1.amazonaws.com\0"
+"unazuki.toyama.jp\0"
+"chita.aichi.jp\0dev\0"
+"omasvuotna.no\0cc.wa.us\0"
+"yuzawa.niigata.jp\0"
+"utsira.no\0"
+"definima.io\0"
+"iwanai.hokkaido.jp\0iwaizumi.iwate.jp\0"
+"fujikawa.yamanashi.jp\0koshu.yamanashi.jp\0k12.me.us\0"
+"kuokgroup\0from-nv.com\0navoi.su\0"
+"ac.pr\0"
+"eastcoast.museum\0is-a-republican.com\0"
+"cc.ks.us\0"
+"kitagawa.miyazaki.jp\0"
+"cc.hi.us\0reg.dk\0"
+"bozen.it\0"
+"hatogaya.saitama.jp\0us-gov-west-1.elasticbeanstalk.com\0"
+"d.se\0"
+"\xe6\x96\xb0\xe6\xbd\x9f.jp\0"
+"helsinki.museum\0"
+"saga.saga.jp\0"
+"club.tw\0accenture\0"
+"crafting.xyz\0"
+"\xe7\x86\x8a\xe6\x9c\xac.jp\0dhl\0"
+"aeroport.fr\0asago.hyogo.jp\0"
+"hofu.yamaguchi.jp\0"
+"monmouth.museum\0"
+"isernia.it\0glass.museum\0"
+"ski.museum\0"
+"kids.museum\0ac.rs\0"
+"toho.fukuoka.jp\0"
+"ac.ru\0ac.se\0certmgr.org\0"
+"ac.rw\0afamilycompany\0"
+"cn.it\0"
+"plaza.museum\0"
+"murakami.niigata.jp\0inami.toyama.jp\0fr\xc3\xa6na.no\0yokohama\0"
+"mishima.fukushima.jp\0abira.hokkaido.jp\0"
+"bod\xc3\xb8.no\0"
+"macys\0"
+"ichikawa.chiba.jp\0"
+"valleaosta.it\0salerno.it\0"
+"taishi.hyogo.jp\0"
+"iveco\0zuerich\0"
+"ac.th\0"
+"omigawa.chiba.jp\0"
+"ac.sz\0ac.tj\0diy\0"
+"tsuwano.shimane.jp\0\xc4\x8d\xc3\xa1hcesuolo.no\0"
+"warman\0"
+"palmas.br\0ok.us\0"
+"gub.uy\0"
+"linkitools.space\0"
+"la.us\0"
+"s3-ap-northeast-2.amazonaws.com\0"
+"ac.ug\0"
+"uji.kyoto.jp\0ando.nara.jp\0ac.tz\0"
+"ac.uk\0call\0"
+"bialystok.pl\0"
+"test.tj\0google\0"
+"for.one\0"
+"fi.cr\0"
+"shimamoto.osaka.jp\0"
+"barsycenter.com\0"
+"hyuga.miyazaki.jp\0"
+"video.hu\0ac.vn\0"
+"floripa.br\0camp\0"
+"hirono.iwate.jp\0internet-dns.de\0"
+"ino.kochi.jp\0"
+"nl.no\0"
+"lib.fl.us\0fin.ci\0"
+"ohira.tochigi.jp\0tokke.no\0"
+"porsanger.no\0"
+"kashiba.nara.jp\0"
+"art.pl\0"
+"leasing.aero\0veneto.it\0olayan\0"
+"giske.no\0"
+"seljord.no\0dev-myqnapcloud.com\0"
+"sport\0azure-mobile.net\0"
+"weatherchannel\0"
+"\xe6\x95\x99\xe8\x82\xb2.\xe9\xa6\x99\xe6\xb8\xaf\0booking\0"
+"nango.fukushima.jp\0sandnessj\xc3\xb8""en.no\0"
+"*.ye\0"
+"cadaques.museum\0"
+"idv.hk\0pharmacy\0"
+"gehirn.ne.jp\0"
+"fin.ec\0"
+"sykkylven.no\0dnp\0"
+"fermo.it\0test.ru\0"
+"myftp.org\0"
+"valle-daosta.it\0"
+"harima.hyogo.jp\0miyoshi.saitama.jp\0"
+"recreation.aero\0reggiocalabria.it\0dog\0"
+"katsuragi.nara.jp\0"
+"judaica.museum\0"
+"yuu.yamaguchi.jp\0"
+"kunitachi.tokyo.jp\0"
+"myravendb.com\0"
+"ac.za\0"
+"yorkshire.museum\0mel\xc3\xb8y.no\0qa2.com\0"
+"hornindal.no\0k12.or.us\0"
+"dot\0"
+"aviation.museum\0bosch\0"
+"um.gov.pl\0"
+"art.sn\0"
+"tagami.niigata.jp\0ac.zm\0"
+"oketo.hokkaido.jp\0"
+"yokoshibahikari.chiba.jp\0syncloud.it\0"
+"is-a-photographer.com\0"
+"filegear-au.me\0"
+"bolivia.bo\0open\0"
+"care\0team\0"
+"eastafrica.museum\0"
+"vennesla.no\0"
+"k12.az.us\0ac.zw\0analytics\0"
+"arts.co\0game-server.cc\0dyndns.ddnss.de\0"
+"jetzt\0swidnik.pl\0hk.com\0"
+"ueno.gunma.jp\0"
+"shari.hokkaido.jp\0casa\0"
+"localhistory.museum\0"
+"trentino-altoadige.it\0miyazu.kyoto.jp\0cars\0"
+"control.aero\0shoo.okayama.jp\0"
+"sola.no\0case\0"
+"shintoku.hokkaido.jp\0zoological.museum\0eat\0"
+"is.it\0cash\0"
+"fetsund.no\0"
+"fi.it\0"
+"rimini.it\0"
+"tech\0dyn.ddnss.de\0"
+"minamitane.kagoshima.jp\0"
+"bo.it\0is-a-soxfan.org\0"
+"investments\0lexus\0"
+"fuel.aero\0"
+"\xe0\xa6\xac\xe0\xa6\xbe\xe0\xa6\x82\xe0\xa6\xb2\xe0\xa6\xbe\0"
+"q.bg\0valledaosta.it\0"
+"vacations\0"
+"7.bg\0eco\0"
+"id.au\0barsy.menu\0"
+"cn.ua\0"
+"kawaue.gifu.jp\0"
+"aland.fi\0app.os.fedoraproject.org\0"
+"r\xc3\xb8st.no\0us.gov.pl\0study\0"
+"mie.jp\0"
+"student.aero\0journalism.museum\0"
+"\xe5\xb3\xb6\xe6\xa0\xb9.jp\0ohda.shimane.jp\0"
+"to.leg.br\0"
+"undersea.museum\0"
+"takarazuka.hyogo.jp\0"
+"ln.cn\0betainabox.com\0"
+"edu\0"
+"dtv\0"
+"\xd8\xa7\xd9\x84\xd8\xac\xd8\xb2\xd8\xa7\xd8\xa6\xd8\xb1\0"
+"planetarium.museum\0"
+"medio-campidano.it\0lib.ky.us\0"
+"forde.no\0"
+"partners\0"
+"cipriani\0"
+"saka.hiroshima.jp\0olayangroup\0"
+"donetsk.ua\0"
+"dvr\0nodum.co\0"
+"furniture.museum\0s3-ap-south-1.amazonaws.com\0"
+"time.no\0"
+"voyage\0"
+"bozen-suedtirol.it\0"
+"dontexist.org\0"
+"matta-varjjat.no\0"
+"volkswagen\0"
+"hayakawa.yamanashi.jp\0"
+"turen.tn\0"
+"arkhangelsk.su\0"
+"matsudo.chiba.jp\0kids.us\0"
+"kep.tr\0"
+"ggee\0"
+"toyooka.hyogo.jp\0"
+"insurance.aero\0"
+"susaki.kochi.jp\0"
+"accident-investigation.aero\0dev.static.land\0"
+"daegu.kr\0faith\0is-into-cars.com\0"
+"kakamigahara.gifu.jp\0"
+"steiermark.museum\0fet.no\0airforce\0"
+"nodum.io\0"
+"hs.zone\0"
+"bounty-full.com\0"
+"sortland.no\0"
+"suzaka.nagano.jp\0bajddar.no\0"
+"codes\0garden\0"
+"himeshima.oita.jp\0resistance.museum\0"
+"withgoogle.com\0"
+"k12.ny.us\0"
+"minamiboso.chiba.jp\0"
+"malatvuopmi.no\0"
+"wa.gov.au\0"
+"cc.mo.us\0actor\0"
+"mincom.tn\0chernivtsi.ua\0bradesco\0"
+"fukuchi.fukuoka.jp\0muenster.museum\0"
+"ua.rs\0"
+"cim.br\0ic.gov.pl\0"
+"\xe6\x97\xb6\xe5\xb0\x9a\0"
+"k12.dc.us\0"
+"mobile\0"
+"lur\xc3\xb8y.no\0"
+"chizu.tottori.jp\0buyshouses.net\0"
+"omuta.fukuoka.jp\0toyama.toyama.jp\0"
+"barlettatraniandria.it\0sr.it\0alabama.museum\0"
+"kuki.saitama.jp\0cc.ca.us\0"
+"sarufutsu.hokkaido.jp\0"
+"inf.br\0"
+"mizuho.tokyo.jp\0exeter.museum\0idv.tw\0"
+"rennes\xc3\xb8y.no\0"
+"unicom\0"
+"bando.ibaraki.jp\0"
+"id.ir\0arts.ve\0"
+"s\xc3\xb8r-varanger.no\0barsyonline.com\0"
+"miyama.fukuoka.jp\0"
+"inf.cu\0"
+"nsw.au\0"
+"profesional.bo\0ap.it\0imakane.hokkaido.jp\0windows\0"
+"wroclaw.pl\0duck\0solutions\0ybo.science\0"
+"minamiise.mie.jp\0"
+"ogliastra.it\0sula.no\0"
+"tonosho.kagawa.jp\0"
+"b.bg\0"
+"koebenhavn.museum\0"
+"kamakura.kanagawa.jp\0kuroiso.tochigi.jp\0"
+"zgora.pl\0"
+"daplie.me\0"
+"narita.chiba.jp\0otake.hiroshima.jp\0"
+"katashina.gunma.jp\0"
+"hachijo.tokyo.jp\0"
+"b.br\0gs.st.no\0harstad.no\0"
+"oster\xc3\xb8y.no\0fedorapeople.org\0"
+"sc.cn\0friuli-v-giulia.it\0from-sc.com\0"
+"gs.svalbard.no\0"
+"circus.museum\0dallas.museum\0ballangen.no\0author\0"
+"ichikai.tochigi.jp\0realty\0"
+"fin.tn\0"
+"nesseby.no\0"
+"prof.pr\0backplaneapp.io\0"
+"\xe5\x8d\x83\xe8\x91\x89.jp\0"
+"kaneyama.yamagata.jp\0mysecuritycamera.com\0"
+"settlers.museum\0"
+"id.lv\0\xd0\xbe\xd0\xbd\xd0\xbb\xd0\xb0\xd0\xb9\xd0\xbd\0balashov.su\0"
+"he.cn\0"
+"laz.it\0yonezawa.yamagata.jp\0id.ly\0"
+"sondre-land.no\0movie\0"
+"takaharu.miyazaki.jp\0"
+"mragowo.pl\0"
+"towada.aomori.jp\0uni5.net\0"
+"dyn.cosidns.de\0"
+"arts.ro\0"
+"bellevue.museum\0"
+"trentino-a-adige.it\0"
+"kumenan.okayama.jp\0coldwar.museum\0ushistory.museum\0"
+"ostrowwlkp.pl\0"
+"cbre\0"
+"forsand.no\0dattolocal.com\0"
+"zachpomor.pl\0cherkasy.ua\0surf\0"
+"svizzera.museum\0knowsitall.info\0"
+"ooshika.nagano.jp\0fan\0"
+"uchihara.ibaraki.jp\0"
+"tksat.bo\0forli-cesena.it\0"
+"chikuhoku.nagano.jp\0"
+"consulting\0"
+"tr.eu.org\0"
+"page\0asso.eu.org\0"
+"noip.us\0"
+"finn\xc3\xb8y.no\0"
+"flesberg.no\0"
+"tarui.gifu.jp\0"
+"fujitsu\0"
+"matsuura.nagasaki.jp\0k12.mt.us\0"
+"selje.no\0hs.run\0"
+"eating-organic.net\0"
+"itami.hyogo.jp\0"
+"kumatori.osaka.jp\0"
+"kameyama.mie.jp\0mobi\0slattum.no\0eu-4.evennode.com\0"
+"toray\0"
+"arts.nf\0from-ma.com\0"
+"masaki.ehime.jp\0"
+"esq\0"
+"\xe6\xb8\xb8\xe6\x88\x8f\0"
+"drive\0"
+"atlanta.museum\0ox.rs\0"
+"trentino-s-tirol.it\0mitou.yamaguchi.jp\0"
+"ecologia.bo\0firewall-gateway.net\0"
+"hokkaido.jp\0fuso.aichi.jp\0"
+"cc.ar.us\0"
+"es.gov.br\0tsuiki.fukuoka.jp\0\xd5\xb0\xd5\xa1\xd5\xb5\0"
+"us-west-1.elasticbeanstalk.com\0"
+"management\0freeboxos.fr\0"
+"moda\0ddnslive.com\0"
+"cesena-forli.it\0"
+"teva\0altervista.org\0spdns.org\0"
+"mitsubishi\0"
+"express.aero\0"
+"sc.ke\0twmail.cc\0"
+"dyndns-remote.com\0"
+"dyndns-at-work.com\0"
+"inf.mk\0losangeles.museum\0"
+"higashinaruse.akita.jp\0"
+"bandai.fukushima.jp\0"
+"eus\0"
+"chirurgiens-dentistes.fr\0"
+"sc.kr\0"
+"hotel.tz\0"
+"*.lcl.dev\0"
+"sayama.osaka.jp\0"
+"takayama.gunma.jp\0"
+"*.nom.br\0"
+"is-leet.com\0"
+"azumino.nagano.jp\0torino.museum\0"
+"radio.br\0"
+"kamiamakusa.kumamoto.jp\0"
+"sc.ls\0pictures\0"
+"nationalheritage.museum\0"
+"\xc3\xb8yer.no\0eu-3.evennode.com\0"
+"flynnhosting.net\0"
+"id.us\0"
+"webcam\0"
+"ina.saitama.jp\0"
+"tomakomai.hokkaido.jp\0finland.museum\0museumcenter.museum\0"
+"murata.miyagi.jp\0jevnaker.no\0"
+"groks-the.info\0"
+"owariasahi.aichi.jp\0"
+"tobetsu.hokkaido.jp\0"
+"skierv\xc3\xa1.no\0"
+"etne.no\0cloudapp.net\0"
+"linz.museum\0averoy.no\0"
+"lib.nm.us\0df.leg.br\0"
+"contemporary.museum\0"
+"teo.br\0"
+"\xe7\x9f\xb3\xe5\xb7\x9d.jp\0"
+"iida.nagano.jp\0"
+"poker\0"
+"oppeg\xc3\xa5rd.no\0"
+"b\xc3\xa1id\xc3\xa1r.no\0dyndns-at-home.com\0"
+"kusu.oita.jp\0"
+"tienda\0"
+"yazu.tottori.jp\0scienceandindustry.museum\0v\xc3\xa6r\xc3\xb8y.no\0"
+"kanna.gunma.jp\0"
+"emb.kw\0khmelnitskiy.ua\0"
+"nyc.museum\0fit\0"
+"dvag\0"
+"airtel\0"
+"chuo.yamanashi.jp\0evenes.no\0"
+"leksvik.no\0\xd8\xb4\xd8\xa8\xd9\x83\xd8\xa9\0"
+"lecco.it\0"
+"aa.no\0\xe9\x80\x9a\xe8\xb2\xa9\0"
+"balat.no\0"
+"servep2p.com\0"
+"filegear-sg.me\0"
+"turystyka.pl\0cyon.site\0"
+"flor\xc3\xb8.no\0"
+"chungnam.kr\0"
+"ashiya.fukuoka.jp\0fujikawa.shizuoka.jp\0"
+"naka.hiroshima.jp\0"
+"locus\0statefarm\0thruhere.net\0"
+"eu-2.evennode.com\0"
+"adachi.tokyo.jp\0k12.wy.us\0"
+"rieti.it\0godo.gifu.jp\0"
+"shimabara.nagasaki.jp\0"
+"\xe3\x82\xbb\xe3\x83\xbc\xe3\x83\xab\0"
+"juniper\0"
+"omotego.fukushima.jp\0"
+"asmatart.museum\0cc.ok.us\0"
+"k12.ia.us\0"
+"inf.ua\0"
+"kosai.shizuoka.jp\0"
+"cc.la.us\0viking\0"
+"\xd0\xb8\xd0\xba\xd0\xbe\xd0\xbc.museum\0"
+"fjell.no\0"
+"hotel.lk\0topology.museum\0tr\xc3\xa6na.no\0fly\0"
+"psc.br\0"
+"mihama.mie.jp\0aseral.no\0"
+"noip.me\0"
+"ap-northeast-2.elasticbeanstalk.com\0"
+"experts-comptables.fr\0minamiizu.shizuoka.jp\0loten.no\0"
+"minakami.gunma.jp\0"
+"airguard.museum\0b.se\0"
+"fauske.no\0"
+"taiwa.miyagi.jp\0seven\0"
+"pars\0\xd8\xa7\xd9\x84\xd8\xb9\xd9\x84\xd9\x8a\xd8\xa7\xd9\x86\0"
+"inzai.chiba.jp\0mulhouse.museum\0"
+"oyamazaki.kyoto.jp\0futurehosting.at\0"
+"pordenone.it\0gj\xc3\xb8vik.no\0\xe5\x81\xa5\xe5\xba\xb7\0"
+"reggio-emilia.it\0childrensgarden.museum\0"
+"niteroi.br\0pulawy.pl\0"
+"zama.kanagawa.jp\0jamison.museum\0"
+"kawakami.nagano.jp\0"
+"cl.it\0"
+"uk0.bigv.io\0"
+"sciencecenters.museum\0"
+"glogow.pl\0"
+"sc.ug\0eu-1.evennode.com\0"
+"sc.tz\0\xd8\xa7\xd9\x85\xd8\xa7\xd8\xb1\xd8\xa7\xd8\xaa\0foo\0"
+"grong.no\0modum.no\0"
+"morotsuka.miyazaki.jp\0for-more.biz\0"
+"nym.by\0"
+"shinto.gunma.jp\0s3-eu-west-2.amazonaws.com\0nym.bz\0"
+"gjesdal.no\0sc.us\0fox\0"
+"\xe5\x85\xac\xe5\x8f\xb8.cn\0\xe6\xb2\x96\xe7\xb8\x84.jp\0"
+"ny.us\0"
+"\xe0\xb9\x80\xe0\xb8\x99\xe0\xb9\x87\xe0\xb8\x95.\xe0\xb9\x84\xe0\xb8\x97\xe0\xb8\xa2\0"
+"shimizu.hokkaido.jp\0"
+"de.cool\0"
+"sasaguri.fukuoka.jp\0"
+"hawaii.museum\0"
+"shiriuchi.hokkaido.jp\0c.cdn77.org\0"
+"soni.nara.jp\0gs.nl.no\0"
+"\xe5\x85\xac\xe5\x8f\xb8.hk\0toyota.aichi.jp\0gu.us\0"
+"trentino-sued-tirol.it\0"
+"bungotakada.oita.jp\0"
+"england.museum\0x443.pw\0"
+"camera\0gal\0iserv.dev\0"
+"york.museum\0"
+"rochester.museum\0nym.ec\0"
+"ashiya.hyogo.jp\0sinaapp.com\0"
+"gangwon.kr\0gap\0"
+"bestbuy\0"
+"americanantiques.museum\0"
+"hotel.hu\0"
+"uchinada.ishikawa.jp\0"
+"dyndns-ip.com\0"
+"makurazaki.kagoshima.jp\0"
+"scotland.museum\0"
+"ogori.fukuoka.jp\0gay\0"
+"yoshino.nara.jp\0"
+"frl\0"
+"lib.id.us\0"
+"oracle\0"
+"ac\0\xe7\xa7\xbb\xe5\x8a\xa8\0to.work\0"
+"ad\0serveminecraft.net\0"
+"ae\0hamamatsu.shizuoka.jp\0"
+"af\0cesenaforl\xc3\xac.it\0"
+"ag\0"
+"rsc.cdn77.org\0"
+"ai\0"
+"williamhill\0"
+"berg.no\0"
+"al\0racing\0logoip.de\0"
+"am\0himeji.hyogo.jp\0"
+"ao\0"
+"aq\0ba\0romsa.no\0"
+"ar\0bb\0satsumasendai.kagoshima.jp\0"
+"passenger-association.aero\0as\0"
+"at\0"
+"au\0be\0phoenix.museum\0"
+"bf\0"
+"aw\0bg\0"
+"ax\0bh\0uk.eu.org\0"
+"bi\0cloudcontrolled.com\0"
+"az\0bj\0chikujo.fukuoka.jp\0"
+"moriya.ibaraki.jp\0"
+"bm\0medecin.km\0"
+"bn\0"
+"bo\0tunk.org\0"
+"computer.museum\0microsoft\0nym.gr\0"
+"ca\0aero.tt\0gdn\0"
+"br\0"
+"bs\0cc\0onred.one\0"
+"bt\0cd\0gea\0"
+"ftr\0"
+"bv\0cf\0casadelamoneda.museum\0"
+"bw\0cg\0yokawa.hyogo.jp\0nym.gy\0"
+"ch\0"
+"by\0ci\0panama.museum\0nym.hk\0"
+"bz\0k12.vt.us\0"
+"dnsfor.me\0"
+"cl\0delta\0"
+"cm\0valle.no\0"
+"cn\0"
+"co\0"
+"properties\0"
+"rakkestad.no\0fun\0enonic.io\0"
+"cr\0"
+"workinggroup.aero\0aero.mv\0nym.ie\0"
+"cu\0de\0moto\0"
+"cv\0"
+"cw\0sherbrooke.museum\0"
+"cx\0"
+"cy\0"
+"cz\0dj\0hachioji.tokyo.jp\0"
+"dk\0"
+"bas.it\0read\0"
+"dm\0hemsedal.no\0bingo\0"
+"k12.il.us\0"
+"do\0chosei.chiba.jp\0"
+"bykle.no\0"
+"ec\0"
+"hitachiota.ibaraki.jp\0"
+"ee\0"
+"eg\0go.dyndns.org\0"
+"to.it\0"
+"dz\0"
+"pu.it\0uwu.ai\0"
+"aarp\0"
+"lucania.it\0from-wi.com\0"
+"!www.ck\0oceanographique.museum\0"
+"es\0"
+"et\0"
+"eu\0"
+"usr.cloud.muni.cz\0"
+"iraq.museum\0nordreisa.no\0"
+"fi\0"
+"fm\0fg.it\0"
+"fo\0tomi.nagano.jp\0ventures\0nym.la\0"
+"ga\0nym.lc\0"
+"fr\0gb\0"
+"jdevcloud.com\0"
+"gd\0"
+"ge\0"
+"gf\0hyllestad.no\0"
+"gg\0nym.li\0"
+"gh\0nym.kz\0"
+"gi\0narashino.chiba.jp\0"
+"kitami.hokkaido.jp\0"
+"o.bg\0gl\0molde.no\0r\xc3\xa5""de.no\0fyi\0"
+"gm\0tjeldsund.no\0"
+"gn\0tondabayashi.osaka.jp\0"
+"gp\0tateshina.nagano.jp\0"
+"5.bg\0gq\0embetsu.hokkaido.jp\0imamat\0"
+"gr\0nym.lt\0"
+"gs\0kudoyama.wakayama.jp\0nym.lu\0nym.me\0"
+"gt\0showa.fukushima.jp\0botanicgarden.museum\0"
+"gu\0amber.museum\0"
+"wa.edu.au\0ringerike.no\0"
+"gw\0sex.hu\0sakaki.nagano.jp\0gift\0"
+"coal.museum\0"
+"gy\0nj.us\0"
+"misato.wakayama.jp\0muenchen.museum\0"
+"hk\0"
+"nym.mn\0"
+"hm\0marker.no\0"
+"hn\0"
+"naganohara.gunma.jp\0"
+"tamano.okayama.jp\0ivgu.no\0"
+"hr\0mosvik.no\0"
+"ht\0id\0otoineppu.hokkaido.jp\0nordkapp.no\0slupsk.pl\0rj.leg.br\0"
+"hu\0ie\0"
+"prd.fr\0mombetsu.hokkaido.jp\0nym.mx\0"
+"sannohe.aomori.jp\0"
+"*.kitakyushu.jp\0"
+"iki.fi\0"
+"ogi.saga.jp\0"
+"il\0"
+"im\0\xe6\x84\x9b\xe7\x9f\xa5.jp\0"
+"in\0"
+"io\0"
+"aip.ee\0ranzan.saitama.jp\0karm\xc3\xb8y.no\0"
+"iq\0"
+"ir\0jaworzno.pl\0marketing\0mayfirst.info\0"
+"is\0kvafjord.no\0"
+"it\0kuriyama.hokkaido.jp\0wafflecell.com\0"
+"je\0"
+"\xe5\xb1\xb1\xe6\xa2\xa8.jp\0shimofusa.chiba.jp\0gle\0nym.nz\0"
+"alipay\0"
+"lib.gu.us\0black\0"
+"visa\0"
+"jo\0lib.co.us\0tatamotors\0"
+"jp\0"
+"select\0"
+"ama.shimane.jp\0katsushika.tokyo.jp\0saltdal.no\0nym.pe\0"
+"namsos.no\0"
+"ke\0"
+"swiss\0googlecode.com\0temp-dns.com\0"
+"kg\0"
+"coffee\0"
+"hitachiomiya.ibaraki.jp\0ki\0r\xc3\xb8yrvik.no\0"
+"\xe5\xbe\xb3\xe5\xb3\xb6.jp\0tonaki.okinawa.jp\0corvette.museum\0"
+"bozen-s\xc3\xbc""dtirol.it\0*.uberspace.de\0"
+"km\0naturhistorisches.museum\0"
+"kn\0"
+"sassari.it\0bentley\0"
+"kp\0from-az.net\0"
+"iheya.okinawa.jp\0la\0"
+"kr\0lb\0gmo\0nym.pt\0"
+"lc\0"
+"shiksha\0ciscofreak.com\0mypsx.net\0"
+"kw\0is-found.org\0"
+"ky\0li\0"
+"bologna.it\0kz\0"
+"kamisu.ibaraki.jp\0lk\0gmx\0"
+"minamioguni.kumamoto.jp\0"
+"ma\0"
+"lr\0"
+"ls\0mc\0"
+"anpachi.gifu.jp\0lt\0md\0ambulance.museum\0"
+"lu\0me\0"
+"lv\0beardu.no\0"
+"mg\0"
+"kosaka.akita.jp\0mh\0"
+"ly\0"
+"mk\0viva\0"
+"ml\0reit\0"
+"mail.pl\0nym.ro\0"
+"mn\0pccw\0"
+"mo\0"
+"mp\0"
+"prd.km\0mq\0na\0"
+"bolt.hu\0mr\0goo\0"
+"ms\0nc\0gop\0"
+"hakuba.nagano.jp\0mt\0from-oh.com\0"
+"mu\0ne\0"
+"mv\0nf\0"
+"mw\0ng\0got\0"
+"barreau.bj\0mx\0"
+"gov\0trentinoalto-adige.it\0my\0ni\0folldal.no\0vivo\0nym.sk\0"
+"fujishiro.ibaraki.jp\0mz\0"
+"nl\0"
+"technology.museum\0"
+"kyoto.jp\0"
+"no\0"
+"jefferson.museum\0"
+"sp.it\0nr\0"
+"nym.su\0"
+"naturbruksgymn.se\0app.os.stg.fedoraproject.org\0"
+"skaun.no\0nu\0able\0"
+"ind.br\0latina.it\0nym.sx\0"
+"olecko.pl\0"
+"aurskog-holand.no\0nz\0"
+"prd.mg\0"
+"sakaiminato.tottori.jp\0"
+"om\0"
+"sex.pl\0"
+"kunstunddesign.museum\0gotdns.org\0"
+"shizuoka.shizuoka.jp\0"
+"motegi.tochigi.jp\0pa\0"
+"nationalfirearms.museum\0"
+"pe\0nym.tw\0"
+"pf\0"
+"kariya.aichi.jp\0sasebo.nagasaki.jp\0ph\0fastpanel.direct\0"
+"og.ao\0an.it\0pk\0"
+"sa.au\0kawai.iwate.jp\0pl\0"
+"pm\0report\0"
+"iwade.wakayama.jp\0pn\0\xd1\x81\xd0\xb0\xd0\xb9\xd1\x82\0"
+"onion\0direct.quickconnect.to\0"
+"urasoe.okinawa.jp\0mk.ua\0"
+"qa\0"
+"kuzumaki.iwate.jp\0pr\0hbo\0rogers\0"
+"ps\0wy.us\0total\0"
+"chiryu.aichi.jp\0pt\0"
+"bugatti\0"
+"nakatombetsu.hokkaido.jp\0toga.toyama.jp\0"
+"ishikari.hokkaido.jp\0mup.gov.pl\0pw\0"
+"jewish.museum\0py\0"
+"piw.gov.pl\0onthewifi.com\0"
+"catering.aero\0lorenskog.no\0is-certified.com\0"
+"lavagis.no\0"
+"cloudns.biz\0"
+"preservation.museum\0sunndal.no\0"
+"r\xc3\xb8""d\xc3\xb8y.no\0"
+"re\0"
+"shop.ht\0"
+"shop.hu\0"
+"minamiminowa.nagano.jp\0"
+"sa.cr\0virginia.museum\0"
+"sic.it\0"
+"lubin.pl\0"
+"rent\0"
+"mad.museum\0"
+"jpmorgan\0"
+"ro\0"
+"logistics.aero\0kalisz.pl\0"
+"kamisunagawa.hokkaido.jp\0sa\0"
+"sb\0"
+"tmp.br\0rs\0sc\0"
+"gs.cn\0stavern.no\0sd\0"
+"catanzaro.it\0gotsu.shimane.jp\0ru\0se\0"
+"rw\0sg\0"
+"sh\0"
+"si\0lib.mn.us\0"
+"sj\0"
+"goiania.br\0sk\0"
+"nakano.nagano.jp\0sm\xc3\xb8la.no\0sl\0"
+"sm\0"
+"sn\0"
+"so\0from-mn.com\0"
+"midtre-gauldal.no\0"
+"kumamoto.jp\0"
+"wiki.bo\0sr\0s3-website-ap-northeast-1.amazonaws.com\0"
+"ss\0tc\0\xe0\xb9\x84\xe0\xb8\x97\xe0\xb8\xa2\0"
+"st\0td\0"
+"wiki.br\0su\0"
+"nishiaizu.fukushima.jp\0sv\0tf\0"
+"tg\0builders\0"
+"ind.gt\0iki.nagasaki.jp\0sx\0th\0"
+"sy\0"
+"school.na\0sz\0tj\0"
+"tk\0"
+"tl\0surgery\0"
+"shimada.shizuoka.jp\0tm\0"
+"\xe4\xb8\x89\xe9\x87\x8d.jp\0tn\0"
+"to\0soc.srcf.net\0"
+"sweden.museum\0leirfjord.no\0doesntexist.com\0"
+"newjersey.museum\0ua\0"
+"oxford.museum\0tr\0"
+"tt\0"
+"kitaura.miyazaki.jp\0"
+"tv\0"
+"humanities.museum\0tw\0ug\0"
+"stokke.no\0tz\0"
+"stockholm.museum\0uk\0\xe3\x81\xbf\xe3\x82\x93\xe3\x81\xaa\0"
+"\xe9\xa6\x99\xe5\xb7\x9d.jp\0"
+"va\0"
+"medecin.fr\0ind.in\0"
+"yugawara.kanagawa.jp\0kamiizumi.saitama.jp\0school.nz\0us\0vc\0"
+"sakyo.kyoto.jp\0kanuma.tochigi.jp\0ve\0"
+"suwa.nagano.jp\0ogimi.okinawa.jp\0kvam.no\0gifts\0"
+"vg\0"
+"trentin-s\xc3\xbc""d-tirol.it\0uy\0vi\0gb.net\0"
+"uz\0"
+"iwate.jp\0"
+"k12.tn.us\0"
+"business\0"
+"vn\0"
+"pomorze.pl\0"
+"\xd0\xba\xd0\xb0\xd1\x82\xd0\xbe\xd0\xbb\xd0\xb8\xd0\xba\0"
+"arezzo.it\0narviika.no\0"
+"kunitomi.miyazaki.jp\0vu\0"
+"toyotomi.hokkaido.jp\0ochi.kochi.jp\0wf\0"
+"toyota\0"
+"\xe4\xb8\xad\xe6\x96\x87\xe7\xbd\x91\0is-with-theband.com\0azurewebsites.net\0"
+"rest\0"
+"shichikashuku.miyagi.jp\0redirectme.net\0"
+"ibestad.no\0"
+"home-webserver.de\0"
+"cc.id.us\0ws\0*.vps.myjino.ru\0"
+"from-vt.com\0"
+"citadel\0filegear-de.me\0"
+"honjyo.akita.jp\0"
+"nomi.ishikawa.jp\0haugesund.no\0"
+"kitaakita.akita.jp\0hiv\0"
+"o.se\0"
+"sa.it\0\xe5\xa4\xa7\xe5\x88\x86.jp\0ind.kw\0"
+"expert\0"
+"tomisato.chiba.jp\0kariwa.niigata.jp\0\xd9\x85\xd9\x84\xd9\x8a\xd8\xb3\xd9\x8a\xd8\xa7\0logoip.com\0"
+"og.it\0"
+"chuo.osaka.jp\0"
+"yamashina.kyoto.jp\0histoire.museum\0rr.leg.br\0"
+"zt.ua\0"
+"\xc3\xb8stre-toten.no\0"
+"midori.chiba.jp\0"
+"16-b.it\0"
+"*.ex.ortsinfo.at\0"
+"otama.fukushima.jp\0\xd0\xb0\xd0\xba.\xd1\x81\xd1\x80\xd0\xb1\0"
+"plc.co.im\0"
+"ibaraki.osaka.jp\0"
+"museet.museum\0zone\0"
+"sumida.tokyo.jp\0"
+"yt\0"
+"\xe0\xa4\x95\xe0\xa5\x89\xe0\xa4\xae\0"
+"hkt\0"
+"boxfuse.io\0"
+"tele.amune.org\0"
+"zm\0"
+"tatsuno.nagano.jp\0"
+"agr.br\0coastaldefence.museum\0"
+"ozora.hokkaido.jp\0salat.no\0dontexist.com\0"
+"progressive\0rs.leg.br\0sc.leg.br\0"
+"ostre-toten.no\0"
+"zw\0myftp.biz\0"
+"takaishi.osaka.jp\0hareid.no\0"
+"hasami.nagasaki.jp\0"
+"dyndns-server.com\0"
+"badaddja.no\0"
+"group.aero\0"
+"station.museum\0"
+"onga.fukuoka.jp\0"
+"auction\0"
+"economia.bo\0tachikawa.tokyo.jp\0"
+"stpetersburg.museum\0"
+"gloppen.no\0"
+"hol.no\0"
+"iizuka.fukuoka.jp\0"
+"geometre-expert.fr\0chijiwa.nagasaki.jp\0"
+"name\0\xe0\xa4\xb8\xe0\xa4\x82\xe0\xa4\x97\xe0\xa4\xa0\xe0\xa4\xa8\0"
+"gd.cn\0"
+"tas.au\0"
+"iwakuni.yamaguchi.jp\0"
+"s3-website-us-east-1.amazonaws.com\0"
+"point2this.com\0"
+"cinema.museum\0gs.aa.no\0"
+"ba.leg.br\0"
+"lenvik.no\0"
+"isteingeek.de\0"
+"gobo.wakayama.jp\0"
+"flekkefjord.no\0"
+"country\0"
+"agents.aero\0"
+"center.museum\0"
+"nanao.ishikawa.jp\0"
+"is-a-therapist.com\0"
+"nationwide\0"
+"barsyonline.co.uk\0"
+"hot\0"
+"shiftedit.io\0"
+"desa.id\0kizu.kyoto.jp\0how\0tiaa\0"
+"yamagata.yamagata.jp\0"
+"mantova.it\0"
+"fyresdal.no\0"
+"tysfjord.no\0"
+"guernsey.museum\0mandal.no\0imdb\0cbg.ru\0"
+"direct\0"
+"tabuse.yamaguchi.jp\0"
+"jewishart.museum\0zhytomyr.ua\0"
+"poltava.ua\0"
+"cern\0"
+"lodi.it\0uklugs.org\0"
+"rec.br\0"
+"molise.it\0zarow.pl\0"
+"br.com\0"
+"from-ok.com\0"
+"kv\xc3\xa6""fjord.no\0"
+"chihayaakasaka.osaka.jp\0alpha-myqnapcloud.com\0"
+"shikabe.hokkaido.jp\0mitsue.nara.jp\0cc.sc.us\0"
+"higashikagawa.kagawa.jp\0"
+"k12.mi.us\0"
+"rec.co\0ibm\0"
+"indigena.bo\0"
+"ind.tn\0cc.ny.us\0is-a-candidate.org\0"
+"rn.leg.br\0"
+"ice\0"
+"bihoro.hokkaido.jp\0cc.gu.us\0"
+"s3.dualstack.us-east-2.amazonaws.com\0"
+"k12.as.us\0"
+"is-a-painter.com\0"
+"cremona.it\0kuchinotsu.nagasaki.jp\0h\xc3\xb8ylandet.no\0neustar\0"
+"est.pr\0noho.st\0"
+"aquarium.museum\0"
+"icu\0"
+"balsan-s\xc3\xbc""dtirol.it\0"
+"nanbu.yamanashi.jp\0limited\0"
+"wloclawek.pl\0"
+"trentinos-tirol.it\0"
+"nachikatsuura.wakayama.jp\0gwiddle.co.uk\0"
+"is-a-caterer.com\0"
+"loginto.me\0"
+"kadoma.osaka.jp\0agric.za\0"
+"ro.leg.br\0"
+"mydatto.com\0"
+"bz.it\0\xe5\x95\x86\xe5\x9f\x8e\0"
+"kr\xc3\xa5""anghke.no\0dynv6.net\0"
+"kiyokawa.kanagawa.jp\0"
+"pagefrontapp.com\0"
+"alfaromeo\0cloudcontrolapp.com\0"
+"km.ua\0"
+"adac\0pantheonsite.io\0"
+"homedepot\0"
+"qc.ca\0trolley.museum\0"
+"tsushima.nagasaki.jp\0satx.museum\0"
+"ifm\0"
+"am.leg.br\0"
+"izena.okinawa.jp\0pilots.museum\0"
+"komono.mie.jp\0"
+"shop.th\0"
+"society.museum\0"
+"tm.cy\0miki.hyogo.jp\0glug.org.uk\0"
+"kembuchi.hokkaido.jp\0nakagawa.nagano.jp\0"
+"goodyear\0"
+"is-a-hard-worker.com\0"
+"mx.na\0lib.or.us\0"
+"minamiyamashiro.kyoto.jp\0aguni.okinawa.jp\0iron.museum\0"
+"gokase.miyazaki.jp\0"
+"kibichuo.okayama.jp\0"
+"navy\0"
+"higashikagura.hokkaido.jp\0"
+"dyn-berlin.de\0"
+"yasaka.nagano.jp\0"
+"from-ar.com\0"
+"s3-website.ap-northeast-2.amazonaws.com\0ddnsfree.com\0"
+"slz.br\0hellas.museum\0"
+"aure.no\0lib.az.us\0"
+"tsuno.miyazaki.jp\0"
+"niikappu.hokkaido.jp\0m\xc4\x81ori.nz\0"
+"from-wv.com\0"
+"jorpeland.no\0"
+"shop.ro\0"
+"tm.fr\0wzmiuw.gov.pl\0"
+"git-repos.de\0"
+"andoy.no\0buzz\0\xe5\x9c\xa8\xe7\xba\xbf\0"
+"ecn.br\0"
+"mimata.miyazaki.jp\0"
+"githubusercontent.com\0"
+"ma.gov.br\0"
+"immo\0"
+"vestnes.no\0style\0ddns.me\0"
+"\xe5\xb9\xbf\xe4\xb8\x9c\0"
+"dyndns-home.com\0"
+"shop.pl\0"
+"def.br\0"
+"air.museum\0"
+"quest\0"
+"tm.hu\0\xe7\xa6\x8f\xe5\xb3\xb6.jp\0"
+"g12.br\0achi.nagano.jp\0r\xc3\xa1isa.no\0myqnapcloud.com\0"
+"cc.nj.us\0"
+"louvre.museum\0\xe5\xa8\xb1\xe4\xb9\x90\0"
+"newholland\0"
+"sauda.no\0"
+"shiki.saitama.jp\0ap.leg.br\0"
+"cancerresearch\0"
+"\xe5\xae\xae\xe5\xb4\x8e.jp\0"
+"marche.it\0rec.nf\0"
+"oshu.iwate.jp\0hannan.osaka.jp\0bearalv\xc3\xa1hki.no\0"
+"\xe6\xbb\x8b\xe8\xb3\x80.jp\0"
+"\xe9\xb9\xbf\xe5\x85\x90\xe5\xb3\xb6.jp\0kuroishi.aomori.jp\0maori.nz\0"
+"aogashima.tokyo.jp\0orkdal.no\0"
+"mi.it\0luxury\0"
+"misaki.osaka.jp\0"
+"from-il.com\0"
+"sand\xc3\xb8y.no\0"
+"inc\0"
+"ee.eu.org\0mypep.link\0"
+"rotorcraft.aero\0north-kazakhstan.su\0"
+"ing\0eu-west-3.elasticbeanstalk.com\0*.advisor.ws\0"
+"fe.it\0bushey.museum\0blogsite.xyz\0enterprisecloud.nu\0"
+"sites.static.land\0user.srcf.net\0"
+"ink\0is-a-nascarfan.com\0"
+"is-very-sweet.org\0"
+"ohtawara.tochigi.jp\0tm.km\0\xd7\x99\xd7\xa8\xd7\x95\xd7\xa9\xd7\x9c\xd7\x99\xd7\x9d.museum\0"
+"homeip.net\0"
+"maebashi.gunma.jp\0"
+"int\0"
+"ritto.shiga.jp\0"
+"m.bg\0"
+"lebesby.no\0randaberg.no\0"
+"ntr.br\0"
+"nakasatsunai.hokkaido.jp\0"
+"taketomi.okinawa.jp\0"
+"3.bg\0gosen.niigata.jp\0"
+"nankoku.kochi.jp\0"
+"grp.lk\0"
+"wakayama.jp\0"
+"tm.mc\0hughes\0"
+"nh.us\0"
+"sn.cn\0yatomi.aichi.jp\0tm.mg\0"
+"tips\0"
+"zaporizhzhia.ua\0"
+"copenhagen.museum\0palace.museum\0lpages.co\0"
+"vaporcloud.io\0"
+"qld.edu.au\0chiyoda.gunma.jp\0erimo.hokkaido.jp\0"
+"santacruz.museum\0"
+"\xe8\x8c\xa8\xe5\x9f\x8e.jp\0toda.saitama.jp\0"
+"cloudera.site\0se.leg.br\0"
+"reggio-calabria.it\0"
+"feedback\0"
+"eu.int\0barsy.mobi\0"
+"inashiki.ibaraki.jp\0"
+"exchange.aero\0rec.ro\0philips\0"
+"tm.no\0"
+"kagawa.jp\0hino.tottori.jp\0\xe0\xb8\xad\xe0\xb8\x87\xe0\xb8\x84\xe0\xb9\x8c\xe0\xb8\x81\xe0\xb8\xa3.\xe0\xb9\x84\xe0\xb8\x97\xe0\xb8\xa2\0"
+"entertainment.aero\0ujitawara.kyoto.jp\0"
+"gyeongnam.kr\0orkanger.no\0"
+"shijonawate.osaka.jp\0applicationcloud.io\0"
+"takashima.shiga.jp\0verm\xc3\xb6gensberater\0"
+"franziskaner.museum\0"
+"us.org\0"
+"nsupdate.info\0"
+"capital\0fuettertdasnetz.de\0"
+"sanuki.kagawa.jp\0niigata.niigata.jp\0lib.ak.us\0"
+"filegear-jp.me\0"
+"jcb\0"
+"steam.museum\0kaufen\0chimkent.su\0"
+"moskenes.no\0"
+"numazu.shizuoka.jp\0engineering\0"
+"odate.akita.jp\0kazimierz-dolny.pl\0"
+"kimitsu.chiba.jp\0"
+"tm.pl\0"
+"vevelstad.no\0"
+"recipes\0"
+"info\0funagata.yamagata.jp\0asnes.no\0jcp\0"
+"judygarland.museum\0"
+"ist\0"
+"tours\0"
+"loabat.no\0"
+"uwajima.ehime.jp\0kpmg\0"
+"usuki.oita.jp\0"
+"flakstad.no\0"
+"futaba.fukushima.jp\0beeldengeluid.museum\0"
+"*.sch.uk\0"
+"shirakawa.gifu.jp\0k12.vi.us\0"
+"cc.wy.us\0forgot.her.name\0"
+"rec.ve\0"
+"monzaedellabrianza.it\0mifune.kumamoto.jp\0"
+"vibovalentia.it\0soeda.fukuoka.jp\0itv\0"
+"nokia\0"
+"est-mon-blogueur.com\0"
+"nakamichi.yamanashi.jp\0"
+"uozu.toyama.jp\0"
+"tm.ro\0"
+"is-a-teacher.com\0"
+"k12.ga.us\0"
+"kota.aichi.jp\0"
+"ome.tokyo.jp\0"
+"tm.se\0"
+"kanonji.kagawa.jp\0"
+"messina.it\0"
+"media.aero\0"
+"s3-us-east-2.amazonaws.com\0mein-iserv.de\0"
+"beppu.oita.jp\0ito.shizuoka.jp\0portal.museum\0vardo.no\0"
+"barrel-of-knowledge.info\0"
+"kashiwara.osaka.jp\0royrvik.no\0"
+"ot.it\0pd.it\0"
+"honjo.saitama.jp\0"
+"asahi.mie.jp\0"
+"tanabe.wakayama.jp\0rhcloud.com\0"
+"\xe5\x85\xb5\xe5\xba\xab.jp\0spreadbetting\0"
+"ribeirao.br\0"
+"of.football\0"
+"m\xc3\xa5s\xc3\xb8y.no\0mi.th\0"
+"al.it\0ragusa.it\0nanporo.hokkaido.jp\0"
+"\xc3\xb8rsta.no\0"
+"numata.hokkaido.jp\0"
+"jampa.br\0"
+"matsuda.kanagawa.jp\0sandnes.no\0"
+"santafe.museum\0"
+"toyone.aichi.jp\0"
+"mytuleap.com\0"
+"nu.ca\0"
+"mi.us\0"
+"higashiyoshino.nara.jp\0jio\0linkyard-cloud.ch\0"
+"\xe5\x80\x8b\xe4\xba\xba.hk\0"
+"katowice.pl\0"
+"hiratsuka.kanagawa.jp\0royken.no\0"
+"\xe5\x8f\xb0\xe6\xb9\xbe\0"
+"tara.saga.jp\0"
+"termez.su\0"
+"writesthisblog.com\0barsy.support\0"
+"kasai.hyogo.jp\0*.compute.amazonaws.com\0"
+"shichinohe.aomori.jp\0sande.more-og-romsdal.no\0"
+"insure\0"
+"ha.cn\0vgs.no\0"
+"varese.it\0incheon.kr\0archaeological.museum\0kinghost.net\0"
+"yokkaichi.mie.jp\0"
+"nakagyo.kyoto.jp\0skjervoy.no\0fhapp.xyz\0"
+"holt\xc3\xa5len.no\0krym.ua\0"
+"woodside\0"
+"mutsu.aomori.jp\0academy.museum\0farmequipment.museum\0"
+"piedmont.it\0movistar\0"
+"\xe5\x98\x89\xe9\x87\x8c\0ro.eu.org\0"
+"ikata.ehime.jp\0"
+"creditunion\0"
+"realestate\0"
+"lajolla.museum\0ann-arbor.mi.us\0"
+"kppsp.gov.pl\0"
+"chiba.jp\0jll\0"
+"rauma.no\0"
+"al.no\0tm.za\0"
+"shimodate.ibaraki.jp\0\xe0\xb4\xad\xe0\xb4\xbe\xe0\xb4\xb0\xe0\xb4\xa4\xe0\xb4\x82\0"
+"enna.it\0"
+"ichinomiya.aichi.jp\0"
+"sango.nara.jp\0"
+"iwanuma.miyagi.jp\0"
+"jmp\0hashbang.sh\0"
+"swinoujscie.pl\0"
+"siljan.no\0"
+"office\0"
+"\xd8\xb9\xd9\x85\xd8\xa7\xd9\x86\0jnj\0"
+"suldal.no\0"
+"starnberg.museum\0"
+"s\xc3\xb8rum.no\0"
+"engineer\0"
+"sorocaba.br\0k12.nh.us\0"
+"skedsmo.no\0"
+"\xe9\x9b\xbb\xe8\xa8\x8a\xe7\x9b\x88\xe7\xa7\x91\0"
+"k12.in.us\0"
+"arakawa.saitama.jp\0"
+"nagano.nagano.jp\0"
+"divtasvuodna.no\0"
+"mex.com\0"
+"ginowan.okinawa.jp\0tarnobrzeg.pl\0sochi.su\0"
+"piacenza.it\0"
+"ro.im\0"
+"cologne\0shriram\0"
+"vi.it\0sabae.fukui.jp\0g\xc3\xa1ivuotna.no\0"
+"childrens.museum\0"
+"fujiidera.osaka.jp\0jot\0cn.eu.org\0"
+"kharkov.ua\0si.eu.org\0"
+"taishin.fukushima.jp\0m.se\0"
+"ro.it\0"
+"\xd0\xb1\xd0\xb5\xd0\xbb\0joy\0"
+"gorizia.it\0"
+"9guacu.br\0"
+"nu.it\0"
+"goldpoint\0"
+"crafts.museum\0"
+"lillehammer.no\0"
+"verran.no\0"
+"manaus.br\0chat\0"
+"industria.bo\0"
+"gratangen.no\0lug.org.uk\0"
+"her\xc3\xb8y.nordland.no\0"
+"hembygdsforbund.museum\0ushuaia.museum\0"
+"omaezaki.shizuoka.jp\0"
+"epilepsy.museum\0asker.no\0"
+"\xe5\x92\x8c\xe6\xad\x8c\xe5\xb1\xb1.jp\0poznan.pl\0"
+"blockbuster\0"
+"osaka\0"
+"dnsdojo.com\0"
+"kl\xc3\xa6""bu.no\0"
+"kyotamba.kyoto.jp\0"
+"school.za\0homelinux.com\0kozow.com\0"
+"midori.gunma.jp\0presse.km\0"
+"nf.ca\0"
+"is-uberleet.com\0"
+"okegawa.saitama.jp\0"
+"ichikawa.hyogo.jp\0"
+"co.financial\0"
+"laquila.it\0russia.museum\0"
+"odessa.ua\0"
+"jolster.no\0"
+"yamato.kumamoto.jp\0"
+"jl.cn\0"
+"interactive.museum\0newport.museum\0sk.eu.org\0"
+"al.us\0"
+"kanan.osaka.jp\0"
+"kazo.saitama.jp\0presse.ml\0"
+"co.krd\0"
+"ru.com\0"
+"a.ssl.fastly.net\0"
+"cesenaforli.it\0lib.ma.us\0myasustor.com\0"
+"andebu.no\0"
+"hemnes.no\0rade.no\0"
+"siellak.no\0land\0"
+"gmbh\0lancaster\0"
+"thingdustdata.com\0"
+"instantcloud.cn\0"
+"county.museum\0aurskog-h\xc3\xb8land.no\0s3.dualstack.ap-south-1.amazonaws.com\0"
+"hamburg\0"
+"\xe7\xae\x87\xe4\xba\xba.hk\0"
+"otaki.nagano.jp\0praxi\0*.cryptonomic.net\0boldlygoingnowhere.org\0"
+"nagato.yamaguchi.jp\0ha.no\0"
+"miyota.nagano.jp\0"
+"hoylandet.no\0"
+"savona.it\0cy.eu.org\0"
+"kfh\0"
+"kochi.jp\0miyoshi.hiroshima.jp\0"
+"conf.au\0"
+"kitagata.gifu.jp\0trysil.no\0"
+"honai.ehime.jp\0"
+"mg.gov.br\0vallee-d-aoste.it\0*.in.futurecms.at\0"
+"s3.eu-central-1.amazonaws.com\0"
+"nishimera.miyazaki.jp\0"
+"hanawa.fukushima.jp\0s3-ca-central-1.amazonaws.com\0"
+"kepno.pl\0"
+"hisayama.fukuoka.jp\0"
+"minamata.kumamoto.jp\0rep.kp\0neat-url.com\0"
+"\xe9\xa6\x99\xe6\xa0\xbc\xe9\x87\x8c\xe6\x8b\x89\0"
+"trentinsued-tirol.it\0"
+"trentinsuedtirol.it\0volda.no\0"
+"film.museum\0"
+"vikna.no\0"
+"aero\0friuli-ve-giulia.it\0"
+"soka.saitama.jp\0"
+"furniture\0"
+"prato.it\0akashi.hyogo.jp\0"
+"cz.eu.org\0"
+"baseball\0ru.eu.org\0se.eu.org\0"
+"k12.pa.us\0"
+"cri.br\0"
+"yachiyo.ibaraki.jp\0"
+"rich\0myds.me\0"
+"eid.no\0"
+"pro.az\0sci.eg\0"
+"frogn.no\0contact\0kia\0ddnss.de\0"
+"norfolk.museum\0rehab\0"
+"kounosu.saitama.jp\0"
+"pro.br\0dubai\0"
+"kawanehon.shizuoka.jp\0"
+"kim\0"
+"s\xc3\xbc""dtirol.it\0mj\xc3\xb8ndalen.no\0smart\0"
+"macerata.it\0"
+"dk.eu.org\0"
+"chikushino.fukuoka.jp\0inatsuki.fukuoka.jp\0oceanographic.museum\0"
+"servepics.com\0"
+"certification.aero\0tsuruga.fukui.jp\0"
+"d.gv.vc\0"
+"map.fastly.net\0"
+"pro.cy\0fr.it\0\xc3\xa1lt\xc3\xa1.no\0"
+"sampa.br\0"
+"dnepropetrovsk.ua\0"
+"s3.eu-west-3.amazonaws.com\0"
+"ch.it\0nesna.no\0gratis\0"
+"nativeamerican.museum\0"
+"clothing\0digital\0"
+"pro.ec\0eidskog.no\0\xe1\x83\x92\xe1\x83\x94\0"
+"nagara.chiba.jp\0ostrowiec.pl\0co.network\0ownip.net\0"
+"ternopil.ua\0baidu\0"
+"z.bg\0*.cns.joyent.com\0"
+"kvalsund.no\0"
+"vi.us\0"
+"kawaguchi.saitama.jp\0"
+"tomika.gifu.jp\0kred\0"
+"trentino-sudtirol.it\0nantan.kyoto.jp\0b\xc3\xa1hccavuotna.no\0"
+"toyono.osaka.jp\0"
+"kotohira.kagawa.jp\0"
+"carboniaiglesias.it\0fastly-terrarium.com\0"
+"kanie.aichi.jp\0"
+"entomology.museum\0rendalen.no\0"
+"reggioemilia.it\0xerox\0"
+"takamori.nagano.jp\0eng.pro\0"
+"nanae.hokkaido.jp\0"
+"lupin\0"
+"isa.kagoshima.jp\0"
+"boomla.net\0"
+"itoman.okinawa.jp\0broadcast.museum\0"
+"tranibarlettaandria.it\0berlin\0ca-central-1.elasticbeanstalk.com\0"
+"de.eu.org\0"
+"watari.miyagi.jp\0"
+"uber.space\0"
+"genova.it\0redumbrella\0\xd0\xb4\xd0\xb5\xd1\x82\xd0\xb8\0"
+"ninohe.iwate.jp\0govt.nz\0"
+"yanagawa.fukuoka.jp\0"
+"localhost.daplie.me\0"
+"civilization.museum\0"
+"campidano-medio.it\0"
+"americana.museum\0scjohnson\0technology\0"
+"chikuzen.fukuoka.jp\0"
+"pro.ht\0frankfurt.museum\0"
+"\xe5\x85\xab\xe5\x8d\xa6\0"
+"kusatsu.gunma.jp\0"
+"mypets.ws\0"
+"softbank\0"
+"osaki.miyagi.jp\0"
+"kani.gifu.jp\0"
+"oshino.yamanashi.jp\0varggat.no\0"
+"gsm.pl\0"
+"gos.pk\0"
+"chungbuk.kr\0"
+"matsuyama.ehime.jp\0kpn\0"
+"salzburg.museum\0"
+"froya.no\0"
+"eun.eg\0exnet.su\0"
+"bir.ru\0"
+"r\xc3\xb8mskog.no\0pomorskie.pl\0"
+"\xeb\x8b\xb7\xec\xbb\xb4\0"
+"fastlylb.net\0"
+"championship.aero\0klepp.no\0"
+"ina.ibaraki.jp\0takamatsu.kagawa.jp\0"
+"wlocl.pl\0"
+"v\xc3\xa5gs\xc3\xb8y.no\0"
+"chambagri.fr\0"
+"pharmaciens.km\0"
+"krd\0lat\0"
+"shinichi.hiroshima.jp\0cc.nh.us\0law\0"
+"wanouchi.gifu.jp\0hanamaki.iwate.jp\0s3-website-us-west-2.amazonaws.com\0"
+"feira.br\0siteleaf.net\0"
+"moss.no\0"
+"hotmail\0"
+"gleeze.com\0"
+"ooguy.com\0"
+"bsb.br\0hita.oita.jp\0in-vpn.de\0"
+"toyo.kochi.jp\0"
+"sk\xc3\xa1nit.no\0apps.fbsbx.com\0"
+"gallery\0"
+"toya.hokkaido.jp\0"
+"traeumtgerade.de\0tuva.su\0"
+"drammen.no\0"
+"im.it\0"
+"omihachiman.shiga.jp\0for-some.biz\0"
+"uk.com\0"
+"pro.na\0"
+"fc.it\0"
+"nasu.tochigi.jp\0pro.mv\0"
+"pb.ao\0bi.it\0wodzislaw.pl\0loginline.services\0ddnsking.com\0"
+"vald-aosta.it\0cri.nz\0"
+"or.at\0toon.ehime.jp\0futuremailing.at\0"
+"vall\xc3\xa9""eaoste.it\0arao.kumamoto.jp\0lds\0map.fastlylb.net\0"
+"k.bg\0or.bi\0"
+"kasahara.gifu.jp\0cartoonart.museum\0"
+"eisenbahn.museum\0"
+"bodo.no\0"
+"ed.ao\0""1.bg\0trentinosudtirol.it\0"
+"hosting-cluster.nl\0"
+"organic\0"
+"yandex\0"
+"gs.tm.no\0"
+"pro.om\0"
+"kobierzyce.pl\0ca.eu.org\0"
+"shunan.yamaguchi.jp\0es.kr\0hasura-app.io\0"
+"or.ci\0"
+"kasama.ibaraki.jp\0"
+"getmyip.com\0"
+"plumbing\0"
+"hidaka.kochi.jp\0br\xc3\xb8nn\xc3\xb8y.no\0\xec\x82\xbc\xec\x84\xb1\0"
+"amagasaki.hyogo.jp\0"
+"or.cr\0ce.leg.br\0"
+"lib.va.us\0mydrobo.com\0"
+"skanland.no\0"
+"misato.akita.jp\0"
+"nombre.bo\0"
+"ed.ci\0hn.cn\0"
+"halden.no\0pro.pr\0"
+"sardegna.it\0oshima.yamaguchi.jp\0myshopblocks.com\0"
+"conf.se\0"
+"sor-aurdal.no\0"
+"tosa.kochi.jp\0"
+"ed.cr\0"
+"dr\xc3\xb8""bak.no\0"
+"\xe5\x98\x89\xe9\x87\x8c\xe5\xa4\xa7\xe9\x85\x92\xe5\xba\x97\0"
+"lib.hi.us\0"
+"webhop.info\0"
+"barsy.info\0"
+"lib.dc.us\0\xe5\x8f\xb0\xe7\x81\xa3\0"
+"andasuolo.no\0"
+"vega.no\0homelinux.net\0"
+"lomza.pl\0"
+"nakama.fukuoka.jp\0langev\xc3\xa5g.no\0"
+"trainer.aero\0"
+"trentinos\xc3\xbc""dtirol.it\0\xe5\x85\xac\xe5\x8f\xb8\0wpcomstaging.com\0"
+"bible.museum\0"
+"environmentalconservation.museum\0"
+"bargains\0"
+"\xe6\xbe\xb3\xe9\x96\x80\0"
+"presse.ci\0fukuyama.hiroshima.jp\0muos\xc3\xa1t.no\0"
+"higashimurayama.tokyo.jp\0hokksund.no\0"
+"j\xc3\xb8lster.no\0"
+"cloudns.eu\0"
+"seaport.museum\0\xc3\xa5krehamn.no\0*.compute-1.amazonaws.com\0"
+"western.museum\0"
+"jor.br\0k12.ok.us\0"
+"sunagawa.hokkaido.jp\0pro.tt\0"
+"mod.gi\0rankoshi.hokkaido.jp\0"
+"cc.mi.us\0familyds.com\0"
+"hobby-site.com\0"
+"or.id\0"
+"obihiro.hokkaido.jp\0minato.osaka.jp\0llc\0"
+"cd.eu.org\0"
+"vv.it\0"
+"\xe7\xbe\xa4\xe9\xa6\xac.jp\0"
+"obanazawa.yamagata.jp\0"
+"z.se\0filegear-gb.me\0in-dsl.org\0"
+"namerikawa.toyama.jp\0"
+"llp\0verisign\0"
+"or.it\0"
+"gushikami.okinawa.jp\0her\xc3\xb8y.m\xc3\xb8re-og-romsdal.no\0pro.vn\0"
+"grimstad.no\0"
+"educational.museum\0"
+"kaneyama.fukushima.jp\0"
+"chikuho.fukuoka.jp\0lolipop.io\0"
+"yoshimi.saitama.jp\0sakata.yamagata.jp\0radio\0from-tn.com\0"
+"or.jp\0"
+"urn.arpa\0house.museum\0"
+"takazaki.miyazaki.jp\0or.ke\0"
+"cloudns.in\0"
+"cruises\0"
+"trentinoa-adige.it\0"
+"bpl.biz\0"
+"ed.jp\0minano.saitama.jp\0"
+"or.kr\0"
+"za.bz\0"
+"\xe0\xb8\x97\xe0\xb8\xab\xe0\xb8\xb2\xe0\xb8\xa3.\xe0\xb9\x84\xe0\xb8\x97\xe0\xb8\xa2\0"
+"ns.ca\0"
+"cloudns.cc\0"
+"fukaya.saitama.jp\0"
+"sakurai.nara.jp\0lol\0"
+"\xe7\xb6\xb2\xe8\xb7\xaf.tw\0"
+"nagaokakyo.kyoto.jp\0"
+"lifeinsurance\0"
+"nishiizu.shizuoka.jp\0"
+"s3.dualstack.ap-northeast-1.amazonaws.com\0"
+"nakano.tokyo.jp\0"
+"\xc3\xa5rdal.no\0"
+"go.ci\0kamo.kyoto.jp\0lib.tn.us\0basketball\0"
+"americanfamily\0dance\0"
+"lpl\0dnsalias.net\0"
+"kashima.ibaraki.jp\0\xe6\xbe\xb3\xe9\x97\xa8\0avianca\0"
+"namie.fukushima.jp\0or.na\0"
+"kwpsp.gov.pl\0\xe5\x85\xac\xe7\x9b\x8a\0\xd0\xbc\xd0\xbe\xd1\x81\xd0\xba\xd0\xb2\xd0\xb0\0"
+"green\0"
+"go.cr\0or.mu\0"
+"higashikawa.hokkaido.jp\0"
+"habmer.no\0"
+"psse.gov.pl\0"
+"conf.lv\0lavangen.no\0"
+"man\0"
+"press.cy\0"
+"quebec.museum\0map\0"
+"esp.br\0roma.museum\0mba\0"
+"ikeda.nagano.jp\0stryn.no\0"
+"military.museum\0"
+"levanger.no\0"
+"\xe7\xb5\x84\xe7\xb9\x94.tw\0accesscam.org\0"
+"yachts\0"
+"historichouses.museum\0"
+"plurinacional.bo\0beskidy.pl\0"
+"valer.ostfold.no\0"
+"dnsup.net\0"
+"pfizer\0"
+"meiwa.mie.jp\0"
+"association.museum\0"
+"kunneppu.hokkaido.jp\0citi\0"
+"nakaniikawa.toyama.jp\0"
+"skanit.no\0boehringer\0georgia.su\0"
+"nisshin.aichi.jp\0"
+"is-a-patsfan.org\0"
+"asahi.yamagata.jp\0"
+"aizubange.fukushima.jp\0project.museum\0"
+"columbus.museum\0tana.no\0"
+"mallorca.museum\0amfam\0"
+"ltd\0"
+"or.pw\0"
+"yashiro.hyogo.jp\0zoology.museum\0kongsvinger.no\0"
+"city\0"
+"is.gov.pl\0democrat\0"
+"misato.miyagi.jp\0market\0"
+"yonago.tottori.jp\0"
+"trentinostirol.it\0"
+"gitlab.io\0"
+"\xed\x95\x9c\xea\xb5\xad\0hermes\0"
+"ed.pw\0med\0issmarterthanyou.com\0"
+"salvador.br\0"
+"miyashiro.saitama.jp\0hokuto.yamanashi.jp\0gliwice.pl\0"
+"nysa.pl\0men\0"
+"kanazawa.ishikawa.jp\0"
+"tsukiyono.gunma.jp\0"
+"utazu.kagawa.jp\0"
+"sos.pl\0"
+"bahn.museum\0"
+"go.id\0k.se\0hospital\0"
+"rm.it\0"
+"assabu.hokkaido.jp\0kakinoki.shimane.jp\0"
+"cc.al.us\0audible\0"
+"rebun.hokkaido.jp\0"
+"modern.museum\0research.museum\0"
+"nic.in\0crimea.ua\0"
+"virgin\0"
+"zp.ua\0"
+"seki.gifu.jp\0nowruz\0"
+"go.it\0"
+"or.th\0"
+"netbank\0"
+"aizumisato.fukushima.jp\0"
+"sigdal.no\0"
+"hanno.saitama.jp\0"
+"t\xc3\xb8nsberg.no\0everbank\0"
+"nishiwaki.hyogo.jp\0"
+"go.jp\0sko.gov.pl\0fishing\0"
+"act.au\0suzuki\0"
+"labor.museum\0"
+"or.ug\0markets\0"
+"go.ke\0"
+"andria-trani-barletta.it\0hirakata.osaka.jp\0"
+"or.tz\0"
+"bern.museum\0"
+"photography.museum\0"
+"shoes\0"
+"kiwa.mie.jp\0ryokami.saitama.jp\0"
+"mil.ac\0trento.it\0moareke.no\0"
+"mil.ae\0or.us\0"
+"vefsn.no\0"
+"go.kr\0*.telebit.xyz\0"
+"tires\0diskstation.org\0"
+"lom.it\0tomigusuku.okinawa.jp\0news\0"
+"nirasaki.yamanashi.jp\0"
+"mil.al\0\xd2\x9b\xd0\xb0\xd0\xb7\0"
+"wuoz.gov.pl\0"
+"taira.toyama.jp\0"
+"mil\0s3-external-1.amazonaws.com\0"
+"mil.ba\0s3-website.ca-central-1.amazonaws.com\0"
+"mil.ar\0"
+"hdfcbank\0"
+"modalen.no\0"
+"noheji.aomori.jp\0isleofman.museum\0"
+"stange.no\0exposed\0mit\0"
+"dolls.museum\0"
+"mil.az\0lombardy.it\0mutsuzawa.chiba.jp\0"
+"next\0"
+"cloudns.us\0"
+"hyogo.jp\0"
+"mil.bo\0"
+"loppa.no\0"
+"mil.br\0ichinomiya.chiba.jp\0"
+"hamura.tokyo.jp\0malbork.pl\0"
+"frei.no\0krasnodar.su\0mangyshlak.su\0go.leg.br\0"
+"usui.fukuoka.jp\0"
+"baseball.museum\0"
+"mil.by\0reise\0"
+"grocery\0"
+"toyako.hokkaido.jp\0"
+"mil.cl\0"
+"mil.cn\0"
+"mil.co\0"
+"trentinosued-tirol.it\0ainan.ehime.jp\0iizuna.nagano.jp\0wsa.gov.pl\0"
+"jeju.kr\0georgia.museum\0"
+"mlb\0"
+"cultural.museum\0karacol.su\0"
+"dnsking.ch\0"
+"higashitsuno.kochi.jp\0"
+"tj\xc3\xb8me.no\0"
+"mil.do\0"
+"viterbo.it\0"
+"obninsk.su\0"
+"mil.ec\0drayddns.com\0"
+"mma\0s3.amazonaws.com\0"
+"mil.eg\0kikuchi.kumamoto.jp\0mihama.wakayama.jp\0skole.museum\0kirkenes.no\0mls\0"
+"kristiansand.no\0\xe5\xa4\xa7\xe6\x8b\xbf\0from-nh.com\0"
+"\xc3\xa5mot.no\0"
+"warszawa.pl\0servehalflife.com\0"
+"sosnowiec.pl\0"
+"obuse.nagano.jp\0vote\0cloudycluster.net\0"
+"kvinnherad.no\0"
+"keymachine.de\0"
+"naruto.tokushima.jp\0"
+"lom.no\0"
+"graphics\0"
+"cc.vi.us\0"
+"barcelona\0"
+"cloudns.club\0"
+"voto\0"
+"go.pw\0"
+"brasilia.me\0"
+"kakogawa.hyogo.jp\0podzone.net\0"
+"takaoka.toyama.jp\0skjak.no\0lacaixa\0"
+"opencraft.hosting\0"
+"mil.ge\0sue.fukuoka.jp\0wellbeingzone.co.uk\0"
+"trentino.it\0jessheim.no\0leczna.pl\0"
+"mil.gh\0matera.it\0gold\0"
+"moe\0"
+"dlugoleka.pl\0golf\0doesntexist.org\0"
+"iz.hr\0toyosato.shiga.jp\0lutsk.ua\0pics\0"
+"contractors\0moi\0ravendb.run\0"
+"is-a-democrat.com\0"
+"nord-fron.no\0\xe6\x96\xb0\xe5\x8a\xa0\xe5\x9d\xa1\0"
+"mom\0now.sh\0"
+"servegame.com\0"
+"mil.gt\0matsue.shimane.jp\0rybnik.pl\0"
+"byen.site\0"
+"\xc3\xb8ygarden.no\0"
+"mt.it\0"
+"mov\0"
+"col.ng\0"
+"mil.hn\0nerima.tokyo.jp\0"
+"mil.id\0shiraoi.hokkaido.jp\0"
+"nab\0kicks-ass.net\0"
+"higashihiroshima.hiroshima.jp\0"
+"go.th\0nic.tj\0mydatto.net\0"
+"mil.in\0heritage.museum\0"
+"gob.ar\0go.tj\0dyndns1.de\0"
+"dynns.com\0"
+"x.bg\0mil.iq\0"
+"starachowice.pl\0"
+"nba\0game-host.org\0"
+"resindevice.io\0"
+"goog\0weber\0"
+"gob.bo\0go.ug\0"
+"nhs.uk\0"
+"mil.jo\0go.tz\0"
+"gotemba.shizuoka.jp\0"
+"rost.no\0tirol\0"
+"abu.yamaguchi.jp\0"
+"!city.yokohama.jp\0komoro.nagano.jp\0"
+"stathelle.no\0java\0"
+"mil.kg\0"
+"shinjo.nara.jp\0express\0msd\0"
+"gob.cl\0"
+"santamaria.br\0"
+"mil.km\0de.us\0"
+"fst.br\0"
+"wassamu.hokkaido.jp\0kamikitayama.nara.jp\0"
+"\xe8\xb0\xb7\xe6\xad\x8c\0"
+"mil.kr\0on-web.fr\0"
+"foz.br\0cahcesuolo.no\0"
+"fujikawaguchiko.yamanashi.jp\0"
+"dd-dns.de\0"
+"ch.eu.org\0"
+"mil.kz\0"
+"greta.fr\0"
+"gob.do\0oygarden.no\0"
+"ulm.museum\0press.se\0"
+"gob.ec\0yorii.saitama.jp\0square7.de\0"
+"s\xc3\xb8r-odal.no\0mtn\0"
+"viking.museum\0"
+"friulivenezia-giulia.it\0taka.hyogo.jp\0browsersafetymark.io\0"
+"homelinux.org\0"
+"mil.lv\0mtr\0"
+"far.br\0mil.mg\0state.museum\0jondal.no\0nec\0"
+"nerdpol.ovh\0"
+"\xe7\xb5\x84\xe7\xb9\x94.hk\0hitachi.ibaraki.jp\0finearts.museum\0nctu.me\0"
+"bibai.hokkaido.jp\0irish\0"
+"gob.es\0shirahama.wakayama.jp\0biev\xc3\xa1t.no\0"
+"atsuma.hokkaido.jp\0cloudns.pw\0"
+"mil.mv\0"
+"mil.ng\0"
+"aya.miyazaki.jp\0net\0"
+"mil.my\0mil.ni\0"
+"coloradoplateau.museum\0mil.mz\0"
+"new\0does-it.net\0"
+"hachinohe.aomori.jp\0mil.no\0church\0"
+"nfl\0"
+"scientist.aero\0"
+"countryestate.museum\0"
+"nic.za\0"
+"biei.hokkaido.jp\0"
+"cn-north-1.eb.amazonaws.com.cn\0"
+"floro.no\0"
+"oizumi.gunma.jp\0yamanouchi.nagano.jp\0health.museum\0net.eu.org\0"
+"mil.nz\0"
+"sera.hiroshima.jp\0"
+"a\xc3\xa9roport.ci\0shiroishi.miyagi.jp\0mango\0from-ut.com\0"
+"vads\xc3\xb8.no\0"
+"urayasu.chiba.jp\0"
+"isen.kagoshima.jp\0"
+"gob.gt\0fuchu.toyama.jp\0\xe0\xb8\x84\xe0\xb8\xad\xe0\xb8\xa1\0s3.ap-south-1.amazonaws.com\0"
+"barueri.br\0murayama.yamagata.jp\0dynamisches-dns.de\0"
+"intelligence.museum\0ngo\0square7.ch\0nh-serv.co.uk\0"
+"hirado.nagasaki.jp\0kikugawa.shizuoka.jp\0"
+"mil.pe\0"
+"mil.ph\0"
+"gob.hn\0"
+"skjerv\xc3\xb8y.no\0mil.pl\0"
+"alto-adige.it\0shiogama.miyagi.jp\0in-dsl.net\0"
+"aizumi.tokushima.jp\0"
+"nhk\0is-very-good.org\0"
+"halsa.no\0yombo.me\0"
+"campobasso.it\0mil.qa\0lenug.su\0"
+"zakopane.pl\0"
+"yurihonjo.akita.jp\0tsukui.kanagawa.jp\0"
+"ryukyu\0"
+"oishida.yamagata.jp\0"
+"skien.no\0"
+"mil.py\0from-ia.com\0"
+"numata.gunma.jp\0"
+"po.it\0grue.no\0"
+"vegarshei.no\0"
+"ping\0potager.org\0"
+"onagawa.miyagi.jp\0sweetpepper.org\0"
+"lu.it\0me.it\0"
+"knightpoint.systems\0"
+"haebaru.okinawa.jp\0pink\0*.webhare.dev\0"
+"carrd.co\0"
+"\xd8\xa7\xd9\x84\xd9\x8a\xd9\x85\xd9\x86\0"
+"press.ma\0"
+"knx-server.net\0"
+"chtr.k12.ma.us\0"
+"bg.it\0"
+"js.org\0"
+"me.ke\0"
+"tateyama.toyama.jp\0"
+"mil.ru\0"
+"frosinone.it\0mil.rw\0"
+"mil.sh\0"
+"trentin-sudtirol.it\0"
+"i.bg\0"
+"doctor\0"
+"tx.us\0"
+"namsskogan.no\0"
+"systems\0"
+"ath.cx\0"
+"mil.st\0"
+"chikugo.fukuoka.jp\0"
+"mt.us\0nd.us\0cloudaccess.host\0"
+"at.eu.org\0"
+"mil.sy\0"
+"tempioolbia.it\0mil.tj\0\xd8\xb9\xd8\xb1\xd8\xa8\0"
+"kaas.gg\0cust.testing.thingdust.io\0"
+"basel.museum\0lodingen.no\0mil.tm\0"
+"brindisi.it\0ws.na\0mil.to\0"
+"aigo\0"
+"mil.tr\0"
+"townnews-staging.com\0"
+"kitagata.saga.jp\0"
+"mil.tw\0"
+"hl.cn\0rishiri.hokkaido.jp\0"
+"aki.kochi.jp\0mil.tz\0"
+"*.on-rancher.cloud\0"
+"noto.ishikawa.jp\0asahi.nagano.jp\0kumagaya.saitama.jp\0"
+"uki.kumamoto.jp\0lund.no\0"
+"muni.il\0"
+"ah.cn\0ris\xc3\xb8r.no\0mil.vc\0frogans\0"
+"gob.mx\0mil.ve\0"
+"nishitosa.kochi.jp\0gob.ni\0brand.se\0"
+"oji.nara.jp\0"
+"uryu.hokkaido.jp\0"
+"coop.ht\0r\xc3\xb8ros.no\0mil.uy\0"
+"stj\xc3\xb8rdal.no\0"
+"lib.de.us\0"
+"galsa.no\0"
+"slg.br\0"
+"\xe0\xa6\xad\xe0\xa6\xbe\xe0\xa6\xb0\xe0\xa6\xa4\0"
+"lego\0"
+"sayo.hyogo.jp\0for-better.biz\0"
+"katori.chiba.jp\0"
+"trentin-s\xc3\xbc""dtirol.it\0"
+"skierva.no\0hosting\0"
+"stalowa-wola.pl\0"
+"lel.br\0settsu.osaka.jp\0anthro.museum\0"
+"tsushima.aichi.jp\0gob.pa\0"
+"ltd.cy\0"
+"r\xc3\xa1hkker\xc3\xa1vju.no\0gob.pe\0"
+"stargard.pl\0"
+"coop.br\0"
+"gob.pk\0\xd8\xa7\xd9\x8a\xd8\xb1\xd8\xa7\xd9\x86\0"
+"kumamoto.kumamoto.jp\0edunet.tn\0"
+"satte.saitama.jp\0now\0"
+"ip6.arpa\0takahama.fukui.jp\0"
+"os.hedmark.no\0"
+"historisches.museum\0"
+"kanra.gunma.jp\0ownprovider.com\0"
+"zhitomir.ua\0press\0fantasyleague.cc\0"
+"rocher\0"
+"schweiz.museum\0mil.za\0togliatti.su\0"
+"org.ac\0"
+"nodebalancer.linode.com\0"
+"org.ae\0nishinomiya.hyogo.jp\0"
+"org.af\0nra\0cloudns.info\0"
+"org.ag\0\xe0\xa4\xad\xe0\xa4\xbe\xe0\xa4\xb0\xe0\xa4\xa4\xe0\xa4\xae\xe0\xa5\x8d\0"
+"gujo.gifu.jp\0"
+"org.ai\0teshikaga.hokkaido.jp\0"
+"hamar.no\0sells-for-less.com\0"
+"org.al\0vt.it\0"
+"org.am\0barefoot\0"
+"mil.zm\0obi\0"
+"brescia.it\0"
+"x.se\0"
+"org.ba\0ltd.gi\0geelvinck.museum\0"
+"org.ar\0org.bb\0name.hr\0bale.museum\0"
+"org.au\0togane.chiba.jp\0"
+"london\0"
+"org.bh\0mil.zw\0"
+"org.bi\0matsusaka.mie.jp\0"
+"org.az\0snasa.no\0vestre-toten.no\0"
+"nrw\0"
+"org.bm\0me.so\0"
+"org.bn\0mitake.gifu.jp\0"
+"org.bo\0seiyo.ehime.jp\0minamiashigara.kanagawa.jp\0"
+"msk.ru\0"
+"shangrila\0"
+"org.br\0"
+"org.bs\0tadaoka.osaka.jp\0lighting\0ltd.hk\0"
+"org.bt\0name.et\0gob.sv\0"
+"catholic\0"
+"org.bw\0yakumo.shimane.jp\0"
+"yusuhara.kochi.jp\0"
+"org.ci\0"
+"org.bz\0culture.museum\0"
+"chonan.chiba.jp\0"
+"ouchi.saga.jp\0"
+"org.cn\0"
+"org.co\0mihara.hiroshima.jp\0"
+"philadelphiaarea.museum\0msk.su\0"
+"fhv.se\0shouji\0"
+"dnsalias.org\0"
+"org.cu\0divttasvuotna.no\0"
+"org.cw\0"
+"me.tz\0"
+"org.cy\0even\xc3\xa1\xc5\xa1\xc5\xa1i.no\0me.uk\0ntt\0"
+"alsace\0"
+"org.dm\0"
+"org.do\0"
+"ostroleka.pl\0"
+"otsu.shiga.jp\0me.us\0"
+"org.ec\0gob.ve\0"
+"ozu.ehime.jp\0maison\0ybo.party\0"
+"org.ee\0"
+"california.museum\0"
+"org.eg\0tuxfamily.org\0"
+"name.cy\0publishproxy.com\0"
+"org.dz\0"
+"off\0"
+"zgorzelec.pl\0"
+"kashihara.nara.jp\0"
+"starostwo.gov.pl\0"
+"svalbard.no\0"
+"org.es\0s3-us-west-2.amazonaws.com\0leadpages.co\0"
+"org.et\0grosseto.it\0"
+"cosenza.it\0\xd9\x87\xd9\x85\xd8\xb1\xd8\xa7\xd9\x87\0"
+"name.eg\0ushiku.ibaraki.jp\0"
+"kozaki.chiba.jp\0lib.mt.us\0lib.nd.us\0"
+"i.ng\0"
+"biratori.hokkaido.jp\0kolobrzeg.pl\0"
+"egyptian.museum\0lib.in.us\0"
+"s3.dualstack.ap-southeast-2.amazonaws.com\0"
+"onomichi.hiroshima.jp\0"
+"dr.na\0"
+"tahara.aichi.jp\0ltd.lk\0wang\0"
+"org.ge\0"
+"org.gg\0williamsburg.museum\0piaget\0"
+"org.gh\0is-a-guru.com\0"
+"org.gi\0"
+"name.az\0"
+"hl.no\0"
+"org.gl\0berkeley.museum\0homeftp.org\0"
+"org.gn\0"
+"org.gp\0"
+"trentinsud-tirol.it\0minobu.yamanashi.jp\0equipment\0"
+"org.gr\0"
+"org.gt\0szkola.pl\0"
+"org.gu\0ah.no\0"
+"takino.hyogo.jp\0"
+"nyc\0"
+"org.gy\0"
+"org.hk\0"
+"takahashi.okayama.jp\0i.ph\0*.platformsh.site\0"
+"org.hn\0"
+"fla.no\0ltd.ng\0"
+"valleedaoste.it\0"
+"mizumaki.fukuoka.jp\0ogaki.gifu.jp\0\xc3\xa5lesund.no\0*.dapps.earth\0"
+"org.ht\0"
+"org.hu\0tagajo.miyagi.jp\0science\0"
+"hakui.ishikawa.jp\0"
+"yaese.okinawa.jp\0lincoln.museum\0"
+"tochigi.jp\0ask\xc3\xb8y.no\0"
+"sandcats.io\0"
+"k12.tx.us\0"
+"org.il\0"
+"org.im\0"
+"org.in\0pointto.us\0"
+"org.iq\0busan.kr\0"
+"org.ir\0podzone.org\0"
+"pa.gov.br\0org.is\0barsy.net\0"
+"org.je\0\xd9\x85\xd9\x88\xd8\xb1\xd9\x8a\xd8\xaa\xd8\xa7\xd9\x86\xd9\x8a\xd8\xa7\0"
+"kawamata.fukushima.jp\0"
+"cc.or.us\0"
+"n\xc3\xa5\xc3\xa5mesjevuemie.no\0"
+"kita.tokyo.jp\0"
+"higashikurume.tokyo.jp\0"
+"space.museum\0bloomberg\0"
+"flynnhub.com\0"
+"org.jo\0exhibition.museum\0fusa.no\0"
+"ftpaccess.cc\0"
+"botanicalgarden.museum\0"
+"shingu.hyogo.jp\0eu-central-1.elasticbeanstalk.com\0app.lmpm.com\0"
+"ve.it\0"
+"doshi.yamanashi.jp\0antiques.museum\0"
+"org.kg\0"
+"org.ki\0i.se\0"
+"kimobetsu.hokkaido.jp\0"
+"org.km\0"
+"org.kn\0"
+"ohkura.yamagata.jp\0us-west-2.elasticbeanstalk.com\0"
+"org.kp\0target\0"
+"org.la\0notteroy.no\0"
+"org.lb\0"
+"pb.gov.br\0org.lc\0sakura\0"
+"commbank\0"
+"kisofukushima.nagano.jp\0org.kw\0hair\0"
+"org.ky\0"
+"hamada.shimane.jp\0org.kz\0kicks-ass.org\0"
+"org.lk\0"
+"tv.bb\0gdansk.pl\0"
+"sec.ps\0"
+"cs.it\0"
+"sn\xc3\xa5""ase.no\0"
+"org.ma\0"
+"org.lr\0brussels\0"
+"org.ls\0westfalen.museum\0sund.no\0"
+"org.me\0dyndns-pics.com\0"
+"org.lv\0"
+"tone.ibaraki.jp\0org.mg\0"
+"agano.niigata.jp\0kv.ua\0"
+"tv.bo\0nishi.osaka.jp\0moroyama.saitama.jp\0org.ly\0odesa.ua\0au.eu.org\0be.eu.org\0"
+"one\0\xe5\xa4\xa9\xe4\xb8\xbb\xe6\x95\x99\0"
+"org.mk\0vt.us\0"
+"tv.br\0org.ml\0ong\0"
+"\xe4\xba\xac\xe9\x83\xbd.jp\0castle.museum\0computerhistory.museum\0"
+"org.mn\0"
+"org.mo\0bielawa.pl\0boutique\0servesarcasm.com\0"
+"kumano.mie.jp\0shacknet.nu\0"
+"matsuno.ehime.jp\0org.na\0onl\0"
+"tsubetsu.hokkaido.jp\0kg.kr\0"
+"org.ms\0dr.tr\0"
+"yukuhashi.fukuoka.jp\0org.mt\0settlement.museum\0"
+"nb.ca\0org.mu\0is-an-actress.com\0"
+"goto.nagasaki.jp\0org.mv\0"
+"kagoshima.jp\0org.mw\0org.ng\0"
+"org.mx\0heroy.nordland.no\0lancome\0soccer\0"
+"org.my\0org.ni\0"
+"org.mz\0"
+"itau\0"
+"valleeaoste.it\0iveland.no\0"
+"rmit\0"
+"chicago.museum\0"
+"pvt.ge\0"
+"hongo.hiroshima.jp\0org.nr\0"
+"ooo\0"
+"hof.no\0"
+"okuma.fukushima.jp\0farmers.museum\0"
+"stuttgart.museum\0"
+"ltd.ua\0"
+"org.nz\0pramerica\0"
+"rel.ht\0"
+"org.om\0coop.rw\0virtueeldomein.nl\0"
+"academia.bo\0\xc3\xa5l.no\0"
+"kamogawa.chiba.jp\0b.ssl.fastly.net\0"
+"org.pa\0lib.me.us\0"
+"shikatsu.aichi.jp\0nordre-land.no\0ltd.uk\0uconnect\0"
+"org.pe\0"
+"bari.it\0org.pf\0"
+"fujimi.saitama.jp\0org.ph\0"
+"q-a.eu.org\0"
+"org.pk\0glade\0"
+"minamiechizen.fukui.jp\0org.pl\0"
+"tabayama.yamanashi.jp\0org.pn\0xihuan\0"
+"lib.as.us\0"
+"theater.museum\0narvik.no\0org.qa\0"
+"org.pr\0"
+"kurobe.toyama.jp\0juedisches.museum\0gamvik.no\0org.ps\0\xe5\x95\x86\xe5\xba\x97\0cdn77-ssl.net\0"
+"kagamino.okayama.jp\0org.pt\0"
+"anan.tokushima.jp\0"
+"alt.za\0"
+"yawata.kyoto.jp\0"
+"org.py\0bg.eu.org\0"
+"maringa.br\0coop.tt\0apartments\0vapor.cloud\0"
+"aoste.it\0science.museum\0org\0"
+"bukhara.su\0"
+"pay\0"
+"taishi.osaka.jp\0"
+"wielun.pl\0health\0"
+"basilicata.it\0higashiizumo.shimane.jp\0narusawa.yamanashi.jp\0"
+"lebtimnetz.de\0"
+"naie.hokkaido.jp\0"
+"coop.mv\0"
+"coop.mw\0"
+"org.ro\0k12.wa.us\0"
+"oslo.no\0"
+"medicina.bo\0tysv\xc3\xa6r.no\0org.sa\0frontier\0"
+"org.sb\0"
+"org.rs\0org.sc\0"
+"itayanagi.aomori.jp\0wakasa.tottori.jp\0org.sd\0"
+"org.se\0club\0org.ru\0"
+"org.rw\0org.sg\0bloxcms.com\0"
+"org.sh\0"
+"\xe6\x94\xbf\xe5\xba\x9c.\xe9\xa6\x99\xe6\xb8\xaf\0"
+"org.sl\0tkmaxx\0"
+"eu.org\0barsy.club\0"
+"org.sn\0name.vn\0"
+"org.so\0"
+"altoadige.it\0dyr\xc3\xb8y.no\0"
+"corporation.museum\0org.ss\0"
+"oyabe.toyama.jp\0org.st\0dnshome.de\0"
+"shizuoka.jp\0"
+"takinoue.hokkaido.jp\0org.sv\0googleapis.com\0"
+"tv.im\0nico\0"
+"on-the-web.tv\0"
+"org.sy\0ott\0"
+"org.sz\0org.tj\0stcgroup\0"
+"amica\0"
+"naoshima.kagawa.jp\0org.tm\0"
+"tv.it\0org.tn\0ap-northeast-1.elasticbeanstalk.com\0"
+"gaivuotna.no\0org.to\0"
+"poa.br\0cc.de.us\0"
+"org.ua\0"
+"org.tr\0"
+"emergency.aero\0"
+"morena.br\0funahashi.toyama.jp\0org.tt\0"
+"\xd8\xaa\xd9\x88\xd9\x86\xd8\xb3\0"
+"oristano.it\0"
+"eigersund.no\0org.tw\0org.ug\0"
+"aichi.jp\0cuisinella\0pet\0"
+"name.tj\0"
+"shonai.fukuoka.jp\0org.uk\0blogsite.org\0"
+"lease\0ovh\0"
+"gangaviika.no\0coop.py\0"
+"foundation.museum\0tromso.no\0telebit.io\0"
+"semboku.akita.jp\0tree.museum\0"
+"name.tr\0"
+"org.vc\0"
+"name.tt\0ddnsgeek.com\0"
+"hachirogata.akita.jp\0tcm.museum\0org.ve\0"
+"kamaishi.iwate.jp\0"
+"bt.it\0"
+"karaganda.su\0"
+"shikaoi.hokkaido.jp\0org.uy\0org.vi\0town\0"
+"okayama.okayama.jp\0org.uz\0"
+"iruma.saitama.jp\0"
+"org.vn\0barsy.pro\0"
+"v.bg\0"
+"codespot.com\0git-pages.rit.edu\0"
+"gjerstad.no\0rel.pl\0"
+"kiyama.saga.jp\0org.vu\0"
+"chuo.chiba.jp\0phd\0hr.eu.org\0"
+"asuke.aichi.jp\0communication.museum\0"
+"nagi.okayama.jp\0athleta\0dnsiskinky.com\0"
+"coop.km\0org.ws\0"
+"podlasie.pl\0of.london\0"
+"club.aero\0uto.kumamoto.jp\0yoshida.saitama.jp\0"
+"otobe.hokkaido.jp\0"
+"shima.mie.jp\0haus\0"
+"pid\0"
+"ichihara.chiba.jp\0tv.na\0lib.vt.us\0"
+"leirvik.no\0"
+"notodden.no\0dc.us\0"
+"toys\0"
+"kouyama.kagoshima.jp\0"
+"vik.no\0akdn\0is-a-designer.com\0"
+"barsy.pub\0"
+"kitashiobara.fukushima.jp\0"
+"pin\0search\0"
+"aeroclub.aero\0"
+"horokanai.hokkaido.jp\0"
+"port.fr\0"
+"miyawaka.fukuoka.jp\0yatsushiro.kumamoto.jp\0yamatokoriyama.nara.jp\0koganei.tokyo.jp\0"
+"lgbt\0"
+"sakuragawa.ibaraki.jp\0usercontent.jp\0"
+"lib.il.us\0"
+"name.qa\0org.za\0"
+"luster.no\0name.pr\0"
+"pi.gov.br\0mr.no\0"
+"chernigov.ua\0"
+"sells-it.net\0"
+"from-in.com\0"
+"fujisato.akita.jp\0"
+"ichinohe.iwate.jp\0"
+"org.zm\0"
+"davvesiida.no\0"
+"horten.no\0kviteseid.no\0"
+"broker.aero\0saitama.jp\0kitanakagusuku.okinawa.jp\0name.na\0\xeb\x8b\xb7\xeb\x84\xb7\0"
+"troandin.no\0"
+"bialowieza.pl\0"
+"name.mv\0"
+"name.ng\0org.zw\0"
+"koka.shiga.jp\0"
+"name.my\0"
+"tagawa.fukuoka.jp\0"
+"nike\0"
+"yamanashi.jp\0"
+"serveftp.net\0"
+"riopreto.br\0"
+"tochigi.tochigi.jp\0oregontrail.museum\0"
+"intl.tn\0"
+"walbrzych.pl\0"
+"noshiro.akita.jp\0"
+"prvcy.page\0"
+"reklam.hu\0cc.tx.us\0"
+"play\0"
+"\xd0\xbf\xd1\x80.\xd1\x81\xd1\x80\xd0\xb1\0"
+"abbott\0pnc\0"
+"nishigo.fukushima.jp\0"
+"cc.mt.us\0cc.nd.us\0"
+"tosashimizu.kochi.jp\0tv.sd\0"
+"saigawa.fukuoka.jp\0detroit.museum\0"
+"workisboring.com\0"
+"anjo.aichi.jp\0"
+"\xe0\xb0\xad\xe0\xb0\xbe\xe0\xb0\xb0\xe0\xb0\xa4\xe0\xb1\x8d\0"
+"sauherad.no\0"
+"lindesnes.no\0"
+"dynalias.com\0""4lima.de\0"
+"shimamaki.hokkaido.jp\0"
+"ibigawa.gifu.jp\0"
+"aisho.shiga.jp\0name.mk\0"
+"botanical.museum\0"
+"garden.museum\0"
+"nes.akershus.no\0"
+"mc.it\0"
+"homebuilt.aero\0freesite.host\0"
+"yamatotakada.nara.jp\0"
+"nagatoro.saitama.jp\0"
+"workshop.museum\0radoy.no\0"
+"time.museum\0"
+"\xe7\xbb\x84\xe7\xb9\x94.hk\0"
+"tv.tr\0"
+"verbania.it\0servegame.org\0"
+"yoita.niigata.jp\0tamayu.shimane.jp\0"
+"name.jo\0"
+"dynserv.org\0"
+"net.ac\0"
+"hamburg.museum\0"
+"net.ae\0"
+"net.af\0tv.tz\0"
+"net.ag\0campidanomedio.it\0"
+"free.hr\0""4lima.at\0"
+"net.ai\0"
+"sakahogi.gifu.jp\0glass\0"
+"net.al\0g.bg\0"
+"net.am\0salem.museum\0"
+"malopolska.pl\0"
+"net.ba\0is-a-conservative.com\0"
+"net.ar\0net.bb\0"
+"on.ca\0kashiwazaki.niigata.jp\0"
+"net.au\0"
+"net.bh\0"
+"net.az\0sydney.museum\0"
+"sh.cn\0""4lima.ch\0"
+"net.bm\0"
+"net.bn\0"
+"net.bo\0"
+"place\0"
+"net.br\0toyonaka.osaka.jp\0members.linode.com\0"
+"net.bs\0"
+"net.bt\0"
+"pe.gov.br\0otaki.chiba.jp\0"
+"pro\0likes-pie.com\0"
+"hichiso.gifu.jp\0es.leg.br\0"
+"industries\0jeep\0"
+"net.ci\0toyokawa.aichi.jp\0"
+"net.bz\0hidaka.saitama.jp\0"
+"gz.cn\0"
+"events\0pru\0"
+"net.cm\0"
+"net.cn\0dray-dns.de\0"
+"net.co\0osaka.jp\0"
+"chesapeakebay.museum\0consulado.st\0lib.ny.us\0"
+"wolomin.pl\0"
+"net.cu\0daito.osaka.jp\0"
+"net.cw\0tsuga.tochigi.jp\0"
+"net.cy\0"
+"hk.org\0"
+"hinode.tokyo.jp\0kawanishi.yamagata.jp\0homeftp.net\0"
+"net.dm\0s3-website.us-east-2.amazonaws.com\0*.hosting.myjino.ru\0"
+"net.do\0service.gov.uk\0"
+"nichinan.tottori.jp\0naamesjevuemie.no\0samsclub\0"
+"kaminoyama.yamagata.jp\0on.fashion\0"
+"minami-alps.yamanashi.jp\0sellsyourhome.org\0"
+"net.ec\0outsystemscloud.com\0"
+"akiruno.tokyo.jp\0"
+"net.eg\0"
+"pub\0"
+"net.dz\0trycloudflare.com\0"
+"ladbrokes\0"
+"pixolino.com\0"
+"austin.museum\0"
+"net.et\0"
+"daigo.ibaraki.jp\0"
+"64-b.it\0"
+"mydobiss.com\0"
+"hashima.gifu.jp\0homesecuritymac.com\0"
+"net.ge\0"
+"net.gg\0"
+"shinyoshitomi.fukuoka.jp\0k12.ri.us\0dst.mi.us\0locker\0bryansk.su\0barsy.org\0"
+"miyama.mie.jp\0"
+"pwc\0"
+"norddal.no\0"
+"net.gl\0"
+"k12.mo.us\0lcube-server.de\0"
+"net.gn\0"
+"qld.gov.au\0"
+"net.gp\0gildesk\xc3\xa5l.no\0"
+"council.aero\0mo-siemens.io\0"
+"net.gr\0"
+"extraspace\0"
+"net.gt\0"
+"net.gu\0cc.me.us\0"
+"budejju.no\0"
+"kannami.shizuoka.jp\0"
+"net.gy\0ascolipiceno.it\0"
+"net.hk\0"
+"shingu.fukuoka.jp\0k12.ca.us\0*.compute.amazonaws.com.cn\0"
+"vr.it\0"
+"osasco.br\0net.hn\0"
+"pa.gov.pl\0blackfriday\0"
+"forum.hu\0hiji.oita.jp\0presidio.museum\0"
+"net.ht\0net.id\0"
+"\xda\x80\xd8\xa7\xd8\xb1\xd8\xaa\0"
+"kasumigaura.ibaraki.jp\0"
+"ookuwa.nagano.jp\0"
+"synology.me\0"
+"net.il\0mobara.chiba.jp\0koshigaya.saitama.jp\0"
+"net.im\0"
+"net.in\0""12hp.de\0"
+"net.iq\0"
+"net.ir\0delaware.museum\0myvnc.com\0"
+"net.is\0"
+"net.je\0"
+"career\0"
+"asakuchi.okayama.jp\0"
+"miho.ibaraki.jp\0"
+"ogawa.ibaraki.jp\0storj.farm\0"
+"vix.br\0"
+"ashoro.hokkaido.jp\0"
+"shingo.aomori.jp\0fitness\0"
+"net.jo\0"
+"unnan.shimane.jp\0"
+"hida.gifu.jp\0"
+"net.kg\0"
+"trentinosuedtirol.it\0net.ki\0"
+"upow.gov.pl\0"
+"taifun-dns.de\0"
+"yamakita.kanagawa.jp\0pubtls.org\0"
+"12hp.at\0"
+"net.kn\0"
+"media.hu\0gripe\0"
+"shinanomachi.nagano.jp\0net.la\0"
+"net.lb\0"
+"tra.kp\0net.lc\0grajewo.pl\0"
+"amakusa.kumamoto.jp\0"
+"net.kw\0"
+"satosho.okayama.jp\0net.ky\0"
+"net.kz\0metlife\0"
+"net.lk\0il.eu.org\0basicserver.io\0"
+"bedzin.pl\0"
+"firm.ht\0valley.museum\0"
+"gs.hl.no\0"
+"aridagawa.wakayama.jp\0"
+"hiroo.hokkaido.jp\0karumai.iwate.jp\0net.ma\0""12hp.ch\0"
+"net.lr\0"
+"net.ls\0reviews\0"
+"pr.gov.br\0net.me\0"
+"net.lv\0"
+"firm.in\0"
+"cq.cn\0net.ly\0gs.ah.no\0"
+"net.mk\0"
+"net.ml\0"
+"lahppi.no\0"
+"agro.bo\0"
+"net.mo\0"
+"miyakonojo.miyazaki.jp\0"
+"net.ms\0"
+"net.mt\0"
+"kozagawa.wakayama.jp\0net.mu\0clinic\0"
+"net.mv\0net.nf\0orange\0"
+"net.mw\0net.ng\0www.ro\0"
+"morioka.iwate.jp\0net.mx\0"
+"net.my\0net.ni\0nikon\0"
+"net.mz\0office-on-the.net\0"
+"r\xc3\xb8yken.no\0hu.eu.org\0ie.eu.org\0"
+"coupon\0moonscale.net\0"
+"kyiv.ua\0"
+"net.nr\0"
+"!city.sendai.jp\0"
+"lyngdal.no\0"
+"nes.buskerud.no\0"
+"tsu.mie.jp\0"
+"firm.co\0"
+"net.nz\0"
+"kanoya.kagoshima.jp\0"
+"naval.museum\0net.om\0"
+"togo.aichi.jp\0net.pa\0"
+"civilaviation.aero\0"
+"utazas.hu\0"
+"net.pe\0firm.dk\0"
+"dielddanuorri.no\0"
+"blogspot.com\0"
+"net.ph\0"
+"net.pk\0fage\0"
+"jus.br\0net.pl\0africa\0dyn.home-webserver.de\0"
+"likescandy.com\0"
+"net.pn\0dyndns.tv\0"
+"cc.vt.us\0"
+"haboro.hokkaido.jp\0saintlouis.museum\0net.qa\0bostik\0"
+"uri.arpa\0net.pr\0"
+"kawanishi.hyogo.jp\0szczecin.pl\0net.ps\0"
+"hvaler.no\0net.pt\0"
+"bo.nordland.no\0gov.nc.tr\0"
+"k12.nj.us\0"
+"joso.ibaraki.jp\0net.py\0"
+"gorge.museum\0"
+"lesja.no\0"
+"plus\0"
+"children.museum\0"
+"caravan\0"
+"yamada.toyama.jp\0"
+"vc.it\0lea\xc5\x8bgaviika.no\0"
+"ebina.kanagawa.jp\0bus.museum\0"
+"itakura.gunma.jp\0mesaverde.museum\0"
+"suedtirol.it\0"
+"g.se\0"
+"ri.it\0education.museum\0"
+"ally\0"
+"emilia-romagna.it\0"
+"no.it\0babia-gora.pl\0"
+"net.sa\0static.land\0"
+"fudai.iwate.jp\0net.sb\0fail\0"
+"net.sc\0secure\0"
+"net.sd\0s3-website-sa-east-1.amazonaws.com\0"
+"net.ru\0"
+"komaki.aichi.jp\0media.pl\0net.rw\0net.sg\0"
+"net.sh\0"
+"gen.in\0kunstsammlung.museum\0"
+"dyndns.ws\0"
+"fussa.tokyo.jp\0net.sl\0"
+"yaita.tochigi.jp\0net.so\0"
+"chernovtsy.ua\0"
+"tawaramoto.nara.jp\0"
+"net.ss\0taipei\0"
+"net.st\0serveblog.net\0api.stdlib.com\0"
+"crotone.it\0"
+"net.th\0physio\0"
+"net.sy\0"
+"trentinoaltoadige.it\0eidsvoll.no\0net.tj\0monash\0"
+"sorum.no\0net.tm\0"
+"net.tn\0"
+"net.to\0"
+"net.ua\0chernihiv.ua\0"
+"net.tr\0"
+"dp.ua\0"
+"net.tt\0"
+"mp.br\0bomlo.no\0net.tw\0my-router.de\0"
+"\xc3\xa5""fjord.no\0duckdns.org\0"
+"room\0"
+"machida.tokyo.jp\0"
+"net.uk\0red\0theater\0"
+"furano.hokkaido.jp\0"
+"design.aero\0silk.museum\0"
+"hikari.yamaguchi.jp\0"
+"healthcare\0"
+"us.na\0lib.wy.us\0net.vc\0dyndns-wiki.com\0"
+"szczytno.pl\0krakow.pl\0"
+"net.ve\0ren\0"
+"erotika.hu\0"
+"shintomi.miyazaki.jp\0"
+"chuo.tokyo.jp\0"
+"net.uy\0net.vi\0"
+"kagami.kochi.jp\0net.uz\0qvc\0"
+"pyatigorsk.ru\0"
+"net.vn\0"
+"wildlife.museum\0"
+"augustow.pl\0"
+"tozawa.yamagata.jp\0boston\0sa.com\0"
+"net.vu\0linkyard.cloud\0"
+"watarai.mie.jp\0teaches-yoga.com\0"
+"lib.ia.us\0"
+"farm.museum\0newmexico.museum\0"
+"odawara.kanagawa.jp\0"
+"takasu.hokkaido.jp\0nakatane.kagoshima.jp\0"
+"mat.br\0"
+"lpusercontent.com\0"
+"stavanger.no\0"
+"bjarkoy.no\0"
+"saga.jp\0"
+"toyota.yamaguchi.jp\0gen.ng\0"
+"wif.gov.pl\0net.ws\0"
+"gen.mi.us\0"
+"belau.pw\0fans\0"
+"gr.eu.org\0"
+"lecce.it\0"
+"from-nm.com\0"
+"gen.nz\0"
+"shimoji.okinawa.jp\0"
+"passagens\0"
+"hdfc\0"
+"matsumae.hokkaido.jp\0"
+"\xe3\x83\x9d\xe3\x82\xa4\xe3\x83\xb3\xe3\x83\x88\0here-for-more.info\0"
+"miasta.pl\0"
+"firm.ve\0"
+"fukusaki.hyogo.jp\0"
+"net.za\0"
+"ontario.museum\0ril\0"
+"avocat.fr\0"
+"szex.hu\0"
+"rio\0"
+"rip\0"
+"sandiego.museum\0"
+"assassination.museum\0"
+"b\xc3\xa5""d\xc3\xa5""ddj\xc3\xa5.no\0"
+"net.zm\0"
+"k12.la.us\0"
+"in-brb.de\0n4t.co\0"
+"autos\0prime\0"
+"cuiaba.br\0works\0"
+"ebetsu.hokkaido.jp\0minami.tokushima.jp\0world\0"
+"tt.im\0"
+"amex\0"
+"tsurugashima.saitama.jp\0"
+"ud.it\0"
+"cc.dc.us\0"
+"store.nf\0"
+"farm\0"
+"pz.it\0winners\0"
+"iwama.ibaraki.jp\0lidl\0"
+"azimuth.network\0"
+"\xd8\xa8\xd8\xa7\xd8\xb1\xd8\xaa\0khakassia.su\0"
+"hammarfeasta.no\0po.gov.pl\0"
+"kouhoku.saga.jp\0"
+"u2.xnbay.com\0"
+"\xe0\xaa\xad\xe0\xaa\xbe\xe0\xaa\xb0\xe0\xaa\xa4\0"
+"nishio.aichi.jp\0kitchen\0"
+"br.it\0cb.it\0"
+"tos.it\0"
+"fast\0"
+"ng.ink\0"
+"akagi.shimane.jp\0edugit.org\0"
+"urbino-pesaro.it\0"
+"fukuoka.jp\0life\0homelink.one\0"
+"pri.ee\0"
+"dyndns-web.com\0"
+"t.bg\0empresa.bo\0"
+"isa-hockeynut.com\0"
+"monza.it\0"
+"friulivgiulia.it\0"
+"repbody.aero\0firm.ro\0"
+"ri.us\0"
+"bahccavuotna.no\0"
+"soo.kagoshima.jp\0gen.tr\0"
+"namdalseid.no\0durban\0kurgan.su\0"
+"is-a-geek.com\0"
+"cool\0"
+"coop\0"
+"\xe0\xa6\xad\xe0\xa6\xbe\xe0\xa7\xb0\xe0\xa6\xa4\0"
+"gs.mr.no\0aktyubinsk.su\0"
+"zushi.kanagawa.jp\0"
+"okuizumo.shimane.jp\0"
+"karasjok.no\0"
+"bc.ca\0"
+"jpn.com\0"
+"emerck\0"
+"\xe0\xb6\xbd\xe0\xb6\x82\xe0\xb6\x9a\xe0\xb7\x8f\0"
+"nose.osaka.jp\0"
+"roan.no\0"
+"hashikami.aomori.jp\0"
+"homeoffice.gov.uk\0"
+"ketrzyn.pl\0"
+"walter\0"
+"olbiatempio.it\0"
+"\xd8\xa8\xd9\x8a\xd8\xaa\xd9\x83\0"
+"usa.oita.jp\0serveftp.org\0"
+"caxias.br\0taxi.br\0imari.saga.jp\0"
+"paragliding.aero\0"
+"firm.nf\0"
+"firm.ng\0"
+"firestone\0"
+"\xe6\x94\xbf\xe5\x8a\xa1\0"
+"sap\0"
+"yamagata.gifu.jp\0skj\xc3\xa5k.no\0sas\0"
+"like\0"
+"sbi\0"
+"nakanoto.ishikawa.jp\0viajes\0"
+"gyeonggi.kr\0"
+"amot.no\0solar\0co.events\0"
+"theworkpc.com\0"
+"higashisumiyoshi.osaka.jp\0smile\0"
+"sca\0"
+"shimogo.fukushima.jp\0cpa.pro\0scb\0"
+"sbs\0"
+"agro.pl\0"
+"qsl.br\0"
+"kurogi.fukuoka.jp\0"
+"shopitsite.com\0"
+"weir\0"
+"environment.museum\0store.ve\0"
+"servequake.com\0"
+"fortworth.museum\0"
+"alesund.no\0"
+"trading\0pony.club\0"
+"miyoshi.tokushima.jp\0principe.st\0from-me.org\0"
+"is-a-musician.com\0"
+"alvdal.no\0"
+"\xe7\xbd\x91\xe7\xb5\xa1.hk\0matsushige.tokushima.jp\0"
+"te.it\0limo\0"
+"cooperativa.bo\0"
+"kochi.kochi.jp\0b\xc3\xb8.telemark.no\0"
+"ravendb.me\0"
+"paleo.museum\0mutual\0"
+"kommune.no\0"
+"johana.toyama.jp\0"
+"jur.pro\0"
+"novara.it\0link\0"
+"run\0""1337.pictures\0"
+"forl\xc3\xac-cesena.it\0sokndal.no\0"
+"fujixerox\0"
+"toyohashi.aichi.jp\0"
+"ses\0"
+"takayama.gifu.jp\0"
+"sew\0"
+"sex\0"
+"okutama.tokyo.jp\0"
+"omaha.museum\0"
+"kodaira.tokyo.jp\0kinder\0sfr\0"
+"e.bg\0"
+"rwe\0"
+"kasuga.hyogo.jp\0erni\0"
+"zj.cn\0cheltenham.museum\0"
+"gyeongbuk.kr\0"
+"polkowice.pl\0"
+"dyndns.biz\0"
+"mill.museum\0ivano-frankivsk.ua\0network\0"
+"kawatana.nagasaki.jp\0"
+"store.ro\0nyc.mn\0"
+"kvitsoy.no\0"
+"omachi.nagano.jp\0isa-geek.org\0"
+"makinohara.shizuoka.jp\0hamaroy.no\0"
+"tecnologia.bo\0giessen.museum\0"
+"izunokuni.shizuoka.jp\0fl.us\0"
+"pilot.aero\0"
+"stada\0"
+"hyundai\0"
+"gx.cn\0is-a-geek.org\0"
+"shiranuka.hokkaido.jp\0vestby.no\0"
+"mito.ibaraki.jp\0theatre\0app.render.com\0"
+"aquila.it\0lib.ok.us\0"
+"store.st\0ens.tn\0spdns.eu\0"
+"missile.museum\0"
+"barletta-trani-andria.it\0"
+"jobs.tt\0\xe6\x9b\xb8\xe7\xb1\x8d\0"
+"misawa.aomori.jp\0"
+"ibaraki.ibaraki.jp\0oi.kanagawa.jp\0"
+"eti.br\0oirase.aomori.jp\0paroch.k12.ma.us\0guge\0"
+"shirosato.ibaraki.jp\0"
+"pharmacien.fr\0"
+"blogspot.vn\0"
+"furubira.hokkaido.jp\0"
+"santabarbara.museum\0"
+"mielec.pl\0"
+"aaa.pro\0"
+"jewelry\0"
+"ski\0"
+"\xe6\x9d\xb1\xe4\xba\xac.jp\0avocat.pro\0safe\0"
+"travelers\0"
+"kamiichi.toyama.jp\0"
+"info.gu\0"
+"kitahiroshima.hokkaido.jp\0"
+"hakodate.hokkaido.jp\0"
+"mw.gov.pl\0nadex\0dnsupdater.de\0"
+"sky\0"
+"kiyose.tokyo.jp\0"
+"seranishi.hiroshima.jp\0freemasonry.museum\0"
+"info.ht\0university.museum\0"
+"info.hu\0griw.gov.pl\0\xe0\xb8\xa8\xe0\xb8\xb6\xe0\xb8\x81\xe0\xb8\xa9\xe0\xb8\xb2.\xe0\xb9\x84\xe0\xb8\x97\xe0\xb8\xa2\0"
+"works.aero\0"
+"lib.ee\0k12.ne.us\0kindle\0"
+"stor-elvdal.no\0live\0"
+"konyvelo.hu\0drobak.no\0beep.pl\0"
+"istanbul\0"
+"sanfrancisco.museum\0"
+"kuji.iwate.jp\0hayashima.okayama.jp\0"
+"miura.kanagawa.jp\0"
+"suzuka.mie.jp\0mine.nu\0"
+"info.et\0koga.fukuoka.jp\0singles\0"
+"mattel\0vistaprint\0"
+"blogspot.re\0"
+"mizusawa.iwate.jp\0"
+"vda.it\0bnr.la\0"
+"t.se\0"
+"alessandria.it\0"
+"hotels\0blogspot.ro\0"
+"ms.gov.br\0"
+"gamo.shiga.jp\0onrender.com\0"
+"minamiawaji.hyogo.jp\0*.triton.zone\0pgfog.com\0"
+"sor-varanger.no\0is-an-entertainer.com\0blogspot.rs\0"
+"maizuru.kyoto.jp\0blogspot.ru\0blogspot.se\0"
+"kr.it\0ovre-eiker.no\0"
+"blogspot.sg\0"
+"trentino-sud-tirol.it\0netflix\0"
+"blogspot.si\0"
+"blogspot.sk\0spdns.de\0"
+"*.transurl.be\0"
+"\xe5\xa5\x88\xe8\x89\xaf.jp\0yaotsu.gifu.jp\0flatanger.no\0schmidt\0"
+"skiptvet.no\0blogspot.sn\0"
+"te.ua\0"
+"shell.museum\0"
+"help\0kaluga.su\0"
+"palermo.it\0portland.museum\0spa\0"
+"hirogawa.wakayama.jp\0blogspot.td\0"
+"hiroshima.jp\0info.cx\0"
+"yk.ca\0web.app\0"
+"co.ae\0"
+"soy\0"
+"co.ag\0aver\xc3\xb8y.no\0"
+"higashiizu.shizuoka.jp\0"
+"download\0"
+"urawa.saitama.jp\0doomdns.org\0krasnik.pl\0"
+"mt.gov.br\0info.ec\0"
+"\xe7\xb6\xb2\xe7\xb5\xa1.cn\0ad.jp\0"
+"co.am\0"
+"co.ao\0tab\0"
+"adm.br\0freedesktop.org\0"
+"chigasaki.kanagawa.jp\0cieszyn.pl\0"
+"co.bb\0blogspot.tw\0blogspot.ug\0"
+"co.at\0"
+"ma.us\0sale\0"
+"co.bi\0sekigahara.gifu.jp\0"
+"info.bb\0fukushima.fukushima.jp\0"
+"higashiyodogawa.osaka.jp\0"
+"info.at\0"
+"info.au\0blogspot.mr\0"
+"joyo.kyoto.jp\0co.bn\0"
+"nm.cn\0os.hordaland.no\0alwaysdata.net\0"
+"temasek\0"
+"nrw.museum\0sande.m\xc3\xb8re-og-romsdal.no\0co.ca\0"
+"info.az\0moriyoshi.akita.jp\0"
+"togitsu.nagasaki.jp\0blogspot.mx\0"
+"js.cn\0blogspot.my\0"
+"nagoya\0tax\0is-a-celticsfan.org\0"
+"as.us\0"
+"info.bo\0co.bw\0blogspot.nl\0"
+"webhop.biz\0"
+"co.ci\0belluno.it\0shiiba.miyazaki.jp\0srl\0"
+"kawajima.saitama.jp\0blogspot.no\0"
+"co.cl\0agrar.hu\0naturalhistory.museum\0"
+"co.cm\0assn.lk\0"
+"lib.nh.us\0\xd0\xbe\xd1\x80\xd0\xb3.\xd1\x81\xd1\x80\xd0\xb1\0"
+"from-mo.com\0"
+"vall\xc3\xa9""edaoste.it\0srt\0"
+"co.cr\0sf.no\0b\xc3\xa1hcavuotna.no\0"
+"scrapper-site.net\0"
+"kihoku.ehime.jp\0s\xc3\xb8gne.no\0"
+"tajiri.osaka.jp\0tci\0"
+"info.co\0ol.no\0marriott\0*.transurl.eu\0"
+"yuki.ibaraki.jp\0endoftheinternet.org\0"
+"drangedal.no\0co.cz\0"
+"co.dk\0"
+"wakasa.fukui.jp\0"
+"pohl\0"
+"stc\0blogspot.pe\0"
+"us.eu.org\0"
+"barclaycard\0"
+"herokuapp.com\0"
+"hitra.no\0"
+"carrier.museum\0tdk\0dyndns-free.com\0"
+"axis.museum\0"
+"ac.gov.br\0pimienta.org\0"
+"kawagoe.mie.jp\0"
+"clinique\0blogspot.qa\0"
+"blogspot.pt\0"
+"here\0"
+"\xe7\xb6\xb2\xe7\xb5\xa1.hk\0tel\0isa-geek.com\0"
+"cam.it\0workers.dev\0"
+"groundhandling.aero\0"
+"blogspot.is\0"
+"wnext.app\0blogspot.it\0"
+"marylhurst.museum\0"
+"guru\0"
+"bjugn.no\0"
+"pueblo.bo\0"
+"gallery.museum\0k12.pr.us\0"
+"co.gg\0"
+"yokote.akita.jp\0soundandvision.museum\0"
+"blogspot.jp\0cust.dev.thingdust.io\0"
+"co.gl\0farmstead.museum\0"
+"store.bb\0"
+"is-a-student.com\0"
+"co.gy\0toyama.jp\0n\xc3\xa1vuotna.no\0nore-og-uvdal.no\0"
+"hadsel.no\0supply\0"
+"va.it\0"
+"culturalcenter.museum\0"
+"hatsukaichi.hiroshima.jp\0restaurant\0blogspot.kr\0"
+"sarl\0"
+"e.se\0from-mi.com\0"
+"rg.it\0"
+"thd\0fr.eu.org\0"
+"ninja\0"
+"kristiansund.no\0"
+"co.id\0blogspot.li\0development.run\0"
+"co.hu\0pagespeedmobilizer.com\0"
+"bmd.br\0b\xc3\xa6rum.no\0maserati\0"
+"off.ai\0cranbrook.museum\0"
+"date.fukushima.jp\0"
+"bhz.br\0nishikata.tochigi.jp\0"
+"co.il\0"
+"co.im\0"
+"co.in\0"
+"blogspot.lt\0blogspot.md\0"
+"blogspot.lu\0"
+"bridgestone\0"
+"co.ir\0nakanojo.gunma.jp\0"
+"co.it\0rv.ua\0"
+"co.je\0"
+"blogspot.mk\0"
+"shinshinotsu.hokkaido.jp\0travel\0\xd0\xba\xd0\xbe\xd0\xbc\0cleverapps.io\0"
+"kamifurano.hokkaido.jp\0"
+"kamikawa.hokkaido.jp\0"
+"pesaro-urbino.it\0"
+"store.dk\0"
+"it.ao\0kr.ua\0"
+"hole.no\0czeladz.pl\0"
+"co.jp\0"
+"laspezia.it\0sakae.nagano.jp\0"
+"tennis\0"
+"blogspot.fi\0"
+"pol.dz\0co.ke\0"
+"shinshiro.aichi.jp\0"
+"gru.br\0"
+"artdeco.museum\0dn.ua\0"
+"oppegard.no\0"
+"\xd9\x83\xd8\xa7\xd8\xab\xd9\x88\xd9\x84\xd9\x8a\xd9\x83\0"
+"kurume.fukuoka.jp\0creation.museum\0homeunix.net\0blogspot.fr\0"
+"!city.nagoya.jp\0mansion.museum\0"
+"uppo.gov.pl\0"
+"co.kr\0"
+"qh.cn\0co.lc\0"
+"tjx\0"
+"rzgw.gov.pl\0save\0"
+"suita.osaka.jp\0"
+"kudamatsu.yamaguchi.jp\0global.ssl.fastly.net\0"
+"vestv\xc3\xa5g\xc3\xb8y.no\0"
+"blogspot.gr\0"
+"*.transurl.nl\0"
+"sanjo.niigata.jp\0guardian\0"
+"co.ma\0"
+"fj.cn\0endofinternet.net\0"
+"co.ls\0"
+"co.me\0barsy.me\0"
+"watch-and-clock.museum\0va.no\0blogspot.hk\0"
+"co.mg\0granvin.no\0lib.mi.us\0"
+"union.aero\0hakone.kanagawa.jp\0co.technology\0"
+"rovigo.it\0"
+"hasvik.no\0"
+"taito.tokyo.jp\0blogspot.hr\0"
+"blogspot.hu\0blogspot.ie\0"
+"vic.gov.au\0co.na\0"
+"omura.nagasaki.jp\0"
+"elblag.pl\0"
+"co.mu\0"
+"co.mw\0"
+"lima-city.de\0"
+"co.ni\0blogspot.in\0"
+"co.mz\0"
+"yamanakako.yamanashi.jp\0in-berlin.de\0"
+"saku.nagano.jp\0co.nl\0blogspot.ba\0"
+"hattfjelldal.no\0info.ve\0"
+"pol.ht\0porn\0co.no\0"
+"insurance\0blogspot.be\0"
+"research.aero\0saxo\0swatch\0"
+"aosta.it\0rifu.miyagi.jp\0\xd8\xa8\xda\xbe\xd8\xa7\xd8\xb1\xd8\xaa\0blogspot.bg\0"
+"okayama.jp\0"
+"blogspot.bj\0"
+"transporte.bo\0info.vn\0*.magentosite.cloud\0"
+"kawagoe.saitama.jp\0"
+"co.nz\0"
+"blogspot.ca\0"
+"co.om\0"
+"vantaa.museum\0"
+"weibo\0blogspot.cf\0"
+"fujiyoshida.yamanashi.jp\0nishikatsura.yamanashi.jp\0"
+"kuwana.mie.jp\0blogspot.ch\0"
+"monzaebrianza.it\0post\0"
+"rishirifuji.hokkaido.jp\0yufu.oita.jp\0blogspot.cl\0lima-city.at\0"
+"monzabrianza.it\0repl.co\0"
+"avellino.it\0b\xc3\xa1jddar.no\0"
+"co.pl\0"
+"top\0"
+"co.pn\0"
+"shirako.chiba.jp\0"
+"blogspot.de\0"
+"panasonic\0blogspot.cv\0"
+"cc.ri.us\0"
+"wakkanai.hokkaido.jp\0omitama.ibaraki.jp\0blogspot.cz\0"
+"cng.br\0info.tn\0blogspot.dk\0"
+"co.pw\0"
+"info.tr\0"
+"lima-city.ch\0"
+"info.tt\0"
+"shiga.jp\0dodge\0"
+"konan.aichi.jp\0"
+"symantec\0"
+"elburg.museum\0"
+"nanmoku.gunma.jp\0info.tz\0"
+"i234.me\0"
+"tr.it\0!city.kitakyushu.jp\0"
+"kraanghke.no\0"
+"nasushiobara.tochigi.jp\0university\0"
+"jinsekikogen.hiroshima.jp\0broadway\0tube\0"
+"takatori.nara.jp\0yahiko.niigata.jp\0okinoshima.shimane.jp\0"
+"fujisawa.kanagawa.jp\0cloudfunctions.net\0"
+"curitiba.br\0"
+"mn.it\0filegear.me\0"
+"chrysler\0"
+"yomitan.okinawa.jp\0co.rs\0"
+"sells-for-u.com\0"
+"vang.no\0"
+"info.ro\0co.rw\0"
+"fresenius\0"
+"filatelia.museum\0olsztyn.pl\0info.sd\0data\0"
+"snaase.no\0nhlfan.net\0"
+"date\0ubs\0"
+"trv\0"
+"co.st\0"
+"barsy.online\0"
+"inagi.tokyo.jp\0"
+"r.bg\0"
+"co.th\0"
+"dentist\0"
+"co.sz\0co.tj\0va.us\0cloud66.zone\0"
+"tc.br\0"
+"8.bg\0"
+"iwi.nz\0co.tm\0"
+"mansions.museum\0lefrak\0"
+"co.ua\0"
+"hobol.no\0info.pk\0\xd8\xa8\xd8\xa7\xd8\xb2\xd8\xa7\xd8\xb1\0"
+"mar.it\0info.pl\0co.tt\0nm.us\0pcloud.host\0"
+"balsfjord.no\0co.ug\0"
+"abruzzo.it\0"
+"info.pr\0co.tz\0"
+"co.uk\0barsy.uk\0"
+"legal\0"
+"is-a-geek.net\0"
+"maritimo.museum\0living\0"
+"blogspot.ae\0"
+"protection\0"
+"co.us\0"
+"\xe7\xa5\x9e\xe5\xa5\x88\xe5\xb7\x9d.jp\0"
+"cci.fr\0co.ve\0"
+"yamanobe.yamagata.jp\0tui\0"
+"blogspot.al\0"
+"blogspot.am\0"
+"fot.br\0info.na\0co.vi\0"
+"co.uz\0"
+"is-a-anarchist.com\0fastvps-server.com\0"
+"ddr.museum\0info.mv\0info.nf\0"
+"aerodrome.aero\0tr.no\0"
+"info.ni\0is-very-nice.org\0"
+"\xe6\x95\x99\xe8\x82\xb2.hk\0ralingen.no\0"
+"ogano.saitama.jp\0"
+"dh.bytemark.co.uk\0"
+"al.gov.br\0info.nr\0"
+"omiya.saitama.jp\0yoshikawa.saitama.jp\0"
+"zlg.br\0"
+"chichibu.saitama.jp\0"
+"tvs\0"
+"ae.org\0goip.de\0"
+"veg\xc3\xa5rshei.no\0"
+"artsandcrafts.museum\0bayern\0"
+"vagan.no\0education\0"
+"is-a-bookkeeper.com\0"
+"friuliveneziagiulia.it\0info.la\0"
+"other.nf\0"
+"folkebibl.no\0"
+"niimi.okayama.jp\0"
+"ayase.kanagawa.jp\0"
+"minamisanriku.miyagi.jp\0"
+"gok.pk\0"
+"daejeon.kr\0is-very-evil.org\0"
+"xfinity\0"
+"gorlice.pl\0"
+"info.ls\0"
+"mydissent.net\0"
+"myphotos.cc\0"
+"nakatsugawa.gifu.jp\0"
+"\xe7\x8f\xa0\xe5\xae\x9d\0is-slick.com\0"
+"co.za\0"
+"bolzano-altoadige.it\0"
+"gonohe.aomori.jp\0"
+"d\xc3\xb8nna.no\0"
+"lakas.hu\0"
+"ui.nabu.casa\0"
+"arte.bo\0gifu.jp\0pol.tr\0co.zm\0"
+"kui.hiroshima.jp\0travelchannel\0hu.com\0"
+"from-md.com\0"
+"yasuda.kochi.jp\0kvanangen.no\0global\0"
+"cog.mi.us\0"
+"co.zw\0"
+"cc.fl.us\0social\0"
+"uy.com\0"
+"k12.al.us\0"
+"ss.it\0info.ke\0"
+"furudono.fukushima.jp\0se.net\0ru.net\0"
+"rennesoy.no\0"
+"info.ki\0"
+"pi.it\0"
+"yoshida.shizuoka.jp\0"
+"boston.museum\0tynset.no\0gallup\0"
+"calabria.it\0"
+"tokushima.tokushima.jp\0niepce.museum\0"
+"lo.it\0"
+"clock.museum\0"
+"l\xc3\xa6rdal.no\0"
+"misato.shimane.jp\0"
+"frog.museum\0"
+"sakura.tochigi.jp\0\xe0\xae\x87\xe0\xae\xa8\xe0\xaf\x8d\xe0\xae\xa4\xe0\xae\xbf\xe0\xae\xaf\xe0\xae\xbe\0isa-geek.net\0"
+"kita.kyoto.jp\0"
+"togakushi.nagano.jp\0hamatama.saga.jp\0tranoy.no\0"
+"kagamiishi.fukushima.jp\0"
+"aq.it\0ba.it\0"
+"brunel.museum\0"
+"whoswho\0"
+"skodje.no\0ipifony.net\0my-vigor.de\0"
+"saijo.ehime.jp\0dali.museum\0"
+"collection.museum\0gotdns.com\0"
+"minami.fukuoka.jp\0"
+"gv.ao\0c.bg\0"
+"campinas.br\0oy.lc\0"
+"gv.at\0"
+"tsk.tr\0capetown\0"
+"shisui.chiba.jp\0\xe6\xb7\xa1\xe9\xa9\xac\xe9\x94\xa1\0"
+"privatizehealthinsurance.net\0"
+"mn.us\0"
+"usarts.museum\0"
+"sd.cn\0*.s5y.io\0"
+"servehttp.com\0"
+"trading.aero\0"
+"l\xc3\xb8ten.no\0*.on-rio.io\0"
+"emr.it\0"
+"baltimore.museum\0"
+"mitaka.tokyo.jp\0"
+"asaminami.hiroshima.jp\0lib.vi.us\0u2-local.xnbay.com\0"
+"b\xc3\xa5tsfjord.no\0vm.bytemark.co.uk\0"
+"ab.ca\0sumita.iwate.jp\0uno\0"
+"olkusz.pl\0archi\0"
+"yahoo\0"
+"sar.it\0haga.tochigi.jp\0castres.museum\0"
+"is-into-cartoons.com\0"
+"trentins\xc3\xbc""d-tirol.it\0"
+"belem.br\0otoyo.kochi.jp\0salangen.no\0hopto.me\0"
+"yoka.hyogo.jp\0"
+"l\xc3\xb8""dingen.no\0"
+"kawahara.tottori.jp\0embroidery.museum\0marnardal.no\0uol\0"
+"omega\0"
+"lierne.no\0"
+"lib.ga.us\0tec.ve\0"
+"friuli-venezia-giulia.it\0"
+"karatsu.saga.jp\0"
+"pesarourbino.it\0"
+"isla.pr\0"
+"b\xc3\xa1l\xc3\xa1t.no\0"
+"otaki.saitama.jp\0elvendrell.museum\0"
+"tokai.ibaraki.jp\0"
+"wajima.ishikawa.jp\0"
+"ups\0co.education\0"
+"shimokitayama.nara.jp\0abo.pa\0"
+"transport.museum\0"
+"est-le-patron.com\0"
+"family.museum\0eurovision\0"
+"giehtavuoatna.no\0bci.dnstrace.pro\0barsy.bg\0"
+"cn.com\0"
+"jelenia-gora.pl\0"
+"sirdal.no\0"
+"ringsaker.no\0"
+"\xe5\xae\xae\xe5\x9f\x8e.jp\0"
+"abkhazia.su\0"
+"ascoli-piceno.it\0"
+"rio.br\0\xd9\xbe\xd8\xa7\xda\xa9\xd8\xb3\xd8\xaa\xd8\xa7\xd9\x86\0"
+"pmn.it\0jeonnam.kr\0barsy.ca\0"
+"educator.aero\0higashiomi.shiga.jp\0"
+"asahi.ibaraki.jp\0ota.tokyo.jp\0"
+"\xe5\xaf\x8c\xe5\xb1\xb1.jp\0"
+"tempio-olbia.it\0security\0meteorapp.com\0"
+"hagi.yamaguchi.jp\0debian.net\0dnsdojo.org\0"
+"s\xc3\xa1lat.no\0"
+"lezajsk.pl\0"
+"k12.ms.us\0k12.nc.us\0"
+"higashichichibu.saitama.jp\0bahcavuotna.no\0"
+"poivron.org\0"
+"sel.no\0barsy.de\0"
+"verona.it\0vadso.no\0"
+"from-al.com\0"
+"roros.no\0cc.ma.us\0"
+"herad.no\0"
+"parachuting.aero\0"
+"semine.miyagi.jp\0"
+"tsukumi.oita.jp\0"
+"mc.eu.org\0"
+"jab.br\0r.se\0blogdns.org\0"
+"lukow.pl\0"
+"cc.as.us\0"
+"yamagata.nagano.jp\0lilly\0"
+"web.bo\0"
+"\xd0\xbc\xd0\xba\xd0\xb4\0"
+"publ.pt\0"
+"kiho.mie.jp\0"
+"andriabarlettatrani.it\0livorno.it\0scor\0\xe9\xa3\x9f\xe5\x93\x81\0"
+"barsy.eu\0"
+"scot\0official.academy\0"
+"philadelphia.museum\0strand.no\0"
+"ong.br\0parliament.nz\0"
+"web.co\0askvoll.no\0"
+"convent.museum\0"
+"vet\0"
+"\xe4\xbd\x9b\xe5\xb1\xb1\0lt.eu.org\0"
+"serveftp.com\0xs4all.space\0"
+"gran.no\0"
+"yuza.yamagata.jp\0"
+"telefonica\0square7.net\0lima.zone\0"
+"association.aero\0tachiarai.fukuoka.jp\0c.la\0"
+"tajimi.gifu.jp\0"
+"web.do\0"
+"*.landing.myjino.ru\0"
+"homeunix.org\0"
+"adult\0observer\0"
+"ukiha.fukuoka.jp\0gs.sf.no\0enebakk.no\0"
+"yamato.fukushima.jp\0"
+"gs.ol.no\0",
+
+"is-a-libertarian.com\0"
+"boats\0"
+"guam.gu\0charity\0"
+"ing.pa\0"
+"baby\0hgtv\0"
+"suifu.ibaraki.jp\0"
+"journal.aero\0wiih.gov.pl\0"
+"fjaler.no\0tolga.no\0"
+"anamizu.ishikawa.jp\0"
+"lib.nj.us\0"
+"fidelity\0barsy.in\0"
+"barsy.io\0"
+"froland.no\0"
+"juif.museum\0mymailer.com.tw\0"
+"nikaho.akita.jp\0kayabe.hokkaido.jp\0vig\0"
+"yonabaru.okinawa.jp\0"
+"waw.pl\0"
+"barclays\0"
+"cagliari.it\0\xd0\xbc\xd0\xbe\xd0\xbd\0"
+"*.futurecms.at\0"
+"vin\0"
+"tselinograd.su\0"
+"vip\0"
+"tanabe.kyoto.jp\0naumburg.museum\0loab\xc3\xa1t.no\0"
+"es.eu.org\0servehumour.com\0"
+"web.gu\0"
+"pub.sa\0"
+"santoandre.br\0info.zm\0"
+"kanegasaki.iwate.jp\0claims\0"
+"takanezawa.tochigi.jp\0uk.net\0"
+"sowa.ibaraki.jp\0aid.pl\0"
+"higashiyamato.tokyo.jp\0"
+"web.id\0fortmissoula.museum\0manx.museum\0"
+"sanofi\0"
+"saobernardo.br\0casino.hu\0foggia.it\0dclk\0"
+"indianmarket.museum\0"
+"rahkkeravju.no\0"
+"shiwa.iwate.jp\0"
+"mochizuki.nagano.jp\0servebbs.net\0"
+"nagaoka.niigata.jp\0"
+"songdalen.no\0storfjord.no\0"
+"rsvp\0"
+"s3.us-east-2.amazonaws.com\0"
+"decorativearts.museum\0ufcfan.org\0"
+"samsung\0is-into-games.com\0"
+"astronomy.museum\0dyn-ip24.de\0"
+"iwata.shizuoka.jp\0"
+"koto.shiga.jp\0"
+"cnt.br\0vanylven.no\0"
+"slask.pl\0"
+"tuscany.it\0build\0"
+"sor-odal.no\0"
+"ebiz.tw\0"
+"handson.museum\0"
+"meiwa.gunma.jp\0homes\0"
+"ogawa.saitama.jp\0"
+"c.se\0"
+"re.it\0nogi.tochigi.jp\0"
+"honbetsu.hokkaido.jp\0mortgage\0"
+"kamo.niigata.jp\0web.lk\0"
+"elverum.no\0"
+"synology-diskstation.de\0"
+"mihara.kochi.jp\0"
+"tsubata.ishikawa.jp\0ma.leg.br\0"
+"stjohn.museum\0vn.ua\0"
+"cruise\0"
+"stjordalshalsen.no\0"
+"tokuyama.yamaguchi.jp\0"
+"nakayama.yamagata.jp\0wien\0"
+"nfshost.com\0"
+"museum\0"
+"sakegawa.yamagata.jp\0"
+"valdaosta.it\0"
+"re.kr\0"
+"sytes.net\0"
+"nara.nara.jp\0"
+"miniserver.com\0"
+"trentin-suedtirol.it\0web.nf\0"
+"trentino-s\xc3\xbc""d-tirol.it\0public.museum\0gausdal.no\0sd.us\0endofinternet.org\0github.io\0"
+"web.ni\0"
+"xj.cn\0gs.va.no\0"
+"nowaruda.pl\0"
+"pacific.museum\0"
+"\xc3\xa1laheadju.no\0"
+"mizunami.gifu.jp\0"
+"fortal.br\0sugito.saitama.jp\0"
+"mazury.pl\0gv.vc\0"
+"aukra.no\0from-pa.com\0"
+"zao.miyagi.jp\0fuchu.tokyo.jp\0"
+"funabashi.chiba.jp\0"
+"revista.bo\0lillesand.no\0"
+"nowtv\0"
+"ngrok.io\0"
+"jerusalem.museum\0"
+"safety\0"
+"and\xc3\xb8y.no\0lib.pa.us\0abbvie\0"
+"yamaxun\0familyds.net\0"
+"tokamachi.niigata.jp\0"
+"chuo.fukuoka.jp\0anan.nagano.jp\0agrinet.tn\0"
+"safety.aero\0web.pk\0plo.ps\0"
+"shimonoseki.yamaguchi.jp\0"
+"motoyama.kochi.jp\0blackbaudcdn.net\0is-a-techie.com\0"
+"alaheadju.no\0ipiranga\0"
+"band\0"
+"konskowola.pl\0vpnplus.to\0"
+"figueres.museum\0"
+"nesset.no\0"
+"lancashire.museum\0"
+"mymediapc.net\0"
+"bank\0"
+"vestvagoy.no\0"
+"sjc.br\0chintai\0in-dsl.de\0dvrcam.info\0rackmaze.com\0"
+"mus.mi.us\0"
+"sanok.pl\0"
+"defense.tn\0"
+"ishikawa.okinawa.jp\0"
+"*.kobe.jp\0otsuchi.iwate.jp\0ishigaki.okinawa.jp\0"
+"mk.eu.org\0"
+"bieszczady.pl\0hobby-site.org\0"
+"kunohe.iwate.jp\0"
+"tcp4.me\0"
+"dynamic-dns.info\0"
+"wiki\0"
+"s\xc3\xb8rfold.no\0ugim.gov.pl\0balena-devices.com\0"
+"wed\0"
+"niki.hokkaido.jp\0"
+"fitjar.no\0gotdns.ch\0"
+"lelux.site\0"
+"kakuda.miyagi.jp\0"
+"cc.va.us\0arab\0"
+"landes.museum\0associates\0"
+"ferrari\0"
+"lucca.it\0fi.eu.org\0"
+"florence.it\0cc.nm.us\0"
+"int.ar\0trust.museum\0"
+"web.tj\0"
+"iglesias-carbonia.it\0"
+"birthplace.museum\0"
+"southcarolina.museum\0"
+"hanggliding.aero\0int.az\0"
+"web.tr\0nflfan.org\0"
+"tp.it\0psp.gov.pl\0"
+"int.bo\0yabuki.fukushima.jp\0"
+"cc.co.us\0"
+"riik.ee\0seat\0"
+"uslivinghistory.museum\0"
+"pv.it\0ericsson\0gallo\0"
+"wine\0"
+"nagahama.shiga.jp\0austrheim.no\0bbs.tr\0"
+"shimoichi.nara.jp\0realestate.pl\0"
+"higashine.yamagata.jp\0"
+"int.ci\0oarai.ibaraki.jp\0"
+"lu.eu.org\0me.eu.org\0"
+"web.ve\0blogspot.co.at\0"
+"int.co\0lasalle\0ashgabad.su\0"
+"shirakawa.fukushima.jp\0"
+"kahoku.ishikawa.jp\0synology-ds.de\0"
+"ato.br\0"
+"bn.it\0"
+"vaga.no\0"
+"swidnica.pl\0"
+"gives\0vodka\0"
+"uchinomi.kagawa.jp\0"
+"p.bg\0"
+"verm\xc3\xb6gensberatung\0"
+"lotte\0"
+"6.bg\0saitama.saitama.jp\0abudhabi\0win\0"
+"l\xc3\xa4ns.museum\0"
+"deporte.bo\0"
+"gs.tr.no\0"
+"lv.eu.org\0"
+"evenassi.no\0"
+"minoh.osaka.jp\0lotto\0"
+"prod\0"
+"london.cloudapps.digital\0"
+"prof\0"
+"idrett.no\0"
+"seek\0"
+"ggf.br\0juegos\0"
+"s3.eu-west-2.amazonaws.com\0"
+"tochio.niigata.jp\0"
+"lib.sd.us\0*.stolos.io\0"
+"journalist.aero\0linde\0"
+"honda\0"
+"kamioka.akita.jp\0co.place\0"
+"web.za\0"
+"s3-eu-west-1.amazonaws.com\0"
+"fribourg.museum\0"
+"ballooning.aero\0"
+"yaizu.shizuoka.jp\0"
+"natuurwetenschappen.museum\0"
+"ishikawa.fukushima.jp\0hikone.shiga.jp\0"
+"emp.br\0\xe6\x95\x8e\xe8\x82\xb2.hk\0"
+"wme\0"
+"rokunohe.aomori.jp\0north.museum\0*.statics.cloud\0loginline.site\0"
+"muncie.museum\0"
+"potenza.it\0"
+"inderoy.no\0"
+"ruhr\0"
+"parti.se\0\xe5\xb7\xa5\xe8\xa1\x8c\0dy.fi\0"
+"dnsdojo.net\0"
+"int.is\0"
+"hapmir.no\0"
+"qld.au\0"
+"idf.il\0inami.wakayama.jp\0colonialwilliamsburg.museum\0graz.museum\0"
+"wios.gov.pl\0blogspot.co.id\0"
+"skoczow.pl\0"
+"riobranco.br\0barrell-of-knowledge.info\0"
+"trust\0"
+"yakumo.hokkaido.jp\0"
+"storage\0"
+"taketa.oita.jp\0"
+"swiftcover\0blogspot.co.il\0"
+"\xe7\xa7\x8b\xe7\x94\xb0.jp\0"
+"sondrio.it\0isshiki.aichi.jp\0kosher\0"
+"cc.mn.us\0"
+"overhalla.no\0"
+"ham-radio-op.net\0"
+"wow\0"
+"int.la\0k12.ct.us\0"
+"deal\0"
+"zaporizhzhe.ua\0giize.com\0flt.cloud.muni.cz\0"
+"airbus\0"
+"ta.it\0games\0"
+"maritime.museum\0"
+"int.lk\0"
+"pg.it\0group\0"
+"is-a-knight.org\0"
+"midatlantic.museum\0"
+"kutchan.hokkaido.jp\0"
+"fh.se\0"
+"barsy.co.uk\0"
+"nishi.fukuoka.jp\0"
+"dazaifu.fukuoka.jp\0"
+"from.hr\0"
+"lapy.pl\0"
+"mosjoen.no\0tysnes.no\0lundbeck\0"
+"my-gateway.de\0"
+"kr.eu.org\0"
+"sport.hu\0"
+"takatsuki.osaka.jp\0bananarepublic\0"
+"ao.it\0oldnavy\0"
+"andriatranibarletta.it\0"
+"\xe9\xa4\x90\xe5\x8e\x85\0"
+"ustka.pl\0"
+"*.elb.amazonaws.com.cn\0"
+"parliament.cy\0asti.it\0int.mv\0"
+"int.mw\0\xd9\x82\xd8\xb7\xd8\xb1\0"
+"naples.it\0int.ni\0"
+"a.bg\0"
+"army\0"
+"h\xc3\xb8yanger.no\0"
+"tokushima.jp\0"
+"hs.kr\0"
+"chieti.it\0"
+"from-co.net\0"
+"fylkesbibl.no\0"
+"saarland\0space\0"
+"wtc\0"
+"koriyama.fukushima.jp\0wtf\0"
+"nx.cn\0"
+"now-dns.net\0"
+"dyndns.info\0"
+"amusement.aero\0"
+"pittsburgh.museum\0"
+"arpa\0"
+"karuizawa.nagano.jp\0porsangu.no\0"
+"matsuzaki.shizuoka.jp\0"
+"recife.br\0"
+"azurecontainer.io\0"
+"walmart\0"
+"navigation.aero\0lib.mo.us\0politie\0"
+"shibuya.tokyo.jp\0"
+"nagareyama.chiba.jp\0higashishirakawa.gifu.jp\0kwp.gov.pl\0"
+"gaular.no\0"
+"\xd8\xa7\xd9\x8a\xd8\xb1\xd8\xa7\xd9\x86.ir\0annefrank.museum\0"
+"int.pt\0"
+"svelvik.no\0"
+"aizuwakamatsu.fukushima.jp\0"
+"forumz.info\0"
+"cargo.aero\0"
+"wake.okayama.jp\0railway.museum\0rnu.tn\0"
+"minato.tokyo.jp\0"
+"wakuya.miyagi.jp\0"
+"watchandclock.museum\0"
+"kami.miyagi.jp\0f\xc3\xb8rde.no\0karlsoy.no\0merseine.nu\0"
+"fukuroi.shizuoka.jp\0"
+"tingvoll.no\0"
+"oharu.aichi.jp\0mo-i-rana.no\0"
+"m\xc3\xa1tta-v\xc3\xa1rjjat.no\0demon.nl\0"
+"yono.saitama.jp\0online.museum\0\xe5\x85\xac\xe5\x8f\xb8.\xe9\xa6\x99\xe6\xb8\xaf\0"
+"bearalvahki.no\0"
+"movimiento.bo\0kumejima.okinawa.jp\0"
+"vaksdal.no\0"
+"dyndns-work.com\0"
+"komae.tokyo.jp\0"
+"int.ru\0camdvr.org\0"
+"dedyn.io\0"
+"tokigawa.saitama.jp\0nyny.museum\0quebec\0"
+"imperia.it\0kujukuri.chiba.jp\0"
+"noda.iwate.jp\0blogdns.net\0webredirect.org\0"
+"accountants\0"
+"!city.sapporo.jp\0"
+"kamishihoro.hokkaido.jp\0"
+"asda\0gucci\0"
+"loan\0"
+"int.tj\0arte\0flickr\0"
+"moscow.museum\0"
+"beauty\0"
+"online\0"
+"takayama.nagano.jp\0"
+"kasaoka.okayama.jp\0"
+"oyodo.nara.jp\0"
+"treviso.it\0"
+"int.tt\0"
+"\xe7\xa6\x8f\xe5\xb2\xa1.jp\0xin\0"
+"noticias.bo\0ilovecollege.info\0"
+"kustanai.ru\0"
+"taiki.hokkaido.jp\0"
+"ppg.br\0clan.rip\0"
+"p.se\0"
+"umi.fukuoka.jp\0*.sensiosite.cloud\0"
+"tendo.yamagata.jp\0in-vpn.org\0"
+"soja.okayama.jp\0int.ve\0"
+"bbva\0"
+"kustanai.su\0mg.leg.br\0"
+"kyotanabe.kyoto.jp\0\xd0\xbe\xd1\x80\xd0\xb3\0"
+"nom.ad\0"
+"gov.ac\0nom.ae\0"
+"int.vn\0promo\0nom.af\0"
+"gov.ae\0nom.ag\0"
+"gov.af\0"
+"android\0nom.ai\0"
+"usculture.museum\0dell\0"
+"fvg.it\0cz.it\0nom.al\0"
+"arq.br\0blogspot.co.uk\0"
+"gov.al\0"
+"okagaki.fukuoka.jp\0"
+"airport.aero\0lewismiller.museum\0"
+"yatsuka.shimane.jp\0"
+"gov.ba\0trapani.it\0"
+"gov.ar\0gov.bb\0"
+"gov.as\0"
+"gov.au\0nakadomari.aomori.jp\0"
+"gov.bf\0television.museum\0"
+"games.hu\0"
+"gov.bh\0"
+"\xe6\x96\xb0\xe9\x97\xbb\0"
+"gov.az\0"
+"koga.ibaraki.jp\0aejrie.no\0"
+"gov.bm\0haibara.shizuoka.jp\0tatar\0"
+"gov.bn\0from-ct.com\0"
+"nesoddtangen.no\0is-a-socialist.com\0"
+"gov.br\0"
+"airline.aero\0gov.bs\0"
+"gov.bt\0gov.cd\0bungoono.oita.jp\0a.run.app\0"
+"kommunalforbund.se\0"
+"gov.by\0sardinia.it\0"
+"gov.bz\0nom.cl\0"
+"asia\0gov.cl\0"
+"gov.cm\0nom.co\0valled-aosta.it\0sogndal.no\0"
+"gov.cn\0sciencehistory.museum\0"
+"author.aero\0gov.co\0saiki.oita.jp\0"
+"lib.tx.us\0is-a-green.com\0"
+"lans.museum\0loft\0"
+"gov.cu\0onjuku.chiba.jp\0\xc3\xa5lg\xc3\xa5rd.no\0"
+"gov.cx\0lib.pr.us\0"
+"gov.cy\0"
+"saikai.nagasaki.jp\0\xc3\xa5s.no\0"
+"fnd.br\0"
+"sexy\0"
+"gov.dm\0miners.museum\0za.com\0"
+"in-butter.de\0"
+"gov.do\0"
+"res.in\0paderborn.museum\0scapp.io\0"
+"c66.me\0"
+"gov.ec\0aga.niigata.jp\0naha.okinawa.jp\0"
+"gov.ee\0hakata.fukuoka.jp\0"
+"gov.eg\0med.pro\0"
+"klabu.no\0"
+"!city.kobe.jp\0dominic.ua\0fed.us\0"
+"gov.dz\0"
+"noboribetsu.hokkaido.jp\0"
+"catering\0"
+"\xd8\xa7\xd9\x84\xd8\xb3\xd8\xb9\xd9\x88\xd8\xaf\xd9\x8a\xd9\x87\0"
+"federation.aero\0servebbs.org\0"
+"nom.es\0from-wy.com\0"
+"gov.et\0cincinnati.museum\0\xe9\xa6\x99\xe6\xb8\xaf\0"
+"oystre-slidre.no\0"
+"s3-eu-central-1.amazonaws.com\0"
+"villas\0"
+"nom.fr\0"
+"shirataka.yamagata.jp\0nom.gd\0"
+"nom.ge\0"
+"gov.ge\0lviv.ua\0blogspot.co.ke\0homesecuritypc.com\0"
+"plants.museum\0vlaanderen.museum\0"
+"gov.gh\0"
+"gov.gi\0securitytactics.com\0"
+"nom.gl\0"
+"remotewd.com\0"
+"brussel.museum\0moma.museum\0"
+"gov.gn\0"
+"bruxelles.museum\0"
+"vicenza.it\0\xd8\xa7\xd9\x84\xd8\xb3\xd8\xb9\xd9\x88\xd8\xaf\xd9\x8a\xd8\xa9\0degree\0"
+"gov.gr\0naklo.pl\0customer.enonic.io\0nom.gt\0"
+"sydney\0"
+"gov.gu\0desi\0"
+"badajoz.museum\0cc.sd.us\0no-ip.org\0"
+"gov.gy\0oseto.nagasaki.jp\0uruma.okinawa.jp\0nord-odal.no\0"
+"k12.md.us\0stackhero-network.com\0"
+"gov.hk\0"
+"nom.hn\0"
+"arendal.no\0"
+"services\0"
+"huissier-justice.fr\0bronnoy.no\0"
+"banamex\0"
+"my.id\0akabira.hokkaido.jp\0showa.yamanashi.jp\0merckmsd\0"
+"gov.ie\0cloudaccess.net\0"
+"kherson.ua\0"
+"oita.oita.jp\0"
+"auspost\0"
+"snillfjord.no\0"
+"nom.im\0"
+"gov.il\0pavia.it\0"
+"gov.in\0a.se\0scrapping.cc\0"
+"rc.it\0choshi.chiba.jp\0"
+"fukumitsu.toyama.jp\0"
+"gov.iq\0"
+"gov.ir\0"
+"gov.is\0sagae.yamagata.jp\0\xd8\xb9\xd8\xb1\xd8\xa7\xd9\x82\0"
+"gov.it\0edu.eu.org\0"
+"\xe9\x9b\x86\xe5\x9b\xa2\0"
+"higashiyama.kyoto.jp\0mormon\0"
+"vic.au\0"
+"is-a-doctor.com\0"
+"ge.it\0"
+"gov.jo\0niihama.ehime.jp\0\xe0\xb8\xa3\xe0\xb8\xb1\xe0\xb8\x90\xe0\xb8\x9a\xe0\xb8\xb2\xe0\xb8\xa5.\xe0\xb9\x84\xe0\xb8\x97\xe0\xb8\xa2\0"
+"academy\0"
+"\xe4\xb8\xad\xe4\xbf\xa1\0"
+"ingatlan.hu\0sb.ua\0nom.ke\0"
+"saotome.st\0"
+"gov.kg\0"
+"honjo.akita.jp\0stream\0"
+"koto.tokyo.jp\0musashimurayama.tokyo.jp\0gov.ki\0"
+"blogspot.co.nz\0"
+"asaka.saitama.jp\0nom.km\0"
+"gov.km\0british.museum\0"
+"gov.kn\0"
+"gov.kp\0"
+"gov.la\0vaapste.no\0"
+"gov.lb\0"
+"gov.lc\0broker\0"
+"kamijima.ehime.jp\0sibenik.museum\0agakhan\0"
+"tatsuno.hyogo.jp\0"
+"gov.kw\0hagebostad.no\0nat.tn\0nom.li\0"
+"capitalone\0familyds.org\0"
+"gov.ky\0"
+"gyokuto.kumamoto.jp\0gov.kz\0oh.us\0syno-ds.de\0"
+"gov.lk\0freetls.fastly.net\0"
+"konsulat.gov.pl\0"
+"harvestcelebration.museum\0"
+"sanda.hyogo.jp\0"
+"gov.ma\0alpha.bounty-full.com\0"
+"itano.tokushima.jp\0gov.lr\0"
+"gov.ls\0br\xc3\xb8nn\xc3\xb8ysund.no\0"
+"gov.lt\0"
+"gov.me\0nom.mg\0"
+"gov.lv\0"
+"mishima.shizuoka.jp\0gov.mg\0aarborte.no\0"
+"gov.ly\0turek.pl\0nom.mk\0"
+"urakawa.hokkaido.jp\0"
+"gov.mk\0"
+"gov.ml\0"
+"gifu.gifu.jp\0shioya.tochigi.jp\0"
+"gov.mn\0spydeberg.no\0"
+"ono.hyogo.jp\0saito.miyazaki.jp\0gov.mo\0"
+"museum.tt\0ivanovo.su\0"
+"nom.nc\0"
+"gov.mr\0"
+"gov.ms\0"
+"tome.miyagi.jp\0gov.mu\0"
+"gov.mv\0"
+"gov.mw\0gov.ng\0nom.ni\0nalchik.ru\0"
+"gov.my\0"
+"gov.mz\0"
+"\xe5\x95\x86\xe6\xa0\x87\0"
+"otaru.hokkaido.jp\0tomobe.ibaraki.jp\0"
+"udine.it\0ybo.trade\0"
+"iglesiascarbonia.it\0"
+"okawa.fukuoka.jp\0gov.nr\0"
+"ube.yamaguchi.jp\0nom.nu\0"
+"tarama.okinawa.jp\0draydns.de\0"
+"xxx\0"
+"nalchik.su\0applinzi.com\0"
+"pisz.pl\0dating\0"
+"trentinosud-tirol.it\0utwente.io\0"
+"gov.om\0"
+"skydiving.aero\0berlin.museum\0s\xc3\xb8mna.no\0nom.pa\0"
+"rackmaze.net\0"
+"fuchu.hiroshima.jp\0"
+"nom.pe\0"
+"yamamoto.miyagi.jp\0\xe6\x89\x8b\xe8\xa1\xa8\0"
+"musashino.tokyo.jp\0"
+"eco.br\0"
+"gov.ph\0xyz\0"
+"milan.it\0"
+"nom.pl\0"
+"gov.pk\0"
+"rome.it\0nishiokoppe.hokkaido.jp\0matsushima.miyagi.jp\0gov.pl\0"
+"gov.pn\0"
+"isehara.kanagawa.jp\0nom.qa\0"
+"dni.us\0"
+"gov.qa\0fiat\0"
+"gov.pr\0"
+"gov.ps\0"
+"gov.pt\0k12.wi.us\0"
+"nom.pw\0"
+"sukagawa.fukushima.jp\0niiza.saitama.jp\0"
+"gov.py\0"
+"memorial.museum\0"
+"stj\xc3\xb8rdalshalsen.no\0"
+"magazine.aero\0"
+"brasil.museum\0luxembourg.museum\0"
+"livinghistory.museum\0kyoto\0"
+"newhampshire.museum\0nom.re\0k12.ks.us\0"
+"fedorainfracloud.org\0"
+"asakawa.fukushima.jp\0"
+"zamami.okinawa.jp\0"
+"ine.kyoto.jp\0higashimatsushima.miyagi.jp\0"
+"nom.ro\0"
+"pinb.gov.pl\0"
+"sayama.saitama.jp\0"
+"fukui.jp\0oyer.no\0gov.sa\0nom.rs\0"
+"\xe7\xa6\x8f\xe4\xba\x95.jp\0kinokawa.wakayama.jp\0gov.sb\0"
+"tn.it\0gov.rs\0gov.sc\0"
+"vao.it\0torino.it\0gov.sd\0"
+"ullensaker.no\0gov.ru\0love\0"
+"kanmaki.nara.jp\0"
+"gov.rw\0gov.sg\0nom.si\0"
+"pt.it\0chocolate.museum\0gov.sh\0"
+"miyoshi.aichi.jp\0"
+"rikuzentakata.iwate.jp\0"
+"american.museum\0"
+"yoro.gifu.jp\0gov.sl\0fido\0institute\0"
+"eiheiji.fukui.jp\0"
+"gov.so\0"
+"meloy.no\0nom.st\0"
+"gov.ss\0"
+"gov.st\0readmyblog.org\0"
+"nagasaki.nagasaki.jp\0cloud.metacentrum.cz\0"
+"\xc3\xb8ystre-slidre.no\0"
+"gov.sx\0nom.tj\0"
+"gov.sy\0"
+"gov.tj\0"
+"nom.tm\0"
+"ambulance.aero\0bl.it\0mino.gifu.jp\0gov.tl\0"
+"gov.tm\0"
+"atami.shizuoka.jp\0gov.tn\0"
+"hirata.fukushima.jp\0gov.to\0"
+"schools.nsw.edu.au\0katagami.akita.jp\0gov.ua\0"
+"gov.tr\0"
+"gov.tt\0"
+"nom.ug\0"
+"n.bg\0s3.dualstack.us-east-1.amazonaws.com\0"
+"kamisato.saitama.jp\0gov.tw\0"
+"hakusan.ishikawa.jp\0naturalhistorymuseum.museum\0"
+"tur.ar\0"
+"4.bg\0wiw.gov.pl\0gov.uk\0cya.gg\0"
+"orskog.no\0"
+"pe.ca\0versicherung\0trafficplex.cloud\0"
+"ck.ua\0"
+"cloudns.asia\0blogspot.co.za\0nom.vc\0"
+"kyowa.akita.jp\0gov.vc\0you\0"
+"gov.ve\0webhop.org\0nom.vg\0"
+"ishinomaki.miyagi.jp\0myhome-server.de\0"
+"nom.uy\0"
+"*.yokohama.jp\0"
+"tur.br\0"
+"hekinan.aichi.jp\0"
+"shibukawa.gunma.jp\0gov.vn\0"
+"museum.mv\0"
+"am.br\0museum.mw\0"
+"nyuzen.toyama.jp\0estate\0freebox-os.com\0"
+"catholic.edu.au\0"
+"museum.no\0"
+"misato.saitama.jp\0rugby\0"
+"kamitonda.wakayama.jp\0community.museum\0"
+"pictet\0"
+"serveirc.com\0"
+"gov.ws\0"
+"minami.kyoto.jp\0timekeeping.museum\0"
+"carrara-massa.it\0florist\0"
+"museum.om\0"
+"intuit\0"
+"maibara.shiga.jp\0"
+"\xe5\xb2\x90\xe9\x98\x9c.jp\0red.sv\0"
+"kumano.hiroshima.jp\0"
+"paris.museum\0sciencecenter.museum\0"
+"can.museum\0"
+"nom.za\0"
+"\xe4\xb8\xaa\xe4\xba\xba.hk\0"
+"gjovik.no\0gov.za\0from-ca.com\0"
+"tomiya.miyagi.jp\0"
+"hokuto.hokkaido.jp\0sukumo.kochi.jp\0\xd8\xa7\xd8\xa8\xd9\x88\xd8\xb8\xd8\xa8\xd9\x8a\0"
+"kiryu.gunma.jp\0"
+"custom.metacentrum.cz\0"
+"nago.okinawa.jp\0shinjuku.tokyo.jp\0sopot.pl\0"
+"dealer\0"
+"k12.ut.us\0gov.zm\0drud.io\0"
+"collegefan.org\0"
+"tonsberg.no\0"
+"navuotna.no\0\xd9\x83\xd9\x88\xd9\x85\0"
+"reliance\0"
+"capebreton.museum\0alibaba\0"
+"hamatonbetsu.hokkaido.jp\0osoyro.no\0k12.oh.us\0gov.zw\0from-ky.com\0"
+"nanjo.okinawa.jp\0"
+"film\0"
+"yun\0"
+"trustee.museum\0"
+"nt.edu.au\0muika.niigata.jp\0"
+"memorial\0"
+"homesense\0"
+"shiroi.chiba.jp\0"
+"yamagata.jp\0brother\0"
+"wakayama.wakayama.jp\0"
+"ltd.co.im\0myoko.niigata.jp\0"
+"dinosaur.museum\0"
+"izumi.osaka.jp\0"
+"so.it\0nakagawa.tokushima.jp\0"
+"kr\xc3\xb8""dsherad.no\0ulvik.no\0"
+"vic.edu.au\0bel.tr\0"
+"pe.it\0"
+"nanto.toyama.jp\0"
+"asn.au\0miyako.fukuoka.jp\0sennan.osaka.jp\0"
+"tenri.nara.jp\0"
+"shibetsu.hokkaido.jp\0"
+"volyn.ua\0is-a-player.com\0"
+"shaw\0"
+"gdynia.pl\0"
+"giving\0"
+"shitara.aichi.jp\0sor-fron.no\0"
+"\xe3\x83\x95\xe3\x82\xa1\xe3\x83\x83\xe3\x82\xb7\xe3\x83\xa7\xe3\x83\xb3\0"
+"yamaga.kumamoto.jp\0evje-og-hornnes.no\0"
+"samukawa.kanagawa.jp\0"
+"is-lost.org\0"
+"edu.krd\0now-dns.org\0"
+"\xe0\xb2\xad\xe0\xb2\xbe\xe0\xb2\xb0\xe0\xb2\xa4\0"
+"okinawa\0"
+"luroy.no\0"
+"nobeoka.miyazaki.jp\0armenia.su\0"
+"pe.kr\0"
+"washtenaw.mi.us\0lplfinancial\0"
+"matsubara.osaka.jp\0"
+"tn.us\0homegoods\0"
+"christmas\0"
+"audi\0\xe6\x8b\x9b\xe8\x81\x98\0mmafan.biz\0"
+"adv.br\0"
+"ferrara.it\0"
+"fedje.no\0today\0"
+"contemporaryart.museum\0"
+"kira.aichi.jp\0tmall\0"
+"africa.com\0"
+"zip\0"
+"of.by\0"
+"aogaki.hyogo.jp\0"
+"kumiyama.kyoto.jp\0ureshino.mie.jp\0"
+"friuliv-giulia.it\0"
+"yoga\0"
+"\xe9\x9d\x92\xe6\xa3\xae.jp\0"
+"poniatowa.pl\0"
+"ap-southeast-2.elasticbeanstalk.com\0"
+"beer\0"
+"hb.cn\0"
+"\xe9\x95\xb7\xe5\xb4\x8e.jp\0hikimi.shimane.jp\0"
+"akishima.tokyo.jp\0fire\0s3.dualstack.eu-west-3.amazonaws.com\0"
+"krodsherad.no\0miami\0"
+"porsgrunn.no\0"
+"posts-and-telecommunications.museum\0salvadordali.museum\0genting\0"
+"h\xc3\xa1""bmer.no\0"
+"pasadena.museum\0loginline.io\0"
+"mukawa.hokkaido.jp\0solund.no\0"
+"h\xc3\xa5.no\0lipsy\0"
+"konan.shiga.jp\0force.museum\0wskr.gov.pl\0"
+"\xc3\xa5snes.no\0"
+"etc.br\0inagawa.hyogo.jp\0sumy.ua\0"
+"atm.pl\0"
+"rns.tn\0"
+"nonoichi.ishikawa.jp\0fish\0"
+"bamble.no\0"
+"bulsan-s\xc3\xbc""dtirol.it\0inc.hk\0"
+"erotica.hu\0trentino-aadige.it\0kadogawa.miyazaki.jp\0"
+"kushimoto.wakayama.jp\0"
+"de.com\0"
+"from-mt.com\0from-nd.com\0"
+"kvinesdal.no\0"
+"school\0"
+"\xe6\x89\x8b\xe6\x9c\xba\0myfritz.net\0"
+"hopto.org\0"
+"design.museum\0"
+"monza-e-della-brianza.it\0"
+"ohi.fukui.jp\0"
+"dattolocal.net\0"
+"redstone\0"
+"futsu.nagasaki.jp\0"
+"shimizu.shizuoka.jp\0twmail.net\0"
+"scienceandhistory.museum\0"
+"jp.eu.org\0"
+"shia\0"
+"no-ip.net\0"
+"nayoro.hokkaido.jp\0in-vpn.net\0"
+"jogasz.hu\0afjord.no\0"
+"sp.gov.br\0rnrt.tn\0"
+"tsuchiura.ibaraki.jp\0agdenes.no\0\xd1\x80\xd1\x83\xd1\x81\0"
+"spy.museum\0\xe4\xb8\x96\xe7\x95\x8c\0"
+"alta.no\0"
+"ena.gifu.jp\0"
+"gouv.fr\0forl\xc3\xac""cesena.it\0"
+"kisosaki.mie.jp\0"
+"lamborghini\0"
+"jobs\0"
+"\xd8\xa7\xd8\xaa\xd8\xb5\xd8\xa7\xd9\x84\xd8\xa7\xd8\xaa\0"
+"n.se\0"
+"tattoo\0"
+"maif\0"
+"taranto.it\0abeno.osaka.jp\0"
+"finnoy.no\0"
+"siena.it\0\xd9\x85\xd8\xb5\xd8\xb1\0"
+"ota.gunma.jp\0"
+"utsunomiya.tochigi.jp\0drud.us\0"
+"imizu.toyama.jp\0"
+"askim.no\0"
+"gr.it\0"
+"rzeszow.pl\0"
+"v-info.info\0"
+"koeln\0"
+"gouv.ht\0mjondalen.no\0"
+"s\xc3\xb8r-aurdal.no\0"
+"gr.jp\0naka.ibaraki.jp\0fbxos.fr\0"
+"date.hokkaido.jp\0"
+"asn.lv\0so.gov.pl\0"
+"wi.us\0"
+"cable-modem.org\0spacekit.io\0"
+"kvits\xc3\xb8y.no\0"
+"koori.fukushima.jp\0edogawa.tokyo.jp\0"
+"farmers\0"
+"sakura.chiba.jp\0"
+"sanagochi.tokushima.jp\0"
+"handa.aichi.jp\0esashi.hokkaido.jp\0"
+"torahime.shiga.jp\0"
+"gouv.bj\0"
+"kimino.wakayama.jp\0"
+"gc.ca\0imabari.ehime.jp\0ia.us\0"
+"vallee-aoste.it\0"
+"health.nz\0"
+"delivery\0"
+"damnserver.com\0"
+"gouv.ci\0ide.kyoto.jp\0"
+"daisen.akita.jp\0"
+"aerobatic.aero\0adygeya.su\0"
+"homeunix.com\0"
+"takamori.kumamoto.jp\0"
+"plantation.museum\0"
+"4u.com\0"
+"adv.mz\0"
+"kv\xc3\xa6nangen.no\0\xe6\x85\x88\xe5\x96\x84\0"
+"kr.com\0"
+"flight.aero\0shop\0"
+"civilisation.museum\0of.no\0s3-website-eu-west-1.amazonaws.com\0"
+"usantiques.museum\0"
+"uvic.museum\0apps.lair.io\0"
+"show\0"
+"hadano.kanagawa.jp\0"
+"tinn.no\0\xe8\x87\xba\xe7\x81\xa3\0"
+"fukuchiyama.kyoto.jp\0"
+"kunisaki.oita.jp\0"
+"ferrero\0"
+"aikawa.kanagawa.jp\0"
+"tado.mie.jp\0london.museum\0"
+"adygeya.ru\0"
+"s3.cn-north-1.amazonaws.com.cn\0"
+"natura\0"
+"\xe6\xa0\x83\xe6\x9c\xa8.jp\0oki.fukuoka.jp\0"
+"s3.dualstack.eu-central-1.amazonaws.com\0"
+"joetsu.niigata.jp\0hinohara.tokyo.jp\0"
+"patria.bo\0my-firewall.org\0"
+"lucerne.museum\0"
+"adult.ht\0cc.oh.us\0yodobashi\0"
+"sogne.no\0in.london\0"
+"best\0cisco\0"
+"akune.kagoshima.jp\0gmina.pl\0\xd8\xa7\xd9\x84\xd8\xa7\xd8\xb1\xd8\xaf\xd9\x86\0"
+"conference.aero\0nozawaonsen.nagano.jp\0\xe0\xa4\xa8\xe0\xa5\x87\xe0\xa4\x9f\0"
+"dyn-o-saur.com\0"
+"hurum.no\0"
+"pescara.it\0"
+"from-wa.com\0"
+"surrey.museum\0statebank\0"
+"watches\0"
+"auto\0"
+"tec.mi.us\0"
+"utashinai.hokkaido.jp\0ariake.saga.jp\0is-by.us\0"
+"ryugasaki.ibaraki.jp\0fukudomi.saga.jp\0"
+"ra.it\0"
+"campinagrande.br\0portlligat.museum\0"
+"cechire.com\0"
+"tanagura.fukushima.jp\0hasama.oita.jp\0"
+"madrid.museum\0"
+"wroc.pl\0"
+"mihama.aichi.jp\0miyake.nara.jp\0clinton.museum\0"
+"m\xc3\xa5lselv.no\0"
+"muko.kyoto.jp\0hitachi\0"
+"feste-ip.net\0"
+"uz.ua\0\xd1\x81\xd1\x80\xd0\xb1\0law.za\0landrover\0"
+"zp.gov.pl\0"
+"health.vn\0"
+"ci.it\0echizen.fukui.jp\0"
+"air-traffic-control.aero\0toscana.it\0"
+"venezia.it\0hidaka.hokkaido.jp\0community\0"
+"salud.bo\0"
+"civilwar.museum\0trogstad.no\0"
+"tomioka.gunma.jp\0"
+"philately.museum\0"
+"tranby.no\0"
+"travel.pl\0"
+"sr.gov.pl\0bauhaus\0"
+"nv.us\0"
+"maryland.museum\0"
+"yokaichiba.chiba.jp\0"
+"carraramassa.it\0s3-ap-southeast-2.amazonaws.com\0"
+"kamimine.saga.jp\0"
+"lib.wa.us\0"
+"inabe.mie.jp\0"
+"komatsu.ishikawa.jp\0discovery.museum\0"
+"webhosting.be\0blogsyte.com\0"
+"schaeffler\0"
+"ekloges.cy\0buzen.fukuoka.jp\0zapto.org\0"
+"bremanger.no\0"
+"press.aero\0museumvereniging.museum\0"
+"staples\0"
+"static-access.net\0"
+"bjerkreim.no\0"
+"bj.cn\0sobetsu.hokkaido.jp\0ismaili\0"
+"sumoto.kumamoto.jp\0stordal.no\0"
+"fredrikstad.no\0"
+"ami.ibaraki.jp\0shingu.wakayama.jp\0"
+"oamishirasato.chiba.jp\0"
+"kikonai.hokkaido.jp\0repair\0"
+"nord-aurdal.no\0"
+"okazaki.aichi.jp\0grondar.za\0"
+"s3-sa-east-1.amazonaws.com\0"
+"couchpotatofries.org\0"
+"no-ip.info\0"
+"vestre-slidre.no\0\xe5\x80\x8b\xe4\xba\xba.\xe9\xa6\x99\xe6\xb8\xaf\0"
+"kishiwada.osaka.jp\0"
+"airtraffic.aero\0nagano.jp\0inuyama.aichi.jp\0"
+"dsmynas.org\0"
+"amsterdam.museum\0hoyanger.no\0"
+"travel.tt\0"
+"ogose.saitama.jp\0"
+"higashi.fukuoka.jp\0"
+"for-the.biz\0"
+"surnadal.no\0bytom.pl\0"
+"winb.gov.pl\0wellbeingzone.eu\0"
+"zentsuji.kagawa.jp\0minamidaito.okinawa.jp\0trondheim.no\0"
+"res.aero\0"
+"urbinopesaro.it\0"
+"etajima.hiroshima.jp\0"
+"gjemnes.no\0glitch.me\0"
+"silk\0"
+"kisarazu.chiba.jp\0"
+"esurance\0"
+"austevoll.no\0k12.ky.us\0sa-east-1.elasticbeanstalk.com\0better-than.tv\0"
+"higashiagatsuma.gunma.jp\0ug.gov.pl\0"
+"fuoisku.no\0"
+"fbx-os.fr\0"
+"fujieda.shizuoka.jp\0"
+"openair.museum\0"
+"suginami.tokyo.jp\0"
+"kawaba.gunma.jp\0takasaki.gunma.jp\0stage.nodeart.io\0"
+"warabi.saitama.jp\0"
+"chirurgiens-dentistes-en-france.fr\0"
+"virtualserver.io\0"
+"sakae.chiba.jp\0kawai.nara.jp\0sina\0"
+"oguni.yamagata.jp\0voss.no\0"
+"pr.it\0"
+"kitagawa.kochi.jp\0"
+"odda.no\0"
+"site.builder.nu\0"
+"webhop.net\0"
+"moka.tochigi.jp\0lincoln\0is.eu.org\0"
+"pippu.hokkaido.jp\0"
+"sciencesnaturelles.museum\0"
+"gouv.sn\0"
+"shibecha.hokkaido.jp\0"
+"college\0url.tw\0"
+"massa-carrara.it\0"
+"diet\0*.otap.co\0"
+"yashio.saitama.jp\0chofu.tokyo.jp\0"
+"\xe8\xaf\xba\xe5\x9f\xba\xe4\xba\x9a\0"
+"miasa.nagano.jp\0"
+"l.bg\0servebbs.com\0"
+"family\0"
+"ichikawamisato.yamanashi.jp\0"
+"2.bg\0\xd8\xb3\xd9\x88\xd8\xaf\xd8\xa7\xd9\x86\0"
+"komforb.se\0"
+"customer.speedpartner.de\0"
+"it.eu.org\0"
+"caserta.it\0"
+"tamba.hyogo.jp\0"
+"miyako.iwate.jp\0"
+"\xe7\xbd\x91\xe5\x9d\x80\0bmoattachments.org\0"
+"kosei.shiga.jp\0"
+"shakotan.hokkaido.jp\0"
+"larsson.museum\0"
+"tel.tr\0cherkassy.ua\0is-a-cubicle-slave.com\0"
+"zappos\0lubartow.pl\0"
+"oguni.kumamoto.jp\0"
+"os\xc3\xb8yro.no\0"
+"support\0"
+"koshimizu.hokkaido.jp\0"
+"film.hu\0assisi.museum\0hockey\0cistron.nl\0"
+"nature.museum\0in.na\0"
+"ardal.no\0cookingchannel\0"
+"consulting.aero\0burghof.museum\0"
+"shiraoka.saitama.jp\0in.ni\0vladimir.su\0"
+"toba.mie.jp\0minnesota.museum\0"
+"tsuruoka.yamagata.jp\0"
+"caa.aero\0freight.aero\0"
+"freeddns.org\0"
+"oga.akita.jp\0no-ip.ca\0"
+"umig.gov.pl\0nissan\0"
+"\xc3\xb8rskog.no\0bplaced.com\0"
+"site\0"
+"tottori.tottori.jp\0"
+"muroto.kochi.jp\0review\0"
+"kamikawa.hyogo.jp\0karmoy.no\0go-vip.net\0"
+"nissay\0"
+"yawara.ibaraki.jp\0riodejaneiro.museum\0"
+"in.eu.org\0"
+"uchiko.ehime.jp\0yao.osaka.jp\0auto.pl\0"
+"horse\0is-a-liberal.com\0"
+"voorloper.cloud\0"
+"freeddns.us\0"
+"nishinoshima.shimane.jp\0limanowa.pl\0"
+"cc.tn.us\0"
+"minokamo.gifu.jp\0estate.museum\0k12.nv.us\0\xd1\x83\xd0\xbf\xd1\x80.\xd1\x81\xd1\x80\xd0\xb1\0vladimir.ru\0"
+"bristol.museum\0"
+"steinkjer.no\0"
+"heimatunduhren.museum\0koeln.museum\0"
+"golffan.us\0"
+"targi.pl\0"
+"fukushima.hokkaido.jp\0"
+"fosnes.no\0showtime\0"
+"essex.museum\0"
+"hicam.net\0"
+"ikawa.akita.jp\0"
+"gouv.km\0"
+"medizinhistorisches.museum\0"
+"happou.akita.jp\0ilawa.pl\0"
+"to.gov.br\0"
+"chippubetsu.hokkaido.jp\0"
+"pc.it\0in.rs\0"
+"dell-ogliastra.it\0suwalki.pl\0"
+"itoigawa.niigata.jp\0toshima.tokyo.jp\0wolterskluwer\0"
+"li.it\0namikata.ehime.jp\0"
+"ddnss.org\0"
+"fukushima.jp\0muroran.hokkaido.jp\0"
+"eu-west-1.elasticbeanstalk.com\0"
+"ama.aichi.jp\0"
+"geek.nz\0quicksytes.com\0"
+"agriculture.museum\0"
+"citic\0"
+"chase\0wales\0dscloud.mobi\0"
+"fuefuki.yamanashi.jp\0gouv.ml\0in.th\0"
+"iwatsuki.saitama.jp\0"
+"chiyoda.tokyo.jp\0is-not-certified.com\0"
+"seirou.niigata.jp\0"
+"nt.au\0"
+"meldal.no\0"
+"wv.us\0"
+"shizukuishi.iwate.jp\0"
+"in.ua\0pa.leg.br\0"
+"texas.museum\0univ.sn\0cyou\0virtual-user.de\0"
+"vlaanderen\0"
+"law.pro\0cust.disrec.thingdust.io\0"
+"nt.ca\0pr.us\0"
+"nakagusuku.okinawa.jp\0"
+"togura.nagano.jp\0okinawa.okinawa.jp\0"
+"\xc3\xa1k\xc5\x8boluokta.no\0k\xc3\xa5""fjord.no\0"
+"tottori.jp\0ikeda.fukui.jp\0onna.okinawa.jp\0republican\0"
+"rightathome\0"
+"town.museum\0in.us\0"
+"city.hu\0jprs\0"
+"flanders.museum\0"
+"ditchyourip.com\0firewall-gateway.de\0"
+"olawa.pl\0"
+"veterinaire.km\0youtube\0"
+"sorfold.no\0az.us\0"
+"sakai.fukui.jp\0arai.shizuoka.jp\0"
+"lib.ri.us\0"
+"is-a-financialadvisor.com\0pb.leg.br\0"
+"dyn53.io\0"
+"troitsk.su\0"
+"friulivegiulia.it\0lib.ms.us\0lib.nc.us\0futbol\0"
+"\xe9\xab\x98\xe7\x9f\xa5.jp\0frosta.no\0servebeer.com\0"
+"suli.hu\0from-pr.com\0"
+"ina.nagano.jp\0"
+"nosegawa.nara.jp\0"
+"genoa.it\0"
+"shopping\0"
+"parma.it\0misasa.tottori.jp\0firebaseapp.com\0"
+"nakagawa.fukuoka.jp\0"
+"in-addr.arpa\0"
+"lib.ca.us\0twmail.org\0memset.net\0"
+"komvux.se\0"
+"dish\0"
+"legnica.pl\0"
+"oita.jp\0"
+"perugia.it\0kamoenai.hokkaido.jp\0"
+"kobayashi.miyazaki.jp\0"
+"wales.museum\0"
+"flir\0"
+"joboji.iwate.jp\0foodnetwork\0"
+"com.ac\0"
+"teramo.it\0terni.it\0"
+"com.af\0\xe6\x84\x9b\xe5\xaa\x9b.jp\0"
+"com.ag\0"
+"bato.tochigi.jp\0"
+"com.ai\0pc.pl\0"
+"paris.eu.org\0"
+"com.al\0intel\0"
+"com.am\0hurdal.no\0"
+"veterinaire.fr\0"
+"com.ba\0"
+"com.ar\0com.bb\0genkai.saga.jp\0myddns.rocks\0"
+"fujinomiya.shizuoka.jp\0lyngen.no\0n\xc3\xb8tter\xc3\xb8y.no\0"
+"loyalist.museum\0wedding\0"
+"com.au\0"
+"com.aw\0forgot.his.name\0"
+"com.bh\0piemonte.it\0tokashiki.okinawa.jp\0"
+"com.bi\0cc.wi.us\0"
+"com.az\0ueda.nagano.jp\0kofu.yamanashi.jp\0building.museum\0"
+"com.bm\0\xe5\x9f\xbc\xe7\x8e\x89.jp\0fedex\0"
+"com.bn\0"
+"com.bo\0taku.saga.jp\0"
+"carbonia-iglesias.it\0k12.nm.us\0is-gone.com\0"
+"com.br\0soundcast.me\0"
+"com.bs\0"
+"com.bt\0"
+"friulive-giulia.it\0notaires.km\0"
+"zara\0"
+"com.by\0com.ci\0"
+"com.bz\0"
+"oguchi.aichi.jp\0wmflabs.org\0"
+"com.cm\0cc.ia.us\0\xd1\x83\xd0\xba\xd1\x80\0prudential\0"
+"production.aero\0com.cn\0showa.gunma.jp\0iobb.net\0"
+"jdf.br\0com.co\0"
+"takehara.hiroshima.jp\0"
+"tsukigata.hokkaido.jp\0s3-eu-west-3.amazonaws.com\0"
+"ishikawa.jp\0urausu.hokkaido.jp\0l.se\0"
+"com.cu\0rn.it\0americanart.museum\0com.de\0"
+"hisamitsu\0"
+"com.cw\0"
+"\xce\xb5\xce\xbb\0hb.cldmail.ru\0"
+"imb.br\0com.cy\0"
+"washingtondc.museum\0"
+"com.dm\0mycd.eu\0nid.io\0"
+"encyclopedic.museum\0penza.su\0"
+"com.do\0"
+"com.ec\0hirara.okinawa.jp\0"
+"*.sendai.jp\0kosuge.yamanashi.jp\0"
+"com.ee\0mikawa.yamagata.jp\0stockholm\0"
+"com.eg\0tosu.saga.jp\0"
+"izumizaki.fukushima.jp\0sm.ua\0"
+"com.dz\0balestrand.no\0"
+"avoues.fr\0"
+"infiniti\0"
+"hikawa.shimane.jp\0"
+"aomori.jp\0"
+"saroma.hokkaido.jp\0"
+"vet.br\0com.es\0"
+"com.et\0"
+"hokuryu.hokkaido.jp\0staging.onred.one\0"
+"nahari.kochi.jp\0"
+"londrina.br\0"
+"pgafan.net\0"
+"is-a-bruinsfan.org\0"
+"com.fr\0tobishima.aichi.jp\0"
+"com.ge\0otago.museum\0rygge.no\0ky.us\0co.business\0"
+"cooking\0"
+"sasayama.hyogo.jp\0skedsmokorset.no\0no-ip.co.uk\0"
+"com.gh\0valle-aosta.it\0gs.of.no\0"
+"com.gi\0tomari.hokkaido.jp\0"
+"v\xc3\xa5ler.hedmark.no\0"
+"mordovia.su\0"
+"com.gl\0"
+"com.gn\0lindas.no\0"
+"com.gp\0dyndns-blog.com\0"
+"trentinoaadige.it\0"
+"com.gr\0"
+"goshiki.hyogo.jp\0\xe7\xbd\x91\xe7\xab\x99\0"
+"com.gt\0ak.us\0americanexpress\0"
+"com.gu\0taiki.mie.jp\0productions\0"
+"forsale\0*.0emm.com\0"
+"ssl.origin.cdn77-secure.org\0"
+"com.gy\0"
+"com.hk\0agrigento.it\0kamigori.hyogo.jp\0"
+"sch.ae\0oe.yamagata.jp\0"
+"com.hn\0bjark\xc3\xb8y.no\0dyndns-mail.com\0"
+"pistoia.it\0holdings\0*.stg.dev\0"
+"com.hr\0nome.pt\0ltda\0"
+"com.ht\0"
+"nt.no\0\xd0\xbe\xd0\xb1\xd1\x80.\xd1\x81\xd1\x80\xd0\xb1\0comsec\0"
+"kiso.nagano.jp\0"
+"\xe7\xb5\x84\xe7\xb9\x94.\xe9\xa6\x99\xe6\xb8\xaf\0dynalias.net\0"
+"tunes\0"
+"r\xc3\xa6lingen.no\0hepforge.org\0"
+"tank.museum\0"
+"com.im\0wajiki.tokushima.jp\0"
+"com.io\0"
+"iwate.iwate.jp\0"
+"com.iq\0work\0"
+"catania.it\0shibata.miyagi.jp\0seoul.kr\0"
+"com.is\0kasuya.fukuoka.jp\0gemological.museum\0groks-this.info\0"
+"press.museum\0rocks\0"
+"orsta.no\0"
+"iris.arpa\0"
+"malvik.no\0"
+"mordovia.ru\0"
+"tsuyama.okayama.jp\0"
+"s\xc3\xb8ndre-land.no\0"
+"schokokeks.net\0"
+"com.jo\0"
+"lugansk.ua\0"
+"kazuno.akita.jp\0"
+"eu.meteorapp.com\0"
+"ibara.okayama.jp\0sklep.pl\0nis.za\0cloud.fedoraproject.org\0"
+"com.kg\0\xd7\xa7\xd7\x95\xd7\x9d\0s3.dualstack.ap-southeast-1.amazonaws.com\0"
+"com.ki\0"
+"jan-mayen.no\0"
+"kunigami.okinawa.jp\0"
+"com.km\0"
+"tsumagoi.gunma.jp\0"
+"usdecorativearts.museum\0leikanger.no\0"
+"obira.hokkaido.jp\0com.kp\0"
+"com.la\0"
+"com.lb\0*.alces.network\0"
+"com.lc\0"
+"artanddesign.museum\0osen.no\0"
+"sn\xc3\xa5sa.no\0"
+"com.kw\0dreamhosters.com\0"
+"tamakawa.fukushima.jp\0mykolaiv.ua\0"
+"com.ky\0"
+"com.kz\0"
+"com.lk\0freebox-os.fr\0withyoutube.com\0"
+"cc.nv.us\0"
+"aknoluokta.no\0"
+"pi.leg.br\0"
+"pvh.br\0"
+"tsunan.niigata.jp\0com.lr\0skin\0"
+"k12.fl.us\0pizza\0"
+"kashima.saga.jp\0nt.ro\0"
+"com.lv\0"
+"cuneo.it\0kainan.tokushima.jp\0com.mg\0*.kunden.ortsinfo.at\0"
+"k12.ar.us\0"
+"com.ly\0"
+"com.mk\0discover\0from-id.com\0"
+"com.ml\0tysvar.no\0"
+"n\xc3\xa6r\xc3\xb8y.no\0bplaced.net\0"
+"kai.yamanashi.jp\0"
+"com.mo\0globo\0"
+"com.na\0"
+"bifuka.hokkaido.jp\0"
+"com.ms\0lunner.no\0qualifioapp.com\0"
+"com.mt\0"
+"obama.nagasaki.jp\0com.mu\0"
+"com.mv\0com.nf\0vuelos\0"
+"com.mw\0com.ng\0"
+"com.mx\0"
+"com.my\0com.ni\0"
+"kamagaya.chiba.jp\0"
+"df.gov.br\0komatsu\0"
+"channelsdvr.net\0global.prod.fastly.net\0"
+"nara.jp\0"
+"mo\xc3\xa5reke.no\0bible\0"
+"ne.jp\0"
+"uenohara.yamanashi.jp\0bindal.no\0com.nr\0"
+"ne.ke\0"
+"tula.su\0"
+"costume.museum\0od.ua\0"
+"bulsan-sudtirol.it\0soma.fukushima.jp\0osakikamijima.hiroshima.jp\0nishikawa.yamagata.jp\0user.aseinet.ne.jp\0"
+"y.bg\0"
+"pp.az\0com.om\0"
+"bilbao.museum\0"
+"ne.kr\0com.pa\0"
+"definima.net\0"
+"cloudfront.net\0"
+"com.pe\0"
+"com.pf\0cv.ua\0"
+"kitayama.wakayama.jp\0lier.no\0"
+"com.ph\0at-band-camp.net\0"
+"sch.id\0com.pk\0"
+"tj.cn\0com.pl\0"
+"shimotsuma.ibaraki.jp\0\xe0\xa4\xad\xe0\xa4\xbe\xe0\xa4\xb0\xe0\xa4\xa4\0"
+"ruovat.no\0"
+"com.qa\0"
+"kamitsue.oita.jp\0com.pr\0mlbfan.org\0"
+"\xe4\xbd\x90\xe8\xb3\x80.jp\0bill.museum\0com.ps\0exchange\0"
+"com.pt\0"
+"jgora.pl\0"
+"sch.ir\0com.py\0go-vip.co\0"
+"center\0"
+"elasticbeanstalk.com\0"
+"pvt.k12.ma.us\0"
+"otsuki.kochi.jp\0"
+"nextdirect\0"
+"the.br\0dsmynas.net\0"
+"com.re\0lib.la.us\0"
+"natal.br\0sch.jo\0"
+"karasuyama.tochigi.jp\0"
+"ravenna.it\0"
+"matsubushi.saitama.jp\0deals\0vpndns.net\0"
+"med.br\0meland.no\0"
+"perso.ht\0ringebu.no\0"
+"ikoma.nara.jp\0sakai.osaka.jp\0"
+"anthropology.museum\0durham.museum\0"
+"com.ro\0"
+"weather\0myjino.ru\0"
+"com.sa\0"
+"dgca.aero\0com.sb\0"
+"com.sc\0"
+"com.sd\0"
+"com.se\0com.ru\0"
+"ibaraki.jp\0com.sg\0"
+"com.sh\0"
+"matsumoto.nagano.jp\0"
+"niigata.jp\0com.sl\0"
+"video\0"
+"art.museum\0virtual.museum\0com.sn\0"
+"com.so\0"
+"itako.ibaraki.jp\0sch.lk\0rodeo\0"
+"com.ss\0northwesternmutual\0"
+"ogata.akita.jp\0com.st\0pt.eu.org\0"
+"opoczno.pl\0podhale.pl\0lugs.org.uk\0"
+"arteducation.museum\0com.sv\0xnbay.com\0"
+"com.sy\0"
+"correios-e-telecomunica\xc3\xa7\xc3\xb5""es.museum\0com.tj\0"
+"milano.it\0roma.it\0s3-fips-us-gov-west-1.amazonaws.com\0"
+"med.ec\0*.awdev.ca\0"
+"com.tm\0"
+"med.ee\0com.tn\0"
+"com.to\0pe.leg.br\0yandexcloud.net\0"
+"sch.ly\0"
+"com.ua\0paris\0"
+"com.tr\0discourse.group\0"
+"host\0"
+"com.tt\0"
+"francaise.museum\0ne.pw\0"
+"com.tw\0com.ug\0us-east-1.elasticbeanstalk.com\0"
+"modelling.aero\0k12.sc.us\0"
+"katsuragi.wakayama.jp\0klodzko.pl\0"
+"rad\xc3\xb8y.no\0from-la.net\0"
+"nishiawakura.okayama.jp\0"
+"sch.ng\0online.th\0from-ak.com\0"
+"utah.museum\0"
+"v\xc3\xa5gan.no\0"
+"nagasaki.jp\0"
+"ogasawara.tokyo.jp\0varoy.no\0com.vc\0"
+"v\xc3\xa5ler.\xc3\xb8stfold.no\0"
+"com.ve\0"
+"k12.gu.us\0"
+"priv.hu\0"
+"com.uy\0com.vi\0"
+"trani-andria-barletta.it\0kawaminami.miyazaki.jp\0com.uz\0"
+"tr\xc3\xb8gstad.no\0"
+"iijima.nagano.jp\0"
+"com.vn\0"
+"isumi.chiba.jp\0"
+"*.moonscale.io\0"
+"com.vu\0"
+"tohnosho.chiba.jp\0"
+"guide\0"
+"yolasite.com\0"
+"is-a-lawyer.com\0"
+"mugi.tokushima.jp\0"
+"democracia.bo\0"
+"*.nagoya.jp\0"
+"com.ws\0"
+"lifestyle\0"
+"helsinki\0"
+"miyada.nagano.jp\0"
+"\xd8\xa7\xd8\xb1\xd8\xa7\xd9\x85\xd9\x83\xd9\x88\0"
+"sch.qa\0"
+"akaiwa.okayama.jp\0"
+"med.ht\0"
+"flog.br\0"
+"from-tx.com\0"
+"s3-website.eu-west-3.amazonaws.com\0"
+"j.bg\0okawa.kochi.jp\0we.bs\0"
+"brumunddal.no\0pruszkow.pl\0ne.ug\0"
+"odo.br\0ponpes.id\0"
+"sk.ca\0*.sapporo.jp\0"
+"ne.tz\0"
+"0.bg\0corsica\0"
+"grane.no\0"
+"motosu.gifu.jp\0"
+"\xe0\xae\x87\xe0\xae\xb2\xe0\xae\x99\xe0\xaf\x8d\xe0\xae\x95\xe0\xaf\x88\0"
+"taa.it\0"
+"minamiaiki.nagano.jp\0"
+"lowicz.pl\0ne.us\0cloudns.pro\0"
+"surgeonshall.museum\0"
+"sandoy.no\0"
+"textile.museum\0"
+"sch.sa\0"
+"ga.us\0"
+"com.zm\0"
+"trd.br\0ogawa.nagano.jp\0"
+"trentino-stirol.it\0wegrow.pl\0selfip.net\0"
+"vlog.br\0est-a-la-masion.com\0"
+"obu.aichi.jp\0"
+"meet\0"
+"fhsk.se\0sch.so\0"
+"kasugai.aichi.jp\0stuff-4-sale.org\0kalmykia.su\0priv.at\0"
+"architecture.museum\0\xe6\x88\x91\xe7\x88\xb1\xe4\xbd\xa0\0"
+"nagiso.nagano.jp\0"
+"balsan-suedtirol.it\0"
+"romskog.no\0grozny.su\0telebit.app\0"
+"beiarn.no\0"
+"koge.tottori.jp\0"
+"takata.fukuoka.jp\0iwafune.tochigi.jp\0aremark.no\0"
+"of.fashion\0"
+"iiyama.nagano.jp\0cambridge.museum\0lib.al.us\0"
+"ouda.nara.jp\0"
+"trentin-sud-tirol.it\0kawakami.nara.jp\0"
+"med.ly\0"
+"wedeploy.sh\0"
+"kijo.miyazaki.jp\0"
+"fl\xc3\xa5.no\0"
+"tono.iwate.jp\0"
+"masfjorden.no\0"
+"yoichi.hokkaido.jp\0"
+"gateway.museum\0bike\0"
+"h\xc3\xb8nefoss.no\0"
+"rexroth\0"
+"kure.hiroshima.jp\0"
+"kalmykia.ru\0"
+"tsuno.kochi.jp\0"
+"nagawa.nagano.jp\0"
+"engineer.aero\0notaires.fr\0"
+"flora.no\0"
+"moriyama.shiga.jp\0"
+"izu.shizuoka.jp\0"
+"kouzushima.tokyo.jp\0"
+"cc.wv.us\0azure\0is-a-nurse.com\0pr.leg.br\0"
+"gamagori.aichi.jp\0"
+"fuji.shizuoka.jp\0"
+"grozny.ru\0"
+"engerdal.no\0"
+"yame.fukuoka.jp\0med.om\0liaison\0"
+"tashkent.su\0"
+"cc.pr.us\0\xe6\x94\xbf\xe5\xba\x9c\0"
+"med.pa\0"
+"s\xc3\xb8rreisa.no\0bashkiria.ru\0"
+"shimokawa.hokkaido.jp\0"
+"archaeology.museum\0parts\0"
+"sveio.no\0cityeats\0"
+"cc.in.us\0"
+"florida.museum\0med.pl\0"
+"canada.museum\0"
+"party\0homedns.org\0dyn-vpn.de\0"
+"pp.se\0pp.ru\0"
+"shimonita.gunma.jp\0kawachinagano.osaka.jp\0"
+"y.se\0"
+"tsugaru.aomori.jp\0nesodden.no\0is-an-engineer.com\0"
+"rj.gov.br\0"
+"usgarden.museum\0cc.az.us\0click\0"
+"bashkiria.su\0"
+"agematsu.nagano.jp\0"
+"pa.it\0obama.fukui.jp\0"
+"umb.it\0railroad.museum\0"
+"nikolaev.ua\0bing\0"
+"yokoze.saitama.jp\0"
+"repl.run\0"
+"firewall-gateway.com\0"
+"lg.jp\0holmestrand.no\0bar.pro\0broke-it.net\0"
+"kasamatsu.gifu.jp\0channel\0"
+"taobao\0"
+"sch.zm\0pp.ua\0"
+"meme\0"
+"b\xc3\xb8.nordland.no\0"
+"sumoto.hyogo.jp\0lv.ua\0"
+"med.sa\0"
+"langevag.no\0med.sd\0"
+"careers\0"
+"onojo.fukuoka.jp\0"
+"crown\0moscow\0"
+"alaska.museum\0"
+"anani.br\0susono.shizuoka.jp\0mysecuritycamera.net\0"
+"radom.pl\0"
+"takko.aomori.jp\0matsukawa.nagano.jp\0"
+"dattorelay.com\0"
+"calvinklein\0"
+"aca.pro\0"
+"il.us\0"
+"oyama.tochigi.jp\0"
+"bplaced.de\0"
+"lig.it\0condos\0dynvpn.de\0"
+"tydal.no\0menu\0"
+"jx.cn\0"
+"tokai.aichi.jp\0stat.no\0"
+"toyoura.hokkaido.jp\0shinagawa.tokyo.jp\0"
+"geology.museum\0"
+"lib.ne.us\0forex\0"
+"kitakata.fukushima.jp\0labour.museum\0"
+"oregon.museum\0perso.sn\0supplies\0"
+"oppdal.no\0"
+"mielno.pl\0"
+"photos\0"
+"lazio.it\0"
+"inder\xc3\xb8y.no\0"
+"naroy.no\0"
+"nikko.tochigi.jp\0hm.no\0"
+"dellogliastra.it\0perso.tn\0"
+"ayagawa.kagawa.jp\0"
+"barum.no\0"
+"nagasu.kumamoto.jp\0"
+"nakai.kanagawa.jp\0ikano\0l-o-g-i-n.de\0"
+"setouchi.okayama.jp\0"
+"tenkawa.nara.jp\0"
+"is-a-personaltrainer.com\0wedeploy.me\0"
+"uhren.museum\0"
+"hitachinaka.ibaraki.jp\0rissa.no\0"
+"nieruchomosci.pl\0"
+"gs.jan-mayen.no\0"
+"trentin-sued-tirol.it\0"
+"tsuru.yamanashi.jp\0"
+"ofunato.iwate.jp\0"
+"oto.fukuoka.jp\0"
+"b-data.io\0"
+"cleaning\0"
+"birkenes.no\0laakesvuemie.no\0"
+"war.museum\0appchizi.com\0"
+"eidsberg.no\0"
+"sevastopol.ua\0house\0"
+"tateyama.chiba.jp\0"
+"swiebodzin.pl\0"
+"shishikui.tokushima.jp\0"
+"kanagawa.jp\0palmsprings.museum\0yalta.ua\0"
+"mashiko.tochigi.jp\0"
+"cc.ky.us\0"
+"cloudns.org\0"
+"historyofscience.museum\0"
+"yanaizu.fukushima.jp\0akkeshi.hokkaido.jp\0ap-northeast-3.elasticbeanstalk.com\0"
+"hangout\0"
+"izumo.shimane.jp\0farsund.no\0"
+"per.la\0cc.ak.us\0flights\0"
+"stjordal.no\0"
+"its.me\0"
+"mitsuke.niigata.jp\0hino.tokyo.jp\0"
+"horology.museum\0pokrovsk.su\0"
+"vision\0"
+"bio.br\0pioneer\0"
+"cheap\0"
+"annaka.gunma.jp\0"
+"vall\xc3\xa9""e-aoste.it\0"
+"sandvikcoromant\0"
+"ct.it\0"
+"website\0"
+"uzs.gov.pl\0"
+"*.compute.estate\0"
+"tsurugi.ishikawa.jp\0minamimaki.nagano.jp\0"
+"square.museum\0lg.ua\0"
+"abiko.chiba.jp\0kerryhotels\0"
+"tychy.pl\0"
+"sannan.hyogo.jp\0"
+"kurate.fukuoka.jp\0"
+"spb.ru\0"
+"per.nf\0"
+"uda.nara.jp\0arts.museum\0"
+"oiso.kanagawa.jp\0"
+"pa.us\0"
+"tw.cn\0"
+"directory\0luxe\0"
+"gs.nt.no\0amsterdam\0"
+"dynalias.org\0spb.su\0"
+"dyndns.org\0from-sd.com\0"
+"*.kawasaki.jp\0"
+"ojiya.niigata.jp\0"
+"sa.gov.au\0priv.pl\0"
+"mediocampidano.it\0"
+"kawakita.ishikawa.jp\0"
+"tozsde.hu\0"
+"consultant.aero\0"
+"choyo.kumamoto.jp\0lanxess\0hu.net\0"
+"vf.no\0"
+"kokubunji.tokyo.jp\0"
+"rl.no\0"
+"halloffame.museum\0"
+"ginoza.okinawa.jp\0"
+"valle-d-aosta.it\0"
+"suisse.museum\0"
+"soc.lk\0kddi\0"
+"national.museum\0"
+"*.elb.amazonaws.com\0"
+"hirono.fukushima.jp\0""3utilities.com\0"
+"yonaguni.okinawa.jp\0"
+"priv.no\0"
+"vinnica.ua\0"
+"clubmed\0"
+"creditcard\0money\0"
+"deatnu.no\0\xd9\xbe\xd8\xa7\xd9\x83\xd8\xb3\xd8\xaa\xd8\xa7\xd9\x86\0is-into-anime.com\0cloud.goog\0"
+"s3-us-west-1.amazonaws.com\0s3-website-us-west-1.amazonaws.com\0"
+"rr.gov.br\0"
+"tamamura.gunma.jp\0"
+"s3.ca-central-1.amazonaws.com\0"
+"bonn.museum\0"
+"keisen.fukuoka.jp\0"
+"est-a-la-maison.com\0"
+"bo.telemark.no\0"
+"ise.mie.jp\0"
+"accountant\0"
+"\xc3\xa5mli.no\0per.sg\0"
+"campania.it\0"
+"ski.no\0"
+"blogspot.com.cy\0"
+"tanohata.iwate.jp\0ashikaga.tochigi.jp\0bounceme.net\0"
+"priv.me\0"
+"mitane.akita.jp\0"
+"sejny.pl\0"
+"rs.gov.br\0sc.gov.br\0wazuka.kyoto.jp\0"
+"k12.id.us\0"
+"volvo\0"
+"turin.it\0blogspot.com.ee\0"
+"lamer\0"
+"tarumizu.kagoshima.jp\0blogspot.com.eg\0"
+"s3.dualstack.eu-west-1.amazonaws.com\0east-kazakhstan.su\0"
+"awaji.hyogo.jp\0"
+"umbria.it\0fujimi.nagano.jp\0nov.ru\0"
+"s\xc3\xb8r-fron.no\0"
+"ebino.miyazaki.jp\0orx.biz\0"
+"wedeploy.io\0"
+"school.museum\0"
+"onyourside\0s3-website-ap-southeast-1.amazonaws.com\0xenapponazure.com\0"
+"blogspot.com.ar\0"
+"chikuma.nagano.jp\0toshiba\0"
+"us.com\0"
+"blogspot.com.au\0"
+"ms.it\0"
+"elk.pl\0nohost.me\0"
+"sakado.saitama.jp\0"
+"forum\0"
+"shinkamigoto.nagasaki.jp\0nov.su\0"
+"guovdageaidnu.no\0"
+"ba.gov.br\0"
+"\xd8\xb3\xd9\x88\xd8\xb1\xd9\x8a\xd8\xa7\0firmdale\0gmail\0"
+"\xd0\xbe\xd0\xb4.\xd1\x81\xd1\x80\xd0\xb1\0\xd8\xb3\xd9\x88\xd8\xb1\xd9\x8a\xd8\xa9\0is-very-bad.org\0blogspot.com.br\0"
+"kadena.okinawa.jp\0\xe4\xb8\xad\xe5\x9b\xbd\0*.spectrum.myjino.ru\0"
+"ce.it\0rindal.no\0"
+"noda.chiba.jp\0hoteles\0"
+"kopervik.no\0myfirewall.org\0"
+"traniandriabarletta.it\0blogspot.com.by\0"
+"cymru.museum\0"
+"w.bg\0kh.ua\0blogspot.com.co\0"
+"alstahaug.no\0"
+"\xe4\xb8\xad\xe5\x9c\x8b\0gb.com\0"
+"komatsushima.tokushima.jp\0arakawa.tokyo.jp\0"
+"ms.kr\0"
+"food\0"
+"sandefjord.no\0"
+"stranda.no\0"
+"sncf\0"
+"sx.cn\0"
+"kawanabe.kagoshima.jp\0"
+"md.ci\0serveexchange.com\0"
+"s3.ap-northeast-2.amazonaws.com\0"
+"ct.us\0"
+"whaling.museum\0rana.no\0game.tw\0"
+"yotsukaido.chiba.jp\0"
+"osteroy.no\0"
+"caltanissetta.it\0"
+"schule\0xbox\0"
+"blogspot.com.es\0"
+"higashiura.aichi.jp\0casacam.net\0"
+"iamallama.com\0"
+"nagai.yamagata.jp\0"
+"kaisei.kanagawa.jp\0lib.ks.us\0stufftoread.com\0"
+"website.yandexcloud.net\0"
+"aioi.hyogo.jp\0"
+"ras.ru\0"
+"rn.gov.br\0udono.mie.jp\0"
+"\xe7\xb5\x84\xe7\xbb\x87.hk\0origins\0"
+"kuju.oita.jp\0"
+"football\0lawyer\0"
+"ford\0"
+"ikaruga.nara.jp\0nanbu.tottori.jp\0"
+"modena.it\0\xe8\x81\x94\xe9\x80\x9a\0"
+"eng.br\0"
+"\xe0\xae\x9a\xe0\xae\xbf\xe0\xae\x99\xe0\xaf\x8d\xe0\xae\x95\xe0\xae\xaa\xe0\xaf\x8d\xe0\xae\xaa\xe0\xaf\x82\xe0\xae\xb0\xe0\xaf\x8d\0"
+"otari.nagano.jp\0kin.okinawa.jp\0"
+"shiso.hyogo.jp\0"
+"bu.no\0cupcake.is\0"
+"hirosaki.aomori.jp\0"
+"\xd8\xa7\xdb\x8c\xd8\xb1\xd8\xa7\xd9\x86\0"
+"computer\0"
+"\xe6\x94\xbf\xe5\xba\x9c.hk\0liguria.it\0hanamigawa.chiba.jp\0chrome\0"
+"is-an-anarchist.com\0"
+"tananger.no\0gop.pk\0"
+"fie.ee\0"
+"canon\0"
+"ro.gov.br\0"
+"diskstation.me\0"
+"aircraft.aero\0realtor\0"
+"kahoku.yamagata.jp\0"
+"ryuoh.shiga.jp\0"
+"gunma.jp\0lebork.pl\0"
+"aisai.aichi.jp\0"
+"diskstation.eu\0"
+"motorcycle.museum\0karpacz.pl\0"
+"attorney\0"
+"cc.ne.us\0"
+"am.gov.br\0"
+"international\0"
+"2ix.at\0"
+"britishcolumbia.museum\0sebastopol.ua\0cc.ga.us\0\xe7\x82\xb9\xe7\x9c\x8b\0"
+"frontdoor\0"
+"s3.dualstack.sa-east-1.amazonaws.com\0"
+"osakasayama.osaka.jp\0"
+"pn.it\0"
+"yawatahama.ehime.jp\0somna.no\0"
+"lt.it\0"
+"nanyo.yamagata.jp\0nissedal.no\0"
+"dep.no\0"
+"*.platform.sh\0"
+"forlicesena.it\0donostia.museum\0s3.dualstack.ap-northeast-2.amazonaws.com\0no.com\0"
+"\xd8\xa7\xd9\x84\xd8\xb3\xd8\xb9\xd9\x88\xd8\xaf\xdb\x8c\xd8\xa9\0""2ix.ch\0"
+"kurashiki.okayama.jp\0"
+"rentals\0is-an-artist.com\0"
+"minamifurano.hokkaido.jp\0motorcycles\0"
+"puglia.it\0av.it\0delmenhorst.museum\0"
+"kragero.no\0"
+"venice.it\0""2ix.de\0"
+"nc.tr\0"
+"selfip.org\0"
+"h.bg\0from-dc.com\0in-the-band.net\0"
+"haram.no\0"
+"khplay.nl\0"
+"selfip.info\0karelia.su\0mysecuritycamera.org\0"
+"test-iserv.de\0"
+"pors\xc3\xa1\xc5\x8bgu.no\0"
+"takasago.hyogo.jp\0artcenter.museum\0"
+"blogspot.com.mt\0"
+"ms.us\0nc.us\0"
+"chitose.hokkaido.jp\0"
+"blogspot.com.ng\0"
+"val-d-aosta.it\0raisa.no\0"
+"tamatsukuri.ibaraki.jp\0"
+"friuli-veneziagiulia.it\0yachiyo.chiba.jp\0"
+"musica.ar\0"
+"in.net\0"
+"nuoro.it\0ms.leg.br\0"
+"kuromatsunai.hokkaido.jp\0przeworsk.pl\0"
+"smola.no\0"
+"equipment.aero\0"
+"hk.cn\0"
+"itabashi.tokyo.jp\0stalbans.museum\0nannestad.no\0"
+"musica.bo\0lib.nv.us\0"
+"schokoladen.museum\0"
+"esan.hokkaido.jp\0"
+"own.pm\0"
+"k12.ec\0realm.cz\0"
+"chino.nagano.jp\0mayfirst.org\0"
+"ichiba.tokushima.jp\0"
+"bryne.no\0lib.ct.us\0is-an-accountant.com\0"
+"iyo.ehime.jp\0sener\0"
+"george\0"
+"ap.gov.br\0"
+"nishiarita.saga.jp\0takahata.yamagata.jp\0krokstadelva.no\0barsy.shop\0"
+"blogspot.com.tr\0"
+"mt.leg.br\0"
+"hsbc\0icbc\0unusualperson.com\0"
+"natori.miyagi.jp\0"
+"gose.nara.jp\0"
+"bharti\0flowers\0"
+"pug.it\0pila.pl\0"
+"kyotango.kyoto.jp\0"
+"iitate.fukushima.jp\0pl.eu.org\0"
+"ap.gov.pl\0"
+"zero\0"
+"cartier\0"
+"cricket\0"
+"baidar.no\0tiffany\0"
+"konin.pl\0"
+"illustration.museum\0"
+"brandywinevalley.museum\0"
+"munakata.fukuoka.jp\0leka.no\0from-va.com\0"
+"touch.museum\0"
+"is-a-bulls-fan.com\0"
+"leangaviika.no\0"
+"t3l3p0rt.net\0"
+"tobe.ehime.jp\0"
+"berlev\xc3\xa5g.no\0"
+"godaddy\0blogdns.com\0"
+"miyazaki.miyazaki.jp\0"
+"krager\xc3\xb8.no\0"
+"cc.il.us\0"
+"earth\0"
+"vs.it\0playstation\0"
+"w.se\0"
+"si.it\0"
+"se.gov.br\0k12.il\0"
+"nakagawa.hokkaido.jp\0edeka\0ac.leg.br\0"
+"ono.fukui.jp\0"
+"kiyosato.hokkaido.jp\0shika.ishikawa.jp\0atsugi.kanagawa.jp\0"
+"mikasa.hokkaido.jp\0"
+"tako.chiba.jp\0"
+"appspot.com\0"
+"le.it\0seika.kyoto.jp\0"
+"barcelona.museum\0"
+"space-to-rent.com\0"
+"verdal.no\0"
+"inazawa.aichi.jp\0"
+"heguri.nara.jp\0epson\0"
+"microlight.aero\0ag.it\0"
+"blogspot.com.uy\0"
+"\xe7\xbd\x91\xe7\xbb\x9c\0"
+"katano.osaka.jp\0mosj\xc3\xb8""en.no\0lt.ua\0"
+"e12.ve\0"
+"\xe7\xbd\x91\xe7\xbb\x9c.cn\0"
+"yn.cn\0"
+"not.br\0"
+"av.tr\0"
+"md.us\0"
+"christiansburg.museum\0"
+"hiraizumi.iwate.jp\0"
+"montreal.museum\0"
+"nichinan.miyazaki.jp\0"
+"makeup\0"
+"doomdns.com\0"
+"al.eu.org\0"
+"saves-the-whales.com\0"
+"hanyu.saitama.jp\0"
+"gs.hm.no\0"
+"kainan.wakayama.jp\0"
+"protonet.io\0"
+"construction\0"
+"katsuyama.fukui.jp\0"
+"kaho.fukuoka.jp\0"
+"acct.pro\0"
+"\xc3\xa5seral.no\0kaszuby.pl\0"
+"edu.ac\0"
+"isesaki.gunma.jp\0caseih\0"
+"l\xc3\xa1hppi.no\0"
+"edu.af\0vana\0operaunite.com\0"
+"neyagawa.osaka.jp\0saskatchewan.museum\0photography\0"
+"ginan.gifu.jp\0\xd8\xa7\xd9\x84\xd8\xb3\xd8\xb9\xd9\x88\xd8\xaf\xdb\x8c\xdb\x83\0"
+"edu.al\0davvenj\xc3\xa1rga.no\0is-a-rockstar.com\0"
+"hidaka.wakayama.jp\0"
+"audnedaln.no\0"
+"mopar\0"
+"edu.ba\0"
+"edu.ar\0edu.bb\0\xd9\x81\xd9\x84\xd8\xb3\xd8\xb7\xd9\x8a\xd9\x86\0"
+"cody.museum\0"
+"khmelnytskyi.ua\0\xe5\xbe\xae\xe5\x8d\x9a\0"
+"edu.au\0nogata.fukuoka.jp\0ashibetsu.hokkaido.jp\0\xe7\xbb\x84\xe7\xbb\x87\xe6\x9c\xba\xe6\x9e\x84\0"
+"sa.gov.pl\0"
+"edu.bh\0"
+"gliding.aero\0edu.bi\0sohu\0"
+"edu.az\0miyagi.jp\0"
+"science-fiction.museum\0"
+"edu.bm\0allstate\0"
+"edu.bn\0"
+"edu.bo\0v\xc3\xa1rgg\xc3\xa1t.no\0"
+"yamada.iwate.jp\0"
+"wanggou\0"
+"edu.br\0"
+"edu.bs\0"
+"edu.bt\0"
+"arida.wakayama.jp\0"
+"edu.ci\0"
+"edu.bz\0"
+"tsubame.niigata.jp\0habikino.osaka.jp\0"
+"edu.cn\0\xe7\xbd\x91\xe7\xbb\x9c.hk\0"
+"edu.co\0"
+"\xe9\x95\xb7\xe9\x87\x8e.jp\0hzc.io\0"
+"sa.edu.au\0aso.kumamoto.jp\0kasukabe.saitama.jp\0"
+"kamikawa.saitama.jp\0"
+"edu.cu\0"
+"geisei.kochi.jp\0"
+"edu.cw\0"
+"saogonca.br\0"
+"beauxarts.museum\0"
+"izumiotsu.osaka.jp\0no-ip.biz\0"
+"karikatur.museum\0anquan\0"
+"edu.dm\0\xe0\xa8\xad\xe0\xa8\xbe\xe0\xa8\xb0\xe0\xa8\xa4\0"
+"k12.ma.us\0grainger\0"
+"edu.do\0nakijin.okinawa.jp\0"
+"lixil\0"
+"cc.pa.us\0"
+"edu.ec\0higashiosaka.osaka.jp\0"
+"edu.ee\0"
+"edu.eg\0"
+"edu.dz\0val-daosta.it\0chikusei.ibaraki.jp\0"
+"psi.br\0"
+"gotpantheon.com\0"
+"h.se\0"
+"edu.es\0"
+"edu.et\0myiphost.com\0"
+"istmein.de\0"
+"balsan.it\0"
+"media\0"
+"docs\0"
+"ora.gunma.jp\0"
+"rockart.museum\0\xe3\x82\xaf\xe3\x83\xa9\xe3\x82\xa6\xe3\x83\x89\0barsy.site\0"
+"s3-ap-southeast-1.amazonaws.com\0"
+"witd.gov.pl\0"
+"edu.ge\0nemuro.hokkaido.jp\0"
+"trentino-s\xc3\xbc""dtirol.it\0cr.it\0"
+"edu.gh\0"
+"edu.gi\0miharu.fukushima.jp\0"
+"cesena-forl\xc3\xac.it\0property\0"
+"song\0"
+"edu.gl\0"
+"sakawa.kochi.jp\0oirm.gov.pl\0"
+"edu.gn\0holiday\0"
+"edu.gp\0benevento.it\0"
+"aju.br\0edu.gr\0k12.tr\0"
+"hashimoto.wakayama.jp\0blog\0final\0"
+"show.aero\0edu.gt\0trentino-alto-adige.it\0chanel\0"
+"edu.gu\0"
+"edu.gy\0"
+"edu.hk\0""2000.hu\0"
+"gs.vf.no\0cust.prod.thingdust.io\0"
+"sony\0"
+"edu.hn\0"
+"gs.rl.no\0hyatt\0"
+"yachimata.chiba.jp\0"
+"edu.ht\0gniezno.pl\0"
+"izumozaki.niigata.jp\0"
+"asso.fr\0tsuruta.aomori.jp\0celtic.museum\0"
+"fm.br\0k12.vi\0"
+"beats\0net-freaks.com\0"
+"cn-northwest-1.eb.amazonaws.com.cn\0"
+"\xe5\xba\x83\xe5\xb3\xb6.jp\0takahama.aichi.jp\0"
+"edu.in\0"
+"edu.iq\0"
+"edu.is\0game\0"
+"asso.gp\0edu.it\0dscloud.biz\0"
+"k\xc3\xa1r\xc3\xa1\xc5\xa1johka.no\0"
+"depot.museum\0"
+"natural.bo\0lib.md.us\0"
+"sano.tochigi.jp\0"
+"edu.jo\0kaminokawa.tochigi.jp\0"
+"store\0"
+"zagan.pl\0"
+"kmpsp.gov.pl\0vologda.su\0"
+"accident-prevention.aero\0"
+"edu.kg\0land-4-sale.us\0"
+"asso.ht\0"
+"edu.ki\0lib.ar.us\0"
+"unzen.nagasaki.jp\0edu.km\0"
+"edu.kn\0is-saved.org\0"
+"edu.kp\0comcast\0"
+"akita.akita.jp\0edu.la\0"
+"edu.lb\0"
+"rikubetsu.hokkaido.jp\0edu.lc\0"
+"finance\0"
+"daiwa.hiroshima.jp\0s\xc3\xa1l\xc3\xa1t.no\0dunlop\0"
+"edu.kw\0history.museum\0"
+"niyodogawa.kochi.jp\0""1kapp.com\0"
+"shonai.yamagata.jp\0edu.ky\0sciences.museum\0"
+"edu.kz\0"
+"edu.lk\0"
+"asso.bj\0for.sale\0"
+"aurland.no\0"
+"foundation\0otsuka\0"
+"edu.lr\0"
+"edu.ls\0"
+"edu.me\0"
+"mihama.chiba.jp\0edu.lv\0"
+"edu.mg\0"
+"edu.ly\0"
+"edu.mk\0"
+"edu.ml\0nittedal.no\0"
+"asso.ci\0"
+"edu.mn\0"
+"edu.mo\0"
+"blue\0"
+"edu.ms\0"
+"edu.mt\0dnsalias.com\0"
+"edu.mv\0lab.ms\0"
+"marburg.museum\0edu.mw\0edu.ng\0"
+"edu.mx\0"
+"edu.my\0edu.ni\0"
+"tas.edu.au\0edu.mz\0"
+"muosat.no\0"
+"amami.kagoshima.jp\0omi.niigata.jp\0"
+"etnedal.no\0kutno.pl\0"
+"\xe5\xb2\xa9\xe6\x89\x8b.jp\0energy\0al.leg.br\0"
+"from-hi.com\0"
+"kharkiv.ua\0"
+"crd.co\0"
+"\xe9\xb3\xa5\xe5\x8f\x96.jp\0edu.nr\0mytis.ru\0"
+"sicily.it\0ichinoseki.iwate.jp\0s3-website.eu-west-2.amazonaws.com\0webhop.me\0"
+"sharp\0"
+"kiev.ua\0"
+"yuasa.wakayama.jp\0cc.ct.us\0"
+"schlesisches.museum\0marine.ru\0filegear-ie.me\0caa.li\0"
+"!city.kawasaki.jp\0azerbaijan.su\0""32-b.it\0"
+"edu.om\0"
+"asso.dz\0read-books.org\0"
+"troms\xc3\xb8.no\0"
+"immobilien\0"
+"na.it\0hob\xc3\xb8l.no\0edu.pa\0"
+"\xe4\xbf\xa1\xe6\x81\xaf\0"
+"no.eu.org\0"
+"edu.pe\0"
+"steigen.no\0edu.pf\0"
+"kautokeino.no\0"
+"edu.ph\0"
+"fm.it\0edu.pk\0vladikavkaz.ru\0"
+"edu.pl\0"
+"dnipropetrovsk.ua\0"
+"edu.pn\0"
+"bs.it\0abashiri.hokkaido.jp\0otsuki.yamanashi.jp\0"
+"gjerdrum.no\0edu.qa\0"
+"gojome.akita.jp\0yamanashi.yamanashi.jp\0edu.pr\0"
+"oshima.tokyo.jp\0edu.ps\0"
+"edu.pt\0"
+"lind\xc3\xa5s.no\0"
+"edu.py\0devices.resinstaging.io\0"
+"u.bg\0"
+"vladikavkaz.su\0"
+"davvenjarga.no\0"
+"yamada.fukuoka.jp\0sakuho.nagano.jp\0ut.us\0"
+"koza.wakayama.jp\0ravendb.community\0"
+"moriguchi.osaka.jp\0nsn.us\0"
+"tgory.pl\0"
+"engine.aero\0"
+"media.museum\0free\0"
+"cr.ua\0svn-repos.de\0"
+"sosa.chiba.jp\0"
+"joburg\0storage.yandexcloud.net\0"
+"mb.ca\0beta.bounty-full.com\0"
+"omi.nagano.jp\0tushu\0"
+"from-or.com\0"
+"iwakura.aichi.jp\0"
+"\xe5\x8c\x97\xe6\xb5\xb7\xe9\x81\x93.jp\0yasuoka.nagano.jp\0guitars\0"
+"oumu.hokkaido.jp\0"
+"rawa-maz.pl\0edu.sa\0"
+"shinjo.okayama.jp\0edu.sb\0"
+"edu.rs\0edu.sc\0"
+"fukui.fukui.jp\0torsken.no\0edu.sd\0"
+"edu.ru\0"
+"ikusaka.nagano.jp\0monticello.museum\0"
+"edu.sg\0for-our.info\0"
+"tas.gov.au\0"
+"historisch.museum\0servemp3.com\0"
+"kaga.ishikawa.jp\0edu.sl\0"
+"shikama.miyagi.jp\0gs.bu.no\0edu.sn\0"
+"edu.so\0"
+"blog.bo\0"
+"edu.ss\0"
+"edu.st\0"
+"blog.br\0"
+"bozen-sudtirol.it\0edu.sv\0"
+"edu.sy\0"
+"edu.tj\0mypi.co\0"
+"\xe7\xb6\xb2\xe7\xbb\x9c.hk\0"
+"cc.na\0edu.tm\0"
+"bygland.no\0"
+"grandrapids.museum\0edu.to\0e4.cz\0"
+"yamaguchi.jp\0malselv.no\0rovno.ua\0"
+"kami.kochi.jp\0edu.ua\0tokyo\0"
+"edu.tr\0r.cdn77.net\0"
+"g\xc3\xa1\xc5\x8bgaviika.no\0s3-ap-northeast-1.amazonaws.com\0"
+"kawara.fukuoka.jp\0heroy.more-og-romsdal.no\0edu.tt\0"
+"from-ms.com\0from-nc.com\0"
+"fm.no\0"
+"edu.tw\0"
+"windmill.museum\0bss.design\0"
+"kiyosu.aichi.jp\0"
+};
+
+static const quint16 tldChunkCount = 2;
+static const quint32 tldChunks[] = {65526, 103395};
+
+QT_END_NAMESPACE
+
+#endif // QURLTLD_P_H
diff --git a/src/corelib/io/qurltlds_p.h.INFO b/src/network/kernel/qurltlds_p.h.INFO
index 33ccd458bf..33ccd458bf 100644
--- a/src/corelib/io/qurltlds_p.h.INFO
+++ b/src/network/kernel/qurltlds_p.h.INFO
diff --git a/src/network/network.pro b/src/network/network.pro
index d8453e879c..d13b3b9248 100644
--- a/src/network/network.pro
+++ b/src/network/network.pro
@@ -15,7 +15,7 @@ msvc:equals(QT_ARCH, i386): QMAKE_LFLAGS += /BASE:0x64000000
 QMAKE_DOCS = $$PWD/doc/qtnetwork.qdocconf
 
 include(access/access.pri)
-include(bearer/bearer.pri)
+qtConfig(bearermanagement): include(bearer/bearer.pri)
 include(kernel/kernel.pri)
 include(socket/socket.pri)
 include(ssl/ssl.pri)
@@ -38,6 +38,4 @@ MODULE_WINRT_CAPABILITIES = \
     internetClientServer \
     privateNetworkClientServer
 
-MODULE_PLUGIN_TYPES = \
-    bearer
 load(qt_module)
diff --git a/src/network/socket/qabstractsocketengine.cpp b/src/network/socket/qabstractsocketengine.cpp
index 54c7452c66..44139ff81d 100644
--- a/src/network/socket/qabstractsocketengine.cpp
+++ b/src/network/socket/qabstractsocketengine.cpp
@@ -274,3 +274,5 @@ int QAbstractSocketEngine::outboundStreamCount() const
 }
 
 QT_END_NAMESPACE
+
+#include "moc_qabstractsocketengine_p.cpp"
diff --git a/src/network/socket/qhttpsocketengine.cpp b/src/network/socket/qhttpsocketengine.cpp
index 9de9b284c1..9b0460b184 100644
--- a/src/network/socket/qhttpsocketengine.cpp
+++ b/src/network/socket/qhttpsocketengine.cpp
@@ -866,3 +866,5 @@ QAbstractSocketEngine *QHttpSocketEngineHandler::createSocketEngine(qintptr, QOb
 QT_END_NAMESPACE
 
 #endif // !QT_NO_NETWORKPROXY
+
+#include "moc_qhttpsocketengine_p.cpp"
diff --git a/src/network/socket/qlocalserver_p.h b/src/network/socket/qlocalserver_p.h
index 92616e59ce..f331a3f10d 100644
--- a/src/network/socket/qlocalserver_p.h
+++ b/src/network/socket/qlocalserver_p.h
@@ -99,15 +99,18 @@ public:
     QMap<quintptr, QTcpSocket*> socketMap;
 #elif defined(Q_OS_WIN)
     struct Listener {
-        HANDLE handle;
+        Listener() = default;
+        HANDLE handle = nullptr;
         OVERLAPPED overlapped;
-        bool connected;
+        bool connected = false;
+    private:
+        Q_DISABLE_COPY(Listener)
     };
 
     void setError(const QString &function);
     bool addListener();
 
-    QList<Listener> listeners;
+    std::vector<std::unique_ptr<Listener>> listeners;
     HANDLE eventHandle;
     QWinEventNotifier *connectionEventNotifier;
 #else
diff --git a/src/network/socket/qlocalserver_win.cpp b/src/network/socket/qlocalserver_win.cpp
index 2d71a7e730..6d92ebe93a 100644
--- a/src/network/socket/qlocalserver_win.cpp
+++ b/src/network/socket/qlocalserver_win.cpp
@@ -62,8 +62,8 @@ bool QLocalServerPrivate::addListener()
 {
     // The object must not change its address once the
     // contained OVERLAPPED struct is passed to Windows.
-    listeners << Listener();
-    Listener &listener = listeners.last();
+    listeners.push_back(std::make_unique<Listener>());
+    auto &listener = listeners.back();
 
     SECURITY_ATTRIBUTES sa;
     sa.nLength = sizeof(SECURITY_ATTRIBUTES);
@@ -175,7 +175,7 @@ bool QLocalServerPrivate::addListener()
         sa.lpSecurityDescriptor = pSD.data();
     }
 
-    listener.handle = CreateNamedPipe(
+    listener->handle = CreateNamedPipe(
                  reinterpret_cast<const wchar_t *>(fullServerName.utf16()), // pipe name
                  PIPE_ACCESS_DUPLEX | FILE_FLAG_OVERLAPPED,       // read/write access
                  PIPE_TYPE_BYTE |          // byte type pipe
@@ -187,32 +187,32 @@ bool QLocalServerPrivate::addListener()
                  3000,                     // client time-out
                  &sa);
 
-    if (listener.handle == INVALID_HANDLE_VALUE) {
+    if (listener->handle == INVALID_HANDLE_VALUE) {
         setError(QLatin1String("QLocalServerPrivate::addListener"));
-        listeners.removeLast();
+        listeners.pop_back();
         return false;
     }
 
     if (worldSID)
         FreeSid(worldSID);
 
-    memset(&listener.overlapped, 0, sizeof(listener.overlapped));
-    listener.overlapped.hEvent = eventHandle;
+    memset(&listener->overlapped, 0, sizeof(OVERLAPPED));
+    listener->overlapped.hEvent = eventHandle;
 
     // Beware! ConnectNamedPipe will reset the eventHandle to non-signaled.
     // Callers of addListener must check all listeners for connections.
-    if (!ConnectNamedPipe(listener.handle, &listener.overlapped)) {
+    if (!ConnectNamedPipe(listener->handle, &listener->overlapped)) {
         switch (GetLastError()) {
         case ERROR_IO_PENDING:
-            listener.connected = false;
+            listener->connected = false;
             break;
         case ERROR_PIPE_CONNECTED:
-            listener.connected = true;
+            listener->connected = true;
             break;
         default:
-            CloseHandle(listener.handle);
+            CloseHandle(listener->handle);
             setError(QLatin1String("QLocalServerPrivate::addListener"));
-            listeners.removeLast();
+            listeners.pop_back();
             return false;
         }
     } else {
@@ -284,12 +284,12 @@ void QLocalServerPrivate::_q_onNewConnection()
 
         // Testing shows that there is indeed absolutely no guarantee which listener gets
         // a client connection first, so there is no way around polling all of them.
-        for (int i = 0; i < listeners.size(); ) {
-            HANDLE handle = listeners[i].handle;
-            if (listeners[i].connected
-                || GetOverlappedResult(handle, &listeners[i].overlapped, &dummy, FALSE))
+        for (size_t i = 0; i < listeners.size(); ) {
+            HANDLE handle = listeners[i]->handle;
+            if (listeners[i]->connected
+                || GetOverlappedResult(handle, &listeners[i]->overlapped, &dummy, FALSE))
             {
-                listeners.removeAt(i);
+                listeners.erase(listeners.begin() + i);
 
                 addListener();
 
@@ -319,8 +319,8 @@ void QLocalServerPrivate::closeServer()
     connectionEventNotifier->deleteLater();
     connectionEventNotifier = 0;
     CloseHandle(eventHandle);
-    for (int i = 0; i < listeners.size(); ++i)
-        CloseHandle(listeners[i].handle);
+    for (size_t i = 0; i < listeners.size(); ++i)
+        CloseHandle(listeners[i]->handle);
     listeners.clear();
 }
 
diff --git a/src/network/socket/qnativesocketengine.cpp b/src/network/socket/qnativesocketengine.cpp
index 31628846dc..ad625b758e 100644
--- a/src/network/socket/qnativesocketengine.cpp
+++ b/src/network/socket/qnativesocketengine.cpp
@@ -1382,3 +1382,5 @@ void QNativeSocketEngine::setExceptionNotificationEnabled(bool enable)
 }
 
 QT_END_NAMESPACE
+
+#include "moc_qnativesocketengine_p.cpp"
diff --git a/src/network/socket/qsocks5socketengine.cpp b/src/network/socket/qsocks5socketengine.cpp
index 4f866e4da0..6a9979a675 100644
--- a/src/network/socket/qsocks5socketengine.cpp
+++ b/src/network/socket/qsocks5socketengine.cpp
@@ -1927,3 +1927,5 @@ QAbstractSocketEngine *QSocks5SocketEngineHandler::createSocketEngine(qintptr so
 }
 
 QT_END_NAMESPACE
+
+#include "moc_qsocks5socketengine_p.cpp"
diff --git a/src/network/ssl/qssl.cpp b/src/network/ssl/qssl.cpp
index c9fa7f85d9..87b9a1b038 100644
--- a/src/network/ssl/qssl.cpp
+++ b/src/network/ssl/qssl.cpp
@@ -102,29 +102,16 @@ Q_LOGGING_CATEGORY(lcSsl, "qt.network.ssl");
     \value IpAddressEntry An IP address entry; the entry contains an IP address
     entry that the certificate is valid for, introduced in Qt 5.13.
 
-    \note In Qt 4, this enum was called \c {AlternateNameEntryType}. That name
-    is deprecated in Qt 5.
-
     \sa QSslCertificate::subjectAlternativeNames()
 */
 
 /*!
-  \typedef QSsl::AlternateNameEntryType
-  \obsolete
-
-  Use QSsl::AlternativeNameEntryType instead.
-*/
-
-/*!
     \enum QSsl::SslProtocol
 
     Describes the protocol of the cipher.
 
-    \value SslV3 SSLv3; not supported by QSslSocket.
-    \value SslV2 SSLv2; not supported by QSslSocket.
     \value TlsV1_0 TLSv1.0
     \value TlsV1_0OrLater TLSv1.0 and later versions. This option is not available when using the WinRT backend due to platform limitations.
-    \value TlsV1 Obsolete, means the same as TlsV1_0
     \value TlsV1_1 TLSv1.1. When using the WinRT backend this option will also enable TLSv1.0.
     \value TlsV1_1OrLater TLSv1.1 and later versions. This option is not available when using the WinRT backend due to platform limitations.
     \value TlsV1_2 TLSv1.2. When using the WinRT backend this option will also enable TLSv1.0 and TLSv1.1.
@@ -137,7 +124,6 @@ Q_LOGGING_CATEGORY(lcSsl, "qt.network.ssl");
     \value TlsV1_3OrLater TLSv1.3 and later versions. (Since Qt 5.12)
     \value UnknownProtocol The cipher's protocol cannot be determined.
     \value AnyProtocol Any supported protocol. This value is used by QSslSocket only.
-    \value TlsV1SslV3 Same as TlsV1_0.
     \value SecureProtocols The default option, using protocols known to be secure.
 */
 
diff --git a/src/network/ssl/qssl.h b/src/network/ssl/qssl.h
index b28c2a87b9..d0b417f9ed 100644
--- a/src/network/ssl/qssl.h
+++ b/src/network/ssl/qssl.h
@@ -72,25 +72,11 @@ namespace QSsl {
         IpAddressEntry
     };
 
-#if QT_DEPRECATED_SINCE(5,0)
-    typedef AlternativeNameEntryType AlternateNameEntryType;
-#endif
-
     enum SslProtocol {
-#if QT_DEPRECATED_SINCE(5, 15)
-        SslV3,
-        SslV2,
-#endif
         TlsV1_0 = 2,
-#if QT_DEPRECATED_SINCE(5,0)
-        TlsV1 = TlsV1_0,
-#endif
         TlsV1_1,
         TlsV1_2,
         AnyProtocol,
-#if QT_DEPRECATED_SINCE(5, 15)
-        TlsV1SslV3,
-#endif
         SecureProtocols = AnyProtocol + 2,
 
         TlsV1_0OrLater,
diff --git a/src/network/ssl/qsslcertificate.cpp b/src/network/ssl/qsslcertificate.cpp
index c179cf9c4a..da952f6e6b 100644
--- a/src/network/ssl/qsslcertificate.cpp
+++ b/src/network/ssl/qsslcertificate.cpp
@@ -373,15 +373,6 @@ QByteArray QSslCertificate::digest(QCryptographicHash::Algorithm algorithm) cons
     \sa subjectInfo()
 */
 
-#if QT_DEPRECATED_SINCE(5,0)
-/*!
-  \fn QMultiMap<QSsl::AlternateNameEntryType, QString> QSslCertificate::alternateSubjectNames() const
-  \obsolete
-
-  Use QSslCertificate::subjectAlternativeNames();
-*/
-#endif
-
 /*!
   \fn QMultiMap<QSsl::AlternativeNameEntryType, QString> QSslCertificate::subjectAlternativeNames() const
 
diff --git a/src/network/ssl/qsslcertificate.h b/src/network/ssl/qsslcertificate.h
index 9993769888..c46065160a 100644
--- a/src/network/ssl/qsslcertificate.h
+++ b/src/network/ssl/qsslcertificate.h
@@ -130,10 +130,6 @@ public:
 
     QList<QByteArray> subjectInfoAttributes() const;
     QList<QByteArray> issuerInfoAttributes() const;
-#if QT_DEPRECATED_SINCE(5,0)
-    QT_DEPRECATED inline QMultiMap<QSsl::AlternateNameEntryType, QString>
-                  alternateSubjectNames() const { return subjectAlternativeNames(); }
-#endif
     QMultiMap<QSsl::AlternativeNameEntryType, QString> subjectAlternativeNames() const;
     QDateTime effectiveDate() const;
     QDateTime expiryDate() const;
diff --git a/src/network/ssl/qsslconfiguration.cpp b/src/network/ssl/qsslconfiguration.cpp
index f5ce02807f..adff0a249f 100644
--- a/src/network/ssl/qsslconfiguration.cpp
+++ b/src/network/ssl/qsslconfiguration.cpp
@@ -54,7 +54,6 @@ const QSsl::SslOptions QSslConfigurationPrivate::defaultSslOptions = QSsl::SslOp
                                                                     |QSsl::SslOptionDisableSessionPersistence;
 
 const char QSslConfiguration::ALPNProtocolHTTP2[] = "h2";
-const char QSslConfiguration::NextProtocolSpdy3_0[] = "spdy/3";
 const char QSslConfiguration::NextProtocolHttp1_1[] = "http/1.1";
 
 /*!
@@ -134,12 +133,6 @@ const char QSslConfiguration::NextProtocolHttp1_1[] = "http/1.1";
 */
 
 /*!
-    \variable QSslConfiguration::NextProtocolSpdy3_0
-    \brief The value used for negotiating SPDY 3.0 during the Next
-    Protocol Negotiation.
-*/
-
-/*!
     \variable QSslConfiguration::NextProtocolHttp1_1
     \brief The value used for negotiating HTTP 1.1 during the Next
     Protocol Negotiation.
@@ -229,7 +222,9 @@ bool QSslConfiguration::operator==(const QSslConfiguration &other) const
         d->nextNegotiatedProtocol == other.d->nextNegotiatedProtocol &&
         d->nextProtocolNegotiationStatus == other.d->nextProtocolNegotiationStatus &&
         d->dtlsCookieEnabled == other.d->dtlsCookieEnabled &&
-        d->ocspStaplingEnabled == other.d->ocspStaplingEnabled;
+        d->ocspStaplingEnabled == other.d->ocspStaplingEnabled &&
+        d->reportFromCallback == other.d->reportFromCallback &&
+        d->missingCertIsFatal == other.d->missingCertIsFatal;
 }
 
 /*!
@@ -274,7 +269,9 @@ bool QSslConfiguration::isNull() const
             d->nextAllowedProtocols.isEmpty() &&
             d->nextNegotiatedProtocol.isNull() &&
             d->nextProtocolNegotiationStatus == QSslConfiguration::NextProtocolNegotiationNone &&
-            d->ocspStaplingEnabled == false);
+            d->ocspStaplingEnabled == false &&
+            d->reportFromCallback == false &&
+            d->missingCertIsFatal == false);
 }
 
 /*!
@@ -1035,7 +1032,7 @@ QByteArray QSslConfiguration::nextNegotiatedProtocol() const
   Whether or not the negotiation succeeded can be queried through
   nextProtocolNegotiationStatus().
 
-  \sa nextNegotiatedProtocol(), nextProtocolNegotiationStatus(), allowedNextProtocols(), QSslConfiguration::NextProtocolSpdy3_0, QSslConfiguration::NextProtocolHttp1_1
+  \sa nextNegotiatedProtocol(), nextProtocolNegotiationStatus(), allowedNextProtocols(), QSslConfiguration::NextProtocolHttp1_1
  */
 #if QT_VERSION >= QT_VERSION_CHECK(6,0,0)
 void QSslConfiguration::setAllowedNextProtocols(const QList<QByteArray> &protocols)
@@ -1053,7 +1050,7 @@ void QSslConfiguration::setAllowedNextProtocols(QList<QByteArray> protocols)
   server through the Next Protocol Negotiation (NPN) or Application-Layer
   Protocol Negotiation (ALPN) TLS extension, as set by setAllowedNextProtocols().
 
-  \sa nextNegotiatedProtocol(), nextProtocolNegotiationStatus(), setAllowedNextProtocols(), QSslConfiguration::NextProtocolSpdy3_0, QSslConfiguration::NextProtocolHttp1_1
+  \sa nextNegotiatedProtocol(), nextProtocolNegotiationStatus(), setAllowedNextProtocols(), QSslConfiguration::NextProtocolHttp1_1
  */
 QList<QByteArray> QSslConfiguration::allowedNextProtocols() const
 {
@@ -1199,6 +1196,91 @@ bool QSslConfiguration::ocspStaplingEnabled() const
     return d->ocspStaplingEnabled;
 }
 
+/*!
+    \since 6.0
+
+    Returns true if a verification callback will emit QSslSocket::handshakeInterruptedOnError()
+    early, before concluding the handshake.
+
+    \note This function always returns false for all backends but OpenSSL.
+
+    \sa setHandshakeMustInterruptOnError(), QSslSocket::handshakeInterruptedOnError(), QSslSocket::continueInterruptedHandshake()
+*/
+bool QSslConfiguration::handshakeMustInterruptOnError() const
+{
+    return d->reportFromCallback;
+}
+
+/*!
+    \since 6.0
+
+    If \a interrupt is true and the underlying backend supports this option,
+    errors found during certificate verification are reported immediately
+    by emitting QSslSocket::handshakeInterruptedOnError(). This allows
+    to stop the unfinished handshake and send a proper alert message to
+    a peer. No special action is required from the application in this case.
+    QSslSocket will close the connection after sending the alert message.
+    If the application after inspecting the error wants to continue the
+    handshake, it must call QSslSocket::continueInterruptedHandshake()
+    from its slot function. The signal-slot connection must be direct.
+
+    \note When interrupting handshake is enabled, errors that would otherwise
+    be reported by QSslSocket::peerVerifyError() are instead only reported by
+    QSslSocket::handshakeInterruptedOnError().
+    \note Even if the handshake was continued, these errors will be
+    reported when emitting QSslSocket::sslErrors() signal (and thus must
+    be ignored in the corresponding function slot).
+
+    \sa handshakeMustInterruptOnError(), QSslSocket::handshakeInterruptedOnError(), QSslSocket::continueInterruptedHandshake()
+*/
+void QSslConfiguration::setHandshakeMustInterruptOnError(bool interrupt)
+{
+#if QT_CONFIG(openssl)
+    d->reportFromCallback = interrupt;
+#else
+    Q_UNUSED(interrupt);
+    qCWarning(lcSsl, "This operation requires OpenSSL as TLS backend");
+#endif
+}
+
+/*!
+    \since 6.0
+
+    Returns true if errors with code QSslError::NoPeerCertificate
+    cannot be ignored.
+
+    \note Always returns false for all TLS backends but OpenSSL.
+
+    \sa QSslSocket::ignoreSslErrors(), setMissingCertificateIsFatal()
+*/
+bool QSslConfiguration::missingCertificateIsFatal() const
+{
+    return d->missingCertIsFatal;
+}
+
+/*!
+    \since 6.0
+
+    If \a cannotRecover is true, and verification mode in use is
+    QSslSocket::VerifyPeer or QSslSocket::AutoVerifyPeer (for a
+    client-side socket), the missing peer's certificate would be
+    treated as an unrecoverable error that cannot be ignored. A proper
+    alert message will be sent to the peer before closing the connection.
+
+    \note Only available if Qt was configured and built with OpenSSL backend.
+
+    \sa QSslSocket::ignoreSslErrors(), QSslSocket::PeerVerifyMode, missingCertificateIsFatal()
+*/
+void QSslConfiguration::setMissingCertificateIsFatal(bool cannotRecover)
+{
+#if QT_CONFIG(openssl)
+    d->missingCertIsFatal = cannotRecover;
+#else
+    Q_UNUSED(cannotRecover);
+    qCWarning(lcSsl, "Handling a missing certificate as a fatal error requires an OpenSSL backend");
+#endif // openssl
+}
+
 /*! \internal
 */
 bool QSslConfigurationPrivate::peerSessionWasShared(const QSslConfiguration &configuration) {
diff --git a/src/network/ssl/qsslconfiguration.h b/src/network/ssl/qsslconfiguration.h
index 09616098a5..5732deaaef 100644
--- a/src/network/ssl/qsslconfiguration.h
+++ b/src/network/ssl/qsslconfiguration.h
@@ -66,7 +66,6 @@
 
 QT_BEGIN_NAMESPACE
 
-template<typename T> class QList;
 class QSslCertificate;
 class QSslCipher;
 class QSslKey;
@@ -173,6 +172,12 @@ public:
     static void setDefaultDtlsConfiguration(const QSslConfiguration &configuration);
 #endif // dtls
 
+    bool handshakeMustInterruptOnError() const;
+    void setHandshakeMustInterruptOnError(bool interrupt);
+
+    bool missingCertificateIsFatal() const;
+    void setMissingCertificateIsFatal(bool cannotRecover);
+
     void setOcspStaplingEnabled(bool enable);
     bool ocspStaplingEnabled() const;
 
@@ -193,7 +198,6 @@ public:
     NextProtocolNegotiationStatus nextProtocolNegotiationStatus() const;
 
     static const char ALPNProtocolHTTP2[];
-    static const char NextProtocolSpdy3_0[];
     static const char NextProtocolHttp1_1[];
 
 private:
diff --git a/src/network/ssl/qsslconfiguration_p.h b/src/network/ssl/qsslconfiguration_p.h
index 83126bb9a0..6ee3490df6 100644
--- a/src/network/ssl/qsslconfiguration_p.h
+++ b/src/network/ssl/qsslconfiguration_p.h
@@ -149,6 +149,14 @@ public:
     const bool ocspStaplingEnabled = false;
 #endif
 
+#if QT_CONFIG(openssl)
+    bool reportFromCallback = false;
+    bool missingCertIsFatal = false;
+#else
+    const bool reportFromCallback = false;
+    const bool missingCertIsFatal = false;
+#endif // openssl
+
     // in qsslsocket.cpp:
     static QSslConfiguration defaultConfiguration();
     static void setDefaultConfiguration(const QSslConfiguration &configuration);
diff --git a/src/network/ssl/qsslcontext_openssl.cpp b/src/network/ssl/qsslcontext_openssl.cpp
index 0aa8a4f438..78e37460c8 100644
--- a/src/network/ssl/qsslcontext_openssl.cpp
+++ b/src/network/ssl/qsslcontext_openssl.cpp
@@ -56,6 +56,7 @@ QT_BEGIN_NAMESPACE
 
 // defined in qsslsocket_openssl.cpp:
 extern int q_X509Callback(int ok, X509_STORE_CTX *ctx);
+extern "C" int q_X509CallbackDirect(int ok, X509_STORE_CTX *ctx);
 extern QString getErrorsFromOpenSsl();
 
 #if QT_CONFIG(dtls)
@@ -290,42 +291,31 @@ void QSslContext::initSslContext(QSslContext *sslContext, QSslSocket::SslMode mo
     bool unsupportedProtocol = false;
     bool isDtls = false;
 init_context:
-    if (sslContext->sslConfiguration.protocol() == QSsl::SslV2) {
-        // SSL 2 is no longer supported, but chosen deliberately -> error
-        sslContext->ctx = nullptr;
-        unsupportedProtocol = true;
-    } else if (sslContext->sslConfiguration.protocol() == QSsl::SslV3) {
-        // SSL 3 is no longer supported, but chosen deliberately -> error
-        sslContext->ctx = nullptr;
-        unsupportedProtocol = true;
-    } else {
-        switch (sslContext->sslConfiguration.protocol()) {
-        case QSsl::DtlsV1_0:
-        case QSsl::DtlsV1_0OrLater:
-        case QSsl::DtlsV1_2:
-        case QSsl::DtlsV1_2OrLater:
+    switch (sslContext->sslConfiguration.protocol()) {
+    case QSsl::DtlsV1_0:
+    case QSsl::DtlsV1_0OrLater:
+    case QSsl::DtlsV1_2:
+    case QSsl::DtlsV1_2OrLater:
 #if QT_CONFIG(dtls)
-            isDtls = true;
-            sslContext->ctx = q_SSL_CTX_new(client ? q_DTLS_client_method() : q_DTLS_server_method());
+        isDtls = true;
+        sslContext->ctx = q_SSL_CTX_new(client ? q_DTLS_client_method() : q_DTLS_server_method());
 #else // dtls
-            sslContext->ctx = nullptr;
-            unsupportedProtocol = true;
-            qCWarning(lcSsl, "DTLS protocol requested, but feature 'dtls' is disabled");
-
+        sslContext->ctx = nullptr;
+        unsupportedProtocol = true;
+        qCWarning(lcSsl, "DTLS protocol requested, but feature 'dtls' is disabled");
 #endif // dtls
-            break;
-        case QSsl::TlsV1_3:
-        case QSsl::TlsV1_3OrLater:
+        break;
+    case QSsl::TlsV1_3:
+    case QSsl::TlsV1_3OrLater:
 #if !defined(TLS1_3_VERSION)
-            qCWarning(lcSsl, "TLS 1.3 is not supported");
-            sslContext->ctx = nullptr;
-            unsupportedProtocol = true;
-            break;
+        qCWarning(lcSsl, "TLS 1.3 is not supported");
+        sslContext->ctx = nullptr;
+        unsupportedProtocol = true;
+        break;
 #endif // TLS1_3_VERSION
-        default:
-            // The ssl options will actually control the supported methods
-            sslContext->ctx = q_SSL_CTX_new(client ? q_TLS_client_method() : q_TLS_server_method());
-        }
+    default:
+        // The ssl options will actually control the supported methods
+        sslContext->ctx = q_SSL_CTX_new(client ? q_TLS_client_method() : q_TLS_server_method());
     }
 
     if (!sslContext->ctx) {
@@ -377,7 +367,6 @@ init_context:
 #endif // TLS1_3_VERSION
         break;
     // Ranges:
-    case QSsl::TlsV1SslV3:
     case QSsl::AnyProtocol:
     case QSsl::SecureProtocols:
     case QSsl::TlsV1_0OrLater:
@@ -419,12 +408,6 @@ init_context:
         Q_UNREACHABLE();
         break;
 #endif // TLS1_3_VERSION
-    case QSsl::SslV2:
-    case QSsl::SslV3:
-        // These protocols are not supported, and we handle
-        // them as an error (see the code above).
-        Q_UNREACHABLE();
-        break;
     case QSsl::UnknownProtocol:
         break;
     }
@@ -594,11 +577,20 @@ init_context:
     if (sslContext->sslConfiguration.peerVerifyMode() == QSslSocket::VerifyNone) {
         q_SSL_CTX_set_verify(sslContext->ctx, SSL_VERIFY_NONE, nullptr);
     } else {
-        q_SSL_CTX_set_verify(sslContext->ctx, SSL_VERIFY_PEER,
-#if QT_CONFIG(dtls)
-                             isDtls ? dtlscallbacks::q_X509DtlsCallback :
-#endif // dtls
-                             q_X509Callback);
+        auto verificationCallback =
+        #if QT_CONFIG(dtls)
+                                            isDtls ? dtlscallbacks::q_X509DtlsCallback :
+        #endif // dtls
+                                            q_X509Callback;
+
+        if (!isDtls && configuration.handshakeMustInterruptOnError())
+            verificationCallback = q_X509CallbackDirect;
+
+        auto verificationMode = SSL_VERIFY_PEER;
+        if (!isDtls && sslContext->sslConfiguration.missingCertificateIsFatal())
+            verificationMode |= SSL_VERIFY_FAIL_IF_NO_PEER_CERT;
+
+        q_SSL_CTX_set_verify(sslContext->ctx, verificationMode, verificationCallback);
     }
 
 #ifdef TLS1_3_VERSION
diff --git a/src/network/ssl/qsslsocket.cpp b/src/network/ssl/qsslsocket.cpp
index 8f1d5d377d..44dcbcec5a 100644
--- a/src/network/ssl/qsslsocket.cpp
+++ b/src/network/ssl/qsslsocket.cpp
@@ -228,6 +228,74 @@
 */
 
 /*!
+    \enum QAlertLevel
+    \brief Describes the level of an alert message
+    \relates QSslSocket
+    \since 6.0
+
+    \ingroup network
+    \ingroup ssl
+    \inmodule QtNetwork
+
+    This enum describes the level of an alert message that was sent
+    or received.
+
+    \value Warning Non-fatal alert message
+    \value Fatal Fatal alert message, the underlying backend will
+           handle such an alert properly and close the connection.
+    \value Unknown An alert of unknown level of severity.
+*/
+
+/*!
+    \enum QAlertType
+    \brief Enumerates possible codes that an alert message can have
+    \relates QSslSocket
+    \since 6.0
+
+    \ingroup network
+    \ingroup ssl
+    \inmodule QtNetwork
+
+    See \l{https://tools.ietf.org/html/rfc8446#page-85}{RFC 8446, section 6}
+    for the possible values and their meaning.
+
+    \value CloseNotify,
+    \value UnexpectedMessage
+    \value BadRecordMac
+    \value RecordOverflow
+    \value DecompressionFailure
+    \value HandshakeFailure
+    \value NoCertificate
+    \value BadCertificate
+    \value UnsupportedCertificate
+    \value CertificateRevoked
+    \value CertificateExpired
+    \value CertificateUnknown
+    \value IllegalParameter
+    \value UnknownCa
+    \value AccessDenied
+    \value DecodeError
+    \value DecryptError
+    \value ExportRestriction
+    \value ProtocolVersion
+    \value InsufficientSecurity
+    \value InternalError
+    \value InappropriateFallback
+    \value UserCancelled
+    \value NoRenegotiation
+    \value MissingExtension
+    \value UnsupportedExtension
+    \value CertificateUnobtainable
+    \value UnrecognizedName
+    \value BadCertificateStatusResponse
+    \value BadCertificateHashValue
+    \value UnknownPskIdentity
+    \value CertificateRequired
+    \value NoApplicationProtocol
+    \value UnknownAlertMessage
+*/
+
+/*!
     \fn void QSslSocket::encrypted()
 
     This signal is emitted when QSslSocket enters encrypted mode. After this
@@ -323,6 +391,49 @@
 */
 
 /*!
+    \fn void QSslSocket::alertSent(QAlertLevel level, QAlertType type, const QString &description)
+
+    QSslSocket emits this signal if an alert message was sent to a peer. \a level
+    describes if it was a warning or a fatal error. \a type gives the code
+    of the alert message. When a textual description of the alert message is
+    available, it is supplied in \a description.
+
+    \note This signal is mostly informational and can be used for debugging
+    purposes, normally it does not require any actions from the application.
+    \note Not all backends support this functionality.
+
+    \sa alertReceived(), QAlertLevel, QAlertType
+*/
+
+/*!
+    \fn void QSslSocket::alertReceived(QAlertLevel level, QAlertType type, const QString &description)
+
+    QSslSocket emits this signal if an alert message was received from a peer.
+    \a level tells if the alert was fatal or it was a warning. \a type is the
+    code explaining why the alert was sent. When a textual description of
+    the alert message is available, it is supplied in \a description.
+
+    \note The signal is mostly for informational and debugging purposes and does not
+    require any handling in the application. If the alert was fatal, underlying
+    backend will handle it and close the connection.
+    \note Not all backends support this functionality.
+
+    \sa alertSent(), QAlertLevel, QAlertType
+*/
+
+/*!
+    \fn void QSslSocket::handshakeInterruptedOnError(const QSslError &error)
+
+    QSslSocket emits this signal if a certificate verification error was
+    found and if early error reporting was enabled in QSslConfiguration.
+    An application is expected to inspect the \a error and decide if
+    it wants to continue the handshake, or abort it and send an alert message
+    to the peer. The signal-slot connection must be direct.
+
+    \sa continueInterruptedHandshake(), sslErrors(), QSslConfiguration::setHandshakeMustInterruptOnError()
+*/
+
+/*!
     \fn void QSslSocket::newSessionTicketReceived()
     \since 5.15
 
@@ -993,7 +1104,10 @@ void QSslSocket::setSslConfiguration(const QSslConfiguration &configuration)
 #if QT_CONFIG(ocsp)
     d->configuration.ocspStaplingEnabled = configuration.ocspStaplingEnabled();
 #endif
-
+#if QT_CONFIG(openssl)
+    d->configuration.reportFromCallback = configuration.handshakeMustInterruptOnError();
+    d->configuration.missingCertIsFatal = configuration.missingCertificateIsFatal();
+#endif // openssl
     // if the CA certificates were set explicitly (either via
     // QSslConfiguration::setCaCertificates() or QSslSocket::setCaCertificates(),
     // we cannot load the certificates on demand
@@ -2083,6 +2197,23 @@ void QSslSocket::ignoreSslErrors(const QList<QSslError> &errors)
     d->ignoreErrorsList = errors;
 }
 
+
+/*!
+    \since 6.0
+
+    If an application wants to conclude a handshake even after receiving
+    handshakeInterruptedOnError() signal, it must call this function.
+    This call must be done from a slot function attached to the signal.
+    The signal-slot connection must be direct.
+
+    \sa handshakeInterruptedOnError(), QSslConfiguration::setHandshakeMustInterruptOnError()
+*/
+void QSslSocket::continueInterruptedHandshake()
+{
+    Q_D(QSslSocket);
+    d->handshakeInterrupted = false;
+}
+
 /*!
     \internal
 */
@@ -2257,13 +2388,24 @@ void QSslSocketPrivate::init()
 */
 bool QSslSocketPrivate::verifyProtocolSupported(const char *where)
 {
-    if (configuration.protocol == QSsl::SslV2 || configuration.protocol == QSsl::SslV3) {
-        qCWarning(lcSsl) << where << "Attempted to use an unsupported protocol.";
+    QLatin1String protocolName("DTLS");
+    switch (configuration.protocol) {
+    case QSsl::UnknownProtocol:
+        // UnknownProtocol, according to our docs, is for cipher whose protocol is unknown.
+        // Should not be used when configuring QSslSocket.
+        protocolName = QLatin1String("UnknownProtocol");
+        Q_FALLTHROUGH();
+    case QSsl::DtlsV1_0:
+    case QSsl::DtlsV1_2:
+    case QSsl::DtlsV1_0OrLater:
+    case QSsl::DtlsV1_2OrLater:
+        qCWarning(lcSsl) << where << "QSslConfiguration with unexpected protocol" << protocolName;
         setErrorAndEmit(QAbstractSocket::SslInvalidUserDataError,
                         QSslSocket::tr("Attempted to use an unsupported protocol."));
         return false;
+    default:
+        return true;
     }
-    return true;
 }
 
 /*!
@@ -2477,6 +2619,10 @@ void QSslConfigurationPrivate::deepCopyDefaultConfiguration(QSslConfigurationPri
 #if QT_CONFIG(ocsp)
     ptr->ocspStaplingEnabled = global->ocspStaplingEnabled;
 #endif
+#if QT_CONFIG(openssl)
+    ptr->reportFromCallback = global->reportFromCallback;
+    ptr->missingCertIsFatal = global->missingCertIsFatal;
+#endif
 }
 
 /*!
diff --git a/src/network/ssl/qsslsocket.h b/src/network/ssl/qsslsocket.h
index 298e7aa6c8..e99c79a967 100644
--- a/src/network/ssl/qsslsocket.h
+++ b/src/network/ssl/qsslsocket.h
@@ -63,6 +63,49 @@ class QSslEllipticCurve;
 class QSslPreSharedKeyAuthenticator;
 class QOcspResponse;
 
+enum class QAlertLevel {
+    Warning,
+    Fatal,
+    Unknown
+};
+
+enum class QAlertType {
+    CloseNotify,
+    UnexpectedMessage = 10,
+    BadRecordMac = 20,
+    RecordOverflow = 22,
+    DecompressionFailure = 30, // reserved
+    HandshakeFailure = 40,
+    NoCertificate = 41, // reserved
+    BadCertificate = 42,
+    UnsupportedCertificate = 43,
+    CertificateRevoked = 44,
+    CertificateExpired = 45,
+    CertificateUnknown = 46,
+    IllegalParameter = 47,
+    UnknownCa = 48,
+    AccessDenied = 49,
+    DecodeError = 50,
+    DecryptError = 51,
+    ExportRestriction = 60, // reserved
+    ProtocolVersion = 70,
+    InsufficientSecurity = 71,
+    InternalError = 80,
+    InappropriateFallback = 86,
+    UserCancelled = 90,
+    NoRenegotiation = 100,
+    MissingExtension = 109,
+    UnsupportedExtension = 110,
+    CertificateUnobtainable = 111, // reserved
+    UnrecognizedName = 112,
+    BadCertificateStatusResponse = 113,
+    BadCertificateHashValue = 114, // reserved
+    UnknownPskIdentity = 115,
+    CertificateRequired = 116,
+    NoApplicationProtocol = 120,
+    UnknownAlertMessage = 255
+};
+
 class QSslSocketPrivate;
 class Q_NETWORK_EXPORT QSslSocket : public QTcpSocket
 {
@@ -204,6 +247,7 @@ public:
     static QString sslLibraryBuildVersionString();
 
     void ignoreSslErrors(const QList<QSslError> &errors);
+    void continueInterruptedHandshake();
 
 public Q_SLOTS:
     void startClientEncryption();
@@ -218,6 +262,9 @@ Q_SIGNALS:
     void encryptedBytesWritten(qint64 totalBytes);
     void preSharedKeyAuthenticationRequired(QSslPreSharedKeyAuthenticator *authenticator);
     void newSessionTicketReceived();
+    void alertSent(QAlertLevel level, QAlertType type, const QString &description);
+    void alertReceived(QAlertLevel level, QAlertType type, const QString &description);
+    void handshakeInterruptedOnError(const QSslError &error);
 
 protected:
     qint64 readData(char *data, qint64 maxlen) override;
diff --git a/src/network/ssl/qsslsocket_mac.cpp b/src/network/ssl/qsslsocket_mac.cpp
index e0e065679d..fe1c43d992 100644
--- a/src/network/ssl/qsslsocket_mac.cpp
+++ b/src/network/ssl/qsslsocket_mac.cpp
@@ -496,10 +496,6 @@ QSsl::SslProtocol QSslSocketBackendPrivate::sessionProtocol() const
     }
 
     switch (protocol) {
-    case kSSLProtocol2:
-        return QSsl::SslV2;
-    case kSSLProtocol3:
-        return QSsl::SslV3;
     case kTLSProtocol1:
         return QSsl::TlsV1_0;
     case kTLSProtocol11:
@@ -657,23 +653,6 @@ QSslCipher QSslSocketBackendPrivate::QSslCipher_from_SSLCipherSuite(SSLCipherSui
     QSslCipher ciph;
     switch (cipher) {
     // Sorted as in CipherSuite.h (and groupped by their RFC)
-    case SSL_RSA_WITH_NULL_MD5:
-        ciph.d->name = QLatin1String("NULL-MD5");
-        ciph.d->protocol = QSsl::SslV3;
-        break;
-    case SSL_RSA_WITH_NULL_SHA:
-        ciph.d->name = QLatin1String("NULL-SHA");
-        ciph.d->protocol = QSsl::SslV3;
-        break;
-    case SSL_RSA_WITH_RC4_128_MD5:
-        ciph.d->name = QLatin1String("RC4-MD5");
-        ciph.d->protocol = QSsl::SslV3;
-        break;
-    case SSL_RSA_WITH_RC4_128_SHA:
-        ciph.d->name = QLatin1String("RC4-SHA");
-        ciph.d->protocol = QSsl::SslV3;
-        break;
-
     // TLS addenda using AES, per RFC 3268
     case TLS_RSA_WITH_AES_128_CBC_SHA:
         ciph.d->name = QLatin1String("AES128-SHA");
@@ -822,12 +801,8 @@ QSslCipher QSslSocketBackendPrivate::QSslCipher_from_SSLCipherSuite(SSLCipherSui
     ciph.d->isNull = false;
 
     // protocol
-    if (ciph.d->protocol == QSsl::SslV3) {
-        ciph.d->protocolString = QLatin1String("SSLv3");
-    } else {
-        ciph.d->protocol = QSsl::TlsV1_2;
-        ciph.d->protocolString = QLatin1String("TLSv1.2");
-    }
+    ciph.d->protocol = QSsl::TlsV1_2;
+    ciph.d->protocolString = QLatin1String("TLSv1.2");
 
     const auto bits = ciph.d->name.splitRef(QLatin1Char('-'));
     if (bits.size() >= 2) {
@@ -1106,22 +1081,6 @@ bool QSslSocketBackendPrivate::setSessionProtocol()
 {
     Q_ASSERT_X(context, Q_FUNC_INFO, "invalid SSL context (null)");
 
-    // QSsl::SslV2 == kSSLProtocol2 is disabled in Secure Transport and
-    // always fails with errSSLIllegalParam:
-    // if (version < MINIMUM_STREAM_VERSION || version > MAXIMUM_STREAM_VERSION)
-    //     return errSSLIllegalParam;
-    // where MINIMUM_STREAM_VERSION is SSL_Version_3_0, MAXIMUM_STREAM_VERSION is TLS_Version_1_2.
-    if (configuration.protocol == QSsl::SslV2) {
-        qCDebug(lcSsl) << "protocol QSsl::SslV2 is disabled";
-        return false;
-    }
-
-    // SslV3 is unsupported.
-    if (configuration.protocol == QSsl::SslV3) {
-        qCDebug(lcSsl) << "protocol QSsl::SslV3 is disabled";
-        return false;
-    }
-
     // SecureTransport has kTLSProtocol13 constant and also, kTLSProtocolMaxSupported.
     // Calling SSLSetProtocolVersionMax/Min with any of these two constants results
     // in errInvalidParam and a failure to set the protocol version. This means
@@ -1162,13 +1121,6 @@ bool QSslSocketBackendPrivate::setSessionProtocol()
         qCDebug(lcSsl) << plainSocket << "requesting : any";
     #endif
         err = SSLSetProtocolVersionMin(context, kTLSProtocol1);
-    } else if (configuration.protocol == QSsl::TlsV1SslV3) {
-    #ifdef QSSLSOCKET_DEBUG
-        qCDebug(lcSsl) << plainSocket << "requesting : SSLv3 - TLSv1.2";
-    #endif
-        err = SSLSetProtocolVersionMin(context, kTLSProtocol1);
-        if (err == errSecSuccess)
-            err = SSLSetProtocolVersionMax(context, kTLSProtocol1);
     } else if (configuration.protocol == QSsl::SecureProtocols) {
     #ifdef QSSLSOCKET_DEBUG
         qCDebug(lcSsl) << plainSocket << "requesting : TLSv1 - TLSv1.2";
@@ -1213,8 +1165,6 @@ bool QSslSocketBackendPrivate::verifySessionProtocol() const
     bool protocolOk = false;
     if (configuration.protocol == QSsl::AnyProtocol)
         protocolOk = true;
-    else if (configuration.protocol == QSsl::TlsV1SslV3)
-        protocolOk = (sessionProtocol() == QSsl::TlsV1_0);
     else if (configuration.protocol == QSsl::SecureProtocols)
         protocolOk = (sessionProtocol() >= QSsl::TlsV1_0);
     else if (configuration.protocol == QSsl::TlsV1_0OrLater)
diff --git a/src/network/ssl/qsslsocket_openssl.cpp b/src/network/ssl/qsslsocket_openssl.cpp
index e197ce6515..2419ec5e38 100644
--- a/src/network/ssl/qsslsocket_openssl.cpp
+++ b/src/network/ssl/qsslsocket_openssl.cpp
@@ -98,6 +98,123 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace {
+
+QAlertLevel tlsAlertLevel(int value)
+{
+    if (const char *typeString = q_SSL_alert_type_string(value)) {
+        // Documented to return 'W' for warning, 'F' for fatal,
+        // 'U' for unknown.
+        switch (typeString[0]) {
+        case 'W':
+            return QAlertLevel::Warning;
+        case 'F':
+            return QAlertLevel::Fatal;
+        default:;
+        }
+    }
+
+    return QAlertLevel::Unknown;
+}
+
+QString tlsAlertDescription(int value)
+{
+    QString description = QLatin1String(q_SSL_alert_desc_string_long(value));
+    if (!description.size())
+        description = QLatin1String("no description provided");
+    return description;
+}
+
+QAlertType tlsAlertType(int value)
+{
+    // In case for some reason openssl gives us a value,
+    // which is not in our enum actually, we leave it to
+    // an application to handle (supposedly they have
+    // if or switch-statements).
+    return QAlertType(value & 0xff);
+}
+
+} // Unnamed namespace
+
+extern "C"
+{
+
+void qt_AlertInfoCallback(const SSL *connection, int from, int value)
+{
+    // Passed to SSL_set_info_callback()
+    // https://www.openssl.org/docs/man1.1.1/man3/SSL_set_info_callback.html
+
+    if (!connection) {
+#ifdef QSSLSOCKET_DEBUG
+        qCWarning(lcSsl, "Invalid 'connection' parameter (nullptr)");
+#endif // QSSLSOCKET_DEBUG
+        return;
+    }
+
+    const auto offset = QSslSocketBackendPrivate::s_indexForSSLExtraData
+                        + QSslSocketBackendPrivate::socketOffsetInExData;
+    auto privateSocket =
+            static_cast<QSslSocketBackendPrivate *>(q_SSL_get_ex_data(connection, offset));
+    if (!privateSocket) {
+        // SSL_set_ex_data can fail:
+#ifdef QSSLSOCKET_DEBUG
+        qCWarning(lcSsl, "No external data (socket backend) found for parameter 'connection'");
+#endif // QSSLSOCKET_DEBUG
+        return;
+    }
+
+    if (!(from & SSL_CB_ALERT)) {
+        // We only want to know about alerts (at least for now).
+        return;
+    }
+
+    if (from & SSL_CB_WRITE)
+        privateSocket->alertMessageSent(value);
+    else
+        privateSocket->alertMessageReceived(value);
+}
+
+int q_X509CallbackDirect(int ok, X509_STORE_CTX *ctx)
+{
+    // Passed to SSL_CTX_set_verify()
+    // https://www.openssl.org/docs/man1.1.1/man3/SSL_CTX_set_verify.html
+    // Returns 0 to abort verification, 1 to continue.
+
+    // This is a new, experimental verification callback, reporting
+    // errors immediately and returning 0 or 1 depending on an application
+    // either ignoring or not ignoring verification errors as they come.
+    if (!ctx) {
+        qCWarning(lcSsl, "Invalid store context (nullptr)");
+        return 0;
+    }
+
+    if (!ok) {
+        // "Whenever a X509_STORE_CTX object is created for the verification of the
+        // peer's certificate during a handshake, a pointer to the SSL object is
+        // stored into the X509_STORE_CTX object to identify the connection affected.
+        // To retrieve this pointer the X509_STORE_CTX_get_ex_data() function can be
+        // used with the correct index."
+        SSL *ssl = static_cast<SSL *>(q_X509_STORE_CTX_get_ex_data(ctx, q_SSL_get_ex_data_X509_STORE_CTX_idx()));
+        if (!ssl) {
+            qCWarning(lcSsl, "No external data (SSL) found in X509 store object");
+            return 0;
+        }
+
+        const auto offset = QSslSocketBackendPrivate::s_indexForSSLExtraData
+                            + QSslSocketBackendPrivate::socketOffsetInExData;
+        auto privateSocket = static_cast<QSslSocketBackendPrivate *>(q_SSL_get_ex_data(ssl, offset));
+        if (!privateSocket) {
+            qCWarning(lcSsl, "No external data (QSslSocketBackendPrivate) found in SSL object");
+            return 0;
+        }
+
+        return privateSocket->emitErrorFromCallback(ctx);
+    }
+    return 1;
+}
+
+} // extern "C"
+
 Q_GLOBAL_STATIC(QRecursiveMutex, qt_opensslInitMutex)
 
 bool QSslSocketPrivate::s_libraryLoaded = false;
@@ -266,11 +383,7 @@ QSslCipher QSslSocketBackendPrivate::QSslCipher_from_SSL_CIPHER(const SSL_CIPHER
         QString protoString = descriptionList.at(1).toString();
         ciph.d->protocolString = protoString;
         ciph.d->protocol = QSsl::UnknownProtocol;
-        if (protoString == QLatin1String("SSLv3"))
-            ciph.d->protocol = QSsl::SslV3;
-        else if (protoString == QLatin1String("SSLv2"))
-            ciph.d->protocol = QSsl::SslV2;
-        else if (protoString == QLatin1String("TLSv1"))
+        if (protoString == QLatin1String("TLSv1"))
             ciph.d->protocol = QSsl::TlsV1_0;
         else if (protoString == QLatin1String("TLSv1.1"))
             ciph.d->protocol = QSsl::TlsV1_1;
@@ -425,12 +538,15 @@ int q_X509Callback(int ok, X509_STORE_CTX *ctx)
             // Not found on store? Try SSL and its external data then. According to the OpenSSL's
             // documentation:
             //
-            // "Whenever a X509_STORE_CTX object is created for the verification of the peers certificate
-            // during a handshake, a pointer to the SSL object is stored into the X509_STORE_CTX object
-            // to identify the connection affected. To retrieve this pointer the X509_STORE_CTX_get_ex_data()
-            // function can be used with the correct index."
+            // "Whenever a X509_STORE_CTX object is created for the verification of the
+            // peer's certificate during a handshake, a pointer to the SSL object is
+            // stored into the X509_STORE_CTX object to identify the connection affected.
+            // To retrieve this pointer the X509_STORE_CTX_get_ex_data() function can be
+            // used with the correct index."
+            const auto offset = QSslSocketBackendPrivate::s_indexForSSLExtraData
+                                + QSslSocketBackendPrivate::errorOffsetInExData;
             if (SSL *ssl = static_cast<SSL *>(q_X509_STORE_CTX_get_ex_data(ctx, q_SSL_get_ex_data_X509_STORE_CTX_idx())))
-                errors = ErrorListPtr(q_SSL_get_ex_data(ssl, QSslSocketBackendPrivate::s_indexForSSLExtraData + 1));
+                errors = ErrorListPtr(q_SSL_get_ex_data(ssl, offset));
         }
 
         if (!errors) {
@@ -476,20 +592,23 @@ void q_setDefaultDtlsCiphers(const QList<QSslCipher> &ciphers);
 long QSslSocketBackendPrivate::setupOpenSslOptions(QSsl::SslProtocol protocol, QSsl::SslOptions sslOptions)
 {
     long options;
-    if (protocol == QSsl::TlsV1SslV3)
-        options = SSL_OP_ALL|SSL_OP_NO_SSLv2|SSL_OP_NO_SSLv3;
-    else if (protocol == QSsl::SecureProtocols)
-        options = SSL_OP_ALL|SSL_OP_NO_SSLv2|SSL_OP_NO_SSLv3;
-    else if (protocol == QSsl::TlsV1_0OrLater)
-        options = SSL_OP_ALL|SSL_OP_NO_SSLv2|SSL_OP_NO_SSLv3;
-    else if (protocol == QSsl::TlsV1_1OrLater)
-        options = SSL_OP_ALL|SSL_OP_NO_SSLv2|SSL_OP_NO_SSLv3|SSL_OP_NO_TLSv1;
-    else if (protocol == QSsl::TlsV1_2OrLater)
-        options = SSL_OP_ALL|SSL_OP_NO_SSLv2|SSL_OP_NO_SSLv3|SSL_OP_NO_TLSv1|SSL_OP_NO_TLSv1_1;
-    else if (protocol == QSsl::TlsV1_3OrLater)
-        options = SSL_OP_ALL|SSL_OP_NO_SSLv2|SSL_OP_NO_SSLv3|SSL_OP_NO_TLSv1|SSL_OP_NO_TLSv1_1|SSL_OP_NO_TLSv1_2;
-    else
+    switch (protocol) {
+    case QSsl::SecureProtocols:
+    case QSsl::TlsV1_0OrLater:
+        options = SSL_OP_ALL | SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3;
+        break;
+    case QSsl::TlsV1_1OrLater:
+        options = SSL_OP_ALL | SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3 | SSL_OP_NO_TLSv1;
+        break;
+    case QSsl::TlsV1_2OrLater:
+        options = SSL_OP_ALL | SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3 | SSL_OP_NO_TLSv1 | SSL_OP_NO_TLSv1_1;
+        break;
+    case QSsl::TlsV1_3OrLater:
+        options = SSL_OP_ALL | SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3 | SSL_OP_NO_TLSv1 | SSL_OP_NO_TLSv1_1 | SSL_OP_NO_TLSv1_2;
+        break;
+    default:
         options = SSL_OP_ALL;
+    }
 
     // This option is disabled by default, so we need to be able to clear it
     if (sslOptions & QSsl::SslOptionDisableEmptyFragments)
@@ -547,10 +666,7 @@ bool QSslSocketBackendPrivate::initSslContext()
         return false;
     }
 
-    if (configuration.protocol != QSsl::SslV2 &&
-        configuration.protocol != QSsl::SslV3 &&
-        configuration.protocol != QSsl::UnknownProtocol &&
-        mode == QSslSocket::SslClientMode) {
+    if (configuration.protocol != QSsl::UnknownProtocol && mode == QSslSocket::SslClientMode) {
         // Set server hostname on TLS extension. RFC4366 section 3.1 requires it in ACE format.
         QString tlsHostName = verificationPeerName.isEmpty() ? q->peerName() : verificationPeerName;
         if (tlsHostName.isEmpty())
@@ -1216,18 +1332,32 @@ bool QSslSocketBackendPrivate::startHandshake()
     if (inSetAndEmitError)
         return false;
 
+    pendingFatalAlert = false;
+    errorsReportedFromCallback = false;
     QVector<QSslErrorEntry> lastErrors;
-    q_SSL_set_ex_data(ssl, s_indexForSSLExtraData + 1, &lastErrors);
+    q_SSL_set_ex_data(ssl, s_indexForSSLExtraData + errorOffsetInExData, &lastErrors);
+
+    // SSL_set_ex_data can fail, but see the callback's code - we handle this there.
+    q_SSL_set_ex_data(ssl, s_indexForSSLExtraData + socketOffsetInExData, this);
+    q_SSL_set_info_callback(ssl, qt_AlertInfoCallback);
+
     int result = (mode == QSslSocket::SslClientMode) ? q_SSL_connect(ssl) : q_SSL_accept(ssl);
-    q_SSL_set_ex_data(ssl, s_indexForSSLExtraData + 1, nullptr);
+    q_SSL_set_ex_data(ssl, s_indexForSSLExtraData + errorOffsetInExData, nullptr);
+    // Note, unlike errors as external data on SSL object, we do not unset
+    // a callback/ex-data if alert notifications are enabled: an alert can
+    // arrive after the handshake, for example, this happens when the server
+    // does not find a ClientCert or does not like it.
 
-    if (!lastErrors.isEmpty())
+    if (!lastErrors.isEmpty() || errorsReportedFromCallback)
         storePeerCertificates();
-    for (const auto &currentError : qAsConst(lastErrors)) {
-        emit q->peerVerifyError(_q_OpenSSL_to_QSslError(currentError.code,
-                                configuration.peerCertificateChain.value(currentError.depth)));
-        if (q->state() != QAbstractSocket::ConnectedState)
-            break;
+
+    if (!errorsReportedFromCallback) {
+        for (const auto &currentError : qAsConst(lastErrors)) {
+            emit q->peerVerifyError(_q_OpenSSL_to_QSslError(currentError.code,
+                                    configuration.peerCertificateChain.value(currentError.depth)));
+            if (q->state() != QAbstractSocket::ConnectedState)
+                break;
+        }
     }
 
     errorList << lastErrors;
@@ -1251,6 +1381,10 @@ bool QSslSocketBackendPrivate::startHandshake()
             {
                 const ScopedBool bg(inSetAndEmitError, true);
                 setErrorAndEmit(QAbstractSocket::SslHandshakeFailedError, errorString);
+                if (pendingFatalAlert) {
+                    trySendFatalAlert();
+                    pendingFatalAlert = false;
+                }
             }
             q->abort();
         }
@@ -1774,6 +1908,88 @@ bool QSslSocketBackendPrivate::checkOcspStatus()
 
 #endif // ocsp
 
+void QSslSocketBackendPrivate::alertMessageSent(int value)
+{
+    Q_Q(QSslSocket);
+
+    const auto level = tlsAlertLevel(value);
+    if (level == QAlertLevel::Fatal && !connectionEncrypted) {
+        // Note, this logic is handshake-time only:
+        pendingFatalAlert = true;
+    }
+
+    emit q->alertSent(level, tlsAlertType(value), tlsAlertDescription(value));
+}
+
+void QSslSocketBackendPrivate::alertMessageReceived(int value)
+{
+    Q_Q(QSslSocket);
+
+    emit q->alertReceived(tlsAlertLevel(value), tlsAlertType(value), tlsAlertDescription(value));
+}
+
+int QSslSocketBackendPrivate::emitErrorFromCallback(X509_STORE_CTX *ctx)
+{
+    // Returns 0 to abort verification, 1 to continue despite error (as
+    // OpenSSL expects from the verification callback).
+    Q_Q(QSslSocket);
+
+    Q_ASSERT(ctx);
+
+    using ScopedBool = QScopedValueRollback<bool>;
+    // While we are not setting, we are emitting and in general -
+    // we want to prevent accidental recursive startHandshake()
+    // calls:
+    const ScopedBool bg(inSetAndEmitError, true);
+
+    X509 *x509 = q_X509_STORE_CTX_get_current_cert(ctx);
+    if (!x509) {
+        qCWarning(lcSsl, "Could not obtain the certificate (that failed to verify)");
+        return 0;
+    }
+    const QSslCertificate certificate = QSslCertificatePrivate::QSslCertificate_from_X509(x509);
+
+    const auto errorAndDepth = QSslErrorEntry::fromStoreContext(ctx);
+    const QSslError tlsError = _q_OpenSSL_to_QSslError(errorAndDepth.code, certificate);
+
+    errorsReportedFromCallback = true;
+    handshakeInterrupted = true;
+    emit q->handshakeInterruptedOnError(tlsError);
+
+    // Conveniently so, we also can access 'lastErrors' external data set
+    // in startHandshake, we store it for the case an application later
+    // wants to check errors (ignored or not):
+    const auto offset = QSslSocketBackendPrivate::s_indexForSSLExtraData
+                        + QSslSocketBackendPrivate::errorOffsetInExData;
+    if (auto errorList = static_cast<QVector<QSslErrorEntry>*>(q_SSL_get_ex_data(ssl, offset)))
+        errorList->append(errorAndDepth);
+
+    // An application is expected to ignore this error (by calling ignoreSslErrors)
+    // in its directly connected slot:
+    return !handshakeInterrupted;
+}
+
+void QSslSocketBackendPrivate::trySendFatalAlert()
+{
+    Q_ASSERT(pendingFatalAlert);
+
+    pendingFatalAlert = false;
+    QVarLengthArray<char, 4096> data;
+    int pendingBytes = 0;
+    while (plainSocket->isValid() && (pendingBytes = q_BIO_pending(writeBio)) > 0
+           && plainSocket->openMode() != QIODevice::NotOpen) {
+        // Read encrypted data from the write BIO into a buffer.
+        data.resize(pendingBytes);
+        const int bioReadBytes = q_BIO_read(writeBio, data.data(), pendingBytes);
+
+        // Write encrypted data from the buffer to the socket.
+        qint64 actualWritten = plainSocket->write(data.constData(), bioReadBytes);
+        if (actualWritten < 0)
+            return;
+        plainSocket->flush();
+    }
+}
+
 void QSslSocketBackendPrivate::disconnectFromHost()
 {
     if (ssl) {
@@ -1817,10 +2033,6 @@ QSsl::SslProtocol QSslSocketBackendPrivate::sessionProtocol() const
     int ver = q_SSL_version(ssl);
 
     switch (ver) {
-    case 0x2:
-        return QSsl::SslV2;
-    case 0x300:
-        return QSsl::SslV3;
     case 0x301:
         return QSsl::TlsV1_0;
     case 0x302:
diff --git a/src/network/ssl/qsslsocket_openssl_p.h b/src/network/ssl/qsslsocket_openssl_p.h
index 47ccf06e71..6c1ffb7237 100644
--- a/src/network/ssl/qsslsocket_openssl_p.h
+++ b/src/network/ssl/qsslsocket_openssl_p.h
@@ -131,6 +131,10 @@ public:
     SSL_SESSION *session;
     QVector<QSslErrorEntry> errorList;
     static int s_indexForSSLExtraData; // index used in SSL_get_ex_data to get the matching QSslSocketBackendPrivate
+    enum ExDataOffset {
+        errorOffsetInExData = 1,
+        socketOffsetInExData = 2
+    };
 
     bool inSetAndEmitError = false;
 
@@ -158,6 +162,15 @@ public:
     bool checkOcspStatus();
 #endif
 
+    void alertMessageSent(int encoded);
+    void alertMessageReceived(int encoded);
+
+    int emitErrorFromCallback(X509_STORE_CTX *ctx);
+    void trySendFatalAlert();
+
+    bool pendingFatalAlert = false;
+    bool errorsReportedFromCallback = false;
+
     // This decription will go to setErrorAndEmit(SslHandshakeError, ocspErrorDescription)
     QString ocspErrorDescription;
     // These will go to sslErrors()
diff --git a/src/network/ssl/qsslsocket_openssl_symbols.cpp b/src/network/ssl/qsslsocket_openssl_symbols.cpp
index 84422e9c8f..93b1c8fbf9 100644
--- a/src/network/ssl/qsslsocket_openssl_symbols.cpp
+++ b/src/network/ssl/qsslsocket_openssl_symbols.cpp
@@ -156,6 +156,10 @@ DEFINEFUNC(void, OPENSSL_sk_free, OPENSSL_STACK *a, a, return, DUMMYARG)
 DEFINEFUNC2(void *, OPENSSL_sk_value, OPENSSL_STACK *a, a, int b, b, return nullptr, return)
 DEFINEFUNC(int, SSL_session_reused, SSL *a, a, return 0, return)
 DEFINEFUNC2(unsigned long, SSL_CTX_set_options, SSL_CTX *ctx, ctx, unsigned long op, op, return 0, return)
+using info_callback = void (*) (const SSL *ssl, int type, int val);
+DEFINEFUNC2(void, SSL_set_info_callback, SSL *ssl, ssl, info_callback cb, cb, return, return)
+DEFINEFUNC(const char *, SSL_alert_type_string, int value, value, return nullptr, return)
+DEFINEFUNC(const char *, SSL_alert_desc_string_long, int value, value, return nullptr, return)
 #ifdef TLS1_3_VERSION
 DEFINEFUNC2(int, SSL_CTX_set_ciphersuites, SSL_CTX *ctx, ctx, const char *str, str, return 0, return)
 DEFINEFUNC2(void, SSL_set_psk_use_session_callback, SSL *ssl, ssl, q_SSL_psk_use_session_cb_func_t callback, callback, return, DUMMYARG)
@@ -841,7 +845,9 @@ bool q_resolveOpenSslSymbols()
     RESOLVEFUNC(OPENSSL_sk_value)
     RESOLVEFUNC(DH_get0_pqg)
     RESOLVEFUNC(SSL_CTX_set_options)
-
+    RESOLVEFUNC(SSL_set_info_callback)
+    RESOLVEFUNC(SSL_alert_type_string)
+    RESOLVEFUNC(SSL_alert_desc_string_long)
 #ifdef TLS1_3_VERSION
     RESOLVEFUNC(SSL_CTX_set_ciphersuites)
     RESOLVEFUNC(SSL_set_psk_use_session_callback)
diff --git a/src/network/ssl/qsslsocket_openssl_symbols_p.h b/src/network/ssl/qsslsocket_openssl_symbols_p.h
index f35e0ba22b..273a4f359a 100644
--- a/src/network/ssl/qsslsocket_openssl_symbols_p.h
+++ b/src/network/ssl/qsslsocket_openssl_symbols_p.h
@@ -735,6 +735,10 @@ int q_OCSP_id_cmp(OCSP_CERTID *a, OCSP_CERTID *b);
 void *q_CRYPTO_malloc(size_t num, const char *file, int line);
 #define q_OPENSSL_malloc(num) q_CRYPTO_malloc(num, "", 0)
 
+void q_SSL_set_info_callback(SSL *ssl, void (*cb) (const SSL *ssl, int type, int val));
+const char *q_SSL_alert_type_string(int value);
+const char *q_SSL_alert_desc_string_long(int value);
+
 QT_END_NAMESPACE
 
 #endif
diff --git a/src/network/ssl/qsslsocket_p.h b/src/network/ssl/qsslsocket_p.h
index 1abd18bb32..4b020b6a73 100644
--- a/src/network/ssl/qsslsocket_p.h
+++ b/src/network/ssl/qsslsocket_p.h
@@ -208,6 +208,7 @@ protected:
     bool paused;
     bool flushTriggered;
     QVector<QOcspResponse> ocspResponses;
+    bool handshakeInterrupted = false;
 };
 
 #if QT_CONFIG(securetransport) || QT_CONFIG(schannel)
diff --git a/src/network/ssl/qsslsocket_schannel.cpp b/src/network/ssl/qsslsocket_schannel.cpp
index 31b0db4818..2db5c48ff2 100644
--- a/src/network/ssl/qsslsocket_schannel.cpp
+++ b/src/network/ssl/qsslsocket_schannel.cpp
@@ -226,12 +226,6 @@ DWORD toSchannelProtocol(QSsl::SslProtocol protocol)
         protocols = SP_PROT_TLS1_0 | SP_PROT_TLS1_1 | SP_PROT_TLS1_2;
         // @future Add TLS 1.3 when supported by Windows!
         break;
-    case QSsl::SslV2:
-    case QSsl::SslV3:
-        return DWORD(-1); // Not supported
-    case QSsl::TlsV1SslV3:
-        protocols = SP_PROT_TLS1_0;
-        break;
     case QSsl::TlsV1_0:
         protocols = SP_PROT_TLS1_0;
         break;
diff --git a/src/network/ssl/qsslsocket_winrt.cpp b/src/network/ssl/qsslsocket_winrt.cpp
index f3ca3dc257..5f5201fc82 100644
--- a/src/network/ssl/qsslsocket_winrt.cpp
+++ b/src/network/ssl/qsslsocket_winrt.cpp
@@ -230,13 +230,7 @@ void QSslSocketBackendPrivate::startClientEncryption()
 
     QSsl::SslProtocol protocol = q->protocol();
     switch (q->protocol()) {
-    case QSsl::SslV2:
-    case QSsl::SslV3:
-        setErrorAndEmit(QAbstractSocket::SslInvalidUserDataError,
-                        QStringLiteral("unsupported protocol"));
-        return;
     case QSsl::AnyProtocol:
-    case QSsl::TlsV1SslV3:
         protectionLevel = SocketProtectionLevel_Tls10;
         break;
     case QSsl::TlsV1_0:
@@ -270,7 +264,7 @@ void QSslSocketBackendPrivate::startClientEncryption()
     }
 
     // Sync custom certificates
-    const QSet<QSslCertificate> caCertificates = configuration.caCertificates.toSet();
+    const QSet<QSslCertificate> caCertificates(configuration.caCertificates.constBegin(), configuration.caCertificates.constEnd());
     const QSet<QSslCertificate> newCertificates = caCertificates - previousCaCertificates;
     const QSet<QSslCertificate> oldCertificates = previousCaCertificates - caCertificates;
     g->syncCaCertificates(newCertificates, oldCertificates);
@@ -393,7 +387,7 @@ void QSslSocketBackendPrivate::continueHandshake()
     hr = control2->get_IgnorableServerCertificateErrors(&ignoreList);
     Q_ASSERT_SUCCEEDED(hr);
 
-    QSet<QSslError> ignoreErrors = ignoreErrorsList.toSet();
+    QSet<QSslError> ignoreErrors(ignoreErrorsList.constBegin(), ignoreErrorsList.constEnd());
     for (int i = ChainValidationResult_Untrusted; i < ChainValidationResult_OtherErrors + 1; ++i) {
         // Populate the native ignore list - break to add, continue to skip
         switch (i) {
@@ -596,7 +590,7 @@ HRESULT QSslSocketBackendPrivate::onSslUpgrade(IAsyncAction *action, AsyncStatus
         }
     }
 
-    sslErrors = errors.toList();
+    sslErrors = QList<QSslError>(errors.constBegin(), errors.constEnd());
 
     // Peer validation
     if (!configuration.peerCertificate.isNull()) {
diff --git a/src/opengl/.prev_CMakeLists.txt b/src/opengl/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..eb125273bc
--- /dev/null
+++ b/src/opengl/.prev_CMakeLists.txt
@@ -0,0 +1,62 @@
+# Generated from opengl.pro.
+
+#####################################################################
+## OpenGL Module:
+#####################################################################
+
+qt_add_module(OpenGL
+    SOURCES
+        qopengl2pexvertexarray.cpp qopengl2pexvertexarray_p.h
+        qopenglcustomshaderstage.cpp qopenglcustomshaderstage_p.h
+        qopengldebug.cpp qopengldebug.h
+        qopenglengineshadermanager.cpp qopenglengineshadermanager_p.h
+        qopenglengineshadersource_p.h
+        qopenglgradientcache.cpp qopenglgradientcache_p.h
+        qopenglpaintdevice.cpp qopenglpaintdevice.h qopenglpaintdevice_p.h
+        qopenglpaintengine.cpp qopenglpaintengine_p.h
+        qopenglpixeltransferoptions.cpp qopenglpixeltransferoptions.h
+        qopenglshadercache_p.h
+        qopengltexture.cpp qopengltexture.h qopengltexture_p.h
+        qopengltexturecache.cpp qopengltexturecache_p.h
+        qopengltextureglyphcache.cpp qopengltextureglyphcache_p.h
+        qopengltexturehelper.cpp qopengltexturehelper_p.h
+        qopengltextureuploader.cpp qopengltextureuploader_p.h
+        qopenglwindow.cpp qopenglwindow.h
+        qtopenglglobal.h
+    DEFINES
+        QT_NO_FOREACH
+        QT_NO_USING_NAMESPACE
+    LIBRARIES
+        Qt::CorePrivate
+        Qt::GuiPrivate
+    PUBLIC_LIBRARIES
+        Qt::Core
+        Qt::Gui
+    PRIVATE_MODULE_INTERFACE
+        Qt::CorePrivate
+        Qt::GuiPrivate
+)
+
+## Scopes:
+#####################################################################
+
+qt_extend_target(OpenGL CONDITION QT_FEATURE_widgets
+    SOURCES
+        qopenglwidget.cpp qopenglwidget.h
+    LIBRARIES
+        Qt::WidgetsPrivate
+    PUBLIC_LIBRARIES
+        Qt::Widgets
+    PRIVATE_MODULE_INTERFACE
+        Qt::WidgetsPrivate
+)
+
+qt_extend_target(OpenGL CONDITION NOT QT_FEATURE_opengles2
+    SOURCES
+        qopenglqueryhelper_p.h
+        qopengltimerquery.cpp qopengltimerquery.h
+)
+qt_add_docs(OpenGL
+    doc/qtopengl.qdocconf
+)
+
diff --git a/src/opengl/CMakeLists.txt b/src/opengl/CMakeLists.txt
new file mode 100644
index 0000000000..18378a7564
--- /dev/null
+++ b/src/opengl/CMakeLists.txt
@@ -0,0 +1,56 @@
+# Generated from opengl.pro.
+
+#####################################################################
+## OpenGL Module:
+#####################################################################
+
+qt_add_module(OpenGL
+    SOURCES
+        qopengl2pexvertexarray.cpp qopengl2pexvertexarray_p.h
+        qopenglbuffer.cpp qopenglbuffer.h
+        qopenglcustomshaderstage.cpp qopenglcustomshaderstage_p.h
+        qopengldebug.cpp qopengldebug.h
+        qopenglengineshadermanager.cpp qopenglengineshadermanager_p.h
+        qopenglengineshadersource_p.h
+        qopenglframebufferobject.cpp qopenglframebufferobject.h qopenglframebufferobject_p.h
+        qopenglgradientcache.cpp qopenglgradientcache_p.h
+        qopenglpaintdevice.cpp qopenglpaintdevice.h qopenglpaintdevice_p.h
+        qopenglpaintengine.cpp qopenglpaintengine_p.h
+        qopenglpixeltransferoptions.cpp qopenglpixeltransferoptions.h
+        qopenglshadercache_p.h
+        qopenglshaderprogram.cpp qopenglshaderprogram.h
+        qopengltexture.cpp qopengltexture.h qopengltexture_p.h
+        qopengltextureblitter.cpp qopengltextureblitter.h
+        qopengltexturecache.cpp qopengltexturecache_p.h
+        qopengltextureglyphcache.cpp qopengltextureglyphcache_p.h
+        qopengltexturehelper.cpp qopengltexturehelper_p.h
+        qopengltextureuploader.cpp qopengltextureuploader_p.h
+        qopenglvertexarrayobject.cpp qopenglvertexarrayobject.h
+        qopenglwindow.cpp qopenglwindow.h
+        qtopenglglobal.h
+    DEFINES
+        QT_NO_FOREACH
+        QT_NO_USING_NAMESPACE
+    LIBRARIES
+        Qt::CorePrivate
+        Qt::GuiPrivate
+    PUBLIC_LIBRARIES
+        Qt::Core
+        Qt::Gui
+    PRIVATE_MODULE_INTERFACE
+        Qt::CorePrivate
+        Qt::GuiPrivate
+)
+
+## Scopes:
+#####################################################################
+
+qt_extend_target(OpenGL CONDITION NOT QT_FEATURE_opengles2
+    SOURCES
+        qopenglqueryhelper_p.h
+        qopengltimerquery.cpp qopengltimerquery.h
+)
+qt_add_docs(OpenGL
+    doc/qtopengl.qdocconf
+)
+
diff --git a/src/opengl/doc/snippets/code/src_opengl_qgl.cpp b/src/opengl/doc/snippets/code/src_opengl_qgl.cpp
deleted file mode 100644
index a73ee2cdc5..0000000000
--- a/src/opengl/doc/snippets/code/src_opengl_qgl.cpp
+++ /dev/null
@@ -1,182 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, you may use this file under the terms of the BSD license
-** as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-//! [0]
-QGLFormat fmt;
-fmt.setAlpha(true);
-fmt.setStereo(true);
-QGLFormat::setDefaultFormat(fmt);
-//! [0]
-
-
-//! [1]
-QGLFormat fmt;
-fmt.setDoubleBuffer(false);                 // single buffer
-fmt.setDirectRendering(false);              // software rendering
-MyGLWidget* myWidget = new MyGLWidget(fmt, ...);
-//! [1]
-
-
-//! [2]
-QGLFormat fmt;
-fmt.setOverlay(true);
-fmt.setStereo(true);
-MyGLWidget* myWidget = new MyGLWidget(fmt, ...);
-if (!myWidget->format().stereo()) {
-    // ok, goggles off
-    if (!myWidget->format().hasOverlay()) {
-        qFatal("Cool hardware required");
-    }
-}
-//! [2]
-
-
-//! [3]
-// The rendering in MyGLWidget depends on using
-// stencil buffer and alpha channel
-MyGLWidget::MyGLWidget(QWidget* parent)
-    : QGLWidget(QGLFormat(QGL::StencilBuffer | QGL::AlphaChannel), parent)
-{
-    if (!format().stencil())
-        qWarning("Could not get stencil buffer; results will be suboptimal");
-    if (!format().alpha())
-        qWarning("Could not get alpha channel; results will be suboptimal");
-    ...
-}
-//! [3]
-
-
-//! [4]
-QApplication a(argc, argv);
-QGLFormat f;
-f.setDoubleBuffer(false);
-QGLFormat::setDefaultFormat(f);
-//! [4]
-
-
-//! [5]
-QGLFormat f = QGLFormat::defaultOverlayFormat();
-f.setDoubleBuffer(true);
-QGLFormat::setDefaultOverlayFormat(f);
-//! [5]
-
-
-//! [6]
-// ...continued from above
-MyGLWidget* myWidget = new MyGLWidget(QGLFormat(QGL::HasOverlay), ...);
-if (myWidget->format().hasOverlay()) {
-    // Yes, we got an overlay, let's check _its_ format:
-    QGLContext* olContext = myWidget->overlayContext();
-    if (olContext->format().doubleBuffer())
-        ; // yes, we got a double buffered overlay
-    else
-        ; // no, only single buffered overlays are available
-}
-//! [6]
-
-
-//! [7]
-QGLContext *cx;
-//  ...
-QGLFormat f;
-f.setStereo(true);
-cx->setFormat(f);
-if (!cx->create())
-    exit(); // no OpenGL support, or cannot render on the specified paintdevice
-if (!cx->format().stereo())
-    exit(); // could not create stereo context
-//! [7]
-
-
-//! [8]
-class MyGLDrawer : public QGLWidget
-{
-    Q_OBJECT        // must include this if you use Qt signals/slots
-
-public:
-    MyGLDrawer(QWidget *parent)
-        : QGLWidget(parent) {}
-
-protected:
-
-    void initializeGL() override
-    {
-        // Set up the rendering context, define display lists etc.:
-        ...
-        glClearColor(0.0, 0.0, 0.0, 0.0);
-        glEnable(GL_DEPTH_TEST);
-        ...
-    }
-
-    void resizeGL(int w, int h) override
-    {
-        // setup viewport, projection etc.:
-        glViewport(0, 0, (GLint)w, (GLint)h);
-        ...
-        glFrustum(...);
-        ...
-    }
-
-    void paintGL() override
-    {
-        // draw the scene:
-        ...
-        glRotatef(...);
-        glMaterialfv(...);
-        glBegin(GL_QUADS);
-        glVertex3f(...);
-        glVertex3f(...);
-        ...
-        glEnd();
-        ...
-    }
-
-};
-//! [8]
diff --git a/src/opengl/doc/snippets/code/src_opengl_qglbuffer.cpp b/src/opengl/doc/snippets/code/src_opengl_qglbuffer.cpp
deleted file mode 100644
index 11ef88ab37..0000000000
--- a/src/opengl/doc/snippets/code/src_opengl_qglbuffer.cpp
+++ /dev/null
@@ -1,60 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2018 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, you may use this file under the terms of the BSD license
-** as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-//! [0]
-    QGLBuffer buffer1(QGLBuffer::IndexBuffer);
-    buffer1.create();
-
-    QGLBuffer buffer2 = buffer1;
-//! [0]
-
-//! [1]
-    QGLBuffer::release(QGLBuffer::VertexBuffer);
-//! [1]
diff --git a/src/opengl/doc/snippets/code/src_opengl_qglcolormap.cpp b/src/opengl/doc/snippets/code/src_opengl_qglcolormap.cpp
deleted file mode 100644
index 12a089944f..0000000000
--- a/src/opengl/doc/snippets/code/src_opengl_qglcolormap.cpp
+++ /dev/null
@@ -1,71 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, you may use this file under the terms of the BSD license
-** as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-//! [0]
-#include <QApplication>
-#include <QGLColormap>
-
-int main()
-{
-    QApplication app(argc, argv);
-
-    MySuperGLWidget widget;     // a QGLWidget in color-index mode
-    QGLColormap colormap;
-
-    // This will fill the colormap with colors ranging from
-    // black to white.
-    for (int i = 0; i < colormap.size(); i++)
-        colormap.setEntry(i, qRgb(i, i, i));
-
-    widget.setColormap(colormap);
-    widget.show();
-    return app.exec();
-}
-//! [0]
diff --git a/src/opengl/doc/snippets/code/src_opengl_qglfunctions.cpp b/src/opengl/doc/snippets/code/src_opengl_qglfunctions.cpp
deleted file mode 100644
index c848ae7ede..0000000000
--- a/src/opengl/doc/snippets/code/src_opengl_qglfunctions.cpp
+++ /dev/null
@@ -1,86 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2018 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, you may use this file under the terms of the BSD license
-** as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-//! [0]
-    class MyGLWidget : public QGLWidget, protected QGLFunctions
-    {
-        Q_OBJECT
-    public:
-        MyGLWidget(QWidget *parent = 0) : QGLWidget(parent) {}
-
-    protected:
-        void initializeGL();
-        void paintGL();
-    };
-
-    void MyGLWidget::initializeGL()
-    {
-        initializeGLFunctions();
-    }
-//! [0]
-
-//! [1]
-    void MyGLWidget::paintGL()
-    {
-        glActiveTexture(GL_TEXTURE1);
-        glBindTexture(GL_TEXTURE_2D, textureId);
-        ...
-    }
-//! [1]
-
-//! [2]
-    QGLFunctions glFuncs(QGLContext::currentContext());
-    glFuncs.glActiveTexture(GL_TEXTURE1);
-//! [2]
-
-//! [3]
-    QGLFunctions funcs(QGLContext::currentContext());
-    bool npot = funcs.hasOpenGLFeature(QGLFunctions::NPOTTextures);
-//! [3]
diff --git a/src/opengl/doc/snippets/code/src_opengl_qglpixelbuffer.cpp b/src/opengl/doc/snippets/code/src_opengl_qglpixelbuffer.cpp
deleted file mode 100644
index f6fbe6ddb4..0000000000
--- a/src/opengl/doc/snippets/code/src_opengl_qglpixelbuffer.cpp
+++ /dev/null
@@ -1,69 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, you may use this file under the terms of the BSD license
-** as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-//! [0]
-QGLPixelBuffer pbuffer(...);
-...
-pbuffer.makeCurrent();
-GLuint dynamicTexture = pbuffer.generateDynamicTexture();
-pbuffer.bindToDynamicTexture(dynamicTexture);
-...
-pbuffer.releaseFromDynamicTexture();
-//! [0]
-
-
-//! [1]
-QGLPixelBuffer pbuffer(...);
-...
-pbuffer.makeCurrent();
-GLuint dynamicTexture = pbuffer.generateDynamicTexture();
-...
-pbuffer.updateDynamicTexture(dynamicTexture);
-//! [1]
diff --git a/src/opengl/doc/snippets/code/src_opengl_qglshaderprogram.cpp b/src/opengl/doc/snippets/code/src_opengl_qglshaderprogram.cpp
deleted file mode 100644
index 04492499e8..0000000000
--- a/src/opengl/doc/snippets/code/src_opengl_qglshaderprogram.cpp
+++ /dev/null
@@ -1,104 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, you may use this file under the terms of the BSD license
-** as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-//! [0]
-QGLShader shader(QGLShader::Vertex);
-shader.compileSourceCode(code);
-
-QGLShaderProgram program(context);
-program.addShader(shader);
-program.link();
-
-program.bind();
-//! [0]
-
-//! [1]
-program.addShaderFromSourceCode(QGLShader::Vertex,
-    "attribute highp vec4 vertex;\n"
-    "uniform highp mat4 matrix;\n"
-    "void main(void)\n"
-    "{\n"
-    "   gl_Position = matrix * vertex;\n"
-    "}");
-program.addShaderFromSourceCode(QGLShader::Fragment,
-    "uniform mediump vec4 color;\n"
-    "void main(void)\n"
-    "{\n"
-    "   gl_FragColor = color;\n"
-    "}");
-program.link();
-program.bind();
-
-int vertexLocation = program.attributeLocation("vertex");
-int matrixLocation = program.uniformLocation("matrix");
-int colorLocation = program.uniformLocation("color");
-//! [1]
-
-//! [2]
-static GLfloat const triangleVertices[] = {
-    60.0f,  10.0f,  0.0f,
-    110.0f, 110.0f, 0.0f,
-    10.0f,  110.0f, 0.0f
-};
-
-QColor color(0, 255, 0, 255);
-
-QMatrix4x4 pmvMatrix;
-pmvMatrix.ortho(rect());
-
-program.enableAttributeArray(vertexLocation);
-program.setAttributeArray(vertexLocation, triangleVertices, 3);
-program.setUniformValue(matrixLocation, pmvMatrix);
-program.setUniformValue(colorLocation, color);
-
-glDrawArrays(GL_TRIANGLES, 0, 3);
-
-program.disableAttributeArray(vertexLocation);
-//! [2]
diff --git a/src/opengl/doc/snippets/code/src_opengl_qgraphicsshadereffect.cpp b/src/opengl/doc/snippets/code/src_opengl_qgraphicsshadereffect.cpp
deleted file mode 100644
index 461e96e094..0000000000
--- a/src/opengl/doc/snippets/code/src_opengl_qgraphicsshadereffect.cpp
+++ /dev/null
@@ -1,95 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2018 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, you may use this file under the terms of the BSD license
-** as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-//! [0]
-    static char const colorizeShaderCode[] =
-        "uniform lowp vec4 effectColor;\n"
-        "lowp vec4 customShader(lowp sampler2D imageTexture, highp vec2 textureCoords) {\n"
-        "    vec4 src = texture2D(imageTexture, textureCoords);\n"
-        "    float gray = dot(src.rgb, vec3(0.212671, 0.715160, 0.072169));\n"
-        "    vec4 colorize = 1.0-((1.0-gray)*(1.0-effectColor));\n"
-        "    return vec4(colorize.rgb, src.a);\n"
-        "}";
-//! [0]
-
-//! [1]
-    class ColorizeEffect : public QGraphicsShaderEffect
-    {
-        Q_OBJECT
-    public:
-        ColorizeEffect(QObject *parent = 0)
-            : QGraphicsShaderEffect(parent), color(Qt::black)
-        {
-            setPixelShaderFragment(colorizeShaderCode);
-        }
-
-        QColor effectColor() const { return color; }
-        void setEffectColor(const QColor& c)
-        {
-            color = c;
-            setUniformsDirty();
-        }
-
-    protected:
-        void setUniforms(QGLShaderProgram *program)
-        {
-            program->setUniformValue("effectColor", color);
-        }
-
-    private:
-        QColor color;
-    };
-//! [1]
-
-//! [2]
-    lowp vec4 customShader(lowp sampler2D imageTexture, highp vec2 textureCoords) {
-        return texture2D(imageTexture, textureCoords);
-    }
-//! [2]
diff --git a/src/opengl/doc/src/qtopengl-examples.qdoc b/src/opengl/doc/src/qtopengl-examples.qdoc
index de80c92883..8770d6247e 100644
--- a/src/opengl/doc/src/qtopengl-examples.qdoc
+++ b/src/opengl/doc/src/qtopengl-examples.qdoc
@@ -33,12 +33,11 @@
 
     \image opengl-examples.png
 
-    These examples describe how to use the \l {Qt OpenGL} module. For new code,
-    please use the OpenGL classes in the \l {Qt GUI} module.
+    These examples describe how to use the \l {Qt OpenGL} module.
 
-    Qt provides support for integration with OpenGL implementations on all
-    platforms, giving developers the opportunity to display hardware accelerated
-    3D graphics alongside a more conventional user interface.
+    Qt provides support for integration with OpenGL implementations, giving
+    developers the opportunity to display hardware accelerated 3D graphics
+    alongside a more conventional user interface.
 
     These examples demonstrate the basic techniques used to take advantage of
     OpenGL in Qt applications.
diff --git a/src/opengl/doc/src/qtopengl-module.qdoc b/src/opengl/doc/src/qtopengl-module.qdoc
index 336d37c73f..24df4aec76 100644
--- a/src/opengl/doc/src/qtopengl-module.qdoc
+++ b/src/opengl/doc/src/qtopengl-module.qdoc
@@ -34,8 +34,7 @@
     \brief The Qt OpenGL module offers classes that make it easy to
     use OpenGL in Qt applications.
 
-    \warning This module should not be used anymore for new code. Please
-    use the corresponding OpenGL classes in \l{Qt GUI}.
+    \warning This module should not be used anymore for new code.
 
     OpenGL is a standard API for rendering 3D graphics. OpenGL only
     deals with 3D rendering and provides little or no support for GUI
@@ -48,9 +47,6 @@
     the United States and other countries.
 
     The Qt OpenGL module makes it easy to use OpenGL in Qt applications.
-    It provides an OpenGL widget class that can be used just like any
-    other Qt widget, except that it opens an OpenGL display buffer where
-    you can use the OpenGL API to render the contents.
 
     To include the definitions of the module's classes, use the
     following directive:
@@ -63,11 +59,4 @@
 
     \snippet code/doc_src_qtopengl.pro 1
     \endif
-
-    The Qt OpenGL module is implemented as a platform-independent Qt/C++
-    wrapper around the platform-dependent GLX (version 1.3 or later),
-    WGL, or AGL C APIs. Although the basic functionality provided is very
-    similar to Mark Kilgard's GLUT library, applications using the Qt
-    OpenGL module can take advantage of the whole Qt API for
-    non-OpenGL-specific GUI functionality.
 */
diff --git a/src/opengl/gl2paintengineex/qgl2pexvertexarray.cpp b/src/opengl/gl2paintengineex/qgl2pexvertexarray.cpp
deleted file mode 100644
index 979ea19fee..0000000000
--- a/src/opengl/gl2paintengineex/qgl2pexvertexarray.cpp
+++ /dev/null
@@ -1,173 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtOpenGL module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qgl2pexvertexarray_p.h"
-
-#include <private/qbezier_p.h>
-
-QT_BEGIN_NAMESPACE
-
-void QGL2PEXVertexArray::clear()
-{
-    vertexArray.reset();
-    vertexArrayStops.reset();
-    boundingRectDirty = true;
-}
-
-
-QGLRect QGL2PEXVertexArray::boundingRect() const
-{
-    if (boundingRectDirty)
-        return QGLRect(0.0, 0.0, 0.0, 0.0);
-    else
-        return QGLRect(minX, minY, maxX, maxY);
-}
-
-void QGL2PEXVertexArray::addClosingLine(int index)
-{
-    QPointF point(vertexArray.at(index));
-    if (point != QPointF(vertexArray.last()))
-        vertexArray.add(point);
-}
-
-void QGL2PEXVertexArray::addCentroid(const QVectorPath &path, int subPathIndex)
-{
-    const QPointF *const points = reinterpret_cast<const QPointF *>(path.points());
-    const QPainterPath::ElementType *const elements = path.elements();
-
-    QPointF sum = points[subPathIndex];
-    int count = 1;
-
-    for (int i = subPathIndex + 1; i < path.elementCount() && (!elements || elements[i] != QPainterPath::MoveToElement); ++i) {
-        sum += points[i];
-        ++count;
-    }
-
-    const QPointF centroid = sum / qreal(count);
-    vertexArray.add(centroid);
-}
-
-void QGL2PEXVertexArray::addPath(const QVectorPath &path, GLfloat curveInverseScale, bool outline)
-{
-    const QPointF* const points = reinterpret_cast<const QPointF*>(path.points());
-    const QPainterPath::ElementType* const elements = path.elements();
-
-    if (boundingRectDirty) {
-        minX = maxX = points[0].x();
-        minY = maxY = points[0].y();
-        boundingRectDirty = false;
-    }
-
-    if (!outline && !path.isConvex())
-        addCentroid(path, 0);
-
-    int lastMoveTo = vertexArray.size();
-    vertexArray.add(points[0]); // The first element is always a moveTo
-
-    do {
-        if (!elements) {
-//             qDebug("QVectorPath has no elements");
-            // If the path has a null elements pointer, the elements implicitly
-            // start with a moveTo (already added) and continue with lineTos:
-            for (int i=1; i<path.elementCount(); ++i)
-                lineToArray(points[i].x(), points[i].y());
-
-            break;
-        }
-//         qDebug("QVectorPath has element types");
-
-        for (int i=1; i<path.elementCount(); ++i) {
-            switch (elements[i]) {
-            case QPainterPath::MoveToElement:
-                if (!outline)
-                    addClosingLine(lastMoveTo);
-//                qDebug("element[%d] is a MoveToElement", i);
-                vertexArrayStops.add(vertexArray.size());
-                if (!outline) {
-                    if (!path.isConvex()) addCentroid(path, i);
-                    lastMoveTo = vertexArray.size();
-                }
-                lineToArray(points[i].x(), points[i].y()); // Add the moveTo as a new vertex
-                break;
-            case QPainterPath::LineToElement:
-//                qDebug("element[%d] is a LineToElement", i);
-                lineToArray(points[i].x(), points[i].y());
-                break;
-            case QPainterPath::CurveToElement: {
-                QBezier b = QBezier::fromPoints(*(((const QPointF *) points) + i - 1),
-                                                points[i],
-                                                points[i+1],
-                                                points[i+2]);
-                QRectF bounds = b.bounds();
-                // threshold based on same algorithm as in qtriangulatingstroker.cpp
-                int threshold = qMin<float>(64, qMax(bounds.width(), bounds.height()) * 3.14f / (curveInverseScale * 6));
-                if (threshold < 3) threshold = 3;
-                qreal one_over_threshold_minus_1 = qreal(1) / (threshold - 1);
-                for (int t=0; t<threshold; ++t) {
-                    QPointF pt = b.pointAt(t * one_over_threshold_minus_1);
-                    lineToArray(pt.x(), pt.y());
-                }
-                i += 2;
-                break; }
-            default:
-                break;
-            }
-        }
-    } while (0);
-
-    if (!outline)
-        addClosingLine(lastMoveTo);
-    vertexArrayStops.add(vertexArray.size());
-}
-
-void QGL2PEXVertexArray::lineToArray(const GLfloat x, const GLfloat y)
-{
-    vertexArray.add(QGLPoint(x, y));
-
-    if (x > maxX)
-        maxX = x;
-    else if (x < minX)
-        minX = x;
-    if (y > maxY)
-        maxY = y;
-    else if (y < minY)
-        minY = y;
-}
-
-QT_END_NAMESPACE
diff --git a/src/opengl/gl2paintengineex/qgl2pexvertexarray_p.h b/src/opengl/gl2paintengineex/qgl2pexvertexarray_p.h
deleted file mode 100644
index 5c95268790..0000000000
--- a/src/opengl/gl2paintengineex/qgl2pexvertexarray_p.h
+++ /dev/null
@@ -1,167 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtOpenGL module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#ifndef QGL2PEXVERTEXARRAY_P_H
-#define QGL2PEXVERTEXARRAY_P_H
-
-#include <QRectF>
-
-#include <private/qdatabuffer_p.h>
-#include <private/qvectorpath_p.h>
-#include <private/qgl_p.h>
-
-QT_BEGIN_NAMESPACE
-
-class QGLPoint
-{
-public:
-    QGLPoint(GLfloat new_x, GLfloat new_y) :
-        x(new_x), y(new_y) {};
-
-    QGLPoint(const QPointF &p) :
-        x(p.x()), y(p.y()) {};
-
-    QGLPoint(const QPointF* p) :
-        x(p->x()), y(p->y()) {};
-
-    GLfloat x;
-    GLfloat y;
-
-    operator QPointF() {return QPointF(x,y);}
-    operator QPointF() const {return QPointF(x,y);}
-};
-
-struct QGLRect
-{
-    QGLRect(const QRectF &r)
-        :  left(r.left()), top(r.top()), right(r.right()), bottom(r.bottom()) {}
-
-    QGLRect(GLfloat l, GLfloat t, GLfloat r, GLfloat b)
-        : left(l), top(t), right(r), bottom(b) {}
-
-    GLfloat left;
-    GLfloat top;
-    GLfloat right;
-    GLfloat bottom;
-
-    operator QRectF() const {return QRectF(left, top, right-left, bottom-top);}
-};
-
-class QGL2PEXVertexArray
-{
-public:
-    QGL2PEXVertexArray() :
-        vertexArray(0), vertexArrayStops(0),
-        maxX(-2e10), maxY(-2e10), minX(2e10), minY(2e10),
-        boundingRectDirty(true)
-    { }
-
-    inline void addRect(const QRectF &rect)
-    {
-        qreal top = rect.top();
-        qreal left = rect.left();
-        qreal bottom = rect.bottom();
-        qreal right = rect.right();
-
-        vertexArray << QGLPoint(left, top)
-                    << QGLPoint(right, top)
-                    << QGLPoint(right, bottom)
-                    << QGLPoint(right, bottom)
-                    << QGLPoint(left, bottom)
-                    << QGLPoint(left, top);
-    }
-
-    inline void addQuad(const QRectF &rect)
-    {
-        qreal top = rect.top();
-        qreal left = rect.left();
-        qreal bottom = rect.bottom();
-        qreal right = rect.right();
-
-        vertexArray << QGLPoint(left, top)
-                    << QGLPoint(right, top)
-                    << QGLPoint(left, bottom)
-                    << QGLPoint(right, bottom);
-
-    }
-
-    inline void addVertex(const GLfloat x, const GLfloat y)
-    {
-        vertexArray.add(QGLPoint(x, y));
-    }
-
-    void addPath(const QVectorPath &path, GLfloat curveInverseScale, bool outline = true);
-    void clear();
-
-    QGLPoint*        data() {return vertexArray.data();}
-    int *stops() const { return vertexArrayStops.data(); }
-    int stopCount() const { return vertexArrayStops.size(); }
-    QGLRect         boundingRect() const;
-
-    int vertexCount() const { return vertexArray.size(); }
-
-    void lineToArray(const GLfloat x, const GLfloat y);
-
-private:
-    QDataBuffer<QGLPoint> vertexArray;
-    QDataBuffer<int>      vertexArrayStops;
-
-    GLfloat     maxX;
-    GLfloat     maxY;
-    GLfloat     minX;
-    GLfloat     minY;
-    bool        boundingRectDirty;
-    void addClosingLine(int index);
-    void addCentroid(const QVectorPath &path, int subPathIndex);
-};
-
-QT_END_NAMESPACE
-
-#endif
diff --git a/src/opengl/gl2paintengineex/qglcustomshaderstage.cpp b/src/opengl/gl2paintengineex/qglcustomshaderstage.cpp
deleted file mode 100644
index 7d6d4595ba..0000000000
--- a/src/opengl/gl2paintengineex/qglcustomshaderstage.cpp
+++ /dev/null
@@ -1,137 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtOpenGL module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qglcustomshaderstage_p.h"
-#include "qglengineshadermanager_p.h"
-#include "qpaintengineex_opengl2_p.h"
-#include <private/qpainter_p.h>
-
-QT_BEGIN_NAMESPACE
-
-class QGLCustomShaderStagePrivate
-{
-public:
-    QGLCustomShaderStagePrivate() :
-        m_manager(0) {}
-
-    QPointer<QGLEngineShaderManager> m_manager;
-    QByteArray              m_source;
-};
-
-
-
-
-QGLCustomShaderStage::QGLCustomShaderStage()
-    : d_ptr(new QGLCustomShaderStagePrivate)
-{
-}
-
-QGLCustomShaderStage::~QGLCustomShaderStage()
-{
-    Q_D(QGLCustomShaderStage);
-    if (d->m_manager) {
-        d->m_manager->removeCustomStage();
-        d->m_manager->sharedShaders->cleanupCustomStage(this);
-    }
-    delete d_ptr;
-}
-
-void QGLCustomShaderStage::setUniformsDirty()
-{
-    Q_D(QGLCustomShaderStage);
-    if (d->m_manager)
-        d->m_manager->setDirty(); // ### Probably a bit overkill!
-}
-
-bool QGLCustomShaderStage::setOnPainter(QPainter* p)
-{
-    Q_D(QGLCustomShaderStage);
-    if (p->paintEngine()->type() != QPaintEngine::OpenGL2) {
-        qWarning("QGLCustomShaderStage::setOnPainter() - paint engine not OpenGL2");
-        return false;
-    }
-    if (d->m_manager)
-        qWarning("Custom shader is already set on a painter");
-
-    QGL2PaintEngineEx *engine = static_cast<QGL2PaintEngineEx*>(p->paintEngine());
-    d->m_manager = QGL2PaintEngineExPrivate::shaderManagerForEngine(engine);
-    Q_ASSERT(d->m_manager);
-
-    d->m_manager->setCustomStage(this);
-    return true;
-}
-
-void QGLCustomShaderStage::removeFromPainter(QPainter* p)
-{
-    Q_D(QGLCustomShaderStage);
-    if (p->paintEngine()->type() != QPaintEngine::OpenGL2)
-        return;
-
-    QGL2PaintEngineEx *engine = static_cast<QGL2PaintEngineEx*>(p->paintEngine());
-    d->m_manager = QGL2PaintEngineExPrivate::shaderManagerForEngine(engine);
-    Q_ASSERT(d->m_manager);
-
-    // Just set the stage to null, don't call removeCustomStage().
-    // This should leave the program in a compiled/linked state
-    // if the next custom shader stage is this one again.
-    d->m_manager->setCustomStage(0);
-    d->m_manager = 0;
-}
-
-QByteArray QGLCustomShaderStage::source() const
-{
-    Q_D(const QGLCustomShaderStage);
-    return d->m_source;
-}
-
-// Called by the shader manager if another custom shader is attached or
-// the manager is deleted
-void QGLCustomShaderStage::setInactive()
-{
-    Q_D(QGLCustomShaderStage);
-    d->m_manager = 0;
-}
-
-void QGLCustomShaderStage::setSource(const QByteArray& s)
-{
-    Q_D(QGLCustomShaderStage);
-    d->m_source = s;
-}
-
-QT_END_NAMESPACE
diff --git a/src/opengl/gl2paintengineex/qglcustomshaderstage_p.h b/src/opengl/gl2paintengineex/qglcustomshaderstage_p.h
deleted file mode 100644
index 77421ebdd3..0000000000
--- a/src/opengl/gl2paintengineex/qglcustomshaderstage_p.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtOpenGL module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QGL_CUSTOM_SHADER_STAGE_H
-#define QGL_CUSTOM_SHADER_STAGE_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include <QGLShaderProgram>
-
-QT_BEGIN_NAMESPACE
-
-
-class QGLCustomShaderStagePrivate;
-class Q_OPENGL_EXPORT QGLCustomShaderStage
-{
-    Q_DECLARE_PRIVATE(QGLCustomShaderStage)
-public:
-    QGLCustomShaderStage();
-    virtual ~QGLCustomShaderStage();
-    virtual void setUniforms(QGLShaderProgram*) {}
-
-    void setUniformsDirty();
-
-    bool setOnPainter(QPainter*);
-    void removeFromPainter(QPainter*);
-    QByteArray source() const;
-
-    void setInactive();
-protected:
-    void setSource(const QByteArray&);
-
-private:
-    QGLCustomShaderStagePrivate* d_ptr;
-};
-
-
-QT_END_NAMESPACE
-
-
-#endif
diff --git a/src/opengl/gl2paintengineex/qglengineshadermanager.cpp b/src/opengl/gl2paintengineex/qglengineshadermanager.cpp
deleted file mode 100644
index 47e8531959..0000000000
--- a/src/opengl/gl2paintengineex/qglengineshadermanager.cpp
+++ /dev/null
@@ -1,875 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtOpenGL module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qglengineshadermanager_p.h"
-#include "qglengineshadersource_p.h"
-#include "qpaintengineex_opengl2_p.h"
-#include "qglshadercache_p.h"
-
-#include <QtGui/private/qopenglcontext_p.h>
-
-#if defined(QT_DEBUG)
-#include <QMetaEnum>
-#endif
-
-#include <algorithm>
-
-// #define QT_GL_SHARED_SHADER_DEBUG
-
-QT_BEGIN_NAMESPACE
-
-class QGLEngineSharedShadersResource : public QOpenGLSharedResource
-{
-public:
-    QGLEngineSharedShadersResource(QOpenGLContext *ctx)
-        : QOpenGLSharedResource(ctx->shareGroup())
-        , m_shaders(new QGLEngineSharedShaders(QGLContext::fromOpenGLContext(ctx)))
-    {
-    }
-
-    ~QGLEngineSharedShadersResource()
-    {
-        delete m_shaders;
-    }
-
-    void invalidateResource() override
-    {
-        delete m_shaders;
-        m_shaders = 0;
-    }
-
-    void freeResource(QOpenGLContext *) override
-    {
-    }
-
-    QGLEngineSharedShaders *shaders() const { return m_shaders; }
-
-private:
-    QGLEngineSharedShaders *m_shaders;
-};
-
-class QGLShaderStorage
-{
-public:
-    QGLEngineSharedShaders *shadersForThread(const QGLContext *context) {
-        QOpenGLMultiGroupSharedResource *&shaders = m_storage.localData();
-        if (!shaders)
-            shaders = new QOpenGLMultiGroupSharedResource;
-        QGLEngineSharedShadersResource *resource =
-            shaders->value<QGLEngineSharedShadersResource>(context->contextHandle());
-        return resource ? resource->shaders() : 0;
-    }
-
-private:
-    QThreadStorage<QOpenGLMultiGroupSharedResource *> m_storage;
-};
-
-Q_GLOBAL_STATIC(QGLShaderStorage, qt_shader_storage);
-
-QGLEngineSharedShaders *QGLEngineSharedShaders::shadersForContext(const QGLContext *context)
-{
-    return qt_shader_storage()->shadersForThread(context);
-}
-
-const char* QGLEngineSharedShaders::qShaderSnippets[] = {
-    0,0,0,0,0,0,0,0,0,0,
-    0,0,0,0,0,0,0,0,0,0,
-    0,0,0,0,0,0,0,0,0,0,
-    0,0,0,0,0
-};
-
-QGLEngineSharedShaders::QGLEngineSharedShaders(const QGLContext* context)
-    : blitShaderProg(0)
-    , simpleShaderProg(0)
-{
-
-/*
-    Rather than having the shader source array statically initialised, it is initialised
-    here instead. This is to allow new shader names to be inserted or existing names moved
-    around without having to change the order of the glsl strings. It is hoped this will
-    make future hard-to-find runtime bugs more obvious and generally give more solid code.
-*/
-    static bool snippetsPopulated = false;
-    if (!snippetsPopulated) {
-
-        const char** code = qShaderSnippets; // shortcut
-
-        code[MainVertexShader] = qglslMainVertexShader;
-        code[MainWithTexCoordsVertexShader] = qglslMainWithTexCoordsVertexShader;
-        code[MainWithTexCoordsAndOpacityVertexShader] = qglslMainWithTexCoordsAndOpacityVertexShader;
-
-        code[UntransformedPositionVertexShader] = qglslUntransformedPositionVertexShader;
-        code[PositionOnlyVertexShader] = qglslPositionOnlyVertexShader;
-        code[ComplexGeometryPositionOnlyVertexShader] = qglslComplexGeometryPositionOnlyVertexShader;
-        code[PositionWithPatternBrushVertexShader] = qglslPositionWithPatternBrushVertexShader;
-        code[PositionWithLinearGradientBrushVertexShader] = qglslPositionWithLinearGradientBrushVertexShader;
-        code[PositionWithConicalGradientBrushVertexShader] = qglslPositionWithConicalGradientBrushVertexShader;
-        code[PositionWithRadialGradientBrushVertexShader] = qglslPositionWithRadialGradientBrushVertexShader;
-        code[PositionWithTextureBrushVertexShader] = qglslPositionWithTextureBrushVertexShader;
-        code[AffinePositionWithPatternBrushVertexShader] = qglslAffinePositionWithPatternBrushVertexShader;
-        code[AffinePositionWithLinearGradientBrushVertexShader] = qglslAffinePositionWithLinearGradientBrushVertexShader;
-        code[AffinePositionWithConicalGradientBrushVertexShader] = qglslAffinePositionWithConicalGradientBrushVertexShader;
-        code[AffinePositionWithRadialGradientBrushVertexShader] = qglslAffinePositionWithRadialGradientBrushVertexShader;
-        code[AffinePositionWithTextureBrushVertexShader] = qglslAffinePositionWithTextureBrushVertexShader;
-
-        code[MainFragmentShader_CMO] = qglslMainFragmentShader_CMO;
-        code[MainFragmentShader_CM] = qglslMainFragmentShader_CM;
-        code[MainFragmentShader_MO] = qglslMainFragmentShader_MO;
-        code[MainFragmentShader_M] = qglslMainFragmentShader_M;
-        code[MainFragmentShader_CO] = qglslMainFragmentShader_CO;
-        code[MainFragmentShader_C] = qglslMainFragmentShader_C;
-        code[MainFragmentShader_O] = qglslMainFragmentShader_O;
-        code[MainFragmentShader] = qglslMainFragmentShader;
-        code[MainFragmentShader_ImageArrays] = qglslMainFragmentShader_ImageArrays;
-
-        code[ImageSrcFragmentShader] = qglslImageSrcFragmentShader;
-        code[ImageSrcWithPatternFragmentShader] = qglslImageSrcWithPatternFragmentShader;
-        code[NonPremultipliedImageSrcFragmentShader] = qglslNonPremultipliedImageSrcFragmentShader;
-        code[CustomImageSrcFragmentShader] = qglslCustomSrcFragmentShader; // Calls "customShader", which must be appended
-        code[SolidBrushSrcFragmentShader] = qglslSolidBrushSrcFragmentShader;
-        if (!context->contextHandle()->isOpenGLES())
-            code[TextureBrushSrcFragmentShader] = qglslTextureBrushSrcFragmentShader_desktop;
-        else
-            code[TextureBrushSrcFragmentShader] = qglslTextureBrushSrcFragmentShader_ES;
-        code[TextureBrushSrcWithPatternFragmentShader] = qglslTextureBrushSrcWithPatternFragmentShader;
-        code[PatternBrushSrcFragmentShader] = qglslPatternBrushSrcFragmentShader;
-        code[LinearGradientBrushSrcFragmentShader] = qglslLinearGradientBrushSrcFragmentShader;
-        code[RadialGradientBrushSrcFragmentShader] = qglslRadialGradientBrushSrcFragmentShader;
-        code[ConicalGradientBrushSrcFragmentShader] = qglslConicalGradientBrushSrcFragmentShader;
-        code[ShockingPinkSrcFragmentShader] = qglslShockingPinkSrcFragmentShader;
-
-        code[NoMaskFragmentShader] = "";
-        code[MaskFragmentShader] = qglslMaskFragmentShader;
-        code[RgbMaskFragmentShaderPass1] = qglslRgbMaskFragmentShaderPass1;
-        code[RgbMaskFragmentShaderPass2] = qglslRgbMaskFragmentShaderPass2;
-        code[RgbMaskWithGammaFragmentShader] = ""; //###
-
-        code[NoCompositionModeFragmentShader] = "";
-        code[MultiplyCompositionModeFragmentShader] = ""; //###
-        code[ScreenCompositionModeFragmentShader] = ""; //###
-        code[OverlayCompositionModeFragmentShader] = ""; //###
-        code[DarkenCompositionModeFragmentShader] = ""; //###
-        code[LightenCompositionModeFragmentShader] = ""; //###
-        code[ColorDodgeCompositionModeFragmentShader] = ""; //###
-        code[ColorBurnCompositionModeFragmentShader] = ""; //###
-        code[HardLightCompositionModeFragmentShader] = ""; //###
-        code[SoftLightCompositionModeFragmentShader] = ""; //###
-        code[DifferenceCompositionModeFragmentShader] = ""; //###
-        code[ExclusionCompositionModeFragmentShader] = ""; //###
-
-#if defined(QT_DEBUG)
-        // Check that all the elements have been filled:
-        for (int i = 0; i < TotalSnippetCount; ++i) {
-            if (Q_UNLIKELY(!qShaderSnippets[i])) {
-                qFatal("Shader snippet for %s (#%d) is missing!",
-                       snippetNameStr(SnippetName(i)).constData(), i);
-            }
-        }
-#endif
-        snippetsPopulated = true;
-    }
-
-    QGLShader* fragShader;
-    QGLShader* vertexShader;
-    QByteArray vertexSource;
-    QByteArray fragSource;
-
-    // Compile up the simple shader:
-    vertexSource.append(qShaderSnippets[MainVertexShader]);
-    vertexSource.append(qShaderSnippets[PositionOnlyVertexShader]);
-
-    fragSource.append(qShaderSnippets[MainFragmentShader]);
-    fragSource.append(qShaderSnippets[ShockingPinkSrcFragmentShader]);
-
-    simpleShaderProg = new QGLShaderProgram(context, 0);
-
-    CachedShader simpleShaderCache(fragSource, vertexSource);
-
-    bool inCache = simpleShaderCache.load(simpleShaderProg, context);
-
-    if (!inCache) {
-        vertexShader = new QGLShader(QGLShader::Vertex, context, 0);
-        shaders.append(vertexShader);
-        if (!vertexShader->compileSourceCode(vertexSource))
-            qWarning("Vertex shader for simpleShaderProg (MainVertexShader & PositionOnlyVertexShader) failed to compile");
-
-        fragShader = new QGLShader(QGLShader::Fragment, context, 0);
-        shaders.append(fragShader);
-        if (!fragShader->compileSourceCode(fragSource))
-            qWarning("Fragment shader for simpleShaderProg (MainFragmentShader & ShockingPinkSrcFragmentShader) failed to compile");
-
-        simpleShaderProg->addShader(vertexShader);
-        simpleShaderProg->addShader(fragShader);
-
-        simpleShaderProg->bindAttributeLocation("vertexCoordsArray", QT_VERTEX_COORDS_ATTR);
-        simpleShaderProg->bindAttributeLocation("pmvMatrix1", QT_PMV_MATRIX_1_ATTR);
-        simpleShaderProg->bindAttributeLocation("pmvMatrix2", QT_PMV_MATRIX_2_ATTR);
-        simpleShaderProg->bindAttributeLocation("pmvMatrix3", QT_PMV_MATRIX_3_ATTR);
-    }
-
-    simpleShaderProg->link();
-
-    if (Q_UNLIKELY(!simpleShaderProg->isLinked())) {
-        qCritical("Errors linking simple shader: %s", qPrintable(simpleShaderProg->log()));
-    } else {
-        if (!inCache)
-            simpleShaderCache.store(simpleShaderProg, context);
-    }
-
-    // Compile the blit shader:
-    vertexSource.clear();
-    vertexSource.append(qShaderSnippets[MainWithTexCoordsVertexShader]);
-    vertexSource.append(qShaderSnippets[UntransformedPositionVertexShader]);
-
-    fragSource.clear();
-    fragSource.append(qShaderSnippets[MainFragmentShader]);
-    fragSource.append(qShaderSnippets[ImageSrcFragmentShader]);
-
-    blitShaderProg = new QGLShaderProgram(context, 0);
-
-    CachedShader blitShaderCache(fragSource, vertexSource);
-
-    inCache = blitShaderCache.load(blitShaderProg, context);
-
-    if (!inCache) {
-        vertexShader = new QGLShader(QGLShader::Vertex, context, 0);
-        shaders.append(vertexShader);
-        if (!vertexShader->compileSourceCode(vertexSource))
-            qWarning("Vertex shader for blitShaderProg (MainWithTexCoordsVertexShader & UntransformedPositionVertexShader) failed to compile");
-
-        fragShader = new QGLShader(QGLShader::Fragment, context, 0);
-        shaders.append(fragShader);
-        if (!fragShader->compileSourceCode(fragSource))
-            qWarning("Fragment shader for blitShaderProg (MainFragmentShader & ImageSrcFragmentShader) failed to compile");
-
-        blitShaderProg->addShader(vertexShader);
-        blitShaderProg->addShader(fragShader);
-
-        blitShaderProg->bindAttributeLocation("textureCoordArray", QT_TEXTURE_COORDS_ATTR);
-        blitShaderProg->bindAttributeLocation("vertexCoordsArray", QT_VERTEX_COORDS_ATTR);
-    }
-
-    blitShaderProg->link();
-    if (Q_UNLIKELY(!blitShaderProg->isLinked())) {
-        qCritical("Errors linking blit shader: %s", qPrintable(blitShaderProg->log()));
-    } else {
-        if (!inCache)
-            blitShaderCache.store(blitShaderProg, context);
-    }
-
-#ifdef QT_GL_SHARED_SHADER_DEBUG
-    qDebug(" -> QGLEngineSharedShaders() %p for thread %p.", this, QThread::currentThread());
-#endif
-}
-
-QGLEngineSharedShaders::~QGLEngineSharedShaders()
-{
-#ifdef QT_GL_SHARED_SHADER_DEBUG
-    qDebug(" -> ~QGLEngineSharedShaders() %p for thread %p.", this, QThread::currentThread());
-#endif
-    qDeleteAll(shaders);
-    shaders.clear();
-
-    qDeleteAll(cachedPrograms);
-    cachedPrograms.clear();
-
-    if (blitShaderProg) {
-        delete blitShaderProg;
-        blitShaderProg = 0;
-    }
-
-    if (simpleShaderProg) {
-        delete simpleShaderProg;
-        simpleShaderProg = 0;
-    }
-}
-
-#if defined (QT_DEBUG)
-QByteArray QGLEngineSharedShaders::snippetNameStr(SnippetName name)
-{
-    QMetaEnum m = staticMetaObject.enumerator(staticMetaObject.indexOfEnumerator("SnippetName"));
-    return QByteArray(m.valueToKey(name));
-}
-#endif
-
-// The address returned here will only be valid until next time this function is called.
-// The program is return bound.
-QGLEngineShaderProg *QGLEngineSharedShaders::findProgramInCache(const QGLEngineShaderProg &prog)
-{
-    for (int i = 0; i < cachedPrograms.size(); ++i) {
-        QGLEngineShaderProg *cachedProg = cachedPrograms.at(i);
-        if (*cachedProg == prog) {
-            // Move the program to the top of the list as a poor-man's cache algo
-            cachedPrograms.move(i, 0);
-            cachedProg->program->bind();
-            return cachedProg;
-        }
-    }
-
-    QScopedPointer<QGLEngineShaderProg> newProg;
-
-    do {
-        QByteArray fragSource;
-        // Insert the custom stage before the srcPixel shader to work around an ATI driver bug
-        // where you cannot forward declare a function that takes a sampler as argument.
-        if (prog.srcPixelFragShader == CustomImageSrcFragmentShader)
-            fragSource.append(prog.customStageSource);
-        fragSource.append(qShaderSnippets[prog.mainFragShader]);
-        fragSource.append(qShaderSnippets[prog.srcPixelFragShader]);
-        if (prog.compositionFragShader)
-            fragSource.append(qShaderSnippets[prog.compositionFragShader]);
-        if (prog.maskFragShader)
-            fragSource.append(qShaderSnippets[prog.maskFragShader]);
-
-        QByteArray vertexSource;
-        vertexSource.append(qShaderSnippets[prog.mainVertexShader]);
-        vertexSource.append(qShaderSnippets[prog.positionVertexShader]);
-
-        QScopedPointer<QGLShaderProgram> shaderProgram(new QGLShaderProgram);
-
-        CachedShader shaderCache(fragSource, vertexSource);
-        bool inCache = shaderCache.load(shaderProgram.data(), QGLContext::currentContext());
-
-        if (!inCache) {
-
-            QScopedPointer<QGLShader> fragShader(new QGLShader(QGLShader::Fragment));
-            QByteArray description;
-#if defined(QT_DEBUG)
-            // Name the shader for easier debugging
-            description.append("Fragment shader: main=");
-            description.append(snippetNameStr(prog.mainFragShader));
-            description.append(", srcPixel=");
-            description.append(snippetNameStr(prog.srcPixelFragShader));
-            if (prog.compositionFragShader) {
-                description.append(", composition=");
-                description.append(snippetNameStr(prog.compositionFragShader));
-            }
-            if (prog.maskFragShader) {
-                description.append(", mask=");
-                description.append(snippetNameStr(prog.maskFragShader));
-            }
-            fragShader->setObjectName(QString::fromLatin1(description));
-#endif
-            if (!fragShader->compileSourceCode(fragSource)) {
-                qWarning() << "Warning:" << description << "failed to compile!";
-                break;
-            }
-
-            QScopedPointer<QGLShader> vertexShader(new QGLShader(QGLShader::Vertex));
-#if defined(QT_DEBUG)
-            // Name the shader for easier debugging
-            description.clear();
-            description.append("Vertex shader: main=");
-            description.append(snippetNameStr(prog.mainVertexShader));
-            description.append(", position=");
-            description.append(snippetNameStr(prog.positionVertexShader));
-            vertexShader->setObjectName(QString::fromLatin1(description));
-#endif
-            if (!vertexShader->compileSourceCode(vertexSource)) {
-                qWarning() << "Warning:" << description << "failed to compile!";
-                break;
-            }
-
-            shaders.append(vertexShader.data());
-            shaders.append(fragShader.data());
-            shaderProgram->addShader(vertexShader.take());
-            shaderProgram->addShader(fragShader.take());
-
-            // We have to bind the vertex attribute names before the program is linked:
-            shaderProgram->bindAttributeLocation("vertexCoordsArray", QT_VERTEX_COORDS_ATTR);
-            if (prog.useTextureCoords)
-                shaderProgram->bindAttributeLocation("textureCoordArray", QT_TEXTURE_COORDS_ATTR);
-            if (prog.useOpacityAttribute)
-                shaderProgram->bindAttributeLocation("opacityArray", QT_OPACITY_ATTR);
-            if (prog.usePmvMatrixAttribute) {
-                shaderProgram->bindAttributeLocation("pmvMatrix1", QT_PMV_MATRIX_1_ATTR);
-                shaderProgram->bindAttributeLocation("pmvMatrix2", QT_PMV_MATRIX_2_ATTR);
-                shaderProgram->bindAttributeLocation("pmvMatrix3", QT_PMV_MATRIX_3_ATTR);
-            }
-        }
-
-        newProg.reset(new QGLEngineShaderProg(prog));
-        newProg->program = shaderProgram.take();
-
-        newProg->program->link();
-        if (newProg->program->isLinked()) {
-            if (!inCache)
-                shaderCache.store(newProg->program, QGLContext::currentContext());
-        } else {
-            QString error;
-            error = QLatin1String("Shader program failed to link,");
-#if defined(QT_DEBUG)
-            QLatin1String br("\n");
-            error += QLatin1String("\n  Shaders Used:\n");
-            for (int i = 0; i < newProg->program->shaders().count(); ++i) {
-                QGLShader *shader = newProg->program->shaders().at(i);
-                error += QLatin1String("    ") + shader->objectName() + QLatin1String(": \n")
-                         + QLatin1String(shader->sourceCode()) + br;
-            }
-#endif
-            error += QLatin1String("  Error Log:\n")
-                     + QLatin1String("    ") + newProg->program->log();
-            qWarning() << error;
-            break;
-        }
-
-        newProg->program->bind();
-
-        if (newProg->maskFragShader != QGLEngineSharedShaders::NoMaskFragmentShader) {
-            GLuint location = newProg->program->uniformLocation("maskTexture");
-            newProg->program->setUniformValue(location, QT_MASK_TEXTURE_UNIT);
-        }
-
-        if (cachedPrograms.count() > 30) {
-            // The cache is full, so delete the last 5 programs in the list.
-            // These programs will be least used, as a program us bumped to
-            // the top of the list when it's used.
-            for (int i = 0; i < 5; ++i) {
-                delete cachedPrograms.last();
-                cachedPrograms.removeLast();
-            }
-        }
-
-        cachedPrograms.insert(0, newProg.data());
-    } while (false);
-
-    return newProg.take();
-}
-
-void QGLEngineSharedShaders::cleanupCustomStage(QGLCustomShaderStage* stage)
-{
-    auto hasStageAsCustomShaderSouce = [stage](QGLEngineShaderProg *cachedProg) -> bool {
-        if (cachedProg->customStageSource == stage->source()) {
-            delete cachedProg;
-            return true;
-        }
-        return false;
-    };
-    cachedPrograms.erase(std::remove_if(cachedPrograms.begin(), cachedPrograms.end(),
-                                        hasStageAsCustomShaderSouce),
-                         cachedPrograms.end());
-}
-
-
-QGLEngineShaderManager::QGLEngineShaderManager(QGLContext* context)
-    : ctx(context),
-      shaderProgNeedsChanging(true),
-      complexGeometry(false),
-      srcPixelType(Qt::NoBrush),
-      opacityMode(NoOpacity),
-      maskType(NoMask),
-      compositionMode(QPainter::CompositionMode_SourceOver),
-      customSrcStage(0),
-      currentShaderProg(0)
-{
-    sharedShaders = QGLEngineSharedShaders::shadersForContext(context);
-}
-
-QGLEngineShaderManager::~QGLEngineShaderManager()
-{
-    //###
-    removeCustomStage();
-}
-
-GLuint QGLEngineShaderManager::getUniformLocation(Uniform id)
-{
-    if (!currentShaderProg)
-        return 0;
-
-    QVector<uint> &uniformLocations = currentShaderProg->uniformLocations;
-    if (uniformLocations.isEmpty())
-        uniformLocations.fill(GLuint(-1), NumUniforms);
-
-    static const char *const uniformNames[] = {
-        "imageTexture",
-        "patternColor",
-        "globalOpacity",
-        "depth",
-        "maskTexture",
-        "fragmentColor",
-        "linearData",
-        "angle",
-        "halfViewportSize",
-        "fmp",
-        "fmp2_m_radius2",
-        "inverse_2_fmp2_m_radius2",
-        "sqrfr",
-        "bradius",
-        "invertedTextureSize",
-        "brushTransform",
-        "brushTexture",
-        "matrix",
-        "translateZ"
-    };
-
-    if (uniformLocations.at(id) == GLuint(-1))
-        uniformLocations[id] = currentShaderProg->program->uniformLocation(uniformNames[id]);
-
-    return uniformLocations.at(id);
-}
-
-
-void QGLEngineShaderManager::optimiseForBrushTransform(QTransform::TransformationType transformType)
-{
-    Q_UNUSED(transformType); // Currently ignored
-}
-
-void QGLEngineShaderManager::setDirty()
-{
-    shaderProgNeedsChanging = true;
-}
-
-void QGLEngineShaderManager::setSrcPixelType(Qt::BrushStyle style)
-{
-    Q_ASSERT(style != Qt::NoBrush);
-    if (srcPixelType == PixelSrcType(style))
-        return;
-
-    srcPixelType = style;
-    shaderProgNeedsChanging = true; //###
-}
-
-void QGLEngineShaderManager::setSrcPixelType(PixelSrcType type)
-{
-    if (srcPixelType == type)
-        return;
-
-    srcPixelType = type;
-    shaderProgNeedsChanging = true; //###
-}
-
-void QGLEngineShaderManager::setOpacityMode(OpacityMode mode)
-{
-    if (opacityMode == mode)
-        return;
-
-    opacityMode = mode;
-    shaderProgNeedsChanging = true; //###
-}
-
-void QGLEngineShaderManager::setMaskType(MaskType type)
-{
-    if (maskType == type)
-        return;
-
-    maskType = type;
-    shaderProgNeedsChanging = true; //###
-}
-
-void QGLEngineShaderManager::setCompositionMode(QPainter::CompositionMode mode)
-{
-    if (compositionMode == mode)
-        return;
-
-    compositionMode = mode;
-    shaderProgNeedsChanging = true; //###
-}
-
-void QGLEngineShaderManager::setCustomStage(QGLCustomShaderStage* stage)
-{
-    if (customSrcStage)
-        removeCustomStage();
-    customSrcStage = stage;
-    shaderProgNeedsChanging = true;
-}
-
-void QGLEngineShaderManager::removeCustomStage()
-{
-    if (customSrcStage)
-        customSrcStage->setInactive();
-    customSrcStage = 0;
-    shaderProgNeedsChanging = true;
-}
-
-QGLShaderProgram* QGLEngineShaderManager::currentProgram()
-{
-    if (currentShaderProg)
-        return currentShaderProg->program;
-    else
-        return sharedShaders->simpleProgram();
-}
-
-void QGLEngineShaderManager::useSimpleProgram()
-{
-    sharedShaders->simpleProgram()->bind();
-    QGLContextPrivate* ctx_d = ctx->d_func();
-    ctx_d->setVertexAttribArrayEnabled(QT_VERTEX_COORDS_ATTR, true);
-    ctx_d->setVertexAttribArrayEnabled(QT_TEXTURE_COORDS_ATTR, false);
-    ctx_d->setVertexAttribArrayEnabled(QT_OPACITY_ATTR, false);
-    shaderProgNeedsChanging = true;
-}
-
-void QGLEngineShaderManager::useBlitProgram()
-{
-    sharedShaders->blitProgram()->bind();
-    QGLContextPrivate* ctx_d = ctx->d_func();
-    ctx_d->setVertexAttribArrayEnabled(QT_VERTEX_COORDS_ATTR, true);
-    ctx_d->setVertexAttribArrayEnabled(QT_TEXTURE_COORDS_ATTR, true);
-    ctx_d->setVertexAttribArrayEnabled(QT_OPACITY_ATTR, false);
-    shaderProgNeedsChanging = true;
-}
-
-QGLShaderProgram* QGLEngineShaderManager::simpleProgram()
-{
-    return sharedShaders->simpleProgram();
-}
-
-QGLShaderProgram* QGLEngineShaderManager::blitProgram()
-{
-    return sharedShaders->blitProgram();
-}
-
-
-
-// Select & use the correct shader program using the current state.
-// Returns \c true if program needed changing.
-bool QGLEngineShaderManager::useCorrectShaderProg()
-{
-    if (!shaderProgNeedsChanging)
-        return false;
-
-    bool useCustomSrc = customSrcStage != 0;
-    if (useCustomSrc && srcPixelType != QGLEngineShaderManager::ImageSrc && srcPixelType != Qt::TexturePattern) {
-        useCustomSrc = false;
-        qWarning("QGLEngineShaderManager - Ignoring custom shader stage for non image src");
-    }
-
-    QGLEngineShaderProg requiredProgram;
-
-    bool texCoords = false;
-
-    // Choose vertex shader shader position function (which typically also sets
-    // varyings) and the source pixel (srcPixel) fragment shader function:
-    requiredProgram.positionVertexShader = QGLEngineSharedShaders::InvalidSnippetName;
-    requiredProgram.srcPixelFragShader = QGLEngineSharedShaders::InvalidSnippetName;
-    bool isAffine = brushTransform.isAffine();
-    if ( (srcPixelType >= Qt::Dense1Pattern) && (srcPixelType <= Qt::DiagCrossPattern) ) {
-        if (isAffine)
-            requiredProgram.positionVertexShader = QGLEngineSharedShaders::AffinePositionWithPatternBrushVertexShader;
-        else
-            requiredProgram.positionVertexShader = QGLEngineSharedShaders::PositionWithPatternBrushVertexShader;
-
-        requiredProgram.srcPixelFragShader = QGLEngineSharedShaders::PatternBrushSrcFragmentShader;
-    }
-    else switch (srcPixelType) {
-        default:
-        case Qt::NoBrush:
-            qFatal("QGLEngineShaderManager::useCorrectShaderProg() - Qt::NoBrush style is set");
-            break;
-        case QGLEngineShaderManager::ImageSrc:
-            requiredProgram.srcPixelFragShader = QGLEngineSharedShaders::ImageSrcFragmentShader;
-            requiredProgram.positionVertexShader = QGLEngineSharedShaders::PositionOnlyVertexShader;
-            texCoords = true;
-            break;
-        case QGLEngineShaderManager::NonPremultipliedImageSrc:
-            requiredProgram.srcPixelFragShader = QGLEngineSharedShaders::NonPremultipliedImageSrcFragmentShader;
-            requiredProgram.positionVertexShader = QGLEngineSharedShaders::PositionOnlyVertexShader;
-            texCoords = true;
-            break;
-        case QGLEngineShaderManager::PatternSrc:
-            requiredProgram.srcPixelFragShader = QGLEngineSharedShaders::ImageSrcWithPatternFragmentShader;
-            requiredProgram.positionVertexShader = QGLEngineSharedShaders::PositionOnlyVertexShader;
-            texCoords = true;
-            break;
-        case QGLEngineShaderManager::TextureSrcWithPattern:
-            requiredProgram.srcPixelFragShader = QGLEngineSharedShaders::TextureBrushSrcWithPatternFragmentShader;
-            requiredProgram.positionVertexShader = isAffine ? QGLEngineSharedShaders::AffinePositionWithTextureBrushVertexShader
-                                                : QGLEngineSharedShaders::PositionWithTextureBrushVertexShader;
-            break;
-        case Qt::SolidPattern:
-            requiredProgram.srcPixelFragShader = QGLEngineSharedShaders::SolidBrushSrcFragmentShader;
-            requiredProgram.positionVertexShader = QGLEngineSharedShaders::PositionOnlyVertexShader;
-            break;
-        case Qt::LinearGradientPattern:
-            requiredProgram.srcPixelFragShader = QGLEngineSharedShaders::LinearGradientBrushSrcFragmentShader;
-            requiredProgram.positionVertexShader = isAffine ? QGLEngineSharedShaders::AffinePositionWithLinearGradientBrushVertexShader
-                                                : QGLEngineSharedShaders::PositionWithLinearGradientBrushVertexShader;
-            break;
-        case Qt::ConicalGradientPattern:
-            requiredProgram.srcPixelFragShader = QGLEngineSharedShaders::ConicalGradientBrushSrcFragmentShader;
-            requiredProgram.positionVertexShader = isAffine ? QGLEngineSharedShaders::AffinePositionWithConicalGradientBrushVertexShader
-                                                : QGLEngineSharedShaders::PositionWithConicalGradientBrushVertexShader;
-            break;
-        case Qt::RadialGradientPattern:
-            requiredProgram.srcPixelFragShader = QGLEngineSharedShaders::RadialGradientBrushSrcFragmentShader;
-            requiredProgram.positionVertexShader = isAffine ? QGLEngineSharedShaders::AffinePositionWithRadialGradientBrushVertexShader
-                                                : QGLEngineSharedShaders::PositionWithRadialGradientBrushVertexShader;
-            break;
-        case Qt::TexturePattern:
-            requiredProgram.srcPixelFragShader = QGLEngineSharedShaders::TextureBrushSrcFragmentShader;
-            requiredProgram.positionVertexShader = isAffine ? QGLEngineSharedShaders::AffinePositionWithTextureBrushVertexShader
-                                                : QGLEngineSharedShaders::PositionWithTextureBrushVertexShader;
-            break;
-    };
-
-    if (useCustomSrc) {
-        requiredProgram.srcPixelFragShader = QGLEngineSharedShaders::CustomImageSrcFragmentShader;
-        requiredProgram.customStageSource = customSrcStage->source();
-    }
-
-    const bool hasCompose = compositionMode > QPainter::CompositionMode_Plus;
-    const bool hasMask = maskType != QGLEngineShaderManager::NoMask;
-
-    // Choose fragment shader main function:
-    if (opacityMode == AttributeOpacity) {
-        Q_ASSERT(!hasCompose && !hasMask);
-        requiredProgram.mainFragShader = QGLEngineSharedShaders::MainFragmentShader_ImageArrays;
-    } else {
-        bool useGlobalOpacity = (opacityMode == UniformOpacity);
-        if (hasCompose && hasMask && useGlobalOpacity)
-            requiredProgram.mainFragShader = QGLEngineSharedShaders::MainFragmentShader_CMO;
-        if (hasCompose && hasMask && !useGlobalOpacity)
-            requiredProgram.mainFragShader = QGLEngineSharedShaders::MainFragmentShader_CM;
-        if (!hasCompose && hasMask && useGlobalOpacity)
-            requiredProgram.mainFragShader = QGLEngineSharedShaders::MainFragmentShader_MO;
-        if (!hasCompose && hasMask && !useGlobalOpacity)
-            requiredProgram.mainFragShader = QGLEngineSharedShaders::MainFragmentShader_M;
-        if (hasCompose && !hasMask && useGlobalOpacity)
-            requiredProgram.mainFragShader = QGLEngineSharedShaders::MainFragmentShader_CO;
-        if (hasCompose && !hasMask && !useGlobalOpacity)
-            requiredProgram.mainFragShader = QGLEngineSharedShaders::MainFragmentShader_C;
-        if (!hasCompose && !hasMask && useGlobalOpacity)
-            requiredProgram.mainFragShader = QGLEngineSharedShaders::MainFragmentShader_O;
-        if (!hasCompose && !hasMask && !useGlobalOpacity)
-            requiredProgram.mainFragShader = QGLEngineSharedShaders::MainFragmentShader;
-    }
-
-    if (hasMask) {
-        if (maskType == PixelMask) {
-            requiredProgram.maskFragShader = QGLEngineSharedShaders::MaskFragmentShader;
-            texCoords = true;
-        } else if (maskType == SubPixelMaskPass1) {
-            requiredProgram.maskFragShader = QGLEngineSharedShaders::RgbMaskFragmentShaderPass1;
-            texCoords = true;
-        } else if (maskType == SubPixelMaskPass2) {
-            requiredProgram.maskFragShader = QGLEngineSharedShaders::RgbMaskFragmentShaderPass2;
-            texCoords = true;
-        } else if (maskType == SubPixelWithGammaMask) {
-            requiredProgram.maskFragShader = QGLEngineSharedShaders::RgbMaskWithGammaFragmentShader;
-            texCoords = true;
-        } else {
-            qCritical("QGLEngineShaderManager::useCorrectShaderProg() - Unknown mask type");
-        }
-    } else {
-        requiredProgram.maskFragShader = QGLEngineSharedShaders::NoMaskFragmentShader;
-    }
-
-    if (hasCompose) {
-        switch (compositionMode) {
-            case QPainter::CompositionMode_Multiply:
-                requiredProgram.compositionFragShader = QGLEngineSharedShaders::MultiplyCompositionModeFragmentShader;
-                break;
-            case QPainter::CompositionMode_Screen:
-                requiredProgram.compositionFragShader = QGLEngineSharedShaders::ScreenCompositionModeFragmentShader;
-                break;
-            case QPainter::CompositionMode_Overlay:
-                requiredProgram.compositionFragShader = QGLEngineSharedShaders::OverlayCompositionModeFragmentShader;
-                break;
-            case QPainter::CompositionMode_Darken:
-                requiredProgram.compositionFragShader = QGLEngineSharedShaders::DarkenCompositionModeFragmentShader;
-                break;
-            case QPainter::CompositionMode_Lighten:
-                requiredProgram.compositionFragShader = QGLEngineSharedShaders::LightenCompositionModeFragmentShader;
-                break;
-            case QPainter::CompositionMode_ColorDodge:
-                requiredProgram.compositionFragShader = QGLEngineSharedShaders::ColorDodgeCompositionModeFragmentShader;
-                break;
-            case QPainter::CompositionMode_ColorBurn:
-                requiredProgram.compositionFragShader = QGLEngineSharedShaders::ColorBurnCompositionModeFragmentShader;
-                break;
-            case QPainter::CompositionMode_HardLight:
-                requiredProgram.compositionFragShader = QGLEngineSharedShaders::HardLightCompositionModeFragmentShader;
-                break;
-            case QPainter::CompositionMode_SoftLight:
-                requiredProgram.compositionFragShader = QGLEngineSharedShaders::SoftLightCompositionModeFragmentShader;
-                break;
-            case QPainter::CompositionMode_Difference:
-                requiredProgram.compositionFragShader = QGLEngineSharedShaders::DifferenceCompositionModeFragmentShader;
-                break;
-            case QPainter::CompositionMode_Exclusion:
-                requiredProgram.compositionFragShader = QGLEngineSharedShaders::ExclusionCompositionModeFragmentShader;
-                break;
-            default:
-                qWarning("QGLEngineShaderManager::useCorrectShaderProg() - Unsupported composition mode");
-        }
-    } else {
-        requiredProgram.compositionFragShader = QGLEngineSharedShaders::NoCompositionModeFragmentShader;
-    }
-
-    // Choose vertex shader main function
-    if (opacityMode == AttributeOpacity) {
-        Q_ASSERT(texCoords);
-        requiredProgram.mainVertexShader = QGLEngineSharedShaders::MainWithTexCoordsAndOpacityVertexShader;
-    } else if (texCoords) {
-        requiredProgram.mainVertexShader = QGLEngineSharedShaders::MainWithTexCoordsVertexShader;
-    } else {
-        requiredProgram.mainVertexShader = QGLEngineSharedShaders::MainVertexShader;
-    }
-    requiredProgram.useTextureCoords = texCoords;
-    requiredProgram.useOpacityAttribute = (opacityMode == AttributeOpacity);
-    if (complexGeometry && srcPixelType == Qt::SolidPattern) {
-        requiredProgram.positionVertexShader = QGLEngineSharedShaders::ComplexGeometryPositionOnlyVertexShader;
-        requiredProgram.usePmvMatrixAttribute = false;
-    } else {
-        requiredProgram.usePmvMatrixAttribute = true;
-
-        // Force complexGeometry off, since we currently don't support that mode for
-        // non-solid brushes
-        complexGeometry = false;
-    }
-
-    // At this point, requiredProgram is fully populated so try to find the program in the cache
-    currentShaderProg = sharedShaders->findProgramInCache(requiredProgram);
-
-    if (currentShaderProg && useCustomSrc) {
-        customSrcStage->setUniforms(currentShaderProg->program);
-    }
-
-    // Make sure all the vertex attribute arrays the program uses are enabled (and the ones it
-    // doesn't use are disabled)
-    QGLContextPrivate* ctx_d = ctx->d_func();
-    ctx_d->setVertexAttribArrayEnabled(QT_VERTEX_COORDS_ATTR, true);
-    ctx_d->setVertexAttribArrayEnabled(QT_TEXTURE_COORDS_ATTR, currentShaderProg && currentShaderProg->useTextureCoords);
-    ctx_d->setVertexAttribArrayEnabled(QT_OPACITY_ATTR, currentShaderProg && currentShaderProg->useOpacityAttribute);
-
-    shaderProgNeedsChanging = false;
-    return true;
-}
-
-QT_END_NAMESPACE
diff --git a/src/opengl/gl2paintengineex/qglengineshadermanager_p.h b/src/opengl/gl2paintengineex/qglengineshadermanager_p.h
deleted file mode 100644
index d23b3ad550..0000000000
--- a/src/opengl/gl2paintengineex/qglengineshadermanager_p.h
+++ /dev/null
@@ -1,508 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtOpenGL module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-/*
-    VERTEX SHADERS
-    ==============
-
-    Vertex shaders are specified as multiple (partial) shaders. On desktop,
-    this works fine. On ES, QGLShader & QGLShaderProgram will make partial
-    shaders work by concatenating the source in each QGLShader and compiling
-    it as a single shader. This is abstracted nicely by QGLShaderProgram and
-    the GL2 engine doesn't need to worry about it.
-
-    Generally, there's two vertex shader objects. The position shaders are
-    the ones which set gl_Position. There's also two "main" vertex shaders,
-    one which just calls the position shader and another which also passes
-    through some texture coordinates from a vertex attribute array to a
-    varying. These texture coordinates are used for mask position in text
-    rendering and for the source coordinates in drawImage/drawPixmap. There's
-    also a "Simple" vertex shader for rendering a solid colour (used to render
-    into the stencil buffer where the actual colour value is discarded).
-
-    The position shaders for brushes look scary. This is because many of the
-    calculations which logically belong in the fragment shader have been moved
-    into the vertex shader to improve performance. This is why the position
-    calculation is in a separate shader. Not only does it calculate the
-    position, but it also calculates some data to be passed to the fragment
-    shader as a varying. It is optimal to move as much of the calculation as
-    possible into the vertex shader as this is executed less often.
-
-    The varyings passed to the fragment shaders are interpolated (which is
-    cheap). Unfortunately, GL will apply perspective correction to the
-    interpolation calusing errors. To get around this, the vertex shader must
-    apply perspective correction itself and set the w-value of gl_Position to
-    zero. That way, GL will be tricked into thinking it doesn't need to apply a
-    perspective correction and use linear interpolation instead (which is what
-    we want). Of course, if the brush transform is affeine, no perspective
-    correction is needed and a simpler vertex shader can be used instead.
-
-    So there are the following "main" vertex shaders:
-        qglslMainVertexShader
-        qglslMainWithTexCoordsVertexShader
-
-    And the following position vertex shaders:
-        qglslPositionOnlyVertexShader
-        qglslPositionWithTextureBrushVertexShader
-        qglslPositionWithPatternBrushVertexShader
-        qglslPositionWithLinearGradientBrushVertexShader
-        qglslPositionWithRadialGradientBrushVertexShader
-        qglslPositionWithConicalGradientBrushVertexShader
-        qglslAffinePositionWithTextureBrushVertexShader
-        qglslAffinePositionWithPatternBrushVertexShader
-        qglslAffinePositionWithLinearGradientBrushVertexShader
-        qglslAffinePositionWithRadialGradientBrushVertexShader
-        qglslAffinePositionWithConicalGradientBrushVertexShader
-
-    Leading to 23 possible vertex shaders
-
-
-    FRAGMENT SHADERS
-    ================
-
-    Fragment shaders are also specified as multiple (partial) shaders. The
-    different fragment shaders represent the different stages in Qt's fragment
-    pipeline. There are 1-3 stages in this pipeline: First stage is to get the
-    fragment's colour value. The next stage is to get the fragment's mask value
-    (coverage value for anti-aliasing) and the final stage is to blend the
-    incoming fragment with the background (for composition modes not supported
-    by GL).
-
-    Of these, the first stage will always be present. If Qt doesn't need to
-    apply anti-aliasing (because it's off or handled by multisampling) then
-    the coverage value doesn't need to be applied. (Note: There are two types
-    of mask, one for regular anti-aliasing and one for sub-pixel anti-
-    aliasing.) If the composition mode is one which GL supports natively then
-    the blending stage doesn't need to be applied.
-
-    As eash stage can have multiple implementations, they are abstracted as
-    GLSL function calls with the following signatures:
-
-    Brushes & image drawing are implementations of "qcolorp vec4 srcPixel()":
-        qglslImageSrcFragShader
-        qglslImageSrcWithPatternFragShader
-        qglslNonPremultipliedImageSrcFragShader
-        qglslSolidBrushSrcFragShader
-        qglslTextureBrushSrcFragShader
-        qglslTextureBrushWithPatternFragShader
-        qglslPatternBrushSrcFragShader
-        qglslLinearGradientBrushSrcFragShader
-        qglslRadialGradientBrushSrcFragShader
-        qglslConicalGradientBrushSrcFragShader
-    NOTE: It is assumed the colour returned by srcPixel() is pre-multiplied
-
-    Masks are implementations of "qcolorp vec4 applyMask(qcolorp vec4 src)":
-        qglslMaskFragmentShader
-        qglslRgbMaskFragmentShaderPass1
-        qglslRgbMaskFragmentShaderPass2
-        qglslRgbMaskWithGammaFragmentShader
-
-    Composition modes are "qcolorp vec4 compose(qcolorp vec4 src)":
-        qglslColorBurnCompositionModeFragmentShader
-        qglslColorDodgeCompositionModeFragmentShader
-        qglslDarkenCompositionModeFragmentShader
-        qglslDifferenceCompositionModeFragmentShader
-        qglslExclusionCompositionModeFragmentShader
-        qglslHardLightCompositionModeFragmentShader
-        qglslLightenCompositionModeFragmentShader
-        qglslMultiplyCompositionModeFragmentShader
-        qglslOverlayCompositionModeFragmentShader
-        qglslScreenCompositionModeFragmentShader
-        qglslSoftLightCompositionModeFragmentShader
-
-
-    Note: In the future, some GLSL compilers will support an extension allowing
-          a new 'color' precision specifier. To support this, qcolorp is used for
-          all color components so it can be defined to colorp or lowp depending upon
-          the implementation.
-
-    So there are differnt frament shader main functions, depending on the
-    number & type of pipelines the fragment needs to go through.
-
-    The choice of which main() fragment shader string to use depends on:
-        - Use of global opacity
-        - Brush style (some brushes apply opacity themselves)
-        - Use & type of mask (TODO: Need to support high quality anti-aliasing & text)
-        - Use of non-GL Composition mode
-
-    Leading to the following fragment shader main functions:
-        gl_FragColor = compose(applyMask(srcPixel()*globalOpacity));
-        gl_FragColor = compose(applyMask(srcPixel()));
-        gl_FragColor = applyMask(srcPixel()*globalOpacity);
-        gl_FragColor = applyMask(srcPixel());
-        gl_FragColor = compose(srcPixel()*globalOpacity);
-        gl_FragColor = compose(srcPixel());
-        gl_FragColor = srcPixel()*globalOpacity;
-        gl_FragColor = srcPixel();
-
-    Called:
-        qglslMainFragmentShader_CMO
-        qglslMainFragmentShader_CM
-        qglslMainFragmentShader_MO
-        qglslMainFragmentShader_M
-        qglslMainFragmentShader_CO
-        qglslMainFragmentShader_C
-        qglslMainFragmentShader_O
-        qglslMainFragmentShader
-
-    Where:
-        M = Mask
-        C = Composition
-        O = Global Opacity
-
-
-    CUSTOM SHADER CODE
-    ==================
-
-    The use of custom shader code is supported by the engine for drawImage and
-    drawPixmap calls. This is implemented via hooks in the fragment pipeline.
-
-    The custom shader is passed to the engine as a partial fragment shader
-    (QGLCustomShaderStage). The shader will implement a pre-defined method name
-    which Qt's fragment pipeline will call:
-
-        lowp vec4 customShader(lowp sampler2d imageTexture, highp vec2 textureCoords)
-
-    The provided src and srcCoords parameters can be used to sample from the
-    source image.
-
-    Transformations, clipping, opacity, and composition modes set using QPainter
-    will be respected when using the custom shader hook.
-*/
-
-#ifndef QGLENGINE_SHADER_MANAGER_H
-#define QGLENGINE_SHADER_MANAGER_H
-
-#include <QGLShader>
-#include <QGLShaderProgram>
-#include <QPainter>
-#include <private/qgl_p.h>
-#include <private/qglcustomshaderstage_p.h>
-
-QT_BEGIN_NAMESPACE
-
-
-
-/*
-struct QGLEngineCachedShaderProg
-{
-    QGLEngineCachedShaderProg(QGLEngineShaderManager::ShaderName vertexMain,
-                              QGLEngineShaderManager::ShaderName vertexPosition,
-                              QGLEngineShaderManager::ShaderName fragMain,
-                              QGLEngineShaderManager::ShaderName pixelSrc,
-                              QGLEngineShaderManager::ShaderName mask,
-                              QGLEngineShaderManager::ShaderName composition);
-
-    int cacheKey;
-    QGLShaderProgram* program;
-}
-*/
-
-static const GLuint QT_VERTEX_COORDS_ATTR  = 0;
-static const GLuint QT_TEXTURE_COORDS_ATTR = 1;
-static const GLuint QT_OPACITY_ATTR = 2;
-static const GLuint QT_PMV_MATRIX_1_ATTR = 3;
-static const GLuint QT_PMV_MATRIX_2_ATTR = 4;
-static const GLuint QT_PMV_MATRIX_3_ATTR = 5;
-
-class QGLEngineShaderProg;
-
-class Q_OPENGL_EXPORT QGLEngineSharedShaders
-{
-    Q_GADGET
-public:
-
-    enum SnippetName {
-        MainVertexShader,
-        MainWithTexCoordsVertexShader,
-        MainWithTexCoordsAndOpacityVertexShader,
-
-        // UntransformedPositionVertexShader must be first in the list:
-        UntransformedPositionVertexShader,
-        PositionOnlyVertexShader,
-        ComplexGeometryPositionOnlyVertexShader,
-        PositionWithPatternBrushVertexShader,
-        PositionWithLinearGradientBrushVertexShader,
-        PositionWithConicalGradientBrushVertexShader,
-        PositionWithRadialGradientBrushVertexShader,
-        PositionWithTextureBrushVertexShader,
-        AffinePositionWithPatternBrushVertexShader,
-        AffinePositionWithLinearGradientBrushVertexShader,
-        AffinePositionWithConicalGradientBrushVertexShader,
-        AffinePositionWithRadialGradientBrushVertexShader,
-        AffinePositionWithTextureBrushVertexShader,
-
-        // MainFragmentShader_CMO must be first in the list:
-        MainFragmentShader_CMO,
-        MainFragmentShader_CM,
-        MainFragmentShader_MO,
-        MainFragmentShader_M,
-        MainFragmentShader_CO,
-        MainFragmentShader_C,
-        MainFragmentShader_O,
-        MainFragmentShader,
-        MainFragmentShader_ImageArrays,
-
-        // ImageSrcFragmentShader must be first in the list::
-        ImageSrcFragmentShader,
-        ImageSrcWithPatternFragmentShader,
-        NonPremultipliedImageSrcFragmentShader,
-        CustomImageSrcFragmentShader,
-        SolidBrushSrcFragmentShader,
-        TextureBrushSrcFragmentShader,
-        TextureBrushSrcWithPatternFragmentShader,
-        PatternBrushSrcFragmentShader,
-        LinearGradientBrushSrcFragmentShader,
-        RadialGradientBrushSrcFragmentShader,
-        ConicalGradientBrushSrcFragmentShader,
-        ShockingPinkSrcFragmentShader,
-
-        // NoMaskFragmentShader must be first in the list:
-        NoMaskFragmentShader,
-        MaskFragmentShader,
-        RgbMaskFragmentShaderPass1,
-        RgbMaskFragmentShaderPass2,
-        RgbMaskWithGammaFragmentShader,
-
-        // NoCompositionModeFragmentShader must be first in the list:
-        NoCompositionModeFragmentShader,
-        MultiplyCompositionModeFragmentShader,
-        ScreenCompositionModeFragmentShader,
-        OverlayCompositionModeFragmentShader,
-        DarkenCompositionModeFragmentShader,
-        LightenCompositionModeFragmentShader,
-        ColorDodgeCompositionModeFragmentShader,
-        ColorBurnCompositionModeFragmentShader,
-        HardLightCompositionModeFragmentShader,
-        SoftLightCompositionModeFragmentShader,
-        DifferenceCompositionModeFragmentShader,
-        ExclusionCompositionModeFragmentShader,
-
-        TotalSnippetCount, InvalidSnippetName
-    };
-#if defined (QT_DEBUG)
-    Q_ENUMS(SnippetName)
-    static QByteArray snippetNameStr(SnippetName snippetName);
-#endif
-
-/*
-    // These allow the ShaderName enum to be used as a cache key
-    const int mainVertexOffset = 0;
-    const int positionVertexOffset = (1<<2) - PositionOnlyVertexShader;
-    const int mainFragOffset = (1<<6) - MainFragmentShader_CMO;
-    const int srcPixelOffset = (1<<10) - ImageSrcFragmentShader;
-    const int maskOffset = (1<<14) - NoMaskShader;
-    const int compositionOffset = (1 << 16) - MultiplyCompositionModeFragmentShader;
-*/
-
-    QGLEngineSharedShaders(const QGLContext *context);
-    ~QGLEngineSharedShaders();
-
-    QGLShaderProgram *simpleProgram() { return simpleShaderProg; }
-    QGLShaderProgram *blitProgram() { return blitShaderProg; }
-    // Compile the program if it's not already in the cache, return the item in the cache.
-    QGLEngineShaderProg *findProgramInCache(const QGLEngineShaderProg &prog);
-    // Compile the custom shader if it's not already in the cache, return the item in the cache.
-
-    static QGLEngineSharedShaders *shadersForContext(const QGLContext *context);
-
-    // Ideally, this would be static and cleanup all programs in all contexts which
-    // contain the custom code. Currently it is just a hint and we rely on deleted
-    // custom shaders being cleaned up by being kicked out of the cache when it's
-    // full.
-    void cleanupCustomStage(QGLCustomShaderStage* stage);
-
-private:
-    QGLShaderProgram *blitShaderProg;
-    QGLShaderProgram *simpleShaderProg;
-    QList<QGLEngineShaderProg*> cachedPrograms;
-    QList<QGLShader *> shaders;
-
-    static const char* qShaderSnippets[TotalSnippetCount];
-};
-
-
-class QGLEngineShaderProg
-{
-public:
-    QGLEngineShaderProg() : program(nullptr) {}
-
-    ~QGLEngineShaderProg() {
-        if (program)
-            delete program;
-    }
-
-    QGLEngineSharedShaders::SnippetName mainVertexShader;
-    QGLEngineSharedShaders::SnippetName positionVertexShader;
-    QGLEngineSharedShaders::SnippetName mainFragShader;
-    QGLEngineSharedShaders::SnippetName srcPixelFragShader;
-    QGLEngineSharedShaders::SnippetName maskFragShader;
-    QGLEngineSharedShaders::SnippetName compositionFragShader;
-
-    QByteArray          customStageSource; //TODO: Decent cache key for custom stages
-    QGLShaderProgram*   program;
-
-    QVector<uint> uniformLocations;
-
-    bool                useTextureCoords;
-    bool                useOpacityAttribute;
-    bool                usePmvMatrixAttribute;
-
-    bool operator==(const QGLEngineShaderProg& other) const {
-        // We don't care about the program
-        return ( mainVertexShader      == other.mainVertexShader &&
-                 positionVertexShader  == other.positionVertexShader &&
-                 mainFragShader        == other.mainFragShader &&
-                 srcPixelFragShader    == other.srcPixelFragShader &&
-                 maskFragShader        == other.maskFragShader &&
-                 compositionFragShader == other.compositionFragShader &&
-                 customStageSource     == other.customStageSource
-               );
-    }
-};
-
-class Q_OPENGL_EXPORT QGLEngineShaderManager : public QObject
-{
-    Q_OBJECT
-public:
-    QGLEngineShaderManager(QGLContext* context);
-    ~QGLEngineShaderManager();
-
-    enum MaskType {NoMask, PixelMask, SubPixelMaskPass1, SubPixelMaskPass2, SubPixelWithGammaMask};
-    enum PixelSrcType {
-        ImageSrc = Qt::TexturePattern+1,
-        NonPremultipliedImageSrc = Qt::TexturePattern+2,
-        PatternSrc = Qt::TexturePattern+3,
-        TextureSrcWithPattern = Qt::TexturePattern+4
-    };
-
-    enum Uniform {
-        ImageTexture,
-        PatternColor,
-        GlobalOpacity,
-        Depth,
-        MaskTexture,
-        FragmentColor,
-        LinearData,
-        Angle,
-        HalfViewportSize,
-        Fmp,
-        Fmp2MRadius2,
-        Inverse2Fmp2MRadius2,
-        SqrFr,
-        BRadius,
-        InvertedTextureSize,
-        BrushTransform,
-        BrushTexture,
-        Matrix,
-        TranslateZ,
-        NumUniforms
-    };
-
-    enum OpacityMode {
-        NoOpacity,
-        UniformOpacity,
-        AttributeOpacity
-    };
-
-    // There are optimizations we can do, depending on the brush transform:
-    //    1) May not have to apply perspective-correction
-    //    2) Can use lower precision for matrix
-    void optimiseForBrushTransform(QTransform::TransformationType transformType);
-    void setSrcPixelType(Qt::BrushStyle);
-    void setSrcPixelType(PixelSrcType); // For non-brush sources, like pixmaps & images
-    void setOpacityMode(OpacityMode);
-    void setMaskType(MaskType);
-    void setCompositionMode(QPainter::CompositionMode);
-    void setCustomStage(QGLCustomShaderStage* stage);
-    void removeCustomStage();
-
-    GLuint getUniformLocation(Uniform id);
-
-    void setDirty(); // someone has manually changed the current shader program
-    bool useCorrectShaderProg(); // returns true if the shader program needed to be changed
-
-    void useSimpleProgram();
-    void useBlitProgram();
-    void setHasComplexGeometry(bool hasComplexGeometry)
-    {
-        complexGeometry = hasComplexGeometry;
-        shaderProgNeedsChanging = true;
-    }
-    bool hasComplexGeometry() const
-    {
-        return complexGeometry;
-    }
-
-    QGLShaderProgram* currentProgram(); // Returns pointer to the shader the manager has chosen
-    QGLShaderProgram* simpleProgram(); // Used to draw into e.g. stencil buffers
-    QGLShaderProgram* blitProgram(); // Used to blit a texture into the framebuffer
-
-    QGLEngineSharedShaders* sharedShaders;
-
-private:
-    QGLContext*     ctx;
-    bool            shaderProgNeedsChanging;
-    bool            complexGeometry;
-
-    // Current state variables which influence the choice of shader:
-    QTransform                  brushTransform;
-    int                         srcPixelType;
-    OpacityMode                 opacityMode;
-    MaskType                    maskType;
-    QPainter::CompositionMode   compositionMode;
-    QGLCustomShaderStage*       customSrcStage;
-
-    QGLEngineShaderProg*    currentShaderProg;
-};
-
-QT_END_NAMESPACE
-
-#endif //QGLENGINE_SHADER_MANAGER_H
diff --git a/src/opengl/gl2paintengineex/qglengineshadersource_p.h b/src/opengl/gl2paintengineex/qglengineshadersource_p.h
deleted file mode 100644
index a667af9b96..0000000000
--- a/src/opengl/gl2paintengineex/qglengineshadersource_p.h
+++ /dev/null
@@ -1,523 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtOpenGL module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-
-#ifndef QGL_ENGINE_SHADER_SOURCE_H
-#define QGL_ENGINE_SHADER_SOURCE_H
-
-#include "qglengineshadermanager_p.h"
-
-QT_BEGIN_NAMESPACE
-
-
-
-static const char* const qglslMainVertexShader = "\n\
-    void setPosition(); \n\
-    void main(void) \n\
-    { \n\
-        setPosition(); \n\
-    }\n";
-
-static const char* const qglslMainWithTexCoordsVertexShader = "\n\
-    attribute highp   vec2      textureCoordArray; \n\
-    varying   highp   vec2      textureCoords; \n\
-    void setPosition(); \n\
-    void main(void) \n\
-    { \n\
-        setPosition(); \n\
-        textureCoords = textureCoordArray; \n\
-    }\n";
-
-static const char* const qglslMainWithTexCoordsAndOpacityVertexShader = "\n\
-    attribute highp   vec2      textureCoordArray; \n\
-    attribute lowp    float     opacityArray; \n\
-    varying   highp   vec2      textureCoords; \n\
-    varying   lowp    float     opacity; \n\
-    void setPosition(); \n\
-    void main(void) \n\
-    { \n\
-        setPosition(); \n\
-        textureCoords = textureCoordArray; \n\
-        opacity = opacityArray; \n\
-    }\n";
-
-// NOTE: We let GL do the perspective correction so texture lookups in the fragment
-//       shader are also perspective corrected.
-static const char* const qglslPositionOnlyVertexShader = "\n\
-    attribute highp   vec2      vertexCoordsArray; \n\
-    attribute highp   vec3      pmvMatrix1; \n\
-    attribute highp   vec3      pmvMatrix2; \n\
-    attribute highp   vec3      pmvMatrix3; \n\
-    void setPosition(void) \n\
-    { \n\
-        highp mat3 pmvMatrix = mat3(pmvMatrix1, pmvMatrix2, pmvMatrix3); \n\
-        vec3 transformedPos = pmvMatrix * vec3(vertexCoordsArray.xy, 1.0); \n\
-        gl_Position = vec4(transformedPos.xy, 0.0, transformedPos.z); \n\
-    }\n";
-
-static const char* const qglslComplexGeometryPositionOnlyVertexShader = "\n\
-    uniform highp mat3 matrix; \n\
-    uniform highp float translateZ; \n\
-    attribute highp vec2 vertexCoordsArray; \n\
-    void setPosition(void) \n\
-    { \n\
-      vec3 v = matrix * vec3(vertexCoordsArray, 1.0); \n\
-      vec4 vz = mat4(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, translateZ, 1) * vec4(v, 1.0); \n\
-      gl_Position = vec4(vz.xyz, 1.0);\n\
-    } \n";
-
-static const char* const qglslUntransformedPositionVertexShader = "\n\
-    attribute highp   vec4      vertexCoordsArray; \n\
-    void setPosition(void) \n\
-    { \n\
-        gl_Position = vertexCoordsArray; \n\
-    }\n";
-
-// Pattern Brush - This assumes the texture size is 8x8 and thus, the inverted size is 0.125
-static const char* const qglslPositionWithPatternBrushVertexShader = "\n\
-    attribute highp   vec2      vertexCoordsArray; \n\
-    attribute highp   vec3      pmvMatrix1; \n\
-    attribute highp   vec3      pmvMatrix2; \n\
-    attribute highp   vec3      pmvMatrix3; \n\
-    uniform   mediump vec2      halfViewportSize; \n\
-    uniform   highp   vec2      invertedTextureSize; \n\
-    uniform   highp   mat3      brushTransform; \n\
-    varying   highp   vec2      patternTexCoords; \n\
-    void setPosition(void) \n\
-    { \n\
-        highp mat3 pmvMatrix = mat3(pmvMatrix1, pmvMatrix2, pmvMatrix3); \n\
-        vec3 transformedPos = pmvMatrix * vec3(vertexCoordsArray.xy, 1.0); \n\
-        gl_Position.xy = transformedPos.xy / transformedPos.z; \n\
-        mediump vec2 viewportCoords = (gl_Position.xy + 1.0) * halfViewportSize; \n\
-        mediump vec3 hTexCoords = brushTransform * vec3(viewportCoords, 1.0); \n\
-        mediump float invertedHTexCoordsZ = 1.0 / hTexCoords.z; \n\
-        gl_Position = vec4(gl_Position.xy * invertedHTexCoordsZ, 0.0, invertedHTexCoordsZ); \n\
-        patternTexCoords.xy = (hTexCoords.xy * 0.125) * invertedHTexCoordsZ; \n\
-    }\n";
-
-static const char* const qglslAffinePositionWithPatternBrushVertexShader
-                 = qglslPositionWithPatternBrushVertexShader;
-
-static const char* const qglslPatternBrushSrcFragmentShader = "\n\
-    uniform           sampler2D brushTexture; \n\
-    uniform   lowp    vec4      patternColor; \n\
-    varying   highp   vec2      patternTexCoords;\n\
-    lowp vec4 srcPixel() \n\
-    { \n\
-        return patternColor * (1.0 - texture2D(brushTexture, patternTexCoords).r); \n\
-    }\n";
-
-
-// Linear Gradient Brush
-static const char* const qglslPositionWithLinearGradientBrushVertexShader = "\n\
-    attribute highp   vec2      vertexCoordsArray; \n\
-    attribute highp   vec3      pmvMatrix1; \n\
-    attribute highp   vec3      pmvMatrix2; \n\
-    attribute highp   vec3      pmvMatrix3; \n\
-    uniform   mediump vec2      halfViewportSize; \n\
-    uniform   highp   vec3      linearData; \n\
-    uniform   highp   mat3      brushTransform; \n\
-    varying   mediump float     index; \n\
-    void setPosition() \n\
-    { \n\
-        highp mat3 pmvMatrix = mat3(pmvMatrix1, pmvMatrix2, pmvMatrix3); \n\
-        vec3 transformedPos = pmvMatrix * vec3(vertexCoordsArray.xy, 1.0); \n\
-        gl_Position.xy = transformedPos.xy / transformedPos.z; \n\
-        mediump vec2 viewportCoords = (gl_Position.xy + 1.0) * halfViewportSize; \n\
-        mediump vec3 hTexCoords = brushTransform * vec3(viewportCoords, 1); \n\
-        mediump float invertedHTexCoordsZ = 1.0 / hTexCoords.z; \n\
-        gl_Position = vec4(gl_Position.xy * invertedHTexCoordsZ, 0.0, invertedHTexCoordsZ); \n\
-        index = (dot(linearData.xy, hTexCoords.xy) * linearData.z) * invertedHTexCoordsZ; \n\
-    }\n";
-
-static const char* const qglslAffinePositionWithLinearGradientBrushVertexShader
-                 = qglslPositionWithLinearGradientBrushVertexShader;
-
-static const char* const qglslLinearGradientBrushSrcFragmentShader = "\n\
-    uniform           sampler2D brushTexture; \n\
-    varying   mediump float     index; \n\
-    lowp vec4 srcPixel() \n\
-    { \n\
-        mediump vec2 val = vec2(index, 0.5); \n\
-        return texture2D(brushTexture, val); \n\
-    }\n";
-
-
-// Conical Gradient Brush
-static const char* const qglslPositionWithConicalGradientBrushVertexShader = "\n\
-    attribute highp   vec2      vertexCoordsArray; \n\
-    attribute highp   vec3      pmvMatrix1; \n\
-    attribute highp   vec3      pmvMatrix2; \n\
-    attribute highp   vec3      pmvMatrix3; \n\
-    uniform   mediump vec2      halfViewportSize; \n\
-    uniform   highp   mat3      brushTransform; \n\
-    varying   highp   vec2      A; \n\
-    void setPosition(void) \n\
-    { \n\
-        highp mat3 pmvMatrix = mat3(pmvMatrix1, pmvMatrix2, pmvMatrix3); \n\
-        vec3 transformedPos = pmvMatrix * vec3(vertexCoordsArray.xy, 1.0); \n\
-        gl_Position.xy = transformedPos.xy / transformedPos.z; \n\
-        mediump vec2  viewportCoords = (gl_Position.xy + 1.0) * halfViewportSize; \n\
-        mediump vec3 hTexCoords = brushTransform * vec3(viewportCoords, 1); \n\
-        mediump float invertedHTexCoordsZ = 1.0 / hTexCoords.z; \n\
-        gl_Position = vec4(gl_Position.xy * invertedHTexCoordsZ, 0.0, invertedHTexCoordsZ); \n\
-        A = hTexCoords.xy * invertedHTexCoordsZ; \n\
-    }\n";
-
-static const char* const qglslAffinePositionWithConicalGradientBrushVertexShader
-                 = qglslPositionWithConicalGradientBrushVertexShader;
-
-static const char* const qglslConicalGradientBrushSrcFragmentShader = "\n\
-    #define INVERSE_2PI 0.1591549430918953358 \n\
-    uniform           sampler2D brushTexture; \n\
-    uniform   mediump float     angle; \n\
-    varying   highp   vec2      A; \n\
-    lowp vec4 srcPixel() \n\
-    { \n\
-        highp float t; \n\
-        if (abs(A.y) == abs(A.x)) \n\
-            t = (atan(-A.y + 0.002, A.x) + angle) * INVERSE_2PI; \n\
-        else \n\
-            t = (atan(-A.y, A.x) + angle) * INVERSE_2PI; \n\
-        return texture2D(brushTexture, vec2(t - floor(t), 0.5)); \n\
-    }\n";
-
-
-// Radial Gradient Brush
-static const char* const qglslPositionWithRadialGradientBrushVertexShader = "\n\
-    attribute highp   vec2      vertexCoordsArray;\n\
-    attribute highp   vec3      pmvMatrix1; \n\
-    attribute highp   vec3      pmvMatrix2; \n\
-    attribute highp   vec3      pmvMatrix3; \n\
-    uniform   mediump vec2      halfViewportSize; \n\
-    uniform   highp   mat3      brushTransform; \n\
-    uniform   highp   vec2      fmp; \n\
-    uniform   mediump vec3      bradius; \n\
-    varying   highp   float     b; \n\
-    varying   highp   vec2      A; \n\
-    void setPosition(void) \n\
-    {\n\
-        highp mat3 pmvMatrix = mat3(pmvMatrix1, pmvMatrix2, pmvMatrix3); \n\
-        vec3 transformedPos = pmvMatrix * vec3(vertexCoordsArray.xy, 1.0); \n\
-        gl_Position.xy = transformedPos.xy / transformedPos.z; \n\
-        mediump vec2 viewportCoords = (gl_Position.xy + 1.0) * halfViewportSize; \n\
-        mediump vec3 hTexCoords = brushTransform * vec3(viewportCoords, 1); \n\
-        mediump float invertedHTexCoordsZ = 1.0 / hTexCoords.z; \n\
-        gl_Position = vec4(gl_Position.xy * invertedHTexCoordsZ, 0.0, invertedHTexCoordsZ); \n\
-        A = hTexCoords.xy * invertedHTexCoordsZ; \n\
-        b = bradius.x + 2.0 * dot(A, fmp); \n\
-    }\n";
-
-static const char* const qglslAffinePositionWithRadialGradientBrushVertexShader
-                 = qglslPositionWithRadialGradientBrushVertexShader;
-
-static const char* const qglslRadialGradientBrushSrcFragmentShader = "\n\
-    uniform           sampler2D brushTexture; \n\
-    uniform   highp   float     fmp2_m_radius2; \n\
-    uniform   highp   float     inverse_2_fmp2_m_radius2; \n\
-    uniform   highp   float     sqrfr; \n\
-    varying   highp   float     b; \n\
-    varying   highp   vec2      A; \n\
-    uniform   mediump vec3      bradius; \n\
-    lowp vec4 srcPixel() \n\
-    { \n\
-        highp float c = sqrfr-dot(A, A); \n\
-        highp float det = b*b - 4.0*fmp2_m_radius2*c; \n\
-        lowp vec4 result = vec4(0.0); \n\
-        if (det >= 0.0) { \n\
-            highp float detSqrt = sqrt(det); \n\
-            highp float w = max((-b - detSqrt) * inverse_2_fmp2_m_radius2, (-b + detSqrt) * inverse_2_fmp2_m_radius2); \n\
-            if (bradius.y + w * bradius.z >= 0.0) \n\
-                result = texture2D(brushTexture, vec2(w, 0.5)); \n\
-        } \n\
-        return result; \n\
-    }\n";
-
-
-// Texture Brush
-static const char* const qglslPositionWithTextureBrushVertexShader = "\n\
-    attribute highp   vec2      vertexCoordsArray; \n\
-    attribute highp   vec3      pmvMatrix1; \n\
-    attribute highp   vec3      pmvMatrix2; \n\
-    attribute highp   vec3      pmvMatrix3; \n\
-    uniform   mediump vec2      halfViewportSize; \n\
-    uniform   highp   vec2      invertedTextureSize; \n\
-    uniform   highp   mat3      brushTransform; \n\
-    varying   highp   vec2      brushTextureCoords; \n\
-    void setPosition(void) \n\
-    { \n\
-        highp mat3 pmvMatrix = mat3(pmvMatrix1, pmvMatrix2, pmvMatrix3); \n\
-        vec3 transformedPos = pmvMatrix * vec3(vertexCoordsArray.xy, 1.0); \n\
-        gl_Position.xy = transformedPos.xy / transformedPos.z; \n\
-        mediump vec2 viewportCoords = (gl_Position.xy + 1.0) * halfViewportSize; \n\
-        mediump vec3 hTexCoords = brushTransform * vec3(viewportCoords, 1); \n\
-        mediump float invertedHTexCoordsZ = 1.0 / hTexCoords.z; \n\
-        gl_Position = vec4(gl_Position.xy * invertedHTexCoordsZ, 0.0, invertedHTexCoordsZ); \n\
-        brushTextureCoords.xy = (hTexCoords.xy * invertedTextureSize) * gl_Position.w; \n\
-    }\n";
-
-static const char* const qglslAffinePositionWithTextureBrushVertexShader
-                 = qglslPositionWithTextureBrushVertexShader;
-
-// OpenGL ES does not support GL_REPEAT wrap modes for NPOT textures. So instead,
-// we emulate GL_REPEAT by only taking the fractional part of the texture coords.
-// TODO: Special case POT textures which don't need this emulation
-static const char* const qglslTextureBrushSrcFragmentShader_ES = "\n\
-    varying highp   vec2      brushTextureCoords; \n\
-    uniform         sampler2D brushTexture; \n\
-    lowp vec4 srcPixel() { \n\
-        return texture2D(brushTexture, fract(brushTextureCoords)); \n\
-    }\n";
-
-static const char* const qglslTextureBrushSrcFragmentShader_desktop = "\n\
-    varying   highp   vec2      brushTextureCoords; \n\
-    uniform           sampler2D brushTexture; \n\
-    lowp vec4 srcPixel() \n\
-    { \n\
-        return texture2D(brushTexture, brushTextureCoords); \n\
-    }\n";
-
-static const char* const qglslTextureBrushSrcWithPatternFragmentShader = "\n\
-    varying   highp   vec2      brushTextureCoords; \n\
-    uniform   lowp    vec4      patternColor; \n\
-    uniform           sampler2D brushTexture; \n\
-    lowp vec4 srcPixel() \n\
-    { \n\
-        return patternColor * (1.0 - texture2D(brushTexture, brushTextureCoords).r); \n\
-    }\n";
-
-// Solid Fill Brush
-static const char* const qglslSolidBrushSrcFragmentShader = "\n\
-    uniform   lowp    vec4      fragmentColor; \n\
-    lowp vec4 srcPixel() \n\
-    { \n\
-        return fragmentColor; \n\
-    }\n";
-
-static const char* const qglslImageSrcFragmentShader = "\n\
-    varying   highp   vec2      textureCoords; \n\
-    uniform           sampler2D imageTexture; \n\
-    lowp vec4 srcPixel() \n\
-    { \n"
-        "return texture2D(imageTexture, textureCoords); \n"
-    "}\n";
-
-static const char* const qglslCustomSrcFragmentShader = "\n\
-    varying   highp   vec2      textureCoords; \n\
-    uniform           sampler2D imageTexture; \n\
-    lowp vec4 srcPixel() \n\
-    { \n\
-        return customShader(imageTexture, textureCoords); \n\
-    }\n";
-
-static const char* const qglslImageSrcWithPatternFragmentShader = "\n\
-    varying   highp   vec2      textureCoords; \n\
-    uniform   lowp    vec4      patternColor; \n\
-    uniform           sampler2D imageTexture; \n\
-    lowp vec4 srcPixel() \n\
-    { \n\
-        return patternColor * (1.0 - texture2D(imageTexture, textureCoords).r); \n\
-    }\n";
-
-static const char* const qglslNonPremultipliedImageSrcFragmentShader = "\n\
-    varying   highp   vec2      textureCoords; \n\
-    uniform          sampler2D imageTexture; \n\
-    lowp vec4 srcPixel() \n\
-    { \n\
-        lowp vec4 sample = texture2D(imageTexture, textureCoords); \n\
-        sample.rgb = sample.rgb * sample.a; \n\
-        return sample; \n\
-    }\n";
-
-static const char* const qglslShockingPinkSrcFragmentShader = "\n\
-    lowp vec4 srcPixel() \n\
-    { \n\
-        return vec4(0.98, 0.06, 0.75, 1.0); \n\
-    }\n";
-
-static const char* const qglslMainFragmentShader_ImageArrays = "\n\
-    varying   lowp    float     opacity; \n\
-    lowp vec4 srcPixel(); \n\
-    void main() \n\
-    { \n\
-        gl_FragColor = srcPixel() * opacity; \n\
-    }\n";
-
-static const char* const qglslMainFragmentShader_CMO = "\n\
-    uniform   lowp    float     globalOpacity; \n\
-    lowp vec4 srcPixel(); \n\
-    lowp vec4 applyMask(lowp vec4); \n\
-    lowp vec4 compose(lowp vec4); \n\
-    void main() \n\
-    { \n\
-        gl_FragColor = applyMask(compose(srcPixel()*globalOpacity))); \n\
-    }\n";
-
-static const char* const qglslMainFragmentShader_CM = "\n\
-    lowp vec4 srcPixel(); \n\
-    lowp vec4 applyMask(lowp vec4); \n\
-    lowp vec4 compose(lowp vec4); \n\
-    void main() \n\
-    { \n\
-        gl_FragColor = applyMask(compose(srcPixel())); \n\
-    }\n";
-
-static const char* const qglslMainFragmentShader_MO = "\n\
-    uniform   lowp    float     globalOpacity; \n\
-    lowp vec4 srcPixel(); \n\
-    lowp vec4 applyMask(lowp vec4); \n\
-    void main() \n\
-    { \n\
-        gl_FragColor = applyMask(srcPixel()*globalOpacity); \n\
-    }\n";
-
-static const char* const qglslMainFragmentShader_M = "\n\
-    lowp vec4 srcPixel(); \n\
-    lowp vec4 applyMask(lowp vec4); \n\
-    void main() \n\
-    { \n\
-        gl_FragColor = applyMask(srcPixel()); \n\
-    }\n";
-
-static const char* const qglslMainFragmentShader_CO = "\n\
-    uniform   lowp    float     globalOpacity; \n\
-    lowp vec4 srcPixel(); \n\
-    lowp vec4 compose(lowp vec4); \n\
-    void main() \n\
-    { \n\
-        gl_FragColor = compose(srcPixel()*globalOpacity); \n\
-    }\n";
-
-static const char* const qglslMainFragmentShader_C = "\n\
-    lowp vec4 srcPixel(); \n\
-    lowp vec4 compose(lowp vec4); \n\
-    void main() \n\
-    { \n\
-        gl_FragColor = compose(srcPixel()); \n\
-    }\n";
-
-static const char* const qglslMainFragmentShader_O = "\n\
-    uniform   lowp    float     globalOpacity; \n\
-    lowp vec4 srcPixel(); \n\
-    void main() \n\
-    { \n\
-        gl_FragColor = srcPixel()*globalOpacity; \n\
-    }\n";
-
-static const char* const qglslMainFragmentShader = "\n\
-    lowp vec4 srcPixel(); \n\
-    void main() \n\
-    { \n\
-        gl_FragColor = srcPixel(); \n\
-    }\n";
-
-static const char* const qglslMaskFragmentShader = "\n\
-    varying   highp   vec2      textureCoords;\n\
-    uniform           sampler2D maskTexture;\n\
-    lowp vec4 applyMask(lowp vec4 src) \n\
-    {\n\
-        lowp vec4 mask = texture2D(maskTexture, textureCoords); \n\
-        return src * mask.a; \n\
-    }\n";
-
-// For source over with subpixel antialiasing, the final color is calculated per component as follows
-// (.a is alpha component, .c is red, green or blue component):
-// alpha = src.a * mask.c * opacity
-// dest.c = dest.c * (1 - alpha) + src.c * alpha
-//
-// In the first pass, calculate: dest.c = dest.c * (1 - alpha) with blend funcs: zero, 1 - source color
-// In the second pass, calculate: dest.c = dest.c + src.c * alpha with blend funcs: one, one
-//
-// If source is a solid color (src is constant), only the first pass is needed, with blend funcs: constant, 1 - source color
-
-// For source composition with subpixel antialiasing, the final color is calculated per component as follows:
-// alpha = src.a * mask.c * opacity
-// dest.c = dest.c * (1 - mask.c) + src.c * alpha
-//
-
-static const char* const qglslRgbMaskFragmentShaderPass1 = "\n\
-    varying   highp   vec2      textureCoords;\n\
-    uniform           sampler2D maskTexture;\n\
-    lowp vec4 applyMask(lowp vec4 src) \n\
-    { \n\
-        lowp vec4 mask = texture2D(maskTexture, textureCoords); \n\
-        return src.a * mask; \n\
-    }\n";
-
-static const char* const qglslRgbMaskFragmentShaderPass2 = "\n\
-    varying   highp   vec2      textureCoords;\n\
-    uniform           sampler2D maskTexture;\n\
-    lowp vec4 applyMask(lowp vec4 src) \n\
-    { \n\
-        lowp vec4 mask = texture2D(maskTexture, textureCoords); \n\
-        return src * mask; \n\
-    }\n";
-
-/*
-    Left to implement:
-        RgbMaskFragmentShader,
-        RgbMaskWithGammaFragmentShader,
-
-        MultiplyCompositionModeFragmentShader,
-        ScreenCompositionModeFragmentShader,
-        OverlayCompositionModeFragmentShader,
-        DarkenCompositionModeFragmentShader,
-        LightenCompositionModeFragmentShader,
-        ColorDodgeCompositionModeFragmentShader,
-        ColorBurnCompositionModeFragmentShader,
-        HardLightCompositionModeFragmentShader,
-        SoftLightCompositionModeFragmentShader,
-        DifferenceCompositionModeFragmentShader,
-        ExclusionCompositionModeFragmentShader,
-*/
-
-QT_END_NAMESPACE
-
-#endif // GLGC_SHADER_SOURCE_H
diff --git a/src/opengl/gl2paintengineex/qglgradientcache.cpp b/src/opengl/gl2paintengineex/qglgradientcache.cpp
deleted file mode 100644
index fc5e236ca6..0000000000
--- a/src/opengl/gl2paintengineex/qglgradientcache.cpp
+++ /dev/null
@@ -1,225 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtOpenGL module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qglgradientcache_p.h"
-#include <private/qdrawhelper_p.h>
-#include <private/qgl_p.h>
-#include <QtCore/qmutex.h>
-#include <QtCore/qrandom.h>
-
-QT_BEGIN_NAMESPACE
-
-class QGL2GradientCacheWrapper
-{
-public:
-    QGL2GradientCache *cacheForContext(const QGLContext *context) {
-        QMutexLocker lock(&m_mutex);
-        return m_resource.value<QGL2GradientCache>(context->contextHandle());
-    }
-
-private:
-    QOpenGLMultiGroupSharedResource m_resource;
-    QMutex m_mutex;
-};
-
-Q_GLOBAL_STATIC(QGL2GradientCacheWrapper, qt_gradient_caches)
-
-QGL2GradientCache::QGL2GradientCache(QOpenGLContext *ctx)
-    : QOpenGLSharedResource(ctx->shareGroup())
-{
-}
-
-QGL2GradientCache::~QGL2GradientCache()
-{
-    cache.clear();
-}
-
-QGL2GradientCache *QGL2GradientCache::cacheForContext(const QGLContext *context)
-{
-    return qt_gradient_caches()->cacheForContext(context);
-}
-
-void QGL2GradientCache::invalidateResource()
-{
-    QMutexLocker lock(&m_mutex);
-    cache.clear();
-}
-
-void QGL2GradientCache::freeResource(QOpenGLContext *)
-{
-    cleanCache();
-}
-
-void QGL2GradientCache::cleanCache()
-{
-    QOpenGLFunctions *funcs = QOpenGLContext::currentContext()->functions();
-    QMutexLocker lock(&m_mutex);
-    QGLGradientColorTableHash::const_iterator it = cache.constBegin();
-    for (; it != cache.constEnd(); ++it) {
-        const CacheInfo &cache_info = it.value();
-        funcs->glDeleteTextures(1, &cache_info.texId);
-    }
-    cache.clear();
-}
-
-GLuint QGL2GradientCache::getBuffer(const QGradient &gradient, qreal opacity)
-{
-    QMutexLocker lock(&m_mutex);
-    quint64 hash_val = 0;
-
-    const QGradientStops stops = gradient.stops();
-    for (int i = 0; i < stops.size() && i <= 2; i++)
-        hash_val += stops[i].second.rgba();
-
-    QGLGradientColorTableHash::const_iterator it = cache.constFind(hash_val);
-
-    if (it == cache.constEnd())
-        return addCacheElement(hash_val, gradient, opacity);
-    else {
-        do {
-            const CacheInfo &cache_info = it.value();
-            if (cache_info.stops == stops && cache_info.opacity == opacity
-                && cache_info.interpolationMode == gradient.interpolationMode())
-            {
-                return cache_info.texId;
-            }
-            ++it;
-        } while (it != cache.constEnd() && it.key() == hash_val);
-        // an exact match for these stops and opacity was not found, create new cache
-        return addCacheElement(hash_val, gradient, opacity);
-    }
-}
-
-
-GLuint QGL2GradientCache::addCacheElement(quint64 hash_val, const QGradient &gradient, qreal opacity)
-{
-    QOpenGLFunctions *funcs = QOpenGLContext::currentContext()->functions();
-    if (cache.size() == maxCacheSize()) {
-        int elem_to_remove = QRandomGenerator::global()->bounded(maxCacheSize());
-        quint64 key = cache.keys()[elem_to_remove];
-
-        // need to call glDeleteTextures on each removed cache entry:
-        QGLGradientColorTableHash::const_iterator it = cache.constFind(key);
-        do {
-            funcs->glDeleteTextures(1, &it.value().texId);
-        } while (++it != cache.constEnd() && it.key() == key);
-        cache.remove(key); // may remove more than 1, but OK
-    }
-
-    CacheInfo cache_entry(gradient.stops(), opacity, gradient.interpolationMode());
-    uint buffer[1024];
-    generateGradientColorTable(gradient, buffer, paletteSize(), opacity);
-    funcs->glGenTextures(1, &cache_entry.texId);
-    funcs->glBindTexture(GL_TEXTURE_2D, cache_entry.texId);
-    funcs->glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, paletteSize(), 1,
-                        0, GL_RGBA, GL_UNSIGNED_BYTE, buffer);
-    return cache.insert(hash_val, cache_entry).value().texId;
-}
-
-
-// GL's expects pixels in RGBA (when using GL_RGBA), bin-endian (ABGR on x86).
-// Qt always stores in ARGB reguardless of the byte-order the mancine uses.
-static inline uint qtToGlColor(uint c)
-{
-    uint o;
-#if Q_BYTE_ORDER == Q_LITTLE_ENDIAN
-    o = (c & 0xff00ff00)  // alpha & green already in the right place
-        | ((c >> 16) & 0x000000ff) // red
-        | ((c << 16) & 0x00ff0000); // blue
-#else //Q_BIG_ENDIAN
-    o = (c << 8)
-        | ((c >> 24) & 0x000000ff);
-#endif // Q_BYTE_ORDER
-    return o;
-}
-
-//TODO: Let GL generate the texture using an FBO
-void QGL2GradientCache::generateGradientColorTable(const QGradient& gradient, uint *colorTable, int size, qreal opacity) const
-{
-    int pos = 0;
-    const QGradientStops s = gradient.stops();
-    bool colorInterpolation = (gradient.interpolationMode() == QGradient::ColorInterpolation);
-
-    uint alpha = qRound(opacity * 256);
-    // Qt LIES! It returns ARGB (on little-endian AND on big-endian)
-    uint current_color = ARGB_COMBINE_ALPHA(s[0].second.rgba(), alpha);
-    qreal incr = 1.0 / qreal(size);
-    qreal fpos = 1.5 * incr;
-    colorTable[pos++] = qtToGlColor(qPremultiply(current_color));
-
-    while (fpos <= s.first().first) {
-        colorTable[pos] = colorTable[pos - 1];
-        pos++;
-        fpos += incr;
-    }
-
-    if (colorInterpolation)
-        current_color = qPremultiply(current_color);
-
-    const int sLast = s.size() - 1;
-    for (int i = 0; i < sLast; ++i) {
-        qreal delta = 1/(s[i+1].first - s[i].first);
-        uint next_color = ARGB_COMBINE_ALPHA(s[i + 1].second.rgba(), alpha);
-        if (colorInterpolation)
-            next_color = qPremultiply(next_color);
-
-        while (fpos < s[i+1].first && pos < size) {
-            int dist = int(256 * ((fpos - s[i].first) * delta));
-            int idist = 256 - dist;
-            if (colorInterpolation)
-                colorTable[pos] = qtToGlColor(INTERPOLATE_PIXEL_256(current_color, idist, next_color, dist));
-            else
-                colorTable[pos] = qtToGlColor(qPremultiply(INTERPOLATE_PIXEL_256(current_color, idist, next_color, dist)));
-            ++pos;
-            fpos += incr;
-        }
-        current_color = next_color;
-    }
-
-    Q_ASSERT(s.size() > 0);
-
-    uint last_color = qtToGlColor(qPremultiply(ARGB_COMBINE_ALPHA(s[sLast].second.rgba(), alpha)));
-    for (;pos < size; ++pos)
-        colorTable[pos] = last_color;
-
-    // Make sure the last color stop is represented at the end of the table
-    colorTable[size-1] = last_color;
-}
-
-QT_END_NAMESPACE
diff --git a/src/opengl/gl2paintengineex/qglgradientcache_p.h b/src/opengl/gl2paintengineex/qglgradientcache_p.h
deleted file mode 100644
index 3c9da982e9..0000000000
--- a/src/opengl/gl2paintengineex/qglgradientcache_p.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtOpenGL module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QGLGRADIENTCACHE_P_H
-#define QGLGRADIENTCACHE_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include <QMultiHash>
-#include <QObject>
-#include <QtOpenGL/QtOpenGL>
-#include <private/qgl_p.h>
-#include <QtCore/qmutex.h>
-
-QT_BEGIN_NAMESPACE
-
-class QGL2GradientCache : public QOpenGLSharedResource
-{
-    struct CacheInfo
-    {
-        inline CacheInfo(QGradientStops s, qreal op, QGradient::InterpolationMode mode) :
-            stops(s), opacity(op), interpolationMode(mode) {}
-
-        GLuint texId;
-        QGradientStops stops;
-        qreal opacity;
-        QGradient::InterpolationMode interpolationMode;
-    };
-
-    typedef QMultiHash<quint64, CacheInfo> QGLGradientColorTableHash;
-
-public:
-    static QGL2GradientCache *cacheForContext(const QGLContext *context);
-
-    QGL2GradientCache(QOpenGLContext *);
-    ~QGL2GradientCache();
-
-    GLuint getBuffer(const QGradient &gradient, qreal opacity);
-    inline int paletteSize() const { return 1024; }
-
-    void invalidateResource() override;
-    void freeResource(QOpenGLContext *ctx) override;
-
-private:
-    inline int maxCacheSize() const { return 60; }
-    inline void generateGradientColorTable(const QGradient& gradient,
-                                           uint *colorTable,
-                                           int size, qreal opacity) const;
-    GLuint addCacheElement(quint64 hash_val, const QGradient &gradient, qreal opacity);
-    void cleanCache();
-
-    QGLGradientColorTableHash cache;
-    QMutex m_mutex;
-};
-
-QT_END_NAMESPACE
-
-#endif // QGLGRADIENTCACHE_P_H
diff --git a/src/opengl/gl2paintengineex/qglshadercache_p.h b/src/opengl/gl2paintengineex/qglshadercache_p.h
deleted file mode 100644
index 4204e3e256..0000000000
--- a/src/opengl/gl2paintengineex/qglshadercache_p.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtOpenGL module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#ifndef QGLSHADERCACHE_P_H
-#define QGLSHADERCACHE_P_H
-
-#include <QtCore/qglobal.h>
-
-QT_BEGIN_NAMESPACE
-
-
-class QGLShaderProgram;
-class QGLContext;
-
-class CachedShader
-{
-public:
-    inline CachedShader(const QByteArray &, const QByteArray &)
-    {}
-
-    inline bool isCached()
-    {
-        return false;
-    }
-
-    inline bool load(QGLShaderProgram *, const QGLContext *)
-    {
-        return false;
-    }
-
-    inline bool store(QGLShaderProgram *, const QGLContext *)
-    {
-        return false;
-    }
-};
-
-QT_END_NAMESPACE
-
-#endif
diff --git a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
deleted file mode 100644
index 2546f6dc13..0000000000
--- a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
+++ /dev/null
@@ -1,2515 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtOpenGL module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-/*
-    When the active program changes, we need to update it's uniforms.
-    We could track state for each program and only update stale uniforms
-        - Could lead to lots of overhead if there's a lot of programs
-    We could update all the uniforms when the program changes
-        - Could end up updating lots of uniforms which don't need updating
-
-    Updating uniforms should be cheap, so the overhead of updating up-to-date
-    uniforms should be minimal. It's also less complex.
-
-    Things which _may_ cause a different program to be used:
-        - Change in brush/pen style
-        - Change in painter opacity
-        - Change in composition mode
-
-    Whenever we set a mode on the shader manager - it needs to tell us if it had
-    to switch to a different program.
-
-    The shader manager should only switch when we tell it to. E.g. if we set a new
-    brush style and then switch to transparent painter, we only want it to compile
-    and use the correct program when we really need it.
-*/
-
-// #define QT_OPENGL_CACHE_AS_VBOS
-
-#include "qglgradientcache_p.h"
-#include "qpaintengineex_opengl2_p.h"
-
-#include <string.h> //for memcpy
-#include <qmath.h>
-
-#include <private/qgl_p.h>
-#include <private/qpaintengineex_p.h>
-#include <QPaintEngine>
-#include <private/qpainter_p.h>
-#include <private/qfontengine_p.h>
-#include <private/qdatabuffer_p.h>
-#include <private/qstatictext_p.h>
-#include <QtGui/private/qtriangulator_p.h>
-
-#include "qglengineshadermanager_p.h"
-#include "qgl2pexvertexarray_p.h"
-#include "qtextureglyphcache_gl_p.h"
-
-#include <QDebug>
-
-#ifndef QT_OPENGL_ES_2
-# include <qopenglfunctions_1_1.h>
-#endif
-
-QT_BEGIN_NAMESPACE
-
-
-
-Q_GUI_EXPORT QImage qt_imageForBrush(int brushStyle, bool invert);
-
-////////////////////////////////// Private Methods //////////////////////////////////////////
-
-QGL2PaintEngineExPrivate::~QGL2PaintEngineExPrivate()
-{
-    delete shaderManager;
-
-    while (pathCaches.size()) {
-        QVectorPath::CacheEntry *e = *(pathCaches.constBegin());
-        e->cleanup(e->engine, e->data);
-        e->data = 0;
-        e->engine = 0;
-    }
-
-    if (elementIndicesVBOId != 0) {
-        glDeleteBuffers(1, &elementIndicesVBOId);
-        elementIndicesVBOId = 0;
-    }
-}
-
-void QGL2PaintEngineExPrivate::updateTextureFilter(GLenum target, GLenum wrapMode, bool smoothPixmapTransform, GLuint id)
-{
-//    glActiveTexture(GL_TEXTURE0 + QT_BRUSH_TEXTURE_UNIT); //### Is it always this texture unit?
-    if (id != GLuint(-1) && id == lastTextureUsed)
-        return;
-
-    lastTextureUsed = id;
-
-    if (smoothPixmapTransform) {
-        glTexParameteri(target, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-        glTexParameteri(target, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-    } else {
-        glTexParameteri(target, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
-        glTexParameteri(target, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
-    }
-    glTexParameteri(target, GL_TEXTURE_WRAP_S, wrapMode);
-    glTexParameteri(target, GL_TEXTURE_WRAP_T, wrapMode);
-}
-
-
-inline QColor qt_premultiplyColor(QColor c, GLfloat opacity)
-{
-    qreal alpha = c.alphaF() * opacity;
-    c.setAlphaF(alpha);
-    c.setRedF(c.redF() * alpha);
-    c.setGreenF(c.greenF() * alpha);
-    c.setBlueF(c.blueF() * alpha);
-    return c;
-}
-
-
-void QGL2PaintEngineExPrivate::setBrush(const QBrush& brush)
-{
-    if (qbrush_fast_equals(currentBrush, brush))
-        return;
-
-    const Qt::BrushStyle newStyle = qbrush_style(brush);
-    Q_ASSERT(newStyle != Qt::NoBrush);
-
-    currentBrush = brush;
-    if (!currentBrushPixmap.isNull())
-        currentBrushPixmap = QPixmap();
-    brushUniformsDirty = true; // All brushes have at least one uniform
-
-    if (newStyle > Qt::SolidPattern)
-        brushTextureDirty = true;
-
-    if (currentBrush.style() == Qt::TexturePattern
-        && qHasPixmapTexture(brush) && brush.texture().isQBitmap())
-    {
-        shaderManager->setSrcPixelType(QGLEngineShaderManager::TextureSrcWithPattern);
-    } else {
-        shaderManager->setSrcPixelType(newStyle);
-    }
-    shaderManager->optimiseForBrushTransform(currentBrush.transform().type());
-}
-
-
-void QGL2PaintEngineExPrivate::useSimpleShader()
-{
-    shaderManager->useSimpleProgram();
-
-    if (matrixDirty)
-        updateMatrix();
-}
-
-// ####TODO Properly #ifdef this class to use #define symbols actually defined
-// by OpenGL/ES includes
-#ifndef GL_MIRRORED_REPEAT_IBM
-#define GL_MIRRORED_REPEAT_IBM 0x8370
-#endif
-
-void QGL2PaintEngineExPrivate::updateBrushTexture()
-{
-    Q_Q(QGL2PaintEngineEx);
-//     qDebug("QGL2PaintEngineExPrivate::updateBrushTexture()");
-    Qt::BrushStyle style = currentBrush.style();
-
-    if ( (style >= Qt::Dense1Pattern) && (style <= Qt::DiagCrossPattern) ) {
-        // Get the image data for the pattern
-        QImage texImage = qt_imageForBrush(style, false);
-
-        glActiveTexture(GL_TEXTURE0 + QT_BRUSH_TEXTURE_UNIT);
-        ctx->d_func()->bindTexture(texImage, GL_TEXTURE_2D, GL_RGBA, QGLContext::InternalBindOption);
-        updateTextureFilter(GL_TEXTURE_2D, GL_REPEAT, q->state()->renderHints & QPainter::SmoothPixmapTransform);
-    }
-    else if (style >= Qt::LinearGradientPattern && style <= Qt::ConicalGradientPattern) {
-        // Gradiant brush: All the gradiants use the same texture
-
-        const QGradient* g = currentBrush.gradient();
-
-        // We apply global opacity in the fragment shaders, so we always pass 1.0
-        // for opacity to the cache.
-        GLuint texId = QGL2GradientCache::cacheForContext(ctx)->getBuffer(*g, 1.0);
-
-        glActiveTexture(GL_TEXTURE0 + QT_BRUSH_TEXTURE_UNIT);
-        glBindTexture(GL_TEXTURE_2D, texId);
-
-        if (g->spread() == QGradient::RepeatSpread || g->type() == QGradient::ConicalGradient)
-            updateTextureFilter(GL_TEXTURE_2D, GL_REPEAT, q->state()->renderHints & QPainter::SmoothPixmapTransform);
-        else if (g->spread() == QGradient::ReflectSpread)
-            updateTextureFilter(GL_TEXTURE_2D, GL_MIRRORED_REPEAT_IBM, q->state()->renderHints & QPainter::SmoothPixmapTransform);
-        else
-            updateTextureFilter(GL_TEXTURE_2D, GL_CLAMP_TO_EDGE, q->state()->renderHints & QPainter::SmoothPixmapTransform);
-    }
-    else if (style == Qt::TexturePattern) {
-        currentBrushPixmap = currentBrush.texture();
-
-        int max_texture_size = ctx->d_func()->maxTextureSize();
-        if (currentBrushPixmap.width() > max_texture_size || currentBrushPixmap.height() > max_texture_size)
-            currentBrushPixmap = currentBrushPixmap.scaled(max_texture_size, max_texture_size, Qt::KeepAspectRatio);
-
-        GLuint wrapMode = GL_REPEAT;
-        if (ctx->contextHandle()->isOpenGLES()) {
-            // OpenGL ES does not support GL_REPEAT wrap modes for NPOT textures. So instead,
-            // we emulate GL_REPEAT by only taking the fractional part of the texture coords
-            // in the qopenglslTextureBrushSrcFragmentShader program.
-            wrapMode = GL_CLAMP_TO_EDGE;
-        }
-
-        glActiveTexture(GL_TEXTURE0 + QT_BRUSH_TEXTURE_UNIT);
-        QGLTexture *tex = ctx->d_func()->bindTexture(currentBrushPixmap, GL_TEXTURE_2D, GL_RGBA,
-                                                     QGLContext::InternalBindOption |
-                                                     QGLContext::CanFlipNativePixmapBindOption);
-        updateTextureFilter(GL_TEXTURE_2D, wrapMode, q->state()->renderHints & QPainter::SmoothPixmapTransform);
-        textureInvertedY = tex->options & QGLContext::InvertedYBindOption ? -1 : 1;
-    }
-    brushTextureDirty = false;
-}
-
-
-void QGL2PaintEngineExPrivate::updateBrushUniforms()
-{
-//     qDebug("QGL2PaintEngineExPrivate::updateBrushUniforms()");
-    Qt::BrushStyle style = currentBrush.style();
-
-    if (style == Qt::NoBrush)
-        return;
-
-    QTransform brushQTransform = currentBrush.transform();
-
-    if (style == Qt::SolidPattern) {
-        QColor col = qt_premultiplyColor(currentBrush.color(), (GLfloat)q->state()->opacity);
-        shaderManager->currentProgram()->setUniformValue(location(QGLEngineShaderManager::FragmentColor), col);
-    }
-    else {
-        // All other brushes have a transform and thus need the translation point:
-        QPointF translationPoint;
-
-        if (style <= Qt::DiagCrossPattern) {
-            QColor col = qt_premultiplyColor(currentBrush.color(), (GLfloat)q->state()->opacity);
-
-            shaderManager->currentProgram()->setUniformValue(location(QGLEngineShaderManager::PatternColor), col);
-
-            QVector2D halfViewportSize(width*0.5, height*0.5);
-            shaderManager->currentProgram()->setUniformValue(location(QGLEngineShaderManager::HalfViewportSize), halfViewportSize);
-        }
-        else if (style == Qt::LinearGradientPattern) {
-            const QLinearGradient *g = static_cast<const QLinearGradient *>(currentBrush.gradient());
-
-            QPointF realStart = g->start();
-            QPointF realFinal = g->finalStop();
-            translationPoint = realStart;
-
-            QPointF l = realFinal - realStart;
-
-            QVector3D linearData(
-                l.x(),
-                l.y(),
-                1.0f / (l.x() * l.x() + l.y() * l.y())
-            );
-
-            shaderManager->currentProgram()->setUniformValue(location(QGLEngineShaderManager::LinearData), linearData);
-
-            QVector2D halfViewportSize(width*0.5, height*0.5);
-            shaderManager->currentProgram()->setUniformValue(location(QGLEngineShaderManager::HalfViewportSize), halfViewportSize);
-        }
-        else if (style == Qt::ConicalGradientPattern) {
-            const QConicalGradient *g = static_cast<const QConicalGradient *>(currentBrush.gradient());
-            translationPoint   = g->center();
-
-            GLfloat angle = -qDegreesToRadians(g->angle());
-
-            shaderManager->currentProgram()->setUniformValue(location(QGLEngineShaderManager::Angle), angle);
-
-            QVector2D halfViewportSize(width*0.5, height*0.5);
-            shaderManager->currentProgram()->setUniformValue(location(QGLEngineShaderManager::HalfViewportSize), halfViewportSize);
-        }
-        else if (style == Qt::RadialGradientPattern) {
-            const QRadialGradient *g = static_cast<const QRadialGradient *>(currentBrush.gradient());
-            QPointF realCenter = g->center();
-            QPointF realFocal  = g->focalPoint();
-            qreal   realRadius = g->centerRadius() - g->focalRadius();
-            translationPoint   = realFocal;
-
-            QPointF fmp = realCenter - realFocal;
-            shaderManager->currentProgram()->setUniformValue(location(QGLEngineShaderManager::Fmp), fmp);
-
-            GLfloat fmp2_m_radius2 = -fmp.x() * fmp.x() - fmp.y() * fmp.y() + realRadius*realRadius;
-            shaderManager->currentProgram()->setUniformValue(location(QGLEngineShaderManager::Fmp2MRadius2), fmp2_m_radius2);
-            shaderManager->currentProgram()->setUniformValue(location(QGLEngineShaderManager::Inverse2Fmp2MRadius2),
-                                                             GLfloat(1.0 / (2.0*fmp2_m_radius2)));
-            shaderManager->currentProgram()->setUniformValue(location(QGLEngineShaderManager::SqrFr),
-                                                             GLfloat(g->focalRadius() * g->focalRadius()));
-            shaderManager->currentProgram()->setUniformValue(location(QGLEngineShaderManager::BRadius),
-                                                             GLfloat(2 * (g->centerRadius() - g->focalRadius()) * g->focalRadius()),
-                                                             g->focalRadius(),
-                                                             g->centerRadius() - g->focalRadius());
-
-            QVector2D halfViewportSize(width*0.5, height*0.5);
-            shaderManager->currentProgram()->setUniformValue(location(QGLEngineShaderManager::HalfViewportSize), halfViewportSize);
-        }
-        else if (style == Qt::TexturePattern) {
-            const QPixmap& texPixmap = currentBrush.texture();
-
-            if (qHasPixmapTexture(currentBrush) && currentBrush.texture().isQBitmap()) {
-                QColor col = qt_premultiplyColor(currentBrush.color(), (GLfloat)q->state()->opacity);
-                shaderManager->currentProgram()->setUniformValue(location(QGLEngineShaderManager::PatternColor), col);
-            }
-
-            QSizeF invertedTextureSize(1.0 / texPixmap.width(), 1.0 / texPixmap.height());
-            shaderManager->currentProgram()->setUniformValue(location(QGLEngineShaderManager::InvertedTextureSize), invertedTextureSize);
-
-            QVector2D halfViewportSize(width*0.5, height*0.5);
-            shaderManager->currentProgram()->setUniformValue(location(QGLEngineShaderManager::HalfViewportSize), halfViewportSize);
-        }
-        else
-            qWarning("QGL2PaintEngineEx: Unimplemented fill style");
-
-        const QPointF &brushOrigin = q->state()->brushOrigin;
-        QTransform matrix = q->state()->matrix;
-        matrix.translate(brushOrigin.x(), brushOrigin.y());
-
-        QTransform translate(1, 0, 0, 1, -translationPoint.x(), -translationPoint.y());
-        qreal m22 = -1;
-        qreal dy = height;
-        if (device->isFlipped()) {
-            m22 = 1;
-            dy = 0;
-        }
-        QTransform gl_to_qt(1, 0, 0, m22, 0, dy);
-        QTransform inv_matrix;
-        if (style == Qt::TexturePattern && textureInvertedY == -1)
-            inv_matrix = gl_to_qt * (QTransform(1, 0, 0, -1, 0, currentBrush.texture().height()) * brushQTransform * matrix).inverted() * translate;
-        else
-            inv_matrix = gl_to_qt * (brushQTransform * matrix).inverted() * translate;
-
-        shaderManager->currentProgram()->setUniformValue(location(QGLEngineShaderManager::BrushTransform), inv_matrix);
-        shaderManager->currentProgram()->setUniformValue(location(QGLEngineShaderManager::BrushTexture), QT_BRUSH_TEXTURE_UNIT);
-    }
-    brushUniformsDirty = false;
-}
-
-
-// This assumes the shader manager has already setup the correct shader program
-void QGL2PaintEngineExPrivate::updateMatrix()
-{
-//     qDebug("QGL2PaintEngineExPrivate::updateMatrix()");
-
-    const QTransform& transform = q->state()->matrix;
-
-    // The projection matrix converts from Qt's coordinate system to GL's coordinate system
-    //    * GL's viewport is 2x2, Qt's is width x height
-    //    * GL has +y -> -y going from bottom -> top, Qt is the other way round
-    //    * GL has [0,0] in the center, Qt has it in the top-left
-    //
-    // This results in the Projection matrix below, which is multiplied by the painter's
-    // transformation matrix, as shown below:
-    //
-    //                Projection Matrix                      Painter Transform
-    // ------------------------------------------------   ------------------------
-    // | 2.0 / width  |      0.0      |     -1.0      |   |  m11  |  m21  |  dx  |
-    // |     0.0      | -2.0 / height |      1.0      | * |  m12  |  m22  |  dy  |
-    // |     0.0      |      0.0      |      1.0      |   |  m13  |  m23  |  m33 |
-    // ------------------------------------------------   ------------------------
-    //
-    // NOTE: The resultant matrix is also transposed, as GL expects column-major matracies
-
-    const GLfloat wfactor = 2.0f / width;
-    GLfloat hfactor = -2.0f / height;
-
-    GLfloat dx = transform.dx();
-    GLfloat dy = transform.dy();
-
-    if (device->isFlipped()) {
-        hfactor *= -1;
-        dy -= height;
-    }
-
-    // Non-integer translates can have strange effects for some rendering operations such as
-    // anti-aliased text rendering. In such cases, we snap the translate to the pixel grid.
-    if (snapToPixelGrid && transform.type() == QTransform::TxTranslate) {
-        // 0.50 needs to rounded down to 0.0 for consistency with raster engine:
-        dx = std::ceil(dx - 0.5f);
-        dy = std::ceil(dy - 0.5f);
-    }
-    pmvMatrix[0][0] = (wfactor * transform.m11())  - transform.m13();
-    pmvMatrix[1][0] = (wfactor * transform.m21())  - transform.m23();
-    pmvMatrix[2][0] = (wfactor * dx) - transform.m33();
-    pmvMatrix[0][1] = (hfactor * transform.m12())  + transform.m13();
-    pmvMatrix[1][1] = (hfactor * transform.m22())  + transform.m23();
-    pmvMatrix[2][1] = (hfactor * dy) + transform.m33();
-    pmvMatrix[0][2] = transform.m13();
-    pmvMatrix[1][2] = transform.m23();
-    pmvMatrix[2][2] = transform.m33();
-
-    // 1/10000 == 0.0001, so we have good enough res to cover curves
-    // that span the entire widget...
-    inverseScale = qMax(1 / qMax( qMax(qAbs(transform.m11()), qAbs(transform.m22())),
-                                  qMax(qAbs(transform.m12()), qAbs(transform.m21())) ),
-                        qreal(0.0001));
-
-    matrixDirty = false;
-    matrixUniformDirty = true;
-
-    // Set the PMV matrix attribute. As we use an attributes rather than uniforms, we only
-    // need to do this once for every matrix change and persists across all shader programs.
-    glVertexAttrib3fv(QT_PMV_MATRIX_1_ATTR, pmvMatrix[0]);
-    glVertexAttrib3fv(QT_PMV_MATRIX_2_ATTR, pmvMatrix[1]);
-    glVertexAttrib3fv(QT_PMV_MATRIX_3_ATTR, pmvMatrix[2]);
-
-    dasher.setInvScale(inverseScale);
-    stroker.setInvScale(inverseScale);
-}
-
-
-void QGL2PaintEngineExPrivate::updateCompositionMode()
-{
-    // NOTE: The entire paint engine works on pre-multiplied data - which is why some of these
-    //       composition modes look odd.
-//     qDebug() << "QGL2PaintEngineExPrivate::updateCompositionMode() - Setting GL composition mode for " << q->state()->composition_mode;
-    switch(q->state()->composition_mode) {
-    case QPainter::CompositionMode_SourceOver:
-        glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
-        break;
-    case QPainter::CompositionMode_DestinationOver:
-        glBlendFunc(GL_ONE_MINUS_DST_ALPHA, GL_ONE);
-        break;
-    case QPainter::CompositionMode_Clear:
-        glBlendFunc(GL_ZERO, GL_ZERO);
-        break;
-    case QPainter::CompositionMode_Source:
-        glBlendFunc(GL_ONE, GL_ZERO);
-        break;
-    case QPainter::CompositionMode_Destination:
-        glBlendFunc(GL_ZERO, GL_ONE);
-        break;
-    case QPainter::CompositionMode_SourceIn:
-        glBlendFunc(GL_DST_ALPHA, GL_ZERO);
-        break;
-    case QPainter::CompositionMode_DestinationIn:
-        glBlendFunc(GL_ZERO, GL_SRC_ALPHA);
-        break;
-    case QPainter::CompositionMode_SourceOut:
-        glBlendFunc(GL_ONE_MINUS_DST_ALPHA, GL_ZERO);
-        break;
-    case QPainter::CompositionMode_DestinationOut:
-        glBlendFunc(GL_ZERO, GL_ONE_MINUS_SRC_ALPHA);
-        break;
-    case QPainter::CompositionMode_SourceAtop:
-        glBlendFunc(GL_DST_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-        break;
-    case QPainter::CompositionMode_DestinationAtop:
-        glBlendFunc(GL_ONE_MINUS_DST_ALPHA, GL_SRC_ALPHA);
-        break;
-    case QPainter::CompositionMode_Xor:
-        glBlendFunc(GL_ONE_MINUS_DST_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-        break;
-    case QPainter::CompositionMode_Plus:
-        glBlendFunc(GL_ONE, GL_ONE);
-        break;
-    default:
-        qWarning("Unsupported composition mode");
-        break;
-    }
-
-    compositionModeDirty = false;
-}
-
-static inline void setCoords(GLfloat *coords, const QGLRect &rect)
-{
-    coords[0] = rect.left;
-    coords[1] = rect.top;
-    coords[2] = rect.right;
-    coords[3] = rect.top;
-    coords[4] = rect.right;
-    coords[5] = rect.bottom;
-    coords[6] = rect.left;
-    coords[7] = rect.bottom;
-}
-
-void QGL2PaintEngineExPrivate::drawTexture(const QGLRect& dest, const QGLRect& src, const QSize &textureSize, bool opaque, bool pattern)
-{
-    // Setup for texture drawing
-    currentBrush = noBrush;
-    shaderManager->setSrcPixelType(pattern ? QGLEngineShaderManager::PatternSrc : QGLEngineShaderManager::ImageSrc);
-
-    if (snapToPixelGrid) {
-        snapToPixelGrid = false;
-        matrixDirty = true;
-    }
-
-    if (prepareForDraw(opaque))
-        shaderManager->currentProgram()->setUniformValue(location(QGLEngineShaderManager::ImageTexture), QT_IMAGE_TEXTURE_UNIT);
-
-    if (pattern) {
-        QColor col = qt_premultiplyColor(q->state()->pen.color(), (GLfloat)q->state()->opacity);
-        shaderManager->currentProgram()->setUniformValue(location(QGLEngineShaderManager::PatternColor), col);
-    }
-
-    GLfloat dx = 1.0 / textureSize.width();
-    GLfloat dy = 1.0 / textureSize.height();
-
-    QGLRect srcTextureRect(src.left*dx, src.top*dy, src.right*dx, src.bottom*dy);
-
-    setCoords(staticVertexCoordinateArray, dest);
-    setCoords(staticTextureCoordinateArray, srcTextureRect);
-
-    glDrawArrays(GL_TRIANGLE_FAN, 0, 4);
-}
-
-void QGL2PaintEngineEx::beginNativePainting()
-{
-    Q_D(QGL2PaintEngineEx);
-    ensureActive();
-    d->transferMode(BrushDrawingMode);
-
-    d->nativePaintingActive = true;
-
-    d->glUseProgram(0);
-
-    // Disable all the vertex attribute arrays:
-    for (int i = 0; i < QT_GL_VERTEX_ARRAY_TRACKED_COUNT; ++i)
-        d->glDisableVertexAttribArray(i);
-
-#ifndef QT_OPENGL_ES_2
-    if (!d->ctx->contextHandle()->isOpenGLES()) {
-        const QGLContext *ctx = d->ctx;
-        const QGLFormat &fmt = d->device->format();
-        if (fmt.majorVersion() < 3 || (fmt.majorVersion() == 3 && fmt.minorVersion() < 1)
-            || (fmt.majorVersion() == 3 && fmt.minorVersion() == 1 && ctx->contextHandle()->hasExtension(QByteArrayLiteral("GL_ARB_compatibility")))
-            || fmt.profile() == QGLFormat::CompatibilityProfile)
-        {
-            // be nice to people who mix OpenGL 1.x code with QPainter commands
-            // by setting modelview and projection matrices to mirror the GL 1
-            // paint engine
-            const QTransform& mtx = state()->matrix;
-
-            float mv_matrix[4][4] =
-                {
-                    { float(mtx.m11()), float(mtx.m12()),     0, float(mtx.m13()) },
-                    { float(mtx.m21()), float(mtx.m22()),     0, float(mtx.m23()) },
-                    {                0,                0,     1,                0 },
-                    {  float(mtx.dx()),  float(mtx.dy()),     0, float(mtx.m33()) }
-                };
-
-            const QSize sz = d->device->size();
-
-            QOpenGLFunctions_1_1 *gl1funcs = QOpenGLContext::currentContext()->versionFunctions<QOpenGLFunctions_1_1>();
-            gl1funcs->initializeOpenGLFunctions();
-
-            gl1funcs->glMatrixMode(GL_PROJECTION);
-            gl1funcs->glLoadIdentity();
-            gl1funcs->glOrtho(0, sz.width(), sz.height(), 0, -999999, 999999);
-
-            gl1funcs->glMatrixMode(GL_MODELVIEW);
-            gl1funcs->glLoadMatrixf(&mv_matrix[0][0]);
-        }
-    }
-#endif
-
-    d->lastTextureUsed = GLuint(-1);
-    d->dirtyStencilRegion = QRect(0, 0, d->width, d->height);
-    d->resetGLState();
-
-    d->shaderManager->setDirty();
-
-    d->needsSync = true;
-}
-
-void QGL2PaintEngineExPrivate::resetGLState()
-{
-    glDisable(GL_BLEND);
-    glActiveTexture(GL_TEXTURE0);
-    glDisable(GL_STENCIL_TEST);
-    glDisable(GL_DEPTH_TEST);
-    glDisable(GL_SCISSOR_TEST);
-    glDepthMask(true);
-    glDepthFunc(GL_LESS);
-    glClearDepthf(1);
-    glStencilMask(0xff);
-    glStencilOp(GL_KEEP, GL_KEEP, GL_KEEP);
-    glStencilFunc(GL_ALWAYS, 0, 0xff);
-    ctx->d_func()->setVertexAttribArrayEnabled(QT_TEXTURE_COORDS_ATTR, false);
-    ctx->d_func()->setVertexAttribArrayEnabled(QT_VERTEX_COORDS_ATTR, false);
-    ctx->d_func()->setVertexAttribArrayEnabled(QT_OPACITY_ATTR, false);
-#ifndef QT_OPENGL_ES_2
-    if (!ctx->contextHandle()->isOpenGLES()) {
-        // gl_Color, corresponding to vertex attribute 3, may have been changed
-        float color[] = { 1.0f, 1.0f, 1.0f, 1.0f };
-        glVertexAttrib4fv(3, color);
-    }
-#endif
-}
-
-bool QGL2PaintEngineExPrivate::resetOpenGLContextActiveEngine()
-{
-    QOpenGLContext *guiGlContext = ctx->contextHandle();
-    QOpenGLContextPrivate *guiGlContextPrivate =
-        guiGlContext ? QOpenGLContextPrivate::get(guiGlContext) : 0;
-
-    if (guiGlContextPrivate && guiGlContextPrivate->active_engine) {
-        ctx->d_func()->refreshCurrentFbo();
-        guiGlContextPrivate->active_engine = 0;
-        return true;
-    }
-
-    return false;
-}
-
-void QGL2PaintEngineEx::endNativePainting()
-{
-    Q_D(QGL2PaintEngineEx);
-    d->needsSync = true;
-    d->nativePaintingActive = false;
-}
-
-void QGL2PaintEngineEx::invalidateState()
-{
-    Q_D(QGL2PaintEngineEx);
-    d->needsSync = true;
-}
-
-bool QGL2PaintEngineEx::isNativePaintingActive() const {
-    Q_D(const QGL2PaintEngineEx);
-    return d->nativePaintingActive;
-}
-
-bool QGL2PaintEngineEx::shouldDrawCachedGlyphs(QFontEngine *fontEngine, const QTransform &t) const
-{
-    // The paint engine does not support projected cached glyph drawing
-    if (t.type() == QTransform::TxProject)
-        return false;
-
-    // The font engine might not support filling the glyph cache
-    // with the given transform applied, in which case we need to
-    // fall back to the QPainterPath code-path.
-    if (!fontEngine->supportsTransformation(t)) {
-        // Except that drawing paths is slow, so for scales between
-        // 0.5 and 2.0 we leave the glyph cache untransformed and deal
-        // with the transform ourselves when painting, resulting in
-        // drawing 1x cached glyphs with a smooth-scale.
-        float det = t.determinant();
-        if (det >= 0.25f && det <= 4.f) {
-            // Assuming the baseclass still agrees
-            return QPaintEngineEx::shouldDrawCachedGlyphs(fontEngine, t);
-        }
-
-        return false; // Fall back to path-drawing
-    }
-
-    return QPaintEngineEx::shouldDrawCachedGlyphs(fontEngine, t);
-}
-
-void QGL2PaintEngineExPrivate::transferMode(EngineMode newMode)
-{
-    if (newMode == mode)
-        return;
-
-    if (mode == TextDrawingMode || mode == ImageDrawingMode || mode == ImageArrayDrawingMode) {
-        lastTextureUsed = GLuint(-1);
-    }
-
-    if (newMode == TextDrawingMode) {
-        shaderManager->setHasComplexGeometry(true);
-    } else {
-        shaderManager->setHasComplexGeometry(false);
-    }
-
-    if (newMode == ImageDrawingMode) {
-        setVertexAttributePointer(QT_VERTEX_COORDS_ATTR, staticVertexCoordinateArray);
-        setVertexAttributePointer(QT_TEXTURE_COORDS_ATTR, staticTextureCoordinateArray);
-    }
-
-    if (newMode == ImageArrayDrawingMode) {
-        setVertexAttributePointer(QT_VERTEX_COORDS_ATTR, (GLfloat*)vertexCoordinateArray.data());
-        setVertexAttributePointer(QT_TEXTURE_COORDS_ATTR, (GLfloat*)textureCoordinateArray.data());
-        setVertexAttributePointer(QT_OPACITY_ATTR, (GLfloat*)opacityArray.data());
-    }
-
-    // This needs to change when we implement high-quality anti-aliasing...
-    if (newMode != TextDrawingMode)
-        shaderManager->setMaskType(QGLEngineShaderManager::NoMask);
-
-    mode = newMode;
-}
-
-struct QGL2PEVectorPathCache
-{
-#ifdef QT_OPENGL_CACHE_AS_VBOS
-    GLuint vbo;
-    GLuint ibo;
-#else
-    float *vertices;
-    void *indices;
-#endif
-    int vertexCount;
-    int indexCount;
-    GLenum primitiveType;
-    qreal iscale;
-    QVertexIndexVector::Type indexType;
-};
-
-void QGL2PaintEngineExPrivate::cleanupVectorPath(QPaintEngineEx *engine, void *data)
-{
-    QGL2PEVectorPathCache *c = (QGL2PEVectorPathCache *) data;
-#ifdef QT_OPENGL_CACHE_AS_VBOS
-    Q_ASSERT(engine->type() == QPaintEngine::OpenGL2);
-    static_cast<QGL2PaintEngineEx *>(engine)->d_func()->unusedVBOSToClean << c->vbo;
-    if (c->ibo)
-        d->unusedIBOSToClean << c->ibo;
-#else
-    Q_UNUSED(engine);
-    free(c->vertices);
-    free(c->indices);
-#endif
-    delete c;
-}
-
-// Assumes everything is configured for the brush you want to use
-void QGL2PaintEngineExPrivate::fill(const QVectorPath& path)
-{
-    transferMode(BrushDrawingMode);
-
-    if (snapToPixelGrid) {
-        snapToPixelGrid = false;
-        matrixDirty = true;
-    }
-
-    // Might need to call updateMatrix to re-calculate inverseScale
-    if (matrixDirty)
-        updateMatrix();
-
-    const QPointF* const points = reinterpret_cast<const QPointF*>(path.points());
-
-    // Check to see if there's any hints
-    if (path.shape() == QVectorPath::RectangleHint) {
-        QGLRect rect(points[0].x(), points[0].y(), points[2].x(), points[2].y());
-        prepareForDraw(currentBrush.isOpaque());
-        composite(rect);
-    } else if (path.isConvex()) {
-
-        if (path.isCacheable()) {
-            QVectorPath::CacheEntry *data = path.lookupCacheData(q);
-            QGL2PEVectorPathCache *cache;
-
-            bool updateCache = false;
-
-            if (data) {
-                cache = (QGL2PEVectorPathCache *) data->data;
-                // Check if scale factor is exceeded for curved paths and generate curves if so...
-                if (path.isCurved()) {
-                    qreal scaleFactor = cache->iscale / inverseScale;
-                    if (scaleFactor < 0.5 || scaleFactor > 2.0) {
-#ifdef QT_OPENGL_CACHE_AS_VBOS
-                        glDeleteBuffers(1, &cache->vbo);
-                        cache->vbo = 0;
-                        Q_ASSERT(cache->ibo == 0);
-#else
-                        free(cache->vertices);
-                        Q_ASSERT(cache->indices == 0);
-#endif
-                        updateCache = true;
-                    }
-                }
-            } else {
-                cache = new QGL2PEVectorPathCache;
-                data = const_cast<QVectorPath &>(path).addCacheData(q, cache, cleanupVectorPath);
-                updateCache = true;
-            }
-
-            // Flatten the path at the current scale factor and fill it into the cache struct.
-            if (updateCache) {
-                vertexCoordinateArray.clear();
-                vertexCoordinateArray.addPath(path, inverseScale, false);
-                int vertexCount = vertexCoordinateArray.vertexCount();
-                int floatSizeInBytes = vertexCount * 2 * sizeof(float);
-                cache->vertexCount = vertexCount;
-                cache->indexCount = 0;
-                cache->primitiveType = GL_TRIANGLE_FAN;
-                cache->iscale = inverseScale;
-#ifdef QT_OPENGL_CACHE_AS_VBOS
-                glGenBuffers(1, &cache->vbo);
-                glBindBuffer(GL_ARRAY_BUFFER, cache->vbo);
-                glBufferData(GL_ARRAY_BUFFER, floatSizeInBytes, vertexCoordinateArray.data(), GL_STATIC_DRAW);
-                cache->ibo = 0;
-#else
-                cache->vertices = (float *) malloc(floatSizeInBytes);
-                memcpy(cache->vertices, vertexCoordinateArray.data(), floatSizeInBytes);
-                cache->indices = 0;
-#endif
-            }
-
-            prepareForDraw(currentBrush.isOpaque());
-#ifdef QT_OPENGL_CACHE_AS_VBOS
-            glBindBuffer(GL_ARRAY_BUFFER, cache->vbo);
-            setVertexAttributePointer(QT_VERTEX_COORDS_ATTR, 0);
-#else
-            setVertexAttributePointer(QT_VERTEX_COORDS_ATTR, cache->vertices);
-#endif
-            glDrawArrays(cache->primitiveType, 0, cache->vertexCount);
-
-        } else {
-      //        printf(" - Marking path as cachable...\n");
-            // Tag it for later so that if the same path is drawn twice, it is assumed to be static and thus cachable
-            path.makeCacheable();
-            vertexCoordinateArray.clear();
-            vertexCoordinateArray.addPath(path, inverseScale, false);
-            prepareForDraw(currentBrush.isOpaque());
-            drawVertexArrays(vertexCoordinateArray, GL_TRIANGLE_FAN);
-        }
-
-    } else {
-        bool useCache = path.isCacheable();
-        if (useCache) {
-            QRectF bbox = path.controlPointRect();
-            // If the path doesn't fit within these limits, it is possible that the triangulation will fail.
-            useCache &= (bbox.left() > -0x8000 * inverseScale)
-                     && (bbox.right() < 0x8000 * inverseScale)
-                     && (bbox.top() > -0x8000 * inverseScale)
-                     && (bbox.bottom() < 0x8000 * inverseScale);
-        }
-
-        if (useCache) {
-            QVectorPath::CacheEntry *data = path.lookupCacheData(q);
-            QGL2PEVectorPathCache *cache;
-
-            bool updateCache = false;
-
-            if (data) {
-                cache = (QGL2PEVectorPathCache *) data->data;
-                // Check if scale factor is exceeded for curved paths and generate curves if so...
-                if (path.isCurved()) {
-                    qreal scaleFactor = cache->iscale / inverseScale;
-                    if (scaleFactor < 0.5 || scaleFactor > 2.0) {
-#ifdef QT_OPENGL_CACHE_AS_VBOS
-                        glDeleteBuffers(1, &cache->vbo);
-                        glDeleteBuffers(1, &cache->ibo);
-#else
-                        free(cache->vertices);
-                        free(cache->indices);
-#endif
-                        updateCache = true;
-                    }
-                }
-            } else {
-                cache = new QGL2PEVectorPathCache;
-                data = const_cast<QVectorPath &>(path).addCacheData(q, cache, cleanupVectorPath);
-                updateCache = true;
-            }
-
-            // Flatten the path at the current scale factor and fill it into the cache struct.
-            if (updateCache) {
-                QTriangleSet polys = qTriangulate(path, QTransform().scale(1 / inverseScale, 1 / inverseScale));
-                cache->vertexCount = polys.vertices.size() / 2;
-                cache->indexCount = polys.indices.size();
-                cache->primitiveType = GL_TRIANGLES;
-                cache->iscale = inverseScale;
-                cache->indexType = polys.indices.type();
-#ifdef QT_OPENGL_CACHE_AS_VBOS
-                glGenBuffers(1, &cache->vbo);
-                glGenBuffers(1, &cache->ibo);
-                glBindBuffer(GL_ARRAY_BUFFER, cache->vbo);
-                glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, cache->ibo);
-
-                if (polys.indices.type() == QVertexIndexVector::UnsignedInt)
-                    glBufferData(GL_ELEMENT_ARRAY_BUFFER, sizeof(quint32) * polys.indices.size(), polys.indices.data(), GL_STATIC_DRAW);
-                else
-                    glBufferData(GL_ELEMENT_ARRAY_BUFFER, sizeof(quint16) * polys.indices.size(), polys.indices.data(), GL_STATIC_DRAW);
-
-                QVarLengthArray<float> vertices(polys.vertices.size());
-                for (int i = 0; i < polys.vertices.size(); ++i)
-                    vertices[i] = float(inverseScale * polys.vertices.at(i));
-                glBufferData(GL_ARRAY_BUFFER, sizeof(float) * vertices.size(), vertices.data(), GL_STATIC_DRAW);
-#else
-                cache->vertices = (float *) malloc(sizeof(float) * polys.vertices.size());
-                if (polys.indices.type() == QVertexIndexVector::UnsignedInt) {
-                    cache->indices = (quint32 *) malloc(sizeof(quint32) * polys.indices.size());
-                    memcpy(cache->indices, polys.indices.data(), sizeof(quint32) * polys.indices.size());
-                } else {
-                    cache->indices = (quint16 *) malloc(sizeof(quint16) * polys.indices.size());
-                    memcpy(cache->indices, polys.indices.data(), sizeof(quint16) * polys.indices.size());
-                }
-                for (int i = 0; i < polys.vertices.size(); ++i)
-                    cache->vertices[i] = float(inverseScale * polys.vertices.at(i));
-#endif
-            }
-
-            prepareForDraw(currentBrush.isOpaque());
-#ifdef QT_OPENGL_CACHE_AS_VBOS
-            glBindBuffer(GL_ARRAY_BUFFER, cache->vbo);
-            glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, cache->ibo);
-            setVertexAttributePointer(QT_VERTEX_COORDS_ATTR, 0);
-            if (cache->indexType == QVertexIndexVector::UnsignedInt)
-                glDrawElements(cache->primitiveType, cache->indexCount, GL_UNSIGNED_INT, 0);
-            else
-                glDrawElements(cache->primitiveType, cache->indexCount, GL_UNSIGNED_SHORT, 0);
-            glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0);
-            glBindBuffer(GL_ARRAY_BUFFER, 0);
-#else
-            setVertexAttributePointer(QT_VERTEX_COORDS_ATTR, cache->vertices);
-            if (cache->indexType == QVertexIndexVector::UnsignedInt)
-                glDrawElements(cache->primitiveType, cache->indexCount, GL_UNSIGNED_INT, (qint32 *)cache->indices);
-            else
-                glDrawElements(cache->primitiveType, cache->indexCount, GL_UNSIGNED_SHORT, (qint16 *)cache->indices);
-#endif
-
-        } else {
-      //        printf(" - Marking path as cachable...\n");
-            // Tag it for later so that if the same path is drawn twice, it is assumed to be static and thus cachable
-            path.makeCacheable();
-
-            if (!device->format().stencil()) {
-                // If there is no stencil buffer, triangulate the path instead.
-
-                QRectF bbox = path.controlPointRect();
-                // If the path doesn't fit within these limits, it is possible that the triangulation will fail.
-                bool withinLimits = (bbox.left() > -0x8000 * inverseScale)
-                                  && (bbox.right() < 0x8000 * inverseScale)
-                                  && (bbox.top() > -0x8000 * inverseScale)
-                                  && (bbox.bottom() < 0x8000 * inverseScale);
-                if (withinLimits) {
-                    QTriangleSet polys = qTriangulate(path, QTransform().scale(1 / inverseScale, 1 / inverseScale));
-
-                    QVarLengthArray<float> vertices(polys.vertices.size());
-                    for (int i = 0; i < polys.vertices.size(); ++i)
-                        vertices[i] = float(inverseScale * polys.vertices.at(i));
-
-                    prepareForDraw(currentBrush.isOpaque());
-                    setVertexAttributePointer(QT_VERTEX_COORDS_ATTR, vertices.constData());
-                    if (polys.indices.type() == QVertexIndexVector::UnsignedInt)
-                        glDrawElements(GL_TRIANGLES, polys.indices.size(), GL_UNSIGNED_INT, polys.indices.data());
-                    else
-                        glDrawElements(GL_TRIANGLES, polys.indices.size(), GL_UNSIGNED_SHORT, polys.indices.data());
-                } else {
-                    // We can't handle big, concave painter paths with OpenGL without stencil buffer.
-                    qWarning("Painter path exceeds +/-32767 pixels.");
-                }
-                return;
-            }
-
-            // The path is too complicated & needs the stencil technique
-            vertexCoordinateArray.clear();
-            vertexCoordinateArray.addPath(path, inverseScale, false);
-
-            fillStencilWithVertexArray(vertexCoordinateArray, path.hasWindingFill());
-
-            glStencilMask(0xff);
-            glStencilOp(GL_KEEP, GL_REPLACE, GL_REPLACE);
-
-            if (q->state()->clipTestEnabled) {
-                // Pass when high bit is set, replace stencil value with current clip
-                glStencilFunc(GL_NOTEQUAL, q->state()->currentClip, GL_STENCIL_HIGH_BIT);
-            } else if (path.hasWindingFill()) {
-                // Pass when any bit is set, replace stencil value with 0
-                glStencilFunc(GL_NOTEQUAL, 0, 0xff);
-            } else {
-                // Pass when high bit is set, replace stencil value with 0
-                glStencilFunc(GL_NOTEQUAL, 0, GL_STENCIL_HIGH_BIT);
-            }
-            prepareForDraw(currentBrush.isOpaque());
-
-            // Stencil the brush onto the dest buffer
-            composite(vertexCoordinateArray.boundingRect());
-            glStencilMask(0);
-            updateClipScissorTest();
-        }
-    }
-}
-
-
-void QGL2PaintEngineExPrivate::fillStencilWithVertexArray(const float *data,
-                                                          int count,
-                                                          int *stops,
-                                                          int stopCount,
-                                                          const QGLRect &bounds,
-                                                          StencilFillMode mode)
-{
-    Q_ASSERT(count || stops);
-
-//     qDebug("QGL2PaintEngineExPrivate::fillStencilWithVertexArray()");
-    glStencilMask(0xff); // Enable stencil writes
-
-    if (dirtyStencilRegion.intersects(currentScissorBounds)) {
-        const QRegion clearRegion = dirtyStencilRegion.intersected(currentScissorBounds);
-        glClearStencil(0); // Clear to zero
-        for (const QRect &rect : clearRegion) {
-#ifndef QT_GL_NO_SCISSOR_TEST
-            setScissor(rect);
-#endif
-            glClear(GL_STENCIL_BUFFER_BIT);
-        }
-
-        dirtyStencilRegion -= currentScissorBounds;
-
-#ifndef QT_GL_NO_SCISSOR_TEST
-        updateClipScissorTest();
-#endif
-    }
-
-    glColorMask(GL_FALSE, GL_FALSE, GL_FALSE, GL_FALSE); // Disable color writes
-    useSimpleShader();
-    glEnable(GL_STENCIL_TEST); // For some reason, this has to happen _after_ the simple shader is use()'d
-
-    if (mode == WindingFillMode) {
-        Q_ASSERT(stops && !count);
-        if (q->state()->clipTestEnabled) {
-            // Flatten clip values higher than current clip, and set high bit to match current clip
-            glStencilFunc(GL_LEQUAL, GL_STENCIL_HIGH_BIT | q->state()->currentClip, ~GL_STENCIL_HIGH_BIT);
-            glStencilOp(GL_KEEP, GL_REPLACE, GL_REPLACE);
-            composite(bounds);
-
-            glStencilFunc(GL_EQUAL, GL_STENCIL_HIGH_BIT, GL_STENCIL_HIGH_BIT);
-        } else if (!stencilClean) {
-            // Clear stencil buffer within bounding rect
-            glStencilFunc(GL_ALWAYS, 0, 0xff);
-            glStencilOp(GL_ZERO, GL_ZERO, GL_ZERO);
-            composite(bounds);
-        }
-
-        // Inc. for front-facing triangle
-        glStencilOpSeparate(GL_FRONT, GL_KEEP, GL_INCR_WRAP, GL_INCR_WRAP);
-        // Dec. for back-facing "holes"
-        glStencilOpSeparate(GL_BACK, GL_KEEP, GL_DECR_WRAP, GL_DECR_WRAP);
-        glStencilMask(~GL_STENCIL_HIGH_BIT);
-        drawVertexArrays(data, stops, stopCount, GL_TRIANGLE_FAN);
-
-        if (q->state()->clipTestEnabled) {
-            // Clear high bit of stencil outside of path
-            glStencilFunc(GL_EQUAL, q->state()->currentClip, ~GL_STENCIL_HIGH_BIT);
-            glStencilOp(GL_KEEP, GL_REPLACE, GL_REPLACE);
-            glStencilMask(GL_STENCIL_HIGH_BIT);
-            composite(bounds);
-        }
-    } else if (mode == OddEvenFillMode) {
-        glStencilMask(GL_STENCIL_HIGH_BIT);
-        glStencilOp(GL_KEEP, GL_KEEP, GL_INVERT); // Simply invert the stencil bit
-        drawVertexArrays(data, stops, stopCount, GL_TRIANGLE_FAN);
-
-    } else { // TriStripStrokeFillMode
-        Q_ASSERT(count && !stops); // tristrips generated directly, so no vertexArray or stops
-        glStencilMask(GL_STENCIL_HIGH_BIT);
-#if 0
-        glStencilOp(GL_KEEP, GL_KEEP, GL_INVERT); // Simply invert the stencil bit
-        setVertexAttributePointer(QT_VERTEX_COORDS_ATTR, data);
-        glDrawArrays(GL_TRIANGLE_STRIP, 0, count);
-#else
-
-        glStencilOp(GL_KEEP, GL_KEEP, GL_REPLACE);
-        if (q->state()->clipTestEnabled) {
-            glStencilFunc(GL_LEQUAL, q->state()->currentClip | GL_STENCIL_HIGH_BIT,
-                          ~GL_STENCIL_HIGH_BIT);
-        } else {
-            glStencilFunc(GL_ALWAYS, GL_STENCIL_HIGH_BIT, 0xff);
-        }
-        setVertexAttributePointer(QT_VERTEX_COORDS_ATTR, data);
-        glDrawArrays(GL_TRIANGLE_STRIP, 0, count);
-#endif
-    }
-
-    // Enable color writes & disable stencil writes
-    glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
-}
-
-/*
-    If the maximum value in the stencil buffer is GL_STENCIL_HIGH_BIT - 1,
-    restore the stencil buffer to a pristine state.  The current clip region
-    is set to 1, and the rest to 0.
-*/
-void QGL2PaintEngineExPrivate::resetClipIfNeeded()
-{
-    if (maxClip != (GL_STENCIL_HIGH_BIT - 1))
-        return;
-
-    Q_Q(QGL2PaintEngineEx);
-
-    useSimpleShader();
-    glEnable(GL_STENCIL_TEST);
-    glColorMask(GL_FALSE, GL_FALSE, GL_FALSE, GL_FALSE);
-
-    QRectF bounds = q->state()->matrix.inverted().mapRect(QRectF(0, 0, width, height));
-    QGLRect rect(bounds.left(), bounds.top(), bounds.right(), bounds.bottom());
-
-    // Set high bit on clip region
-    glStencilFunc(GL_LEQUAL, q->state()->currentClip, 0xff);
-    glStencilOp(GL_KEEP, GL_INVERT, GL_INVERT);
-    glStencilMask(GL_STENCIL_HIGH_BIT);
-    composite(rect);
-
-    // Reset clipping to 1 and everything else to zero
-    glStencilFunc(GL_NOTEQUAL, 0x01, GL_STENCIL_HIGH_BIT);
-    glStencilOp(GL_ZERO, GL_REPLACE, GL_REPLACE);
-    glStencilMask(0xff);
-    composite(rect);
-
-    q->state()->currentClip = 1;
-    q->state()->canRestoreClip = false;
-
-    maxClip = 1;
-
-    glStencilMask(0x0);
-    glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
-}
-
-bool QGL2PaintEngineExPrivate::prepareForCachedGlyphDraw(const QFontEngineGlyphCache &cache)
-{
-    Q_Q(QGL2PaintEngineEx);
-
-    Q_ASSERT(cache.transform().type() <= QTransform::TxScale);
-
-    QTransform &transform = q->state()->matrix;
-    transform.scale(1.0 / cache.transform().m11(), 1.0 / cache.transform().m22());
-    bool ret = prepareForDraw(false);
-    transform.scale(cache.transform().m11(), cache.transform().m22());
-
-    return ret;
-}
-
-bool QGL2PaintEngineExPrivate::prepareForDraw(bool srcPixelsAreOpaque)
-{
-    if (brushTextureDirty && mode != ImageDrawingMode && mode != ImageArrayDrawingMode)
-        updateBrushTexture();
-
-    if (compositionModeDirty)
-        updateCompositionMode();
-
-    if (matrixDirty)
-        updateMatrix();
-
-    const bool stateHasOpacity = q->state()->opacity < 0.99f;
-    if (q->state()->composition_mode == QPainter::CompositionMode_Source
-        || (q->state()->composition_mode == QPainter::CompositionMode_SourceOver
-            && srcPixelsAreOpaque && !stateHasOpacity))
-    {
-        glDisable(GL_BLEND);
-    } else {
-        glEnable(GL_BLEND);
-    }
-
-    QGLEngineShaderManager::OpacityMode opacityMode;
-    if (mode == ImageArrayDrawingMode) {
-        opacityMode = QGLEngineShaderManager::AttributeOpacity;
-    } else {
-        opacityMode = stateHasOpacity ? QGLEngineShaderManager::UniformOpacity
-                                      : QGLEngineShaderManager::NoOpacity;
-        if (stateHasOpacity && (mode != ImageDrawingMode)) {
-            // Using a brush
-            bool brushIsPattern = (currentBrush.style() >= Qt::Dense1Pattern) &&
-                                  (currentBrush.style() <= Qt::DiagCrossPattern);
-
-            if ((currentBrush.style() == Qt::SolidPattern) || brushIsPattern)
-                opacityMode = QGLEngineShaderManager::NoOpacity; // Global opacity handled by srcPixel shader
-        }
-    }
-    shaderManager->setOpacityMode(opacityMode);
-
-    bool changed = shaderManager->useCorrectShaderProg();
-    // If the shader program needs changing, we change it and mark all uniforms as dirty
-    if (changed) {
-        // The shader program has changed so mark all uniforms as dirty:
-        brushUniformsDirty = true;
-        opacityUniformDirty = true;
-        matrixUniformDirty = true;
-        translateZUniformDirty = true;
-    }
-
-    if (brushUniformsDirty && mode != ImageDrawingMode && mode != ImageArrayDrawingMode)
-        updateBrushUniforms();
-
-    if (opacityMode == QGLEngineShaderManager::UniformOpacity && opacityUniformDirty) {
-        shaderManager->currentProgram()->setUniformValue(location(QGLEngineShaderManager::GlobalOpacity), (GLfloat)q->state()->opacity);
-        opacityUniformDirty = false;
-    }
-
-    if (matrixUniformDirty && shaderManager->hasComplexGeometry()) {
-        shaderManager->currentProgram()->setUniformValue(location(QGLEngineShaderManager::Matrix),
-                                                         pmvMatrix);
-        matrixUniformDirty = false;
-    }
-
-    if (translateZUniformDirty && shaderManager->hasComplexGeometry()) {
-        shaderManager->currentProgram()->setUniformValue(location(QGLEngineShaderManager::TranslateZ),
-                                                         translateZ);
-        translateZUniformDirty = false;
-    }
-
-    return changed;
-}
-
-void QGL2PaintEngineExPrivate::composite(const QGLRect& boundingRect)
-{
-    setCoords(staticVertexCoordinateArray, boundingRect);
-    setVertexAttributePointer(QT_VERTEX_COORDS_ATTR, staticVertexCoordinateArray);
-    glDrawArrays(GL_TRIANGLE_FAN, 0, 4);
-}
-
-// Draws the vertex array as a set of <vertexArrayStops.size()> triangle fans.
-void QGL2PaintEngineExPrivate::drawVertexArrays(const float *data, int *stops, int stopCount,
-                                                GLenum primitive)
-{
-    // Now setup the pointer to the vertex array:
-    setVertexAttributePointer(QT_VERTEX_COORDS_ATTR, data);
-
-    int previousStop = 0;
-    for (int i=0; i<stopCount; ++i) {
-        int stop = stops[i];
-/*
-        qDebug("Drawing triangle fan for vertecies %d -> %d:", previousStop, stop-1);
-        for (int i=previousStop; i<stop; ++i)
-            qDebug("   %02d: [%.2f, %.2f]", i, vertexArray.data()[i].x, vertexArray.data()[i].y);
-*/
-        glDrawArrays(primitive, previousStop, stop - previousStop);
-        previousStop = stop;
-    }
-}
-
-/////////////////////////////////// Public Methods //////////////////////////////////////////
-
-QGL2PaintEngineEx::QGL2PaintEngineEx()
-    : QPaintEngineEx(*(new QGL2PaintEngineExPrivate(this)))
-{
-}
-
-QGL2PaintEngineEx::~QGL2PaintEngineEx()
-{
-}
-
-void QGL2PaintEngineEx::fill(const QVectorPath &path, const QBrush &brush)
-{
-    Q_D(QGL2PaintEngineEx);
-
-    if (qbrush_style(brush) == Qt::NoBrush)
-        return;
-    ensureActive();
-    d->setBrush(brush);
-    d->fill(path);
-}
-
-Q_GUI_EXPORT bool qt_scaleForTransform(const QTransform &transform, qreal *scale); // qtransform.cpp
-
-
-void QGL2PaintEngineEx::stroke(const QVectorPath &path, const QPen &pen)
-{
-    Q_D(QGL2PaintEngineEx);
-
-    const QBrush &penBrush = qpen_brush(pen);
-    if (qpen_style(pen) == Qt::NoPen || qbrush_style(penBrush) == Qt::NoBrush)
-        return;
-
-    QGL2PaintEngineState *s = state();
-    if (qt_pen_is_cosmetic(pen, s->renderHints) && !qt_scaleForTransform(s->transform(), 0)) {
-        // QTriangulatingStroker class is not meant to support cosmetically sheared strokes.
-        QPaintEngineEx::stroke(path, pen);
-        return;
-    }
-
-    ensureActive();
-    d->setBrush(penBrush);
-    d->stroke(path, pen);
-}
-
-void QGL2PaintEngineExPrivate::stroke(const QVectorPath &path, const QPen &pen)
-{
-    const QGL2PaintEngineState *s = q->state();
-    if (snapToPixelGrid) {
-        snapToPixelGrid = false;
-        matrixDirty = true;
-    }
-
-    const Qt::PenStyle penStyle = qpen_style(pen);
-    const QBrush &penBrush = qpen_brush(pen);
-    const bool opaque = penBrush.isOpaque() && s->opacity > 0.99;
-
-    transferMode(BrushDrawingMode);
-
-    // updateMatrix() is responsible for setting the inverse scale on
-    // the strokers, so we need to call it here and not wait for
-    // prepareForDraw() down below.
-    updateMatrix();
-
-    QRectF clip = q->state()->matrix.inverted().mapRect(q->state()->clipEnabled
-                                                        ? q->state()->rectangleClip
-                                                        : QRectF(0, 0, width, height));
-
-    if (penStyle == Qt::SolidLine) {
-        stroker.process(path, pen, clip, s->renderHints);
-
-    } else { // Some sort of dash
-        dasher.process(path, pen, clip, s->renderHints);
-
-        QVectorPath dashStroke(dasher.points(),
-                               dasher.elementCount(),
-                               dasher.elementTypes());
-        stroker.process(dashStroke, pen, clip, s->renderHints);
-    }
-
-    if (!stroker.vertexCount())
-        return;
-
-    if (opaque) {
-        prepareForDraw(opaque);
-        setVertexAttributePointer(QT_VERTEX_COORDS_ATTR, stroker.vertices());
-        glDrawArrays(GL_TRIANGLE_STRIP, 0, stroker.vertexCount() / 2);
-
-//         QBrush b(Qt::green);
-//         d->setBrush(&b);
-//         d->prepareForDraw(true);
-//         glDrawArrays(GL_LINE_STRIP, 0, d->stroker.vertexCount() / 2);
-
-    } else {
-        qreal width = qpen_widthf(pen) / 2;
-        if (width == 0)
-            width = 0.5;
-        qreal extra = pen.joinStyle() == Qt::MiterJoin
-                      ? qMax(pen.miterLimit() * width, width)
-                      : width;
-
-        if (qt_pen_is_cosmetic(pen, s->renderHints))
-            extra = extra * inverseScale;
-
-        QRectF bounds = path.controlPointRect().adjusted(-extra, -extra, extra, extra);
-
-        fillStencilWithVertexArray(stroker.vertices(), stroker.vertexCount() / 2,
-                                      0, 0, bounds, QGL2PaintEngineExPrivate::TriStripStrokeFillMode);
-
-        glStencilOp(GL_KEEP, GL_REPLACE, GL_REPLACE);
-
-        // Pass when any bit is set, replace stencil value with 0
-        glStencilFunc(GL_NOTEQUAL, 0, GL_STENCIL_HIGH_BIT);
-        prepareForDraw(false);
-
-        // Stencil the brush onto the dest buffer
-        composite(bounds);
-
-        glStencilMask(0);
-
-        updateClipScissorTest();
-    }
-}
-
-void QGL2PaintEngineEx::penChanged() { }
-void QGL2PaintEngineEx::brushChanged() { }
-void QGL2PaintEngineEx::brushOriginChanged() { }
-
-void QGL2PaintEngineEx::opacityChanged()
-{
-//    qDebug("QGL2PaintEngineEx::opacityChanged()");
-    Q_D(QGL2PaintEngineEx);
-    state()->opacityChanged = true;
-
-    Q_ASSERT(d->shaderManager);
-    d->brushUniformsDirty = true;
-    d->opacityUniformDirty = true;
-}
-
-void QGL2PaintEngineEx::compositionModeChanged()
-{
-//     qDebug("QGL2PaintEngineEx::compositionModeChanged()");
-    Q_D(QGL2PaintEngineEx);
-    state()->compositionModeChanged = true;
-    d->compositionModeDirty = true;
-}
-
-void QGL2PaintEngineEx::renderHintsChanged()
-{
-    Q_D(QGL2PaintEngineEx);
-    state()->renderHintsChanged = true;
-
-#if !defined(QT_OPENGL_ES_2)
-QT_WARNING_PUSH
-QT_WARNING_DISABLE_DEPRECATED
-    if (!d->ctx->contextHandle()->isOpenGLES()) {
-        if ((state()->renderHints & QPainter::Antialiasing)
-#if QT_DEPRECATED_SINCE(5, 14)
-            || (state()->renderHints & QPainter::HighQualityAntialiasing)
-#endif
-            )
-            d->glEnable(GL_MULTISAMPLE);
-        else
-            d->glDisable(GL_MULTISAMPLE);
-    }
-QT_WARNING_POP
-#endif
-
-    d->lastTextureUsed = GLuint(-1);
-    d->brushTextureDirty = true;
-//    qDebug("QGL2PaintEngineEx::renderHintsChanged() not implemented!");
-}
-
-void QGL2PaintEngineEx::transformChanged()
-{
-    Q_D(QGL2PaintEngineEx);
-    d->matrixDirty = true;
-    state()->matrixChanged = true;
-}
-
-
-static const QRectF scaleRect(const QRectF &r, qreal sx, qreal sy)
-{
-    return QRectF(r.x() * sx, r.y() * sy, r.width() * sx, r.height() * sy);
-}
-
-void QGL2PaintEngineEx::drawPixmap(const QRectF& dest, const QPixmap & pixmap, const QRectF & src)
-{
-    Q_D(QGL2PaintEngineEx);
-    QGLContext *ctx = d->ctx;
-
-    int max_texture_size = ctx->d_func()->maxTextureSize();
-    if (pixmap.width() > max_texture_size || pixmap.height() > max_texture_size) {
-        QPixmap scaled = pixmap.scaled(max_texture_size, max_texture_size, Qt::KeepAspectRatio);
-
-        const qreal sx = scaled.width() / qreal(pixmap.width());
-        const qreal sy = scaled.height() / qreal(pixmap.height());
-
-        drawPixmap(dest, scaled, scaleRect(src, sx, sy));
-        return;
-    }
-
-    ensureActive();
-    d->transferMode(ImageDrawingMode);
-
-    QGLContext::BindOptions bindOptions = QGLContext::InternalBindOption|QGLContext::CanFlipNativePixmapBindOption;
-#ifdef QGL_USE_TEXTURE_POOL
-    bindOptions |= QGLContext::TemporarilyCachedBindOption;
-#endif
-
-    d->glActiveTexture(GL_TEXTURE0 + QT_IMAGE_TEXTURE_UNIT);
-    QGLTexture *texture =
-        ctx->d_func()->bindTexture(pixmap, GL_TEXTURE_2D, GL_RGBA, bindOptions);
-
-    GLfloat top = texture->options & QGLContext::InvertedYBindOption ? (pixmap.height() - src.top()) : src.top();
-    GLfloat bottom = texture->options & QGLContext::InvertedYBindOption ? (pixmap.height() - src.bottom()) : src.bottom();
-    QGLRect srcRect(src.left(), top, src.right(), bottom);
-
-    bool isBitmap = pixmap.isQBitmap();
-    bool isOpaque = !isBitmap && !pixmap.hasAlpha();
-
-    d->updateTextureFilter(GL_TEXTURE_2D, GL_CLAMP_TO_EDGE,
-                           state()->renderHints & QPainter::SmoothPixmapTransform, texture->id);
-    d->drawTexture(dest, srcRect, pixmap.size(), isOpaque, isBitmap);
-
-    if (texture->options&QGLContext::TemporarilyCachedBindOption) {
-        // pixmap was temporarily cached as a QImage texture by pooling system
-        // and should be destroyed immediately
-        QGLTextureCache::instance()->remove(ctx, texture->id);
-    }
-}
-
-void QGL2PaintEngineEx::drawImage(const QRectF& dest, const QImage& image, const QRectF& src,
-                        Qt::ImageConversionFlags)
-{
-    Q_D(QGL2PaintEngineEx);
-    QGLContext *ctx = d->ctx;
-
-    int max_texture_size = ctx->d_func()->maxTextureSize();
-    if (image.width() > max_texture_size || image.height() > max_texture_size) {
-        QImage scaled = image.scaled(max_texture_size, max_texture_size, Qt::KeepAspectRatio);
-
-        const qreal sx = scaled.width() / qreal(image.width());
-        const qreal sy = scaled.height() / qreal(image.height());
-
-        drawImage(dest, scaled, scaleRect(src, sx, sy));
-        return;
-    }
-
-    ensureActive();
-    d->transferMode(ImageDrawingMode);
-
-    d->glActiveTexture(GL_TEXTURE0 + QT_IMAGE_TEXTURE_UNIT);
-
-    QGLContext::BindOptions bindOptions = QGLContext::InternalBindOption;
-#ifdef QGL_USE_TEXTURE_POOL
-    bindOptions |= QGLContext::TemporarilyCachedBindOption;
-#endif
-
-    QGLTexture *texture = ctx->d_func()->bindTexture(image, GL_TEXTURE_2D, GL_RGBA, bindOptions);
-    GLuint id = texture->id;
-
-    d->updateTextureFilter(GL_TEXTURE_2D, GL_CLAMP_TO_EDGE,
-                           state()->renderHints & QPainter::SmoothPixmapTransform, id);
-    d->drawTexture(dest, src, image.size(), !image.hasAlphaChannel());
-
-    if (texture->options&QGLContext::TemporarilyCachedBindOption) {
-        // image was temporarily cached by texture pooling system
-        // and should be destroyed immediately
-        QGLTextureCache::instance()->remove(ctx, texture->id);
-    }
-}
-
-void QGL2PaintEngineEx::drawStaticTextItem(QStaticTextItem *textItem)
-{
-    Q_D(QGL2PaintEngineEx);
-
-    ensureActive();
-
-    QPainterState *s = state();
-
-    // don't try to cache huge fonts or vastly transformed fonts
-    QFontEngine *fontEngine = textItem->fontEngine();
-    if (shouldDrawCachedGlyphs(fontEngine, s->matrix)) {
-
-        QFontEngine::GlyphFormat glyphFormat = fontEngine->glyphFormat != QFontEngine::Format_None
-                                                ? fontEngine->glyphFormat : d->glyphCacheFormat;
-
-        if (glyphFormat == QFontEngine::Format_A32) {
-            if (!QGLFramebufferObject::hasOpenGLFramebufferObjects()
-                || d->device->alphaRequested() || s->matrix.type() > QTransform::TxTranslate
-                || (s->composition_mode != QPainter::CompositionMode_Source
-                && s->composition_mode != QPainter::CompositionMode_SourceOver))
-            {
-                glyphFormat = QFontEngine::Format_A8;
-            }
-        }
-
-        d->drawCachedGlyphs(glyphFormat, textItem);
-    } else {
-        QPaintEngineEx::drawStaticTextItem(textItem);
-    }
-}
-
-bool QGL2PaintEngineEx::drawTexture(const QRectF &dest, GLuint textureId, const QSize &size, const QRectF &src)
-{
-    Q_D(QGL2PaintEngineEx);
-    if (!d->shaderManager)
-        return false;
-
-    ensureActive();
-    d->transferMode(ImageDrawingMode);
-
-    d->glActiveTexture(GL_TEXTURE0 + QT_IMAGE_TEXTURE_UNIT);
-    d->glBindTexture(GL_TEXTURE_2D, textureId);
-
-    QGLRect srcRect(src.left(), src.bottom(), src.right(), src.top());
-
-    d->updateTextureFilter(GL_TEXTURE_2D, GL_CLAMP_TO_EDGE,
-                           state()->renderHints & QPainter::SmoothPixmapTransform, textureId);
-    d->drawTexture(dest, srcRect, size, false);
-    return true;
-}
-
-void QGL2PaintEngineEx::drawTextItem(const QPointF &p, const QTextItem &textItem)
-{
-    Q_D(QGL2PaintEngineEx);
-
-    ensureActive();
-    QGL2PaintEngineState *s = state();
-
-    const QTextItemInt &ti = static_cast<const QTextItemInt &>(textItem);
-
-    QTransform::TransformationType txtype = s->matrix.type();
-
-    QFontEngine::GlyphFormat glyphFormat = ti.fontEngine->glyphFormat != QFontEngine::Format_None
-                                                ? ti.fontEngine->glyphFormat : d->glyphCacheFormat;
-
-    if (glyphFormat == QFontEngine::Format_A32) {
-        if (!QGLFramebufferObject::hasOpenGLFramebufferObjects()
-            || d->device->alphaRequested() || txtype > QTransform::TxTranslate
-            || (state()->composition_mode != QPainter::CompositionMode_Source
-            && state()->composition_mode != QPainter::CompositionMode_SourceOver))
-        {
-            glyphFormat = QFontEngine::Format_A8;
-        }
-    }
-
-    if (shouldDrawCachedGlyphs(ti.fontEngine, s->matrix)) {
-        QVarLengthArray<QFixedPoint> positions;
-        QVarLengthArray<glyph_t> glyphs;
-        QTransform matrix = QTransform::fromTranslate(p.x(), p.y());
-        ti.fontEngine->getGlyphPositions(ti.glyphs, matrix, ti.flags, glyphs, positions);
-
-        {
-            QStaticTextItem staticTextItem;
-            staticTextItem.setFontEngine(ti.fontEngine);
-            staticTextItem.glyphs = glyphs.data();
-            staticTextItem.numGlyphs = glyphs.size();
-            staticTextItem.glyphPositions = positions.data();
-
-            d->drawCachedGlyphs(glyphFormat, &staticTextItem);
-        }
-        return;
-    }
-
-    QPaintEngineEx::drawTextItem(p, ti);
-}
-
-namespace {
-
-    class QOpenGLStaticTextUserData: public QStaticTextUserData
-    {
-    public:
-        QOpenGLStaticTextUserData()
-            : QStaticTextUserData(OpenGLUserData), cacheSize(0, 0), cacheSerialNumber(0)
-        {
-        }
-
-        ~QOpenGLStaticTextUserData()
-        {
-        }
-
-        QSize cacheSize;
-        QGL2PEXVertexArray vertexCoordinateArray;
-        QGL2PEXVertexArray textureCoordinateArray;
-        QFontEngine::GlyphFormat glyphFormat;
-        int cacheSerialNumber;
-    };
-
-}
-
-
-// #define QT_OPENGL_DRAWCACHEDGLYPHS_INDEX_ARRAY_VBO
-
-void QGL2PaintEngineExPrivate::drawCachedGlyphs(QFontEngine::GlyphFormat glyphFormat,
-                                                QStaticTextItem *staticTextItem)
-{
-    Q_Q(QGL2PaintEngineEx);
-
-    QGL2PaintEngineState *s = q->state();
-
-    void *cacheKey = const_cast<QGLContext *>(QGLContextPrivate::contextGroup(ctx)->context());
-    bool recreateVertexArrays = false;
-
-    QTransform glyphCacheTransform;
-    QFontEngine *fe = staticTextItem->fontEngine();
-    if (fe->supportsTransformation(s->matrix)) {
-        // The font-engine supports rendering glyphs with the current transform, so we
-        // build a glyph-cache with the scale pre-applied, so that the cache contains
-        // glyphs with the appropriate resolution in the case of retina displays.
-        glyphCacheTransform = s->matrix.type() < QTransform::TxRotate ?
-            QTransform::fromScale(qAbs(s->matrix.m11()), qAbs(s->matrix.m22())) :
-            QTransform::fromScale(
-                QVector2D(s->matrix.m11(), s->matrix.m12()).length(),
-                QVector2D(s->matrix.m21(), s->matrix.m22()).length());
-    }
-
-    QGLTextureGlyphCache *cache =
-            (QGLTextureGlyphCache *) fe->glyphCache(cacheKey, glyphFormat, glyphCacheTransform);
-    if (!cache || cache->glyphFormat() != glyphFormat || cache->contextGroup() == 0) {
-        cache = new QGLTextureGlyphCache(glyphFormat, glyphCacheTransform);
-        fe->setGlyphCache(cacheKey, cache);
-        recreateVertexArrays = true;
-    }
-
-    if (staticTextItem->userDataNeedsUpdate) {
-        recreateVertexArrays = true;
-    } else if (staticTextItem->userData() == 0) {
-        recreateVertexArrays = true;
-    } else if (staticTextItem->userData()->type != QStaticTextUserData::OpenGLUserData) {
-        recreateVertexArrays = true;
-    } else {
-        QOpenGLStaticTextUserData *userData = static_cast<QOpenGLStaticTextUserData *>(staticTextItem->userData());
-        if (userData->glyphFormat != glyphFormat) {
-            recreateVertexArrays = true;
-        } else if (userData->cacheSerialNumber != cache->serialNumber()) {
-            recreateVertexArrays = true;
-        }
-    }
-
-    // We only need to update the cache with new glyphs if we are actually going to recreate the vertex arrays.
-    // If the cache size has changed, we do need to regenerate the vertices, but we don't need to repopulate the
-    // cache so this text is performed before we test if the cache size has changed.
-    if (recreateVertexArrays) {
-        cache->setPaintEnginePrivate(this);
-        if (!cache->populate(fe, staticTextItem->numGlyphs,
-                             staticTextItem->glyphs, staticTextItem->glyphPositions)) {
-            // No space for glyphs in cache. We need to reset it and try again.
-            cache->clear();
-            cache->populate(fe, staticTextItem->numGlyphs,
-                            staticTextItem->glyphs, staticTextItem->glyphPositions);
-        }
-        cache->fillInPendingGlyphs();
-    }
-
-    if (cache->width() == 0 || cache->height() == 0)
-        return;
-
-    transferMode(TextDrawingMode);
-
-    int margin = fe->glyphMargin(glyphFormat);
-
-    GLfloat dx = 1.0 / cache->width();
-    GLfloat dy = 1.0 / cache->height();
-
-    // Use global arrays by default
-    QGL2PEXVertexArray *vertexCoordinates = &vertexCoordinateArray;
-    QGL2PEXVertexArray *textureCoordinates = &textureCoordinateArray;
-
-    if (staticTextItem->useBackendOptimizations) {
-        QOpenGLStaticTextUserData *userData = 0;
-
-        if (staticTextItem->userData() == 0
-            || staticTextItem->userData()->type != QStaticTextUserData::OpenGLUserData) {
-
-            userData = new QOpenGLStaticTextUserData();
-            staticTextItem->setUserData(userData);
-
-        } else {
-            userData = static_cast<QOpenGLStaticTextUserData*>(staticTextItem->userData());
-        }
-
-        userData->glyphFormat = glyphFormat;
-        userData->cacheSerialNumber = cache->serialNumber();
-
-        // Use cache if backend optimizations is turned on
-        vertexCoordinates = &userData->vertexCoordinateArray;
-        textureCoordinates = &userData->textureCoordinateArray;
-
-        QSize size(cache->width(), cache->height());
-        if (userData->cacheSize != size) {
-            recreateVertexArrays = true;
-            userData->cacheSize = size;
-        }
-    }
-
-    if (recreateVertexArrays) {
-        vertexCoordinates->clear();
-        textureCoordinates->clear();
-
-        bool supportsSubPixelPositions = fe->supportsSubPixelPositions();
-        for (int i=0; i<staticTextItem->numGlyphs; ++i) {
-            QFixed subPixelPosition;
-            if (supportsSubPixelPositions)
-                subPixelPosition = fe->subPixelPositionForX(staticTextItem->glyphPositions[i].x);
-
-            QTextureGlyphCache::GlyphAndSubPixelPosition glyph(staticTextItem->glyphs[i], subPixelPosition);
-
-            const QTextureGlyphCache::Coord &c = cache->coords[glyph];
-            if (c.isNull())
-                continue;
-
-            int x = qFloor(staticTextItem->glyphPositions[i].x.toReal() * cache->transform().m11()) + c.baseLineX - margin;
-            int y = qRound(staticTextItem->glyphPositions[i].y.toReal() * cache->transform().m22()) - c.baseLineY - margin;
-
-            vertexCoordinates->addQuad(QRectF(x, y, c.w, c.h));
-            textureCoordinates->addQuad(QRectF(c.x*dx, c.y*dy, c.w * dx, c.h * dy));
-        }
-
-        staticTextItem->userDataNeedsUpdate = false;
-    }
-
-    int numGlyphs = vertexCoordinates->vertexCount() / 4;
-    if (numGlyphs == 0)
-        return;
-
-    if (elementIndices.size() < numGlyphs*6) {
-        Q_ASSERT(elementIndices.size() % 6 == 0);
-        int j = elementIndices.size() / 6 * 4;
-        while (j < numGlyphs*4) {
-            elementIndices.append(j + 0);
-            elementIndices.append(j + 0);
-            elementIndices.append(j + 1);
-            elementIndices.append(j + 2);
-            elementIndices.append(j + 3);
-            elementIndices.append(j + 3);
-
-            j += 4;
-        }
-
-#if defined(QT_OPENGL_DRAWCACHEDGLYPHS_INDEX_ARRAY_VBO)
-        if (elementIndicesVBOId == 0)
-            glGenBuffers(1, &elementIndicesVBOId);
-
-        glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, elementIndicesVBOId);
-        glBufferData(GL_ELEMENT_ARRAY_BUFFER, elementIndices.size() * sizeof(GLushort),
-                     elementIndices.constData(), GL_STATIC_DRAW);
-#endif
-    } else {
-#if defined(QT_OPENGL_DRAWCACHEDGLYPHS_INDEX_ARRAY_VBO)
-        glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, elementIndicesVBOId);
-#endif
-    }
-
-    setVertexAttributePointer(QT_VERTEX_COORDS_ATTR, (GLfloat*)vertexCoordinates->data());
-    setVertexAttributePointer(QT_TEXTURE_COORDS_ATTR, (GLfloat*)textureCoordinates->data());
-
-    if (!snapToPixelGrid) {
-        snapToPixelGrid = true;
-        matrixDirty = true;
-    }
-
-    QBrush pensBrush = q->state()->pen.brush();
-    setBrush(pensBrush);
-
-    if (glyphFormat == QFontEngine::Format_A32) {
-
-        // Subpixel antialiasing without gamma correction
-
-        QPainter::CompositionMode compMode = q->state()->composition_mode;
-        Q_ASSERT(compMode == QPainter::CompositionMode_Source
-            || compMode == QPainter::CompositionMode_SourceOver);
-
-        shaderManager->setMaskType(QGLEngineShaderManager::SubPixelMaskPass1);
-
-        if (pensBrush.style() == Qt::SolidPattern) {
-            // Solid patterns can get away with only one pass.
-            QColor c = pensBrush.color();
-            qreal oldOpacity = q->state()->opacity;
-            if (compMode == QPainter::CompositionMode_Source) {
-                c = qt_premultiplyColor(c, q->state()->opacity);
-                q->state()->opacity = 1;
-                opacityUniformDirty = true;
-            }
-
-            compositionModeDirty = false; // I can handle this myself, thank you very much
-            prepareForCachedGlyphDraw(*cache);
-
-            // prepareForCachedGlyphDraw() have set the opacity on the current shader, so the opacity state can now be reset.
-            if (compMode == QPainter::CompositionMode_Source) {
-                q->state()->opacity = oldOpacity;
-                opacityUniformDirty = true;
-            }
-
-            glEnable(GL_BLEND);
-            glBlendFunc(GL_CONSTANT_COLOR, GL_ONE_MINUS_SRC_COLOR);
-            glBlendColor(c.redF(), c.greenF(), c.blueF(), c.alphaF());
-        } else {
-            // Other brush styles need two passes.
-
-            qreal oldOpacity = q->state()->opacity;
-            if (compMode == QPainter::CompositionMode_Source) {
-                q->state()->opacity = 1;
-                opacityUniformDirty = true;
-                pensBrush = Qt::white;
-                setBrush(pensBrush);
-            }
-
-            compositionModeDirty = false; // I can handle this myself, thank you very much
-            prepareForCachedGlyphDraw(*cache);
-            glEnable(GL_BLEND);
-            glBlendFunc(GL_ZERO, GL_ONE_MINUS_SRC_COLOR);
-
-            glActiveTexture(GL_TEXTURE0 + QT_MASK_TEXTURE_UNIT);
-            glBindTexture(GL_TEXTURE_2D, cache->texture());
-            updateTextureFilter(GL_TEXTURE_2D, GL_REPEAT, false);
-
-#if defined(QT_OPENGL_DRAWCACHEDGLYPHS_INDEX_ARRAY_VBO)
-            glDrawElements(GL_TRIANGLE_STRIP, 6 * numGlyphs, GL_UNSIGNED_SHORT, 0);
-#else
-            glDrawElements(GL_TRIANGLE_STRIP, 6 * numGlyphs, GL_UNSIGNED_SHORT, elementIndices.data());
-#endif
-
-            shaderManager->setMaskType(QGLEngineShaderManager::SubPixelMaskPass2);
-
-            if (compMode == QPainter::CompositionMode_Source) {
-                q->state()->opacity = oldOpacity;
-                opacityUniformDirty = true;
-                pensBrush = q->state()->pen.brush();
-                setBrush(pensBrush);
-            }
-
-            compositionModeDirty = false;
-            prepareForCachedGlyphDraw(*cache);
-            glEnable(GL_BLEND);
-            glBlendFunc(GL_ONE, GL_ONE);
-        }
-        compositionModeDirty = true;
-    } else {
-        // Grayscale/mono glyphs
-
-        shaderManager->setMaskType(QGLEngineShaderManager::PixelMask);
-        prepareForCachedGlyphDraw(*cache);
-    }
-
-    QGLTextureGlyphCache::FilterMode filterMode = (s->matrix.type() > QTransform::TxTranslate)?QGLTextureGlyphCache::Linear:QGLTextureGlyphCache::Nearest;
-    if (lastMaskTextureUsed != cache->texture() || cache->filterMode() != filterMode) {
-
-        glActiveTexture(GL_TEXTURE0 + QT_MASK_TEXTURE_UNIT);
-        if (lastMaskTextureUsed != cache->texture()) {
-            glBindTexture(GL_TEXTURE_2D, cache->texture());
-            lastMaskTextureUsed = cache->texture();
-        }
-
-        if (cache->filterMode() != filterMode) {
-            if (filterMode == QGLTextureGlyphCache::Linear) {
-                glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-                glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-            } else {
-                glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
-                glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
-            }
-            cache->setFilterMode(filterMode);
-        }
-    }
-
-#if defined(QT_OPENGL_DRAWCACHEDGLYPHS_INDEX_ARRAY_VBO)
-    glDrawElements(GL_TRIANGLE_STRIP, 6 * numGlyphs, GL_UNSIGNED_SHORT, 0);
-    glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0);
-#else
-    glDrawElements(GL_TRIANGLE_STRIP, 6 * numGlyphs, GL_UNSIGNED_SHORT, elementIndices.data());
-#endif
-}
-
-void QGL2PaintEngineEx::drawPixmapFragments(const QPainter::PixmapFragment *fragments, int fragmentCount, const QPixmap &pixmap,
-                                            QPainter::PixmapFragmentHints hints)
-{
-    Q_D(QGL2PaintEngineEx);
-    // Use fallback for extended composition modes.
-    if (state()->composition_mode > QPainter::CompositionMode_Plus) {
-        QPaintEngineEx::drawPixmapFragments(fragments, fragmentCount, pixmap, hints);
-        return;
-    }
-
-    ensureActive();
-    int max_texture_size = d->ctx->d_func()->maxTextureSize();
-    if (pixmap.width() > max_texture_size || pixmap.height() > max_texture_size) {
-        QPixmap scaled = pixmap.scaled(max_texture_size, max_texture_size, Qt::KeepAspectRatio);
-        d->drawPixmapFragments(fragments, fragmentCount, scaled, hints);
-    } else {
-        d->drawPixmapFragments(fragments, fragmentCount, pixmap, hints);
-    }
-}
-
-
-void QGL2PaintEngineExPrivate::drawPixmapFragments(const QPainter::PixmapFragment *fragments,
-                                                   int fragmentCount, const QPixmap &pixmap,
-                                                   QPainter::PixmapFragmentHints hints)
-{
-    GLfloat dx = 1.0f / pixmap.size().width();
-    GLfloat dy = 1.0f / pixmap.size().height();
-
-    vertexCoordinateArray.clear();
-    textureCoordinateArray.clear();
-    opacityArray.reset();
-
-    if (snapToPixelGrid) {
-        snapToPixelGrid = false;
-        matrixDirty = true;
-    }
-
-    bool allOpaque = true;
-
-    for (int i = 0; i < fragmentCount; ++i) {
-        qreal s = 0;
-        qreal c = 1;
-        if (fragments[i].rotation != 0) {
-            s = qFastSin(qDegreesToRadians(fragments[i].rotation));
-            c = qFastCos(qDegreesToRadians(fragments[i].rotation));
-        }
-
-        qreal right = 0.5 * fragments[i].scaleX * fragments[i].width;
-        qreal bottom = 0.5 * fragments[i].scaleY * fragments[i].height;
-        QGLPoint bottomRight(right * c - bottom * s, right * s + bottom * c);
-        QGLPoint bottomLeft(-right * c - bottom * s, -right * s + bottom * c);
-
-        vertexCoordinateArray.addVertex(bottomRight.x + fragments[i].x, bottomRight.y + fragments[i].y);
-        vertexCoordinateArray.addVertex(-bottomLeft.x + fragments[i].x, -bottomLeft.y + fragments[i].y);
-        vertexCoordinateArray.addVertex(-bottomRight.x + fragments[i].x, -bottomRight.y + fragments[i].y);
-        vertexCoordinateArray.addVertex(-bottomRight.x + fragments[i].x, -bottomRight.y + fragments[i].y);
-        vertexCoordinateArray.addVertex(bottomLeft.x + fragments[i].x, bottomLeft.y + fragments[i].y);
-        vertexCoordinateArray.addVertex(bottomRight.x + fragments[i].x, bottomRight.y + fragments[i].y);
-
-        QGLRect src(fragments[i].sourceLeft * dx, fragments[i].sourceTop * dy,
-                    (fragments[i].sourceLeft + fragments[i].width) * dx,
-                    (fragments[i].sourceTop + fragments[i].height) * dy);
-
-        textureCoordinateArray.addVertex(src.right, src.bottom);
-        textureCoordinateArray.addVertex(src.right, src.top);
-        textureCoordinateArray.addVertex(src.left, src.top);
-        textureCoordinateArray.addVertex(src.left, src.top);
-        textureCoordinateArray.addVertex(src.left, src.bottom);
-        textureCoordinateArray.addVertex(src.right, src.bottom);
-
-        qreal opacity = fragments[i].opacity * q->state()->opacity;
-        opacityArray << opacity << opacity << opacity << opacity << opacity << opacity;
-        allOpaque &= (opacity >= 0.99f);
-    }
-
-    glActiveTexture(GL_TEXTURE0 + QT_IMAGE_TEXTURE_UNIT);
-    QGLTexture *texture = ctx->d_func()->bindTexture(pixmap, GL_TEXTURE_2D, GL_RGBA,
-                                                     QGLContext::InternalBindOption
-                                                     | QGLContext::CanFlipNativePixmapBindOption);
-
-    if (texture->options & QGLContext::InvertedYBindOption) {
-        // Flip texture y-coordinate.
-        QGLPoint *data = textureCoordinateArray.data();
-        for (int i = 0; i < 6 * fragmentCount; ++i)
-            data[i].y = 1 - data[i].y;
-    }
-
-    transferMode(ImageArrayDrawingMode);
-
-    bool isBitmap = pixmap.isQBitmap();
-    bool isOpaque = !isBitmap && (!pixmap.hasAlpha() || (hints & QPainter::OpaqueHint)) && allOpaque;
-
-    updateTextureFilter(GL_TEXTURE_2D, GL_CLAMP_TO_EDGE,
-                           q->state()->renderHints & QPainter::SmoothPixmapTransform, texture->id);
-
-    // Setup for texture drawing
-    currentBrush = noBrush;
-    shaderManager->setSrcPixelType(isBitmap ? QGLEngineShaderManager::PatternSrc
-                                            : QGLEngineShaderManager::ImageSrc);
-    if (prepareForDraw(isOpaque))
-        shaderManager->currentProgram()->setUniformValue(location(QGLEngineShaderManager::ImageTexture), QT_IMAGE_TEXTURE_UNIT);
-
-    if (isBitmap) {
-        QColor col = qt_premultiplyColor(q->state()->pen.color(), (GLfloat)q->state()->opacity);
-        shaderManager->currentProgram()->setUniformValue(location(QGLEngineShaderManager::PatternColor), col);
-    }
-
-    glDrawArrays(GL_TRIANGLES, 0, 6 * fragmentCount);
-}
-
-bool QGL2PaintEngineEx::begin(QPaintDevice *pdev)
-{
-    Q_D(QGL2PaintEngineEx);
-
-//     qDebug("QGL2PaintEngineEx::begin()");
-    if (pdev->devType() == QInternal::OpenGL)
-        d->device = static_cast<QGLPaintDevice*>(pdev);
-    else
-        d->device = QGLPaintDevice::getDevice(pdev);
-
-    if (!d->device)
-        return false;
-
-    d->ctx = d->device->context();
-    d->ctx->d_ptr->active_engine = this;
-
-    d->resetOpenGLContextActiveEngine();
-
-    const QSize sz = d->device->size();
-    d->width = sz.width();
-    d->height = sz.height();
-    d->mode = BrushDrawingMode;
-    d->brushTextureDirty = true;
-    d->brushUniformsDirty = true;
-    d->matrixUniformDirty = true;
-    d->matrixDirty = true;
-    d->compositionModeDirty = true;
-    d->opacityUniformDirty = true;
-    d->translateZUniformDirty = true;
-    d->needsSync = true;
-    d->useSystemClip = !systemClip().isEmpty();
-    d->currentBrush = QBrush();
-
-    d->dirtyStencilRegion = QRect(0, 0, d->width, d->height);
-    d->stencilClean = true;
-
-    // Calling begin paint should make the correct context current. So, any
-    // code which calls into GL or otherwise needs a current context *must*
-    // go after beginPaint:
-    d->device->beginPaint();
-
-    d->initializeOpenGLFunctions();
-
-    d->shaderManager = new QGLEngineShaderManager(d->ctx);
-
-    d->glDisable(GL_STENCIL_TEST);
-    d->glDisable(GL_DEPTH_TEST);
-    d->glDisable(GL_SCISSOR_TEST);
-
-#if !defined(QT_OPENGL_ES_2)
-    if (!d->ctx->contextHandle()->isOpenGLES())
-        d->glDisable(GL_MULTISAMPLE);
-#endif
-
-    d->glyphCacheFormat = QFontEngine::Format_A8;
-
-#if !defined(QT_OPENGL_ES_2)
-    if (!d->ctx->contextHandle()->isOpenGLES()) {
-        d->glyphCacheFormat = QFontEngine::Format_A32;
-        d->multisamplingAlwaysEnabled = false;
-    } else {
-        d->multisamplingAlwaysEnabled = d->device->format().sampleBuffers();
-    }
-#else
-    // OpenGL ES can't switch MSAA off, so if the gl paint device is
-    // multisampled, it's always multisampled.
-    d->multisamplingAlwaysEnabled = d->device->format().sampleBuffers();
-#endif
-
-    return true;
-}
-
-bool QGL2PaintEngineEx::end()
-{
-    Q_D(QGL2PaintEngineEx);
-
-    QGLContext *ctx = d->ctx;
-    d->glUseProgram(0);
-    d->transferMode(BrushDrawingMode);
-    d->device->endPaint();
-
-    ctx->d_ptr->active_engine = 0;
-    ctx->makeCurrent();
-    d->resetOpenGLContextActiveEngine();
-    d->resetGLState();
-
-    delete d->shaderManager;
-    d->shaderManager = 0;
-    d->currentBrush = QBrush();
-
-#ifdef QT_OPENGL_CACHE_AS_VBOS
-    if (!d->unusedVBOSToClean.isEmpty()) {
-        d->glDeleteBuffers(d->unusedVBOSToClean.size(), d->unusedVBOSToClean.constData());
-        d->unusedVBOSToClean.clear();
-    }
-    if (!d->unusedIBOSToClean.isEmpty()) {
-        d->glDeleteBuffers(d->unusedIBOSToClean.size(), d->unusedIBOSToClean.constData());
-        d->unusedIBOSToClean.clear();
-    }
-#endif
-
-    return false;
-}
-
-void QGL2PaintEngineEx::ensureActive()
-{
-    Q_D(QGL2PaintEngineEx);
-    QGLContext *ctx = d->ctx;
-
-    if (isActive() && (ctx->d_ptr->active_engine != this || d->resetOpenGLContextActiveEngine())) {
-        ctx->d_ptr->active_engine = this;
-        d->needsSync = true;
-    }
-
-    d->device->ensureActiveTarget();
-
-    if (d->needsSync) {
-        d->transferMode(BrushDrawingMode);
-        d->glViewport(0, 0, d->width, d->height);
-        d->needsSync = false;
-        d->lastMaskTextureUsed = 0;
-        d->shaderManager->setDirty();
-        d->ctx->d_func()->syncGlState();
-        for (int i = 0; i < 3; ++i)
-            d->vertexAttribPointers[i] = (GLfloat*)-1; // Assume the pointers are clobbered
-        setState(state());
-    }
-}
-
-void QGL2PaintEngineExPrivate::updateClipScissorTest()
-{
-    Q_Q(QGL2PaintEngineEx);
-    if (q->state()->clipTestEnabled) {
-        glEnable(GL_STENCIL_TEST);
-        glStencilFunc(GL_LEQUAL, q->state()->currentClip, ~GL_STENCIL_HIGH_BIT);
-    } else {
-        glDisable(GL_STENCIL_TEST);
-        glStencilFunc(GL_ALWAYS, 0, 0xff);
-    }
-
-#ifdef QT_GL_NO_SCISSOR_TEST
-    currentScissorBounds = QRect(0, 0, width, height);
-#else
-    QRect bounds = q->state()->rectangleClip;
-    if (!q->state()->clipEnabled) {
-        if (useSystemClip)
-            bounds = systemClip.boundingRect();
-        else
-            bounds = QRect(0, 0, width, height);
-    } else {
-        if (useSystemClip)
-            bounds = bounds.intersected(systemClip.boundingRect());
-        else
-            bounds = bounds.intersected(QRect(0, 0, width, height));
-    }
-
-    currentScissorBounds = bounds;
-
-    if (bounds == QRect(0, 0, width, height)) {
-        glDisable(GL_SCISSOR_TEST);
-    } else {
-        glEnable(GL_SCISSOR_TEST);
-        setScissor(bounds);
-    }
-#endif
-}
-
-void QGL2PaintEngineExPrivate::setScissor(const QRect &rect)
-{
-    const int left = rect.left();
-    const int width = rect.width();
-    int bottom = height - (rect.top() + rect.height());
-    if (device->isFlipped()) {
-        bottom = rect.top();
-    }
-    const int height = rect.height();
-
-    glScissor(left, bottom, width, height);
-}
-
-void QGL2PaintEngineEx::clipEnabledChanged()
-{
-    Q_D(QGL2PaintEngineEx);
-
-    state()->clipChanged = true;
-
-    if (painter()->hasClipping())
-        d->regenerateClip();
-    else
-        d->systemStateChanged();
-}
-
-void QGL2PaintEngineExPrivate::clearClip(uint value)
-{
-    dirtyStencilRegion -= currentScissorBounds;
-
-    glStencilMask(0xff);
-    glClearStencil(value);
-    glClear(GL_STENCIL_BUFFER_BIT);
-    glStencilMask(0x0);
-
-    q->state()->needsClipBufferClear = false;
-}
-
-void QGL2PaintEngineExPrivate::writeClip(const QVectorPath &path, uint value)
-{
-    transferMode(BrushDrawingMode);
-
-    if (snapToPixelGrid) {
-        snapToPixelGrid = false;
-        matrixDirty = true;
-    }
-
-    if (matrixDirty)
-        updateMatrix();
-
-    stencilClean = false;
-
-    const bool singlePass = !path.hasWindingFill()
-        && (((q->state()->currentClip == maxClip - 1) && q->state()->clipTestEnabled)
-            || q->state()->needsClipBufferClear);
-    const uint referenceClipValue = q->state()->needsClipBufferClear ? 1 : q->state()->currentClip;
-
-    if (q->state()->needsClipBufferClear)
-        clearClip(1);
-
-    if (path.isEmpty()) {
-        glEnable(GL_STENCIL_TEST);
-        glStencilFunc(GL_LEQUAL, value, ~GL_STENCIL_HIGH_BIT);
-        return;
-    }
-
-    if (q->state()->clipTestEnabled)
-        glStencilFunc(GL_LEQUAL, q->state()->currentClip, ~GL_STENCIL_HIGH_BIT);
-    else
-        glStencilFunc(GL_ALWAYS, 0, 0xff);
-
-    vertexCoordinateArray.clear();
-    vertexCoordinateArray.addPath(path, inverseScale, false);
-
-    if (!singlePass)
-        fillStencilWithVertexArray(vertexCoordinateArray, path.hasWindingFill());
-
-    glColorMask(false, false, false, false);
-    glEnable(GL_STENCIL_TEST);
-    useSimpleShader();
-
-    if (singlePass) {
-        // Under these conditions we can set the new stencil value in a single
-        // pass, by using the current value and the "new value" as the toggles
-
-        glStencilFunc(GL_LEQUAL, referenceClipValue, ~GL_STENCIL_HIGH_BIT);
-        glStencilOp(GL_KEEP, GL_INVERT, GL_INVERT);
-        glStencilMask(value ^ referenceClipValue);
-
-        drawVertexArrays(vertexCoordinateArray, GL_TRIANGLE_FAN);
-    } else {
-        glStencilOp(GL_KEEP, GL_REPLACE, GL_REPLACE);
-        glStencilMask(0xff);
-
-        if (!q->state()->clipTestEnabled && path.hasWindingFill()) {
-            // Pass when any clip bit is set, set high bit
-            glStencilFunc(GL_NOTEQUAL, GL_STENCIL_HIGH_BIT, ~GL_STENCIL_HIGH_BIT);
-            composite(vertexCoordinateArray.boundingRect());
-        }
-
-        // Pass when high bit is set, replace stencil value with new clip value
-        glStencilFunc(GL_NOTEQUAL, value, GL_STENCIL_HIGH_BIT);
-
-        composite(vertexCoordinateArray.boundingRect());
-    }
-
-    glStencilFunc(GL_LEQUAL, value, ~GL_STENCIL_HIGH_BIT);
-    glStencilMask(0);
-
-    glColorMask(true, true, true, true);
-}
-
-void QGL2PaintEngineEx::clip(const QVectorPath &path, Qt::ClipOperation op)
-{
-//     qDebug("QGL2PaintEngineEx::clip()");
-    Q_D(QGL2PaintEngineEx);
-
-    state()->clipChanged = true;
-
-    ensureActive();
-
-    if (op == Qt::ReplaceClip) {
-        op = Qt::IntersectClip;
-        if (d->hasClipOperations()) {
-            d->systemStateChanged();
-            state()->canRestoreClip = false;
-        }
-    }
-
-#ifndef QT_GL_NO_SCISSOR_TEST
-    if (!path.isEmpty() && op == Qt::IntersectClip && (path.shape() == QVectorPath::RectangleHint)) {
-        const QPointF* const points = reinterpret_cast<const QPointF*>(path.points());
-        QRectF rect(points[0], points[2]);
-
-        if (state()->matrix.type() <= QTransform::TxScale
-            || (state()->matrix.type() == QTransform::TxRotate
-                && qFuzzyIsNull(state()->matrix.m11())
-                && qFuzzyIsNull(state()->matrix.m22())))
-        {
-            state()->rectangleClip = state()->rectangleClip.intersected(state()->matrix.mapRect(rect).toRect());
-            d->updateClipScissorTest();
-            return;
-        }
-    }
-#endif
-
-    const QRect pathRect = state()->matrix.mapRect(path.controlPointRect()).toAlignedRect();
-
-    switch (op) {
-    case Qt::NoClip:
-        if (d->useSystemClip) {
-            state()->clipTestEnabled = true;
-            state()->currentClip = 1;
-        } else {
-            state()->clipTestEnabled = false;
-        }
-        state()->rectangleClip = QRect(0, 0, d->width, d->height);
-        state()->canRestoreClip = false;
-        d->updateClipScissorTest();
-        break;
-    case Qt::IntersectClip:
-        state()->rectangleClip = state()->rectangleClip.intersected(pathRect);
-        d->updateClipScissorTest();
-        d->resetClipIfNeeded();
-        ++d->maxClip;
-        d->writeClip(path, d->maxClip);
-        state()->currentClip = d->maxClip;
-        state()->clipTestEnabled = true;
-        break;
-    default:
-        break;
-    }
-}
-
-void QGL2PaintEngineExPrivate::regenerateClip()
-{
-    systemStateChanged();
-    replayClipOperations();
-}
-
-void QGL2PaintEngineExPrivate::systemStateChanged()
-{
-    Q_Q(QGL2PaintEngineEx);
-
-    q->state()->clipChanged = true;
-
-    if (systemClip.isEmpty()) {
-        useSystemClip = false;
-    } else {
-        if (q->paintDevice()->devType() == QInternal::Widget && currentClipDevice) {
-            QWidgetPrivate *widgetPrivate = qt_widget_private(static_cast<QWidget *>(currentClipDevice)->window());
-            useSystemClip = widgetPrivate->extra && widgetPrivate->extra->inRenderWithPainter;
-        } else {
-            useSystemClip = true;
-        }
-    }
-
-    q->state()->clipTestEnabled = false;
-    q->state()->needsClipBufferClear = true;
-
-    q->state()->currentClip = 1;
-    maxClip = 1;
-
-    q->state()->rectangleClip = useSystemClip ? systemClip.boundingRect() : QRect(0, 0, width, height);
-    updateClipScissorTest();
-
-    if (systemClip.rectCount() == 1) {
-        if (systemClip.boundingRect() == QRect(0, 0, width, height))
-            useSystemClip = false;
-#ifndef QT_GL_NO_SCISSOR_TEST
-        // scissoring takes care of the system clip
-        return;
-#endif
-    }
-
-    if (useSystemClip) {
-        clearClip(0);
-
-        QPainterPath path;
-        path.addRegion(systemClip);
-
-        q->state()->currentClip = 0;
-        writeClip(qtVectorPathForPath(q->state()->matrix.inverted().map(path)), 1);
-        q->state()->currentClip = 1;
-        q->state()->clipTestEnabled = true;
-    }
-}
-
-void QGL2PaintEngineEx::setTranslateZ(GLfloat z)
-{
-    Q_D(QGL2PaintEngineEx);
-    if (d->translateZ != z) {
-        d->translateZ = z;
-        d->translateZUniformDirty = true;
-    }
-}
-
-void QGL2PaintEngineEx::setState(QPainterState *new_state)
-{
-    //     qDebug("QGL2PaintEngineEx::setState()");
-
-    Q_D(QGL2PaintEngineEx);
-
-    QGL2PaintEngineState *s = static_cast<QGL2PaintEngineState *>(new_state);
-    QGL2PaintEngineState *old_state = state();
-
-    QPaintEngineEx::setState(s);
-
-    if (s->isNew) {
-        // Newly created state object.  The call to setState()
-        // will either be followed by a call to begin(), or we are
-        // setting the state as part of a save().
-        s->isNew = false;
-        return;
-    }
-
-    // Setting the state as part of a restore().
-
-    if (old_state == s || old_state->renderHintsChanged)
-        renderHintsChanged();
-
-    if (old_state == s || old_state->matrixChanged)
-        d->matrixDirty = true;
-
-    if (old_state == s || old_state->compositionModeChanged)
-        d->compositionModeDirty = true;
-
-    if (old_state == s || old_state->opacityChanged)
-        d->opacityUniformDirty = true;
-
-    if (old_state == s || old_state->clipChanged) {
-        if (old_state && old_state != s && old_state->canRestoreClip) {
-            d->updateClipScissorTest();
-            d->glDepthFunc(GL_LEQUAL);
-        } else {
-            d->regenerateClip();
-        }
-    }
-}
-
-QPainterState *QGL2PaintEngineEx::createState(QPainterState *orig) const
-{
-    if (orig)
-        const_cast<QGL2PaintEngineEx *>(this)->ensureActive();
-
-    QGL2PaintEngineState *s;
-    if (!orig)
-        s = new QGL2PaintEngineState();
-    else
-        s = new QGL2PaintEngineState(*static_cast<QGL2PaintEngineState *>(orig));
-
-    s->matrixChanged = false;
-    s->compositionModeChanged = false;
-    s->opacityChanged = false;
-    s->renderHintsChanged = false;
-    s->clipChanged = false;
-
-    return s;
-}
-
-QGL2PaintEngineState::QGL2PaintEngineState(QGL2PaintEngineState &other)
-    : QPainterState(other)
-{
-    isNew = true;
-    needsClipBufferClear = other.needsClipBufferClear;
-    clipTestEnabled = other.clipTestEnabled;
-    currentClip = other.currentClip;
-    canRestoreClip = other.canRestoreClip;
-    rectangleClip = other.rectangleClip;
-}
-
-QGL2PaintEngineState::QGL2PaintEngineState()
-{
-    isNew = true;
-    needsClipBufferClear = true;
-    clipTestEnabled = false;
-    canRestoreClip = true;
-}
-
-QGL2PaintEngineState::~QGL2PaintEngineState()
-{
-}
-
-QT_END_NAMESPACE
diff --git a/src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h b/src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h
deleted file mode 100644
index 762aac2f65..0000000000
--- a/src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h
+++ /dev/null
@@ -1,334 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtOpenGL module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QPAINTENGINEEX_OPENGL2_P_H
-#define QPAINTENGINEEX_OPENGL2_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include <QDebug>
-
-#include <private/qpaintengineex_p.h>
-#include <private/qglengineshadermanager_p.h>
-#include <private/qgl2pexvertexarray_p.h>
-#include <private/qglpaintdevice_p.h>
-#include <private/qfontengine_p.h>
-#include <private/qdatabuffer_p.h>
-#include <private/qtriangulatingstroker_p.h>
-#include <private/qopenglextensions_p.h>
-
-enum EngineMode {
-    ImageDrawingMode,
-    TextDrawingMode,
-    BrushDrawingMode,
-    ImageArrayDrawingMode
-};
-
-QT_BEGIN_NAMESPACE
-
-#define GL_STENCIL_HIGH_BIT         GLuint(0x80)
-#define QT_BRUSH_TEXTURE_UNIT       GLuint(0)
-#define QT_IMAGE_TEXTURE_UNIT       GLuint(0) //Can be the same as brush texture unit
-#define QT_MASK_TEXTURE_UNIT        GLuint(1)
-#define QT_BACKGROUND_TEXTURE_UNIT  GLuint(2)
-
-class QGL2PaintEngineExPrivate;
-
-
-class QGL2PaintEngineState : public QPainterState
-{
-public:
-    QGL2PaintEngineState(QGL2PaintEngineState &other);
-    QGL2PaintEngineState();
-    ~QGL2PaintEngineState();
-
-    uint isNew : 1;
-    uint needsClipBufferClear : 1;
-    uint clipTestEnabled : 1;
-    uint canRestoreClip : 1;
-    uint matrixChanged : 1;
-    uint compositionModeChanged : 1;
-    uint opacityChanged : 1;
-    uint renderHintsChanged : 1;
-    uint clipChanged : 1;
-    uint currentClip : 8;
-
-    QRect rectangleClip;
-};
-
-class Q_OPENGL_EXPORT QGL2PaintEngineEx : public QPaintEngineEx
-{
-    Q_DECLARE_PRIVATE(QGL2PaintEngineEx)
-public:
-    QGL2PaintEngineEx();
-    ~QGL2PaintEngineEx();
-
-    bool begin(QPaintDevice *device) override;
-    void ensureActive();
-    bool end() override;
-
-    virtual void clipEnabledChanged() override;
-    virtual void penChanged() override;
-    virtual void brushChanged() override;
-    virtual void brushOriginChanged() override;
-    virtual void opacityChanged() override;
-    virtual void compositionModeChanged() override;
-    virtual void renderHintsChanged() override;
-    virtual void transformChanged() override;
-
-    virtual void drawPixmap(const QRectF &r, const QPixmap &pm, const QRectF &sr) override;
-    virtual void drawPixmapFragments(const QPainter::PixmapFragment *fragments, int fragmentCount, const QPixmap &pixmap,
-                                     QPainter::PixmapFragmentHints hints) override;
-    virtual void drawImage(const QRectF &r, const QImage &pm, const QRectF &sr,
-                           Qt::ImageConversionFlags flags = Qt::AutoColor) override;
-    virtual void drawTextItem(const QPointF &p, const QTextItem &textItem) override;
-    virtual void fill(const QVectorPath &path, const QBrush &brush) override;
-    virtual void stroke(const QVectorPath &path, const QPen &pen) override;
-    virtual void clip(const QVectorPath &path, Qt::ClipOperation op) override;
-
-    virtual void drawStaticTextItem(QStaticTextItem *textItem) override;
-
-    bool drawTexture(const QRectF &r, GLuint textureId, const QSize &size, const QRectF &sr);
-
-    Type type() const override { return OpenGL2; }
-
-    virtual void setState(QPainterState *s) override;
-    virtual QPainterState *createState(QPainterState *orig) const override;
-    inline QGL2PaintEngineState *state() {
-        return static_cast<QGL2PaintEngineState *>(QPaintEngineEx::state());
-    }
-    inline const QGL2PaintEngineState *state() const {
-        return static_cast<const QGL2PaintEngineState *>(QPaintEngineEx::state());
-    }
-
-    void beginNativePainting() override;
-    void endNativePainting() override;
-
-    void invalidateState();
-
-    void setRenderTextActive(bool);
-
-    bool isNativePaintingActive() const;
-    bool requiresPretransformedGlyphPositions(QFontEngine *, const QTransform &) const override { return false; }
-    bool shouldDrawCachedGlyphs(QFontEngine *, const QTransform &) const override;
-
-    void setTranslateZ(GLfloat z);
-
-private:
-    Q_DISABLE_COPY_MOVE(QGL2PaintEngineEx)
-};
-
-class QGL2PaintEngineExPrivate : public QPaintEngineExPrivate, protected QOpenGLExtensions
-{
-    Q_DECLARE_PUBLIC(QGL2PaintEngineEx)
-public:
-    enum StencilFillMode {
-        OddEvenFillMode,
-        WindingFillMode,
-        TriStripStrokeFillMode
-    };
-
-    QGL2PaintEngineExPrivate(QGL2PaintEngineEx *q_ptr) :
-            q(q_ptr),
-            shaderManager(nullptr),
-            width(0), height(0),
-            ctx(nullptr),
-            useSystemClip(true),
-            elementIndicesVBOId(0),
-            opacityArray(0),
-            snapToPixelGrid(false),
-            nativePaintingActive(false),
-            inverseScale(1),
-            lastMaskTextureUsed(0),
-            translateZ(0)
-    { }
-
-    ~QGL2PaintEngineExPrivate();
-
-    void updateBrushTexture();
-    void updateBrushUniforms();
-    void updateMatrix();
-    void updateCompositionMode();
-    void updateTextureFilter(GLenum target, GLenum wrapMode, bool smoothPixmapTransform, GLuint id = GLuint(-1));
-
-    void resetGLState();
-    bool resetOpenGLContextActiveEngine();
-
-    // fill, stroke, drawTexture, drawPixmaps & drawCachedGlyphs are the main rendering entry-points,
-    // however writeClip can also be thought of as en entry point as it does similar things.
-    void fill(const QVectorPath &path);
-    void stroke(const QVectorPath &path, const QPen &pen);
-    void drawTexture(const QGLRect& dest, const QGLRect& src, const QSize &textureSize, bool opaque, bool pattern = false);
-    void drawPixmapFragments(const QPainter::PixmapFragment *fragments, int fragmentCount, const QPixmap &pixmap,
-                             QPainter::PixmapFragmentHints hints);
-    void drawCachedGlyphs(QFontEngine::GlyphFormat glyphFormat, QStaticTextItem *staticTextItem);
-
-    // Calls glVertexAttributePointer if the pointer has changed
-    inline void setVertexAttributePointer(unsigned int arrayIndex, const GLfloat *pointer);
-
-    // draws whatever is in the vertex array:
-    void drawVertexArrays(const float *data, int *stops, int stopCount, GLenum primitive);
-    void drawVertexArrays(QGL2PEXVertexArray &vertexArray, GLenum primitive) {
-        drawVertexArrays((const float *) vertexArray.data(), vertexArray.stops(), vertexArray.stopCount(), primitive);
-    }
-
-    // Composites the bounding rect onto dest buffer:
-    void composite(const QGLRect& boundingRect);
-
-    // Calls drawVertexArrays to render into stencil buffer:
-    void fillStencilWithVertexArray(const float *data, int count, int *stops, int stopCount, const QGLRect &bounds, StencilFillMode mode);
-    void fillStencilWithVertexArray(QGL2PEXVertexArray& vertexArray, bool useWindingFill) {
-        fillStencilWithVertexArray((const float *) vertexArray.data(), 0, vertexArray.stops(), vertexArray.stopCount(),
-                                   vertexArray.boundingRect(),
-                                   useWindingFill ? WindingFillMode : OddEvenFillMode);
-    }
-
-    void setBrush(const QBrush& brush);
-    void transferMode(EngineMode newMode);
-    bool prepareForDraw(bool srcPixelsAreOpaque); // returns true if the program has changed
-    bool prepareForCachedGlyphDraw(const QFontEngineGlyphCache &cache);
-    inline void useSimpleShader();
-    inline GLuint location(const QGLEngineShaderManager::Uniform uniform) {
-        return shaderManager->getUniformLocation(uniform);
-    }
-
-    void clearClip(uint value);
-    void writeClip(const QVectorPath &path, uint value);
-    void resetClipIfNeeded();
-
-    void updateClipScissorTest();
-    void setScissor(const QRect &rect);
-    void regenerateClip();
-    void systemStateChanged() override;
-
-
-    static QGLEngineShaderManager* shaderManagerForEngine(QGL2PaintEngineEx *engine) { return engine->d_func()->shaderManager; }
-    static QGL2PaintEngineExPrivate *getData(QGL2PaintEngineEx *engine) { return engine->d_func(); }
-    static void cleanupVectorPath(QPaintEngineEx *engine, void *data);
-
-
-    QGL2PaintEngineEx* q;
-    QGLEngineShaderManager* shaderManager;
-    QGLPaintDevice* device;
-    int width, height;
-    QGLContext *ctx;
-    EngineMode mode;
-    QFontEngine::GlyphFormat glyphCacheFormat;
-
-    // Dirty flags
-    bool matrixDirty; // Implies matrix uniforms are also dirty
-    bool compositionModeDirty;
-    bool brushTextureDirty;
-    bool brushUniformsDirty;
-    bool opacityUniformDirty;
-    bool matrixUniformDirty;
-    bool translateZUniformDirty;
-
-    bool stencilClean; // Has the stencil not been used for clipping so far?
-    bool useSystemClip;
-    QRegion dirtyStencilRegion;
-    QRect currentScissorBounds;
-    uint maxClip;
-
-    QBrush currentBrush; // May not be the state's brush!
-    const QBrush noBrush;
-
-    QPixmap currentBrushPixmap;
-
-    QGL2PEXVertexArray vertexCoordinateArray;
-    QGL2PEXVertexArray textureCoordinateArray;
-    QVector<GLushort> elementIndices;
-    GLuint elementIndicesVBOId;
-    QDataBuffer<GLfloat> opacityArray;
-    GLfloat staticVertexCoordinateArray[8];
-    GLfloat staticTextureCoordinateArray[8];
-
-    bool snapToPixelGrid;
-    bool nativePaintingActive;
-    GLfloat pmvMatrix[3][3];
-    GLfloat inverseScale;
-
-    GLuint lastTextureUsed;
-    GLuint lastMaskTextureUsed;
-
-    bool needsSync;
-    bool multisamplingAlwaysEnabled;
-
-    GLfloat depthRange[2];
-
-    float textureInvertedY;
-
-    QTriangulatingStroker stroker;
-    QDashedStrokeProcessor dasher;
-
-    QSet<QVectorPath::CacheEntry *> pathCaches;
-    QVector<GLuint> unusedVBOSToClean;
-    QVector<GLuint> unusedIBOSToClean;
-
-    const GLfloat *vertexAttribPointers[3];
-
-    GLfloat translateZ;
-};
-
-
-void QGL2PaintEngineExPrivate::setVertexAttributePointer(unsigned int arrayIndex, const GLfloat *pointer)
-{
-    Q_ASSERT(arrayIndex < 3);
-    if (pointer == vertexAttribPointers[arrayIndex])
-        return;
-
-    vertexAttribPointers[arrayIndex] = pointer;
-    if (arrayIndex == QT_OPACITY_ATTR)
-        glVertexAttribPointer(arrayIndex, 1, GL_FLOAT, GL_FALSE, 0, pointer);
-    else
-        glVertexAttribPointer(arrayIndex, 2, GL_FLOAT, GL_FALSE, 0, pointer);
-}
-
-QT_END_NAMESPACE
-
-#endif // QPAINTENGINEEX_OPENGL2_P_H
diff --git a/src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp b/src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp
deleted file mode 100644
index d5ce4efd1a..0000000000
--- a/src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp
+++ /dev/null
@@ -1,414 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtOpenGL module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qtextureglyphcache_gl_p.h"
-#include "qpaintengineex_opengl2_p.h"
-#include "qglfunctions.h"
-#include "private/qglengineshadersource_p.h"
-
-QT_BEGIN_NAMESPACE
-
-
-static int next_qgltextureglyphcache_serial_number()
-{
-    static QBasicAtomicInt serial = Q_BASIC_ATOMIC_INITIALIZER(0);
-    return 1 + serial.fetchAndAddRelaxed(1);
-}
-
-QGLTextureGlyphCache::QGLTextureGlyphCache(QFontEngine::GlyphFormat format, const QTransform &matrix)
-    : QImageTextureGlyphCache(format, matrix)
-    , m_textureResource(0)
-    , pex(0)
-    , m_blitProgram(0)
-    , m_filterMode(Nearest)
-    , m_serialNumber(next_qgltextureglyphcache_serial_number())
-{
-#ifdef QT_GL_TEXTURE_GLYPH_CACHE_DEBUG
-    qDebug(" -> QGLTextureGlyphCache() %p for context %p.", this, QOpenGLContext::currentContext());
-#endif
-    m_vertexCoordinateArray[0] = -1.0f;
-    m_vertexCoordinateArray[1] = -1.0f;
-    m_vertexCoordinateArray[2] =  1.0f;
-    m_vertexCoordinateArray[3] = -1.0f;
-    m_vertexCoordinateArray[4] =  1.0f;
-    m_vertexCoordinateArray[5] =  1.0f;
-    m_vertexCoordinateArray[6] = -1.0f;
-    m_vertexCoordinateArray[7] =  1.0f;
-
-    m_textureCoordinateArray[0] = 0.0f;
-    m_textureCoordinateArray[1] = 0.0f;
-    m_textureCoordinateArray[2] = 1.0f;
-    m_textureCoordinateArray[3] = 0.0f;
-    m_textureCoordinateArray[4] = 1.0f;
-    m_textureCoordinateArray[5] = 1.0f;
-    m_textureCoordinateArray[6] = 0.0f;
-    m_textureCoordinateArray[7] = 1.0f;
-}
-
-QGLTextureGlyphCache::~QGLTextureGlyphCache()
-{
-#ifdef QT_GL_TEXTURE_GLYPH_CACHE_DEBUG
-    qDebug(" -> ~QGLTextureGlyphCache() %p.", this);
-#endif
-    delete m_blitProgram;
-    if (m_textureResource)
-        m_textureResource->free();
-}
-
-void QGLTextureGlyphCache::createTextureData(int width, int height)
-{
-    QGLContext *ctx = const_cast<QGLContext *>(QGLContext::currentContext());
-    if (ctx == 0) {
-        qWarning("QGLTextureGlyphCache::createTextureData: Called with no context");
-        return;
-    }
-    QOpenGLFunctions *funcs = ctx->contextHandle()->functions();
-
-    // create in QImageTextureGlyphCache baseclass is meant to be called
-    // only to create the initial image and does not preserve the content,
-    // so we don't call when this function is called from resize.
-    if ((!QGLFramebufferObject::hasOpenGLFramebufferObjects() || ctx->d_ptr->workaround_brokenFBOReadBack) && image().isNull())
-        QImageTextureGlyphCache::createTextureData(width, height);
-
-    // Make the lower glyph texture size 16 x 16.
-    if (width < 16)
-        width = 16;
-    if (height < 16)
-        height = 16;
-
-    if (m_textureResource && !m_textureResource->m_texture) {
-        delete m_textureResource;
-        m_textureResource = 0;
-    }
-
-    if (!m_textureResource)
-        m_textureResource = new QGLGlyphTexture(ctx);
-
-    funcs->glGenTextures(1, &m_textureResource->m_texture);
-    funcs->glBindTexture(GL_TEXTURE_2D, m_textureResource->m_texture);
-
-    m_textureResource->m_width = width;
-    m_textureResource->m_height = height;
-
-    if (m_format == QFontEngine::Format_A32) {
-        QVarLengthArray<uchar> data(width * height * 4);
-        for (int i = 0; i < data.size(); ++i)
-            data[i] = 0;
-        funcs->glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, width, height, 0, GL_RGBA, GL_UNSIGNED_BYTE, &data[0]);
-    } else {
-        QVarLengthArray<uchar> data(width * height);
-        for (int i = 0; i < data.size(); ++i)
-            data[i] = 0;
-        funcs->glTexImage2D(GL_TEXTURE_2D, 0, GL_ALPHA, width, height, 0, GL_ALPHA, GL_UNSIGNED_BYTE, &data[0]);
-    }
-
-    funcs->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
-    funcs->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
-    funcs->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-    funcs->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-    m_filterMode = Nearest;
-}
-
-void QGLTextureGlyphCache::resizeTextureData(int width, int height)
-{
-    QGLContext *ctx = const_cast<QGLContext *>(QGLContext::currentContext());
-    if (ctx == 0) {
-        qWarning("QGLTextureGlyphCache::resizeTextureData: Called with no context");
-        return;
-    }
-    QOpenGLFunctions *funcs = ctx->contextHandle()->functions();
-
-    int oldWidth = m_textureResource->m_width;
-    int oldHeight = m_textureResource->m_height;
-
-    // Make the lower glyph texture size 16 x 16.
-    if (width < 16)
-        width = 16;
-    if (height < 16)
-        height = 16;
-
-    GLuint oldTexture = m_textureResource->m_texture;
-    createTextureData(width, height);
-
-    if (!QGLFramebufferObject::hasOpenGLFramebufferObjects() || ctx->d_ptr->workaround_brokenFBOReadBack) {
-        QImageTextureGlyphCache::resizeTextureData(width, height);
-        Q_ASSERT(image().depth() == 8);
-        funcs->glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, width, oldHeight, GL_ALPHA, GL_UNSIGNED_BYTE, image().constBits());
-        funcs->glDeleteTextures(1, &oldTexture);
-        return;
-    }
-
-    // ### the QTextureGlyphCache API needs to be reworked to allow
-    // ### resizeTextureData to fail
-
-    ctx->d_ptr->refreshCurrentFbo();
-
-    funcs->glBindFramebuffer(GL_FRAMEBUFFER, m_textureResource->m_fbo);
-
-    GLuint tmp_texture;
-    funcs->glGenTextures(1, &tmp_texture);
-    funcs->glBindTexture(GL_TEXTURE_2D, tmp_texture);
-    funcs->glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, oldWidth, oldHeight, 0,
-                        GL_RGBA, GL_UNSIGNED_BYTE, NULL);
-    funcs->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
-    funcs->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
-    funcs->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-    funcs->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-    m_filterMode = Nearest;
-    funcs->glBindTexture(GL_TEXTURE_2D, 0);
-    funcs->glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
-                                  GL_TEXTURE_2D, tmp_texture, 0);
-
-    funcs->glActiveTexture(GL_TEXTURE0 + QT_IMAGE_TEXTURE_UNIT);
-    funcs->glBindTexture(GL_TEXTURE_2D, oldTexture);
-
-    if (pex != 0)
-        pex->transferMode(BrushDrawingMode);
-
-    funcs->glDisable(GL_STENCIL_TEST);
-    funcs->glDisable(GL_DEPTH_TEST);
-    funcs->glDisable(GL_SCISSOR_TEST);
-    funcs->glDisable(GL_BLEND);
-
-    funcs->glViewport(0, 0, oldWidth, oldHeight);
-
-    QGLShaderProgram *blitProgram = 0;
-    if (pex == 0) {
-        if (m_blitProgram == 0) {
-            m_blitProgram = new QGLShaderProgram(ctx);
-
-            {
-                QString source;
-                source.append(QLatin1String(qglslMainWithTexCoordsVertexShader));
-                source.append(QLatin1String(qglslUntransformedPositionVertexShader));
-
-                QGLShader *vertexShader = new QGLShader(QGLShader::Vertex, m_blitProgram);
-                vertexShader->compileSourceCode(source);
-
-                m_blitProgram->addShader(vertexShader);
-            }
-
-            {
-                QString source;
-                source.append(QLatin1String(qglslMainFragmentShader));
-                source.append(QLatin1String(qglslImageSrcFragmentShader));
-
-                QGLShader *fragmentShader = new QGLShader(QGLShader::Fragment, m_blitProgram);
-                fragmentShader->compileSourceCode(source);
-
-                m_blitProgram->addShader(fragmentShader);
-            }
-
-            m_blitProgram->bindAttributeLocation("vertexCoordsArray", QT_VERTEX_COORDS_ATTR);
-            m_blitProgram->bindAttributeLocation("textureCoordArray", QT_TEXTURE_COORDS_ATTR);
-
-            m_blitProgram->link();
-        }
-
-        funcs->glVertexAttribPointer(QT_VERTEX_COORDS_ATTR, 2, GL_FLOAT, GL_FALSE, 0, m_vertexCoordinateArray);
-        funcs->glVertexAttribPointer(QT_TEXTURE_COORDS_ATTR, 2, GL_FLOAT, GL_FALSE, 0, m_textureCoordinateArray);
-
-        m_blitProgram->bind();
-        m_blitProgram->enableAttributeArray(int(QT_VERTEX_COORDS_ATTR));
-        m_blitProgram->enableAttributeArray(int(QT_TEXTURE_COORDS_ATTR));
-        m_blitProgram->disableAttributeArray(int(QT_OPACITY_ATTR));
-
-        blitProgram = m_blitProgram;
-
-    } else {
-        pex->setVertexAttributePointer(QT_VERTEX_COORDS_ATTR, m_vertexCoordinateArray);
-        pex->setVertexAttributePointer(QT_TEXTURE_COORDS_ATTR, m_textureCoordinateArray);
-
-        pex->shaderManager->useBlitProgram();
-        blitProgram = pex->shaderManager->blitProgram();
-    }
-
-    blitProgram->setUniformValue("imageTexture", QT_IMAGE_TEXTURE_UNIT);
-
-    funcs->glDrawArrays(GL_TRIANGLE_FAN, 0, 4);
-
-    funcs->glBindTexture(GL_TEXTURE_2D, m_textureResource->m_texture);
-
-    funcs->glCopyTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, 0, 0, oldWidth, oldHeight);
-
-    funcs->glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
-                                     GL_RENDERBUFFER, 0);
-    funcs->glDeleteTextures(1, &tmp_texture);
-    funcs->glDeleteTextures(1, &oldTexture);
-
-    funcs->glBindFramebuffer(GL_FRAMEBUFFER, ctx->d_ptr->current_fbo);
-
-    if (pex != 0) {
-        funcs->glViewport(0, 0, pex->width, pex->height);
-        pex->updateClipScissorTest();
-    }
-}
-
-void QGLTextureGlyphCache::fillTexture(const Coord &c, glyph_t glyph, QFixed subPixelPosition)
-{
-    QGLContext *ctx = const_cast<QGLContext *>(QGLContext::currentContext());
-    if (ctx == 0) {
-        qWarning("QGLTextureGlyphCache::fillTexture: Called with no context");
-        return;
-    }
-    QOpenGLFunctions *funcs = ctx->contextHandle()->functions();
-
-    if (!QGLFramebufferObject::hasOpenGLFramebufferObjects() || ctx->d_ptr->workaround_brokenFBOReadBack) {
-        QImageTextureGlyphCache::fillTexture(c, glyph, subPixelPosition);
-
-        funcs->glBindTexture(GL_TEXTURE_2D, m_textureResource->m_texture);
-        const QImage &texture = image();
-        const uchar *bits = texture.constBits();
-        bits += c.y * texture.bytesPerLine() + c.x;
-        for (int i=0; i<c.h; ++i) {
-            funcs->glTexSubImage2D(GL_TEXTURE_2D, 0, c.x, c.y + i, c.w, 1, GL_ALPHA, GL_UNSIGNED_BYTE, bits);
-            bits += texture.bytesPerLine();
-        }
-        return;
-    }
-
-    QImage mask = textureMapForGlyph(glyph, subPixelPosition);
-    const int maskWidth = mask.width();
-    const int maskHeight = mask.height();
-
-    if (mask.format() == QImage::Format_Mono) {
-        mask = mask.convertToFormat(QImage::Format_Indexed8);
-        for (int y = 0; y < maskHeight; ++y) {
-            uchar *src = (uchar *) mask.scanLine(y);
-            for (int x = 0; x < maskWidth; ++x)
-                src[x] = -src[x]; // convert 0 and 1 into 0 and 255
-        }
-    } else if (mask.depth() == 32) {
-        // Make the alpha component equal to the average of the RGB values.
-        // This is needed when drawing sub-pixel antialiased text on translucent targets.
-        for (int y = 0; y < maskHeight; ++y) {
-            quint32 *src = (quint32 *) mask.scanLine(y);
-            for (int x = 0; x < maskWidth; ++x) {
-                int r = qRed(src[x]);
-                int g = qGreen(src[x]);
-                int b = qBlue(src[x]);
-                int avg;
-                if (mask.format() == QImage::Format_RGB32)
-                    avg = (r + g + b + 1) / 3; // "+1" for rounding.
-                else // Format_ARGB_Premultiplied
-                    avg = qAlpha(src[x]);
-                if (ctx->contextHandle()->isOpenGLES()) {
-                    // swizzle the bits to accommodate for the GL_RGBA upload.
-                    src[x] = (avg << 24) | (r << 0) | (g << 8) | (b << 16);
-                } else {
-                    src[x] = (src[x] & 0x00ffffff) | (avg << 24);
-                }
-            }
-        }
-    }
-
-    funcs->glBindTexture(GL_TEXTURE_2D, m_textureResource->m_texture);
-    if (mask.depth() == 32) {
-        GLenum format = GL_RGBA;
-#if !defined(QT_OPENGL_ES_2)
-        if (!ctx->contextHandle()->isOpenGLES())
-            format = GL_BGRA;
-#endif
-        funcs->glTexSubImage2D(GL_TEXTURE_2D, 0, c.x, c.y, maskWidth, maskHeight, format, GL_UNSIGNED_BYTE, mask.bits());
-    } else {
-        // glTexSubImage2D() might cause some garbage to appear in the texture if the mask width is
-        // not a multiple of four bytes. The bug appeared on a computer with 32-bit Windows Vista
-        // and nVidia GeForce 8500GT. GL_UNPACK_ALIGNMENT is set to four bytes, 'mask' has a
-        // multiple of four bytes per line, and most of the glyph shows up correctly in the
-        // texture, which makes me think that this is a driver bug.
-        // One workaround is to make sure the mask width is a multiple of four bytes, for instance
-        // by converting it to a format with four bytes per pixel. Another is to copy one line at a
-        // time.
-
-        if (!ctx->d_ptr->workaround_brokenAlphaTexSubImage_init) {
-            // don't know which driver versions exhibit this bug, so be conservative for now
-            const QByteArray vendorString(reinterpret_cast<const char*>(funcs->glGetString(GL_VENDOR)));
-            ctx->d_ptr->workaround_brokenAlphaTexSubImage = vendorString.indexOf("NVIDIA") >= 0;
-            ctx->d_ptr->workaround_brokenAlphaTexSubImage_init = true;
-        }
-
-        if (ctx->d_ptr->workaround_brokenAlphaTexSubImage) {
-            for (int i = 0; i < maskHeight; ++i)
-                funcs->glTexSubImage2D(GL_TEXTURE_2D, 0, c.x, c.y + i, maskWidth, 1, GL_ALPHA, GL_UNSIGNED_BYTE, mask.scanLine(i));
-        } else {
-            funcs->glTexSubImage2D(GL_TEXTURE_2D, 0, c.x, c.y, maskWidth, maskHeight, GL_ALPHA, GL_UNSIGNED_BYTE, mask.bits());
-        }
-    }
-}
-
-int QGLTextureGlyphCache::glyphPadding() const
-{
-    return 1;
-}
-
-int QGLTextureGlyphCache::maxTextureWidth() const
-{
-    QGLContext *ctx = const_cast<QGLContext *>(QGLContext::currentContext());
-    if (ctx == 0)
-        return QImageTextureGlyphCache::maxTextureWidth();
-    else
-        return ctx->d_ptr->maxTextureSize();
-}
-
-int QGLTextureGlyphCache::maxTextureHeight() const
-{
-    QGLContext *ctx = const_cast<QGLContext *>(QGLContext::currentContext());
-    if (ctx == 0)
-        return QImageTextureGlyphCache::maxTextureHeight();
-
-    if (ctx->d_ptr->workaround_brokenTexSubImage)
-        return qMin(1024, ctx->d_ptr->maxTextureSize());
-    else
-        return ctx->d_ptr->maxTextureSize();
-}
-
-void QGLTextureGlyphCache::clear()
-{
-    m_textureResource->free();
-    m_textureResource = 0;
-
-    m_w = 0;
-    m_h = 0;
-    m_cx = 0;
-    m_cy = 0;
-    m_currentRowHeight = 0;
-    coords.clear();
-}
-
-QT_END_NAMESPACE
diff --git a/src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h b/src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h
deleted file mode 100644
index 7c12ce8998..0000000000
--- a/src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h
+++ /dev/null
@@ -1,171 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtOpenGL module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QTEXTUREGLYPHCACHE_GL_P_H
-#define QTEXTUREGLYPHCACHE_GL_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API. It exists purely as an
-// implementation detail. This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include <private/qtextureglyphcache_p.h>
-#include <private/qgl_p.h>
-#include <qglshaderprogram.h>
-#include <qglframebufferobject.h>
-#include <qopenglfunctions.h>
-
-// #define QT_GL_TEXTURE_GLYPH_CACHE_DEBUG
-
-QT_BEGIN_NAMESPACE
-
-class QGL2PaintEngineExPrivate;
-
-struct QGLGlyphTexture : public QOpenGLSharedResource
-{
-    QGLGlyphTexture(const QGLContext *ctx)
-        : QOpenGLSharedResource(ctx->contextHandle()->shareGroup())
-        , m_fbo(0)
-        , m_width(0)
-        , m_height(0)
-    {
-        if (ctx && QGLFramebufferObject::hasOpenGLFramebufferObjects() && !ctx->d_ptr->workaround_brokenFBOReadBack)
-            ctx->contextHandle()->functions()->glGenFramebuffers(1, &m_fbo);
-
-#ifdef QT_GL_TEXTURE_GLYPH_CACHE_DEBUG
-        qDebug(" -> QGLGlyphTexture() %p for context %p.", this, ctx);
-#endif
-    }
-
-    void freeResource(QOpenGLContext *context) override
-    {
-        const QGLContext *ctx = QGLContext::fromOpenGLContext(context);
-#ifdef QT_GL_TEXTURE_GLYPH_CACHE_DEBUG
-        qDebug("~QGLGlyphTexture() %p for context %p.", this, ctx);
-#else
-        Q_UNUSED(ctx);
-#endif
-        if (ctx && m_fbo)
-            ctx->contextHandle()->functions()->glDeleteFramebuffers(1, &m_fbo);
-        if (m_width || m_height)
-            ctx->contextHandle()->functions()->glDeleteTextures(1, &m_texture);
-    }
-
-    void invalidateResource() override
-    {
-        m_texture = 0;
-        m_fbo = 0;
-        m_width = 0;
-        m_height = 0;
-    }
-
-    GLuint m_texture;
-    GLuint m_fbo;
-    int m_width;
-    int m_height;
-};
-
-class Q_OPENGL_EXPORT QGLTextureGlyphCache : public QImageTextureGlyphCache
-{
-public:
-    QGLTextureGlyphCache(QFontEngine::GlyphFormat format, const QTransform &matrix);
-    ~QGLTextureGlyphCache();
-
-    virtual void createTextureData(int width, int height) override;
-    virtual void resizeTextureData(int width, int height) override;
-    virtual void fillTexture(const Coord &c, glyph_t glyph, QFixed subPixelPosition) override;
-    virtual int glyphPadding() const override;
-    virtual int maxTextureWidth() const override;
-    virtual int maxTextureHeight() const override;
-
-    inline GLuint texture() const {
-        QGLTextureGlyphCache *that = const_cast<QGLTextureGlyphCache *>(this);
-        QGLGlyphTexture *glyphTexture = that->m_textureResource;
-        return glyphTexture ? glyphTexture->m_texture : 0;
-    }
-
-    inline int width() const {
-        QGLTextureGlyphCache *that = const_cast<QGLTextureGlyphCache *>(this);
-        QGLGlyphTexture *glyphTexture = that->m_textureResource;
-        return glyphTexture ? glyphTexture->m_width : 0;
-    }
-    inline int height() const {
-        QGLTextureGlyphCache *that = const_cast<QGLTextureGlyphCache *>(this);
-        QGLGlyphTexture *glyphTexture = that->m_textureResource;
-        return glyphTexture ? glyphTexture->m_height : 0;
-    }
-
-    inline void setPaintEnginePrivate(QGL2PaintEngineExPrivate *p) { pex = p; }
-
-    inline const QOpenGLContextGroup *contextGroup() const { return m_textureResource ? m_textureResource->group() : nullptr; }
-
-    inline int serialNumber() const { return m_serialNumber; }
-
-    enum FilterMode {
-        Nearest,
-        Linear
-    };
-    FilterMode filterMode() const { return m_filterMode; }
-    void setFilterMode(FilterMode m) { m_filterMode = m; }
-
-    void clear();
-
-private:
-    QGLGlyphTexture *m_textureResource;
-
-    QGL2PaintEngineExPrivate *pex;
-    QGLShaderProgram *m_blitProgram;
-    FilterMode m_filterMode;
-
-    GLfloat m_vertexCoordinateArray[8];
-    GLfloat m_textureCoordinateArray[8];
-
-    int m_serialNumber;
-};
-
-QT_END_NAMESPACE
-
-#endif
-
diff --git a/src/opengl/opengl.pro b/src/opengl/opengl.pro
index 8b2349ff2f..bf4ba63053 100644
--- a/src/opengl/opengl.pro
+++ b/src/opengl/opengl.pro
@@ -1,57 +1,67 @@
 TARGET     = QtOpenGL
-QT         = core-private gui-private widgets-private
+QT         = core-private gui-private
 
 DEFINES   += QT_NO_USING_NAMESPACE QT_NO_FOREACH
 
-msvc:equals(QT_ARCH, i386): QMAKE_LFLAGS += /BASE:0x63000000
-solaris-cc*:QMAKE_CXXFLAGS_RELEASE -= -O2
-
 QMAKE_DOCS = $$PWD/doc/qtopengl.qdocconf
 
 qtConfig(opengl): CONFIG += opengl
 qtConfig(opengles2): CONFIG += opengles2
 
-HEADERS += qgl.h \
-           qgl_p.h \
-           qglcolormap.h \
-           qglfunctions.h \
-           qglpixelbuffer.h \
-           qglpixelbuffer_p.h \
-           qglframebufferobject.h  \
-           qglframebufferobject_p.h  \
-           qglpaintdevice_p.h \
-           qglbuffer.h \
-           qtopenglglobal.h
-
-SOURCES += qgl.cpp \
-           qglcolormap.cpp \
-           qglfunctions.cpp \
-           qglpixelbuffer.cpp \
-           qglframebufferobject.cpp \
-           qglpaintdevice.cpp \
-           qglbuffer.cpp \
-
-HEADERS +=  qglshaderprogram.h \
-            gl2paintengineex/qglgradientcache_p.h \
-            gl2paintengineex/qglengineshadermanager_p.h \
-            gl2paintengineex/qgl2pexvertexarray_p.h \
-            gl2paintengineex/qpaintengineex_opengl2_p.h \
-            gl2paintengineex/qglengineshadersource_p.h \
-            gl2paintengineex/qglcustomshaderstage_p.h \
-            gl2paintengineex/qtextureglyphcache_gl_p.h \
-            gl2paintengineex/qglshadercache_p.h
-
-SOURCES +=  qglshaderprogram.cpp \
-            gl2paintengineex/qglgradientcache.cpp \
-            gl2paintengineex/qglengineshadermanager.cpp \
-            gl2paintengineex/qgl2pexvertexarray.cpp \
-            gl2paintengineex/qpaintengineex_opengl2.cpp \
-            gl2paintengineex/qglcustomshaderstage.cpp \
-            gl2paintengineex/qtextureglyphcache_gl.cpp
-
-qtConfig(graphicseffect) {
-    HEADERS += qgraphicsshadereffect_p.h
-    SOURCES += qgraphicsshadereffect.cpp
+HEADERS += \
+    qopengl2pexvertexarray_p.h \
+    qopenglbuffer.h \
+    qopenglcustomshaderstage_p.h \
+    qopengldebug.h \
+    qopenglengineshadermanager_p.h \
+    qopenglengineshadersource_p.h \
+    qopenglframebufferobject.h \
+    qopenglframebufferobject_p.h \
+    qopenglgradientcache_p.h \
+    qopenglpaintdevice.h \
+    qopenglpaintdevice_p.h \
+    qopenglpaintengine_p.h \
+    qopenglpixeltransferoptions.h \
+    qopenglshadercache_p.h \
+    qopenglshaderprogram.h \
+    qopengltexture.h \
+    qopengltexture_p.h \
+    qopengltexturehelper_p.h \
+    qopengltextureblitter.h \
+    qopengltexturecache_p.h \
+    qopengltextureglyphcache_p.h \
+    qopengltextureuploader_p.h \
+    qopenglvertexarrayobject.h \
+    qopenglwindow.h \
+    qtopenglglobal.h
+
+SOURCES += \
+    qopengl2pexvertexarray.cpp \
+    qopenglbuffer.cpp \
+    qopenglcustomshaderstage.cpp \
+    qopenglengineshadermanager.cpp \
+    qopenglframebufferobject.cpp \
+    qopenglgradientcache.cpp \
+    qopenglpaintdevice.cpp \
+    qopenglpaintengine.cpp \
+    qopenglpixeltransferoptions.cpp \
+    qopenglshaderprogram.cpp \
+    qopengltexture.cpp \
+    qopengltexturehelper.cpp \
+    qopengltextureblitter.cpp \
+    qopengltexturecache.cpp \
+    qopengltextureglyphcache.cpp \
+    qopengltextureuploader.cpp \
+    qopenglvertexarrayobject.cpp \
+    qopenglwindow.cpp \
+    qopengldebug.cpp
+
+!qtConfig(opengles2) {
+    HEADERS += \
+        qopenglqueryhelper_p.h \
+        qopengltimerquery.h
+
+    SOURCES += qopengltimerquery.cpp
 }
 
 load(qt_module)
diff --git a/src/opengl/qgl.cpp b/src/opengl/qgl.cpp
deleted file mode 100644
index 4108b70094..0000000000
--- a/src/opengl/qgl.cpp
+++ /dev/null
@@ -1,5558 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtOpenGL module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qapplication.h"
-#include "qplatformdefs.h"
-#include "qgl.h"
-#include <qdebug.h>
-#include <qglfunctions.h>
-
-#include <qdatetime.h>
-
-#include <stdlib.h> // malloc
-
-#include "qpixmap.h"
-#include "qimage.h"
-#include "qgl_p.h"
-
-#include "gl2paintengineex/qpaintengineex_opengl2_p.h"
-
-#include <qpa/qplatformopenglcontext.h>
-
-#include <qglpixelbuffer.h>
-#include <qglframebufferobject.h>
-#include <private/qopenglextensions_p.h>
-
-#include <private/qimage_p.h>
-#include <qpa/qplatformpixmap.h>
-#include <private/qglpixelbuffer_p.h>
-#include <private/qimagepixmapcleanuphooks_p.h>
-#include "qcolormap.h"
-#include "qfile.h"
-#include <qmutex.h>
-
-#include "qsurfaceformat.h"
-#include <private/qapplication_p.h>
-#include <qpa/qplatformopenglcontext.h>
-#include <qpa/qplatformwindow.h>
-
-#ifndef QT_OPENGL_ES_2
-#include <qopenglfunctions_1_1.h>
-#endif
-
-// #define QT_GL_CONTEXT_RESOURCE_DEBUG
-
-QT_BEGIN_NAMESPACE
-
-class QGLDefaultExtensions
-{
-public:
-    QGLDefaultExtensions()
-    {
-        QGLTemporaryContext tempContext;
-        Q_ASSERT(QOpenGLContext::currentContext());
-        QOpenGLExtensions *ext = qgl_extensions();
-        Q_ASSERT(ext);
-        extensions = ext->openGLExtensions();
-        features = ext->openGLFeatures();
-    }
-
-    QOpenGLFunctions::OpenGLFeatures features;
-    QOpenGLExtensions::OpenGLExtensions extensions;
-};
-
-Q_GLOBAL_STATIC(QGLDefaultExtensions, qtDefaultExtensions)
-
-bool qgl_hasFeature(QOpenGLFunctions::OpenGLFeature feature)
-{
-    if (QOpenGLContext::currentContext())
-        return QOpenGLContext::currentContext()->functions()->hasOpenGLFeature(feature);
-    return qtDefaultExtensions()->features & feature;
-}
-
-bool qgl_hasExtension(QOpenGLExtensions::OpenGLExtension extension)
-{
-    if (QOpenGLContext::currentContext())
-        return qgl_extensions()->hasOpenGLExtension(extension);
-    return qtDefaultExtensions()->extensions & extension;
-}
-
-QOpenGLExtensions::OpenGLExtensions extensions;
-
-/*
-    Returns the GL extensions for the current QOpenGLContext. If there is no
-    current QOpenGLContext, a default context will be created and the extensions
-    for that context will be returned instead.
-*/
-QOpenGLExtensions* qgl_extensions()
-{
-    if (QOpenGLContext *context = QOpenGLContext::currentContext())
-        return static_cast<QOpenGLExtensions *>(context->functions());
-
-    Q_ASSERT(false);
-    return 0;
-}
-
-QOpenGLFunctions *qgl_functions()
-{
-    return qgl_extensions(); // QOpenGLExtensions is just a subclass of QOpenGLFunctions
-}
-
-#ifndef QT_OPENGL_ES_2
-QOpenGLFunctions_1_1 *qgl1_functions()
-{
-    QOpenGLFunctions_1_1 *f = QOpenGLContext::currentContext()->versionFunctions<QOpenGLFunctions_1_1>();
-    f->initializeOpenGLFunctions();
-    return f;
-}
-#endif
-
-struct QGLThreadContext {
-    ~QGLThreadContext() {
-        if (context)
-            context->doneCurrent();
-    }
-    QGLContext *context;
-};
-
-Q_GLOBAL_STATIC(QGLFormat, qgl_default_format)
-
-class QGLDefaultOverlayFormat: public QGLFormat
-{
-public:
-    inline QGLDefaultOverlayFormat()
-    {
-        setOption(QGL::FormatOption(0xffffU << 16)); // turn off all options
-        setOption(QGL::DirectRendering);
-        setPlane(1);
-    }
-};
-Q_GLOBAL_STATIC(QGLDefaultOverlayFormat, defaultOverlayFormatInstance)
-
-Q_GLOBAL_STATIC(QGLSignalProxy, theSignalProxy)
-QGLSignalProxy *QGLSignalProxy::instance()
-{
-    QGLSignalProxy *proxy = theSignalProxy();
-    if (proxy && qApp && proxy->thread() != qApp->thread()) {
-        if (proxy->thread() == QThread::currentThread())
-            proxy->moveToThread(qApp->thread());
-    }
-    return proxy;
-}
-
-
-/*!
-    \namespace QGL
-    \inmodule QtOpenGL
-
-    \brief The QGL namespace specifies miscellaneous identifiers used
-    in the Qt OpenGL module.
-*/
-
-/*!
-    \enum QGL::FormatOption
-
-    This enum specifies the format options that can be used to configure an OpenGL
-    context. These are set using QGLFormat::setOption().
-
-    \value DoubleBuffer      Specifies the use of double buffering.
-    \value DepthBuffer       Enables the use of a depth buffer.
-    \value Rgba              Specifies that the context should use RGBA as its pixel format.
-    \value AlphaChannel      Enables the use of an alpha channel.
-    \value AccumBuffer       Enables the use of an accumulation buffer.
-    \value StencilBuffer     Enables the use of a stencil buffer.
-    \value StereoBuffers     Enables the use of a stereo buffers for use with visualization hardware.
-    \value DirectRendering   Specifies that the context is used for direct rendering to a display.
-    \value HasOverlay        Enables the use of an overlay.
-    \value SampleBuffers     Enables the use of sample buffers.
-    \value DeprecatedFunctions      Enables the use of deprecated functionality for OpenGL 3.x
-                                    contexts. A context with deprecated functionality enabled is
-                                    called a full context in the OpenGL specification.
-    \value SingleBuffer      Specifies the use of a single buffer, as opposed to double buffers.
-    \value NoDepthBuffer     Disables the use of a depth buffer.
-    \value ColorIndex        Specifies that the context should use a color index as its pixel format.
-    \value NoAlphaChannel    Disables the use of an alpha channel.
-    \value NoAccumBuffer     Disables the use of an accumulation buffer.
-    \value NoStencilBuffer   Disables the use of a stencil buffer.
-    \value NoStereoBuffers   Disables the use of stereo buffers.
-    \value IndirectRendering Specifies that the context is used for indirect rendering to a buffer.
-    \value NoOverlay         Disables the use of an overlay.
-    \value NoSampleBuffers   Disables the use of sample buffers.
-    \value NoDeprecatedFunctions    Disables the use of deprecated functionality for OpenGL 3.x
-                                    contexts. A context with deprecated functionality disabled is
-                                    called a forward compatible context in the OpenGL specification.
-*/
-
-/*****************************************************************************
-  QGLFormat implementation
- *****************************************************************************/
-
-
-/*!
-    \class QGLFormat
-    \inmodule QtOpenGL
-    \obsolete
-
-    \brief The QGLFormat class specifies the display format of an OpenGL
-    rendering context.
-
-    A display format has several characteristics:
-    \list
-    \li \l{setDoubleBuffer()}{Double or single buffering.}
-    \li \l{setDepth()}{Depth buffer.}
-    \li \l{setRgba()}{RGBA or color index mode.}
-    \li \l{setAlpha()}{Alpha channel.}
-    \li \l{setAccum()}{Accumulation buffer.}
-    \li \l{setStencil()}{Stencil buffer.}
-    \li \l{setStereo()}{Stereo buffers.}
-    \li \l{setDirectRendering()}{Direct rendering.}
-    \li \l{setOverlay()}{Presence of an overlay.}
-    \li \l{setPlane()}{Plane of an overlay.}
-    \li \l{setSampleBuffers()}{Multisample buffers.}
-    \endlist
-
-    You can also specify preferred bit depths for the color buffer,
-    depth buffer, alpha buffer, accumulation buffer and the stencil
-    buffer with the functions: setRedBufferSize(), setGreenBufferSize(),
-    setBlueBufferSize(), setDepthBufferSize(), setAlphaBufferSize(),
-    setAccumBufferSize() and setStencilBufferSize().
-
-    Note that even if you specify that you prefer a 32 bit depth
-    buffer (e.g. with setDepthBufferSize(32)), the format that is
-    chosen may not have a 32 bit depth buffer, even if there is a
-    format available with a 32 bit depth buffer. The main reason for
-    this is how the system dependant picking algorithms work on the
-    different platforms, and some format options may have higher
-    precedence than others.
-
-    You create and tell a QGLFormat object what rendering options you
-    want from an OpenGL rendering context.
-
-    OpenGL drivers or accelerated hardware may or may not support
-    advanced features such as alpha channel or stereographic viewing.
-    If you request some features that the driver/hardware does not
-    provide when you create a QGLWidget, you will get a rendering
-    context with the nearest subset of features.
-
-    There are different ways to define the display characteristics of
-    a rendering context. One is to create a QGLFormat and make it the
-    default for the entire application:
-    \snippet code/src_opengl_qgl.cpp 0
-
-    Or you can specify the desired format when creating an object of
-    your QGLWidget subclass:
-    \snippet code/src_opengl_qgl.cpp 1
-
-    After the widget has been created, you can find out which of the
-    requested features the system was able to provide:
-    \snippet code/src_opengl_qgl.cpp 2
-
-    \legalese
-        OpenGL is a trademark of Silicon Graphics, Inc. in the
-        United States and other countries.
-    \endlegalese
-
-    \sa QGLContext, QGLWidget
-*/
-
-#ifndef QT_OPENGL_ES
-
-static inline void transform_point(GLdouble out[4], const GLdouble m[16], const GLdouble in[4])
-{
-#define M(row,col)  m[col*4+row]
-    out[0] =
-        M(0, 0) * in[0] + M(0, 1) * in[1] + M(0, 2) * in[2] + M(0, 3) * in[3];
-    out[1] =
-        M(1, 0) * in[0] + M(1, 1) * in[1] + M(1, 2) * in[2] + M(1, 3) * in[3];
-    out[2] =
-        M(2, 0) * in[0] + M(2, 1) * in[1] + M(2, 2) * in[2] + M(2, 3) * in[3];
-    out[3] =
-        M(3, 0) * in[0] + M(3, 1) * in[1] + M(3, 2) * in[2] + M(3, 3) * in[3];
-#undef M
-}
-
-static inline GLint qgluProject(GLdouble objx, GLdouble objy, GLdouble objz,
-           const GLdouble model[16], const GLdouble proj[16],
-           const GLint viewport[4],
-           GLdouble * winx, GLdouble * winy, GLdouble * winz)
-{
-   GLdouble in[4], out[4];
-
-   in[0] = objx;
-   in[1] = objy;
-   in[2] = objz;
-   in[3] = 1.0;
-   transform_point(out, model, in);
-   transform_point(in, proj, out);
-
-   if (in[3] == 0.0)
-      return GL_FALSE;
-
-   in[0] /= in[3];
-   in[1] /= in[3];
-   in[2] /= in[3];
-
-   *winx = viewport[0] + (1 + in[0]) * viewport[2] / 2;
-   *winy = viewport[1] + (1 + in[1]) * viewport[3] / 2;
-
-   *winz = (1 + in[2]) / 2;
-   return GL_TRUE;
-}
-
-#endif // !QT_OPENGL_ES
-
-/*!
-    Constructs a QGLFormat object with the following default settings:
-    \list
-    \li \l{setDoubleBuffer()}{Double buffer:} Enabled.
-    \li \l{setDepth()}{Depth buffer:} Enabled.
-    \li \l{setRgba()}{RGBA:} Enabled (i.e., color index disabled).
-    \li \l{setAlpha()}{Alpha channel:} Disabled.
-    \li \l{setAccum()}{Accumulator buffer:} Disabled.
-    \li \l{setStencil()}{Stencil buffer:} Enabled.
-    \li \l{setStereo()}{Stereo:} Disabled.
-    \li \l{setDirectRendering()}{Direct rendering:} Enabled.
-    \li \l{setOverlay()}{Overlay:} Disabled.
-    \li \l{setPlane()}{Plane:} 0 (i.e., normal plane).
-    \li \l{setSampleBuffers()}{Multisample buffers:} Disabled.
-    \endlist
-*/
-
-QGLFormat::QGLFormat()
-{
-    d = new QGLFormatPrivate;
-}
-
-
-/*!
-    Creates a QGLFormat object that is a copy of the current
-    defaultFormat().
-
-    If \a options is not 0, the default format is modified by the
-    specified format options. The \a options parameter should be
-    QGL::FormatOption values OR'ed together.
-
-    This constructor makes it easy to specify a certain desired format
-    in classes derived from QGLWidget, for example:
-    \snippet code/src_opengl_qgl.cpp 3
-
-    Note that there are QGL::FormatOption values to turn format settings
-    both on and off, e.g. QGL::DepthBuffer and QGL::NoDepthBuffer,
-    QGL::DirectRendering and QGL::IndirectRendering, etc.
-
-    The \a plane parameter defaults to 0 and is the plane which this
-    format should be associated with. Not all OpenGL implementations
-    supports overlay/underlay rendering planes.
-
-    \sa defaultFormat(), setOption(), setPlane()
-*/
-
-QGLFormat::QGLFormat(QGL::FormatOptions options, int plane)
-{
-    d = new QGLFormatPrivate;
-    QGL::FormatOptions newOpts = options;
-    d->opts = defaultFormat().d->opts;
-    d->opts |= (newOpts & 0xffff);
-    d->opts &= ~(newOpts >> 16);
-    d->pln = plane;
-}
-
-/*!
-    \internal
-*/
-void QGLFormat::detach()
-{
-    if (d->ref.loadRelaxed() != 1) {
-        QGLFormatPrivate *newd = new QGLFormatPrivate(d);
-        if (!d->ref.deref())
-            delete d;
-        d = newd;
-    }
-}
-
-/*!
-    Constructs a copy of \a other.
-*/
-
-QGLFormat::QGLFormat(const QGLFormat &other)
-{
-    d = other.d;
-    d->ref.ref();
-}
-
-/*!
-    Assigns \a other to this object.
-*/
-
-QGLFormat &QGLFormat::operator=(const QGLFormat &other)
-{
-    if (d != other.d) {
-        other.d->ref.ref();
-        if (!d->ref.deref())
-            delete d;
-        d = other.d;
-    }
-    return *this;
-}
-
-/*!
-    Destroys the QGLFormat.
-*/
-QGLFormat::~QGLFormat()
-{
-    if (!d->ref.deref())
-        delete d;
-}
-
-/*!
-    Returns an OpenGL format for the window format specified by \a format.
-*/
-QGLFormat QGLFormat::fromSurfaceFormat(const QSurfaceFormat &format)
-{
-    QGLFormat retFormat;
-    if (format.alphaBufferSize() >= 0)
-        retFormat.setAlphaBufferSize(format.alphaBufferSize());
-    if (format.blueBufferSize() >= 0)
-        retFormat.setBlueBufferSize(format.blueBufferSize());
-    if (format.greenBufferSize() >= 0)
-        retFormat.setGreenBufferSize(format.greenBufferSize());
-    if (format.redBufferSize() >= 0)
-        retFormat.setRedBufferSize(format.redBufferSize());
-    if (format.depthBufferSize() >= 0)
-        retFormat.setDepthBufferSize(format.depthBufferSize());
-    if (format.samples() > 1) {
-        retFormat.setSampleBuffers(true);
-        retFormat.setSamples(format.samples());
-    }
-    if (format.stencilBufferSize() > 0) {
-        retFormat.setStencil(true);
-        retFormat.setStencilBufferSize(format.stencilBufferSize());
-    }
-    retFormat.setSwapInterval(format.swapInterval());
-    retFormat.setDoubleBuffer(format.swapBehavior() != QSurfaceFormat::SingleBuffer);
-    retFormat.setStereo(format.stereo());
-    retFormat.setVersion(format.majorVersion(), format.minorVersion());
-    retFormat.setProfile(static_cast<QGLFormat::OpenGLContextProfile>(format.profile()));
-    return retFormat;
-}
-
-/*!
-    Returns a window format for the OpenGL format specified by \a format.
-*/
-QSurfaceFormat QGLFormat::toSurfaceFormat(const QGLFormat &format)
-{
-    QSurfaceFormat retFormat;
-    if (format.alpha())
-        retFormat.setAlphaBufferSize(format.alphaBufferSize() == -1 ? 1 : format.alphaBufferSize());
-    if (format.blueBufferSize() >= 0)
-        retFormat.setBlueBufferSize(format.blueBufferSize());
-    if (format.greenBufferSize() >= 0)
-        retFormat.setGreenBufferSize(format.greenBufferSize());
-    if (format.redBufferSize() >= 0)
-        retFormat.setRedBufferSize(format.redBufferSize());
-    if (format.depth())
-        retFormat.setDepthBufferSize(format.depthBufferSize() == -1 ? 1 : format.depthBufferSize());
-    retFormat.setSwapBehavior(format.doubleBuffer() ? QSurfaceFormat::DoubleBuffer : QSurfaceFormat::SingleBuffer);
-    if (format.sampleBuffers())
-        retFormat.setSamples(format.samples() == -1 ? 4 : format.samples());
-    if (format.stencil())
-        retFormat.setStencilBufferSize(format.stencilBufferSize() == -1 ? 1 : format.stencilBufferSize());
-    retFormat.setSwapInterval(format.swapInterval());
-    retFormat.setStereo(format.stereo());
-    retFormat.setMajorVersion(format.majorVersion());
-    retFormat.setMinorVersion(format.minorVersion());
-    retFormat.setProfile(static_cast<QSurfaceFormat::OpenGLContextProfile>(format.profile()));
-    // QGLFormat has no way to set DeprecatedFunctions, that is, to tell that forward
-    // compatibility should not be requested. Some drivers fail to ignore the fwdcompat
-    // bit with compatibility profiles so make sure it is not set.
-    if (format.profile() == QGLFormat::CompatibilityProfile)
-        retFormat.setOption(QSurfaceFormat::DeprecatedFunctions);
-    return retFormat;
-}
-
-void QGLContextPrivate::setupSharing() {
-    Q_Q(QGLContext);
-    QOpenGLContext *sharedContext = guiGlContext->shareContext();
-    if (sharedContext) {
-        QGLContext *actualSharedContext = QGLContext::fromOpenGLContext(sharedContext);
-        sharing = true;
-        QGLContextGroup::addShare(q, actualSharedContext);
-    }
-}
-
-void QGLContextPrivate::refreshCurrentFbo()
-{
-    QOpenGLContextPrivate *guiGlContextPrivate =
-        guiGlContext ? QOpenGLContextPrivate::get(guiGlContext) : 0;
-
-    // if QOpenGLFramebufferObjects have been used in the mean-time, we've lost our cached value
-    if (guiGlContextPrivate && guiGlContextPrivate->qgl_current_fbo_invalid) {
-        GLint current;
-        QOpenGLFunctions *funcs = qgl_functions();
-        funcs->glGetIntegerv(GL_FRAMEBUFFER_BINDING, &current);
-
-        current_fbo = current;
-
-        guiGlContextPrivate->qgl_current_fbo_invalid = false;
-    }
-}
-
-void QGLContextPrivate::setCurrentFbo(GLuint fbo)
-{
-    current_fbo = fbo;
-
-    QOpenGLContextPrivate *guiGlContextPrivate =
-        guiGlContext ? QOpenGLContextPrivate::get(guiGlContext) : 0;
-
-    if (guiGlContextPrivate)
-        guiGlContextPrivate->qgl_current_fbo_invalid = false;
-}
-
-
-/*!
-    \fn bool QGLFormat::doubleBuffer() const
-
-    Returns \c true if double buffering is enabled; otherwise returns
-    false. Double buffering is enabled by default.
-
-    \sa setDoubleBuffer()
-*/
-
-/*!
-    If \a enable is true sets double buffering; otherwise sets single
-    buffering.
-
-    Double buffering is enabled by default.
-
-    Double buffering is a technique where graphics are rendered on an
-    off-screen buffer and not directly to the screen. When the drawing
-    has been completed, the program calls a swapBuffers() function to
-    exchange the screen contents with the buffer. The result is
-    flicker-free drawing and often better performance.
-
-    Note that single buffered contexts are currently not supported
-    with EGL.
-
-    \sa doubleBuffer(), QGLContext::swapBuffers(),
-    QGLWidget::swapBuffers()
-*/
-
-void QGLFormat::setDoubleBuffer(bool enable)
-{
-    setOption(enable ? QGL::DoubleBuffer : QGL::SingleBuffer);
-}
-
-
-/*!
-    \fn bool QGLFormat::depth() const
-
-    Returns \c true if the depth buffer is enabled; otherwise returns
-    false. The depth buffer is enabled by default.
-
-    \sa setDepth(), setDepthBufferSize()
-*/
-
-/*!
-    If \a enable is true enables the depth buffer; otherwise disables
-    the depth buffer.
-
-    The depth buffer is enabled by default.
-
-    The purpose of a depth buffer (or Z-buffering) is to remove hidden
-    surfaces. Pixels are assigned Z values based on the distance to
-    the viewer. A pixel with a high Z value is closer to the viewer
-    than a pixel with a low Z value. This information is used to
-    decide whether to draw a pixel or not.
-
-    \sa depth(), setDepthBufferSize()
-*/
-
-void QGLFormat::setDepth(bool enable)
-{
-    setOption(enable ? QGL::DepthBuffer : QGL::NoDepthBuffer);
-}
-
-
-/*!
-    \fn bool QGLFormat::rgba() const
-
-    Returns \c true if RGBA color mode is set. Returns \c false if color
-    index mode is set. The default color mode is RGBA.
-
-    \sa setRgba()
-*/
-
-/*!
-    If \a enable is true sets RGBA mode. If \a enable is false sets
-    color index mode.
-
-    The default color mode is RGBA.
-
-    RGBA is the preferred mode for most OpenGL applications. In RGBA
-    color mode you specify colors as red + green + blue + alpha
-    quadruplets.
-
-    In color index mode you specify an index into a color lookup
-    table.
-
-    \sa rgba()
-*/
-
-void QGLFormat::setRgba(bool enable)
-{
-    setOption(enable ? QGL::Rgba : QGL::ColorIndex);
-}
-
-
-/*!
-    \fn bool QGLFormat::alpha() const
-
-    Returns \c true if the alpha buffer in the framebuffer is enabled;
-    otherwise returns \c false. The alpha buffer is disabled by default.
-
-    \sa setAlpha(), setAlphaBufferSize()
-*/
-
-/*!
-    If \a enable is true enables the alpha buffer; otherwise disables
-    the alpha buffer.
-
-    The alpha buffer is disabled by default.
-
-    The alpha buffer is typically used for implementing transparency
-    or translucency. The A in RGBA specifies the transparency of a
-    pixel.
-
-    \sa alpha(), setAlphaBufferSize()
-*/
-
-void QGLFormat::setAlpha(bool enable)
-{
-    setOption(enable ? QGL::AlphaChannel : QGL::NoAlphaChannel);
-}
-
-
-/*!
-    \fn bool QGLFormat::accum() const
-
-    Returns \c true if the accumulation buffer is enabled; otherwise
-    returns \c false. The accumulation buffer is disabled by default.
-
-    \sa setAccum(), setAccumBufferSize()
-*/
-
-/*!
-    If \a enable is true enables the accumulation buffer; otherwise
-    disables the accumulation buffer.
-
-    The accumulation buffer is disabled by default.
-
-    The accumulation buffer is used to create blur effects and
-    multiple exposures.
-
-    \sa accum(), setAccumBufferSize()
-*/
-
-void QGLFormat::setAccum(bool enable)
-{
-    setOption(enable ? QGL::AccumBuffer : QGL::NoAccumBuffer);
-}
-
-
-/*!
-    \fn bool QGLFormat::stencil() const
-
-    Returns \c true if the stencil buffer is enabled; otherwise returns
-    false. The stencil buffer is enabled by default.
-
-    \sa setStencil(), setStencilBufferSize()
-*/
-
-/*!
-    If \a enable is true enables the stencil buffer; otherwise
-    disables the stencil buffer.
-
-    The stencil buffer is enabled by default.
-
-    The stencil buffer masks certain parts of the drawing area so that
-    masked parts are not drawn on.
-
-    \sa stencil(), setStencilBufferSize()
-*/
-
-void QGLFormat::setStencil(bool enable)
-{
-    setOption(enable ? QGL::StencilBuffer: QGL::NoStencilBuffer);
-}
-
-
-/*!
-    \fn bool QGLFormat::stereo() const
-
-    Returns \c true if stereo buffering is enabled; otherwise returns
-    false. Stereo buffering is disabled by default.
-
-    \sa setStereo()
-*/
-
-/*!
-    If \a enable is true enables stereo buffering; otherwise disables
-    stereo buffering.
-
-    Stereo buffering is disabled by default.
-
-    Stereo buffering provides extra color buffers to generate left-eye
-    and right-eye images.
-
-    \sa stereo()
-*/
-
-void QGLFormat::setStereo(bool enable)
-{
-    setOption(enable ? QGL::StereoBuffers : QGL::NoStereoBuffers);
-}
-
-
-/*!
-    \fn bool QGLFormat::directRendering() const
-
-    Returns \c true if direct rendering is enabled; otherwise returns
-    false.
-
-    Direct rendering is enabled by default.
-
-    \sa setDirectRendering()
-*/
-
-/*!
-    If \a enable is true enables direct rendering; otherwise disables
-    direct rendering.
-
-    Direct rendering is enabled by default.
-
-    Enabling this option will make OpenGL bypass the underlying window
-    system and render directly from hardware to the screen, if this is
-    supported by the system.
-
-    \sa directRendering()
-*/
-
-void QGLFormat::setDirectRendering(bool enable)
-{
-    setOption(enable ? QGL::DirectRendering : QGL::IndirectRendering);
-}
-
-/*!
-    \fn bool QGLFormat::sampleBuffers() const
-
-    Returns \c true if multisample buffer support is enabled; otherwise
-    returns \c false.
-
-    The multisample buffer is disabled by default.
-
-    \sa setSampleBuffers()
-*/
-
-/*!
-    If \a enable is true, a GL context with multisample buffer support
-    is picked; otherwise ignored.
-
-    \sa sampleBuffers(), setSamples(), samples()
-*/
-void QGLFormat::setSampleBuffers(bool enable)
-{
-    setOption(enable ? QGL::SampleBuffers : QGL::NoSampleBuffers);
-}
-
-/*!
-    Returns the number of samples per pixel when multisampling is
-    enabled. By default, the highest number of samples that is
-    available is used.
-
-    \sa setSampleBuffers(), sampleBuffers(), setSamples()
-*/
-int QGLFormat::samples() const
-{
-   return d->numSamples;
-}
-
-/*!
-    Set the preferred number of samples per pixel when multisampling
-    is enabled to \a numSamples. By default, the highest number of
-    samples available is used.
-
-    \sa setSampleBuffers(), sampleBuffers(), samples()
-*/
-void QGLFormat::setSamples(int numSamples)
-{
-    detach();
-    if (numSamples < 0) {
-        qWarning("QGLFormat::setSamples: Cannot have negative number of samples per pixel %d", numSamples);
-        return;
-    }
-    d->numSamples = numSamples;
-    setSampleBuffers(numSamples > 0);
-}
-
-/*!
-    \since 4.2
-
-    Set the preferred swap interval. This can be used to sync the GL
-    drawing into a system window to the vertical refresh of the screen.
-    Setting an \a interval value of 0 will turn the vertical refresh syncing
-    off, any value higher than 0 will turn the vertical syncing on.
-
-    Under Windows and under X11, where the \c{WGL_EXT_swap_control}
-    and \c{GLX_SGI_video_sync} extensions are used, the \a interval
-    parameter can be used to set the minimum number of video frames
-    that are displayed before a buffer swap will occur. In effect,
-    setting the \a interval to 10, means there will be 10 vertical
-    retraces between every buffer swap.
-
-    Under Windows the \c{WGL_EXT_swap_control} extension has to be present,
-    and under X11 the \c{GLX_SGI_video_sync} extension has to be present.
-*/
-void QGLFormat::setSwapInterval(int interval)
-{
-    detach();
-    d->swapInterval = interval;
-}
-
-/*!
-    \since 4.2
-
-    Returns the currently set swap interval. -1 is returned if setting
-    the swap interval isn't supported in the system GL implementation.
-*/
-int QGLFormat::swapInterval() const
-{
-    return d->swapInterval;
-}
-
-/*!
-    \fn bool QGLFormat::hasOverlay() const
-
-    Returns \c true if overlay plane is enabled; otherwise returns \c false.
-
-    Overlay is disabled by default.
-
-    \sa setOverlay()
-*/
-
-/*!
-    If \a enable is true enables an overlay plane; otherwise disables
-    the overlay plane.
-
-    Enabling the overlay plane will cause QGLWidget to create an
-    additional context in an overlay plane. See the QGLWidget
-    documentation for further information.
-
-    \sa hasOverlay()
-*/
-
-void QGLFormat::setOverlay(bool enable)
-{
-    setOption(enable ? QGL::HasOverlay : QGL::NoOverlay);
-}
-
-/*!
-    Returns the plane of this format. The default for normal formats
-    is 0, which means the normal plane. The default for overlay
-    formats is 1, which is the first overlay plane.
-
-    \sa setPlane(), defaultOverlayFormat()
-*/
-int QGLFormat::plane() const
-{
-    return d->pln;
-}
-
-/*!
-    Sets the requested plane to \a plane. 0 is the normal plane, 1 is
-    the first overlay plane, 2 is the second overlay plane, etc.; -1,
-    -2, etc. are underlay planes.
-
-    Note that in contrast to other format specifications, the plane
-    specifications will be matched exactly. This means that if you
-    specify a plane that the underlying OpenGL system cannot provide,
-    an \l{QGLWidget::isValid()}{invalid} QGLWidget will be
-    created.
-
-    \sa plane()
-*/
-void QGLFormat::setPlane(int plane)
-{
-    detach();
-    d->pln = plane;
-}
-
-/*!
-    Sets the format option to \a opt.
-
-    \sa testOption()
-*/
-
-void QGLFormat::setOption(QGL::FormatOptions opt)
-{
-    detach();
-    if (opt & 0xffff)
-        d->opts |= opt;
-    else
-       d->opts &= ~(opt >> 16);
-}
-
-
-
-/*!
-    Returns \c true if format option \a opt is set; otherwise returns \c false.
-
-    \sa setOption()
-*/
-
-bool QGLFormat::testOption(QGL::FormatOptions opt) const
-{
-    if (opt & 0xffff)
-       return (d->opts & opt) != 0;
-    else
-       return (d->opts & (opt >> 16)) == 0;
-}
-
-/*!
-    Set the minimum depth buffer size to \a size.
-
-    \sa depthBufferSize(), setDepth(), depth()
-*/
-void QGLFormat::setDepthBufferSize(int size)
-{
-    detach();
-    if (size < 0) {
-        qWarning("QGLFormat::setDepthBufferSize: Cannot set negative depth buffer size %d", size);
-        return;
-    }
-    d->depthSize = size;
-    setDepth(size > 0);
-}
-
-/*!
-    Returns the depth buffer size.
-
-    \sa depth(), setDepth(), setDepthBufferSize()
-*/
-int QGLFormat::depthBufferSize() const
-{
-   return d->depthSize;
-}
-
-/*!
-    \since 4.2
-
-    Set the preferred red buffer size to \a size.
-
-    \sa setGreenBufferSize(), setBlueBufferSize(), setAlphaBufferSize()
-*/
-void QGLFormat::setRedBufferSize(int size)
-{
-    detach();
-    if (size < 0) {
-        qWarning("QGLFormat::setRedBufferSize: Cannot set negative red buffer size %d", size);
-        return;
-    }
-    d->redSize = size;
-}
-
-/*!
-    \since 4.2
-
-    Returns the red buffer size.
-
-    \sa setRedBufferSize()
-*/
-int QGLFormat::redBufferSize() const
-{
-   return d->redSize;
-}
-
-/*!
-    \since 4.2
-
-    Set the preferred green buffer size to \a size.
-
-    \sa setRedBufferSize(), setBlueBufferSize(), setAlphaBufferSize()
-*/
-void QGLFormat::setGreenBufferSize(int size)
-{
-    detach();
-    if (size < 0) {
-        qWarning("QGLFormat::setGreenBufferSize: Cannot set negative green buffer size %d", size);
-        return;
-    }
-    d->greenSize = size;
-}
-
-/*!
-    \since 4.2
-
-    Returns the green buffer size.
-
-    \sa setGreenBufferSize()
-*/
-int QGLFormat::greenBufferSize() const
-{
-   return d->greenSize;
-}
-
-/*!
-    \since 4.2
-
-    Set the preferred blue buffer size to \a size.
-
-    \sa setRedBufferSize(), setGreenBufferSize(), setAlphaBufferSize()
-*/
-void QGLFormat::setBlueBufferSize(int size)
-{
-    detach();
-    if (size < 0) {
-        qWarning("QGLFormat::setBlueBufferSize: Cannot set negative blue buffer size %d", size);
-        return;
-    }
-    d->blueSize = size;
-}
-
-/*!
-    \since 4.2
-
-    Returns the blue buffer size.
-
-    \sa setBlueBufferSize()
-*/
-int QGLFormat::blueBufferSize() const
-{
-   return d->blueSize;
-}
-
-/*!
-    Set the preferred alpha buffer size to \a size.
-    This function implicitly enables the alpha channel.
-
-    \sa setRedBufferSize(), setGreenBufferSize(), alphaBufferSize()
-*/
-void QGLFormat::setAlphaBufferSize(int size)
-{
-    detach();
-    if (size < 0) {
-        qWarning("QGLFormat::setAlphaBufferSize: Cannot set negative alpha buffer size %d", size);
-        return;
-    }
-    d->alphaSize = size;
-    setAlpha(size > 0);
-}
-
-/*!
-    Returns the alpha buffer size.
-
-    \sa alpha(), setAlpha(), setAlphaBufferSize()
-*/
-int QGLFormat::alphaBufferSize() const
-{
-   return d->alphaSize;
-}
-
-/*!
-    Set the preferred accumulation buffer size, where \a size is the
-    bit depth for each RGBA component.
-
-    \sa accum(), setAccum(), accumBufferSize()
-*/
-void QGLFormat::setAccumBufferSize(int size)
-{
-    detach();
-    if (size < 0) {
-        qWarning("QGLFormat::setAccumBufferSize: Cannot set negative accumulate buffer size %d", size);
-        return;
-    }
-    d->accumSize = size;
-    setAccum(size > 0);
-}
-
-/*!
-    Returns the accumulation buffer size.
-
-    \sa setAccumBufferSize(), accum(), setAccum()
-*/
-int QGLFormat::accumBufferSize() const
-{
-   return d->accumSize;
-}
-
-/*!
-    Set the preferred stencil buffer size to \a size.
-
-    \sa stencilBufferSize(), setStencil(), stencil()
-*/
-void QGLFormat::setStencilBufferSize(int size)
-{
-    detach();
-    if (size < 0) {
-        qWarning("QGLFormat::setStencilBufferSize: Cannot set negative stencil buffer size %d", size);
-        return;
-    }
-    d->stencilSize = size;
-    setStencil(size > 0);
-}
-
-/*!
-    Returns the stencil buffer size.
-
-    \sa stencil(), setStencil(), setStencilBufferSize()
-*/
-int QGLFormat::stencilBufferSize() const
-{
-   return d->stencilSize;
-}
-
-/*!
-    \since 4.7
-
-    Set the OpenGL version to the \a major and \a minor numbers. If a
-    context compatible with the requested OpenGL version cannot be
-    created, a context compatible with version 1.x is created instead.
-
-    \sa majorVersion(), minorVersion()
-*/
-void QGLFormat::setVersion(int major, int minor)
-{
-    if (major < 1 || minor < 0) {
-        qWarning("QGLFormat::setVersion: Cannot set zero or negative version number %d.%d", major, minor);
-        return;
-    }
-    detach();
-    d->majorVersion = major;
-    d->minorVersion = minor;
-}
-
-/*!
-    \since 4.7
-
-    Returns the OpenGL major version.
-
-    \sa setVersion(), minorVersion()
-*/
-int QGLFormat::majorVersion() const
-{
-    return d->majorVersion;
-}
-
-/*!
-    \since 4.7
-
-    Returns the OpenGL minor version.
-
-    \sa setVersion(), majorVersion()
-*/
-int QGLFormat::minorVersion() const
-{
-    return d->minorVersion;
-}
-
-/*!
-    \enum QGLFormat::OpenGLContextProfile
-    \since 4.7
-
-    This enum describes the OpenGL context profiles that can be
-    specified for contexts implementing OpenGL version 3.2 or
-    higher. These profiles are different from OpenGL ES profiles.
-
-    \value NoProfile            OpenGL version is lower than 3.2.
-    \value CoreProfile          Functionality deprecated in OpenGL version 3.0 is not available.
-    \value CompatibilityProfile Functionality from earlier OpenGL versions is available.
-*/
-
-/*!
-    \since 4.7
-
-    Set the OpenGL context profile to \a profile. The \a profile is
-    ignored if the requested OpenGL version is less than 3.2.
-
-    \sa profile()
-*/
-void QGLFormat::setProfile(OpenGLContextProfile profile)
-{
-    detach();
-    d->profile = profile;
-}
-
-/*!
-    \since 4.7
-
-    Returns the OpenGL context profile.
-
-    \sa setProfile()
-*/
-QGLFormat::OpenGLContextProfile QGLFormat::profile() const
-{
-    return d->profile;
-}
-
-
-/*!
-    \fn bool QGLFormat::hasOpenGL()
-
-    Returns \c true if the window system has any OpenGL support;
-    otherwise returns \c false.
-
-    \warning This function must not be called until the QApplication
-    object has been created.
-*/
-bool QGLFormat::hasOpenGL()
-{
-    return QApplicationPrivate::platformIntegration()
-            ->hasCapability(QPlatformIntegration::OpenGL);
-}
-
-/*!
-    \fn bool QGLFormat::hasOpenGLOverlays()
-
-    Returns \c true if the window system supports OpenGL overlays;
-    otherwise returns \c false.
-
-    \warning This function must not be called until the QApplication
-    object has been created.
-*/
-bool QGLFormat::hasOpenGLOverlays()
-{
-    return false;
-}
-
-QGLFormat::OpenGLVersionFlags Q_AUTOTEST_EXPORT qOpenGLVersionFlagsFromString(const QString &versionString)
-{
-    QGLFormat::OpenGLVersionFlags versionFlags = QGLFormat::OpenGL_Version_None;
-
-    if (versionString.startsWith(QLatin1String("OpenGL ES"))) {
-        const auto parts = versionString.splitRef(QLatin1Char(' '));
-        if (parts.size() >= 3) {
-            if (parts[2].startsWith(QLatin1String("1."))) {
-                if (parts[1].endsWith(QLatin1String("-CM"))) {
-                    versionFlags |= QGLFormat::OpenGL_ES_Common_Version_1_0 |
-                                    QGLFormat::OpenGL_ES_CommonLite_Version_1_0;
-                    if (parts[2].startsWith(QLatin1String("1.1")))
-                        versionFlags |= QGLFormat::OpenGL_ES_Common_Version_1_1 |
-                                        QGLFormat::OpenGL_ES_CommonLite_Version_1_1;
-                } else {
-                    // Not -CM, must be CL, CommonLite
-                    versionFlags |= QGLFormat::OpenGL_ES_CommonLite_Version_1_0;
-                    if (parts[2].startsWith(QLatin1String("1.1")))
-                        versionFlags |= QGLFormat::OpenGL_ES_CommonLite_Version_1_1;
-                }
-            } else {
-                // OpenGL ES version 2.0 or higher
-                versionFlags |= QGLFormat::OpenGL_ES_Version_2_0;
-            }
-        } else {
-            // if < 3 parts to the name, it is an unrecognised OpenGL ES
-            qWarning("Unrecognised OpenGL ES version");
-        }
-    } else {
-        // not ES, regular OpenGL, the version numbers are first in the string
-        if (versionString.startsWith(QLatin1String("1."))) {
-            switch (versionString[2].toLatin1()) {
-            case '5':
-                versionFlags |= QGLFormat::OpenGL_Version_1_5;
-                Q_FALLTHROUGH();
-            case '4':
-                versionFlags |= QGLFormat::OpenGL_Version_1_4;
-                Q_FALLTHROUGH();
-            case '3':
-                versionFlags |= QGLFormat::OpenGL_Version_1_3;
-                Q_FALLTHROUGH();
-            case '2':
-                versionFlags |= QGLFormat::OpenGL_Version_1_2;
-                Q_FALLTHROUGH();
-            case '1':
-                versionFlags |= QGLFormat::OpenGL_Version_1_1;
-                Q_FALLTHROUGH();
-            default:
-                break;
-            }
-        } else if (versionString.startsWith(QLatin1String("2."))) {
-            versionFlags |= QGLFormat::OpenGL_Version_1_1 |
-                            QGLFormat::OpenGL_Version_1_2 |
-                            QGLFormat::OpenGL_Version_1_3 |
-                            QGLFormat::OpenGL_Version_1_4 |
-                            QGLFormat::OpenGL_Version_1_5 |
-                            QGLFormat::OpenGL_Version_2_0;
-            if (versionString[2].toLatin1() == '1')
-                versionFlags |= QGLFormat::OpenGL_Version_2_1;
-        } else if (versionString.startsWith(QLatin1String("3."))) {
-            versionFlags |= QGLFormat::OpenGL_Version_1_1 |
-                            QGLFormat::OpenGL_Version_1_2 |
-                            QGLFormat::OpenGL_Version_1_3 |
-                            QGLFormat::OpenGL_Version_1_4 |
-                            QGLFormat::OpenGL_Version_1_5 |
-                            QGLFormat::OpenGL_Version_2_0 |
-                            QGLFormat::OpenGL_Version_2_1 |
-                            QGLFormat::OpenGL_Version_3_0;
-            switch (versionString[2].toLatin1()) {
-            case '3':
-                versionFlags |= QGLFormat::OpenGL_Version_3_3;
-                Q_FALLTHROUGH();
-            case '2':
-                versionFlags |= QGLFormat::OpenGL_Version_3_2;
-                Q_FALLTHROUGH();
-            case '1':
-                versionFlags |= QGLFormat::OpenGL_Version_3_1;
-                Q_FALLTHROUGH();
-            case '0':
-                break;
-            default:
-                versionFlags |= QGLFormat::OpenGL_Version_3_1 |
-                                QGLFormat::OpenGL_Version_3_2 |
-                                QGLFormat::OpenGL_Version_3_3;
-                break;
-            }
-        } else if (versionString.startsWith(QLatin1String("4."))) {
-            versionFlags |= QGLFormat::OpenGL_Version_1_1 |
-                            QGLFormat::OpenGL_Version_1_2 |
-                            QGLFormat::OpenGL_Version_1_3 |
-                            QGLFormat::OpenGL_Version_1_4 |
-                            QGLFormat::OpenGL_Version_1_5 |
-                            QGLFormat::OpenGL_Version_2_0 |
-                            QGLFormat::OpenGL_Version_2_1 |
-                            QGLFormat::OpenGL_Version_3_0 |
-                            QGLFormat::OpenGL_Version_3_1 |
-                            QGLFormat::OpenGL_Version_3_2 |
-                            QGLFormat::OpenGL_Version_3_3 |
-                            QGLFormat::OpenGL_Version_4_0;
-            switch (versionString[2].toLatin1()) {
-            case '3':
-                versionFlags |= QGLFormat::OpenGL_Version_4_3;
-                Q_FALLTHROUGH();
-            case '2':
-                versionFlags |= QGLFormat::OpenGL_Version_4_2;
-                Q_FALLTHROUGH();
-            case '1':
-                versionFlags |= QGLFormat::OpenGL_Version_4_1;
-                Q_FALLTHROUGH();
-            case '0':
-                break;
-            default:
-                versionFlags |= QGLFormat::OpenGL_Version_4_1 |
-                                QGLFormat::OpenGL_Version_4_2 |
-                                QGLFormat::OpenGL_Version_4_3;
-                break;
-            }
-        } else {
-            versionFlags |= QGLFormat::OpenGL_Version_1_1 |
-                            QGLFormat::OpenGL_Version_1_2 |
-                            QGLFormat::OpenGL_Version_1_3 |
-                            QGLFormat::OpenGL_Version_1_4 |
-                            QGLFormat::OpenGL_Version_1_5 |
-                            QGLFormat::OpenGL_Version_2_0 |
-                            QGLFormat::OpenGL_Version_2_1 |
-                            QGLFormat::OpenGL_Version_3_0 |
-                            QGLFormat::OpenGL_Version_3_1 |
-                            QGLFormat::OpenGL_Version_3_2 |
-                            QGLFormat::OpenGL_Version_3_3 |
-                            QGLFormat::OpenGL_Version_4_0 |
-                            QGLFormat::OpenGL_Version_4_1 |
-                            QGLFormat::OpenGL_Version_4_2 |
-                            QGLFormat::OpenGL_Version_4_3;
-        }
-    }
-    return versionFlags;
-}
-
-/*!
-    \enum QGLFormat::OpenGLVersionFlag
-    \since 4.2
-
-    This enum describes the various OpenGL versions that are
-    recognized by Qt. Use the QGLFormat::openGLVersionFlags() function
-    to identify which versions that are supported at runtime.
-
-    \value OpenGL_Version_None  If no OpenGL is present or if no OpenGL context is current.
-
-    \value OpenGL_Version_1_1  OpenGL version 1.1 or higher is present.
-
-    \value OpenGL_Version_1_2  OpenGL version 1.2 or higher is present.
-
-    \value OpenGL_Version_1_3  OpenGL version 1.3 or higher is present.
-
-    \value OpenGL_Version_1_4  OpenGL version 1.4 or higher is present.
-
-    \value OpenGL_Version_1_5  OpenGL version 1.5 or higher is present.
-
-    \value OpenGL_Version_2_0  OpenGL version 2.0 or higher is present.
-    Note that version 2.0 supports all the functionality of version 1.5.
-
-    \value OpenGL_Version_2_1  OpenGL version 2.1 or higher is present.
-
-    \value OpenGL_Version_3_0  OpenGL version 3.0 or higher is present.
-
-    \value OpenGL_Version_3_1  OpenGL version 3.1 or higher is present.
-    Note that OpenGL version 3.1 or higher does not necessarily support all the features of
-    version 3.0 and lower.
-
-    \value OpenGL_Version_3_2  OpenGL version 3.2 or higher is present.
-
-    \value OpenGL_Version_3_3  OpenGL version 3.3 or higher is present.
-
-    \value OpenGL_Version_4_0  OpenGL version 4.0 or higher is present.
-
-    \value OpenGL_Version_4_1  OpenGL version 4.1 or higher is present.
-
-    \value OpenGL_Version_4_2  OpenGL version 4.2 or higher is present.
-
-    \value OpenGL_Version_4_3  OpenGL version 4.3 or higher is present.
-
-    \value OpenGL_ES_CommonLite_Version_1_0  OpenGL ES version 1.0 Common Lite or higher is present.
-
-    \value OpenGL_ES_Common_Version_1_0  OpenGL ES version 1.0 Common or higher is present.
-    The Common profile supports all the features of Common Lite.
-
-    \value OpenGL_ES_CommonLite_Version_1_1  OpenGL ES version 1.1 Common Lite or higher is present.
-
-    \value OpenGL_ES_Common_Version_1_1  OpenGL ES version 1.1 Common or higher is present.
-    The Common profile supports all the features of Common Lite.
-
-    \value OpenGL_ES_Version_2_0  OpenGL ES version 2.0 or higher is present.
-    Note that OpenGL ES version 2.0 does not support all the features of OpenGL ES 1.x.
-    So if OpenGL_ES_Version_2_0 is returned, none of the ES 1.x flags are returned.
-
-    See also \l{http://www.opengl.org} for more information about the different
-    revisions of OpenGL.
-
-    \sa openGLVersionFlags()
-*/
-
-/*!
-    \since 4.2
-
-    Identifies, at runtime, which OpenGL versions that are supported
-    by the current platform.
-
-    Note that if OpenGL version 1.5 is supported, its predecessors
-    (i.e., version 1.4 and lower) are also supported. To identify the
-    support of a particular feature, like multi texturing, test for
-    the version in which the feature was first introduced (i.e.,
-    version 1.3 in the case of multi texturing) to adapt to the largest
-    possible group of runtime platforms.
-
-    This function needs a valid current OpenGL context to work;
-    otherwise it will return OpenGL_Version_None.
-
-    \sa hasOpenGL(), hasOpenGLOverlays()
-*/
-QGLFormat::OpenGLVersionFlags QGLFormat::openGLVersionFlags()
-{
-    static bool cachedDefault = false;
-    static OpenGLVersionFlags defaultVersionFlags = OpenGL_Version_None;
-    QGLContext *currentCtx = const_cast<QGLContext *>(QGLContext::currentContext());
-    QGLTemporaryContext *tmpContext = 0;
-
-    if (currentCtx && currentCtx->d_func()->version_flags_cached)
-        return currentCtx->d_func()->version_flags;
-
-    if (!currentCtx) {
-        if (cachedDefault) {
-            return defaultVersionFlags;
-        } else {
-            if (!hasOpenGL())
-                return defaultVersionFlags;
-            tmpContext = new QGLTemporaryContext;
-            cachedDefault = true;
-        }
-    }
-
-    QString versionString(QLatin1String(reinterpret_cast<const char*>(qgl_functions()->glGetString(GL_VERSION))));
-    OpenGLVersionFlags versionFlags = qOpenGLVersionFlagsFromString(versionString);
-    if (currentCtx) {
-        currentCtx->d_func()->version_flags_cached = true;
-        currentCtx->d_func()->version_flags = versionFlags;
-    }
-    if (tmpContext) {
-        defaultVersionFlags = versionFlags;
-        delete tmpContext;
-    }
-
-    return versionFlags;
-}
-
-
-/*!
-    Returns the default QGLFormat for the application. All QGLWidget
-    objects that are created use this format unless another format is
-    specified, e.g. when they are constructed.
-
-    If no special default format has been set using
-    setDefaultFormat(), the default format is the same as that created
-    with QGLFormat().
-
-    \sa setDefaultFormat()
-*/
-
-QGLFormat QGLFormat::defaultFormat()
-{
-    return *qgl_default_format();
-}
-
-/*!
-    Sets a new default QGLFormat for the application to \a f. For
-    example, to set single buffering as the default instead of double
-    buffering, your main() might contain code like this:
-    \snippet code/src_opengl_qgl.cpp 4
-
-    \sa defaultFormat()
-*/
-
-void QGLFormat::setDefaultFormat(const QGLFormat &f)
-{
-    *qgl_default_format() = f;
-}
-
-
-/*!
-    Returns the default QGLFormat for overlay contexts.
-
-    The default overlay format is:
-    \list
-    \li \l{setDoubleBuffer()}{Double buffer:} Disabled.
-    \li \l{setDepth()}{Depth buffer:} Disabled.
-    \li \l{setRgba()}{RGBA:} Disabled (i.e., color index enabled).
-    \li \l{setAlpha()}{Alpha channel:} Disabled.
-    \li \l{setAccum()}{Accumulator buffer:} Disabled.
-    \li \l{setStencil()}{Stencil buffer:} Disabled.
-    \li \l{setStereo()}{Stereo:} Disabled.
-    \li \l{setDirectRendering()}{Direct rendering:} Enabled.
-    \li \l{setOverlay()}{Overlay:} Disabled.
-    \li \l{setSampleBuffers()}{Multisample buffers:} Disabled.
-    \li \l{setPlane()}{Plane:} 1 (i.e., first overlay plane).
-    \endlist
-
-    \sa setDefaultFormat()
-*/
-
-QGLFormat QGLFormat::defaultOverlayFormat()
-{
-    return *defaultOverlayFormatInstance();
-}
-
-/*!
-    Sets a new default QGLFormat for overlay contexts to \a f. This
-    format is used whenever a QGLWidget is created with a format that
-    hasOverlay() enabled.
-
-    For example, to get a double buffered overlay context (if
-    available), use code like this:
-
-    \snippet code/src_opengl_qgl.cpp 5
-
-    As usual, you can find out after widget creation whether the
-    underlying OpenGL system was able to provide the requested
-    specification:
-
-    \snippet code/src_opengl_qgl.cpp 6
-
-    \sa defaultOverlayFormat()
-*/
-
-void QGLFormat::setDefaultOverlayFormat(const QGLFormat &f)
-{
-    QGLFormat *defaultFormat = defaultOverlayFormatInstance();
-    *defaultFormat = f;
-    // Make sure the user doesn't request that the overlays themselves
-    // have overlays, since it is unlikely that the system supports
-    // infinitely many planes...
-    defaultFormat->setOverlay(false);
-}
-
-
-/*!
-    Returns \c true if all the options of the two QGLFormat objects
-    \a a and \a b are equal; otherwise returns \c false.
-
-    \relates QGLFormat
-*/
-
-bool operator==(const QGLFormat& a, const QGLFormat& b)
-{
-    return (a.d == b.d) || ((int) a.d->opts == (int) b.d->opts
-        && a.d->pln == b.d->pln
-        && a.d->alphaSize == b.d->alphaSize
-        && a.d->accumSize == b.d->accumSize
-        && a.d->stencilSize == b.d->stencilSize
-        && a.d->depthSize == b.d->depthSize
-        && a.d->redSize == b.d->redSize
-        && a.d->greenSize == b.d->greenSize
-        && a.d->blueSize == b.d->blueSize
-        && a.d->numSamples == b.d->numSamples
-        && a.d->swapInterval == b.d->swapInterval
-        && a.d->majorVersion == b.d->majorVersion
-        && a.d->minorVersion == b.d->minorVersion
-        && a.d->profile == b.d->profile);
-}
-
-#ifndef QT_NO_DEBUG_STREAM
-QDebug operator<<(QDebug dbg, const QGLFormat &f)
-{
-    const QGLFormatPrivate * const d = f.d;
-
-    QDebugStateSaver saver(dbg);
-    dbg.nospace() << "QGLFormat("
-                  << "options " << d->opts
-                  << ", plane " << d->pln
-                  << ", depthBufferSize " << d->depthSize
-                  << ", accumBufferSize " << d->accumSize
-                  << ", stencilBufferSize " << d->stencilSize
-                  << ", redBufferSize " << d->redSize
-                  << ", greenBufferSize " << d->greenSize
-                  << ", blueBufferSize " << d->blueSize
-                  << ", alphaBufferSize " << d->alphaSize
-                  << ", samples " << d->numSamples
-                  << ", swapInterval " << d->swapInterval
-                  << ", majorVersion " << d->majorVersion
-                  << ", minorVersion " << d->minorVersion
-                  << ", profile " << d->profile
-                  << ')';
-
-    return dbg;
-}
-#endif
-
-
-/*!
-    Returns \c false if all the options of the two QGLFormat objects
-    \a a and \a b are equal; otherwise returns \c true.
-
-    \relates QGLFormat
-*/
-
-bool operator!=(const QGLFormat& a, const QGLFormat& b)
-{
-    return !(a == b);
-}
-
-struct QGLContextGroupList {
-    void append(QGLContextGroup *group) {
-        QMutexLocker locker(&m_mutex);
-        m_list.append(group);
-    }
-
-    void remove(QGLContextGroup *group) {
-        QMutexLocker locker(&m_mutex);
-        m_list.removeOne(group);
-    }
-
-    QList<QGLContextGroup *> m_list;
-    QRecursiveMutex m_mutex;
-};
-
-Q_GLOBAL_STATIC(QGLContextGroupList, qt_context_groups)
-
-/*****************************************************************************
-  QGLContext implementation
- *****************************************************************************/
-
-QGLContextGroup::QGLContextGroup(const QGLContext *context)
-    : m_context(context), m_refs(1)
-{
-    qt_context_groups()->append(this);
-}
-
-QGLContextGroup::~QGLContextGroup()
-{
-    qt_context_groups()->remove(this);
-}
-
-const QGLContext *qt_gl_transfer_context(const QGLContext *ctx)
-{
-    if (!ctx)
-        return 0;
-    QList<const QGLContext *> shares
-        (QGLContextPrivate::contextGroup(ctx)->shares());
-    if (shares.size() >= 2)
-        return (ctx == shares.at(0)) ? shares.at(1) : shares.at(0);
-    else
-        return 0;
-}
-
-QGLContextPrivate::QGLContextPrivate(QGLContext *context)
-    : internal_context(false)
-    , q_ptr(context)
-    , texture_destroyer(0)
-    , functions(0)
-{
-    group = new QGLContextGroup(context);
-
-    texture_destroyer = new QGLTextureDestroyer;
-}
-
-QGLContextPrivate::~QGLContextPrivate()
-{
-    delete functions;
-
-    if (!group->m_refs.deref()) {
-        Q_ASSERT(group->context() == q_ptr);
-        delete group;
-    }
-
-    delete texture_destroyer;
-}
-
-void QGLContextPrivate::init(QPaintDevice *dev, const QGLFormat &format)
-{
-    Q_Q(QGLContext);
-    glFormat = reqFormat = format;
-    valid = false;
-    q->setDevice(dev);
-
-    guiGlContext = 0;
-    ownContext = false;
-    fbo = 0;
-    crWin = false;
-    initDone = false;
-    sharing = false;
-    max_texture_size = -1;
-    version_flags_cached = false;
-    version_flags = QGLFormat::OpenGL_Version_None;
-    current_fbo = 0;
-    default_fbo = 0;
-    active_engine = 0;
-    workaround_needsFullClearOnEveryFrame = false;
-    workaround_brokenFBOReadBack = false;
-    workaround_brokenTexSubImage = false;
-    workaroundsCached = false;
-
-    workaround_brokenTextureFromPixmap = false;
-    workaround_brokenTextureFromPixmap_init = false;
-
-    workaround_brokenAlphaTexSubImage = false;
-    workaround_brokenAlphaTexSubImage_init = false;
-
-    for (int i = 0; i < QT_GL_VERTEX_ARRAY_TRACKED_COUNT; ++i)
-        vertexAttributeArraysEnabledState[i] = false;
-}
-
-QGLContext* QGLContext::currentCtx = 0;
-
-/*
-    QGLTemporaryContext implementation
-*/
-class QGLTemporaryContextPrivate
-{
-public:
-    QWindow *window;
-    QOpenGLContext *context;
-
-    QGLContext *oldContext;
-};
-
-QGLTemporaryContext::QGLTemporaryContext(bool, QWidget *)
-    : d(new QGLTemporaryContextPrivate)
-{
-    d->oldContext = const_cast<QGLContext *>(QGLContext::currentContext());
-
-    d->window = new QWindow;
-    d->window->setSurfaceType(QWindow::OpenGLSurface);
-    d->window->setGeometry(QRect(0, 0, 3, 3));
-    d->window->create();
-
-    d->context = new QOpenGLContext;
-#if !defined(QT_OPENGL_ES)
-    if (QOpenGLContext::openGLModuleType() == QOpenGLContext::LibGL) {
-        // On desktop, request latest released version
-        QSurfaceFormat format;
-#if defined(Q_OS_MAC)
-        // OS X is limited to OpenGL 3.2 Core Profile at present
-        // so set that here. If we use compatibility profile it
-        // only reports 2.x contexts.
-        format.setMajorVersion(3);
-        format.setMinorVersion(2);
-        format.setProfile(QSurfaceFormat::CoreProfile);
-#else
-        format.setMajorVersion(4);
-        format.setMinorVersion(3);
-#endif
-        d->context->setFormat(format);
-    }
-#endif // QT_OPENGL_ES
-    d->context->create();
-    d->context->makeCurrent(d->window);
-}
-
-QGLTemporaryContext::~QGLTemporaryContext()
-{
-    if (d->oldContext)
-        d->oldContext->makeCurrent();
-
-    delete d->context;
-    delete d->window;
-}
-
-/*
-   Read back the contents of the currently bound framebuffer, used in
-   QGLWidget::grabFrameBuffer(), QGLPixelbuffer::toImage() and
-   QGLFramebufferObject::toImage()
-*/
-
-static void convertFromGLImage(QImage &img, int w, int h, bool alpha_format, bool include_alpha)
-{
-    Q_ASSERT(!img.isNull());
-    if (QSysInfo::ByteOrder == QSysInfo::BigEndian) {
-        // OpenGL gives RGBA; Qt wants ARGB
-        uint *p = (uint*)img.bits();
-        uint *end = p + w*h;
-        if (alpha_format && include_alpha) {
-            while (p < end) {
-                uint a = *p << 24;
-                *p = (*p >> 8) | a;
-                p++;
-            }
-        } else {
-            // This is an old legacy fix for PowerPC based Macs, which
-            // we shouldn't remove
-            while (p < end) {
-                *p = 0xff000000 | (*p>>8);
-                ++p;
-            }
-        }
-    } else {
-        // OpenGL gives ABGR (i.e. RGBA backwards); Qt wants ARGB
-        for (int y = 0; y < h; y++) {
-            uint *q = (uint*)img.scanLine(y);
-            for (int x=0; x < w; ++x) {
-                const uint pixel = *q;
-                if (alpha_format && include_alpha) {
-                    *q = ((pixel << 16) & 0xff0000) | ((pixel >> 16) & 0xff)
-                         | (pixel & 0xff00ff00);
-                } else {
-                    *q = 0xff000000 | ((pixel << 16) & 0xff0000)
-                         | ((pixel >> 16) & 0xff) | (pixel & 0x00ff00);
-                }
-
-                q++;
-            }
-        }
-
-    }
-    img = img.mirrored();
-}
-
-QImage qt_gl_read_frame_buffer(const QSize &size, bool alpha_format, bool include_alpha)
-{
-    QImage img(size, (alpha_format && include_alpha) ? QImage::Format_ARGB32_Premultiplied
-                                                     : QImage::Format_RGB32);
-    if (img.isNull())
-        return QImage();
-    int w = size.width();
-    int h = size.height();
-    qgl_functions()->glReadPixels(0, 0, w, h, GL_RGBA, GL_UNSIGNED_BYTE, img.bits());
-    convertFromGLImage(img, w, h, alpha_format, include_alpha);
-    return img;
-}
-
-QImage qt_gl_read_texture(const QSize &size, bool alpha_format, bool include_alpha)
-{
-    QImage img(size, alpha_format ? QImage::Format_ARGB32_Premultiplied : QImage::Format_RGB32);
-    if (img.isNull())
-        return QImage();
-    int w = size.width();
-    int h = size.height();
-#ifndef QT_OPENGL_ES
-    if (!QOpenGLContext::currentContext()->isOpenGLES()) {
-
-        qgl1_functions()->glGetTexImage(GL_TEXTURE_2D, 0, GL_RGBA, GL_UNSIGNED_BYTE, img.bits());
-    }
-#endif // QT_OPENGL_ES
-    convertFromGLImage(img, w, h, alpha_format, include_alpha);
-    return img;
-}
-
-Q_GLOBAL_STATIC(QGLTextureCache, qt_gl_texture_cache)
-
-QGLTextureCache::QGLTextureCache()
-    : m_cache(64*1024) // cache ~64 MB worth of textures - this is not accurate though
-{
-    QImagePixmapCleanupHooks::instance()->addPlatformPixmapModificationHook(cleanupTexturesForPixampData);
-    QImagePixmapCleanupHooks::instance()->addPlatformPixmapDestructionHook(cleanupBeforePixmapDestruction);
-    QImagePixmapCleanupHooks::instance()->addImageHook(cleanupTexturesForCacheKey);
-}
-
-QGLTextureCache::~QGLTextureCache()
-{
-    QImagePixmapCleanupHooks::instance()->removePlatformPixmapModificationHook(cleanupTexturesForPixampData);
-    QImagePixmapCleanupHooks::instance()->removePlatformPixmapDestructionHook(cleanupBeforePixmapDestruction);
-    QImagePixmapCleanupHooks::instance()->removeImageHook(cleanupTexturesForCacheKey);
-}
-
-void QGLTextureCache::insert(QGLContext* ctx, qint64 key, QGLTexture* texture, int cost)
-{
-    QWriteLocker locker(&m_lock);
-    const QGLTextureCacheKey cacheKey = {key, QGLContextPrivate::contextGroup(ctx)};
-    const bool inserted = m_cache.insert(cacheKey, texture, cost);
-    Q_UNUSED(inserted) Q_ASSERT(inserted);
-}
-
-void QGLTextureCache::remove(qint64 key)
-{
-    QWriteLocker locker(&m_lock);
-    QMutexLocker groupLocker(&qt_context_groups()->m_mutex);
-    QList<QGLContextGroup *>::const_iterator it = qt_context_groups()->m_list.constBegin();
-    while (it != qt_context_groups()->m_list.constEnd()) {
-        const QGLTextureCacheKey cacheKey = {key, *it};
-        m_cache.remove(cacheKey);
-        ++it;
-    }
-}
-
-bool QGLTextureCache::remove(QGLContext* ctx, GLuint textureId)
-{
-    QWriteLocker locker(&m_lock);
-    QList<QGLTextureCacheKey> keys = m_cache.keys();
-    for (int i = 0; i < keys.size(); ++i) {
-        QGLTexture *tex = m_cache.object(keys.at(i));
-        if (tex->id == textureId && tex->context == ctx) {
-            tex->options |= QGLContext::MemoryManagedBindOption; // forces a glDeleteTextures() call
-            m_cache.remove(keys.at(i));
-            return true;
-        }
-    }
-    return false;
-}
-
-void QGLTextureCache::removeContextTextures(QGLContext* ctx)
-{
-    QWriteLocker locker(&m_lock);
-    QList<QGLTextureCacheKey> keys = m_cache.keys();
-    for (int i = 0; i < keys.size(); ++i) {
-        const QGLTextureCacheKey &key = keys.at(i);
-        if (m_cache.object(key)->context == ctx)
-            m_cache.remove(key);
-    }
-}
-
-/*
-  a hook that removes textures from the cache when a pixmap/image
-  is deref'ed
-*/
-void QGLTextureCache::cleanupTexturesForCacheKey(qint64 cacheKey)
-{
-    qt_gl_texture_cache()->remove(cacheKey);
-}
-
-
-void QGLTextureCache::cleanupTexturesForPixampData(QPlatformPixmap* pmd)
-{
-    cleanupTexturesForCacheKey(pmd->cacheKey());
-}
-
-void QGLTextureCache::cleanupBeforePixmapDestruction(QPlatformPixmap* pmd)
-{
-    // Remove any bound textures first:
-    cleanupTexturesForPixampData(pmd);
-}
-
-QGLTextureCache *QGLTextureCache::instance()
-{
-    return qt_gl_texture_cache();
-}
-
-// DDS format structure
-struct DDSFormat {
-    quint32 dwSize;
-    quint32 dwFlags;
-    quint32 dwHeight;
-    quint32 dwWidth;
-    quint32 dwLinearSize;
-    quint32 dummy1;
-    quint32 dwMipMapCount;
-    quint32 dummy2[11];
-    struct {
-        quint32 dummy3[2];
-        quint32 dwFourCC;
-        quint32 dummy4[5];
-    } ddsPixelFormat;
-};
-
-// compressed texture pixel formats
-#define FOURCC_DXT1  0x31545844
-#define FOURCC_DXT2  0x32545844
-#define FOURCC_DXT3  0x33545844
-#define FOURCC_DXT4  0x34545844
-#define FOURCC_DXT5  0x35545844
-
-// ####TODO Properly #ifdef this class to use #define symbols actually defined
-// by system GL includes
-#ifndef GL_COMPRESSED_RGB_S3TC_DXT1_EXT
-#define GL_COMPRESSED_RGB_S3TC_DXT1_EXT   0x83F0
-#endif
-
-#ifndef GL_COMPRESSED_RGBA_S3TC_DXT1_EXT
-#define GL_COMPRESSED_RGBA_S3TC_DXT1_EXT  0x83F1
-#endif
-
-#ifndef GL_COMPRESSED_RGBA_S3TC_DXT3_EXT
-#define GL_COMPRESSED_RGBA_S3TC_DXT3_EXT 0x83F2
-#endif
-
-#ifndef GL_COMPRESSED_RGBA_S3TC_DXT5_EXT
-#define GL_COMPRESSED_RGBA_S3TC_DXT5_EXT 0x83F3
-#endif
-
-#ifndef GL_GENERATE_MIPMAP_SGIS
-#define GL_GENERATE_MIPMAP_SGIS       0x8191
-#define GL_GENERATE_MIPMAP_HINT_SGIS  0x8192
-#endif
-
-/*!
-    \class QGLContext
-    \inmodule QtOpenGL
-    \obsolete
-
-    \brief The QGLContext class encapsulates an OpenGL rendering context.
-
-    An OpenGL rendering context is a complete set of OpenGL state
-    variables. The rendering context's \l {QGL::FormatOption} {format}
-    is set in the constructor, but it can also be set later with
-    setFormat(). The format options that are actually set are returned
-    by format(); the options you asked for are returned by
-    requestedFormat(). Note that after a QGLContext object has been
-    constructed, the actual OpenGL context must be created by
-    explicitly calling the \l{create()}
-    function. The makeCurrent() function makes this context the
-    current rendering context. You can make \e no context current
-    using doneCurrent(). The reset() function will reset the context
-    and make it invalid.
-
-    You can examine properties of the context with, e.g. isValid(),
-    isSharing(), initialized(), windowCreated() and
-    overlayTransparentColor().
-
-    If you're using double buffering you can swap the screen contents
-    with the off-screen buffer using swapBuffers().
-
-    Please note that QGLContext is not thread safe.
-*/
-
-/*!
-    \enum QGLContext::BindOption
-    \since 4.6
-
-    A set of options to decide how to bind a texture using bindTexture().
-
-    \value NoBindOption Don't do anything, pass the texture straight
-    through.
-
-    \value InvertedYBindOption Specifies that the texture should be flipped
-    over the X axis so that the texture coordinate 0,0 corresponds to
-    the top left corner. Inverting the texture implies a deep copy
-    prior to upload.
-
-    \value MipmapBindOption Specifies that bindTexture() should try
-    to generate mipmaps.  If the GL implementation supports the \c
-    GL_SGIS_generate_mipmap extension, mipmaps will be automatically
-    generated for the texture. Mipmap generation is only supported for
-    the \c GL_TEXTURE_2D target.
-
-    \value PremultipliedAlphaBindOption Specifies that the image should be
-    uploaded with premultiplied alpha and does a conversion accordingly.
-
-    \value LinearFilteringBindOption Specifies that the texture filtering
-    should be set to GL_LINEAR. Default is GL_NEAREST. If mipmap is
-    also enabled, filtering will be set to GL_LINEAR_MIPMAP_LINEAR.
-
-    \value DefaultBindOption In Qt 4.5 and earlier, bindTexture()
-    would mirror the image and automatically generate mipmaps. This
-    option helps preserve this default behavior.
-
-    \omitvalue CanFlipNativePixmapBindOption \omit Used by x11 from pixmap to choose
-    whether or not it can bind the pixmap upside down or not. \endomit
-
-    \omitvalue MemoryManagedBindOption \omit Used by paint engines to
-    indicate that the pixmap should be memory managed along side with
-    the pixmap/image that it stems from, e.g. installing destruction
-    hooks in them. \endomit
-
-    \omitvalue TemporarilyCachedBindOption \omit Used by paint engines on some
-    platforms to indicate that the pixmap or image texture is possibly
-    cached only temporarily and must be destroyed immediately after the use. \endomit
-
-    \omitvalue InternalBindOption
-*/
-
-/*!
-    \obsolete
-
-    Constructs an OpenGL context for the given paint \a device, which
-    can be a widget or a pixmap. The \a format specifies several
-    display options for the context.
-
-    If the underlying OpenGL/Window system cannot satisfy all the
-    features requested in \a format, the nearest subset of features
-    will be used. After creation, the format() method will return the
-    actual format obtained.
-
-    Note that after a QGLContext object has been constructed, \l
-    create() must be called explicitly to create the actual OpenGL
-    context. The context will be \l {isValid()}{invalid} if it was not
-    possible to obtain a GL context at all.
-*/
-
-QGLContext::QGLContext(const QGLFormat &format, QPaintDevice *device)
-    : d_ptr(new QGLContextPrivate(this))
-{
-    Q_D(QGLContext);
-    d->init(device, format);
-}
-
-/*!
-    Constructs an OpenGL context with the given \a format which
-    specifies several display options for the context.
-
-    If the underlying OpenGL/Window system cannot satisfy all the
-    features requested in \a format, the nearest subset of features
-    will be used. After creation, the format() method will return the
-    actual format obtained.
-
-    Note that after a QGLContext object has been constructed, \l
-    create() must be called explicitly to create the actual OpenGL
-    context. The context will be \l {isValid()}{invalid} if it was not
-    possible to obtain a GL context at all.
-
-    \sa format(), isValid()
-*/
-QGLContext::QGLContext(const QGLFormat &format)
-    : d_ptr(new QGLContextPrivate(this))
-{
-    Q_D(QGLContext);
-    d->init(0, format);
-}
-
-static void qDeleteQGLContext(void *handle)
-{
-    QGLContext *context = static_cast<QGLContext *>(handle);
-    delete context;
-}
-
-QGLContext::QGLContext(QOpenGLContext *context)
-    : d_ptr(new QGLContextPrivate(this))
-{
-    Q_D(QGLContext);
-    d->init(0, QGLFormat::fromSurfaceFormat(context->format()));
-    d->guiGlContext = context;
-    d->guiGlContext->setQGLContextHandle(this, qDeleteQGLContext);
-    d->ownContext = false;
-    d->valid = context->isValid();
-    d->setupSharing();
-}
-
-/*!
-    Returns the OpenGL context handle.
-*/
-QOpenGLContext *QGLContext::contextHandle() const
-{
-    Q_D(const QGLContext);
-    return d->guiGlContext;
-}
-
-/*!
-    Returns an OpenGL context for the window context specified by the \a context
-    parameter.
-*/
-QGLContext *QGLContext::fromOpenGLContext(QOpenGLContext *context)
-{
-    if (!context)
-        return 0;
-    if (context->qGLContextHandle()) {
-        return reinterpret_cast<QGLContext *>(context->qGLContextHandle());
-    }
-    QGLContext *glContext = new QGLContext(context);
-    //Don't call create on context. This can cause the platformFormat to be set on the widget, which
-    //will cause the platformWindow to be recreated.
-    return glContext;
-}
-
-/*!
-    Destroys the OpenGL context and frees its resources.
-*/
-
-QGLContext::~QGLContext()
-{
-    // remove any textures cached in this context
-    QGLTextureCache::instance()->removeContextTextures(this);
-
-    // clean up resources specific to this context
-    d_ptr->cleanup();
-
-    QGLSignalProxy::instance()->emitAboutToDestroyContext(this);
-    reset();
-}
-
-void QGLContextPrivate::cleanup()
-{
-}
-
-#define ctx q_ptr
-void QGLContextPrivate::setVertexAttribArrayEnabled(int arrayIndex, bool enabled)
-{
-    Q_Q(QGLContext);
-    Q_ASSERT(arrayIndex < QT_GL_VERTEX_ARRAY_TRACKED_COUNT);
-#ifdef glEnableVertexAttribArray
-    Q_ASSERT(glEnableVertexAttribArray);
-#endif
-
-    if (vertexAttributeArraysEnabledState[arrayIndex] && !enabled)
-        q->functions()->glDisableVertexAttribArray(arrayIndex);
-
-    if (!vertexAttributeArraysEnabledState[arrayIndex] && enabled)
-        q->functions()->glEnableVertexAttribArray(arrayIndex);
-
-    vertexAttributeArraysEnabledState[arrayIndex] = enabled;
-}
-
-void QGLContextPrivate::syncGlState()
-{
-    Q_Q(QGLContext);
-#ifdef glEnableVertexAttribArray
-    Q_ASSERT(glEnableVertexAttribArray);
-#endif
-    for (int i = 0; i < QT_GL_VERTEX_ARRAY_TRACKED_COUNT; ++i) {
-        if (vertexAttributeArraysEnabledState[i])
-            q->functions()->glEnableVertexAttribArray(i);
-        else
-            q->functions()->glDisableVertexAttribArray(i);
-    }
-
-}
-#undef ctx
-
-void QGLContextPrivate::swapRegion(const QRegion &)
-{
-    Q_Q(QGLContext);
-    q->swapBuffers();
-}
-
-/*!
-    \overload
-
-    Reads the compressed texture file \a fileName and generates a 2D GL
-    texture from it.
-
-    This function can load DirectDrawSurface (DDS) textures in the
-    DXT1, DXT3 and DXT5 DDS formats if the \c GL_ARB_texture_compression
-    and \c GL_EXT_texture_compression_s3tc extensions are supported.
-
-    Since 4.6.1, textures in the ETC1 format can be loaded if the
-    \c GL_OES_compressed_ETC1_RGB8_texture extension is supported
-    and the ETC1 texture has been encapsulated in the PVR container format.
-    Also, textures in the PVRTC2 and PVRTC4 formats can be loaded
-    if the \c GL_IMG_texture_compression_pvrtc extension is supported.
-
-    \sa deleteTexture()
-*/
-
-GLuint QGLContext::bindTexture(const QString &fileName)
-{
-    QGLTexture texture(this);
-    QSize size = texture.bindCompressedTexture(fileName);
-    if (!size.isValid())
-        return 0;
-    return texture.id;
-}
-
-static inline QRgb qt_gl_convertToGLFormatHelper(QRgb src_pixel, GLenum texture_format)
-{
-    if (texture_format == GL_BGRA) {
-        if (QSysInfo::ByteOrder == QSysInfo::BigEndian) {
-            return ((src_pixel << 24) & 0xff000000)
-                   | ((src_pixel >> 24) & 0x000000ff)
-                   | ((src_pixel << 8) & 0x00ff0000)
-                   | ((src_pixel >> 8) & 0x0000ff00);
-        } else {
-            return src_pixel;
-        }
-    } else {  // GL_RGBA
-        if (QSysInfo::ByteOrder == QSysInfo::BigEndian) {
-            return (src_pixel << 8) | ((src_pixel >> 24) & 0xff);
-        } else {
-            return ((src_pixel << 16) & 0xff0000)
-                   | ((src_pixel >> 16) & 0xff)
-                   | (src_pixel & 0xff00ff00);
-        }
-    }
-}
-
-static void convertToGLFormatHelper(QImage &dst, const QImage &img, GLenum texture_format)
-{
-    Q_ASSERT(dst.depth() == 32);
-    Q_ASSERT(img.depth() == 32);
-
-    if (dst.size() != img.size()) {
-        int target_width = dst.width();
-        int target_height = dst.height();
-        qreal sx = target_width / qreal(img.width());
-        qreal sy = target_height / qreal(img.height());
-
-        quint32 *dest = (quint32 *) dst.scanLine(0); // NB! avoid detach here
-        const uchar *srcPixels = img.constScanLine(img.height() - 1);
-        int sbpl = img.bytesPerLine();
-        int dbpl = dst.bytesPerLine();
-
-        int ix = int(0x00010000 / sx);
-        int iy = int(0x00010000 / sy);
-
-        quint32 basex = int(0.5 * ix);
-        quint32 srcy = int(0.5 * iy);
-
-        // scale, swizzle and mirror in one loop
-        while (target_height--) {
-            const uint *src = (const quint32 *) (srcPixels - (srcy >> 16) * sbpl);
-            int srcx = basex;
-            for (int x=0; x<target_width; ++x) {
-                dest[x] = qt_gl_convertToGLFormatHelper(src[srcx >> 16], texture_format);
-                srcx += ix;
-            }
-            dest = (quint32 *)(((uchar *) dest) + dbpl);
-            srcy += iy;
-        }
-    } else {
-        const int width = img.width();
-        const int height = img.height();
-        const uint *p = (const uint*) img.scanLine(img.height() - 1);
-        uint *q = (uint*) dst.scanLine(0);
-
-        if (texture_format == GL_BGRA) {
-            if (QSysInfo::ByteOrder == QSysInfo::BigEndian) {
-                // mirror + swizzle
-                for (int i=0; i < height; ++i) {
-                    const uint *end = p + width;
-                    while (p < end) {
-                        *q = ((*p << 24) & 0xff000000)
-                             | ((*p >> 24) & 0x000000ff)
-                             | ((*p << 8) & 0x00ff0000)
-                             | ((*p >> 8) & 0x0000ff00);
-                        p++;
-                        q++;
-                    }
-                    p -= 2 * width;
-                }
-            } else {
-                const uint bytesPerLine = img.bytesPerLine();
-                for (int i=0; i < height; ++i) {
-                    memcpy(q, p, bytesPerLine);
-                    q += width;
-                    p -= width;
-                }
-            }
-        } else {
-            if (QSysInfo::ByteOrder == QSysInfo::BigEndian) {
-                for (int i=0; i < height; ++i) {
-                    const uint *end = p + width;
-                    while (p < end) {
-                        *q = (*p << 8) | ((*p >> 24) & 0xff);
-                        p++;
-                        q++;
-                    }
-                    p -= 2 * width;
-                }
-            } else {
-                for (int i=0; i < height; ++i) {
-                    const uint *end = p + width;
-                    while (p < end) {
-                        *q = ((*p << 16) & 0xff0000) | ((*p >> 16) & 0xff) | (*p & 0xff00ff00);
-                        p++;
-                        q++;
-                    }
-                    p -= 2 * width;
-                }
-            }
-        }
-    }
-}
-
-/*! \internal */
-QGLTexture *QGLContextPrivate::bindTexture(const QImage &image, GLenum target, GLint format,
-                                           QGLContext::BindOptions options)
-{
-    Q_Q(QGLContext);
-
-    const qint64 key = image.cacheKey();
-    QGLTexture *texture = textureCacheLookup(key, target);
-    if (texture) {
-        if (image.paintingActive()) {
-            // A QPainter is active on the image - take the safe route and replace the texture.
-            q->deleteTexture(texture->id);
-            texture = 0;
-        } else {
-            qgl_functions()->glBindTexture(target, texture->id);
-            return texture;
-        }
-    }
-
-    if (!texture)
-        texture = bindTexture(image, target, format, key, options);
-    // NOTE: bindTexture(const QImage&, GLenum, GLint, const qint64, bool) should never return null
-    Q_ASSERT(texture);
-
-    // Enable the cleanup hooks for this image so that the texture cache entry is removed when the
-    // image gets deleted:
-    QImagePixmapCleanupHooks::enableCleanupHooks(image);
-
-    return texture;
-}
-
-// #define QGL_BIND_TEXTURE_DEBUG
-
-// ####TODO Properly #ifdef this file to use #define symbols actually defined
-// by OpenGL/ES includes
-#ifndef GL_UNSIGNED_INT_8_8_8_8_REV
-#define GL_UNSIGNED_INT_8_8_8_8_REV 0x8367
-#endif
-
-// map from Qt's ARGB endianness-dependent format to GL's big-endian RGBA layout
-static inline void qgl_byteSwapImage(QImage &img, GLenum pixel_type)
-{
-    const int width = img.width();
-    const int height = img.height();
-
-    if (pixel_type == GL_UNSIGNED_INT_8_8_8_8_REV
-        || (pixel_type == GL_UNSIGNED_BYTE && QSysInfo::ByteOrder == QSysInfo::LittleEndian))
-    {
-        for (int i = 0; i < height; ++i) {
-            uint *p = (uint *) img.scanLine(i);
-            for (int x = 0; x < width; ++x)
-                p[x] = ((p[x] << 16) & 0xff0000) | ((p[x] >> 16) & 0xff) | (p[x] & 0xff00ff00);
-        }
-    } else {
-        for (int i = 0; i < height; ++i) {
-            uint *p = (uint *) img.scanLine(i);
-            for (int x = 0; x < width; ++x)
-                p[x] = (p[x] << 8) | ((p[x] >> 24) & 0xff);
-        }
-    }
-}
-
-QGLTexture* QGLContextPrivate::bindTexture(const QImage &image, GLenum target, GLint internalFormat,
-                                           const qint64 key, QGLContext::BindOptions options)
-{
-    Q_Q(QGLContext);
-    QOpenGLFunctions *funcs = qgl_functions();
-
-#ifdef QGL_BIND_TEXTURE_DEBUG
-    printf("QGLContextPrivate::bindTexture(), imageSize=(%d,%d), internalFormat =0x%x, options=%x, key=%llx\n",
-           image.width(), image.height(), internalFormat, int(options), key);
-    QTime time;
-    time.start();
-#endif
-
-#ifndef QT_NO_DEBUG
-    // Reset the gl error stack...git
-    while (funcs->glGetError() != GL_NO_ERROR) ;
-#endif
-
-    // Scale the pixmap if needed. GL textures needs to have the
-    // dimensions 2^n+2(border) x 2^m+2(border), unless we're using GL
-    // 2.0 or use the GL_TEXTURE_RECTANGLE texture target
-    int tx_w = qNextPowerOfTwo(image.width() - 1);
-    int tx_h = qNextPowerOfTwo(image.height() - 1);
-
-    QImage img = image;
-
-    if (!qgl_extensions()->hasOpenGLFeature(QOpenGLFunctions::NPOTTextures)
-        && !(QGLFormat::openGLVersionFlags() & QGLFormat::OpenGL_ES_Version_2_0)
-        && (target == GL_TEXTURE_2D && (tx_w != image.width() || tx_h != image.height())))
-    {
-        img = img.scaled(tx_w, tx_h);
-#ifdef QGL_BIND_TEXTURE_DEBUG
-        printf(" - upscaled to %dx%d (%d ms)\n", tx_w, tx_h, time.elapsed());
-
-#endif
-    }
-
-    GLuint filtering = options & QGLContext::LinearFilteringBindOption ? GL_LINEAR : GL_NEAREST;
-
-    GLuint tx_id;
-    funcs->glGenTextures(1, &tx_id);
-    funcs->glBindTexture(target, tx_id);
-    funcs->glTexParameteri(target, GL_TEXTURE_MAG_FILTER, filtering);
-
-    QOpenGLContext *ctx = QOpenGLContext::currentContext();
-    bool genMipmap = !ctx->isOpenGLES();
-    if (glFormat.directRendering()
-        && (qgl_extensions()->hasOpenGLExtension(QOpenGLExtensions::GenerateMipmap))
-        && target == GL_TEXTURE_2D
-        && (options & QGLContext::MipmapBindOption))
-    {
-#if !defined(QT_OPENGL_ES_2)
-        if (genMipmap) {
-            funcs->glHint(GL_GENERATE_MIPMAP_HINT_SGIS, GL_NICEST);
-            funcs->glTexParameteri(target, GL_GENERATE_MIPMAP_SGIS, GL_TRUE);
-        } else {
-            funcs->glHint(GL_GENERATE_MIPMAP_HINT, GL_NICEST);
-            genMipmap = true;
-        }
-#else
-        funcs->glHint(GL_GENERATE_MIPMAP_HINT, GL_NICEST);
-        genMipmap = true;
-#endif
-        funcs->glTexParameteri(target, GL_TEXTURE_MIN_FILTER, options & QGLContext::LinearFilteringBindOption
-                               ? GL_LINEAR_MIPMAP_LINEAR : GL_NEAREST_MIPMAP_NEAREST);
-#ifdef QGL_BIND_TEXTURE_DEBUG
-        printf(" - generating mipmaps (%d ms)\n", time.elapsed());
-#endif
-    } else {
-        funcs->glTexParameteri(target, GL_TEXTURE_MIN_FILTER, filtering);
-    }
-
-    QImage::Format target_format = img.format();
-    bool premul = options & QGLContext::PremultipliedAlphaBindOption;
-    bool needsbyteswap = true;
-    GLenum externalFormat;
-    GLuint pixel_type;
-    if (target_format == QImage::Format_RGBA8888
-        || target_format == QImage::Format_RGBA8888_Premultiplied
-        || target_format == QImage::Format_RGBX8888) {
-        externalFormat = GL_RGBA;
-        pixel_type = GL_UNSIGNED_BYTE;
-        needsbyteswap = false;
-    } else if (qgl_extensions()->hasOpenGLExtension(QOpenGLExtensions::BGRATextureFormat)) {
-        externalFormat = GL_BGRA;
-        needsbyteswap = false;
-        if (QGLFormat::openGLVersionFlags() & QGLFormat::OpenGL_Version_1_2)
-            pixel_type = GL_UNSIGNED_INT_8_8_8_8_REV;
-        else
-            pixel_type = GL_UNSIGNED_BYTE;
-    } else {
-        externalFormat = GL_RGBA;
-        pixel_type = GL_UNSIGNED_BYTE;
-    }
-
-    switch (target_format) {
-    case QImage::Format_ARGB32:
-        if (premul) {
-            img = img.convertToFormat(target_format = QImage::Format_ARGB32_Premultiplied);
-#ifdef QGL_BIND_TEXTURE_DEBUG
-            printf(" - converted ARGB32 -> ARGB32_Premultiplied (%d ms) \n", time.elapsed());
-#endif
-        }
-        break;
-    case QImage::Format_ARGB32_Premultiplied:
-        if (!premul) {
-            img = img.convertToFormat(target_format = QImage::Format_ARGB32);
-#ifdef QGL_BIND_TEXTURE_DEBUG
-            printf(" - converted ARGB32_Premultiplied -> ARGB32 (%d ms)\n", time.elapsed());
-#endif
-        }
-        break;
-    case QImage::Format_RGBA8888:
-        if (premul) {
-            img = img.convertToFormat(target_format = QImage::Format_RGBA8888_Premultiplied);
-#ifdef QGL_BIND_TEXTURE_DEBUG
-            printf(" - converted RGBA8888 -> RGBA8888_Premultiplied (%d ms) \n", time.elapsed());
-#endif
-        }
-        break;
-    case QImage::Format_RGBA8888_Premultiplied:
-        if (!premul) {
-            img = img.convertToFormat(target_format = QImage::Format_RGBA8888);
-#ifdef QGL_BIND_TEXTURE_DEBUG
-            printf(" - converted RGBA8888_Premultiplied -> RGBA8888 (%d ms) \n", time.elapsed());
-#endif
-        }
-        break;
-    case QImage::Format_RGB16:
-        pixel_type = GL_UNSIGNED_SHORT_5_6_5;
-        externalFormat = GL_RGB;
-        internalFormat = GL_RGB;
-        needsbyteswap = false;
-        break;
-    case QImage::Format_RGB32:
-    case QImage::Format_RGBX8888:
-        break;
-    default:
-        // Ideally more formats would be converted directly to an RGBA8888 format,
-        // but we are only guaranteed to have a fast conversion to an ARGB format.
-        if (img.hasAlphaChannel()) {
-            img = img.convertToFormat(premul
-                                      ? QImage::Format_ARGB32_Premultiplied
-                                      : QImage::Format_ARGB32);
-#ifdef QGL_BIND_TEXTURE_DEBUG
-            printf(" - converted to 32-bit alpha format (%d ms)\n", time.elapsed());
-#endif
-        } else {
-            img = img.convertToFormat(QImage::Format_RGB32);
-#ifdef QGL_BIND_TEXTURE_DEBUG
-            printf(" - converted to 32-bit (%d ms)\n", time.elapsed());
-#endif
-        }
-    }
-
-    if (options & QGLContext::InvertedYBindOption) {
-        if (img.isDetached()) {
-            int ipl = img.bytesPerLine() / 4;
-            int h = img.height();
-            for (int y=0; y<h/2; ++y) {
-                int *a = (int *) img.scanLine(y);
-                int *b = (int *) img.scanLine(h - y - 1);
-                for (int x=0; x<ipl; ++x)
-                    qSwap(a[x], b[x]);
-            }
-        } else {
-            // Create a new image and copy across.  If we use the
-            // above in-place code then a full copy of the image is
-            // made before the lines are swapped, which processes the
-            // data twice.  This version should only do it once.
-            img = img.mirrored();
-        }
-#ifdef QGL_BIND_TEXTURE_DEBUG
-            printf(" - flipped bits over y (%d ms)\n", time.elapsed());
-#endif
-    }
-
-    if (needsbyteswap) {
-        // The only case where we end up with a depth different from
-        // 32 in the switch above is for the RGB16 case, where we do
-        // not need a byteswap.
-        Q_ASSERT(img.depth() == 32);
-        qgl_byteSwapImage(img, pixel_type);
-#ifdef QGL_BIND_TEXTURE_DEBUG
-            printf(" - did byte swapping (%d ms)\n", time.elapsed());
-#endif
-    }
-    if (ctx->isOpenGLES()) {
-        // OpenGL/ES requires that the internal and external formats be
-        // identical.
-        internalFormat = externalFormat;
-    }
-#ifdef QGL_BIND_TEXTURE_DEBUG
-    printf(" - uploading, image.format=%d, externalFormat=0x%x, internalFormat=0x%x, pixel_type=0x%x\n",
-           img.format(), externalFormat, internalFormat, pixel_type);
-#endif
-
-    const QImage &constRef = img; // to avoid detach in bits()...
-    funcs->glTexImage2D(target, 0, internalFormat, img.width(), img.height(), 0, externalFormat,
-                        pixel_type, constRef.bits());
-    if (genMipmap && ctx->isOpenGLES())
-        q->functions()->glGenerateMipmap(target);
-#ifndef QT_NO_DEBUG
-    GLenum error = funcs->glGetError();
-    if (error != GL_NO_ERROR) {
-        qWarning(" - texture upload failed, error code 0x%x, enum: %d (%x)\n", error, target, target);
-    }
-#endif
-
-#ifdef QGL_BIND_TEXTURE_DEBUG
-    static int totalUploadTime = 0;
-    totalUploadTime += time.elapsed();
-    printf(" - upload done in %d ms, (accumulated: %d ms)\n", time.elapsed(), totalUploadTime);
-#endif
-
-
-    // this assumes the size of a texture is always smaller than the max cache size
-    int cost = img.width()*img.height()*4/1024;
-    QGLTexture *texture = new QGLTexture(q, tx_id, target, options);
-    QGLTextureCache::instance()->insert(q, key, texture, cost);
-
-    return texture;
-}
-
-QGLTexture *QGLContextPrivate::textureCacheLookup(const qint64 key, GLenum target)
-{
-    Q_Q(QGLContext);
-    QGLTexture *texture = QGLTextureCache::instance()->getTexture(q, key);
-    if (texture && texture->target == target
-        && (texture->context == q || QGLContext::areSharing(q, texture->context)))
-    {
-        return texture;
-    }
-    return 0;
-}
-
-/*! \internal */
-QGLTexture *QGLContextPrivate::bindTexture(const QPixmap &pixmap, GLenum target, GLint format, QGLContext::BindOptions options)
-{
-    Q_Q(QGLContext);
-    QPlatformPixmap *pd = pixmap.handle();
-    Q_UNUSED(pd);
-
-    const qint64 key = pixmap.cacheKey();
-    QGLTexture *texture = textureCacheLookup(key, target);
-    if (texture) {
-        if (pixmap.paintingActive()) {
-            // A QPainter is active on the pixmap - take the safe route and replace the texture.
-            q->deleteTexture(texture->id);
-            texture = 0;
-        } else {
-            qgl_functions()->glBindTexture(target, texture->id);
-            return texture;
-        }
-    }
-
-    if (!texture) {
-        QImage image;
-        QPaintEngine* paintEngine = pixmap.paintEngine();
-        if (!paintEngine || paintEngine->type() != QPaintEngine::Raster)
-            image = pixmap.toImage();
-        else {
-            // QRasterPixmapData::toImage() will deep-copy the backing QImage if there's an active QPainter on it.
-            // For performance reasons, we don't want that here, so we temporarily redirect the paint engine.
-            QPaintDevice* currentPaintDevice = paintEngine->paintDevice();
-            paintEngine->setPaintDevice(0);
-            image = pixmap.toImage();
-            paintEngine->setPaintDevice(currentPaintDevice);
-        }
-
-        // If the system depth is 16 and the pixmap doesn't have an alpha channel
-        // then we convert it to RGB16 in the hope that it gets uploaded as a 16
-        // bit texture which is much faster to access than a 32-bit one.
-        if (pixmap.depth() == 16 && !image.hasAlphaChannel() )
-            image = image.convertToFormat(QImage::Format_RGB16);
-        texture = bindTexture(image, target, format, key, options);
-    }
-    // NOTE: bindTexture(const QImage&, GLenum, GLint, const qint64, bool) should never return null
-    Q_ASSERT(texture);
-
-    if (texture->id > 0)
-        QImagePixmapCleanupHooks::enableCleanupHooks(pixmap);
-
-    return texture;
-}
-
-/*! \internal */
-int QGLContextPrivate::maxTextureSize()
-{
-    if (max_texture_size != -1)
-        return max_texture_size;
-
-    QOpenGLFunctions *funcs = qgl_functions();
-    funcs->glGetIntegerv(GL_MAX_TEXTURE_SIZE, &max_texture_size);
-
-#ifndef QT_OPENGL_ES
-    Q_Q(QGLContext);
-    if (!q->contextHandle()->isOpenGLES()) {
-        GLenum proxy = GL_PROXY_TEXTURE_2D;
-
-        GLint size;
-        GLint next = 64;
-        funcs->glTexImage2D(proxy, 0, GL_RGBA, next, next, 0, GL_RGBA, GL_UNSIGNED_BYTE, 0);
-        QOpenGLFunctions_1_1 *gl1funcs = qgl1_functions();
-        gl1funcs->glGetTexLevelParameteriv(proxy, 0, GL_TEXTURE_WIDTH, &size);
-        if (size == 0) {
-            return max_texture_size;
-        }
-        do {
-            size = next;
-            next = size * 2;
-
-            if (next > max_texture_size)
-                break;
-            funcs->glTexImage2D(proxy, 0, GL_RGBA, next, next, 0, GL_RGBA, GL_UNSIGNED_BYTE, 0);
-            gl1funcs->glGetTexLevelParameteriv(proxy, 0, GL_TEXTURE_WIDTH, &next);
-        } while (next > size);
-
-        max_texture_size = size;
-    }
-#endif
-
-    return max_texture_size;
-}
-
-/*!
-  Returns a QGLFunctions object that is initialized for this context.
- */
-QGLFunctions *QGLContext::functions() const
-{
-    QGLContextPrivate *d = const_cast<QGLContextPrivate *>(d_func());
-    if (!d->functions) {
-        d->functions = new QGLFunctions(this);
-        d->functions->initializeGLFunctions(this);
-    }
-    return d->functions;
-}
-
-/*!
-  Generates and binds a 2D GL texture to the current context, based
-  on \a image. The generated texture id is returned and can be used in
-  later \c glBindTexture() calls.
-
-  \overload
-*/
-GLuint QGLContext::bindTexture(const QImage &image, GLenum target, GLint format)
-{
-    if (image.isNull())
-        return 0;
-
-    Q_D(QGLContext);
-    QGLTexture *texture = d->bindTexture(image, target, format, DefaultBindOption);
-    return texture->id;
-}
-
-/*!
-    \since 4.6
-
-    Generates and binds a 2D GL texture to the current context, based
-    on \a image. The generated texture id is returned and can be used
-    in later \c glBindTexture() calls.
-
-    The \a target parameter specifies the texture target. The default
-    target is \c GL_TEXTURE_2D.
-
-    The \a format parameter sets the internal format for the
-    texture. The default format is \c GL_RGBA.
-
-    The binding \a options are a set of options used to decide how to
-    bind the texture to the context.
-
-    The texture that is generated is cached, so multiple calls to
-    bindTexture() with the same QImage will return the same texture
-    id.
-
-    Note that we assume default values for the glPixelStore() and
-    glPixelTransfer() parameters.
-
-    \sa deleteTexture()
-*/
-GLuint QGLContext::bindTexture(const QImage &image, GLenum target, GLint format, BindOptions options)
-{
-    if (image.isNull())
-        return 0;
-
-    Q_D(QGLContext);
-    QGLTexture *texture = d->bindTexture(image, target, format, options);
-    return texture->id;
-}
-
-/*! \overload
-
-    Generates and binds a 2D GL texture based on \a pixmap.
-*/
-GLuint QGLContext::bindTexture(const QPixmap &pixmap, GLenum target, GLint format)
-{
-    if (pixmap.isNull())
-        return 0;
-
-    Q_D(QGLContext);
-    QGLTexture *texture = d->bindTexture(pixmap, target, format, DefaultBindOption);
-    return texture->id;
-}
-
-/*!
-  \overload
-  \since 4.6
-
-  Generates and binds a 2D GL texture to the current context, based
-  on \a pixmap.
-*/
-GLuint QGLContext::bindTexture(const QPixmap &pixmap, GLenum target, GLint format, BindOptions options)
-{
-    if (pixmap.isNull())
-        return 0;
-
-    Q_D(QGLContext);
-    QGLTexture *texture = d->bindTexture(pixmap, target, format, options);
-    return texture->id;
-}
-
-/*!
-    Removes the texture identified by \a id from the texture cache,
-    and calls glDeleteTextures() to delete the texture from the
-    context.
-
-    \sa bindTexture()
-*/
-void QGLContext::deleteTexture(GLuint id)
-{
-    if (QGLTextureCache::instance()->remove(this, id))
-        return;
-    qgl_functions()->glDeleteTextures(1, &id);
-}
-
-void qt_add_rect_to_array(const QRectF &r, GLfloat *array)
-{
-    qreal left = r.left();
-    qreal right = r.right();
-    qreal top = r.top();
-    qreal bottom = r.bottom();
-
-    array[0] = left;
-    array[1] = top;
-    array[2] = right;
-    array[3] = top;
-    array[4] = right;
-    array[5] = bottom;
-    array[6] = left;
-    array[7] = bottom;
-}
-
-void qt_add_texcoords_to_array(qreal x1, qreal y1, qreal x2, qreal y2, GLfloat *array)
-{
-    array[0] = x1;
-    array[1] = y1;
-    array[2] = x2;
-    array[3] = y1;
-    array[4] = x2;
-    array[5] = y2;
-    array[6] = x1;
-    array[7] = y2;
-}
-
-#if !defined(QT_OPENGL_ES_2)
-
-static void qDrawTextureRect(const QRectF &target, GLint textureWidth, GLint textureHeight, GLenum textureTarget)
-{
-    QOpenGLFunctions *funcs = qgl_functions();
-    GLfloat tx = 1.0f;
-    GLfloat ty = 1.0f;
-
-#ifdef QT_OPENGL_ES
-    Q_UNUSED(textureWidth);
-    Q_UNUSED(textureHeight);
-    Q_UNUSED(textureTarget);
-#else
-    if (textureTarget != GL_TEXTURE_2D && !QOpenGLContext::currentContext()->isOpenGLES()) {
-        if (textureWidth == -1 || textureHeight == -1) {
-            QOpenGLFunctions_1_1 *gl1funcs = qgl1_functions();
-            gl1funcs->glGetTexLevelParameteriv(textureTarget, 0, GL_TEXTURE_WIDTH, &textureWidth);
-            gl1funcs->glGetTexLevelParameteriv(textureTarget, 0, GL_TEXTURE_HEIGHT, &textureHeight);
-        }
-
-        tx = GLfloat(textureWidth);
-        ty = GLfloat(textureHeight);
-    }
-#endif
-
-    GLfloat texCoordArray[4*2] = {
-        0, ty, tx, ty, tx, 0, 0, 0
-    };
-
-    GLfloat vertexArray[4*2];
-    qt_add_rect_to_array(target, vertexArray);
-
-    QOpenGLFunctions_1_1 *gl1funcs = qgl1_functions();
-    gl1funcs->glVertexPointer(2, GL_FLOAT, 0, vertexArray);
-    gl1funcs->glTexCoordPointer(2, GL_FLOAT, 0, texCoordArray);
-
-    gl1funcs->glEnableClientState(GL_VERTEX_ARRAY);
-    gl1funcs->glEnableClientState(GL_TEXTURE_COORD_ARRAY);
-    funcs->glDrawArrays(GL_TRIANGLE_FAN, 0, 4);
-
-    gl1funcs->glDisableClientState(GL_VERTEX_ARRAY);
-    gl1funcs->glDisableClientState(GL_TEXTURE_COORD_ARRAY);
-}
-
-#endif // !QT_OPENGL_ES_2
-
-/*!
-    \since 4.4
-
-    This function supports the following use cases:
-
-    \list
-    \li On OpenGL and OpenGL ES 1.x it draws the given texture, \a textureId,
-    to the given target rectangle, \a target, in OpenGL model space. The
-    \a textureTarget should be a 2D texture target.
-    \li On OpenGL and OpenGL ES 2.x, if a painter is active, not inside a
-    beginNativePainting / endNativePainting block, and uses the
-    engine with type QPaintEngine::OpenGL2, the function will draw the given
-    texture, \a textureId, to the given target rectangle, \a target,
-    respecting the current painter state. This will let you draw a texture
-    with the clip, transform, render hints, and composition mode set by the
-    painter. Note that the texture target needs to be GL_TEXTURE_2D for this
-    use case, and that this is the only supported use case under OpenGL ES 2.x.
-    \endlist
-
-*/
-void QGLContext::drawTexture(const QRectF &target, GLuint textureId, GLenum textureTarget)
-{
-#if !defined(QT_OPENGL_ES) || defined(QT_OPENGL_ES_2)
-     if (d_ptr->active_engine &&
-         d_ptr->active_engine->type() == QPaintEngine::OpenGL2) {
-         QGL2PaintEngineEx *eng = static_cast<QGL2PaintEngineEx*>(d_ptr->active_engine);
-         if (!eng->isNativePaintingActive()) {
-            QRectF src(0, 0, target.width(), target.height());
-            QSize size(target.width(), target.height());
-            if (eng->drawTexture(target, textureId, size, src))
-                return;
-        }
-     }
-#endif
-
-#ifndef QT_OPENGL_ES_2
-     QOpenGLFunctions *funcs = qgl_functions();
-     if (!contextHandle()->isOpenGLES()) {
-#ifdef QT_OPENGL_ES
-        if (textureTarget != GL_TEXTURE_2D) {
-            qWarning("QGLContext::drawTexture(): texture target must be GL_TEXTURE_2D on OpenGL ES");
-            return;
-        }
-#else
-        const bool wasEnabled = funcs->glIsEnabled(GL_TEXTURE_2D);
-        GLint oldTexture;
-        funcs->glGetIntegerv(GL_TEXTURE_BINDING_2D, &oldTexture);
-#endif
-
-        funcs->glEnable(textureTarget);
-        funcs->glBindTexture(textureTarget, textureId);
-
-        qDrawTextureRect(target, -1, -1, textureTarget);
-
-#ifdef QT_OPENGL_ES
-        funcs->glDisable(textureTarget);
-#else
-        if (!wasEnabled)
-            funcs->glDisable(textureTarget);
-        funcs->glBindTexture(textureTarget, oldTexture);
-#endif
-        return;
-    }
-#else
-    Q_UNUSED(target);
-    Q_UNUSED(textureId);
-    Q_UNUSED(textureTarget);
-#endif
-    qWarning("drawTexture() with OpenGL ES 2.0 requires an active OpenGL2 paint engine");
-}
-
-/*!
-    \since 4.4
-
-    This function supports the following use cases:
-
-    \list
-    \li By default it draws the given texture, \a textureId,
-    at the given \a point in OpenGL model space. The
-    \a textureTarget should be a 2D texture target.
-    \li If a painter is active, not inside a
-    beginNativePainting / endNativePainting block, and uses the
-    engine with type QPaintEngine::OpenGL2, the function will draw the given
-    texture, \a textureId, at the given \a point,
-    respecting the current painter state. This will let you draw a texture
-    with the clip, transform, render hints, and composition mode set by the
-    painter. Note that the texture target needs to be GL_TEXTURE_2D for this
-    use case.
-    \endlist
-
-    \note This function is not supported under any version of OpenGL ES.
-*/
-void QGLContext::drawTexture(const QPointF &point, GLuint textureId, GLenum textureTarget)
-{
-#ifdef QT_OPENGL_ES
-    Q_UNUSED(point);
-    Q_UNUSED(textureId);
-    Q_UNUSED(textureTarget);
-#else
-    if (!contextHandle()->isOpenGLES()) {
-        QOpenGLFunctions *funcs = qgl_functions();
-        const bool wasEnabled = funcs->glIsEnabled(GL_TEXTURE_2D);
-        GLint oldTexture;
-        funcs->glGetIntegerv(GL_TEXTURE_BINDING_2D, &oldTexture);
-
-        funcs->glEnable(textureTarget);
-        funcs->glBindTexture(textureTarget, textureId);
-
-        GLint textureWidth;
-        GLint textureHeight;
-
-        QOpenGLFunctions_1_1 *gl1funcs = qgl1_functions();
-        gl1funcs->glGetTexLevelParameteriv(textureTarget, 0, GL_TEXTURE_WIDTH, &textureWidth);
-        gl1funcs->glGetTexLevelParameteriv(textureTarget, 0, GL_TEXTURE_HEIGHT, &textureHeight);
-
-        if (d_ptr->active_engine &&
-            d_ptr->active_engine->type() == QPaintEngine::OpenGL2) {
-            QGL2PaintEngineEx *eng = static_cast<QGL2PaintEngineEx*>(d_ptr->active_engine);
-            if (!eng->isNativePaintingActive()) {
-                QRectF dest(point, QSizeF(textureWidth, textureHeight));
-                QRectF src(0, 0, textureWidth, textureHeight);
-                QSize size(textureWidth, textureHeight);
-                if (eng->drawTexture(dest, textureId, size, src))
-                    return;
-            }
-        }
-
-        qDrawTextureRect(QRectF(point, QSizeF(textureWidth, textureHeight)), textureWidth, textureHeight, textureTarget);
-
-        if (!wasEnabled)
-            funcs->glDisable(textureTarget);
-        funcs->glBindTexture(textureTarget, oldTexture);
-        return;
-    }
-#endif
-    qWarning("drawTexture(const QPointF &point, GLuint textureId, GLenum textureTarget) not supported with OpenGL ES, use rect version instead");
-}
-
-/*!
-    This function sets the limit for the texture cache to \a size,
-    expressed in kilobytes.
-
-    By default, the cache limit is approximately 64 MB.
-
-    \sa textureCacheLimit()
-*/
-void QGLContext::setTextureCacheLimit(int size)
-{
-    QGLTextureCache::instance()->setMaxCost(size);
-}
-
-/*!
-    Returns the current texture cache limit in kilobytes.
-
-    \sa setTextureCacheLimit()
-*/
-int QGLContext::textureCacheLimit()
-{
-    return QGLTextureCache::instance()->maxCost();
-}
-
-
-/*!
-    \fn QGLFormat QGLContext::format() const
-
-    Returns the frame buffer format that was obtained (this may be a
-    subset of what was requested).
-
-    \sa requestedFormat()
-*/
-
-/*!
-    \fn QGLFormat QGLContext::requestedFormat() const
-
-    Returns the frame buffer format that was originally requested in
-    the constructor or setFormat().
-
-    \sa format()
-*/
-
-/*!
-    Sets a \a format for this context. The context is \l{reset()}{reset}.
-
-    Call create() to create a new GL context that tries to match the
-    new format.
-
-    \snippet code/src_opengl_qgl.cpp 7
-
-    \sa format(), reset(), create()
-*/
-
-void QGLContext::setFormat(const QGLFormat &format)
-{
-    Q_D(QGLContext);
-    reset();
-    d->glFormat = d->reqFormat = format;
-}
-
-/*!
-    \internal
-*/
-void QGLContext::setDevice(QPaintDevice *pDev)
-{
-    Q_D(QGLContext);
-    // Do not touch the valid flag here. The context is either a new one and
-    // valid is not yet set or it is adapted from a valid QOpenGLContext in which
-    // case it must remain valid.
-    d->paintDevice = pDev;
-    if (d->paintDevice && (d->paintDevice->devType() != QInternal::Widget
-                           && d->paintDevice->devType() != QInternal::Pixmap
-                           && d->paintDevice->devType() != QInternal::Pbuffer)) {
-        qWarning("QGLContext: Unsupported paint device type");
-    }
-}
-
-/*!
-    \fn bool QGLContext::isValid() const
-
-    Returns \c true if a GL rendering context has been successfully
-    created; otherwise returns \c false.
-*/
-
-/*!
-    \fn void QGLContext::setValid(bool valid)
-    \internal
-
-    Forces the GL rendering context to be valid.
-*/
-
-/*!
-    \fn bool QGLContext::isSharing() const
-
-    Returns \c true if this context is sharing its GL context with
-    another QGLContext, otherwise false is returned. Note that context
-    sharing might not be supported between contexts with different
-    formats.
-*/
-
-/*!
-    Returns \c true if \a context1 and \a context2 are sharing their
-    GL resources such as textures, shader programs, etc;
-    otherwise returns \c false.
-
-    \since 4.6
-*/
-bool QGLContext::areSharing(const QGLContext *context1, const QGLContext *context2)
-{
-    if (!context1 || !context2)
-        return false;
-    return context1->d_ptr->group == context2->d_ptr->group;
-}
-
-/*!
-    \fn bool QGLContext::deviceIsPixmap() const
-
-    Returns \c true if the paint device of this context is a pixmap;
-    otherwise returns \c false.
-
-    Since Qt 5 the paint device is never actually a pixmap. renderPixmap() is
-    however still simulated using framebuffer objects and readbacks, and this
-    function will return \c true in this case.
-*/
-
-/*!
-    \fn bool QGLContext::windowCreated() const
-
-    Returns \c true if a window has been created for this context;
-    otherwise returns \c false.
-
-    \sa setWindowCreated()
-*/
-
-/*!
-    \fn void QGLContext::setWindowCreated(bool on)
-
-    If \a on is true the context has had a window created for it. If
-    \a on is false no window has been created for the context.
-
-    \sa windowCreated()
-*/
-
-/*!
-    \fn uint QGLContext::colorIndex(const QColor& c) const
-
-    \internal
-
-    Returns a colormap index for the color c, in ColorIndex mode. Used
-    by qglColor() and qglClearColor().
-*/
-uint QGLContext::colorIndex(const QColor&) const
-{
-    return 0;
-}
-
-/*!
-    \fn bool QGLContext::initialized() const
-
-    Returns \c true if this context has been initialized, i.e. if
-    QGLWidget::initializeGL() has been performed on it; otherwise
-    returns \c false.
-
-    \sa setInitialized()
-*/
-
-/*!
-    \fn void QGLContext::setInitialized(bool on)
-
-    If \a on is true the context has been initialized, i.e.
-    QGLContext::setInitialized() has been called on it. If \a on is
-    false the context has not been initialized.
-
-    \sa initialized()
-*/
-
-/*!
-    \fn const QGLContext* QGLContext::currentContext()
-
-    Returns the current context, i.e. the context to which any OpenGL
-    commands will currently be directed. Returns 0 if no context is
-    current.
-
-    \sa makeCurrent()
-*/
-
-/*!
-    \fn QColor QGLContext::overlayTransparentColor() const
-
-    If this context is a valid context in an overlay plane, returns
-    the plane's transparent color. Otherwise returns an \l{QColor::isValid()}{invalid} color.
-
-    The returned color's \l{QColormap::pixel()}{pixel} value is
-    the index of the transparent color in the colormap of the overlay
-    plane. (Naturally, the color's RGB values are meaningless.)
-
-    The returned QColor object will generally work as expected only
-    when passed as the argument to QGLWidget::qglColor() or
-    QGLWidget::qglClearColor(). Under certain circumstances it can
-    also be used to draw transparent graphics with a QPainter.
-*/
-QColor QGLContext::overlayTransparentColor() const
-{
-    return QColor(); // Invalid color
-}
-
-/*!
-    Creates the GL context. Returns \c true if it was successful in
-    creating a valid GL rendering context on the paint device
-    specified in the constructor; otherwise returns \c false (i.e. the
-    context is invalid).
-
-    If the OpenGL implementation on your system does not support the requested
-    version of OpenGL context, then QGLContext will try to create the closest
-    matching version. The actual created context properties can be queried
-    using the QGLFormat returned by the format() function. For example, if
-    you request a context that supports OpenGL 4.3 Core profile but the driver
-    and/or hardware only supports version 3.2 Core profile contexts then you will
-    get a 3.2 Core profile context.
-
-    After successful creation, format() returns the set of features of
-    the created GL rendering context.
-
-    If \a shareContext points to a valid QGLContext, this method will
-    try to establish OpenGL display list and texture object sharing
-    between this context and the \a shareContext. Note that this may
-    fail if the two contexts have different \l {format()} {formats}.
-    Use isSharing() to see if sharing is in effect.
-
-    \warning Implementation note: initialization of C++ class
-    members usually takes place in the class constructor. QGLContext
-    is an exception because it must be simple to customize. The
-    virtual functions chooseContext() (and chooseVisual() for X11) can
-    be reimplemented in a subclass to select a particular context. The
-    problem is that virtual functions are not properly called during
-    construction (even though this is correct C++) because C++
-    constructs class hierarchies from the bottom up. For this reason
-    we need a create() function.
-
-    \sa chooseContext(), format(), isValid()
-*/
-
-bool QGLContext::create(const QGLContext* shareContext)
-{
-    Q_D(QGLContext);
-    if (!d->paintDevice && !d->guiGlContext)
-        return false;
-
-    reset();
-    d->valid = chooseContext(shareContext);
-    if (d->valid && d->paintDevice && d->paintDevice->devType() == QInternal::Widget) {
-        QWidgetPrivate *wd = qt_widget_private(static_cast<QWidget *>(d->paintDevice));
-        wd->usesDoubleBufferedGLContext = d->glFormat.doubleBuffer();
-    }
-    return d->valid;
-}
-
-bool QGLContext::isValid() const
-{
-    Q_D(const QGLContext);
-    return d->valid;
-}
-
-void QGLContext::setValid(bool valid)
-{
-    Q_D(QGLContext);
-    d->valid = valid;
-}
-
-bool QGLContext::isSharing() const
-{
-    Q_D(const QGLContext);
-    return d->group->isSharing();
-}
-
-QGLFormat QGLContext::format() const
-{
-    Q_D(const QGLContext);
-    return d->glFormat;
-}
-
-QGLFormat QGLContext::requestedFormat() const
-{
-    Q_D(const QGLContext);
-    return d->reqFormat;
-}
-
- QPaintDevice* QGLContext::device() const
-{
-    Q_D(const QGLContext);
-    return d->paintDevice;
-}
-
-bool QGLContext::deviceIsPixmap() const
-{
-    Q_D(const QGLContext);
-    return !d->readback_target_size.isEmpty();
-}
-
-
-bool QGLContext::windowCreated() const
-{
-    Q_D(const QGLContext);
-    return d->crWin;
-}
-
-
-void QGLContext::setWindowCreated(bool on)
-{
-    Q_D(QGLContext);
-    d->crWin = on;
-}
-
-bool QGLContext::initialized() const
-{
-    Q_D(const QGLContext);
-    return d->initDone;
-}
-
-void QGLContext::setInitialized(bool on)
-{
-    Q_D(QGLContext);
-    d->initDone = on;
-}
-
-const QGLContext* QGLContext::currentContext()
-{
-    if (const QOpenGLContext *threadContext = QOpenGLContext::currentContext()) {
-        return QGLContext::fromOpenGLContext(const_cast<QOpenGLContext *>(threadContext));
-    }
-    return 0;
-}
-
-void QGLContextPrivate::setCurrentContext(QGLContext *context)
-{
-    Q_UNUSED(context);
-}
-
-/*!
-    Moves the QGLContext to the given \a thread.
-
-    Enables calling swapBuffers() and makeCurrent() on the context in
-    the given thread.
-*/
-void QGLContext::moveToThread(QThread *thread)
-{
-    Q_D(QGLContext);
-    if (d->guiGlContext)
-        d->guiGlContext->moveToThread(thread);
-}
-
-/*!
-    \fn bool QGLContext::chooseContext(const QGLContext* shareContext = 0)
-
-    This semi-internal function is called by create(). It creates a
-    system-dependent OpenGL handle that matches the format() of \a
-    shareContext as closely as possible, returning true if successful
-    or false if a suitable handle could not be found.
-
-    On Windows, it calls the virtual function choosePixelFormat(),
-    which finds a matching pixel format identifier. On X11, it calls
-    the virtual function chooseVisual() which finds an appropriate X
-    visual. On other platforms it may work differently.
-*/
-bool QGLContext::chooseContext(const QGLContext* shareContext)
-{
-    Q_D(QGLContext);
-    if(!d->paintDevice || d->paintDevice->devType() != QInternal::Widget) {
-        // Unlike in Qt 4, the only possible target is a widget backed by an OpenGL-based
-        // QWindow. Pixmaps in particular are not supported anymore as paint devices since
-        // starting from Qt 5 QPixmap is raster-backed on almost all platforms.
-        d->valid = false;
-    }else {
-        QWidget *widget = static_cast<QWidget *>(d->paintDevice);
-        QGLFormat glformat = format();
-        QSurfaceFormat winFormat = QGLFormat::toSurfaceFormat(glformat);
-        if (widget->testAttribute(Qt::WA_TranslucentBackground))
-            winFormat.setAlphaBufferSize(qMax(winFormat.alphaBufferSize(), 8));
-
-        QWindow *window = widget->windowHandle();
-        if (!window->handle()
-            || window->surfaceType() != QWindow::OpenGLSurface
-            || window->requestedFormat() != winFormat)
-        {
-            window->setSurfaceType(QWindow::OpenGLSurface);
-            window->setFormat(winFormat);
-            window->destroy();
-            window->create();
-        }
-
-        if (d->ownContext)
-            delete d->guiGlContext;
-        d->ownContext = true;
-        QOpenGLContext *shareGlContext = shareContext ? shareContext->d_func()->guiGlContext : 0;
-        d->guiGlContext = new QOpenGLContext;
-        d->guiGlContext->setFormat(winFormat);
-        d->guiGlContext->setShareContext(shareGlContext);
-        d->valid = d->guiGlContext->create();
-
-        if (d->valid)
-            d->guiGlContext->setQGLContextHandle(this, 0);
-
-        d->glFormat = QGLFormat::fromSurfaceFormat(d->guiGlContext->format());
-        d->setupSharing();
-    }
-
-
-    return d->valid;
-}
-
-/*!
-    \fn void QGLContext::reset()
-
-    Resets the context and makes it invalid.
-
-    \sa create(), isValid()
-*/
-void QGLContext::reset()
-{
-    Q_D(QGLContext);
-    if (!d->valid)
-        return;
-    d->cleanup();
-
-    d->crWin = false;
-    d->sharing = false;
-    d->valid = false;
-    d->transpColor = QColor();
-    d->initDone = false;
-    QGLContextGroup::removeShare(this);
-    if (d->guiGlContext) {
-        if (QOpenGLContext::currentContext() == d->guiGlContext)
-            doneCurrent();
-        if (d->ownContext) {
-            if (d->guiGlContext->thread() == QThread::currentThread())
-                delete d->guiGlContext;
-            else
-                d->guiGlContext->deleteLater();
-        } else
-            d->guiGlContext->setQGLContextHandle(0,0);
-        d->guiGlContext = 0;
-    }
-    d->ownContext = false;
-}
-
-/*!
-    \fn void QGLContext::makeCurrent()
-
-    Makes this context the current OpenGL rendering context. All GL
-    functions you call operate on this context until another context
-    is made current.
-
-    In some very rare cases the underlying call may fail. If this
-    occurs an error message is output to stderr.
-
-    If you call this from a thread other than the main UI thread,
-    make sure you've first pushed the context to the relevant thread
-    from the UI thread using moveToThread().
-*/
-void QGLContext::makeCurrent()
-{
-    Q_D(QGLContext);
-    if (!d->paintDevice || d->paintDevice->devType() != QInternal::Widget)
-        return;
-
-    QWidget *widget = static_cast<QWidget *>(d->paintDevice);
-    if (!widget->windowHandle())
-        return;
-
-    if (d->guiGlContext->makeCurrent(widget->windowHandle())) {
-        if (!d->workaroundsCached) {
-            d->workaroundsCached = true;
-            const char *renderer = reinterpret_cast<const char *>(d->guiGlContext->functions()->glGetString(GL_RENDERER));
-            if (renderer && strstr(renderer, "Mali")) {
-                d->workaround_brokenFBOReadBack = true;
-            }
-        }
-    }
-}
-
-/*!
-    \fn void QGLContext::swapBuffers() const
-
-    Call this to finish a frame of OpenGL rendering, and make sure to
-    call makeCurrent() again before issuing any further OpenGL commands,
-    for example as part of a new frame.
-*/
-void QGLContext::swapBuffers() const
-{
-    Q_D(const QGLContext);
-    if (!d->paintDevice || d->paintDevice->devType() != QInternal::Widget)
-        return;
-
-    QWidget *widget = static_cast<QWidget *>(d->paintDevice);
-    if (!widget->windowHandle())
-        return;
-
-    d->guiGlContext->swapBuffers(widget->windowHandle());
-}
-
-/*!
-    \fn void QGLContext::doneCurrent()
-
-    Makes no GL context the current context. Normally, you do not need
-    to call this function; QGLContext calls it as necessary.
-*/
-void QGLContext::doneCurrent()
-{
-    Q_D(QGLContext);
-    d->guiGlContext->doneCurrent();
-}
-
-/*!
-    \fn QPaintDevice* QGLContext::device() const
-
-    Returns the paint device set for this context.
-
-    \sa QGLContext::QGLContext()
-*/
-
-/*****************************************************************************
-  QGLWidget implementation
- *****************************************************************************/
-
-
-/*!
-    \class QGLWidget
-    \inmodule QtOpenGL
-    \obsolete
-
-    \brief The QGLWidget class is a widget for rendering OpenGL graphics.
-
-    QGLWidget provides functionality for displaying OpenGL graphics
-    integrated into a Qt application. It is very simple to use. You
-    inherit from it and use the subclass like any other QWidget,
-    except that you have the choice between using QPainter and
-    standard OpenGL rendering commands.
-
-    \note This class is part of the legacy \l {Qt OpenGL} module and,
-    like the other \c QGL classes, should be avoided in the new
-    applications. Instead, starting from Qt 5.4, prefer using
-    QOpenGLWidget and the \c QOpenGL classes.
-
-    QGLWidget provides three convenient virtual functions that you can
-    reimplement in your subclass to perform the typical OpenGL tasks:
-
-    \list
-    \li paintGL() - Renders the OpenGL scene. Gets called whenever the widget
-    needs to be updated.
-    \li resizeGL() - Sets up the OpenGL viewport, projection, etc. Gets
-    called whenever the widget has been resized (and also when it
-    is shown for the first time because all newly created widgets get a
-    resize event automatically).
-    \li initializeGL() - Sets up the OpenGL rendering context, defines display
-    lists, etc. Gets called once before the first time resizeGL() or
-    paintGL() is called.
-    \endlist
-
-    Here is a rough outline of how a QGLWidget subclass might look:
-
-    \snippet code/src_opengl_qgl.cpp 8
-
-    If you need to trigger a repaint from places other than paintGL()
-    (a typical example is when using \l{QTimer}{timers} to
-    animate scenes), you should call the widget's updateGL() function.
-
-    Your widget's OpenGL rendering context is made current when
-    paintGL(), resizeGL(), or initializeGL() is called. If you need to
-    call the standard OpenGL API functions from other places (e.g. in
-    your widget's constructor or in your own paint functions), you
-    must call makeCurrent() first.
-
-    QGLWidget provides functions for requesting a new display
-    \l{QGLFormat}{format} and you can also create widgets with
-    customized rendering \l{QGLContext}{contexts}.
-
-    You can also share OpenGL display lists between QGLWidget objects (see
-    the documentation of the QGLWidget constructors for details).
-
-    Note that under Windows, the QGLContext belonging to a QGLWidget
-    has to be recreated when the QGLWidget is reparented. This is
-    necessary due to limitations on the Windows platform. This will
-    most likely cause problems for users that have subclassed and
-    installed their own QGLContext on a QGLWidget. It is possible to
-    work around this issue by putting the QGLWidget inside a dummy
-    widget and then reparenting the dummy widget, instead of the
-    QGLWidget. This will side-step the issue altogether, and is what
-    we recommend for users that need this kind of functionality.
-
-    On \macos, when Qt is built with Cocoa support, a QGLWidget
-    can't have any sibling widgets placed ontop of itself. This is due
-    to limitations in the Cocoa API and is not supported by Apple.
-
-    \section1 Overlays
-
-    The QGLWidget creates a GL overlay context in addition to the
-    normal context if overlays are supported by the underlying system.
-
-    If you want to use overlays, you specify it in the
-    \l{QGLFormat}{format}. (Note: Overlay must be requested in the format
-    passed to the QGLWidget constructor.) Your GL widget should also
-    implement some or all of these virtual methods:
-
-    \list
-    \li paintOverlayGL()
-    \li resizeOverlayGL()
-    \li initializeOverlayGL()
-    \endlist
-
-    These methods work in the same way as the normal paintGL() etc.
-    functions, except that they will be called when the overlay
-    context is made current. You can explicitly make the overlay
-    context current by using makeOverlayCurrent(), and you can access
-    the overlay context directly (e.g. to ask for its transparent
-    color) by calling overlayContext().
-
-    On X servers in which the default visual is in an overlay plane,
-    non-GL Qt windows can also be used for overlays.
-
-    \section1 Painting Techniques
-
-    As described above, subclass QGLWidget to render pure 3D content in the
-    following way:
-
-    \list
-    \li Reimplement the QGLWidget::initializeGL() and QGLWidget::resizeGL() to
-       set up the OpenGL state and provide a perspective transformation.
-    \li Reimplement QGLWidget::paintGL() to paint the 3D scene, calling only
-       OpenGL functions to draw on the widget.
-    \endlist
-
-    It is also possible to draw 2D graphics onto a QGLWidget subclass, it is necessary
-    to reimplement QGLWidget::paintEvent() and do the following:
-
-    \list
-    \li Construct a QPainter object.
-    \li Initialize it for use on the widget with the QPainter::begin() function.
-    \li Draw primitives using QPainter's member functions.
-    \li Call QPainter::end() to finish painting.
-    \endlist
-
-    \section1 Threading
-
-    As of Qt version 4.8, support for doing threaded GL rendering has
-    been improved. There are three scenarios that we currently support:
-    \list
-    \li 1. Buffer swapping in a thread.
-
-    Swapping buffers in a double buffered context may be a
-    synchronous, locking call that may be a costly operation in some
-    GL implementations. Especially so on embedded devices. It's not
-    optimal to have the CPU idling while the GPU is doing a buffer
-    swap. In those cases it is possible to do the rendering in the
-    main thread and do the actual buffer swap in a separate
-    thread. This can be done with the following steps:
-
-    1. Call doneCurrent() in the main thread when the rendering is
-    finished.
-
-    2. Call QGLContext::moveToThread(swapThread) to transfer ownership
-    of the context to the swapping thread.
-
-    3. Notify the swapping thread that it can grab the context.
-
-    4. Make the rendering context current in the swapping thread with
-    makeCurrent() and then call swapBuffers().
-
-    5. Call doneCurrent() in the swapping thread.
-
-    6. Call QGLContext::moveToThread(qApp->thread()) and notify the
-    main thread that swapping is done.
-
-    Doing this will free up the main thread so that it can continue
-    with, for example, handling UI events or network requests. Even if
-    there is a context swap involved, it may be preferable compared to
-    having the main thread wait while the GPU finishes the swap
-    operation. Note that this is highly implementation dependent.
-
-    \li 2. Texture uploading in a thread.
-
-    Doing texture uploads in a thread may be very useful for
-    applications handling large amounts of images that needs to be
-    displayed, like for instance a photo gallery application. This is
-    supported in Qt through the existing bindTexture() API. A simple
-    way of doing this is to create two sharing QGLWidgets. One is made
-    current in the main GUI thread, while the other is made current in
-    the texture upload thread. The widget in the uploading thread is
-    never shown, it is only used for sharing textures with the main
-    thread. For each texture that is bound via bindTexture(), notify
-    the main thread so that it can start using the texture.
-
-    \li 3. Using QPainter to draw into a QGLWidget in a thread.
-
-    In Qt 4.8, it is possible to draw into a QGLWidget using a
-    QPainter in a separate thread. Note that this is also possible for
-    QGLPixelBuffers and QGLFramebufferObjects. Since this is only
-    supported in the GL 2 paint engine, OpenGL 2.0 or OpenGL ES 2.0 is
-    required.
-
-    QGLWidgets can only be created in the main GUI thread. This means
-    a call to doneCurrent() is necessary to release the GL context
-    from the main thread, before the widget can be drawn into by
-    another thread. You then need to call QGLContext::moveToThread()
-    to transfer ownership of the context to the thread in which you
-    want to make it current.
-    Also, the main GUI thread will dispatch resize and
-    paint events to a QGLWidget when the widget is resized, or parts
-    of it becomes exposed or needs redrawing. It is therefore
-    necessary to handle those events because the default
-    implementations inside QGLWidget will try to make the QGLWidget's
-    context current, which again will interfere with any threads
-    rendering into the widget. Reimplement QGLWidget::paintEvent() and
-    QGLWidget::resizeEvent() to notify the rendering thread that a
-    resize or update is necessary, and be careful not to call the base
-    class implementation. If you are rendering an animation, it might
-    not be necessary to handle the paint event at all since the
-    rendering thread is doing regular updates. Then it would be enough
-    to reimplement QGLWidget::paintEvent() to do nothing.
-
-    \endlist
-
-    As a general rule when doing threaded rendering: be aware that
-    binding and releasing contexts in different threads have to be
-    synchronized by the user. A GL rendering context can only be
-    current in one thread at any time. If you try to open a QPainter
-    on a QGLWidget and the widget's rendering context is current in
-    another thread, it will fail.
-
-    In addition to this, rendering using raw GL calls in a separate
-    thread is supported.
-
-    \e{OpenGL is a trademark of Silicon Graphics, Inc. in the United States and other
-    countries.}
-
-    \sa QOpenGLWidget, QGLPixelBuffer
-*/
-
-/*!
-    Constructs an OpenGL widget with a \a parent widget.
-
-    The \l{QGLFormat::defaultFormat()}{default format} is
-    used. The widget will be \l{isValid()}{invalid} if the
-    system has no \l{QGLFormat::hasOpenGL()}{OpenGL support}.
-
-    The \a parent and widget flag, \a f, arguments are passed
-    to the QWidget constructor.
-
-    If \a shareWidget is a valid QGLWidget, this widget will share
-    OpenGL display lists and texture objects with \a shareWidget. But
-    if \a shareWidget and this widget have different \l {format()}
-    {formats}, sharing might not be possible. You can check whether
-    sharing is in effect by calling isSharing().
-
-    The initialization of OpenGL rendering state, etc. should be done
-    by overriding the initializeGL() function, rather than in the
-    constructor of your QGLWidget subclass.
-
-    \sa QGLFormat::defaultFormat(), {Textures Example}
-*/
-
-QGLWidget::QGLWidget(QWidget *parent, const QGLWidget* shareWidget, Qt::WindowFlags f)
-    : QWidget(*(new QGLWidgetPrivate), parent, f)
-{
-    Q_D(QGLWidget);
-    d->init(new QGLContext(QGLFormat::defaultFormat(), this), shareWidget);
-}
-
-/*!
-  \internal
- */
-QGLWidget::QGLWidget(QGLWidgetPrivate &dd, const QGLFormat &format, QWidget *parent, const QGLWidget *shareWidget, Qt::WindowFlags f)
-    : QWidget(dd, parent, f)
-{
-    Q_D(QGLWidget);
-    d->init(new QGLContext(format, this), shareWidget);
-
-}
-
-
-/*!
-    Constructs an OpenGL widget with parent \a parent.
-
-    The \a format argument specifies the desired
-    \l{QGLFormat}{rendering options}.
-    If the underlying OpenGL/Window system
-    cannot satisfy all the features requested in \a format, the
-    nearest subset of features will be used. After creation, the
-    format() method will return the actual format obtained.
-
-    The widget will be \l{isValid()}{invalid} if the system
-    has no \l{QGLFormat::hasOpenGL()}{OpenGL support}.
-
-    The \a parent and widget flag, \a f, arguments are passed
-    to the QWidget constructor.
-
-    If \a shareWidget is a valid QGLWidget, this widget will share
-    OpenGL display lists and texture objects with \a shareWidget. But
-    if \a shareWidget and this widget have different \l {format()}
-    {formats}, sharing might not be possible. You can check whether
-    sharing is in effect by calling isSharing().
-
-    The initialization of OpenGL rendering state, etc. should be done
-    by overriding the initializeGL() function, rather than in the
-    constructor of your QGLWidget subclass.
-
-    \sa QGLFormat::defaultFormat(), isValid()
-*/
-
-QGLWidget::QGLWidget(const QGLFormat &format, QWidget *parent, const QGLWidget* shareWidget,
-                     Qt::WindowFlags f)
-    : QWidget(*(new QGLWidgetPrivate), parent, f)
-{
-    Q_D(QGLWidget);
-    d->init(new QGLContext(format, this), shareWidget);
-}
-
-/*!
-    Constructs an OpenGL widget with parent \a parent.
-
-    The \a context argument is a pointer to the QGLContext that
-    you wish to be bound to this widget. This allows you to pass in
-    your own QGLContext sub-classes.
-
-    The widget will be \l{isValid()}{invalid} if the system
-    has no \l{QGLFormat::hasOpenGL()}{OpenGL support}.
-
-    The \a parent and widget flag, \a f, arguments are passed
-    to the QWidget constructor.
-
-    If \a shareWidget is a valid QGLWidget, this widget will share
-    OpenGL display lists and texture objects with \a shareWidget. But
-    if \a shareWidget and this widget have different \l {format()}
-    {formats}, sharing might not be possible. You can check whether
-    sharing is in effect by calling isSharing().
-
-    The initialization of OpenGL rendering state, etc. should be done
-    by overriding the initializeGL() function, rather than in the
-    constructor of your QGLWidget subclass.
-
-    \sa QGLFormat::defaultFormat(), isValid()
-*/
-QGLWidget::QGLWidget(QGLContext *context, QWidget *parent, const QGLWidget *shareWidget,
-                     Qt::WindowFlags f)
-    : QWidget(*(new QGLWidgetPrivate), parent, f)
-{
-    Q_D(QGLWidget);
-    d->init(context, shareWidget);
-}
-
-/*!
-    Destroys the widget.
-*/
-
-QGLWidget::~QGLWidget()
-{
-    Q_D(QGLWidget);
-    delete d->glcx;
-    d->glcx = 0;
-    d->cleanupColormaps();
-}
-
-/*!
-    \fn QGLFormat QGLWidget::format() const
-
-    Returns the format of the contained GL rendering context.
-*/
-
-/*!
-    \fn bool QGLWidget::doubleBuffer() const
-
-    Returns \c true if the contained GL rendering context has double
-    buffering; otherwise returns \c false.
-
-    \sa QGLFormat::doubleBuffer()
-*/
-
-/*!
-    \fn void QGLWidget::setAutoBufferSwap(bool on)
-
-    If \a on is true automatic GL buffer swapping is switched on;
-    otherwise it is switched off.
-
-    If \a on is true and the widget is using a double-buffered format,
-    the background and foreground GL buffers will automatically be
-    swapped after each paintGL() call.
-
-    The buffer auto-swapping is on by default.
-
-    \sa autoBufferSwap(), doubleBuffer(), swapBuffers()
-*/
-
-/*!
-    \fn bool QGLWidget::autoBufferSwap() const
-
-    Returns \c true if the widget is doing automatic GL buffer swapping;
-    otherwise returns \c false.
-
-    \sa setAutoBufferSwap()
-*/
-
-/*!
-    \fn QFunctionPointer QGLContext::getProcAddress(const QString &proc) const
-
-    Returns a function pointer to the GL extension function passed in
-    \a proc. \nullptr is returned if a pointer to the function could not be
-    obtained.
-*/
-QFunctionPointer QGLContext::getProcAddress(const QString &procName) const
-{
-    Q_D(const QGLContext);
-    return d->guiGlContext->getProcAddress(procName.toLatin1());
-}
-
-/*!
-    \fn bool QGLWidget::isValid() const
-
-    Returns \c true if the widget has a valid GL rendering context;
-    otherwise returns \c false. A widget will be invalid if the system
-    has no \l{QGLFormat::hasOpenGL()}{OpenGL support}.
-*/
-
-bool QGLWidget::isValid() const
-{
-    Q_D(const QGLWidget);
-    return d->glcx && d->glcx->isValid();
-}
-
-/*!
-    \fn bool QGLWidget::isSharing() const
-
-    Returns \c true if this widget's GL context is shared with another GL
-    context, otherwise false is returned. Context sharing might not be
-    possible if the widgets use different formats.
-
-    \sa format()
-*/
-
-bool QGLWidget::isSharing() const
-{
-    Q_D(const QGLWidget);
-    return d->glcx->isSharing();
-}
-
-/*!
-    \fn void QGLWidget::makeCurrent()
-
-    Makes this widget the current widget for OpenGL operations, i.e.
-    makes the widget's rendering context the current OpenGL rendering
-    context.
-*/
-
-void QGLWidget::makeCurrent()
-{
-    Q_D(QGLWidget);
-    d->makeCurrent();
-}
-
-bool QGLWidgetPrivate::makeCurrent()
-{
-    glcx->makeCurrent();
-    return QGLContext::currentContext() == glcx;
-}
-
-/*!
-    \fn void QGLWidget::doneCurrent()
-
-    Makes no GL context the current context. Normally, you do not need
-    to call this function; QGLContext calls it as necessary. However,
-    it may be useful in multithreaded environments.
-*/
-
-void QGLWidget::doneCurrent()
-{
-    Q_D(QGLWidget);
-    d->glcx->doneCurrent();
-}
-
-/*!
-    \fn void QGLWidget::swapBuffers()
-
-    Swaps the screen contents with an off-screen buffer. This only
-    works if the widget's format specifies double buffer mode.
-
-    Normally, there is no need to explicitly call this function
-    because it is done automatically after each widget repaint, i.e.
-    each time after paintGL() has been executed.
-
-    \sa doubleBuffer(), setAutoBufferSwap(), QGLFormat::setDoubleBuffer()
-*/
-
-void QGLWidget::swapBuffers()
-{
-    Q_D(QGLWidget);
-    d->glcx->swapBuffers();
-}
-
-
-/*!
-    \fn const QGLContext* QGLWidget::overlayContext() const
-
-    Returns the overlay context of this widget, or \nullptr if this
-    widget has no overlay.
-
-    \sa context()
-*/
-const QGLContext* QGLWidget::overlayContext() const
-{
-    return nullptr;
-}
-
-/*!
-    \fn void QGLWidget::makeOverlayCurrent()
-
-    Makes the overlay context of this widget current. Use this if you
-    need to issue OpenGL commands to the overlay context outside of
-    initializeOverlayGL(), resizeOverlayGL(), and paintOverlayGL().
-
-    Does nothing if this widget has no overlay.
-
-    \sa makeCurrent()
-*/
-void QGLWidget::makeOverlayCurrent()
-{
-}
-
-/*!
-  \obsolete
-
-  Sets a new format for this widget.
-
-  If the underlying OpenGL/Window system cannot satisfy all the
-  features requested in \a format, the nearest subset of features will
-  be used. After creation, the format() method will return the actual
-  rendering context format obtained.
-
-  The widget will be assigned a new QGLContext, and the initializeGL()
-  function will be executed for this new context before the first
-  resizeGL() or paintGL().
-
-  This method will try to keep display list and texture object sharing
-  in effect with other QGLWidget objects, but changing the format might make
-  sharing impossible. Use isSharing() to see if sharing is still in
-  effect.
-
-  \sa format(), isSharing(), isValid()
-*/
-
-void QGLWidget::setFormat(const QGLFormat &format)
-{
-    setContext(new QGLContext(format,this));
-}
-
-
-
-
-/*!
-    \fn QGLContext *QGLWidget::context() const
-
-    Returns the context of this widget.
-
-    It is possible that the context is not valid (see isValid()), for
-    example, if the underlying hardware does not support the format
-    attributes that were requested.
-*/
-
-/*!
-  \fn void QGLWidget::setContext(QGLContext *context,
-                                 const QGLContext* shareContext,
-                                 bool deleteOldContext)
-  \obsolete
-
-  Sets a new context for this widget. The QGLContext \a context must
-  be created using \e new. QGLWidget will delete \a context when
-  another context is set or when the widget is destroyed.
-
-  If \a context is invalid, QGLContext::create() is performed on
-  it. The initializeGL() function will then be executed for the new
-  context before the first resizeGL() or paintGL().
-
-  If \a context is invalid, this method will try to keep display list
-  and texture object sharing in effect, or (if \a shareContext points
-  to a valid context) start display list and texture object sharing
-  with that context, but sharing might be impossible if the two
-  contexts have different \l {format()} {formats}. Use isSharing() to
-  see whether sharing is in effect.
-
-  If \a deleteOldContext is true (the default), the existing context
-  will be deleted. You may use false here if you have kept a pointer
-  to the old context (as returned by context()), and want to restore
-  that context later.
-
-  \note This function is obsolete and should no longer be used. If you were
-  using it to recreate the context for a QGLWidget, you should instead create a
-  new QGLWidget or use the QOpenGLContext API in conjunction with QWindow.
-  There is currently no officially supported way to substitute QGLWidget's
-  context with your own implementation of QGLContext.
-
-  \sa context(), isSharing()
-*/
-void QGLWidget::setContext(QGLContext *context,
-                            const QGLContext* shareContext,
-                            bool deleteOldContext)
-{
-    Q_D(QGLWidget);
-    if (context == 0) {
-        qWarning("QGLWidget::setContext: Cannot set null context");
-        return;
-    }
-
-    if (context->device() == 0) // a context may refere to more than 1 window.
-        context->setDevice(this); //but its better to point to 1 of them than none of them.
-
-    QGLContext* oldcx = d->glcx;
-    d->glcx = context;
-
-    if (!d->glcx->isValid())
-        d->glcx->create(shareContext ? shareContext : oldcx);
-
-    if (deleteOldContext)
-        delete oldcx;
-}
-
-/*!
-    \fn void QGLWidget::updateGL()
-
-    Updates the widget by calling glDraw().
-*/
-
-void QGLWidget::updateGL()
-{
-    Q_D(QGLWidget);
-    const bool targetIsOffscreen = !d->glcx->d_ptr->readback_target_size.isEmpty();
-    if (updatesEnabled() && (testAttribute(Qt::WA_Mapped) || targetIsOffscreen))
-        glDraw();
-}
-
-
-/*!
-    \fn void QGLWidget::updateOverlayGL()
-
-    Updates the widget's overlay (if any). Will cause the virtual
-    function paintOverlayGL() to be executed.
-
-    The widget's rendering context will become the current context and
-    initializeGL() will be called if it hasn't already been called.
-*/
-void QGLWidget::updateOverlayGL()
-{
-}
-
-/*!
-    This virtual function is called once before the first call to
-    paintGL() or resizeGL(), and then once whenever the widget has
-    been assigned a new QGLContext. Reimplement it in a subclass.
-
-    This function should set up any required OpenGL context rendering
-    flags, defining display lists, etc.
-
-    There is no need to call makeCurrent() because this has already
-    been done when this function is called.
-*/
-
-void QGLWidget::initializeGL()
-{
-}
-
-
-/*!
-    This virtual function is called whenever the widget needs to be
-    painted. Reimplement it in a subclass.
-
-    There is no need to call makeCurrent() because this has already
-    been done when this function is called.
-*/
-
-void QGLWidget::paintGL()
-{
-    qgl_functions()->glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-}
-
-
-/*!
-    \fn void QGLWidget::resizeGL(int width , int height)
-
-    This virtual function is called whenever the widget has been
-    resized. The new size is passed in \a width and \a height.
-    Reimplement it in a subclass.
-
-    There is no need to call makeCurrent() because this has already
-    been done when this function is called.
-*/
-
-void QGLWidget::resizeGL(int, int)
-{
-}
-
-
-
-/*!
-    This virtual function is used in the same manner as initializeGL()
-    except that it operates on the widget's overlay context instead of
-    the widget's main context. This means that initializeOverlayGL()
-    is called once before the first call to paintOverlayGL() or
-    resizeOverlayGL(). Reimplement it in a subclass.
-
-    This function should set up any required OpenGL context rendering
-    flags, defining display lists, etc. for the overlay context.
-
-    There is no need to call makeOverlayCurrent() because this has
-    already been done when this function is called.
-*/
-
-void QGLWidget::initializeOverlayGL()
-{
-}
-
-
-/*!
-    This virtual function is used in the same manner as paintGL()
-    except that it operates on the widget's overlay context instead of
-    the widget's main context. This means that paintOverlayGL() is
-    called whenever the widget's overlay needs to be painted.
-    Reimplement it in a subclass.
-
-    There is no need to call makeOverlayCurrent() because this has
-    already been done when this function is called.
-*/
-
-void QGLWidget::paintOverlayGL()
-{
-}
-
-
-/*!
-    \fn void QGLWidget::resizeOverlayGL(int width , int height)
-
-    This virtual function is used in the same manner as paintGL()
-    except that it operates on the widget's overlay context instead of
-    the widget's main context. This means that resizeOverlayGL() is
-    called whenever the widget has been resized. The new size is
-    passed in \a width and \a height. Reimplement it in a subclass.
-
-    There is no need to call makeOverlayCurrent() because this has
-    already been done when this function is called.
-*/
-
-void QGLWidget::resizeOverlayGL(int, int)
-{
-}
-
-/*!\reimp
-*/
-bool QGLWidget::event(QEvent *e)
-{
-    Q_D(QGLWidget);
-
-    // A re-parent will destroy the window and re-create it. We should not reset the context while it happens.
-    if (e->type() == QEvent::ParentAboutToChange)
-        d->parent_changing = true;
-
-    if (e->type() == QEvent::ParentChange)
-        d->parent_changing = false;
-
-    return QWidget::event(e);
-}
-
-/*!
-    \fn void QGLWidget::paintEvent(QPaintEvent *event)
-
-    Handles paint events passed in the \a event parameter. Will cause
-    the virtual paintGL() function to be called.
-
-    The widget's rendering context will become the current context and
-    initializeGL() will be called if it hasn't already been called.
-*/
-
-void QGLWidget::paintEvent(QPaintEvent *)
-{
-    if (updatesEnabled()) {
-        glDraw();
-        updateOverlayGL();
-    }
-}
-
-
-/*!
-    \fn void QGLWidget::resizeEvent(QResizeEvent *event)
-
-    Handles resize events that are passed in the \a event parameter.
-    Calls the virtual function resizeGL().
-*/
-void QGLWidget::resizeEvent(QResizeEvent *e)
-{
-    Q_D(QGLWidget);
-
-    QWidget::resizeEvent(e);
-    if (!isValid())
-        return;
-    if (!d->makeCurrent())
-        return;
-    if (!d->glcx->initialized())
-        glInit();
-    const qreal scaleFactor = (window() && window()->windowHandle()) ?
-        window()->windowHandle()->devicePixelRatio() : 1.0;
-
-    resizeGL(width() * scaleFactor, height() * scaleFactor);
-}
-
-/*!
-    Renders the current scene on a pixmap and returns the pixmap.
-
-    You can use this method on both visible and invisible QGLWidget objects.
-
-    Internally the function renders into a framebuffer object and performs pixel
-    readback. This has a performance penalty, meaning that this function is not
-    suitable to be called at a high frequency.
-
-    After creating and binding the framebuffer object, the function will call
-    initializeGL(), resizeGL(), and paintGL(). On the next normal update
-    initializeGL() and resizeGL() will be triggered again since the size of the
-    destination pixmap and the QGLWidget's size may differ.
-
-    The size of the pixmap will be \a w pixels wide and \a h pixels high unless
-    one of these parameters is 0 (the default), in which case the pixmap will
-    have the same size as the widget.
-
-    Care must be taken when using framebuffer objects in paintGL() in
-    combination with this function. To switch back to the default framebuffer,
-    use QGLFramebufferObject::bindDefault(). Binding FBO 0 is wrong since
-    renderPixmap() uses a custom framebuffer instead of the one provided by the
-    windowing system.
-
-    \a useContext is ignored. Historically this parameter enabled the usage of
-    the existing GL context. This is not supported anymore since additional
-    contexts are never created.
-
-    Overlays are not rendered onto the pixmap.
-
-    If the GL rendering context and the desktop have different bit
-    depths, the result will most likely look surprising.
-
-    Note that the creation of display lists, modifications of the view
-    frustum etc. should be done from within initializeGL(). If this is
-    not done, the temporary QGLContext will not be initialized
-    properly, and the rendered pixmap may be incomplete/corrupted.
-*/
-
-QPixmap QGLWidget::renderPixmap(int w, int h, bool useContext)
-{
-    Q_UNUSED(useContext);
-    Q_D(QGLWidget);
-
-    QSize sz = size();
-    if ((w > 0) && (h > 0))
-        sz = QSize(w, h);
-
-    QPixmap pm;
-    if (d->glcx->isValid()) {
-        d->glcx->makeCurrent();
-        QGLFramebufferObject fbo(sz, QGLFramebufferObject::CombinedDepthStencil);
-        fbo.bind();
-        d->glcx->setInitialized(false);
-        uint prevDefaultFbo = d->glcx->d_ptr->default_fbo;
-        d->glcx->d_ptr->default_fbo = fbo.handle();
-        d->glcx->d_ptr->readback_target_size = sz;
-        updateGL();
-        fbo.release();
-        pm = QPixmap::fromImage(fbo.toImage());
-        d->glcx->d_ptr->default_fbo = prevDefaultFbo;
-        d->glcx->setInitialized(false);
-        d->glcx->d_ptr->readback_target_size = QSize();
-    }
-
-    return pm;
-}
-
-/*!
-    Returns an image of the frame buffer. If \a withAlpha is true the
-    alpha channel is included.
-
-    Depending on your hardware, you can explicitly select which color
-    buffer to grab with a glReadBuffer() call before calling this
-    function.
-
-    On QNX the back buffer is not preserved when swapBuffers() is called. The back buffer
-    where this function reads from, might thus not contain the same content as the front buffer.
-    In order to retrieve what is currently visible on the screen, swapBuffers()
-    has to be executed prior to this function call.
-*/
-QImage QGLWidget::grabFrameBuffer(bool withAlpha)
-{
-    makeCurrent();
-    QImage res;
-    qreal pixelRatio = devicePixelRatioF();
-    int w = pixelRatio * width();
-    int h = pixelRatio * height();
-    if (format().rgba())
-        res = qt_gl_read_frame_buffer(QSize(w, h), format().alpha(), withAlpha);
-    res.setDevicePixelRatio(pixelRatio);
-    return res;
-}
-
-
-
-/*!
-    Initializes OpenGL for this widget's context. Calls the virtual
-    function initializeGL().
-*/
-
-void QGLWidget::glInit()
-{
-    Q_D(QGLWidget);
-    if (!isValid())
-        return;
-    if (!d->makeCurrent())
-        return;
-    initializeGL();
-    d->glcx->setInitialized(true);
-}
-
-
-/*!
-    Executes the virtual function paintGL().
-
-    The widget's rendering context will become the current context and
-    initializeGL() will be called if it hasn't already been called.
-*/
-
-void QGLWidget::glDraw()
-{
-    Q_D(QGLWidget);
-    if (!isValid())
-        return;
-    if (!d->makeCurrent())
-        return;
-#ifndef QT_OPENGL_ES
-    if (d->glcx->deviceIsPixmap() && !d->glcx->contextHandle()->isOpenGLES())
-        qgl1_functions()->glDrawBuffer(GL_FRONT);
-#endif
-    QSize readback_target_size = d->glcx->d_ptr->readback_target_size;
-    if (!d->glcx->initialized()) {
-        glInit();
-        const qreal scaleFactor = (window() && window()->windowHandle()) ?
-            window()->windowHandle()->devicePixelRatio() : 1.0;
-        int w, h;
-        if (readback_target_size.isEmpty()) {
-            w = d->glcx->device()->width() * scaleFactor;
-            h = d->glcx->device()->height() * scaleFactor;
-        } else {
-            w = readback_target_size.width();
-            h = readback_target_size.height();
-        }
-        resizeGL(w, h); // New context needs this "resize"
-    }
-    paintGL();
-    if (doubleBuffer() && readback_target_size.isEmpty()) {
-        if (d->autoSwap)
-            swapBuffers();
-    } else {
-        qgl_functions()->glFlush();
-    }
-}
-
-/*!
-    Convenience function for specifying a drawing color to OpenGL.
-    Calls glColor4 (in RGBA mode) or glIndex (in color-index mode)
-    with the color \a c. Applies to this widgets GL context.
-
-    \note This function is not supported on OpenGL/ES 2.0 systems.
-
-    \sa qglClearColor(), QGLContext::currentContext(), QColor
-*/
-
-void QGLWidget::qglColor(const QColor& c) const
-{
-#if !defined(QT_OPENGL_ES_2)
-#ifdef QT_OPENGL_ES
-    qgl_functions()->glColor4f(c.redF(), c.greenF(), c.blueF(), c.alphaF());
-#else
-    Q_D(const QGLWidget);
-    const QGLContext *ctx = QGLContext::currentContext();
-    if (ctx && !ctx->contextHandle()->isOpenGLES()) {
-        if (ctx->format().rgba())
-            qgl1_functions()->glColor4f(c.redF(), c.greenF(), c.blueF(), c.alphaF());
-        else if (!d->cmap.isEmpty()) { // QGLColormap in use?
-            int i = d->cmap.find(c.rgb());
-            if (i < 0)
-                i = d->cmap.findNearest(c.rgb());
-            qgl1_functions()->glIndexi(i);
-        } else
-            qgl1_functions()->glIndexi(ctx->colorIndex(c));
-    }
-#endif //QT_OPENGL_ES
-#else
-    Q_UNUSED(c);
-#endif //QT_OPENGL_ES_2
-}
-
-/*!
-    Convenience function for specifying the clearing color to OpenGL.
-    Calls glClearColor (in RGBA mode) or glClearIndex (in color-index
-    mode) with the color \a c. Applies to this widgets GL context.
-
-    \sa qglColor(), QGLContext::currentContext(), QColor
-*/
-
-void QGLWidget::qglClearColor(const QColor& c) const
-{
-#ifdef QT_OPENGL_ES
-    qgl_functions()->glClearColor(c.redF(), c.greenF(), c.blueF(), c.alphaF());
-#else
-    Q_D(const QGLWidget);
-    const QGLContext *ctx = QGLContext::currentContext();
-    if (ctx && !ctx->contextHandle()->isOpenGLES()) {
-        if (ctx->format().rgba())
-            qgl_functions()->glClearColor(c.redF(), c.greenF(), c.blueF(), c.alphaF());
-        else if (!d->cmap.isEmpty()) { // QGLColormap in use?
-            int i = d->cmap.find(c.rgb());
-            if (i < 0)
-                i = d->cmap.findNearest(c.rgb());
-            qgl1_functions()->glClearIndex(i);
-        } else {
-            qgl1_functions()->glClearIndex(ctx->colorIndex(c));
-        }
-    } else {
-        qgl_functions()->glClearColor(c.redF(), c.greenF(), c.blueF(), c.alphaF());
-    }
-#endif
-}
-
-
-/*!
-    Converts the image \a img into the unnamed format expected by
-    OpenGL functions such as glTexImage2D(). The returned image is not
-    usable as a QImage, but QImage::width(), QImage::height() and
-    QImage::bits() may be used with OpenGL. The GL format used is
-    \c GL_RGBA.
-
-    \omit ###
-
-    \l opengl/texture example
-    The following few lines are from the texture example. Most of the
-    code is irrelevant, so we just quote the relevant bits:
-
-    \quotefromfile opengl/texture/gltexobj.cpp
-    \skipto tex1
-    \printline tex1
-    \printline gllogo.bmp
-
-    We create \e tex1 (and another variable) for OpenGL, and load a real
-    image into \e buf.
-
-    \skipto convertToGLFormat
-    \printline convertToGLFormat
-
-    A few lines later, we convert \e buf into OpenGL format and store it
-    in \e tex1.
-
-    \skipto glTexImage2D
-    \printline glTexImage2D
-    \printline tex1.bits
-
-    Note the dimension restrictions for texture images as described in
-    the glTexImage2D() documentation. The width must be 2^m + 2*border
-    and the height 2^n + 2*border where m and n are integers and
-    border is either 0 or 1.
-
-    Another function in the same example uses \e tex1 with OpenGL.
-
-    \endomit
-*/
-
-QImage QGLWidget::convertToGLFormat(const QImage& img)
-{
-    QImage res(img.size(), QImage::Format_ARGB32);
-    convertToGLFormatHelper(res, img.convertToFormat(QImage::Format_ARGB32), GL_RGBA);
-    return res;
-}
-
-
-/*!
-    \fn QGLColormap & QGLWidget::colormap() const
-
-    Returns the colormap for this widget.
-
-    Usually it is only top-level widgets that can have different
-    colormaps installed. Asking for the colormap of a child widget
-    will return the colormap for the child's top-level widget.
-
-    If no colormap has been set for this widget, the QGLColormap
-    returned will be empty.
-
-    \sa setColormap(), QGLColormap::isEmpty()
-*/
-const QGLColormap & QGLWidget::colormap() const
-{
-    Q_D(const QGLWidget);
-    return d->cmap;
-}
-
-/*!
-    \fn void QGLWidget::setColormap(const QGLColormap & cmap)
-
-    Set the colormap for this widget to \a cmap. Usually it is only
-    top-level widgets that can have colormaps installed.
-
-    \sa colormap()
-*/
-void QGLWidget::setColormap(const QGLColormap & c)
-{
-    Q_UNUSED(c);
-}
-
-#ifndef QT_OPENGL_ES
-
-static void qt_save_gl_state()
-{
-    QOpenGLFunctions *funcs = qgl_functions();
-    QOpenGLFunctions_1_1 *gl1funcs = qgl1_functions();
-
-    gl1funcs->glPushClientAttrib(GL_CLIENT_ALL_ATTRIB_BITS);
-    gl1funcs->glPushAttrib(GL_ALL_ATTRIB_BITS);
-    gl1funcs->glMatrixMode(GL_TEXTURE);
-    gl1funcs->glPushMatrix();
-    gl1funcs->glLoadIdentity();
-    gl1funcs->glMatrixMode(GL_PROJECTION);
-    gl1funcs->glPushMatrix();
-    gl1funcs->glMatrixMode(GL_MODELVIEW);
-    gl1funcs->glPushMatrix();
-
-    gl1funcs->glShadeModel(GL_FLAT);
-    funcs->glDisable(GL_CULL_FACE);
-    funcs->glDisable(GL_LIGHTING);
-    funcs->glDisable(GL_STENCIL_TEST);
-    funcs->glDisable(GL_DEPTH_TEST);
-    funcs->glEnable(GL_BLEND);
-    funcs->glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
-}
-
-static void qt_restore_gl_state()
-{
-    QOpenGLFunctions_1_1 *gl1funcs = qgl1_functions();
-
-    gl1funcs->glMatrixMode(GL_TEXTURE);
-    gl1funcs->glPopMatrix();
-    gl1funcs->glMatrixMode(GL_PROJECTION);
-    gl1funcs->glPopMatrix();
-    gl1funcs->glMatrixMode(GL_MODELVIEW);
-    gl1funcs->glPopMatrix();
-    gl1funcs->glPopAttrib();
-    gl1funcs->glPopClientAttrib();
-}
-
-static void qt_gl_draw_text(QPainter *p, int x, int y, const QString &str,
-                            const QFont &font)
-{
-    GLfloat color[4];
-    qgl_functions()->glGetFloatv(GL_CURRENT_COLOR, &color[0]);
-
-    QColor col;
-    col.setRgbF(color[0], color[1], color[2],color[3]);
-    QPen old_pen = p->pen();
-    QFont old_font = p->font();
-
-    p->setPen(col);
-    p->setFont(font);
-    p->drawText(x, y, str);
-
-    p->setPen(old_pen);
-    p->setFont(old_font);
-}
-
-#endif // !QT_OPENGL_ES
-
-/*!
-   Renders the string \a str into the GL context of this widget.
-
-   \a x and \a y are specified in window coordinates, with the origin
-   in the upper left-hand corner of the window. If \a font is not
-   specified, the currently set application font will be used to
-   render the string. To change the color of the rendered text you can
-   use the glColor() call (or the qglColor() convenience function),
-   just before the renderText() call.
-
-   \note This function clears the stencil buffer.
-
-   \note This function is not supported on OpenGL/ES systems.
-
-   \note This function temporarily disables depth-testing when the
-   text is drawn.
-
-   \note This function can only be used inside a
-   QPainter::beginNativePainting()/QPainter::endNativePainting() block
-   if a painter is active on the QGLWidget.
-*/
-
-void QGLWidget::renderText(int x, int y, const QString &str, const QFont &font)
-{
-#ifndef QT_OPENGL_ES
-    Q_D(QGLWidget);
-    if (!d->glcx->contextHandle()->isOpenGLES()) {
-        Q_D(QGLWidget);
-        if (str.isEmpty() || !isValid())
-            return;
-
-        QOpenGLFunctions *funcs = qgl_functions();
-        GLint view[4];
-        bool use_scissor_testing = funcs->glIsEnabled(GL_SCISSOR_TEST);
-        if (!use_scissor_testing)
-            funcs->glGetIntegerv(GL_VIEWPORT, &view[0]);
-        int width = d->glcx->device()->width();
-        int height = d->glcx->device()->height();
-        bool auto_swap = autoBufferSwap();
-
-        QPaintEngine *engine = paintEngine();
-
-        qt_save_gl_state();
-
-        QPainter *p;
-        bool reuse_painter = false;
-        if (engine->isActive()) {
-            reuse_painter = true;
-            p = engine->painter();
-
-            funcs->glDisable(GL_DEPTH_TEST);
-            funcs->glViewport(0, 0, width, height);
-        } else {
-            setAutoBufferSwap(false);
-            // disable glClear() as a result of QPainter::begin()
-            d->disable_clear_on_painter_begin = true;
-            p = new QPainter(this);
-        }
-
-        QRect viewport(view[0], view[1], view[2], view[3]);
-        if (!use_scissor_testing && viewport != rect()) {
-            // if the user hasn't set a scissor box, we set one that
-            // covers the current viewport
-            funcs->glScissor(view[0], view[1], view[2], view[3]);
-            funcs->glEnable(GL_SCISSOR_TEST);
-        } else if (use_scissor_testing) {
-            // use the scissor box set by the user
-            funcs->glEnable(GL_SCISSOR_TEST);
-        }
-
-        qt_gl_draw_text(p, x, y, str, font);
-
-        if (!reuse_painter) {
-            p->end();
-            delete p;
-            setAutoBufferSwap(auto_swap);
-            d->disable_clear_on_painter_begin = false;
-        }
-
-        qt_restore_gl_state();
-
-        return;
-    }
-#else // QT_OPENGL_ES
-    Q_UNUSED(x);
-    Q_UNUSED(y);
-    Q_UNUSED(str);
-    Q_UNUSED(font);
-#endif
-    qWarning("QGLWidget::renderText is not supported under OpenGL/ES");
-}
-
-/*! \overload
-
-    \a x, \a y and \a z are specified in scene or object coordinates
-    relative to the currently set projection and model matrices. This
-    can be useful if you want to annotate models with text labels and
-    have the labels move with the model as it is rotated etc.
-
-    \note This function is not supported on OpenGL/ES systems.
-
-    \note If depth testing is enabled before this function is called,
-    then the drawn text will be depth-tested against the models that
-    have already been drawn in the scene.  Use \c{glDisable(GL_DEPTH_TEST)}
-    before calling this function to annotate the models without
-    depth-testing the text.
-
-    \note This function can only be used inside a
-    QPainter::beginNativePainting()/QPainter::endNativePainting() block
-    if a painter is active on the QGLWidget.
-*/
-void QGLWidget::renderText(double x, double y, double z, const QString &str, const QFont &font)
-{
-#ifndef QT_OPENGL_ES
-    Q_D(QGLWidget);
-    if (!d->glcx->contextHandle()->isOpenGLES()) {
-        Q_D(QGLWidget);
-        if (str.isEmpty() || !isValid())
-            return;
-
-        QOpenGLFunctions *funcs = qgl_functions();
-        bool auto_swap = autoBufferSwap();
-
-        int width = d->glcx->device()->width();
-        int height = d->glcx->device()->height();
-        GLdouble model[4 * 4], proj[4 * 4];
-        GLint view[4];
-        QOpenGLFunctions_1_1 *gl1funcs = qgl1_functions();
-        gl1funcs->glGetDoublev(GL_MODELVIEW_MATRIX, &model[0]);
-        gl1funcs->glGetDoublev(GL_PROJECTION_MATRIX, &proj[0]);
-        funcs->glGetIntegerv(GL_VIEWPORT, &view[0]);
-        GLdouble win_x = 0, win_y = 0, win_z = 0;
-        qgluProject(x, y, z, &model[0], &proj[0], &view[0],
-                    &win_x, &win_y, &win_z);
-        const int dpr = d->glcx->device()->devicePixelRatioF();
-        win_x /= dpr;
-        win_y /= dpr;
-        win_y = height - win_y; // y is inverted
-
-        QPaintEngine *engine = paintEngine();
-
-        QPainter *p;
-        bool reuse_painter = false;
-        bool use_depth_testing = funcs->glIsEnabled(GL_DEPTH_TEST);
-        bool use_scissor_testing = funcs->glIsEnabled(GL_SCISSOR_TEST);
-
-        qt_save_gl_state();
-
-        if (engine->isActive()) {
-            reuse_painter = true;
-            p = engine->painter();
-        } else {
-            setAutoBufferSwap(false);
-            // disable glClear() as a result of QPainter::begin()
-            d->disable_clear_on_painter_begin = true;
-            p = new QPainter(this);
-        }
-
-        QRect viewport(view[0], view[1], view[2], view[3]);
-        if (!use_scissor_testing && viewport != rect()) {
-            funcs->glScissor(view[0], view[1], view[2], view[3]);
-            funcs->glEnable(GL_SCISSOR_TEST);
-        } else if (use_scissor_testing) {
-            funcs->glEnable(GL_SCISSOR_TEST);
-        }
-        funcs->glViewport(0, 0, width * dpr, height * dpr);
-        gl1funcs->glAlphaFunc(GL_GREATER, 0.0);
-        funcs->glEnable(GL_ALPHA_TEST);
-        if (use_depth_testing)
-            funcs->glEnable(GL_DEPTH_TEST);
-
-        // The only option in Qt 5 is the shader-based OpenGL 2 paint engine.
-        // Setting fixed pipeline transformations is futile. Instead, pass the
-        // extra values directly and let the engine figure the matrices out.
-        static_cast<QGL2PaintEngineEx *>(p->paintEngine())->setTranslateZ(-2 * win_z);
-
-        qt_gl_draw_text(p, qRound(win_x), qRound(win_y), str, font);
-
-        static_cast<QGL2PaintEngineEx *>(p->paintEngine())->setTranslateZ(0);
-
-        if (!reuse_painter) {
-            p->end();
-            delete p;
-            setAutoBufferSwap(auto_swap);
-            d->disable_clear_on_painter_begin = false;
-        }
-
-        qt_restore_gl_state();
-
-        return;
-    }
-#else // QT_OPENGL_ES
-    Q_UNUSED(x);
-    Q_UNUSED(y);
-    Q_UNUSED(z);
-    Q_UNUSED(str);
-    Q_UNUSED(font);
-#endif
-    qWarning("QGLWidget::renderText is not supported under OpenGL/ES");
-}
-
-QGLFormat QGLWidget::format() const
-{
-    Q_D(const QGLWidget);
-    return d->glcx->format();
-}
-
-QGLContext *QGLWidget::context() const
-{
-    Q_D(const QGLWidget);
-    return d->glcx;
-}
-
-bool QGLWidget::doubleBuffer() const
-{
-    Q_D(const QGLWidget);
-    return d->glcx->d_ptr->glFormat.testOption(QGL::DoubleBuffer);
-}
-
-void QGLWidget::setAutoBufferSwap(bool on)
-{
-    Q_D(QGLWidget);
-    d->autoSwap = on;
-}
-
-bool QGLWidget::autoBufferSwap() const
-{
-    Q_D(const QGLWidget);
-    return d->autoSwap;
-}
-
-/*!
-    Calls QGLContext:::bindTexture(\a image, \a target, \a format) on the currently
-    set context.
-
-    \sa deleteTexture()
-*/
-GLuint QGLWidget::bindTexture(const QImage &image, GLenum target, GLint format)
-{
-    if (image.isNull())
-        return 0;
-
-    Q_D(QGLWidget);
-    return d->glcx->bindTexture(image, target, format, QGLContext::DefaultBindOption);
-}
-
-/*!
-  \overload
-  \since 4.6
-
-  The binding \a options are a set of options used to decide how to
-  bind the texture to the context.
- */
-GLuint QGLWidget::bindTexture(const QImage &image, GLenum target, GLint format, QGLContext::BindOptions options)
-{
-    if (image.isNull())
-        return 0;
-
-    Q_D(QGLWidget);
-    return d->glcx->bindTexture(image, target, format, options);
-}
-
-
-/*!
-    Calls QGLContext:::bindTexture(\a pixmap, \a target, \a format) on the currently
-    set context.
-
-    \sa deleteTexture()
-*/
-GLuint QGLWidget::bindTexture(const QPixmap &pixmap, GLenum target, GLint format)
-{
-    if (pixmap.isNull())
-        return 0;
-
-    Q_D(QGLWidget);
-    return d->glcx->bindTexture(pixmap, target, format, QGLContext::DefaultBindOption);
-}
-
-/*!
-  \overload
-  \since 4.6
-
-  Generates and binds a 2D GL texture to the current context, based
-  on \a pixmap. The generated texture id is returned and can be used in
-
-  The binding \a options are a set of options used to decide how to
-  bind the texture to the context.
- */
-GLuint QGLWidget::bindTexture(const QPixmap &pixmap, GLenum target, GLint format,
-                              QGLContext::BindOptions options)
-{
-    Q_D(QGLWidget);
-    return d->glcx->bindTexture(pixmap, target, format, options);
-}
-
-/*! \overload
-
-    Calls QGLContext::bindTexture(\a fileName) on the currently set context.
-
-    \sa deleteTexture()
-*/
-GLuint QGLWidget::bindTexture(const QString &fileName)
-{
-    Q_D(QGLWidget);
-    return d->glcx->bindTexture(fileName);
-}
-
-/*!
-    Calls QGLContext::deleteTexture(\a id) on the currently set
-    context.
-
-    \sa bindTexture()
-*/
-void QGLWidget::deleteTexture(GLuint id)
-{
-    Q_D(QGLWidget);
-    d->glcx->deleteTexture(id);
-}
-
-/*!
-    \since 4.4
-
-    Calls the corresponding QGLContext::drawTexture() with
-    \a target, \a textureId, and \a textureTarget for this
-    widget's context.
-*/
-void QGLWidget::drawTexture(const QRectF &target, GLuint textureId, GLenum textureTarget)
-{
-    Q_D(QGLWidget);
-    d->glcx->drawTexture(target, textureId, textureTarget);
-}
-
-/*!
-    \since 4.4
-
-    Calls the corresponding QGLContext::drawTexture() with
-    \a point, \a textureId, and \a textureTarget for this
-    widget's context.
-*/
-void QGLWidget::drawTexture(const QPointF &point, GLuint textureId, GLenum textureTarget)
-{
-    Q_D(QGLWidget);
-    d->glcx->drawTexture(point, textureId, textureTarget);
-}
-
-Q_GLOBAL_STATIC(QGLEngineThreadStorage<QGL2PaintEngineEx>, qt_gl_2_engine)
-
-Q_OPENGL_EXPORT QPaintEngine* qt_qgl_paint_engine()
-{
-    return qt_gl_2_engine()->engine();
-}
-
-/*!
-    \internal
-
-    Returns the GL widget's paint engine.
-*/
-QPaintEngine *QGLWidget::paintEngine() const
-{
-    return qt_qgl_paint_engine();
-}
-
-void QGLWidgetPrivate::init(QGLContext *context, const QGLWidget *shareWidget)
-{
-    Q_Q(QGLWidget);
-    q->setAttribute(Qt::WA_PaintOnScreen);
-    q->setAttribute(Qt::WA_NoSystemBackground);
-    q->setAutoFillBackground(true); // for compatibility
-
-    mustHaveWindowHandle = 1;
-    q->setAttribute(Qt::WA_NativeWindow);
-    q->setWindowFlag(Qt::MSWindowsOwnDC);
-
-    initContext(context, shareWidget);
-}
-
-/*
-  This is the shared initialization for all platforms. Called from QGLWidgetPrivate::init()
-*/
-void QGLWidgetPrivate::initContext(QGLContext *context, const QGLWidget* shareWidget)
-{
-    Q_Q(QGLWidget);
-
-    glDevice.setWidget(q);
-
-    glcx = 0;
-    autoSwap = true;
-
-    if (context && !context->device())
-        context->setDevice(q);
-    q->setContext(context, shareWidget ? shareWidget->context() : 0);
-
-    if (!glcx)
-        glcx = new QGLContext(QGLFormat::defaultFormat(), q);
-}
-
-bool QGLWidgetPrivate::renderCxPm(QPixmap*)
-{
-    return false;
-}
-
-/*! \internal
-  Free up any allocated colormaps. This fn is only called for
-  top-level widgets.
-*/
-void QGLWidgetPrivate::cleanupColormaps()
-{
-}
-
-void QGLContextGroup::addShare(const QGLContext *context, const QGLContext *share) {
-    Q_ASSERT(context && share);
-    if (context->d_ptr->group == share->d_ptr->group)
-        return;
-
-    // Make sure 'context' is not already shared with another group of contexts.
-    Q_ASSERT(context->d_ptr->group->m_refs.loadRelaxed() == 1);
-
-    // Free 'context' group resources and make it use the same resources as 'share'.
-    QGLContextGroup *group = share->d_ptr->group;
-    delete context->d_ptr->group;
-    context->d_ptr->group = group;
-    group->m_refs.ref();
-
-    // Maintain a list of all the contexts in each group of sharing contexts.
-    // The list is empty if the "share" context wasn't sharing already.
-    if (group->m_shares.isEmpty())
-        group->m_shares.append(share);
-    group->m_shares.append(context);
-}
-
-void QGLContextGroup::removeShare(const QGLContext *context) {
-    // Remove the context from the group.
-    QGLContextGroup *group = context->d_ptr->group;
-    if (group->m_shares.isEmpty())
-        return;
-    group->m_shares.removeAll(context);
-
-    // Update context group representative.
-    Q_ASSERT(group->m_shares.size() != 0);
-    if (group->m_context == context)
-        group->m_context = group->m_shares.at(0);
-
-    // If there is only one context left, then make the list empty.
-    if (group->m_shares.size() == 1)
-        group->m_shares.clear();
-}
-
-QSize QGLTexture::bindCompressedTexture
-    (const QString& fileName, const char *format)
-{
-    QFile file(fileName);
-    if (!file.open(QIODevice::ReadOnly))
-        return QSize();
-    QByteArray contents = file.readAll();
-    file.close();
-    return bindCompressedTexture
-        (contents.constData(), contents.size(), format);
-}
-
-// PVR header format for container files that store textures compressed
-// with the ETC1, PVRTC2, and PVRTC4 encodings.  Format information from the
-// PowerVR SDK at http://www.imgtec.com/powervr/insider/powervr-sdk.asp
-// "PVRTexTool Reference Manual, version 1.11f".
-struct PvrHeader
-{
-    quint32 headerSize;
-    quint32 height;
-    quint32 width;
-    quint32 mipMapCount;
-    quint32 flags;
-    quint32 dataSize;
-    quint32 bitsPerPixel;
-    quint32 redMask;
-    quint32 greenMask;
-    quint32 blueMask;
-    quint32 alphaMask;
-    quint32 magic;
-    quint32 surfaceCount;
-};
-
-#define PVR_MAGIC               0x21525650      // "PVR!" in little-endian
-
-#define PVR_FORMAT_MASK         0x000000FF
-#define PVR_FORMAT_PVRTC2       0x00000018
-#define PVR_FORMAT_PVRTC4       0x00000019
-#define PVR_FORMAT_ETC1         0x00000036
-
-#define PVR_HAS_MIPMAPS         0x00000100
-#define PVR_TWIDDLED            0x00000200
-#define PVR_NORMAL_MAP          0x00000400
-#define PVR_BORDER_ADDED        0x00000800
-#define PVR_CUBE_MAP            0x00001000
-#define PVR_FALSE_COLOR_MIPMAPS 0x00002000
-#define PVR_VOLUME_TEXTURE      0x00004000
-#define PVR_ALPHA_IN_TEXTURE    0x00008000
-#define PVR_VERTICAL_FLIP       0x00010000
-
-#ifndef GL_COMPRESSED_RGB_PVRTC_4BPPV1_IMG
-#define GL_COMPRESSED_RGB_PVRTC_4BPPV1_IMG      0x8C00
-#define GL_COMPRESSED_RGB_PVRTC_2BPPV1_IMG      0x8C01
-#define GL_COMPRESSED_RGBA_PVRTC_4BPPV1_IMG     0x8C02
-#define GL_COMPRESSED_RGBA_PVRTC_2BPPV1_IMG     0x8C03
-#endif
-
-#ifndef GL_ETC1_RGB8_OES
-#define GL_ETC1_RGB8_OES                        0x8D64
-#endif
-
-bool QGLTexture::canBindCompressedTexture
-    (const char *buf, int len, const char *format, bool *hasAlpha)
-{
-    if (QSysInfo::ByteOrder != QSysInfo::LittleEndian) {
-        // Compressed texture loading only supported on little-endian
-        // systems such as x86 and ARM at the moment.
-        return false;
-    }
-    if (!format) {
-        // Auto-detect the format from the header.
-        if (len >= 4 && !qstrncmp(buf, "DDS ", 4)) {
-            *hasAlpha = true;
-            return true;
-        } else if (len >= 52 && !qstrncmp(buf + 44, "PVR!", 4)) {
-            const PvrHeader *pvrHeader =
-                reinterpret_cast<const PvrHeader *>(buf);
-            *hasAlpha = (pvrHeader->alphaMask != 0);
-            return true;
-        }
-    } else {
-        // Validate the format against the header.
-        if (!qstricmp(format, "DDS")) {
-            if (len >= 4 && !qstrncmp(buf, "DDS ", 4)) {
-                *hasAlpha = true;
-                return true;
-            }
-        } else if (!qstricmp(format, "PVR") || !qstricmp(format, "ETC1")) {
-            if (len >= 52 && !qstrncmp(buf + 44, "PVR!", 4)) {
-                const PvrHeader *pvrHeader =
-                    reinterpret_cast<const PvrHeader *>(buf);
-                *hasAlpha = (pvrHeader->alphaMask != 0);
-                return true;
-            }
-        }
-    }
-    return false;
-}
-
-#define ctx QGLContext::currentContext()
-
-QSize QGLTexture::bindCompressedTexture
-    (const char *buf, int len, const char *format)
-{
-    if (QSysInfo::ByteOrder != QSysInfo::LittleEndian) {
-        // Compressed texture loading only supported on little-endian
-        // systems such as x86 and ARM at the moment.
-        return QSize();
-    }
-    if (!format) {
-        // Auto-detect the format from the header.
-        if (len >= 4 && !qstrncmp(buf, "DDS ", 4))
-            return bindCompressedTextureDDS(buf, len);
-        else if (len >= 52 && !qstrncmp(buf + 44, "PVR!", 4))
-            return bindCompressedTexturePVR(buf, len);
-    } else {
-        // Validate the format against the header.
-        if (!qstricmp(format, "DDS")) {
-            if (len >= 4 && !qstrncmp(buf, "DDS ", 4))
-                return bindCompressedTextureDDS(buf, len);
-        } else if (!qstricmp(format, "PVR") || !qstricmp(format, "ETC1")) {
-            if (len >= 52 && !qstrncmp(buf + 44, "PVR!", 4))
-                return bindCompressedTexturePVR(buf, len);
-        }
-    }
-    return QSize();
-}
-
-QSize QGLTexture::bindCompressedTextureDDS(const char *buf, int len)
-{
-    // We only support 2D texture loading at present.
-    if (target != GL_TEXTURE_2D)
-        return QSize();
-
-    // Bail out if the necessary extension is not present.
-    if (!qgl_extensions()->hasOpenGLExtension(QOpenGLExtensions::DDSTextureCompression)) {
-        qWarning("QGLContext::bindTexture(): DDS texture compression is not supported.");
-        return QSize();
-    }
-
-    const DDSFormat *ddsHeader = reinterpret_cast<const DDSFormat *>(buf + 4);
-    if (!ddsHeader->dwLinearSize) {
-        qWarning("QGLContext::bindTexture(): DDS image size is not valid.");
-        return QSize();
-    }
-
-    int blockSize = 16;
-    GLenum format;
-
-    switch(ddsHeader->ddsPixelFormat.dwFourCC) {
-    case FOURCC_DXT1:
-        format = GL_COMPRESSED_RGBA_S3TC_DXT1_EXT;
-        blockSize = 8;
-        break;
-    case FOURCC_DXT3:
-        format = GL_COMPRESSED_RGBA_S3TC_DXT3_EXT;
-        break;
-    case FOURCC_DXT5:
-        format = GL_COMPRESSED_RGBA_S3TC_DXT5_EXT;
-        break;
-    default:
-        qWarning("QGLContext::bindTexture(): DDS image format not supported.");
-        return QSize();
-    }
-
-    const GLubyte *pixels =
-        reinterpret_cast<const GLubyte *>(buf + ddsHeader->dwSize + 4);
-
-    QOpenGLFunctions *funcs = qgl_functions();
-    funcs->glGenTextures(1, &id);
-    funcs->glBindTexture(GL_TEXTURE_2D, id);
-    funcs->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-    funcs->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-
-    int size;
-    int offset = 0;
-    int available = len - int(ddsHeader->dwSize + 4);
-    int w = ddsHeader->dwWidth;
-    int h = ddsHeader->dwHeight;
-
-    // load mip-maps
-    for(int i = 0; i < (int) ddsHeader->dwMipMapCount; ++i) {
-        if (w == 0) w = 1;
-        if (h == 0) h = 1;
-
-        size = ((w+3)/4) * ((h+3)/4) * blockSize;
-        if (size > available)
-            break;
-        qgl_extensions()->glCompressedTexImage2D(GL_TEXTURE_2D, i, format, w, h, 0,
-                               size, pixels + offset);
-        offset += size;
-        available -= size;
-
-        // half size for each mip-map level
-        w = w/2;
-        h = h/2;
-    }
-
-    // DDS images are not inverted.
-    options &= ~QGLContext::InvertedYBindOption;
-
-    return QSize(ddsHeader->dwWidth, ddsHeader->dwHeight);
-}
-
-QSize QGLTexture::bindCompressedTexturePVR(const char *buf, int len)
-{
-    // We only support 2D texture loading at present.  Cube maps later.
-    if (target != GL_TEXTURE_2D)
-        return QSize();
-
-    // Determine which texture format we will be loading.
-    const PvrHeader *pvrHeader = reinterpret_cast<const PvrHeader *>(buf);
-    GLenum textureFormat;
-    quint32 minWidth, minHeight;
-    switch (pvrHeader->flags & PVR_FORMAT_MASK) {
-    case PVR_FORMAT_PVRTC2:
-        if (pvrHeader->alphaMask)
-            textureFormat = GL_COMPRESSED_RGBA_PVRTC_2BPPV1_IMG;
-        else
-            textureFormat = GL_COMPRESSED_RGB_PVRTC_2BPPV1_IMG;
-        minWidth = 16;
-        minHeight = 8;
-        break;
-
-    case PVR_FORMAT_PVRTC4:
-        if (pvrHeader->alphaMask)
-            textureFormat = GL_COMPRESSED_RGBA_PVRTC_4BPPV1_IMG;
-        else
-            textureFormat = GL_COMPRESSED_RGB_PVRTC_4BPPV1_IMG;
-        minWidth = 8;
-        minHeight = 8;
-        break;
-
-    case PVR_FORMAT_ETC1:
-        textureFormat = GL_ETC1_RGB8_OES;
-        minWidth = 4;
-        minHeight = 4;
-        break;
-
-    default:
-        qWarning("QGLContext::bindTexture(): PVR image format 0x%x not supported.", int(pvrHeader->flags & PVR_FORMAT_MASK));
-        return QSize();
-    }
-
-    // Bail out if the necessary extension is not present.
-    if (textureFormat == GL_ETC1_RGB8_OES) {
-        if (!qgl_extensions()->hasOpenGLExtension(QOpenGLExtensions::ETC1TextureCompression)) {
-            qWarning("QGLContext::bindTexture(): ETC1 texture compression is not supported.");
-            return QSize();
-        }
-    } else {
-        if (!qgl_extensions()->hasOpenGLExtension(QOpenGLExtensions::PVRTCTextureCompression)) {
-            qWarning("QGLContext::bindTexture(): PVRTC texture compression is not supported.");
-            return QSize();
-        }
-    }
-
-    // Boundary check on the buffer size.
-    quint32 bufferSize = pvrHeader->headerSize + pvrHeader->dataSize;
-    if (bufferSize > quint32(len)) {
-        qWarning("QGLContext::bindTexture(): PVR image size is not valid.");
-        return QSize();
-    }
-
-    // Create the texture.
-    QOpenGLFunctions *funcs = qgl_functions();
-    funcs->glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
-    funcs->glGenTextures(1, &id);
-    funcs->glBindTexture(GL_TEXTURE_2D, id);
-    if (pvrHeader->mipMapCount) {
-        if ((options & QGLContext::LinearFilteringBindOption) != 0) {
-            funcs->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-            funcs->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR);
-        } else {
-            funcs->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
-            funcs->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST_MIPMAP_NEAREST);
-        }
-    } else if ((options & QGLContext::LinearFilteringBindOption) != 0) {
-        funcs->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-        funcs->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-    } else {
-        funcs->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
-        funcs->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
-    }
-
-    // Load the compressed mipmap levels.
-    const GLubyte *buffer =
-        reinterpret_cast<const GLubyte *>(buf + pvrHeader->headerSize);
-    bufferSize = pvrHeader->dataSize;
-    quint32 level = 0;
-    quint32 width = pvrHeader->width;
-    quint32 height = pvrHeader->height;
-    while (bufferSize > 0 && level <= pvrHeader->mipMapCount) {
-        quint32 size =
-            (qMax(width, minWidth) * qMax(height, minHeight) *
-             pvrHeader->bitsPerPixel) / 8;
-        if (size > bufferSize)
-            break;
-        qgl_extensions()->glCompressedTexImage2D(GL_TEXTURE_2D, GLint(level), textureFormat,
-                               GLsizei(width), GLsizei(height), 0,
-                               GLsizei(size), buffer);
-        width /= 2;
-        height /= 2;
-        buffer += size;
-        ++level;
-    }
-
-    // Restore the default pixel alignment for later texture uploads.
-    funcs->glPixelStorei(GL_UNPACK_ALIGNMENT, 4);
-
-    // Set the invert flag for the texture.  The "vertical flip"
-    // flag in PVR is the opposite sense to our sense of inversion.
-    options.setFlag(QGLContext::InvertedYBindOption, !(pvrHeader->flags & PVR_VERTICAL_FLIP));
-
-    return QSize(pvrHeader->width, pvrHeader->height);
-}
-
-#undef ctx
-
-QT_END_NAMESPACE
diff --git a/src/opengl/qgl.h b/src/opengl/qgl.h
deleted file mode 100644
index f5accbeb3c..0000000000
--- a/src/opengl/qgl.h
+++ /dev/null
@@ -1,524 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtOpenGL module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QGL_H
-#define QGL_H
-
-#ifndef QT_NO_OPENGL
-
-#include <QtGui/qopengl.h>
-#include <QtWidgets/qwidget.h>
-#include <QtGui/qpaintengine.h>
-#include <QtOpenGL/qglcolormap.h>
-#include <QtCore/qmap.h>
-#include <QtCore/qscopedpointer.h>
-
-#include <QtGui/QSurfaceFormat>
-
-QT_BEGIN_NAMESPACE
-
-
-
-
-class QPixmap;
-class QGLWidgetPrivate;
-class QGLContextPrivate;
-
-// Namespace class:
-namespace QGL
-{
-    enum FormatOption {
-        DoubleBuffer            = 0x0001,
-        DepthBuffer             = 0x0002,
-        Rgba                    = 0x0004,
-        AlphaChannel            = 0x0008,
-        AccumBuffer             = 0x0010,
-        StencilBuffer           = 0x0020,
-        StereoBuffers           = 0x0040,
-        DirectRendering         = 0x0080,
-        HasOverlay              = 0x0100,
-        SampleBuffers           = 0x0200,
-        DeprecatedFunctions     = 0x0400,
-        SingleBuffer            = DoubleBuffer    << 16,
-        NoDepthBuffer           = DepthBuffer     << 16,
-        ColorIndex              = Rgba            << 16,
-        NoAlphaChannel          = AlphaChannel    << 16,
-        NoAccumBuffer           = AccumBuffer     << 16,
-        NoStencilBuffer         = StencilBuffer   << 16,
-        NoStereoBuffers         = StereoBuffers   << 16,
-        IndirectRendering       = DirectRendering << 16,
-        NoOverlay               = HasOverlay      << 16,
-        NoSampleBuffers         = SampleBuffers   << 16,
-        NoDeprecatedFunctions   = DeprecatedFunctions << 16
-    };
-    Q_DECLARE_FLAGS(FormatOptions, FormatOption)
-}
-
-Q_DECLARE_OPERATORS_FOR_FLAGS(QGL::FormatOptions)
-
-class QGLFormatPrivate;
-
-class Q_OPENGL_EXPORT QGLFormat
-{
-public:
-    QGLFormat();
-    QGLFormat(QGL::FormatOptions options, int plane = 0);
-    QGLFormat(const QGLFormat &other);
-    QGLFormat &operator=(const QGLFormat &other);
-    ~QGLFormat();
-
-    void setDepthBufferSize(int size);
-    int  depthBufferSize() const;
-
-    void setAccumBufferSize(int size);
-    int  accumBufferSize() const;
-
-    void setRedBufferSize(int size);
-    int  redBufferSize() const;
-
-    void setGreenBufferSize(int size);
-    int  greenBufferSize() const;
-
-    void setBlueBufferSize(int size);
-    int  blueBufferSize() const;
-
-    void setAlphaBufferSize(int size);
-    int  alphaBufferSize() const;
-
-    void setStencilBufferSize(int size);
-    int  stencilBufferSize() const;
-
-    void setSampleBuffers(bool enable);
-    bool sampleBuffers() const;
-
-    void setSamples(int numSamples);
-    int  samples() const;
-
-    void setSwapInterval(int interval);
-    int  swapInterval() const;
-
-    bool doubleBuffer() const;
-    void setDoubleBuffer(bool enable);
-    bool depth() const;
-    void setDepth(bool enable);
-    bool rgba() const;
-    void setRgba(bool enable);
-    bool alpha() const;
-    void setAlpha(bool enable);
-    bool accum() const;
-    void setAccum(bool enable);
-    bool stencil() const;
-    void setStencil(bool enable);
-    bool stereo() const;
-    void setStereo(bool enable);
-    bool directRendering() const;
-    void setDirectRendering(bool enable);
-    bool hasOverlay() const;
-    void setOverlay(bool enable);
-
-    int plane() const;
-    void setPlane(int plane);
-
-    void setOption(QGL::FormatOptions opt);
-    bool testOption(QGL::FormatOptions opt) const;
-
-    static QGLFormat defaultFormat();
-    static void setDefaultFormat(const QGLFormat& f);
-
-    static QGLFormat defaultOverlayFormat();
-    static void setDefaultOverlayFormat(const QGLFormat& f);
-
-    static bool hasOpenGL();
-    static bool hasOpenGLOverlays();
-
-    void setVersion(int major, int minor);
-    int majorVersion() const;
-    int minorVersion() const;
-
-    enum OpenGLContextProfile {
-        NoProfile,
-        CoreProfile,
-        CompatibilityProfile
-    };
-
-    void setProfile(OpenGLContextProfile profile);
-    OpenGLContextProfile profile() const;
-
-    enum OpenGLVersionFlag {
-        OpenGL_Version_None               = 0x00000000,
-        OpenGL_Version_1_1                = 0x00000001,
-        OpenGL_Version_1_2                = 0x00000002,
-        OpenGL_Version_1_3                = 0x00000004,
-        OpenGL_Version_1_4                = 0x00000008,
-        OpenGL_Version_1_5                = 0x00000010,
-        OpenGL_Version_2_0                = 0x00000020,
-        OpenGL_Version_2_1                = 0x00000040,
-        OpenGL_ES_Common_Version_1_0      = 0x00000080,
-        OpenGL_ES_CommonLite_Version_1_0  = 0x00000100,
-        OpenGL_ES_Common_Version_1_1      = 0x00000200,
-        OpenGL_ES_CommonLite_Version_1_1  = 0x00000400,
-        OpenGL_ES_Version_2_0             = 0x00000800,
-        OpenGL_Version_3_0                = 0x00001000,
-        OpenGL_Version_3_1                = 0x00002000,
-        OpenGL_Version_3_2                = 0x00004000,
-        OpenGL_Version_3_3                = 0x00008000,
-        OpenGL_Version_4_0                = 0x00010000,
-        OpenGL_Version_4_1                = 0x00020000,
-        OpenGL_Version_4_2                = 0x00040000,
-        OpenGL_Version_4_3                = 0x00080000
-    };
-    Q_DECLARE_FLAGS(OpenGLVersionFlags, OpenGLVersionFlag)
-
-    static OpenGLVersionFlags openGLVersionFlags();
-
-    static QGLFormat fromSurfaceFormat(const QSurfaceFormat &format);
-    static QSurfaceFormat toSurfaceFormat(const QGLFormat &format);
-private:
-    QGLFormatPrivate *d;
-
-    void detach();
-
-    friend Q_OPENGL_EXPORT bool operator==(const QGLFormat&, const QGLFormat&);
-    friend Q_OPENGL_EXPORT bool operator!=(const QGLFormat&, const QGLFormat&);
-#ifndef QT_NO_DEBUG_STREAM
-    friend Q_OPENGL_EXPORT QDebug operator<<(QDebug, const QGLFormat &);
-#endif
-};
-
-Q_DECLARE_OPERATORS_FOR_FLAGS(QGLFormat::OpenGLVersionFlags)
-
-Q_OPENGL_EXPORT bool operator==(const QGLFormat&, const QGLFormat&);
-Q_OPENGL_EXPORT bool operator!=(const QGLFormat&, const QGLFormat&);
-
-#ifndef QT_NO_DEBUG_STREAM
-Q_OPENGL_EXPORT QDebug operator<<(QDebug, const QGLFormat &);
-#endif
-
-class QGLFunctions;
-
-class Q_OPENGL_EXPORT QGLContext
-{
-    Q_DECLARE_PRIVATE(QGLContext)
-public:
-    QGLContext(const QGLFormat& format, QPaintDevice* device);
-    QGLContext(const QGLFormat& format);
-    virtual ~QGLContext();
-
-    virtual bool create(const QGLContext* shareContext = nullptr);
-    bool isValid() const;
-    bool isSharing() const;
-    void reset();
-
-    static bool areSharing(const QGLContext *context1, const QGLContext *context2);
-
-    QGLFormat format() const;
-    QGLFormat requestedFormat() const;
-    void setFormat(const QGLFormat& format);
-
-    void moveToThread(QThread *thread);
-
-    virtual void makeCurrent();
-    virtual void doneCurrent();
-
-    virtual void swapBuffers() const;
-
-    QGLFunctions *functions() const;
-
-    enum BindOption {
-        NoBindOption                            = 0x0000,
-        InvertedYBindOption                     = 0x0001,
-        MipmapBindOption                        = 0x0002,
-        PremultipliedAlphaBindOption            = 0x0004,
-        LinearFilteringBindOption               = 0x0008,
-
-        MemoryManagedBindOption                 = 0x0010, // internal flag
-        CanFlipNativePixmapBindOption           = 0x0020, // internal flag
-        TemporarilyCachedBindOption             = 0x0040, // internal flag
-
-        DefaultBindOption                       = LinearFilteringBindOption
-                                                  | InvertedYBindOption
-                                                  | MipmapBindOption,
-        InternalBindOption                      = MemoryManagedBindOption
-                                                  | PremultipliedAlphaBindOption
-    };
-    Q_DECLARE_FLAGS(BindOptions, BindOption)
-
-    GLuint bindTexture(const QImage &image, GLenum target, GLint format,
-                       BindOptions options);
-    GLuint bindTexture(const QPixmap &pixmap, GLenum target, GLint format,
-                       BindOptions options);
-
-    GLuint bindTexture(const QImage &image, GLenum target = GL_TEXTURE_2D,
-                       GLint format = GL_RGBA);
-    GLuint bindTexture(const QPixmap &pixmap, GLenum target = GL_TEXTURE_2D,
-                       GLint format = GL_RGBA);
-    GLuint bindTexture(const QString &fileName);
-
-    void deleteTexture(GLuint tx_id);
-
-    void drawTexture(const QRectF &target, GLuint textureId, GLenum textureTarget = GL_TEXTURE_2D);
-    void drawTexture(const QPointF &point, GLuint textureId, GLenum textureTarget = GL_TEXTURE_2D);
-
-    static void setTextureCacheLimit(int size);
-    static int textureCacheLimit();
-
-    QFunctionPointer getProcAddress(const QString &proc) const;
-    QPaintDevice* device() const;
-    QColor overlayTransparentColor() const;
-
-    static const QGLContext* currentContext();
-
-    static QGLContext *fromOpenGLContext(QOpenGLContext *platformContext);
-    QOpenGLContext *contextHandle() const;
-
-protected:
-    virtual bool chooseContext(const QGLContext* shareContext = nullptr);
-
-    bool deviceIsPixmap() const;
-    bool windowCreated() const;
-    void setWindowCreated(bool on);
-    bool initialized() const;
-    void setInitialized(bool on);
-
-    uint colorIndex(const QColor& c) const;
-    void setValid(bool valid);
-    void setDevice(QPaintDevice *pDev);
-
-protected:
-    static QGLContext* currentCtx;
-
-private:
-    QGLContext(QOpenGLContext *windowContext);
-
-    QScopedPointer<QGLContextPrivate> d_ptr;
-
-    friend class QGLPixelBuffer;
-    friend class QGLPixelBufferPrivate;
-    friend class QGLWidget;
-    friend class QGLWidgetPrivate;
-    friend class QGLGlyphCache;
-    friend class QGL2PaintEngineEx;
-    friend class QGL2PaintEngineExPrivate;
-    friend class QGLEngineShaderManager;
-    friend class QGLTextureGlyphCache;
-    friend struct QGLGlyphTexture;
-    friend class QGLContextGroup;
-    friend class QGLPixmapBlurFilter;
-    friend class QGLTexture;
-    friend QGLFormat::OpenGLVersionFlags QGLFormat::openGLVersionFlags();
-    friend class QGLFramebufferObject;
-    friend class QGLFramebufferObjectPrivate;
-    friend class QGLFBOGLPaintDevice;
-    friend class QGLPaintDevice;
-    friend class QGLWidgetGLPaintDevice;
-    friend class QX11GLSharedContexts;
-    friend class QGLContextResourceBase;
-    friend class QSGDistanceFieldGlyphCache;
-private:
-    Q_DISABLE_COPY(QGLContext)
-};
-
-Q_DECLARE_OPERATORS_FOR_FLAGS(QGLContext::BindOptions)
-
-class Q_OPENGL_EXPORT QGLWidget : public QWidget
-{
-    Q_OBJECT
-    Q_DECLARE_PRIVATE(QGLWidget)
-public:
-    explicit QGLWidget(QWidget* parent=nullptr,
-                       const QGLWidget* shareWidget = nullptr, Qt::WindowFlags f=Qt::WindowFlags());
-    explicit QGLWidget(QGLContext *context, QWidget* parent=nullptr,
-                       const QGLWidget* shareWidget = nullptr, Qt::WindowFlags f=Qt::WindowFlags());
-    explicit QGLWidget(const QGLFormat& format, QWidget* parent=nullptr,
-                       const QGLWidget* shareWidget = nullptr, Qt::WindowFlags f=Qt::WindowFlags());
-    ~QGLWidget();
-
-    void qglColor(const QColor& c) const;
-    void qglClearColor(const QColor& c) const;
-
-    bool isValid() const;
-    bool isSharing() const;
-
-    void makeCurrent();
-    void doneCurrent();
-
-    bool doubleBuffer() const;
-    void swapBuffers();
-
-    QGLFormat format() const;
-    void setFormat(const QGLFormat& format);
-
-    QGLContext* context() const;
-    void setContext(QGLContext* context, const QGLContext* shareContext = nullptr,
-                    bool deleteOldContext = true);
-
-    QPixmap renderPixmap(int w = 0, int h = 0, bool useContext = false);
-    QImage grabFrameBuffer(bool withAlpha = false);
-
-    void makeOverlayCurrent();
-    const QGLContext* overlayContext() const;
-
-    static QImage convertToGLFormat(const QImage& img);
-
-    const QGLColormap & colormap() const;
-    void  setColormap(const QGLColormap & map);
-
-    void renderText(int x, int y, const QString & str,
-                    const QFont & fnt = QFont());
-    void renderText(double x, double y, double z, const QString & str,
-                    const QFont & fnt = QFont());
-    QPaintEngine *paintEngine() const override;
-
-    GLuint bindTexture(const QImage &image, GLenum target, GLint format,
-                       QGLContext::BindOptions options);
-    GLuint bindTexture(const QPixmap &pixmap, GLenum target, GLint format,
-                       QGLContext::BindOptions options);
-
-    GLuint bindTexture(const QImage &image, GLenum target = GL_TEXTURE_2D,
-                       GLint format = GL_RGBA);
-    GLuint bindTexture(const QPixmap &pixmap, GLenum target = GL_TEXTURE_2D,
-                       GLint format = GL_RGBA);
-
-    GLuint bindTexture(const QString &fileName);
-
-    void deleteTexture(GLuint tx_id);
-
-    void drawTexture(const QRectF &target, GLuint textureId, GLenum textureTarget = GL_TEXTURE_2D);
-    void drawTexture(const QPointF &point, GLuint textureId, GLenum textureTarget = GL_TEXTURE_2D);
-
-public Q_SLOTS:
-    virtual void updateGL();
-    virtual void updateOverlayGL();
-
-protected:
-    bool event(QEvent *) override;
-    virtual void initializeGL();
-    virtual void resizeGL(int w, int h);
-    virtual void paintGL();
-
-    virtual void initializeOverlayGL();
-    virtual void resizeOverlayGL(int w, int h);
-    virtual void paintOverlayGL();
-
-    void setAutoBufferSwap(bool on);
-    bool autoBufferSwap() const;
-
-    void paintEvent(QPaintEvent*) override;
-    void resizeEvent(QResizeEvent*) override;
-
-    virtual void glInit();
-    virtual void glDraw();
-
-    QGLWidget(QGLWidgetPrivate &dd,
-              const QGLFormat &format = QGLFormat(),
-              QWidget *parent = nullptr,
-              const QGLWidget* shareWidget = nullptr,
-              Qt::WindowFlags f = Qt::WindowFlags());
-private:
-    Q_DISABLE_COPY(QGLWidget)
-
-    friend class QGLDrawable;
-    friend class QGLPixelBuffer;
-    friend class QGLPixelBufferPrivate;
-    friend class QGLContext;
-    friend class QGLContextPrivate;
-    friend class QGLOverlayWidget;
-    friend class QGLPaintDevice;
-    friend class QGLWidgetGLPaintDevice;
-};
-
-
-//
-// QGLFormat inline functions
-//
-
-inline bool QGLFormat::doubleBuffer() const
-{
-    return testOption(QGL::DoubleBuffer);
-}
-
-inline bool QGLFormat::depth() const
-{
-    return testOption(QGL::DepthBuffer);
-}
-
-inline bool QGLFormat::rgba() const
-{
-    return testOption(QGL::Rgba);
-}
-
-inline bool QGLFormat::alpha() const
-{
-    return testOption(QGL::AlphaChannel);
-}
-
-inline bool QGLFormat::accum() const
-{
-    return testOption(QGL::AccumBuffer);
-}
-
-inline bool QGLFormat::stencil() const
-{
-    return testOption(QGL::StencilBuffer);
-}
-
-inline bool QGLFormat::stereo() const
-{
-    return testOption(QGL::StereoBuffers);
-}
-
-inline bool QGLFormat::directRendering() const
-{
-    return testOption(QGL::DirectRendering);
-}
-
-inline bool QGLFormat::hasOverlay() const
-{
-    return testOption(QGL::HasOverlay);
-}
-
-inline bool QGLFormat::sampleBuffers() const
-{
-    return testOption(QGL::SampleBuffers);
-}
-
-QT_END_NAMESPACE
-
-#endif // QT_NO_OPENGL
-#endif // QGL_H
diff --git a/src/opengl/qgl_p.h b/src/opengl/qgl_p.h
deleted file mode 100644
index 4e52c0f5e9..0000000000
--- a/src/opengl/qgl_p.h
+++ /dev/null
@@ -1,556 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtOpenGL module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QGL_P_H
-#define QGL_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists for the convenience
-// of the QGLWidget class.  This header file may change from
-// version to version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include "QtOpenGL/qgl.h"
-#include "QtOpenGL/qglcolormap.h"
-#include "QtCore/qmap.h"
-#include "QtCore/qthread.h"
-#include "QtCore/qthreadstorage.h"
-#include "QtCore/qhashfunctions.h"
-#include "QtCore/qatomic.h"
-#include "QtWidgets/private/qwidget_p.h"
-#include "QtGui/private/qopenglcontext_p.h"
-#include "QtGui/private/qopenglextensions_p.h"
-#include "qcache.h"
-#include "qglpaintdevice_p.h"
-
-#include <QtGui/QOpenGLContext>
-
-QT_BEGIN_NAMESPACE
-
-class QGLContext;
-class QGLOverlayWidget;
-class QPixmap;
-class QOpenGLExtensions;
-
-class QGLFormatPrivate
-{
-public:
-    QGLFormatPrivate()
-        : ref(1)
-    {
-        opts = QGL::DoubleBuffer | QGL::DepthBuffer | QGL::Rgba | QGL::DirectRendering
-             | QGL::StencilBuffer | QGL::DeprecatedFunctions;
-        pln = 0;
-        depthSize = accumSize = stencilSize = redSize = greenSize = blueSize = alphaSize = -1;
-        numSamples = -1;
-        swapInterval = -1;
-        majorVersion = 2;
-        minorVersion = 0;
-        profile = QGLFormat::NoProfile;
-    }
-    QGLFormatPrivate(const QGLFormatPrivate *other)
-        : ref(1),
-          opts(other->opts),
-          pln(other->pln),
-          depthSize(other->depthSize),
-          accumSize(other->accumSize),
-          stencilSize(other->stencilSize),
-          redSize(other->redSize),
-          greenSize(other->greenSize),
-          blueSize(other->blueSize),
-          alphaSize(other->alphaSize),
-          numSamples(other->numSamples),
-          swapInterval(other->swapInterval),
-          majorVersion(other->majorVersion),
-          minorVersion(other->minorVersion),
-          profile(other->profile)
-    {
-    }
-    QAtomicInt ref;
-    QGL::FormatOptions opts;
-    int pln;
-    int depthSize;
-    int accumSize;
-    int stencilSize;
-    int redSize;
-    int greenSize;
-    int blueSize;
-    int alphaSize;
-    int numSamples;
-    int swapInterval;
-    int majorVersion;
-    int minorVersion;
-    QGLFormat::OpenGLContextProfile profile;
-};
-
-class Q_OPENGL_EXPORT QGLWidgetPrivate : public QWidgetPrivate
-{
-    Q_DECLARE_PUBLIC(QGLWidget)
-public:
-    QGLWidgetPrivate() : QWidgetPrivate()
-                       , disable_clear_on_painter_begin(false)
-                       , parent_changing(false)
-    {
-    }
-
-    ~QGLWidgetPrivate() {}
-
-    void init(QGLContext *context, const QGLWidget* shareWidget);
-    void initContext(QGLContext *context, const QGLWidget* shareWidget);
-    bool renderCxPm(QPixmap *pixmap);
-    void cleanupColormaps();
-    void aboutToDestroy() override {
-        if (glcx && !parent_changing)
-            glcx->reset();
-    }
-
-    bool makeCurrent();
-
-    QGLContext *glcx;
-    QGLWidgetGLPaintDevice glDevice;
-    bool autoSwap;
-
-    QGLColormap cmap;
-
-    bool disable_clear_on_painter_begin;
-    bool parent_changing;
-};
-
-// QGLContextPrivate has the responsibility of creating context groups.
-// QGLContextPrivate maintains the reference counter and destroys
-// context groups when needed.
-class QGLContextGroup
-{
-public:
-    ~QGLContextGroup();
-
-    const QGLContext *context() const {return m_context;}
-    bool isSharing() const { return m_shares.size() >= 2; }
-    QList<const QGLContext *> shares() const { return m_shares; }
-
-    static void addShare(const QGLContext *context, const QGLContext *share);
-    static void removeShare(const QGLContext *context);
-
-private:
-    QGLContextGroup(const QGLContext *context);
-
-    const QGLContext *m_context; // context group's representative
-    QList<const QGLContext *> m_shares;
-    QAtomicInt m_refs;
-
-    friend class QGLContext;
-    friend class QGLContextPrivate;
-    friend class QGLContextGroupResourceBase;
-};
-
-// Get the context that resources for "ctx" will transfer to once
-// "ctx" is destroyed.  Returns null if nothing is sharing with ctx.
-const QGLContext *qt_gl_transfer_context(const QGLContext *);
-
-/*
-    QGLTemporaryContext - the main objective of this class is to have a way of
-    creating a GL context and making it current, without going via QGLWidget
-    and friends. At certain points during GL initialization we need a current
-    context in order decide what GL features are available, and to resolve GL
-    extensions. Having a light-weight way of creating such a context saves
-    initial application startup time, and it doesn't wind up creating recursive
-    conflicts.
-    The class currently uses a private d pointer to hide the platform specific
-    types. This could possibly been done inline with #ifdef'ery, but it causes
-    major headaches on e.g. X11 due to namespace pollution.
-*/
-class QGLTemporaryContextPrivate;
-class QGLTemporaryContext {
-public:
-    explicit QGLTemporaryContext(bool directRendering = true, QWidget *parent = nullptr);
-    ~QGLTemporaryContext();
-
-private:
-    QScopedPointer<QGLTemporaryContextPrivate> d;
-};
-
-class QGLTexture;
-class QGLTextureDestroyer;
-
-// This probably needs to grow to GL_MAX_VERTEX_ATTRIBS, but 3 is ok for now as that's
-// all the GL2 engine uses:
-#define QT_GL_VERTEX_ARRAY_TRACKED_COUNT 3
-
-class QGLContextResourceBase;
-
-class QGLContextPrivate
-{
-    Q_DECLARE_PUBLIC(QGLContext)
-public:
-    explicit QGLContextPrivate(QGLContext *context);
-    ~QGLContextPrivate();
-    QGLTexture *bindTexture(const QImage &image, GLenum target, GLint format,
-                            QGLContext::BindOptions options);
-    QGLTexture *bindTexture(const QImage &image, GLenum target, GLint format, const qint64 key,
-                            QGLContext::BindOptions options);
-    QGLTexture *bindTexture(const QPixmap &pixmap, GLenum target, GLint format,
-                            QGLContext::BindOptions options);
-    QGLTexture *textureCacheLookup(const qint64 key, GLenum target);
-    void init(QPaintDevice *dev, const QGLFormat &format);
-    int maxTextureSize();
-
-    void cleanup();
-
-    void setVertexAttribArrayEnabled(int arrayIndex, bool enabled = true);
-    void syncGlState(); // Makes sure the GL context's state is what we think it is
-    void swapRegion(const QRegion &region);
-
-    QOpenGLContext *guiGlContext;
-    // true if QGLContext owns the QOpenGLContext (for who deletes who)
-    bool ownContext;
-
-    void setupSharing();
-    void refreshCurrentFbo();
-    void setCurrentFbo(GLuint fbo);
-
-    QGLFormat glFormat;
-    QGLFormat reqFormat;
-    GLuint fbo;
-
-    uint valid : 1;
-    uint sharing : 1;
-    uint initDone : 1;
-    uint crWin : 1;
-    uint internal_context : 1;
-    uint version_flags_cached : 1;
-
-    // workarounds for driver/hw bugs on different platforms
-    uint workaround_needsFullClearOnEveryFrame : 1;
-    uint workaround_brokenFBOReadBack : 1;
-    uint workaround_brokenTexSubImage : 1;
-    uint workaroundsCached : 1;
-
-    uint workaround_brokenTextureFromPixmap : 1;
-    uint workaround_brokenTextureFromPixmap_init : 1;
-
-    uint workaround_brokenAlphaTexSubImage : 1;
-    uint workaround_brokenAlphaTexSubImage_init : 1;
-
-    QPaintDevice *paintDevice;
-    QSize readback_target_size;
-    QColor transpColor;
-    QGLContext *q_ptr;
-    QGLFormat::OpenGLVersionFlags version_flags;
-
-    QGLContextGroup *group;
-    GLint max_texture_size;
-
-    GLuint current_fbo;
-    GLuint default_fbo;
-    QPaintEngine *active_engine;
-    QGLTextureDestroyer *texture_destroyer;
-
-    QGLFunctions *functions;
-
-    bool vertexAttributeArraysEnabledState[QT_GL_VERTEX_ARRAY_TRACKED_COUNT];
-
-    static inline QGLContextGroup *contextGroup(const QGLContext *ctx) { return ctx->d_ptr->group; }
-
-    static void setCurrentContext(QGLContext *context);
-};
-
-// Temporarily make a context current if not already current or
-// shared with the current contex.  The previous context is made
-// current when the object goes out of scope.
-class Q_OPENGL_EXPORT QGLShareContextScope
-{
-public:
-    QGLShareContextScope(const QGLContext *ctx)
-        : m_oldContext(nullptr)
-    {
-        QGLContext *currentContext = const_cast<QGLContext *>(QGLContext::currentContext());
-        if (currentContext != ctx && !QGLContext::areSharing(ctx, currentContext)) {
-            m_oldContext = currentContext;
-            m_ctx = const_cast<QGLContext *>(ctx);
-            m_ctx->makeCurrent();
-        } else {
-            m_ctx = currentContext;
-        }
-    }
-
-    operator QGLContext *()
-    {
-        return m_ctx;
-    }
-
-    QGLContext *operator->()
-    {
-        return m_ctx;
-    }
-
-    ~QGLShareContextScope()
-    {
-        if (m_oldContext)
-            m_oldContext->makeCurrent();
-    }
-
-private:
-    QGLContext *m_oldContext;
-    QGLContext *m_ctx;
-};
-
-QT_END_NAMESPACE
-Q_DECLARE_METATYPE(GLuint)
-QT_BEGIN_NAMESPACE
-
-class Q_OPENGL_EXPORT QGLTextureDestroyer
-{
-public:
-    void emitFreeTexture(QGLContext *context, QPlatformPixmap *, GLuint id) {
-        if (context->contextHandle())
-            (new QOpenGLSharedResourceGuard(context->contextHandle(), id, freeTextureFunc))->free();
-    }
-
-private:
-    static void freeTextureFunc(QOpenGLFunctions *, GLuint id) {
-        QOpenGLContext::currentContext()->functions()->glDeleteTextures(1, &id);
-    }
-};
-
-class Q_OPENGL_EXPORT QGLSignalProxy : public QObject
-{
-    Q_OBJECT
-public:
-    void emitAboutToDestroyContext(const QGLContext *context) {
-        emit aboutToDestroyContext(context);
-    }
-    static QGLSignalProxy *instance();
-Q_SIGNALS:
-    void aboutToDestroyContext(const QGLContext *context);
-};
-
-class QGLTexture {
-public:
-    explicit QGLTexture(QGLContext *ctx = nullptr, GLuint tx_id = 0, GLenum tx_target = GL_TEXTURE_2D,
-               QGLContext::BindOptions opt = QGLContext::DefaultBindOption)
-        : context(ctx),
-          id(tx_id),
-          target(tx_target),
-          options(opt)
-    {}
-
-    ~QGLTexture() {
-        if (options & QGLContext::MemoryManagedBindOption) {
-            Q_ASSERT(context);
-            QPlatformPixmap *boundPixmap = nullptr;
-            context->d_ptr->texture_destroyer->emitFreeTexture(context, boundPixmap, id);
-        }
-     }
-
-    QGLContext *context;
-    GLuint id;
-    GLenum target;
-
-    QGLContext::BindOptions options;
-
-    bool canBindCompressedTexture
-        (const char *buf, int len, const char *format, bool *hasAlpha);
-    QSize bindCompressedTexture
-        (const QString& fileName, const char *format = nullptr);
-    QSize bindCompressedTexture
-        (const char *buf, int len, const char *format = nullptr);
-    QSize bindCompressedTextureDDS(const char *buf, int len);
-    QSize bindCompressedTexturePVR(const char *buf, int len);
-};
-
-struct QGLTextureCacheKey {
-    qint64 key;
-    QGLContextGroup *group;
-};
-
-inline bool operator==(const QGLTextureCacheKey &a, const QGLTextureCacheKey &b)
-{
-    return a.key == b.key && a.group == b.group;
-}
-
-inline uint qHash(const QGLTextureCacheKey &key)
-{
-    return qHash(key.key) ^ qHash(key.group);
-}
-
-
-class Q_AUTOTEST_EXPORT QGLTextureCache {
-public:
-    QGLTextureCache();
-    ~QGLTextureCache();
-
-    void insert(QGLContext *ctx, qint64 key, QGLTexture *texture, int cost);
-    void remove(qint64 key);
-    inline int size();
-    inline void setMaxCost(int newMax);
-    inline int maxCost();
-    inline QGLTexture* getTexture(QGLContext *ctx, qint64 key);
-
-    bool remove(QGLContext *ctx, GLuint textureId);
-    void removeContextTextures(QGLContext *ctx);
-    static QGLTextureCache *instance();
-    static void cleanupTexturesForCacheKey(qint64 cacheKey);
-    static void cleanupTexturesForPixampData(QPlatformPixmap* pixmap);
-    static void cleanupBeforePixmapDestruction(QPlatformPixmap* pixmap);
-
-private:
-    QCache<QGLTextureCacheKey, QGLTexture> m_cache;
-    QReadWriteLock m_lock;
-};
-
-int QGLTextureCache::size() {
-    QReadLocker locker(&m_lock);
-    return m_cache.size();
-}
-
-void QGLTextureCache::setMaxCost(int newMax)
-{
-    QWriteLocker locker(&m_lock);
-    m_cache.setMaxCost(newMax);
-}
-
-int QGLTextureCache::maxCost()
-{
-    QReadLocker locker(&m_lock);
-    return m_cache.maxCost();
-}
-
-QGLTexture* QGLTextureCache::getTexture(QGLContext *ctx, qint64 key)
-{
-    // Can't be a QReadLocker since QCache::object() modifies the cache (reprioritizes the object)
-    QWriteLocker locker(&m_lock);
-    const QGLTextureCacheKey cacheKey = {key, QGLContextPrivate::contextGroup(ctx)};
-    return m_cache.object(cacheKey);
-}
-
-Q_OPENGL_EXPORT extern QPaintEngine* qt_qgl_paint_engine();
-
-QOpenGLExtensions* qgl_extensions();
-bool qgl_hasFeature(QOpenGLFunctions::OpenGLFeature feature);
-bool qgl_hasExtension(QOpenGLExtensions::OpenGLExtension extension);
-
-// Put a guard around a GL object identifier and its context.
-// When the context goes away, a shared context will be used
-// in its place.  If there are no more shared contexts, then
-// the identifier is returned as zero - it is assumed that the
-// context destruction cleaned up the identifier in this case.
-class QGLSharedResourceGuardBase : public QOpenGLSharedResource
-{
-public:
-    QGLSharedResourceGuardBase(QGLContext *context, GLuint id)
-        : QOpenGLSharedResource(context->contextHandle()->shareGroup())
-        , m_id(id)
-    {
-    }
-
-    GLuint id() const
-    {
-        return m_id;
-    }
-
-protected:
-    void invalidateResource() override
-    {
-        m_id = 0;
-    }
-
-    void freeResource(QOpenGLContext *context) override
-    {
-        if (m_id) {
-            freeResource(QGLContext::fromOpenGLContext(context), m_id);
-        }
-    }
-
-    virtual void freeResource(QGLContext *ctx, GLuint id) = 0;
-
-private:
-    GLuint m_id;
-};
-
-template <typename Func>
-class QGLSharedResourceGuard : public QGLSharedResourceGuardBase
-{
-public:
-    QGLSharedResourceGuard(QGLContext *context, GLuint id, Func func)
-        : QGLSharedResourceGuardBase(context, id)
-        , m_func(func)
-    {
-    }
-
-protected:
-    void freeResource(QGLContext *ctx, GLuint id) override
-    {
-        m_func(ctx, id);
-    }
-
-private:
-    Func m_func;
-};
-
-template <typename Func>
-QGLSharedResourceGuardBase *createSharedResourceGuard(QGLContext *context, GLuint id, Func cleanupFunc)
-{
-    return new QGLSharedResourceGuard<Func>(context, id, cleanupFunc);
-}
-
-// this is a class that wraps a QThreadStorage object for storing
-// thread local instances of the GL 1 and GL 2 paint engines
-
-template <class T>
-class QGLEngineThreadStorage
-{
-public:
-    QPaintEngine *engine() {
-        QPaintEngine *&localEngine = storage.localData();
-        if (!localEngine)
-            localEngine = new T;
-        return localEngine;
-    }
-
-private:
-    QThreadStorage<QPaintEngine *> storage;
-};
-QT_END_NAMESPACE
-
-#endif // QGL_P_H
diff --git a/src/opengl/qglbuffer.cpp b/src/opengl/qglbuffer.cpp
deleted file mode 100644
index bb9c2affbd..0000000000
--- a/src/opengl/qglbuffer.cpp
+++ /dev/null
@@ -1,568 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtOpenGL module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <QtOpenGL/qgl.h>
-#include <QtOpenGL/private/qgl_p.h>
-#include <private/qopenglextensions_p.h>
-#include <QtCore/qatomic.h>
-#include "qglbuffer.h"
-
-QT_BEGIN_NAMESPACE
-
-/*!
-    \class QGLBuffer
-    \inmodule QtOpenGL
-    \brief The QGLBuffer class provides functions for creating and managing GL buffer objects.
-    \since 4.7
-    \obsolete
-    \ingroup painting-3D
-
-    Buffer objects are created in the GL server so that the
-    client application can avoid uploading vertices, indices,
-    texture image data, etc every time they are needed.
-
-    QGLBuffer objects can be copied around as a reference to the
-    underlying GL buffer object:
-
-    \snippet code/src_opengl_qglbuffer.cpp 0
-
-    QGLBuffer performs a shallow copy when objects are copied in this
-    manner, but does not implement copy-on-write semantics.  The original
-    object will be affected whenever the copy is modified.
-
-    \note This class has been deprecated in favor of QOpenGLBuffer.
-*/
-
-/*!
-    \enum QGLBuffer::Type
-    This enum defines the type of GL buffer object to create with QGLBuffer.
-
-    \value VertexBuffer Vertex buffer object for use when specifying
-           vertex arrays.
-    \value IndexBuffer Index buffer object for use with \c{glDrawElements()}.
-    \value PixelPackBuffer Pixel pack buffer object for reading pixel
-           data from the GL server (for example, with \c{glReadPixels()}).
-           Not supported under OpenGL/ES.
-    \value PixelUnpackBuffer Pixel unpack buffer object for writing pixel
-           data to the GL server (for example, with \c{glTexImage2D()}).
-           Not supported under OpenGL/ES.
-*/
-
-/*!
-    \enum QGLBuffer::UsagePattern
-    This enum defines the usage pattern of a QGLBuffer object.
-
-    \value StreamDraw The data will be set once and used a few times
-           for drawing operations.  Under OpenGL/ES 1.1 this is identical
-           to StaticDraw.
-    \value StreamRead The data will be set once and used a few times
-           for reading data back from the GL server.  Not supported
-           under OpenGL/ES.
-    \value StreamCopy The data will be set once and used a few times
-           for reading data back from the GL server for use in further
-           drawing operations.  Not supported under OpenGL/ES.
-    \value StaticDraw The data will be set once and used many times
-           for drawing operations.
-    \value StaticRead The data will be set once and used many times
-           for reading data back from the GL server.  Not supported
-           under OpenGL/ES.
-    \value StaticCopy The data will be set once and used many times
-           for reading data back from the GL server for use in further
-           drawing operations.  Not supported under OpenGL/ES.
-    \value DynamicDraw The data will be modified repeatedly and used
-           many times for drawing operations.
-    \value DynamicRead The data will be modified repeatedly and used
-           many times for reading data back from the GL server.
-           Not supported under OpenGL/ES.
-    \value DynamicCopy The data will be modified repeatedly and used
-           many times for reading data back from the GL server for
-           use in further drawing operations.  Not supported under OpenGL/ES.
-*/
-
-/*!
-    \enum QGLBuffer::Access
-    This enum defines the access mode for QGLBuffer::map().
-
-    \value ReadOnly The buffer will be mapped for reading only.
-    \value WriteOnly The buffer will be mapped for writing only.
-    \value ReadWrite The buffer will be mapped for reading and writing.
-*/
-
-class QGLBufferPrivate
-{
-public:
-    QGLBufferPrivate(QGLBuffer::Type t)
-        : ref(1),
-          type(t),
-          guard(0),
-          usagePattern(QGLBuffer::StaticDraw),
-          actualUsagePattern(QGLBuffer::StaticDraw),
-          funcs(0)
-    {
-    }
-
-    QAtomicInt ref;
-    QGLBuffer::Type type;
-    QGLSharedResourceGuardBase *guard;
-    QGLBuffer::UsagePattern usagePattern;
-    QGLBuffer::UsagePattern actualUsagePattern;
-    QOpenGLExtensions *funcs;
-};
-
-/*!
-    Constructs a new buffer object of type QGLBuffer::VertexBuffer.
-
-    Note: this constructor just creates the QGLBuffer instance.  The actual
-    buffer object in the GL server is not created until create() is called.
-
-    \sa create()
-*/
-QGLBuffer::QGLBuffer()
-    : d_ptr(new QGLBufferPrivate(QGLBuffer::VertexBuffer))
-{
-}
-
-/*!
-    Constructs a new buffer object of \a type.
-
-    Note: this constructor just creates the QGLBuffer instance.  The actual
-    buffer object in the GL server is not created until create() is called.
-
-    \sa create()
-*/
-QGLBuffer::QGLBuffer(QGLBuffer::Type type)
-    : d_ptr(new QGLBufferPrivate(type))
-{
-}
-
-/*!
-    Constructs a shallow copy of \a other.
-
-    Note: QGLBuffer does not implement copy-on-write semantics,
-    so \a other will be affected whenever the copy is modified.
-*/
-QGLBuffer::QGLBuffer(const QGLBuffer &other)
-    : d_ptr(other.d_ptr)
-{
-    d_ptr->ref.ref();
-}
-
-#define ctx QGLContext::currentContext();
-
-/*!
-    Destroys this buffer object, including the storage being
-    used in the GL server.
-*/
-QGLBuffer::~QGLBuffer()
-{
-    if (!d_ptr->ref.deref()) {
-        destroy();
-        delete d_ptr;
-    }
-}
-
-/*!
-    Assigns a shallow copy of \a other to this object.
-
-    Note: QGLBuffer does not implement copy-on-write semantics,
-    so \a other will be affected whenever the copy is modified.
-*/
-QGLBuffer &QGLBuffer::operator=(const QGLBuffer &other)
-{
-    if (d_ptr != other.d_ptr) {
-        other.d_ptr->ref.ref();
-        if (!d_ptr->ref.deref()) {
-            destroy();
-            delete d_ptr;
-        }
-        d_ptr = other.d_ptr;
-    }
-    return *this;
-}
-
-/*!
-    Returns the type of buffer represented by this object.
-*/
-QGLBuffer::Type QGLBuffer::type() const
-{
-    Q_D(const QGLBuffer);
-    return d->type;
-}
-
-/*!
-    Returns the usage pattern for this buffer object.
-    The default value is StaticDraw.
-
-    \sa setUsagePattern()
-*/
-QGLBuffer::UsagePattern QGLBuffer::usagePattern() const
-{
-    Q_D(const QGLBuffer);
-    return d->usagePattern;
-}
-
-/*!
-    Sets the usage pattern for this buffer object to \a value.
-    This function must be called before allocate() or write().
-
-    \sa usagePattern(), allocate(), write()
-*/
-void QGLBuffer::setUsagePattern(QGLBuffer::UsagePattern value)
-{
-    Q_D(QGLBuffer);
-    d->usagePattern = d->actualUsagePattern = value;
-}
-
-#undef ctx
-
-namespace {
-    void freeBufferFunc(QGLContext *ctx, GLuint id)
-    {
-        Q_ASSERT(ctx);
-        ctx->contextHandle()->functions()->glDeleteBuffers(1, &id);
-    }
-}
-
-/*!
-    Creates the buffer object in the GL server.  Returns \c true if
-    the object was created; false otherwise.
-
-    This function must be called with a current QGLContext.
-    The buffer will be bound to and can only be used in
-    that context (or any other context that is shared with it).
-
-    This function will return false if the GL implementation
-    does not support buffers, or there is no current QGLContext.
-
-    \sa isCreated(), allocate(), write(), destroy()
-*/
-bool QGLBuffer::create()
-{
-    Q_D(QGLBuffer);
-    if (d->guard && d->guard->id())
-        return true;
-    QGLContext *ctx = const_cast<QGLContext *>(QGLContext::currentContext());
-    if (ctx) {
-        delete d->funcs;
-        d->funcs = new QOpenGLExtensions(ctx->contextHandle());
-        if (!d->funcs->hasOpenGLFeature(QOpenGLFunctions::Buffers))
-            return false;
-
-        GLuint bufferId = 0;
-        d->funcs->glGenBuffers(1, &bufferId);
-        if (bufferId) {
-            if (d->guard)
-                d->guard->free();
-
-            d->guard = createSharedResourceGuard(ctx, bufferId, freeBufferFunc);
-            return true;
-        }
-    }
-    return false;
-}
-
-#define ctx QGLContext::currentContext()
-
-/*!
-    Returns \c true if this buffer has been created; false otherwise.
-
-    \sa create(), destroy()
-*/
-bool QGLBuffer::isCreated() const
-{
-    Q_D(const QGLBuffer);
-    return d->guard && d->guard->id();
-}
-
-/*!
-    Destroys this buffer object, including the storage being
-    used in the GL server.  All references to the buffer will
-    become invalid.
-*/
-void QGLBuffer::destroy()
-{
-    Q_D(QGLBuffer);
-    if (d->guard) {
-        d->guard->free();
-        d->guard = 0;
-    }
-}
-
-/*!
-    Reads the \a count bytes in this buffer starting at \a offset
-    into \a data.  Returns \c true on success; false if reading from
-    the buffer is not supported.  Buffer reading is not supported
-    under OpenGL/ES.
-
-    It is assumed that this buffer has been bound to the current context.
-
-    \sa write(), bind()
-*/
-bool QGLBuffer::read(int offset, void *data, int count)
-{
-#if !defined(QT_OPENGL_ES)
-    Q_D(QGLBuffer);
-    if (!d->funcs->hasOpenGLFeature(QOpenGLFunctions::Buffers) || !d->guard->id() || !d->funcs->d()->GetBufferSubData)
-        return false;
-    while (d->funcs->glGetError() != GL_NO_ERROR) ; // Clear error state.
-    d->funcs->glGetBufferSubData(d->type, offset, count, data);
-    return d->funcs->glGetError() == GL_NO_ERROR;
-#else
-    Q_UNUSED(offset);
-    Q_UNUSED(data);
-    Q_UNUSED(count);
-    return false;
-#endif
-}
-
-/*!
-    Replaces the \a count bytes of this buffer starting at \a offset
-    with the contents of \a data.  Any other bytes in the buffer
-    will be left unmodified.
-
-    It is assumed that create() has been called on this buffer and that
-    it has been bound to the current context.
-
-    \sa create(), read(), allocate()
-*/
-void QGLBuffer::write(int offset, const void *data, int count)
-{
-#ifndef QT_NO_DEBUG
-    if (!isCreated())
-        qWarning("QGLBuffer::allocate(): buffer not created");
-#endif
-    Q_D(QGLBuffer);
-    if (d->guard && d->guard->id())
-        d->funcs->glBufferSubData(d->type, offset, count, data);
-}
-
-/*!
-    Allocates \a count bytes of space to the buffer, initialized to
-    the contents of \a data.  Any previous contents will be removed.
-
-    It is assumed that create() has been called on this buffer and that
-    it has been bound to the current context.
-
-    \sa create(), read(), write()
-*/
-void QGLBuffer::allocate(const void *data, int count)
-{
-#ifndef QT_NO_DEBUG
-    if (!isCreated())
-        qWarning("QGLBuffer::allocate(): buffer not created");
-#endif
-    Q_D(QGLBuffer);
-    if (d->guard && d->guard->id())
-        d->funcs->glBufferData(d->type, count, data, d->actualUsagePattern);
-}
-
-/*!
-    \fn void QGLBuffer::allocate(int count)
-    \overload
-
-    Allocates \a count bytes of space to the buffer.  Any previous
-    contents will be removed.
-
-    It is assumed that create() has been called on this buffer and that
-    it has been bound to the current context.
-
-    \sa create(), write()
-*/
-
-/*!
-    Binds the buffer associated with this object to the current
-    GL context.  Returns \c false if binding was not possible, usually because
-    type() is not supported on this GL implementation.
-
-    The buffer must be bound to the same QGLContext current when create()
-    was called, or to another QGLContext that is sharing with it.
-    Otherwise, false will be returned from this function.
-
-    \sa release(), create()
-*/
-bool QGLBuffer::bind()
-{
-#ifndef QT_NO_DEBUG
-    if (!isCreated())
-        qWarning("QGLBuffer::bind(): buffer not created");
-#endif
-    Q_D(const QGLBuffer);
-    GLuint bufferId = d->guard ? d->guard->id() : 0;
-    if (bufferId) {
-        if (d->guard->group() != QOpenGLContextGroup::currentContextGroup()) {
-#ifndef QT_NO_DEBUG
-            qWarning("QGLBuffer::bind: buffer is not valid in the current context");
-#endif
-            return false;
-        }
-        d->funcs->glBindBuffer(d->type, bufferId);
-        return true;
-    } else {
-        return false;
-    }
-}
-
-/*!
-    Releases the buffer associated with this object from the
-    current GL context.
-
-    This function must be called with the same QGLContext current
-    as when bind() was called on the buffer.
-
-    \sa bind()
-*/
-void QGLBuffer::release()
-{
-#ifndef QT_NO_DEBUG
-    if (!isCreated())
-        qWarning("QGLBuffer::release(): buffer not created");
-#endif
-    Q_D(const QGLBuffer);
-    if (d->guard && d->guard->id())
-        d->funcs->glBindBuffer(d->type, 0);
-}
-
-#undef ctx
-
-/*!
-    Releases the buffer associated with \a type in the current
-    QGLContext.
-
-    This function is a direct call to \c{glBindBuffer(type, 0)}
-    for use when the caller does not know which QGLBuffer has
-    been bound to the context but wants to make sure that it
-    is released.
-
-    \snippet code/src_opengl_qglbuffer.cpp 1
-*/
-void QGLBuffer::release(QGLBuffer::Type type)
-{
-    if (QOpenGLContext *ctx = QOpenGLContext::currentContext())
-        ctx->functions()->glBindBuffer(GLenum(type), 0);
-}
-
-#define ctx QGLContext::currentContext()
-
-/*!
-    Returns the GL identifier associated with this buffer; zero if
-    the buffer has not been created.
-
-    \sa isCreated()
-*/
-GLuint QGLBuffer::bufferId() const
-{
-    Q_D(const QGLBuffer);
-    return d->guard ? d->guard->id() : 0;
-}
-
-#ifndef GL_BUFFER_SIZE
-#define GL_BUFFER_SIZE 0x8764
-#endif
-
-/*!
-    Returns the size of the data in this buffer, for reading operations.
-    Returns -1 if fetching the buffer size is not supported, or the
-    buffer has not been created.
-
-    It is assumed that this buffer has been bound to the current context.
-
-    \sa isCreated(), bind()
-*/
-int QGLBuffer::size() const
-{
-    Q_D(const QGLBuffer);
-    if (!d->guard || !d->guard->id())
-        return -1;
-    GLint value = -1;
-    d->funcs->glGetBufferParameteriv(d->type, GL_BUFFER_SIZE, &value);
-    return value;
-}
-
-/*!
-    Maps the contents of this buffer into the application's memory
-    space and returns a pointer to it.  Returns null if memory
-    mapping is not possible.  The \a access parameter indicates the
-    type of access to be performed.
-
-    It is assumed that create() has been called on this buffer and that
-    it has been bound to the current context.
-
-    This function is only supported under OpenGL/ES if the
-    \c{GL_OES_mapbuffer} extension is present.
-
-    \sa unmap(), create(), bind()
-*/
-void *QGLBuffer::map(QGLBuffer::Access access)
-{
-    Q_D(QGLBuffer);
-#ifndef QT_NO_DEBUG
-    if (!isCreated())
-        qWarning("QGLBuffer::map(): buffer not created");
-#endif
-    if (!d->guard || !d->guard->id())
-        return 0;
-    return d->funcs->glMapBuffer(d->type, access);
-}
-
-/*!
-    Unmaps the buffer after it was mapped into the application's
-    memory space with a previous call to map().  Returns \c true if
-    the unmap succeeded; false otherwise.
-
-    It is assumed that this buffer has been bound to the current context,
-    and that it was previously mapped with map().
-
-    This function is only supported under OpenGL/ES if the
-    \c{GL_OES_mapbuffer} extension is present.
-
-    \sa map()
-*/
-bool QGLBuffer::unmap()
-{
-    Q_D(QGLBuffer);
-#ifndef QT_NO_DEBUG
-    if (!isCreated())
-        qWarning("QGLBuffer::unmap(): buffer not created");
-#endif
-    if (!d->guard || !d->guard->id())
-        return false;
-    return d->funcs->glUnmapBuffer(d->type) == GL_TRUE;
-}
-
-QT_END_NAMESPACE
diff --git a/src/opengl/qglbuffer.h b/src/opengl/qglbuffer.h
deleted file mode 100644
index daf5227c66..0000000000
--- a/src/opengl/qglbuffer.h
+++ /dev/null
@@ -1,125 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtOpenGL module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QGLBUFFER_H
-#define QGLBUFFER_H
-
-#include <QtCore/qscopedpointer.h>
-#include <QtOpenGL/qgl.h>
-
-QT_BEGIN_NAMESPACE
-
-
-class QGLBufferPrivate;
-
-class Q_OPENGL_EXPORT QGLBuffer
-{
-public:
-    enum Type
-    {
-        VertexBuffer        = 0x8892, // GL_ARRAY_BUFFER
-        IndexBuffer         = 0x8893, // GL_ELEMENT_ARRAY_BUFFER
-        PixelPackBuffer     = 0x88EB, // GL_PIXEL_PACK_BUFFER
-        PixelUnpackBuffer   = 0x88EC  // GL_PIXEL_UNPACK_BUFFER
-    };
-
-    QGLBuffer();
-    explicit QGLBuffer(QGLBuffer::Type type);
-    QGLBuffer(const QGLBuffer &other);
-    ~QGLBuffer();
-
-    QGLBuffer &operator=(const QGLBuffer &other);
-
-    enum UsagePattern
-    {
-        StreamDraw          = 0x88E0, // GL_STREAM_DRAW
-        StreamRead          = 0x88E1, // GL_STREAM_READ
-        StreamCopy          = 0x88E2, // GL_STREAM_COPY
-        StaticDraw          = 0x88E4, // GL_STATIC_DRAW
-        StaticRead          = 0x88E5, // GL_STATIC_READ
-        StaticCopy          = 0x88E6, // GL_STATIC_COPY
-        DynamicDraw         = 0x88E8, // GL_DYNAMIC_DRAW
-        DynamicRead         = 0x88E9, // GL_DYNAMIC_READ
-        DynamicCopy         = 0x88EA  // GL_DYNAMIC_COPY
-    };
-
-    enum Access
-    {
-        ReadOnly            = 0x88B8, // GL_READ_ONLY
-        WriteOnly           = 0x88B9, // GL_WRITE_ONLY
-        ReadWrite           = 0x88BA  // GL_READ_WRITE
-    };
-
-    QGLBuffer::Type type() const;
-
-    QGLBuffer::UsagePattern usagePattern() const;
-    void setUsagePattern(QGLBuffer::UsagePattern value);
-
-    bool create();
-    bool isCreated() const;
-
-    void destroy();
-
-    bool bind();
-    void release();
-
-    static void release(QGLBuffer::Type type);
-
-    GLuint bufferId() const;
-
-    int size() const;
-
-    bool read(int offset, void *data, int count);
-    void write(int offset, const void *data, int count);
-
-    void allocate(const void *data, int count);
-    inline void allocate(int count) { allocate(nullptr, count); }
-
-    void *map(QGLBuffer::Access access);
-    bool unmap();
-
-private:
-    QGLBufferPrivate *d_ptr;
-
-    Q_DECLARE_PRIVATE(QGLBuffer)
-};
-
-QT_END_NAMESPACE
-
-#endif
diff --git a/src/opengl/qglcolormap.cpp b/src/opengl/qglcolormap.cpp
deleted file mode 100644
index f314a9715d..0000000000
--- a/src/opengl/qglcolormap.cpp
+++ /dev/null
@@ -1,296 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtOpenGL module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-/*!
-    \class QGLColormap
-    \brief The QGLColormap class is used for installing custom colormaps into
-    a QGLWidget.
-
-    \obsolete
-    \inmodule QtOpenGL
-    \ingroup painting-3D
-    \ingroup shared
-
-    QGLColormap provides a platform independent way of specifying and
-    installing indexed colormaps for a QGLWidget. QGLColormap is
-    especially useful when using the OpenGL color-index mode.
-
-    Under X11 you must use an X server that supports either a \c
-    PseudoColor or \c DirectColor visual class. If your X server
-    currently only provides a \c GrayScale, \c TrueColor, \c
-    StaticColor or \c StaticGray visual, you will not be able to
-    allocate colorcells for writing. If this is the case, try setting
-    your X server to 8 bit mode. It should then provide you with at
-    least a \c PseudoColor visual. Note that you may experience
-    colormap flashing if your X server is running in 8 bit mode.
-
-    The size() of the colormap is always set to 256
-    colors. Note that under Windows you can also install colormaps
-    in child widgets.
-
-    This class uses \l{implicit sharing} as a memory and speed
-    optimization.
-
-    Example of use:
-    \snippet code/src_opengl_qglcolormap.cpp 0
-
-    \sa QGLWidget::setColormap(), QGLWidget::colormap()
-*/
-
-/*!
-    \fn Qt::HANDLE QGLColormap::handle()
-
-    \internal
-
-    Returns the handle for this color map.
-*/
-
-/*!
-    \fn void QGLColormap::setHandle(Qt::HANDLE handle)
-
-    \internal
-
-    Sets the handle for this color map to \a handle.
-*/
-
-#include "qglcolormap.h"
-
-QT_BEGIN_NAMESPACE
-
-QGLColormap::QGLColormapData QGLColormap::shared_null = { Q_BASIC_ATOMIC_INITIALIZER(1), 0, 0 };
-
-/*!
-    Construct a QGLColormap.
-*/
-QGLColormap::QGLColormap()
-    : d(&shared_null)
-{
-    d->ref.ref();
-}
-
-
-/*!
-    Construct a shallow copy of \a map.
-*/
-QGLColormap::QGLColormap(const QGLColormap &map)
-    : d(map.d)
-{
-    d->ref.ref();
-}
-
-/*!
-    Dereferences the QGLColormap and deletes it if this was the last
-    reference to it.
-*/
-QGLColormap::~QGLColormap()
-{
-    if (!d->ref.deref())
-        cleanup(d);
-}
-
-void QGLColormap::cleanup(QGLColormap::QGLColormapData *x)
-{
-    delete x->cells;
-    x->cells = 0;
-    delete x;
-}
-
-/*!
-    Assign a shallow copy of \a map to this QGLColormap.
-*/
-QGLColormap & QGLColormap::operator=(const QGLColormap &map)
-{
-    map.d->ref.ref();
-    if (!d->ref.deref())
-        cleanup(d);
-    d = map.d;
-    return *this;
-}
-
-/*!
-    \fn void QGLColormap::detach()
-    \internal
-
-    Detaches this QGLColormap from the shared block.
-*/
-
-void QGLColormap::detach_helper()
-{
-    QGLColormapData *x = new QGLColormapData;
-    x->ref.storeRelaxed(1);
-    x->cmapHandle = 0;
-    x->cells = 0;
-    if (d->cells) {
-        x->cells = new QVector<QRgb>(256);
-        *x->cells = *d->cells;
-    }
-    if (!d->ref.deref())
-        cleanup(d);
-    d = x;
-}
-
-/*!
-    Set cell at index \a idx in the colormap to color \a color.
-*/
-void QGLColormap::setEntry(int idx, QRgb color)
-{
-    detach();
-    if (!d->cells)
-        d->cells = new QVector<QRgb>(256);
-    d->cells->replace(idx, color);
-}
-
-/*!
-    Set an array of cells in this colormap. \a count is the number of
-    colors that should be set, \a colors is the array of colors, and
-    \a base is the starting index.  The first element in \a colors
-    is set at \a base in the colormap.
-*/
-void QGLColormap::setEntries(int count, const QRgb *colors, int base)
-{
-    detach();
-    if (!d->cells)
-        d->cells = new QVector<QRgb>(256);
-
-    Q_ASSERT_X(colors && base >= 0 && (base + count) <= d->cells->size(), "QGLColormap::setEntries",
-               "preconditions not met");
-    for (int i = 0; i < count; ++i)
-        setEntry(base + i, colors[i]);
-}
-
-/*!
-    Returns the QRgb value in the colorcell with index \a idx.
-*/
-QRgb QGLColormap::entryRgb(int idx) const
-{
-    if (d == &shared_null || !d->cells)
-        return 0;
-    else
-        return d->cells->at(idx);
-}
-
-/*!
-    \overload
-
-    Set the cell with index \a idx in the colormap to color \a color.
-*/
-void QGLColormap::setEntry(int idx, const QColor &color)
-{
-    setEntry(idx, color.rgb());
-}
-
-/*!
-    Returns the QRgb value in the colorcell with index \a idx.
-*/
-QColor QGLColormap::entryColor(int idx) const
-{
-    if (d == &shared_null || !d->cells)
-        return QColor();
-    else
-        return QColor(d->cells->at(idx));
-}
-
-/*!
-    Returns \c true if the colormap is empty or it is not in use
-    by a QGLWidget; otherwise returns \c false.
-
-    A colormap with no color values set is considered to be empty.
-    For historical reasons, a colormap that has color values set
-    but which is not in use by a QGLWidget is also considered empty.
-
-    Compare size() with zero to determine if the colormap is empty
-    regardless of whether it is in use by a QGLWidget or not.
-
-    \sa size()
-*/
-bool QGLColormap::isEmpty() const
-{
-    return d == &shared_null || d->cells == 0 || d->cells->size() == 0 || d->cmapHandle == 0;
-}
-
-
-/*!
-    Returns the number of colorcells in the colormap.
-*/
-int QGLColormap::size() const
-{
-    return d->cells ? d->cells->size() : 0;
-}
-
-/*!
-    Returns the index of the color \a color. If \a color is not in the
-    map, -1 is returned.
-*/
-int QGLColormap::find(QRgb color) const
-{
-    if (d->cells)
-        return d->cells->indexOf(color);
-    return -1;
-}
-
-/*!
-    Returns the index of the color that is the closest match to color
-    \a color.
-*/
-int QGLColormap::findNearest(QRgb color) const
-{
-    int idx = find(color);
-    if (idx >= 0)
-        return idx;
-    int mapSize = size();
-    int mindist = 200000;
-    int r = qRed(color);
-    int g = qGreen(color);
-    int b = qBlue(color);
-    int rx, gx, bx, dist;
-    for (int i = 0; i < mapSize; ++i) {
-        QRgb ci = d->cells->at(i);
-        rx = r - qRed(ci);
-        gx = g - qGreen(ci);
-        bx = b - qBlue(ci);
-        dist = rx * rx + gx * gx + bx * bx;        // calculate distance
-        if (dist < mindist) {                // minimal?
-            mindist = dist;
-            idx = i;
-        }
-    }
-    return idx;
-}
-
-QT_END_NAMESPACE
diff --git a/src/opengl/qglcolormap.h b/src/opengl/qglcolormap.h
deleted file mode 100644
index b59b56e040..0000000000
--- a/src/opengl/qglcolormap.h
+++ /dev/null
@@ -1,99 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtOpenGL module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QGLCOLORMAP_H
-#define QGLCOLORMAP_H
-
-#include <QtGui/qcolor.h>
-#include <QtCore/qvector.h>
-#include <QtOpenGL/qtopenglglobal.h>
-
-QT_BEGIN_NAMESPACE
-
-
-class Q_OPENGL_EXPORT QGLColormap
-{
-public:
-    QGLColormap();
-    QGLColormap(const QGLColormap &);
-    ~QGLColormap();
-
-    QGLColormap &operator=(const QGLColormap &);
-
-    bool   isEmpty() const;
-    int    size() const;
-    void   detach();
-
-    void   setEntries(int count, const QRgb * colors, int base = 0);
-    void   setEntry(int idx, QRgb color);
-    void   setEntry(int idx, const QColor & color);
-    QRgb   entryRgb(int idx) const;
-    QColor entryColor(int idx) const;
-    int    find(QRgb color) const;
-    int    findNearest(QRgb color) const;
-
-protected:
-    Qt::HANDLE handle() { return d ? d->cmapHandle : nullptr; }
-    void setHandle(Qt::HANDLE ahandle) { d->cmapHandle = ahandle; }
-
-private:
-    struct QGLColormapData {
-        QBasicAtomicInt ref;
-        QVector<QRgb> *cells;
-        Qt::HANDLE cmapHandle;
-    };
-
-    QGLColormapData *d;
-    static struct QGLColormapData shared_null;
-    static void cleanup(QGLColormapData *x);
-    void detach_helper();
-
-    friend class QGLWidget;
-    friend class QGLWidgetPrivate;
-};
-
-inline void QGLColormap::detach()
-{
-    if (d->ref.loadRelaxed() != 1)
-        detach_helper();
-}
-
-QT_END_NAMESPACE
-
-#endif // QGLCOLORMAP_H
diff --git a/src/opengl/qglframebufferobject.cpp b/src/opengl/qglframebufferobject.cpp
deleted file mode 100644
index 362b3ef189..0000000000
--- a/src/opengl/qglframebufferobject.cpp
+++ /dev/null
@@ -1,1466 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtOpenGL module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qglframebufferobject.h"
-#include "qglframebufferobject_p.h"
-
-#include <qdebug.h>
-#include <private/qgl_p.h>
-#include <private/qfont_p.h>
-#include "gl2paintengineex/qpaintengineex_opengl2_p.h"
-
-#include <qimage.h>
-#include <qwindow.h>
-
-QT_BEGIN_NAMESPACE
-
-extern QImage qt_gl_read_frame_buffer(const QSize&, bool, bool);
-
-#define QGL_FUNC_CONTEXT const QGLContext *ctx = QGLContext::currentContext();
-#define QGL_FUNCP_CONTEXT const QGLContext *ctx = QGLContext::currentContext();
-
-#ifndef QT_NO_DEBUG
-#define QT_RESET_GLERROR()                                \
-{                                                         \
-    while (QOpenGLContext::currentContext()->functions()->glGetError() != GL_NO_ERROR) {} \
-}
-#define QT_CHECK_GLERROR()                                \
-{                                                         \
-    GLenum err = QOpenGLContext::currentContext()->functions()->glGetError(); \
-    if (err != GL_NO_ERROR) {                             \
-        qDebug("[%s line %d] GL Error: %d",               \
-               __FILE__, __LINE__, (int)err);             \
-    }                                                     \
-}
-#else
-#define QT_RESET_GLERROR() {}
-#define QT_CHECK_GLERROR() {}
-#endif
-
-// ####TODO Properly #ifdef this class to use #define symbols actually defined
-// by OpenGL/ES includes
-#ifndef GL_MAX_SAMPLES
-#define GL_MAX_SAMPLES 0x8D57
-#endif
-
-#ifndef GL_RENDERBUFFER_SAMPLES
-#define GL_RENDERBUFFER_SAMPLES 0x8CAB
-#endif
-
-#ifndef GL_DEPTH24_STENCIL8
-#define GL_DEPTH24_STENCIL8 0x88F0
-#endif
-
-#ifndef GL_DEPTH_COMPONENT24
-#define GL_DEPTH_COMPONENT24 0x81A6
-#endif
-
-#ifndef GL_DEPTH_COMPONENT24_OES
-#define GL_DEPTH_COMPONENT24_OES 0x81A6
-#endif
-
-#ifndef GL_READ_FRAMEBUFFER
-#define GL_READ_FRAMEBUFFER 0x8CA8
-#endif
-
-#ifndef GL_DRAW_FRAMEBUFFER
-#define GL_DRAW_FRAMEBUFFER 0x8CA9
-#endif
-
-#ifndef GL_DEPTH_STENCIL_ATTACHMENT
-#define GL_DEPTH_STENCIL_ATTACHMENT 0x821A
-#endif
-
-#ifndef GL_DEPTH_STENCIL
-#define GL_DEPTH_STENCIL 0x84F9
-#endif
-
-/*!
-    \class QGLFramebufferObjectFormat
-    \inmodule QtOpenGL
-    \brief The QGLFramebufferObjectFormat class specifies the format of an OpenGL
-    framebuffer object.
-
-    \since 4.6
-    \obsolete
-
-    \ingroup painting-3D
-
-    A framebuffer object has several characteristics:
-    \list
-    \li \l{setSamples()}{Number of samples per pixels.}
-    \li \l{setAttachment()}{Depth and/or stencil attachments.}
-    \li \l{setTextureTarget()}{Texture target.}
-    \li \l{setInternalTextureFormat()}{Internal texture format.}
-    \endlist
-
-    Note that the desired attachments or number of samples per pixels might not
-    be supported by the hardware driver. Call QGLFramebufferObject::format()
-    after creating a QGLFramebufferObject to find the exact format that was
-    used to create the frame buffer object.
-
-    \note This class has been deprecated in favor of QOpenGLFramebufferObjectFormat.
-
-    \sa QGLFramebufferObject
-*/
-
-/*!
-    \internal
-*/
-void QGLFramebufferObjectFormat::detach()
-{
-    if (d->ref.loadRelaxed() != 1) {
-        QGLFramebufferObjectFormatPrivate *newd
-            = new QGLFramebufferObjectFormatPrivate(d);
-        if (!d->ref.deref())
-            delete d;
-        d = newd;
-    }
-}
-
-/*!
-    Creates a QGLFramebufferObjectFormat object for specifying
-    the format of an OpenGL framebuffer object.
-
-    By default the format specifies a non-multisample framebuffer object with no
-    attachments, texture target \c GL_TEXTURE_2D, and internal format \c GL_RGBA8.
-    On OpenGL/ES systems, the default internal format is \c GL_RGBA.
-
-    \sa samples(), attachment(), internalTextureFormat()
-*/
-
-QGLFramebufferObjectFormat::QGLFramebufferObjectFormat()
-{
-    d = new QGLFramebufferObjectFormatPrivate;
-}
-
-/*!
-    Constructs a copy of \a other.
-*/
-
-QGLFramebufferObjectFormat::QGLFramebufferObjectFormat(const QGLFramebufferObjectFormat &other)
-{
-    d = other.d;
-    d->ref.ref();
-}
-
-/*!
-    Assigns \a other to this object.
-*/
-
-QGLFramebufferObjectFormat &QGLFramebufferObjectFormat::operator=(const QGLFramebufferObjectFormat &other)
-{
-    if (d != other.d) {
-        other.d->ref.ref();
-        if (!d->ref.deref())
-            delete d;
-        d = other.d;
-    }
-    return *this;
-}
-
-/*!
-    Destroys the QGLFramebufferObjectFormat.
-*/
-QGLFramebufferObjectFormat::~QGLFramebufferObjectFormat()
-{
-    if (!d->ref.deref())
-        delete d;
-}
-
-/*!
-    Sets the number of samples per pixel for a multisample framebuffer object
-    to \a samples.  The default sample count of 0 represents a regular
-    non-multisample framebuffer object.
-
-    If the desired amount of samples per pixel is not supported by the hardware
-    then the maximum number of samples per pixel will be used. Note that
-    multisample framebuffer objects cannot be bound as textures. Also, the
-    \c{GL_EXT_framebuffer_multisample} extension is required to create a
-    framebuffer with more than one sample per pixel.
-
-    \sa samples()
-*/
-void QGLFramebufferObjectFormat::setSamples(int samples)
-{
-    detach();
-    d->samples = samples;
-}
-
-/*!
-    Returns the number of samples per pixel if a framebuffer object
-    is a multisample framebuffer object. Otherwise, returns 0.
-    The default value is 0.
-
-    \sa setSamples()
-*/
-int QGLFramebufferObjectFormat::samples() const
-{
-    return d->samples;
-}
-
-/*!
-    \since 4.8
-
-    Enables mipmapping if \a enabled is true; otherwise disables it.
-
-    Mipmapping is disabled by default.
-
-    If mipmapping is enabled, additional memory will be allocated for
-    the mipmap levels. The mipmap levels can be updated by binding the
-    texture and calling glGenerateMipmap(). Mipmapping cannot be enabled
-    for multisampled framebuffer objects.
-
-    \sa mipmap(), QGLFramebufferObject::texture()
-*/
-void QGLFramebufferObjectFormat::setMipmap(bool enabled)
-{
-    detach();
-    d->mipmap = enabled;
-}
-
-/*!
-    \since 4.8
-
-    Returns \c true if mipmapping is enabled.
-
-    \sa setMipmap()
-*/
-bool QGLFramebufferObjectFormat::mipmap() const
-{
-    return d->mipmap;
-}
-
-/*!
-    Sets the attachment configuration of a framebuffer object to \a attachment.
-
-    \sa attachment()
-*/
-void QGLFramebufferObjectFormat::setAttachment(QGLFramebufferObject::Attachment attachment)
-{
-    detach();
-    d->attachment = attachment;
-}
-
-/*!
-    Returns the configuration of the depth and stencil buffers attached to
-    a framebuffer object.  The default is QGLFramebufferObject::NoAttachment.
-
-    \sa setAttachment()
-*/
-QGLFramebufferObject::Attachment QGLFramebufferObjectFormat::attachment() const
-{
-    return d->attachment;
-}
-
-/*!
-    Sets the texture target of the texture attached to a framebuffer object to
-    \a target. Ignored for multisample framebuffer objects.
-
-    \sa textureTarget(), samples()
-*/
-void QGLFramebufferObjectFormat::setTextureTarget(GLenum target)
-{
-    detach();
-    d->target = target;
-}
-
-/*!
-    Returns the texture target of the texture attached to a framebuffer object.
-    Ignored for multisample framebuffer objects.  The default is
-    \c GL_TEXTURE_2D.
-
-    \sa setTextureTarget(), samples()
-*/
-GLenum QGLFramebufferObjectFormat::textureTarget() const
-{
-    return d->target;
-}
-
-/*!
-    Sets the internal format of a framebuffer object's texture or
-    multisample framebuffer object's color buffer to
-    \a internalTextureFormat.
-
-    \sa internalTextureFormat()
-*/
-void QGLFramebufferObjectFormat::setInternalTextureFormat(GLenum internalTextureFormat)
-{
-    detach();
-    d->internal_format = internalTextureFormat;
-}
-
-/*!
-    Returns the internal format of a framebuffer object's texture or
-    multisample framebuffer object's color buffer.  The default is
-    \c GL_RGBA8 on desktop OpenGL systems, and \c GL_RGBA on
-    OpenGL/ES systems.
-
-    \sa setInternalTextureFormat()
-*/
-GLenum QGLFramebufferObjectFormat::internalTextureFormat() const
-{
-    return d->internal_format;
-}
-
-/*!
-    Returns \c true if all the options of this framebuffer object format
-    are the same as \a other; otherwise returns \c false.
-*/
-bool QGLFramebufferObjectFormat::operator==(const QGLFramebufferObjectFormat& other) const
-{
-    if (d == other.d)
-        return true;
-    else
-        return d->equals(other.d);
-}
-
-/*!
-    Returns \c false if all the options of this framebuffer object format
-    are the same as \a other; otherwise returns \c true.
-*/
-bool QGLFramebufferObjectFormat::operator!=(const QGLFramebufferObjectFormat& other) const
-{
-    return !(*this == other);
-}
-
-void QGLFBOGLPaintDevice::setFBO(QGLFramebufferObject* f,
-                                 QGLFramebufferObject::Attachment attachment)
-{
-    fbo = f;
-    m_thisFBO = fbo->d_func()->fbo(); // This shouldn't be needed
-
-    // The context that the fbo was created in may not have depth
-    // and stencil buffers, but the fbo itself might.
-    fboFormat = QGLContext::currentContext()->format();
-    if (attachment == QGLFramebufferObject::CombinedDepthStencil) {
-        fboFormat.setDepth(true);
-        fboFormat.setStencil(true);
-    } else if (attachment == QGLFramebufferObject::Depth) {
-        fboFormat.setDepth(true);
-        fboFormat.setStencil(false);
-    } else {
-        fboFormat.setDepth(false);
-        fboFormat.setStencil(false);
-    }
-
-    GLenum format = f->format().internalTextureFormat();
-    reqAlpha = (format != GL_RGB
-#ifdef GL_RGB5
-                && format != GL_RGB5
-#endif
-#ifdef GL_RGB8
-                && format != GL_RGB8
-#endif
-    );
-}
-
-QGLContext *QGLFBOGLPaintDevice::context() const
-{
-    return const_cast<QGLContext *>(QGLContext::currentContext());
-}
-
-bool QGLFramebufferObjectPrivate::checkFramebufferStatus() const
-{
-    QGL_FUNCP_CONTEXT;
-    if (!ctx)
-        return false;   // Context no longer exists.
-    GLenum status = ctx->contextHandle()->functions()->glCheckFramebufferStatus(GL_FRAMEBUFFER);
-    switch(status) {
-    case GL_NO_ERROR:
-    case GL_FRAMEBUFFER_COMPLETE:
-        return true;
-    case GL_FRAMEBUFFER_UNSUPPORTED:
-        qDebug("QGLFramebufferObject: Unsupported framebuffer format.");
-        break;
-    case GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT:
-        qDebug("QGLFramebufferObject: Framebuffer incomplete attachment.");
-        break;
-    case GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT:
-        qDebug("QGLFramebufferObject: Framebuffer incomplete, missing attachment.");
-        break;
-#ifdef GL_FRAMEBUFFER_INCOMPLETE_DUPLICATE_ATTACHMENT
-    case GL_FRAMEBUFFER_INCOMPLETE_DUPLICATE_ATTACHMENT:
-        qDebug("QGLFramebufferObject: Framebuffer incomplete, duplicate attachment.");
-        break;
-#endif
-#ifdef GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS
-    case GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS:
-        qDebug("QGLFramebufferObject: Framebuffer incomplete, attached images must have same dimensions.");
-        break;
-#endif
-#ifdef GL_FRAMEBUFFER_INCOMPLETE_FORMATS
-    case GL_FRAMEBUFFER_INCOMPLETE_FORMATS:
-        qDebug("QGLFramebufferObject: Framebuffer incomplete, attached images must have same format.");
-        break;
-#endif
-#ifdef GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER
-    case GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER:
-        qDebug("QGLFramebufferObject: Framebuffer incomplete, missing draw buffer.");
-        break;
-#endif
-#ifdef GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER
-    case GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER:
-        qDebug("QGLFramebufferObject: Framebuffer incomplete, missing read buffer.");
-        break;
-#endif
-#ifdef GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE
-    case GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE:
-        qDebug("QGLFramebufferObject: Framebuffer incomplete, attachments must have same number of samples per pixel.");
-        break;
-#endif
-    default:
-        qDebug() <<"QGLFramebufferObject: An undefined error has occurred: "<< status;
-        break;
-    }
-    return false;
-}
-
-namespace
-{
-    void freeFramebufferFunc(QGLContext *ctx, GLuint id)
-    {
-        Q_ASSERT(ctx);
-        ctx->contextHandle()->functions()->glDeleteFramebuffers(1, &id);
-    }
-
-    void freeRenderbufferFunc(QGLContext *ctx, GLuint id)
-    {
-        Q_ASSERT(ctx);
-        ctx->contextHandle()->functions()->glDeleteRenderbuffers(1, &id);
-    }
-
-    void freeTextureFunc(QGLContext *ctx, GLuint id)
-    {
-        Q_UNUSED(ctx);
-        ctx->contextHandle()->functions()->glDeleteTextures(1, &id);
-    }
-}
-
-void QGLFramebufferObjectPrivate::init(QGLFramebufferObject *q, const QSize &sz,
-                                       QGLFramebufferObject::Attachment attachment,
-                                       GLenum texture_target, GLenum internal_format,
-                                       GLint samples, bool mipmap)
-{
-    QGLContext *ctx = const_cast<QGLContext *>(QGLContext::currentContext());
-
-    funcs.initializeOpenGLFunctions();
-
-    if (!funcs.hasOpenGLFeature(QOpenGLFunctions::Framebuffers))
-        return;
-
-    ctx->d_ptr->refreshCurrentFbo();
-
-    size = sz;
-    target = texture_target;
-    // texture dimensions
-
-    QT_RESET_GLERROR(); // reset error state
-    GLuint fbo = 0;
-    funcs.glGenFramebuffers(1, &fbo);
-    funcs.glBindFramebuffer(GL_FRAMEBUFFER, fbo);
-
-    GLuint texture = 0;
-    GLuint color_buffer = 0;
-    GLuint depth_buffer = 0;
-    GLuint stencil_buffer = 0;
-
-    QT_CHECK_GLERROR();
-    // init texture
-    if (samples == 0) {
-        funcs.glGenTextures(1, &texture);
-        funcs.glBindTexture(target, texture);
-        funcs.glTexImage2D(target, 0, internal_format, size.width(), size.height(), 0,
-                           GL_RGBA, GL_UNSIGNED_BYTE, NULL);
-        if (mipmap) {
-            int width = size.width();
-            int height = size.height();
-            int level = 0;
-            while (width > 1 || height > 1) {
-                width = qMax(1, width >> 1);
-                height = qMax(1, height >> 1);
-                ++level;
-                funcs.glTexImage2D(target, level, internal_format, width, height, 0,
-                                   GL_RGBA, GL_UNSIGNED_BYTE, NULL);
-            }
-        }
-        funcs.glTexParameteri(target, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
-        funcs.glTexParameteri(target, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
-        funcs.glTexParameteri(target, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-        funcs.glTexParameteri(target, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-        funcs.glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
-                target, texture, 0);
-
-        QT_CHECK_GLERROR();
-        valid = checkFramebufferStatus();
-        funcs.glBindTexture(target, 0);
-
-        color_buffer = 0;
-    } else {
-        mipmap = false;
-        GLint maxSamples;
-        funcs.glGetIntegerv(GL_MAX_SAMPLES, &maxSamples);
-
-        samples = qBound(0, int(samples), int(maxSamples));
-
-        funcs.glGenRenderbuffers(1, &color_buffer);
-        funcs.glBindRenderbuffer(GL_RENDERBUFFER, color_buffer);
-        if (funcs.hasOpenGLExtension(QOpenGLExtensions::FramebufferMultisample) && samples > 0) {
-            funcs.glRenderbufferStorageMultisample(GL_RENDERBUFFER, samples,
-                internal_format, size.width(), size.height());
-        } else {
-            samples = 0;
-            funcs.glRenderbufferStorage(GL_RENDERBUFFER, internal_format,
-                size.width(), size.height());
-        }
-
-        funcs.glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
-                                     GL_RENDERBUFFER, color_buffer);
-
-        QT_CHECK_GLERROR();
-        valid = checkFramebufferStatus();
-
-        if (valid)
-            funcs.glGetRenderbufferParameteriv(GL_RENDERBUFFER, GL_RENDERBUFFER_SAMPLES, &samples);
-    }
-
-    // In practice, a combined depth-stencil buffer is supported by all desktop platforms, while a
-    // separate stencil buffer is not. On embedded devices however, a combined depth-stencil buffer
-    // might not be supported while separate buffers are, according to QTBUG-12861.
-
-    if (attachment == QGLFramebufferObject::CombinedDepthStencil
-        && funcs.hasOpenGLExtension(QOpenGLExtensions::PackedDepthStencil)) {
-        // depth and stencil buffer needs another extension
-        funcs.glGenRenderbuffers(1, &depth_buffer);
-        funcs.glBindRenderbuffer(GL_RENDERBUFFER, depth_buffer);
-        Q_ASSERT(funcs.glIsRenderbuffer(depth_buffer));
-#ifndef Q_OS_WASM
-        if (samples != 0 && funcs.hasOpenGLExtension(QOpenGLExtensions::FramebufferMultisample))
-            funcs.glRenderbufferStorageMultisample(GL_RENDERBUFFER, samples,
-                GL_DEPTH24_STENCIL8, size.width(), size.height());
-        else
-            funcs.glRenderbufferStorage(GL_RENDERBUFFER,
-                GL_DEPTH24_STENCIL8, size.width(), size.height());
-
-        stencil_buffer = depth_buffer;
-        funcs.glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT,
-                                     GL_RENDERBUFFER, depth_buffer);
-        funcs.glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_STENCIL_ATTACHMENT,
-                                     GL_RENDERBUFFER, stencil_buffer);
-#else
-        // webgl does not allow separate depth and stencil attachments
-        if (samples != 0) {
-            funcs.glRenderbufferStorageMultisample(GL_RENDERBUFFER, samples,
-                                                   GL_DEPTH_STENCIL, size.width(), size.height());
-        } else {
-            funcs.glRenderbufferStorage(GL_RENDERBUFFER, GL_DEPTH_STENCIL,
-                                        size.width(), size.height());
-        }
-        stencil_buffer = depth_buffer;
-        funcs.glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_STENCIL_ATTACHMENT,
-                                        GL_RENDERBUFFER, depth_buffer);
-#endif
-
-        valid = checkFramebufferStatus();
-        if (!valid) {
-            funcs.glDeleteRenderbuffers(1, &depth_buffer);
-            stencil_buffer = depth_buffer = 0;
-        }
-    }
-
-    if (depth_buffer == 0 && (attachment == QGLFramebufferObject::CombinedDepthStencil
-        || (attachment == QGLFramebufferObject::Depth)))
-    {
-        funcs.glGenRenderbuffers(1, &depth_buffer);
-        funcs.glBindRenderbuffer(GL_RENDERBUFFER, depth_buffer);
-        Q_ASSERT(funcs.glIsRenderbuffer(depth_buffer));
-        if (samples != 0 && funcs.hasOpenGLExtension(QOpenGLExtensions::FramebufferMultisample)) {
-#ifdef QT_OPENGL_ES
-            if (funcs.hasOpenGLExtension(QOpenGLExtensions::Depth24)) {
-                funcs.glRenderbufferStorageMultisample(GL_RENDERBUFFER, samples,
-                    GL_DEPTH_COMPONENT24_OES, size.width(), size.height());
-            } else {
-                funcs.glRenderbufferStorageMultisample(GL_RENDERBUFFER, samples,
-                    GL_DEPTH_COMPONENT16, size.width(), size.height());
-            }
-#else
-            if (ctx->contextHandle()->isOpenGLES()) {
-                if (funcs.hasOpenGLExtension(QOpenGLExtensions::Depth24))
-                    funcs.glRenderbufferStorageMultisample(GL_RENDERBUFFER, samples,
-                                                           GL_DEPTH_COMPONENT24, size.width(), size.height());
-                else
-                    funcs.glRenderbufferStorageMultisample(GL_RENDERBUFFER, samples,
-                                                           GL_DEPTH_COMPONENT16, size.width(), size.height());
-            } else {
-                funcs.glRenderbufferStorageMultisample(GL_RENDERBUFFER, samples,
-                                                       GL_DEPTH_COMPONENT, size.width(), size.height());
-            }
-#endif
-        } else {
-#ifdef QT_OPENGL_ES
-            if (funcs.hasOpenGLExtension(QOpenGLExtensions::Depth24)) {
-                funcs.glRenderbufferStorage(GL_RENDERBUFFER, GL_DEPTH_COMPONENT24_OES,
-                                        size.width(), size.height());
-            } else {
-                funcs.glRenderbufferStorage(GL_RENDERBUFFER, GL_DEPTH_COMPONENT16,
-                                        size.width(), size.height());
-            }
-#else
-            if (ctx->contextHandle()->isOpenGLES()) {
-                if (funcs.hasOpenGLExtension(QOpenGLExtensions::Depth24)) {
-                    funcs.glRenderbufferStorage(GL_RENDERBUFFER, GL_DEPTH_COMPONENT24,
-                                                size.width(), size.height());
-                } else {
-                    funcs.glRenderbufferStorage(GL_RENDERBUFFER, GL_DEPTH_COMPONENT16,
-                                                size.width(), size.height());
-                }
-            } else {
-                funcs.glRenderbufferStorage(GL_RENDERBUFFER, GL_DEPTH_COMPONENT, size.width(), size.height());
-            }
-#endif
-        }
-        funcs.glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT,
-                                     GL_RENDERBUFFER, depth_buffer);
-        valid = checkFramebufferStatus();
-        if (!valid) {
-            funcs.glDeleteRenderbuffers(1, &depth_buffer);
-            depth_buffer = 0;
-        }
-    }
-
-    if (stencil_buffer == 0 && (attachment == QGLFramebufferObject::CombinedDepthStencil)) {
-        funcs.glGenRenderbuffers(1, &stencil_buffer);
-        funcs.glBindRenderbuffer(GL_RENDERBUFFER, stencil_buffer);
-        Q_ASSERT(funcs.glIsRenderbuffer(stencil_buffer));
-
-#ifdef QT_OPENGL_ES
-        GLenum storage = GL_STENCIL_INDEX8;
-#else
-        GLenum storage = ctx->contextHandle()->isOpenGLES() ? GL_STENCIL_INDEX8 : GL_STENCIL_INDEX;
-#endif
-
-        if (samples != 0 && funcs.hasOpenGLExtension(QOpenGLExtensions::FramebufferMultisample))
-            funcs.glRenderbufferStorageMultisample(GL_RENDERBUFFER, samples, storage, size.width(), size.height());
-        else
-            funcs.glRenderbufferStorage(GL_RENDERBUFFER, storage, size.width(), size.height());
-
-        funcs.glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_STENCIL_ATTACHMENT,
-                                  GL_RENDERBUFFER, stencil_buffer);
-        valid = checkFramebufferStatus();
-        if (!valid) {
-            funcs.glDeleteRenderbuffers(1, &stencil_buffer);
-            stencil_buffer = 0;
-        }
-    }
-
-    // The FBO might have become valid after removing the depth or stencil buffer.
-    valid = checkFramebufferStatus();
-
-    if (depth_buffer && stencil_buffer) {
-        fbo_attachment = QGLFramebufferObject::CombinedDepthStencil;
-    } else if (depth_buffer) {
-        fbo_attachment = QGLFramebufferObject::Depth;
-    } else {
-        fbo_attachment = QGLFramebufferObject::NoAttachment;
-    }
-
-    funcs.glBindFramebuffer(GL_FRAMEBUFFER, ctx->d_ptr->current_fbo);
-    if (valid) {
-        fbo_guard = createSharedResourceGuard(ctx, fbo, freeFramebufferFunc);
-        if (color_buffer)
-            color_buffer_guard = createSharedResourceGuard(ctx, color_buffer, freeRenderbufferFunc);
-        else
-            texture_guard = createSharedResourceGuard(ctx, texture, freeTextureFunc);
-        if (depth_buffer)
-            depth_buffer_guard = createSharedResourceGuard(ctx, depth_buffer, freeRenderbufferFunc);
-        if (stencil_buffer) {
-            if (stencil_buffer == depth_buffer)
-                stencil_buffer_guard = depth_buffer_guard;
-            else
-                stencil_buffer_guard = createSharedResourceGuard(ctx, stencil_buffer, freeRenderbufferFunc);
-        }
-    } else {
-        if (color_buffer)
-            funcs.glDeleteRenderbuffers(1, &color_buffer);
-        else
-            funcs.glDeleteTextures(1, &texture);
-        if (depth_buffer)
-            funcs.glDeleteRenderbuffers(1, &depth_buffer);
-        if (stencil_buffer && depth_buffer != stencil_buffer)
-            funcs.glDeleteRenderbuffers(1, &stencil_buffer);
-        funcs.glDeleteFramebuffers(1, &fbo);
-    }
-    QT_CHECK_GLERROR();
-
-    format.setTextureTarget(target);
-    format.setSamples(int(samples));
-    format.setAttachment(fbo_attachment);
-    format.setInternalTextureFormat(internal_format);
-    format.setMipmap(mipmap);
-
-    glDevice.setFBO(q, attachment);
-}
-
-/*!
-    \class QGLFramebufferObject
-    \inmodule QtOpenGL
-    \brief The QGLFramebufferObject class encapsulates an OpenGL framebuffer object.
-    \since 4.2
-
-    \obsolete
-
-    \ingroup painting-3D
-
-    The QGLFramebufferObject class encapsulates an OpenGL framebuffer
-    object, defined by the \c{GL_EXT_framebuffer_object} extension. In
-    addition it provides a rendering surface that can be painted on
-    with a QPainter, rendered to using native GL calls, or both. This
-    surface can be bound and used as a regular texture in your own GL
-    drawing code.  By default, the QGLFramebufferObject class
-    generates a 2D GL texture (using the \c{GL_TEXTURE_2D} target),
-    which is used as the internal rendering target.
-
-    \b{It is important to have a current GL context when creating a
-    QGLFramebufferObject, otherwise initialization will fail.}
-
-    OpenGL framebuffer objects and pbuffers (see
-    \l{QGLPixelBuffer}{QGLPixelBuffer}) can both be used to render to
-    offscreen surfaces, but there are a number of advantages with
-    using framebuffer objects instead of pbuffers:
-
-    \list 1
-    \li A framebuffer object does not require a separate rendering
-    context, so no context switching will occur when switching
-    rendering targets. There is an overhead involved in switching
-    targets, but in general it is cheaper than a context switch to a
-    pbuffer.
-
-    \li Rendering to dynamic textures (i.e. render-to-texture
-    functionality) works on all platforms. No need to do explicit copy
-    calls from a render buffer into a texture, as was necessary on
-    systems that did not support the \c{render_texture} extension.
-
-    \li It is possible to attach several rendering buffers (or texture
-    objects) to the same framebuffer object, and render to all of them
-    without doing a context switch.
-
-    \li The OpenGL framebuffer extension is a pure GL extension with no
-    system dependant WGL, CGL, or GLX parts. This makes using
-    framebuffer objects more portable.
-    \endlist
-
-    When using a QPainter to paint to a QGLFramebufferObject you should take
-    care that the QGLFramebufferObject is created with the CombinedDepthStencil
-    attachment for QPainter to be able to render correctly.
-    Note that you need to create a QGLFramebufferObject with more than one
-    sample per pixel for primitives to be antialiased when drawing using a
-    QPainter. To create a multisample framebuffer object you should use one of
-    the constructors that take a QGLFramebufferObjectFormat parameter, and set
-    the QGLFramebufferObjectFormat::samples() property to a non-zero value.
-
-    When painting to a QGLFramebufferObject using QPainter, the state of
-    the current GL context will be altered by the paint engine to reflect
-    its needs.  Applications should not rely upon the GL state being reset
-    to its original conditions, particularly the current shader program,
-    GL viewport, texture units, and drawing modes.
-
-    For multisample framebuffer objects a color render buffer is created,
-    otherwise a texture with the specified texture target is created.
-    The color render buffer or texture will have the specified internal
-    format, and will be bound to the \c GL_COLOR_ATTACHMENT0
-    attachment in the framebuffer object.
-
-    If you want to use a framebuffer object with multisampling enabled
-    as a texture, you first need to copy from it to a regular framebuffer
-    object using QGLContext::blitFramebuffer().
-
-    \section1 Threading
-
-    As of Qt 4.8, it's possible to draw into a QGLFramebufferObject
-    using a QPainter in a separate thread. Note that OpenGL 2.0 or
-    OpenGL ES 2.0 is required for this to work.
-
-    \note This class has been deprecated in favor of QOpenGLFramebufferObject.
-*/
-
-
-/*!
-    \enum QGLFramebufferObject::Attachment
-    \since 4.3
-
-    This enum type is used to configure the depth and stencil buffers
-    attached to the framebuffer object when it is created.
-
-    \value NoAttachment         No attachment is added to the framebuffer object. Note that the
-                                OpenGL depth and stencil tests won't work when rendering to a
-                                framebuffer object without any depth or stencil buffers.
-                                This is the default value.
-
-    \value CombinedDepthStencil If the \c GL_EXT_packed_depth_stencil extension is present,
-                                a combined depth and stencil buffer is attached.
-                                If the extension is not present, only a depth buffer is attached.
-
-    \value Depth                A depth buffer is attached to the framebuffer object.
-
-    \sa attachment()
-*/
-
-
-/*! \fn QGLFramebufferObject::QGLFramebufferObject(const QSize &size, GLenum target)
-
-    Constructs an OpenGL framebuffer object and binds a 2D GL texture
-    to the buffer of the size \a size. The texture is bound to the
-    \c GL_COLOR_ATTACHMENT0 target in the framebuffer object.
-
-    The \a target parameter is used to specify the GL texture
-    target. The default target is \c GL_TEXTURE_2D. Keep in mind that
-    \c GL_TEXTURE_2D textures must have a power of 2 width and height
-    (e.g. 256x512), unless you are using OpenGL 2.0 or higher.
-
-    By default, no depth and stencil buffers are attached. This behavior
-    can be toggled using one of the overloaded constructors.
-
-    The default internal texture format is \c GL_RGBA8 for desktop
-    OpenGL, and \c GL_RGBA for OpenGL/ES.
-
-    It is important that you have a current GL context set when
-    creating the QGLFramebufferObject, otherwise the initialization
-    will fail.
-
-    \sa size(), texture(), attachment()
-*/
-
-QGLFramebufferObject::QGLFramebufferObject(const QSize &size, GLenum target)
-    : d_ptr(new QGLFramebufferObjectPrivate)
-{
-    Q_D(QGLFramebufferObject);
-    d->init(this, size, NoAttachment, target,
-#ifndef QT_OPENGL_ES_2
-            QOpenGLContext::currentContext()->isOpenGLES() ? GL_RGBA : GL_RGBA8
-#else
-            GL_RGBA
-#endif
-        );
-}
-
-/*! \overload
-
-    Constructs an OpenGL framebuffer object and binds a 2D GL texture
-    to the buffer of the given \a width and \a height.
-
-    \sa size(), texture()
-*/
-QGLFramebufferObject::QGLFramebufferObject(int width, int height, GLenum target)
-    : d_ptr(new QGLFramebufferObjectPrivate)
-{
-    Q_D(QGLFramebufferObject);
-    d->init(this, QSize(width, height), NoAttachment, target,
-#ifndef QT_OPENGL_ES_2
-            QOpenGLContext::currentContext()->isOpenGLES() ? GL_RGBA : GL_RGBA8
-#else
-            GL_RGBA
-#endif
-        );
-}
-
-/*! \overload
-
-    Constructs an OpenGL framebuffer object of the given \a size based on the
-    supplied \a format.
-*/
-
-QGLFramebufferObject::QGLFramebufferObject(const QSize &size, const QGLFramebufferObjectFormat &format)
-    : d_ptr(new QGLFramebufferObjectPrivate)
-{
-    Q_D(QGLFramebufferObject);
-    d->init(this, size, format.attachment(), format.textureTarget(), format.internalTextureFormat(),
-            format.samples(), format.mipmap());
-}
-
-/*! \overload
-
-    Constructs an OpenGL framebuffer object of the given \a width and \a height
-    based on the supplied \a format.
-*/
-
-QGLFramebufferObject::QGLFramebufferObject(int width, int height, const QGLFramebufferObjectFormat &format)
-    : d_ptr(new QGLFramebufferObjectPrivate)
-{
-    Q_D(QGLFramebufferObject);
-    d->init(this, QSize(width, height), format.attachment(), format.textureTarget(),
-            format.internalTextureFormat(), format.samples(), format.mipmap());
-}
-
-/*! \overload
-
-    Constructs an OpenGL framebuffer object and binds a texture to the
-    buffer of the given \a width and \a height.
-
-    The \a attachment parameter describes the depth/stencil buffer
-    configuration, \a target the texture target and \a internal_format
-    the internal texture format. The default texture target is \c
-    GL_TEXTURE_2D, while the default internal format is \c GL_RGBA8
-    for desktop OpenGL and \c GL_RGBA for OpenGL/ES.
-
-    \sa size(), texture(), attachment()
-*/
-QGLFramebufferObject::QGLFramebufferObject(int width, int height, Attachment attachment,
-                                           GLenum target, GLenum internal_format)
-    : d_ptr(new QGLFramebufferObjectPrivate)
-{
-    Q_D(QGLFramebufferObject);
-    if (!internal_format)
-#ifdef QT_OPENGL_ES_2
-        internal_format = GL_RGBA;
-#else
-    internal_format = QOpenGLContext::currentContext()->isOpenGLES() ? GL_RGBA : GL_RGBA8;
-#endif
-    d->init(this, QSize(width, height), attachment, target, internal_format);
-}
-
-/*! \overload
-
-    Constructs an OpenGL framebuffer object and binds a texture to the
-    buffer of the given \a size.
-
-    The \a attachment parameter describes the depth/stencil buffer
-    configuration, \a target the texture target and \a internal_format
-    the internal texture format. The default texture target is \c
-    GL_TEXTURE_2D, while the default internal format is \c GL_RGBA8
-    for desktop OpenGL and \c GL_RGBA for OpenGL/ES.
-
-    \sa size(), texture(), attachment()
-*/
-QGLFramebufferObject::QGLFramebufferObject(const QSize &size, Attachment attachment,
-                                           GLenum target, GLenum internal_format)
-    : d_ptr(new QGLFramebufferObjectPrivate)
-{
-    Q_D(QGLFramebufferObject);
-    if (!internal_format)
-#ifdef QT_OPENGL_ES_2
-        internal_format = GL_RGBA;
-#else
-        internal_format = QOpenGLContext::currentContext()->isOpenGLES() ? GL_RGBA : GL_RGBA8;
-#endif
-    d->init(this, size, attachment, target, internal_format);
-}
-
-/*!
-    \fn QGLFramebufferObject::~QGLFramebufferObject()
-
-    Destroys the framebuffer object and frees any allocated resources.
-*/
-QGLFramebufferObject::~QGLFramebufferObject()
-{
-    Q_D(QGLFramebufferObject);
-
-    delete d->engine;
-
-    if (d->texture_guard)
-        d->texture_guard->free();
-    if (d->color_buffer_guard)
-        d->color_buffer_guard->free();
-    if (d->depth_buffer_guard)
-        d->depth_buffer_guard->free();
-    if (d->stencil_buffer_guard && d->stencil_buffer_guard != d->depth_buffer_guard)
-        d->stencil_buffer_guard->free();
-    if (d->fbo_guard)
-        d->fbo_guard->free();
-}
-
-/*!
-    \fn bool QGLFramebufferObject::isValid() const
-
-    Returns \c true if the framebuffer object is valid.
-
-    The framebuffer can become invalid if the initialization process
-    fails, the user attaches an invalid buffer to the framebuffer
-    object, or a non-power of two width/height is specified as the
-    texture size if the texture target is \c{GL_TEXTURE_2D}.
-    The non-power of two limitation does not apply if the OpenGL version
-    is 2.0 or higher, or if the GL_ARB_texture_non_power_of_two extension
-    is present.
-
-    The framebuffer can also become invalid if the QGLContext that
-    the framebuffer was created within is destroyed and there are
-    no other shared contexts that can take over ownership of the
-    framebuffer.
-*/
-bool QGLFramebufferObject::isValid() const
-{
-    Q_D(const QGLFramebufferObject);
-    return d->valid && d->fbo_guard && d->fbo_guard->id();
-}
-
-/*!
-    \fn bool QGLFramebufferObject::bind()
-
-    Switches rendering from the default, windowing system provided
-    framebuffer to this framebuffer object.
-    Returns \c true upon success, false otherwise.
-
-    \sa release()
-*/
-bool QGLFramebufferObject::bind()
-{
-    if (!isValid())
-        return false;
-    Q_D(QGLFramebufferObject);
-    QGL_FUNC_CONTEXT;
-    if (!ctx)
-        return false;   // Context no longer exists.
-    const QGLContext *current = QGLContext::currentContext();
-#ifdef QT_DEBUG
-    if (!current ||
-        QGLContextPrivate::contextGroup(current) != QGLContextPrivate::contextGroup(ctx))
-    {
-        qWarning("QGLFramebufferObject::bind() called from incompatible context");
-    }
-#endif
-    d->funcs.glBindFramebuffer(GL_FRAMEBUFFER, d->fbo());
-    d->valid = d->checkFramebufferStatus();
-    if (d->valid && current)
-        current->d_ptr->setCurrentFbo(d->fbo());
-    return d->valid;
-}
-
-/*!
-    \fn bool QGLFramebufferObject::release()
-
-    Switches rendering back to the default, windowing system provided
-    framebuffer.
-    Returns \c true upon success, false otherwise.
-
-    \sa bind()
-*/
-bool QGLFramebufferObject::release()
-{
-    if (!isValid())
-        return false;
-    Q_D(QGLFramebufferObject);
-    QGL_FUNC_CONTEXT;
-    if (!ctx)
-        return false;   // Context no longer exists.
-
-    const QGLContext *current = QGLContext::currentContext();
-
-#ifdef QT_DEBUG
-    if (!current ||
-        QGLContextPrivate::contextGroup(current) != QGLContextPrivate::contextGroup(ctx))
-    {
-        qWarning("QGLFramebufferObject::release() called from incompatible context");
-    }
-#endif
-
-    if (current) {
-        current->d_ptr->setCurrentFbo(current->d_ptr->default_fbo);
-        d->funcs.glBindFramebuffer(GL_FRAMEBUFFER, current->d_ptr->default_fbo);
-    }
-
-    return true;
-}
-
-/*!
-    \fn GLuint QGLFramebufferObject::texture() const
-
-    Returns the texture id for the texture attached as the default
-    rendering target in this framebuffer object. This texture id can
-    be bound as a normal texture in your own GL code.
-
-    If a multisample framebuffer object is used then the value returned
-    from this function will be invalid.
-*/
-GLuint QGLFramebufferObject::texture() const
-{
-    Q_D(const QGLFramebufferObject);
-    return d->texture_guard ? d->texture_guard->id() : 0;
-}
-
-/*!
-    \fn QSize QGLFramebufferObject::size() const
-
-    Returns the size of the texture attached to this framebuffer
-    object.
-*/
-QSize QGLFramebufferObject::size() const
-{
-    Q_D(const QGLFramebufferObject);
-    return d->size;
-}
-
-/*!
-    Returns the format of this framebuffer object.
-*/
-QGLFramebufferObjectFormat QGLFramebufferObject::format() const
-{
-    Q_D(const QGLFramebufferObject);
-    return d->format;
-}
-
-/*!
-    \fn QImage QGLFramebufferObject::toImage() const
-
-    Returns the contents of this framebuffer object as a QImage.
-
-    The returned image has a format of premultiplied ARGB32 or RGB32. The latter is used
-    only when internalTextureFormat() is set to \c GL_RGB.
-
-    If the rendering in the framebuffer was not done with premultiplied alpha in mind,
-    create a wrapper QImage with a non-premultiplied format. This is necessary before
-    performing operations like QImage::save() because otherwise the image data would get
-    unpremultiplied, even though it was not premultiplied in the first place. To create
-    such a wrapper without performing a copy of the pixel data, do the following:
-
-    \code
-    QImage fboImage(fbo.toImage());
-    QImage image(fboImage.constBits(), fboImage.width(), fboImage.height(), QImage::Format_ARGB32);
-    \endcode
-
-    On QNX the back buffer is not preserved when a buffer swap occures. So this function
-    might return old content.
-*/
-QImage QGLFramebufferObject::toImage() const
-{
-    Q_D(const QGLFramebufferObject);
-    if (!d->valid)
-        return QImage();
-
-    // qt_gl_read_frame_buffer doesn't work on a multisample FBO
-    if (format().samples() != 0) {
-        QGLFramebufferObject temp(size(), QGLFramebufferObjectFormat());
-
-        QRect rect(QPoint(0, 0), size());
-        blitFramebuffer(&temp, rect, const_cast<QGLFramebufferObject *>(this), rect);
-
-        return temp.toImage();
-    }
-
-    bool wasBound = isBound();
-    if (!wasBound)
-        const_cast<QGLFramebufferObject *>(this)->bind();
-    QImage image = qt_gl_read_frame_buffer(d->size, format().internalTextureFormat() != GL_RGB, true);
-    if (!wasBound)
-        const_cast<QGLFramebufferObject *>(this)->release();
-
-    return image;
-}
-
-Q_GLOBAL_STATIC(QGLEngineThreadStorage<QGL2PaintEngineEx>, qt_buffer_2_engine)
-
-/*! \reimp */
-QPaintEngine *QGLFramebufferObject::paintEngine() const
-{
-    Q_D(const QGLFramebufferObject);
-    if (d->engine)
-        return d->engine;
-
-    QPaintEngine *engine = qt_buffer_2_engine()->engine();
-    if (engine->isActive() && engine->paintDevice() != this) {
-        d->engine = new QGL2PaintEngineEx;
-        return d->engine;
-    }
-    return engine;
-}
-
-/*!
-    \fn bool QGLFramebufferObject::bindDefault()
-
-    Switches rendering back to the default, windowing system provided
-    framebuffer.
-    Returns \c true upon success, false otherwise.
-
-    \sa bind(), release()
-*/
-bool QGLFramebufferObject::bindDefault()
-{
-    QGLContext *ctx = const_cast<QGLContext *>(QGLContext::currentContext());
-
-    if (ctx) {
-        QOpenGLFunctions functions(ctx->contextHandle());
-        if (!functions.hasOpenGLFeature(QOpenGLFunctions::Framebuffers))
-            return false;
-
-        ctx->d_ptr->setCurrentFbo(ctx->d_ptr->default_fbo);
-        functions.glBindFramebuffer(GL_FRAMEBUFFER, ctx->d_ptr->default_fbo);
-#ifdef QT_DEBUG
-    } else {
-        qWarning("QGLFramebufferObject::bindDefault() called without current context.");
-#endif
-    }
-
-    return ctx != 0;
-}
-
-/*!
-    \fn bool QGLFramebufferObject::hasOpenGLFramebufferObjects()
-
-    Returns \c true if the OpenGL \c{GL_EXT_framebuffer_object} extension
-    is present on this system; otherwise returns \c false.
-*/
-bool QGLFramebufferObject::hasOpenGLFramebufferObjects()
-{
-    return qgl_hasFeature(QOpenGLFunctions::Framebuffers);
-}
-
-/*!
-    \since 4.4
-
-    Draws the given texture, \a textureId, to the given target rectangle,
-    \a target, in OpenGL model space. The \a textureTarget should be a 2D
-    texture target.
-
-    The framebuffer object should be bound when calling this function.
-
-    Equivalent to the corresponding QGLContext::drawTexture().
-*/
-void QGLFramebufferObject::drawTexture(const QRectF &target, GLuint textureId, GLenum textureTarget)
-{
-    const_cast<QGLContext *>(QGLContext::currentContext())->drawTexture(target, textureId, textureTarget);
-}
-
-/*!
-    \since 4.4
-
-    Draws the given texture, \a textureId, at the given \a point in OpenGL
-    model space. The \a textureTarget should be a 2D texture target.
-
-    The framebuffer object should be bound when calling this function.
-
-    Equivalent to the corresponding QGLContext::drawTexture().
-*/
-void QGLFramebufferObject::drawTexture(const QPointF &point, GLuint textureId, GLenum textureTarget)
-{
-    const_cast<QGLContext *>(QGLContext::currentContext())->drawTexture(point, textureId, textureTarget);
-}
-
-/*! \reimp */
-int QGLFramebufferObject::metric(PaintDeviceMetric metric) const
-{
-    Q_D(const QGLFramebufferObject);
-
-    float dpmx = qt_defaultDpiX()*100./2.54;
-    float dpmy = qt_defaultDpiY()*100./2.54;
-    int w = d->size.width();
-    int h = d->size.height();
-    switch (metric) {
-    case PdmWidth:
-        return w;
-
-    case PdmHeight:
-        return h;
-
-    case PdmWidthMM:
-        return qRound(w * 1000 / dpmx);
-
-    case PdmHeightMM:
-        return qRound(h * 1000 / dpmy);
-
-    case PdmNumColors:
-        return 0;
-
-    case PdmDepth:
-        return 32;//d->depth;
-
-    case PdmDpiX:
-        return qRound(dpmx * 0.0254);
-
-    case PdmDpiY:
-        return qRound(dpmy * 0.0254);
-
-    case PdmPhysicalDpiX:
-        return qRound(dpmx * 0.0254);
-
-    case PdmPhysicalDpiY:
-        return qRound(dpmy * 0.0254);
-
-    case QPaintDevice::PdmDevicePixelRatio:
-        return 1;
-
-    case QPaintDevice::PdmDevicePixelRatioScaled:
-        return 1 * QPaintDevice::devicePixelRatioFScale();
-
-    default:
-        qWarning("QGLFramebufferObject::metric(), Unhandled metric type: %d.\n", metric);
-        break;
-    }
-    return 0;
-}
-
-/*!
-    \fn GLuint QGLFramebufferObject::handle() const
-
-    Returns the GL framebuffer object handle for this framebuffer
-    object (returned by the \c{glGenFrameBuffersEXT()} function). This
-    handle can be used to attach new images or buffers to the
-    framebuffer. The user is responsible for cleaning up and
-    destroying these objects.
-*/
-GLuint QGLFramebufferObject::handle() const
-{
-    Q_D(const QGLFramebufferObject);
-    return d->fbo();
-}
-
-/*! \fn int QGLFramebufferObject::devType() const
-    \internal
-*/
-
-
-/*!
-    Returns the status of the depth and stencil buffers attached to
-    this framebuffer object.
-*/
-
-QGLFramebufferObject::Attachment QGLFramebufferObject::attachment() const
-{
-    Q_D(const QGLFramebufferObject);
-    if (d->valid)
-        return d->fbo_attachment;
-    return NoAttachment;
-}
-
-/*!
-    \since 4.5
-
-    Returns \c true if the framebuffer object is currently bound to a context,
-    otherwise false is returned.
-*/
-
-bool QGLFramebufferObject::isBound() const
-{
-    Q_D(const QGLFramebufferObject);
-    const QGLContext *current = QGLContext::currentContext();
-    if (current) {
-        current->d_ptr->refreshCurrentFbo();
-        return current->d_ptr->current_fbo == d->fbo();
-    }
-
-    return false;
-}
-
-/*!
-    \fn bool QGLFramebufferObject::hasOpenGLFramebufferBlit()
-
-    \since 4.6
-
-    Returns \c true if the OpenGL \c{GL_EXT_framebuffer_blit} extension
-    is present on this system; otherwise returns \c false.
-
-    \sa blitFramebuffer()
-*/
-bool QGLFramebufferObject::hasOpenGLFramebufferBlit()
-{
-    return QOpenGLExtensions(QOpenGLContext::currentContext()).hasOpenGLExtension(QOpenGLExtensions::FramebufferBlit);
-}
-
-/*!
-    \since 4.6
-
-    Blits from the \a sourceRect rectangle in the \a source framebuffer
-    object to the \a targetRect rectangle in the \a target framebuffer object.
-
-    If \a source or \a target is \nullptr, the default framebuffer will be used
-    instead of a framebuffer object as source or target respectively.
-
-    The \a buffers parameter should be a mask consisting of any combination of
-    \c GL_COLOR_BUFFER_BIT, \c GL_DEPTH_BUFFER_BIT, and
-    \c GL_STENCIL_BUFFER_BIT.  Any buffer type that is not present both
-    in the source and target buffers is ignored.
-
-    The \a sourceRect and \a targetRect rectangles may have different sizes;
-    in this case \a buffers should not contain \c GL_DEPTH_BUFFER_BIT or
-    \c GL_STENCIL_BUFFER_BIT. The \a filter parameter should be set to
-    \c GL_LINEAR or \c GL_NEAREST, and specifies whether linear or nearest
-    interpolation should be used when scaling is performed.
-
-    If \a source equals \a target a copy is performed within the same buffer.
-    Results are undefined if the source and target rectangles overlap and
-    have different sizes. The sizes must also be the same if any of the
-    framebuffer objects are multisample framebuffers.
-
-    Note that the scissor test will restrict the blit area if enabled.
-
-    This function will have no effect unless hasOpenGLFramebufferBlit() returns
-    true.
-
-    \sa hasOpenGLFramebufferBlit()
-*/
-void QGLFramebufferObject::blitFramebuffer(QGLFramebufferObject *target, const QRect &targetRect,
-                                           QGLFramebufferObject *source, const QRect &sourceRect,
-                                           GLbitfield buffers,
-                                           GLenum filter)
-{
-    const QGLContext *ctx = QGLContext::currentContext();
-    if (!ctx || !ctx->contextHandle())
-        return;
-
-    QOpenGLExtensions functions(ctx->contextHandle());
-    if (!functions.hasOpenGLExtension(QOpenGLExtensions::FramebufferBlit))
-        return;
-
-    QSurface *surface = ctx->contextHandle()->surface();
-
-    const int height = static_cast<QWindow *>(surface)->height();
-
-    const int sh = source ? source->height() : height;
-    const int th = target ? target->height() : height;
-
-    const int sx0 = sourceRect.left();
-    const int sx1 = sourceRect.left() + sourceRect.width();
-    const int sy0 = sh - (sourceRect.top() + sourceRect.height());
-    const int sy1 = sh - sourceRect.top();
-
-    const int tx0 = targetRect.left();
-    const int tx1 = targetRect.left() + targetRect.width();
-    const int ty0 = th - (targetRect.top() + targetRect.height());
-    const int ty1 = th - targetRect.top();
-
-    ctx->d_ptr->refreshCurrentFbo();
-
-    functions.glBindFramebuffer(GL_READ_FRAMEBUFFER, source ? source->handle() : 0);
-    functions.glBindFramebuffer(GL_DRAW_FRAMEBUFFER, target ? target->handle() : 0);
-
-    functions.glBlitFramebuffer(sx0, sy0, sx1, sy1,
-                         tx0, ty0, tx1, ty1,
-                         buffers, filter);
-
-    functions.glBindFramebuffer(GL_FRAMEBUFFER, ctx->d_ptr->current_fbo);
-}
-
-QT_END_NAMESPACE
diff --git a/src/opengl/qglframebufferobject.h b/src/opengl/qglframebufferobject.h
deleted file mode 100644
index c88063cbb5..0000000000
--- a/src/opengl/qglframebufferobject.h
+++ /dev/null
@@ -1,149 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtOpenGL module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QGLFRAMEBUFFEROBJECT_H
-#define QGLFRAMEBUFFEROBJECT_H
-
-#include <QtOpenGL/qgl.h>
-#include <QtGui/qpaintdevice.h>
-
-QT_BEGIN_NAMESPACE
-
-
-class QGLFramebufferObjectPrivate;
-class QGLFramebufferObjectFormat;
-
-class Q_OPENGL_EXPORT QGLFramebufferObject : public QPaintDevice
-{
-    Q_DECLARE_PRIVATE(QGLFramebufferObject)
-public:
-    enum Attachment {
-        NoAttachment,
-        CombinedDepthStencil,
-        Depth
-    };
-
-    QGLFramebufferObject(const QSize &size, GLenum target = GL_TEXTURE_2D);
-    QGLFramebufferObject(int width, int height, GLenum target = GL_TEXTURE_2D);
-
-    QGLFramebufferObject(const QSize &size, Attachment attachment,
-                         GLenum target = GL_TEXTURE_2D, GLenum internal_format = 0);
-    QGLFramebufferObject(int width, int height, Attachment attachment,
-                         GLenum target = GL_TEXTURE_2D, GLenum internal_format = 0);
-
-    QGLFramebufferObject(const QSize &size, const QGLFramebufferObjectFormat &format);
-    QGLFramebufferObject(int width, int height, const QGLFramebufferObjectFormat &format);
-
-    virtual ~QGLFramebufferObject();
-
-    QGLFramebufferObjectFormat format() const;
-
-    bool isValid() const;
-    bool isBound() const;
-    bool bind();
-    bool release();
-
-    GLuint texture() const;
-    QSize size() const;
-    QImage toImage() const;
-    Attachment attachment() const;
-
-    QPaintEngine *paintEngine() const override;
-    GLuint handle() const;
-
-    static bool bindDefault();
-
-    static bool hasOpenGLFramebufferObjects();
-
-    void drawTexture(const QRectF &target, GLuint textureId, GLenum textureTarget = GL_TEXTURE_2D);
-    void drawTexture(const QPointF &point, GLuint textureId, GLenum textureTarget = GL_TEXTURE_2D);
-
-    static bool hasOpenGLFramebufferBlit();
-    static void blitFramebuffer(QGLFramebufferObject *target, const QRect &targetRect,
-                                QGLFramebufferObject *source, const QRect &sourceRect,
-                                GLbitfield buffers = GL_COLOR_BUFFER_BIT,
-                                GLenum filter = GL_NEAREST);
-
-protected:
-    int metric(PaintDeviceMetric metric) const override;
-    int devType() const override { return QInternal::FramebufferObject; }
-
-private:
-    Q_DISABLE_COPY(QGLFramebufferObject)
-    QScopedPointer<QGLFramebufferObjectPrivate> d_ptr;
-    friend class QGLPaintDevice;
-    friend class QGLFBOGLPaintDevice;
-};
-
-class QGLFramebufferObjectFormatPrivate;
-class Q_OPENGL_EXPORT QGLFramebufferObjectFormat
-{
-public:
-    QGLFramebufferObjectFormat();
-    QGLFramebufferObjectFormat(const QGLFramebufferObjectFormat &other);
-    QGLFramebufferObjectFormat &operator=(const QGLFramebufferObjectFormat &other);
-    ~QGLFramebufferObjectFormat();
-
-    void setSamples(int samples);
-    int samples() const;
-
-    void setMipmap(bool enabled);
-    bool mipmap() const;
-
-    void setAttachment(QGLFramebufferObject::Attachment attachment);
-    QGLFramebufferObject::Attachment attachment() const;
-
-    void setTextureTarget(GLenum target);
-    GLenum textureTarget() const;
-
-    void setInternalTextureFormat(GLenum internalTextureFormat);
-    GLenum internalTextureFormat() const;
-
-    bool operator==(const QGLFramebufferObjectFormat& other) const;
-    bool operator!=(const QGLFramebufferObjectFormat& other) const;
-
-private:
-    QGLFramebufferObjectFormatPrivate *d;
-
-    void detach();
-};
-
-QT_END_NAMESPACE
-
-#endif // QGLFRAMEBUFFEROBJECT_H
diff --git a/src/opengl/qglframebufferobject_p.h b/src/opengl/qglframebufferobject_p.h
deleted file mode 100644
index 9d536527c3..0000000000
--- a/src/opengl/qglframebufferobject_p.h
+++ /dev/null
@@ -1,157 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtOpenGL module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QGLFRAMEBUFFEROBJECT_P_H
-#define QGLFRAMEBUFFEROBJECT_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API. It exists purely as an
-// implementation detail. This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include <qglframebufferobject.h>
-#include <private/qglpaintdevice_p.h>
-#include <private/qgl_p.h>
-#include <private/qopenglextensions_p.h>
-
-QT_BEGIN_NAMESPACE
-
-class QGLFramebufferObjectFormatPrivate
-{
-public:
-    QGLFramebufferObjectFormatPrivate()
-        : ref(1),
-          samples(0),
-          attachment(QGLFramebufferObject::NoAttachment),
-          target(GL_TEXTURE_2D),
-          mipmap(false)
-    {
-#ifndef QT_OPENGL_ES_2
-        QOpenGLContext *ctx = QOpenGLContext::currentContext();
-        const bool isES = ctx ? ctx->isOpenGLES() : QOpenGLContext::openGLModuleType() != QOpenGLContext::LibGL;
-        internal_format = isES ? GL_RGBA : GL_RGBA8;
-#else
-        internal_format = GL_RGBA;
-#endif
-    }
-    QGLFramebufferObjectFormatPrivate
-            (const QGLFramebufferObjectFormatPrivate *other)
-        : ref(1),
-          samples(other->samples),
-          attachment(other->attachment),
-          target(other->target),
-          internal_format(other->internal_format),
-          mipmap(other->mipmap)
-    {
-    }
-    bool equals(const QGLFramebufferObjectFormatPrivate *other)
-    {
-        return samples == other->samples &&
-               attachment == other->attachment &&
-               target == other->target &&
-               internal_format == other->internal_format &&
-               mipmap == other->mipmap;
-    }
-
-    QAtomicInt ref;
-    int samples;
-    QGLFramebufferObject::Attachment attachment;
-    GLenum target;
-    GLenum internal_format;
-    uint mipmap : 1;
-};
-
-class QGLFBOGLPaintDevice : public QGLPaintDevice
-{
-public:
-    virtual QPaintEngine* paintEngine() const override {return fbo->paintEngine();}
-    virtual QSize size() const override {return fbo->size();}
-    virtual QGLContext* context() const override;
-    virtual QGLFormat format() const override {return fboFormat;}
-    virtual bool alphaRequested() const override { return reqAlpha; }
-
-    void setFBO(QGLFramebufferObject* f,
-                QGLFramebufferObject::Attachment attachment);
-
-private:
-    QGLFramebufferObject* fbo;
-    QGLFormat fboFormat;
-    bool reqAlpha;
-};
-
-class QGLFramebufferObjectPrivate
-{
-public:
-    QGLFramebufferObjectPrivate() : fbo_guard(nullptr), texture_guard(nullptr), depth_buffer_guard(nullptr)
-                                  , stencil_buffer_guard(nullptr), color_buffer_guard(nullptr)
-                                  , valid(false), engine(nullptr) {}
-    ~QGLFramebufferObjectPrivate() {}
-
-    void init(QGLFramebufferObject *q, const QSize& sz,
-              QGLFramebufferObject::Attachment attachment,
-              GLenum internal_format, GLenum texture_target,
-              GLint samples = 0, bool mipmap = false);
-    bool checkFramebufferStatus() const;
-    QGLSharedResourceGuardBase *fbo_guard;
-    QGLSharedResourceGuardBase *texture_guard;
-    QGLSharedResourceGuardBase *depth_buffer_guard;
-    QGLSharedResourceGuardBase *stencil_buffer_guard;
-    QGLSharedResourceGuardBase *color_buffer_guard;
-    GLenum target;
-    QSize size;
-    QGLFramebufferObjectFormat format;
-    uint valid : 1;
-    QGLFramebufferObject::Attachment fbo_attachment;
-    mutable QPaintEngine *engine;
-    QGLFBOGLPaintDevice glDevice;
-    QOpenGLExtensions funcs;
-
-    inline GLuint fbo() const { return fbo_guard ? fbo_guard->id() : 0; }
-};
-
-
-QT_END_NAMESPACE
-
-#endif // QGLFRAMEBUFFEROBJECT_P_H
diff --git a/src/opengl/qglfunctions.cpp b/src/opengl/qglfunctions.cpp
deleted file mode 100644
index b20311bec4..0000000000
--- a/src/opengl/qglfunctions.cpp
+++ /dev/null
@@ -1,1330 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtOpenGL module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qglfunctions.h"
-#include "qgl_p.h"
-#include "QtGui/private/qopenglcontext_p.h"
-#include <private/qopengl_p.h>
-
-QT_BEGIN_NAMESPACE
-
-/*!
-    \class QGLFunctions
-    \inmodule QtOpenGL
-    \brief The QGLFunctions class provides cross-platform access to the OpenGL ES 2.0 API.
-    \since 4.8
-    \obsolete
-    \ingroup painting-3D
-
-    OpenGL ES 2.0 defines a subset of the OpenGL specification that is
-    common across many desktop and embedded OpenGL implementations.
-    However, it can be difficult to use the functions from that subset
-    because they need to be resolved manually on desktop systems.
-
-    QGLFunctions provides a guaranteed API that is available on all
-    OpenGL systems and takes care of function resolution on systems
-    that need it.  The recommended way to use QGLFunctions is by
-    direct inheritance:
-
-    \snippet code/src_opengl_qglfunctions.cpp 0
-
-    The \c{paintGL()} function can then use any of the OpenGL ES 2.0
-    functions without explicit resolution, such as glActiveTexture()
-    in the following example:
-
-    \snippet code/src_opengl_qglfunctions.cpp 1
-
-    QGLFunctions can also be used directly for ad-hoc invocation
-    of OpenGL ES 2.0 functions on all platforms:
-
-    \snippet code/src_opengl_qglfunctions.cpp 2
-
-    QGLFunctions provides wrappers for all OpenGL ES 2.0 functions,
-    except those like \c{glDrawArrays()}, \c{glViewport()}, and
-    \c{glBindTexture()} that don't have portability issues.
-
-    Including the header for QGLFunctions will also define all of
-    the OpenGL ES 2.0 macro constants that are not already defined by
-    the system's OpenGL headers, such as \c{GL_TEXTURE1} above.
-
-    The hasOpenGLFeature() and openGLFeatures() functions can be used
-    to determine if the OpenGL implementation has a major OpenGL ES 2.0
-    feature.  For example, the following checks if non power of two
-    textures are available:
-
-    \snippet code/src_opengl_qglfunctions.cpp 3
-
-    \note This class has been deprecated in favor of QOpenGLFunctions.
-*/
-
-/*!
-    \enum QGLFunctions::OpenGLFeature
-    This enum defines OpenGL ES 2.0 features that may be optional
-    on other platforms.
-
-    \value Multitexture glActiveTexture() function is available.
-    \value Shaders Shader functions are available.
-    \value Buffers Vertex and index buffer functions are available.
-    \value Framebuffers Framebuffer object functions are available.
-    \value BlendColor glBlendColor() is available.
-    \value BlendEquation glBlendEquation() is available.
-    \value BlendEquationSeparate glBlendEquationSeparate() is available.
-    \value BlendFuncSeparate glBlendFuncSeparate() is available.
-    \value BlendSubtract Blend subtract mode is available.
-    \value CompressedTextures Compressed texture functions are available.
-    \value Multisample glSampleCoverage() function is available.
-    \value StencilSeparate Separate stencil functions are available.
-    \value NPOTTextures Non power of two textures are available.
-*/
-
-// Hidden private fields for additional extension data.
-struct QGLFunctionsPrivateEx : public QGLFunctionsPrivate, public QOpenGLSharedResource
-{
-    QGLFunctionsPrivateEx(QOpenGLContext *context)
-        : QGLFunctionsPrivate(QGLContext::fromOpenGLContext(context))
-        , QOpenGLSharedResource(context->shareGroup())
-        , m_features(-1)
-    {
-        funcs = new QOpenGLFunctions(context);
-        funcs->initializeOpenGLFunctions();
-    }
-
-    ~QGLFunctionsPrivateEx()
-    {
-        delete funcs;
-    }
-
-    void invalidateResource() override
-    {
-        m_features = -1;
-    }
-
-    void freeResource(QOpenGLContext *) override
-    {
-        // no gl resources to free
-    }
-
-    int m_features;
-};
-
-Q_GLOBAL_STATIC(QOpenGLMultiGroupSharedResource, qt_gl_functions_resource)
-
-static QGLFunctionsPrivateEx *qt_gl_functions(const QGLContext *context = 0)
-{
-    if (!context)
-        context = QGLContext::currentContext();
-    Q_ASSERT(context);
-    QGLFunctionsPrivateEx *funcs =
-        reinterpret_cast<QGLFunctionsPrivateEx *>
-            (qt_gl_functions_resource()->value<QGLFunctionsPrivateEx>(context->contextHandle()));
-    return funcs;
-}
-
-/*!
-    Constructs a default function resolver.  The resolver cannot
-    be used until initializeGLFunctions() is called to specify
-    the context.
-
-    \sa initializeGLFunctions()
-*/
-QGLFunctions::QGLFunctions()
-    : d_ptr(0)
-{
-}
-
-/*!
-    Constructs a function resolver for \a context.  If \a context
-    is \nullptr, then the resolver will be created for the current
-    QGLContext.
-
-    An object constructed in this way can only be used with \a context
-    and other contexts that share with it.  Use initializeGLFunctions()
-    to change the object's context association.
-
-    \sa initializeGLFunctions()
-*/
-QGLFunctions::QGLFunctions(const QGLContext *context)
-    : d_ptr(qt_gl_functions(context))
-{
-}
-
-/*!
-    \fn QGLFunctions::~QGLFunctions()
-
-    Destroys this function resolver.
-*/
-
-static int qt_gl_resolve_features()
-{
-    QOpenGLContext *ctx = QOpenGLContext::currentContext();
-    if (ctx->isOpenGLES()) {
-        // OpenGL ES 2
-        int features = QGLFunctions::Multitexture |
-            QGLFunctions::Shaders |
-            QGLFunctions::Buffers |
-            QGLFunctions::Framebuffers |
-            QGLFunctions::BlendColor |
-            QGLFunctions::BlendEquation |
-            QGLFunctions::BlendEquationSeparate |
-            QGLFunctions::BlendFuncSeparate |
-            QGLFunctions::BlendSubtract |
-            QGLFunctions::CompressedTextures |
-            QGLFunctions::Multisample |
-            QGLFunctions::StencilSeparate;
-        QOpenGLExtensionMatcher extensions;
-        if (extensions.match("GL_OES_texture_npot"))
-            features |= QGLFunctions::NPOTTextures;
-        if (extensions.match("GL_IMG_texture_npot"))
-            features |= QGLFunctions::NPOTTextures;
-        return features;
-    } else {
-        // OpenGL
-        int features = 0;
-        QGLFormat::OpenGLVersionFlags versions = QGLFormat::openGLVersionFlags();
-        QOpenGLExtensionMatcher extensions;
-
-        // Recognize features by extension name.
-        if (extensions.match("GL_ARB_multitexture"))
-            features |= QGLFunctions::Multitexture;
-        if (extensions.match("GL_ARB_shader_objects"))
-            features |= QGLFunctions::Shaders;
-        if (extensions.match("GL_EXT_framebuffer_object") ||
-            extensions.match("GL_ARB_framebuffer_object"))
-            features |= QGLFunctions::Framebuffers;
-        if (extensions.match("GL_EXT_blend_color"))
-            features |= QGLFunctions::BlendColor;
-        if (extensions.match("GL_EXT_blend_equation_separate"))
-            features |= QGLFunctions::BlendEquationSeparate;
-        if (extensions.match("GL_EXT_blend_func_separate"))
-            features |= QGLFunctions::BlendFuncSeparate;
-        if (extensions.match("GL_EXT_blend_subtract"))
-            features |= QGLFunctions::BlendSubtract;
-        if (extensions.match("GL_ARB_texture_compression"))
-            features |= QGLFunctions::CompressedTextures;
-        if (extensions.match("GL_ARB_multisample"))
-            features |= QGLFunctions::Multisample;
-        if (extensions.match("GL_ARB_texture_non_power_of_two"))
-            features |= QGLFunctions::NPOTTextures;
-
-        // Recognize features by minimum OpenGL version.
-        if (versions & QGLFormat::OpenGL_Version_1_2) {
-            features |= QGLFunctions::BlendColor |
-                QGLFunctions::BlendEquation;
-        }
-        if (versions & QGLFormat::OpenGL_Version_1_3) {
-            features |= QGLFunctions::Multitexture |
-                QGLFunctions::CompressedTextures |
-                QGLFunctions::Multisample;
-        }
-        if (versions & QGLFormat::OpenGL_Version_1_4)
-            features |= QGLFunctions::BlendFuncSeparate;
-        if (versions & QGLFormat::OpenGL_Version_1_5)
-            features |= QGLFunctions::Buffers;
-        if (versions & QGLFormat::OpenGL_Version_2_0) {
-            features |= QGLFunctions::Shaders |
-                QGLFunctions::StencilSeparate |
-                QGLFunctions::BlendEquationSeparate |
-                QGLFunctions::NPOTTextures;
-        }
-        return features;
-    }
-}
-
-/*!
-    Returns the set of features that are present on this system's
-    OpenGL implementation.
-
-    It is assumed that the QGLContext associated with this function
-    resolver is current.
-
-    \sa hasOpenGLFeature()
-*/
-QGLFunctions::OpenGLFeatures QGLFunctions::openGLFeatures() const
-{
-    QGLFunctionsPrivateEx *d = static_cast<QGLFunctionsPrivateEx *>(d_ptr);
-    if (!d)
-        return { };
-    if (d->m_features == -1)
-        d->m_features = qt_gl_resolve_features();
-    return QGLFunctions::OpenGLFeatures(d->m_features);
-}
-
-/*!
-    Returns \c true if \a feature is present on this system's OpenGL
-    implementation; false otherwise.
-
-    It is assumed that the QGLContext associated with this function
-    resolver is current.
-
-    \sa openGLFeatures()
-*/
-bool QGLFunctions::hasOpenGLFeature(QGLFunctions::OpenGLFeature feature) const
-{
-    QGLFunctionsPrivateEx *d = static_cast<QGLFunctionsPrivateEx *>(d_ptr);
-    if (!d)
-        return false;
-    if (d->m_features == -1)
-        d->m_features = qt_gl_resolve_features();
-    return (d->m_features & int(feature)) != 0;
-}
-
-/*!
-    Initializes GL function resolution for \a context.  If \a context
-    is \nullptr, then the current QGLContext will be used.
-
-    After calling this function, the QGLFunctions object can only be
-    used with \a context and other contexts that share with it.
-    Call initializeGLFunctions() again to change the object's context
-    association.
-*/
-void QGLFunctions::initializeGLFunctions(const QGLContext *context)
-{
-    d_ptr = qt_gl_functions(context);
-}
-
-/*!
-    \fn void QGLFunctions::glActiveTexture(GLenum texture)
-
-    Convenience function that calls glActiveTexture(\a texture).
-
-    For more information, see the OpenGL ES 2.0 documentation for
-    \l{http://www.khronos.org/opengles/sdk/docs/man/glActiveTexture.xml}{glActiveTexture()}.
-*/
-
-/*!
-    \fn void QGLFunctions::glAttachShader(GLuint program, GLuint shader)
-
-    Convenience function that calls glAttachShader(\a program, \a shader).
-
-    For more information, see the OpenGL ES 2.0 documentation for
-    \l{http://www.khronos.org/opengles/sdk/docs/man/glAttachShader.xml}{glAttachShader()}.
-
-    This convenience function will do nothing on OpenGL ES 1.x systems.
-*/
-
-/*!
-    \fn void QGLFunctions::glBindAttribLocation(GLuint program, GLuint index, const char* name)
-
-    Convenience function that calls glBindAttribLocation(\a program, \a index, \a name).
-
-    For more information, see the OpenGL ES 2.0 documentation for
-    \l{http://www.khronos.org/opengles/sdk/docs/man/glBindAttribLocation.xml}{glBindAttribLocation()}.
-
-    This convenience function will do nothing on OpenGL ES 1.x systems.
-*/
-
-/*!
-    \fn void QGLFunctions::glBindBuffer(GLenum target, GLuint buffer)
-
-    Convenience function that calls glBindBuffer(\a target, \a buffer).
-
-    For more information, see the OpenGL ES 2.0 documentation for
-    \l{http://www.khronos.org/opengles/sdk/docs/man/glBindBuffer.xml}{glBindBuffer()}.
-*/
-
-/*!
-    \fn void QGLFunctions::glBindFramebuffer(GLenum target, GLuint framebuffer)
-
-    Convenience function that calls glBindFramebuffer(\a target, \a framebuffer).
-
-    Note that Qt will translate a \a framebuffer argument of 0 to the currently
-    bound QOpenGLContext's defaultFramebufferObject().
-
-    For more information, see the OpenGL ES 2.0 documentation for
-    \l{http://www.khronos.org/opengles/sdk/docs/man/glBindFramebuffer.xml}{glBindFramebuffer()}.
-*/
-
-/*!
-    \fn void QGLFunctions::glBindRenderbuffer(GLenum target, GLuint renderbuffer)
-
-    Convenience function that calls glBindRenderbuffer(\a target, \a renderbuffer).
-
-    For more information, see the OpenGL ES 2.0 documentation for
-    \l{http://www.khronos.org/opengles/sdk/docs/man/glBindRenderbuffer.xml}{glBindRenderbuffer()}.
-*/
-
-/*!
-    \fn void QGLFunctions::glBlendColor(GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha)
-
-    Convenience function that calls glBlendColor(\a red, \a green, \a blue, \a alpha).
-
-    For more information, see the OpenGL ES 2.0 documentation for
-    \l{http://www.khronos.org/opengles/sdk/docs/man/glBlendColor.xml}{glBlendColor()}.
-*/
-
-/*!
-    \fn void QGLFunctions::glBlendEquation(GLenum mode)
-
-    Convenience function that calls glBlendEquation(\a mode).
-
-    For more information, see the OpenGL ES 2.0 documentation for
-    \l{http://www.khronos.org/opengles/sdk/docs/man/glBlendEquation.xml}{glBlendEquation()}.
-*/
-
-/*!
-    \fn void QGLFunctions::glBlendEquationSeparate(GLenum modeRGB, GLenum modeAlpha)
-
-    Convenience function that calls glBlendEquationSeparate(\a modeRGB, \a modeAlpha).
-
-    For more information, see the OpenGL ES 2.0 documentation for
-    \l{http://www.khronos.org/opengles/sdk/docs/man/glBlendEquationSeparate.xml}{glBlendEquationSeparate()}.
-*/
-
-/*!
-    \fn void QGLFunctions::glBlendFuncSeparate(GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha)
-
-    Convenience function that calls glBlendFuncSeparate(\a srcRGB, \a dstRGB, \a srcAlpha, \a dstAlpha).
-
-    For more information, see the OpenGL ES 2.0 documentation for
-    \l{http://www.khronos.org/opengles/sdk/docs/man/glBlendFuncSeparate.xml}{glBlendFuncSeparate()}.
-*/
-
-/*!
-    \fn void QGLFunctions::glBufferData(GLenum target, qopengl_GLsizeiptr size, const void* data, GLenum usage)
-
-    Convenience function that calls glBufferData(\a target, \a size, \a data, \a usage).
-
-    For more information, see the OpenGL ES 2.0 documentation for
-    \l{http://www.khronos.org/opengles/sdk/docs/man/glBufferData.xml}{glBufferData()}.
-*/
-
-/*!
-    \fn void QGLFunctions::glBufferSubData(GLenum target, qopengl_GLintptr offset, qopengl_GLsizeiptr size, const void* data)
-
-    Convenience function that calls glBufferSubData(\a target, \a offset, \a size, \a data).
-
-    For more information, see the OpenGL ES 2.0 documentation for
-    \l{http://www.khronos.org/opengles/sdk/docs/man/glBufferSubData.xml}{glBufferSubData()}.
-*/
-
-/*!
-    \fn GLenum QGLFunctions::glCheckFramebufferStatus(GLenum target)
-
-    Convenience function that calls glCheckFramebufferStatus(\a target).
-
-    For more information, see the OpenGL ES 2.0 documentation for
-    \l{http://www.khronos.org/opengles/sdk/docs/man/glCheckFramebufferStatus.xml}{glCheckFramebufferStatus()}.
-*/
-
-/*!
-    \fn void QGLFunctions::glClearDepthf(GLclampf depth)
-
-    Convenience function that calls glClearDepth(\a depth) on
-    desktop OpenGL systems and glClearDepthf(\a depth) on
-    embedded OpenGL ES systems.
-
-    For more information, see the OpenGL ES 2.0 documentation for
-    \l{http://www.khronos.org/opengles/sdk/docs/man/glClearDepthf.xml}{glClearDepthf()}.
-*/
-
-/*!
-    \fn void QGLFunctions::glCompileShader(GLuint shader)
-
-    Convenience function that calls glCompileShader(\a shader).
-
-    For more information, see the OpenGL ES 2.0 documentation for
-    \l{http://www.khronos.org/opengles/sdk/docs/man/glCompileShader.xml}{glCompileShader()}.
-
-    This convenience function will do nothing on OpenGL ES 1.x systems.
-*/
-
-/*!
-    \fn void QGLFunctions::glCompressedTexImage2D(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const void* data)
-
-    Convenience function that calls glCompressedTexImage2D(\a target, \a level, \a internalformat, \a width, \a height, \a border, \a imageSize, \a data).
-
-    For more information, see the OpenGL ES 2.0 documentation for
-    \l{http://www.khronos.org/opengles/sdk/docs/man/glCompressedTexImage2D.xml}{glCompressedTexImage2D()}.
-*/
-
-/*!
-    \fn void QGLFunctions::glCompressedTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const void* data)
-
-    Convenience function that calls glCompressedTexSubImage2D(\a target, \a level, \a xoffset, \a yoffset, \a width, \a height, \a format, \a imageSize, \a data).
-
-    For more information, see the OpenGL ES 2.0 documentation for
-    \l{http://www.khronos.org/opengles/sdk/docs/man/glCompressedTexSubImage2D.xml}{glCompressedTexSubImage2D()}.
-*/
-
-/*!
-    \fn GLuint QGLFunctions::glCreateProgram()
-
-    Convenience function that calls glCreateProgram().
-
-    For more information, see the OpenGL ES 2.0 documentation for
-    \l{http://www.khronos.org/opengles/sdk/docs/man/glCreateProgram.xml}{glCreateProgram()}.
-
-    This convenience function will do nothing on OpenGL ES 1.x systems.
-*/
-
-/*!
-    \fn GLuint QGLFunctions::glCreateShader(GLenum type)
-
-    Convenience function that calls glCreateShader(\a type).
-
-    For more information, see the OpenGL ES 2.0 documentation for
-    \l{http://www.khronos.org/opengles/sdk/docs/man/glCreateShader.xml}{glCreateShader()}.
-
-    This convenience function will do nothing on OpenGL ES 1.x systems.
-*/
-
-/*!
-    \fn void QGLFunctions::glDeleteBuffers(GLsizei n, const GLuint* buffers)
-
-    Convenience function that calls glDeleteBuffers(\a n, \a buffers).
-
-    For more information, see the OpenGL ES 2.0 documentation for
-    \l{http://www.khronos.org/opengles/sdk/docs/man/glDeleteBuffers.xml}{glDeleteBuffers()}.
-*/
-
-/*!
-    \fn void QGLFunctions::glDeleteFramebuffers(GLsizei n, const GLuint* framebuffers)
-
-    Convenience function that calls glDeleteFramebuffers(\a n, \a framebuffers).
-
-    For more information, see the OpenGL ES 2.0 documentation for
-    \l{http://www.khronos.org/opengles/sdk/docs/man/glDeleteFramebuffers.xml}{glDeleteFramebuffers()}.
-*/
-
-/*!
-    \fn void QGLFunctions::glDeleteProgram(GLuint program)
-
-    Convenience function that calls glDeleteProgram(\a program).
-
-    For more information, see the OpenGL ES 2.0 documentation for
-    \l{http://www.khronos.org/opengles/sdk/docs/man/glDeleteProgram.xml}{glDeleteProgram()}.
-
-    This convenience function will do nothing on OpenGL ES 1.x systems.
-*/
-
-/*!
-    \fn void QGLFunctions::glDeleteRenderbuffers(GLsizei n, const GLuint* renderbuffers)
-
-    Convenience function that calls glDeleteRenderbuffers(\a n, \a renderbuffers).
-
-    For more information, see the OpenGL ES 2.0 documentation for
-    \l{http://www.khronos.org/opengles/sdk/docs/man/glDeleteRenderbuffers.xml}{glDeleteRenderbuffers()}.
-*/
-
-/*!
-    \fn void QGLFunctions::glDeleteShader(GLuint shader)
-
-    Convenience function that calls glDeleteShader(\a shader).
-
-    For more information, see the OpenGL ES 2.0 documentation for
-    \l{http://www.khronos.org/opengles/sdk/docs/man/glDeleteShader.xml}{glDeleteShader()}.
-
-    This convenience function will do nothing on OpenGL ES 1.x systems.
-*/
-
-/*!
-    \fn void QGLFunctions::glDepthRangef(GLclampf zNear, GLclampf zFar)
-
-    Convenience function that calls glDepthRange(\a zNear, \a zFar) on
-    desktop OpenGL systems and glDepthRangef(\a zNear, \a zFar) on
-    embedded OpenGL ES systems.
-
-    For more information, see the OpenGL ES 2.0 documentation for
-    \l{http://www.khronos.org/opengles/sdk/docs/man/glDepthRangef.xml}{glDepthRangef()}.
-*/
-
-/*!
-    \fn void QGLFunctions::glDetachShader(GLuint program, GLuint shader)
-
-    Convenience function that calls glDetachShader(\a program, \a shader).
-
-    For more information, see the OpenGL ES 2.0 documentation for
-    \l{http://www.khronos.org/opengles/sdk/docs/man/glDetachShader.xml}{glDetachShader()}.
-
-    This convenience function will do nothing on OpenGL ES 1.x systems.
-*/
-
-/*!
-    \fn void QGLFunctions::glDisableVertexAttribArray(GLuint index)
-
-    Convenience function that calls glDisableVertexAttribArray(\a index).
-
-    For more information, see the OpenGL ES 2.0 documentation for
-    \l{http://www.khronos.org/opengles/sdk/docs/man/glDisableVertexAttribArray.xml}{glDisableVertexAttribArray()}.
-
-    This convenience function will do nothing on OpenGL ES 1.x systems.
-*/
-
-/*!
-    \fn void QGLFunctions::glEnableVertexAttribArray(GLuint index)
-
-    Convenience function that calls glEnableVertexAttribArray(\a index).
-
-    For more information, see the OpenGL ES 2.0 documentation for
-    \l{http://www.khronos.org/opengles/sdk/docs/man/glEnableVertexAttribArray.xml}{glEnableVertexAttribArray()}.
-
-    This convenience function will do nothing on OpenGL ES 1.x systems.
-*/
-
-/*!
-    \fn void QGLFunctions::glFramebufferRenderbuffer(GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer)
-
-    Convenience function that calls glFramebufferRenderbuffer(\a target, \a attachment, \a renderbuffertarget, \a renderbuffer).
-
-    For more information, see the OpenGL ES 2.0 documentation for
-    \l{http://www.khronos.org/opengles/sdk/docs/man/glFramebufferRenderbuffer.xml}{glFramebufferRenderbuffer()}.
-*/
-
-/*!
-    \fn void QGLFunctions::glFramebufferTexture2D(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level)
-
-    Convenience function that calls glFramebufferTexture2D(\a target, \a attachment, \a textarget, \a texture, \a level).
-
-    For more information, see the OpenGL ES 2.0 documentation for
-    \l{http://www.khronos.org/opengles/sdk/docs/man/glFramebufferTexture2D.xml}{glFramebufferTexture2D()}.
-*/
-
-/*!
-    \fn void QGLFunctions::glGenBuffers(GLsizei n, GLuint* buffers)
-
-    Convenience function that calls glGenBuffers(\a n, \a buffers).
-
-    For more information, see the OpenGL ES 2.0 documentation for
-    \l{http://www.khronos.org/opengles/sdk/docs/man/glGenBuffers.xml}{glGenBuffers()}.
-*/
-
-/*!
-    \fn void QGLFunctions::glGenerateMipmap(GLenum target)
-
-    Convenience function that calls glGenerateMipmap(\a target).
-
-    For more information, see the OpenGL ES 2.0 documentation for
-    \l{http://www.khronos.org/opengles/sdk/docs/man/glGenerateMipmap.xml}{glGenerateMipmap()}.
-*/
-
-/*!
-    \fn void QGLFunctions::glGenFramebuffers(GLsizei n, GLuint* framebuffers)
-
-    Convenience function that calls glGenFramebuffers(\a n, \a framebuffers).
-
-    For more information, see the OpenGL ES 2.0 documentation for
-    \l{http://www.khronos.org/opengles/sdk/docs/man/glGenFramebuffers.xml}{glGenFramebuffers()}.
-*/
-
-/*!
-    \fn void QGLFunctions::glGenRenderbuffers(GLsizei n, GLuint* renderbuffers)
-
-    Convenience function that calls glGenRenderbuffers(\a n, \a renderbuffers).
-
-    For more information, see the OpenGL ES 2.0 documentation for
-    \l{http://www.khronos.org/opengles/sdk/docs/man/glGenRenderbuffers.xml}{glGenRenderbuffers()}.
-*/
-
-/*!
-    \fn void QGLFunctions::glGetActiveAttrib(GLuint program, GLuint index, GLsizei bufsize, GLsizei* length, GLint* size, GLenum* type, char* name)
-
-    Convenience function that calls glGetActiveAttrib(\a program, \a index, \a bufsize, \a length, \a size, \a type, \a name).
-
-    For more information, see the OpenGL ES 2.0 documentation for
-    \l{http://www.khronos.org/opengles/sdk/docs/man/glGetActiveAttrib.xml}{glGetActiveAttrib()}.
-
-    This convenience function will do nothing on OpenGL ES 1.x systems.
-*/
-
-/*!
-    \fn void QGLFunctions::glGetActiveUniform(GLuint program, GLuint index, GLsizei bufsize, GLsizei* length, GLint* size, GLenum* type, char* name)
-
-    Convenience function that calls glGetActiveUniform(\a program, \a index, \a bufsize, \a length, \a size, \a type, \a name).
-
-    For more information, see the OpenGL ES 2.0 documentation for
-    \l{http://www.khronos.org/opengles/sdk/docs/man/glGetActiveUniform.xml}{glGetActiveUniform()}.
-
-    This convenience function will do nothing on OpenGL ES 1.x systems.
-*/
-
-/*!
-    \fn void QGLFunctions::glGetAttachedShaders(GLuint program, GLsizei maxcount, GLsizei* count, GLuint* shaders)
-
-    Convenience function that calls glGetAttachedShaders(\a program, \a maxcount, \a count, \a shaders).
-
-    For more information, see the OpenGL ES 2.0 documentation for
-    \l{http://www.khronos.org/opengles/sdk/docs/man/glGetAttachedShaders.xml}{glGetAttachedShaders()}.
-
-    This convenience function will do nothing on OpenGL ES 1.x systems.
-*/
-
-/*!
-    \fn int QGLFunctions::glGetAttribLocation(GLuint program, const char* name)
-
-    Convenience function that calls glGetAttribLocation(\a program, \a name).
-
-    For more information, see the OpenGL ES 2.0 documentation for
-    \l{http://www.khronos.org/opengles/sdk/docs/man/glGetAttribLocation.xml}{glGetAttribLocation()}.
-
-    This convenience function will do nothing on OpenGL ES 1.x systems.
-*/
-
-/*!
-    \fn void QGLFunctions::glGetBufferParameteriv(GLenum target, GLenum pname, GLint* params)
-
-    Convenience function that calls glGetBufferParameteriv(\a target, \a pname, \a params).
-
-    For more information, see the OpenGL ES 2.0 documentation for
-    \l{http://www.khronos.org/opengles/sdk/docs/man/glGetBufferParameteriv.xml}{glGetBufferParameteriv()}.
-*/
-
-/*!
-    \fn void QGLFunctions::glGetFramebufferAttachmentParameteriv(GLenum target, GLenum attachment, GLenum pname, GLint* params)
-
-    Convenience function that calls glGetFramebufferAttachmentParameteriv(\a target, \a attachment, \a pname, \a params).
-
-    For more information, see the OpenGL ES 2.0 documentation for
-    \l{http://www.khronos.org/opengles/sdk/docs/man/glGetFramebufferAttachmentParameteriv.xml}{glGetFramebufferAttachmentParameteriv()}.
-*/
-
-/*!
-    \fn void QGLFunctions::glGetProgramiv(GLuint program, GLenum pname, GLint* params)
-
-    Convenience function that calls glGetProgramiv(\a program, \a pname, \a params).
-
-    For more information, see the OpenGL ES 2.0 documentation for
-    \l{http://www.khronos.org/opengles/sdk/docs/man/glGetProgramiv.xml}{glGetProgramiv()}.
-
-    This convenience function will do nothing on OpenGL ES 1.x systems.
-*/
-
-/*!
-    \fn void QGLFunctions::glGetProgramInfoLog(GLuint program, GLsizei bufsize, GLsizei* length, char* infolog)
-
-    Convenience function that calls glGetProgramInfoLog(\a program, \a bufsize, \a length, \a infolog).
-
-    For more information, see the OpenGL ES 2.0 documentation for
-    \l{http://www.khronos.org/opengles/sdk/docs/man/glGetProgramInfoLog.xml}{glGetProgramInfoLog()}.
-
-    This convenience function will do nothing on OpenGL ES 1.x systems.
-*/
-
-/*!
-    \fn void QGLFunctions::glGetRenderbufferParameteriv(GLenum target, GLenum pname, GLint* params)
-
-    Convenience function that calls glGetRenderbufferParameteriv(\a target, \a pname, \a params).
-
-    For more information, see the OpenGL ES 2.0 documentation for
-    \l{http://www.khronos.org/opengles/sdk/docs/man/glGetRenderbufferParameteriv.xml}{glGetRenderbufferParameteriv()}.
-*/
-
-/*!
-    \fn void QGLFunctions::glGetShaderiv(GLuint shader, GLenum pname, GLint* params)
-
-    Convenience function that calls glGetShaderiv(\a shader, \a pname, \a params).
-
-    For more information, see the OpenGL ES 2.0 documentation for
-    \l{http://www.khronos.org/opengles/sdk/docs/man/glGetShaderiv.xml}{glGetShaderiv()}.
-
-    This convenience function will do nothing on OpenGL ES 1.x systems.
-*/
-
-/*!
-    \fn void QGLFunctions::glGetShaderInfoLog(GLuint shader, GLsizei bufsize, GLsizei* length, char* infolog)
-
-    Convenience function that calls glGetShaderInfoLog(\a shader, \a bufsize, \a length, \a infolog).
-
-    For more information, see the OpenGL ES 2.0 documentation for
-    \l{http://www.khronos.org/opengles/sdk/docs/man/glGetShaderInfoLog.xml}{glGetShaderInfoLog()}.
-
-    This convenience function will do nothing on OpenGL ES 1.x systems.
-*/
-
-/*!
-    \fn void QGLFunctions::glGetShaderPrecisionFormat(GLenum shadertype, GLenum precisiontype, GLint* range, GLint* precision)
-
-    Convenience function that calls glGetShaderPrecisionFormat(\a shadertype, \a precisiontype, \a range, \a precision).
-
-    For more information, see the OpenGL ES 2.0 documentation for
-    \l{http://www.khronos.org/opengles/sdk/docs/man/glGetShaderPrecisionFormat.xml}{glGetShaderPrecisionFormat()}.
-
-    This convenience function will do nothing on OpenGL ES 1.x systems.
-*/
-
-/*!
-    \fn void QGLFunctions::glGetShaderSource(GLuint shader, GLsizei bufsize, GLsizei* length, char* source)
-
-    Convenience function that calls glGetShaderSource(\a shader, \a bufsize, \a length, \a source).
-
-    For more information, see the OpenGL ES 2.0 documentation for
-    \l{http://www.khronos.org/opengles/sdk/docs/man/glGetShaderSource.xml}{glGetShaderSource()}.
-
-    This convenience function will do nothing on OpenGL ES 1.x systems.
-*/
-
-/*!
-    \fn void QGLFunctions::glGetUniformfv(GLuint program, GLint location, GLfloat* params)
-
-    Convenience function that calls glGetUniformfv(\a program, \a location, \a params).
-
-    For more information, see the OpenGL ES 2.0 documentation for
-    \l{http://www.khronos.org/opengles/sdk/docs/man/glGetUniformfv.xml}{glGetUniformfv()}.
-
-    This convenience function will do nothing on OpenGL ES 1.x systems.
-*/
-
-/*!
-    \fn void QGLFunctions::glGetUniformiv(GLuint program, GLint location, GLint* params)
-
-    Convenience function that calls glGetUniformiv(\a program, \a location, \a params).
-
-    For more information, see the OpenGL ES 2.0 documentation for
-    \l{http://www.khronos.org/opengles/sdk/docs/man/glGetUniformiv.xml}{glGetUniformiv()}.
-
-    This convenience function will do nothing on OpenGL ES 1.x systems.
-*/
-
-/*!
-    \fn int QGLFunctions::glGetUniformLocation(GLuint program, const char* name)
-
-    Convenience function that calls glGetUniformLocation(\a program, \a name).
-
-    For more information, see the OpenGL ES 2.0 documentation for
-    \l{http://www.khronos.org/opengles/sdk/docs/man/glGetUniformLocation.xml}{glGetUniformLocation()}.
-
-    This convenience function will do nothing on OpenGL ES 1.x systems.
-*/
-
-/*!
-    \fn void QGLFunctions::glGetVertexAttribfv(GLuint index, GLenum pname, GLfloat* params)
-
-    Convenience function that calls glGetVertexAttribfv(\a index, \a pname, \a params).
-
-    For more information, see the OpenGL ES 2.0 documentation for
-    \l{http://www.khronos.org/opengles/sdk/docs/man/glGetVertexAttribfv.xml}{glGetVertexAttribfv()}.
-
-    This convenience function will do nothing on OpenGL ES 1.x systems.
-*/
-
-/*!
-    \fn void QGLFunctions::glGetVertexAttribiv(GLuint index, GLenum pname, GLint* params)
-
-    Convenience function that calls glGetVertexAttribiv(\a index, \a pname, \a params).
-
-    For more information, see the OpenGL ES 2.0 documentation for
-    \l{http://www.khronos.org/opengles/sdk/docs/man/glGetVertexAttribiv.xml}{glGetVertexAttribiv()}.
-
-    This convenience function will do nothing on OpenGL ES 1.x systems.
-*/
-
-/*!
-    \fn void QGLFunctions::glGetVertexAttribPointerv(GLuint index, GLenum pname, void** pointer)
-
-    Convenience function that calls glGetVertexAttribPointerv(\a index, \a pname, \a pointer).
-
-    For more information, see the OpenGL ES 2.0 documentation for
-    \l{http://www.khronos.org/opengles/sdk/docs/man/glGetVertexAttribPointerv.xml}{glGetVertexAttribPointerv()}.
-
-    This convenience function will do nothing on OpenGL ES 1.x systems.
-*/
-
-/*!
-    \fn GLboolean QGLFunctions::glIsBuffer(GLuint buffer)
-
-    Convenience function that calls glIsBuffer(\a buffer).
-
-    For more information, see the OpenGL ES 2.0 documentation for
-    \l{http://www.khronos.org/opengles/sdk/docs/man/glIsBuffer.xml}{glIsBuffer()}.
-*/
-
-/*!
-    \fn GLboolean QGLFunctions::glIsFramebuffer(GLuint framebuffer)
-
-    Convenience function that calls glIsFramebuffer(\a framebuffer).
-
-    For more information, see the OpenGL ES 2.0 documentation for
-    \l{http://www.khronos.org/opengles/sdk/docs/man/glIsFramebuffer.xml}{glIsFramebuffer()}.
-*/
-
-/*!
-    \fn GLboolean QGLFunctions::glIsProgram(GLuint program)
-
-    Convenience function that calls glIsProgram(\a program).
-
-    For more information, see the OpenGL ES 2.0 documentation for
-    \l{http://www.khronos.org/opengles/sdk/docs/man/glIsProgram.xml}{glIsProgram()}.
-
-    This convenience function will do nothing on OpenGL ES 1.x systems.
-*/
-
-/*!
-    \fn GLboolean QGLFunctions::glIsRenderbuffer(GLuint renderbuffer)
-
-    Convenience function that calls glIsRenderbuffer(\a renderbuffer).
-
-    For more information, see the OpenGL ES 2.0 documentation for
-    \l{http://www.khronos.org/opengles/sdk/docs/man/glIsRenderbuffer.xml}{glIsRenderbuffer()}.
-*/
-
-/*!
-    \fn GLboolean QGLFunctions::glIsShader(GLuint shader)
-
-    Convenience function that calls glIsShader(\a shader).
-
-    For more information, see the OpenGL ES 2.0 documentation for
-    \l{http://www.khronos.org/opengles/sdk/docs/man/glIsShader.xml}{glIsShader()}.
-
-    This convenience function will do nothing on OpenGL ES 1.x systems.
-*/
-
-/*!
-    \fn void QGLFunctions::glLinkProgram(GLuint program)
-
-    Convenience function that calls glLinkProgram(\a program).
-
-    For more information, see the OpenGL ES 2.0 documentation for
-    \l{http://www.khronos.org/opengles/sdk/docs/man/glLinkProgram.xml}{glLinkProgram()}.
-
-    This convenience function will do nothing on OpenGL ES 1.x systems.
-*/
-
-/*!
-    \fn void QGLFunctions::glReleaseShaderCompiler()
-
-    Convenience function that calls glReleaseShaderCompiler().
-
-    For more information, see the OpenGL ES 2.0 documentation for
-    \l{http://www.khronos.org/opengles/sdk/docs/man/glReleaseShaderCompiler.xml}{glReleaseShaderCompiler()}.
-
-    This convenience function will do nothing on OpenGL ES 1.x systems.
-*/
-
-/*!
-    \fn void QGLFunctions::glRenderbufferStorage(GLenum target, GLenum internalformat, GLsizei width, GLsizei height)
-
-    Convenience function that calls glRenderbufferStorage(\a target, \a internalformat, \a width, \a height).
-
-    For more information, see the OpenGL ES 2.0 documentation for
-    \l{http://www.khronos.org/opengles/sdk/docs/man/glRenderbufferStorage.xml}{glRenderbufferStorage()}.
-*/
-
-/*!
-    \fn void QGLFunctions::glSampleCoverage(GLclampf value, GLboolean invert)
-
-    Convenience function that calls glSampleCoverage(\a value, \a invert).
-
-    For more information, see the OpenGL ES 2.0 documentation for
-    \l{http://www.khronos.org/opengles/sdk/docs/man/glSampleCoverage.xml}{glSampleCoverage()}.
-*/
-
-/*!
-    \fn void QGLFunctions::glShaderBinary(GLint n, const GLuint* shaders, GLenum binaryformat, const void* binary, GLint length)
-
-    Convenience function that calls glShaderBinary(\a n, \a shaders, \a binaryformat, \a binary, \a length).
-
-    For more information, see the OpenGL ES 2.0 documentation for
-    \l{http://www.khronos.org/opengles/sdk/docs/man/glShaderBinary.xml}{glShaderBinary()}.
-
-    This convenience function will do nothing on OpenGL ES 1.x systems.
-*/
-
-/*!
-    \fn void QGLFunctions::glShaderSource(GLuint shader, GLsizei count, const char** string, const GLint* length)
-
-    Convenience function that calls glShaderSource(\a shader, \a count, \a string, \a length).
-
-    For more information, see the OpenGL ES 2.0 documentation for
-    \l{http://www.khronos.org/opengles/sdk/docs/man/glShaderSource.xml}{glShaderSource()}.
-
-    This convenience function will do nothing on OpenGL ES 1.x systems.
-*/
-
-/*!
-    \fn void QGLFunctions::glStencilFuncSeparate(GLenum face, GLenum func, GLint ref, GLuint mask)
-
-    Convenience function that calls glStencilFuncSeparate(\a face, \a func, \a ref, \a mask).
-
-    For more information, see the OpenGL ES 2.0 documentation for
-    \l{http://www.khronos.org/opengles/sdk/docs/man/glStencilFuncSeparate.xml}{glStencilFuncSeparate()}.
-*/
-
-/*!
-    \fn void QGLFunctions::glStencilMaskSeparate(GLenum face, GLuint mask)
-
-    Convenience function that calls glStencilMaskSeparate(\a face, \a mask).
-
-    For more information, see the OpenGL ES 2.0 documentation for
-    \l{http://www.khronos.org/opengles/sdk/docs/man/glStencilMaskSeparate.xml}{glStencilMaskSeparate()}.
-*/
-
-/*!
-    \fn void QGLFunctions::glStencilOpSeparate(GLenum face, GLenum fail, GLenum zfail, GLenum zpass)
-
-    Convenience function that calls glStencilOpSeparate(\a face, \a fail, \a zfail, \a zpass).
-
-    For more information, see the OpenGL ES 2.0 documentation for
-    \l{http://www.khronos.org/opengles/sdk/docs/man/glStencilOpSeparate.xml}{glStencilOpSeparate()}.
-*/
-
-/*!
-    \fn void QGLFunctions::glUniform1f(GLint location, GLfloat x)
-
-    Convenience function that calls glUniform1f(\a location, \a x).
-
-    For more information, see the OpenGL ES 2.0 documentation for
-    \l{http://www.khronos.org/opengles/sdk/docs/man/glUniform1f.xml}{glUniform1f()}.
-
-    This convenience function will do nothing on OpenGL ES 1.x systems.
-*/
-
-/*!
-    \fn void QGLFunctions::glUniform1fv(GLint location, GLsizei count, const GLfloat* v)
-
-    Convenience function that calls glUniform1fv(\a location, \a count, \a v).
-
-    For more information, see the OpenGL ES 2.0 documentation for
-    \l{http://www.khronos.org/opengles/sdk/docs/man/glUniform1fv.xml}{glUniform1fv()}.
-
-    This convenience function will do nothing on OpenGL ES 1.x systems.
-*/
-
-/*!
-    \fn void QGLFunctions::glUniform1i(GLint location, GLint x)
-
-    Convenience function that calls glUniform1i(\a location, \a x).
-
-    For more information, see the OpenGL ES 2.0 documentation for
-    \l{http://www.khronos.org/opengles/sdk/docs/man/glUniform1i.xml}{glUniform1i()}.
-
-    This convenience function will do nothing on OpenGL ES 1.x systems.
-*/
-
-/*!
-    \fn void QGLFunctions::glUniform1iv(GLint location, GLsizei count, const GLint* v)
-
-    Convenience function that calls glUniform1iv(\a location, \a count, \a v).
-
-    For more information, see the OpenGL ES 2.0 documentation for
-    \l{http://www.khronos.org/opengles/sdk/docs/man/glUniform1iv.xml}{glUniform1iv()}.
-
-    This convenience function will do nothing on OpenGL ES 1.x systems.
-*/
-
-/*!
-    \fn void QGLFunctions::glUniform2f(GLint location, GLfloat x, GLfloat y)
-
-    Convenience function that calls glUniform2f(\a location, \a x, \a y).
-
-    For more information, see the OpenGL ES 2.0 documentation for
-    \l{http://www.khronos.org/opengles/sdk/docs/man/glUniform2f.xml}{glUniform2f()}.
-
-    This convenience function will do nothing on OpenGL ES 1.x systems.
-*/
-
-/*!
-    \fn void QGLFunctions::glUniform2fv(GLint location, GLsizei count, const GLfloat* v)
-
-    Convenience function that calls glUniform2fv(\a location, \a count, \a v).
-
-    For more information, see the OpenGL ES 2.0 documentation for
-    \l{http://www.khronos.org/opengles/sdk/docs/man/glUniform2fv.xml}{glUniform2fv()}.
-
-    This convenience function will do nothing on OpenGL ES 1.x systems.
-*/
-
-/*!
-    \fn void QGLFunctions::glUniform2i(GLint location, GLint x, GLint y)
-
-    Convenience function that calls glUniform2i(\a location, \a x, \a y).
-
-    For more information, see the OpenGL ES 2.0 documentation for
-    \l{http://www.khronos.org/opengles/sdk/docs/man/glUniform2i.xml}{glUniform2i()}.
-
-    This convenience function will do nothing on OpenGL ES 1.x systems.
-*/
-
-/*!
-    \fn void QGLFunctions::glUniform2iv(GLint location, GLsizei count, const GLint* v)
-
-    Convenience function that calls glUniform2iv(\a location, \a count, \a v).
-
-    For more information, see the OpenGL ES 2.0 documentation for
-    \l{http://www.khronos.org/opengles/sdk/docs/man/glUniform2iv.xml}{glUniform2iv()}.
-
-    This convenience function will do nothing on OpenGL ES 1.x systems.
-*/
-
-/*!
-    \fn void QGLFunctions::glUniform3f(GLint location, GLfloat x, GLfloat y, GLfloat z)
-
-    Convenience function that calls glUniform3f(\a location, \a x, \a y, \a z).
-
-    For more information, see the OpenGL ES 2.0 documentation for
-    \l{http://www.khronos.org/opengles/sdk/docs/man/glUniform3f.xml}{glUniform3f()}.
-
-    This convenience function will do nothing on OpenGL ES 1.x systems.
-*/
-
-/*!
-    \fn void QGLFunctions::glUniform3fv(GLint location, GLsizei count, const GLfloat* v)
-
-    Convenience function that calls glUniform3fv(\a location, \a count, \a v).
-
-    For more information, see the OpenGL ES 2.0 documentation for
-    \l{http://www.khronos.org/opengles/sdk/docs/man/glUniform3fv.xml}{glUniform3fv()}.
-
-    This convenience function will do nothing on OpenGL ES 1.x systems.
-*/
-
-/*!
-    \fn void QGLFunctions::glUniform3i(GLint location, GLint x, GLint y, GLint z)
-
-    Convenience function that calls glUniform3i(\a location, \a x, \a y, \a z).
-
-    For more information, see the OpenGL ES 2.0 documentation for
-    \l{http://www.khronos.org/opengles/sdk/docs/man/glUniform3i.xml}{glUniform3i()}.
-
-    This convenience function will do nothing on OpenGL ES 1.x systems.
-*/
-
-/*!
-    \fn void QGLFunctions::glUniform3iv(GLint location, GLsizei count, const GLint* v)
-
-    Convenience function that calls glUniform3iv(\a location, \a count, \a v).
-
-    For more information, see the OpenGL ES 2.0 documentation for
-    \l{http://www.khronos.org/opengles/sdk/docs/man/glUniform3iv.xml}{glUniform3iv()}.
-
-    This convenience function will do nothing on OpenGL ES 1.x systems.
-*/
-
-/*!
-    \fn void QGLFunctions::glUniform4f(GLint location, GLfloat x, GLfloat y, GLfloat z, GLfloat w)
-
-    Convenience function that calls glUniform4f(\a location, \a x, \a y, \a z, \a w).
-
-    For more information, see the OpenGL ES 2.0 documentation for
-    \l{http://www.khronos.org/opengles/sdk/docs/man/glUniform4f.xml}{glUniform4f()}.
-
-    This convenience function will do nothing on OpenGL ES 1.x systems.
-*/
-
-/*!
-    \fn void QGLFunctions::glUniform4fv(GLint location, GLsizei count, const GLfloat* v)
-
-    Convenience function that calls glUniform4fv(\a location, \a count, \a v).
-
-    For more information, see the OpenGL ES 2.0 documentation for
-    \l{http://www.khronos.org/opengles/sdk/docs/man/glUniform4fv.xml}{glUniform4fv()}.
-
-    This convenience function will do nothing on OpenGL ES 1.x systems.
-*/
-
-/*!
-    \fn void QGLFunctions::glUniform4i(GLint location, GLint x, GLint y, GLint z, GLint w)
-
-    Convenience function that calls glUniform4i(\a location, \a x, \a y, \a z, \a w).
-
-    For more information, see the OpenGL ES 2.0 documentation for
-    \l{http://www.khronos.org/opengles/sdk/docs/man/glUniform4i.xml}{glUniform4i()}.
-
-    This convenience function will do nothing on OpenGL ES 1.x systems.
-*/
-
-/*!
-    \fn void QGLFunctions::glUniform4iv(GLint location, GLsizei count, const GLint* v)
-
-    Convenience function that calls glUniform4iv(\a location, \a count, \a v).
-
-    For more information, see the OpenGL ES 2.0 documentation for
-    \l{http://www.khronos.org/opengles/sdk/docs/man/glUniform4iv.xml}{glUniform4iv()}.
-
-    This convenience function will do nothing on OpenGL ES 1.x systems.
-*/
-
-/*!
-    \fn void QGLFunctions::glUniformMatrix2fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat* value)
-
-    Convenience function that calls glUniformMatrix2fv(\a location, \a count, \a transpose, \a value).
-
-    For more information, see the OpenGL ES 2.0 documentation for
-    \l{http://www.khronos.org/opengles/sdk/docs/man/glUniformMatrix2fv.xml}{glUniformMatrix2fv()}.
-
-    This convenience function will do nothing on OpenGL ES 1.x systems.
-*/
-
-/*!
-    \fn void QGLFunctions::glUniformMatrix3fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat* value)
-
-    Convenience function that calls glUniformMatrix3fv(\a location, \a count, \a transpose, \a value).
-
-    For more information, see the OpenGL ES 2.0 documentation for
-    \l{http://www.khronos.org/opengles/sdk/docs/man/glUniformMatrix3fv.xml}{glUniformMatrix3fv()}.
-
-    This convenience function will do nothing on OpenGL ES 1.x systems.
-*/
-
-/*!
-    \fn void QGLFunctions::glUniformMatrix4fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat* value)
-
-    Convenience function that calls glUniformMatrix4fv(\a location, \a count, \a transpose, \a value).
-
-    For more information, see the OpenGL ES 2.0 documentation for
-    \l{http://www.khronos.org/opengles/sdk/docs/man/glUniformMatrix4fv.xml}{glUniformMatrix4fv()}.
-
-    This convenience function will do nothing on OpenGL ES 1.x systems.
-*/
-
-/*!
-    \fn void QGLFunctions::glUseProgram(GLuint program)
-
-    Convenience function that calls glUseProgram(\a program).
-
-    For more information, see the OpenGL ES 2.0 documentation for
-    \l{http://www.khronos.org/opengles/sdk/docs/man/glUseProgram.xml}{glUseProgram()}.
-
-    This convenience function will do nothing on OpenGL ES 1.x systems.
-*/
-
-/*!
-    \fn void QGLFunctions::glValidateProgram(GLuint program)
-
-    Convenience function that calls glValidateProgram(\a program).
-
-    For more information, see the OpenGL ES 2.0 documentation for
-    \l{http://www.khronos.org/opengles/sdk/docs/man/glValidateProgram.xml}{glValidateProgram()}.
-
-    This convenience function will do nothing on OpenGL ES 1.x systems.
-*/
-
-/*!
-    \fn void QGLFunctions::glVertexAttrib1f(GLuint indx, GLfloat x)
-
-    Convenience function that calls glVertexAttrib1f(\a indx, \a x).
-
-    For more information, see the OpenGL ES 2.0 documentation for
-    \l{http://www.khronos.org/opengles/sdk/docs/man/glVertexAttrib1f.xml}{glVertexAttrib1f()}.
-
-    This convenience function will do nothing on OpenGL ES 1.x systems.
-*/
-
-/*!
-    \fn void QGLFunctions::glVertexAttrib1fv(GLuint indx, const GLfloat* values)
-
-    Convenience function that calls glVertexAttrib1fv(\a indx, \a values).
-
-    For more information, see the OpenGL ES 2.0 documentation for
-    \l{http://www.khronos.org/opengles/sdk/docs/man/glVertexAttrib1fv.xml}{glVertexAttrib1fv()}.
-
-    This convenience function will do nothing on OpenGL ES 1.x systems.
-*/
-
-/*!
-    \fn void QGLFunctions::glVertexAttrib2f(GLuint indx, GLfloat x, GLfloat y)
-
-    Convenience function that calls glVertexAttrib2f(\a indx, \a x, \a y).
-
-    For more information, see the OpenGL ES 2.0 documentation for
-    \l{http://www.khronos.org/opengles/sdk/docs/man/glVertexAttrib2f.xml}{glVertexAttrib2f()}.
-
-    This convenience function will do nothing on OpenGL ES 1.x systems.
-*/
-
-/*!
-    \fn void QGLFunctions::glVertexAttrib2fv(GLuint indx, const GLfloat* values)
-
-    Convenience function that calls glVertexAttrib2fv(\a indx, \a values).
-
-    For more information, see the OpenGL ES 2.0 documentation for
-    \l{http://www.khronos.org/opengles/sdk/docs/man/glVertexAttrib2fv.xml}{glVertexAttrib2fv()}.
-
-    This convenience function will do nothing on OpenGL ES 1.x systems.
-*/
-
-/*!
-    \fn void QGLFunctions::glVertexAttrib3f(GLuint indx, GLfloat x, GLfloat y, GLfloat z)
-
-    Convenience function that calls glVertexAttrib3f(\a indx, \a x, \a y, \a z).
-
-    For more information, see the OpenGL ES 2.0 documentation for
-    \l{http://www.khronos.org/opengles/sdk/docs/man/glVertexAttrib3f.xml}{glVertexAttrib3f()}.
-
-    This convenience function will do nothing on OpenGL ES 1.x systems.
-*/
-
-/*!
-    \fn void QGLFunctions::glVertexAttrib3fv(GLuint indx, const GLfloat* values)
-
-    Convenience function that calls glVertexAttrib3fv(\a indx, \a values).
-
-    For more information, see the OpenGL ES 2.0 documentation for
-    \l{http://www.khronos.org/opengles/sdk/docs/man/glVertexAttrib3fv.xml}{glVertexAttrib3fv()}.
-
-    This convenience function will do nothing on OpenGL ES 1.x systems.
-*/
-
-/*!
-    \fn void QGLFunctions::glVertexAttrib4f(GLuint indx, GLfloat x, GLfloat y, GLfloat z, GLfloat w)
-
-    Convenience function that calls glVertexAttrib4f(\a indx, \a x, \a y, \a z, \a w).
-
-    For more information, see the OpenGL ES 2.0 documentation for
-    \l{http://www.khronos.org/opengles/sdk/docs/man/glVertexAttrib4f.xml}{glVertexAttrib4f()}.
-
-    This convenience function will do nothing on OpenGL ES 1.x systems.
-*/
-
-/*!
-    \fn void QGLFunctions::glVertexAttrib4fv(GLuint indx, const GLfloat* values)
-
-    Convenience function that calls glVertexAttrib4fv(\a indx, \a values).
-
-    For more information, see the OpenGL ES 2.0 documentation for
-    \l{http://www.khronos.org/opengles/sdk/docs/man/glVertexAttrib4fv.xml}{glVertexAttrib4fv()}.
-
-    This convenience function will do nothing on OpenGL ES 1.x systems.
-*/
-
-/*!
-    \fn void QGLFunctions::glVertexAttribPointer(GLuint indx, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const void* ptr)
-
-    Convenience function that calls glVertexAttribPointer(\a indx, \a size, \a type, \a normalized, \a stride, \a ptr).
-
-    For more information, see the OpenGL ES 2.0 documentation for
-    \l{http://www.khronos.org/opengles/sdk/docs/man/glVertexAttribPointer.xml}{glVertexAttribPointer()}.
-
-    This convenience function will do nothing on OpenGL ES 1.x systems.
-*/
-
-QGLFunctionsPrivate::QGLFunctionsPrivate(const QGLContext *)
-    : funcs(0)
-{
-}
-
-QT_END_NAMESPACE
diff --git a/src/opengl/qglfunctions.h b/src/opengl/qglfunctions.h
deleted file mode 100644
index d8c5249a1a..0000000000
--- a/src/opengl/qglfunctions.h
+++ /dev/null
@@ -1,1688 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtOpenGL module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QGLFUNCTIONS_H
-#define QGLFUNCTIONS_H
-
-#include <QtOpenGL/qgl.h>
-#include <QtGui/qopenglcontext.h>
-#include <QtGui/qopenglfunctions.h>
-
-QT_BEGIN_NAMESPACE
-
-struct QGLFunctionsPrivate;
-
-class Q_OPENGL_EXPORT QGLFunctions
-{
-public:
-    QGLFunctions();
-    explicit QGLFunctions(const QGLContext *context);
-    ~QGLFunctions() {}
-
-    enum OpenGLFeature
-    {
-        Multitexture          = 0x0001,
-        Shaders               = 0x0002,
-        Buffers               = 0x0004,
-        Framebuffers          = 0x0008,
-        BlendColor            = 0x0010,
-        BlendEquation         = 0x0020,
-        BlendEquationSeparate = 0x0040,
-        BlendFuncSeparate     = 0x0080,
-        BlendSubtract         = 0x0100,
-        CompressedTextures    = 0x0200,
-        Multisample           = 0x0400,
-        StencilSeparate       = 0x0800,
-        NPOTTextures          = 0x1000
-    };
-    Q_DECLARE_FLAGS(OpenGLFeatures, OpenGLFeature)
-
-    QGLFunctions::OpenGLFeatures openGLFeatures() const;
-    bool hasOpenGLFeature(QGLFunctions::OpenGLFeature feature) const;
-
-    void initializeGLFunctions(const QGLContext *context = nullptr);
-
-    void glActiveTexture(GLenum texture);
-    void glAttachShader(GLuint program, GLuint shader);
-    void glBindAttribLocation(GLuint program, GLuint index, const char* name);
-    void glBindBuffer(GLenum target, GLuint buffer);
-    void glBindFramebuffer(GLenum target, GLuint framebuffer);
-    void glBindRenderbuffer(GLenum target, GLuint renderbuffer);
-    void glBlendColor(GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha);
-    void glBlendEquation(GLenum mode);
-    void glBlendEquationSeparate(GLenum modeRGB, GLenum modeAlpha);
-    void glBlendFuncSeparate(GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha);
-    void glBufferData(GLenum target, qopengl_GLsizeiptr size, const void* data, GLenum usage);
-    void glBufferSubData(GLenum target, qopengl_GLintptr offset, qopengl_GLsizeiptr size, const void* data);
-    GLenum glCheckFramebufferStatus(GLenum target);
-    void glClearDepthf(GLclampf depth);
-    void glCompileShader(GLuint shader);
-    void glCompressedTexImage2D(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const void* data);
-    void glCompressedTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const void* data);
-    GLuint glCreateProgram();
-    GLuint glCreateShader(GLenum type);
-    void glDeleteBuffers(GLsizei n, const GLuint* buffers);
-    void glDeleteFramebuffers(GLsizei n, const GLuint* framebuffers);
-    void glDeleteProgram(GLuint program);
-    void glDeleteRenderbuffers(GLsizei n, const GLuint* renderbuffers);
-    void glDeleteShader(GLuint shader);
-    void glDepthRangef(GLclampf zNear, GLclampf zFar);
-    void glDetachShader(GLuint program, GLuint shader);
-    void glDisableVertexAttribArray(GLuint index);
-    void glEnableVertexAttribArray(GLuint index);
-    void glFramebufferRenderbuffer(GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer);
-    void glFramebufferTexture2D(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
-    void glGenBuffers(GLsizei n, GLuint* buffers);
-    void glGenerateMipmap(GLenum target);
-    void glGenFramebuffers(GLsizei n, GLuint* framebuffers);
-    void glGenRenderbuffers(GLsizei n, GLuint* renderbuffers);
-    void glGetActiveAttrib(GLuint program, GLuint index, GLsizei bufsize, GLsizei* length, GLint* size, GLenum* type, char* name);
-    void glGetActiveUniform(GLuint program, GLuint index, GLsizei bufsize, GLsizei* length, GLint* size, GLenum* type, char* name);
-    void glGetAttachedShaders(GLuint program, GLsizei maxcount, GLsizei* count, GLuint* shaders);
-    int glGetAttribLocation(GLuint program, const char* name);
-    void glGetBufferParameteriv(GLenum target, GLenum pname, GLint* params);
-    void glGetFramebufferAttachmentParameteriv(GLenum target, GLenum attachment, GLenum pname, GLint* params);
-    void glGetProgramiv(GLuint program, GLenum pname, GLint* params);
-    void glGetProgramInfoLog(GLuint program, GLsizei bufsize, GLsizei* length, char* infolog);
-    void glGetRenderbufferParameteriv(GLenum target, GLenum pname, GLint* params);
-    void glGetShaderiv(GLuint shader, GLenum pname, GLint* params);
-    void glGetShaderInfoLog(GLuint shader, GLsizei bufsize, GLsizei* length, char* infolog);
-    void glGetShaderPrecisionFormat(GLenum shadertype, GLenum precisiontype, GLint* range, GLint* precision);
-    void glGetShaderSource(GLuint shader, GLsizei bufsize, GLsizei* length, char* source);
-    void glGetUniformfv(GLuint program, GLint location, GLfloat* params);
-    void glGetUniformiv(GLuint program, GLint location, GLint* params);
-    int glGetUniformLocation(GLuint program, const char* name);
-    void glGetVertexAttribfv(GLuint index, GLenum pname, GLfloat* params);
-    void glGetVertexAttribiv(GLuint index, GLenum pname, GLint* params);
-    void glGetVertexAttribPointerv(GLuint index, GLenum pname, void** pointer);
-    GLboolean glIsBuffer(GLuint buffer);
-    GLboolean glIsFramebuffer(GLuint framebuffer);
-    GLboolean glIsProgram(GLuint program);
-    GLboolean glIsRenderbuffer(GLuint renderbuffer);
-    GLboolean glIsShader(GLuint shader);
-    void glLinkProgram(GLuint program);
-    void glReleaseShaderCompiler();
-    void glRenderbufferStorage(GLenum target, GLenum internalformat, GLsizei width, GLsizei height);
-    void glSampleCoverage(GLclampf value, GLboolean invert);
-    void glShaderBinary(GLint n, const GLuint* shaders, GLenum binaryformat, const void* binary, GLint length);
-    void glShaderSource(GLuint shader, GLsizei count, const char** string, const GLint* length);
-    void glStencilFuncSeparate(GLenum face, GLenum func, GLint ref, GLuint mask);
-    void glStencilMaskSeparate(GLenum face, GLuint mask);
-    void glStencilOpSeparate(GLenum face, GLenum fail, GLenum zfail, GLenum zpass);
-    void glUniform1f(GLint location, GLfloat x);
-    void glUniform1fv(GLint location, GLsizei count, const GLfloat* v);
-    void glUniform1i(GLint location, GLint x);
-    void glUniform1iv(GLint location, GLsizei count, const GLint* v);
-    void glUniform2f(GLint location, GLfloat x, GLfloat y);
-    void glUniform2fv(GLint location, GLsizei count, const GLfloat* v);
-    void glUniform2i(GLint location, GLint x, GLint y);
-    void glUniform2iv(GLint location, GLsizei count, const GLint* v);
-    void glUniform3f(GLint location, GLfloat x, GLfloat y, GLfloat z);
-    void glUniform3fv(GLint location, GLsizei count, const GLfloat* v);
-    void glUniform3i(GLint location, GLint x, GLint y, GLint z);
-    void glUniform3iv(GLint location, GLsizei count, const GLint* v);
-    void glUniform4f(GLint location, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-    void glUniform4fv(GLint location, GLsizei count, const GLfloat* v);
-    void glUniform4i(GLint location, GLint x, GLint y, GLint z, GLint w);
-    void glUniform4iv(GLint location, GLsizei count, const GLint* v);
-    void glUniformMatrix2fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat* value);
-    void glUniformMatrix3fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat* value);
-    void glUniformMatrix4fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat* value);
-    void glUseProgram(GLuint program);
-    void glValidateProgram(GLuint program);
-    void glVertexAttrib1f(GLuint indx, GLfloat x);
-    void glVertexAttrib1fv(GLuint indx, const GLfloat* values);
-    void glVertexAttrib2f(GLuint indx, GLfloat x, GLfloat y);
-    void glVertexAttrib2fv(GLuint indx, const GLfloat* values);
-    void glVertexAttrib3f(GLuint indx, GLfloat x, GLfloat y, GLfloat z);
-    void glVertexAttrib3fv(GLuint indx, const GLfloat* values);
-    void glVertexAttrib4f(GLuint indx, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-    void glVertexAttrib4fv(GLuint indx, const GLfloat* values);
-    void glVertexAttribPointer(GLuint indx, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const void* ptr);
-
-private:
-    QGLFunctionsPrivate *d_ptr;
-    static bool isInitialized(const QGLFunctionsPrivate *d) { return d != nullptr; }
-};
-
-Q_DECLARE_OPERATORS_FOR_FLAGS(QGLFunctions::OpenGLFeatures)
-
-struct QGLFunctionsPrivate
-{
-    QGLFunctionsPrivate(const QGLContext *context = nullptr);
-    QOpenGLFunctions *funcs;
-};
-
-inline void QGLFunctions::glActiveTexture(GLenum texture)
-{
-    Q_ASSERT(QGLFunctions::isInitialized(d_ptr));
-    d_ptr->funcs->glActiveTexture(texture);
-}
-
-inline void QGLFunctions::glAttachShader(GLuint program, GLuint shader)
-{
-    Q_ASSERT(QGLFunctions::isInitialized(d_ptr));
-    d_ptr->funcs->glAttachShader(program, shader);
-}
-
-inline void QGLFunctions::glBindAttribLocation(GLuint program, GLuint index, const char* name)
-{
-    Q_ASSERT(QGLFunctions::isInitialized(d_ptr));
-    d_ptr->funcs->glBindAttribLocation(program, index, name);
-}
-
-inline void QGLFunctions::glBindBuffer(GLenum target, GLuint buffer)
-{
-    Q_ASSERT(QGLFunctions::isInitialized(d_ptr));
-    d_ptr->funcs->glBindBuffer(target, buffer);
-}
-
-inline void QGLFunctions::glBindFramebuffer(GLenum target, GLuint framebuffer)
-{
-    if (framebuffer == 0)
-        framebuffer = QOpenGLContext::currentContext()->defaultFramebufferObject();
-    Q_ASSERT(QGLFunctions::isInitialized(d_ptr));
-    d_ptr->funcs->glBindFramebuffer(target, framebuffer);
-}
-
-inline void QGLFunctions::glBindRenderbuffer(GLenum target, GLuint renderbuffer)
-{
-    Q_ASSERT(QGLFunctions::isInitialized(d_ptr));
-    d_ptr->funcs->glBindRenderbuffer(target, renderbuffer);
-}
-
-inline void QGLFunctions::glBlendColor(GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha)
-{
-    Q_ASSERT(QGLFunctions::isInitialized(d_ptr));
-    d_ptr->funcs->glBlendColor(red, green, blue, alpha);
-}
-
-inline void QGLFunctions::glBlendEquation(GLenum mode)
-{
-    Q_ASSERT(QGLFunctions::isInitialized(d_ptr));
-    d_ptr->funcs->glBlendEquation(mode);
-}
-
-inline void QGLFunctions::glBlendEquationSeparate(GLenum modeRGB, GLenum modeAlpha)
-{
-    Q_ASSERT(QGLFunctions::isInitialized(d_ptr));
-    d_ptr->funcs->glBlendEquationSeparate(modeRGB, modeAlpha);
-}
-
-inline void QGLFunctions::glBlendFuncSeparate(GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha)
-{
-    Q_ASSERT(QGLFunctions::isInitialized(d_ptr));
-    d_ptr->funcs->glBlendFuncSeparate(srcRGB, dstRGB, srcAlpha, dstAlpha);
-}
-
-inline void QGLFunctions::glBufferData(GLenum target, qopengl_GLsizeiptr size, const void* data, GLenum usage)
-{
-    Q_ASSERT(QGLFunctions::isInitialized(d_ptr));
-    d_ptr->funcs->glBufferData(target, size, data, usage);
-}
-
-inline void QGLFunctions::glBufferSubData(GLenum target, qopengl_GLintptr offset, qopengl_GLsizeiptr size, const void* data)
-{
-    Q_ASSERT(QGLFunctions::isInitialized(d_ptr));
-    d_ptr->funcs->glBufferSubData(target, offset, size, data);
-}
-
-inline GLenum QGLFunctions::glCheckFramebufferStatus(GLenum target)
-{
-    Q_ASSERT(QGLFunctions::isInitialized(d_ptr));
-    return d_ptr->funcs->glCheckFramebufferStatus(target);
-}
-
-inline void QGLFunctions::glClearDepthf(GLclampf depth)
-{
-    Q_ASSERT(QGLFunctions::isInitialized(d_ptr));
-    return d_ptr->funcs->glClearDepthf(depth);
-}
-
-inline void QGLFunctions::glCompileShader(GLuint shader)
-{
-    Q_ASSERT(QGLFunctions::isInitialized(d_ptr));
-    d_ptr->funcs->glCompileShader(shader);
-}
-
-inline void QGLFunctions::glCompressedTexImage2D(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const void* data)
-{
-    Q_ASSERT(QGLFunctions::isInitialized(d_ptr));
-    d_ptr->funcs->glCompressedTexImage2D(target, level, internalformat, width, height, border, imageSize, data);
-}
-
-inline void QGLFunctions::glCompressedTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const void* data)
-{
-    Q_ASSERT(QGLFunctions::isInitialized(d_ptr));
-    d_ptr->funcs->glCompressedTexSubImage2D(target, level, xoffset, yoffset, width, height, format, imageSize, data);
-}
-
-inline GLuint QGLFunctions::glCreateProgram()
-{
-    Q_ASSERT(QGLFunctions::isInitialized(d_ptr));
-    return d_ptr->funcs->glCreateProgram();
-}
-
-inline GLuint QGLFunctions::glCreateShader(GLenum type)
-{
-    Q_ASSERT(QGLFunctions::isInitialized(d_ptr));
-    return d_ptr->funcs->glCreateShader(type);
-}
-
-inline void QGLFunctions::glDeleteBuffers(GLsizei n, const GLuint* buffers)
-{
-    Q_ASSERT(QGLFunctions::isInitialized(d_ptr));
-    d_ptr->funcs->glDeleteBuffers(n, buffers);
-}
-
-inline void QGLFunctions::glDeleteFramebuffers(GLsizei n, const GLuint* framebuffers)
-{
-    Q_ASSERT(QGLFunctions::isInitialized(d_ptr));
-    d_ptr->funcs->glDeleteFramebuffers(n, framebuffers);
-}
-
-inline void QGLFunctions::glDeleteProgram(GLuint program)
-{
-    Q_ASSERT(QGLFunctions::isInitialized(d_ptr));
-    d_ptr->funcs->glDeleteProgram(program);
-}
-
-inline void QGLFunctions::glDeleteRenderbuffers(GLsizei n, const GLuint* renderbuffers)
-{
-    Q_ASSERT(QGLFunctions::isInitialized(d_ptr));
-    d_ptr->funcs->glDeleteRenderbuffers(n, renderbuffers);
-}
-
-inline void QGLFunctions::glDeleteShader(GLuint shader)
-{
-    Q_ASSERT(QGLFunctions::isInitialized(d_ptr));
-    d_ptr->funcs->glDeleteShader(shader);
-}
-
-inline void QGLFunctions::glDepthRangef(GLclampf zNear, GLclampf zFar)
-{
-    Q_ASSERT(QGLFunctions::isInitialized(d_ptr));
-    return d_ptr->funcs->glDepthRangef(zNear, zFar);
-}
-
-inline void QGLFunctions::glDetachShader(GLuint program, GLuint shader)
-{
-    Q_ASSERT(QGLFunctions::isInitialized(d_ptr));
-    d_ptr->funcs->glDetachShader(program, shader);
-}
-
-inline void QGLFunctions::glDisableVertexAttribArray(GLuint index)
-{
-    Q_ASSERT(QGLFunctions::isInitialized(d_ptr));
-    d_ptr->funcs->glDisableVertexAttribArray(index);
-}
-
-inline void QGLFunctions::glEnableVertexAttribArray(GLuint index)
-{
-    Q_ASSERT(QGLFunctions::isInitialized(d_ptr));
-    d_ptr->funcs->glEnableVertexAttribArray(index);
-}
-
-inline void QGLFunctions::glFramebufferRenderbuffer(GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer)
-{
-    Q_ASSERT(QGLFunctions::isInitialized(d_ptr));
-    d_ptr->funcs->glFramebufferRenderbuffer(target, attachment, renderbuffertarget, renderbuffer);
-}
-
-inline void QGLFunctions::glFramebufferTexture2D(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level)
-{
-    Q_ASSERT(QGLFunctions::isInitialized(d_ptr));
-    d_ptr->funcs->glFramebufferTexture2D(target, attachment, textarget, texture, level);
-}
-
-inline void QGLFunctions::glGenBuffers(GLsizei n, GLuint* buffers)
-{
-    Q_ASSERT(QGLFunctions::isInitialized(d_ptr));
-    d_ptr->funcs->glGenBuffers(n, buffers);
-}
-
-inline void QGLFunctions::glGenerateMipmap(GLenum target)
-{
-    Q_ASSERT(QGLFunctions::isInitialized(d_ptr));
-    d_ptr->funcs->glGenerateMipmap(target);
-}
-
-inline void QGLFunctions::glGenFramebuffers(GLsizei n, GLuint* framebuffers)
-{
-    Q_ASSERT(QGLFunctions::isInitialized(d_ptr));
-    d_ptr->funcs->glGenFramebuffers(n, framebuffers);
-}
-
-inline void QGLFunctions::glGenRenderbuffers(GLsizei n, GLuint* renderbuffers)
-{
-    Q_ASSERT(QGLFunctions::isInitialized(d_ptr));
-    d_ptr->funcs->glGenRenderbuffers(n, renderbuffers);
-}
-
-inline void QGLFunctions::glGetActiveAttrib(GLuint program, GLuint index, GLsizei bufsize, GLsizei* length, GLint* size, GLenum* type, char* name)
-{
-    Q_ASSERT(QGLFunctions::isInitialized(d_ptr));
-    d_ptr->funcs->glGetActiveAttrib(program, index, bufsize, length, size, type, name);
-}
-
-inline void QGLFunctions::glGetActiveUniform(GLuint program, GLuint index, GLsizei bufsize, GLsizei* length, GLint* size, GLenum* type, char* name)
-{
-    Q_ASSERT(QGLFunctions::isInitialized(d_ptr));
-    d_ptr->funcs->glGetActiveUniform(program, index, bufsize, length, size, type, name);
-}
-
-inline void QGLFunctions::glGetAttachedShaders(GLuint program, GLsizei maxcount, GLsizei* count, GLuint* shaders)
-{
-    Q_ASSERT(QGLFunctions::isInitialized(d_ptr));
-    d_ptr->funcs->glGetAttachedShaders(program, maxcount, count, shaders);
-}
-
-inline int QGLFunctions::glGetAttribLocation(GLuint program, const char* name)
-{
-    Q_ASSERT(QGLFunctions::isInitialized(d_ptr));
-    return d_ptr->funcs->glGetAttribLocation(program, name);
-}
-
-inline void QGLFunctions::glGetBufferParameteriv(GLenum target, GLenum pname, GLint* params)
-{
-    Q_ASSERT(QGLFunctions::isInitialized(d_ptr));
-    d_ptr->funcs->glGetBufferParameteriv(target, pname, params);
-}
-
-inline void QGLFunctions::glGetFramebufferAttachmentParameteriv(GLenum target, GLenum attachment, GLenum pname, GLint* params)
-{
-    Q_ASSERT(QGLFunctions::isInitialized(d_ptr));
-    d_ptr->funcs->glGetFramebufferAttachmentParameteriv(target, attachment, pname, params);
-}
-
-inline void QGLFunctions::glGetProgramiv(GLuint program, GLenum pname, GLint* params)
-{
-    Q_ASSERT(QGLFunctions::isInitialized(d_ptr));
-    d_ptr->funcs->glGetProgramiv(program, pname, params);
-}
-
-inline void QGLFunctions::glGetProgramInfoLog(GLuint program, GLsizei bufsize, GLsizei* length, char* infolog)
-{
-    Q_ASSERT(QGLFunctions::isInitialized(d_ptr));
-    d_ptr->funcs->glGetProgramInfoLog(program, bufsize, length, infolog);
-}
-
-inline void QGLFunctions::glGetRenderbufferParameteriv(GLenum target, GLenum pname, GLint* params)
-{
-    Q_ASSERT(QGLFunctions::isInitialized(d_ptr));
-    d_ptr->funcs->glGetRenderbufferParameteriv(target, pname, params);
-}
-
-inline void QGLFunctions::glGetShaderiv(GLuint shader, GLenum pname, GLint* params)
-{
-    Q_ASSERT(QGLFunctions::isInitialized(d_ptr));
-    d_ptr->funcs->glGetShaderiv(shader, pname, params);
-}
-
-inline void QGLFunctions::glGetShaderInfoLog(GLuint shader, GLsizei bufsize, GLsizei* length, char* infolog)
-{
-    Q_ASSERT(QGLFunctions::isInitialized(d_ptr));
-    d_ptr->funcs->glGetShaderInfoLog(shader, bufsize, length, infolog);
-}
-
-inline void QGLFunctions::glGetShaderPrecisionFormat(GLenum shadertype, GLenum precisiontype, GLint* range, GLint* precision)
-{
-    Q_ASSERT(QGLFunctions::isInitialized(d_ptr));
-    d_ptr->funcs->glGetShaderPrecisionFormat(shadertype, precisiontype, range, precision);
-}
-
-inline void QGLFunctions::glGetShaderSource(GLuint shader, GLsizei bufsize, GLsizei* length, char* source)
-{
-    Q_ASSERT(QGLFunctions::isInitialized(d_ptr));
-    d_ptr->funcs->glGetShaderSource(shader, bufsize, length, source);
-}
-
-inline void QGLFunctions::glGetUniformfv(GLuint program, GLint location, GLfloat* params)
-{
-    Q_ASSERT(QGLFunctions::isInitialized(d_ptr));
-    d_ptr->funcs->glGetUniformfv(program, location, params);
-}
-
-inline void QGLFunctions::glGetUniformiv(GLuint program, GLint location, GLint* params)
-{
-    Q_ASSERT(QGLFunctions::isInitialized(d_ptr));
-    d_ptr->funcs->glGetUniformiv(program, location, params);
-}
-
-inline int QGLFunctions::glGetUniformLocation(GLuint program, const char* name)
-{
-    Q_ASSERT(QGLFunctions::isInitialized(d_ptr));
-    return d_ptr->funcs->glGetUniformLocation(program, name);
-}
-
-inline void QGLFunctions::glGetVertexAttribfv(GLuint index, GLenum pname, GLfloat* params)
-{
-    Q_ASSERT(QGLFunctions::isInitialized(d_ptr));
-    d_ptr->funcs->glGetVertexAttribfv(index, pname, params);
-}
-
-inline void QGLFunctions::glGetVertexAttribiv(GLuint index, GLenum pname, GLint* params)
-{
-    Q_ASSERT(QGLFunctions::isInitialized(d_ptr));
-    d_ptr->funcs->glGetVertexAttribiv(index, pname, params);
-}
-
-inline void QGLFunctions::glGetVertexAttribPointerv(GLuint index, GLenum pname, void** pointer)
-{
-    Q_ASSERT(QGLFunctions::isInitialized(d_ptr));
-    d_ptr->funcs->glGetVertexAttribPointerv(index, pname, pointer);
-}
-
-inline GLboolean QGLFunctions::glIsBuffer(GLuint buffer)
-{
-    Q_ASSERT(QGLFunctions::isInitialized(d_ptr));
-    return d_ptr->funcs->glIsBuffer(buffer);
-}
-
-inline GLboolean QGLFunctions::glIsFramebuffer(GLuint framebuffer)
-{
-    Q_ASSERT(QGLFunctions::isInitialized(d_ptr));
-    return d_ptr->funcs->glIsFramebuffer(framebuffer);
-}
-
-inline GLboolean QGLFunctions::glIsProgram(GLuint program)
-{
-    Q_ASSERT(QGLFunctions::isInitialized(d_ptr));
-    return d_ptr->funcs->glIsProgram(program);
-}
-
-inline GLboolean QGLFunctions::glIsRenderbuffer(GLuint renderbuffer)
-{
-    Q_ASSERT(QGLFunctions::isInitialized(d_ptr));
-    return d_ptr->funcs->glIsRenderbuffer(renderbuffer);
-}
-
-inline GLboolean QGLFunctions::glIsShader(GLuint shader)
-{
-    Q_ASSERT(QGLFunctions::isInitialized(d_ptr));
-    return d_ptr->funcs->glIsShader(shader);
-}
-
-inline void QGLFunctions::glLinkProgram(GLuint program)
-{
-    Q_ASSERT(QGLFunctions::isInitialized(d_ptr));
-    d_ptr->funcs->glLinkProgram(program);
-}
-
-inline void QGLFunctions::glReleaseShaderCompiler()
-{
-    Q_ASSERT(QGLFunctions::isInitialized(d_ptr));
-    d_ptr->funcs->glReleaseShaderCompiler();
-}
-
-inline void QGLFunctions::glRenderbufferStorage(GLenum target, GLenum internalformat, GLsizei width, GLsizei height)
-{
-    Q_ASSERT(QGLFunctions::isInitialized(d_ptr));
-    d_ptr->funcs->glRenderbufferStorage(target, internalformat, width, height);
-}
-
-inline void QGLFunctions::glSampleCoverage(GLclampf value, GLboolean invert)
-{
-    Q_ASSERT(QGLFunctions::isInitialized(d_ptr));
-    d_ptr->funcs->glSampleCoverage(value, invert);
-}
-
-inline void QGLFunctions::glShaderBinary(GLint n, const GLuint* shaders, GLenum binaryformat, const void* binary, GLint length)
-{
-    Q_ASSERT(QGLFunctions::isInitialized(d_ptr));
-    d_ptr->funcs->glShaderBinary(n, shaders, binaryformat, binary, length);
-}
-
-inline void QGLFunctions::glShaderSource(GLuint shader, GLsizei count, const char** string, const GLint* length)
-{
-    Q_ASSERT(QGLFunctions::isInitialized(d_ptr));
-    d_ptr->funcs->glShaderSource(shader, count, string, length);
-}
-
-inline void QGLFunctions::glStencilFuncSeparate(GLenum face, GLenum func, GLint ref, GLuint mask)
-{
-    Q_ASSERT(QGLFunctions::isInitialized(d_ptr));
-    d_ptr->funcs->glStencilFuncSeparate(face, func, ref, mask);
-}
-
-inline void QGLFunctions::glStencilMaskSeparate(GLenum face, GLuint mask)
-{
-    Q_ASSERT(QGLFunctions::isInitialized(d_ptr));
-    d_ptr->funcs->glStencilMaskSeparate(face, mask);
-}
-
-inline void QGLFunctions::glStencilOpSeparate(GLenum face, GLenum fail, GLenum zfail, GLenum zpass)
-{
-    Q_ASSERT(QGLFunctions::isInitialized(d_ptr));
-    d_ptr->funcs->glStencilOpSeparate(face, fail, zfail, zpass);
-}
-
-inline void QGLFunctions::glUniform1f(GLint location, GLfloat x)
-{
-    Q_ASSERT(QGLFunctions::isInitialized(d_ptr));
-    d_ptr->funcs->glUniform1f(location, x);
-}
-
-inline void QGLFunctions::glUniform1fv(GLint location, GLsizei count, const GLfloat* v)
-{
-    Q_ASSERT(QGLFunctions::isInitialized(d_ptr));
-    d_ptr->funcs->glUniform1fv(location, count, v);
-}
-
-inline void QGLFunctions::glUniform1i(GLint location, GLint x)
-{
-    Q_ASSERT(QGLFunctions::isInitialized(d_ptr));
-    d_ptr->funcs->glUniform1i(location, x);
-}
-
-inline void QGLFunctions::glUniform1iv(GLint location, GLsizei count, const GLint* v)
-{
-    Q_ASSERT(QGLFunctions::isInitialized(d_ptr));
-    d_ptr->funcs->glUniform1iv(location, count, v);
-}
-
-inline void QGLFunctions::glUniform2f(GLint location, GLfloat x, GLfloat y)
-{
-    Q_ASSERT(QGLFunctions::isInitialized(d_ptr));
-    d_ptr->funcs->glUniform2f(location, x, y);
-}
-
-inline void QGLFunctions::glUniform2fv(GLint location, GLsizei count, const GLfloat* v)
-{
-    Q_ASSERT(QGLFunctions::isInitialized(d_ptr));
-    d_ptr->funcs->glUniform2fv(location, count, v);
-}
-
-inline void QGLFunctions::glUniform2i(GLint location, GLint x, GLint y)
-{
-    Q_ASSERT(QGLFunctions::isInitialized(d_ptr));
-    d_ptr->funcs->glUniform2i(location, x, y);
-}
-
-inline void QGLFunctions::glUniform2iv(GLint location, GLsizei count, const GLint* v)
-{
-    Q_ASSERT(QGLFunctions::isInitialized(d_ptr));
-    d_ptr->funcs->glUniform2iv(location, count, v);
-}
-
-inline void QGLFunctions::glUniform3f(GLint location, GLfloat x, GLfloat y, GLfloat z)
-{
-    Q_ASSERT(QGLFunctions::isInitialized(d_ptr));
-    d_ptr->funcs->glUniform3f(location, x, y, z);
-}
-
-inline void QGLFunctions::glUniform3fv(GLint location, GLsizei count, const GLfloat* v)
-{
-    Q_ASSERT(QGLFunctions::isInitialized(d_ptr));
-    d_ptr->funcs->glUniform3fv(location, count, v);
-}
-
-inline void QGLFunctions::glUniform3i(GLint location, GLint x, GLint y, GLint z)
-{
-    Q_ASSERT(QGLFunctions::isInitialized(d_ptr));
-    d_ptr->funcs->glUniform3i(location, x, y, z);
-}
-
-inline void QGLFunctions::glUniform3iv(GLint location, GLsizei count, const GLint* v)
-{
-    Q_ASSERT(QGLFunctions::isInitialized(d_ptr));
-    d_ptr->funcs->glUniform3iv(location, count, v);
-}
-
-inline void QGLFunctions::glUniform4f(GLint location, GLfloat x, GLfloat y, GLfloat z, GLfloat w)
-{
-    Q_ASSERT(QGLFunctions::isInitialized(d_ptr));
-    d_ptr->funcs->glUniform4f(location, x, y, z, w);
-}
-
-inline void QGLFunctions::glUniform4fv(GLint location, GLsizei count, const GLfloat* v)
-{
-    Q_ASSERT(QGLFunctions::isInitialized(d_ptr));
-    d_ptr->funcs->glUniform4fv(location, count, v);
-}
-
-inline void QGLFunctions::glUniform4i(GLint location, GLint x, GLint y, GLint z, GLint w)
-{
-    Q_ASSERT(QGLFunctions::isInitialized(d_ptr));
-    d_ptr->funcs->glUniform4i(location, x, y, z, w);
-}
-
-inline void QGLFunctions::glUniform4iv(GLint location, GLsizei count, const GLint* v)
-{
-    Q_ASSERT(QGLFunctions::isInitialized(d_ptr));
-    d_ptr->funcs->glUniform4iv(location, count, v);
-}
-
-inline void QGLFunctions::glUniformMatrix2fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat* value)
-{
-    Q_ASSERT(QGLFunctions::isInitialized(d_ptr));
-    d_ptr->funcs->glUniformMatrix2fv(location, count, transpose, value);
-}
-
-inline void QGLFunctions::glUniformMatrix3fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat* value)
-{
-    Q_ASSERT(QGLFunctions::isInitialized(d_ptr));
-    d_ptr->funcs->glUniformMatrix3fv(location, count, transpose, value);
-}
-
-inline void QGLFunctions::glUniformMatrix4fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat* value)
-{
-    Q_ASSERT(QGLFunctions::isInitialized(d_ptr));
-    d_ptr->funcs->glUniformMatrix4fv(location, count, transpose, value);
-}
-
-inline void QGLFunctions::glUseProgram(GLuint program)
-{
-    Q_ASSERT(QGLFunctions::isInitialized(d_ptr));
-    d_ptr->funcs->glUseProgram(program);
-}
-
-inline void QGLFunctions::glValidateProgram(GLuint program)
-{
-    Q_ASSERT(QGLFunctions::isInitialized(d_ptr));
-    d_ptr->funcs->glValidateProgram(program);
-}
-
-inline void QGLFunctions::glVertexAttrib1f(GLuint indx, GLfloat x)
-{
-    Q_ASSERT(QGLFunctions::isInitialized(d_ptr));
-    d_ptr->funcs->glVertexAttrib1f(indx, x);
-}
-
-inline void QGLFunctions::glVertexAttrib1fv(GLuint indx, const GLfloat* values)
-{
-    Q_ASSERT(QGLFunctions::isInitialized(d_ptr));
-    d_ptr->funcs->glVertexAttrib1fv(indx, values);
-}
-
-inline void QGLFunctions::glVertexAttrib2f(GLuint indx, GLfloat x, GLfloat y)
-{
-    Q_ASSERT(QGLFunctions::isInitialized(d_ptr));
-    d_ptr->funcs->glVertexAttrib2f(indx, x, y);
-}
-
-inline void QGLFunctions::glVertexAttrib2fv(GLuint indx, const GLfloat* values)
-{
-    Q_ASSERT(QGLFunctions::isInitialized(d_ptr));
-    d_ptr->funcs->glVertexAttrib2fv(indx, values);
-}
-
-inline void QGLFunctions::glVertexAttrib3f(GLuint indx, GLfloat x, GLfloat y, GLfloat z)
-{
-    Q_ASSERT(QGLFunctions::isInitialized(d_ptr));
-    d_ptr->funcs->glVertexAttrib3f(indx, x, y, z);
-}
-
-inline void QGLFunctions::glVertexAttrib3fv(GLuint indx, const GLfloat* values)
-{
-    Q_ASSERT(QGLFunctions::isInitialized(d_ptr));
-    d_ptr->funcs->glVertexAttrib3fv(indx, values);
-}
-
-inline void QGLFunctions::glVertexAttrib4f(GLuint indx, GLfloat x, GLfloat y, GLfloat z, GLfloat w)
-{
-    Q_ASSERT(QGLFunctions::isInitialized(d_ptr));
-    d_ptr->funcs->glVertexAttrib4f(indx, x, y, z, w);
-}
-
-inline void QGLFunctions::glVertexAttrib4fv(GLuint indx, const GLfloat* values)
-{
-    Q_ASSERT(QGLFunctions::isInitialized(d_ptr));
-    d_ptr->funcs->glVertexAttrib4fv(indx, values);
-}
-
-inline void QGLFunctions::glVertexAttribPointer(GLuint indx, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const void* ptr)
-{
-    Q_ASSERT(QGLFunctions::isInitialized(d_ptr));
-    d_ptr->funcs->glVertexAttribPointer(indx, size, type, normalized, stride, ptr);
-}
-
-#ifndef GL_ACTIVE_ATTRIBUTE_MAX_LENGTH
-#define GL_ACTIVE_ATTRIBUTE_MAX_LENGTH 0x8B8A
-#endif
-#ifndef GL_ACTIVE_ATTRIBUTES
-#define GL_ACTIVE_ATTRIBUTES 0x8B89
-#endif
-#ifndef GL_ACTIVE_TEXTURE
-#define GL_ACTIVE_TEXTURE 0x84E0
-#endif
-#ifndef GL_ACTIVE_UNIFORM_MAX_LENGTH
-#define GL_ACTIVE_UNIFORM_MAX_LENGTH 0x8B87
-#endif
-#ifndef GL_ACTIVE_UNIFORMS
-#define GL_ACTIVE_UNIFORMS 0x8B86
-#endif
-#ifndef GL_ALIASED_LINE_WIDTH_RANGE
-#define GL_ALIASED_LINE_WIDTH_RANGE 0x846E
-#endif
-#ifndef GL_ALIASED_POINT_SIZE_RANGE
-#define GL_ALIASED_POINT_SIZE_RANGE 0x846D
-#endif
-#ifndef GL_ALPHA
-#define GL_ALPHA 0x1906
-#endif
-#ifndef GL_ALPHA_BITS
-#define GL_ALPHA_BITS 0x0D55
-#endif
-#ifndef GL_ALWAYS
-#define GL_ALWAYS 0x0207
-#endif
-#ifndef GL_ARRAY_BUFFER
-#define GL_ARRAY_BUFFER 0x8892
-#endif
-#ifndef GL_ARRAY_BUFFER_BINDING
-#define GL_ARRAY_BUFFER_BINDING 0x8894
-#endif
-#ifndef GL_ATTACHED_SHADERS
-#define GL_ATTACHED_SHADERS 0x8B85
-#endif
-#ifndef GL_BACK
-#define GL_BACK 0x0405
-#endif
-#ifndef GL_BLEND
-#define GL_BLEND 0x0BE2
-#endif
-#ifndef GL_BLEND_COLOR
-#define GL_BLEND_COLOR 0x8005
-#endif
-#ifndef GL_BLEND_DST_ALPHA
-#define GL_BLEND_DST_ALPHA 0x80CA
-#endif
-#ifndef GL_BLEND_DST_RGB
-#define GL_BLEND_DST_RGB 0x80C8
-#endif
-#ifndef GL_BLEND_EQUATION
-#define GL_BLEND_EQUATION 0x8009
-#endif
-#ifndef GL_BLEND_EQUATION_ALPHA
-#define GL_BLEND_EQUATION_ALPHA 0x883D
-#endif
-#ifndef GL_BLEND_EQUATION_RGB
-#define GL_BLEND_EQUATION_RGB 0x8009
-#endif
-#ifndef GL_BLEND_SRC_ALPHA
-#define GL_BLEND_SRC_ALPHA 0x80CB
-#endif
-#ifndef GL_BLEND_SRC_RGB
-#define GL_BLEND_SRC_RGB 0x80C9
-#endif
-#ifndef GL_BLUE_BITS
-#define GL_BLUE_BITS 0x0D54
-#endif
-#ifndef GL_BOOL
-#define GL_BOOL 0x8B56
-#endif
-#ifndef GL_BOOL_VEC2
-#define GL_BOOL_VEC2 0x8B57
-#endif
-#ifndef GL_BOOL_VEC3
-#define GL_BOOL_VEC3 0x8B58
-#endif
-#ifndef GL_BOOL_VEC4
-#define GL_BOOL_VEC4 0x8B59
-#endif
-#ifndef GL_BUFFER_SIZE
-#define GL_BUFFER_SIZE 0x8764
-#endif
-#ifndef GL_BUFFER_USAGE
-#define GL_BUFFER_USAGE 0x8765
-#endif
-#ifndef GL_BYTE
-#define GL_BYTE 0x1400
-#endif
-#ifndef GL_CCW
-#define GL_CCW 0x0901
-#endif
-#ifndef GL_CLAMP_TO_EDGE
-#define GL_CLAMP_TO_EDGE 0x812F
-#endif
-#ifndef GL_COLOR_ATTACHMENT0
-#define GL_COLOR_ATTACHMENT0 0x8CE0
-#endif
-#ifndef GL_COLOR_BUFFER_BIT
-#define GL_COLOR_BUFFER_BIT 0x00004000
-#endif
-#ifndef GL_COLOR_CLEAR_VALUE
-#define GL_COLOR_CLEAR_VALUE 0x0C22
-#endif
-#ifndef GL_COLOR_WRITEMASK
-#define GL_COLOR_WRITEMASK 0x0C23
-#endif
-#ifndef GL_COMPILE_STATUS
-#define GL_COMPILE_STATUS 0x8B81
-#endif
-#ifndef GL_COMPRESSED_TEXTURE_FORMATS
-#define GL_COMPRESSED_TEXTURE_FORMATS 0x86A3
-#endif
-#ifndef GL_CONSTANT_ALPHA
-#define GL_CONSTANT_ALPHA 0x8003
-#endif
-#ifndef GL_CONSTANT_COLOR
-#define GL_CONSTANT_COLOR 0x8001
-#endif
-#ifndef GL_CULL_FACE
-#define GL_CULL_FACE 0x0B44
-#endif
-#ifndef GL_CULL_FACE_MODE
-#define GL_CULL_FACE_MODE 0x0B45
-#endif
-#ifndef GL_CURRENT_PROGRAM
-#define GL_CURRENT_PROGRAM 0x8B8D
-#endif
-#ifndef GL_CURRENT_VERTEX_ATTRIB
-#define GL_CURRENT_VERTEX_ATTRIB 0x8626
-#endif
-#ifndef GL_CW
-#define GL_CW 0x0900
-#endif
-#ifndef GL_DECR
-#define GL_DECR 0x1E03
-#endif
-#ifndef GL_DECR_WRAP
-#define GL_DECR_WRAP 0x8508
-#endif
-#ifndef GL_DELETE_STATUS
-#define GL_DELETE_STATUS 0x8B80
-#endif
-#ifndef GL_DEPTH_ATTACHMENT
-#define GL_DEPTH_ATTACHMENT 0x8D00
-#endif
-#ifndef GL_DEPTH_BITS
-#define GL_DEPTH_BITS 0x0D56
-#endif
-#ifndef GL_DEPTH_BUFFER_BIT
-#define GL_DEPTH_BUFFER_BIT 0x00000100
-#endif
-#ifndef GL_DEPTH_CLEAR_VALUE
-#define GL_DEPTH_CLEAR_VALUE 0x0B73
-#endif
-#ifndef GL_DEPTH_COMPONENT
-#define GL_DEPTH_COMPONENT 0x1902
-#endif
-#ifndef GL_DEPTH_COMPONENT16
-#define GL_DEPTH_COMPONENT16 0x81A5
-#endif
-#ifndef GL_DEPTH_FUNC
-#define GL_DEPTH_FUNC 0x0B74
-#endif
-#ifndef GL_DEPTH_RANGE
-#define GL_DEPTH_RANGE 0x0B70
-#endif
-#ifndef GL_DEPTH_TEST
-#define GL_DEPTH_TEST 0x0B71
-#endif
-#ifndef GL_DEPTH_WRITEMASK
-#define GL_DEPTH_WRITEMASK 0x0B72
-#endif
-#ifndef GL_DITHER
-#define GL_DITHER 0x0BD0
-#endif
-#ifndef GL_DONT_CARE
-#define GL_DONT_CARE 0x1100
-#endif
-#ifndef GL_DST_ALPHA
-#define GL_DST_ALPHA 0x0304
-#endif
-#ifndef GL_DST_COLOR
-#define GL_DST_COLOR 0x0306
-#endif
-#ifndef GL_DYNAMIC_DRAW
-#define GL_DYNAMIC_DRAW 0x88E8
-#endif
-#ifndef GL_ELEMENT_ARRAY_BUFFER
-#define GL_ELEMENT_ARRAY_BUFFER 0x8893
-#endif
-#ifndef GL_ELEMENT_ARRAY_BUFFER_BINDING
-#define GL_ELEMENT_ARRAY_BUFFER_BINDING 0x8895
-#endif
-#ifndef GL_EQUAL
-#define GL_EQUAL 0x0202
-#endif
-#ifndef GL_EXTENSIONS
-#define GL_EXTENSIONS 0x1F03
-#endif
-#ifndef GL_FALSE
-#define GL_FALSE 0
-#endif
-#ifndef GL_FASTEST
-#define GL_FASTEST 0x1101
-#endif
-#ifndef GL_FIXED
-#define GL_FIXED 0x140C
-#endif
-#ifndef GL_FLOAT
-#define GL_FLOAT 0x1406
-#endif
-#ifndef GL_FLOAT_MAT2
-#define GL_FLOAT_MAT2 0x8B5A
-#endif
-#ifndef GL_FLOAT_MAT3
-#define GL_FLOAT_MAT3 0x8B5B
-#endif
-#ifndef GL_FLOAT_MAT4
-#define GL_FLOAT_MAT4 0x8B5C
-#endif
-#ifndef GL_FLOAT_VEC2
-#define GL_FLOAT_VEC2 0x8B50
-#endif
-#ifndef GL_FLOAT_VEC3
-#define GL_FLOAT_VEC3 0x8B51
-#endif
-#ifndef GL_FLOAT_VEC4
-#define GL_FLOAT_VEC4 0x8B52
-#endif
-#ifndef GL_FRAGMENT_SHADER
-#define GL_FRAGMENT_SHADER 0x8B30
-#endif
-#ifndef GL_FRAMEBUFFER
-#define GL_FRAMEBUFFER 0x8D40
-#endif
-#ifndef GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME
-#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME 0x8CD1
-#endif
-#ifndef GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE
-#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE 0x8CD0
-#endif
-#ifndef GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE
-#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE 0x8CD3
-#endif
-#ifndef GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL
-#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL 0x8CD2
-#endif
-#ifndef GL_FRAMEBUFFER_BINDING
-#define GL_FRAMEBUFFER_BINDING 0x8CA6
-#endif
-#ifndef GL_FRAMEBUFFER_COMPLETE
-#define GL_FRAMEBUFFER_COMPLETE 0x8CD5
-#endif
-#ifndef GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT
-#define GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT 0x8CD6
-#endif
-#ifndef GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS
-#define GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS 0x8CD9
-#endif
-#ifndef GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT
-#define GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT 0x8CD7
-#endif
-#ifndef GL_FRAMEBUFFER_UNSUPPORTED
-#define GL_FRAMEBUFFER_UNSUPPORTED 0x8CDD
-#endif
-#ifndef GL_FRONT
-#define GL_FRONT 0x0404
-#endif
-#ifndef GL_FRONT_AND_BACK
-#define GL_FRONT_AND_BACK 0x0408
-#endif
-#ifndef GL_FRONT_FACE
-#define GL_FRONT_FACE 0x0B46
-#endif
-#ifndef GL_FUNC_ADD
-#define GL_FUNC_ADD 0x8006
-#endif
-#ifndef GL_FUNC_REVERSE_SUBTRACT
-#define GL_FUNC_REVERSE_SUBTRACT 0x800B
-#endif
-#ifndef GL_FUNC_SUBTRACT
-#define GL_FUNC_SUBTRACT 0x800A
-#endif
-#ifndef GL_GENERATE_MIPMAP_HINT
-#define GL_GENERATE_MIPMAP_HINT 0x8192
-#endif
-#ifndef GL_GEQUAL
-#define GL_GEQUAL 0x0206
-#endif
-#ifndef GL_GREATER
-#define GL_GREATER 0x0204
-#endif
-#ifndef GL_GREEN_BITS
-#define GL_GREEN_BITS 0x0D53
-#endif
-#ifndef GL_HIGH_FLOAT
-#define GL_HIGH_FLOAT 0x8DF2
-#endif
-#ifndef GL_HIGH_INT
-#define GL_HIGH_INT 0x8DF5
-#endif
-#ifndef GL_IMPLEMENTATION_COLOR_READ_FORMAT
-#define GL_IMPLEMENTATION_COLOR_READ_FORMAT 0x8B9B
-#endif
-#ifndef GL_IMPLEMENTATION_COLOR_READ_TYPE
-#define GL_IMPLEMENTATION_COLOR_READ_TYPE 0x8B9A
-#endif
-#ifndef GL_INCR
-#define GL_INCR 0x1E02
-#endif
-#ifndef GL_INCR_WRAP
-#define GL_INCR_WRAP 0x8507
-#endif
-#ifndef GL_INFO_LOG_LENGTH
-#define GL_INFO_LOG_LENGTH 0x8B84
-#endif
-#ifndef GL_INT
-#define GL_INT 0x1404
-#endif
-#ifndef GL_INT_VEC2
-#define GL_INT_VEC2 0x8B53
-#endif
-#ifndef GL_INT_VEC3
-#define GL_INT_VEC3 0x8B54
-#endif
-#ifndef GL_INT_VEC4
-#define GL_INT_VEC4 0x8B55
-#endif
-#ifndef GL_INVALID_ENUM
-#define GL_INVALID_ENUM 0x0500
-#endif
-#ifndef GL_INVALID_FRAMEBUFFER_OPERATION
-#define GL_INVALID_FRAMEBUFFER_OPERATION 0x0506
-#endif
-#ifndef GL_INVALID_OPERATION
-#define GL_INVALID_OPERATION 0x0502
-#endif
-#ifndef GL_INVALID_VALUE
-#define GL_INVALID_VALUE 0x0501
-#endif
-#ifndef GL_INVERT
-#define GL_INVERT 0x150A
-#endif
-#ifndef GL_KEEP
-#define GL_KEEP 0x1E00
-#endif
-#ifndef GL_LEQUAL
-#define GL_LEQUAL 0x0203
-#endif
-#ifndef GL_LESS
-#define GL_LESS 0x0201
-#endif
-#ifndef GL_LINEAR
-#define GL_LINEAR 0x2601
-#endif
-#ifndef GL_LINEAR_MIPMAP_LINEAR
-#define GL_LINEAR_MIPMAP_LINEAR 0x2703
-#endif
-#ifndef GL_LINEAR_MIPMAP_NEAREST
-#define GL_LINEAR_MIPMAP_NEAREST 0x2701
-#endif
-#ifndef GL_LINE_LOOP
-#define GL_LINE_LOOP 0x0002
-#endif
-#ifndef GL_LINES
-#define GL_LINES 0x0001
-#endif
-#ifndef GL_LINE_STRIP
-#define GL_LINE_STRIP 0x0003
-#endif
-#ifndef GL_LINE_WIDTH
-#define GL_LINE_WIDTH 0x0B21
-#endif
-#ifndef GL_LINK_STATUS
-#define GL_LINK_STATUS 0x8B82
-#endif
-#ifndef GL_LOW_FLOAT
-#define GL_LOW_FLOAT 0x8DF0
-#endif
-#ifndef GL_LOW_INT
-#define GL_LOW_INT 0x8DF3
-#endif
-#ifndef GL_LUMINANCE
-#define GL_LUMINANCE 0x1909
-#endif
-#ifndef GL_LUMINANCE_ALPHA
-#define GL_LUMINANCE_ALPHA 0x190A
-#endif
-#ifndef GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS
-#define GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS 0x8B4D
-#endif
-#ifndef GL_MAX_CUBE_MAP_TEXTURE_SIZE
-#define GL_MAX_CUBE_MAP_TEXTURE_SIZE 0x851C
-#endif
-#ifndef GL_MAX_FRAGMENT_UNIFORM_VECTORS
-#define GL_MAX_FRAGMENT_UNIFORM_VECTORS 0x8DFD
-#endif
-#ifndef GL_MAX_RENDERBUFFER_SIZE
-#define GL_MAX_RENDERBUFFER_SIZE 0x84E8
-#endif
-#ifndef GL_MAX_TEXTURE_IMAGE_UNITS
-#define GL_MAX_TEXTURE_IMAGE_UNITS 0x8872
-#endif
-#ifndef GL_MAX_TEXTURE_SIZE
-#define GL_MAX_TEXTURE_SIZE 0x0D33
-#endif
-#ifndef GL_MAX_VARYING_VECTORS
-#define GL_MAX_VARYING_VECTORS 0x8DFC
-#endif
-#ifndef GL_MAX_VERTEX_ATTRIBS
-#define GL_MAX_VERTEX_ATTRIBS 0x8869
-#endif
-#ifndef GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS
-#define GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS 0x8B4C
-#endif
-#ifndef GL_MAX_VERTEX_UNIFORM_VECTORS
-#define GL_MAX_VERTEX_UNIFORM_VECTORS 0x8DFB
-#endif
-#ifndef GL_MAX_VIEWPORT_DIMS
-#define GL_MAX_VIEWPORT_DIMS 0x0D3A
-#endif
-#ifndef GL_MEDIUM_FLOAT
-#define GL_MEDIUM_FLOAT 0x8DF1
-#endif
-#ifndef GL_MEDIUM_INT
-#define GL_MEDIUM_INT 0x8DF4
-#endif
-#ifndef GL_MIRRORED_REPEAT
-#define GL_MIRRORED_REPEAT 0x8370
-#endif
-#ifndef GL_NEAREST
-#define GL_NEAREST 0x2600
-#endif
-#ifndef GL_NEAREST_MIPMAP_LINEAR
-#define GL_NEAREST_MIPMAP_LINEAR 0x2702
-#endif
-#ifndef GL_NEAREST_MIPMAP_NEAREST
-#define GL_NEAREST_MIPMAP_NEAREST 0x2700
-#endif
-#ifndef GL_NEVER
-#define GL_NEVER 0x0200
-#endif
-#ifndef GL_NICEST
-#define GL_NICEST 0x1102
-#endif
-#ifndef GL_NO_ERROR
-#define GL_NO_ERROR 0
-#endif
-#ifndef GL_NONE
-#define GL_NONE 0
-#endif
-#ifndef GL_NOTEQUAL
-#define GL_NOTEQUAL 0x0205
-#endif
-#ifndef GL_NUM_COMPRESSED_TEXTURE_FORMATS
-#define GL_NUM_COMPRESSED_TEXTURE_FORMATS 0x86A2
-#endif
-#ifndef GL_NUM_SHADER_BINARY_FORMATS
-#define GL_NUM_SHADER_BINARY_FORMATS 0x8DF9
-#endif
-#ifndef GL_ONE
-#define GL_ONE 1
-#endif
-#ifndef GL_ONE_MINUS_CONSTANT_ALPHA
-#define GL_ONE_MINUS_CONSTANT_ALPHA 0x8004
-#endif
-#ifndef GL_ONE_MINUS_CONSTANT_COLOR
-#define GL_ONE_MINUS_CONSTANT_COLOR 0x8002
-#endif
-#ifndef GL_ONE_MINUS_DST_ALPHA
-#define GL_ONE_MINUS_DST_ALPHA 0x0305
-#endif
-#ifndef GL_ONE_MINUS_DST_COLOR
-#define GL_ONE_MINUS_DST_COLOR 0x0307
-#endif
-#ifndef GL_ONE_MINUS_SRC_ALPHA
-#define GL_ONE_MINUS_SRC_ALPHA 0x0303
-#endif
-#ifndef GL_ONE_MINUS_SRC_COLOR
-#define GL_ONE_MINUS_SRC_COLOR 0x0301
-#endif
-#ifndef GL_OUT_OF_MEMORY
-#define GL_OUT_OF_MEMORY 0x0505
-#endif
-#ifndef GL_PACK_ALIGNMENT
-#define GL_PACK_ALIGNMENT 0x0D05
-#endif
-#ifndef GL_POINTS
-#define GL_POINTS 0x0000
-#endif
-#ifndef GL_POLYGON_OFFSET_FACTOR
-#define GL_POLYGON_OFFSET_FACTOR 0x8038
-#endif
-#ifndef GL_POLYGON_OFFSET_FILL
-#define GL_POLYGON_OFFSET_FILL 0x8037
-#endif
-#ifndef GL_POLYGON_OFFSET_UNITS
-#define GL_POLYGON_OFFSET_UNITS 0x2A00
-#endif
-#ifndef GL_RED_BITS
-#define GL_RED_BITS 0x0D52
-#endif
-#ifndef GL_RENDERBUFFER
-#define GL_RENDERBUFFER 0x8D41
-#endif
-#ifndef GL_RENDERBUFFER_ALPHA_SIZE
-#define GL_RENDERBUFFER_ALPHA_SIZE 0x8D53
-#endif
-#ifndef GL_RENDERBUFFER_BINDING
-#define GL_RENDERBUFFER_BINDING 0x8CA7
-#endif
-#ifndef GL_RENDERBUFFER_BLUE_SIZE
-#define GL_RENDERBUFFER_BLUE_SIZE 0x8D52
-#endif
-#ifndef GL_RENDERBUFFER_DEPTH_SIZE
-#define GL_RENDERBUFFER_DEPTH_SIZE 0x8D54
-#endif
-#ifndef GL_RENDERBUFFER_GREEN_SIZE
-#define GL_RENDERBUFFER_GREEN_SIZE 0x8D51
-#endif
-#ifndef GL_RENDERBUFFER_HEIGHT
-#define GL_RENDERBUFFER_HEIGHT 0x8D43
-#endif
-#ifndef GL_RENDERBUFFER_INTERNAL_FORMAT
-#define GL_RENDERBUFFER_INTERNAL_FORMAT 0x8D44
-#endif
-#ifndef GL_RENDERBUFFER_RED_SIZE
-#define GL_RENDERBUFFER_RED_SIZE 0x8D50
-#endif
-#ifndef GL_RENDERBUFFER_STENCIL_SIZE
-#define GL_RENDERBUFFER_STENCIL_SIZE 0x8D55
-#endif
-#ifndef GL_RENDERBUFFER_WIDTH
-#define GL_RENDERBUFFER_WIDTH 0x8D42
-#endif
-#ifndef GL_RENDERER
-#define GL_RENDERER 0x1F01
-#endif
-#ifndef GL_REPEAT
-#define GL_REPEAT 0x2901
-#endif
-#ifndef GL_REPLACE
-#define GL_REPLACE 0x1E01
-#endif
-#ifndef GL_RGB
-#define GL_RGB 0x1907
-#endif
-#ifndef GL_RGB565
-#define GL_RGB565 0x8D62
-#endif
-#ifndef GL_RGB5_A1
-#define GL_RGB5_A1 0x8057
-#endif
-#ifndef GL_RGBA
-#define GL_RGBA 0x1908
-#endif
-#ifndef GL_RGBA4
-#define GL_RGBA4 0x8056
-#endif
-#ifndef GL_BGRA
-#define GL_BGRA 0x80E1
-#endif
-#ifndef GL_SAMPLE_ALPHA_TO_COVERAGE
-#define GL_SAMPLE_ALPHA_TO_COVERAGE 0x809E
-#endif
-#ifndef GL_SAMPLE_BUFFERS
-#define GL_SAMPLE_BUFFERS 0x80A8
-#endif
-#ifndef GL_SAMPLE_COVERAGE
-#define GL_SAMPLE_COVERAGE 0x80A0
-#endif
-#ifndef GL_SAMPLE_COVERAGE_INVERT
-#define GL_SAMPLE_COVERAGE_INVERT 0x80AB
-#endif
-#ifndef GL_SAMPLE_COVERAGE_VALUE
-#define GL_SAMPLE_COVERAGE_VALUE 0x80AA
-#endif
-#ifndef GL_SAMPLER_2D
-#define GL_SAMPLER_2D 0x8B5E
-#endif
-#ifndef GL_SAMPLER_CUBE
-#define GL_SAMPLER_CUBE 0x8B60
-#endif
-#ifndef GL_SAMPLES
-#define GL_SAMPLES 0x80A9
-#endif
-#ifndef GL_SCISSOR_BOX
-#define GL_SCISSOR_BOX 0x0C10
-#endif
-#ifndef GL_SCISSOR_TEST
-#define GL_SCISSOR_TEST 0x0C11
-#endif
-#ifndef GL_SHADER_BINARY_FORMATS
-#define GL_SHADER_BINARY_FORMATS 0x8DF8
-#endif
-#ifndef GL_SHADER_COMPILER
-#define GL_SHADER_COMPILER 0x8DFA
-#endif
-#ifndef GL_SHADER_SOURCE_LENGTH
-#define GL_SHADER_SOURCE_LENGTH 0x8B88
-#endif
-#ifndef GL_SHADER_TYPE
-#define GL_SHADER_TYPE 0x8B4F
-#endif
-#ifndef GL_SHADING_LANGUAGE_VERSION
-#define GL_SHADING_LANGUAGE_VERSION 0x8B8C
-#endif
-#ifndef GL_SHORT
-#define GL_SHORT 0x1402
-#endif
-#ifndef GL_SRC_ALPHA
-#define GL_SRC_ALPHA 0x0302
-#endif
-#ifndef GL_SRC_ALPHA_SATURATE
-#define GL_SRC_ALPHA_SATURATE 0x0308
-#endif
-#ifndef GL_SRC_COLOR
-#define GL_SRC_COLOR 0x0300
-#endif
-#ifndef GL_STATIC_DRAW
-#define GL_STATIC_DRAW 0x88E4
-#endif
-#ifndef GL_STENCIL_ATTACHMENT
-#define GL_STENCIL_ATTACHMENT 0x8D20
-#endif
-#ifndef GL_STENCIL_BACK_FAIL
-#define GL_STENCIL_BACK_FAIL 0x8801
-#endif
-#ifndef GL_STENCIL_BACK_FUNC
-#define GL_STENCIL_BACK_FUNC 0x8800
-#endif
-#ifndef GL_STENCIL_BACK_PASS_DEPTH_FAIL
-#define GL_STENCIL_BACK_PASS_DEPTH_FAIL 0x8802
-#endif
-#ifndef GL_STENCIL_BACK_PASS_DEPTH_PASS
-#define GL_STENCIL_BACK_PASS_DEPTH_PASS 0x8803
-#endif
-#ifndef GL_STENCIL_BACK_REF
-#define GL_STENCIL_BACK_REF 0x8CA3
-#endif
-#ifndef GL_STENCIL_BACK_VALUE_MASK
-#define GL_STENCIL_BACK_VALUE_MASK 0x8CA4
-#endif
-#ifndef GL_STENCIL_BACK_WRITEMASK
-#define GL_STENCIL_BACK_WRITEMASK 0x8CA5
-#endif
-#ifndef GL_STENCIL_BITS
-#define GL_STENCIL_BITS 0x0D57
-#endif
-#ifndef GL_STENCIL_BUFFER_BIT
-#define GL_STENCIL_BUFFER_BIT 0x00000400
-#endif
-#ifndef GL_STENCIL_CLEAR_VALUE
-#define GL_STENCIL_CLEAR_VALUE 0x0B91
-#endif
-#ifndef GL_STENCIL_FAIL
-#define GL_STENCIL_FAIL 0x0B94
-#endif
-#ifndef GL_STENCIL_FUNC
-#define GL_STENCIL_FUNC 0x0B92
-#endif
-#ifndef GL_STENCIL_INDEX
-#define GL_STENCIL_INDEX 0x1901
-#endif
-#ifndef GL_STENCIL_INDEX8
-#define GL_STENCIL_INDEX8 0x8D48
-#endif
-#ifndef GL_STENCIL_PASS_DEPTH_FAIL
-#define GL_STENCIL_PASS_DEPTH_FAIL 0x0B95
-#endif
-#ifndef GL_STENCIL_PASS_DEPTH_PASS
-#define GL_STENCIL_PASS_DEPTH_PASS 0x0B96
-#endif
-#ifndef GL_STENCIL_REF
-#define GL_STENCIL_REF 0x0B97
-#endif
-#ifndef GL_STENCIL_TEST
-#define GL_STENCIL_TEST 0x0B90
-#endif
-#ifndef GL_STENCIL_VALUE_MASK
-#define GL_STENCIL_VALUE_MASK 0x0B93
-#endif
-#ifndef GL_STENCIL_WRITEMASK
-#define GL_STENCIL_WRITEMASK 0x0B98
-#endif
-#ifndef GL_STREAM_DRAW
-#define GL_STREAM_DRAW 0x88E0
-#endif
-#ifndef GL_SUBPIXEL_BITS
-#define GL_SUBPIXEL_BITS 0x0D50
-#endif
-#ifndef GL_TEXTURE0
-#define GL_TEXTURE0 0x84C0
-#endif
-#ifndef GL_TEXTURE
-#define GL_TEXTURE 0x1702
-#endif
-#ifndef GL_TEXTURE10
-#define GL_TEXTURE10 0x84CA
-#endif
-#ifndef GL_TEXTURE1
-#define GL_TEXTURE1 0x84C1
-#endif
-#ifndef GL_TEXTURE11
-#define GL_TEXTURE11 0x84CB
-#endif
-#ifndef GL_TEXTURE12
-#define GL_TEXTURE12 0x84CC
-#endif
-#ifndef GL_TEXTURE13
-#define GL_TEXTURE13 0x84CD
-#endif
-#ifndef GL_TEXTURE14
-#define GL_TEXTURE14 0x84CE
-#endif
-#ifndef GL_TEXTURE15
-#define GL_TEXTURE15 0x84CF
-#endif
-#ifndef GL_TEXTURE16
-#define GL_TEXTURE16 0x84D0
-#endif
-#ifndef GL_TEXTURE17
-#define GL_TEXTURE17 0x84D1
-#endif
-#ifndef GL_TEXTURE18
-#define GL_TEXTURE18 0x84D2
-#endif
-#ifndef GL_TEXTURE19
-#define GL_TEXTURE19 0x84D3
-#endif
-#ifndef GL_TEXTURE20
-#define GL_TEXTURE20 0x84D4
-#endif
-#ifndef GL_TEXTURE2
-#define GL_TEXTURE2 0x84C2
-#endif
-#ifndef GL_TEXTURE21
-#define GL_TEXTURE21 0x84D5
-#endif
-#ifndef GL_TEXTURE22
-#define GL_TEXTURE22 0x84D6
-#endif
-#ifndef GL_TEXTURE23
-#define GL_TEXTURE23 0x84D7
-#endif
-#ifndef GL_TEXTURE24
-#define GL_TEXTURE24 0x84D8
-#endif
-#ifndef GL_TEXTURE25
-#define GL_TEXTURE25 0x84D9
-#endif
-#ifndef GL_TEXTURE26
-#define GL_TEXTURE26 0x84DA
-#endif
-#ifndef GL_TEXTURE27
-#define GL_TEXTURE27 0x84DB
-#endif
-#ifndef GL_TEXTURE28
-#define GL_TEXTURE28 0x84DC
-#endif
-#ifndef GL_TEXTURE29
-#define GL_TEXTURE29 0x84DD
-#endif
-#ifndef GL_TEXTURE_2D
-#define GL_TEXTURE_2D 0x0DE1
-#endif
-#ifndef GL_TEXTURE30
-#define GL_TEXTURE30 0x84DE
-#endif
-#ifndef GL_TEXTURE3
-#define GL_TEXTURE3 0x84C3
-#endif
-#ifndef GL_TEXTURE31
-#define GL_TEXTURE31 0x84DF
-#endif
-#ifndef GL_TEXTURE4
-#define GL_TEXTURE4 0x84C4
-#endif
-#ifndef GL_TEXTURE5
-#define GL_TEXTURE5 0x84C5
-#endif
-#ifndef GL_TEXTURE6
-#define GL_TEXTURE6 0x84C6
-#endif
-#ifndef GL_TEXTURE7
-#define GL_TEXTURE7 0x84C7
-#endif
-#ifndef GL_TEXTURE8
-#define GL_TEXTURE8 0x84C8
-#endif
-#ifndef GL_TEXTURE9
-#define GL_TEXTURE9 0x84C9
-#endif
-#ifndef GL_TEXTURE_BINDING_2D
-#define GL_TEXTURE_BINDING_2D 0x8069
-#endif
-#ifndef GL_TEXTURE_BINDING_CUBE_MAP
-#define GL_TEXTURE_BINDING_CUBE_MAP 0x8514
-#endif
-#ifndef GL_TEXTURE_CUBE_MAP
-#define GL_TEXTURE_CUBE_MAP 0x8513
-#endif
-#ifndef GL_TEXTURE_CUBE_MAP_NEGATIVE_X
-#define GL_TEXTURE_CUBE_MAP_NEGATIVE_X 0x8516
-#endif
-#ifndef GL_TEXTURE_CUBE_MAP_NEGATIVE_Y
-#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y 0x8518
-#endif
-#ifndef GL_TEXTURE_CUBE_MAP_NEGATIVE_Z
-#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z 0x851A
-#endif
-#ifndef GL_TEXTURE_CUBE_MAP_POSITIVE_X
-#define GL_TEXTURE_CUBE_MAP_POSITIVE_X 0x8515
-#endif
-#ifndef GL_TEXTURE_CUBE_MAP_POSITIVE_Y
-#define GL_TEXTURE_CUBE_MAP_POSITIVE_Y 0x8517
-#endif
-#ifndef GL_TEXTURE_CUBE_MAP_POSITIVE_Z
-#define GL_TEXTURE_CUBE_MAP_POSITIVE_Z 0x8519
-#endif
-#ifndef GL_TEXTURE_MAG_FILTER
-#define GL_TEXTURE_MAG_FILTER 0x2800
-#endif
-#ifndef GL_TEXTURE_MIN_FILTER
-#define GL_TEXTURE_MIN_FILTER 0x2801
-#endif
-#ifndef GL_TEXTURE_WRAP_S
-#define GL_TEXTURE_WRAP_S 0x2802
-#endif
-#ifndef GL_TEXTURE_WRAP_T
-#define GL_TEXTURE_WRAP_T 0x2803
-#endif
-#ifndef GL_TRIANGLE_FAN
-#define GL_TRIANGLE_FAN 0x0006
-#endif
-#ifndef GL_TRIANGLES
-#define GL_TRIANGLES 0x0004
-#endif
-#ifndef GL_TRIANGLE_STRIP
-#define GL_TRIANGLE_STRIP 0x0005
-#endif
-#ifndef GL_TRUE
-#define GL_TRUE 1
-#endif
-#ifndef GL_UNPACK_ALIGNMENT
-#define GL_UNPACK_ALIGNMENT 0x0CF5
-#endif
-#ifndef GL_UNSIGNED_BYTE
-#define GL_UNSIGNED_BYTE 0x1401
-#endif
-#ifndef GL_UNSIGNED_INT
-#define GL_UNSIGNED_INT 0x1405
-#endif
-#ifndef GL_UNSIGNED_SHORT
-#define GL_UNSIGNED_SHORT 0x1403
-#endif
-#ifndef GL_UNSIGNED_SHORT_4_4_4_4
-#define GL_UNSIGNED_SHORT_4_4_4_4 0x8033
-#endif
-#ifndef GL_UNSIGNED_SHORT_5_5_5_1
-#define GL_UNSIGNED_SHORT_5_5_5_1 0x8034
-#endif
-#ifndef GL_UNSIGNED_SHORT_5_6_5
-#define GL_UNSIGNED_SHORT_5_6_5 0x8363
-#endif
-#ifndef GL_VALIDATE_STATUS
-#define GL_VALIDATE_STATUS 0x8B83
-#endif
-#ifndef GL_VENDOR
-#define GL_VENDOR 0x1F00
-#endif
-#ifndef GL_VERSION
-#define GL_VERSION 0x1F02
-#endif
-#ifndef GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING
-#define GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING 0x889F
-#endif
-#ifndef GL_VERTEX_ATTRIB_ARRAY_ENABLED
-#define GL_VERTEX_ATTRIB_ARRAY_ENABLED 0x8622
-#endif
-#ifndef GL_VERTEX_ATTRIB_ARRAY_NORMALIZED
-#define GL_VERTEX_ATTRIB_ARRAY_NORMALIZED 0x886A
-#endif
-#ifndef GL_VERTEX_ATTRIB_ARRAY_POINTER
-#define GL_VERTEX_ATTRIB_ARRAY_POINTER 0x8645
-#endif
-#ifndef GL_VERTEX_ATTRIB_ARRAY_SIZE
-#define GL_VERTEX_ATTRIB_ARRAY_SIZE 0x8623
-#endif
-#ifndef GL_VERTEX_ATTRIB_ARRAY_STRIDE
-#define GL_VERTEX_ATTRIB_ARRAY_STRIDE 0x8624
-#endif
-#ifndef GL_VERTEX_ATTRIB_ARRAY_TYPE
-#define GL_VERTEX_ATTRIB_ARRAY_TYPE 0x8625
-#endif
-#ifndef GL_VERTEX_SHADER
-#define GL_VERTEX_SHADER 0x8B31
-#endif
-#ifndef GL_VIEWPORT
-#define GL_VIEWPORT 0x0BA2
-#endif
-#ifndef GL_ZERO
-#define GL_ZERO 0
-#endif
-
-QT_END_NAMESPACE
-
-#endif
diff --git a/src/opengl/qglpaintdevice.cpp b/src/opengl/qglpaintdevice.cpp
deleted file mode 100644
index c5151f66bb..0000000000
--- a/src/opengl/qglpaintdevice.cpp
+++ /dev/null
@@ -1,239 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtOpenGL module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <private/qglpaintdevice_p.h>
-#include <private/qgl_p.h>
-#include <private/qglpixelbuffer_p.h>
-#include <private/qglframebufferobject_p.h>
-#include <qopenglfunctions.h>
-#include <qwindow.h>
-
-QT_BEGIN_NAMESPACE
-
-QGLPaintDevice::QGLPaintDevice()
-    : m_thisFBO(0)
-{
-}
-
-QGLPaintDevice::~QGLPaintDevice()
-{
-}
-
-int QGLPaintDevice::metric(QPaintDevice::PaintDeviceMetric metric) const
-{
-    switch(metric) {
-    case PdmWidth:
-        return size().width();
-    case PdmHeight:
-        return size().height();
-    case PdmDepth: {
-        const QGLFormat f = format();
-        return f.redBufferSize() + f.greenBufferSize() + f.blueBufferSize() + f.alphaBufferSize();
-    }
-    case PdmDevicePixelRatio:
-        return 1;
-    case PdmDevicePixelRatioScaled:
-        return 1 * QPaintDevice::devicePixelRatioFScale();
-    default:
-        qWarning("QGLPaintDevice::metric() - metric %d not known", metric);
-        return 0;
-    }
-}
-
-void QGLPaintDevice::beginPaint()
-{
-    // Make sure our context is the current one:
-    QGLContext *ctx = context();
-    ctx->makeCurrent();
-
-    ctx->d_func()->refreshCurrentFbo();
-
-    // Record the currently bound FBO so we can restore it again
-    // in endPaint() and bind this device's FBO
-    //
-    // Note: m_thisFBO could be zero if the paint device is not
-    // backed by an FBO (e.g. window back buffer).  But there could
-    // be a previous FBO bound to the context which we need to
-    // explicitly unbind.  Otherwise the painting will go into
-    // the previous FBO instead of to the window.
-    m_previousFBO = ctx->d_func()->current_fbo;
-
-    if (m_previousFBO != m_thisFBO) {
-        ctx->d_func()->setCurrentFbo(m_thisFBO);
-        ctx->contextHandle()->functions()->glBindFramebuffer(GL_FRAMEBUFFER, m_thisFBO);
-    }
-
-    // Set the default fbo for the context to m_thisFBO so that
-    // if some raw GL code between beginNativePainting() and
-    // endNativePainting() calls QGLFramebufferObject::release(),
-    // painting will revert to the window surface's fbo.
-    ctx->d_ptr->default_fbo = m_thisFBO;
-}
-
-void QGLPaintDevice::ensureActiveTarget()
-{
-    QGLContext* ctx = context();
-    if (ctx != QGLContext::currentContext())
-        ctx->makeCurrent();
-
-    ctx->d_func()->refreshCurrentFbo();
-
-    if (ctx->d_ptr->current_fbo != m_thisFBO) {
-        ctx->d_func()->setCurrentFbo(m_thisFBO);
-        ctx->contextHandle()->functions()->glBindFramebuffer(GL_FRAMEBUFFER, m_thisFBO);
-    }
-
-    ctx->d_ptr->default_fbo = m_thisFBO;
-}
-
-void QGLPaintDevice::endPaint()
-{
-    // Make sure the FBO bound at beginPaint is re-bound again here:
-    QGLContext *ctx = context();
-    ctx->makeCurrent();
-
-    ctx->d_func()->refreshCurrentFbo();
-
-    if (m_previousFBO != ctx->d_func()->current_fbo) {
-        ctx->d_func()->setCurrentFbo(m_previousFBO);
-        ctx->contextHandle()->functions()->glBindFramebuffer(GL_FRAMEBUFFER, m_previousFBO);
-    }
-
-    ctx->d_ptr->default_fbo = 0;
-}
-
-QGLFormat QGLPaintDevice::format() const
-{
-    return context()->format();
-}
-
-bool QGLPaintDevice::alphaRequested() const
-{
-    return context()->d_func()->reqFormat.alpha();
-}
-
-bool QGLPaintDevice::isFlipped() const
-{
-    return false;
-}
-
-////////////////// QGLWidgetGLPaintDevice //////////////////
-
-QGLWidgetGLPaintDevice::QGLWidgetGLPaintDevice()
-{
-}
-
-QPaintEngine* QGLWidgetGLPaintDevice::paintEngine() const
-{
-    return glWidget->paintEngine();
-}
-
-void QGLWidgetGLPaintDevice::setWidget(QGLWidget* w)
-{
-    glWidget = w;
-}
-
-void QGLWidgetGLPaintDevice::beginPaint()
-{
-    QGLPaintDevice::beginPaint();
-    QOpenGLFunctions *funcs = QOpenGLContext::currentContext()->functions();
-    if (!glWidget->d_func()->disable_clear_on_painter_begin && glWidget->autoFillBackground()) {
-        if (glWidget->testAttribute(Qt::WA_TranslucentBackground))
-            funcs->glClearColor(0.0, 0.0, 0.0, 0.0);
-        else {
-            const QColor &c = glWidget->palette().brush(glWidget->backgroundRole()).color();
-            float alpha = c.alphaF();
-            funcs->glClearColor(c.redF() * alpha, c.greenF() * alpha, c.blueF() * alpha, alpha);
-        }
-        if (context()->d_func()->workaround_needsFullClearOnEveryFrame)
-            funcs->glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
-        else
-            funcs->glClear(GL_COLOR_BUFFER_BIT);
-    }
-}
-
-void QGLWidgetGLPaintDevice::endPaint()
-{
-    if (glWidget->autoBufferSwap())
-        glWidget->swapBuffers();
-    QGLPaintDevice::endPaint();
-}
-
-
-QSize QGLWidgetGLPaintDevice::size() const
-{
-    return glWidget->size() * (glWidget->windowHandle() ?
-                               glWidget->windowHandle()->devicePixelRatio() : qApp->devicePixelRatio());
-}
-
-QGLContext* QGLWidgetGLPaintDevice::context() const
-{
-    return const_cast<QGLContext*>(glWidget->context());
-}
-
-// returns the QGLPaintDevice for the given QPaintDevice
-QGLPaintDevice* QGLPaintDevice::getDevice(QPaintDevice* pd)
-{
-    QGLPaintDevice* glpd = 0;
-
-    switch(pd->devType()) {
-        case QInternal::Widget:
-            // Should not be called on a non-gl widget:
-            Q_ASSERT(qobject_cast<QGLWidget*>(static_cast<QWidget*>(pd)));
-            glpd = &(static_cast<QGLWidget*>(pd)->d_func()->glDevice);
-            break;
-        case QInternal::Pbuffer:
-            glpd = &(static_cast<QGLPixelBuffer*>(pd)->d_func()->glDevice);
-            break;
-        case QInternal::FramebufferObject:
-            glpd = &(static_cast<QGLFramebufferObject*>(pd)->d_func()->glDevice);
-            break;
-        case QInternal::Pixmap: {
-            qWarning("Pixmap type not supported for GL rendering");
-            break;
-        }
-        default:
-            qWarning("QGLPaintDevice::getDevice() - Unknown device type %d", pd->devType());
-            break;
-    }
-
-    return glpd;
-}
-
-QT_END_NAMESPACE
diff --git a/src/opengl/qglpaintdevice_p.h b/src/opengl/qglpaintdevice_p.h
deleted file mode 100644
index bfecdabd53..0000000000
--- a/src/opengl/qglpaintdevice_p.h
+++ /dev/null
@@ -1,113 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtOpenGL module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QGLPAINTDEVICE_P_H
-#define QGLPAINTDEVICE_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists for the convenience
-// of the Qt OpenGL module.  This header file may change from
-// version to version without notice, or even be removed.
-//
-// We mean it.
-//
-
-
-#include <qpaintdevice.h>
-#include <QtOpenGL/qgl.h>
-
-
-QT_BEGIN_NAMESPACE
-
-class Q_OPENGL_EXPORT QGLPaintDevice : public QPaintDevice
-{
-public:
-    QGLPaintDevice();
-    virtual ~QGLPaintDevice();
-
-    int devType() const override {return QInternal::OpenGL;}
-
-    virtual void beginPaint();
-    virtual void ensureActiveTarget();
-    virtual void endPaint();
-
-    virtual QGLContext* context() const = 0;
-    virtual QGLFormat format() const;
-    virtual QSize size() const = 0;
-    virtual bool alphaRequested() const;
-    virtual bool isFlipped() const;
-
-    // returns the QGLPaintDevice for the given QPaintDevice
-    static QGLPaintDevice* getDevice(QPaintDevice*);
-
-protected:
-    int metric(QPaintDevice::PaintDeviceMetric metric) const override;
-    GLuint m_previousFBO;
-    GLuint m_thisFBO;
-};
-
-
-// Wraps a QGLWidget
-class QGLWidget;
-class Q_OPENGL_EXPORT QGLWidgetGLPaintDevice : public QGLPaintDevice
-{
-public:
-    QGLWidgetGLPaintDevice();
-
-    virtual QPaintEngine* paintEngine() const override;
-
-    // QGLWidgets need to do swapBufers in endPaint:
-    virtual void beginPaint() override;
-    virtual void endPaint() override;
-    virtual QSize size() const override;
-    virtual QGLContext* context() const override;
-
-    void setWidget(QGLWidget*);
-
-private:
-    friend class QGLWidget;
-    QGLWidget *glWidget;
-};
-
-QT_END_NAMESPACE
-
-#endif // QGLPAINTDEVICE_P_H
diff --git a/src/opengl/qglpixelbuffer.cpp b/src/opengl/qglpixelbuffer.cpp
deleted file mode 100644
index e2f434ac3c..0000000000
--- a/src/opengl/qglpixelbuffer.cpp
+++ /dev/null
@@ -1,654 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtOpenGL module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-/*!
-    \class QGLPixelBuffer
-    \inmodule QtOpenGL
-    \brief The QGLPixelBuffer class encapsulates an OpenGL pbuffer.
-    \since 4.1
-    \obsolete
-
-    \ingroup painting-3D
-
-    Rendering into a pbuffer is normally done using full hardware
-    acceleration. This can be significantly faster than rendering
-    into a QPixmap.
-
-    There are three approaches to using this class:
-
-    \list 1
-    \li \b{We can draw into the pbuffer and convert it to a QImage
-       using toImage().} This is normally much faster than calling
-       QGLWidget::renderPixmap().
-
-    \li \b{We can draw into the pbuffer and copy the contents into
-       an OpenGL texture using updateDynamicTexture().} This allows
-       us to create dynamic textures and works on all systems
-       with pbuffer support.
-
-    \li \b{On systems that support it, we can bind the pbuffer to
-       an OpenGL texture.} The texture is then updated automatically
-       when the pbuffer contents change, eliminating the need for
-       additional copy operations. This is supported only on Windows
-       and \macos systems that provide the \c render_texture
-       extension. Note that under Windows, a multi-sampled pbuffer
-       can't be used in conjunction with the \c render_texture
-       extension. If a multi-sampled pbuffer is requested under
-       Windows, the \c render_texture extension is turned off for that
-       pbuffer.
-
-
-    \endlist
-
-    \note This class has been deprecated, use QOpenGLFramebufferObject
-    for offscreen rendering.
-
-    \section1 Threading
-
-    As of Qt 4.8, it's possible to render into a QGLPixelBuffer using
-    a QPainter in a separate thread. Note that OpenGL 2.0 or OpenGL ES
-    2.0 is required for this to work.
-
-    Pbuffers are provided by the OpenGL \c pbuffer extension; call
-    hasOpenGLPbuffer() to find out if the system provides pbuffers.
-*/
-
-#include <private/qopenglextensions_p.h>
-
-#include <QtCore/qglobal.h>
-#include <QtGui/qopenglframebufferobject.h>
-
-#include "gl2paintengineex/qpaintengineex_opengl2_p.h"
-
-#include <qglframebufferobject.h>
-#include <qglpixelbuffer.h>
-#include <private/qglpixelbuffer_p.h>
-#include <private/qfont_p.h>
-#include <qimage.h>
-
-QT_BEGIN_NAMESPACE
-
-extern QImage qt_gl_read_frame_buffer(const QSize&, bool, bool);
-
-
-QGLContext* QGLPBufferGLPaintDevice::context() const
-{
-    return pbuf->d_func()->qctx;
-}
-
-void QGLPBufferGLPaintDevice::beginPaint()
-{
-    pbuf->makeCurrent();
-    QGLPaintDevice::beginPaint();
-}
-
-void QGLPBufferGLPaintDevice::endPaint()
-{
-    QOpenGLContext::currentContext()->functions()->glFlush();
-    QGLPaintDevice::endPaint();
-}
-
-void QGLPBufferGLPaintDevice::setFbo(GLuint fbo)
-{
-    m_thisFBO = fbo;
-}
-
-void QGLPBufferGLPaintDevice::setPBuffer(QGLPixelBuffer* pb)
-{
-    pbuf = pb;
-}
-
-void QGLPixelBufferPrivate::common_init(const QSize &size, const QGLFormat &format, QGLWidget *shareWidget)
-{
-    Q_Q(QGLPixelBuffer);
-    if(init(size, format, shareWidget)) {
-        req_size = size;
-        req_format = format;
-        req_shareWidget = shareWidget;
-        invalid = false;
-        glDevice.setPBuffer(q);
-    }
-}
-
-/*!
-    Constructs an OpenGL pbuffer of the given \a size. If no \a
-    format is specified, the \l{QGLFormat::defaultFormat()}{default
-    format} is used. If the \a shareWidget parameter points to a
-    valid QGLWidget, the pbuffer will share its context with \a
-    shareWidget.
-
-    If you intend to bind this pbuffer as a dynamic texture, the width
-    and height components of \c size must be powers of two (e.g., 512
-    x 128).
-
-    \sa size(), format()
-*/
-QGLPixelBuffer::QGLPixelBuffer(const QSize &size, const QGLFormat &format, QGLWidget *shareWidget)
-    : d_ptr(new QGLPixelBufferPrivate(this))
-{
-    Q_D(QGLPixelBuffer);
-    d->common_init(size, format, shareWidget);
-}
-
-
-/*! \overload
-
-    Constructs an OpenGL pbuffer with the \a width and \a height. If
-    no \a format is specified, the
-    \l{QGLFormat::defaultFormat()}{default format} is used. If the \a
-    shareWidget parameter points to a valid QGLWidget, the pbuffer
-    will share its context with \a shareWidget.
-
-    If you intend to bind this pbuffer as a dynamic texture, the width
-    and height components of \c size must be powers of two (e.g., 512
-    x 128).
-
-    \sa size(), format()
-*/
-QGLPixelBuffer::QGLPixelBuffer(int width, int height, const QGLFormat &format, QGLWidget *shareWidget)
-    : d_ptr(new QGLPixelBufferPrivate(this))
-{
-    Q_D(QGLPixelBuffer);
-    d->common_init(QSize(width, height), format, shareWidget);
-}
-
-
-/*! \fn QGLPixelBuffer::~QGLPixelBuffer()
-
-    Destroys the pbuffer and frees any allocated resources.
-*/
-QGLPixelBuffer::~QGLPixelBuffer()
-{
-    Q_D(QGLPixelBuffer);
-
-    // defined in qpaintengine_opengl.cpp
-    QGLContext *current = const_cast<QGLContext *>(QGLContext::currentContext());
-    if (current != d->qctx)
-        makeCurrent();
-    d->cleanup();
-    if (current && current != d->qctx)
-        current->makeCurrent();
-}
-
-/*! \fn bool QGLPixelBuffer::makeCurrent()
-
-    Makes this pbuffer the current OpenGL rendering context. Returns
-    true on success; otherwise returns \c false.
-
-    \sa QGLContext::makeCurrent(), doneCurrent()
-*/
-
-bool QGLPixelBuffer::makeCurrent()
-{
-    Q_D(QGLPixelBuffer);
-    if (d->invalid)
-        return false;
-    d->qctx->makeCurrent();
-    if (!d->fbo) {
-        QOpenGLFramebufferObjectFormat format;
-        if (d->req_format.stencil())
-            format.setAttachment(QOpenGLFramebufferObject::CombinedDepthStencil);
-        else if (d->req_format.depth())
-            format.setAttachment(QOpenGLFramebufferObject::Depth);
-        if (d->req_format.sampleBuffers())
-            format.setSamples(d->req_format.samples());
-        d->fbo = new QOpenGLFramebufferObject(d->req_size, format);
-        d->fbo->bind();
-        d->glDevice.setFbo(d->fbo->handle());
-        QOpenGLContext::currentContext()->functions()->glViewport(0, 0, d->req_size.width(), d->req_size.height());
-    }
-    return true;
-}
-
-/*! \fn bool QGLPixelBuffer::doneCurrent()
-
-    Makes no context the current OpenGL context. Returns \c true on
-    success; otherwise returns \c false.
-*/
-
-bool QGLPixelBuffer::doneCurrent()
-{
-    Q_D(QGLPixelBuffer);
-    if (d->invalid)
-        return false;
-    d->qctx->doneCurrent();
-    return true;
-}
-
-/*!
-    Returns the context of this pixelbuffer.
-*/
-QGLContext *QGLPixelBuffer::context() const
-{
-    Q_D(const QGLPixelBuffer);
-    return d->qctx;
-}
-
-/*!
-    \fn GLuint QGLPixelBuffer::generateDynamicTexture() const
-
-    Generates and binds a 2D GL texture that is the same size as the
-    pbuffer, and returns the texture's ID. This can be used in
-    conjunction with bindToDynamicTexture() and
-    updateDynamicTexture().
-
-    \sa size()
-*/
-
-/*! \fn bool QGLPixelBuffer::bindToDynamicTexture(GLuint texture_id)
-
-    Binds the texture specified by \a texture_id to this pbuffer.
-    Returns \c true on success; otherwise returns \c false.
-
-    The texture must be of the same size and format as the pbuffer.
-
-    To unbind the texture, call releaseFromDynamicTexture(). While
-    the texture is bound, it is updated automatically when the
-    pbuffer contents change, eliminating the need for additional copy
-    operations.
-
-    Example:
-
-    \snippet code/src_opengl_qglpixelbuffer.cpp 0
-
-    \warning This function uses the \c {render_texture} extension,
-    which is currently not supported under X11. An alternative that
-    works on all systems (including X11) is to manually copy the
-    pbuffer contents to a texture using updateDynamicTexture().
-
-    \warning For the bindToDynamicTexture() call to succeed on the
-    \macos, the pbuffer needs a shared context, i.e. the
-    QGLPixelBuffer must be created with a share widget.
-
-    \sa generateDynamicTexture(), releaseFromDynamicTexture()
-*/
-
-/*! \fn void QGLPixelBuffer::releaseFromDynamicTexture()
-
-    Releases the pbuffer from any previously bound texture.
-
-    \sa bindToDynamicTexture()
-*/
-
-/*! \fn bool QGLPixelBuffer::hasOpenGLPbuffers()
-
-    Returns \c true if the OpenGL \c pbuffer extension is present on
-    this system; otherwise returns \c false.
-*/
-
-/*!
-    Copies the pbuffer contents into the texture specified with \a
-    texture_id.
-
-    The texture must be of the same size and format as the pbuffer.
-
-    Example:
-
-    \snippet code/src_opengl_qglpixelbuffer.cpp 1
-
-    An alternative on Windows and \macos systems that support the
-    \c render_texture extension is to use bindToDynamicTexture() to
-    get dynamic updates of the texture.
-
-    \sa generateDynamicTexture(), bindToDynamicTexture()
-*/
-void QGLPixelBuffer::updateDynamicTexture(GLuint texture_id) const
-{
-    Q_D(const QGLPixelBuffer);
-    if (d->invalid || !d->fbo)
-        return;
-
-    const QGLContext *ctx = QGLContext::currentContext();
-    if (!ctx)
-        return;
-
-#undef glBindFramebuffer
-
-#ifndef GL_READ_FRAMEBUFFER
-#define GL_READ_FRAMEBUFFER 0x8CA8
-#endif
-
-#ifndef GL_DRAW_FRAMEBUFFER
-#define GL_DRAW_FRAMEBUFFER 0x8CA9
-#endif
-
-    QOpenGLExtensions extensions(ctx->contextHandle());
-
-    ctx->d_ptr->refreshCurrentFbo();
-
-    if (d->blit_fbo) {
-        QOpenGLFramebufferObject::blitFramebuffer(d->blit_fbo, d->fbo);
-        extensions.glBindFramebuffer(GL_READ_FRAMEBUFFER, d->blit_fbo->handle());
-    }
-
-    extensions.glBindTexture(GL_TEXTURE_2D, texture_id);
-#ifndef QT_OPENGL_ES
-    GLenum format = ctx->contextHandle()->isOpenGLES() ? GL_RGBA : GL_RGBA8;
-    extensions.glCopyTexImage2D(GL_TEXTURE_2D, 0, format, 0, 0, d->req_size.width(), d->req_size.height(), 0);
-#else
-    extensions.glCopyTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 0, 0, d->req_size.width(), d->req_size.height(), 0);
-#endif
-
-    if (d->blit_fbo)
-        extensions.glBindFramebuffer(GL_READ_FRAMEBUFFER, ctx->d_func()->current_fbo);
-}
-
-/*!
-    Returns the size of the pbuffer.
-*/
-QSize QGLPixelBuffer::size() const
-{
-    Q_D(const QGLPixelBuffer);
-    return d->req_size;
-}
-
-/*!
-    Returns the contents of the pbuffer as a QImage.
-*/
-QImage QGLPixelBuffer::toImage() const
-{
-    Q_D(const QGLPixelBuffer);
-    if (d->invalid)
-        return QImage();
-
-    const_cast<QGLPixelBuffer *>(this)->makeCurrent();
-    if (d->fbo)
-        d->fbo->bind();
-    return qt_gl_read_frame_buffer(d->req_size, d->format.alpha(), true);
-}
-
-/*!
-    Returns the native pbuffer handle.
-*/
-Qt::HANDLE QGLPixelBuffer::handle() const
-{
-    Q_D(const QGLPixelBuffer);
-    if (d->invalid)
-        return 0;
-    return (Qt::HANDLE) d->pbuf;
-}
-
-/*!
-    Returns \c true if this pbuffer is valid; otherwise returns \c false.
-*/
-bool QGLPixelBuffer::isValid() const
-{
-    Q_D(const QGLPixelBuffer);
-    return !d->invalid;
-}
-
-Q_GLOBAL_STATIC(QGLEngineThreadStorage<QGL2PaintEngineEx>, qt_buffer_2_engine)
-
-/*! \reimp */
-QPaintEngine *QGLPixelBuffer::paintEngine() const
-{
-    return qt_buffer_2_engine()->engine();
-}
-
-/*! \reimp */
-int QGLPixelBuffer::metric(PaintDeviceMetric metric) const
-{
-    Q_D(const QGLPixelBuffer);
-
-    float dpmx = qt_defaultDpiX()*100./2.54;
-    float dpmy = qt_defaultDpiY()*100./2.54;
-    int w = d->req_size.width();
-    int h = d->req_size.height();
-    switch (metric) {
-    case PdmWidth:
-        return w;
-
-    case PdmHeight:
-        return h;
-
-    case PdmWidthMM:
-        return qRound(w * 1000 / dpmx);
-
-    case PdmHeightMM:
-        return qRound(h * 1000 / dpmy);
-
-    case PdmNumColors:
-        return 0;
-
-    case PdmDepth:
-        return 32;//d->depth;
-
-    case PdmDpiX:
-        return qRound(dpmx * 0.0254);
-
-    case PdmDpiY:
-        return qRound(dpmy * 0.0254);
-
-    case PdmPhysicalDpiX:
-        return qRound(dpmx * 0.0254);
-
-    case PdmPhysicalDpiY:
-        return qRound(dpmy * 0.0254);
-
-    case QPaintDevice::PdmDevicePixelRatio:
-        return 1;
-
-    case QPaintDevice::PdmDevicePixelRatioScaled:
-        return QPaintDevice::devicePixelRatioFScale();
-
-    default:
-        qWarning("QGLPixelBuffer::metric(), Unhandled metric type: %d\n", metric);
-        break;
-    }
-    return 0;
-}
-
-/*!
-    Generates and binds a 2D GL texture to the current context, based
-    on \a image. The generated texture id is returned and can be used
-    in later glBindTexture() calls.
-
-    The \a target parameter specifies the texture target.
-
-    Equivalent to calling QGLContext::bindTexture().
-
-    \sa deleteTexture()
-*/
-GLuint QGLPixelBuffer::bindTexture(const QImage &image, GLenum target)
-{
-    Q_D(QGLPixelBuffer);
-#ifndef QT_OPENGL_ES
-    GLenum format = QOpenGLContext::currentContext()->isOpenGLES() ? GL_RGBA : GL_RGBA8;
-    return d->qctx->bindTexture(image, target, GLint(format));
-#else
-    return d->qctx->bindTexture(image, target, GL_RGBA);
-#endif
-}
-
-/*! \overload
-
-    Generates and binds a 2D GL texture based on \a pixmap.
-
-    Equivalent to calling QGLContext::bindTexture().
-
-    \sa deleteTexture()
-*/
-GLuint QGLPixelBuffer::bindTexture(const QPixmap &pixmap, GLenum target)
-{
-    Q_D(QGLPixelBuffer);
-#ifndef QT_OPENGL_ES
-    GLenum format = QOpenGLContext::currentContext()->isOpenGLES() ? GL_RGBA : GL_RGBA8;
-    return d->qctx->bindTexture(pixmap, target, GLint(format));
-#else
-    return d->qctx->bindTexture(pixmap, target, GL_RGBA);
-#endif
-}
-
-/*! \overload
-
-    Reads the DirectDrawSurface (DDS) compressed file \a fileName and
-    generates a 2D GL texture from it.
-
-    Equivalent to calling QGLContext::bindTexture().
-
-    \sa deleteTexture()
-*/
-GLuint QGLPixelBuffer::bindTexture(const QString &fileName)
-{
-    Q_D(QGLPixelBuffer);
-    return d->qctx->bindTexture(fileName);
-}
-
-/*!
-    Removes the texture identified by \a texture_id from the texture cache.
-
-    Equivalent to calling QGLContext::deleteTexture().
- */
-void QGLPixelBuffer::deleteTexture(GLuint texture_id)
-{
-    Q_D(QGLPixelBuffer);
-    d->qctx->deleteTexture(texture_id);
-}
-
-/*!
-    \since 4.4
-
-    Draws the given texture, \a textureId, to the given target rectangle,
-    \a target, in OpenGL model space. The \a textureTarget should be a 2D
-    texture target.
-
-    Equivalent to the corresponding QGLContext::drawTexture().
-*/
-void QGLPixelBuffer::drawTexture(const QRectF &target, GLuint textureId, GLenum textureTarget)
-{
-    Q_D(QGLPixelBuffer);
-    d->qctx->drawTexture(target, textureId, textureTarget);
-}
-
-/*!
-    \since 4.4
-
-    Draws the given texture, \a textureId, at the given \a point in OpenGL model
-    space. The textureTarget parameter should be a 2D texture target.
-
-    Equivalent to the corresponding QGLContext::drawTexture().
-*/
-void QGLPixelBuffer::drawTexture(const QPointF &point, GLuint textureId, GLenum textureTarget)
-{
-    Q_D(QGLPixelBuffer);
-    d->qctx->drawTexture(point, textureId, textureTarget);
-}
-
-/*!
-    Returns the format of the pbuffer. The format may be different
-    from the one that was requested.
-*/
-QGLFormat QGLPixelBuffer::format() const
-{
-    Q_D(const QGLPixelBuffer);
-    return d->format;
-}
-
-/*! \fn int QGLPixelBuffer::devType() const
-    \internal
-*/
-
-bool QGLPixelBufferPrivate::init(const QSize &, const QGLFormat &f, QGLWidget *shareWidget)
-{
-    widget = new QGLWidget(f, 0, shareWidget);
-    widget->resize(1, 1);
-    qctx = const_cast<QGLContext *>(widget->context());
-    return widget->isValid();
-}
-
-bool QGLPixelBufferPrivate::cleanup()
-{
-    delete fbo;
-    fbo = 0;
-    delete blit_fbo;
-    blit_fbo = 0;
-    delete widget;
-    widget = 0;
-    return true;
-}
-
-bool QGLPixelBuffer::bindToDynamicTexture(GLuint texture_id)
-{
-    Q_UNUSED(texture_id);
-    return false;
-}
-
-void QGLPixelBuffer::releaseFromDynamicTexture()
-{
-}
-
-GLuint QGLPixelBuffer::generateDynamicTexture() const
-{
-    Q_D(const QGLPixelBuffer);
-    if (!d->fbo)
-        return 0;
-
-    if (d->fbo->format().samples() > 0
-        && QOpenGLExtensions(QOpenGLContext::currentContext())
-           .hasOpenGLExtension(QOpenGLExtensions::FramebufferBlit))
-    {
-        if (!d->blit_fbo)
-            const_cast<QOpenGLFramebufferObject *&>(d->blit_fbo) = new QOpenGLFramebufferObject(d->req_size);
-    } else {
-        return d->fbo->texture();
-    }
-
-    GLuint texture;
-    QOpenGLFunctions *funcs = QOpenGLContext::currentContext()->functions();
-
-    funcs->glGenTextures(1, &texture);
-    funcs->glBindTexture(GL_TEXTURE_2D, texture);
-
-    funcs->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
-    funcs->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
-    funcs->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-    funcs->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-
-    funcs->glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, d->req_size.width(), d->req_size.height(), 0,
-                        GL_RGBA, GL_UNSIGNED_BYTE, 0);
-
-    return texture;
-}
-
-bool QGLPixelBuffer::hasOpenGLPbuffers()
-{
-    return QGLFramebufferObject::hasOpenGLFramebufferObjects();
-}
-
-QT_END_NAMESPACE
diff --git a/src/opengl/qglpixelbuffer.h b/src/opengl/qglpixelbuffer.h
deleted file mode 100644
index f5d7929c35..0000000000
--- a/src/opengl/qglpixelbuffer.h
+++ /dev/null
@@ -1,104 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtOpenGL module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QGLPIXELBUFFER_H
-#define QGLPIXELBUFFER_H
-
-#include <QtOpenGL/qgl.h>
-#include <QtGui/qpaintdevice.h>
-
-QT_BEGIN_NAMESPACE
-
-
-class QGLPixelBufferPrivate;
-
-class Q_OPENGL_EXPORT QGLPixelBuffer : public QPaintDevice
-{
-    Q_DECLARE_PRIVATE(QGLPixelBuffer)
-public:
-    QGLPixelBuffer(const QSize &size, const QGLFormat &format = QGLFormat::defaultFormat(),
-                   QGLWidget *shareWidget = nullptr);
-    QGLPixelBuffer(int width, int height, const QGLFormat &format = QGLFormat::defaultFormat(),
-                   QGLWidget *shareWidget = nullptr);
-    virtual ~QGLPixelBuffer();
-
-    bool isValid() const;
-    bool makeCurrent();
-    bool doneCurrent();
-
-    QGLContext *context() const;
-
-    GLuint generateDynamicTexture() const;
-    bool bindToDynamicTexture(GLuint texture);
-    void releaseFromDynamicTexture();
-    void updateDynamicTexture(GLuint texture_id) const;
-
-    GLuint bindTexture(const QImage &image, GLenum target = GL_TEXTURE_2D);
-    GLuint bindTexture(const QPixmap &pixmap, GLenum target = GL_TEXTURE_2D);
-    GLuint bindTexture(const QString &fileName);
-    void deleteTexture(GLuint texture_id);
-
-    void drawTexture(const QRectF &target, GLuint textureId, GLenum textureTarget = GL_TEXTURE_2D);
-    void drawTexture(const QPointF &point, GLuint textureId, GLenum textureTarget = GL_TEXTURE_2D);
-
-    QSize size() const;
-    Qt::HANDLE handle() const;
-    QImage toImage() const;
-
-    QPaintEngine *paintEngine() const override;
-    QGLFormat format() const;
-
-    static bool hasOpenGLPbuffers();
-
-protected:
-    int metric(PaintDeviceMetric metric) const override;
-    int devType() const override { return QInternal::Pbuffer; }
-
-private:
-    Q_DISABLE_COPY(QGLPixelBuffer)
-    QScopedPointer<QGLPixelBufferPrivate> d_ptr;
-    friend class QGLDrawable;
-    friend class QGLPaintDevice;
-    friend class QGLPBufferGLPaintDevice;
-    friend class QGLContextPrivate;
-};
-
-QT_END_NAMESPACE
-
-#endif // QGLPIXELBUFFER_H
diff --git a/src/opengl/qglpixelbuffer_p.h b/src/opengl/qglpixelbuffer_p.h
deleted file mode 100644
index 2729ade2b6..0000000000
--- a/src/opengl/qglpixelbuffer_p.h
+++ /dev/null
@@ -1,107 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtOpenGL module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QGLPIXELBUFFER_P_H
-#define QGLPIXELBUFFER_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API. It exists purely as an
-// implementation detail. This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include "QtOpenGL/qglpixelbuffer.h"
-#include <private/qgl_p.h>
-#include <private/qglpaintdevice_p.h>
-
-QT_BEGIN_NAMESPACE
-
-class QEglContext;
-class QOpenGLFramebufferObject;
-
-class QGLPBufferGLPaintDevice : public QGLPaintDevice
-{
-public:
-    QPaintEngine* paintEngine() const override {return pbuf->paintEngine();}
-    QSize size() const override {return pbuf->size();}
-    QGLContext* context() const override;
-    void beginPaint() override;
-    void endPaint() override;
-    void setPBuffer(QGLPixelBuffer* pb);
-    void setFbo(GLuint fbo);
-private:
-    QGLPixelBuffer* pbuf;
-};
-
-class QGLPixelBufferPrivate {
-    Q_DECLARE_PUBLIC(QGLPixelBuffer)
-public:
-    QGLPixelBufferPrivate(QGLPixelBuffer *q) : q_ptr(q), invalid(true), qctx(nullptr), widget(nullptr), fbo(nullptr), blit_fbo(nullptr), pbuf(nullptr), ctx(nullptr)
-    {
-    }
-    bool init(const QSize &size, const QGLFormat &f, QGLWidget *shareWidget);
-    void common_init(const QSize &size, const QGLFormat &f, QGLWidget *shareWidget);
-    bool cleanup();
-
-    QGLPixelBuffer *q_ptr;
-    bool invalid;
-    QGLContext *qctx;
-    QGLPBufferGLPaintDevice glDevice;
-    QGLWidget *widget;
-    QOpenGLFramebufferObject *fbo;
-    QOpenGLFramebufferObject *blit_fbo;
-    QGLFormat format;
-
-    QGLFormat req_format;
-    QPointer<QGLWidget> req_shareWidget;
-    QSize req_size;
-
-    //stubs
-    void *pbuf;
-    void *ctx;
-};
-
-QT_END_NAMESPACE
-
-#endif // QGLPIXELBUFFER_P_H
diff --git a/src/opengl/qglshaderprogram.cpp b/src/opengl/qglshaderprogram.cpp
deleted file mode 100644
index 35f60318be..0000000000
--- a/src/opengl/qglshaderprogram.cpp
+++ /dev/null
@@ -1,3237 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtOpenGL module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qglshaderprogram.h"
-#include <private/qopenglextensions_p.h>
-#include "qgl_p.h"
-#include <QtCore/private/qobject_p.h>
-#include <QtCore/qdebug.h>
-#include <QtCore/qfile.h>
-#include <QtCore/qvarlengtharray.h>
-#include <QtCore/qvector.h>
-#include <QDebug>
-
-QT_BEGIN_NAMESPACE
-
-/*!
-    \class QGLShaderProgram
-    \inmodule QtOpenGL
-    \brief The QGLShaderProgram class allows OpenGL shader programs to be linked and used.
-    \since 4.6
-    \obsolete
-    \ingroup painting-3D
-
-    \section1 Introduction
-
-    This class supports shader programs written in the OpenGL Shading
-    Language (GLSL) and in the OpenGL/ES Shading Language (GLSL/ES).
-
-    QGLShader and QGLShaderProgram shelter the programmer from the details of
-    compiling and linking vertex and fragment shaders.
-
-    The following example creates a vertex shader program using the
-    supplied source \c{code}.  Once compiled and linked, the shader
-    program is activated in the current QGLContext by calling
-    QGLShaderProgram::bind():
-
-    \snippet code/src_opengl_qglshaderprogram.cpp 0
-
-    \section1 Writing Portable Shaders
-
-    Shader programs can be difficult to reuse across OpenGL implementations
-    because of varying levels of support for standard vertex attributes and
-    uniform variables.  In particular, GLSL/ES lacks all of the
-    standard variables that are present on desktop OpenGL systems:
-    \c{gl_Vertex}, \c{gl_Normal}, \c{gl_Color}, and so on.  Desktop OpenGL
-    lacks the variable qualifiers \c{highp}, \c{mediump}, and \c{lowp}.
-
-    The QGLShaderProgram class makes the process of writing portable shaders
-    easier by prefixing all shader programs with the following lines on
-    desktop OpenGL:
-
-    \code
-    #define highp
-    #define mediump
-    #define lowp
-    \endcode
-
-    This makes it possible to run most GLSL/ES shader programs
-    on desktop systems.  The programmer should restrict themselves
-    to just features that are present in GLSL/ES, and avoid
-    standard variable names that only work on the desktop.
-
-    \section1 Simple Shader Example
-
-    \snippet code/src_opengl_qglshaderprogram.cpp 1
-
-    With the above shader program active, we can draw a green triangle
-    as follows:
-
-    \snippet code/src_opengl_qglshaderprogram.cpp 2
-
-    \section1 Binary Shaders and Programs
-
-    Binary shaders may be specified using \c{glShaderBinary()} on
-    the return value from QGLShader::shaderId().  The QGLShader instance
-    containing the binary can then be added to the shader program with
-    addShader() and linked in the usual fashion with link().
-
-    Binary programs may be specified using \c{glProgramBinaryOES()}
-    on the return value from programId().  Then the application should
-    call link(), which will notice that the program has already been
-    specified and linked, allowing other operations to be performed
-    on the shader program.
-
-    \note This class has been deprecated in favor of QOpenGLShaderProgram.
-
-    \sa QGLShader
-*/
-
-/*!
-    \class QGLShader
-    \inmodule QtOpenGL
-    \brief The QGLShader class allows OpenGL shaders to be compiled.
-    \since 4.6
-    \obsolete
-    \ingroup painting-3D
-
-    This class supports shaders written in the OpenGL Shading Language (GLSL)
-    and in the OpenGL/ES Shading Language (GLSL/ES).
-
-    QGLShader and QGLShaderProgram shelter the programmer from the details of
-    compiling and linking vertex and fragment shaders.
-
-    \note This class has been deprecated in favor of QOpenGLShader.
-
-    \sa QGLShaderProgram
-*/
-
-/*!
-    \enum QGLShader::ShaderTypeBit
-    This enum specifies the type of QGLShader that is being created.
-
-    \value Vertex Vertex shader written in the OpenGL Shading Language (GLSL).
-    \value Fragment Fragment shader written in the OpenGL Shading Language (GLSL).
-    \value Geometry Geometry shaders written in the OpenGL Shading
-           Language (GLSL), based on the GL_EXT_geometry_shader4 extension.
-*/
-
-#ifndef GL_FRAGMENT_SHADER
-#define GL_FRAGMENT_SHADER 0x8B30
-#endif
-#ifndef GL_VERTEX_SHADER
-#define GL_VERTEX_SHADER 0x8B31
-#endif
-#ifndef GL_COMPILE_STATUS
-#define GL_COMPILE_STATUS 0x8B81
-#endif
-#ifndef GL_LINK_STATUS
-#define GL_LINK_STATUS 0x8B82
-#endif
-#ifndef GL_INFO_LOG_LENGTH
-#define GL_INFO_LOG_LENGTH 0x8B84
-#endif
-#ifndef GL_ACTIVE_UNIFORMS
-#define GL_ACTIVE_UNIFORMS 0x8B86
-#endif
-#ifndef GL_ACTIVE_UNIFORM_MAX_LENGTH
-#define GL_ACTIVE_UNIFORM_MAX_LENGTH 0x8B87
-#endif
-#ifndef GL_ACTIVE_ATTRIBUTES
-#define GL_ACTIVE_ATTRIBUTES 0x8B89
-#endif
-#ifndef GL_ACTIVE_ATTRIBUTE_MAX_LENGTH
-#define GL_ACTIVE_ATTRIBUTE_MAX_LENGTH 0x8B8A
-#endif
-#ifndef GL_CURRENT_VERTEX_ATTRIB
-#define GL_CURRENT_VERTEX_ATTRIB 0x8626
-#endif
-#ifndef GL_SHADER_SOURCE_LENGTH
-#define GL_SHADER_SOURCE_LENGTH 0x8B88
-#endif
-#ifndef GL_SHADER_BINARY_FORMATS
-#define GL_SHADER_BINARY_FORMATS          0x8DF8
-#endif
-#ifndef GL_NUM_SHADER_BINARY_FORMATS
-#define GL_NUM_SHADER_BINARY_FORMATS      0x8DF9
-#endif
-
-class QGLShaderPrivate : public QObjectPrivate
-{
-    Q_DECLARE_PUBLIC(QGLShader)
-public:
-    QGLShaderPrivate(const QGLContext *ctx, QGLShader::ShaderType type)
-        : shaderGuard(0)
-        , shaderType(type)
-        , compiled(false)
-        , glfuncs(new QOpenGLFunctions(ctx->contextHandle()))
-    {
-    }
-    ~QGLShaderPrivate();
-
-    QGLSharedResourceGuardBase *shaderGuard;
-    QGLShader::ShaderType shaderType;
-    bool compiled;
-    QString log;
-
-    QOpenGLFunctions *glfuncs;
-
-    bool create();
-    bool compile(QGLShader *q);
-    void deleteShader();
-};
-
-namespace {
-    void freeShaderFunc(QGLContext *ctx, GLuint id)
-    {
-        Q_ASSERT(ctx);
-        ctx->contextHandle()->functions()->glDeleteShader(id);
-    }
-}
-
-#define ctx QGLContext::currentContext()
-
-QGLShaderPrivate::~QGLShaderPrivate()
-{
-    delete glfuncs;
-    if (shaderGuard)
-        shaderGuard->free();
-}
-
-bool QGLShaderPrivate::create()
-{
-    QGLContext *context = const_cast<QGLContext *>(QGLContext::currentContext());
-    if (!context)
-        return false;
-
-    if (glfuncs->hasOpenGLFeature(QOpenGLFunctions::Shaders)) {
-        GLuint shader;
-        if (shaderType == QGLShader::Vertex)
-            shader = glfuncs->glCreateShader(GL_VERTEX_SHADER);
-#if !defined(QT_OPENGL_ES_2)
-        else if (shaderType == QGLShader::Geometry
-                 && !context->contextHandle()->isOpenGLES())
-            shader = glfuncs->glCreateShader(GL_GEOMETRY_SHADER_EXT);
-#endif
-        else
-            shader = glfuncs->glCreateShader(GL_FRAGMENT_SHADER);
-        if (!shader) {
-            qWarning("Could not create shader of type %d.", int(shaderType));
-            return false;
-        }
-        shaderGuard = createSharedResourceGuard(context, shader, freeShaderFunc);
-        return true;
-    } else {
-        return false;
-    }
-}
-
-bool QGLShaderPrivate::compile(QGLShader *q)
-{
-    GLuint shader = shaderGuard ? shaderGuard->id() : 0;
-    if (!shader)
-        return false;
-    glfuncs->glCompileShader(shader);
-    GLint value = 0;
-    glfuncs->glGetShaderiv(shader, GL_COMPILE_STATUS, &value);
-    compiled = (value != 0);
-    value = 0;
-    glfuncs->glGetShaderiv(shader, GL_INFO_LOG_LENGTH, &value);
-    if (!compiled && value > 1) {
-        char *logbuf = new char [value];
-        GLint len;
-        glfuncs->glGetShaderInfoLog(shader, value, &len, logbuf);
-        log = QString::fromLatin1(logbuf);
-        QString name = q->objectName();
-
-        const char *types[] = {
-            "Fragment",
-            "Vertex",
-            "Geometry",
-            ""
-        };
-
-        const char *type = types[3];
-        if (shaderType == QGLShader::Fragment)
-            type = types[0];
-        else if (shaderType == QGLShader::Vertex)
-            type = types[1];
-        else if (shaderType == QGLShader::Geometry)
-            type = types[2];
-
-        if (name.isEmpty())
-            qWarning("QGLShader::compile(%s): %s", type, qPrintable(log));
-        else
-            qWarning("QGLShader::compile(%s)[%s]: %s", type, qPrintable(name), qPrintable(log));
-
-        delete [] logbuf;
-    }
-    return compiled;
-}
-
-void QGLShaderPrivate::deleteShader()
-{
-    if (shaderGuard) {
-        shaderGuard->free();
-        shaderGuard = 0;
-    }
-}
-
-/*!
-    Constructs a new QGLShader object of the specified \a type
-    and attaches it to \a parent.  If shader programs are not supported,
-    QGLShaderProgram::hasOpenGLShaderPrograms() will return false.
-
-    This constructor is normally followed by a call to compileSourceCode()
-    or compileSourceFile().
-
-    The shader will be associated with the current QGLContext.
-
-    \sa compileSourceCode(), compileSourceFile()
-*/
-QGLShader::QGLShader(QGLShader::ShaderType type, QObject *parent)
-    : QObject(*new QGLShaderPrivate(QGLContext::currentContext(), type), parent)
-{
-    Q_D(QGLShader);
-    d->create();
-}
-
-/*!
-    Constructs a new QGLShader object of the specified \a type
-    and attaches it to \a parent.  If shader programs are not supported,
-    then QGLShaderProgram::hasOpenGLShaderPrograms() will return false.
-
-    This constructor is normally followed by a call to compileSourceCode()
-    or compileSourceFile().
-
-    The shader will be associated with \a context.
-
-    \sa compileSourceCode(), compileSourceFile()
-*/
-QGLShader::QGLShader(QGLShader::ShaderType type, const QGLContext *context, QObject *parent)
-    : QObject(*new QGLShaderPrivate(context ? context : QGLContext::currentContext(), type), parent)
-{
-    Q_D(QGLShader);
-#ifndef QT_NO_DEBUG
-    if (context && !QGLContext::areSharing(context, QGLContext::currentContext())) {
-        qWarning("QGLShader::QGLShader: \'context\' must be the current context or sharing with it.");
-        return;
-    }
-#endif
-    d->create();
-}
-
-/*!
-    Deletes this shader.  If the shader has been attached to a
-    QGLShaderProgram object, then the actual shader will stay around
-    until the QGLShaderProgram is destroyed.
-*/
-QGLShader::~QGLShader()
-{
-}
-
-/*!
-    Returns the type of this shader.
-*/
-QGLShader::ShaderType QGLShader::shaderType() const
-{
-    Q_D(const QGLShader);
-    return d->shaderType;
-}
-
-// The precision qualifiers are useful on OpenGL/ES systems,
-// but usually not present on desktop systems.  Define the
-// keywords to empty strings on desktop systems.
-#if !defined(QT_OPENGL_ES) || defined(QT_OPENGL_FORCE_SHADER_DEFINES)
-#define QGL_DEFINE_QUALIFIERS 1
-static const char qualifierDefines[] =
-    "#define lowp\n"
-    "#define mediump\n"
-    "#define highp\n";
-
-#else
-
-// The "highp" qualifier doesn't exist in fragment shaders
-// on all ES platforms.  When it doesn't exist, use "mediump".
-#define QGL_REDEFINE_HIGHP 1
-static const char redefineHighp[] =
-    "#ifndef GL_FRAGMENT_PRECISION_HIGH\n"
-    "#define highp mediump\n"
-    "#endif\n";
-#endif
-
-/*!
-    Sets the \a source code for this shader and compiles it.
-    Returns \c true if the source was successfully compiled, false otherwise.
-
-    \sa compileSourceFile()
-*/
-bool QGLShader::compileSourceCode(const char *source)
-{
-    Q_D(QGLShader);
-    if (d->shaderGuard && d->shaderGuard->id()) {
-        QVarLengthArray<const char *, 4> src;
-        QVarLengthArray<GLint, 4> srclen;
-        int headerLen = 0;
-        while (source && source[headerLen] == '#') {
-            // Skip #version and #extension directives at the start of
-            // the shader code.  We need to insert the qualifierDefines
-            // and redefineHighp just after them.
-            if (qstrncmp(source + headerLen, "#version", 8) != 0 &&
-                    qstrncmp(source + headerLen, "#extension", 10) != 0) {
-                break;
-            }
-            while (source[headerLen] != '\0' && source[headerLen] != '\n')
-                ++headerLen;
-            if (source[headerLen] == '\n')
-                ++headerLen;
-        }
-        if (headerLen > 0) {
-            src.append(source);
-            srclen.append(GLint(headerLen));
-        }
-#ifdef QGL_DEFINE_QUALIFIERS
-        if (!QOpenGLContext::currentContext()->isOpenGLES()) {
-            src.append(qualifierDefines);
-            srclen.append(GLint(sizeof(qualifierDefines) - 1));
-        }
-#endif
-#ifdef QGL_REDEFINE_HIGHP
-        if (d->shaderType == Fragment
-            && QOpenGLContext::currentContext()->isOpenGLES()) {
-            src.append(redefineHighp);
-            srclen.append(GLint(sizeof(redefineHighp) - 1));
-        }
-#endif
-        src.append(source + headerLen);
-        srclen.append(GLint(qstrlen(source + headerLen)));
-        d->glfuncs->glShaderSource(d->shaderGuard->id(), src.size(), src.data(), srclen.data());
-        return d->compile(this);
-    } else {
-        return false;
-    }
-}
-
-/*!
-    \overload
-
-    Sets the \a source code for this shader and compiles it.
-    Returns \c true if the source was successfully compiled, false otherwise.
-
-    \sa compileSourceFile()
-*/
-bool QGLShader::compileSourceCode(const QByteArray& source)
-{
-    return compileSourceCode(source.constData());
-}
-
-/*!
-    \overload
-
-    Sets the \a source code for this shader and compiles it.
-    Returns \c true if the source was successfully compiled, false otherwise.
-
-    \sa compileSourceFile()
-*/
-bool QGLShader::compileSourceCode(const QString& source)
-{
-    return compileSourceCode(source.toLatin1().constData());
-}
-
-/*!
-    Sets the source code for this shader to the contents of \a fileName
-    and compiles it.  Returns \c true if the file could be opened and the
-    source compiled, false otherwise.
-
-    \sa compileSourceCode()
-*/
-bool QGLShader::compileSourceFile(const QString& fileName)
-{
-    QFile file(fileName);
-    if (!file.open(QFile::ReadOnly)) {
-        qWarning() << "QGLShader: Unable to open file" << fileName;
-        return false;
-    }
-
-    QByteArray contents = file.readAll();
-    return compileSourceCode(contents.constData());
-}
-
-/*!
-    Returns the source code for this shader.
-
-    \sa compileSourceCode()
-*/
-QByteArray QGLShader::sourceCode() const
-{
-    Q_D(const QGLShader);
-    GLuint shader = d->shaderGuard ? d->shaderGuard->id() : 0;
-    if (!shader)
-        return QByteArray();
-    GLint size = 0;
-    d->glfuncs->glGetShaderiv(shader, GL_SHADER_SOURCE_LENGTH, &size);
-    if (size <= 0)
-        return QByteArray();
-    GLint len = 0;
-    char *source = new char [size];
-    d->glfuncs->glGetShaderSource(shader, size, &len, source);
-    QByteArray src(source);
-    delete [] source;
-    return src;
-}
-
-/*!
-    Returns \c true if this shader has been compiled; false otherwise.
-
-    \sa compileSourceCode(), compileSourceFile()
-*/
-bool QGLShader::isCompiled() const
-{
-    Q_D(const QGLShader);
-    return d->compiled;
-}
-
-/*!
-    Returns the errors and warnings that occurred during the last compile.
-
-    \sa compileSourceCode(), compileSourceFile()
-*/
-QString QGLShader::log() const
-{
-    Q_D(const QGLShader);
-    return d->log;
-}
-
-/*!
-    Returns the OpenGL identifier associated with this shader.
-
-    \sa QGLShaderProgram::programId()
-*/
-GLuint QGLShader::shaderId() const
-{
-    Q_D(const QGLShader);
-    return d->shaderGuard ? d->shaderGuard->id() : 0;
-}
-
-#undef ctx
-
-class ShaderProgramOpenGLFunctions : public QOpenGLFunctions
-{
-public:
-    ShaderProgramOpenGLFunctions()
-        : QOpenGLFunctions()
-        , glProgramParameteri(0)
-    {
-    }
-
-    typedef void (QOPENGLF_APIENTRYP type_glProgramParameteri)(GLuint program, GLenum pname, GLint value);
-
-    void initializeGeometryShaderFunctions()
-    {
-        QOpenGLContext *context = QOpenGLContext::currentContext();
-        if (!context->isOpenGLES()) {
-            glProgramParameteri = (type_glProgramParameteri)
-                context->getProcAddress("glProgramParameteri");
-
-            if (!glProgramParameteri) {
-                glProgramParameteri = (type_glProgramParameteri)
-                    context->getProcAddress("glProgramParameteriEXT");
-            }
-        }
-    }
-
-    type_glProgramParameteri glProgramParameteri;
-};
-
-class QGLShaderProgramPrivate : public QObjectPrivate
-{
-    Q_DECLARE_PUBLIC(QGLShaderProgram)
-public:
-    QGLShaderProgramPrivate(const QGLContext *)
-        : programGuard(0)
-        , linked(false)
-        , inited(false)
-        , removingShaders(false)
-        , geometryVertexCount(64)
-        , geometryInputType(0)
-        , geometryOutputType(0)
-        , glfuncs(new ShaderProgramOpenGLFunctions)
-    {
-    }
-    ~QGLShaderProgramPrivate();
-
-    QGLSharedResourceGuardBase *programGuard;
-    bool linked;
-    bool inited;
-    bool removingShaders;
-
-    int geometryVertexCount;
-    GLenum geometryInputType;
-    GLenum geometryOutputType;
-
-    QString log;
-    QList<QGLShader *> shaders;
-    QList<QGLShader *> anonShaders;
-
-    ShaderProgramOpenGLFunctions *glfuncs;
-
-    bool hasShader(QGLShader::ShaderType type) const;
-};
-
-namespace {
-    void freeProgramFunc(QGLContext *ctx, GLuint id)
-    {
-        Q_ASSERT(ctx);
-        ctx->contextHandle()->functions()->glDeleteProgram(id);
-    }
-}
-
-
-QGLShaderProgramPrivate::~QGLShaderProgramPrivate()
-{
-    delete glfuncs;
-    if (programGuard)
-        programGuard->free();
-}
-
-bool QGLShaderProgramPrivate::hasShader(QGLShader::ShaderType type) const
-{
-    for (QGLShader *shader : shaders) {
-        if (shader->shaderType() == type)
-            return true;
-    }
-    return false;
-}
-
-#define ctx QGLContext::currentContext()
-
-/*!
-    Constructs a new shader program and attaches it to \a parent.
-    The program will be invalid until addShader() is called.
-
-    The shader program will be associated with the current QGLContext.
-
-    \sa addShader()
-*/
-QGLShaderProgram::QGLShaderProgram(QObject *parent)
-    : QObject(*new QGLShaderProgramPrivate(QGLContext::currentContext()), parent)
-{
-}
-
-/*!
-    Constructs a new shader program and attaches it to \a parent.
-    The program will be invalid until addShader() is called.
-
-    The shader program will be associated with \a context.
-
-    \sa addShader()
-*/
-QGLShaderProgram::QGLShaderProgram(const QGLContext *context, QObject *parent)
-    : QObject(*new QGLShaderProgramPrivate(context), parent)
-{
-}
-
-/*!
-    Deletes this shader program.
-*/
-QGLShaderProgram::~QGLShaderProgram()
-{
-}
-
-bool QGLShaderProgram::init()
-{
-    Q_D(QGLShaderProgram);
-    if ((d->programGuard && d->programGuard->id()) || d->inited)
-        return true;
-    d->inited = true;
-    QGLContext *context = const_cast<QGLContext *>(QGLContext::currentContext());
-    if (!context)
-        return false;
-    d->glfuncs->initializeOpenGLFunctions();
-    d->glfuncs->initializeGeometryShaderFunctions();
-    if (d->glfuncs->hasOpenGLFeature(QOpenGLFunctions::Shaders)) {
-        GLuint program = d->glfuncs->glCreateProgram();
-        if (!program) {
-            qWarning("QGLShaderProgram: could not create shader program");
-            return false;
-        }
-        if (d->programGuard)
-            delete d->programGuard;
-        d->programGuard = createSharedResourceGuard(context, program, freeProgramFunc);
-        return true;
-    } else {
-        qWarning("QGLShaderProgram: shader programs are not supported");
-        return false;
-    }
-}
-
-/*!
-    Adds a compiled \a shader to this shader program.  Returns \c true
-    if the shader could be added, or false otherwise.
-
-    Ownership of the \a shader object remains with the caller.
-    It will not be deleted when this QGLShaderProgram instance
-    is deleted.  This allows the caller to add the same shader
-    to multiple shader programs.
-
-    \sa addShaderFromSourceCode(), addShaderFromSourceFile()
-    \sa removeShader(), link(), removeAllShaders()
-*/
-bool QGLShaderProgram::addShader(QGLShader *shader)
-{
-    Q_D(QGLShaderProgram);
-    if (!init())
-        return false;
-    if (d->shaders.contains(shader))
-        return true;    // Already added to this shader program.
-    if (d->programGuard && d->programGuard->id() && shader) {
-        if (!shader->d_func()->shaderGuard || !shader->d_func()->shaderGuard->id())
-            return false;
-        if (d->programGuard->group() != shader->d_func()->shaderGuard->group()) {
-            qWarning("QGLShaderProgram::addShader: Program and shader are not associated with same context.");
-            return false;
-        }
-        d->glfuncs->glAttachShader(d->programGuard->id(), shader->d_func()->shaderGuard->id());
-        d->linked = false;  // Program needs to be relinked.
-        d->shaders.append(shader);
-        connect(shader, SIGNAL(destroyed()), this, SLOT(shaderDestroyed()));
-        return true;
-    } else {
-        return false;
-    }
-}
-
-/*!
-    Compiles \a source as a shader of the specified \a type and
-    adds it to this shader program.  Returns \c true if compilation
-    was successful, false otherwise.  The compilation errors
-    and warnings will be made available via log().
-
-    This function is intended to be a short-cut for quickly
-    adding vertex and fragment shaders to a shader program without
-    creating an instance of QGLShader first.
-
-    \sa addShader(), addShaderFromSourceFile()
-    \sa removeShader(), link(), log(), removeAllShaders()
-*/
-bool QGLShaderProgram::addShaderFromSourceCode(QGLShader::ShaderType type, const char *source)
-{
-    Q_D(QGLShaderProgram);
-    if (!init())
-        return false;
-    QGLShader *shader = new QGLShader(type, this);
-    if (!shader->compileSourceCode(source)) {
-        d->log = shader->log();
-        delete shader;
-        return false;
-    }
-    d->anonShaders.append(shader);
-    return addShader(shader);
-}
-
-/*!
-    \overload
-
-    Compiles \a source as a shader of the specified \a type and
-    adds it to this shader program.  Returns \c true if compilation
-    was successful, false otherwise.  The compilation errors
-    and warnings will be made available via log().
-
-    This function is intended to be a short-cut for quickly
-    adding vertex and fragment shaders to a shader program without
-    creating an instance of QGLShader first.
-
-    \sa addShader(), addShaderFromSourceFile()
-    \sa removeShader(), link(), log(), removeAllShaders()
-*/
-bool QGLShaderProgram::addShaderFromSourceCode(QGLShader::ShaderType type, const QByteArray& source)
-{
-    return addShaderFromSourceCode(type, source.constData());
-}
-
-/*!
-    \overload
-
-    Compiles \a source as a shader of the specified \a type and
-    adds it to this shader program.  Returns \c true if compilation
-    was successful, false otherwise.  The compilation errors
-    and warnings will be made available via log().
-
-    This function is intended to be a short-cut for quickly
-    adding vertex and fragment shaders to a shader program without
-    creating an instance of QGLShader first.
-
-    \sa addShader(), addShaderFromSourceFile()
-    \sa removeShader(), link(), log(), removeAllShaders()
-*/
-bool QGLShaderProgram::addShaderFromSourceCode(QGLShader::ShaderType type, const QString& source)
-{
-    return addShaderFromSourceCode(type, source.toLatin1().constData());
-}
-
-/*!
-    Compiles the contents of \a fileName as a shader of the specified
-    \a type and adds it to this shader program.  Returns \c true if
-    compilation was successful, false otherwise.  The compilation errors
-    and warnings will be made available via log().
-
-    This function is intended to be a short-cut for quickly
-    adding vertex and fragment shaders to a shader program without
-    creating an instance of QGLShader first.
-
-    \sa addShader(), addShaderFromSourceCode()
-*/
-bool QGLShaderProgram::addShaderFromSourceFile
-    (QGLShader::ShaderType type, const QString& fileName)
-{
-    Q_D(QGLShaderProgram);
-    if (!init())
-        return false;
-    QGLShader *shader = new QGLShader(type, this);
-    if (!shader->compileSourceFile(fileName)) {
-        d->log = shader->log();
-        delete shader;
-        return false;
-    }
-    d->anonShaders.append(shader);
-    return addShader(shader);
-}
-
-/*!
-    Removes \a shader from this shader program.  The object is not deleted.
-
-    The shader program must be valid in the current QGLContext.
-
-    \sa addShader(), link(), removeAllShaders()
-*/
-void QGLShaderProgram::removeShader(QGLShader *shader)
-{
-    Q_D(QGLShaderProgram);
-    if (d->programGuard && d->programGuard->id()
-        && shader && shader->d_func()->shaderGuard)
-    {
-        d->glfuncs->glDetachShader(d->programGuard->id(), shader->d_func()->shaderGuard->id());
-    }
-    d->linked = false;  // Program needs to be relinked.
-    if (shader) {
-        d->shaders.removeAll(shader);
-        d->anonShaders.removeAll(shader);
-        disconnect(shader, SIGNAL(destroyed()), this, SLOT(shaderDestroyed()));
-    }
-}
-
-/*!
-    Returns a list of all shaders that have been added to this shader
-    program using addShader().
-
-    \sa addShader(), removeShader()
-*/
-QList<QGLShader *> QGLShaderProgram::shaders() const
-{
-    Q_D(const QGLShaderProgram);
-    return d->shaders;
-}
-
-/*!
-    Removes all of the shaders that were added to this program previously.
-    The QGLShader objects for the shaders will not be deleted if they
-    were constructed externally.  QGLShader objects that are constructed
-    internally by QGLShaderProgram will be deleted.
-
-    \sa addShader(), removeShader()
-*/
-void QGLShaderProgram::removeAllShaders()
-{
-    Q_D(QGLShaderProgram);
-    d->removingShaders = true;
-    if (d->programGuard) {
-        if (const auto programGuardId = d->programGuard->id()) {
-            for (QGLShader *shader : qAsConst(d->shaders)) {
-                if (shader && shader->d_func()->shaderGuard)
-                    d->glfuncs->glDetachShader(programGuardId, shader->d_func()->shaderGuard->id());
-            }
-        }
-    }
-    // Delete shader objects that were created anonymously.
-    qDeleteAll(d->anonShaders);
-    d->shaders.clear();
-    d->anonShaders.clear();
-    d->linked = false;  // Program needs to be relinked.
-    d->removingShaders = false;
-}
-
-/*!
-    Links together the shaders that were added to this program with
-    addShader().  Returns \c true if the link was successful or
-    false otherwise.  If the link failed, the error messages can
-    be retrieved with log().
-
-    Subclasses can override this function to initialize attributes
-    and uniform variables for use in specific shader programs.
-
-    If the shader program was already linked, calling this
-    function again will force it to be re-linked.
-
-    \sa addShader(), log()
-*/
-bool QGLShaderProgram::link()
-{
-    Q_D(QGLShaderProgram);
-    GLuint program = d->programGuard ? d->programGuard->id() : 0;
-    if (!program)
-        return false;
-
-    GLint value;
-    if (d->shaders.isEmpty()) {
-        // If there are no explicit shaders, then it is possible that the
-        // application added a program binary with glProgramBinaryOES(),
-        // or otherwise populated the shaders itself.  Check to see if the
-        // program is already linked and bail out if so.
-        value = 0;
-        d->glfuncs->glGetProgramiv(program, GL_LINK_STATUS, &value);
-        d->linked = (value != 0);
-        if (d->linked)
-            return true;
-    }
-
-#if !defined(QT_OPENGL_ES_2)
-    // Set up the geometry shader parameters
-    if (!QOpenGLContext::currentContext()->isOpenGLES()
-        && d->glfuncs->glProgramParameteri) {
-        for (QGLShader *shader : qAsConst(d->shaders)) {
-            if (shader->shaderType() & QGLShader::Geometry) {
-                d->glfuncs->glProgramParameteri(program, GL_GEOMETRY_INPUT_TYPE_EXT,
-                                       d->geometryInputType);
-                d->glfuncs->glProgramParameteri(program, GL_GEOMETRY_OUTPUT_TYPE_EXT,
-                                       d->geometryOutputType);
-                d->glfuncs->glProgramParameteri(program, GL_GEOMETRY_VERTICES_OUT_EXT,
-                                       d->geometryVertexCount);
-                break;
-            }
-        }
-    }
-#endif
-
-    d->glfuncs->glLinkProgram(program);
-    value = 0;
-    d->glfuncs->glGetProgramiv(program, GL_LINK_STATUS, &value);
-    d->linked = (value != 0);
-    value = 0;
-    d->glfuncs->glGetProgramiv(program, GL_INFO_LOG_LENGTH, &value);
-    d->log = QString();
-    if (value > 1) {
-        char *logbuf = new char [value];
-        GLint len;
-        d->glfuncs->glGetProgramInfoLog(program, value, &len, logbuf);
-        d->log = QString::fromLatin1(logbuf);
-        QString name = objectName();
-        if (!d->linked) {
-            if (name.isEmpty())
-                qWarning() << "QGLShader::link:" << d->log;
-            else
-                qWarning() << "QGLShader::link[" << name << "]:" << d->log;
-        }
-        delete [] logbuf;
-    }
-    return d->linked;
-}
-
-/*!
-    Returns \c true if this shader program has been linked; false otherwise.
-
-    \sa link()
-*/
-bool QGLShaderProgram::isLinked() const
-{
-    Q_D(const QGLShaderProgram);
-    return d->linked;
-}
-
-/*!
-    Returns the errors and warnings that occurred during the last link()
-    or addShader() with explicitly specified source code.
-
-    \sa link()
-*/
-QString QGLShaderProgram::log() const
-{
-    Q_D(const QGLShaderProgram);
-    return d->log;
-}
-
-/*!
-    Binds this shader program to the active QGLContext and makes
-    it the current shader program.  Any previously bound shader program
-    is released.  This is equivalent to calling \c{glUseProgram()} on
-    programId().  Returns \c true if the program was successfully bound;
-    false otherwise.  If the shader program has not yet been linked,
-    or it needs to be re-linked, this function will call link().
-
-    \sa link(), release()
-*/
-bool QGLShaderProgram::bind()
-{
-    Q_D(QGLShaderProgram);
-    GLuint program = d->programGuard ? d->programGuard->id() : 0;
-    if (!program)
-        return false;
-    if (!d->linked && !link())
-        return false;
-#ifndef QT_NO_DEBUG
-    if (d->programGuard->group() != QOpenGLContextGroup::currentContextGroup()) {
-        qWarning("QGLShaderProgram::bind: program is not valid in the current context.");
-        return false;
-    }
-#endif
-    d->glfuncs->glUseProgram(program);
-    return true;
-}
-
-#undef ctx
-#define ctx QGLContext::currentContext()
-
-/*!
-    Releases the active shader program from the current QGLContext.
-    This is equivalent to calling \c{glUseProgram(0)}.
-
-    \sa bind()
-*/
-void QGLShaderProgram::release()
-{
-    Q_D(QGLShaderProgram);
-#ifndef QT_NO_DEBUG
-    if (d->programGuard && d->programGuard->group() != QOpenGLContextGroup::currentContextGroup())
-        qWarning("QGLShaderProgram::release: program is not valid in the current context.");
-#endif
-    d->glfuncs->glUseProgram(0);
-}
-
-/*!
-    Returns the OpenGL identifier associated with this shader program.
-
-    \sa QGLShader::shaderId()
-*/
-GLuint QGLShaderProgram::programId() const
-{
-    Q_D(const QGLShaderProgram);
-    GLuint id = d->programGuard ? d->programGuard->id() : 0;
-    if (id)
-        return id;
-
-    // Create the identifier if we don't have one yet.  This is for
-    // applications that want to create the attached shader configuration
-    // themselves, particularly those using program binaries.
-    if (!const_cast<QGLShaderProgram *>(this)->init())
-        return 0;
-    return d->programGuard ? d->programGuard->id() : 0;
-}
-
-/*!
-    Binds the attribute \a name to the specified \a location.  This
-    function can be called before or after the program has been linked.
-    Any attributes that have not been explicitly bound when the program
-    is linked will be assigned locations automatically.
-
-    When this function is called after the program has been linked,
-    the program will need to be relinked for the change to take effect.
-
-    \sa attributeLocation()
-*/
-void QGLShaderProgram::bindAttributeLocation(const char *name, int location)
-{
-    Q_D(QGLShaderProgram);
-    if (!init() || !d->programGuard || !d->programGuard->id())
-        return;
-    d->glfuncs->glBindAttribLocation(d->programGuard->id(), location, name);
-    d->linked = false;  // Program needs to be relinked.
-}
-
-/*!
-    \overload
-
-    Binds the attribute \a name to the specified \a location.  This
-    function can be called before or after the program has been linked.
-    Any attributes that have not been explicitly bound when the program
-    is linked will be assigned locations automatically.
-
-    When this function is called after the program has been linked,
-    the program will need to be relinked for the change to take effect.
-
-    \sa attributeLocation()
-*/
-void QGLShaderProgram::bindAttributeLocation(const QByteArray& name, int location)
-{
-    bindAttributeLocation(name.constData(), location);
-}
-
-/*!
-    \overload
-
-    Binds the attribute \a name to the specified \a location.  This
-    function can be called before or after the program has been linked.
-    Any attributes that have not been explicitly bound when the program
-    is linked will be assigned locations automatically.
-
-    When this function is called after the program has been linked,
-    the program will need to be relinked for the change to take effect.
-
-    \sa attributeLocation()
-*/
-void QGLShaderProgram::bindAttributeLocation(const QString& name, int location)
-{
-    bindAttributeLocation(name.toLatin1().constData(), location);
-}
-
-/*!
-    Returns the location of the attribute \a name within this shader
-    program's parameter list.  Returns -1 if \a name is not a valid
-    attribute for this shader program.
-
-    \sa uniformLocation(), bindAttributeLocation()
-*/
-int QGLShaderProgram::attributeLocation(const char *name) const
-{
-    Q_D(const QGLShaderProgram);
-    if (d->linked && d->programGuard && d->programGuard->id()) {
-        return d->glfuncs->glGetAttribLocation(d->programGuard->id(), name);
-    } else {
-        qWarning() << "QGLShaderProgram::attributeLocation(" << name
-                   << "): shader program is not linked";
-        return -1;
-    }
-}
-
-/*!
-    \overload
-
-    Returns the location of the attribute \a name within this shader
-    program's parameter list.  Returns -1 if \a name is not a valid
-    attribute for this shader program.
-
-    \sa uniformLocation(), bindAttributeLocation()
-*/
-int QGLShaderProgram::attributeLocation(const QByteArray& name) const
-{
-    return attributeLocation(name.constData());
-}
-
-/*!
-    \overload
-
-    Returns the location of the attribute \a name within this shader
-    program's parameter list.  Returns -1 if \a name is not a valid
-    attribute for this shader program.
-
-    \sa uniformLocation(), bindAttributeLocation()
-*/
-int QGLShaderProgram::attributeLocation(const QString& name) const
-{
-    return attributeLocation(name.toLatin1().constData());
-}
-
-/*!
-    Sets the attribute at \a location in the current context to \a value.
-
-    \sa setUniformValue()
-*/
-void QGLShaderProgram::setAttributeValue(int location, GLfloat value)
-{
-    Q_D(QGLShaderProgram);
-    Q_UNUSED(d);
-    if (location != -1)
-        d->glfuncs->glVertexAttrib1fv(location, &value);
-}
-
-/*!
-    \overload
-
-    Sets the attribute called \a name in the current context to \a value.
-
-    \sa setUniformValue()
-*/
-void QGLShaderProgram::setAttributeValue(const char *name, GLfloat value)
-{
-    setAttributeValue(attributeLocation(name), value);
-}
-
-/*!
-    Sets the attribute at \a location in the current context to
-    the 2D vector (\a x, \a y).
-
-    \sa setUniformValue()
-*/
-void QGLShaderProgram::setAttributeValue(int location, GLfloat x, GLfloat y)
-{
-    Q_D(QGLShaderProgram);
-    Q_UNUSED(d);
-    if (location != -1) {
-        GLfloat values[2] = {x, y};
-        d->glfuncs->glVertexAttrib2fv(location, values);
-    }
-}
-
-/*!
-    \overload
-
-    Sets the attribute called \a name in the current context to
-    the 2D vector (\a x, \a y).
-
-    \sa setUniformValue()
-*/
-void QGLShaderProgram::setAttributeValue(const char *name, GLfloat x, GLfloat y)
-{
-    setAttributeValue(attributeLocation(name), x, y);
-}
-
-/*!
-    Sets the attribute at \a location in the current context to
-    the 3D vector (\a x, \a y, \a z).
-
-    \sa setUniformValue()
-*/
-void QGLShaderProgram::setAttributeValue
-        (int location, GLfloat x, GLfloat y, GLfloat z)
-{
-    Q_D(QGLShaderProgram);
-    Q_UNUSED(d);
-    if (location != -1) {
-        GLfloat values[3] = {x, y, z};
-        d->glfuncs->glVertexAttrib3fv(location, values);
-    }
-}
-
-/*!
-    \overload
-
-    Sets the attribute called \a name in the current context to
-    the 3D vector (\a x, \a y, \a z).
-
-    \sa setUniformValue()
-*/
-void QGLShaderProgram::setAttributeValue
-        (const char *name, GLfloat x, GLfloat y, GLfloat z)
-{
-    setAttributeValue(attributeLocation(name), x, y, z);
-}
-
-/*!
-    Sets the attribute at \a location in the current context to
-    the 4D vector (\a x, \a y, \a z, \a w).
-
-    \sa setUniformValue()
-*/
-void QGLShaderProgram::setAttributeValue
-        (int location, GLfloat x, GLfloat y, GLfloat z, GLfloat w)
-{
-    Q_D(QGLShaderProgram);
-    Q_UNUSED(d);
-    if (location != -1) {
-        GLfloat values[4] = {x, y, z, w};
-        d->glfuncs->glVertexAttrib4fv(location, values);
-    }
-}
-
-/*!
-    \overload
-
-    Sets the attribute called \a name in the current context to
-    the 4D vector (\a x, \a y, \a z, \a w).
-
-    \sa setUniformValue()
-*/
-void QGLShaderProgram::setAttributeValue
-        (const char *name, GLfloat x, GLfloat y, GLfloat z, GLfloat w)
-{
-    setAttributeValue(attributeLocation(name), x, y, z, w);
-}
-
-/*!
-    Sets the attribute at \a location in the current context to \a value.
-
-    \sa setUniformValue()
-*/
-void QGLShaderProgram::setAttributeValue(int location, const QVector2D& value)
-{
-    Q_D(QGLShaderProgram);
-    Q_UNUSED(d);
-    if (location != -1)
-        d->glfuncs->glVertexAttrib2fv(location, reinterpret_cast<const GLfloat *>(&value));
-}
-
-/*!
-    \overload
-
-    Sets the attribute called \a name in the current context to \a value.
-
-    \sa setUniformValue()
-*/
-void QGLShaderProgram::setAttributeValue(const char *name, const QVector2D& value)
-{
-    setAttributeValue(attributeLocation(name), value);
-}
-
-/*!
-    Sets the attribute at \a location in the current context to \a value.
-
-    \sa setUniformValue()
-*/
-void QGLShaderProgram::setAttributeValue(int location, const QVector3D& value)
-{
-    Q_D(QGLShaderProgram);
-    Q_UNUSED(d);
-    if (location != -1)
-        d->glfuncs->glVertexAttrib3fv(location, reinterpret_cast<const GLfloat *>(&value));
-}
-
-/*!
-    \overload
-
-    Sets the attribute called \a name in the current context to \a value.
-
-    \sa setUniformValue()
-*/
-void QGLShaderProgram::setAttributeValue(const char *name, const QVector3D& value)
-{
-    setAttributeValue(attributeLocation(name), value);
-}
-
-/*!
-    Sets the attribute at \a location in the current context to \a value.
-
-    \sa setUniformValue()
-*/
-void QGLShaderProgram::setAttributeValue(int location, const QVector4D& value)
-{
-    Q_D(QGLShaderProgram);
-    Q_UNUSED(d);
-    if (location != -1)
-        d->glfuncs->glVertexAttrib4fv(location, reinterpret_cast<const GLfloat *>(&value));
-}
-
-/*!
-    \overload
-
-    Sets the attribute called \a name in the current context to \a value.
-
-    \sa setUniformValue()
-*/
-void QGLShaderProgram::setAttributeValue(const char *name, const QVector4D& value)
-{
-    setAttributeValue(attributeLocation(name), value);
-}
-
-/*!
-    Sets the attribute at \a location in the current context to \a value.
-
-    \sa setUniformValue()
-*/
-void QGLShaderProgram::setAttributeValue(int location, const QColor& value)
-{
-    Q_D(QGLShaderProgram);
-    Q_UNUSED(d);
-    if (location != -1) {
-        GLfloat values[4] = {GLfloat(value.redF()), GLfloat(value.greenF()),
-                             GLfloat(value.blueF()), GLfloat(value.alphaF())};
-        d->glfuncs->glVertexAttrib4fv(location, values);
-    }
-}
-
-/*!
-    \overload
-
-    Sets the attribute called \a name in the current context to \a value.
-
-    \sa setUniformValue()
-*/
-void QGLShaderProgram::setAttributeValue(const char *name, const QColor& value)
-{
-    setAttributeValue(attributeLocation(name), value);
-}
-
-/*!
-    Sets the attribute at \a location in the current context to the
-    contents of \a values, which contains \a columns elements, each
-    consisting of \a rows elements.  The \a rows value should be
-    1, 2, 3, or 4.  This function is typically used to set matrix
-    values and column vectors.
-
-    \sa setUniformValue()
-*/
-void QGLShaderProgram::setAttributeValue
-    (int location, const GLfloat *values, int columns, int rows)
-{
-    Q_D(QGLShaderProgram);
-    Q_UNUSED(d);
-    if (rows < 1 || rows > 4) {
-        qWarning() << "QGLShaderProgram::setAttributeValue: rows" << rows << "not supported";
-        return;
-    }
-    if (location != -1) {
-        while (columns-- > 0) {
-            if (rows == 1)
-                d->glfuncs->glVertexAttrib1fv(location, values);
-            else if (rows == 2)
-                d->glfuncs->glVertexAttrib2fv(location, values);
-            else if (rows == 3)
-                d->glfuncs->glVertexAttrib3fv(location, values);
-            else
-                d->glfuncs->glVertexAttrib4fv(location, values);
-            values += rows;
-            ++location;
-        }
-    }
-}
-
-/*!
-    \overload
-
-    Sets the attribute called \a name in the current context to the
-    contents of \a values, which contains \a columns elements, each
-    consisting of \a rows elements.  The \a rows value should be
-    1, 2, 3, or 4.  This function is typically used to set matrix
-    values and column vectors.
-
-    \sa setUniformValue()
-*/
-void QGLShaderProgram::setAttributeValue
-    (const char *name, const GLfloat *values, int columns, int rows)
-{
-    setAttributeValue(attributeLocation(name), values, columns, rows);
-}
-
-/*!
-    Sets an array of vertex \a values on the attribute at \a location
-    in this shader program.  The \a tupleSize indicates the number of
-    components per vertex (1, 2, 3, or 4), and the \a stride indicates
-    the number of bytes between vertices.  A default \a stride value
-    of zero indicates that the vertices are densely packed in \a values.
-
-    The array will become active when enableAttributeArray() is called
-    on the \a location.  Otherwise the value specified with
-    setAttributeValue() for \a location will be used.
-
-    \sa setAttributeValue(), setUniformValue(), enableAttributeArray()
-    \sa disableAttributeArray()
-*/
-void QGLShaderProgram::setAttributeArray
-    (int location, const GLfloat *values, int tupleSize, int stride)
-{
-    Q_D(QGLShaderProgram);
-    Q_UNUSED(d);
-    if (location != -1) {
-        d->glfuncs->glVertexAttribPointer(location, tupleSize, GL_FLOAT, GL_FALSE,
-                              stride, values);
-    }
-}
-
-/*!
-    Sets an array of 2D vertex \a values on the attribute at \a location
-    in this shader program.  The \a stride indicates the number of bytes
-    between vertices.  A default \a stride value of zero indicates that
-    the vertices are densely packed in \a values.
-
-    The array will become active when enableAttributeArray() is called
-    on the \a location.  Otherwise the value specified with
-    setAttributeValue() for \a location will be used.
-
-    \sa setAttributeValue(), setUniformValue(), enableAttributeArray()
-    \sa disableAttributeArray()
-*/
-void QGLShaderProgram::setAttributeArray
-        (int location, const QVector2D *values, int stride)
-{
-    Q_D(QGLShaderProgram);
-    Q_UNUSED(d);
-    if (location != -1) {
-        d->glfuncs->glVertexAttribPointer(location, 2, GL_FLOAT, GL_FALSE,
-                              stride, values);
-    }
-}
-
-/*!
-    Sets an array of 3D vertex \a values on the attribute at \a location
-    in this shader program.  The \a stride indicates the number of bytes
-    between vertices.  A default \a stride value of zero indicates that
-    the vertices are densely packed in \a values.
-
-    The array will become active when enableAttributeArray() is called
-    on the \a location.  Otherwise the value specified with
-    setAttributeValue() for \a location will be used.
-
-    \sa setAttributeValue(), setUniformValue(), enableAttributeArray()
-    \sa disableAttributeArray()
-*/
-void QGLShaderProgram::setAttributeArray
-        (int location, const QVector3D *values, int stride)
-{
-    Q_D(QGLShaderProgram);
-    Q_UNUSED(d);
-    if (location != -1) {
-        d->glfuncs->glVertexAttribPointer(location, 3, GL_FLOAT, GL_FALSE,
-                              stride, values);
-    }
-}
-
-/*!
-    Sets an array of 4D vertex \a values on the attribute at \a location
-    in this shader program.  The \a stride indicates the number of bytes
-    between vertices.  A default \a stride value of zero indicates that
-    the vertices are densely packed in \a values.
-
-    The array will become active when enableAttributeArray() is called
-    on the \a location.  Otherwise the value specified with
-    setAttributeValue() for \a location will be used.
-
-    \sa setAttributeValue(), setUniformValue(), enableAttributeArray()
-    \sa disableAttributeArray()
-*/
-void QGLShaderProgram::setAttributeArray
-        (int location, const QVector4D *values, int stride)
-{
-    Q_D(QGLShaderProgram);
-    Q_UNUSED(d);
-    if (location != -1) {
-        d->glfuncs->glVertexAttribPointer(location, 4, GL_FLOAT, GL_FALSE,
-                              stride, values);
-    }
-}
-
-/*!
-    Sets an array of vertex \a values on the attribute at \a location
-    in this shader program.  The \a stride indicates the number of bytes
-    between vertices.  A default \a stride value of zero indicates that
-    the vertices are densely packed in \a values.
-
-    The \a type indicates the type of elements in the \a values array,
-    usually \c{GL_FLOAT}, \c{GL_UNSIGNED_BYTE}, etc.  The \a tupleSize
-    indicates the number of components per vertex: 1, 2, 3, or 4.
-
-    The array will become active when enableAttributeArray() is called
-    on the \a location.  Otherwise the value specified with
-    setAttributeValue() for \a location will be used.
-
-    The setAttributeBuffer() function can be used to set the attribute
-    array to an offset within a vertex buffer.
-
-    \note Normalization will be enabled. If this is not desired, call
-    glVertexAttribPointer directly through QGLFunctions.
-
-    \sa setAttributeValue(), setUniformValue(), enableAttributeArray()
-    \sa disableAttributeArray(), setAttributeBuffer()
-    \since 4.7
-*/
-void QGLShaderProgram::setAttributeArray
-    (int location, GLenum type, const void *values, int tupleSize, int stride)
-{
-    Q_D(QGLShaderProgram);
-    Q_UNUSED(d);
-    if (location != -1) {
-        d->glfuncs->glVertexAttribPointer(location, tupleSize, type, GL_TRUE,
-                              stride, values);
-    }
-}
-
-/*!
-    \overload
-
-    Sets an array of vertex \a values on the attribute called \a name
-    in this shader program.  The \a tupleSize indicates the number of
-    components per vertex (1, 2, 3, or 4), and the \a stride indicates
-    the number of bytes between vertices.  A default \a stride value
-    of zero indicates that the vertices are densely packed in \a values.
-
-    The array will become active when enableAttributeArray() is called
-    on \a name.  Otherwise the value specified with setAttributeValue()
-    for \a name will be used.
-
-    \sa setAttributeValue(), setUniformValue(), enableAttributeArray()
-    \sa disableAttributeArray()
-*/
-void QGLShaderProgram::setAttributeArray
-    (const char *name, const GLfloat *values, int tupleSize, int stride)
-{
-    setAttributeArray(attributeLocation(name), values, tupleSize, stride);
-}
-
-/*!
-    \overload
-
-    Sets an array of 2D vertex \a values on the attribute called \a name
-    in this shader program.  The \a stride indicates the number of bytes
-    between vertices.  A default \a stride value of zero indicates that
-    the vertices are densely packed in \a values.
-
-    The array will become active when enableAttributeArray() is called
-    on \a name.  Otherwise the value specified with setAttributeValue()
-    for \a name will be used.
-
-    \sa setAttributeValue(), setUniformValue(), enableAttributeArray()
-    \sa disableAttributeArray()
-*/
-void QGLShaderProgram::setAttributeArray
-        (const char *name, const QVector2D *values, int stride)
-{
-    setAttributeArray(attributeLocation(name), values, stride);
-}
-
-/*!
-    \overload
-
-    Sets an array of 3D vertex \a values on the attribute called \a name
-    in this shader program.  The \a stride indicates the number of bytes
-    between vertices.  A default \a stride value of zero indicates that
-    the vertices are densely packed in \a values.
-
-    The array will become active when enableAttributeArray() is called
-    on \a name.  Otherwise the value specified with setAttributeValue()
-    for \a name will be used.
-
-    \sa setAttributeValue(), setUniformValue(), enableAttributeArray()
-    \sa disableAttributeArray()
-*/
-void QGLShaderProgram::setAttributeArray
-        (const char *name, const QVector3D *values, int stride)
-{
-    setAttributeArray(attributeLocation(name), values, stride);
-}
-
-/*!
-    \overload
-
-    Sets an array of 4D vertex \a values on the attribute called \a name
-    in this shader program.  The \a stride indicates the number of bytes
-    between vertices.  A default \a stride value of zero indicates that
-    the vertices are densely packed in \a values.
-
-    The array will become active when enableAttributeArray() is called
-    on \a name.  Otherwise the value specified with setAttributeValue()
-    for \a name will be used.
-
-    \sa setAttributeValue(), setUniformValue(), enableAttributeArray()
-    \sa disableAttributeArray()
-*/
-void QGLShaderProgram::setAttributeArray
-        (const char *name, const QVector4D *values, int stride)
-{
-    setAttributeArray(attributeLocation(name), values, stride);
-}
-
-/*!
-    \overload
-
-    Sets an array of vertex \a values on the attribute called \a name
-    in this shader program.  The \a stride indicates the number of bytes
-    between vertices.  A default \a stride value of zero indicates that
-    the vertices are densely packed in \a values.
-
-    The \a type indicates the type of elements in the \a values array,
-    usually \c{GL_FLOAT}, \c{GL_UNSIGNED_BYTE}, etc.  The \a tupleSize
-    indicates the number of components per vertex: 1, 2, 3, or 4.
-
-    The array will become active when enableAttributeArray() is called
-    on the \a name.  Otherwise the value specified with
-    setAttributeValue() for \a name will be used.
-
-    The setAttributeBuffer() function can be used to set the attribute
-    array to an offset within a vertex buffer.
-
-    \sa setAttributeValue(), setUniformValue(), enableAttributeArray()
-    \sa disableAttributeArray(), setAttributeBuffer()
-    \since 4.7
-*/
-void QGLShaderProgram::setAttributeArray
-    (const char *name, GLenum type, const void *values, int tupleSize, int stride)
-{
-    setAttributeArray(attributeLocation(name), type, values, tupleSize, stride);
-}
-
-/*!
-    Sets an array of vertex values on the attribute at \a location in
-    this shader program, starting at a specific \a offset in the
-    currently bound vertex buffer.  The \a stride indicates the number
-    of bytes between vertices.  A default \a stride value of zero
-    indicates that the vertices are densely packed in the value array.
-
-    The \a type indicates the type of elements in the vertex value
-    array, usually \c{GL_FLOAT}, \c{GL_UNSIGNED_BYTE}, etc.  The \a
-    tupleSize indicates the number of components per vertex: 1, 2, 3,
-    or 4.
-
-    The array will become active when enableAttributeArray() is called
-    on the \a location.  Otherwise the value specified with
-    setAttributeValue() for \a location will be used.
-
-    \note Normalization will be enabled. If this is not desired, call
-    glVertexAttribPointer directly though QGLFunctions.
-
-    \sa setAttributeArray()
-    \since 4.7
-*/
-void QGLShaderProgram::setAttributeBuffer
-    (int location, GLenum type, int offset, int tupleSize, int stride)
-{
-    Q_D(QGLShaderProgram);
-    Q_UNUSED(d);
-    if (location != -1) {
-        d->glfuncs->glVertexAttribPointer(location, tupleSize, type, GL_TRUE, stride,
-                              reinterpret_cast<const void *>(qintptr(offset)));
-    }
-}
-
-/*!
-    \overload
-
-    Sets an array of vertex values on the attribute called \a name
-    in this shader program, starting at a specific \a offset in the
-    currently bound vertex buffer.  The \a stride indicates the number
-    of bytes between vertices.  A default \a stride value of zero
-    indicates that the vertices are densely packed in the value array.
-
-    The \a type indicates the type of elements in the vertex value
-    array, usually \c{GL_FLOAT}, \c{GL_UNSIGNED_BYTE}, etc.  The \a
-    tupleSize indicates the number of components per vertex: 1, 2, 3,
-    or 4.
-
-    The array will become active when enableAttributeArray() is called
-    on the \a name.  Otherwise the value specified with
-    setAttributeValue() for \a name will be used.
-
-    \sa setAttributeArray()
-    \since 4.7
-*/
-void QGLShaderProgram::setAttributeBuffer
-    (const char *name, GLenum type, int offset, int tupleSize, int stride)
-{
-    setAttributeBuffer(attributeLocation(name), type, offset, tupleSize, stride);
-}
-
-/*!
-    Enables the vertex array at \a location in this shader program
-    so that the value set by setAttributeArray() on \a location
-    will be used by the shader program.
-
-    \sa disableAttributeArray(), setAttributeArray(), setAttributeValue()
-    \sa setUniformValue()
-*/
-void QGLShaderProgram::enableAttributeArray(int location)
-{
-    Q_D(QGLShaderProgram);
-    Q_UNUSED(d);
-    if (location != -1)
-        d->glfuncs->glEnableVertexAttribArray(location);
-}
-
-/*!
-    \overload
-
-    Enables the vertex array called \a name in this shader program
-    so that the value set by setAttributeArray() on \a name
-    will be used by the shader program.
-
-    \sa disableAttributeArray(), setAttributeArray(), setAttributeValue()
-    \sa setUniformValue()
-*/
-void QGLShaderProgram::enableAttributeArray(const char *name)
-{
-    enableAttributeArray(attributeLocation(name));
-}
-
-/*!
-    Disables the vertex array at \a location in this shader program
-    that was enabled by a previous call to enableAttributeArray().
-
-    \sa enableAttributeArray(), setAttributeArray(), setAttributeValue()
-    \sa setUniformValue()
-*/
-void QGLShaderProgram::disableAttributeArray(int location)
-{
-    Q_D(QGLShaderProgram);
-    Q_UNUSED(d);
-    if (location != -1)
-        d->glfuncs->glDisableVertexAttribArray(location);
-}
-
-/*!
-    \overload
-
-    Disables the vertex array called \a name in this shader program
-    that was enabled by a previous call to enableAttributeArray().
-
-    \sa enableAttributeArray(), setAttributeArray(), setAttributeValue()
-    \sa setUniformValue()
-*/
-void QGLShaderProgram::disableAttributeArray(const char *name)
-{
-    disableAttributeArray(attributeLocation(name));
-}
-
-/*!
-    Returns the location of the uniform variable \a name within this shader
-    program's parameter list.  Returns -1 if \a name is not a valid
-    uniform variable for this shader program.
-
-    \sa attributeLocation()
-*/
-int QGLShaderProgram::uniformLocation(const char *name) const
-{
-    Q_D(const QGLShaderProgram);
-    Q_UNUSED(d);
-    if (d->linked && d->programGuard && d->programGuard->id()) {
-        return d->glfuncs->glGetUniformLocation(d->programGuard->id(), name);
-    } else {
-        qWarning() << "QGLShaderProgram::uniformLocation(" << name
-                   << "): shader program is not linked";
-        return -1;
-    }
-}
-
-/*!
-    \overload
-
-    Returns the location of the uniform variable \a name within this shader
-    program's parameter list.  Returns -1 if \a name is not a valid
-    uniform variable for this shader program.
-
-    \sa attributeLocation()
-*/
-int QGLShaderProgram::uniformLocation(const QByteArray& name) const
-{
-    return uniformLocation(name.constData());
-}
-
-/*!
-    \overload
-
-    Returns the location of the uniform variable \a name within this shader
-    program's parameter list.  Returns -1 if \a name is not a valid
-    uniform variable for this shader program.
-
-    \sa attributeLocation()
-*/
-int QGLShaderProgram::uniformLocation(const QString& name) const
-{
-    return uniformLocation(name.toLatin1().constData());
-}
-
-/*!
-    Sets the uniform variable at \a location in the current context to \a value.
-
-    \sa setAttributeValue()
-*/
-void QGLShaderProgram::setUniformValue(int location, GLfloat value)
-{
-    Q_D(QGLShaderProgram);
-    Q_UNUSED(d);
-    if (location != -1)
-        d->glfuncs->glUniform1fv(location, 1, &value);
-}
-
-/*!
-    \overload
-
-    Sets the uniform variable called \a name in the current context
-    to \a value.
-
-    \sa setAttributeValue()
-*/
-void QGLShaderProgram::setUniformValue(const char *name, GLfloat value)
-{
-    setUniformValue(uniformLocation(name), value);
-}
-
-/*!
-    Sets the uniform variable at \a location in the current context to \a value.
-
-    \sa setAttributeValue()
-*/
-void QGLShaderProgram::setUniformValue(int location, GLint value)
-{
-    Q_D(QGLShaderProgram);
-    Q_UNUSED(d);
-    if (location != -1)
-        d->glfuncs->glUniform1i(location, value);
-}
-
-/*!
-    \overload
-
-    Sets the uniform variable called \a name in the current context
-    to \a value.
-
-    \sa setAttributeValue()
-*/
-void QGLShaderProgram::setUniformValue(const char *name, GLint value)
-{
-    setUniformValue(uniformLocation(name), value);
-}
-
-/*!
-    Sets the uniform variable at \a location in the current context to \a value.
-    This function should be used when setting sampler values.
-
-    \sa setAttributeValue()
-*/
-void QGLShaderProgram::setUniformValue(int location, GLuint value)
-{
-    Q_D(QGLShaderProgram);
-    Q_UNUSED(d);
-    if (location != -1)
-        d->glfuncs->glUniform1i(location, value);
-}
-
-/*!
-    \overload
-
-    Sets the uniform variable called \a name in the current context
-    to \a value.  This function should be used when setting sampler values.
-
-    \sa setAttributeValue()
-*/
-void QGLShaderProgram::setUniformValue(const char *name, GLuint value)
-{
-    setUniformValue(uniformLocation(name), value);
-}
-
-/*!
-    Sets the uniform variable at \a location in the current context to
-    the 2D vector (\a x, \a y).
-
-    \sa setAttributeValue()
-*/
-void QGLShaderProgram::setUniformValue(int location, GLfloat x, GLfloat y)
-{
-    Q_D(QGLShaderProgram);
-    Q_UNUSED(d);
-    if (location != -1) {
-        GLfloat values[2] = {x, y};
-        d->glfuncs->glUniform2fv(location, 1, values);
-    }
-}
-
-/*!
-    \overload
-
-    Sets the uniform variable called \a name in the current context to
-    the 2D vector (\a x, \a y).
-
-    \sa setAttributeValue()
-*/
-void QGLShaderProgram::setUniformValue(const char *name, GLfloat x, GLfloat y)
-{
-    setUniformValue(uniformLocation(name), x, y);
-}
-
-/*!
-    Sets the uniform variable at \a location in the current context to
-    the 3D vector (\a x, \a y, \a z).
-
-    \sa setAttributeValue()
-*/
-void QGLShaderProgram::setUniformValue
-        (int location, GLfloat x, GLfloat y, GLfloat z)
-{
-    Q_D(QGLShaderProgram);
-    Q_UNUSED(d);
-    if (location != -1) {
-        GLfloat values[3] = {x, y, z};
-        d->glfuncs->glUniform3fv(location, 1, values);
-    }
-}
-
-/*!
-    \overload
-
-    Sets the uniform variable called \a name in the current context to
-    the 3D vector (\a x, \a y, \a z).
-
-    \sa setAttributeValue()
-*/
-void QGLShaderProgram::setUniformValue
-        (const char *name, GLfloat x, GLfloat y, GLfloat z)
-{
-    setUniformValue(uniformLocation(name), x, y, z);
-}
-
-/*!
-    Sets the uniform variable at \a location in the current context to
-    the 4D vector (\a x, \a y, \a z, \a w).
-
-    \sa setAttributeValue()
-*/
-void QGLShaderProgram::setUniformValue
-        (int location, GLfloat x, GLfloat y, GLfloat z, GLfloat w)
-{
-    Q_D(QGLShaderProgram);
-    Q_UNUSED(d);
-    if (location != -1) {
-        GLfloat values[4] = {x, y, z, w};
-        d->glfuncs->glUniform4fv(location, 1, values);
-    }
-}
-
-/*!
-    \overload
-
-    Sets the uniform variable called \a name in the current context to
-    the 4D vector (\a x, \a y, \a z, \a w).
-
-    \sa setAttributeValue()
-*/
-void QGLShaderProgram::setUniformValue
-        (const char *name, GLfloat x, GLfloat y, GLfloat z, GLfloat w)
-{
-    setUniformValue(uniformLocation(name), x, y, z, w);
-}
-
-/*!
-    Sets the uniform variable at \a location in the current context to \a value.
-
-    \sa setAttributeValue()
-*/
-void QGLShaderProgram::setUniformValue(int location, const QVector2D& value)
-{
-    Q_D(QGLShaderProgram);
-    Q_UNUSED(d);
-    if (location != -1)
-        d->glfuncs->glUniform2fv(location, 1, reinterpret_cast<const GLfloat *>(&value));
-}
-
-/*!
-    \overload
-
-    Sets the uniform variable called \a name in the current context
-    to \a value.
-
-    \sa setAttributeValue()
-*/
-void QGLShaderProgram::setUniformValue(const char *name, const QVector2D& value)
-{
-    setUniformValue(uniformLocation(name), value);
-}
-
-/*!
-    Sets the uniform variable at \a location in the current context to \a value.
-
-    \sa setAttributeValue()
-*/
-void QGLShaderProgram::setUniformValue(int location, const QVector3D& value)
-{
-    Q_D(QGLShaderProgram);
-    Q_UNUSED(d);
-    if (location != -1)
-        d->glfuncs->glUniform3fv(location, 1, reinterpret_cast<const GLfloat *>(&value));
-}
-
-/*!
-    \overload
-
-    Sets the uniform variable called \a name in the current context
-    to \a value.
-
-    \sa setAttributeValue()
-*/
-void QGLShaderProgram::setUniformValue(const char *name, const QVector3D& value)
-{
-    setUniformValue(uniformLocation(name), value);
-}
-
-/*!
-    Sets the uniform variable at \a location in the current context to \a value.
-
-    \sa setAttributeValue()
-*/
-void QGLShaderProgram::setUniformValue(int location, const QVector4D& value)
-{
-    Q_D(QGLShaderProgram);
-    Q_UNUSED(d);
-    if (location != -1)
-        d->glfuncs->glUniform4fv(location, 1, reinterpret_cast<const GLfloat *>(&value));
-}
-
-/*!
-    \overload
-
-    Sets the uniform variable called \a name in the current context
-    to \a value.
-
-    \sa setAttributeValue()
-*/
-void QGLShaderProgram::setUniformValue(const char *name, const QVector4D& value)
-{
-    setUniformValue(uniformLocation(name), value);
-}
-
-/*!
-    Sets the uniform variable at \a location in the current context to
-    the red, green, blue, and alpha components of \a color.
-
-    \sa setAttributeValue()
-*/
-void QGLShaderProgram::setUniformValue(int location, const QColor& color)
-{
-    Q_D(QGLShaderProgram);
-    Q_UNUSED(d);
-    if (location != -1) {
-        GLfloat values[4] = {GLfloat(color.redF()), GLfloat(color.greenF()),
-                             GLfloat(color.blueF()), GLfloat(color.alphaF())};
-        d->glfuncs->glUniform4fv(location, 1, values);
-    }
-}
-
-/*!
-    \overload
-
-    Sets the uniform variable called \a name in the current context to
-    the red, green, blue, and alpha components of \a color.
-
-    \sa setAttributeValue()
-*/
-void QGLShaderProgram::setUniformValue(const char *name, const QColor& color)
-{
-    setUniformValue(uniformLocation(name), color);
-}
-
-/*!
-    Sets the uniform variable at \a location in the current context to
-    the x and y coordinates of \a point.
-
-    \sa setAttributeValue()
-*/
-void QGLShaderProgram::setUniformValue(int location, const QPoint& point)
-{
-    Q_D(QGLShaderProgram);
-    Q_UNUSED(d);
-    if (location != -1) {
-        GLfloat values[4] = {GLfloat(point.x()), GLfloat(point.y())};
-        d->glfuncs->glUniform2fv(location, 1, values);
-    }
-}
-
-/*!
-    \overload
-
-    Sets the uniform variable associated with \a name in the current
-    context to the x and y coordinates of \a point.
-
-    \sa setAttributeValue()
-*/
-void QGLShaderProgram::setUniformValue(const char *name, const QPoint& point)
-{
-    setUniformValue(uniformLocation(name), point);
-}
-
-/*!
-    Sets the uniform variable at \a location in the current context to
-    the x and y coordinates of \a point.
-
-    \sa setAttributeValue()
-*/
-void QGLShaderProgram::setUniformValue(int location, const QPointF& point)
-{
-    Q_D(QGLShaderProgram);
-    Q_UNUSED(d);
-    if (location != -1) {
-        GLfloat values[4] = {GLfloat(point.x()), GLfloat(point.y())};
-        d->glfuncs->glUniform2fv(location, 1, values);
-    }
-}
-
-/*!
-    \overload
-
-    Sets the uniform variable associated with \a name in the current
-    context to the x and y coordinates of \a point.
-
-    \sa setAttributeValue()
-*/
-void QGLShaderProgram::setUniformValue(const char *name, const QPointF& point)
-{
-    setUniformValue(uniformLocation(name), point);
-}
-
-/*!
-    Sets the uniform variable at \a location in the current context to
-    the width and height of the given \a size.
-
-    \sa setAttributeValue()
-*/
-void QGLShaderProgram::setUniformValue(int location, const QSize& size)
-{
-    Q_D(QGLShaderProgram);
-    Q_UNUSED(d);
-    if (location != -1) {
-        GLfloat values[4] = {GLfloat(size.width()), GLfloat(size.height())};
-        d->glfuncs->glUniform2fv(location, 1, values);
-    }
-}
-
-/*!
-    \overload
-
-    Sets the uniform variable associated with \a name in the current
-    context to the width and height of the given \a size.
-
-    \sa setAttributeValue()
-*/
-void QGLShaderProgram::setUniformValue(const char *name, const QSize& size)
-{
-    setUniformValue(uniformLocation(name), size);
-}
-
-/*!
-    Sets the uniform variable at \a location in the current context to
-    the width and height of the given \a size.
-
-    \sa setAttributeValue()
-*/
-void QGLShaderProgram::setUniformValue(int location, const QSizeF& size)
-{
-    Q_D(QGLShaderProgram);
-    Q_UNUSED(d);
-    if (location != -1) {
-        GLfloat values[4] = {GLfloat(size.width()), GLfloat(size.height())};
-        d->glfuncs->glUniform2fv(location, 1, values);
-    }
-}
-
-/*!
-    \overload
-
-    Sets the uniform variable associated with \a name in the current
-    context to the width and height of the given \a size.
-
-    \sa setAttributeValue()
-*/
-void QGLShaderProgram::setUniformValue(const char *name, const QSizeF& size)
-{
-    setUniformValue(uniformLocation(name), size);
-}
-
-/*!
-    Sets the uniform variable at \a location in the current context
-    to a 2x2 matrix \a value.
-
-    \sa setAttributeValue()
-*/
-void QGLShaderProgram::setUniformValue(int location, const QMatrix2x2& value)
-{
-    Q_D(QGLShaderProgram);
-    d->glfuncs->glUniformMatrix2fv(location, 1, GL_FALSE, value.constData());
-}
-
-/*!
-    \overload
-
-    Sets the uniform variable called \a name in the current context
-    to a 2x2 matrix \a value.
-
-    \sa setAttributeValue()
-*/
-void QGLShaderProgram::setUniformValue(const char *name, const QMatrix2x2& value)
-{
-    setUniformValue(uniformLocation(name), value);
-}
-
-/*!
-    Sets the uniform variable at \a location in the current context
-    to a 2x3 matrix \a value.
-
-    \sa setAttributeValue()
-*/
-void QGLShaderProgram::setUniformValue(int location, const QMatrix2x3& value)
-{
-    Q_D(QGLShaderProgram);
-    d->glfuncs->glUniform3fv(location, 2, value.constData());
-}
-
-/*!
-    \overload
-
-    Sets the uniform variable called \a name in the current context
-    to a 2x3 matrix \a value.
-
-    \sa setAttributeValue()
-*/
-void QGLShaderProgram::setUniformValue(const char *name, const QMatrix2x3& value)
-{
-    setUniformValue(uniformLocation(name), value);
-}
-
-/*!
-    Sets the uniform variable at \a location in the current context
-    to a 2x4 matrix \a value.
-
-    \sa setAttributeValue()
-*/
-void QGLShaderProgram::setUniformValue(int location, const QMatrix2x4& value)
-{
-    Q_D(QGLShaderProgram);
-    d->glfuncs->glUniform4fv(location, 2, value.constData());
-}
-
-/*!
-    \overload
-
-    Sets the uniform variable called \a name in the current context
-    to a 2x4 matrix \a value.
-
-    \sa setAttributeValue()
-*/
-void QGLShaderProgram::setUniformValue(const char *name, const QMatrix2x4& value)
-{
-    setUniformValue(uniformLocation(name), value);
-}
-
-/*!
-    Sets the uniform variable at \a location in the current context
-    to a 3x2 matrix \a value.
-
-    \sa setAttributeValue()
-*/
-void QGLShaderProgram::setUniformValue(int location, const QMatrix3x2& value)
-{
-    Q_D(QGLShaderProgram);
-    d->glfuncs->glUniform2fv(location, 3, value.constData());
-}
-
-/*!
-    \overload
-
-    Sets the uniform variable called \a name in the current context
-    to a 3x2 matrix \a value.
-
-    \sa setAttributeValue()
-*/
-void QGLShaderProgram::setUniformValue(const char *name, const QMatrix3x2& value)
-{
-    setUniformValue(uniformLocation(name), value);
-}
-
-/*!
-    Sets the uniform variable at \a location in the current context
-    to a 3x3 matrix \a value.
-
-    \sa setAttributeValue()
-*/
-void QGLShaderProgram::setUniformValue(int location, const QMatrix3x3& value)
-{
-    Q_D(QGLShaderProgram);
-    d->glfuncs->glUniformMatrix3fv(location, 1, GL_FALSE, value.constData());
-}
-
-/*!
-    \overload
-
-    Sets the uniform variable called \a name in the current context
-    to a 3x3 matrix \a value.
-
-    \sa setAttributeValue()
-*/
-void QGLShaderProgram::setUniformValue(const char *name, const QMatrix3x3& value)
-{
-    setUniformValue(uniformLocation(name), value);
-}
-
-/*!
-    Sets the uniform variable at \a location in the current context
-    to a 3x4 matrix \a value.
-
-    \sa setAttributeValue()
-*/
-void QGLShaderProgram::setUniformValue(int location, const QMatrix3x4& value)
-{
-    Q_D(QGLShaderProgram);
-    d->glfuncs->glUniform4fv(location, 3, value.constData());
-}
-
-/*!
-    \overload
-
-    Sets the uniform variable called \a name in the current context
-    to a 3x4 matrix \a value.
-
-    \sa setAttributeValue()
-*/
-void QGLShaderProgram::setUniformValue(const char *name, const QMatrix3x4& value)
-{
-    setUniformValue(uniformLocation(name), value);
-}
-
-/*!
-    Sets the uniform variable at \a location in the current context
-    to a 4x2 matrix \a value.
-
-    \sa setAttributeValue()
-*/
-void QGLShaderProgram::setUniformValue(int location, const QMatrix4x2& value)
-{
-    Q_D(QGLShaderProgram);
-    d->glfuncs->glUniform2fv(location, 4, value.constData());
-}
-
-/*!
-    \overload
-
-    Sets the uniform variable called \a name in the current context
-    to a 4x2 matrix \a value.
-
-    \sa setAttributeValue()
-*/
-void QGLShaderProgram::setUniformValue(const char *name, const QMatrix4x2& value)
-{
-    setUniformValue(uniformLocation(name), value);
-}
-
-/*!
-    Sets the uniform variable at \a location in the current context
-    to a 4x3 matrix \a value.
-
-    \sa setAttributeValue()
-*/
-void QGLShaderProgram::setUniformValue(int location, const QMatrix4x3& value)
-{
-    Q_D(QGLShaderProgram);
-    d->glfuncs->glUniform3fv(location, 4, value.constData());
-}
-
-/*!
-    \overload
-
-    Sets the uniform variable called \a name in the current context
-    to a 4x3 matrix \a value.
-
-    \sa setAttributeValue()
-*/
-void QGLShaderProgram::setUniformValue(const char *name, const QMatrix4x3& value)
-{
-    setUniformValue(uniformLocation(name), value);
-}
-
-/*!
-    Sets the uniform variable at \a location in the current context
-    to a 4x4 matrix \a value.
-
-    \sa setAttributeValue()
-*/
-void QGLShaderProgram::setUniformValue(int location, const QMatrix4x4& value)
-{
-    Q_D(QGLShaderProgram);
-    d->glfuncs->glUniformMatrix4fv(location, 1, GL_FALSE, value.constData());
-}
-
-/*!
-    \overload
-
-    Sets the uniform variable called \a name in the current context
-    to a 4x4 matrix \a value.
-
-    \sa setAttributeValue()
-*/
-void QGLShaderProgram::setUniformValue(const char *name, const QMatrix4x4& value)
-{
-    setUniformValue(uniformLocation(name), value);
-}
-
-/*!
-    \overload
-
-    Sets the uniform variable at \a location in the current context
-    to a 2x2 matrix \a value.  The matrix elements must be specified
-    in column-major order.
-
-    \sa setAttributeValue()
-    \since 4.7
-*/
-void QGLShaderProgram::setUniformValue(int location, const GLfloat value[2][2])
-{
-    Q_D(QGLShaderProgram);
-    if (location != -1)
-        d->glfuncs->glUniformMatrix2fv(location, 1, GL_FALSE, value[0]);
-}
-
-/*!
-    \overload
-
-    Sets the uniform variable at \a location in the current context
-    to a 3x3 matrix \a value.  The matrix elements must be specified
-    in column-major order.
-
-    \sa setAttributeValue()
-    \since 4.7
-*/
-void QGLShaderProgram::setUniformValue(int location, const GLfloat value[3][3])
-{
-    Q_D(QGLShaderProgram);
-    if (location != -1)
-        d->glfuncs->glUniformMatrix3fv(location, 1, GL_FALSE, value[0]);
-}
-
-/*!
-    \overload
-
-    Sets the uniform variable at \a location in the current context
-    to a 4x4 matrix \a value.  The matrix elements must be specified
-    in column-major order.
-
-    \sa setAttributeValue()
-*/
-void QGLShaderProgram::setUniformValue(int location, const GLfloat value[4][4])
-{
-    Q_D(QGLShaderProgram);
-    if (location != -1)
-        d->glfuncs->glUniformMatrix4fv(location, 1, GL_FALSE, value[0]);
-}
-
-
-/*!
-    \overload
-
-    Sets the uniform variable called \a name in the current context
-    to a 2x2 matrix \a value.  The matrix elements must be specified
-    in column-major order.
-
-    \sa setAttributeValue()
-    \since 4.7
-*/
-void QGLShaderProgram::setUniformValue(const char *name, const GLfloat value[2][2])
-{
-    setUniformValue(uniformLocation(name), value);
-}
-
-/*!
-    \overload
-
-    Sets the uniform variable called \a name in the current context
-    to a 3x3 matrix \a value.  The matrix elements must be specified
-    in column-major order.
-
-    \sa setAttributeValue()
-    \since 4.7
-*/
-void QGLShaderProgram::setUniformValue(const char *name, const GLfloat value[3][3])
-{
-    setUniformValue(uniformLocation(name), value);
-}
-
-/*!
-    \overload
-
-    Sets the uniform variable called \a name in the current context
-    to a 4x4 matrix \a value.  The matrix elements must be specified
-    in column-major order.
-
-    \sa setAttributeValue()
-*/
-void QGLShaderProgram::setUniformValue(const char *name, const GLfloat value[4][4])
-{
-    setUniformValue(uniformLocation(name), value);
-}
-
-/*!
-    Sets the uniform variable at \a location in the current context to a
-    3x3 transformation matrix \a value that is specified as a QTransform value.
-
-    To set a QTransform value as a 4x4 matrix in a shader, use
-    \c{setUniformValue(location, QMatrix4x4(value))}.
-*/
-void QGLShaderProgram::setUniformValue(int location, const QTransform& value)
-{
-    Q_D(QGLShaderProgram);
-    if (location != -1) {
-        GLfloat mat[3][3] = {
-            {GLfloat(value.m11()), GLfloat(value.m12()), GLfloat(value.m13())},
-            {GLfloat(value.m21()), GLfloat(value.m22()), GLfloat(value.m23())},
-            {GLfloat(value.m31()), GLfloat(value.m32()), GLfloat(value.m33())}
-        };
-        d->glfuncs->glUniformMatrix3fv(location, 1, GL_FALSE, mat[0]);
-    }
-}
-
-/*!
-    \overload
-
-    Sets the uniform variable called \a name in the current context to a
-    3x3 transformation matrix \a value that is specified as a QTransform value.
-
-    To set a QTransform value as a 4x4 matrix in a shader, use
-    \c{setUniformValue(name, QMatrix4x4(value))}.
-*/
-void QGLShaderProgram::setUniformValue
-        (const char *name, const QTransform& value)
-{
-    setUniformValue(uniformLocation(name), value);
-}
-
-/*!
-    Sets the uniform variable array at \a location in the current
-    context to the \a count elements of \a values.
-
-    \sa setAttributeValue()
-*/
-void QGLShaderProgram::setUniformValueArray(int location, const GLint *values, int count)
-{
-    Q_D(QGLShaderProgram);
-    if (location != -1)
-        d->glfuncs->glUniform1iv(location, count, values);
-}
-
-/*!
-    \overload
-
-    Sets the uniform variable array called \a name in the current
-    context to the \a count elements of \a values.
-
-    \sa setAttributeValue()
-*/
-void QGLShaderProgram::setUniformValueArray
-        (const char *name, const GLint *values, int count)
-{
-    setUniformValueArray(uniformLocation(name), values, count);
-}
-
-/*!
-    Sets the uniform variable array at \a location in the current
-    context to the \a count elements of \a values.  This overload
-    should be used when setting an array of sampler values.
-
-    \sa setAttributeValue()
-*/
-void QGLShaderProgram::setUniformValueArray(int location, const GLuint *values, int count)
-{
-    Q_D(QGLShaderProgram);
-    if (location != -1)
-        d->glfuncs->glUniform1iv(location, count, reinterpret_cast<const GLint *>(values));
-}
-
-/*!
-    \overload
-
-    Sets the uniform variable array called \a name in the current
-    context to the \a count elements of \a values.  This overload
-    should be used when setting an array of sampler values.
-
-    \sa setAttributeValue()
-*/
-void QGLShaderProgram::setUniformValueArray
-        (const char *name, const GLuint *values, int count)
-{
-    setUniformValueArray(uniformLocation(name), values, count);
-}
-
-/*!
-    Sets the uniform variable array at \a location in the current
-    context to the \a count elements of \a values.  Each element
-    has \a tupleSize components.  The \a tupleSize must be 1, 2, 3, or 4.
-
-    \sa setAttributeValue()
-*/
-void QGLShaderProgram::setUniformValueArray(int location, const GLfloat *values, int count, int tupleSize)
-{
-    Q_D(QGLShaderProgram);
-    if (location != -1) {
-        if (tupleSize == 1)
-            d->glfuncs->glUniform1fv(location, count, values);
-        else if (tupleSize == 2)
-            d->glfuncs->glUniform2fv(location, count, values);
-        else if (tupleSize == 3)
-            d->glfuncs->glUniform3fv(location, count, values);
-        else if (tupleSize == 4)
-            d->glfuncs->glUniform4fv(location, count, values);
-        else
-            qWarning() << "QGLShaderProgram::setUniformValue: size" << tupleSize << "not supported";
-    }
-}
-
-/*!
-    \overload
-
-    Sets the uniform variable array called \a name in the current
-    context to the \a count elements of \a values.  Each element
-    has \a tupleSize components.  The \a tupleSize must be 1, 2, 3, or 4.
-
-    \sa setAttributeValue()
-*/
-void QGLShaderProgram::setUniformValueArray
-        (const char *name, const GLfloat *values, int count, int tupleSize)
-{
-    setUniformValueArray(uniformLocation(name), values, count, tupleSize);
-}
-
-/*!
-    Sets the uniform variable array at \a location in the current
-    context to the \a count 2D vector elements of \a values.
-
-    \sa setAttributeValue()
-*/
-void QGLShaderProgram::setUniformValueArray(int location, const QVector2D *values, int count)
-{
-    Q_D(QGLShaderProgram);
-    if (location != -1)
-        d->glfuncs->glUniform2fv(location, count, reinterpret_cast<const GLfloat *>(values));
-}
-
-/*!
-    \overload
-
-    Sets the uniform variable array called \a name in the current
-    context to the \a count 2D vector elements of \a values.
-
-    \sa setAttributeValue()
-*/
-void QGLShaderProgram::setUniformValueArray(const char *name, const QVector2D *values, int count)
-{
-    setUniformValueArray(uniformLocation(name), values, count);
-}
-
-/*!
-    Sets the uniform variable array at \a location in the current
-    context to the \a count 3D vector elements of \a values.
-
-    \sa setAttributeValue()
-*/
-void QGLShaderProgram::setUniformValueArray(int location, const QVector3D *values, int count)
-{
-    Q_D(QGLShaderProgram);
-    if (location != -1)
-        d->glfuncs->glUniform3fv(location, count, reinterpret_cast<const GLfloat *>(values));
-}
-
-/*!
-    \overload
-
-    Sets the uniform variable array called \a name in the current
-    context to the \a count 3D vector elements of \a values.
-
-    \sa setAttributeValue()
-*/
-void QGLShaderProgram::setUniformValueArray(const char *name, const QVector3D *values, int count)
-{
-    setUniformValueArray(uniformLocation(name), values, count);
-}
-
-/*!
-    Sets the uniform variable array at \a location in the current
-    context to the \a count 4D vector elements of \a values.
-
-    \sa setAttributeValue()
-*/
-void QGLShaderProgram::setUniformValueArray(int location, const QVector4D *values, int count)
-{
-    Q_D(QGLShaderProgram);
-    Q_UNUSED(d);
-    if (location != -1)
-        d->glfuncs->glUniform4fv(location, count, reinterpret_cast<const GLfloat *>(values));
-}
-
-/*!
-    \overload
-
-    Sets the uniform variable array called \a name in the current
-    context to the \a count 4D vector elements of \a values.
-
-    \sa setAttributeValue()
-*/
-void QGLShaderProgram::setUniformValueArray(const char *name, const QVector4D *values, int count)
-{
-    setUniformValueArray(uniformLocation(name), values, count);
-}
-
-// We have to repack matrix arrays from qreal to GLfloat.
-#define setUniformMatrixArray(func,location,values,count,type,cols,rows) \
-    if (location == -1 || count <= 0) \
-        return; \
-    if (sizeof(type) == sizeof(GLfloat) * cols * rows) { \
-        func(location, count, GL_FALSE, \
-             reinterpret_cast<const GLfloat *>(values[0].constData())); \
-    } else { \
-        QVarLengthArray<GLfloat> temp(cols * rows * count); \
-        for (int index = 0; index < count; ++index) { \
-            for (int index2 = 0; index2 < (cols * rows); ++index2) { \
-                temp.data()[cols * rows * index + index2] = \
-                    values[index].constData()[index2]; \
-            } \
-        } \
-        func(location, count, GL_FALSE, temp.constData()); \
-    }
-#define setUniformGenericMatrixArray(colfunc,location,values,count,type,cols,rows) \
-    if (location == -1 || count <= 0) \
-        return; \
-    if (sizeof(type) == sizeof(GLfloat) * cols * rows) { \
-        const GLfloat *data = reinterpret_cast<const GLfloat *> \
-            (values[0].constData());  \
-        colfunc(location, count * cols, data); \
-    } else { \
-        QVarLengthArray<GLfloat> temp(cols * rows * count); \
-        for (int index = 0; index < count; ++index) { \
-            for (int index2 = 0; index2 < (cols * rows); ++index2) { \
-                temp.data()[cols * rows * index + index2] = \
-                    values[index].constData()[index2]; \
-            } \
-        } \
-        colfunc(location, count * cols, temp.constData()); \
-    }
-
-/*!
-    Sets the uniform variable array at \a location in the current
-    context to the \a count 2x2 matrix elements of \a values.
-
-    \sa setAttributeValue()
-*/
-void QGLShaderProgram::setUniformValueArray(int location, const QMatrix2x2 *values, int count)
-{
-    Q_D(QGLShaderProgram);
-    Q_UNUSED(d);
-    setUniformMatrixArray
-        (d->glfuncs->glUniformMatrix2fv, location, values, count, QMatrix2x2, 2, 2);
-}
-
-/*!
-    \overload
-
-    Sets the uniform variable array called \a name in the current
-    context to the \a count 2x2 matrix elements of \a values.
-
-    \sa setAttributeValue()
-*/
-void QGLShaderProgram::setUniformValueArray(const char *name, const QMatrix2x2 *values, int count)
-{
-    setUniformValueArray(uniformLocation(name), values, count);
-}
-
-/*!
-    Sets the uniform variable array at \a location in the current
-    context to the \a count 2x3 matrix elements of \a values.
-
-    \sa setAttributeValue()
-*/
-void QGLShaderProgram::setUniformValueArray(int location, const QMatrix2x3 *values, int count)
-{
-    Q_D(QGLShaderProgram);
-    Q_UNUSED(d);
-    setUniformGenericMatrixArray
-        (d->glfuncs->glUniform3fv, location, values, count,
-         QMatrix2x3, 2, 3);
-}
-
-/*!
-    \overload
-
-    Sets the uniform variable array called \a name in the current
-    context to the \a count 2x3 matrix elements of \a values.
-
-    \sa setAttributeValue()
-*/
-void QGLShaderProgram::setUniformValueArray(const char *name, const QMatrix2x3 *values, int count)
-{
-    setUniformValueArray(uniformLocation(name), values, count);
-}
-
-/*!
-    Sets the uniform variable array at \a location in the current
-    context to the \a count 2x4 matrix elements of \a values.
-
-    \sa setAttributeValue()
-*/
-void QGLShaderProgram::setUniformValueArray(int location, const QMatrix2x4 *values, int count)
-{
-    Q_D(QGLShaderProgram);
-    Q_UNUSED(d);
-    setUniformGenericMatrixArray
-        (d->glfuncs->glUniform4fv, location, values, count,
-         QMatrix2x4, 2, 4);
-}
-
-/*!
-    \overload
-
-    Sets the uniform variable array called \a name in the current
-    context to the \a count 2x4 matrix elements of \a values.
-
-    \sa setAttributeValue()
-*/
-void QGLShaderProgram::setUniformValueArray(const char *name, const QMatrix2x4 *values, int count)
-{
-    setUniformValueArray(uniformLocation(name), values, count);
-}
-
-/*!
-    Sets the uniform variable array at \a location in the current
-    context to the \a count 3x2 matrix elements of \a values.
-
-    \sa setAttributeValue()
-*/
-void QGLShaderProgram::setUniformValueArray(int location, const QMatrix3x2 *values, int count)
-{
-    Q_D(QGLShaderProgram);
-    Q_UNUSED(d);
-    setUniformGenericMatrixArray
-        (d->glfuncs->glUniform2fv, location, values, count,
-         QMatrix3x2, 3, 2);
-}
-
-/*!
-    \overload
-
-    Sets the uniform variable array called \a name in the current
-    context to the \a count 3x2 matrix elements of \a values.
-
-    \sa setAttributeValue()
-*/
-void QGLShaderProgram::setUniformValueArray(const char *name, const QMatrix3x2 *values, int count)
-{
-    setUniformValueArray(uniformLocation(name), values, count);
-}
-
-/*!
-    Sets the uniform variable array at \a location in the current
-    context to the \a count 3x3 matrix elements of \a values.
-
-    \sa setAttributeValue()
-*/
-void QGLShaderProgram::setUniformValueArray(int location, const QMatrix3x3 *values, int count)
-{
-    Q_D(QGLShaderProgram);
-    Q_UNUSED(d);
-    setUniformMatrixArray
-        (d->glfuncs->glUniformMatrix3fv, location, values, count, QMatrix3x3, 3, 3);
-}
-
-/*!
-    \overload
-
-    Sets the uniform variable array called \a name in the current
-    context to the \a count 3x3 matrix elements of \a values.
-
-    \sa setAttributeValue()
-*/
-void QGLShaderProgram::setUniformValueArray(const char *name, const QMatrix3x3 *values, int count)
-{
-    setUniformValueArray(uniformLocation(name), values, count);
-}
-
-/*!
-    Sets the uniform variable array at \a location in the current
-    context to the \a count 3x4 matrix elements of \a values.
-
-    \sa setAttributeValue()
-*/
-void QGLShaderProgram::setUniformValueArray(int location, const QMatrix3x4 *values, int count)
-{
-    Q_D(QGLShaderProgram);
-    Q_UNUSED(d);
-    setUniformGenericMatrixArray
-        (d->glfuncs->glUniform4fv, location, values, count,
-         QMatrix3x4, 3, 4);
-}
-
-/*!
-    \overload
-
-    Sets the uniform variable array called \a name in the current
-    context to the \a count 3x4 matrix elements of \a values.
-
-    \sa setAttributeValue()
-*/
-void QGLShaderProgram::setUniformValueArray(const char *name, const QMatrix3x4 *values, int count)
-{
-    setUniformValueArray(uniformLocation(name), values, count);
-}
-
-/*!
-    Sets the uniform variable array at \a location in the current
-    context to the \a count 4x2 matrix elements of \a values.
-
-    \sa setAttributeValue()
-*/
-void QGLShaderProgram::setUniformValueArray(int location, const QMatrix4x2 *values, int count)
-{
-    Q_D(QGLShaderProgram);
-    Q_UNUSED(d);
-    setUniformGenericMatrixArray
-        (d->glfuncs->glUniform2fv, location, values, count,
-         QMatrix4x2, 4, 2);
-}
-
-/*!
-    \overload
-
-    Sets the uniform variable array called \a name in the current
-    context to the \a count 4x2 matrix elements of \a values.
-
-    \sa setAttributeValue()
-*/
-void QGLShaderProgram::setUniformValueArray(const char *name, const QMatrix4x2 *values, int count)
-{
-    setUniformValueArray(uniformLocation(name), values, count);
-}
-
-/*!
-    Sets the uniform variable array at \a location in the current
-    context to the \a count 4x3 matrix elements of \a values.
-
-    \sa setAttributeValue()
-*/
-void QGLShaderProgram::setUniformValueArray(int location, const QMatrix4x3 *values, int count)
-{
-    Q_D(QGLShaderProgram);
-    Q_UNUSED(d);
-    setUniformGenericMatrixArray
-        (d->glfuncs->glUniform3fv, location, values, count,
-         QMatrix4x3, 4, 3);
-}
-
-/*!
-    \overload
-
-    Sets the uniform variable array called \a name in the current
-    context to the \a count 4x3 matrix elements of \a values.
-
-    \sa setAttributeValue()
-*/
-void QGLShaderProgram::setUniformValueArray(const char *name, const QMatrix4x3 *values, int count)
-{
-    setUniformValueArray(uniformLocation(name), values, count);
-}
-
-/*!
-    Sets the uniform variable array at \a location in the current
-    context to the \a count 4x4 matrix elements of \a values.
-
-    \sa setAttributeValue()
-*/
-void QGLShaderProgram::setUniformValueArray(int location, const QMatrix4x4 *values, int count)
-{
-    Q_D(QGLShaderProgram);
-    Q_UNUSED(d);
-    setUniformMatrixArray
-        (d->glfuncs->glUniformMatrix4fv, location, values, count, QMatrix4x4, 4, 4);
-}
-
-/*!
-    \overload
-
-    Sets the uniform variable array called \a name in the current
-    context to the \a count 4x4 matrix elements of \a values.
-
-    \sa setAttributeValue()
-*/
-void QGLShaderProgram::setUniformValueArray(const char *name, const QMatrix4x4 *values, int count)
-{
-    setUniformValueArray(uniformLocation(name), values, count);
-}
-
-#undef ctx
-
-/*!
-    Returns the hardware limit for how many vertices a geometry shader
-    can output.
-
-    \since 4.7
-
-    \sa setGeometryOutputVertexCount()
-*/
-int QGLShaderProgram::maxGeometryOutputVertices() const
-{
-    GLint n = 0;
-#if !defined(QT_OPENGL_ES_2)
-    Q_D(const QGLShaderProgram);
-    if (!QOpenGLContext::currentContext()->isOpenGLES())
-        d->glfuncs->glGetIntegerv(GL_MAX_GEOMETRY_OUTPUT_VERTICES_EXT, &n);
-#endif
-    return n;
-}
-
-/*!
-    Sets the maximum number of vertices the current geometry shader
-    program will produce, if active, to \a count.
-
-    \since 4.7
-
-    This parameter takes effect the next time the program is linked.
-*/
-void QGLShaderProgram::setGeometryOutputVertexCount(int count)
-{
-#ifndef QT_NO_DEBUG
-    int max = maxGeometryOutputVertices();
-    if (count > max) {
-        qWarning("QGLShaderProgram::setGeometryOutputVertexCount: count: %d higher than maximum: %d",
-                 count, max);
-    }
-#endif
-    d_func()->geometryVertexCount = count;
-}
-
-
-/*!
-    Returns the maximum number of vertices the current geometry shader
-    program will produce, if active.
-
-    \since 4.7
-
-    This parameter takes effect the ntext time the program is linked.
-*/
-int QGLShaderProgram::geometryOutputVertexCount() const
-{
-    return d_func()->geometryVertexCount;
-}
-
-
-/*!
-    Sets the input type from \a inputType.
-
-    This parameter takes effect the next time the program is linked.
-*/
-void QGLShaderProgram::setGeometryInputType(GLenum inputType)
-{
-    d_func()->geometryInputType = inputType;
-}
-
-
-/*!
-    Returns the geometry shader input type, if active.
-
-    This parameter takes effect the next time the program is linked.
-
-    \since 4.7
- */
-
-GLenum QGLShaderProgram::geometryInputType() const
-{
-    return d_func()->geometryInputType;
-}
-
-
-/*!
-    Sets the output type from the geometry shader, if active, to
-    \a outputType.
-
-    This parameter takes effect the next time the program is linked.
-
-    \since 4.7
-*/
-void QGLShaderProgram::setGeometryOutputType(GLenum outputType)
-{
-    d_func()->geometryOutputType = outputType;
-}
-
-
-/*!
-    Returns the geometry shader output type, if active.
-
-    This parameter takes effect the next time the program is linked.
-
-    \since 4.7
- */
-GLenum QGLShaderProgram::geometryOutputType() const
-{
-    return d_func()->geometryOutputType;
-}
-
-
-/*!
-    Returns \c true if shader programs written in the OpenGL Shading
-    Language (GLSL) are supported on this system; false otherwise.
-
-    The \a context is used to resolve the GLSL extensions.
-    If \a context is \nullptr, then QGLContext::currentContext() is
-    used.
-*/
-bool QGLShaderProgram::hasOpenGLShaderPrograms(const QGLContext *context)
-{
-#if !defined(QT_OPENGL_ES_2)
-    if (!context)
-        context = QGLContext::currentContext();
-    if (!context)
-        return false;
-
-    QOpenGLFunctions functions(context->contextHandle());
-    return functions.hasOpenGLFeature(QOpenGLFunctions::Shaders);
-#else
-    Q_UNUSED(context);
-    return true;
-#endif
-}
-
-/*!
-    \internal
-*/
-void QGLShaderProgram::shaderDestroyed()
-{
-    Q_D(QGLShaderProgram);
-    QGLShader *shader = qobject_cast<QGLShader *>(sender());
-    if (shader && !d->removingShaders)
-        removeShader(shader);
-}
-
-
-#undef ctx
-#undef context
-
-/*!
-    Returns \c true if shader programs of type \a type are supported on
-    this system; false otherwise.
-
-    The \a context is used to resolve the GLSL extensions.
-    If \a context is \nullptr, then QGLContext::currentContext() is
-    used.
-
-    \since 4.7
-*/
-bool QGLShader::hasOpenGLShaders(ShaderType type, const QGLContext *context)
-{
-    if (!context)
-        context = QGLContext::currentContext();
-    if (!context)
-        return false;
-
-    if ((type & ~(Geometry | Vertex | Fragment)) || type == 0)
-        return false;
-
-    QOpenGLFunctions functions(context->contextHandle());
-    bool resolved = functions.hasOpenGLFeature(QOpenGLFunctions::Shaders);
-    if (!resolved)
-        return false;
-
-    if ((type & Geometry) && !QByteArray((const char *) functions.glGetString(GL_EXTENSIONS)).contains("GL_EXT_geometry_shader4"))
-        return false;
-
-    return true;
-}
-
-QT_END_NAMESPACE
diff --git a/src/opengl/qglshaderprogram.h b/src/opengl/qglshaderprogram.h
deleted file mode 100644
index 3ce88197d2..0000000000
--- a/src/opengl/qglshaderprogram.h
+++ /dev/null
@@ -1,303 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtOpenGL module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QGLSHADERPROGRAM_H
-#define QGLSHADERPROGRAM_H
-
-#include <QtOpenGL/qgl.h>
-#include <QtGui/qvector2d.h>
-#include <QtGui/qvector3d.h>
-#include <QtGui/qvector4d.h>
-#include <QtGui/qmatrix4x4.h>
-
-QT_BEGIN_NAMESPACE
-
-
-class QGLShaderProgram;
-class QGLShaderPrivate;
-
-class Q_OPENGL_EXPORT QGLShader : public QObject
-{
-    Q_OBJECT
-public:
-    enum ShaderTypeBit
-    {
-        Vertex          = 0x0001,
-        Fragment        = 0x0002,
-        Geometry        = 0x0004
-    };
-    Q_DECLARE_FLAGS(ShaderType, ShaderTypeBit)
-
-    explicit QGLShader(QGLShader::ShaderType type, QObject *parent = nullptr);
-    QGLShader(QGLShader::ShaderType type, const QGLContext *context, QObject *parent = nullptr);
-    virtual ~QGLShader();
-
-    QGLShader::ShaderType shaderType() const;
-
-    bool compileSourceCode(const char *source);
-    bool compileSourceCode(const QByteArray& source);
-    bool compileSourceCode(const QString& source);
-    bool compileSourceFile(const QString& fileName);
-
-    QByteArray sourceCode() const;
-
-    bool isCompiled() const;
-    QString log() const;
-
-    GLuint shaderId() const;
-
-    static bool hasOpenGLShaders(ShaderType type, const QGLContext *context = nullptr);
-
-private:
-    friend class QGLShaderProgram;
-
-    Q_DISABLE_COPY(QGLShader)
-    Q_DECLARE_PRIVATE(QGLShader)
-};
-
-Q_DECLARE_OPERATORS_FOR_FLAGS(QGLShader::ShaderType)
-
-
-class QGLShaderProgramPrivate;
-
-class Q_OPENGL_EXPORT QGLShaderProgram : public QObject
-{
-    Q_OBJECT
-public:
-    explicit QGLShaderProgram(QObject *parent = nullptr);
-    explicit QGLShaderProgram(const QGLContext *context, QObject *parent = nullptr);
-    virtual ~QGLShaderProgram();
-
-    bool addShader(QGLShader *shader);
-    void removeShader(QGLShader *shader);
-    QList<QGLShader *> shaders() const;
-
-    bool addShaderFromSourceCode(QGLShader::ShaderType type, const char *source);
-    bool addShaderFromSourceCode(QGLShader::ShaderType type, const QByteArray& source);
-    bool addShaderFromSourceCode(QGLShader::ShaderType type, const QString& source);
-    bool addShaderFromSourceFile(QGLShader::ShaderType type, const QString& fileName);
-
-    void removeAllShaders();
-
-    virtual bool link();
-    bool isLinked() const;
-    QString log() const;
-
-    bool bind();
-    void release();
-
-    GLuint programId() const;
-
-    int maxGeometryOutputVertices() const;
-
-    void setGeometryOutputVertexCount(int count);
-    int geometryOutputVertexCount() const;
-
-    void setGeometryInputType(GLenum inputType);
-    GLenum geometryInputType() const;
-
-    void setGeometryOutputType(GLenum outputType);
-    GLenum geometryOutputType() const;
-
-    void bindAttributeLocation(const char *name, int location);
-    void bindAttributeLocation(const QByteArray& name, int location);
-    void bindAttributeLocation(const QString& name, int location);
-
-    int attributeLocation(const char *name) const;
-    int attributeLocation(const QByteArray& name) const;
-    int attributeLocation(const QString& name) const;
-
-    void setAttributeValue(int location, GLfloat value);
-    void setAttributeValue(int location, GLfloat x, GLfloat y);
-    void setAttributeValue(int location, GLfloat x, GLfloat y, GLfloat z);
-    void setAttributeValue(int location, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-    void setAttributeValue(int location, const QVector2D& value);
-    void setAttributeValue(int location, const QVector3D& value);
-    void setAttributeValue(int location, const QVector4D& value);
-    void setAttributeValue(int location, const QColor& value);
-    void setAttributeValue(int location, const GLfloat *values, int columns, int rows);
-
-    void setAttributeValue(const char *name, GLfloat value);
-    void setAttributeValue(const char *name, GLfloat x, GLfloat y);
-    void setAttributeValue(const char *name, GLfloat x, GLfloat y, GLfloat z);
-    void setAttributeValue(const char *name, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-    void setAttributeValue(const char *name, const QVector2D& value);
-    void setAttributeValue(const char *name, const QVector3D& value);
-    void setAttributeValue(const char *name, const QVector4D& value);
-    void setAttributeValue(const char *name, const QColor& value);
-    void setAttributeValue(const char *name, const GLfloat *values, int columns, int rows);
-
-    void setAttributeArray
-        (int location, const GLfloat *values, int tupleSize, int stride = 0);
-    void setAttributeArray
-        (int location, const QVector2D *values, int stride = 0);
-    void setAttributeArray
-        (int location, const QVector3D *values, int stride = 0);
-    void setAttributeArray
-        (int location, const QVector4D *values, int stride = 0);
-    void setAttributeArray
-        (int location, GLenum type, const void *values, int tupleSize, int stride = 0);
-    void setAttributeArray
-        (const char *name, const GLfloat *values, int tupleSize, int stride = 0);
-    void setAttributeArray
-        (const char *name, const QVector2D *values, int stride = 0);
-    void setAttributeArray
-        (const char *name, const QVector3D *values, int stride = 0);
-    void setAttributeArray
-        (const char *name, const QVector4D *values, int stride = 0);
-    void setAttributeArray
-        (const char *name, GLenum type, const void *values, int tupleSize, int stride = 0);
-
-    void setAttributeBuffer
-        (int location, GLenum type, int offset, int tupleSize, int stride = 0);
-    void setAttributeBuffer
-        (const char *name, GLenum type, int offset, int tupleSize, int stride = 0);
-
-    void enableAttributeArray(int location);
-    void enableAttributeArray(const char *name);
-    void disableAttributeArray(int location);
-    void disableAttributeArray(const char *name);
-
-    int uniformLocation(const char *name) const;
-    int uniformLocation(const QByteArray& name) const;
-    int uniformLocation(const QString& name) const;
-
-    void setUniformValue(int location, GLfloat value);
-    void setUniformValue(int location, GLint value);
-    void setUniformValue(int location, GLuint value);
-    void setUniformValue(int location, GLfloat x, GLfloat y);
-    void setUniformValue(int location, GLfloat x, GLfloat y, GLfloat z);
-    void setUniformValue(int location, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-    void setUniformValue(int location, const QVector2D& value);
-    void setUniformValue(int location, const QVector3D& value);
-    void setUniformValue(int location, const QVector4D& value);
-    void setUniformValue(int location, const QColor& color);
-    void setUniformValue(int location, const QPoint& point);
-    void setUniformValue(int location, const QPointF& point);
-    void setUniformValue(int location, const QSize& size);
-    void setUniformValue(int location, const QSizeF& size);
-    void setUniformValue(int location, const QMatrix2x2& value);
-    void setUniformValue(int location, const QMatrix2x3& value);
-    void setUniformValue(int location, const QMatrix2x4& value);
-    void setUniformValue(int location, const QMatrix3x2& value);
-    void setUniformValue(int location, const QMatrix3x3& value);
-    void setUniformValue(int location, const QMatrix3x4& value);
-    void setUniformValue(int location, const QMatrix4x2& value);
-    void setUniformValue(int location, const QMatrix4x3& value);
-    void setUniformValue(int location, const QMatrix4x4& value);
-    void setUniformValue(int location, const GLfloat value[2][2]);
-    void setUniformValue(int location, const GLfloat value[3][3]);
-    void setUniformValue(int location, const GLfloat value[4][4]);
-    void setUniformValue(int location, const QTransform& value);
-
-    void setUniformValue(const char *name, GLfloat value);
-    void setUniformValue(const char *name, GLint value);
-    void setUniformValue(const char *name, GLuint value);
-    void setUniformValue(const char *name, GLfloat x, GLfloat y);
-    void setUniformValue(const char *name, GLfloat x, GLfloat y, GLfloat z);
-    void setUniformValue(const char *name, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-    void setUniformValue(const char *name, const QVector2D& value);
-    void setUniformValue(const char *name, const QVector3D& value);
-    void setUniformValue(const char *name, const QVector4D& value);
-    void setUniformValue(const char *name, const QColor& color);
-    void setUniformValue(const char *name, const QPoint& point);
-    void setUniformValue(const char *name, const QPointF& point);
-    void setUniformValue(const char *name, const QSize& size);
-    void setUniformValue(const char *name, const QSizeF& size);
-    void setUniformValue(const char *name, const QMatrix2x2& value);
-    void setUniformValue(const char *name, const QMatrix2x3& value);
-    void setUniformValue(const char *name, const QMatrix2x4& value);
-    void setUniformValue(const char *name, const QMatrix3x2& value);
-    void setUniformValue(const char *name, const QMatrix3x3& value);
-    void setUniformValue(const char *name, const QMatrix3x4& value);
-    void setUniformValue(const char *name, const QMatrix4x2& value);
-    void setUniformValue(const char *name, const QMatrix4x3& value);
-    void setUniformValue(const char *name, const QMatrix4x4& value);
-    void setUniformValue(const char *name, const GLfloat value[2][2]);
-    void setUniformValue(const char *name, const GLfloat value[3][3]);
-    void setUniformValue(const char *name, const GLfloat value[4][4]);
-    void setUniformValue(const char *name, const QTransform& value);
-
-    void setUniformValueArray(int location, const GLfloat *values, int count, int tupleSize);
-    void setUniformValueArray(int location, const GLint *values, int count);
-    void setUniformValueArray(int location, const GLuint *values, int count);
-    void setUniformValueArray(int location, const QVector2D *values, int count);
-    void setUniformValueArray(int location, const QVector3D *values, int count);
-    void setUniformValueArray(int location, const QVector4D *values, int count);
-    void setUniformValueArray(int location, const QMatrix2x2 *values, int count);
-    void setUniformValueArray(int location, const QMatrix2x3 *values, int count);
-    void setUniformValueArray(int location, const QMatrix2x4 *values, int count);
-    void setUniformValueArray(int location, const QMatrix3x2 *values, int count);
-    void setUniformValueArray(int location, const QMatrix3x3 *values, int count);
-    void setUniformValueArray(int location, const QMatrix3x4 *values, int count);
-    void setUniformValueArray(int location, const QMatrix4x2 *values, int count);
-    void setUniformValueArray(int location, const QMatrix4x3 *values, int count);
-    void setUniformValueArray(int location, const QMatrix4x4 *values, int count);
-
-    void setUniformValueArray(const char *name, const GLfloat *values, int count, int tupleSize);
-    void setUniformValueArray(const char *name, const GLint *values, int count);
-    void setUniformValueArray(const char *name, const GLuint *values, int count);
-    void setUniformValueArray(const char *name, const QVector2D *values, int count);
-    void setUniformValueArray(const char *name, const QVector3D *values, int count);
-    void setUniformValueArray(const char *name, const QVector4D *values, int count);
-    void setUniformValueArray(const char *name, const QMatrix2x2 *values, int count);
-    void setUniformValueArray(const char *name, const QMatrix2x3 *values, int count);
-    void setUniformValueArray(const char *name, const QMatrix2x4 *values, int count);
-    void setUniformValueArray(const char *name, const QMatrix3x2 *values, int count);
-    void setUniformValueArray(const char *name, const QMatrix3x3 *values, int count);
-    void setUniformValueArray(const char *name, const QMatrix3x4 *values, int count);
-    void setUniformValueArray(const char *name, const QMatrix4x2 *values, int count);
-    void setUniformValueArray(const char *name, const QMatrix4x3 *values, int count);
-    void setUniformValueArray(const char *name, const QMatrix4x4 *values, int count);
-
-    static bool hasOpenGLShaderPrograms(const QGLContext *context = nullptr);
-
-private Q_SLOTS:
-    void shaderDestroyed();
-
-private:
-    Q_DISABLE_COPY(QGLShaderProgram)
-    Q_DECLARE_PRIVATE(QGLShaderProgram)
-
-    bool init();
-};
-
-QT_END_NAMESPACE
-
-#endif
diff --git a/src/opengl/qgraphicsshadereffect.cpp b/src/opengl/qgraphicsshadereffect.cpp
deleted file mode 100644
index 97b83a6b3d..0000000000
--- a/src/opengl/qgraphicsshadereffect.cpp
+++ /dev/null
@@ -1,272 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtOpenGL module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qgraphicsshadereffect_p.h"
-
-#include "qglshaderprogram.h"
-#include "gl2paintengineex/qglcustomshaderstage_p.h"
-#define QGL_HAVE_CUSTOM_SHADERS 1
-#include <QtGui/qpainter.h>
-#include <QtWidgets/qgraphicsitem.h>
-#include <private/qgraphicseffect_p.h>
-
-QT_BEGIN_NAMESPACE
-
-/*#
-    \class QGraphicsShaderEffect
-    \inmodule QtOpenGL
-    \brief The QGraphicsShaderEffect class is the base class for creating
-    custom GLSL shader effects in a QGraphicsScene.
-    \since 4.6
-    \ingroup multimedia
-    \ingroup graphicsview-api
-
-    The specific effect is defined by a fragment of GLSL source code
-    supplied to setPixelShaderFragment().  This source code must define a
-    function with the signature
-    \c{lowp vec4 customShader(lowp sampler2D imageTexture, highp vec2 textureCoords)}
-    that returns the source pixel value
-    to use in the paint engine's shader program.  The shader fragment
-    is linked with the regular shader code used by the GL2 paint engine
-    to construct a complete QGLShaderProgram.
-
-    The following example shader converts the incoming pixmap to
-    grayscale and then applies a colorize operation using the
-    \c effectColor value:
-
-    \snippet code/src_opengl_qgraphicsshadereffect.cpp 0
-
-    To use this shader code, it is necessary to define a subclass
-    of QGraphicsShaderEffect as follows:
-
-    \snippet code/src_opengl_qgraphicsshadereffect.cpp 1
-
-    The setUniforms() function is called when the effect is about
-    to be used for drawing to give the subclass the opportunity to
-    set effect-specific uniform variables.
-
-    QGraphicsShaderEffect is only supported when the GL2 paint engine
-    is in use.  When any other paint engine is in use (GL1, raster, etc),
-    the drawItem() method will draw its item argument directly with
-    no effect applied.
-
-    \sa QGraphicsEffect
-*/
-
-static const char qglslDefaultImageFragmentShader[] = "\
-    lowp vec4 customShader(lowp sampler2D imageTexture, highp vec2 textureCoords) { \
-        return texture2D(imageTexture, textureCoords); \
-    }\n";
-
-#ifdef QGL_HAVE_CUSTOM_SHADERS
-
-class QGLCustomShaderEffectStage : public QGLCustomShaderStage
-{
-public:
-    QGLCustomShaderEffectStage
-            (QGraphicsShaderEffect *e, const QByteArray& source)
-        : QGLCustomShaderStage(),
-          effect(e)
-    {
-        setSource(source);
-    }
-
-    void setUniforms(QGLShaderProgram *program) override;
-
-    QGraphicsShaderEffect *effect;
-};
-
-void QGLCustomShaderEffectStage::setUniforms(QGLShaderProgram *program)
-{
-    effect->setUniforms(program);
-}
-
-#endif
-
-class QGraphicsShaderEffectPrivate : public QGraphicsEffectPrivate
-{
-    Q_DECLARE_PUBLIC(QGraphicsShaderEffect)
-public:
-    QGraphicsShaderEffectPrivate()
-        : pixelShaderFragment(qglslDefaultImageFragmentShader)
-#ifdef QGL_HAVE_CUSTOM_SHADERS
-          , customShaderStage(0)
-#endif
-    {
-    }
-
-    QByteArray pixelShaderFragment;
-#ifdef QGL_HAVE_CUSTOM_SHADERS
-    QGLCustomShaderEffectStage *customShaderStage;
-#endif
-};
-
-/*#
-    Constructs a shader effect and attaches it to \a parent.
-*/
-QGraphicsShaderEffect::QGraphicsShaderEffect(QObject *parent)
-    : QGraphicsEffect(*new QGraphicsShaderEffectPrivate(), parent)
-{
-}
-
-/*#
-    Destroys this shader effect.
-*/
-QGraphicsShaderEffect::~QGraphicsShaderEffect()
-{
-#ifdef QGL_HAVE_CUSTOM_SHADERS
-    Q_D(QGraphicsShaderEffect);
-    delete d->customShaderStage;
-#endif
-}
-
-/*#
-    Returns the source code for the pixel shader fragment for
-    this shader effect.  The default is a shader that copies
-    its incoming pixmap directly to the output with no effect
-    applied.
-
-    \sa setPixelShaderFragment()
-*/
-QByteArray QGraphicsShaderEffect::pixelShaderFragment() const
-{
-    Q_D(const QGraphicsShaderEffect);
-    return d->pixelShaderFragment;
-}
-
-/*#
-    Sets the source code for the pixel shader fragment for
-    this shader effect to \a code.
-
-    The \a code must define a GLSL function with the signature
-    \c{lowp vec4 customShader(lowp sampler2D imageTexture, highp vec2 textureCoords)}
-    that returns the source pixel value to use in the paint engine's
-    shader program.  The following is the default pixel shader fragment,
-    which draws a pixmap with no effect applied:
-
-    \snippet code/src_opengl_qgraphicsshadereffect.cpp 2
-
-    \sa pixelShaderFragment(), setUniforms()
-*/
-void QGraphicsShaderEffect::setPixelShaderFragment(const QByteArray& code)
-{
-    Q_D(QGraphicsShaderEffect);
-    if (d->pixelShaderFragment != code) {
-        d->pixelShaderFragment = code;
-#ifdef QGL_HAVE_CUSTOM_SHADERS
-        delete d->customShaderStage;
-        d->customShaderStage = 0;
-#endif
-    }
-}
-
-/*#
-    \reimp
-*/
-void QGraphicsShaderEffect::draw(QPainter *painter)
-{
-    Q_D(QGraphicsShaderEffect);
-
-#ifdef QGL_HAVE_CUSTOM_SHADERS
-    // Set the custom shader on the paint engine.  The setOnPainter()
-    // call may fail if the paint engine is not GL2.  In that case,
-    // we fall through to drawing the pixmap normally.
-    if (!d->customShaderStage) {
-        d->customShaderStage = new QGLCustomShaderEffectStage
-            (this, d->pixelShaderFragment);
-    }
-    bool usingShader = d->customShaderStage->setOnPainter(painter);
-
-    QPoint offset;
-    if (sourceIsPixmap()) {
-        // No point in drawing in device coordinates (pixmap will be scaled anyways).
-        const QPixmap pixmap = sourcePixmap(Qt::LogicalCoordinates, &offset);
-        painter->drawPixmap(offset, pixmap);
-    } else {
-        // Draw pixmap in device coordinates to avoid pixmap scaling.
-        const QPixmap pixmap = sourcePixmap(Qt::DeviceCoordinates, &offset);
-        QTransform restoreTransform = painter->worldTransform();
-        painter->setWorldTransform(QTransform());
-        painter->drawPixmap(offset, pixmap);
-        painter->setWorldTransform(restoreTransform);
-    }
-
-    // Remove the custom shader to return to normal painting operations.
-    if (usingShader)
-        d->customShaderStage->removeFromPainter(painter);
-#else
-    drawSource(painter);
-#endif
-}
-
-/*#
-    Sets the custom uniform variables on this shader effect to
-    be dirty.  The setUniforms() function will be called the next
-    time the shader program corresponding to this effect is used.
-
-    This function is typically called by subclasses when an
-    effect-specific parameter is changed by the application.
-
-    \sa setUniforms()
-*/
-void QGraphicsShaderEffect::setUniformsDirty()
-{
-#ifdef QGL_HAVE_CUSTOM_SHADERS
-    Q_D(QGraphicsShaderEffect);
-    if (d->customShaderStage)
-        d->customShaderStage->setUniformsDirty();
-#endif
-}
-
-/*#
-    Sets custom uniform variables on the current GL context when
-    \a program is about to be used by the paint engine.
-
-    This function should be overridden if the shader set with
-    setPixelShaderFragment() has additional parameters beyond
-    those that the paint engine normally sets itself.
-
-    \sa setUniformsDirty()
-*/
-void QGraphicsShaderEffect::setUniforms(QGLShaderProgram *program)
-{
-    Q_UNUSED(program);
-}
-
-QT_END_NAMESPACE
diff --git a/src/opengl/qgraphicsshadereffect_p.h b/src/opengl/qgraphicsshadereffect_p.h
deleted file mode 100644
index 218caa2936..0000000000
--- a/src/opengl/qgraphicsshadereffect_p.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtOpenGL module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QGRAPHICSSHADEREFFECT_P_H
-#define QGRAPHICSSHADEREFFECT_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include <QtWidgets/qgraphicseffect.h>
-
-#include <QtOpenGL/qtopenglglobal.h>
-
-QT_REQUIRE_CONFIG(graphicseffect);
-
-QT_BEGIN_NAMESPACE
-
-class QGLShaderProgram;
-class QGLCustomShaderEffectStage;
-class QGraphicsShaderEffectPrivate;
-
-class Q_OPENGL_EXPORT QGraphicsShaderEffect : public QGraphicsEffect
-{
-    Q_OBJECT
-public:
-    QGraphicsShaderEffect(QObject *parent = nullptr);
-    virtual ~QGraphicsShaderEffect();
-
-    QByteArray pixelShaderFragment() const;
-    void setPixelShaderFragment(const QByteArray& code);
-
-protected:
-    void draw(QPainter *painter) override;
-    void setUniformsDirty();
-    virtual void setUniforms(QGLShaderProgram *program);
-
-private:
-    Q_DECLARE_PRIVATE(QGraphicsShaderEffect)
-    Q_DISABLE_COPY_MOVE(QGraphicsShaderEffect)
-
-    friend class QGLCustomShaderEffectStage;
-};
-
-QT_END_NAMESPACE
-
-#endif // QGRAPHICSSHADEREFFECT_P_H
diff --git a/src/opengl/qopengl2pexvertexarray.cpp b/src/opengl/qopengl2pexvertexarray.cpp
new file mode 100644
index 0000000000..df0fb764c9
--- /dev/null
+++ b/src/opengl/qopengl2pexvertexarray.cpp
@@ -0,0 +1,173 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtOpenGL module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qopengl2pexvertexarray_p.h"
+
+#include <private/qbezier_p.h>
+
+QT_BEGIN_NAMESPACE
+
+void QOpenGL2PEXVertexArray::clear()
+{
+    vertexArray.reset();
+    vertexArrayStops.reset();
+    boundingRectDirty = true;
+}
+
+
+QOpenGLRect QOpenGL2PEXVertexArray::boundingRect() const
+{
+    if (boundingRectDirty)
+        return QOpenGLRect(0.0, 0.0, 0.0, 0.0);
+    else
+        return QOpenGLRect(minX, minY, maxX, maxY);
+}
+
+void QOpenGL2PEXVertexArray::addClosingLine(int index)
+{
+    QPointF point(vertexArray.at(index));
+    if (point != QPointF(vertexArray.last()))
+        vertexArray.add(point);
+}
+
+void QOpenGL2PEXVertexArray::addCentroid(const QVectorPath &path, int subPathIndex)
+{
+    const QPointF *const points = reinterpret_cast<const QPointF *>(path.points());
+    const QPainterPath::ElementType *const elements = path.elements();
+
+    QPointF sum = points[subPathIndex];
+    int count = 1;
+
+    for (int i = subPathIndex + 1; i < path.elementCount() && (!elements || elements[i] != QPainterPath::MoveToElement); ++i) {
+        sum += points[i];
+        ++count;
+    }
+
+    const QPointF centroid = sum / qreal(count);
+    vertexArray.add(centroid);
+}
+
+void QOpenGL2PEXVertexArray::addPath(const QVectorPath &path, GLfloat curveInverseScale, bool outline)
+{
+    const QPointF* const points = reinterpret_cast<const QPointF*>(path.points());
+    const QPainterPath::ElementType* const elements = path.elements();
+
+    if (boundingRectDirty) {
+        minX = maxX = points[0].x();
+        minY = maxY = points[0].y();
+        boundingRectDirty = false;
+    }
+
+    if (!outline && !path.isConvex())
+        addCentroid(path, 0);
+
+    int lastMoveTo = vertexArray.size();
+    vertexArray.add(points[0]); // The first element is always a moveTo
+
+    do {
+        if (!elements) {
+//             qDebug("QVectorPath has no elements");
+            // If the path has a null elements pointer, the elements implicitly
+            // start with a moveTo (already added) and continue with lineTos:
+            for (int i=1; i<path.elementCount(); ++i)
+                lineToArray(points[i].x(), points[i].y());
+
+            break;
+        }
+//         qDebug("QVectorPath has element types");
+
+        for (int i=1; i<path.elementCount(); ++i) {
+            switch (elements[i]) {
+            case QPainterPath::MoveToElement:
+                if (!outline)
+                    addClosingLine(lastMoveTo);
+//                qDebug("element[%d] is a MoveToElement", i);
+                vertexArrayStops.add(vertexArray.size());
+                if (!outline) {
+                    if (!path.isConvex()) addCentroid(path, i);
+                    lastMoveTo = vertexArray.size();
+                }
+                lineToArray(points[i].x(), points[i].y()); // Add the moveTo as a new vertex
+                break;
+            case QPainterPath::LineToElement:
+//                qDebug("element[%d] is a LineToElement", i);
+                lineToArray(points[i].x(), points[i].y());
+                break;
+            case QPainterPath::CurveToElement: {
+                QBezier b = QBezier::fromPoints(*(((const QPointF *) points) + i - 1),
+                                                points[i],
+                                                points[i+1],
+                                                points[i+2]);
+                QRectF bounds = b.bounds();
+                // threshold based on same algorithm as in qtriangulatingstroker.cpp
+                int threshold = qMin<float>(64, qMax(bounds.width(), bounds.height()) * 3.14f / (curveInverseScale * 6));
+                if (threshold < 3) threshold = 3;
+                qreal one_over_threshold_minus_1 = qreal(1) / (threshold - 1);
+                for (int t=0; t<threshold; ++t) {
+                    QPointF pt = b.pointAt(t * one_over_threshold_minus_1);
+                    lineToArray(pt.x(), pt.y());
+                }
+                i += 2;
+                break; }
+            default:
+                break;
+            }
+        }
+    } while (0);
+
+    if (!outline)
+        addClosingLine(lastMoveTo);
+    vertexArrayStops.add(vertexArray.size());
+}
+
+void QOpenGL2PEXVertexArray::lineToArray(const GLfloat x, const GLfloat y)
+{
+    vertexArray.add(QOpenGLPoint(x, y));
+
+    if (x > maxX)
+        maxX = x;
+    else if (x < minX)
+        minX = x;
+    if (y > maxY)
+        maxY = y;
+    else if (y < minY)
+        minY = y;
+}
+
+QT_END_NAMESPACE
diff --git a/src/opengl/qopengl2pexvertexarray_p.h b/src/opengl/qopengl2pexvertexarray_p.h
new file mode 100644
index 0000000000..3ef26e908d
--- /dev/null
+++ b/src/opengl/qopengl2pexvertexarray_p.h
@@ -0,0 +1,167 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtOpenGL module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#ifndef QOPENGL2PEXVERTEXARRAY_P_H
+#define QOPENGL2PEXVERTEXARRAY_P_H
+
+#include <QRectF>
+
+#include <private/qdatabuffer_p.h>
+#include <private/qvectorpath_p.h>
+#include <private/qopenglcontext_p.h>
+
+QT_BEGIN_NAMESPACE
+
+class QOpenGLPoint
+{
+public:
+    QOpenGLPoint(GLfloat new_x, GLfloat new_y) :
+        x(new_x), y(new_y) {};
+
+    QOpenGLPoint(const QPointF &p) :
+        x(p.x()), y(p.y()) {};
+
+    QOpenGLPoint(const QPointF* p) :
+        x(p->x()), y(p->y()) {};
+
+    GLfloat x;
+    GLfloat y;
+
+    operator QPointF() {return QPointF(x,y);}
+    operator QPointF() const {return QPointF(x,y);}
+};
+
+struct QOpenGLRect
+{
+    QOpenGLRect(const QRectF &r)
+        :  left(r.left()), top(r.top()), right(r.right()), bottom(r.bottom()) {}
+
+    QOpenGLRect(GLfloat l, GLfloat t, GLfloat r, GLfloat b)
+        : left(l), top(t), right(r), bottom(b) {}
+
+    GLfloat left;
+    GLfloat top;
+    GLfloat right;
+    GLfloat bottom;
+
+    operator QRectF() const {return QRectF(left, top, right-left, bottom-top);}
+};
+
+class QOpenGL2PEXVertexArray
+{
+public:
+    QOpenGL2PEXVertexArray() :
+        vertexArray(0), vertexArrayStops(0),
+        maxX(-2e10), maxY(-2e10), minX(2e10), minY(2e10),
+        boundingRectDirty(true)
+    { }
+
+    inline void addRect(const QRectF &rect)
+    {
+        qreal top = rect.top();
+        qreal left = rect.left();
+        qreal bottom = rect.bottom();
+        qreal right = rect.right();
+
+        vertexArray << QOpenGLPoint(left, top)
+                    << QOpenGLPoint(right, top)
+                    << QOpenGLPoint(right, bottom)
+                    << QOpenGLPoint(right, bottom)
+                    << QOpenGLPoint(left, bottom)
+                    << QOpenGLPoint(left, top);
+    }
+
+    inline void addQuad(const QRectF &rect)
+    {
+        qreal top = rect.top();
+        qreal left = rect.left();
+        qreal bottom = rect.bottom();
+        qreal right = rect.right();
+
+        vertexArray << QOpenGLPoint(left, top)
+                    << QOpenGLPoint(right, top)
+                    << QOpenGLPoint(left, bottom)
+                    << QOpenGLPoint(right, bottom);
+
+    }
+
+    inline void addVertex(const GLfloat x, const GLfloat y)
+    {
+        vertexArray.add(QOpenGLPoint(x, y));
+    }
+
+    void addPath(const QVectorPath &path, GLfloat curveInverseScale, bool outline = true);
+    void clear();
+
+    QOpenGLPoint*        data() {return vertexArray.data();}
+    int *stops() const { return vertexArrayStops.data(); }
+    int stopCount() const { return vertexArrayStops.size(); }
+    QOpenGLRect         boundingRect() const;
+
+    int vertexCount() const { return vertexArray.size(); }
+
+    void lineToArray(const GLfloat x, const GLfloat y);
+
+private:
+    QDataBuffer<QOpenGLPoint> vertexArray;
+    QDataBuffer<int>      vertexArrayStops;
+
+    GLfloat     maxX;
+    GLfloat     maxY;
+    GLfloat     minX;
+    GLfloat     minY;
+    bool        boundingRectDirty;
+    void addClosingLine(int index);
+    void addCentroid(const QVectorPath &path, int subPathIndex);
+};
+
+QT_END_NAMESPACE
+
+#endif
diff --git a/src/opengl/qopenglbuffer.cpp b/src/opengl/qopenglbuffer.cpp
new file mode 100644
index 0000000000..3f049e5e89
--- /dev/null
+++ b/src/opengl/qopenglbuffer.cpp
@@ -0,0 +1,618 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtOpenGL module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui/qopengl.h>
+#include <QtGui/private/qopenglcontext_p.h>
+#include <QtCore/qatomic.h>
+#include "qopenglbuffer.h"
+#include <private/qopenglextensions_p.h>
+
+#ifndef GL_CONTEXT_LOST
+#define GL_CONTEXT_LOST                   0x0507
+#endif
+
+QT_BEGIN_NAMESPACE
+
+/*!
+    \class QOpenGLBuffer
+    \brief The QOpenGLBuffer class provides functions for creating and managing OpenGL buffer objects.
+    \since 5.0
+    \ingroup painting-3D
+    \inmodule QtOpenGL
+
+    Buffer objects are created in the OpenGL server so that the
+    client application can avoid uploading vertices, indices,
+    texture image data, etc every time they are needed.
+
+    QOpenGLBuffer objects can be copied around as a reference to the
+    underlying OpenGL buffer object:
+
+    \snippet code/src_gui_opengl_qopenglbuffer.cpp 0
+
+    QOpenGLBuffer performs a shallow copy when objects are copied in this
+    manner, but does not implement copy-on-write semantics.  The original
+    object will be affected whenever the copy is modified.
+*/
+
+/*!
+    \enum QOpenGLBuffer::Type
+    This enum defines the type of OpenGL buffer object to create with QOpenGLBuffer.
+
+    \value VertexBuffer Vertex buffer object for use when specifying
+           vertex arrays.
+    \value IndexBuffer Index buffer object for use with \c{glDrawElements()}.
+    \value PixelPackBuffer Pixel pack buffer object for reading pixel
+           data from the OpenGL server (for example, with \c{glReadPixels()}).
+           Not supported under OpenGL/ES.
+    \value PixelUnpackBuffer Pixel unpack buffer object for writing pixel
+           data to the OpenGL server (for example, with \c{glTexImage2D()}).
+           Not supported under OpenGL/ES.
+*/
+
+/*!
+    \enum QOpenGLBuffer::UsagePattern
+    This enum defines the usage pattern of a QOpenGLBuffer object.
+
+    \value StreamDraw The data will be set once and used a few times
+           for drawing operations.  Under OpenGL/ES 1.1 this is identical
+           to StaticDraw.
+    \value StreamRead The data will be set once and used a few times
+           for reading data back from the OpenGL server.  Not supported
+           under OpenGL/ES.
+    \value StreamCopy The data will be set once and used a few times
+           for reading data back from the OpenGL server for use in further
+           drawing operations.  Not supported under OpenGL/ES.
+    \value StaticDraw The data will be set once and used many times
+           for drawing operations.
+    \value StaticRead The data will be set once and used many times
+           for reading data back from the OpenGL server.  Not supported
+           under OpenGL/ES.
+    \value StaticCopy The data will be set once and used many times
+           for reading data back from the OpenGL server for use in further
+           drawing operations.  Not supported under OpenGL/ES.
+    \value DynamicDraw The data will be modified repeatedly and used
+           many times for drawing operations.
+    \value DynamicRead The data will be modified repeatedly and used
+           many times for reading data back from the OpenGL server.
+           Not supported under OpenGL/ES.
+    \value DynamicCopy The data will be modified repeatedly and used
+           many times for reading data back from the OpenGL server for
+           use in further drawing operations.  Not supported under OpenGL/ES.
+*/
+
+/*!
+    \enum QOpenGLBuffer::Access
+    This enum defines the access mode for QOpenGLBuffer::map().
+
+    \value ReadOnly The buffer will be mapped for reading only.
+    \value WriteOnly The buffer will be mapped for writing only.
+    \value ReadWrite The buffer will be mapped for reading and writing.
+*/
+
+/*!
+    \enum QOpenGLBuffer::RangeAccessFlag
+    This enum defines the access mode bits for QOpenGLBuffer::mapRange().
+
+    \value RangeRead The buffer will be mapped for reading.
+    \value RangeWrite The buffer will be mapped for writing.
+    \value RangeInvalidate Discard the previous contents of the specified range.
+    \value RangeInvalidateBuffer Discard the previous contents of the entire buffer.
+    \value RangeFlushExplicit Indicates that modifications are to be flushed explicitly via \c glFlushMappedBufferRange.
+    \value RangeUnsynchronized Indicates that pending operations should not be synchronized before returning from mapRange().
+*/
+
+class QOpenGLBufferPrivate
+{
+public:
+    QOpenGLBufferPrivate(QOpenGLBuffer::Type t)
+        : ref(1),
+          type(t),
+          guard(nullptr),
+          usagePattern(QOpenGLBuffer::StaticDraw),
+          actualUsagePattern(QOpenGLBuffer::StaticDraw),
+          funcs(nullptr)
+    {
+    }
+
+    QAtomicInt ref;
+    QOpenGLBuffer::Type type;
+    QOpenGLSharedResourceGuard *guard;
+    QOpenGLBuffer::UsagePattern usagePattern;
+    QOpenGLBuffer::UsagePattern actualUsagePattern;
+    QOpenGLExtensions *funcs;
+};
+
+/*!
+    Constructs a new buffer object of type QOpenGLBuffer::VertexBuffer.
+
+    Note: this constructor just creates the QOpenGLBuffer instance.  The actual
+    buffer object in the OpenGL server is not created until create() is called.
+
+    \sa create()
+*/
+QOpenGLBuffer::QOpenGLBuffer()
+    : d_ptr(new QOpenGLBufferPrivate(QOpenGLBuffer::VertexBuffer))
+{
+}
+
+/*!
+    Constructs a new buffer object of \a type.
+
+    Note: this constructor just creates the QOpenGLBuffer instance.  The actual
+    buffer object in the OpenGL server is not created until create() is called.
+
+    \sa create()
+*/
+QOpenGLBuffer::QOpenGLBuffer(QOpenGLBuffer::Type type)
+    : d_ptr(new QOpenGLBufferPrivate(type))
+{
+}
+
+/*!
+    Constructs a shallow copy of \a other.
+
+    Note: QOpenGLBuffer does not implement copy-on-write semantics,
+    so \a other will be affected whenever the copy is modified.
+*/
+QOpenGLBuffer::QOpenGLBuffer(const QOpenGLBuffer &other)
+    : d_ptr(other.d_ptr)
+{
+    d_ptr->ref.ref();
+}
+
+/*!
+    Destroys this buffer object, including the storage being
+    used in the OpenGL server.
+*/
+QOpenGLBuffer::~QOpenGLBuffer()
+{
+    if (!d_ptr->ref.deref()) {
+        destroy();
+        delete d_ptr;
+    }
+}
+
+/*!
+    Assigns a shallow copy of \a other to this object.
+
+    Note: QOpenGLBuffer does not implement copy-on-write semantics,
+    so \a other will be affected whenever the copy is modified.
+*/
+QOpenGLBuffer &QOpenGLBuffer::operator=(const QOpenGLBuffer &other)
+{
+    if (d_ptr != other.d_ptr) {
+        other.d_ptr->ref.ref();
+        if (!d_ptr->ref.deref()) {
+            destroy();
+            delete d_ptr;
+        }
+        d_ptr = other.d_ptr;
+    }
+    return *this;
+}
+
+/*!
+    Returns the type of buffer represented by this object.
+*/
+QOpenGLBuffer::Type QOpenGLBuffer::type() const
+{
+    Q_D(const QOpenGLBuffer);
+    return d->type;
+}
+
+/*!
+    Returns the usage pattern for this buffer object.
+    The default value is StaticDraw.
+
+    \sa setUsagePattern()
+*/
+QOpenGLBuffer::UsagePattern QOpenGLBuffer::usagePattern() const
+{
+    Q_D(const QOpenGLBuffer);
+    return d->usagePattern;
+}
+
+/*!
+    Sets the usage pattern for this buffer object to \a value.
+    This function must be called before allocate() or write().
+
+    \sa usagePattern(), allocate(), write()
+*/
+void QOpenGLBuffer::setUsagePattern(QOpenGLBuffer::UsagePattern value)
+{
+    Q_D(QOpenGLBuffer);
+    d->usagePattern = d->actualUsagePattern = value;
+}
+
+namespace {
+    void freeBufferFunc(QOpenGLFunctions *funcs, GLuint id)
+    {
+        funcs->glDeleteBuffers(1, &id);
+    }
+}
+
+/*!
+    Creates the buffer object in the OpenGL server.  Returns \c true if
+    the object was created; false otherwise.
+
+    This function must be called with a current QOpenGLContext.
+    The buffer will be bound to and can only be used in
+    that context (or any other context that is shared with it).
+
+    This function will return false if the OpenGL implementation
+    does not support buffers, or there is no current QOpenGLContext.
+
+    \sa isCreated(), allocate(), write(), destroy()
+*/
+bool QOpenGLBuffer::create()
+{
+    Q_D(QOpenGLBuffer);
+    if (d->guard && d->guard->id())
+        return true;
+    QOpenGLContext *ctx = QOpenGLContext::currentContext();
+    if (ctx) {
+        delete d->funcs;
+        d->funcs = new QOpenGLExtensions(ctx);
+        GLuint bufferId = 0;
+        d->funcs->glGenBuffers(1, &bufferId);
+        if (bufferId) {
+            if (d->guard)
+                d->guard->free();
+
+            d->guard = new QOpenGLSharedResourceGuard(ctx, bufferId, freeBufferFunc);
+            return true;
+        }
+    }
+    return false;
+}
+
+/*!
+    Returns \c true if this buffer has been created; false otherwise.
+
+    \sa create(), destroy()
+*/
+bool QOpenGLBuffer::isCreated() const
+{
+    Q_D(const QOpenGLBuffer);
+    return d->guard && d->guard->id();
+}
+
+/*!
+    Destroys this buffer object, including the storage being
+    used in the OpenGL server.  All references to the buffer will
+    become invalid.
+*/
+void QOpenGLBuffer::destroy()
+{
+    Q_D(QOpenGLBuffer);
+    if (d->guard) {
+        d->guard->free();
+        d->guard = nullptr;
+    }
+    delete d->funcs;
+    d->funcs = nullptr;
+}
+
+/*!
+    Reads the \a count bytes in this buffer starting at \a offset
+    into \a data.  Returns \c true on success; false if reading from
+    the buffer is not supported.  Buffer reading is not supported
+    under OpenGL/ES.
+
+    It is assumed that this buffer has been bound to the current context.
+
+    \sa write(), bind()
+*/
+bool QOpenGLBuffer::read(int offset, void *data, int count)
+{
+#if !defined(QT_OPENGL_ES)
+    Q_D(QOpenGLBuffer);
+    if (!d->funcs->hasOpenGLFeature(QOpenGLFunctions::Buffers) || !d->guard->id())
+        return false;
+
+    while (true) { // Clear error state.
+        GLenum error = d->funcs->glGetError();
+        if (error == GL_NO_ERROR)
+            break;
+        if (error == GL_CONTEXT_LOST)
+            return false;
+    };
+    d->funcs->glGetBufferSubData(d->type, offset, count, data);
+    return d->funcs->glGetError() == GL_NO_ERROR;
+#else
+    Q_UNUSED(offset);
+    Q_UNUSED(data);
+    Q_UNUSED(count);
+    return false;
+#endif
+}
+
+/*!
+    Replaces the \a count bytes of this buffer starting at \a offset
+    with the contents of \a data.  Any other bytes in the buffer
+    will be left unmodified.
+
+    It is assumed that create() has been called on this buffer and that
+    it has been bound to the current context.
+
+    \sa create(), read(), allocate()
+*/
+void QOpenGLBuffer::write(int offset, const void *data, int count)
+{
+#ifndef QT_NO_DEBUG
+    if (!isCreated())
+        qWarning("QOpenGLBuffer::write(): buffer not created");
+#endif
+    Q_D(QOpenGLBuffer);
+    if (d->guard && d->guard->id())
+        d->funcs->glBufferSubData(d->type, offset, count, data);
+}
+
+/*!
+    Allocates \a count bytes of space to the buffer, initialized to
+    the contents of \a data.  Any previous contents will be removed.
+
+    It is assumed that create() has been called on this buffer and that
+    it has been bound to the current context.
+
+    \sa create(), read(), write()
+*/
+void QOpenGLBuffer::allocate(const void *data, int count)
+{
+#ifndef QT_NO_DEBUG
+    if (!isCreated())
+        qWarning("QOpenGLBuffer::allocate(): buffer not created");
+#endif
+    Q_D(QOpenGLBuffer);
+    if (d->guard && d->guard->id())
+        d->funcs->glBufferData(d->type, count, data, d->actualUsagePattern);
+}
+
+/*!
+    \fn void QOpenGLBuffer::allocate(int count)
+    \overload
+
+    Allocates \a count bytes of space to the buffer.  Any previous
+    contents will be removed.
+
+    It is assumed that create() has been called on this buffer and that
+    it has been bound to the current context.
+
+    \sa create(), write()
+*/
+
+/*!
+    Binds the buffer associated with this object to the current
+    OpenGL context.  Returns \c false if binding was not possible, usually because
+    type() is not supported on this OpenGL implementation.
+
+    The buffer must be bound to the same QOpenGLContext current when create()
+    was called, or to another QOpenGLContext that is sharing with it.
+    Otherwise, false will be returned from this function.
+
+    \sa release(), create()
+*/
+bool QOpenGLBuffer::bind()
+{
+#ifndef QT_NO_DEBUG
+    if (!isCreated())
+        qWarning("QOpenGLBuffer::bind(): buffer not created");
+#endif
+    Q_D(const QOpenGLBuffer);
+    GLuint bufferId = d->guard ? d->guard->id() : 0;
+    if (bufferId) {
+        if (d->guard->group() != QOpenGLContextGroup::currentContextGroup()) {
+#ifndef QT_NO_DEBUG
+            qWarning("QOpenGLBuffer::bind: buffer is not valid in the current context");
+#endif
+            return false;
+        }
+        d->funcs->glBindBuffer(d->type, bufferId);
+        return true;
+    } else {
+        return false;
+    }
+}
+
+/*!
+    Releases the buffer associated with this object from the
+    current OpenGL context.
+
+    This function must be called with the same QOpenGLContext current
+    as when bind() was called on the buffer.
+
+    \sa bind()
+*/
+void QOpenGLBuffer::release()
+{
+#ifndef QT_NO_DEBUG
+    if (!isCreated())
+        qWarning("QOpenGLBuffer::release(): buffer not created");
+#endif
+    Q_D(const QOpenGLBuffer);
+    if (d->guard && d->guard->id())
+        d->funcs->glBindBuffer(d->type, 0);
+}
+
+/*!
+    Releases the buffer associated with \a type in the current
+    QOpenGLContext.
+
+    This function is a direct call to \c{glBindBuffer(type, 0)}
+    for use when the caller does not know which QOpenGLBuffer has
+    been bound to the context but wants to make sure that it
+    is released.
+
+    \snippet code/src_gui_opengl_qopenglbuffer.cpp 1
+*/
+void QOpenGLBuffer::release(QOpenGLBuffer::Type type)
+{
+    QOpenGLContext *ctx = QOpenGLContext::currentContext();
+    if (ctx)
+        ctx->functions()->glBindBuffer(GLenum(type), 0);
+}
+
+/*!
+    Returns the OpenGL identifier associated with this buffer; zero if
+    the buffer has not been created.
+
+    \sa isCreated()
+*/
+GLuint QOpenGLBuffer::bufferId() const
+{
+    Q_D(const QOpenGLBuffer);
+    return d->guard ? d->guard->id() : 0;
+}
+
+/*!
+    Returns the size of the data in this buffer, for reading operations.
+    Returns -1 if fetching the buffer size is not supported, or the
+    buffer has not been created.
+
+    It is assumed that this buffer has been bound to the current context.
+
+    \sa isCreated(), bind()
+*/
+int QOpenGLBuffer::size() const
+{
+    Q_D(const QOpenGLBuffer);
+    if (!d->guard || !d->guard->id())
+        return -1;
+    GLint value = -1;
+    d->funcs->glGetBufferParameteriv(d->type, GL_BUFFER_SIZE, &value);
+    return value;
+}
+
+/*!
+    Maps the contents of this buffer into the application's memory
+    space and returns a pointer to it.  Returns null if memory
+    mapping is not possible.  The \a access parameter indicates the
+    type of access to be performed.
+
+    It is assumed that create() has been called on this buffer and that
+    it has been bound to the current context.
+
+    \note This function is only supported under OpenGL ES 2.0 or
+    earlier if the \c GL_OES_mapbuffer extension is present.
+
+    \note On OpenGL ES 3.0 and newer, or, in case if desktop OpenGL,
+    if \c GL_ARB_map_buffer_range is supported, this function uses
+    \c glMapBufferRange instead of \c glMapBuffer.
+
+    \sa unmap(), create(), bind(), mapRange()
+*/
+void *QOpenGLBuffer::map(QOpenGLBuffer::Access access)
+{
+    Q_D(QOpenGLBuffer);
+#ifndef QT_NO_DEBUG
+    if (!isCreated())
+        qWarning("QOpenGLBuffer::map(): buffer not created");
+#endif
+    if (!d->guard || !d->guard->id())
+        return nullptr;
+    if (d->funcs->hasOpenGLExtension(QOpenGLExtensions::MapBufferRange)) {
+        QOpenGLBuffer::RangeAccessFlags rangeAccess;
+        switch (access) {
+        case QOpenGLBuffer::ReadOnly:
+            rangeAccess = QOpenGLBuffer::RangeRead;
+            break;
+        case QOpenGLBuffer::WriteOnly:
+            rangeAccess = QOpenGLBuffer::RangeWrite;
+            break;
+        case QOpenGLBuffer::ReadWrite:
+            rangeAccess = QOpenGLBuffer::RangeRead | QOpenGLBuffer::RangeWrite;
+            break;
+        }
+        return d->funcs->glMapBufferRange(d->type, 0, size(), rangeAccess);
+    } else {
+        return d->funcs->glMapBuffer(d->type, access);
+    }
+}
+
+/*!
+    Maps the range specified by \a offset and \a count of the contents
+    of this buffer into the application's memory space and returns a
+    pointer to it.  Returns null if memory mapping is not possible.
+    The \a access parameter specifies a combination of access flags.
+
+    It is assumed that create() has been called on this buffer and that
+    it has been bound to the current context.
+
+    \note This function is not available on OpenGL ES 2.0 and earlier.
+
+    \sa unmap(), create(), bind()
+ */
+void *QOpenGLBuffer::mapRange(int offset, int count, QOpenGLBuffer::RangeAccessFlags access)
+{
+    Q_D(QOpenGLBuffer);
+#ifndef QT_NO_DEBUG
+    if (!isCreated())
+        qWarning("QOpenGLBuffer::mapRange(): buffer not created");
+#endif
+    if (!d->guard || !d->guard->id())
+        return nullptr;
+    return d->funcs->glMapBufferRange(d->type, offset, count, access);
+}
+
+/*!
+    Unmaps the buffer after it was mapped into the application's
+    memory space with a previous call to map().  Returns \c true if
+    the unmap succeeded; false otherwise.
+
+    It is assumed that this buffer has been bound to the current context,
+    and that it was previously mapped with map().
+
+    \note This function is only supported under OpenGL ES 2.0 and
+    earlier if the \c{GL_OES_mapbuffer} extension is present.
+
+    \sa map()
+*/
+bool QOpenGLBuffer::unmap()
+{
+    Q_D(QOpenGLBuffer);
+#ifndef QT_NO_DEBUG
+    if (!isCreated())
+        qWarning("QOpenGLBuffer::unmap(): buffer not created");
+#endif
+    if (!d->guard || !d->guard->id())
+        return false;
+    return d->funcs->glUnmapBuffer(d->type) == GL_TRUE;
+}
+
+QT_END_NAMESPACE
diff --git a/src/opengl/qopenglbuffer.h b/src/opengl/qopenglbuffer.h
new file mode 100644
index 0000000000..8a099a0320
--- /dev/null
+++ b/src/opengl/qopenglbuffer.h
@@ -0,0 +1,145 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtOpenGL module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QOPENGLBUFFER_H
+#define QOPENGLBUFFER_H
+
+#include <QtOpenGL/qtopenglglobal.h>
+
+#ifndef QT_NO_OPENGL
+
+#include <QtCore/qscopedpointer.h>
+#include <QtGui/qopengl.h>
+
+QT_BEGIN_NAMESPACE
+
+
+class QOpenGLBufferPrivate;
+
+class Q_OPENGL_EXPORT QOpenGLBuffer
+{
+public:
+    enum Type
+    {
+        VertexBuffer        = 0x8892, // GL_ARRAY_BUFFER
+        IndexBuffer         = 0x8893, // GL_ELEMENT_ARRAY_BUFFER
+        PixelPackBuffer     = 0x88EB, // GL_PIXEL_PACK_BUFFER
+        PixelUnpackBuffer   = 0x88EC  // GL_PIXEL_UNPACK_BUFFER
+    };
+
+    QOpenGLBuffer();
+    explicit QOpenGLBuffer(QOpenGLBuffer::Type type);
+    QOpenGLBuffer(const QOpenGLBuffer &other);
+    ~QOpenGLBuffer();
+
+    QOpenGLBuffer &operator=(const QOpenGLBuffer &other);
+
+    enum UsagePattern
+    {
+        StreamDraw          = 0x88E0, // GL_STREAM_DRAW
+        StreamRead          = 0x88E1, // GL_STREAM_READ
+        StreamCopy          = 0x88E2, // GL_STREAM_COPY
+        StaticDraw          = 0x88E4, // GL_STATIC_DRAW
+        StaticRead          = 0x88E5, // GL_STATIC_READ
+        StaticCopy          = 0x88E6, // GL_STATIC_COPY
+        DynamicDraw         = 0x88E8, // GL_DYNAMIC_DRAW
+        DynamicRead         = 0x88E9, // GL_DYNAMIC_READ
+        DynamicCopy         = 0x88EA  // GL_DYNAMIC_COPY
+    };
+
+    enum Access
+    {
+        ReadOnly            = 0x88B8, // GL_READ_ONLY
+        WriteOnly           = 0x88B9, // GL_WRITE_ONLY
+        ReadWrite           = 0x88BA  // GL_READ_WRITE
+    };
+
+    enum RangeAccessFlag
+    {
+        RangeRead             = 0x0001, // GL_MAP_READ_BIT
+        RangeWrite            = 0x0002, // GL_MAP_WRITE_BIT
+        RangeInvalidate       = 0x0004, // GL_MAP_INVALIDATE_RANGE_BIT
+        RangeInvalidateBuffer = 0x0008, // GL_MAP_INVALIDATE_BUFFER_BIT
+        RangeFlushExplicit    = 0x0010, // GL_MAP_FLUSH_EXPLICIT_BIT
+        RangeUnsynchronized   = 0x0020  // GL_MAP_UNSYNCHRONIZED_BIT
+    };
+    Q_DECLARE_FLAGS(RangeAccessFlags, RangeAccessFlag)
+
+    QOpenGLBuffer::Type type() const;
+
+    QOpenGLBuffer::UsagePattern usagePattern() const;
+    void setUsagePattern(QOpenGLBuffer::UsagePattern value);
+
+    bool create();
+    bool isCreated() const;
+
+    void destroy();
+
+    bool bind();
+    void release();
+
+    static void release(QOpenGLBuffer::Type type);
+
+    GLuint bufferId() const;
+
+    int size() const;
+
+    bool read(int offset, void *data, int count);
+    void write(int offset, const void *data, int count);
+
+    void allocate(const void *data, int count);
+    inline void allocate(int count) { allocate(nullptr, count); }
+
+    void *map(QOpenGLBuffer::Access access);
+    void *mapRange(int offset, int count, QOpenGLBuffer::RangeAccessFlags access);
+    bool unmap();
+
+private:
+    QOpenGLBufferPrivate *d_ptr;
+
+    Q_DECLARE_PRIVATE(QOpenGLBuffer)
+};
+
+Q_DECLARE_OPERATORS_FOR_FLAGS(QOpenGLBuffer::RangeAccessFlags)
+
+QT_END_NAMESPACE
+
+#endif // QT_NO_OPENGL
+
+#endif
diff --git a/src/opengl/qopenglcustomshaderstage.cpp b/src/opengl/qopenglcustomshaderstage.cpp
new file mode 100644
index 0000000000..7a32b2fbc0
--- /dev/null
+++ b/src/opengl/qopenglcustomshaderstage.cpp
@@ -0,0 +1,137 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtOpenGL module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qopenglcustomshaderstage_p.h"
+#include "qopenglengineshadermanager_p.h"
+#include "qopenglpaintengine_p.h"
+#include <private/qpainter_p.h>
+
+QT_BEGIN_NAMESPACE
+
+class QOpenGLCustomShaderStagePrivate
+{
+public:
+    QOpenGLCustomShaderStagePrivate() :
+        m_manager(nullptr) {}
+
+    QPointer<QOpenGLEngineShaderManager> m_manager;
+    QByteArray              m_source;
+};
+
+
+
+
+QOpenGLCustomShaderStage::QOpenGLCustomShaderStage()
+    : d_ptr(new QOpenGLCustomShaderStagePrivate)
+{
+}
+
+QOpenGLCustomShaderStage::~QOpenGLCustomShaderStage()
+{
+    Q_D(QOpenGLCustomShaderStage);
+    if (d->m_manager) {
+        d->m_manager->removeCustomStage();
+        d->m_manager->sharedShaders->cleanupCustomStage(this);
+    }
+    delete d_ptr;
+}
+
+void QOpenGLCustomShaderStage::setUniformsDirty()
+{
+    Q_D(QOpenGLCustomShaderStage);
+    if (d->m_manager)
+        d->m_manager->setDirty(); // ### Probably a bit overkill!
+}
+
+bool QOpenGLCustomShaderStage::setOnPainter(QPainter* p)
+{
+    Q_D(QOpenGLCustomShaderStage);
+    if (p->paintEngine()->type() != QPaintEngine::OpenGL2) {
+        qWarning("QOpenGLCustomShaderStage::setOnPainter() - paint engine not OpenGL2");
+        return false;
+    }
+    if (d->m_manager)
+        qWarning("Custom shader is already set on a painter");
+
+    QOpenGL2PaintEngineEx *engine = static_cast<QOpenGL2PaintEngineEx*>(p->paintEngine());
+    d->m_manager = QOpenGL2PaintEngineExPrivate::shaderManagerForEngine(engine);
+    Q_ASSERT(d->m_manager);
+
+    d->m_manager->setCustomStage(this);
+    return true;
+}
+
+void QOpenGLCustomShaderStage::removeFromPainter(QPainter* p)
+{
+    Q_D(QOpenGLCustomShaderStage);
+    if (p->paintEngine()->type() != QPaintEngine::OpenGL2)
+        return;
+
+    QOpenGL2PaintEngineEx *engine = static_cast<QOpenGL2PaintEngineEx*>(p->paintEngine());
+    d->m_manager = QOpenGL2PaintEngineExPrivate::shaderManagerForEngine(engine);
+    Q_ASSERT(d->m_manager);
+
+    // Just set the stage to null, don't call removeCustomStage().
+    // This should leave the program in a compiled/linked state
+    // if the next custom shader stage is this one again.
+    d->m_manager->setCustomStage(nullptr);
+    d->m_manager = nullptr;
+}
+
+QByteArray QOpenGLCustomShaderStage::source() const
+{
+    Q_D(const QOpenGLCustomShaderStage);
+    return d->m_source;
+}
+
+// Called by the shader manager if another custom shader is attached or
+// the manager is deleted
+void QOpenGLCustomShaderStage::setInactive()
+{
+    Q_D(QOpenGLCustomShaderStage);
+    d->m_manager = nullptr;
+}
+
+void QOpenGLCustomShaderStage::setSource(const QByteArray& s)
+{
+    Q_D(QOpenGLCustomShaderStage);
+    d->m_source = s;
+}
+
+QT_END_NAMESPACE
diff --git a/src/opengl/qopenglcustomshaderstage_p.h b/src/opengl/qopenglcustomshaderstage_p.h
new file mode 100644
index 0000000000..255c115e3c
--- /dev/null
+++ b/src/opengl/qopenglcustomshaderstage_p.h
@@ -0,0 +1,90 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtOpenGL module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QOPENGL_CUSTOM_SHADER_STAGE_H
+#define QOPENGL_CUSTOM_SHADER_STAGE_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <QtOpenGL/qtopenglglobal.h>
+#include <QOpenGLShaderProgram>
+
+QT_BEGIN_NAMESPACE
+
+
+class QPainter;
+class QOpenGLCustomShaderStagePrivate;
+class Q_OPENGL_EXPORT QOpenGLCustomShaderStage
+{
+    Q_DECLARE_PRIVATE(QOpenGLCustomShaderStage)
+public:
+    QOpenGLCustomShaderStage();
+    virtual ~QOpenGLCustomShaderStage();
+    virtual void setUniforms(QOpenGLShaderProgram*) {}
+
+    void setUniformsDirty();
+
+    bool setOnPainter(QPainter*);
+    void removeFromPainter(QPainter*);
+    QByteArray source() const;
+
+    void setInactive();
+protected:
+    void setSource(const QByteArray&);
+
+private:
+    QOpenGLCustomShaderStagePrivate* d_ptr;
+
+    Q_DISABLE_COPY_MOVE(QOpenGLCustomShaderStage)
+};
+
+
+QT_END_NAMESPACE
+
+
+#endif
diff --git a/src/opengl/qopengldebug.cpp b/src/opengl/qopengldebug.cpp
new file mode 100644
index 0000000000..a69f6069dc
--- /dev/null
+++ b/src/opengl/qopengldebug.cpp
@@ -0,0 +1,1826 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtOpenGL module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtCore/private/qobject_p.h>
+#include <QtCore/qglobal.h>
+#include <QtCore/qvarlengtharray.h>
+#include <QtGui/qopengl.h>
+#include <QtGui/qopenglfunctions.h>
+#include <QtGui/qoffscreensurface.h>
+
+#include "qopengldebug.h"
+
+QT_BEGIN_NAMESPACE
+
+/*!
+    \class QOpenGLDebugMessage
+    \brief The QOpenGLDebugMessage class wraps an OpenGL debug message.
+    \inmodule QtOpenGL
+    \reentrant
+    \since 5.1
+    \ingroup shared
+    \ingroup painting-3D
+
+    Debug messages are usually created by the OpenGL server and then read by
+    OpenGL clients (either from the OpenGL internal debug log, or logged in real-time).
+    A debug message has a textual representation, a vendor-specific numeric id,
+    a source, a type and a severity.
+
+    It's also possible for applications or third-party libraries and toolkits
+    to create and insert messages in the debug log. In order to do so, you can use
+    the createApplicationMessage() or the createThirdPartyMessage() static functions.
+
+    \sa QOpenGLDebugLogger
+*/
+
+/*!
+    \class QOpenGLDebugLogger
+    \brief The QOpenGLDebugLogger enables logging of OpenGL debugging messages.
+    \inmodule QtOpenGL
+    \since 5.1
+    \ingroup painting-3D
+
+    \tableofcontents
+
+    \section1 Introduction
+
+    OpenGL programming can be very error prone. Most of the time, a single
+    failing call to OpenGL can cause an entire portion of an application to
+    stop working, with nothing being drawn on the screen.
+
+    The only way to be sure that no errors are being returned from the OpenGL
+    implementation is checking with \c{glGetError} after each and every API
+    call. Moreover, OpenGL errors stack up, therefore glGetError should always
+    be used in a loop like this:
+
+    \snippet code/src_gui_opengl_qopengldebug.cpp 0
+
+    If you try to clear the error stack, make sure not just keep going until
+    GL_NO_ERROR is returned but also break on GL_CONTEXT_LOST as that error
+    value will keep repeating.
+
+    There are also many other information we are interested in (as application
+    developers), for instance performance issues, or warnings about using
+    deprecated APIs. Those kind of messages are not reported through the
+    ordinary OpenGL error reporting mechanisms.
+
+    QOpenGLDebugLogger aims at addressing these issues by providing access to
+    the \e{OpenGL debug log}. If your OpenGL implementation supports it (by
+    exposing the \c{GL_KHR_debug} extension), messages from the OpenGL server
+    will be either logged in an internal OpenGL log, or passed in "real-time"
+    to listeners as they're generated from OpenGL.
+
+    QOpenGLDebugLogger supports both these modes of operation. Refer to the
+    following sections to find out the differences between them.
+
+    \section1 Creating an OpenGL Debug Context
+
+    For efficiency reasons, OpenGL implementations are allowed not to create
+    any debug output at all, unless the OpenGL context is a debug context. In order
+    to create a debug context from Qt, you must set the QSurfaceFormat::DebugContext
+    format option on the QSurfaceFormat used to create the QOpenGLContext object:
+
+    \snippet code/src_gui_opengl_qopengldebug.cpp 1
+
+    Note that requesting a 3.2 OpenGL Core Profile is just for the example's
+    purposes; this class is not tied to any specific OpenGL or OpenGL ES
+    version, as it relies on the availability of the \c{GL_KHR_debug} extension
+    (see below).
+
+    \section1 Creating and Initializing a QOpenGLDebugLogger
+
+    QOpenGLDebugLogger is a simple QObject-derived class. Just like all QObject
+    subclasses, you create an instance (and optionally specify a parent
+    object), and like the other OpenGL functions in Qt you \e{must} initialize
+    it before usage by calling initialize() whilst there is a current OpenGL context:
+
+    \snippet code/src_gui_opengl_qopengldebug.cpp 2
+
+    Note that the \c{GL_KHR_debug} extension \e{must} be available in the context
+    in order to access the messages logged by OpenGL. You can check the
+    presence of this extension by calling:
+
+    \snippet code/src_gui_opengl_qopengldebug.cpp 3
+
+    where \c{ctx} is a valid QOpenGLContext. If the extension is not available,
+    initialize() will return false.
+
+    \section1 Reading the Internal OpenGL Debug Log
+
+    OpenGL implementations keep an internal log of debug messages. Messages
+    stored in this log can be retrieved by using the loggedMessages() function:
+
+    \snippet code/src_gui_opengl_qopengldebug.cpp 4
+
+    The internal log has a limited size; when it fills up, older messages will
+    get discarded to make room for the new incoming messages. When you call
+    loggedMessages(), the internal log will be emptied as well.
+
+    If you want to be sure not to lose any debug message, you must use real-time
+    logging instead of calling this function. However, debug messages might
+    still be generated in the timespan between context creation and activation
+    of real-time logging (or, in general, when the real-time logging is disabled).
+
+    \section1 Real-time logging of messages
+
+    It is also possible to receive a stream of debug messages from the OpenGL
+    server \e{as they are generated} by the implementation. In order to do so,
+    you need to connect a suitable slot to the messageLogged() signal, and
+    start logging by calling startLogging():
+
+    \snippet code/src_gui_opengl_qopengldebug.cpp 5
+
+    Similarly, logging can be disabled at any time by calling the stopLogging()
+    function.
+
+    Real-time logging can be either asynchronous or synchronous, depending on
+    the parameter passed to startLogging(). When logging in asynchronous mode
+    (the default, as it has a very small overhead), the OpenGL implementation
+    can generate messages at any time, and/or in an order which is different from the
+    order of the OpenGL commands which caused those messages to be logged.
+    The messages could also be generated from a thread that it's different from
+    the thread the context is currently bound to. This is because OpenGL
+    implementations are usually highly threaded and asynchronous, and therefore
+    no warranties are made about the relative order and the timings of the
+    debug messages.
+
+    On the other hand, logging in synchronous mode has a high overhead, but
+    the OpenGL implementation guarantees that all the messages caused by a
+    certain command are received in order, before the command returns,
+    and from the same thread the OpenGL context is bound to.
+
+    This means that when logging in synchronous mode you will be able to run
+    your OpenGL application in a debugger, put a breakpoint on a slot connected
+    to the messageLogged() signal, and see in the backtrace the exact call
+    that caused the logged message. This can be extremely useful to debug
+    an OpenGL problem. Note that if OpenGL rendering is happening in another
+    thread, you must force the signal/slot connection type to Qt::DirectConnection
+    in order to be able to see the actual backtrace.
+
+    Refer to the LoggingMode enum documentation for more information about
+    logging modes.
+
+    \note When real-time logging is enabled, debug messages will \e{not} be
+    inserted in the internal OpenGL debug log any more; messages already
+    present in the internal log will not be deleted, nor they will be emitted
+    through the messageLogged() signal. Since some messages might be generated
+    before real-time logging is started (and therefore be kept in the internal
+    OpenGL log), it is important to always check if it contains any message
+    after calling startLogging().
+
+    \section1 Inserting Messages in the Debug Log
+
+    It is possible for applications and libraries to insert custom messages in
+    the debug log, for instance for marking a group of related OpenGL commands
+    and therefore being then able to identify eventual messages coming from them.
+
+    In order to do so, you can create a QOpenGLDebugMessage object by calling
+    \l{QOpenGLDebugMessage::}{createApplicationMessage()} or
+    \l{QOpenGLDebugMessage::}{createThirdPartyMessage()}, and then inserting it
+    into the log by calling logMessage():
+
+    \snippet code/src_gui_opengl_qopengldebug.cpp 6
+
+    Note that OpenGL implementations have a vendor-specific limit to the length
+    of the messages that can be inserted in the debug log. You can retrieve
+    this length by calling the maximumMessageLength() method; messages longer
+    than the limit will automatically get truncated.
+
+    \section1 Controlling the Debug Output
+
+    QOpenGLDebugMessage is also able to apply filters to the debug messages, and
+    therefore limit the amount of messages logged. You can enable or disable
+    logging of messages by calling enableMessages() and disableMessages()
+    respectively. By default, all messages are logged.
+
+    It is possible to enable or disable messages by selecting them by:
+
+    \list
+    \li source, type and severity (and including all ids in the selection);
+    \li id, source and type (and including all severities in the selection).
+    \endlist
+
+    Note that the "enabled" status for a given message is a property of the
+    (id, source, type, severity) tuple; the message attributes \e{do not} form
+    a hierarchy of any kind. You should be careful about the order of the calls
+    to enableMessages() and disableMessages(), as it will change which
+    messages will are enabled / disabled.
+
+    It's not possible to filter by the message text itself; applications
+    have to do that on their own (in slots connected to the messageLogged()
+    signal, or after fetching the messages in the internal debug log
+    through loggedMessages()).
+
+    In order to simplify the management of the enabled / disabled statuses,
+    QOpenGLDebugMessage also supports the concept of \c{debug groups}. A debug
+    group contains the group of enabled / disabled configurations of debug
+    messages. Moreover, debug groups are organized in a stack: it is possible
+    to push and pop groups by calling pushGroup() and popGroup() respectively.
+    (When an OpenGL context is created, there is already a group in the stack).
+
+    The enableMessages() and disableMessages() functions will modify the
+    configuration in the current debug group, that is, the one at the top of
+    the debug groups stack.
+
+    When a new group is pushed onto the debug groups stack, it will inherit
+    the configuration of the group that was previously on the top of the stack.
+    Vice versa, popping a debug group will restore the configuration of
+    the debug group that becomes the new top.
+
+    Pushing (respectively popping) debug groups will also automatically generate
+    a debug message of type QOpenGLDebugMessage::GroupPushType (respectively
+    \l{QOpenGLDebugMessage::}{GroupPopType}).
+
+    \sa QOpenGLDebugMessage
+*/
+
+/*!
+    \enum QOpenGLDebugMessage::Source
+
+    The Source enum defines the source of the debug message.
+
+    \value InvalidSource
+        The source of the message is invalid; this is the source of a
+        default-constructed QOpenGLDebugMessage object.
+
+    \value APISource
+        The message was generated in response to OpenGL API calls.
+
+    \value WindowSystemSource
+        The message was generated by the window system.
+
+    \value ShaderCompilerSource
+        The message was generated by the shader compiler.
+
+    \value ThirdPartySource
+        The message was generated by a third party, for instance an OpenGL
+        framework a or debugging toolkit.
+
+    \value ApplicationSource
+        The message was generated by the application itself.
+
+    \value OtherSource
+        The message was generated by a source not included in this
+        enumeration.
+
+    \omitvalue LastSource
+
+    \value AnySource
+        This value corresponds to a mask of all possible message sources.
+*/
+
+/*!
+    \enum QOpenGLDebugMessage::Type
+
+    The Type enum defines the type of the debug message.
+
+    \value InvalidType
+        The type of the message is invalid; this is the type of a
+        default-constructed QOpenGLDebugMessage object.
+
+    \value ErrorType
+        The message represents an error.
+
+    \value DeprecatedBehaviorType
+        The message represents an usage of deprecated behavior.
+
+    \value UndefinedBehaviorType
+        The message represents an usage of undefined behavior.
+
+    \value PortabilityType
+        The message represents an usage of vendor-specific behavior,
+        that might pose portability concerns.
+
+    \value PerformanceType
+        The message represents a performance issue.
+
+    \value OtherType
+        The message represents a type not included in this
+        enumeration.
+
+    \value MarkerType
+        The message represents a marker in the debug log.
+
+    \value GroupPushType
+        The message represents a debug group push operation.
+
+    \value GroupPopType
+        The message represents a debug group pop operation.
+
+    \omitvalue LastType
+
+    \value AnyType
+        This value corresponds to a mask of all possible message types.
+*/
+
+/*!
+    \enum QOpenGLDebugMessage::Severity
+
+    The Severity enum defines the severity of the debug message.
+
+    \value InvalidSeverity
+        The severity of the message is invalid; this is the severity of a
+        default-constructed QOpenGLDebugMessage object.
+
+    \value HighSeverity
+        The message has a high severity.
+
+    \value MediumSeverity
+        The message has a medium severity.
+
+    \value LowSeverity
+        The message has a low severity.
+
+    \value NotificationSeverity
+        The message is a notification.
+
+    \omitvalue LastSeverity
+
+    \value AnySeverity
+        This value corresponds to a mask of all possible message severities.
+*/
+
+/*!
+    \property QOpenGLDebugLogger::loggingMode
+
+    \brief the logging mode passed to startLogging().
+
+    Note that logging must have been started or the value of this property
+    will be meaningless.
+
+    \sa startLogging(), isLogging()
+*/
+/*!
+    \enum QOpenGLDebugLogger::LoggingMode
+
+    The LoggingMode enum defines the logging mode of the logger object.
+
+    \value AsynchronousLogging
+        Messages from the OpenGL server are logged asynchronously. This means
+        that messages can be logged some time after the corresponding OpenGL
+        actions that caused them, and even be received in an out-of-order
+        fashion, depending on the OpenGL implementation. This mode has a very low
+        performance penalty, as OpenGL implementations are heavily threaded
+        and asynchronous by nature.
+
+    \value SynchronousLogging
+        Messages from the OpenGL server are logged synchronously and
+        sequentially. This has a severe performance hit, as OpenGL
+        implementations are very asynchronous by nature; but it's very useful
+        to debug OpenGL problems, as OpenGL guarantees that the messages
+        generated by a OpenGL command will be logged before the corresponding
+        command execution has returned. Therefore, you can install a breakpoint
+        on the messageLogged() signal and see in the backtrace which OpenGL
+        command caused it; the only caveat is that if you are using OpenGL from
+        multiple threads you may need to force direct connection when
+        connecting to the messageLogged() signal.
+*/
+
+// When using OpenGL ES 2.0, all the necessary GL_KHR_debug constants are
+// provided in qopengles2ext.h. Unfortunately, newer versions of that file
+// suffix everything with _KHR which causes extra headache when the goal is
+// to have a single piece of code that builds in all our target
+// environments. Therefore, try to detect this and use our custom defines
+// instead, which we anyway need for OS X.
+
+#if defined(GL_KHR_debug) && defined(GL_DEBUG_SOURCE_API_KHR)
+#define USE_MANUAL_DEFS
+#endif
+
+// Under OSX (at least up to 10.8) we cannot include our copy of glext.h,
+// but we use the system-wide one, which unfortunately lacks all the needed
+// defines/typedefs. In order to make the code compile, we just add here
+// the GL_KHR_debug defines.
+
+#ifndef GL_KHR_debug
+#define GL_KHR_debug 1
+#define USE_MANUAL_DEFS
+#endif
+
+#ifdef USE_MANUAL_DEFS
+
+#ifndef GL_DEBUG_OUTPUT_SYNCHRONOUS
+#define GL_DEBUG_OUTPUT_SYNCHRONOUS       0x8242
+#endif
+#ifndef GL_DEBUG_NEXT_LOGGED_MESSAGE_LENGTH
+#define GL_DEBUG_NEXT_LOGGED_MESSAGE_LENGTH 0x8243
+#endif
+#ifndef GL_DEBUG_CALLBACK_FUNCTION
+#define GL_DEBUG_CALLBACK_FUNCTION        0x8244
+#endif
+#ifndef GL_DEBUG_CALLBACK_USER_PARAM
+#define GL_DEBUG_CALLBACK_USER_PARAM      0x8245
+#endif
+#ifndef GL_DEBUG_SOURCE_API
+#define GL_DEBUG_SOURCE_API               0x8246
+#endif
+#ifndef GL_DEBUG_SOURCE_WINDOW_SYSTEM
+#define GL_DEBUG_SOURCE_WINDOW_SYSTEM     0x8247
+#endif
+#ifndef GL_DEBUG_SOURCE_SHADER_COMPILER
+#define GL_DEBUG_SOURCE_SHADER_COMPILER   0x8248
+#endif
+#ifndef GL_DEBUG_SOURCE_THIRD_PARTY
+#define GL_DEBUG_SOURCE_THIRD_PARTY       0x8249
+#endif
+#ifndef GL_DEBUG_SOURCE_APPLICATION
+#define GL_DEBUG_SOURCE_APPLICATION       0x824A
+#endif
+#ifndef GL_DEBUG_SOURCE_OTHER
+#define GL_DEBUG_SOURCE_OTHER             0x824B
+#endif
+#ifndef GL_DEBUG_TYPE_ERROR
+#define GL_DEBUG_TYPE_ERROR               0x824C
+#endif
+#ifndef GL_DEBUG_TYPE_DEPRECATED_BEHAVIOR
+#define GL_DEBUG_TYPE_DEPRECATED_BEHAVIOR 0x824D
+#endif
+#ifndef GL_DEBUG_TYPE_UNDEFINED_BEHAVIOR
+#define GL_DEBUG_TYPE_UNDEFINED_BEHAVIOR  0x824E
+#endif
+#ifndef GL_DEBUG_TYPE_PORTABILITY
+#define GL_DEBUG_TYPE_PORTABILITY         0x824F
+#endif
+#ifndef GL_DEBUG_TYPE_PERFORMANCE
+#define GL_DEBUG_TYPE_PERFORMANCE         0x8250
+#endif
+#ifndef GL_DEBUG_TYPE_OTHER
+#define GL_DEBUG_TYPE_OTHER               0x8251
+#endif
+#ifndef GL_DEBUG_TYPE_MARKER
+#define GL_DEBUG_TYPE_MARKER              0x8268
+#endif
+#ifndef GL_DEBUG_TYPE_PUSH_GROUP
+#define GL_DEBUG_TYPE_PUSH_GROUP          0x8269
+#endif
+#ifndef GL_DEBUG_TYPE_POP_GROUP
+#define GL_DEBUG_TYPE_POP_GROUP           0x826A
+#endif
+#ifndef GL_DEBUG_SEVERITY_NOTIFICATION
+#define GL_DEBUG_SEVERITY_NOTIFICATION    0x826B
+#endif
+#ifndef GL_MAX_DEBUG_GROUP_STACK_DEPTH
+#define GL_MAX_DEBUG_GROUP_STACK_DEPTH    0x826C
+#endif
+#ifndef GL_DEBUG_GROUP_STACK_DEPTH
+#define GL_DEBUG_GROUP_STACK_DEPTH        0x826D
+#endif
+#ifndef GL_BUFFER
+#define GL_BUFFER                         0x82E0
+#endif
+#ifndef GL_SHADER
+#define GL_SHADER                         0x82E1
+#endif
+#ifndef GL_PROGRAM
+#define GL_PROGRAM                        0x82E2
+#endif
+#ifndef GL_QUERY
+#define GL_QUERY                          0x82E3
+#endif
+#ifndef GL_PROGRAM_PIPELINE
+#define GL_PROGRAM_PIPELINE               0x82E4
+#endif
+#ifndef GL_SAMPLER
+#define GL_SAMPLER                        0x82E6
+#endif
+#ifndef GL_DISPLAY_LIST
+#define GL_DISPLAY_LIST                   0x82E7
+#endif
+#ifndef GL_MAX_LABEL_LENGTH
+#define GL_MAX_LABEL_LENGTH               0x82E8
+#endif
+#ifndef GL_MAX_DEBUG_MESSAGE_LENGTH
+#define GL_MAX_DEBUG_MESSAGE_LENGTH       0x9143
+#endif
+#ifndef GL_MAX_DEBUG_LOGGED_MESSAGES
+#define GL_MAX_DEBUG_LOGGED_MESSAGES      0x9144
+#endif
+#ifndef GL_DEBUG_LOGGED_MESSAGES
+#define GL_DEBUG_LOGGED_MESSAGES          0x9145
+#endif
+#ifndef GL_DEBUG_SEVERITY_HIGH
+#define GL_DEBUG_SEVERITY_HIGH            0x9146
+#endif
+#ifndef GL_DEBUG_SEVERITY_MEDIUM
+#define GL_DEBUG_SEVERITY_MEDIUM          0x9147
+#endif
+#ifndef GL_DEBUG_SEVERITY_LOW
+#define GL_DEBUG_SEVERITY_LOW             0x9148
+#endif
+#ifndef GL_DEBUG_OUTPUT
+#define GL_DEBUG_OUTPUT                   0x92E0
+#endif
+#ifndef GL_CONTEXT_FLAG_DEBUG_BIT
+#define GL_CONTEXT_FLAG_DEBUG_BIT         0x00000002
+#endif
+#ifndef GL_STACK_OVERFLOW
+#define GL_STACK_OVERFLOW                 0x0503
+#endif
+#ifndef GL_STACK_UNDERFLOW
+#define GL_STACK_UNDERFLOW                0x0504
+#endif
+
+typedef void (QOPENGLF_APIENTRY *GLDEBUGPROC)(GLenum source,GLenum type,GLuint id,GLenum severity,GLsizei length,const GLchar *message,const GLvoid *userParam);
+
+#endif /* USE_MANUAL_DEFS */
+
+
+/*!
+    \internal
+*/
+static QOpenGLDebugMessage::Source qt_messageSourceFromGL(GLenum source)
+{
+    switch (source) {
+    case GL_DEBUG_SOURCE_API:
+        return QOpenGLDebugMessage::APISource;
+    case GL_DEBUG_SOURCE_WINDOW_SYSTEM:
+        return QOpenGLDebugMessage::WindowSystemSource;
+    case GL_DEBUG_SOURCE_SHADER_COMPILER:
+        return QOpenGLDebugMessage::ShaderCompilerSource;
+    case GL_DEBUG_SOURCE_THIRD_PARTY:
+        return QOpenGLDebugMessage::ThirdPartySource;
+    case GL_DEBUG_SOURCE_APPLICATION:
+        return QOpenGLDebugMessage::ApplicationSource;
+    case GL_DEBUG_SOURCE_OTHER:
+        return QOpenGLDebugMessage::OtherSource;
+    }
+
+    Q_ASSERT_X(false, Q_FUNC_INFO, "Unknown message source from GL");
+    return QOpenGLDebugMessage::OtherSource;
+}
+
+/*!
+    \internal
+*/
+static GLenum qt_messageSourceToGL(QOpenGLDebugMessage::Source source)
+{
+    switch (source) {
+    case QOpenGLDebugMessage::InvalidSource:
+        break;
+    case QOpenGLDebugMessage::APISource:
+        return GL_DEBUG_SOURCE_API;
+    case QOpenGLDebugMessage::WindowSystemSource:
+        return GL_DEBUG_SOURCE_WINDOW_SYSTEM;
+    case QOpenGLDebugMessage::ShaderCompilerSource:
+        return GL_DEBUG_SOURCE_SHADER_COMPILER;
+    case QOpenGLDebugMessage::ThirdPartySource:
+        return GL_DEBUG_SOURCE_THIRD_PARTY;
+    case QOpenGLDebugMessage::ApplicationSource:
+        return GL_DEBUG_SOURCE_APPLICATION;
+    case QOpenGLDebugMessage::OtherSource:
+        return GL_DEBUG_SOURCE_OTHER;
+    case QOpenGLDebugMessage::AnySource:
+        break;
+    }
+
+    Q_ASSERT_X(false, Q_FUNC_INFO, "Invalid message source");
+    return GL_DEBUG_SOURCE_OTHER;
+}
+
+/*!
+    \internal
+*/
+static QString qt_messageSourceToString(QOpenGLDebugMessage::Source source)
+{
+    switch (source) {
+    case QOpenGLDebugMessage::InvalidSource:
+        return QStringLiteral("InvalidSource");
+    case QOpenGLDebugMessage::APISource:
+        return QStringLiteral("APISource");
+    case QOpenGLDebugMessage::WindowSystemSource:
+        return QStringLiteral("WindowSystemSource");
+    case QOpenGLDebugMessage::ShaderCompilerSource:
+        return QStringLiteral("ShaderCompilerSource");
+    case QOpenGLDebugMessage::ThirdPartySource:
+        return QStringLiteral("ThirdPartySource");
+    case QOpenGLDebugMessage::ApplicationSource:
+        return QStringLiteral("ApplicationSource");
+    case QOpenGLDebugMessage::OtherSource:
+        return QStringLiteral("OtherSource");
+    case QOpenGLDebugMessage::AnySource:
+        return QStringLiteral("AnySource");
+    }
+
+    Q_ASSERT_X(false, Q_FUNC_INFO, "Unknown message source");
+    return QString();
+}
+
+/*!
+    \internal
+*/
+static QOpenGLDebugMessage::Type qt_messageTypeFromGL(GLenum type)
+{
+    switch (type) {
+    case GL_DEBUG_TYPE_ERROR:
+        return QOpenGLDebugMessage::ErrorType;
+    case GL_DEBUG_TYPE_DEPRECATED_BEHAVIOR:
+    return QOpenGLDebugMessage::DeprecatedBehaviorType;
+    case GL_DEBUG_TYPE_UNDEFINED_BEHAVIOR:
+        return QOpenGLDebugMessage::UndefinedBehaviorType;
+    case GL_DEBUG_TYPE_PORTABILITY:
+        return QOpenGLDebugMessage::PortabilityType;
+    case GL_DEBUG_TYPE_PERFORMANCE:
+        return QOpenGLDebugMessage::PerformanceType;
+    case GL_DEBUG_TYPE_OTHER:
+        return QOpenGLDebugMessage::OtherType;
+    case GL_DEBUG_TYPE_MARKER:
+        return QOpenGLDebugMessage::MarkerType;
+    case GL_DEBUG_TYPE_PUSH_GROUP:
+        return QOpenGLDebugMessage::GroupPushType;
+    case GL_DEBUG_TYPE_POP_GROUP:
+        return QOpenGLDebugMessage::GroupPopType;
+    }
+
+    Q_ASSERT_X(false, Q_FUNC_INFO, "Unknown message type from GL");
+    return QOpenGLDebugMessage::OtherType;
+}
+
+/*!
+    \internal
+*/
+static GLenum qt_messageTypeToGL(QOpenGLDebugMessage::Type type)
+{
+    switch (type) {
+    case QOpenGLDebugMessage::InvalidType:
+        break;
+    case QOpenGLDebugMessage::ErrorType:
+        return GL_DEBUG_TYPE_ERROR;
+    case QOpenGLDebugMessage::DeprecatedBehaviorType:
+        return GL_DEBUG_TYPE_DEPRECATED_BEHAVIOR;
+    case QOpenGLDebugMessage::UndefinedBehaviorType:
+        return GL_DEBUG_TYPE_UNDEFINED_BEHAVIOR;
+    case QOpenGLDebugMessage::PortabilityType:
+        return GL_DEBUG_TYPE_PORTABILITY;
+    case QOpenGLDebugMessage::PerformanceType:
+        return GL_DEBUG_TYPE_PERFORMANCE;
+    case QOpenGLDebugMessage::OtherType:
+        return GL_DEBUG_TYPE_OTHER;
+    case QOpenGLDebugMessage::MarkerType:
+        return GL_DEBUG_TYPE_MARKER;
+    case QOpenGLDebugMessage::GroupPushType:
+        return GL_DEBUG_TYPE_PUSH_GROUP;
+    case QOpenGLDebugMessage::GroupPopType:
+        return GL_DEBUG_TYPE_POP_GROUP;
+    case QOpenGLDebugMessage::AnyType:
+        break;
+    }
+
+    Q_ASSERT_X(false, Q_FUNC_INFO, "Invalid message type");
+    return GL_DEBUG_TYPE_OTHER;
+}
+
+/*!
+    \internal
+*/
+static QString qt_messageTypeToString(QOpenGLDebugMessage::Type type)
+{
+    switch (type) {
+    case QOpenGLDebugMessage::InvalidType:
+        return QStringLiteral("InvalidType");
+    case QOpenGLDebugMessage::ErrorType:
+        return QStringLiteral("ErrorType");
+    case QOpenGLDebugMessage::DeprecatedBehaviorType:
+        return QStringLiteral("DeprecatedBehaviorType");
+    case QOpenGLDebugMessage::UndefinedBehaviorType:
+        return QStringLiteral("UndefinedBehaviorType");
+    case QOpenGLDebugMessage::PortabilityType:
+        return QStringLiteral("PortabilityType");
+    case QOpenGLDebugMessage::PerformanceType:
+        return QStringLiteral("PerformanceType");
+    case QOpenGLDebugMessage::OtherType:
+        return QStringLiteral("OtherType");
+    case QOpenGLDebugMessage::MarkerType:
+        return QStringLiteral("MarkerType");
+    case QOpenGLDebugMessage::GroupPushType:
+        return QStringLiteral("GroupPushType");
+    case QOpenGLDebugMessage::GroupPopType:
+        return QStringLiteral("GroupPopType");
+    case QOpenGLDebugMessage::AnyType:
+        return QStringLiteral("AnyType");
+    }
+
+    Q_ASSERT_X(false, Q_FUNC_INFO, "Unknown message type");
+    return QString();
+}
+
+/*!
+    \internal
+*/
+static QOpenGLDebugMessage::Severity qt_messageSeverityFromGL(GLenum severity)
+{
+    switch (severity) {
+    case GL_DEBUG_SEVERITY_HIGH:
+        return QOpenGLDebugMessage::HighSeverity;
+    case GL_DEBUG_SEVERITY_MEDIUM:
+        return QOpenGLDebugMessage::MediumSeverity;
+    case GL_DEBUG_SEVERITY_LOW:
+        return QOpenGLDebugMessage::LowSeverity;
+    case GL_DEBUG_SEVERITY_NOTIFICATION:
+        return QOpenGLDebugMessage::NotificationSeverity;
+    }
+
+    Q_ASSERT_X(false, Q_FUNC_INFO, "Unknown message severity from GL");
+    return QOpenGLDebugMessage::NotificationSeverity;
+}
+
+/*!
+    \internal
+*/
+static GLenum qt_messageSeverityToGL(QOpenGLDebugMessage::Severity severity)
+{
+    switch (severity) {
+    case QOpenGLDebugMessage::InvalidSeverity:
+        break;
+    case QOpenGLDebugMessage::HighSeverity:
+        return GL_DEBUG_SEVERITY_HIGH;
+    case QOpenGLDebugMessage::MediumSeverity:
+        return GL_DEBUG_SEVERITY_MEDIUM;
+    case QOpenGLDebugMessage::LowSeverity:
+        return GL_DEBUG_SEVERITY_LOW;
+    case QOpenGLDebugMessage::NotificationSeverity:
+        return GL_DEBUG_SEVERITY_NOTIFICATION;
+    case QOpenGLDebugMessage::AnySeverity:
+        break;
+    }
+
+    Q_ASSERT_X(false, Q_FUNC_INFO, "Invalid message severity");
+    return GL_DEBUG_SEVERITY_NOTIFICATION;
+}
+
+/*!
+    \internal
+*/
+static QString qt_messageSeverityToString(QOpenGLDebugMessage::Severity severity)
+{
+    switch (severity) {
+    case QOpenGLDebugMessage::InvalidSeverity:
+        return QStringLiteral("InvalidSeverity");
+    case QOpenGLDebugMessage::HighSeverity:
+        return QStringLiteral("HighSeverity");
+    case QOpenGLDebugMessage::MediumSeverity:
+        return QStringLiteral("MediumSeverity");
+    case QOpenGLDebugMessage::LowSeverity:
+        return QStringLiteral("LowSeverity");
+    case QOpenGLDebugMessage::NotificationSeverity:
+        return QStringLiteral("NotificationSeverity");
+    case QOpenGLDebugMessage::AnySeverity:
+        return QStringLiteral("AnySeverity");
+    }
+
+    Q_ASSERT_X(false, Q_FUNC_INFO, "Unknown message severity");
+    return QString();
+}
+
+class QOpenGLDebugMessagePrivate : public QSharedData
+{
+public:
+    QOpenGLDebugMessagePrivate();
+
+    QString message;
+    GLuint id;
+    QOpenGLDebugMessage::Source source;
+    QOpenGLDebugMessage::Type type;
+    QOpenGLDebugMessage::Severity severity;
+};
+
+/*!
+    \internal
+*/
+QOpenGLDebugMessagePrivate::QOpenGLDebugMessagePrivate()
+    : message(),
+      id(0),
+      source(QOpenGLDebugMessage::InvalidSource),
+      type(QOpenGLDebugMessage::InvalidType),
+      severity(QOpenGLDebugMessage::InvalidSeverity)
+{
+}
+
+
+/*!
+    Constructs a debug message with an empty message string, id set to 0,
+    source set to InvalidSource, type set to InvalidType, and severity set to
+    InvalidSeverity.
+
+    \note This constructor should not be used to create a debug message;
+    instead, use the createApplicationMessage() or the createThirdPartyMessage()
+    static functions.
+
+    \sa createApplicationMessage(), createThirdPartyMessage()
+*/
+QOpenGLDebugMessage::QOpenGLDebugMessage()
+    : d(new QOpenGLDebugMessagePrivate)
+{
+}
+
+/*!
+    Constructs a debug message as a copy of \a debugMessage.
+
+    \sa operator=()
+*/
+QOpenGLDebugMessage::QOpenGLDebugMessage(const QOpenGLDebugMessage &debugMessage)
+    : d(debugMessage.d)
+{
+}
+
+/*!
+    Destroys this debug message.
+*/
+QOpenGLDebugMessage::~QOpenGLDebugMessage()
+{
+}
+
+/*!
+    Assigns the message \a debugMessage to this object, and returns a reference
+    to the copy.
+*/
+QOpenGLDebugMessage &QOpenGLDebugMessage::operator=(const QOpenGLDebugMessage &debugMessage)
+{
+    d = debugMessage.d;
+    return *this;
+}
+
+/*!
+   \fn QOpenGLDebugMessage &QOpenGLDebugMessage::operator=(QOpenGLDebugMessage &&debugMessage)
+
+   Move-assigns \a debugMessage to this object.
+*/
+
+/*!
+    \fn void QOpenGLDebugMessage::swap(QOpenGLDebugMessage &debugMessage)
+
+    Swaps the message \a debugMessage with this message. This operation is very
+    fast and never fails.
+*/
+
+/*!
+    Returns the source of the debug message.
+*/
+QOpenGLDebugMessage::Source QOpenGLDebugMessage::source() const
+{
+    return d->source;
+}
+
+/*!
+    Returns the type of the debug message.
+*/
+QOpenGLDebugMessage::Type QOpenGLDebugMessage::type() const
+{
+    return d->type;
+}
+
+/*!
+    Returns the severity of the debug message.
+*/
+QOpenGLDebugMessage::Severity QOpenGLDebugMessage::severity() const
+{
+    return d->severity;
+}
+
+/*!
+    Returns the id of the debug message. Ids are generally vendor-specific.
+*/
+GLuint QOpenGLDebugMessage::id() const
+{
+    return d->id;
+}
+
+/*!
+    Returns the textual message contained by this debug message.
+*/
+QString QOpenGLDebugMessage::message() const
+{
+    return d->message;
+}
+
+/*!
+    Constructs and returns a debug message with \a text as its text, \a id
+    as id, \a severity as severity, and \a type as type. The message source
+    will be set to ApplicationSource.
+
+    \sa QOpenGLDebugLogger::logMessage(), createThirdPartyMessage()
+*/
+QOpenGLDebugMessage QOpenGLDebugMessage::createApplicationMessage(const QString &text,
+                                                                  GLuint id,
+                                                                  QOpenGLDebugMessage::Severity severity,
+                                                                  QOpenGLDebugMessage::Type type)
+{
+    QOpenGLDebugMessage m;
+    m.d->message = text;
+    m.d->id = id;
+    m.d->severity = severity;
+    m.d->type = type;
+    m.d->source = ApplicationSource;
+    return m;
+}
+
+/*!
+    Constructs and returns a debug message with \a text as its text, \a id
+    as id, \a severity as severity, and \a type as type. The message source
+    will be set to ThirdPartySource.
+
+    \sa QOpenGLDebugLogger::logMessage(), createApplicationMessage()
+*/
+QOpenGLDebugMessage QOpenGLDebugMessage::createThirdPartyMessage(const QString &text,
+                                                                 GLuint id,
+                                                                 QOpenGLDebugMessage::Severity severity,
+                                                                 QOpenGLDebugMessage::Type type)
+{
+    QOpenGLDebugMessage m;
+    m.d->message = text;
+    m.d->id = id;
+    m.d->severity = severity;
+    m.d->type = type;
+    m.d->source = ThirdPartySource;
+    return m;
+}
+
+/*!
+    Returns \c true if this debug message is equal to \a debugMessage, or false
+    otherwise. Two debugging messages are equal if they have the same textual
+    message, the same id, the same source, the same type and the same severity.
+
+    \sa operator!=()
+*/
+bool QOpenGLDebugMessage::operator==(const QOpenGLDebugMessage &debugMessage) const
+{
+    return (d == debugMessage.d)
+            || (d->id == debugMessage.d->id
+                && d->source == debugMessage.d->source
+                && d->type == debugMessage.d->type
+                && d->severity == debugMessage.d->severity
+                && d->message == debugMessage.d->message);
+}
+
+/*!
+    \fn bool QOpenGLDebugMessage::operator!=(const QOpenGLDebugMessage &debugMessage) const
+
+    Returns \c true if this message is different from \a debugMessage, or false
+    otherwise.
+
+    \sa operator==()
+*/
+
+#ifndef QT_NO_DEBUG_STREAM
+/*!
+    \relates QOpenGLDebugMessage
+
+    Writes the source \a source into the debug object \a debug for debugging
+    purposes.
+*/
+QDebug operator<<(QDebug debug, QOpenGLDebugMessage::Source source)
+{
+    QDebugStateSaver saver(debug);
+    debug.nospace() << "QOpenGLDebugMessage::Source("
+                    << qt_messageSourceToString(source)
+                    << ')';
+    return debug;
+}
+
+/*!
+    \relates QOpenGLDebugMessage
+
+    Writes the type \a type into the debug object \a debug for debugging
+    purposes.
+*/
+QDebug operator<<(QDebug debug, QOpenGLDebugMessage::Type type)
+{
+    QDebugStateSaver saver(debug);
+    debug.nospace() << "QOpenGLDebugMessage::Type("
+                    << qt_messageTypeToString(type)
+                    << ')';
+    return debug;
+}
+
+/*!
+    \relates QOpenGLDebugMessage
+
+    Writes the severity \a severity into the debug object \a debug for debugging
+    purposes.
+*/
+QDebug operator<<(QDebug debug, QOpenGLDebugMessage::Severity severity)
+{
+    QDebugStateSaver saver(debug);
+    debug.nospace() << "QOpenGLDebugMessage::Severity("
+                    << qt_messageSeverityToString(severity)
+                    << ')';
+    return debug;
+}
+
+/*!
+    \relates QOpenGLDebugMessage
+
+    Writes the message \a message into the debug object \a debug for debugging
+    purposes.
+*/
+QDebug operator<<(QDebug debug, const QOpenGLDebugMessage &message)
+{
+    QDebugStateSaver saver(debug);
+    debug.nospace() << "QOpenGLDebugMessage("
+                    << qt_messageSourceToString(message.source()) << ", "
+                    << message.id() << ", "
+                    << message.message() << ", "
+                    << qt_messageSeverityToString(message.severity()) << ", "
+                    << qt_messageTypeToString(message.type()) << ')';
+    return debug;
+
+}
+#endif // QT_NO_DEBUG_STREAM
+
+typedef void (QOPENGLF_APIENTRYP qt_glDebugMessageControl_t)(GLenum source, GLenum type, GLenum severity, GLsizei count, const GLuint *ids, GLboolean enabled);
+typedef void (QOPENGLF_APIENTRYP qt_glDebugMessageInsert_t)(GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar *buf);
+typedef void (QOPENGLF_APIENTRYP qt_glDebugMessageCallback_t)(GLDEBUGPROC callback, const void *userParam);
+typedef GLuint (QOPENGLF_APIENTRYP qt_glGetDebugMessageLog_t)(GLuint count, GLsizei bufsize, GLenum *sources, GLenum *types, GLuint *ids, GLenum *severities, GLsizei *lengths, GLchar *messageLog);
+typedef void (QOPENGLF_APIENTRYP qt_glPushDebugGroup_t)(GLenum source, GLuint id, GLsizei length, const GLchar *message);
+typedef void (QOPENGLF_APIENTRYP qt_glPopDebugGroup_t)();
+typedef void (QOPENGLF_APIENTRYP qt_glGetPointerv_t)(GLenum pname, GLvoid **params);
+
+class QOpenGLDebugLoggerPrivate : public QObjectPrivate
+{
+    Q_DECLARE_PUBLIC(QOpenGLDebugLogger)
+public:
+    QOpenGLDebugLoggerPrivate();
+
+    void handleMessage(GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar *rawMessage);
+    void controlDebugMessages(QOpenGLDebugMessage::Sources sources,
+                              QOpenGLDebugMessage::Types types,
+                              QOpenGLDebugMessage::Severities severities,
+                              const QVector<GLuint> &ids,
+                              const QByteArray &callerName,
+                              bool enable);
+    void _q_contextAboutToBeDestroyed();
+
+    qt_glDebugMessageControl_t glDebugMessageControl;
+    qt_glDebugMessageInsert_t glDebugMessageInsert;
+    qt_glDebugMessageCallback_t glDebugMessageCallback;
+    qt_glGetDebugMessageLog_t glGetDebugMessageLog;
+    qt_glPushDebugGroup_t glPushDebugGroup;
+    qt_glPopDebugGroup_t glPopDebugGroup;
+    qt_glGetPointerv_t glGetPointerv;
+
+    GLDEBUGPROC oldDebugCallbackFunction;
+    void *oldDebugCallbackParameter;
+    QOpenGLContext *context;
+    GLint maxMessageLength;
+    QOpenGLDebugLogger::LoggingMode loggingMode;
+    bool initialized : 1;
+    bool isLogging : 1;
+    bool debugWasEnabled : 1;
+    bool syncDebugWasEnabled : 1;
+};
+
+/*!
+    \internal
+*/
+QOpenGLDebugLoggerPrivate::QOpenGLDebugLoggerPrivate()
+    : glDebugMessageControl(nullptr),
+      glDebugMessageInsert(nullptr),
+      glDebugMessageCallback(nullptr),
+      glGetDebugMessageLog(nullptr),
+      glPushDebugGroup(nullptr),
+      glPopDebugGroup(nullptr),
+      oldDebugCallbackFunction(nullptr),
+      context(nullptr),
+      maxMessageLength(0),
+      loggingMode(QOpenGLDebugLogger::AsynchronousLogging),
+      initialized(false),
+      isLogging(false),
+      debugWasEnabled(false),
+      syncDebugWasEnabled(false)
+{
+}
+
+/*!
+    \internal
+*/
+void QOpenGLDebugLoggerPrivate::handleMessage(GLenum source,
+                                              GLenum type,
+                                              GLuint id,
+                                              GLenum severity,
+                                              GLsizei length,
+                                              const GLchar *rawMessage)
+{
+    if (oldDebugCallbackFunction)
+        oldDebugCallbackFunction(source, type, id, severity, length, rawMessage, oldDebugCallbackParameter);
+
+    QOpenGLDebugMessage message;
+
+    QOpenGLDebugMessagePrivate *messagePrivate = message.d.data();
+    messagePrivate->source = qt_messageSourceFromGL(source);
+    messagePrivate->type = qt_messageTypeFromGL(type);
+    messagePrivate->id = id;
+    messagePrivate->severity = qt_messageSeverityFromGL(severity);
+    // not passing the length to fromUtf8, as some bugged OpenGL drivers
+    // do not handle the length correctly. Just rely on the message to be NUL terminated.
+    messagePrivate->message = QString::fromUtf8(rawMessage);
+
+    Q_Q(QOpenGLDebugLogger);
+    emit q->messageLogged(message);
+}
+
+/*!
+    \internal
+*/
+void QOpenGLDebugLoggerPrivate::controlDebugMessages(QOpenGLDebugMessage::Sources sources,
+                                                     QOpenGLDebugMessage::Types types,
+                                                     QOpenGLDebugMessage::Severities severities,
+                                                     const QVector<GLuint> &ids,
+                                                     const QByteArray &callerName,
+                                                     bool enable)
+{
+    if (!initialized) {
+        qWarning("QOpenGLDebugLogger::%s(): object must be initialized before enabling/disabling messages", callerName.constData());
+        return;
+    }
+    if (sources == QOpenGLDebugMessage::InvalidSource) {
+        qWarning("QOpenGLDebugLogger::%s(): invalid source specified", callerName.constData());
+        return;
+    }
+    if (types == QOpenGLDebugMessage::InvalidType) {
+        qWarning("QOpenGLDebugLogger::%s(): invalid type specified", callerName.constData());
+        return;
+    }
+    if (severities == QOpenGLDebugMessage::InvalidSeverity) {
+        qWarning("QOpenGLDebugLogger::%s(): invalid severity specified", callerName.constData());
+        return;
+    }
+
+    QVarLengthArray<GLenum, 8> glSources;
+    QVarLengthArray<GLenum, 8> glTypes;
+    QVarLengthArray<GLenum, 8> glSeverities;
+
+    if (ids.count() > 0) {
+        Q_ASSERT(severities == QOpenGLDebugMessage::AnySeverity);
+
+        // The GL_KHR_debug extension says:
+        //
+        //        - If <count> is greater than zero, then <ids> is an array of <count>
+        //          message IDs for the specified combination of <source> and <type>. In
+        //          this case, if <source> or <type> is DONT_CARE, or <severity> is not
+        //          DONT_CARE, the error INVALID_OPERATION is generated. If <count> is
+        //          zero, the value if <ids> is ignored.
+        //
+        // This means we can't convert AnySource or AnyType into DONT_CARE, but we have to roll
+        // them into individual sources/types.
+
+        if (sources == QOpenGLDebugMessage::AnySource) {
+            sources = QOpenGLDebugMessage::InvalidSource;
+            for (uint i = 1; i <= QOpenGLDebugMessage::LastSource; i = i << 1)
+                sources |= QOpenGLDebugMessage::Source(i);
+        }
+
+        if (types == QOpenGLDebugMessage::AnyType) {
+            types = QOpenGLDebugMessage::InvalidType;
+            for (uint i = 1; i <= QOpenGLDebugMessage::LastType; i = i << 1)
+                types |= QOpenGLDebugMessage::Type(i);
+        }
+    }
+
+#define CONVERT_TO_GL_DEBUG_MESSAGE_CONTROL_PARAMETERS(type, source, target) \
+    if (source == QOpenGLDebugMessage::Any ## type) { \
+        target << GL_DONT_CARE; \
+    } else { \
+        for (uint i = 1; i <= QOpenGLDebugMessage::Last ## type; i = i << 1) \
+            if (source.testFlag(QOpenGLDebugMessage:: type (i))) \
+                target << qt_message ## type ## ToGL (QOpenGLDebugMessage:: type (i)); \
+    }
+
+    CONVERT_TO_GL_DEBUG_MESSAGE_CONTROL_PARAMETERS(Source, sources, glSources)
+    CONVERT_TO_GL_DEBUG_MESSAGE_CONTROL_PARAMETERS(Type, types, glTypes)
+    CONVERT_TO_GL_DEBUG_MESSAGE_CONTROL_PARAMETERS(Severity, severities, glSeverities)
+#undef CONVERT_TO_GL_DEBUG_MESSAGE_CONTROL_PARAMETERS
+
+    const GLsizei idCount = ids.count();
+    // The GL_KHR_debug extension says that if idCount is 0, idPtr must be ignored.
+    // Unfortunately, some bugged drivers do NOT ignore it, so pass NULL in case.
+    const GLuint * const idPtr = idCount ? ids.constData() : nullptr;
+
+    for (GLenum source : glSources)
+        for (GLenum type : glTypes)
+            for (GLenum severity : glSeverities)
+                glDebugMessageControl(source, type, severity, idCount, idPtr, GLboolean(enable));
+}
+
+/*!
+    \internal
+*/
+void QOpenGLDebugLoggerPrivate::_q_contextAboutToBeDestroyed()
+{
+    Q_ASSERT(context);
+
+    // Re-make our context current somehow, otherwise stopLogging will fail.
+
+    // Save the current context and its surface in case we need to set them back
+    QOpenGLContext *currentContext = QOpenGLContext::currentContext();
+    QSurface *currentSurface = nullptr;
+
+    QScopedPointer<QOffscreenSurface> offscreenSurface;
+
+    if (context != currentContext) {
+        // Make our old context current on a temporary surface
+        if (currentContext)
+            currentSurface = currentContext->surface();
+
+        offscreenSurface.reset(new QOffscreenSurface);
+        offscreenSurface->setFormat(context->format());
+        offscreenSurface->create();
+        if (!context->makeCurrent(offscreenSurface.data()))
+            qWarning("QOpenGLDebugLoggerPrivate::_q_contextAboutToBeDestroyed(): could not make the owning GL context current for cleanup");
+    }
+
+    Q_Q(QOpenGLDebugLogger);
+    q->stopLogging();
+
+    if (offscreenSurface) {
+        // We did change the current context: set it back
+        if (currentContext)
+            currentContext->makeCurrent(currentSurface);
+        else
+            context->doneCurrent();
+    }
+
+    QObject::disconnect(context, SIGNAL(aboutToBeDestroyed()), q, SLOT(_q_contextAboutToBeDestroyed()));
+    context = nullptr;
+    initialized = false;
+}
+
+extern "C" {
+static void QOPENGLF_APIENTRY qt_opengl_debug_callback(GLenum source,
+                                                       GLenum type,
+                                                       GLuint id,
+                                                       GLenum severity,
+                                                       GLsizei length,
+                                                       const GLchar *rawMessage,
+                                                       const GLvoid *userParam)
+{
+    QOpenGLDebugLoggerPrivate *loggerPrivate = static_cast<QOpenGLDebugLoggerPrivate *>(const_cast<GLvoid *>(userParam));
+    loggerPrivate->handleMessage(source, type, id, severity, length, rawMessage);
+}
+}
+
+/*!
+    Constructs a new logger object with the given \a parent.
+
+    \note The object must be initialized before logging can happen.
+
+    \sa initialize()
+*/
+QOpenGLDebugLogger::QOpenGLDebugLogger(QObject *parent)
+    : QObject(*new QOpenGLDebugLoggerPrivate, parent)
+{
+    // QOpenGLDebugMessage is going to be mostly used as an argument
+    // of a cross thread connection, therefore let's ease the life for the users
+    // and register the type for them.
+    qRegisterMetaType<QOpenGLDebugMessage>();
+}
+
+/*!
+    Destroys the logger object.
+*/
+QOpenGLDebugLogger::~QOpenGLDebugLogger()
+{
+    stopLogging();
+}
+
+/*!
+    Initializes the object in the current OpenGL context. The context must
+    support the \c{GL_KHR_debug} extension for the initialization to succeed.
+    The object must be initialized before any logging can happen.
+
+    It is safe to call this function multiple times from the same context.
+
+    This function can also be used to change the context of a previously
+    initialized object; note that in this case the object must not be logging
+    when you call this function.
+
+    Returns \c true if the logger is successfully initialized; false otherwise.
+
+    \sa QOpenGLContext
+*/
+bool QOpenGLDebugLogger::initialize()
+{
+    QOpenGLContext *context = QOpenGLContext::currentContext();
+    if (!context) {
+        qWarning("QOpenGLDebugLogger::initialize(): no current OpenGL context found.");
+        return false;
+    }
+
+    Q_D(QOpenGLDebugLogger);
+    if (d->context == context) {
+        // context is non-NULL, d->context is non NULL only on successful initialization.
+        Q_ASSERT(d->initialized);
+        return true;
+    }
+
+    if (d->isLogging) {
+        qWarning("QOpenGLDebugLogger::initialize(): cannot initialize the object while logging. Please stop the logging first.");
+        return false;
+    }
+
+    if (d->context)
+        disconnect(d->context, SIGNAL(aboutToBeDestroyed()), this, SLOT(_q_contextAboutToBeDestroyed()));
+
+    d->initialized = false;
+    d->context = nullptr;
+
+    if (!context->hasExtension(QByteArrayLiteral("GL_KHR_debug")))
+        return false;
+
+    d->context = context;
+    connect(d->context, SIGNAL(aboutToBeDestroyed()), this, SLOT(_q_contextAboutToBeDestroyed()));
+
+#define GET_DEBUG_PROC_ADDRESS(procName) \
+    d->procName = reinterpret_cast< qt_ ## procName ## _t >( \
+        d->context->getProcAddress(d->context->isOpenGLES() ? (#procName "KHR") : (#procName)) \
+    );
+
+    GET_DEBUG_PROC_ADDRESS(glDebugMessageControl);
+    GET_DEBUG_PROC_ADDRESS(glDebugMessageInsert);
+    GET_DEBUG_PROC_ADDRESS(glDebugMessageCallback);
+    GET_DEBUG_PROC_ADDRESS(glGetDebugMessageLog);
+    GET_DEBUG_PROC_ADDRESS(glPushDebugGroup);
+    GET_DEBUG_PROC_ADDRESS(glPopDebugGroup);
+    GET_DEBUG_PROC_ADDRESS(glGetPointerv)
+
+#undef GET_DEBUG_PROC_ADDRESS
+
+    QOpenGLContext::currentContext()->functions()->glGetIntegerv(GL_MAX_DEBUG_MESSAGE_LENGTH, &d->maxMessageLength);
+
+#ifndef QT_NO_DEBUG
+    if (!d->context->format().testOption(QSurfaceFormat::DebugContext)) {
+        qWarning("QOpenGLDebugLogger::initialize(): the current context is not a debug context:\n"
+                 "    this means that the GL may not generate any debug output at all.\n"
+                 "    To avoid this warning, try creating the context with the\n"
+                 "    QSurfaceFormat::DebugContext surface format option.");
+    }
+#endif // QT_NO_DEBUG
+
+    d->initialized = true;
+    return true;
+}
+
+/*!
+    Returns \c true if this object is currently logging, false otherwise.
+
+    \sa startLogging()
+*/
+bool QOpenGLDebugLogger::isLogging() const
+{
+    Q_D(const QOpenGLDebugLogger);
+    return d->isLogging;
+}
+
+/*!
+    Starts logging messages coming from the OpenGL server. When a new message
+    is received, the signal messageLogged() is emitted, carrying the logged
+    message as argument.
+
+    \a loggingMode specifies whether the logging must be asynchronous (the default)
+    or synchronous.
+
+    QOpenGLDebugLogger will record the values of \c{GL_DEBUG_OUTPUT} and
+    \c{GL_DEBUG_OUTPUT_SYNCHRONOUS} when logging is started, and set them back
+    when logging is stopped. Moreover, any user-defined OpenGL debug callback
+    installed when this function is invoked will be restored when logging is
+    stopped; QOpenGLDebugLogger will ensure that the pre-existing callback will
+    still be invoked when logging.
+
+    \note It's not possible to change the logging mode without stopping and
+    starting logging again. This might change in a future version of Qt.
+
+    \note The object must be initialized before logging can happen.
+
+    \sa stopLogging(), initialize()
+*/
+void QOpenGLDebugLogger::startLogging(QOpenGLDebugLogger::LoggingMode loggingMode)
+{
+    Q_D(QOpenGLDebugLogger);
+    if (!d->initialized) {
+        qWarning("QOpenGLDebugLogger::startLogging(): object must be initialized before logging can start");
+        return;
+    }
+    if (d->isLogging) {
+        qWarning("QOpenGLDebugLogger::startLogging(): this object is already logging");
+        return;
+    }
+
+    d->isLogging = true;
+    d->loggingMode = loggingMode;
+
+    d->glGetPointerv(GL_DEBUG_CALLBACK_FUNCTION, reinterpret_cast<void **>(&d->oldDebugCallbackFunction));
+    d->glGetPointerv(GL_DEBUG_CALLBACK_USER_PARAM, &d->oldDebugCallbackParameter);
+
+    d->glDebugMessageCallback(&qt_opengl_debug_callback, d);
+
+    QOpenGLFunctions *funcs = QOpenGLContext::currentContext()->functions();
+    d->debugWasEnabled = funcs->glIsEnabled(GL_DEBUG_OUTPUT);
+    d->syncDebugWasEnabled = funcs->glIsEnabled(GL_DEBUG_OUTPUT_SYNCHRONOUS);
+
+    if (d->loggingMode == SynchronousLogging)
+        funcs->glEnable(GL_DEBUG_OUTPUT_SYNCHRONOUS);
+    else
+        funcs->glDisable(GL_DEBUG_OUTPUT_SYNCHRONOUS);
+
+    funcs->glEnable(GL_DEBUG_OUTPUT);
+}
+
+/*!
+    Returns the logging mode of the object.
+
+    \sa startLogging()
+*/
+QOpenGLDebugLogger::LoggingMode QOpenGLDebugLogger::loggingMode() const
+{
+    Q_D(const QOpenGLDebugLogger);
+    return d->loggingMode;
+}
+
+/*!
+    Stops logging messages from the OpenGL server.
+
+    \sa startLogging()
+*/
+void QOpenGLDebugLogger::stopLogging()
+{
+    Q_D(QOpenGLDebugLogger);
+    if (!d->isLogging)
+        return;
+
+    QOpenGLContext *currentContext = QOpenGLContext::currentContext();
+    if (!currentContext || currentContext != d->context) {
+        qWarning("QOpenGLDebugLogger::stopLogging(): attempting to stop logging with the wrong OpenGL context current");
+        return;
+    }
+
+    d->isLogging = false;
+
+    d->glDebugMessageCallback(d->oldDebugCallbackFunction, d->oldDebugCallbackParameter);
+
+    QOpenGLFunctions *funcs = QOpenGLContext::currentContext()->functions();
+    if (!d->debugWasEnabled)
+        funcs->glDisable(GL_DEBUG_OUTPUT);
+
+    if (d->syncDebugWasEnabled)
+        funcs->glEnable(GL_DEBUG_OUTPUT_SYNCHRONOUS);
+    else
+        funcs->glDisable(GL_DEBUG_OUTPUT_SYNCHRONOUS);
+}
+
+/*!
+    Inserts the message \a debugMessage into the OpenGL debug log. This provides
+    a way for applications or libraries to insert custom messages that can
+    ease the debugging of OpenGL applications.
+
+    \note \a debugMessage must have QOpenGLDebugMessage::ApplicationSource or
+    QOpenGLDebugMessage::ThirdPartySource as its source, and a valid
+    type and severity, otherwise it will not be inserted into the log.
+
+    \note The object must be initialized before logging can happen.
+
+    \sa initialize()
+*/
+void QOpenGLDebugLogger::logMessage(const QOpenGLDebugMessage &debugMessage)
+{
+    Q_D(QOpenGLDebugLogger);
+    if (!d->initialized) {
+        qWarning("QOpenGLDebugLogger::logMessage(): object must be initialized before logging messages");
+        return;
+    }
+    if (debugMessage.source() != QOpenGLDebugMessage::ApplicationSource
+            && debugMessage.source() != QOpenGLDebugMessage::ThirdPartySource) {
+        qWarning("QOpenGLDebugLogger::logMessage(): using a message source different from ApplicationSource\n"
+                 "    or ThirdPartySource is not supported by GL_KHR_debug. The message will not be logged.");
+        return;
+    }
+    if (debugMessage.type() == QOpenGLDebugMessage::InvalidType
+            || debugMessage.type() == QOpenGLDebugMessage::AnyType
+            || debugMessage.severity() == QOpenGLDebugMessage::InvalidSeverity
+            || debugMessage.severity() == QOpenGLDebugMessage::AnySeverity) {
+        qWarning("QOpenGLDebugLogger::logMessage(): the message has a non-valid type and/or severity. The message will not be logged.");
+        return;
+    }
+
+    const GLenum source = qt_messageSourceToGL(debugMessage.source());
+    const GLenum type = qt_messageTypeToGL(debugMessage.type());
+    const GLenum severity = qt_messageSeverityToGL(debugMessage.severity());
+    QByteArray rawMessage = debugMessage.message().toUtf8();
+    rawMessage.append('\0');
+
+    if (rawMessage.length() > d->maxMessageLength) {
+        qWarning("QOpenGLDebugLogger::logMessage(): message too long, truncating it\n"
+                 "    (%d bytes long, but the GL accepts up to %d bytes)", rawMessage.length(), d->maxMessageLength);
+        rawMessage.resize(d->maxMessageLength - 1);
+        rawMessage.append('\0');
+    }
+
+    // Don't pass rawMessage.length(), as unfortunately bugged
+    // OpenGL drivers will eat the trailing NUL in the message. Just rely
+    // on the message being NUL terminated.
+    d->glDebugMessageInsert(source,
+                            type,
+                            debugMessage.id(),
+                            severity,
+                            -1,
+                            rawMessage.constData());
+}
+
+/*!
+    Pushes a debug group with name \a name, id \a id, and source \a source onto
+    the debug groups stack. If the group is successfully pushed, OpenGL will
+    automatically log a message with message \a name, id \a id, source \a
+    source, type QOpenGLDebugMessage::GroupPushType and severity
+    QOpenGLDebugMessage::NotificationSeverity.
+
+    The newly pushed group will inherit the same filtering settings of the
+    group that was on the top of the stack; that is, the filtering will not be
+    changed by pushing a new group.
+
+    \note The \a source must either be QOpenGLDebugMessage::ApplicationSource or
+    QOpenGLDebugMessage::ThirdPartySource, otherwise the group will not be pushed.
+
+    \note The object must be initialized before managing debug groups.
+
+    \sa popGroup(), enableMessages(), disableMessages()
+*/
+void QOpenGLDebugLogger::pushGroup(const QString &name, GLuint id, QOpenGLDebugMessage::Source source)
+{
+    Q_D(QOpenGLDebugLogger);
+    if (!d->initialized) {
+        qWarning("QOpenGLDebugLogger::pushGroup(): object must be initialized before pushing a debug group");
+        return;
+    }
+    if (source != QOpenGLDebugMessage::ApplicationSource
+            && source != QOpenGLDebugMessage::ThirdPartySource) {
+        qWarning("QOpenGLDebugLogger::pushGroup(): using a source different from ApplicationSource\n"
+                 "    or ThirdPartySource is not supported by GL_KHR_debug. The group will not be pushed.");
+        return;
+    }
+
+    QByteArray rawName = name.toUtf8();
+    rawName.append('\0');
+    if (rawName.length() > d->maxMessageLength) {
+        qWarning("QOpenGLDebugLogger::pushGroup(): group name too long, truncating it\n"
+                 "    (%d bytes long, but the GL accepts up to %d bytes)", rawName.length(), d->maxMessageLength);
+        rawName.resize(d->maxMessageLength - 1);
+        rawName.append('\0');
+    }
+
+    // Don't pass rawMessage.length(), as unfortunately bugged
+    // OpenGL drivers will eat the trailing NUL in the name. Just rely
+    // on the name being NUL terminated.
+    d->glPushDebugGroup(qt_messageSourceToGL(source), id, -1, rawName.constData());
+}
+
+/*!
+    Pops the topmost debug group from the debug groups stack. If the group is
+    successfully popped, OpenGL will automatically log a message with message,
+    id and source matching those of the popped group, type
+    QOpenGLDebugMessage::GroupPopType and severity
+    QOpenGLDebugMessage::NotificationSeverity.
+
+    Popping a debug group will restore the message filtering settings of the
+    group that becomes the top of the debug groups stack.
+
+    \note The object must be initialized before managing debug groups.
+
+    \sa pushGroup()
+*/
+void QOpenGLDebugLogger::popGroup()
+{
+    Q_D(QOpenGLDebugLogger);
+    if (!d->initialized) {
+        qWarning("QOpenGLDebugLogger::pushGroup(): object must be initialized before popping a debug group");
+        return;
+    }
+
+    d->glPopDebugGroup();
+}
+
+/*!
+    Enables the logging of messages from the given \a sources, of the given \a
+    types and with the given \a severities and any message id.
+
+    The logging will be enabled in the current control group.
+
+    \sa disableMessages(), pushGroup(), popGroup()
+*/
+void QOpenGLDebugLogger::enableMessages(QOpenGLDebugMessage::Sources sources,
+                                        QOpenGLDebugMessage::Types types,
+                                        QOpenGLDebugMessage::Severities severities)
+{
+    Q_D(QOpenGLDebugLogger);
+    d->controlDebugMessages(sources,
+                            types,
+                            severities,
+                            QVector<GLuint>(),
+                            QByteArrayLiteral("enableMessages"),
+                            true);
+}
+
+/*!
+    Enables the logging of messages with the given \a ids, from the given \a
+    sources and of the given \a types and any severity.
+
+    The logging will be enabled in the current control group.
+
+    \sa disableMessages(), pushGroup(), popGroup()
+*/
+void QOpenGLDebugLogger::enableMessages(const QVector<GLuint> &ids,
+                                        QOpenGLDebugMessage::Sources sources,
+                                        QOpenGLDebugMessage::Types types)
+{
+    Q_D(QOpenGLDebugLogger);
+    d->controlDebugMessages(sources,
+                            types,
+                            QOpenGLDebugMessage::AnySeverity,
+                            ids,
+                            QByteArrayLiteral("enableMessages"),
+                            true);
+}
+
+/*!
+    Disables the logging of messages with the given \a sources, of the given \a
+    types and with the given \a severities and any message id.
+
+    The logging will be disabled in the current control group.
+
+    \sa enableMessages(), pushGroup(), popGroup()
+*/
+void QOpenGLDebugLogger::disableMessages(QOpenGLDebugMessage::Sources sources,
+                                         QOpenGLDebugMessage::Types types,
+                                         QOpenGLDebugMessage::Severities severities)
+{
+    Q_D(QOpenGLDebugLogger);
+    d->controlDebugMessages(sources,
+                            types,
+                            severities,
+                            QVector<GLuint>(),
+                            QByteArrayLiteral("disableMessages"),
+                            false);
+}
+
+/*!
+    Disables the logging of messages with the given \a ids, from the given \a
+    sources and of the given \a types and any severity.
+
+    The logging will be disabled in the current control group.
+
+    \sa enableMessages(), pushGroup(), popGroup()
+*/
+void QOpenGLDebugLogger::disableMessages(const QVector<GLuint> &ids,
+                                         QOpenGLDebugMessage::Sources sources,
+                                         QOpenGLDebugMessage::Types types)
+{
+    Q_D(QOpenGLDebugLogger);
+    d->controlDebugMessages(sources,
+                            types,
+                            QOpenGLDebugMessage::AnySeverity,
+                            ids,
+                            QByteArrayLiteral("disableMessages"),
+                            false);
+}
+
+/*!
+    Reads all the available messages in the OpenGL internal debug log and
+    returns them. Moreover, this function will clear the internal debug log,
+    so that subsequent invocations will not return messages that were
+    already returned.
+
+    \sa startLogging()
+*/
+QList<QOpenGLDebugMessage> QOpenGLDebugLogger::loggedMessages() const
+{
+    Q_D(const QOpenGLDebugLogger);
+    if (!d->initialized) {
+        qWarning("QOpenGLDebugLogger::loggedMessages(): object must be initialized before reading logged messages");
+        return QList<QOpenGLDebugMessage>();
+    }
+
+    static const GLuint maxMessageCount = 128;
+    GLuint messagesRead;
+    GLenum messageSources[maxMessageCount];
+    GLenum messageTypes[maxMessageCount];
+    GLuint messageIds[maxMessageCount];
+    GLenum messageSeverities[maxMessageCount];
+    GLsizei messageLengths[maxMessageCount];
+
+    QByteArray messagesBuffer;
+    messagesBuffer.resize(maxMessageCount * d->maxMessageLength);
+
+    QList<QOpenGLDebugMessage> messages;
+    do {
+        messagesRead = d->glGetDebugMessageLog(maxMessageCount,
+                                               GLsizei(messagesBuffer.size()),
+                                               messageSources,
+                                               messageTypes,
+                                               messageIds,
+                                               messageSeverities,
+                                               messageLengths,
+                                               messagesBuffer.data());
+
+        const char *messagesBufferPtr = messagesBuffer.constData();
+        for (GLuint i = 0; i < messagesRead; ++i) {
+            QOpenGLDebugMessage message;
+
+            QOpenGLDebugMessagePrivate *messagePrivate = message.d.data();
+            messagePrivate->source = qt_messageSourceFromGL(messageSources[i]);
+            messagePrivate->type = qt_messageTypeFromGL(messageTypes[i]);
+            messagePrivate->id = messageIds[i];
+            messagePrivate->severity = qt_messageSeverityFromGL(messageSeverities[i]);
+            messagePrivate->message = QString::fromUtf8(messagesBufferPtr, messageLengths[i] - 1);
+
+            messagesBufferPtr += messageLengths[i];
+            messages << message;
+        }
+    } while (messagesRead == maxMessageCount);
+
+    return messages;
+}
+
+/*!
+    \fn void QOpenGLDebugLogger::messageLogged(const QOpenGLDebugMessage &debugMessage)
+
+    This signal is emitted when a debug message (wrapped by the \a debugMessage
+    argument) is logged from the OpenGL server.
+
+    Depending on the OpenGL implementation, this signal can be emitted
+    from other threads than the one(s) the receiver(s) lives in, and even
+    different from the thread the QOpenGLContext in which this object has
+    been initialized lives in. Moreover, the signal could be emitted from
+    multiple threads at the same time. This is normally not a problem,
+    as Qt will utilize a queued connection for cross-thread signal emissions,
+    but if you force the connection type to Direct then you must be aware of
+    the potential races in the slots connected to this signal.
+
+    If logging have been started in SynchronousLogging mode, OpenGL guarantees
+    that this signal will be emitted from the same thread the QOpenGLContext
+    has been bound to, and no concurrent invocations will ever happen.
+
+    \note Logging must have been started, or this signal will not be emitted.
+
+    \sa startLogging()
+*/
+
+/*!
+    Returns the maximum supported length, in bytes, for the text of the messages
+    passed to logMessage(). This is also the maximum length of a debug group
+    name, as pushing or popping groups will automatically log a message with
+    the debug group name as the message text.
+
+    If a message text is too long, it will be automatically truncated by
+    QOpenGLDebugLogger.
+
+    \note Message texts are encoded in UTF-8 when they get passed to OpenGL, so
+    their size in bytes does not usually match the amount of UTF-16 code units,
+    as returned, for instance, by QString::length(). (It does if the message contains
+    7-bit ASCII only data, which is typical for debug messages.)
+*/
+qint64 QOpenGLDebugLogger::maximumMessageLength() const
+{
+    Q_D(const QOpenGLDebugLogger);
+    if (!d->initialized) {
+        qWarning("QOpenGLDebugLogger::maximumMessageLength(): object must be initialized before reading the maximum message length");
+        return -1;
+    }
+    return d->maxMessageLength;
+}
+
+
+QT_END_NAMESPACE
+
+#include "moc_qopengldebug.cpp"
diff --git a/src/opengl/qopengldebug.h b/src/opengl/qopengldebug.h
new file mode 100644
index 0000000000..fef2782302
--- /dev/null
+++ b/src/opengl/qopengldebug.h
@@ -0,0 +1,221 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtOpenGL module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QOPENGLDEBUG_H
+#define QOPENGLDEBUG_H
+
+#include <QtOpenGL/qtopenglglobal.h>
+
+#ifndef QT_NO_OPENGL
+
+#include <QtCore/qshareddata.h>
+#include <QtCore/qflags.h>
+#include <QtCore/qlist.h>
+#include <QtCore/qvector.h>
+#include <QtCore/qmetatype.h>
+#include <QtCore/qdebug.h>
+#include <QtGui/qopenglcontext.h>
+
+#if defined(Q_CLANG_QDOC)
+#undef GLuint
+typedef unsigned int GLuint;
+#endif
+
+QT_BEGIN_NAMESPACE
+
+class QOpenGLDebugLogger;
+class QOpenGLDebugLoggerPrivate;
+class QOpenGLDebugMessagePrivate;
+
+class Q_OPENGL_EXPORT QOpenGLDebugMessage
+{
+public:
+    enum Source {
+        InvalidSource        = 0x00000000,
+        APISource            = 0x00000001,
+        WindowSystemSource   = 0x00000002,
+        ShaderCompilerSource = 0x00000004,
+        ThirdPartySource     = 0x00000008,
+        ApplicationSource    = 0x00000010,
+        OtherSource          = 0x00000020,
+        LastSource           = OtherSource, // private API
+        AnySource            = 0xffffffff
+    };
+    Q_DECLARE_FLAGS(Sources, Source)
+
+    enum Type {
+        InvalidType            = 0x00000000,
+        ErrorType              = 0x00000001,
+        DeprecatedBehaviorType = 0x00000002,
+        UndefinedBehaviorType  = 0x00000004,
+        PortabilityType        = 0x00000008,
+        PerformanceType        = 0x00000010,
+        OtherType              = 0x00000020,
+        MarkerType             = 0x00000040,
+        GroupPushType          = 0x00000080,
+        GroupPopType           = 0x00000100,
+        LastType               = GroupPopType, // private API
+        AnyType                = 0xffffffff
+    };
+    Q_DECLARE_FLAGS(Types, Type)
+
+    enum Severity {
+        InvalidSeverity      = 0x00000000,
+        HighSeverity         = 0x00000001,
+        MediumSeverity       = 0x00000002,
+        LowSeverity          = 0x00000004,
+        NotificationSeverity = 0x00000008,
+        LastSeverity         = NotificationSeverity, // private API
+        AnySeverity          = 0xffffffff
+    };
+    Q_DECLARE_FLAGS(Severities, Severity)
+
+    QOpenGLDebugMessage();
+    QOpenGLDebugMessage(const QOpenGLDebugMessage &debugMessage);
+
+    QOpenGLDebugMessage &operator=(const QOpenGLDebugMessage &debugMessage);
+    QOpenGLDebugMessage &operator=(QOpenGLDebugMessage &&other) noexcept { swap(other); return *this; }
+    ~QOpenGLDebugMessage();
+
+    void swap(QOpenGLDebugMessage &other) noexcept { qSwap(d, other.d); }
+
+    Source source() const;
+    Type type() const;
+    Severity severity() const;
+    GLuint id() const;
+    QString message() const;
+
+    static QOpenGLDebugMessage createApplicationMessage(const QString &text,
+                                                        GLuint id = 0,
+                                                        Severity severity = NotificationSeverity,
+                                                        Type type = OtherType);
+    static QOpenGLDebugMessage createThirdPartyMessage(const QString &text,
+                                                       GLuint id = 0,
+                                                       Severity severity = NotificationSeverity,
+                                                       Type type = OtherType);
+
+    bool operator==(const QOpenGLDebugMessage &debugMessage) const;
+    inline bool operator!=(const QOpenGLDebugMessage &debugMessage) const { return !operator==(debugMessage); }
+
+private:
+    friend class QOpenGLDebugLogger;
+    friend class QOpenGLDebugLoggerPrivate;
+    QSharedDataPointer<QOpenGLDebugMessagePrivate> d;
+};
+
+Q_DECLARE_SHARED(QOpenGLDebugMessage)
+Q_DECLARE_OPERATORS_FOR_FLAGS(QOpenGLDebugMessage::Sources)
+Q_DECLARE_OPERATORS_FOR_FLAGS(QOpenGLDebugMessage::Types)
+Q_DECLARE_OPERATORS_FOR_FLAGS(QOpenGLDebugMessage::Severities)
+
+#ifndef QT_NO_DEBUG_STREAM
+Q_OPENGL_EXPORT QDebug operator<<(QDebug debug, const QOpenGLDebugMessage &message);
+Q_OPENGL_EXPORT QDebug operator<<(QDebug debug, QOpenGLDebugMessage::Source source);
+Q_OPENGL_EXPORT QDebug operator<<(QDebug debug, QOpenGLDebugMessage::Type type);
+Q_OPENGL_EXPORT QDebug operator<<(QDebug debug, QOpenGLDebugMessage::Severity severity);
+#endif
+
+class QOpenGLDebugLoggerPrivate;
+
+class Q_OPENGL_EXPORT QOpenGLDebugLogger : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(LoggingMode loggingMode READ loggingMode)
+
+public:
+    enum LoggingMode {
+        AsynchronousLogging,
+        SynchronousLogging
+    };
+    Q_ENUM(LoggingMode)
+
+    explicit QOpenGLDebugLogger(QObject *parent = nullptr);
+    ~QOpenGLDebugLogger();
+
+    bool initialize();
+
+    bool isLogging() const;
+    LoggingMode loggingMode() const;
+
+    qint64 maximumMessageLength() const;
+
+    void pushGroup(const QString &name,
+                   GLuint id = 0,
+                   QOpenGLDebugMessage::Source source = QOpenGLDebugMessage::ApplicationSource);
+    void popGroup();
+
+    void enableMessages(QOpenGLDebugMessage::Sources sources = QOpenGLDebugMessage::AnySource,
+                        QOpenGLDebugMessage::Types types = QOpenGLDebugMessage::AnyType,
+                        QOpenGLDebugMessage::Severities severities = QOpenGLDebugMessage::AnySeverity);
+
+    void enableMessages(const QVector<GLuint> &ids,
+                        QOpenGLDebugMessage::Sources sources = QOpenGLDebugMessage::AnySource,
+                        QOpenGLDebugMessage::Types types = QOpenGLDebugMessage::AnyType);
+
+    void disableMessages(QOpenGLDebugMessage::Sources sources = QOpenGLDebugMessage::AnySource,
+                         QOpenGLDebugMessage::Types types = QOpenGLDebugMessage::AnyType,
+                         QOpenGLDebugMessage::Severities severities = QOpenGLDebugMessage::AnySeverity);
+
+    void disableMessages(const QVector<GLuint> &ids,
+                         QOpenGLDebugMessage::Sources sources = QOpenGLDebugMessage::AnySource,
+                         QOpenGLDebugMessage::Types types = QOpenGLDebugMessage::AnyType);
+
+    QList<QOpenGLDebugMessage> loggedMessages() const;
+
+public Q_SLOTS:
+    void logMessage(const QOpenGLDebugMessage &debugMessage);
+    void startLogging(LoggingMode loggingMode = AsynchronousLogging);
+    void stopLogging();
+
+Q_SIGNALS:
+    void messageLogged(const QOpenGLDebugMessage &debugMessage);
+
+private:
+    Q_DISABLE_COPY(QOpenGLDebugLogger)
+    Q_DECLARE_PRIVATE(QOpenGLDebugLogger)
+    Q_PRIVATE_SLOT(d_func(), void _q_contextAboutToBeDestroyed())
+};
+
+QT_END_NAMESPACE
+
+Q_DECLARE_METATYPE(QOpenGLDebugMessage)
+
+#endif // QT_NO_OPENGL
+
+#endif // QOPENGLDEBUG_H
diff --git a/src/opengl/qopenglengineshadermanager.cpp b/src/opengl/qopenglengineshadermanager.cpp
new file mode 100644
index 0000000000..09bd9ff096
--- /dev/null
+++ b/src/opengl/qopenglengineshadermanager.cpp
@@ -0,0 +1,898 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtOpenGL module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qopenglengineshadermanager_p.h"
+#include "qopenglengineshadersource_p.h"
+#include "qopenglpaintengine_p.h"
+#include <private/qopenglshadercache_p.h>
+
+#include <QtGui/private/qopenglcontext_p.h>
+#include <QtCore/qthreadstorage.h>
+
+#include <algorithm>
+
+#if defined(QT_DEBUG)
+#include <QMetaEnum>
+#endif
+
+// #define QT_GL_SHARED_SHADER_DEBUG
+
+QT_BEGIN_NAMESPACE
+
+class QOpenGLEngineSharedShadersResource : public QOpenGLSharedResource
+{
+public:
+    QOpenGLEngineSharedShadersResource(QOpenGLContext *ctx)
+        : QOpenGLSharedResource(ctx->shareGroup())
+        , m_shaders(new QOpenGLEngineSharedShaders(ctx))
+    {
+    }
+
+    ~QOpenGLEngineSharedShadersResource()
+    {
+        delete m_shaders;
+    }
+
+    void invalidateResource() override
+    {
+        delete m_shaders;
+        m_shaders = nullptr;
+    }
+
+    void freeResource(QOpenGLContext *) override
+    {
+    }
+
+    QOpenGLEngineSharedShaders *shaders() const { return m_shaders; }
+
+private:
+    QOpenGLEngineSharedShaders *m_shaders;
+};
+
+class QOpenGLShaderStorage
+{
+public:
+    QOpenGLEngineSharedShaders *shadersForThread(QOpenGLContext *context) {
+        QOpenGLMultiGroupSharedResource *&shaders = m_storage.localData();
+        if (!shaders)
+            shaders = new QOpenGLMultiGroupSharedResource;
+        QOpenGLEngineSharedShadersResource *resource =
+            shaders->value<QOpenGLEngineSharedShadersResource>(context);
+        return resource ? resource->shaders() : nullptr;
+    }
+
+private:
+    QThreadStorage<QOpenGLMultiGroupSharedResource *> m_storage;
+};
+
+Q_GLOBAL_STATIC(QOpenGLShaderStorage, qt_shader_storage);
+
+QOpenGLEngineSharedShaders *QOpenGLEngineSharedShaders::shadersForContext(QOpenGLContext *context)
+{
+    return qt_shader_storage()->shadersForThread(context);
+}
+
+const char* QOpenGLEngineSharedShaders::qShaderSnippets[] = {
+    0,0,0,0,0,0,0,0,0,0,
+    0,0,0,0,0,0,0,0,0,0,
+    0,0,0,0,0,0,0,0,0,0,
+    0,0,0,0,0
+};
+
+QOpenGLEngineSharedShaders::QOpenGLEngineSharedShaders(QOpenGLContext* context)
+    : blitShaderProg(nullptr)
+    , simpleShaderProg(nullptr)
+{
+
+/*
+    Rather than having the shader source array statically initialised, it is initialised
+    here instead. This is to allow new shader names to be inserted or existing names moved
+    around without having to change the order of the glsl strings. It is hoped this will
+    make future hard-to-find runtime bugs more obvious and generally give more solid code.
+*/
+
+    // Check if the user has requested an OpenGL 3.2 Core Profile or higher
+    // and if so use GLSL 1.50 core shaders instead of legacy ones.
+    const QSurfaceFormat &fmt = context->format();
+    const bool isCoreProfile = fmt.profile() == QSurfaceFormat::CoreProfile && fmt.version() >= qMakePair(3,2);
+
+    const char** code = qShaderSnippets; // shortcut
+
+    if (isCoreProfile) {
+        code[MainVertexShader] = qopenglslMainVertexShader_core;
+        code[MainWithTexCoordsVertexShader] = qopenglslMainWithTexCoordsVertexShader_core;
+        code[MainWithTexCoordsAndOpacityVertexShader] = qopenglslMainWithTexCoordsAndOpacityVertexShader_core;
+
+        code[UntransformedPositionVertexShader] = qopenglslUntransformedPositionVertexShader_core;
+        code[PositionOnlyVertexShader] = qopenglslPositionOnlyVertexShader_core;
+        code[ComplexGeometryPositionOnlyVertexShader] = qopenglslComplexGeometryPositionOnlyVertexShader_core;
+        code[PositionWithPatternBrushVertexShader] = qopenglslPositionWithPatternBrushVertexShader_core;
+        code[PositionWithLinearGradientBrushVertexShader] = qopenglslPositionWithLinearGradientBrushVertexShader_core;
+        code[PositionWithConicalGradientBrushVertexShader] = qopenglslPositionWithConicalGradientBrushVertexShader_core;
+        code[PositionWithRadialGradientBrushVertexShader] = qopenglslPositionWithRadialGradientBrushVertexShader_core;
+        code[PositionWithTextureBrushVertexShader] = qopenglslPositionWithTextureBrushVertexShader_core;
+        code[AffinePositionWithPatternBrushVertexShader] = qopenglslAffinePositionWithPatternBrushVertexShader_core;
+        code[AffinePositionWithLinearGradientBrushVertexShader] = qopenglslAffinePositionWithLinearGradientBrushVertexShader_core;
+        code[AffinePositionWithConicalGradientBrushVertexShader] = qopenglslAffinePositionWithConicalGradientBrushVertexShader_core;
+        code[AffinePositionWithRadialGradientBrushVertexShader] = qopenglslAffinePositionWithRadialGradientBrushVertexShader_core;
+        code[AffinePositionWithTextureBrushVertexShader] = qopenglslAffinePositionWithTextureBrushVertexShader_core;
+
+        code[MainFragmentShader_MO] = qopenglslMainFragmentShader_MO_core;
+        code[MainFragmentShader_M] = qopenglslMainFragmentShader_M_core;
+        code[MainFragmentShader_O] = qopenglslMainFragmentShader_O_core;
+        code[MainFragmentShader] = qopenglslMainFragmentShader_core;
+        code[MainFragmentShader_ImageArrays] = qopenglslMainFragmentShader_ImageArrays_core;
+
+        code[ImageSrcFragmentShader] = qopenglslImageSrcFragmentShader_core;
+        code[ImageSrcWithPatternFragmentShader] = qopenglslImageSrcWithPatternFragmentShader_core;
+        code[NonPremultipliedImageSrcFragmentShader] = qopenglslNonPremultipliedImageSrcFragmentShader_core;
+        code[GrayscaleImageSrcFragmentShader] = qopenglslGrayscaleImageSrcFragmentShader_core;
+        code[AlphaImageSrcFragmentShader] = qopenglslAlphaImageSrcFragmentShader_core;
+        code[CustomImageSrcFragmentShader] = qopenglslCustomSrcFragmentShader_core; // Calls "customShader", which must be appended
+        code[SolidBrushSrcFragmentShader] = qopenglslSolidBrushSrcFragmentShader_core;
+
+        code[TextureBrushSrcFragmentShader] = qopenglslTextureBrushSrcFragmentShader_core;
+        code[TextureBrushSrcWithPatternFragmentShader] = qopenglslTextureBrushSrcWithPatternFragmentShader_core;
+        code[PatternBrushSrcFragmentShader] = qopenglslPatternBrushSrcFragmentShader_core;
+        code[LinearGradientBrushSrcFragmentShader] = qopenglslLinearGradientBrushSrcFragmentShader_core;
+        code[RadialGradientBrushSrcFragmentShader] = qopenglslRadialGradientBrushSrcFragmentShader_core;
+        code[ConicalGradientBrushSrcFragmentShader] = qopenglslConicalGradientBrushSrcFragmentShader_core;
+        code[ShockingPinkSrcFragmentShader] = qopenglslShockingPinkSrcFragmentShader_core;
+
+        code[NoMaskFragmentShader] = "";
+        code[MaskFragmentShader] = qopenglslMaskFragmentShader_core;
+        code[RgbMaskFragmentShaderPass1] = qopenglslRgbMaskFragmentShaderPass1_core;
+        code[RgbMaskFragmentShaderPass2] = qopenglslRgbMaskFragmentShaderPass2_core;
+        code[RgbMaskWithGammaFragmentShader] = ""; //###
+    } else {
+        code[MainVertexShader] = qopenglslMainVertexShader;
+        code[MainWithTexCoordsVertexShader] = qopenglslMainWithTexCoordsVertexShader;
+        code[MainWithTexCoordsAndOpacityVertexShader] = qopenglslMainWithTexCoordsAndOpacityVertexShader;
+
+        code[UntransformedPositionVertexShader] = qopenglslUntransformedPositionVertexShader;
+        code[PositionOnlyVertexShader] = qopenglslPositionOnlyVertexShader;
+        code[ComplexGeometryPositionOnlyVertexShader] = qopenglslComplexGeometryPositionOnlyVertexShader;
+        code[PositionWithPatternBrushVertexShader] = qopenglslPositionWithPatternBrushVertexShader;
+        code[PositionWithLinearGradientBrushVertexShader] = qopenglslPositionWithLinearGradientBrushVertexShader;
+        code[PositionWithConicalGradientBrushVertexShader] = qopenglslPositionWithConicalGradientBrushVertexShader;
+        code[PositionWithRadialGradientBrushVertexShader] = qopenglslPositionWithRadialGradientBrushVertexShader;
+        code[PositionWithTextureBrushVertexShader] = qopenglslPositionWithTextureBrushVertexShader;
+        code[AffinePositionWithPatternBrushVertexShader] = qopenglslAffinePositionWithPatternBrushVertexShader;
+        code[AffinePositionWithLinearGradientBrushVertexShader] = qopenglslAffinePositionWithLinearGradientBrushVertexShader;
+        code[AffinePositionWithConicalGradientBrushVertexShader] = qopenglslAffinePositionWithConicalGradientBrushVertexShader;
+        code[AffinePositionWithRadialGradientBrushVertexShader] = qopenglslAffinePositionWithRadialGradientBrushVertexShader;
+        code[AffinePositionWithTextureBrushVertexShader] = qopenglslAffinePositionWithTextureBrushVertexShader;
+
+        code[MainFragmentShader_MO] = qopenglslMainFragmentShader_MO;
+        code[MainFragmentShader_M] = qopenglslMainFragmentShader_M;
+        code[MainFragmentShader_O] = qopenglslMainFragmentShader_O;
+        code[MainFragmentShader] = qopenglslMainFragmentShader;
+        code[MainFragmentShader_ImageArrays] = qopenglslMainFragmentShader_ImageArrays;
+
+        code[ImageSrcFragmentShader] = qopenglslImageSrcFragmentShader;
+        code[ImageSrcWithPatternFragmentShader] = qopenglslImageSrcWithPatternFragmentShader;
+        code[NonPremultipliedImageSrcFragmentShader] = qopenglslNonPremultipliedImageSrcFragmentShader;
+        code[GrayscaleImageSrcFragmentShader] = qopenglslGrayscaleImageSrcFragmentShader;
+        code[AlphaImageSrcFragmentShader] = qopenglslAlphaImageSrcFragmentShader;
+        code[CustomImageSrcFragmentShader] = qopenglslCustomSrcFragmentShader; // Calls "customShader", which must be appended
+        code[SolidBrushSrcFragmentShader] = qopenglslSolidBrushSrcFragmentShader;
+        code[TextureBrushSrcFragmentShader] = qopenglslTextureBrushSrcFragmentShader;
+        code[TextureBrushSrcWithPatternFragmentShader] = qopenglslTextureBrushSrcWithPatternFragmentShader;
+        code[PatternBrushSrcFragmentShader] = qopenglslPatternBrushSrcFragmentShader;
+        code[LinearGradientBrushSrcFragmentShader] = qopenglslLinearGradientBrushSrcFragmentShader;
+        code[RadialGradientBrushSrcFragmentShader] = qopenglslRadialGradientBrushSrcFragmentShader;
+        code[ConicalGradientBrushSrcFragmentShader] = qopenglslConicalGradientBrushSrcFragmentShader;
+        code[ShockingPinkSrcFragmentShader] = qopenglslShockingPinkSrcFragmentShader;
+
+        code[NoMaskFragmentShader] = "";
+        code[MaskFragmentShader] = qopenglslMaskFragmentShader;
+        code[RgbMaskFragmentShaderPass1] = qopenglslRgbMaskFragmentShaderPass1;
+        code[RgbMaskFragmentShaderPass2] = qopenglslRgbMaskFragmentShaderPass2;
+        code[RgbMaskWithGammaFragmentShader] = ""; //###
+    }
+
+    // The composition shaders are just layout qualifiers and the same
+    // for all profiles that support them.
+    code[NoCompositionModeFragmentShader] = "";
+    code[MultiplyCompositionModeFragmentShader] = qopenglslMultiplyCompositionModeFragmentShader;
+    code[ScreenCompositionModeFragmentShader] = qopenglslScreenCompositionModeFragmentShader;
+    code[OverlayCompositionModeFragmentShader] = qopenglslOverlayCompositionModeFragmentShader;
+    code[DarkenCompositionModeFragmentShader] = qopenglslDarkenCompositionModeFragmentShader;
+    code[LightenCompositionModeFragmentShader] = qopenglslLightenCompositionModeFragmentShader;
+    code[ColorDodgeCompositionModeFragmentShader] = qopenglslColorDodgeCompositionModeFragmentShader;
+    code[ColorBurnCompositionModeFragmentShader] = qopenglslColorBurnCompositionModeFragmentShader;
+    code[HardLightCompositionModeFragmentShader] = qopenglslHardLightCompositionModeFragmentShader;
+    code[SoftLightCompositionModeFragmentShader] = qopenglslSoftLightCompositionModeFragmentShader;
+    code[DifferenceCompositionModeFragmentShader] = qopenglslDifferenceCompositionModeFragmentShader;
+    code[ExclusionCompositionModeFragmentShader] = qopenglslExclusionCompositionModeFragmentShader;
+
+#if defined(QT_DEBUG)
+    // Check that all the elements have been filled:
+    for (int i = 0; i < TotalSnippetCount; ++i) {
+        if (Q_UNLIKELY(!qShaderSnippets[i])) {
+            qFatal("Shader snippet for %s (#%d) is missing!",
+                   snippetNameStr(SnippetName(i)).constData(), i);
+        }
+    }
+#endif
+
+    QByteArray vertexSource;
+    QByteArray fragSource;
+
+    // Compile up the simple shader:
+#ifdef Q_OS_WASM
+    vertexSource.append(qShaderSnippets[PositionOnlyVertexShader]);
+    vertexSource.append(qShaderSnippets[MainVertexShader]);
+#else
+    vertexSource.append(qShaderSnippets[MainVertexShader]);
+    vertexSource.append(qShaderSnippets[PositionOnlyVertexShader]);
+#endif
+    fragSource.append(qShaderSnippets[MainFragmentShader]);
+    fragSource.append(qShaderSnippets[ShockingPinkSrcFragmentShader]);
+
+    simpleShaderProg = new QOpenGLShaderProgram;
+
+    CachedShader simpleShaderCache(fragSource, vertexSource);
+
+    bool inCache = simpleShaderCache.load(simpleShaderProg, context);
+
+    if (!inCache) {
+        if (!simpleShaderProg->addCacheableShaderFromSourceCode(QOpenGLShader::Vertex, vertexSource))
+            qWarning("Vertex shader for simpleShaderProg (MainVertexShader & PositionOnlyVertexShader) failed to compile");
+        if (!simpleShaderProg->addCacheableShaderFromSourceCode(QOpenGLShader::Fragment, fragSource))
+            qWarning("Fragment shader for simpleShaderProg (MainFragmentShader & ShockingPinkSrcFragmentShader) failed to compile");
+
+        simpleShaderProg->bindAttributeLocation("vertexCoordsArray", QT_VERTEX_COORDS_ATTR);
+        simpleShaderProg->bindAttributeLocation("pmvMatrix1", QT_PMV_MATRIX_1_ATTR);
+        simpleShaderProg->bindAttributeLocation("pmvMatrix2", QT_PMV_MATRIX_2_ATTR);
+        simpleShaderProg->bindAttributeLocation("pmvMatrix3", QT_PMV_MATRIX_3_ATTR);
+    }
+
+    simpleShaderProg->link();
+
+    if (Q_UNLIKELY(!simpleShaderProg->isLinked())) {
+        qCritical("Errors linking simple shader: %s", qPrintable(simpleShaderProg->log()));
+    } else {
+        if (!inCache)
+            simpleShaderCache.store(simpleShaderProg, context);
+    }
+
+    // Compile the blit shader:
+    vertexSource.clear();
+    vertexSource.append(qShaderSnippets[MainWithTexCoordsVertexShader]);
+    vertexSource.append(qShaderSnippets[UntransformedPositionVertexShader]);
+
+    fragSource.clear();
+    fragSource.append(qShaderSnippets[MainFragmentShader]);
+    fragSource.append(qShaderSnippets[ImageSrcFragmentShader]);
+
+    blitShaderProg = new QOpenGLShaderProgram;
+
+    CachedShader blitShaderCache(fragSource, vertexSource);
+
+    inCache = blitShaderCache.load(blitShaderProg, context);
+
+    if (!inCache) {
+        if (!blitShaderProg->addCacheableShaderFromSourceCode(QOpenGLShader::Vertex, vertexSource))
+            qWarning("Vertex shader for blitShaderProg (MainWithTexCoordsVertexShader & UntransformedPositionVertexShader) failed to compile");
+        if (!blitShaderProg->addCacheableShaderFromSourceCode(QOpenGLShader::Fragment, fragSource))
+            qWarning("Fragment shader for blitShaderProg (MainFragmentShader & ImageSrcFragmentShader) failed to compile");
+
+        blitShaderProg->bindAttributeLocation("textureCoordArray", QT_TEXTURE_COORDS_ATTR);
+        blitShaderProg->bindAttributeLocation("vertexCoordsArray", QT_VERTEX_COORDS_ATTR);
+    }
+
+    blitShaderProg->link();
+    if (Q_UNLIKELY(!blitShaderProg->isLinked())) {
+        qCritical("Errors linking blit shader: %s", qPrintable(blitShaderProg->log()));
+    } else {
+        if (!inCache)
+            blitShaderCache.store(blitShaderProg, context);
+    }
+
+#ifdef QT_GL_SHARED_SHADER_DEBUG
+    qDebug(" -> QOpenGLEngineSharedShaders() %p for thread %p.", this, QThread::currentThread());
+#endif
+}
+
+QOpenGLEngineSharedShaders::~QOpenGLEngineSharedShaders()
+{
+#ifdef QT_GL_SHARED_SHADER_DEBUG
+    qDebug(" -> ~QOpenGLEngineSharedShaders() %p for thread %p.", this, QThread::currentThread());
+#endif
+    qDeleteAll(cachedPrograms);
+    cachedPrograms.clear();
+
+    if (blitShaderProg) {
+        delete blitShaderProg;
+        blitShaderProg = nullptr;
+    }
+
+    if (simpleShaderProg) {
+        delete simpleShaderProg;
+        simpleShaderProg = nullptr;
+    }
+}
+
+#if defined (QT_DEBUG)
+QByteArray QOpenGLEngineSharedShaders::snippetNameStr(SnippetName name)
+{
+    QMetaEnum m = staticMetaObject.enumerator(staticMetaObject.indexOfEnumerator("SnippetName"));
+    return QByteArray(m.valueToKey(name));
+}
+#endif
+
+// The address returned here will only be valid until next time this function is called.
+// The program is return bound.
+QOpenGLEngineShaderProg *QOpenGLEngineSharedShaders::findProgramInCache(const QOpenGLEngineShaderProg &prog)
+{
+    for (int i = 0; i < cachedPrograms.size(); ++i) {
+        QOpenGLEngineShaderProg *cachedProg = cachedPrograms[i];
+        if (*cachedProg == prog) {
+            // Move the program to the top of the list as a poor-man's cache algo
+            cachedPrograms.move(i, 0);
+            cachedProg->program->bind();
+            return cachedProg;
+        }
+    }
+
+    QScopedPointer<QOpenGLEngineShaderProg> newProg;
+
+    do {
+        QByteArray fragSource;
+        // Insert the custom stage before the srcPixel shader to work around an ATI driver bug
+        // where you cannot forward declare a function that takes a sampler as argument.
+        if (prog.srcPixelFragShader == CustomImageSrcFragmentShader)
+            fragSource.append(prog.customStageSource);
+        fragSource.append(qShaderSnippets[prog.mainFragShader]);
+        fragSource.append(qShaderSnippets[prog.srcPixelFragShader]);
+        if (prog.compositionFragShader)
+            fragSource.append(qShaderSnippets[prog.compositionFragShader]);
+        if (prog.maskFragShader)
+            fragSource.append(qShaderSnippets[prog.maskFragShader]);
+
+        QByteArray vertexSource;
+#ifdef Q_OS_WASM
+        vertexSource.append(qShaderSnippets[prog.positionVertexShader]);
+        vertexSource.append(qShaderSnippets[prog.mainVertexShader]);
+#else
+        vertexSource.append(qShaderSnippets[prog.mainVertexShader]);
+        vertexSource.append(qShaderSnippets[prog.positionVertexShader]);
+#endif
+        QScopedPointer<QOpenGLShaderProgram> shaderProgram(new QOpenGLShaderProgram);
+
+        CachedShader shaderCache(fragSource, vertexSource);
+        bool inCache = shaderCache.load(shaderProgram.data(), QOpenGLContext::currentContext());
+
+        if (!inCache) {
+            if (!shaderProgram->addCacheableShaderFromSourceCode(QOpenGLShader::Vertex, vertexSource)) {
+                QByteArray description;
+#if defined(QT_DEBUG)
+                description.append("Vertex shader: main=");
+                description.append(snippetNameStr(prog.mainVertexShader));
+                description.append(", position=");
+                description.append(snippetNameStr(prog.positionVertexShader));
+#endif
+                qWarning("Warning: \"%s\" failed to compile!", description.constData());
+                break;
+            }
+            if (!shaderProgram->addCacheableShaderFromSourceCode(QOpenGLShader::Fragment, fragSource)) {
+                QByteArray description;
+#if defined(QT_DEBUG)
+                description.append("Fragment shader: main=");
+                description.append(snippetNameStr(prog.mainFragShader));
+                description.append(", srcPixel=");
+                description.append(snippetNameStr(prog.srcPixelFragShader));
+                if (prog.compositionFragShader) {
+                    description.append(", composition=");
+                    description.append(snippetNameStr(prog.compositionFragShader));
+                }
+                if (prog.maskFragShader) {
+                    description.append(", mask=");
+                    description.append(snippetNameStr(prog.maskFragShader));
+                }
+#endif
+                qWarning("Warning: \"%s\" failed to compile!", description.constData());
+                break;
+            }
+
+            // We have to bind the vertex attribute names before the program is linked:
+            shaderProgram->bindAttributeLocation("vertexCoordsArray", QT_VERTEX_COORDS_ATTR);
+            if (prog.useTextureCoords)
+                shaderProgram->bindAttributeLocation("textureCoordArray", QT_TEXTURE_COORDS_ATTR);
+            if (prog.useOpacityAttribute)
+                shaderProgram->bindAttributeLocation("opacityArray", QT_OPACITY_ATTR);
+            if (prog.usePmvMatrixAttribute) {
+                shaderProgram->bindAttributeLocation("pmvMatrix1", QT_PMV_MATRIX_1_ATTR);
+                shaderProgram->bindAttributeLocation("pmvMatrix2", QT_PMV_MATRIX_2_ATTR);
+                shaderProgram->bindAttributeLocation("pmvMatrix3", QT_PMV_MATRIX_3_ATTR);
+            }
+        }
+
+        newProg.reset(new QOpenGLEngineShaderProg(prog));
+        newProg->program = shaderProgram.take();
+
+        newProg->program->link();
+        if (newProg->program->isLinked()) {
+            if (!inCache)
+                shaderCache.store(newProg->program, QOpenGLContext::currentContext());
+        } else {
+            QString error;
+            error = QLatin1String("Shader program failed to link")
+                    + QLatin1String("  Error Log:\n")
+                    + QLatin1String("    ") + newProg->program->log();
+            qWarning() << error;
+            break;
+        }
+
+        newProg->program->bind();
+
+        if (newProg->maskFragShader != QOpenGLEngineSharedShaders::NoMaskFragmentShader) {
+            GLuint location = newProg->program->uniformLocation("maskTexture");
+            newProg->program->setUniformValue(location, QT_MASK_TEXTURE_UNIT);
+        }
+
+        if (cachedPrograms.count() > 30) {
+            // The cache is full, so delete the last 5 programs in the list.
+            // These programs will be least used, as a program us bumped to
+            // the top of the list when it's used.
+            for (int i = 0; i < 5; ++i) {
+                delete cachedPrograms.last();
+                cachedPrograms.removeLast();
+            }
+        }
+
+        cachedPrograms.insert(0, newProg.data());
+    } while (false);
+
+    return newProg.take();
+}
+
+void QOpenGLEngineSharedShaders::cleanupCustomStage(QOpenGLCustomShaderStage* stage)
+{
+    auto hasStageAsCustomShaderSouce = [stage](QOpenGLEngineShaderProg *cachedProg) -> bool {
+        if (cachedProg->customStageSource == stage->source()) {
+            delete cachedProg;
+            return true;
+        }
+        return false;
+    };
+    cachedPrograms.erase(std::remove_if(cachedPrograms.begin(), cachedPrograms.end(),
+                                        hasStageAsCustomShaderSouce),
+                         cachedPrograms.end());
+}
+
+
+QOpenGLEngineShaderManager::QOpenGLEngineShaderManager(QOpenGLContext* context)
+    : ctx(context),
+      shaderProgNeedsChanging(true),
+      complexGeometry(false),
+      srcPixelType(Qt::NoBrush),
+      opacityMode(NoOpacity),
+      maskType(NoMask),
+      compositionMode(QPainter::CompositionMode_SourceOver),
+      customSrcStage(nullptr),
+      currentShaderProg(nullptr)
+{
+    sharedShaders = QOpenGLEngineSharedShaders::shadersForContext(context);
+}
+
+QOpenGLEngineShaderManager::~QOpenGLEngineShaderManager()
+{
+    //###
+    removeCustomStage();
+}
+
+GLuint QOpenGLEngineShaderManager::getUniformLocation(Uniform id)
+{
+    if (!currentShaderProg)
+        return 0;
+
+    QVector<uint> &uniformLocations = currentShaderProg->uniformLocations;
+    if (uniformLocations.isEmpty())
+        uniformLocations.fill(GLuint(-1), NumUniforms);
+
+    const char uniformNames[][26] = {
+        "imageTexture",
+        "patternColor",
+        "globalOpacity",
+        "depth",
+        "maskTexture",
+        "fragmentColor",
+        "linearData",
+        "angle",
+        "halfViewportSize",
+        "fmp",
+        "fmp2_m_radius2",
+        "inverse_2_fmp2_m_radius2",
+        "sqrfr",
+        "bradius",
+        "invertedTextureSize",
+        "brushTransform",
+        "brushTexture",
+        "matrix"
+    };
+
+    if (uniformLocations.at(id) == GLuint(-1))
+        uniformLocations[id] = currentShaderProg->program->uniformLocation(uniformNames[id]);
+
+    return uniformLocations.at(id);
+}
+
+
+void QOpenGLEngineShaderManager::optimiseForBrushTransform(QTransform::TransformationType transformType)
+{
+    Q_UNUSED(transformType); // Currently ignored
+}
+
+void QOpenGLEngineShaderManager::setDirty()
+{
+    shaderProgNeedsChanging = true;
+}
+
+void QOpenGLEngineShaderManager::setSrcPixelType(Qt::BrushStyle style)
+{
+    Q_ASSERT(style != Qt::NoBrush);
+    if (srcPixelType == PixelSrcType(style))
+        return;
+
+    srcPixelType = style;
+    shaderProgNeedsChanging = true; //###
+}
+
+void QOpenGLEngineShaderManager::setSrcPixelType(PixelSrcType type)
+{
+    if (srcPixelType == type)
+        return;
+
+    srcPixelType = type;
+    shaderProgNeedsChanging = true; //###
+}
+
+void QOpenGLEngineShaderManager::setOpacityMode(OpacityMode mode)
+{
+    if (opacityMode == mode)
+        return;
+
+    opacityMode = mode;
+    shaderProgNeedsChanging = true; //###
+}
+
+void QOpenGLEngineShaderManager::setMaskType(MaskType type)
+{
+    if (maskType == type)
+        return;
+
+    maskType = type;
+    shaderProgNeedsChanging = true; //###
+}
+
+void QOpenGLEngineShaderManager::setCompositionMode(QPainter::CompositionMode mode)
+{
+    if (compositionMode == mode)
+        return;
+
+    bool wasAdvanced = compositionMode > QPainter::CompositionMode_Plus;
+    bool isAdvanced = mode > QPainter::CompositionMode_Plus;
+
+    compositionMode = mode;
+    shaderProgNeedsChanging = shaderProgNeedsChanging || wasAdvanced || isAdvanced;
+}
+
+void QOpenGLEngineShaderManager::setCustomStage(QOpenGLCustomShaderStage* stage)
+{
+    if (customSrcStage)
+        removeCustomStage();
+    customSrcStage = stage;
+    shaderProgNeedsChanging = true;
+}
+
+void QOpenGLEngineShaderManager::removeCustomStage()
+{
+    if (customSrcStage)
+        customSrcStage->setInactive();
+    customSrcStage = nullptr;
+    shaderProgNeedsChanging = true;
+}
+
+QOpenGLShaderProgram* QOpenGLEngineShaderManager::currentProgram()
+{
+    if (currentShaderProg)
+        return currentShaderProg->program;
+    else
+        return sharedShaders->simpleProgram();
+}
+
+void QOpenGLEngineShaderManager::useSimpleProgram()
+{
+    sharedShaders->simpleProgram()->bind();
+    QOpenGLContextPrivate* ctx_d = ctx->d_func();
+    Q_UNUSED(ctx_d);
+
+    QOpenGL2PaintEngineEx *active_engine = static_cast<QOpenGL2PaintEngineEx *>(ctx_d->active_engine);
+
+    active_engine->d_func()->setVertexAttribArrayEnabled(QT_VERTEX_COORDS_ATTR, true);
+    active_engine->d_func()->setVertexAttribArrayEnabled(QT_TEXTURE_COORDS_ATTR, false);
+    active_engine->d_func()->setVertexAttribArrayEnabled(QT_OPACITY_ATTR, false);
+
+    shaderProgNeedsChanging = true;
+}
+
+void QOpenGLEngineShaderManager::useBlitProgram()
+{
+    sharedShaders->blitProgram()->bind();
+    QOpenGLContextPrivate* ctx_d = ctx->d_func();
+    QOpenGL2PaintEngineEx *active_engine = static_cast<QOpenGL2PaintEngineEx *>(ctx_d->active_engine);
+    active_engine->d_func()->setVertexAttribArrayEnabled(QT_VERTEX_COORDS_ATTR, true);
+    active_engine->d_func()->setVertexAttribArrayEnabled(QT_TEXTURE_COORDS_ATTR, true);
+    active_engine->d_func()->setVertexAttribArrayEnabled(QT_OPACITY_ATTR, false);
+    shaderProgNeedsChanging = true;
+}
+
+QOpenGLShaderProgram* QOpenGLEngineShaderManager::simpleProgram()
+{
+    return sharedShaders->simpleProgram();
+}
+
+QOpenGLShaderProgram* QOpenGLEngineShaderManager::blitProgram()
+{
+    return sharedShaders->blitProgram();
+}
+
+
+
+// Select & use the correct shader program using the current state.
+// Returns \c true if program needed changing.
+bool QOpenGLEngineShaderManager::useCorrectShaderProg()
+{
+    if (!shaderProgNeedsChanging)
+        return false;
+
+    bool useCustomSrc = customSrcStage != nullptr;
+    if (useCustomSrc && srcPixelType != QOpenGLEngineShaderManager::ImageSrc && srcPixelType != Qt::TexturePattern) {
+        useCustomSrc = false;
+        qWarning("QOpenGLEngineShaderManager - Ignoring custom shader stage for non image src");
+    }
+
+    QOpenGLEngineShaderProg requiredProgram;
+
+    bool texCoords = false;
+
+    // Choose vertex shader shader position function (which typically also sets
+    // varyings) and the source pixel (srcPixel) fragment shader function:
+    requiredProgram.positionVertexShader = QOpenGLEngineSharedShaders::InvalidSnippetName;
+    requiredProgram.srcPixelFragShader = QOpenGLEngineSharedShaders::InvalidSnippetName;
+    bool isAffine = brushTransform.isAffine();
+    if ( (srcPixelType >= Qt::Dense1Pattern) && (srcPixelType <= Qt::DiagCrossPattern) ) {
+        if (isAffine)
+            requiredProgram.positionVertexShader = QOpenGLEngineSharedShaders::AffinePositionWithPatternBrushVertexShader;
+        else
+            requiredProgram.positionVertexShader = QOpenGLEngineSharedShaders::PositionWithPatternBrushVertexShader;
+
+        requiredProgram.srcPixelFragShader = QOpenGLEngineSharedShaders::PatternBrushSrcFragmentShader;
+    }
+    else switch (srcPixelType) {
+        default:
+        case Qt::NoBrush:
+            qFatal("QOpenGLEngineShaderManager::useCorrectShaderProg() - Qt::NoBrush style is set");
+            break;
+        case QOpenGLEngineShaderManager::ImageSrc:
+            requiredProgram.srcPixelFragShader = QOpenGLEngineSharedShaders::ImageSrcFragmentShader;
+            requiredProgram.positionVertexShader = QOpenGLEngineSharedShaders::PositionOnlyVertexShader;
+            texCoords = true;
+            break;
+        case QOpenGLEngineShaderManager::NonPremultipliedImageSrc:
+            requiredProgram.srcPixelFragShader = QOpenGLEngineSharedShaders::NonPremultipliedImageSrcFragmentShader;
+            requiredProgram.positionVertexShader = QOpenGLEngineSharedShaders::PositionOnlyVertexShader;
+            texCoords = true;
+            break;
+        case QOpenGLEngineShaderManager::GrayscaleImageSrc:
+            requiredProgram.srcPixelFragShader = QOpenGLEngineSharedShaders::GrayscaleImageSrcFragmentShader;
+            requiredProgram.positionVertexShader = QOpenGLEngineSharedShaders::PositionOnlyVertexShader;
+            texCoords = true;
+            break;
+        case QOpenGLEngineShaderManager::AlphaImageSrc:
+            requiredProgram.srcPixelFragShader = QOpenGLEngineSharedShaders::AlphaImageSrcFragmentShader;
+            requiredProgram.positionVertexShader = QOpenGLEngineSharedShaders::PositionOnlyVertexShader;
+            texCoords = true;
+            break;
+        case QOpenGLEngineShaderManager::PatternSrc:
+            requiredProgram.srcPixelFragShader = QOpenGLEngineSharedShaders::ImageSrcWithPatternFragmentShader;
+            requiredProgram.positionVertexShader = QOpenGLEngineSharedShaders::PositionOnlyVertexShader;
+            texCoords = true;
+            break;
+        case QOpenGLEngineShaderManager::TextureSrcWithPattern:
+            requiredProgram.srcPixelFragShader = QOpenGLEngineSharedShaders::TextureBrushSrcWithPatternFragmentShader;
+            requiredProgram.positionVertexShader = isAffine ? QOpenGLEngineSharedShaders::AffinePositionWithTextureBrushVertexShader
+                                                : QOpenGLEngineSharedShaders::PositionWithTextureBrushVertexShader;
+            break;
+        case Qt::SolidPattern:
+            requiredProgram.srcPixelFragShader = QOpenGLEngineSharedShaders::SolidBrushSrcFragmentShader;
+            requiredProgram.positionVertexShader = QOpenGLEngineSharedShaders::PositionOnlyVertexShader;
+            break;
+        case Qt::LinearGradientPattern:
+            requiredProgram.srcPixelFragShader = QOpenGLEngineSharedShaders::LinearGradientBrushSrcFragmentShader;
+            requiredProgram.positionVertexShader = isAffine ? QOpenGLEngineSharedShaders::AffinePositionWithLinearGradientBrushVertexShader
+                                                : QOpenGLEngineSharedShaders::PositionWithLinearGradientBrushVertexShader;
+            break;
+        case Qt::ConicalGradientPattern:
+            requiredProgram.srcPixelFragShader = QOpenGLEngineSharedShaders::ConicalGradientBrushSrcFragmentShader;
+            requiredProgram.positionVertexShader = isAffine ? QOpenGLEngineSharedShaders::AffinePositionWithConicalGradientBrushVertexShader
+                                                : QOpenGLEngineSharedShaders::PositionWithConicalGradientBrushVertexShader;
+            break;
+        case Qt::RadialGradientPattern:
+            requiredProgram.srcPixelFragShader = QOpenGLEngineSharedShaders::RadialGradientBrushSrcFragmentShader;
+            requiredProgram.positionVertexShader = isAffine ? QOpenGLEngineSharedShaders::AffinePositionWithRadialGradientBrushVertexShader
+                                                : QOpenGLEngineSharedShaders::PositionWithRadialGradientBrushVertexShader;
+            break;
+        case Qt::TexturePattern:
+            requiredProgram.srcPixelFragShader = QOpenGLEngineSharedShaders::TextureBrushSrcFragmentShader;
+            requiredProgram.positionVertexShader = isAffine ? QOpenGLEngineSharedShaders::AffinePositionWithTextureBrushVertexShader
+                                                : QOpenGLEngineSharedShaders::PositionWithTextureBrushVertexShader;
+            break;
+    };
+
+    if (useCustomSrc) {
+        requiredProgram.srcPixelFragShader = QOpenGLEngineSharedShaders::CustomImageSrcFragmentShader;
+        requiredProgram.customStageSource = customSrcStage->source();
+    }
+
+    const bool hasCompose = compositionMode > QPainter::CompositionMode_Plus;
+    const bool hasMask = maskType != QOpenGLEngineShaderManager::NoMask;
+
+    // Choose fragment shader main function:
+    if (opacityMode == AttributeOpacity) {
+        Q_ASSERT(!hasCompose && !hasMask);
+        requiredProgram.mainFragShader = QOpenGLEngineSharedShaders::MainFragmentShader_ImageArrays;
+    } else {
+        bool useGlobalOpacity = (opacityMode == UniformOpacity);
+        if (hasMask && useGlobalOpacity)
+            requiredProgram.mainFragShader = QOpenGLEngineSharedShaders::MainFragmentShader_MO;
+        if (hasMask && !useGlobalOpacity)
+            requiredProgram.mainFragShader = QOpenGLEngineSharedShaders::MainFragmentShader_M;
+        if (!hasMask && useGlobalOpacity)
+            requiredProgram.mainFragShader = QOpenGLEngineSharedShaders::MainFragmentShader_O;
+        if (!hasMask && !useGlobalOpacity)
+            requiredProgram.mainFragShader = QOpenGLEngineSharedShaders::MainFragmentShader;
+    }
+
+    if (hasMask) {
+        if (maskType == PixelMask) {
+            requiredProgram.maskFragShader = QOpenGLEngineSharedShaders::MaskFragmentShader;
+            texCoords = true;
+        } else if (maskType == SubPixelMaskPass1) {
+            requiredProgram.maskFragShader = QOpenGLEngineSharedShaders::RgbMaskFragmentShaderPass1;
+            texCoords = true;
+        } else if (maskType == SubPixelMaskPass2) {
+            requiredProgram.maskFragShader = QOpenGLEngineSharedShaders::RgbMaskFragmentShaderPass2;
+            texCoords = true;
+        } else if (maskType == SubPixelWithGammaMask) {
+            requiredProgram.maskFragShader = QOpenGLEngineSharedShaders::RgbMaskWithGammaFragmentShader;
+            texCoords = true;
+        } else {
+            qCritical("QOpenGLEngineShaderManager::useCorrectShaderProg() - Unknown mask type");
+        }
+    } else {
+        requiredProgram.maskFragShader = QOpenGLEngineSharedShaders::NoMaskFragmentShader;
+    }
+
+    if (hasCompose) {
+        switch (compositionMode) {
+            case QPainter::CompositionMode_Multiply:
+                requiredProgram.compositionFragShader = QOpenGLEngineSharedShaders::MultiplyCompositionModeFragmentShader;
+                break;
+            case QPainter::CompositionMode_Screen:
+                requiredProgram.compositionFragShader = QOpenGLEngineSharedShaders::ScreenCompositionModeFragmentShader;
+                break;
+            case QPainter::CompositionMode_Overlay:
+                requiredProgram.compositionFragShader = QOpenGLEngineSharedShaders::OverlayCompositionModeFragmentShader;
+                break;
+            case QPainter::CompositionMode_Darken:
+                requiredProgram.compositionFragShader = QOpenGLEngineSharedShaders::DarkenCompositionModeFragmentShader;
+                break;
+            case QPainter::CompositionMode_Lighten:
+                requiredProgram.compositionFragShader = QOpenGLEngineSharedShaders::LightenCompositionModeFragmentShader;
+                break;
+            case QPainter::CompositionMode_ColorDodge:
+                requiredProgram.compositionFragShader = QOpenGLEngineSharedShaders::ColorDodgeCompositionModeFragmentShader;
+                break;
+            case QPainter::CompositionMode_ColorBurn:
+                requiredProgram.compositionFragShader = QOpenGLEngineSharedShaders::ColorBurnCompositionModeFragmentShader;
+                break;
+            case QPainter::CompositionMode_HardLight:
+                requiredProgram.compositionFragShader = QOpenGLEngineSharedShaders::HardLightCompositionModeFragmentShader;
+                break;
+            case QPainter::CompositionMode_SoftLight:
+                requiredProgram.compositionFragShader = QOpenGLEngineSharedShaders::SoftLightCompositionModeFragmentShader;
+                break;
+            case QPainter::CompositionMode_Difference:
+                requiredProgram.compositionFragShader = QOpenGLEngineSharedShaders::DifferenceCompositionModeFragmentShader;
+                break;
+            case QPainter::CompositionMode_Exclusion:
+                requiredProgram.compositionFragShader = QOpenGLEngineSharedShaders::ExclusionCompositionModeFragmentShader;
+                break;
+            default:
+                qWarning("QOpenGLEngineShaderManager::useCorrectShaderProg() - Unsupported composition mode");
+        }
+    } else {
+        requiredProgram.compositionFragShader = QOpenGLEngineSharedShaders::NoCompositionModeFragmentShader;
+    }
+
+    // Choose vertex shader main function
+    if (opacityMode == AttributeOpacity) {
+        Q_ASSERT(texCoords);
+        requiredProgram.mainVertexShader = QOpenGLEngineSharedShaders::MainWithTexCoordsAndOpacityVertexShader;
+    } else if (texCoords) {
+        requiredProgram.mainVertexShader = QOpenGLEngineSharedShaders::MainWithTexCoordsVertexShader;
+    } else {
+        requiredProgram.mainVertexShader = QOpenGLEngineSharedShaders::MainVertexShader;
+    }
+    requiredProgram.useTextureCoords = texCoords;
+    requiredProgram.useOpacityAttribute = (opacityMode == AttributeOpacity);
+    if (complexGeometry && srcPixelType == Qt::SolidPattern) {
+        requiredProgram.positionVertexShader = QOpenGLEngineSharedShaders::ComplexGeometryPositionOnlyVertexShader;
+        requiredProgram.usePmvMatrixAttribute = false;
+    } else {
+        requiredProgram.usePmvMatrixAttribute = true;
+
+        // Force complexGeometry off, since we currently don't support that mode for
+        // non-solid brushes
+        complexGeometry = false;
+    }
+
+    // At this point, requiredProgram is fully populated so try to find the program in the cache
+    currentShaderProg = sharedShaders->findProgramInCache(requiredProgram);
+
+    if (currentShaderProg && useCustomSrc) {
+        customSrcStage->setUniforms(currentShaderProg->program);
+    }
+
+    // Make sure all the vertex attribute arrays the program uses are enabled (and the ones it
+    // doesn't use are disabled)
+    QOpenGLContextPrivate* ctx_d = ctx->d_func();
+    QOpenGL2PaintEngineEx *active_engine = static_cast<QOpenGL2PaintEngineEx *>(ctx_d->active_engine);
+    active_engine->d_func()->setVertexAttribArrayEnabled(QT_VERTEX_COORDS_ATTR, true);
+    active_engine->d_func()->setVertexAttribArrayEnabled(QT_TEXTURE_COORDS_ATTR, currentShaderProg && currentShaderProg->useTextureCoords);
+    active_engine->d_func()->setVertexAttribArrayEnabled(QT_OPACITY_ATTR, currentShaderProg && currentShaderProg->useOpacityAttribute);
+
+    shaderProgNeedsChanging = false;
+    return true;
+}
+
+QT_END_NAMESPACE
diff --git a/src/opengl/qopenglengineshadermanager_p.h b/src/opengl/qopenglengineshadermanager_p.h
new file mode 100644
index 0000000000..71e6214278
--- /dev/null
+++ b/src/opengl/qopenglengineshadermanager_p.h
@@ -0,0 +1,506 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtOpenGL module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+/*
+    VERTEX SHADERS
+    ==============
+
+    Vertex shaders are specified as multiple (partial) shaders. On desktop,
+    this works fine. On ES, QOpenGLShader & QOpenGLShaderProgram will make partial
+    shaders work by concatenating the source in each QOpenGLShader and compiling
+    it as a single shader. This is abstracted nicely by QOpenGLShaderProgram and
+    the GL2 engine doesn't need to worry about it.
+
+    Generally, there's two vertex shader objects. The position shaders are
+    the ones which set gl_Position. There's also two "main" vertex shaders,
+    one which just calls the position shader and another which also passes
+    through some texture coordinates from a vertex attribute array to a
+    varying. These texture coordinates are used for mask position in text
+    rendering and for the source coordinates in drawImage/drawPixmap. There's
+    also a "Simple" vertex shader for rendering a solid colour (used to render
+    into the stencil buffer where the actual colour value is discarded).
+
+    The position shaders for brushes look scary. This is because many of the
+    calculations which logically belong in the fragment shader have been moved
+    into the vertex shader to improve performance. This is why the position
+    calculation is in a separate shader. Not only does it calculate the
+    position, but it also calculates some data to be passed to the fragment
+    shader as a varying. It is optimal to move as much of the calculation as
+    possible into the vertex shader as this is executed less often.
+
+    The varyings passed to the fragment shaders are interpolated (which is
+    cheap). Unfortunately, GL will apply perspective correction to the
+    interpolation calusing errors. To get around this, the vertex shader must
+    apply perspective correction itself and set the w-value of gl_Position to
+    zero. That way, GL will be tricked into thinking it doesn't need to apply a
+    perspective correction and use linear interpolation instead (which is what
+    we want). Of course, if the brush transform is affeine, no perspective
+    correction is needed and a simpler vertex shader can be used instead.
+
+    So there are the following "main" vertex shaders:
+        qopenglslMainVertexShader
+        qopenglslMainWithTexCoordsVertexShader
+
+    And the following position vertex shaders:
+        qopenglslPositionOnlyVertexShader
+        qopenglslPositionWithTextureBrushVertexShader
+        qopenglslPositionWithPatternBrushVertexShader
+        qopenglslPositionWithLinearGradientBrushVertexShader
+        qopenglslPositionWithRadialGradientBrushVertexShader
+        qopenglslPositionWithConicalGradientBrushVertexShader
+        qopenglslAffinePositionWithTextureBrushVertexShader
+        qopenglslAffinePositionWithPatternBrushVertexShader
+        qopenglslAffinePositionWithLinearGradientBrushVertexShader
+        qopenglslAffinePositionWithRadialGradientBrushVertexShader
+        qopenglslAffinePositionWithConicalGradientBrushVertexShader
+
+    Leading to 23 possible vertex shaders
+
+
+    FRAGMENT SHADERS
+    ================
+
+    Fragment shaders are also specified as multiple (partial) shaders. The
+    different fragment shaders represent the different stages in Qt's fragment
+    pipeline. There are 1-3 stages in this pipeline: First stage is to get the
+    fragment's colour value. The next stage is to get the fragment's mask value
+    (coverage value for anti-aliasing) and the final stage is to blend the
+    incoming fragment with the background (for composition modes not supported
+    by GL).
+
+    Of these, the first stage will always be present. If Qt doesn't need to
+    apply anti-aliasing (because it's off or handled by multisampling) then
+    the coverage value doesn't need to be applied. (Note: There are two types
+    of mask, one for regular anti-aliasing and one for sub-pixel anti-
+    aliasing.) If the composition mode is one which GL supports natively then
+    the blending stage doesn't need to be applied.
+
+    As eash stage can have multiple implementations, they are abstracted as
+    GLSL function calls with the following signatures:
+
+    Brushes & image drawing are implementations of "qcolorp vec4 srcPixel()":
+        qopenglslImageSrcFragShader
+        qopenglslImageSrcWithPatternFragShader
+        qopenglslNonPremultipliedImageSrcFragShader
+        qopenglslSolidBrushSrcFragShader
+        qopenglslTextureBrushSrcFragShader
+        qopenglslTextureBrushWithPatternFragShader
+        qopenglslPatternBrushSrcFragShader
+        qopenglslLinearGradientBrushSrcFragShader
+        qopenglslRadialGradientBrushSrcFragShader
+        qopenglslConicalGradientBrushSrcFragShader
+    NOTE: It is assumed the colour returned by srcPixel() is pre-multiplied
+
+    Masks are implementations of "qcolorp vec4 applyMask(qcolorp vec4 src)":
+        qopenglslMaskFragmentShader
+        qopenglslRgbMaskFragmentShaderPass1
+        qopenglslRgbMaskFragmentShaderPass2
+        qopenglslRgbMaskWithGammaFragmentShader
+
+    Composition modes are "qcolorp vec4 compose(qcolorp vec4 src)":
+        qopenglslColorBurnCompositionModeFragmentShader
+        qopenglslColorDodgeCompositionModeFragmentShader
+        qopenglslDarkenCompositionModeFragmentShader
+        qopenglslDifferenceCompositionModeFragmentShader
+        qopenglslExclusionCompositionModeFragmentShader
+        qopenglslHardLightCompositionModeFragmentShader
+        qopenglslLightenCompositionModeFragmentShader
+        qopenglslMultiplyCompositionModeFragmentShader
+        qopenglslOverlayCompositionModeFragmentShader
+        qopenglslScreenCompositionModeFragmentShader
+        qopenglslSoftLightCompositionModeFragmentShader
+
+
+    Note: In the future, some GLSL compilers will support an extension allowing
+          a new 'color' precision specifier. To support this, qcolorp is used for
+          all color components so it can be defined to colorp or lowp depending upon
+          the implementation.
+
+    So there are differnt frament shader main functions, depending on the
+    number & type of pipelines the fragment needs to go through.
+
+    The choice of which main() fragment shader string to use depends on:
+        - Use of global opacity
+        - Brush style (some brushes apply opacity themselves)
+        - Use & type of mask (TODO: Need to support high quality anti-aliasing & text)
+        - Use of non-GL Composition mode
+
+    Leading to the following fragment shader main functions:
+        gl_FragColor = compose(applyMask(srcPixel()*globalOpacity));
+        gl_FragColor = compose(applyMask(srcPixel()));
+        gl_FragColor = applyMask(srcPixel()*globalOpacity);
+        gl_FragColor = applyMask(srcPixel());
+        gl_FragColor = compose(srcPixel()*globalOpacity);
+        gl_FragColor = compose(srcPixel());
+        gl_FragColor = srcPixel()*globalOpacity;
+        gl_FragColor = srcPixel();
+
+    Called:
+        qopenglslMainFragmentShader_CMO
+        qopenglslMainFragmentShader_CM
+        qopenglslMainFragmentShader_MO
+        qopenglslMainFragmentShader_M
+        qopenglslMainFragmentShader_CO
+        qopenglslMainFragmentShader_C
+        qopenglslMainFragmentShader_O
+        qopenglslMainFragmentShader
+
+    Where:
+        M = Mask
+        C = Composition
+        O = Global Opacity
+
+
+    CUSTOM SHADER CODE
+    ==================
+
+    The use of custom shader code is supported by the engine for drawImage and
+    drawPixmap calls. This is implemented via hooks in the fragment pipeline.
+
+    The custom shader is passed to the engine as a partial fragment shader
+    (QOpenGLCustomShaderStage). The shader will implement a pre-defined method name
+    which Qt's fragment pipeline will call:
+
+        lowp vec4 customShader(lowp sampler2d imageTexture, highp vec2 textureCoords)
+
+    The provided src and srcCoords parameters can be used to sample from the
+    source image.
+
+    Transformations, clipping, opacity, and composition modes set using QPainter
+    will be respected when using the custom shader hook.
+*/
+
+#ifndef QOPENGLENGINE_SHADER_MANAGER_H
+#define QOPENGLENGINE_SHADER_MANAGER_H
+
+#include <QOpenGLShader>
+#include <QOpenGLShaderProgram>
+#include <QPainter>
+#include <private/qopenglcontext_p.h>
+#include <private/qopenglcustomshaderstage_p.h>
+
+QT_BEGIN_NAMESPACE
+
+
+
+/*
+struct QOpenGLEngineCachedShaderProg
+{
+    QOpenGLEngineCachedShaderProg(QOpenGLEngineShaderManager::ShaderName vertexMain,
+                              QOpenGLEngineShaderManager::ShaderName vertexPosition,
+                              QOpenGLEngineShaderManager::ShaderName fragMain,
+                              QOpenGLEngineShaderManager::ShaderName pixelSrc,
+                              QOpenGLEngineShaderManager::ShaderName mask,
+                              QOpenGLEngineShaderManager::ShaderName composition);
+
+    int cacheKey;
+    QOpenGLShaderProgram* program;
+}
+*/
+
+static const GLuint QT_VERTEX_COORDS_ATTR  = 0;
+static const GLuint QT_TEXTURE_COORDS_ATTR = 1;
+static const GLuint QT_OPACITY_ATTR = 2;
+static const GLuint QT_PMV_MATRIX_1_ATTR = 3;
+static const GLuint QT_PMV_MATRIX_2_ATTR = 4;
+static const GLuint QT_PMV_MATRIX_3_ATTR = 5;
+
+class QOpenGLEngineShaderProg;
+
+class Q_OPENGL_EXPORT QOpenGLEngineSharedShaders
+{
+    Q_GADGET
+public:
+
+    enum SnippetName {
+        MainVertexShader,
+        MainWithTexCoordsVertexShader,
+        MainWithTexCoordsAndOpacityVertexShader,
+
+        // UntransformedPositionVertexShader must be first in the list:
+        UntransformedPositionVertexShader,
+        PositionOnlyVertexShader,
+        ComplexGeometryPositionOnlyVertexShader,
+        PositionWithPatternBrushVertexShader,
+        PositionWithLinearGradientBrushVertexShader,
+        PositionWithConicalGradientBrushVertexShader,
+        PositionWithRadialGradientBrushVertexShader,
+        PositionWithTextureBrushVertexShader,
+        AffinePositionWithPatternBrushVertexShader,
+        AffinePositionWithLinearGradientBrushVertexShader,
+        AffinePositionWithConicalGradientBrushVertexShader,
+        AffinePositionWithRadialGradientBrushVertexShader,
+        AffinePositionWithTextureBrushVertexShader,
+
+        // MainFragmentShader_CMO must be first in the list:
+        MainFragmentShader_MO,
+        MainFragmentShader_M,
+        MainFragmentShader_O,
+        MainFragmentShader,
+        MainFragmentShader_ImageArrays,
+
+        // ImageSrcFragmentShader must be first in the list::
+        ImageSrcFragmentShader,
+        ImageSrcWithPatternFragmentShader,
+        NonPremultipliedImageSrcFragmentShader,
+        GrayscaleImageSrcFragmentShader,
+        AlphaImageSrcFragmentShader,
+        CustomImageSrcFragmentShader,
+        SolidBrushSrcFragmentShader,
+        TextureBrushSrcFragmentShader,
+        TextureBrushSrcWithPatternFragmentShader,
+        PatternBrushSrcFragmentShader,
+        LinearGradientBrushSrcFragmentShader,
+        RadialGradientBrushSrcFragmentShader,
+        ConicalGradientBrushSrcFragmentShader,
+        ShockingPinkSrcFragmentShader,
+
+        // NoMaskFragmentShader must be first in the list:
+        NoMaskFragmentShader,
+        MaskFragmentShader,
+        RgbMaskFragmentShaderPass1,
+        RgbMaskFragmentShaderPass2,
+        RgbMaskWithGammaFragmentShader,
+
+        // NoCompositionModeFragmentShader must be first in the list:
+        NoCompositionModeFragmentShader,
+        MultiplyCompositionModeFragmentShader,
+        ScreenCompositionModeFragmentShader,
+        OverlayCompositionModeFragmentShader,
+        DarkenCompositionModeFragmentShader,
+        LightenCompositionModeFragmentShader,
+        ColorDodgeCompositionModeFragmentShader,
+        ColorBurnCompositionModeFragmentShader,
+        HardLightCompositionModeFragmentShader,
+        SoftLightCompositionModeFragmentShader,
+        DifferenceCompositionModeFragmentShader,
+        ExclusionCompositionModeFragmentShader,
+
+        TotalSnippetCount, InvalidSnippetName
+    };
+#if defined (QT_DEBUG)
+    Q_ENUM(SnippetName)
+    static QByteArray snippetNameStr(SnippetName snippetName);
+#endif
+
+/*
+    // These allow the ShaderName enum to be used as a cache key
+    const int mainVertexOffset = 0;
+    const int positionVertexOffset = (1<<2) - PositionOnlyVertexShader;
+    const int mainFragOffset = (1<<6) - MainFragmentShader_CMO;
+    const int srcPixelOffset = (1<<10) - ImageSrcFragmentShader;
+    const int maskOffset = (1<<14) - NoMaskShader;
+    const int compositionOffset = (1 << 16) - MultiplyCompositionModeFragmentShader;
+*/
+
+    QOpenGLEngineSharedShaders(QOpenGLContext *context);
+    ~QOpenGLEngineSharedShaders();
+
+    QOpenGLShaderProgram *simpleProgram() { return simpleShaderProg; }
+    QOpenGLShaderProgram *blitProgram() { return blitShaderProg; }
+    // Compile the program if it's not already in the cache, return the item in the cache.
+    QOpenGLEngineShaderProg *findProgramInCache(const QOpenGLEngineShaderProg &prog);
+    // Compile the custom shader if it's not already in the cache, return the item in the cache.
+
+    static QOpenGLEngineSharedShaders *shadersForContext(QOpenGLContext *context);
+
+    // Ideally, this would be static and cleanup all programs in all contexts which
+    // contain the custom code. Currently it is just a hint and we rely on deleted
+    // custom shaders being cleaned up by being kicked out of the cache when it's
+    // full.
+    void cleanupCustomStage(QOpenGLCustomShaderStage* stage);
+
+private:
+    QOpenGLShaderProgram *blitShaderProg;
+    QOpenGLShaderProgram *simpleShaderProg;
+    QList<QOpenGLEngineShaderProg*> cachedPrograms;
+
+    static const char* qShaderSnippets[TotalSnippetCount];
+};
+
+
+class QOpenGLEngineShaderProg
+{
+public:
+    QOpenGLEngineShaderProg() : program(nullptr) {}
+
+    ~QOpenGLEngineShaderProg() {
+        if (program)
+            delete program;
+    }
+
+    QOpenGLEngineSharedShaders::SnippetName mainVertexShader;
+    QOpenGLEngineSharedShaders::SnippetName positionVertexShader;
+    QOpenGLEngineSharedShaders::SnippetName mainFragShader;
+    QOpenGLEngineSharedShaders::SnippetName srcPixelFragShader;
+    QOpenGLEngineSharedShaders::SnippetName maskFragShader;
+    QOpenGLEngineSharedShaders::SnippetName compositionFragShader;
+
+    QByteArray          customStageSource; //TODO: Decent cache key for custom stages
+    QOpenGLShaderProgram*   program;
+
+    QVector<uint> uniformLocations;
+
+    bool                useTextureCoords;
+    bool                useOpacityAttribute;
+    bool                usePmvMatrixAttribute;
+
+    bool operator==(const QOpenGLEngineShaderProg& other) const {
+        // We don't care about the program
+        return ( mainVertexShader      == other.mainVertexShader &&
+                 positionVertexShader  == other.positionVertexShader &&
+                 mainFragShader        == other.mainFragShader &&
+                 srcPixelFragShader    == other.srcPixelFragShader &&
+                 maskFragShader        == other.maskFragShader &&
+                 compositionFragShader == other.compositionFragShader &&
+                 customStageSource     == other.customStageSource
+               );
+    }
+};
+
+class Q_OPENGL_EXPORT QOpenGLEngineShaderManager : public QObject
+{
+    Q_OBJECT
+public:
+    QOpenGLEngineShaderManager(QOpenGLContext* context);
+    ~QOpenGLEngineShaderManager();
+
+    enum MaskType {NoMask, PixelMask, SubPixelMaskPass1, SubPixelMaskPass2, SubPixelWithGammaMask};
+    enum PixelSrcType {
+        ImageSrc = Qt::TexturePattern+1,
+        NonPremultipliedImageSrc = Qt::TexturePattern+2,
+        PatternSrc = Qt::TexturePattern+3,
+        TextureSrcWithPattern = Qt::TexturePattern+4,
+        GrayscaleImageSrc = Qt::TexturePattern+5,
+        AlphaImageSrc = Qt::TexturePattern+6,
+    };
+
+    enum Uniform {
+        ImageTexture,
+        PatternColor,
+        GlobalOpacity,
+        Depth,
+        MaskTexture,
+        FragmentColor,
+        LinearData,
+        Angle,
+        HalfViewportSize,
+        Fmp,
+        Fmp2MRadius2,
+        Inverse2Fmp2MRadius2,
+        SqrFr,
+        BRadius,
+        InvertedTextureSize,
+        BrushTransform,
+        BrushTexture,
+        Matrix,
+        NumUniforms
+    };
+
+    enum OpacityMode {
+        NoOpacity,
+        UniformOpacity,
+        AttributeOpacity
+    };
+
+    // There are optimizations we can do, depending on the brush transform:
+    //    1) May not have to apply perspective-correction
+    //    2) Can use lower precision for matrix
+    void optimiseForBrushTransform(QTransform::TransformationType transformType);
+    void setSrcPixelType(Qt::BrushStyle);
+    void setSrcPixelType(PixelSrcType); // For non-brush sources, like pixmaps & images
+    void setOpacityMode(OpacityMode);
+    void setMaskType(MaskType);
+    void setCompositionMode(QPainter::CompositionMode);
+    void setCustomStage(QOpenGLCustomShaderStage* stage);
+    void removeCustomStage();
+
+    GLuint getUniformLocation(Uniform id);
+
+    void setDirty(); // someone has manually changed the current shader program
+    bool useCorrectShaderProg(); // returns true if the shader program needed to be changed
+
+    void useSimpleProgram();
+    void useBlitProgram();
+    void setHasComplexGeometry(bool hasComplexGeometry)
+    {
+        complexGeometry = hasComplexGeometry;
+        shaderProgNeedsChanging = true;
+    }
+    bool hasComplexGeometry() const
+    {
+        return complexGeometry;
+    }
+
+    QOpenGLShaderProgram* currentProgram(); // Returns pointer to the shader the manager has chosen
+    QOpenGLShaderProgram* simpleProgram(); // Used to draw into e.g. stencil buffers
+    QOpenGLShaderProgram* blitProgram(); // Used to blit a texture into the framebuffer
+
+    QOpenGLEngineSharedShaders* sharedShaders;
+
+private:
+    QOpenGLContext*     ctx;
+    bool            shaderProgNeedsChanging;
+    bool            complexGeometry;
+
+    // Current state variables which influence the choice of shader:
+    QTransform                  brushTransform;
+    int                         srcPixelType;
+    OpacityMode                 opacityMode;
+    MaskType                    maskType;
+    QPainter::CompositionMode   compositionMode;
+    QOpenGLCustomShaderStage*       customSrcStage;
+
+    QOpenGLEngineShaderProg*    currentShaderProg;
+};
+
+QT_END_NAMESPACE
+
+#endif //QOPENGLENGINE_SHADER_MANAGER_H
diff --git a/src/opengl/qopenglengineshadersource_p.h b/src/opengl/qopenglengineshadersource_p.h
new file mode 100644
index 0000000000..49d17c8d79
--- /dev/null
+++ b/src/opengl/qopenglengineshadersource_p.h
@@ -0,0 +1,969 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtOpenGL module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+
+#ifndef QOPENGL_ENGINE_SHADER_SOURCE_H
+#define QOPENGL_ENGINE_SHADER_SOURCE_H
+
+#include "qopenglengineshadermanager_p.h"
+
+QT_BEGIN_NAMESPACE
+
+
+static const char* const qopenglslMainVertexShader = "\n\
+    void setPosition(); \n\
+    void main(void) \n\
+    { \n\
+        setPosition(); \n\
+    }\n";
+
+static const char* const qopenglslMainWithTexCoordsVertexShader = "\n\
+    attribute highp   vec2      textureCoordArray; \n\
+    varying   highp   vec2      textureCoords; \n\
+    void setPosition(); \n\
+    void main(void) \n\
+    { \n\
+        setPosition(); \n\
+        textureCoords = textureCoordArray; \n\
+    }\n";
+
+static const char* const qopenglslMainWithTexCoordsAndOpacityVertexShader = "\n\
+    attribute highp   vec2      textureCoordArray; \n\
+    attribute lowp    float     opacityArray; \n\
+    varying   highp   vec2      textureCoords; \n\
+    varying   lowp    float     opacity; \n\
+    void setPosition(); \n\
+    void main(void) \n\
+    { \n\
+        setPosition(); \n\
+        textureCoords = textureCoordArray; \n\
+        opacity = opacityArray; \n\
+    }\n";
+
+// NOTE: We let GL do the perspective correction so texture lookups in the fragment
+//       shader are also perspective corrected.
+static const char* const qopenglslPositionOnlyVertexShader = "\n\
+    attribute highp   vec2      vertexCoordsArray; \n\
+    attribute highp   vec3      pmvMatrix1; \n\
+    attribute highp   vec3      pmvMatrix2; \n\
+    attribute highp   vec3      pmvMatrix3; \n\
+    void setPosition(void) \n\
+    { \n\
+        highp mat3 pmvMatrix = mat3(pmvMatrix1, pmvMatrix2, pmvMatrix3); \n\
+        vec3 transformedPos = pmvMatrix * vec3(vertexCoordsArray.xy, 1.0); \n\
+        gl_Position = vec4(transformedPos.xy, 0.0, transformedPos.z); \n\
+    }\n";
+
+static const char* const qopenglslComplexGeometryPositionOnlyVertexShader = "\n\
+    uniform highp mat3 matrix; \n\
+    attribute highp vec2 vertexCoordsArray; \n\
+    void setPosition(void) \n\
+    { \n\
+      gl_Position = vec4(matrix * vec3(vertexCoordsArray, 1), 1);\n\
+    } \n";
+
+static const char* const qopenglslUntransformedPositionVertexShader = "\n\
+    attribute highp   vec4      vertexCoordsArray; \n\
+    void setPosition(void) \n\
+    { \n\
+        gl_Position = vertexCoordsArray; \n\
+    }\n";
+
+// Pattern Brush - This assumes the texture size is 8x8 and thus, the inverted size is 0.125
+static const char* const qopenglslPositionWithPatternBrushVertexShader = "\n\
+    attribute highp   vec2      vertexCoordsArray; \n\
+    attribute highp   vec3      pmvMatrix1; \n\
+    attribute highp   vec3      pmvMatrix2; \n\
+    attribute highp   vec3      pmvMatrix3; \n\
+    uniform   mediump vec2      halfViewportSize; \n\
+    uniform   highp   vec2      invertedTextureSize; \n\
+    uniform   highp   mat3      brushTransform; \n\
+    varying   highp   vec2      patternTexCoords; \n\
+    void setPosition(void) \n\
+    { \n\
+        highp mat3 pmvMatrix = mat3(pmvMatrix1, pmvMatrix2, pmvMatrix3); \n\
+        vec3 transformedPos = pmvMatrix * vec3(vertexCoordsArray.xy, 1.0); \n\
+        gl_Position.xy = transformedPos.xy / transformedPos.z; \n\
+        mediump vec2 viewportCoords = (gl_Position.xy + 1.0) * halfViewportSize; \n\
+        mediump vec3 hTexCoords = brushTransform * vec3(viewportCoords, 1.0); \n\
+        mediump float invertedHTexCoordsZ = 1.0 / hTexCoords.z; \n\
+        gl_Position = vec4(gl_Position.xy * invertedHTexCoordsZ, 0.0, invertedHTexCoordsZ); \n\
+        patternTexCoords.xy = (hTexCoords.xy * 0.125) * invertedHTexCoordsZ; \n\
+    }\n";
+
+static const char* const qopenglslAffinePositionWithPatternBrushVertexShader
+                 = qopenglslPositionWithPatternBrushVertexShader;
+
+static const char* const qopenglslPatternBrushSrcFragmentShader = "\n\
+    uniform           sampler2D brushTexture; \n\
+    uniform   lowp    vec4      patternColor; \n\
+    varying   highp   vec2      patternTexCoords;\n\
+    lowp vec4 srcPixel() \n\
+    { \n\
+        return patternColor * (1.0 - texture2D(brushTexture, patternTexCoords).r); \n\
+    }\n";
+
+
+// Linear Gradient Brush
+static const char* const qopenglslPositionWithLinearGradientBrushVertexShader = "\n\
+    attribute highp   vec2      vertexCoordsArray; \n\
+    attribute highp   vec3      pmvMatrix1; \n\
+    attribute highp   vec3      pmvMatrix2; \n\
+    attribute highp   vec3      pmvMatrix3; \n\
+    uniform   mediump vec2      halfViewportSize; \n\
+    uniform   highp   vec3      linearData; \n\
+    uniform   highp   mat3      brushTransform; \n\
+    varying   mediump float     index; \n\
+    void setPosition() \n\
+    { \n\
+        highp mat3 pmvMatrix = mat3(pmvMatrix1, pmvMatrix2, pmvMatrix3); \n\
+        vec3 transformedPos = pmvMatrix * vec3(vertexCoordsArray.xy, 1.0); \n\
+        gl_Position.xy = transformedPos.xy / transformedPos.z; \n\
+        mediump vec2 viewportCoords = (gl_Position.xy + 1.0) * halfViewportSize; \n\
+        mediump vec3 hTexCoords = brushTransform * vec3(viewportCoords, 1); \n\
+        mediump float invertedHTexCoordsZ = 1.0 / hTexCoords.z; \n\
+        gl_Position = vec4(gl_Position.xy * invertedHTexCoordsZ, 0.0, invertedHTexCoordsZ); \n\
+        index = (dot(linearData.xy, hTexCoords.xy) * linearData.z) * invertedHTexCoordsZ; \n\
+    }\n";
+
+static const char* const qopenglslAffinePositionWithLinearGradientBrushVertexShader
+                 = qopenglslPositionWithLinearGradientBrushVertexShader;
+
+static const char* const qopenglslLinearGradientBrushSrcFragmentShader = "\n\
+    uniform           sampler2D brushTexture; \n\
+    varying   mediump float     index; \n\
+    lowp vec4 srcPixel() \n\
+    { \n\
+        mediump vec2 val = vec2(index, 0.5); \n\
+        return texture2D(brushTexture, val); \n\
+    }\n";
+
+
+// Conical Gradient Brush
+static const char* const qopenglslPositionWithConicalGradientBrushVertexShader = "\n\
+    attribute highp   vec2      vertexCoordsArray; \n\
+    attribute highp   vec3      pmvMatrix1; \n\
+    attribute highp   vec3      pmvMatrix2; \n\
+    attribute highp   vec3      pmvMatrix3; \n\
+    uniform   mediump vec2      halfViewportSize; \n\
+    uniform   highp   mat3      brushTransform; \n\
+    varying   highp   vec2      A; \n\
+    void setPosition(void) \n\
+    { \n\
+        highp mat3 pmvMatrix = mat3(pmvMatrix1, pmvMatrix2, pmvMatrix3); \n\
+        vec3 transformedPos = pmvMatrix * vec3(vertexCoordsArray.xy, 1.0); \n\
+        gl_Position.xy = transformedPos.xy / transformedPos.z; \n\
+        mediump vec2  viewportCoords = (gl_Position.xy + 1.0) * halfViewportSize; \n\
+        mediump vec3 hTexCoords = brushTransform * vec3(viewportCoords, 1); \n\
+        mediump float invertedHTexCoordsZ = 1.0 / hTexCoords.z; \n\
+        gl_Position = vec4(gl_Position.xy * invertedHTexCoordsZ, 0.0, invertedHTexCoordsZ); \n\
+        A = hTexCoords.xy * invertedHTexCoordsZ; \n\
+    }\n";
+
+static const char* const qopenglslAffinePositionWithConicalGradientBrushVertexShader
+                 = qopenglslPositionWithConicalGradientBrushVertexShader;
+
+static const char* const qopenglslConicalGradientBrushSrcFragmentShader = "\n\
+    #define INVERSE_2PI 0.1591549430918953358 \n\
+    uniform           sampler2D brushTexture; \n\
+    uniform   mediump float     angle; \n\
+    varying   highp   vec2      A; \n\
+    lowp vec4 srcPixel() \n\
+    { \n\
+        highp float t; \n\
+        if (abs(A.y) == abs(A.x)) \n\
+            t = (atan(-A.y + 0.002, A.x) + angle) * INVERSE_2PI; \n\
+        else \n\
+            t = (atan(-A.y, A.x) + angle) * INVERSE_2PI; \n\
+        return texture2D(brushTexture, vec2(t - floor(t), 0.5)); \n\
+    }\n";
+
+
+// Radial Gradient Brush
+static const char* const qopenglslPositionWithRadialGradientBrushVertexShader = "\n\
+    attribute highp   vec2      vertexCoordsArray;\n\
+    attribute highp   vec3      pmvMatrix1; \n\
+    attribute highp   vec3      pmvMatrix2; \n\
+    attribute highp   vec3      pmvMatrix3; \n\
+    uniform   mediump vec2      halfViewportSize; \n\
+    uniform   highp   mat3      brushTransform; \n\
+    uniform   highp   vec2      fmp; \n\
+    uniform   mediump vec3      bradius; \n\
+    varying   highp   float     b; \n\
+    varying   highp   vec2      A; \n\
+    void setPosition(void) \n\
+    {\n\
+        highp mat3 pmvMatrix = mat3(pmvMatrix1, pmvMatrix2, pmvMatrix3); \n\
+        vec3 transformedPos = pmvMatrix * vec3(vertexCoordsArray.xy, 1.0); \n\
+        gl_Position.xy = transformedPos.xy / transformedPos.z; \n\
+        mediump vec2 viewportCoords = (gl_Position.xy + 1.0) * halfViewportSize; \n\
+        mediump vec3 hTexCoords = brushTransform * vec3(viewportCoords, 1); \n\
+        mediump float invertedHTexCoordsZ = 1.0 / hTexCoords.z; \n\
+        gl_Position = vec4(gl_Position.xy * invertedHTexCoordsZ, 0.0, invertedHTexCoordsZ); \n\
+        A = hTexCoords.xy * invertedHTexCoordsZ; \n\
+        b = bradius.x + 2.0 * dot(A, fmp); \n\
+    }\n";
+
+static const char* const qopenglslAffinePositionWithRadialGradientBrushVertexShader
+                 = qopenglslPositionWithRadialGradientBrushVertexShader;
+
+static const char* const qopenglslRadialGradientBrushSrcFragmentShader = "\n\
+    uniform           sampler2D brushTexture; \n\
+    uniform   highp   float     fmp2_m_radius2; \n\
+    uniform   highp   float     inverse_2_fmp2_m_radius2; \n\
+    uniform   highp   float     sqrfr; \n\
+    varying   highp   float     b; \n\
+    varying   highp   vec2      A; \n\
+    uniform   mediump vec3      bradius; \n\
+    lowp vec4 srcPixel() \n\
+    { \n\
+        highp float c = sqrfr-dot(A, A); \n\
+        highp float det = b*b - 4.0*fmp2_m_radius2*c; \n\
+        lowp vec4 result = vec4(0.0); \n\
+        if (det >= 0.0) { \n\
+            highp float detSqrt = sqrt(det); \n\
+            highp float w = max((-b - detSqrt) * inverse_2_fmp2_m_radius2, (-b + detSqrt) * inverse_2_fmp2_m_radius2); \n\
+            if (bradius.y + w * bradius.z >= 0.0) \n\
+                result = texture2D(brushTexture, vec2(w, 0.5)); \n\
+        } \n\
+        return result; \n\
+    }\n";
+
+
+// Texture Brush
+static const char* const qopenglslPositionWithTextureBrushVertexShader = "\n\
+    attribute highp   vec2      vertexCoordsArray; \n\
+    attribute highp   vec3      pmvMatrix1; \n\
+    attribute highp   vec3      pmvMatrix2; \n\
+    attribute highp   vec3      pmvMatrix3; \n\
+    uniform   mediump vec2      halfViewportSize; \n\
+    uniform   highp   vec2      invertedTextureSize; \n\
+    uniform   highp   mat3      brushTransform; \n\
+    varying   highp   vec2      brushTextureCoords; \n\
+    void setPosition(void) \n\
+    { \n\
+        highp mat3 pmvMatrix = mat3(pmvMatrix1, pmvMatrix2, pmvMatrix3); \n\
+        vec3 transformedPos = pmvMatrix * vec3(vertexCoordsArray.xy, 1.0); \n\
+        gl_Position.xy = transformedPos.xy / transformedPos.z; \n\
+        mediump vec2 viewportCoords = (gl_Position.xy + 1.0) * halfViewportSize; \n\
+        mediump vec3 hTexCoords = brushTransform * vec3(viewportCoords, 1); \n\
+        mediump float invertedHTexCoordsZ = 1.0 / hTexCoords.z; \n\
+        gl_Position = vec4(gl_Position.xy * invertedHTexCoordsZ, 0.0, invertedHTexCoordsZ); \n\
+        brushTextureCoords.xy = (hTexCoords.xy * invertedTextureSize) * gl_Position.w; \n\
+    }\n";
+
+static const char* const qopenglslAffinePositionWithTextureBrushVertexShader
+                 = qopenglslPositionWithTextureBrushVertexShader;
+
+static const char* const qopenglslTextureBrushSrcFragmentShader = "\n\
+    varying   highp   vec2      brushTextureCoords; \n\
+    uniform           sampler2D brushTexture; \n\
+    lowp vec4 srcPixel() \n\
+    { \n\
+        return texture2D(brushTexture, brushTextureCoords); \n\
+    }\n";
+
+static const char* const qopenglslTextureBrushSrcWithPatternFragmentShader = "\n\
+    varying   highp   vec2      brushTextureCoords; \n\
+    uniform   lowp    vec4      patternColor; \n\
+    uniform           sampler2D brushTexture; \n\
+    lowp vec4 srcPixel() \n\
+    { \n\
+        return patternColor * (1.0 - texture2D(brushTexture, brushTextureCoords).r); \n\
+    }\n";
+
+// Solid Fill Brush
+static const char* const qopenglslSolidBrushSrcFragmentShader = "\n\
+    uniform   lowp    vec4      fragmentColor; \n\
+    lowp vec4 srcPixel() \n\
+    { \n\
+        return fragmentColor; \n\
+    }\n";
+
+static const char* const qopenglslImageSrcFragmentShader = "\n\
+    varying   highp   vec2      textureCoords; \n\
+    uniform           sampler2D imageTexture; \n\
+    lowp vec4 srcPixel() \n\
+    { \n"
+        "return texture2D(imageTexture, textureCoords); \n"
+    "}\n";
+
+static const char* const qopenglslCustomSrcFragmentShader = "\n\
+    varying   highp   vec2      textureCoords; \n\
+    uniform           sampler2D imageTexture; \n\
+    lowp vec4 srcPixel() \n\
+    { \n\
+        return customShader(imageTexture, textureCoords); \n\
+    }\n";
+
+static const char* const qopenglslImageSrcWithPatternFragmentShader = "\n\
+    varying   highp   vec2      textureCoords; \n\
+    uniform   lowp    vec4      patternColor; \n\
+    uniform           sampler2D imageTexture; \n\
+    lowp vec4 srcPixel() \n\
+    { \n\
+        return patternColor * (1.0 - texture2D(imageTexture, textureCoords).r); \n\
+    }\n";
+
+static const char* const qopenglslNonPremultipliedImageSrcFragmentShader = "\n\
+    varying   highp   vec2      textureCoords; \n\
+    uniform          sampler2D imageTexture; \n\
+    lowp vec4 srcPixel() \n\
+    { \n\
+        lowp vec4 sample = texture2D(imageTexture, textureCoords); \n\
+        sample.rgb = sample.rgb * sample.a; \n\
+        return sample; \n\
+    }\n";
+
+static const char* const qopenglslGrayscaleImageSrcFragmentShader = "\n\
+    varying   highp   vec2      textureCoords; \n\
+    uniform          sampler2D imageTexture; \n\
+    lowp vec4 srcPixel() \n\
+    { \n\
+        return texture2D(imageTexture, textureCoords).rrra; \n\
+    }\n";
+
+static const char* const qopenglslAlphaImageSrcFragmentShader = "\n\
+    varying   highp   vec2      textureCoords; \n\
+    uniform          sampler2D imageTexture; \n\
+    lowp vec4 srcPixel() \n\
+    { \n\
+        return vec4(0, 0, 0, texture2D(imageTexture, textureCoords).r); \n\
+    }\n";
+
+static const char* const qopenglslShockingPinkSrcFragmentShader = "\n\
+    lowp vec4 srcPixel() \n\
+    { \n\
+        return vec4(0.98, 0.06, 0.75, 1.0); \n\
+    }\n";
+
+static const char* const qopenglslMainFragmentShader_ImageArrays = "\n\
+    varying   lowp    float     opacity; \n\
+    lowp vec4 srcPixel(); \n\
+    void main() \n\
+    { \n\
+        gl_FragColor = srcPixel() * opacity; \n\
+    }\n";
+
+static const char* const qopenglslMainFragmentShader_MO = "\n\
+    uniform   lowp    float     globalOpacity; \n\
+    lowp vec4 srcPixel(); \n\
+    lowp vec4 applyMask(lowp vec4); \n\
+    void main() \n\
+    { \n\
+        gl_FragColor = applyMask(srcPixel()*globalOpacity); \n\
+    }\n";
+
+static const char* const qopenglslMainFragmentShader_M = "\n\
+    lowp vec4 srcPixel(); \n\
+    lowp vec4 applyMask(lowp vec4); \n\
+    void main() \n\
+    { \n\
+        gl_FragColor = applyMask(srcPixel()); \n\
+    }\n";
+
+static const char* const qopenglslMainFragmentShader_O = "\n\
+    uniform   lowp    float     globalOpacity; \n\
+    lowp vec4 srcPixel(); \n\
+    void main() \n\
+    { \n\
+        gl_FragColor = srcPixel()*globalOpacity; \n\
+    }\n";
+
+static const char* const qopenglslMainFragmentShader = "\n\
+    lowp vec4 srcPixel(); \n\
+    void main() \n\
+    { \n\
+        gl_FragColor = srcPixel(); \n\
+    }\n";
+
+static const char* const qopenglslMaskFragmentShader = "\n\
+    varying   highp   vec2      textureCoords;\n\
+    uniform           sampler2D maskTexture;\n\
+    lowp vec4 applyMask(lowp vec4 src) \n\
+    {\n\
+        lowp vec4 mask = texture2D(maskTexture, textureCoords); \n\
+        return src * mask.a; \n\
+    }\n";
+
+// For source over with subpixel antialiasing, the final color is calculated per component as follows
+// (.a is alpha component, .c is red, green or blue component):
+// alpha = src.a * mask.c * opacity
+// dest.c = dest.c * (1 - alpha) + src.c * alpha
+//
+// In the first pass, calculate: dest.c = dest.c * (1 - alpha) with blend funcs: zero, 1 - source color
+// In the second pass, calculate: dest.c = dest.c + src.c * alpha with blend funcs: one, one
+//
+// If source is a solid color (src is constant), only the first pass is needed, with blend funcs: constant, 1 - source color
+
+// For source composition with subpixel antialiasing, the final color is calculated per component as follows:
+// alpha = src.a * mask.c * opacity
+// dest.c = dest.c * (1 - mask.c) + src.c * alpha
+//
+
+static const char* const qopenglslRgbMaskFragmentShaderPass1 = "\n\
+    varying   highp   vec2      textureCoords;\n\
+    uniform           sampler2D maskTexture;\n\
+    lowp vec4 applyMask(lowp vec4 src) \n\
+    { \n\
+        lowp vec4 mask = texture2D(maskTexture, textureCoords); \n\
+        return src.a * mask; \n\
+    }\n";
+
+static const char* const qopenglslRgbMaskFragmentShaderPass2 = "\n\
+    varying   highp   vec2      textureCoords;\n\
+    uniform           sampler2D maskTexture;\n\
+    lowp vec4 applyMask(lowp vec4 src) \n\
+    { \n\
+        lowp vec4 mask = texture2D(maskTexture, textureCoords); \n\
+        return src * mask; \n\
+    }\n";
+
+static const char* const qopenglslMultiplyCompositionModeFragmentShader = "\n\
+    #ifdef GL_KHR_blend_equation_advanced\n\
+    layout(blend_support_multiply) out;\n\
+    #endif\n";
+
+static const char* const qopenglslScreenCompositionModeFragmentShader = "\n\
+    #ifdef GL_KHR_blend_equation_advanced\n\
+    layout(blend_support_screen) out;\n\
+    #endif\n";
+
+static const char* const qopenglslOverlayCompositionModeFragmentShader = "\n\
+    #ifdef GL_KHR_blend_equation_advanced\n\
+    layout(blend_support_overlay) out;\n\
+    #endif\n";
+
+static const char* const qopenglslDarkenCompositionModeFragmentShader = "\n\
+    #ifdef GL_KHR_blend_equation_advanced\n\
+    layout(blend_support_darken) out;\n\
+    #endif\n";
+
+static const char* const qopenglslLightenCompositionModeFragmentShader = "\n\
+    #ifdef GL_KHR_blend_equation_advanced\n\
+    layout(blend_support_lighten) out;\n\
+    #endif\n";
+
+static const char* const qopenglslColorDodgeCompositionModeFragmentShader = "\n\
+    #ifdef GL_KHR_blend_equation_advanced\n\
+    layout(blend_support_colordodge) out;\n\
+    #endif\n";
+
+static const char* const qopenglslColorBurnCompositionModeFragmentShader = "\n\
+    #ifdef GL_KHR_blend_equation_advanced\n\
+    layout(blend_support_colorburn) out;\n\
+    #endif\n";
+
+static const char* const qopenglslHardLightCompositionModeFragmentShader = "\n\
+    #ifdef GL_KHR_blend_equation_advanced\n\
+    layout(blend_support_hardlight) out;\n\
+    #endif\n";
+
+static const char* const qopenglslSoftLightCompositionModeFragmentShader = "\n\
+    #ifdef GL_KHR_blend_equation_advanced\n\
+    layout(blend_support_softlight) out;\n\
+    #endif\n";
+
+static const char* const qopenglslDifferenceCompositionModeFragmentShader = "\n\
+    #ifdef GL_KHR_blend_equation_advanced\n\
+    layout(blend_support_difference) out;\n\
+    #endif\n";
+
+static const char* const qopenglslExclusionCompositionModeFragmentShader = "\n\
+    #ifdef GL_KHR_blend_equation_advanced\n\
+    layout(blend_support_exclusion) out;\n\
+    #endif\n";
+
+/*
+    Left to implement:
+        RgbMaskFragmentShader,
+        RgbMaskWithGammaFragmentShader,
+*/
+
+/*
+    OpenGL 3.2+ Core Profile shaders
+    The following shader snippets are copies of the snippets above
+    but use the modern GLSL 1.5 keywords. New shaders should make
+    a snippet for both profiles and add them appropriately in the
+    shader manager.
+*/
+static const char* const qopenglslMainVertexShader_core =
+    "#version 150 core\n\
+    void setPosition(); \n\
+    void main(void) \n\
+    { \n\
+        setPosition(); \n\
+    }\n";
+
+static const char* const qopenglslMainWithTexCoordsVertexShader_core =
+    "#version 150 core\n\
+    in      vec2      textureCoordArray; \n\
+    out     vec2      textureCoords; \n\
+    void setPosition(); \n\
+    void main(void) \n\
+    { \n\
+        setPosition(); \n\
+        textureCoords = textureCoordArray; \n\
+    }\n";
+
+static const char* const qopenglslMainWithTexCoordsAndOpacityVertexShader_core =
+    "#version 150 core\n\
+    in      vec2      textureCoordArray; \n\
+    in      float     opacityArray; \n\
+    out     vec2      textureCoords; \n\
+    out     float     opacity; \n\
+    void setPosition(); \n\
+    void main(void) \n\
+    { \n\
+        setPosition(); \n\
+        textureCoords = textureCoordArray; \n\
+        opacity = opacityArray; \n\
+    }\n";
+
+// NOTE: We let GL do the perspective correction so texture lookups in the fragment
+//       shader are also perspective corrected.
+static const char* const qopenglslPositionOnlyVertexShader_core = "\n\
+    in      vec2      vertexCoordsArray; \n\
+    in      vec3      pmvMatrix1; \n\
+    in      vec3      pmvMatrix2; \n\
+    in      vec3      pmvMatrix3; \n\
+    void setPosition(void) \n\
+    { \n\
+        mat3 pmvMatrix = mat3(pmvMatrix1, pmvMatrix2, pmvMatrix3); \n\
+        vec3 transformedPos = pmvMatrix * vec3(vertexCoordsArray.xy, 1.0); \n\
+        gl_Position = vec4(transformedPos.xy, 0.0, transformedPos.z); \n\
+    }\n";
+
+static const char* const qopenglslComplexGeometryPositionOnlyVertexShader_core = "\n\
+    in      vec2      vertexCoordsArray; \n\
+    uniform mat3      matrix; \n\
+    void setPosition(void) \n\
+    { \n\
+      gl_Position = vec4(matrix * vec3(vertexCoordsArray, 1), 1);\n\
+    } \n";
+
+static const char* const qopenglslUntransformedPositionVertexShader_core = "\n\
+    in      vec4      vertexCoordsArray; \n\
+    void setPosition(void) \n\
+    { \n\
+        gl_Position = vertexCoordsArray; \n\
+    }\n";
+
+// Pattern Brush - This assumes the texture size is 8x8 and thus, the inverted size is 0.125
+static const char* const qopenglslPositionWithPatternBrushVertexShader_core = "\n\
+    in      vec2      vertexCoordsArray; \n\
+    in      vec3      pmvMatrix1; \n\
+    in      vec3      pmvMatrix2; \n\
+    in      vec3      pmvMatrix3; \n\
+    out     vec2      patternTexCoords; \n\
+    uniform vec2      halfViewportSize; \n\
+    uniform vec2      invertedTextureSize; \n\
+    uniform mat3      brushTransform; \n\
+    void setPosition(void) \n\
+    { \n\
+        mat3 pmvMatrix = mat3(pmvMatrix1, pmvMatrix2, pmvMatrix3); \n\
+        vec3 transformedPos = pmvMatrix * vec3(vertexCoordsArray.xy, 1.0); \n\
+        gl_Position.xy = transformedPos.xy / transformedPos.z; \n\
+        vec2 viewportCoords = (gl_Position.xy + 1.0) * halfViewportSize; \n\
+        vec3 hTexCoords = brushTransform * vec3(viewportCoords, 1.0); \n\
+        float invertedHTexCoordsZ = 1.0 / hTexCoords.z; \n\
+        gl_Position = vec4(gl_Position.xy * invertedHTexCoordsZ, 0.0, invertedHTexCoordsZ); \n\
+        patternTexCoords.xy = (hTexCoords.xy * 0.125) * invertedHTexCoordsZ; \n\
+    }\n";
+
+static const char* const qopenglslAffinePositionWithPatternBrushVertexShader_core
+                 = qopenglslPositionWithPatternBrushVertexShader_core;
+
+static const char* const qopenglslPatternBrushSrcFragmentShader_core = "\n\
+    in      vec2      patternTexCoords;\n\
+    uniform sampler2D brushTexture; \n\
+    uniform vec4      patternColor; \n\
+    vec4 srcPixel() \n\
+    { \n\
+        return patternColor * (1.0 - texture(brushTexture, patternTexCoords).r); \n\
+    }\n";
+
+
+// Linear Gradient Brush
+static const char* const qopenglslPositionWithLinearGradientBrushVertexShader_core = "\n\
+    in      vec2      vertexCoordsArray; \n\
+    in      vec3      pmvMatrix1; \n\
+    in      vec3      pmvMatrix2; \n\
+    in      vec3      pmvMatrix3; \n\
+    out     float     index; \n\
+    uniform vec2      halfViewportSize; \n\
+    uniform vec3      linearData; \n\
+    uniform mat3      brushTransform; \n\
+    void setPosition() \n\
+    { \n\
+        mat3 pmvMatrix = mat3(pmvMatrix1, pmvMatrix2, pmvMatrix3); \n\
+        vec3 transformedPos = pmvMatrix * vec3(vertexCoordsArray.xy, 1.0); \n\
+        gl_Position.xy = transformedPos.xy / transformedPos.z; \n\
+        vec2 viewportCoords = (gl_Position.xy + 1.0) * halfViewportSize; \n\
+        vec3 hTexCoords = brushTransform * vec3(viewportCoords, 1); \n\
+        float invertedHTexCoordsZ = 1.0 / hTexCoords.z; \n\
+        gl_Position = vec4(gl_Position.xy * invertedHTexCoordsZ, 0.0, invertedHTexCoordsZ); \n\
+        index = (dot(linearData.xy, hTexCoords.xy) * linearData.z) * invertedHTexCoordsZ; \n\
+    }\n";
+
+static const char* const qopenglslAffinePositionWithLinearGradientBrushVertexShader_core
+                 = qopenglslPositionWithLinearGradientBrushVertexShader_core;
+
+static const char* const qopenglslLinearGradientBrushSrcFragmentShader_core = "\n\
+    uniform sampler2D brushTexture; \n\
+    in      float     index; \n\
+    vec4 srcPixel() \n\
+    { \n\
+        vec2 val = vec2(index, 0.5); \n\
+        return texture(brushTexture, val); \n\
+    }\n";
+
+
+// Conical Gradient Brush
+static const char* const qopenglslPositionWithConicalGradientBrushVertexShader_core = "\n\
+    in      vec2      vertexCoordsArray; \n\
+    in      vec3      pmvMatrix1; \n\
+    in      vec3      pmvMatrix2; \n\
+    in      vec3      pmvMatrix3; \n\
+    out     vec2      A; \n\
+    uniform vec2      halfViewportSize; \n\
+    uniform mat3      brushTransform; \n\
+    void setPosition(void) \n\
+    { \n\
+        mat3 pmvMatrix = mat3(pmvMatrix1, pmvMatrix2, pmvMatrix3); \n\
+        vec3 transformedPos = pmvMatrix * vec3(vertexCoordsArray.xy, 1.0); \n\
+        gl_Position.xy = transformedPos.xy / transformedPos.z; \n\
+        vec2  viewportCoords = (gl_Position.xy + 1.0) * halfViewportSize; \n\
+        vec3 hTexCoords = brushTransform * vec3(viewportCoords, 1); \n\
+        float invertedHTexCoordsZ = 1.0 / hTexCoords.z; \n\
+        gl_Position = vec4(gl_Position.xy * invertedHTexCoordsZ, 0.0, invertedHTexCoordsZ); \n\
+        A = hTexCoords.xy * invertedHTexCoordsZ; \n\
+    }\n";
+
+static const char* const qopenglslAffinePositionWithConicalGradientBrushVertexShader_core
+                 = qopenglslPositionWithConicalGradientBrushVertexShader_core;
+
+static const char* const qopenglslConicalGradientBrushSrcFragmentShader_core = "\n\
+    #define INVERSE_2PI 0.1591549430918953358 \n\
+    in      vec2      A; \n\
+    uniform sampler2D brushTexture; \n\
+    uniform float     angle; \n\
+    vec4 srcPixel() \n\
+    { \n\
+        float t; \n\
+        if (abs(A.y) == abs(A.x)) \n\
+            t = (atan(-A.y + 0.002, A.x) + angle) * INVERSE_2PI; \n\
+        else \n\
+            t = (atan(-A.y, A.x) + angle) * INVERSE_2PI; \n\
+        return texture(brushTexture, vec2(t - floor(t), 0.5)); \n\
+    }\n";
+
+
+// Radial Gradient Brush
+static const char* const qopenglslPositionWithRadialGradientBrushVertexShader_core = "\n\
+    in      vec2      vertexCoordsArray;\n\
+    in      vec3      pmvMatrix1; \n\
+    in      vec3      pmvMatrix2; \n\
+    in      vec3      pmvMatrix3; \n\
+    out     float     b; \n\
+    out     vec2      A; \n\
+    uniform vec2      halfViewportSize; \n\
+    uniform mat3      brushTransform; \n\
+    uniform vec2      fmp; \n\
+    uniform vec3      bradius; \n\
+    void setPosition(void) \n\
+    {\n\
+        mat3 pmvMatrix = mat3(pmvMatrix1, pmvMatrix2, pmvMatrix3); \n\
+        vec3 transformedPos = pmvMatrix * vec3(vertexCoordsArray.xy, 1.0); \n\
+        gl_Position.xy = transformedPos.xy / transformedPos.z; \n\
+        vec2 viewportCoords = (gl_Position.xy + 1.0) * halfViewportSize; \n\
+        vec3 hTexCoords = brushTransform * vec3(viewportCoords, 1); \n\
+        float invertedHTexCoordsZ = 1.0 / hTexCoords.z; \n\
+        gl_Position = vec4(gl_Position.xy * invertedHTexCoordsZ, 0.0, invertedHTexCoordsZ); \n\
+        A = hTexCoords.xy * invertedHTexCoordsZ; \n\
+        b = bradius.x + 2.0 * dot(A, fmp); \n\
+    }\n";
+
+static const char* const qopenglslAffinePositionWithRadialGradientBrushVertexShader_core
+                 = qopenglslPositionWithRadialGradientBrushVertexShader_core;
+
+static const char* const qopenglslRadialGradientBrushSrcFragmentShader_core = "\n\
+    in      float     b; \n\
+    in      vec2      A; \n\
+    uniform sampler2D brushTexture; \n\
+    uniform float     fmp2_m_radius2; \n\
+    uniform float     inverse_2_fmp2_m_radius2; \n\
+    uniform float     sqrfr; \n\
+    uniform vec3      bradius; \n\
+    \n\
+    vec4 srcPixel() \n\
+    { \n\
+        float c = sqrfr-dot(A, A); \n\
+        float det = b*b - 4.0*fmp2_m_radius2*c; \n\
+        vec4 result = vec4(0.0); \n\
+        if (det >= 0.0) { \n\
+            float detSqrt = sqrt(det); \n\
+            float w = max((-b - detSqrt) * inverse_2_fmp2_m_radius2, (-b + detSqrt) * inverse_2_fmp2_m_radius2); \n\
+            if (bradius.y + w * bradius.z >= 0.0) \n\
+                result = texture(brushTexture, vec2(w, 0.5)); \n\
+        } \n\
+        return result; \n\
+    }\n";
+
+
+// Texture Brush
+static const char* const qopenglslPositionWithTextureBrushVertexShader_core = "\n\
+    in      vec2      vertexCoordsArray; \n\
+    in      vec3      pmvMatrix1; \n\
+    in      vec3      pmvMatrix2; \n\
+    in      vec3      pmvMatrix3; \n\
+    out     vec2      brushTextureCoords; \n\
+    uniform vec2      halfViewportSize; \n\
+    uniform vec2      invertedTextureSize; \n\
+    uniform mat3      brushTransform; \n\
+    \n\
+    void setPosition(void) \n\
+    { \n\
+        mat3 pmvMatrix = mat3(pmvMatrix1, pmvMatrix2, pmvMatrix3); \n\
+        vec3 transformedPos = pmvMatrix * vec3(vertexCoordsArray.xy, 1.0); \n\
+        gl_Position.xy = transformedPos.xy / transformedPos.z; \n\
+        vec2 viewportCoords = (gl_Position.xy + 1.0) * halfViewportSize; \n\
+        vec3 hTexCoords = brushTransform * vec3(viewportCoords, 1); \n\
+        float invertedHTexCoordsZ = 1.0 / hTexCoords.z; \n\
+        gl_Position = vec4(gl_Position.xy * invertedHTexCoordsZ, 0.0, invertedHTexCoordsZ); \n\
+        brushTextureCoords.xy = (hTexCoords.xy * invertedTextureSize) * gl_Position.w; \n\
+    }\n";
+
+static const char* const qopenglslAffinePositionWithTextureBrushVertexShader_core
+                 = qopenglslPositionWithTextureBrushVertexShader_core;
+
+static const char* const qopenglslTextureBrushSrcFragmentShader_core = "\n\
+    in      vec2      brushTextureCoords; \n\
+    uniform sampler2D brushTexture; \n\
+    vec4 srcPixel() \n\
+    { \n\
+        return texture(brushTexture, brushTextureCoords); \n\
+    }\n";
+
+static const char* const qopenglslTextureBrushSrcWithPatternFragmentShader_core = "\n\
+    in      vec2      brushTextureCoords; \n\
+    uniform vec4      patternColor; \n\
+    uniform sampler2D brushTexture; \n\
+    vec4 srcPixel() \n\
+    { \n\
+        return patternColor * (1.0 - texture(brushTexture, brushTextureCoords).r); \n\
+    }\n";
+
+// Solid Fill Brush
+static const char* const qopenglslSolidBrushSrcFragmentShader_core = "\n\
+    uniform vec4      fragmentColor; \n\
+    vec4 srcPixel() \n\
+    { \n\
+        return fragmentColor; \n\
+    }\n";
+
+static const char* const qopenglslImageSrcFragmentShader_core = "\n\
+    in      vec2      textureCoords; \n\
+    uniform sampler2D imageTexture; \n\
+    vec4 srcPixel() \n\
+    { \n\
+        return texture(imageTexture, textureCoords); \n\
+    }\n";
+
+static const char* const qopenglslCustomSrcFragmentShader_core = "\n\
+    in      vec2      textureCoords; \n\
+    uniform sampler2D imageTexture; \n\
+    vec4 srcPixel() \n\
+    { \n\
+        return customShader(imageTexture, textureCoords); \n\
+    }\n";
+
+static const char* const qopenglslImageSrcWithPatternFragmentShader_core = "\n\
+    in      vec2      textureCoords; \n\
+    uniform vec4      patternColor; \n\
+    uniform sampler2D imageTexture; \n\
+    vec4 srcPixel() \n\
+    { \n\
+        return patternColor * (1.0 - texture(imageTexture, textureCoords).r); \n\
+    }\n";
+
+static const char* const qopenglslNonPremultipliedImageSrcFragmentShader_core = "\n\
+    in      vec2      textureCoords; \n\
+    uniform sampler2D imageTexture; \n\
+    vec4 srcPixel() \n\
+    { \n\
+        vec4 sample = texture(imageTexture, textureCoords); \n\
+        sample.rgb = sample.rgb * sample.a; \n\
+        return sample; \n\
+    }\n";
+
+static const char* const qopenglslGrayscaleImageSrcFragmentShader_core = "\n\
+    in      vec2      textureCoords; \n\
+    uniform sampler2D imageTexture; \n\
+    vec4 srcPixel() \n\
+    { \n\
+        return texture(imageTexture, textureCoords).rrra; \n\
+    }\n";
+
+static const char* const qopenglslAlphaImageSrcFragmentShader_core = "\n\
+    in      vec2      textureCoords; \n\
+    uniform sampler2D imageTexture; \n\
+    vec4 srcPixel() \n\
+    { \n\
+        return vec4(0, 0, 0, texture(imageTexture, textureCoords).r); \n\
+    }\n";
+
+static const char* const qopenglslShockingPinkSrcFragmentShader_core = "\n\
+    vec4 srcPixel() \n\
+    { \n\
+        return vec4(0.98, 0.06, 0.75, 1.0); \n\
+    }\n";
+
+static const char* const qopenglslMainFragmentShader_ImageArrays_core =
+    "#version 150 core\n\
+    in      float     opacity; \n\
+    out     vec4      fragColor; \n\
+    vec4 srcPixel(); \n\
+    void main() \n\
+    { \n\
+        fragColor = srcPixel() * opacity; \n\
+    }\n";
+
+static const char* const qopenglslMainFragmentShader_MO_core =
+    "#version 150 core\n\
+    out     vec4      fragColor; \n\
+    uniform float     globalOpacity; \n\
+    vec4 srcPixel(); \n\
+    vec4 applyMask(vec4); \n\
+    void main() \n\
+    { \n\
+        fragColor = applyMask(srcPixel()*globalOpacity); \n\
+    }\n";
+
+static const char* const qopenglslMainFragmentShader_M_core =
+    "#version 150 core\n\
+    out     vec4      fragColor; \n\
+    vec4 srcPixel(); \n\
+    vec4 applyMask(vec4); \n\
+    void main() \n\
+    { \n\
+        fragColor = applyMask(srcPixel()); \n\
+    }\n";
+
+static const char* const qopenglslMainFragmentShader_O_core =
+    "#version 150 core\n\
+    out     vec4      fragColor; \n\
+    uniform float     globalOpacity; \n\
+    vec4 srcPixel(); \n\
+    void main() \n\
+    { \n\
+        fragColor = srcPixel()*globalOpacity; \n\
+    }\n";
+
+static const char* const qopenglslMainFragmentShader_core =
+    "#version 150 core\n\
+    out     vec4      fragColor; \n\
+    vec4 srcPixel(); \n\
+    void main() \n\
+    { \n\
+        fragColor = srcPixel(); \n\
+    }\n";
+
+static const char* const qopenglslMaskFragmentShader_core = "\n\
+    in      vec2      textureCoords;\n\
+    uniform sampler2D maskTexture;\n\
+    vec4 applyMask(vec4 src) \n\
+    {\n\
+        vec4 mask = texture(maskTexture, textureCoords); \n\
+        return src * mask.r; \n\
+    }\n";
+
+// For source over with subpixel antialiasing, the final color is calculated per component as follows
+// (.a is alpha component, .c is red, green or blue component):
+// alpha = src.a * mask.c * opacity
+// dest.c = dest.c * (1 - alpha) + src.c * alpha
+//
+// In the first pass, calculate: dest.c = dest.c * (1 - alpha) with blend funcs: zero, 1 - source color
+// In the second pass, calculate: dest.c = dest.c + src.c * alpha with blend funcs: one, one
+//
+// If source is a solid color (src is constant), only the first pass is needed, with blend funcs: constant, 1 - source color
+
+// For source composition with subpixel antialiasing, the final color is calculated per component as follows:
+// alpha = src.a * mask.c * opacity
+// dest.c = dest.c * (1 - mask.c) + src.c * alpha
+//
+
+static const char* const qopenglslRgbMaskFragmentShaderPass1_core = "\n\
+    in      vec2      textureCoords;\n\
+    uniform sampler2D maskTexture;\n\
+    vec4 applyMask(vec4 src) \n\
+    { \n\
+        vec4 mask = texture(maskTexture, textureCoords); \n\
+        return src.a * mask; \n\
+    }\n";
+
+static const char* const qopenglslRgbMaskFragmentShaderPass2_core = "\n\
+    in      vec2      textureCoords;\n\
+    uniform sampler2D maskTexture;\n\
+    vec4 applyMask(vec4 src) \n\
+    { \n\
+        vec4 mask = texture(maskTexture, textureCoords); \n\
+        return src * mask; \n\
+    }\n";
+
+/*
+    Left to implement:
+        RgbMaskFragmentShader_core,
+        RgbMaskWithGammaFragmentShader_core,
+*/
+
+QT_END_NAMESPACE
+
+#endif // GLGC_SHADER_SOURCE_H
diff --git a/src/opengl/qopenglframebufferobject.cpp b/src/opengl/qopenglframebufferobject.cpp
new file mode 100644
index 0000000000..d39f5b5b75
--- /dev/null
+++ b/src/opengl/qopenglframebufferobject.cpp
@@ -0,0 +1,1857 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtOpenGL module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qopenglframebufferobject.h"
+#include "qopenglframebufferobject_p.h"
+
+#include <qdebug.h>
+#include <private/qopengl_p.h>
+#include <private/qopenglcontext_p.h>
+#include <private/qopenglextensions_p.h>
+#include <private/qfont_p.h>
+
+#include <qwindow.h>
+#include <qimage.h>
+#include <QtCore/qbytearray.h>
+
+QT_BEGIN_NAMESPACE
+
+#ifndef QT_NO_DEBUG
+#define QT_RESET_GLERROR()                                \
+{                                                         \
+    while (true) {\
+        GLenum error = QOpenGLContext::currentContext()->functions()->glGetError(); \
+        if (error == GL_NO_ERROR || error == GL_CONTEXT_LOST) \
+            break; \
+    } \
+}
+#define QT_CHECK_GLERROR()                                \
+{                                                         \
+    GLenum err = QOpenGLContext::currentContext()->functions()->glGetError(); \
+    if (err != GL_NO_ERROR && err != GL_CONTEXT_LOST) {                             \
+        qDebug("[%s line %d] OpenGL Error: %d",           \
+               __FILE__, __LINE__, (int)err);             \
+    }                                                     \
+}
+#else
+#define QT_RESET_GLERROR() {}
+#define QT_CHECK_GLERROR() {}
+#endif
+
+#ifndef GL_MAX_SAMPLES
+#define GL_MAX_SAMPLES 0x8D57
+#endif
+
+#ifndef GL_RENDERBUFFER_SAMPLES
+#define GL_RENDERBUFFER_SAMPLES 0x8CAB
+#endif
+
+#ifndef GL_DEPTH24_STENCIL8
+#define GL_DEPTH24_STENCIL8 0x88F0
+#endif
+
+#ifndef GL_DEPTH_COMPONENT24
+#define GL_DEPTH_COMPONENT24 0x81A6
+#endif
+
+#ifndef GL_DEPTH_COMPONENT24_OES
+#define GL_DEPTH_COMPONENT24_OES 0x81A6
+#endif
+
+#ifndef GL_READ_FRAMEBUFFER
+#define GL_READ_FRAMEBUFFER 0x8CA8
+#endif
+
+#ifndef GL_DRAW_FRAMEBUFFER
+#define GL_DRAW_FRAMEBUFFER 0x8CA9
+#endif
+
+#ifndef GL_RGB8
+#define GL_RGB8                           0x8051
+#endif
+
+#ifndef GL_RGB10
+#define GL_RGB10                          0x8052
+#endif
+
+#ifndef GL_RGB16
+#define GL_RGB16                          0x8054
+#endif
+
+#ifndef GL_RGBA8
+#define GL_RGBA8                          0x8058
+#endif
+
+#ifndef GL_RGB10_A2
+#define GL_RGB10_A2                       0x8059
+#endif
+
+#ifndef GL_RGBA16
+#define GL_RGBA16                         0x805B
+#endif
+
+#ifndef GL_BGRA
+#define GL_BGRA                           0x80E1
+#endif
+
+#ifndef GL_UNSIGNED_INT_8_8_8_8_REV
+#define GL_UNSIGNED_INT_8_8_8_8_REV       0x8367
+#endif
+
+#ifndef GL_UNSIGNED_INT_2_10_10_10_REV
+#define GL_UNSIGNED_INT_2_10_10_10_REV    0x8368
+#endif
+
+#ifndef GL_CONTEXT_LOST
+#define GL_CONTEXT_LOST                   0x0507
+#endif
+
+#ifndef GL_DEPTH_STENCIL_ATTACHMENT
+#define GL_DEPTH_STENCIL_ATTACHMENT       0x821A
+#endif
+
+#ifndef GL_DEPTH_STENCIL
+#define GL_DEPTH_STENCIL                  0x84F9
+#endif
+
+
+
+/*!
+    \class QOpenGLFramebufferObjectFormat
+    \brief The QOpenGLFramebufferObjectFormat class specifies the format of an OpenGL
+    framebuffer object.
+    \inmodule QtOpenGL
+
+    \since 5.0
+
+    \ingroup painting-3D
+
+    A framebuffer object has several characteristics:
+    \list
+    \li \l{setSamples()}{Number of samples per pixels.}
+    \li \l{setAttachment()}{Depth and/or stencil attachments.}
+    \li \l{setTextureTarget()}{Texture target.}
+    \li \l{setInternalTextureFormat()}{Internal texture format.}
+    \endlist
+
+    Note that the desired attachments or number of samples per pixels might not
+    be supported by the hardware driver. Call QOpenGLFramebufferObject::format()
+    after creating a QOpenGLFramebufferObject to find the exact format that was
+    used to create the frame buffer object.
+
+    \sa QOpenGLFramebufferObject
+*/
+
+/*!
+    \internal
+*/
+void QOpenGLFramebufferObjectFormat::detach()
+{
+    if (d->ref.loadRelaxed() != 1) {
+        QOpenGLFramebufferObjectFormatPrivate *newd
+            = new QOpenGLFramebufferObjectFormatPrivate(d);
+        if (!d->ref.deref())
+            delete d;
+        d = newd;
+    }
+}
+
+/*!
+    Creates a QOpenGLFramebufferObjectFormat object for specifying
+    the format of an OpenGL framebuffer object.
+
+    By default the format specifies a non-multisample framebuffer object with no
+    depth/stencil attachments, texture target \c GL_TEXTURE_2D, and internal format \c GL_RGBA8.
+    On OpenGL/ES systems, the default internal format is \c GL_RGBA.
+
+    \sa samples(), attachment(), internalTextureFormat()
+*/
+
+QOpenGLFramebufferObjectFormat::QOpenGLFramebufferObjectFormat()
+{
+    d = new QOpenGLFramebufferObjectFormatPrivate;
+}
+
+/*!
+    Constructs a copy of \a other.
+*/
+
+QOpenGLFramebufferObjectFormat::QOpenGLFramebufferObjectFormat(const QOpenGLFramebufferObjectFormat &other)
+{
+    d = other.d;
+    d->ref.ref();
+}
+
+/*!
+    Assigns \a other to this object.
+*/
+
+QOpenGLFramebufferObjectFormat &QOpenGLFramebufferObjectFormat::operator=(const QOpenGLFramebufferObjectFormat &other)
+{
+    if (d != other.d) {
+        other.d->ref.ref();
+        if (!d->ref.deref())
+            delete d;
+        d = other.d;
+    }
+    return *this;
+}
+
+/*!
+    Destroys the QOpenGLFramebufferObjectFormat.
+*/
+QOpenGLFramebufferObjectFormat::~QOpenGLFramebufferObjectFormat()
+{
+    if (!d->ref.deref())
+        delete d;
+}
+
+/*!
+    Sets the number of samples per pixel for a multisample framebuffer object
+    to \a samples.  The default sample count of 0 represents a regular
+    non-multisample framebuffer object.
+
+    If the desired amount of samples per pixel is not supported by the hardware
+    then the maximum number of samples per pixel will be used. Note that
+    multisample framebuffer objects cannot be bound as textures. Also, the
+    \c{GL_EXT_framebuffer_multisample} extension is required to create a
+    framebuffer with more than one sample per pixel.
+
+    \sa samples()
+*/
+void QOpenGLFramebufferObjectFormat::setSamples(int samples)
+{
+    detach();
+    d->samples = samples;
+}
+
+/*!
+    Returns the number of samples per pixel if a framebuffer object
+    is a multisample framebuffer object. Otherwise, returns 0.
+    The default value is 0.
+
+    \sa setSamples()
+*/
+int QOpenGLFramebufferObjectFormat::samples() const
+{
+    return d->samples;
+}
+
+/*!
+    Enables mipmapping if \a enabled is true; otherwise disables it.
+
+    Mipmapping is disabled by default.
+
+    If mipmapping is enabled, additional memory will be allocated for
+    the mipmap levels. The mipmap levels can be updated by binding the
+    texture and calling glGenerateMipmap(). Mipmapping cannot be enabled
+    for multisampled framebuffer objects.
+
+    \sa mipmap(), QOpenGLFramebufferObject::texture()
+*/
+void QOpenGLFramebufferObjectFormat::setMipmap(bool enabled)
+{
+    detach();
+    d->mipmap = enabled;
+}
+
+/*!
+    Returns \c true if mipmapping is enabled.
+
+    \sa setMipmap()
+*/
+bool QOpenGLFramebufferObjectFormat::mipmap() const
+{
+    return d->mipmap;
+}
+
+/*!
+    Sets the attachment configuration of a framebuffer object to \a attachment.
+
+    \sa attachment()
+*/
+void QOpenGLFramebufferObjectFormat::setAttachment(QOpenGLFramebufferObject::Attachment attachment)
+{
+    detach();
+    d->attachment = attachment;
+}
+
+/*!
+    Returns the configuration of the depth and stencil buffers attached to
+    a framebuffer object.  The default is QOpenGLFramebufferObject::NoAttachment.
+
+    \sa setAttachment()
+*/
+QOpenGLFramebufferObject::Attachment QOpenGLFramebufferObjectFormat::attachment() const
+{
+    return d->attachment;
+}
+
+/*!
+    Sets the texture target of the texture attached to a framebuffer object to
+    \a target. Ignored for multisample framebuffer objects.
+
+    \sa textureTarget(), samples()
+*/
+void QOpenGLFramebufferObjectFormat::setTextureTarget(GLenum target)
+{
+    detach();
+    d->target = target;
+}
+
+/*!
+    Returns the texture target of the texture attached to a framebuffer object.
+    Ignored for multisample framebuffer objects.  The default is
+    \c GL_TEXTURE_2D.
+
+    \sa setTextureTarget(), samples()
+*/
+GLenum QOpenGLFramebufferObjectFormat::textureTarget() const
+{
+    return d->target;
+}
+
+/*!
+    Sets the internal format of a framebuffer object's texture or
+    multisample framebuffer object's color buffer to
+    \a internalTextureFormat.
+
+    \sa internalTextureFormat()
+*/
+void QOpenGLFramebufferObjectFormat::setInternalTextureFormat(GLenum internalTextureFormat)
+{
+    detach();
+    d->internal_format = internalTextureFormat;
+}
+
+/*!
+    Returns the internal format of a framebuffer object's texture or
+    multisample framebuffer object's color buffer.  The default is
+    \c GL_RGBA8 on desktop OpenGL systems, and \c GL_RGBA on
+    OpenGL/ES systems.
+
+    \sa setInternalTextureFormat()
+*/
+GLenum QOpenGLFramebufferObjectFormat::internalTextureFormat() const
+{
+    return d->internal_format;
+}
+
+/*!
+    Returns \c true if all the options of this framebuffer object format
+    are the same as \a other; otherwise returns \c false.
+*/
+bool QOpenGLFramebufferObjectFormat::operator==(const QOpenGLFramebufferObjectFormat& other) const
+{
+    if (d == other.d)
+        return true;
+    else
+        return d->equals(other.d);
+}
+
+/*!
+    Returns \c false if all the options of this framebuffer object format
+    are the same as \a other; otherwise returns \c true.
+*/
+bool QOpenGLFramebufferObjectFormat::operator!=(const QOpenGLFramebufferObjectFormat& other) const
+{
+    return !(*this == other);
+}
+
+bool QOpenGLFramebufferObjectPrivate::checkFramebufferStatus(QOpenGLContext *ctx) const
+{
+    if (!ctx)
+        return false;   // Context no longer exists.
+    GLenum status = ctx->functions()->glCheckFramebufferStatus(GL_FRAMEBUFFER);
+    switch(status) {
+    case GL_NO_ERROR:
+    case GL_FRAMEBUFFER_COMPLETE:
+        return true;
+    case GL_FRAMEBUFFER_UNSUPPORTED:
+        qDebug("QOpenGLFramebufferObject: Unsupported framebuffer format.");
+        break;
+    case GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT:
+        qDebug("QOpenGLFramebufferObject: Framebuffer incomplete attachment.");
+        break;
+    case GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT:
+        qDebug("QOpenGLFramebufferObject: Framebuffer incomplete, missing attachment.");
+        break;
+#ifdef GL_FRAMEBUFFER_INCOMPLETE_DUPLICATE_ATTACHMENT
+    case GL_FRAMEBUFFER_INCOMPLETE_DUPLICATE_ATTACHMENT:
+        qDebug("QOpenGLFramebufferObject: Framebuffer incomplete, duplicate attachment.");
+        break;
+#endif
+#ifdef GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS
+    case GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS:
+        qDebug("QOpenGLFramebufferObject: Framebuffer incomplete, attached images must have same dimensions.");
+        break;
+#endif
+#ifdef GL_FRAMEBUFFER_INCOMPLETE_FORMATS
+    case GL_FRAMEBUFFER_INCOMPLETE_FORMATS:
+        qDebug("QOpenGLFramebufferObject: Framebuffer incomplete, attached images must have same format.");
+        break;
+#endif
+#ifdef GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER
+    case GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER:
+        qDebug("QOpenGLFramebufferObject: Framebuffer incomplete, missing draw buffer.");
+        break;
+#endif
+#ifdef GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER
+    case GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER:
+        qDebug("QOpenGLFramebufferObject: Framebuffer incomplete, missing read buffer.");
+        break;
+#endif
+#ifdef GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE
+    case GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE:
+        qDebug("QOpenGLFramebufferObject: Framebuffer incomplete, attachments must have same number of samples per pixel.");
+        break;
+#endif
+    default:
+        qDebug() <<"QOpenGLFramebufferObject: An undefined error has occurred: "<< status;
+        break;
+    }
+    return false;
+}
+
+namespace
+{
+    void freeFramebufferFunc(QOpenGLFunctions *funcs, GLuint id)
+    {
+        funcs->glDeleteFramebuffers(1, &id);
+    }
+
+    void freeRenderbufferFunc(QOpenGLFunctions *funcs, GLuint id)
+    {
+        funcs->glDeleteRenderbuffers(1, &id);
+    }
+
+    void freeTextureFunc(QOpenGLFunctions *funcs, GLuint id)
+    {
+        funcs->glDeleteTextures(1, &id);
+    }
+}
+
+void QOpenGLFramebufferObjectPrivate::init(QOpenGLFramebufferObject *, const QSize &size,
+                                           QOpenGLFramebufferObject::Attachment attachment,
+                                           GLenum texture_target, GLenum internal_format,
+                                           GLint samples, bool mipmap)
+{
+    QOpenGLContext *ctx = QOpenGLContext::currentContext();
+
+    funcs.initializeOpenGLFunctions();
+
+    if (!funcs.hasOpenGLFeature(QOpenGLFunctions::Framebuffers))
+        return;
+
+    // Fall back to using a normal non-msaa FBO if we don't have support for MSAA
+    if (!funcs.hasOpenGLExtension(QOpenGLExtensions::FramebufferMultisample)
+            || !funcs.hasOpenGLExtension(QOpenGLExtensions::FramebufferBlit)) {
+        samples = 0;
+    } else if (!ctx->isOpenGLES() || ctx->format().majorVersion() >= 3) {
+        GLint maxSamples;
+        funcs.glGetIntegerv(GL_MAX_SAMPLES, &maxSamples);
+        samples = qBound(0, int(samples), int(maxSamples));
+    }
+
+    colorAttachments.append(ColorAttachment(size, internal_format));
+
+    dsSize = size;
+
+    samples = qMax(0, samples);
+    requestedSamples = samples;
+
+    target = texture_target;
+
+    QT_RESET_GLERROR(); // reset error state
+    GLuint fbo = 0;
+
+    funcs.glGenFramebuffers(1, &fbo);
+    funcs.glBindFramebuffer(GL_FRAMEBUFFER, fbo);
+
+    QOpenGLContextPrivate::get(ctx)->qgl_current_fbo_invalid = true;
+
+    QT_CHECK_GLERROR();
+
+    format.setTextureTarget(target);
+    format.setInternalTextureFormat(internal_format);
+    format.setMipmap(mipmap);
+
+    if (samples == 0)
+        initTexture(0);
+    else
+        initColorBuffer(0, &samples);
+
+    format.setSamples(int(samples));
+
+    initDepthStencilAttachments(ctx, attachment);
+
+    if (valid)
+        fbo_guard = new QOpenGLSharedResourceGuard(ctx, fbo, freeFramebufferFunc);
+    else
+        funcs.glDeleteFramebuffers(1, &fbo);
+
+    QT_CHECK_GLERROR();
+}
+
+void QOpenGLFramebufferObjectPrivate::initTexture(int idx)
+{
+    QOpenGLContext *ctx = QOpenGLContext::currentContext();
+    GLuint texture = 0;
+
+    funcs.glGenTextures(1, &texture);
+    funcs.glBindTexture(target, texture);
+
+    funcs.glTexParameteri(target, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+    funcs.glTexParameteri(target, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+    funcs.glTexParameteri(target, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+    funcs.glTexParameteri(target, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+
+    ColorAttachment &color(colorAttachments[idx]);
+
+    GLuint pixelType = GL_UNSIGNED_BYTE;
+    if (color.internalFormat == GL_RGB10_A2 || color.internalFormat == GL_RGB10)
+        pixelType = GL_UNSIGNED_INT_2_10_10_10_REV;
+    else if (color.internalFormat == GL_RGB16  || color.internalFormat == GL_RGBA16)
+        pixelType = GL_UNSIGNED_SHORT;
+
+    funcs.glTexImage2D(target, 0, color.internalFormat, color.size.width(), color.size.height(), 0,
+                       GL_RGBA, pixelType, nullptr);
+    if (format.mipmap()) {
+        int width = color.size.width();
+        int height = color.size.height();
+        int level = 0;
+        while (width > 1 || height > 1) {
+            width = qMax(1, width >> 1);
+            height = qMax(1, height >> 1);
+            ++level;
+            funcs.glTexImage2D(target, level, color.internalFormat, width, height, 0,
+                               GL_RGBA, pixelType, nullptr);
+        }
+    }
+    funcs.glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0 + idx,
+                                 target, texture, 0);
+
+    QT_CHECK_GLERROR();
+    funcs.glBindTexture(target, 0);
+    valid = checkFramebufferStatus(ctx);
+    if (valid) {
+        color.guard = new QOpenGLSharedResourceGuard(ctx, texture, freeTextureFunc);
+    } else {
+        funcs.glDeleteTextures(1, &texture);
+    }
+}
+
+void QOpenGLFramebufferObjectPrivate::initColorBuffer(int idx, GLint *samples)
+{
+    QOpenGLContext *ctx = QOpenGLContext::currentContext();
+    GLuint color_buffer = 0;
+
+    ColorAttachment &color(colorAttachments[idx]);
+
+    GLenum storageFormat = color.internalFormat;
+    // ES requires a sized format. The older desktop extension does not. Correct the format on ES.
+    if (ctx->isOpenGLES()) {
+        if (color.internalFormat == GL_RGBA) {
+            if (funcs.hasOpenGLExtension(QOpenGLExtensions::Sized8Formats))
+                storageFormat = GL_RGBA8;
+            else
+                storageFormat = GL_RGBA4;
+        } else if (color.internalFormat == GL_RGB10) {
+            // GL_RGB10 is not allowed in ES for glRenderbufferStorage.
+            storageFormat = GL_RGB10_A2;
+        }
+    }
+
+    funcs.glGenRenderbuffers(1, &color_buffer);
+    funcs.glBindRenderbuffer(GL_RENDERBUFFER, color_buffer);
+    funcs.glRenderbufferStorageMultisample(GL_RENDERBUFFER, *samples, storageFormat, color.size.width(), color.size.height());
+    funcs.glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0 + idx,
+                                    GL_RENDERBUFFER, color_buffer);
+
+    QT_CHECK_GLERROR();
+    valid = checkFramebufferStatus(ctx);
+    if (valid) {
+        // Query the actual number of samples. This can be greater than the requested
+        // value since the typically supported values are 0, 4, 8, ..., and the
+        // requests are mapped to the next supported value.
+        funcs.glGetRenderbufferParameteriv(GL_RENDERBUFFER, GL_RENDERBUFFER_SAMPLES, samples);
+        color.guard = new QOpenGLSharedResourceGuard(ctx, color_buffer, freeRenderbufferFunc);
+    } else {
+        funcs.glDeleteRenderbuffers(1, &color_buffer);
+    }
+}
+
+void QOpenGLFramebufferObjectPrivate::initDepthStencilAttachments(QOpenGLContext *ctx,
+                                                                  QOpenGLFramebufferObject::Attachment attachment)
+{
+    // Use the same sample count for all attachments. format.samples() already contains
+    // the actual number of samples for the color attachment and is not suitable. Use
+    // requestedSamples instead.
+    const int samples = requestedSamples;
+
+    // free existing attachments
+    if (depth_buffer_guard) {
+#ifdef Q_OS_WASM
+        funcs.glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_STENCIL_ATTACHMENT, GL_RENDERBUFFER, 0);
+#else
+        funcs.glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_RENDERBUFFER, 0);
+#endif
+        depth_buffer_guard->free();
+    }
+    if (stencil_buffer_guard) {
+        funcs.glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_STENCIL_ATTACHMENT, GL_RENDERBUFFER, 0);
+        if (stencil_buffer_guard != depth_buffer_guard)
+            stencil_buffer_guard->free();
+    }
+
+    depth_buffer_guard = nullptr;
+    stencil_buffer_guard = nullptr;
+
+    GLuint depth_buffer = 0;
+    GLuint stencil_buffer = 0;
+
+    // In practice, a combined depth-stencil buffer is supported by all desktop platforms, while a
+    // separate stencil buffer is not. On embedded devices however, a combined depth-stencil buffer
+    // might not be supported while separate buffers are, according to QTBUG-12861.
+#ifdef Q_OS_WASM
+    // WebGL doesn't allow separately attach buffers to
+    // STENCIL_ATTACHMENT and DEPTH_ATTACHMENT
+    // QTBUG-69913
+    if (attachment == QOpenGLFramebufferObject::CombinedDepthStencil) {
+        funcs.glGenRenderbuffers(1, &depth_buffer);
+        funcs.glBindRenderbuffer(GL_RENDERBUFFER, depth_buffer);
+        Q_ASSERT(funcs.glIsRenderbuffer(depth_buffer));
+
+        if (samples != 0 ) {
+            funcs.glRenderbufferStorageMultisample(GL_RENDERBUFFER, samples,
+                                                   GL_DEPTH24_STENCIL8, dsSize.width(), dsSize.height());
+        } else {
+            funcs.glRenderbufferStorage(GL_RENDERBUFFER, GL_DEPTH_STENCIL,
+                                        dsSize.width(), dsSize.height());
+        }
+
+        funcs.glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_STENCIL_ATTACHMENT,
+                                        GL_RENDERBUFFER, depth_buffer);
+
+        valid = checkFramebufferStatus(ctx);
+        if (!valid) {
+            funcs.glDeleteRenderbuffers(1, &depth_buffer);
+            depth_buffer = 0;
+        }
+    }
+#else
+    if (attachment == QOpenGLFramebufferObject::CombinedDepthStencil
+        && funcs.hasOpenGLExtension(QOpenGLExtensions::PackedDepthStencil))
+    {
+        // depth and stencil buffer needs another extension
+        funcs.glGenRenderbuffers(1, &depth_buffer);
+        funcs.glBindRenderbuffer(GL_RENDERBUFFER, depth_buffer);
+        Q_ASSERT(funcs.glIsRenderbuffer(depth_buffer));
+        if (samples != 0 && funcs.hasOpenGLExtension(QOpenGLExtensions::FramebufferMultisample))
+            funcs.glRenderbufferStorageMultisample(GL_RENDERBUFFER, samples,
+                GL_DEPTH24_STENCIL8, dsSize.width(), dsSize.height());
+        else
+            funcs.glRenderbufferStorage(GL_RENDERBUFFER,
+                GL_DEPTH24_STENCIL8, dsSize.width(), dsSize.height());
+
+        stencil_buffer = depth_buffer;
+        funcs.glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT,
+                                     GL_RENDERBUFFER, depth_buffer);
+        funcs.glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_STENCIL_ATTACHMENT,
+                                     GL_RENDERBUFFER, stencil_buffer);
+
+        valid = checkFramebufferStatus(ctx);
+        if (!valid) {
+            funcs.glDeleteRenderbuffers(1, &depth_buffer);
+            stencil_buffer = depth_buffer = 0;
+        }
+    }
+
+    if (depth_buffer == 0 && (attachment == QOpenGLFramebufferObject::CombinedDepthStencil
+        || (attachment == QOpenGLFramebufferObject::Depth)))
+    {
+        funcs.glGenRenderbuffers(1, &depth_buffer);
+        funcs.glBindRenderbuffer(GL_RENDERBUFFER, depth_buffer);
+        Q_ASSERT(funcs.glIsRenderbuffer(depth_buffer));
+        if (samples != 0 && funcs.hasOpenGLExtension(QOpenGLExtensions::FramebufferMultisample)) {
+            if (ctx->isOpenGLES()) {
+                if (funcs.hasOpenGLExtension(QOpenGLExtensions::Depth24))
+                    funcs.glRenderbufferStorageMultisample(GL_RENDERBUFFER, samples,
+                                                           GL_DEPTH_COMPONENT24, dsSize.width(), dsSize.height());
+                else
+                    funcs.glRenderbufferStorageMultisample(GL_RENDERBUFFER, samples,
+                                                           GL_DEPTH_COMPONENT16, dsSize.width(), dsSize.height());
+            } else {
+                funcs.glRenderbufferStorageMultisample(GL_RENDERBUFFER, samples,
+                                                       GL_DEPTH_COMPONENT, dsSize.width(), dsSize.height());
+            }
+        } else {
+            if (ctx->isOpenGLES()) {
+                if (funcs.hasOpenGLExtension(QOpenGLExtensions::Depth24)) {
+                    funcs.glRenderbufferStorage(GL_RENDERBUFFER, GL_DEPTH_COMPONENT24,
+                                                dsSize.width(), dsSize.height());
+                } else {
+                    funcs.glRenderbufferStorage(GL_RENDERBUFFER, GL_DEPTH_COMPONENT16,
+                                                dsSize.width(), dsSize.height());
+                }
+            } else {
+                funcs.glRenderbufferStorage(GL_RENDERBUFFER, GL_DEPTH_COMPONENT, dsSize.width(), dsSize.height());
+            }
+        }
+        funcs.glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT,
+                                     GL_RENDERBUFFER, depth_buffer);
+        valid = checkFramebufferStatus(ctx);
+        if (!valid) {
+            funcs.glDeleteRenderbuffers(1, &depth_buffer);
+            depth_buffer = 0;
+        }
+    }
+
+    if (stencil_buffer == 0 && (attachment == QOpenGLFramebufferObject::CombinedDepthStencil)) {
+        funcs.glGenRenderbuffers(1, &stencil_buffer);
+        funcs.glBindRenderbuffer(GL_RENDERBUFFER, stencil_buffer);
+        Q_ASSERT(funcs.glIsRenderbuffer(stencil_buffer));
+
+#ifdef QT_OPENGL_ES
+        GLenum storage = GL_STENCIL_INDEX8;
+#else
+        GLenum storage = ctx->isOpenGLES() ? GL_STENCIL_INDEX8 : GL_STENCIL_INDEX;
+#endif
+
+        if (samples != 0 && funcs.hasOpenGLExtension(QOpenGLExtensions::FramebufferMultisample))
+            funcs.glRenderbufferStorageMultisample(GL_RENDERBUFFER, samples, storage, dsSize.width(), dsSize.height());
+        else
+            funcs.glRenderbufferStorage(GL_RENDERBUFFER, storage, dsSize.width(), dsSize.height());
+
+        funcs.glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_STENCIL_ATTACHMENT,
+                                  GL_RENDERBUFFER, stencil_buffer);
+        valid = checkFramebufferStatus(ctx);
+        if (!valid) {
+            funcs.glDeleteRenderbuffers(1, &stencil_buffer);
+            stencil_buffer = 0;
+        }
+    }
+#endif //Q_OS_WASM
+
+    // The FBO might have become valid after removing the depth or stencil buffer.
+    valid = checkFramebufferStatus(ctx);
+
+#ifdef Q_OS_WASM
+    if (depth_buffer) {
+#else
+    if (depth_buffer && stencil_buffer) {
+#endif
+        fbo_attachment = QOpenGLFramebufferObject::CombinedDepthStencil;
+    } else if (depth_buffer) {
+        fbo_attachment = QOpenGLFramebufferObject::Depth;
+    } else {
+        fbo_attachment = QOpenGLFramebufferObject::NoAttachment;
+    }
+
+    if (valid) {
+        if (depth_buffer)
+            depth_buffer_guard = new QOpenGLSharedResourceGuard(ctx, depth_buffer, freeRenderbufferFunc);
+        if (stencil_buffer) {
+            if (stencil_buffer == depth_buffer)
+                stencil_buffer_guard = depth_buffer_guard;
+            else
+                stencil_buffer_guard = new QOpenGLSharedResourceGuard(ctx, stencil_buffer, freeRenderbufferFunc);
+        }
+    } else {
+        if (depth_buffer)
+            funcs.glDeleteRenderbuffers(1, &depth_buffer);
+        if (stencil_buffer && depth_buffer != stencil_buffer)
+            funcs.glDeleteRenderbuffers(1, &stencil_buffer);
+    }
+    QT_CHECK_GLERROR();
+
+    format.setAttachment(fbo_attachment);
+}
+
+/*!
+    \class QOpenGLFramebufferObject
+    \brief The QOpenGLFramebufferObject class encapsulates an OpenGL framebuffer object.
+    \since 5.0
+    \inmodule QtOpenGL
+
+    \ingroup painting-3D
+
+    The QOpenGLFramebufferObject class encapsulates an OpenGL framebuffer
+    object, defined by the \c{GL_EXT_framebuffer_object} extension. It provides
+    a rendering surface that can be painted on with a QPainter with the help of
+    QOpenGLPaintDevice, or rendered to using native OpenGL calls. This surface
+    can be bound and used as a regular texture in your own OpenGL drawing code.
+    By default, the QOpenGLFramebufferObject class generates a 2D OpenGL
+    texture (using the \c{GL_TEXTURE_2D} target), which is used as the internal
+    rendering target.
+
+    \b{It is important to have a current OpenGL context when creating a
+    QOpenGLFramebufferObject, otherwise initialization will fail.}
+
+    Create the QOpenGLFrameBufferObject instance with the CombinedDepthStencil
+    attachment if you want QPainter to render correctly. Note that you need to
+    create a QOpenGLFramebufferObject with more than one sample per pixel for
+    primitives to be antialiased when drawing using a QPainter. To create a
+    multisample framebuffer object you should use one of the constructors that
+    take a QOpenGLFramebufferObjectFormat parameter, and set the
+    QOpenGLFramebufferObjectFormat::samples() property to a non-zero value.
+
+    For multisample framebuffer objects a color render buffer is created,
+    otherwise a texture with the specified texture target is created.
+    The color render buffer or texture will have the specified internal
+    format, and will be bound to the \c GL_COLOR_ATTACHMENT0
+    attachment in the framebuffer object.
+
+    Multiple render targets are also supported, in case the OpenGL
+    implementation supports this. Here there will be multiple textures (or, in
+    case of multisampling, renderbuffers) present and each of them will get
+    attached to \c GL_COLOR_ATTACHMENT0, \c 1, \c 2, ...
+
+    If you want to use a framebuffer object with multisampling enabled
+    as a texture, you first need to copy from it to a regular framebuffer
+    object using QOpenGLContext::blitFramebuffer().
+
+    It is possible to draw into a QOpenGLFramebufferObject using QPainter and
+    QOpenGLPaintDevice in a separate thread.
+*/
+
+
+/*!
+    \enum QOpenGLFramebufferObject::Attachment
+
+    This enum type is used to configure the depth and stencil buffers
+    attached to the framebuffer object when it is created.
+
+    \value NoAttachment         No attachment is added to the framebuffer object. Note that the
+                                OpenGL depth and stencil tests won't work when rendering to a
+                                framebuffer object without any depth or stencil buffers.
+                                This is the default value.
+
+    \value CombinedDepthStencil If the \c GL_EXT_packed_depth_stencil extension is present,
+                                a combined depth and stencil buffer is attached.
+                                If the extension is not present, only a depth buffer is attached.
+
+    \value Depth                A depth buffer is attached to the framebuffer object.
+
+    \sa attachment()
+*/
+
+static inline GLenum effectiveInternalFormat(GLenum internalFormat)
+{
+    if (!internalFormat)
+#ifdef QT_OPENGL_ES_2
+        internalFormat = GL_RGBA;
+#else
+        internalFormat = QOpenGLContext::currentContext()->isOpenGLES() ? GL_RGBA : GL_RGBA8;
+#endif
+    return internalFormat;
+}
+
+/*!
+
+    Constructs an OpenGL framebuffer object and binds a 2D OpenGL texture
+    to the buffer of the size \a size. The texture is bound to the
+    \c GL_COLOR_ATTACHMENT0 target in the framebuffer object.
+
+    The \a target parameter is used to specify the OpenGL texture
+    target. The default target is \c GL_TEXTURE_2D. Keep in mind that
+    \c GL_TEXTURE_2D textures must have a power of 2 width and height
+    (e.g. 256x512), unless you are using OpenGL 2.0 or higher.
+
+    By default, no depth and stencil buffers are attached. This behavior
+    can be toggled using one of the overloaded constructors.
+
+    The default internal texture format is \c GL_RGBA8 for desktop
+    OpenGL, and \c GL_RGBA for OpenGL/ES.
+
+    It is important that you have a current OpenGL context set when
+    creating the QOpenGLFramebufferObject, otherwise the initialization
+    will fail.
+
+    \sa size(), texture(), attachment()
+*/
+
+QOpenGLFramebufferObject::QOpenGLFramebufferObject(const QSize &size, GLenum target)
+    : d_ptr(new QOpenGLFramebufferObjectPrivate)
+{
+    Q_D(QOpenGLFramebufferObject);
+    d->init(this, size, NoAttachment, target, effectiveInternalFormat(0));
+}
+
+/*!
+
+    Constructs an OpenGL framebuffer object and binds a 2D OpenGL texture
+    to the buffer of the given \a width and \a height.
+
+    \sa size(), texture()
+*/
+QOpenGLFramebufferObject::QOpenGLFramebufferObject(int width, int height, GLenum target)
+    : QOpenGLFramebufferObject(QSize(width, height), target)
+{
+}
+
+/*!
+
+    Constructs an OpenGL framebuffer object of the given \a size based on the
+    supplied \a format.
+*/
+
+QOpenGLFramebufferObject::QOpenGLFramebufferObject(const QSize &size, const QOpenGLFramebufferObjectFormat &format)
+    : d_ptr(new QOpenGLFramebufferObjectPrivate)
+{
+    Q_D(QOpenGLFramebufferObject);
+    d->init(this, size, format.attachment(), format.textureTarget(), format.internalTextureFormat(),
+            format.samples(), format.mipmap());
+}
+
+/*!
+
+    Constructs an OpenGL framebuffer object of the given \a width and \a height
+    based on the supplied \a format.
+*/
+
+QOpenGLFramebufferObject::QOpenGLFramebufferObject(int width, int height, const QOpenGLFramebufferObjectFormat &format)
+    : QOpenGLFramebufferObject(QSize(width, height), format)
+{
+}
+
+/*!
+
+    Constructs an OpenGL framebuffer object and binds a texture to the
+    buffer of the given \a width and \a height.
+
+    The \a attachment parameter describes the depth/stencil buffer
+    configuration, \a target the texture target and \a internalFormat
+    the internal texture format. The default texture target is \c
+    GL_TEXTURE_2D, while the default internal format is \c GL_RGBA8
+    for desktop OpenGL and \c GL_RGBA for OpenGL/ES.
+
+    \sa size(), texture(), attachment()
+*/
+QOpenGLFramebufferObject::QOpenGLFramebufferObject(int width, int height, Attachment attachment,
+                                           GLenum target, GLenum internalFormat)
+    : d_ptr(new QOpenGLFramebufferObjectPrivate)
+{
+    Q_D(QOpenGLFramebufferObject);
+    d->init(this, QSize(width, height), attachment, target, effectiveInternalFormat(internalFormat));
+}
+
+/*!
+
+    Constructs an OpenGL framebuffer object and binds a texture to the
+    buffer of the given \a size.
+
+    The \a attachment parameter describes the depth/stencil buffer
+    configuration, \a target the texture target and \a internalFormat
+    the internal texture format. The default texture target is \c
+    GL_TEXTURE_2D, while the default internal format is \c GL_RGBA8
+    for desktop OpenGL and \c GL_RGBA for OpenGL/ES.
+
+    \sa size(), texture(), attachment()
+*/
+QOpenGLFramebufferObject::QOpenGLFramebufferObject(const QSize &size, Attachment attachment,
+                                           GLenum target, GLenum internalFormat)
+    : d_ptr(new QOpenGLFramebufferObjectPrivate)
+{
+    Q_D(QOpenGLFramebufferObject);
+    d->init(this, size, attachment, target, effectiveInternalFormat(internalFormat));
+}
+
+/*!
+
+    Destroys the framebuffer object and frees any allocated resources.
+*/
+QOpenGLFramebufferObject::~QOpenGLFramebufferObject()
+{
+    Q_D(QOpenGLFramebufferObject);
+    if (isBound())
+        release();
+
+    for (const auto &color : qAsConst(d->colorAttachments)) {
+        if (color.guard)
+            color.guard->free();
+    }
+    d->colorAttachments.clear();
+
+    if (d->depth_buffer_guard)
+        d->depth_buffer_guard->free();
+    if (d->stencil_buffer_guard && d->stencil_buffer_guard != d->depth_buffer_guard)
+        d->stencil_buffer_guard->free();
+    if (d->fbo_guard)
+        d->fbo_guard->free();
+
+    QOpenGLContextPrivate *contextPrv = QOpenGLContextPrivate::get(QOpenGLContext::currentContext());
+    if (contextPrv && contextPrv->qgl_current_fbo == this) {
+        contextPrv->qgl_current_fbo_invalid = true;
+        contextPrv->qgl_current_fbo = nullptr;
+    }
+}
+
+/*!
+    Creates and attaches an additional texture or renderbuffer of \a size width
+    and height.
+
+    There is always an attachment at GL_COLOR_ATTACHMENT0. Call this function
+    to set up additional attachments at GL_COLOR_ATTACHMENT1,
+    GL_COLOR_ATTACHMENT2, ...
+
+    When \a internalFormat is not \c 0, it specifies the internal format of the
+    texture or renderbuffer. Otherwise a default of GL_RGBA or GL_RGBA8 is
+    used.
+
+    \note This is only functional when multiple render targets are supported by
+    the OpenGL implementation. When that is not the case, the function will not
+    add any additional color attachments. Call
+    QOpenGLFunctions::hasOpenGLFeature() with
+    QOpenGLFunctions::MultipleRenderTargets at runtime to check if MRT is
+    supported.
+
+    \note The internal format of the color attachments may differ but there may
+    be limitations on the supported combinations, depending on the drivers.
+
+    \note The size of the color attachments may differ but rendering is limited
+    to the area that fits all the attachments, according to the OpenGL
+    specification. Some drivers may not be fully conformant in this respect,
+    however.
+
+    \since 5.6
+ */
+void QOpenGLFramebufferObject::addColorAttachment(const QSize &size, GLenum internalFormat)
+{
+    Q_D(QOpenGLFramebufferObject);
+
+    if (!QOpenGLContext::currentContext()->functions()->hasOpenGLFeature(QOpenGLFunctions::MultipleRenderTargets)) {
+        qWarning("Multiple render targets not supported, ignoring extra color attachment request");
+        return;
+    }
+
+    QOpenGLFramebufferObjectPrivate::ColorAttachment color(size, effectiveInternalFormat(internalFormat));
+    d->colorAttachments.append(color);
+    const int idx = d->colorAttachments.count() - 1;
+
+    if (d->requestedSamples == 0) {
+        d->initTexture(idx);
+    } else {
+        GLint samples = d->requestedSamples;
+        d->initColorBuffer(idx, &samples);
+    }
+}
+
+/*! \overload
+
+    Creates and attaches an additional texture or renderbuffer of size \a width and \a height.
+
+    When \a internalFormat is not \c 0, it specifies the internal format of the texture or
+    renderbuffer. Otherwise a default of GL_RGBA or GL_RGBA8 is used.
+
+    \since 5.6
+ */
+void QOpenGLFramebufferObject::addColorAttachment(int width, int height, GLenum internalFormat)
+{
+    addColorAttachment(QSize(width, height), internalFormat);
+}
+
+/*!
+    \fn bool QOpenGLFramebufferObject::isValid() const
+
+    Returns \c true if the framebuffer object is valid.
+
+    The framebuffer can become invalid if the initialization process
+    fails, the user attaches an invalid buffer to the framebuffer
+    object, or a non-power of two width/height is specified as the
+    texture size if the texture target is \c{GL_TEXTURE_2D}.
+    The non-power of two limitation does not apply if the OpenGL version
+    is 2.0 or higher, or if the GL_ARB_texture_non_power_of_two extension
+    is present.
+
+    The framebuffer can also become invalid if the QOpenGLContext that
+    the framebuffer was created within is destroyed and there are
+    no other shared contexts that can take over ownership of the
+    framebuffer.
+*/
+bool QOpenGLFramebufferObject::isValid() const
+{
+    Q_D(const QOpenGLFramebufferObject);
+    return d->valid && d->fbo_guard && d->fbo_guard->id();
+}
+
+/*!
+    \fn bool QOpenGLFramebufferObject::bind()
+
+    Switches rendering from the default, windowing system provided
+    framebuffer to this framebuffer object.
+    Returns \c true upon success, false otherwise.
+
+    \note If takeTexture() was called, a new texture is created and associated
+    with the framebuffer object. This is potentially expensive and changes the
+    context state (the currently bound texture).
+
+    \sa release()
+*/
+bool QOpenGLFramebufferObject::bind()
+{
+    if (!isValid())
+        return false;
+    Q_D(QOpenGLFramebufferObject);
+    QOpenGLContext *current = QOpenGLContext::currentContext();
+    if (!current)
+        return false;
+#ifdef QT_DEBUG
+    if (current->shareGroup() != d->fbo_guard->group())
+        qWarning("QOpenGLFramebufferObject::bind() called from incompatible context");
+#endif
+
+    d->funcs.glBindFramebuffer(GL_FRAMEBUFFER, d->fbo());
+
+    QOpenGLContextPrivate::get(current)->qgl_current_fbo_invalid = true;
+    QOpenGLContextPrivate::get(current)->qgl_current_fbo = this;
+
+    if (d->format.samples() == 0) {
+        // Create new textures to replace the ones stolen via takeTexture().
+        for (int i = 0; i < d->colorAttachments.count(); ++i) {
+            if (!d->colorAttachments.at(i).guard)
+                d->initTexture(i);
+        }
+    }
+
+    return d->valid;
+}
+
+/*!
+    \fn bool QOpenGLFramebufferObject::release()
+
+    Switches rendering back to the default, windowing system provided
+    framebuffer.
+    Returns \c true upon success, false otherwise.
+
+    \sa bind()
+*/
+bool QOpenGLFramebufferObject::release()
+{
+    if (!isValid())
+        return false;
+
+    QOpenGLContext *current = QOpenGLContext::currentContext();
+    if (!current)
+        return false;
+
+    Q_D(QOpenGLFramebufferObject);
+#ifdef QT_DEBUG
+    if (current->shareGroup() != d->fbo_guard->group())
+        qWarning("QOpenGLFramebufferObject::release() called from incompatible context");
+#endif
+
+    if (current) {
+        d->funcs.glBindFramebuffer(GL_FRAMEBUFFER, current->defaultFramebufferObject());
+
+        QOpenGLContextPrivate *contextPrv = QOpenGLContextPrivate::get(current);
+        contextPrv->qgl_current_fbo_invalid = true;
+        contextPrv->qgl_current_fbo = nullptr;
+    }
+
+    return true;
+}
+
+/*!
+    \fn GLuint QOpenGLFramebufferObject::texture() const
+
+    Returns the texture id for the texture attached as the default
+    rendering target in this framebuffer object. This texture id can
+    be bound as a normal texture in your own OpenGL code.
+
+    If a multisample framebuffer object is used then the value returned
+    from this function will be invalid.
+
+    When multiple textures are attached, the return value is the ID of
+    the first one.
+
+    \sa takeTexture(), textures()
+*/
+GLuint QOpenGLFramebufferObject::texture() const
+{
+    Q_D(const QOpenGLFramebufferObject);
+    return d->colorAttachments[0].guard ? d->colorAttachments[0].guard->id() : 0;
+}
+
+/*!
+    Returns the texture id for all attached textures.
+
+    If a multisample framebuffer object is used, then an empty vector is returned.
+
+    \since 5.6
+
+    \sa takeTexture(), texture()
+*/
+QVector<GLuint> QOpenGLFramebufferObject::textures() const
+{
+    Q_D(const QOpenGLFramebufferObject);
+    QVector<GLuint> ids;
+    if (d->format.samples() != 0)
+        return ids;
+    ids.reserve(d->colorAttachments.count());
+    for (const auto &color : d->colorAttachments)
+        ids.append(color.guard ? color.guard->id() : 0);
+    return ids;
+}
+
+/*!
+   \fn GLuint QOpenGLFramebufferObject::takeTexture()
+
+   Returns the texture id for the texture attached to this framebuffer
+   object. The ownership of the texture is transferred to the caller.
+
+   If the framebuffer object is currently bound, an implicit release()
+   will be done. During the next call to bind() a new texture will be
+   created.
+
+   If a multisample framebuffer object is used, then there is no
+   texture and the return value from this function will be invalid.
+   Similarly, incomplete framebuffer objects will also return 0.
+
+   \since 5.3
+
+   \sa texture(), bind(), release()
+ */
+GLuint QOpenGLFramebufferObject::takeTexture()
+{
+    return takeTexture(0);
+}
+
+/*! \overload
+
+   Returns the texture id for the texture attached to the color attachment of
+   index \a colorAttachmentIndex of this framebuffer object. The ownership of
+   the texture is transferred to the caller.
+
+   When \a colorAttachmentIndex is \c 0, the behavior is identical to the
+   parameter-less variant of this function.
+
+   If the framebuffer object is currently bound, an implicit release()
+   will be done. During the next call to bind() a new texture will be
+   created.
+
+   If a multisample framebuffer object is used, then there is no
+   texture and the return value from this function will be invalid.
+   Similarly, incomplete framebuffer objects will also return 0.
+
+   \since 5.6
+ */
+GLuint QOpenGLFramebufferObject::takeTexture(int colorAttachmentIndex)
+{
+    Q_D(QOpenGLFramebufferObject);
+    GLuint id = 0;
+    if (isValid() && d->format.samples() == 0 && d->colorAttachments.count() > colorAttachmentIndex) {
+        QOpenGLContext *current = QOpenGLContext::currentContext();
+        if (current && current->shareGroup() == d->fbo_guard->group() && isBound())
+            release();
+        auto &guard = d->colorAttachments[colorAttachmentIndex].guard;
+        id = guard ? guard->id() : 0;
+        // Do not call free() on texture_guard, just null it out.
+        // This way the texture will not be deleted when the guard is destroyed.
+        guard = nullptr;
+    }
+    return id;
+}
+
+/*!
+    \return the size of the color and depth/stencil attachments attached to
+    this framebuffer object.
+*/
+QSize QOpenGLFramebufferObject::size() const
+{
+    Q_D(const QOpenGLFramebufferObject);
+    return d->dsSize;
+}
+
+/*!
+    \return the sizes of all color attachments attached to this framebuffer
+    object.
+
+    \since 5.6
+*/
+QVector<QSize> QOpenGLFramebufferObject::sizes() const
+{
+    Q_D(const QOpenGLFramebufferObject);
+    QVector<QSize> sz;
+    sz.reserve(d->colorAttachments.size());
+    for (const auto &color : d->colorAttachments)
+        sz.append(color.size);
+    return sz;
+}
+
+/*!
+    \fn int QOpenGLFramebufferObject::width() const
+
+    Returns the width of the framebuffer object attachments.
+*/
+
+/*!
+    \fn int QOpenGLFramebufferObject::height() const
+
+    Returns the height of the framebuffer object attachments.
+*/
+
+/*!
+    Returns the format of this framebuffer object.
+*/
+QOpenGLFramebufferObjectFormat QOpenGLFramebufferObject::format() const
+{
+    Q_D(const QOpenGLFramebufferObject);
+    return d->format;
+}
+
+static inline QImage qt_gl_read_framebuffer_rgba8(const QSize &size, bool include_alpha, QOpenGLContext *context)
+{
+    QOpenGLFunctions *funcs = context->functions();
+    const int w = size.width();
+    const int h = size.height();
+    bool isOpenGL12orBetter = !context->isOpenGLES() && (context->format().majorVersion() >= 2 || context->format().minorVersion() >= 2);
+    if (isOpenGL12orBetter) {
+        QImage img(size, include_alpha ? QImage::Format_ARGB32_Premultiplied : QImage::Format_RGB32);
+        funcs->glReadPixels(0, 0, w, h, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, img.bits());
+        return img;
+    }
+
+    // For OpenGL ES stick with the byte ordered format / RGBA readback format
+    // since that is the only spec mandated way. (also, skip the
+    // GL_IMPLEMENTATION_COLOR_READ_FORMAT mess since there is nothing saying a
+    // BGRA capable impl would return BGRA from there)
+
+    QImage rgbaImage(size, include_alpha ? QImage::Format_RGBA8888_Premultiplied : QImage::Format_RGBX8888);
+    funcs->glReadPixels(0, 0, w, h, GL_RGBA, GL_UNSIGNED_BYTE, rgbaImage.bits());
+    return rgbaImage;
+}
+
+static inline QImage qt_gl_read_framebuffer_rgb10a2(const QSize &size, bool include_alpha, QOpenGLContext *context)
+{
+    // We assume OpenGL 1.2+ or ES 3.0+ here.
+    QImage img(size, include_alpha ? QImage::Format_A2BGR30_Premultiplied : QImage::Format_BGR30);
+    context->functions()->glReadPixels(0, 0, size.width(), size.height(), GL_RGBA, GL_UNSIGNED_INT_2_10_10_10_REV, img.bits());
+    return img;
+}
+
+static inline QImage qt_gl_read_framebuffer_rgba16(const QSize &size, bool include_alpha, QOpenGLContext *context)
+{
+    // We assume OpenGL 1.2+ or ES 3.0+ here.
+    QImage img(size, include_alpha ? QImage::Format_RGBA64_Premultiplied : QImage::Format_RGBX64);
+    context->functions()->glReadPixels(0, 0, size.width(), size.height(), GL_RGBA, GL_UNSIGNED_SHORT, img.bits());
+    return img;
+}
+
+static QImage qt_gl_read_framebuffer(const QSize &size, GLenum internal_format, bool include_alpha, bool flip)
+{
+    QOpenGLContext *ctx = QOpenGLContext::currentContext();
+    QOpenGLFunctions *funcs = ctx->functions();
+    while (true) {
+        GLenum error = funcs->glGetError();
+        if (error == GL_NO_ERROR || error == GL_CONTEXT_LOST)
+            break;
+    }
+    switch (internal_format) {
+    case GL_RGB:
+    case GL_RGB8:
+        return qt_gl_read_framebuffer_rgba8(size, false, ctx).mirrored(false, flip);
+    case GL_RGB10:
+        return qt_gl_read_framebuffer_rgb10a2(size, false, ctx).mirrored(false, flip);
+    case GL_RGB10_A2:
+        return qt_gl_read_framebuffer_rgb10a2(size, include_alpha, ctx).mirrored(false, flip);
+    case GL_RGB16:
+        return qt_gl_read_framebuffer_rgba16(size, false, ctx).mirrored(false, flip);
+    case GL_RGBA16:
+        return qt_gl_read_framebuffer_rgba16(size, include_alpha, ctx).mirrored(false, flip);
+    case GL_RGBA:
+    case GL_RGBA8:
+    default:
+        return qt_gl_read_framebuffer_rgba8(size, include_alpha, ctx).mirrored(false, flip);
+    }
+
+    Q_UNREACHABLE();
+    return QImage();
+}
+
+Q_OPENGL_EXPORT QImage qt_gl_read_framebuffer(const QSize &size, bool alpha_format, bool include_alpha)
+{
+    return qt_gl_read_framebuffer(size, alpha_format ? GL_RGBA : GL_RGB, include_alpha, true);
+}
+
+/*!
+    \fn QImage QOpenGLFramebufferObject::toImage(bool flipped) const
+
+    Returns the contents of this framebuffer object as a QImage.
+
+    If \a flipped is true the image is flipped from OpenGL coordinates to raster coordinates.
+    If used together with QOpenGLPaintDevice, \a flipped should be the opposite of the value
+    of QOpenGLPaintDevice::paintFlipped().
+
+    The returned image has a format of premultiplied ARGB32 or RGB32. The latter
+    is used only when internalTextureFormat() is set to \c GL_RGB. Since Qt 5.2
+    the function will fall back to premultiplied RGBA8888 or RGBx8888 when
+    reading to (A)RGB32 is not supported, and this includes OpenGL ES. Since Qt
+    5.4 an A2BGR30 image is returned if the internal format is RGB10_A2, and since
+    Qt 5.12 a RGBA64 image is return if the internal format is RGBA16.
+
+    If the rendering in the framebuffer was not done with premultiplied alpha in mind,
+    create a wrapper QImage with a non-premultiplied format. This is necessary before
+    performing operations like QImage::save() because otherwise the image data would get
+    unpremultiplied, even though it was not premultiplied in the first place. To create
+    such a wrapper without performing a copy of the pixel data, do the following:
+
+    \code
+    QImage fboImage(fbo.toImage());
+    QImage image(fboImage.constBits(), fboImage.width(), fboImage.height(), QImage::Format_ARGB32);
+    \endcode
+
+    For multisampled framebuffer objects the samples are resolved using the
+    \c{GL_EXT_framebuffer_blit} extension. If the extension is not available, the contents
+    of the returned image is undefined.
+
+    For singlesampled framebuffers the contents is retrieved via \c glReadPixels. This is
+    a potentially expensive and inefficient operation. Therefore it is recommended that
+    this function is used as seldom as possible.
+
+    \sa QOpenGLPaintDevice::paintFlipped()
+*/
+
+QImage QOpenGLFramebufferObject::toImage(bool flipped) const
+{
+    return toImage(flipped, 0);
+}
+
+/*!
+    \fn QImage QOpenGLFramebufferObject::toImage() const
+    \overload
+
+    Returns the contents of this framebuffer object as a QImage. This method flips
+    the image from OpenGL coordinates to raster coordinates.
+*/
+// ### Qt 6: Remove this method and make it a default argument instead.
+QImage QOpenGLFramebufferObject::toImage() const
+{
+    return toImage(true, 0);
+}
+
+/*! \overload
+
+    Returns the contents of the color attachment of index \a
+    colorAttachmentIndex of this framebuffer object as a QImage. This method
+    flips the image from OpenGL coordinates to raster coordinates when \a
+    flipped is set to \c true.
+
+    \note This overload is only fully functional when multiple render targets are
+    supported by the OpenGL implementation. When that is not the case, only one
+    color attachment will be set up.
+
+    \since 5.6
+*/
+QImage QOpenGLFramebufferObject::toImage(bool flipped, int colorAttachmentIndex) const
+{
+    Q_D(const QOpenGLFramebufferObject);
+    if (!d->valid)
+        return QImage();
+
+    QOpenGLContext *ctx = QOpenGLContext::currentContext();
+    if (!ctx) {
+        qWarning("QOpenGLFramebufferObject::toImage() called without a current context");
+        return QImage();
+    }
+
+    if (d->colorAttachments.count() <= colorAttachmentIndex) {
+        qWarning("QOpenGLFramebufferObject::toImage() called for missing color attachment");
+        return QImage();
+    }
+
+    GLuint prevFbo = 0;
+    ctx->functions()->glGetIntegerv(GL_FRAMEBUFFER_BINDING, (GLint *) &prevFbo);
+
+    if (prevFbo != d->fbo())
+        const_cast<QOpenGLFramebufferObject *>(this)->bind();
+
+    QImage image;
+    QOpenGLExtraFunctions *extraFuncs = ctx->extraFunctions();
+    // qt_gl_read_framebuffer doesn't work on a multisample FBO
+    if (format().samples() != 0) {
+        QRect rect(QPoint(0, 0), size());
+        QOpenGLFramebufferObjectFormat fmt;
+        if (extraFuncs->hasOpenGLFeature(QOpenGLFunctions::MultipleRenderTargets)) {
+            fmt.setInternalTextureFormat(d->colorAttachments[colorAttachmentIndex].internalFormat);
+            QOpenGLFramebufferObject temp(d->colorAttachments[colorAttachmentIndex].size, fmt);
+            blitFramebuffer(&temp, rect, const_cast<QOpenGLFramebufferObject *>(this), rect,
+                            GL_COLOR_BUFFER_BIT, GL_NEAREST,
+                            colorAttachmentIndex, 0);
+            image = temp.toImage(flipped);
+        } else {
+            fmt.setInternalTextureFormat(d->colorAttachments[0].internalFormat);
+            QOpenGLFramebufferObject temp(size(), fmt);
+            blitFramebuffer(&temp, rect, const_cast<QOpenGLFramebufferObject *>(this), rect);
+            image = temp.toImage(flipped);
+        }
+    } else {
+        if (extraFuncs->hasOpenGLFeature(QOpenGLFunctions::MultipleRenderTargets)) {
+            extraFuncs->glReadBuffer(GL_COLOR_ATTACHMENT0 + colorAttachmentIndex);
+            image = qt_gl_read_framebuffer(d->colorAttachments[colorAttachmentIndex].size,
+                                           d->colorAttachments[colorAttachmentIndex].internalFormat,
+                                           true, flipped);
+            extraFuncs->glReadBuffer(GL_COLOR_ATTACHMENT0);
+        } else {
+            image = qt_gl_read_framebuffer(d->colorAttachments[0].size,
+                                           d->colorAttachments[0].internalFormat,
+                                           true, flipped);
+        }
+    }
+
+    if (prevFbo != d->fbo())
+        ctx->functions()->glBindFramebuffer(GL_FRAMEBUFFER, prevFbo);
+
+    return image;
+}
+
+/*!
+    \fn bool QOpenGLFramebufferObject::bindDefault()
+
+    Switches rendering back to the default, windowing system provided
+    framebuffer.
+    Returns \c true upon success, false otherwise.
+
+    \sa bind(), release()
+*/
+bool QOpenGLFramebufferObject::bindDefault()
+{
+    QOpenGLContext *ctx = const_cast<QOpenGLContext *>(QOpenGLContext::currentContext());
+
+    if (ctx) {
+        ctx->functions()->glBindFramebuffer(GL_FRAMEBUFFER, ctx->defaultFramebufferObject());
+        QOpenGLContextPrivate::get(ctx)->qgl_current_fbo_invalid = true;
+        QOpenGLContextPrivate::get(ctx)->qgl_current_fbo = nullptr;
+    }
+#ifdef QT_DEBUG
+    else
+        qWarning("QOpenGLFramebufferObject::bindDefault() called without current context.");
+#endif
+
+    return ctx != nullptr;
+}
+
+/*!
+    \fn bool QOpenGLFramebufferObject::hasOpenGLFramebufferObjects()
+
+    Returns \c true if the OpenGL \c{GL_EXT_framebuffer_object} extension
+    is present on this system; otherwise returns \c false.
+*/
+bool QOpenGLFramebufferObject::hasOpenGLFramebufferObjects()
+{
+    return QOpenGLContext::currentContext()->functions()->hasOpenGLFeature(QOpenGLFunctions::Framebuffers);
+}
+
+/*!
+    \fn GLuint QOpenGLFramebufferObject::handle() const
+
+    Returns the OpenGL framebuffer object handle for this framebuffer
+    object (returned by the \c{glGenFrameBuffersEXT()} function). This
+    handle can be used to attach new images or buffers to the
+    framebuffer. The user is responsible for cleaning up and
+    destroying these objects.
+*/
+GLuint QOpenGLFramebufferObject::handle() const
+{
+    Q_D(const QOpenGLFramebufferObject);
+    return d->fbo();
+}
+
+/*!
+    Returns the status of the depth and stencil buffers attached to
+    this framebuffer object.
+*/
+
+QOpenGLFramebufferObject::Attachment QOpenGLFramebufferObject::attachment() const
+{
+    Q_D(const QOpenGLFramebufferObject);
+    if (d->valid)
+        return d->fbo_attachment;
+    return NoAttachment;
+}
+
+/*!
+    Sets the attachments of the framebuffer object to \a attachment.
+
+    This can be used to free or reattach the depth and stencil buffer
+    attachments as needed.
+
+    \note This function alters the current framebuffer binding.
+ */
+void QOpenGLFramebufferObject::setAttachment(QOpenGLFramebufferObject::Attachment attachment)
+{
+    Q_D(QOpenGLFramebufferObject);
+    if (attachment == d->fbo_attachment || !isValid())
+        return;
+    QOpenGLContext *current = QOpenGLContext::currentContext();
+    if (!current)
+        return;
+#ifdef QT_DEBUG
+    if (current->shareGroup() != d->fbo_guard->group())
+        qWarning("QOpenGLFramebufferObject::setAttachment() called from incompatible context");
+#endif
+    d->funcs.glBindFramebuffer(GL_FRAMEBUFFER, d->fbo());
+    QOpenGLContextPrivate::get(current)->qgl_current_fbo_invalid = true;
+    d->initDepthStencilAttachments(current, attachment);
+}
+
+/*!
+    Returns \c true if the framebuffer object is currently bound to the current context,
+    otherwise false is returned.
+*/
+bool QOpenGLFramebufferObject::isBound() const
+{
+    Q_D(const QOpenGLFramebufferObject);
+    QOpenGLContext *ctx = QOpenGLContext::currentContext();
+    if (!ctx)
+        return false;
+    GLint fbo = 0;
+    ctx->functions()->glGetIntegerv(GL_FRAMEBUFFER_BINDING, &fbo);
+    return GLuint(fbo) == d->fbo();
+}
+
+/*!
+    \fn bool QOpenGLFramebufferObject::hasOpenGLFramebufferBlit()
+
+    Returns \c true if the OpenGL \c{GL_EXT_framebuffer_blit} extension
+    is present on this system; otherwise returns \c false.
+
+    \sa blitFramebuffer()
+*/
+bool QOpenGLFramebufferObject::hasOpenGLFramebufferBlit()
+{
+    return QOpenGLExtensions(QOpenGLContext::currentContext()).hasOpenGLExtension(QOpenGLExtensions::FramebufferBlit);
+}
+
+
+/*!
+    \overload
+
+    Convenience overload to blit between two framebuffer objects.
+*/
+void QOpenGLFramebufferObject::blitFramebuffer(QOpenGLFramebufferObject *target,
+                                               QOpenGLFramebufferObject *source,
+                                               GLbitfield buffers, GLenum filter)
+{
+    if (!target && !source)
+        return;
+
+    QSize targetSize;
+    QSize sourceSize;
+
+    if (target)
+        targetSize = target->size();
+    if (source)
+        sourceSize = source->size();
+
+    if (targetSize.isEmpty())
+        targetSize = sourceSize;
+    else if (sourceSize.isEmpty())
+        sourceSize = targetSize;
+
+    blitFramebuffer(target, QRect(QPoint(0, 0), targetSize),
+                    source, QRect(QPoint(0, 0), sourceSize),
+                    buffers, filter);
+}
+
+/*! \overload
+ *
+    Convenience overload to blit between two framebuffer objects.
+*/
+void QOpenGLFramebufferObject::blitFramebuffer(QOpenGLFramebufferObject *target, const QRect &targetRect,
+                                               QOpenGLFramebufferObject *source, const QRect &sourceRect,
+                                               GLbitfield buffers,
+                                               GLenum filter)
+{
+    blitFramebuffer(target, targetRect, source, sourceRect, buffers, filter, 0, 0);
+}
+
+/*!
+    \enum QOpenGLFramebufferObject::FramebufferRestorePolicy
+    \since 5.7
+
+    This enum type is used to configure the behavior related to restoring
+    framebuffer bindings when calling blitFramebuffer().
+
+    \value DontRestoreFramebufferBinding        Do not restore the previous framebuffer binding.
+                                                The caller is responsible for tracking and setting
+                                                the framebuffer binding as needed.
+
+    \value RestoreFramebufferBindingToDefault   After the blit operation, bind the default
+                                                framebuffer.
+
+    \value RestoreFrameBufferBinding            Restore the previously bound framebuffer. This is
+                                                potentially expensive because of the need to
+                                                query the currently bound framebuffer.
+
+    \sa blitFramebuffer()
+*/
+
+/*!
+    \since 5.7
+
+    Blits from the \a sourceRect rectangle in the \a source framebuffer
+    object to the \a targetRect rectangle in the \a target framebuffer object.
+
+    If \a source or \a target is 0, the default framebuffer will be used
+    instead of a framebuffer object as source or target respectively.
+
+    This function will have no effect unless hasOpenGLFramebufferBlit() returns
+    true.
+
+    The \a buffers parameter should be a mask consisting of any combination of
+    \c GL_COLOR_BUFFER_BIT, \c GL_DEPTH_BUFFER_BIT, and
+    \c GL_STENCIL_BUFFER_BIT.  Any buffer type that is not present both
+    in the source and target buffers is ignored.
+
+    The \a sourceRect and \a targetRect rectangles may have different sizes;
+    in this case \a buffers should not contain \c GL_DEPTH_BUFFER_BIT or
+    \c GL_STENCIL_BUFFER_BIT. The \a filter parameter should be set to
+    \c GL_LINEAR or \c GL_NEAREST, and specifies whether linear or nearest
+    interpolation should be used when scaling is performed.
+
+    If \a source equals \a target a copy is performed within the same buffer.
+    Results are undefined if the source and target rectangles overlap and
+    have different sizes. The sizes must also be the same if any of the
+    framebuffer objects are multisample framebuffers.
+
+    \note The scissor test will restrict the blit area if enabled.
+
+    When multiple render targets are in use, \a readColorAttachmentIndex and \a
+    drawColorAttachmentIndex specify the index of the color attachments in the
+    source and destination framebuffers.
+
+    The \a restorePolicy determines if the framebuffer that was bound prior to
+    calling this function should be restored, or if the default framebuffer
+    should be bound before returning, of if the caller is responsible for
+    tracking and setting the bound framebuffer. Restoring the previous
+    framebuffer can be relatively expensive due to the call to \c{glGetIntegerv}
+    which on some OpenGL drivers may imply a pipeline stall.
+
+    \sa hasOpenGLFramebufferBlit()
+*/
+void QOpenGLFramebufferObject::blitFramebuffer(QOpenGLFramebufferObject *target, const QRect &targetRect,
+                                               QOpenGLFramebufferObject *source, const QRect &sourceRect,
+                                               GLbitfield buffers,
+                                               GLenum filter,
+                                               int readColorAttachmentIndex,
+                                               int drawColorAttachmentIndex,
+                                               QOpenGLFramebufferObject::FramebufferRestorePolicy restorePolicy)
+{
+    QOpenGLContext *ctx = QOpenGLContext::currentContext();
+    if (!ctx)
+        return;
+
+    QOpenGLExtensions extensions(ctx);
+    if (!extensions.hasOpenGLExtension(QOpenGLExtensions::FramebufferBlit))
+        return;
+
+    GLuint prevFbo = 0;
+    if (restorePolicy == RestoreFrameBufferBinding)
+        ctx->functions()->glGetIntegerv(GL_FRAMEBUFFER_BINDING, (GLint *) &prevFbo);
+
+    const int sx0 = sourceRect.left();
+    const int sx1 = sourceRect.left() + sourceRect.width();
+    const int sy0 = sourceRect.top();
+    const int sy1 = sourceRect.top() + sourceRect.height();
+
+    const int tx0 = targetRect.left();
+    const int tx1 = targetRect.left() + targetRect.width();
+    const int ty0 = targetRect.top();
+    const int ty1 = targetRect.top() + targetRect.height();
+
+    const GLuint defaultFboId = ctx->defaultFramebufferObject();
+
+    extensions.glBindFramebuffer(GL_READ_FRAMEBUFFER, source ? source->handle() : defaultFboId);
+    extensions.glBindFramebuffer(GL_DRAW_FRAMEBUFFER, target ? target->handle() : defaultFboId);
+
+    const bool supportsMRT = extensions.hasOpenGLFeature(QOpenGLFunctions::MultipleRenderTargets);
+    if (supportsMRT) {
+        extensions.glReadBuffer(GL_COLOR_ATTACHMENT0 + readColorAttachmentIndex);
+        if (target) {
+            GLenum drawBuf = GL_COLOR_ATTACHMENT0 + drawColorAttachmentIndex;
+            extensions.glDrawBuffers(1, &drawBuf);
+        }
+    }
+
+    extensions.glBlitFramebuffer(sx0, sy0, sx1, sy1,
+                                 tx0, ty0, tx1, ty1,
+                                 buffers, filter);
+
+    if (supportsMRT)
+        extensions.glReadBuffer(GL_COLOR_ATTACHMENT0);
+
+    switch (restorePolicy) {
+    case RestoreFrameBufferBinding:
+        ctx->functions()->glBindFramebuffer(GL_FRAMEBUFFER, prevFbo); // sets both READ and DRAW
+        break;
+
+    case RestoreFramebufferBindingToDefault:
+        ctx->functions()->glBindFramebuffer(GL_FRAMEBUFFER, ctx->defaultFramebufferObject()); // sets both READ and DRAW
+        break;
+
+    case DontRestoreFramebufferBinding:
+        break;
+    }
+}
+
+/*!
+   \overload
+
+    Convenience overload to blit between two framebuffer objects and
+    to restore the previous framebuffer binding. Equivalent to calling
+    blitFramebuffer(target, targetRect, source, sourceRect, buffers, filter,
+    readColorAttachmentIndex, drawColorAttachmentIndex,
+    RestoreFrameBufferBinding).
+*/
+void QOpenGLFramebufferObject::blitFramebuffer(QOpenGLFramebufferObject *target, const QRect &targetRect,
+                                               QOpenGLFramebufferObject *source, const QRect &sourceRect,
+                                               GLbitfield buffers,
+                                               GLenum filter,
+                                               int readColorAttachmentIndex,
+                                               int drawColorAttachmentIndex)
+{
+    blitFramebuffer(target, targetRect, source, sourceRect,
+                    buffers, filter,
+                    readColorAttachmentIndex,
+                    drawColorAttachmentIndex,
+                    RestoreFrameBufferBinding);
+}
+
+QT_END_NAMESPACE
diff --git a/src/opengl/qopenglframebufferobject.h b/src/opengl/qopenglframebufferobject.h
new file mode 100644
index 0000000000..da3347eaec
--- /dev/null
+++ b/src/opengl/qopenglframebufferobject.h
@@ -0,0 +1,196 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtOpenGL module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QOPENGLFRAMEBUFFEROBJECT_H
+#define QOPENGLFRAMEBUFFEROBJECT_H
+
+#include <QtOpenGL/qtopenglglobal.h>
+
+#include <QtGui/qopengl.h>
+#include <QtGui/qpaintdevice.h>
+
+#include <QtCore/qscopedpointer.h>
+
+#if defined(Q_CLANG_QDOC)
+#undef GLuint
+typedef unsigned int GLuint;
+#undef GLenum
+typedef unsigned int GLenum;
+#undef GL_TEXTURE_2D
+#define GL_TEXTURE_2D 0x0DE1
+#undef GLbitfield
+typedef unsigned int GLbitfield;
+#endif
+
+QT_BEGIN_NAMESPACE
+
+class QOpenGLFramebufferObjectPrivate;
+class QOpenGLFramebufferObjectFormat;
+
+class Q_OPENGL_EXPORT QOpenGLFramebufferObject
+{
+    Q_DECLARE_PRIVATE(QOpenGLFramebufferObject)
+public:
+    enum Attachment {
+        NoAttachment,
+        CombinedDepthStencil,
+        Depth
+    };
+
+    explicit QOpenGLFramebufferObject(const QSize &size, GLenum target = GL_TEXTURE_2D);
+    QOpenGLFramebufferObject(int width, int height, GLenum target = GL_TEXTURE_2D);
+
+    QOpenGLFramebufferObject(const QSize &size, Attachment attachment,
+                         GLenum target = GL_TEXTURE_2D, GLenum internalFormat = 0);
+    QOpenGLFramebufferObject(int width, int height, Attachment attachment,
+                         GLenum target = GL_TEXTURE_2D, GLenum internalFormat = 0);
+
+    QOpenGLFramebufferObject(const QSize &size, const QOpenGLFramebufferObjectFormat &format);
+    QOpenGLFramebufferObject(int width, int height, const QOpenGLFramebufferObjectFormat &format);
+
+    virtual ~QOpenGLFramebufferObject();
+
+    void addColorAttachment(const QSize &size, GLenum internalFormat = 0);
+    void addColorAttachment(int width, int height, GLenum internalFormat = 0);
+
+    QOpenGLFramebufferObjectFormat format() const;
+
+    bool isValid() const;
+    bool isBound() const;
+    bool bind();
+    bool release();
+
+    int width() const { return size().width(); }
+    int height() const { return size().height(); }
+
+    GLuint texture() const;
+    QVector<GLuint> textures() const;
+
+    GLuint takeTexture();
+    GLuint takeTexture(int colorAttachmentIndex);
+
+    QSize size() const;
+    QVector<QSize> sizes() const;
+
+    QImage toImage() const;
+    QImage toImage(bool flipped) const;
+    QImage toImage(bool flipped, int colorAttachmentIndex) const;
+
+    Attachment attachment() const;
+    void setAttachment(Attachment attachment);
+
+    GLuint handle() const;
+
+    static bool bindDefault();
+
+    static bool hasOpenGLFramebufferObjects();
+
+    static bool hasOpenGLFramebufferBlit();
+
+    enum FramebufferRestorePolicy {
+        DontRestoreFramebufferBinding,
+        RestoreFramebufferBindingToDefault,
+        RestoreFrameBufferBinding
+    };
+
+    static void blitFramebuffer(QOpenGLFramebufferObject *target, const QRect &targetRect,
+                                QOpenGLFramebufferObject *source, const QRect &sourceRect,
+                                GLbitfield buffers,
+                                GLenum filter,
+                                int readColorAttachmentIndex,
+                                int drawColorAttachmentIndex,
+                                FramebufferRestorePolicy restorePolicy);
+    static void blitFramebuffer(QOpenGLFramebufferObject *target, const QRect &targetRect,
+                                QOpenGLFramebufferObject *source, const QRect &sourceRect,
+                                GLbitfield buffers,
+                                GLenum filter,
+                                int readColorAttachmentIndex,
+                                int drawColorAttachmentIndex);
+    static void blitFramebuffer(QOpenGLFramebufferObject *target, const QRect &targetRect,
+                                QOpenGLFramebufferObject *source, const QRect &sourceRect,
+                                GLbitfield buffers = GL_COLOR_BUFFER_BIT,
+                                GLenum filter = GL_NEAREST);
+    static void blitFramebuffer(QOpenGLFramebufferObject *target,
+                                QOpenGLFramebufferObject *source,
+                                GLbitfield buffers = GL_COLOR_BUFFER_BIT,
+                                GLenum filter = GL_NEAREST);
+
+private:
+    Q_DISABLE_COPY(QOpenGLFramebufferObject)
+    QScopedPointer<QOpenGLFramebufferObjectPrivate> d_ptr;
+    friend class QOpenGLPaintDevice;
+    friend class QOpenGLFBOGLPaintDevice;
+};
+
+class QOpenGLFramebufferObjectFormatPrivate;
+class Q_OPENGL_EXPORT QOpenGLFramebufferObjectFormat
+{
+public:
+    QOpenGLFramebufferObjectFormat();
+    QOpenGLFramebufferObjectFormat(const QOpenGLFramebufferObjectFormat &other);
+    QOpenGLFramebufferObjectFormat &operator=(const QOpenGLFramebufferObjectFormat &other);
+    ~QOpenGLFramebufferObjectFormat();
+
+    void setSamples(int samples);
+    int samples() const;
+
+    void setMipmap(bool enabled);
+    bool mipmap() const;
+
+    void setAttachment(QOpenGLFramebufferObject::Attachment attachment);
+    QOpenGLFramebufferObject::Attachment attachment() const;
+
+    void setTextureTarget(GLenum target);
+    GLenum textureTarget() const;
+
+    void setInternalTextureFormat(GLenum internalTextureFormat);
+    GLenum internalTextureFormat() const;
+
+    bool operator==(const QOpenGLFramebufferObjectFormat& other) const;
+    bool operator!=(const QOpenGLFramebufferObjectFormat& other) const;
+
+private:
+    QOpenGLFramebufferObjectFormatPrivate *d;
+
+    void detach();
+};
+
+QT_END_NAMESPACE
+
+#endif // QOPENGLFRAMEBUFFEROBJECT_H
diff --git a/src/opengl/qopenglframebufferobject_p.h b/src/opengl/qopenglframebufferobject_p.h
new file mode 100644
index 0000000000..df87734a58
--- /dev/null
+++ b/src/opengl/qopenglframebufferobject_p.h
@@ -0,0 +1,153 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtOpenGL module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QOPENGLFRAMEBUFFEROBJECT_P_H
+#define QOPENGLFRAMEBUFFEROBJECT_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API. It exists purely as an
+// implementation detail. This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <qopenglframebufferobject.h>
+#include <private/qopenglcontext_p.h>
+#include <private/qopenglextensions_p.h>
+
+QT_BEGIN_NAMESPACE
+
+class QOpenGLFramebufferObjectFormatPrivate
+{
+public:
+    QOpenGLFramebufferObjectFormatPrivate()
+        : ref(1),
+          samples(0),
+          attachment(QOpenGLFramebufferObject::NoAttachment),
+          target(GL_TEXTURE_2D),
+          mipmap(false)
+    {
+#ifndef QT_OPENGL_ES_2
+        // There is nothing that says QOpenGLFramebufferObjectFormat needs a current
+        // context, so we need a fallback just to be safe, even though in pratice there
+        // will usually be a context current.
+        QOpenGLContext *ctx = QOpenGLContext::currentContext();
+        const bool isES = ctx ? ctx->isOpenGLES() : QOpenGLContext::openGLModuleType() != QOpenGLContext::LibGL;
+        internal_format = isES ? GL_RGBA : GL_RGBA8;
+#else
+        internal_format = GL_RGBA;
+#endif
+    }
+    QOpenGLFramebufferObjectFormatPrivate
+            (const QOpenGLFramebufferObjectFormatPrivate *other)
+        : ref(1),
+          samples(other->samples),
+          attachment(other->attachment),
+          target(other->target),
+          internal_format(other->internal_format),
+          mipmap(other->mipmap)
+    {
+    }
+    bool equals(const QOpenGLFramebufferObjectFormatPrivate *other)
+    {
+        return samples == other->samples &&
+               attachment == other->attachment &&
+               target == other->target &&
+               internal_format == other->internal_format &&
+               mipmap == other->mipmap;
+    }
+
+    QAtomicInt ref;
+    int samples;
+    QOpenGLFramebufferObject::Attachment attachment;
+    GLenum target;
+    GLenum internal_format;
+    uint mipmap : 1;
+};
+
+class QOpenGLFramebufferObjectPrivate
+{
+public:
+    QOpenGLFramebufferObjectPrivate() : fbo_guard(nullptr), depth_buffer_guard(nullptr)
+                                  , stencil_buffer_guard(nullptr)
+                                  , valid(false) {}
+    ~QOpenGLFramebufferObjectPrivate() {}
+
+    void init(QOpenGLFramebufferObject *q, const QSize &size,
+              QOpenGLFramebufferObject::Attachment attachment,
+              GLenum texture_target, GLenum internal_format,
+              GLint samples = 0, bool mipmap = false);
+    void initTexture(int idx);
+    void initColorBuffer(int idx, GLint *samples);
+    void initDepthStencilAttachments(QOpenGLContext *ctx, QOpenGLFramebufferObject::Attachment attachment);
+
+    bool checkFramebufferStatus(QOpenGLContext *ctx) const;
+    QOpenGLSharedResourceGuard *fbo_guard;
+    QOpenGLSharedResourceGuard *depth_buffer_guard;
+    QOpenGLSharedResourceGuard *stencil_buffer_guard;
+    GLenum target;
+    QSize dsSize;
+    QOpenGLFramebufferObjectFormat format;
+    int requestedSamples;
+    uint valid : 1;
+    QOpenGLFramebufferObject::Attachment fbo_attachment;
+    QOpenGLExtensions funcs;
+
+    struct ColorAttachment {
+        ColorAttachment() : internalFormat(0), guard(nullptr) { }
+        ColorAttachment(const QSize &size, GLenum internalFormat)
+            : size(size), internalFormat(internalFormat), guard(nullptr) { }
+        QSize size;
+        GLenum internalFormat;
+        QOpenGLSharedResourceGuard *guard;
+    };
+    QVector<ColorAttachment> colorAttachments;
+
+    inline GLuint fbo() const { return fbo_guard ? fbo_guard->id() : 0; }
+};
+
+Q_OPENGL_EXPORT QImage qt_gl_read_framebuffer(const QSize &size, bool alpha_format, bool include_alpha);
+
+QT_END_NAMESPACE
+
+#endif // QOPENGLFRAMEBUFFEROBJECT_P_H
diff --git a/src/opengl/qopenglgradientcache.cpp b/src/opengl/qopenglgradientcache.cpp
new file mode 100644
index 0000000000..7a932a19bb
--- /dev/null
+++ b/src/opengl/qopenglgradientcache.cpp
@@ -0,0 +1,276 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtOpenGL module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qopenglgradientcache_p.h"
+#include <private/qdrawhelper_p.h>
+#include <private/qopenglcontext_p.h>
+#include <private/qrgba64_p.h>
+#include <QtCore/qmutex.h>
+#include <QtCore/qrandom.h>
+#include "qopenglfunctions.h"
+#include <private/qopenglextensions_p.h>
+
+#ifndef GL_RGBA16
+#define GL_RGBA16   0x805B
+#endif
+
+QT_BEGIN_NAMESPACE
+
+class QOpenGL2GradientCacheWrapper
+{
+public:
+    QOpenGL2GradientCache *cacheForContext(QOpenGLContext *context) {
+        QMutexLocker lock(&m_mutex);
+        return m_resource.value<QOpenGL2GradientCache>(context);
+    }
+
+private:
+    QOpenGLMultiGroupSharedResource m_resource;
+    QMutex m_mutex;
+};
+
+Q_GLOBAL_STATIC(QOpenGL2GradientCacheWrapper, qt_gradient_caches)
+
+QOpenGL2GradientCache::QOpenGL2GradientCache(QOpenGLContext *ctx)
+    : QOpenGLSharedResource(ctx->shareGroup())
+{
+}
+
+QOpenGL2GradientCache::~QOpenGL2GradientCache()
+{
+    cache.clear();
+}
+
+QOpenGL2GradientCache *QOpenGL2GradientCache::cacheForContext(QOpenGLContext *context)
+{
+    return qt_gradient_caches()->cacheForContext(context);
+}
+
+void QOpenGL2GradientCache::invalidateResource()
+{
+    QMutexLocker lock(&m_mutex);
+    cache.clear();
+}
+
+void QOpenGL2GradientCache::freeResource(QOpenGLContext *)
+{
+    cleanCache();
+}
+
+void QOpenGL2GradientCache::cleanCache()
+{
+    QMutexLocker lock(&m_mutex);
+    QOpenGLGradientColorTableHash::const_iterator it = cache.constBegin();
+    QOpenGLFunctions *funcs = QOpenGLContext::currentContext()->functions();
+    for (; it != cache.constEnd(); ++it) {
+        const CacheInfo &cache_info = it.value();
+        funcs->glDeleteTextures(1, &cache_info.texId);
+    }
+    cache.clear();
+}
+
+GLuint QOpenGL2GradientCache::getBuffer(const QGradient &gradient, qreal opacity)
+{
+    quint64 hash_val = 0;
+
+    const QGradientStops stops = gradient.stops();
+    for (int i = 0; i < stops.size() && i <= 2; i++)
+        hash_val += stops[i].second.rgba();
+
+    const QMutexLocker lock(&m_mutex);
+    QOpenGLGradientColorTableHash::const_iterator it = cache.constFind(hash_val);
+
+    if (it == cache.constEnd())
+        return addCacheElement(hash_val, gradient, opacity);
+    else {
+        do {
+            const CacheInfo &cache_info = it.value();
+            if (cache_info.stops == stops && cache_info.opacity == opacity
+                && cache_info.interpolationMode == gradient.interpolationMode())
+            {
+                return cache_info.texId;
+            }
+            ++it;
+        } while (it != cache.constEnd() && it.key() == hash_val);
+        // an exact match for these stops and opacity was not found, create new cache
+        return addCacheElement(hash_val, gradient, opacity);
+    }
+}
+
+
+GLuint QOpenGL2GradientCache::addCacheElement(quint64 hash_val, const QGradient &gradient, qreal opacity)
+{
+    QOpenGLFunctions *funcs = QOpenGLContext::currentContext()->functions();
+    if (cache.size() == maxCacheSize()) {
+        int elem_to_remove = QRandomGenerator::global()->bounded(maxCacheSize());
+        quint64 key = cache.keys()[elem_to_remove];
+
+        // need to call glDeleteTextures on each removed cache entry:
+        QOpenGLGradientColorTableHash::const_iterator it = cache.constFind(key);
+        do {
+            funcs->glDeleteTextures(1, &it.value().texId);
+        } while (++it != cache.constEnd() && it.key() == key);
+        cache.remove(key); // may remove more than 1, but OK
+    }
+
+    CacheInfo cache_entry(gradient.stops(), opacity, gradient.interpolationMode());
+    funcs->glGenTextures(1, &cache_entry.texId);
+    funcs->glBindTexture(GL_TEXTURE_2D, cache_entry.texId);
+    if (static_cast<QOpenGLExtensions *>(funcs)->hasOpenGLExtension(QOpenGLExtensions::Sized16Formats)) {
+        QRgba64 buffer[1024];
+        generateGradientColorTable(gradient, buffer, paletteSize(), opacity);
+        funcs->glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA16, paletteSize(), 1,
+                            0, GL_RGBA, GL_UNSIGNED_SHORT, buffer);
+    } else {
+        uint buffer[1024];
+        generateGradientColorTable(gradient, buffer, paletteSize(), opacity);
+        funcs->glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, paletteSize(), 1,
+                            0, GL_RGBA, GL_UNSIGNED_BYTE, buffer);
+    }
+    return cache.insert(hash_val, cache_entry).value().texId;
+}
+
+
+//TODO: Let GL generate the texture using an FBO
+void QOpenGL2GradientCache::generateGradientColorTable(const QGradient& gradient, QRgba64 *colorTable, int size, qreal opacity) const
+{
+    int pos = 0;
+    const QGradientStops s = gradient.stops();
+
+    bool colorInterpolation = (gradient.interpolationMode() == QGradient::ColorInterpolation);
+
+    uint alpha = qRound(opacity * 256);
+    QRgba64 current_color = combineAlpha256(s[0].second.rgba64(), alpha);
+    qreal incr = 1.0 / qreal(size);
+    qreal fpos = 1.5 * incr;
+    colorTable[pos++] = qPremultiply(current_color);
+
+    while (fpos <= s.first().first) {
+        colorTable[pos] = colorTable[pos - 1];
+        pos++;
+        fpos += incr;
+    }
+
+    if (colorInterpolation)
+        current_color = qPremultiply(current_color);
+
+    const int sLast = s.size() - 1;
+    for (int i = 0; i < sLast; ++i) {
+        qreal delta = 1/(s[i+1].first - s[i].first);
+        QRgba64 next_color = combineAlpha256(s[i + 1].second.rgba64(), alpha);
+        if (colorInterpolation)
+            next_color = qPremultiply(next_color);
+
+        while (fpos < s[i+1].first && pos < size) {
+            int dist = int(256 * ((fpos - s[i].first) * delta));
+            int idist = 256 - dist;
+            if (colorInterpolation)
+                colorTable[pos] = interpolate256(current_color, idist, next_color, dist);
+            else
+                colorTable[pos] = qPremultiply(interpolate256(current_color, idist, next_color, dist));
+            ++pos;
+            fpos += incr;
+        }
+        current_color = next_color;
+    }
+
+    Q_ASSERT(s.size() > 0);
+
+    QRgba64 last_color = qPremultiply(combineAlpha256(s[sLast].second.rgba64(), alpha));
+    for (;pos < size; ++pos)
+        colorTable[pos] = last_color;
+
+    // Make sure the last color stop is represented at the end of the table
+    colorTable[size-1] = last_color;
+}
+
+void QOpenGL2GradientCache::generateGradientColorTable(const QGradient& gradient, uint *colorTable, int size, qreal opacity) const
+{
+    int pos = 0;
+    const QGradientStops s = gradient.stops();
+
+    bool colorInterpolation = (gradient.interpolationMode() == QGradient::ColorInterpolation);
+
+    uint alpha = qRound(opacity * 256);
+    // Qt LIES! It returns ARGB (on little-endian AND on big-endian)
+    uint current_color = ARGB_COMBINE_ALPHA(s[0].second.rgba(), alpha);
+    qreal incr = 1.0 / qreal(size);
+    qreal fpos = 1.5 * incr;
+    colorTable[pos++] = ARGB2RGBA(qPremultiply(current_color));
+
+    while (fpos <= s.first().first) {
+        colorTable[pos] = colorTable[pos - 1];
+        pos++;
+        fpos += incr;
+    }
+
+    if (colorInterpolation)
+        current_color = qPremultiply(current_color);
+
+    const int sLast = s.size() - 1;
+    for (int i = 0; i < sLast; ++i) {
+        qreal delta = 1/(s[i+1].first - s[i].first);
+        uint next_color = ARGB_COMBINE_ALPHA(s[i + 1].second.rgba(), alpha);
+        if (colorInterpolation)
+            next_color = qPremultiply(next_color);
+
+        while (fpos < s[i+1].first && pos < size) {
+            int dist = int(256 * ((fpos - s[i].first) * delta));
+            int idist = 256 - dist;
+            if (colorInterpolation)
+                colorTable[pos] = ARGB2RGBA(INTERPOLATE_PIXEL_256(current_color, idist, next_color, dist));
+            else
+                colorTable[pos] = ARGB2RGBA(qPremultiply(INTERPOLATE_PIXEL_256(current_color, idist, next_color, dist)));
+            ++pos;
+            fpos += incr;
+        }
+        current_color = next_color;
+    }
+
+    Q_ASSERT(s.size() > 0);
+
+    uint last_color = ARGB2RGBA(qPremultiply(ARGB_COMBINE_ALPHA(s[sLast].second.rgba(), alpha)));
+    for (;pos < size; ++pos)
+        colorTable[pos] = last_color;
+
+    // Make sure the last color stop is represented at the end of the table
+    colorTable[size-1] = last_color;
+}
+
+QT_END_NAMESPACE
diff --git a/src/opengl/qopenglgradientcache_p.h b/src/opengl/qopenglgradientcache_p.h
new file mode 100644
index 0000000000..da070ae233
--- /dev/null
+++ b/src/opengl/qopenglgradientcache_p.h
@@ -0,0 +1,107 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtOpenGL module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QOPENGLGRADIENTCACHE_P_H
+#define QOPENGLGRADIENTCACHE_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <QMultiHash>
+#include <QObject>
+#include <private/qopenglcontext_p.h>
+#include <QtCore/qmutex.h>
+#include <QGradient>
+#include <qrgba64.h>
+
+QT_BEGIN_NAMESPACE
+
+class QOpenGL2GradientCache : public QOpenGLSharedResource
+{
+    struct CacheInfo
+    {
+        inline CacheInfo(QGradientStops s, qreal op, QGradient::InterpolationMode mode) :
+            stops(std::move(s)), opacity(op), interpolationMode(mode) {}
+
+        GLuint texId;
+        QGradientStops stops;
+        qreal opacity;
+        QGradient::InterpolationMode interpolationMode;
+    };
+
+    typedef QMultiHash<quint64, CacheInfo> QOpenGLGradientColorTableHash;
+
+public:
+    static QOpenGL2GradientCache *cacheForContext(QOpenGLContext *context);
+
+    QOpenGL2GradientCache(QOpenGLContext *);
+    ~QOpenGL2GradientCache();
+
+    GLuint getBuffer(const QGradient &gradient, qreal opacity);
+    inline int paletteSize() const { return 1024; }
+
+    void invalidateResource() override;
+    void freeResource(QOpenGLContext *ctx) override;
+
+private:
+    inline int maxCacheSize() const { return 60; }
+    inline void generateGradientColorTable(const QGradient& gradient,
+                                           QRgba64 *colorTable,
+                                           int size, qreal opacity) const;
+    inline void generateGradientColorTable(const QGradient& gradient,
+                                           uint *colorTable,
+                                           int size, qreal opacity) const;
+    GLuint addCacheElement(quint64 hash_val, const QGradient &gradient, qreal opacity);
+    void cleanCache();
+
+    QOpenGLGradientColorTableHash cache;
+    QMutex m_mutex;
+};
+
+QT_END_NAMESPACE
+
+#endif // QOPENGLGRADIENTCACHE_P_H
diff --git a/src/opengl/qopenglpaintdevice.cpp b/src/opengl/qopenglpaintdevice.cpp
new file mode 100644
index 0000000000..811425cf69
--- /dev/null
+++ b/src/opengl/qopenglpaintdevice.cpp
@@ -0,0 +1,372 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtOpenGL module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <qopenglpaintdevice.h>
+#include <qpaintengine.h>
+#include <qthreadstorage.h>
+
+#include <private/qopenglpaintdevice_p.h>
+#include <private/qobject_p.h>
+#include <private/qopenglcontext_p.h>
+#include <private/qopenglframebufferobject_p.h>
+#include <private/qopenglpaintengine_p.h>
+
+// for qt_defaultDpiX/Y
+#include <private/qfont_p.h>
+
+#include <qopenglfunctions.h>
+
+QT_BEGIN_NAMESPACE
+
+/*!
+    \class QOpenGLPaintDevice
+    \brief The QOpenGLPaintDevice class enables painting to an OpenGL context using QPainter.
+    \since 5.0
+    \inmodule QtOpenGL
+
+    \ingroup painting-3D
+
+    The QOpenGLPaintDevice uses the \b current QOpenGL context to render
+    QPainter draw commands. The context is captured upon construction. It
+    requires support for OpenGL (ES) 2.0 or higher.
+
+    \section1 Performance
+
+    The QOpenGLPaintDevice is almost always hardware accelerated and
+    has the potential of being much faster than software
+    rasterization. However, it is more sensitive to state changes, and
+    therefore requires the drawing commands to be carefully ordered to
+    achieve optimal performance.
+
+    \section1 Antialiasing and Quality
+
+    Antialiasing in the OpenGL paint engine is done using
+    multisampling. Most hardware require significantly more memory to
+    do multisampling and the resulting quality is not on par with the
+    quality of the software paint engine. The OpenGL paint engine's
+    strength lies in its performance, not its visual rendering
+    quality.
+
+    \section1 State Changes
+
+    When painting to a QOpenGLPaintDevice using QPainter, the state of
+    the current OpenGL context will be altered by the paint engine to
+    reflect its needs.  Applications should not rely upon the OpenGL
+    state being reset to its original conditions, particularly the
+    current shader program, OpenGL viewport, texture units, and
+    drawing modes.
+
+    \section1 Mixing QPainter and OpenGL
+
+    When intermixing QPainter and OpenGL, it is important to notify
+    QPainter that the OpenGL state may have been cluttered so it can
+    restore its internal state. This is achieved by calling \l
+    QPainter::beginNativePainting() before starting the OpenGL
+    rendering and calling \l QPainter::endNativePainting() after
+    finishing.
+
+    \sa {OpenGL Window Example}
+
+*/
+
+/*!
+    Constructs a QOpenGLPaintDevice.
+
+    The QOpenGLPaintDevice is only valid for the current context.
+
+    \sa QOpenGLContext::currentContext()
+*/
+QOpenGLPaintDevice::QOpenGLPaintDevice()
+    : d_ptr(new QOpenGLPaintDevicePrivate(QSize()))
+{
+}
+
+/*!
+    Constructs a QOpenGLPaintDevice with the given \a size.
+
+    The QOpenGLPaintDevice is only valid for the current context.
+
+    \sa QOpenGLContext::currentContext()
+*/
+QOpenGLPaintDevice::QOpenGLPaintDevice(const QSize &size)
+    : d_ptr(new QOpenGLPaintDevicePrivate(size))
+{
+}
+
+/*!
+    Constructs a QOpenGLPaintDevice with the given \a width and \a height.
+
+    The QOpenGLPaintDevice is only valid for the current context.
+
+    \sa QOpenGLContext::currentContext()
+*/
+QOpenGLPaintDevice::QOpenGLPaintDevice(int width, int height)
+    : QOpenGLPaintDevice(QSize(width, height))
+{
+}
+
+/*!
+    \internal
+ */
+QOpenGLPaintDevice::QOpenGLPaintDevice(QOpenGLPaintDevicePrivate &dd)
+    : d_ptr(&dd)
+{
+}
+
+/*!
+    Destroys the QOpenGLPaintDevice.
+*/
+
+QOpenGLPaintDevice::~QOpenGLPaintDevice()
+{
+    delete d_ptr->engine;
+}
+
+/*!
+    \fn int QOpenGLPaintDevice::devType() const
+    \internal
+    \reimp
+*/
+
+QOpenGLPaintDevicePrivate::QOpenGLPaintDevicePrivate(const QSize &sz)
+    : size(sz)
+    , ctx(QOpenGLContext::currentContext())
+    , dpmx(qt_defaultDpiX() * 100. / 2.54)
+    , dpmy(qt_defaultDpiY() * 100. / 2.54)
+    , devicePixelRatio(1.0)
+    , flipped(false)
+    , engine(nullptr)
+{
+}
+
+QOpenGLPaintDevicePrivate::~QOpenGLPaintDevicePrivate()
+{
+}
+
+class QOpenGLEngineThreadStorage
+{
+public:
+    QPaintEngine *engine() {
+        QPaintEngine *&localEngine = storage.localData();
+        if (!localEngine)
+            localEngine = new QOpenGL2PaintEngineEx;
+        return localEngine;
+    }
+
+private:
+    QThreadStorage<QPaintEngine *> storage;
+};
+
+Q_GLOBAL_STATIC(QOpenGLEngineThreadStorage, qt_opengl_engine)
+
+/*!
+    \reimp
+*/
+
+QPaintEngine *QOpenGLPaintDevice::paintEngine() const
+{
+    if (d_ptr->engine)
+        return d_ptr->engine;
+
+    QPaintEngine *engine = qt_opengl_engine()->engine();
+    if (engine->isActive() && engine->paintDevice() != this) {
+        d_ptr->engine = new QOpenGL2PaintEngineEx;
+        return d_ptr->engine;
+    }
+
+    return engine;
+}
+
+/*!
+    Returns the OpenGL context associated with the paint device.
+*/
+
+QOpenGLContext *QOpenGLPaintDevice::context() const
+{
+    return d_ptr->ctx;
+}
+
+/*!
+    Returns the pixel size of the paint device.
+
+    \sa setSize()
+*/
+
+QSize QOpenGLPaintDevice::size() const
+{
+    return d_ptr->size;
+}
+
+/*!
+    Sets the pixel size of the paint device to \a size.
+
+    \sa size()
+*/
+
+void QOpenGLPaintDevice::setSize(const QSize &size)
+{
+    d_ptr->size = size;
+}
+
+/*!
+    Sets the device pixel ratio for the paint device to \a devicePixelRatio.
+*/
+void QOpenGLPaintDevice::setDevicePixelRatio(qreal devicePixelRatio)
+{
+    d_ptr->devicePixelRatio = devicePixelRatio;
+}
+
+/*!
+    \reimp
+*/
+
+int QOpenGLPaintDevice::metric(QPaintDevice::PaintDeviceMetric metric) const
+{
+    switch (metric) {
+    case PdmWidth:
+        return d_ptr->size.width();
+    case PdmHeight:
+        return d_ptr->size.height();
+    case PdmDepth:
+        return 32;
+    case PdmWidthMM:
+        return qRound(d_ptr->size.width() * 1000 / d_ptr->dpmx);
+    case PdmHeightMM:
+        return qRound(d_ptr->size.height() * 1000 / d_ptr->dpmy);
+    case PdmNumColors:
+        return 0;
+    case PdmDpiX:
+        return qRound(d_ptr->dpmx * 0.0254);
+    case PdmDpiY:
+        return qRound(d_ptr->dpmy * 0.0254);
+    case PdmPhysicalDpiX:
+        return qRound(d_ptr->dpmx * 0.0254);
+    case PdmPhysicalDpiY:
+        return qRound(d_ptr->dpmy * 0.0254);
+    case PdmDevicePixelRatio:
+        return d_ptr->devicePixelRatio;
+    case PdmDevicePixelRatioScaled:
+        return d_ptr->devicePixelRatio * QPaintDevice::devicePixelRatioFScale();
+
+    default:
+        qWarning("QOpenGLPaintDevice::metric() - metric %d not known", metric);
+        return 0;
+    }
+}
+
+/*!
+    Returns the number of pixels per meter horizontally.
+
+    \sa setDotsPerMeterX()
+*/
+
+qreal QOpenGLPaintDevice::dotsPerMeterX() const
+{
+    return d_ptr->dpmx;
+}
+
+/*!
+    Returns the number of pixels per meter vertically.
+
+    \sa setDotsPerMeterY()
+*/
+
+qreal QOpenGLPaintDevice::dotsPerMeterY() const
+{
+    return d_ptr->dpmy;
+}
+
+/*!
+    Sets the number of pixels per meter horizontally to \a dpmx.
+
+    \sa dotsPerMeterX()
+*/
+
+void QOpenGLPaintDevice::setDotsPerMeterX(qreal dpmx)
+{
+    d_ptr->dpmx = dpmx;
+}
+
+/*!
+    Sets the number of pixels per meter vertically to \a dpmy.
+
+    \sa dotsPerMeterY()
+*/
+
+void QOpenGLPaintDevice::setDotsPerMeterY(qreal dpmy)
+{
+    d_ptr->dpmx = dpmy;
+}
+
+/*!
+    Sets whether painting should be flipped around the Y-axis or not to \a flipped.
+
+    \sa paintFlipped()
+*/
+void QOpenGLPaintDevice::setPaintFlipped(bool flipped)
+{
+    d_ptr->flipped = flipped;
+}
+
+/*!
+    Returns \c true if painting is flipped around the Y-axis.
+
+    \sa setPaintFlipped()
+*/
+
+bool QOpenGLPaintDevice::paintFlipped() const
+{
+    return d_ptr->flipped;
+}
+
+/*!
+    This virtual method is provided as a callback to allow re-binding a target
+    frame buffer object or context when different QOpenGLPaintDevice instances
+    are issuing draw calls alternately.
+
+    \l{QPainter::beginNativePainting()}{beginNativePainting()} will also trigger
+    this method.
+
+    The default implementation does nothing.
+*/
+void QOpenGLPaintDevice::ensureActiveTarget()
+{
+}
+
+QT_END_NAMESPACE
diff --git a/src/opengl/qopenglpaintdevice.h b/src/opengl/qopenglpaintdevice.h
new file mode 100644
index 0000000000..f4e1ce4a2e
--- /dev/null
+++ b/src/opengl/qopenglpaintdevice.h
@@ -0,0 +1,95 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtOpenGL module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QOPENGLPAINTDEVICE_H
+#define QOPENGLPAINTDEVICE_H
+
+#include <QtOpenGL/qtopenglglobal.h>
+
+#ifndef QT_NO_OPENGL
+
+#include <QtGui/qpaintdevice.h>
+#include <QtGui/qopengl.h>
+#include <QtGui/qopenglcontext.h>
+
+QT_BEGIN_NAMESPACE
+
+class QOpenGLPaintDevicePrivate;
+
+class Q_OPENGL_EXPORT QOpenGLPaintDevice : public QPaintDevice
+{
+    Q_DECLARE_PRIVATE(QOpenGLPaintDevice)
+public:
+    QOpenGLPaintDevice();
+    explicit QOpenGLPaintDevice(const QSize &size);
+    QOpenGLPaintDevice(int width, int height);
+    ~QOpenGLPaintDevice();
+
+    int devType() const override { return QInternal::OpenGL; }
+    QPaintEngine *paintEngine() const override;
+
+    QOpenGLContext *context() const;
+    QSize size() const;
+    void setSize(const QSize &size);
+    void setDevicePixelRatio(qreal devicePixelRatio);
+
+    qreal dotsPerMeterX() const;
+    qreal dotsPerMeterY() const;
+
+    void setDotsPerMeterX(qreal);
+    void setDotsPerMeterY(qreal);
+
+    void setPaintFlipped(bool flipped);
+    bool paintFlipped() const;
+
+    virtual void ensureActiveTarget();
+
+protected:
+    QOpenGLPaintDevice(QOpenGLPaintDevicePrivate &dd);
+    int metric(QPaintDevice::PaintDeviceMetric metric) const override;
+
+    Q_DISABLE_COPY(QOpenGLPaintDevice)
+    QScopedPointer<QOpenGLPaintDevicePrivate> d_ptr;
+};
+
+QT_END_NAMESPACE
+
+#endif // QT_NO_OPENGL
+
+#endif // QOPENGLPAINTDEVICE_H
diff --git a/src/opengl/qopenglpaintdevice_p.h b/src/opengl/qopenglpaintdevice_p.h
new file mode 100644
index 0000000000..f4f02e7b57
--- /dev/null
+++ b/src/opengl/qopenglpaintdevice_p.h
@@ -0,0 +1,87 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtOpenGL module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QOPENGL_PAINTDEVICE_P_H
+#define QOPENGL_PAINTDEVICE_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists for the convenience
+// of the Qt OpenGL classes.  This header file may change from
+// version to version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <qopenglpaintdevice.h>
+
+QT_BEGIN_NAMESPACE
+
+class QOpenGLContext;
+class QPaintEngine;
+
+class Q_OPENGL_EXPORT QOpenGLPaintDevicePrivate
+{
+public:
+    QOpenGLPaintDevicePrivate(const QSize &size);
+    virtual ~QOpenGLPaintDevicePrivate();
+
+    static QOpenGLPaintDevicePrivate *get(QOpenGLPaintDevice *dev) { return dev->d_func(); }
+
+    virtual void beginPaint() { }
+    virtual void endPaint() { }
+
+public:
+    QSize size;
+    QOpenGLContext *ctx;
+
+    qreal dpmx;
+    qreal dpmy;
+    qreal devicePixelRatio;
+
+    bool flipped;
+
+    QPaintEngine *engine;
+};
+
+QT_END_NAMESPACE
+
+#endif // QOPENGL_PAINTDEVICE_P_H
diff --git a/src/opengl/qopenglpaintengine.cpp b/src/opengl/qopenglpaintengine.cpp
new file mode 100644
index 0000000000..4168067e8f
--- /dev/null
+++ b/src/opengl/qopenglpaintengine.cpp
@@ -0,0 +1,2702 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtOpenGL module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*
+    When the active program changes, we need to update it's uniforms.
+    We could track state for each program and only update stale uniforms
+        - Could lead to lots of overhead if there's a lot of programs
+    We could update all the uniforms when the program changes
+        - Could end up updating lots of uniforms which don't need updating
+
+    Updating uniforms should be cheap, so the overhead of updating up-to-date
+    uniforms should be minimal. It's also less complex.
+
+    Things which _may_ cause a different program to be used:
+        - Change in brush/pen style
+        - Change in painter opacity
+        - Change in composition mode
+
+    Whenever we set a mode on the shader manager - it needs to tell us if it had
+    to switch to a different program.
+
+    The shader manager should only switch when we tell it to. E.g. if we set a new
+    brush style and then switch to transparent painter, we only want it to compile
+    and use the correct program when we really need it.
+*/
+
+// #define QT_OPENGL_CACHE_AS_VBOS
+
+#include <private/qopenglgradientcache_p.h>
+#include <private/qopengltexturecache_p.h>
+#include "qopenglpaintengine_p.h"
+#include "qopenglpaintdevice_p.h"
+
+#include <string.h> //for memcpy
+#include <qmath.h>
+
+#include <private/qopengl_p.h>
+#include <private/qopenglcontext_p.h>
+#include <private/qopenglextensions_p.h>
+#include <private/qpaintengineex_p.h>
+#include <QPaintEngine>
+#include <private/qpainter_p.h>
+#include <private/qfontengine_p.h>
+#include <private/qdatabuffer_p.h>
+#include <private/qstatictext_p.h>
+#include <private/qtriangulator_p.h>
+
+#include <private/qopenglengineshadermanager_p.h>
+#include <private/qopengl2pexvertexarray_p.h>
+#include <private/qopengltextureglyphcache_p.h>
+
+#include <QDebug>
+
+#ifndef GL_KHR_blend_equation_advanced
+#define GL_KHR_blend_equation_advanced 1
+#define GL_MULTIPLY_KHR                   0x9294
+#define GL_SCREEN_KHR                     0x9295
+#define GL_OVERLAY_KHR                    0x9296
+#define GL_DARKEN_KHR                     0x9297
+#define GL_LIGHTEN_KHR                    0x9298
+#define GL_COLORDODGE_KHR                 0x9299
+#define GL_COLORBURN_KHR                  0x929A
+#define GL_HARDLIGHT_KHR                  0x929B
+#define GL_SOFTLIGHT_KHR                  0x929C
+#define GL_DIFFERENCE_KHR                 0x929E
+#define GL_EXCLUSION_KHR                  0x92A0
+#endif /* GL_KHR_blend_equation_advanced */
+
+#ifndef GL_KHR_blend_equation_advanced_coherent
+#define GL_KHR_blend_equation_advanced_coherent 1
+#define GL_BLEND_ADVANCED_COHERENT_KHR    0x9285
+#endif /* GL_KHR_blend_equation_advanced_coherent */
+
+QT_BEGIN_NAMESPACE
+
+
+Q_OPENGL_EXPORT QImage qt_imageForBrush(int brushStyle, bool invert);
+
+////////////////////////////////// Private Methods //////////////////////////////////////////
+
+QOpenGL2PaintEngineExPrivate::~QOpenGL2PaintEngineExPrivate()
+{
+    delete shaderManager;
+
+    vertexBuffer.destroy();
+    texCoordBuffer.destroy();
+    opacityBuffer.destroy();
+    indexBuffer.destroy();
+    vao.destroy();
+
+    if (elementIndicesVBOId != 0) {
+        funcs.glDeleteBuffers(1, &elementIndicesVBOId);
+        elementIndicesVBOId = 0;
+    }
+}
+
+inline QColor qt_premultiplyColor(QColor c, GLfloat opacity)
+{
+    qreal alpha = c.alphaF() * opacity;
+    c.setAlphaF(alpha);
+    c.setRedF(c.redF() * alpha);
+    c.setGreenF(c.greenF() * alpha);
+    c.setBlueF(c.blueF() * alpha);
+    return c;
+}
+
+
+void QOpenGL2PaintEngineExPrivate::setBrush(const QBrush& brush)
+{
+    if (qbrush_fast_equals(currentBrush, brush))
+        return;
+
+    const Qt::BrushStyle newStyle = qbrush_style(brush);
+    Q_ASSERT(newStyle != Qt::NoBrush);
+
+    currentBrush = brush;
+    if (!currentBrushImage.isNull())
+        currentBrushImage = QImage();
+    brushUniformsDirty = true; // All brushes have at least one uniform
+
+    if (newStyle > Qt::SolidPattern)
+        brushTextureDirty = true;
+
+    if (currentBrush.style() == Qt::TexturePattern
+        && qHasPixmapTexture(brush) && brush.texture().isQBitmap())
+    {
+        shaderManager->setSrcPixelType(QOpenGLEngineShaderManager::TextureSrcWithPattern);
+    } else {
+        shaderManager->setSrcPixelType(newStyle);
+    }
+    shaderManager->optimiseForBrushTransform(currentBrush.transform().type());
+}
+
+
+void QOpenGL2PaintEngineExPrivate::useSimpleShader()
+{
+    shaderManager->useSimpleProgram();
+
+    if (matrixDirty)
+        updateMatrix();
+}
+
+/*
+    Single entry-point for activating, binding, and setting properties.
+
+    Allows keeping track of (caching) the latest texture unit and bound
+    texture in a central place, so that we can skip re-binding unless
+    needed.
+
+    \note Any code or Qt API that internally activates or binds will
+    not affect the cache used by this function, which means they will
+    lead to inconsisent state. QPainter::beginNativePainting() takes
+    care of resetting the cache, so for user–code this is fine, but
+    internally in the paint engine care must be taken to not call
+    functions that may activate or bind under our feet.
+*/
+template<typename T>
+void QOpenGL2PaintEngineExPrivate::updateTexture(GLenum textureUnit, const T &texture, GLenum wrapMode, GLenum filterMode, TextureUpdateMode updateMode)
+{
+    static const GLenum target = GL_TEXTURE_2D;
+
+    activateTextureUnit(textureUnit);
+
+    GLuint textureId = bindTexture(texture);
+
+    if (updateMode == UpdateIfNeeded && textureId == lastTextureUsed)
+        return;
+
+    lastTextureUsed = textureId;
+
+    funcs.glTexParameteri(target, GL_TEXTURE_WRAP_S, wrapMode);
+    funcs.glTexParameteri(target, GL_TEXTURE_WRAP_T, wrapMode);
+
+    funcs.glTexParameteri(target, GL_TEXTURE_MAG_FILTER, filterMode);
+    funcs.glTexParameteri(target, GL_TEXTURE_MIN_FILTER, filterMode);
+}
+
+void QOpenGL2PaintEngineExPrivate::activateTextureUnit(GLenum textureUnit)
+{
+    if (textureUnit != lastTextureUnitUsed) {
+        funcs.glActiveTexture(GL_TEXTURE0 + textureUnit);
+        lastTextureUnitUsed = textureUnit;
+
+        // We simplify things by keeping a single cached value of the last
+        // texture that was bound, instead of one per texture unit. This
+        // means that switching texture units could potentially mean we
+        // need a re-bind and corresponding parameter updates.
+        lastTextureUsed = GLuint(-1);
+    }
+}
+
+template<>
+GLuint QOpenGL2PaintEngineExPrivate::bindTexture(const GLuint &textureId)
+{
+    if (textureId != lastTextureUsed)
+        funcs.glBindTexture(GL_TEXTURE_2D, textureId);
+
+    return textureId;
+}
+
+template<>
+GLuint QOpenGL2PaintEngineExPrivate::bindTexture(const QImage &image)
+{
+    return QOpenGLTextureCache::cacheForContext(ctx)->bindTexture(ctx, image);
+}
+
+template<>
+GLuint QOpenGL2PaintEngineExPrivate::bindTexture(const QPixmap &pixmap)
+{
+    return QOpenGLTextureCache::cacheForContext(ctx)->bindTexture(ctx, pixmap);
+}
+
+template<>
+GLuint QOpenGL2PaintEngineExPrivate::bindTexture(const QGradient &gradient)
+{
+    // We apply global opacity in the fragment shaders, so we always pass 1.0
+    // for opacity to the cache.
+    GLuint textureId = QOpenGL2GradientCache::cacheForContext(ctx)->getBuffer(gradient, 1.0);
+
+    // QOpenGL2GradientCache::getBuffer() may bind and generate a new texture if it
+    // hasn't been cached yet, but will otherwise return an unbound texture id. To
+    // be sure that the texture is bound, we unfortunately have to bind again,
+    // which results in the initial generation of the texture doing two binds.
+    return bindTexture(textureId);
+}
+
+struct ImageWithBindOptions
+{
+    const QImage &image;
+    QOpenGLTextureUploader::BindOptions options;
+};
+
+template<>
+GLuint QOpenGL2PaintEngineExPrivate::bindTexture(const ImageWithBindOptions &imageWithOptions)
+{
+    return QOpenGLTextureCache::cacheForContext(ctx)->bindTexture(ctx, imageWithOptions.image, imageWithOptions.options);
+}
+
+inline static bool isPowerOfTwo(int x)
+{
+    // Assumption: x >= 1
+    return x == (x & -x);
+}
+
+void QOpenGL2PaintEngineExPrivate::updateBrushTexture()
+{
+    Q_Q(QOpenGL2PaintEngineEx);
+//     qDebug("QOpenGL2PaintEngineExPrivate::updateBrushTexture()");
+    Qt::BrushStyle style = currentBrush.style();
+
+    bool smoothPixmapTransform = q->state()->renderHints & QPainter::SmoothPixmapTransform;
+    GLenum filterMode = smoothPixmapTransform ? GL_LINEAR : GL_NEAREST;
+
+    if ( (style >= Qt::Dense1Pattern) && (style <= Qt::DiagCrossPattern) ) {
+        // Get the image data for the pattern
+        QImage textureImage = qt_imageForBrush(style, false);
+
+        updateTexture(QT_BRUSH_TEXTURE_UNIT, textureImage, GL_REPEAT, filterMode, ForceUpdate);
+    }
+    else if (style >= Qt::LinearGradientPattern && style <= Qt::ConicalGradientPattern) {
+        // Gradiant brush: All the gradiants use the same texture
+
+        const QGradient *gradient = currentBrush.gradient();
+
+        GLenum wrapMode = GL_CLAMP_TO_EDGE;
+        if (gradient->spread() == QGradient::RepeatSpread || gradient->type() == QGradient::ConicalGradient)
+            wrapMode = GL_REPEAT;
+        else if (gradient->spread() == QGradient::ReflectSpread)
+            wrapMode = GL_MIRRORED_REPEAT;
+
+        updateTexture(QT_BRUSH_TEXTURE_UNIT, *gradient, wrapMode, filterMode, ForceUpdate);
+    }
+    else if (style == Qt::TexturePattern) {
+        currentBrushImage = currentBrush.textureImage();
+
+        int max_texture_size = ctx->d_func()->maxTextureSize();
+        QSize newSize = currentBrushImage.size();
+        newSize = newSize.boundedTo(QSize(max_texture_size, max_texture_size));
+        if (!QOpenGLContext::currentContext()->functions()->hasOpenGLFeature(QOpenGLFunctions::NPOTTextureRepeat)) {
+            if (!isPowerOfTwo(newSize.width()) || !isPowerOfTwo(newSize.height())) {
+                newSize.setHeight(qNextPowerOfTwo(newSize.height() - 1));
+                newSize.setWidth(qNextPowerOfTwo(newSize.width() - 1));
+            }
+        }
+        if (currentBrushImage.size() != newSize)
+            currentBrushImage = currentBrushImage.scaled(newSize, Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
+
+        GLuint wrapMode = GL_REPEAT;
+
+        updateTexture(QT_BRUSH_TEXTURE_UNIT, currentBrushImage, wrapMode, filterMode, ForceUpdate);
+    }
+    brushTextureDirty = false;
+}
+
+
+void QOpenGL2PaintEngineExPrivate::updateBrushUniforms()
+{
+//     qDebug("QOpenGL2PaintEngineExPrivate::updateBrushUniforms()");
+    Qt::BrushStyle style = currentBrush.style();
+
+    if (style == Qt::NoBrush)
+        return;
+
+    QTransform brushQTransform = currentBrush.transform();
+
+    if (style == Qt::SolidPattern) {
+        QColor col = qt_premultiplyColor(currentBrush.color(), (GLfloat)q->state()->opacity);
+        shaderManager->currentProgram()->setUniformValue(location(QOpenGLEngineShaderManager::FragmentColor), col);
+    }
+    else {
+        // All other brushes have a transform and thus need the translation point:
+        QPointF translationPoint;
+
+        if (style <= Qt::DiagCrossPattern) {
+            QColor col = qt_premultiplyColor(currentBrush.color(), (GLfloat)q->state()->opacity);
+
+            shaderManager->currentProgram()->setUniformValue(location(QOpenGLEngineShaderManager::PatternColor), col);
+
+            QVector2D halfViewportSize(width*0.5, height*0.5);
+            shaderManager->currentProgram()->setUniformValue(location(QOpenGLEngineShaderManager::HalfViewportSize), halfViewportSize);
+        }
+        else if (style == Qt::LinearGradientPattern) {
+            const QLinearGradient *g = static_cast<const QLinearGradient *>(currentBrush.gradient());
+
+            QPointF realStart = g->start();
+            QPointF realFinal = g->finalStop();
+            translationPoint = realStart;
+
+            QPointF l = realFinal - realStart;
+
+            QVector3D linearData(
+                l.x(),
+                l.y(),
+                1.0f / (l.x() * l.x() + l.y() * l.y())
+            );
+
+            shaderManager->currentProgram()->setUniformValue(location(QOpenGLEngineShaderManager::LinearData), linearData);
+
+            QVector2D halfViewportSize(width*0.5, height*0.5);
+            shaderManager->currentProgram()->setUniformValue(location(QOpenGLEngineShaderManager::HalfViewportSize), halfViewportSize);
+        }
+        else if (style == Qt::ConicalGradientPattern) {
+            const QConicalGradient *g = static_cast<const QConicalGradient *>(currentBrush.gradient());
+            translationPoint   = g->center();
+
+            GLfloat angle = -qDegreesToRadians(g->angle());
+
+            shaderManager->currentProgram()->setUniformValue(location(QOpenGLEngineShaderManager::Angle), angle);
+
+            QVector2D halfViewportSize(width*0.5, height*0.5);
+            shaderManager->currentProgram()->setUniformValue(location(QOpenGLEngineShaderManager::HalfViewportSize), halfViewportSize);
+        }
+        else if (style == Qt::RadialGradientPattern) {
+            const QRadialGradient *g = static_cast<const QRadialGradient *>(currentBrush.gradient());
+            QPointF realCenter = g->center();
+            QPointF realFocal  = g->focalPoint();
+            qreal   realRadius = g->centerRadius() - g->focalRadius();
+            translationPoint   = realFocal;
+
+            QPointF fmp = realCenter - realFocal;
+            shaderManager->currentProgram()->setUniformValue(location(QOpenGLEngineShaderManager::Fmp), fmp);
+
+            GLfloat fmp2_m_radius2 = -fmp.x() * fmp.x() - fmp.y() * fmp.y() + realRadius*realRadius;
+            shaderManager->currentProgram()->setUniformValue(location(QOpenGLEngineShaderManager::Fmp2MRadius2), fmp2_m_radius2);
+            shaderManager->currentProgram()->setUniformValue(location(QOpenGLEngineShaderManager::Inverse2Fmp2MRadius2),
+                                                             GLfloat(1.0 / (2.0*fmp2_m_radius2)));
+            shaderManager->currentProgram()->setUniformValue(location(QOpenGLEngineShaderManager::SqrFr),
+                                                             GLfloat(g->focalRadius() * g->focalRadius()));
+            shaderManager->currentProgram()->setUniformValue(location(QOpenGLEngineShaderManager::BRadius),
+                                                             GLfloat(2 * (g->centerRadius() - g->focalRadius()) * g->focalRadius()),
+                                                             g->focalRadius(),
+                                                             g->centerRadius() - g->focalRadius());
+
+            QVector2D halfViewportSize(width*0.5, height*0.5);
+            shaderManager->currentProgram()->setUniformValue(location(QOpenGLEngineShaderManager::HalfViewportSize), halfViewportSize);
+        }
+        else if (style == Qt::TexturePattern) {
+            const QPixmap& texPixmap = currentBrush.texture();
+
+            if (qHasPixmapTexture(currentBrush) && currentBrush.texture().isQBitmap()) {
+                QColor col = qt_premultiplyColor(currentBrush.color(), (GLfloat)q->state()->opacity);
+                shaderManager->currentProgram()->setUniformValue(location(QOpenGLEngineShaderManager::PatternColor), col);
+            }
+
+            QSizeF invertedTextureSize(1.0 / texPixmap.width(), 1.0 / texPixmap.height());
+            shaderManager->currentProgram()->setUniformValue(location(QOpenGLEngineShaderManager::InvertedTextureSize), invertedTextureSize);
+
+            QVector2D halfViewportSize(width*0.5, height*0.5);
+            shaderManager->currentProgram()->setUniformValue(location(QOpenGLEngineShaderManager::HalfViewportSize), halfViewportSize);
+        }
+        else
+            qWarning("QOpenGL2PaintEngineEx: Unimplemented fill style");
+
+        const QPointF &brushOrigin = q->state()->brushOrigin;
+        QTransform matrix = q->state()->matrix;
+        matrix.translate(brushOrigin.x(), brushOrigin.y());
+
+        QTransform translate(1, 0, 0, 1, -translationPoint.x(), -translationPoint.y());
+        qreal m22 = -1;
+        qreal dy = height;
+        if (device->paintFlipped()) {
+            m22 = 1;
+            dy = 0;
+        }
+        QTransform gl_to_qt(1, 0, 0, m22, 0, dy);
+        QTransform inv_matrix = gl_to_qt * (brushQTransform * matrix).inverted() * translate;
+
+        shaderManager->currentProgram()->setUniformValue(location(QOpenGLEngineShaderManager::BrushTransform), inv_matrix);
+        shaderManager->currentProgram()->setUniformValue(location(QOpenGLEngineShaderManager::BrushTexture), QT_BRUSH_TEXTURE_UNIT);
+    }
+    brushUniformsDirty = false;
+}
+
+
+// This assumes the shader manager has already setup the correct shader program
+void QOpenGL2PaintEngineExPrivate::updateMatrix()
+{
+//     qDebug("QOpenGL2PaintEngineExPrivate::updateMatrix()");
+
+    const QTransform& transform = q->state()->matrix;
+
+    // The projection matrix converts from Qt's coordinate system to GL's coordinate system
+    //    * GL's viewport is 2x2, Qt's is width x height
+    //    * GL has +y -> -y going from bottom -> top, Qt is the other way round
+    //    * GL has [0,0] in the center, Qt has it in the top-left
+    //
+    // This results in the Projection matrix below, which is multiplied by the painter's
+    // transformation matrix, as shown below:
+    //
+    //                Projection Matrix                      Painter Transform
+    // ------------------------------------------------   ------------------------
+    // | 2.0 / width  |      0.0      |     -1.0      |   |  m11  |  m21  |  dx  |
+    // |     0.0      | -2.0 / height |      1.0      | * |  m12  |  m22  |  dy  |
+    // |     0.0      |      0.0      |      1.0      |   |  m13  |  m23  |  m33 |
+    // ------------------------------------------------   ------------------------
+    //
+    // NOTE: The resultant matrix is also transposed, as GL expects column-major matracies
+
+    const GLfloat wfactor = 2.0f / width;
+    GLfloat hfactor = -2.0f / height;
+
+    GLfloat dx = transform.dx();
+    GLfloat dy = transform.dy();
+
+    if (device->paintFlipped()) {
+        hfactor *= -1;
+        dy -= height;
+    }
+
+    // Non-integer translates can have strange effects for some rendering operations such as
+    // anti-aliased text rendering. In such cases, we snap the translate to the pixel grid.
+    if (snapToPixelGrid && transform.type() == QTransform::TxTranslate) {
+        // 0.50 needs to rounded down to 0.0 for consistency with raster engine:
+        dx = std::ceil(dx - 0.5f);
+        dy = std::ceil(dy - 0.5f);
+    }
+    pmvMatrix[0][0] = (wfactor * transform.m11())  - transform.m13();
+    pmvMatrix[1][0] = (wfactor * transform.m21())  - transform.m23();
+    pmvMatrix[2][0] = (wfactor * dx) - transform.m33();
+    pmvMatrix[0][1] = (hfactor * transform.m12())  + transform.m13();
+    pmvMatrix[1][1] = (hfactor * transform.m22())  + transform.m23();
+    pmvMatrix[2][1] = (hfactor * dy) + transform.m33();
+    pmvMatrix[0][2] = transform.m13();
+    pmvMatrix[1][2] = transform.m23();
+    pmvMatrix[2][2] = transform.m33();
+
+    // 1/10000 == 0.0001, so we have good enough res to cover curves
+    // that span the entire widget...
+    inverseScale = qMax(1 / qMax( qMax(qAbs(transform.m11()), qAbs(transform.m22())),
+                                  qMax(qAbs(transform.m12()), qAbs(transform.m21())) ),
+                        qreal(0.0001));
+
+    matrixDirty = false;
+    matrixUniformDirty = true;
+
+    // Set the PMV matrix attribute. As we use an attributes rather than uniforms, we only
+    // need to do this once for every matrix change and persists across all shader programs.
+    funcs.glVertexAttrib3fv(QT_PMV_MATRIX_1_ATTR, pmvMatrix[0]);
+    funcs.glVertexAttrib3fv(QT_PMV_MATRIX_2_ATTR, pmvMatrix[1]);
+    funcs.glVertexAttrib3fv(QT_PMV_MATRIX_3_ATTR, pmvMatrix[2]);
+
+    dasher.setInvScale(inverseScale);
+    stroker.setInvScale(inverseScale);
+}
+
+
+void QOpenGL2PaintEngineExPrivate::updateCompositionMode()
+{
+    // NOTE: The entire paint engine works on pre-multiplied data - which is why some of these
+    //       composition modes look odd.
+//     qDebug() << "QOpenGL2PaintEngineExPrivate::updateCompositionMode() - Setting GL composition mode for " << q->state()->composition_mode;
+    if (ctx->functions()->hasOpenGLFeature(QOpenGLFunctions::BlendEquationAdvanced)) {
+       if (q->state()->composition_mode <= QPainter::CompositionMode_Plus) {
+           funcs.glDisable(GL_BLEND_ADVANCED_COHERENT_KHR);
+           funcs.glBlendEquation(GL_FUNC_ADD);
+       } else {
+           funcs.glEnable(GL_BLEND_ADVANCED_COHERENT_KHR);
+       }
+       shaderManager->setCompositionMode(q->state()->composition_mode);
+    } else {
+        if (q->state()->composition_mode > QPainter::CompositionMode_Plus) {
+            qWarning("Unsupported composition mode");
+            compositionModeDirty = false;
+            return;
+        }
+    }
+    switch(q->state()->composition_mode) {
+    case QPainter::CompositionMode_SourceOver:
+        funcs.glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
+        break;
+    case QPainter::CompositionMode_DestinationOver:
+        funcs.glBlendFunc(GL_ONE_MINUS_DST_ALPHA, GL_ONE);
+        break;
+    case QPainter::CompositionMode_Clear:
+        funcs.glBlendFunc(GL_ZERO, GL_ZERO);
+        break;
+    case QPainter::CompositionMode_Source:
+        funcs.glBlendFunc(GL_ONE, GL_ZERO);
+        break;
+    case QPainter::CompositionMode_Destination:
+        funcs.glBlendFunc(GL_ZERO, GL_ONE);
+        break;
+    case QPainter::CompositionMode_SourceIn:
+        funcs.glBlendFunc(GL_DST_ALPHA, GL_ZERO);
+        break;
+    case QPainter::CompositionMode_DestinationIn:
+        funcs.glBlendFunc(GL_ZERO, GL_SRC_ALPHA);
+        break;
+    case QPainter::CompositionMode_SourceOut:
+        funcs.glBlendFunc(GL_ONE_MINUS_DST_ALPHA, GL_ZERO);
+        break;
+    case QPainter::CompositionMode_DestinationOut:
+        funcs.glBlendFunc(GL_ZERO, GL_ONE_MINUS_SRC_ALPHA);
+        break;
+    case QPainter::CompositionMode_SourceAtop:
+        funcs.glBlendFunc(GL_DST_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+        break;
+    case QPainter::CompositionMode_DestinationAtop:
+        funcs.glBlendFunc(GL_ONE_MINUS_DST_ALPHA, GL_SRC_ALPHA);
+        break;
+    case QPainter::CompositionMode_Xor:
+        funcs.glBlendFunc(GL_ONE_MINUS_DST_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+        break;
+    case QPainter::CompositionMode_Plus:
+        funcs.glBlendFunc(GL_ONE, GL_ONE);
+        break;
+    case QPainter::CompositionMode_Multiply:
+        funcs.glBlendEquation(GL_MULTIPLY_KHR);
+        break;
+    case QPainter::CompositionMode_Screen:
+        funcs.glBlendEquation(GL_SCREEN_KHR);
+        break;
+    case QPainter::CompositionMode_Overlay:
+        funcs.glBlendEquation(GL_OVERLAY_KHR);
+        break;
+    case QPainter::CompositionMode_Darken:
+        funcs.glBlendEquation(GL_DARKEN_KHR);
+        break;
+    case QPainter::CompositionMode_Lighten:
+        funcs.glBlendEquation(GL_LIGHTEN_KHR);
+        break;
+    case QPainter::CompositionMode_ColorDodge:
+        funcs.glBlendEquation(GL_COLORDODGE_KHR);
+        break;
+    case QPainter::CompositionMode_ColorBurn:
+        funcs.glBlendEquation(GL_COLORBURN_KHR);
+        break;
+    case QPainter::CompositionMode_HardLight:
+        funcs.glBlendEquation(GL_HARDLIGHT_KHR);
+        break;
+    case QPainter::CompositionMode_SoftLight:
+        funcs.glBlendEquation(GL_SOFTLIGHT_KHR);
+        break;
+    case QPainter::CompositionMode_Difference:
+        funcs.glBlendEquation(GL_DIFFERENCE_KHR);
+        break;
+    case QPainter::CompositionMode_Exclusion:
+        funcs.glBlendEquation(GL_EXCLUSION_KHR);
+        break;
+    default:
+        qWarning("Unsupported composition mode");
+        break;
+    }
+
+    compositionModeDirty = false;
+}
+
+static inline void setCoords(GLfloat *coords, const QOpenGLRect &rect)
+{
+    coords[0] = rect.left;
+    coords[1] = rect.top;
+    coords[2] = rect.right;
+    coords[3] = rect.top;
+    coords[4] = rect.right;
+    coords[5] = rect.bottom;
+    coords[6] = rect.left;
+    coords[7] = rect.bottom;
+}
+
+void QOpenGL2PaintEngineExPrivate::drawTexture(const QOpenGLRect& dest, const QOpenGLRect& src, const QSize &textureSize, bool opaque, bool pattern)
+{
+    // Setup for texture drawing
+    currentBrush = noBrush;
+
+    if (snapToPixelGrid) {
+        snapToPixelGrid = false;
+        matrixDirty = true;
+    }
+
+    if (prepareForDraw(opaque))
+        shaderManager->currentProgram()->setUniformValue(location(QOpenGLEngineShaderManager::ImageTexture), QT_IMAGE_TEXTURE_UNIT);
+
+    if (pattern) {
+        QColor col = qt_premultiplyColor(q->state()->pen.color(), (GLfloat)q->state()->opacity);
+        shaderManager->currentProgram()->setUniformValue(location(QOpenGLEngineShaderManager::PatternColor), col);
+    }
+
+    GLfloat dx = 1.0 / textureSize.width();
+    GLfloat dy = 1.0 / textureSize.height();
+
+    QOpenGLRect srcTextureRect(src.left*dx, src.top*dy, src.right*dx, src.bottom*dy);
+
+    setCoords(staticVertexCoordinateArray, dest);
+    setCoords(staticTextureCoordinateArray, srcTextureRect);
+
+    setVertexAttribArrayEnabled(QT_VERTEX_COORDS_ATTR, true);
+    setVertexAttribArrayEnabled(QT_TEXTURE_COORDS_ATTR, true);
+
+    uploadData(QT_VERTEX_COORDS_ATTR, staticVertexCoordinateArray, 8);
+    uploadData(QT_TEXTURE_COORDS_ATTR, staticTextureCoordinateArray, 8);
+
+    funcs.glDrawArrays(GL_TRIANGLE_FAN, 0, 4);
+}
+
+void QOpenGL2PaintEngineEx::beginNativePainting()
+{
+    Q_D(QOpenGL2PaintEngineEx);
+    ensureActive();
+    d->transferMode(BrushDrawingMode);
+
+    d->nativePaintingActive = true;
+
+    d->funcs.glUseProgram(0);
+
+    // Disable all the vertex attribute arrays:
+    for (int i = 0; i < QT_GL_VERTEX_ARRAY_TRACKED_COUNT; ++i)
+        d->funcs.glDisableVertexAttribArray(i);
+
+#if !defined(QT_OPENGL_ES_2) && !defined(QT_OPENGL_DYNAMIC)
+    Q_ASSERT(QOpenGLContext::currentContext());
+    const QOpenGLContext *ctx = d->ctx;
+    const QSurfaceFormat &fmt = d->device->context()->format();
+    if (fmt.majorVersion() < 3 || (fmt.majorVersion() == 3 && fmt.minorVersion() < 1)
+        || (fmt.majorVersion() == 3 && fmt.minorVersion() == 1 && ctx->hasExtension(QByteArrayLiteral("GL_ARB_compatibility")))
+        || fmt.profile() == QSurfaceFormat::CompatibilityProfile)
+    {
+        // be nice to people who mix OpenGL 1.x code with QPainter commands
+        // by setting modelview and projection matrices to mirror the GL 1
+        // paint engine
+        const QTransform& mtx = state()->matrix;
+
+        float mv_matrix[4][4] =
+            {
+                { float(mtx.m11()), float(mtx.m12()),     0, float(mtx.m13()) },
+                { float(mtx.m21()), float(mtx.m22()),     0, float(mtx.m23()) },
+                {                0,                0,     1,                0 },
+                {  float(mtx.dx()),  float(mtx.dy()),     0, float(mtx.m33()) }
+            };
+
+        const QSize sz = d->device->size();
+
+        glMatrixMode(GL_PROJECTION);
+        glLoadIdentity();
+        glOrtho(0, sz.width(), sz.height(), 0, -999999, 999999);
+
+        glMatrixMode(GL_MODELVIEW);
+        glLoadMatrixf(&mv_matrix[0][0]);
+    }
+#endif // QT_OPENGL_ES_2
+
+    d->resetGLState();
+
+    // We don't know what texture units and textures the native painting
+    // will activate and bind, so we can't assume anything when we return
+    // from the native painting.
+    d->lastTextureUnitUsed = QT_UNKNOWN_TEXTURE_UNIT;
+    d->lastTextureUsed = GLuint(-1);
+
+    d->dirtyStencilRegion = QRect(0, 0, d->width, d->height);
+
+    d->shaderManager->setDirty();
+
+    d->needsSync = true;
+}
+
+void QOpenGL2PaintEngineExPrivate::resetGLState()
+{
+    activateTextureUnit(QT_DEFAULT_TEXTURE_UNIT);
+
+    funcs.glDisable(GL_BLEND);
+    funcs.glDisable(GL_STENCIL_TEST);
+    funcs.glDisable(GL_DEPTH_TEST);
+    funcs.glDisable(GL_SCISSOR_TEST);
+    funcs.glDepthMask(true);
+    funcs.glDepthFunc(GL_LESS);
+    funcs.glClearDepthf(1);
+    funcs.glStencilMask(0xff);
+    funcs.glStencilOp(GL_KEEP, GL_KEEP, GL_KEEP);
+    funcs.glStencilFunc(GL_ALWAYS, 0, 0xff);
+    setVertexAttribArrayEnabled(QT_TEXTURE_COORDS_ATTR, false);
+    setVertexAttribArrayEnabled(QT_VERTEX_COORDS_ATTR, false);
+    setVertexAttribArrayEnabled(QT_OPACITY_ATTR, false);
+    if (!QOpenGLContext::currentContext()->isOpenGLES()) {
+        // gl_Color, corresponding to vertex attribute 3, may have been changed
+        float color[] = { 1.0f, 1.0f, 1.0f, 1.0f };
+        funcs.glVertexAttrib4fv(3, color);
+    }
+    if (vao.isCreated()) {
+        vao.release();
+        funcs.glBindBuffer(GL_ARRAY_BUFFER, 0);
+        funcs.glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0);
+    }
+}
+
+void QOpenGL2PaintEngineEx::endNativePainting()
+{
+    Q_D(QOpenGL2PaintEngineEx);
+    d->needsSync = true;
+    d->nativePaintingActive = false;
+}
+
+void QOpenGL2PaintEngineEx::invalidateState()
+{
+    Q_D(QOpenGL2PaintEngineEx);
+    d->needsSync = true;
+}
+
+bool QOpenGL2PaintEngineEx::isNativePaintingActive() const {
+    Q_D(const QOpenGL2PaintEngineEx);
+    return d->nativePaintingActive;
+}
+
+void QOpenGL2PaintEngineExPrivate::transferMode(EngineMode newMode)
+{
+    if (newMode == mode)
+        return;
+
+    if (newMode == TextDrawingMode) {
+        shaderManager->setHasComplexGeometry(true);
+    } else {
+        shaderManager->setHasComplexGeometry(false);
+    }
+
+    if (newMode == ImageDrawingMode) {
+        uploadData(QT_VERTEX_COORDS_ATTR, staticVertexCoordinateArray, 8);
+        uploadData(QT_TEXTURE_COORDS_ATTR, staticTextureCoordinateArray, 8);
+    }
+
+    if (newMode == ImageArrayDrawingMode || newMode == ImageOpacityArrayDrawingMode) {
+        uploadData(QT_VERTEX_COORDS_ATTR, (GLfloat*)vertexCoordinateArray.data(), vertexCoordinateArray.vertexCount() * 2);
+        uploadData(QT_TEXTURE_COORDS_ATTR, (GLfloat*)textureCoordinateArray.data(), textureCoordinateArray.vertexCount() * 2);
+
+        if (newMode == ImageOpacityArrayDrawingMode)
+            uploadData(QT_OPACITY_ATTR, (GLfloat*)opacityArray.data(), opacityArray.size());
+    }
+
+    // This needs to change when we implement high-quality anti-aliasing...
+    if (newMode != TextDrawingMode)
+        shaderManager->setMaskType(QOpenGLEngineShaderManager::NoMask);
+
+    mode = newMode;
+}
+
+struct QOpenGL2PEVectorPathCache
+{
+#ifdef QT_OPENGL_CACHE_AS_VBOS
+    GLuint vbo;
+    GLuint ibo;
+#else
+    float *vertices;
+    void *indices;
+#endif
+    int vertexCount;
+    int indexCount;
+    GLenum primitiveType;
+    qreal iscale;
+    QVertexIndexVector::Type indexType;
+};
+
+void QOpenGL2PaintEngineExPrivate::cleanupVectorPath(QPaintEngineEx *engine, void *data)
+{
+    QOpenGL2PEVectorPathCache *c = (QOpenGL2PEVectorPathCache *) data;
+#ifdef QT_OPENGL_CACHE_AS_VBOS
+    Q_ASSERT(engine->type() == QPaintEngine::OpenGL2);
+    static_cast<QOpenGL2PaintEngineEx *>(engine)->d_func()->unusedVBOSToClean << c->vbo;
+    if (c->ibo)
+        d->unusedIBOSToClean << c->ibo;
+#else
+    Q_UNUSED(engine);
+    free(c->vertices);
+    free(c->indices);
+#endif
+    delete c;
+}
+
+// Assumes everything is configured for the brush you want to use
+void QOpenGL2PaintEngineExPrivate::fill(const QVectorPath& path)
+{
+    transferMode(BrushDrawingMode);
+
+    if (snapToPixelGrid) {
+        snapToPixelGrid = false;
+        matrixDirty = true;
+    }
+
+    // Might need to call updateMatrix to re-calculate inverseScale
+    if (matrixDirty)
+        updateMatrix();
+
+    const bool supportsElementIndexUint = funcs.hasOpenGLExtension(QOpenGLExtensions::ElementIndexUint);
+
+    const QPointF* const points = reinterpret_cast<const QPointF*>(path.points());
+
+    // Check to see if there's any hints
+    if (path.shape() == QVectorPath::RectangleHint) {
+        QOpenGLRect rect(points[0].x(), points[0].y(), points[2].x(), points[2].y());
+        prepareForDraw(currentBrush.isOpaque());
+        composite(rect);
+    } else if (path.isConvex()) {
+
+        if (path.isCacheable()) {
+            QVectorPath::CacheEntry *data = path.lookupCacheData(q);
+            QOpenGL2PEVectorPathCache *cache;
+
+            bool updateCache = false;
+
+            if (data) {
+                cache = (QOpenGL2PEVectorPathCache *) data->data;
+                // Check if scale factor is exceeded and regenerate if so...
+                qreal scaleFactor = cache->iscale / inverseScale;
+                if (scaleFactor < 0.5 || scaleFactor > 2.0) {
+#ifdef QT_OPENGL_CACHE_AS_VBOS
+                    glDeleteBuffers(1, &cache->vbo);
+                    cache->vbo = 0;
+                    Q_ASSERT(cache->ibo == 0);
+#else
+                    free(cache->vertices);
+                    Q_ASSERT(cache->indices == nullptr);
+#endif
+                    updateCache = true;
+                }
+            } else {
+                cache = new QOpenGL2PEVectorPathCache;
+                data = const_cast<QVectorPath &>(path).addCacheData(q, cache, cleanupVectorPath);
+                updateCache = true;
+            }
+
+            // Flatten the path at the current scale factor and fill it into the cache struct.
+            if (updateCache) {
+                vertexCoordinateArray.clear();
+                vertexCoordinateArray.addPath(path, inverseScale, false);
+                int vertexCount = vertexCoordinateArray.vertexCount();
+                int floatSizeInBytes = vertexCount * 2 * sizeof(float);
+                cache->vertexCount = vertexCount;
+                cache->indexCount = 0;
+                cache->primitiveType = GL_TRIANGLE_FAN;
+                cache->iscale = inverseScale;
+#ifdef QT_OPENGL_CACHE_AS_VBOS
+                funcs.glGenBuffers(1, &cache->vbo);
+                funcs.glBindBuffer(GL_ARRAY_BUFFER, cache->vbo);
+                funcs.glBufferData(GL_ARRAY_BUFFER, floatSizeInBytes, vertexCoordinateArray.data(), GL_STATIC_DRAW);
+                cache->ibo = 0;
+#else
+                cache->vertices = (float *) malloc(floatSizeInBytes);
+                memcpy(cache->vertices, vertexCoordinateArray.data(), floatSizeInBytes);
+                cache->indices = nullptr;
+#endif
+            }
+
+            prepareForDraw(currentBrush.isOpaque());
+#ifdef QT_OPENGL_CACHE_AS_VBOS
+            funcs.glBindBuffer(GL_ARRAY_BUFFER, cache->vbo);
+            uploadData(QT_VERTEX_COORD_ATTR, 0, cache->vertexCount);
+            setVertexAttributePointer(QT_VERTEX_COORDS_ATTR, 0);
+#else
+            uploadData(QT_VERTEX_COORDS_ATTR, cache->vertices, cache->vertexCount * 2);
+#endif
+            funcs.glDrawArrays(cache->primitiveType, 0, cache->vertexCount);
+
+        } else {
+      //        printf(" - Marking path as cachable...\n");
+            // Tag it for later so that if the same path is drawn twice, it is assumed to be static and thus cachable
+            path.makeCacheable();
+            vertexCoordinateArray.clear();
+            vertexCoordinateArray.addPath(path, inverseScale, false);
+            prepareForDraw(currentBrush.isOpaque());
+            drawVertexArrays(vertexCoordinateArray, GL_TRIANGLE_FAN);
+        }
+
+    } else {
+        bool useCache = path.isCacheable();
+        if (useCache) {
+            QRectF bbox = path.controlPointRect();
+            // If the path doesn't fit within these limits, it is possible that the triangulation will fail.
+            useCache &= (bbox.left() > -0x8000 * inverseScale)
+                     && (bbox.right() < 0x8000 * inverseScale)
+                     && (bbox.top() > -0x8000 * inverseScale)
+                     && (bbox.bottom() < 0x8000 * inverseScale);
+        }
+
+        if (useCache) {
+            QVectorPath::CacheEntry *data = path.lookupCacheData(q);
+            QOpenGL2PEVectorPathCache *cache;
+
+            bool updateCache = false;
+
+            if (data) {
+                cache = (QOpenGL2PEVectorPathCache *) data->data;
+                // Check if scale factor is exceeded and regenerate if so...
+                qreal scaleFactor = cache->iscale / inverseScale;
+                if (scaleFactor < 0.5 || scaleFactor > 2.0) {
+#ifdef QT_OPENGL_CACHE_AS_VBOS
+                    glDeleteBuffers(1, &cache->vbo);
+                    glDeleteBuffers(1, &cache->ibo);
+#else
+                    free(cache->vertices);
+                    free(cache->indices);
+#endif
+                    updateCache = true;
+                }
+            } else {
+                cache = new QOpenGL2PEVectorPathCache;
+                data = const_cast<QVectorPath &>(path).addCacheData(q, cache, cleanupVectorPath);
+                updateCache = true;
+            }
+
+            // Flatten the path at the current scale factor and fill it into the cache struct.
+            if (updateCache) {
+                QTriangleSet polys = qTriangulate(path, QTransform().scale(1 / inverseScale, 1 / inverseScale), 1, supportsElementIndexUint);
+                cache->vertexCount = polys.vertices.size() / 2;
+                cache->indexCount = polys.indices.size();
+                cache->primitiveType = GL_TRIANGLES;
+                cache->iscale = inverseScale;
+                cache->indexType = polys.indices.type();
+#ifdef QT_OPENGL_CACHE_AS_VBOS
+                funcs.glGenBuffers(1, &cache->vbo);
+                funcs.glGenBuffers(1, &cache->ibo);
+                funcs.glBindBuffer(GL_ARRAY_BUFFER, cache->vbo);
+                funcs.glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, cache->ibo);
+
+                if (polys.indices.type() == QVertexIndexVector::UnsignedInt)
+                    funcs.glBufferData(GL_ELEMENT_ARRAY_BUFFER, sizeof(quint32) * polys.indices.size(), polys.indices.data(), GL_STATIC_DRAW);
+                else
+                    funcs.glBufferData(GL_ELEMENT_ARRAY_BUFFER, sizeof(quint16) * polys.indices.size(), polys.indices.data(), GL_STATIC_DRAW);
+
+                QVarLengthArray<float> vertices(polys.vertices.size());
+                for (int i = 0; i < polys.vertices.size(); ++i)
+                    vertices[i] = float(inverseScale * polys.vertices.at(i));
+                funcs.glBufferData(GL_ARRAY_BUFFER, sizeof(float) * vertices.size(), vertices.data(), GL_STATIC_DRAW);
+#else
+                cache->vertices = (float *) malloc(sizeof(float) * polys.vertices.size());
+                if (polys.indices.type() == QVertexIndexVector::UnsignedInt) {
+                    cache->indices = (quint32 *) malloc(sizeof(quint32) * polys.indices.size());
+                    memcpy(cache->indices, polys.indices.data(), sizeof(quint32) * polys.indices.size());
+                } else {
+                    cache->indices = (quint16 *) malloc(sizeof(quint16) * polys.indices.size());
+                    memcpy(cache->indices, polys.indices.data(), sizeof(quint16) * polys.indices.size());
+                }
+                for (int i = 0; i < polys.vertices.size(); ++i)
+                    cache->vertices[i] = float(inverseScale * polys.vertices.at(i));
+#endif
+            }
+
+            prepareForDraw(currentBrush.isOpaque());
+#ifdef QT_OPENGL_CACHE_AS_VBOS
+            funcs.glBindBuffer(GL_ARRAY_BUFFER, cache->vbo);
+            funcs.glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, cache->ibo);
+            uploadData(QT_VERTEX_COORDS_ATTR, 0, cache->vertexCount);
+            setVertexAttributePointer(QT_VERTEX_COORDS_ATTR, 0);
+            if (cache->indexType == QVertexIndexVector::UnsignedInt)
+                funcs.glDrawElements(cache->primitiveType, cache->indexCount, GL_UNSIGNED_INT, 0);
+            else
+                funcs.glDrawElements(cache->primitiveType, cache->indexCount, GL_UNSIGNED_SHORT, 0);
+            funcs.glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0);
+            funcs.glBindBuffer(GL_ARRAY_BUFFER, 0);
+#else
+            uploadData(QT_VERTEX_COORDS_ATTR, cache->vertices, cache->vertexCount * 2);
+            const GLenum indexValueType = cache->indexType == QVertexIndexVector::UnsignedInt ? GL_UNSIGNED_INT : GL_UNSIGNED_SHORT;
+            const bool useIndexVbo = uploadIndexData(cache->indices, indexValueType, cache->indexCount);
+            funcs.glDrawElements(cache->primitiveType, cache->indexCount, indexValueType, useIndexVbo ? nullptr : cache->indices);
+#endif
+
+        } else {
+      //        printf(" - Marking path as cachable...\n");
+            // Tag it for later so that if the same path is drawn twice, it is assumed to be static and thus cachable
+            path.makeCacheable();
+
+            if (device->context()->format().stencilBufferSize() <= 0) {
+                // If there is no stencil buffer, triangulate the path instead.
+
+                QRectF bbox = path.controlPointRect();
+                // If the path doesn't fit within these limits, it is possible that the triangulation will fail.
+                bool withinLimits = (bbox.left() > -0x8000 * inverseScale)
+                                  && (bbox.right() < 0x8000 * inverseScale)
+                                  && (bbox.top() > -0x8000 * inverseScale)
+                                  && (bbox.bottom() < 0x8000 * inverseScale);
+                if (withinLimits) {
+                    QTriangleSet polys = qTriangulate(path, QTransform().scale(1 / inverseScale, 1 / inverseScale), 1, supportsElementIndexUint);
+
+                    QVarLengthArray<float> vertices(polys.vertices.size());
+                    for (int i = 0; i < polys.vertices.size(); ++i)
+                        vertices[i] = float(inverseScale * polys.vertices.at(i));
+
+                    prepareForDraw(currentBrush.isOpaque());
+                    uploadData(QT_VERTEX_COORDS_ATTR, vertices.constData(), vertices.size());
+                    const GLenum indexValueType = funcs.hasOpenGLExtension(QOpenGLExtensions::ElementIndexUint) ? GL_UNSIGNED_INT : GL_UNSIGNED_SHORT;
+                    const bool useIndexVbo = uploadIndexData(polys.indices.data(), indexValueType, polys.indices.size());
+                    funcs.glDrawElements(GL_TRIANGLES, polys.indices.size(), indexValueType, useIndexVbo ? nullptr : polys.indices.data());
+                } else {
+                    // We can't handle big, concave painter paths with OpenGL without stencil buffer.
+                    qWarning("Painter path exceeds +/-32767 pixels.");
+                }
+                return;
+            }
+
+            // The path is too complicated & needs the stencil technique
+            vertexCoordinateArray.clear();
+            vertexCoordinateArray.addPath(path, inverseScale, false);
+
+            fillStencilWithVertexArray(vertexCoordinateArray, path.hasWindingFill());
+
+            funcs.glStencilMask(0xff);
+            funcs.glStencilOp(GL_KEEP, GL_REPLACE, GL_REPLACE);
+
+            if (q->state()->clipTestEnabled) {
+                // Pass when high bit is set, replace stencil value with current clip
+                funcs.glStencilFunc(GL_NOTEQUAL, q->state()->currentClip, GL_STENCIL_HIGH_BIT);
+            } else if (path.hasWindingFill()) {
+                // Pass when any bit is set, replace stencil value with 0
+                funcs.glStencilFunc(GL_NOTEQUAL, 0, 0xff);
+            } else {
+                // Pass when high bit is set, replace stencil value with 0
+                funcs.glStencilFunc(GL_NOTEQUAL, 0, GL_STENCIL_HIGH_BIT);
+            }
+            prepareForDraw(currentBrush.isOpaque());
+
+            // Stencil the brush onto the dest buffer
+            composite(vertexCoordinateArray.boundingRect());
+            funcs.glStencilMask(0);
+            updateClipScissorTest();
+        }
+    }
+}
+
+
+void QOpenGL2PaintEngineExPrivate::fillStencilWithVertexArray(const float *data,
+                                                          int count,
+                                                          int *stops,
+                                                          int stopCount,
+                                                          const QOpenGLRect &bounds,
+                                                          StencilFillMode mode)
+{
+    Q_ASSERT(count || stops);
+
+//     qDebug("QOpenGL2PaintEngineExPrivate::fillStencilWithVertexArray()");
+    funcs.glStencilMask(0xff); // Enable stencil writes
+
+    if (dirtyStencilRegion.intersects(currentScissorBounds)) {
+        const QRegion clearRegion = dirtyStencilRegion.intersected(currentScissorBounds);
+        funcs.glClearStencil(0); // Clear to zero
+        for (const QRect &rect : clearRegion) {
+#ifndef QT_GL_NO_SCISSOR_TEST
+            setScissor(rect);
+#endif
+            funcs.glClear(GL_STENCIL_BUFFER_BIT);
+        }
+
+        dirtyStencilRegion -= currentScissorBounds;
+
+#ifndef QT_GL_NO_SCISSOR_TEST
+        updateClipScissorTest();
+#endif
+    }
+
+    funcs.glColorMask(GL_FALSE, GL_FALSE, GL_FALSE, GL_FALSE); // Disable color writes
+    useSimpleShader();
+    funcs.glEnable(GL_STENCIL_TEST); // For some reason, this has to happen _after_ the simple shader is use()'d
+
+    if (mode == WindingFillMode) {
+        Q_ASSERT(stops && !count);
+        if (q->state()->clipTestEnabled) {
+            // Flatten clip values higher than current clip, and set high bit to match current clip
+            funcs.glStencilFunc(GL_LEQUAL, GL_STENCIL_HIGH_BIT | q->state()->currentClip, ~GL_STENCIL_HIGH_BIT);
+            funcs.glStencilOp(GL_KEEP, GL_REPLACE, GL_REPLACE);
+            composite(bounds);
+
+            funcs.glStencilFunc(GL_EQUAL, GL_STENCIL_HIGH_BIT, GL_STENCIL_HIGH_BIT);
+        } else if (!stencilClean) {
+            // Clear stencil buffer within bounding rect
+            funcs.glStencilFunc(GL_ALWAYS, 0, 0xff);
+            funcs.glStencilOp(GL_ZERO, GL_ZERO, GL_ZERO);
+            composite(bounds);
+        }
+
+        // Inc. for front-facing triangle
+        funcs.glStencilOpSeparate(GL_FRONT, GL_KEEP, GL_INCR_WRAP, GL_INCR_WRAP);
+        // Dec. for back-facing "holes"
+        funcs.glStencilOpSeparate(GL_BACK, GL_KEEP, GL_DECR_WRAP, GL_DECR_WRAP);
+        funcs.glStencilMask(~GL_STENCIL_HIGH_BIT);
+        drawVertexArrays(data, stops, stopCount, GL_TRIANGLE_FAN);
+
+        if (q->state()->clipTestEnabled) {
+            // Clear high bit of stencil outside of path
+            funcs.glStencilFunc(GL_EQUAL, q->state()->currentClip, ~GL_STENCIL_HIGH_BIT);
+            funcs.glStencilOp(GL_KEEP, GL_REPLACE, GL_REPLACE);
+            funcs.glStencilMask(GL_STENCIL_HIGH_BIT);
+            composite(bounds);
+        }
+    } else if (mode == OddEvenFillMode) {
+        funcs.glStencilMask(GL_STENCIL_HIGH_BIT);
+        funcs.glStencilOp(GL_KEEP, GL_KEEP, GL_INVERT); // Simply invert the stencil bit
+        drawVertexArrays(data, stops, stopCount, GL_TRIANGLE_FAN);
+
+    } else { // TriStripStrokeFillMode
+        Q_ASSERT(count && !stops); // tristrips generated directly, so no vertexArray or stops
+        funcs.glStencilMask(GL_STENCIL_HIGH_BIT);
+#if 0
+        funcs.glStencilOp(GL_KEEP, GL_KEEP, GL_INVERT); // Simply invert the stencil bit
+        setVertexAttributePointer(QT_VERTEX_COORDS_ATTR, data);
+        funcs.glDrawArrays(GL_TRIANGLE_STRIP, 0, count);
+#else
+
+        funcs.glStencilOp(GL_KEEP, GL_KEEP, GL_REPLACE);
+        if (q->state()->clipTestEnabled) {
+            funcs.glStencilFunc(GL_LEQUAL, q->state()->currentClip | GL_STENCIL_HIGH_BIT,
+                                ~GL_STENCIL_HIGH_BIT);
+        } else {
+            funcs.glStencilFunc(GL_ALWAYS, GL_STENCIL_HIGH_BIT, 0xff);
+        }
+
+        uploadData(QT_VERTEX_COORDS_ATTR, data, count * 2);
+        funcs.glDrawArrays(GL_TRIANGLE_STRIP, 0, count);
+#endif
+    }
+
+    // Enable color writes & disable stencil writes
+    funcs.glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
+}
+
+/*
+    If the maximum value in the stencil buffer is GL_STENCIL_HIGH_BIT - 1,
+    restore the stencil buffer to a pristine state.  The current clip region
+    is set to 1, and the rest to 0.
+*/
+void QOpenGL2PaintEngineExPrivate::resetClipIfNeeded()
+{
+    if (maxClip != (GL_STENCIL_HIGH_BIT - 1))
+        return;
+
+    Q_Q(QOpenGL2PaintEngineEx);
+
+    useSimpleShader();
+    funcs.glEnable(GL_STENCIL_TEST);
+    funcs.glColorMask(GL_FALSE, GL_FALSE, GL_FALSE, GL_FALSE);
+
+    QRectF bounds = q->state()->matrix.inverted().mapRect(QRectF(0, 0, width, height));
+    QOpenGLRect rect(bounds.left(), bounds.top(), bounds.right(), bounds.bottom());
+
+    // Set high bit on clip region
+    funcs.glStencilFunc(GL_LEQUAL, q->state()->currentClip, 0xff);
+    funcs.glStencilOp(GL_KEEP, GL_INVERT, GL_INVERT);
+    funcs.glStencilMask(GL_STENCIL_HIGH_BIT);
+    composite(rect);
+
+    // Reset clipping to 1 and everything else to zero
+    funcs.glStencilFunc(GL_NOTEQUAL, 0x01, GL_STENCIL_HIGH_BIT);
+    funcs.glStencilOp(GL_ZERO, GL_REPLACE, GL_REPLACE);
+    funcs.glStencilMask(0xff);
+    composite(rect);
+
+    q->state()->currentClip = 1;
+    q->state()->canRestoreClip = false;
+
+    maxClip = 1;
+
+    funcs.glStencilMask(0x0);
+    funcs.glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
+}
+
+bool QOpenGL2PaintEngineExPrivate::prepareForCachedGlyphDraw(const QFontEngineGlyphCache &cache)
+{
+    Q_Q(QOpenGL2PaintEngineEx);
+
+    Q_ASSERT(cache.transform().type() <= QTransform::TxScale);
+
+    QTransform &transform = q->state()->matrix;
+    transform.scale(1.0 / cache.transform().m11(), 1.0 / cache.transform().m22());
+    bool ret = prepareForDraw(false);
+    transform.scale(cache.transform().m11(), cache.transform().m22());
+
+    return ret;
+}
+
+bool QOpenGL2PaintEngineExPrivate::prepareForDraw(bool srcPixelsAreOpaque)
+{
+    if (brushTextureDirty && (mode == TextDrawingMode || mode == BrushDrawingMode))
+        updateBrushTexture();
+
+    if (compositionModeDirty)
+        updateCompositionMode();
+
+    if (matrixDirty)
+        updateMatrix();
+
+    const bool stateHasOpacity = q->state()->opacity < 0.99f;
+    if (q->state()->composition_mode == QPainter::CompositionMode_Source
+        || (q->state()->composition_mode == QPainter::CompositionMode_SourceOver
+            && srcPixelsAreOpaque && !stateHasOpacity))
+    {
+        funcs.glDisable(GL_BLEND);
+    } else {
+        funcs.glEnable(GL_BLEND);
+    }
+
+    QOpenGLEngineShaderManager::OpacityMode opacityMode;
+    if (mode == ImageOpacityArrayDrawingMode) {
+        opacityMode = QOpenGLEngineShaderManager::AttributeOpacity;
+    } else {
+        opacityMode = stateHasOpacity ? QOpenGLEngineShaderManager::UniformOpacity
+                                      : QOpenGLEngineShaderManager::NoOpacity;
+        if (stateHasOpacity && (mode != ImageDrawingMode && mode != ImageArrayDrawingMode)) {
+            // Using a brush
+            bool brushIsPattern = (currentBrush.style() >= Qt::Dense1Pattern) &&
+                                  (currentBrush.style() <= Qt::DiagCrossPattern);
+
+            if ((currentBrush.style() == Qt::SolidPattern) || brushIsPattern)
+                opacityMode = QOpenGLEngineShaderManager::NoOpacity; // Global opacity handled by srcPixel shader
+        }
+    }
+    shaderManager->setOpacityMode(opacityMode);
+
+    bool changed = shaderManager->useCorrectShaderProg();
+    // If the shader program needs changing, we change it and mark all uniforms as dirty
+    if (changed) {
+        // The shader program has changed so mark all uniforms as dirty:
+        brushUniformsDirty = true;
+        opacityUniformDirty = true;
+        matrixUniformDirty = true;
+    }
+
+    if (brushUniformsDirty && (mode == TextDrawingMode || mode == BrushDrawingMode))
+        updateBrushUniforms();
+
+    if (opacityMode == QOpenGLEngineShaderManager::UniformOpacity && opacityUniformDirty) {
+        shaderManager->currentProgram()->setUniformValue(location(QOpenGLEngineShaderManager::GlobalOpacity), (GLfloat)q->state()->opacity);
+        opacityUniformDirty = false;
+    }
+
+    if (matrixUniformDirty && shaderManager->hasComplexGeometry()) {
+        shaderManager->currentProgram()->setUniformValue(location(QOpenGLEngineShaderManager::Matrix),
+                                                         pmvMatrix);
+        matrixUniformDirty = false;
+    }
+
+    return changed;
+}
+
+void QOpenGL2PaintEngineExPrivate::composite(const QOpenGLRect& boundingRect)
+{
+    setCoords(staticVertexCoordinateArray, boundingRect);
+
+    uploadData(QT_VERTEX_COORDS_ATTR, staticVertexCoordinateArray, 8);
+    funcs.glDrawArrays(GL_TRIANGLE_FAN, 0, 4);
+}
+
+// Draws the vertex array as a set of <vertexArrayStops.size()> triangle fans.
+void QOpenGL2PaintEngineExPrivate::drawVertexArrays(const float *data, int *stops, int stopCount,
+                                                GLenum primitive)
+{
+    // Now setup the pointer to the vertex array:
+    uploadData(QT_VERTEX_COORDS_ATTR, data, stops[stopCount-1] * 2);
+
+    int previousStop = 0;
+    for (int i=0; i<stopCount; ++i) {
+        int stop = stops[i];
+
+        funcs.glDrawArrays(primitive, previousStop, stop - previousStop);
+        previousStop = stop;
+    }
+}
+
+/////////////////////////////////// Public Methods //////////////////////////////////////////
+
+QOpenGL2PaintEngineEx::QOpenGL2PaintEngineEx()
+    : QPaintEngineEx(*(new QOpenGL2PaintEngineExPrivate(this)))
+{
+    gccaps &= ~QPaintEngine::RasterOpModes;
+}
+
+QOpenGL2PaintEngineEx::~QOpenGL2PaintEngineEx()
+{
+}
+
+void QOpenGL2PaintEngineEx::fill(const QVectorPath &path, const QBrush &brush)
+{
+    Q_D(QOpenGL2PaintEngineEx);
+
+    if (qbrush_style(brush) == Qt::NoBrush)
+        return;
+    ensureActive();
+    d->setBrush(brush);
+    d->fill(path);
+}
+
+Q_GUI_EXPORT extern bool qt_scaleForTransform(const QTransform &transform, qreal *scale); // qtransform.cpp
+
+
+void QOpenGL2PaintEngineEx::stroke(const QVectorPath &path, const QPen &pen)
+{
+    Q_D(QOpenGL2PaintEngineEx);
+
+    const QBrush &penBrush = qpen_brush(pen);
+    if (qpen_style(pen) == Qt::NoPen || qbrush_style(penBrush) == Qt::NoBrush)
+        return;
+
+    QOpenGL2PaintEngineState *s = state();
+    if (qt_pen_is_cosmetic(pen, state()->renderHints) && !qt_scaleForTransform(s->transform(), nullptr)) {
+        // QTriangulatingStroker class is not meant to support cosmetically sheared strokes.
+        QPaintEngineEx::stroke(path, pen);
+        return;
+    }
+
+    ensureActive();
+    d->setBrush(penBrush);
+    d->stroke(path, pen);
+}
+
+void QOpenGL2PaintEngineExPrivate::stroke(const QVectorPath &path, const QPen &pen)
+{
+    const QOpenGL2PaintEngineState *s = q->state();
+    if (snapToPixelGrid) {
+        snapToPixelGrid = false;
+        matrixDirty = true;
+    }
+
+    const Qt::PenStyle penStyle = qpen_style(pen);
+    const QBrush &penBrush = qpen_brush(pen);
+    const bool opaque = penBrush.isOpaque() && s->opacity > 0.99;
+
+    transferMode(BrushDrawingMode);
+
+    // updateMatrix() is responsible for setting the inverse scale on
+    // the strokers, so we need to call it here and not wait for
+    // prepareForDraw() down below.
+    updateMatrix();
+
+    QRectF clip = q->state()->matrix.inverted().mapRect(q->state()->clipEnabled
+                                                        ? q->state()->rectangleClip
+                                                        : QRectF(0, 0, width, height));
+
+    if (penStyle == Qt::SolidLine) {
+        stroker.process(path, pen, clip, s->renderHints);
+
+    } else { // Some sort of dash
+        dasher.process(path, pen, clip, s->renderHints);
+
+        QVectorPath dashStroke(dasher.points(),
+                               dasher.elementCount(),
+                               dasher.elementTypes());
+        stroker.process(dashStroke, pen, clip, s->renderHints);
+    }
+
+    if (!stroker.vertexCount())
+        return;
+
+    if (opaque) {
+        prepareForDraw(opaque);
+
+        uploadData(QT_VERTEX_COORDS_ATTR, stroker.vertices(), stroker.vertexCount());
+        funcs.glDrawArrays(GL_TRIANGLE_STRIP, 0, stroker.vertexCount() / 2);
+    } else {
+        qreal width = qpen_widthf(pen) / 2;
+        if (width == 0)
+            width = 0.5;
+        qreal extra = pen.joinStyle() == Qt::MiterJoin
+                      ? qMax(pen.miterLimit() * width, width)
+                      : width;
+
+        if (qt_pen_is_cosmetic(pen, q->state()->renderHints))
+            extra = extra * inverseScale;
+
+        QRectF bounds = path.controlPointRect().adjusted(-extra, -extra, extra, extra);
+
+        fillStencilWithVertexArray(stroker.vertices(), stroker.vertexCount() / 2,
+                                      nullptr, 0, bounds, QOpenGL2PaintEngineExPrivate::TriStripStrokeFillMode);
+
+        funcs.glStencilOp(GL_KEEP, GL_REPLACE, GL_REPLACE);
+
+        // Pass when any bit is set, replace stencil value with 0
+        funcs.glStencilFunc(GL_NOTEQUAL, 0, GL_STENCIL_HIGH_BIT);
+        prepareForDraw(false);
+
+        // Stencil the brush onto the dest buffer
+        composite(bounds);
+
+        funcs.glStencilMask(0);
+
+        updateClipScissorTest();
+    }
+}
+
+void QOpenGL2PaintEngineEx::penChanged() { }
+void QOpenGL2PaintEngineEx::brushChanged() { }
+void QOpenGL2PaintEngineEx::brushOriginChanged() { }
+
+void QOpenGL2PaintEngineEx::opacityChanged()
+{
+//    qDebug("QOpenGL2PaintEngineEx::opacityChanged()");
+    Q_D(QOpenGL2PaintEngineEx);
+    state()->opacityChanged = true;
+
+    Q_ASSERT(d->shaderManager);
+    d->brushUniformsDirty = true;
+    d->opacityUniformDirty = true;
+}
+
+void QOpenGL2PaintEngineEx::compositionModeChanged()
+{
+//     qDebug("QOpenGL2PaintEngineEx::compositionModeChanged()");
+    Q_D(QOpenGL2PaintEngineEx);
+    state()->compositionModeChanged = true;
+    d->compositionModeDirty = true;
+}
+
+void QOpenGL2PaintEngineEx::renderHintsChanged()
+{
+    state()->renderHintsChanged = true;
+
+#ifndef QT_OPENGL_ES_2
+    if (!QOpenGLContext::currentContext()->isOpenGLES()) {
+        Q_D(QOpenGL2PaintEngineEx);
+QT_WARNING_PUSH
+QT_WARNING_DISABLE_DEPRECATED
+        if ((state()->renderHints & QPainter::Antialiasing)
+#if QT_DEPRECATED_SINCE(5, 14)
+            || (state()->renderHints & QPainter::HighQualityAntialiasing)
+#endif
+            )
+            d->funcs.glEnable(GL_MULTISAMPLE);
+        else
+            d->funcs.glDisable(GL_MULTISAMPLE);
+QT_WARNING_POP
+    }
+#endif // QT_OPENGL_ES_2
+
+    Q_D(QOpenGL2PaintEngineEx);
+
+    // This is a somewhat sneaky way of conceptually making the next call to
+    // updateTexture() use FoceUpdate for the TextureUpdateMode. We need this
+    // as new render hints may require updating the filter mode.
+    d->lastTextureUsed = GLuint(-1);
+
+    d->brushTextureDirty = true;
+//    qDebug("QOpenGL2PaintEngineEx::renderHintsChanged() not implemented!");
+}
+
+void QOpenGL2PaintEngineEx::transformChanged()
+{
+    Q_D(QOpenGL2PaintEngineEx);
+    d->matrixDirty = true;
+    state()->matrixChanged = true;
+}
+
+
+static const QRectF scaleRect(const QRectF &r, qreal sx, qreal sy)
+{
+    return QRectF(r.x() * sx, r.y() * sy, r.width() * sx, r.height() * sy);
+}
+
+void QOpenGL2PaintEngineEx::drawPixmap(const QRectF& dest, const QPixmap & pixmap, const QRectF & src)
+{
+    Q_D(QOpenGL2PaintEngineEx);
+    QOpenGLContext *ctx = d->ctx;
+
+    // Draw pixmaps that are really images as images since drawImage has
+    // better handling of non-default image formats.
+    if (pixmap.paintEngine()->type() == QPaintEngine::Raster && !pixmap.isQBitmap())
+        return drawImage(dest, pixmap.toImage(), src);
+
+    int max_texture_size = ctx->d_func()->maxTextureSize();
+    if (pixmap.width() > max_texture_size || pixmap.height() > max_texture_size) {
+        QPixmap scaled = pixmap.scaled(max_texture_size, max_texture_size, Qt::KeepAspectRatio);
+
+        const qreal sx = scaled.width() / qreal(pixmap.width());
+        const qreal sy = scaled.height() / qreal(pixmap.height());
+
+        drawPixmap(dest, scaled, scaleRect(src, sx, sy));
+        return;
+    }
+
+    ensureActive();
+    d->transferMode(ImageDrawingMode);
+
+    GLenum filterMode = state()->renderHints & QPainter::SmoothPixmapTransform ? GL_LINEAR : GL_NEAREST;
+    d->updateTexture(QT_IMAGE_TEXTURE_UNIT, pixmap, GL_CLAMP_TO_EDGE, filterMode);
+
+    bool isBitmap = pixmap.isQBitmap();
+    bool isOpaque = !isBitmap && !pixmap.hasAlpha();
+
+    d->shaderManager->setSrcPixelType(isBitmap ? QOpenGLEngineShaderManager::PatternSrc : QOpenGLEngineShaderManager::ImageSrc);
+
+    QOpenGLRect srcRect(src.left(), src.top(), src.right(), src.bottom());
+    d->drawTexture(dest, srcRect, pixmap.size(), isOpaque, isBitmap);
+}
+
+void QOpenGL2PaintEngineEx::drawImage(const QRectF& dest, const QImage& image, const QRectF& src,
+                        Qt::ImageConversionFlags)
+{
+    Q_D(QOpenGL2PaintEngineEx);
+    QOpenGLContext *ctx = d->ctx;
+
+    int max_texture_size = ctx->d_func()->maxTextureSize();
+    if (image.width() > max_texture_size || image.height() > max_texture_size) {
+        QImage scaled = image.scaled(max_texture_size, max_texture_size, Qt::KeepAspectRatio);
+
+        const qreal sx = scaled.width() / qreal(image.width());
+        const qreal sy = scaled.height() / qreal(image.height());
+
+        drawImage(dest, scaled, scaleRect(src, sx, sy));
+        return;
+    }
+
+    ensureActive();
+    d->transferMode(ImageDrawingMode);
+
+    QOpenGLTextureUploader::BindOptions bindOption = QOpenGLTextureUploader::PremultipliedAlphaBindOption;
+    // Use specialized bind for formats we have specialized shaders for.
+    switch (image.format()) {
+    case QImage::Format_RGBA8888:
+    case QImage::Format_ARGB32:
+    case QImage::Format_RGBA64:
+        d->shaderManager->setSrcPixelType(QOpenGLEngineShaderManager::NonPremultipliedImageSrc);
+        bindOption = { };
+        break;
+    case QImage::Format_Alpha8:
+        if (ctx->functions()->hasOpenGLFeature(QOpenGLFunctions::TextureRGFormats)) {
+            d->shaderManager->setSrcPixelType(QOpenGLEngineShaderManager::AlphaImageSrc);
+            bindOption = QOpenGLTextureUploader::UseRedForAlphaAndLuminanceBindOption;
+        } else
+            d->shaderManager->setSrcPixelType(QOpenGLEngineShaderManager::ImageSrc);
+        break;
+    case QImage::Format_Grayscale8:
+    case QImage::Format_Grayscale16:
+        if (ctx->functions()->hasOpenGLFeature(QOpenGLFunctions::TextureRGFormats)) {
+            d->shaderManager->setSrcPixelType(QOpenGLEngineShaderManager::GrayscaleImageSrc);
+            bindOption = QOpenGLTextureUploader::UseRedForAlphaAndLuminanceBindOption;
+        } else
+            d->shaderManager->setSrcPixelType(QOpenGLEngineShaderManager::ImageSrc);
+        break;
+    default:
+        d->shaderManager->setSrcPixelType(QOpenGLEngineShaderManager::ImageSrc);
+        break;
+    }
+
+    ImageWithBindOptions imageWithOptions = { image, bindOption };
+    GLenum filterMode = state()->renderHints & QPainter::SmoothPixmapTransform ? GL_LINEAR : GL_NEAREST;
+    d->updateTexture(QT_IMAGE_TEXTURE_UNIT, imageWithOptions, GL_CLAMP_TO_EDGE, filterMode);
+
+    d->drawTexture(dest, src, image.size(), !image.hasAlphaChannel());
+}
+
+void QOpenGL2PaintEngineEx::drawStaticTextItem(QStaticTextItem *textItem)
+{
+    Q_D(QOpenGL2PaintEngineEx);
+
+    ensureActive();
+
+    QPainterState *s = state();
+
+    QFontEngine *fontEngine = textItem->fontEngine();
+    if (shouldDrawCachedGlyphs(fontEngine, s->matrix)) {
+        QFontEngine::GlyphFormat glyphFormat = fontEngine->glyphFormat != QFontEngine::Format_None
+                                                ? fontEngine->glyphFormat : d->glyphCacheFormat;
+        if (glyphFormat == QFontEngine::Format_A32) {
+            if (d->device->context()->format().alphaBufferSize() > 0 || s->matrix.type() > QTransform::TxTranslate
+                || (s->composition_mode != QPainter::CompositionMode_Source
+                && s->composition_mode != QPainter::CompositionMode_SourceOver))
+            {
+                glyphFormat = QFontEngine::Format_A8;
+            }
+        }
+
+        d->drawCachedGlyphs(glyphFormat, textItem);
+    } else {
+        QPaintEngineEx::drawStaticTextItem(textItem);
+    }
+}
+
+bool QOpenGL2PaintEngineEx::drawTexture(const QRectF &dest, GLuint textureId, const QSize &size, const QRectF &src)
+{
+    Q_D(QOpenGL2PaintEngineEx);
+    if (!d->shaderManager)
+        return false;
+
+    ensureActive();
+    d->transferMode(ImageDrawingMode);
+
+    GLenum filterMode = state()->renderHints & QPainter::SmoothPixmapTransform ? GL_LINEAR : GL_NEAREST;
+    d->updateTexture(QT_IMAGE_TEXTURE_UNIT, textureId, GL_CLAMP_TO_EDGE, filterMode);
+
+    d->shaderManager->setSrcPixelType(QOpenGLEngineShaderManager::ImageSrc);
+
+    QOpenGLRect srcRect(src.left(), src.bottom(), src.right(), src.top());
+    d->drawTexture(dest, srcRect, size, false);
+
+    return true;
+}
+
+void QOpenGL2PaintEngineEx::drawTextItem(const QPointF &p, const QTextItem &textItem)
+{
+    Q_D(QOpenGL2PaintEngineEx);
+
+    ensureActive();
+    QOpenGL2PaintEngineState *s = state();
+
+    const QTextItemInt &ti = static_cast<const QTextItemInt &>(textItem);
+
+    QTransform::TransformationType txtype = s->matrix.type();
+
+    QFontEngine::GlyphFormat glyphFormat = ti.fontEngine->glyphFormat != QFontEngine::Format_None
+                                                ? ti.fontEngine->glyphFormat : d->glyphCacheFormat;
+
+    if (glyphFormat == QFontEngine::Format_A32) {
+        if (d->device->context()->format().alphaBufferSize() > 0 || txtype > QTransform::TxTranslate
+            || (state()->composition_mode != QPainter::CompositionMode_Source
+            && state()->composition_mode != QPainter::CompositionMode_SourceOver))
+        {
+            glyphFormat = QFontEngine::Format_A8;
+        }
+    }
+
+    if (shouldDrawCachedGlyphs(ti.fontEngine, s->matrix)) {
+        QVarLengthArray<QFixedPoint> positions;
+        QVarLengthArray<glyph_t> glyphs;
+        QTransform matrix = QTransform::fromTranslate(p.x(), p.y());
+        ti.fontEngine->getGlyphPositions(ti.glyphs, matrix, ti.flags, glyphs, positions);
+
+        {
+            QStaticTextItem staticTextItem;
+            staticTextItem.setFontEngine(ti.fontEngine);
+            staticTextItem.glyphs = glyphs.data();
+            staticTextItem.numGlyphs = glyphs.size();
+            staticTextItem.glyphPositions = positions.data();
+
+            d->drawCachedGlyphs(glyphFormat, &staticTextItem);
+        }
+        return;
+    }
+
+    QPaintEngineEx::drawTextItem(p, ti);
+}
+
+namespace {
+
+    class QOpenGLStaticTextUserData: public QStaticTextUserData
+    {
+    public:
+        QOpenGLStaticTextUserData()
+            : QStaticTextUserData(OpenGLUserData), cacheSize(0, 0), cacheSerialNumber(0)
+        {
+        }
+
+        ~QOpenGLStaticTextUserData()
+        {
+        }
+
+        QSize cacheSize;
+        QOpenGL2PEXVertexArray vertexCoordinateArray;
+        QOpenGL2PEXVertexArray textureCoordinateArray;
+        QFontEngine::GlyphFormat glyphFormat;
+        int cacheSerialNumber;
+    };
+
+}
+
+
+// #define QT_OPENGL_DRAWCACHEDGLYPHS_INDEX_ARRAY_VBO
+
+bool QOpenGL2PaintEngineEx::shouldDrawCachedGlyphs(QFontEngine *fontEngine, const QTransform &t) const
+{
+    // The paint engine does not support projected cached glyph drawing
+    if (t.type() == QTransform::TxProject)
+        return false;
+
+    // The font engine might not support filling the glyph cache
+    // with the given transform applied, in which case we need to
+    // fall back to the QPainterPath code-path.
+    if (!fontEngine->supportsTransformation(t)) {
+        // Except that drawing paths is slow, so for scales between
+        // 0.5 and 2.0 we leave the glyph cache untransformed and deal
+        // with the transform ourselves when painting, resulting in
+        // drawing 1x cached glyphs with a smooth-scale.
+        float det = t.determinant();
+        if (det >= 0.25f && det <= 4.f) {
+            // Assuming the baseclass still agrees
+            return QPaintEngineEx::shouldDrawCachedGlyphs(fontEngine, t);
+        }
+
+        return false; // Fall back to path-drawing
+    }
+
+    return QPaintEngineEx::shouldDrawCachedGlyphs(fontEngine, t);
+}
+
+void QOpenGL2PaintEngineExPrivate::drawCachedGlyphs(QFontEngine::GlyphFormat glyphFormat,
+                                                QStaticTextItem *staticTextItem)
+{
+    Q_Q(QOpenGL2PaintEngineEx);
+
+    QOpenGL2PaintEngineState *s = q->state();
+
+    void *cacheKey = ctx; // use context, not the shareGroup() -> the GL glyph cache uses FBOs which may not be shareable
+    bool recreateVertexArrays = false;
+
+    QTransform glyphCacheTransform;
+    QFontEngine *fe = staticTextItem->fontEngine();
+    if (fe->supportsTransformation(s->matrix)) {
+        // The font-engine supports rendering glyphs with the current transform, so we
+        // build a glyph-cache with the scale pre-applied, so that the cache contains
+        // glyphs with the appropriate resolution in the case of retina displays.
+        glyphCacheTransform = s->matrix.type() < QTransform::TxRotate ?
+            QTransform::fromScale(qAbs(s->matrix.m11()), qAbs(s->matrix.m22())) :
+            QTransform::fromScale(
+                QVector2D(s->matrix.m11(), s->matrix.m12()).length(),
+                QVector2D(s->matrix.m21(), s->matrix.m22()).length());
+    }
+
+    QOpenGLTextureGlyphCache *cache =
+            (QOpenGLTextureGlyphCache *) fe->glyphCache(cacheKey, glyphFormat, glyphCacheTransform);
+    if (!cache || cache->glyphFormat() != glyphFormat || cache->contextGroup() == nullptr) {
+        cache = new QOpenGLTextureGlyphCache(glyphFormat, glyphCacheTransform);
+        fe->setGlyphCache(cacheKey, cache);
+        recreateVertexArrays = true;
+    }
+
+    if (staticTextItem->userDataNeedsUpdate) {
+        recreateVertexArrays = true;
+    } else if (staticTextItem->userData() == nullptr) {
+        recreateVertexArrays = true;
+    } else if (staticTextItem->userData()->type != QStaticTextUserData::OpenGLUserData) {
+        recreateVertexArrays = true;
+    } else {
+        QOpenGLStaticTextUserData *userData = static_cast<QOpenGLStaticTextUserData *>(staticTextItem->userData());
+        if (userData->glyphFormat != glyphFormat) {
+            recreateVertexArrays = true;
+        } else if (userData->cacheSerialNumber != cache->serialNumber()) {
+            recreateVertexArrays = true;
+        }
+    }
+
+    // We only need to update the cache with new glyphs if we are actually going to recreate the vertex arrays.
+    // If the cache size has changed, we do need to regenerate the vertices, but we don't need to repopulate the
+    // cache so this text is performed before we test if the cache size has changed.
+    if (recreateVertexArrays) {
+        cache->setPaintEnginePrivate(this);
+        if (!cache->populate(fe, staticTextItem->numGlyphs,
+                             staticTextItem->glyphs, staticTextItem->glyphPositions)) {
+            // No space for glyphs in cache. We need to reset it and try again.
+            cache->clear();
+            cache->populate(fe, staticTextItem->numGlyphs,
+                            staticTextItem->glyphs, staticTextItem->glyphPositions);
+        }
+
+        if (cache->hasPendingGlyphs()) {
+            // Filling in the glyphs binds and sets parameters, so we need to
+            // ensure that the glyph cache doesn't mess with whatever unit
+            // is currently active. Note that the glyph cache internally
+            // uses the image texture unit for blitting to the cache, while
+            // we switch between image and mask units when drawing.
+            static const GLenum glypchCacheTextureUnit = QT_IMAGE_TEXTURE_UNIT;
+            activateTextureUnit(glypchCacheTextureUnit);
+
+            cache->fillInPendingGlyphs();
+
+            // We assume the cache can be trusted on which texture was bound
+            lastTextureUsed = cache->texture();
+
+            // But since the brush and image texture units are possibly shared
+            // we may have to re-bind brush textures after filling in the cache.
+            brushTextureDirty = (QT_BRUSH_TEXTURE_UNIT == glypchCacheTextureUnit);
+        }
+        cache->setPaintEnginePrivate(nullptr);
+    }
+
+    if (cache->width() == 0 || cache->height() == 0)
+        return;
+
+    if (glyphFormat == QFontEngine::Format_ARGB)
+        transferMode(ImageArrayDrawingMode);
+    else
+        transferMode(TextDrawingMode);
+
+    int margin = fe->glyphMargin(glyphFormat);
+
+    GLfloat dx = 1.0 / cache->width();
+    GLfloat dy = 1.0 / cache->height();
+
+    // Use global arrays by default
+    QOpenGL2PEXVertexArray *vertexCoordinates = &vertexCoordinateArray;
+    QOpenGL2PEXVertexArray *textureCoordinates = &textureCoordinateArray;
+
+    if (staticTextItem->useBackendOptimizations) {
+        QOpenGLStaticTextUserData *userData = nullptr;
+
+        if (staticTextItem->userData() == nullptr
+            || staticTextItem->userData()->type != QStaticTextUserData::OpenGLUserData) {
+
+            userData = new QOpenGLStaticTextUserData();
+            staticTextItem->setUserData(userData);
+
+        } else {
+            userData = static_cast<QOpenGLStaticTextUserData*>(staticTextItem->userData());
+        }
+
+        userData->glyphFormat = glyphFormat;
+        userData->cacheSerialNumber = cache->serialNumber();
+
+        // Use cache if backend optimizations is turned on
+        vertexCoordinates = &userData->vertexCoordinateArray;
+        textureCoordinates = &userData->textureCoordinateArray;
+
+        QSize size(cache->width(), cache->height());
+        if (userData->cacheSize != size) {
+            recreateVertexArrays = true;
+            userData->cacheSize = size;
+        }
+    }
+
+    if (recreateVertexArrays) {
+        vertexCoordinates->clear();
+        textureCoordinates->clear();
+
+        bool supportsSubPixelPositions = fe->supportsSubPixelPositions();
+        for (int i=0; i<staticTextItem->numGlyphs; ++i) {
+            QFixed subPixelPosition;
+            if (supportsSubPixelPositions)
+                subPixelPosition = fe->subPixelPositionForX(staticTextItem->glyphPositions[i].x);
+
+            QTextureGlyphCache::GlyphAndSubPixelPosition glyph(staticTextItem->glyphs[i], subPixelPosition);
+
+            const QTextureGlyphCache::Coord &c = cache->coords[glyph];
+            if (c.isNull())
+                continue;
+
+            int x = qFloor(staticTextItem->glyphPositions[i].x.toReal() * cache->transform().m11()) + c.baseLineX - margin;
+            int y = qRound(staticTextItem->glyphPositions[i].y.toReal() * cache->transform().m22()) - c.baseLineY - margin;
+
+            vertexCoordinates->addQuad(QRectF(x, y, c.w, c.h));
+            textureCoordinates->addQuad(QRectF(c.x*dx, c.y*dy, c.w * dx, c.h * dy));
+        }
+
+        staticTextItem->userDataNeedsUpdate = false;
+    }
+
+    int numGlyphs = vertexCoordinates->vertexCount() / 4;
+    if (numGlyphs == 0)
+        return;
+
+    if (elementIndices.size() < numGlyphs*6) {
+        Q_ASSERT(elementIndices.size() % 6 == 0);
+        int j = elementIndices.size() / 6 * 4;
+        while (j < numGlyphs*4) {
+            elementIndices.append(j + 0);
+            elementIndices.append(j + 0);
+            elementIndices.append(j + 1);
+            elementIndices.append(j + 2);
+            elementIndices.append(j + 3);
+            elementIndices.append(j + 3);
+
+            j += 4;
+        }
+
+#if defined(QT_OPENGL_DRAWCACHEDGLYPHS_INDEX_ARRAY_VBO)
+        if (elementIndicesVBOId == 0)
+            funcs.glGenBuffers(1, &elementIndicesVBOId);
+
+        funcs.glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, elementIndicesVBOId);
+        funcs.glBufferData(GL_ELEMENT_ARRAY_BUFFER, elementIndices.size() * sizeof(GLushort),
+                           elementIndices.constData(), GL_STATIC_DRAW);
+#endif
+    } else {
+#if defined(QT_OPENGL_DRAWCACHEDGLYPHS_INDEX_ARRAY_VBO)
+        funcs.glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, elementIndicesVBOId);
+#endif
+    }
+
+    if (glyphFormat != QFontEngine::Format_ARGB || recreateVertexArrays) {
+        uploadData(QT_VERTEX_COORDS_ATTR, (GLfloat*)vertexCoordinates->data(), vertexCoordinates->vertexCount() * 2);
+        uploadData(QT_TEXTURE_COORDS_ATTR, (GLfloat*)textureCoordinates->data(), textureCoordinates->vertexCount() * 2);
+    }
+
+    if (!snapToPixelGrid) {
+        snapToPixelGrid = true;
+        matrixDirty = true;
+    }
+
+    QBrush pensBrush = q->state()->pen.brush();
+    setBrush(pensBrush);
+
+    if (glyphFormat == QFontEngine::Format_A32) {
+
+        // Subpixel antialiasing without gamma correction
+
+        QPainter::CompositionMode compMode = q->state()->composition_mode;
+        Q_ASSERT(compMode == QPainter::CompositionMode_Source
+            || compMode == QPainter::CompositionMode_SourceOver);
+
+        shaderManager->setMaskType(QOpenGLEngineShaderManager::SubPixelMaskPass1);
+
+        if (pensBrush.style() == Qt::SolidPattern) {
+            // Solid patterns can get away with only one pass.
+            QColor c = pensBrush.color();
+            qreal oldOpacity = q->state()->opacity;
+            if (compMode == QPainter::CompositionMode_Source) {
+                c = qt_premultiplyColor(c, q->state()->opacity);
+                q->state()->opacity = 1;
+                opacityUniformDirty = true;
+            }
+
+            compositionModeDirty = false; // I can handle this myself, thank you very much
+            prepareForCachedGlyphDraw(*cache);
+
+            // prepareForCachedGlyphDraw() have set the opacity on the current shader, so the opacity state can now be reset.
+            if (compMode == QPainter::CompositionMode_Source) {
+                q->state()->opacity = oldOpacity;
+                opacityUniformDirty = true;
+            }
+
+            funcs.glEnable(GL_BLEND);
+            funcs.glBlendFunc(GL_CONSTANT_COLOR, GL_ONE_MINUS_SRC_COLOR);
+            funcs.glBlendColor(c.redF(), c.greenF(), c.blueF(), c.alphaF());
+        } else {
+            // Other brush styles need two passes.
+
+            qreal oldOpacity = q->state()->opacity;
+            if (compMode == QPainter::CompositionMode_Source) {
+                q->state()->opacity = 1;
+                opacityUniformDirty = true;
+                pensBrush = Qt::white;
+                setBrush(pensBrush);
+            }
+
+            compositionModeDirty = false; // I can handle this myself, thank you very much
+            prepareForCachedGlyphDraw(*cache);
+            funcs.glEnable(GL_BLEND);
+            funcs.glBlendFunc(GL_ZERO, GL_ONE_MINUS_SRC_COLOR);
+
+            updateTexture(QT_MASK_TEXTURE_UNIT, cache->texture(), GL_REPEAT, GL_NEAREST, ForceUpdate);
+
+#if defined(QT_OPENGL_DRAWCACHEDGLYPHS_INDEX_ARRAY_VBO)
+            funcs.glDrawElements(GL_TRIANGLE_STRIP, 6 * numGlyphs, GL_UNSIGNED_SHORT, 0);
+#else
+            const bool useIndexVbo = uploadIndexData(elementIndices.data(), GL_UNSIGNED_SHORT, 6 * numGlyphs);
+            funcs.glDrawElements(GL_TRIANGLE_STRIP, 6 * numGlyphs, GL_UNSIGNED_SHORT, useIndexVbo ? nullptr : elementIndices.data());
+#endif
+
+            shaderManager->setMaskType(QOpenGLEngineShaderManager::SubPixelMaskPass2);
+
+            if (compMode == QPainter::CompositionMode_Source) {
+                q->state()->opacity = oldOpacity;
+                opacityUniformDirty = true;
+                pensBrush = q->state()->pen.brush();
+                setBrush(pensBrush);
+            }
+
+            compositionModeDirty = false;
+            prepareForCachedGlyphDraw(*cache);
+            funcs.glEnable(GL_BLEND);
+            funcs.glBlendFunc(GL_ONE, GL_ONE);
+        }
+        compositionModeDirty = true;
+    } else if (glyphFormat == QFontEngine::Format_ARGB) {
+        currentBrush = noBrush;
+        shaderManager->setSrcPixelType(QOpenGLEngineShaderManager::ImageSrc);
+        if (prepareForCachedGlyphDraw(*cache))
+            shaderManager->currentProgram()->setUniformValue(location(QOpenGLEngineShaderManager::ImageTexture), QT_IMAGE_TEXTURE_UNIT);
+    } else {
+        // Grayscale/mono glyphs
+
+        shaderManager->setMaskType(QOpenGLEngineShaderManager::PixelMask);
+        prepareForCachedGlyphDraw(*cache);
+    }
+
+    GLenum textureUnit = QT_MASK_TEXTURE_UNIT;
+    if (glyphFormat == QFontEngine::Format_ARGB)
+        textureUnit = QT_IMAGE_TEXTURE_UNIT;
+
+    QOpenGLTextureGlyphCache::FilterMode filterMode = (s->matrix.type() > QTransform::TxTranslate) ?
+        QOpenGLTextureGlyphCache::Linear : QOpenGLTextureGlyphCache::Nearest;
+
+    GLenum glFilterMode = filterMode == QOpenGLTextureGlyphCache::Linear ? GL_LINEAR : GL_NEAREST;
+
+    TextureUpdateMode updateMode = UpdateIfNeeded;
+    if (cache->filterMode() != filterMode) {
+        updateMode = ForceUpdate;
+        cache->setFilterMode(filterMode);
+    }
+
+    updateTexture(textureUnit, cache->texture(), GL_REPEAT, glFilterMode, updateMode);
+
+#if defined(QT_OPENGL_DRAWCACHEDGLYPHS_INDEX_ARRAY_VBO)
+    funcs.glDrawElements(GL_TRIANGLE_STRIP, 6 * numGlyphs, GL_UNSIGNED_SHORT, 0);
+    funcs.glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0);
+#else
+    const bool useIndexVbo = uploadIndexData(elementIndices.data(), GL_UNSIGNED_SHORT, 6 * numGlyphs);
+    funcs.glDrawElements(GL_TRIANGLE_STRIP, 6 * numGlyphs, GL_UNSIGNED_SHORT, useIndexVbo ? nullptr : elementIndices.data());
+#endif
+}
+
+void QOpenGL2PaintEngineEx::drawPixmapFragments(const QPainter::PixmapFragment *fragments, int fragmentCount, const QPixmap &pixmap,
+                                            QPainter::PixmapFragmentHints hints)
+{
+    Q_D(QOpenGL2PaintEngineEx);
+    // Use fallback for extended composition modes.
+    if (state()->composition_mode > QPainter::CompositionMode_Plus) {
+        QPaintEngineEx::drawPixmapFragments(fragments, fragmentCount, pixmap, hints);
+        return;
+    }
+
+    ensureActive();
+    int max_texture_size = d->ctx->d_func()->maxTextureSize();
+    if (pixmap.width() > max_texture_size || pixmap.height() > max_texture_size) {
+        QPixmap scaled = pixmap.scaled(max_texture_size, max_texture_size, Qt::KeepAspectRatio);
+        d->drawPixmapFragments(fragments, fragmentCount, scaled, hints);
+    } else {
+        d->drawPixmapFragments(fragments, fragmentCount, pixmap, hints);
+    }
+}
+
+
+void QOpenGL2PaintEngineExPrivate::drawPixmapFragments(const QPainter::PixmapFragment *fragments,
+                                                   int fragmentCount, const QPixmap &pixmap,
+                                                   QPainter::PixmapFragmentHints hints)
+{
+    GLfloat dx = 1.0f / pixmap.size().width();
+    GLfloat dy = 1.0f / pixmap.size().height();
+
+    vertexCoordinateArray.clear();
+    textureCoordinateArray.clear();
+    opacityArray.reset();
+
+    if (snapToPixelGrid) {
+        snapToPixelGrid = false;
+        matrixDirty = true;
+    }
+
+    bool allOpaque = true;
+
+    for (int i = 0; i < fragmentCount; ++i) {
+        qreal s = 0;
+        qreal c = 1;
+        if (fragments[i].rotation != 0) {
+            s = qFastSin(qDegreesToRadians(fragments[i].rotation));
+            c = qFastCos(qDegreesToRadians(fragments[i].rotation));
+        }
+
+        qreal right = 0.5 * fragments[i].scaleX * fragments[i].width;
+        qreal bottom = 0.5 * fragments[i].scaleY * fragments[i].height;
+        QOpenGLPoint bottomRight(right * c - bottom * s, right * s + bottom * c);
+        QOpenGLPoint bottomLeft(-right * c - bottom * s, -right * s + bottom * c);
+
+        vertexCoordinateArray.addVertex(bottomRight.x + fragments[i].x, bottomRight.y + fragments[i].y);
+        vertexCoordinateArray.addVertex(-bottomLeft.x + fragments[i].x, -bottomLeft.y + fragments[i].y);
+        vertexCoordinateArray.addVertex(-bottomRight.x + fragments[i].x, -bottomRight.y + fragments[i].y);
+        vertexCoordinateArray.addVertex(-bottomRight.x + fragments[i].x, -bottomRight.y + fragments[i].y);
+        vertexCoordinateArray.addVertex(bottomLeft.x + fragments[i].x, bottomLeft.y + fragments[i].y);
+        vertexCoordinateArray.addVertex(bottomRight.x + fragments[i].x, bottomRight.y + fragments[i].y);
+
+        QOpenGLRect src(fragments[i].sourceLeft * dx, fragments[i].sourceTop * dy,
+                    (fragments[i].sourceLeft + fragments[i].width) * dx,
+                    (fragments[i].sourceTop + fragments[i].height) * dy);
+
+        textureCoordinateArray.addVertex(src.right, src.bottom);
+        textureCoordinateArray.addVertex(src.right, src.top);
+        textureCoordinateArray.addVertex(src.left, src.top);
+        textureCoordinateArray.addVertex(src.left, src.top);
+        textureCoordinateArray.addVertex(src.left, src.bottom);
+        textureCoordinateArray.addVertex(src.right, src.bottom);
+
+        qreal opacity = fragments[i].opacity * q->state()->opacity;
+        opacityArray << opacity << opacity << opacity << opacity << opacity << opacity;
+        allOpaque &= (opacity >= 0.99f);
+    }
+
+    transferMode(ImageOpacityArrayDrawingMode);
+
+    GLenum filterMode = q->state()->renderHints & QPainter::SmoothPixmapTransform ? GL_LINEAR : GL_NEAREST;
+    updateTexture(QT_IMAGE_TEXTURE_UNIT, pixmap, GL_CLAMP_TO_EDGE, filterMode);
+
+    bool isBitmap = pixmap.isQBitmap();
+    bool isOpaque = !isBitmap && (!pixmap.hasAlpha() || (hints & QPainter::OpaqueHint)) && allOpaque;
+
+    // Setup for texture drawing
+    currentBrush = noBrush;
+    shaderManager->setSrcPixelType(isBitmap ? QOpenGLEngineShaderManager::PatternSrc
+                                            : QOpenGLEngineShaderManager::ImageSrc);
+    if (prepareForDraw(isOpaque))
+        shaderManager->currentProgram()->setUniformValue(location(QOpenGLEngineShaderManager::ImageTexture), QT_IMAGE_TEXTURE_UNIT);
+
+    if (isBitmap) {
+        QColor col = qt_premultiplyColor(q->state()->pen.color(), (GLfloat)q->state()->opacity);
+        shaderManager->currentProgram()->setUniformValue(location(QOpenGLEngineShaderManager::PatternColor), col);
+    }
+
+    funcs.glDrawArrays(GL_TRIANGLES, 0, 6 * fragmentCount);
+}
+
+bool QOpenGL2PaintEngineEx::begin(QPaintDevice *pdev)
+{
+    Q_D(QOpenGL2PaintEngineEx);
+
+    Q_ASSERT(pdev->devType() == QInternal::OpenGL);
+    d->device = static_cast<QOpenGLPaintDevice*>(pdev);
+
+    if (!d->device)
+        return false;
+
+    d->device->ensureActiveTarget();
+
+    if (d->device->context() != QOpenGLContext::currentContext() || !d->device->context()) {
+        qWarning("QPainter::begin(): QOpenGLPaintDevice's context needs to be current");
+        return false;
+    }
+
+    if (d->ctx != QOpenGLContext::currentContext()
+            || (d->ctx && QOpenGLContext::currentContext() && d->ctx->format() != QOpenGLContext::currentContext()->format())) {
+        d->vertexBuffer.destroy();
+        d->texCoordBuffer.destroy();
+        d->opacityBuffer.destroy();
+        d->indexBuffer.destroy();
+        d->vao.destroy();
+    }
+
+    d->ctx = QOpenGLContext::currentContext();
+    d->ctx->d_func()->active_engine = this;
+
+    QOpenGLPaintDevicePrivate::get(d->device)->beginPaint();
+
+    d->funcs.initializeOpenGLFunctions();
+
+    // Generate a new Vertex Array Object if we don't have one already.  We can
+    // only hit the VAO-based path when using a core profile context.  This is
+    // because while non-core contexts can support VAOs via extensions, legacy
+    // components like the QtOpenGL module do not know about VAOs. There are
+    // still tests for QGL-QOpenGL paint engine interoperability, so keep the
+    // status quo for now, and avoid introducing a VAO in non-core contexts.
+    const bool needsVAO = d->ctx->format().profile() == QSurfaceFormat::CoreProfile
+        && d->ctx->format().version() >= qMakePair(3, 2);
+    if (needsVAO && !d->vao.isCreated()) {
+        bool created = d->vao.create();
+
+        // If we managed to create it then we have a profile that supports VAOs
+        if (created) {
+            d->vao.bind();
+
+            // Generate a new Vertex Buffer Object if we don't have one already
+            if (!d->vertexBuffer.isCreated()) {
+                d->vertexBuffer.create();
+                // Set its usage to StreamDraw, we will use this buffer only a few times before refilling it
+                d->vertexBuffer.setUsagePattern(QOpenGLBuffer::StreamDraw);
+            }
+            if (!d->texCoordBuffer.isCreated()) {
+                d->texCoordBuffer.create();
+                d->texCoordBuffer.setUsagePattern(QOpenGLBuffer::StreamDraw);
+            }
+            if (!d->opacityBuffer.isCreated()) {
+                d->opacityBuffer.create();
+                d->opacityBuffer.setUsagePattern(QOpenGLBuffer::StreamDraw);
+            }
+            if (!d->indexBuffer.isCreated()) {
+                d->indexBuffer.create();
+                d->indexBuffer.setUsagePattern(QOpenGLBuffer::StreamDraw);
+            }
+        }
+    }
+
+    for (int i = 0; i < QT_GL_VERTEX_ARRAY_TRACKED_COUNT; ++i)
+        d->vertexAttributeArraysEnabledState[i] = false;
+
+    const QSize sz = d->device->size();
+    d->width = sz.width();
+    d->height = sz.height();
+    d->mode = BrushDrawingMode;
+    d->brushTextureDirty = true;
+    d->brushUniformsDirty = true;
+    d->matrixUniformDirty = true;
+    d->matrixDirty = true;
+    d->compositionModeDirty = true;
+    d->opacityUniformDirty = true;
+    d->needsSync = true;
+    d->useSystemClip = !systemClip().isEmpty();
+    d->currentBrush = QBrush();
+
+    d->dirtyStencilRegion = QRect(0, 0, d->width, d->height);
+    d->stencilClean = true;
+
+    d->shaderManager = new QOpenGLEngineShaderManager(d->ctx);
+
+    d->funcs.glDisable(GL_STENCIL_TEST);
+    d->funcs.glDisable(GL_DEPTH_TEST);
+    d->funcs.glDisable(GL_SCISSOR_TEST);
+
+    d->glyphCacheFormat = QFontEngine::Format_A8;
+
+#ifndef QT_OPENGL_ES_2
+    if (!QOpenGLContext::currentContext()->isOpenGLES()) {
+        d->funcs.glDisable(GL_MULTISAMPLE);
+        d->glyphCacheFormat = QFontEngine::Format_A32;
+        d->multisamplingAlwaysEnabled = false;
+    } else
+#endif // QT_OPENGL_ES_2
+    {
+        // OpenGL ES can't switch MSAA off, so if the gl paint device is
+        // multisampled, it's always multisampled.
+        d->multisamplingAlwaysEnabled = d->device->context()->format().samples() > 1;
+    }
+
+    return true;
+}
+
+bool QOpenGL2PaintEngineEx::end()
+{
+    Q_D(QOpenGL2PaintEngineEx);
+
+    QOpenGLPaintDevicePrivate::get(d->device)->endPaint();
+
+    QOpenGLContext *ctx = d->ctx;
+    d->funcs.glUseProgram(0);
+    d->transferMode(BrushDrawingMode);
+
+    ctx->d_func()->active_engine = nullptr;
+
+    d->resetGLState();
+
+    delete d->shaderManager;
+    d->shaderManager = nullptr;
+    d->currentBrush = QBrush();
+
+#ifdef QT_OPENGL_CACHE_AS_VBOS
+    if (!d->unusedVBOSToClean.isEmpty()) {
+        glDeleteBuffers(d->unusedVBOSToClean.size(), d->unusedVBOSToClean.constData());
+        d->unusedVBOSToClean.clear();
+    }
+    if (!d->unusedIBOSToClean.isEmpty()) {
+        glDeleteBuffers(d->unusedIBOSToClean.size(), d->unusedIBOSToClean.constData());
+        d->unusedIBOSToClean.clear();
+    }
+#endif
+
+    return false;
+}
+
+void QOpenGL2PaintEngineEx::ensureActive()
+{
+    Q_D(QOpenGL2PaintEngineEx);
+    QOpenGLContext *ctx = d->ctx;
+
+    if (d->vao.isCreated())
+        d->vao.bind();
+
+    if (isActive() && ctx->d_func()->active_engine != this) {
+        ctx->d_func()->active_engine = this;
+        d->needsSync = true;
+    }
+
+    if (d->needsSync) {
+        d->device->ensureActiveTarget();
+
+        d->transferMode(BrushDrawingMode);
+        d->funcs.glViewport(0, 0, d->width, d->height);
+        d->needsSync = false;
+        d->shaderManager->setDirty();
+        d->syncGlState();
+        for (int i = 0; i < 3; ++i)
+            d->vertexAttribPointers[i] = (GLfloat*)-1; // Assume the pointers are clobbered
+        setState(state());
+    }
+}
+
+void QOpenGL2PaintEngineExPrivate::updateClipScissorTest()
+{
+    Q_Q(QOpenGL2PaintEngineEx);
+    if (q->state()->clipTestEnabled) {
+        funcs.glEnable(GL_STENCIL_TEST);
+        funcs.glStencilFunc(GL_LEQUAL, q->state()->currentClip, ~GL_STENCIL_HIGH_BIT);
+    } else {
+        funcs.glDisable(GL_STENCIL_TEST);
+        funcs.glStencilFunc(GL_ALWAYS, 0, 0xff);
+    }
+
+#ifdef QT_GL_NO_SCISSOR_TEST
+    currentScissorBounds = QRect(0, 0, width, height);
+#else
+    QRect bounds = q->state()->rectangleClip;
+    if (!q->state()->clipEnabled) {
+        if (useSystemClip)
+            bounds = systemClip.boundingRect();
+        else
+            bounds = QRect(0, 0, width, height);
+    } else {
+        if (useSystemClip)
+            bounds = bounds.intersected(systemClip.boundingRect());
+        else
+            bounds = bounds.intersected(QRect(0, 0, width, height));
+    }
+
+    currentScissorBounds = bounds;
+
+    if (bounds == QRect(0, 0, width, height)) {
+        funcs.glDisable(GL_SCISSOR_TEST);
+    } else {
+        funcs.glEnable(GL_SCISSOR_TEST);
+        setScissor(bounds);
+    }
+#endif
+}
+
+void QOpenGL2PaintEngineExPrivate::setScissor(const QRect &rect)
+{
+    const int left = rect.left();
+    const int width = rect.width();
+    int bottom = height - (rect.top() + rect.height());
+    if (device->paintFlipped()) {
+        bottom = rect.top();
+    }
+    const int height = rect.height();
+
+    funcs.glScissor(left, bottom, width, height);
+}
+
+void QOpenGL2PaintEngineEx::clipEnabledChanged()
+{
+    Q_D(QOpenGL2PaintEngineEx);
+
+    state()->clipChanged = true;
+
+    if (painter()->hasClipping())
+        d->regenerateClip();
+    else
+        d->systemStateChanged();
+}
+
+void QOpenGL2PaintEngineExPrivate::clearClip(uint value)
+{
+    dirtyStencilRegion -= currentScissorBounds;
+
+    funcs.glStencilMask(0xff);
+    funcs.glClearStencil(value);
+    funcs.glClear(GL_STENCIL_BUFFER_BIT);
+    funcs.glStencilMask(0x0);
+
+    q->state()->needsClipBufferClear = false;
+}
+
+void QOpenGL2PaintEngineExPrivate::writeClip(const QVectorPath &path, uint value)
+{
+    transferMode(BrushDrawingMode);
+
+    if (snapToPixelGrid) {
+        snapToPixelGrid = false;
+        matrixDirty = true;
+    }
+
+    if (matrixDirty)
+        updateMatrix();
+
+    stencilClean = false;
+
+    const bool singlePass = !path.hasWindingFill()
+        && (((q->state()->currentClip == maxClip - 1) && q->state()->clipTestEnabled)
+            || q->state()->needsClipBufferClear);
+    const uint referenceClipValue = q->state()->needsClipBufferClear ? 1 : q->state()->currentClip;
+
+    if (q->state()->needsClipBufferClear)
+        clearClip(1);
+
+    if (path.isEmpty()) {
+        funcs.glEnable(GL_STENCIL_TEST);
+        funcs.glStencilFunc(GL_LEQUAL, value, ~GL_STENCIL_HIGH_BIT);
+        return;
+    }
+
+    if (q->state()->clipTestEnabled)
+        funcs.glStencilFunc(GL_LEQUAL, q->state()->currentClip, ~GL_STENCIL_HIGH_BIT);
+    else
+        funcs.glStencilFunc(GL_ALWAYS, 0, 0xff);
+
+    vertexCoordinateArray.clear();
+    vertexCoordinateArray.addPath(path, inverseScale, false);
+
+    if (!singlePass)
+        fillStencilWithVertexArray(vertexCoordinateArray, path.hasWindingFill());
+
+    funcs.glColorMask(false, false, false, false);
+    funcs.glEnable(GL_STENCIL_TEST);
+    useSimpleShader();
+
+    if (singlePass) {
+        // Under these conditions we can set the new stencil value in a single
+        // pass, by using the current value and the "new value" as the toggles
+
+        funcs.glStencilFunc(GL_LEQUAL, referenceClipValue, ~GL_STENCIL_HIGH_BIT);
+        funcs.glStencilOp(GL_KEEP, GL_INVERT, GL_INVERT);
+        funcs.glStencilMask(value ^ referenceClipValue);
+
+        drawVertexArrays(vertexCoordinateArray, GL_TRIANGLE_FAN);
+    } else {
+        funcs.glStencilOp(GL_KEEP, GL_REPLACE, GL_REPLACE);
+        funcs.glStencilMask(0xff);
+
+        if (!q->state()->clipTestEnabled && path.hasWindingFill()) {
+            // Pass when any clip bit is set, set high bit
+            funcs.glStencilFunc(GL_NOTEQUAL, GL_STENCIL_HIGH_BIT, ~GL_STENCIL_HIGH_BIT);
+            composite(vertexCoordinateArray.boundingRect());
+        }
+
+        // Pass when high bit is set, replace stencil value with new clip value
+        funcs.glStencilFunc(GL_NOTEQUAL, value, GL_STENCIL_HIGH_BIT);
+
+        composite(vertexCoordinateArray.boundingRect());
+    }
+
+    funcs.glStencilFunc(GL_LEQUAL, value, ~GL_STENCIL_HIGH_BIT);
+    funcs.glStencilMask(0);
+
+    funcs.glColorMask(true, true, true, true);
+}
+
+void QOpenGL2PaintEngineEx::clip(const QVectorPath &path, Qt::ClipOperation op)
+{
+//     qDebug("QOpenGL2PaintEngineEx::clip()");
+    Q_D(QOpenGL2PaintEngineEx);
+
+    state()->clipChanged = true;
+
+    ensureActive();
+
+    if (op == Qt::ReplaceClip) {
+        op = Qt::IntersectClip;
+        if (d->hasClipOperations()) {
+            d->systemStateChanged();
+            state()->canRestoreClip = false;
+        }
+    }
+
+#ifndef QT_GL_NO_SCISSOR_TEST
+    if (!path.isEmpty() && op == Qt::IntersectClip && (path.shape() == QVectorPath::RectangleHint)) {
+        const QPointF* const points = reinterpret_cast<const QPointF*>(path.points());
+        QRectF rect(points[0], points[2]);
+
+        if (state()->matrix.type() <= QTransform::TxScale
+            || (state()->matrix.type() == QTransform::TxRotate
+                && qFuzzyIsNull(state()->matrix.m11())
+                && qFuzzyIsNull(state()->matrix.m22())))
+        {
+            state()->rectangleClip = state()->rectangleClip.intersected(state()->matrix.mapRect(rect).toRect());
+            d->updateClipScissorTest();
+            return;
+        }
+    }
+#endif
+
+    const QRect pathRect = state()->matrix.mapRect(path.controlPointRect()).toAlignedRect();
+
+    switch (op) {
+    case Qt::NoClip:
+        if (d->useSystemClip) {
+            state()->clipTestEnabled = true;
+            state()->currentClip = 1;
+        } else {
+            state()->clipTestEnabled = false;
+        }
+        state()->rectangleClip = QRect(0, 0, d->width, d->height);
+        state()->canRestoreClip = false;
+        d->updateClipScissorTest();
+        break;
+    case Qt::IntersectClip:
+        state()->rectangleClip = state()->rectangleClip.intersected(pathRect);
+        d->updateClipScissorTest();
+        d->resetClipIfNeeded();
+        ++d->maxClip;
+        d->writeClip(path, d->maxClip);
+        state()->currentClip = d->maxClip;
+        state()->clipTestEnabled = true;
+        break;
+    default:
+        break;
+    }
+}
+
+void QOpenGL2PaintEngineExPrivate::regenerateClip()
+{
+    systemStateChanged();
+    replayClipOperations();
+}
+
+void QOpenGL2PaintEngineExPrivate::systemStateChanged()
+{
+    Q_Q(QOpenGL2PaintEngineEx);
+
+    q->state()->clipChanged = true;
+
+    if (systemClip.isEmpty()) {
+        useSystemClip = false;
+    } else {
+        if (q->paintDevice()->devType() == QInternal::Widget && currentClipDevice) {
+            //QWidgetPrivate *widgetPrivate = qt_widget_private(static_cast<QWidget *>(currentClipDevice)->window());
+            //useSystemClip = widgetPrivate->extra && widgetPrivate->extra->inRenderWithPainter;
+            useSystemClip = true;
+        } else {
+            useSystemClip = true;
+        }
+    }
+
+    q->state()->clipTestEnabled = false;
+    q->state()->needsClipBufferClear = true;
+
+    q->state()->currentClip = 1;
+    maxClip = 1;
+
+    q->state()->rectangleClip = useSystemClip ? systemClip.boundingRect() : QRect(0, 0, width, height);
+    updateClipScissorTest();
+
+    if (systemClip.rectCount() == 1) {
+        if (systemClip.boundingRect() == QRect(0, 0, width, height))
+            useSystemClip = false;
+#ifndef QT_GL_NO_SCISSOR_TEST
+        // scissoring takes care of the system clip
+        return;
+#endif
+    }
+
+    if (useSystemClip) {
+        clearClip(0);
+
+        QPainterPath path;
+        path.addRegion(systemClip);
+
+        q->state()->currentClip = 0;
+        writeClip(qtVectorPathForPath(q->state()->matrix.inverted().map(path)), 1);
+        q->state()->currentClip = 1;
+        q->state()->clipTestEnabled = true;
+    }
+}
+
+void QOpenGL2PaintEngineEx::setState(QPainterState *new_state)
+{
+    //     qDebug("QOpenGL2PaintEngineEx::setState()");
+
+    Q_D(QOpenGL2PaintEngineEx);
+
+    QOpenGL2PaintEngineState *s = static_cast<QOpenGL2PaintEngineState *>(new_state);
+    QOpenGL2PaintEngineState *old_state = state();
+
+    QPaintEngineEx::setState(s);
+
+    if (s->isNew) {
+        // Newly created state object.  The call to setState()
+        // will either be followed by a call to begin(), or we are
+        // setting the state as part of a save().
+        s->isNew = false;
+        return;
+    }
+
+    // Setting the state as part of a restore().
+
+    if (old_state == s || old_state->renderHintsChanged)
+        renderHintsChanged();
+
+    if (old_state == s || old_state->matrixChanged)
+        d->matrixDirty = true;
+
+    if (old_state == s || old_state->compositionModeChanged)
+        d->compositionModeDirty = true;
+
+    if (old_state == s || old_state->opacityChanged)
+        d->opacityUniformDirty = true;
+
+    if (old_state == s || old_state->clipChanged) {
+        if (old_state && old_state != s && old_state->canRestoreClip) {
+            d->updateClipScissorTest();
+            d->funcs.glDepthFunc(GL_LEQUAL);
+        } else {
+            d->regenerateClip();
+        }
+    }
+}
+
+QPainterState *QOpenGL2PaintEngineEx::createState(QPainterState *orig) const
+{
+    if (orig)
+        const_cast<QOpenGL2PaintEngineEx *>(this)->ensureActive();
+
+    QOpenGL2PaintEngineState *s;
+    if (!orig)
+        s = new QOpenGL2PaintEngineState();
+    else
+        s = new QOpenGL2PaintEngineState(*static_cast<QOpenGL2PaintEngineState *>(orig));
+
+    s->matrixChanged = false;
+    s->compositionModeChanged = false;
+    s->opacityChanged = false;
+    s->renderHintsChanged = false;
+    s->clipChanged = false;
+
+    return s;
+}
+
+QOpenGL2PaintEngineState::QOpenGL2PaintEngineState(QOpenGL2PaintEngineState &other)
+    : QPainterState(other)
+{
+    isNew = true;
+    needsClipBufferClear = other.needsClipBufferClear;
+    clipTestEnabled = other.clipTestEnabled;
+    currentClip = other.currentClip;
+    canRestoreClip = other.canRestoreClip;
+    rectangleClip = other.rectangleClip;
+}
+
+QOpenGL2PaintEngineState::QOpenGL2PaintEngineState()
+{
+    isNew = true;
+    needsClipBufferClear = true;
+    clipTestEnabled = false;
+    canRestoreClip = true;
+}
+
+QOpenGL2PaintEngineState::~QOpenGL2PaintEngineState()
+{
+}
+
+void QOpenGL2PaintEngineExPrivate::setVertexAttribArrayEnabled(int arrayIndex, bool enabled)
+{
+    Q_ASSERT(arrayIndex < QT_GL_VERTEX_ARRAY_TRACKED_COUNT);
+
+    if (vertexAttributeArraysEnabledState[arrayIndex] && !enabled)
+        funcs.glDisableVertexAttribArray(arrayIndex);
+
+    if (!vertexAttributeArraysEnabledState[arrayIndex] && enabled)
+        funcs.glEnableVertexAttribArray(arrayIndex);
+
+    vertexAttributeArraysEnabledState[arrayIndex] = enabled;
+}
+
+void QOpenGL2PaintEngineExPrivate::syncGlState()
+{
+    for (int i = 0; i < QT_GL_VERTEX_ARRAY_TRACKED_COUNT; ++i) {
+        if (vertexAttributeArraysEnabledState[i])
+            funcs.glEnableVertexAttribArray(i);
+        else
+            funcs.glDisableVertexAttribArray(i);
+    }
+}
+
+
+QT_END_NAMESPACE
diff --git a/src/opengl/qopenglpaintengine_p.h b/src/opengl/qopenglpaintengine_p.h
new file mode 100644
index 0000000000..9dc92e3810
--- /dev/null
+++ b/src/opengl/qopenglpaintengine_p.h
@@ -0,0 +1,395 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtOpenGL module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QOPENGLPAINTENGINE_P_H
+#define QOPENGLPAINTENGINE_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <QDebug>
+
+#include <qopenglpaintdevice.h>
+
+#include <private/qpaintengineex_p.h>
+#include <private/qopenglengineshadermanager_p.h>
+#include <private/qopengl2pexvertexarray_p.h>
+#include <private/qfontengine_p.h>
+#include <private/qdatabuffer_p.h>
+#include <private/qtriangulatingstroker_p.h>
+
+#include <private/qopenglextensions_p.h>
+
+#include <QOpenGLVertexArrayObject>
+#include <QOpenGLBuffer>
+
+enum EngineMode {
+    ImageDrawingMode,
+    TextDrawingMode,
+    BrushDrawingMode,
+    ImageArrayDrawingMode,
+    ImageOpacityArrayDrawingMode
+};
+
+QT_BEGIN_NAMESPACE
+
+#define GL_STENCIL_HIGH_BIT         GLuint(0x80)
+#define QT_UNKNOWN_TEXTURE_UNIT     GLuint(-1)
+#define QT_DEFAULT_TEXTURE_UNIT     GLuint(0)
+#define QT_BRUSH_TEXTURE_UNIT       GLuint(0)
+#define QT_IMAGE_TEXTURE_UNIT       GLuint(0) //Can be the same as brush texture unit
+#define QT_MASK_TEXTURE_UNIT        GLuint(1)
+#define QT_BACKGROUND_TEXTURE_UNIT  GLuint(2)
+
+class QOpenGL2PaintEngineExPrivate;
+
+class QOpenGL2PaintEngineState : public QPainterState
+{
+public:
+    QOpenGL2PaintEngineState(QOpenGL2PaintEngineState &other);
+    QOpenGL2PaintEngineState();
+    ~QOpenGL2PaintEngineState();
+
+    uint isNew : 1;
+    uint needsClipBufferClear : 1;
+    uint clipTestEnabled : 1;
+    uint canRestoreClip : 1;
+    uint matrixChanged : 1;
+    uint compositionModeChanged : 1;
+    uint opacityChanged : 1;
+    uint renderHintsChanged : 1;
+    uint clipChanged : 1;
+    uint currentClip : 8;
+
+    QRect rectangleClip;
+};
+
+class Q_OPENGL_EXPORT QOpenGL2PaintEngineEx : public QPaintEngineEx
+{
+    Q_DECLARE_PRIVATE(QOpenGL2PaintEngineEx)
+public:
+    QOpenGL2PaintEngineEx();
+    ~QOpenGL2PaintEngineEx();
+
+    bool begin(QPaintDevice *device) override;
+    void ensureActive();
+    bool end() override;
+
+    virtual void clipEnabledChanged() override;
+    virtual void penChanged() override;
+    virtual void brushChanged() override;
+    virtual void brushOriginChanged() override;
+    virtual void opacityChanged() override;
+    virtual void compositionModeChanged() override;
+    virtual void renderHintsChanged() override;
+    virtual void transformChanged() override;
+
+    virtual void drawPixmap(const QRectF &r, const QPixmap &pm, const QRectF &sr) override;
+    virtual void drawPixmapFragments(const QPainter::PixmapFragment *fragments, int fragmentCount, const QPixmap &pixmap,
+                                     QPainter::PixmapFragmentHints hints) override;
+    virtual void drawImage(const QRectF &r, const QImage &pm, const QRectF &sr,
+                           Qt::ImageConversionFlags flags = Qt::AutoColor) override;
+    virtual void drawTextItem(const QPointF &p, const QTextItem &textItem) override;
+    virtual void fill(const QVectorPath &path, const QBrush &brush) override;
+    virtual void stroke(const QVectorPath &path, const QPen &pen) override;
+    virtual void clip(const QVectorPath &path, Qt::ClipOperation op) override;
+
+    virtual void drawStaticTextItem(QStaticTextItem *textItem) override;
+
+    bool drawTexture(const QRectF &r, GLuint textureId, const QSize &size, const QRectF &sr);
+
+    Type type() const override { return OpenGL2; }
+
+    virtual void setState(QPainterState *s) override;
+    virtual QPainterState *createState(QPainterState *orig) const override;
+    inline QOpenGL2PaintEngineState *state() {
+        return static_cast<QOpenGL2PaintEngineState *>(QPaintEngineEx::state());
+    }
+    inline const QOpenGL2PaintEngineState *state() const {
+        return static_cast<const QOpenGL2PaintEngineState *>(QPaintEngineEx::state());
+    }
+
+    void beginNativePainting() override;
+    void endNativePainting() override;
+
+    void invalidateState();
+
+    void setRenderTextActive(bool);
+
+    bool isNativePaintingActive() const;
+    bool requiresPretransformedGlyphPositions(QFontEngine *, const QTransform &) const override { return false; }
+    bool shouldDrawCachedGlyphs(QFontEngine *, const QTransform &) const override;
+
+private:
+    Q_DISABLE_COPY_MOVE(QOpenGL2PaintEngineEx)
+
+    friend class QOpenGLEngineShaderManager;
+};
+
+// This probably needs to grow to GL_MAX_VERTEX_ATTRIBS, but 3 is ok for now as that's
+// all the GL2 engine uses:
+#define QT_GL_VERTEX_ARRAY_TRACKED_COUNT 3
+
+class QOpenGL2PaintEngineExPrivate : public QPaintEngineExPrivate
+{
+    Q_DECLARE_PUBLIC(QOpenGL2PaintEngineEx)
+public:
+    enum StencilFillMode {
+        OddEvenFillMode,
+        WindingFillMode,
+        TriStripStrokeFillMode
+    };
+
+    QOpenGL2PaintEngineExPrivate(QOpenGL2PaintEngineEx *q_ptr) :
+            q(q_ptr),
+            shaderManager(nullptr),
+            width(0), height(0),
+            ctx(nullptr),
+            useSystemClip(true),
+            elementIndicesVBOId(0),
+            opacityArray(0),
+            snapToPixelGrid(false),
+            nativePaintingActive(false),
+            inverseScale(1),
+            lastTextureUnitUsed(QT_UNKNOWN_TEXTURE_UNIT),
+            vertexBuffer(QOpenGLBuffer::VertexBuffer),
+            texCoordBuffer(QOpenGLBuffer::VertexBuffer),
+            opacityBuffer(QOpenGLBuffer::VertexBuffer),
+            indexBuffer(QOpenGLBuffer::IndexBuffer)
+    { }
+
+    ~QOpenGL2PaintEngineExPrivate();
+
+    void updateBrushTexture();
+    void updateBrushUniforms();
+    void updateMatrix();
+    void updateCompositionMode();
+
+    enum TextureUpdateMode { UpdateIfNeeded, ForceUpdate };
+    template<typename T>
+    void updateTexture(GLenum textureUnit, const T &texture, GLenum wrapMode, GLenum filterMode, TextureUpdateMode updateMode = UpdateIfNeeded);
+    template<typename T>
+    GLuint bindTexture(const T &texture);
+    void activateTextureUnit(GLenum textureUnit);
+
+    void resetGLState();
+
+    // fill, stroke, drawTexture, drawPixmaps & drawCachedGlyphs are the main rendering entry-points,
+    // however writeClip can also be thought of as en entry point as it does similar things.
+    void fill(const QVectorPath &path);
+    void stroke(const QVectorPath &path, const QPen &pen);
+    void drawTexture(const QOpenGLRect& dest, const QOpenGLRect& src, const QSize &textureSize, bool opaque, bool pattern = false);
+    void drawPixmapFragments(const QPainter::PixmapFragment *fragments, int fragmentCount, const QPixmap &pixmap,
+                             QPainter::PixmapFragmentHints hints);
+    void drawCachedGlyphs(QFontEngine::GlyphFormat glyphFormat, QStaticTextItem *staticTextItem);
+
+    // Calls glVertexAttributePointer if the pointer has changed
+    inline void uploadData(unsigned int arrayIndex, const GLfloat *data, GLuint count);
+    inline bool uploadIndexData(const void *data, GLenum indexValueType, GLuint count);
+
+    // draws whatever is in the vertex array:
+    void drawVertexArrays(const float *data, int *stops, int stopCount, GLenum primitive);
+    void drawVertexArrays(QOpenGL2PEXVertexArray &vertexArray, GLenum primitive) {
+        drawVertexArrays((const float *) vertexArray.data(), vertexArray.stops(), vertexArray.stopCount(), primitive);
+    }
+
+    // Composites the bounding rect onto dest buffer:
+    void composite(const QOpenGLRect& boundingRect);
+
+    // Calls drawVertexArrays to render into stencil buffer:
+    void fillStencilWithVertexArray(const float *data, int count, int *stops, int stopCount, const QOpenGLRect &bounds, StencilFillMode mode);
+    void fillStencilWithVertexArray(QOpenGL2PEXVertexArray& vertexArray, bool useWindingFill) {
+        fillStencilWithVertexArray((const float *) vertexArray.data(), 0, vertexArray.stops(), vertexArray.stopCount(),
+                                   vertexArray.boundingRect(),
+                                   useWindingFill ? WindingFillMode : OddEvenFillMode);
+    }
+
+    void setBrush(const QBrush& brush);
+    void transferMode(EngineMode newMode);
+    bool prepareForDraw(bool srcPixelsAreOpaque); // returns true if the program has changed
+    bool prepareForCachedGlyphDraw(const QFontEngineGlyphCache &cache);
+    inline void useSimpleShader();
+    inline GLuint location(const QOpenGLEngineShaderManager::Uniform uniform) {
+        return shaderManager->getUniformLocation(uniform);
+    }
+
+    void clearClip(uint value);
+    void writeClip(const QVectorPath &path, uint value);
+    void resetClipIfNeeded();
+
+    void updateClipScissorTest();
+    void setScissor(const QRect &rect);
+    void regenerateClip();
+    void systemStateChanged() override;
+
+    void setVertexAttribArrayEnabled(int arrayIndex, bool enabled = true);
+    void syncGlState();
+
+    static QOpenGLEngineShaderManager* shaderManagerForEngine(QOpenGL2PaintEngineEx *engine) { return engine->d_func()->shaderManager; }
+    static QOpenGL2PaintEngineExPrivate *getData(QOpenGL2PaintEngineEx *engine) { return engine->d_func(); }
+    static void cleanupVectorPath(QPaintEngineEx *engine, void *data);
+
+    QOpenGLExtensions funcs;
+
+    QOpenGL2PaintEngineEx* q;
+    QOpenGLEngineShaderManager* shaderManager;
+    QOpenGLPaintDevice* device;
+    int width, height;
+    QOpenGLContext *ctx;
+    EngineMode mode;
+    QFontEngine::GlyphFormat glyphCacheFormat;
+
+    bool vertexAttributeArraysEnabledState[QT_GL_VERTEX_ARRAY_TRACKED_COUNT];
+
+    // Dirty flags
+    bool matrixDirty; // Implies matrix uniforms are also dirty
+    bool compositionModeDirty;
+    bool brushTextureDirty;
+    bool brushUniformsDirty;
+    bool opacityUniformDirty;
+    bool matrixUniformDirty;
+
+    bool stencilClean; // Has the stencil not been used for clipping so far?
+    bool useSystemClip;
+    QRegion dirtyStencilRegion;
+    QRect currentScissorBounds;
+    uint maxClip;
+
+    QBrush currentBrush; // May not be the state's brush!
+    const QBrush noBrush;
+
+    QImage currentBrushImage;
+
+    QOpenGL2PEXVertexArray vertexCoordinateArray;
+    QOpenGL2PEXVertexArray textureCoordinateArray;
+    QVector<GLushort> elementIndices;
+    GLuint elementIndicesVBOId;
+    QDataBuffer<GLfloat> opacityArray;
+    GLfloat staticVertexCoordinateArray[8];
+    GLfloat staticTextureCoordinateArray[8];
+
+    bool snapToPixelGrid;
+    bool nativePaintingActive;
+    GLfloat pmvMatrix[3][3];
+    GLfloat inverseScale;
+
+    GLenum lastTextureUnitUsed;
+    GLuint lastTextureUsed;
+
+    QOpenGLVertexArrayObject vao;
+    QOpenGLBuffer vertexBuffer;
+    QOpenGLBuffer texCoordBuffer;
+    QOpenGLBuffer opacityBuffer;
+    QOpenGLBuffer indexBuffer;
+
+    bool needsSync;
+    bool multisamplingAlwaysEnabled;
+
+    QTriangulatingStroker stroker;
+    QDashedStrokeProcessor dasher;
+
+    QVector<GLuint> unusedVBOSToClean;
+    QVector<GLuint> unusedIBOSToClean;
+
+    const GLfloat *vertexAttribPointers[3];
+};
+
+
+void QOpenGL2PaintEngineExPrivate::uploadData(unsigned int arrayIndex, const GLfloat *data, GLuint count)
+{
+    Q_ASSERT(arrayIndex < 3);
+
+    // If a vertex array object is created we have a profile that supports them
+    // and we will upload the data via a QOpenGLBuffer. Otherwise we will use
+    // the legacy way of uploading the data via glVertexAttribPointer.
+    if (vao.isCreated()) {
+        if (arrayIndex == QT_VERTEX_COORDS_ATTR) {
+            vertexBuffer.bind();
+            vertexBuffer.allocate(data, count * sizeof(float));
+        }
+        if (arrayIndex == QT_TEXTURE_COORDS_ATTR) {
+            texCoordBuffer.bind();
+            texCoordBuffer.allocate(data, count * sizeof(float));
+        }
+        if (arrayIndex == QT_OPACITY_ATTR) {
+            opacityBuffer.bind();
+            opacityBuffer.allocate(data, count * sizeof(float));
+        }
+        if (arrayIndex == QT_OPACITY_ATTR)
+            funcs.glVertexAttribPointer(arrayIndex, 1, GL_FLOAT, GL_FALSE, 0, nullptr);
+        else
+            funcs.glVertexAttribPointer(arrayIndex, 2, GL_FLOAT, GL_FALSE, 0, nullptr);
+    } else {
+        // If we already uploaded the data we don't have to do it again
+        if (data == vertexAttribPointers[arrayIndex])
+            return;
+
+        // Store the data in cache and upload it to the graphics card.
+        vertexAttribPointers[arrayIndex] = data;
+        if (arrayIndex == QT_OPACITY_ATTR)
+            funcs.glVertexAttribPointer(arrayIndex, 1, GL_FLOAT, GL_FALSE, 0, data);
+        else
+            funcs.glVertexAttribPointer(arrayIndex, 2, GL_FLOAT, GL_FALSE, 0, data);
+    }
+}
+
+bool QOpenGL2PaintEngineExPrivate::uploadIndexData(const void *data, GLenum indexValueType, GLuint count)
+{
+    // Follow the uploadData() logic: VBOs are used only when VAO support is available.
+    // Otherwise the legacy client-side pointer path is used.
+    if (vao.isCreated()) {
+        Q_ASSERT(indexValueType == GL_UNSIGNED_SHORT || indexValueType == GL_UNSIGNED_INT);
+        indexBuffer.bind();
+        indexBuffer.allocate(data, count * (indexValueType == GL_UNSIGNED_SHORT ? sizeof(quint16) : sizeof(quint32)));
+        return true;
+    }
+    return false;
+}
+
+QT_END_NAMESPACE
+
+#endif
diff --git a/src/opengl/qopenglpixeltransferoptions.cpp b/src/opengl/qopenglpixeltransferoptions.cpp
new file mode 100644
index 0000000000..aa1af3b092
--- /dev/null
+++ b/src/opengl/qopenglpixeltransferoptions.cpp
@@ -0,0 +1,263 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB).
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtOpenGL module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qopenglpixeltransferoptions.h"
+#include <QSharedData>
+
+QT_BEGIN_NAMESPACE
+
+/*!
+ * \class QOpenGLPixelTransferOptions
+ *
+ * \brief The QOpenGLPixelTransferOptions class describes the pixel storage
+ * modes that affect the unpacking of pixels during texture upload.
+ */
+
+/*!
+ * \fn QOpenGLPixelTransferOptions & QOpenGLPixelTransferOptions::operator=(QOpenGLPixelTransferOptions &&other)
+ * \internal
+ */
+
+/*!
+ * \fn void QOpenGLPixelTransferOptions::swap(QOpenGLPixelTransferOptions &other)
+ * \internal
+ */
+
+class QOpenGLPixelTransferOptionsData : public QSharedData
+{
+public:
+    QOpenGLPixelTransferOptionsData()
+        : alignment(4)
+        , skipImages(0)
+        , skipRows(0)
+        , skipPixels(0)
+        , imageHeight(0)
+        , rowLength(0)
+        , lsbFirst(false)
+        , swapBytes(false)
+    {}
+
+    int alignment;
+    int skipImages;
+    int skipRows;
+    int skipPixels;
+    int imageHeight;
+    int rowLength;
+    bool lsbFirst;
+    bool swapBytes;
+};
+
+/*!
+ * Constructs a new QOpenGLPixelTransferOptions instance with the default settings.
+ */
+QOpenGLPixelTransferOptions::QOpenGLPixelTransferOptions()
+    : data(new QOpenGLPixelTransferOptionsData)
+{
+}
+
+/*!
+ * \internal
+ */
+QOpenGLPixelTransferOptions::QOpenGLPixelTransferOptions(const QOpenGLPixelTransferOptions &rhs)
+    : data(rhs.data)
+{
+}
+
+/*!
+ * \internal
+ */
+QOpenGLPixelTransferOptions &QOpenGLPixelTransferOptions::operator=(const QOpenGLPixelTransferOptions &rhs)
+{
+    if (this != &rhs)
+        data.operator=(rhs.data);
+    return *this;
+}
+
+/*!
+ * Destructor.
+ */
+QOpenGLPixelTransferOptions::~QOpenGLPixelTransferOptions()
+{
+}
+
+/*!
+ * Sets the \a alignment requirements for each pixel row. Corresponds to \c GL_UNPACK_ALIGNMENT.
+ * The default value is 4, as specified by OpenGL.
+ */
+void QOpenGLPixelTransferOptions::setAlignment(int alignment)
+{
+    data->alignment = alignment;
+}
+
+/*!
+ * \return the current alignment requirement for each pixel row.
+ */
+int QOpenGLPixelTransferOptions::alignment() const
+{
+    return data->alignment;
+}
+
+/*!
+ * Sets the number of images that are skipped to \a skipImages.
+ * Corresponds to \c GL_UNPACK_SKIP_IMAGES. Equivalent to incrementing the pointer
+ * passed to QOpenGLTexture::setData(). The default value is 0.
+ */
+void QOpenGLPixelTransferOptions::setSkipImages(int skipImages)
+{
+    data->skipImages = skipImages;
+}
+
+/*!
+ * \return the number of images that are skipped.
+ */
+int QOpenGLPixelTransferOptions::skipImages() const
+{
+    return data->skipImages;
+}
+
+/*!
+ * Sets the number of rows that are skipped to \a skipRows.
+ * Corresponds to \c GL_UNPACK_SKIP_ROWS. Equivalent to incrementing the pointer
+ * passed to QOpenGLTexture::setData(). The default value is 0.
+ */
+void QOpenGLPixelTransferOptions::setSkipRows(int skipRows)
+{
+    data->skipRows = skipRows;
+}
+
+/*!
+ * \return the number of rows that are skipped.
+ */
+int QOpenGLPixelTransferOptions::skipRows() const
+{
+    return data->skipRows;
+}
+
+/*!
+ * Sets the number of pixels that are skipped to \a skipPixels.
+ * Corresponds to \c GL_UNPACK_SKIP_PIXELS. Equivalent to incrementing the pointer
+ * passed to QOpenGLTexture::setData(). The default value is 0.
+ */
+void QOpenGLPixelTransferOptions::setSkipPixels(int skipPixels)
+{
+    data->skipPixels = skipPixels;
+}
+
+/*!
+ * \return the number of pixels that are skipped.
+ */
+int QOpenGLPixelTransferOptions::skipPixels() const
+{
+    return data->skipPixels;
+}
+
+/*!
+ * Sets the image height for 3D textures to \a imageHeight.
+ * Corresponds to \c GL_UNPACK_IMAGE_HEIGHT.
+ * The default value is 0.
+ */
+void QOpenGLPixelTransferOptions::setImageHeight(int imageHeight)
+{
+    data->imageHeight = imageHeight;
+}
+
+/*!
+ * \return the currently set image height.
+ */
+int QOpenGLPixelTransferOptions::imageHeight() const
+{
+    return data->imageHeight;
+}
+
+/*!
+ * Sets the number of pixels in a row to \a rowLength.
+ * Corresponds to \c GL_UNPACK_ROW_LENGTH.
+ * The default value is 0.
+ */
+void QOpenGLPixelTransferOptions::setRowLength(int rowLength)
+{
+    data->rowLength = rowLength;
+}
+
+/*!
+ * \return the currently set row length.
+ */
+int QOpenGLPixelTransferOptions::rowLength() const
+{
+    return data->rowLength;
+}
+
+/*!
+ * \a lsbFirst specifies if bits within a byte are ordered from least to most significat.
+ * The default value is \c false, meaning that the first bit in each byte is the
+ * most significant one. This is significant for bitmap data only.
+ * Corresponds to \c GL_UNPACK_LSB_FIRST.
+ */
+void QOpenGLPixelTransferOptions::setLeastSignificantByteFirst(bool lsbFirst)
+{
+    data->lsbFirst = lsbFirst;
+}
+
+/*!
+ * \return \c true if bits within a byte are ordered from least to most significant.
+ */
+bool QOpenGLPixelTransferOptions::isLeastSignificantBitFirst() const
+{
+    return data->lsbFirst;
+}
+
+/*!
+ * \a swapBytes specifies if the byte ordering for multibyte components is reversed.
+ * The default value is \c false.
+ * Corresponds to \c GL_UNPACK_SWAP_BYTES.
+ */
+void QOpenGLPixelTransferOptions::setSwapBytesEnabled(bool swapBytes)
+{
+    data->swapBytes = swapBytes;
+}
+
+/*!
+ * \return \c true if the byte ordering for multibyte components is reversed.
+ */
+bool QOpenGLPixelTransferOptions::isSwapBytesEnabled() const
+{
+    return data->swapBytes;
+}
+
+QT_END_NAMESPACE
diff --git a/src/opengl/qopenglpixeltransferoptions.h b/src/opengl/qopenglpixeltransferoptions.h
new file mode 100644
index 0000000000..252c2a2f1e
--- /dev/null
+++ b/src/opengl/qopenglpixeltransferoptions.h
@@ -0,0 +1,100 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB).
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtOpenGL module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QOPENGLPIXELUPLOADOPTIONS_H
+#define QOPENGLPIXELUPLOADOPTIONS_H
+
+#include <QtOpenGL/qtopenglglobal.h>
+
+#if !defined(QT_NO_OPENGL)
+
+#include <QtCore/QSharedDataPointer>
+
+QT_BEGIN_NAMESPACE
+
+class QOpenGLPixelTransferOptionsData;
+
+class Q_OPENGL_EXPORT QOpenGLPixelTransferOptions
+{
+public:
+    QOpenGLPixelTransferOptions();
+    QOpenGLPixelTransferOptions(const QOpenGLPixelTransferOptions &);
+    QOpenGLPixelTransferOptions &operator=(QOpenGLPixelTransferOptions &&other) noexcept
+    { swap(other); return *this; }
+    QOpenGLPixelTransferOptions &operator=(const QOpenGLPixelTransferOptions &);
+    ~QOpenGLPixelTransferOptions();
+
+    void swap(QOpenGLPixelTransferOptions &other) noexcept
+    { data.swap(other.data); }
+
+    void setAlignment(int alignment);
+    int alignment() const;
+
+    void setSkipImages(int skipImages);
+    int skipImages() const;
+
+    void setSkipRows(int skipRows);
+    int skipRows() const;
+
+    void setSkipPixels(int skipPixels);
+    int skipPixels() const;
+
+    void setImageHeight(int imageHeight);
+    int imageHeight() const;
+
+    void setRowLength(int rowLength);
+    int rowLength() const;
+
+    void setLeastSignificantByteFirst(bool lsbFirst);
+    bool isLeastSignificantBitFirst() const;
+
+    void setSwapBytesEnabled(bool swapBytes);
+    bool isSwapBytesEnabled() const;
+
+private:
+    QSharedDataPointer<QOpenGLPixelTransferOptionsData> data;
+};
+
+Q_DECLARE_SHARED(QOpenGLPixelTransferOptions)
+
+QT_END_NAMESPACE
+
+#endif // QT_NO_OPENGL
+
+#endif // QOPENGLPIXELUPLOADOPTIONS_H
diff --git a/src/opengl/qopenglqueryhelper_p.h b/src/opengl/qopenglqueryhelper_p.h
new file mode 100644
index 0000000000..f3ed997f98
--- /dev/null
+++ b/src/opengl/qopenglqueryhelper_p.h
@@ -0,0 +1,186 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB).
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtOpenGL module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QOPENGLQUERYHELPER_P_H
+#define QOPENGLQUERYHELPER_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <QtGui/private/qtguiglobal_p.h>
+
+#if !defined(QT_OPENGL_ES_2)
+
+#include <QtGui/QOpenGLContext>
+
+QT_BEGIN_NAMESPACE
+
+// Helper class used by QOpenGLTimerQuery and later will be used by
+// QOpenGLOcclusionQuery
+class QOpenGLQueryHelper
+{
+public:
+    QOpenGLQueryHelper(QOpenGLContext *context)
+        : GetQueryObjectuiv(nullptr),
+          GetQueryObjectiv(nullptr),
+          GetQueryiv(nullptr),
+          EndQuery(nullptr),
+          BeginQuery(nullptr),
+          IsQuery(nullptr),
+          DeleteQueries(nullptr),
+          GenQueries(nullptr),
+          GetInteger64v(nullptr),
+          GetQueryObjectui64v(nullptr),
+          GetQueryObjecti64v(nullptr),
+          QueryCounter(nullptr)
+    {
+        Q_ASSERT(context);
+
+        // Core in OpenGL >=1.5
+        GetQueryObjectuiv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLuint *)>(context->getProcAddress("glGetQueryObjectuiv"));
+        GetQueryObjectiv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLint *)>(context->getProcAddress("glGetQueryObjectiv"));
+        GetQueryiv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , GLint *)>(context->getProcAddress("glGetQueryiv"));
+        EndQuery = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum )>(context->getProcAddress("glEndQuery"));
+        BeginQuery = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLuint )>(context->getProcAddress("glBeginQuery"));
+        IsQuery = reinterpret_cast<GLboolean (QOPENGLF_APIENTRYP)(GLuint )>(context->getProcAddress("glIsQuery"));
+        DeleteQueries = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLsizei , const GLuint *)>(context->getProcAddress("glDeleteQueries"));
+        GenQueries = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLsizei , GLuint *)>(context->getProcAddress("glGenQueries"));
+
+        // Core in OpenGL >=3.2
+        GetInteger64v = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLint64 *)>(context->getProcAddress("glGetInteger64v"));
+
+        // Core in OpenGL >=3.3 / ARB_timer_query
+        GetQueryObjectui64v = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLuint64 *)>(context->getProcAddress("glGetQueryObjectui64v"));
+        GetQueryObjecti64v = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLint64 *)>(context->getProcAddress("glGetQueryObjecti64v"));
+        QueryCounter = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum )>(context->getProcAddress("glQueryCounter"));
+    }
+
+    inline void glGetQueryObjectuiv(GLuint id, GLenum pname, GLuint *params)
+    {
+        GetQueryObjectuiv(id, pname, params);
+    }
+
+    inline void glGetQueryObjectiv(GLuint id, GLenum pname, GLint *params)
+    {
+        GetQueryObjectiv(id, pname, params);
+    }
+
+    inline void glGetQueryiv(GLenum target, GLenum pname, GLint *params)
+    {
+        GetQueryiv(target, pname, params);
+    }
+
+    inline void glEndQuery(GLenum target)
+    {
+        EndQuery(target);
+    }
+
+    inline void glBeginQuery(GLenum target, GLuint id)
+    {
+        BeginQuery(target, id);
+    }
+
+    inline GLboolean glIsQuery(GLuint id)
+    {
+        return IsQuery(id);
+    }
+
+    inline void glDeleteQueries(GLsizei n, const GLuint *ids)
+    {
+        DeleteQueries(n, ids);
+    }
+
+    inline void glGenQueries(GLsizei n, GLuint *ids)
+    {
+        GenQueries(n, ids);
+    }
+
+    inline void glGetInteger64v(GLenum pname, GLint64 *params)
+    {
+        GetInteger64v(pname, params);
+    }
+
+    inline void glGetQueryObjectui64v(GLuint id, GLenum pname, GLuint64 *params)
+    {
+        GetQueryObjectui64v(id, pname, params);
+    }
+
+    inline void glGetQueryObjecti64v(GLuint id, GLenum pname, GLint64 *params)
+    {
+        GetQueryObjecti64v(id, pname, params);
+    }
+
+    inline void glQueryCounter(GLuint id, GLenum target)
+    {
+        QueryCounter(id, target);
+    }
+
+private:
+    // Core in OpenGL >=1.5
+    void (QOPENGLF_APIENTRYP GetQueryObjectuiv)(GLuint id, GLenum pname, GLuint *params);
+    void (QOPENGLF_APIENTRYP GetQueryObjectiv)(GLuint id, GLenum pname, GLint *params);
+    void (QOPENGLF_APIENTRYP GetQueryiv)(GLenum target, GLenum pname, GLint *params);
+    void (QOPENGLF_APIENTRYP EndQuery)(GLenum target);
+    void (QOPENGLF_APIENTRYP BeginQuery)(GLenum target, GLuint id);
+    GLboolean (QOPENGLF_APIENTRYP IsQuery)(GLuint id);
+    void (QOPENGLF_APIENTRYP DeleteQueries)(GLsizei n, const GLuint *ids);
+    void (QOPENGLF_APIENTRYP GenQueries)(GLsizei n, GLuint *ids);
+
+    // Core in OpenGL >=3.2
+    void (QOPENGLF_APIENTRYP GetInteger64v)(GLenum pname, GLint64 *params);
+
+    // Core in OpenGL >=3.3 and provided by ARB_timer_query
+    void (QOPENGLF_APIENTRYP GetQueryObjectui64v)(GLuint id, GLenum pname, GLuint64 *params);
+    void (QOPENGLF_APIENTRYP GetQueryObjecti64v)(GLuint id, GLenum pname, GLint64 *params);
+    void (QOPENGLF_APIENTRYP QueryCounter)(GLuint id, GLenum target);
+};
+
+QT_END_NAMESPACE
+
+#endif
+
+#endif // QOPENGLQUERYHELPER_P_H
diff --git a/src/opengl/qopenglshadercache_p.h b/src/opengl/qopenglshadercache_p.h
new file mode 100644
index 0000000000..88efa34216
--- /dev/null
+++ b/src/opengl/qopenglshadercache_p.h
@@ -0,0 +1,86 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtOpenGL module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#ifndef QOPENGLSHADERCACHE_P_H
+#define QOPENGLSHADERCACHE_P_H
+
+#include <QtOpenGL/qtopenglglobal.h>
+
+QT_BEGIN_NAMESPACE
+
+
+class QOpenGLShaderProgram;
+class QOpenGLContext;
+
+class CachedShader
+{
+public:
+    inline CachedShader(const QByteArray &, const QByteArray &)
+    {}
+
+    inline bool isCached()
+    {
+        return false;
+    }
+
+    inline bool load(QOpenGLShaderProgram *, QOpenGLContext *)
+    {
+        return false;
+    }
+
+    inline bool store(QOpenGLShaderProgram *, QOpenGLContext *)
+    {
+        return false;
+    }
+};
+
+QT_END_NAMESPACE
+
+#endif
diff --git a/src/opengl/qopenglshaderprogram.cpp b/src/opengl/qopenglshaderprogram.cpp
new file mode 100644
index 0000000000..c5e61859ee
--- /dev/null
+++ b/src/opengl/qopenglshaderprogram.cpp
@@ -0,0 +1,3810 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtOpenGL module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qopenglshaderprogram.h"
+#include "qopenglextrafunctions.h"
+#include "private/qopenglcontext_p.h"
+#include <QtCore/private/qobject_p.h>
+#include <QtCore/qdebug.h>
+#include <QtCore/qfile.h>
+#include <QtCore/qvarlengtharray.h>
+#include <QtCore/qvector.h>
+#include <QtCore/qloggingcategory.h>
+#include <QtGui/private/qopenglprogrambinarycache_p.h>
+#include <QtGui/qtransform.h>
+#include <QtGui/QColor>
+#include <QtGui/QSurfaceFormat>
+
+#if !defined(QT_OPENGL_ES_2)
+#include <QtGui/qopenglfunctions_4_0_core.h>
+#endif
+
+#include <algorithm>
+
+QT_BEGIN_NAMESPACE
+
+/*!
+    \class QOpenGLShaderProgram
+    \brief The QOpenGLShaderProgram class allows OpenGL shader programs to be linked and used.
+    \since 5.0
+    \ingroup painting-3D
+    \inmodule QtOpenGL
+
+    \section1 Introduction
+
+    This class supports shader programs written in the OpenGL Shading
+    Language (GLSL) and in the OpenGL/ES Shading Language (GLSL/ES).
+
+    QOpenGLShader and QOpenGLShaderProgram shelter the programmer from the details of
+    compiling and linking vertex and fragment shaders.
+
+    The following example creates a vertex shader program using the
+    supplied source \c{code}.  Once compiled and linked, the shader
+    program is activated in the current QOpenGLContext by calling
+    QOpenGLShaderProgram::bind():
+
+    \snippet code/src_gui_qopenglshaderprogram.cpp 0
+
+    \section1 Writing Portable Shaders
+
+    Shader programs can be difficult to reuse across OpenGL implementations
+    because of varying levels of support for standard vertex attributes and
+    uniform variables.  In particular, GLSL/ES lacks all of the
+    standard variables that are present on desktop OpenGL systems:
+    \c{gl_Vertex}, \c{gl_Normal}, \c{gl_Color}, and so on.  Desktop OpenGL
+    lacks the variable qualifiers \c{highp}, \c{mediump}, and \c{lowp}.
+
+    The QOpenGLShaderProgram class makes the process of writing portable shaders
+    easier by prefixing all shader programs with the following lines on
+    desktop OpenGL:
+
+    \code
+    #define highp
+    #define mediump
+    #define lowp
+    \endcode
+
+    This makes it possible to run most GLSL/ES shader programs
+    on desktop systems.  The programmer should restrict themselves
+    to just features that are present in GLSL/ES, and avoid
+    standard variable names that only work on the desktop.
+
+    \section1 Simple Shader Example
+
+    \snippet code/src_gui_qopenglshaderprogram.cpp 1
+
+    With the above shader program active, we can draw a green triangle
+    as follows:
+
+    \snippet code/src_gui_qopenglshaderprogram.cpp 2
+
+    \section1 Binary Shaders and Programs
+
+    Binary shaders may be specified using \c{glShaderBinary()} on
+    the return value from QOpenGLShader::shaderId().  The QOpenGLShader instance
+    containing the binary can then be added to the shader program with
+    addShader() and linked in the usual fashion with link().
+
+    Binary programs may be specified using \c{glProgramBinaryOES()}
+    on the return value from programId().  Then the application should
+    call link(), which will notice that the program has already been
+    specified and linked, allowing other operations to be performed
+    on the shader program. The shader program's id can be explicitly
+    created using the create() function.
+
+    \section2 Caching Program Binaries
+
+    As of Qt 5.9, support for caching program binaries on disk is built in. To
+    enable this, switch to using addCacheableShaderFromSourceCode() and
+    addCacheableShaderFromSourceFile(). With an OpenGL ES 3.x context or support
+    for \c{GL_ARB_get_program_binary}, this will transparently cache program
+    binaries under QStandardPaths::GenericCacheLocation or
+    QStandardPaths::CacheLocation. When support is not available, calling the
+    cacheable function variants is equivalent to the normal ones.
+
+    \note Some drivers do not have any binary formats available, even though
+    they advertise the extension or offer OpenGL ES 3.0. In this case program
+    binary support will be disabled.
+
+    \sa QOpenGLShader
+*/
+
+/*!
+    \class QOpenGLShader
+    \brief The QOpenGLShader class allows OpenGL shaders to be compiled.
+    \since 5.0
+    \ingroup painting-3D
+    \inmodule QtOpenGL
+
+    This class supports shaders written in the OpenGL Shading Language (GLSL)
+    and in the OpenGL/ES Shading Language (GLSL/ES).
+
+    QOpenGLShader and QOpenGLShaderProgram shelter the programmer from the details of
+    compiling and linking vertex and fragment shaders.
+
+    \sa QOpenGLShaderProgram
+*/
+
+/*!
+    \enum QOpenGLShader::ShaderTypeBit
+    This enum specifies the type of QOpenGLShader that is being created.
+
+    \value Vertex Vertex shader written in the OpenGL Shading Language (GLSL).
+    \value Fragment Fragment shader written in the OpenGL Shading Language (GLSL).
+    \value Geometry Geometry shaders written in the OpenGL Shading Language (GLSL)
+           (requires OpenGL >= 3.2 or OpenGL ES >= 3.2).
+    \value TessellationControl Tessellation control shaders written in the OpenGL
+           shading language (GLSL) (requires OpenGL >= 4.0 or OpenGL ES >= 3.2).
+    \value TessellationEvaluation Tessellation evaluation shaders written in the OpenGL
+           shading language (GLSL) (requires OpenGL >= 4.0 or OpenGL ES >= 3.2).
+    \value Compute Compute shaders written in the OpenGL shading language (GLSL)
+           (requires OpenGL >= 4.3 or OpenGL ES >= 3.1).
+*/
+
+// For GLES 3.1/3.2
+#ifndef GL_GEOMETRY_SHADER
+#define GL_GEOMETRY_SHADER         0x8DD9
+#endif
+#ifndef GL_TESS_CONTROL_SHADER
+#define GL_TESS_CONTROL_SHADER     0x8E88
+#endif
+#ifndef GL_TESS_EVALUATION_SHADER
+#define GL_TESS_EVALUATION_SHADER  0x8E87
+#endif
+#ifndef GL_COMPUTE_SHADER
+#define GL_COMPUTE_SHADER          0x91B9
+#endif
+#ifndef GL_MAX_GEOMETRY_OUTPUT_VERTICES
+#define GL_MAX_GEOMETRY_OUTPUT_VERTICES          0x8DE0
+#endif
+#ifndef GL_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS
+#define GL_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS  0x8DE1
+#endif
+#ifndef GL_PATCH_VERTICES
+#define GL_PATCH_VERTICES  0x8E72
+#endif
+#ifndef GL_PATCH_DEFAULT_OUTER_LEVEL
+#define GL_PATCH_DEFAULT_OUTER_LEVEL  0x8E74
+#endif
+#ifndef GL_PATCH_DEFAULT_INNER_LEVEL
+#define GL_PATCH_DEFAULT_INNER_LEVEL  0x8E73
+#endif
+
+#ifndef QT_OPENGL_ES_2
+static inline bool isFormatGLES(const QSurfaceFormat &f)
+{
+    return (f.renderableType() == QSurfaceFormat::OpenGLES);
+}
+#endif
+
+static inline bool supportsGeometry(const QSurfaceFormat &f)
+{
+    return f.version() >= qMakePair(3, 2);
+}
+
+static inline bool supportsCompute(const QSurfaceFormat &f)
+{
+#ifndef QT_OPENGL_ES_2
+    if (!isFormatGLES(f))
+        return f.version() >= qMakePair(4, 3);
+    else
+        return f.version() >= qMakePair(3, 1);
+#else
+    return f.version() >= qMakePair(3, 1);
+#endif
+}
+
+static inline bool supportsTessellation(const QSurfaceFormat &f)
+{
+#ifndef QT_OPENGL_ES_2
+    if (!isFormatGLES(f))
+        return f.version() >= qMakePair(4, 0);
+    else
+        return f.version() >= qMakePair(3, 2);
+#else
+    return f.version() >= qMakePair(3, 2);
+#endif
+}
+
+class QOpenGLShaderPrivate : public QObjectPrivate
+{
+    Q_DECLARE_PUBLIC(QOpenGLShader)
+public:
+    QOpenGLShaderPrivate(QOpenGLContext *ctx, QOpenGLShader::ShaderType type)
+        : shaderGuard(nullptr)
+        , shaderType(type)
+        , compiled(false)
+        , glfuncs(new QOpenGLExtraFunctions(ctx))
+        , supportsGeometryShaders(false)
+        , supportsTessellationShaders(false)
+        , supportsComputeShaders(false)
+    {
+        if (shaderType & QOpenGLShader::Geometry)
+            supportsGeometryShaders = supportsGeometry(ctx->format());
+        else if (shaderType & (QOpenGLShader::TessellationControl | QOpenGLShader::TessellationEvaluation))
+            supportsTessellationShaders = supportsTessellation(ctx->format());
+        else if (shaderType & QOpenGLShader::Compute)
+            supportsComputeShaders = supportsCompute(ctx->format());
+    }
+    ~QOpenGLShaderPrivate();
+
+    QOpenGLSharedResourceGuard *shaderGuard;
+    QOpenGLShader::ShaderType shaderType;
+    bool compiled;
+    QString log;
+
+    QOpenGLExtraFunctions *glfuncs;
+
+    // Support for geometry shaders
+    bool supportsGeometryShaders;
+    // Support for tessellation shaders
+    bool supportsTessellationShaders;
+    // Support for compute shaders
+    bool supportsComputeShaders;
+
+
+    bool create();
+    bool compile(QOpenGLShader *q);
+    void deleteShader();
+};
+
+namespace {
+    void freeShaderFunc(QOpenGLFunctions *funcs, GLuint id)
+    {
+        funcs->glDeleteShader(id);
+    }
+}
+
+QOpenGLShaderPrivate::~QOpenGLShaderPrivate()
+{
+    delete glfuncs;
+    if (shaderGuard)
+        shaderGuard->free();
+}
+
+bool QOpenGLShaderPrivate::create()
+{
+    QOpenGLContext *context = const_cast<QOpenGLContext *>(QOpenGLContext::currentContext());
+    if (!context)
+        return false;
+    GLuint shader = 0;
+    if (shaderType == QOpenGLShader::Vertex) {
+        shader = glfuncs->glCreateShader(GL_VERTEX_SHADER);
+    } else if (shaderType == QOpenGLShader::Geometry && supportsGeometryShaders) {
+        shader = glfuncs->glCreateShader(GL_GEOMETRY_SHADER);
+    } else if (shaderType == QOpenGLShader::TessellationControl && supportsTessellationShaders) {
+        shader = glfuncs->glCreateShader(GL_TESS_CONTROL_SHADER);
+    } else if (shaderType == QOpenGLShader::TessellationEvaluation && supportsTessellationShaders) {
+        shader = glfuncs->glCreateShader(GL_TESS_EVALUATION_SHADER);
+    } else if (shaderType == QOpenGLShader::Compute && supportsComputeShaders) {
+        shader = glfuncs->glCreateShader(GL_COMPUTE_SHADER);
+    } else if (shaderType == QOpenGLShader::Fragment) {
+        shader = glfuncs->glCreateShader(GL_FRAGMENT_SHADER);
+    }
+    if (!shader) {
+        qWarning("QOpenGLShader: could not create shader");
+        return false;
+    }
+    shaderGuard = new QOpenGLSharedResourceGuard(context, shader, freeShaderFunc);
+    return true;
+}
+
+bool QOpenGLShaderPrivate::compile(QOpenGLShader *q)
+{
+    GLuint shader = shaderGuard ? shaderGuard->id() : 0;
+    if (!shader)
+        return false;
+
+    // Try to compile shader
+    glfuncs->glCompileShader(shader);
+    GLint value = 0;
+
+    // Get compilation status
+    glfuncs->glGetShaderiv(shader, GL_COMPILE_STATUS, &value);
+    compiled = (value != 0);
+
+    if (!compiled) {
+        // Compilation failed, try to provide some information about the failure
+        QString name = q->objectName();
+
+        const char *types[] = {
+            "Fragment",
+            "Vertex",
+            "Geometry",
+            "Tessellation Control",
+            "Tessellation Evaluation",
+            "Compute",
+            ""
+        };
+
+        const char *type = types[6];
+        switch (shaderType) {
+        case QOpenGLShader::Fragment:
+            type = types[0]; break;
+        case QOpenGLShader::Vertex:
+            type = types[1]; break;
+        case QOpenGLShader::Geometry:
+            type = types[2]; break;
+        case QOpenGLShader::TessellationControl:
+            type = types[3]; break;
+        case QOpenGLShader::TessellationEvaluation:
+            type = types[4]; break;
+        case QOpenGLShader::Compute:
+            type = types[5]; break;
+        }
+
+        // Get info and source code lengths
+        GLint infoLogLength = 0;
+        GLint sourceCodeLength = 0;
+        char *logBuffer = nullptr;
+        char *sourceCodeBuffer = nullptr;
+
+        // Get the compilation info log
+        glfuncs->glGetShaderiv(shader, GL_INFO_LOG_LENGTH, &infoLogLength);
+
+        if (infoLogLength > 1) {
+            GLint temp;
+            logBuffer = new char [infoLogLength];
+            glfuncs->glGetShaderInfoLog(shader, infoLogLength, &temp, logBuffer);
+        }
+
+        // Get the source code
+        glfuncs->glGetShaderiv(shader, GL_SHADER_SOURCE_LENGTH, &sourceCodeLength);
+
+        if (sourceCodeLength > 1) {
+            GLint temp;
+            sourceCodeBuffer = new char [sourceCodeLength];
+            glfuncs->glGetShaderSource(shader, sourceCodeLength, &temp, sourceCodeBuffer);
+        }
+
+        if (logBuffer)
+            log = QString::fromLatin1(logBuffer);
+        else
+            log = QLatin1String("failed");
+
+        if (name.isEmpty())
+            qWarning("QOpenGLShader::compile(%s): %s", type, qPrintable(log));
+        else
+            qWarning("QOpenGLShader::compile(%s)[%s]: %s", type, qPrintable(name), qPrintable(log));
+
+        // Dump the source code if we got it
+        if (sourceCodeBuffer) {
+            qWarning("*** Problematic %s shader source code ***\n"
+                     "%ls\n"
+                     "***",
+                     type, qUtf16Printable(QString::fromLatin1(sourceCodeBuffer)));
+        }
+
+        // Cleanup
+        delete [] logBuffer;
+        delete [] sourceCodeBuffer;
+    }
+
+    return compiled;
+}
+
+void QOpenGLShaderPrivate::deleteShader()
+{
+    if (shaderGuard) {
+        shaderGuard->free();
+        shaderGuard = nullptr;
+    }
+}
+
+/*!
+    Constructs a new QOpenGLShader object of the specified \a type
+    and attaches it to \a parent.  If shader programs are not supported,
+    QOpenGLShaderProgram::hasOpenGLShaderPrograms() will return false.
+
+    This constructor is normally followed by a call to compileSourceCode()
+    or compileSourceFile().
+
+    The shader will be associated with the current QOpenGLContext.
+
+    \sa compileSourceCode(), compileSourceFile()
+*/
+QOpenGLShader::QOpenGLShader(QOpenGLShader::ShaderType type, QObject *parent)
+    : QObject(*new QOpenGLShaderPrivate(QOpenGLContext::currentContext(), type), parent)
+{
+    Q_D(QOpenGLShader);
+    d->create();
+}
+
+/*!
+    Deletes this shader.  If the shader has been attached to a
+    QOpenGLShaderProgram object, then the actual shader will stay around
+    until the QOpenGLShaderProgram is destroyed.
+*/
+QOpenGLShader::~QOpenGLShader()
+{
+}
+
+/*!
+    Returns the type of this shader.
+*/
+QOpenGLShader::ShaderType QOpenGLShader::shaderType() const
+{
+    Q_D(const QOpenGLShader);
+    return d->shaderType;
+}
+
+static const char qualifierDefines[] =
+    "#define lowp\n"
+    "#define mediump\n"
+    "#define highp\n";
+
+#if defined(QT_OPENGL_ES) && !defined(QT_OPENGL_FORCE_SHADER_DEFINES)
+// The "highp" qualifier doesn't exist in fragment shaders
+// on all ES platforms.  When it doesn't exist, use "mediump".
+#define QOpenGL_REDEFINE_HIGHP 1
+static const char redefineHighp[] =
+    "#ifndef GL_FRAGMENT_PRECISION_HIGH\n"
+    "#define highp mediump\n"
+    "#endif\n";
+#endif
+
+// Boiler-plate header to have the layout attributes available we need later
+static const char blendEquationAdvancedHeader[] =
+    "#ifdef GL_KHR_blend_equation_advanced\n"
+    "#extension GL_ARB_fragment_coord_conventions : enable\n"
+    "#extension GL_KHR_blend_equation_advanced : enable\n"
+    "#endif\n";
+
+struct QVersionDirectivePosition
+{
+    Q_DECL_CONSTEXPR QVersionDirectivePosition(int position = 0, int line = -1)
+        : position(position)
+        , line(line)
+    {
+    }
+
+    Q_DECL_CONSTEXPR bool hasPosition() const
+    {
+        return position > 0;
+    }
+
+    const int position;
+    const int line;
+};
+
+static QVersionDirectivePosition findVersionDirectivePosition(const char *source)
+{
+    Q_ASSERT(source);
+
+    // According to the GLSL spec the #version directive must not be
+    // preceded by anything but whitespace and comments.
+    // In order to not get confused by #version directives within a
+    // multiline comment, we need to do some minimal comment parsing
+    // while searching for the directive.
+    enum {
+        Normal,
+        StartOfLine,
+        PreprocessorDirective,
+        CommentStarting,
+        MultiLineComment,
+        SingleLineComment,
+        CommentEnding
+    } state = StartOfLine;
+
+    const char *c = source;
+    while (*c) {
+        switch (state) {
+        case PreprocessorDirective:
+            if (*c == ' ' || *c == '\t')
+                break;
+            if (!strncmp(c, "version", strlen("version"))) {
+                // Found version directive
+                c += strlen("version");
+                while (*c && *c != '\n')
+                    ++c;
+                int splitPosition = c - source + 1;
+                int linePosition = int(std::count(source, c, '\n')) + 1;
+                return QVersionDirectivePosition(splitPosition, linePosition);
+            } else if (*c == '/')
+                state = CommentStarting;
+            else if (*c == '\n')
+                state = StartOfLine;
+            else
+                state = Normal;
+            break;
+        case StartOfLine:
+            if (*c == ' ' || *c == '\t')
+                break;
+            else if (*c == '#') {
+                state = PreprocessorDirective;
+                break;
+            }
+            state = Normal;
+            Q_FALLTHROUGH();
+        case Normal:
+            if (*c == '/')
+                state = CommentStarting;
+            else if (*c == '\n')
+                state = StartOfLine;
+            break;
+        case CommentStarting:
+            if (*c == '*')
+                state = MultiLineComment;
+            else if (*c == '/')
+                state = SingleLineComment;
+            else
+                state = Normal;
+            break;
+        case MultiLineComment:
+            if (*c == '*')
+                state = CommentEnding;
+            break;
+        case SingleLineComment:
+            if (*c == '\n')
+                state = Normal;
+            break;
+        case CommentEnding:
+            if (*c == '/')
+                state = Normal;
+            else if (*c != QLatin1Char('*'))
+                state = MultiLineComment;
+            break;
+        }
+        ++c;
+    }
+
+    return QVersionDirectivePosition(0, 1);
+}
+
+/*!
+    Sets the \a source code for this shader and compiles it.
+    Returns \c true if the source was successfully compiled, false otherwise.
+
+    \sa compileSourceFile()
+*/
+bool QOpenGLShader::compileSourceCode(const char *source)
+{
+    Q_D(QOpenGLShader);
+    // This method breaks the shader code into two parts:
+    // 1. Up to and including an optional #version directive.
+    // 2. The rest.
+    // If a #version directive exists, qualifierDefines and redefineHighp
+    // are inserted after. Otherwise they are inserted right at the start.
+    // In both cases a #line directive is appended in order to compensate
+    // for line number changes in case of compiler errors.
+
+    if (d->shaderGuard && d->shaderGuard->id() && source) {
+        const QVersionDirectivePosition versionDirectivePosition = findVersionDirectivePosition(source);
+
+        QVarLengthArray<const char *, 5> sourceChunks;
+        QVarLengthArray<GLint, 5> sourceChunkLengths;
+        QOpenGLContext *ctx = QOpenGLContext::currentContext();
+
+        if (versionDirectivePosition.hasPosition()) {
+            // Append source up to and including the #version directive
+            sourceChunks.append(source);
+            sourceChunkLengths.append(GLint(versionDirectivePosition.position));
+        } else {
+            // QTBUG-55733: Intel on Windows with Compatibility profile requires a #version always
+            if (ctx->format().profile() == QSurfaceFormat::CompatibilityProfile) {
+                const char *vendor = reinterpret_cast<const char *>(ctx->functions()->glGetString(GL_VENDOR));
+                if (vendor && !strcmp(vendor, "Intel")) {
+                    static const char version110[] = "#version 110\n";
+                    sourceChunks.append(version110);
+                    sourceChunkLengths.append(GLint(sizeof(version110)) - 1);
+                }
+            }
+        }
+        if (d->shaderType == Fragment) {
+            sourceChunks.append(blendEquationAdvancedHeader);
+            sourceChunkLengths.append(GLint(sizeof(blendEquationAdvancedHeader) - 1));
+        }
+
+        // The precision qualifiers are useful on OpenGL/ES systems,
+        // but usually not present on desktop systems.
+        const QSurfaceFormat currentSurfaceFormat = ctx->format();
+        QOpenGLContextPrivate *ctx_d = QOpenGLContextPrivate::get(QOpenGLContext::currentContext());
+        if (currentSurfaceFormat.renderableType() == QSurfaceFormat::OpenGL
+                || ctx_d->workaround_missingPrecisionQualifiers
+#ifdef QT_OPENGL_FORCE_SHADER_DEFINES
+                || true
+#endif
+                ) {
+            sourceChunks.append(qualifierDefines);
+            sourceChunkLengths.append(GLint(sizeof(qualifierDefines) - 1));
+        }
+
+#ifdef QOpenGL_REDEFINE_HIGHP
+        if (d->shaderType == Fragment && !ctx_d->workaround_missingPrecisionQualifiers
+            && QOpenGLContext::currentContext()->isOpenGLES()) {
+            sourceChunks.append(redefineHighp);
+            sourceChunkLengths.append(GLint(sizeof(redefineHighp) - 1));
+        }
+#endif
+
+        QByteArray lineDirective;
+        // #line is rejected by some drivers:
+        // "2.1 Mesa 8.1-devel (git-48a3d4e)" or "MESA 2.1 Mesa 8.1-devel"
+        const char *version = reinterpret_cast<const char *>(ctx->functions()->glGetString(GL_VERSION));
+        if (!version || !strstr(version, "2.1 Mesa 8")) {
+            // Append #line directive in order to compensate for text insertion
+            lineDirective = QStringLiteral("#line %1\n").arg(versionDirectivePosition.line).toUtf8();
+            sourceChunks.append(lineDirective.constData());
+            sourceChunkLengths.append(GLint(lineDirective.length()));
+        }
+
+        // Append rest of shader code
+        sourceChunks.append(source + versionDirectivePosition.position);
+        sourceChunkLengths.append(GLint(qstrlen(source + versionDirectivePosition.position)));
+
+        d->glfuncs->glShaderSource(d->shaderGuard->id(), sourceChunks.size(), sourceChunks.data(), sourceChunkLengths.data());
+        return d->compile(this);
+    } else {
+        return false;
+    }
+}
+
+/*!
+    \overload
+
+    Sets the \a source code for this shader and compiles it.
+    Returns \c true if the source was successfully compiled, false otherwise.
+
+    \sa compileSourceFile()
+*/
+bool QOpenGLShader::compileSourceCode(const QByteArray& source)
+{
+    return compileSourceCode(source.constData());
+}
+
+/*!
+    \overload
+
+    Sets the \a source code for this shader and compiles it.
+    Returns \c true if the source was successfully compiled, false otherwise.
+
+    \sa compileSourceFile()
+*/
+bool QOpenGLShader::compileSourceCode(const QString& source)
+{
+    return compileSourceCode(source.toLatin1().constData());
+}
+
+/*!
+    Sets the source code for this shader to the contents of \a fileName
+    and compiles it.  Returns \c true if the file could be opened and the
+    source compiled, false otherwise.
+
+    \sa compileSourceCode()
+*/
+bool QOpenGLShader::compileSourceFile(const QString& fileName)
+{
+    QFile file(fileName);
+    if (!file.open(QFile::ReadOnly)) {
+        qWarning() << "QOpenGLShader: Unable to open file" << fileName;
+        return false;
+    }
+
+    QByteArray contents = file.readAll();
+    return compileSourceCode(contents.constData());
+}
+
+/*!
+    Returns the source code for this shader.
+
+    \sa compileSourceCode()
+*/
+QByteArray QOpenGLShader::sourceCode() const
+{
+    Q_D(const QOpenGLShader);
+    GLuint shader = d->shaderGuard ? d->shaderGuard->id() : 0;
+    if (!shader)
+        return QByteArray();
+    GLint size = 0;
+    d->glfuncs->glGetShaderiv(shader, GL_SHADER_SOURCE_LENGTH, &size);
+    if (size <= 0)
+        return QByteArray();
+    GLint len = 0;
+    char *source = new char [size];
+    d->glfuncs->glGetShaderSource(shader, size, &len, source);
+    QByteArray src(source);
+    delete [] source;
+    return src;
+}
+
+/*!
+    Returns \c true if this shader has been compiled; false otherwise.
+
+    \sa compileSourceCode(), compileSourceFile()
+*/
+bool QOpenGLShader::isCompiled() const
+{
+    Q_D(const QOpenGLShader);
+    return d->compiled;
+}
+
+/*!
+    Returns the errors and warnings that occurred during the last compile.
+
+    \sa compileSourceCode(), compileSourceFile()
+*/
+QString QOpenGLShader::log() const
+{
+    Q_D(const QOpenGLShader);
+    return d->log;
+}
+
+/*!
+    Returns the OpenGL identifier associated with this shader.
+
+    \sa QOpenGLShaderProgram::programId()
+*/
+GLuint QOpenGLShader::shaderId() const
+{
+    Q_D(const QOpenGLShader);
+    return d->shaderGuard ? d->shaderGuard->id() : 0;
+}
+
+class QOpenGLShaderProgramPrivate : public QObjectPrivate
+{
+    Q_DECLARE_PUBLIC(QOpenGLShaderProgram)
+public:
+    QOpenGLShaderProgramPrivate()
+        : programGuard(nullptr)
+        , linked(false)
+        , inited(false)
+        , removingShaders(false)
+        , glfuncs(new QOpenGLExtraFunctions)
+#ifndef QT_OPENGL_ES_2
+        , tessellationFuncs(nullptr)
+#endif
+        , linkBinaryRecursion(false)
+    {
+    }
+    ~QOpenGLShaderProgramPrivate();
+
+    QOpenGLSharedResourceGuard *programGuard;
+    bool linked;
+    bool inited;
+    bool removingShaders;
+
+    QString log;
+    QList<QOpenGLShader *> shaders;
+    QList<QOpenGLShader *> anonShaders;
+
+    QOpenGLExtraFunctions *glfuncs;
+#ifndef QT_OPENGL_ES_2
+    // for tessellation features not in GLES 3.2
+    QOpenGLFunctions_4_0_Core *tessellationFuncs;
+#endif
+
+    bool hasShader(QOpenGLShader::ShaderType type) const;
+
+    QOpenGLProgramBinaryCache::ProgramDesc binaryProgram;
+    bool isCacheDisabled() const;
+    bool compileCacheable();
+    bool linkBinary();
+
+    bool linkBinaryRecursion;
+};
+
+namespace {
+    void freeProgramFunc(QOpenGLFunctions *funcs, GLuint id)
+    {
+        funcs->glDeleteProgram(id);
+    }
+}
+
+
+QOpenGLShaderProgramPrivate::~QOpenGLShaderProgramPrivate()
+{
+    delete glfuncs;
+    if (programGuard)
+        programGuard->free();
+}
+
+bool QOpenGLShaderProgramPrivate::hasShader(QOpenGLShader::ShaderType type) const
+{
+    for (QOpenGLShader *shader : shaders) {
+        if (shader->shaderType() == type)
+            return true;
+    }
+    return false;
+}
+
+/*!
+    Constructs a new shader program and attaches it to \a parent.
+    The program will be invalid until addShader() is called.
+
+    The shader program will be associated with the current QOpenGLContext.
+
+    \sa addShader()
+*/
+QOpenGLShaderProgram::QOpenGLShaderProgram(QObject *parent)
+    : QObject(*new QOpenGLShaderProgramPrivate, parent)
+{
+}
+
+/*!
+    Deletes this shader program.
+*/
+QOpenGLShaderProgram::~QOpenGLShaderProgram()
+{
+}
+
+/*!
+    Requests the shader program's id to be created immediately. Returns \c true
+    if successful; \c false otherwise.
+
+    This function is primarily useful when combining QOpenGLShaderProgram
+    with other OpenGL functions that operate directly on the shader
+    program id, like \c {GL_OES_get_program_binary}.
+
+    When the shader program is used normally, the shader program's id will
+    be created on demand.
+
+    \sa programId()
+
+    \since 5.3
+ */
+bool QOpenGLShaderProgram::create()
+{
+    return init();
+}
+
+bool QOpenGLShaderProgram::init()
+{
+    Q_D(QOpenGLShaderProgram);
+    if ((d->programGuard && d->programGuard->id()) || d->inited)
+        return true;
+    d->inited = true;
+    QOpenGLContext *context = const_cast<QOpenGLContext *>(QOpenGLContext::currentContext());
+    if (!context)
+        return false;
+    d->glfuncs->initializeOpenGLFunctions();
+
+#ifndef QT_OPENGL_ES_2
+    if (!context->isOpenGLES() && context->format().version() >= qMakePair(4, 0)) {
+        d->tessellationFuncs = context->versionFunctions<QOpenGLFunctions_4_0_Core>();
+        d->tessellationFuncs->initializeOpenGLFunctions();
+    }
+#endif
+
+    GLuint program = d->glfuncs->glCreateProgram();
+    if (!program) {
+        qWarning("QOpenGLShaderProgram: could not create shader program");
+        return false;
+    }
+    if (d->programGuard)
+        delete d->programGuard;
+    d->programGuard = new QOpenGLSharedResourceGuard(context, program, freeProgramFunc);
+    return true;
+}
+
+/*!
+    Adds a compiled \a shader to this shader program.  Returns \c true
+    if the shader could be added, or false otherwise.
+
+    Ownership of the \a shader object remains with the caller.
+    It will not be deleted when this QOpenGLShaderProgram instance
+    is deleted.  This allows the caller to add the same shader
+    to multiple shader programs.
+
+    \sa addShaderFromSourceCode(), addShaderFromSourceFile()
+    \sa removeShader(), link(), removeAllShaders()
+*/
+bool QOpenGLShaderProgram::addShader(QOpenGLShader *shader)
+{
+    Q_D(QOpenGLShaderProgram);
+    if (!init())
+        return false;
+    if (d->shaders.contains(shader))
+        return true;    // Already added to this shader program.
+    if (d->programGuard && d->programGuard->id() && shader) {
+        if (!shader->d_func()->shaderGuard || !shader->d_func()->shaderGuard->id())
+            return false;
+        if (d->programGuard->group() != shader->d_func()->shaderGuard->group()) {
+            qWarning("QOpenGLShaderProgram::addShader: Program and shader are not associated with same context.");
+            return false;
+        }
+        d->glfuncs->glAttachShader(d->programGuard->id(), shader->d_func()->shaderGuard->id());
+        d->linked = false;  // Program needs to be relinked.
+        d->shaders.append(shader);
+        connect(shader, SIGNAL(destroyed()), this, SLOT(shaderDestroyed()));
+        return true;
+    } else {
+        return false;
+    }
+}
+
+/*!
+    Compiles \a source as a shader of the specified \a type and
+    adds it to this shader program.  Returns \c true if compilation
+    was successful, false otherwise.  The compilation errors
+    and warnings will be made available via log().
+
+    This function is intended to be a short-cut for quickly
+    adding vertex and fragment shaders to a shader program without
+    creating an instance of QOpenGLShader first.
+
+    \sa addShader(), addShaderFromSourceFile()
+    \sa removeShader(), link(), log(), removeAllShaders()
+*/
+bool QOpenGLShaderProgram::addShaderFromSourceCode(QOpenGLShader::ShaderType type, const char *source)
+{
+    Q_D(QOpenGLShaderProgram);
+    if (!init())
+        return false;
+    QOpenGLShader *shader = new QOpenGLShader(type, this);
+    if (!shader->compileSourceCode(source)) {
+        d->log = shader->log();
+        delete shader;
+        return false;
+    }
+    d->anonShaders.append(shader);
+    return addShader(shader);
+}
+
+/*!
+    \overload
+
+    Compiles \a source as a shader of the specified \a type and
+    adds it to this shader program.  Returns \c true if compilation
+    was successful, false otherwise.  The compilation errors
+    and warnings will be made available via log().
+
+    This function is intended to be a short-cut for quickly
+    adding vertex and fragment shaders to a shader program without
+    creating an instance of QOpenGLShader first.
+
+    \sa addShader(), addShaderFromSourceFile()
+    \sa removeShader(), link(), log(), removeAllShaders()
+*/
+bool QOpenGLShaderProgram::addShaderFromSourceCode(QOpenGLShader::ShaderType type, const QByteArray& source)
+{
+    return addShaderFromSourceCode(type, source.constData());
+}
+
+/*!
+    \overload
+
+    Compiles \a source as a shader of the specified \a type and
+    adds it to this shader program.  Returns \c true if compilation
+    was successful, false otherwise.  The compilation errors
+    and warnings will be made available via log().
+
+    This function is intended to be a short-cut for quickly
+    adding vertex and fragment shaders to a shader program without
+    creating an instance of QOpenGLShader first.
+
+    \sa addShader(), addShaderFromSourceFile()
+    \sa removeShader(), link(), log(), removeAllShaders()
+*/
+bool QOpenGLShaderProgram::addShaderFromSourceCode(QOpenGLShader::ShaderType type, const QString& source)
+{
+    return addShaderFromSourceCode(type, source.toLatin1().constData());
+}
+
+/*!
+    Compiles the contents of \a fileName as a shader of the specified
+    \a type and adds it to this shader program.  Returns \c true if
+    compilation was successful, false otherwise.  The compilation errors
+    and warnings will be made available via log().
+
+    This function is intended to be a short-cut for quickly
+    adding vertex and fragment shaders to a shader program without
+    creating an instance of QOpenGLShader first.
+
+    \sa addShader(), addShaderFromSourceCode()
+*/
+bool QOpenGLShaderProgram::addShaderFromSourceFile
+    (QOpenGLShader::ShaderType type, const QString& fileName)
+{
+    Q_D(QOpenGLShaderProgram);
+    if (!init())
+        return false;
+    QOpenGLShader *shader = new QOpenGLShader(type, this);
+    if (!shader->compileSourceFile(fileName)) {
+        d->log = shader->log();
+        delete shader;
+        return false;
+    }
+    d->anonShaders.append(shader);
+    return addShader(shader);
+}
+
+/*!
+    Registers the shader of the specified \a type and \a source to this
+    program. Unlike addShaderFromSourceCode(), this function does not perform
+    compilation. Compilation is deferred to link(), and may not happen at all,
+    because link() may potentially use a program binary from Qt's shader disk
+    cache. This will typically lead to a significant increase in performance.
+
+    \return true if the shader has been registered or, in the non-cached case,
+    compiled successfully; false if there was an error. The compilation error
+    messages can be retrieved via log().
+
+    When the disk cache is disabled, via Qt::AA_DisableShaderDiskCache for
+    example, or the OpenGL context has no support for context binaries, calling
+    this function is equivalent to addShaderFromSourceCode().
+
+    \since 5.9
+    \sa addShaderFromSourceCode(), addCacheableShaderFromSourceFile()
+ */
+bool QOpenGLShaderProgram::addCacheableShaderFromSourceCode(QOpenGLShader::ShaderType type, const char *source)
+{
+    Q_D(QOpenGLShaderProgram);
+    if (!init())
+        return false;
+    if (d->isCacheDisabled())
+        return addShaderFromSourceCode(type, source);
+
+    return addCacheableShaderFromSourceCode(type, QByteArray(source));
+}
+
+static inline QShader::Stage qt_shaderTypeToStage(QOpenGLShader::ShaderType type)
+{
+    switch (type) {
+    case QOpenGLShader::Vertex:
+        return QShader::VertexStage;
+    case QOpenGLShader::Fragment:
+        return QShader::FragmentStage;
+    case QOpenGLShader::Geometry:
+        return QShader::GeometryStage;
+    case QOpenGLShader::TessellationControl:
+        return QShader::TessellationControlStage;
+    case QOpenGLShader::TessellationEvaluation:
+        return QShader::TessellationEvaluationStage;
+    case QOpenGLShader::Compute:
+        return QShader::ComputeStage;
+    }
+    return QShader::VertexStage;
+}
+
+static inline QOpenGLShader::ShaderType qt_shaderStageToType(QShader::Stage stage)
+{
+    switch (stage) {
+    case QShader::VertexStage:
+        return QOpenGLShader::Vertex;
+    case QShader::TessellationControlStage:
+        return QOpenGLShader::TessellationControl;
+    case QShader::TessellationEvaluationStage:
+        return QOpenGLShader::TessellationEvaluation;
+    case QShader::GeometryStage:
+        return QOpenGLShader::Geometry;
+    case QShader::FragmentStage:
+        return QOpenGLShader::Fragment;
+    case QShader::ComputeStage:
+        return QOpenGLShader::Compute;
+    }
+    return QOpenGLShader::Vertex;
+}
+
+/*!
+    \overload
+
+    Registers the shader of the specified \a type and \a source to this
+    program. Unlike addShaderFromSourceCode(), this function does not perform
+    compilation. Compilation is deferred to link(), and may not happen at all,
+    because link() may potentially use a program binary from Qt's shader disk
+    cache. This will typically lead to a significant increase in performance.
+
+    \return true if the shader has been registered or, in the non-cached case,
+    compiled successfully; false if there was an error. The compilation error
+    messages can be retrieved via log().
+
+    When the disk cache is disabled, via Qt::AA_DisableShaderDiskCache for
+    example, or the OpenGL context has no support for context binaries, calling
+    this function is equivalent to addShaderFromSourceCode().
+
+    \since 5.9
+    \sa addShaderFromSourceCode(), addCacheableShaderFromSourceFile()
+ */
+bool QOpenGLShaderProgram::addCacheableShaderFromSourceCode(QOpenGLShader::ShaderType type, const QByteArray &source)
+{
+    Q_D(QOpenGLShaderProgram);
+    if (!init())
+        return false;
+    if (d->isCacheDisabled())
+        return addShaderFromSourceCode(type, source);
+
+    d->binaryProgram.shaders.append(QOpenGLProgramBinaryCache::ShaderDesc(qt_shaderTypeToStage(type), source));
+    return true;
+}
+
+/*!
+    \overload
+
+    Registers the shader of the specified \a type and \a source to this
+    program. Unlike addShaderFromSourceCode(), this function does not perform
+    compilation. Compilation is deferred to link(), and may not happen at all,
+    because link() may potentially use a program binary from Qt's shader disk
+    cache. This will typically lead to a significant increase in performance.
+
+    When the disk cache is disabled, via Qt::AA_DisableShaderDiskCache for
+    example, or the OpenGL context has no support for context binaries, calling
+    this function is equivalent to addShaderFromSourceCode().
+
+    \since 5.9
+    \sa addShaderFromSourceCode(), addCacheableShaderFromSourceFile()
+ */
+bool QOpenGLShaderProgram::addCacheableShaderFromSourceCode(QOpenGLShader::ShaderType type, const QString &source)
+{
+    Q_D(QOpenGLShaderProgram);
+    if (!init())
+        return false;
+    if (d->isCacheDisabled())
+        return addShaderFromSourceCode(type, source);
+
+    return addCacheableShaderFromSourceCode(type, source.toUtf8().constData());
+}
+
+/*!
+    Registers the shader of the specified \a type and \a fileName to this
+    program. Unlike addShaderFromSourceFile(), this function does not perform
+    compilation. Compilation is deferred to link(), and may not happen at all,
+    because link() may potentially use a program binary from Qt's shader disk
+    cache. This will typically lead to a significant increase in performance.
+
+    \return true if the file has been read successfully, false if the file could
+    not be opened or the normal, non-cached compilation of the shader has
+    failed. The compilation error messages can be retrieved via log().
+
+    When the disk cache is disabled, via Qt::AA_DisableShaderDiskCache for
+    example, or the OpenGL context has no support for context binaries, calling
+    this function is equivalent to addShaderFromSourceFile().
+
+    \since 5.9
+    \sa addShaderFromSourceFile(), addCacheableShaderFromSourceCode()
+ */
+bool QOpenGLShaderProgram::addCacheableShaderFromSourceFile(QOpenGLShader::ShaderType type, const QString &fileName)
+{
+    Q_D(QOpenGLShaderProgram);
+    if (!init())
+        return false;
+    if (d->isCacheDisabled())
+        return addShaderFromSourceFile(type, fileName);
+
+    QOpenGLProgramBinaryCache::ShaderDesc shader(qt_shaderTypeToStage(type));
+    // NB! It could be tempting to defer reading the file contents and just
+    // hash the filename as the cache key, perhaps combined with last-modified
+    // timestamp checks. However, this would raise a number of issues (no
+    // timestamps for files in the resource system; preference for global, not
+    // per-application cache items (where filenames may clash); resource-based
+    // shaders from libraries like Qt Quick; etc.), so just avoid it.
+    QFile f(fileName);
+    if (f.open(QIODevice::ReadOnly | QIODevice::Text)) {
+        shader.source = f.readAll();
+        f.close();
+    } else {
+        qWarning("QOpenGLShaderProgram: Unable to open file %s", qPrintable(fileName));
+        return false;
+    }
+    d->binaryProgram.shaders.append(shader);
+    return true;
+}
+
+/*!
+    Removes \a shader from this shader program.  The object is not deleted.
+
+    The shader program must be valid in the current QOpenGLContext.
+
+    \sa addShader(), link(), removeAllShaders()
+*/
+void QOpenGLShaderProgram::removeShader(QOpenGLShader *shader)
+{
+    Q_D(QOpenGLShaderProgram);
+    if (d->programGuard && d->programGuard->id()
+        && shader && shader->d_func()->shaderGuard)
+    {
+        d->glfuncs->glDetachShader(d->programGuard->id(), shader->d_func()->shaderGuard->id());
+    }
+    d->linked = false;  // Program needs to be relinked.
+    if (shader) {
+        d->shaders.removeAll(shader);
+        d->anonShaders.removeAll(shader);
+        disconnect(shader, SIGNAL(destroyed()), this, SLOT(shaderDestroyed()));
+    }
+}
+
+/*!
+    Returns a list of all shaders that have been added to this shader
+    program using addShader().
+
+    \sa addShader(), removeShader()
+*/
+QList<QOpenGLShader *> QOpenGLShaderProgram::shaders() const
+{
+    Q_D(const QOpenGLShaderProgram);
+    return d->shaders;
+}
+
+/*!
+    Removes all of the shaders that were added to this program previously.
+    The QOpenGLShader objects for the shaders will not be deleted if they
+    were constructed externally.  QOpenGLShader objects that are constructed
+    internally by QOpenGLShaderProgram will be deleted.
+
+    \sa addShader(), removeShader()
+*/
+void QOpenGLShaderProgram::removeAllShaders()
+{
+    Q_D(QOpenGLShaderProgram);
+    d->removingShaders = true;
+    for (QOpenGLShader *shader : qAsConst(d->shaders)) {
+        if (d->programGuard && d->programGuard->id()
+            && shader && shader->d_func()->shaderGuard)
+        {
+            d->glfuncs->glDetachShader(d->programGuard->id(), shader->d_func()->shaderGuard->id());
+        }
+    }
+    // Delete shader objects that were created anonymously.
+    qDeleteAll(d->anonShaders);
+    d->shaders.clear();
+    d->anonShaders.clear();
+    d->binaryProgram = QOpenGLProgramBinaryCache::ProgramDesc();
+    d->linked = false;  // Program needs to be relinked.
+    d->removingShaders = false;
+}
+
+/*!
+    Links together the shaders that were added to this program with
+    addShader().  Returns \c true if the link was successful or
+    false otherwise.  If the link failed, the error messages can
+    be retrieved with log().
+
+    Subclasses can override this function to initialize attributes
+    and uniform variables for use in specific shader programs.
+
+    If the shader program was already linked, calling this
+    function again will force it to be re-linked.
+
+    When shaders were added to this program via
+    addCacheableShaderFromSourceCode() or addCacheableShaderFromSourceFile(),
+    program binaries are supported, and a cached binary is available on disk,
+    actual compilation and linking are skipped. Instead, link() will initialize
+    the program with the binary blob via glProgramBinary(). If there is no
+    cached version of the program or it was generated with a different driver
+    version, the shaders will be compiled from source and the program will get
+    linked normally. This allows seamless upgrading of the graphics drivers,
+    without having to worry about potentially incompatible binary formats.
+
+    \sa addShader(), log()
+*/
+bool QOpenGLShaderProgram::link()
+{
+    Q_D(QOpenGLShaderProgram);
+    GLuint program = d->programGuard ? d->programGuard->id() : 0;
+    if (!program)
+        return false;
+
+    if (!d->linkBinaryRecursion && d->shaders.isEmpty() && !d->binaryProgram.shaders.isEmpty())
+        return d->linkBinary();
+
+    GLint value;
+    if (d->shaders.isEmpty()) {
+        // If there are no explicit shaders, then it is possible that the
+        // application added a program binary with glProgramBinaryOES(), or
+        // otherwise populated the shaders itself. This is also the case when
+        // we are recursively called back from linkBinary() after a successful
+        // glProgramBinary(). Check to see if the program is already linked and
+        // bail out if so.
+        value = 0;
+        d->glfuncs->glGetProgramiv(program, GL_LINK_STATUS, &value);
+        d->linked = (value != 0);
+        if (d->linked)
+            return true;
+    }
+
+    d->glfuncs->glLinkProgram(program);
+    value = 0;
+    d->glfuncs->glGetProgramiv(program, GL_LINK_STATUS, &value);
+    d->linked = (value != 0);
+    value = 0;
+    d->glfuncs->glGetProgramiv(program, GL_INFO_LOG_LENGTH, &value);
+    d->log = QString();
+    if (value > 1) {
+        char *logbuf = new char [value];
+        GLint len;
+        d->glfuncs->glGetProgramInfoLog(program, value, &len, logbuf);
+        d->log = QString::fromLatin1(logbuf);
+        if (!d->linked && !d->linkBinaryRecursion) {
+            QString name = objectName();
+            if (name.isEmpty())
+                qWarning("QOpenGLShader::link: %ls", qUtf16Printable(d->log));
+            else
+                qWarning("QOpenGLShader::link[%ls]: %ls", qUtf16Printable(name), qUtf16Printable(d->log));
+        }
+        delete [] logbuf;
+    }
+    return d->linked;
+}
+
+/*!
+    Returns \c true if this shader program has been linked; false otherwise.
+
+    \sa link()
+*/
+bool QOpenGLShaderProgram::isLinked() const
+{
+    Q_D(const QOpenGLShaderProgram);
+    return d->linked;
+}
+
+/*!
+    Returns the errors and warnings that occurred during the last link()
+    or addShader() with explicitly specified source code.
+
+    \sa link()
+*/
+QString QOpenGLShaderProgram::log() const
+{
+    Q_D(const QOpenGLShaderProgram);
+    return d->log;
+}
+
+/*!
+    Binds this shader program to the active QOpenGLContext and makes
+    it the current shader program.  Any previously bound shader program
+    is released.  This is equivalent to calling \c{glUseProgram()} on
+    programId().  Returns \c true if the program was successfully bound;
+    false otherwise.  If the shader program has not yet been linked,
+    or it needs to be re-linked, this function will call link().
+
+    \sa link(), release()
+*/
+bool QOpenGLShaderProgram::bind()
+{
+    Q_D(QOpenGLShaderProgram);
+    GLuint program = d->programGuard ? d->programGuard->id() : 0;
+    if (!program)
+        return false;
+    if (!d->linked && !link())
+        return false;
+#ifndef QT_NO_DEBUG
+    if (d->programGuard->group() != QOpenGLContextGroup::currentContextGroup()) {
+        qWarning("QOpenGLShaderProgram::bind: program is not valid in the current context.");
+        return false;
+    }
+#endif
+    d->glfuncs->glUseProgram(program);
+    return true;
+}
+
+/*!
+    Releases the active shader program from the current QOpenGLContext.
+    This is equivalent to calling \c{glUseProgram(0)}.
+
+    \sa bind()
+*/
+void QOpenGLShaderProgram::release()
+{
+    Q_D(QOpenGLShaderProgram);
+#ifndef QT_NO_DEBUG
+    if (d->programGuard && d->programGuard->group() != QOpenGLContextGroup::currentContextGroup())
+        qWarning("QOpenGLShaderProgram::release: program is not valid in the current context.");
+#endif
+    d->glfuncs->glUseProgram(0);
+}
+
+/*!
+    Returns the OpenGL identifier associated with this shader program.
+
+    \sa QOpenGLShader::shaderId()
+*/
+GLuint QOpenGLShaderProgram::programId() const
+{
+    Q_D(const QOpenGLShaderProgram);
+    GLuint id = d->programGuard ? d->programGuard->id() : 0;
+    if (id)
+        return id;
+
+    // Create the identifier if we don't have one yet.  This is for
+    // applications that want to create the attached shader configuration
+    // themselves, particularly those using program binaries.
+    if (!const_cast<QOpenGLShaderProgram *>(this)->init())
+        return 0;
+    return d->programGuard ? d->programGuard->id() : 0;
+}
+
+/*!
+    Binds the attribute \a name to the specified \a location.  This
+    function can be called before or after the program has been linked.
+    Any attributes that have not been explicitly bound when the program
+    is linked will be assigned locations automatically.
+
+    When this function is called after the program has been linked,
+    the program will need to be relinked for the change to take effect.
+
+    \sa attributeLocation()
+*/
+void QOpenGLShaderProgram::bindAttributeLocation(const char *name, int location)
+{
+    Q_D(QOpenGLShaderProgram);
+    if (!init() || !d->programGuard || !d->programGuard->id())
+        return;
+    d->glfuncs->glBindAttribLocation(d->programGuard->id(), location, name);
+    d->linked = false;  // Program needs to be relinked.
+}
+
+/*!
+    \overload
+
+    Binds the attribute \a name to the specified \a location.  This
+    function can be called before or after the program has been linked.
+    Any attributes that have not been explicitly bound when the program
+    is linked will be assigned locations automatically.
+
+    When this function is called after the program has been linked,
+    the program will need to be relinked for the change to take effect.
+
+    \sa attributeLocation()
+*/
+void QOpenGLShaderProgram::bindAttributeLocation(const QByteArray& name, int location)
+{
+    bindAttributeLocation(name.constData(), location);
+}
+
+/*!
+    \overload
+
+    Binds the attribute \a name to the specified \a location.  This
+    function can be called before or after the program has been linked.
+    Any attributes that have not been explicitly bound when the program
+    is linked will be assigned locations automatically.
+
+    When this function is called after the program has been linked,
+    the program will need to be relinked for the change to take effect.
+
+    \sa attributeLocation()
+*/
+void QOpenGLShaderProgram::bindAttributeLocation(const QString& name, int location)
+{
+    bindAttributeLocation(name.toLatin1().constData(), location);
+}
+
+/*!
+    Returns the location of the attribute \a name within this shader
+    program's parameter list.  Returns -1 if \a name is not a valid
+    attribute for this shader program.
+
+    \sa uniformLocation(), bindAttributeLocation()
+*/
+int QOpenGLShaderProgram::attributeLocation(const char *name) const
+{
+    Q_D(const QOpenGLShaderProgram);
+    if (d->linked && d->programGuard && d->programGuard->id()) {
+        return d->glfuncs->glGetAttribLocation(d->programGuard->id(), name);
+    } else {
+        qWarning("QOpenGLShaderProgram::attributeLocation(%s): shader program is not linked", name);
+        return -1;
+    }
+}
+
+/*!
+    \overload
+
+    Returns the location of the attribute \a name within this shader
+    program's parameter list.  Returns -1 if \a name is not a valid
+    attribute for this shader program.
+
+    \sa uniformLocation(), bindAttributeLocation()
+*/
+int QOpenGLShaderProgram::attributeLocation(const QByteArray& name) const
+{
+    return attributeLocation(name.constData());
+}
+
+/*!
+    \overload
+
+    Returns the location of the attribute \a name within this shader
+    program's parameter list.  Returns -1 if \a name is not a valid
+    attribute for this shader program.
+
+    \sa uniformLocation(), bindAttributeLocation()
+*/
+int QOpenGLShaderProgram::attributeLocation(const QString& name) const
+{
+    return attributeLocation(name.toLatin1().constData());
+}
+
+/*!
+    Sets the attribute at \a location in the current context to \a value.
+
+    \sa setUniformValue()
+*/
+void QOpenGLShaderProgram::setAttributeValue(int location, GLfloat value)
+{
+    Q_D(QOpenGLShaderProgram);
+    if (location != -1)
+        d->glfuncs->glVertexAttrib1fv(location, &value);
+}
+
+/*!
+    \overload
+
+    Sets the attribute called \a name in the current context to \a value.
+
+    \sa setUniformValue()
+*/
+void QOpenGLShaderProgram::setAttributeValue(const char *name, GLfloat value)
+{
+    setAttributeValue(attributeLocation(name), value);
+}
+
+/*!
+    Sets the attribute at \a location in the current context to
+    the 2D vector (\a x, \a y).
+
+    \sa setUniformValue()
+*/
+void QOpenGLShaderProgram::setAttributeValue(int location, GLfloat x, GLfloat y)
+{
+    Q_D(QOpenGLShaderProgram);
+    if (location != -1) {
+        GLfloat values[2] = {x, y};
+        d->glfuncs->glVertexAttrib2fv(location, values);
+    }
+}
+
+/*!
+    \overload
+
+    Sets the attribute called \a name in the current context to
+    the 2D vector (\a x, \a y).
+
+    \sa setUniformValue()
+*/
+void QOpenGLShaderProgram::setAttributeValue(const char *name, GLfloat x, GLfloat y)
+{
+    setAttributeValue(attributeLocation(name), x, y);
+}
+
+/*!
+    Sets the attribute at \a location in the current context to
+    the 3D vector (\a x, \a y, \a z).
+
+    \sa setUniformValue()
+*/
+void QOpenGLShaderProgram::setAttributeValue
+        (int location, GLfloat x, GLfloat y, GLfloat z)
+{
+    Q_D(QOpenGLShaderProgram);
+    Q_UNUSED(d);
+    if (location != -1) {
+        GLfloat values[3] = {x, y, z};
+        d->glfuncs->glVertexAttrib3fv(location, values);
+    }
+}
+
+/*!
+    \overload
+
+    Sets the attribute called \a name in the current context to
+    the 3D vector (\a x, \a y, \a z).
+
+    \sa setUniformValue()
+*/
+void QOpenGLShaderProgram::setAttributeValue
+        (const char *name, GLfloat x, GLfloat y, GLfloat z)
+{
+    setAttributeValue(attributeLocation(name), x, y, z);
+}
+
+/*!
+    Sets the attribute at \a location in the current context to
+    the 4D vector (\a x, \a y, \a z, \a w).
+
+    \sa setUniformValue()
+*/
+void QOpenGLShaderProgram::setAttributeValue
+        (int location, GLfloat x, GLfloat y, GLfloat z, GLfloat w)
+{
+    Q_D(QOpenGLShaderProgram);
+    if (location != -1) {
+        GLfloat values[4] = {x, y, z, w};
+        d->glfuncs->glVertexAttrib4fv(location, values);
+    }
+}
+
+/*!
+    \overload
+
+    Sets the attribute called \a name in the current context to
+    the 4D vector (\a x, \a y, \a z, \a w).
+
+    \sa setUniformValue()
+*/
+void QOpenGLShaderProgram::setAttributeValue
+        (const char *name, GLfloat x, GLfloat y, GLfloat z, GLfloat w)
+{
+    setAttributeValue(attributeLocation(name), x, y, z, w);
+}
+
+/*!
+    Sets the attribute at \a location in the current context to \a value.
+
+    \sa setUniformValue()
+*/
+void QOpenGLShaderProgram::setAttributeValue(int location, const QVector2D& value)
+{
+    Q_D(QOpenGLShaderProgram);
+    if (location != -1)
+        d->glfuncs->glVertexAttrib2fv(location, reinterpret_cast<const GLfloat *>(&value));
+}
+
+/*!
+    \overload
+
+    Sets the attribute called \a name in the current context to \a value.
+
+    \sa setUniformValue()
+*/
+void QOpenGLShaderProgram::setAttributeValue(const char *name, const QVector2D& value)
+{
+    setAttributeValue(attributeLocation(name), value);
+}
+
+/*!
+    Sets the attribute at \a location in the current context to \a value.
+
+    \sa setUniformValue()
+*/
+void QOpenGLShaderProgram::setAttributeValue(int location, const QVector3D& value)
+{
+    Q_D(QOpenGLShaderProgram);
+    Q_UNUSED(d);
+    if (location != -1)
+        d->glfuncs->glVertexAttrib3fv(location, reinterpret_cast<const GLfloat *>(&value));
+}
+
+/*!
+    \overload
+
+    Sets the attribute called \a name in the current context to \a value.
+
+    \sa setUniformValue()
+*/
+void QOpenGLShaderProgram::setAttributeValue(const char *name, const QVector3D& value)
+{
+    setAttributeValue(attributeLocation(name), value);
+}
+
+/*!
+    Sets the attribute at \a location in the current context to \a value.
+
+    \sa setUniformValue()
+*/
+void QOpenGLShaderProgram::setAttributeValue(int location, const QVector4D& value)
+{
+    Q_D(QOpenGLShaderProgram);
+    Q_UNUSED(d);
+    if (location != -1)
+        d->glfuncs->glVertexAttrib4fv(location, reinterpret_cast<const GLfloat *>(&value));
+}
+
+/*!
+    \overload
+
+    Sets the attribute called \a name in the current context to \a value.
+
+    \sa setUniformValue()
+*/
+void QOpenGLShaderProgram::setAttributeValue(const char *name, const QVector4D& value)
+{
+    setAttributeValue(attributeLocation(name), value);
+}
+
+/*!
+    Sets the attribute at \a location in the current context to \a value.
+
+    \sa setUniformValue()
+*/
+void QOpenGLShaderProgram::setAttributeValue(int location, const QColor& value)
+{
+    Q_D(QOpenGLShaderProgram);
+    Q_UNUSED(d);
+    if (location != -1) {
+        GLfloat values[4] = {GLfloat(value.redF()), GLfloat(value.greenF()),
+                             GLfloat(value.blueF()), GLfloat(value.alphaF())};
+        d->glfuncs->glVertexAttrib4fv(location, values);
+    }
+}
+
+/*!
+    \overload
+
+    Sets the attribute called \a name in the current context to \a value.
+
+    \sa setUniformValue()
+*/
+void QOpenGLShaderProgram::setAttributeValue(const char *name, const QColor& value)
+{
+    setAttributeValue(attributeLocation(name), value);
+}
+
+/*!
+    Sets the attribute at \a location in the current context to the
+    contents of \a values, which contains \a columns elements, each
+    consisting of \a rows elements.  The \a rows value should be
+    1, 2, 3, or 4.  This function is typically used to set matrix
+    values and column vectors.
+
+    \sa setUniformValue()
+*/
+void QOpenGLShaderProgram::setAttributeValue
+    (int location, const GLfloat *values, int columns, int rows)
+{
+    Q_D(QOpenGLShaderProgram);
+    Q_UNUSED(d);
+    if (rows < 1 || rows > 4) {
+        qWarning("QOpenGLShaderProgram::setAttributeValue: rows %d not supported", rows);
+        return;
+    }
+    if (location != -1) {
+        while (columns-- > 0) {
+            if (rows == 1)
+                d->glfuncs->glVertexAttrib1fv(location, values);
+            else if (rows == 2)
+                d->glfuncs->glVertexAttrib2fv(location, values);
+            else if (rows == 3)
+                d->glfuncs->glVertexAttrib3fv(location, values);
+            else
+                d->glfuncs->glVertexAttrib4fv(location, values);
+            values += rows;
+            ++location;
+        }
+    }
+}
+
+/*!
+    \overload
+
+    Sets the attribute called \a name in the current context to the
+    contents of \a values, which contains \a columns elements, each
+    consisting of \a rows elements.  The \a rows value should be
+    1, 2, 3, or 4.  This function is typically used to set matrix
+    values and column vectors.
+
+    \sa setUniformValue()
+*/
+void QOpenGLShaderProgram::setAttributeValue
+    (const char *name, const GLfloat *values, int columns, int rows)
+{
+    setAttributeValue(attributeLocation(name), values, columns, rows);
+}
+
+/*!
+    Sets an array of vertex \a values on the attribute at \a location
+    in this shader program.  The \a tupleSize indicates the number of
+    components per vertex (1, 2, 3, or 4), and the \a stride indicates
+    the number of bytes between vertices.  A default \a stride value
+    of zero indicates that the vertices are densely packed in \a values.
+
+    The array will become active when enableAttributeArray() is called
+    on the \a location.  Otherwise the value specified with
+    setAttributeValue() for \a location will be used.
+
+    \sa setAttributeValue(), setUniformValue(), enableAttributeArray()
+    \sa disableAttributeArray()
+*/
+void QOpenGLShaderProgram::setAttributeArray
+    (int location, const GLfloat *values, int tupleSize, int stride)
+{
+    Q_D(QOpenGLShaderProgram);
+    Q_UNUSED(d);
+    if (location != -1) {
+        d->glfuncs->glVertexAttribPointer(location, tupleSize, GL_FLOAT, GL_FALSE,
+                              stride, values);
+    }
+}
+
+/*!
+    Sets an array of 2D vertex \a values on the attribute at \a location
+    in this shader program.  The \a stride indicates the number of bytes
+    between vertices.  A default \a stride value of zero indicates that
+    the vertices are densely packed in \a values.
+
+    The array will become active when enableAttributeArray() is called
+    on the \a location.  Otherwise the value specified with
+    setAttributeValue() for \a location will be used.
+
+    \sa setAttributeValue(), setUniformValue(), enableAttributeArray()
+    \sa disableAttributeArray()
+*/
+void QOpenGLShaderProgram::setAttributeArray
+        (int location, const QVector2D *values, int stride)
+{
+    Q_D(QOpenGLShaderProgram);
+    Q_UNUSED(d);
+    if (location != -1) {
+        d->glfuncs->glVertexAttribPointer(location, 2, GL_FLOAT, GL_FALSE,
+                              stride, values);
+    }
+}
+
+/*!
+    Sets an array of 3D vertex \a values on the attribute at \a location
+    in this shader program.  The \a stride indicates the number of bytes
+    between vertices.  A default \a stride value of zero indicates that
+    the vertices are densely packed in \a values.
+
+    The array will become active when enableAttributeArray() is called
+    on the \a location.  Otherwise the value specified with
+    setAttributeValue() for \a location will be used.
+
+    \sa setAttributeValue(), setUniformValue(), enableAttributeArray()
+    \sa disableAttributeArray()
+*/
+void QOpenGLShaderProgram::setAttributeArray
+        (int location, const QVector3D *values, int stride)
+{
+    Q_D(QOpenGLShaderProgram);
+    Q_UNUSED(d);
+    if (location != -1) {
+        d->glfuncs->glVertexAttribPointer(location, 3, GL_FLOAT, GL_FALSE,
+                              stride, values);
+    }
+}
+
+/*!
+    Sets an array of 4D vertex \a values on the attribute at \a location
+    in this shader program.  The \a stride indicates the number of bytes
+    between vertices.  A default \a stride value of zero indicates that
+    the vertices are densely packed in \a values.
+
+    The array will become active when enableAttributeArray() is called
+    on the \a location.  Otherwise the value specified with
+    setAttributeValue() for \a location will be used.
+
+    \sa setAttributeValue(), setUniformValue(), enableAttributeArray()
+    \sa disableAttributeArray()
+*/
+void QOpenGLShaderProgram::setAttributeArray
+        (int location, const QVector4D *values, int stride)
+{
+    Q_D(QOpenGLShaderProgram);
+    Q_UNUSED(d);
+    if (location != -1) {
+        d->glfuncs->glVertexAttribPointer(location, 4, GL_FLOAT, GL_FALSE,
+                              stride, values);
+    }
+}
+
+/*!
+    Sets an array of vertex \a values on the attribute at \a location
+    in this shader program.  The \a stride indicates the number of bytes
+    between vertices.  A default \a stride value of zero indicates that
+    the vertices are densely packed in \a values.
+
+    The \a type indicates the type of elements in the \a values array,
+    usually \c{GL_FLOAT}, \c{GL_UNSIGNED_BYTE}, etc.  The \a tupleSize
+    indicates the number of components per vertex: 1, 2, 3, or 4.
+
+    The array will become active when enableAttributeArray() is called
+    on the \a location.  Otherwise the value specified with
+    setAttributeValue() for \a location will be used.
+
+    The setAttributeBuffer() function can be used to set the attribute
+    array to an offset within a vertex buffer.
+
+    \note Normalization will be enabled. If this is not desired, call
+    glVertexAttribPointer directly through QOpenGLFunctions.
+
+    \sa setAttributeValue(), setUniformValue(), enableAttributeArray()
+    \sa disableAttributeArray(), setAttributeBuffer()
+*/
+void QOpenGLShaderProgram::setAttributeArray
+    (int location, GLenum type, const void *values, int tupleSize, int stride)
+{
+    Q_D(QOpenGLShaderProgram);
+    Q_UNUSED(d);
+    if (location != -1) {
+        d->glfuncs->glVertexAttribPointer(location, tupleSize, type, GL_TRUE,
+                              stride, values);
+    }
+}
+
+/*!
+    \overload
+
+    Sets an array of vertex \a values on the attribute called \a name
+    in this shader program.  The \a tupleSize indicates the number of
+    components per vertex (1, 2, 3, or 4), and the \a stride indicates
+    the number of bytes between vertices.  A default \a stride value
+    of zero indicates that the vertices are densely packed in \a values.
+
+    The array will become active when enableAttributeArray() is called
+    on \a name.  Otherwise the value specified with setAttributeValue()
+    for \a name will be used.
+
+    \sa setAttributeValue(), setUniformValue(), enableAttributeArray()
+    \sa disableAttributeArray()
+*/
+void QOpenGLShaderProgram::setAttributeArray
+    (const char *name, const GLfloat *values, int tupleSize, int stride)
+{
+    setAttributeArray(attributeLocation(name), values, tupleSize, stride);
+}
+
+/*!
+    \overload
+
+    Sets an array of 2D vertex \a values on the attribute called \a name
+    in this shader program.  The \a stride indicates the number of bytes
+    between vertices.  A default \a stride value of zero indicates that
+    the vertices are densely packed in \a values.
+
+    The array will become active when enableAttributeArray() is called
+    on \a name.  Otherwise the value specified with setAttributeValue()
+    for \a name will be used.
+
+    \sa setAttributeValue(), setUniformValue(), enableAttributeArray()
+    \sa disableAttributeArray()
+*/
+void QOpenGLShaderProgram::setAttributeArray
+        (const char *name, const QVector2D *values, int stride)
+{
+    setAttributeArray(attributeLocation(name), values, stride);
+}
+
+/*!
+    \overload
+
+    Sets an array of 3D vertex \a values on the attribute called \a name
+    in this shader program.  The \a stride indicates the number of bytes
+    between vertices.  A default \a stride value of zero indicates that
+    the vertices are densely packed in \a values.
+
+    The array will become active when enableAttributeArray() is called
+    on \a name.  Otherwise the value specified with setAttributeValue()
+    for \a name will be used.
+
+    \sa setAttributeValue(), setUniformValue(), enableAttributeArray()
+    \sa disableAttributeArray()
+*/
+void QOpenGLShaderProgram::setAttributeArray
+        (const char *name, const QVector3D *values, int stride)
+{
+    setAttributeArray(attributeLocation(name), values, stride);
+}
+
+/*!
+    \overload
+
+    Sets an array of 4D vertex \a values on the attribute called \a name
+    in this shader program.  The \a stride indicates the number of bytes
+    between vertices.  A default \a stride value of zero indicates that
+    the vertices are densely packed in \a values.
+
+    The array will become active when enableAttributeArray() is called
+    on \a name.  Otherwise the value specified with setAttributeValue()
+    for \a name will be used.
+
+    \sa setAttributeValue(), setUniformValue(), enableAttributeArray()
+    \sa disableAttributeArray()
+*/
+void QOpenGLShaderProgram::setAttributeArray
+        (const char *name, const QVector4D *values, int stride)
+{
+    setAttributeArray(attributeLocation(name), values, stride);
+}
+
+/*!
+    \overload
+
+    Sets an array of vertex \a values on the attribute called \a name
+    in this shader program.  The \a stride indicates the number of bytes
+    between vertices.  A default \a stride value of zero indicates that
+    the vertices are densely packed in \a values.
+
+    The \a type indicates the type of elements in the \a values array,
+    usually \c{GL_FLOAT}, \c{GL_UNSIGNED_BYTE}, etc.  The \a tupleSize
+    indicates the number of components per vertex: 1, 2, 3, or 4.
+
+    The array will become active when enableAttributeArray() is called
+    on the \a name.  Otherwise the value specified with
+    setAttributeValue() for \a name will be used.
+
+    The setAttributeBuffer() function can be used to set the attribute
+    array to an offset within a vertex buffer.
+
+    \sa setAttributeValue(), setUniformValue(), enableAttributeArray()
+    \sa disableAttributeArray(), setAttributeBuffer()
+*/
+void QOpenGLShaderProgram::setAttributeArray
+    (const char *name, GLenum type, const void *values, int tupleSize, int stride)
+{
+    setAttributeArray(attributeLocation(name), type, values, tupleSize, stride);
+}
+
+/*!
+    Sets an array of vertex values on the attribute at \a location in
+    this shader program, starting at a specific \a offset in the
+    currently bound vertex buffer.  The \a stride indicates the number
+    of bytes between vertices.  A default \a stride value of zero
+    indicates that the vertices are densely packed in the value array.
+
+    The \a type indicates the type of elements in the vertex value
+    array, usually \c{GL_FLOAT}, \c{GL_UNSIGNED_BYTE}, etc.  The \a
+    tupleSize indicates the number of components per vertex: 1, 2, 3,
+    or 4.
+
+    The array will become active when enableAttributeArray() is called
+    on the \a location.  Otherwise the value specified with
+    setAttributeValue() for \a location will be used.
+
+    \note Normalization will be enabled. If this is not desired, call
+    glVertexAttribPointer directly through QOpenGLFunctions.
+
+    \sa setAttributeArray()
+*/
+void QOpenGLShaderProgram::setAttributeBuffer
+    (int location, GLenum type, int offset, int tupleSize, int stride)
+{
+    Q_D(QOpenGLShaderProgram);
+    Q_UNUSED(d);
+    if (location != -1) {
+        d->glfuncs->glVertexAttribPointer(location, tupleSize, type, GL_TRUE, stride,
+                              reinterpret_cast<const void *>(qintptr(offset)));
+    }
+}
+
+/*!
+    \overload
+
+    Sets an array of vertex values on the attribute called \a name
+    in this shader program, starting at a specific \a offset in the
+    currently bound vertex buffer.  The \a stride indicates the number
+    of bytes between vertices.  A default \a stride value of zero
+    indicates that the vertices are densely packed in the value array.
+
+    The \a type indicates the type of elements in the vertex value
+    array, usually \c{GL_FLOAT}, \c{GL_UNSIGNED_BYTE}, etc.  The \a
+    tupleSize indicates the number of components per vertex: 1, 2, 3,
+    or 4.
+
+    The array will become active when enableAttributeArray() is called
+    on the \a name.  Otherwise the value specified with
+    setAttributeValue() for \a name will be used.
+
+    \sa setAttributeArray()
+*/
+void QOpenGLShaderProgram::setAttributeBuffer
+    (const char *name, GLenum type, int offset, int tupleSize, int stride)
+{
+    setAttributeBuffer(attributeLocation(name), type, offset, tupleSize, stride);
+}
+
+/*!
+    Enables the vertex array at \a location in this shader program
+    so that the value set by setAttributeArray() on \a location
+    will be used by the shader program.
+
+    \sa disableAttributeArray(), setAttributeArray(), setAttributeValue()
+    \sa setUniformValue()
+*/
+void QOpenGLShaderProgram::enableAttributeArray(int location)
+{
+    Q_D(QOpenGLShaderProgram);
+    Q_UNUSED(d);
+    if (location != -1)
+        d->glfuncs->glEnableVertexAttribArray(location);
+}
+
+/*!
+    \overload
+
+    Enables the vertex array called \a name in this shader program
+    so that the value set by setAttributeArray() on \a name
+    will be used by the shader program.
+
+    \sa disableAttributeArray(), setAttributeArray(), setAttributeValue()
+    \sa setUniformValue()
+*/
+void QOpenGLShaderProgram::enableAttributeArray(const char *name)
+{
+    enableAttributeArray(attributeLocation(name));
+}
+
+/*!
+    Disables the vertex array at \a location in this shader program
+    that was enabled by a previous call to enableAttributeArray().
+
+    \sa enableAttributeArray(), setAttributeArray(), setAttributeValue()
+    \sa setUniformValue()
+*/
+void QOpenGLShaderProgram::disableAttributeArray(int location)
+{
+    Q_D(QOpenGLShaderProgram);
+    Q_UNUSED(d);
+    if (location != -1)
+        d->glfuncs->glDisableVertexAttribArray(location);
+}
+
+/*!
+    \overload
+
+    Disables the vertex array called \a name in this shader program
+    that was enabled by a previous call to enableAttributeArray().
+
+    \sa enableAttributeArray(), setAttributeArray(), setAttributeValue()
+    \sa setUniformValue()
+*/
+void QOpenGLShaderProgram::disableAttributeArray(const char *name)
+{
+    disableAttributeArray(attributeLocation(name));
+}
+
+/*!
+    Returns the location of the uniform variable \a name within this shader
+    program's parameter list.  Returns -1 if \a name is not a valid
+    uniform variable for this shader program.
+
+    \sa attributeLocation()
+*/
+int QOpenGLShaderProgram::uniformLocation(const char *name) const
+{
+    Q_D(const QOpenGLShaderProgram);
+    Q_UNUSED(d);
+    if (d->linked && d->programGuard && d->programGuard->id()) {
+        return d->glfuncs->glGetUniformLocation(d->programGuard->id(), name);
+    } else {
+        qWarning("QOpenGLShaderProgram::uniformLocation(%s): shader program is not linked", name);
+        return -1;
+    }
+}
+
+/*!
+    \overload
+
+    Returns the location of the uniform variable \a name within this shader
+    program's parameter list.  Returns -1 if \a name is not a valid
+    uniform variable for this shader program.
+
+    \sa attributeLocation()
+*/
+int QOpenGLShaderProgram::uniformLocation(const QByteArray& name) const
+{
+    return uniformLocation(name.constData());
+}
+
+/*!
+    \overload
+
+    Returns the location of the uniform variable \a name within this shader
+    program's parameter list.  Returns -1 if \a name is not a valid
+    uniform variable for this shader program.
+
+    \sa attributeLocation()
+*/
+int QOpenGLShaderProgram::uniformLocation(const QString& name) const
+{
+    return uniformLocation(name.toLatin1().constData());
+}
+
+/*!
+    Sets the uniform variable at \a location in the current context to \a value.
+
+    \sa setAttributeValue()
+*/
+void QOpenGLShaderProgram::setUniformValue(int location, GLfloat value)
+{
+    Q_D(QOpenGLShaderProgram);
+    Q_UNUSED(d);
+    if (location != -1)
+        d->glfuncs->glUniform1fv(location, 1, &value);
+}
+
+/*!
+    \overload
+
+    Sets the uniform variable called \a name in the current context
+    to \a value.
+
+    \sa setAttributeValue()
+*/
+void QOpenGLShaderProgram::setUniformValue(const char *name, GLfloat value)
+{
+    setUniformValue(uniformLocation(name), value);
+}
+
+/*!
+    Sets the uniform variable at \a location in the current context to \a value.
+
+    \sa setAttributeValue()
+*/
+void QOpenGLShaderProgram::setUniformValue(int location, GLint value)
+{
+    Q_D(QOpenGLShaderProgram);
+    Q_UNUSED(d);
+    if (location != -1)
+        d->glfuncs->glUniform1i(location, value);
+}
+
+/*!
+    \overload
+
+    Sets the uniform variable called \a name in the current context
+    to \a value.
+
+    \sa setAttributeValue()
+*/
+void QOpenGLShaderProgram::setUniformValue(const char *name, GLint value)
+{
+    setUniformValue(uniformLocation(name), value);
+}
+
+/*!
+    Sets the uniform variable at \a location in the current context to \a value.
+    This function should be used when setting sampler values.
+
+    \note This function is not aware of unsigned int support in modern OpenGL
+    versions and therefore treats \a value as a GLint and calls glUniform1i.
+
+    \sa setAttributeValue()
+*/
+void QOpenGLShaderProgram::setUniformValue(int location, GLuint value)
+{
+    Q_D(QOpenGLShaderProgram);
+    Q_UNUSED(d);
+    if (location != -1)
+        d->glfuncs->glUniform1i(location, value);
+}
+
+/*!
+    \overload
+
+    Sets the uniform variable called \a name in the current context
+    to \a value.  This function should be used when setting sampler values.
+
+    \note This function is not aware of unsigned int support in modern OpenGL
+    versions and therefore treats \a value as a GLint and calls glUniform1i.
+
+    \sa setAttributeValue()
+*/
+void QOpenGLShaderProgram::setUniformValue(const char *name, GLuint value)
+{
+    setUniformValue(uniformLocation(name), value);
+}
+
+/*!
+    Sets the uniform variable at \a location in the current context to
+    the 2D vector (\a x, \a y).
+
+    \sa setAttributeValue()
+*/
+void QOpenGLShaderProgram::setUniformValue(int location, GLfloat x, GLfloat y)
+{
+    Q_D(QOpenGLShaderProgram);
+    Q_UNUSED(d);
+    if (location != -1) {
+        GLfloat values[2] = {x, y};
+        d->glfuncs->glUniform2fv(location, 1, values);
+    }
+}
+
+/*!
+    \overload
+
+    Sets the uniform variable called \a name in the current context to
+    the 2D vector (\a x, \a y).
+
+    \sa setAttributeValue()
+*/
+void QOpenGLShaderProgram::setUniformValue(const char *name, GLfloat x, GLfloat y)
+{
+    setUniformValue(uniformLocation(name), x, y);
+}
+
+/*!
+    Sets the uniform variable at \a location in the current context to
+    the 3D vector (\a x, \a y, \a z).
+
+    \sa setAttributeValue()
+*/
+void QOpenGLShaderProgram::setUniformValue
+        (int location, GLfloat x, GLfloat y, GLfloat z)
+{
+    Q_D(QOpenGLShaderProgram);
+    Q_UNUSED(d);
+    if (location != -1) {
+        GLfloat values[3] = {x, y, z};
+        d->glfuncs->glUniform3fv(location, 1, values);
+    }
+}
+
+/*!
+    \overload
+
+    Sets the uniform variable called \a name in the current context to
+    the 3D vector (\a x, \a y, \a z).
+
+    \sa setAttributeValue()
+*/
+void QOpenGLShaderProgram::setUniformValue
+        (const char *name, GLfloat x, GLfloat y, GLfloat z)
+{
+    setUniformValue(uniformLocation(name), x, y, z);
+}
+
+/*!
+    Sets the uniform variable at \a location in the current context to
+    the 4D vector (\a x, \a y, \a z, \a w).
+
+    \sa setAttributeValue()
+*/
+void QOpenGLShaderProgram::setUniformValue
+        (int location, GLfloat x, GLfloat y, GLfloat z, GLfloat w)
+{
+    Q_D(QOpenGLShaderProgram);
+    Q_UNUSED(d);
+    if (location != -1) {
+        GLfloat values[4] = {x, y, z, w};
+        d->glfuncs->glUniform4fv(location, 1, values);
+    }
+}
+
+/*!
+    \overload
+
+    Sets the uniform variable called \a name in the current context to
+    the 4D vector (\a x, \a y, \a z, \a w).
+
+    \sa setAttributeValue()
+*/
+void QOpenGLShaderProgram::setUniformValue
+        (const char *name, GLfloat x, GLfloat y, GLfloat z, GLfloat w)
+{
+    setUniformValue(uniformLocation(name), x, y, z, w);
+}
+
+/*!
+    Sets the uniform variable at \a location in the current context to \a value.
+
+    \sa setAttributeValue()
+*/
+void QOpenGLShaderProgram::setUniformValue(int location, const QVector2D& value)
+{
+    Q_D(QOpenGLShaderProgram);
+    Q_UNUSED(d);
+    if (location != -1)
+        d->glfuncs->glUniform2fv(location, 1, reinterpret_cast<const GLfloat *>(&value));
+}
+
+/*!
+    \overload
+
+    Sets the uniform variable called \a name in the current context
+    to \a value.
+
+    \sa setAttributeValue()
+*/
+void QOpenGLShaderProgram::setUniformValue(const char *name, const QVector2D& value)
+{
+    setUniformValue(uniformLocation(name), value);
+}
+
+/*!
+    Sets the uniform variable at \a location in the current context to \a value.
+
+    \sa setAttributeValue()
+*/
+void QOpenGLShaderProgram::setUniformValue(int location, const QVector3D& value)
+{
+    Q_D(QOpenGLShaderProgram);
+    Q_UNUSED(d);
+    if (location != -1)
+        d->glfuncs->glUniform3fv(location, 1, reinterpret_cast<const GLfloat *>(&value));
+}
+
+/*!
+    \overload
+
+    Sets the uniform variable called \a name in the current context
+    to \a value.
+
+    \sa setAttributeValue()
+*/
+void QOpenGLShaderProgram::setUniformValue(const char *name, const QVector3D& value)
+{
+    setUniformValue(uniformLocation(name), value);
+}
+
+/*!
+    Sets the uniform variable at \a location in the current context to \a value.
+
+    \sa setAttributeValue()
+*/
+void QOpenGLShaderProgram::setUniformValue(int location, const QVector4D& value)
+{
+    Q_D(QOpenGLShaderProgram);
+    Q_UNUSED(d);
+    if (location != -1)
+        d->glfuncs->glUniform4fv(location, 1, reinterpret_cast<const GLfloat *>(&value));
+}
+
+/*!
+    \overload
+
+    Sets the uniform variable called \a name in the current context
+    to \a value.
+
+    \sa setAttributeValue()
+*/
+void QOpenGLShaderProgram::setUniformValue(const char *name, const QVector4D& value)
+{
+    setUniformValue(uniformLocation(name), value);
+}
+
+/*!
+    Sets the uniform variable at \a location in the current context to
+    the red, green, blue, and alpha components of \a color.
+
+    \sa setAttributeValue()
+*/
+void QOpenGLShaderProgram::setUniformValue(int location, const QColor& color)
+{
+    Q_D(QOpenGLShaderProgram);
+    Q_UNUSED(d);
+    if (location != -1) {
+        GLfloat values[4] = {GLfloat(color.redF()), GLfloat(color.greenF()),
+                             GLfloat(color.blueF()), GLfloat(color.alphaF())};
+        d->glfuncs->glUniform4fv(location, 1, values);
+    }
+}
+
+/*!
+    \overload
+
+    Sets the uniform variable called \a name in the current context to
+    the red, green, blue, and alpha components of \a color.
+
+    \sa setAttributeValue()
+*/
+void QOpenGLShaderProgram::setUniformValue(const char *name, const QColor& color)
+{
+    setUniformValue(uniformLocation(name), color);
+}
+
+/*!
+    Sets the uniform variable at \a location in the current context to
+    the x and y coordinates of \a point.
+
+    \sa setAttributeValue()
+*/
+void QOpenGLShaderProgram::setUniformValue(int location, const QPoint& point)
+{
+    Q_D(QOpenGLShaderProgram);
+    Q_UNUSED(d);
+    if (location != -1) {
+        GLfloat values[4] = {GLfloat(point.x()), GLfloat(point.y())};
+        d->glfuncs->glUniform2fv(location, 1, values);
+    }
+}
+
+/*!
+    \overload
+
+    Sets the uniform variable associated with \a name in the current
+    context to the x and y coordinates of \a point.
+
+    \sa setAttributeValue()
+*/
+void QOpenGLShaderProgram::setUniformValue(const char *name, const QPoint& point)
+{
+    setUniformValue(uniformLocation(name), point);
+}
+
+/*!
+    Sets the uniform variable at \a location in the current context to
+    the x and y coordinates of \a point.
+
+    \sa setAttributeValue()
+*/
+void QOpenGLShaderProgram::setUniformValue(int location, const QPointF& point)
+{
+    Q_D(QOpenGLShaderProgram);
+    Q_UNUSED(d);
+    if (location != -1) {
+        GLfloat values[4] = {GLfloat(point.x()), GLfloat(point.y())};
+        d->glfuncs->glUniform2fv(location, 1, values);
+    }
+}
+
+/*!
+    \overload
+
+    Sets the uniform variable associated with \a name in the current
+    context to the x and y coordinates of \a point.
+
+    \sa setAttributeValue()
+*/
+void QOpenGLShaderProgram::setUniformValue(const char *name, const QPointF& point)
+{
+    setUniformValue(uniformLocation(name), point);
+}
+
+/*!
+    Sets the uniform variable at \a location in the current context to
+    the width and height of the given \a size.
+
+    \sa setAttributeValue()
+*/
+void QOpenGLShaderProgram::setUniformValue(int location, const QSize& size)
+{
+    Q_D(QOpenGLShaderProgram);
+    Q_UNUSED(d);
+    if (location != -1) {
+        GLfloat values[4] = {GLfloat(size.width()), GLfloat(size.height())};
+        d->glfuncs->glUniform2fv(location, 1, values);
+    }
+}
+
+/*!
+    \overload
+
+    Sets the uniform variable associated with \a name in the current
+    context to the width and height of the given \a size.
+
+    \sa setAttributeValue()
+*/
+void QOpenGLShaderProgram::setUniformValue(const char *name, const QSize& size)
+{
+    setUniformValue(uniformLocation(name), size);
+}
+
+/*!
+    Sets the uniform variable at \a location in the current context to
+    the width and height of the given \a size.
+
+    \sa setAttributeValue()
+*/
+void QOpenGLShaderProgram::setUniformValue(int location, const QSizeF& size)
+{
+    Q_D(QOpenGLShaderProgram);
+    Q_UNUSED(d);
+    if (location != -1) {
+        GLfloat values[4] = {GLfloat(size.width()), GLfloat(size.height())};
+        d->glfuncs->glUniform2fv(location, 1, values);
+    }
+}
+
+/*!
+    \overload
+
+    Sets the uniform variable associated with \a name in the current
+    context to the width and height of the given \a size.
+
+    \sa setAttributeValue()
+*/
+void QOpenGLShaderProgram::setUniformValue(const char *name, const QSizeF& size)
+{
+    setUniformValue(uniformLocation(name), size);
+}
+
+/*!
+    Sets the uniform variable at \a location in the current context
+    to a 2x2 matrix \a value.
+
+    \sa setAttributeValue()
+*/
+void QOpenGLShaderProgram::setUniformValue(int location, const QMatrix2x2& value)
+{
+    Q_D(QOpenGLShaderProgram);
+    Q_UNUSED(d);
+    d->glfuncs->glUniformMatrix2fv(location, 1, GL_FALSE, value.constData());
+}
+
+/*!
+    \overload
+
+    Sets the uniform variable called \a name in the current context
+    to a 2x2 matrix \a value.
+
+    \sa setAttributeValue()
+*/
+void QOpenGLShaderProgram::setUniformValue(const char *name, const QMatrix2x2& value)
+{
+    setUniformValue(uniformLocation(name), value);
+}
+
+/*!
+    Sets the uniform variable at \a location in the current context
+    to a 2x3 matrix \a value.
+
+    \note This function is not aware of non square matrix support,
+    that is, GLSL types like mat2x3, that is present in modern OpenGL
+    versions. Instead, it treats the uniform as an array of vec3.
+
+    \sa setAttributeValue()
+*/
+void QOpenGLShaderProgram::setUniformValue(int location, const QMatrix2x3& value)
+{
+    Q_D(QOpenGLShaderProgram);
+    Q_UNUSED(d);
+    d->glfuncs->glUniform3fv(location, 2, value.constData());
+}
+
+/*!
+    \overload
+
+    Sets the uniform variable called \a name in the current context
+    to a 2x3 matrix \a value.
+
+    \note This function is not aware of non square matrix support,
+    that is, GLSL types like mat2x3, that is present in modern OpenGL
+    versions. Instead, it treats the uniform as an array of vec3.
+
+    \sa setAttributeValue()
+*/
+void QOpenGLShaderProgram::setUniformValue(const char *name, const QMatrix2x3& value)
+{
+    setUniformValue(uniformLocation(name), value);
+}
+
+/*!
+    Sets the uniform variable at \a location in the current context
+    to a 2x4 matrix \a value.
+
+    \note This function is not aware of non square matrix support,
+    that is, GLSL types like mat2x4, that is present in modern OpenGL
+    versions. Instead, it treats the uniform as an array of vec4.
+
+    \sa setAttributeValue()
+*/
+void QOpenGLShaderProgram::setUniformValue(int location, const QMatrix2x4& value)
+{
+    Q_D(QOpenGLShaderProgram);
+    Q_UNUSED(d);
+    d->glfuncs->glUniform4fv(location, 2, value.constData());
+}
+
+/*!
+    \overload
+
+    Sets the uniform variable called \a name in the current context
+    to a 2x4 matrix \a value.
+
+    \note This function is not aware of non square matrix support,
+    that is, GLSL types like mat2x4, that is present in modern OpenGL
+    versions. Instead, it treats the uniform as an array of vec4.
+
+    \sa setAttributeValue()
+*/
+void QOpenGLShaderProgram::setUniformValue(const char *name, const QMatrix2x4& value)
+{
+    setUniformValue(uniformLocation(name), value);
+}
+
+/*!
+    Sets the uniform variable at \a location in the current context
+    to a 3x2 matrix \a value.
+
+    \note This function is not aware of non square matrix support,
+    that is, GLSL types like mat3x2, that is present in modern OpenGL
+    versions. Instead, it treats the uniform as an array of vec2.
+
+    \sa setAttributeValue()
+*/
+void QOpenGLShaderProgram::setUniformValue(int location, const QMatrix3x2& value)
+{
+    Q_D(QOpenGLShaderProgram);
+    Q_UNUSED(d);
+    d->glfuncs->glUniform2fv(location, 3, value.constData());
+}
+
+/*!
+    \overload
+
+    Sets the uniform variable called \a name in the current context
+    to a 3x2 matrix \a value.
+
+    \note This function is not aware of non square matrix support,
+    that is, GLSL types like mat3x2, that is present in modern OpenGL
+    versions. Instead, it treats the uniform as an array of vec2.
+
+    \sa setAttributeValue()
+*/
+void QOpenGLShaderProgram::setUniformValue(const char *name, const QMatrix3x2& value)
+{
+    setUniformValue(uniformLocation(name), value);
+}
+
+/*!
+    Sets the uniform variable at \a location in the current context
+    to a 3x3 matrix \a value.
+
+    \sa setAttributeValue()
+*/
+void QOpenGLShaderProgram::setUniformValue(int location, const QMatrix3x3& value)
+{
+    Q_D(QOpenGLShaderProgram);
+    Q_UNUSED(d);
+    d->glfuncs->glUniformMatrix3fv(location, 1, GL_FALSE, value.constData());
+}
+
+/*!
+    \overload
+
+    Sets the uniform variable called \a name in the current context
+    to a 3x3 matrix \a value.
+
+    \sa setAttributeValue()
+*/
+void QOpenGLShaderProgram::setUniformValue(const char *name, const QMatrix3x3& value)
+{
+    setUniformValue(uniformLocation(name), value);
+}
+
+/*!
+    Sets the uniform variable at \a location in the current context
+    to a 3x4 matrix \a value.
+
+    \note This function is not aware of non square matrix support,
+    that is, GLSL types like mat3x4, that is present in modern OpenGL
+    versions. Instead, it treats the uniform as an array of vec4.
+
+    \sa setAttributeValue()
+*/
+void QOpenGLShaderProgram::setUniformValue(int location, const QMatrix3x4& value)
+{
+    Q_D(QOpenGLShaderProgram);
+    Q_UNUSED(d);
+    d->glfuncs->glUniform4fv(location, 3, value.constData());
+}
+
+/*!
+    \overload
+
+    Sets the uniform variable called \a name in the current context
+    to a 3x4 matrix \a value.
+
+    \note This function is not aware of non square matrix support,
+    that is, GLSL types like mat3x4, that is present in modern OpenGL
+    versions. Instead, it treats the uniform as an array of vec4.
+
+    \sa setAttributeValue()
+*/
+void QOpenGLShaderProgram::setUniformValue(const char *name, const QMatrix3x4& value)
+{
+    setUniformValue(uniformLocation(name), value);
+}
+
+/*!
+    Sets the uniform variable at \a location in the current context
+    to a 4x2 matrix \a value.
+
+    \note This function is not aware of non square matrix support,
+    that is, GLSL types like mat4x2, that is present in modern OpenGL
+    versions. Instead, it treats the uniform as an array of vec2.
+
+    \sa setAttributeValue()
+*/
+void QOpenGLShaderProgram::setUniformValue(int location, const QMatrix4x2& value)
+{
+    Q_D(QOpenGLShaderProgram);
+    Q_UNUSED(d);
+    d->glfuncs->glUniform2fv(location, 4, value.constData());
+}
+
+/*!
+    \overload
+
+    Sets the uniform variable called \a name in the current context
+    to a 4x2 matrix \a value.
+
+    \note This function is not aware of non square matrix support,
+    that is, GLSL types like mat4x2, that is present in modern OpenGL
+    versions. Instead, it treats the uniform as an array of vec2.
+
+    \sa setAttributeValue()
+*/
+void QOpenGLShaderProgram::setUniformValue(const char *name, const QMatrix4x2& value)
+{
+    setUniformValue(uniformLocation(name), value);
+}
+
+/*!
+    Sets the uniform variable at \a location in the current context
+    to a 4x3 matrix \a value.
+
+    \note This function is not aware of non square matrix support,
+    that is, GLSL types like mat4x3, that is present in modern OpenGL
+    versions. Instead, it treats the uniform as an array of vec3.
+
+    \sa setAttributeValue()
+*/
+void QOpenGLShaderProgram::setUniformValue(int location, const QMatrix4x3& value)
+{
+    Q_D(QOpenGLShaderProgram);
+    Q_UNUSED(d);
+    d->glfuncs->glUniform3fv(location, 4, value.constData());
+}
+
+/*!
+    \overload
+
+    Sets the uniform variable called \a name in the current context
+    to a 4x3 matrix \a value.
+
+    \note This function is not aware of non square matrix support,
+    that is, GLSL types like mat4x3, that is present in modern OpenGL
+    versions. Instead, it treats the uniform as an array of vec3.
+
+    \sa setAttributeValue()
+*/
+void QOpenGLShaderProgram::setUniformValue(const char *name, const QMatrix4x3& value)
+{
+    setUniformValue(uniformLocation(name), value);
+}
+
+/*!
+    Sets the uniform variable at \a location in the current context
+    to a 4x4 matrix \a value.
+
+    \sa setAttributeValue()
+*/
+void QOpenGLShaderProgram::setUniformValue(int location, const QMatrix4x4& value)
+{
+    Q_D(QOpenGLShaderProgram);
+    Q_UNUSED(d);
+    d->glfuncs->glUniformMatrix4fv(location, 1, GL_FALSE, value.constData());
+}
+
+/*!
+    \overload
+
+    Sets the uniform variable called \a name in the current context
+    to a 4x4 matrix \a value.
+
+    \sa setAttributeValue()
+*/
+void QOpenGLShaderProgram::setUniformValue(const char *name, const QMatrix4x4& value)
+{
+    setUniformValue(uniformLocation(name), value);
+}
+
+/*!
+    \overload
+
+    Sets the uniform variable at \a location in the current context
+    to a 2x2 matrix \a value.  The matrix elements must be specified
+    in column-major order.
+
+    \sa setAttributeValue()
+*/
+void QOpenGLShaderProgram::setUniformValue(int location, const GLfloat value[2][2])
+{
+    Q_D(QOpenGLShaderProgram);
+    Q_UNUSED(d);
+    if (location != -1)
+        d->glfuncs->glUniformMatrix2fv(location, 1, GL_FALSE, value[0]);
+}
+
+/*!
+    \overload
+
+    Sets the uniform variable at \a location in the current context
+    to a 3x3 matrix \a value.  The matrix elements must be specified
+    in column-major order.
+
+    \sa setAttributeValue()
+*/
+void QOpenGLShaderProgram::setUniformValue(int location, const GLfloat value[3][3])
+{
+    Q_D(QOpenGLShaderProgram);
+    Q_UNUSED(d);
+    if (location != -1)
+        d->glfuncs->glUniformMatrix3fv(location, 1, GL_FALSE, value[0]);
+}
+
+/*!
+    \overload
+
+    Sets the uniform variable at \a location in the current context
+    to a 4x4 matrix \a value.  The matrix elements must be specified
+    in column-major order.
+
+    \sa setAttributeValue()
+*/
+void QOpenGLShaderProgram::setUniformValue(int location, const GLfloat value[4][4])
+{
+    Q_D(QOpenGLShaderProgram);
+    Q_UNUSED(d);
+    if (location != -1)
+        d->glfuncs->glUniformMatrix4fv(location, 1, GL_FALSE, value[0]);
+}
+
+
+/*!
+    \overload
+
+    Sets the uniform variable called \a name in the current context
+    to a 2x2 matrix \a value.  The matrix elements must be specified
+    in column-major order.
+
+    \sa setAttributeValue()
+*/
+void QOpenGLShaderProgram::setUniformValue(const char *name, const GLfloat value[2][2])
+{
+    setUniformValue(uniformLocation(name), value);
+}
+
+/*!
+    \overload
+
+    Sets the uniform variable called \a name in the current context
+    to a 3x3 matrix \a value.  The matrix elements must be specified
+    in column-major order.
+
+    \sa setAttributeValue()
+*/
+void QOpenGLShaderProgram::setUniformValue(const char *name, const GLfloat value[3][3])
+{
+    setUniformValue(uniformLocation(name), value);
+}
+
+/*!
+    \overload
+
+    Sets the uniform variable called \a name in the current context
+    to a 4x4 matrix \a value.  The matrix elements must be specified
+    in column-major order.
+
+    \sa setAttributeValue()
+*/
+void QOpenGLShaderProgram::setUniformValue(const char *name, const GLfloat value[4][4])
+{
+    setUniformValue(uniformLocation(name), value);
+}
+
+/*!
+    Sets the uniform variable at \a location in the current context to a
+    3x3 transformation matrix \a value that is specified as a QTransform value.
+
+    To set a QTransform value as a 4x4 matrix in a shader, use
+    \c{setUniformValue(location, QMatrix4x4(value))}.
+*/
+void QOpenGLShaderProgram::setUniformValue(int location, const QTransform& value)
+{
+    Q_D(QOpenGLShaderProgram);
+    Q_UNUSED(d);
+    if (location != -1) {
+        GLfloat mat[3][3] = {
+            {GLfloat(value.m11()), GLfloat(value.m12()), GLfloat(value.m13())},
+            {GLfloat(value.m21()), GLfloat(value.m22()), GLfloat(value.m23())},
+            {GLfloat(value.m31()), GLfloat(value.m32()), GLfloat(value.m33())}
+        };
+        d->glfuncs->glUniformMatrix3fv(location, 1, GL_FALSE, mat[0]);
+    }
+}
+
+/*!
+    \overload
+
+    Sets the uniform variable called \a name in the current context to a
+    3x3 transformation matrix \a value that is specified as a QTransform value.
+
+    To set a QTransform value as a 4x4 matrix in a shader, use
+    \c{setUniformValue(name, QMatrix4x4(value))}.
+*/
+void QOpenGLShaderProgram::setUniformValue
+        (const char *name, const QTransform& value)
+{
+    setUniformValue(uniformLocation(name), value);
+}
+
+/*!
+    Sets the uniform variable array at \a location in the current
+    context to the \a count elements of \a values.
+
+    \sa setAttributeValue()
+*/
+void QOpenGLShaderProgram::setUniformValueArray(int location, const GLint *values, int count)
+{
+    Q_D(QOpenGLShaderProgram);
+    Q_UNUSED(d);
+    if (location != -1)
+        d->glfuncs->glUniform1iv(location, count, values);
+}
+
+/*!
+    \overload
+
+    Sets the uniform variable array called \a name in the current
+    context to the \a count elements of \a values.
+
+    \sa setAttributeValue()
+*/
+void QOpenGLShaderProgram::setUniformValueArray
+        (const char *name, const GLint *values, int count)
+{
+    setUniformValueArray(uniformLocation(name), values, count);
+}
+
+/*!
+    Sets the uniform variable array at \a location in the current
+    context to the \a count elements of \a values.  This overload
+    should be used when setting an array of sampler values.
+
+    \note This function is not aware of unsigned int support in modern OpenGL
+    versions and therefore treats \a values as a GLint and calls glUniform1iv.
+
+    \sa setAttributeValue()
+*/
+void QOpenGLShaderProgram::setUniformValueArray(int location, const GLuint *values, int count)
+{
+    Q_D(QOpenGLShaderProgram);
+    Q_UNUSED(d);
+    if (location != -1)
+        d->glfuncs->glUniform1iv(location, count, reinterpret_cast<const GLint *>(values));
+}
+
+/*!
+    \overload
+
+    Sets the uniform variable array called \a name in the current
+    context to the \a count elements of \a values.  This overload
+    should be used when setting an array of sampler values.
+
+    \sa setAttributeValue()
+*/
+void QOpenGLShaderProgram::setUniformValueArray
+        (const char *name, const GLuint *values, int count)
+{
+    setUniformValueArray(uniformLocation(name), values, count);
+}
+
+/*!
+    Sets the uniform variable array at \a location in the current
+    context to the \a count elements of \a values.  Each element
+    has \a tupleSize components.  The \a tupleSize must be 1, 2, 3, or 4.
+
+    \sa setAttributeValue()
+*/
+void QOpenGLShaderProgram::setUniformValueArray(int location, const GLfloat *values, int count, int tupleSize)
+{
+    Q_D(QOpenGLShaderProgram);
+    Q_UNUSED(d);
+    if (location != -1) {
+        if (tupleSize == 1)
+            d->glfuncs->glUniform1fv(location, count, values);
+        else if (tupleSize == 2)
+            d->glfuncs->glUniform2fv(location, count, values);
+        else if (tupleSize == 3)
+            d->glfuncs->glUniform3fv(location, count, values);
+        else if (tupleSize == 4)
+            d->glfuncs->glUniform4fv(location, count, values);
+        else
+            qWarning("QOpenGLShaderProgram::setUniformValue: size %d not supported", tupleSize);
+    }
+}
+
+/*!
+    \overload
+
+    Sets the uniform variable array called \a name in the current
+    context to the \a count elements of \a values.  Each element
+    has \a tupleSize components.  The \a tupleSize must be 1, 2, 3, or 4.
+
+    \sa setAttributeValue()
+*/
+void QOpenGLShaderProgram::setUniformValueArray
+        (const char *name, const GLfloat *values, int count, int tupleSize)
+{
+    setUniformValueArray(uniformLocation(name), values, count, tupleSize);
+}
+
+/*!
+    Sets the uniform variable array at \a location in the current
+    context to the \a count 2D vector elements of \a values.
+
+    \sa setAttributeValue()
+*/
+void QOpenGLShaderProgram::setUniformValueArray(int location, const QVector2D *values, int count)
+{
+    Q_D(QOpenGLShaderProgram);
+    Q_UNUSED(d);
+    if (location != -1)
+        d->glfuncs->glUniform2fv(location, count, reinterpret_cast<const GLfloat *>(values));
+}
+
+/*!
+    \overload
+
+    Sets the uniform variable array called \a name in the current
+    context to the \a count 2D vector elements of \a values.
+
+    \sa setAttributeValue()
+*/
+void QOpenGLShaderProgram::setUniformValueArray(const char *name, const QVector2D *values, int count)
+{
+    setUniformValueArray(uniformLocation(name), values, count);
+}
+
+/*!
+    Sets the uniform variable array at \a location in the current
+    context to the \a count 3D vector elements of \a values.
+
+    \sa setAttributeValue()
+*/
+void QOpenGLShaderProgram::setUniformValueArray(int location, const QVector3D *values, int count)
+{
+    Q_D(QOpenGLShaderProgram);
+    Q_UNUSED(d);
+    if (location != -1)
+        d->glfuncs->glUniform3fv(location, count, reinterpret_cast<const GLfloat *>(values));
+}
+
+/*!
+    \overload
+
+    Sets the uniform variable array called \a name in the current
+    context to the \a count 3D vector elements of \a values.
+
+    \sa setAttributeValue()
+*/
+void QOpenGLShaderProgram::setUniformValueArray(const char *name, const QVector3D *values, int count)
+{
+    setUniformValueArray(uniformLocation(name), values, count);
+}
+
+/*!
+    Sets the uniform variable array at \a location in the current
+    context to the \a count 4D vector elements of \a values.
+
+    \sa setAttributeValue()
+*/
+void QOpenGLShaderProgram::setUniformValueArray(int location, const QVector4D *values, int count)
+{
+    Q_D(QOpenGLShaderProgram);
+    Q_UNUSED(d);
+    if (location != -1)
+        d->glfuncs->glUniform4fv(location, count, reinterpret_cast<const GLfloat *>(values));
+}
+
+/*!
+    \overload
+
+    Sets the uniform variable array called \a name in the current
+    context to the \a count 4D vector elements of \a values.
+
+    \sa setAttributeValue()
+*/
+void QOpenGLShaderProgram::setUniformValueArray(const char *name, const QVector4D *values, int count)
+{
+    setUniformValueArray(uniformLocation(name), values, count);
+}
+
+// We have to repack matrix arrays from qreal to GLfloat.
+#define setUniformMatrixArray(func,location,values,count,type,cols,rows) \
+    if (location == -1 || count <= 0) \
+        return; \
+    if (sizeof(type) == sizeof(GLfloat) * cols * rows) { \
+        func(location, count, GL_FALSE, \
+             reinterpret_cast<const GLfloat *>(values[0].constData())); \
+    } else { \
+        QVarLengthArray<GLfloat> temp(cols * rows * count); \
+        for (int index = 0; index < count; ++index) { \
+            for (int index2 = 0; index2 < (cols * rows); ++index2) { \
+                temp.data()[cols * rows * index + index2] = \
+                    values[index].constData()[index2]; \
+            } \
+        } \
+        func(location, count, GL_FALSE, temp.constData()); \
+    }
+#define setUniformGenericMatrixArray(colfunc,location,values,count,type,cols,rows) \
+    if (location == -1 || count <= 0) \
+        return; \
+    if (sizeof(type) == sizeof(GLfloat) * cols * rows) { \
+        const GLfloat *data = reinterpret_cast<const GLfloat *> \
+            (values[0].constData());  \
+        colfunc(location, count * cols, data); \
+    } else { \
+        QVarLengthArray<GLfloat> temp(cols * rows * count); \
+        for (int index = 0; index < count; ++index) { \
+            for (int index2 = 0; index2 < (cols * rows); ++index2) { \
+                temp.data()[cols * rows * index + index2] = \
+                    values[index].constData()[index2]; \
+            } \
+        } \
+        colfunc(location, count * cols, temp.constData()); \
+    }
+
+/*!
+    Sets the uniform variable array at \a location in the current
+    context to the \a count 2x2 matrix elements of \a values.
+
+    \sa setAttributeValue()
+*/
+void QOpenGLShaderProgram::setUniformValueArray(int location, const QMatrix2x2 *values, int count)
+{
+    Q_D(QOpenGLShaderProgram);
+    Q_UNUSED(d);
+    setUniformMatrixArray
+        (d->glfuncs->glUniformMatrix2fv, location, values, count, QMatrix2x2, 2, 2);
+}
+
+/*!
+    \overload
+
+    Sets the uniform variable array called \a name in the current
+    context to the \a count 2x2 matrix elements of \a values.
+
+    \sa setAttributeValue()
+*/
+void QOpenGLShaderProgram::setUniformValueArray(const char *name, const QMatrix2x2 *values, int count)
+{
+    setUniformValueArray(uniformLocation(name), values, count);
+}
+
+/*!
+    Sets the uniform variable array at \a location in the current
+    context to the \a count 2x3 matrix elements of \a values.
+
+    \sa setAttributeValue()
+*/
+void QOpenGLShaderProgram::setUniformValueArray(int location, const QMatrix2x3 *values, int count)
+{
+    Q_D(QOpenGLShaderProgram);
+    Q_UNUSED(d);
+    setUniformGenericMatrixArray
+        (d->glfuncs->glUniform3fv, location, values, count,
+         QMatrix2x3, 2, 3);
+}
+
+/*!
+    \overload
+
+    Sets the uniform variable array called \a name in the current
+    context to the \a count 2x3 matrix elements of \a values.
+
+    \sa setAttributeValue()
+*/
+void QOpenGLShaderProgram::setUniformValueArray(const char *name, const QMatrix2x3 *values, int count)
+{
+    setUniformValueArray(uniformLocation(name), values, count);
+}
+
+/*!
+    Sets the uniform variable array at \a location in the current
+    context to the \a count 2x4 matrix elements of \a values.
+
+    \sa setAttributeValue()
+*/
+void QOpenGLShaderProgram::setUniformValueArray(int location, const QMatrix2x4 *values, int count)
+{
+    Q_D(QOpenGLShaderProgram);
+    Q_UNUSED(d);
+    setUniformGenericMatrixArray
+        (d->glfuncs->glUniform4fv, location, values, count,
+         QMatrix2x4, 2, 4);
+}
+
+/*!
+    \overload
+
+    Sets the uniform variable array called \a name in the current
+    context to the \a count 2x4 matrix elements of \a values.
+
+    \sa setAttributeValue()
+*/
+void QOpenGLShaderProgram::setUniformValueArray(const char *name, const QMatrix2x4 *values, int count)
+{
+    setUniformValueArray(uniformLocation(name), values, count);
+}
+
+/*!
+    Sets the uniform variable array at \a location in the current
+    context to the \a count 3x2 matrix elements of \a values.
+
+    \sa setAttributeValue()
+*/
+void QOpenGLShaderProgram::setUniformValueArray(int location, const QMatrix3x2 *values, int count)
+{
+    Q_D(QOpenGLShaderProgram);
+    Q_UNUSED(d);
+    setUniformGenericMatrixArray
+        (d->glfuncs->glUniform2fv, location, values, count,
+         QMatrix3x2, 3, 2);
+}
+
+/*!
+    \overload
+
+    Sets the uniform variable array called \a name in the current
+    context to the \a count 3x2 matrix elements of \a values.
+
+    \sa setAttributeValue()
+*/
+void QOpenGLShaderProgram::setUniformValueArray(const char *name, const QMatrix3x2 *values, int count)
+{
+    setUniformValueArray(uniformLocation(name), values, count);
+}
+
+/*!
+    Sets the uniform variable array at \a location in the current
+    context to the \a count 3x3 matrix elements of \a values.
+
+    \sa setAttributeValue()
+*/
+void QOpenGLShaderProgram::setUniformValueArray(int location, const QMatrix3x3 *values, int count)
+{
+    Q_D(QOpenGLShaderProgram);
+    Q_UNUSED(d);
+    setUniformMatrixArray
+        (d->glfuncs->glUniformMatrix3fv, location, values, count, QMatrix3x3, 3, 3);
+}
+
+/*!
+    \overload
+
+    Sets the uniform variable array called \a name in the current
+    context to the \a count 3x3 matrix elements of \a values.
+
+    \sa setAttributeValue()
+*/
+void QOpenGLShaderProgram::setUniformValueArray(const char *name, const QMatrix3x3 *values, int count)
+{
+    setUniformValueArray(uniformLocation(name), values, count);
+}
+
+/*!
+    Sets the uniform variable array at \a location in the current
+    context to the \a count 3x4 matrix elements of \a values.
+
+    \sa setAttributeValue()
+*/
+void QOpenGLShaderProgram::setUniformValueArray(int location, const QMatrix3x4 *values, int count)
+{
+    Q_D(QOpenGLShaderProgram);
+    Q_UNUSED(d);
+    setUniformGenericMatrixArray
+        (d->glfuncs->glUniform4fv, location, values, count,
+         QMatrix3x4, 3, 4);
+}
+
+/*!
+    \overload
+
+    Sets the uniform variable array called \a name in the current
+    context to the \a count 3x4 matrix elements of \a values.
+
+    \sa setAttributeValue()
+*/
+void QOpenGLShaderProgram::setUniformValueArray(const char *name, const QMatrix3x4 *values, int count)
+{
+    setUniformValueArray(uniformLocation(name), values, count);
+}
+
+/*!
+    Sets the uniform variable array at \a location in the current
+    context to the \a count 4x2 matrix elements of \a values.
+
+    \sa setAttributeValue()
+*/
+void QOpenGLShaderProgram::setUniformValueArray(int location, const QMatrix4x2 *values, int count)
+{
+    Q_D(QOpenGLShaderProgram);
+    Q_UNUSED(d);
+    setUniformGenericMatrixArray
+        (d->glfuncs->glUniform2fv, location, values, count,
+         QMatrix4x2, 4, 2);
+}
+
+/*!
+    \overload
+
+    Sets the uniform variable array called \a name in the current
+    context to the \a count 4x2 matrix elements of \a values.
+
+    \sa setAttributeValue()
+*/
+void QOpenGLShaderProgram::setUniformValueArray(const char *name, const QMatrix4x2 *values, int count)
+{
+    setUniformValueArray(uniformLocation(name), values, count);
+}
+
+/*!
+    Sets the uniform variable array at \a location in the current
+    context to the \a count 4x3 matrix elements of \a values.
+
+    \sa setAttributeValue()
+*/
+void QOpenGLShaderProgram::setUniformValueArray(int location, const QMatrix4x3 *values, int count)
+{
+    Q_D(QOpenGLShaderProgram);
+    Q_UNUSED(d);
+    setUniformGenericMatrixArray
+        (d->glfuncs->glUniform3fv, location, values, count,
+         QMatrix4x3, 4, 3);
+}
+
+/*!
+    \overload
+
+    Sets the uniform variable array called \a name in the current
+    context to the \a count 4x3 matrix elements of \a values.
+
+    \sa setAttributeValue()
+*/
+void QOpenGLShaderProgram::setUniformValueArray(const char *name, const QMatrix4x3 *values, int count)
+{
+    setUniformValueArray(uniformLocation(name), values, count);
+}
+
+/*!
+    Sets the uniform variable array at \a location in the current
+    context to the \a count 4x4 matrix elements of \a values.
+
+    \sa setAttributeValue()
+*/
+void QOpenGLShaderProgram::setUniformValueArray(int location, const QMatrix4x4 *values, int count)
+{
+    Q_D(QOpenGLShaderProgram);
+    Q_UNUSED(d);
+    setUniformMatrixArray
+        (d->glfuncs->glUniformMatrix4fv, location, values, count, QMatrix4x4, 4, 4);
+}
+
+/*!
+    \overload
+
+    Sets the uniform variable array called \a name in the current
+    context to the \a count 4x4 matrix elements of \a values.
+
+    \sa setAttributeValue()
+*/
+void QOpenGLShaderProgram::setUniformValueArray(const char *name, const QMatrix4x4 *values, int count)
+{
+    setUniformValueArray(uniformLocation(name), values, count);
+}
+
+/*!
+    Returns the hardware limit for how many vertices a geometry shader
+    can output.
+*/
+int QOpenGLShaderProgram::maxGeometryOutputVertices() const
+{
+    GLint n = 0;
+    Q_D(const QOpenGLShaderProgram);
+    d->glfuncs->glGetIntegerv(GL_MAX_GEOMETRY_OUTPUT_VERTICES, &n);
+    return n;
+}
+
+/*!
+    Use this function to specify to OpenGL the number of vertices in
+    a patch to \a count. A patch is a custom OpenGL primitive whose interpretation
+    is entirely defined by the tessellation shader stages. Therefore, calling
+    this function only makes sense when using a QOpenGLShaderProgram
+    containing tessellation stage shaders. When using OpenGL tessellation,
+    the only primitive that can be rendered with \c{glDraw*()} functions is
+    \c{GL_PATCHES}.
+
+    This is equivalent to calling glPatchParameteri(GL_PATCH_VERTICES, count).
+
+    \note This modifies global OpenGL state and is not specific to this
+    QOpenGLShaderProgram instance. You should call this in your render
+    function when needed, as QOpenGLShaderProgram will not apply this for
+    you. This is purely a convenience function.
+
+    \sa patchVertexCount()
+*/
+void QOpenGLShaderProgram::setPatchVertexCount(int count)
+{
+    Q_D(QOpenGLShaderProgram);
+    d->glfuncs->glPatchParameteri(GL_PATCH_VERTICES, count);
+}
+
+/*!
+    Returns the number of vertices per-patch to be used when rendering.
+
+    \note This returns the global OpenGL state value. It is not specific to
+    this QOpenGLShaderProgram instance.
+
+    \sa setPatchVertexCount()
+*/
+int QOpenGLShaderProgram::patchVertexCount() const
+{
+    int patchVertices = 0;
+    Q_D(const QOpenGLShaderProgram);
+    d->glfuncs->glGetIntegerv(GL_PATCH_VERTICES, &patchVertices);
+    return patchVertices;
+}
+
+/*!
+    Sets the default outer tessellation levels to be used by the tessellation
+    primitive generator in the event that the tessellation control shader
+    does not output them to \a levels. For more details on OpenGL and Tessellation
+    shaders see \l{OpenGL Tessellation Shaders}.
+
+    The \a levels argument should be a QVector consisting of 4 floats. Not all
+    of the values make sense for all tessellation modes. If you specify a vector with
+    fewer than 4 elements, the remaining elements will be given a default value of 1.
+
+    \note This modifies global OpenGL state and is not specific to this
+    QOpenGLShaderProgram instance. You should call this in your render
+    function when needed, as QOpenGLShaderProgram will not apply this for
+    you. This is purely a convenience function.
+
+    \note This function is only available with OpenGL >= 4.0 and is not supported
+    with OpenGL ES 3.2.
+
+    \sa defaultOuterTessellationLevels(), setDefaultInnerTessellationLevels()
+*/
+void QOpenGLShaderProgram::setDefaultOuterTessellationLevels(const QVector<float> &levels)
+{
+#ifndef QT_OPENGL_ES_2
+    Q_D(QOpenGLShaderProgram);
+    if (d->tessellationFuncs) {
+        QVector<float> tessLevels = levels;
+
+        // Ensure we have the required 4 outer tessellation levels
+        // Use default of 1 for missing entries (same as spec)
+        const int argCount = 4;
+        if (tessLevels.size() < argCount) {
+            tessLevels.reserve(argCount);
+            for (int i = tessLevels.size(); i < argCount; ++i)
+                tessLevels.append(1.0f);
+        }
+        d->tessellationFuncs->glPatchParameterfv(GL_PATCH_DEFAULT_OUTER_LEVEL, tessLevels.data());
+    }
+#else
+    Q_UNUSED(levels);
+#endif
+}
+
+/*!
+    Returns the default outer tessellation levels to be used by the tessellation
+    primitive generator in the event that the tessellation control shader
+    does not output them. For more details on OpenGL and Tessellation shaders see
+    \l{OpenGL Tessellation Shaders}.
+
+    Returns a QVector of floats describing the outer tessellation levels. The vector
+    will always have four elements but not all of them make sense for every mode
+    of tessellation.
+
+    \note This returns the global OpenGL state value. It is not specific to
+    this QOpenGLShaderProgram instance.
+
+    \note This function is only supported with OpenGL >= 4.0 and will not
+    return valid results with OpenGL ES 3.2.
+
+    \sa setDefaultOuterTessellationLevels(), defaultInnerTessellationLevels()
+*/
+QVector<float> QOpenGLShaderProgram::defaultOuterTessellationLevels() const
+{
+#ifndef QT_OPENGL_ES_2
+    QVector<float> tessLevels(4, 1.0f);
+    Q_D(const QOpenGLShaderProgram);
+    if (d->tessellationFuncs)
+        d->tessellationFuncs->glGetFloatv(GL_PATCH_DEFAULT_OUTER_LEVEL, tessLevels.data());
+    return tessLevels;
+#else
+    return QVector<float>();
+#endif
+}
+
+/*!
+    Sets the default outer tessellation levels to be used by the tessellation
+    primitive generator in the event that the tessellation control shader
+    does not output them to \a levels. For more details on OpenGL and Tessellation shaders see
+    \l{OpenGL Tessellation Shaders}.
+
+    The \a levels argument should be a QVector consisting of 2 floats. Not all
+    of the values make sense for all tessellation modes. If you specify a vector with
+    fewer than 2 elements, the remaining elements will be given a default value of 1.
+
+    \note This modifies global OpenGL state and is not specific to this
+    QOpenGLShaderProgram instance. You should call this in your render
+    function when needed, as QOpenGLShaderProgram will not apply this for
+    you. This is purely a convenience function.
+
+    \note This function is only available with OpenGL >= 4.0 and is not supported
+    with OpenGL ES 3.2.
+
+    \sa defaultInnerTessellationLevels(), setDefaultOuterTessellationLevels()
+*/
+void QOpenGLShaderProgram::setDefaultInnerTessellationLevels(const QVector<float> &levels)
+{
+#ifndef QT_OPENGL_ES_2
+    Q_D(QOpenGLShaderProgram);
+    if (d->tessellationFuncs) {
+        QVector<float> tessLevels = levels;
+
+        // Ensure we have the required 2 inner tessellation levels
+        // Use default of 1 for missing entries (same as spec)
+        const int argCount = 2;
+        if (tessLevels.size() < argCount) {
+            tessLevels.reserve(argCount);
+            for (int i = tessLevels.size(); i < argCount; ++i)
+                tessLevels.append(1.0f);
+        }
+        d->tessellationFuncs->glPatchParameterfv(GL_PATCH_DEFAULT_INNER_LEVEL, tessLevels.data());
+    }
+#else
+    Q_UNUSED(levels);
+#endif
+}
+
+/*!
+    Returns the default inner tessellation levels to be used by the tessellation
+    primitive generator in the event that the tessellation control shader
+    does not output them. For more details on OpenGL and Tessellation shaders see
+    \l{OpenGL Tessellation Shaders}.
+
+    Returns a QVector of floats describing the inner tessellation levels. The vector
+    will always have two elements but not all of them make sense for every mode
+    of tessellation.
+
+    \note This returns the global OpenGL state value. It is not specific to
+    this QOpenGLShaderProgram instance.
+
+    \note This function is only supported with OpenGL >= 4.0 and will not
+    return valid results with OpenGL ES 3.2.
+
+    \sa setDefaultInnerTessellationLevels(), defaultOuterTessellationLevels()
+*/
+QVector<float> QOpenGLShaderProgram::defaultInnerTessellationLevels() const
+{
+#ifndef QT_OPENGL_ES_2
+    QVector<float> tessLevels(2, 1.0f);
+    Q_D(const QOpenGLShaderProgram);
+    if (d->tessellationFuncs)
+        d->tessellationFuncs->glGetFloatv(GL_PATCH_DEFAULT_INNER_LEVEL, tessLevels.data());
+    return tessLevels;
+#else
+    return QVector<float>();
+#endif
+}
+
+
+/*!
+    Returns \c true if shader programs written in the OpenGL Shading
+    Language (GLSL) are supported on this system; false otherwise.
+
+    The \a context is used to resolve the GLSL extensions.
+    If \a context is \nullptr, then QOpenGLContext::currentContext()
+    is used.
+*/
+bool QOpenGLShaderProgram::hasOpenGLShaderPrograms(QOpenGLContext *context)
+{
+    if (!context)
+        context = QOpenGLContext::currentContext();
+    if (!context)
+        return false;
+    return QOpenGLFunctions(context).hasOpenGLFeature(QOpenGLFunctions::Shaders);
+}
+
+/*!
+    \internal
+*/
+void QOpenGLShaderProgram::shaderDestroyed()
+{
+    Q_D(QOpenGLShaderProgram);
+    QOpenGLShader *shader = qobject_cast<QOpenGLShader *>(sender());
+    if (shader && !d->removingShaders)
+        removeShader(shader);
+}
+
+/*!
+    Returns \c true if shader programs of type \a type are supported on
+    this system; false otherwise.
+
+    The \a context is used to resolve the GLSL extensions.
+    If \a context is \nullptr, then QOpenGLContext::currentContext()
+    is used.
+*/
+bool QOpenGLShader::hasOpenGLShaders(ShaderType type, QOpenGLContext *context)
+{
+    if (!context)
+        context = QOpenGLContext::currentContext();
+    if (!context)
+        return false;
+
+    if ((type & ~(Geometry | Vertex | Fragment | TessellationControl | TessellationEvaluation | Compute)) || type == 0)
+        return false;
+
+    if (type & QOpenGLShader::Geometry)
+        return supportsGeometry(context->format());
+    else if (type & (QOpenGLShader::TessellationControl | QOpenGLShader::TessellationEvaluation))
+        return supportsTessellation(context->format());
+    else if (type & QOpenGLShader::Compute)
+        return supportsCompute(context->format());
+
+    // Unconditional support of vertex and fragment shaders implicitly assumes
+    // a minimum OpenGL version of 2.0
+    return true;
+}
+
+bool QOpenGLShaderProgramPrivate::isCacheDisabled() const
+{
+    static QOpenGLProgramBinarySupportCheckWrapper binSupportCheck;
+    return !binSupportCheck.get(QOpenGLContext::currentContext())->isSupported();
+}
+
+bool QOpenGLShaderProgramPrivate::compileCacheable()
+{
+    Q_Q(QOpenGLShaderProgram);
+    for (const QOpenGLProgramBinaryCache::ShaderDesc &shader : qAsConst(binaryProgram.shaders)) {
+        QScopedPointer<QOpenGLShader> s(new QOpenGLShader(qt_shaderStageToType(shader.stage), q));
+        if (!s->compileSourceCode(shader.source)) {
+            log = s->log();
+            return false;
+        }
+        anonShaders.append(s.take());
+        if (!q->addShader(anonShaders.last()))
+            return false;
+    }
+    return true;
+}
+
+bool QOpenGLShaderProgramPrivate::linkBinary()
+{
+    static QOpenGLProgramBinaryCache binCache;
+
+    Q_Q(QOpenGLShaderProgram);
+
+    const QByteArray cacheKey = binaryProgram.cacheKey();
+    if (lcOpenGLProgramDiskCache().isEnabled(QtDebugMsg))
+        qCDebug(lcOpenGLProgramDiskCache, "program with %d shaders, cache key %s",
+                binaryProgram.shaders.count(), cacheKey.constData());
+
+    bool needsCompile = true;
+    if (binCache.load(cacheKey, q->programId())) {
+        qCDebug(lcOpenGLProgramDiskCache, "Program binary received from cache");
+        needsCompile = false;
+    }
+
+    bool needsSave = false;
+    if (needsCompile) {
+        qCDebug(lcOpenGLProgramDiskCache, "Program binary not in cache, compiling");
+        if (compileCacheable())
+            needsSave = true;
+        else
+            return false;
+    }
+
+    linkBinaryRecursion = true;
+    bool ok = q->link();
+    linkBinaryRecursion = false;
+    if (ok && needsSave)
+        binCache.save(cacheKey, q->programId());
+
+    return ok;
+}
+
+QT_END_NAMESPACE
diff --git a/src/opengl/qopenglshaderprogram.h b/src/opengl/qopenglshaderprogram.h
new file mode 100644
index 0000000000..87da4fc072
--- /dev/null
+++ b/src/opengl/qopenglshaderprogram.h
@@ -0,0 +1,314 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtOpenGL module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QOPENGLSHADERPROGRAM_H
+#define QOPENGLSHADERPROGRAM_H
+
+#include <QtOpenGL/qtopenglglobal.h>
+
+#include <QtGui/qopengl.h>
+#include <QtGui/qvector2d.h>
+#include <QtGui/qvector3d.h>
+#include <QtGui/qvector4d.h>
+#include <QtGui/qmatrix4x4.h>
+
+QT_BEGIN_NAMESPACE
+
+
+class QOpenGLContext;
+class QOpenGLShaderProgram;
+class QOpenGLShaderPrivate;
+
+class Q_OPENGL_EXPORT QOpenGLShader : public QObject
+{
+    Q_OBJECT
+public:
+    enum ShaderTypeBit
+    {
+        Vertex                 = 0x0001,
+        Fragment               = 0x0002,
+        Geometry               = 0x0004,
+        TessellationControl    = 0x0008,
+        TessellationEvaluation = 0x0010,
+        Compute                = 0x0020
+    };
+    Q_DECLARE_FLAGS(ShaderType, ShaderTypeBit)
+
+    explicit QOpenGLShader(QOpenGLShader::ShaderType type, QObject *parent = nullptr);
+    ~QOpenGLShader();
+
+    QOpenGLShader::ShaderType shaderType() const;
+
+    bool compileSourceCode(const char *source);
+    bool compileSourceCode(const QByteArray& source);
+    bool compileSourceCode(const QString& source);
+    bool compileSourceFile(const QString& fileName);
+
+    QByteArray sourceCode() const;
+
+    bool isCompiled() const;
+    QString log() const;
+
+    GLuint shaderId() const;
+
+    static bool hasOpenGLShaders(ShaderType type, QOpenGLContext *context = nullptr);
+
+private:
+    friend class QOpenGLShaderProgram;
+
+    Q_DISABLE_COPY(QOpenGLShader)
+    Q_DECLARE_PRIVATE(QOpenGLShader)
+};
+
+Q_DECLARE_OPERATORS_FOR_FLAGS(QOpenGLShader::ShaderType)
+
+
+class QOpenGLShaderProgramPrivate;
+
+class Q_OPENGL_EXPORT QOpenGLShaderProgram : public QObject
+{
+    Q_OBJECT
+public:
+    explicit QOpenGLShaderProgram(QObject *parent = nullptr);
+    ~QOpenGLShaderProgram();
+
+    bool addShader(QOpenGLShader *shader);
+    void removeShader(QOpenGLShader *shader);
+    QList<QOpenGLShader *> shaders() const;
+
+    bool addShaderFromSourceCode(QOpenGLShader::ShaderType type, const char *source);
+    bool addShaderFromSourceCode(QOpenGLShader::ShaderType type, const QByteArray& source);
+    bool addShaderFromSourceCode(QOpenGLShader::ShaderType type, const QString& source);
+    bool addShaderFromSourceFile(QOpenGLShader::ShaderType type, const QString& fileName);
+
+    bool addCacheableShaderFromSourceCode(QOpenGLShader::ShaderType type, const char *source);
+    bool addCacheableShaderFromSourceCode(QOpenGLShader::ShaderType type, const QByteArray &source);
+    bool addCacheableShaderFromSourceCode(QOpenGLShader::ShaderType type, const QString &source);
+    bool addCacheableShaderFromSourceFile(QOpenGLShader::ShaderType type, const QString &fileName);
+
+    void removeAllShaders();
+
+    virtual bool link();
+    bool isLinked() const;
+    QString log() const;
+
+    bool bind();
+    void release();
+
+    bool create();
+
+    GLuint programId() const;
+
+    int maxGeometryOutputVertices() const;
+
+    void setPatchVertexCount(int count);
+    int patchVertexCount() const;
+
+    void setDefaultOuterTessellationLevels(const QVector<float> &levels);
+    QVector<float> defaultOuterTessellationLevels() const;
+
+    void setDefaultInnerTessellationLevels(const QVector<float> &levels);
+    QVector<float> defaultInnerTessellationLevels() const;
+
+    void bindAttributeLocation(const char *name, int location);
+    void bindAttributeLocation(const QByteArray& name, int location);
+    void bindAttributeLocation(const QString& name, int location);
+
+    int attributeLocation(const char *name) const;
+    int attributeLocation(const QByteArray& name) const;
+    int attributeLocation(const QString& name) const;
+
+    void setAttributeValue(int location, GLfloat value);
+    void setAttributeValue(int location, GLfloat x, GLfloat y);
+    void setAttributeValue(int location, GLfloat x, GLfloat y, GLfloat z);
+    void setAttributeValue(int location, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+    void setAttributeValue(int location, const QVector2D& value);
+    void setAttributeValue(int location, const QVector3D& value);
+    void setAttributeValue(int location, const QVector4D& value);
+    void setAttributeValue(int location, const QColor& value);
+    void setAttributeValue(int location, const GLfloat *values, int columns, int rows);
+
+    void setAttributeValue(const char *name, GLfloat value);
+    void setAttributeValue(const char *name, GLfloat x, GLfloat y);
+    void setAttributeValue(const char *name, GLfloat x, GLfloat y, GLfloat z);
+    void setAttributeValue(const char *name, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+    void setAttributeValue(const char *name, const QVector2D& value);
+    void setAttributeValue(const char *name, const QVector3D& value);
+    void setAttributeValue(const char *name, const QVector4D& value);
+    void setAttributeValue(const char *name, const QColor& value);
+    void setAttributeValue(const char *name, const GLfloat *values, int columns, int rows);
+
+    void setAttributeArray
+        (int location, const GLfloat *values, int tupleSize, int stride = 0);
+    void setAttributeArray
+        (int location, const QVector2D *values, int stride = 0);
+    void setAttributeArray
+        (int location, const QVector3D *values, int stride = 0);
+    void setAttributeArray
+        (int location, const QVector4D *values, int stride = 0);
+    void setAttributeArray
+        (int location, GLenum type, const void *values, int tupleSize, int stride = 0);
+    void setAttributeArray
+        (const char *name, const GLfloat *values, int tupleSize, int stride = 0);
+    void setAttributeArray
+        (const char *name, const QVector2D *values, int stride = 0);
+    void setAttributeArray
+        (const char *name, const QVector3D *values, int stride = 0);
+    void setAttributeArray
+        (const char *name, const QVector4D *values, int stride = 0);
+    void setAttributeArray
+        (const char *name, GLenum type, const void *values, int tupleSize, int stride = 0);
+
+    void setAttributeBuffer
+        (int location, GLenum type, int offset, int tupleSize, int stride = 0);
+    void setAttributeBuffer
+        (const char *name, GLenum type, int offset, int tupleSize, int stride = 0);
+
+    void enableAttributeArray(int location);
+    void enableAttributeArray(const char *name);
+    void disableAttributeArray(int location);
+    void disableAttributeArray(const char *name);
+
+    int uniformLocation(const char *name) const;
+    int uniformLocation(const QByteArray& name) const;
+    int uniformLocation(const QString& name) const;
+
+    void setUniformValue(int location, GLfloat value);
+    void setUniformValue(int location, GLint value);
+    void setUniformValue(int location, GLuint value);
+    void setUniformValue(int location, GLfloat x, GLfloat y);
+    void setUniformValue(int location, GLfloat x, GLfloat y, GLfloat z);
+    void setUniformValue(int location, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+    void setUniformValue(int location, const QVector2D& value);
+    void setUniformValue(int location, const QVector3D& value);
+    void setUniformValue(int location, const QVector4D& value);
+    void setUniformValue(int location, const QColor& color);
+    void setUniformValue(int location, const QPoint& point);
+    void setUniformValue(int location, const QPointF& point);
+    void setUniformValue(int location, const QSize& size);
+    void setUniformValue(int location, const QSizeF& size);
+    void setUniformValue(int location, const QMatrix2x2& value);
+    void setUniformValue(int location, const QMatrix2x3& value);
+    void setUniformValue(int location, const QMatrix2x4& value);
+    void setUniformValue(int location, const QMatrix3x2& value);
+    void setUniformValue(int location, const QMatrix3x3& value);
+    void setUniformValue(int location, const QMatrix3x4& value);
+    void setUniformValue(int location, const QMatrix4x2& value);
+    void setUniformValue(int location, const QMatrix4x3& value);
+    void setUniformValue(int location, const QMatrix4x4& value);
+    void setUniformValue(int location, const GLfloat value[2][2]);
+    void setUniformValue(int location, const GLfloat value[3][3]);
+    void setUniformValue(int location, const GLfloat value[4][4]);
+    void setUniformValue(int location, const QTransform& value);
+
+    void setUniformValue(const char *name, GLfloat value);
+    void setUniformValue(const char *name, GLint value);
+    void setUniformValue(const char *name, GLuint value);
+    void setUniformValue(const char *name, GLfloat x, GLfloat y);
+    void setUniformValue(const char *name, GLfloat x, GLfloat y, GLfloat z);
+    void setUniformValue(const char *name, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+    void setUniformValue(const char *name, const QVector2D& value);
+    void setUniformValue(const char *name, const QVector3D& value);
+    void setUniformValue(const char *name, const QVector4D& value);
+    void setUniformValue(const char *name, const QColor& color);
+    void setUniformValue(const char *name, const QPoint& point);
+    void setUniformValue(const char *name, const QPointF& point);
+    void setUniformValue(const char *name, const QSize& size);
+    void setUniformValue(const char *name, const QSizeF& size);
+    void setUniformValue(const char *name, const QMatrix2x2& value);
+    void setUniformValue(const char *name, const QMatrix2x3& value);
+    void setUniformValue(const char *name, const QMatrix2x4& value);
+    void setUniformValue(const char *name, const QMatrix3x2& value);
+    void setUniformValue(const char *name, const QMatrix3x3& value);
+    void setUniformValue(const char *name, const QMatrix3x4& value);
+    void setUniformValue(const char *name, const QMatrix4x2& value);
+    void setUniformValue(const char *name, const QMatrix4x3& value);
+    void setUniformValue(const char *name, const QMatrix4x4& value);
+    void setUniformValue(const char *name, const GLfloat value[2][2]);
+    void setUniformValue(const char *name, const GLfloat value[3][3]);
+    void setUniformValue(const char *name, const GLfloat value[4][4]);
+    void setUniformValue(const char *name, const QTransform& value);
+
+    void setUniformValueArray(int location, const GLfloat *values, int count, int tupleSize);
+    void setUniformValueArray(int location, const GLint *values, int count);
+    void setUniformValueArray(int location, const GLuint *values, int count);
+    void setUniformValueArray(int location, const QVector2D *values, int count);
+    void setUniformValueArray(int location, const QVector3D *values, int count);
+    void setUniformValueArray(int location, const QVector4D *values, int count);
+    void setUniformValueArray(int location, const QMatrix2x2 *values, int count);
+    void setUniformValueArray(int location, const QMatrix2x3 *values, int count);
+    void setUniformValueArray(int location, const QMatrix2x4 *values, int count);
+    void setUniformValueArray(int location, const QMatrix3x2 *values, int count);
+    void setUniformValueArray(int location, const QMatrix3x3 *values, int count);
+    void setUniformValueArray(int location, const QMatrix3x4 *values, int count);
+    void setUniformValueArray(int location, const QMatrix4x2 *values, int count);
+    void setUniformValueArray(int location, const QMatrix4x3 *values, int count);
+    void setUniformValueArray(int location, const QMatrix4x4 *values, int count);
+
+    void setUniformValueArray(const char *name, const GLfloat *values, int count, int tupleSize);
+    void setUniformValueArray(const char *name, const GLint *values, int count);
+    void setUniformValueArray(const char *name, const GLuint *values, int count);
+    void setUniformValueArray(const char *name, const QVector2D *values, int count);
+    void setUniformValueArray(const char *name, const QVector3D *values, int count);
+    void setUniformValueArray(const char *name, const QVector4D *values, int count);
+    void setUniformValueArray(const char *name, const QMatrix2x2 *values, int count);
+    void setUniformValueArray(const char *name, const QMatrix2x3 *values, int count);
+    void setUniformValueArray(const char *name, const QMatrix2x4 *values, int count);
+    void setUniformValueArray(const char *name, const QMatrix3x2 *values, int count);
+    void setUniformValueArray(const char *name, const QMatrix3x3 *values, int count);
+    void setUniformValueArray(const char *name, const QMatrix3x4 *values, int count);
+    void setUniformValueArray(const char *name, const QMatrix4x2 *values, int count);
+    void setUniformValueArray(const char *name, const QMatrix4x3 *values, int count);
+    void setUniformValueArray(const char *name, const QMatrix4x4 *values, int count);
+
+    static bool hasOpenGLShaderPrograms(QOpenGLContext *context = nullptr);
+
+private Q_SLOTS:
+    void shaderDestroyed();
+
+private:
+    Q_DISABLE_COPY(QOpenGLShaderProgram)
+    Q_DECLARE_PRIVATE(QOpenGLShaderProgram)
+
+    bool init();
+};
+
+QT_END_NAMESPACE
+
+#endif
diff --git a/src/opengl/qopengltexture.cpp b/src/opengl/qopengltexture.cpp
new file mode 100644
index 0000000000..49ebdfbec2
--- /dev/null
+++ b/src/opengl/qopengltexture.cpp
@@ -0,0 +1,4989 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB).
+** Copyright (C) 2020 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtGui module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qopengltexture.h"
+#include "qopengltexture_p.h"
+#include "qopengltexturehelper_p.h"
+#include "qopenglfunctions.h"
+#include <QtGui/qcolor.h>
+#include <QtGui/qopenglcontext.h>
+#include <QtCore/qdebug.h>
+#include <private/qobject_p.h>
+#include <private/qopenglcontext_p.h>
+
+QT_BEGIN_NAMESPACE
+
+//this is to work around GL_TEXTURE_WRAP_R_OES which also has 0x8072 as value
+#if !defined(GL_TEXTURE_WRAP_R)
+    #define GL_TEXTURE_WRAP_R 0x8072
+#endif
+
+QOpenGLTexturePrivate::QOpenGLTexturePrivate(QOpenGLTexture::Target textureTarget,
+                                             QOpenGLTexture *qq)
+    : q_ptr(qq),
+      context(nullptr),
+      target(textureTarget),
+      textureId(0),
+      format(QOpenGLTexture::NoFormat),
+      formatClass(QOpenGLTexture::NoFormatClass),
+      requestedMipLevels(1),
+      mipLevels(-1),
+      layers(1),
+      faces(1),
+      samples(0),
+      fixedSamplePositions(true),
+      baseLevel(0),
+      maxLevel(1000),
+      depthStencilMode(QOpenGLTexture::DepthMode),
+      comparisonFunction(QOpenGLTexture::CompareLessEqual),
+      comparisonMode(QOpenGLTexture::CompareNone),
+      minFilter(QOpenGLTexture::Nearest),
+      magFilter(QOpenGLTexture::Nearest),
+      maxAnisotropy(1.0f),
+      minLevelOfDetail(-1000.0f),
+      maxLevelOfDetail(1000.0f),
+      levelOfDetailBias(0.0f),
+      textureView(false),
+      autoGenerateMipMaps(true),
+      storageAllocated(false),
+      texFuncs(nullptr),
+      functions(nullptr)
+{
+    dimensions[0] = dimensions[1] = dimensions[2] = 1;
+
+    switch (target) {
+    case QOpenGLTexture::Target1D:
+        bindingTarget = QOpenGLTexture::BindingTarget1D;
+        break;
+    case QOpenGLTexture::Target1DArray:
+        bindingTarget = QOpenGLTexture::BindingTarget1DArray;
+        break;
+    case QOpenGLTexture::Target2D:
+        bindingTarget = QOpenGLTexture::BindingTarget2D;
+        break;
+    case QOpenGLTexture::Target2DArray:
+        bindingTarget = QOpenGLTexture::BindingTarget2DArray;
+        break;
+    case QOpenGLTexture::Target3D:
+        bindingTarget = QOpenGLTexture::BindingTarget3D;
+        break;
+    case QOpenGLTexture::TargetCubeMap:
+        bindingTarget = QOpenGLTexture::BindingTargetCubeMap;
+        faces = 6;
+        break;
+    case QOpenGLTexture::TargetCubeMapArray:
+        bindingTarget = QOpenGLTexture::BindingTargetCubeMapArray;
+        faces = 6;
+        break;
+    case QOpenGLTexture::Target2DMultisample:
+        bindingTarget = QOpenGLTexture::BindingTarget2DMultisample;
+        break;
+    case QOpenGLTexture::Target2DMultisampleArray:
+        bindingTarget = QOpenGLTexture::BindingTarget2DMultisampleArray;
+        break;
+    case QOpenGLTexture::TargetRectangle:
+        bindingTarget = QOpenGLTexture::BindingTargetRectangle;
+        break;
+    case QOpenGLTexture::TargetBuffer:
+        bindingTarget = QOpenGLTexture::BindingTargetBuffer;
+        break;
+    }
+
+    swizzleMask[0] = QOpenGLTexture::RedValue;
+    swizzleMask[1] = QOpenGLTexture::GreenValue;
+    swizzleMask[2] = QOpenGLTexture::BlueValue;
+    swizzleMask[3] = QOpenGLTexture::AlphaValue;
+
+    wrapModes[0] = wrapModes[1] = wrapModes[2] = target == QOpenGLTexture::TargetRectangle
+        ? QOpenGLTexture::ClampToEdge : QOpenGLTexture::Repeat;
+}
+
+QOpenGLTexturePrivate::~QOpenGLTexturePrivate()
+{
+    destroy();
+}
+
+void QOpenGLTexturePrivate::initializeOpenGLFunctions()
+{
+    // If we already have a functions object, there is nothing to do
+    if (texFuncs)
+        return;
+
+    // See if the context already has a suitable resource we can use.
+    // If not create a functions object and add it to the context in case
+    // others wish to use it too
+    texFuncs = context->textureFunctions();
+    if (!texFuncs) {
+        texFuncs = new QOpenGLTextureHelper(context);
+        auto *funcs = texFuncs; // lets us capture by pointer value below
+        context->setTextureFunctions(funcs, [funcs] { delete funcs; });
+    }
+}
+
+bool QOpenGLTexturePrivate::create()
+{
+    if (textureId != 0)
+        return true;
+
+    QOpenGLContext *ctx = QOpenGLContext::currentContext();
+    if (!ctx) {
+        qWarning("Requires a valid current OpenGL context.\n"
+                 "Texture has not been created");
+        return false;
+    }
+    context = ctx;
+    functions = ctx->functions();
+
+    // Resolve any functions we will need based upon context version and create the texture
+    initializeOpenGLFunctions();
+
+    // What features do we have?
+    QOpenGLTexture::Feature feature = QOpenGLTexture::ImmutableStorage;
+    while (feature != QOpenGLTexture::MaxFeatureFlag) {
+        if (QOpenGLTexture::hasFeature(feature))
+            features |= feature;
+        feature = static_cast<QOpenGLTexture::Feature>(feature << 1);
+    }
+
+    functions->glGenTextures(1, &textureId);
+    return textureId != 0;
+}
+
+void QOpenGLTexturePrivate::destroy()
+{
+    if (!textureId) {
+        // not created or already destroyed
+        return;
+    }
+    QOpenGLContext *currentContext = QOpenGLContext::currentContext();
+    if (!currentContext) {
+        qWarning("QOpenGLTexturePrivate::destroy() called without a current context.\n"
+                 "Texture has not been destroyed");
+        return;
+    }
+    if (!QOpenGLContext::areSharing(currentContext, context)) {
+
+        qWarning("QOpenGLTexturePrivate::destroy() called but texture context %p"
+                 " is not shared with current context %p.\n"
+                 "Texture has not been destroyed",
+                 static_cast<const void *>(context),
+                 static_cast<const void *>(currentContext));
+        return;
+    }
+
+    functions->glDeleteTextures(1, &textureId);
+
+    context = nullptr;
+    functions = nullptr;
+    textureId = 0;
+    format = QOpenGLTexture::NoFormat;
+    formatClass = QOpenGLTexture::NoFormatClass;
+    requestedMipLevels = 1;
+    mipLevels = -1;
+    layers = 1;
+    faces = 1;
+    samples = 0;
+    fixedSamplePositions = true,
+    baseLevel = 0;
+    maxLevel = 1000;
+    depthStencilMode = QOpenGLTexture::DepthMode;
+    minFilter = QOpenGLTexture::Nearest;
+    magFilter = QOpenGLTexture::Nearest;
+    maxAnisotropy = 1.0f;
+    minLevelOfDetail = -1000.0f;
+    maxLevelOfDetail = 1000.0f;
+    levelOfDetailBias = 0.0f;
+    textureView = false;
+    autoGenerateMipMaps = true;
+    storageAllocated = false;
+    texFuncs = nullptr;
+
+    swizzleMask[0] = QOpenGLTexture::RedValue;
+    swizzleMask[1] = QOpenGLTexture::GreenValue;
+    swizzleMask[2] = QOpenGLTexture::BlueValue;
+    swizzleMask[3] = QOpenGLTexture::AlphaValue;
+
+    wrapModes[0] = wrapModes[1] = wrapModes[2] = target == QOpenGLTexture::TargetRectangle
+        ? QOpenGLTexture::ClampToEdge : QOpenGLTexture::Repeat;
+}
+
+void QOpenGLTexturePrivate::bind()
+{
+    functions->glBindTexture(target, textureId);
+}
+
+void QOpenGLTexturePrivate::bind(uint unit, QOpenGLTexture::TextureUnitReset reset)
+{
+    GLint oldTextureUnit = 0;
+    if (reset == QOpenGLTexture::ResetTextureUnit)
+        functions->glGetIntegerv(GL_ACTIVE_TEXTURE, &oldTextureUnit);
+
+    texFuncs->glActiveTexture(GL_TEXTURE0 + unit);
+    functions->glBindTexture(target, textureId);
+
+    if (reset == QOpenGLTexture::ResetTextureUnit)
+        texFuncs->glActiveTexture(GL_TEXTURE0 + oldTextureUnit);
+}
+
+void QOpenGLTexturePrivate::release()
+{
+    functions->glBindTexture(target, 0);
+}
+
+void QOpenGLTexturePrivate::release(uint unit, QOpenGLTexture::TextureUnitReset reset)
+{
+    GLint oldTextureUnit = 0;
+    if (reset == QOpenGLTexture::ResetTextureUnit)
+        functions->glGetIntegerv(GL_ACTIVE_TEXTURE, &oldTextureUnit);
+
+    texFuncs->glActiveTexture(GL_TEXTURE0 + unit);
+    functions->glBindTexture(target, 0);
+
+    if (reset == QOpenGLTexture::ResetTextureUnit)
+        texFuncs->glActiveTexture(GL_TEXTURE0 + oldTextureUnit);
+}
+
+bool QOpenGLTexturePrivate::isBound() const
+{
+    GLint boundTextureId = 0;
+    functions->glGetIntegerv(bindingTarget, &boundTextureId);
+    return (static_cast<GLuint>(boundTextureId) == textureId);
+}
+
+bool QOpenGLTexturePrivate::isBound(uint unit) const
+{
+    GLint oldTextureUnit = 0;
+    functions->glGetIntegerv(GL_ACTIVE_TEXTURE, &oldTextureUnit);
+
+    GLint boundTextureId = 0;
+    texFuncs->glActiveTexture(GL_TEXTURE0 + unit);
+    functions->glGetIntegerv(bindingTarget, &boundTextureId);
+    bool result = (static_cast<GLuint>(boundTextureId) == textureId);
+
+    texFuncs->glActiveTexture(GL_TEXTURE0 + oldTextureUnit);
+    return result;
+}
+
+int QOpenGLTexturePrivate::evaluateMipLevels() const
+{
+    switch (target) {
+    case QOpenGLTexture::Target1D:
+    case QOpenGLTexture::Target1DArray:
+    case QOpenGLTexture::Target2D:
+    case QOpenGLTexture::Target2DArray:
+    case QOpenGLTexture::Target3D:
+    case QOpenGLTexture::TargetCubeMap:
+    case QOpenGLTexture::TargetCubeMapArray:
+        return qMin(maximumMipLevelCount(), qMax(1, requestedMipLevels));
+
+    case QOpenGLTexture::TargetRectangle:
+    case QOpenGLTexture::Target2DMultisample:
+    case QOpenGLTexture::Target2DMultisampleArray:
+    case QOpenGLTexture::TargetBuffer:
+    default:
+        return 1;
+    }
+}
+
+static bool isSizedTextureFormat(QOpenGLTexture::TextureFormat internalFormat)
+{
+    switch (internalFormat) {
+    case QOpenGLTexture::NoFormat:
+        return false;
+
+    case QOpenGLTexture::R8_UNorm:
+    case QOpenGLTexture::RG8_UNorm:
+    case QOpenGLTexture::RGB8_UNorm:
+    case QOpenGLTexture::RGBA8_UNorm:
+    case QOpenGLTexture::R16_UNorm:
+    case QOpenGLTexture::RG16_UNorm:
+    case QOpenGLTexture::RGB16_UNorm:
+    case QOpenGLTexture::RGBA16_UNorm:
+    case QOpenGLTexture::R8_SNorm:
+    case QOpenGLTexture::RG8_SNorm:
+    case QOpenGLTexture::RGB8_SNorm:
+    case QOpenGLTexture::RGBA8_SNorm:
+    case QOpenGLTexture::R16_SNorm:
+    case QOpenGLTexture::RG16_SNorm:
+    case QOpenGLTexture::RGB16_SNorm:
+    case QOpenGLTexture::RGBA16_SNorm:
+    case QOpenGLTexture::R8U:
+    case QOpenGLTexture::RG8U:
+    case QOpenGLTexture::RGB8U:
+    case QOpenGLTexture::RGBA8U:
+    case QOpenGLTexture::R16U:
+    case QOpenGLTexture::RG16U:
+    case QOpenGLTexture::RGB16U:
+    case QOpenGLTexture::RGBA16U:
+    case QOpenGLTexture::R32U:
+    case QOpenGLTexture::RG32U:
+    case QOpenGLTexture::RGB32U:
+    case QOpenGLTexture::RGBA32U:
+    case QOpenGLTexture::R8I:
+    case QOpenGLTexture::RG8I:
+    case QOpenGLTexture::RGB8I:
+    case QOpenGLTexture::RGBA8I:
+    case QOpenGLTexture::R16I:
+    case QOpenGLTexture::RG16I:
+    case QOpenGLTexture::RGB16I:
+    case QOpenGLTexture::RGBA16I:
+    case QOpenGLTexture::R32I:
+    case QOpenGLTexture::RG32I:
+    case QOpenGLTexture::RGB32I:
+    case QOpenGLTexture::RGBA32I:
+    case QOpenGLTexture::R16F:
+    case QOpenGLTexture::RG16F:
+    case QOpenGLTexture::RGB16F:
+    case QOpenGLTexture::RGBA16F:
+    case QOpenGLTexture::R32F:
+    case QOpenGLTexture::RG32F:
+    case QOpenGLTexture::RGB32F:
+    case QOpenGLTexture::RGBA32F:
+    case QOpenGLTexture::RGB9E5:
+    case QOpenGLTexture::RG11B10F:
+    case QOpenGLTexture::RG3B2:
+    case QOpenGLTexture::R5G6B5:
+    case QOpenGLTexture::RGB5A1:
+    case QOpenGLTexture::RGBA4:
+    case QOpenGLTexture::RGB10A2:
+
+    case QOpenGLTexture::D16:
+    case QOpenGLTexture::D24:
+    case QOpenGLTexture::D32:
+    case QOpenGLTexture::D32F:
+
+    case QOpenGLTexture::D24S8:
+    case QOpenGLTexture::D32FS8X24:
+
+    case QOpenGLTexture::S8:
+
+    case QOpenGLTexture::RGB_DXT1:
+    case QOpenGLTexture::RGBA_DXT1:
+    case QOpenGLTexture::RGBA_DXT3:
+    case QOpenGLTexture::RGBA_DXT5:
+    case QOpenGLTexture::R_ATI1N_UNorm:
+    case QOpenGLTexture::R_ATI1N_SNorm:
+    case QOpenGLTexture::RG_ATI2N_UNorm:
+    case QOpenGLTexture::RG_ATI2N_SNorm:
+    case QOpenGLTexture::RGB_BP_UNSIGNED_FLOAT:
+    case QOpenGLTexture::RGB_BP_SIGNED_FLOAT:
+    case QOpenGLTexture::RGB_BP_UNorm:
+    case QOpenGLTexture::SRGB8:
+    case QOpenGLTexture::SRGB8_Alpha8:
+    case QOpenGLTexture::SRGB_DXT1:
+    case QOpenGLTexture::SRGB_Alpha_DXT1:
+    case QOpenGLTexture::SRGB_Alpha_DXT3:
+    case QOpenGLTexture::SRGB_Alpha_DXT5:
+    case QOpenGLTexture::SRGB_BP_UNorm:
+    case QOpenGLTexture::R11_EAC_UNorm:
+    case QOpenGLTexture::R11_EAC_SNorm:
+    case QOpenGLTexture::RG11_EAC_UNorm:
+    case QOpenGLTexture::RG11_EAC_SNorm:
+    case QOpenGLTexture::RGB8_ETC2:
+    case QOpenGLTexture::SRGB8_ETC2:
+    case QOpenGLTexture::RGB8_PunchThrough_Alpha1_ETC2:
+    case QOpenGLTexture::SRGB8_PunchThrough_Alpha1_ETC2:
+    case QOpenGLTexture::RGBA8_ETC2_EAC:
+    case QOpenGLTexture::SRGB8_Alpha8_ETC2_EAC:
+    case QOpenGLTexture::RGBA_ASTC_4x4:
+    case QOpenGLTexture::RGBA_ASTC_5x4:
+    case QOpenGLTexture::RGBA_ASTC_5x5:
+    case QOpenGLTexture::RGBA_ASTC_6x5:
+    case QOpenGLTexture::RGBA_ASTC_6x6:
+    case QOpenGLTexture::RGBA_ASTC_8x5:
+    case QOpenGLTexture::RGBA_ASTC_8x6:
+    case QOpenGLTexture::RGBA_ASTC_8x8:
+    case QOpenGLTexture::RGBA_ASTC_10x5:
+    case QOpenGLTexture::RGBA_ASTC_10x6:
+    case QOpenGLTexture::RGBA_ASTC_10x8:
+    case QOpenGLTexture::RGBA_ASTC_10x10:
+    case QOpenGLTexture::RGBA_ASTC_12x10:
+    case QOpenGLTexture::RGBA_ASTC_12x12:
+    case QOpenGLTexture::SRGB8_Alpha8_ASTC_4x4:
+    case QOpenGLTexture::SRGB8_Alpha8_ASTC_5x4:
+    case QOpenGLTexture::SRGB8_Alpha8_ASTC_5x5:
+    case QOpenGLTexture::SRGB8_Alpha8_ASTC_6x5:
+    case QOpenGLTexture::SRGB8_Alpha8_ASTC_6x6:
+    case QOpenGLTexture::SRGB8_Alpha8_ASTC_8x5:
+    case QOpenGLTexture::SRGB8_Alpha8_ASTC_8x6:
+    case QOpenGLTexture::SRGB8_Alpha8_ASTC_8x8:
+    case QOpenGLTexture::SRGB8_Alpha8_ASTC_10x5:
+    case QOpenGLTexture::SRGB8_Alpha8_ASTC_10x6:
+    case QOpenGLTexture::SRGB8_Alpha8_ASTC_10x8:
+    case QOpenGLTexture::SRGB8_Alpha8_ASTC_10x10:
+    case QOpenGLTexture::SRGB8_Alpha8_ASTC_12x10:
+    case QOpenGLTexture::SRGB8_Alpha8_ASTC_12x12:
+        return true;
+
+    case QOpenGLTexture::RGB8_ETC1:
+        return false;
+
+    case QOpenGLTexture::DepthFormat:
+    case QOpenGLTexture::AlphaFormat:
+
+    case QOpenGLTexture::RGBFormat:
+    case QOpenGLTexture::RGBAFormat:
+
+    case QOpenGLTexture::LuminanceFormat:
+
+    case QOpenGLTexture::LuminanceAlphaFormat:
+        return false;
+    }
+
+    Q_UNREACHABLE();
+    return false;
+}
+
+static bool isTextureTargetMultisample(QOpenGLTexture::Target target)
+{
+    switch (target) {
+    case QOpenGLTexture::Target1D:
+    case QOpenGLTexture::Target1DArray:
+    case QOpenGLTexture::Target2D:
+    case QOpenGLTexture::Target2DArray:
+    case QOpenGLTexture::Target3D:
+    case QOpenGLTexture::TargetCubeMap:
+    case QOpenGLTexture::TargetCubeMapArray:
+        return false;
+
+    case QOpenGLTexture::Target2DMultisample:
+    case QOpenGLTexture::Target2DMultisampleArray:
+        return true;
+
+    case QOpenGLTexture::TargetRectangle:
+    case QOpenGLTexture::TargetBuffer:
+        return false;
+    }
+
+    Q_UNREACHABLE();
+    return false;
+}
+
+bool QOpenGLTexturePrivate::isUsingImmutableStorage() const
+{
+    // Use immutable storage whenever possible, falling back to mutable
+    // Note that if multisample textures are not supported at all, we'll still fail into
+    // the mutable storage allocation
+    return isSizedTextureFormat(format)
+            && (isTextureTargetMultisample(target)
+                ? features.testFlag(QOpenGLTexture::ImmutableMultisampleStorage)
+                : features.testFlag(QOpenGLTexture::ImmutableStorage));
+}
+
+void QOpenGLTexturePrivate::allocateStorage(QOpenGLTexture::PixelFormat pixelFormat, QOpenGLTexture::PixelType pixelType)
+{
+    // Resolve the actual number of mipmap levels we can use
+    mipLevels = evaluateMipLevels();
+
+    if (isUsingImmutableStorage())
+        allocateImmutableStorage();
+    else
+        allocateMutableStorage(pixelFormat, pixelType);
+}
+
+static QOpenGLTexture::PixelFormat pixelFormatCompatibleWithInternalFormat(QOpenGLTexture::TextureFormat internalFormat)
+{
+    switch (internalFormat) {
+    case QOpenGLTexture::NoFormat:
+        return QOpenGLTexture::NoSourceFormat;
+
+    case QOpenGLTexture::R8_UNorm:
+        return QOpenGLTexture::Red;
+
+    case QOpenGLTexture::RG8_UNorm:
+        return QOpenGLTexture::RG;
+
+    case QOpenGLTexture::RGB8_UNorm:
+        return QOpenGLTexture::RGB;
+
+    case QOpenGLTexture::RGBA8_UNorm:
+        return QOpenGLTexture::RGBA;
+
+    case QOpenGLTexture::R16_UNorm:
+        return QOpenGLTexture::Red;
+
+    case QOpenGLTexture::RG16_UNorm:
+        return QOpenGLTexture::RG;
+
+    case QOpenGLTexture::RGB16_UNorm:
+        return QOpenGLTexture::RGB;
+
+    case QOpenGLTexture::RGBA16_UNorm:
+        return QOpenGLTexture::RGBA;
+
+    case QOpenGLTexture::R8_SNorm:
+        return QOpenGLTexture::Red;
+
+    case QOpenGLTexture::RG8_SNorm:
+        return QOpenGLTexture::RG;
+
+    case QOpenGLTexture::RGB8_SNorm:
+        return QOpenGLTexture::RGB;
+
+    case QOpenGLTexture::RGBA8_SNorm:
+        return QOpenGLTexture::RGBA;
+
+    case QOpenGLTexture::R16_SNorm:
+        return QOpenGLTexture::Red;
+
+    case QOpenGLTexture::RG16_SNorm:
+        return QOpenGLTexture::RG;
+
+    case QOpenGLTexture::RGB16_SNorm:
+        return QOpenGLTexture::RGB;
+
+    case QOpenGLTexture::RGBA16_SNorm:
+        return QOpenGLTexture::RGBA;
+
+    case QOpenGLTexture::R8U:
+        return QOpenGLTexture::Red_Integer;
+
+    case QOpenGLTexture::RG8U:
+        return QOpenGLTexture::RG_Integer;
+
+    case QOpenGLTexture::RGB8U:
+        return QOpenGLTexture::RGB_Integer;
+
+    case QOpenGLTexture::RGBA8U:
+        return QOpenGLTexture::RGBA_Integer;
+
+    case QOpenGLTexture::R16U:
+        return QOpenGLTexture::Red_Integer;
+
+    case QOpenGLTexture::RG16U:
+        return QOpenGLTexture::RG_Integer;
+
+    case QOpenGLTexture::RGB16U:
+        return QOpenGLTexture::RGB_Integer;
+
+    case QOpenGLTexture::RGBA16U:
+        return QOpenGLTexture::RGBA_Integer;
+
+    case QOpenGLTexture::R32U:
+        return QOpenGLTexture::Red_Integer;
+
+    case QOpenGLTexture::RG32U:
+        return QOpenGLTexture::RG_Integer;
+
+    case QOpenGLTexture::RGB32U:
+        return QOpenGLTexture::RGB_Integer;
+
+    case QOpenGLTexture::RGBA32U:
+        return QOpenGLTexture::RGBA_Integer;
+
+    case QOpenGLTexture::R8I:
+        return QOpenGLTexture::Red_Integer;
+
+    case QOpenGLTexture::RG8I:
+        return QOpenGLTexture::RG_Integer;
+
+    case QOpenGLTexture::RGB8I:
+        return QOpenGLTexture::RGB_Integer;
+
+    case QOpenGLTexture::RGBA8I:
+        return QOpenGLTexture::RGBA_Integer;
+
+    case QOpenGLTexture::R16I:
+        return QOpenGLTexture::Red_Integer;
+
+    case QOpenGLTexture::RG16I:
+        return QOpenGLTexture::RG_Integer;
+
+    case QOpenGLTexture::RGB16I:
+        return QOpenGLTexture::RGB_Integer;
+
+    case QOpenGLTexture::RGBA16I:
+        return QOpenGLTexture::RGBA_Integer;
+
+    case QOpenGLTexture::R32I:
+        return QOpenGLTexture::Red_Integer;
+
+    case QOpenGLTexture::RG32I:
+        return QOpenGLTexture::RG_Integer;
+
+    case QOpenGLTexture::RGB32I:
+        return QOpenGLTexture::RGB_Integer;
+
+    case QOpenGLTexture::RGBA32I:
+        return QOpenGLTexture::RGBA_Integer;
+
+    case QOpenGLTexture::R16F:
+        return QOpenGLTexture::Red;
+
+    case QOpenGLTexture::RG16F:
+        return QOpenGLTexture::RG;
+
+    case QOpenGLTexture::RGB16F:
+        return QOpenGLTexture::RGB;
+
+    case QOpenGLTexture::RGBA16F:
+        return QOpenGLTexture::RGBA;
+
+    case QOpenGLTexture::R32F:
+        return QOpenGLTexture::Red;
+
+    case QOpenGLTexture::RG32F:
+        return QOpenGLTexture::RG;
+
+    case QOpenGLTexture::RGB32F:
+        return QOpenGLTexture::RGB;
+
+    case QOpenGLTexture::RGBA32F:
+        return QOpenGLTexture::RGBA;
+
+    case QOpenGLTexture::RGB9E5:
+        return QOpenGLTexture::RGB;
+
+    case QOpenGLTexture::RG11B10F:
+        return QOpenGLTexture::RGB;
+
+    case QOpenGLTexture::RG3B2:
+        return QOpenGLTexture::RGB;
+
+    case QOpenGLTexture::R5G6B5:
+        return QOpenGLTexture::RGB;
+
+    case QOpenGLTexture::RGB5A1:
+        return QOpenGLTexture::RGBA;
+
+    case QOpenGLTexture::RGBA4:
+        return QOpenGLTexture::RGBA;
+
+    case QOpenGLTexture::RGB10A2:
+        return QOpenGLTexture::RGBA;
+
+    case QOpenGLTexture::D16:
+    case QOpenGLTexture::D24:
+    case QOpenGLTexture::D32:
+    case QOpenGLTexture::D32F:
+        return QOpenGLTexture::Depth;
+
+    case QOpenGLTexture::D24S8:
+    case QOpenGLTexture::D32FS8X24:
+        return QOpenGLTexture::DepthStencil;
+
+    case QOpenGLTexture::S8:
+        return QOpenGLTexture::Stencil;
+
+    case QOpenGLTexture::RGB_DXT1:
+    case QOpenGLTexture::RGBA_DXT1:
+    case QOpenGLTexture::RGBA_DXT3:
+    case QOpenGLTexture::RGBA_DXT5:
+    case QOpenGLTexture::R_ATI1N_UNorm:
+    case QOpenGLTexture::R_ATI1N_SNorm:
+    case QOpenGLTexture::RG_ATI2N_UNorm:
+    case QOpenGLTexture::RG_ATI2N_SNorm:
+    case QOpenGLTexture::RGB_BP_UNSIGNED_FLOAT:
+    case QOpenGLTexture::RGB_BP_SIGNED_FLOAT:
+    case QOpenGLTexture::RGB_BP_UNorm:
+    case QOpenGLTexture::SRGB8:
+    case QOpenGLTexture::SRGB8_Alpha8:
+    case QOpenGLTexture::SRGB_DXT1:
+    case QOpenGLTexture::SRGB_Alpha_DXT1:
+    case QOpenGLTexture::SRGB_Alpha_DXT3:
+    case QOpenGLTexture::SRGB_Alpha_DXT5:
+    case QOpenGLTexture::SRGB_BP_UNorm:
+    case QOpenGLTexture::RGB8_ETC1:
+        return QOpenGLTexture::RGBA;
+
+    case QOpenGLTexture::R11_EAC_UNorm:
+    case QOpenGLTexture::R11_EAC_SNorm:
+        return QOpenGLTexture::Red;
+
+    case QOpenGLTexture::RG11_EAC_UNorm:
+    case QOpenGLTexture::RG11_EAC_SNorm:
+        return QOpenGLTexture::RG;
+
+    case QOpenGLTexture::RGB8_ETC2:
+    case QOpenGLTexture::SRGB8_ETC2:
+        return QOpenGLTexture::RGB;
+
+    case QOpenGLTexture::RGB8_PunchThrough_Alpha1_ETC2:
+    case QOpenGLTexture::SRGB8_PunchThrough_Alpha1_ETC2:
+        return QOpenGLTexture::RGBA;
+
+    case QOpenGLTexture::RGBA8_ETC2_EAC:
+    case QOpenGLTexture::SRGB8_Alpha8_ETC2_EAC:
+        return QOpenGLTexture::RGBA;
+
+    case QOpenGLTexture::RGBA_ASTC_4x4:
+    case QOpenGLTexture::RGBA_ASTC_5x4:
+    case QOpenGLTexture::RGBA_ASTC_5x5:
+    case QOpenGLTexture::RGBA_ASTC_6x5:
+    case QOpenGLTexture::RGBA_ASTC_6x6:
+    case QOpenGLTexture::RGBA_ASTC_8x5:
+    case QOpenGLTexture::RGBA_ASTC_8x6:
+    case QOpenGLTexture::RGBA_ASTC_8x8:
+    case QOpenGLTexture::RGBA_ASTC_10x5:
+    case QOpenGLTexture::RGBA_ASTC_10x6:
+    case QOpenGLTexture::RGBA_ASTC_10x8:
+    case QOpenGLTexture::RGBA_ASTC_10x10:
+    case QOpenGLTexture::RGBA_ASTC_12x10:
+    case QOpenGLTexture::RGBA_ASTC_12x12:
+    case QOpenGLTexture::SRGB8_Alpha8_ASTC_4x4:
+    case QOpenGLTexture::SRGB8_Alpha8_ASTC_5x4:
+    case QOpenGLTexture::SRGB8_Alpha8_ASTC_5x5:
+    case QOpenGLTexture::SRGB8_Alpha8_ASTC_6x5:
+    case QOpenGLTexture::SRGB8_Alpha8_ASTC_6x6:
+    case QOpenGLTexture::SRGB8_Alpha8_ASTC_8x5:
+    case QOpenGLTexture::SRGB8_Alpha8_ASTC_8x6:
+    case QOpenGLTexture::SRGB8_Alpha8_ASTC_8x8:
+    case QOpenGLTexture::SRGB8_Alpha8_ASTC_10x5:
+    case QOpenGLTexture::SRGB8_Alpha8_ASTC_10x6:
+    case QOpenGLTexture::SRGB8_Alpha8_ASTC_10x8:
+    case QOpenGLTexture::SRGB8_Alpha8_ASTC_10x10:
+    case QOpenGLTexture::SRGB8_Alpha8_ASTC_12x10:
+    case QOpenGLTexture::SRGB8_Alpha8_ASTC_12x12:
+        return QOpenGLTexture::RGBA;
+
+    case QOpenGLTexture::DepthFormat:
+        return QOpenGLTexture::Depth;
+
+    case QOpenGLTexture::AlphaFormat:
+        return QOpenGLTexture::Alpha;
+
+    case QOpenGLTexture::RGBFormat:
+        return QOpenGLTexture::RGB;
+
+    case QOpenGLTexture::RGBAFormat:
+        return QOpenGLTexture::RGBA;
+
+    case QOpenGLTexture::LuminanceFormat:
+        return QOpenGLTexture::Luminance;
+
+    case QOpenGLTexture::LuminanceAlphaFormat:
+        return QOpenGLTexture::LuminanceAlpha;
+    }
+
+    Q_UNREACHABLE();
+    return QOpenGLTexture::NoSourceFormat;
+}
+
+static QOpenGLTexture::PixelType pixelTypeCompatibleWithInternalFormat(QOpenGLTexture::TextureFormat internalFormat)
+{
+    switch (internalFormat) {
+    case QOpenGLTexture::NoFormat:
+        return QOpenGLTexture::NoPixelType;
+
+    case QOpenGLTexture::R8_UNorm:
+    case QOpenGLTexture::RG8_UNorm:
+    case QOpenGLTexture::RGB8_UNorm:
+    case QOpenGLTexture::RGBA8_UNorm:
+    case QOpenGLTexture::R16_UNorm:
+    case QOpenGLTexture::RG16_UNorm:
+    case QOpenGLTexture::RGB16_UNorm:
+    case QOpenGLTexture::RGBA16_UNorm:
+        return QOpenGLTexture::UInt8;
+
+    case QOpenGLTexture::R8_SNorm:
+    case QOpenGLTexture::RG8_SNorm:
+    case QOpenGLTexture::RGB8_SNorm:
+    case QOpenGLTexture::RGBA8_SNorm:
+    case QOpenGLTexture::R16_SNorm:
+    case QOpenGLTexture::RG16_SNorm:
+    case QOpenGLTexture::RGB16_SNorm:
+    case QOpenGLTexture::RGBA16_SNorm:
+        return QOpenGLTexture::Int8;
+
+    case QOpenGLTexture::R8U:
+    case QOpenGLTexture::RG8U:
+    case QOpenGLTexture::RGB8U:
+    case QOpenGLTexture::RGBA8U:
+    case QOpenGLTexture::R16U:
+    case QOpenGLTexture::RG16U:
+    case QOpenGLTexture::RGB16U:
+    case QOpenGLTexture::RGBA16U:
+    case QOpenGLTexture::R32U:
+    case QOpenGLTexture::RG32U:
+    case QOpenGLTexture::RGB32U:
+    case QOpenGLTexture::RGBA32U:
+        return QOpenGLTexture::UInt8;
+
+    case QOpenGLTexture::R8I:
+    case QOpenGLTexture::RG8I:
+    case QOpenGLTexture::RGB8I:
+    case QOpenGLTexture::RGBA8I:
+    case QOpenGLTexture::R16I:
+    case QOpenGLTexture::RG16I:
+    case QOpenGLTexture::RGB16I:
+    case QOpenGLTexture::RGBA16I:
+    case QOpenGLTexture::R32I:
+    case QOpenGLTexture::RG32I:
+    case QOpenGLTexture::RGB32I:
+    case QOpenGLTexture::RGBA32I:
+        return QOpenGLTexture::Int8;
+
+    case QOpenGLTexture::R16F:
+    case QOpenGLTexture::RG16F:
+    case QOpenGLTexture::RGB16F:
+    case QOpenGLTexture::RGBA16F:
+        return QOpenGLTexture::Float16;
+
+    case QOpenGLTexture::R32F:
+    case QOpenGLTexture::RG32F:
+    case QOpenGLTexture::RGB32F:
+    case QOpenGLTexture::RGBA32F:
+        return QOpenGLTexture::Float32;
+
+    case QOpenGLTexture::RGB9E5:
+        return QOpenGLTexture::UInt16_RGB5A1_Rev;
+
+    case QOpenGLTexture::RG11B10F:
+        return QOpenGLTexture::UInt32_RG11B10F;
+
+    case QOpenGLTexture::RG3B2:
+        return QOpenGLTexture::UInt8_RG3B2;
+
+    case QOpenGLTexture::R5G6B5:
+        return QOpenGLTexture::UInt16_R5G6B5;
+
+    case QOpenGLTexture::RGB5A1:
+        return QOpenGLTexture::UInt16_RGB5A1;
+
+    case QOpenGLTexture::RGBA4:
+        return QOpenGLTexture::UInt16_RGBA4;
+
+    case QOpenGLTexture::RGB10A2:
+        return QOpenGLTexture::UInt32_RGB10A2;
+
+    case QOpenGLTexture::D16:
+        return QOpenGLTexture::UInt16;
+
+    case QOpenGLTexture::D24:
+    case QOpenGLTexture::D32:
+        return QOpenGLTexture::UInt32;
+
+    case QOpenGLTexture::D32F:
+        return QOpenGLTexture::Float32;
+
+    case QOpenGLTexture::D24S8:
+        return QOpenGLTexture::UInt32_D24S8;
+
+    case QOpenGLTexture::D32FS8X24:
+        return QOpenGLTexture::Float32_D32_UInt32_S8_X24;
+
+    case QOpenGLTexture::S8:
+        return QOpenGLTexture::UInt8;
+
+    case QOpenGLTexture::RGB_DXT1:
+    case QOpenGLTexture::RGBA_DXT1:
+    case QOpenGLTexture::RGBA_DXT3:
+    case QOpenGLTexture::RGBA_DXT5:
+    case QOpenGLTexture::R_ATI1N_UNorm:
+    case QOpenGLTexture::R_ATI1N_SNorm:
+    case QOpenGLTexture::RG_ATI2N_UNorm:
+    case QOpenGLTexture::RG_ATI2N_SNorm:
+    case QOpenGLTexture::RGB_BP_UNSIGNED_FLOAT:
+    case QOpenGLTexture::RGB_BP_SIGNED_FLOAT:
+    case QOpenGLTexture::RGB_BP_UNorm:
+    case QOpenGLTexture::SRGB8:
+    case QOpenGLTexture::SRGB8_Alpha8:
+    case QOpenGLTexture::SRGB_DXT1:
+    case QOpenGLTexture::SRGB_Alpha_DXT1:
+    case QOpenGLTexture::SRGB_Alpha_DXT3:
+    case QOpenGLTexture::SRGB_Alpha_DXT5:
+    case QOpenGLTexture::SRGB_BP_UNorm:
+    case QOpenGLTexture::R11_EAC_UNorm:
+    case QOpenGLTexture::R11_EAC_SNorm:
+    case QOpenGLTexture::RG11_EAC_UNorm:
+    case QOpenGLTexture::RG11_EAC_SNorm:
+    case QOpenGLTexture::RGB8_ETC2:
+    case QOpenGLTexture::SRGB8_ETC2:
+    case QOpenGLTexture::RGB8_PunchThrough_Alpha1_ETC2:
+    case QOpenGLTexture::SRGB8_PunchThrough_Alpha1_ETC2:
+    case QOpenGLTexture::RGBA8_ETC2_EAC:
+    case QOpenGLTexture::SRGB8_Alpha8_ETC2_EAC:
+    case QOpenGLTexture::RGB8_ETC1:
+    case QOpenGLTexture::RGBA_ASTC_4x4:
+    case QOpenGLTexture::RGBA_ASTC_5x4:
+    case QOpenGLTexture::RGBA_ASTC_5x5:
+    case QOpenGLTexture::RGBA_ASTC_6x5:
+    case QOpenGLTexture::RGBA_ASTC_6x6:
+    case QOpenGLTexture::RGBA_ASTC_8x5:
+    case QOpenGLTexture::RGBA_ASTC_8x6:
+    case QOpenGLTexture::RGBA_ASTC_8x8:
+    case QOpenGLTexture::RGBA_ASTC_10x5:
+    case QOpenGLTexture::RGBA_ASTC_10x6:
+    case QOpenGLTexture::RGBA_ASTC_10x8:
+    case QOpenGLTexture::RGBA_ASTC_10x10:
+    case QOpenGLTexture::RGBA_ASTC_12x10:
+    case QOpenGLTexture::RGBA_ASTC_12x12:
+    case QOpenGLTexture::SRGB8_Alpha8_ASTC_4x4:
+    case QOpenGLTexture::SRGB8_Alpha8_ASTC_5x4:
+    case QOpenGLTexture::SRGB8_Alpha8_ASTC_5x5:
+    case QOpenGLTexture::SRGB8_Alpha8_ASTC_6x5:
+    case QOpenGLTexture::SRGB8_Alpha8_ASTC_6x6:
+    case QOpenGLTexture::SRGB8_Alpha8_ASTC_8x5:
+    case QOpenGLTexture::SRGB8_Alpha8_ASTC_8x6:
+    case QOpenGLTexture::SRGB8_Alpha8_ASTC_8x8:
+    case QOpenGLTexture::SRGB8_Alpha8_ASTC_10x5:
+    case QOpenGLTexture::SRGB8_Alpha8_ASTC_10x6:
+    case QOpenGLTexture::SRGB8_Alpha8_ASTC_10x8:
+    case QOpenGLTexture::SRGB8_Alpha8_ASTC_10x10:
+    case QOpenGLTexture::SRGB8_Alpha8_ASTC_12x10:
+    case QOpenGLTexture::SRGB8_Alpha8_ASTC_12x12:
+        return QOpenGLTexture::UInt8;
+
+    case QOpenGLTexture::DepthFormat:
+        return QOpenGLTexture::UInt32;
+
+    case QOpenGLTexture::AlphaFormat:
+    case QOpenGLTexture::RGBFormat:
+    case QOpenGLTexture::RGBAFormat:
+    case QOpenGLTexture::LuminanceFormat:
+    case QOpenGLTexture::LuminanceAlphaFormat:
+        return QOpenGLTexture::UInt8;
+    }
+
+    Q_UNREACHABLE();
+    return QOpenGLTexture::NoPixelType;
+}
+
+static bool isCompressedFormat(QOpenGLTexture::TextureFormat internalFormat)
+{
+    switch (internalFormat) {
+    case QOpenGLTexture::NoFormat:
+
+    case QOpenGLTexture::R8_UNorm:
+    case QOpenGLTexture::RG8_UNorm:
+    case QOpenGLTexture::RGB8_UNorm:
+    case QOpenGLTexture::RGBA8_UNorm:
+    case QOpenGLTexture::R16_UNorm:
+    case QOpenGLTexture::RG16_UNorm:
+    case QOpenGLTexture::RGB16_UNorm:
+    case QOpenGLTexture::RGBA16_UNorm:
+    case QOpenGLTexture::R8_SNorm:
+    case QOpenGLTexture::RG8_SNorm:
+    case QOpenGLTexture::RGB8_SNorm:
+    case QOpenGLTexture::RGBA8_SNorm:
+    case QOpenGLTexture::R16_SNorm:
+    case QOpenGLTexture::RG16_SNorm:
+    case QOpenGLTexture::RGB16_SNorm:
+    case QOpenGLTexture::RGBA16_SNorm:
+    case QOpenGLTexture::R8U:
+    case QOpenGLTexture::RG8U:
+    case QOpenGLTexture::RGB8U:
+    case QOpenGLTexture::RGBA8U:
+    case QOpenGLTexture::R16U:
+    case QOpenGLTexture::RG16U:
+    case QOpenGLTexture::RGB16U:
+    case QOpenGLTexture::RGBA16U:
+    case QOpenGLTexture::R32U:
+    case QOpenGLTexture::RG32U:
+    case QOpenGLTexture::RGB32U:
+    case QOpenGLTexture::RGBA32U:
+    case QOpenGLTexture::R8I:
+    case QOpenGLTexture::RG8I:
+    case QOpenGLTexture::RGB8I:
+    case QOpenGLTexture::RGBA8I:
+    case QOpenGLTexture::R16I:
+    case QOpenGLTexture::RG16I:
+    case QOpenGLTexture::RGB16I:
+    case QOpenGLTexture::RGBA16I:
+    case QOpenGLTexture::R32I:
+    case QOpenGLTexture::RG32I:
+    case QOpenGLTexture::RGB32I:
+    case QOpenGLTexture::RGBA32I:
+    case QOpenGLTexture::R16F:
+    case QOpenGLTexture::RG16F:
+    case QOpenGLTexture::RGB16F:
+    case QOpenGLTexture::RGBA16F:
+    case QOpenGLTexture::R32F:
+    case QOpenGLTexture::RG32F:
+    case QOpenGLTexture::RGB32F:
+    case QOpenGLTexture::RGBA32F:
+    case QOpenGLTexture::RGB9E5:
+    case QOpenGLTexture::RG11B10F:
+    case QOpenGLTexture::RG3B2:
+    case QOpenGLTexture::R5G6B5:
+    case QOpenGLTexture::RGB5A1:
+    case QOpenGLTexture::RGBA4:
+    case QOpenGLTexture::RGB10A2:
+
+    case QOpenGLTexture::D16:
+    case QOpenGLTexture::D24:
+    case QOpenGLTexture::D32:
+    case QOpenGLTexture::D32F:
+
+    case QOpenGLTexture::D24S8:
+    case QOpenGLTexture::D32FS8X24:
+
+    case QOpenGLTexture::S8:
+        return false;
+
+    case QOpenGLTexture::RGB_DXT1:
+    case QOpenGLTexture::RGBA_DXT1:
+    case QOpenGLTexture::RGBA_DXT3:
+    case QOpenGLTexture::RGBA_DXT5:
+    case QOpenGLTexture::R_ATI1N_UNorm:
+    case QOpenGLTexture::R_ATI1N_SNorm:
+    case QOpenGLTexture::RG_ATI2N_UNorm:
+    case QOpenGLTexture::RG_ATI2N_SNorm:
+    case QOpenGLTexture::RGB_BP_UNSIGNED_FLOAT:
+    case QOpenGLTexture::RGB_BP_SIGNED_FLOAT:
+    case QOpenGLTexture::RGB_BP_UNorm:
+    case QOpenGLTexture::SRGB8:
+    case QOpenGLTexture::SRGB8_Alpha8:
+    case QOpenGLTexture::SRGB_DXT1:
+    case QOpenGLTexture::SRGB_Alpha_DXT1:
+    case QOpenGLTexture::SRGB_Alpha_DXT3:
+    case QOpenGLTexture::SRGB_Alpha_DXT5:
+    case QOpenGLTexture::SRGB_BP_UNorm:
+    case QOpenGLTexture::R11_EAC_UNorm:
+    case QOpenGLTexture::R11_EAC_SNorm:
+    case QOpenGLTexture::RG11_EAC_UNorm:
+    case QOpenGLTexture::RG11_EAC_SNorm:
+    case QOpenGLTexture::RGB8_ETC2:
+    case QOpenGLTexture::SRGB8_ETC2:
+    case QOpenGLTexture::RGB8_PunchThrough_Alpha1_ETC2:
+    case QOpenGLTexture::SRGB8_PunchThrough_Alpha1_ETC2:
+    case QOpenGLTexture::RGBA8_ETC2_EAC:
+    case QOpenGLTexture::SRGB8_Alpha8_ETC2_EAC:
+    case QOpenGLTexture::RGB8_ETC1:
+    case QOpenGLTexture::RGBA_ASTC_4x4:
+    case QOpenGLTexture::RGBA_ASTC_5x4:
+    case QOpenGLTexture::RGBA_ASTC_5x5:
+    case QOpenGLTexture::RGBA_ASTC_6x5:
+    case QOpenGLTexture::RGBA_ASTC_6x6:
+    case QOpenGLTexture::RGBA_ASTC_8x5:
+    case QOpenGLTexture::RGBA_ASTC_8x6:
+    case QOpenGLTexture::RGBA_ASTC_8x8:
+    case QOpenGLTexture::RGBA_ASTC_10x5:
+    case QOpenGLTexture::RGBA_ASTC_10x6:
+    case QOpenGLTexture::RGBA_ASTC_10x8:
+    case QOpenGLTexture::RGBA_ASTC_10x10:
+    case QOpenGLTexture::RGBA_ASTC_12x10:
+    case QOpenGLTexture::RGBA_ASTC_12x12:
+    case QOpenGLTexture::SRGB8_Alpha8_ASTC_4x4:
+    case QOpenGLTexture::SRGB8_Alpha8_ASTC_5x4:
+    case QOpenGLTexture::SRGB8_Alpha8_ASTC_5x5:
+    case QOpenGLTexture::SRGB8_Alpha8_ASTC_6x5:
+    case QOpenGLTexture::SRGB8_Alpha8_ASTC_6x6:
+    case QOpenGLTexture::SRGB8_Alpha8_ASTC_8x5:
+    case QOpenGLTexture::SRGB8_Alpha8_ASTC_8x6:
+    case QOpenGLTexture::SRGB8_Alpha8_ASTC_8x8:
+    case QOpenGLTexture::SRGB8_Alpha8_ASTC_10x5:
+    case QOpenGLTexture::SRGB8_Alpha8_ASTC_10x6:
+    case QOpenGLTexture::SRGB8_Alpha8_ASTC_10x8:
+    case QOpenGLTexture::SRGB8_Alpha8_ASTC_10x10:
+    case QOpenGLTexture::SRGB8_Alpha8_ASTC_12x10:
+    case QOpenGLTexture::SRGB8_Alpha8_ASTC_12x12:
+        return true;
+
+    case QOpenGLTexture::DepthFormat:
+    case QOpenGLTexture::AlphaFormat:
+    case QOpenGLTexture::RGBFormat:
+    case QOpenGLTexture::RGBAFormat:
+    case QOpenGLTexture::LuminanceFormat:
+    case QOpenGLTexture::LuminanceAlphaFormat:
+        return false;
+    }
+
+    Q_UNREACHABLE();
+    return false;
+}
+
+void QOpenGLTexturePrivate::allocateMutableStorage(QOpenGLTexture::PixelFormat pixelFormat, QOpenGLTexture::PixelType pixelType)
+{
+    // There is no way to allocate mutable storage for compressed textures in in
+    // versions older than OpenGL 3.1 and OpenGL ES 3.0, because the older specs
+    // do not mandate accepting null data pointers for glCompressedTexImage*D,
+    // unlike glTexImage*D (which in turn does not accept compressed formats).
+    if (isCompressedFormat(format)) {
+        storageAllocated = true;
+        return;
+    }
+
+    switch (target) {
+    case QOpenGLTexture::TargetBuffer:
+        // Buffer textures get their storage from an external OpenGL buffer
+        qWarning("Buffer textures do not allocate storage");
+        return;
+
+    case QOpenGLTexture::Target1D:
+        if (features.testFlag(QOpenGLTexture::Texture1D)) {
+            for (int level = 0; level < mipLevels; ++level)
+                texFuncs->glTextureImage1D(textureId, target, bindingTarget, level, format,
+                                           mipLevelSize(level, dimensions[0]),
+                                           0,
+                                           pixelFormat, pixelType, nullptr);
+        } else {
+            qWarning("1D textures are not supported");
+            return;
+        }
+        break;
+
+    case QOpenGLTexture::Target1DArray:
+        if (features.testFlag(QOpenGLTexture::Texture1D)
+                && features.testFlag(QOpenGLTexture::TextureArrays)) {
+            for (int level = 0; level < mipLevels; ++level)
+                texFuncs->glTextureImage2D(textureId, target, bindingTarget, level, format,
+                                           mipLevelSize(level, dimensions[0]),
+                                           layers,
+                                           0,
+                                           pixelFormat, pixelType, nullptr);
+        } else {
+            qWarning("1D array textures are not supported");
+            return;
+        }
+        break;
+
+    case QOpenGLTexture::Target2D:
+    case QOpenGLTexture::TargetRectangle:
+        for (int level = 0; level < mipLevels; ++level)
+            texFuncs->glTextureImage2D(textureId, target, bindingTarget, level, format,
+                                       mipLevelSize(level, dimensions[0]),
+                                       mipLevelSize(level, dimensions[1]),
+                                       0,
+                                       pixelFormat, pixelType, nullptr);
+        break;
+
+    case QOpenGLTexture::TargetCubeMap: {
+        // Cubemaps are the odd one out. We have to allocate storage for each
+        // face and miplevel using the special cubemap face targets rather than
+        // GL_TARGET_CUBEMAP.
+        const QOpenGLTexture::CubeMapFace faceTargets[] = {
+            QOpenGLTexture::CubeMapPositiveX, QOpenGLTexture::CubeMapNegativeX,
+            QOpenGLTexture::CubeMapPositiveY, QOpenGLTexture::CubeMapNegativeY,
+            QOpenGLTexture::CubeMapPositiveZ, QOpenGLTexture::CubeMapNegativeZ
+        };
+
+        for (int faceTarget = 0; faceTarget < 6; ++faceTarget) {
+            for (int level = 0; level < mipLevels; ++level) {
+                texFuncs->glTextureImage2D(textureId, faceTargets[faceTarget], bindingTarget,
+                                           level, format,
+                                           mipLevelSize(level, dimensions[0]),
+                                           mipLevelSize(level, dimensions[1]),
+                                           0,
+                                           pixelFormat, pixelType, nullptr);
+            }
+        }
+        break;
+    }
+
+    case QOpenGLTexture::Target2DArray:
+        if (features.testFlag(QOpenGLTexture::TextureArrays)) {
+            for (int level = 0; level < mipLevels; ++level)
+                texFuncs->glTextureImage3D(textureId, target, bindingTarget, level, format,
+                                           mipLevelSize(level, dimensions[0]),
+                                           mipLevelSize(level, dimensions[1]),
+                                           layers,
+                                           0,
+                                           pixelFormat, pixelType, nullptr);
+        } else {
+            qWarning("Array textures are not supported");
+            return;
+        }
+        break;
+
+    case QOpenGLTexture::TargetCubeMapArray:
+        // Cubemap arrays must specify number of layer-faces (6 * layers) as depth parameter
+        if (features.testFlag(QOpenGLTexture::TextureCubeMapArrays)) {
+            for (int level = 0; level < mipLevels; ++level)
+                texFuncs->glTextureImage3D(textureId, target, bindingTarget, level, format,
+                                           mipLevelSize(level, dimensions[0]),
+                                           mipLevelSize(level, dimensions[1]),
+                                           6 * layers,
+                                           0,
+                                           pixelFormat, pixelType, nullptr);
+        } else {
+            qWarning("Cubemap Array textures are not supported");
+            return;
+        }
+        break;
+
+    case QOpenGLTexture::Target3D:
+        if (features.testFlag(QOpenGLTexture::Texture3D)) {
+            for (int level = 0; level < mipLevels; ++level)
+                texFuncs->glTextureImage3D(textureId, target, bindingTarget, level, format,
+                                           mipLevelSize(level, dimensions[0]),
+                                           mipLevelSize(level, dimensions[1]),
+                                           mipLevelSize(level, dimensions[2]),
+                                           0,
+                                           pixelFormat, pixelType, nullptr);
+        } else {
+            qWarning("3D textures are not supported");
+            return;
+        }
+        break;
+
+    case QOpenGLTexture::Target2DMultisample:
+        if (features.testFlag(QOpenGLTexture::TextureMultisample)) {
+            texFuncs->glTextureImage2DMultisample(textureId, target, bindingTarget, samples, format,
+                                                  dimensions[0], dimensions[1],
+                                                  fixedSamplePositions);
+        } else {
+            qWarning("Multisample textures are not supported");
+            return;
+        }
+        break;
+
+    case QOpenGLTexture::Target2DMultisampleArray:
+        if (features.testFlag(QOpenGLTexture::TextureMultisample)
+                && features.testFlag(QOpenGLTexture::TextureArrays)) {
+            texFuncs->glTextureImage3DMultisample(textureId, target, bindingTarget, samples, format,
+                                                  dimensions[0], dimensions[1], layers,
+                                                  fixedSamplePositions);
+        } else {
+            qWarning("Multisample array textures are not supported");
+            return;
+        }
+        break;
+    }
+
+    storageAllocated = true;
+}
+
+void QOpenGLTexturePrivate::allocateImmutableStorage()
+{
+    switch (target) {
+    case QOpenGLTexture::TargetBuffer:
+        // Buffer textures get their storage from an external OpenGL buffer
+        qWarning("Buffer textures do not allocate storage");
+        return;
+
+    case QOpenGLTexture::Target1D:
+        if (features.testFlag(QOpenGLTexture::Texture1D)) {
+            texFuncs->glTextureStorage1D(textureId, target, bindingTarget, mipLevels, format,
+                                         dimensions[0]);
+        } else {
+            qWarning("1D textures are not supported");
+            return;
+        }
+        break;
+
+    case QOpenGLTexture::Target1DArray:
+        if (features.testFlag(QOpenGLTexture::Texture1D)
+                && features.testFlag(QOpenGLTexture::TextureArrays)) {
+            texFuncs->glTextureStorage2D(textureId, target, bindingTarget, mipLevels, format,
+                                         dimensions[0], layers);
+        } else {
+            qWarning("1D array textures are not supported");
+            return;
+        }
+        break;
+
+    case QOpenGLTexture::Target2D:
+    case QOpenGLTexture::TargetCubeMap:
+    case QOpenGLTexture::TargetRectangle:
+        texFuncs->glTextureStorage2D(textureId, target, bindingTarget, mipLevels, format,
+                                     dimensions[0], dimensions[1]);
+        break;
+
+    case QOpenGLTexture::Target2DArray:
+        if (features.testFlag(QOpenGLTexture::TextureArrays)) {
+            texFuncs->glTextureStorage3D(textureId, target, bindingTarget, mipLevels, format,
+                                         dimensions[0], dimensions[1], layers);
+        } else {
+            qWarning("Array textures are not supported");
+            return;
+        }
+        break;
+
+    case QOpenGLTexture::TargetCubeMapArray:
+        // Cubemap arrays must specify number of layer-faces (6 * layers) as depth parameter
+        if (features.testFlag(QOpenGLTexture::TextureCubeMapArrays)) {
+            texFuncs->glTextureStorage3D(textureId, target, bindingTarget, mipLevels, format,
+                                         dimensions[0], dimensions[1], 6 * layers);
+        } else {
+            qWarning("Cubemap Array textures are not supported");
+            return;
+        }
+        break;
+
+    case QOpenGLTexture::Target3D:
+        if (features.testFlag(QOpenGLTexture::Texture3D)) {
+            texFuncs->glTextureStorage3D(textureId, target, bindingTarget, mipLevels, format,
+                                         dimensions[0], dimensions[1], dimensions[2]);
+        } else {
+            qWarning("3D textures are not supported");
+            return;
+        }
+        break;
+
+    case QOpenGLTexture::Target2DMultisample:
+        if (features.testFlag(QOpenGLTexture::ImmutableMultisampleStorage)) {
+            texFuncs->glTextureStorage2DMultisample(textureId, target, bindingTarget, samples, format,
+                                                    dimensions[0], dimensions[1],
+                                                    fixedSamplePositions);
+        } else {
+            qWarning("Multisample textures are not supported");
+            return;
+        }
+        break;
+
+    case QOpenGLTexture::Target2DMultisampleArray:
+        if (features.testFlag(QOpenGLTexture::ImmutableMultisampleStorage)
+                && features.testFlag(QOpenGLTexture::TextureArrays)) {
+            texFuncs->glTextureStorage3DMultisample(textureId, target, bindingTarget, samples, format,
+                                                    dimensions[0], dimensions[1], layers,
+                                                    fixedSamplePositions);
+        } else {
+            qWarning("Multisample array textures are not supported");
+            return;
+        }
+        break;
+    }
+
+    storageAllocated = true;
+}
+
+void QOpenGLTexturePrivate::setData(int mipLevel, int layer, int layerCount, QOpenGLTexture::CubeMapFace cubeFace,
+                                    QOpenGLTexture::PixelFormat sourceFormat, QOpenGLTexture::PixelType sourceType,
+                                    const void *data, const QOpenGLPixelTransferOptions * const options)
+{
+    switch (target) {
+    case QOpenGLTexture::Target1D:
+        Q_UNUSED(layer);
+        Q_UNUSED(cubeFace);
+        Q_UNUSED(layerCount);
+        texFuncs->glTextureSubImage1D(textureId, target, bindingTarget, mipLevel,
+                                      0, mipLevelSize( mipLevel, dimensions[0] ),
+                                      sourceFormat, sourceType, data, options);
+        break;
+
+    case QOpenGLTexture::Target1DArray:
+        Q_UNUSED(cubeFace);
+        texFuncs->glTextureSubImage2D(textureId, target, bindingTarget, mipLevel,
+                                      0, layer,
+                                      mipLevelSize(mipLevel, dimensions[0]),
+                                      layerCount,
+                                      sourceFormat, sourceType, data, options);
+        break;
+
+    case QOpenGLTexture::Target2D:
+        Q_UNUSED(layer);
+        Q_UNUSED(cubeFace);
+        Q_UNUSED(layerCount);
+        texFuncs->glTextureSubImage2D(textureId, target, bindingTarget, mipLevel,
+                                      0, 0,
+                                      mipLevelSize(mipLevel, dimensions[0]),
+                                      mipLevelSize(mipLevel, dimensions[1]),
+                                      sourceFormat, sourceType, data, options);
+        break;
+
+    case QOpenGLTexture::Target2DArray:
+        Q_UNUSED(cubeFace);
+        texFuncs->glTextureSubImage3D(textureId, target, bindingTarget, mipLevel,
+                                      0, 0, layer,
+                                      mipLevelSize(mipLevel, dimensions[0]),
+                                      mipLevelSize(mipLevel, dimensions[1]),
+                                      layerCount,
+                                      sourceFormat, sourceType, data, options);
+        break;
+
+    case QOpenGLTexture::Target3D:
+        Q_UNUSED(cubeFace);
+        Q_UNUSED(layerCount);
+        texFuncs->glTextureSubImage3D(textureId, target, bindingTarget, mipLevel,
+                                      0, 0, layer,
+                                      mipLevelSize(mipLevel, dimensions[0]),
+                                      mipLevelSize(mipLevel, dimensions[1]),
+                                      mipLevelSize(mipLevel, dimensions[2]),
+                                      sourceFormat, sourceType, data, options);
+        break;
+
+    case QOpenGLTexture::TargetCubeMap:
+        Q_UNUSED(layer);
+        Q_UNUSED(layerCount);
+        texFuncs->glTextureSubImage2D(textureId, cubeFace, bindingTarget, mipLevel,
+                                      0, 0,
+                                      mipLevelSize(mipLevel, dimensions[0]),
+                                      mipLevelSize(mipLevel, dimensions[1]),
+                                      sourceFormat, sourceType, data, options);
+        break;
+
+    case QOpenGLTexture::TargetCubeMapArray: {
+        int faceIndex = cubeFace - QOpenGLTexture::CubeMapPositiveX;
+        int layerFace = 6 * layer + faceIndex;
+        texFuncs->glTextureSubImage3D(textureId, target, bindingTarget, mipLevel,
+                                      0, 0, layerFace,
+                                      mipLevelSize(mipLevel, dimensions[0]),
+                                      mipLevelSize(mipLevel, dimensions[1]),
+                                      layerCount,
+                                      sourceFormat, sourceType, data, options);
+        break;
+    }
+
+    case QOpenGLTexture::TargetRectangle:
+        Q_UNUSED(mipLevel);
+        Q_UNUSED(layer);
+        Q_UNUSED(cubeFace);
+        Q_UNUSED(layerCount);
+        texFuncs->glTextureSubImage2D(textureId, target, bindingTarget, 0,
+                                      0, 0,
+                                      dimensions[0],
+                                      dimensions[1],
+                                      sourceFormat, sourceType, data, options);
+        break;
+
+    case QOpenGLTexture::Target2DMultisample:
+    case QOpenGLTexture::Target2DMultisampleArray:
+    case QOpenGLTexture::TargetBuffer:
+        // We don't upload pixel data for these targets
+        qWarning("QOpenGLTexture::setData(): Texture target does not support pixel data upload");
+        break;
+    }
+
+    // If requested perform automatic mip map generation
+    if (mipLevel == 0 && autoGenerateMipMaps && mipLevels > 1) {
+        Q_Q(QOpenGLTexture);
+        q->generateMipMaps();
+    }
+}
+
+void QOpenGLTexturePrivate::setData(int xOffset, int yOffset, int zOffset, int width, int height, int depth,
+                                    int mipLevel, int layer, int layerCount, QOpenGLTexture::CubeMapFace cubeFace,
+                                    QOpenGLTexture::PixelFormat sourceFormat, QOpenGLTexture::PixelType sourceType,
+                                    const void *data, const QOpenGLPixelTransferOptions * const options)
+{
+    switch (target) {
+    case QOpenGLTexture::Target1D:
+        Q_UNUSED(layer);
+        Q_UNUSED(cubeFace);
+        Q_UNUSED(layerCount);
+        Q_UNUSED(yOffset);
+        Q_UNUSED(zOffset);
+        Q_UNUSED(height);
+        Q_UNUSED(depth);
+        texFuncs->glTextureSubImage1D(textureId, target, bindingTarget, mipLevel,
+                                      xOffset, width,
+                                      sourceFormat, sourceType, data, options);
+        break;
+
+    case QOpenGLTexture::Target1DArray:
+        Q_UNUSED(cubeFace);
+        Q_UNUSED(yOffset);
+        Q_UNUSED(zOffset);
+        Q_UNUSED(height);
+        Q_UNUSED(depth);
+        texFuncs->glTextureSubImage2D(textureId, target, bindingTarget, mipLevel,
+                                      xOffset, layer,
+                                      width,
+                                      layerCount,
+                                      sourceFormat, sourceType, data, options);
+        break;
+
+    case QOpenGLTexture::Target2D:
+        Q_UNUSED(layer);
+        Q_UNUSED(cubeFace);
+        Q_UNUSED(layerCount);
+        Q_UNUSED(zOffset);
+        Q_UNUSED(depth);
+        texFuncs->glTextureSubImage2D(textureId, target, bindingTarget, mipLevel,
+                                      xOffset, yOffset,
+                                      width, height,
+                                      sourceFormat, sourceType, data, options);
+        break;
+
+    case QOpenGLTexture::Target2DArray:
+        Q_UNUSED(cubeFace);
+        Q_UNUSED(zOffset);
+        Q_UNUSED(depth);
+        texFuncs->glTextureSubImage3D(textureId, target, bindingTarget, mipLevel,
+                                      xOffset, yOffset, layer,
+                                      width, height, layerCount,
+                                      sourceFormat, sourceType, data, options);
+        break;
+
+    case QOpenGLTexture::Target3D:
+        Q_UNUSED(cubeFace);
+        Q_UNUSED(layerCount);
+        texFuncs->glTextureSubImage3D(textureId, target, bindingTarget, mipLevel,
+                                      xOffset, yOffset, zOffset,
+                                      width, height, depth,
+                                      sourceFormat, sourceType, data, options);
+        break;
+
+    case QOpenGLTexture::TargetCubeMap:
+        Q_UNUSED(layer);
+        Q_UNUSED(layerCount);
+        Q_UNUSED(zOffset);
+        Q_UNUSED(depth);
+        texFuncs->glTextureSubImage2D(textureId, cubeFace, bindingTarget, mipLevel,
+                                      xOffset, yOffset,
+                                      width, height,
+                                      sourceFormat, sourceType, data, options);
+        break;
+
+    case QOpenGLTexture::TargetCubeMapArray: {
+        Q_UNUSED(zOffset);
+        Q_UNUSED(depth);
+        int faceIndex = cubeFace - QOpenGLTexture::CubeMapPositiveX;
+        int layerFace = 6 * layer + faceIndex;
+        texFuncs->glTextureSubImage3D(textureId, target, bindingTarget, mipLevel,
+                                      xOffset, yOffset, layerFace,
+                                      width, height,
+                                      layerCount,
+                                      sourceFormat, sourceType, data, options);
+        break;
+    }
+
+    case QOpenGLTexture::TargetRectangle:
+        Q_UNUSED(mipLevel);
+        Q_UNUSED(layer);
+        Q_UNUSED(cubeFace);
+        Q_UNUSED(layerCount);
+        Q_UNUSED(zOffset);
+        Q_UNUSED(depth);
+        texFuncs->glTextureSubImage2D(textureId, target, bindingTarget, 0,
+                                      xOffset, yOffset,
+                                      width, height,
+                                      sourceFormat, sourceType, data, options);
+        break;
+
+    case QOpenGLTexture::Target2DMultisample:
+    case QOpenGLTexture::Target2DMultisampleArray:
+    case QOpenGLTexture::TargetBuffer:
+        // We don't upload pixel data for these targets
+        qWarning("QOpenGLTexture::setData(): Texture target does not support pixel data upload");
+        break;
+    }
+
+    // If requested perform automatic mip map generation
+    if (mipLevel == 0 && autoGenerateMipMaps && mipLevels > 1) {
+        Q_Q(QOpenGLTexture);
+        q->generateMipMaps();
+    }
+}
+
+
+void QOpenGLTexturePrivate::setCompressedData(int mipLevel, int layer, int layerCount,
+                                              QOpenGLTexture::CubeMapFace cubeFace,
+                                              int dataSize, const void *data,
+                                              const QOpenGLPixelTransferOptions * const options)
+{
+    if (!isCompressedFormat(format)) {
+        qWarning("Cannot set compressed data for non-compressed format 0x%x", format);
+        return;
+    }
+
+    const bool needsFullSpec = !isUsingImmutableStorage(); // was allocateStorage() a no-op?
+
+    switch (target) {
+    case QOpenGLTexture::Target1D:
+        Q_UNUSED(layer);
+        Q_UNUSED(cubeFace);
+        Q_UNUSED(layerCount);
+        if (needsFullSpec) {
+            texFuncs->glCompressedTextureImage1D(textureId, target, bindingTarget, mipLevel,
+                                                 format,
+                                                 mipLevelSize(mipLevel, dimensions[0]),
+                                                 0, dataSize, data, options);
+        } else {
+            texFuncs->glCompressedTextureSubImage1D(textureId, target, bindingTarget, mipLevel,
+                                                    0, mipLevelSize( mipLevel, dimensions[0] ),
+                                                    format, dataSize, data, options);
+        }
+        break;
+
+    case QOpenGLTexture::Target1DArray:
+        Q_UNUSED(cubeFace);
+        if (!needsFullSpec) {
+            texFuncs->glCompressedTextureSubImage2D(textureId, target, bindingTarget, mipLevel,
+                                                    0, layer,
+                                                    mipLevelSize(mipLevel, dimensions[0]),
+                                                    layerCount,
+                                                    format, dataSize, data, options);
+        }
+        break;
+
+    case QOpenGLTexture::Target2D:
+        Q_UNUSED(layer);
+        Q_UNUSED(cubeFace);
+        Q_UNUSED(layerCount);
+        if (needsFullSpec) {
+            texFuncs->glCompressedTextureImage2D(textureId, target, bindingTarget, mipLevel,
+                                                 format,
+                                                 mipLevelSize(mipLevel, dimensions[0]),
+                                                 mipLevelSize(mipLevel, dimensions[1]),
+                                                 0, dataSize, data, options);
+        } else {
+            texFuncs->glCompressedTextureSubImage2D(textureId, target, bindingTarget, mipLevel,
+                                                    0, 0,
+                                                    mipLevelSize(mipLevel, dimensions[0]),
+                                                    mipLevelSize(mipLevel, dimensions[1]),
+                                                    format, dataSize, data, options);
+        }
+        break;
+
+    case QOpenGLTexture::Target2DArray:
+        Q_UNUSED(cubeFace);
+        if (!needsFullSpec) {
+            texFuncs->glCompressedTextureSubImage3D(textureId, target, bindingTarget, mipLevel,
+                                                    0, 0, layer,
+                                                    mipLevelSize(mipLevel, dimensions[0]),
+                                                    mipLevelSize(mipLevel, dimensions[1]),
+                                                    layerCount,
+                                                    format, dataSize, data, options);
+        }
+        break;
+
+    case QOpenGLTexture::Target3D:
+        Q_UNUSED(cubeFace);
+        Q_UNUSED(layerCount);
+        if (needsFullSpec) {
+            texFuncs->glCompressedTextureImage3D(textureId, target, bindingTarget, mipLevel,
+                                                 format,
+                                                 mipLevelSize(mipLevel, dimensions[0]),
+                                                 mipLevelSize(mipLevel, dimensions[1]),
+                                                 mipLevelSize(mipLevel, dimensions[2]),
+                                                 0, dataSize, data, options);
+        } else {
+            texFuncs->glCompressedTextureSubImage3D(textureId, target, bindingTarget, mipLevel,
+                                                    0, 0, layer,
+                                                    mipLevelSize(mipLevel, dimensions[0]),
+                                                    mipLevelSize(mipLevel, dimensions[1]),
+                                                    mipLevelSize(mipLevel, dimensions[2]),
+                                                    format, dataSize, data, options);
+        }
+        break;
+
+    case QOpenGLTexture::TargetCubeMap:
+        Q_UNUSED(layer);
+        Q_UNUSED(layerCount);
+        if (needsFullSpec) {
+            texFuncs->glCompressedTextureImage2D(textureId, cubeFace, bindingTarget, mipLevel,
+                                                 format,
+                                                 mipLevelSize(mipLevel, dimensions[0]),
+                                                 mipLevelSize(mipLevel, dimensions[1]),
+                                                 0, dataSize, data, options);
+        } else {
+            texFuncs->glCompressedTextureSubImage2D(textureId, cubeFace, bindingTarget, mipLevel,
+                                                    0, 0,
+                                                    mipLevelSize(mipLevel, dimensions[0]),
+                                                    mipLevelSize(mipLevel, dimensions[1]),
+                                                    format, dataSize, data, options);
+        }
+        break;
+
+    case QOpenGLTexture::TargetCubeMapArray: {
+        int faceIndex = cubeFace - QOpenGLTexture::CubeMapPositiveX;
+        int layerFace = 6 * layer + faceIndex;
+        if (!needsFullSpec) {
+            texFuncs->glCompressedTextureSubImage3D(textureId, target, bindingTarget, mipLevel,
+                                                    0, 0, layerFace,
+                                                    mipLevelSize(mipLevel, dimensions[0]),
+                                                    mipLevelSize(mipLevel, dimensions[1]),
+                                                    layerCount,
+                                                    format, dataSize, data, options);
+        }
+        break;
+    }
+
+    case QOpenGLTexture::TargetRectangle:
+    case QOpenGLTexture::Target2DMultisample:
+    case QOpenGLTexture::Target2DMultisampleArray:
+    case QOpenGLTexture::TargetBuffer:
+        // We don't upload pixel data for these targets
+        qWarning("QOpenGLTexture::setCompressedData(): Texture target does not support pixel data upload");
+        break;
+    }
+
+    // If requested perform automatic mip map generation
+    if (mipLevel == 0 && autoGenerateMipMaps && mipLevels > 1) {
+        Q_Q(QOpenGLTexture);
+        q->generateMipMaps();
+    }
+}
+
+void QOpenGLTexturePrivate::setWrapMode(QOpenGLTexture::WrapMode mode)
+{
+    switch (target) {
+    case QOpenGLTexture::Target1D:
+    case QOpenGLTexture::Target1DArray:
+    case QOpenGLTexture::TargetBuffer:
+        wrapModes[0] = mode;
+        texFuncs->glTextureParameteri(textureId, target, bindingTarget, GL_TEXTURE_WRAP_S, mode);
+        break;
+
+    case QOpenGLTexture::Target2D:
+    case QOpenGLTexture::Target2DArray:
+    case QOpenGLTexture::TargetCubeMap:
+    case QOpenGLTexture::TargetCubeMapArray:
+    case QOpenGLTexture::Target2DMultisample:
+    case QOpenGLTexture::Target2DMultisampleArray:
+    case QOpenGLTexture::TargetRectangle:
+        wrapModes[0] = wrapModes[1] = mode;
+        texFuncs->glTextureParameteri(textureId, target, bindingTarget, GL_TEXTURE_WRAP_S, mode);
+        texFuncs->glTextureParameteri(textureId, target, bindingTarget, GL_TEXTURE_WRAP_T, mode);
+        break;
+
+    case QOpenGLTexture::Target3D:
+        wrapModes[0] = wrapModes[1] = wrapModes[2] = mode;
+        texFuncs->glTextureParameteri(textureId, target, bindingTarget, GL_TEXTURE_WRAP_S, mode);
+        texFuncs->glTextureParameteri(textureId, target, bindingTarget, GL_TEXTURE_WRAP_T, mode);
+        texFuncs->glTextureParameteri(textureId, target, bindingTarget, GL_TEXTURE_WRAP_R, mode);
+        break;
+    }
+}
+
+void QOpenGLTexturePrivate::setWrapMode(QOpenGLTexture::CoordinateDirection direction, QOpenGLTexture::WrapMode mode)
+{
+    switch (target) {
+    case QOpenGLTexture::Target1D:
+    case QOpenGLTexture::Target1DArray:
+    case QOpenGLTexture::TargetBuffer:
+        switch (direction) {
+        case QOpenGLTexture::DirectionS:
+            wrapModes[0] = mode;
+            texFuncs->glTextureParameteri(textureId, target, bindingTarget, GL_TEXTURE_WRAP_S, mode);
+            break;
+
+        case QOpenGLTexture::DirectionT:
+        case QOpenGLTexture::DirectionR:
+            qWarning("QOpenGLTexture::setWrapMode() direction not valid for this texture target");
+            break;
+        }
+        break;
+
+    case QOpenGLTexture::Target2D:
+    case QOpenGLTexture::Target2DArray:
+    case QOpenGLTexture::TargetCubeMap:
+    case QOpenGLTexture::TargetCubeMapArray:
+    case QOpenGLTexture::Target2DMultisample:
+    case QOpenGLTexture::Target2DMultisampleArray:
+    case QOpenGLTexture::TargetRectangle:
+        switch (direction) {
+        case QOpenGLTexture::DirectionS:
+            wrapModes[0] = mode;
+            texFuncs->glTextureParameteri(textureId, target, bindingTarget, GL_TEXTURE_WRAP_S, mode);
+            break;
+
+        case QOpenGLTexture::DirectionT:
+            wrapModes[1] = mode;
+            texFuncs->glTextureParameteri(textureId, target, bindingTarget, GL_TEXTURE_WRAP_T, mode);
+            break;
+
+        case QOpenGLTexture::DirectionR:
+            qWarning("QOpenGLTexture::setWrapMode() direction not valid for this texture target");
+            break;
+        }
+        break;
+
+    case QOpenGLTexture::Target3D:
+        switch (direction) {
+        case QOpenGLTexture::DirectionS:
+            wrapModes[0] = mode;
+            texFuncs->glTextureParameteri(textureId, target, bindingTarget, direction, mode);
+            break;
+
+        case QOpenGLTexture::DirectionT:
+            wrapModes[1] = mode;
+            texFuncs->glTextureParameteri(textureId, target, bindingTarget, direction, mode);
+            break;
+
+        case QOpenGLTexture::DirectionR:
+            wrapModes[2] = mode;
+            texFuncs->glTextureParameteri(textureId, target, bindingTarget, direction, mode);
+            break;
+        }
+        break;
+    }
+}
+
+QOpenGLTexture::WrapMode QOpenGLTexturePrivate::wrapMode(QOpenGLTexture::CoordinateDirection direction) const
+{
+    switch (target) {
+    case QOpenGLTexture::Target1D:
+    case QOpenGLTexture::Target1DArray:
+    case QOpenGLTexture::TargetBuffer:
+        switch (direction) {
+        case QOpenGLTexture::DirectionS:
+            return wrapModes[0];
+
+        case QOpenGLTexture::DirectionT:
+        case QOpenGLTexture::DirectionR:
+            qWarning("QOpenGLTexture::wrapMode() direction not valid for this texture target");
+            return QOpenGLTexture::Repeat;
+        }
+        break;
+
+    case QOpenGLTexture::Target2D:
+    case QOpenGLTexture::Target2DArray:
+    case QOpenGLTexture::TargetCubeMap:
+    case QOpenGLTexture::TargetCubeMapArray:
+    case QOpenGLTexture::Target2DMultisample:
+    case QOpenGLTexture::Target2DMultisampleArray:
+    case QOpenGLTexture::TargetRectangle:
+        switch (direction) {
+        case QOpenGLTexture::DirectionS:
+            return wrapModes[0];
+
+        case QOpenGLTexture::DirectionT:
+            return wrapModes[1];
+
+        case QOpenGLTexture::DirectionR:
+            qWarning("QOpenGLTexture::wrapMode() direction not valid for this texture target");
+            return QOpenGLTexture::Repeat;
+        }
+        break;
+
+    case QOpenGLTexture::Target3D:
+        switch (direction) {
+        case QOpenGLTexture::DirectionS:
+            return wrapModes[0];
+
+        case QOpenGLTexture::DirectionT:
+            return wrapModes[1];
+
+        case QOpenGLTexture::DirectionR:
+            return wrapModes[2];
+        }
+        break;
+    }
+    // Should never get here
+    Q_ASSERT(false);
+    return QOpenGLTexture::Repeat;
+}
+
+QOpenGLTexture *QOpenGLTexturePrivate::createTextureView(QOpenGLTexture::Target viewTarget,
+                                                         QOpenGLTexture::TextureFormat viewFormat,
+                                                         int minimumMipmapLevel, int maximumMipmapLevel,
+                                                         int minimumLayer, int maximumLayer) const
+{
+    // Do sanity checks - see http://www.opengl.org/wiki/GLAPI/glTextureView
+
+    // Check the targets are compatible
+    bool viewTargetCompatible = false;
+    switch (target) {
+    case QOpenGLTexture::Target1D:
+    case QOpenGLTexture::Target1DArray:
+        viewTargetCompatible = (viewTarget == QOpenGLTexture::Target1D
+                             || viewTarget == QOpenGLTexture::Target1DArray);
+        break;
+
+
+    case QOpenGLTexture::Target2D:
+    case QOpenGLTexture::Target2DArray:
+        viewTargetCompatible = (viewTarget == QOpenGLTexture::Target2D
+                             || viewTarget == QOpenGLTexture::Target2DArray);
+        break;
+
+    case QOpenGLTexture::Target3D:
+        viewTargetCompatible = (viewTarget == QOpenGLTexture::Target3D);
+        break;
+
+    case QOpenGLTexture::TargetCubeMap:
+    case QOpenGLTexture::TargetCubeMapArray:
+        viewTargetCompatible = (viewTarget == QOpenGLTexture::TargetCubeMap
+                             || viewTarget == QOpenGLTexture::Target2D
+                             || viewTarget == QOpenGLTexture::Target2DArray
+                             || viewTarget == QOpenGLTexture::TargetCubeMapArray);
+        break;
+
+    case QOpenGLTexture::Target2DMultisample:
+    case QOpenGLTexture::Target2DMultisampleArray:
+        viewTargetCompatible = (viewTarget == QOpenGLTexture::Target2DMultisample
+                             || viewTarget == QOpenGLTexture::Target2DMultisampleArray);
+        break;
+
+    case QOpenGLTexture::TargetRectangle:
+        viewTargetCompatible = (viewTarget == QOpenGLTexture::TargetRectangle);
+        break;
+
+    case QOpenGLTexture::TargetBuffer:
+        // Cannot be used with texture views
+        break;
+    }
+
+    if (!viewTargetCompatible) {
+        qWarning("QOpenGLTexture::createTextureView(): Incompatible source and view targets");
+        return nullptr;
+    }
+
+    // Check the formats are compatible
+    bool viewFormatCompatible = false;
+    switch (formatClass) {
+    case QOpenGLTexture::NoFormatClass:
+        break;
+
+    case QOpenGLTexture::FormatClass_128Bit:
+        viewFormatCompatible = (viewFormat == QOpenGLTexture::RGBA32F
+                             || viewFormat == QOpenGLTexture::RGBA32U
+                             || viewFormat == QOpenGLTexture::RGBA32I);
+        break;
+
+    case QOpenGLTexture::FormatClass_96Bit:
+        viewFormatCompatible = (viewFormat == QOpenGLTexture::RGB32F
+                             || viewFormat == QOpenGLTexture::RGB32U
+                             || viewFormat == QOpenGLTexture::RGB32I);
+        break;
+
+    case QOpenGLTexture::FormatClass_64Bit:
+        viewFormatCompatible = (viewFormat == QOpenGLTexture::RGBA16F
+                             || viewFormat == QOpenGLTexture::RG32F
+                             || viewFormat == QOpenGLTexture::RGBA16U
+                             || viewFormat == QOpenGLTexture::RG32U
+                             || viewFormat == QOpenGLTexture::RGBA16I
+                             || viewFormat == QOpenGLTexture::RG32I
+                             || viewFormat == QOpenGLTexture::RGBA16_UNorm
+                             || viewFormat == QOpenGLTexture::RGBA16_SNorm);
+        break;
+
+    case QOpenGLTexture::FormatClass_48Bit:
+        viewFormatCompatible = (viewFormat == QOpenGLTexture::RGB16_UNorm
+                             || viewFormat == QOpenGLTexture::RGB16_SNorm
+                             || viewFormat == QOpenGLTexture::RGB16F
+                             || viewFormat == QOpenGLTexture::RGB16U
+                             || viewFormat == QOpenGLTexture::RGB16I);
+        break;
+
+    case QOpenGLTexture::FormatClass_32Bit:
+        viewFormatCompatible = (viewFormat == QOpenGLTexture::RG16F
+                             || viewFormat == QOpenGLTexture::RG11B10F
+                             || viewFormat == QOpenGLTexture::R32F
+                             || viewFormat == QOpenGLTexture::RGB10A2
+                             || viewFormat == QOpenGLTexture::RGBA8U
+                             || viewFormat == QOpenGLTexture::RG16U
+                             || viewFormat == QOpenGLTexture::R32U
+                             || viewFormat == QOpenGLTexture::RGBA8I
+                             || viewFormat == QOpenGLTexture::RG16I
+                             || viewFormat == QOpenGLTexture::R32I
+                             || viewFormat == QOpenGLTexture::RGBA8_UNorm
+                             || viewFormat == QOpenGLTexture::RG16_UNorm
+                             || viewFormat == QOpenGLTexture::RGBA8_SNorm
+                             || viewFormat == QOpenGLTexture::RG16_SNorm
+                             || viewFormat == QOpenGLTexture::SRGB8_Alpha8
+                             || viewFormat == QOpenGLTexture::RGB9E5);
+        break;
+
+    case QOpenGLTexture::FormatClass_24Bit:
+        viewFormatCompatible = (viewFormat == QOpenGLTexture::RGB8_UNorm
+                             || viewFormat == QOpenGLTexture::RGB8_SNorm
+                             || viewFormat == QOpenGLTexture::SRGB8
+                             || viewFormat == QOpenGLTexture::RGB8U
+                             || viewFormat == QOpenGLTexture::RGB8I);
+        break;
+
+    case QOpenGLTexture::FormatClass_16Bit:
+        viewFormatCompatible = (viewFormat == QOpenGLTexture::R16F
+                             || viewFormat == QOpenGLTexture::RG8U
+                             || viewFormat == QOpenGLTexture::R16U
+                             || viewFormat == QOpenGLTexture::RG8I
+                             || viewFormat == QOpenGLTexture::R16I
+                             || viewFormat == QOpenGLTexture::RG8_UNorm
+                             || viewFormat == QOpenGLTexture::R16_UNorm
+                             || viewFormat == QOpenGLTexture::RG8_SNorm
+                             || viewFormat == QOpenGLTexture::R16_SNorm);
+        break;
+
+    case QOpenGLTexture::FormatClass_8Bit:
+        viewFormatCompatible = (viewFormat == QOpenGLTexture::R8U
+                             || viewFormat == QOpenGLTexture::R8I
+                             || viewFormat == QOpenGLTexture::R8_UNorm
+                             || viewFormat == QOpenGLTexture::R8_SNorm);
+        break;
+
+    case QOpenGLTexture::FormatClass_RGTC1_R:
+        viewFormatCompatible = (viewFormat == QOpenGLTexture::R_ATI1N_UNorm
+                             || viewFormat == QOpenGLTexture::R_ATI1N_SNorm);
+        break;
+
+    case QOpenGLTexture::FormatClass_RGTC2_RG:
+        viewFormatCompatible = (viewFormat == QOpenGLTexture::RG_ATI2N_UNorm
+                             || viewFormat == QOpenGLTexture::RG_ATI2N_SNorm);
+        break;
+
+    case QOpenGLTexture::FormatClass_BPTC_Unorm:
+        viewFormatCompatible = (viewFormat == QOpenGLTexture::RGB_BP_UNorm
+                             || viewFormat == QOpenGLTexture::SRGB_BP_UNorm);
+        break;
+
+    case QOpenGLTexture::FormatClass_BPTC_Float:
+        viewFormatCompatible = (viewFormat == QOpenGLTexture::RGB_BP_UNSIGNED_FLOAT
+                             || viewFormat == QOpenGLTexture::RGB_BP_SIGNED_FLOAT);
+        break;
+
+    case QOpenGLTexture::FormatClass_S3TC_DXT1_RGB:
+        viewFormatCompatible = (viewFormat == QOpenGLTexture::RGB_DXT1
+                             || viewFormat == QOpenGLTexture::SRGB_DXT1);
+        break;
+
+    case QOpenGLTexture::FormatClass_S3TC_DXT1_RGBA:
+        viewFormatCompatible = (viewFormat == QOpenGLTexture::RGBA_DXT1
+                             || viewFormat == QOpenGLTexture::SRGB_Alpha_DXT1);
+        break;
+
+    case QOpenGLTexture::FormatClass_S3TC_DXT3_RGBA:
+        viewFormatCompatible = (viewFormat == QOpenGLTexture::RGBA_DXT3
+                             || viewFormat == QOpenGLTexture::SRGB_Alpha_DXT3);
+        break;
+
+    case QOpenGLTexture::FormatClass_S3TC_DXT5_RGBA:
+        viewFormatCompatible = (viewFormat == QOpenGLTexture::RGBA_DXT5
+                             || viewFormat == QOpenGLTexture::SRGB_Alpha_DXT5);
+        break;
+
+    case QOpenGLTexture::FormatClass_Unique:
+        viewFormatCompatible = (viewFormat == format);
+        break;
+    }
+
+    if (!viewFormatCompatible) {
+        qWarning("QOpenGLTexture::createTextureView(): Incompatible source and view formats");
+        return nullptr;
+    }
+
+
+    // Create a view
+    QOpenGLTexture *view = new QOpenGLTexture(viewTarget);
+    view->setFormat(viewFormat);
+    view->create();
+    view->d_ptr->textureView = true;
+    texFuncs->glTextureView(view->textureId(), viewTarget, textureId, viewFormat,
+                            minimumMipmapLevel, maximumMipmapLevel - minimumMipmapLevel + 1,
+                            minimumLayer, maximumLayer - minimumLayer + 1);
+    return view;
+}
+
+
+/*!
+    \class QOpenGLTexture
+    \inmodule QtGui
+    \since 5.2
+    \wrapper
+    \brief The QOpenGLTexture class encapsulates an OpenGL texture object.
+
+    QOpenGLTexture makes it easy to work with OpenGL textures and the myriad features
+    and targets that they offer depending upon the capabilities of your OpenGL implementation.
+
+    The typical usage pattern for QOpenGLTexture is
+    \list
+        \li Instantiate the object specifying the texture target type
+        \li Set properties that affect the storage requirements e.g. storage format, dimensions
+        \li Allocate the server-side storage
+        \li Optionally upload pixel data
+        \li Optionally set any additional properties e.g. filtering and border options
+        \li Render with texture or render to texture
+    \endlist
+
+    In the common case of simply using a QImage as the source of texture pixel data
+    most of the above steps are performed automatically.
+
+    \code
+    // Prepare texture
+    QOpenGLTexture *texture = new QOpenGLTexture(QImage(fileName).mirrored());
+    texture->setMinificationFilter(QOpenGLTexture::LinearMipMapLinear);
+    texture->setMagnificationFilter(QOpenGLTexture::Linear);
+    ...
+    // Render with texture
+    texture->bind();
+    glDrawArrays(...);
+    \endcode
+
+    Note that the QImage is mirrored vertically to account for the fact that
+    OpenGL and QImage use opposite directions for the y axis. Another option
+    would be to transform your texture coordinates.
+*/
+
+/*!
+    \enum QOpenGLTexture::Filter
+    This enum defines the filtering parameters for a QOpenGLTexture object.
+    \value Nearest Equivalent to GL_NEAREST
+    \value Linear Equivalent to GL_LINEAR
+    \value NearestMipMapNearest Equivalent to GL_NEAREST_MIPMAP_NEAREST
+    \value NearestMipMapLinear Equivalent to GL_NEAREST_MIPMAP_LINEAR
+    \value LinearMipMapNearest Equivalent to GL_LINEAR_MIPMAP_NEAREST
+    \value LinearMipMapLinear Equivalent to GL_LINEAR_MIPMAP_LINEAR
+*/
+
+/*!
+    \enum QOpenGLTexture::Target
+    This enum defines the texture target of a QOpenGLTexture object.
+    For more information on creating array textures, see \l{Array Texture}.
+
+    \value Target1D A 1-dimensional texture.
+           Equivalent to GL_TEXTURE_1D.
+    \value Target1DArray An array of 1-dimensional textures.
+           Equivalent to GL_TEXTURE_1D_ARRAY
+    \value Target2D A 2-dimensional texture.
+           Equivalent to GL_TEXTURE_2D
+    \value Target2DArray An array of 2-dimensional textures.
+           Equivalent to GL_TEXTURE_2D_ARRAY
+    \value Target3D A 3-dimensional texture.
+           Equivalent to GL_TEXTURE_3D
+    \value TargetCubeMap A cubemap texture.
+           Equivalent to GL_TEXTURE_CUBE_MAP
+    \value TargetCubeMapArray An array of cubemap textures.
+           Equivalent to GL_TEXTURE_CUBE_MAP_ARRAY
+    \value Target2DMultisample A 2-dimensional texture with multisample support.
+           Equivalent to GL_TEXTURE_2D_MULTISAMPLE
+    \value Target2DMultisampleArray An array of 2-dimensional textures with multisample support.
+           Equivalent to GL_TEXTURE_2D_MULTISAMPLE_ARRAY
+    \value TargetRectangle A rectangular 2-dimensional texture.
+           Equivalent to GL_TEXTURE_RECTANGLE
+    \value TargetBuffer A texture with data from an OpenGL buffer object.
+           Equivalent to GL_TEXTURE_BUFFER
+*/
+
+/*!
+    \enum QOpenGLTexture::BindingTarget
+    This enum defines the possible binding targets of texture units.
+
+    \value BindingTarget1D Equivalent to GL_TEXTURE_BINDING_1D
+    \value BindingTarget1DArray Equivalent to GL_TEXTURE_BINDING_1D_ARRAY
+    \value BindingTarget2D Equivalent to GL_TEXTURE_BINDING_2D
+    \value BindingTarget2DArray Equivalent to GL_TEXTURE_BINDING_2D_ARRAY
+    \value BindingTarget3D Equivalent to GL_TEXTURE_BINDING_3D
+    \value BindingTargetCubeMap Equivalent to GL_TEXTURE_BINDING_CUBE_MAP
+    \value BindingTargetCubeMapArray Equivalent to GL_TEXTURE_BINDING_CUBE_MAP_ARRAY
+    \value BindingTarget2DMultisample Equivalent to GL_TEXTURE_BINDING_2D_MULTISAMPLE
+    \value BindingTarget2DMultisampleArray Equivalent to GL_TEXTURE_BINDING_2D_MULTISAMPLE_ARRAY
+    \value BindingTargetRectangle Equivalent to GL_TEXTURE_BINDING_RECTANGLE
+    \value BindingTargetBuffer Equivalent to GL_TEXTURE_BINDING_BUFFER
+*/
+
+/*!
+    \enum QOpenGLTexture::MipMapGeneration
+    This enum defines the options to control mipmap generation.
+
+    \value GenerateMipMaps Mipmaps should be generated
+    \value DontGenerateMipMaps Mipmaps should not be generated
+*/
+
+/*!
+    \enum QOpenGLTexture::TextureUnitReset
+    This enum defines options ot control texture unit activation.
+
+    \value ResetTextureUnit The previous active texture unit will be reset
+    \value DontResetTextureUnit The previous active texture unit will not be rest
+*/
+
+/*!
+    \enum QOpenGLTexture::TextureFormat
+    This enum defines the possible texture formats. Depending upon your OpenGL
+    implementation only a subset of these may be supported.
+
+    \value NoFormat Equivalent to GL_NONE
+
+    \value R8_UNorm Equivalent to GL_R8
+    \value RG8_UNorm Equivalent to GL_RG8
+    \value RGB8_UNorm Equivalent to GL_RGB8
+    \value RGBA8_UNorm Equivalent to GL_RGBA8
+
+    \value R16_UNorm Equivalent to GL_R16
+    \value RG16_UNorm Equivalent to GL_RG16
+    \value RGB16_UNorm Equivalent to GL_RGB16
+    \value RGBA16_UNorm Equivalent to GL_RGBA16
+
+    \value R8_SNorm Equivalent to GL_R8_SNORM
+    \value RG8_SNorm Equivalent to GL_RG8_SNORM
+    \value RGB8_SNorm Equivalent to GL_RGB8_SNORM
+    \value RGBA8_SNorm Equivalent to GL_RGBA8_SNORM
+
+    \value R16_SNorm Equivalent to GL_R16_SNORM
+    \value RG16_SNorm Equivalent to GL_RG16_SNORM
+    \value RGB16_SNorm Equivalent to GL_RGB16_SNORM
+    \value RGBA16_SNorm Equivalent to GL_RGBA16_SNORM
+
+    \value R8U Equivalent to GL_R8UI
+    \value RG8U Equivalent to GL_RG8UI
+    \value RGB8U Equivalent to GL_RGB8UI
+    \value RGBA8U Equivalent to GL_RGBA8UI
+
+    \value R16U Equivalent to GL_R16UI
+    \value RG16U Equivalent to GL_RG16UI
+    \value RGB16U Equivalent to GL_RGB16UI
+    \value RGBA16U Equivalent to GL_RGBA16UI
+
+    \value R32U Equivalent to GL_R32UI
+    \value RG32U Equivalent to GL_RG32UI
+    \value RGB32U Equivalent to GL_RGB32UI
+    \value RGBA32U Equivalent to GL_RGBA32UI
+
+    \value R8I Equivalent to GL_R8I
+    \value RG8I Equivalent to GL_RG8I
+    \value RGB8I Equivalent to GL_RGB8I
+    \value RGBA8I Equivalent to GL_RGBA8I
+
+    \value R16I Equivalent to GL_R16I
+    \value RG16I Equivalent to GL_RG16I
+    \value RGB16I Equivalent to GL_RGB16I
+    \value RGBA16I Equivalent to GL_RGBA16I
+
+    \value R32I Equivalent to GL_R32I
+    \value RG32I Equivalent to GL_RG32I
+    \value RGB32I Equivalent to GL_RGB32I
+    \value RGBA32I Equivalent to GL_RGBA32I
+
+    \value R16F Equivalent to GL_R16F
+    \value RG16F Equivalent to GL_RG16F
+    \value RGB16F Equivalent to GL_RGB16F
+    \value RGBA16F Equivalent to GL_RGBA16F
+
+    \value R32F Equivalent to GL_R32F
+    \value RG32F Equivalent to GL_RG32F
+    \value RGB32F Equivalent to GL_RGB32F
+    \value RGBA32F Equivalent to GL_RGBA32F
+
+    \value RGB9E5 Equivalent to GL_RGB9_E5
+    \value RG11B10F Equivalent to GL_R11F_G11F_B10F
+    \value RG3B2 Equivalent to GL_R3_G3_B2
+    \value R5G6B5 Equivalent to GL_RGB565
+    \value RGB5A1 Equivalent to GL_RGB5_A1
+    \value RGBA4 Equivalent to GL_RGBA4
+    \value RGB10A2 Equivalent to GL_RGB10_A2UI
+
+    \value D16 Equivalent to GL_DEPTH_COMPONENT16
+    \value D24 Equivalent to GL_DEPTH_COMPONENT24
+    \value D24S8 Equivalent to GL_DEPTH24_STENCIL8
+    \value D32 Equivalent to GL_DEPTH_COMPONENT32
+    \value D32F Equivalent to GL_DEPTH_COMPONENT32F
+    \value D32FS8X24 Equivalent to GL_DEPTH32F_STENCIL8
+    \value S8 Equivalent to GL_STENCIL_INDEX8. Introduced in Qt 5.4
+
+    \value RGB_DXT1 Equivalent to GL_COMPRESSED_RGB_S3TC_DXT1_EXT
+    \value RGBA_DXT1 Equivalent to GL_COMPRESSED_RGBA_S3TC_DXT1_EXT
+    \value RGBA_DXT3 Equivalent to GL_COMPRESSED_RGBA_S3TC_DXT3_EXT
+    \value RGBA_DXT5 Equivalent to GL_COMPRESSED_RGBA_S3TC_DXT5_EXT
+    \value R_ATI1N_UNorm Equivalent to GL_COMPRESSED_RED_RGTC1
+    \value R_ATI1N_SNorm Equivalent to GL_COMPRESSED_SIGNED_RED_RGTC1
+    \value RG_ATI2N_UNorm Equivalent to GL_COMPRESSED_RG_RGTC2
+    \value RG_ATI2N_SNorm Equivalent to GL_COMPRESSED_SIGNED_RG_RGTC2
+    \value RGB_BP_UNSIGNED_FLOAT Equivalent to GL_COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT_ARB
+    \value RGB_BP_SIGNED_FLOAT Equivalent to GL_COMPRESSED_RGB_BPTC_SIGNED_FLOAT_ARB
+    \value RGB_BP_UNorm Equivalent to GL_COMPRESSED_RGBA_BPTC_UNORM_ARB
+    \value R11_EAC_UNorm Equivalent to GL_COMPRESSED_R11_EAC
+    \value R11_EAC_SNorm Equivalent to GL_COMPRESSED_SIGNED_R11_EAC
+    \value RG11_EAC_UNorm Equivalent to GL_COMPRESSED_RG11_EAC
+    \value RG11_EAC_SNorm Equivalent to GL_COMPRESSED_SIGNED_RG11_EAC
+    \value RGB8_ETC2 Equivalent to GL_COMPRESSED_RGB8_ETC2
+    \value SRGB8_ETC2 Equivalent to GL_COMPRESSED_SRGB8_ETC2
+    \value RGB8_PunchThrough_Alpha1_ETC2 Equivalent to GL_COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_ETC2
+    \value SRGB8_PunchThrough_Alpha1_ETC2 Equivalent to GL_COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_ETC2
+    \value RGBA8_ETC2_EAC Equivalent to GL_COMPRESSED_RGBA8_ETC2_EAC
+    \value SRGB8_Alpha8_ETC2_EAC Equivalent to GL_COMPRESSED_SRGB8_ALPHA8_ETC2_EAC
+    \value RGB8_ETC1 Equivalent to GL_ETC1_RGB8_OES
+    \value RGBA_ASTC_4x4 Equivalent to GL_COMPRESSED_RGBA_ASTC_4x4_KHR
+    \value RGBA_ASTC_5x4 Equivalent to GL_COMPRESSED_RGBA_ASTC_5x4_KHR
+    \value RGBA_ASTC_5x5 Equivalent to GL_COMPRESSED_RGBA_ASTC_5x5_KHR
+    \value RGBA_ASTC_6x5 Equivalent to GL_COMPRESSED_RGBA_ASTC_6x5_KHR
+    \value RGBA_ASTC_6x6 Equivalent to GL_COMPRESSED_RGBA_ASTC_6x6_KHR
+    \value RGBA_ASTC_8x5 Equivalent to GL_COMPRESSED_RGBA_ASTC_8x5_KHR
+    \value RGBA_ASTC_8x6 Equivalent to GL_COMPRESSED_RGBA_ASTC_8x6_KHR
+    \value RGBA_ASTC_8x8 Equivalent to GL_COMPRESSED_RGBA_ASTC_8x8_KHR
+    \value RGBA_ASTC_10x5 Equivalent to GL_COMPRESSED_RGBA_ASTC_10x5_KHR
+    \value RGBA_ASTC_10x6 Equivalent to GL_COMPRESSED_RGBA_ASTC_10x6_KHR
+    \value RGBA_ASTC_10x8 Equivalent to GL_COMPRESSED_RGBA_ASTC_10x8_KHR
+    \value RGBA_ASTC_10x10 Equivalent to GL_COMPRESSED_RGBA_ASTC_10x10_KHR
+    \value RGBA_ASTC_12x10 Equivalent to GL_COMPRESSED_RGBA_ASTC_12x10_KHR
+    \value RGBA_ASTC_12x12 Equivalent to GL_COMPRESSED_RGBA_ASTC_12x12_KHR
+    \value SRGB8_Alpha8_ASTC_4x4 Equivalent to GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x4_KHR
+    \value SRGB8_Alpha8_ASTC_5x4 Equivalent to GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x4_KHR
+    \value SRGB8_Alpha8_ASTC_5x5 Equivalent to GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x5_KHR
+    \value SRGB8_Alpha8_ASTC_6x5 Equivalent to GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x5_KHR
+    \value SRGB8_Alpha8_ASTC_6x6 Equivalent to GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x6_KHR
+    \value SRGB8_Alpha8_ASTC_8x5 Equivalent to GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x5_KHR
+    \value SRGB8_Alpha8_ASTC_8x6 Equivalent to GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x6_KHR
+    \value SRGB8_Alpha8_ASTC_8x8 Equivalent to GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x8_KHR
+    \value SRGB8_Alpha8_ASTC_10x5 Equivalent to GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x5_KHR
+    \value SRGB8_Alpha8_ASTC_10x6 Equivalent to GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x6_KHR
+    \value SRGB8_Alpha8_ASTC_10x8 Equivalent to GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x8_KHR
+    \value SRGB8_Alpha8_ASTC_10x10 Equivalent to GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x10_KHR
+    \value SRGB8_Alpha8_ASTC_12x10 Equivalent to GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x10_KHR
+    \value SRGB8_Alpha8_ASTC_12x12 Equivalent to GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x12_KHR
+
+    \value SRGB8 Equivalent to GL_SRGB8
+    \value SRGB8_Alpha8 Equivalent to GL_SRGB8_ALPHA8
+    \value SRGB_DXT1 Equivalent to GL_COMPRESSED_SRGB_S3TC_DXT1_EXT
+    \value SRGB_Alpha_DXT1 Equivalent to GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT
+    \value SRGB_Alpha_DXT3 Equivalent to GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT
+    \value SRGB_Alpha_DXT5 Equivalent to GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT
+    \value SRGB_BP_UNorm Equivalent to GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM_ARB
+
+    \value DepthFormat Equivalent to GL_DEPTH_COMPONENT (only OpenGL ES 3 or ES 2 with OES_depth_texture)
+    \value AlphaFormat Equivalent to GL_ALPHA (OpenGL ES 2 only)
+    \value RGBFormat Equivalent to GL_RGB (OpenGL ES 2 only)
+    \value RGBAFormat Equivalent to GL_RGBA (OpenGL ES 2 only)
+    \value LuminanceFormat Equivalent to GL_LUMINANCE (OpenGL ES 2 only)
+    \value LuminanceAlphaFormat Equivalent to GL_LUMINANCE_ALPHA (OpenGL ES 2 only)
+*/
+
+/*!
+    \enum QOpenGLTexture::CubeMapFace
+    This enum defines the possible CubeMap faces.
+
+    \value CubeMapPositiveX Equivalent to GL_TEXTURE_CUBE_MAP_POSITIVE_X
+    \value CubeMapNegativeX Equivalent to GL_TEXTURE_CUBE_MAP_NEGATIVE_X
+    \value CubeMapPositiveY Equivalent to GL_TEXTURE_CUBE_MAP_POSITIVE_Y
+    \value CubeMapNegativeY Equivalent to GL_TEXTURE_CUBE_MAP_NEGATIVE_Y
+    \value CubeMapPositiveZ Equivalent to GL_TEXTURE_CUBE_MAP_POSITIVE_Z
+    \value CubeMapNegativeZ Equivalent to GL_TEXTURE_CUBE_MAP_NEGATIVE_Z
+*/
+
+/*!
+    \enum QOpenGLTexture::PixelFormat
+    This enum defines the possible client-side pixel formats for a pixel
+    transfer operation.
+
+    \value NoSourceFormat Equivalent to GL_NONE
+    \value Red Equivalent to GL_RED
+    \value RG Equivalent to GL_RG
+    \value RGB Equivalent to GL_RGB
+    \value BGR Equivalent to GL_BGR
+    \value RGBA Equivalent to GL_RGBA
+    \value BGRA Equivalent to GL_BGRA
+    \value Red_Integer Equivalent to GL_RED_INTEGER
+    \value RG_Integer Equivalent to GL_RG_INTEGER
+    \value RGB_Integer Equivalent to GL_RGB_INTEGER
+    \value BGR_Integer Equivalent to GL_BGR_INTEGER
+    \value RGBA_Integer Equivalent to GL_RGBA_INTEGER
+    \value BGRA_Integer Equivalent to GL_BGRA_INTEGER
+    \value Stencil Equivalent to GL_STENCIL_INDEX. Introduced in Qt 5.4
+    \value Depth Equivalent to GL_DEPTH_COMPONENT
+    \value DepthStencil Equivalent to GL_DEPTH_STENCIL
+    \value Alpha Equivalent to GL_ALPHA (OpenGL ES 2 only)
+    \value Luminance Equivalent to GL_LUMINANCE (OpenGL ES 2 only)
+    \value LuminanceAlpha Equivalent to GL_LUMINANCE_ALPHA (OpenGL ES 2 only)
+
+*/
+
+/*!
+    \enum QOpenGLTexture::PixelType
+    This enum defines the possible pixel data types for a pixel transfer operation
+
+    \value NoPixelType Equivalent to GL_NONE
+    \value Int8 Equivalent to GL_BYTE
+    \value UInt8 Equivalent to GL_UNSIGNED_BYTE
+    \value Int16 Equivalent to GL_SHORT
+    \value UInt16 Equivalent to GL_UNSIGNED_SHORT
+    \value Int32 Equivalent to GL_INT
+    \value UInt32 Equivalent to GL_UNSIGNED_INT
+    \value Float16 Equivalent to GL_HALF_FLOAT
+    \value Float16OES Equivalent to GL_HALF_FLOAT_OES
+    \value Float32 Equivalent to GL_FLOAT
+    \value UInt32_RGB9_E5 Equivalent to GL_UNSIGNED_INT_5_9_9_9_REV
+    \value UInt32_RG11B10F Equivalent to GL_UNSIGNED_INT_10F_11F_11F_REV
+    \value UInt8_RG3B2 Equivalent to GL_UNSIGNED_BYTE_3_3_2
+    \value UInt8_RG3B2_Rev Equivalent to GL_UNSIGNED_BYTE_2_3_3_REV
+    \value UInt16_RGB5A1 Equivalent to GL_UNSIGNED_SHORT_5_5_5_1
+    \value UInt16_RGB5A1_Rev Equivalent to GL_UNSIGNED_SHORT_1_5_5_5_REV
+    \value UInt16_R5G6B5 Equivalent to GL_UNSIGNED_SHORT_5_6_5
+    \value UInt16_R5G6B5_Rev Equivalent to GL_UNSIGNED_SHORT_5_6_5_REV
+    \value UInt16_RGBA4 Equivalent to GL_UNSIGNED_SHORT_4_4_4_4
+    \value UInt16_RGBA4_Rev Equivalent to GL_UNSIGNED_SHORT_4_4_4_4_REV
+    \value UInt32_RGBA8 Equivalent to GL_UNSIGNED_INT_8_8_8_8
+    \value UInt32_RGBA8_Rev Equivalent to GL_UNSIGNED_INT_8_8_8_8_REV
+    \value UInt32_RGB10A2 Equivalent to GL_UNSIGNED_INT_10_10_10_2
+    \value UInt32_RGB10A2_Rev Equivalent to GL_UNSIGNED_INT_2_10_10_10_REV
+    \value UInt32_D24S8 Equivalent to GL_UNSIGNED_INT_24_8. Introduced in Qt 5.4
+    \value Float32_D32_UInt32_S8_X24 Equivalent to GL_FLOAT_32_UNSIGNED_INT_24_8_REV. Introduced in Qt 5.4
+*/
+
+/*!
+    \enum QOpenGLTexture::Feature
+    This enum defines the OpenGL texture-related features that can be tested for.
+
+    \value ImmutableStorage Support for immutable texture storage
+    \value ImmutableMultisampleStorage Support for immutable texture storage with
+           multisample targets
+    \value TextureRectangle Support for the GL_TEXTURE_RECTANGLE target
+    \value TextureArrays Support for texture targets with array layers
+    \value Texture3D Support for the 3 dimensional texture target
+    \value TextureMultisample Support for texture targets that have multisample capabilities
+    \value TextureBuffer Support for textures that use OpenGL buffer objects
+           as their data source
+    \value TextureCubeMapArrays Support for cubemap array texture target
+    \value Swizzle Support for texture component swizzle masks
+    \value StencilTexturing Support for stencil texturing (i.e. looking up depth or stencil
+           components of a combined depth/stencil format texture in GLSL shaders).
+    \value AnisotropicFiltering Support for anisotropic texture filtering
+    \value NPOTTextures Basic support for non-power-of-two textures
+    \value NPOTTextureRepeat Full support for non-power-of-two textures including texture
+           repeat modes
+    \value Texture1D Support for the 1 dimensional texture target
+    \value TextureComparisonOperators Support for texture comparison operators
+    \value TextureMipMapLevel Support for setting the base and maximum mipmap levels
+*/
+
+/*!
+    \enum QOpenGLTexture::SwizzleComponent
+    This enum defines the texture color components that can be assigned a swizzle mask.
+
+    \value SwizzleRed The red component. Equivalent to GL_TEXTURE_SWIZZLE_R
+    \value SwizzleGreen The green component. Equivalent to GL_TEXTURE_SWIZZLE_G
+    \value SwizzleBlue The blue component. Equivalent to GL_TEXTURE_SWIZZLE_B
+    \value SwizzleAlpha The alpha component. Equivalent to GL_TEXTURE_SWIZZLE_A
+*/
+
+/*!
+    \enum QOpenGLTexture::SwizzleValue
+    This enum defines the possible mask values for texture swizzling.
+
+    \value RedValue Maps the component to the red channel. Equivalent to GL_RED
+    \value GreenValue Maps the component to the green channel. Equivalent to GL_GREEN
+    \value BlueValue Maps the component to the blue channel. Equivalent to GL_BLUE
+    \value AlphaValue Maps the component to the alpha channel. Equivalent to GL_ALPHA
+    \value ZeroValue Maps the component to a fixed value of 0. Equivalent to GL_ZERO
+    \value OneValue Maps the component to a fixed value of 1. Equivalent to GL_ONE
+*/
+
+/*!
+    \enum QOpenGLTexture::WrapMode
+    This enum defines the possible texture coordinate wrapping modes.
+
+    \value Repeat Texture coordinate is repeated. Equivalent to GL_REPEAT
+    \value MirroredRepeat Texture coordinate is reflected about 0 and 1. Equivalent to GL_MIRRORED_REPEAT
+    \value ClampToEdge Clamps the texture coordinates to [0,1]. Equivalent to GL_CLAMP_TO_EDGE
+    \value ClampToBorder As for ClampToEdge but also blends samples at 0 and 1 with a
+           fixed border color. Equivalent to GL_CLAMP_TO_BORDER
+*/
+
+/*!
+    \enum QOpenGLTexture::CoordinateDirection
+    This enum defines the possible texture coordinate directions
+
+    \value DirectionS The horizontal direction. Equivalent to GL_TEXTURE_WRAP_S
+    \value DirectionT The vertical direction. Equivalent to GL_TEXTURE_WRAP_T
+    \value DirectionR The depth direction. Equivalent to GL_TEXTURE_WRAP_R
+*/
+
+/*!
+    Creates a QOpenGLTexture object that can later be bound to \a target.
+
+    This does not create the underlying OpenGL texture object. Therefore,
+    construction using this constructor does not require a valid current
+    OpenGL context.
+*/
+QOpenGLTexture::QOpenGLTexture(Target target)
+    : d_ptr(new QOpenGLTexturePrivate(target, this))
+{
+}
+
+/*!
+    Creates a QOpenGLTexture object that can later be bound to the 2D texture
+    target and contains the pixel data contained in \a image. If you wish
+    to have a chain of mipmaps generated then set \a genMipMaps to \c true (this
+    is the default).
+
+    This does create the underlying OpenGL texture object. Therefore,
+    construction using this constructor does require a valid current
+    OpenGL context.
+*/
+QOpenGLTexture::QOpenGLTexture(const QImage& image, MipMapGeneration genMipMaps)
+    : QOpenGLTexture(QOpenGLTexture::Target2D)
+{
+    setData(image, genMipMaps);
+}
+
+QOpenGLTexture::~QOpenGLTexture()
+{
+}
+
+/*!
+    Returns the binding target of this texture.
+
+    \since 5.4
+*/
+QOpenGLTexture::Target QOpenGLTexture::target() const
+{
+    Q_D(const QOpenGLTexture);
+    return d->target;
+}
+
+/*!
+    Creates the underlying OpenGL texture object. This requires a current valid
+    OpenGL context. If the texture object already exists, this function does
+    nothing.
+
+    Once the texture object is created you can obtain the object
+    name from the textureId() function. This may be useful if you wish to make
+    some raw OpenGL calls related to this texture.
+
+    Normally it should not be necessary to call this function directly as all
+    functions that set properties of the texture object implicitly call create()
+    on your behalf.
+
+    Returns \c true if the creation succeeded, otherwise returns \c false.
+
+    \sa destroy(), isCreated(), textureId()
+*/
+bool QOpenGLTexture::create()
+{
+    Q_D(QOpenGLTexture);
+    return d->create();
+}
+
+/*!
+    Destroys the underlying OpenGL texture object. This requires a current valid
+    OpenGL context.
+
+    \sa create(), isCreated(), textureId()
+*/
+void QOpenGLTexture::destroy()
+{
+    Q_D(QOpenGLTexture);
+    return d->destroy();
+}
+
+/*!
+    Returns \c true if the underlying OpenGL texture object has been created.
+
+    \sa create(), destroy(), textureId()
+*/
+bool QOpenGLTexture::isCreated() const
+{
+    Q_D(const QOpenGLTexture);
+    return d->textureId != 0;
+}
+
+/*!
+    Returns the name of the underlying OpenGL texture object or 0 if it has
+    not yet been created.
+
+    \sa create(), destroy(), isCreated()
+*/
+GLuint QOpenGLTexture::textureId() const
+{
+    Q_D(const QOpenGLTexture);
+    return d->textureId;
+}
+
+/*!
+    Binds this texture to the currently active texture unit ready for
+    rendering. Note that you do not need to bind QOpenGLTexture objects
+    in order to modify them as the implementation makes use of the
+    EXT_direct_state_access extension where available and simulates it
+    where it is not.
+
+    \sa release()
+*/
+void QOpenGLTexture::bind()
+{
+    Q_D(QOpenGLTexture);
+    Q_ASSERT(d->textureId);
+    d->bind();
+}
+
+/*!
+    Binds this texture to texture unit \a unit ready for
+    rendering. Note that you do not need to bind QOpenGLTexture objects
+    in order to modify them as the implementation makes use of the
+    EXT_direct_state_access extension where available and simulates it
+    where it is not.
+
+    If parameter \a reset is \c true then this function will restore
+    the active unit to the texture unit that was active upon entry.
+
+    \sa release()
+*/
+void QOpenGLTexture::bind(uint unit, TextureUnitReset reset)
+{
+    Q_D(QOpenGLTexture);
+    Q_ASSERT(d->textureId);
+    d->bind(unit, reset);
+}
+
+/*!
+    Unbinds this texture from the currently active texture unit.
+
+    \sa bind()
+*/
+void QOpenGLTexture::release()
+{
+    Q_D(QOpenGLTexture);
+    d->release();
+}
+
+/*!
+    Unbinds this texture from texture unit \a unit.
+
+    If parameter \a reset is \c true then this function
+    will restore the active unit to the texture unit that was active
+    upon entry.
+*/
+void QOpenGLTexture::release(uint unit, TextureUnitReset reset)
+{
+    Q_D(QOpenGLTexture);
+    d->release(unit, reset);
+}
+
+/*!
+    Returns \c true if this texture is bound to the corresponding target
+    of the currently active texture unit.
+
+    \sa bind(), release()
+*/
+bool QOpenGLTexture::isBound() const
+{
+    Q_D(const QOpenGLTexture);
+    Q_ASSERT(d->textureId);
+    return d->isBound();
+}
+
+/*!
+    Returns \c true if this texture is bound to the corresponding target
+    of texture unit \a unit.
+
+    \sa bind(), release()
+*/
+bool QOpenGLTexture::isBound(uint unit)
+{
+    Q_D(const QOpenGLTexture);
+    Q_ASSERT(d->textureId);
+    return d->isBound(unit);
+}
+
+/*!
+    Returns the textureId of the texture that is bound to the \a target
+    of the currently active texture unit.
+*/
+GLuint QOpenGLTexture::boundTextureId(BindingTarget target)
+{
+    QOpenGLContext *ctx = QOpenGLContext::currentContext();
+    if (!ctx) {
+        qWarning("QOpenGLTexture::boundTextureId() requires a valid current context");
+        return 0;
+    }
+
+    GLint textureId = 0;
+    ctx->functions()->glGetIntegerv(target, &textureId);
+    return static_cast<GLuint>(textureId);
+}
+
+/*!
+    Returns the textureId of the texture that is bound to the \a target
+    of the texture unit \a unit.
+*/
+GLuint QOpenGLTexture::boundTextureId(uint unit, BindingTarget target)
+{
+    QOpenGLContext *ctx = QOpenGLContext::currentContext();
+    if (!ctx) {
+        qWarning("QOpenGLTexture::boundTextureId() requires a valid current context");
+        return 0;
+    }
+
+    QOpenGLFunctions *funcs = ctx->functions();
+    funcs->initializeOpenGLFunctions();
+
+    GLint oldTextureUnit = 0;
+    funcs->glGetIntegerv(GL_ACTIVE_TEXTURE, &oldTextureUnit);
+
+    funcs->glActiveTexture(unit);
+    GLint textureId = 0;
+    funcs->glGetIntegerv(target, &textureId);
+    funcs->glActiveTexture(oldTextureUnit);
+
+    return static_cast<GLuint>(textureId);
+}
+
+/*!
+    Sets the format of this texture object to \a format. This function
+    must be called before texture storage is allocated.
+
+    Note that all formats may not be supported. The exact set of supported
+    formats is dependent upon your OpenGL implementation and version.
+
+    \sa format(), allocateStorage()
+*/
+void QOpenGLTexture::setFormat(TextureFormat format)
+{
+    Q_D(QOpenGLTexture);
+    d->create();
+    if (isStorageAllocated()) {
+        qWarning("QOpenGLTexture::setFormat(): Cannot change format once storage has been allocated");
+        return;
+    }
+
+    d->format = format;
+
+    switch (format) {
+    case NoFormat:
+        d->formatClass = NoFormatClass;
+        break;
+
+    case RGBA32F:
+    case RGBA32U:
+    case RGBA32I:
+        d->formatClass = FormatClass_128Bit;
+        break;
+
+    case RGB32F:
+    case RGB32U:
+    case RGB32I:
+        d->formatClass = FormatClass_96Bit;
+        break;
+
+    case RGBA16F:
+    case RG32F:
+    case RGBA16U:
+    case RG32U:
+    case RGBA16I:
+    case RG32I:
+    case RGBA16_UNorm:
+    case RGBA16_SNorm:
+        d->formatClass = FormatClass_64Bit;
+        break;
+
+    case RGB16_UNorm:
+    case RGB16_SNorm:
+    case RGB16F:
+    case RGB16U:
+    case RGB16I:
+        d->formatClass = FormatClass_48Bit;
+        break;
+
+    case RG16F:
+    case RG11B10F:
+    case R32F:
+    case RGB10A2:
+    case RGBA8U:
+    case RG16U:
+    case R32U:
+    case RGBA8I:
+    case RG16I:
+    case R32I:
+    case RGBA8_UNorm:
+    case RG16_UNorm:
+    case RGBA8_SNorm:
+    case RG16_SNorm:
+    case SRGB8_Alpha8:
+    case RGB9E5:
+        d->formatClass = FormatClass_32Bit;
+        break;
+
+    case RGB8_UNorm:
+    case RGB8_SNorm:
+    case SRGB8:
+    case RGB8U:
+    case RGB8I:
+        d->formatClass = FormatClass_24Bit;
+        break;
+
+    case R16F:
+    case RG8U:
+    case R16U:
+    case RG8I:
+    case R16I:
+    case RG8_UNorm:
+    case R16_UNorm:
+    case RG8_SNorm:
+    case R16_SNorm:
+        d->formatClass = FormatClass_16Bit;
+        break;
+
+    case R8U:
+    case R8I:
+    case R8_UNorm:
+    case R8_SNorm:
+        d->formatClass = FormatClass_8Bit;
+        break;
+
+    case R_ATI1N_UNorm:
+    case R_ATI1N_SNorm:
+        d->formatClass = FormatClass_RGTC1_R;
+        break;
+
+    case RG_ATI2N_UNorm:
+    case RG_ATI2N_SNorm:
+        d->formatClass = FormatClass_RGTC2_RG;
+        break;
+
+    case RGB_BP_UNorm:
+    case SRGB_BP_UNorm:
+        d->formatClass = FormatClass_BPTC_Unorm;
+        break;
+
+    case RGB_BP_UNSIGNED_FLOAT:
+    case RGB_BP_SIGNED_FLOAT:
+        d->formatClass = FormatClass_BPTC_Float;
+        break;
+
+    case RGB_DXT1:
+    case SRGB_DXT1:
+        d->formatClass = FormatClass_S3TC_DXT1_RGB;
+        break;
+
+    case RGBA_DXT1:
+    case SRGB_Alpha_DXT1:
+        d->formatClass = FormatClass_S3TC_DXT1_RGBA;
+        break;
+
+    case RGBA_DXT3:
+    case SRGB_Alpha_DXT3:
+        d->formatClass = FormatClass_S3TC_DXT3_RGBA;
+        break;
+
+    case RGBA_DXT5:
+    case SRGB_Alpha_DXT5:
+        d->formatClass = FormatClass_S3TC_DXT5_RGBA;
+        break;
+
+    case QOpenGLTexture::R11_EAC_UNorm:
+    case QOpenGLTexture::R11_EAC_SNorm:
+    case QOpenGLTexture::RG11_EAC_UNorm:
+    case QOpenGLTexture::RG11_EAC_SNorm:
+    case QOpenGLTexture::RGB8_ETC2:
+    case QOpenGLTexture::SRGB8_ETC2:
+    case QOpenGLTexture::RGB8_PunchThrough_Alpha1_ETC2:
+    case QOpenGLTexture::SRGB8_PunchThrough_Alpha1_ETC2:
+    case QOpenGLTexture::RGBA8_ETC2_EAC:
+    case QOpenGLTexture::SRGB8_Alpha8_ETC2_EAC:
+    case QOpenGLTexture::RGB8_ETC1:
+    case RG3B2:
+    case R5G6B5:
+    case RGB5A1:
+    case RGBA4:
+    case D16:
+    case D24:
+    case D24S8:
+    case D32:
+    case D32F:
+    case D32FS8X24:
+    case S8:
+    case DepthFormat:
+    case AlphaFormat:
+    case RGBFormat:
+    case RGBAFormat:
+    case LuminanceFormat:
+    case LuminanceAlphaFormat:
+    case QOpenGLTexture::RGBA_ASTC_4x4:
+    case QOpenGLTexture::RGBA_ASTC_5x4:
+    case QOpenGLTexture::RGBA_ASTC_5x5:
+    case QOpenGLTexture::RGBA_ASTC_6x5:
+    case QOpenGLTexture::RGBA_ASTC_6x6:
+    case QOpenGLTexture::RGBA_ASTC_8x5:
+    case QOpenGLTexture::RGBA_ASTC_8x6:
+    case QOpenGLTexture::RGBA_ASTC_8x8:
+    case QOpenGLTexture::RGBA_ASTC_10x5:
+    case QOpenGLTexture::RGBA_ASTC_10x6:
+    case QOpenGLTexture::RGBA_ASTC_10x8:
+    case QOpenGLTexture::RGBA_ASTC_10x10:
+    case QOpenGLTexture::RGBA_ASTC_12x10:
+    case QOpenGLTexture::RGBA_ASTC_12x12:
+    case QOpenGLTexture::SRGB8_Alpha8_ASTC_4x4:
+    case QOpenGLTexture::SRGB8_Alpha8_ASTC_5x4:
+    case QOpenGLTexture::SRGB8_Alpha8_ASTC_5x5:
+    case QOpenGLTexture::SRGB8_Alpha8_ASTC_6x5:
+    case QOpenGLTexture::SRGB8_Alpha8_ASTC_6x6:
+    case QOpenGLTexture::SRGB8_Alpha8_ASTC_8x5:
+    case QOpenGLTexture::SRGB8_Alpha8_ASTC_8x6:
+    case QOpenGLTexture::SRGB8_Alpha8_ASTC_8x8:
+    case QOpenGLTexture::SRGB8_Alpha8_ASTC_10x5:
+    case QOpenGLTexture::SRGB8_Alpha8_ASTC_10x6:
+    case QOpenGLTexture::SRGB8_Alpha8_ASTC_10x8:
+    case QOpenGLTexture::SRGB8_Alpha8_ASTC_10x10:
+    case QOpenGLTexture::SRGB8_Alpha8_ASTC_12x10:
+    case QOpenGLTexture::SRGB8_Alpha8_ASTC_12x12:
+        d->formatClass = FormatClass_Unique;
+        break;
+    }
+}
+
+/*!
+    Returns the format of this texture object.
+
+    \sa setFormat()
+*/
+QOpenGLTexture::TextureFormat QOpenGLTexture::format() const
+{
+    Q_D(const QOpenGLTexture);
+    return d->format;
+}
+
+static bool isNpot(int width, int height = 1, int depth = 1)
+{
+    return width & (width-1) || height & (height-1) || depth & (depth-1);
+}
+
+/*!
+    Sets the dimensions of this texture object to \a width,
+    \a height, and \a depth. The default for each dimension is 1.
+    The maximum allowable texture size is dependent upon your OpenGL
+    implementation. Allocating storage for a texture less than the
+    maximum size can still fail if your system is low on resources.
+
+    If a non-power-of-two \a width, \a height or \a depth is provided and your
+    OpenGL implementation doesn't have support for repeating non-power-of-two
+    textures, then the wrap mode is automatically set to ClampToEdge.
+
+    \sa width(), height(), depth()
+*/
+void QOpenGLTexture::setSize(int width, int height, int depth)
+{
+    Q_D(QOpenGLTexture);
+    d->create();
+    if (isStorageAllocated()) {
+        qWarning("Cannot resize a texture that already has storage allocated.\n"
+                 "To do so, destroy() the texture and then create() and setSize()");
+        return;
+    }
+
+    if (isNpot(width, height, depth) && !hasFeature(Feature::NPOTTextureRepeat) && d->target != Target::TargetRectangle)
+        d->setWrapMode(WrapMode::ClampToEdge);
+
+    switch (d->target) {
+    case QOpenGLTexture::Target1D:
+    case QOpenGLTexture::Target1DArray:
+    case QOpenGLTexture::TargetBuffer:
+        d->dimensions[0] = width;
+        Q_UNUSED(height);
+        Q_UNUSED(depth);
+        break;
+
+    case QOpenGLTexture::Target2D:
+    case QOpenGLTexture::Target2DArray:
+    case QOpenGLTexture::TargetRectangle:
+    case QOpenGLTexture::Target2DMultisample:
+    case QOpenGLTexture::Target2DMultisampleArray:
+        d->dimensions[0] = width;
+        d->dimensions[1] = height;
+        Q_UNUSED(depth);
+        break;
+
+    case QOpenGLTexture::TargetCubeMap:
+    case QOpenGLTexture::TargetCubeMapArray:
+        if (width != height)
+            qWarning("QAbstractOpenGLTexture::setSize(): Cube map textures must be square");
+        d->dimensions[0] = d->dimensions[1] = width;
+        Q_UNUSED(depth);
+        break;
+
+    case QOpenGLTexture::Target3D:
+        d->dimensions[0] = width;
+        d->dimensions[1] = height;
+        d->dimensions[2] = depth;
+        break;
+    }
+}
+
+/*!
+    Returns the width of a 1D, 2D or 3D texture.
+
+    \sa height(), depth(), setSize()
+*/
+int QOpenGLTexture::width() const
+{
+    Q_D(const QOpenGLTexture);
+    return d->dimensions[0];
+}
+
+/*!
+    Returns the height of a 2D or 3D texture.
+
+    \sa width(), depth(), setSize()
+*/
+int QOpenGLTexture::height() const
+{
+    Q_D(const QOpenGLTexture);
+    return d->dimensions[1];
+}
+
+/*!
+    Returns the depth of a 3D texture.
+
+    \sa width(), height(), setSize()
+*/
+int QOpenGLTexture::depth() const
+{
+    Q_D(const QOpenGLTexture);
+    return d->dimensions[2];
+}
+
+/*!
+    For texture targets that support mipmaps, this function
+    sets the requested number of mipmap \a levels to allocate storage
+    for. This function should be called before storage is allocated
+    for the texture.
+
+    If the texture target does not support mipmaps this function
+    has no effect.
+
+    \sa mipLevels(), maximumMipLevels(), isStorageAllocated()
+*/
+void QOpenGLTexture::setMipLevels(int levels)
+{
+    Q_D(QOpenGLTexture);
+    d->create();
+    if (isStorageAllocated()) {
+        qWarning("Cannot set mip levels on a texture that already has storage allocated.\n"
+                 "To do so, destroy() the texture and then create() and setMipLevels()");
+        return;
+    }
+
+    switch (d->target) {
+    case QOpenGLTexture::Target1D:
+    case QOpenGLTexture::Target1DArray:
+    case QOpenGLTexture::Target2D:
+    case QOpenGLTexture::Target2DArray:
+    case QOpenGLTexture::TargetCubeMap:
+    case QOpenGLTexture::TargetCubeMapArray:
+    case QOpenGLTexture::Target3D:
+        d->requestedMipLevels = levels;
+        break;
+
+    case QOpenGLTexture::TargetBuffer:
+    case QOpenGLTexture::TargetRectangle:
+    case QOpenGLTexture::Target2DMultisample:
+    case QOpenGLTexture::Target2DMultisampleArray:
+        qWarning("QAbstractOpenGLTexture::setMipLevels(): This texture target does not support mipmaps");
+        break;
+    }
+}
+
+/*!
+    Returns the number of mipmap levels for this texture. If storage
+    has not yet been allocated for this texture it returns the
+    requested number of mipmap levels.
+
+    \sa setMipLevels(), maximumMipLevels(), isStorageAllocated()
+*/
+int QOpenGLTexture::mipLevels() const
+{
+    Q_D(const QOpenGLTexture);
+    return isStorageAllocated() ? d->mipLevels : d->requestedMipLevels;
+}
+
+/*!
+    Returns the maximum number of mipmap levels that this texture
+    can have given the current dimensions.
+
+    \sa setMipLevels(), mipLevels(), setSize()
+*/
+int QOpenGLTexture::maximumMipLevels() const
+{
+    Q_D(const QOpenGLTexture);
+    return d->maximumMipLevelCount();
+}
+
+/*!
+    Sets the number of array \a layers to allocate storage for. This
+    function should be called before storage is allocated for the texture.
+
+    For targets that do not support array layers this function has
+    no effect.
+
+    \sa layers(), isStorageAllocated()
+*/
+void QOpenGLTexture::setLayers(int layers)
+{
+    Q_D(QOpenGLTexture);
+    d->create();
+    if (isStorageAllocated()) {
+        qWarning("Cannot set layers on a texture that already has storage allocated.\n"
+                 "To do so, destroy() the texture and then create() and setLayers()");
+        return;
+    }
+
+    switch (d->target) {
+    case QOpenGLTexture::Target1DArray:
+    case QOpenGLTexture::Target2DArray:
+    case QOpenGLTexture::TargetCubeMapArray:
+    case QOpenGLTexture::Target2DMultisampleArray:
+        d->layers = layers;
+        break;
+
+    case QOpenGLTexture::Target1D:
+    case QOpenGLTexture::Target2D:
+    case QOpenGLTexture::Target3D:
+    case QOpenGLTexture::TargetCubeMap:
+    case QOpenGLTexture::TargetBuffer:
+    case QOpenGLTexture::TargetRectangle:
+    case QOpenGLTexture::Target2DMultisample:
+        qWarning("Texture target does not support array layers");
+        break;
+    }
+}
+
+/*!
+    Returns the number of array layers for this texture. If
+    storage has not yet been allocated for this texture then
+    this function returns the requested number of array layers.
+
+    For texture targets that do not support array layers this
+    will return 1.
+
+    \sa setLayers(), isStorageAllocated()
+*/
+int QOpenGLTexture::layers() const
+{
+    Q_D(const QOpenGLTexture);
+    return d->layers;
+}
+
+/*!
+    Returns the number of faces for this texture. For cubemap
+    and cubemap array type targets this will be 6.
+
+    For non-cubemap type targets this will return 1.
+*/
+int QOpenGLTexture::faces() const
+{
+    Q_D(const QOpenGLTexture);
+    return d->faces;
+}
+
+/*!
+    Sets the number of \a samples to allocate storage for when rendering to
+    a multisample capable texture target. This function should
+    be called before storage is allocated for the texture.
+
+    For targets that do not support multisampling this function has
+    no effect.
+
+    \sa samples(), isStorageAllocated()
+*/
+void QOpenGLTexture::setSamples(int samples)
+{
+    Q_D(QOpenGLTexture);
+    d->create();
+    if (isStorageAllocated()) {
+        qWarning("Cannot set sample count on a texture that already has storage allocated.\n"
+                 "To do so, destroy() the texture and then create() and setSamples()");
+        return;
+    }
+
+    switch (d->target) {
+    case QOpenGLTexture::Target2DMultisample:
+    case QOpenGLTexture::Target2DMultisampleArray:
+        d->samples = samples;
+        break;
+
+    case QOpenGLTexture::Target1D:
+    case QOpenGLTexture::Target2D:
+    case QOpenGLTexture::Target3D:
+    case QOpenGLTexture::Target1DArray:
+    case QOpenGLTexture::Target2DArray:
+    case QOpenGLTexture::TargetCubeMap:
+    case QOpenGLTexture::TargetCubeMapArray:
+    case QOpenGLTexture::TargetBuffer:
+    case QOpenGLTexture::TargetRectangle:
+
+        qWarning("Texture target does not support multisampling");
+        break;
+    }
+}
+
+/*!
+    Returns the number of multisample sample points for this texture.
+    If storage has not yet been allocated for this texture then
+    this function returns the requested number of samples.
+
+    For texture targets that do not support multisampling this
+    will return 0.
+
+    \sa setSamples(), isStorageAllocated()
+*/
+int QOpenGLTexture::samples() const
+{
+    Q_D(const QOpenGLTexture);
+    return d->samples;
+}
+
+/*!
+    Sets whether the sample positions and number of samples used with
+    a multisample capable texture target to \a fixed. If set to \c true
+    the sample positions and number of samples used are the same for
+    all texels in the image and will not depend upon the image size or
+    internal format. This function should be called before storage is allocated
+    for the texture.
+
+    For targets that do not support multisampling this function has
+    no effect.
+
+    The default value is \c true.
+
+    \sa isFixedSamplePositions(), isStorageAllocated()
+*/
+void QOpenGLTexture::setFixedSamplePositions(bool fixed)
+{
+    Q_D(QOpenGLTexture);
+    d->create();
+    if (isStorageAllocated()) {
+        qWarning("Cannot set sample positions on a texture that already has storage allocated.\n"
+                 "To do so, destroy() the texture and then create() and setFixedSamplePositions()");
+        return;
+    }
+
+    switch (d->target) {
+    case QOpenGLTexture::Target2DMultisample:
+    case QOpenGLTexture::Target2DMultisampleArray:
+        d->fixedSamplePositions = fixed;
+        break;
+
+    case QOpenGLTexture::Target1D:
+    case QOpenGLTexture::Target2D:
+    case QOpenGLTexture::Target3D:
+    case QOpenGLTexture::Target1DArray:
+    case QOpenGLTexture::Target2DArray:
+    case QOpenGLTexture::TargetCubeMap:
+    case QOpenGLTexture::TargetCubeMapArray:
+    case QOpenGLTexture::TargetBuffer:
+    case QOpenGLTexture::TargetRectangle:
+
+        qWarning("Texture target does not support multisampling");
+        break;
+    }
+}
+
+/*!
+    Returns whether this texture uses a fixed pattern of multisample
+    samples. If storage has not yet been allocated for this texture then
+    this function returns the requested fixed sample position setting.
+
+    For texture targets that do not support multisampling this
+    will return \c true.
+
+    \sa setFixedSamplePositions(), isStorageAllocated()
+*/
+bool QOpenGLTexture::isFixedSamplePositions() const
+{
+    Q_D(const QOpenGLTexture);
+    return d->fixedSamplePositions;
+}
+
+/*!
+    Allocates server-side storage for this texture object taking
+    into account, the format, dimensions, mipmap levels, array
+    layers and cubemap faces.
+
+    Once storage has been allocated it is no longer possible to change
+    these properties.
+
+    If supported QOpenGLTexture makes use of immutable texture
+    storage.
+
+    Once storage has been allocated for the texture then pixel data
+    can be uploaded via one of the setData() overloads.
+
+    \note If immutable texture storage is not available,
+    then a default pixel format and pixel type will be used to
+    create the mutable storage. You can use the other
+    allocateStorage() overload to specify exactly the pixel format
+    and the pixel type to use when allocating mutable storage;
+    this is particulary useful under certain OpenGL ES implementations
+    (notably, OpenGL ES 2), where the pixel format and the pixel type
+    used at allocation time must perfectly match the format
+    and the type passed to any subsequent setData() call.
+
+    \sa isStorageAllocated(), setData()
+*/
+void QOpenGLTexture::allocateStorage()
+{
+    Q_D(QOpenGLTexture);
+    if (d->create()) {
+        const QOpenGLTexture::PixelFormat pixelFormat = pixelFormatCompatibleWithInternalFormat(d->format);
+        const QOpenGLTexture::PixelType pixelType = pixelTypeCompatibleWithInternalFormat(d->format);
+        d->allocateStorage(pixelFormat, pixelType);
+    }
+}
+
+/*!
+    \since 5.5
+
+    Allocates server-side storage for this texture object taking
+    into account, the format, dimensions, mipmap levels, array
+    layers and cubemap faces.
+
+    Once storage has been allocated it is no longer possible to change
+    these properties.
+
+    If supported QOpenGLTexture makes use of immutable texture
+    storage. However, if immutable texture storage is not available,
+    then the specified \a pixelFormat and \a pixelType will be used
+    to allocate mutable storage; note that in certain OpenGL implementations
+    (notably, OpenGL ES 2) they must perfectly match the format
+    and the type passed to any subsequent setData() call.
+
+    Once storage has been allocated for the texture then pixel data
+    can be uploaded via one of the setData() overloads.
+
+    \sa isStorageAllocated(), setData()
+*/
+void QOpenGLTexture::allocateStorage(QOpenGLTexture::PixelFormat pixelFormat, QOpenGLTexture::PixelType pixelType)
+{
+    Q_D(QOpenGLTexture);
+    if (d->create())
+        d->allocateStorage(pixelFormat, pixelType);
+}
+
+/*!
+    Returns \c true if server-side storage for this texture as been
+    allocated.
+
+    The texture format, dimensions, mipmap levels and array layers
+    cannot be altered once storage ihas been allocated.
+
+    \sa allocateStorage(), setSize(), setMipLevels(), setLayers(), setFormat()
+*/
+bool QOpenGLTexture::isStorageAllocated() const
+{
+    Q_D(const QOpenGLTexture);
+    return d->storageAllocated;
+}
+
+/*!
+    Attempts to create a texture view onto this texture. A texture
+    view is somewhat analogous to a view in SQL in that it presents
+    a restricted or reinterpreted view of the original data. Texture
+    views do not allocate any more server-side storage, insted relying
+    on the storage buffer of the source texture.
+
+    Texture views are only available when using immutable storage. For
+    more information on texture views see
+    http://www.opengl.org/wiki/Texture_Storage#Texture_views.
+
+    The \a target argument specifies the target to use for the view.
+    Only some targets can be used depending upon the target of the original
+    target. For e.g. a view onto a Target1DArray texture can specify
+    either Target1DArray or Target1D but for the latter the number of
+    array layers specified with \a minimumLayer and \a maximumLayer must
+    be exactly 1.
+
+    Simpliar constraints apply for the \a viewFormat. See the above link
+    and the specification for more details.
+
+    The \a minimumMipmapLevel, \a maximumMipmapLevel, \a minimumLayer,
+    and \a maximumLayer arguments serve to restrict the parts of the
+    texture accessible by the texture view.
+
+    If creation of the texture view fails this function will return
+    0. If the function succeeds it will return a pointer to a new
+    QOpenGLTexture object that will return \c true from its isTextureView()
+    function.
+
+    \sa isTextureView()
+*/
+QOpenGLTexture *QOpenGLTexture::createTextureView(Target target,
+                                                  TextureFormat viewFormat,
+                                                  int minimumMipmapLevel, int maximumMipmapLevel,
+                                                  int minimumLayer, int maximumLayer) const
+{
+    Q_D(const QOpenGLTexture);
+    if (!isStorageAllocated()) {
+        qWarning("Cannot set create a texture view of a texture that does not have storage allocated.");
+        return nullptr;
+    }
+    Q_ASSERT(maximumMipmapLevel >= minimumMipmapLevel);
+    Q_ASSERT(maximumLayer >= minimumLayer);
+    return d->createTextureView(target, viewFormat,
+                                minimumMipmapLevel, maximumMipmapLevel,
+                                minimumLayer, maximumLayer);
+}
+
+/*!
+    Returns \c true if this texture object is actually a view onto another
+    texture object.
+
+    \sa createTextureView()
+*/
+bool QOpenGLTexture::isTextureView() const
+{
+    Q_D(const QOpenGLTexture);
+    Q_ASSERT(d->textureId);
+    return d->textureView;
+}
+
+/*!
+    Uploads pixel \a data for this texture object \a mipLevel, array \a layer, and \a cubeFace.
+    Storage must have been allocated before uploading pixel data. Some overloads of setData()
+    will set appropriate dimensions, mipmap levels, and array layers and then allocate storage
+    for you if they have enough information to do so. This will be noted in the function
+    documentation.
+
+    The structure of the pixel data pointed to by \a data is specified by \a sourceFormat
+    and \a sourceType. The pixel data upload can optionally be controlled by \a options.
+
+    If using a compressed format() then you should use setCompressedData() instead of this
+    function.
+
+    \since 5.3
+    \sa setCompressedData()
+*/
+void QOpenGLTexture::setData(int mipLevel, int layer, CubeMapFace cubeFace,
+                             PixelFormat sourceFormat, PixelType sourceType,
+                             const void *data, const QOpenGLPixelTransferOptions * const options)
+{
+    Q_D(QOpenGLTexture);
+    Q_ASSERT(d->textureId);
+    if (!isStorageAllocated()) {
+        qWarning("Cannot set data on a texture that does not have storage allocated.\n"
+                 "To do so call allocateStorage() before this function");
+        return;
+    }
+    d->setData(mipLevel, layer, 1, cubeFace, sourceFormat, sourceType, data, options);
+}
+
+/*!
+    \since 5.9
+    \overload
+
+    Parameter \a layerCount is the number of layers in a texture array
+    that are being uploaded/populated by this call.
+*/
+void QOpenGLTexture::setData(int mipLevel, int layer, int layerCount, QOpenGLTexture::CubeMapFace cubeFace, QOpenGLTexture::PixelFormat sourceFormat, QOpenGLTexture::PixelType sourceType, const void *data, const QOpenGLPixelTransferOptions * const options)
+{
+    Q_D(QOpenGLTexture);
+    Q_ASSERT(d->textureId);
+    if (!isStorageAllocated()) {
+        qWarning("Cannot set data on a texture that does not have storage allocated.\n"
+                 "To do so call allocateStorage() before this function");
+        return;
+    }
+    d->setData(mipLevel, layer, layerCount, cubeFace, sourceFormat, sourceType, data, options);
+}
+
+/*!
+    \since 5.3
+    \overload
+*/
+void QOpenGLTexture::setData(int mipLevel, int layer,
+                             PixelFormat sourceFormat, PixelType sourceType,
+                             const void *data, const QOpenGLPixelTransferOptions * const options)
+{
+    Q_D(QOpenGLTexture);
+    Q_ASSERT(d->textureId);
+    d->setData(mipLevel, layer, 1, QOpenGLTexture::CubeMapPositiveX, sourceFormat, sourceType, data, options);
+}
+
+/*!
+    \since 5.3
+    \overload
+*/
+void QOpenGLTexture::setData(int mipLevel,
+                             PixelFormat sourceFormat, PixelType sourceType,
+                             const void *data, const QOpenGLPixelTransferOptions * const options)
+{
+    Q_D(QOpenGLTexture);
+    Q_ASSERT(d->textureId);
+    d->setData(mipLevel, 0, 1, QOpenGLTexture::CubeMapPositiveX, sourceFormat, sourceType, data, options);
+}
+
+/*!
+    \since 5.3
+    \overload
+*/
+void QOpenGLTexture::setData(PixelFormat sourceFormat, PixelType sourceType,
+                             const void *data, const QOpenGLPixelTransferOptions * const options)
+{
+    Q_D(QOpenGLTexture);
+    Q_ASSERT(d->textureId);
+    d->setData(0, 0, 1, QOpenGLTexture::CubeMapPositiveX, sourceFormat, sourceType, data, options);
+}
+
+/*!
+    \since 5.14
+    \overload
+
+    This overload is to be used to update a part of the texture. Parameters \a
+    xOffset, \a yOffset, \a zOffset specify the texel offsets within the
+    texture. Parameters \a width, \a height and \a depth specify the dimensions
+    of the sub image.
+
+    The structure of the pixel data pointed to by \a data is specified by \a
+    sourceFormat and \a sourceType. The pixel data upload can optionally be
+    controlled by \a options.
+*/
+void QOpenGLTexture::setData(int xOffset, int yOffset, int zOffset,
+                             int width, int height, int depth,
+                             PixelFormat sourceFormat, PixelType sourceType,
+                             const void *data, const QOpenGLPixelTransferOptions * const options)
+{
+    Q_D(QOpenGLTexture);
+    Q_ASSERT(d->textureId);
+    d->setData(xOffset, yOffset, zOffset,
+               width, height, depth,
+               0, 0, 1,
+               QOpenGLTexture::CubeMapPositiveX, sourceFormat,
+               sourceType, data, options);
+}
+
+/*!
+    \since 5.14
+    \overload
+
+    This overload is to be used to update a part of the texture. Parameters \a
+    xOffset, \a yOffset, \a zOffset specify the texel offsets within the
+    texture. Parameters \a width, \a height and \a depth specify the dimensions
+    of the sub image. The mip map level the sub image we want to
+    update is specified with \a mipLevel.
+
+    The structure of the pixel data pointed to by \a data is specified by \a
+    sourceFormat and \a sourceType. The pixel data upload can optionally be
+    controlled by \a options.
+*/
+void QOpenGLTexture::setData(int xOffset, int yOffset, int zOffset,
+                             int width, int height, int depth,
+                             int mipLevel,
+                             PixelFormat sourceFormat, PixelType sourceType,
+                             const void *data, const QOpenGLPixelTransferOptions * const options)
+{
+    Q_D(QOpenGLTexture);
+    Q_ASSERT(d->textureId);
+    d->setData(xOffset, yOffset, zOffset,
+               width, height, depth,
+               mipLevel, 0, 1,
+               QOpenGLTexture::CubeMapPositiveX, sourceFormat,
+               sourceType, data, options);
+}
+
+/*!
+    \since 5.14
+    \overload
+
+    This overload is to be used to update a part of the texture. Parameters \a
+    xOffset, \a yOffset, \a zOffset specify the texel offsets within the
+    texture. Parameters \a width, \a height and \a depth specify the dimensions
+    of the sub image. The mip map level and layerof the sub image we want to
+    update are specified with \a mipLevel and \a layer.
+
+    The structure of the pixel data pointed to by \a data is specified by \a
+    sourceFormat and \a sourceType. The pixel data upload can optionally be
+    controlled by \a options.
+*/
+void QOpenGLTexture::setData(int xOffset, int yOffset, int zOffset,
+                             int width, int height, int depth,
+                             int mipLevel, int layer,
+                             PixelFormat sourceFormat, PixelType sourceType,
+                             const void *data, const QOpenGLPixelTransferOptions * const options)
+{
+    Q_D(QOpenGLTexture);
+    Q_ASSERT(d->textureId);
+    d->setData(xOffset, yOffset, zOffset,
+               width, height, depth,
+               mipLevel, layer, 1,
+               QOpenGLTexture::CubeMapPositiveX, sourceFormat,
+               sourceType, data, options);
+}
+
+/*!
+    \since 5.14
+    \overload
+
+    This overload is to be used to update a part of the texture. Parameters \a
+    xOffset, \a yOffset, \a zOffset specify the texel offsets within the
+    texture. Parameters \a width, \a height and \a depth specify the dimensions
+    of the sub image.The mip map level, layer and cube map face of the sub
+    image we want to update are specified with \a mipLevel, \a layer and \a
+    face.
+
+    The structure of the pixel data pointed to by \a data is specified by \a
+    sourceFormat and \a sourceType. The pixel data upload can optionally be
+    controlled by \a options.
+*/
+void QOpenGLTexture::setData(int xOffset, int yOffset, int zOffset,
+                             int width, int height, int depth,
+                             int mipLevel, int layer,
+                             CubeMapFace face,
+                             PixelFormat sourceFormat, PixelType sourceType,
+                             const void *data, const QOpenGLPixelTransferOptions * const options)
+{
+    Q_D(QOpenGLTexture);
+    Q_ASSERT(d->textureId);
+    d->setData(xOffset, yOffset, zOffset,
+               width, height, depth,
+               mipLevel, layer, 1,
+               face, sourceFormat,
+               sourceType, data, options);
+}
+
+/*!
+    \since 5.14
+    \overload
+
+    This overload is to be used to update a part of the texture. Parameters \a
+    xOffset, \a yOffset, \a zOffset specify the texel offsets within the
+    texture. Parameters \a width, \a height and \a depth specify the dimensions
+    of the sub image.The mip map level, starting layer, cube map face and
+    number of layers of the sub image we want to update are specified with \a
+    mipLevel, \a layer, \a face and \a layerCount.
+
+    The structure of the pixel data pointed to by \a data is specified by \a
+    sourceFormat and \a sourceType. The pixel data upload can optionally be
+    controlled by \a options.
+*/
+void QOpenGLTexture::setData(int xOffset, int yOffset, int zOffset,
+                             int width, int height, int depth,
+                             int mipLevel, int layer,
+                             CubeMapFace face, int layerCount,
+                             PixelFormat sourceFormat, PixelType sourceType,
+                             const void *data, const QOpenGLPixelTransferOptions * const options)
+{
+    Q_D(QOpenGLTexture);
+    Q_ASSERT(d->textureId);
+    d->setData(xOffset, yOffset, zOffset,
+               width, height, depth,
+               mipLevel, layer, layerCount,
+               face, sourceFormat,
+               sourceType, data, options);
+}
+
+#if QT_DEPRECATED_SINCE(5, 3)
+/*!
+    \obsolete
+    \overload
+
+    \sa setCompressedData()
+*/
+void QOpenGLTexture::setData(int mipLevel, int layer, CubeMapFace cubeFace,
+                             PixelFormat sourceFormat, PixelType sourceType,
+                             void *data, const QOpenGLPixelTransferOptions * const options)
+{
+    Q_D(QOpenGLTexture);
+    Q_ASSERT(d->textureId);
+    if (!isStorageAllocated()) {
+        qWarning("Cannot set data on a texture that does not have storage allocated.\n"
+                 "To do so call allocateStorage() before this function");
+        return;
+    }
+    d->setData(mipLevel, layer, 1, cubeFace, sourceFormat, sourceType, data, options);
+}
+
+/*!
+    \obsolete
+    \overload
+*/
+void QOpenGLTexture::setData(int mipLevel, int layer,
+                             PixelFormat sourceFormat, PixelType sourceType,
+                             void *data, const QOpenGLPixelTransferOptions * const options)
+{
+    Q_D(QOpenGLTexture);
+    Q_ASSERT(d->textureId);
+    d->setData(mipLevel, layer, 1, QOpenGLTexture::CubeMapPositiveX, sourceFormat, sourceType, data, options);
+}
+
+/*!
+    \obsolete
+    \overload
+*/
+void QOpenGLTexture::setData(int mipLevel,
+                             PixelFormat sourceFormat, PixelType sourceType,
+                             void *data, const QOpenGLPixelTransferOptions * const options)
+{
+    Q_D(QOpenGLTexture);
+    Q_ASSERT(d->textureId);
+    d->setData(mipLevel, 0, 1, QOpenGLTexture::CubeMapPositiveX, sourceFormat, sourceType, data, options);
+}
+
+/*!
+    \obsolete
+    \overload
+*/
+void QOpenGLTexture::setData(PixelFormat sourceFormat, PixelType sourceType,
+                             void *data, const QOpenGLPixelTransferOptions * const options)
+{
+    Q_D(QOpenGLTexture);
+    Q_ASSERT(d->textureId);
+    d->setData(0, 0, 1, QOpenGLTexture::CubeMapPositiveX, sourceFormat, sourceType, data, options);
+}
+#endif
+
+/*!
+    This overload of setData() will allocate storage for you.
+    The pixel data is contained in \a image. Mipmaps are generated by default.
+    Set \a genMipMaps to \l DontGenerateMipMaps to turn off mipmap generation.
+
+    \overload
+*/
+void QOpenGLTexture::setData(const QImage& image, MipMapGeneration genMipMaps)
+{
+    QOpenGLContext *context = QOpenGLContext::currentContext();
+    if (!context) {
+        qWarning("QOpenGLTexture::setData() requires a valid current context");
+        return;
+    }
+
+    if (image.isNull()) {
+        qWarning("QOpenGLTexture::setData() tried to set a null image");
+        return;
+    }
+
+    if (context->isOpenGLES() && context->format().majorVersion() < 3)
+        setFormat(QOpenGLTexture::RGBAFormat);
+    else
+        setFormat(QOpenGLTexture::RGBA8_UNorm);
+
+    setSize(image.width(), image.height());
+    setMipLevels(genMipMaps == GenerateMipMaps ? maximumMipLevels() : 1);
+    allocateStorage(QOpenGLTexture::RGBA, QOpenGLTexture::UInt8);
+
+    // Upload pixel data and generate mipmaps
+    QImage glImage = image.convertToFormat(QImage::Format_RGBA8888);
+    QOpenGLPixelTransferOptions uploadOptions;
+    uploadOptions.setAlignment(1);
+    setData(0, QOpenGLTexture::RGBA, QOpenGLTexture::UInt8, glImage.constBits(), &uploadOptions);
+}
+
+/*!
+    Uploads compressed pixel \a data to \a mipLevel, array \a layer, and \a cubeFace.
+    The pixel transfer can optionally be controlled with \a options. The \a dataSize
+    argument should specify the size of the data pointed to by \a data.
+
+    If not using a compressed format() then you should use setData() instead of this
+    function.
+
+    \since 5.3
+*/
+void QOpenGLTexture::setCompressedData(int mipLevel, int layer, CubeMapFace cubeFace,
+                                       int dataSize, const void *data,
+                                       const QOpenGLPixelTransferOptions * const options)
+{
+    Q_D(QOpenGLTexture);
+    Q_ASSERT(d->textureId);
+    if (!isStorageAllocated()) {
+        qWarning("Cannot set data on a texture that does not have storage allocated.\n"
+                 "To do so call allocateStorage() before this function");
+        return;
+    }
+    d->setCompressedData(mipLevel, layer, 1, cubeFace, dataSize, data, options);
+}
+
+/*!
+    \since 5.9
+    \overload
+
+    Parameter \a layerCount is the number of layers in a texture array
+    that are being uploaded/populated by this call.
+*/
+void QOpenGLTexture::setCompressedData(int mipLevel, int layer, int layerCount, QOpenGLTexture::CubeMapFace cubeFace, int dataSize, const void *data, const QOpenGLPixelTransferOptions * const options)
+{
+    Q_D(QOpenGLTexture);
+    Q_ASSERT(d->textureId);
+    if (!isStorageAllocated()) {
+        qWarning("Cannot set data on a texture that does not have storage allocated.\n"
+                 "To do so call allocateStorage() before this function");
+        return;
+    }
+    d->setCompressedData(mipLevel, layer, layerCount, cubeFace, dataSize, data, options);
+}
+
+/*!
+    \overload
+*/
+void QOpenGLTexture::setCompressedData(int mipLevel, int layer, int dataSize, const void *data,
+                                       const QOpenGLPixelTransferOptions * const options)
+{
+    Q_D(QOpenGLTexture);
+    Q_ASSERT(d->textureId);
+    d->setCompressedData(mipLevel, layer, 1, QOpenGLTexture::CubeMapPositiveX, dataSize, data, options);
+}
+
+/*!
+    \overload
+*/
+void QOpenGLTexture::setCompressedData(int mipLevel, int dataSize, const void *data,
+                                       const QOpenGLPixelTransferOptions * const options)
+{
+    Q_D(QOpenGLTexture);
+    Q_ASSERT(d->textureId);
+    d->setCompressedData(mipLevel, 0, 1, QOpenGLTexture::CubeMapPositiveX, dataSize, data, options);
+}
+
+/*!
+    \overload
+*/
+void QOpenGLTexture::setCompressedData(int dataSize, const void *data,
+                                       const QOpenGLPixelTransferOptions * const options)
+{
+    Q_D(QOpenGLTexture);
+    Q_ASSERT(d->textureId);
+    d->setCompressedData(0, 0, 1, QOpenGLTexture::CubeMapPositiveX, dataSize, data, options);
+}
+
+#if QT_DEPRECATED_SINCE(5, 3)
+/*!
+    \obsolete
+    \overload
+*/
+void QOpenGLTexture::setCompressedData(int mipLevel, int layer, CubeMapFace cubeFace,
+                                       int dataSize, void *data,
+                                       const QOpenGLPixelTransferOptions * const options)
+{
+    Q_D(QOpenGLTexture);
+    Q_ASSERT(d->textureId);
+    if (!isStorageAllocated()) {
+        qWarning("Cannot set data on a texture that does not have storage allocated.\n"
+                 "To do so call allocateStorage() before this function");
+        return;
+    }
+    d->setCompressedData(mipLevel, layer, 1, cubeFace, dataSize, data, options);
+}
+
+/*!
+    \obsolete
+    \overload
+*/
+void QOpenGLTexture::setCompressedData(int mipLevel, int layer, int dataSize, void *data,
+                                       const QOpenGLPixelTransferOptions * const options)
+{
+    Q_D(QOpenGLTexture);
+    Q_ASSERT(d->textureId);
+    d->setCompressedData(mipLevel, layer, 1, QOpenGLTexture::CubeMapPositiveX, dataSize, data, options);
+}
+
+/*!
+    \obsolete
+    \overload
+*/
+void QOpenGLTexture::setCompressedData(int mipLevel, int dataSize, void *data,
+                                       const QOpenGLPixelTransferOptions * const options)
+{
+    Q_D(QOpenGLTexture);
+    Q_ASSERT(d->textureId);
+    d->setCompressedData(mipLevel, 0, 1, QOpenGLTexture::CubeMapPositiveX, dataSize, data, options);
+}
+
+/*!
+    \obsolete
+    \overload
+*/
+void QOpenGLTexture::setCompressedData(int dataSize, void *data,
+                                       const QOpenGLPixelTransferOptions * const options)
+{
+    Q_D(QOpenGLTexture);
+    Q_ASSERT(d->textureId);
+    d->setCompressedData(0, 0, 1, QOpenGLTexture::CubeMapPositiveX, dataSize, data, options);
+}
+#endif
+
+/*!
+    Returns \c true if your OpenGL implementation and version supports the texture
+    feature \a feature.
+*/
+bool QOpenGLTexture::hasFeature(Feature feature)
+{
+    QOpenGLContext *ctx = QOpenGLContext::currentContext();
+    if (!ctx) {
+        qWarning("QOpenGLTexture::hasFeature() requires a valid current context");
+        return false;
+    }
+
+    QSurfaceFormat f = ctx->format();
+
+    bool supported = false;
+
+#if !defined(QT_OPENGL_ES_2)
+    if (!ctx->isOpenGLES()) {
+        switch (feature) {
+        case ImmutableMultisampleStorage:
+            supported = f.version() >= qMakePair(4, 3)
+                    || ctx->hasExtension(QByteArrayLiteral("GL_ARB_texture_storage_multisample"));
+            break;
+
+        case TextureBuffer:
+            supported = f.version() >= qMakePair(3, 0)
+                    || ctx->hasExtension(QByteArrayLiteral("GL_ARB_texture_buffer_object"));
+            break;
+
+        case StencilTexturing:
+            supported = f.version() >= qMakePair(4, 3)
+                    || ctx->hasExtension(QByteArrayLiteral("GL_ARB_stencil_texturing"));
+            break;
+
+        case ImmutableStorage:
+            supported = f.version() >= qMakePair(4, 2)
+                    || ctx->hasExtension(QByteArrayLiteral("GL_ARB_texture_storage"))
+                    || ctx->hasExtension(QByteArrayLiteral("GL_EXT_texture_storage"));
+            break;
+
+        case TextureCubeMapArrays:
+            supported = f.version() >= qMakePair(4, 0)
+                    || ctx->hasExtension(QByteArrayLiteral("ARB_texture_cube_map_array"));
+            break;
+
+        case Swizzle:
+            supported = f.version() >= qMakePair(3, 3)
+                    || ctx->hasExtension(QByteArrayLiteral("GL_ARB_texture_swizzle"));
+            break;
+
+        case TextureMultisample:
+            supported = f.version() >= qMakePair(3, 2)
+                    || ctx->hasExtension(QByteArrayLiteral("GL_ARB_texture_multisample"));
+            break;
+
+        case TextureArrays:
+            supported = f.version() >= qMakePair(3, 0)
+                    || ctx->hasExtension(QByteArrayLiteral("GL_EXT_texture_array"));
+            break;
+
+        case TextureRectangle:
+            supported = f.version() >= qMakePair(2, 1)
+                    || ctx->hasExtension(QByteArrayLiteral("ARB_texture_rectangle"));
+            break;
+
+        case Texture3D:
+            supported = f.version() >= qMakePair(1, 3);
+            break;
+
+        case AnisotropicFiltering:
+            supported = ctx->hasExtension(QByteArrayLiteral("GL_EXT_texture_filter_anisotropic"));
+            break;
+
+        case NPOTTextures:
+        case NPOTTextureRepeat:
+            supported = ctx->hasExtension(QByteArrayLiteral("GL_ARB_texture_non_power_of_two"));
+            break;
+
+        case Texture1D:
+            supported = f.version() >= qMakePair(1, 1);
+            break;
+
+        case TextureComparisonOperators:
+            // GL 1.4 and GL_ARB_shadow alone support only LEQUAL and GEQUAL;
+            // since we're talking about history anyhow avoid to be extra pedantic
+            // in the feature set, and simply claim supported if we have the full set of operators
+            // (which has been added into 1.5 / GL_EXT_shadow_funcs).
+            supported = f.version() >= qMakePair(1, 5)
+                    || (ctx->hasExtension(QByteArrayLiteral("GL_ARB_shadow"))
+                        && ctx->hasExtension(QByteArrayLiteral("GL_EXT_shadow_funcs")));
+            break;
+
+        case TextureMipMapLevel:
+            supported = f.version() >= qMakePair(1, 2);
+            break;
+
+        case MaxFeatureFlag:
+            break;
+        }
+    }
+
+    if (ctx->isOpenGLES())
+#endif
+    {
+        const char *renderer = reinterpret_cast<const char *>(ctx->functions()->glGetString(GL_RENDERER));
+        switch (feature) {
+        case ImmutableStorage:
+            supported = (f.version() >= qMakePair(3, 0) || ctx->hasExtension(QByteArrayLiteral("GL_EXT_texture_storage")))
+                && !(renderer && strstr(renderer, "Mali")); // do not use on Mali: QTBUG-45106
+            break;
+
+        case ImmutableMultisampleStorage:
+            supported = f.version() >= qMakePair(3, 1);
+            break;
+
+        case TextureRectangle:
+            break;
+
+        case TextureArrays:
+            supported = f.version() >= qMakePair(3, 0);
+            break;
+
+        case Texture3D:
+            supported = f.version() >= qMakePair(3, 0)
+                    || ctx->hasExtension(QByteArrayLiteral("GL_OES_texture_3D"));
+            break;
+
+        case TextureMultisample:
+            supported = f.version() >= qMakePair(3, 1);
+            break;
+
+        case TextureBuffer:
+            break;
+
+        case TextureCubeMapArrays:
+            break;
+
+        case Swizzle:
+            supported = f.version() >= qMakePair(3, 0);
+            break;
+
+        case StencilTexturing:
+            break;
+
+        case AnisotropicFiltering:
+            supported = ctx->hasExtension(QByteArrayLiteral("GL_EXT_texture_filter_anisotropic"));
+            break;
+
+        case NPOTTextures:
+        case NPOTTextureRepeat:
+            supported = f.version() >= qMakePair(3,0)
+                    || ctx->hasExtension(QByteArrayLiteral("GL_OES_texture_npot"))
+                    || ctx->hasExtension(QByteArrayLiteral("GL_ARB_texture_non_power_of_two"));
+            break;
+
+        case Texture1D:
+            break;
+
+        case TextureComparisonOperators:
+            supported = f.version() >= qMakePair(3, 0)
+                    || ctx->hasExtension(QByteArrayLiteral("GL_EXT_shadow_samplers"));
+            break;
+
+        case TextureMipMapLevel:
+            supported = f.version() >= qMakePair(3, 0);
+            break;
+
+        case MaxFeatureFlag:
+            break;
+        }
+    }
+
+    return supported;
+}
+
+/*!
+    Sets the base mipmap level used for all texture lookups with this texture to \a baseLevel.
+
+    \note This function has no effect on Qt built for OpenGL ES 2.
+    \sa mipBaseLevel(), setMipMaxLevel(), setMipLevelRange()
+*/
+void QOpenGLTexture::setMipBaseLevel(int baseLevel)
+{
+    Q_D(QOpenGLTexture);
+    d->create();
+    if (!d->features.testFlag(TextureMipMapLevel)) {
+        qWarning("QOpenGLTexture::setMipBaseLevel: requires OpenGL >= 1.2 or OpenGL ES >= 3.0");
+        return;
+    }
+    Q_ASSERT(d->textureId);
+    Q_ASSERT(d->texFuncs);
+    Q_ASSERT(baseLevel <= d->maxLevel);
+    d->baseLevel = baseLevel;
+    d->texFuncs->glTextureParameteri(d->textureId, d->target, d->bindingTarget, GL_TEXTURE_BASE_LEVEL, baseLevel);
+}
+
+/*!
+    Returns the mipmap base level used for all texture lookups with this texture.
+    The default is 0.
+
+    \sa setMipBaseLevel(), mipMaxLevel(), mipLevelRange()
+*/
+int QOpenGLTexture::mipBaseLevel() const
+{
+    Q_D(const QOpenGLTexture);
+    return d->baseLevel;
+}
+
+/*!
+    Sets the maximum mipmap level used for all texture lookups with this texture to \a maxLevel.
+
+    \note This function has no effect on Qt built for OpenGL ES 2.
+    \sa mipMaxLevel(), setMipBaseLevel(), setMipLevelRange()
+*/
+void QOpenGLTexture::setMipMaxLevel(int maxLevel)
+{
+    Q_D(QOpenGLTexture);
+    d->create();
+    if (!d->features.testFlag(TextureMipMapLevel)) {
+        qWarning("QOpenGLTexture::setMipMaxLevel: requires OpenGL >= 1.2 or OpenGL ES >= 3.0");
+        return;
+    }
+    Q_ASSERT(d->textureId);
+    Q_ASSERT(d->texFuncs);
+    Q_ASSERT(d->baseLevel <= maxLevel);
+    d->maxLevel = maxLevel;
+    d->texFuncs->glTextureParameteri(d->textureId, d->target, d->bindingTarget, GL_TEXTURE_MAX_LEVEL, maxLevel);
+}
+
+/*!
+    Returns the mipmap maximum level used for all texture lookups with this texture.
+
+    \sa setMipMaxLevel(), mipBaseLevel(), mipLevelRange()
+*/
+int QOpenGLTexture::mipMaxLevel() const
+{
+    Q_D(const QOpenGLTexture);
+    return d->maxLevel;
+}
+
+/*!
+    Sets the range of mipmap levels that can be used for texture lookups with this texture
+    to range from \a baseLevel to \a maxLevel.
+
+    \note This function has no effect on Qt built for OpenGL ES 2.
+    \sa setMipBaseLevel(), setMipMaxLevel(), mipLevelRange()
+*/
+void QOpenGLTexture::setMipLevelRange(int baseLevel, int maxLevel)
+{
+    Q_D(QOpenGLTexture);
+    d->create();
+    if (!d->features.testFlag(TextureMipMapLevel)) {
+        qWarning("QOpenGLTexture::setMipLevelRange: requires OpenGL >= 1.2 or OpenGL ES >= 3.0");
+        return;
+    }
+    Q_ASSERT(d->textureId);
+    Q_ASSERT(d->texFuncs);
+    Q_ASSERT(baseLevel <= maxLevel);
+    d->texFuncs->glTextureParameteri(d->textureId, d->target, d->bindingTarget, GL_TEXTURE_BASE_LEVEL, baseLevel);
+    d->texFuncs->glTextureParameteri(d->textureId, d->target, d->bindingTarget, GL_TEXTURE_MAX_LEVEL, maxLevel);
+}
+
+/*!
+    Returns the range of mipmap levels that can be used for texture lookups with this texture.
+
+    \sa mipBaseLevel(), mipMaxLevel()
+*/
+QPair<int, int> QOpenGLTexture::mipLevelRange() const
+{
+    Q_D(const QOpenGLTexture);
+    return qMakePair(d->baseLevel, d->maxLevel);
+}
+
+/*!
+    If \a enabled is \c true, enables automatic mipmap generation for this texture object
+    to occur whenever the level 0 mipmap data is set via setData().
+
+    The automatic mipmap generation is enabled by default.
+
+    \note Mipmap generation is not supported for compressed textures with OpenGL ES 2.0.
+
+    \sa isAutoMipMapGenerationEnabled(), generateMipMaps()
+*/
+void QOpenGLTexture::setAutoMipMapGenerationEnabled(bool enabled)
+{
+    Q_D(QOpenGLTexture);
+    d->autoGenerateMipMaps = enabled;
+}
+
+/*!
+    Returns whether auto mipmap generation is enabled for this texture object.
+
+    \sa setAutoMipMapGenerationEnabled(), generateMipMaps()
+*/
+bool QOpenGLTexture::isAutoMipMapGenerationEnabled() const
+{
+    Q_D(const QOpenGLTexture);
+    return d->autoGenerateMipMaps;
+}
+
+/*!
+    Generates mipmaps for this texture object from mipmap level 0. If you are
+    using a texture target and filtering option that requires mipmaps and you
+    have disabled automatic mipmap generation then you need to call this function
+    or the overload to create the mipmap chain.
+
+    \note Mipmap generation is not supported for compressed textures with OpenGL ES.
+
+    \sa setAutoMipMapGenerationEnabled(), setMipLevels(), mipLevels()
+*/
+void QOpenGLTexture::generateMipMaps()
+{
+    Q_D(QOpenGLTexture);
+    Q_ASSERT(d->texFuncs);
+    Q_ASSERT(d->textureId);
+    if (isCompressedFormat(d->format)) {
+        if (QOpenGLContext *ctx = QOpenGLContext::currentContext())
+            if (ctx->isOpenGLES())
+                return;
+    }
+    d->texFuncs->glGenerateTextureMipmap(d->textureId, d->target, d->bindingTarget);
+}
+
+/*!
+    Generates mipmaps for this texture object from mipmap level \a baseLevel. If you are
+    using a texture target and filtering option that requires mipmaps and you
+    have disabled automatic mipmap generation then you need to call this function
+    or the overload to create the mipmap chain.
+
+    The generation of mipmaps to above \a baseLevel is achieved by setting the mipmap
+    base level to \a baseLevel and then generating the mipmap chain. If \a resetBaseLevel
+    is \c true, then the baseLevel of the texture will be reset to its previous value.
+
+    \sa setAutoMipMapGenerationEnabled(), setMipLevels(), mipLevels()
+*/
+void QOpenGLTexture::generateMipMaps(int baseLevel, bool resetBaseLevel)
+{
+    Q_D(QOpenGLTexture);
+    Q_ASSERT(d->texFuncs);
+    Q_ASSERT(d->textureId);
+    if (isCompressedFormat(d->format)) {
+        if (QOpenGLContext *ctx = QOpenGLContext::currentContext())
+            if (ctx->isOpenGLES())
+                return;
+    }
+    int oldBaseLevel;
+    if (resetBaseLevel)
+        oldBaseLevel = mipBaseLevel();
+    setMipBaseLevel(baseLevel);
+    d->texFuncs->glGenerateTextureMipmap(d->textureId, d->target, d->bindingTarget);
+    if (resetBaseLevel)
+        setMipBaseLevel(oldBaseLevel);
+}
+
+/*!
+    GLSL shaders are able to reorder the components of the vec4 returned by texture
+    functions. It is also desirable to be able to control this reordering from CPU
+    side code. This is made possible by swizzle masks since OpenGL 3.3.
+
+    Each component of the texture can be mapped to one of the SwizzleValue options.
+
+    This function maps \a component to the output \a value.
+
+    \note This function has no effect on Mac and Qt built for OpenGL ES 2.
+    \sa swizzleMask()
+*/
+void QOpenGLTexture::setSwizzleMask(SwizzleComponent component, SwizzleValue value)
+{
+#if !defined(Q_OS_MAC) && !defined(QT_OPENGL_ES_2)
+    if (!QOpenGLContext::currentContext()->isOpenGLES()) {
+        Q_D(QOpenGLTexture);
+        d->create();
+        Q_ASSERT(d->texFuncs);
+        Q_ASSERT(d->textureId);
+        if (!d->features.testFlag(Swizzle)) {
+            qWarning("QOpenGLTexture::setSwizzleMask() requires OpenGL >= 3.3");
+            return;
+        }
+        d->swizzleMask[component - SwizzleRed] = value;
+        d->texFuncs->glTextureParameteri(d->textureId, d->target, d->bindingTarget, component, value);
+        return;
+    }
+#else
+    Q_UNUSED(component);
+    Q_UNUSED(value);
+#endif
+    qWarning("QOpenGLTexture: Texture swizzling is not supported");
+}
+
+/*!
+    Parameters \a {r}, \a {g}, \a {b}, and \a {a}  are values used for setting
+    the colors red, green, blue, and the alpha value.
+    \overload
+*/
+void QOpenGLTexture::setSwizzleMask(SwizzleValue r, SwizzleValue g,
+                                    SwizzleValue b, SwizzleValue a)
+{
+#if !defined(Q_OS_MAC) && !defined(QT_OPENGL_ES_2)
+    if (!QOpenGLContext::currentContext()->isOpenGLES()) {
+        Q_D(QOpenGLTexture);
+        d->create();
+        Q_ASSERT(d->texFuncs);
+        Q_ASSERT(d->textureId);
+        if (!d->features.testFlag(Swizzle)) {
+            qWarning("QOpenGLTexture::setSwizzleMask() requires OpenGL >= 3.3");
+            return;
+        }
+        GLint swizzleMask[] = {GLint(r), GLint(g), GLint(b), GLint(a)};
+        d->swizzleMask[0] = r;
+        d->swizzleMask[1] = g;
+        d->swizzleMask[2] = b;
+        d->swizzleMask[3] = a;
+        d->texFuncs->glTextureParameteriv(d->textureId, d->target, d->bindingTarget, GL_TEXTURE_SWIZZLE_RGBA, swizzleMask);
+        return;
+    }
+#else
+    Q_UNUSED(r);
+    Q_UNUSED(g);
+    Q_UNUSED(b);
+    Q_UNUSED(a);
+#endif
+    qWarning("QOpenGLTexture: Texture swizzling is not supported");
+}
+
+/*!
+    Returns the swizzle mask for texture \a component.
+*/
+QOpenGLTexture::SwizzleValue QOpenGLTexture::swizzleMask(SwizzleComponent component) const
+{
+    Q_D(const QOpenGLTexture);
+    return d->swizzleMask[component - SwizzleRed];
+}
+
+/*!
+    \enum QOpenGLTexture::DepthStencilMode
+    \since 5.4
+    This enum specifies which component of a depth/stencil texture is
+    accessed when the texture is sampled.
+
+    \value DepthMode Equivalent to GL_DEPTH_COMPONENT.
+    \value StencilMode Equivalent to GL_STENCIL_INDEX.
+*/
+
+/*!
+    If using a texture that has a combined depth/stencil format this function sets
+    which component of the texture is accessed to \a mode.
+
+    When the parameter is set to DepthMode, then accessing it from the
+    shader will access the depth component as a single float, as normal. But when
+    the parameter is set to StencilMode, the shader will access the stencil component.
+
+    \note This function has no effect on Mac and Qt built for OpenGL ES 2.
+    \since 5.4
+    \sa depthStencilMode()
+*/
+void QOpenGLTexture::setDepthStencilMode(QOpenGLTexture::DepthStencilMode mode)
+{
+#if !defined(Q_OS_MAC) && !defined(QT_OPENGL_ES_2)
+    if (!QOpenGLContext::currentContext()->isOpenGLES()) {
+        Q_D(QOpenGLTexture);
+        d->create();
+        Q_ASSERT(d->texFuncs);
+        Q_ASSERT(d->textureId);
+        if (!d->features.testFlag(StencilTexturing)) {
+            qWarning("QOpenGLTexture::setDepthStencilMode() requires OpenGL >= 4.3 or GL_ARB_stencil_texturing");
+            return;
+        }
+        d->depthStencilMode = mode;
+        d->texFuncs->glTextureParameteri(d->textureId, d->target, d->bindingTarget, GL_DEPTH_STENCIL_TEXTURE_MODE, mode);
+        return;
+    }
+#else
+    Q_UNUSED(mode);
+#endif
+    qWarning("QOpenGLTexture: DepthStencil Mode is not supported");
+}
+
+/*!
+    Returns the depth stencil mode for textures using a combined depth/stencil format.
+
+    \since 5.4
+    \sa setDepthStencilMode()
+*/
+QOpenGLTexture::DepthStencilMode QOpenGLTexture::depthStencilMode() const
+{
+    Q_D(const QOpenGLTexture);
+    return d->depthStencilMode;
+}
+
+/*!
+    \enum QOpenGLTexture::ComparisonFunction
+    \since 5.5
+    This enum specifies which comparison operator is used when texture comparison
+    is enabled on this texture.
+
+    \value CompareLessEqual Equivalent to GL_LEQUAL.
+    \value CompareGreaterEqual Equivalent to GL_GEQUAL.
+    \value CompareLess Equivalent to GL_LESS.
+    \value CompareGreater Equivalent to GL_GREATER.
+    \value CompareEqual Equivalent to GL_EQUAL.
+    \value CommpareNotEqual Equivalent to GL_NOTEQUAL.
+    \value CompareAlways Equivalent to GL_ALWAYS.
+    \value CompareNever Equivalent to GL_NEVER.
+
+*/
+
+/*!
+    \since 5.5
+
+    Sets the texture comparison function on this texture to \a function. The texture
+    comparison function is used by shadow samplers when sampling a depth texture.
+
+    \sa comparisonFunction()
+*/
+void QOpenGLTexture::setComparisonFunction(QOpenGLTexture::ComparisonFunction function)
+{
+    Q_D(QOpenGLTexture);
+    d->create();
+    if (!d->features.testFlag(TextureComparisonOperators)) {
+        qWarning("QOpenGLTexture::setComparisonFunction: requires OpenGL >= 1.5 or OpenGL ES >= 3.0");
+        return;
+    }
+    d->comparisonFunction = function;
+    d->texFuncs->glTextureParameteri(d->textureId, d->target, d->bindingTarget, GL_TEXTURE_COMPARE_FUNC, function);
+}
+
+/*!
+    \since 5.5
+
+    Returns the texture comparison operator set on this texture. By default, a
+    texture has a CompareLessEqual comparison function.
+
+    \sa setComparisonFunction()
+*/
+QOpenGLTexture::ComparisonFunction QOpenGLTexture::comparisonFunction() const
+{
+    Q_D(const QOpenGLTexture);
+    return d->comparisonFunction;
+}
+
+/*!
+    \enum QOpenGLTexture::ComparisonMode
+    \since 5.5
+    This enum specifies which comparison mode is used when sampling this texture.
+
+    \value CompareRefToTexture Equivalent to GL_COMPARE_REF_TO_TEXTURE.
+    \value CompareNone Equivalent to GL_NONE.
+*/
+
+/*!
+    \since 5.5
+
+    Sets the texture comparison mode on this texture to \a mode. The texture
+    comparison mode is used by shadow samplers when sampling a depth texture.
+
+    \sa comparisonMode()
+*/
+void QOpenGLTexture::setComparisonMode(QOpenGLTexture::ComparisonMode mode)
+{
+    Q_D(QOpenGLTexture);
+    d->create();
+    if (!d->features.testFlag(TextureComparisonOperators)) {
+        qWarning("QOpenGLTexture::setComparisonMode: requires OpenGL >= 1.5 or OpenGL ES >= 3.0");
+        return;
+    }
+    d->comparisonMode = mode;
+    d->texFuncs->glTextureParameteri(d->textureId, d->target, d->bindingTarget, GL_TEXTURE_COMPARE_MODE, mode);
+}
+
+/*!
+    \since 5.5
+
+    Returns the texture comparison mode set on this texture. By default, a
+    texture has a CompareNone comparison mode (i.e. comparisons are disabled).
+
+    \sa setComparisonMode()
+*/
+QOpenGLTexture::ComparisonMode QOpenGLTexture::comparisonMode() const
+{
+    Q_D(const QOpenGLTexture);
+    return d->comparisonMode;
+}
+
+/*!
+    Sets the filter used for minification to \a filter.
+
+    \sa minificationFilter(), setMagnificationFilter(), setMinMagFilters()
+*/
+void QOpenGLTexture::setMinificationFilter(QOpenGLTexture::Filter filter)
+{
+    Q_D(QOpenGLTexture);
+    d->create();
+    Q_ASSERT(d->texFuncs);
+    Q_ASSERT(d->textureId);
+    d->minFilter = filter;
+    d->texFuncs->glTextureParameteri(d->textureId, d->target, d->bindingTarget, GL_TEXTURE_MIN_FILTER, filter);
+}
+
+/*!
+    Returns the minification filter.
+
+    \sa setMinificationFilter()
+*/
+QOpenGLTexture::Filter QOpenGLTexture::minificationFilter() const
+{
+    Q_D(const QOpenGLTexture);
+    return d->minFilter;
+}
+
+/*!
+    Sets the magnification filter to \a filter.
+
+    \sa magnificationFilter(), setMinificationFilter(), setMinMagFilters()
+*/
+void QOpenGLTexture::setMagnificationFilter(QOpenGLTexture::Filter filter)
+{
+    Q_D(QOpenGLTexture);
+    d->create();
+    Q_ASSERT(d->texFuncs);
+    Q_ASSERT(d->textureId);
+    d->magFilter = filter;
+    d->texFuncs->glTextureParameteri(d->textureId, d->target, d->bindingTarget, GL_TEXTURE_MAG_FILTER, filter);
+}
+
+/*!
+    Returns the magnification filter.
+
+    \sa setMagnificationFilter()
+*/
+QOpenGLTexture::Filter QOpenGLTexture::magnificationFilter() const
+{
+    Q_D(const QOpenGLTexture);
+    return d->magFilter;
+}
+
+/*!
+    Sets the minification filter to \a minificationFilter and the magnification filter
+    to \a magnificationFilter.
+
+    \sa minMagFilters(), setMinificationFilter(), setMagnificationFilter()
+*/
+void QOpenGLTexture::setMinMagFilters(QOpenGLTexture::Filter minificationFilter,
+                                      QOpenGLTexture::Filter magnificationFilter)
+{
+    Q_D(QOpenGLTexture);
+    d->create();
+    Q_ASSERT(d->texFuncs);
+    Q_ASSERT(d->textureId);
+    d->minFilter = minificationFilter;
+    d->magFilter = magnificationFilter;
+    d->texFuncs->glTextureParameteri(d->textureId, d->target, d->bindingTarget, GL_TEXTURE_MIN_FILTER, minificationFilter);
+    d->texFuncs->glTextureParameteri(d->textureId, d->target, d->bindingTarget, GL_TEXTURE_MAG_FILTER, magnificationFilter);
+}
+
+/*!
+    Returns the current minification and magnification filters.
+
+    \sa setMinMagFilters()
+*/
+QPair<QOpenGLTexture::Filter, QOpenGLTexture::Filter> QOpenGLTexture::minMagFilters() const
+{
+    Q_D(const QOpenGLTexture);
+    return QPair<QOpenGLTexture::Filter, QOpenGLTexture::Filter>(d->minFilter, d->magFilter);
+}
+
+/*!
+    If your OpenGL implementation supports the GL_EXT_texture_filter_anisotropic extension
+    this function sets the maximum anisotropy level to \a anisotropy.
+
+    \sa maximumAnisotropy()
+*/
+void QOpenGLTexture::setMaximumAnisotropy(float anisotropy)
+{
+    Q_D(QOpenGLTexture);
+    d->create();
+    Q_ASSERT(d->texFuncs);
+    Q_ASSERT(d->textureId);
+    if (!d->features.testFlag(AnisotropicFiltering)) {
+        qWarning("QOpenGLTexture::setMaximumAnisotropy() requires GL_EXT_texture_filter_anisotropic");
+        return;
+    }
+    d->maxAnisotropy = anisotropy;
+    d->texFuncs->glTextureParameteri(d->textureId, d->target, d->bindingTarget, GL_TEXTURE_MAX_ANISOTROPY_EXT, anisotropy);
+}
+
+/*!
+    Returns the maximum level of anisotropy to be accounted for when performing texture lookups.
+    This requires the GL_EXT_texture_filter_anisotropic extension.
+
+    \sa setMaximumAnisotropy()
+*/
+float QOpenGLTexture::maximumAnisotropy() const
+{
+    Q_D(const QOpenGLTexture);
+    return d->maxAnisotropy;
+}
+
+/*!
+    Sets the wrap (or repeat mode) for all texture dimentions to \a mode.
+
+    \sa wrapMode()
+*/
+void QOpenGLTexture::setWrapMode(QOpenGLTexture::WrapMode mode)
+{
+    Q_D(QOpenGLTexture);
+    d->create();
+    Q_ASSERT(d->texFuncs);
+    Q_ASSERT(d->textureId);
+    d->setWrapMode(mode);
+}
+
+/*!
+    Holds the texture dimension \a direction.
+    \overload
+*/
+void QOpenGLTexture::setWrapMode(QOpenGLTexture::CoordinateDirection direction, QOpenGLTexture::WrapMode mode)
+{
+    Q_D(QOpenGLTexture);
+    d->create();
+    Q_ASSERT(d->texFuncs);
+    Q_ASSERT(d->textureId);
+    d->setWrapMode(direction, mode);
+}
+
+/*!
+    Returns the wrap mode for the texture dimension \a direction.
+
+    \sa setWrapMode()
+*/
+QOpenGLTexture::WrapMode QOpenGLTexture::wrapMode(QOpenGLTexture::CoordinateDirection direction) const
+{
+    Q_D(const QOpenGLTexture);
+    return d->wrapMode(direction);
+}
+
+/*!
+    Sets the border color of the texture to \a color.
+
+    \note This function has no effect on Mac and Qt built for OpenGL ES 2.
+    \sa borderColor()
+*/
+void QOpenGLTexture::setBorderColor(const QColor &color)
+{
+    setBorderColor(static_cast<float>(color.redF()), static_cast<float>(color.greenF()),
+                   static_cast<float>(color.blueF()), static_cast<float>(color.alphaF()));
+}
+
+/*!
+    Sets the color red to \a {r}, green to \a {g}, blue to \a {b}, and \a {a} to the
+    alpha value.
+    \overload
+*/
+void QOpenGLTexture::setBorderColor(float r, float g, float b, float a)
+{
+#if !defined(QT_OPENGL_ES_2)
+    if (!QOpenGLContext::currentContext()->isOpenGLES()) {
+        Q_D(QOpenGLTexture);
+        d->create();
+        Q_ASSERT(d->texFuncs);
+        Q_ASSERT(d->textureId);
+        float values[4];
+        values[0] = r;
+        values[1] = g;
+        values[2] = b;
+        values[3] = a;
+        d->borderColor.clear();
+        for (int i = 0; i < 4; ++i)
+            d->borderColor.append(QVariant(values[i]));
+        d->texFuncs->glTextureParameterfv(d->textureId, d->target, d->bindingTarget, GL_TEXTURE_BORDER_COLOR, values);
+        return;
+    }
+#else
+    Q_UNUSED(r);
+    Q_UNUSED(g);
+    Q_UNUSED(b);
+    Q_UNUSED(a);
+#endif
+    qWarning("QOpenGLTexture: Border color is not supported");
+}
+
+/*!
+    Sets the color red to \a {r}, green to \a {g}, blue to \a {b}, and the alpha
+    value to \a {a}.
+    \overload
+*/
+void QOpenGLTexture::setBorderColor(int r, int g, int b, int a)
+{
+#if !defined(QT_OPENGL_ES_2)
+    if (!QOpenGLContext::currentContext()->isOpenGLES()) {
+        Q_D(QOpenGLTexture);
+        d->create();
+        Q_ASSERT(d->texFuncs);
+        Q_ASSERT(d->textureId);
+        int values[4];
+        values[0] = r;
+        values[1] = g;
+        values[2] = b;
+        values[3] = a;
+        d->borderColor.clear();
+        for (int i = 0; i < 4; ++i)
+            d->borderColor.append(QVariant(values[i]));
+        d->texFuncs->glTextureParameteriv(d->textureId, d->target, d->bindingTarget, GL_TEXTURE_BORDER_COLOR, values);
+        return;
+    }
+#else
+    Q_UNUSED(r);
+    Q_UNUSED(g);
+    Q_UNUSED(b);
+    Q_UNUSED(a);
+#endif
+    qWarning("QOpenGLTexture: Border color is not supported");
+
+    // TODO Handle case of using glTextureParameterIiv() based on format
+}
+
+/*!
+    Sets the color red to \a {r}, green to \a {g}, blue to \a {b}, and the alpha
+    value to \a {a}.
+    \overload
+*/
+void QOpenGLTexture::setBorderColor(uint r, uint g, uint b, uint a)
+{
+#if !defined(QT_OPENGL_ES_2)
+    if (!QOpenGLContext::currentContext()->isOpenGLES()) {
+        Q_D(QOpenGLTexture);
+        d->create();
+        Q_ASSERT(d->texFuncs);
+        Q_ASSERT(d->textureId);
+        int values[4];
+        values[0] = int(r);
+        values[1] = int(g);
+        values[2] = int(b);
+        values[3] = int(a);
+        d->borderColor.clear();
+        for (int i = 0; i < 4; ++i)
+            d->borderColor.append(QVariant(values[i]));
+        d->texFuncs->glTextureParameteriv(d->textureId, d->target, d->bindingTarget, GL_TEXTURE_BORDER_COLOR, values);
+        return;
+    }
+#else
+    Q_UNUSED(r);
+    Q_UNUSED(g);
+    Q_UNUSED(b);
+    Q_UNUSED(a);
+#endif
+    qWarning("QOpenGLTexture: Border color is not supported");
+
+    // TODO Handle case of using glTextureParameterIuiv() based on format
+}
+
+/*!
+    Returns the borderColor of this texture.
+
+    \sa setBorderColor()
+*/
+QColor QOpenGLTexture::borderColor() const
+{
+    Q_D(const QOpenGLTexture);
+    QColor c(0.0f, 0.0f, 0.0f, 0.0f);
+    if (!d->borderColor.isEmpty()) {
+        c.setRedF(d->borderColor.at(0).toFloat());
+        c.setGreenF(d->borderColor.at(1).toFloat());
+        c.setBlueF(d->borderColor.at(2).toFloat());
+        c.setAlphaF(d->borderColor.at(3).toFloat());
+    }
+    return c;
+}
+
+/*!
+    Writes the texture border color into the first four elements
+    of the array pointed to by \a border.
+
+    \sa setBorderColor()
+*/
+void QOpenGLTexture::borderColor(float *border) const
+{
+    Q_D(const QOpenGLTexture);
+    Q_ASSERT(border);
+    if (d->borderColor.isEmpty()) {
+        for (int i = 0; i < 4; ++i)
+            border[i] = 0.0f;
+    } else {
+        for (int i = 0; i < 4; ++i)
+            border[i] = d->borderColor.at(i).toFloat();
+    }
+}
+
+/*!
+    Writes the texture border color into the first four elements
+    of the array pointed to by \a border.
+
+    \overload
+*/
+void QOpenGLTexture::borderColor(int *border) const
+{
+    Q_D(const QOpenGLTexture);
+    Q_ASSERT(border);
+    if (d->borderColor.isEmpty()) {
+        for (int i = 0; i < 4; ++i)
+            border[i] = 0;
+    } else {
+        for (int i = 0; i < 4; ++i)
+            border[i] = d->borderColor.at(i).toInt();
+    }
+}
+
+/*!
+    Writes the texture border color into the first four elements
+    of the array pointed to by \a border.
+
+    \overload
+*/
+void QOpenGLTexture::borderColor(unsigned int *border) const
+{
+    Q_D(const QOpenGLTexture);
+    Q_ASSERT(border);
+    if (d->borderColor.isEmpty()) {
+        for (int i = 0; i < 4; ++i)
+            border[i] = 0;
+    } else {
+        for (int i = 0; i < 4; ++i)
+            border[i] = d->borderColor.at(i).toUInt();
+    }
+}
+
+/*!
+    Sets the minimum level of detail to \a value. This limits the selection of highest
+    resolution mipmap (lowest mipmap level). The default value is -1000.
+
+    \note This function has no effect on Qt built for OpenGL ES 2.
+    \sa minimumLevelOfDetail(), setMaximumLevelOfDetail(), setLevelOfDetailRange()
+*/
+void QOpenGLTexture::setMinimumLevelOfDetail(float value)
+{
+#if !defined(QT_OPENGL_ES_2)
+    if (!QOpenGLContext::currentContext()->isOpenGLES()) {
+        Q_D(QOpenGLTexture);
+        d->create();
+        Q_ASSERT(d->texFuncs);
+        Q_ASSERT(d->textureId);
+        Q_ASSERT(value < d->maxLevelOfDetail);
+        d->minLevelOfDetail = value;
+        d->texFuncs->glTextureParameterf(d->textureId, d->target, d->bindingTarget, GL_TEXTURE_MIN_LOD, value);
+        return;
+    }
+#else
+    Q_UNUSED(value);
+#endif
+    qWarning("QOpenGLTexture: Detail level is not supported");
+}
+
+/*!
+    Returns the minimum level of detail parameter.
+
+    \sa setMinimumLevelOfDetail(), maximumLevelOfDetail(), levelOfDetailRange()
+*/
+float QOpenGLTexture::minimumLevelOfDetail() const
+{
+    Q_D(const QOpenGLTexture);
+    return d->minLevelOfDetail;
+}
+
+/*!
+    Sets the maximum level of detail to \a value. This limits the selection of lowest
+    resolution mipmap (highest mipmap level). The default value is 1000.
+
+    \note This function has no effect on Qt built for OpenGL ES 2.
+    \sa maximumLevelOfDetail(), setMinimumLevelOfDetail(), setLevelOfDetailRange()
+*/
+void QOpenGLTexture::setMaximumLevelOfDetail(float value)
+{
+#if !defined(QT_OPENGL_ES_2)
+    if (!QOpenGLContext::currentContext()->isOpenGLES()) {
+        Q_D(QOpenGLTexture);
+        d->create();
+        Q_ASSERT(d->texFuncs);
+        Q_ASSERT(d->textureId);
+        Q_ASSERT(value > d->minLevelOfDetail);
+        d->maxLevelOfDetail = value;
+        d->texFuncs->glTextureParameterf(d->textureId, d->target, d->bindingTarget, GL_TEXTURE_MAX_LOD, value);
+        return;
+    }
+#else
+    Q_UNUSED(value);
+#endif
+    qWarning("QOpenGLTexture: Detail level is not supported");
+}
+
+/*!
+    Returns the maximum level of detail parameter.
+
+    \sa setMaximumLevelOfDetail(), minimumLevelOfDetail(), levelOfDetailRange()
+*/
+float QOpenGLTexture::maximumLevelOfDetail() const
+{
+    Q_D(const QOpenGLTexture);
+    return d->maxLevelOfDetail;
+}
+
+/*!
+    Sets the minimum level of detail parameters to \a min and the maximum level
+    to \a max.
+    \note This function has no effect on Qt built for OpenGL ES 2.
+    \sa levelOfDetailRange(), setMinimumLevelOfDetail(), setMaximumLevelOfDetail()
+*/
+void QOpenGLTexture::setLevelOfDetailRange(float min, float max)
+{
+#if !defined(QT_OPENGL_ES_2)
+    if (!QOpenGLContext::currentContext()->isOpenGLES()) {
+        Q_D(QOpenGLTexture);
+        d->create();
+        Q_ASSERT(d->texFuncs);
+        Q_ASSERT(d->textureId);
+        Q_ASSERT(min < max);
+        d->minLevelOfDetail = min;
+        d->maxLevelOfDetail = max;
+        d->texFuncs->glTextureParameterf(d->textureId, d->target, d->bindingTarget, GL_TEXTURE_MIN_LOD, min);
+        d->texFuncs->glTextureParameterf(d->textureId, d->target, d->bindingTarget, GL_TEXTURE_MAX_LOD, max);
+        return;
+    }
+#else
+    Q_UNUSED(min);
+    Q_UNUSED(max);
+#endif
+    qWarning("QOpenGLTexture: Detail level is not supported");
+}
+
+/*!
+    Returns the minimum and maximum level of detail parameters.
+
+    \sa setLevelOfDetailRange(), minimumLevelOfDetail(), maximumLevelOfDetail()
+*/
+QPair<float, float> QOpenGLTexture::levelOfDetailRange() const
+{
+    Q_D(const QOpenGLTexture);
+    return qMakePair(d->minLevelOfDetail, d->maxLevelOfDetail);
+}
+
+/*!
+    Sets the level of detail bias to \a bias.
+    Level of detail bias affects the point at which mipmapping levels change.
+    Increasing values for level of detail bias makes the overall images blurrier
+    or smoother. Decreasing values make the overall images sharper.
+
+    \note This function has no effect on Qt built for OpenGL ES 2.
+    \sa levelofDetailBias()
+*/
+void QOpenGLTexture::setLevelofDetailBias(float bias)
+{
+#if !defined(QT_OPENGL_ES_2)
+    if (!QOpenGLContext::currentContext()->isOpenGLES()) {
+        Q_D(QOpenGLTexture);
+        d->create();
+        Q_ASSERT(d->texFuncs);
+        Q_ASSERT(d->textureId);
+        d->levelOfDetailBias = bias;
+        d->texFuncs->glTextureParameterf(d->textureId, d->target, d->bindingTarget, GL_TEXTURE_LOD_BIAS, bias);
+        return;
+    }
+#else
+    Q_UNUSED(bias);
+#endif
+    qWarning("QOpenGLTexture: Detail level is not supported");
+}
+
+/*!
+    Returns the level of detail bias parameter.
+
+    \sa setLevelofDetailBias()
+*/
+float QOpenGLTexture::levelofDetailBias() const
+{
+    Q_D(const QOpenGLTexture);
+    return d->levelOfDetailBias;
+}
+
+#ifndef QT_NO_DEBUG_STREAM
+QDebug operator<<(QDebug debug, const QOpenGLTexture *t)
+{
+    QDebugStateSaver saver(debug);
+    debug.nospace();
+    debug << "QOpenGLTexture(";
+    if (t) {
+        const QOpenGLTexturePrivate *d = t->d_ptr.data();
+        debug << d->target << ", bindingTarget=" << d->bindingTarget
+            << ", size=[" << d->dimensions[0]
+            << ", " << d->dimensions[1];
+        if (d->target == QOpenGLTexture::Target3D)
+            debug << ", " << d->dimensions[2];
+        debug << "], format=" << d->format << ", formatClass=" << d->formatClass;
+        if (t->isCreated())
+            debug << ", textureId=" << d->textureId;
+        if (t->isBound())
+            debug << ", [bound]";
+        if (t->isTextureView())
+            debug << ", [view]";
+        if (d->fixedSamplePositions)
+            debug << ", [fixedSamplePositions]";
+        debug << ", mipLevels=" << d->requestedMipLevels << ", layers=" << d->layers
+            << ", faces=" << d->faces << ", samples=" << d->samples
+            << ", depthStencilMode=" << d->depthStencilMode << ", comparisonFunction="
+            << d->comparisonFunction << ", comparisonMode=" << d->comparisonMode
+            << ", features=" << d->features << ", minificationFilter=" << d->minFilter
+            << ", magnificationFilter=" << d->magFilter << ", wrapMode=" << d->wrapModes[0];
+    } else {
+        debug << '0';
+    }
+    debug << ')';
+    return debug;
+}
+#endif // QT_NO_DEBUG_STREAM
+
+QT_END_NAMESPACE
diff --git a/src/opengl/qopengltexture.h b/src/opengl/qopengltexture.h
new file mode 100644
index 0000000000..8eba2724df
--- /dev/null
+++ b/src/opengl/qopengltexture.h
@@ -0,0 +1,663 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB).
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtOpenGL module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QOPENGLABSTRACTTEXTURE_H
+#define QOPENGLABSTRACTTEXTURE_H
+
+#include <QtOpenGL/qtopenglglobal.h>
+
+#ifndef QT_NO_OPENGL
+
+#include <QtGui/qopengl.h>
+#include <QtGui/qimage.h>
+#include <QtCore/QScopedPointer>
+
+QT_BEGIN_NAMESPACE
+
+class QDebug;
+class QOpenGLTexturePrivate;
+class QOpenGLPixelTransferOptions;
+
+class Q_OPENGL_EXPORT QOpenGLTexture
+{
+    Q_GADGET
+public:
+    enum Target {
+        Target1D                   = 0x0DE0,    // GL_TEXTURE_1D
+        Target1DArray              = 0x8C18,    // GL_TEXTURE_1D_ARRAY
+        Target2D                   = 0x0DE1,    // GL_TEXTURE_2D
+        Target2DArray              = 0x8C1A,    // GL_TEXTURE_2D_ARRAY
+        Target3D                   = 0x806F,    // GL_TEXTURE_3D
+        TargetCubeMap              = 0x8513,    // GL_TEXTURE_CUBE_MAP
+        TargetCubeMapArray         = 0x9009,    // GL_TEXTURE_CUBE_MAP_ARRAY
+        Target2DMultisample        = 0x9100,    // GL_TEXTURE_2D_MULTISAMPLE
+        Target2DMultisampleArray   = 0x9102,    // GL_TEXTURE_2D_MULTISAMPLE_ARRAY
+        TargetRectangle            = 0x84F5,    // GL_TEXTURE_RECTANGLE
+        TargetBuffer               = 0x8C2A     // GL_TEXTURE_BUFFER
+    };
+    Q_ENUM(Target)
+
+    enum BindingTarget {
+        BindingTarget1D                    = 0x8068,   // GL_TEXTURE_BINDING_1D
+        BindingTarget1DArray               = 0x8C1C,   // GL_TEXTURE_BINDING_1D_ARRAY
+        BindingTarget2D                    = 0x8069,   // GL_TEXTURE_BINDING_2D
+        BindingTarget2DArray               = 0x8C1D,   // GL_TEXTURE_BINDING_2D_ARRAY
+        BindingTarget3D                    = 0x806A,   // GL_TEXTURE_BINDING_3D
+        BindingTargetCubeMap               = 0x8514,   // GL_TEXTURE_BINDING_CUBE_MAP
+        BindingTargetCubeMapArray          = 0x900A,   // GL_TEXTURE_BINDING_CUBE_MAP_ARRAY
+        BindingTarget2DMultisample         = 0x9104,   // GL_TEXTURE_BINDING_2D_MULTISAMPLE
+        BindingTarget2DMultisampleArray    = 0x9105,   // GL_TEXTURE_BINDING_2D_MULTISAMPLE_ARRAY
+        BindingTargetRectangle             = 0x84F6,   // GL_TEXTURE_BINDING_RECTANGLE
+        BindingTargetBuffer                = 0x8C2C    // GL_TEXTURE_BINDING_BUFFER
+    };
+    Q_ENUM(BindingTarget)
+
+    enum MipMapGeneration {
+        GenerateMipMaps,
+        DontGenerateMipMaps
+    };
+    Q_ENUM(MipMapGeneration)
+
+    enum TextureUnitReset {
+        ResetTextureUnit,
+        DontResetTextureUnit
+    };
+    Q_ENUM(TextureUnitReset)
+
+    enum TextureFormat {
+        NoFormat               = 0,         // GL_NONE
+
+        // Unsigned normalized formats
+        R8_UNorm               = 0x8229,    // GL_R8
+        RG8_UNorm              = 0x822B,    // GL_RG8
+        RGB8_UNorm             = 0x8051,    // GL_RGB8
+        RGBA8_UNorm            = 0x8058,    // GL_RGBA8
+
+        R16_UNorm              = 0x822A,    // GL_R16
+        RG16_UNorm             = 0x822C,    // GL_RG16
+        RGB16_UNorm            = 0x8054,    // GL_RGB16
+        RGBA16_UNorm           = 0x805B,    // GL_RGBA16
+
+        // Signed normalized formats
+        R8_SNorm               = 0x8F94,    // GL_R8_SNORM
+        RG8_SNorm              = 0x8F95,    // GL_RG8_SNORM
+        RGB8_SNorm             = 0x8F96,    // GL_RGB8_SNORM
+        RGBA8_SNorm            = 0x8F97,    // GL_RGBA8_SNORM
+
+        R16_SNorm              = 0x8F98,    // GL_R16_SNORM
+        RG16_SNorm             = 0x8F99,    // GL_RG16_SNORM
+        RGB16_SNorm            = 0x8F9A,    // GL_RGB16_SNORM
+        RGBA16_SNorm           = 0x8F9B,    // GL_RGBA16_SNORM
+
+        // Unsigned integer formats
+        R8U                    = 0x8232,    // GL_R8UI
+        RG8U                   = 0x8238,    // GL_RG8UI
+        RGB8U                  = 0x8D7D,    // GL_RGB8UI
+        RGBA8U                 = 0x8D7C,    // GL_RGBA8UI
+
+        R16U                   = 0x8234,    // GL_R16UI
+        RG16U                  = 0x823A,    // GL_RG16UI
+        RGB16U                 = 0x8D77,    // GL_RGB16UI
+        RGBA16U                = 0x8D76,    // GL_RGBA16UI
+
+        R32U                   = 0x8236,    // GL_R32UI
+        RG32U                  = 0x823C,    // GL_RG32UI
+        RGB32U                 = 0x8D71,    // GL_RGB32UI
+        RGBA32U                = 0x8D70,    // GL_RGBA32UI
+
+        // Signed integer formats
+        R8I                    = 0x8231,    // GL_R8I
+        RG8I                   = 0x8237,    // GL_RG8I
+        RGB8I                  = 0x8D8F,    // GL_RGB8I
+        RGBA8I                 = 0x8D8E,    // GL_RGBA8I
+
+        R16I                   = 0x8233,    // GL_R16I
+        RG16I                  = 0x8239,    // GL_RG16I
+        RGB16I                 = 0x8D89,    // GL_RGB16I
+        RGBA16I                = 0x8D88,    // GL_RGBA16I
+
+        R32I                   = 0x8235,    // GL_R32I
+        RG32I                  = 0x823B,    // GL_RG32I
+        RGB32I                 = 0x8D83,    // GL_RGB32I
+        RGBA32I                = 0x8D82,    // GL_RGBA32I
+
+        // Floating point formats
+        R16F                   = 0x822D,    // GL_R16F
+        RG16F                  = 0x822F,    // GL_RG16F
+        RGB16F                 = 0x881B,    // GL_RGB16F
+        RGBA16F                = 0x881A,    // GL_RGBA16F
+
+        R32F                   = 0x822E,    // GL_R32F
+        RG32F                  = 0x8230,    // GL_RG32F
+        RGB32F                 = 0x8815,    // GL_RGB32F
+        RGBA32F                = 0x8814,    // GL_RGBA32F
+
+        // Packed formats
+        RGB9E5                 = 0x8C3D,    // GL_RGB9_E5
+        RG11B10F               = 0x8C3A,    // GL_R11F_G11F_B10F
+        RG3B2                  = 0x2A10,    // GL_R3_G3_B2
+        R5G6B5                 = 0x8D62,    // GL_RGB565
+        RGB5A1                 = 0x8057,    // GL_RGB5_A1
+        RGBA4                  = 0x8056,    // GL_RGBA4
+        RGB10A2                = 0x906F,    // GL_RGB10_A2UI
+
+        // Depth formats
+        D16                    = 0x81A5,    // GL_DEPTH_COMPONENT16
+        D24                    = 0x81A6,    // GL_DEPTH_COMPONENT24
+        D24S8                  = 0x88F0,    // GL_DEPTH24_STENCIL8
+        D32                    = 0x81A7,    // GL_DEPTH_COMPONENT32
+        D32F                   = 0x8CAC,    // GL_DEPTH_COMPONENT32F
+        D32FS8X24              = 0x8CAD,    // GL_DEPTH32F_STENCIL8
+        S8                     = 0x8D48,    // GL_STENCIL_INDEX8
+
+        // Compressed formats
+        RGB_DXT1               = 0x83F0,    // GL_COMPRESSED_RGB_S3TC_DXT1_EXT
+        RGBA_DXT1              = 0x83F1,    // GL_COMPRESSED_RGBA_S3TC_DXT1_EXT
+        RGBA_DXT3              = 0x83F2,    // GL_COMPRESSED_RGBA_S3TC_DXT3_EXT
+        RGBA_DXT5              = 0x83F3,    // GL_COMPRESSED_RGBA_S3TC_DXT5_EXT
+        R_ATI1N_UNorm          = 0x8DBB,    // GL_COMPRESSED_RED_RGTC1
+        R_ATI1N_SNorm          = 0x8DBC,    // GL_COMPRESSED_SIGNED_RED_RGTC1
+        RG_ATI2N_UNorm         = 0x8DBD,    // GL_COMPRESSED_RG_RGTC2
+        RG_ATI2N_SNorm         = 0x8DBE,    // GL_COMPRESSED_SIGNED_RG_RGTC2
+        RGB_BP_UNSIGNED_FLOAT  = 0x8E8F,    // GL_COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT_ARB
+        RGB_BP_SIGNED_FLOAT    = 0x8E8E,    // GL_COMPRESSED_RGB_BPTC_SIGNED_FLOAT_ARB
+        RGB_BP_UNorm           = 0x8E8C,    // GL_COMPRESSED_RGBA_BPTC_UNORM_ARB
+        R11_EAC_UNorm          = 0x9270,    // GL_COMPRESSED_R11_EAC
+        R11_EAC_SNorm          = 0x9271,    // GL_COMPRESSED_SIGNED_R11_EAC
+        RG11_EAC_UNorm         = 0x9272,    // GL_COMPRESSED_RG11_EAC
+        RG11_EAC_SNorm         = 0x9273,    // GL_COMPRESSED_SIGNED_RG11_EAC
+        RGB8_ETC2              = 0x9274,    // GL_COMPRESSED_RGB8_ETC2
+        SRGB8_ETC2             = 0x9275,    // GL_COMPRESSED_SRGB8_ETC2
+        RGB8_PunchThrough_Alpha1_ETC2 = 0x9276, // GL_COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_ETC2
+        SRGB8_PunchThrough_Alpha1_ETC2 = 0x9277, // GL_COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_ETC2
+        RGBA8_ETC2_EAC         = 0x9278,    // GL_COMPRESSED_RGBA8_ETC2_EAC
+        SRGB8_Alpha8_ETC2_EAC  = 0x9279,    // GL_COMPRESSED_SRGB8_ALPHA8_ETC2_EAC
+        RGB8_ETC1              = 0x8D64,    // GL_ETC1_RGB8_OES
+        RGBA_ASTC_4x4          = 0x93B0,    // GL_COMPRESSED_RGBA_ASTC_4x4_KHR
+        RGBA_ASTC_5x4          = 0x93B1,    // GL_COMPRESSED_RGBA_ASTC_5x4_KHR
+        RGBA_ASTC_5x5          = 0x93B2,    // GL_COMPRESSED_RGBA_ASTC_5x5_KHR
+        RGBA_ASTC_6x5          = 0x93B3,    // GL_COMPRESSED_RGBA_ASTC_6x5_KHR
+        RGBA_ASTC_6x6          = 0x93B4,    // GL_COMPRESSED_RGBA_ASTC_6x6_KHR
+        RGBA_ASTC_8x5          = 0x93B5,    // GL_COMPRESSED_RGBA_ASTC_8x5_KHR
+        RGBA_ASTC_8x6          = 0x93B6,    // GL_COMPRESSED_RGBA_ASTC_8x6_KHR
+        RGBA_ASTC_8x8          = 0x93B7,    // GL_COMPRESSED_RGBA_ASTC_8x8_KHR
+        RGBA_ASTC_10x5         = 0x93B8,    // GL_COMPRESSED_RGBA_ASTC_10x5_KHR
+        RGBA_ASTC_10x6         = 0x93B9,    // GL_COMPRESSED_RGBA_ASTC_10x6_KHR
+        RGBA_ASTC_10x8         = 0x93BA,    // GL_COMPRESSED_RGBA_ASTC_10x8_KHR
+        RGBA_ASTC_10x10        = 0x93BB,    // GL_COMPRESSED_RGBA_ASTC_10x10_KHR
+        RGBA_ASTC_12x10        = 0x93BC,    // GL_COMPRESSED_RGBA_ASTC_12x10_KHR
+        RGBA_ASTC_12x12        = 0x93BD,    // GL_COMPRESSED_RGBA_ASTC_12x12_KHR
+        SRGB8_Alpha8_ASTC_4x4  = 0x93D0,    // GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x4_KHR
+        SRGB8_Alpha8_ASTC_5x4  = 0x93D1,    // GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x4_KHR
+        SRGB8_Alpha8_ASTC_5x5  = 0x93D2,    // GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x5_KHR
+        SRGB8_Alpha8_ASTC_6x5  = 0x93D3,    // GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x5_KHR
+        SRGB8_Alpha8_ASTC_6x6  = 0x93D4,    // GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x6_KHR
+        SRGB8_Alpha8_ASTC_8x5  = 0x93D5,    // GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x5_KHR
+        SRGB8_Alpha8_ASTC_8x6  = 0x93D6,    // GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x6_KHR
+        SRGB8_Alpha8_ASTC_8x8  = 0x93D7,    // GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x8_KHR
+        SRGB8_Alpha8_ASTC_10x5 = 0x93D8,    // GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x5_KHR
+        SRGB8_Alpha8_ASTC_10x6 = 0x93D9,    // GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x6_KHR
+        SRGB8_Alpha8_ASTC_10x8 = 0x93DA,    // GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x8_KHR
+        SRGB8_Alpha8_ASTC_10x10 = 0x93DB,   // GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x10_KHR
+        SRGB8_Alpha8_ASTC_12x10 = 0x93DC,   // GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x10_KHR
+        SRGB8_Alpha8_ASTC_12x12 = 0x93DD,   // GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x12_KHR
+
+        // sRGB formats
+        SRGB8                  = 0x8C41,    // GL_SRGB8
+        SRGB8_Alpha8           = 0x8C43,    // GL_SRGB8_ALPHA8
+        SRGB_DXT1              = 0x8C4C,    // GL_COMPRESSED_SRGB_S3TC_DXT1_EXT
+        SRGB_Alpha_DXT1        = 0x8C4D,    // GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT
+        SRGB_Alpha_DXT3        = 0x8C4E,    // GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT
+        SRGB_Alpha_DXT5        = 0x8C4F,    // GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT
+        SRGB_BP_UNorm          = 0x8E8D,    // GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM_ARB
+
+        // ES 2 formats
+        DepthFormat            = 0x1902,    // GL_DEPTH_COMPONENT
+        AlphaFormat            = 0x1906,    // GL_ALPHA
+        RGBFormat              = 0x1907,    // GL_RGB
+        RGBAFormat             = 0x1908,    // GL_RGBA
+        LuminanceFormat        = 0x1909,    // GL_LUMINANCE
+        LuminanceAlphaFormat   = 0x190A
+
+    };
+    Q_ENUM(TextureFormat)
+
+    // This is not used externally yet but is reserved to allow checking of
+    // compatibility between texture formats
+#ifndef Q_QDOC
+    enum TextureFormatClass {
+        NoFormatClass,
+        FormatClass_128Bit,
+        FormatClass_96Bit,
+        FormatClass_64Bit,
+        FormatClass_48Bit,
+        FormatClass_32Bit,
+        FormatClass_24Bit,
+        FormatClass_16Bit,
+        FormatClass_8Bit,
+        FormatClass_RGTC1_R,
+        FormatClass_RGTC2_RG,
+        FormatClass_BPTC_Unorm,
+        FormatClass_BPTC_Float,
+        FormatClass_S3TC_DXT1_RGB,
+        FormatClass_S3TC_DXT1_RGBA,
+        FormatClass_S3TC_DXT3_RGBA,
+        FormatClass_S3TC_DXT5_RGBA,
+        FormatClass_Unique
+    };
+#endif
+
+    enum CubeMapFace {
+        CubeMapPositiveX = 0x8515,  // GL_TEXTURE_CUBE_MAP_POSITIVE_X
+        CubeMapNegativeX = 0x8516,  // GL_TEXTURE_CUBE_MAP_NEGATIVE_X
+        CubeMapPositiveY = 0x8517,  // GL_TEXTURE_CUBE_MAP_POSITIVE_Y
+        CubeMapNegativeY = 0x8518,  // GL_TEXTURE_CUBE_MAP_NEGATIVE_Y
+        CubeMapPositiveZ = 0x8519,  // GL_TEXTURE_CUBE_MAP_POSITIVE_Z
+        CubeMapNegativeZ = 0x851A   // GL_TEXTURE_CUBE_MAP_NEGATIVE_Z
+    };
+    Q_ENUM(CubeMapFace)
+
+    enum PixelFormat {
+        NoSourceFormat = 0,         // GL_NONE
+        Red            = 0x1903,    // GL_RED
+        RG             = 0x8227,    // GL_RG
+        RGB            = 0x1907,    // GL_RGB
+        BGR            = 0x80E0,    // GL_BGR
+        RGBA           = 0x1908,    // GL_RGBA
+        BGRA           = 0x80E1,    // GL_BGRA
+        Red_Integer    = 0x8D94,    // GL_RED_INTEGER
+        RG_Integer     = 0x8228,    // GL_RG_INTEGER
+        RGB_Integer    = 0x8D98,    // GL_RGB_INTEGER
+        BGR_Integer    = 0x8D9A,    // GL_BGR_INTEGER
+        RGBA_Integer   = 0x8D99,    // GL_RGBA_INTEGER
+        BGRA_Integer   = 0x8D9B,    // GL_BGRA_INTEGER
+        Stencil        = 0x1901,    // GL_STENCIL_INDEX
+        Depth          = 0x1902,    // GL_DEPTH_COMPONENT
+        DepthStencil   = 0x84F9,    // GL_DEPTH_STENCIL
+        Alpha          = 0x1906,    // GL_ALPHA
+        Luminance      = 0x1909,    // GL_LUMINANCE
+        LuminanceAlpha = 0x190A     // GL_LUMINANCE_ALPHA
+    };
+    Q_ENUM(PixelFormat)
+
+    enum PixelType {
+        NoPixelType        = 0,         // GL_NONE
+        Int8               = 0x1400,    // GL_BYTE
+        UInt8              = 0x1401,    // GL_UNSIGNED_BYTE
+        Int16              = 0x1402,    // GL_SHORT
+        UInt16             = 0x1403,    // GL_UNSIGNED_SHORT
+        Int32              = 0x1404,    // GL_INT
+        UInt32             = 0x1405,    // GL_UNSIGNED_INT
+        Float16            = 0x140B,    // GL_HALF_FLOAT
+        Float16OES         = 0x8D61,    // GL_HALF_FLOAT_OES
+        Float32            = 0x1406,    // GL_FLOAT
+        UInt32_RGB9_E5     = 0x8C3E,    // GL_UNSIGNED_INT_5_9_9_9_REV
+        UInt32_RG11B10F    = 0x8C3B,    // GL_UNSIGNED_INT_10F_11F_11F_REV
+        UInt8_RG3B2        = 0x8032,    // GL_UNSIGNED_BYTE_3_3_2
+        UInt8_RG3B2_Rev    = 0x8362,    // GL_UNSIGNED_BYTE_2_3_3_REV
+        UInt16_RGB5A1      = 0x8034,    // GL_UNSIGNED_SHORT_5_5_5_1
+        UInt16_RGB5A1_Rev  = 0x8366,    // GL_UNSIGNED_SHORT_1_5_5_5_REV
+        UInt16_R5G6B5      = 0x8363,    // GL_UNSIGNED_SHORT_5_6_5
+        UInt16_R5G6B5_Rev  = 0x8364,    // GL_UNSIGNED_SHORT_5_6_5_REV
+        UInt16_RGBA4       = 0x8033,    // GL_UNSIGNED_SHORT_4_4_4_4
+        UInt16_RGBA4_Rev   = 0x8365,    // GL_UNSIGNED_SHORT_4_4_4_4_REV
+        UInt32_RGBA8       = 0x8035,    // GL_UNSIGNED_INT_8_8_8_8
+        UInt32_RGBA8_Rev   = 0x8367,    // GL_UNSIGNED_INT_8_8_8_8_REV
+        UInt32_RGB10A2     = 0x8036,    // GL_UNSIGNED_INT_10_10_10_2
+        UInt32_RGB10A2_Rev = 0x8368,    // GL_UNSIGNED_INT_2_10_10_10_REV
+        UInt32_D24S8       = 0x84FA,    // GL_UNSIGNED_INT_24_8
+        Float32_D32_UInt32_S8_X24 = 0x8DAD // GL_FLOAT_32_UNSIGNED_INT_24_8_REV
+    };
+    Q_ENUM(PixelType)
+
+    enum SwizzleComponent {
+        SwizzleRed   = 0x8E42,  // GL_TEXTURE_SWIZZLE_R
+        SwizzleGreen = 0x8E43,  // GL_TEXTURE_SWIZZLE_G
+        SwizzleBlue  = 0x8E44,  // GL_TEXTURE_SWIZZLE_B
+        SwizzleAlpha = 0x8E45   // GL_TEXTURE_SWIZZLE_A
+    };
+    Q_ENUM(SwizzleComponent)
+
+    enum SwizzleValue {
+        RedValue   = 0x1903, // GL_RED
+        GreenValue = 0x1904, // GL_GREEN
+        BlueValue  = 0x1905, // GL_BLUE
+        AlphaValue = 0x1906, // GL_ALPHA
+        ZeroValue  = 0,      // GL_ZERO
+        OneValue   = 1       // GL_ONE
+    };
+    Q_ENUM(SwizzleValue)
+
+    enum WrapMode {
+        Repeat         = 0x2901, // GL_REPEAT
+        MirroredRepeat = 0x8370, // GL_MIRRORED_REPEAT
+        ClampToEdge    = 0x812F, // GL_CLAMP_TO_EDGE
+        ClampToBorder  = 0x812D  // GL_CLAMP_TO_BORDER
+    };
+    Q_ENUM(WrapMode)
+
+    enum CoordinateDirection {
+        DirectionS = 0x2802, // GL_TEXTURE_WRAP_S
+        DirectionT = 0x2803, // GL_TEXTURE_WRAP_T
+        DirectionR = 0x8072  // GL_TEXTURE_WRAP_R
+    };
+    Q_ENUM(CoordinateDirection)
+
+    // Features
+    enum Feature {
+        ImmutableStorage            = 0x00000001,
+        ImmutableMultisampleStorage = 0x00000002,
+        TextureRectangle            = 0x00000004,
+        TextureArrays               = 0x00000008,
+        Texture3D                   = 0x00000010,
+        TextureMultisample          = 0x00000020,
+        TextureBuffer               = 0x00000040,
+        TextureCubeMapArrays        = 0x00000080,
+        Swizzle                     = 0x00000100,
+        StencilTexturing            = 0x00000200,
+        AnisotropicFiltering        = 0x00000400,
+        NPOTTextures                = 0x00000800,
+        NPOTTextureRepeat           = 0x00001000,
+        Texture1D                   = 0x00002000,
+        TextureComparisonOperators  = 0x00004000,
+        TextureMipMapLevel          = 0x00008000,
+#ifndef Q_QDOC
+        MaxFeatureFlag              = 0x00010000
+#endif
+    };
+    Q_DECLARE_FLAGS(Features, Feature)
+    Q_ENUM(Feature)
+
+    explicit QOpenGLTexture(Target target);
+    explicit QOpenGLTexture(const QImage& image, MipMapGeneration genMipMaps = GenerateMipMaps);
+    ~QOpenGLTexture();
+
+    Target target() const;
+
+    // Creation and destruction
+    bool create();
+    void destroy();
+    bool isCreated() const;
+    GLuint textureId() const;
+
+    // Binding and releasing
+    void bind();
+    void bind(uint unit, TextureUnitReset reset = DontResetTextureUnit);
+    void release();
+    void release(uint unit, TextureUnitReset reset = DontResetTextureUnit);
+
+    bool isBound() const;
+    bool isBound(uint unit);
+    static GLuint boundTextureId(BindingTarget target);
+    static GLuint boundTextureId(uint unit, BindingTarget target);
+
+    // Storage allocation
+    void setFormat(TextureFormat format);
+    TextureFormat format() const;
+    void setSize(int width, int height = 1, int depth = 1);
+    int width() const;
+    int height() const;
+    int depth() const;
+    void setMipLevels(int levels);
+    int mipLevels() const;
+    int maximumMipLevels() const;
+    void setLayers(int layers);
+    int layers() const;
+    int faces() const;
+    void setSamples(int samples);
+    int samples() const;
+    void setFixedSamplePositions(bool fixed);
+    bool isFixedSamplePositions() const;
+    void allocateStorage();
+    void allocateStorage(PixelFormat pixelFormat, PixelType pixelType);
+    bool isStorageAllocated() const;
+
+    QOpenGLTexture *createTextureView(Target target,
+                                      TextureFormat viewFormat,
+                                      int minimumMipmapLevel, int maximumMipmapLevel,
+                                      int minimumLayer, int maximumLayer) const;
+    bool isTextureView() const;
+
+    // Pixel transfer
+    // ### Qt 6: remove the non-const void * overloads
+#if QT_DEPRECATED_SINCE(5, 3)
+    QT_DEPRECATED void setData(int mipLevel, int layer, CubeMapFace cubeFace,
+                               PixelFormat sourceFormat, PixelType sourceType,
+                               void *data, const QOpenGLPixelTransferOptions * const options = nullptr);
+    QT_DEPRECATED void setData(int mipLevel, int layer,
+                               PixelFormat sourceFormat, PixelType sourceType,
+                               void *data, const QOpenGLPixelTransferOptions * const options = nullptr);
+    QT_DEPRECATED void setData(int mipLevel,
+                               PixelFormat sourceFormat, PixelType sourceType,
+                               void *data, const QOpenGLPixelTransferOptions * const options = nullptr);
+    QT_DEPRECATED void setData(PixelFormat sourceFormat, PixelType sourceType,
+                               void *data, const QOpenGLPixelTransferOptions * const options = nullptr);
+#endif // QT_DEPRECATED_SINCE(5, 3)
+
+    void setData(int mipLevel, int layer, CubeMapFace cubeFace,
+                 PixelFormat sourceFormat, PixelType sourceType,
+                 const void *data, const QOpenGLPixelTransferOptions * const options = nullptr);
+    void setData(int mipLevel, int layer, int layerCount, CubeMapFace cubeFace,
+                 PixelFormat sourceFormat, PixelType sourceType,
+                 const void *data, const QOpenGLPixelTransferOptions * const options = nullptr);
+    void setData(int mipLevel, int layer,
+                 PixelFormat sourceFormat, PixelType sourceType,
+                 const void *data, const QOpenGLPixelTransferOptions * const options = nullptr);
+    void setData(int mipLevel,
+                 PixelFormat sourceFormat, PixelType sourceType,
+                 const void *data, const QOpenGLPixelTransferOptions * const options = nullptr);
+    void setData(PixelFormat sourceFormat, PixelType sourceType,
+                 const void *data, const QOpenGLPixelTransferOptions * const options = nullptr);
+
+    void setData(int xOffset, int yOffset, int zOffset,
+                 int width, int height, int depth,
+                 PixelFormat sourceFormat, PixelType sourceType,
+                 const void *data, const QOpenGLPixelTransferOptions * const options = nullptr);
+    void setData(int xOffset, int yOffset, int zOffset,
+                 int width, int height, int depth, int mipLevel,
+                 PixelFormat sourceFormat, PixelType sourceType,
+                 const void *data, const QOpenGLPixelTransferOptions * const options = nullptr);
+    void setData(int xOffset, int yOffset, int zOffset,
+                 int width, int height, int depth,
+                 int mipLevel, int layer,
+                 PixelFormat sourceFormat, PixelType sourceType,
+                 const void *data, const QOpenGLPixelTransferOptions * const options = nullptr);
+    void setData(int xOffset, int yOffset, int zOffset,
+                 int width, int height, int depth,
+                 int mipLevel, int layer,
+                 CubeMapFace cubeFace,
+                 PixelFormat sourceFormat, PixelType sourceType,
+                 const void *data, const QOpenGLPixelTransferOptions * const options = nullptr);
+    void setData(int xOffset, int yOffset, int zOffset,
+                 int width, int height, int depth,
+                 int mipLevel, int layer,
+                 CubeMapFace cubeFace, int layerCount,
+                 PixelFormat sourceFormat, PixelType sourceType,
+                 const void *data, const QOpenGLPixelTransferOptions * const options = nullptr);
+
+    // Compressed data upload
+    // ### Qt 6: remove the non-const void * overloads
+#if QT_DEPRECATED_SINCE(5, 3)
+    QT_DEPRECATED void setCompressedData(int mipLevel, int layer, CubeMapFace cubeFace,
+                                         int dataSize, void *data,
+                                         const QOpenGLPixelTransferOptions * const options = nullptr);
+    QT_DEPRECATED void setCompressedData(int mipLevel, int layer,
+                                         int dataSize, void *data,
+                                         const QOpenGLPixelTransferOptions * const options = nullptr);
+    QT_DEPRECATED void setCompressedData(int mipLevel, int dataSize, void *data,
+                                         const QOpenGLPixelTransferOptions * const options = nullptr);
+    QT_DEPRECATED void setCompressedData(int dataSize, void *data,
+                                         const QOpenGLPixelTransferOptions * const options = nullptr);
+#endif // QT_DEPRECATED_SINCE(5, 3)
+
+    void setCompressedData(int mipLevel, int layer, CubeMapFace cubeFace,
+                           int dataSize, const void *data,
+                           const QOpenGLPixelTransferOptions * const options = nullptr);
+    void setCompressedData(int mipLevel, int layer, int layerCount, CubeMapFace cubeFace,
+                           int dataSize, const void *data,
+                           const QOpenGLPixelTransferOptions * const options = nullptr);
+    void setCompressedData(int mipLevel, int layer,
+                           int dataSize, const void *data,
+                           const QOpenGLPixelTransferOptions * const options = nullptr);
+    void setCompressedData(int mipLevel, int dataSize, const void *data,
+                           const QOpenGLPixelTransferOptions * const options = nullptr);
+    void setCompressedData(int dataSize, const void *data,
+                           const QOpenGLPixelTransferOptions * const options = nullptr);
+
+    // Helpful overloads for setData
+    void setData(const QImage& image, MipMapGeneration genMipMaps = GenerateMipMaps);
+
+    static bool hasFeature(Feature feature);
+
+    // Texture Parameters
+    void setMipBaseLevel(int baseLevel);
+    int mipBaseLevel() const;
+    void setMipMaxLevel(int maxLevel);
+    int mipMaxLevel() const;
+    void setMipLevelRange(int baseLevel, int maxLevel);
+    QPair<int, int> mipLevelRange() const;
+
+    void setAutoMipMapGenerationEnabled(bool enabled);
+    bool isAutoMipMapGenerationEnabled() const;
+
+    void generateMipMaps();
+    void generateMipMaps(int baseLevel, bool resetBaseLevel = true);
+
+    void setSwizzleMask(SwizzleComponent component, SwizzleValue value);
+    void setSwizzleMask(SwizzleValue r, SwizzleValue g,
+                        SwizzleValue b, SwizzleValue a);
+    SwizzleValue swizzleMask(SwizzleComponent component) const;
+
+    enum DepthStencilMode {
+        DepthMode   = 0x1902,   // GL_DEPTH_COMPONENT
+        StencilMode = 0x1901    // GL_STENCIL_INDEX
+    };
+    Q_ENUM(DepthStencilMode)
+
+    void setDepthStencilMode(DepthStencilMode mode);
+    DepthStencilMode depthStencilMode() const;
+
+    enum ComparisonFunction {
+        CompareLessEqual    = 0x0203,   // GL_LEQUAL
+        CompareGreaterEqual = 0x0206,   // GL_GEQUAL
+        CompareLess         = 0x0201,   // GL_LESS
+        CompareGreater      = 0x0204,   // GL_GREATER
+        CompareEqual        = 0x0202,   // GL_EQUAL
+        CommpareNotEqual    = 0x0205,   // GL_NOTEQUAL
+        CompareAlways       = 0x0207,   // GL_ALWAYS
+        CompareNever        = 0x0200    // GL_NEVER
+    };
+    Q_ENUM(ComparisonFunction)
+
+    void setComparisonFunction(ComparisonFunction function);
+    ComparisonFunction comparisonFunction() const;
+
+    enum ComparisonMode {
+        CompareRefToTexture = 0x884E,   // GL_COMPARE_REF_TO_TEXTURE
+        CompareNone         = 0x0000    // GL_NONE
+    };
+
+    void setComparisonMode(ComparisonMode mode);
+    ComparisonMode comparisonMode() const;
+
+    // Sampling Parameters
+    enum Filter {
+        Nearest                 = 0x2600,   // GL_NEAREST
+        Linear                  = 0x2601,   // GL_LINEAR
+        NearestMipMapNearest    = 0x2700,   // GL_NEAREST_MIPMAP_NEAREST
+        NearestMipMapLinear     = 0x2702,   // GL_NEAREST_MIPMAP_LINEAR
+        LinearMipMapNearest     = 0x2701,   // GL_LINEAR_MIPMAP_NEAREST
+        LinearMipMapLinear      = 0x2703    // GL_LINEAR_MIPMAP_LINEAR
+    };
+    Q_ENUM(Filter)
+
+    void setMinificationFilter(Filter filter);
+    Filter minificationFilter() const;
+    void setMagnificationFilter(Filter filter);
+    Filter magnificationFilter() const;
+    void setMinMagFilters(Filter minificationFilter,
+                          Filter magnificationFilter);
+    QPair<Filter, Filter> minMagFilters() const;
+    void setMaximumAnisotropy(float anisotropy);
+    float maximumAnisotropy() const;
+
+    void setWrapMode(WrapMode mode);
+    void setWrapMode(CoordinateDirection direction, WrapMode mode);
+    WrapMode wrapMode(CoordinateDirection direction) const;
+
+    void setBorderColor(const QColor &color);
+    void setBorderColor(float r, float g, float b, float a);
+    void setBorderColor(int r, int g, int b, int a);
+    void setBorderColor(uint r, uint g, uint b, uint a);
+
+    QColor borderColor() const;
+    void borderColor(float *border) const;
+    void borderColor(int *border) const;
+    void borderColor(unsigned int *border) const;
+
+    void setMinimumLevelOfDetail(float value);
+    float minimumLevelOfDetail() const;
+    void setMaximumLevelOfDetail(float value);
+    float maximumLevelOfDetail() const;
+    void setLevelOfDetailRange(float min, float max);
+    QPair<float, float> levelOfDetailRange() const;
+    void setLevelofDetailBias(float bias);
+    float levelofDetailBias() const;
+
+#ifndef QT_NO_DEBUG_STREAM
+    friend Q_OPENGL_EXPORT QDebug operator<<(QDebug dbg, const QOpenGLTexture *t);
+#endif
+
+private:
+    Q_DISABLE_COPY(QOpenGLTexture)
+    Q_DECLARE_PRIVATE(QOpenGLTexture)
+    QScopedPointer<QOpenGLTexturePrivate> d_ptr;
+};
+
+Q_DECLARE_OPERATORS_FOR_FLAGS(QOpenGLTexture::Features)
+
+#ifndef QT_NO_DEBUG_STREAM
+Q_OPENGL_EXPORT QDebug operator<<(QDebug debug, const QOpenGLTexture *t);
+#endif
+
+QT_END_NAMESPACE
+
+#endif // QT_NO_OPENGL
+
+#endif // QOPENGLABSTRACTTEXTURE_H
diff --git a/src/opengl/qopengltexture_p.h b/src/opengl/qopengltexture_p.h
new file mode 100644
index 0000000000..1dc0801644
--- /dev/null
+++ b/src/opengl/qopengltexture_p.h
@@ -0,0 +1,184 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB).
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtOpenGL module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QABSTRACTOPENGLTEXTURE_P_H
+#define QABSTRACTOPENGLTEXTURE_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#ifndef QT_NO_OPENGL
+
+#include <QtOpenGL/qtopenglglobal.h>
+#include "private/qobject_p.h"
+#include "qopengltexture.h"
+#include "qopengl.h"
+
+#include <cmath>
+
+namespace {
+inline double qLog2(const double x)
+{
+    return std::log(x) / std::log(2.0);
+}
+}
+
+QT_BEGIN_NAMESPACE
+
+class QOpenGLContext;
+class QOpenGLTextureHelper;
+class QOpenGLFunctions;
+
+class QOpenGLTexturePrivate
+{
+public:
+    QOpenGLTexturePrivate(QOpenGLTexture::Target textureTarget,
+                          QOpenGLTexture *qq);
+    ~QOpenGLTexturePrivate();
+
+    Q_DECLARE_PUBLIC(QOpenGLTexture)
+
+    void resetFuncs(QOpenGLTextureHelper *funcs);
+    void initializeOpenGLFunctions();
+
+    bool create();
+    void destroy();
+
+    void bind();
+    void bind(uint unit, QOpenGLTexture::TextureUnitReset reset = QOpenGLTexture::DontResetTextureUnit);
+    void release();
+    void release(uint unit, QOpenGLTexture::TextureUnitReset reset = QOpenGLTexture::DontResetTextureUnit);
+    bool isBound() const;
+    bool isBound(uint unit) const;
+
+    void allocateStorage(QOpenGLTexture::PixelFormat pixelFormat, QOpenGLTexture::PixelType pixelType);
+    void allocateMutableStorage(QOpenGLTexture::PixelFormat pixelFormat, QOpenGLTexture::PixelType pixelType);
+    void allocateImmutableStorage();
+    void setData(int mipLevel, int layer, int layerCount, QOpenGLTexture::CubeMapFace cubeFace,
+                 QOpenGLTexture::PixelFormat sourceFormat, QOpenGLTexture::PixelType sourceType,
+                 const void *data, const QOpenGLPixelTransferOptions * const options);
+    void setData(int xOffset, int yOffset, int zOffset, int width, int height, int depth,
+                 int mipLevel, int layer, int layerCount, QOpenGLTexture::CubeMapFace cubeFace,
+                 QOpenGLTexture::PixelFormat sourceFormat, QOpenGLTexture::PixelType sourceType,
+                 const void *data, const QOpenGLPixelTransferOptions * const options);
+    void setCompressedData(int mipLevel, int layer, int layerCount, QOpenGLTexture::CubeMapFace cubeFace,
+                           int dataSize, const void *data,
+                           const QOpenGLPixelTransferOptions * const options);
+
+
+    void setWrapMode(QOpenGLTexture::WrapMode mode);
+    void setWrapMode(QOpenGLTexture::CoordinateDirection direction, QOpenGLTexture::WrapMode mode);
+    QOpenGLTexture::WrapMode wrapMode(QOpenGLTexture::CoordinateDirection direction) const;
+
+    QOpenGLTexture *createTextureView(QOpenGLTexture::Target target, QOpenGLTexture::TextureFormat viewFormat,
+                                      int minimumMipmapLevel, int maximumMipmapLevel,
+                                      int minimumLayer, int maximumLayer) const;
+
+    int evaluateMipLevels() const;
+
+    inline int maximumMipLevelCount() const
+    {
+        return 1 + std::floor(qLog2(qMax(dimensions[0], qMax(dimensions[1], dimensions[2]))));
+    }
+
+    static inline int mipLevelSize(int mipLevel, int baseLevelSize)
+    {
+        return std::floor(double(qMax(1, baseLevelSize >> mipLevel)));
+    }
+
+    bool isUsingImmutableStorage() const;
+
+    QOpenGLTexture *q_ptr;
+    QOpenGLContext *context;
+    QOpenGLTexture::Target target;
+    QOpenGLTexture::BindingTarget bindingTarget;
+    GLuint textureId;
+    QOpenGLTexture::TextureFormat format;
+    QOpenGLTexture::TextureFormatClass formatClass;
+    int dimensions[3];
+    int requestedMipLevels;
+    int mipLevels;
+    int layers;
+    int faces;
+
+    int samples;
+    bool fixedSamplePositions;
+
+    int baseLevel;
+    int maxLevel;
+
+    QOpenGLTexture::SwizzleValue swizzleMask[4];
+    QOpenGLTexture::DepthStencilMode depthStencilMode;
+    QOpenGLTexture::ComparisonFunction comparisonFunction;
+    QOpenGLTexture::ComparisonMode comparisonMode;
+
+    QOpenGLTexture::Filter minFilter;
+    QOpenGLTexture::Filter magFilter;
+    float maxAnisotropy;
+    QOpenGLTexture::WrapMode wrapModes[3];
+    QVariantList borderColor;
+    float minLevelOfDetail;
+    float maxLevelOfDetail;
+    float levelOfDetailBias;
+
+    bool textureView;
+    bool autoGenerateMipMaps;
+    bool storageAllocated;
+
+    QOpenGLTextureHelper *texFuncs;
+    QOpenGLFunctions *functions;
+
+    QOpenGLTexture::Features features;
+};
+
+QT_END_NAMESPACE
+
+#undef Q_CALL_MEMBER_FUNCTION
+
+#endif // QT_NO_OPENGL
+
+#endif // QABSTRACTOPENGLTEXTURE_P_H
diff --git a/src/opengl/qopengltextureblitter.cpp b/src/opengl/qopengltextureblitter.cpp
new file mode 100644
index 0000000000..b350e8e0e3
--- /dev/null
+++ b/src/opengl/qopengltextureblitter.cpp
@@ -0,0 +1,682 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtOpenGL module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qopengltextureblitter.h"
+
+#include <QtOpenGL/QOpenGLShaderProgram>
+#include <QtOpenGL/QOpenGLVertexArrayObject>
+#include <QtOpenGL/QOpenGLBuffer>
+#include <QtGui/QOpenGLContext>
+#include <QtGui/QOpenGLFunctions>
+
+#ifndef GL_TEXTURE_EXTERNAL_OES
+#define GL_TEXTURE_EXTERNAL_OES           0x8D65
+#endif
+
+QT_BEGIN_NAMESPACE
+
+/*!
+    \class QOpenGLTextureBlitter
+    \brief The QOpenGLTextureBlitter class provides a convenient way to draw textured quads via OpenGL.
+    \since 5.8
+    \ingroup painting-3D
+    \inmodule QtOpenGL
+
+    Drawing textured quads, in order to get the contents of a texture
+    onto the screen, is a common operation when developing 2D user
+    interfaces. QOpenGLTextureBlitter provides a convenience class to
+    avoid repeating vertex data, shader sources, buffer and program
+    management and matrix calculations.
+
+    For example, a QOpenGLWidget subclass can do the following to draw
+    the contents rendered into a framebuffer at the pixel position \c{(x, y)}:
+
+    \code
+    void OpenGLWidget::initializeGL()
+    {
+        m_blitter.create();
+        m_fbo = new QOpenGLFramebufferObject(size);
+    }
+
+    void OpenGLWidget::paintGL()
+    {
+        m_fbo->bind();
+        // update offscreen content
+        m_fbo->release();
+
+        m_blitter.bind();
+        const QRect targetRect(QPoint(x, y), m_fbo->size());
+        const QMatrix4x4 target = QOpenGLTextureBlitter::targetTransform(targetRect, QRect(QPoint(0, 0), m_fbo->size()));
+        m_blitter.blit(m_fbo->texture(), target, QOpenGLTextureBlitter::OriginBottomLeft);
+        m_blitter.release();
+    }
+    \endcode
+
+    The blitter implements GLSL shaders both for GLSL 1.00 (suitable
+    for OpenGL (ES) 2.x and compatibility profiles of newer OpenGL
+    versions) and version 150 (suitable for core profile contexts with
+    OpenGL 3.2 and newer).
+ */
+
+static const char vertex_shader150[] =
+    "#version 150 core\n"
+    "in vec3 vertexCoord;"
+    "in vec2 textureCoord;"
+    "out vec2 uv;"
+    "uniform mat4 vertexTransform;"
+    "uniform mat3 textureTransform;"
+    "void main() {"
+    "   uv = (textureTransform * vec3(textureCoord,1.0)).xy;"
+    "   gl_Position = vertexTransform * vec4(vertexCoord,1.0);"
+    "}";
+
+static const char fragment_shader150[] =
+    "#version 150 core\n"
+    "in vec2 uv;"
+    "out vec4 fragcolor;"
+    "uniform sampler2D textureSampler;"
+    "uniform bool swizzle;"
+    "uniform float opacity;"
+    "void main() {"
+    "   vec4 tmpFragColor = texture(textureSampler, uv);"
+    "   tmpFragColor.a *= opacity;"
+    "   fragcolor = swizzle ? tmpFragColor.bgra : tmpFragColor;"
+    "}";
+
+static const char vertex_shader[] =
+    "attribute highp vec3 vertexCoord;"
+    "attribute highp vec2 textureCoord;"
+    "varying highp vec2 uv;"
+    "uniform highp mat4 vertexTransform;"
+    "uniform highp mat3 textureTransform;"
+    "void main() {"
+    "   uv = (textureTransform * vec3(textureCoord,1.0)).xy;"
+    "   gl_Position = vertexTransform * vec4(vertexCoord,1.0);"
+    "}";
+
+static const char fragment_shader[] =
+    "varying highp vec2 uv;"
+    "uniform sampler2D textureSampler;"
+    "uniform bool swizzle;"
+    "uniform highp float opacity;"
+    "void main() {"
+    "   highp vec4 tmpFragColor = texture2D(textureSampler,uv);"
+    "   tmpFragColor.a *= opacity;"
+    "   gl_FragColor = swizzle ? tmpFragColor.bgra : tmpFragColor;"
+    "}";
+
+static const char fragment_shader_external_oes[] =
+    "#extension GL_OES_EGL_image_external : require\n"
+    "varying highp vec2 uv;"
+    "uniform samplerExternalOES textureSampler;\n"
+    "uniform bool swizzle;"
+    "uniform highp float opacity;"
+    "void main() {"
+    "   highp vec4 tmpFragColor = texture2D(textureSampler, uv);"
+    "   tmpFragColor.a *= opacity;"
+    "   gl_FragColor = swizzle ? tmpFragColor.bgra : tmpFragColor;"
+    "}";
+
+static const GLfloat vertex_buffer_data[] = {
+        -1,-1, 0,
+        -1, 1, 0,
+         1,-1, 0,
+        -1, 1, 0,
+         1,-1, 0,
+         1, 1, 0
+};
+
+static const GLfloat texture_buffer_data[] = {
+        0, 0,
+        0, 1,
+        1, 0,
+        0, 1,
+        1, 0,
+        1, 1
+};
+
+class TextureBinder
+{
+public:
+    TextureBinder(GLenum target, GLuint textureId) : m_target(target)
+    {
+        QOpenGLContext::currentContext()->functions()->glBindTexture(m_target, textureId);
+    }
+    ~TextureBinder()
+    {
+        QOpenGLContext::currentContext()->functions()->glBindTexture(m_target, 0);
+    }
+
+private:
+    GLenum m_target;
+};
+
+class QOpenGLTextureBlitterPrivate
+{
+public:
+    enum TextureMatrixUniform {
+        User,
+        Identity,
+        IdentityFlipped
+    };
+
+    enum ProgramIndex {
+        TEXTURE_2D,
+        TEXTURE_EXTERNAL_OES
+    };
+
+    QOpenGLTextureBlitterPrivate() :
+        swizzle(false),
+        opacity(1.0f),
+        vao(new QOpenGLVertexArrayObject),
+        currentTarget(TEXTURE_2D)
+    { }
+
+    bool buildProgram(ProgramIndex idx, const char *vs, const char *fs);
+
+    void blit(GLuint texture, const QMatrix4x4 &vertexTransform, const QMatrix3x3 &textureTransform);
+    void blit(GLuint texture, const QMatrix4x4 &vertexTransform, QOpenGLTextureBlitter::Origin origin);
+
+    void prepareProgram(const QMatrix4x4 &vertexTransform);
+
+    QOpenGLBuffer vertexBuffer;
+    QOpenGLBuffer textureBuffer;
+    struct Program {
+        Program() :
+            vertexCoordAttribPos(0),
+            vertexTransformUniformPos(0),
+            textureCoordAttribPos(0),
+            textureTransformUniformPos(0),
+            swizzleUniformPos(0),
+            opacityUniformPos(0),
+            swizzle(false),
+            opacity(0.0f),
+            textureMatrixUniformState(User)
+        { }
+        QScopedPointer<QOpenGLShaderProgram> glProgram;
+        GLuint vertexCoordAttribPos;
+        GLuint vertexTransformUniformPos;
+        GLuint textureCoordAttribPos;
+        GLuint textureTransformUniformPos;
+        GLuint swizzleUniformPos;
+        GLuint opacityUniformPos;
+        bool swizzle;
+        float opacity;
+        TextureMatrixUniform textureMatrixUniformState;
+    } programs[2];
+    bool swizzle;
+    float opacity;
+    QScopedPointer<QOpenGLVertexArrayObject> vao;
+    GLenum currentTarget;
+};
+
+static inline QOpenGLTextureBlitterPrivate::ProgramIndex targetToProgramIndex(GLenum target)
+{
+    switch (target) {
+    case GL_TEXTURE_2D:
+        return QOpenGLTextureBlitterPrivate::TEXTURE_2D;
+    case GL_TEXTURE_EXTERNAL_OES:
+        return QOpenGLTextureBlitterPrivate::TEXTURE_EXTERNAL_OES;
+    default:
+        qWarning("Unsupported texture target 0x%x", target);
+        return QOpenGLTextureBlitterPrivate::TEXTURE_2D;
+    }
+}
+
+void QOpenGLTextureBlitterPrivate::prepareProgram(const QMatrix4x4 &vertexTransform)
+{
+    Program *program = &programs[targetToProgramIndex(currentTarget)];
+
+    vertexBuffer.bind();
+    program->glProgram->setAttributeBuffer(program->vertexCoordAttribPos, GL_FLOAT, 0, 3, 0);
+    program->glProgram->enableAttributeArray(program->vertexCoordAttribPos);
+    vertexBuffer.release();
+
+    program->glProgram->setUniformValue(program->vertexTransformUniformPos, vertexTransform);
+
+    textureBuffer.bind();
+    program->glProgram->setAttributeBuffer(program->textureCoordAttribPos, GL_FLOAT, 0, 2, 0);
+    program->glProgram->enableAttributeArray(program->textureCoordAttribPos);
+    textureBuffer.release();
+
+    if (swizzle != program->swizzle) {
+        program->glProgram->setUniformValue(program->swizzleUniformPos, swizzle);
+        program->swizzle = swizzle;
+    }
+
+    if (opacity != program->opacity) {
+        program->glProgram->setUniformValue(program->opacityUniformPos, opacity);
+        program->opacity = opacity;
+    }
+}
+
+void QOpenGLTextureBlitterPrivate::blit(GLuint texture,
+                                        const QMatrix4x4 &vertexTransform,
+                                        const QMatrix3x3 &textureTransform)
+{
+    TextureBinder binder(currentTarget, texture);
+    prepareProgram(vertexTransform);
+
+    Program *program = &programs[targetToProgramIndex(currentTarget)];
+    program->glProgram->setUniformValue(program->textureTransformUniformPos, textureTransform);
+    program->textureMatrixUniformState = User;
+
+    QOpenGLContext::currentContext()->functions()->glDrawArrays(GL_TRIANGLES, 0, 6);
+}
+
+void QOpenGLTextureBlitterPrivate::blit(GLuint texture,
+                                        const QMatrix4x4 &vertexTransform,
+                                        QOpenGLTextureBlitter::Origin origin)
+{
+    TextureBinder binder(currentTarget, texture);
+    prepareProgram(vertexTransform);
+
+    Program *program = &programs[targetToProgramIndex(currentTarget)];
+    if (origin == QOpenGLTextureBlitter::OriginTopLeft) {
+        if (program->textureMatrixUniformState != IdentityFlipped) {
+            QMatrix3x3 flipped;
+            flipped(1,1) = -1;
+            flipped(1,2) = 1;
+            program->glProgram->setUniformValue(program->textureTransformUniformPos, flipped);
+            program->textureMatrixUniformState = IdentityFlipped;
+        }
+    } else if (program->textureMatrixUniformState != Identity) {
+        program->glProgram->setUniformValue(program->textureTransformUniformPos, QMatrix3x3());
+        program->textureMatrixUniformState = Identity;
+    }
+
+    QOpenGLContext::currentContext()->functions()->glDrawArrays(GL_TRIANGLES, 0, 6);
+}
+
+bool QOpenGLTextureBlitterPrivate::buildProgram(ProgramIndex idx, const char *vs, const char *fs)
+{
+    Program *p = &programs[idx];
+
+    p->glProgram.reset(new QOpenGLShaderProgram);
+
+    p->glProgram->addCacheableShaderFromSourceCode(QOpenGLShader::Vertex, vs);
+    p->glProgram->addCacheableShaderFromSourceCode(QOpenGLShader::Fragment, fs);
+    p->glProgram->link();
+    if (!p->glProgram->isLinked()) {
+        qWarning() << "Could not link shader program:\n" << p->glProgram->log();
+        return false;
+    }
+
+    p->glProgram->bind();
+
+    p->vertexCoordAttribPos = p->glProgram->attributeLocation("vertexCoord");
+    p->vertexTransformUniformPos = p->glProgram->uniformLocation("vertexTransform");
+    p->textureCoordAttribPos = p->glProgram->attributeLocation("textureCoord");
+    p->textureTransformUniformPos = p->glProgram->uniformLocation("textureTransform");
+    p->swizzleUniformPos = p->glProgram->uniformLocation("swizzle");
+    p->opacityUniformPos = p->glProgram->uniformLocation("opacity");
+
+    p->glProgram->setUniformValue(p->swizzleUniformPos, false);
+
+    // minmize state left set after a create()
+    p->glProgram->release();
+
+    return true;
+}
+
+/*!
+    Constructs a new QOpenGLTextureBlitter instance.
+
+    \note no graphics resources are initialized in the
+    constructor. This makes it safe to place plain
+    QOpenGLTextureBlitter members into classes because the actual
+    initialization that depends on the OpenGL context happens only in
+    create().
+ */
+QOpenGLTextureBlitter::QOpenGLTextureBlitter()
+    : d_ptr(new QOpenGLTextureBlitterPrivate)
+{
+}
+
+/*!
+    Destructs the instance.
+
+    \note When the OpenGL context - or a context sharing resources
+    with it - that was current when calling create() is not current,
+    graphics resources will not be released. Therefore, it is
+    recommended to call destroy() manually instead of relying on the
+    destructor to perform OpenGL resource cleanup.
+ */
+QOpenGLTextureBlitter::~QOpenGLTextureBlitter()
+{
+    destroy();
+}
+
+/*!
+    Initializes the graphics resources used by the blitter.
+
+    \return \c true if successful, \c false if there was a
+    failure. Failures can occur when there is no OpenGL context
+    current on the current thread, or when shader compilation fails
+    for some reason.
+
+    \sa isCreated(), destroy()
+ */
+bool QOpenGLTextureBlitter::create()
+{
+    QOpenGLContext *currentContext = QOpenGLContext::currentContext();
+    if (!currentContext)
+        return false;
+
+    Q_D(QOpenGLTextureBlitter);
+
+    if (d->programs[QOpenGLTextureBlitterPrivate::TEXTURE_2D].glProgram)
+        return true;
+
+    QSurfaceFormat format = currentContext->format();
+    if (format.profile() == QSurfaceFormat::CoreProfile && format.version() >= qMakePair(3,2)) {
+        if (!d->buildProgram(QOpenGLTextureBlitterPrivate::TEXTURE_2D, vertex_shader150, fragment_shader150))
+            return false;
+    } else {
+        if (!d->buildProgram(QOpenGLTextureBlitterPrivate::TEXTURE_2D, vertex_shader, fragment_shader))
+            return false;
+        if (supportsExternalOESTarget())
+            if (!d->buildProgram(QOpenGLTextureBlitterPrivate::TEXTURE_EXTERNAL_OES, vertex_shader, fragment_shader_external_oes))
+                return false;
+    }
+
+    // Create and bind the VAO, if supported.
+    QOpenGLVertexArrayObject::Binder vaoBinder(d->vao.data());
+
+    d->vertexBuffer.create();
+    d->vertexBuffer.bind();
+    d->vertexBuffer.allocate(vertex_buffer_data, sizeof(vertex_buffer_data));
+    d->vertexBuffer.release();
+
+    d->textureBuffer.create();
+    d->textureBuffer.bind();
+    d->textureBuffer.allocate(texture_buffer_data, sizeof(texture_buffer_data));
+    d->textureBuffer.release();
+
+    return true;
+}
+
+/*!
+    \return \c true if create() was called and succeeded. \c false otherwise.
+
+    \sa create(), destroy()
+ */
+bool QOpenGLTextureBlitter::isCreated() const
+{
+    Q_D(const QOpenGLTextureBlitter);
+    return d->programs[QOpenGLTextureBlitterPrivate::TEXTURE_2D].glProgram;
+}
+
+/*!
+    Frees all graphics resources held by the blitter. Assumes that
+    the OpenGL context, or another context sharing resources with it,
+    that was current on the thread when invoking create() is current.
+
+    The function has no effect when the blitter is not in created state.
+
+    \sa create()
+ */
+void QOpenGLTextureBlitter::destroy()
+{
+    if (!isCreated())
+        return;
+    Q_D(QOpenGLTextureBlitter);
+    d->programs[QOpenGLTextureBlitterPrivate::TEXTURE_2D].glProgram.reset();
+    d->programs[QOpenGLTextureBlitterPrivate::TEXTURE_EXTERNAL_OES].glProgram.reset();
+    d->vertexBuffer.destroy();
+    d->textureBuffer.destroy();
+    d->vao.reset();
+}
+
+/*!
+    \return \c true when bind() accepts \c GL_TEXTURE_EXTERNAL_OES as
+    its target argument.
+
+    \sa bind(), blit()
+ */
+bool QOpenGLTextureBlitter::supportsExternalOESTarget() const
+{
+    QOpenGLContext *ctx = QOpenGLContext::currentContext();
+    return ctx && ctx->isOpenGLES() && ctx->hasExtension("GL_OES_EGL_image_external");
+}
+
+/*!
+    Binds the graphics resources used by the blitter. This must be
+    called before calling blit(). Code modifying the OpenGL state
+    should be avoided between the call to bind() and blit() because
+    otherwise conflicts may arise.
+
+    \a target is the texture target for the source texture and must be
+    either \c GL_TEXTURE_2D or \c GL_OES_EGL_image_external.
+
+    \sa release(), blit()
+ */
+void QOpenGLTextureBlitter::bind(GLenum target)
+{
+    Q_D(QOpenGLTextureBlitter);
+
+    if (d->vao->isCreated())
+        d->vao->bind();
+
+    d->currentTarget = target;
+    QOpenGLTextureBlitterPrivate::Program *p = &d->programs[targetToProgramIndex(target)];
+    p->glProgram->bind();
+
+    d->vertexBuffer.bind();
+    p->glProgram->setAttributeBuffer(p->vertexCoordAttribPos, GL_FLOAT, 0, 3, 0);
+    p->glProgram->enableAttributeArray(p->vertexCoordAttribPos);
+    d->vertexBuffer.release();
+
+    d->textureBuffer.bind();
+    p->glProgram->setAttributeBuffer(p->textureCoordAttribPos, GL_FLOAT, 0, 2, 0);
+    p->glProgram->enableAttributeArray(p->textureCoordAttribPos);
+    d->textureBuffer.release();
+}
+
+/*!
+    Unbinds the graphics resources used by the blitter.
+
+    \sa bind()
+ */
+void QOpenGLTextureBlitter::release()
+{
+    Q_D(QOpenGLTextureBlitter);
+    d->programs[targetToProgramIndex(d->currentTarget)].glProgram->release();
+    if (d->vao->isCreated())
+        d->vao->release();
+}
+
+/*!
+    Sets whether swizzling is enabled for the red and blue color channels to
+    \a swizzle. An BGRA to RGBA conversion (occurring in the shader on
+    the GPU, instead of a slow CPU-side transformation) can be useful
+    when the source texture contains data from a QImage with a format
+    like QImage::Format_ARGB32 which maps to BGRA on little endian
+    systems.
+
+    By default the red-blue swizzle is disabled since this is what a
+    texture attached to an framebuffer object or a texture based on a
+    byte ordered QImage format (like QImage::Format_RGBA8888) needs.
+ */
+void QOpenGLTextureBlitter::setRedBlueSwizzle(bool swizzle)
+{
+    Q_D(QOpenGLTextureBlitter);
+    d->swizzle = swizzle;
+}
+
+/*!
+    Changes the opacity to \a opacity. The default opacity is 1.0.
+
+    \note the blitter does not alter the blend state. It is up to the
+    caller of blit() to ensure the correct blend settings are active.
+
+ */
+void QOpenGLTextureBlitter::setOpacity(float opacity)
+{
+    Q_D(QOpenGLTextureBlitter);
+    d->opacity = opacity;
+}
+
+/*!
+    \enum QOpenGLTextureBlitter::Origin
+
+    \value OriginBottomLeft Indicates that the data in the texture
+    follows the OpenGL convention of coordinate systems, meaning Y is
+    running from bottom to top.
+
+    \value OriginTopLeft Indicates that the data in the texture has Y
+    running from top to bottom, which is typical with regular,
+    unflipped image data.
+
+    \sa blit()
+ */
+
+/*!
+    Performs the blit with the source texture \a texture.
+
+    \a targetTransform specifies the transformation applied. This is
+    usually generated by the targetTransform() helper function.
+
+    \a sourceOrigin specifies if the image data needs flipping. When
+    \a texture corresponds to a texture attached to an FBO pass
+    OriginBottomLeft. On the other hand, when \a texture is based on
+    unflipped image data, pass OriginTopLeft. This is more efficient
+    than using QImage::mirrored().
+
+    \sa targetTransform(), Origin, bind()
+ */
+void QOpenGLTextureBlitter::blit(GLuint texture,
+                                 const QMatrix4x4 &targetTransform,
+                                 Origin sourceOrigin)
+{
+    Q_D(QOpenGLTextureBlitter);
+    d->blit(texture,targetTransform, sourceOrigin);
+}
+
+/*!
+    Performs the blit with the source texture \a texture.
+
+    \a targetTransform specifies the transformation applied. This is
+    usually generated by the targetTransform() helper function.
+
+    \a sourceTransform specifies the transformation applied to the
+    source. This allows using only a sub-rect of the source
+    texture. This is usually generated by the sourceTransform() helper
+    function.
+
+    \sa sourceTransform(), targetTransform(), Origin, bind()
+ */
+void QOpenGLTextureBlitter::blit(GLuint texture,
+                                 const QMatrix4x4 &targetTransform,
+                                 const QMatrix3x3 &sourceTransform)
+{
+    Q_D(QOpenGLTextureBlitter);
+    d->blit(texture, targetTransform, sourceTransform);
+}
+
+/*!
+    Calculates a target transform suitable for blit().
+
+    \a target is the target rectangle in pixels. \a viewport describes
+    the source dimensions and will in most cases be set to (0, 0,
+    image width, image height).
+
+    For unscaled output the size of \a target and \a viewport should
+    match.
+
+    \sa blit()
+ */
+QMatrix4x4 QOpenGLTextureBlitter::targetTransform(const QRectF &target,
+                                                  const QRect &viewport)
+{
+    qreal x_scale = target.width() / viewport.width();
+    qreal y_scale = target.height() / viewport.height();
+
+    const QPointF relative_to_viewport = target.topLeft() - viewport.topLeft();
+    qreal x_translate = x_scale - 1 + ((relative_to_viewport.x() / viewport.width()) * 2);
+    qreal y_translate = -y_scale + 1 - ((relative_to_viewport.y() / viewport.height()) * 2);
+
+    QMatrix4x4 matrix;
+    matrix(0,3) = x_translate;
+    matrix(1,3) = y_translate;
+
+    matrix(0,0) = x_scale;
+    matrix(1,1) = y_scale;
+
+    return matrix;
+}
+
+/*!
+    Calculates a 3x3 matrix suitable as the input to blit(). This is
+    used when only a part of the texture is to be used in the blit.
+
+    \a subTexture is the desired source rectangle in pixels, \a
+    textureSize is the full width and height of the texture data.  \a
+    origin specifies the orientation of the image data when it comes
+    to the Y axis.
+
+    \sa blit(), Origin
+ */
+QMatrix3x3 QOpenGLTextureBlitter::sourceTransform(const QRectF &subTexture,
+                                                  const QSize &textureSize,
+                                                  Origin origin)
+{
+    qreal x_scale = subTexture.width() / textureSize.width();
+    qreal y_scale = subTexture.height() / textureSize.height();
+
+    const QPointF topLeft = subTexture.topLeft();
+    qreal x_translate = topLeft.x() / textureSize.width();
+    qreal y_translate = topLeft.y() / textureSize.height();
+
+    if (origin == OriginTopLeft) {
+        y_scale = -y_scale;
+        y_translate = 1 - y_translate;
+    }
+
+    QMatrix3x3 matrix;
+    matrix(0,2) = x_translate;
+    matrix(1,2) = y_translate;
+
+    matrix(0,0) = x_scale;
+    matrix(1,1) = y_scale;
+
+    return matrix;
+}
+
+QT_END_NAMESPACE
diff --git a/src/opengl/qopengltextureblitter.h b/src/opengl/qopengltextureblitter.h
new file mode 100644
index 0000000000..1818576085
--- /dev/null
+++ b/src/opengl/qopengltextureblitter.h
@@ -0,0 +1,90 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtOpenGL module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QOPENGLTEXTUREBLITTER_H
+#define QOPENGLTEXTUREBLITTER_H
+
+#include <QtOpenGL/qtopenglglobal.h>
+
+#include <QtGui/qopengl.h>
+#include <QtGui/QMatrix3x3>
+#include <QtGui/QMatrix4x4>
+
+QT_BEGIN_NAMESPACE
+
+class QOpenGLTextureBlitterPrivate;
+
+class Q_OPENGL_EXPORT QOpenGLTextureBlitter
+{
+public:
+    QOpenGLTextureBlitter();
+    ~QOpenGLTextureBlitter();
+
+    enum Origin {
+        OriginBottomLeft,
+        OriginTopLeft
+    };
+
+    bool create();
+    bool isCreated() const;
+    void destroy();
+
+    bool supportsExternalOESTarget() const;
+
+    void bind(GLenum target = GL_TEXTURE_2D);
+    void release();
+
+    void setRedBlueSwizzle(bool swizzle);
+    void setOpacity(float opacity);
+
+    void blit(GLuint texture, const QMatrix4x4 &targetTransform, Origin sourceOrigin);
+    void blit(GLuint texture, const QMatrix4x4 &targetTransform, const QMatrix3x3 &sourceTransform);
+
+    static QMatrix4x4 targetTransform(const QRectF &target, const QRect &viewport);
+    static QMatrix3x3 sourceTransform(const QRectF &subTexture, const QSize &textureSize, Origin origin);
+
+private:
+    Q_DISABLE_COPY(QOpenGLTextureBlitter)
+    Q_DECLARE_PRIVATE(QOpenGLTextureBlitter)
+    QScopedPointer<QOpenGLTextureBlitterPrivate> d_ptr;
+};
+
+QT_END_NAMESPACE
+
+#endif //QOPENGLTEXTUREBLITTER_H
diff --git a/src/opengl/qopengltexturecache.cpp b/src/opengl/qopengltexturecache.cpp
new file mode 100644
index 0000000000..5256c429e0
--- /dev/null
+++ b/src/opengl/qopengltexturecache.cpp
@@ -0,0 +1,198 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtOpenGL module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qopengltexturecache_p.h"
+#include <private/qopengltextureuploader_p.h>
+#include <qmath.h>
+#include <qopenglfunctions.h>
+#include <private/qimagepixmapcleanuphooks_p.h>
+#include <qpa/qplatformpixmap.h>
+
+QT_BEGIN_NAMESPACE
+
+class QOpenGLTextureCacheWrapper
+{
+public:
+    QOpenGLTextureCacheWrapper()
+    {
+        QImagePixmapCleanupHooks::instance()->addPlatformPixmapModificationHook(cleanupTexturesForPixmapData);
+        QImagePixmapCleanupHooks::instance()->addPlatformPixmapDestructionHook(cleanupTexturesForPixmapData);
+        QImagePixmapCleanupHooks::instance()->addImageHook(cleanupTexturesForCacheKey);
+    }
+
+    ~QOpenGLTextureCacheWrapper()
+    {
+        QImagePixmapCleanupHooks::instance()->removePlatformPixmapModificationHook(cleanupTexturesForPixmapData);
+        QImagePixmapCleanupHooks::instance()->removePlatformPixmapDestructionHook(cleanupTexturesForPixmapData);
+        QImagePixmapCleanupHooks::instance()->removeImageHook(cleanupTexturesForCacheKey);
+    }
+
+    QOpenGLTextureCache *cacheForContext(QOpenGLContext *context) {
+        QMutexLocker lock(&m_mutex);
+        return m_resource.value<QOpenGLTextureCache>(context);
+    }
+
+    static void cleanupTexturesForCacheKey(qint64 key);
+    static void cleanupTexturesForPixmapData(QPlatformPixmap *pmd);
+
+private:
+    QOpenGLMultiGroupSharedResource m_resource;
+    QMutex m_mutex;
+};
+
+Q_GLOBAL_STATIC(QOpenGLTextureCacheWrapper, qt_texture_caches)
+
+QOpenGLTextureCache *QOpenGLTextureCache::cacheForContext(QOpenGLContext *context)
+{
+    return qt_texture_caches()->cacheForContext(context);
+}
+
+void QOpenGLTextureCacheWrapper::cleanupTexturesForCacheKey(qint64 key)
+{
+    QList<QOpenGLSharedResource *> resources = qt_texture_caches()->m_resource.resources();
+    for (QList<QOpenGLSharedResource *>::iterator it = resources.begin(); it != resources.end(); ++it)
+        static_cast<QOpenGLTextureCache *>(*it)->invalidate(key);
+}
+
+void QOpenGLTextureCacheWrapper::cleanupTexturesForPixmapData(QPlatformPixmap *pmd)
+{
+    cleanupTexturesForCacheKey(pmd->cacheKey());
+}
+
+QOpenGLTextureCache::QOpenGLTextureCache(QOpenGLContext *ctx)
+    : QOpenGLSharedResource(ctx->shareGroup())
+    , m_cache(256 * 1024) // 256 MB cache
+{
+}
+
+QOpenGLTextureCache::~QOpenGLTextureCache()
+{
+}
+
+GLuint QOpenGLTextureCache::bindTexture(QOpenGLContext *context, const QPixmap &pixmap, QOpenGLTextureUploader::BindOptions options)
+{
+    if (pixmap.isNull())
+        return 0;
+    QMutexLocker locker(&m_mutex);
+    qint64 key = pixmap.cacheKey();
+
+    // A QPainter is active on the image - take the safe route and replace the texture.
+    if (!pixmap.paintingActive()) {
+        QOpenGLCachedTexture *entry = m_cache.object(key);
+        if (entry && entry->options() == options) {
+            context->functions()->glBindTexture(GL_TEXTURE_2D, entry->id());
+            return entry->id();
+        }
+    }
+
+    GLuint id = bindTexture(context, key, pixmap.toImage(), options);
+    if (id > 0)
+        QImagePixmapCleanupHooks::enableCleanupHooks(pixmap);
+
+    return id;
+}
+
+GLuint QOpenGLTextureCache::bindTexture(QOpenGLContext *context, const QImage &image, QOpenGLTextureUploader::BindOptions options)
+{
+    if (image.isNull())
+        return 0;
+    QMutexLocker locker(&m_mutex);
+    qint64 key = image.cacheKey();
+
+    // A QPainter is active on the image - take the safe route and replace the texture.
+    if (!image.paintingActive()) {
+        QOpenGLCachedTexture *entry = m_cache.object(key);
+        if (entry && entry->options() == options) {
+            context->functions()->glBindTexture(GL_TEXTURE_2D, entry->id());
+            return entry->id();
+        }
+    }
+
+    QImage img = image;
+    if (!context->functions()->hasOpenGLFeature(QOpenGLFunctions::NPOTTextures))
+        options |= QOpenGLTextureUploader::PowerOfTwoBindOption;
+
+    GLuint id = bindTexture(context, key, img, options);
+    if (id > 0)
+        QImagePixmapCleanupHooks::enableCleanupHooks(image);
+
+    return id;
+}
+
+GLuint QOpenGLTextureCache::bindTexture(QOpenGLContext *context, qint64 key, const QImage &image, QOpenGLTextureUploader::BindOptions options)
+{
+    GLuint id;
+    QOpenGLFunctions *funcs = context->functions();
+    funcs->glGenTextures(1, &id);
+    funcs->glBindTexture(GL_TEXTURE_2D, id);
+
+    int cost = QOpenGLTextureUploader::textureImage(GL_TEXTURE_2D, image, options);
+
+    m_cache.insert(key, new QOpenGLCachedTexture(id, options, context), cost / 1024);
+
+    return id;
+}
+
+void QOpenGLTextureCache::invalidate(qint64 key)
+{
+    QMutexLocker locker(&m_mutex);
+    m_cache.remove(key);
+}
+
+void QOpenGLTextureCache::invalidateResource()
+{
+    m_cache.clear();
+}
+
+void QOpenGLTextureCache::freeResource(QOpenGLContext *)
+{
+    Q_ASSERT(false); // the texture cache lives until the context group disappears
+}
+
+static void freeTexture(QOpenGLFunctions *funcs, GLuint id)
+{
+    funcs->glDeleteTextures(1, &id);
+}
+
+QOpenGLCachedTexture::QOpenGLCachedTexture(GLuint id, QOpenGLTextureUploader::BindOptions options, QOpenGLContext *context) : m_options(options)
+{
+    m_resource = new QOpenGLSharedResourceGuard(context, id, freeTexture);
+}
+
+QT_END_NAMESPACE
diff --git a/src/opengl/qopengltexturecache_p.h b/src/opengl/qopengltexturecache_p.h
new file mode 100644
index 0000000000..14e03ebea1
--- /dev/null
+++ b/src/opengl/qopengltexturecache_p.h
@@ -0,0 +1,108 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtOpenGL module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#ifndef QOPENGLTEXTURECACHE_P_H
+#define QOPENGLTEXTURECACHE_P_H
+
+#include <QtOpenGL/qtopenglglobal.h>
+#include <QHash>
+#include <QObject>
+#include <QCache>
+#include <private/qopenglcontext_p.h>
+#include <private/qopengltextureuploader_p.h>
+#include <QtCore/qmutex.h>
+
+QT_BEGIN_NAMESPACE
+
+class QOpenGLCachedTexture;
+
+class Q_OPENGL_EXPORT QOpenGLTextureCache : public QOpenGLSharedResource
+{
+public:
+    static QOpenGLTextureCache *cacheForContext(QOpenGLContext *context);
+
+    QOpenGLTextureCache(QOpenGLContext *);
+    ~QOpenGLTextureCache();
+
+    GLuint bindTexture(QOpenGLContext *context, const QPixmap &pixmap,
+                       QOpenGLTextureUploader::BindOptions options = QOpenGLTextureUploader::PremultipliedAlphaBindOption);
+    GLuint bindTexture(QOpenGLContext *context, const QImage &image,
+                       QOpenGLTextureUploader::BindOptions options = QOpenGLTextureUploader::PremultipliedAlphaBindOption);
+
+    void invalidate(qint64 key);
+
+    void invalidateResource() override;
+    void freeResource(QOpenGLContext *ctx) override;
+
+private:
+    GLuint bindTexture(QOpenGLContext *context, qint64 key, const QImage &image, QOpenGLTextureUploader::BindOptions options);
+
+    QMutex m_mutex;
+    QCache<quint64, QOpenGLCachedTexture> m_cache;
+};
+
+class QOpenGLCachedTexture
+{
+public:
+    QOpenGLCachedTexture(GLuint id, QOpenGLTextureUploader::BindOptions options, QOpenGLContext *context);
+    ~QOpenGLCachedTexture() { m_resource->free(); }
+
+    GLuint id() const { return m_resource->id(); }
+    QOpenGLTextureUploader::BindOptions options() const { return m_options; }
+
+private:
+    QOpenGLSharedResourceGuard *m_resource;
+    QOpenGLTextureUploader::BindOptions m_options;
+};
+
+QT_END_NAMESPACE
+
+#endif
+
diff --git a/src/opengl/qopengltextureglyphcache.cpp b/src/opengl/qopengltextureglyphcache.cpp
new file mode 100644
index 0000000000..66fd3a7507
--- /dev/null
+++ b/src/opengl/qopengltextureglyphcache.cpp
@@ -0,0 +1,485 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtOpenGL module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qopengltextureglyphcache_p.h"
+#include <private/qopenglpaintengine_p.h>
+#include "private/qopenglengineshadersource_p.h"
+#include <private/qopenglextensions_p.h>
+#include <qrgb.h>
+#include <private/qdrawhelper_p.h>
+
+QT_BEGIN_NAMESPACE
+
+
+static int next_qopengltextureglyphcache_serial_number()
+{
+    static QBasicAtomicInt serial = Q_BASIC_ATOMIC_INITIALIZER(0);
+    return 1 + serial.fetchAndAddRelaxed(1);
+}
+
+QOpenGLTextureGlyphCache::QOpenGLTextureGlyphCache(QFontEngine::GlyphFormat format, const QTransform &matrix, const QColor &color)
+    : QImageTextureGlyphCache(format, matrix, color)
+    , m_textureResource(nullptr)
+    , pex(nullptr)
+    , m_blitProgram(nullptr)
+    , m_filterMode(Nearest)
+    , m_serialNumber(next_qopengltextureglyphcache_serial_number())
+    , m_buffer(QOpenGLBuffer::VertexBuffer)
+{
+#ifdef QT_GL_TEXTURE_GLYPH_CACHE_DEBUG
+    qDebug(" -> QOpenGLTextureGlyphCache() %p for context %p.", this, QOpenGLContext::currentContext());
+#endif
+    m_vertexCoordinateArray[0] = -1.0f;
+    m_vertexCoordinateArray[1] = -1.0f;
+    m_vertexCoordinateArray[2] =  1.0f;
+    m_vertexCoordinateArray[3] = -1.0f;
+    m_vertexCoordinateArray[4] =  1.0f;
+    m_vertexCoordinateArray[5] =  1.0f;
+    m_vertexCoordinateArray[6] = -1.0f;
+    m_vertexCoordinateArray[7] =  1.0f;
+
+    m_textureCoordinateArray[0] = 0.0f;
+    m_textureCoordinateArray[1] = 0.0f;
+    m_textureCoordinateArray[2] = 1.0f;
+    m_textureCoordinateArray[3] = 0.0f;
+    m_textureCoordinateArray[4] = 1.0f;
+    m_textureCoordinateArray[5] = 1.0f;
+    m_textureCoordinateArray[6] = 0.0f;
+    m_textureCoordinateArray[7] = 1.0f;
+}
+
+QOpenGLTextureGlyphCache::~QOpenGLTextureGlyphCache()
+{
+#ifdef QT_GL_TEXTURE_GLYPH_CACHE_DEBUG
+    qDebug(" -> ~QOpenGLTextureGlyphCache() %p.", this);
+#endif
+    clear();
+}
+
+#if !defined(QT_OPENGL_ES_2)
+static inline bool isCoreProfile()
+{
+    return QOpenGLContext::currentContext()->format().profile() == QSurfaceFormat::CoreProfile;
+}
+#endif
+
+void QOpenGLTextureGlyphCache::createTextureData(int width, int height)
+{
+    QOpenGLContext *ctx = const_cast<QOpenGLContext *>(QOpenGLContext::currentContext());
+    if (ctx == nullptr) {
+        qWarning("QOpenGLTextureGlyphCache::createTextureData: Called with no context");
+        return;
+    }
+
+    // create in QImageTextureGlyphCache baseclass is meant to be called
+    // only to create the initial image and does not preserve the content,
+    // so we don't call when this function is called from resize.
+    if (ctx->d_func()->workaround_brokenFBOReadBack && image().isNull())
+        QImageTextureGlyphCache::createTextureData(width, height);
+
+    // Make the lower glyph texture size 16 x 16.
+    if (width < 16)
+        width = 16;
+    if (height < 16)
+        height = 16;
+
+    if (m_textureResource && !m_textureResource->m_texture) {
+        delete m_textureResource;
+        m_textureResource = nullptr;
+    }
+
+    if (!m_textureResource)
+        m_textureResource = new QOpenGLGlyphTexture(ctx);
+
+    QOpenGLFunctions *funcs = ctx->functions();
+    funcs->glGenTextures(1, &m_textureResource->m_texture);
+    funcs->glBindTexture(GL_TEXTURE_2D, m_textureResource->m_texture);
+
+    m_textureResource->m_width = width;
+    m_textureResource->m_height = height;
+
+    if (m_format == QFontEngine::Format_A32 || m_format == QFontEngine::Format_ARGB) {
+        QVarLengthArray<uchar> data(width * height * 4);
+        for (int i = 0; i < data.size(); ++i)
+            data[i] = 0;
+        funcs->glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, width, height, 0, GL_RGBA, GL_UNSIGNED_BYTE, &data[0]);
+    } else {
+        QVarLengthArray<uchar> data(width * height);
+        for (int i = 0; i < data.size(); ++i)
+            data[i] = 0;
+#if !defined(QT_OPENGL_ES_2)
+        const GLint internalFormat = isCoreProfile() ? GL_R8 : GL_ALPHA;
+        const GLenum format = isCoreProfile() ? GL_RED : GL_ALPHA;
+#else
+        const GLint internalFormat = GL_ALPHA;
+        const GLenum format = GL_ALPHA;
+#endif
+        funcs->glTexImage2D(GL_TEXTURE_2D, 0, internalFormat, width, height, 0, format, GL_UNSIGNED_BYTE, &data[0]);
+    }
+
+    funcs->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+    funcs->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+    funcs->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+    funcs->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+    m_filterMode = Nearest;
+
+    if (!m_buffer.isCreated()) {
+        m_buffer.create();
+        m_buffer.bind();
+        static GLfloat buf[sizeof(m_vertexCoordinateArray) + sizeof(m_textureCoordinateArray)];
+        memcpy(buf, m_vertexCoordinateArray, sizeof(m_vertexCoordinateArray));
+        memcpy(buf + (sizeof(m_vertexCoordinateArray) / sizeof(GLfloat)),
+               m_textureCoordinateArray,
+               sizeof(m_textureCoordinateArray));
+        m_buffer.allocate(buf, sizeof(buf));
+        m_buffer.release();
+    }
+
+    if (!m_vao.isCreated())
+        m_vao.create();
+}
+
+void QOpenGLTextureGlyphCache::setupVertexAttribs()
+{
+    m_buffer.bind();
+    m_blitProgram->setAttributeBuffer(int(QT_VERTEX_COORDS_ATTR), GL_FLOAT, 0, 2);
+    m_blitProgram->setAttributeBuffer(int(QT_TEXTURE_COORDS_ATTR), GL_FLOAT, sizeof(m_vertexCoordinateArray), 2);
+    m_blitProgram->enableAttributeArray(int(QT_VERTEX_COORDS_ATTR));
+    m_blitProgram->enableAttributeArray(int(QT_TEXTURE_COORDS_ATTR));
+    m_buffer.release();
+}
+
+static void load_glyph_image_to_texture(QOpenGLContext *ctx,
+                                        QImage &img,
+                                        GLuint texture,
+                                        int tx, int ty)
+{
+    QOpenGLFunctions *funcs = ctx->functions();
+
+    const int imgWidth = img.width();
+    const int imgHeight = img.height();
+
+    if (img.format() == QImage::Format_Mono) {
+        img = img.convertToFormat(QImage::Format_Grayscale8);
+    } else if (img.depth() == 32) {
+        if (img.format() == QImage::Format_RGB32
+            // We need to make the alpha component equal to the average of the RGB values.
+            // This is needed when drawing sub-pixel antialiased text on translucent targets.
+#if Q_BYTE_ORDER == Q_BIG_ENDIAN
+            || img.format() == QImage::Format_ARGB32_Premultiplied
+#else
+            || (img.format() == QImage::Format_ARGB32_Premultiplied
+                && ctx->isOpenGLES())
+#endif
+            ) {
+            for (int y = 0; y < imgHeight; ++y) {
+                QRgb *src = (QRgb *) img.scanLine(y);
+                for (int x = 0; x < imgWidth; ++x) {
+                    int r = qRed(src[x]);
+                    int g = qGreen(src[x]);
+                    int b = qBlue(src[x]);
+                    int avg;
+                    if (img.format() == QImage::Format_RGB32)
+                        avg = (r + g + b + 1) / 3; // "+1" for rounding.
+                    else // Format_ARGB_Premultiplied
+                        avg = qAlpha(src[x]);
+
+                    src[x] = qRgba(r, g, b, avg);
+                    // swizzle the bits to accommodate for the GL_RGBA upload.
+#if Q_BYTE_ORDER != Q_BIG_ENDIAN
+                    if (ctx->isOpenGLES())
+#endif
+                        src[x] = ARGB2RGBA(src[x]);
+                }
+            }
+        }
+    }
+
+    funcs->glBindTexture(GL_TEXTURE_2D, texture);
+    if (img.depth() == 32) {
+#ifdef QT_OPENGL_ES_2
+        GLenum fmt = GL_RGBA;
+#else
+        GLenum fmt = ctx->isOpenGLES() ? GL_RGBA : GL_BGRA;
+#endif // QT_OPENGL_ES_2
+
+#if Q_BYTE_ORDER == Q_BIG_ENDIAN
+        fmt = GL_RGBA;
+#endif
+        funcs->glTexSubImage2D(GL_TEXTURE_2D, 0, tx, ty, imgWidth, imgHeight, fmt, GL_UNSIGNED_BYTE, img.constBits());
+    } else {
+        // The scanlines in image are 32-bit aligned, even for mono or 8-bit formats. This
+        // is good because it matches the default of 4 bytes for GL_UNPACK_ALIGNMENT.
+#if !defined(QT_OPENGL_ES_2)
+        const GLenum format = isCoreProfile() ? GL_RED : GL_ALPHA;
+#else
+        const GLenum format = GL_ALPHA;
+#endif
+        funcs->glTexSubImage2D(GL_TEXTURE_2D, 0, tx, ty, imgWidth, imgHeight, format, GL_UNSIGNED_BYTE, img.constBits());
+    }
+}
+
+static void load_glyph_image_region_to_texture(QOpenGLContext *ctx,
+                                               const QImage &srcImg,
+                                               int x, int y,
+                                               int w, int h,
+                                               GLuint texture,
+                                               int tx, int ty)
+{
+    Q_ASSERT(x + w <= srcImg.width() && y + h <= srcImg.height());
+
+    QImage img;
+    if (x != 0 || y != 0 || w != srcImg.width() || h != srcImg.height())
+        img = srcImg.copy(x, y, w, h);
+    else
+        img = srcImg;
+
+    load_glyph_image_to_texture(ctx, img, texture, tx, ty);
+}
+
+void QOpenGLTextureGlyphCache::resizeTextureData(int width, int height)
+{
+    QOpenGLContext *ctx = QOpenGLContext::currentContext();
+    if (ctx == nullptr) {
+        qWarning("QOpenGLTextureGlyphCache::resizeTextureData: Called with no context");
+        return;
+    }
+
+    QOpenGLFunctions *funcs = ctx->functions();
+    GLint oldFbo;
+    funcs->glGetIntegerv(GL_FRAMEBUFFER_BINDING, &oldFbo);
+
+    int oldWidth = m_textureResource->m_width;
+    int oldHeight = m_textureResource->m_height;
+
+    // Make the lower glyph texture size 16 x 16.
+    if (width < 16)
+        width = 16;
+    if (height < 16)
+        height = 16;
+
+    GLuint oldTexture = m_textureResource->m_texture;
+    createTextureData(width, height);
+
+    if (ctx->d_func()->workaround_brokenFBOReadBack) {
+        QImageTextureGlyphCache::resizeTextureData(width, height);
+        load_glyph_image_region_to_texture(ctx, image(), 0, 0, qMin(oldWidth, width), qMin(oldHeight, height),
+                                           m_textureResource->m_texture, 0, 0);
+        return;
+    }
+
+    // ### the QTextureGlyphCache API needs to be reworked to allow
+    // ### resizeTextureData to fail
+
+    funcs->glBindFramebuffer(GL_FRAMEBUFFER, m_textureResource->m_fbo);
+
+    GLuint tmp_texture;
+    funcs->glGenTextures(1, &tmp_texture);
+    funcs->glBindTexture(GL_TEXTURE_2D, tmp_texture);
+    funcs->glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, oldWidth, oldHeight, 0,
+                        GL_RGBA, GL_UNSIGNED_BYTE, nullptr);
+    funcs->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+    funcs->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+    funcs->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+    funcs->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+    m_filterMode = Nearest;
+    funcs->glBindTexture(GL_TEXTURE_2D, 0);
+    funcs->glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
+                                  GL_TEXTURE_2D, tmp_texture, 0);
+
+    funcs->glActiveTexture(GL_TEXTURE0 + QT_IMAGE_TEXTURE_UNIT);
+    funcs->glBindTexture(GL_TEXTURE_2D, oldTexture);
+
+    if (pex != nullptr)
+        pex->transferMode(BrushDrawingMode);
+
+    funcs->glDisable(GL_STENCIL_TEST);
+    funcs->glDisable(GL_DEPTH_TEST);
+    funcs->glDisable(GL_SCISSOR_TEST);
+    funcs->glDisable(GL_BLEND);
+
+    funcs->glViewport(0, 0, oldWidth, oldHeight);
+
+    QOpenGLShaderProgram *blitProgram = nullptr;
+    if (pex == nullptr) {
+        if (m_blitProgram == nullptr) {
+            m_blitProgram = new QOpenGLShaderProgram;
+            const bool isCoreProfile = ctx->format().profile() == QSurfaceFormat::CoreProfile;
+
+            {
+                QString source;
+#ifdef Q_OS_WASM
+                source.append(QLatin1String(isCoreProfile ? qopenglslUntransformedPositionVertexShader_core : qopenglslUntransformedPositionVertexShader));
+                source.append(QLatin1String(isCoreProfile ? qopenglslMainWithTexCoordsVertexShader_core : qopenglslMainWithTexCoordsVertexShader));
+#else
+                source.append(QLatin1String(isCoreProfile ? qopenglslMainWithTexCoordsVertexShader_core : qopenglslMainWithTexCoordsVertexShader));
+                source.append(QLatin1String(isCoreProfile ? qopenglslUntransformedPositionVertexShader_core : qopenglslUntransformedPositionVertexShader));
+#endif
+                m_blitProgram->addCacheableShaderFromSourceCode(QOpenGLShader::Vertex, source);
+            }
+
+            {
+                QString source;
+#ifdef Q_OS_WASM
+                source.append(QLatin1String(isCoreProfile ? qopenglslImageSrcFragmentShader_core : qopenglslImageSrcFragmentShader));
+                source.append(QLatin1String(isCoreProfile ? qopenglslMainFragmentShader_core : qopenglslMainFragmentShader));
+#else
+                source.append(QLatin1String(isCoreProfile ? qopenglslMainFragmentShader_core : qopenglslMainFragmentShader));
+                source.append(QLatin1String(isCoreProfile ? qopenglslImageSrcFragmentShader_core : qopenglslImageSrcFragmentShader));
+#endif
+                m_blitProgram->addCacheableShaderFromSourceCode(QOpenGLShader::Fragment, source);
+            }
+
+            m_blitProgram->bindAttributeLocation("vertexCoordsArray", QT_VERTEX_COORDS_ATTR);
+            m_blitProgram->bindAttributeLocation("textureCoordArray", QT_TEXTURE_COORDS_ATTR);
+
+            m_blitProgram->link();
+
+            if (m_vao.isCreated()) {
+                m_vao.bind();
+                setupVertexAttribs();
+            }
+        }
+
+        if (m_vao.isCreated())
+            m_vao.bind();
+        else
+            setupVertexAttribs();
+
+        m_blitProgram->bind();
+        blitProgram = m_blitProgram;
+
+    } else {
+        pex->uploadData(QT_VERTEX_COORDS_ATTR, m_vertexCoordinateArray, 8);
+        pex->uploadData(QT_TEXTURE_COORDS_ATTR, m_textureCoordinateArray, 8);
+
+        pex->shaderManager->useBlitProgram();
+        blitProgram = pex->shaderManager->blitProgram();
+    }
+
+    blitProgram->setUniformValue("imageTexture", QT_IMAGE_TEXTURE_UNIT);
+
+    funcs->glDrawArrays(GL_TRIANGLE_FAN, 0, 4);
+
+    funcs->glBindTexture(GL_TEXTURE_2D, m_textureResource->m_texture);
+
+    funcs->glCopyTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, 0, 0, oldWidth, oldHeight);
+
+    funcs->glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
+                                     GL_RENDERBUFFER, 0);
+    funcs->glDeleteTextures(1, &tmp_texture);
+    funcs->glDeleteTextures(1, &oldTexture);
+
+    funcs->glBindFramebuffer(GL_FRAMEBUFFER, (GLuint)oldFbo);
+
+    if (pex != nullptr) {
+        funcs->glViewport(0, 0, pex->width, pex->height);
+        pex->updateClipScissorTest();
+    } else {
+        if (m_vao.isCreated()) {
+            m_vao.release();
+        } else {
+            m_blitProgram->disableAttributeArray(int(QT_VERTEX_COORDS_ATTR));
+            m_blitProgram->disableAttributeArray(int(QT_TEXTURE_COORDS_ATTR));
+        }
+    }
+}
+
+void QOpenGLTextureGlyphCache::fillTexture(const Coord &c, glyph_t glyph, QFixed subPixelPosition)
+{
+    QOpenGLContext *ctx = QOpenGLContext::currentContext();
+    if (ctx == nullptr) {
+        qWarning("QOpenGLTextureGlyphCache::fillTexture: Called with no context");
+        return;
+    }
+
+    if (ctx->d_func()->workaround_brokenFBOReadBack) {
+        QImageTextureGlyphCache::fillTexture(c, glyph, subPixelPosition);
+        load_glyph_image_region_to_texture(ctx, image(), c.x, c.y, c.w, c.h, m_textureResource->m_texture, c.x, c.y);
+        return;
+    }
+
+    QImage mask = textureMapForGlyph(glyph, subPixelPosition);
+    load_glyph_image_to_texture(ctx, mask, m_textureResource->m_texture, c.x, c.y);
+}
+
+int QOpenGLTextureGlyphCache::glyphPadding() const
+{
+    return 1;
+}
+
+int QOpenGLTextureGlyphCache::maxTextureWidth() const
+{
+    QOpenGLContext *ctx = const_cast<QOpenGLContext *>(QOpenGLContext::currentContext());
+    if (ctx == nullptr)
+        return QImageTextureGlyphCache::maxTextureWidth();
+    else
+        return ctx->d_func()->maxTextureSize();
+}
+
+int QOpenGLTextureGlyphCache::maxTextureHeight() const
+{
+    QOpenGLContext *ctx = const_cast<QOpenGLContext *>(QOpenGLContext::currentContext());
+    if (ctx == nullptr)
+        return QImageTextureGlyphCache::maxTextureHeight();
+
+    if (ctx->d_func()->workaround_brokenTexSubImage)
+        return qMin(1024, ctx->d_func()->maxTextureSize());
+    else
+        return ctx->d_func()->maxTextureSize();
+}
+
+void QOpenGLTextureGlyphCache::clear()
+{
+    if (m_textureResource)
+        m_textureResource->free();
+    m_textureResource = nullptr;
+
+    delete m_blitProgram;
+    m_blitProgram = nullptr;
+
+    m_w = 0;
+    m_h = 0;
+    m_cx = 0;
+    m_cy = 0;
+    m_currentRowHeight = 0;
+    coords.clear();
+}
+
+QT_END_NAMESPACE
diff --git a/src/opengl/qopengltextureglyphcache_p.h b/src/opengl/qopengltextureglyphcache_p.h
new file mode 100644
index 0000000000..15ecd6209b
--- /dev/null
+++ b/src/opengl/qopengltextureglyphcache_p.h
@@ -0,0 +1,181 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtOpenGL module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QOPENGLTEXTUREGLYPHCACHE_P_H
+#define QOPENGLTEXTUREGLYPHCACHE_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API. It exists purely as an
+// implementation detail. This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <QtOpenGL/qtopenglglobal.h>
+#include <private/qtextureglyphcache_p.h>
+#include <private/qopenglcontext_p.h>
+#include <qopenglshaderprogram.h>
+#include <qopenglfunctions.h>
+#include <qopenglbuffer.h>
+#include <qopenglvertexarrayobject.h>
+
+// #define QT_GL_TEXTURE_GLYPH_CACHE_DEBUG
+
+QT_BEGIN_NAMESPACE
+
+class QOpenGL2PaintEngineExPrivate;
+
+class QOpenGLGlyphTexture : public QOpenGLSharedResource
+{
+public:
+    explicit QOpenGLGlyphTexture(QOpenGLContext *ctx)
+        : QOpenGLSharedResource(ctx->shareGroup())
+        , m_width(0)
+        , m_height(0)
+    {
+        if (!ctx->d_func()->workaround_brokenFBOReadBack)
+            QOpenGLFunctions(ctx).glGenFramebuffers(1, &m_fbo);
+
+#ifdef QT_GL_TEXTURE_GLYPH_CACHE_DEBUG
+        qDebug(" -> QOpenGLGlyphTexture() %p for context %p.", this, ctx);
+#endif
+    }
+
+    void freeResource(QOpenGLContext *context) override
+    {
+        QOpenGLContext *ctx = context;
+#ifdef QT_GL_TEXTURE_GLYPH_CACHE_DEBUG
+        qDebug("~QOpenGLGlyphTexture() %p for context %p.", this, ctx);
+#endif
+        if (!ctx->d_func()->workaround_brokenFBOReadBack)
+            ctx->functions()->glDeleteFramebuffers(1, &m_fbo);
+        if (m_width || m_height)
+            ctx->functions()->glDeleteTextures(1, &m_texture);
+    }
+
+    void invalidateResource() override
+    {
+        m_texture = 0;
+        m_fbo = 0;
+        m_width = 0;
+        m_height = 0;
+    }
+
+    GLuint m_texture;
+    GLuint m_fbo;
+    int m_width;
+    int m_height;
+};
+
+class Q_OPENGL_EXPORT QOpenGLTextureGlyphCache : public QImageTextureGlyphCache
+{
+public:
+    QOpenGLTextureGlyphCache(QFontEngine::GlyphFormat glyphFormat, const QTransform &matrix, const QColor &color = QColor());
+    ~QOpenGLTextureGlyphCache();
+
+    virtual void createTextureData(int width, int height) override;
+    virtual void resizeTextureData(int width, int height) override;
+    virtual void fillTexture(const Coord &c, glyph_t glyph, QFixed subPixelPosition) override;
+    virtual int glyphPadding() const override;
+    virtual int maxTextureWidth() const override;
+    virtual int maxTextureHeight() const override;
+
+    inline GLuint texture() const {
+        QOpenGLTextureGlyphCache *that = const_cast<QOpenGLTextureGlyphCache *>(this);
+        QOpenGLGlyphTexture *glyphTexture = that->m_textureResource;
+        return glyphTexture ? glyphTexture->m_texture : 0;
+    }
+
+    inline int width() const {
+        QOpenGLTextureGlyphCache *that = const_cast<QOpenGLTextureGlyphCache *>(this);
+        QOpenGLGlyphTexture *glyphTexture = that->m_textureResource;
+        return glyphTexture ? glyphTexture->m_width : 0;
+    }
+    inline int height() const {
+        QOpenGLTextureGlyphCache *that = const_cast<QOpenGLTextureGlyphCache *>(this);
+        QOpenGLGlyphTexture *glyphTexture = that->m_textureResource;
+        return glyphTexture ? glyphTexture->m_height : 0;
+    }
+
+    inline void setPaintEnginePrivate(QOpenGL2PaintEngineExPrivate *p) { pex = p; }
+
+    inline const QOpenGLContextGroup *contextGroup() const { return m_textureResource ? m_textureResource->group() : nullptr; }
+
+    inline int serialNumber() const { return m_serialNumber; }
+
+    enum FilterMode {
+        Nearest,
+        Linear
+    };
+    FilterMode filterMode() const { return m_filterMode; }
+    void setFilterMode(FilterMode m) { m_filterMode = m; }
+
+    void clear();
+
+    QOpenGL2PaintEngineExPrivate *paintEnginePrivate() const
+    {
+        return pex;
+    }
+
+private:
+    void setupVertexAttribs();
+
+    QOpenGLGlyphTexture *m_textureResource;
+
+    QOpenGL2PaintEngineExPrivate *pex;
+    QOpenGLShaderProgram *m_blitProgram;
+    FilterMode m_filterMode;
+
+    GLfloat m_vertexCoordinateArray[8];
+    GLfloat m_textureCoordinateArray[8];
+
+    int m_serialNumber;
+
+    QOpenGLBuffer m_buffer;
+    QOpenGLVertexArrayObject m_vao;
+};
+
+QT_END_NAMESPACE
+
+#endif // QOPENGLTEXTUREGLYPHCACHE_P_H
+
diff --git a/src/opengl/qopengltexturehelper.cpp b/src/opengl/qopengltexturehelper.cpp
new file mode 100644
index 0000000000..8f1473ecc9
--- /dev/null
+++ b/src/opengl/qopengltexturehelper.cpp
@@ -0,0 +1,589 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB).
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtOpenGL module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qopengltexturehelper_p.h"
+
+#include <QOpenGLContext>
+#include <private/qopenglextensions_p.h>
+
+QT_BEGIN_NAMESPACE
+
+QOpenGLTextureHelper::QOpenGLTextureHelper(QOpenGLContext *context)
+{
+    functions = context->functions();
+    // Resolve EXT_direct_state_access entry points if present.
+
+    // However, disable it on some systems where DSA is known to be unreliable.
+    bool allowDSA = true;
+    const char *renderer = reinterpret_cast<const char *>(context->functions()->glGetString(GL_RENDERER));
+    // QTBUG-40653, QTBUG-44988
+    if (renderer && strstr(renderer, "AMD Radeon HD"))
+        allowDSA = false;
+
+    if (allowDSA && !context->isOpenGLES()
+        && context->hasExtension(QByteArrayLiteral("GL_EXT_direct_state_access"))) {
+        TextureParameteriEXT = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLenum , GLint )>(context->getProcAddress("glTextureParameteriEXT"));
+        TextureParameterivEXT = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLenum , const GLint *)>(context->getProcAddress("glTextureParameterivEXT"));
+        TextureParameterfEXT = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLenum , GLfloat )>(context->getProcAddress("glTextureParameterfEXT"));
+        TextureParameterfvEXT = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLenum , const GLfloat *)>(context->getProcAddress("glTextureParameterfvEXT"));
+        GenerateTextureMipmapEXT = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum )>(context->getProcAddress("glGenerateTextureMipmapEXT"));
+        TextureStorage3DEXT = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLsizei , GLenum , GLsizei , GLsizei , GLsizei )>(context->getProcAddress("glTextureStorage3DEXT"));
+        TextureStorage2DEXT = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLsizei , GLenum , GLsizei , GLsizei )>(context->getProcAddress("glTextureStorage2DEXT"));
+        TextureStorage1DEXT = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLsizei , GLenum , GLsizei )>(context->getProcAddress("glTextureStorage1DEXT"));
+        TextureStorage3DMultisampleEXT = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLsizei , GLenum , GLsizei , GLsizei , GLsizei , GLboolean )>(context->getProcAddress("glTextureStorage3DMultisampleEXT"));
+        TextureStorage2DMultisampleEXT = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLsizei , GLenum , GLsizei , GLsizei , GLboolean )>(context->getProcAddress("glTextureStorage2DMultisampleEXT"));
+        TextureImage3DEXT = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLint , GLenum , GLsizei , GLsizei , GLsizei , GLint , GLenum , GLenum , const GLvoid *)>(context->getProcAddress("glTextureImage3DEXT"));
+        TextureImage2DEXT = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLint , GLenum , GLsizei , GLsizei , GLint , GLenum , GLenum , const GLvoid *)>(context->getProcAddress("glTextureImage2DEXT"));
+        TextureImage1DEXT = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLint , GLenum , GLsizei , GLint , GLenum , GLenum , const GLvoid *)>(context->getProcAddress("glTextureImage1DEXT"));
+        TextureSubImage3DEXT = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLint , GLint , GLint , GLint , GLsizei , GLsizei , GLsizei , GLenum , GLenum , const GLvoid *)>(context->getProcAddress("glTextureSubImage3DEXT"));
+        TextureSubImage2DEXT = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLint , GLint , GLint , GLsizei , GLsizei , GLenum , GLenum , const GLvoid *)>(context->getProcAddress("glTextureSubImage2DEXT"));
+        TextureSubImage1DEXT = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLint , GLint , GLsizei , GLenum , GLenum , const GLvoid *)>(context->getProcAddress("glTextureSubImage1DEXT"));
+        CompressedTextureSubImage1DEXT = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLint , GLint , GLsizei , GLenum , GLsizei , const GLvoid *)>(context->getProcAddress("glCompressedTextureSubImage1DEXT"));
+        CompressedTextureSubImage2DEXT = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLint , GLint , GLint , GLsizei , GLsizei , GLenum , GLsizei , const GLvoid *)>(context->getProcAddress("glCompressedTextureSubImage2DEXT"));
+        CompressedTextureSubImage3DEXT = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLint , GLint , GLint , GLint , GLsizei , GLsizei , GLsizei , GLenum , GLsizei , const GLvoid *)>(context->getProcAddress("glCompressedTextureSubImage3DEXT"));
+        CompressedTextureImage1DEXT = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLint , GLenum , GLsizei , GLint , GLsizei , const GLvoid *)>(context->getProcAddress("glCompressedTextureImage1DEXT"));
+        CompressedTextureImage2DEXT = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLint , GLenum , GLsizei , GLsizei , GLint , GLsizei , const GLvoid *)>(context->getProcAddress("glCompressedTextureImage2DEXT"));
+        CompressedTextureImage3DEXT = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLint , GLenum , GLsizei , GLsizei , GLsizei , GLint , GLsizei , const GLvoid *)>(context->getProcAddress("glCompressedTextureImage3DEXT"));
+
+        // Use the real DSA functions
+        TextureParameteri = &QOpenGLTextureHelper::dsa_TextureParameteri;
+        TextureParameteriv = &QOpenGLTextureHelper::dsa_TextureParameteriv;
+        TextureParameterf = &QOpenGLTextureHelper::dsa_TextureParameterf;
+        TextureParameterfv = &QOpenGLTextureHelper::dsa_TextureParameterfv;
+        GenerateTextureMipmap = &QOpenGLTextureHelper::dsa_GenerateTextureMipmap;
+        TextureStorage3D = &QOpenGLTextureHelper::dsa_TextureStorage3D;
+        TextureStorage2D = &QOpenGLTextureHelper::dsa_TextureStorage2D;
+        TextureStorage1D = &QOpenGLTextureHelper::dsa_TextureStorage1D;
+        TextureStorage3DMultisample = &QOpenGLTextureHelper::dsa_TextureStorage3DMultisample;
+        TextureStorage2DMultisample = &QOpenGLTextureHelper::dsa_TextureStorage2DMultisample;
+        TextureImage3D = &QOpenGLTextureHelper::dsa_TextureImage3D;
+        TextureImage2D = &QOpenGLTextureHelper::dsa_TextureImage2D;
+        TextureImage1D = &QOpenGLTextureHelper::dsa_TextureImage1D;
+        TextureSubImage3D = &QOpenGLTextureHelper::dsa_TextureSubImage3D;
+        TextureSubImage2D = &QOpenGLTextureHelper::dsa_TextureSubImage2D;
+        TextureSubImage1D = &QOpenGLTextureHelper::dsa_TextureSubImage1D;
+        CompressedTextureSubImage1D = &QOpenGLTextureHelper::dsa_CompressedTextureSubImage1D;
+        CompressedTextureSubImage2D = &QOpenGLTextureHelper::dsa_CompressedTextureSubImage2D;
+        CompressedTextureSubImage3D = &QOpenGLTextureHelper::dsa_CompressedTextureSubImage3D;
+        CompressedTextureImage1D = &QOpenGLTextureHelper::dsa_CompressedTextureImage1D;
+        CompressedTextureImage2D = &QOpenGLTextureHelper::dsa_CompressedTextureImage2D;
+        CompressedTextureImage3D = &QOpenGLTextureHelper::dsa_CompressedTextureImage3D;
+    } else {
+        // Use our own DSA emulation
+        TextureParameteri = &QOpenGLTextureHelper::qt_TextureParameteri;
+        TextureParameteriv = &QOpenGLTextureHelper::qt_TextureParameteriv;
+        TextureParameterf = &QOpenGLTextureHelper::qt_TextureParameterf;
+        TextureParameterfv = &QOpenGLTextureHelper::qt_TextureParameterfv;
+        GenerateTextureMipmap = &QOpenGLTextureHelper::qt_GenerateTextureMipmap;
+        TextureStorage3D = &QOpenGLTextureHelper::qt_TextureStorage3D;
+        TextureStorage2D = &QOpenGLTextureHelper::qt_TextureStorage2D;
+        TextureStorage1D = &QOpenGLTextureHelper::qt_TextureStorage1D;
+        TextureStorage3DMultisample = &QOpenGLTextureHelper::qt_TextureStorage3DMultisample;
+        TextureStorage2DMultisample = &QOpenGLTextureHelper::qt_TextureStorage2DMultisample;
+        TextureImage3D = &QOpenGLTextureHelper::qt_TextureImage3D;
+        TextureImage2D = &QOpenGLTextureHelper::qt_TextureImage2D;
+        TextureImage1D = &QOpenGLTextureHelper::qt_TextureImage1D;
+        TextureSubImage3D = &QOpenGLTextureHelper::qt_TextureSubImage3D;
+        TextureSubImage2D = &QOpenGLTextureHelper::qt_TextureSubImage2D;
+        TextureSubImage1D = &QOpenGLTextureHelper::qt_TextureSubImage1D;
+        CompressedTextureSubImage1D = &QOpenGLTextureHelper::qt_CompressedTextureSubImage1D;
+        CompressedTextureSubImage2D = &QOpenGLTextureHelper::qt_CompressedTextureSubImage2D;
+        CompressedTextureSubImage3D = &QOpenGLTextureHelper::qt_CompressedTextureSubImage3D;
+        CompressedTextureImage1D = &QOpenGLTextureHelper::qt_CompressedTextureImage1D;
+        CompressedTextureImage2D = &QOpenGLTextureHelper::qt_CompressedTextureImage2D;
+        CompressedTextureImage3D = &QOpenGLTextureHelper::qt_CompressedTextureImage3D;
+    }
+
+    // Some DSA functions are part of NV_texture_multisample instead
+    if (!context->isOpenGLES()
+        && context->hasExtension(QByteArrayLiteral("GL_NV_texture_multisample"))) {
+        TextureImage3DMultisampleNV = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLsizei , GLint , GLsizei , GLsizei , GLsizei , GLboolean )>(context->getProcAddress("glTextureImage3DMultisampleNV"));
+        TextureImage2DMultisampleNV = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLsizei , GLint , GLsizei , GLsizei , GLboolean )>(context->getProcAddress("glTextureImage2DMultisampleNV"));
+
+        TextureImage3DMultisample = &QOpenGLTextureHelper::dsa_TextureImage3DMultisample;
+        TextureImage2DMultisample = &QOpenGLTextureHelper::dsa_TextureImage2DMultisample;
+    } else {
+        TextureImage3DMultisample = &QOpenGLTextureHelper::qt_TextureImage3DMultisample;
+        TextureImage2DMultisample = &QOpenGLTextureHelper::qt_TextureImage2DMultisample;
+    }
+
+#if defined(QT_OPENGL_ES_2)
+    // Here we are targeting OpenGL ES 2.0+ only. This is likely using EGL, where,
+    // similarly to WGL, non-extension functions (i.e. any function that is part of the
+    // GLES spec) *may* not be queried via eglGetProcAddress.
+
+    // OpenGL 1.0
+    TexImage1D = 0;
+
+    // OpenGL 1.1
+    TexSubImage1D = 0;
+
+    // OpenGL 1.3
+    GetCompressedTexImage = 0;
+    CompressedTexSubImage1D = 0;
+    CompressedTexSubImage2D = ::glCompressedTexSubImage2D;
+    CompressedTexImage1D = 0;
+    CompressedTexImage2D = ::glCompressedTexImage2D;
+    ActiveTexture = ::glActiveTexture;
+
+    // OpenGL 3.0
+    GenerateMipmap = ::glGenerateMipmap;
+
+    // OpenGL 3.2
+    TexImage3DMultisample = 0;
+    TexImage2DMultisample = 0;
+
+    // OpenGL 4.2
+    QOpenGLContext *ctx = QOpenGLContext::currentContext();
+    if (ctx->format().majorVersion() >= 3) {
+        // OpenGL ES 3.0+ has immutable storage for 2D and 3D at least.
+        QOpenGLExtraFunctionsPrivate *extra = static_cast<QOpenGLExtensions *>(context->extraFunctions())->d();
+        TexStorage3D = extra->f.TexStorage3D;
+        TexStorage2D = extra->f.TexStorage2D;
+    } else {
+        TexStorage3D = 0;
+        TexStorage2D = 0;
+    }
+    TexStorage1D = 0;
+
+    // OpenGL 4.3
+    TexStorage3DMultisample = 0;
+    TexStorage2DMultisample = 0;
+    TexBufferRange = 0;
+    TextureView = 0;
+
+    // OpenGL ES 3.1+ has TexStorage2DMultisample
+    if (ctx->format().version() >= qMakePair(3, 1)) {
+        QOpenGLExtraFunctionsPrivate *extra = static_cast<QOpenGLExtensions *>(context->extraFunctions())->d();
+        TexStorage2DMultisample = extra->f.TexStorage2DMultisample;
+    }
+
+#endif
+
+    if (context->isOpenGLES() && context->hasExtension(QByteArrayLiteral("GL_OES_texture_3D"))) {
+        TexImage3D = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum, GLint, GLint, GLsizei, GLsizei, GLsizei, GLint, GLenum, GLenum, const GLvoid*)>(context->getProcAddress("glTexImage3DOES"));
+        TexSubImage3D = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLenum, GLenum, const GLvoid*)>(context->getProcAddress("glTexSubImage3DOES"));
+        CompressedTexImage3D = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum, GLint, GLenum, GLsizei, GLsizei, GLsizei, GLint, GLsizei, const GLvoid*)>(context->getProcAddress("glCompressedTexImage3DOES"));
+        CompressedTexSubImage3D = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLenum, GLsizei, const GLvoid*)>(context->getProcAddress("glCompressedTexSubImage3DOES"));
+    } else {
+        QOpenGLContext *ctx = QOpenGLContext::currentContext();
+        if (ctx->isOpenGLES() && ctx->format().majorVersion() >= 3) {
+            // OpenGL ES 3.0+ has glTexImage3D.
+            QOpenGLExtraFunctionsPrivate *extra = static_cast<QOpenGLExtensions *>(context->extraFunctions())->d();
+            TexImage3D = extra->f.TexImage3D;
+            TexSubImage3D = extra->f.TexSubImage3D;
+            CompressedTexImage3D = extra->f.CompressedTexImage3D;
+            CompressedTexSubImage3D = extra->f.CompressedTexSubImage3D;
+        } else {
+            // OpenGL 1.2
+            TexImage3D = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLint , GLint , GLsizei , GLsizei , GLsizei , GLint , GLenum , GLenum , const GLvoid *)>(context->getProcAddress("glTexImage3D"));
+            TexSubImage3D = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLint , GLint , GLint , GLint , GLsizei , GLsizei , GLsizei , GLenum , GLenum , const GLvoid *)>(context->getProcAddress("glTexSubImage3D"));
+
+            // OpenGL 1.3
+            CompressedTexImage3D = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLint , GLenum , GLsizei , GLsizei , GLsizei , GLint , GLsizei , const GLvoid *)>(context->getProcAddress("glCompressedTexImage3D"));
+            CompressedTexSubImage3D = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLint , GLint , GLint , GLint , GLsizei , GLsizei , GLsizei , GLenum , GLsizei , const GLvoid *)>(context->getProcAddress("glCompressedTexSubImage3D"));
+        }
+    }
+
+#ifndef QT_OPENGL_ES_2
+    // OpenGL 1.0 and 1.1
+    TexImage1D = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLint , GLint , GLsizei , GLint , GLenum , GLenum , const GLvoid *)>(context->getProcAddress("glTexImage1D"));
+    TexSubImage1D = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLint , GLint , GLsizei , GLenum , GLenum , const GLvoid *)>(context->getProcAddress("glTexSubImage1D"));\
+
+    // OpenGL 1.3
+    GetCompressedTexImage = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLint , GLvoid *)>(context->getProcAddress("glGetCompressedTexImage"));
+    CompressedTexSubImage1D = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLint , GLint , GLsizei , GLenum , GLsizei , const GLvoid *)>(context->getProcAddress("glCompressedTexSubImage1D"));
+    CompressedTexSubImage2D = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLint , GLint , GLint , GLsizei , GLsizei , GLenum , GLsizei , const GLvoid *)>(context->getProcAddress("glCompressedTexSubImage2D"));
+    CompressedTexImage1D = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLint , GLenum , GLsizei , GLint , GLsizei , const GLvoid *)>(context->getProcAddress("glCompressedTexImage1D"));
+    CompressedTexImage2D = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLint , GLenum , GLsizei , GLsizei , GLint , GLsizei , const GLvoid *)>(context->getProcAddress("glCompressedTexImage2D"));
+    ActiveTexture = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum )>(context->getProcAddress("glActiveTexture"));
+
+    // OpenGL 3.0
+    GenerateMipmap = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum )>(context->getProcAddress("glGenerateMipmap"));
+
+    // OpenGL 3.2
+    TexImage3DMultisample = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLsizei , GLint , GLsizei , GLsizei , GLsizei , GLboolean )>(context->getProcAddress("glTexImage3DMultisample"));
+    TexImage2DMultisample = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLsizei , GLint , GLsizei , GLsizei , GLboolean )>(context->getProcAddress("glTexImage2DMultisample"));
+
+    // OpenGL 4.2
+    TexStorage3D = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLsizei , GLenum , GLsizei , GLsizei , GLsizei )>(context->getProcAddress("glTexStorage3D"));
+    TexStorage2D = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLsizei , GLenum , GLsizei , GLsizei )>(context->getProcAddress("glTexStorage2D"));
+    TexStorage1D = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLsizei , GLenum , GLsizei )>(context->getProcAddress("glTexStorage1D"));
+
+    // OpenGL 4.3
+    TexStorage3DMultisample = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLsizei , GLenum , GLsizei , GLsizei , GLsizei , GLboolean )>(context->getProcAddress("glTexStorage3DMultisample"));
+    TexStorage2DMultisample = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLsizei , GLenum , GLsizei , GLsizei , GLboolean )>(context->getProcAddress("glTexStorage2DMultisample"));
+    TexBufferRange = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , GLuint , GLintptr , GLsizeiptr )>(context->getProcAddress("glTexBufferRange"));
+    TextureView = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLuint , GLenum , GLuint , GLuint , GLuint , GLuint )>(context->getProcAddress("glTextureView"));
+#endif
+}
+
+void QOpenGLTextureHelper::dsa_TextureParameteri(GLuint texture, GLenum target, GLenum bindingTarget, GLenum pname, GLint param)
+{
+    Q_UNUSED(bindingTarget);
+    TextureParameteriEXT(texture, target, pname, param);
+}
+
+void QOpenGLTextureHelper::dsa_TextureParameteriv(GLuint texture, GLenum target, GLenum bindingTarget, GLenum pname, const GLint *params)
+{
+    Q_UNUSED(bindingTarget);
+    TextureParameterivEXT(texture, target, pname, params);
+}
+
+void QOpenGLTextureHelper::dsa_TextureParameterf(GLuint texture, GLenum target, GLenum bindingTarget, GLenum pname, GLfloat param)
+{
+    Q_UNUSED(bindingTarget);
+    TextureParameterfEXT(texture, target, pname, param);
+}
+
+void QOpenGLTextureHelper::dsa_TextureParameterfv(GLuint texture, GLenum target, GLenum bindingTarget, GLenum pname, const GLfloat *params)
+{
+    Q_UNUSED(bindingTarget);
+    TextureParameterfvEXT(texture, target, pname, params);
+}
+
+void QOpenGLTextureHelper::dsa_GenerateTextureMipmap(GLuint texture, GLenum target, GLenum bindingTarget)
+{
+    Q_UNUSED(bindingTarget);
+    GenerateTextureMipmapEXT(texture, target);
+}
+
+void QOpenGLTextureHelper::dsa_TextureStorage3D(GLuint texture, GLenum target, GLenum bindingTarget, GLsizei levels, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth)
+{
+    Q_UNUSED(bindingTarget);
+    TextureStorage3DEXT(texture, target, levels, internalFormat, width, height, depth);
+}
+
+void QOpenGLTextureHelper::dsa_TextureStorage2D(GLuint texture, GLenum target, GLenum bindingTarget, GLsizei levels, GLenum internalFormat, GLsizei width, GLsizei height)
+{
+    Q_UNUSED(bindingTarget);
+    TextureStorage2DEXT(texture, target, levels, internalFormat, width, height);
+}
+
+void QOpenGLTextureHelper::dsa_TextureStorage1D(GLuint texture, GLenum target, GLenum bindingTarget, GLsizei levels, GLenum internalFormat, GLsizei width)
+{
+    Q_UNUSED(bindingTarget);
+    TextureStorage1DEXT(texture, target, levels, internalFormat, width);
+}
+
+void QOpenGLTextureHelper::dsa_TextureStorage3DMultisample(GLuint texture, GLenum target, GLenum bindingTarget, GLsizei samples, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedSampleLocations)
+{
+    Q_UNUSED(bindingTarget);
+    TextureStorage3DMultisampleEXT(texture, target, samples, internalFormat, width, height, depth, fixedSampleLocations);
+}
+
+void QOpenGLTextureHelper::dsa_TextureStorage2DMultisample(GLuint texture, GLenum target, GLenum bindingTarget, GLsizei samples, GLenum internalFormat, GLsizei width, GLsizei height, GLboolean fixedSampleLocations)
+{
+    Q_UNUSED(bindingTarget);
+    TextureStorage2DMultisampleEXT(texture, target, samples, internalFormat, width, height, fixedSampleLocations);
+}
+
+void QOpenGLTextureHelper::dsa_TextureImage3D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels)
+{
+    Q_UNUSED(bindingTarget);
+    TextureImage3DEXT(texture, target, level, internalFormat, width, height, depth, border, format, type, pixels);
+}
+
+void QOpenGLTextureHelper::dsa_TextureImage2D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level, GLenum internalFormat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid *pixels)
+{
+    Q_UNUSED(bindingTarget);
+    TextureImage2DEXT(texture, target, level, internalFormat, width, height, border, format, type, pixels);
+}
+
+void QOpenGLTextureHelper::dsa_TextureImage1D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level, GLenum internalFormat, GLsizei width, GLint border, GLenum format, GLenum type, const GLvoid *pixels)
+{
+    Q_UNUSED(bindingTarget);
+    TextureImage1DEXT(texture, target, level, internalFormat, width, border, format, type, pixels);
+}
+
+void QOpenGLTextureHelper::dsa_TextureSubImage3D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels)
+{
+    Q_UNUSED(bindingTarget);
+    TextureSubImage3DEXT(texture, target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels);
+}
+
+void QOpenGLTextureHelper::dsa_TextureSubImage2D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels)
+{
+    Q_UNUSED(bindingTarget);
+    TextureSubImage2DEXT(texture, target, level, xoffset, yoffset, width, height, format, type, pixels);
+}
+
+void QOpenGLTextureHelper::dsa_TextureSubImage1D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid *pixels)
+{
+    Q_UNUSED(bindingTarget);
+    TextureSubImage1DEXT(texture, target, level, xoffset, width, format, type, pixels);
+}
+
+void QOpenGLTextureHelper::dsa_TextureImage3DMultisample(GLuint texture, GLenum target, GLenum bindingTarget, GLsizei samples, GLint internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedSampleLocations)
+{
+    Q_UNUSED(bindingTarget);
+    TextureImage3DMultisampleNV(texture, target, samples, internalFormat, width, height, depth, fixedSampleLocations);
+}
+
+void QOpenGLTextureHelper::dsa_TextureImage2DMultisample(GLuint texture, GLenum target, GLenum bindingTarget, GLsizei samples, GLint internalFormat, GLsizei width, GLsizei height, GLboolean fixedSampleLocations)
+{
+    Q_UNUSED(bindingTarget);
+    TextureImage2DMultisampleNV(texture, target, samples, internalFormat, width, height, fixedSampleLocations);
+}
+
+void QOpenGLTextureHelper::dsa_CompressedTextureSubImage1D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *bits)
+{
+    Q_UNUSED(bindingTarget);
+    CompressedTextureSubImage1DEXT(texture, target, level, xoffset, width, format, imageSize, bits);
+}
+
+void QOpenGLTextureHelper::dsa_CompressedTextureSubImage2D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *bits)
+{
+    Q_UNUSED(bindingTarget);
+    CompressedTextureSubImage2DEXT(texture, target, level, xoffset, yoffset, width, height, format, imageSize, bits);
+}
+
+void QOpenGLTextureHelper::dsa_CompressedTextureSubImage3D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *bits)
+{
+    Q_UNUSED(bindingTarget);
+    CompressedTextureSubImage3DEXT(texture, target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, bits);
+}
+
+void QOpenGLTextureHelper::dsa_CompressedTextureImage1D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level, GLenum internalFormat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *bits)
+{
+    Q_UNUSED(bindingTarget);
+    CompressedTextureImage1DEXT(texture, target, level, internalFormat, width, border, imageSize, bits);
+}
+
+void QOpenGLTextureHelper::dsa_CompressedTextureImage2D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level, GLenum internalFormat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *bits)
+{
+    Q_UNUSED(bindingTarget);
+    CompressedTextureImage2DEXT(texture, target, level, internalFormat, width, height, border, imageSize, bits);
+}
+
+void QOpenGLTextureHelper::dsa_CompressedTextureImage3D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *bits)
+{
+    Q_UNUSED(bindingTarget);
+    CompressedTextureImage3DEXT(texture, target, level, internalFormat, width, height, depth, border, imageSize, bits);
+}
+
+namespace {
+
+class TextureBinder
+{
+public:
+    TextureBinder(QOpenGLFunctions *functions, GLuint texture, GLenum target, GLenum bindingTarget)
+    : m_functions(functions)
+    {
+        // For cubemaps we can't use the standard DSA emulation as it is illegal to
+        // try to bind a texture to one of the cubemap face targets. So we force the
+        // target and binding target to the cubemap values in this case.
+        switch (target) {
+        case GL_TEXTURE_CUBE_MAP_NEGATIVE_X:
+        case GL_TEXTURE_CUBE_MAP_POSITIVE_X:
+        case GL_TEXTURE_CUBE_MAP_NEGATIVE_Y:
+        case GL_TEXTURE_CUBE_MAP_POSITIVE_Y:
+        case GL_TEXTURE_CUBE_MAP_NEGATIVE_Z:
+        case GL_TEXTURE_CUBE_MAP_POSITIVE_Z:
+            bindingTarget = GL_TEXTURE_BINDING_CUBE_MAP;
+            m_target = GL_TEXTURE_CUBE_MAP;
+            break;
+
+        default:
+            m_target = target;
+            break;
+        }
+
+        m_functions->glGetIntegerv(bindingTarget, &m_oldTexture);
+        m_functions->glBindTexture(m_target, texture);
+    }
+
+    ~TextureBinder()
+    {
+        m_functions->glBindTexture(m_target, m_oldTexture);
+    }
+
+private:
+    QOpenGLFunctions *m_functions;
+    GLenum m_target;
+    GLint m_oldTexture;
+};
+
+} // namespace
+
+void QOpenGLTextureHelper::qt_TextureParameteri(GLuint texture, GLenum target, GLenum bindingTarget, GLenum pname, GLint param)
+{
+    TextureBinder binder(functions, texture, target, bindingTarget);
+    functions->glTexParameteri(target, pname, param);
+}
+
+void QOpenGLTextureHelper::qt_TextureParameteriv(GLuint texture, GLenum target, GLenum bindingTarget, GLenum pname, const GLint *params)
+{
+    TextureBinder binder(functions, texture, target, bindingTarget);
+    functions->glTexParameteriv(target, pname, params);
+}
+
+void QOpenGLTextureHelper::qt_TextureParameterf(GLuint texture, GLenum target, GLenum bindingTarget, GLenum pname, GLfloat param)
+{
+    TextureBinder binder(functions, texture, target, bindingTarget);
+    functions->glTexParameterf(target, pname, param);
+}
+
+void QOpenGLTextureHelper::qt_TextureParameterfv(GLuint texture, GLenum target, GLenum bindingTarget, GLenum pname, const GLfloat *params)
+{
+    TextureBinder binder(functions, texture, target, bindingTarget);
+    functions->glTexParameterfv(target, pname, params);
+}
+
+void QOpenGLTextureHelper::qt_GenerateTextureMipmap(GLuint texture, GLenum target, GLenum bindingTarget)
+{
+    TextureBinder binder(functions, texture, target, bindingTarget);
+    functions->glGenerateMipmap(target);
+}
+
+void QOpenGLTextureHelper::qt_TextureStorage3D(GLuint texture, GLenum target, GLenum bindingTarget, GLsizei levels, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth)
+{
+    TextureBinder binder(functions, texture, target, bindingTarget);
+    glTexStorage3D(target, levels, internalFormat, width, height, depth);
+}
+
+void QOpenGLTextureHelper::qt_TextureStorage2D(GLuint texture, GLenum target, GLenum bindingTarget, GLsizei levels, GLenum internalFormat, GLsizei width, GLsizei height)
+{
+    TextureBinder binder(functions, texture, target, bindingTarget);
+    glTexStorage2D(target, levels, internalFormat, width, height);
+}
+
+void QOpenGLTextureHelper::qt_TextureStorage1D(GLuint texture, GLenum target, GLenum bindingTarget, GLsizei levels, GLenum internalFormat, GLsizei width)
+{
+    TextureBinder binder(functions, texture, target, bindingTarget);
+    glTexStorage1D(target, levels, internalFormat, width);
+}
+
+void QOpenGLTextureHelper::qt_TextureStorage3DMultisample(GLuint texture, GLenum target, GLenum bindingTarget, GLsizei samples, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedSampleLocations)
+{
+    TextureBinder binder(functions, texture, target, bindingTarget);
+    glTexStorage3DMultisample(target, samples, internalFormat, width, height, depth, fixedSampleLocations);
+}
+
+void QOpenGLTextureHelper::qt_TextureStorage2DMultisample(GLuint texture, GLenum target, GLenum bindingTarget, GLsizei samples, GLenum internalFormat, GLsizei width, GLsizei height, GLboolean fixedSampleLocations)
+{
+    TextureBinder binder(functions, texture, target, bindingTarget);
+    glTexStorage2DMultisample(target, samples, internalFormat, width, height, fixedSampleLocations);
+}
+
+void QOpenGLTextureHelper::qt_TextureImage3D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels)
+{
+    TextureBinder binder(functions, texture, target, bindingTarget);
+    glTexImage3D(target, level, internalFormat, width, height, depth, border, format, type, pixels);
+}
+
+void QOpenGLTextureHelper::qt_TextureImage2D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level, GLenum internalFormat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid *pixels)
+{
+    TextureBinder binder(functions, texture, target, bindingTarget);
+    functions->glTexImage2D(target, level, internalFormat, width, height, border, format, type, pixels);
+}
+
+void QOpenGLTextureHelper::qt_TextureImage1D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level, GLenum internalFormat, GLsizei width, GLint border, GLenum format, GLenum type, const GLvoid *pixels)
+{
+    TextureBinder binder(functions, texture, target, bindingTarget);
+    glTexImage1D(target, level, internalFormat, width, border, format, type, pixels);
+}
+
+void QOpenGLTextureHelper::qt_TextureSubImage3D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels)
+{
+    TextureBinder binder(functions, texture, target, bindingTarget);
+    glTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels);
+}
+
+void QOpenGLTextureHelper::qt_TextureSubImage2D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels)
+{
+    TextureBinder binder(functions, texture, target, bindingTarget);
+    functions->glTexSubImage2D(target, level, xoffset, yoffset, width, height, format, type, pixels);
+}
+
+void QOpenGLTextureHelper::qt_TextureSubImage1D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid *pixels)
+{
+    TextureBinder binder(functions, texture, target, bindingTarget);
+    glTexSubImage1D(target, level, xoffset, width, format, type, pixels);
+}
+
+void QOpenGLTextureHelper::qt_TextureImage3DMultisample(GLuint texture, GLenum target, GLenum bindingTarget, GLsizei samples, GLint internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedSampleLocations)
+{
+    TextureBinder binder(functions, texture, target, bindingTarget);
+    glTexImage3DMultisample(target, samples, internalFormat, width, height, depth, fixedSampleLocations);
+}
+
+void QOpenGLTextureHelper::qt_TextureImage2DMultisample(GLuint texture, GLenum target, GLenum bindingTarget, GLsizei samples, GLint internalFormat, GLsizei width, GLsizei height, GLboolean fixedSampleLocations)
+{
+    TextureBinder binder(functions, texture, target, bindingTarget);
+    glTexImage2DMultisample(target, samples, internalFormat, width, height, fixedSampleLocations);
+}
+
+void QOpenGLTextureHelper::qt_CompressedTextureSubImage1D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *bits)
+{
+    TextureBinder binder(functions, texture, target, bindingTarget);
+    glCompressedTexSubImage1D(target, level, xoffset, width, format, imageSize, bits);
+}
+
+void QOpenGLTextureHelper::qt_CompressedTextureSubImage2D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *bits)
+{
+    TextureBinder binder(functions, texture, target, bindingTarget);
+    glCompressedTexSubImage2D(target, level, xoffset, yoffset, width, height, format, imageSize, bits);
+}
+
+void QOpenGLTextureHelper::qt_CompressedTextureSubImage3D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *bits)
+{
+    TextureBinder binder(functions, texture, target, bindingTarget);
+    glCompressedTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, bits);
+}
+
+void QOpenGLTextureHelper::qt_CompressedTextureImage1D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level, GLenum internalFormat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *bits)
+{
+    TextureBinder binder(functions, texture, target, bindingTarget);
+    glCompressedTexImage1D(target, level, internalFormat, width, border, imageSize, bits);
+}
+
+void QOpenGLTextureHelper::qt_CompressedTextureImage2D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level, GLenum internalFormat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *bits)
+{
+    TextureBinder binder(functions, texture, target, bindingTarget);
+    glCompressedTexImage2D(target, level, internalFormat, width, height, border, imageSize, bits);
+}
+
+void QOpenGLTextureHelper::qt_CompressedTextureImage3D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *bits)
+{
+    TextureBinder binder(functions, texture, target, bindingTarget);
+    glCompressedTexImage3D(target, level, internalFormat, width, height, depth, border, imageSize, bits);
+}
+
+QT_END_NAMESPACE
diff --git a/src/opengl/qopengltexturehelper_p.h b/src/opengl/qopengltexturehelper_p.h
new file mode 100644
index 0000000000..a62a47d029
--- /dev/null
+++ b/src/opengl/qopengltexturehelper_p.h
@@ -0,0 +1,797 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB).
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtOpenGL module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QOPENGLTEXTUREHELPER_P_H
+#define QOPENGLTEXTUREHELPER_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <QtOpenGL/qtopenglglobal.h>
+
+#ifndef QT_NO_OPENGL
+
+#include "qopengl.h"
+#include "qopenglpixeltransferoptions.h"
+#include "qopengltexture.h"
+#include "qopenglfunctions.h"
+
+QT_BEGIN_NAMESPACE
+
+// Constants for OpenGL and OpenGL ES 3.0+ which are not available with OpenGL ES 2.0.
+#ifndef GL_TEXTURE_BASE_LEVEL
+#define GL_TEXTURE_BASE_LEVEL 0x813C
+#endif
+#ifndef GL_TEXTURE_MAX_LEVEL
+#define GL_TEXTURE_MAX_LEVEL 0x813D
+#endif
+#ifndef GL_TEXTURE_COMPARE_MODE
+#define GL_TEXTURE_COMPARE_MODE 0x884C
+#endif
+#ifndef GL_TEXTURE_COMPARE_FUNC
+#define GL_TEXTURE_COMPARE_FUNC 0x884D
+#endif
+
+// use GL_APICALL only on Android + __clang__
+#if !defined(Q_OS_ANDROID) || !defined(__clang__)
+# undef GL_APICALL
+# define GL_APICALL
+#elif !defined(GL_APICALL)
+# define GL_APICALL
+#endif
+
+class QOpenGLContext;
+
+class QOpenGLTextureHelper
+{
+public:
+    QOpenGLTextureHelper(QOpenGLContext *context);
+
+    // DSA-like API. Will either use real DSA or our emulation
+    inline void glTextureParameteri(GLuint texture, GLenum target, GLenum bindingTarget, GLenum pname, GLint param)
+    {
+        (this->*TextureParameteri)(texture, target, bindingTarget, pname, param);
+    }
+
+    inline void glTextureParameteriv(GLuint texture, GLenum target, GLenum bindingTarget, GLenum pname, const GLint *params)
+    {
+        (this->*TextureParameteriv)(texture, target, bindingTarget, pname, params);
+    }
+
+    inline void glTextureParameterf(GLuint texture, GLenum target, GLenum bindingTarget, GLenum pname, GLfloat param)
+    {
+        (this->*TextureParameterf)(texture, target, bindingTarget, pname, param);
+    }
+
+    inline void glTextureParameterfv(GLuint texture, GLenum target, GLenum bindingTarget, GLenum pname, const GLfloat *params)
+    {
+        (this->*TextureParameterfv)(texture, target, bindingTarget, pname, params);
+    }
+
+    inline void glGenerateTextureMipmap(GLuint texture, GLenum target, GLenum bindingTarget)
+    {
+        (this->*GenerateTextureMipmap)(texture, target, bindingTarget);
+    }
+
+    inline void glTextureStorage3D(GLuint texture, GLenum target, GLenum bindingTarget, GLsizei levels, GLenum internalFormat,
+                                   GLsizei width, GLsizei height, GLsizei depth)
+    {
+        (this->*TextureStorage3D)(texture, target, bindingTarget, levels, internalFormat, width, height, depth);
+    }
+
+    inline void glTextureStorage2D(GLuint texture, GLenum target, GLenum bindingTarget, GLsizei levels, GLenum internalFormat,
+                                   GLsizei width, GLsizei height)
+    {
+        (this->*TextureStorage2D)(texture, target, bindingTarget, levels, internalFormat, width, height);
+    }
+
+    inline void glTextureStorage1D(GLuint texture, GLenum target, GLenum bindingTarget, GLsizei levels, GLenum internalFormat,
+                                   GLsizei width)
+    {
+        (this->*TextureStorage1D)(texture, target, bindingTarget, levels, internalFormat, width);
+    }
+
+    inline void glTextureStorage3DMultisample(GLuint texture, GLenum target, GLenum bindingTarget, GLsizei samples, GLenum internalFormat,
+                                              GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedSampleLocations)
+    {
+        (this->*TextureStorage3DMultisample)(texture, target, bindingTarget, samples, internalFormat, width, height, depth, fixedSampleLocations);
+    }
+
+    inline void glTextureStorage2DMultisample(GLuint texture, GLenum target, GLenum bindingTarget, GLsizei samples, GLenum internalFormat,
+                                              GLsizei width, GLsizei height, GLboolean fixedSampleLocations)
+    {
+        (this->*TextureStorage2DMultisample)(texture, target, bindingTarget, samples, internalFormat, width, height, fixedSampleLocations);
+    }
+
+    inline void glTextureImage3D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level, GLenum internalFormat,
+                                 GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels)
+    {
+        (this->*TextureImage3D)(texture, target, bindingTarget, level, internalFormat, width, height, depth, border, format, type, pixels);
+    }
+
+    inline void glTextureImage2D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level, GLenum internalFormat,
+                                 GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid *pixels)
+    {
+        (this->*TextureImage2D)(texture, target, bindingTarget, level, internalFormat, width, height, border, format, type, pixels);
+    }
+
+    inline void glTextureImage1D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level, GLenum internalFormat,
+                                 GLsizei width, GLint border, GLenum format, GLenum type, const GLvoid *pixels)
+    {
+        (this->*TextureImage1D)(texture, target, bindingTarget, level, internalFormat, width, border, format, type, pixels);
+    }
+
+    inline void glTextureSubImage3D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level, GLint xoffset, GLint yoffset, GLint zoffset,
+                                    GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type,
+                                    const GLvoid *pixels, const QOpenGLPixelTransferOptions * const options = nullptr)
+    {
+        if (options) {
+            QOpenGLPixelTransferOptions oldOptions = savePixelUploadOptions();
+            setPixelUploadOptions(*options);
+            (this->*TextureSubImage3D)(texture, target, bindingTarget, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels);
+            setPixelUploadOptions(oldOptions);
+        } else {
+            (this->*TextureSubImage3D)(texture, target, bindingTarget, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels);
+        }
+    }
+
+    inline void glTextureSubImage2D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level, GLint xoffset, GLint yoffset,
+                                    GLsizei width, GLsizei height, GLenum format, GLenum type,
+                                    const GLvoid *pixels, const QOpenGLPixelTransferOptions * const options = nullptr)
+    {
+        if (options) {
+            QOpenGLPixelTransferOptions oldOptions = savePixelUploadOptions();
+            setPixelUploadOptions(*options);
+            (this->*TextureSubImage2D)(texture, target, bindingTarget, level, xoffset, yoffset, width, height, format, type, pixels);
+            setPixelUploadOptions(oldOptions);
+        } else {
+            (this->*TextureSubImage2D)(texture, target, bindingTarget, level, xoffset, yoffset, width, height, format, type, pixels);
+        }
+    }
+
+    inline void glTextureSubImage1D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level, GLint xoffset,
+                                    GLsizei width, GLenum format, GLenum type,
+                                    const GLvoid *pixels, const QOpenGLPixelTransferOptions * const options = nullptr)
+    {
+        if (options) {
+            QOpenGLPixelTransferOptions oldOptions = savePixelUploadOptions();
+            setPixelUploadOptions(*options);
+            (this->*TextureSubImage1D)(texture, target, bindingTarget, level, xoffset, width, format, type, pixels);
+            setPixelUploadOptions(oldOptions);
+        } else {
+            (this->*TextureSubImage1D)(texture, target, bindingTarget, level, xoffset, width, format, type, pixels);
+        }
+    }
+
+    inline void glTextureImage3DMultisample(GLuint texture, GLenum target, GLenum bindingTarget, GLsizei samples, GLint internalFormat,
+                                            GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedSampleLocations)
+    {
+        (this->*TextureImage3DMultisample)(texture, target, bindingTarget, samples, internalFormat, width, height, depth, fixedSampleLocations);
+    }
+
+    inline void glTextureImage2DMultisample(GLuint texture, GLenum target, GLenum bindingTarget, GLsizei samples, GLint internalFormat,
+                                            GLsizei width, GLsizei height, GLboolean fixedSampleLocations)
+    {
+        (this->*TextureImage2DMultisample)(texture, target, bindingTarget, samples, internalFormat, width, height, fixedSampleLocations);
+    }
+
+    inline void glCompressedTextureSubImage1D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level,
+                                              GLint xoffset, GLsizei width,
+                                              GLenum format, GLsizei imageSize, const GLvoid *bits,
+                                              const QOpenGLPixelTransferOptions * const options = nullptr)
+    {
+        if (options) {
+            QOpenGLPixelTransferOptions oldOptions = savePixelUploadOptions();
+            setPixelUploadOptions(*options);
+            (this->*CompressedTextureSubImage1D)(texture, target, bindingTarget, level, xoffset, width, format, imageSize, bits);
+            setPixelUploadOptions(oldOptions);
+        } else {
+            (this->*CompressedTextureSubImage1D)(texture, target, bindingTarget, level, xoffset, width, format, imageSize, bits);
+        }
+    }
+
+    inline void glCompressedTextureSubImage2D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level,
+                                              GLint xoffset, GLint yoffset,
+                                              GLsizei width, GLsizei height,
+                                              GLenum format, GLsizei imageSize, const GLvoid *bits,
+                                              const QOpenGLPixelTransferOptions * const options = nullptr)
+    {
+        if (options) {
+            QOpenGLPixelTransferOptions oldOptions = savePixelUploadOptions();
+            setPixelUploadOptions(*options);
+            (this->*CompressedTextureSubImage2D)(texture, target, bindingTarget, level, xoffset, yoffset, width, height, format, imageSize, bits);
+            setPixelUploadOptions(oldOptions);
+        } else {
+            (this->*CompressedTextureSubImage2D)(texture, target, bindingTarget, level, xoffset, yoffset, width, height, format, imageSize, bits);
+        }
+    }
+
+    inline void glCompressedTextureSubImage3D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level,
+                                              GLint xoffset, GLint yoffset, GLint zoffset,
+                                              GLsizei width, GLsizei height, GLsizei depth,
+                                              GLenum format, GLsizei imageSize, const GLvoid *bits,
+                                              const QOpenGLPixelTransferOptions * const options = nullptr)
+    {
+        if (options) {
+            QOpenGLPixelTransferOptions oldOptions = savePixelUploadOptions();
+            setPixelUploadOptions(*options);
+            (this->*CompressedTextureSubImage3D)(texture, target, bindingTarget, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, bits);
+            setPixelUploadOptions(oldOptions);
+        } else {
+            (this->*CompressedTextureSubImage3D)(texture, target, bindingTarget, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, bits);
+        }
+    }
+
+    inline void glCompressedTextureImage1D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level,
+                                           GLenum internalFormat, GLsizei width,
+                                           GLint border, GLsizei imageSize, const GLvoid *bits,
+                                           const QOpenGLPixelTransferOptions * const options = nullptr)
+    {
+        if (options) {
+            QOpenGLPixelTransferOptions oldOptions = savePixelUploadOptions();
+            setPixelUploadOptions(*options);
+            (this->*CompressedTextureImage1D)(texture, target, bindingTarget, level, internalFormat, width, border, imageSize, bits);
+            setPixelUploadOptions(oldOptions);
+        } else {
+            (this->*CompressedTextureImage1D)(texture, target, bindingTarget, level, internalFormat, width, border, imageSize, bits);
+        }
+    }
+
+    inline void glCompressedTextureImage2D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level,
+                                           GLenum internalFormat, GLsizei width, GLsizei height,
+                                           GLint border, GLsizei imageSize, const GLvoid *bits,
+                                           const QOpenGLPixelTransferOptions * const options = nullptr)
+
+    {
+        if (options) {
+            QOpenGLPixelTransferOptions oldOptions = savePixelUploadOptions();
+            setPixelUploadOptions(*options);
+            (this->*CompressedTextureImage2D)(texture, target, bindingTarget, level, internalFormat, width, height, border, imageSize, bits);
+            setPixelUploadOptions(oldOptions);
+        } else {
+            (this->*CompressedTextureImage2D)(texture, target, bindingTarget, level, internalFormat, width, height, border, imageSize, bits);
+        }
+    }
+
+    inline void glCompressedTextureImage3D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level,
+                                           GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth,
+                                           GLint border, GLsizei imageSize, const GLvoid *bits,
+                                           const QOpenGLPixelTransferOptions * const options = nullptr)
+    {
+        if (options) {
+            QOpenGLPixelTransferOptions oldOptions = savePixelUploadOptions();
+            setPixelUploadOptions(*options);
+            (this->*CompressedTextureImage3D)(texture, target, bindingTarget, level, internalFormat, width, height, depth, border, imageSize, bits);
+            setPixelUploadOptions(oldOptions);
+        } else {
+            (this->*CompressedTextureImage3D)(texture, target, bindingTarget, level, internalFormat, width, height, depth, border, imageSize, bits);
+        }
+    }
+
+private:
+    // DSA wrapper (so we can use pointer to member function as switch)
+    void dsa_TextureParameteri(GLuint texture, GLenum target, GLenum bindingTarget, GLenum pname, GLint param);
+
+    void dsa_TextureParameteriv(GLuint texture, GLenum target, GLenum bindingTarget, GLenum pname, const GLint *params);
+
+    void dsa_TextureParameterf(GLuint texture, GLenum target, GLenum bindingTarget, GLenum pname, GLfloat param);
+
+    void dsa_TextureParameterfv(GLuint texture, GLenum target, GLenum bindingTarget, GLenum pname, const GLfloat *params);
+
+    void dsa_GenerateTextureMipmap(GLuint texture, GLenum target, GLenum bindingTarget);
+
+    void dsa_TextureStorage3D(GLuint texture, GLenum target, GLenum bindingTarget, GLsizei levels, GLenum internalFormat,
+                              GLsizei width, GLsizei height, GLsizei depth);
+
+    void dsa_TextureStorage2D(GLuint texture, GLenum target, GLenum bindingTarget, GLsizei levels, GLenum internalFormat,
+                              GLsizei width, GLsizei height);
+
+    void dsa_TextureStorage1D(GLuint texture, GLenum target, GLenum bindingTarget, GLsizei levels, GLenum internalFormat,
+                              GLsizei width);
+
+    void dsa_TextureStorage3DMultisample(GLuint texture, GLenum target, GLenum bindingTarget, GLsizei samples, GLenum internalFormat,
+                                         GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedSampleLocations);
+
+    void dsa_TextureStorage2DMultisample(GLuint texture, GLenum target, GLenum bindingTarget, GLsizei samples, GLenum internalFormat,
+                                         GLsizei width, GLsizei height, GLboolean fixedSampleLocations);
+
+    void dsa_TextureImage3D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level, GLenum internalFormat,
+                            GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
+
+    void dsa_TextureImage2D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level, GLenum internalFormat,
+                            GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
+
+    void dsa_TextureImage1D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level, GLenum internalFormat,
+                            GLsizei width, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
+
+    void dsa_TextureSubImage3D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level, GLint xoffset, GLint yoffset, GLint zoffset,
+                               GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels);
+
+    void dsa_TextureSubImage2D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level, GLint xoffset, GLint yoffset,
+                               GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels);
+
+    void dsa_TextureSubImage1D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level, GLint xoffset,
+                               GLsizei width, GLenum format, GLenum type, const GLvoid *pixels);
+
+    void dsa_TextureImage3DMultisample(GLuint texture, GLenum target, GLenum bindingTarget, GLsizei samples, GLint internalFormat,
+                                       GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedSampleLocations);
+
+    void dsa_TextureImage2DMultisample(GLuint texture, GLenum target, GLenum bindingTarget, GLsizei samples, GLint internalFormat,
+                                       GLsizei width, GLsizei height, GLboolean fixedSampleLocations);
+
+    void dsa_CompressedTextureSubImage1D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level,
+                                         GLint xoffset, GLsizei width,
+                                         GLenum format, GLsizei imageSize, const GLvoid *bits);
+
+    void dsa_CompressedTextureSubImage2D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level,
+                                         GLint xoffset, GLint yoffset,
+                                         GLsizei width, GLsizei height,
+                                         GLenum format, GLsizei imageSize, const GLvoid *bits);
+
+    void dsa_CompressedTextureSubImage3D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level,
+                                         GLint xoffset, GLint yoffset, GLint zoffset,
+                                         GLsizei width, GLsizei height, GLsizei depth,
+                                         GLenum format, GLsizei imageSize, const GLvoid *bits);
+
+    void dsa_CompressedTextureImage1D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level,
+                                      GLenum internalFormat, GLsizei width,
+                                      GLint border, GLsizei imageSize, const GLvoid *bits);
+
+    void dsa_CompressedTextureImage2D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level,
+                                      GLenum internalFormat, GLsizei width, GLsizei height,
+                                      GLint border, GLsizei imageSize, const GLvoid *bits);
+
+    void dsa_CompressedTextureImage3D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level,
+                                      GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth,
+                                      GLint border, GLsizei imageSize, const GLvoid *bits);
+
+    // DSA emulation API
+    void qt_TextureParameteri(GLuint texture, GLenum target, GLenum bindingTarget, GLenum pname, GLint param);
+
+    void qt_TextureParameteriv(GLuint texture, GLenum target, GLenum bindingTarget, GLenum pname, const GLint *params);
+
+    void qt_TextureParameterf(GLuint texture, GLenum target, GLenum bindingTarget, GLenum pname, GLfloat param);
+
+    void qt_TextureParameterfv(GLuint texture, GLenum target, GLenum bindingTarget, GLenum pname, const GLfloat *params);
+
+    void qt_GenerateTextureMipmap(GLuint texture, GLenum target, GLenum bindingTarget);
+
+    void qt_TextureStorage3D(GLuint texture, GLenum target, GLenum bindingTarget, GLsizei levels,
+                             GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth);
+
+    void qt_TextureStorage2D(GLuint texture, GLenum target, GLenum bindingTarget, GLsizei levels,
+                             GLenum internalFormat, GLsizei width, GLsizei height);
+
+    void qt_TextureStorage1D(GLuint texture, GLenum target, GLenum bindingTarget, GLsizei levels,
+                             GLenum internalFormat, GLsizei width);
+
+    void qt_TextureStorage3DMultisample(GLuint texture, GLenum target, GLenum bindingTarget, GLsizei samples,
+                                        GLenum internalFormat, GLsizei width, GLsizei height,
+                                        GLsizei depth, GLboolean fixedSampleLocations);
+
+    void qt_TextureStorage2DMultisample(GLuint texture, GLenum target, GLenum bindingTarget, GLsizei samples,
+                                        GLenum internalFormat, GLsizei width, GLsizei height,
+                                        GLboolean fixedSampleLocations);
+
+    void qt_TextureImage3D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level, GLenum internalFormat,
+                           GLsizei width, GLsizei height, GLsizei depth,
+                           GLint border, GLenum format, GLenum type,
+                           const GLvoid *pixels);
+
+    void qt_TextureImage2D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level, GLenum internalFormat,
+                           GLsizei width, GLsizei height,
+                           GLint border, GLenum format, GLenum type,
+                           const GLvoid *pixels);
+
+    void qt_TextureImage1D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level, GLenum internalFormat,
+                           GLsizei width, GLint border, GLenum format, GLenum type,
+                           const GLvoid *pixels);
+
+    void qt_TextureSubImage3D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level,
+                              GLint xoffset, GLint yoffset, GLint zoffset,
+                              GLsizei width, GLsizei height, GLsizei depth,
+                              GLenum format, GLenum type, const GLvoid *pixels);
+
+    void qt_TextureSubImage2D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level,
+                              GLint xoffset, GLint yoffset,
+                              GLsizei width, GLsizei height,
+                              GLenum format, GLenum type, const GLvoid *pixels);
+
+    void qt_TextureSubImage1D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level,
+                              GLint xoffset, GLsizei width,
+                              GLenum format, GLenum type, const GLvoid *pixels);
+
+    void qt_TextureImage3DMultisample(GLuint texture, GLenum target, GLenum bindingTarget, GLsizei samples,
+                                      GLint internalFormat, GLsizei width, GLsizei height, GLsizei depth,
+                                      GLboolean fixedSampleLocations);
+
+    void qt_TextureImage2DMultisample(GLuint texture, GLenum target, GLenum bindingTarget, GLsizei samples,
+                                      GLint internalFormat, GLsizei width, GLsizei height,
+                                      GLboolean fixedSampleLocations);
+
+    void qt_CompressedTextureSubImage1D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level,
+                                        GLint xoffset, GLsizei width, GLenum format,
+                                        GLsizei imageSize, const GLvoid *bits);
+
+    void qt_CompressedTextureSubImage2D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level,
+                                        GLint xoffset, GLint yoffset,
+                                        GLsizei width, GLsizei height,
+                                        GLenum format, GLsizei imageSize, const GLvoid *bits);
+
+    void qt_CompressedTextureSubImage3D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level,
+                                        GLint xoffset, GLint yoffset, GLint zoffset,
+                                        GLsizei width, GLsizei height, GLsizei depth,
+                                        GLenum format, GLsizei imageSize, const GLvoid *bits);
+
+    void qt_CompressedTextureImage1D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level, GLenum internalFormat,
+                                     GLsizei width, GLint border,
+                                     GLsizei imageSize, const GLvoid *bits);
+
+    void qt_CompressedTextureImage2D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level, GLenum internalFormat,
+                                     GLsizei width, GLsizei height, GLint border,
+                                     GLsizei imageSize, const GLvoid *bits);
+
+    void qt_CompressedTextureImage3D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level, GLenum internalFormat,
+                                     GLsizei width, GLsizei height, GLsizei depth, GLint border,
+                                     GLsizei imageSize, const GLvoid *bits);
+
+public:
+    // Raw OpenGL functions, resolved and used by our DSA-like static functions if no EXT_direct_state_access is available
+
+    // OpenGL 1.0
+    inline void glTexImage1D(GLenum target, GLint level, GLint internalFormat,
+                             GLsizei width, GLint border,
+                             GLenum format, GLenum type, const GLvoid *pixels)
+    {
+        TexImage1D(target, level, internalFormat, width, border, format, type, pixels);
+    }
+
+    // OpenGL 1.1
+    inline void glTexSubImage1D(GLenum target, GLint level, GLint xoffset, GLsizei width,
+                                GLenum format, GLenum type, const GLvoid *pixels)
+    {
+        TexSubImage1D(target, level, xoffset, width, format, type, pixels);
+    }
+
+    // OpenGL 1.2
+    inline void glTexImage3D(GLenum target, GLint level, GLint internalFormat,
+                             GLsizei width, GLsizei height, GLsizei depth, GLint border,
+                             GLenum format, GLenum type, const GLvoid *pixels)
+    {
+        TexImage3D(target, level, internalFormat, width, height, depth, border, format, type, pixels);
+    }
+
+    inline void glTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset,
+                                GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels)
+    {
+        TexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels);
+    }
+
+    // OpenGL 1.3
+    inline void glGetCompressedTexImage(GLenum target, GLint level, GLvoid *img)
+    {
+        GetCompressedTexImage(target, level, img);
+    }
+
+    inline void glCompressedTexSubImage1D(GLenum target, GLint level, GLint xoffset, GLsizei width,
+                                          GLenum format, GLsizei imageSize, const GLvoid *data)
+    {
+        CompressedTexSubImage1D(target, level, xoffset, width, format, imageSize, data);
+    }
+
+    inline void glCompressedTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset,
+                                          GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *data)
+    {
+        CompressedTexSubImage2D(target, level, xoffset, yoffset, width, height, format, imageSize, data);
+    }
+
+    inline void glCompressedTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset,
+                                          GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *data)
+    {
+        CompressedTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, data);
+    }
+
+    inline void glCompressedTexImage1D(GLenum target, GLint level, GLenum internalFormat, GLsizei width,
+                                       GLint border, GLsizei imageSize, const GLvoid *data)
+    {
+        CompressedTexImage1D(target, level, internalFormat, width, border, imageSize, data);
+    }
+
+    inline void glCompressedTexImage2D(GLenum target, GLint level, GLenum internalFormat, GLsizei width, GLsizei height,
+                                       GLint border, GLsizei imageSize, const GLvoid *data)
+    {
+        CompressedTexImage2D(target, level, internalFormat, width, height, border, imageSize, data);
+    }
+
+    inline void glCompressedTexImage3D(GLenum target, GLint level, GLenum internalFormat,
+                                       GLsizei width, GLsizei height, GLsizei depth,
+                                       GLint border, GLsizei imageSize, const GLvoid *data)
+    {
+        CompressedTexImage3D(target, level, internalFormat, width, height, depth, border, imageSize, data);
+    }
+
+    inline void glActiveTexture(GLenum texture)
+    {
+        ActiveTexture(texture);
+    }
+
+    // OpenGL 3.0
+    inline void glGenerateMipmap(GLenum target)
+    {
+        GenerateMipmap(target);
+    }
+
+    // OpenGL 3.2
+    inline void glTexImage3DMultisample(GLenum target, GLsizei samples, GLint internalFormat,
+                                        GLsizei width, GLsizei height, GLsizei depth,
+                                        GLboolean fixedSampleLocations)
+    {
+        TexImage3DMultisample(target, samples, internalFormat, width, height, depth, fixedSampleLocations);
+    }
+
+    inline void glTexImage2DMultisample(GLenum target, GLsizei samples, GLint internalFormat,
+                                        GLsizei width, GLsizei height,
+                                        GLboolean fixedSampleLocations)
+    {
+        TexImage2DMultisample(target, samples, internalFormat, width, height, fixedSampleLocations);
+    }
+
+    // OpenGL 4.2
+    inline void glTexStorage3D(GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth)
+    {
+        TexStorage3D(target, levels, internalFormat, width, height, depth);
+    }
+
+    inline void glTexStorage2D(GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width, GLsizei height)
+    {
+        TexStorage2D(target, levels, internalFormat, width, height);
+    }
+
+    inline void glTexStorage1D(GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width)
+    {
+        TexStorage1D(target, levels, internalFormat, width);
+    }
+
+    // OpenGL 4.3
+    inline void glTexStorage3DMultisample(GLenum target, GLsizei samples, GLenum internalFormat,
+                                          GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedSampleLocations)
+    {
+        TexStorage3DMultisample(target, samples, internalFormat, width, height, depth, fixedSampleLocations);
+    }
+
+    inline void glTexStorage2DMultisample(GLenum target, GLsizei samples, GLenum internalFormat,
+                                          GLsizei width, GLsizei height, GLboolean fixedSampleLocations)
+    {
+        TexStorage2DMultisample(target, samples, internalFormat, width, height, fixedSampleLocations);
+    }
+
+    inline void glTexBufferRange(GLenum target, GLenum internalFormat, GLuint buffer,
+                                 GLintptr offset, GLsizeiptr size)
+    {
+        TexBufferRange(target, internalFormat, buffer, offset, size);
+    }
+
+    inline void glTextureView(GLuint texture, GLenum target, GLuint origTexture, GLenum internalFormat,
+                              GLuint minLevel, GLuint numLevels, GLuint minLayer, GLuint numLayers)
+    {
+        TextureView(texture, target, origTexture, internalFormat, minLevel, numLevels, minLayer, numLayers);
+    }
+
+    // Helper functions
+    inline QOpenGLPixelTransferOptions savePixelUploadOptions()
+    {
+        QOpenGLPixelTransferOptions options;
+        int val = 0;
+        functions->glGetIntegerv(GL_UNPACK_ALIGNMENT, &val);
+        options.setAlignment(val);
+#if !defined(QT_OPENGL_ES_2)
+        functions->glGetIntegerv(GL_UNPACK_SKIP_IMAGES, &val);
+        options.setSkipImages(val);
+        functions->glGetIntegerv(GL_UNPACK_SKIP_ROWS, &val);
+        options.setSkipRows(val);
+        functions->glGetIntegerv(GL_UNPACK_SKIP_PIXELS, &val);
+        options.setSkipPixels(val);
+        functions->glGetIntegerv(GL_UNPACK_IMAGE_HEIGHT, &val);
+        options.setImageHeight(val);
+        functions->glGetIntegerv(GL_UNPACK_ROW_LENGTH, &val);
+        options.setRowLength(val);
+        GLboolean b = GL_FALSE;
+        functions->glGetBooleanv(GL_UNPACK_LSB_FIRST, &b);
+        options.setLeastSignificantByteFirst(b);
+        functions->glGetBooleanv(GL_UNPACK_SWAP_BYTES, &b);
+        options.setSwapBytesEnabled(b);
+#endif
+        return options;
+    }
+
+    inline void setPixelUploadOptions(const QOpenGLPixelTransferOptions &options)
+    {
+        functions->glPixelStorei(GL_UNPACK_ALIGNMENT, options.alignment());
+#if !defined(QT_OPENGL_ES_2)
+        functions->glPixelStorei(GL_UNPACK_SKIP_IMAGES, options.skipImages());
+        functions->glPixelStorei(GL_UNPACK_SKIP_ROWS, options.skipRows());
+        functions->glPixelStorei(GL_UNPACK_SKIP_PIXELS, options.skipPixels());
+        functions->glPixelStorei(GL_UNPACK_IMAGE_HEIGHT, options.imageHeight());
+        functions->glPixelStorei(GL_UNPACK_ROW_LENGTH, options.rowLength());
+        functions->glPixelStorei(GL_UNPACK_LSB_FIRST, options.isLeastSignificantBitFirst());
+        functions->glPixelStorei(GL_UNPACK_SWAP_BYTES, options.isSwapBytesEnabled());
+#endif
+    }
+
+    QOpenGLFunctions *functions;
+private:
+    // Typedefs and pointers to member functions used to switch between EXT_direct_state_access and our own emulated DSA.
+    // The argument match the corresponding GL function, but there's an extra "GLenum bindingTarget" which gets used with
+    // the DSA emulation -- it contains the right GL_BINDING_TEXTURE_X to use.
+    typedef void (QOpenGLTextureHelper::*TextureParameteriMemberFunc)(GLuint texture, GLenum target, GLenum bindingTarget, GLenum pname, GLint param);
+    typedef void (QOpenGLTextureHelper::*TextureParameterivMemberFunc)(GLuint texture, GLenum target, GLenum bindingTarget, GLenum pname, const GLint *params);
+    typedef void (QOpenGLTextureHelper::*TextureParameterfMemberFunc)(GLuint texture, GLenum target, GLenum bindingTarget, GLenum pname, GLfloat param);
+    typedef void (QOpenGLTextureHelper::*TextureParameterfvMemberFunc)(GLuint texture, GLenum target, GLenum bindingTarget, GLenum pname, const GLfloat *params);
+    typedef void (QOpenGLTextureHelper::*GenerateTextureMipmapMemberFunc)(GLuint texture, GLenum target, GLenum bindingTarget);
+    typedef void (QOpenGLTextureHelper::*TextureStorage3DMemberFunc)(GLuint texture, GLenum target, GLenum bindingTarget, GLsizei levels, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth);
+    typedef void (QOpenGLTextureHelper::*TextureStorage2DMemberFunc)(GLuint texture, GLenum target, GLenum bindingTarget, GLsizei levels, GLenum internalFormat, GLsizei width, GLsizei height);
+    typedef void (QOpenGLTextureHelper::*TextureStorage1DMemberFunc)(GLuint texture, GLenum target, GLenum bindingTarget, GLsizei levels, GLenum internalFormat, GLsizei width);
+    typedef void (QOpenGLTextureHelper::*TextureStorage3DMultisampleMemberFunc)(GLuint texture, GLenum target, GLenum bindingTarget, GLsizei samples, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedSampleLocations);
+    typedef void (QOpenGLTextureHelper::*TextureStorage2DMultisampleMemberFunc)(GLuint texture, GLenum target, GLenum bindingTarget, GLsizei samples, GLenum internalFormat, GLsizei width, GLsizei height, GLboolean fixedSampleLocations);
+    typedef void (QOpenGLTextureHelper::*TextureImage3DMemberFunc)(GLuint texture, GLenum target, GLenum bindingTarget, GLint level, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
+    typedef void (QOpenGLTextureHelper::*TextureImage2DMemberFunc)(GLuint texture, GLenum target, GLenum bindingTarget, GLint level, GLenum internalFormat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
+    typedef void (QOpenGLTextureHelper::*TextureImage1DMemberFunc)(GLuint texture, GLenum target, GLenum bindingTarget, GLint level, GLenum internalFormat, GLsizei width, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
+    typedef void (QOpenGLTextureHelper::*TextureSubImage3DMemberFunc)(GLuint texture, GLenum target, GLenum bindingTarget, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels);
+    typedef void (QOpenGLTextureHelper::*TextureSubImage2DMemberFunc)(GLuint texture, GLenum target, GLenum bindingTarget, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels);
+    typedef void (QOpenGLTextureHelper::*TextureSubImage1DMemberFunc)(GLuint texture, GLenum target, GLenum bindingTarget, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid *pixels);
+    typedef void (QOpenGLTextureHelper::*TextureImage3DMultisampleMemberFunc)(GLuint texture, GLenum target, GLenum bindingTarget, GLsizei samples, GLint internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedSampleLocations);
+    typedef void (QOpenGLTextureHelper::*TextureImage2DMultisampleMemberFunc)(GLuint texture, GLenum target, GLenum bindingTarget, GLsizei samples, GLint internalFormat, GLsizei width, GLsizei height, GLboolean fixedSampleLocations);
+    typedef void (QOpenGLTextureHelper::*CompressedTextureSubImage1DMemberFunc)(GLuint texture, GLenum target, GLenum bindingTarget, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *bits);
+    typedef void (QOpenGLTextureHelper::*CompressedTextureSubImage2DMemberFunc)(GLuint texture, GLenum target, GLenum bindingTarget, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *bits);
+    typedef void (QOpenGLTextureHelper::*CompressedTextureSubImage3DMemberFunc)(GLuint texture, GLenum target, GLenum bindingTarget, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *bits);
+    typedef void (QOpenGLTextureHelper::*CompressedTextureImage1DMemberFunc)(GLuint texture, GLenum target, GLenum bindingTarget, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *bits);
+    typedef void (QOpenGLTextureHelper::*CompressedTextureImage2DMemberFunc)(GLuint texture, GLenum target, GLenum bindingTarget, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *bits);
+    typedef void (QOpenGLTextureHelper::*CompressedTextureImage3DMemberFunc)(GLuint texture, GLenum target, GLenum bindingTarget, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *bits);
+
+
+    TextureParameteriMemberFunc TextureParameteri;
+    TextureParameterivMemberFunc TextureParameteriv;
+    TextureParameterfMemberFunc TextureParameterf;
+    TextureParameterfvMemberFunc TextureParameterfv;
+    GenerateTextureMipmapMemberFunc GenerateTextureMipmap;
+    TextureStorage3DMemberFunc TextureStorage3D;
+    TextureStorage2DMemberFunc TextureStorage2D;
+    TextureStorage1DMemberFunc TextureStorage1D;
+    TextureStorage3DMultisampleMemberFunc TextureStorage3DMultisample;
+    TextureStorage2DMultisampleMemberFunc TextureStorage2DMultisample;
+    TextureImage3DMemberFunc TextureImage3D;
+    TextureImage2DMemberFunc TextureImage2D;
+    TextureImage1DMemberFunc TextureImage1D;
+    TextureSubImage3DMemberFunc TextureSubImage3D;
+    TextureSubImage2DMemberFunc TextureSubImage2D;
+    TextureSubImage1DMemberFunc TextureSubImage1D;
+    TextureImage3DMultisampleMemberFunc TextureImage3DMultisample;
+    TextureImage2DMultisampleMemberFunc TextureImage2DMultisample;
+    CompressedTextureSubImage1DMemberFunc CompressedTextureSubImage1D;
+    CompressedTextureSubImage2DMemberFunc CompressedTextureSubImage2D;
+    CompressedTextureSubImage3DMemberFunc CompressedTextureSubImage3D;
+    CompressedTextureImage1DMemberFunc CompressedTextureImage1D;
+    CompressedTextureImage2DMemberFunc CompressedTextureImage2D;
+    CompressedTextureImage3DMemberFunc CompressedTextureImage3D;
+
+    // Raw function pointers for core and DSA functions
+
+    // EXT_direct_state_access used when DSA is available
+    void (QOPENGLF_APIENTRYP TextureParameteriEXT)(GLuint texture, GLenum target, GLenum pname, GLint param);
+    void (QOPENGLF_APIENTRYP TextureParameterivEXT)(GLuint texture, GLenum target, GLenum pname, const GLint *params);
+    void (QOPENGLF_APIENTRYP TextureParameterfEXT)(GLuint texture, GLenum target, GLenum pname, GLfloat param);
+    void (QOPENGLF_APIENTRYP TextureParameterfvEXT)(GLuint texture, GLenum target, GLenum pname, const GLfloat *params);
+    void (QOPENGLF_APIENTRYP GenerateTextureMipmapEXT)(GLuint texture, GLenum target);
+    void (QOPENGLF_APIENTRYP TextureStorage3DEXT)(GLuint texture, GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth);
+    void (QOPENGLF_APIENTRYP TextureStorage2DEXT)(GLuint texture, GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width, GLsizei height);
+    void (QOPENGLF_APIENTRYP TextureStorage1DEXT)(GLuint texture, GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width);
+    void (QOPENGLF_APIENTRYP TextureStorage3DMultisampleEXT)(GLuint texture, GLenum target, GLsizei samples, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedSampleLocations);
+    void (QOPENGLF_APIENTRYP TextureStorage2DMultisampleEXT)(GLuint texture, GLenum target, GLsizei samples, GLenum internalFormat, GLsizei width, GLsizei height, GLboolean fixedSampleLocations);
+    void (QOPENGLF_APIENTRYP TextureImage3DEXT)(GLuint texture, GLenum target, GLint level, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
+    void (QOPENGLF_APIENTRYP TextureImage2DEXT)(GLuint texture, GLenum target, GLint level, GLenum internalFormat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
+    void (QOPENGLF_APIENTRYP TextureImage1DEXT)(GLuint texture, GLenum target, GLint level, GLenum internalFormat, GLsizei width, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
+    void (QOPENGLF_APIENTRYP TextureSubImage3DEXT)(GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels);
+    void (QOPENGLF_APIENTRYP TextureSubImage2DEXT)(GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels);
+    void (QOPENGLF_APIENTRYP TextureSubImage1DEXT)(GLuint texture, GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid *pixels);
+    void (QOPENGLF_APIENTRYP CompressedTextureSubImage1DEXT)(GLuint texture, GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *bits);
+    void (QOPENGLF_APIENTRYP CompressedTextureSubImage2DEXT)(GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *bits);
+    void (QOPENGLF_APIENTRYP CompressedTextureSubImage3DEXT)(GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *bits);
+    void (QOPENGLF_APIENTRYP CompressedTextureImage1DEXT)(GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *bits);
+    void (QOPENGLF_APIENTRYP CompressedTextureImage2DEXT)(GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *bits);
+    void (QOPENGLF_APIENTRYP CompressedTextureImage3DEXT)(GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *bits);
+
+
+    // Plus some missing ones that are in the NV_texture_multisample extension instead
+    void (QOPENGLF_APIENTRYP TextureImage3DMultisampleNV)(GLuint texture, GLenum target, GLsizei samples, GLint internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedSampleLocations);
+    void (QOPENGLF_APIENTRYP TextureImage2DMultisampleNV)(GLuint texture, GLenum target, GLsizei samples, GLint internalFormat, GLsizei width, GLsizei height, GLboolean fixedSampleLocations);
+
+    // OpenGL 1.0
+    void (QOPENGLF_APIENTRYP TexImage1D)(GLenum target, GLint level, GLint internalFormat, GLsizei width, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
+
+    // OpenGL 1.1
+    void (QOPENGLF_APIENTRYP TexSubImage1D)(GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid *pixels);
+
+    // OpenGL 1.2
+    void (QOPENGLF_APIENTRYP TexImage3D)(GLenum target, GLint level, GLint internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
+    void (QOPENGLF_APIENTRYP TexSubImage3D)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels);
+
+    // OpenGL 1.3
+    void (QOPENGLF_APIENTRYP GetCompressedTexImage)(GLenum target, GLint level, GLvoid *img);
+    void (QOPENGLF_APIENTRYP CompressedTexSubImage1D)(GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *data);
+    GL_APICALL void (QOPENGLF_APIENTRYP CompressedTexSubImage2D)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *data);
+    void (QOPENGLF_APIENTRYP CompressedTexSubImage3D)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *data);
+    void (QOPENGLF_APIENTRYP CompressedTexImage1D)(GLenum target, GLint level, GLenum internalFormat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *data);
+    GL_APICALL void (QOPENGLF_APIENTRYP CompressedTexImage2D)(GLenum target, GLint level, GLenum internalFormat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *data);
+    void (QOPENGLF_APIENTRYP CompressedTexImage3D)(GLenum target, GLint level, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *data);
+    GL_APICALL void (QOPENGLF_APIENTRYP ActiveTexture)(GLenum texture);
+
+    // OpenGL 3.0
+    GL_APICALL void (QOPENGLF_APIENTRYP GenerateMipmap)(GLenum target);
+
+    // OpenGL 3.2
+    void (QOPENGLF_APIENTRYP TexImage3DMultisample)(GLenum target, GLsizei samples, GLint internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedSampleLocations);
+    void (QOPENGLF_APIENTRYP TexImage2DMultisample)(GLenum target, GLsizei samples, GLint internalFormat, GLsizei width, GLsizei height, GLboolean fixedSampleLocations);
+
+    // OpenGL 4.2
+    void (QOPENGLF_APIENTRYP TexStorage3D)(GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth);
+    void (QOPENGLF_APIENTRYP TexStorage2D)(GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width, GLsizei height);
+    void (QOPENGLF_APIENTRYP TexStorage1D)(GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width);
+
+    // OpenGL 4.3
+    void (QOPENGLF_APIENTRYP TexStorage3DMultisample)(GLenum target, GLsizei samples, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedSampleLocations);
+    void (QOPENGLF_APIENTRYP TexStorage2DMultisample)(GLenum target, GLsizei samples, GLenum internalFormat, GLsizei width, GLsizei height, GLboolean fixedSampleLocations);
+    void (QOPENGLF_APIENTRYP TexBufferRange)(GLenum target, GLenum internalFormat, GLuint buffer, GLintptr offset, GLsizeiptr size);
+    void (QOPENGLF_APIENTRYP TextureView)(GLuint texture, GLenum target, GLuint origtexture, GLenum internalformat, GLuint minlevel, GLuint numlevels, GLuint minlayer, GLuint numlayers);
+};
+
+QT_END_NAMESPACE
+
+#undef Q_CALL_MEMBER_FUNCTION
+
+#endif // QT_NO_OPENGL
+
+#endif // QOPENGLTEXTUREHELPER_P_H
diff --git a/src/opengl/qopengltextureuploader.cpp b/src/opengl/qopengltextureuploader.cpp
new file mode 100644
index 0000000000..469ddc56c1
--- /dev/null
+++ b/src/opengl/qopengltextureuploader.cpp
@@ -0,0 +1,381 @@
+/****************************************************************************
+**
+** Copyright (C) 2018 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtOpenGL module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qopengltextureuploader_p.h"
+
+#include <qimage.h>
+#include <qmath.h>
+#include <qopenglfunctions.h>
+#include <private/qopenglcontext_p.h>
+#include <private/qopenglextensions_p.h>
+
+#ifndef GL_RED
+#define GL_RED                            0x1903
+#endif
+
+#ifndef GL_GREEN
+#define GL_GREEN                          0x1904
+#endif
+
+#ifndef GL_BLUE
+#define GL_BLUE                           0x1905
+#endif
+
+#ifndef GL_RGB10_A2
+#define GL_RGB10_A2                       0x8059
+#endif
+
+#ifndef GL_RGBA16
+#define GL_RGBA16                         0x805B
+#endif
+
+#ifndef GL_BGR
+#define GL_BGR 0x80E0
+#endif
+
+#ifndef GL_BGRA
+#define GL_BGRA 0x80E1
+#endif
+
+#ifndef GL_UNSIGNED_INT_8_8_8_8_REV
+#define GL_UNSIGNED_INT_8_8_8_8_REV       0x8367
+#endif
+
+#ifndef GL_UNSIGNED_INT_2_10_10_10_REV
+#define GL_UNSIGNED_INT_2_10_10_10_REV    0x8368
+#endif
+
+#ifndef GL_TEXTURE_SWIZZLE_R
+#define GL_TEXTURE_SWIZZLE_R              0x8E42
+#endif
+
+#ifndef GL_TEXTURE_SWIZZLE_G
+#define GL_TEXTURE_SWIZZLE_G              0x8E43
+#endif
+
+#ifndef GL_TEXTURE_SWIZZLE_B
+#define GL_TEXTURE_SWIZZLE_B              0x8E44
+#endif
+
+#ifndef GL_TEXTURE_SWIZZLE_A
+#define GL_TEXTURE_SWIZZLE_A              0x8E45
+#endif
+
+#ifndef GL_SRGB
+#define GL_SRGB                           0x8C40
+#endif
+#ifndef GL_SRGB_ALPHA
+#define GL_SRGB_ALPHA                     0x8C42
+#endif
+
+QT_BEGIN_NAMESPACE
+
+qsizetype QOpenGLTextureUploader::textureImage(GLenum target, const QImage &image, QOpenGLTextureUploader::BindOptions options, QSize maxSize)
+{
+    QOpenGLContext *context = QOpenGLContext::currentContext();
+    QOpenGLExtensions *funcs = static_cast<QOpenGLExtensions*>(context->functions());
+
+    QImage tx;
+    GLenum externalFormat;
+    GLenum internalFormat;
+    GLuint pixelType;
+    QImage::Format targetFormat = QImage::Format_Invalid;
+    const bool isOpenGL12orBetter = !context->isOpenGLES() && (context->format().majorVersion() >= 2 || context->format().minorVersion() >= 2);
+    const bool isOpenGLES3orBetter = context->isOpenGLES() && context->format().majorVersion() >= 3;
+    const bool sRgbBinding = (options & SRgbBindOption);
+    Q_ASSERT(isOpenGL12orBetter || context->isOpenGLES());
+    Q_ASSERT((options & (SRgbBindOption | UseRedForAlphaAndLuminanceBindOption)) != (SRgbBindOption | UseRedForAlphaAndLuminanceBindOption));
+
+    switch (image.format()) {
+    case QImage::Format_RGB32:
+    case QImage::Format_ARGB32:
+    case QImage::Format_ARGB32_Premultiplied:
+        if (isOpenGL12orBetter) {
+            externalFormat = GL_BGRA;
+            internalFormat = GL_RGBA;
+            pixelType = GL_UNSIGNED_INT_8_8_8_8_REV;
+#if Q_BYTE_ORDER == Q_LITTLE_ENDIAN
+        // Without GL_UNSIGNED_INT_8_8_8_8_REV, BGRA only matches ARGB on little endian:
+        } else if (funcs->hasOpenGLExtension(QOpenGLExtensions::BGRATextureFormat) && !sRgbBinding) {
+            // The GL_EXT_texture_format_BGRA8888 extension requires the internal format to match the external.
+            externalFormat = internalFormat = GL_BGRA;
+            pixelType = GL_UNSIGNED_BYTE;
+        } else if (context->isOpenGLES() && context->hasExtension(QByteArrayLiteral("GL_APPLE_texture_format_BGRA8888"))) {
+            // Is only allowed as an external format like OpenGL.
+            externalFormat = GL_BGRA;
+            internalFormat = GL_RGBA;
+            pixelType = GL_UNSIGNED_BYTE;
+#endif
+        } else if (funcs->hasOpenGLExtension(QOpenGLExtensions::TextureSwizzle)) {
+#if Q_BYTE_ORDER == Q_LITTLE_ENDIAN
+            funcs->glTexParameteri(target, GL_TEXTURE_SWIZZLE_R, GL_BLUE);
+            funcs->glTexParameteri(target, GL_TEXTURE_SWIZZLE_B, GL_RED);
+#else
+            funcs->glTexParameteri(target, GL_TEXTURE_SWIZZLE_R, GL_GREEN);
+            funcs->glTexParameteri(target, GL_TEXTURE_SWIZZLE_G, GL_BLUE);
+            funcs->glTexParameteri(target, GL_TEXTURE_SWIZZLE_B, GL_ALPHA);
+            funcs->glTexParameteri(target, GL_TEXTURE_SWIZZLE_A, GL_RED);
+#endif
+            externalFormat = internalFormat = GL_RGBA;
+            pixelType = GL_UNSIGNED_BYTE;
+        } else {
+            // No support for direct ARGB32 upload.
+            break;
+        }
+        targetFormat = image.format();
+        break;
+    case QImage::Format_BGR30:
+    case QImage::Format_A2BGR30_Premultiplied:
+        if (sRgbBinding) {
+            // Always needs conversion
+            break;
+        } else if (isOpenGL12orBetter || isOpenGLES3orBetter) {
+            pixelType = GL_UNSIGNED_INT_2_10_10_10_REV;
+            externalFormat = GL_RGBA;
+            internalFormat = GL_RGB10_A2;
+            targetFormat =  image.format();
+        }
+        break;
+    case QImage::Format_RGB30:
+    case QImage::Format_A2RGB30_Premultiplied:
+        if (sRgbBinding) {
+            // Always needs conversion
+            break;
+        } else if (isOpenGL12orBetter) {
+            pixelType = GL_UNSIGNED_INT_2_10_10_10_REV;
+            externalFormat = GL_BGRA;
+            internalFormat = GL_RGB10_A2;
+            targetFormat = image.format();
+        } else if (funcs->hasOpenGLExtension(QOpenGLExtensions::TextureSwizzle)) {
+            funcs->glTexParameteri(target, GL_TEXTURE_SWIZZLE_B, GL_RED);
+            funcs->glTexParameteri(target, GL_TEXTURE_SWIZZLE_R, GL_BLUE);
+            pixelType = GL_UNSIGNED_INT_2_10_10_10_REV;
+            externalFormat = GL_RGBA;
+            internalFormat = GL_RGB10_A2;
+            targetFormat = image.format();
+        }
+        break;
+    case QImage::Format_RGB444:
+    case QImage::Format_RGB555:
+    case QImage::Format_RGB16:
+        if (isOpenGL12orBetter || context->isOpenGLES()) {
+            externalFormat = internalFormat = GL_RGB;
+            pixelType = GL_UNSIGNED_SHORT_5_6_5;
+            targetFormat = QImage::Format_RGB16;
+        }
+        break;
+    case QImage::Format_RGB666:
+    case QImage::Format_RGB888:
+        externalFormat = internalFormat = GL_RGB;
+        pixelType = GL_UNSIGNED_BYTE;
+        targetFormat = QImage::Format_RGB888;
+        break;
+    case QImage::Format_BGR888:
+        if (isOpenGL12orBetter) {
+            externalFormat = GL_BGR;
+            internalFormat = GL_RGB;
+            pixelType = GL_UNSIGNED_BYTE;
+            targetFormat = QImage::Format_BGR888;
+        } else if (funcs->hasOpenGLExtension(QOpenGLExtensions::TextureSwizzle)) {
+            funcs->glTexParameteri(target, GL_TEXTURE_SWIZZLE_B, GL_RED);
+            funcs->glTexParameteri(target, GL_TEXTURE_SWIZZLE_R, GL_BLUE);
+            externalFormat = internalFormat = GL_RGB;
+            pixelType = GL_UNSIGNED_BYTE;
+            targetFormat = QImage::Format_BGR888;
+        }
+        break;
+    case QImage::Format_RGBX8888:
+    case QImage::Format_RGBA8888:
+    case QImage::Format_RGBA8888_Premultiplied:
+        externalFormat = internalFormat = GL_RGBA;
+        pixelType = GL_UNSIGNED_BYTE;
+        targetFormat = image.format();
+        break;
+    case QImage::Format_RGBX64:
+    case QImage::Format_RGBA64:
+    case QImage::Format_RGBA64_Premultiplied:
+        externalFormat = internalFormat = GL_RGBA;
+        if (isOpenGL12orBetter || (context->isOpenGLES() && context->format().majorVersion() >= 3))
+            internalFormat = GL_RGBA16;
+        pixelType = GL_UNSIGNED_SHORT;
+        targetFormat =  image.format();
+        break;
+    case QImage::Format_Indexed8:
+        if (sRgbBinding) {
+            // Always needs conversion
+            break;
+        } else if (options & UseRedForAlphaAndLuminanceBindOption) {
+            externalFormat = internalFormat = GL_RED;
+            pixelType = GL_UNSIGNED_BYTE;
+            targetFormat = image.format();
+        }
+        break;
+    case QImage::Format_Alpha8:
+        if (sRgbBinding) {
+            // Always needs conversion
+            break;
+        } else if (options & UseRedForAlphaAndLuminanceBindOption) {
+            externalFormat = internalFormat = GL_RED;
+            pixelType = GL_UNSIGNED_BYTE;
+            targetFormat = image.format();
+        } else if (context->isOpenGLES() || context->format().profile() != QSurfaceFormat::CoreProfile) {
+            externalFormat = internalFormat = GL_ALPHA;
+            pixelType = GL_UNSIGNED_BYTE;
+            targetFormat = image.format();
+        } else if (funcs->hasOpenGLExtension(QOpenGLExtensions::TextureSwizzle)) {
+            funcs->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_SWIZZLE_R, GL_ALPHA);
+            funcs->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_SWIZZLE_G, GL_ZERO);
+            funcs->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_SWIZZLE_B, GL_ZERO);
+            funcs->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_SWIZZLE_A, GL_ZERO);
+            externalFormat = internalFormat = GL_RED;
+            pixelType = GL_UNSIGNED_BYTE;
+            targetFormat = image.format();
+        }
+        break;
+    case QImage::Format_Grayscale8:
+        if (sRgbBinding) {
+            // Always needs conversion
+            break;
+        } else if (options & UseRedForAlphaAndLuminanceBindOption) {
+            externalFormat = internalFormat = GL_RED;
+            pixelType = GL_UNSIGNED_BYTE;
+            targetFormat = image.format();
+        } else if (context->isOpenGLES() || context->format().profile() != QSurfaceFormat::CoreProfile) {
+            externalFormat = internalFormat = GL_LUMINANCE;
+            pixelType = GL_UNSIGNED_BYTE;
+            targetFormat = image.format();
+        } else if (funcs->hasOpenGLExtension(QOpenGLExtensions::TextureSwizzle)) {
+            funcs->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_SWIZZLE_R, GL_RED);
+            funcs->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_SWIZZLE_G, GL_RED);
+            funcs->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_SWIZZLE_B, GL_RED);
+            funcs->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_SWIZZLE_A, GL_ONE);
+            externalFormat = internalFormat = GL_RED;
+            pixelType = GL_UNSIGNED_BYTE;
+            targetFormat = image.format();
+        }
+        break;
+    case QImage::Format_Grayscale16:
+        if (sRgbBinding) {
+            // Always needs conversion
+            break;
+        } else if (options & UseRedForAlphaAndLuminanceBindOption) {
+            externalFormat = internalFormat = GL_RED;
+            pixelType = GL_UNSIGNED_SHORT;
+            targetFormat = image.format();
+        } else if (context->isOpenGLES() || context->format().profile() != QSurfaceFormat::CoreProfile) {
+            externalFormat = internalFormat = GL_LUMINANCE;
+            pixelType = GL_UNSIGNED_SHORT;
+            targetFormat = image.format();
+        } else if (funcs->hasOpenGLExtension(QOpenGLExtensions::TextureSwizzle)) {
+            funcs->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_SWIZZLE_R, GL_RED);
+            funcs->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_SWIZZLE_G, GL_RED);
+            funcs->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_SWIZZLE_B, GL_RED);
+            funcs->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_SWIZZLE_A, GL_ONE);
+            externalFormat = internalFormat = GL_RED;
+            pixelType = GL_UNSIGNED_SHORT;
+            targetFormat = image.format();
+        }
+        break;
+    default:
+        break;
+    }
+
+    // If no direct upload was detected above, convert to RGBA8888 and upload that
+    if (targetFormat == QImage::Format_Invalid) {
+        externalFormat = internalFormat = GL_RGBA;
+        pixelType = GL_UNSIGNED_BYTE;
+        if (!image.hasAlphaChannel())
+            targetFormat = QImage::Format_RGBX8888;
+        else
+            targetFormat = QImage::Format_RGBA8888;
+    }
+
+    if (options & PremultipliedAlphaBindOption) {
+        if (targetFormat == QImage::Format_ARGB32)
+            targetFormat = QImage::Format_ARGB32_Premultiplied;
+        else if (targetFormat == QImage::Format_RGBA8888)
+            targetFormat = QImage::Format_RGBA8888_Premultiplied;
+        else if (targetFormat == QImage::Format_RGBA64)
+            targetFormat = QImage::Format_RGBA64_Premultiplied;
+    } else {
+        if (targetFormat == QImage::Format_ARGB32_Premultiplied)
+            targetFormat = QImage::Format_ARGB32;
+        else if (targetFormat == QImage::Format_RGBA8888_Premultiplied)
+            targetFormat = QImage::Format_RGBA8888;
+        else if (targetFormat == QImage::Format_RGBA64_Premultiplied)
+            targetFormat = QImage::Format_RGBA64;
+    }
+
+    if (sRgbBinding) {
+        Q_ASSERT(internalFormat == GL_RGBA || internalFormat == GL_RGB);
+        if (image.hasAlphaChannel())
+            internalFormat = GL_SRGB_ALPHA;
+        else
+            internalFormat = GL_SRGB;
+    }
+
+    if (image.format() != targetFormat)
+        tx = image.convertToFormat(targetFormat);
+    else
+        tx = image;
+
+    QSize newSize = tx.size();
+    if (!maxSize.isEmpty())
+        newSize = newSize.boundedTo(maxSize);
+    if (options & PowerOfTwoBindOption) {
+        newSize.setWidth(qNextPowerOfTwo(newSize.width() - 1));
+        newSize.setHeight(qNextPowerOfTwo(newSize.height() - 1));
+    }
+
+    if (newSize != tx.size())
+        tx = tx.scaled(newSize, Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
+
+    // Handle cases where the QImage is actually a sub image of its image data:
+    qsizetype naturalBpl = ((qsizetype(tx.width()) * tx.depth() + 31) >> 5) << 2;
+    if (tx.bytesPerLine() != naturalBpl)
+        tx = tx.copy(tx.rect());
+
+    funcs->glTexImage2D(target, 0, internalFormat, tx.width(), tx.height(), 0, externalFormat, pixelType, tx.constBits());
+
+    qsizetype cost = qint64(tx.width()) * tx.height() * tx.depth() / 8;
+
+    return cost;
+}
+
+QT_END_NAMESPACE
diff --git a/src/opengl/qopengltextureuploader_p.h b/src/opengl/qopengltextureuploader_p.h
new file mode 100644
index 0000000000..cea6d97658
--- /dev/null
+++ b/src/opengl/qopengltextureuploader_p.h
@@ -0,0 +1,84 @@
+/****************************************************************************
+**
+** Copyright (C) 2018 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtOpenGL module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#ifndef QOPENGLTEXTUREUPLOADER_P_H
+#define QOPENGLTEXTUREUPLOADER_P_H
+
+#include <QtCore/qsize.h>
+#include <QtOpenGL/qtopenglglobal.h>
+#include <QtGui/private/qopenglcontext_p.h>
+
+QT_BEGIN_NAMESPACE
+
+class QImage;
+
+class Q_OPENGL_EXPORT QOpenGLTextureUploader
+{
+public:
+    enum BindOption {
+        NoBindOption                            = 0x0000,
+        PremultipliedAlphaBindOption            = 0x0001,
+        UseRedForAlphaAndLuminanceBindOption    = 0x0002,
+        SRgbBindOption                          = 0x0004,
+        PowerOfTwoBindOption                    = 0x0008
+    };
+    Q_DECLARE_FLAGS(BindOptions, BindOption)
+    Q_FLAGS(BindOptions)
+
+    static qsizetype textureImage(GLenum target, const QImage &image, BindOptions options, QSize maxSize = QSize());
+
+};
+
+Q_DECLARE_OPERATORS_FOR_FLAGS(QOpenGLTextureUploader::BindOptions)
+
+QT_END_NAMESPACE
+
+#endif
+
diff --git a/src/opengl/qopengltimerquery.cpp b/src/opengl/qopengltimerquery.cpp
new file mode 100644
index 0000000000..44955d48fc
--- /dev/null
+++ b/src/opengl/qopengltimerquery.cpp
@@ -0,0 +1,880 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB).
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtOpenGL module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qopengltimerquery.h"
+
+#include "qopenglqueryhelper_p.h"
+#include <QtCore/private/qobject_p.h>
+#include <QtGui/QOpenGLContext>
+#include <QtGui/QOpenGLFunctions>
+
+QT_BEGIN_NAMESPACE
+
+// Helper class used as fallback if OpenGL <3.3 is being used with EXT_timer_query
+class QExtTimerQueryHelper
+{
+public:
+    QExtTimerQueryHelper(QOpenGLContext *context)
+    {
+        Q_ASSERT(context);
+        GetQueryObjectui64vEXT = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLuint64EXT *)>(context->getProcAddress("glGetQueryObjectui64vEXT"));
+        GetQueryObjecti64vEXT = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLint64EXT *)>(context->getProcAddress("glGetQueryObjecti64vEXT"));
+    }
+
+    inline void glGetQueryObjectui64vEXT(GLuint id, GLenum pname, GLuint64EXT *params)
+    {
+        GetQueryObjectui64vEXT(id, pname, params);
+    }
+
+    inline void glGetQueryObjecti64vEXT(GLuint id, GLenum pname, GLint64EXT *params)
+    {
+        GetQueryObjecti64vEXT(id, pname, params);
+    }
+
+private:
+    void (QOPENGLF_APIENTRYP GetQueryObjectui64vEXT)(GLuint id, GLenum pname, GLuint64EXT *params);
+    void (QOPENGLF_APIENTRYP GetQueryObjecti64vEXT)(GLuint id, GLenum pname, GLint64EXT *params);
+};
+
+class QOpenGLTimerQueryPrivate : public QObjectPrivate
+{
+public:
+    QOpenGLTimerQueryPrivate()
+        : QObjectPrivate(),
+          context(nullptr),
+          ext(nullptr),
+          timeInterval(0),
+          timer(0)
+    {
+    }
+
+    ~QOpenGLTimerQueryPrivate()
+    {
+        delete core;
+        delete ext;
+    }
+
+    bool create();
+    void destroy();
+    void begin();
+    void end();
+    GLuint64 waitForTimeStamp() const;
+    void recordTimestamp();
+    bool isResultAvailable() const;
+    GLuint64 result() const;
+
+    // There are several cases we must handle:
+    //   OpenGL >=3.3 includes timer queries as a core feature
+    //   ARB_timer_query has same functionality as above. Requires OpenGL 3.2
+    //   EXT_timer_query offers limited support. Can be used with OpenGL >=1.5
+    //
+    // Note that some implementations (OS X) provide OpenGL 3.2 but do not expose the
+    // ARB_timer_query extension. In such situations we must also be able to handle
+    // using the EXT_timer_query extension with any version of OpenGL.
+    //
+    // OpenGL 1.5 or above contains the generic query API and OpenGL 3.3 and
+    // ARB_timer_query provide the 64-bit query API. These are wrapped by
+    // QOpenGLQueryHelper. All we need to handle in addition is the EXT_timer_query
+    // case and to take care not to call the Core/ARB functions when we only
+    // have EXT_timer_query available.
+    QOpenGLContext *context;
+    QOpenGLQueryHelper *core;
+    QExtTimerQueryHelper *ext;
+    mutable GLuint64 timeInterval;
+    GLuint timer;
+};
+
+bool QOpenGLTimerQueryPrivate::create()
+{
+    QOpenGLContext *ctx = QOpenGLContext::currentContext();
+
+    if (timer && context == ctx)
+        return true;
+
+    context = ctx;
+    if (!context) {
+        qWarning("A current OpenGL context is required to create timer query objects");
+        return false;
+    }
+
+    if (context->isOpenGLES()) {
+        qWarning("QOpenGLTimerQuery: Not supported on OpenGL ES");
+        return false;
+    }
+
+    // Resolve the functions provided by OpenGL 1.5 and OpenGL 3.3 or ARB_timer_query
+    core = new QOpenGLQueryHelper(context);
+
+    // Check to see if we also need to resolve the functions for EXT_timer_query
+    QSurfaceFormat f = context->format();
+    if (f.version() <= qMakePair<int, int>(3, 2)
+        && !context->hasExtension(QByteArrayLiteral("GL_ARB_timer_query"))
+        && context->hasExtension(QByteArrayLiteral("GL_EXT_timer_query"))) {
+        ext = new QExtTimerQueryHelper(context);
+    } else if (f.version() <= qMakePair<int, int>(3, 2)
+               && !context->hasExtension(QByteArrayLiteral("GL_ARB_timer_query"))
+               && !context->hasExtension(QByteArrayLiteral("GL_EXT_timer_query"))) {
+        qWarning("QOpenGLTimerQuery requires one of:\n"
+                 "  OpenGL 3.3 or newer,\n"
+                 "  OpenGL 3.2 and the ARB_timer_query extension\n"
+                 "  or the EXT_timer query extension");
+        return false;
+    }
+
+    core->glGenQueries(1, &timer);
+    return (timer != 0);
+}
+
+void QOpenGLTimerQueryPrivate::destroy()
+{
+    if (!timer)
+        return;
+
+    core->glDeleteQueries(1, &timer);
+    timer = 0;
+    context = nullptr;
+}
+
+// GL_TIME_ELAPSED_EXT is not defined on OS X 10.6
+#if !defined(GL_TIME_ELAPSED_EXT)
+#define GL_TIME_ELAPSED_EXT 0x88BF
+#endif
+
+// GL_TIME_ELAPSED is not defined on OS X 10.7 or 10.8 yet
+#if !defined(GL_TIME_ELAPSED)
+#define GL_TIME_ELAPSED GL_TIME_ELAPSED_EXT
+#endif
+
+void QOpenGLTimerQueryPrivate::begin()
+{
+    core->glBeginQuery(GL_TIME_ELAPSED, timer);
+}
+
+void QOpenGLTimerQueryPrivate::end()
+{
+    core->glEndQuery(GL_TIME_ELAPSED);
+}
+
+void QOpenGLTimerQueryPrivate::recordTimestamp()
+{
+    // Don't call glQueryCounter if we only have EXT_timer_query
+#if defined(GL_TIMESTAMP)
+    if (!ext)
+        core->glQueryCounter(timer, GL_TIMESTAMP);
+    else
+        qWarning("QOpenGLTimerQuery::recordTimestamp() requires OpenGL 3.3 or GL_ARB_timer_query");
+#else
+    qWarning("QOpenGLTimerQuery::recordTimestamp() requires OpenGL 3.3 or GL_ARB_timer_query");
+#endif
+}
+
+GLuint64 QOpenGLTimerQueryPrivate::waitForTimeStamp() const
+{
+    GLint64 tmp = 0;
+#if defined(GL_TIMESTAMP)
+    if (!ext)
+        core->glGetInteger64v(GL_TIMESTAMP, &tmp);
+    else
+        qWarning("QOpenGLTimerQuery::waitForTimestamp() requires OpenGL 3.3 or GL_ARB_timer_query");
+#else
+    qWarning("QOpenGLTimerQuery::waitForTimestamp() requires OpenGL 3.3 or GL_ARB_timer_query");
+#endif
+    GLuint64 timestamp(tmp);
+    return timestamp;
+}
+
+bool QOpenGLTimerQueryPrivate::isResultAvailable() const
+{
+    GLuint available = GL_FALSE;
+    core->glGetQueryObjectuiv(timer, GL_QUERY_RESULT_AVAILABLE, &available);
+    return available;
+}
+
+GLuint64 QOpenGLTimerQueryPrivate::result() const
+{
+    if (!ext)
+        core->glGetQueryObjectui64v(timer, GL_QUERY_RESULT, &timeInterval);
+    else
+        ext->glGetQueryObjectui64vEXT(timer, GL_QUERY_RESULT, &timeInterval);
+    return timeInterval;
+}
+
+/*!
+    \class QOpenGLTimerQuery
+    \brief The QOpenGLTimerQuery class wraps an OpenGL timer query object.
+    \inmodule QtOpenGL
+    \since 5.1
+    \ingroup painting-3D
+
+    OpenGL timer query objects are OpenGL managed resources to measure the
+    execution times of sequences of OpenGL commands on the GPU.
+
+    OpenGL offers various levels of support for timer queries, depending on
+    the version of OpenGL you have and the presence of the ARB_timer_query or
+    EXT_timer_query extensions. The support can be summarized as:
+
+    \list
+        \li OpenGL >=3.3 offers full support for all timer query functionality.
+        \li OpenGL 3.2 with the ARB_timer_query extension offers full support
+            for all timer query functionality.
+        \li OpenGL <=3.2 with the EXT_timer_query extension offers limited support
+            in that the timestamp of the GPU cannot be queried. Places where this
+            impacts functions provided by Qt classes will be highlighted in the
+            function documentation.
+        \li OpenGL ES 2 (and OpenGL ES 3) do not provide any support for OpenGL
+            timer queries.
+    \endlist
+
+    OpenGL represents time with a granularity of 1 nanosecond (1e-9 seconds). As a
+    consequence of this, 32-bit integers would only give a total possible duration
+    of approximately 4 seconds, which would not be difficult to exceed in poorly
+    performing or lengthy operations. OpenGL therefore uses 64 bit integer types
+    to represent times. A GLuint64 variable has enough width to contain a duration
+    of hundreds of years, which is plenty for real-time rendering needs.
+
+    As with the other Qt OpenGL classes, QOpenGLTimerQuery has a create()
+    function to create the underlying OpenGL object. This is to allow the developer to
+    ensure that there is a valid current OpenGL context at the time.
+
+    Once created, timer queries can be issued in one of several ways. The simplest
+    method is to delimit a block of commands with calls to begin() and end(). This
+    instructs OpenGL to measure the time taken from completing all commands issued
+    prior to begin() until the completion of all commands issued prior to end().
+
+    At the end of a frame we can retrieve the results by calling waitForResult().
+    As this function's name implies, it blocks CPU execution until OpenGL notifies
+    that the timer query result is available. To avoid blocking, you can check
+    if the query result is available by calling isResultAvailable(). Note that
+    modern GPUs are deeply pipelined and query results may not become available for
+    between 1-5 frames after they were issued.
+
+    Note that OpenGL does not permit nesting or interleaving of multiple timer queries
+    using begin() and end(). Using multiple timer queries and recordTimestamp() avoids
+    this limitation. When using recordTimestamp() the result can be obtained at
+    some later time using isResultAvailable() and waitForResult(). Qt provides the
+    convenience class QOpenGLTimeMonitor that helps with using multiple query objects.
+
+    \sa QOpenGLTimeMonitor
+*/
+
+/*!
+    Creates a QOpenGLTimerQuery instance with the given \a parent. You must call create()
+    with a valid OpenGL context before using.
+*/
+QOpenGLTimerQuery::QOpenGLTimerQuery(QObject *parent)
+    : QObject(*new QOpenGLTimerQueryPrivate, parent)
+{
+}
+
+/*!
+    Destroys the QOpenGLTimerQuery and the underlying OpenGL resource.
+*/
+QOpenGLTimerQuery::~QOpenGLTimerQuery()
+{
+    QOpenGLContext* ctx = QOpenGLContext::currentContext();
+
+    Q_D(QOpenGLTimerQuery);
+    QOpenGLContext *oldContext = nullptr;
+    if (d->context != ctx) {
+        oldContext = ctx;
+        if (d->context->makeCurrent(oldContext->surface())) {
+            ctx = d->context;
+        } else {
+            qWarning("QOpenGLTimerQuery::~QOpenGLTimerQuery() failed to make query objects's context current");
+            ctx = nullptr;
+        }
+    }
+
+    if (ctx)
+        destroy();
+
+    if (oldContext) {
+        if (!oldContext->makeCurrent(oldContext->surface()))
+            qWarning("QOpenGLTimerQuery::~QOpenGLTimerQuery() failed to restore current context");
+    }
+}
+
+/*!
+    Creates the underlying OpenGL timer query object. There must be a valid OpenGL context
+    that supports query objects current for this function to succeed.
+
+    Returns \c true if the OpenGL timer query object was successfully created.
+*/
+bool QOpenGLTimerQuery::create()
+{
+    Q_D(QOpenGLTimerQuery);
+    return d->create();
+}
+
+/*!
+    Destroys the underlying OpenGL timer query object. The context that was current when
+    create() was called must be current when calling this function.
+*/
+void QOpenGLTimerQuery::destroy()
+{
+    Q_D(QOpenGLTimerQuery);
+    d->destroy();
+}
+
+/*!
+    Returns \c true if the underlying OpenGL query object has been created. If this
+    returns \c true and the associated OpenGL context is current, then you are able to issue
+    queries with this object.
+*/
+bool QOpenGLTimerQuery::isCreated() const
+{
+    Q_D(const QOpenGLTimerQuery);
+    return (d->timer != 0);
+}
+
+/*!
+    Returns the id of the underlying OpenGL query object.
+*/
+GLuint QOpenGLTimerQuery::objectId() const
+{
+    Q_D(const QOpenGLTimerQuery);
+    return d->timer;
+}
+
+/*!
+    Marks the start point in the OpenGL command queue for a sequence of commands to
+    be timed by this query object.
+
+    This is useful for simple use-cases. Usually it is better to use recordTimestamp().
+
+    \sa end(), isResultAvailable(), waitForResult(), recordTimestamp()
+*/
+void QOpenGLTimerQuery::begin()
+{
+    Q_D(QOpenGLTimerQuery);
+    d->begin();
+}
+
+/*!
+    Marks the end point in the OpenGL command queue for a sequence of commands to
+    be timed by this query object.
+
+    This is useful for simple use-cases. Usually it is better to use recordTimestamp().
+
+    \sa begin(), isResultAvailable(), waitForResult(), recordTimestamp()
+*/
+void QOpenGLTimerQuery::end()
+{
+    Q_D(QOpenGLTimerQuery);
+    d->end();
+}
+
+/*!
+    Places a marker in the OpenGL command queue for the GPU to record the timestamp
+    when this marker is reached by the GPU. This function is non-blocking and the
+    result will become available at some later time.
+
+    The availability of the result can be checked with isResultAvailable(). The result
+    can be fetched with waitForResult() which will block if the result is not yet
+    available.
+
+    \sa waitForResult(), isResultAvailable(), begin(), end()
+*/
+void QOpenGLTimerQuery::recordTimestamp()
+{
+    Q_D(QOpenGLTimerQuery);
+    return d->recordTimestamp();
+}
+
+/*!
+    Returns the current timestamp of the GPU when all previously issued OpenGL
+    commands have been received but not necessarily executed by the GPU.
+
+    This function blocks until the result is returned.
+
+    \sa recordTimestamp()
+*/
+GLuint64 QOpenGLTimerQuery::waitForTimestamp() const
+{
+    Q_D(const QOpenGLTimerQuery);
+    return d->waitForTimeStamp();
+}
+
+/*!
+    Returns \c true if the OpenGL timer query result is available.
+
+    This function is non-blocking and ideally should be used to check for the
+    availability of the query result before calling waitForResult().
+
+    \sa waitForResult()
+*/
+bool QOpenGLTimerQuery::isResultAvailable() const
+{
+    Q_D(const QOpenGLTimerQuery);
+    return d->isResultAvailable();
+}
+
+/*!
+    Returns the result of the OpenGL timer query.
+
+    This function will block until the result is made available by OpenGL. It is
+    recommended to call isResultAvailable() to ensure that the result is available
+    to avoid unnecessary blocking and stalling.
+
+    \sa isResultAvailable()
+*/
+GLuint64 QOpenGLTimerQuery::waitForResult() const
+{
+    Q_D(const QOpenGLTimerQuery);
+    return d->result();
+}
+
+
+class QOpenGLTimeMonitorPrivate : public QObjectPrivate
+{
+public:
+    QOpenGLTimeMonitorPrivate()
+        : QObjectPrivate(),
+          timers(),
+          timeSamples(),
+          context(nullptr),
+          core(nullptr),
+          ext(nullptr),
+          requestedSampleCount(2),
+          currentSample(-1),
+          timerQueryActive(false)
+    {
+    }
+
+    ~QOpenGLTimeMonitorPrivate()
+    {
+        delete core;
+        delete ext;
+    }
+
+    bool create();
+    void destroy();
+    void recordSample();
+    bool isResultAvailable() const;
+    QVector<GLuint64> samples() const;
+    QVector<GLuint64> intervals() const;
+    void reset();
+
+    QVector<GLuint> timers;
+    mutable QVector<GLuint64> timeSamples;
+
+    QOpenGLContext *context;
+    QOpenGLQueryHelper *core;
+    QExtTimerQueryHelper *ext;
+
+    int requestedSampleCount;
+    int currentSample;
+    mutable bool timerQueryActive;
+};
+
+bool QOpenGLTimeMonitorPrivate::create()
+{
+    if (!timers.isEmpty() && timers.at(0) != 0 && timers.size() == requestedSampleCount)
+        return true;
+
+    QOpenGLContext *ctx = QOpenGLContext::currentContext();
+    if (context && context != ctx) {
+        qWarning("QTimeMonitor: Attempting to use different OpenGL context to recreate timers.\n"
+                 "Please call destroy() first or use the same context to previously create");
+        return false;
+    }
+
+    context = ctx;
+    if (!context) {
+        qWarning("A current OpenGL context is required to create timer query objects");
+        return false;
+    }
+
+    // Resize the vectors that hold the timers and the recorded samples
+    timers.resize(requestedSampleCount);
+    timeSamples.resize(requestedSampleCount);
+
+    // Resolve the functions provided by OpenGL 1.5 and OpenGL 3.3 or ARB_timer_query
+    core = new QOpenGLQueryHelper(context);
+
+    // Check to see if we also need to resolve the functions for EXT_timer_query
+    QSurfaceFormat f = context->format();
+    if (f.version() <= qMakePair<int, int>(3, 2)
+        && !context->hasExtension(QByteArrayLiteral("GL_ARB_timer_query"))
+        && context->hasExtension(QByteArrayLiteral("GL_EXT_timer_query"))) {
+        ext = new QExtTimerQueryHelper(context);
+    } else if (f.version() <= qMakePair<int, int>(3, 2)
+               && !context->hasExtension(QByteArrayLiteral("GL_ARB_timer_query"))
+               && !context->hasExtension(QByteArrayLiteral("GL_EXT_timer_query"))) {
+        qWarning("QOpenGLTimeMonitor requires one of:\n"
+                 "  OpenGL 3.3 or newer,\n"
+                 "  OpenGL 3.2 and the ARB_timer_query extension\n"
+                 "  or the EXT_timer query extension");
+        return false;
+    }
+
+    core->glGenQueries(requestedSampleCount, timers.data());
+    return (timers.at(0) != 0);
+}
+
+void QOpenGLTimeMonitorPrivate::destroy()
+{
+    if (timers.isEmpty() || timers.at(0) == 0)
+        return;
+
+    core->glDeleteQueries(timers.size(), timers.data());
+    timers.clear();
+    delete core;
+    core = nullptr;
+    delete ext;
+    ext = nullptr;
+    context = nullptr;
+}
+
+void QOpenGLTimeMonitorPrivate::recordSample()
+{
+    // Use glQueryCounter() and GL_TIMESTAMP where available.
+    // Otherwise, simulate it with glBeginQuery()/glEndQuery()
+    if (!ext) {
+#if defined(GL_TIMESTAMP)
+        core->glQueryCounter(timers.at(++currentSample), GL_TIMESTAMP);
+#endif
+    } else {
+        if (currentSample == -1) {
+            core->glBeginQuery(GL_TIME_ELAPSED_EXT, timers.at(++currentSample));
+            timerQueryActive = true;
+        } else if (currentSample < timers.size() - 1) {
+            core->glEndQuery(GL_TIME_ELAPSED_EXT);
+            core->glBeginQuery(GL_TIME_ELAPSED_EXT, timers.at(++currentSample));
+        } else {
+            if (timerQueryActive) {
+                core->glEndQuery(GL_TIME_ELAPSED_EXT);
+                timerQueryActive = false;
+            }
+        }
+    }
+}
+
+bool QOpenGLTimeMonitorPrivate::isResultAvailable() const
+{
+    // The OpenGL spec says that if a query result is ready then the results of all queries
+    // of the same type issued before it must also be ready. Therefore we only need to check
+    // the availability of the result for the last issued query
+    GLuint available = GL_FALSE;
+    core->glGetQueryObjectuiv(timers.at(currentSample), GL_QUERY_RESULT_AVAILABLE, &available);
+    return available;
+}
+
+QVector<GLuint64> QOpenGLTimeMonitorPrivate::samples() const
+{
+    // For the Core and ARB options just ask for the timestamp for each timer query.
+    // For the EXT implementation we cannot obtain timestamps so we defer any result
+    // collection to the intervals() function
+    if (!ext) {
+        for (int i = 0; i <= currentSample; ++i)
+            core->glGetQueryObjectui64v(timers.at(i), GL_QUERY_RESULT, &timeSamples[i]);
+    } else {
+        qWarning("QOpenGLTimeMonitor::samples() requires OpenGL >=3.3\n"
+                 "or OpenGL 3.2 and GL_ARB_timer_query");
+    }
+    return timeSamples;
+}
+
+QVector<GLuint64> QOpenGLTimeMonitorPrivate::intervals() const
+{
+    QVector<GLuint64> intervals(timers.size() - 1);
+    if (!ext) {
+        // Obtain the timestamp samples and calculate the interval durations
+        const QVector<GLuint64> timeStamps = samples();
+        for (int i = 0; i < intervals.size(); ++i)
+            intervals[i] = timeStamps[i+1] - timeStamps[i];
+    } else {
+        // Stop the last timer if needed
+        if (timerQueryActive) {
+            core->glEndQuery(GL_TIME_ELAPSED_EXT);
+            timerQueryActive = false;
+        }
+
+        // Obtain the results from all timers apart from the redundant last one. In this
+        // case the results actually are the intervals not timestamps
+        for (int i = 0; i < currentSample; ++i)
+            ext->glGetQueryObjectui64vEXT(timers.at(i), GL_QUERY_RESULT, &intervals[i]);
+    }
+
+    return intervals;
+}
+
+void QOpenGLTimeMonitorPrivate::reset()
+{
+    currentSample = -1;
+    timeSamples.fill(0);
+}
+
+
+/*!
+    \class QOpenGLTimeMonitor
+    \brief The QOpenGLTimeMonitor class wraps a sequence of OpenGL timer query objects.
+    \inmodule QtOpenGL
+    \since 5.1
+    \ingroup painting-3D
+
+    The QOpenGLTimeMonitor class is a convenience wrapper around a collection of OpenGL
+    timer query objects used to measure intervals of time on the GPU to the level of
+    granularity required by your rendering application.
+
+    The OpenGL timer queries objects are queried in sequence to record the GPU
+    timestamps at positions of interest in your rendering code. Once the results for
+    all issues timer queries become available, the results can be fetched and
+    QOpenGLTimerMonitor will calculate the recorded time intervals for you.
+
+    The typical use case of this class is to either profile your application's rendering
+    algorithms or to adjust those algorithms in real-time for dynamic performance/quality
+    balancing.
+
+    Prior to using QOpenGLTimeMonitor in your rendering function you should set the
+    required number of sample points that you wish to record by calling setSamples(). Note
+    that measuring N sample points will produce N-1 time intervals. Once you have set the
+    number of sample points, call the create() function with a valid current OpenGL context
+    to create the necessary query timer objects. These steps are usually performed just
+    once in an initialization function.
+
+    Use the recordSample() function to delimit blocks of code containing OpenGL commands
+    that you wish to time. You can check availability of the resulting time
+    samples and time intervals with isResultAvailable(). The calculated time intervals and
+    the raw timestamp samples can be retrieved with the blocking waitForIntervals() and
+    waitForSamples() functions respectively.
+
+    After retrieving the results and before starting a new round of taking samples
+    (for example, in the next frame) be sure to call the reset() function which will clear
+    the cached results and reset the timer index back to the first timer object.
+
+    \sa QOpenGLTimerQuery
+*/
+
+/*!
+    Creates a QOpenGLTimeMonitor instance with the given \a parent. You must call create()
+    with a valid OpenGL context before using.
+
+    \sa setSampleCount(), create()
+*/
+QOpenGLTimeMonitor::QOpenGLTimeMonitor(QObject *parent)
+    : QObject(*new QOpenGLTimeMonitorPrivate, parent)
+{
+}
+
+/*!
+    Destroys the QOpenGLTimeMonitor and any underlying OpenGL resources.
+*/
+QOpenGLTimeMonitor::~QOpenGLTimeMonitor()
+{
+    QOpenGLContext* ctx = QOpenGLContext::currentContext();
+
+    Q_D(QOpenGLTimeMonitor);
+    QOpenGLContext *oldContext = nullptr;
+    if (d->context != ctx) {
+        oldContext = ctx;
+        if (d->context->makeCurrent(oldContext->surface())) {
+            ctx = d->context;
+        } else {
+            qWarning("QOpenGLTimeMonitor::~QOpenGLTimeMonitor() failed to make time monitor's context current");
+            ctx = nullptr;
+        }
+    }
+
+    if (ctx)
+        destroy();
+
+    if (oldContext) {
+        if (!oldContext->makeCurrent(oldContext->surface()))
+            qWarning("QOpenGLTimeMonitor::~QOpenGLTimeMonitor() failed to restore current context");
+    }
+}
+
+/*!
+    Sets the number of sample points to \a sampleCount. After setting the number
+    of samples with this function, you must call create() to instantiate the underlying
+    OpenGL timer query objects.
+
+    The new \a sampleCount must be at least 2.
+
+    \sa sampleCount(), create(), recordSample()
+*/
+void QOpenGLTimeMonitor::setSampleCount(int sampleCount)
+{
+    // We need at least 2 samples to get an interval
+    if (sampleCount < 2)
+        return;
+    Q_D(QOpenGLTimeMonitor);
+    d->requestedSampleCount = sampleCount;
+}
+
+/*!
+    Returns the number of sample points that have been requested with
+    setSampleCount(). If create was successfully called following setSampleCount(),
+    then the value returned will be the actual number of sample points
+    that can be used.
+
+    The default value for sample count is 2, leading to the measurement of a
+    single interval.
+
+    \sa setSampleCount()
+*/
+int QOpenGLTimeMonitor::sampleCount() const
+{
+    Q_D(const QOpenGLTimeMonitor);
+    return d->requestedSampleCount;
+}
+
+/*!
+    Instantiate sampleCount() OpenGL timer query objects that will be used
+    to track the amount of time taken to execute OpenGL commands between
+    successive calls to recordSample().
+
+    Returns \c true if the OpenGL timer query objects could be created.
+
+    \sa destroy(), setSampleCount(), recordSample()
+*/
+bool QOpenGLTimeMonitor::create()
+{
+    Q_D(QOpenGLTimeMonitor);
+    return d->create();
+}
+
+/*!
+    Destroys any OpenGL timer query objects used within this instance.
+
+    \sa create()
+*/
+void QOpenGLTimeMonitor::destroy()
+{
+    Q_D(QOpenGLTimeMonitor);
+    d->destroy();
+}
+
+/*!
+    Returns \c true if the underlying OpenGL query objects have been created. If this
+    returns \c true and the associated OpenGL context is current, then you are able to record
+    time samples with this object.
+*/
+bool QOpenGLTimeMonitor::isCreated() const
+{
+    Q_D(const QOpenGLTimeMonitor);
+    return (!d->timers.isEmpty() && d->timers.at(0) != 0);
+}
+
+/*!
+    Returns a QVector containing the object Ids of the OpenGL timer query objects.
+*/
+QVector<GLuint> QOpenGLTimeMonitor::objectIds() const
+{
+    Q_D(const QOpenGLTimeMonitor);
+    return d->timers;
+}
+
+/*!
+    Issues an OpenGL timer query at this point in the OpenGL command queue. Calling this
+    function in a sequence in your application's rendering function, will build up
+    details of the GPU time taken to execute the OpenGL commands between successive
+    calls to this function.
+
+    \sa setSampleCount(), isResultAvailable(), waitForSamples(), waitForIntervals()
+*/
+int QOpenGLTimeMonitor::recordSample()
+{
+    Q_D(QOpenGLTimeMonitor);
+    d->recordSample();
+    return d->currentSample;
+}
+
+/*!
+    Returns \c true if the OpenGL timer query results are available.
+
+    \sa waitForSamples(), waitForIntervals()
+*/
+bool QOpenGLTimeMonitor::isResultAvailable() const
+{
+    Q_D(const QOpenGLTimeMonitor);
+    return d->isResultAvailable();
+}
+
+/*!
+    Returns a QVector containing the GPU timestamps taken with recordSample().
+
+    This function will block until OpenGL indicates the results are available. It
+    is recommended to check the availability of the result prior to calling this
+    function with isResultAvailable().
+
+    \note This function only works on systems that have OpenGL >=3.3 or the
+          ARB_timer_query extension. See QOpenGLTimerQuery for more details.
+
+    \sa waitForIntervals(), isResultAvailable()
+*/
+QVector<GLuint64> QOpenGLTimeMonitor::waitForSamples() const
+{
+    Q_D(const QOpenGLTimeMonitor);
+    return d->samples();
+}
+
+/*!
+    Returns a QVector containing the time intervals delimited by the calls to
+    recordSample(). The resulting vector will contain one fewer element as
+    this represents the intervening intervals rather than the actual timestamp
+    samples.
+
+    This function will block until OpenGL indicates the results are available. It
+    is recommended to check the availability of the result prior to calling this
+    function with isResultAvailable().
+
+    \sa waitForSamples(), isResultAvailable()
+*/
+QVector<GLuint64> QOpenGLTimeMonitor::waitForIntervals() const
+{
+    Q_D(const QOpenGLTimeMonitor);
+    return d->intervals();
+}
+
+/*!
+    Resets the time monitor ready for use in another frame of rendering. Call
+    this once you have obtained the previous results and before calling
+    recordSample() for the first time on the next frame.
+
+    \sa recordSample()
+*/
+void QOpenGLTimeMonitor::reset()
+{
+    Q_D(QOpenGLTimeMonitor);
+    d->reset();
+}
+
+QT_END_NAMESPACE
diff --git a/src/opengl/qopengltimerquery.h b/src/opengl/qopengltimerquery.h
new file mode 100644
index 0000000000..a779240108
--- /dev/null
+++ b/src/opengl/qopengltimerquery.h
@@ -0,0 +1,116 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB).
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtOpenGL module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QOPENGLTIMERQUERY_H
+#define QOPENGLTIMERQUERY_H
+
+#include <QtOpenGL/qtopenglglobal.h>
+
+#if !defined(QT_NO_OPENGL) && !defined(QT_OPENGL_ES_2)
+
+#include <QtCore/QObject>
+#include <QtGui/qopengl.h>
+
+QT_BEGIN_NAMESPACE
+
+class QOpenGLTimerQueryPrivate;
+
+class Q_OPENGL_EXPORT QOpenGLTimerQuery : public QObject
+{
+    Q_OBJECT
+
+public:
+    explicit QOpenGLTimerQuery(QObject *parent = nullptr);
+    ~QOpenGLTimerQuery();
+
+    bool create();
+    void destroy();
+    bool isCreated() const;
+    GLuint objectId() const;
+
+    void begin();
+    void end();
+    GLuint64 waitForTimestamp() const;
+    void recordTimestamp();
+    bool isResultAvailable() const;
+    GLuint64 waitForResult() const;
+
+private:
+    Q_DECLARE_PRIVATE(QOpenGLTimerQuery)
+    Q_DISABLE_COPY(QOpenGLTimerQuery)
+};
+
+
+class QOpenGLTimeMonitorPrivate;
+
+class Q_OPENGL_EXPORT QOpenGLTimeMonitor : public QObject
+{
+    Q_OBJECT
+
+public:
+    explicit QOpenGLTimeMonitor(QObject *parent = nullptr);
+    ~QOpenGLTimeMonitor();
+
+    void setSampleCount(int sampleCount);
+    int sampleCount() const;
+
+    bool create();
+    void destroy();
+    bool isCreated() const;
+    QVector<GLuint> objectIds() const;
+
+    int recordSample();
+
+    bool isResultAvailable() const;
+
+    QVector<GLuint64> waitForSamples() const;
+    QVector<GLuint64> waitForIntervals() const;
+
+    void reset();
+
+private:
+    Q_DECLARE_PRIVATE(QOpenGLTimeMonitor)
+    Q_DISABLE_COPY(QOpenGLTimeMonitor)
+};
+
+QT_END_NAMESPACE
+
+#endif // QT_NO_OPENGL
+
+#endif // QOPENGLTIMERQUERY_H
diff --git a/src/opengl/qopenglvertexarrayobject.cpp b/src/opengl/qopenglvertexarrayobject.cpp
new file mode 100644
index 0000000000..a6ac282d4c
--- /dev/null
+++ b/src/opengl/qopenglvertexarrayobject.cpp
@@ -0,0 +1,531 @@
+/****************************************************************************
+**
+** Copyright (C) 2014 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Sean Harmer <sean.harmer@kdab.com>
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtOpenGL module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qopenglvertexarrayobject.h"
+
+#include <QtCore/private/qobject_p.h>
+#include <QtCore/qthread.h>
+#include <QtGui/qopenglcontext.h>
+#include <QtGui/qoffscreensurface.h>
+#include <QtGui/qguiapplication.h>
+
+#include <QtGui/qopenglfunctions_3_0.h>
+#include <QtGui/qopenglfunctions_3_2_core.h>
+
+#include <private/qopenglextensions_p.h>
+#include <private/qopenglvertexarrayobject_p.h>
+
+QT_BEGIN_NAMESPACE
+
+class QOpenGLFunctions_3_0;
+class QOpenGLFunctions_3_2_Core;
+
+void qtInitializeVertexArrayObjectHelper(QOpenGLVertexArrayObjectHelper *helper, QOpenGLContext *context)
+{
+    Q_ASSERT(helper);
+    Q_ASSERT(context);
+
+    bool tryARB = true;
+
+    if (context->isOpenGLES()) {
+        if (context->format().majorVersion() >= 3) {
+            QOpenGLExtraFunctionsPrivate *extra = static_cast<QOpenGLExtensions *>(context->extraFunctions())->d();
+            helper->GenVertexArrays = extra->f.GenVertexArrays;
+            helper->DeleteVertexArrays = extra->f.DeleteVertexArrays;
+            helper->BindVertexArray = extra->f.BindVertexArray;
+            helper->IsVertexArray = extra->f.IsVertexArray;
+            tryARB = false;
+        } else if (context->hasExtension(QByteArrayLiteral("GL_OES_vertex_array_object"))) {
+            helper->GenVertexArrays = reinterpret_cast<QOpenGLVertexArrayObjectHelper::qt_GenVertexArrays_t>(context->getProcAddress("glGenVertexArraysOES"));
+            helper->DeleteVertexArrays = reinterpret_cast<QOpenGLVertexArrayObjectHelper::qt_DeleteVertexArrays_t>(context->getProcAddress("glDeleteVertexArraysOES"));
+            helper->BindVertexArray = reinterpret_cast<QOpenGLVertexArrayObjectHelper::qt_BindVertexArray_t>(context->getProcAddress("glBindVertexArrayOES"));
+            helper->IsVertexArray = reinterpret_cast<QOpenGLVertexArrayObjectHelper::qt_IsVertexArray_t>(context->getProcAddress("glIsVertexArrayOES"));
+            tryARB = false;
+        }
+    } else if (context->hasExtension(QByteArrayLiteral("GL_APPLE_vertex_array_object")) &&
+               !context->hasExtension(QByteArrayLiteral("GL_ARB_vertex_array_object"))) {
+        helper->GenVertexArrays = reinterpret_cast<QOpenGLVertexArrayObjectHelper::qt_GenVertexArrays_t>(context->getProcAddress("glGenVertexArraysAPPLE"));
+        helper->DeleteVertexArrays = reinterpret_cast<QOpenGLVertexArrayObjectHelper::qt_DeleteVertexArrays_t>(context->getProcAddress("glDeleteVertexArraysAPPLE"));
+        helper->BindVertexArray = reinterpret_cast<QOpenGLVertexArrayObjectHelper::qt_BindVertexArray_t>(context->getProcAddress("glBindVertexArrayAPPLE"));
+        helper->IsVertexArray = reinterpret_cast<QOpenGLVertexArrayObjectHelper::qt_IsVertexArray_t>(context->getProcAddress("glIsVertexArrayAPPLE"));
+        tryARB = false;
+    }
+
+    if (tryARB && context->hasExtension(QByteArrayLiteral("GL_ARB_vertex_array_object"))) {
+        helper->GenVertexArrays = reinterpret_cast<QOpenGLVertexArrayObjectHelper::qt_GenVertexArrays_t>(context->getProcAddress("glGenVertexArrays"));
+        helper->DeleteVertexArrays = reinterpret_cast<QOpenGLVertexArrayObjectHelper::qt_DeleteVertexArrays_t>(context->getProcAddress("glDeleteVertexArrays"));
+        helper->BindVertexArray = reinterpret_cast<QOpenGLVertexArrayObjectHelper::qt_BindVertexArray_t>(context->getProcAddress("glBindVertexArray"));
+        helper->IsVertexArray = reinterpret_cast<QOpenGLVertexArrayObjectHelper::qt_IsVertexArray_t>(context->getProcAddress("glIsVertexArray"));
+    }
+}
+
+class QOpenGLVertexArrayObjectPrivate : public QObjectPrivate
+{
+public:
+    QOpenGLVertexArrayObjectPrivate()
+        : vao(0)
+        , vaoFuncsType(NotSupported)
+        , context(nullptr)
+    {
+    }
+
+    ~QOpenGLVertexArrayObjectPrivate()
+    {
+        if (vaoFuncsType == ARB || vaoFuncsType == APPLE || vaoFuncsType == OES)
+            delete vaoFuncs.helper;
+    }
+
+    bool create();
+    void destroy();
+    void bind();
+    void release();
+    void _q_contextAboutToBeDestroyed();
+
+    Q_DECLARE_PUBLIC(QOpenGLVertexArrayObject)
+
+    GLuint vao;
+
+    union {
+        QOpenGLFunctions_3_0 *core_3_0;
+        QOpenGLFunctions_3_2_Core *core_3_2;
+        QOpenGLVertexArrayObjectHelper *helper;
+    } vaoFuncs;
+    enum {
+        NotSupported,
+        Core_3_0,
+        Core_3_2,
+        ARB,
+        APPLE,
+        OES
+    } vaoFuncsType;
+
+    QOpenGLContext *context;
+};
+
+bool QOpenGLVertexArrayObjectPrivate::create()
+{
+    if (vao) {
+        qWarning("QOpenGLVertexArrayObject::create() VAO is already created");
+        return false;
+    }
+
+    Q_Q(QOpenGLVertexArrayObject);
+
+    QOpenGLContext *ctx = QOpenGLContext::currentContext();
+    if (!ctx) {
+        qWarning("QOpenGLVertexArrayObject::create() requires a valid current OpenGL context");
+        return false;
+    }
+
+    //Fail early, if context is the same as ctx, it means we have tried to initialize for this context and failed
+    if (ctx == context)
+        return false;
+
+    context = ctx;
+    QObject::connect(context, SIGNAL(aboutToBeDestroyed()), q, SLOT(_q_contextAboutToBeDestroyed()));
+
+    if (ctx->isOpenGLES()) {
+        if (ctx->format().majorVersion() >= 3 || ctx->hasExtension(QByteArrayLiteral("GL_OES_vertex_array_object"))) {
+            vaoFuncs.helper = new QOpenGLVertexArrayObjectHelper(ctx);
+            vaoFuncsType = OES;
+            vaoFuncs.helper->glGenVertexArrays(1, &vao);
+        }
+    } else {
+        vaoFuncs.core_3_0 = nullptr;
+        vaoFuncsType = NotSupported;
+        QSurfaceFormat format = ctx->format();
+#ifndef QT_OPENGL_ES_2
+        if (format.version() >= qMakePair<int, int>(3,2)) {
+            vaoFuncs.core_3_2 = ctx->versionFunctions<QOpenGLFunctions_3_2_Core>();
+            vaoFuncsType = Core_3_2;
+            vaoFuncs.core_3_2->glGenVertexArrays(1, &vao);
+        } else if (format.majorVersion() >= 3) {
+            vaoFuncs.core_3_0 = ctx->versionFunctions<QOpenGLFunctions_3_0>();
+            vaoFuncsType = Core_3_0;
+            vaoFuncs.core_3_0->glGenVertexArrays(1, &vao);
+        } else
+#endif
+        if (ctx->hasExtension(QByteArrayLiteral("GL_ARB_vertex_array_object"))) {
+            vaoFuncs.helper = new QOpenGLVertexArrayObjectHelper(ctx);
+            vaoFuncsType = ARB;
+            vaoFuncs.helper->glGenVertexArrays(1, &vao);
+        } else if (ctx->hasExtension(QByteArrayLiteral("GL_APPLE_vertex_array_object"))) {
+            vaoFuncs.helper = new QOpenGLVertexArrayObjectHelper(ctx);
+            vaoFuncsType = APPLE;
+            vaoFuncs.helper->glGenVertexArrays(1, &vao);
+        }
+    }
+
+    return (vao != 0);
+}
+
+void QOpenGLVertexArrayObjectPrivate::destroy()
+{
+    Q_Q(QOpenGLVertexArrayObject);
+
+    QOpenGLContext *ctx = QOpenGLContext::currentContext();
+    QOpenGLContext *oldContext = nullptr;
+    QSurface *oldContextSurface = nullptr;
+    QScopedPointer<QOffscreenSurface> offscreenSurface;
+    if (context && context != ctx) {
+        oldContext = ctx;
+        oldContextSurface = ctx ? ctx->surface() : nullptr;
+        // Before going through the effort of creating an offscreen surface
+        // check that we are on the GUI thread because otherwise many platforms
+        // will not able to create that offscreen surface.
+        if (QThread::currentThread() != qGuiApp->thread()) {
+            ctx = nullptr;
+        } else {
+            // Cannot just make the current surface current again with another context.
+            // The format may be incompatible and some platforms (iOS) may impose
+            // restrictions on using a window with different contexts. Create an
+            // offscreen surface (a pbuffer or a hidden window) instead to be safe.
+            offscreenSurface.reset(new QOffscreenSurface);
+            offscreenSurface->setFormat(context->format());
+            offscreenSurface->create();
+            if (context->makeCurrent(offscreenSurface.data())) {
+                ctx = context;
+            } else {
+                qWarning("QOpenGLVertexArrayObject::destroy() failed to make VAO's context current");
+                ctx = nullptr;
+            }
+        }
+    }
+
+    if (context) {
+        QObject::disconnect(context, SIGNAL(aboutToBeDestroyed()), q, SLOT(_q_contextAboutToBeDestroyed()));
+        context = nullptr;
+    }
+
+    if (vao && ctx) {
+        switch (vaoFuncsType) {
+#ifndef QT_OPENGL_ES_2
+        case Core_3_2:
+            vaoFuncs.core_3_2->glDeleteVertexArrays(1, &vao);
+            break;
+        case Core_3_0:
+            vaoFuncs.core_3_0->glDeleteVertexArrays(1, &vao);
+            break;
+#endif
+        case ARB:
+        case APPLE:
+        case OES:
+            vaoFuncs.helper->glDeleteVertexArrays(1, &vao);
+            break;
+        default:
+            break;
+        }
+
+        vao = 0;
+    }
+
+    if (oldContext && oldContextSurface) {
+        if (!oldContext->makeCurrent(oldContextSurface))
+            qWarning("QOpenGLVertexArrayObject::destroy() failed to restore current context");
+    }
+}
+
+/*!
+    \internal
+*/
+void QOpenGLVertexArrayObjectPrivate::_q_contextAboutToBeDestroyed()
+{
+    destroy();
+}
+
+void QOpenGLVertexArrayObjectPrivate::bind()
+{
+    switch (vaoFuncsType) {
+#ifndef QT_OPENGL_ES_2
+    case Core_3_2:
+        vaoFuncs.core_3_2->glBindVertexArray(vao);
+        break;
+    case Core_3_0:
+        vaoFuncs.core_3_0->glBindVertexArray(vao);
+        break;
+#endif
+    case ARB:
+    case APPLE:
+    case OES:
+        vaoFuncs.helper->glBindVertexArray(vao);
+        break;
+    default:
+        break;
+    }
+}
+
+void QOpenGLVertexArrayObjectPrivate::release()
+{
+    switch (vaoFuncsType) {
+#ifndef QT_OPENGL_ES_2
+    case Core_3_2:
+        vaoFuncs.core_3_2->glBindVertexArray(0);
+        break;
+    case Core_3_0:
+        vaoFuncs.core_3_0->glBindVertexArray(0);
+        break;
+#endif
+    case ARB:
+    case APPLE:
+    case OES:
+        vaoFuncs.helper->glBindVertexArray(0);
+        break;
+    default:
+        break;
+    }
+}
+
+
+/*!
+    \class QOpenGLVertexArrayObject
+    \brief The QOpenGLVertexArrayObject class wraps an OpenGL Vertex Array Object.
+    \inmodule QtOpenGL
+    \since 5.1
+    \ingroup painting-3D
+
+    A Vertex Array Object (VAO) is an OpenGL container object that encapsulates
+    the state needed to specify per-vertex attribute data to the OpenGL pipeline.
+    To put it another way, a VAO remembers the states of buffer objects (see
+    QOpenGLBuffer) and their associated state (e.g. vertex attribute divisors).
+    This allows a very easy and efficient method of switching between OpenGL buffer
+    states for rendering different "objects" in a scene. The QOpenGLVertexArrayObject
+    class is a thin wrapper around an OpenGL VAO.
+
+    For the desktop, VAOs are supported as a core feature in OpenGL 3.0 or newer and by the
+    GL_ARB_vertex_array_object for older versions. On OpenGL ES 2, VAOs are provided by
+    the optional GL_OES_vertex_array_object extension. You can check the version of
+    OpenGL with QOpenGLContext::surfaceFormat() and check for the presence of extensions
+    with QOpenGLContext::hasExtension().
+
+    As with the other Qt OpenGL classes, QOpenGLVertexArrayObject has a create()
+    function to create the underlying OpenGL object. This is to allow the developer to
+    ensure that there is a valid current OpenGL context at the time.
+
+    Once you have successfully created a VAO the typical usage pattern is:
+
+    \list
+        \li In scene initialization function, for each visual object:
+        \list
+            \li Bind the VAO
+            \li Set vertex data state for this visual object (vertices, normals, texture coordinates etc.)
+            \li Unbind (release()) the VAO
+        \endlist
+        \li In render function, for each visual object:
+        \list
+            \li Bind the VAO (and shader program if needed)
+            \li Call a glDraw*() function
+            \li Unbind (release()) the VAO
+        \endlist
+    \endlist
+
+    The act of binding the VAO in the render function has the effect of restoring
+    all of the vertex data state setup in the initialization phase. In this way we can
+    set a great deal of state when setting up a VAO and efficiently switch between
+    state sets of objects to be rendered. Using VAOs also allows the OpenGL driver
+    to amortise the validation checks of the vertex data.
+
+    \note Vertex Array Objects, like all other OpenGL container objects, are specific
+    to the context for which they were created and cannot be shared amongst a
+    context group.
+
+    \sa QOpenGLVertexArrayObject::Binder, QOpenGLBuffer
+*/
+
+/*!
+    Creates a QOpenGLVertexArrayObject with the given \a parent. You must call create()
+    with a valid OpenGL context before using.
+*/
+QOpenGLVertexArrayObject::QOpenGLVertexArrayObject(QObject* parent)
+    : QObject(*new QOpenGLVertexArrayObjectPrivate, parent)
+{
+}
+
+/*!
+    \internal
+*/
+QOpenGLVertexArrayObject::QOpenGLVertexArrayObject(QOpenGLVertexArrayObjectPrivate &dd)
+    : QObject(dd)
+{
+}
+
+/*!
+    Destroys the QOpenGLVertexArrayObject and the underlying OpenGL resource.
+*/
+QOpenGLVertexArrayObject::~QOpenGLVertexArrayObject()
+{
+    destroy();
+}
+
+/*!
+    Creates the underlying OpenGL vertex array object. There must be a valid OpenGL context
+    that supports vertex array objects current for this function to succeed.
+
+    Returns \c true if the OpenGL vertex array object was successfully created.
+
+    When the return value is \c false, vertex array object support is not available. This
+    is not an error: on systems with OpenGL 2.x or OpenGL ES 2.0 vertex array objects may
+    not be supported. The application is free to continue execution in this case, but it
+    then has to be prepared to operate in a VAO-less manner too. This means that instead
+    of merely calling bind(), the value of isCreated() must be checked and the vertex
+    arrays has to be initialized in the traditional way when there is no vertex array
+    object present.
+
+    \sa isCreated()
+*/
+bool QOpenGLVertexArrayObject::create()
+{
+    Q_D(QOpenGLVertexArrayObject);
+    return d->create();
+}
+
+/*!
+    Destroys the underlying OpenGL vertex array object. There must be a valid OpenGL context
+    that supports vertex array objects current for this function to succeed.
+*/
+void QOpenGLVertexArrayObject::destroy()
+{
+    Q_D(QOpenGLVertexArrayObject);
+    d->destroy();
+}
+
+/*!
+    Returns \c true is the underlying OpenGL vertex array object has been created. If this
+    returns \c true and the associated OpenGL context is current, then you are able to bind()
+    this object.
+*/
+bool QOpenGLVertexArrayObject::isCreated() const
+{
+    Q_D(const QOpenGLVertexArrayObject);
+    return (d->vao != 0);
+}
+
+/*!
+    Returns the id of the underlying OpenGL vertex array object.
+*/
+GLuint QOpenGLVertexArrayObject::objectId() const
+{
+    Q_D(const QOpenGLVertexArrayObject);
+    return d->vao;
+}
+
+/*!
+    Binds this vertex array object to the OpenGL binding point. From this point on
+    and until release() is called or another vertex array object is bound, any
+    modifications made to vertex data state are stored inside this vertex array object.
+
+    If another vertex array object is then bound you can later restore the set of
+    state associated with this object by calling bind() on this object once again.
+    This allows efficient changes between vertex data states in rendering functions.
+*/
+void QOpenGLVertexArrayObject::bind()
+{
+    Q_D(QOpenGLVertexArrayObject);
+    d->bind();
+}
+
+/*!
+    Unbinds this vertex array object by binding the default vertex array object (id = 0).
+*/
+void QOpenGLVertexArrayObject::release()
+{
+    Q_D(QOpenGLVertexArrayObject);
+    d->release();
+}
+
+
+/*!
+    \class QOpenGLVertexArrayObject::Binder
+    \brief The QOpenGLVertexArrayObject::Binder class is a convenience class to help
+    with the binding and releasing of OpenGL Vertex Array Objects.
+    \inmodule QtOpenGL
+    \reentrant
+    \since 5.1
+    \ingroup painting-3D
+
+    QOpenGLVertexArrayObject::Binder is a simple convenience class that can be used
+    to assist with the binding and releasing of QOpenGLVertexArrayObject instances.
+    This class is to QOpenGLVertexArrayObject as QMutexLocker is to QMutex.
+
+    This class implements the RAII principle which helps to ensure behavior in
+    complex code or in the presence of exceptions.
+
+    The constructor of this class accepts a QOpenGLVertexArrayObject (VAO) as an
+    argument and attempts to bind the VAO, calling QOpenGLVertexArrayObject::create()
+    if necessary. The destructor of this class calls QOpenGLVertexArrayObject::release()
+    which unbinds the VAO.
+
+    If needed the VAO can be temporarily unbound with the release() function and bound
+    once more with rebind().
+
+    \sa QOpenGLVertexArrayObject
+*/
+
+/*!
+    \fn QOpenGLVertexArrayObject::Binder::Binder(QOpenGLVertexArrayObject *v)
+
+    Creates a QOpenGLVertexArrayObject::Binder object and binds \a v by calling
+    QOpenGLVertexArrayObject::bind(). If necessary it first calls
+    QOpenGLVertexArrayObject::create().
+*/
+
+/*!
+    \fn QOpenGLVertexArrayObject::Binder::~Binder()
+
+    Destroys the QOpenGLVertexArrayObject::Binder and releases the associated vertex array object.
+*/
+
+/*!
+    \fn QOpenGLVertexArrayObject::Binder::release()
+
+    Can be used to temporarily release the associated vertex array object.
+
+    \sa rebind()
+*/
+
+/*!
+    \fn QOpenGLVertexArrayObject::Binder::rebind()
+
+    Can be used to rebind the associated vertex array object.
+
+    \sa release()
+*/
+
+QT_END_NAMESPACE
+
+#include "moc_qopenglvertexarrayobject.cpp"
diff --git a/src/opengl/qopenglvertexarrayobject.h b/src/opengl/qopenglvertexarrayobject.h
new file mode 100644
index 0000000000..0675c844e9
--- /dev/null
+++ b/src/opengl/qopenglvertexarrayobject.h
@@ -0,0 +1,111 @@
+/****************************************************************************
+**
+** Copyright (C) 2014 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Sean Harmer <sean.harmer@kdab.com>
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtOpenGL module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QOPENGLVERTEXARRAYOBJECT_H
+#define QOPENGLVERTEXARRAYOBJECT_H
+
+#include <QtOpenGL/qtopenglglobal.h>
+
+#ifndef QT_NO_OPENGL
+
+#include <QtCore/QObject>
+#include <QtGui/qopengl.h>
+
+QT_BEGIN_NAMESPACE
+
+class QOpenGLVertexArrayObjectPrivate;
+
+class Q_OPENGL_EXPORT QOpenGLVertexArrayObject : public QObject
+{
+    Q_OBJECT
+
+public:
+    explicit QOpenGLVertexArrayObject(QObject* parent = nullptr);
+    ~QOpenGLVertexArrayObject();
+
+    bool create();
+    void destroy();
+    bool isCreated() const;
+    GLuint objectId() const;
+    void bind();
+    void release();
+
+    class Q_OPENGL_EXPORT Binder
+    {
+    public:
+        inline Binder(QOpenGLVertexArrayObject *v)
+            : vao(v)
+        {
+            Q_ASSERT(v);
+            if (vao->isCreated() || vao->create())
+                vao->bind();
+        }
+
+        inline ~Binder()
+        {
+            release();
+        }
+
+        inline void release()
+        {
+            vao->release();
+        }
+
+        inline void rebind()
+        {
+            vao->bind();
+        }
+
+    private:
+        Q_DISABLE_COPY(Binder)
+        QOpenGLVertexArrayObject *vao;
+    };
+
+private:
+    Q_DISABLE_COPY(QOpenGLVertexArrayObject)
+    Q_DECLARE_PRIVATE(QOpenGLVertexArrayObject)
+    Q_PRIVATE_SLOT(d_func(), void _q_contextAboutToBeDestroyed())
+    QOpenGLVertexArrayObject(QOpenGLVertexArrayObjectPrivate &dd);
+};
+
+QT_END_NAMESPACE
+
+#endif
+
+#endif // QOPENGLVERTEXARRAYOBJECT_H
diff --git a/src/opengl/qopenglvertexarrayobject_p.h b/src/opengl/qopenglvertexarrayobject_p.h
new file mode 100644
index 0000000000..0d0fca4d81
--- /dev/null
+++ b/src/opengl/qopenglvertexarrayobject_p.h
@@ -0,0 +1,121 @@
+/****************************************************************************
+**
+** Copyright (C) 2014 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Sean Harmer <sean.harmer@kdab.com>
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtOpenGL module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QOPENGLVERTEXARRAYOBJECT_P_H
+#define QOPENGLVERTEXARRAYOBJECT_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists for the convenience
+// of the Qt OpenGL classes.  This header file may change from
+// version to version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <QtOpenGL/qtopenglglobal.h>
+
+#include <QtGui/qopengl.h>
+
+QT_BEGIN_NAMESPACE
+
+class QOpenGLVertexArrayObjectHelper;
+class QOpenGLContext;
+
+void Q_OPENGL_EXPORT qtInitializeVertexArrayObjectHelper(QOpenGLVertexArrayObjectHelper *helper, QOpenGLContext *context);
+
+class QOpenGLVertexArrayObjectHelper
+{
+    Q_DISABLE_COPY(QOpenGLVertexArrayObjectHelper)
+
+public:
+    explicit inline QOpenGLVertexArrayObjectHelper(QOpenGLContext *context)
+        : GenVertexArrays(nullptr)
+        , DeleteVertexArrays(nullptr)
+        , BindVertexArray(nullptr)
+        , IsVertexArray(nullptr)
+    {
+        qtInitializeVertexArrayObjectHelper(this, context);
+    }
+
+    inline bool isValid() const
+    {
+        return GenVertexArrays && DeleteVertexArrays && BindVertexArray && IsVertexArray;
+    }
+
+    inline void glGenVertexArrays(GLsizei n, GLuint *arrays) const
+    {
+        GenVertexArrays(n, arrays);
+    }
+
+    inline void glDeleteVertexArrays(GLsizei n, const GLuint *arrays) const
+    {
+        DeleteVertexArrays(n, arrays);
+    }
+
+    inline void glBindVertexArray(GLuint array) const
+    {
+        BindVertexArray(array);
+    }
+
+    inline GLboolean glIsVertexArray(GLuint array) const
+    {
+        return IsVertexArray(array);
+    }
+
+private:
+    friend void Q_OPENGL_EXPORT qtInitializeVertexArrayObjectHelper(QOpenGLVertexArrayObjectHelper *helper, QOpenGLContext *context);
+
+    // Function signatures are equivalent between desktop core, ARB, APPLE, ES 3 and ES 2 extensions
+    typedef void (QOPENGLF_APIENTRYP qt_GenVertexArrays_t)(GLsizei n, GLuint *arrays);
+    typedef void (QOPENGLF_APIENTRYP qt_DeleteVertexArrays_t)(GLsizei n, const GLuint *arrays);
+    typedef void (QOPENGLF_APIENTRYP qt_BindVertexArray_t)(GLuint array);
+    typedef GLboolean (QOPENGLF_APIENTRYP qt_IsVertexArray_t)(GLuint array);
+
+    qt_GenVertexArrays_t GenVertexArrays;
+    qt_DeleteVertexArrays_t DeleteVertexArrays;
+    qt_BindVertexArray_t BindVertexArray;
+    qt_IsVertexArray_t IsVertexArray;
+};
+
+QT_END_NAMESPACE
+
+#endif // QOPENGLVERTEXARRAYOBJECT_P_H
diff --git a/src/opengl/qopenglwindow.cpp b/src/opengl/qopenglwindow.cpp
new file mode 100644
index 0000000000..d000dced94
--- /dev/null
+++ b/src/opengl/qopenglwindow.cpp
@@ -0,0 +1,698 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtOpenGL module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qopenglwindow.h"
+#include <QtGui/QOpenGLFunctions>
+#include <QtGui/private/qpaintdevicewindow_p.h>
+#include <QtGui/private/qopenglextensions_p.h>
+#include <QtGui/private/qopenglcontext_p.h>
+#include <QtGui/QMatrix4x4>
+#include <QtGui/QOffscreenSurface>
+
+#include <QtOpenGL/private/qopenglframebufferobject_p.h>
+#include <QtOpenGL/QOpenGLFramebufferObject>
+#include <QtOpenGL/QOpenGLTextureBlitter>
+#include <QtOpenGL/QOpenGLPaintDevice>
+
+QT_BEGIN_NAMESPACE
+
+/*!
+  \class QOpenGLWindow
+  \inmodule QtOpenGL
+  \since 5.4
+  \brief The QOpenGLWindow class is a convenience subclass of QWindow to perform OpenGL painting.
+
+  QOpenGLWindow is an enhanced QWindow that allows easily creating windows that
+  perform OpenGL rendering using an API that is compatible with QOpenGLWidget
+  Unlike QOpenGLWidget, QOpenGLWindow has no dependency on the widgets module
+  and offers better performance.
+
+  A typical application will subclass QOpenGLWindow and reimplement the following
+  virtual functions:
+
+  \list
+
+  \li initializeGL() to perform OpenGL resource initialization
+
+  \li resizeGL() to set up the transformation matrices and other window size dependent resources
+
+  \li paintGL() to issue OpenGL commands or draw using QPainter
+
+  \endlist
+
+  To schedule a repaint, call the update() function. Note that this will not
+  immediately result in a call to paintGL(). Calling update() multiple times in
+  a row will not change the behavior in any way.
+
+  This is a slot so it can be connected to a \l QTimer::timeout() signal to
+  perform animation. Note however that in the modern OpenGL world it is a much
+  better choice to rely on synchronization to the vertical refresh rate of the
+  display. See \l{QSurfaceFormat::setSwapInterval()}{setSwapInterval()} on a
+  description of the swap interval. With a swap interval of \c 1, which is the
+  case on most systems by default, the
+  \l{QOpenGLContext::swapBuffers()}{swapBuffers()} call, that is executed
+  internally by QOpenGLWindow after each repaint, will block and wait for
+  vsync. This means that whenever the swap is done, an update can be scheduled
+  again by calling update(), without relying on timers.
+
+  To request a specific configuration for the context, use setFormat()
+  like for any other QWindow. This allows, among others, requesting a
+  given OpenGL version and profile, or enabling depth and stencil
+  buffers.
+
+  Unlike QWindow, QOpenGLWindow allows opening a painter on itself and perform
+  QPainter-based drawing.
+
+  QOpenGLWindow supports multiple update behaviors. The default,
+  \c NoPartialUpdate is equivalent to a regular, OpenGL-based QWindow. In
+  contrast, \c PartialUpdateBlit and \c PartialUpdateBlend are
+  more in line with QOpenGLWidget's way of working, where there is always an
+  extra, dedicated framebuffer object present. These modes allow, by
+  sacrificing some performance, redrawing only a smaller area on each paint and
+  having the rest of the content preserved from of the previous frame. This is
+  useful for applications than render incrementally using QPainter, because
+  this way they do not have to redraw the entire window content on each
+  paintGL() call.
+
+  Similarly to QOpenGLWidget, QOpenGLWindow supports the Qt::AA_ShareOpenGLContexts
+  attribute. When enabled, the OpenGL contexts of all QOpenGLWindow instances will share
+  with each other. This allows accessing each other's shareable OpenGL resources.
+
+  For more information on graphics in Qt, see \l {Graphics}.
+ */
+
+/*!
+  \enum QOpenGLWindow::UpdateBehavior
+
+  This enum describes the update strategy of the QOpenGLWindow.
+
+  \value NoPartialUpdate Indicates that the entire window surface will
+  redrawn on each update and so no additional framebuffers are needed.
+  This is the setting used in most cases and is equivalent to how drawing
+  directly via QWindow would function.
+
+  \value PartialUpdateBlit Indicates that the drawing performed in paintGL()
+  does not cover the entire window. In this case an extra framebuffer object
+  is created under the hood, and rendering performed in paintGL() will target
+  this framebuffer. This framebuffer is then blitted onto the window surface's
+  default framebuffer after each paint. This allows having QPainter-based drawing
+  code in paintGL() which only repaints a smaller area at a time, because, unlike
+  NoPartialUpdate, the previous content is preserved.
+
+  \value PartialUpdateBlend Similar to PartialUpdateBlit, but instead of using
+  framebuffer blits, the contents of the extra framebuffer is rendered by
+  drawing a textured quad with blending enabled. This, unlike PartialUpdateBlit,
+  allows alpha blended content and works even when the glBlitFramebuffer is
+  not available. Performance-wise this setting is likely to be somewhat slower
+  than PartialUpdateBlit.
+ */
+
+/*!
+    \fn void QOpenGLWindow::frameSwapped()
+
+    This signal is emitted after the potentially blocking
+    \l{QOpenGLContext::swapBuffers()}{buffer swap} has been done. Applications
+    that wish to continuously repaint synchronized to the vertical refresh,
+    should issue an update() upon this signal. This allows for a much smoother
+    experience compared to the traditional usage of timers.
+*/
+
+// GLES2 builds won't have these constants with the suffixless names
+#ifndef GL_READ_FRAMEBUFFER
+#define GL_READ_FRAMEBUFFER 0x8CA8
+#endif
+#ifndef GL_DRAW_FRAMEBUFFER
+#define GL_DRAW_FRAMEBUFFER 0x8CA9
+#endif
+
+class QOpenGLWindowPaintDevice : public QOpenGLPaintDevice
+{
+public:
+    QOpenGLWindowPaintDevice(QOpenGLWindow *window) : m_window(window) { }
+    void ensureActiveTarget() override;
+
+    QOpenGLWindow *m_window;
+};
+
+class QOpenGLWindowPrivate : public QPaintDeviceWindowPrivate
+{
+    Q_DECLARE_PUBLIC(QOpenGLWindow)
+public:
+    QOpenGLWindowPrivate(QOpenGLContext *shareContext, QOpenGLWindow::UpdateBehavior updateBehavior)
+        : updateBehavior(updateBehavior)
+        , hasFboBlit(false)
+        , shareContext(shareContext)
+    {
+        if (!shareContext)
+            this->shareContext = qt_gl_global_share_context();
+    }
+
+    ~QOpenGLWindowPrivate();
+
+    static QOpenGLWindowPrivate *get(QOpenGLWindow *w) { return w->d_func(); }
+
+    void bindFBO();
+    void initialize();
+
+    void beginPaint(const QRegion &region) override;
+    void endPaint() override;
+    void flush(const QRegion &region) override;
+
+    QOpenGLWindow::UpdateBehavior updateBehavior;
+    bool hasFboBlit;
+    QScopedPointer<QOpenGLContext> context;
+    QOpenGLContext *shareContext;
+    QScopedPointer<QOpenGLFramebufferObject> fbo;
+    QScopedPointer<QOpenGLWindowPaintDevice> paintDevice;
+    QOpenGLTextureBlitter blitter;
+    QColor backgroundColor;
+    QScopedPointer<QOffscreenSurface> offscreenSurface;
+};
+
+QOpenGLWindowPrivate::~QOpenGLWindowPrivate()
+{
+    Q_Q(QOpenGLWindow);
+    if (q->isValid()) {
+        q->makeCurrent(); // this works even when the platformwindow is destroyed
+        paintDevice.reset(nullptr);
+        fbo.reset(nullptr);
+        blitter.destroy();
+        q->doneCurrent();
+    }
+}
+
+void QOpenGLWindowPrivate::initialize()
+{
+    Q_Q(QOpenGLWindow);
+
+    if (context)
+        return;
+
+    if (!q->handle())
+        qWarning("Attempted to initialize QOpenGLWindow without a platform window");
+
+    context.reset(new QOpenGLContext);
+    context->setShareContext(shareContext);
+    context->setFormat(q->requestedFormat());
+    if (!context->create())
+        qWarning("QOpenGLWindow::beginPaint: Failed to create context");
+    if (!context->makeCurrent(q))
+        qWarning("QOpenGLWindow::beginPaint: Failed to make context current");
+
+    paintDevice.reset(new QOpenGLWindowPaintDevice(q));
+    if (updateBehavior == QOpenGLWindow::PartialUpdateBlit)
+        hasFboBlit = QOpenGLFramebufferObject::hasOpenGLFramebufferBlit();
+
+    q->initializeGL();
+}
+
+void QOpenGLWindowPrivate::beginPaint(const QRegion &region)
+{
+    Q_UNUSED(region);
+    Q_Q(QOpenGLWindow);
+
+    initialize();
+    context->makeCurrent(q);
+
+    const int deviceWidth = q->width() * q->devicePixelRatio();
+    const int deviceHeight = q->height() * q->devicePixelRatio();
+    const QSize deviceSize(deviceWidth, deviceHeight);
+    if (updateBehavior > QOpenGLWindow::NoPartialUpdate) {
+        if (!fbo || fbo->size() != deviceSize) {
+            QOpenGLFramebufferObjectFormat fboFormat;
+            fboFormat.setAttachment(QOpenGLFramebufferObject::CombinedDepthStencil);
+            const int samples = q->requestedFormat().samples();
+            if (samples > 0) {
+                if (updateBehavior != QOpenGLWindow::PartialUpdateBlend)
+                    fboFormat.setSamples(samples);
+                else
+                    qWarning("QOpenGLWindow: PartialUpdateBlend does not support multisampling");
+            }
+            fbo.reset(new QOpenGLFramebufferObject(deviceSize, fboFormat));
+            markWindowAsDirty();
+        }
+    } else {
+        markWindowAsDirty();
+    }
+
+    paintDevice->setSize(QSize(deviceWidth, deviceHeight));
+    paintDevice->setDevicePixelRatio(q->devicePixelRatio());
+    context->functions()->glViewport(0, 0, deviceWidth, deviceHeight);
+
+    context->functions()->glBindFramebuffer(GL_FRAMEBUFFER, context->defaultFramebufferObject());
+
+    q->paintUnderGL();
+
+    if (updateBehavior > QOpenGLWindow::NoPartialUpdate)
+        fbo->bind();
+}
+
+void QOpenGLWindowPrivate::endPaint()
+{
+    Q_Q(QOpenGLWindow);
+
+    if (updateBehavior > QOpenGLWindow::NoPartialUpdate)
+        fbo->release();
+
+    context->functions()->glBindFramebuffer(GL_FRAMEBUFFER, context->defaultFramebufferObject());
+
+    if (updateBehavior == QOpenGLWindow::PartialUpdateBlit && hasFboBlit) {
+        const int deviceWidth = q->width() * q->devicePixelRatio();
+        const int deviceHeight = q->height() * q->devicePixelRatio();
+        QOpenGLExtensions extensions(context.data());
+        extensions.glBindFramebuffer(GL_READ_FRAMEBUFFER, fbo->handle());
+        extensions.glBindFramebuffer(GL_DRAW_FRAMEBUFFER, context->defaultFramebufferObject());
+        extensions.glBlitFramebuffer(0, 0, deviceWidth, deviceHeight,
+                                     0, 0, deviceWidth, deviceHeight,
+                                     GL_COLOR_BUFFER_BIT, GL_NEAREST);
+    } else if (updateBehavior > QOpenGLWindow::NoPartialUpdate) {
+        if (updateBehavior == QOpenGLWindow::PartialUpdateBlend) {
+            context->functions()->glEnable(GL_BLEND);
+            context->functions()->glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+        }
+        if (!blitter.isCreated())
+            blitter.create();
+
+        QRect windowRect(QPoint(0, 0), fbo->size());
+        QMatrix4x4 target = QOpenGLTextureBlitter::targetTransform(windowRect, windowRect);
+        blitter.bind();
+        blitter.blit(fbo->texture(), target, QOpenGLTextureBlitter::OriginBottomLeft);
+        blitter.release();
+
+        if (updateBehavior == QOpenGLWindow::PartialUpdateBlend)
+            context->functions()->glDisable(GL_BLEND);
+    }
+
+    q->paintOverGL();
+}
+
+void QOpenGLWindowPrivate::bindFBO()
+{
+    if (updateBehavior > QOpenGLWindow::NoPartialUpdate)
+        fbo->bind();
+    else
+        QOpenGLFramebufferObject::bindDefault();
+}
+
+void QOpenGLWindowPrivate::flush(const QRegion &region)
+{
+    Q_UNUSED(region);
+    Q_Q(QOpenGLWindow);
+    context->swapBuffers(q);
+    emit q->frameSwapped();
+}
+
+void QOpenGLWindowPaintDevice::ensureActiveTarget()
+{
+    QOpenGLWindowPrivate::get(m_window)->bindFBO();
+}
+
+/*!
+  Constructs a new QOpenGLWindow with the given \a parent and \a updateBehavior.
+
+  \sa QOpenGLWindow::UpdateBehavior
+ */
+QOpenGLWindow::QOpenGLWindow(QOpenGLWindow::UpdateBehavior updateBehavior, QWindow *parent)
+    : QPaintDeviceWindow(*(new QOpenGLWindowPrivate(nullptr, updateBehavior)), parent)
+{
+    setSurfaceType(QSurface::OpenGLSurface);
+}
+
+/*!
+  Constructs a new QOpenGLWindow with the given \a parent and \a updateBehavior. The QOpenGLWindow's context will share with \a shareContext.
+
+  \sa QOpenGLWindow::UpdateBehavior shareContext
+*/
+QOpenGLWindow::QOpenGLWindow(QOpenGLContext *shareContext, UpdateBehavior updateBehavior, QWindow *parent)
+    : QPaintDeviceWindow(*(new QOpenGLWindowPrivate(shareContext, updateBehavior)), parent)
+{
+    setSurfaceType(QSurface::OpenGLSurface);
+}
+
+/*!
+  Destroys the QOpenGLWindow instance, freeing its resources.
+
+  The OpenGLWindow's context is made current in the destructor, allowing for
+  safe destruction of any child object that may need to release OpenGL
+  resources belonging to the context provided by this window.
+
+  \warning if you have objects wrapping OpenGL resources (such as
+  QOpenGLBuffer, QOpenGLShaderProgram, etc.) as members of a QOpenGLWindow
+  subclass, you may need to add a call to makeCurrent() in that subclass'
+  destructor as well. Due to the rules of C++ object destruction, those objects
+  will be destroyed \e{before} calling this function (but after that the
+  destructor of the subclass has run), therefore making the OpenGL context
+  current in this function happens too late for their safe disposal.
+
+  \sa makeCurrent
+
+  \since 5.5
+*/
+QOpenGLWindow::~QOpenGLWindow()
+{
+    makeCurrent();
+}
+
+/*!
+  \return the update behavior for this QOpenGLWindow.
+*/
+QOpenGLWindow::UpdateBehavior QOpenGLWindow::updateBehavior() const
+{
+    Q_D(const QOpenGLWindow);
+    return d->updateBehavior;
+}
+
+/*!
+  \return \c true if the window's OpenGL resources, like the context, have
+  been successfully initialized. Note that the return value is always \c false
+  until the window becomes exposed (shown).
+*/
+bool QOpenGLWindow::isValid() const
+{
+    Q_D(const QOpenGLWindow);
+    return d->context && d->context->isValid();
+}
+
+/*!
+  Prepares for rendering OpenGL content for this window by making the
+  corresponding context current and binding the framebuffer object, if there is
+  one, in that context context.
+
+  It is not necessary to call this function in most cases, because it is called
+  automatically before invoking paintGL(). It is provided nonetheless to support
+  advanced, multi-threaded scenarios where a thread different than the GUI or main
+  thread may want to update the surface or framebuffer contents. See QOpenGLContext
+  for more information on threading related issues.
+
+  This function is suitable for calling also when the underlying platform window
+  is already destroyed. This means that it is safe to call this function from
+  a QOpenGLWindow subclass' destructor. If there is no native window anymore,
+  an offscreen surface is used instead. This ensures that OpenGL resource
+  cleanup operations in the destructor will always work, as long as
+  this function is called first.
+
+  \sa QOpenGLContext, context(), paintGL(), doneCurrent()
+ */
+void QOpenGLWindow::makeCurrent()
+{
+    Q_D(QOpenGLWindow);
+
+    if (!isValid())
+        return;
+
+    // The platform window may be destroyed at this stage and therefore
+    // makeCurrent() may not safely be called with 'this'.
+    if (handle()) {
+        d->context->makeCurrent(this);
+    } else {
+        if (!d->offscreenSurface) {
+            d->offscreenSurface.reset(new QOffscreenSurface(screen()));
+            d->offscreenSurface->setFormat(d->context->format());
+            d->offscreenSurface->create();
+        }
+        d->context->makeCurrent(d->offscreenSurface.data());
+    }
+
+    d->bindFBO();
+}
+
+/*!
+  Releases the context.
+
+  It is not necessary to call this function in most cases, since the widget
+  will make sure the context is bound and released properly when invoking
+  paintGL().
+
+  \sa makeCurrent()
+ */
+void QOpenGLWindow::doneCurrent()
+{
+    Q_D(QOpenGLWindow);
+
+    if (!isValid())
+        return;
+
+    d->context->doneCurrent();
+}
+
+/*!
+  \return The QOpenGLContext used by this window or \c 0 if not yet initialized.
+ */
+QOpenGLContext *QOpenGLWindow::context() const
+{
+    Q_D(const QOpenGLWindow);
+    return d->context.data();
+}
+
+/*!
+  \return The QOpenGLContext requested to be shared with this window's QOpenGLContext.
+*/
+QOpenGLContext *QOpenGLWindow::shareContext() const
+{
+    Q_D(const QOpenGLWindow);
+    return d->shareContext;
+}
+
+/*!
+  The framebuffer object handle used by this window.
+
+  When the update behavior is set to \c NoPartialUpdate, there is no separate
+  framebuffer object. In this case the returned value is the ID of the
+  default framebuffer.
+
+  Otherwise the value of the ID of the framebuffer object or \c 0 if not
+  yet initialized.
+ */
+GLuint QOpenGLWindow::defaultFramebufferObject() const
+{
+    Q_D(const QOpenGLWindow);
+    if (d->updateBehavior > NoPartialUpdate && d->fbo)
+        return d->fbo->handle();
+    else if (QOpenGLContext *ctx = QOpenGLContext::currentContext())
+        return ctx->defaultFramebufferObject();
+    else
+        return 0;
+}
+
+/*!
+  Returns a copy of the framebuffer.
+
+  \note This is a potentially expensive operation because it relies on
+  glReadPixels() to read back the pixels. This may be slow and can stall the
+  GPU pipeline.
+
+  \note When used together with update behavior \c NoPartialUpdate, the returned
+  image may not contain the desired content when called after the front and back
+  buffers have been swapped (unless preserved swap is enabled in the underlying
+  windowing system interface). In this mode the function reads from the back
+  buffer and the contents of that may not match the content on the screen (the
+  front buffer). In this case the only place where this function can safely be
+  used is paintGL() or paintOverGL().
+ */
+QImage QOpenGLWindow::grabFramebuffer()
+{
+    if (!isValid())
+        return QImage();
+
+    makeCurrent();
+
+    const bool hasAlpha = format().hasAlpha();
+    QImage img = qt_gl_read_framebuffer(size() * devicePixelRatio(), hasAlpha, hasAlpha);
+    img.setDevicePixelRatio(devicePixelRatio());
+    return img;
+}
+
+/*!
+  This virtual function is called once before the first call to paintGL() or
+  resizeGL(). Reimplement it in a subclass.
+
+  This function should set up any required OpenGL resources and state.
+
+  There is no need to call makeCurrent() because this has already been done
+  when this function is called. Note however that the framebuffer, in case
+  partial update mode is used, is not yet available at this stage, so avoid
+  issuing draw calls from here. Defer such calls to paintGL() instead.
+
+  \sa paintGL(), resizeGL()
+ */
+void QOpenGLWindow::initializeGL()
+{
+}
+
+/*!
+  This virtual function is called whenever the widget has been resized.
+  Reimplement it in a subclass. The new size is passed in \a w and \a h.
+
+  \note This is merely a convenience function in order to provide an API that is
+  compatible with QOpenGLWidget. Unlike with QOpenGLWidget, derived classes are
+  free to choose to override resizeEvent() instead of this function.
+
+  \note Avoid issuing OpenGL commands from this function as there may not be a
+  context current when it is invoked. If it cannot be avoided, call makeCurrent().
+
+  \note Scheduling updates from here is not necessary. The windowing systems
+  will send expose events that trigger an update automatically.
+
+  \sa initializeGL(), paintGL()
+ */
+void QOpenGLWindow::resizeGL(int w, int h)
+{
+    Q_UNUSED(w);
+    Q_UNUSED(h);
+}
+
+/*!
+  This virtual function is called whenever the window contents needs to be
+  painted. Reimplement it in a subclass.
+
+  There is no need to call makeCurrent() because this has already
+  been done when this function is called.
+
+  Before invoking this function, the context and the framebuffer, if there is
+  one, are bound, and the viewport is set up by a call to glViewport(). No
+  other state is set and no clearing or drawing is performed by the framework.
+
+  \note When using a partial update behavior, like \c PartialUpdateBlend, the
+  output of the previous paintGL() call is preserved and, after the additional
+  drawing perfomed in the current invocation of the function, the content is
+  blitted or blended over the content drawn directly to the window in
+  paintUnderGL().
+
+  \sa initializeGL(), resizeGL(), paintUnderGL(), paintOverGL(), UpdateBehavior
+ */
+void QOpenGLWindow::paintGL()
+{
+}
+
+/*!
+  The virtual function is called before each invocation of paintGL().
+
+  When the update mode is set to \c NoPartialUpdate, there is no difference
+  between this function and paintGL(), performing rendering in either of them
+  leads to the same result.
+
+  The difference becomes significant when using \c PartialUpdateBlend, where an
+  extra framebuffer object is used. There, paintGL() targets this additional
+  framebuffer object, which preserves its contents, while paintUnderGL() and
+  paintOverGL() target the default framebuffer, i.e. directly the window
+  surface, the contents of which is lost after each displayed frame.
+
+  \note Avoid relying on this function when the update behavior is
+  \c PartialUpdateBlit. This mode involves blitting the extra framebuffer used by
+  paintGL() onto the default framebuffer after each invocation of paintGL(),
+  thus overwriting all drawing generated in this function.
+
+  \sa paintGL(), paintOverGL(), UpdateBehavior
+ */
+void QOpenGLWindow::paintUnderGL()
+{
+}
+
+/*!
+  This virtual function is called after each invocation of paintGL().
+
+  When the update mode is set to NoPartialUpdate, there is no difference
+  between this function and paintGL(), performing rendering in either of them
+  leads to the same result.
+
+  Like paintUnderGL(), rendering in this function targets the default
+  framebuffer of the window, regardless of the update behavior. It gets called
+  after paintGL() has returned and the blit (PartialUpdateBlit) or quad drawing
+  (PartialUpdateBlend) has been done.
+
+  \sa paintGL(), paintUnderGL(), UpdateBehavior
+ */
+void QOpenGLWindow::paintOverGL()
+{
+}
+
+/*!
+  Paint \a event handler. Calls paintGL().
+
+  \sa paintGL()
+ */
+void QOpenGLWindow::paintEvent(QPaintEvent *event)
+{
+    Q_UNUSED(event);
+    paintGL();
+}
+
+/*!
+  Resize \a event handler. Calls resizeGL().
+
+  \sa resizeGL()
+ */
+void QOpenGLWindow::resizeEvent(QResizeEvent *event)
+{
+    Q_UNUSED(event);
+    Q_D(QOpenGLWindow);
+    d->initialize();
+    resizeGL(width(), height());
+}
+
+/*!
+  \internal
+ */
+int QOpenGLWindow::metric(PaintDeviceMetric metric) const
+{
+    Q_D(const QOpenGLWindow);
+
+    switch (metric) {
+        case PdmDepth:
+            if (d->paintDevice)
+                return d->paintDevice->depth();
+            break;
+        default:
+            break;
+    }
+    return QPaintDeviceWindow::metric(metric);
+}
+
+/*!
+  \internal
+ */
+QPaintDevice *QOpenGLWindow::redirected(QPoint *) const
+{
+    Q_D(const QOpenGLWindow);
+    if (QOpenGLContext::currentContext() == d->context.data())
+        return d->paintDevice.data();
+    return nullptr;
+}
+
+QT_END_NAMESPACE
diff --git a/src/opengl/qopenglwindow.h b/src/opengl/qopenglwindow.h
new file mode 100644
index 0000000000..926e4fabfd
--- /dev/null
+++ b/src/opengl/qopenglwindow.h
@@ -0,0 +1,107 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtOpenGL module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QOPENGLWINDOW_H
+#define QOPENGLWINDOW_H
+
+#include <QtOpenGL/qtopenglglobal.h>
+
+#ifndef QT_NO_OPENGL
+
+#include <QtGui/QPaintDeviceWindow>
+#include <QtGui/QOpenGLContext>
+#include <QtGui/QImage>
+
+QT_BEGIN_NAMESPACE
+
+class QOpenGLWindowPrivate;
+
+class Q_OPENGL_EXPORT QOpenGLWindow : public QPaintDeviceWindow
+{
+    Q_OBJECT
+    Q_DECLARE_PRIVATE(QOpenGLWindow)
+
+public:
+    enum UpdateBehavior {
+        NoPartialUpdate,
+        PartialUpdateBlit,
+        PartialUpdateBlend
+    };
+
+    explicit QOpenGLWindow(UpdateBehavior updateBehavior = NoPartialUpdate, QWindow *parent = nullptr);
+    explicit QOpenGLWindow(QOpenGLContext *shareContext, UpdateBehavior updateBehavior = NoPartialUpdate, QWindow *parent = nullptr);
+    ~QOpenGLWindow();
+
+    UpdateBehavior updateBehavior() const;
+    bool isValid() const;
+
+    void makeCurrent();
+    void doneCurrent();
+
+    QOpenGLContext *context() const;
+    QOpenGLContext *shareContext() const;
+
+    GLuint defaultFramebufferObject() const;
+
+    QImage grabFramebuffer();
+
+Q_SIGNALS:
+    void frameSwapped();
+
+protected:
+    virtual void initializeGL();
+    virtual void resizeGL(int w, int h);
+    virtual void paintGL();
+    virtual void paintUnderGL();
+    virtual void paintOverGL();
+
+    void paintEvent(QPaintEvent *event) override;
+    void resizeEvent(QResizeEvent *event) override;
+    int metric(PaintDeviceMetric metric) const override;
+    QPaintDevice *redirected(QPoint *) const override;
+
+private:
+    Q_DISABLE_COPY(QOpenGLWindow)
+};
+
+QT_END_NAMESPACE
+
+#endif // QT_NO_OPENGL
+
+#endif
diff --git a/src/openglextensions/CMakeLists.txt b/src/openglextensions/CMakeLists.txt
new file mode 100644
index 0000000000..d2fc027398
--- /dev/null
+++ b/src/openglextensions/CMakeLists.txt
@@ -0,0 +1,20 @@
+# Generated from openglextensions.pro.
+
+#####################################################################
+## OpenGLExtensions Module:
+#####################################################################
+
+qt_add_module(OpenGLExtensions
+    STATIC
+    SOURCES
+        qopenglextensions.cpp qopenglextensions.h
+    DEFINES
+        QT_NO_CAST_FROM_ASCII
+        QT_NO_FOREACH
+    PUBLIC_LIBRARIES
+        Qt::Core
+        Qt::Gui
+)
+
+## Scopes:
+#####################################################################
diff --git a/src/openglwidgets/CMakeLists.txt b/src/openglwidgets/CMakeLists.txt
new file mode 100644
index 0000000000..d58944e596
--- /dev/null
+++ b/src/openglwidgets/CMakeLists.txt
@@ -0,0 +1,19 @@
+# Generated from openglwidgets.pro.
+
+#####################################################################
+## OpenGLWidgets Module:
+#####################################################################
+
+qt_add_module(OpenGLWidgets
+    SOURCES
+        qopenglwidget.cpp qopenglwidget.h
+    DEFINES
+        QT_NO_FOREACH
+        QT_NO_USING_NAMESPACE
+    LIBRARIES
+        Qt::OpenGLPrivate
+        Qt::WidgetsPrivate
+    PUBLIC_LIBRARIES
+        Qt::OpenGL
+        Qt::Widgets
+)
diff --git a/src/openglwidgets/openglwidgets.pro b/src/openglwidgets/openglwidgets.pro
new file mode 100644
index 0000000000..a058b77ea7
--- /dev/null
+++ b/src/openglwidgets/openglwidgets.pro
@@ -0,0 +1,13 @@
+TARGET = QtOpenGLWidgets
+QT = opengl widgets
+QT_PRIVATE += opengl-private widgets-private
+
+DEFINES += QT_NO_USING_NAMESPACE QT_NO_FOREACH
+
+HEADERS += \
+    qopenglwidget.h
+
+SOURCES += \
+    qopenglwidget.cpp
+
+load(qt_module)
diff --git a/src/openglwidgets/qopenglwidget.cpp b/src/openglwidgets/qopenglwidget.cpp
new file mode 100644
index 0000000000..1fefa09203
--- /dev/null
+++ b/src/openglwidgets/qopenglwidget.cpp
@@ -0,0 +1,1416 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtOpenGLWidgets module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qopenglwidget.h"
+#include <QtGui/QOpenGLContext>
+#include <QtGui/QOffscreenSurface>
+#include <QtGui/QOpenGLFunctions>
+#include <QtGui/QWindow>
+#include <QtGui/QGuiApplication>
+#include <QtGui/QScreen>
+#include <QtGui/qpa/qplatformwindow.h>
+#include <QtGui/qpa/qplatformintegration.h>
+#include <QtOpenGL/QOpenGLFramebufferObject>
+#include <QtOpenGL/QOpenGLPaintDevice>
+
+#include <QtGui/private/qguiapplication_p.h>
+#include <QtGui/private/qopenglextensions_p.h>
+#include <QtGui/private/qfont_p.h>
+#include <QtGui/private/qopenglcontext_p.h>
+#include <QtOpenGL/private/qopenglframebufferobject_p.h>
+#include <QtOpenGL/private/qopenglpaintdevice_p.h>
+
+#include <QtWidgets/private/qwidget_p.h>
+
+QT_BEGIN_NAMESPACE
+
+/*!
+  \class QOpenGLWidget
+  \inmodule QtOpenGLWidgets
+  \since 5.4
+
+  \brief The QOpenGLWidget class is a widget for rendering OpenGL graphics.
+
+  QOpenGLWidget provides functionality for displaying OpenGL graphics
+  integrated into a Qt application. It is very simple to use: Make
+  your class inherit from it and use the subclass like any other
+  QWidget, except that you have the choice between using QPainter and
+  standard OpenGL rendering commands.
+
+  QOpenGLWidget provides three convenient virtual functions that you
+  can reimplement in your subclass to perform the typical OpenGL
+  tasks:
+
+  \list
+  \li paintGL() - Renders the OpenGL scene. Gets called whenever the widget
+  needs to be updated.
+  \li resizeGL() - Sets up the OpenGL viewport, projection, etc. Gets
+  called whenever the widget has been resized (and also when it
+  is shown for the first time because all newly created widgets get a
+  resize event automatically).
+  \li initializeGL() - Sets up the OpenGL resources and state. Gets called
+  once before the first time resizeGL() or paintGL() is called.
+  \endlist
+
+  If you need to trigger a repaint from places other than paintGL() (a
+  typical example is when using \l{QTimer}{timers} to animate scenes),
+  you should call the widget's update() function to schedule an update.
+
+  Your widget's OpenGL rendering context is made current when
+  paintGL(), resizeGL(), or initializeGL() is called. If you need to
+  call the standard OpenGL API functions from other places (e.g. in
+  your widget's constructor or in your own paint functions), you
+  must call makeCurrent() first.
+
+  All rendering happens into an OpenGL framebuffer
+  object. makeCurrent() ensure that it is bound in the context. Keep
+  this in mind when creating and binding additional framebuffer
+  objects in the rendering code in paintGL(). Never re-bind the
+  framebuffer with ID 0. Instead, call defaultFramebufferObject() to
+  get the ID that should be bound.
+
+  QOpenGLWidget allows using different OpenGL versions and profiles
+  when the platform supports it. Just set the requested format via
+  setFormat(). Keep in mind however that having multiple QOpenGLWidget
+  instances in the same window requires that they all use the same
+  format, or at least formats that do not make the contexts
+  non-sharable. To overcome this issue, prefer using
+  QSurfaceFormat::setDefaultFormat() instead of setFormat().
+
+  \note Calling QSurfaceFormat::setDefaultFormat() before constructing
+  the QApplication instance is mandatory on some platforms (for example,
+  \macos) when an OpenGL core profile context is requested. This is to
+  ensure that resource sharing between contexts stays functional as all
+  internal contexts are created using the correct version and profile.
+
+  \section1 Painting Techniques
+
+  As described above, subclass QOpenGLWidget to render pure 3D content in the
+  following way:
+
+  \list
+
+  \li Reimplement the initializeGL() and resizeGL() functions to
+  set up the OpenGL state and provide a perspective transformation.
+
+  \li Reimplement paintGL() to paint the 3D scene, calling only
+  OpenGL functions.
+
+  \endlist
+
+  It is also possible to draw 2D graphics onto a QOpenGLWidget subclass using QPainter:
+
+  \list
+
+  \li In paintGL(), instead of issuing OpenGL commands, construct a QPainter
+      object for use on the widget.
+
+  \li Draw primitives using QPainter's member functions.
+
+  \li Direct OpenGL commands can still be issued. However, you must make sure
+  these are enclosed by a call to the painter's beginNativePainting() and
+  endNativePainting().
+
+  \endlist
+
+  When performing drawing using QPainter only, it is also possible to perform
+  the painting like it is done for ordinary widgets: by reimplementing paintEvent().
+
+  \list
+
+  \li Reimplement the paintEvent() function.
+
+  \li Construct a QPainter object targeting the widget. Either pass the widget to the
+  constructor or the QPainter::begin() function.
+
+  \li Draw primitives using QPainter's member functions.
+
+  \li Painting finishes then the QPainter instance is destroyed. Alternatively,
+  call QPainter::end() explicitly.
+
+  \endlist
+
+  \section1 OpenGL Function Calls, Headers and QOpenGLFunctions
+
+  When making OpenGL function calls, it is strongly recommended to avoid calling
+  the functions directly. Instead, prefer using QOpenGLFunctions (when making
+  portable applications) or the versioned variants (for example,
+  QOpenGLFunctions_3_2_Core and similar, when targeting modern, desktop-only
+  OpenGL). This way the application will work correctly in all Qt build
+  configurations, including the ones that perform dynamic OpenGL implementation
+  loading which means applications are not directly linking to an GL
+  implementation and thus direct function calls are not feasible.
+
+  In paintGL() the current context is always accessible by caling
+  QOpenGLContext::currentContext(). From this context an already initialized,
+  ready-to-be-used QOpenGLFunctions instance is retrievable by calling
+  QOpenGLContext::functions(). An alternative to prefixing every GL call is to
+  inherit from QOpenGLFunctions and call
+  QOpenGLFunctions::initializeOpenGLFunctions() in initializeGL().
+
+  As for the OpenGL headers, note that in most cases there will be no need to
+  directly include any headers like GL.h. The OpenGL-related Qt headers will
+  include qopengl.h which will in turn include an appropriate header for the
+  system. This might be an OpenGL ES 3.x or 2.0 header, the highest version that
+  is available, or a system-provided gl.h. In addition, a copy of the extension
+  headers (called glext.h on some systems) is provided as part of Qt both for
+  OpenGL and OpenGL ES. These will get included automatically on platforms where
+  feasible. This means that constants and function pointer typedefs from ARB,
+  EXT, OES extensions are automatically available.
+
+  \section1 Code Examples
+
+  To get started, the simplest QOpenGLWidget subclass could like like the following:
+
+  \snippet code/doc_gui_widgets_qopenglwidget.cpp 0
+
+  Alternatively, the prefixing of each and every OpenGL call can be avoided by deriving
+  from QOpenGLFunctions instead:
+
+  \snippet code/doc_gui_widgets_qopenglwidget.cpp 1
+
+  To get a context compatible with a given OpenGL version or profile, or to
+  request depth and stencil buffers, call setFormat():
+
+  \snippet code/doc_gui_widgets_qopenglwidget.cpp 2
+
+  With OpenGL 3.0+ contexts, when portability is not important, the versioned
+  QOpenGLFunctions variants give easy access to all the modern OpenGL functions
+  available in a given version:
+
+  \snippet code/doc_gui_widgets_qopenglwidget.cpp 3
+
+  As described above, it is simpler and more robust to set the requested format
+  globally so that it applies to all windows and contexts during the lifetime of
+  the application. Below is an example of this:
+
+  \snippet code/doc_gui_widgets_qopenglwidget.cpp 6
+
+  \section1 Multisampling
+
+  To enable multisampling, set the number of requested samples on the
+  QSurfaceFormat that is passed to setFormat(). On systems that do not support
+  it the request may get ignored.
+
+  Multisampling support requires support for multisampled renderbuffers and
+  framebuffer blits. On OpenGL ES 2.0 implementations it is likely that these
+  will not be present. This means that multisampling will not be available. With
+  modern OpenGL versions and OpenGL ES 3.0 and up this is usually not a problem
+  anymore.
+
+  \section1 Threading
+
+  Performing offscreen rendering on worker threads, for example to generate
+  textures that are then used in the GUI/main thread in paintGL(), are supported
+  by exposing the widget's QOpenGLContext so that additional contexts sharing
+  with it can be created on each thread.
+
+  Drawing directly to the QOpenGLWidget's framebuffer outside the GUI/main
+  thread is possible by reimplementing paintEvent() to do nothing. The context's
+  thread affinity has to be changed via QObject::moveToThread(). After that,
+  makeCurrent() and doneCurrent() are usable on the worker thread. Be careful to
+  move the context back to the GUI/main thread afterwards.
+
+  Triggering a buffer swap just for the QOpenGLWidget is not possible since there
+  is no real, onscreen native surface for it. It is up to the widget stack to
+  manage composition and buffer swaps on the gui thread. When a thread is done
+  updating the framebuffer, call update() \b{on the GUI/main thread} to
+  schedule composition.
+
+  Extra care has to be taken to avoid using the framebuffer when the GUI/main
+  thread is performing compositing. The signals aboutToCompose() and
+  frameSwapped() will be emitted when the composition is starting and
+  ending. They are emitted on the GUI/main thread. This means that by using a
+  direct connection aboutToCompose() can block the GUI/main thread until the
+  worker thread has finished its rendering. After that, the worker thread must
+  perform no further rendering until the frameSwapped() signal is emitted. If
+  this is not acceptable, the worker thread has to implement a double buffering
+  mechanism. This involves drawing using an alternative render target, that is
+  fully controlled by the thread, e.g. an additional framebuffer object, and
+  blitting to the QOpenGLWidget's framebuffer at a suitable time.
+
+  \section1 Context Sharing
+
+  When multiple QOpenGLWidgets are added as children to the same top-level
+  widget, their contexts will share with each other. This does not apply for
+  QOpenGLWidget instances that belong to different windows.
+
+  This means that all QOpenGLWidgets in the same window can access each other's
+  sharable resources, like textures, and there is no need for an extra "global
+  share" context.
+
+  To set up sharing between QOpenGLWidget instances belonging to different
+  windows, set the Qt::AA_ShareOpenGLContexts application attribute before
+  instantiating QApplication. This will trigger sharing between all
+  QOpenGLWidget instances without any further steps.
+
+  Creating extra QOpenGLContext instances that share resources like textures
+  with the QOpenGLWidget's context is also possible. Simply pass the pointer
+  returned from context() to QOpenGLContext::setShareContext() before calling
+  QOpenGLContext::create(). The resulting context can also be used on a
+  different thread, allowing threaded generation of textures and asynchronous
+  texture uploads.
+
+  Note that QOpenGLWidget expects a standard conformant implementation of
+  resource sharing when it comes to the underlying graphics drivers. For
+  example, some drivers, in particular for mobile and embedded hardware, have
+  issues with setting up sharing between an existing context and others that are
+  created later. Some other drivers may behave in unexpected ways when trying to
+  utilize shared resources between different threads.
+
+  \section1 Resource Initialization and Cleanup
+
+  The QOpenGLWidget's associated OpenGL context is guaranteed to be current
+  whenever initializeGL() and paintGL() are invoked. Do not attempt to create
+  OpenGL resources before initializeGL() is called. For example, attempting to
+  compile shaders, initialize vertex buffer objects or upload texture data will
+  fail when done in a subclass's constructor. These operations must be deferred
+  to initializeGL(). Some of Qt's OpenGL helper classes, like QOpenGLBuffer or
+  QOpenGLVertexArrayObject, have a matching deferred behavior: they can be
+  instantiated without a context, but all initialization is deferred until a
+  create(), or similar, call. This means that they can be used as normal
+  (non-pointer) member variables in a QOpenGLWidget subclass, but the create()
+  or similar function can only be called from initializeGL(). Be aware however
+  that not all classes are designed like this. When in doubt, make the member
+  variable a pointer and create and destroy the instance dynamically in
+  initializeGL() and the destructor, respectively.
+
+  Releasing the resources also needs the context to be current. Therefore
+  destructors that perform such cleanup are expected to call makeCurrent()
+  before moving on to destroy any OpenGL resources or wrappers. Avoid deferred
+  deletion via \l{QObject::deleteLater()}{deleteLater()} or the parenting
+  mechanism of QObject. There is no guarantee the correct context will be
+  current at the time the instance in question is really destroyed.
+
+  A typical subclass will therefore often look like the following when it comes
+  to resource initialization and destruction:
+
+  \snippet code/doc_gui_widgets_qopenglwidget.cpp 4
+
+  This is naturally not the only possible solution. One alternative is to use
+  the \l{QOpenGLContext::aboutToBeDestroyed()}{aboutToBeDestroyed()} signal of
+  QOpenGLContext. By connecting a slot, using direct connection, to this signal,
+  it is possible to perform cleanup whenever the underlying native context
+  handle, or the entire QOpenGLContext instance, is going to be released. The
+  following snippet is in principle equivalent to the previous one:
+
+  \snippet code/doc_gui_widgets_qopenglwidget.cpp 5
+
+  \note For widgets that change their associated top-level window multiple times
+  during their lifetime, a combined approach is essential. Whenever the widget
+  or a parent of it gets reparented so that the top-level window becomes
+  different, the widget's associated context is destroyed and a new one is
+  created. This is then followed by a call to initializeGL() where all OpenGL
+  resources must get reinitialized. Due to this the only option to perform
+  proper cleanup is to connect to the context's aboutToBeDestroyed()
+  signal. Note that the context in question may not be the current one when the
+  signal gets emitted. Therefore it is good practice to call makeCurrent() in
+  the connected slot. Additionally, the same cleanup steps must be performed
+  from the derived class' destructor, since the slot connected to the signal
+  will not get invoked when the widget is being destroyed.
+
+  \note When Qt::AA_ShareOpenGLContexts is set, the widget's context never
+  changes, not even when reparenting because the widget's associated texture is
+  guaranteed to be accessible also from the new top-level's context.
+
+  Proper cleanup is especially important due to context sharing. Even though
+  each QOpenGLWidget's associated context is destroyed together with the
+  QOpenGLWidget, the sharable resources in that context, like textures, will
+  stay valid until the top-level window, in which the QOpenGLWidget lived, is
+  destroyed. Additionally, settings like Qt::AA_ShareOpenGLContexts and some Qt
+  modules may trigger an even wider scope for sharing contexts, potentially
+  leading to keeping the resources in question alive for the entire lifetime of
+  the application. Therefore the safest and most robust is always to perform
+  explicit cleanup for all resources and resource wrappers used in the
+  QOpenGLWidget.
+
+  \section1 Limitations
+
+  Putting other widgets underneath and making the QOpenGLWidget transparent will
+  not lead to the expected results: The widgets underneath will not be
+  visible. This is because in practice the QOpenGLWidget is drawn before all
+  other regular, non-OpenGL widgets, and so see-through type of solutions are
+  not feasible. Other type of layouts, like having widgets on top of the
+  QOpenGLWidget, will function as expected.
+
+  When absolutely necessary, this limitation can be overcome by setting the
+  Qt::WA_AlwaysStackOnTop attribute on the QOpenGLWidget. Be aware however that
+  this breaks stacking order, for example it will not be possible to have other
+  widgets on top of the QOpenGLWidget, so it should only be used in situations
+  where a semi-transparent QOpenGLWidget with other widgets visible underneath
+  is required.
+
+  Note that this does not apply when there are no other widgets underneath and
+  the intention is to have a semi-transparent window. In that case the
+  traditional approach of setting Qt::WA_TranslucentBackground
+  on the top-level window is sufficient. Note that if the transparent areas are
+  only desired in the QOpenGLWidget, then Qt::WA_NoSystemBackground will need
+  to be turned back to \c false after enabling Qt::WA_TranslucentBackground.
+  Additionally, requesting an alpha channel for the QOpenGLWidget's context via
+  setFormat() may be necessary too, depending on the system.
+
+  QOpenGLWidget supports multiple update behaviors, just like QOpenGLWindow. In
+  preserved mode the rendered content from the previous paintGL() call is
+  available in the next one, allowing incremental rendering. In non-preserved
+  mode the content is lost and paintGL() implementations are expected to redraw
+  everything in the view.
+
+  Before Qt 5.5 the default behavior of QOpenGLWidget was to preserve the
+  rendered contents between paintGL() calls. Since Qt 5.5 the default behavior
+  is non-preserved because this provides better performance and the majority of
+  applications have no need for the previous content. This also resembles the
+  semantics of an OpenGL-based QWindow and matches the default behavior of
+  QOpenGLWindow in that the color and ancillary buffers are invalidated for
+  each frame. To restore the preserved behavior, call setUpdateBehavior() with
+  \c PartialUpdate.
+
+  \section1 Alternatives
+
+  Adding a QOpenGLWidget into a window turns on OpenGL-based
+  compositing for the entire window.  In some special cases this may
+  not be ideal, and the old QGLWidget-style behavior with a separate,
+  native child window is desired. Desktop applications that understand
+  the limitations of this approach (for example when it comes to
+  overlaps, transparency, scroll views and MDI areas), can use
+  QOpenGLWindow with QWidget::createWindowContainer(). This is a
+  modern alternative to QGLWidget and is faster than QOpenGLWidget due
+  to the lack of the additional composition step. It is strongly
+  recommended to limit the usage of this approach to cases where there
+  is no other choice. Note that this option is not suitable for most
+  embedded and mobile platforms, and it is known to have issues on
+  certain desktop platforms (e.g. \macos) too. The stable,
+  cross-platform solution is always QOpenGLWidget.
+
+  \e{OpenGL is a trademark of Silicon Graphics, Inc. in the United States and other
+  countries.}
+
+  \sa QOpenGLFunctions, QOpenGLWindow, Qt::AA_ShareOpenGLContexts, UpdateBehavior
+*/
+
+/*!
+    \fn void QOpenGLWidget::aboutToCompose()
+
+    This signal is emitted when the widget's top-level window is about to begin
+    composing the textures of its QOpenGLWidget children and the other widgets.
+*/
+
+/*!
+    \fn void QOpenGLWidget::frameSwapped()
+
+    This signal is emitted after the widget's top-level window has finished
+    composition and returned from its potentially blocking
+    QOpenGLContext::swapBuffers() call.
+*/
+
+/*!
+    \fn void QOpenGLWidget::aboutToResize()
+
+    This signal is emitted when the widget's size is changed and therefore the
+    framebuffer object is going to be recreated.
+*/
+
+/*!
+    \fn void QOpenGLWidget::resized()
+
+    This signal is emitted right after the framebuffer object has been recreated
+    due to resizing the widget.
+*/
+
+/*!
+    \enum QOpenGLWidget::UpdateBehavior
+    \since 5.5
+
+    This enum describes the update semantics of QOpenGLWidget.
+
+    \value NoPartialUpdate QOpenGLWidget will discard the
+    contents of the color buffer and the ancillary buffers after the
+    QOpenGLWidget is rendered to screen. This is the same behavior that can be
+    expected by calling QOpenGLContext::swapBuffers with a default opengl
+    enabled QWindow as the argument. NoPartialUpdate can have some performance
+    benefits on certain hardware architectures common in the mobile and
+    embedded space when a framebuffer object is used as the rendering target.
+    The framebuffer object is invalidated between frames with
+    glDiscardFramebufferEXT if supported or a glClear. Please see the
+    documentation of EXT_discard_framebuffer for more information:
+    https://www.khronos.org/registry/gles/extensions/EXT/EXT_discard_framebuffer.txt
+
+    \value PartialUpdate The framebuffer objects color buffer and ancillary
+    buffers are not invalidated between frames.
+
+    \sa updateBehavior(), setUpdateBehavior()
+*/
+
+class QOpenGLWidgetPaintDevicePrivate : public QOpenGLPaintDevicePrivate
+{
+public:
+    QOpenGLWidgetPaintDevicePrivate(QOpenGLWidget *widget)
+        : QOpenGLPaintDevicePrivate(QSize()),
+          w(widget) { }
+
+    void beginPaint() override;
+    void endPaint() override;
+
+    QOpenGLWidget *w;
+};
+
+class QOpenGLWidgetPaintDevice : public QOpenGLPaintDevice
+{
+public:
+    QOpenGLWidgetPaintDevice(QOpenGLWidget *widget)
+        : QOpenGLPaintDevice(*new QOpenGLWidgetPaintDevicePrivate(widget)) { }
+    void ensureActiveTarget() override;
+};
+
+class QOpenGLWidgetPrivate : public QWidgetPrivate
+{
+    Q_DECLARE_PUBLIC(QOpenGLWidget)
+public:
+    QOpenGLWidgetPrivate()
+        : context(nullptr),
+          fbo(nullptr),
+          resolvedFbo(nullptr),
+          surface(nullptr),
+          initialized(false),
+          fakeHidden(false),
+          inBackingStorePaint(false),
+          hasBeenComposed(false),
+          flushPending(false),
+          paintDevice(nullptr),
+          updateBehavior(QOpenGLWidget::NoPartialUpdate),
+          requestedSamples(0),
+          inPaintGL(false),
+          textureFormat(0)
+    {
+        requestedFormat = QSurfaceFormat::defaultFormat();
+    }
+
+    void reset();
+    void recreateFbo();
+
+    GLuint textureId() const override;
+    QPlatformTextureList::Flags textureListFlags() override;
+
+    void initialize();
+    void invokeUserPaint();
+    void render();
+
+    void invalidateFbo();
+
+    QImage grabFramebuffer() override;
+    void beginBackingStorePainting() override { inBackingStorePaint = true; }
+    void endBackingStorePainting() override { inBackingStorePaint = false; }
+    void beginCompose() override;
+    void endCompose() override;
+    void initializeViewportFramebuffer() override;
+    void resizeViewportFramebuffer() override;
+    void resolveSamples() override;
+
+    QOpenGLContext *context;
+    QOpenGLFramebufferObject *fbo;
+    QOpenGLFramebufferObject *resolvedFbo;
+    QOffscreenSurface *surface;
+    bool initialized;
+    bool fakeHidden;
+    bool inBackingStorePaint;
+    bool hasBeenComposed;
+    bool flushPending;
+    QOpenGLPaintDevice *paintDevice;
+    QSurfaceFormat requestedFormat;
+    QOpenGLWidget::UpdateBehavior updateBehavior;
+    int requestedSamples;
+    bool inPaintGL;
+    GLenum textureFormat;
+};
+
+void QOpenGLWidgetPaintDevicePrivate::beginPaint()
+{
+    // NB! autoFillBackground is and must be false by default. Otherwise we would clear on
+    // every QPainter begin() which is not desirable. This is only for legacy use cases,
+    // like using QOpenGLWidget as the viewport of a graphics view, that expect clearing
+    // with the palette's background color.
+    if (w->autoFillBackground()) {
+        QOpenGLFunctions *f = QOpenGLContext::currentContext()->functions();
+        if (w->format().hasAlpha()) {
+            f->glClearColor(0, 0, 0, 0);
+        } else {
+            QColor c = w->palette().brush(w->backgroundRole()).color();
+            float alpha = c.alphaF();
+            f->glClearColor(c.redF() * alpha, c.greenF() * alpha, c.blueF() * alpha, alpha);
+        }
+        f->glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
+    }
+}
+
+void QOpenGLWidgetPaintDevicePrivate::endPaint()
+{
+    QOpenGLWidgetPrivate *wd = static_cast<QOpenGLWidgetPrivate *>(QWidgetPrivate::get(w));
+    if (!wd->initialized)
+        return;
+
+    if (!wd->inPaintGL)
+        QOpenGLContextPrivate::get(wd->context)->defaultFboRedirect = 0;
+}
+
+void QOpenGLWidgetPaintDevice::ensureActiveTarget()
+{
+    QOpenGLWidgetPaintDevicePrivate *d = static_cast<QOpenGLWidgetPaintDevicePrivate *>(d_ptr.data());
+    QOpenGLWidgetPrivate *wd = static_cast<QOpenGLWidgetPrivate *>(QWidgetPrivate::get(d->w));
+    if (!wd->initialized)
+        return;
+
+    if (QOpenGLContext::currentContext() != wd->context)
+        d->w->makeCurrent();
+    else
+        wd->fbo->bind();
+
+    if (!wd->inPaintGL)
+        QOpenGLContextPrivate::get(wd->context)->defaultFboRedirect = wd->fbo->handle();
+
+    // When used as a viewport, drawing is done via opening a QPainter on the widget
+    // without going through paintEvent(). We will have to make sure a glFlush() is done
+    // before the texture is accessed also in this case.
+    wd->flushPending = true;
+}
+
+GLuint QOpenGLWidgetPrivate::textureId() const
+{
+    return resolvedFbo ? resolvedFbo->texture() : (fbo ? fbo->texture() : 0);
+}
+
+#ifndef GL_SRGB
+#define GL_SRGB 0x8C40
+#endif
+#ifndef GL_SRGB8
+#define GL_SRGB8 0x8C41
+#endif
+#ifndef GL_SRGB_ALPHA
+#define GL_SRGB_ALPHA 0x8C42
+#endif
+#ifndef GL_SRGB8_ALPHA8
+#define GL_SRGB8_ALPHA8 0x8C43
+#endif
+
+QPlatformTextureList::Flags QOpenGLWidgetPrivate::textureListFlags()
+{
+    QPlatformTextureList::Flags flags = QWidgetPrivate::textureListFlags();
+    switch (textureFormat) {
+    case GL_SRGB:
+    case GL_SRGB8:
+    case GL_SRGB_ALPHA:
+    case GL_SRGB8_ALPHA8:
+        flags |= QPlatformTextureList::TextureIsSrgb;
+        break;
+    default:
+        break;
+    }
+    return flags;
+}
+
+void QOpenGLWidgetPrivate::reset()
+{
+    Q_Q(QOpenGLWidget);
+
+    // Destroy the OpenGL resources first. These need the context to be current.
+    if (initialized)
+        q->makeCurrent();
+
+    delete paintDevice;
+    paintDevice = nullptr;
+    delete fbo;
+    fbo = nullptr;
+    delete resolvedFbo;
+    resolvedFbo = nullptr;
+
+    if (initialized)
+        q->doneCurrent();
+
+    // Delete the context first, then the surface. Slots connected to
+    // the context's aboutToBeDestroyed() may still call makeCurrent()
+    // to perform some cleanup.
+    delete context;
+    context = nullptr;
+    delete surface;
+    surface = nullptr;
+    initialized = fakeHidden = inBackingStorePaint = false;
+}
+
+void QOpenGLWidgetPrivate::recreateFbo()
+{
+    Q_Q(QOpenGLWidget);
+
+    emit q->aboutToResize();
+
+    context->makeCurrent(surface);
+
+    delete fbo;
+    fbo = nullptr;
+    delete resolvedFbo;
+    resolvedFbo = nullptr;
+
+    int samples = requestedSamples;
+    QOpenGLExtensions *extfuncs = static_cast<QOpenGLExtensions *>(context->functions());
+    if (!extfuncs->hasOpenGLExtension(QOpenGLExtensions::FramebufferMultisample))
+        samples = 0;
+
+    QOpenGLFramebufferObjectFormat format;
+    format.setAttachment(QOpenGLFramebufferObject::CombinedDepthStencil);
+    format.setSamples(samples);
+    if (textureFormat)
+        format.setInternalTextureFormat(textureFormat);
+
+    const QSize deviceSize = q->size() * q->devicePixelRatioF();
+    fbo = new QOpenGLFramebufferObject(deviceSize, format);
+    if (samples > 0)
+        resolvedFbo = new QOpenGLFramebufferObject(deviceSize);
+
+    textureFormat = fbo->format().internalTextureFormat();
+
+    fbo->bind();
+    context->functions()->glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
+    flushPending = true; // Make sure the FBO is initialized before use
+
+    paintDevice->setSize(deviceSize);
+    paintDevice->setDevicePixelRatio(q->devicePixelRatioF());
+
+    emit q->resized();
+}
+
+void QOpenGLWidgetPrivate::beginCompose()
+{
+    Q_Q(QOpenGLWidget);
+    if (flushPending) {
+        flushPending = false;
+        q->makeCurrent();
+        static_cast<QOpenGLExtensions *>(context->functions())->flushShared();
+    }
+    hasBeenComposed = true;
+    emit q->aboutToCompose();
+}
+
+void QOpenGLWidgetPrivate::endCompose()
+{
+    Q_Q(QOpenGLWidget);
+    emit q->frameSwapped();
+}
+
+void QOpenGLWidgetPrivate::initialize()
+{
+    Q_Q(QOpenGLWidget);
+    if (initialized)
+        return;
+
+    // If no global shared context get our toplevel's context with which we
+    // will share in order to make the texture usable by the underlying window's backingstore.
+    QWidget *tlw = q->window();
+    QOpenGLContext *shareContext = qt_gl_global_share_context();
+    if (!shareContext)
+        shareContext = get(tlw)->shareContext();
+    // If shareContext is null, showing content on-screen will not work.
+    // However, offscreen rendering and grabFramebuffer() will stay fully functional.
+
+    // Do not include the sample count. Requesting a multisampled context is not necessary
+    // since we render into an FBO, never to an actual surface. What's more, attempting to
+    // create a pbuffer with a multisampled config crashes certain implementations. Just
+    // avoid the entire hassle, the result is the same.
+    requestedSamples = requestedFormat.samples();
+    requestedFormat.setSamples(0);
+
+    QScopedPointer<QOpenGLContext> ctx(new QOpenGLContext);
+    ctx->setFormat(requestedFormat);
+    if (shareContext) {
+        ctx->setShareContext(shareContext);
+        ctx->setScreen(shareContext->screen());
+    }
+    if (Q_UNLIKELY(!ctx->create())) {
+        qWarning("QOpenGLWidget: Failed to create context");
+        return;
+    }
+
+    // Propagate settings that make sense only for the tlw. Note that this only
+    // makes sense for properties that get picked up even after the native
+    // window is created.
+    if (tlw->windowHandle()) {
+        QSurfaceFormat tlwFormat = tlw->windowHandle()->format();
+        if (requestedFormat.swapInterval() != tlwFormat.swapInterval()) {
+            // Most platforms will pick up the changed swap interval on the next
+            // makeCurrent or swapBuffers.
+            tlwFormat.setSwapInterval(requestedFormat.swapInterval());
+            tlw->windowHandle()->setFormat(tlwFormat);
+        }
+        if (requestedFormat.swapBehavior() != tlwFormat.swapBehavior()) {
+            tlwFormat.setSwapBehavior(requestedFormat.swapBehavior());
+            tlw->windowHandle()->setFormat(tlwFormat);
+        }
+    }
+
+    // The top-level window's surface is not good enough since it causes way too
+    // much trouble with regards to the QSurfaceFormat for example. So just like
+    // in QQuickWidget, use a dedicated QOffscreenSurface.
+    surface = new QOffscreenSurface;
+    surface->setFormat(ctx->format());
+    surface->setScreen(ctx->screen());
+    surface->create();
+
+    if (Q_UNLIKELY(!ctx->makeCurrent(surface))) {
+        qWarning("QOpenGLWidget: Failed to make context current");
+        return;
+    }
+
+    paintDevice = new QOpenGLWidgetPaintDevice(q);
+    paintDevice->setSize(q->size() * q->devicePixelRatioF());
+    paintDevice->setDevicePixelRatio(q->devicePixelRatioF());
+
+    context = ctx.take();
+    initialized = true;
+
+    q->initializeGL();
+}
+
+void QOpenGLWidgetPrivate::resolveSamples()
+{
+    Q_Q(QOpenGLWidget);
+    if (resolvedFbo) {
+        q->makeCurrent();
+        QRect rect(QPoint(0, 0), fbo->size());
+        QOpenGLFramebufferObject::blitFramebuffer(resolvedFbo, rect, fbo, rect);
+        flushPending = true;
+    }
+}
+
+void QOpenGLWidgetPrivate::invokeUserPaint()
+{
+    Q_Q(QOpenGLWidget);
+
+    QOpenGLContext *ctx = QOpenGLContext::currentContext();
+    Q_ASSERT(ctx && fbo);
+
+    QOpenGLFunctions *f = ctx->functions();
+    QOpenGLContextPrivate::get(ctx)->defaultFboRedirect = fbo->handle();
+
+    f->glViewport(0, 0, q->width() * q->devicePixelRatioF(), q->height() * q->devicePixelRatioF());
+    inPaintGL = true;
+    q->paintGL();
+    inPaintGL = false;
+    flushPending = true;
+
+    QOpenGLContextPrivate::get(ctx)->defaultFboRedirect = 0;
+}
+
+void QOpenGLWidgetPrivate::render()
+{
+    Q_Q(QOpenGLWidget);
+
+    if (fakeHidden || !initialized)
+        return;
+
+    q->makeCurrent();
+
+    if (updateBehavior == QOpenGLWidget::NoPartialUpdate && hasBeenComposed) {
+        invalidateFbo();
+        hasBeenComposed = false;
+    }
+
+    invokeUserPaint();
+}
+
+void QOpenGLWidgetPrivate::invalidateFbo()
+{
+    QOpenGLExtensions *f = static_cast<QOpenGLExtensions *>(QOpenGLContext::currentContext()->functions());
+    if (f->hasOpenGLExtension(QOpenGLExtensions::DiscardFramebuffer)) {
+        const int gl_color_attachment0 = 0x8CE0;  // GL_COLOR_ATTACHMENT0
+        const int gl_depth_attachment = 0x8D00;   // GL_DEPTH_ATTACHMENT
+        const int gl_stencil_attachment = 0x8D20; // GL_STENCIL_ATTACHMENT
+#ifdef Q_OS_WASM
+        // webgl does not allow separate depth and stencil attachments
+        // QTBUG-69913
+        const int gl_depth_stencil_attachment = 0x821A; // GL_DEPTH_STENCIL_ATTACHMENT
+
+        const GLenum attachments[] = {
+            gl_color_attachment0, gl_depth_attachment, gl_stencil_attachment, gl_depth_stencil_attachment
+        };
+#else
+        const GLenum attachments[] = {
+            gl_color_attachment0, gl_depth_attachment, gl_stencil_attachment
+        };
+#endif
+        f->glDiscardFramebufferEXT(GL_FRAMEBUFFER, sizeof attachments / sizeof *attachments, attachments);
+    } else {
+        f->glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
+    }
+}
+
+QImage QOpenGLWidgetPrivate::grabFramebuffer()
+{
+    Q_Q(QOpenGLWidget);
+
+    initialize();
+    if (!initialized)
+        return QImage();
+
+    if (!fbo) // could be completely offscreen, without ever getting a resize event
+        recreateFbo();
+
+    if (!inPaintGL)
+        render();
+
+    if (resolvedFbo) {
+        resolveSamples();
+        resolvedFbo->bind();
+    } else {
+        q->makeCurrent();
+    }
+
+    const bool hasAlpha = q->format().hasAlpha();
+    QImage res = qt_gl_read_framebuffer(q->size() * q->devicePixelRatioF(), hasAlpha, hasAlpha);
+    res.setDevicePixelRatio(q->devicePixelRatioF());
+
+    // While we give no guarantees of what is going to be left bound, prefer the
+    // multisample fbo instead of the resolved one. Clients may continue to
+    // render straight after calling this function.
+    if (resolvedFbo)
+        q->makeCurrent();
+
+    return res;
+}
+
+void QOpenGLWidgetPrivate::initializeViewportFramebuffer()
+{
+    Q_Q(QOpenGLWidget);
+    // Legacy behavior for compatibility with QGLWidget when used as a graphics view
+    // viewport: enable clearing on each painter begin.
+    q->setAutoFillBackground(true);
+}
+
+void QOpenGLWidgetPrivate::resizeViewportFramebuffer()
+{
+    Q_Q(QOpenGLWidget);
+    if (!initialized)
+        return;
+
+    if (!fbo || q->size() * q->devicePixelRatioF() != fbo->size()) {
+        recreateFbo();
+        q->update();
+    }
+}
+
+/*!
+  Constructs a widget which is a child of \a parent, with widget flags set to \a f.
+ */
+QOpenGLWidget::QOpenGLWidget(QWidget *parent, Qt::WindowFlags f)
+    : QWidget(*(new QOpenGLWidgetPrivate), parent, f)
+{
+    Q_D(QOpenGLWidget);
+    if (Q_UNLIKELY(!QGuiApplicationPrivate::platformIntegration()->hasCapability(QPlatformIntegration::RasterGLSurface)))
+        qWarning("QOpenGLWidget is not supported on this platform.");
+    else
+        d->setRenderToTexture();
+}
+
+/*!
+  Destroys the QOpenGLWidget instance, freeing its resources.
+
+  The QOpenGLWidget's context is made current in the destructor, allowing for
+  safe destruction of any child object that may need to release OpenGL
+  resources belonging to the context provided by this widget.
+
+  \warning if you have objects wrapping OpenGL resources (such as
+  QOpenGLBuffer, QOpenGLShaderProgram, etc.) as members of a OpenGLWidget
+  subclass, you may need to add a call to makeCurrent() in that subclass'
+  destructor as well. Due to the rules of C++ object destruction, those objects
+  will be destroyed \e{before} calling this function (but after that the
+  destructor of the subclass has run), therefore making the OpenGL context
+  current in this function happens too late for their safe disposal.
+
+  \sa makeCurrent
+*/
+QOpenGLWidget::~QOpenGLWidget()
+{
+    Q_D(QOpenGLWidget);
+    d->reset();
+}
+
+/*!
+  Sets this widget's update behavior to \a updateBehavior.
+  \since 5.5
+*/
+void QOpenGLWidget::setUpdateBehavior(UpdateBehavior updateBehavior)
+{
+    Q_D(QOpenGLWidget);
+    d->updateBehavior = updateBehavior;
+}
+
+/*!
+  \return the update behavior of the widget.
+  \since 5.5
+*/
+QOpenGLWidget::UpdateBehavior QOpenGLWidget::updateBehavior() const
+{
+    Q_D(const QOpenGLWidget);
+    return d->updateBehavior;
+}
+
+/*!
+  Sets the requested surface \a format.
+
+  When the format is not explicitly set via this function, the format returned by
+  QSurfaceFormat::defaultFormat() will be used. This means that when having multiple
+  OpenGL widgets, individual calls to this function can be replaced by one single call to
+  QSurfaceFormat::setDefaultFormat() before creating the first widget.
+
+  \note Requesting an alpha buffer via this function will not lead to the
+  desired results when the intention is to make other widgets beneath visible.
+  Instead, use Qt::WA_AlwaysStackOnTop to enable semi-transparent QOpenGLWidget
+  instances with other widgets visible underneath. Keep in mind however that
+  this breaks the stacking order, so it will no longer be possible to have
+  other widgets on top of the QOpenGLWidget.
+
+  \sa format(), Qt::WA_AlwaysStackOnTop, QSurfaceFormat::setDefaultFormat()
+ */
+void QOpenGLWidget::setFormat(const QSurfaceFormat &format)
+{
+    Q_D(QOpenGLWidget);
+    if (Q_UNLIKELY(d->initialized)) {
+        qWarning("QOpenGLWidget: Already initialized, setting the format has no effect");
+        return;
+    }
+
+    d->requestedFormat = format;
+}
+
+/*!
+    Returns the context and surface format used by this widget and its toplevel
+    window.
+
+    After the widget and its toplevel have both been created, resized and shown,
+    this function will return the actual format of the context. This may differ
+    from the requested format if the request could not be fulfilled by the
+    platform. It is also possible to get larger color buffer sizes than
+    requested.
+
+    When the widget's window and the related OpenGL resources are not yet
+    initialized, the return value is the format that has been set via
+    setFormat().
+
+    \sa setFormat(), context()
+ */
+QSurfaceFormat QOpenGLWidget::format() const
+{
+    Q_D(const QOpenGLWidget);
+    return d->initialized ? d->context->format() : d->requestedFormat;
+}
+
+/*!
+    Sets a custom internal texture format of \a texFormat.
+
+    When working with sRGB framebuffers, it will be necessary to specify a
+    format like \c{GL_SRGB8_ALPHA8}. This can be achieved by calling this
+    function.
+
+    \note This function has no effect if called after the widget has already
+    been shown and thus it performed initialization.
+
+    \note This function will typically have to be used in combination with a
+    QSurfaceFormat::setDefaultFormat() call that sets the color space to
+    QSurfaceFormat::sRGBColorSpace.
+
+    \since 5.10
+ */
+void QOpenGLWidget::setTextureFormat(GLenum texFormat)
+{
+    Q_D(QOpenGLWidget);
+    if (Q_UNLIKELY(d->initialized)) {
+        qWarning("QOpenGLWidget: Already initialized, setting the internal texture format has no effect");
+        return;
+    }
+
+    d->textureFormat = texFormat;
+}
+
+/*!
+    \return the active internal texture format if the widget has already
+    initialized, the requested format if one was set but the widget has not yet
+    been made visible, or \nullptr if setTextureFormat() was not called and the
+    widget has not yet been made visible.
+
+    \since 5.10
+ */
+GLenum QOpenGLWidget::textureFormat() const
+{
+    Q_D(const QOpenGLWidget);
+    return d->textureFormat;
+}
+
+/*!
+  \return \e true if the widget and OpenGL resources, like the context, have
+  been successfully initialized. Note that the return value is always false
+  until the widget is shown.
+*/
+bool QOpenGLWidget::isValid() const
+{
+    Q_D(const QOpenGLWidget);
+    return d->initialized && d->context->isValid();
+}
+
+/*!
+  Prepares for rendering OpenGL content for this widget by making the
+  corresponding context current and binding the framebuffer object in that
+  context.
+
+  It is not necessary to call this function in most cases, because it
+  is called automatically before invoking paintGL().
+
+  \sa context(), paintGL(), doneCurrent()
+ */
+void QOpenGLWidget::makeCurrent()
+{
+    Q_D(QOpenGLWidget);
+    if (!d->initialized)
+        return;
+
+    d->context->makeCurrent(d->surface);
+
+    if (d->fbo) // there may not be one if we are in reset()
+        d->fbo->bind();
+}
+
+/*!
+  Releases the context.
+
+  It is not necessary to call this function in most cases, since the
+  widget will make sure the context is bound and released properly
+  when invoking paintGL().
+ */
+void QOpenGLWidget::doneCurrent()
+{
+    Q_D(QOpenGLWidget);
+    if (!d->initialized)
+        return;
+
+    d->context->doneCurrent();
+}
+
+/*!
+  \return The QOpenGLContext used by this widget or \c 0 if not yet initialized.
+
+  \note The context and the framebuffer object used by the widget changes when
+  reparenting the widget via setParent().
+
+  \sa QOpenGLContext::setShareContext(), defaultFramebufferObject()
+ */
+QOpenGLContext *QOpenGLWidget::context() const
+{
+    Q_D(const QOpenGLWidget);
+    return d->context;
+}
+
+/*!
+  \return The framebuffer object handle or \c 0 if not yet initialized.
+
+  \note The framebuffer object belongs to the context returned by context()
+  and may not be accessible from other contexts.
+
+  \note The context and the framebuffer object used by the widget changes when
+  reparenting the widget via setParent(). In addition, the framebuffer object
+  changes on each resize.
+
+  \sa context()
+ */
+GLuint QOpenGLWidget::defaultFramebufferObject() const
+{
+    Q_D(const QOpenGLWidget);
+    return d->fbo ? d->fbo->handle() : 0;
+}
+
+/*!
+  This virtual function is called once before the first call to
+  paintGL() or resizeGL(). Reimplement it in a subclass.
+
+  This function should set up any required OpenGL resources and state.
+
+  There is no need to call makeCurrent() because this has already been
+  done when this function is called. Note however that the framebuffer
+  is not yet available at this stage, so avoid issuing draw calls from
+  here. Defer such calls to paintGL() instead.
+
+  \sa paintGL(), resizeGL()
+*/
+void QOpenGLWidget::initializeGL()
+{
+}
+
+/*!
+  This virtual function is called whenever the widget has been
+  resized. Reimplement it in a subclass. The new size is passed in
+  \a w and \a h.
+
+  There is no need to call makeCurrent() because this has already been
+  done when this function is called. Additionally, the framebuffer is
+  also bound.
+
+  \sa initializeGL(), paintGL()
+*/
+void QOpenGLWidget::resizeGL(int w, int h)
+{
+    Q_UNUSED(w);
+    Q_UNUSED(h);
+}
+
+/*!
+  This virtual function is called whenever the widget needs to be
+  painted. Reimplement it in a subclass.
+
+  There is no need to call makeCurrent() because this has already
+  been done when this function is called.
+
+  Before invoking this function, the context and the framebuffer are
+  bound, and the viewport is set up by a call to glViewport(). No
+  other state is set and no clearing or drawing is performed by the
+  framework.
+
+  \sa initializeGL(), resizeGL()
+*/
+void QOpenGLWidget::paintGL()
+{
+}
+
+/*!
+  Handles resize events that are passed in the \a e event parameter.
+  Calls the virtual function resizeGL().
+
+  \note Avoid overriding this function in derived classes. If that is not
+  feasible, make sure that QOpenGLWidget's implementation is invoked
+  too. Otherwise the underlying framebuffer object and related resources will
+  not get resized properly and will lead to incorrect rendering.
+*/
+void QOpenGLWidget::resizeEvent(QResizeEvent *e)
+{
+    Q_D(QOpenGLWidget);
+
+    if (e->size().isEmpty()) {
+        d->fakeHidden = true;
+        return;
+    }
+    d->fakeHidden = false;
+
+    d->initialize();
+    if (!d->initialized)
+        return;
+
+    d->recreateFbo();
+    resizeGL(width(), height());
+    d->sendPaintEvent(QRect(QPoint(0, 0), size()));
+}
+
+/*!
+  Handles paint events.
+
+  Calling QWidget::update() will lead to sending a paint event \a e,
+  and thus invoking this function. (NB this is asynchronous and will
+  happen at some point after returning from update()). This function
+  will then, after some preparation, call the virtual paintGL() to
+  update the contents of the QOpenGLWidget's framebuffer. The widget's
+  top-level window will then composite the framebuffer's texture with
+  the rest of the window.
+*/
+void QOpenGLWidget::paintEvent(QPaintEvent *e)
+{
+    Q_UNUSED(e);
+    Q_D(QOpenGLWidget);
+    if (!d->initialized)
+        return;
+
+    if (updatesEnabled())
+        d->render();
+}
+
+/*!
+  Renders and returns a 32-bit RGB image of the framebuffer.
+
+  \note This is a potentially expensive operation because it relies on glReadPixels()
+  to read back the pixels. This may be slow and can stall the GPU pipeline.
+*/
+QImage QOpenGLWidget::grabFramebuffer()
+{
+    Q_D(QOpenGLWidget);
+    return d->grabFramebuffer();
+}
+
+/*!
+  \internal
+*/
+int QOpenGLWidget::metric(QPaintDevice::PaintDeviceMetric metric) const
+{
+    Q_D(const QOpenGLWidget);
+    if (d->inBackingStorePaint)
+        return QWidget::metric(metric);
+
+    auto window = d->windowHandle(QWidgetPrivate::WindowHandleMode::TopLevel);
+    QScreen *screen = window ? window->screen() : QGuiApplication::primaryScreen();
+
+    const float dpmx = qt_defaultDpiX() * 100. / 2.54;
+    const float dpmy = qt_defaultDpiY() * 100. / 2.54;
+
+    switch (metric) {
+    case PdmWidth:
+        return width();
+    case PdmHeight:
+        return height();
+    case PdmDepth:
+        return 32;
+    case PdmWidthMM:
+        if (screen)
+            return width() * screen->physicalSize().width() / screen->geometry().width();
+        else
+            return width() * 1000 / dpmx;
+    case PdmHeightMM:
+        if (screen)
+            return height() * screen->physicalSize().height() / screen->geometry().height();
+        else
+            return height() * 1000 / dpmy;
+    case PdmNumColors:
+        return 0;
+    case PdmDpiX:
+        if (screen)
+            return qRound(screen->logicalDotsPerInchX());
+        else
+            return qRound(dpmx * 0.0254);
+    case PdmDpiY:
+        if (screen)
+            return qRound(screen->logicalDotsPerInchY());
+        else
+            return qRound(dpmy * 0.0254);
+    case PdmPhysicalDpiX:
+        if (screen)
+            return qRound(screen->physicalDotsPerInchX());
+        else
+            return qRound(dpmx * 0.0254);
+    case PdmPhysicalDpiY:
+        if (screen)
+            return qRound(screen->physicalDotsPerInchY());
+        else
+            return qRound(dpmy * 0.0254);
+    case PdmDevicePixelRatio:
+        if (window)
+            return int(window->devicePixelRatio());
+        else
+            return 1.0;
+    case PdmDevicePixelRatioScaled:
+        if (window)
+            return int(window->devicePixelRatio() * devicePixelRatioFScale());
+        else
+            return int(devicePixelRatioFScale());
+    default:
+        qWarning("QOpenGLWidget::metric(): unknown metric %d", metric);
+        return 0;
+    }
+}
+
+/*!
+  \internal
+*/
+QPaintDevice *QOpenGLWidget::redirected(QPoint *p) const
+{
+    Q_D(const QOpenGLWidget);
+    if (d->inBackingStorePaint)
+        return QWidget::redirected(p);
+
+    return d->paintDevice;
+}
+
+/*!
+  \internal
+*/
+QPaintEngine *QOpenGLWidget::paintEngine() const
+{
+    Q_D(const QOpenGLWidget);
+    // QWidget needs to "punch a hole" into the backingstore. This needs the
+    // normal paint engine and device, not the GL one. So in this mode, behave
+    // like a normal widget.
+    if (d->inBackingStorePaint)
+        return QWidget::paintEngine();
+
+    if (!d->initialized)
+        return nullptr;
+
+    return d->paintDevice->paintEngine();
+}
+
+/*!
+  \internal
+*/
+bool QOpenGLWidget::event(QEvent *e)
+{
+    Q_D(QOpenGLWidget);
+    switch (e->type()) {
+    case QEvent::WindowChangeInternal:
+        if (QCoreApplication::testAttribute(Qt::AA_ShareOpenGLContexts))
+            break;
+        if (d->initialized)
+            d->reset();
+        if (isHidden())
+            break;
+        Q_FALLTHROUGH();
+    case QEvent::Show: // reparenting may not lead to a resize so reinitalize on Show too
+        if (d->initialized && window()->windowHandle()
+                && d->context->shareContext() != QWidgetPrivate::get(window())->shareContext())
+        {
+            // Special case: did grabFramebuffer() for a hidden widget that then became visible.
+            // Recreate all resources since the context now needs to share with the TLW's.
+            if (!QCoreApplication::testAttribute(Qt::AA_ShareOpenGLContexts))
+                d->reset();
+        }
+        if (!d->initialized && !size().isEmpty() && window()->windowHandle()) {
+            d->initialize();
+            if (d->initialized)
+                d->recreateFbo();
+        }
+        break;
+    case QEvent::ScreenChangeInternal:
+        if (d->initialized && d->paintDevice->devicePixelRatioF() != devicePixelRatioF())
+            d->recreateFbo();
+        break;
+    default:
+        break;
+    }
+    return QWidget::event(e);
+}
+
+QT_END_NAMESPACE
+
+#include "moc_qopenglwidget.cpp"
diff --git a/src/openglwidgets/qopenglwidget.h b/src/openglwidgets/qopenglwidget.h
new file mode 100644
index 0000000000..0f2884f827
--- /dev/null
+++ b/src/openglwidgets/qopenglwidget.h
@@ -0,0 +1,111 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtOpenGLWidgets module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QOPENGLWIDGET_H
+#define QOPENGLWIDGET_H
+
+#include <QtOpenGLWidgets/qtopenglwidgetsglobal.h>
+
+#include <QtWidgets/QWidget>
+#include <QtGui/QSurfaceFormat>
+#include <QtGui/qopengl.h>
+
+QT_BEGIN_NAMESPACE
+
+class QOpenGLWidgetPrivate;
+
+class Q_OPENGLWIDGETS_EXPORT QOpenGLWidget : public QWidget
+{
+    Q_OBJECT
+    Q_DECLARE_PRIVATE(QOpenGLWidget)
+
+public:
+    enum UpdateBehavior {
+        NoPartialUpdate,
+        PartialUpdate
+    };
+
+    explicit QOpenGLWidget(QWidget* parent = nullptr, Qt::WindowFlags f = Qt::WindowFlags());
+    ~QOpenGLWidget();
+
+    void setUpdateBehavior(UpdateBehavior updateBehavior);
+    UpdateBehavior updateBehavior() const;
+
+    void setFormat(const QSurfaceFormat &format);
+    QSurfaceFormat format() const;
+
+    GLenum textureFormat() const;
+    void setTextureFormat(GLenum texFormat);
+
+    bool isValid() const;
+
+    void makeCurrent();
+    void doneCurrent();
+
+    QOpenGLContext *context() const;
+    GLuint defaultFramebufferObject() const;
+
+    QImage grabFramebuffer();
+
+Q_SIGNALS:
+    void aboutToCompose();
+    void frameSwapped();
+    void aboutToResize();
+    void resized();
+
+protected:
+    virtual void initializeGL();
+    virtual void resizeGL(int w, int h);
+    virtual void paintGL();
+
+    void paintEvent(QPaintEvent *e) override;
+    void resizeEvent(QResizeEvent *e) override;
+    bool event(QEvent *e) override;
+
+    int metric(QPaintDevice::PaintDeviceMetric metric) const override;
+    QPaintDevice *redirected(QPoint *p) const override;
+    QPaintEngine *paintEngine() const override;
+
+private:
+    Q_DISABLE_COPY(QOpenGLWidget)
+};
+
+QT_END_NAMESPACE
+
+#endif // QOPENGLWIDGET_H
diff --git a/src/openglwidgets/qtopenglwidgetsglobal.h b/src/openglwidgets/qtopenglwidgetsglobal.h
new file mode 100644
index 0000000000..41c73fafda
--- /dev/null
+++ b/src/openglwidgets/qtopenglwidgetsglobal.h
@@ -0,0 +1,59 @@
+/****************************************************************************
+**
+** Copyright (C) 2020 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtOpenGLWidgets module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QTOPENGLWIDGETSGLOBAL_H
+#define QTOPENGLWIDGETSGLOBAL_H
+
+#include <QtCore/qglobal.h>
+
+QT_BEGIN_NAMESPACE
+
+#ifndef QT_STATIC
+#  if defined(QT_BUILD_OPENGLWIDGETS_LIB)
+#    define Q_OPENGLWIDGETS_EXPORT Q_DECL_EXPORT
+#  else
+#    define Q_OPENGLWIDGETS_EXPORT Q_DECL_IMPORT
+#  endif
+#else
+#  define Q_OPENGLWIDGETS_EXPORT
+#endif
+
+QT_END_NAMESPACE
+
+#endif // QTOPENGLWIDGETSGLOBAL_H
diff --git a/src/platformheaders/.prev_CMakeLists.txt b/src/platformheaders/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..5456de5c80
--- /dev/null
+++ b/src/platformheaders/.prev_CMakeLists.txt
@@ -0,0 +1,2 @@
+# Generated from platformheaders.pro.
+
diff --git a/src/platformheaders/CMakeLists.txt b/src/platformheaders/CMakeLists.txt
new file mode 100644
index 0000000000..820bbb71a5
--- /dev/null
+++ b/src/platformheaders/CMakeLists.txt
@@ -0,0 +1,13 @@
+# Generated from platformheaders.pro.
+
+# special case begin
+
+# FIXME Add the rest of the stuff? I don't think any other stuff is needed?
+
+qt_add_module(PlatformHeaders HEADER_MODULE)
+
+qt_add_docs(PlatformHeaders
+    doc/qtplatformheaders.qdocconf
+)
+
+# special case end
diff --git a/tests/auto/corelib/io/qfileselector/platforms/+mac/test5 b/src/platformheaders/fake.cpp
index e69de29bb2..e69de29bb2 100644
--- a/tests/auto/corelib/io/qfileselector/platforms/+mac/test5
+++ b/src/platformheaders/fake.cpp
diff --git a/src/platformsupport/CMakeLists.txt b/src/platformsupport/CMakeLists.txt
new file mode 100644
index 0000000000..fc980f3707
--- /dev/null
+++ b/src/platformsupport/CMakeLists.txt
@@ -0,0 +1,49 @@
+# Generated from platformsupport.pro.
+
+add_subdirectory(edid)
+add_subdirectory(eventdispatchers)
+add_subdirectory(devicediscovery)
+add_subdirectory(fbconvenience)
+add_subdirectory(themes)
+# special case begin
+if (QT_FEATURE_dbus)
+    add_subdirectory(linuxofono)
+endif()
+# special case end
+if(APPLE OR QT_FEATURE_freetype OR WIN32)
+    add_subdirectory(fontdatabases)
+endif()
+if(QT_FEATURE_evdev OR QT_FEATURE_integrityhid OR QT_FEATURE_libinput OR QT_FEATURE_tslib)
+    add_subdirectory(input)
+endif()
+if(QT_FEATURE_xcb OR (UNIX AND NOT APPLE_UIKIT))
+    add_subdirectory(services)
+endif()
+if(QT_FEATURE_opengl)
+    add_subdirectory(platformcompositor)
+endif()
+if(QT_FEATURE_egl)
+    add_subdirectory(eglconvenience)
+endif()
+if(QT_FEATURE_opengl AND QT_FEATURE_xlib AND NOT QT_FEATURE_opengles2)
+    add_subdirectory(glxconvenience)
+endif()
+if(QT_FEATURE_kms)
+    add_subdirectory(kmsconvenience)
+endif()
+if(QT_FEATURE_accessibility)
+    add_subdirectory(accessibility)
+endif()
+if(QT_FEATURE_accessibility AND QT_FEATURE_accessibility_atspi_bridge)
+    add_subdirectory(linuxaccessibility)
+endif()
+if(QT_FEATURE_accessibility AND WIN32 AND NOT WINRT)
+    add_subdirectory(windowsuiautomation)
+endif()
+if(APPLE)
+    add_subdirectory(clipboard)
+    add_subdirectory(graphics)
+endif()
+if(QT_FEATURE_vulkan)
+    add_subdirectory(vkconvenience)
+endif()
diff --git a/src/platformsupport/accessibility/CMakeLists.txt b/src/platformsupport/accessibility/CMakeLists.txt
new file mode 100644
index 0000000000..4757b123af
--- /dev/null
+++ b/src/platformsupport/accessibility/CMakeLists.txt
@@ -0,0 +1,20 @@
+# Generated from accessibility.pro.
+
+#####################################################################
+## AccessibilitySupport Module:
+#####################################################################
+
+qt_add_module(AccessibilitySupport
+    STATIC
+    INTERNAL_MODULE
+    SOURCES
+        qaccessiblebridgeutils.cpp qaccessiblebridgeutils_p.h
+    DEFINES
+        QT_NO_CAST_FROM_ASCII
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::GuiPrivate
+)
+
+#### Keys ignored in scope 1:.:.:accessibility.pro:<TRUE>:
+# MODULE = "accessibility_support"
diff --git a/src/platformsupport/clipboard/CMakeLists.txt b/src/platformsupport/clipboard/CMakeLists.txt
new file mode 100644
index 0000000000..52022903aa
--- /dev/null
+++ b/src/platformsupport/clipboard/CMakeLists.txt
@@ -0,0 +1,29 @@
+# Generated from clipboard.pro.
+
+#####################################################################
+## ClipboardSupport Module:
+#####################################################################
+
+qt_add_module(ClipboardSupport
+    STATIC
+    INTERNAL_MODULE
+    SOURCES
+        qmacmime.mm qmacmime_p.h
+    DEFINES
+        QT_NO_CAST_FROM_ASCII
+    PUBLIC_LIBRARIES
+        ${FWImageIO}
+        Qt::CorePrivate
+        Qt::Gui
+)
+
+#### Keys ignored in scope 1:.:.:clipboard.pro:<TRUE>:
+# MODULE = "clipboard_support"
+
+## Scopes:
+#####################################################################
+
+qt_extend_target(ClipboardSupport CONDITION APPLE_OSX
+    LIBRARIES
+        ${FWAppKit}
+)
diff --git a/src/platformsupport/devicediscovery/CMakeLists.txt b/src/platformsupport/devicediscovery/CMakeLists.txt
new file mode 100644
index 0000000000..8ecabb4a1b
--- /dev/null
+++ b/src/platformsupport/devicediscovery/CMakeLists.txt
@@ -0,0 +1,40 @@
+# Generated from devicediscovery.pro.
+
+#####################################################################
+## DeviceDiscoverySupport Module:
+#####################################################################
+
+qt_add_module(DeviceDiscoverySupport
+    STATIC
+    INTERNAL_MODULE
+    SOURCES
+        qdevicediscovery_p.h
+    DEFINES
+        QT_NO_CAST_FROM_ASCII
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+)
+
+#### Keys ignored in scope 1:.:.:devicediscovery.pro:<TRUE>:
+# MODULE = "devicediscovery_support"
+# QT_FOR_CONFIG = "gui-private"
+
+## Scopes:
+#####################################################################
+
+qt_extend_target(DeviceDiscoverySupport CONDITION QT_FEATURE_libudev
+    SOURCES
+        qdevicediscovery_udev.cpp qdevicediscovery_udev_p.h
+    LIBRARIES
+        PkgConfig::Libudev
+)
+
+qt_extend_target(DeviceDiscoverySupport CONDITION QT_FEATURE_evdev AND NOT QT_FEATURE_libudev
+    SOURCES
+        qdevicediscovery_static.cpp qdevicediscovery_static_p.h
+)
+
+qt_extend_target(DeviceDiscoverySupport CONDITION NOT QT_FEATURE_evdev AND NOT QT_FEATURE_libudev
+    SOURCES
+        qdevicediscovery_dummy.cpp qdevicediscovery_dummy_p.h
+)
diff --git a/src/platformsupport/edid/CMakeLists.txt b/src/platformsupport/edid/CMakeLists.txt
new file mode 100644
index 0000000000..aaea30448e
--- /dev/null
+++ b/src/platformsupport/edid/CMakeLists.txt
@@ -0,0 +1,21 @@
+# Generated from edid.pro.
+
+#####################################################################
+## EdidSupport Module:
+#####################################################################
+
+qt_add_module(EdidSupport
+    STATIC
+    INTERNAL_MODULE
+    SOURCES
+        qedidparser.cpp qedidparser_p.h
+    DEFINES
+        QT_NO_CAST_FROM_ASCII
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+    PRECOMPILED_HEADER
+        "../../corelib/global/qt_pch.h"
+)
+
+#### Keys ignored in scope 1:.:.:edid.pro:<TRUE>:
+# MODULE = "edid_support"
diff --git a/src/platformsupport/eglconvenience/.prev_CMakeLists.txt b/src/platformsupport/eglconvenience/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..c00cc30d62
--- /dev/null
+++ b/src/platformsupport/eglconvenience/.prev_CMakeLists.txt
@@ -0,0 +1,50 @@
+# Generated from eglconvenience.pro.
+
+#####################################################################
+## EglSupport Module:
+#####################################################################
+
+qt_add_module(EglSupport
+    STATIC
+    INTERNAL_MODULE
+    SOURCES
+        qeglconvenience.cpp qeglconvenience_p.h
+        qeglstreamconvenience.cpp qeglstreamconvenience_p.h
+        qt_egl_p.h
+    DEFINES
+        QT_NO_CAST_FROM_ASCII
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::GuiPrivate
+    PRECOMPILED_HEADER
+        "../../corelib/global/qt_pch.h"
+)
+
+#### Keys ignored in scope 1:.:.:eglconvenience.pro:<TRUE>:
+# MODULE = "egl_support"
+
+## Scopes:
+#####################################################################
+
+qt_extend_target(EglSupport CONDITION QT_FEATURE_opengl
+    SOURCES
+        qeglpbuffer.cpp qeglpbuffer_p.h
+        qeglplatformcontext.cpp qeglplatformcontext_p.h
+)
+
+qt_extend_target(EglSupport CONDITION QT_FEATURE_egl_x11
+    SOURCES
+        qxlibeglintegration.cpp qxlibeglintegration_p.h
+    LIBRARIES
+        X11::X11
+)
+
+qt_extend_target(EglSupport CONDITION NOT QT_FEATURE_egl_x11
+    DEFINES
+        QT_EGL_NO_X11
+)
+
+qt_extend_target(EglSupport CONDITION QT_FEATURE_dlopen
+    PUBLIC_LIBRARIES
+        ${CMAKE_DL_LIBS}
+)
diff --git a/src/platformsupport/eglconvenience/CMakeLists.txt b/src/platformsupport/eglconvenience/CMakeLists.txt
new file mode 100644
index 0000000000..1858dc7e90
--- /dev/null
+++ b/src/platformsupport/eglconvenience/CMakeLists.txt
@@ -0,0 +1,53 @@
+# Generated from eglconvenience.pro.
+
+#####################################################################
+## EglSupport Module:
+#####################################################################
+
+qt_find_package(EGL) # special case
+
+qt_add_module(EglSupport
+    STATIC
+    INTERNAL_MODULE
+    SOURCES
+        qeglconvenience.cpp qeglconvenience_p.h
+        qeglstreamconvenience.cpp qeglstreamconvenience_p.h
+        qt_egl_p.h
+    DEFINES
+        QT_NO_CAST_FROM_ASCII
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::GuiPrivate
+        EGL::EGL # special case
+    PRECOMPILED_HEADER
+        "../../corelib/global/qt_pch.h"
+)
+
+#### Keys ignored in scope 1:.:.:eglconvenience.pro:<TRUE>:
+# MODULE = "egl_support"
+
+## Scopes:
+#####################################################################
+
+qt_extend_target(EglSupport CONDITION QT_FEATURE_opengl
+    SOURCES
+        qeglpbuffer.cpp qeglpbuffer_p.h
+        qeglplatformcontext.cpp qeglplatformcontext_p.h
+)
+
+qt_extend_target(EglSupport CONDITION QT_FEATURE_egl_x11
+    SOURCES
+        qxlibeglintegration.cpp qxlibeglintegration_p.h
+    LIBRARIES
+        X11::X11
+)
+
+qt_extend_target(EglSupport CONDITION NOT QT_FEATURE_egl_x11
+    DEFINES
+        QT_EGL_NO_X11
+)
+
+qt_extend_target(EglSupport CONDITION QT_FEATURE_dlopen
+    PUBLIC_LIBRARIES
+        ${CMAKE_DL_LIBS}
+)
diff --git a/src/platformsupport/eventdispatchers/.prev_CMakeLists.txt b/src/platformsupport/eventdispatchers/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..2e25d6cfd6
--- /dev/null
+++ b/src/platformsupport/eventdispatchers/.prev_CMakeLists.txt
@@ -0,0 +1,42 @@
+# Generated from eventdispatchers.pro.
+
+#####################################################################
+## EventDispatcherSupport Module:
+#####################################################################
+
+qt_add_module(EventDispatcherSupport
+    STATIC
+    INTERNAL_MODULE
+    DEFINES
+        QT_NO_CAST_FROM_ASCII
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::GuiPrivate
+    PRECOMPILED_HEADER
+        "../../corelib/global/qt_pch.h"
+)
+
+#### Keys ignored in scope 1:.:.:eventdispatchers.pro:<TRUE>:
+# MODULE = "eventdispatcher_support"
+
+## Scopes:
+#####################################################################
+
+qt_extend_target(EventDispatcherSupport CONDITION UNIX
+    SOURCES
+        qgenericunixeventdispatcher.cpp qgenericunixeventdispatcher_p.h
+        qunixeventdispatcher.cpp
+        qunixeventdispatcher_qpa_p.h
+)
+
+qt_extend_target(EventDispatcherSupport CONDITION WIN32
+    SOURCES
+        qwindowsguieventdispatcher.cpp qwindowsguieventdispatcher_p.h
+)
+
+qt_extend_target(EventDispatcherSupport CONDITION QT_FEATURE_glib
+    SOURCES
+        qeventdispatcher_glib.cpp qeventdispatcher_glib_p.h
+    LIBRARIES
+        GLIB2::GLIB2
+)
diff --git a/src/platformsupport/eventdispatchers/CMakeLists.txt b/src/platformsupport/eventdispatchers/CMakeLists.txt
new file mode 100644
index 0000000000..72b873423b
--- /dev/null
+++ b/src/platformsupport/eventdispatchers/CMakeLists.txt
@@ -0,0 +1,44 @@
+# Generated from eventdispatchers.pro.
+
+qt_find_package(GLIB2) # special case
+
+#####################################################################
+## EventDispatcherSupport Module:
+#####################################################################
+
+qt_add_module(EventDispatcherSupport
+    STATIC
+    INTERNAL_MODULE
+    DEFINES
+        QT_NO_CAST_FROM_ASCII
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::GuiPrivate
+    PRECOMPILED_HEADER
+        "../../corelib/global/qt_pch.h"
+)
+
+#### Keys ignored in scope 1:.:.:eventdispatchers.pro:<TRUE>:
+# MODULE = "eventdispatcher_support"
+
+## Scopes:
+#####################################################################
+
+qt_extend_target(EventDispatcherSupport CONDITION UNIX
+    SOURCES
+        qgenericunixeventdispatcher.cpp qgenericunixeventdispatcher_p.h
+        qunixeventdispatcher.cpp
+        qunixeventdispatcher_qpa_p.h
+)
+
+qt_extend_target(EventDispatcherSupport CONDITION WIN32
+    SOURCES
+        qwindowsguieventdispatcher.cpp qwindowsguieventdispatcher_p.h
+)
+
+qt_extend_target(EventDispatcherSupport CONDITION QT_FEATURE_glib
+    SOURCES
+        qeventdispatcher_glib.cpp qeventdispatcher_glib_p.h
+    LIBRARIES
+        GLIB2::GLIB2
+)
diff --git a/src/platformsupport/fbconvenience/CMakeLists.txt b/src/platformsupport/fbconvenience/CMakeLists.txt
new file mode 100644
index 0000000000..804b2c15ec
--- /dev/null
+++ b/src/platformsupport/fbconvenience/CMakeLists.txt
@@ -0,0 +1,26 @@
+# Generated from fbconvenience.pro.
+
+#####################################################################
+## FbSupport Module:
+#####################################################################
+
+qt_add_module(FbSupport
+    STATIC
+    INTERNAL_MODULE
+    SOURCES
+        qfbbackingstore.cpp qfbbackingstore_p.h
+        qfbcursor.cpp qfbcursor_p.h
+        qfbscreen.cpp qfbscreen_p.h
+        qfbvthandler.cpp qfbvthandler_p.h
+        qfbwindow.cpp qfbwindow_p.h
+    DEFINES
+        QT_NO_CAST_FROM_ASCII
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::GuiPrivate
+    PRECOMPILED_HEADER
+        "../../corelib/global/qt_pch.h"
+)
+
+#### Keys ignored in scope 1:.:.:fbconvenience.pro:<TRUE>:
+# MODULE = "fb_support"
diff --git a/src/platformsupport/fontdatabases/.prev_CMakeLists.txt b/src/platformsupport/fontdatabases/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..56cf076bd9
--- /dev/null
+++ b/src/platformsupport/fontdatabases/.prev_CMakeLists.txt
@@ -0,0 +1,136 @@
+# Generated from fontdatabases.pro.
+
+#####################################################################
+## FontDatabaseSupport Module:
+#####################################################################
+
+qt_add_module(FontDatabaseSupport
+    STATIC
+    INTERNAL_MODULE
+    DEFINES
+        QT_NO_CAST_FROM_ASCII
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::GuiPrivate
+    PRECOMPILED_HEADER
+        "../../corelib/global/qt_pch.h"
+)
+
+#### Keys ignored in scope 1:.:.:fontdatabases.pro:<TRUE>:
+# MODULE = "fontdatabase_support"
+
+## Scopes:
+#####################################################################
+
+qt_extend_target(FontDatabaseSupport CONDITION APPLE
+    SOURCES
+        mac/qcoretextfontdatabase.mm mac/qcoretextfontdatabase_p.h
+        mac/qfontengine_coretext.mm mac/qfontengine_coretext_p.h
+    LIBRARIES
+        ${FWCoreFoundation}
+        ${FWCoreGraphics}
+        ${FWCoreText}
+        ${FWFoundation}
+)
+
+qt_extend_target(FontDatabaseSupport CONDITION APPLE_OSX
+    LIBRARIES
+        ${FWAppKit}
+)
+
+qt_extend_target(FontDatabaseSupport CONDITION APPLE AND NOT APPLE_OSX
+    LIBRARIES
+        ${FWUIKit}
+)
+
+qt_extend_target(FontDatabaseSupport CONDITION QT_FEATURE_freetype
+    SOURCES
+        freetype/qfontengine_ft.cpp freetype/qfontengine_ft_p.h
+        freetype/qfreetypefontdatabase.cpp freetype/qfreetypefontdatabase_p.h
+    LIBRARIES
+        WrapFreetype::WrapFreetype
+)
+
+qt_extend_target(FontDatabaseSupport CONDITION UNIX
+    SOURCES
+        genericunix/qgenericunixfontdatabase_p.h
+)
+
+qt_extend_target(FontDatabaseSupport CONDITION QT_FEATURE_fontconfig
+    SOURCES
+        fontconfig/qfontconfigdatabase.cpp fontconfig/qfontconfigdatabase_p.h
+        fontconfig/qfontenginemultifontconfig.cpp fontconfig/qfontenginemultifontconfig_p.h
+    LIBRARIES
+        Fontconfig::Fontconfig
+)
+
+qt_extend_target(FontDatabaseSupport CONDITION WIN32 AND NOT WINRT
+    SOURCES
+        windows/qwindowsfontdatabase.cpp windows/qwindowsfontdatabase_p.h
+        windows/qwindowsfontdatabasebase.cpp windows/qwindowsfontdatabasebase_p.h
+        windows/qwindowsfontengine.cpp windows/qwindowsfontengine_p.h
+        windows/qwindowsnativeimage.cpp windows/qwindowsnativeimage_p.h
+    LIBRARIES
+        advapi32
+        gdi32
+        ole32
+        user32
+    PUBLIC_LIBRARIES
+        Qt::GuiPrivate
+)
+
+qt_extend_target(FontDatabaseSupport CONDITION QT_FEATURE_freetype AND WIN32 AND NOT WINRT
+    SOURCES
+        windows/qwindowsfontdatabase_ft.cpp windows/qwindowsfontdatabase_ft_p.h
+)
+
+qt_extend_target(FontDatabaseSupport CONDITION QT_FEATURE_direct2d AND QT_FEATURE_directwrite AND WIN32 AND NOT WINRT
+    SOURCES
+        windows/qwindowsfontenginedirectwrite.cpp windows/qwindowsfontenginedirectwrite_p.h
+    LIBRARIES
+        d2d1
+)
+
+qt_extend_target(FontDatabaseSupport CONDITION QT_FEATURE_direct2d AND QT_FEATURE_directwrite AND QT_FEATURE_directwrite3 AND WIN32 AND NOT WINRT
+    SOURCES
+        windows/qwindowsdirectwritefontdatabase.cpp windows/qwindowsdirectwritefontdatabase_p.h
+    DEFINES
+        QT_USE_DIRECTWRITE2
+        QT_USE_DIRECTWRITE3
+    LIBRARIES
+        dwrite_3
+)
+
+qt_extend_target(FontDatabaseSupport CONDITION QT_FEATURE_direct2d AND QT_FEATURE_directwrite AND QT_FEATURE_directwrite2 AND WIN32 AND NOT QT_FEATURE_directwrite3 AND NOT WINRT
+    DEFINES
+        QT_USE_DIRECTWRITE2
+    LIBRARIES
+        dwrite_2
+)
+
+qt_extend_target(FontDatabaseSupport CONDITION QT_FEATURE_direct2d AND QT_FEATURE_directwrite AND WIN32 AND NOT QT_FEATURE_directwrite2 AND NOT QT_FEATURE_directwrite3 AND NOT WINRT
+    LIBRARIES
+        dwrite
+)
+
+qt_extend_target(FontDatabaseSupport CONDITION WIN32 AND NOT WINRT AND (NOT QT_FEATURE_direct2d OR NOT QT_FEATURE_directwrite)
+    DEFINES
+        QT_NO_DIRECTWRITE
+)
+
+qt_extend_target(FontDatabaseSupport CONDITION WIN32 AND mingw AND NOT WINRT
+    LIBRARIES
+        uuid
+)
+
+qt_extend_target(FontDatabaseSupport CONDITION WINRT
+    SOURCES
+        winrt/qwinrtfontdatabase.cpp winrt/qwinrtfontdatabase_p.h
+    DEFINES
+        __WRL_NO_DEFAULT_LIB__
+    LIBRARIES
+        dwrite_1
+        ws2_32
+    PUBLIC_LIBRARIES
+        Qt::GuiPrivate
+)
diff --git a/src/platformsupport/fontdatabases/CMakeLists.txt b/src/platformsupport/fontdatabases/CMakeLists.txt
new file mode 100644
index 0000000000..b613d6cf6a
--- /dev/null
+++ b/src/platformsupport/fontdatabases/CMakeLists.txt
@@ -0,0 +1,139 @@
+# Generated from fontdatabases.pro.
+
+qt_find_package(WrapFreetype PROVIDED_TARGETS WrapFreetype::WrapFreetype) # special case
+qt_find_package(Fontconfig) # special case
+
+#####################################################################
+## FontDatabaseSupport Module:
+#####################################################################
+
+qt_add_module(FontDatabaseSupport
+    STATIC
+    INTERNAL_MODULE
+    DEFINES
+        QT_NO_CAST_FROM_ASCII
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::GuiPrivate
+    PRECOMPILED_HEADER
+        "../../corelib/global/qt_pch.h"
+)
+
+#### Keys ignored in scope 1:.:.:fontdatabases.pro:<TRUE>:
+# MODULE = "fontdatabase_support"
+
+## Scopes:
+#####################################################################
+
+qt_extend_target(FontDatabaseSupport CONDITION APPLE
+    SOURCES
+        mac/qcoretextfontdatabase.mm mac/qcoretextfontdatabase_p.h
+        mac/qfontengine_coretext.mm mac/qfontengine_coretext_p.h
+    LIBRARIES
+        ${FWCoreFoundation}
+        ${FWCoreGraphics}
+        ${FWCoreText}
+        ${FWFoundation}
+)
+
+qt_extend_target(FontDatabaseSupport CONDITION APPLE_OSX
+    LIBRARIES
+        ${FWAppKit}
+)
+
+qt_extend_target(FontDatabaseSupport CONDITION APPLE AND NOT APPLE_OSX
+    LIBRARIES
+        ${FWUIKit}
+)
+
+qt_extend_target(FontDatabaseSupport CONDITION QT_FEATURE_freetype
+    SOURCES
+        freetype/qfontengine_ft.cpp freetype/qfontengine_ft_p.h
+        freetype/qfreetypefontdatabase.cpp freetype/qfreetypefontdatabase_p.h
+    LIBRARIES
+        WrapFreetype::WrapFreetype
+)
+
+qt_extend_target(FontDatabaseSupport CONDITION UNIX
+    SOURCES
+        genericunix/qgenericunixfontdatabase_p.h
+)
+
+qt_extend_target(FontDatabaseSupport CONDITION QT_FEATURE_fontconfig
+    SOURCES
+        fontconfig/qfontconfigdatabase.cpp fontconfig/qfontconfigdatabase_p.h
+        fontconfig/qfontenginemultifontconfig.cpp fontconfig/qfontenginemultifontconfig_p.h
+    LIBRARIES
+        Fontconfig::Fontconfig
+)
+
+qt_extend_target(FontDatabaseSupport CONDITION WIN32 AND NOT WINRT
+    SOURCES
+        windows/qwindowsfontdatabase.cpp windows/qwindowsfontdatabase_p.h
+        windows/qwindowsfontdatabasebase.cpp windows/qwindowsfontdatabasebase_p.h
+        windows/qwindowsfontengine.cpp windows/qwindowsfontengine_p.h
+        windows/qwindowsnativeimage.cpp windows/qwindowsnativeimage_p.h
+    LIBRARIES
+        advapi32
+        gdi32
+        ole32
+        user32
+    PUBLIC_LIBRARIES
+        Qt::GuiPrivate
+)
+
+qt_extend_target(FontDatabaseSupport CONDITION QT_FEATURE_freetype AND WIN32 AND NOT WINRT
+    SOURCES
+        windows/qwindowsfontdatabase_ft.cpp windows/qwindowsfontdatabase_ft_p.h
+)
+
+qt_extend_target(FontDatabaseSupport CONDITION QT_FEATURE_direct2d AND QT_FEATURE_directwrite AND WIN32 AND NOT WINRT
+    SOURCES
+        windows/qwindowsfontenginedirectwrite.cpp windows/qwindowsfontenginedirectwrite_p.h
+    LIBRARIES
+        d2d1
+)
+
+qt_extend_target(FontDatabaseSupport CONDITION QT_FEATURE_direct2d AND QT_FEATURE_directwrite AND QT_FEATURE_directwrite3 AND WIN32 AND NOT WINRT
+    SOURCES
+        windows/qwindowsdirectwritefontdatabase.cpp windows/qwindowsdirectwritefontdatabase_p.h
+    DEFINES
+        QT_USE_DIRECTWRITE2
+        QT_USE_DIRECTWRITE3
+    LIBRARIES
+        dwrite_3
+)
+
+qt_extend_target(FontDatabaseSupport CONDITION QT_FEATURE_direct2d AND QT_FEATURE_directwrite AND QT_FEATURE_directwrite2 AND WIN32 AND NOT QT_FEATURE_directwrite3 AND NOT WINRT
+    DEFINES
+        QT_USE_DIRECTWRITE2
+    LIBRARIES
+        dwrite_2
+)
+
+qt_extend_target(FontDatabaseSupport CONDITION QT_FEATURE_direct2d AND QT_FEATURE_directwrite AND WIN32 AND NOT QT_FEATURE_directwrite2 AND NOT QT_FEATURE_directwrite3 AND NOT WINRT
+    LIBRARIES
+        dwrite
+)
+
+qt_extend_target(FontDatabaseSupport CONDITION WIN32 AND NOT WINRT AND (NOT QT_FEATURE_direct2d OR NOT QT_FEATURE_directwrite)
+    DEFINES
+        QT_NO_DIRECTWRITE
+)
+
+qt_extend_target(FontDatabaseSupport CONDITION WIN32 AND mingw AND NOT WINRT
+    LIBRARIES
+        uuid
+)
+
+qt_extend_target(FontDatabaseSupport CONDITION WINRT
+    SOURCES
+        winrt/qwinrtfontdatabase.cpp winrt/qwinrtfontdatabase_p.h
+    DEFINES
+        __WRL_NO_DEFAULT_LIB__
+    LIBRARIES
+        dwrite_1
+        ws2_32
+    PUBLIC_LIBRARIES
+        Qt::GuiPrivate
+)
diff --git a/tests/auto/corelib/io/qfileselector/platforms/+osx/test b/src/platformsupport/fontdatabases/fake.cpp
index e69de29bb2..e69de29bb2 100644
--- a/tests/auto/corelib/io/qfileselector/platforms/+osx/test
+++ b/src/platformsupport/fontdatabases/fake.cpp
diff --git a/src/platformsupport/fontdatabases/freetype/qfontengine_ft.cpp b/src/platformsupport/fontdatabases/freetype/qfontengine_ft.cpp
index e65f67d4f1..d7ccd9db92 100644
--- a/src/platformsupport/fontdatabases/freetype/qfontengine_ft.cpp
+++ b/src/platformsupport/fontdatabases/freetype/qfontengine_ft.cpp
@@ -1357,50 +1357,65 @@ static inline FT_Matrix QTransformToFTMatrix(const QTransform &matrix)
     return m;
 }
 
-QFontEngineFT::QGlyphSet *QFontEngineFT::loadGlyphSet(const QTransform &matrix)
+QFontEngineFT::QGlyphSet *QFontEngineFT::TransformedGlyphSets::findSet(const QTransform &matrix, const QFontDef &fontDef)
 {
-    if (matrix.type() > QTransform::TxShear || !cacheEnabled)
-        return nullptr;
-
-    // FT_Set_Transform only supports scalable fonts
-    if (!FT_IS_SCALABLE(freetype->face))
-        return matrix.type() <= QTransform::TxTranslate ? &defaultGlyphSet : nullptr;
-
     FT_Matrix m = QTransformToFTMatrix(matrix);
 
-    QGlyphSet *gs = nullptr;
-
-    for (int i = 0; i < transformedGlyphSets.count(); ++i) {
-        const QGlyphSet &g = transformedGlyphSets.at(i);
-        if (g.transformationMatrix.xx == m.xx
-            && g.transformationMatrix.xy == m.xy
-            && g.transformationMatrix.yx == m.yx
-            && g.transformationMatrix.yy == m.yy) {
+    int i = 0;
+    for (; i < nSets; ++i) {
+        QGlyphSet *g = sets[i];
+        if (!g)
+            break;
+        if (g->transformationMatrix.xx == m.xx
+            && g->transformationMatrix.xy == m.xy
+            && g->transformationMatrix.yx == m.yx
+            && g->transformationMatrix.yy == m.yy) {
 
             // found a match, move it to the front
-            transformedGlyphSets.move(i, 0);
-            gs = &transformedGlyphSets[0];
-            break;
+            moveToFront(i);
+            return g;
         }
     }
 
-    if (!gs) {
-        // don't cache more than 10 transformations
-        if (transformedGlyphSets.count() >= 10) {
-            transformedGlyphSets.move(transformedGlyphSets.size() - 1, 0);
-        } else {
-            transformedGlyphSets.prepend(QGlyphSet());
-        }
-        gs = &transformedGlyphSets[0];
-        gs->clear();
-        gs->transformationMatrix = m;
-        gs->outline_drawing = fontDef.pixelSize * fontDef.pixelSize * qAbs(matrix.determinant()) > QT_MAX_CACHED_GLYPH_SIZE * QT_MAX_CACHED_GLYPH_SIZE;
-    }
+    // don't cache more than nSets transformations
+    if (i == nSets)
+        // reuse the last set
+        --i;
+    moveToFront(nSets - 1);
+    if (!sets[0])
+        sets[0] = new QGlyphSet;
+    QGlyphSet *gs = sets[0];
+    gs->clear();
+    gs->transformationMatrix = m;
+    gs->outline_drawing = fontDef.pixelSize * fontDef.pixelSize * qAbs(matrix.determinant()) > QT_MAX_CACHED_GLYPH_SIZE * QT_MAX_CACHED_GLYPH_SIZE;
     Q_ASSERT(gs != nullptr);
 
     return gs;
 }
 
+void QFontEngineFT::TransformedGlyphSets::moveToFront(int i)
+{
+    QGlyphSet *g = sets[i];
+    while (i > 0) {
+        sets[i] = sets[i - 1];
+        --i;
+    }
+    sets[0] = g;
+}
+
+
+QFontEngineFT::QGlyphSet *QFontEngineFT::loadGlyphSet(const QTransform &matrix)
+{
+    if (matrix.type() > QTransform::TxShear || !cacheEnabled)
+        return 0;
+
+    // FT_Set_Transform only supports scalable fonts
+    if (!FT_IS_SCALABLE(freetype->face))
+        return matrix.type() <= QTransform::TxTranslate ? &defaultGlyphSet : nullptr;
+
+    return transformedGlyphSets.findSet(matrix, fontDef);
+}
+
 void QFontEngineFT::getUnscaledGlyph(glyph_t glyph, QPainterPath *path, glyph_metrics_t *metrics)
 {
     FT_Face face = lockFace(Unscaled);
diff --git a/src/platformsupport/fontdatabases/freetype/qfontengine_ft_p.h b/src/platformsupport/fontdatabases/freetype/qfontengine_ft_p.h
index 2e3aef6979..8019588bf5 100644
--- a/src/platformsupport/fontdatabases/freetype/qfontengine_ft_p.h
+++ b/src/platformsupport/fontdatabases/freetype/qfontengine_ft_p.h
@@ -63,6 +63,8 @@
 
 #include <qmutex.h>
 
+#include <string.h>
+
 QT_BEGIN_NAMESPACE
 
 class QFontEngineFTRawFont;
@@ -170,6 +172,7 @@ public:
         inline bool isGlyphMissing(glyph_t index) const { return missing_glyphs.contains(index); }
         inline void setGlyphMissing(glyph_t index) const { missing_glyphs.insert(index); }
 private:
+        Q_DISABLE_COPY(QGlyphSet);
         mutable QHash<GlyphAndSubPixelPosition, Glyph *> glyph_data; // maps from glyph index to glyph data
         mutable QSet<glyph_t> missing_glyphs;
         mutable Glyph *fast_glyph_data[256]; // for fast lookup of glyphs < 256
@@ -310,7 +313,18 @@ private:
     GlyphFormat defaultFormat;
     FT_Matrix matrix;
 
-    QList<QGlyphSet> transformedGlyphSets;
+    struct TransformedGlyphSets {
+        enum { nSets = 10 };
+        QGlyphSet *sets[nSets];
+
+        QGlyphSet *findSet(const QTransform &matrix, const QFontDef &fontDef);
+        TransformedGlyphSets() { std::fill(&sets[0], &sets[nSets], nullptr); }
+        ~TransformedGlyphSets() { qDeleteAll(&sets[0], &sets[nSets]); }
+    private:
+        void moveToFront(int i);
+        Q_DISABLE_COPY(TransformedGlyphSets);
+    };
+    TransformedGlyphSets transformedGlyphSets;
     mutable QGlyphSet defaultGlyphSet;
 
     QFontEngine::FaceId face_id;
@@ -326,6 +340,9 @@ private:
     QFixed scalableBitmapScaleFactor;
 };
 
+Q_DECLARE_TYPEINFO(QFontEngineFT::QGlyphSet, Q_MOVABLE_TYPE);
+
+
 inline uint qHash(const QFontEngineFT::GlyphAndSubPixelPosition &g)
 {
     return (g.glyph << 8)  | (g.subPixelPosition * 10).round().toInt();
diff --git a/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm b/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm
index 894919a1c8..bc55efd23d 100644
--- a/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm
+++ b/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm
@@ -268,17 +268,7 @@ static void getFontDescription(CTFontDescriptorRef font, FontDescription *fd)
                     Q_UNREACHABLE();
                 Q_ASSERT(length >= 86);
             }
-            quint32 unicodeRange[4] = {
-                qFromBigEndian<quint32>(os2Table.data() + 42),
-                qFromBigEndian<quint32>(os2Table.data() + 46),
-                qFromBigEndian<quint32>(os2Table.data() + 50),
-                qFromBigEndian<quint32>(os2Table.data() + 54)
-            };
-            quint32 codePageRange[2] = {
-                qFromBigEndian<quint32>(os2Table.data() + 78),
-                qFromBigEndian<quint32>(os2Table.data() + 82)
-            };
-            fd->writingSystems = QPlatformFontDatabase::writingSystemsFromTrueTypeBits(unicodeRange, codePageRange);
+            fd->writingSystems = QPlatformFontDatabase::writingSystemsFromOS2Table(reinterpret_cast<const char *>(os2Table.data()), length);
         }
     }
 
diff --git a/src/platformsupport/fontdatabases/windows/qwindowsdirectwritefontdatabase.cpp b/src/platformsupport/fontdatabases/windows/qwindowsdirectwritefontdatabase.cpp
new file mode 100644
index 0000000000..16db2216ee
--- /dev/null
+++ b/src/platformsupport/fontdatabases/windows/qwindowsdirectwritefontdatabase.cpp
@@ -0,0 +1,459 @@
+/****************************************************************************
+**
+** Copyright (C) 2020 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the plugins of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qwindowsdirectwritefontdatabase_p.h"
+#include "qwindowsfontenginedirectwrite_p.h"
+#include "qwindowsfontdatabase_p.h"
+
+#include <QtCore/qendian.h>
+#include <QtCore/qstringbuilder.h>
+#include <QtCore/qvarlengtharray.h>
+
+#include <dwrite_3.h>
+#include <d2d1.h>
+
+QT_BEGIN_NAMESPACE
+
+#ifdef QT_USE_DIRECTWRITE3
+
+// Defined in gui/text/qfontdatabase.cpp
+Q_GUI_EXPORT QFontDatabase::WritingSystem qt_writing_system_for_script(int script);
+
+QWindowsDirectWriteFontDatabase::QWindowsDirectWriteFontDatabase()
+{
+    qCDebug(lcQpaFonts) << "Creating DirectWrite database";
+}
+
+QWindowsDirectWriteFontDatabase::~QWindowsDirectWriteFontDatabase()
+{
+    for (auto it = m_populatedFonts.begin(); it != m_populatedFonts.end(); ++it)
+        it.value()->Release();
+}
+
+QString QWindowsDirectWriteFontDatabase::localeString(IDWriteLocalizedStrings *names,
+                                                      wchar_t localeName[])
+{
+    uint index;
+    BOOL exists;
+    if (SUCCEEDED(names->FindLocaleName(localeName, &index, &exists)) && exists) {
+        uint length;
+        if (SUCCEEDED(names->GetStringLength(index, &length)) && length > 0) {
+            QVarLengthArray<wchar_t> buffer(int(length) + 1);
+            if (SUCCEEDED(names->GetString(index, buffer.data(), length + 1)))
+                return QString::fromWCharArray(buffer.data());
+        }
+    }
+
+    return QString();
+}
+
+static QFont::Stretch fromDirectWriteStretch(DWRITE_FONT_STRETCH stretch)
+{
+    switch (stretch) {
+    case DWRITE_FONT_STRETCH_ULTRA_CONDENSED: return QFont::UltraCondensed;
+    case DWRITE_FONT_STRETCH_EXTRA_CONDENSED: return QFont::ExtraCondensed;
+    case DWRITE_FONT_STRETCH_CONDENSED: return QFont::Condensed;
+    case DWRITE_FONT_STRETCH_SEMI_CONDENSED: return QFont::SemiCondensed;
+    case DWRITE_FONT_STRETCH_NORMAL: return QFont::Unstretched;
+    case DWRITE_FONT_STRETCH_SEMI_EXPANDED: return QFont::SemiExpanded;
+    case DWRITE_FONT_STRETCH_EXPANDED: return QFont::Expanded;
+    case DWRITE_FONT_STRETCH_EXTRA_EXPANDED: return QFont::ExtraExpanded;
+    case DWRITE_FONT_STRETCH_ULTRA_EXPANDED: return QFont::UltraExpanded;
+    default: return QFont::AnyStretch;
+    }
+}
+
+static QFont::Weight fromDirectWriteWeight(DWRITE_FONT_WEIGHT weight)
+{
+    return QPlatformFontDatabase::weightFromInteger(int(weight));
+}
+
+static DWRITE_FONT_STYLE toDirectWriteStyle(QFont::Style style)
+{
+    switch (style) {
+    case QFont::StyleNormal: return DWRITE_FONT_STYLE_NORMAL;
+    case QFont::StyleOblique: return DWRITE_FONT_STYLE_OBLIQUE;
+    case QFont::StyleItalic: return DWRITE_FONT_STYLE_ITALIC;
+    default: return DWRITE_FONT_STYLE_NORMAL;
+    }
+}
+
+static QFont::Style fromDirectWriteStyle(DWRITE_FONT_STYLE style)
+{
+    switch (style) {
+    case DWRITE_FONT_STYLE_NORMAL: return QFont::StyleNormal;
+    case DWRITE_FONT_STYLE_OBLIQUE: return QFont::StyleOblique;
+    case DWRITE_FONT_STYLE_ITALIC: return QFont::StyleItalic;
+    default: return QFont::StyleNormal;
+    }
+}
+
+void QWindowsDirectWriteFontDatabase::populateFamily(const QString &familyName)
+{
+    auto it = m_populatedFonts.find(familyName);
+    IDWriteFontFamily *fontFamily = it != m_populatedFonts.end() ? it.value() : nullptr;
+    if (fontFamily == nullptr) {
+        qCWarning(lcQpaFonts) << "Cannot find" << familyName << "in list of fonts";
+        return;
+    }
+
+    qCDebug(lcQpaFonts) << "Populate family:" << familyName;
+
+    wchar_t defaultLocale[LOCALE_NAME_MAX_LENGTH];
+    bool hasDefaultLocale = GetUserDefaultLocaleName(defaultLocale, LOCALE_NAME_MAX_LENGTH) != 0;
+    wchar_t englishLocale[] = L"en-us";
+
+    static const int SMOOTH_SCALABLE = 0xffff;
+    const QString foundryName; // No such concept.
+    const bool scalable = true;
+    const bool antialias = false;
+    const int size = SMOOTH_SCALABLE;
+
+    IDWriteFontList *matchingFonts;
+    if (SUCCEEDED(fontFamily->GetMatchingFonts(DWRITE_FONT_WEIGHT_REGULAR,
+                                               DWRITE_FONT_STRETCH_NORMAL,
+                                               DWRITE_FONT_STYLE_NORMAL,
+                                               &matchingFonts))) {
+        for (uint j = 0; j < matchingFonts->GetFontCount(); ++j) {
+            IDWriteFont *font;
+            if (SUCCEEDED(matchingFonts->GetFont(j, &font))) {
+                IDWriteFont1 *font1 = nullptr;
+                if (!SUCCEEDED(font->QueryInterface(__uuidof(IDWriteFont1),
+                                                   reinterpret_cast<void **>(&font1)))) {
+                    qCWarning(lcQpaFonts) << "COM object does not support IDWriteFont1";
+                    continue;
+                }
+
+                QString defaultLocaleFamilyName;
+                QString englishLocaleFamilyName;
+
+                IDWriteFontFamily *fontFamily2;
+                if (SUCCEEDED(font1->GetFontFamily(&fontFamily2))) {
+                    IDWriteLocalizedStrings *names;
+                    if (SUCCEEDED(fontFamily2->GetFamilyNames(&names))) {
+                        defaultLocaleFamilyName = hasDefaultLocale ? localeString(names, defaultLocale) : QString();
+                        englishLocaleFamilyName = localeString(names, englishLocale);
+
+                        names->Release();
+                    }
+
+                    fontFamily2->Release();
+                }
+
+                if (defaultLocaleFamilyName.isEmpty() && englishLocaleFamilyName.isEmpty())
+                    englishLocaleFamilyName = familyName;
+
+                {
+                    IDWriteLocalizedStrings *names;
+                    if (SUCCEEDED(font1->GetFaceNames(&names))) {
+                        QString defaultLocaleStyleName = hasDefaultLocale ? localeString(names, defaultLocale) : QString();
+                        QString englishLocaleStyleName = localeString(names, englishLocale);
+
+                        QFont::Stretch stretch = fromDirectWriteStretch(font1->GetStretch());
+                        QFont::Style style = fromDirectWriteStyle(font1->GetStyle());
+                        QFont::Weight weight = fromDirectWriteWeight(font1->GetWeight());
+                        bool fixed = font1->IsMonospacedFont();
+
+                        qCDebug(lcQpaFonts) << "Family" << familyName << "has english variant" << englishLocaleStyleName << ", in default locale:" << defaultLocaleStyleName << stretch << style << weight << fixed;
+
+                        IDWriteFontFace *face = nullptr;
+                        if (SUCCEEDED(font->CreateFontFace(&face))) {
+                            QSupportedWritingSystems writingSystems;
+
+                            const void *tableData = nullptr;
+                            UINT32 tableSize;
+                            void *tableContext = nullptr;
+                            BOOL exists;
+                            HRESULT hr = face->TryGetFontTable(qbswap<quint32>(MAKE_TAG('O','S','/','2')),
+                                                               &tableData,
+                                                               &tableSize,
+                                                               &tableContext,
+                                                               &exists);
+                            if (SUCCEEDED(hr) && exists) {
+                                writingSystems = QPlatformFontDatabase::writingSystemsFromOS2Table(reinterpret_cast<const char *>(tableData), tableSize);
+                            } else { // Fall back to checking first character of each Unicode range in font (may include too many writing systems)
+                                quint32 rangeCount;
+                                hr = font1->GetUnicodeRanges(0, nullptr, &rangeCount);
+
+                                if (rangeCount > 0) {
+                                    QVarLengthArray<DWRITE_UNICODE_RANGE, QChar::ScriptCount> ranges(rangeCount);
+
+                                    hr = font1->GetUnicodeRanges(rangeCount, ranges.data(), &rangeCount);
+                                    if (SUCCEEDED(hr)) {
+                                        for (uint i = 0; i < rangeCount; ++i) {
+                                            QChar::Script script = QChar::script(ranges.at(i).first);
+
+                                            QFontDatabase::WritingSystem writingSystem = qt_writing_system_for_script(script);
+
+                                            if (writingSystem > QFontDatabase::Any && writingSystem < QFontDatabase::WritingSystemsCount)
+                                                writingSystems.setSupported(writingSystem);
+                                        }
+                                    } else {
+                                        const QString errorString = qt_error_string(int(hr));
+                                        qCWarning(lcQpaFonts) << "Failed to get unicode ranges for font" << englishLocaleFamilyName << englishLocaleStyleName << ":" << errorString;
+                                    }
+                                }
+                            }
+
+                            if (!englishLocaleStyleName.isEmpty() || defaultLocaleStyleName.isEmpty()) {
+                                qCDebug(lcQpaFonts) << "Font" << englishLocaleFamilyName << englishLocaleStyleName << "supports writing systems:" << writingSystems;
+
+                                QPlatformFontDatabase::registerFont(englishLocaleFamilyName, englishLocaleStyleName, QString(), weight, style, stretch, antialias, scalable, size, fixed, writingSystems, face);
+                                face->AddRef();
+                            }
+
+                            if (!defaultLocaleFamilyName.isEmpty() && defaultLocaleFamilyName != englishLocaleFamilyName) {
+                                QPlatformFontDatabase::registerFont(defaultLocaleFamilyName, defaultLocaleStyleName, QString(), weight, style, stretch, antialias, scalable, size, fixed, writingSystems, face);
+                                face->AddRef();
+                            }
+
+                            face->Release();
+                        }
+
+                        names->Release();
+                    }
+                }
+
+                font1->Release();
+                font->Release();
+            }
+        }
+
+        matchingFonts->Release();
+    }
+}
+
+QFontEngine *QWindowsDirectWriteFontDatabase::fontEngine(const QFontDef &fontDef, void *handle)
+{
+    IDWriteFontFace *face = reinterpret_cast<IDWriteFontFace *>(handle);
+    Q_ASSERT(face != nullptr);
+
+    QWindowsFontEngineDirectWrite *fontEngine = new QWindowsFontEngineDirectWrite(face, fontDef.pixelSize, data());
+    fontEngine->initFontInfo(fontDef, defaultVerticalDPI());
+
+    return fontEngine;
+}
+
+QStringList QWindowsDirectWriteFontDatabase::fallbacksForFamily(const QString &family, QFont::Style style, QFont::StyleHint styleHint, QChar::Script script) const
+{
+    QStringList result;
+    result.append(familyForStyleHint(styleHint));
+    result.append(extraTryFontsForFamily(family));
+    result.append(QPlatformFontDatabase::fallbacksForFamily(family, style, styleHint, script));
+
+    qCDebug(lcQpaFonts) << __FUNCTION__ << family << style << styleHint
+        << script << result;
+    return result;
+}
+
+QStringList QWindowsDirectWriteFontDatabase::addApplicationFont(const QByteArray &fontData, const QString &fileName)
+{
+    qCDebug(lcQpaFonts) << "Adding application font" << fileName;
+
+    QByteArray loadedData = fontData;
+    if (loadedData.isEmpty()) {
+        QFile file(fileName);
+        if (!file.open(QIODevice::ReadOnly)) {
+            qCWarning(lcQpaFonts) << "Cannot open" << fileName << "for reading.";
+            return QStringList();
+        }
+        loadedData = file.readAll();
+    }
+
+    IDWriteFontFace *face = createDirectWriteFace(loadedData);
+    if (face == nullptr) {
+        qCWarning(lcQpaFonts) << "Failed to create DirectWrite face from font data. Font may be unsupported.";
+        return QStringList();
+    }
+
+    wchar_t defaultLocale[LOCALE_NAME_MAX_LENGTH];
+    bool hasDefaultLocale = GetUserDefaultLocaleName(defaultLocale, LOCALE_NAME_MAX_LENGTH) != 0;
+    wchar_t englishLocale[] = L"en-us";
+
+    static const int SMOOTH_SCALABLE = 0xffff;
+    const QString foundryName; // No such concept.
+    const bool scalable = true;
+    const bool antialias = false;
+    const int size = SMOOTH_SCALABLE;
+
+    QSupportedWritingSystems writingSystems;
+    writingSystems.setSupported(QFontDatabase::Any);
+    writingSystems.setSupported(QFontDatabase::Latin);
+
+    QStringList ret;
+    IDWriteFontFace3 *face3 = nullptr;
+    if (SUCCEEDED(face->QueryInterface(__uuidof(IDWriteFontFace3),
+                                      reinterpret_cast<void **>(&face3)))) {
+        QString defaultLocaleFamilyName;
+        QString englishLocaleFamilyName;
+
+        IDWriteLocalizedStrings *names;
+        if (SUCCEEDED(face3->GetFamilyNames(&names))) {
+            defaultLocaleFamilyName = hasDefaultLocale ? localeString(names, defaultLocale) : QString();
+            englishLocaleFamilyName = localeString(names, englishLocale);
+
+            names->Release();
+        }
+
+        QString defaultLocaleStyleName;
+        QString englishLocaleStyleName;
+        if (SUCCEEDED(face3->GetFaceNames(&names))) {
+            defaultLocaleStyleName = hasDefaultLocale ? localeString(names, defaultLocale) : QString();
+            englishLocaleStyleName = localeString(names, englishLocale);
+
+            names->Release();
+        }
+
+        QFont::Stretch stretch = fromDirectWriteStretch(face3->GetStretch());
+        QFont::Style style = fromDirectWriteStyle(face3->GetStyle());
+        QFont::Weight weight = fromDirectWriteWeight(face3->GetWeight());
+        bool fixed = face3->IsMonospacedFont();
+
+        qCDebug(lcQpaFonts) << "\tFont names:" << englishLocaleFamilyName << ", " << defaultLocaleFamilyName
+                            << ", style names:" << englishLocaleStyleName << ", " << defaultLocaleStyleName
+                            << ", stretch:" << stretch
+                            << ", style:" << style
+                            << ", weight:" << weight
+                            << ", fixed:" << fixed;
+
+        if (!englishLocaleFamilyName.isEmpty()) {
+            ret.append(englishLocaleFamilyName);
+            QPlatformFontDatabase::registerFont(englishLocaleFamilyName, englishLocaleStyleName, QString(), weight, style, stretch, antialias, scalable, size, fixed, writingSystems, face);
+            face->AddRef();
+        }
+
+        if (!defaultLocaleFamilyName.isEmpty() && defaultLocaleFamilyName != englishLocaleFamilyName) {
+            ret.append(defaultLocaleFamilyName);
+            QPlatformFontDatabase::registerFont(defaultLocaleFamilyName, defaultLocaleStyleName, QString(), weight, style, stretch, antialias, scalable, size, fixed, writingSystems, face);
+            face->AddRef();
+        }
+
+        face3->Release();
+    } else {
+        qCWarning(lcQpaFonts) << "Unable to query IDWriteFontFace3 interface from font face.";
+    }
+
+    face->Release();
+
+    return ret;
+}
+
+void QWindowsDirectWriteFontDatabase::releaseHandle(void *handle)
+{
+    IDWriteFontFace *face = reinterpret_cast<IDWriteFontFace *>(handle);
+    face->Release();
+}
+
+bool QWindowsDirectWriteFontDatabase::fontsAlwaysScalable() const
+{
+    return true;
+}
+
+bool QWindowsDirectWriteFontDatabase::isPrivateFontFamily(const QString &family) const
+{
+    Q_UNUSED(family);
+    return false;
+}
+
+void QWindowsDirectWriteFontDatabase::populateFontDatabase()
+{
+    wchar_t defaultLocale[LOCALE_NAME_MAX_LENGTH];
+    bool hasDefaultLocale = GetUserDefaultLocaleName(defaultLocale, LOCALE_NAME_MAX_LENGTH) != 0;
+    wchar_t englishLocale[] = L"en-us";
+
+    QString defaultFontName = defaultFont().family();
+    QString systemDefaultFontName = systemDefaultFont().family();
+
+    IDWriteFontCollection *fontCollection;
+    if (SUCCEEDED(data()->directWriteFactory->GetSystemFontCollection(&fontCollection))) {
+        for (uint i = 0; i < fontCollection->GetFontFamilyCount(); ++i) {
+            IDWriteFontFamily *fontFamily;
+            if (SUCCEEDED(fontCollection->GetFontFamily(i, &fontFamily))) {
+                QString defaultLocaleName;
+                QString englishLocaleName;
+
+                IDWriteLocalizedStrings *names;
+                if (SUCCEEDED(fontFamily->GetFamilyNames(&names))) {
+                    if (hasDefaultLocale)
+                        defaultLocaleName = localeString(names, defaultLocale);
+
+                    englishLocaleName = localeString(names, englishLocale);
+                }
+
+                qCDebug(lcQpaFonts) << "Registering font, english name = " << englishLocaleName << ", name in current locale = " << defaultLocaleName;
+                if (!defaultLocaleName.isEmpty()) {
+                    registerFontFamily(defaultLocaleName);
+                    m_populatedFonts.insert(defaultLocaleName, fontFamily);
+                    fontFamily->AddRef();
+
+                    if (defaultLocaleName == defaultFontName && defaultFontName != systemDefaultFontName) {
+                        qDebug(lcQpaFonts) << "Adding default font" << systemDefaultFontName << "as alternative to" << defaultLocaleName;
+
+                        m_populatedFonts.insert(systemDefaultFontName, fontFamily);
+                        fontFamily->AddRef();
+                    }
+                }
+
+                if (!englishLocaleName.isEmpty() && englishLocaleName != defaultLocaleName) {
+                    registerFontFamily(englishLocaleName);
+                    m_populatedFonts.insert(englishLocaleName, fontFamily);
+                    fontFamily->AddRef();
+
+                    if (englishLocaleName == defaultFontName && defaultFontName != systemDefaultFontName) {
+                        qDebug(lcQpaFonts) << "Adding default font" << systemDefaultFontName << "as alternative to" << englishLocaleName;
+
+                        m_populatedFonts.insert(systemDefaultFontName, fontFamily);
+                        fontFamily->AddRef();
+                    }
+                }
+
+                fontFamily->Release();
+            }
+        }
+    }
+}
+
+QFont QWindowsDirectWriteFontDatabase::defaultFont() const
+{
+    return QFont(QStringLiteral("Segoe UI"));
+}
+
+#endif // QT_USE_DIRECTWRITE3
+
+QT_END_NAMESPACE
diff --git a/src/platformsupport/fontdatabases/windows/qwindowsdirectwritefontdatabase_p.h b/src/platformsupport/fontdatabases/windows/qwindowsdirectwritefontdatabase_p.h
new file mode 100644
index 0000000000..2110043df6
--- /dev/null
+++ b/src/platformsupport/fontdatabases/windows/qwindowsdirectwritefontdatabase_p.h
@@ -0,0 +1,96 @@
+/****************************************************************************
+**
+** Copyright (C) 2020 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the plugins of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QWINDOWSDIRECTWRITEFONTDATABASE_P_H
+#define QWINDOWSDIRECTWRITEFONTDATABASE_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API. It exists purely as an
+// implementation detail. This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include "qwindowsfontdatabasebase_p.h"
+
+#include <qpa/qplatformfontdatabase.h>
+#include <QtCore/qloggingcategory.h>
+
+struct IDWriteFactory;
+struct IDWriteFont;
+struct IDWriteFontFamily;
+struct IDWriteLocalizedStrings;
+
+QT_BEGIN_NAMESPACE
+
+#ifdef QT_USE_DIRECTWRITE3
+
+class QWindowsDirectWriteFontDatabase : public QWindowsFontDatabaseBase
+{
+    Q_DISABLE_COPY_MOVE(QWindowsDirectWriteFontDatabase)
+public:
+    QWindowsDirectWriteFontDatabase();
+    ~QWindowsDirectWriteFontDatabase() override;
+
+    void populateFontDatabase() override;
+    void populateFamily(const QString &familyName) override;
+    QFontEngine *fontEngine(const QFontDef &fontDef, void *handle) override;
+    QStringList fallbacksForFamily(const QString &family, QFont::Style style, QFont::StyleHint styleHint, QChar::Script script) const override;
+    QStringList addApplicationFont(const QByteArray &fontData, const QString &fileName) override;
+    void releaseHandle(void *handle) override;
+    QFont defaultFont() const override;
+
+    bool fontsAlwaysScalable() const override;
+    bool isPrivateFontFamily(const QString &family) const override;
+
+private:
+    static QString localeString(IDWriteLocalizedStrings *names, wchar_t localeName[]);
+
+    QHash<QString, IDWriteFontFamily *> m_populatedFonts;
+};
+
+#endif // QT_USE_DIRECTWRITE3
+
+QT_END_NAMESPACE
+
+#endif // QWINDOWSDIRECTWRITEFONTDATABASE_P_H
diff --git a/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase.cpp b/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase.cpp
index 36a94724c1..9c348c9e19 100644
--- a/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase.cpp
+++ b/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase.cpp
@@ -51,7 +51,6 @@
 #include <QtCore/QDebug>
 #include <QtCore/QFile>
 #include <QtCore/QtEndian>
-#include <QtCore/QThreadStorage>
 #include <QtCore/private/qsystemlibrary_p.h>
 #include <QtCore/private/qwinregistry_p.h>
 
@@ -64,6 +63,7 @@
 #    include <dwrite.h>
 #  endif
 #  include <d2d1.h>
+#  include "qwindowsdirectwritefontdatabase_p.h"
 #endif
 
 QT_BEGIN_NAMESPACE
@@ -75,40 +75,6 @@ Q_LOGGING_CATEGORY(lcQpaFonts, "qt.qpa.fonts")
 
 typedef HRESULT (WINAPI *DWriteCreateFactoryType)(DWRITE_FACTORY_TYPE, const IID &, IUnknown **);
 
-static inline DWriteCreateFactoryType resolveDWriteCreateFactory()
-{
-    QSystemLibrary library(QStringLiteral("dwrite"));
-    QFunctionPointer result = library.resolve("DWriteCreateFactory");
-    if (Q_UNLIKELY(!result)) {
-        qWarning("Unable to load dwrite.dll");
-        return nullptr;
-    }
-    return reinterpret_cast<DWriteCreateFactoryType>(result);
-}
-
-static void createDirectWriteFactory(IDWriteFactory **factory)
-{
-    *factory = nullptr;
-
-    static const DWriteCreateFactoryType dWriteCreateFactory = resolveDWriteCreateFactory();
-    if (!dWriteCreateFactory)
-        return;
-
-    IUnknown *result = NULL;
-#if defined(QT_USE_DIRECTWRITE2)
-    dWriteCreateFactory(DWRITE_FACTORY_TYPE_SHARED, __uuidof(IDWriteFactory2), &result);
-#endif
-
-    if (result == NULL) {
-        if (FAILED(dWriteCreateFactory(DWRITE_FACTORY_TYPE_SHARED, __uuidof(IDWriteFactory), &result))) {
-            qErrnoWarning("DWriteCreateFactory failed");
-            return;
-        }
-    }
-
-    *factory = static_cast<IDWriteFactory *>(result);
-}
-
 static inline bool useDirectWrite(QFont::HintingPreference hintingPreference,
                                   const QString &familyName = QString(),
                                   bool isColorFont = false)
@@ -131,459 +97,6 @@ static inline bool useDirectWrite(QFont::HintingPreference hintingPreference,
 }
 #endif // !QT_NO_DIRECTWRITE
 
-// Helper classes for creating font engines directly from font data
-namespace {
-
-#   pragma pack(1)
-
-    // Common structure for all formats of the "name" table
-    struct NameTable
-    {
-        quint16 format;
-        quint16 count;
-        quint16 stringOffset;
-    };
-
-    struct NameRecord
-    {
-        quint16 platformID;
-        quint16 encodingID;
-        quint16 languageID;
-        quint16 nameID;
-        quint16 length;
-        quint16 offset;
-    };
-
-    struct OffsetSubTable
-    {
-        quint32 scalerType;
-        quint16 numTables;
-        quint16 searchRange;
-        quint16 entrySelector;
-        quint16 rangeShift;
-    };
-
-    struct TableDirectory
-    {
-        quint32 identifier;
-        quint32 checkSum;
-        quint32 offset;
-        quint32 length;
-    };
-
-    struct OS2Table
-    {
-        quint16 version;
-        qint16  avgCharWidth;
-        quint16 weightClass;
-        quint16 widthClass;
-        quint16 type;
-        qint16  subscriptXSize;
-        qint16  subscriptYSize;
-        qint16  subscriptXOffset;
-        qint16  subscriptYOffset;
-        qint16  superscriptXSize;
-        qint16  superscriptYSize;
-        qint16  superscriptXOffset;
-        qint16  superscriptYOffset;
-        qint16  strikeOutSize;
-        qint16  strikeOutPosition;
-        qint16  familyClass;
-        quint8  panose[10];
-        quint32 unicodeRanges[4];
-        quint8  vendorID[4];
-        quint16 selection;
-        quint16 firstCharIndex;
-        quint16 lastCharIndex;
-        qint16  typoAscender;
-        qint16  typoDescender;
-        qint16  typoLineGap;
-        quint16 winAscent;
-        quint16 winDescent;
-        quint32 codepageRanges[2];
-        qint16  height;
-        qint16  capHeight;
-        quint16 defaultChar;
-        quint16 breakChar;
-        quint16 maxContext;
-    };
-
-#   pragma pack()
-
-    class EmbeddedFont
-    {
-    public:
-        EmbeddedFont(const QByteArray &fontData) : m_fontData(fontData) {}
-
-        QString changeFamilyName(const QString &newFamilyName);
-        QByteArray data() const { return m_fontData; }
-        TableDirectory *tableDirectoryEntry(const QByteArray &tagName);
-        QString familyName(TableDirectory *nameTableDirectory = 0);
-
-    private:
-        QByteArray m_fontData;
-    };
-
-    TableDirectory *EmbeddedFont::tableDirectoryEntry(const QByteArray &tagName)
-    {
-        Q_ASSERT(tagName.size() == 4);
-        quint32 tagId = *(reinterpret_cast<const quint32 *>(tagName.constData()));
-        const size_t fontDataSize = m_fontData.size();
-        if (Q_UNLIKELY(fontDataSize < sizeof(OffsetSubTable)))
-            return 0;
-
-        OffsetSubTable *offsetSubTable = reinterpret_cast<OffsetSubTable *>(m_fontData.data());
-        TableDirectory *tableDirectory = reinterpret_cast<TableDirectory *>(offsetSubTable + 1);
-
-        const size_t tableCount = qFromBigEndian<quint16>(offsetSubTable->numTables);
-        if (Q_UNLIKELY(fontDataSize < sizeof(OffsetSubTable) + sizeof(TableDirectory) * tableCount))
-            return 0;
-
-        TableDirectory *tableDirectoryEnd = tableDirectory + tableCount;
-        for (TableDirectory *entry = tableDirectory; entry < tableDirectoryEnd; ++entry) {
-            if (entry->identifier == tagId)
-                return entry;
-        }
-
-        return 0;
-    }
-
-    QString EmbeddedFont::familyName(TableDirectory *nameTableDirectoryEntry)
-    {
-        QString name;
-
-        if (nameTableDirectoryEntry == 0)
-            nameTableDirectoryEntry = tableDirectoryEntry("name");
-
-        if (nameTableDirectoryEntry != 0) {
-            quint32 offset = qFromBigEndian<quint32>(nameTableDirectoryEntry->offset);
-            if (Q_UNLIKELY(quint32(m_fontData.size()) < offset + sizeof(NameTable)))
-                return QString();
-
-            NameTable *nameTable = reinterpret_cast<NameTable *>(m_fontData.data() + offset);
-            NameRecord *nameRecord = reinterpret_cast<NameRecord *>(nameTable + 1);
-
-            quint16 nameTableCount = qFromBigEndian<quint16>(nameTable->count);
-            if (Q_UNLIKELY(quint32(m_fontData.size()) < offset + sizeof(NameRecord) * nameTableCount))
-                return QString();
-
-            for (int i = 0; i < nameTableCount; ++i, ++nameRecord) {
-                if (qFromBigEndian<quint16>(nameRecord->nameID) == 1
-                 && qFromBigEndian<quint16>(nameRecord->platformID) == 3 // Windows
-                 && qFromBigEndian<quint16>(nameRecord->languageID) == 0x0409) { // US English
-                    quint16 stringOffset = qFromBigEndian<quint16>(nameTable->stringOffset);
-                    quint16 nameOffset = qFromBigEndian<quint16>(nameRecord->offset);
-                    quint16 nameLength = qFromBigEndian<quint16>(nameRecord->length);
-
-                    if (Q_UNLIKELY(quint32(m_fontData.size()) < offset + stringOffset + nameOffset + nameLength))
-                        return QString();
-
-                    const void *ptr = reinterpret_cast<const quint8 *>(nameTable)
-                                                        + stringOffset
-                                                        + nameOffset;
-
-                    const quint16 *s = reinterpret_cast<const quint16 *>(ptr);
-                    const quint16 *e = s + nameLength / sizeof(quint16);
-                    while (s != e)
-                        name += QChar( qFromBigEndian<quint16>(*s++));
-                    break;
-                }
-            }
-        }
-
-        return name;
-    }
-
-    QString EmbeddedFont::changeFamilyName(const QString &newFamilyName)
-    {
-        TableDirectory *nameTableDirectoryEntry = tableDirectoryEntry("name");
-        if (nameTableDirectoryEntry == 0)
-            return QString();
-
-        QString oldFamilyName = familyName(nameTableDirectoryEntry);
-
-        // Reserve size for name table header, five required name records and string
-        const int requiredRecordCount = 5;
-        quint16 nameIds[requiredRecordCount] = { 1, 2, 3, 4, 6 };
-
-        int sizeOfHeader = sizeof(NameTable) + sizeof(NameRecord) * requiredRecordCount;
-        int newFamilyNameSize = newFamilyName.size() * int(sizeof(quint16));
-
-        const QString regularString = QString::fromLatin1("Regular");
-        int regularStringSize = regularString.size() * int(sizeof(quint16));
-
-        // Align table size of table to 32 bits (pad with 0)
-        int fullSize = ((sizeOfHeader + newFamilyNameSize + regularStringSize) & ~3) + 4;
-
-        QByteArray newNameTable(fullSize, char(0));
-
-        {
-            NameTable *nameTable = reinterpret_cast<NameTable *>(newNameTable.data());
-            nameTable->count = qbswap<quint16>(requiredRecordCount);
-            nameTable->stringOffset = qbswap<quint16>(sizeOfHeader);
-
-            NameRecord *nameRecord = reinterpret_cast<NameRecord *>(nameTable + 1);
-            for (int i = 0; i < requiredRecordCount; ++i, nameRecord++) {
-                nameRecord->nameID = qbswap<quint16>(nameIds[i]);
-                nameRecord->encodingID = qbswap<quint16>(1);
-                nameRecord->languageID = qbswap<quint16>(0x0409);
-                nameRecord->platformID = qbswap<quint16>(3);
-                nameRecord->length = qbswap<quint16>(newFamilyNameSize);
-
-                // Special case for sub-family
-                if (nameIds[i] == 4) {
-                    nameRecord->offset = qbswap<quint16>(newFamilyNameSize);
-                    nameRecord->length = qbswap<quint16>(regularStringSize);
-                }
-            }
-
-            // nameRecord now points to string data
-            quint16 *stringStorage = reinterpret_cast<quint16 *>(nameRecord);
-            const quint16 *sourceString = newFamilyName.utf16();
-            for (int i = 0; i < newFamilyName.size(); ++i)
-                stringStorage[i] = qbswap<quint16>(sourceString[i]);
-            stringStorage += newFamilyName.size();
-
-            sourceString = regularString.utf16();
-            for (int i = 0; i < regularString.size(); ++i)
-                stringStorage[i] = qbswap<quint16>(sourceString[i]);
-        }
-
-        quint32 *p = reinterpret_cast<quint32 *>(newNameTable.data());
-        quint32 *tableEnd = reinterpret_cast<quint32 *>(newNameTable.data() + fullSize);
-
-        quint32 checkSum = 0;
-        while (p < tableEnd)
-            checkSum +=  qFromBigEndian<quint32>(*(p++));
-
-        nameTableDirectoryEntry->checkSum = qbswap<quint32>(checkSum);
-        nameTableDirectoryEntry->offset = qbswap<quint32>(m_fontData.size());
-        nameTableDirectoryEntry->length = qbswap<quint32>(fullSize);
-
-        m_fontData.append(newNameTable);
-
-        return oldFamilyName;
-    }
-
-#if !defined(QT_NO_DIRECTWRITE)
-
-    class DirectWriteFontFileStream: public IDWriteFontFileStream
-    {
-        Q_DISABLE_COPY(DirectWriteFontFileStream)
-    public:
-        DirectWriteFontFileStream(const QByteArray &fontData)
-            : m_fontData(fontData)
-            , m_referenceCount(0)
-        {
-        }
-        virtual ~DirectWriteFontFileStream()
-        {
-        }
-
-        HRESULT STDMETHODCALLTYPE QueryInterface(REFIID iid, void **object);
-        ULONG STDMETHODCALLTYPE AddRef();
-        ULONG STDMETHODCALLTYPE Release();
-
-        HRESULT STDMETHODCALLTYPE ReadFileFragment(const void **fragmentStart, UINT64 fileOffset,
-                                                   UINT64 fragmentSize, OUT void **fragmentContext);
-        void STDMETHODCALLTYPE ReleaseFileFragment(void *fragmentContext);
-        HRESULT STDMETHODCALLTYPE GetFileSize(OUT UINT64 *fileSize);
-        HRESULT STDMETHODCALLTYPE GetLastWriteTime(OUT UINT64 *lastWriteTime);
-
-    private:
-        QByteArray m_fontData;
-        ULONG m_referenceCount;
-    };
-
-    HRESULT STDMETHODCALLTYPE DirectWriteFontFileStream::QueryInterface(REFIID iid, void **object)
-    {
-        if (iid == IID_IUnknown || iid == __uuidof(IDWriteFontFileStream)) {
-            *object = this;
-            AddRef();
-            return S_OK;
-        } else {
-            *object = NULL;
-            return E_NOINTERFACE;
-        }
-    }
-
-    ULONG STDMETHODCALLTYPE DirectWriteFontFileStream::AddRef()
-    {
-        return InterlockedIncrement(&m_referenceCount);
-    }
-
-    ULONG STDMETHODCALLTYPE DirectWriteFontFileStream::Release()
-    {
-        ULONG newCount = InterlockedDecrement(&m_referenceCount);
-        if (newCount == 0)
-            delete this;
-        return newCount;
-    }
-
-    HRESULT STDMETHODCALLTYPE DirectWriteFontFileStream::ReadFileFragment(
-        const void **fragmentStart,
-        UINT64 fileOffset,
-        UINT64 fragmentSize,
-        OUT void **fragmentContext)
-    {
-        *fragmentContext = NULL;
-        if (fileOffset + fragmentSize <= quint64(m_fontData.size())) {
-            *fragmentStart = m_fontData.data() + fileOffset;
-            return S_OK;
-        } else {
-            *fragmentStart = NULL;
-            return E_FAIL;
-        }
-    }
-
-    void STDMETHODCALLTYPE DirectWriteFontFileStream::ReleaseFileFragment(void *)
-    {
-    }
-
-    HRESULT STDMETHODCALLTYPE DirectWriteFontFileStream::GetFileSize(UINT64 *fileSize)
-    {
-        *fileSize = m_fontData.size();
-        return S_OK;
-    }
-
-    HRESULT STDMETHODCALLTYPE DirectWriteFontFileStream::GetLastWriteTime(UINT64 *lastWriteTime)
-    {
-        *lastWriteTime = 0;
-        return E_NOTIMPL;
-    }
-
-    class DirectWriteFontFileLoader: public IDWriteFontFileLoader
-    {
-    public:
-        DirectWriteFontFileLoader() : m_referenceCount(0) {}
-        virtual ~DirectWriteFontFileLoader()
-        {
-        }
-
-        inline void addKey(const void *key, const QByteArray &fontData)
-        {
-            Q_ASSERT(!m_fontDatas.contains(key));
-            m_fontDatas.insert(key, fontData);
-        }
-
-        inline void removeKey(const void *key)
-        {
-            m_fontDatas.remove(key);
-        }
-
-        HRESULT STDMETHODCALLTYPE QueryInterface(REFIID iid, void **object);
-        ULONG STDMETHODCALLTYPE AddRef();
-        ULONG STDMETHODCALLTYPE Release();
-
-        HRESULT STDMETHODCALLTYPE CreateStreamFromKey(void const *fontFileReferenceKey,
-                                                      UINT32 fontFileReferenceKeySize,
-                                                      OUT IDWriteFontFileStream **fontFileStream);
-
-    private:
-        ULONG m_referenceCount;
-        QHash<const void *, QByteArray> m_fontDatas;
-    };
-
-    HRESULT STDMETHODCALLTYPE DirectWriteFontFileLoader::QueryInterface(const IID &iid,
-                                                                        void **object)
-    {
-        if (iid == IID_IUnknown || iid == __uuidof(IDWriteFontFileLoader)) {
-            *object = this;
-            AddRef();
-            return S_OK;
-        } else {
-            *object = NULL;
-            return E_NOINTERFACE;
-        }
-    }
-
-    ULONG STDMETHODCALLTYPE DirectWriteFontFileLoader::AddRef()
-    {
-        return InterlockedIncrement(&m_referenceCount);
-    }
-
-    ULONG STDMETHODCALLTYPE DirectWriteFontFileLoader::Release()
-    {
-        ULONG newCount = InterlockedDecrement(&m_referenceCount);
-        if (newCount == 0)
-            delete this;
-        return newCount;
-    }
-
-    HRESULT STDMETHODCALLTYPE DirectWriteFontFileLoader::CreateStreamFromKey(
-        void const *fontFileReferenceKey,
-        UINT32 fontFileReferenceKeySize,
-        IDWriteFontFileStream **fontFileStream)
-    {
-        Q_UNUSED(fontFileReferenceKeySize);
-
-        if (fontFileReferenceKeySize != sizeof(const void *)) {
-            qWarning("%s: Wrong key size", __FUNCTION__);
-            return E_FAIL;
-        }
-
-        const void *key = *reinterpret_cast<void * const *>(fontFileReferenceKey);
-        *fontFileStream = NULL;
-        auto it = m_fontDatas.constFind(key);
-        if (it == m_fontDatas.constEnd())
-            return E_FAIL;
-
-        QByteArray fontData = it.value();
-        DirectWriteFontFileStream *stream = new DirectWriteFontFileStream(fontData);
-        stream->AddRef();
-        *fontFileStream = stream;
-
-        return S_OK;
-    }
-
-    class CustomFontFileLoader
-    {
-    public:
-        CustomFontFileLoader() : m_directWriteFontFileLoader(nullptr)
-        {
-            createDirectWriteFactory(&m_directWriteFactory);
-
-            if (m_directWriteFactory) {
-                m_directWriteFontFileLoader = new DirectWriteFontFileLoader();
-                m_directWriteFactory->RegisterFontFileLoader(m_directWriteFontFileLoader);
-            }
-        }
-
-        ~CustomFontFileLoader()
-        {
-            if (m_directWriteFactory != 0 && m_directWriteFontFileLoader != 0)
-                m_directWriteFactory->UnregisterFontFileLoader(m_directWriteFontFileLoader);
-
-            if (m_directWriteFactory != 0)
-                m_directWriteFactory->Release();
-        }
-
-        void addKey(const void *key, const QByteArray &fontData)
-        {
-            if (m_directWriteFontFileLoader != 0)
-                m_directWriteFontFileLoader->addKey(key, fontData);
-        }
-
-        void removeKey(const void *key)
-        {
-            if (m_directWriteFontFileLoader != 0)
-                m_directWriteFontFileLoader->removeKey(key);
-        }
-
-        IDWriteFontFileLoader *loader() const
-        {
-            return m_directWriteFontFileLoader;
-        }
-
-    private:
-        IDWriteFactory *m_directWriteFactory;
-        DirectWriteFontFileLoader *m_directWriteFontFileLoader;
-    };
-
-#endif
-
-} // Anonymous namespace
-
 /*!
     \struct QWindowsFontEngineData
     \brief Static constant data shared by the font engines.
@@ -620,18 +133,6 @@ unsigned QWindowsFontDatabase::fontOptions()
     return m_fontOptions;
 }
 
-QWindowsFontEngineData::~QWindowsFontEngineData()
-{
-    if (hdc)
-        DeleteDC(hdc);
-#if !defined(QT_NO_DIRECTWRITE)
-    if (directWriteGdiInterop)
-        directWriteGdiInterop->Release();
-    if (directWriteFactory)
-        directWriteFactory->Release();
-#endif
-}
-
 qreal QWindowsFontDatabase::fontSmoothingGamma()
 {
     int winSmooth;
@@ -645,26 +146,6 @@ qreal QWindowsFontDatabase::fontSmoothingGamma()
     return result;
 }
 
-#if !defined(QT_NO_DIRECTWRITE)
-static inline bool initDirectWrite(QWindowsFontEngineData *d)
-{
-    if (!d->directWriteFactory) {
-        createDirectWriteFactory(&d->directWriteFactory);
-        if (!d->directWriteFactory)
-            return false;
-    }
-    if (!d->directWriteGdiInterop) {
-        const HRESULT  hr = d->directWriteFactory->GetGdiInterop(&d->directWriteGdiInterop);
-        if (FAILED(hr)) {
-            qErrnoWarning("%s: GetGdiInterop failed", __FUNCTION__);
-            return false;
-        }
-    }
-    return true;
-}
-
-#endif // !defined(QT_NO_DIRECTWRITE)
-
 /*!
     \class QWindowsFontDatabase
     \brief Font database for Windows
@@ -1239,20 +720,6 @@ void QWindowsFontDatabase::populateFontDatabase()
     addDefaultEUDCFont();
 }
 
-typedef QSharedPointer<QWindowsFontEngineData> QWindowsFontEngineDataPtr;
-
-typedef QThreadStorage<QWindowsFontEngineDataPtr> FontEngineThreadLocalData;
-
-Q_GLOBAL_STATIC(FontEngineThreadLocalData, fontEngineThreadLocalData)
-
-QSharedPointer<QWindowsFontEngineData> sharedFontData()
-{
-    FontEngineThreadLocalData *data = fontEngineThreadLocalData();
-    if (!data->hasLocalData())
-        data->setLocalData(QSharedPointer<QWindowsFontEngineData>::create());
-    return data->localData();
-}
-
 QWindowsFontDatabase::QWindowsFontDatabase()
 {
     // Properties accessed by QWin32PrintEngine (Qt Print Support)
@@ -1262,9 +729,9 @@ QWindowsFontDatabase::QWindowsFontDatabase()
     Q_UNUSED(logFontMetaTypeId)
 
     if (lcQpaFonts().isDebugEnabled()) {
-        const QWindowsFontEngineDataPtr data = sharedFontData();
+        QSharedPointer<QWindowsFontEngineData> d = data();
         qCDebug(lcQpaFonts) << __FUNCTION__ << "Clear type: "
-            << data->clearTypeEnabled << "gamma: " << data->fontSmoothingGamma;
+            << d->clearTypeEnabled << "gamma: " << d->fontSmoothingGamma;
     }
 }
 
@@ -1278,7 +745,7 @@ QFontEngine * QWindowsFontDatabase::fontEngine(const QFontDef &fontDef, void *ha
     const QString faceName(static_cast<const QChar*>(handle));
     QFontEngine *fe = QWindowsFontDatabase::createEngine(fontDef, faceName,
                                                          defaultVerticalDPI(),
-                                                         sharedFontData());
+                                                         data());
     qCDebug(lcQpaFonts) << __FUNCTION__ << "FONTDEF" << fontDef << fe << handle;
     return fe;
 }
@@ -1332,7 +799,7 @@ QT_WARNING_POP
 
             fontEngine = QWindowsFontDatabase::createEngine(request, QString(),
                                                             defaultVerticalDPI(),
-                                                            sharedFontData());
+                                                            data());
 
             if (fontEngine) {
                 if (request.family != fontEngine->fontDef.family) {
@@ -1371,87 +838,17 @@ QT_WARNING_POP
                 RemoveFontMemResourceEx(fontHandle);
             }
         }
+
+        // Get style and weight info
+        if (fontEngine != nullptr)
+            font.updateFromOS2Table(fontEngine);
     }
 #if !defined(QT_NO_DIRECTWRITE)
     else {
-        CustomFontFileLoader fontFileLoader;
-        fontFileLoader.addKey(this, fontData);
-
-        QSharedPointer<QWindowsFontEngineData> fontEngineData = sharedFontData();
-        if (!initDirectWrite(fontEngineData.data()))
-            return 0;
-
-        IDWriteFontFile *fontFile = 0;
-        void *key = this;
-
-        HRESULT hres = fontEngineData->directWriteFactory->CreateCustomFontFileReference(&key,
-                                                                                         sizeof(void *),
-                                                                                         fontFileLoader.loader(),
-                                                                                         &fontFile);
-        if (FAILED(hres)) {
-            qErrnoWarning(hres, "%s: CreateCustomFontFileReference failed", __FUNCTION__);
-            return 0;
-        }
-
-        BOOL isSupportedFontType;
-        DWRITE_FONT_FILE_TYPE fontFileType;
-        DWRITE_FONT_FACE_TYPE fontFaceType;
-        UINT32 numberOfFaces;
-        fontFile->Analyze(&isSupportedFontType, &fontFileType, &fontFaceType, &numberOfFaces);
-        if (!isSupportedFontType) {
-            fontFile->Release();
-            return 0;
-        }
-
-        IDWriteFontFace *directWriteFontFace = 0;
-        hres = fontEngineData->directWriteFactory->CreateFontFace(fontFaceType,
-                                                                  1,
-                                                                  &fontFile,
-                                                                  0,
-                                                                  DWRITE_FONT_SIMULATIONS_NONE,
-                                                                  &directWriteFontFace);
-        if (FAILED(hres)) {
-            qErrnoWarning(hres, "%s: CreateFontFace failed", __FUNCTION__);
-            fontFile->Release();
-            return 0;
-        }
-
-        fontFile->Release();
-
-        fontEngine = new QWindowsFontEngineDirectWrite(directWriteFontFace,
-                                                       pixelSize,
-                                                       fontEngineData);
-
-        // Get font family from font data
-        fontEngine->fontDef.family = font.familyName();
-        fontEngine->fontDef.hintingPreference = hintingPreference;
-
-        directWriteFontFace->Release();
+        fontEngine = QWindowsFontDatabaseBase::fontEngine(fontData, pixelSize, hintingPreference);
     }
 #endif
 
-    // Get style and weight info
-    if (fontEngine != 0) {
-        TableDirectory *os2TableEntry = font.tableDirectoryEntry("OS/2");
-        if (os2TableEntry != 0) {
-            const OS2Table *os2Table =
-                    reinterpret_cast<const OS2Table *>(fontData.constData()
-                                                       + qFromBigEndian<quint32>(os2TableEntry->offset));
-
-            bool italic = qFromBigEndian<quint16>(os2Table->selection)  & (1 << 0);
-            bool oblique = qFromBigEndian<quint16>(os2Table->selection) & (1 << 9);
-
-            if (italic)
-                fontEngine->fontDef.style = QFont::StyleItalic;
-            else if (oblique)
-                fontEngine->fontDef.style = QFont::StyleOblique;
-            else
-                fontEngine->fontDef.style = QFont::StyleNormal;
-
-            fontEngine->fontDef.weight = QPlatformFontDatabase::weightFromInteger(qFromBigEndian<quint16>(os2Table->weightClass));
-        }
-    }
-
     qCDebug(lcQpaFonts) << __FUNCTION__ << "FONTDATA" << fontData << pixelSize << hintingPreference << fontEngine;
     return fontEngine;
 }
@@ -1683,234 +1080,12 @@ void QWindowsFontDatabase::refUniqueFont(const QString &uniqueFont)
         m_uniqueFontData[uniqueFont].refCount.ref();
 }
 
-// ### fixme Qt 6 (QTBUG-58610): See comment at QWindowsFontDatabase::systemDefaultFont()
-HFONT QWindowsFontDatabase::systemFont()
-{
-    static const auto stock_sysfont =
-        reinterpret_cast<HFONT>(GetStockObject(DEFAULT_GUI_FONT));
-    return stock_sysfont;
-}
-
-// Creation functions
-
-static const char *other_tryFonts[] = {
-    "Arial",
-    "MS UI Gothic",
-    "Gulim",
-    "SimSun",
-    "PMingLiU",
-    "Arial Unicode MS",
-    0
-};
-
-static const char *jp_tryFonts [] = {
-    "MS UI Gothic",
-    "Arial",
-    "Gulim",
-    "SimSun",
-    "PMingLiU",
-    "Arial Unicode MS",
-    0
-};
-
-static const char *ch_CN_tryFonts [] = {
-    "SimSun",
-    "Arial",
-    "PMingLiU",
-    "Gulim",
-    "MS UI Gothic",
-    "Arial Unicode MS",
-    0
-};
-
-static const char *ch_TW_tryFonts [] = {
-    "PMingLiU",
-    "Arial",
-    "SimSun",
-    "Gulim",
-    "MS UI Gothic",
-    "Arial Unicode MS",
-    0
-};
-
-static const char *kr_tryFonts[] = {
-    "Gulim",
-    "Arial",
-    "PMingLiU",
-    "SimSun",
-    "MS UI Gothic",
-    "Arial Unicode MS",
-    0
-};
-
-static const char **tryFonts = 0;
-
-LOGFONT QWindowsFontDatabase::fontDefToLOGFONT(const QFontDef &request, const QString &faceName)
-{
-    LOGFONT lf;
-    memset(&lf, 0, sizeof(LOGFONT));
-
-    lf.lfHeight = -qRound(request.pixelSize);
-    lf.lfWidth                = 0;
-    lf.lfEscapement        = 0;
-    lf.lfOrientation        = 0;
-    if (request.weight == 50)
-        lf.lfWeight = FW_DONTCARE;
-    else
-        lf.lfWeight = (request.weight*900)/99;
-    lf.lfItalic         = request.style != QFont::StyleNormal;
-    lf.lfCharSet        = DEFAULT_CHARSET;
-
-    int strat = OUT_DEFAULT_PRECIS;
-    if (request.styleStrategy & QFont::PreferBitmap) {
-        strat = OUT_RASTER_PRECIS;
-    } else if (request.styleStrategy & QFont::PreferDevice) {
-        strat = OUT_DEVICE_PRECIS;
-    } else if (request.styleStrategy & QFont::PreferOutline) {
-        strat = OUT_OUTLINE_PRECIS;
-    } else if (request.styleStrategy & QFont::ForceOutline) {
-        strat = OUT_TT_ONLY_PRECIS;
-    }
-
-    lf.lfOutPrecision   = strat;
-
-    int qual = DEFAULT_QUALITY;
-
-    if (request.styleStrategy & QFont::PreferMatch)
-        qual = DRAFT_QUALITY;
-    else if (request.styleStrategy & QFont::PreferQuality)
-        qual = PROOF_QUALITY;
-
-    if (request.styleStrategy & QFont::PreferAntialias) {
-        qual = (request.styleStrategy & QFont::NoSubpixelAntialias) == 0
-            ? CLEARTYPE_QUALITY : ANTIALIASED_QUALITY;
-    } else if (request.styleStrategy & QFont::NoAntialias) {
-        qual = NONANTIALIASED_QUALITY;
-    } else if ((request.styleStrategy & QFont::NoSubpixelAntialias) && sharedFontData()->clearTypeEnabled) {
-        qual = ANTIALIASED_QUALITY;
-    }
-
-    lf.lfQuality        = qual;
-
-    lf.lfClipPrecision  = CLIP_DEFAULT_PRECIS;
-
-    int hint = FF_DONTCARE;
-    switch (request.styleHint) {
-        case QFont::Helvetica:
-            hint = FF_SWISS;
-            break;
-        case QFont::Times:
-            hint = FF_ROMAN;
-            break;
-        case QFont::Courier:
-            hint = FF_MODERN;
-            break;
-        case QFont::OldEnglish:
-            hint = FF_DECORATIVE;
-            break;
-        case QFont::System:
-            hint = FF_MODERN;
-            break;
-        default:
-            break;
-    }
-
-    lf.lfPitchAndFamily = DEFAULT_PITCH | hint;
-
-    QString fam = faceName;
-    if (fam.isEmpty())
-        fam = request.families.size() > 0 ? request.families.at(0) : request.family;
-    if (Q_UNLIKELY(fam.size() >= LF_FACESIZE)) {
-        qCritical("%s: Family name '%s' is too long.", __FUNCTION__, qPrintable(fam));
-        fam.truncate(LF_FACESIZE - 1);
-    }
-
-    if (fam.isEmpty())
-        fam = QStringLiteral("MS Sans Serif");
-
-    if (fam == QLatin1String("MS Sans Serif")
-        && (request.style == QFont::StyleItalic || (-lf.lfHeight > 18 && -lf.lfHeight != 24))) {
-        fam = QStringLiteral("Arial"); // MS Sans Serif has bearing problems in italic, and does not scale
-    }
-    if (fam == QLatin1String("Courier") && !(request.styleStrategy & QFont::PreferBitmap))
-        fam = QStringLiteral("Courier New");
-
-    memcpy(lf.lfFaceName, fam.utf16(), fam.size() * sizeof(wchar_t));
-
-    return lf;
-}
-
-QStringList QWindowsFontDatabase::extraTryFontsForFamily(const QString &family)
-{
-    QStringList result;
-    QFontDatabase db;
-    if (!db.writingSystems(family).contains(QFontDatabase::Symbol)) {
-        if (!tryFonts) {
-            LANGID lid = GetUserDefaultLangID();
-            switch (lid&0xff) {
-            case LANG_CHINESE: // Chinese
-                if ( lid == 0x0804 || lid == 0x1004) // China mainland and Singapore
-                    tryFonts = ch_CN_tryFonts;
-                else
-                    tryFonts = ch_TW_tryFonts; // Taiwan, Hong Kong and Macau
-                break;
-            case LANG_JAPANESE:
-                tryFonts = jp_tryFonts;
-                break;
-            case LANG_KOREAN:
-                tryFonts = kr_tryFonts;
-                break;
-            default:
-                tryFonts = other_tryFonts;
-                break;
-            }
-        }
-        QFontDatabase db;
-        const QStringList families = db.families();
-        const char **tf = tryFonts;
-        while (tf && *tf) {
-            // QTBUG-31689, family might be an English alias for a localized font name.
-            const QString family = QString::fromLatin1(*tf);
-            if (families.contains(family) || db.hasFamily(family))
-                result << family;
-            ++tf;
-        }
-    }
-    result.append(QStringLiteral("Segoe UI Emoji"));
-    result.append(QStringLiteral("Segoe UI Symbol"));
-    return result;
-}
-
-QString QWindowsFontDatabase::familyForStyleHint(QFont::StyleHint styleHint)
-{
-    switch (styleHint) {
-    case QFont::Times:
-        return QStringLiteral("Times New Roman");
-    case QFont::Courier:
-        return QStringLiteral("Courier New");
-    case QFont::Monospace:
-        return QStringLiteral("Courier New");
-    case QFont::Cursive:
-        return QStringLiteral("Comic Sans MS");
-    case QFont::Fantasy:
-        return QStringLiteral("Impact");
-    case QFont::Decorative:
-        return QStringLiteral("Old English");
-    case QFont::Helvetica:
-        return QStringLiteral("Arial");
-    case QFont::System:
-    default:
-        break;
-    }
-    return QStringLiteral("MS Shell Dlg 2");
-}
-
 QStringList QWindowsFontDatabase::fallbacksForFamily(const QString &family, QFont::Style style, QFont::StyleHint styleHint, QChar::Script script) const
 {
     QStringList result;
-    result.append(QWindowsFontDatabase::familyForStyleHint(styleHint));
+    result.append(familyForStyleHint(styleHint));
     result.append(m_eudcFonts);
-    result.append(QWindowsFontDatabase::extraTryFontsForFamily(family));
+    result.append(extraTryFontsForFamily(family));
     result.append(QPlatformFontDatabase::fallbacksForFamily(family, style, styleHint, script));
 
     qCDebug(lcQpaFonts) << __FUNCTION__ << family << style << styleHint
@@ -1947,7 +1122,7 @@ QFontEngine *QWindowsFontDatabase::createEngine(const QFontDef &request, const Q
     }
 
 #if !defined(QT_NO_DIRECTWRITE)
-    if (initDirectWrite(data.data())) {
+    if (data->directWriteFactory != nullptr) {
         const QString fam = QString::fromWCharArray(lf.lfFaceName);
         const QString nameSubstitute = QWindowsFontEngineDirectWrite::fontNameSubstitute(fam);
         if (nameSubstitute != fam) {
@@ -2023,62 +1198,6 @@ QFontEngine *QWindowsFontDatabase::createEngine(const QFontDef &request, const Q
     return fe;
 }
 
-QFont QWindowsFontDatabase::systemDefaultFont()
-{
-#if QT_VERSION >= 0x060000
-    // Qt 6: Obtain default GUI font (typically "Segoe UI, 9pt", see QTBUG-58610)
-    NONCLIENTMETRICS ncm;
-    ncm.cbSize = FIELD_OFFSET(NONCLIENTMETRICS, lfMessageFont) + sizeof(LOGFONT);
-    SystemParametersInfo(SPI_GETNONCLIENTMETRICS, ncm.cbSize , &ncm, 0);
-    const QFont systemFont = QWindowsFontDatabase::LOGFONT_to_QFont(ncm.lfMessageFont);
-#else
-    LOGFONT lf;
-    GetObject(QWindowsFontDatabase::systemFont(), sizeof(lf), &lf);
-    QFont systemFont =  QWindowsFontDatabase::LOGFONT_to_QFont(lf);
-    // "MS Shell Dlg 2" is the correct system font >= Win2k
-    if (systemFont.family() == QLatin1String("MS Shell Dlg"))
-        systemFont.setFamily(QStringLiteral("MS Shell Dlg 2"));
-    // Qt 5 by (Qt 4) legacy uses GetStockObject(DEFAULT_GUI_FONT) to
-    // obtain the default GUI font (typically "MS Shell Dlg 2, 8pt"). This has been
-    // long deprecated; the message font of the NONCLIENTMETRICS structure obtained by
-    // SystemParametersInfo(SPI_GETNONCLIENTMETRICS) should be used instead (see
-    // QWindowsTheme::refreshFonts(), typically "Segoe UI, 9pt"), which is larger.
-#endif // Qt 5
-    qCDebug(lcQpaFonts) << __FUNCTION__ << systemFont;
-    return systemFont;
-}
-
-QFont QWindowsFontDatabase::LOGFONT_to_QFont(const LOGFONT& logFont, int verticalDPI_In)
-{
-    if (verticalDPI_In <= 0)
-        verticalDPI_In = defaultVerticalDPI();
-    QFont qFont(QString::fromWCharArray(logFont.lfFaceName));
-    qFont.setItalic(logFont.lfItalic);
-    if (logFont.lfWeight != FW_DONTCARE)
-        qFont.setWeight(QPlatformFontDatabase::weightFromInteger(logFont.lfWeight));
-    const qreal logFontHeight = qAbs(logFont.lfHeight);
-    qFont.setPointSizeF(logFontHeight * 72.0 / qreal(verticalDPI_In));
-    qFont.setUnderline(logFont.lfUnderline);
-    qFont.setOverline(false);
-    qFont.setStrikeOut(logFont.lfStrikeOut);
-    return qFont;
-}
-
-int QWindowsFontDatabase::defaultVerticalDPI()
-{
-    static int vDPI = -1;
-    if (vDPI == -1) {
-        if (HDC defaultDC = GetDC(0)) {
-            vDPI = GetDeviceCaps(defaultDC, LOGPIXELSY);
-            ReleaseDC(0, defaultDC);
-        } else {
-            // FIXME: Resolve now or return 96 and keep unresolved?
-            vDPI = 96;
-        }
-    }
-    return vDPI;
-}
-
 bool QWindowsFontDatabase::isPrivateFontFamily(const QString &family) const
 {
     return m_eudcFonts.contains(family) || QPlatformFontDatabase::isPrivateFontFamily(family);
diff --git a/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase_ft.cpp b/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase_ft.cpp
index 5c2742d295..b355001254 100644
--- a/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase_ft.cpp
+++ b/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase_ft.cpp
@@ -422,8 +422,8 @@ QFontEngine *QWindowsFontDatabaseFT::fontEngine(const QByteArray &fontData, qrea
 QStringList QWindowsFontDatabaseFT::fallbacksForFamily(const QString &family, QFont::Style style, QFont::StyleHint styleHint, QChar::Script script) const
 {
     QStringList result;
-    result.append(QWindowsFontDatabase::familyForStyleHint(styleHint));
-    result.append(QWindowsFontDatabase::extraTryFontsForFamily(family));
+    result.append(QWindowsFontDatabaseBase::familyForStyleHint(styleHint));
+    result.append(QWindowsFontDatabaseBase::extraTryFontsForFamily(family));
     result.append(QFreeTypeFontDatabase::fallbacksForFamily(family, style, styleHint, script));
 
     qCDebug(lcQpaFonts) << __FUNCTION__ << family << style << styleHint
diff --git a/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase_p.h b/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase_p.h
index f132e69d4d..64b80ed5b3 100644
--- a/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase_p.h
+++ b/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase_p.h
@@ -51,39 +51,16 @@
 // We mean it.
 //
 
+#include "qwindowsfontdatabasebase_p.h"
+
 #include <qpa/qplatformfontdatabase.h>
 #include <QtCore/QSharedPointer>
 #include <QtCore/QLoggingCategory>
 #include <QtCore/qt_windows.h>
 
-#if !defined(QT_NO_DIRECTWRITE)
-    struct IDWriteFactory;
-    struct IDWriteGdiInterop;
-#endif
-
 QT_BEGIN_NAMESPACE
 
-Q_DECLARE_LOGGING_CATEGORY(lcQpaFonts)
-
-class QWindowsFontEngineData
-{
-    Q_DISABLE_COPY_MOVE(QWindowsFontEngineData)
-public:
-    QWindowsFontEngineData();
-    ~QWindowsFontEngineData();
-
-    uint pow_gamma[256];
-
-    bool clearTypeEnabled = false;
-    qreal fontSmoothingGamma;
-    HDC hdc = 0;
-#if !defined(QT_NO_DIRECTWRITE)
-    IDWriteFactory *directWriteFactory = nullptr;
-    IDWriteGdiInterop *directWriteGdiInterop = nullptr;
-#endif
-};
-
-class QWindowsFontDatabase : public QPlatformFontDatabase
+class QWindowsFontDatabase : public QWindowsFontDatabaseBase
 {
     Q_DISABLE_COPY_MOVE(QWindowsFontDatabase)
 public:
@@ -113,22 +90,11 @@ public:
     void refUniqueFont(const QString &uniqueFont);
     bool isPrivateFontFamily(const QString &family) const override;
 
-    static QFont systemDefaultFont();
-
     static QFontEngine *createEngine(const QFontDef &request, const QString &faceName,
                                      int dpi,
                                      const QSharedPointer<QWindowsFontEngineData> &data);
 
-    static HFONT systemFont();
-    static QFont LOGFONT_to_QFont(const LOGFONT& lf, int verticalDPI = 0);
-
     static qreal fontSmoothingGamma();
-    static LOGFONT fontDefToLOGFONT(const QFontDef &fontDef, const QString &faceName);
-
-    static QStringList extraTryFontsForFamily(const QString &family);
-    static QString familyForStyleHint(QFont::StyleHint styleHint);
-
-    static int defaultVerticalDPI();
 
     static void setFontOptions(unsigned options);
     static unsigned fontOptions();
diff --git a/src/platformsupport/fontdatabases/windows/qwindowsfontdatabasebase.cpp b/src/platformsupport/fontdatabases/windows/qwindowsfontdatabasebase.cpp
new file mode 100644
index 0000000000..e6dee54d84
--- /dev/null
+++ b/src/platformsupport/fontdatabases/windows/qwindowsfontdatabasebase.cpp
@@ -0,0 +1,988 @@
+/****************************************************************************
+**
+** Copyright (C) 2020 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the plugins of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qwindowsfontdatabasebase_p.h"
+#include "qwindowsfontdatabase_p.h"
+
+#include <QtCore/private/qsystemlibrary_p.h>
+#include <QtCore/QThreadStorage>
+#include <QtCore/QtEndian>
+
+#if !defined(QT_NO_DIRECTWRITE)
+#  if defined(QT_USE_DIRECTWRITE3)
+#    include <dwrite_3.h>
+#  elif defined(QT_USE_DIRECTWRITE2)
+#    include <dwrite_2.h>
+#  else
+#    include <dwrite.h>
+#  endif
+#  include <d2d1.h>
+#  include "qwindowsfontenginedirectwrite_p.h"
+#endif
+
+QT_BEGIN_NAMESPACE
+
+// Helper classes for creating font engines directly from font data
+namespace {
+
+#   pragma pack(1)
+
+    // Common structure for all formats of the "name" table
+    struct NameTable
+    {
+        quint16 format;
+        quint16 count;
+        quint16 stringOffset;
+    };
+
+    struct NameRecord
+    {
+        quint16 platformID;
+        quint16 encodingID;
+        quint16 languageID;
+        quint16 nameID;
+        quint16 length;
+        quint16 offset;
+    };
+
+    struct OffsetSubTable
+    {
+        quint32 scalerType;
+        quint16 numTables;
+        quint16 searchRange;
+        quint16 entrySelector;
+        quint16 rangeShift;
+    };
+
+    struct TableDirectory : public QWindowsFontDatabaseBase::FontTable
+    {
+        quint32 identifier;
+        quint32 checkSum;
+        quint32 offset;
+        quint32 length;
+    };
+
+    struct OS2Table
+    {
+        quint16 version;
+        qint16  avgCharWidth;
+        quint16 weightClass;
+        quint16 widthClass;
+        quint16 type;
+        qint16  subscriptXSize;
+        qint16  subscriptYSize;
+        qint16  subscriptXOffset;
+        qint16  subscriptYOffset;
+        qint16  superscriptXSize;
+        qint16  superscriptYSize;
+        qint16  superscriptXOffset;
+        qint16  superscriptYOffset;
+        qint16  strikeOutSize;
+        qint16  strikeOutPosition;
+        qint16  familyClass;
+        quint8  panose[10];
+        quint32 unicodeRanges[4];
+        quint8  vendorID[4];
+        quint16 selection;
+        quint16 firstCharIndex;
+        quint16 lastCharIndex;
+        qint16  typoAscender;
+        qint16  typoDescender;
+        qint16  typoLineGap;
+        quint16 winAscent;
+        quint16 winDescent;
+        quint32 codepageRanges[2];
+        qint16  height;
+        qint16  capHeight;
+        quint16 defaultChar;
+        quint16 breakChar;
+        quint16 maxContext;
+    };
+
+#   pragma pack()
+
+} // Anonymous namespace
+
+QWindowsFontDatabaseBase::FontTable *QWindowsFontDatabaseBase::EmbeddedFont::tableDirectoryEntry(const QByteArray &tagName)
+{
+    Q_ASSERT(tagName.size() == 4);
+    quint32 tagId = *(reinterpret_cast<const quint32 *>(tagName.constData()));
+    const size_t fontDataSize = m_fontData.size();
+    if (Q_UNLIKELY(fontDataSize < sizeof(OffsetSubTable)))
+        return nullptr;
+
+    OffsetSubTable *offsetSubTable = reinterpret_cast<OffsetSubTable *>(m_fontData.data());
+    TableDirectory *tableDirectory = reinterpret_cast<TableDirectory *>(offsetSubTable + 1);
+
+    const size_t tableCount = qFromBigEndian<quint16>(offsetSubTable->numTables);
+    if (Q_UNLIKELY(fontDataSize < sizeof(OffsetSubTable) + sizeof(TableDirectory) * tableCount))
+        return nullptr;
+
+    TableDirectory *tableDirectoryEnd = tableDirectory + tableCount;
+    for (TableDirectory *entry = tableDirectory; entry < tableDirectoryEnd; ++entry) {
+        if (entry->identifier == tagId)
+            return entry;
+    }
+
+    return nullptr;
+}
+
+QString QWindowsFontDatabaseBase::EmbeddedFont::familyName(QWindowsFontDatabaseBase::FontTable *directoryEntry)
+{
+    QString name;
+
+    TableDirectory *nameTableDirectoryEntry = static_cast<TableDirectory *>(directoryEntry);
+    if (nameTableDirectoryEntry == nullptr)
+        nameTableDirectoryEntry = static_cast<TableDirectory *>(tableDirectoryEntry("name"));
+
+    if (nameTableDirectoryEntry != nullptr) {
+        quint32 offset = qFromBigEndian<quint32>(nameTableDirectoryEntry->offset);
+        if (Q_UNLIKELY(quint32(m_fontData.size()) < offset + sizeof(NameTable)))
+            return QString();
+
+        NameTable *nameTable = reinterpret_cast<NameTable *>(m_fontData.data() + offset);
+        NameRecord *nameRecord = reinterpret_cast<NameRecord *>(nameTable + 1);
+
+        quint16 nameTableCount = qFromBigEndian<quint16>(nameTable->count);
+        if (Q_UNLIKELY(quint32(m_fontData.size()) < offset + sizeof(NameRecord) * nameTableCount))
+            return QString();
+
+        for (int i = 0; i < nameTableCount; ++i, ++nameRecord) {
+            if (qFromBigEndian<quint16>(nameRecord->nameID) == 1
+             && qFromBigEndian<quint16>(nameRecord->platformID) == 3 // Windows
+             && qFromBigEndian<quint16>(nameRecord->languageID) == 0x0409) { // US English
+                quint16 stringOffset = qFromBigEndian<quint16>(nameTable->stringOffset);
+                quint16 nameOffset = qFromBigEndian<quint16>(nameRecord->offset);
+                quint16 nameLength = qFromBigEndian<quint16>(nameRecord->length);
+
+                if (Q_UNLIKELY(quint32(m_fontData.size()) < offset + stringOffset + nameOffset + nameLength))
+                    return QString();
+
+                const void *ptr = reinterpret_cast<const quint8 *>(nameTable)
+                                                    + stringOffset
+                                                    + nameOffset;
+
+                const quint16 *s = reinterpret_cast<const quint16 *>(ptr);
+                const quint16 *e = s + nameLength / sizeof(quint16);
+                while (s != e)
+                    name += QChar( qFromBigEndian<quint16>(*s++));
+                break;
+            }
+        }
+    }
+
+    return name;
+}
+
+void QWindowsFontDatabaseBase::EmbeddedFont::updateFromOS2Table(QFontEngine *fontEngine)
+{
+    TableDirectory *os2TableEntry = static_cast<TableDirectory *>(tableDirectoryEntry("OS/2"));
+    if (os2TableEntry != nullptr) {
+        const OS2Table *os2Table =
+                reinterpret_cast<const OS2Table *>(m_fontData.constData()
+                                                   + qFromBigEndian<quint32>(os2TableEntry->offset));
+
+        bool italic = qFromBigEndian<quint16>(os2Table->selection)  & (1 << 0);
+        bool oblique = qFromBigEndian<quint16>(os2Table->selection) & (1 << 9);
+
+        if (italic)
+            fontEngine->fontDef.style = QFont::StyleItalic;
+        else if (oblique)
+            fontEngine->fontDef.style = QFont::StyleOblique;
+        else
+            fontEngine->fontDef.style = QFont::StyleNormal;
+
+        fontEngine->fontDef.weight = QPlatformFontDatabase::weightFromInteger(qFromBigEndian<quint16>(os2Table->weightClass));
+    }
+}
+
+QString QWindowsFontDatabaseBase::EmbeddedFont::changeFamilyName(const QString &newFamilyName)
+{
+    TableDirectory *nameTableDirectoryEntry = static_cast<TableDirectory *>(tableDirectoryEntry("name"));
+    if (nameTableDirectoryEntry == nullptr)
+        return QString();
+
+    QString oldFamilyName = familyName(nameTableDirectoryEntry);
+
+    // Reserve size for name table header, five required name records and string
+    const int requiredRecordCount = 5;
+    quint16 nameIds[requiredRecordCount] = { 1, 2, 3, 4, 6 };
+
+    int sizeOfHeader = sizeof(NameTable) + sizeof(NameRecord) * requiredRecordCount;
+    int newFamilyNameSize = newFamilyName.size() * int(sizeof(quint16));
+
+    const QString regularString = QString::fromLatin1("Regular");
+    int regularStringSize = regularString.size() * int(sizeof(quint16));
+
+    // Align table size of table to 32 bits (pad with 0)
+    int fullSize = ((sizeOfHeader + newFamilyNameSize + regularStringSize) & ~3) + 4;
+
+    QByteArray newNameTable(fullSize, char(0));
+
+    {
+        NameTable *nameTable = reinterpret_cast<NameTable *>(newNameTable.data());
+        nameTable->count = qbswap<quint16>(requiredRecordCount);
+        nameTable->stringOffset = qbswap<quint16>(sizeOfHeader);
+
+        NameRecord *nameRecord = reinterpret_cast<NameRecord *>(nameTable + 1);
+        for (int i = 0; i < requiredRecordCount; ++i, nameRecord++) {
+            nameRecord->nameID = qbswap<quint16>(nameIds[i]);
+            nameRecord->encodingID = qbswap<quint16>(1);
+            nameRecord->languageID = qbswap<quint16>(0x0409);
+            nameRecord->platformID = qbswap<quint16>(3);
+            nameRecord->length = qbswap<quint16>(newFamilyNameSize);
+
+            // Special case for sub-family
+            if (nameIds[i] == 4) {
+                nameRecord->offset = qbswap<quint16>(newFamilyNameSize);
+                nameRecord->length = qbswap<quint16>(regularStringSize);
+            }
+        }
+
+        // nameRecord now points to string data
+        quint16 *stringStorage = reinterpret_cast<quint16 *>(nameRecord);
+        const quint16 *sourceString = newFamilyName.utf16();
+        for (int i = 0; i < newFamilyName.size(); ++i)
+            stringStorage[i] = qbswap<quint16>(sourceString[i]);
+        stringStorage += newFamilyName.size();
+
+        sourceString = regularString.utf16();
+        for (int i = 0; i < regularString.size(); ++i)
+            stringStorage[i] = qbswap<quint16>(sourceString[i]);
+    }
+
+    quint32 *p = reinterpret_cast<quint32 *>(newNameTable.data());
+    quint32 *tableEnd = reinterpret_cast<quint32 *>(newNameTable.data() + fullSize);
+
+    quint32 checkSum = 0;
+    while (p < tableEnd)
+        checkSum +=  qFromBigEndian<quint32>(*(p++));
+
+    nameTableDirectoryEntry->checkSum = qbswap<quint32>(checkSum);
+    nameTableDirectoryEntry->offset = qbswap<quint32>(m_fontData.size());
+    nameTableDirectoryEntry->length = qbswap<quint32>(fullSize);
+
+    m_fontData.append(newNameTable);
+
+    return oldFamilyName;
+}
+
+#if !defined(QT_NO_DIRECTWRITE)
+
+namespace {
+    class DirectWriteFontFileStream: public IDWriteFontFileStream
+    {
+        Q_DISABLE_COPY(DirectWriteFontFileStream)
+    public:
+        DirectWriteFontFileStream(const QByteArray &fontData)
+            : m_fontData(fontData)
+            , m_referenceCount(0)
+        {
+        }
+        virtual ~DirectWriteFontFileStream()
+        {
+        }
+
+        HRESULT STDMETHODCALLTYPE QueryInterface(REFIID iid, void **object);
+        ULONG STDMETHODCALLTYPE AddRef();
+        ULONG STDMETHODCALLTYPE Release();
+
+        HRESULT STDMETHODCALLTYPE ReadFileFragment(const void **fragmentStart, UINT64 fileOffset,
+                                                   UINT64 fragmentSize, OUT void **fragmentContext);
+        void STDMETHODCALLTYPE ReleaseFileFragment(void *fragmentContext);
+        HRESULT STDMETHODCALLTYPE GetFileSize(OUT UINT64 *fileSize);
+        HRESULT STDMETHODCALLTYPE GetLastWriteTime(OUT UINT64 *lastWriteTime);
+
+    private:
+        QByteArray m_fontData;
+        ULONG m_referenceCount;
+    };
+
+    HRESULT STDMETHODCALLTYPE DirectWriteFontFileStream::QueryInterface(REFIID iid, void **object)
+    {
+        if (iid == IID_IUnknown || iid == __uuidof(IDWriteFontFileStream)) {
+            *object = this;
+            AddRef();
+            return S_OK;
+        } else {
+            *object = NULL;
+            return E_NOINTERFACE;
+        }
+    }
+
+    ULONG STDMETHODCALLTYPE DirectWriteFontFileStream::AddRef()
+    {
+        return InterlockedIncrement(&m_referenceCount);
+    }
+
+    ULONG STDMETHODCALLTYPE DirectWriteFontFileStream::Release()
+    {
+        ULONG newCount = InterlockedDecrement(&m_referenceCount);
+        if (newCount == 0)
+            delete this;
+        return newCount;
+    }
+
+    HRESULT STDMETHODCALLTYPE DirectWriteFontFileStream::ReadFileFragment(
+        const void **fragmentStart,
+        UINT64 fileOffset,
+        UINT64 fragmentSize,
+        OUT void **fragmentContext)
+    {
+        *fragmentContext = NULL;
+        if (fileOffset + fragmentSize <= quint64(m_fontData.size())) {
+            *fragmentStart = m_fontData.data() + fileOffset;
+            return S_OK;
+        } else {
+            *fragmentStart = NULL;
+            return E_FAIL;
+        }
+    }
+
+    void STDMETHODCALLTYPE DirectWriteFontFileStream::ReleaseFileFragment(void *)
+    {
+    }
+
+    HRESULT STDMETHODCALLTYPE DirectWriteFontFileStream::GetFileSize(UINT64 *fileSize)
+    {
+        *fileSize = m_fontData.size();
+        return S_OK;
+    }
+
+    HRESULT STDMETHODCALLTYPE DirectWriteFontFileStream::GetLastWriteTime(UINT64 *lastWriteTime)
+    {
+        *lastWriteTime = 0;
+        return E_NOTIMPL;
+    }
+
+    class DirectWriteFontFileLoader: public IDWriteFontFileLoader
+    {
+    public:
+        DirectWriteFontFileLoader() : m_referenceCount(0) {}
+        virtual ~DirectWriteFontFileLoader()
+        {
+        }
+
+        inline void addKey(const void *key, const QByteArray &fontData)
+        {
+            Q_ASSERT(!m_fontDatas.contains(key));
+            m_fontDatas.insert(key, fontData);
+        }
+
+        inline void removeKey(const void *key)
+        {
+            m_fontDatas.remove(key);
+        }
+
+        HRESULT STDMETHODCALLTYPE QueryInterface(REFIID iid, void **object);
+        ULONG STDMETHODCALLTYPE AddRef();
+        ULONG STDMETHODCALLTYPE Release();
+
+        HRESULT STDMETHODCALLTYPE CreateStreamFromKey(void const *fontFileReferenceKey,
+                                                      UINT32 fontFileReferenceKeySize,
+                                                      OUT IDWriteFontFileStream **fontFileStream);
+
+    private:
+        ULONG m_referenceCount;
+        QHash<const void *, QByteArray> m_fontDatas;
+    };
+
+    HRESULT STDMETHODCALLTYPE DirectWriteFontFileLoader::QueryInterface(const IID &iid,
+                                                                        void **object)
+    {
+        if (iid == IID_IUnknown || iid == __uuidof(IDWriteFontFileLoader)) {
+            *object = this;
+            AddRef();
+            return S_OK;
+        } else {
+            *object = NULL;
+            return E_NOINTERFACE;
+        }
+    }
+
+    ULONG STDMETHODCALLTYPE DirectWriteFontFileLoader::AddRef()
+    {
+        return InterlockedIncrement(&m_referenceCount);
+    }
+
+    ULONG STDMETHODCALLTYPE DirectWriteFontFileLoader::Release()
+    {
+        ULONG newCount = InterlockedDecrement(&m_referenceCount);
+        if (newCount == 0)
+            delete this;
+        return newCount;
+    }
+
+    HRESULT STDMETHODCALLTYPE DirectWriteFontFileLoader::CreateStreamFromKey(
+        void const *fontFileReferenceKey,
+        UINT32 fontFileReferenceKeySize,
+        IDWriteFontFileStream **fontFileStream)
+    {
+        Q_UNUSED(fontFileReferenceKeySize);
+
+        if (fontFileReferenceKeySize != sizeof(const void *)) {
+            qWarning("%s: Wrong key size", __FUNCTION__);
+            return E_FAIL;
+        }
+
+        const void *key = *reinterpret_cast<void * const *>(fontFileReferenceKey);
+        *fontFileStream = NULL;
+        auto it = m_fontDatas.constFind(key);
+        if (it == m_fontDatas.constEnd())
+            return E_FAIL;
+
+        QByteArray fontData = it.value();
+        DirectWriteFontFileStream *stream = new DirectWriteFontFileStream(fontData);
+        stream->AddRef();
+        *fontFileStream = stream;
+
+        return S_OK;
+    }
+
+    class CustomFontFileLoader
+    {
+    public:
+        CustomFontFileLoader(IDWriteFactory *factory)
+        {
+            m_directWriteFactory = factory;
+
+            if (m_directWriteFactory) {
+                m_directWriteFactory->AddRef();
+
+                m_directWriteFontFileLoader = new DirectWriteFontFileLoader();
+                m_directWriteFactory->RegisterFontFileLoader(m_directWriteFontFileLoader);
+            }
+        }
+
+        ~CustomFontFileLoader()
+        {
+            if (m_directWriteFactory != nullptr && m_directWriteFontFileLoader != nullptr)
+                m_directWriteFactory->UnregisterFontFileLoader(m_directWriteFontFileLoader);
+
+            if (m_directWriteFactory != nullptr)
+                m_directWriteFactory->Release();
+        }
+
+        void addKey(const void *key, const QByteArray &fontData)
+        {
+            if (m_directWriteFontFileLoader != nullptr)
+                m_directWriteFontFileLoader->addKey(key, fontData);
+        }
+
+        void removeKey(const void *key)
+        {
+            if (m_directWriteFontFileLoader != nullptr)
+                m_directWriteFontFileLoader->removeKey(key);
+        }
+
+        IDWriteFontFileLoader *loader() const
+        {
+            return m_directWriteFontFileLoader;
+        }
+
+    private:
+        IDWriteFactory *m_directWriteFactory                    = nullptr;
+        DirectWriteFontFileLoader *m_directWriteFontFileLoader  = nullptr;
+    };
+} // Anonymous namespace
+
+#endif // !defined(QT_NO_DIRECTWRITE)
+
+
+QWindowsFontEngineData::~QWindowsFontEngineData()
+{
+    if (hdc)
+        DeleteDC(hdc);
+
+#if !defined(QT_NO_DIRECTWRITE)
+    if (directWriteGdiInterop)
+        directWriteGdiInterop->Release();
+    if (directWriteFactory)
+        directWriteFactory->Release();
+#endif
+}
+
+QWindowsFontDatabaseBase::QWindowsFontDatabaseBase()
+{
+}
+
+QWindowsFontDatabaseBase::~QWindowsFontDatabaseBase()
+{
+}
+
+typedef QSharedPointer<QWindowsFontEngineData> QWindowsFontEngineDataPtr;
+typedef QThreadStorage<QWindowsFontEngineDataPtr> FontEngineThreadLocalData;
+Q_GLOBAL_STATIC(FontEngineThreadLocalData, fontEngineThreadLocalData)
+
+QSharedPointer<QWindowsFontEngineData> QWindowsFontDatabaseBase::data()
+{
+    FontEngineThreadLocalData *data = fontEngineThreadLocalData();
+    if (!data->hasLocalData())
+        data->setLocalData(QSharedPointer<QWindowsFontEngineData>::create());
+
+    if (!init(data->localData()))
+        qCWarning(lcQpaFonts) << "Cannot initialize common font database data";
+
+    return data->localData();
+}
+
+bool QWindowsFontDatabaseBase::init(QSharedPointer<QWindowsFontEngineData> d)
+{
+#if !defined(QT_NO_DIRECTWRITE)
+    if (!d->directWriteFactory) {
+        createDirectWriteFactory(&d->directWriteFactory);
+        if (!d->directWriteFactory)
+            return false;
+    }
+    if (!d->directWriteGdiInterop) {
+        const HRESULT  hr = d->directWriteFactory->GetGdiInterop(&d->directWriteGdiInterop);
+        if (FAILED(hr)) {
+            qErrnoWarning("%s: GetGdiInterop failed", __FUNCTION__);
+            return false;
+        }
+    }
+#endif
+    return true;
+}
+
+#if !defined(QT_NO_DIRECTWRITE)
+// ### Qt 6: Link directly to dwrite instead
+typedef HRESULT (WINAPI *DWriteCreateFactoryType)(DWRITE_FACTORY_TYPE, const IID &, IUnknown **);
+static inline DWriteCreateFactoryType resolveDWriteCreateFactory()
+{
+    QSystemLibrary library(QStringLiteral("dwrite"));
+    QFunctionPointer result = library.resolve("DWriteCreateFactory");
+    if (Q_UNLIKELY(!result)) {
+        qWarning("Unable to load dwrite.dll");
+        return nullptr;
+    }
+    return reinterpret_cast<DWriteCreateFactoryType>(result);
+}
+
+void QWindowsFontDatabaseBase::createDirectWriteFactory(IDWriteFactory **factory)
+{
+    *factory = nullptr;
+
+    static const DWriteCreateFactoryType dWriteCreateFactory = resolveDWriteCreateFactory();
+    if (!dWriteCreateFactory)
+        return;
+
+    IUnknown *result = nullptr;
+#  if defined(QT_USE_DIRECTWRITE3)
+    dWriteCreateFactory(DWRITE_FACTORY_TYPE_SHARED, __uuidof(IDWriteFactory3), &result);
+#  endif
+
+#  if defined(QT_USE_DIRECTWRITE2)
+    if (result == nullptr)
+        dWriteCreateFactory(DWRITE_FACTORY_TYPE_SHARED, __uuidof(IDWriteFactory2), &result);
+#  endif
+
+    if (result == nullptr) {
+        if (FAILED(dWriteCreateFactory(DWRITE_FACTORY_TYPE_SHARED, __uuidof(IDWriteFactory), &result))) {
+            qErrnoWarning("DWriteCreateFactory failed");
+            return;
+        }
+    }
+
+    *factory = static_cast<IDWriteFactory *>(result);
+}
+#endif // !defined(QT_NO_DIRECTWRITE)
+
+int QWindowsFontDatabaseBase::defaultVerticalDPI()
+{
+    static int vDPI = -1;
+    if (vDPI == -1) {
+        if (HDC defaultDC = GetDC(0)) {
+            vDPI = GetDeviceCaps(defaultDC, LOGPIXELSY);
+            ReleaseDC(0, defaultDC);
+        } else {
+            // FIXME: Resolve now or return 96 and keep unresolved?
+            vDPI = 96;
+        }
+    }
+    return vDPI;
+}
+
+LOGFONT QWindowsFontDatabaseBase::fontDefToLOGFONT(const QFontDef &request, const QString &faceName)
+{
+    LOGFONT lf;
+    memset(&lf, 0, sizeof(LOGFONT));
+
+    lf.lfHeight = -qRound(request.pixelSize);
+    lf.lfWidth                = 0;
+    lf.lfEscapement        = 0;
+    lf.lfOrientation        = 0;
+    if (request.weight == 50)
+        lf.lfWeight = FW_DONTCARE;
+    else
+        lf.lfWeight = (request.weight*900)/99;
+    lf.lfItalic         = request.style != QFont::StyleNormal;
+    lf.lfCharSet        = DEFAULT_CHARSET;
+
+    int strat = OUT_DEFAULT_PRECIS;
+    if (request.styleStrategy & QFont::PreferBitmap) {
+        strat = OUT_RASTER_PRECIS;
+    } else if (request.styleStrategy & QFont::PreferDevice) {
+        strat = OUT_DEVICE_PRECIS;
+    } else if (request.styleStrategy & QFont::PreferOutline) {
+        strat = OUT_OUTLINE_PRECIS;
+    } else if (request.styleStrategy & QFont::ForceOutline) {
+        strat = OUT_TT_ONLY_PRECIS;
+    }
+
+    lf.lfOutPrecision   = strat;
+
+    int qual = DEFAULT_QUALITY;
+
+    if (request.styleStrategy & QFont::PreferMatch)
+        qual = DRAFT_QUALITY;
+    else if (request.styleStrategy & QFont::PreferQuality)
+        qual = PROOF_QUALITY;
+
+    if (request.styleStrategy & QFont::PreferAntialias) {
+        qual = (request.styleStrategy & QFont::NoSubpixelAntialias) == 0
+            ? CLEARTYPE_QUALITY : ANTIALIASED_QUALITY;
+    } else if (request.styleStrategy & QFont::NoAntialias) {
+        qual = NONANTIALIASED_QUALITY;
+    } else if ((request.styleStrategy & QFont::NoSubpixelAntialias) && data()->clearTypeEnabled) {
+        qual = ANTIALIASED_QUALITY;
+    }
+
+    lf.lfQuality        = qual;
+
+    lf.lfClipPrecision  = CLIP_DEFAULT_PRECIS;
+
+    int hint = FF_DONTCARE;
+    switch (request.styleHint) {
+        case QFont::Helvetica:
+            hint = FF_SWISS;
+            break;
+        case QFont::Times:
+            hint = FF_ROMAN;
+            break;
+        case QFont::Courier:
+            hint = FF_MODERN;
+            break;
+        case QFont::OldEnglish:
+            hint = FF_DECORATIVE;
+            break;
+        case QFont::System:
+            hint = FF_MODERN;
+            break;
+        default:
+            break;
+    }
+
+    lf.lfPitchAndFamily = DEFAULT_PITCH | hint;
+
+    QString fam = faceName;
+    if (fam.isEmpty())
+        fam = request.families.size() > 0 ? request.families.at(0) : request.family;
+    if (Q_UNLIKELY(fam.size() >= LF_FACESIZE)) {
+        qCritical("%s: Family name '%s' is too long.", __FUNCTION__, qPrintable(fam));
+        fam.truncate(LF_FACESIZE - 1);
+    }
+
+    if (fam.isEmpty())
+        fam = QStringLiteral("MS Sans Serif");
+
+    if (fam == QLatin1String("MS Sans Serif")
+        && (request.style == QFont::StyleItalic || (-lf.lfHeight > 18 && -lf.lfHeight != 24))) {
+        fam = QStringLiteral("Arial"); // MS Sans Serif has bearing problems in italic, and does not scale
+    }
+    if (fam == QLatin1String("Courier") && !(request.styleStrategy & QFont::PreferBitmap))
+        fam = QStringLiteral("Courier New");
+
+    memcpy(lf.lfFaceName, fam.utf16(), fam.size() * sizeof(wchar_t));
+
+    return lf;
+}
+
+QFont QWindowsFontDatabaseBase::LOGFONT_to_QFont(const LOGFONT& logFont, int verticalDPI_In)
+{
+    if (verticalDPI_In <= 0)
+        verticalDPI_In = defaultVerticalDPI();
+    QFont qFont(QString::fromWCharArray(logFont.lfFaceName));
+    qFont.setItalic(logFont.lfItalic);
+    if (logFont.lfWeight != FW_DONTCARE)
+        qFont.setWeight(QPlatformFontDatabase::weightFromInteger(logFont.lfWeight));
+    const qreal logFontHeight = qAbs(logFont.lfHeight);
+    qFont.setPointSizeF(logFontHeight * 72.0 / qreal(verticalDPI_In));
+    qFont.setUnderline(logFont.lfUnderline);
+    qFont.setOverline(false);
+    qFont.setStrikeOut(logFont.lfStrikeOut);
+    return qFont;
+}
+
+// ### fixme Qt 6 (QTBUG-58610): See comment at QWindowsFontDatabase::systemDefaultFont()
+HFONT QWindowsFontDatabaseBase::systemFont()
+{
+    static const auto stock_sysfont =
+        reinterpret_cast<HFONT>(GetStockObject(DEFAULT_GUI_FONT));
+    return stock_sysfont;
+}
+
+QFont QWindowsFontDatabaseBase::systemDefaultFont()
+{
+#if QT_VERSION >= 0x060000
+    // Qt 6: Obtain default GUI font (typically "Segoe UI, 9pt", see QTBUG-58610)
+    NONCLIENTMETRICS ncm;
+    ncm.cbSize = FIELD_OFFSET(NONCLIENTMETRICS, lfMessageFont) + sizeof(LOGFONT);
+    SystemParametersInfo(SPI_GETNONCLIENTMETRICS, ncm.cbSize , &ncm, 0);
+    const QFont systemFont = QWindowsFontDatabase::LOGFONT_to_QFont(ncm.lfMessageFont);
+#else
+    LOGFONT lf;
+    GetObject(systemFont(), sizeof(lf), &lf);
+    QFont systemFont =  LOGFONT_to_QFont(lf);
+    // "MS Shell Dlg 2" is the correct system font >= Win2k
+    if (systemFont.family() == QLatin1String("MS Shell Dlg"))
+        systemFont.setFamily(QStringLiteral("MS Shell Dlg 2"));
+    // Qt 5 by (Qt 4) legacy uses GetStockObject(DEFAULT_GUI_FONT) to
+    // obtain the default GUI font (typically "MS Shell Dlg 2, 8pt"). This has been
+    // long deprecated; the message font of the NONCLIENTMETRICS structure obtained by
+    // SystemParametersInfo(SPI_GETNONCLIENTMETRICS) should be used instead (see
+    // QWindowsTheme::refreshFonts(), typically "Segoe UI, 9pt"), which is larger.
+#endif // Qt 5
+    qCDebug(lcQpaFonts) << __FUNCTION__ << systemFont;
+    return systemFont;
+}
+
+#if !defined(QT_NO_DIRECTWRITE)
+IDWriteFontFace *QWindowsFontDatabaseBase::createDirectWriteFace(const QByteArray &fontData) const
+{
+    QSharedPointer<QWindowsFontEngineData> fontEngineData = data();
+    if (fontEngineData->directWriteFactory == nullptr) {
+        qCWarning(lcQpaFonts) << "DirectWrite factory not created in QWindowsFontDatabaseBase::createDirectWriteFace()";
+        return nullptr;
+    }
+
+    CustomFontFileLoader fontFileLoader(fontEngineData->directWriteFactory);
+    fontFileLoader.addKey(this, fontData);
+
+    IDWriteFontFile *fontFile = nullptr;
+    const void *key = this;
+
+    HRESULT hres = fontEngineData->directWriteFactory->CreateCustomFontFileReference(&key,
+                                                                                     sizeof(void *),
+                                                                                     fontFileLoader.loader(),
+                                                                                     &fontFile);
+    if (FAILED(hres)) {
+        qErrnoWarning(hres, "%s: CreateCustomFontFileReference failed", __FUNCTION__);
+        return nullptr;
+    }
+
+    BOOL isSupportedFontType;
+    DWRITE_FONT_FILE_TYPE fontFileType;
+    DWRITE_FONT_FACE_TYPE fontFaceType;
+    UINT32 numberOfFaces;
+    fontFile->Analyze(&isSupportedFontType, &fontFileType, &fontFaceType, &numberOfFaces);
+    if (!isSupportedFontType) {
+        fontFile->Release();
+        return nullptr;
+    }
+
+    // ### Currently no support for .ttc, but we could easily return a list here.
+    IDWriteFontFace *directWriteFontFace = nullptr;
+    hres = fontEngineData->directWriteFactory->CreateFontFace(fontFaceType,
+                                                              1,
+                                                              &fontFile,
+                                                              0,
+                                                              DWRITE_FONT_SIMULATIONS_NONE,
+                                                              &directWriteFontFace);
+    if (FAILED(hres)) {
+        qErrnoWarning(hres, "%s: CreateFontFace failed", __FUNCTION__);
+        fontFile->Release();
+        return nullptr;
+    }
+
+    fontFile->Release();
+    return directWriteFontFace;
+}
+#endif // !defined(QT_NO_DIRECTWRITE)
+
+QFontEngine *QWindowsFontDatabaseBase::fontEngine(const QByteArray &fontData, qreal pixelSize, QFont::HintingPreference hintingPreference)
+{
+    QFontEngine *fontEngine = nullptr;
+
+#if !defined(QT_NO_DIRECTWRITE)
+    QSharedPointer<QWindowsFontEngineData> fontEngineData = data();
+    if (fontEngineData->directWriteFactory == nullptr)
+        return nullptr;
+
+    IDWriteFontFace *directWriteFontFace = createDirectWriteFace(fontData);
+    fontEngine = new QWindowsFontEngineDirectWrite(directWriteFontFace,
+                                                   pixelSize,
+                                                   fontEngineData);
+
+    // Get font family from font data
+    EmbeddedFont font(fontData);
+    font.updateFromOS2Table(fontEngine);
+    fontEngine->fontDef.family = font.familyName();
+    fontEngine->fontDef.hintingPreference = hintingPreference;
+
+    directWriteFontFace->Release();
+#else // !defined(QT_NO_DIRECTWRITE)
+    Q_UNUSED(fontData);
+    Q_UNUSED(pixelSize);
+    Q_UNUSED(hintingPreference);
+#endif
+
+    return fontEngine;
+}
+
+QString QWindowsFontDatabaseBase::familyForStyleHint(QFont::StyleHint styleHint)
+{
+    switch (styleHint) {
+    case QFont::Times:
+        return QStringLiteral("Times New Roman");
+    case QFont::Courier:
+        return QStringLiteral("Courier New");
+    case QFont::Monospace:
+        return QStringLiteral("Courier New");
+    case QFont::Cursive:
+        return QStringLiteral("Comic Sans MS");
+    case QFont::Fantasy:
+        return QStringLiteral("Impact");
+    case QFont::Decorative:
+        return QStringLiteral("Old English");
+    case QFont::Helvetica:
+        return QStringLiteral("Arial");
+    case QFont::System:
+    default:
+        break;
+    }
+    return QStringLiteral("MS Shell Dlg 2");
+}
+
+// Creation functions
+
+static const char *other_tryFonts[] = {
+    "Arial",
+    "MS UI Gothic",
+    "Gulim",
+    "SimSun",
+    "PMingLiU",
+    "Arial Unicode MS",
+    0
+};
+
+static const char *jp_tryFonts [] = {
+    "MS UI Gothic",
+    "Arial",
+    "Gulim",
+    "SimSun",
+    "PMingLiU",
+    "Arial Unicode MS",
+    0
+};
+
+static const char *ch_CN_tryFonts [] = {
+    "SimSun",
+    "Arial",
+    "PMingLiU",
+    "Gulim",
+    "MS UI Gothic",
+    "Arial Unicode MS",
+    0
+};
+
+static const char *ch_TW_tryFonts [] = {
+    "PMingLiU",
+    "Arial",
+    "SimSun",
+    "Gulim",
+    "MS UI Gothic",
+    "Arial Unicode MS",
+    0
+};
+
+static const char *kr_tryFonts[] = {
+    "Gulim",
+    "Arial",
+    "PMingLiU",
+    "SimSun",
+    "MS UI Gothic",
+    "Arial Unicode MS",
+    0
+};
+
+static const char **tryFonts = nullptr;
+
+QStringList QWindowsFontDatabaseBase::extraTryFontsForFamily(const QString &family)
+{
+    QStringList result;
+    QFontDatabase db;
+    if (!db.writingSystems(family).contains(QFontDatabase::Symbol)) {
+        if (!tryFonts) {
+            LANGID lid = GetUserDefaultLangID();
+            switch (lid&0xff) {
+            case LANG_CHINESE: // Chinese
+                if ( lid == 0x0804 || lid == 0x1004) // China mainland and Singapore
+                    tryFonts = ch_CN_tryFonts;
+                else
+                    tryFonts = ch_TW_tryFonts; // Taiwan, Hong Kong and Macau
+                break;
+            case LANG_JAPANESE:
+                tryFonts = jp_tryFonts;
+                break;
+            case LANG_KOREAN:
+                tryFonts = kr_tryFonts;
+                break;
+            default:
+                tryFonts = other_tryFonts;
+                break;
+            }
+        }
+        QFontDatabase db;
+        const QStringList families = db.families();
+        const char **tf = tryFonts;
+        while (tf && *tf) {
+            // QTBUG-31689, family might be an English alias for a localized font name.
+            const QString family = QString::fromLatin1(*tf);
+            if (families.contains(family) || db.hasFamily(family))
+                result << family;
+            ++tf;
+        }
+    }
+    result.append(QStringLiteral("Segoe UI Emoji"));
+    result.append(QStringLiteral("Segoe UI Symbol"));
+    return result;
+}
+
+QT_END_NAMESPACE
diff --git a/src/platformsupport/fontdatabases/windows/qwindowsfontdatabasebase_p.h b/src/platformsupport/fontdatabases/windows/qwindowsfontdatabasebase_p.h
new file mode 100644
index 0000000000..5b9db5dede
--- /dev/null
+++ b/src/platformsupport/fontdatabases/windows/qwindowsfontdatabasebase_p.h
@@ -0,0 +1,136 @@
+/****************************************************************************
+**
+** Copyright (C) 2020 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the plugins of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QWINDOWSFONTDATABASEBASE_P_H
+#define QWINDOWSFONTDATABASEBASE_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API. It exists purely as an
+// implementation detail. This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <qpa/qplatformfontdatabase.h>
+#include <QtCore/QSharedPointer>
+#include <QtCore/QLoggingCategory>
+#include <QtCore/qt_windows.h>
+
+#if !defined(QT_NO_DIRECTWRITE)
+    struct IDWriteFactory;
+    struct IDWriteGdiInterop;
+    struct IDWriteFontFace;
+#endif
+
+QT_BEGIN_NAMESPACE
+
+Q_DECLARE_LOGGING_CATEGORY(lcQpaFonts);
+
+class QWindowsFontEngineData
+{
+    Q_DISABLE_COPY_MOVE(QWindowsFontEngineData)
+public:
+    QWindowsFontEngineData();
+    ~QWindowsFontEngineData();
+
+    uint pow_gamma[256];
+
+    bool clearTypeEnabled = false;
+    qreal fontSmoothingGamma;
+    HDC hdc = 0;
+#if !defined(QT_NO_DIRECTWRITE)
+    IDWriteFactory *directWriteFactory = nullptr;
+    IDWriteGdiInterop *directWriteGdiInterop = nullptr;
+#endif
+};
+
+class QWindowsFontDatabaseBase : public QPlatformFontDatabase
+{
+public:
+    QWindowsFontDatabaseBase();
+    ~QWindowsFontDatabaseBase() override;
+
+    QFontEngine *fontEngine(const QByteArray &fontData, qreal pixelSize, QFont::HintingPreference hintingPreference) override;
+
+    static int defaultVerticalDPI();
+    static QSharedPointer<QWindowsFontEngineData> data();
+#if !defined(QT_NO_DIRECTWRITE)
+    static void createDirectWriteFactory(IDWriteFactory **factory);
+#endif
+    static QFont systemDefaultFont();
+    static HFONT systemFont();
+    static LOGFONT fontDefToLOGFONT(const QFontDef &fontDef, const QString &faceName);
+    static QFont LOGFONT_to_QFont(const LOGFONT& lf, int verticalDPI = 0);
+
+    static QString familyForStyleHint(QFont::StyleHint styleHint);
+    static QStringList extraTryFontsForFamily(const QString &family);
+
+    class FontTable{};
+    class EmbeddedFont
+    {
+    public:
+        EmbeddedFont(const QByteArray &fontData) : m_fontData(fontData) {}
+
+        QString changeFamilyName(const QString &newFamilyName);
+        QByteArray data() const { return m_fontData; }
+        void updateFromOS2Table(QFontEngine *fontEngine);
+        FontTable *tableDirectoryEntry(const QByteArray &tagName);
+        QString familyName(FontTable *nameTableDirectory = nullptr);
+
+    private:
+        QByteArray m_fontData;
+    };
+
+protected:
+
+#if !defined(QT_NO_DIRECTWRITE)
+    IDWriteFontFace *createDirectWriteFace(const QByteArray &fontData) const;
+#endif
+
+private:
+    static bool init(QSharedPointer<QWindowsFontEngineData> data);
+};
+
+QT_END_NAMESPACE
+
+#endif // QWINDOWSFONTDATABASEBASE_P_H
diff --git a/src/platformsupport/fontdatabases/windows/qwindowsfontenginedirectwrite.cpp b/src/platformsupport/fontdatabases/windows/qwindowsfontenginedirectwrite.cpp
index e8f9cfb2a8..b11ad46bc7 100644
--- a/src/platformsupport/fontdatabases/windows/qwindowsfontenginedirectwrite.cpp
+++ b/src/platformsupport/fontdatabases/windows/qwindowsfontenginedirectwrite.cpp
@@ -187,6 +187,18 @@ namespace {
 
 }
 
+static DWRITE_MEASURING_MODE renderModeToMeasureMode(DWRITE_RENDERING_MODE renderMode)
+{
+    switch (renderMode) {
+    case DWRITE_RENDERING_MODE_GDI_CLASSIC:
+        return DWRITE_MEASURING_MODE_GDI_CLASSIC;
+    case DWRITE_RENDERING_MODE_GDI_NATURAL:
+        return DWRITE_MEASURING_MODE_GDI_NATURAL;
+    default:
+        return DWRITE_MEASURING_MODE_NATURAL;
+    }
+}
+
 static DWRITE_RENDERING_MODE hintingPreferenceToRenderingMode(QFont::HintingPreference hintingPreference)
 {
     if (QHighDpiScaling::isActive() && hintingPreference == QFont::PreferDefaultHinting)
@@ -209,13 +221,10 @@ static DWRITE_RENDERING_MODE hintingPreferenceToRenderingMode(QFont::HintingPref
     \ingroup qt-lighthouse-win
 
     Font engine for subpixel positioned text on Windows Vista
-    (with platform update) and Windows 7. If selected during
+    (with platform update) and later. If selected during
     configuration, the engine will be selected only when the hinting
-    preference of a font is set to None or Vertical hinting. The font
-    database uses most of the same logic but creates a direct write
-    font based on the LOGFONT rather than a GDI handle.
-
-    Will probably be superseded by a common Free Type font engine in Qt 5.X.
+    preference of a font is set to None or Vertical hinting, or
+    when fontengine=directwrite is selected as platform option.
 */
 
 QWindowsFontEngineDirectWrite::QWindowsFontEngineDirectWrite(IDWriteFontFace *directWriteFontFace,
@@ -480,9 +489,22 @@ void QWindowsFontEngineDirectWrite::recalcAdvances(QGlyphLayout *glyphs, QFontEn
         glyphIndices[i] = UINT16(glyphs->glyphs[i]);
 
     QVarLengthArray<DWRITE_GLYPH_METRICS> glyphMetrics(glyphIndices.size());
-    HRESULT hr = m_directWriteFontFace->GetDesignGlyphMetrics(glyphIndices.data(),
-                                                              glyphIndices.size(),
-                                                              glyphMetrics.data());
+
+    HRESULT hr;
+    DWRITE_RENDERING_MODE renderMode = hintingPreferenceToRenderingMode(QFont::HintingPreference(fontDef.hintingPreference));
+    if (renderMode == DWRITE_RENDERING_MODE_GDI_CLASSIC || renderMode == DWRITE_RENDERING_MODE_GDI_NATURAL) {
+        hr = m_directWriteFontFace->GetGdiCompatibleGlyphMetrics(float(fontDef.pixelSize),
+                                                                 1.0f,
+                                                                 NULL,
+                                                                 TRUE,
+                                                                 glyphIndices.data(),
+                                                                 glyphIndices.size(),
+                                                                 glyphMetrics.data());
+    } else {
+        hr = m_directWriteFontFace->GetDesignGlyphMetrics(glyphIndices.data(),
+                                                          glyphIndices.size(),
+                                                          glyphMetrics.data());
+    }
     if (SUCCEEDED(hr)) {
         qreal stretch = fontDef.stretch != QFont::AnyStretch ? fontDef.stretch / 100.0 : 1.0;
         for (int i = 0; i < glyphs->numGlyphs; ++i)
@@ -715,6 +737,8 @@ QImage QWindowsFontEngineDirectWrite::imageForGlyph(glyph_t t,
 
     DWRITE_RENDERING_MODE renderMode =
             hintingPreferenceToRenderingMode(QFont::HintingPreference(fontDef.hintingPreference));
+    DWRITE_MEASURING_MODE measureMode =
+            renderModeToMeasureMode(renderMode);
 
     IDWriteGlyphRunAnalysis *glyphAnalysis = NULL;
     HRESULT hr = m_fontEngineData->directWriteFactory->CreateGlyphRunAnalysis(
@@ -722,7 +746,7 @@ QImage QWindowsFontEngineDirectWrite::imageForGlyph(glyph_t t,
                 1.0f,
                 &transform,
                 renderMode,
-                DWRITE_MEASURING_MODE_NATURAL,
+                measureMode,
                 margin, margin,
                 &glyphAnalysis
                 );
@@ -752,7 +776,7 @@ QImage QWindowsFontEngineDirectWrite::imageForGlyph(glyph_t t,
                                                   0.0f,
                                                   &glyphRun,
                                                   NULL,
-                                                  DWRITE_MEASURING_MODE_NATURAL,
+                                                  measureMode,
                                                   NULL,
                                                   0,
                                                   &enumerator);
@@ -783,7 +807,7 @@ QImage QWindowsFontEngineDirectWrite::imageForGlyph(glyph_t t,
                             1.0f,
                             &transform,
                             renderMode,
-                            DWRITE_MEASURING_MODE_NATURAL,
+                            measureMode,
                             0.0, 0.0,
                             &colorGlyphsAnalysis
                             );
@@ -1023,6 +1047,7 @@ glyph_metrics_t QWindowsFontEngineDirectWrite::alphaMapBoundingBox(glyph_t glyph
 
     DWRITE_RENDERING_MODE renderMode =
             hintingPreferenceToRenderingMode(QFont::HintingPreference(fontDef.hintingPreference));
+    DWRITE_MEASURING_MODE measureMode = renderModeToMeasureMode(renderMode);
 
     const int margin = glyphMargin(QFontEngine::Format_A32);
     IDWriteGlyphRunAnalysis *glyphAnalysis = NULL;
@@ -1031,7 +1056,7 @@ glyph_metrics_t QWindowsFontEngineDirectWrite::alphaMapBoundingBox(glyph_t glyph
                 1.0f,
                 &transform,
                 renderMode,
-                DWRITE_MEASURING_MODE_NATURAL,
+                measureMode,
                 margin, margin,
                 &glyphAnalysis
                 );
diff --git a/src/platformsupport/fontdatabases/windows/windows.pri b/src/platformsupport/fontdatabases/windows/windows.pri
index 7ddfb2c281..fbe6d490f9 100644
--- a/src/platformsupport/fontdatabases/windows/windows.pri
+++ b/src/platformsupport/fontdatabases/windows/windows.pri
@@ -2,11 +2,13 @@ QT *= gui-private
 
 SOURCES += \
     $$PWD/qwindowsfontdatabase.cpp \
+    $$PWD/qwindowsfontdatabasebase.cpp \
     $$PWD/qwindowsfontengine.cpp \
     $$PWD/qwindowsnativeimage.cpp
 
 HEADERS += \
     $$PWD/qwindowsfontdatabase_p.h \
+    $$PWD/qwindowsfontdatabasebase_p.h \
     $$PWD/qwindowsfontengine_p.h \
     $$PWD/qwindowsnativeimage_p.h
 
@@ -16,7 +18,13 @@ qtConfig(freetype) {
 }
 
 qtConfig(directwrite):qtConfig(direct2d) {
-    qtConfig(directwrite2) {
+    qtConfig(directwrite3) {
+        QMAKE_USE_PRIVATE += dwrite_3
+        DEFINES *= QT_USE_DIRECTWRITE3 QT_USE_DIRECTWRITE2
+
+        SOURCES += $$PWD/qwindowsdirectwritefontdatabase.cpp
+        HEADERS += $$PWD/qwindowsdirectwritefontdatabase_p.h
+    } else: qtConfig(directwrite2) {
         QMAKE_USE_PRIVATE += dwrite_2
         DEFINES *= QT_USE_DIRECTWRITE2
     } else {
diff --git a/src/platformsupport/glxconvenience/.prev_CMakeLists.txt b/src/platformsupport/glxconvenience/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..d3d2c87910
--- /dev/null
+++ b/src/platformsupport/glxconvenience/.prev_CMakeLists.txt
@@ -0,0 +1,21 @@
+# Generated from glxconvenience.pro.
+
+#####################################################################
+## GlxSupport Module:
+#####################################################################
+
+qt_add_module(GlxSupport
+    STATIC
+    INTERNAL_MODULE
+    SOURCES
+        qglxconvenience.cpp qglxconvenience_p.h
+    DEFINES
+        QT_NO_CAST_FROM_ASCII
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::GuiPrivate
+        X11::X11
+)
+
+#### Keys ignored in scope 1:.:.:glxconvenience.pro:<TRUE>:
+# MODULE = "glx_support"
diff --git a/src/platformsupport/glxconvenience/CMakeLists.txt b/src/platformsupport/glxconvenience/CMakeLists.txt
new file mode 100644
index 0000000000..00d2e6c754
--- /dev/null
+++ b/src/platformsupport/glxconvenience/CMakeLists.txt
@@ -0,0 +1,23 @@
+# Generated from glxconvenience.pro.
+
+qt_find_package(X11) # special case
+
+#####################################################################
+## GlxSupport Module:
+#####################################################################
+
+qt_add_module(GlxSupport
+    STATIC
+    INTERNAL_MODULE
+    SOURCES
+        qglxconvenience.cpp qglxconvenience_p.h
+    DEFINES
+        QT_NO_CAST_FROM_ASCII
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::GuiPrivate
+        X11::X11
+)
+
+#### Keys ignored in scope 1:.:.:glxconvenience.pro:<TRUE>:
+# MODULE = "glx_support"
diff --git a/src/platformsupport/graphics/CMakeLists.txt b/src/platformsupport/graphics/CMakeLists.txt
new file mode 100644
index 0000000000..e9f0245dbe
--- /dev/null
+++ b/src/platformsupport/graphics/CMakeLists.txt
@@ -0,0 +1,20 @@
+# Generated from graphics.pro.
+
+#####################################################################
+## GraphicsSupport Module:
+#####################################################################
+
+qt_add_module(GraphicsSupport
+    STATIC
+    INTERNAL_MODULE
+    SOURCES
+        qrasterbackingstore.cpp qrasterbackingstore_p.h
+    DEFINES
+        QT_NO_CAST_FROM_ASCII
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::GuiPrivate
+)
+
+#### Keys ignored in scope 1:.:.:graphics.pro:<TRUE>:
+# MODULE = "graphics_support"
diff --git a/src/platformsupport/input/.prev_CMakeLists.txt b/src/platformsupport/input/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..f8c05e9f97
--- /dev/null
+++ b/src/platformsupport/input/.prev_CMakeLists.txt
@@ -0,0 +1,102 @@
+# Generated from input.pro.
+
+#####################################################################
+## InputSupport Module:
+#####################################################################
+
+qt_add_module(InputSupport
+    STATIC
+    INTERNAL_MODULE
+    DEFINES
+        QT_NO_CAST_FROM_ASCII
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::DeviceDiscoverySupportPrivate
+        Qt::GuiPrivate
+    PRECOMPILED_HEADER
+        "../../corelib/global/qt_pch.h"
+)
+
+#### Keys ignored in scope 3:.:.:input-support.pro:<TRUE>:
+# MODULE = "input_support"
+
+## Scopes:
+#####################################################################
+
+qt_extend_target(InputSupport CONDITION QT_FEATURE_evdev
+    SOURCES
+        evdevkeyboard/qevdevkeyboard_defaultmap_p.h
+        evdevkeyboard/qevdevkeyboardhandler.cpp evdevkeyboard/qevdevkeyboardhandler_p.h
+        evdevkeyboard/qevdevkeyboardmanager.cpp evdevkeyboard/qevdevkeyboardmanager_p.h
+        evdevmouse/qevdevmousehandler.cpp evdevmouse/qevdevmousehandler_p.h
+        evdevmouse/qevdevmousemanager.cpp evdevmouse/qevdevmousemanager_p.h
+        evdevtouch/qevdevtouchhandler.cpp evdevtouch/qevdevtouchhandler_p.h
+        evdevtouch/qevdevtouchmanager.cpp evdevtouch/qevdevtouchmanager_p.h
+    INCLUDE_DIRECTORIES
+        evdevtouch/../shared
+)
+
+qt_extend_target(InputSupport CONDITION QT_FEATURE_evdev AND QT_FEATURE_tabletevent
+    SOURCES
+        evdevtablet/qevdevtablethandler.cpp evdevtablet/qevdevtablethandler_p.h
+        evdevtablet/qevdevtabletmanager.cpp evdevtablet/qevdevtabletmanager_p.h
+)
+
+qt_extend_target(InputSupport CONDITION QT_FEATURE_evdev AND QT_FEATURE_libudev AND QT_FEATURE_tabletevent
+    LIBRARIES
+        PkgConfig::Libudev
+)
+
+qt_extend_target(InputSupport CONDITION QT_FEATURE_evdev AND QT_FEATURE_libudev
+    LIBRARIES
+        PkgConfig::Libudev
+)
+
+qt_extend_target(InputSupport CONDITION QT_FEATURE_evdev AND QT_FEATURE_mtdev
+    LIBRARIES
+        PkgConfig::Mtdev
+)
+
+qt_extend_target(InputSupport CONDITION QT_FEATURE_tslib
+    SOURCES
+        tslib/qtslib.cpp tslib/qtslib_p.h
+    PUBLIC_LIBRARIES
+        PkgConfig::Tslib
+)
+
+qt_extend_target(InputSupport CONDITION QT_FEATURE_libinput
+    SOURCES
+        libinput/qlibinputhandler.cpp libinput/qlibinputhandler_p.h
+        libinput/qlibinputkeyboard.cpp libinput/qlibinputkeyboard_p.h
+        libinput/qlibinputpointer.cpp libinput/qlibinputpointer_p.h
+        libinput/qlibinputtouch.cpp libinput/qlibinputtouch_p.h
+    INCLUDE_DIRECTORIES
+        libinput/../shared
+    LIBRARIES
+        Libinput::Libinput
+        PkgConfig::Libudev
+)
+
+qt_extend_target(InputSupport CONDITION QT_FEATURE_libinput AND QT_FEATURE_xkbcommon
+    LIBRARIES
+        XKB::XKB
+    PUBLIC_LIBRARIES
+        Qt::XkbCommonSupportPrivate
+)
+
+qt_extend_target(InputSupport CONDITION QT_FEATURE_evdev OR QT_FEATURE_libinput
+    SOURCES
+        shared/devicehandlerlist_p.h
+        shared/qevdevutil.cpp shared/qevdevutil_p.h
+        shared/qtouchoutputmapping.cpp shared/qtouchoutputmapping_p.h
+)
+
+qt_extend_target(InputSupport CONDITION QT_FEATURE_integrityhid
+    SOURCES
+        integrityhid/qintegrityhidmanager.cpp integrityhid/qintegrityhidmanager.h
+    LIBRARIES
+        integrityhid
+)
+if(QT_FEATURE_xkbcommon)
+    add_subdirectory(xkbcommon)
+endif()
diff --git a/src/platformsupport/input/CMakeLists.txt b/src/platformsupport/input/CMakeLists.txt
new file mode 100644
index 0000000000..7ab93df062
--- /dev/null
+++ b/src/platformsupport/input/CMakeLists.txt
@@ -0,0 +1,107 @@
+# Generated from input.pro.
+
+qt_find_package(Libinput) # special case
+qt_find_package(XKB) # special case
+qt_find_package(Tslib) # special case
+qt_find_package(Mtdev) # special case
+
+#####################################################################
+## InputSupport Module:
+#####################################################################
+
+qt_add_module(InputSupport
+    STATIC
+    INTERNAL_MODULE
+    DEFINES
+        QT_NO_CAST_FROM_ASCII
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::DeviceDiscoverySupportPrivate
+        Qt::GuiPrivate
+    PRECOMPILED_HEADER
+        "../../corelib/global/qt_pch.h"
+)
+
+#### Keys ignored in scope 3:.:.:input-support.pro:<TRUE>:
+# MODULE = "input_support"
+
+## Scopes:
+#####################################################################
+
+qt_extend_target(InputSupport CONDITION QT_FEATURE_evdev
+    SOURCES
+        evdevkeyboard/qevdevkeyboard_defaultmap_p.h
+        evdevkeyboard/qevdevkeyboardhandler.cpp evdevkeyboard/qevdevkeyboardhandler_p.h
+        evdevkeyboard/qevdevkeyboardmanager.cpp evdevkeyboard/qevdevkeyboardmanager_p.h
+        evdevmouse/qevdevmousehandler.cpp evdevmouse/qevdevmousehandler_p.h
+        evdevmouse/qevdevmousemanager.cpp evdevmouse/qevdevmousemanager_p.h
+        evdevtouch/qevdevtouchhandler.cpp evdevtouch/qevdevtouchhandler_p.h
+        evdevtouch/qevdevtouchmanager.cpp evdevtouch/qevdevtouchmanager_p.h
+    INCLUDE_DIRECTORIES
+        evdevtouch/../shared
+)
+
+qt_extend_target(InputSupport CONDITION QT_FEATURE_evdev AND QT_FEATURE_tabletevent
+    SOURCES
+        evdevtablet/qevdevtablethandler.cpp evdevtablet/qevdevtablethandler_p.h
+        evdevtablet/qevdevtabletmanager.cpp evdevtablet/qevdevtabletmanager_p.h
+)
+
+qt_extend_target(InputSupport CONDITION QT_FEATURE_evdev AND QT_FEATURE_libudev AND QT_FEATURE_tabletevent
+    LIBRARIES
+        PkgConfig::Libudev
+)
+
+qt_extend_target(InputSupport CONDITION QT_FEATURE_evdev AND QT_FEATURE_libudev
+    LIBRARIES
+        PkgConfig::Libudev
+)
+
+qt_extend_target(InputSupport CONDITION QT_FEATURE_evdev AND QT_FEATURE_mtdev
+    LIBRARIES
+        PkgConfig::Mtdev
+)
+
+qt_extend_target(InputSupport CONDITION QT_FEATURE_tslib
+    SOURCES
+        tslib/qtslib.cpp tslib/qtslib_p.h
+    PUBLIC_LIBRARIES
+        PkgConfig::Tslib
+)
+
+qt_extend_target(InputSupport CONDITION QT_FEATURE_libinput
+    SOURCES
+        libinput/qlibinputhandler.cpp libinput/qlibinputhandler_p.h
+        libinput/qlibinputkeyboard.cpp libinput/qlibinputkeyboard_p.h
+        libinput/qlibinputpointer.cpp libinput/qlibinputpointer_p.h
+        libinput/qlibinputtouch.cpp libinput/qlibinputtouch_p.h
+    INCLUDE_DIRECTORIES
+        libinput/../shared
+    LIBRARIES
+        Libinput::Libinput
+        PkgConfig::Libudev
+)
+
+qt_extend_target(InputSupport CONDITION QT_FEATURE_libinput AND QT_FEATURE_xkbcommon
+    LIBRARIES
+        XKB::XKB
+    PUBLIC_LIBRARIES
+        Qt::XkbCommonSupportPrivate
+)
+
+qt_extend_target(InputSupport CONDITION QT_FEATURE_evdev OR QT_FEATURE_libinput
+    SOURCES
+        shared/devicehandlerlist_p.h
+        shared/qevdevutil.cpp shared/qevdevutil_p.h
+        shared/qtouchoutputmapping.cpp shared/qtouchoutputmapping_p.h
+)
+
+qt_extend_target(InputSupport CONDITION QT_FEATURE_integrityhid
+    SOURCES
+        integrityhid/qintegrityhidmanager.cpp integrityhid/qintegrityhidmanager.h
+    LIBRARIES
+        integrityhid
+)
+if(QT_FEATURE_xkbcommon)
+    add_subdirectory(xkbcommon)
+endif()
diff --git a/src/platformsupport/input/xkbcommon/CMakeLists.txt b/src/platformsupport/input/xkbcommon/CMakeLists.txt
new file mode 100644
index 0000000000..86d132d912
--- /dev/null
+++ b/src/platformsupport/input/xkbcommon/CMakeLists.txt
@@ -0,0 +1,32 @@
+# Generated from xkbcommon.pro.
+
+#####################################################################
+## XkbCommonSupport Module:
+#####################################################################
+
+qt_add_module(XkbCommonSupport
+    STATIC
+    INTERNAL_MODULE
+    SOURCES
+        qxkbcommon.cpp qxkbcommon_p.h
+        qxkbcommon_3rdparty.cpp
+    DEFINES
+        QT_NO_CAST_FROM_ASCII
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::GuiPrivate
+        XKB::XKB
+    PRECOMPILED_HEADER
+        "../../../corelib/global/qt_pch.h"
+)
+
+#### Keys ignored in scope 1:.:.:xkbcommon.pro:<TRUE>:
+# MODULE = "xkbcommon_support"
+
+## Scopes:
+#####################################################################
+
+qt_extend_target(XkbCommonSupport CONDITION CLANG AND NOT ICC
+    COMPILE_OPTIONS
+        -ftemplate-depth=1024
+)
diff --git a/src/platformsupport/kmsconvenience/.prev_CMakeLists.txt b/src/platformsupport/kmsconvenience/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..5b0fd00566
--- /dev/null
+++ b/src/platformsupport/kmsconvenience/.prev_CMakeLists.txt
@@ -0,0 +1,21 @@
+# Generated from kmsconvenience.pro.
+
+#####################################################################
+## KmsSupport Module:
+#####################################################################
+
+qt_add_module(KmsSupport
+    STATIC
+    INTERNAL_MODULE
+    SOURCES
+        qkmsdevice.cpp qkmsdevice_p.h
+    DEFINES
+        QT_NO_CAST_FROM_ASCII
+    PUBLIC_LIBRARIES
+        Libdrm::Libdrm
+        Qt::CorePrivate
+        Qt::GuiPrivate
+)
+
+#### Keys ignored in scope 1:.:.:kmsconvenience.pro:<TRUE>:
+# MODULE = "kms_support"
diff --git a/src/platformsupport/kmsconvenience/CMakeLists.txt b/src/platformsupport/kmsconvenience/CMakeLists.txt
new file mode 100644
index 0000000000..8001ee27de
--- /dev/null
+++ b/src/platformsupport/kmsconvenience/CMakeLists.txt
@@ -0,0 +1,23 @@
+# Generated from kmsconvenience.pro.
+
+qt_find_package(Libdrm) # special case
+
+#####################################################################
+## KmsSupport Module:
+#####################################################################
+
+qt_add_module(KmsSupport
+    STATIC
+    INTERNAL_MODULE
+    SOURCES
+        qkmsdevice.cpp qkmsdevice_p.h
+    DEFINES
+        QT_NO_CAST_FROM_ASCII
+    PUBLIC_LIBRARIES
+        Libdrm::Libdrm
+        Qt::CorePrivate
+        Qt::GuiPrivate
+)
+
+#### Keys ignored in scope 1:.:.:kmsconvenience.pro:<TRUE>:
+# MODULE = "kms_support"
diff --git a/src/platformsupport/kmsconvenience/qkmsdevice.cpp b/src/platformsupport/kmsconvenience/qkmsdevice.cpp
index 18f7b5e23b..8cd7f9b368 100644
--- a/src/platformsupport/kmsconvenience/qkmsdevice.cpp
+++ b/src/platformsupport/kmsconvenience/qkmsdevice.cpp
@@ -396,7 +396,7 @@ QPlatformScreen *QKmsDevice::createScreenForConnector(drmModeResPtr resources,
         drmFormat = DRM_FORMAT_XRGB8888;
         drmFormatExplicit = false;
     }
-    qCDebug(qLcKmsDebug) << "Format is" << hex << drmFormat << dec << "requested_by_user =" << drmFormatExplicit
+    qCDebug(qLcKmsDebug) << "Format is" << Qt::hex << drmFormat << Qt::dec << "requested_by_user =" << drmFormatExplicit
                          << "for output" << connectorName;
 
     const QString cloneSource = userConnectorConfig.value(QStringLiteral("clones")).toString();
diff --git a/src/platformsupport/linuxaccessibility/.prev_CMakeLists.txt b/src/platformsupport/linuxaccessibility/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..38d3d2831f
--- /dev/null
+++ b/src/platformsupport/linuxaccessibility/.prev_CMakeLists.txt
@@ -0,0 +1,41 @@
+# Generated from linuxaccessibility.pro.
+
+#####################################################################
+## LinuxAccessibilitySupport Module:
+#####################################################################
+
+qt_add_module(LinuxAccessibilitySupport
+    STATIC
+    INTERNAL_MODULE
+    SOURCES
+        application.cpp application_p.h
+        atspiadaptor.cpp atspiadaptor_p.h
+        bridge.cpp bridge_p.h
+        cache.cpp cache_p.h
+        constant_mappings.cpp constant_mappings_p.h
+        dbusconnection.cpp dbusconnection_p.h
+        struct_marshallers.cpp struct_marshallers_p.h
+    DBUS_ADAPTOR_SOURCES
+        dbusxml/Cache.xml
+        dbusxml/DeviceEventController.xml
+    DBUS_ADAPTOR_FLAGS
+        "-i" "struct_marshallers_p.h"
+    DBUS_INTERFACE_SOURCES
+        dbusxml/Bus.xml
+        dbusxml/Socket.xml
+    DBUS_INTERFACE_FLAGS
+        "-i" "struct_marshallers_p.h"
+    DEFINES
+        QT_NO_CAST_FROM_ASCII
+    PUBLIC_LIBRARIES
+        PkgConfig::ATSPI2_nolink
+        Qt::AccessibilitySupportPrivate
+        Qt::CorePrivate
+        Qt::DBus
+        Qt::GuiPrivate
+    PRECOMPILED_HEADER
+        "../../corelib/global/qt_pch.h"
+)
+
+#### Keys ignored in scope 1:.:.:linuxaccessibility.pro:<TRUE>:
+# MODULE = "linuxaccessibility_support"
diff --git a/src/platformsupport/linuxaccessibility/CMakeLists.txt b/src/platformsupport/linuxaccessibility/CMakeLists.txt
new file mode 100644
index 0000000000..35bfdabf5f
--- /dev/null
+++ b/src/platformsupport/linuxaccessibility/CMakeLists.txt
@@ -0,0 +1,43 @@
+# Generated from linuxaccessibility.pro.
+
+qt_find_package(ATSPI2) # special case
+
+#####################################################################
+## LinuxAccessibilitySupport Module:
+#####################################################################
+
+qt_add_module(LinuxAccessibilitySupport
+    STATIC
+    INTERNAL_MODULE
+    SOURCES
+        application.cpp application_p.h
+        atspiadaptor.cpp atspiadaptor_p.h
+        bridge.cpp bridge_p.h
+        cache.cpp cache_p.h
+        constant_mappings.cpp constant_mappings_p.h
+        dbusconnection.cpp dbusconnection_p.h
+        struct_marshallers.cpp struct_marshallers_p.h
+    DBUS_ADAPTOR_SOURCES
+        dbusxml/Cache.xml
+        dbusxml/DeviceEventController.xml
+    DBUS_ADAPTOR_FLAGS
+        "-i" "struct_marshallers_p.h"
+    DBUS_INTERFACE_SOURCES
+        dbusxml/Bus.xml
+        dbusxml/Socket.xml
+    DBUS_INTERFACE_FLAGS
+        "-i" "struct_marshallers_p.h"
+    DEFINES
+        QT_NO_CAST_FROM_ASCII
+    PUBLIC_LIBRARIES
+        PkgConfig::ATSPI2_nolink
+        Qt::AccessibilitySupportPrivate
+        Qt::CorePrivate
+        Qt::DBus
+        Qt::GuiPrivate
+    PRECOMPILED_HEADER
+        "../../corelib/global/qt_pch.h"
+)
+
+#### Keys ignored in scope 1:.:.:linuxaccessibility.pro:<TRUE>:
+# MODULE = "linuxaccessibility_support"
diff --git a/src/platformsupport/linuxaccessibility/constant_mappings_p.h b/src/platformsupport/linuxaccessibility/constant_mappings_p.h
index 4da818c8c1..1d4dd833e1 100644
--- a/src/platformsupport/linuxaccessibility/constant_mappings_p.h
+++ b/src/platformsupport/linuxaccessibility/constant_mappings_p.h
@@ -118,7 +118,7 @@ struct RoleNames {
     QString localizedName() const {return m_localizedName;}
 
 private:
-    AtspiRole m_spiRole;
+    AtspiRole m_spiRole = ATSPI_ROLE_INVALID;
     QString m_name;
     QString m_localizedName;
 };
diff --git a/src/platformsupport/linuxofono/CMakeLists.txt b/src/platformsupport/linuxofono/CMakeLists.txt
new file mode 100644
index 0000000000..ba8bc97dd6
--- /dev/null
+++ b/src/platformsupport/linuxofono/CMakeLists.txt
@@ -0,0 +1,20 @@
+# Generated from linuxofono.pro.
+
+#####################################################################
+## LinuxOfonoSupport Module:
+#####################################################################
+
+add_qt_module(LinuxOfonoSupport
+    STATIC
+    INTERNAL_MODULE
+    SOURCES
+        qofonoservice_linux.cpp qofonoservice_linux_p.h
+    DEFINES
+        QT_NO_CAST_FROM_ASCII
+    PUBLIC_LIBRARIES
+        Qt::Core
+        Qt::DBus
+)
+
+#### Keys ignored in scope 1:.:.:linuxofono.pro:<TRUE>:
+# MODULE = "linuxofono_support"
diff --git a/src/platformsupport/linuxofono/linuxofono.pro b/src/platformsupport/linuxofono/linuxofono.pro
new file mode 100644
index 0000000000..1bc5b10225
--- /dev/null
+++ b/src/platformsupport/linuxofono/linuxofono.pro
@@ -0,0 +1,15 @@
+TARGET = QtLinuxOfonoSupport
+MODULE = linuxofono_support
+
+QT = core dbus
+CONFIG += static internal_module
+
+DEFINES += QT_NO_CAST_FROM_ASCII
+
+HEADERS += \
+    qofonoservice_linux_p.h
+
+SOURCES += \
+    qofonoservice_linux.cpp
+
+load(qt_module)
diff --git a/src/platformsupport/linuxofono/qofonoservice_linux.cpp b/src/platformsupport/linuxofono/qofonoservice_linux.cpp
new file mode 100644
index 0000000000..792c703966
--- /dev/null
+++ b/src/platformsupport/linuxofono/qofonoservice_linux.cpp
@@ -0,0 +1,384 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the plugins of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QObject>
+#include <QList>
+#include <QtDBus/QtDBus>
+#include <QtDBus/QDBusConnection>
+#include <QtDBus/QDBusError>
+#include <QtDBus/QDBusInterface>
+#include <QtDBus/QDBusMessage>
+#include <QtDBus/QDBusReply>
+#include <QtDBus/QDBusPendingCallWatcher>
+#include <QtDBus/QDBusObjectPath>
+#include <QtDBus/QDBusPendingCall>
+
+#include "qofonoservice_linux_p.h"
+
+#ifndef QT_NO_DBUS
+
+QDBusArgument &operator<<(QDBusArgument &argument, const ObjectPathProperties &item)
+{
+    argument.beginStructure();
+    argument << item.path << item.properties;
+    argument.endStructure();
+    return argument;
+}
+
+const QDBusArgument &operator>>(const QDBusArgument &argument, ObjectPathProperties &item)
+{
+    argument.beginStructure();
+    argument >> item.path >> item.properties;
+    argument.endStructure();
+    return argument;
+}
+
+QT_BEGIN_NAMESPACE
+
+QOfonoManagerInterface::QOfonoManagerInterface( QObject *parent)
+        : QDBusAbstractInterface(QLatin1String(OFONO_SERVICE),
+                                 QLatin1String(OFONO_MANAGER_PATH),
+                                 OFONO_MANAGER_INTERFACE,
+                                 QDBusConnection::systemBus(), parent)
+{
+    qDBusRegisterMetaType<ObjectPathProperties>();
+    qDBusRegisterMetaType<PathPropertiesList>();
+
+    QDBusConnection::systemBus().connect(QLatin1String(OFONO_SERVICE),
+                           QLatin1String(OFONO_MANAGER_PATH),
+                           QLatin1String(OFONO_MANAGER_INTERFACE),
+                           QLatin1String("ModemAdded"),
+                           this,SLOT(modemAdded(QDBusObjectPath,QVariantMap)));
+    QDBusConnection::systemBus().connect(QLatin1String(OFONO_SERVICE),
+                           QLatin1String(OFONO_MANAGER_PATH),
+                           QLatin1String(OFONO_MANAGER_INTERFACE),
+                           QLatin1String("ModemRemoved"),
+                           this,SLOT(modemRemoved(QDBusObjectPath)));
+}
+
+QOfonoManagerInterface::~QOfonoManagerInterface()
+{
+}
+
+QStringList QOfonoManagerInterface::getModems()
+{
+    if (modemList.isEmpty()) {
+        QDBusPendingReply<PathPropertiesList> reply = call(QDBus::Block, QLatin1String("GetModems"));
+        reply.waitForFinished();
+        if (!reply.isError()) {
+            const auto modems = reply.value();
+            for (const ObjectPathProperties &modem : modems)
+                modemList << modem.path.path();
+        }
+    }
+
+    return modemList;
+}
+
+QString QOfonoManagerInterface::currentModem()
+{
+    const QStringList modems = getModems();
+    for (const QString &modem : modems) {
+        QOfonoModemInterface device(modem);
+        if (device.isPowered() && device.isOnline()
+                && device.interfaces().contains(QLatin1String("org.ofono.NetworkRegistration")))
+        return modem;
+    }
+    return QString();
+}
+
+void QOfonoManagerInterface::modemAdded(const QDBusObjectPath &path, const QVariantMap &/*var*/)
+{
+    if (!modemList.contains(path.path())) {
+        modemList << path.path();
+        Q_EMIT modemChanged();
+    }
+}
+
+void QOfonoManagerInterface::modemRemoved(const QDBusObjectPath &path)
+{
+    if (modemList.contains(path.path())) {
+        modemList.removeOne(path.path());
+        Q_EMIT modemChanged();
+    }
+}
+
+
+QOfonoModemInterface::QOfonoModemInterface(const QString &dbusPathName, QObject *parent)
+    : QDBusAbstractInterface(QLatin1String(OFONO_SERVICE),
+                             dbusPathName,
+                             OFONO_MODEM_INTERFACE,
+                             QDBusConnection::systemBus(), parent)
+{
+    QDBusConnection::systemBus().connect(QLatin1String(OFONO_SERVICE),
+                                         path(),
+                                         QLatin1String(OFONO_MODEM_INTERFACE),
+                                         QLatin1String("PropertyChanged"),
+                                         this,SLOT(propertyChanged(QString,QDBusVariant)));
+}
+
+QOfonoModemInterface::~QOfonoModemInterface()
+{
+}
+
+void QOfonoModemInterface::propertyChanged(const QString &name,const QDBusVariant &value)
+{
+    propertiesMap[name] = value.variant();
+}
+
+bool QOfonoModemInterface::isPowered()
+{
+    QVariant var = getProperty(QStringLiteral("Powered"));
+    return qdbus_cast<bool>(var);
+}
+
+bool QOfonoModemInterface::isOnline()
+{
+    QVariant var = getProperty(QStringLiteral("Online"));
+    return qdbus_cast<bool>(var);
+}
+
+QStringList QOfonoModemInterface::interfaces()
+{
+    const QVariant var = getProperty(QStringLiteral("Interfaces"));
+    return var.toStringList();
+}
+
+QVariantMap QOfonoModemInterface::getProperties()
+{
+    if (propertiesMap.isEmpty()) {
+        QDBusPendingReply<QVariantMap> reply = call(QDBus::Block, QLatin1String("GetProperties"));
+        if (!reply.isError()) {
+            propertiesMap = reply.value();
+        }
+    }
+    return propertiesMap;
+}
+
+QVariant QOfonoModemInterface::getProperty(const QString &property)
+{
+    QVariant var;
+    QVariantMap map = getProperties();
+    if (map.contains(property))
+        var = map.value(property);
+    return var;
+}
+
+
+QOfonoNetworkRegistrationInterface::QOfonoNetworkRegistrationInterface(const QString &dbusPathName, QObject *parent)
+    : QDBusAbstractInterface(QLatin1String(OFONO_SERVICE),
+                             dbusPathName,
+                             OFONO_NETWORK_REGISTRATION_INTERFACE,
+                             QDBusConnection::systemBus(), parent)
+{
+}
+
+QOfonoNetworkRegistrationInterface::~QOfonoNetworkRegistrationInterface()
+{
+}
+
+QString QOfonoNetworkRegistrationInterface::getTechnology()
+{
+    QVariant var = getProperty(QStringLiteral("Technology"));
+    return qdbus_cast<QString>(var);
+}
+
+QVariant QOfonoNetworkRegistrationInterface::getProperty(const QString &property)
+{
+    QVariant var;
+    QVariantMap map = getProperties();
+    if (map.contains(property))
+        var = map.value(property);
+    return var;
+}
+
+QVariantMap QOfonoNetworkRegistrationInterface::getProperties()
+{
+    if (propertiesMap.isEmpty()) {
+        QDBusPendingReply<QVariantMap> reply = call(QDBus::Block, QLatin1String("GetProperties"));
+        reply.waitForFinished();
+        if (!reply.isError()) {
+            propertiesMap = reply.value();
+        }
+    }
+    return propertiesMap;
+}
+
+QOfonoDataConnectionManagerInterface::QOfonoDataConnectionManagerInterface(const QString &dbusPathName, QObject *parent)
+    : QDBusAbstractInterface(QLatin1String(OFONO_SERVICE),
+                             dbusPathName,
+                             OFONO_DATA_CONNECTION_MANAGER_INTERFACE,
+                             QDBusConnection::systemBus(), parent)
+{
+    QDBusConnection::systemBus().connect(QLatin1String(OFONO_SERVICE),
+                                         path(),
+                                         QLatin1String(OFONO_MODEM_INTERFACE),
+                                         QLatin1String("PropertyChanged"),
+                                         this,SLOT(propertyChanged(QString,QDBusVariant)));
+}
+
+QOfonoDataConnectionManagerInterface::~QOfonoDataConnectionManagerInterface()
+{
+}
+
+QStringList QOfonoDataConnectionManagerInterface::contexts()
+{
+    if (contextList.isEmpty()) {
+        QDBusPendingReply<PathPropertiesList > reply = call(QLatin1String("GetContexts"));
+        reply.waitForFinished();
+        if (!reply.isError()) {
+            const auto contexts = reply.value();
+            for (const ObjectPathProperties &context : contexts)
+                contextList << context.path.path();
+        }
+    }
+    return contextList;
+}
+
+PathPropertiesList QOfonoDataConnectionManagerInterface::contextsWithProperties()
+{
+    if (contextListProperties.isEmpty()) {
+        QDBusPendingReply<PathPropertiesList > reply = call(QLatin1String("GetContexts"));
+        reply.waitForFinished();
+        if (!reply.isError()) {
+            contextListProperties = reply.value();
+        }
+    }
+    return contextListProperties;
+}
+
+bool QOfonoDataConnectionManagerInterface::roamingAllowed()
+{
+    QVariant var = getProperty(QStringLiteral("RoamingAllowed"));
+    return qdbus_cast<bool>(var);
+}
+
+QString QOfonoDataConnectionManagerInterface::bearer()
+{
+    QVariant var = getProperty(QStringLiteral("Bearer"));
+    return qdbus_cast<QString>(var);
+}
+
+QVariant QOfonoDataConnectionManagerInterface::getProperty(const QString &property)
+{
+    return getProperties().value(property);
+}
+
+QVariantMap &QOfonoDataConnectionManagerInterface::getProperties()
+{
+    if (propertiesMap.isEmpty()) {
+        QDBusPendingReply<QVariantMap> reply = call(QDBus::Block, QLatin1String("GetProperties"));
+        if (!reply.isError()) {
+            propertiesMap = reply.value();
+        }
+    }
+    return propertiesMap;
+}
+
+void QOfonoDataConnectionManagerInterface::propertyChanged(const QString &name, const QDBusVariant &value)
+{
+    propertiesMap[name] = value.variant();
+    if (name == QLatin1String("RoamingAllowed"))
+        Q_EMIT roamingAllowedChanged(value.variant().toBool());
+}
+
+
+QOfonoConnectionContextInterface::QOfonoConnectionContextInterface(const QString &dbusPathName, QObject *parent)
+    : QDBusAbstractInterface(QLatin1String(OFONO_SERVICE),
+                             dbusPathName,
+                             OFONO_CONNECTION_CONTEXT_INTERFACE,
+                             QDBusConnection::systemBus(), parent)
+{
+    QDBusConnection::systemBus().connect(QLatin1String(OFONO_SERVICE),
+                                         path(),
+                                         QLatin1String(OFONO_MODEM_INTERFACE),
+                                         QLatin1String("PropertyChanged"),
+                                         this,SLOT(propertyChanged(QString,QDBusVariant)));
+}
+
+QOfonoConnectionContextInterface::~QOfonoConnectionContextInterface()
+{
+}
+
+QVariantMap QOfonoConnectionContextInterface::getProperties()
+{
+    if (propertiesMap.isEmpty()) {
+        QDBusPendingReply<QVariantMap> reply = call(QDBus::Block, QLatin1String("GetProperties"));
+        if (!reply.isError()) {
+            propertiesMap = reply.value();
+        }
+    }
+    return propertiesMap;
+}
+
+void QOfonoConnectionContextInterface::propertyChanged(const QString &name, const QDBusVariant &value)
+{
+    propertiesMap[name] = value.variant();
+}
+
+QVariant QOfonoConnectionContextInterface::getProperty(const QString &property)
+{
+    QVariant var;
+    QVariantMap map = getProperties();
+    if (map.contains(property))
+        var = map.value(property);
+    return var;
+}
+
+bool QOfonoConnectionContextInterface::active()
+{
+    QVariant var = getProperty(QStringLiteral("Active"));
+    return qdbus_cast<bool>(var);
+}
+
+QString QOfonoConnectionContextInterface::accessPointName()
+{
+    QVariant var = getProperty(QStringLiteral("AccessPointName"));
+    return qdbus_cast<QString>(var);
+}
+
+QString QOfonoConnectionContextInterface::name()
+{
+    QVariant var = getProperty(QStringLiteral("Name"));
+    return qdbus_cast<QString>(var);
+}
+
+QT_END_NAMESPACE
+
+#endif // QT_NO_DBUS
diff --git a/src/plugins/bearer/linux_common/qofonoservice_linux_p.h b/src/platformsupport/linuxofono/qofonoservice_linux_p.h
index 62df5d4fa7..62df5d4fa7 100644
--- a/src/plugins/bearer/linux_common/qofonoservice_linux_p.h
+++ b/src/platformsupport/linuxofono/qofonoservice_linux_p.h
diff --git a/src/platformsupport/platformcompositor/CMakeLists.txt b/src/platformsupport/platformcompositor/CMakeLists.txt
new file mode 100644
index 0000000000..1ddc9e719d
--- /dev/null
+++ b/src/platformsupport/platformcompositor/CMakeLists.txt
@@ -0,0 +1,23 @@
+# Generated from platformcompositor.pro.
+
+#####################################################################
+## PlatformCompositorSupport Module:
+#####################################################################
+
+qt_add_module(PlatformCompositorSupport
+    STATIC
+    INTERNAL_MODULE
+    SOURCES
+        qopenglcompositor.cpp qopenglcompositor_p.h
+        qopenglcompositorbackingstore.cpp qopenglcompositorbackingstore_p.h
+        qplatformbackingstoreopenglsupport.cpp qplatformbackingstoreopenglsupport.h
+    DEFINES
+        QT_NO_CAST_FROM_ASCII
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::GuiPrivate
+        Qt::OpenGL
+)
+
+#### Keys ignored in scope 1:.:.:platformcompositor.pro:<TRUE>:
+# MODULE = "platformcompositor_support"
diff --git a/src/platformsupport/platformcompositor/platformcompositor.pro b/src/platformsupport/platformcompositor/platformcompositor.pro
index 81c31571d0..89386ab3ef 100644
--- a/src/platformsupport/platformcompositor/platformcompositor.pro
+++ b/src/platformsupport/platformcompositor/platformcompositor.pro
@@ -1,16 +1,18 @@
 TARGET = QtPlatformCompositorSupport
 MODULE = platformcompositor_support
 
-QT = core-private gui-private
+QT = core-private gui-private opengl
 CONFIG += static internal_module
 
 DEFINES += QT_NO_CAST_FROM_ASCII
 
 SOURCES += \
+    qplatformbackingstoreopenglsupport.cpp \
     qopenglcompositor.cpp \
     qopenglcompositorbackingstore.cpp
 
 HEADERS += \
+    qplatformbackingstoreopenglsupport.h \
     qopenglcompositor_p.h \
     qopenglcompositorbackingstore_p.h
 
diff --git a/src/platformsupport/platformcompositor/qopenglcompositor.cpp b/src/platformsupport/platformcompositor/qopenglcompositor.cpp
index 635bf0107f..abfaca3f9c 100644
--- a/src/platformsupport/platformcompositor/qopenglcompositor.cpp
+++ b/src/platformsupport/platformcompositor/qopenglcompositor.cpp
@@ -37,8 +37,8 @@
 **
 ****************************************************************************/
 
+#include <QtOpenGL/QOpenGLFramebufferObject>
 #include <QtGui/QOpenGLContext>
-#include <QtGui/QOpenGLFramebufferObject>
 #include <QtGui/QWindow>
 #include <qpa/qplatformbackingstore.h>
 
diff --git a/src/platformsupport/platformcompositor/qopenglcompositor_p.h b/src/platformsupport/platformcompositor/qopenglcompositor_p.h
index 41a3288240..c9414c82c6 100644
--- a/src/platformsupport/platformcompositor/qopenglcompositor_p.h
+++ b/src/platformsupport/platformcompositor/qopenglcompositor_p.h
@@ -52,7 +52,7 @@
 //
 
 #include <QtCore/QTimer>
-#include <QtGui/QOpenGLTextureBlitter>
+#include <QtOpenGL/QOpenGLTextureBlitter>
 #include <QtGui/QMatrix4x4>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/platformsupport/platformcompositor/qplatformbackingstoreopenglsupport.cpp b/src/platformsupport/platformcompositor/qplatformbackingstoreopenglsupport.cpp
new file mode 100644
index 0000000000..511d85a400
--- /dev/null
+++ b/src/platformsupport/platformcompositor/qplatformbackingstoreopenglsupport.cpp
@@ -0,0 +1,455 @@
+/****************************************************************************
+**
+** Copyright (C) 2020 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtGui module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QT_NO_OPENGL
+
+#include "qplatformbackingstoreopenglsupport.h"
+
+#include <QtGui/private/qwindow_p.h>
+
+#include <qpa/qplatformgraphicsbuffer.h>
+#include <qpa/qplatformgraphicsbufferhelper.h>
+
+#include <QtOpenGL/QOpenGLTextureBlitter>
+#include <QtGui/qopengl.h>
+#include <QtGui/QOpenGLFunctions>
+#include <QtGui/QOpenGLContext>
+#include <QtGui/QOffscreenSurface>
+
+#ifndef GL_TEXTURE_BASE_LEVEL
+#define GL_TEXTURE_BASE_LEVEL             0x813C
+#endif
+#ifndef GL_TEXTURE_MAX_LEVEL
+#define GL_TEXTURE_MAX_LEVEL              0x813D
+#endif
+#ifndef GL_UNPACK_ROW_LENGTH
+#define GL_UNPACK_ROW_LENGTH              0x0CF2
+#endif
+#ifndef GL_RGB10_A2
+#define GL_RGB10_A2                       0x8059
+#endif
+#ifndef GL_UNSIGNED_INT_2_10_10_10_REV
+#define GL_UNSIGNED_INT_2_10_10_10_REV    0x8368
+#endif
+
+#ifndef GL_FRAMEBUFFER_SRGB
+#define GL_FRAMEBUFFER_SRGB 0x8DB9
+#endif
+#ifndef GL_FRAMEBUFFER_SRGB_CAPABLE
+#define GL_FRAMEBUFFER_SRGB_CAPABLE 0x8DBA
+#endif
+
+QT_BEGIN_NAMESPACE
+
+static inline QRect deviceRect(const QRect &rect, QWindow *window)
+{
+    QRect deviceRect(rect.topLeft() * window->devicePixelRatio(),
+                     rect.size() * window->devicePixelRatio());
+    return deviceRect;
+}
+
+static inline QPoint deviceOffset(const QPoint &pt, QWindow *window)
+{
+    return pt * window->devicePixelRatio();
+}
+
+static QRegion deviceRegion(const QRegion &region, QWindow *window, const QPoint &offset)
+{
+    if (offset.isNull() && window->devicePixelRatio() <= 1)
+        return region;
+
+    QVector<QRect> rects;
+    rects.reserve(region.rectCount());
+    for (const QRect &rect : region)
+        rects.append(deviceRect(rect.translated(offset), window));
+
+    QRegion deviceRegion;
+    deviceRegion.setRects(rects.constData(), rects.count());
+    return deviceRegion;
+}
+
+static inline QRect toBottomLeftRect(const QRect &topLeftRect, int windowHeight)
+{
+    return QRect(topLeftRect.x(), windowHeight - topLeftRect.bottomRight().y() - 1,
+                 topLeftRect.width(), topLeftRect.height());
+}
+
+static void blitTextureForWidget(const QPlatformTextureList *textures, int idx, QWindow *window, const QRect &deviceWindowRect,
+                                 QOpenGLTextureBlitter *blitter, const QPoint &offset, bool canUseSrgb)
+{
+    const QRect clipRect = textures->clipRect(idx);
+    if (clipRect.isEmpty())
+        return;
+
+    QRect rectInWindow = textures->geometry(idx);
+    // relative to the TLW, not necessarily our window (if the flush is for a native child widget), have to adjust
+    rectInWindow.translate(-offset);
+
+    const QRect clippedRectInWindow = rectInWindow & clipRect.translated(rectInWindow.topLeft());
+    const QRect srcRect = toBottomLeftRect(clipRect, rectInWindow.height());
+
+    const QMatrix4x4 target = QOpenGLTextureBlitter::targetTransform(deviceRect(clippedRectInWindow, window),
+                                                                     deviceWindowRect);
+
+    const QMatrix3x3 source = QOpenGLTextureBlitter::sourceTransform(deviceRect(srcRect, window),
+                                                                     deviceRect(rectInWindow, window).size(),
+                                                                     QOpenGLTextureBlitter::OriginBottomLeft);
+
+    QOpenGLFunctions *funcs = QOpenGLContext::currentContext()->functions();
+    const bool srgb = textures->flags(idx).testFlag(QPlatformTextureList::TextureIsSrgb);
+    if (srgb && canUseSrgb)
+        funcs->glEnable(GL_FRAMEBUFFER_SRGB);
+
+    blitter->blit(textures->textureId(idx), target, source);
+
+    if (srgb && canUseSrgb)
+        funcs->glDisable(GL_FRAMEBUFFER_SRGB);
+}
+
+QPlatformBackingStoreOpenGLSupport::~QPlatformBackingStoreOpenGLSupport() {
+    if (context) {
+        QOffscreenSurface offscreenSurface;
+        offscreenSurface.setFormat(context->format());
+        offscreenSurface.create();
+        context->makeCurrent(&offscreenSurface);
+        if (textureId)
+            context->functions()->glDeleteTextures(1, &textureId);
+        if (blitter)
+            blitter->destroy();
+    }
+    delete blitter;
+}
+
+void QPlatformBackingStoreOpenGLSupport::composeAndFlush(QWindow *window, const QRegion &region, const QPoint &offset, QPlatformTextureList *textures, bool translucentBackground)
+{
+    if (!qt_window_private(window)->receivedExpose)
+        return;
+
+    if (!context) {
+        context.reset(new QOpenGLContext);
+        context->setFormat(window->requestedFormat());
+        context->setScreen(window->screen());
+        context->setShareContext(qt_window_private(window)->shareContext());
+        if (!context->create()) {
+            qCWarning(lcQpaBackingStore, "composeAndFlush: QOpenGLContext creation failed");
+            return;
+        }
+    }
+
+    bool current = context->makeCurrent(window);
+
+    if (!current && context->isValid()) {
+        delete blitter;
+        blitter = nullptr;
+        textureId = 0;
+        current = context->create() && context->makeCurrent(window);
+    }
+
+    if (!current) {
+        qCWarning(lcQpaBackingStore, "composeAndFlush: makeCurrent() failed");
+        return;
+    }
+
+    qCDebug(lcQpaBackingStore) << "Composing and flushing" << region << "of" << window
+        << "at offset" << offset << "with" << textures->count() << "texture(s) in" << textures;
+
+    QWindowPrivate::get(window)->lastComposeTime.start();
+
+    QOpenGLFunctions *funcs = context->functions();
+    funcs->glViewport(0, 0, qRound(window->width() * window->devicePixelRatio()), qRound(window->height() * window->devicePixelRatio()));
+    funcs->glClearColor(0, 0, 0, translucentBackground ? 0 : 1);
+    funcs->glClear(GL_COLOR_BUFFER_BIT);
+
+    if (!blitter) {
+        blitter = new QOpenGLTextureBlitter;
+        blitter->create();
+    }
+
+    blitter->bind();
+
+    const QRect deviceWindowRect = deviceRect(QRect(QPoint(), window->size()), window);
+    const QPoint deviceWindowOffset = deviceOffset(offset, window);
+
+    bool canUseSrgb = false;
+    // If there are any sRGB textures in the list, check if the destination
+    // framebuffer is sRGB capable.
+    for (int i = 0; i < textures->count(); ++i) {
+        if (textures->flags(i).testFlag(QPlatformTextureList::TextureIsSrgb)) {
+            GLint cap = 0;
+            funcs->glGetIntegerv(GL_FRAMEBUFFER_SRGB_CAPABLE, &cap);
+            if (cap)
+                canUseSrgb = true;
+            break;
+        }
+    }
+
+    // Textures for renderToTexture widgets.
+    for (int i = 0; i < textures->count(); ++i) {
+        if (!textures->flags(i).testFlag(QPlatformTextureList::StacksOnTop))
+            blitTextureForWidget(textures, i, window, deviceWindowRect, blitter, offset, canUseSrgb);
+    }
+
+    // Backingstore texture with the normal widgets.
+    GLuint textureId = 0;
+    QOpenGLTextureBlitter::Origin origin = QOpenGLTextureBlitter::OriginTopLeft;
+    if (QPlatformGraphicsBuffer *graphicsBuffer = backingStore->graphicsBuffer()) {
+        if (graphicsBuffer->size() != textureSize) {
+            if (this->textureId)
+                funcs->glDeleteTextures(1, &this->textureId);
+            funcs->glGenTextures(1, &this->textureId);
+            funcs->glBindTexture(GL_TEXTURE_2D, this->textureId);
+            QOpenGLContext *ctx = QOpenGLContext::currentContext();
+            if (!ctx->isOpenGLES() || ctx->format().majorVersion() >= 3) {
+                funcs->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_BASE_LEVEL, 0);
+                funcs->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL, 0);
+            }
+            funcs->glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+            funcs->glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+            funcs->glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+            funcs->glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+
+            if (QPlatformGraphicsBufferHelper::lockAndBindToTexture(graphicsBuffer, &needsSwizzle, &premultiplied)) {
+                textureSize = graphicsBuffer->size();
+            } else {
+                textureSize = QSize(0,0);
+            }
+
+            graphicsBuffer->unlock();
+        } else if (!region.isEmpty()){
+            funcs->glBindTexture(GL_TEXTURE_2D, this->textureId);
+            QPlatformGraphicsBufferHelper::lockAndBindToTexture(graphicsBuffer, &needsSwizzle, &premultiplied);
+            graphicsBuffer->unlock();
+        }
+
+        if (graphicsBuffer->origin() == QPlatformGraphicsBuffer::OriginBottomLeft)
+            origin = QOpenGLTextureBlitter::OriginBottomLeft;
+        textureId = this->textureId;
+    } else {
+        QPlatformBackingStore::TextureFlags flags;
+        textureId = backingStore->toTexture(deviceRegion(region, window, offset), &textureSize, &flags);
+        needsSwizzle = (flags & QPlatformBackingStore::TextureSwizzle) != 0;
+        premultiplied = (flags & QPlatformBackingStore::TexturePremultiplied) != 0;
+        if (flags & QPlatformBackingStore::TextureFlip)
+            origin = QOpenGLTextureBlitter::OriginBottomLeft;
+    }
+
+    funcs->glEnable(GL_BLEND);
+    if (premultiplied)
+        funcs->glBlendFuncSeparate(GL_ONE, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ONE);
+    else
+        funcs->glBlendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ONE);
+
+    if (textureId) {
+        if (needsSwizzle)
+            blitter->setRedBlueSwizzle(true);
+        // The backingstore is for the entire tlw.
+        // In case of native children offset tells the position relative to the tlw.
+        const QRect srcRect = toBottomLeftRect(deviceWindowRect.translated(deviceWindowOffset), textureSize.height());
+        const QMatrix3x3 source = QOpenGLTextureBlitter::sourceTransform(srcRect,
+                                                                         textureSize,
+                                                                         origin);
+        blitter->blit(textureId, QMatrix4x4(), source);
+        if (needsSwizzle)
+            blitter->setRedBlueSwizzle(false);
+    }
+
+    // Textures for renderToTexture widgets that have WA_AlwaysStackOnTop set.
+    bool blendIsPremultiplied = premultiplied;
+    for (int i = 0; i < textures->count(); ++i) {
+        const QPlatformTextureList::Flags flags = textures->flags(i);
+        if (flags.testFlag(QPlatformTextureList::NeedsPremultipliedAlphaBlending)) {
+            if (!blendIsPremultiplied) {
+                funcs->glBlendFuncSeparate(GL_ONE, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ONE);
+                blendIsPremultiplied = true;
+            }
+        } else {
+            if (blendIsPremultiplied) {
+                funcs->glBlendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ONE);
+                blendIsPremultiplied = false;
+            }
+        }
+        if (flags.testFlag(QPlatformTextureList::StacksOnTop))
+            blitTextureForWidget(textures, i, window, deviceWindowRect, blitter, offset, canUseSrgb);
+    }
+
+    funcs->glDisable(GL_BLEND);
+    blitter->release();
+
+    context->swapBuffers(window);
+}
+
+GLuint QPlatformBackingStoreOpenGLSupport::toTexture(const QRegion &dirtyRegion, QSize *textureSize, QPlatformBackingStore::TextureFlags *flags) const
+{
+    Q_ASSERT(textureSize);
+    Q_ASSERT(flags);
+
+    QImage image = backingStore->toImage();
+    QSize imageSize = image.size();
+
+    QOpenGLContext *ctx = QOpenGLContext::currentContext();
+    GLenum internalFormat = GL_RGBA;
+    GLuint pixelType = GL_UNSIGNED_BYTE;
+
+    bool needsConversion = false;
+    *flags = { };
+    switch (image.format()) {
+    case QImage::Format_ARGB32_Premultiplied:
+        *flags |= QPlatformBackingStore::TexturePremultiplied;
+        Q_FALLTHROUGH();
+    case QImage::Format_RGB32:
+    case QImage::Format_ARGB32:
+        *flags |= QPlatformBackingStore::TextureSwizzle;
+        break;
+    case QImage::Format_RGBA8888_Premultiplied:
+        *flags |= QPlatformBackingStore::TexturePremultiplied;
+        Q_FALLTHROUGH();
+    case QImage::Format_RGBX8888:
+    case QImage::Format_RGBA8888:
+        break;
+    case QImage::Format_BGR30:
+    case QImage::Format_A2BGR30_Premultiplied:
+        if (!ctx->isOpenGLES() || ctx->format().majorVersion() >= 3) {
+            pixelType = GL_UNSIGNED_INT_2_10_10_10_REV;
+            internalFormat = GL_RGB10_A2;
+            *flags |= QPlatformBackingStore::TexturePremultiplied;
+        } else {
+            needsConversion = true;
+        }
+        break;
+    case QImage::Format_RGB30:
+    case QImage::Format_A2RGB30_Premultiplied:
+        if (!ctx->isOpenGLES() || ctx->format().majorVersion() >= 3) {
+            pixelType = GL_UNSIGNED_INT_2_10_10_10_REV;
+            internalFormat = GL_RGB10_A2;
+            *flags |= QPlatformBackingStore::TextureSwizzle | QPlatformBackingStore::TexturePremultiplied;
+        } else {
+            needsConversion = true;
+        }
+        break;
+    default:
+        needsConversion = true;
+        break;
+    }
+    if (imageSize.isEmpty()) {
+        *textureSize = imageSize;
+        return 0;
+    }
+
+    // Must rely on the input only, not d_ptr.
+    // With the default composeAndFlush() textureSize is &d_ptr->textureSize.
+    bool resized = *textureSize != imageSize;
+    if (dirtyRegion.isEmpty() && !resized)
+        return textureId;
+
+    *textureSize = imageSize;
+
+    if (needsConversion)
+        image = image.convertToFormat(QImage::Format_RGBA8888);
+
+    // The image provided by the backingstore may have a stride larger than width * 4, for
+    // instance on platforms that manually implement client-side decorations.
+    static const int bytesPerPixel = 4;
+    const qsizetype strideInPixels = image.bytesPerLine() / bytesPerPixel;
+    const bool hasUnpackRowLength = !ctx->isOpenGLES() || ctx->format().majorVersion() >= 3;
+
+    QOpenGLFunctions *funcs = ctx->functions();
+
+    if (hasUnpackRowLength) {
+        funcs->glPixelStorei(GL_UNPACK_ROW_LENGTH, strideInPixels);
+    } else if (strideInPixels != image.width()) {
+        // No UNPACK_ROW_LENGTH on ES 2.0 and yet we would need it. This case is typically
+        // hit with QtWayland which is rarely used in combination with a ES2.0-only GL
+        // implementation.  Therefore, accept the performance hit and do a copy.
+        image = image.copy();
+    }
+
+    if (resized) {
+        if (textureId)
+            funcs->glDeleteTextures(1, &textureId);
+        funcs->glGenTextures(1, &textureId);
+        funcs->glBindTexture(GL_TEXTURE_2D, textureId);
+        if (!ctx->isOpenGLES() || ctx->format().majorVersion() >= 3) {
+            funcs->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_BASE_LEVEL, 0);
+            funcs->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL, 0);
+        }
+        funcs->glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+        funcs->glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+        funcs->glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+        funcs->glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+
+        funcs->glTexImage2D(GL_TEXTURE_2D, 0, internalFormat, imageSize.width(), imageSize.height(), 0, GL_RGBA, pixelType,
+                            const_cast<uchar*>(image.constBits()));
+    } else {
+        funcs->glBindTexture(GL_TEXTURE_2D, textureId);
+        QRect imageRect = image.rect();
+        QRect rect = dirtyRegion.boundingRect() & imageRect;
+
+        if (hasUnpackRowLength) {
+            funcs->glTexSubImage2D(GL_TEXTURE_2D, 0, rect.x(), rect.y(), rect.width(), rect.height(), GL_RGBA, pixelType,
+                                   image.constScanLine(rect.y()) + rect.x() * bytesPerPixel);
+        } else {
+            // if the rect is wide enough it's cheaper to just
+            // extend it instead of doing an image copy
+            if (rect.width() >= imageRect.width() / 2) {
+                rect.setX(0);
+                rect.setWidth(imageRect.width());
+            }
+
+            // if the sub-rect is full-width we can pass the image data directly to
+            // OpenGL instead of copying, since there's no gap between scanlines
+
+            if (rect.width() == imageRect.width()) {
+                funcs->glTexSubImage2D(GL_TEXTURE_2D, 0, 0, rect.y(), rect.width(), rect.height(), GL_RGBA, pixelType,
+                                       image.constScanLine(rect.y()));
+            } else {
+                funcs->glTexSubImage2D(GL_TEXTURE_2D, 0, rect.x(), rect.y(), rect.width(), rect.height(), GL_RGBA, pixelType,
+                                       image.copy(rect).constBits());
+            }
+        }
+    }
+
+    if (hasUnpackRowLength)
+        funcs->glPixelStorei(GL_UNPACK_ROW_LENGTH, 0);
+
+    return textureId;
+}
+
+#endif // QT_NO_OPENGL
+
+QT_END_NAMESPACE
diff --git a/src/platformsupport/platformcompositor/qplatformbackingstoreopenglsupport.h b/src/platformsupport/platformcompositor/qplatformbackingstoreopenglsupport.h
new file mode 100644
index 0000000000..5523b18f76
--- /dev/null
+++ b/src/platformsupport/platformcompositor/qplatformbackingstoreopenglsupport.h
@@ -0,0 +1,87 @@
+/****************************************************************************
+**
+** Copyright (C) 2020 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtGui module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QPLATFORMBACKINGSTOREOPENGLSUPPORT_H
+#define QPLATFORMBACKINGSTOREOPENGLSUPPORT_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is part of the QPA API and is not meant to be used
+// in applications. Usage of this API may make your code
+// source and binary incompatible with future versions of Qt.
+//
+
+#ifndef QT_NO_OPENGL
+
+#include <QtGui/qtguiglobal.h>
+#include <qpa/qplatformbackingstore.h>
+
+#include <QtGui/QOpenGLContext>
+
+QT_BEGIN_NAMESPACE
+
+class QOpenGLTextureBlitter;
+class QOpenGLBackingStore;
+
+class QPlatformBackingStoreOpenGLSupport : public QPlatformBackingStoreOpenGLSupportBase
+{
+public:
+    explicit QPlatformBackingStoreOpenGLSupport(QPlatformBackingStore *backingStore) : backingStore(backingStore) {}
+    ~QPlatformBackingStoreOpenGLSupport() override;
+    void composeAndFlush(QWindow *window, const QRegion &region, const QPoint &offset,
+                         QPlatformTextureList *textures, bool translucentBackground) override;
+    GLuint toTexture(const QRegion &dirtyRegion, QSize *textureSize, QPlatformBackingStore::TextureFlags *flags) const override;
+
+private:
+    QPlatformBackingStore *backingStore = nullptr;
+    QScopedPointer<QOpenGLContext> context;
+    mutable GLuint textureId = 0;
+    mutable QSize textureSize;
+    mutable bool needsSwizzle = false;
+    mutable bool premultiplied = false;
+    QOpenGLTextureBlitter *blitter = nullptr;
+};
+
+QT_END_NAMESPACE
+
+#endif // QT_NO_OPENGL
+
+#endif // QPLATFORMBACKINGSTOREOPENGLSUPPORT_H
diff --git a/src/platformsupport/platformsupport.pro b/src/platformsupport/platformsupport.pro
index 877665ff06..4b41b29c12 100644
--- a/src/platformsupport/platformsupport.pro
+++ b/src/platformsupport/platformsupport.pro
@@ -45,3 +45,7 @@ darwin {
 
 qtConfig(vulkan): \
     SUBDIRS += vkconvenience
+
+!android:linux*:qtHaveModule(dbus) \
+    SUBDIRS += linuxofono
+
diff --git a/src/platformsupport/services/CMakeLists.txt b/src/platformsupport/services/CMakeLists.txt
new file mode 100644
index 0000000000..602dd40305
--- /dev/null
+++ b/src/platformsupport/services/CMakeLists.txt
@@ -0,0 +1,30 @@
+# Generated from services.pro.
+
+#####################################################################
+## ServiceSupport Module:
+#####################################################################
+
+qt_add_module(ServiceSupport
+    STATIC
+    INTERNAL_MODULE
+    SOURCES
+        genericunix/qgenericunixservices.cpp genericunix/qgenericunixservices_p.h
+    DEFINES
+        QT_NO_CAST_FROM_ASCII
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::GuiPrivate
+    PRECOMPILED_HEADER
+        "../../corelib/global/qt_pch.h"
+)
+
+#### Keys ignored in scope 1:.:.:services.pro:<TRUE>:
+# MODULE = "service_support"
+
+## Scopes:
+#####################################################################
+
+qt_extend_target(ServiceSupport CONDITION QT_FEATURE_dbus
+    PUBLIC_LIBRARIES
+        Qt::DBus
+)
diff --git a/src/platformsupport/themes/CMakeLists.txt b/src/platformsupport/themes/CMakeLists.txt
new file mode 100644
index 0000000000..a7be78d0e0
--- /dev/null
+++ b/src/platformsupport/themes/CMakeLists.txt
@@ -0,0 +1,54 @@
+# Generated from themes.pro.
+
+#####################################################################
+## ThemeSupport Module:
+#####################################################################
+
+qt_add_module(ThemeSupport
+    STATIC
+    INTERNAL_MODULE
+    SOURCES
+        qabstractfileiconengine.cpp qabstractfileiconengine_p.h
+    DEFINES
+        QT_NO_CAST_FROM_ASCII
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::GuiPrivate
+)
+
+#### Keys ignored in scope 1:.:.:themes.pro:<TRUE>:
+# MODULE = "theme_support"
+
+## Scopes:
+#####################################################################
+
+qt_extend_target(ThemeSupport CONDITION QT_FEATURE_xcb OR (UNIX AND NOT APPLE_UIKIT)
+    SOURCES
+        genericunix/qgenericunixthemes.cpp genericunix/qgenericunixthemes_p.h
+)
+
+qt_extend_target(ThemeSupport CONDITION QT_FEATURE_dbus AND (QT_FEATURE_xcb OR UNIX) AND (QT_FEATURE_xcb OR NOT APPLE_UIKIT)
+    SOURCES
+        genericunix/dbusmenu/qdbusmenuadaptor.cpp genericunix/dbusmenu/qdbusmenuadaptor_p.h
+        genericunix/dbusmenu/qdbusmenubar.cpp genericunix/dbusmenu/qdbusmenubar_p.h
+        genericunix/dbusmenu/qdbusmenuconnection.cpp genericunix/dbusmenu/qdbusmenuconnection_p.h
+        genericunix/dbusmenu/qdbusmenuregistrarproxy.cpp genericunix/dbusmenu/qdbusmenuregistrarproxy_p.h
+        genericunix/dbusmenu/qdbusmenutypes.cpp genericunix/dbusmenu/qdbusmenutypes_p.h
+        genericunix/dbusmenu/qdbusplatformmenu.cpp genericunix/dbusmenu/qdbusplatformmenu_p.h
+    INCLUDE_DIRECTORIES
+        genericunix/dbusmenu
+    LIBRARIES
+        Qt::DBus
+)
+
+qt_extend_target(ThemeSupport CONDITION QT_FEATURE_dbus AND QT_FEATURE_systemtrayicon AND (QT_FEATURE_xcb OR UNIX) AND (QT_FEATURE_xcb OR NOT APPLE_UIKIT)
+    SOURCES
+        genericunix/dbustray/qdbustrayicon.cpp genericunix/dbustray/qdbustrayicon_p.h
+        genericunix/dbustray/qdbustraytypes.cpp genericunix/dbustray/qdbustraytypes_p.h
+        genericunix/dbustray/qstatusnotifieritemadaptor.cpp genericunix/dbustray/qstatusnotifieritemadaptor_p.h
+        genericunix/dbustray/qxdgnotificationproxy.cpp genericunix/dbustray/qxdgnotificationproxy_p.h
+    INCLUDE_DIRECTORIES
+        genericunix/dbustray
+    LIBRARIES
+        Qt::DBus
+)
diff --git a/src/platformsupport/themes/genericunix/dbusmenu/qdbusmenutypes.cpp b/src/platformsupport/themes/genericunix/dbusmenu/qdbusmenutypes.cpp
index ccf2180dc5..6fadea5d28 100644
--- a/src/platformsupport/themes/genericunix/dbusmenu/qdbusmenutypes.cpp
+++ b/src/platformsupport/themes/genericunix/dbusmenu/qdbusmenutypes.cpp
@@ -48,7 +48,9 @@
 #include <QDebug>
 #include <QtEndian>
 #include <QBuffer>
-#include <private/qkeysequence_p.h>
+#if QT_CONFIG(shortcut)
+#  include <private/qkeysequence_p.h>
+#endif
 #include <qpa/qplatformmenu.h>
 #include "qdbusplatformmenu_p.h"
 
diff --git a/src/platformsupport/themes/genericunix/dbusmenu/qdbusplatformmenu_p.h b/src/platformsupport/themes/genericunix/dbusmenu/qdbusplatformmenu_p.h
index 8a31f82fb0..aa0f303416 100644
--- a/src/platformsupport/themes/genericunix/dbusmenu/qdbusplatformmenu_p.h
+++ b/src/platformsupport/themes/genericunix/dbusmenu/qdbusplatformmenu_p.h
@@ -96,7 +96,7 @@ public:
     void setChecked(bool isChecked) override;
     bool hasExclusiveGroup() const { return m_hasExclusiveGroup; }
     void setHasExclusiveGroup(bool hasExclusiveGroup) override;
-#ifndef QT_NO_SHORTCUT
+#if QT_CONFIG(shortcut)
     QKeySequence shortcut() const { return m_shortcut; }
     void setShortcut(const QKeySequence& shortcut) override;
 #endif
@@ -123,7 +123,9 @@ private:
     bool m_hasExclusiveGroup : 1;
     short /*unused*/ : 6;
     short m_dbusID : 16;
+#if QT_CONFIG(shortcut)
     QKeySequence m_shortcut;
+#endif
 };
 
 class QDBusPlatformMenu : public QPlatformMenu
diff --git a/src/platformsupport/themes/genericunix/dbustray/qdbustrayicon_p.h b/src/platformsupport/themes/genericunix/dbustray/qdbustrayicon_p.h
index 7034a7edb4..edc115742c 100644
--- a/src/platformsupport/themes/genericunix/dbustray/qdbustrayicon_p.h
+++ b/src/platformsupport/themes/genericunix/dbustray/qdbustrayicon_p.h
@@ -83,6 +83,7 @@ class QDBusTrayIcon: public QPlatformSystemTrayIcon
     Q_PROPERTY(QString attentionIconName READ attentionIconName NOTIFY attention)
     Q_PROPERTY(QIcon attentionIcon READ attentionIcon NOTIFY attention)
     Q_PROPERTY(QDBusPlatformMenu *menu READ menu NOTIFY menuChanged)
+    Q_MOC_INCLUDE("qdbusplatformmenu_p.h")
 
 public:
     QDBusTrayIcon();
diff --git a/src/platformsupport/vkconvenience/.prev_CMakeLists.txt b/src/platformsupport/vkconvenience/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..6f17cfa306
--- /dev/null
+++ b/src/platformsupport/vkconvenience/.prev_CMakeLists.txt
@@ -0,0 +1,31 @@
+# Generated from vkconvenience.pro.
+
+#####################################################################
+## VulkanSupport Module:
+#####################################################################
+
+qt_add_module(VulkanSupport
+    STATIC
+    INTERNAL_MODULE
+    SOURCES
+        qbasicvulkanplatforminstance.cpp qbasicvulkanplatforminstance_p.h
+        qvkconvenience.cpp qvkconvenience_p.h
+    DEFINES
+        QT_NO_CAST_FROM_ASCII
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::GuiPrivate
+    PRECOMPILED_HEADER
+        "../../corelib/global/qt_pch.h"
+)
+
+#### Keys ignored in scope 1:.:.:vkconvenience.pro:<TRUE>:
+# MODULE = "vulkan_support"
+
+## Scopes:
+#####################################################################
+
+qt_extend_target(VulkanSupport CONDITION QT_FEATURE_opengl
+    PUBLIC_LIBRARIES
+        Qt::OpenGL
+)
diff --git a/src/platformsupport/vkconvenience/CMakeLists.txt b/src/platformsupport/vkconvenience/CMakeLists.txt
new file mode 100644
index 0000000000..6ec2574375
--- /dev/null
+++ b/src/platformsupport/vkconvenience/CMakeLists.txt
@@ -0,0 +1,33 @@
+# Generated from vkconvenience.pro.
+
+qt_find_package(Vulkan) # special case
+
+#####################################################################
+## VulkanSupport Module:
+#####################################################################
+
+qt_add_module(VulkanSupport
+    STATIC
+    INTERNAL_MODULE
+    SOURCES
+        qbasicvulkanplatforminstance.cpp qbasicvulkanplatforminstance_p.h
+        qvkconvenience.cpp qvkconvenience_p.h
+    DEFINES
+        QT_NO_CAST_FROM_ASCII
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::GuiPrivate
+    PRECOMPILED_HEADER
+        "../../corelib/global/qt_pch.h"
+)
+
+#### Keys ignored in scope 1:.:.:vkconvenience.pro:<TRUE>:
+# MODULE = "vulkan_support"
+
+## Scopes:
+#####################################################################
+
+qt_extend_target(VulkanSupport CONDITION QT_FEATURE_opengl
+    PUBLIC_LIBRARIES
+        Qt::OpenGL
+)
diff --git a/src/platformsupport/vkconvenience/qvkconvenience.cpp b/src/platformsupport/vkconvenience/qvkconvenience.cpp
index acde1d1bda..59de335333 100644
--- a/src/platformsupport/vkconvenience/qvkconvenience.cpp
+++ b/src/platformsupport/vkconvenience/qvkconvenience.cpp
@@ -39,7 +39,9 @@
 
 #include "qvkconvenience_p.h"
 
-#include <QOpenGLTexture>
+#if QT_CONFIG(opengl)
+#include <QtOpenGL/QOpenGLTexture>
+#endif
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/platformsupport/vkconvenience/vkconvenience.pro b/src/platformsupport/vkconvenience/vkconvenience.pro
index ee540024cf..f3ada5768a 100644
--- a/src/platformsupport/vkconvenience/vkconvenience.pro
+++ b/src/platformsupport/vkconvenience/vkconvenience.pro
@@ -2,6 +2,8 @@ TARGET = QtVulkanSupport
 MODULE = vulkan_support
 
 QT = core-private gui-private
+qtConfig(opengl): QT += opengl
+
 CONFIG += static internal_module
 
 DEFINES += QT_NO_CAST_FROM_ASCII
diff --git a/src/platformsupport/windowsuiautomation/CMakeLists.txt b/src/platformsupport/windowsuiautomation/CMakeLists.txt
new file mode 100644
index 0000000000..c610b97fd6
--- /dev/null
+++ b/src/platformsupport/windowsuiautomation/CMakeLists.txt
@@ -0,0 +1,28 @@
+# Generated from windowsuiautomation.pro.
+
+#####################################################################
+## WindowsUIAutomationSupport Module:
+#####################################################################
+
+qt_add_module(WindowsUIAutomationSupport
+    STATIC
+    INTERNAL_MODULE
+    SOURCES
+        qwindowsuiawrapper.cpp qwindowsuiawrapper_p.h
+        uiaattributeids_p.h
+        uiaclientinterfaces_p.h
+        uiacontroltypeids_p.h
+        uiaerrorids_p.h
+        uiaeventids_p.h
+        uiageneralids_p.h
+        uiapatternids_p.h
+        uiapropertyids_p.h
+        uiaserverinterfaces_p.h
+        uiatypes_p.h
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::GuiPrivate
+)
+
+#### Keys ignored in scope 1:.:.:windowsuiautomation.pro:<TRUE>:
+# MODULE = "windowsuiautomation_support"
diff --git a/src/plugins/CMakeLists.txt b/src/plugins/CMakeLists.txt
new file mode 100644
index 0000000000..6718d64ca0
--- /dev/null
+++ b/src/plugins/CMakeLists.txt
@@ -0,0 +1,25 @@
+# Generated from plugins.pro.
+
+if(TARGET Qt::Sql)
+    add_subdirectory(sqldrivers)
+endif()
+if(QT_FEATURE_bearermanagement AND TARGET Qt::Network)
+    add_subdirectory(bearer)
+endif()
+if(TARGET Qt::Gui)
+    add_subdirectory(platforms)
+    add_subdirectory(platforminputcontexts)
+    add_subdirectory(platformthemes)
+endif()
+if(QT_FEATURE_imageformatplugin AND TARGET Qt::Gui)
+    add_subdirectory(imageformats)
+endif()
+if(QT_FEATURE_library AND TARGET Qt::Gui AND NOT ANDROID)
+    add_subdirectory(generic)
+endif()
+if(TARGET Qt::Widgets)
+    add_subdirectory(styles)
+endif()
+if(TARGET Qt::PrintSupport AND NOT WINRT)
+    add_subdirectory(printsupport)
+endif()
diff --git a/src/plugins/bearer/.prev_CMakeLists.txt b/src/plugins/bearer/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..a7a36f60c6
--- /dev/null
+++ b/src/plugins/bearer/.prev_CMakeLists.txt
@@ -0,0 +1,12 @@
+# Generated from bearer.pro.
+
+if(SUBDIRS_ISEMPTY OR (TARGET Qt::DBus AND linux_x_ AND NOT ANDROID))
+    add_subdirectory(generic)
+endif()
+if(TARGET Qt::DBus AND linux_x_ AND NOT ANDROID)
+    add_subdirectory(connman)
+    add_subdirectory(networkmanager)
+endif()
+if(ANDROID AND NOT ANDROID_EMBEDDED)
+    add_subdirectory(android)
+endif()
diff --git a/src/plugins/bearer/CMakeLists.txt b/src/plugins/bearer/CMakeLists.txt
new file mode 100644
index 0000000000..528061d264
--- /dev/null
+++ b/src/plugins/bearer/CMakeLists.txt
@@ -0,0 +1,14 @@
+# Generated from bearer.pro.
+
+# special case begin
+# The whole block is manual.
+if(NOT ANDROID AND LINUX AND TARGET Qt::DBus)
+    add_subdirectory(generic)
+    add_subdirectory(connman)
+    add_subdirectory(networkmanager)
+elseif(ANDROID AND NOT ANDROID_EMBEDDED)
+    add_subdirectory(android)
+else()
+    add_subdirectory(generic)
+endif()
+# special case end
diff --git a/src/plugins/bearer/android/CMakeLists.txt b/src/plugins/bearer/android/CMakeLists.txt
new file mode 100644
index 0000000000..193cbf1fe3
--- /dev/null
+++ b/src/plugins/bearer/android/CMakeLists.txt
@@ -0,0 +1,4 @@
+# Generated from android.pro.
+
+add_subdirectory(src)
+add_subdirectory(jar)
diff --git a/src/plugins/bearer/android/jar/.prev_CMakeLists.txt b/src/plugins/bearer/android/jar/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..f5f25c4f8b
--- /dev/null
+++ b/src/plugins/bearer/android/jar/.prev_CMakeLists.txt
@@ -0,0 +1,16 @@
+# Generated from jar.pro.
+
+set(java_sources
+    src/org/qtproject/qt5/android/bearer/QtNetworkReceiver.java
+)
+
+add_jar(QtAndroidBearer
+    INCLUDE_JARS ${QT_ANDROID_JAR}
+    SOURCES ${java_sources}
+)
+
+install_jar(QtAndroidBearer
+    DESTINATION jar
+    COMPONENT Devel
+)
+
diff --git a/src/plugins/bearer/android/jar/CMakeLists.txt b/src/plugins/bearer/android/jar/CMakeLists.txt
new file mode 100644
index 0000000000..16641d42b7
--- /dev/null
+++ b/src/plugins/bearer/android/jar/CMakeLists.txt
@@ -0,0 +1,22 @@
+#####################################################################
+## QtAndroidBearer Binary:
+#####################################################################
+
+set(java_sources
+    src/org/qtproject/qt5/android/bearer/QtNetworkReceiver.java
+)
+
+add_jar(QtAndroidBearer
+    INCLUDE_JARS ${QT_ANDROID_JAR}
+    SOURCES ${java_sources}
+    )
+
+install_jar(QtAndroidBearer
+    DESTINATION jar
+    COMPONENT Devel)
+
+#### Keys ignored in scope 1:.:.:jar.pro:<TRUE>:
+# JAVACLASSPATH = "$$PWD/src"
+# JAVASOURCES = "$$PWD/src/org/qtproject/qt5/android/bearer/QtNetworkReceiver.java"
+# _LOADED = "qt_build_paths"
+
diff --git a/src/plugins/bearer/android/src/CMakeLists.txt b/src/plugins/bearer/android/src/CMakeLists.txt
new file mode 100644
index 0000000000..5be89e316b
--- /dev/null
+++ b/src/plugins/bearer/android/src/CMakeLists.txt
@@ -0,0 +1,19 @@
+# Generated from src.pro.
+
+#####################################################################
+## QAndroidBearerEnginePlugin Plugin:
+#####################################################################
+
+qt_add_plugin(QAndroidBearerEnginePlugin
+    OUTPUT_NAME qandroidbearer
+    TYPE bearer
+    SOURCES
+        main.cpp
+        qandroidbearerengine.cpp qandroidbearerengine.h
+        wrappers/androidconnectivitymanager.cpp wrappers/androidconnectivitymanager.h
+    INCLUDE_DIRECTORIES
+        wrappers
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::NetworkPrivate
+)
diff --git a/src/plugins/bearer/android/src/qandroidbearerengine.cpp b/src/plugins/bearer/android/src/qandroidbearerengine.cpp
index a43ed69570..ad9895e0cf 100644
--- a/src/plugins/bearer/android/src/qandroidbearerengine.cpp
+++ b/src/plugins/bearer/android/src/qandroidbearerengine.cpp
@@ -38,7 +38,7 @@
 ****************************************************************************/
 
 #include "qandroidbearerengine.h"
-#include "../../qnetworksession_impl.h"
+#include <private/qnetworksession_impl_p.h>
 #include "wrappers/androidconnectivitymanager.h"
 
 #ifndef QT_NO_BEARERMANAGEMENT
diff --git a/src/plugins/bearer/android/src/qandroidbearerengine.h b/src/plugins/bearer/android/src/qandroidbearerengine.h
index 837b02232d..867d04d886 100644
--- a/src/plugins/bearer/android/src/qandroidbearerengine.h
+++ b/src/plugins/bearer/android/src/qandroidbearerengine.h
@@ -40,7 +40,7 @@
 #ifndef QANDROIDBEARERENGINE_H
 #define QANDROIDBEARERENGINE_H
 
-#include "../../qbearerengine_impl.h"
+#include <private/qbearerengine_impl_p.h>
 
 #include <QAbstractEventDispatcher>
 #include <QAbstractNativeEventFilter>
diff --git a/src/plugins/bearer/android/src/src.pro b/src/plugins/bearer/android/src/src.pro
index eb0738386c..fcd599dffe 100644
--- a/src/plugins/bearer/android/src/src.pro
+++ b/src/plugins/bearer/android/src/src.pro
@@ -2,13 +2,10 @@ TARGET = qandroidbearer
 
 QT = core-private network-private
 
-HEADERS += qandroidbearerengine.h \
-           ../../qnetworksession_impl.h \
-           ../../qbearerengine_impl.h
+HEADERS += qandroidbearerengine.h
 
 SOURCES += main.cpp \
-           qandroidbearerengine.cpp \
-           ../../qnetworksession_impl.cpp
+           qandroidbearerengine.cpp
 
 include(wrappers/wrappers.pri)
 
diff --git a/src/plugins/bearer/connman/.prev_CMakeLists.txt b/src/plugins/bearer/connman/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..55aaa41491
--- /dev/null
+++ b/src/plugins/bearer/connman/.prev_CMakeLists.txt
@@ -0,0 +1,26 @@
+# Generated from connman.pro.
+
+#####################################################################
+## QConnmanEnginePlugin Plugin:
+#####################################################################
+
+qt_add_plugin(QConnmanEnginePlugin
+    OUTPUT_NAME qconnmanbearer
+    CLASS_NAME QConnmanEnginePlugin
+    TYPE bearer
+    SOURCES
+        main.cpp
+        qconnmanengine.cpp qconnmanengine.h
+        qconnmanservice_linux.cpp qconnmanservice_linux_p.h
+    LIBRARIES
+        Qt::LinuxOfonoSupportPrivate
+        Qt::NetworkPrivate
+    PUBLIC_LIBRARIES
+        Qt::Core
+        Qt::DBus
+        Qt::LinuxOfonoSupport
+        Qt::Network
+)
+
+#### Keys ignored in scope 1:.:.:connman.pro:<TRUE>:
+# OTHER_FILES = "connman.json"
diff --git a/src/plugins/bearer/connman/CMakeLists.txt b/src/plugins/bearer/connman/CMakeLists.txt
new file mode 100644
index 0000000000..745f48b6e0
--- /dev/null
+++ b/src/plugins/bearer/connman/CMakeLists.txt
@@ -0,0 +1,22 @@
+# Generated from connman.pro.
+
+#####################################################################
+## QConnmanEnginePlugin Plugin:
+#####################################################################
+
+qt_add_plugin(QConnmanEnginePlugin
+    OUTPUT_NAME qconnmanbearer
+    TYPE bearer
+    SOURCES
+        main.cpp
+        qconnmanengine.cpp qconnmanengine.h
+        qconnmanservice_linux.cpp qconnmanservice_linux_p.h
+    PUBLIC_LIBRARIES
+        Qt::Core
+        Qt::DBus
+        Qt::LinuxOfonoSupportPrivate
+        Qt::NetworkPrivate
+)
+
+#### Keys ignored in scope 1:.:.:connman.pro:<TRUE>:
+# OTHER_FILES = "connman.json"
diff --git a/src/plugins/bearer/connman/connman.pro b/src/plugins/bearer/connman/connman.pro
index 065ed11dad..03e94cfe6a 100644
--- a/src/plugins/bearer/connman/connman.pro
+++ b/src/plugins/bearer/connman/connman.pro
@@ -1,18 +1,13 @@
 TARGET = qconnmanbearer
 
-QT = core network-private dbus
+QT = core network-private dbus linuxofono_support_private
 
 HEADERS += qconnmanservice_linux_p.h \
-           ../linux_common/qofonoservice_linux_p.h \
-           qconnmanengine.h \
-           ../qnetworksession_impl.h \
-           ../qbearerengine_impl.h
+           qconnmanengine.h
 
 SOURCES += main.cpp \
            qconnmanservice_linux.cpp \
-           ../linux_common/qofonoservice_linux.cpp \
-           qconnmanengine.cpp \
-           ../qnetworksession_impl.cpp
+           qconnmanengine.cpp
 
 OTHER_FILES += connman.json
 
diff --git a/src/plugins/bearer/connman/qconnmanengine.cpp b/src/plugins/bearer/connman/qconnmanengine.cpp
index 8b2076bd18..a673834825 100644
--- a/src/plugins/bearer/connman/qconnmanengine.cpp
+++ b/src/plugins/bearer/connman/qconnmanengine.cpp
@@ -39,7 +39,7 @@
 
 #include "qconnmanengine.h"
 #include "qconnmanservice_linux_p.h"
-#include "../qnetworksession_impl.h"
+#include <private/qnetworksession_impl_p.h>
 
 #include <QtNetwork/private/qnetworkconfiguration_p.h>
 
diff --git a/src/plugins/bearer/connman/qconnmanengine.h b/src/plugins/bearer/connman/qconnmanengine.h
index ef80d38fa2..969eed45b1 100644
--- a/src/plugins/bearer/connman/qconnmanengine.h
+++ b/src/plugins/bearer/connman/qconnmanengine.h
@@ -51,10 +51,10 @@
 // We mean it.
 //
 
-#include "../qbearerengine_impl.h"
+#include <private/qbearerengine_impl_p.h>
 
 #include "qconnmanservice_linux_p.h"
-#include "../linux_common/qofonoservice_linux_p.h"
+#include <private/qofonoservice_linux_p.h>
 
 #include <QMap>
 #include <QVariant>
diff --git a/src/plugins/bearer/corewlan/CMakeLists.txt b/src/plugins/bearer/corewlan/CMakeLists.txt
new file mode 100644
index 0000000000..31e70cc938
--- /dev/null
+++ b/src/plugins/bearer/corewlan/CMakeLists.txt
@@ -0,0 +1,30 @@
+# Generated from corewlan.pro.
+
+#####################################################################
+## QCoreWlanEnginePlugin Plugin:
+#####################################################################
+
+qt_add_plugin(QCoreWlanEnginePlugin
+    OUTPUT_NAME qcorewlanbearer
+    TYPE bearer
+    SOURCES
+        main.cpp
+        qcorewlanengine.h qcorewlanengine.mm
+    PUBLIC_LIBRARIES
+        ${FWFoundation}
+        ${FWSystemConfiguration}
+        Qt::CorePrivate
+        Qt::NetworkPrivate
+)
+
+#### Keys ignored in scope 1:.:.:corewlan.pro:<TRUE>:
+# OTHER_FILES = "corewlan.json"
+
+## Scopes:
+#####################################################################
+
+qt_extend_target(QCoreWlanEnginePlugin CONDITION QT_FEATURE_corewlan
+    PUBLIC_LIBRARIES
+        ${FWCoreWLAN}
+        ${FWSecurity}
+)
diff --git a/src/plugins/bearer/corewlan/corewlan.pro b/src/plugins/bearer/corewlan/corewlan.pro
index 1dc09ebdd6..4f08eaba71 100644
--- a/src/plugins/bearer/corewlan/corewlan.pro
+++ b/src/plugins/bearer/corewlan/corewlan.pro
@@ -7,12 +7,9 @@ qtConfig(corewlan) {
     LIBS += -framework CoreWLAN -framework Security
 }
 
-HEADERS += qcorewlanengine.h \
-           ../qnetworksession_impl.h \
-           ../qbearerengine_impl.h
+HEADERS += qcorewlanengine.h
 
-SOURCES += main.cpp \
-           ../qnetworksession_impl.cpp
+SOURCES += main.cpp
 
 OBJECTIVE_SOURCES += qcorewlanengine.mm
 
diff --git a/src/plugins/bearer/corewlan/qcorewlanengine.h b/src/plugins/bearer/corewlan/qcorewlanengine.h
index 6dddee66a4..8775474c09 100644
--- a/src/plugins/bearer/corewlan/qcorewlanengine.h
+++ b/src/plugins/bearer/corewlan/qcorewlanengine.h
@@ -40,7 +40,7 @@
 #ifndef QCOREWLANENGINE_H
 #define QCOREWLANENGINE_H
 
-#include "../qbearerengine_impl.h"
+#include <private/qbearerengine_impl_p.h>
 
 #include <QMap>
 #include <QTimer>
diff --git a/src/plugins/bearer/corewlan/qcorewlanengine.mm b/src/plugins/bearer/corewlan/qcorewlanengine.mm
index 66f2ed017b..01c6df74d5 100644
--- a/src/plugins/bearer/corewlan/qcorewlanengine.mm
+++ b/src/plugins/bearer/corewlan/qcorewlanengine.mm
@@ -38,7 +38,7 @@
 ****************************************************************************/
 
 #include "qcorewlanengine.h"
-#include "../qnetworksession_impl.h"
+#include <private/qnetworksession_impl_p.h>
 
 #include <QtNetwork/private/qnetworkconfiguration_p.h>
 
diff --git a/src/plugins/bearer/generic/CMakeLists.txt b/src/plugins/bearer/generic/CMakeLists.txt
new file mode 100644
index 0000000000..6d65346b57
--- /dev/null
+++ b/src/plugins/bearer/generic/CMakeLists.txt
@@ -0,0 +1,28 @@
+# Generated from generic.pro.
+
+#####################################################################
+## QGenericEnginePlugin Plugin:
+#####################################################################
+
+qt_add_plugin(QGenericEnginePlugin
+    OUTPUT_NAME qgenericbearer
+    TYPE bearer
+    SOURCES
+        ../platformdefs_win.h
+        main.cpp
+        qgenericengine.cpp qgenericengine.h
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::NetworkPrivate
+)
+
+#### Keys ignored in scope 1:.:.:generic.pro:<TRUE>:
+# OTHER_FILES = "generic.json"
+
+## Scopes:
+#####################################################################
+
+qt_extend_target(QGenericEnginePlugin CONDITION WIN32 AND NOT WINRT
+    PUBLIC_LIBRARIES
+        iphlpapi
+)
diff --git a/src/plugins/bearer/generic/generic.pro b/src/plugins/bearer/generic/generic.pro
index f30bdc4951..14b858b301 100644
--- a/src/plugins/bearer/generic/generic.pro
+++ b/src/plugins/bearer/generic/generic.pro
@@ -3,11 +3,8 @@ TARGET = qgenericbearer
 QT = core-private network-private
 
 HEADERS += qgenericengine.h \
-           ../qnetworksession_impl.h \
-           ../qbearerengine_impl.h \
            ../platformdefs_win.h
 SOURCES += qgenericengine.cpp \
-           ../qnetworksession_impl.cpp \
            main.cpp
 
 OTHER_FILES += generic.json
diff --git a/src/plugins/bearer/generic/qgenericengine.cpp b/src/plugins/bearer/generic/qgenericengine.cpp
index b1f28849a7..a5fba15789 100644
--- a/src/plugins/bearer/generic/qgenericengine.cpp
+++ b/src/plugins/bearer/generic/qgenericengine.cpp
@@ -41,7 +41,7 @@
 #define WIN32_LEAN_AND_MEAN 1
 
 #include "qgenericengine.h"
-#include "../qnetworksession_impl.h"
+#include <private/qnetworksession_impl_p.h>
 
 #include <QtNetwork/private/qnetworkconfiguration_p.h>
 
diff --git a/src/plugins/bearer/generic/qgenericengine.h b/src/plugins/bearer/generic/qgenericengine.h
index 79c71ca7a3..6b8fb4cd0f 100644
--- a/src/plugins/bearer/generic/qgenericengine.h
+++ b/src/plugins/bearer/generic/qgenericengine.h
@@ -40,7 +40,7 @@
 #ifndef QGENERICENGINE_H
 #define QGENERICENGINE_H
 
-#include "../qbearerengine_impl.h"
+#include <private/qbearerengine_impl_p.h>
 
 #include <QMap>
 #include <QTimer>
diff --git a/src/plugins/bearer/linux_common/qofonoservice_linux.cpp b/src/plugins/bearer/linux_common/qofonoservice_linux.cpp
deleted file mode 100644
index 05f9b3ca17..0000000000
--- a/src/plugins/bearer/linux_common/qofonoservice_linux.cpp
+++ /dev/null
@@ -1,384 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the plugins of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <QObject>
-#include <QList>
-#include <QtDBus/QtDBus>
-#include <QtDBus/QDBusConnection>
-#include <QtDBus/QDBusError>
-#include <QtDBus/QDBusInterface>
-#include <QtDBus/QDBusMessage>
-#include <QtDBus/QDBusReply>
-#include <QtDBus/QDBusPendingCallWatcher>
-#include <QtDBus/QDBusObjectPath>
-#include <QtDBus/QDBusPendingCall>
-
-#include "qofonoservice_linux_p.h"
-
-#ifndef QT_NO_DBUS
-
-QDBusArgument &operator<<(QDBusArgument &argument, const ObjectPathProperties &item)
-{
-    argument.beginStructure();
-    argument << item.path << item.properties;
-    argument.endStructure();
-    return argument;
-}
-
-const QDBusArgument &operator>>(const QDBusArgument &argument, ObjectPathProperties &item)
-{
-    argument.beginStructure();
-    argument >> item.path >> item.properties;
-    argument.endStructure();
-    return argument;
-}
-
-QT_BEGIN_NAMESPACE
-
-QOfonoManagerInterface::QOfonoManagerInterface( QObject *parent)
-        : QDBusAbstractInterface(QLatin1String(OFONO_SERVICE),
-                                 QLatin1String(OFONO_MANAGER_PATH),
-                                 OFONO_MANAGER_INTERFACE,
-                                 QDBusConnection::systemBus(), parent)
-{
-    qDBusRegisterMetaType<ObjectPathProperties>();
-    qDBusRegisterMetaType<PathPropertiesList>();
-
-    QDBusConnection::systemBus().connect(QLatin1String(OFONO_SERVICE),
-                           QLatin1String(OFONO_MANAGER_PATH),
-                           QLatin1String(OFONO_MANAGER_INTERFACE),
-                           QLatin1String("ModemAdded"),
-                           this,SLOT(modemAdded(QDBusObjectPath,QVariantMap)));
-    QDBusConnection::systemBus().connect(QLatin1String(OFONO_SERVICE),
-                           QLatin1String(OFONO_MANAGER_PATH),
-                           QLatin1String(OFONO_MANAGER_INTERFACE),
-                           QLatin1String("ModemRemoved"),
-                           this,SLOT(modemRemoved(QDBusObjectPath)));
-}
-
-QOfonoManagerInterface::~QOfonoManagerInterface()
-{
-}
-
-QStringList QOfonoManagerInterface::getModems()
-{
-    if (modemList.isEmpty()) {
-        QDBusPendingReply<PathPropertiesList> reply = call(QDBus::Block, QLatin1String("GetModems"));
-        reply.waitForFinished();
-        if (!reply.isError()) {
-            const auto modems = reply.value();
-            for (const ObjectPathProperties &modem : modems)
-                modemList << modem.path.path();
-        }
-    }
-
-    return modemList;
-}
-
-QString QOfonoManagerInterface::currentModem()
-{
-    const QStringList modems = getModems();
-    for (const QString &modem : modems) {
-        QOfonoModemInterface device(modem);
-        if (device.isPowered() && device.isOnline()
-                && device.interfaces().contains(QLatin1String("org.ofono.NetworkRegistration")))
-        return modem;
-    }
-    return QString();
-}
-
-void QOfonoManagerInterface::modemAdded(const QDBusObjectPath &path, const QVariantMap &/*var*/)
-{
-    if (!modemList.contains(path.path())) {
-        modemList << path.path();
-        Q_EMIT modemChanged();
-    }
-}
-
-void QOfonoManagerInterface::modemRemoved(const QDBusObjectPath &path)
-{
-    if (modemList.contains(path.path())) {
-        modemList.removeOne(path.path());
-        Q_EMIT modemChanged();
-    }
-}
-
-
-QOfonoModemInterface::QOfonoModemInterface(const QString &dbusPathName, QObject *parent)
-    : QDBusAbstractInterface(QLatin1String(OFONO_SERVICE),
-                             dbusPathName,
-                             OFONO_MODEM_INTERFACE,
-                             QDBusConnection::systemBus(), parent)
-{
-    QDBusConnection::systemBus().connect(QLatin1String(OFONO_SERVICE),
-                                         path(),
-                                         OFONO_MODEM_INTERFACE,
-                                         QLatin1String("PropertyChanged"),
-                                         this,SLOT(propertyChanged(QString,QDBusVariant)));
-}
-
-QOfonoModemInterface::~QOfonoModemInterface()
-{
-}
-
-void QOfonoModemInterface::propertyChanged(const QString &name,const QDBusVariant &value)
-{
-    propertiesMap[name] = value.variant();
-}
-
-bool QOfonoModemInterface::isPowered()
-{
-    QVariant var = getProperty(QStringLiteral("Powered"));
-    return qdbus_cast<bool>(var);
-}
-
-bool QOfonoModemInterface::isOnline()
-{
-    QVariant var = getProperty(QStringLiteral("Online"));
-    return qdbus_cast<bool>(var);
-}
-
-QStringList QOfonoModemInterface::interfaces()
-{
-    const QVariant var = getProperty(QStringLiteral("Interfaces"));
-    return var.toStringList();
-}
-
-QVariantMap QOfonoModemInterface::getProperties()
-{
-    if (propertiesMap.isEmpty()) {
-        QDBusPendingReply<QVariantMap> reply = call(QDBus::Block, QLatin1String("GetProperties"));
-        if (!reply.isError()) {
-            propertiesMap = reply.value();
-        }
-    }
-    return propertiesMap;
-}
-
-QVariant QOfonoModemInterface::getProperty(const QString &property)
-{
-    QVariant var;
-    QVariantMap map = getProperties();
-    if (map.contains(property))
-        var = map.value(property);
-    return var;
-}
-
-
-QOfonoNetworkRegistrationInterface::QOfonoNetworkRegistrationInterface(const QString &dbusPathName, QObject *parent)
-    : QDBusAbstractInterface(QLatin1String(OFONO_SERVICE),
-                             dbusPathName,
-                             OFONO_NETWORK_REGISTRATION_INTERFACE,
-                             QDBusConnection::systemBus(), parent)
-{
-}
-
-QOfonoNetworkRegistrationInterface::~QOfonoNetworkRegistrationInterface()
-{
-}
-
-QString QOfonoNetworkRegistrationInterface::getTechnology()
-{
-    QVariant var = getProperty(QStringLiteral("Technology"));
-    return qdbus_cast<QString>(var);
-}
-
-QVariant QOfonoNetworkRegistrationInterface::getProperty(const QString &property)
-{
-    QVariant var;
-    QVariantMap map = getProperties();
-    if (map.contains(property))
-        var = map.value(property);
-    return var;
-}
-
-QVariantMap QOfonoNetworkRegistrationInterface::getProperties()
-{
-    if (propertiesMap.isEmpty()) {
-        QDBusPendingReply<QVariantMap> reply = call(QDBus::Block, QLatin1String("GetProperties"));
-        reply.waitForFinished();
-        if (!reply.isError()) {
-            propertiesMap = reply.value();
-        }
-    }
-    return propertiesMap;
-}
-
-QOfonoDataConnectionManagerInterface::QOfonoDataConnectionManagerInterface(const QString &dbusPathName, QObject *parent)
-    : QDBusAbstractInterface(QLatin1String(OFONO_SERVICE),
-                             dbusPathName,
-                             OFONO_DATA_CONNECTION_MANAGER_INTERFACE,
-                             QDBusConnection::systemBus(), parent)
-{
-    QDBusConnection::systemBus().connect(QLatin1String(OFONO_SERVICE),
-                                         path(),
-                                         QLatin1String(OFONO_MODEM_INTERFACE),
-                                         QLatin1String("PropertyChanged"),
-                                         this,SLOT(propertyChanged(QString,QDBusVariant)));
-}
-
-QOfonoDataConnectionManagerInterface::~QOfonoDataConnectionManagerInterface()
-{
-}
-
-QStringList QOfonoDataConnectionManagerInterface::contexts()
-{
-    if (contextList.isEmpty()) {
-        QDBusPendingReply<PathPropertiesList > reply = call(QLatin1String("GetContexts"));
-        reply.waitForFinished();
-        if (!reply.isError()) {
-            const auto contexts = reply.value();
-            for (const ObjectPathProperties &context : contexts)
-                contextList << context.path.path();
-        }
-    }
-    return contextList;
-}
-
-PathPropertiesList QOfonoDataConnectionManagerInterface::contextsWithProperties()
-{
-    if (contextListProperties.isEmpty()) {
-        QDBusPendingReply<PathPropertiesList > reply = call(QLatin1String("GetContexts"));
-        reply.waitForFinished();
-        if (!reply.isError()) {
-            contextListProperties = reply.value();
-        }
-    }
-    return contextListProperties;
-}
-
-bool QOfonoDataConnectionManagerInterface::roamingAllowed()
-{
-    QVariant var = getProperty(QStringLiteral("RoamingAllowed"));
-    return qdbus_cast<bool>(var);
-}
-
-QString QOfonoDataConnectionManagerInterface::bearer()
-{
-    QVariant var = getProperty(QStringLiteral("Bearer"));
-    return qdbus_cast<QString>(var);
-}
-
-QVariant QOfonoDataConnectionManagerInterface::getProperty(const QString &property)
-{
-    return getProperties().value(property);
-}
-
-QVariantMap &QOfonoDataConnectionManagerInterface::getProperties()
-{
-    if (propertiesMap.isEmpty()) {
-        QDBusPendingReply<QVariantMap> reply = call(QDBus::Block, QLatin1String("GetProperties"));
-        if (!reply.isError()) {
-            propertiesMap = reply.value();
-        }
-    }
-    return propertiesMap;
-}
-
-void QOfonoDataConnectionManagerInterface::propertyChanged(const QString &name, const QDBusVariant &value)
-{
-    propertiesMap[name] = value.variant();
-    if (name == QLatin1String("RoamingAllowed"))
-        Q_EMIT roamingAllowedChanged(value.variant().toBool());
-}
-
-
-QOfonoConnectionContextInterface::QOfonoConnectionContextInterface(const QString &dbusPathName, QObject *parent)
-    : QDBusAbstractInterface(QLatin1String(OFONO_SERVICE),
-                             dbusPathName,
-                             OFONO_CONNECTION_CONTEXT_INTERFACE,
-                             QDBusConnection::systemBus(), parent)
-{
-    QDBusConnection::systemBus().connect(QLatin1String(OFONO_SERVICE),
-                                         path(),
-                                         QLatin1String(OFONO_MODEM_INTERFACE),
-                                         QLatin1String("PropertyChanged"),
-                                         this,SLOT(propertyChanged(QString,QDBusVariant)));
-}
-
-QOfonoConnectionContextInterface::~QOfonoConnectionContextInterface()
-{
-}
-
-QVariantMap QOfonoConnectionContextInterface::getProperties()
-{
-    if (propertiesMap.isEmpty()) {
-        QDBusPendingReply<QVariantMap> reply = call(QDBus::Block, QLatin1String("GetProperties"));
-        if (!reply.isError()) {
-            propertiesMap = reply.value();
-        }
-    }
-    return propertiesMap;
-}
-
-void QOfonoConnectionContextInterface::propertyChanged(const QString &name, const QDBusVariant &value)
-{
-    propertiesMap[name] = value.variant();
-}
-
-QVariant QOfonoConnectionContextInterface::getProperty(const QString &property)
-{
-    QVariant var;
-    QVariantMap map = getProperties();
-    if (map.contains(property))
-        var = map.value(property);
-    return var;
-}
-
-bool QOfonoConnectionContextInterface::active()
-{
-    QVariant var = getProperty(QStringLiteral("Active"));
-    return qdbus_cast<bool>(var);
-}
-
-QString QOfonoConnectionContextInterface::accessPointName()
-{
-    QVariant var = getProperty(QStringLiteral("AccessPointName"));
-    return qdbus_cast<QString>(var);
-}
-
-QString QOfonoConnectionContextInterface::name()
-{
-    QVariant var = getProperty(QStringLiteral("Name"));
-    return qdbus_cast<QString>(var);
-}
-
-QT_END_NAMESPACE
-
-#endif // QT_NO_DBUS
diff --git a/src/plugins/bearer/nativewifi/nativewifi.pro b/src/plugins/bearer/nativewifi/nativewifi.pro
index da7f2da353..41bde99341 100644
--- a/src/plugins/bearer/nativewifi/nativewifi.pro
+++ b/src/plugins/bearer/nativewifi/nativewifi.pro
@@ -3,13 +3,10 @@ TARGET = qnativewifibearer
 QT = core-private network-private
 
 HEADERS += qnativewifiengine.h \
-           platformdefs.h \
-           ../qnetworksession_impl.h \
-           ../qbearerengine_impl.h
+           platformdefs.h
 
 SOURCES += main.cpp \
-           qnativewifiengine.cpp \
-           ../qnetworksession_impl.cpp
+           qnativewifiengine.cpp
 
 OTHER_FILES += nativewifi.json
 
diff --git a/src/plugins/bearer/nativewifi/qnativewifiengine.cpp b/src/plugins/bearer/nativewifi/qnativewifiengine.cpp
index 777b4eea59..ca8700e63b 100644
--- a/src/plugins/bearer/nativewifi/qnativewifiengine.cpp
+++ b/src/plugins/bearer/nativewifi/qnativewifiengine.cpp
@@ -39,7 +39,7 @@
 
 #include "qnativewifiengine.h"
 #include "platformdefs.h"
-#include "../qnetworksession_impl.h"
+#include <private/qnetworksession_impl_p.h>
 
 #include <QtNetwork/private/qnetworkconfiguration_p.h>
 
diff --git a/src/plugins/bearer/nativewifi/qnativewifiengine.h b/src/plugins/bearer/nativewifi/qnativewifiengine.h
index ab8d949c9a..24e97bf6df 100644
--- a/src/plugins/bearer/nativewifi/qnativewifiengine.h
+++ b/src/plugins/bearer/nativewifi/qnativewifiengine.h
@@ -51,7 +51,7 @@
 // We mean it.
 //
 
-#include "../qbearerengine_impl.h"
+#include <private/qbearerengine_impl_p.h>
 
 #include <QtCore/qtimer.h>
 
diff --git a/src/plugins/bearer/networkmanager/.prev_CMakeLists.txt b/src/plugins/bearer/networkmanager/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..df5927024d
--- /dev/null
+++ b/src/plugins/bearer/networkmanager/.prev_CMakeLists.txt
@@ -0,0 +1,26 @@
+# Generated from networkmanager.pro.
+
+#####################################################################
+## QNetworkManagerEnginePlugin Plugin:
+#####################################################################
+
+qt_add_plugin(QNetworkManagerEnginePlugin
+    OUTPUT_NAME qnmbearer
+    CLASS_NAME QNetworkManagerEnginePlugin
+    TYPE bearer
+    SOURCES
+        main.cpp
+        qnetworkmanagerengine.cpp qnetworkmanagerengine.h
+        qnetworkmanagerservice.cpp qnetworkmanagerservice.h
+    LIBRARIES
+        Qt::LinuxOfonoSupportPrivate
+        Qt::NetworkPrivate
+    PUBLIC_LIBRARIES
+        Qt::Core
+        Qt::DBus
+        Qt::LinuxOfonoSupport
+        Qt::Network
+)
+
+#### Keys ignored in scope 1:.:.:networkmanager.pro:<TRUE>:
+# OTHER_FILES = "networkmanager.json"
diff --git a/src/plugins/bearer/networkmanager/CMakeLists.txt b/src/plugins/bearer/networkmanager/CMakeLists.txt
new file mode 100644
index 0000000000..8f26a4c86d
--- /dev/null
+++ b/src/plugins/bearer/networkmanager/CMakeLists.txt
@@ -0,0 +1,22 @@
+# Generated from networkmanager.pro.
+
+#####################################################################
+## QNetworkManagerEnginePlugin Plugin:
+#####################################################################
+
+qt_add_plugin(QNetworkManagerEnginePlugin
+    OUTPUT_NAME qnmbearer
+    TYPE bearer
+    SOURCES
+        main.cpp
+        qnetworkmanagerengine.cpp qnetworkmanagerengine.h
+        qnetworkmanagerservice.cpp qnetworkmanagerservice.h
+    PUBLIC_LIBRARIES
+        Qt::Core
+        Qt::DBus
+        Qt::LinuxOfonoSupportPrivate
+        Qt::NetworkPrivate
+)
+
+#### Keys ignored in scope 1:.:.:networkmanager.pro:<TRUE>:
+# OTHER_FILES = "networkmanager.json"
diff --git a/src/plugins/bearer/networkmanager/networkmanager.pro b/src/plugins/bearer/networkmanager/networkmanager.pro
index e71c93f66f..3ca217f974 100644
--- a/src/plugins/bearer/networkmanager/networkmanager.pro
+++ b/src/plugins/bearer/networkmanager/networkmanager.pro
@@ -1,18 +1,13 @@
 TARGET = qnmbearer
 
-QT = core network-private dbus
+QT = core network-private dbus linuxofono_support_private
 
 HEADERS += qnetworkmanagerservice.h \
-           qnetworkmanagerengine.h \
-           ../linux_common/qofonoservice_linux_p.h \
-           ../qnetworksession_impl.h \
-           ../qbearerengine_impl.h
+           qnetworkmanagerengine.h
 
 SOURCES += main.cpp \
            qnetworkmanagerservice.cpp \
-           qnetworkmanagerengine.cpp \
-           ../linux_common/qofonoservice_linux.cpp \
-           ../qnetworksession_impl.cpp
+           qnetworkmanagerengine.cpp
 
 OTHER_FILES += networkmanager.json
 
diff --git a/src/plugins/bearer/networkmanager/qnetworkmanagerengine.cpp b/src/plugins/bearer/networkmanager/qnetworkmanagerengine.cpp
index 85a9f9b9e0..cba2221587 100644
--- a/src/plugins/bearer/networkmanager/qnetworkmanagerengine.cpp
+++ b/src/plugins/bearer/networkmanager/qnetworkmanagerengine.cpp
@@ -39,7 +39,7 @@
 
 #include "qnetworkmanagerengine.h"
 #include "qnetworkmanagerservice.h"
-#include "../qnetworksession_impl.h"
+#include <private/qnetworksession_impl_p.h>
 
 #include <QtNetwork/private/qnetworkconfiguration_p.h>
 
@@ -53,7 +53,6 @@
 #include <QDBusInterface>
 #include <QDBusMessage>
 #include <QDBusReply>
-#include "../linux_common/qofonoservice_linux_p.h"
 
 #ifndef QT_NO_DBUS
 
diff --git a/src/plugins/bearer/networkmanager/qnetworkmanagerengine.h b/src/plugins/bearer/networkmanager/qnetworkmanagerengine.h
index a95c68abdf..c624d6087d 100644
--- a/src/plugins/bearer/networkmanager/qnetworkmanagerengine.h
+++ b/src/plugins/bearer/networkmanager/qnetworkmanagerengine.h
@@ -51,11 +51,11 @@
 // We mean it.
 //
 
-#include "../qbearerengine_impl.h"
+#include <private/qbearerengine_impl_p.h>
 
 #include "qnetworkmanagerservice.h"
 
-#include "../linux_common/qofonoservice_linux_p.h"
+#include <private/qofonoservice_linux_p.h>
 
 #include <QMap>
 #include <QVariant>
diff --git a/src/plugins/bearer/nla/nla.pro b/src/plugins/bearer/nla/nla.pro
index 76f3279d25..2582dc7cd4 100644
--- a/src/plugins/bearer/nla/nla.pro
+++ b/src/plugins/bearer/nla/nla.pro
@@ -5,13 +5,10 @@ QT = core core-private network network-private
 QMAKE_USE_PRIVATE += ws2_32
 
 HEADERS += qnlaengine.h \
-           ../platformdefs_win.h \
-           ../qnetworksession_impl.h \
-           ../qbearerengine_impl.h
+           ../platformdefs_win.h
 
 SOURCES += main.cpp \
-           qnlaengine.cpp \
-           ../qnetworksession_impl.cpp
+           qnlaengine.cpp
 
 OTHER_FILES += nla.json
 
diff --git a/src/plugins/bearer/nla/qnlaengine.cpp b/src/plugins/bearer/nla/qnlaengine.cpp
index e1e60389f1..ab3c0d0e3a 100644
--- a/src/plugins/bearer/nla/qnlaengine.cpp
+++ b/src/plugins/bearer/nla/qnlaengine.cpp
@@ -38,7 +38,7 @@
 ****************************************************************************/
 
 #include "qnlaengine.h"
-#include "../qnetworksession_impl.h"
+#include <private/qnetworksession_impl_p.h>
 
 #include <QtNetwork/private/qnetworkconfiguration_p.h>
 
diff --git a/src/plugins/bearer/nla/qnlaengine.h b/src/plugins/bearer/nla/qnlaengine.h
index ab014ff776..90efa50201 100644
--- a/src/plugins/bearer/nla/qnlaengine.h
+++ b/src/plugins/bearer/nla/qnlaengine.h
@@ -51,7 +51,7 @@
 // We mean it.
 //
 
-#include "../qbearerengine_impl.h"
+#include <private/qbearerengine_impl_p.h>
 
 #include <QtNetwork/private/qnativesocketengine_p.h>
 
diff --git a/src/plugins/bearer/qbearerengine_impl.h b/src/plugins/bearer/qbearerengine_impl.h
deleted file mode 100644
index 5c003aaaf6..0000000000
--- a/src/plugins/bearer/qbearerengine_impl.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the plugins of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QBEARERENGINE_IMPL_H
-#define QBEARERENGINE_IMPL_H
-
-#include <QtNetwork/private/qbearerengine_p.h>
-
-QT_BEGIN_NAMESPACE
-
-class QBearerEngineImpl : public QBearerEngine
-{
-    Q_OBJECT
-
-public:
-    enum ConnectionError {
-        InterfaceLookupError = 0,
-        ConnectError,
-        OperationNotSupported,
-        DisconnectionError,
-    };
-
-    QBearerEngineImpl(QObject *parent = nullptr) : QBearerEngine(parent) {}
-    ~QBearerEngineImpl() {}
-
-    virtual void connectToId(const QString &id) = 0;
-    virtual void disconnectFromId(const QString &id) = 0;
-
-    virtual QString getInterfaceFromId(const QString &id) = 0;
-
-    virtual QNetworkSession::State sessionStateForId(const QString &id) = 0;
-
-    virtual quint64 bytesWritten(const QString &) { return Q_UINT64_C(0); }
-    virtual quint64 bytesReceived(const QString &) { return Q_UINT64_C(0); }
-    virtual quint64 startTime(const QString &) { return Q_UINT64_C(0); }
-
-Q_SIGNALS:
-    void connectionError(const QString &id, QBearerEngineImpl::ConnectionError error);
-};
-
-QT_END_NAMESPACE
-
-Q_DECLARE_METATYPE(QBearerEngineImpl::ConnectionError)
-
-#endif // QBEARERENGINE_IMPL_H
diff --git a/src/plugins/bearer/qnetworksession_impl.cpp b/src/plugins/bearer/qnetworksession_impl.cpp
deleted file mode 100644
index 8eba9ccc42..0000000000
--- a/src/plugins/bearer/qnetworksession_impl.cpp
+++ /dev/null
@@ -1,435 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the plugins of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-// see comment in ../platformdefs_win.h.
-#define WIN32_LEAN_AND_MEAN 1
-
-#include "qnetworksession_impl.h"
-#include "qbearerengine_impl.h"
-
-#include <QtNetwork/qnetworksession.h>
-#include <QtNetwork/private/qnetworkconfigmanager_p.h>
-
-#include <QtCore/qdatetime.h>
-#include <QtCore/qdebug.h>
-#include <QtCore/qmutex.h>
-#include <QtCore/qstringlist.h>
-
-QT_BEGIN_NAMESPACE
-
-static QBearerEngineImpl *getEngineFromId(const QString &id)
-{
-    QNetworkConfigurationManagerPrivate *priv = qNetworkConfigurationManagerPrivate();
-    if (priv) {
-        const auto engines = priv->engines();
-        for (QBearerEngine *engine : engines) {
-            QBearerEngineImpl *engineImpl = qobject_cast<QBearerEngineImpl *>(engine);
-            if (engineImpl && engineImpl->hasIdentifier(id))
-                return engineImpl;
-        }
-    }
-
-    return nullptr;
-}
-
-class QNetworkSessionManagerPrivate : public QObject
-{
-    Q_OBJECT
-
-public:
-    QNetworkSessionManagerPrivate(QObject *parent = nullptr) : QObject(parent) {}
-    ~QNetworkSessionManagerPrivate() {}
-
-    inline void forceSessionClose(const QNetworkConfiguration &config)
-    { emit forcedSessionClose(config); }
-
-Q_SIGNALS:
-    void forcedSessionClose(const QNetworkConfiguration &config);
-};
-
-Q_GLOBAL_STATIC(QNetworkSessionManagerPrivate, sessionManager);
-
-void QNetworkSessionPrivateImpl::syncStateWithInterface()
-{
-    connect(sessionManager(), SIGNAL(forcedSessionClose(QNetworkConfiguration)),
-            this, SLOT(forcedSessionClose(QNetworkConfiguration)));
-
-    opened = false;
-    isOpen = false;
-    state = QNetworkSession::Invalid;
-    lastError = QNetworkSession::UnknownSessionError;
-
-    qRegisterMetaType<QBearerEngineImpl::ConnectionError>();
-
-    switch (publicConfig.type()) {
-    case QNetworkConfiguration::InternetAccessPoint:
-        activeConfig = publicConfig;
-        engine = getEngineFromId(activeConfig.identifier());
-        if (engine) {
-            qRegisterMetaType<QNetworkConfigurationPrivatePointer>();
-            connect(engine, SIGNAL(configurationChanged(QNetworkConfigurationPrivatePointer)),
-                    this, SLOT(configurationChanged(QNetworkConfigurationPrivatePointer)),
-                    Qt::QueuedConnection);
-            connect(engine, SIGNAL(connectionError(QString,QBearerEngineImpl::ConnectionError)),
-                    this, SLOT(connectionError(QString,QBearerEngineImpl::ConnectionError)),
-                    Qt::QueuedConnection);
-        }
-        break;
-    case QNetworkConfiguration::ServiceNetwork:
-        serviceConfig = publicConfig;
-        // Defer setting engine and signals until open().
-        Q_FALLTHROUGH();
-    case QNetworkConfiguration::UserChoice:
-        // Defer setting serviceConfig and activeConfig until open().
-        Q_FALLTHROUGH();
-    default:
-        engine = nullptr;
-    }
-
-    networkConfigurationsChanged();
-}
-
-void QNetworkSessionPrivateImpl::open()
-{
-    if (serviceConfig.isValid()) {
-        lastError = QNetworkSession::OperationNotSupportedError;
-        emit QNetworkSessionPrivate::error(lastError);
-    } else if (!isOpen) {
-        if ((activeConfig.state() & QNetworkConfiguration::Discovered) != QNetworkConfiguration::Discovered) {
-            lastError = QNetworkSession::InvalidConfigurationError;
-            state = QNetworkSession::Invalid;
-            emit stateChanged(state);
-            emit QNetworkSessionPrivate::error(lastError);
-            return;
-        }
-        opened = true;
-
-        if ((activeConfig.state() & QNetworkConfiguration::Active) != QNetworkConfiguration::Active &&
-            (activeConfig.state() & QNetworkConfiguration::Discovered) == QNetworkConfiguration::Discovered) {
-            state = QNetworkSession::Connecting;
-            emit stateChanged(state);
-
-            engine->connectToId(activeConfig.identifier());
-        }
-
-        isOpen = (activeConfig.state() & QNetworkConfiguration::Active) == QNetworkConfiguration::Active;
-        if (isOpen)
-            emit quitPendingWaitsForOpened();
-    }
-}
-
-void QNetworkSessionPrivateImpl::close()
-{
-    if (serviceConfig.isValid()) {
-        lastError = QNetworkSession::OperationNotSupportedError;
-        emit QNetworkSessionPrivate::error(lastError);
-    } else if (isOpen) {
-        opened = false;
-        isOpen = false;
-        emit closed();
-    }
-}
-
-void QNetworkSessionPrivateImpl::stop()
-{
-    if (serviceConfig.isValid()) {
-        lastError = QNetworkSession::OperationNotSupportedError;
-        emit QNetworkSessionPrivate::error(lastError);
-    } else {
-        if ((activeConfig.state() & QNetworkConfiguration::Active) == QNetworkConfiguration::Active) {
-            state = QNetworkSession::Closing;
-            emit stateChanged(state);
-
-            engine->disconnectFromId(activeConfig.identifier());
-
-            sessionManager()->forceSessionClose(activeConfig);
-        }
-
-        opened = false;
-        isOpen = false;
-        emit closed();
-    }
-}
-
-void QNetworkSessionPrivateImpl::migrate()
-{
-}
-
-void QNetworkSessionPrivateImpl::accept()
-{
-}
-
-void QNetworkSessionPrivateImpl::ignore()
-{
-}
-
-void QNetworkSessionPrivateImpl::reject()
-{
-}
-
-#ifndef QT_NO_NETWORKINTERFACE
-QNetworkInterface QNetworkSessionPrivateImpl::currentInterface() const
-{
-    if (!engine || state != QNetworkSession::Connected || !publicConfig.isValid())
-        return QNetworkInterface();
-
-    QString iface = engine->getInterfaceFromId(activeConfig.identifier());
-    if (iface.isEmpty())
-        return QNetworkInterface();
-    return QNetworkInterface::interfaceFromName(iface);
-}
-#endif
-
-QVariant QNetworkSessionPrivateImpl::sessionProperty(const QString &key) const
-{
-    if (key == QLatin1String("AutoCloseSessionTimeout")) {
-        if (engine && engine->requiresPolling() &&
-            !(engine->capabilities() & QNetworkConfigurationManager::CanStartAndStopInterfaces)) {
-            return sessionTimeout >= 0 ? sessionTimeout * 10000 : -1;
-        }
-    }
-
-    return QVariant();
-}
-
-void QNetworkSessionPrivateImpl::setSessionProperty(const QString &key, const QVariant &value)
-{
-    if (key == QLatin1String("AutoCloseSessionTimeout")) {
-        if (engine && engine->requiresPolling() &&
-            !(engine->capabilities() & QNetworkConfigurationManager::CanStartAndStopInterfaces)) {
-            int timeout = value.toInt();
-            if (timeout >= 0) {
-                connect(engine, SIGNAL(updateCompleted()),
-                        this, SLOT(decrementTimeout()), Qt::UniqueConnection);
-                sessionTimeout = timeout / 10000;   // convert to poll intervals
-            } else {
-                disconnect(engine, SIGNAL(updateCompleted()), this, SLOT(decrementTimeout()));
-                sessionTimeout = -1;
-            }
-        }
-    }
-}
-
-QString QNetworkSessionPrivateImpl::errorString() const
-{
-    switch (lastError) {
-    case QNetworkSession::UnknownSessionError:
-        return tr("Unknown session error.");
-    case QNetworkSession::SessionAbortedError:
-        return tr("The session was aborted by the user or system.");
-    case QNetworkSession::OperationNotSupportedError:
-        return tr("The requested operation is not supported by the system.");
-    case QNetworkSession::InvalidConfigurationError:
-        return tr("The specified configuration cannot be used.");
-    case QNetworkSession::RoamingError:
-        return tr("Roaming was aborted or is not possible.");
-    default:
-        break;
-    }
-
-    return QString();
-}
-
-QNetworkSession::SessionError QNetworkSessionPrivateImpl::error() const
-{
-    return lastError;
-}
-
-quint64 QNetworkSessionPrivateImpl::bytesWritten() const
-{
-    if (engine && state == QNetworkSession::Connected)
-        return engine->bytesWritten(activeConfig.identifier());
-    return Q_UINT64_C(0);
-}
-
-quint64 QNetworkSessionPrivateImpl::bytesReceived() const
-{
-    if (engine && state == QNetworkSession::Connected)
-        return engine->bytesReceived(activeConfig.identifier());
-    return Q_UINT64_C(0);
-}
-
-quint64 QNetworkSessionPrivateImpl::activeTime() const
-{
-    if (state == QNetworkSession::Connected && startTime != Q_UINT64_C(0))
-        return QDateTime::currentSecsSinceEpoch() - startTime;
-    return Q_UINT64_C(0);
-}
-
-QNetworkSession::UsagePolicies QNetworkSessionPrivateImpl::usagePolicies() const
-{
-    return currentPolicies;
-}
-
-void QNetworkSessionPrivateImpl::setUsagePolicies(QNetworkSession::UsagePolicies newPolicies)
-{
-    if (newPolicies != currentPolicies) {
-        currentPolicies = newPolicies;
-        emit usagePoliciesChanged(currentPolicies);
-    }
-}
-
-void QNetworkSessionPrivateImpl::updateStateFromServiceNetwork()
-{
-    QNetworkSession::State oldState = state;
-
-    const auto configs = serviceConfig.children();
-    for (const QNetworkConfiguration &config : configs) {
-        if ((config.state() & QNetworkConfiguration::Active) != QNetworkConfiguration::Active)
-            continue;
-
-        if (activeConfig != config) {
-            if (engine) {
-                disconnect(engine, SIGNAL(connectionError(QString,QBearerEngineImpl::ConnectionError)),
-                           this, SLOT(connectionError(QString,QBearerEngineImpl::ConnectionError)));
-            }
-
-            activeConfig = config;
-            engine = getEngineFromId(activeConfig.identifier());
-
-            if (engine) {
-                connect(engine, SIGNAL(connectionError(QString,QBearerEngineImpl::ConnectionError)),
-                        this, SLOT(connectionError(QString,QBearerEngineImpl::ConnectionError)),
-                        Qt::QueuedConnection);
-            }
-            emit newConfigurationActivated();
-        }
-
-        state = QNetworkSession::Connected;
-        if (state != oldState)
-            emit stateChanged(state);
-
-        return;
-    }
-
-    if (serviceConfig.children().isEmpty())
-        state = QNetworkSession::NotAvailable;
-    else
-        state = QNetworkSession::Disconnected;
-
-    if (state != oldState)
-        emit stateChanged(state);
-}
-
-void QNetworkSessionPrivateImpl::updateStateFromActiveConfig()
-{
-    if (!engine)
-        return;
-
-    QNetworkSession::State oldState = state;
-    state = engine->sessionStateForId(activeConfig.identifier());
-
-    bool oldActive = isOpen;
-    isOpen = (state == QNetworkSession::Connected) ? opened : false;
-
-    if (!oldActive && isOpen)
-        emit quitPendingWaitsForOpened();
-    if (oldActive && !isOpen)
-        emit closed();
-
-    if (oldState != state)
-        emit stateChanged(state);
-}
-
-void QNetworkSessionPrivateImpl::networkConfigurationsChanged()
-{
-    if (serviceConfig.isValid())
-        updateStateFromServiceNetwork();
-    else
-        updateStateFromActiveConfig();
-
-    if (engine)
-        startTime = engine->startTime(activeConfig.identifier());
-}
-
-void QNetworkSessionPrivateImpl::configurationChanged(QNetworkConfigurationPrivatePointer config)
-{
-    if (serviceConfig.isValid() &&
-        (config->id == serviceConfig.identifier() || config->id == activeConfig.identifier())) {
-        updateStateFromServiceNetwork();
-    } else if (config->id == activeConfig.identifier()) {
-        updateStateFromActiveConfig();
-    }
-}
-
-void QNetworkSessionPrivateImpl::forcedSessionClose(const QNetworkConfiguration &config)
-{
-    if (activeConfig == config) {
-        opened = false;
-        isOpen = false;
-
-        emit closed();
-
-        lastError = QNetworkSession::SessionAbortedError;
-        emit QNetworkSessionPrivate::error(lastError);
-    }
-}
-
-void QNetworkSessionPrivateImpl::connectionError(const QString &id, QBearerEngineImpl::ConnectionError error)
-{
-    if (activeConfig.identifier() == id) {
-        networkConfigurationsChanged();
-        switch (error) {
-        case QBearerEngineImpl::OperationNotSupported:
-            lastError = QNetworkSession::OperationNotSupportedError;
-            opened = false;
-            break;
-        case QBearerEngineImpl::InterfaceLookupError:
-        case QBearerEngineImpl::ConnectError:
-        case QBearerEngineImpl::DisconnectionError:
-        default:
-            lastError = QNetworkSession::UnknownSessionError;
-        }
-
-        emit QNetworkSessionPrivate::error(lastError);
-    }
-}
-
-void QNetworkSessionPrivateImpl::decrementTimeout()
-{
-    if (--sessionTimeout <= 0) {
-        disconnect(engine, SIGNAL(updateCompleted()), this, SLOT(decrementTimeout()));
-        sessionTimeout = -1;
-        close();
-    }
-}
-
-QT_END_NAMESPACE
-
-#include "qnetworksession_impl.moc"
diff --git a/src/plugins/bearer/qnetworksession_impl.h b/src/plugins/bearer/qnetworksession_impl.h
deleted file mode 100644
index 0f8e014900..0000000000
--- a/src/plugins/bearer/qnetworksession_impl.h
+++ /dev/null
@@ -1,130 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the plugins of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QNETWORKSESSION_IMPL_H
-#define QNETWORKSESSION_IMPL_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include "qbearerengine_impl.h"
-
-#include <QtNetwork/private/qnetworkconfigmanager_p.h>
-#include <QtNetwork/private/qnetworksession_p.h>
-
-QT_BEGIN_NAMESPACE
-
-class QBearerEngineImpl;
-
-class QNetworkSessionPrivateImpl : public QNetworkSessionPrivate
-{
-    Q_OBJECT
-
-public:
-    QNetworkSessionPrivateImpl()
-        : engine(nullptr), startTime(0), lastError(QNetworkSession::UnknownSessionError), sessionTimeout(-1), currentPolicies(QNetworkSession::NoPolicy), opened(false)
-    {}
-    ~QNetworkSessionPrivateImpl()
-    {}
-
-    //called by QNetworkSession constructor and ensures
-    //that the state is immediately updated (w/o actually opening
-    //a session). Also this function should take care of
-    //notification hooks to discover future state changes.
-    void syncStateWithInterface() override;
-
-#ifndef QT_NO_NETWORKINTERFACE
-    QNetworkInterface currentInterface() const override;
-#endif
-    QVariant sessionProperty(const QString& key) const override;
-    void setSessionProperty(const QString& key, const QVariant& value) override;
-
-    void open() override;
-    void close() override;
-    void stop() override;
-    void migrate() override;
-    void accept() override;
-    void ignore() override;
-    void reject() override;
-
-    QString errorString() const override; //must return translated string
-    QNetworkSession::SessionError error() const override;
-
-    quint64 bytesWritten() const override;
-    quint64 bytesReceived() const override;
-    quint64 activeTime() const override;
-
-    QNetworkSession::UsagePolicies usagePolicies() const override;
-    void setUsagePolicies(QNetworkSession::UsagePolicies) override;
-
-private Q_SLOTS:
-    void networkConfigurationsChanged();
-    void configurationChanged(QNetworkConfigurationPrivatePointer config);
-    void forcedSessionClose(const QNetworkConfiguration &config);
-    void connectionError(const QString &id, QBearerEngineImpl::ConnectionError error);
-    void decrementTimeout();
-
-private:
-    void updateStateFromServiceNetwork();
-    void updateStateFromActiveConfig();
-
-private:
-    QBearerEngineImpl *engine;
-
-    quint64 startTime;
-
-    QNetworkSession::SessionError lastError;
-
-    int sessionTimeout;
-    QNetworkSession::UsagePolicies currentPolicies;
-
-    bool opened;
-};
-
-QT_END_NAMESPACE
-
-#endif // QNETWORKSESSION_IMPL_H
diff --git a/src/plugins/generic/.prev_CMakeLists.txt b/src/plugins/generic/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..b3851ffbd1
--- /dev/null
+++ b/src/plugins/generic/.prev_CMakeLists.txt
@@ -0,0 +1,23 @@
+# Generated from generic.pro.
+
+if(QT_FEATURE_evdev)
+    add_subdirectory(evdevmouse)
+    add_subdirectory(evdevtouch)
+    add_subdirectory(evdevkeyboard)
+endif()
+if(QT_FEATURE_evdev AND QT_FEATURE_tabletevent)
+    add_subdirectory(evdevtablet)
+endif()
+if(QT_FEATURE_tslib)
+    add_subdirectory(tslib)
+endif()
+if(QT_FEATURE_tuiotouch)
+    add_subdirectory(tuiotouch)
+endif()
+if(QT_FEATURE_libinput)
+    add_subdirectory(libinput)
+endif()
+if(FREEBSD)
+    add_subdirectory(bsdkeyboard)
+    add_subdirectory(bsdmouse)
+endif()
diff --git a/src/plugins/generic/CMakeLists.txt b/src/plugins/generic/CMakeLists.txt
new file mode 100644
index 0000000000..f5890d0961
--- /dev/null
+++ b/src/plugins/generic/CMakeLists.txt
@@ -0,0 +1,23 @@
+# Generated from generic.pro.
+
+if(QT_FEATURE_evdev)
+    add_subdirectory(evdevmouse)
+    add_subdirectory(evdevtouch)
+    add_subdirectory(evdevkeyboard)
+endif()
+if(QT_FEATURE_evdev AND QT_FEATURE_tabletevent)
+    add_subdirectory(evdevtablet)
+endif()
+if(QT_FEATURE_tslib)
+    add_subdirectory(tslib)
+endif()
+if(QT_FEATURE_tuiotouch)
+    add_subdirectory(tuiotouch)
+endif()
+if(QT_FEATURE_libinput)
+    add_subdirectory(libinput)
+endif()
+if(FREEBSD)
+    # add_subdirectory(bsdkeyboard) # special case TODO
+    # add_subdirectory(bsdmouse) # special case TODO
+endif()
diff --git a/src/plugins/generic/evdevkeyboard/CMakeLists.txt b/src/plugins/generic/evdevkeyboard/CMakeLists.txt
new file mode 100644
index 0000000000..86f5c36124
--- /dev/null
+++ b/src/plugins/generic/evdevkeyboard/CMakeLists.txt
@@ -0,0 +1,22 @@
+# Generated from evdevkeyboard.pro.
+
+#####################################################################
+## QEvdevKeyboardPlugin Plugin:
+#####################################################################
+
+qt_add_plugin(QEvdevKeyboardPlugin
+    OUTPUT_NAME qevdevkeyboardplugin
+    TYPE generic
+    SOURCES
+        main.cpp
+    PUBLIC_LIBRARIES
+        Qt::Core
+        Qt::CorePrivate
+        Qt::Gui
+        Qt::GuiPrivate
+        Qt::InputSupportPrivate
+)
+
+#### Keys ignored in scope 1:.:.:evdevkeyboard.pro:<TRUE>:
+# OTHER_FILES = "evdevkeyboard.json"
+# PLUGIN_EXTENDS = "-"
diff --git a/src/plugins/generic/evdevmouse/CMakeLists.txt b/src/plugins/generic/evdevmouse/CMakeLists.txt
new file mode 100644
index 0000000000..2ed6c1b6d4
--- /dev/null
+++ b/src/plugins/generic/evdevmouse/CMakeLists.txt
@@ -0,0 +1,22 @@
+# Generated from evdevmouse.pro.
+
+#####################################################################
+## QEvdevMousePlugin Plugin:
+#####################################################################
+
+qt_add_plugin(QEvdevMousePlugin
+    OUTPUT_NAME qevdevmouseplugin
+    TYPE generic
+    SOURCES
+        main.cpp
+    PUBLIC_LIBRARIES
+        Qt::Core
+        Qt::CorePrivate
+        Qt::Gui
+        Qt::GuiPrivate
+        Qt::InputSupportPrivate
+)
+
+#### Keys ignored in scope 1:.:.:evdevmouse.pro:<TRUE>:
+# OTHER_FILES = "evdevmouse.json"
+# PLUGIN_EXTENDS = "-"
diff --git a/src/plugins/generic/evdevtablet/CMakeLists.txt b/src/plugins/generic/evdevtablet/CMakeLists.txt
new file mode 100644
index 0000000000..93dd10a0e1
--- /dev/null
+++ b/src/plugins/generic/evdevtablet/CMakeLists.txt
@@ -0,0 +1,22 @@
+# Generated from evdevtablet.pro.
+
+#####################################################################
+## QEvdevTabletPlugin Plugin:
+#####################################################################
+
+qt_add_plugin(QEvdevTabletPlugin
+    OUTPUT_NAME qevdevtabletplugin
+    TYPE generic
+    SOURCES
+        main.cpp
+    PUBLIC_LIBRARIES
+        Qt::Core
+        Qt::CorePrivate
+        Qt::Gui
+        Qt::GuiPrivate
+        Qt::InputSupportPrivate
+)
+
+#### Keys ignored in scope 1:.:.:evdevtablet.pro:<TRUE>:
+# OTHER_FILES = "evdevtablet.json"
+# PLUGIN_EXTENDS = "-"
diff --git a/src/plugins/generic/evdevtouch/CMakeLists.txt b/src/plugins/generic/evdevtouch/CMakeLists.txt
new file mode 100644
index 0000000000..e4a4d40c2a
--- /dev/null
+++ b/src/plugins/generic/evdevtouch/CMakeLists.txt
@@ -0,0 +1,22 @@
+# Generated from evdevtouch.pro.
+
+#####################################################################
+## QEvdevTouchScreenPlugin Plugin:
+#####################################################################
+
+qt_add_plugin(QEvdevTouchScreenPlugin
+    OUTPUT_NAME qevdevtouchplugin
+    TYPE generic
+    SOURCES
+        main.cpp
+    PUBLIC_LIBRARIES
+        Qt::Core
+        Qt::CorePrivate
+        Qt::Gui
+        Qt::GuiPrivate
+        Qt::InputSupportPrivate
+)
+
+#### Keys ignored in scope 1:.:.:evdevtouch.pro:<TRUE>:
+# OTHER_FILES = "evdevtouch.json"
+# PLUGIN_EXTENDS = "-"
diff --git a/src/plugins/generic/libinput/CMakeLists.txt b/src/plugins/generic/libinput/CMakeLists.txt
new file mode 100644
index 0000000000..b772623307
--- /dev/null
+++ b/src/plugins/generic/libinput/CMakeLists.txt
@@ -0,0 +1,22 @@
+# Generated from libinput.pro.
+
+#####################################################################
+## QLibInputPlugin Plugin:
+#####################################################################
+
+qt_add_plugin(QLibInputPlugin
+    OUTPUT_NAME qlibinputplugin
+    TYPE generic
+    SOURCES
+        main.cpp
+    PUBLIC_LIBRARIES
+        Qt::Core
+        Qt::CorePrivate
+        Qt::Gui
+        Qt::GuiPrivate
+        Qt::InputSupportPrivate
+)
+
+#### Keys ignored in scope 1:.:.:libinput.pro:<TRUE>:
+# OTHER_FILES = "libinput.json"
+# PLUGIN_EXTENDS = "-"
diff --git a/src/plugins/generic/tslib/.prev_CMakeLists.txt b/src/plugins/generic/tslib/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..3e82a077c3
--- /dev/null
+++ b/src/plugins/generic/tslib/.prev_CMakeLists.txt
@@ -0,0 +1,23 @@
+# Generated from tslib.pro.
+
+#####################################################################
+## QTsLibPlugin Plugin:
+#####################################################################
+
+qt_add_plugin(QTsLibPlugin
+    OUTPUT_NAME qtslibplugin
+    TYPE generic
+    SOURCES
+        main.cpp
+    PUBLIC_LIBRARIES
+        PkgConfig::Tslib
+        Qt::Core
+        Qt::CorePrivate
+        Qt::Gui
+        Qt::GuiPrivate
+        Qt::InputSupportPrivate
+)
+
+#### Keys ignored in scope 1:.:.:tslib.pro:<TRUE>:
+# OTHER_FILES = "tslib.json"
+# PLUGIN_EXTENDS = "-"
diff --git a/src/plugins/generic/tslib/CMakeLists.txt b/src/plugins/generic/tslib/CMakeLists.txt
new file mode 100644
index 0000000000..964e322a55
--- /dev/null
+++ b/src/plugins/generic/tslib/CMakeLists.txt
@@ -0,0 +1,25 @@
+# Generated from tslib.pro.
+
+qt_find_package(Tslib) # special case
+
+#####################################################################
+## QTsLibPlugin Plugin:
+#####################################################################
+
+qt_add_plugin(QTsLibPlugin
+    OUTPUT_NAME qtslibplugin
+    TYPE generic
+    SOURCES
+        main.cpp
+    PUBLIC_LIBRARIES
+        PkgConfig::Tslib
+        Qt::Core
+        Qt::CorePrivate
+        Qt::Gui
+        Qt::GuiPrivate
+        Qt::InputSupportPrivate
+)
+
+#### Keys ignored in scope 1:.:.:tslib.pro:<TRUE>:
+# OTHER_FILES = "tslib.json"
+# PLUGIN_EXTENDS = "-"
diff --git a/src/plugins/generic/tuiotouch/CMakeLists.txt b/src/plugins/generic/tuiotouch/CMakeLists.txt
new file mode 100644
index 0000000000..82db49d4c3
--- /dev/null
+++ b/src/plugins/generic/tuiotouch/CMakeLists.txt
@@ -0,0 +1,29 @@
+# Generated from tuiotouch.pro.
+
+#####################################################################
+## QTuioTouchPlugin Plugin:
+#####################################################################
+
+qt_add_plugin(QTuioTouchPlugin
+    OUTPUT_NAME qtuiotouchplugin
+    TYPE generic
+    SOURCES
+        main.cpp
+        qoscbundle.cpp qoscbundle_p.h
+        qoscmessage.cpp qoscmessage_p.h
+        qtuiocursor_p.h
+        qtuiohandler.cpp qtuiohandler_p.h
+        qtuiotoken_p.h
+    DEFINES
+        QT_NO_FOREACH
+    PUBLIC_LIBRARIES
+        Qt::Core
+        Qt::CorePrivate
+        Qt::Gui
+        Qt::GuiPrivate
+        Qt::Network
+)
+
+#### Keys ignored in scope 1:.:.:tuiotouch.pro:<TRUE>:
+# OTHER_FILES = "tuiotouch.json"
+# PLUGIN_EXTENDS = "-"
diff --git a/src/plugins/imageformats/CMakeLists.txt b/src/plugins/imageformats/CMakeLists.txt
new file mode 100644
index 0000000000..00fefbdc0d
--- /dev/null
+++ b/src/plugins/imageformats/CMakeLists.txt
@@ -0,0 +1,11 @@
+# Generated from imageformats.pro.
+
+if(QT_FEATURE_ico)
+    add_subdirectory(ico)
+endif()
+if(QT_FEATURE_jpeg)
+    add_subdirectory(jpeg)
+endif()
+if(QT_FEATURE_gif)
+    add_subdirectory(gif)
+endif()
diff --git a/src/plugins/imageformats/gif/.prev_CMakeLists.txt b/src/plugins/imageformats/gif/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..b4923b81b1
--- /dev/null
+++ b/src/plugins/imageformats/gif/.prev_CMakeLists.txt
@@ -0,0 +1,19 @@
+# Generated from gif.pro.
+
+#####################################################################
+## QGifPlugin Plugin:
+#####################################################################
+
+qt_add_plugin(QGifPlugin
+    OUTPUT_NAME qgif
+    TYPE imageformats
+    SOURCES
+        main.cpp main.h
+        qgifhandler.cpp qgifhandler_p.h
+    PUBLIC_LIBRARIES
+        Qt::Core
+        Qt::Gui
+)
+
+#### Keys ignored in scope 1:.:.:gif.pro:<TRUE>:
+# OTHER_FILES = "gif.json"
diff --git a/src/plugins/imageformats/gif/CMakeLists.txt b/src/plugins/imageformats/gif/CMakeLists.txt
new file mode 100644
index 0000000000..c6780e32e9
--- /dev/null
+++ b/src/plugins/imageformats/gif/CMakeLists.txt
@@ -0,0 +1,20 @@
+# Generated from gif.pro.
+
+#####################################################################
+## QGifPlugin Plugin:
+#####################################################################
+
+qt_add_plugin(QGifPlugin
+    OUTPUT_NAME qgif
+    TYPE imageformats
+    SOURCES
+        main.cpp main.h
+        qgifhandler.cpp qgifhandler_p.h
+    LIBRARIES # special case
+        Qt::GuiPrivate # special case
+    PUBLIC_LIBRARIES # special case
+        Qt::Gui # special case
+)
+
+#### Keys ignored in scope 1:.:.:gif.pro:<TRUE>:
+# OTHER_FILES = "gif.json"
diff --git a/src/plugins/imageformats/gif/qgifhandler.cpp b/src/plugins/imageformats/gif/qgifhandler.cpp
index c92cc3ea61..a672e92006 100644
--- a/src/plugins/imageformats/gif/qgifhandler.cpp
+++ b/src/plugins/imageformats/gif/qgifhandler.cpp
@@ -246,7 +246,7 @@ int QGIFFormat::decode(QImage *image, const uchar *buffer, int length,
     }
 
     image->detach();
-    int bpl = image->bytesPerLine();
+    qsizetype bpl = image->bytesPerLine();
     unsigned char *bits = image->bits();
 
 #define LM(l, m) (((m)<<8)|l)
@@ -422,7 +422,7 @@ int QGIFFormat::decode(QImage *image, const uchar *buffer, int length,
                         }
                         memset(backingstore.bits(), 0, backingstore.sizeInBytes());
                     }
-                    const int dest_bpl = backingstore.bytesPerLine();
+                    const qsizetype dest_bpl = backingstore.bytesPerLine();
                     unsigned char *dest_data = backingstore.bits();
                     for (int ln=0; ln<h; ln++) {
                         memcpy(FAST_SCAN_LINE(dest_data, dest_bpl, ln),
diff --git a/src/plugins/imageformats/ico/.prev_CMakeLists.txt b/src/plugins/imageformats/ico/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..6151d6fd07
--- /dev/null
+++ b/src/plugins/imageformats/ico/.prev_CMakeLists.txt
@@ -0,0 +1,21 @@
+# Generated from ico.pro.
+
+#####################################################################
+## QICOPlugin Plugin:
+#####################################################################
+
+qt_add_plugin(QICOPlugin
+    OUTPUT_NAME qico
+    TYPE imageformats
+    SOURCES
+        main.cpp main.h
+        qicohandler.cpp qicohandler.h
+    LIBRARIES
+        Qt::CorePrivate
+    PUBLIC_LIBRARIES
+        Qt::Core
+        Qt::Gui
+)
+
+#### Keys ignored in scope 1:.:.:ico.pro:<TRUE>:
+# OTHER_FILES = "ico.json"
diff --git a/src/plugins/imageformats/ico/CMakeLists.txt b/src/plugins/imageformats/ico/CMakeLists.txt
new file mode 100644
index 0000000000..1174848d5e
--- /dev/null
+++ b/src/plugins/imageformats/ico/CMakeLists.txt
@@ -0,0 +1,20 @@
+# Generated from ico.pro.
+
+#####################################################################
+## QICOPlugin Plugin:
+#####################################################################
+
+qt_add_plugin(QICOPlugin
+    OUTPUT_NAME qico
+    TYPE imageformats
+    SOURCES
+        main.cpp main.h
+        qicohandler.cpp qicohandler.h
+    PUBLIC_LIBRARIES
+        Qt::Core
+        Qt::CorePrivate
+        Qt::Gui
+)
+
+#### Keys ignored in scope 1:.:.:ico.pro:<TRUE>:
+# OTHER_FILES = "ico.json"
diff --git a/src/plugins/imageformats/ico/qicohandler.cpp b/src/plugins/imageformats/ico/qicohandler.cpp
index eb50f52bd6..1982e05344 100644
--- a/src/plugins/imageformats/ico/qicohandler.cpp
+++ b/src/plugins/imageformats/ico/qicohandler.cpp
@@ -356,7 +356,7 @@ void ICOReader::read1BitBMP(QImage & image)
     if (iod) {
 
         int h = image.height();
-        int bpl = image.bytesPerLine();
+        qsizetype bpl = image.bytesPerLine();
 
         while (--h >= 0) {
             if (iod->read((char*)image.scanLine(h),bpl) != bpl) {
@@ -405,7 +405,7 @@ void ICOReader::read8BitBMP(QImage & image)
     if (iod) {
 
         int h = icoAttrib.h;
-        int bpl = image.bytesPerLine();
+        qsizetype bpl = image.bytesPerLine();
 
         while (--h >= 0) {
             if (iod->read((char *)image.scanLine(h), bpl) != bpl) {
@@ -425,7 +425,7 @@ void ICOReader::read16_24_32BMP(QImage & image)
         QRgb *p;
         QRgb  *end;
         uchar *buf = new uchar[image.bytesPerLine()];
-        int    bpl = ((icoAttrib.w*icoAttrib.nbits+31)/32)*4;
+        qsizetype    bpl = ((qsizetype(icoAttrib.w)*icoAttrib.nbits+31)/32)*4;
         uchar *b;
 
         while (--h >= 0) {
diff --git a/src/plugins/imageformats/jpeg/.prev_CMakeLists.txt b/src/plugins/imageformats/jpeg/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..a02c8f05ed
--- /dev/null
+++ b/src/plugins/imageformats/jpeg/.prev_CMakeLists.txt
@@ -0,0 +1,94 @@
+# Generated from jpeg.pro.
+
+#####################################################################
+## QJpegPlugin Plugin:
+#####################################################################
+
+qt_add_plugin(QJpegPlugin
+    OUTPUT_NAME qjpeg
+    TYPE imageformats
+    SOURCES
+        main.cpp main.h
+        qjpeghandler.cpp qjpeghandler_p.h
+    PUBLIC_LIBRARIES
+        Qt::Core
+        Qt::CorePrivate
+        Qt::Gui
+        Qt::GuiPrivate
+)
+
+#### Keys ignored in scope 1:.:.:jpeg.pro:<TRUE>:
+# OTHER_FILES = "jpeg.json"
+
+## Scopes:
+#####################################################################
+
+qt_extend_target(QJpegPlugin CONDITION QT_FEATURE_system_jpeg
+    PUBLIC_LIBRARIES
+        JPEG::JPEG
+)
+
+qt_extend_target(QJpegPlugin CONDITION NOT QT_FEATURE_system_jpeg
+    SOURCES
+        ../../../3rdparty/libjpeg/src/jaricom.c
+        ../../../3rdparty/libjpeg/src/jcapimin.c
+        ../../../3rdparty/libjpeg/src/jcapistd.c
+        ../../../3rdparty/libjpeg/src/jcarith.c
+        ../../../3rdparty/libjpeg/src/jccoefct.c
+        ../../../3rdparty/libjpeg/src/jccolor.c
+        ../../../3rdparty/libjpeg/src/jcdctmgr.c
+        ../../../3rdparty/libjpeg/src/jchuff.c
+        ../../../3rdparty/libjpeg/src/jcinit.c
+        ../../../3rdparty/libjpeg/src/jcmainct.c
+        ../../../3rdparty/libjpeg/src/jcmarker.c
+        ../../../3rdparty/libjpeg/src/jcmaster.c
+        ../../../3rdparty/libjpeg/src/jcomapi.c
+        ../../../3rdparty/libjpeg/src/jcparam.c
+        ../../../3rdparty/libjpeg/src/jcphuff.c
+        ../../../3rdparty/libjpeg/src/jcprepct.c
+        ../../../3rdparty/libjpeg/src/jcsample.c
+        ../../../3rdparty/libjpeg/src/jctrans.c
+        ../../../3rdparty/libjpeg/src/jdapimin.c
+        ../../../3rdparty/libjpeg/src/jdapistd.c
+        ../../../3rdparty/libjpeg/src/jdarith.c
+        ../../../3rdparty/libjpeg/src/jdatadst.c
+        ../../../3rdparty/libjpeg/src/jdatasrc.c
+        ../../../3rdparty/libjpeg/src/jdcoefct.c
+        ../../../3rdparty/libjpeg/src/jdcolor.c
+        ../../../3rdparty/libjpeg/src/jddctmgr.c
+        ../../../3rdparty/libjpeg/src/jdhuff.c
+        ../../../3rdparty/libjpeg/src/jdinput.c
+        ../../../3rdparty/libjpeg/src/jdmainct.c
+        ../../../3rdparty/libjpeg/src/jdmarker.c
+        ../../../3rdparty/libjpeg/src/jdmaster.c
+        ../../../3rdparty/libjpeg/src/jdmerge.c
+        ../../../3rdparty/libjpeg/src/jdphuff.c
+        ../../../3rdparty/libjpeg/src/jdpostct.c
+        ../../../3rdparty/libjpeg/src/jdsample.c
+        ../../../3rdparty/libjpeg/src/jdtrans.c
+        ../../../3rdparty/libjpeg/src/jerror.c
+        ../../../3rdparty/libjpeg/src/jfdctflt.c
+        ../../../3rdparty/libjpeg/src/jfdctfst.c
+        ../../../3rdparty/libjpeg/src/jfdctint.c
+        ../../../3rdparty/libjpeg/src/jidctflt.c
+        ../../../3rdparty/libjpeg/src/jidctfst.c
+        ../../../3rdparty/libjpeg/src/jidctint.c
+        ../../../3rdparty/libjpeg/src/jidctred.c
+        ../../../3rdparty/libjpeg/src/jmemmgr.c
+        ../../../3rdparty/libjpeg/src/jmemnobs.c
+        ../../../3rdparty/libjpeg/src/jquant1.c
+        ../../../3rdparty/libjpeg/src/jquant2.c
+        ../../../3rdparty/libjpeg/src/jsimd_none.c
+        ../../../3rdparty/libjpeg/src/jutils.c
+    INCLUDE_DIRECTORIES
+        ../../../3rdparty/libjpeg
+        ../../../3rdparty/libjpeg/src
+)
+
+qt_extend_target(QJpegPlugin CONDITION WINRT AND NOT QT_FEATURE_system_jpeg
+    DEFINES
+        NO_GETENV
+)
+
+#### Keys ignored in scope 6:.:../../../3rdparty:../../../3rdparty/libjpeg.pri:GCC:
+# QMAKE_CFLAGS_WARN_ON = "-Wno-unused-parameter" "-Wno-main"
diff --git a/src/plugins/imageformats/jpeg/CMakeLists.txt b/src/plugins/imageformats/jpeg/CMakeLists.txt
new file mode 100644
index 0000000000..13d28c7b8b
--- /dev/null
+++ b/src/plugins/imageformats/jpeg/CMakeLists.txt
@@ -0,0 +1,96 @@
+# Generated from jpeg.pro.
+
+qt_find_package(JPEG) # special case
+
+#####################################################################
+## QJpegPlugin Plugin:
+#####################################################################
+
+qt_add_plugin(QJpegPlugin
+    OUTPUT_NAME qjpeg
+    TYPE imageformats
+    SOURCES
+        main.cpp main.h
+        qjpeghandler.cpp qjpeghandler_p.h
+    PUBLIC_LIBRARIES
+        Qt::Core
+        Qt::CorePrivate
+        Qt::Gui
+        Qt::GuiPrivate
+)
+
+#### Keys ignored in scope 1:.:.:jpeg.pro:<TRUE>:
+# OTHER_FILES = "jpeg.json"
+
+## Scopes:
+#####################################################################
+
+qt_extend_target(QJpegPlugin CONDITION QT_FEATURE_system_jpeg
+    PUBLIC_LIBRARIES
+        JPEG::JPEG
+)
+
+qt_extend_target(QJpegPlugin CONDITION NOT QT_FEATURE_system_jpeg
+    SOURCES
+        ../../../3rdparty/libjpeg/src/jaricom.c
+        ../../../3rdparty/libjpeg/src/jcapimin.c
+        ../../../3rdparty/libjpeg/src/jcapistd.c
+        ../../../3rdparty/libjpeg/src/jcarith.c
+        ../../../3rdparty/libjpeg/src/jccoefct.c
+        ../../../3rdparty/libjpeg/src/jccolor.c
+        ../../../3rdparty/libjpeg/src/jcdctmgr.c
+        ../../../3rdparty/libjpeg/src/jchuff.c
+        ../../../3rdparty/libjpeg/src/jcinit.c
+        ../../../3rdparty/libjpeg/src/jcmainct.c
+        ../../../3rdparty/libjpeg/src/jcmarker.c
+        ../../../3rdparty/libjpeg/src/jcmaster.c
+        ../../../3rdparty/libjpeg/src/jcomapi.c
+        ../../../3rdparty/libjpeg/src/jcparam.c
+        ../../../3rdparty/libjpeg/src/jcphuff.c
+        ../../../3rdparty/libjpeg/src/jcprepct.c
+        ../../../3rdparty/libjpeg/src/jcsample.c
+        ../../../3rdparty/libjpeg/src/jctrans.c
+        ../../../3rdparty/libjpeg/src/jdapimin.c
+        ../../../3rdparty/libjpeg/src/jdapistd.c
+        ../../../3rdparty/libjpeg/src/jdarith.c
+        ../../../3rdparty/libjpeg/src/jdatadst.c
+        ../../../3rdparty/libjpeg/src/jdatasrc.c
+        ../../../3rdparty/libjpeg/src/jdcoefct.c
+        ../../../3rdparty/libjpeg/src/jdcolor.c
+        ../../../3rdparty/libjpeg/src/jddctmgr.c
+        ../../../3rdparty/libjpeg/src/jdhuff.c
+        ../../../3rdparty/libjpeg/src/jdinput.c
+        ../../../3rdparty/libjpeg/src/jdmainct.c
+        ../../../3rdparty/libjpeg/src/jdmarker.c
+        ../../../3rdparty/libjpeg/src/jdmaster.c
+        ../../../3rdparty/libjpeg/src/jdmerge.c
+        ../../../3rdparty/libjpeg/src/jdphuff.c
+        ../../../3rdparty/libjpeg/src/jdpostct.c
+        ../../../3rdparty/libjpeg/src/jdsample.c
+        ../../../3rdparty/libjpeg/src/jdtrans.c
+        ../../../3rdparty/libjpeg/src/jerror.c
+        ../../../3rdparty/libjpeg/src/jfdctflt.c
+        ../../../3rdparty/libjpeg/src/jfdctfst.c
+        ../../../3rdparty/libjpeg/src/jfdctint.c
+        ../../../3rdparty/libjpeg/src/jidctflt.c
+        ../../../3rdparty/libjpeg/src/jidctfst.c
+        ../../../3rdparty/libjpeg/src/jidctint.c
+        ../../../3rdparty/libjpeg/src/jidctred.c
+        ../../../3rdparty/libjpeg/src/jmemmgr.c
+        ../../../3rdparty/libjpeg/src/jmemnobs.c
+        ../../../3rdparty/libjpeg/src/jquant1.c
+        ../../../3rdparty/libjpeg/src/jquant2.c
+        ../../../3rdparty/libjpeg/src/jsimd_none.c
+        ../../../3rdparty/libjpeg/src/jutils.c
+    INCLUDE_DIRECTORIES
+        ../../../3rdparty/libjpeg
+        ../../../3rdparty/libjpeg/src
+)
+
+qt_extend_target(QJpegPlugin CONDITION WINRT AND NOT QT_FEATURE_system_jpeg
+    DEFINES
+        NO_GETENV
+)
+
+#### Keys ignored in scope 6:.:../../../3rdparty:../../../3rdparty/libjpeg.pri:GCC:
+# QMAKE_CFLAGS_WARN_ON = "-Wno-unused-parameter" "-Wno-main"
diff --git a/src/plugins/platforminputcontexts/CMakeLists.txt b/src/plugins/platforminputcontexts/CMakeLists.txt
new file mode 100644
index 0000000000..155f5161f2
--- /dev/null
+++ b/src/plugins/platforminputcontexts/CMakeLists.txt
@@ -0,0 +1,8 @@
+# Generated from platforminputcontexts.pro.
+
+if(QT_FEATURE_xkbcommon)
+    add_subdirectory(compose)
+endif()
+if(QT_FEATURE_xkbcommon AND TARGET Qt::DBus AND UNIX AND NOT APPLE_OSX)
+    add_subdirectory(ibus)
+endif()
diff --git a/src/plugins/platforminputcontexts/compose/.prev_CMakeLists.txt b/src/plugins/platforminputcontexts/compose/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..ff09314303
--- /dev/null
+++ b/src/plugins/platforminputcontexts/compose/.prev_CMakeLists.txt
@@ -0,0 +1,24 @@
+# Generated from compose.pro.
+
+#####################################################################
+## QComposePlatformInputContextPlugin Plugin:
+#####################################################################
+
+qt_add_plugin(QComposePlatformInputContextPlugin
+    OUTPUT_NAME composeplatforminputcontextplugin
+    TYPE platforminputcontexts
+    SOURCES
+        qcomposeplatforminputcontext.cpp qcomposeplatforminputcontext.h
+        qcomposeplatforminputcontextmain.cpp
+    LIBRARIES
+        XKB::XKB
+    PUBLIC_LIBRARIES
+        Qt::Core
+        Qt::CorePrivate
+        Qt::Gui
+        Qt::GuiPrivate
+)
+
+#### Keys ignored in scope 1:.:.:compose.pro:<TRUE>:
+# OTHER_FILES = "$$PWD/compose.json"
+# PLUGIN_EXTENDS = "-"
diff --git a/src/plugins/platforminputcontexts/compose/CMakeLists.txt b/src/plugins/platforminputcontexts/compose/CMakeLists.txt
new file mode 100644
index 0000000000..fe4e3b8b80
--- /dev/null
+++ b/src/plugins/platforminputcontexts/compose/CMakeLists.txt
@@ -0,0 +1,26 @@
+# Generated from compose.pro.
+
+#####################################################################
+## QComposePlatformInputContextPlugin Plugin:
+#####################################################################
+
+qt_find_package(XKB) # special case
+pkg_get_variable(PKG_X11_PREFIX x11 prefix) # special case
+qt_add_plugin(QComposePlatformInputContextPlugin
+    OUTPUT_NAME composeplatforminputcontextplugin
+    TYPE platforminputcontexts
+    SOURCES
+        qcomposeplatforminputcontext.cpp qcomposeplatforminputcontext.h
+        qcomposeplatforminputcontextmain.cpp
+    LIBRARIES
+        XKB::XKB
+    PUBLIC_LIBRARIES
+        Qt::Core
+        Qt::CorePrivate
+        Qt::Gui
+        Qt::GuiPrivate
+)
+
+#### Keys ignored in scope 1:.:.:compose.pro:<TRUE>:
+# OTHER_FILES = "$$PWD/compose.json"
+# PLUGIN_EXTENDS = "-"
diff --git a/src/plugins/platforminputcontexts/ibus/CMakeLists.txt b/src/plugins/platforminputcontexts/ibus/CMakeLists.txt
new file mode 100644
index 0000000000..1017407342
--- /dev/null
+++ b/src/plugins/platforminputcontexts/ibus/CMakeLists.txt
@@ -0,0 +1,27 @@
+# Generated from ibus.pro.
+
+#####################################################################
+## QIbusPlatformInputContextPlugin Plugin:
+#####################################################################
+
+qt_add_plugin(QIbusPlatformInputContextPlugin
+    OUTPUT_NAME ibusplatforminputcontextplugin
+    TYPE platforminputcontexts
+    SOURCES
+        main.cpp
+        qibusinputcontextproxy.cpp qibusinputcontextproxy.h
+        qibusplatforminputcontext.cpp qibusplatforminputcontext.h
+        qibusproxy.cpp qibusproxy.h
+        qibusproxyportal.cpp qibusproxyportal.h
+        qibustypes.cpp qibustypes.h
+    PUBLIC_LIBRARIES
+        Qt::Core
+        Qt::DBus
+        Qt::Gui
+        Qt::GuiPrivate
+        Qt::XkbCommonSupportPrivate
+)
+
+#### Keys ignored in scope 1:.:.:ibus.pro:<TRUE>:
+# OTHER_FILES = "$$PWD/ibus.json"
+# PLUGIN_EXTENDS = "-"
diff --git a/src/plugins/platforms/.prev_CMakeLists.txt b/src/plugins/platforms/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..5797b07233
--- /dev/null
+++ b/src/plugins/platforms/.prev_CMakeLists.txt
@@ -0,0 +1,57 @@
+# Generated from platforms.pro.
+
+if(ANDROID AND NOT ANDROID_EMBEDDED)
+    add_subdirectory(android)
+endif()
+if(NOT ANDROID)
+    add_subdirectory(minimal)
+endif()
+if(QT_FEATURE_freetype AND NOT ANDROID)
+    add_subdirectory(offscreen)
+endif()
+if(QT_FEATURE_xcb)
+    add_subdirectory(xcb)
+endif()
+if(APPLE_UIKIT AND NOT APPLE_WATCHOS)
+    add_subdirectory(ios)
+endif()
+if(APPLE_OSX)
+    add_subdirectory(cocoa)
+endif()
+if(QT_FEATURE_direct3d9 AND WIN32 AND NOT WINRT)
+    add_subdirectory(windows)
+endif()
+if(QT_FEATURE_direct3d11 AND WINRT)
+    add_subdirectory(winrt)
+endif()
+if(QT_FEATURE_direct2d1_1 AND QT_FEATURE_direct3d11_1 AND QT_FEATURE_directwrite1)
+    add_subdirectory(direct2d)
+endif()
+if(QNX)
+    add_subdirectory(qnx)
+endif()
+if(QT_FEATURE_eglfs)
+    add_subdirectory(eglfs)
+    add_subdirectory(minimalegl)
+endif()
+if(QT_FEATURE_directfb)
+    add_subdirectory(directfb)
+endif()
+if(QT_FEATURE_linuxfb)
+    add_subdirectory(linuxfb)
+endif()
+if(QT_FEATURE_vnc AND TARGET Qt::Network)
+    add_subdirectory(vnc)
+endif()
+if(FREEBSD)
+    add_subdirectory(bsdfb)
+endif()
+if(HAIKU)
+    add_subdirectory(haiku)
+endif()
+if(WASM)
+    add_subdirectory(wasm)
+endif()
+if(QT_FEATURE_integrityfb)
+    add_subdirectory(integrity)
+endif()
diff --git a/src/plugins/platforms/CMakeLists.txt b/src/plugins/platforms/CMakeLists.txt
new file mode 100644
index 0000000000..57c3952e4c
--- /dev/null
+++ b/src/plugins/platforms/CMakeLists.txt
@@ -0,0 +1,57 @@
+# Generated from platforms.pro.
+
+if(ANDROID AND NOT ANDROID_EMBEDDED)
+    add_subdirectory(android)
+endif()
+if(NOT ANDROID)
+    add_subdirectory(minimal)
+endif()
+if(QT_FEATURE_freetype AND NOT ANDROID)
+    add_subdirectory(offscreen)
+endif()
+if(QT_FEATURE_xcb)
+    add_subdirectory(xcb)
+endif()
+if(APPLE_UIKIT AND NOT APPLE_WATCHOS)
+    add_subdirectory(ios)
+endif()
+if(APPLE_OSX)
+    add_subdirectory(cocoa)
+endif()
+if(WIN32 AND NOT WINRT) # special case TODO fix direct3d9 test
+    add_subdirectory(windows)
+endif()
+if(QT_FEATURE_direct3d11 AND WINRT)
+    # add_subdirectory(winrt) # special case TODO
+endif()
+if(QT_FEATURE_direct2d1_1 AND QT_FEATURE_direct3d11_1 AND QT_FEATURE_directwrite1)
+    # add_subdirectory(direct2d) # special case TODO
+endif()
+if(QNX)
+    # add_subdirectory(qnx) # special case TODO
+endif()
+if(QT_FEATURE_eglfs)
+    add_subdirectory(eglfs)
+    add_subdirectory(minimalegl)
+endif()
+if(QT_FEATURE_directfb)
+    add_subdirectory(directfb)
+endif()
+if(QT_FEATURE_linuxfb)
+    add_subdirectory(linuxfb)
+endif()
+if(QT_FEATURE_vnc AND TARGET Qt::Network)
+    add_subdirectory(vnc)
+endif()
+if(FREEBSD)
+    # add_subdirectory(bsdfb) # special case TODO
+endif()
+if(HAIKU)
+    # add_subdirectory(haiku) # special case TODO
+endif()
+if(WASM)
+    # add_subdirectory(wasm) # special case TODO
+endif()
+if(QT_FEATURE_integrityfb)
+    # add_subdirectory(integrity) # special case TODO
+endif()
diff --git a/src/plugins/platforms/android/.prev_CMakeLists.txt b/src/plugins/platforms/android/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..7b21613fb9
--- /dev/null
+++ b/src/plugins/platforms/android/.prev_CMakeLists.txt
@@ -0,0 +1,85 @@
+# Generated from android.pro.
+
+#####################################################################
+## QAndroidIntegrationPlugin Plugin:
+#####################################################################
+
+qt_add_plugin(QAndroidIntegrationPlugin
+    OUTPUT_NAME qtforandroid
+    TYPE platforms
+    SOURCES
+        androidcontentfileengine.cpp androidcontentfileengine.h
+        androiddeadlockprotector.cpp androiddeadlockprotector.h
+        androidjniaccessibility.cpp androidjniaccessibility.h
+        androidjniclipboard.cpp androidjniclipboard.h
+        androidjniinput.cpp androidjniinput.h
+        androidjnimain.cpp androidjnimain.h
+        androidjnimenu.cpp androidjnimenu.h
+        androidsurfaceclient.h
+        main.cpp
+        qandroidassetsfileenginehandler.cpp qandroidassetsfileenginehandler.h
+        qandroideventdispatcher.cpp qandroideventdispatcher.h
+        qandroidinputcontext.cpp qandroidinputcontext.h
+        qandroidplatformaccessibility.cpp qandroidplatformaccessibility.h
+        qandroidplatformbackingstore.cpp qandroidplatformbackingstore.h
+        qandroidplatformclipboard.cpp qandroidplatformclipboard.h
+        qandroidplatformdialoghelpers.cpp qandroidplatformdialoghelpers.h
+        qandroidplatformfiledialoghelper.cpp qandroidplatformfiledialoghelper.h
+        qandroidplatformfontdatabase.cpp qandroidplatformfontdatabase.h
+        qandroidplatformforeignwindow.cpp qandroidplatformforeignwindow.h
+        qandroidplatformintegration.cpp qandroidplatformintegration.h
+        qandroidplatformmenu.cpp qandroidplatformmenu.h
+        qandroidplatformmenubar.cpp qandroidplatformmenubar.h
+        qandroidplatformmenuitem.cpp qandroidplatformmenuitem.h
+        qandroidplatformoffscreensurface.cpp qandroidplatformoffscreensurface.h
+        qandroidplatformopenglcontext.cpp qandroidplatformopenglcontext.h
+        qandroidplatformopenglwindow.cpp qandroidplatformopenglwindow.h
+        qandroidplatformscreen.cpp qandroidplatformscreen.h
+        qandroidplatformservices.cpp qandroidplatformservices.h
+        qandroidplatformtheme.cpp qandroidplatformtheme.h
+        qandroidplatformwindow.cpp qandroidplatformwindow.h
+        qandroidsystemlocale.cpp qandroidsystemlocale.h
+    INCLUDE_DIRECTORIES
+        ${CMAKE_CURRENT_SOURCE_DIR}
+        ${QT_SOURCE_TREE}/src/3rdparty/android
+    PUBLIC_LIBRARIES
+        Qt::AccessibilitySupportPrivate
+        Qt::Core
+        Qt::CorePrivate
+        Qt::EglSupportPrivate
+        Qt::EventDispatcherSupportPrivate
+        Qt::FontDatabaseSupportPrivate
+        Qt::Gui
+        Qt::GuiPrivate
+        android
+        jnigraphics
+)
+
+#### Keys ignored in scope 1:.:.:android.pro:<TRUE>:
+# OTHER_FILES = "$$PWD/android.json"
+
+## Scopes:
+#####################################################################
+
+qt_extend_target(QAndroidIntegrationPlugin CONDITION QT_FEATURE_vulkan
+    SOURCES
+        qandroidplatformvulkaninstance.cpp qandroidplatformvulkaninstance.h
+        qandroidplatformvulkanwindow.cpp qandroidplatformvulkanwindow.h
+    PUBLIC_LIBRARIES
+        Qt::VulkanSupportPrivate
+)
+
+qt_extend_target(QAndroidIntegrationPlugin CONDITION TARGET Qt::PlatformCompositorSupportPrivate
+    PUBLIC_LIBRARIES
+        Qt::PlatformCompositorSupportPrivate
+)
+
+qt_extend_target(QAndroidIntegrationPlugin CONDITION QT_FEATURE_android_style_assets
+    SOURCES
+        extract.cpp
+)
+
+qt_extend_target(QAndroidIntegrationPlugin CONDITION NOT QT_FEATURE_android_style_assets
+    SOURCES
+        extract-dummy.cpp
+)
diff --git a/src/plugins/platforms/android/CMakeLists.txt b/src/plugins/platforms/android/CMakeLists.txt
new file mode 100644
index 0000000000..4d1f83053b
--- /dev/null
+++ b/src/plugins/platforms/android/CMakeLists.txt
@@ -0,0 +1,94 @@
+# Generated from android.pro.
+
+#####################################################################
+## QAndroidIntegrationPlugin Plugin:
+#####################################################################
+
+qt_add_plugin(QAndroidIntegrationPlugin
+    OUTPUT_NAME qtforandroid
+    TYPE platforms
+    DEFAULT_IF ${QT_QPA_DEFAULT_PLATFORM} MATCHES android # special case
+    SOURCES
+        androidcontentfileengine.cpp androidcontentfileengine.h
+        androiddeadlockprotector.cpp androiddeadlockprotector.h
+        androidjniaccessibility.cpp androidjniaccessibility.h
+        androidjniclipboard.cpp androidjniclipboard.h
+        androidjniinput.cpp androidjniinput.h
+        androidjnimain.cpp androidjnimain.h
+        androidjnimenu.cpp androidjnimenu.h
+        androidsurfaceclient.h
+        main.cpp
+        qandroidassetsfileenginehandler.cpp qandroidassetsfileenginehandler.h
+        qandroideventdispatcher.cpp qandroideventdispatcher.h
+        qandroidinputcontext.cpp qandroidinputcontext.h
+        qandroidplatformaccessibility.cpp qandroidplatformaccessibility.h
+        qandroidplatformbackingstore.cpp qandroidplatformbackingstore.h
+        qandroidplatformclipboard.cpp qandroidplatformclipboard.h
+        qandroidplatformdialoghelpers.cpp qandroidplatformdialoghelpers.h
+        qandroidplatformfiledialoghelper.cpp qandroidplatformfiledialoghelper.h
+        qandroidplatformfontdatabase.cpp qandroidplatformfontdatabase.h
+        qandroidplatformforeignwindow.cpp qandroidplatformforeignwindow.h
+        qandroidplatformintegration.cpp qandroidplatformintegration.h
+        qandroidplatformmenu.cpp qandroidplatformmenu.h
+        qandroidplatformmenubar.cpp qandroidplatformmenubar.h
+        qandroidplatformmenuitem.cpp qandroidplatformmenuitem.h
+        qandroidplatformoffscreensurface.cpp qandroidplatformoffscreensurface.h
+        qandroidplatformopenglcontext.cpp qandroidplatformopenglcontext.h
+        qandroidplatformopenglwindow.cpp qandroidplatformopenglwindow.h
+        qandroidplatformscreen.cpp qandroidplatformscreen.h
+        qandroidplatformservices.cpp qandroidplatformservices.h
+        qandroidplatformtheme.cpp qandroidplatformtheme.h
+        qandroidplatformwindow.cpp qandroidplatformwindow.h
+        qandroidsystemlocale.cpp qandroidsystemlocale.h
+    INCLUDE_DIRECTORIES
+        ${CMAKE_CURRENT_SOURCE_DIR}
+        ${QT_SOURCE_TREE}/src/3rdparty/android
+    PUBLIC_LIBRARIES
+        Qt::AccessibilitySupportPrivate
+        Qt::Core
+        Qt::CorePrivate
+        Qt::EglSupportPrivate
+        Qt::EventDispatcherSupportPrivate
+        Qt::FontDatabaseSupportPrivate
+        Qt::Gui
+        Qt::GuiPrivate
+        android
+        jnigraphics
+# special case begin
+    INSTALL_DIRECTORY
+        plugins/platforms
+    OUTPUT_DIRECTORY
+        plugins/platforms
+    ARCHIVE_INSTALL_DIRECTORY
+        plugins/platforms
+# special case end
+)
+
+#### Keys ignored in scope 1:.:.:android.pro:<TRUE>:
+# OTHER_FILES = "$$PWD/android.json"
+
+## Scopes:
+#####################################################################
+
+qt_extend_target(QAndroidIntegrationPlugin CONDITION QT_FEATURE_vulkan
+    SOURCES
+        qandroidplatformvulkaninstance.cpp qandroidplatformvulkaninstance.h
+        qandroidplatformvulkanwindow.cpp qandroidplatformvulkanwindow.h
+    PUBLIC_LIBRARIES
+        Qt::VulkanSupportPrivate
+)
+
+qt_extend_target(QAndroidIntegrationPlugin CONDITION TARGET Qt::PlatformCompositorSupportPrivate
+    PUBLIC_LIBRARIES
+        Qt::PlatformCompositorSupportPrivate
+)
+
+qt_extend_target(QAndroidIntegrationPlugin CONDITION QT_FEATURE_android_style_assets
+    SOURCES
+        extract.cpp
+)
+
+qt_extend_target(QAndroidIntegrationPlugin CONDITION NOT QT_FEATURE_android_style_assets
+    SOURCES
+        extract-dummy.cpp
+)
diff --git a/src/plugins/platforms/android/android.pro b/src/plugins/platforms/android/android.pro
index 730247cd7f..8ea78f7cba 100644
--- a/src/plugins/platforms/android/android.pro
+++ b/src/plugins/platforms/android/android.pro
@@ -9,6 +9,8 @@ QT += \
 
 qtConfig(vulkan): QT += vulkan_support-private
 
+qtHaveModule(platformcompositor_support-private): QT += platformcompositor_support-private
+
 OTHER_FILES += $$PWD/android.json
 
 INCLUDEPATH += \
@@ -16,7 +18,6 @@ INCLUDEPATH += \
     $$QT_SOURCE_TREE/src/3rdparty/android
 
 SOURCES += $$PWD/main.cpp \
-           $$PWD/androidplatformplugin.cpp \
            $$PWD/androidcontentfileengine.cpp \
            $$PWD/androiddeadlockprotector.cpp \
            $$PWD/androidjnimain.cpp \
diff --git a/src/plugins/platforms/android/androidplatformplugin.cpp b/src/plugins/platforms/android/androidplatformplugin.cpp
deleted file mode 100644
index 297e167f47..0000000000
--- a/src/plugins/platforms/android/androidplatformplugin.cpp
+++ /dev/null
@@ -1,64 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 BogDan Vatra <bogdan@kde.org>
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the plugins of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <qpa/qplatformintegrationplugin.h>
-#include "qandroidplatformintegration.h"
-
-QT_BEGIN_NAMESPACE
-
-class QAndroidPlatformIntegrationPlugin: public QPlatformIntegrationPlugin
-{
-    Q_OBJECT
-    Q_PLUGIN_METADATA(IID QPlatformIntegrationFactoryInterface_iid FILE "android.json")
-public:
-    QPlatformIntegration *create(const QString &key, const QStringList &paramList) override;
-};
-
-
-QPlatformIntegration *QAndroidPlatformIntegrationPlugin::create(const QString &key, const QStringList &paramList)
-{
-    Q_UNUSED(paramList);
-    if (!key.compare(QLatin1String("android"), Qt::CaseInsensitive))
-        return new QAndroidPlatformIntegration(paramList);
-    return 0;
-}
-
-QT_END_NAMESPACE
-#include "androidplatformplugin.moc"
-
diff --git a/src/plugins/platforms/android/main.cpp b/src/plugins/platforms/android/main.cpp
index c304fc8d69..4841d0425c 100644
--- a/src/plugins/platforms/android/main.cpp
+++ b/src/plugins/platforms/android/main.cpp
@@ -61,3 +61,4 @@ QPlatformIntegration *QAndroidIntegrationPlugin::create(const QString& system, c
 }
 
 QT_END_NAMESPACE
+#include "main.moc"
diff --git a/src/plugins/platforms/android/qandroidplatformintegration.cpp b/src/plugins/platforms/android/qandroidplatformintegration.cpp
index c81cc66166..592b78d936 100644
--- a/src/plugins/platforms/android/qandroidplatformintegration.cpp
+++ b/src/plugins/platforms/android/qandroidplatformintegration.cpp
@@ -43,6 +43,9 @@
 #include <QtGui/private/qguiapplication_p.h>
 #include <QGuiApplication>
 #include <QOpenGLContext>
+#if QT_CONFIG(opengl)
+#include <QtPlatformCompositorSupport/qpa/qplatformbackingstoreopenglsupport.h>
+#endif
 #include <QThread>
 #include <QOffscreenSurface>
 
@@ -286,7 +289,12 @@ QPlatformBackingStore *QAndroidPlatformIntegration::createPlatformBackingStore(Q
 {
     if (!QtAndroid::activity())
         return nullptr;
-    return new QAndroidPlatformBackingStore(window);
+
+    auto *backingStore = new QAndroidPlatformBackingStore(window);
+#if QT_CONFIG(opengl)
+    backingStore->setOpenGLSupport(new QPlatformBackingStoreOpenGLSupport(backingStore));
+#endif // QT_CONFIG(opengl)
+    return backingStore;
 }
 
 QPlatformOpenGLContext *QAndroidPlatformIntegration::createPlatformOpenGLContext(QOpenGLContext *context) const
diff --git a/src/plugins/platforms/cocoa/.prev_CMakeLists.txt b/src/plugins/platforms/cocoa/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..1491340b65
--- /dev/null
+++ b/src/plugins/platforms/cocoa/.prev_CMakeLists.txt
@@ -0,0 +1,150 @@
+# Generated from cocoa.pro.
+
+#####################################################################
+## QCocoaIntegrationPlugin Plugin:
+#####################################################################
+
+qt_add_plugin(QCocoaIntegrationPlugin
+    OUTPUT_NAME qcocoa
+    TYPE platforms
+    SOURCES
+        main.mm
+        messages.cpp messages.h
+        qcocoaapplication.h qcocoaapplication.mm
+        qcocoaapplicationdelegate.h qcocoaapplicationdelegate.mm
+        qcocoabackingstore.h qcocoabackingstore.mm
+        qcocoaclipboard.h qcocoaclipboard.mm
+        qcocoacursor.h qcocoacursor.mm
+        qcocoadrag.h qcocoadrag.mm
+        qcocoaeventdispatcher.h qcocoaeventdispatcher.mm
+        qcocoahelpers.h qcocoahelpers.mm
+        qcocoainputcontext.h qcocoainputcontext.mm
+        qcocoaintegration.h qcocoaintegration.mm
+        qcocoaintrospection.h qcocoaintrospection.mm
+        qcocoakeymapper.h qcocoakeymapper.mm
+        qcocoamenu.h qcocoamenu.mm
+        qcocoamenubar.h qcocoamenubar.mm
+        qcocoamenuitem.h qcocoamenuitem.mm
+        qcocoamenuloader.h qcocoamenuloader.mm
+        qcocoamimetypes.h qcocoamimetypes.mm
+        qcocoanativeinterface.h qcocoanativeinterface.mm
+        qcocoansmenu.h qcocoansmenu.mm
+        qcocoascreen.h qcocoascreen.mm
+        qcocoaservices.h qcocoaservices.mm
+        qcocoasystemtrayicon.h qcocoasystemtrayicon.mm
+        qcocoatheme.h qcocoatheme.mm
+        qcocoawindow.h qcocoawindow.mm
+        qcocoawindowmanager.h qcocoawindowmanager.mm
+        qiosurfacegraphicsbuffer.h qiosurfacegraphicsbuffer.mm
+        qmacclipboard.h qmacclipboard.mm
+        qmultitouch_mac.mm qmultitouch_mac_p.h
+        qnsview.h qnsview.mm
+        qnswindow.h qnswindow.mm
+        qnswindowdelegate.h qnswindowdelegate.mm
+    PUBLIC_LIBRARIES
+        ${FWAppKit}
+        ${FWCarbon}
+        ${FWCoreServices}
+        ${FWCoreVideo}
+        ${FWIOKit}
+        ${FWIOSurface}
+        ${FWMetal}
+        ${FWQuartzCore}
+        Cups::Cups
+        Qt::ClipboardSupportPrivate
+        Qt::Core
+        Qt::CorePrivate
+        Qt::FontDatabaseSupportPrivate
+        Qt::GraphicsSupportPrivate
+        Qt::Gui
+        Qt::GuiPrivate
+        Qt::ThemeSupportPrivate
+)
+
+# Resources:
+set(qcocoaresources_resource_files
+    "images/sizeallcursor.png"
+    "images/spincursor.png"
+    "images/waitcursor.png"
+)
+
+qt_add_resource(QCocoaIntegrationPlugin "qcocoaresources"
+    PREFIX
+        "/qt-project.org/mac/cursors"
+    FILES
+        ${qcocoaresources_resource_files}
+)
+
+
+#### Keys ignored in scope 1:.:.:cocoa.pro:<TRUE>:
+# OTHER_FILES = "cocoa.json"
+
+## Scopes:
+#####################################################################
+
+qt_extend_target(QCocoaIntegrationPlugin CONDITION QT_FEATURE_opengl
+    SOURCES
+        qcocoaglcontext.h qcocoaglcontext.mm
+)
+
+qt_extend_target(QCocoaIntegrationPlugin CONDITION QT_FEATURE_vulkan
+    SOURCES
+        qcocoavulkaninstance.h qcocoavulkaninstance.mm
+    PUBLIC_LIBRARIES
+        Qt::VulkanSupportPrivate
+)
+
+qt_extend_target(QCocoaIntegrationPlugin CONDITION QT_FEATURE_accessibility
+    SOURCES
+        qcocoaaccessibility.h qcocoaaccessibility.mm
+        qcocoaaccessibilityelement.h qcocoaaccessibilityelement.mm
+    PUBLIC_LIBRARIES
+        Qt::AccessibilitySupportPrivate
+)
+
+qt_extend_target(QCocoaIntegrationPlugin CONDITION QT_FEATURE_sessionmanager
+    SOURCES
+        qcocoasessionmanager.cpp qcocoasessionmanager.h
+)
+
+qt_extend_target(QCocoaIntegrationPlugin CONDITION TARGET Qt::PlatformCompositorSupportPrivate
+    PUBLIC_LIBRARIES
+        Qt::PlatformCompositorSupportPrivate
+)
+
+qt_extend_target(QCocoaIntegrationPlugin CONDITION TARGET Qt::Widgets
+    SOURCES
+        qpaintengine_mac.mm qpaintengine_mac_p.h
+    PUBLIC_LIBRARIES
+        Qt::WidgetsPrivate
+)
+
+#### Keys ignored in scope 8:.:.:cocoa.pro:TARGET Qt::Widgets:
+# QT_FOR_CONFIG = "widgets"
+
+qt_extend_target(QCocoaIntegrationPlugin CONDITION TARGET Qt::PrintSupport AND TARGET Qt::Widgets
+    SOURCES
+        qcocoaprintdevice.h qcocoaprintdevice.mm
+        qcocoaprintersupport.h qcocoaprintersupport.mm
+        qprintengine_mac.mm qprintengine_mac_p.h
+    PUBLIC_LIBRARIES
+        Qt::PrintSupportPrivate
+)
+
+qt_extend_target(QCocoaIntegrationPlugin CONDITION QT_FEATURE_colordialog AND TARGET Qt::Widgets
+    SOURCES
+        qcocoacolordialoghelper.h qcocoacolordialoghelper.mm
+)
+
+qt_extend_target(QCocoaIntegrationPlugin CONDITION QT_FEATURE_filedialog AND TARGET Qt::Widgets
+    SOURCES
+        qcocoafiledialoghelper.h qcocoafiledialoghelper.mm
+)
+
+qt_extend_target(QCocoaIntegrationPlugin CONDITION QT_FEATURE_fontdialog AND TARGET Qt::Widgets
+    SOURCES
+        qcocoafontdialoghelper.h qcocoafontdialoghelper.mm
+)
+
+#### Keys ignored in scope 13:.:.:cocoa.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN:
+# PLUGIN_EXTENDS = "-"
diff --git a/src/plugins/platforms/cocoa/CMakeLists.txt b/src/plugins/platforms/cocoa/CMakeLists.txt
new file mode 100644
index 0000000000..9e8b162aec
--- /dev/null
+++ b/src/plugins/platforms/cocoa/CMakeLists.txt
@@ -0,0 +1,154 @@
+# Generated from cocoa.pro.
+
+# special case:
+qt_find_package(Cups PROVIDED_TARGETS Cups::Cups)
+
+#####################################################################
+## QCocoaIntegrationPlugin Plugin:
+#####################################################################
+
+qt_add_plugin(QCocoaIntegrationPlugin
+    OUTPUT_NAME qcocoa
+    DEFAULT_IF ${QT_QPA_DEFAULT_PLATFORM} MATCHES cocoa # special case
+    TYPE platforms
+    SOURCES
+        main.mm
+        messages.cpp messages.h
+        qcocoaapplication.h qcocoaapplication.mm
+        qcocoaapplicationdelegate.h qcocoaapplicationdelegate.mm
+        qcocoabackingstore.h qcocoabackingstore.mm
+        qcocoaclipboard.h qcocoaclipboard.mm
+        qcocoacursor.h qcocoacursor.mm
+        qcocoadrag.h qcocoadrag.mm
+        qcocoaeventdispatcher.h qcocoaeventdispatcher.mm
+        qcocoahelpers.h qcocoahelpers.mm
+        qcocoainputcontext.h qcocoainputcontext.mm
+        qcocoaintegration.h qcocoaintegration.mm
+        qcocoaintrospection.h qcocoaintrospection.mm
+        qcocoakeymapper.h qcocoakeymapper.mm
+        qcocoamenu.h qcocoamenu.mm
+        qcocoamenubar.h qcocoamenubar.mm
+        qcocoamenuitem.h qcocoamenuitem.mm
+        qcocoamenuloader.h qcocoamenuloader.mm
+        qcocoamimetypes.h qcocoamimetypes.mm
+        qcocoanativeinterface.h qcocoanativeinterface.mm
+        qcocoansmenu.h qcocoansmenu.mm
+        qcocoascreen.h qcocoascreen.mm
+        qcocoaservices.h qcocoaservices.mm
+        qcocoasystemtrayicon.h qcocoasystemtrayicon.mm
+        qcocoatheme.h qcocoatheme.mm
+        qcocoawindow.h qcocoawindow.mm
+        qcocoawindowmanager.h qcocoawindowmanager.mm
+        qiosurfacegraphicsbuffer.h qiosurfacegraphicsbuffer.mm
+        qmacclipboard.h qmacclipboard.mm
+        qmultitouch_mac.mm qmultitouch_mac_p.h
+        qnsview.h qnsview.mm
+        qnswindow.h qnswindow.mm
+        qnswindowdelegate.h qnswindowdelegate.mm
+    PUBLIC_LIBRARIES
+        ${FWAppKit}
+        ${FWCarbon}
+        ${FWCoreServices}
+        ${FWCoreVideo}
+        ${FWIOKit}
+        ${FWIOSurface}
+        ${FWMetal}
+        ${FWQuartzCore}
+        Cups::Cups
+        Qt::ClipboardSupportPrivate
+        Qt::Core
+        Qt::CorePrivate
+        Qt::FontDatabaseSupportPrivate
+        Qt::GraphicsSupportPrivate
+        Qt::Gui
+        Qt::GuiPrivate
+        Qt::ThemeSupportPrivate
+)
+
+# Resources:
+set(qcocoaresources_resource_files
+    "images/sizeallcursor.png"
+    "images/spincursor.png"
+    "images/waitcursor.png"
+)
+
+qt_add_resource(QCocoaIntegrationPlugin "qcocoaresources"
+    PREFIX
+        "/qt-project.org/mac/cursors"
+    FILES
+        ${qcocoaresources_resource_files}
+)
+
+
+#### Keys ignored in scope 1:.:.:cocoa.pro:<TRUE>:
+# OTHER_FILES = "cocoa.json"
+
+## Scopes:
+#####################################################################
+
+qt_extend_target(QCocoaIntegrationPlugin CONDITION QT_FEATURE_opengl
+    SOURCES
+        qcocoaglcontext.h qcocoaglcontext.mm
+)
+
+qt_extend_target(QCocoaIntegrationPlugin CONDITION QT_FEATURE_vulkan
+    SOURCES
+        qcocoavulkaninstance.h qcocoavulkaninstance.mm
+    PUBLIC_LIBRARIES
+        Qt::VulkanSupportPrivate
+)
+
+qt_extend_target(QCocoaIntegrationPlugin CONDITION QT_FEATURE_accessibility
+    SOURCES
+        qcocoaaccessibility.h qcocoaaccessibility.mm
+        qcocoaaccessibilityelement.h qcocoaaccessibilityelement.mm
+    PUBLIC_LIBRARIES
+        Qt::AccessibilitySupportPrivate
+)
+
+qt_extend_target(QCocoaIntegrationPlugin CONDITION QT_FEATURE_sessionmanager
+    SOURCES
+        qcocoasessionmanager.cpp qcocoasessionmanager.h
+)
+
+qt_extend_target(QCocoaIntegrationPlugin CONDITION TARGET Qt::PlatformCompositorSupportPrivate
+    PUBLIC_LIBRARIES
+        Qt::PlatformCompositorSupportPrivate
+)
+
+qt_extend_target(QCocoaIntegrationPlugin CONDITION TARGET Qt::Widgets
+    SOURCES
+        qpaintengine_mac.mm qpaintengine_mac_p.h
+    PUBLIC_LIBRARIES
+        Qt::WidgetsPrivate
+)
+
+#### Keys ignored in scope 8:.:.:cocoa.pro:TARGET Qt::Widgets:
+# QT_FOR_CONFIG = "widgets"
+
+qt_extend_target(QCocoaIntegrationPlugin CONDITION TARGET Qt::PrintSupport AND TARGET Qt::Widgets
+    SOURCES
+        qcocoaprintdevice.h qcocoaprintdevice.mm
+        qcocoaprintersupport.h qcocoaprintersupport.mm
+        qprintengine_mac.mm qprintengine_mac_p.h
+    PUBLIC_LIBRARIES
+        Qt::PrintSupportPrivate
+)
+
+qt_extend_target(QCocoaIntegrationPlugin CONDITION QT_FEATURE_colordialog AND TARGET Qt::Widgets
+    SOURCES
+        qcocoacolordialoghelper.h qcocoacolordialoghelper.mm
+)
+
+qt_extend_target(QCocoaIntegrationPlugin CONDITION QT_FEATURE_filedialog AND TARGET Qt::Widgets
+    SOURCES
+        qcocoafiledialoghelper.h qcocoafiledialoghelper.mm
+)
+
+qt_extend_target(QCocoaIntegrationPlugin CONDITION QT_FEATURE_fontdialog AND TARGET Qt::Widgets
+    SOURCES
+        qcocoafontdialoghelper.h qcocoafontdialoghelper.mm
+)
+
+#### Keys ignored in scope 13:.:.:cocoa.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN:
+# PLUGIN_EXTENDS = "-"
diff --git a/src/plugins/platforms/cocoa/cocoa.pro b/src/plugins/platforms/cocoa/cocoa.pro
index a919963cf4..953346c56e 100644
--- a/src/plugins/platforms/cocoa/cocoa.pro
+++ b/src/plugins/platforms/cocoa/cocoa.pro
@@ -101,6 +101,8 @@ QT += \
 
 qtConfig(vulkan): QT += vulkan_support-private
 
+qtHaveModule(platformcompositor_support-private): QT += platformcompositor_support-private
+
 CONFIG += no_app_extension_api_only
 
 qtHaveModule(widgets) {
diff --git a/src/plugins/platforms/cocoa/qcocoaintegration.h b/src/plugins/platforms/cocoa/qcocoaintegration.h
index 0c14e07551..30838ba254 100644
--- a/src/plugins/platforms/cocoa/qcocoaintegration.h
+++ b/src/plugins/platforms/cocoa/qcocoaintegration.h
@@ -128,6 +128,8 @@ public:
 
     void beep() const override;
 
+    void closePopups(QWindow *forWindow = nullptr);
+
 private Q_SLOTS:
     void focusWindowChanged(QWindow *);
 
diff --git a/src/plugins/platforms/cocoa/qcocoaintegration.mm b/src/plugins/platforms/cocoa/qcocoaintegration.mm
index 61308d6bf9..b2698b05fe 100644
--- a/src/plugins/platforms/cocoa/qcocoaintegration.mm
+++ b/src/plugins/platforms/cocoa/qcocoaintegration.mm
@@ -68,6 +68,10 @@
 
 #include <QtFontDatabaseSupport/private/qfontengine_coretext_p.h>
 
+#if QT_CONFIG(opengl)
+#include <QtPlatformCompositorSupport/qpa/qplatformbackingstoreopenglsupport.h>
+#endif
+
 #ifdef QT_WIDGETS_LIB
 #include <QtWidgets/qtwidgetsglobal.h>
 #if QT_CONFIG(filedialog)
@@ -324,10 +328,16 @@ QPlatformBackingStore *QCocoaIntegration::createPlatformBackingStore(QWindow *wi
         return nullptr;
     }
 
+    QPlatformBackingStore *backingStore = nullptr;
     if (platformWindow->view().layer)
-        return new QCALayerBackingStore(window);
+        backingStore = new QCALayerBackingStore(window);
     else
-        return new QNSWindowBackingStore(window);
+        backingStore = new QNSWindowBackingStore(window);
+
+#if QT_CONFIG(opengl)
+    backingStore->setOpenGLSupport(new QPlatformBackingStoreOpenGLSupport(backingStore));
+#endif
+    return backingStore;
 }
 
 QAbstractEventDispatcher *QCocoaIntegration::createEventDispatcher() const
@@ -487,6 +497,19 @@ void QCocoaIntegration::beep() const
     NSBeep();
 }
 
+void QCocoaIntegration::closePopups(QWindow *forWindow)
+{
+    for (auto it = m_popupWindowStack.begin(); it != m_popupWindowStack.end();) {
+        auto *popup = *it;
+        if (!forWindow || popup->window()->transientParent() == forWindow) {
+            it = m_popupWindowStack.erase(it);
+            QWindowSystemInterface::handleCloseEvent<QWindowSystemInterface::SynchronousDelivery>(popup->window());
+        } else {
+            ++it;
+        }
+    }
+}
+
 void QCocoaIntegration::focusWindowChanged(QWindow *focusWindow)
 {
     // Don't revert icon just because we lost focus
diff --git a/src/plugins/platforms/cocoa/qcocoawindow.h b/src/plugins/platforms/cocoa/qcocoawindow.h
index b15c0ac31c..4bff1de515 100644
--- a/src/plugins/platforms/cocoa/qcocoawindow.h
+++ b/src/plugins/platforms/cocoa/qcocoawindow.h
@@ -151,6 +151,7 @@ public:
     Q_NOTIFICATION_HANDLER(NSWindowDidEndLiveResizeNotification) void windowDidEndLiveResize();
     Q_NOTIFICATION_HANDLER(NSWindowDidBecomeKeyNotification) void windowDidBecomeKey();
     Q_NOTIFICATION_HANDLER(NSWindowDidResignKeyNotification) void windowDidResignKey();
+    Q_NOTIFICATION_HANDLER(NSWindowWillMiniaturizeNotification) void windowWillMiniaturize();
     Q_NOTIFICATION_HANDLER(NSWindowDidMiniaturizeNotification) void windowDidMiniaturize();
     Q_NOTIFICATION_HANDLER(NSWindowDidDeminiaturizeNotification) void windowDidDeminiaturize();
     Q_NOTIFICATION_HANDLER(NSWindowWillEnterFullScreenNotification) void windowWillEnterFullScreen();
diff --git a/src/plugins/platforms/cocoa/qcocoawindow.mm b/src/plugins/platforms/cocoa/qcocoawindow.mm
index 9cb4470e02..28da4fcf5d 100644
--- a/src/plugins/platforms/cocoa/qcocoawindow.mm
+++ b/src/plugins/platforms/cocoa/qcocoawindow.mm
@@ -71,14 +71,6 @@ enum {
     defaultWindowHeight = 160
 };
 
-static void qt_closePopups()
-{
-    while (QCocoaWindow *popup = QCocoaIntegration::instance()->popPopupWindow()) {
-        QWindowSystemInterface::handleCloseEvent(popup->window());
-        QWindowSystemInterface::flushWindowSystemEvents();
-    }
-}
-
 Q_LOGGING_CATEGORY(lcCocoaNotifications, "qt.qpa.cocoa.notifications");
 
 static void qRegisterNotificationCallbacks()
@@ -819,6 +811,11 @@ void QCocoaWindow::windowDidExitFullScreen()
     }
 }
 
+void QCocoaWindow::windowWillMiniaturize()
+{
+    QCocoaIntegration::instance()->closePopups(window());
+}
+
 void QCocoaWindow::windowDidMiniaturize()
 {
     if (!isContentView())
@@ -1157,7 +1154,7 @@ void QCocoaWindow::viewDidChangeGlobalFrame()
 void QCocoaWindow::windowWillMove()
 {
     // Close any open popups on window move
-    qt_closePopups();
+    QCocoaIntegration::instance()->closePopups();
 }
 
 void QCocoaWindow::windowDidMove()
@@ -1286,7 +1283,7 @@ void QCocoaWindow::windowWillClose()
 {
     // Close any open popups on window closing.
     if (window() && !windowIsPopupType(window()->type()))
-        qt_closePopups();
+        QCocoaIntegration::instance()->closePopups();
 }
 
 // ----------------------- NSWindowDelegate callbacks -----------------------
diff --git a/src/plugins/platforms/cocoa/qpaintengine_mac.mm b/src/plugins/platforms/cocoa/qpaintengine_mac.mm
index 00b2267f0d..cadb76d2e4 100644
--- a/src/plugins/platforms/cocoa/qpaintengine_mac.mm
+++ b/src/plugins/platforms/cocoa/qpaintengine_mac.mm
@@ -90,7 +90,7 @@ CGImageRef qt_mac_create_imagemask(const QPixmap &pixmap, const QRectF &sr)
         image = image.convertToFormat(QImage::Format_ARGB32_Premultiplied);
 
     const int sx = qRound(sr.x()), sy = qRound(sr.y()), sw = qRound(sr.width()), sh = qRound(sr.height());
-    const int sbpr = image.bytesPerLine();
+    const qsizetype sbpr = image.bytesPerLine();
     const uint nbytes = sw * sh;
     //  alpha is always 255 for bitmaps, ignore it in this case.
     const quint32 mask = pixmap.depth() == 1 ? 0x00ffffff : 0xffffffff;
diff --git a/src/plugins/platforms/directfb/.prev_CMakeLists.txt b/src/plugins/platforms/directfb/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..33beaa3da4
--- /dev/null
+++ b/src/plugins/platforms/directfb/.prev_CMakeLists.txt
@@ -0,0 +1,61 @@
+# Generated from directfb.pro.
+
+#####################################################################
+## QDirectFbIntegrationPlugin Plugin:
+#####################################################################
+
+qt_add_plugin(QDirectFbIntegrationPlugin
+    OUTPUT_NAME qdirectfb
+    TYPE platforms
+    SOURCES
+        main.cpp
+        qdirectfbbackingstore.cpp qdirectfbbackingstore.h
+        qdirectfbblitter.cpp qdirectfbblitter.h
+        qdirectfbconvenience.cpp qdirectfbconvenience.h
+        qdirectfbcursor.cpp qdirectfbcursor.h
+        qdirectfbeglhooks.h
+        qdirectfbinput.cpp qdirectfbinput.h
+        qdirectfbintegration.cpp qdirectfbintegration.h
+        qdirectfbscreen.cpp qdirectfbscreen.h
+        qdirectfbwindow.cpp qdirectfbwindow.h
+    PUBLIC_LIBRARIES
+        PkgConfig::DirectFB
+        Qt::Core
+        Qt::CorePrivate
+        Qt::EventDispatcherSupportPrivate
+        Qt::FontDatabaseSupportPrivate
+        Qt::Gui
+        Qt::GuiPrivate
+        Qt::ServiceSupportPrivate
+)
+
+#### Keys ignored in scope 1:.:.:directfb.pro:<TRUE>:
+# OTHER_FILES = "directfb.json"
+
+## Scopes:
+#####################################################################
+
+qt_extend_target(QDirectFbIntegrationPlugin CONDITION QT_CONFIG___contains___directfb_egl
+    SOURCES
+        qdirectfb_egl.cpp qdirectfb_egl.h
+    DEFINES
+        DIRECTFB_GL_EGL
+    PUBLIC_LIBRARIES
+        Qt::EglSupportPrivate
+)
+
+qt_extend_target(QDirectFbIntegrationPlugin CONDITION NOT DIRECTFB_PLATFORM_HOOKS_SOURCES_ISEMPTY
+    DEFINES
+        DIRECTFB_PLATFORM_HOOKS
+)
+
+#### Keys ignored in scope 3:.:.:directfb.pro:NOT DIRECTFB_PLATFORM_HOOKS_SOURCES_ISEMPTY:
+# QMAKE_LIBDIR = "$$DIRECTFB_PLATFORM_HOOKS_LIBDIR"
+
+qt_extend_target(QDirectFbIntegrationPlugin CONDITION DIRECTFB_PLATFORM_HOOKS_SOURCES_ISEMPTY
+    SOURCES
+        qdirectfbeglhooks_stub.cpp
+)
+
+#### Keys ignored in scope 5:.:.:directfb.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN:
+# PLUGIN_EXTENDS = "-"
diff --git a/src/plugins/platforms/directfb/CMakeLists.txt b/src/plugins/platforms/directfb/CMakeLists.txt
new file mode 100644
index 0000000000..c723ca75f4
--- /dev/null
+++ b/src/plugins/platforms/directfb/CMakeLists.txt
@@ -0,0 +1,65 @@
+# Generated from directfb.pro.
+
+# begin special case:
+qt_find_package(DirectFB)
+# end special case:
+
+#####################################################################
+## QDirectFbIntegrationPlugin Plugin:
+#####################################################################
+
+qt_add_plugin(QDirectFbIntegrationPlugin
+    OUTPUT_NAME qdirectfb
+    TYPE platforms
+    SOURCES
+        main.cpp
+        qdirectfbbackingstore.cpp qdirectfbbackingstore.h
+        qdirectfbblitter.cpp qdirectfbblitter.h
+        qdirectfbconvenience.cpp qdirectfbconvenience.h
+        qdirectfbcursor.cpp qdirectfbcursor.h
+        qdirectfbeglhooks.h
+        qdirectfbinput.cpp qdirectfbinput.h
+        qdirectfbintegration.cpp qdirectfbintegration.h
+        qdirectfbscreen.cpp qdirectfbscreen.h
+        qdirectfbwindow.cpp qdirectfbwindow.h
+    PUBLIC_LIBRARIES
+        PkgConfig::DirectFB
+        Qt::Core
+        Qt::CorePrivate
+        Qt::EventDispatcherSupportPrivate
+        Qt::FontDatabaseSupportPrivate
+        Qt::Gui
+        Qt::GuiPrivate
+        Qt::ServiceSupportPrivate
+)
+
+#### Keys ignored in scope 1:.:.:directfb.pro:<TRUE>:
+# OTHER_FILES = "directfb.json"
+
+## Scopes:
+#####################################################################
+
+qt_extend_target(QDirectFbIntegrationPlugin CONDITION QT_CONFIG___contains___directfb_egl
+    SOURCES
+        qdirectfb_egl.cpp qdirectfb_egl.h
+    DEFINES
+        DIRECTFB_GL_EGL
+    PUBLIC_LIBRARIES
+        Qt::EglSupportPrivate
+)
+
+qt_extend_target(QDirectFbIntegrationPlugin CONDITION NOT DIRECTFB_PLATFORM_HOOKS_SOURCES_ISEMPTY
+    DEFINES
+        DIRECTFB_PLATFORM_HOOKS
+)
+
+#### Keys ignored in scope 3:.:.:directfb.pro:NOT DIRECTFB_PLATFORM_HOOKS_SOURCES_ISEMPTY:
+# QMAKE_LIBDIR = "$$DIRECTFB_PLATFORM_HOOKS_LIBDIR"
+
+qt_extend_target(QDirectFbIntegrationPlugin CONDITION DIRECTFB_PLATFORM_HOOKS_SOURCES_ISEMPTY
+    SOURCES
+        qdirectfbeglhooks_stub.cpp
+)
+
+#### Keys ignored in scope 5:.:.:directfb.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN:
+# PLUGIN_EXTENDS = "-"
diff --git a/src/plugins/platforms/eglfs/.prev_CMakeLists.txt b/src/plugins/platforms/eglfs/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..896b8cd3e8
--- /dev/null
+++ b/src/plugins/platforms/eglfs/.prev_CMakeLists.txt
@@ -0,0 +1,115 @@
+# Generated from eglfs.pro.
+
+#####################################################################
+## EglFSDeviceIntegration Module:
+#####################################################################
+
+qt_add_module(EglFSDeviceIntegration
+    INTERNAL_MODULE
+    SOURCES
+        api/qeglfsdeviceintegration.cpp api/qeglfsdeviceintegration_p.h
+        api/qeglfsglobal_p.h
+        api/qeglfshooks.cpp api/qeglfshooks_p.h
+        api/qeglfsintegration.cpp api/qeglfsintegration_p.h
+        api/qeglfsoffscreenwindow.cpp api/qeglfsoffscreenwindow_p.h
+        api/qeglfsscreen.cpp api/qeglfsscreen_p.h
+        api/qeglfswindow.cpp api/qeglfswindow_p.h
+    DEFINES
+        QT_BUILD_EGL_DEVICE_LIB
+        QT_EGL_NO_X11
+    INCLUDE_DIRECTORIES
+        api
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::DeviceDiscoverySupportPrivate
+        Qt::EglSupportPrivate
+        Qt::EventDispatcherSupportPrivate
+        Qt::FbSupportPrivate
+        Qt::FontDatabaseSupportPrivate
+        Qt::GuiPrivate
+        Qt::ServiceSupportPrivate
+        Qt::ThemeSupportPrivate
+)
+
+#### Keys ignored in scope 2:.:.:eglfsdeviceintegration.pro:<TRUE>:
+# MODULE = "eglfsdeviceintegration"
+
+## Scopes:
+#####################################################################
+
+qt_extend_target(EglFSDeviceIntegration CONDITION TARGET Qt::InputSupportPrivate
+    PUBLIC_LIBRARIES
+        Qt::InputSupportPrivate
+)
+
+qt_extend_target(EglFSDeviceIntegration CONDITION TARGET Qt::PlatformCompositorSupportPrivate
+    PUBLIC_LIBRARIES
+        Qt::PlatformCompositorSupportPrivate
+)
+
+qt_extend_target(EglFSDeviceIntegration CONDITION QT_FEATURE_vulkan
+    SOURCES
+        api/vulkan/qeglfsvulkaninstance.cpp api/vulkan/qeglfsvulkaninstance_p.h
+        api/vulkan/qeglfsvulkanwindow.cpp api/vulkan/qeglfsvulkanwindow_p.h
+    PUBLIC_LIBRARIES
+        Qt::VulkanSupportPrivate
+)
+
+qt_extend_target(EglFSDeviceIntegration CONDITION NOT EGLFS_PLATFORM_HOOKS_SOURCES_ISEMPTY
+    DEFINES
+        EGLFS_PLATFORM_HOOKS
+)
+
+qt_extend_target(EglFSDeviceIntegration CONDITION NOT EGLFS_DEVICE_INTEGRATION_ISEMPTY
+    DEFINES
+        EGLFS_PREFERRED_PLUGIN=
+)
+
+if(QT_FEATURE_cursor)
+    # Resources:
+    set(cursor_resource_files
+        "cursor-atlas.png"
+        "cursor.json"
+    )
+
+    qt_add_resource(EglFSDeviceIntegration "cursor"
+        PREFIX
+            "/"
+        FILES
+            ${cursor_resource_files}
+    )
+endif()
+
+qt_extend_target(EglFSDeviceIntegration CONDITION QT_FEATURE_opengl
+    SOURCES
+        api/qeglfscontext.cpp api/qeglfscontext_p.h
+        api/qeglfscursor.cpp api/qeglfscursor_p.h
+    PUBLIC_LIBRARIES
+        Qt::OpenGLPrivate
+)
+#####################################################################
+## QEglFSIntegrationPlugin Plugin:
+#####################################################################
+
+qt_add_plugin(QEglFSIntegrationPlugin
+    OUTPUT_NAME qeglfs
+    TYPE platforms
+    SOURCES
+        qeglfsmain.cpp
+    DEFINES
+        QT_EGL_NO_X11
+    INCLUDE_DIRECTORIES
+        api
+    PUBLIC_LIBRARIES
+        Qt::EglFSDeviceIntegrationPrivate
+)
+
+#### Keys ignored in scope 13:.:.:eglfs-plugin.pro:<TRUE>:
+# OTHER_FILES = "$$PWD/eglfs.json"
+
+## Scopes:
+#####################################################################
+
+#### Keys ignored in scope 14:.:.:eglfs-plugin.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN:
+# PLUGIN_EXTENDS = "-"
+add_subdirectory(deviceintegration)
diff --git a/src/plugins/platforms/eglfs/CMakeLists.txt b/src/plugins/platforms/eglfs/CMakeLists.txt
new file mode 100644
index 0000000000..0078c1f0d7
--- /dev/null
+++ b/src/plugins/platforms/eglfs/CMakeLists.txt
@@ -0,0 +1,114 @@
+# Generated from eglfs.pro.
+qt_find_package(EGL) # special case
+
+#####################################################################
+## EglFSDeviceIntegration Module:
+#####################################################################
+
+qt_add_module(EglFSDeviceIntegration
+    INTERNAL_MODULE
+    SOURCES
+        api/qeglfsdeviceintegration.cpp api/qeglfsdeviceintegration_p.h
+        api/qeglfsglobal_p.h
+        api/qeglfshooks.cpp api/qeglfshooks_p.h
+        api/qeglfsintegration.cpp api/qeglfsintegration_p.h
+        api/qeglfsoffscreenwindow.cpp api/qeglfsoffscreenwindow_p.h
+        api/qeglfsscreen.cpp api/qeglfsscreen_p.h
+        api/qeglfswindow.cpp api/qeglfswindow_p.h
+    DEFINES
+        QT_BUILD_EGL_DEVICE_LIB
+        QT_EGL_NO_X11
+    INCLUDE_DIRECTORIES
+        api
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::DeviceDiscoverySupportPrivate
+        Qt::EglSupportPrivate
+        Qt::EventDispatcherSupportPrivate
+        Qt::FbSupportPrivate
+        Qt::FontDatabaseSupportPrivate
+        Qt::GuiPrivate
+        Qt::ServiceSupportPrivate
+        Qt::ThemeSupportPrivate
+        EGL::EGL # special case
+)
+
+#### Keys ignored in scope 2:.:.:eglfsdeviceintegration.pro:<TRUE>:
+# MODULE = "eglfsdeviceintegration"
+
+## Scopes:
+#####################################################################
+
+qt_extend_target(EglFSDeviceIntegration CONDITION TARGET Qt::InputSupportPrivate
+    PUBLIC_LIBRARIES
+        Qt::InputSupportPrivate
+)
+
+qt_extend_target(EglFSDeviceIntegration CONDITION TARGET Qt::PlatformCompositorSupportPrivate
+    PUBLIC_LIBRARIES
+        Qt::PlatformCompositorSupportPrivate
+)
+
+qt_extend_target(EglFSDeviceIntegration CONDITION QT_FEATURE_vulkan
+    SOURCES
+        api/vulkan/qeglfsvulkaninstance.cpp api/vulkan/qeglfsvulkaninstance_p.h
+        api/vulkan/qeglfsvulkanwindow.cpp api/vulkan/qeglfsvulkanwindow_p.h
+    PUBLIC_LIBRARIES
+        Qt::VulkanSupportPrivate
+)
+
+# special case:
+# extend_target(EglFSDeviceIntegration CONDITION NOT EGLFS_PLATFORM_HOOKS_SOURCES_ISEMPTY ...
+# extend_target(EglFSDeviceIntegration CONDITION NOT EGLFS_DEVICE_INTEGRATION_ISEMPTY ...
+
+if(QT_FEATURE_cursor) # special case
+    # Resources:
+    set(cursor_resource_files
+        "cursor-atlas.png"
+        "cursor.json"
+    )
+
+    qt_add_resource(EglFSDeviceIntegration "cursor"
+        PREFIX
+            "/"
+        FILES
+            ${cursor_resource_files}
+    )
+endif()
+
+qt_extend_target(EglFSDeviceIntegration CONDITION QT_FEATURE_opengl
+    SOURCES
+        api/qeglfscontext.cpp api/qeglfscontext_p.h
+        api/qeglfscursor.cpp api/qeglfscursor_p.h
+    PUBLIC_LIBRARIES
+        Qt::OpenGLPrivate
+)
+#####################################################################
+## QEglFSIntegrationPlugin Plugin:
+#####################################################################
+
+qt_add_plugin(QEglFSIntegrationPlugin
+    OUTPUT_NAME qeglfs
+    TYPE platforms
+    DEFAULT_IF ${QT_QPA_DEFAULT_PLATFORM} MATCHES eglfs # special case
+    SOURCES
+        qeglfsmain.cpp
+    DEFINES
+        QT_EGL_NO_X11
+    INCLUDE_DIRECTORIES
+        api
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate # special case
+        Qt::EglFSDeviceIntegrationPrivate
+        EGL::EGL # special case
+)
+
+#### Keys ignored in scope 13:.:.:eglfs-plugin.pro:<TRUE>:
+# OTHER_FILES = "$$PWD/eglfs.json"
+
+## Scopes:
+#####################################################################
+
+#### Keys ignored in scope 14:.:.:eglfs-plugin.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN:
+# PLUGIN_EXTENDS = "-"
+add_subdirectory(deviceintegration)
diff --git a/src/plugins/platforms/eglfs/api/api.pri b/src/plugins/platforms/eglfs/api/api.pri
index 68965b58d8..bcb72c9ea7 100644
--- a/src/plugins/platforms/eglfs/api/api.pri
+++ b/src/plugins/platforms/eglfs/api/api.pri
@@ -15,6 +15,7 @@ HEADERS +=  $$PWD/qeglfswindow_p.h \
             $$PWD/qeglfsglobal_p.h
 
 qtConfig(opengl) {
+    QT += opengl-private
     SOURCES += \
         $$PWD/qeglfscursor.cpp \
         $$PWD/qeglfscontext.cpp
diff --git a/src/plugins/platforms/eglfs/api/qeglfscursor.cpp b/src/plugins/platforms/eglfs/api/qeglfscursor.cpp
index 98e05195ee..b8bd7e038b 100644
--- a/src/plugins/platforms/eglfs/api/qeglfscursor.cpp
+++ b/src/plugins/platforms/eglfs/api/qeglfscursor.cpp
@@ -50,7 +50,7 @@
 #include <QtCore/QJsonObject>
 
 #include <QtGui/private/qguiapplication_p.h>
-#include <QtGui/private/qopenglvertexarrayobject_p.h>
+#include <QtOpenGL/private/qopenglvertexarrayobject_p.h>
 
 #ifndef GL_VERTEX_ARRAY_BINDING
 #define GL_VERTEX_ARRAY_BINDING 0x85B5
diff --git a/src/plugins/platforms/eglfs/api/qeglfscursor_p.h b/src/plugins/platforms/eglfs/api/qeglfscursor_p.h
index 8768f9dd8c..7a6044aca0 100644
--- a/src/plugins/platforms/eglfs/api/qeglfscursor_p.h
+++ b/src/plugins/platforms/eglfs/api/qeglfscursor_p.h
@@ -54,9 +54,9 @@
 #include "qeglfsglobal_p.h"
 #include <qpa/qplatformcursor.h>
 #include <qpa/qplatformscreen.h>
+#include <QtOpenGL/QOpenGLShaderProgram>
 #include <QtGui/QMatrix4x4>
 #include <QtGui/QOpenGLFunctions>
-#include <QtGui/QOpenGLShaderProgram>
 #include <QtGui/private/qinputdevicemanager_p.h>
 
 #include <QtCore/qvector.h>
diff --git a/src/plugins/platforms/eglfs/deviceintegration/.prev_CMakeLists.txt b/src/plugins/platforms/eglfs/deviceintegration/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..d08bf6bc20
--- /dev/null
+++ b/src/plugins/platforms/eglfs/deviceintegration/.prev_CMakeLists.txt
@@ -0,0 +1,38 @@
+# Generated from deviceintegration.pro.
+
+if(QT_FEATURE_eglfs_x11)
+    add_subdirectory(eglfs_x11)
+endif()
+if(QT_FEATURE_eglfs_egldevice OR QT_FEATURE_eglfs_gbm)
+    add_subdirectory(eglfs_kms_support)
+endif()
+if(QT_FEATURE_eglfs_gbm)
+    add_subdirectory(eglfs_kms)
+endif()
+if(QT_FEATURE_eglfs_egldevice)
+    add_subdirectory(eglfs_kms_egldevice)
+endif()
+if(QT_FEATURE_eglfs_vsp2)
+    add_subdirectory(eglfs_kms_vsp2)
+endif()
+if(QT_FEATURE_eglfs_brcm)
+    add_subdirectory(eglfs_brcm)
+endif()
+if(QT_FEATURE_eglfs_mali)
+    add_subdirectory(eglfs_mali)
+endif()
+if(QT_FEATURE_eglfs_viv)
+    add_subdirectory(eglfs_viv)
+endif()
+if(QT_FEATURE_eglfs_rcar)
+    add_subdirectory(eglfs_rcar)
+endif()
+if(QT_FEATURE_eglfs_viv_wl)
+    add_subdirectory(eglfs_viv_wl)
+endif()
+if(QT_FEATURE_eglfs_openwfd)
+    add_subdirectory(eglfs_openwfd)
+endif()
+if(QT_FEATURE_opengl)
+    add_subdirectory(eglfs_emu)
+endif()
diff --git a/src/plugins/platforms/eglfs/deviceintegration/CMakeLists.txt b/src/plugins/platforms/eglfs/deviceintegration/CMakeLists.txt
new file mode 100644
index 0000000000..7ddcb8993f
--- /dev/null
+++ b/src/plugins/platforms/eglfs/deviceintegration/CMakeLists.txt
@@ -0,0 +1,38 @@
+# Generated from deviceintegration.pro.
+
+if(QT_FEATURE_eglfs_x11)
+    add_subdirectory(eglfs_x11)
+endif()
+if(QT_FEATURE_eglfs_egldevice OR QT_FEATURE_eglfs_gbm)
+    add_subdirectory(eglfs_kms_support)
+endif()
+if(QT_FEATURE_eglfs_gbm)
+    add_subdirectory(eglfs_kms)
+endif()
+if(QT_FEATURE_eglfs_egldevice)
+    add_subdirectory(eglfs_kms_egldevice)
+endif()
+if(QT_FEATURE_eglfs_vsp2)
+    # add_subdirectory(eglfs_kms_vsp2) # special case TODO
+endif()
+if(QT_FEATURE_eglfs_brcm)
+    # add_subdirectory(eglfs_brcm) # special case TODO
+endif()
+if(QT_FEATURE_eglfs_mali)
+    # add_subdirectory(eglfs_mali) # special case TODO
+endif()
+if(QT_FEATURE_eglfs_viv)
+    # add_subdirectory(eglfs_viv) # special case TODO
+endif()
+if(QT_FEATURE_eglfs_rcar)
+    # add_subdirectory(eglfs_rcar) # special case TODO
+endif()
+if(QT_FEATURE_eglfs_viv_wl)
+    # add_subdirectory(eglfs_viv_wl) # special case TODO
+endif()
+if(QT_FEATURE_eglfs_openwfd)
+    # add_subdirectory(eglfs_openwfd) # special case TODO
+endif()
+if(QT_FEATURE_opengl)
+    add_subdirectory(eglfs_emu)
+endif()
diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_emu/CMakeLists.txt b/src/plugins/platforms/eglfs/deviceintegration/eglfs_emu/CMakeLists.txt
new file mode 100644
index 0000000000..a62b8bbb2b
--- /dev/null
+++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_emu/CMakeLists.txt
@@ -0,0 +1,28 @@
+# Generated from eglfs_emu.pro.
+
+#####################################################################
+## QEglFSEmulatorIntegrationPlugin Plugin:
+#####################################################################
+
+qt_add_plugin(QEglFSEmulatorIntegrationPlugin
+    OUTPUT_NAME qeglfs-emu-integration
+    TYPE egldeviceintegrations
+    SOURCES
+        qeglfsemulatorintegration.cpp qeglfsemulatorintegration.h
+        qeglfsemulatorscreen.cpp qeglfsemulatorscreen.h
+        qeglfsemumain.cpp
+    DEFINES
+        QT_EGL_NO_X11
+    INCLUDE_DIRECTORIES
+        ../../api
+    PUBLIC_LIBRARIES
+        Qt::Core
+        Qt::CorePrivate
+        Qt::EglFSDeviceIntegrationPrivate
+        Qt::Gui
+        Qt::GuiPrivate
+)
+
+#### Keys ignored in scope 1:.:.:eglfs_emu.pro:<TRUE>:
+# DISTFILES = "eglfs_emu.json"
+# OTHER_FILES = "$$PWD/eglfs_emu.json"
diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/CMakeLists.txt b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/CMakeLists.txt
new file mode 100644
index 0000000000..55a1d71c07
--- /dev/null
+++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/CMakeLists.txt
@@ -0,0 +1,36 @@
+# Generated from eglfs_kms.pro.
+
+#####################################################################
+## QEglFSKmsGbmIntegrationPlugin Plugin:
+#####################################################################
+
+qt_add_plugin(QEglFSKmsGbmIntegrationPlugin
+    OUTPUT_NAME qeglfs-kms-integration
+    TYPE egldeviceintegrations
+    SOURCES
+        qeglfskmsgbmcursor.cpp qeglfskmsgbmcursor.h
+        qeglfskmsgbmdevice.cpp qeglfskmsgbmdevice.h
+        qeglfskmsgbmintegration.cpp qeglfskmsgbmintegration.h
+        qeglfskmsgbmmain.cpp
+        qeglfskmsgbmscreen.cpp qeglfskmsgbmscreen.h
+        qeglfskmsgbmwindow.cpp qeglfskmsgbmwindow.h
+    DEFINES
+        QT_EGL_NO_X11
+    INCLUDE_DIRECTORIES
+        ../../api
+        ../eglfs_kms_support
+    PUBLIC_LIBRARIES
+        Libdrm::Libdrm
+        Qt::Core
+        Qt::CorePrivate
+        Qt::EdidSupportPrivate
+        Qt::EglFSDeviceIntegrationPrivate
+        Qt::EglFsKmsSupportPrivate
+        Qt::Gui
+        Qt::GuiPrivate
+        Qt::KmsSupportPrivate
+        gbm::gbm
+)
+
+#### Keys ignored in scope 1:.:.:eglfs_kms.pro:<TRUE>:
+# OTHER_FILES = "$$PWD/eglfs_kms.json"
diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/CMakeLists.txt b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/CMakeLists.txt
new file mode 100644
index 0000000000..a0b405c90c
--- /dev/null
+++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/CMakeLists.txt
@@ -0,0 +1,33 @@
+# Generated from eglfs_kms_egldevice.pro.
+
+#####################################################################
+## QEglFSKmsEglDeviceIntegrationPlugin Plugin:
+#####################################################################
+
+qt_add_plugin(QEglFSKmsEglDeviceIntegrationPlugin
+    OUTPUT_NAME qeglfs-kms-egldevice-integration
+    TYPE egldeviceintegrations
+    SOURCES
+        qeglfskmsegldevice.cpp qeglfskmsegldevice.h
+        qeglfskmsegldeviceintegration.cpp qeglfskmsegldeviceintegration.h
+        qeglfskmsegldevicemain.cpp
+        qeglfskmsegldevicescreen.cpp qeglfskmsegldevicescreen.h
+    DEFINES
+        QT_EGL_NO_X11
+    INCLUDE_DIRECTORIES
+        ../../api
+        ../eglfs_kms_support
+    PUBLIC_LIBRARIES
+        Libdrm::Libdrm
+        Qt::Core
+        Qt::CorePrivate
+        Qt::EdidSupportPrivate
+        Qt::EglFSDeviceIntegrationPrivate
+        Qt::EglFsKmsSupportPrivate
+        Qt::Gui
+        Qt::GuiPrivate
+        Qt::KmsSupportPrivate
+)
+
+#### Keys ignored in scope 1:.:.:eglfs_kms_egldevice.pro:<TRUE>:
+# OTHER_FILES = "$$PWD/eglfs_kms_egldevice.json"
diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/CMakeLists.txt b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/CMakeLists.txt
new file mode 100644
index 0000000000..abaad3930d
--- /dev/null
+++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/CMakeLists.txt
@@ -0,0 +1,29 @@
+# Generated from eglfs_kms_support.pro.
+
+#####################################################################
+## EglFsKmsSupport Module:
+#####################################################################
+
+qt_add_module(EglFsKmsSupport
+    INTERNAL_MODULE
+    NO_MODULE_HEADERS
+    SOURCES
+        qeglfskmsdevice.cpp qeglfskmsdevice.h
+        qeglfskmseventreader.cpp qeglfskmseventreader.h
+        qeglfskmshelpers.h
+        qeglfskmsintegration.cpp qeglfskmsintegration.h
+        qeglfskmsscreen.cpp qeglfskmsscreen.h
+    DEFINES
+        QT_EGL_NO_X11
+    INCLUDE_DIRECTORIES
+        ../../api
+    PUBLIC_LIBRARIES
+        Libdrm::Libdrm
+        Qt::Core
+        Qt::CorePrivate
+        Qt::EdidSupportPrivate
+        Qt::EglFSDeviceIntegrationPrivate
+        Qt::Gui
+        Qt::GuiPrivate
+        Qt::KmsSupportPrivate
+)
diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_x11/CMakeLists.txt b/src/plugins/platforms/eglfs/deviceintegration/eglfs_x11/CMakeLists.txt
new file mode 100644
index 0000000000..fee448db8a
--- /dev/null
+++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_x11/CMakeLists.txt
@@ -0,0 +1,29 @@
+# Generated from eglfs_x11.pro.
+
+#####################################################################
+## QEglFSX11IntegrationPlugin Plugin:
+#####################################################################
+
+qt_add_plugin(QEglFSX11IntegrationPlugin
+    OUTPUT_NAME qeglfs-x11-integration
+    TYPE egldeviceintegrations
+    SOURCES
+        qeglfsx11integration.cpp qeglfsx11integration.h
+        qeglfsx11main.cpp
+    DEFINES
+        QT_EGL_NO_X11
+    INCLUDE_DIRECTORIES
+        ../../api
+    PUBLIC_LIBRARIES
+        Qt::Core
+        Qt::CorePrivate
+        Qt::EglFSDeviceIntegrationPrivate
+        Qt::Gui
+        Qt::GuiPrivate
+        X11::X11
+        X11::XCB
+        XCB::XCB
+)
+
+#### Keys ignored in scope 1:.:.:eglfs_x11.pro:<TRUE>:
+# OTHER_FILES = "$$PWD/eglfs_x11.json"
diff --git a/src/plugins/platforms/ios/.prev_CMakeLists.txt b/src/plugins/platforms/ios/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..d7ff160ee0
--- /dev/null
+++ b/src/plugins/platforms/ios/.prev_CMakeLists.txt
@@ -0,0 +1,65 @@
+# Generated from ios.pro.
+
+#####################################################################
+## QIOSIntegrationPlugin Plugin:
+#####################################################################
+
+add_qt_plugin(QIOSIntegrationPlugin
+    OUTPUT_NAME qios
+    TYPE platforms
+    SOURCES
+        plugin.mm
+        qiosapplicationdelegate.h qiosapplicationdelegate.mm
+        qiosapplicationstate.h qiosapplicationstate.mm
+        qiosbackingstore.h qiosbackingstore.mm
+        qioscontext.h qioscontext.mm
+        qioseventdispatcher.h qioseventdispatcher.mm
+        qiosglobal.h qiosglobal.mm
+        qiosinputcontext.h qiosinputcontext.mm
+        qiosintegration.h qiosintegration.mm
+        qiosplatformaccessibility.h qiosplatformaccessibility.mm
+        qiosscreen.h qiosscreen.mm
+        qiosservices.h qiosservices.mm
+        qiostextresponder.h qiostextresponder.mm
+        qiostheme.h qiostheme.mm
+        qiosviewcontroller.h qiosviewcontroller.mm
+        qioswindow.h qioswindow.mm
+        quiaccessibilityelement.h quiaccessibilityelement.mm
+        quiview.h quiview.mm
+    PUBLIC_LIBRARIES
+        ${FWAudioToolbox}
+        ${FWFoundation}
+        ${FWQuartzCore}
+        ${FWUIKit}
+        Qt::ClipboardSupportPrivate
+        Qt::CorePrivate
+        Qt::FontDatabaseSupportPrivate
+        Qt::GraphicsSupportPrivate
+        Qt::GuiPrivate
+)
+
+#### Keys ignored in scope 2:.:.:kernel.pro:<TRUE>:
+# OTHER_FILES = "quiview_textinput.mm" "quiview_accessibility.mm"
+
+## Scopes:
+#####################################################################
+
+extend_target(QIOSIntegrationPlugin CONDITION TARGET Qt::PlatformCompositorSupportPrivate
+    PUBLIC_LIBRARIES
+        Qt::PlatformCompositorSupportPrivate
+)
+
+extend_target(QIOSIntegrationPlugin CONDITION NOT APPLE_TVOS
+    SOURCES
+        qiosclipboard.h qiosclipboard.mm
+        qiosfiledialog.h qiosfiledialog.mm
+        qiosmenu.h qiosmenu.mm
+        qiosmessagedialog.h qiosmessagedialog.mm
+        qiostextinputoverlay.h qiostextinputoverlay.mm
+    PUBLIC_LIBRARIES
+        ${FWAssetsLibrary}
+)
+
+#### Keys ignored in scope 6:.:.:kernel.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN:
+# PLUGIN_EXTENDS = "-"
+add_subdirectory(optional)
diff --git a/src/plugins/platforms/ios/CMakeLists.txt b/src/plugins/platforms/ios/CMakeLists.txt
new file mode 100644
index 0000000000..d7ff160ee0
--- /dev/null
+++ b/src/plugins/platforms/ios/CMakeLists.txt
@@ -0,0 +1,65 @@
+# Generated from ios.pro.
+
+#####################################################################
+## QIOSIntegrationPlugin Plugin:
+#####################################################################
+
+add_qt_plugin(QIOSIntegrationPlugin
+    OUTPUT_NAME qios
+    TYPE platforms
+    SOURCES
+        plugin.mm
+        qiosapplicationdelegate.h qiosapplicationdelegate.mm
+        qiosapplicationstate.h qiosapplicationstate.mm
+        qiosbackingstore.h qiosbackingstore.mm
+        qioscontext.h qioscontext.mm
+        qioseventdispatcher.h qioseventdispatcher.mm
+        qiosglobal.h qiosglobal.mm
+        qiosinputcontext.h qiosinputcontext.mm
+        qiosintegration.h qiosintegration.mm
+        qiosplatformaccessibility.h qiosplatformaccessibility.mm
+        qiosscreen.h qiosscreen.mm
+        qiosservices.h qiosservices.mm
+        qiostextresponder.h qiostextresponder.mm
+        qiostheme.h qiostheme.mm
+        qiosviewcontroller.h qiosviewcontroller.mm
+        qioswindow.h qioswindow.mm
+        quiaccessibilityelement.h quiaccessibilityelement.mm
+        quiview.h quiview.mm
+    PUBLIC_LIBRARIES
+        ${FWAudioToolbox}
+        ${FWFoundation}
+        ${FWQuartzCore}
+        ${FWUIKit}
+        Qt::ClipboardSupportPrivate
+        Qt::CorePrivate
+        Qt::FontDatabaseSupportPrivate
+        Qt::GraphicsSupportPrivate
+        Qt::GuiPrivate
+)
+
+#### Keys ignored in scope 2:.:.:kernel.pro:<TRUE>:
+# OTHER_FILES = "quiview_textinput.mm" "quiview_accessibility.mm"
+
+## Scopes:
+#####################################################################
+
+extend_target(QIOSIntegrationPlugin CONDITION TARGET Qt::PlatformCompositorSupportPrivate
+    PUBLIC_LIBRARIES
+        Qt::PlatformCompositorSupportPrivate
+)
+
+extend_target(QIOSIntegrationPlugin CONDITION NOT APPLE_TVOS
+    SOURCES
+        qiosclipboard.h qiosclipboard.mm
+        qiosfiledialog.h qiosfiledialog.mm
+        qiosmenu.h qiosmenu.mm
+        qiosmessagedialog.h qiosmessagedialog.mm
+        qiostextinputoverlay.h qiostextinputoverlay.mm
+    PUBLIC_LIBRARIES
+        ${FWAssetsLibrary}
+)
+
+#### Keys ignored in scope 6:.:.:kernel.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN:
+# PLUGIN_EXTENDS = "-"
+add_subdirectory(optional)
diff --git a/src/plugins/platforms/ios/kernel.pro b/src/plugins/platforms/ios/kernel.pro
index 71257d09f7..01e0105223 100644
--- a/src/plugins/platforms/ios/kernel.pro
+++ b/src/plugins/platforms/ios/kernel.pro
@@ -9,6 +9,8 @@ QT += \
     core-private gui-private \
     clipboard_support-private fontdatabase_support-private graphics_support-private
 
+qtHaveModule(platformcompositor_support-private): QT += platformcompositor_support-private
+
 LIBS += -framework Foundation -framework UIKit -framework QuartzCore -framework AudioToolbox
 
 OBJECTIVE_SOURCES = \
diff --git a/src/plugins/platforms/ios/optional/CMakeLists.txt b/src/plugins/platforms/ios/optional/CMakeLists.txt
new file mode 100644
index 0000000000..3c84e61f26
--- /dev/null
+++ b/src/plugins/platforms/ios/optional/CMakeLists.txt
@@ -0,0 +1,5 @@
+# Generated from optional.pro.
+
+if(APPLE_IOS)
+    add_subdirectory(nsphotolibrarysupport)
+endif()
diff --git a/src/plugins/platforms/ios/optional/nsphotolibrarysupport/CMakeLists.txt b/src/plugins/platforms/ios/optional/nsphotolibrarysupport/CMakeLists.txt
new file mode 100644
index 0000000000..0fbb0fdbd8
--- /dev/null
+++ b/src/plugins/platforms/ios/optional/nsphotolibrarysupport/CMakeLists.txt
@@ -0,0 +1,29 @@
+# Generated from nsphotolibrarysupport.pro.
+
+#####################################################################
+## QIosOptionalPlugin_NSPhotoLibrary Plugin:
+#####################################################################
+
+add_qt_plugin(QIosOptionalPlugin_NSPhotoLibrary
+    OUTPUT_NAME qiosnsphotolibrarysupport
+    TYPE platforms/darwin
+    SOURCES
+        plugin.mm
+        qiosfileengineassetslibrary.h qiosfileengineassetslibrary.mm
+        qiosfileenginefactory.h
+        qiosimagepickercontroller.h qiosimagepickercontroller.mm
+    PUBLIC_LIBRARIES
+        ${FWAssetsLibrary}
+        ${FWFoundation}
+        ${FWUIKit}
+        Qt::Core
+        Qt::Gui
+        Qt::GuiPrivate
+)
+
+#### Keys ignored in scope 1:.:.:nsphotolibrarysupport.pro:<TRUE>:
+# OTHER_FILES = "plugin.json"
+# PLUGIN_EXTENDS = "-"
+
+## Scopes:
+#####################################################################
diff --git a/src/plugins/platforms/ios/qiosintegration.mm b/src/plugins/platforms/ios/qiosintegration.mm
index 9eca0eaad3..d724e65717 100644
--- a/src/plugins/platforms/ios/qiosintegration.mm
+++ b/src/plugins/platforms/ios/qiosintegration.mm
@@ -65,6 +65,10 @@
 
 #import <AudioToolbox/AudioServices.h>
 
+#if QT_CONFIG(opengl)
+#include <QtPlatformCompositorSupport/qpa/qplatformbackingstoreopenglsupport.h>
+#endif
+
 #include <QtDebug>
 
 QT_BEGIN_NAMESPACE
@@ -186,7 +190,11 @@ QPlatformWindow *QIOSIntegration::createPlatformWindow(QWindow *window) const
 // Used when the QWindow's surface type is set by the client to QSurface::RasterSurface
 QPlatformBackingStore *QIOSIntegration::createPlatformBackingStore(QWindow *window) const
 {
-    return new QIOSBackingStore(window);
+    auto *backingStore = new QIOSBackingStore(window);
+#if QT_CONFIG(opengl)
+    backingStore->setOpenGLSupport(new QPlatformBackingStoreOpenGLSupport(backingStore));
+#endif
+    return backingStore;
 }
 
 // Used when the QWindow's surface type is set by the client to QSurface::OpenGLSurface
diff --git a/src/plugins/platforms/linuxfb/.prev_CMakeLists.txt b/src/plugins/platforms/linuxfb/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..bcec98e1de
--- /dev/null
+++ b/src/plugins/platforms/linuxfb/.prev_CMakeLists.txt
@@ -0,0 +1,46 @@
+# Generated from linuxfb.pro.
+
+#####################################################################
+## QLinuxFbIntegrationPlugin Plugin:
+#####################################################################
+
+qt_add_plugin(QLinuxFbIntegrationPlugin
+    OUTPUT_NAME qlinuxfb
+    TYPE platforms
+    SOURCES
+        main.cpp
+        qlinuxfbintegration.cpp qlinuxfbintegration.h
+        qlinuxfbscreen.cpp qlinuxfbscreen.h
+    DEFINES
+        QT_NO_FOREACH
+    PUBLIC_LIBRARIES
+        Qt::Core
+        Qt::CorePrivate
+        Qt::EventDispatcherSupportPrivate
+        Qt::FbSupportPrivate
+        Qt::FontDatabaseSupportPrivate
+        Qt::Gui
+        Qt::GuiPrivate
+        Qt::ServiceSupportPrivate
+)
+
+#### Keys ignored in scope 1:.:.:linuxfb.pro:<TRUE>:
+# OTHER_FILES = "linuxfb.json"
+
+## Scopes:
+#####################################################################
+
+qt_extend_target(QLinuxFbIntegrationPlugin CONDITION TARGET Qt::InputSupportPrivate
+    PUBLIC_LIBRARIES
+        Qt::InputSupportPrivate
+)
+
+qt_extend_target(QLinuxFbIntegrationPlugin CONDITION TARGET Qt::KmsSupportPrivate
+    SOURCES
+        qlinuxfbdrmscreen.cpp qlinuxfbdrmscreen.h
+    PUBLIC_LIBRARIES
+        Qt::KmsSupportPrivate
+)
+
+#### Keys ignored in scope 4:.:.:linuxfb.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN:
+# PLUGIN_EXTENDS = "-"
diff --git a/src/plugins/platforms/linuxfb/CMakeLists.txt b/src/plugins/platforms/linuxfb/CMakeLists.txt
new file mode 100644
index 0000000000..8747894100
--- /dev/null
+++ b/src/plugins/platforms/linuxfb/CMakeLists.txt
@@ -0,0 +1,47 @@
+# Generated from linuxfb.pro.
+
+#####################################################################
+## QLinuxFbIntegrationPlugin Plugin:
+#####################################################################
+
+qt_add_plugin(QLinuxFbIntegrationPlugin
+    OUTPUT_NAME qlinuxfb
+    TYPE platforms
+    DEFAULT_IF ${QT_QPA_DEFAULT_PLATFORM} MATCHES linuxfb # special case
+    SOURCES
+        main.cpp
+        qlinuxfbintegration.cpp qlinuxfbintegration.h
+        qlinuxfbscreen.cpp qlinuxfbscreen.h
+    DEFINES
+        QT_NO_FOREACH
+    PUBLIC_LIBRARIES
+        Qt::Core
+        Qt::CorePrivate
+        Qt::EventDispatcherSupportPrivate
+        Qt::FbSupportPrivate
+        Qt::FontDatabaseSupportPrivate
+        Qt::Gui
+        Qt::GuiPrivate
+        Qt::ServiceSupportPrivate
+)
+
+#### Keys ignored in scope 1:.:.:linuxfb.pro:<TRUE>:
+# OTHER_FILES = "linuxfb.json"
+
+## Scopes:
+#####################################################################
+
+qt_extend_target(QLinuxFbIntegrationPlugin CONDITION TARGET Qt::InputSupportPrivate
+    PUBLIC_LIBRARIES
+        Qt::InputSupportPrivate
+)
+
+qt_extend_target(QLinuxFbIntegrationPlugin CONDITION TARGET Qt::KmsSupportPrivate
+    SOURCES
+        qlinuxfbdrmscreen.cpp qlinuxfbdrmscreen.h
+    PUBLIC_LIBRARIES
+        Qt::KmsSupportPrivate
+)
+
+#### Keys ignored in scope 4:.:.:linuxfb.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN:
+# PLUGIN_EXTENDS = "-"
diff --git a/src/plugins/platforms/minimal/.prev_CMakeLists.txt b/src/plugins/platforms/minimal/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..764c684932
--- /dev/null
+++ b/src/plugins/platforms/minimal/.prev_CMakeLists.txt
@@ -0,0 +1,37 @@
+# Generated from minimal.pro.
+
+#####################################################################
+## QMinimalIntegrationPlugin Plugin:
+#####################################################################
+
+qt_add_plugin(QMinimalIntegrationPlugin
+    OUTPUT_NAME qminimal
+    TYPE platforms
+    SOURCES
+        main.cpp
+        qminimalbackingstore.cpp qminimalbackingstore.h
+        qminimalintegration.cpp qminimalintegration.h
+    DEFINES
+        QT_NO_FOREACH
+    PUBLIC_LIBRARIES
+        Qt::Core
+        Qt::CorePrivate
+        Qt::EventDispatcherSupportPrivate
+        Qt::FontDatabaseSupportPrivate
+        Qt::Gui
+        Qt::GuiPrivate
+)
+
+#### Keys ignored in scope 1:.:.:minimal.pro:<TRUE>:
+# OTHER_FILES = "minimal.json"
+
+## Scopes:
+#####################################################################
+
+qt_extend_target(QMinimalIntegrationPlugin CONDITION QT_FEATURE_freetype
+    LIBRARIES
+        WrapFreetype::WrapFreetype
+)
+
+#### Keys ignored in scope 3:.:.:minimal.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN:
+# PLUGIN_EXTENDS = "-"
diff --git a/src/plugins/platforms/minimal/CMakeLists.txt b/src/plugins/platforms/minimal/CMakeLists.txt
new file mode 100644
index 0000000000..623cf5f83a
--- /dev/null
+++ b/src/plugins/platforms/minimal/CMakeLists.txt
@@ -0,0 +1,40 @@
+# Generated from minimal.pro.
+
+#####################################################################
+## QMinimalIntegrationPlugin Plugin:
+#####################################################################
+
+qt_find_package(WrapFreetype PROVIDED_TARGETS WrapFreetype::WrapFreetype) # special case
+
+qt_add_plugin(QMinimalIntegrationPlugin
+    OUTPUT_NAME qminimal
+    TYPE platforms
+    DEFAULT_IF ${QT_QPA_DEFAULT_PLATFORM} MATCHES minimal # special case
+    SOURCES
+        main.cpp
+        qminimalbackingstore.cpp qminimalbackingstore.h
+        qminimalintegration.cpp qminimalintegration.h
+    DEFINES
+        QT_NO_FOREACH
+    PUBLIC_LIBRARIES
+        Qt::Core
+        Qt::CorePrivate
+        Qt::EventDispatcherSupportPrivate
+        Qt::FontDatabaseSupportPrivate
+        Qt::Gui
+        Qt::GuiPrivate
+)
+
+#### Keys ignored in scope 1:.:.:minimal.pro:<TRUE>:
+# OTHER_FILES = "minimal.json"
+
+## Scopes:
+#####################################################################
+
+qt_extend_target(QMinimalIntegrationPlugin CONDITION QT_FEATURE_freetype
+    LIBRARIES
+        WrapFreetype::WrapFreetype
+)
+
+#### Keys ignored in scope 3:.:.:minimal.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN:
+# PLUGIN_EXTENDS = "-"
diff --git a/src/plugins/platforms/minimalegl/.prev_CMakeLists.txt b/src/plugins/platforms/minimalegl/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..7a08af79a9
--- /dev/null
+++ b/src/plugins/platforms/minimalegl/.prev_CMakeLists.txt
@@ -0,0 +1,41 @@
+# Generated from minimalegl.pro.
+
+#####################################################################
+## QMinimalEglIntegrationPlugin Plugin:
+#####################################################################
+
+qt_add_plugin(QMinimalEglIntegrationPlugin
+    OUTPUT_NAME qminimalegl
+    TYPE platforms
+    SOURCES
+        main.cpp
+        qminimaleglintegration.cpp qminimaleglintegration.h
+        qminimaleglscreen.cpp qminimaleglscreen.h
+        qminimaleglwindow.cpp qminimaleglwindow.h
+    DEFINES
+        QT_EGL_NO_X11
+    PUBLIC_LIBRARIES
+        Qt::Core
+        Qt::CorePrivate
+        Qt::EglSupportPrivate
+        Qt::EventDispatcherSupportPrivate
+        Qt::FontDatabaseSupportPrivate
+        Qt::Gui
+        Qt::GuiPrivate
+)
+
+#### Keys ignored in scope 1:.:.:minimalegl.pro:<TRUE>:
+# OTHER_FILES = "minimalegl.json"
+
+## Scopes:
+#####################################################################
+
+qt_extend_target(QMinimalEglIntegrationPlugin CONDITION QT_FEATURE_opengl
+    SOURCES
+        qminimaleglbackingstore.cpp qminimaleglbackingstore.h
+    PUBLIC_LIBRARIES
+        Qt::OpenGL
+)
+
+#### Keys ignored in scope 3:.:.:minimalegl.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN:
+# PLUGIN_EXTENDS = "-"
diff --git a/src/plugins/platforms/minimalegl/CMakeLists.txt b/src/plugins/platforms/minimalegl/CMakeLists.txt
new file mode 100644
index 0000000000..4c8856e35d
--- /dev/null
+++ b/src/plugins/platforms/minimalegl/CMakeLists.txt
@@ -0,0 +1,42 @@
+# Generated from minimalegl.pro.
+
+#####################################################################
+## QMinimalEglIntegrationPlugin Plugin:
+#####################################################################
+
+qt_add_plugin(QMinimalEglIntegrationPlugin
+    OUTPUT_NAME qminimalegl
+    TYPE platforms
+    DEFAULT_IF ${QT_QPA_DEFAULT_PLATFORM} MATCHES minimalegl # special case
+    SOURCES
+        main.cpp
+        qminimaleglintegration.cpp qminimaleglintegration.h
+        qminimaleglscreen.cpp qminimaleglscreen.h
+        qminimaleglwindow.cpp qminimaleglwindow.h
+    DEFINES
+        QT_EGL_NO_X11
+    PUBLIC_LIBRARIES
+        Qt::Core
+        Qt::CorePrivate
+        Qt::EglSupportPrivate
+        Qt::EventDispatcherSupportPrivate
+        Qt::FontDatabaseSupportPrivate
+        Qt::Gui
+        Qt::GuiPrivate
+)
+
+#### Keys ignored in scope 1:.:.:minimalegl.pro:<TRUE>:
+# OTHER_FILES = "minimalegl.json"
+
+## Scopes:
+#####################################################################
+
+qt_extend_target(QMinimalEglIntegrationPlugin CONDITION QT_FEATURE_opengl
+    SOURCES
+        qminimaleglbackingstore.cpp qminimaleglbackingstore.h
+    PUBLIC_LIBRARIES
+        Qt::OpenGL
+)
+
+#### Keys ignored in scope 3:.:.:minimalegl.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN:
+# PLUGIN_EXTENDS = "-"
diff --git a/src/plugins/platforms/minimalegl/minimalegl.pro b/src/plugins/platforms/minimalegl/minimalegl.pro
index b7dde9069f..3f6ae4e248 100644
--- a/src/plugins/platforms/minimalegl/minimalegl.pro
+++ b/src/plugins/platforms/minimalegl/minimalegl.pro
@@ -21,6 +21,7 @@ HEADERS =   qminimaleglintegration.h \
             qminimaleglscreen.h
 
 qtConfig(opengl) {
+    QT += opengl
     SOURCES += qminimaleglbackingstore.cpp
     HEADERS += qminimaleglbackingstore.h
 }
diff --git a/src/plugins/platforms/minimalegl/qminimaleglbackingstore.cpp b/src/plugins/platforms/minimalegl/qminimaleglbackingstore.cpp
index dc8dd74312..2319762f31 100644
--- a/src/plugins/platforms/minimalegl/qminimaleglbackingstore.cpp
+++ b/src/plugins/platforms/minimalegl/qminimaleglbackingstore.cpp
@@ -40,7 +40,7 @@
 #include "qminimaleglbackingstore.h"
 
 #include <QtGui/QOpenGLContext>
-#include <QtGui/QOpenGLPaintDevice>
+#include <QtOpenGL/QOpenGLPaintDevice>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/plugins/platforms/offscreen/.prev_CMakeLists.txt b/src/plugins/platforms/offscreen/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..62d36ec449
--- /dev/null
+++ b/src/plugins/platforms/offscreen/.prev_CMakeLists.txt
@@ -0,0 +1,40 @@
+# Generated from offscreen.pro.
+
+#####################################################################
+## QOffscreenIntegrationPlugin Plugin:
+#####################################################################
+
+qt_add_plugin(QOffscreenIntegrationPlugin
+    OUTPUT_NAME qoffscreen
+    TYPE platforms
+    SOURCES
+        main.cpp
+        qoffscreencommon.cpp qoffscreencommon.h
+        qoffscreenintegration.cpp qoffscreenintegration.h
+        qoffscreenwindow.cpp qoffscreenwindow.h
+    DEFINES
+        QT_NO_FOREACH
+    PUBLIC_LIBRARIES
+        Qt::Core
+        Qt::CorePrivate
+        Qt::EventDispatcherSupportPrivate
+        Qt::FontDatabaseSupportPrivate
+        Qt::Gui
+        Qt::GuiPrivate
+)
+
+#### Keys ignored in scope 1:.:.:offscreen.pro:<TRUE>:
+# OTHER_FILES = "offscreen.json"
+
+## Scopes:
+#####################################################################
+
+qt_extend_target(QOffscreenIntegrationPlugin CONDITION QT_FEATURE_opengl AND QT_FEATURE_xlib AND NOT QT_FEATURE_opengles2
+    SOURCES
+        qoffscreenintegration_x11.cpp qoffscreenintegration_x11.h
+    PUBLIC_LIBRARIES
+        Qt::GlxSupportPrivate
+)
+
+#### Keys ignored in scope 3:.:.:offscreen.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN:
+# PLUGIN_EXTENDS = "-"
diff --git a/src/plugins/platforms/offscreen/CMakeLists.txt b/src/plugins/platforms/offscreen/CMakeLists.txt
new file mode 100644
index 0000000000..63474c3760
--- /dev/null
+++ b/src/plugins/platforms/offscreen/CMakeLists.txt
@@ -0,0 +1,41 @@
+# Generated from offscreen.pro.
+
+#####################################################################
+## QOffscreenIntegrationPlugin Plugin:
+#####################################################################
+
+qt_add_plugin(QOffscreenIntegrationPlugin
+    OUTPUT_NAME qoffscreen
+    TYPE platforms
+    DEFAULT_IF ${QT_QPA_DEFAULT_PLATFORM} MATCHES offscreen # special case
+    SOURCES
+        main.cpp
+        qoffscreencommon.cpp qoffscreencommon.h
+        qoffscreenintegration.cpp qoffscreenintegration.h
+        qoffscreenwindow.cpp qoffscreenwindow.h
+    DEFINES
+        QT_NO_FOREACH
+    PUBLIC_LIBRARIES
+        Qt::Core
+        Qt::CorePrivate
+        Qt::EventDispatcherSupportPrivate
+        Qt::FontDatabaseSupportPrivate
+        Qt::Gui
+        Qt::GuiPrivate
+)
+
+#### Keys ignored in scope 1:.:.:offscreen.pro:<TRUE>:
+# OTHER_FILES = "offscreen.json"
+
+## Scopes:
+#####################################################################
+
+qt_extend_target(QOffscreenIntegrationPlugin CONDITION QT_FEATURE_opengl AND QT_FEATURE_xlib AND NOT QT_FEATURE_opengles2
+    SOURCES
+        qoffscreenintegration_x11.cpp qoffscreenintegration_x11.h
+    PUBLIC_LIBRARIES
+        Qt::GlxSupportPrivate
+)
+
+#### Keys ignored in scope 3:.:.:offscreen.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN:
+# PLUGIN_EXTENDS = "-"
diff --git a/src/plugins/platforms/vnc/.prev_CMakeLists.txt b/src/plugins/platforms/vnc/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..a26cc0be2b
--- /dev/null
+++ b/src/plugins/platforms/vnc/.prev_CMakeLists.txt
@@ -0,0 +1,43 @@
+# Generated from vnc.pro.
+
+#####################################################################
+## QVncIntegrationPlugin Plugin:
+#####################################################################
+
+qt_add_plugin(QVncIntegrationPlugin
+    OUTPUT_NAME qvnc
+    TYPE platforms
+    SOURCES
+        main.cpp
+        qvnc.cpp qvnc_p.h
+        qvncclient.cpp qvncclient.h
+        qvncintegration.cpp qvncintegration.h
+        qvncscreen.cpp qvncscreen.h
+    DEFINES
+        QT_NO_FOREACH
+    PUBLIC_LIBRARIES
+        Qt::Core
+        Qt::CorePrivate
+        Qt::EventDispatcherSupportPrivate
+        Qt::FbSupportPrivate
+        Qt::FontDatabaseSupportPrivate
+        Qt::Gui
+        Qt::GuiPrivate
+        Qt::Network
+        Qt::ServiceSupportPrivate
+        Qt::ThemeSupportPrivate
+)
+
+#### Keys ignored in scope 1:.:.:vnc.pro:<TRUE>:
+# OTHER_FILES = "vnc.json"
+
+## Scopes:
+#####################################################################
+
+qt_extend_target(QVncIntegrationPlugin CONDITION TARGET Qt::InputSupportPrivate
+    PUBLIC_LIBRARIES
+        Qt::InputSupportPrivate
+)
+
+#### Keys ignored in scope 3:.:.:vnc.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN:
+# PLUGIN_EXTENDS = "-"
diff --git a/src/plugins/platforms/vnc/CMakeLists.txt b/src/plugins/platforms/vnc/CMakeLists.txt
new file mode 100644
index 0000000000..cb84355d81
--- /dev/null
+++ b/src/plugins/platforms/vnc/CMakeLists.txt
@@ -0,0 +1,44 @@
+# Generated from vnc.pro.
+
+#####################################################################
+## QVncIntegrationPlugin Plugin:
+#####################################################################
+
+qt_add_plugin(QVncIntegrationPlugin
+    OUTPUT_NAME qvnc
+    TYPE platforms
+    DEFAULT_IF ${QT_QPA_DEFAULT_PLATFORM} MATCHES vnc # special case
+    SOURCES
+        main.cpp
+        qvnc.cpp qvnc_p.h
+        qvncclient.cpp qvncclient.h
+        qvncintegration.cpp qvncintegration.h
+        qvncscreen.cpp qvncscreen.h
+    DEFINES
+        QT_NO_FOREACH
+    PUBLIC_LIBRARIES
+        Qt::Core
+        Qt::CorePrivate
+        Qt::EventDispatcherSupportPrivate
+        Qt::FbSupportPrivate
+        Qt::FontDatabaseSupportPrivate
+        Qt::Gui
+        Qt::GuiPrivate
+        Qt::Network
+        Qt::ServiceSupportPrivate
+        Qt::ThemeSupportPrivate
+)
+
+#### Keys ignored in scope 1:.:.:vnc.pro:<TRUE>:
+# OTHER_FILES = "vnc.json"
+
+## Scopes:
+#####################################################################
+
+qt_extend_target(QVncIntegrationPlugin CONDITION TARGET Qt::InputSupportPrivate
+    PUBLIC_LIBRARIES
+        Qt::InputSupportPrivate
+)
+
+#### Keys ignored in scope 3:.:.:vnc.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN:
+# PLUGIN_EXTENDS = "-"
diff --git a/src/plugins/platforms/vnc/qvnc.cpp b/src/plugins/platforms/vnc/qvnc.cpp
index 8390fa19cd..aea8d26983 100644
--- a/src/plugins/platforms/vnc/qvnc.cpp
+++ b/src/plugins/platforms/vnc/qvnc.cpp
@@ -502,7 +502,7 @@ void QRfbRawEncoder::write()
         const quint32 encoding = htonl(0); // raw encoding
         socket->write((char *)&encoding, sizeof(encoding));
 
-        int linestep = screenImage.bytesPerLine();
+        qsizetype linestep = screenImage.bytesPerLine();
         const uchar *screendata = screenImage.scanLine(rect.y)
                                   + rect.x * screenImage.depth() / 8;
 
diff --git a/src/plugins/platforms/wasm/qwasmbackingstore.cpp b/src/plugins/platforms/wasm/qwasmbackingstore.cpp
index 6ac685083d..cef15543d4 100644
--- a/src/plugins/platforms/wasm/qwasmbackingstore.cpp
+++ b/src/plugins/platforms/wasm/qwasmbackingstore.cpp
@@ -31,7 +31,7 @@
 #include "qwasmwindow.h"
 #include "qwasmcompositor.h"
 
-#include <QtGui/qopengltexture.h>
+#include <QtOpenGL/qopengltexture.h>
 #include <QtGui/qmatrix4x4.h>
 #include <QtGui/qpainter.h>
 #include <private/qguiapplication_p.h>
diff --git a/src/plugins/platforms/wasm/qwasmcompositor.cpp b/src/plugins/platforms/wasm/qwasmcompositor.cpp
index 2f0b0414d9..a4cfaa85a8 100644
--- a/src/plugins/platforms/wasm/qwasmcompositor.cpp
+++ b/src/plugins/platforms/wasm/qwasmcompositor.cpp
@@ -31,12 +31,11 @@
 #include "qwasmwindow.h"
 #include "qwasmstylepixmaps_p.h"
 
-#include <QtGui/qopengltexture.h>
+#include <QtOpenGL/qopengltexture.h>
 
 #include <QtGui/private/qwindow_p.h>
 #include <QtGui/qopenglcontext.h>
 #include <QtGui/qopenglfunctions.h>
-#include <QtGui/qopengltextureblitter.h>
 #include <QtGui/qoffscreensurface.h>
 #include <QtGui/qpainter.h>
 #include <private/qpixmapcache_p.h>
diff --git a/src/plugins/platforms/wasm/qwasmcompositor.h b/src/plugins/platforms/wasm/qwasmcompositor.h
index 422f990175..a07c747a98 100644
--- a/src/plugins/platforms/wasm/qwasmcompositor.h
+++ b/src/plugins/platforms/wasm/qwasmcompositor.h
@@ -33,8 +33,7 @@
 #include <QtGui/qregion.h>
 #include <qpa/qplatformwindow.h>
 
-#include <QtGui/qopengltextureblitter.h>
-#include <QtGui/qopengltexture.h>
+#include <QtOpenGL/qopengltextureblitter.h>
 #include <QtGui/qpalette.h>
 #include <QtGui/qpainter.h>
 
@@ -43,7 +42,7 @@ QT_BEGIN_NAMESPACE
 class QWasmWindow;
 class QWasmScreen;
 class QOpenGLContext;
-class QOpenGLTextureBlitter;
+class QOpenGLTexture;
 
 class QWasmCompositedWindow
 {
diff --git a/src/plugins/platforms/wasm/qwasmintegration.cpp b/src/plugins/platforms/wasm/qwasmintegration.cpp
index 4b42b5788f..37cc6185c5 100644
--- a/src/plugins/platforms/wasm/qwasmintegration.cpp
+++ b/src/plugins/platforms/wasm/qwasmintegration.cpp
@@ -41,6 +41,7 @@
 #include "qwasmwindow.h"
 #ifndef QT_NO_OPENGL
 # include "qwasmbackingstore.h"
+# include <QtPlatformCompositorSupport/qpa/qplatformbackingstoreopenglsupport.h>
 #endif
 #include "qwasmfontdatabase.h"
 #if defined(Q_OS_UNIX)
@@ -180,6 +181,7 @@ QPlatformBackingStore *QWasmIntegration::createPlatformBackingStore(QWindow *win
 #ifndef QT_NO_OPENGL
     QWasmCompositor *compositor = QWasmScreen::get(window->screen())->compositor();
     QWasmBackingStore *backingStore = new QWasmBackingStore(compositor, window);
+    backingStore->setOpenGLSupport(new QPlatformBackingStoreOpenGLSupport(backingStore));
     m_backingStores.insert(window, backingStore);
     return backingStore;
 #else
diff --git a/src/plugins/platforms/wasm/wasm.pro b/src/plugins/platforms/wasm/wasm.pro
index a12ae06833..1aee4a3e58 100644
--- a/src/plugins/platforms/wasm/wasm.pro
+++ b/src/plugins/platforms/wasm/wasm.pro
@@ -4,6 +4,8 @@ QT += \
     core-private gui-private \
     eventdispatcher_support-private fontdatabase_support-private egl_support-private
 
+qtHaveModule(platformcompositor_support-private): QT += platformcompositor_support-private
+
 # Avoid X11 header collision, use generic EGL native types
 DEFINES += QT_EGL_NO_X11
 
@@ -52,6 +54,7 @@ wasmfonts.base = ../../../3rdparty/wasm
 RESOURCES += wasmfonts
 
 qtConfig(opengl) {
+    QT += opengl
     SOURCES += qwasmbackingstore.cpp
     HEADERS += qwasmbackingstore.h
 }
diff --git a/src/plugins/platforms/windows/.prev_CMakeLists.txt b/src/plugins/platforms/windows/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..92b2ccb217
--- /dev/null
+++ b/src/plugins/platforms/windows/.prev_CMakeLists.txt
@@ -0,0 +1,246 @@
+# Generated from windows.pro.
+
+#####################################################################
+## QWindowsIntegrationPlugin Plugin:
+#####################################################################
+
+qt_add_plugin(QWindowsIntegrationPlugin
+    OUTPUT_NAME qwindows
+    TYPE platforms
+    SOURCES
+        main.cpp
+        qtwindowsglobal.h
+        qwin10helpers.cpp qwin10helpers.h
+        qwindowsbackingstore.cpp qwindowsbackingstore.h
+        qwindowscombase.h
+        qwindowscontext.cpp qwindowscontext.h
+        qwindowscursor.cpp qwindowscursor.h
+        qwindowsdialoghelpers.cpp qwindowsdialoghelpers.h
+        qwindowsdropdataobject.cpp qwindowsdropdataobject.h
+        qwindowsgdiintegration.cpp qwindowsgdiintegration.h
+        qwindowsgdinativeinterface.cpp qwindowsgdinativeinterface.h
+        qwindowsinputcontext.cpp qwindowsinputcontext.h
+        qwindowsintegration.cpp qwindowsintegration.h
+        qwindowsinternalmimedata.cpp qwindowsinternalmimedata.h
+        qwindowskeymapper.cpp qwindowskeymapper.h
+        qwindowsmenu.cpp qwindowsmenu.h
+        qwindowsmime.cpp qwindowsmime.h
+        qwindowsmousehandler.cpp qwindowsmousehandler.h
+        qwindowsnativeinterface.cpp qwindowsnativeinterface.h
+        qwindowsole.cpp qwindowsole.h
+        qwindowsopengltester.cpp qwindowsopengltester.h
+        qwindowspointerhandler.cpp qwindowspointerhandler.h
+        qwindowsscreen.cpp qwindowsscreen.h
+        qwindowsservices.cpp qwindowsservices.h
+        qwindowstheme.cpp qwindowstheme.h
+        qwindowsthreadpoolrunner.h
+        qwindowswindow.cpp qwindowswindow.h
+    DEFINES
+        QT_NO_CAST_FROM_ASCII
+        QT_NO_FOREACH
+    INCLUDE_DIRECTORIES
+        ${CMAKE_CURRENT_SOURCE_DIR}
+    LIBRARIES
+        advapi32
+        d3d9
+        gdi32
+        ole32
+        shell32
+        user32
+        winmm
+    PUBLIC_LIBRARIES
+        Qt::Core
+        Qt::CorePrivate
+        Qt::EventDispatcherSupportPrivate
+        Qt::FontDatabaseSupportPrivate
+        Qt::Gui
+        Qt::GuiPrivate
+        Qt::ThemeSupportPrivate
+        dwmapi
+        imm32
+        oleaut32
+        shlwapi
+        winspool
+        wtsapi32
+)
+
+# Resources:
+set_source_files_properties("openglblacklists/default.json"
+    PROPERTIES QT_RESOURCE_ALIAS "default.json"
+)
+set(openglblacklists_resource_files
+    "openglblacklists/default.json"
+)
+
+qt_add_resource(QWindowsIntegrationPlugin "openglblacklists"
+    PREFIX
+        "/qt-project.org/windows/openglblacklists"
+    FILES
+        ${openglblacklists_resource_files}
+)
+
+
+#### Keys ignored in scope 1:.:.:windows.pro:<TRUE>:
+# OTHER_FILES = "windows.json"
+
+## Scopes:
+#####################################################################
+
+qt_extend_target(QWindowsIntegrationPlugin CONDITION TARGET Qt::PlatformCompositorSupportPrivate
+    PUBLIC_LIBRARIES
+        Qt::PlatformCompositorSupportPrivate
+)
+
+qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_accessibility
+    SOURCES
+        uiautomation/qwindowsuiaaccessibility.cpp uiautomation/qwindowsuiaaccessibility.h
+        uiautomation/qwindowsuiabaseprovider.cpp uiautomation/qwindowsuiabaseprovider.h
+        uiautomation/qwindowsuiaexpandcollapseprovider.cpp uiautomation/qwindowsuiaexpandcollapseprovider.h
+        uiautomation/qwindowsuiagriditemprovider.cpp uiautomation/qwindowsuiagriditemprovider.h
+        uiautomation/qwindowsuiagridprovider.cpp uiautomation/qwindowsuiagridprovider.h
+        uiautomation/qwindowsuiainvokeprovider.cpp uiautomation/qwindowsuiainvokeprovider.h
+        uiautomation/qwindowsuiamainprovider.cpp uiautomation/qwindowsuiamainprovider.h
+        uiautomation/qwindowsuiaprovidercache.cpp uiautomation/qwindowsuiaprovidercache.h
+        uiautomation/qwindowsuiarangevalueprovider.cpp uiautomation/qwindowsuiarangevalueprovider.h
+        uiautomation/qwindowsuiaselectionitemprovider.cpp uiautomation/qwindowsuiaselectionitemprovider.h
+        uiautomation/qwindowsuiaselectionprovider.cpp uiautomation/qwindowsuiaselectionprovider.h
+        uiautomation/qwindowsuiatableitemprovider.cpp uiautomation/qwindowsuiatableitemprovider.h
+        uiautomation/qwindowsuiatableprovider.cpp uiautomation/qwindowsuiatableprovider.h
+        uiautomation/qwindowsuiatextprovider.cpp uiautomation/qwindowsuiatextprovider.h
+        uiautomation/qwindowsuiatextrangeprovider.cpp uiautomation/qwindowsuiatextrangeprovider.h
+        uiautomation/qwindowsuiatoggleprovider.cpp uiautomation/qwindowsuiatoggleprovider.h
+        uiautomation/qwindowsuiautils.cpp uiautomation/qwindowsuiautils.h
+        uiautomation/qwindowsuiavalueprovider.cpp uiautomation/qwindowsuiavalueprovider.h
+        uiautomation/qwindowsuiawindowprovider.cpp uiautomation/qwindowsuiawindowprovider.h
+    PUBLIC_LIBRARIES
+        Qt::AccessibilitySupportPrivate
+)
+
+qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_vulkan
+    SOURCES
+        qwindowsvulkaninstance.cpp qwindowsvulkaninstance.h
+    PUBLIC_LIBRARIES
+        Qt::VulkanSupportPrivate
+)
+
+qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_directwrite3
+    DEFINES
+        QT_USE_DIRECTWRITE2
+        QT_USE_DIRECTWRITE3
+)
+
+#### Keys ignored in scope 6:.:.:windows.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN:
+# PLUGIN_EXTENDS = "-"
+
+qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_opengl AND NOT QT_FEATURE_dynamicgl AND NOT QT_FEATURE_opengles2
+    PUBLIC_LIBRARIES
+        opengl32
+)
+
+qt_extend_target(QWindowsIntegrationPlugin CONDITION mingw
+    PUBLIC_LIBRARIES
+        uuid
+)
+
+qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_opengl
+    SOURCES
+        qwindowsopenglcontext.h
+)
+
+qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_opengles2
+    SOURCES
+        qwindowseglcontext.cpp qwindowseglcontext.h
+)
+
+qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_opengl AND NOT QT_FEATURE_opengles2
+    SOURCES
+        qwindowsglcontext.cpp qwindowsglcontext.h
+)
+
+qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_dynamicgl
+    SOURCES
+        qwindowseglcontext.cpp qwindowseglcontext.h
+)
+
+qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_systemtrayicon
+    SOURCES
+        qwindowssystemtrayicon.cpp qwindowssystemtrayicon.h
+)
+
+qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_clipboard
+    SOURCES
+        qwindowsclipboard.cpp qwindowsclipboard.h
+)
+
+qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_clipboard AND QT_FEATURE_draganddrop
+    SOURCES
+        qwindowsdrag.cpp qwindowsdrag.h
+)
+
+qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_tabletevent
+    SOURCES
+        qwindowstabletsupport.cpp qwindowstabletsupport.h
+    INCLUDE_DIRECTORIES
+        ${QT_SOURCE_TREE}/src/3rdparty/wintab
+)
+
+qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_sessionmanager
+    SOURCES
+        qwindowssessionmanager.cpp qwindowssessionmanager.h
+)
+
+if(QT_FEATURE_imageformat_png)
+    # Resources:
+    set(cursors_resource_files
+        "images/closedhandcursor_32.png"
+        "images/closedhandcursor_48.png"
+        "images/closedhandcursor_64.png"
+        "images/dragcopycursor_32.png"
+        "images/dragcopycursor_48.png"
+        "images/dragcopycursor_64.png"
+        "images/draglinkcursor_32.png"
+        "images/draglinkcursor_48.png"
+        "images/draglinkcursor_64.png"
+        "images/dragmovecursor_32.png"
+        "images/dragmovecursor_48.png"
+        "images/dragmovecursor_64.png"
+        "images/openhandcursor_32.png"
+        "images/openhandcursor_48.png"
+        "images/openhandcursor_64.png"
+        "images/splithcursor_32.png"
+        "images/splithcursor_48.png"
+        "images/splithcursor_64.png"
+        "images/splitvcursor_32.png"
+        "images/splitvcursor_48.png"
+        "images/splitvcursor_64.png"
+    )
+
+    qt_add_resource(QWindowsIntegrationPlugin "cursors"
+        PREFIX
+            "/qt-project.org/windows/cursors"
+        FILES
+            ${cursors_resource_files}
+    )
+endif()
+
+qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_accessibility AND TARGET Qt::WindowsUIAutomationSupportPrivate
+    PUBLIC_LIBRARIES
+        Qt::WindowsUIAutomationSupportPrivate
+)
+
+qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_accessibility AND mingw
+    PUBLIC_LIBRARIES
+        uuid
+)
+
+qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_combined_angle_lib
+    DEFINES
+        LIBEGL_NAME=
+        LIBGLESV2_NAME=
+)
+
+qt_extend_target(QWindowsIntegrationPlugin CONDITION NOT QT_FEATURE_combined_angle_lib
+    DEFINES
+        LIBEGL_NAME=
+        LIBGLESV2_NAME=
+)
diff --git a/src/plugins/platforms/windows/CMakeLists.txt b/src/plugins/platforms/windows/CMakeLists.txt
new file mode 100644
index 0000000000..4cb9608378
--- /dev/null
+++ b/src/plugins/platforms/windows/CMakeLists.txt
@@ -0,0 +1,240 @@
+# Generated from windows.pro.
+
+#####################################################################
+## QWindowsIntegrationPlugin Plugin:
+#####################################################################
+
+qt_add_plugin(QWindowsIntegrationPlugin
+    OUTPUT_NAME qwindows
+    TYPE platforms
+    DEFAULT_IF ${QT_QPA_DEFAULT_PLATFORM} MATCHES windows # special case
+    SOURCES
+        main.cpp
+        qtwindowsglobal.h
+        qwin10helpers.cpp qwin10helpers.h
+        qwindowsbackingstore.cpp qwindowsbackingstore.h
+        qwindowscombase.h
+        qwindowscontext.cpp qwindowscontext.h
+        qwindowscursor.cpp qwindowscursor.h
+        qwindowsdialoghelpers.cpp qwindowsdialoghelpers.h
+        qwindowsdropdataobject.cpp qwindowsdropdataobject.h
+        qwindowsgdiintegration.cpp qwindowsgdiintegration.h
+        qwindowsgdinativeinterface.cpp qwindowsgdinativeinterface.h
+        qwindowsinputcontext.cpp qwindowsinputcontext.h
+        qwindowsintegration.cpp qwindowsintegration.h
+        qwindowsinternalmimedata.cpp qwindowsinternalmimedata.h
+        qwindowskeymapper.cpp qwindowskeymapper.h
+        qwindowsmenu.cpp qwindowsmenu.h
+        qwindowsmime.cpp qwindowsmime.h
+        qwindowsmousehandler.cpp qwindowsmousehandler.h
+        qwindowsnativeinterface.cpp qwindowsnativeinterface.h
+        qwindowsole.cpp qwindowsole.h
+        qwindowsopengltester.cpp qwindowsopengltester.h
+        qwindowspointerhandler.cpp qwindowspointerhandler.h
+        qwindowsscreen.cpp qwindowsscreen.h
+        qwindowsservices.cpp qwindowsservices.h
+        qwindowstheme.cpp qwindowstheme.h
+        qwindowsthreadpoolrunner.h
+        qwindowswindow.cpp qwindowswindow.h
+    DEFINES
+        QT_NO_CAST_FROM_ASCII
+        QT_NO_FOREACH
+    INCLUDE_DIRECTORIES
+        ${CMAKE_CURRENT_SOURCE_DIR}
+    LIBRARIES
+        advapi32
+        d3d9
+        gdi32
+        ole32
+        shell32
+        user32
+        winmm
+    PUBLIC_LIBRARIES
+        Qt::Core
+        Qt::CorePrivate
+        Qt::EventDispatcherSupportPrivate
+        Qt::FontDatabaseSupportPrivate
+        Qt::Gui
+        Qt::GuiPrivate
+        Qt::ThemeSupportPrivate
+        dwmapi
+        imm32
+        oleaut32
+        shlwapi
+        winspool
+        wtsapi32
+)
+
+# Resources:
+set_source_files_properties("openglblacklists/default.json"
+    PROPERTIES QT_RESOURCE_ALIAS "default.json"
+)
+set(openglblacklists_resource_files
+    "openglblacklists/default.json"
+)
+
+qt_add_resource(QWindowsIntegrationPlugin "openglblacklists"
+    PREFIX
+        "/qt-project.org/windows/openglblacklists"
+    FILES
+        ${openglblacklists_resource_files}
+)
+
+
+#### Keys ignored in scope 1:.:.:windows.pro:<TRUE>:
+# OTHER_FILES = "windows.json"
+
+## Scopes:
+#####################################################################
+
+qt_extend_target(QWindowsIntegrationPlugin CONDITION TARGET Qt::PlatformCompositorSupportPrivate
+    PUBLIC_LIBRARIES
+        Qt::PlatformCompositorSupportPrivate
+)
+
+qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_accessibility
+    SOURCES
+        uiautomation/qwindowsuiaaccessibility.cpp uiautomation/qwindowsuiaaccessibility.h
+        uiautomation/qwindowsuiabaseprovider.cpp uiautomation/qwindowsuiabaseprovider.h
+        uiautomation/qwindowsuiaexpandcollapseprovider.cpp uiautomation/qwindowsuiaexpandcollapseprovider.h
+        uiautomation/qwindowsuiagriditemprovider.cpp uiautomation/qwindowsuiagriditemprovider.h
+        uiautomation/qwindowsuiagridprovider.cpp uiautomation/qwindowsuiagridprovider.h
+        uiautomation/qwindowsuiainvokeprovider.cpp uiautomation/qwindowsuiainvokeprovider.h
+        uiautomation/qwindowsuiamainprovider.cpp uiautomation/qwindowsuiamainprovider.h
+        uiautomation/qwindowsuiaprovidercache.cpp uiautomation/qwindowsuiaprovidercache.h
+        uiautomation/qwindowsuiarangevalueprovider.cpp uiautomation/qwindowsuiarangevalueprovider.h
+        uiautomation/qwindowsuiaselectionitemprovider.cpp uiautomation/qwindowsuiaselectionitemprovider.h
+        uiautomation/qwindowsuiaselectionprovider.cpp uiautomation/qwindowsuiaselectionprovider.h
+        uiautomation/qwindowsuiatableitemprovider.cpp uiautomation/qwindowsuiatableitemprovider.h
+        uiautomation/qwindowsuiatableprovider.cpp uiautomation/qwindowsuiatableprovider.h
+        uiautomation/qwindowsuiatextprovider.cpp uiautomation/qwindowsuiatextprovider.h
+        uiautomation/qwindowsuiatextrangeprovider.cpp uiautomation/qwindowsuiatextrangeprovider.h
+        uiautomation/qwindowsuiatoggleprovider.cpp uiautomation/qwindowsuiatoggleprovider.h
+        uiautomation/qwindowsuiautils.cpp uiautomation/qwindowsuiautils.h
+        uiautomation/qwindowsuiavalueprovider.cpp uiautomation/qwindowsuiavalueprovider.h
+        uiautomation/qwindowsuiawindowprovider.cpp uiautomation/qwindowsuiawindowprovider.h
+    PUBLIC_LIBRARIES
+        Qt::AccessibilitySupportPrivate
+)
+
+qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_vulkan
+    SOURCES
+        qwindowsvulkaninstance.cpp qwindowsvulkaninstance.h
+    PUBLIC_LIBRARIES
+        Qt::VulkanSupportPrivate
+)
+
+qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_directwrite3
+    DEFINES
+        QT_USE_DIRECTWRITE2
+        QT_USE_DIRECTWRITE3
+)
+
+#### Keys ignored in scope 6:.:.:windows.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN:
+# PLUGIN_EXTENDS = "-"
+
+qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_opengl AND NOT QT_FEATURE_dynamicgl AND NOT QT_FEATURE_opengles2
+    PUBLIC_LIBRARIES
+        opengl32
+)
+
+qt_extend_target(QWindowsIntegrationPlugin CONDITION mingw
+    PUBLIC_LIBRARIES
+        uuid
+)
+
+qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_opengl
+    SOURCES
+        qwindowsopenglcontext.h
+)
+
+qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_opengles2
+    SOURCES
+        qwindowseglcontext.cpp qwindowseglcontext.h
+)
+
+qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_opengl AND NOT QT_FEATURE_opengles2
+    SOURCES
+        qwindowsglcontext.cpp qwindowsglcontext.h
+)
+
+qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_dynamicgl
+    SOURCES
+        qwindowseglcontext.cpp qwindowseglcontext.h
+)
+
+qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_systemtrayicon
+    SOURCES
+        qwindowssystemtrayicon.cpp qwindowssystemtrayicon.h
+)
+
+qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_clipboard
+    SOURCES
+        qwindowsclipboard.cpp qwindowsclipboard.h
+)
+
+qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_clipboard AND QT_FEATURE_draganddrop
+    SOURCES
+        qwindowsdrag.cpp qwindowsdrag.h
+)
+
+qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_tabletevent
+    SOURCES
+        qwindowstabletsupport.cpp qwindowstabletsupport.h
+    INCLUDE_DIRECTORIES
+        ${QT_SOURCE_TREE}/src/3rdparty/wintab
+)
+
+qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_sessionmanager
+    SOURCES
+        qwindowssessionmanager.cpp qwindowssessionmanager.h
+)
+
+if(QT_FEATURE_imageformat_png)
+    # Resources:
+    set(cursors_resource_files
+        "images/closedhandcursor_32.png"
+        "images/closedhandcursor_48.png"
+        "images/closedhandcursor_64.png"
+        "images/dragcopycursor_32.png"
+        "images/dragcopycursor_48.png"
+        "images/dragcopycursor_64.png"
+        "images/draglinkcursor_32.png"
+        "images/draglinkcursor_48.png"
+        "images/draglinkcursor_64.png"
+        "images/dragmovecursor_32.png"
+        "images/dragmovecursor_48.png"
+        "images/dragmovecursor_64.png"
+        "images/openhandcursor_32.png"
+        "images/openhandcursor_48.png"
+        "images/openhandcursor_64.png"
+        "images/splithcursor_32.png"
+        "images/splithcursor_48.png"
+        "images/splithcursor_64.png"
+        "images/splitvcursor_32.png"
+        "images/splitvcursor_48.png"
+        "images/splitvcursor_64.png"
+    )
+
+    qt_add_resource(QWindowsIntegrationPlugin "cursors"
+        PREFIX
+            "/qt-project.org/windows/cursors"
+        FILES
+            ${cursors_resource_files}
+    )
+endif()
+
+qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_accessibility AND TARGET Qt::WindowsUIAutomationSupportPrivate
+    PUBLIC_LIBRARIES
+        Qt::WindowsUIAutomationSupportPrivate
+)
+
+qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_accessibility AND mingw
+    PUBLIC_LIBRARIES
+        uuid
+)
+
+# special case:
+# qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_combined_angle_lib ...
+# qt_extend_target(QWindowsIntegrationPlugin CONDITION NOT QT_FEATURE_combined_angle_lib ...
+
diff --git a/src/plugins/platforms/windows/qwindowscontext.cpp b/src/plugins/platforms/windows/qwindowscontext.cpp
index 2591966d54..438a0fbaa4 100644
--- a/src/plugins/platforms/windows/qwindowscontext.cpp
+++ b/src/plugins/platforms/windows/qwindowscontext.cpp
@@ -1001,7 +1001,7 @@ QByteArray QWindowsContext::comErrorString(HRESULT hr)
     }
     _com_error error(hr);
     result += QByteArrayLiteral(" (");
-    result += errorMessageFromComError(error);
+    result += errorMessageFromComError(error).toUtf8();
     result += ')';
     return result;
 }
diff --git a/src/plugins/platforms/windows/qwindowsgdiintegration.cpp b/src/plugins/platforms/windows/qwindowsgdiintegration.cpp
index c88f669eb5..7e9595321a 100644
--- a/src/plugins/platforms/windows/qwindowsgdiintegration.cpp
+++ b/src/plugins/platforms/windows/qwindowsgdiintegration.cpp
@@ -45,6 +45,10 @@
 #include <QtCore/qdebug.h>
 #include <QtGui/private/qpixmap_raster_p.h>
 
+#if QT_CONFIG(opengl)
+#include <QtPlatformCompositorSupport/qpa/qplatformbackingstoreopenglsupport.h>
+#endif
+
 QT_BEGIN_NAMESPACE
 
 class QWindowsGdiIntegrationPrivate
@@ -73,7 +77,11 @@ QPlatformPixmap *QWindowsGdiIntegration::createPlatformPixmap(QPlatformPixmap::P
 
 QPlatformBackingStore *QWindowsGdiIntegration::createPlatformBackingStore(QWindow *window) const
 {
-    return new QWindowsBackingStore(window);
+    auto *backingStore = new QWindowsBackingStore(window);
+#ifndef QT_NO_OPENGL
+    backingStore->setOpenGLSupport(new QPlatformBackingStoreOpenGLSupport(backingStore));
+#endif
+    return backingStore;
 }
 
 QT_END_NAMESPACE
diff --git a/src/plugins/platforms/windows/qwindowsglcontext.cpp b/src/plugins/platforms/windows/qwindowsglcontext.cpp
index f5d0a8780a..7431f52e8a 100644
--- a/src/plugins/platforms/windows/qwindowsglcontext.cpp
+++ b/src/plugins/platforms/windows/qwindowsglcontext.cpp
@@ -329,7 +329,7 @@ static inline bool
 static void describeFormats(HDC hdc)
 {
     const int pfiMax = QOpenGLStaticContext::opengl32.describePixelFormat(hdc, 0, 0, nullptr);
-    for (int i = 0; i < pfiMax; i++) {
+    for (int i = 1; i <= pfiMax; i++) {
         PIXELFORMATDESCRIPTOR pfd;
         initPixelFormatDescriptor(&pfd);
         QOpenGLStaticContext::opengl32.describePixelFormat(hdc, i, sizeof(PIXELFORMATDESCRIPTOR), &pfd);
diff --git a/src/plugins/platforms/windows/qwindowsintegration.cpp b/src/plugins/platforms/windows/qwindowsintegration.cpp
index 4b4047ac0c..77340387d8 100644
--- a/src/plugins/platforms/windows/qwindowsintegration.cpp
+++ b/src/plugins/platforms/windows/qwindowsintegration.cpp
@@ -48,6 +48,9 @@
 #include "qwindowsscreen.h"
 #include "qwindowstheme.h"
 #include "qwindowsservices.h"
+#ifdef QT_USE_DIRECTWRITE3
+#include <QtFontDatabaseSupport/private/qwindowsdirectwritefontdatabase_p.h>
+#endif
 #ifndef QT_NO_FREETYPE
 #  include <QtFontDatabaseSupport/private/qwindowsfontdatabase_ft_p.h>
 #endif
@@ -187,7 +190,9 @@ static inline unsigned parseOptions(const QStringList &paramList,
     unsigned options = 0;
     for (const QString &param : paramList) {
         if (param.startsWith(u"fontengine=")) {
-            if (param.endsWith(u"freetype")) {
+            if (param.endsWith(u"directwrite")) {
+                options |= QWindowsIntegration::FontDatabaseDirectWrite;
+            } else if (param.endsWith(u"freetype")) {
                 options |= QWindowsIntegration::FontDatabaseFreeType;
             } else if (param.endsWith(u"native")) {
                 options |= QWindowsIntegration::FontDatabaseNative;
@@ -504,14 +509,17 @@ QWindowsStaticOpenGLContext *QWindowsIntegration::staticOpenGLContext()
 QPlatformFontDatabase *QWindowsIntegration::fontDatabase() const
 {
     if (!d->m_fontDatabase) {
-#ifdef QT_NO_FREETYPE
-        d->m_fontDatabase = new QWindowsFontDatabase();
-#else // QT_NO_FREETYPE
+#ifdef QT_USE_DIRECTWRITE3
+        if (d->m_options & QWindowsIntegration::FontDatabaseDirectWrite)
+            d->m_fontDatabase = new QWindowsDirectWriteFontDatabase;
+        else
+#endif
+#ifndef QT_NO_FREETYPE
         if (d->m_options & QWindowsIntegration::FontDatabaseFreeType)
             d->m_fontDatabase = new QWindowsFontDatabaseFT;
         else
-            d->m_fontDatabase = new QWindowsFontDatabase;
 #endif // QT_NO_FREETYPE
+        d->m_fontDatabase = new QWindowsFontDatabase();
     }
     return d->m_fontDatabase;
 }
diff --git a/src/plugins/platforms/windows/qwindowsintegration.h b/src/plugins/platforms/windows/qwindowsintegration.h
index 1f16d13769..165472ad40 100644
--- a/src/plugins/platforms/windows/qwindowsintegration.h
+++ b/src/plugins/platforms/windows/qwindowsintegration.h
@@ -72,7 +72,8 @@ public:
         DetectAltGrModifier = 0x800,
         RtlEnabled = 0x1000,
         DarkModeWindowFrames = 0x2000,
-        DarkModeStyle = 0x4000
+        DarkModeStyle = 0x4000,
+        FontDatabaseDirectWrite = 0x8000
     };
 
     explicit QWindowsIntegration(const QStringList &paramList);
diff --git a/src/plugins/platforms/windows/qwindowsmime.cpp b/src/plugins/platforms/windows/qwindowsmime.cpp
index fe9e1fe31f..9bc79a10f9 100644
--- a/src/plugins/platforms/windows/qwindowsmime.cpp
+++ b/src/plugins/platforms/windows/qwindowsmime.cpp
@@ -149,7 +149,10 @@ static bool qt_write_dibv5(QDataStream &s, QImage image)
         return false;
 
     //depth will be always 32
-    int bpl_bmp = image.width()*4;
+    qsizetype bpl_bmp = qsizetype(image.width()) * 4;
+    qsizetype size = bpl_bmp * image.height();
+    if (qsizetype(DWORD(size)) != size)
+        return false;
 
     BMP_BITMAPV5HEADER bi;
     ZeroMemory(&bi, sizeof(bi));
@@ -261,11 +264,11 @@ static bool qt_read_dibv5(QDataStream &s, QImage &image)
     const int blue_shift = calc_shift(blue_mask);
     const int alpha_shift =  alpha_mask ? calc_shift(alpha_mask) : 0u;
 
-    const int  bpl = image.bytesPerLine();
+    const qsizetype  bpl = image.bytesPerLine();
     uchar *data = image.bits();
 
     auto *buf24 = new uchar[bpl];
-    const int bpl24 = ((w * nbits + 31) / 32) * 4;
+    const qsizetype bpl24 = ((qsizetype(w) * nbits + 31) / 32) * 4;
 
     while (--h >= 0) {
         QRgb *p = reinterpret_cast<QRgb *>(data + h * bpl);
diff --git a/src/plugins/platforms/windows/qwindowswindow.cpp b/src/plugins/platforms/windows/qwindowswindow.cpp
index 21b736f62e..e635463951 100644
--- a/src/plugins/platforms/windows/qwindowswindow.cpp
+++ b/src/plugins/platforms/windows/qwindowswindow.cpp
@@ -269,7 +269,7 @@ QDebug operator<<(QDebug d, const GUID &guid)
 
 static void formatBriefRectangle(QDebug &d, const QRect &r)
 {
-    d << r.width() << 'x' << r.height() << forcesign << r.x() << r.y() << noforcesign;
+    d << r.width() << 'x' << r.height() << Qt::forcesign << r.x() << r.y() << Qt::noforcesign;
 }
 
 static void formatBriefMargins(QDebug &d, const QMargins &m)
@@ -929,7 +929,7 @@ QMargins QWindowsGeometryHint::frameOnPrimaryScreen(DWORD style, DWORD exStyle)
     const QMargins result(qAbs(rect.left), qAbs(rect.top),
                           qAbs(rect.right), qAbs(rect.bottom));
     qCDebug(lcQpaWindows).nospace() << __FUNCTION__ << " style="
-        << showbase << hex << style << " exStyle=" << exStyle << dec << noshowbase
+        << Qt::showbase << Qt::hex << style << " exStyle=" << exStyle << Qt::dec << Qt::noshowbase
         << ' ' << rect << ' ' << result;
     return result;
 }
diff --git a/src/plugins/platforms/windows/windows.pro b/src/plugins/platforms/windows/windows.pro
index 50a3bb41a9..b14969cc3a 100644
--- a/src/plugins/platforms/windows/windows.pro
+++ b/src/plugins/platforms/windows/windows.pro
@@ -5,9 +5,13 @@ QT += \
     eventdispatcher_support-private \
     fontdatabase_support-private theme_support-private
 
+qtHaveModule(platformcompositor_support-private): QT += platformcompositor_support-private
+
 qtConfig(accessibility): QT += accessibility_support-private
 qtConfig(vulkan): QT += vulkan_support-private
 
+qtConfig(directwrite3): DEFINES *= QT_USE_DIRECTWRITE2 QT_USE_DIRECTWRITE3
+
 LIBS += -ldwmapi
 QMAKE_USE_PRIVATE += gdi32
 
diff --git a/src/plugins/platforms/winrt/qwinrtintegration.cpp b/src/plugins/platforms/winrt/qwinrtintegration.cpp
index 27d3746933..dd8cd80fd9 100644
--- a/src/plugins/platforms/winrt/qwinrtintegration.cpp
+++ b/src/plugins/platforms/winrt/qwinrtintegration.cpp
@@ -53,6 +53,9 @@
 #if QT_CONFIG(accessibility)
 #  include "uiautomation/qwinrtuiaaccessibility.h"
 #endif
+#if QT_CONFIG(opengl)
+#include <QtPlatformCompositorSupport/qpa/qplatformbackingstoreopenglsupport.h>
+#endif
 
 #include <QtGui/QOffscreenSurface>
 #include <QtGui/QOpenGLContext>
@@ -205,7 +208,11 @@ QPlatformWindow *QWinRTIntegration::createPlatformWindow(QWindow *window) const
 
 QPlatformBackingStore *QWinRTIntegration::createPlatformBackingStore(QWindow *window) const
 {
-    return new QWinRTBackingStore(window);
+    auto *backingStore = new QWinRTBackingStore(window);
+#if QT_CONFIG(opengl)
+    backingStore->setOpenGLSupport(new QPlatformBackingStoreOpenGLSupport(backingStore));
+#endif
+    return backingStore;
 }
 
 QPlatformOpenGLContext *QWinRTIntegration::createPlatformOpenGLContext(QOpenGLContext *context) const
diff --git a/src/plugins/platforms/winrt/winrt.pro b/src/plugins/platforms/winrt/winrt.pro
index 43dc8f074c..7ac49f73c4 100644
--- a/src/plugins/platforms/winrt/winrt.pro
+++ b/src/plugins/platforms/winrt/winrt.pro
@@ -6,6 +6,8 @@ QT += \
     core-private gui-private \
     fontdatabase_support-private egl_support-private
 
+qtHaveModule(platformcompositor_support-private): QT += platformcompositor_support-private
+
 DEFINES *= QT_NO_CAST_FROM_ASCII __WRL_NO_DEFAULT_LIB__
 
 QMAKE_USE_PRIVATE += d3d11 ws2_32
diff --git a/src/plugins/platforms/xcb/.prev_CMakeLists.txt b/src/plugins/platforms/xcb/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..85290fae84
--- /dev/null
+++ b/src/plugins/platforms/xcb/.prev_CMakeLists.txt
@@ -0,0 +1,167 @@
+# Generated from xcb.pro.
+
+#####################################################################
+## XcbQpa Module:
+#####################################################################
+
+qt_add_module(XcbQpa
+    INTERNAL_MODULE
+    NO_MODULE_HEADERS
+    SOURCES
+        gl_integrations/qxcbglintegration.cpp gl_integrations/qxcbglintegration.h
+        gl_integrations/qxcbglintegrationfactory.cpp gl_integrations/qxcbglintegrationfactory.h
+        gl_integrations/qxcbglintegrationplugin.h
+        gl_integrations/qxcbnativeinterfacehandler.cpp gl_integrations/qxcbnativeinterfacehandler.h
+        qxcbatom.cpp qxcbatom.h
+        qxcbbackingstore.cpp qxcbbackingstore.h
+        qxcbclipboard.cpp qxcbclipboard.h
+        qxcbconnection.cpp qxcbconnection.h
+        qxcbconnection_basic.cpp qxcbconnection_basic.h
+        qxcbconnection_screens.cpp
+        qxcbconnection_xi2.cpp
+        qxcbcursor.cpp qxcbcursor.h
+        qxcbeventdispatcher.cpp qxcbeventdispatcher.h
+        qxcbeventqueue.cpp qxcbeventqueue.h
+        qxcbimage.cpp qxcbimage.h
+        qxcbintegration.cpp qxcbintegration.h
+        qxcbkeyboard.cpp qxcbkeyboard.h
+        qxcbmime.cpp qxcbmime.h
+        qxcbnativeinterface.cpp qxcbnativeinterface.h
+        qxcbobject.h
+        qxcbscreen.cpp qxcbscreen.h
+        qxcbsystemtraytracker.cpp qxcbsystemtraytracker.h
+        qxcbwindow.cpp qxcbwindow.h
+        qxcbwmsupport.cpp qxcbwmsupport.h
+        qxcbxsettings.cpp qxcbxsettings.h
+    DEFINES
+        QT_BUILD_XCB_PLUGIN
+        QT_NO_FOREACH
+    INCLUDE_DIRECTORIES
+        gl_integrations
+    PUBLIC_LIBRARIES
+        PkgConfig::XKB_COMMON_X11
+        Qt::CorePrivate
+        Qt::EdidSupportPrivate
+        Qt::FontDatabaseSupportPrivate
+        Qt::GuiPrivate
+        Qt::ServiceSupportPrivate
+        Qt::ThemeSupportPrivate
+        Qt::XkbCommonSupportPrivate
+        XCB::ICCCM
+        XCB::IMAGE
+        XCB::KEYSYMS
+        XCB::RANDR
+        XCB::RENDER
+        XCB::RENDERUTIL
+        XCB::SHAPE
+        XCB::SHM
+        XCB::SYNC
+        XCB::XCB
+        XCB::XFIXES
+        XCB::XINERAMA
+        XCB::XINPUT
+        XCB::XKB
+        XKB::XKB
+)
+
+## Scopes:
+#####################################################################
+
+qt_extend_target(XcbQpa CONDITION TARGET Qt::PlatformCompositorSupportPrivate
+    PUBLIC_LIBRARIES
+        Qt::PlatformCompositorSupportPrivate
+)
+
+qt_extend_target(XcbQpa CONDITION TARGET Qt::LinuxAccessibilitySupportPrivate
+    PUBLIC_LIBRARIES
+        Qt::LinuxAccessibilitySupportPrivate
+)
+
+qt_extend_target(XcbQpa CONDITION QT_FEATURE_vulkan
+    SOURCES
+        qxcbvulkaninstance.cpp qxcbvulkaninstance.h
+        qxcbvulkanwindow.cpp qxcbvulkanwindow.h
+    PUBLIC_LIBRARIES
+        Qt::VulkanSupportPrivate
+)
+
+qt_extend_target(XcbQpa CONDITION QT_FEATURE_glib
+    LIBRARIES
+        GLIB2::GLIB2
+)
+
+qt_extend_target(XcbQpa CONDITION QT_FEATURE_draganddrop
+    SOURCES
+        qxcbdrag.cpp qxcbdrag.h
+)
+
+qt_extend_target(XcbQpa CONDITION QT_FEATURE_xcb_xlib
+    PUBLIC_LIBRARIES
+        X11::XCB
+)
+
+qt_extend_target(XcbQpa CONDITION QT_FEATURE_xcb_sm
+    SOURCES
+        qxcbsessionmanager.cpp qxcbsessionmanager.h
+    PUBLIC_LIBRARIES
+        ${X11_SM_LIB} ${X11_ICE_LIB}
+)
+
+qt_extend_target(XcbQpa CONDITION QT_FEATURE_dlopen
+    PUBLIC_LIBRARIES
+        ${CMAKE_DL_LIBS}
+)
+
+qt_extend_target(XcbQpa CONDITION CLANG AND NOT ICC
+    COMPILE_OPTIONS
+        -ftemplate-depth=1024
+)
+
+qt_extend_target(XcbQpa CONDITION QT_FEATURE_xcb_native_painting
+    SOURCES
+        nativepainting/qbackingstore_x11.cpp nativepainting/qbackingstore_x11_p.h
+        nativepainting/qcolormap_x11.cpp nativepainting/qcolormap_x11_p.h
+        nativepainting/qpaintengine_x11.cpp nativepainting/qpaintengine_x11_p.h
+        nativepainting/qpixmap_x11.cpp nativepainting/qpixmap_x11_p.h
+        nativepainting/qt_x11_p.h
+        nativepainting/qtessellator.cpp nativepainting/qtessellator_p.h
+        nativepainting/qxcbnativepainting.cpp nativepainting/qxcbnativepainting.h
+    INCLUDE_DIRECTORIES
+        nativepainting
+)
+
+qt_extend_target(XcbQpa CONDITION QT_FEATURE_xcb_native_painting AND QT_FEATURE_xrender
+    PUBLIC_LIBRARIES
+        PkgConfig::XRender
+)
+
+qt_extend_target(XcbQpa CONDITION QT_FEATURE_fontconfig AND QT_FEATURE_xcb_native_painting
+    LIBRARIES
+        WrapFreetype::WrapFreetype
+)
+#####################################################################
+## QXcbIntegrationPlugin Plugin:
+#####################################################################
+
+qt_add_plugin(QXcbIntegrationPlugin
+    OUTPUT_NAME qxcb
+    TYPE platforms
+    SOURCES
+        qxcbmain.cpp
+    DEFINES
+        QT_NO_FOREACH
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::GuiPrivate
+        Qt::XcbQpaPrivate
+)
+
+#### Keys ignored in scope 20:.:.:xcb-plugin.pro:<TRUE>:
+# OTHER_FILES = "xcb.json" "README"
+
+## Scopes:
+#####################################################################
+
+#### Keys ignored in scope 22:.:.:xcb-plugin.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN:
+# PLUGIN_EXTENDS = "-"
+add_subdirectory(gl_integrations)
diff --git a/src/plugins/platforms/xcb/CMakeLists.txt b/src/plugins/platforms/xcb/CMakeLists.txt
new file mode 100644
index 0000000000..a7cb58ba29
--- /dev/null
+++ b/src/plugins/platforms/xcb/CMakeLists.txt
@@ -0,0 +1,193 @@
+# Generated from xcb.pro.
+
+#####################################################################
+## XcbQpa Module:
+#####################################################################
+
+qt_add_module(XcbQpa
+    INTERNAL_MODULE
+    NO_MODULE_HEADERS
+    SOURCES
+        gl_integrations/qxcbglintegration.cpp gl_integrations/qxcbglintegration.h
+        gl_integrations/qxcbglintegrationfactory.cpp gl_integrations/qxcbglintegrationfactory.h
+        gl_integrations/qxcbglintegrationplugin.h
+        gl_integrations/qxcbnativeinterfacehandler.cpp gl_integrations/qxcbnativeinterfacehandler.h
+        qxcbatom.cpp qxcbatom.h
+        qxcbbackingstore.cpp qxcbbackingstore.h
+        qxcbclipboard.cpp qxcbclipboard.h
+        qxcbconnection.cpp qxcbconnection.h
+        qxcbconnection_basic.cpp qxcbconnection_basic.h
+        qxcbconnection_screens.cpp
+        qxcbconnection_xi2.cpp
+        qxcbcursor.cpp qxcbcursor.h
+        qxcbeventdispatcher.cpp qxcbeventdispatcher.h
+        qxcbeventqueue.cpp qxcbeventqueue.h
+        qxcbimage.cpp qxcbimage.h
+        qxcbintegration.cpp qxcbintegration.h
+        qxcbkeyboard.cpp qxcbkeyboard.h
+        qxcbmime.cpp qxcbmime.h
+        qxcbnativeinterface.cpp qxcbnativeinterface.h
+        qxcbobject.h
+        qxcbscreen.cpp qxcbscreen.h
+        qxcbsystemtraytracker.cpp qxcbsystemtraytracker.h
+        qxcbwindow.cpp qxcbwindow.h
+        qxcbwmsupport.cpp qxcbwmsupport.h
+        qxcbxsettings.cpp qxcbxsettings.h
+    DEFINES
+        QT_BUILD_XCB_PLUGIN
+        QT_NO_FOREACH
+    INCLUDE_DIRECTORIES
+        gl_integrations
+    PUBLIC_LIBRARIES
+        PkgConfig::XKB_COMMON_X11
+        Qt::CorePrivate
+        Qt::EdidSupportPrivate
+        Qt::FontDatabaseSupportPrivate
+        Qt::GuiPrivate
+        Qt::ServiceSupportPrivate
+        Qt::ThemeSupportPrivate
+        Qt::XkbCommonSupportPrivate
+        XCB::ICCCM
+        XCB::IMAGE
+        XCB::KEYSYMS
+        XCB::RANDR
+        XCB::RENDER
+        XCB::RENDERUTIL
+        XCB::SHAPE
+        XCB::SHM
+        XCB::SYNC
+        XCB::XCB
+        XCB::XFIXES
+        XCB::XINERAMA
+        $<$<TARGET_EXISTS:XCB::XINPUT>:XCB::XINPUT> # special case
+        XCB::XKB
+        XKB::XKB
+)
+
+## Scopes:
+#####################################################################
+
+qt_extend_target(XcbQpa CONDITION TARGET Qt::PlatformCompositorSupportPrivate
+    PUBLIC_LIBRARIES
+        Qt::PlatformCompositorSupportPrivate
+)
+
+qt_extend_target(XcbQpa CONDITION TARGET Qt::LinuxAccessibilitySupportPrivate
+    PUBLIC_LIBRARIES
+        Qt::LinuxAccessibilitySupportPrivate
+)
+
+qt_extend_target(XcbQpa CONDITION QT_FEATURE_vulkan
+    SOURCES
+        qxcbvulkaninstance.cpp qxcbvulkaninstance.h
+        qxcbvulkanwindow.cpp qxcbvulkanwindow.h
+    PUBLIC_LIBRARIES
+        Qt::VulkanSupportPrivate
+)
+
+qt_extend_target(XcbQpa CONDITION QT_FEATURE_glib
+    LIBRARIES
+        GLIB2::GLIB2
+)
+
+qt_extend_target(XcbQpa CONDITION QT_FEATURE_draganddrop
+    SOURCES
+        qxcbdrag.cpp qxcbdrag.h
+)
+
+qt_extend_target(XcbQpa CONDITION QT_FEATURE_xcb_xlib
+    PUBLIC_LIBRARIES
+        X11::XCB
+        # special case begin
+        # 'QMAKE_USE += xcb_xlib' in qmake implies also += xlib (aka X11)
+        # due to "use": "xcb xlib" in src/gui/configure.json.
+        # That's not yet handled by the conversion scripts unfortunately.
+        X11::X11
+        # special case end
+)
+
+qt_extend_target(XcbQpa CONDITION QT_FEATURE_xcb_sm
+    SOURCES
+        qxcbsessionmanager.cpp qxcbsessionmanager.h
+    PUBLIC_LIBRARIES
+        ${X11_SM_LIB} ${X11_ICE_LIB}
+)
+
+qt_extend_target(XcbQpa CONDITION QT_FEATURE_dlopen
+    PUBLIC_LIBRARIES
+        ${CMAKE_DL_LIBS}
+)
+
+qt_extend_target(XcbQpa CONDITION CLANG AND NOT ICC
+    COMPILE_OPTIONS
+        -ftemplate-depth=1024
+)
+
+qt_extend_target(XcbQpa CONDITION QT_FEATURE_xcb_native_painting
+    SOURCES
+        nativepainting/qbackingstore_x11.cpp nativepainting/qbackingstore_x11_p.h
+        nativepainting/qcolormap_x11.cpp nativepainting/qcolormap_x11_p.h
+        nativepainting/qpaintengine_x11.cpp nativepainting/qpaintengine_x11_p.h
+        nativepainting/qpixmap_x11.cpp nativepainting/qpixmap_x11_p.h
+        nativepainting/qt_x11_p.h
+        nativepainting/qtessellator.cpp nativepainting/qtessellator_p.h
+        nativepainting/qxcbnativepainting.cpp nativepainting/qxcbnativepainting.h
+    INCLUDE_DIRECTORIES
+        nativepainting
+)
+
+qt_extend_target(XcbQpa CONDITION QT_FEATURE_xcb_native_painting AND QT_FEATURE_xrender
+    PUBLIC_LIBRARIES
+        PkgConfig::XRender
+)
+
+qt_extend_target(XcbQpa CONDITION QT_FEATURE_fontconfig AND QT_FEATURE_xcb_native_painting
+    LIBRARIES
+        WrapFreetype::WrapFreetype
+)
+
+# special case begin
+if (NOT QT_FEATURE_system_xcb_input)
+    set(xinput_source "${PROJECT_SOURCE_DIR}/src/3rdparty/xcb/libxcb/xinput.c")
+    set_source_files_properties(
+        "${xinput_source}"
+        PROPERTIES COMPILE_OPTIONS "-w"
+    )
+    target_sources(XcbQpa PRIVATE "${xinput_source}")
+    target_include_directories(XcbQpa PRIVATE
+        "${PROJECT_SOURCE_DIR}/src/3rdparty/xcb/include"
+    )
+endif()
+# special case end
+
+#####################################################################
+## QXcbIntegrationPlugin Plugin:
+#####################################################################
+
+qt_add_plugin(QXcbIntegrationPlugin
+    OUTPUT_NAME qxcb
+    TYPE platforms
+    DEFAULT_IF ${QT_QPA_DEFAULT_PLATFORM} MATCHES xcb # special case
+    SOURCES
+        qxcbmain.cpp
+    DEFINES
+        QT_NO_FOREACH
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::GuiPrivate
+        Qt::XcbQpaPrivate
+)
+
+#### Keys ignored in scope 20:.:.:xcb-plugin.pro:<TRUE>:
+# OTHER_FILES = "xcb.json" "README"
+
+## Scopes:
+#####################################################################
+
+#### Keys ignored in scope 22:.:.:xcb-plugin.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN:
+# PLUGIN_EXTENDS = "-"
+add_subdirectory(gl_integrations)
+if(OFF)
+    add_subdirectory(xcb-static) # special case TODO: xcb-static sub folder
+endif()
+
diff --git a/src/plugins/platforms/xcb/gl_integrations/CMakeLists.txt b/src/plugins/platforms/xcb/gl_integrations/CMakeLists.txt
new file mode 100644
index 0000000000..210a924550
--- /dev/null
+++ b/src/plugins/platforms/xcb/gl_integrations/CMakeLists.txt
@@ -0,0 +1,8 @@
+# Generated from gl_integrations.pro.
+
+if(QT_FEATURE_xcb_egl_plugin)
+    add_subdirectory(xcb_egl)
+endif()
+if(QT_FEATURE_xcb_glx_plugin)
+    add_subdirectory(xcb_glx)
+endif()
diff --git a/src/plugins/platforms/xcb/gl_integrations/xcb_egl/CMakeLists.txt b/src/plugins/platforms/xcb/gl_integrations/xcb_egl/CMakeLists.txt
new file mode 100644
index 0000000000..a78d01ec87
--- /dev/null
+++ b/src/plugins/platforms/xcb/gl_integrations/xcb_egl/CMakeLists.txt
@@ -0,0 +1,28 @@
+# Generated from xcb_egl.pro.
+
+#####################################################################
+## QXcbEglIntegrationPlugin Plugin:
+#####################################################################
+
+qt_add_plugin(QXcbEglIntegrationPlugin
+    OUTPUT_NAME qxcb-egl-integration
+    TYPE xcbglintegrations
+    SOURCES
+        qxcbeglcontext.h
+        qxcbeglintegration.cpp qxcbeglintegration.h
+        qxcbeglmain.cpp
+        qxcbeglnativeinterfacehandler.cpp qxcbeglnativeinterfacehandler.h
+        qxcbeglwindow.cpp qxcbeglwindow.h
+    DEFINES
+        QT_NO_FOREACH
+    INCLUDE_DIRECTORIES
+        ..
+        ../..
+    PUBLIC_LIBRARIES
+        Qt::Core
+        Qt::CorePrivate
+        Qt::EglSupportPrivate
+        Qt::Gui
+        Qt::GuiPrivate
+        Qt::XcbQpaPrivate
+)
diff --git a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/CMakeLists.txt b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/CMakeLists.txt
new file mode 100644
index 0000000000..b3361dbd99
--- /dev/null
+++ b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/CMakeLists.txt
@@ -0,0 +1,41 @@
+# Generated from xcb_glx.pro.
+
+#####################################################################
+## QXcbGlxIntegrationPlugin Plugin:
+#####################################################################
+
+qt_add_plugin(QXcbGlxIntegrationPlugin
+    OUTPUT_NAME qxcb-glx-integration
+    TYPE xcbglintegrations
+    SOURCES
+        qglxintegration.cpp qglxintegration.h
+        qxcbglxintegration.cpp qxcbglxintegration.h
+        qxcbglxmain.cpp
+        qxcbglxnativeinterfacehandler.cpp qxcbglxnativeinterfacehandler.h
+        qxcbglxwindow.cpp qxcbglxwindow.h
+    DEFINES
+        QT_NO_FOREACH
+    INCLUDE_DIRECTORIES
+        ..
+        ../..
+    PUBLIC_LIBRARIES
+        Qt::Core
+        Qt::CorePrivate
+        Qt::GlxSupportPrivate
+        Qt::Gui
+        Qt::GuiPrivate
+        Qt::XcbQpaPrivate
+)
+
+## Scopes:
+#####################################################################
+
+qt_extend_target(QXcbGlxIntegrationPlugin CONDITION QT_FEATURE_xcb_glx
+    PUBLIC_LIBRARIES
+        XCB::GLX
+)
+
+qt_extend_target(QXcbGlxIntegrationPlugin CONDITION QT_FEATURE_dlopen AND NOT static
+    PUBLIC_LIBRARIES
+        ${CMAKE_DL_LIBS}
+)
diff --git a/src/plugins/platforms/xcb/nativepainting/qpaintengine_x11.cpp b/src/plugins/platforms/xcb/nativepainting/qpaintengine_x11.cpp
index 82b6d60bcd..7bf2b38d7d 100644
--- a/src/plugins/platforms/xcb/nativepainting/qpaintengine_x11.cpp
+++ b/src/plugins/platforms/xcb/nativepainting/qpaintengine_x11.cpp
@@ -2016,7 +2016,7 @@ Q_GUI_EXPORT void qt_x11_drawImage(const QRect &rect, const QPoint &pos, const Q
         || (image_byte_order == LSBFirst && bgr_layout))
     {
         im = image.copy(rect);
-        const int iw = im.bytesPerLine() / 4;
+        const qsizetype iw = im.bytesPerLine() / 4;
         uint *data = (uint *)im.bits();
         for (int i=0; i < h; i++) {
             uint *p = data;
diff --git a/src/plugins/platforms/xcb/nativepainting/qpixmap_x11.cpp b/src/plugins/platforms/xcb/nativepainting/qpixmap_x11.cpp
index f86bedbdcd..467e93e64f 100644
--- a/src/plugins/platforms/xcb/nativepainting/qpixmap_x11.cpp
+++ b/src/plugins/platforms/xcb/nativepainting/qpixmap_x11.cpp
@@ -1747,7 +1747,7 @@ XID QX11PlatformPixmap::createBitmapFromImage(const QImage &image)
     int w = img.width();
     int h = img.height();
     int bpl = (w + 7) / 8;
-    int ibpl = img.bytesPerLine();
+    qsizetype ibpl = img.bytesPerLine();
     if (bpl != ibpl) {
         tmp_bits = new uchar[bpl*h];
         bits = (char *)tmp_bits;
@@ -2017,7 +2017,7 @@ QImage QX11PlatformPixmap::toImage(const QXImageWrapper &xiWrapper, const QRect
         }
     } else if (xi->bits_per_pixel == d) {        // compatible depth
         char *xidata = xi->data;                // copy each scanline
-        int bpl = qMin(int(image.bytesPerLine()),xi->bytes_per_line);
+        qsizetype bpl = qMin(image.bytesPerLine(),xi->bytes_per_line);
         for (int y=0; y<xi->height; y++) {
             memcpy(image.scanLine(y), xidata, bpl);
             xidata += xi->bytes_per_line;
@@ -2038,10 +2038,10 @@ QImage QX11PlatformPixmap::toImage(const QXImageWrapper &xiWrapper, const QRect
         uchar *end;
         uchar  use[256];                        // pixel-in-use table
         uchar  pix[256];                        // pixel translation table
-        int    ncols, bpl;
+        int    ncols;
         memset(use, 0, 256);
         memset(pix, 0, 256);
-        bpl = image.bytesPerLine();
+        qsizetype bpl = image.bytesPerLine();
 
         if (x11_mask) {                         // which pixels are used?
             for (int i = 0; i < xi->height; i++) {
diff --git a/src/plugins/platforms/xcb/qxcbbackingstore.cpp b/src/plugins/platforms/xcb/qxcbbackingstore.cpp
index 8f55bc2e96..7330c3c9a3 100644
--- a/src/plugins/platforms/xcb/qxcbbackingstore.cpp
+++ b/src/plugins/platforms/xcb/qxcbbackingstore.cpp
@@ -537,7 +537,7 @@ void QXcbBackingStoreImage::ensureGC(xcb_drawable_t dst)
 static inline void copy_unswapped(char *dst, int dstBytesPerLine, const QImage &img, const QRect &rect)
 {
     const uchar *srcData = img.constBits();
-    const int srcBytesPerLine = img.bytesPerLine();
+    const qsizetype srcBytesPerLine = img.bytesPerLine();
 
     const int leftOffset = rect.left() * img.depth() >> 3;
     const int bottom = rect.bottom() + 1;
@@ -553,7 +553,7 @@ template <class Pixel>
 static inline void copy_swapped(char *dst, const int dstStride, const QImage &img, const QRect &rect)
 {
     const uchar *srcData = img.constBits();
-    const int srcBytesPerLine = img.bytesPerLine();
+    const qsizetype srcBytesPerLine = img.bytesPerLine();
 
     const int left = rect.left();
     const int width = rect.width();
diff --git a/src/plugins/platforms/xcb/qxcbeventqueue.cpp b/src/plugins/platforms/xcb/qxcbeventqueue.cpp
index 759ee3cc95..f0cb5edd2a 100644
--- a/src/plugins/platforms/xcb/qxcbeventqueue.cpp
+++ b/src/plugins/platforms/xcb/qxcbeventqueue.cpp
@@ -62,8 +62,8 @@ static bool dispatcherOwnerDestructing = false;
     when accessing the tail node. It does not dequeue the last node and does not
     access (read or write) the tail node's 'next' member. This lets the reader
     add more items at the same time as the main thread is dequeuing nodes from
-    the head. A custom linked list implementation is used, because QLinkedList
-    does not have any thread-safety guarantees and the custom list is more
+    the head. A custom linked list implementation is used, because std::list
+    does not have any thread-safety guarantees. The custom list is
     lightweight - no reference counting, back links, etc.
 
     Memory management:
diff --git a/src/plugins/platforms/xcb/qxcbeventqueue.h b/src/plugins/platforms/xcb/qxcbeventqueue.h
index 11d0b8e963..e7327b3fd6 100644
--- a/src/plugins/platforms/xcb/qxcbeventqueue.h
+++ b/src/plugins/platforms/xcb/qxcbeventqueue.h
@@ -49,6 +49,7 @@
 #include <xcb/xcb.h>
 
 #include <atomic>
+#include <limits>
 
 QT_BEGIN_NAMESPACE
 
@@ -106,7 +107,7 @@ public:
     bool peekEventQueue(PeekerCallback peeker, void *peekerData = nullptr,
                         PeekOptions option = PeekDefault, qint32 peekerId = -1);
 
-    void waitForNewEvents(unsigned long time = ULONG_MAX);
+    void waitForNewEvents(unsigned long time = std::numeric_limits<unsigned long>::max());
 
 private:
     QXcbEventNode *qXcbEventNodeFactory(xcb_generic_event_t *event);
diff --git a/src/plugins/platforms/xcb/qxcbimage.cpp b/src/plugins/platforms/xcb/qxcbimage.cpp
index b0e610dd51..5b5c37fac4 100644
--- a/src/plugins/platforms/xcb/qxcbimage.cpp
+++ b/src/plugins/platforms/xcb/qxcbimage.cpp
@@ -212,7 +212,7 @@ xcb_pixmap_t qt_xcb_XPixmapFromBitmap(QXcbScreen *screen, const QImage &image)
     }
     const int width = bitmap.width();
     const int height = bitmap.height();
-    const int bytesPerLine = bitmap.bytesPerLine();
+    const qsizetype bytesPerLine = bitmap.bytesPerLine();
     int destLineSize = width / 8;
     if (width % 8)
         ++destLineSize;
diff --git a/src/plugins/platforms/xcb/qxcbintegration.cpp b/src/plugins/platforms/xcb/qxcbintegration.cpp
index 3fd989e1f9..cea0511822 100644
--- a/src/plugins/platforms/xcb/qxcbintegration.cpp
+++ b/src/plugins/platforms/xcb/qxcbintegration.cpp
@@ -61,6 +61,9 @@
 
 #include <QtFontDatabaseSupport/private/qgenericunixfontdatabase_p.h>
 #include <QtServiceSupport/private/qgenericunixservices_p.h>
+#if QT_CONFIG(opengl)
+#include <QtPlatformCompositorSupport/qpa/qplatformbackingstoreopenglsupport.h>
+#endif
 
 #include <stdio.h>
 
@@ -288,16 +291,23 @@ QPlatformOpenGLContext *QXcbIntegration::createPlatformOpenGLContext(QOpenGLCont
 
 QPlatformBackingStore *QXcbIntegration::createPlatformBackingStore(QWindow *window) const
 {
-    const bool isTrayIconWindow = QXcbWindow::isTrayIconWindow(window);
-    if (isTrayIconWindow)
-        return new QXcbSystemTrayBackingStore(window);
+    QPlatformBackingStore *backingStore = nullptr;
 
+    const bool isTrayIconWindow = QXcbWindow::isTrayIconWindow(window);
+    if (isTrayIconWindow) {
+        backingStore = new QXcbSystemTrayBackingStore(window);
 #if QT_CONFIG(xcb_native_painting)
-    if (nativePaintingEnabled())
-        return new QXcbNativeBackingStore(window);
+    } else if (nativePaintingEnabled()) {
+        backingStore = new QXcbNativeBackingStore(window);
 #endif
-
-    return new QXcbBackingStore(window);
+    } else {
+        backingStore = new QXcbBackingStore(window);
+    }
+    Q_ASSERT(backingStore);
+#ifndef QT_NO_OPENGL
+    backingStore->setOpenGLSupport(new QPlatformBackingStoreOpenGLSupport(backingStore));
+#endif
+    return backingStore;
 }
 
 QPlatformOffscreenSurface *QXcbIntegration::createPlatformOffscreenSurface(QOffscreenSurface *surface) const
diff --git a/src/plugins/platforms/xcb/xcb_qpa_lib.pro b/src/plugins/platforms/xcb/xcb_qpa_lib.pro
index a5d05faa9c..1f651e7697 100644
--- a/src/plugins/platforms/xcb/xcb_qpa_lib.pro
+++ b/src/plugins/platforms/xcb/xcb_qpa_lib.pro
@@ -9,6 +9,9 @@ QT += \
     edid_support-private \
     xkbcommon_support-private
 
+qtHaveModule(platformcompositor_support-private): \
+    QT += platformcompositor_support-private
+
 qtHaveModule(linuxaccessibility_support-private): \
     QT += linuxaccessibility_support-private
 
diff --git a/src/plugins/platformthemes/CMakeLists.txt b/src/plugins/platformthemes/CMakeLists.txt
new file mode 100644
index 0000000000..6aa17c234c
--- /dev/null
+++ b/src/plugins/platformthemes/CMakeLists.txt
@@ -0,0 +1,8 @@
+# Generated from platformthemes.pro.
+
+if(QT_FEATURE_dbus AND QT_FEATURE_mimetype AND QT_FEATURE_regularexpression)
+    add_subdirectory(xdgdesktopportal)
+endif()
+if(QT_FEATURE_gtk3 AND TARGET Qt::Widgets)
+    add_subdirectory(gtk3)
+endif()
diff --git a/src/plugins/platformthemes/gtk3/.prev_CMakeLists.txt b/src/plugins/platformthemes/gtk3/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..0784de2ca8
--- /dev/null
+++ b/src/plugins/platformthemes/gtk3/.prev_CMakeLists.txt
@@ -0,0 +1,27 @@
+# Generated from gtk3.pro.
+
+#####################################################################
+## QGtk3ThemePlugin Plugin:
+#####################################################################
+
+qt_add_plugin(QGtk3ThemePlugin
+    OUTPUT_NAME qgtk3
+    TYPE platformthemes
+    SOURCES
+        main.cpp
+        qgtk3dialoghelpers.cpp qgtk3dialoghelpers.h
+        qgtk3menu.cpp qgtk3menu.h
+        qgtk3theme.cpp qgtk3theme.h
+    DEFINES
+        GDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_6
+    PUBLIC_LIBRARIES
+        PkgConfig::GTK3
+        Qt::Core
+        Qt::CorePrivate
+        Qt::Gui
+        Qt::GuiPrivate
+        Qt::ThemeSupportPrivate
+)
+
+#### Keys ignored in scope 1:.:.:gtk3.pro:<TRUE>:
+# PLUGIN_EXTENDS = "-"
diff --git a/src/plugins/platformthemes/gtk3/CMakeLists.txt b/src/plugins/platformthemes/gtk3/CMakeLists.txt
new file mode 100644
index 0000000000..4e56e4a6b3
--- /dev/null
+++ b/src/plugins/platformthemes/gtk3/CMakeLists.txt
@@ -0,0 +1,32 @@
+# Generated from gtk3.pro.
+
+qt_find_package(GTK3) # special case
+qt_find_package(X11) # special case
+
+#####################################################################
+## QGtk3ThemePlugin Plugin:
+#####################################################################
+
+qt_add_plugin(QGtk3ThemePlugin
+    OUTPUT_NAME qgtk3
+    TYPE platformthemes
+    SOURCES
+        main.cpp
+        qgtk3dialoghelpers.cpp qgtk3dialoghelpers.h
+        qgtk3menu.cpp qgtk3menu.h
+        qgtk3theme.cpp qgtk3theme.h
+    DEFINES
+        GDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_6
+    LIBRARIES # special case
+        X11::X11 # special case
+    PUBLIC_LIBRARIES
+        PkgConfig::GTK3
+        Qt::Core
+        Qt::CorePrivate
+        Qt::Gui
+        Qt::GuiPrivate
+        Qt::ThemeSupportPrivate
+)
+
+#### Keys ignored in scope 1:.:.:gtk3.pro:<TRUE>:
+# PLUGIN_EXTENDS = "-"
diff --git a/src/plugins/platformthemes/xdgdesktopportal/CMakeLists.txt b/src/plugins/platformthemes/xdgdesktopportal/CMakeLists.txt
new file mode 100644
index 0000000000..a9062f695f
--- /dev/null
+++ b/src/plugins/platformthemes/xdgdesktopportal/CMakeLists.txt
@@ -0,0 +1,24 @@
+# Generated from xdgdesktopportal.pro.
+
+#####################################################################
+## QXdgDesktopPortalThemePlugin Plugin:
+#####################################################################
+
+qt_add_plugin(QXdgDesktopPortalThemePlugin
+    OUTPUT_NAME qxdgdesktopportal
+    TYPE platformthemes
+    SOURCES
+        main.cpp
+        qxdgdesktopportalfiledialog.cpp qxdgdesktopportalfiledialog_p.h
+        qxdgdesktopportaltheme.cpp qxdgdesktopportaltheme.h
+    PUBLIC_LIBRARIES
+        Qt::Core
+        Qt::CorePrivate
+        Qt::DBus
+        Qt::Gui
+        Qt::GuiPrivate
+        Qt::ThemeSupportPrivate
+)
+
+#### Keys ignored in scope 1:.:.:xdgdesktopportal.pro:<TRUE>:
+# PLUGIN_EXTENDS = "-"
diff --git a/src/plugins/printsupport/.prev_CMakeLists.txt b/src/plugins/printsupport/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..5853d82c6a
--- /dev/null
+++ b/src/plugins/printsupport/.prev_CMakeLists.txt
@@ -0,0 +1,11 @@
+# Generated from printsupport.pro.
+
+if(APPLE_OSX)
+    add_subdirectory(cocoa)
+endif()
+if(WIN32)
+    add_subdirectory(windows)
+endif()
+if(QT_FEATURE_cups AND UNIX AND NOT APPLE)
+    add_subdirectory(cups)
+endif()
diff --git a/src/plugins/printsupport/CMakeLists.txt b/src/plugins/printsupport/CMakeLists.txt
new file mode 100644
index 0000000000..22b753f5c0
--- /dev/null
+++ b/src/plugins/printsupport/CMakeLists.txt
@@ -0,0 +1,11 @@
+# Generated from printsupport.pro.
+
+if(APPLE_OSX)
+    add_subdirectory(cocoa)
+endif()
+if(WIN32)
+    # add_subdirectory(windows) # special case TODO
+endif()
+if(QT_FEATURE_cups AND UNIX AND NOT APPLE)
+    add_subdirectory(cups)
+endif()
diff --git a/src/plugins/printsupport/cocoa/CMakeLists.txt b/src/plugins/printsupport/cocoa/CMakeLists.txt
new file mode 100644
index 0000000000..72660dc173
--- /dev/null
+++ b/src/plugins/printsupport/cocoa/CMakeLists.txt
@@ -0,0 +1,22 @@
+# Generated from cocoa.pro.
+
+#####################################################################
+## QCocoaPrinterSupportPlugin Plugin:
+#####################################################################
+
+qt_add_plugin(QCocoaPrinterSupportPlugin
+    OUTPUT_NAME cocoaprintersupport
+    TYPE printsupport
+    SOURCES
+        main.cpp
+    PUBLIC_LIBRARIES
+        ${FWAppKit}
+        Qt::Core
+        Qt::Gui
+        Qt::GuiPrivate
+        Qt::PrintSupportPrivate
+)
+
+#### Keys ignored in scope 1:.:.:cocoa.pro:<TRUE>:
+# MODULE = "cocoaprintersupport"
+# OTHER_FILES = "cocoa.json"
diff --git a/src/plugins/printsupport/cups/.prev_CMakeLists.txt b/src/plugins/printsupport/cups/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..c65ffb89c7
--- /dev/null
+++ b/src/plugins/printsupport/cups/.prev_CMakeLists.txt
@@ -0,0 +1,30 @@
+# Generated from cups.pro.
+
+#####################################################################
+## QCupsPrinterSupportPlugin Plugin:
+#####################################################################
+
+qt_add_plugin(QCupsPrinterSupportPlugin
+    OUTPUT_NAME cupsprintersupport
+    TYPE printsupport
+    SOURCES
+        main.cpp
+        qcupsprintengine.cpp qcupsprintengine_p.h
+        qcupsprintersupport.cpp qcupsprintersupport_p.h
+        qppdprintdevice.cpp qppdprintdevice.h
+    INCLUDE_DIRECTORIES
+        ../../../printsupport/kernel
+    LIBRARIES
+        Cups::Cups
+    PUBLIC_LIBRARIES
+        Qt::Core
+        Qt::CorePrivate
+        Qt::Gui
+        Qt::GuiPrivate
+        Qt::PrintSupport
+        Qt::PrintSupportPrivate
+)
+
+#### Keys ignored in scope 1:.:.:cups.pro:<TRUE>:
+# MODULE = "cupsprintersupport"
+# OTHER_FILES = "cups.json"
diff --git a/src/plugins/printsupport/cups/CMakeLists.txt b/src/plugins/printsupport/cups/CMakeLists.txt
new file mode 100644
index 0000000000..5c920443ea
--- /dev/null
+++ b/src/plugins/printsupport/cups/CMakeLists.txt
@@ -0,0 +1,32 @@
+# Generated from cups.pro.
+
+qt_find_package(Cups PROVIDED_TARGETS Cups::Cups) # special case
+
+#####################################################################
+## QCupsPrinterSupportPlugin Plugin:
+#####################################################################
+
+qt_add_plugin(QCupsPrinterSupportPlugin
+    OUTPUT_NAME cupsprintersupport
+    TYPE printsupport
+    SOURCES
+        main.cpp
+        qcupsprintengine.cpp qcupsprintengine_p.h
+        qcupsprintersupport.cpp qcupsprintersupport_p.h
+        qppdprintdevice.cpp qppdprintdevice.h
+    INCLUDE_DIRECTORIES
+        ../../../printsupport/kernel
+    LIBRARIES
+        Cups::Cups
+    PUBLIC_LIBRARIES
+        Qt::Core
+        Qt::CorePrivate
+        Qt::Gui
+        Qt::GuiPrivate
+        Qt::PrintSupport
+        Qt::PrintSupportPrivate
+)
+
+#### Keys ignored in scope 1:.:.:cups.pro:<TRUE>:
+# MODULE = "cupsprintersupport"
+# OTHER_FILES = "cups.json"
diff --git a/src/plugins/sqldrivers/.prev_CMakeLists.txt b/src/plugins/sqldrivers/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..8752cf701f
--- /dev/null
+++ b/src/plugins/sqldrivers/.prev_CMakeLists.txt
@@ -0,0 +1,15 @@
+# Generated from sqldrivers.pro.
+
+cmake_minimum_required(VERSION 3.15.0)
+
+project(ldrivers_FIXME
+    VERSION 6.0.0
+    DESCRIPTION "Qt ldrivers_FIXME Libraries"
+    HOMEPAGE_URL "https://qt.io/"
+    LANGUAGES CXX C
+)
+
+find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS BuildInternals Core SET_ME_TO_SOMETHING_USEFUL)
+find_package(Qt6 ${PROJECT_VERSION} CONFIG OPTIONAL_COMPONENTS SET_ME_TO_SOMETHING_USEFUL)
+
+qt_build_repo()
diff --git a/src/plugins/sqldrivers/CMakeLists.txt b/src/plugins/sqldrivers/CMakeLists.txt
new file mode 100644
index 0000000000..d45f5712a8
--- /dev/null
+++ b/src/plugins/sqldrivers/CMakeLists.txt
@@ -0,0 +1,55 @@
+# Generated from sqldrivers.pro.
+
+# special case begin
+# Currently handled completely manually.
+
+# TODO sqldrivers_standalone {
+#     _QMAKE_CACHE_ = $$shadowed($$SQLDRV_SRC_TREE)/.qmake.conf
+#     load(qt_configure)
+# }
+
+qt_feature_module_begin(
+    NO_MODULE
+    PUBLIC_FILE "qtsqldrivers-config.h"
+    PRIVATE_FILE "qtsqldrivers-config_p.h"
+)
+include(configure.cmake)
+qt_feature_module_end(NO_MODULE)
+
+
+if(QT_FEATURE_sql_psql)
+    add_subdirectory(psql)
+endif()
+
+if(QT_FEATURE_sql_mysql)
+     add_subdirectory(mysql)
+endif()
+
+if(QT_FEATURE_sql_odbc)
+    add_subdirectory(odbc)
+endif()
+
+if(QT_FEATURE_sql_tds)
+#     TODO add_subdirectory(tds)
+endif()
+
+if(QT_FEATURE_sql_oci)
+    add_subdirectory(oci)
+endif()
+
+if(QT_FEATURE_sql_db2)
+    add_subdirectory(db2)
+endif()
+
+if(QT_FEATURE_sql_sqlite)
+    add_subdirectory(sqlite)
+endif()
+
+if(QT_FEATURE_sql_sqlite2)
+#     TODO add_subdirectory(sqlite2)
+endif()
+
+if(QT_FEATURE_sql_ibase)
+#     TODO add_subdirectory(ibase)
+endif()
+# special case end
diff --git a/src/plugins/sqldrivers/README b/src/plugins/sqldrivers/README
index 26418c5e36..7da95fe53c 100644
--- a/src/plugins/sqldrivers/README
+++ b/src/plugins/sqldrivers/README
@@ -1,4 +1,4 @@
-Please note that the DB2, MySQL, Oracle and TDS client drivers are not
+Please note that the DB2, MySQL and Oracle client drivers are not
 distributed with the Qt Open Source Editions.
 
 This is because the client libraries are distributed under a license which
diff --git a/src/plugins/sqldrivers/configure.cmake b/src/plugins/sqldrivers/configure.cmake
new file mode 100644
index 0000000000..7cf0763da1
--- /dev/null
+++ b/src/plugins/sqldrivers/configure.cmake
@@ -0,0 +1,50 @@
+
+
+#### Inputs
+
+
+
+#### Libraries
+
+qt_find_package(DB2 PROVIDED_TARGETS DB2::DB2)
+qt_find_package(MySQL PROVIDED_TARGETS MySQL::MySQL)
+qt_find_package(PostgreSQL PROVIDED_TARGETS PostgreSQL::PostgreSQL)
+qt_find_package(Oracle PROVIDED_TARGETS Oracle::OCI)
+qt_find_package(ODBC PROVIDED_TARGETS ODBC::ODBC)
+qt_find_package(SQLite3 PROVIDED_TARGETS SQLite::SQLite3)
+
+
+#### Tests
+
+
+
+#### Features
+
+qt_feature("sql-db2" PRIVATE
+    LABEL "DB2 (IBM)"
+    CONDITION DB2_FOUND
+)
+qt_feature("sql-ibase" PRIVATE
+    LABEL "InterBase"
+    CONDITION libs.ibase OR FIXME
+)
+qt_feature("sql-mysql" PRIVATE
+    LABEL "MySql"
+    CONDITION MySQL_FOUND
+)
+qt_feature("sql-oci" PRIVATE
+    LABEL "OCI (Oracle)"
+    CONDITION Oracle_FOUND
+)
+qt_feature("sql-odbc" PRIVATE
+    LABEL "ODBC"
+    CONDITION QT_FEATURE_datestring AND ODBC_FOUND
+)
+qt_feature("sql-psql" PRIVATE
+    LABEL "PostgreSQL"
+    CONDITION PostgreSQL_FOUND
+)
+qt_feature("sql-sqlite" PRIVATE
+    LABEL "SQLite"
+    CONDITION QT_FEATURE_datestring AND SQLite3_FOUND
+)
diff --git a/src/plugins/sqldrivers/configure.json b/src/plugins/sqldrivers/configure.json
index 28ccbeadcd..f738e58a00 100644
--- a/src/plugins/sqldrivers/configure.json
+++ b/src/plugins/sqldrivers/configure.json
@@ -7,9 +7,7 @@
 
     "commandline": {
         "assignments": {
-            "MYSQL_PATH": "mysql.prefix",
-            "SYBASE": "tds.prefix",
-            "SYBASE_LIBS": "tds.libs"
+            "MYSQL_PATH": "mysql.prefix"
         },
         "options": {
             "mysql_config": "string",
@@ -22,17 +20,13 @@
             "sql-odbc": "boolean",
             "sql-psql": "boolean",
             "sql-sqlite": "boolean",
-            "sql-sqlite2": "boolean",
-            "sql-tds": "boolean",
             "plugin-sql-db2": { "type": "void", "name": "sql-db2" },
             "plugin-sql-ibase": { "type": "void", "name": "sql-ibase" },
             "plugin-sql-mysql": { "type": "void", "name": "sql-mysql" },
             "plugin-sql-oci": { "type": "void", "name": "sql-oci" },
             "plugin-sql-odbc": { "type": "void", "name": "sql-odbc" },
             "plugin-sql-psql": { "type": "void", "name": "sql-psql" },
-            "plugin-sql-sqlite": { "type": "void", "name": "sql-sqlite" },
-            "plugin-sql-sqlite2": { "type": "void", "name": "sql-sqlite2" },
-            "plugin-sql-tds": { "type": "void", "name": "sql-tds" }
+            "plugin-sql-sqlite": { "type": "void", "name": "sql-sqlite" }
         }
     },
 
@@ -94,15 +88,6 @@
                 { "type": "psqlEnv", "libs": "-lpq", "condition": "!config.win32" }
             ]
         },
-        "tds": {
-            "label": "TDS (Sybase)",
-            "test": {},
-            "headers": [ "sybfront.h", "sybdb.h" ],
-            "sources": [
-                { "type": "sybaseEnv", "libs": "-lNTWDBLIB", "condition": "config.win32" },
-                { "type": "sybaseEnv", "libs": "-lsybdb", "condition": "!config.win32" }
-            ]
-        },
         "oci": {
             "label": "OCI (Oracle)",
             "test": {},
@@ -132,14 +117,6 @@
                 { "libs": "-lodbc", "condition": "!config.win32 && !config.darwin" }
             ]
         },
-        "sqlite2": {
-            "label": "SQLite (version 2)",
-            "test": {},
-            "headers": "sqlite.h",
-            "sources": [
-                "-lsqlite"
-            ]
-        },
         "sqlite3": {
             "label": "SQLite (version 3)",
             "export": "sqlite",
@@ -191,11 +168,6 @@
             "condition": "libs.psql",
             "output": [ "privateFeature" ]
         },
-        "sql-sqlite2": {
-            "label": "SQLite2",
-            "condition": "libs.sqlite2",
-            "output": [ "privateFeature" ]
-        },
         "sql-sqlite": {
             "label": "SQLite",
             "condition": "features.datestring",
@@ -206,11 +178,6 @@
             "autoDetect": false,
             "condition": "features.sql-sqlite && libs.sqlite3",
             "output": [ "privateFeature" ]
-        },
-        "sql-tds": {
-            "label": "TDS (Sybase)",
-            "condition": "features.datestring && libs.tds",
-            "output": [ "privateFeature" ]
         }
     },
 
@@ -218,9 +185,7 @@
         {
             "type": "warning",
             "condition": "config.win32 && !config.msvc && features.sql-oci",
-            "message": "Qt does not support compiling the Oracle database driver with
-MinGW, due to lack of such support from Oracle. Consider disabling the
-Oracle driver, as the current build will most likely fail."
+            "message": "Qt does not support compiling the Oracle database driver with MinGW, due to lack of such support from Oracle. Consider disabling the Oracle driver, as the current build will most likely fail."
         }
     ],
 
@@ -229,7 +194,7 @@ Oracle driver, as the current build will most likely fail."
             "section": "Qt Sql Drivers",
             "entries": [
                 "sql-db2", "sql-ibase", "sql-mysql", "sql-oci", "sql-odbc", "sql-psql",
-                "sql-sqlite2", "sql-sqlite", "system-sqlite", "sql-tds"
+                "sql-sqlite", "system-sqlite"
             ]
         }
     ]
diff --git a/src/plugins/sqldrivers/db2/CMakeLists.txt b/src/plugins/sqldrivers/db2/CMakeLists.txt
new file mode 100644
index 0000000000..637461e168
--- /dev/null
+++ b/src/plugins/sqldrivers/db2/CMakeLists.txt
@@ -0,0 +1,32 @@
+# Generated from db2.pro.
+
+#####################################################################
+## QDB2DriverPlugin Plugin:
+#####################################################################
+
+qt_add_plugin(QDB2DriverPlugin
+    OUTPUT_NAME qsqldb2
+    TYPE sqldrivers
+    SOURCES
+        main.cpp
+        qsql_db2.cpp qsql_db2_p.h
+    DEFINES
+        QT_NO_CAST_FROM_ASCII
+        QT_NO_CAST_TO_ASCII
+    PUBLIC_LIBRARIES
+        DB2::DB2
+        Qt::Core
+        Qt::CorePrivate
+        Qt::SqlPrivate
+)
+
+#### Keys ignored in scope 1:.:.:db2.pro:<TRUE>:
+# OTHER_FILES = "db2.json"
+
+## Scopes:
+#####################################################################
+
+qt_extend_target(QDB2DriverPlugin CONDITION (TEST_architecture_arch STREQUAL "x86_64")
+    DEFINES
+        ODBC64
+)
diff --git a/src/plugins/sqldrivers/ibase/qsql_ibase.cpp b/src/plugins/sqldrivers/ibase/qsql_ibase.cpp
index 0fa21f504c..fb364c21f5 100644
--- a/src/plugins/sqldrivers/ibase/qsql_ibase.cpp
+++ b/src/plugins/sqldrivers/ibase/qsql_ibase.cpp
@@ -1913,15 +1913,8 @@ void QIBaseDriver::qHandleEventNotification(void *updatedResultBuffer)
         isc_event_counts(counts, eBuffer->bufferLength, eBuffer->eventBuffer, eBuffer->resultBuffer);
         if (counts[0]) {
 
-            if (eBuffer->subscriptionState == QIBaseEventBuffer::Subscribed) {
-#if QT_DEPRECATED_SINCE(5, 15)
-QT_WARNING_PUSH
-QT_WARNING_DISABLE_DEPRECATED
-                emit notification(i.key());
-QT_WARNING_POP
-#endif
+            if (eBuffer->subscriptionState == QIBaseEventBuffer::Subscribed)
                 emit notification(i.key(), QSqlDriver::UnknownSource, QVariant());
-            }
             else if (eBuffer->subscriptionState == QIBaseEventBuffer::Starting)
                 eBuffer->subscriptionState = QIBaseEventBuffer::Subscribed;
 
diff --git a/src/plugins/sqldrivers/mysql/CMakeLists.txt b/src/plugins/sqldrivers/mysql/CMakeLists.txt
new file mode 100644
index 0000000000..c99f322dfb
--- /dev/null
+++ b/src/plugins/sqldrivers/mysql/CMakeLists.txt
@@ -0,0 +1,24 @@
+# Generated from mysql.pro.
+
+#####################################################################
+## QMYSQLDriverPlugin Plugin:
+#####################################################################
+
+qt_add_plugin(QMYSQLDriverPlugin
+    OUTPUT_NAME qsqlmysql
+    TYPE sqldrivers
+    SOURCES
+        main.cpp
+        qsql_mysql.cpp qsql_mysql_p.h
+    DEFINES
+        QT_NO_CAST_FROM_ASCII
+        QT_NO_CAST_TO_ASCII
+    PUBLIC_LIBRARIES
+        MySQL::MySQL
+        Qt::Core
+        Qt::CorePrivate
+        Qt::SqlPrivate
+)
+
+#### Keys ignored in scope 1:.:.:mysql.pro:<TRUE>:
+# OTHER_FILES = "mysql.json"
diff --git a/src/plugins/sqldrivers/mysql/main.cpp b/src/plugins/sqldrivers/mysql/main.cpp
index 4c6753097f..f7d56dd1c9 100644
--- a/src/plugins/sqldrivers/mysql/main.cpp
+++ b/src/plugins/sqldrivers/mysql/main.cpp
@@ -62,7 +62,6 @@ QMYSQLDriverPlugin::QMYSQLDriverPlugin()
 QSqlDriver* QMYSQLDriverPlugin::create(const QString &name)
 {
     if (name == QLatin1String("QMYSQL") ||
-        name == QLatin1String("QMYSQL3") ||
         name == QLatin1String("QMARIADB")) {
         QMYSQLDriver* driver = new QMYSQLDriver();
         return driver;
diff --git a/src/plugins/sqldrivers/mysql/mysql.json b/src/plugins/sqldrivers/mysql/mysql.json
index 89f5e65fb9..8fd3d727b1 100644
--- a/src/plugins/sqldrivers/mysql/mysql.json
+++ b/src/plugins/sqldrivers/mysql/mysql.json
@@ -1,3 +1,3 @@
 {
-    "Keys": [ "QMYSQL3", "QMYSQL", "QMARIADB" ]
+    "Keys": [ "QMYSQL", "QMARIADB" ]
 }
diff --git a/src/plugins/sqldrivers/mysql/qsql_mysql.cpp b/src/plugins/sqldrivers/mysql/qsql_mysql.cpp
index d3e37f11d6..4e2698760f 100644
--- a/src/plugins/sqldrivers/mysql/qsql_mysql.cpp
+++ b/src/plugins/sqldrivers/mysql/qsql_mysql.cpp
@@ -322,7 +322,7 @@ static QSqlError qMakeStmtError(const QString& err, QSqlError::ErrorType type,
                             MYSQL_STMT* stmt)
 {
     const char *cerr = mysql_stmt_error(stmt);
-    return QSqlError(QLatin1String("QMYSQL3: ") + err,
+    return QSqlError(QLatin1String("QMYSQL: ") + err,
                      QString::fromLatin1(cerr),
                      type, QString::number(mysql_stmt_errno(stmt)));
 }
diff --git a/src/plugins/sqldrivers/oci/CMakeLists.txt b/src/plugins/sqldrivers/oci/CMakeLists.txt
new file mode 100644
index 0000000000..713c9fc871
--- /dev/null
+++ b/src/plugins/sqldrivers/oci/CMakeLists.txt
@@ -0,0 +1,32 @@
+# Generated from oci.pro.
+
+#####################################################################
+## QOCIDriverPlugin Plugin:
+#####################################################################
+
+qt_add_plugin(QOCIDriverPlugin
+    OUTPUT_NAME qsqloci
+    TYPE sqldrivers
+    SOURCES
+        main.cpp
+        qsql_oci.cpp qsql_oci_p.h
+    DEFINES
+        QT_NO_CAST_FROM_ASCII
+        QT_NO_CAST_TO_ASCII
+    PUBLIC_LIBRARIES
+        Oracle::OCI
+        Qt::Core
+        Qt::CorePrivate
+        Qt::SqlPrivate
+)
+
+#### Keys ignored in scope 1:.:.:oci.pro:<TRUE>:
+# OTHER_FILES = "oci.json"
+
+## Scopes:
+#####################################################################
+
+qt_extend_target(QOCIDriverPlugin CONDITION APPLE
+    LINK_OPTIONS
+        "-Wl,-flat_namespace,-U,_environ"
+)
diff --git a/src/plugins/sqldrivers/oci/main.cpp b/src/plugins/sqldrivers/oci/main.cpp
index e576928d31..db273bfb04 100644
--- a/src/plugins/sqldrivers/oci/main.cpp
+++ b/src/plugins/sqldrivers/oci/main.cpp
@@ -61,7 +61,7 @@ QOCIDriverPlugin::QOCIDriverPlugin()
 
 QSqlDriver* QOCIDriverPlugin::create(const QString &name)
 {
-    if (name == QLatin1String("QOCI") || name == QLatin1String("QOCI8")) {
+    if (name == QLatin1String("QOCI")) {
         QOCIDriver* driver = new QOCIDriver();
         return driver;
     }
diff --git a/src/plugins/sqldrivers/oci/oci.json b/src/plugins/sqldrivers/oci/oci.json
index cbed8fc1ac..c2bb8c81f6 100644
--- a/src/plugins/sqldrivers/oci/oci.json
+++ b/src/plugins/sqldrivers/oci/oci.json
@@ -1,3 +1,3 @@
 {
-    "Keys": [ "QOCI8", "QOCI" ]
+    "Keys": [ "QOCI" ]
 }
diff --git a/src/plugins/sqldrivers/odbc/.prev_CMakeLists.txt b/src/plugins/sqldrivers/odbc/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..692d1fc294
--- /dev/null
+++ b/src/plugins/sqldrivers/odbc/.prev_CMakeLists.txt
@@ -0,0 +1,32 @@
+# Generated from odbc.pro.
+
+#####################################################################
+## QODBCDriverPlugin Plugin:
+#####################################################################
+
+qt_add_plugin(QODBCDriverPlugin
+    OUTPUT_NAME qsqlodbc
+    TYPE sqldrivers
+    SOURCES
+        main.cpp
+        qsql_odbc.cpp qsql_odbc_p.h
+    DEFINES
+        QT_NO_CAST_FROM_ASCII
+        QT_NO_CAST_TO_ASCII
+    PUBLIC_LIBRARIES
+        ODBC::ODBC
+        Qt::Core
+        Qt::CorePrivate
+        Qt::SqlPrivate
+)
+
+#### Keys ignored in scope 1:.:.:odbc.pro:<TRUE>:
+# OTHER_FILES = "odbc.json"
+
+## Scopes:
+#####################################################################
+
+qt_extend_target(QODBCDriverPlugin CONDITION UNIX
+    DEFINES
+        UNICODE
+)
diff --git a/src/plugins/sqldrivers/odbc/CMakeLists.txt b/src/plugins/sqldrivers/odbc/CMakeLists.txt
new file mode 100644
index 0000000000..5c163181c5
--- /dev/null
+++ b/src/plugins/sqldrivers/odbc/CMakeLists.txt
@@ -0,0 +1,33 @@
+# Generated from odbc.pro.
+
+#####################################################################
+## QODBCDriverPlugin Plugin:
+#####################################################################
+
+qt_find_package(ODBC) # special case
+qt_add_plugin(QODBCDriverPlugin
+    OUTPUT_NAME qsqlodbc
+    TYPE sqldrivers
+    SOURCES
+        main.cpp
+        qsql_odbc.cpp qsql_odbc_p.h
+    DEFINES
+        QT_NO_CAST_FROM_ASCII
+        QT_NO_CAST_TO_ASCII
+    PUBLIC_LIBRARIES
+        ODBC::ODBC
+        Qt::Core
+        Qt::CorePrivate
+        Qt::SqlPrivate
+)
+
+#### Keys ignored in scope 1:.:.:odbc.pro:<TRUE>:
+# OTHER_FILES = "odbc.json"
+
+## Scopes:
+#####################################################################
+
+qt_extend_target(QODBCDriverPlugin CONDITION UNIX
+    DEFINES
+        UNICODE
+)
diff --git a/src/plugins/sqldrivers/odbc/main.cpp b/src/plugins/sqldrivers/odbc/main.cpp
index ac63941a82..e712514a88 100644
--- a/src/plugins/sqldrivers/odbc/main.cpp
+++ b/src/plugins/sqldrivers/odbc/main.cpp
@@ -61,7 +61,7 @@ QODBCDriverPlugin::QODBCDriverPlugin()
 
 QSqlDriver* QODBCDriverPlugin::create(const QString &name)
 {
-    if (name == QLatin1String("QODBC") || name == QLatin1String("QODBC3")) {
+    if (name == QLatin1String("QODBC")) {
         QODBCDriver* driver = new QODBCDriver();
         return driver;
     }
diff --git a/src/plugins/sqldrivers/odbc/odbc.json b/src/plugins/sqldrivers/odbc/odbc.json
index 41640776fb..c3f6117f42 100644
--- a/src/plugins/sqldrivers/odbc/odbc.json
+++ b/src/plugins/sqldrivers/odbc/odbc.json
@@ -1,3 +1,3 @@
 {
-    "Keys": [ "QODBC3", "QODBC" ]
+    "Keys": [ "QODBC" ]
 }
diff --git a/src/plugins/sqldrivers/odbc/qsql_odbc.cpp b/src/plugins/sqldrivers/odbc/qsql_odbc.cpp
index 8e996d0ded..be1a06bc1d 100644
--- a/src/plugins/sqldrivers/odbc/qsql_odbc.cpp
+++ b/src/plugins/sqldrivers/odbc/qsql_odbc.cpp
@@ -328,7 +328,7 @@ static QSqlError qMakeError(const QString& err, QSqlError::ErrorType type, const
 {
     int nativeCode = -1;
     QString message = qODBCWarn(p, &nativeCode);
-    return QSqlError(QLatin1String("QODBC3: ") + err, message, type,
+    return QSqlError(QLatin1String("QODBC: ") + err, message, type,
                      nativeCode != -1 ? QString::number(nativeCode) : QString());
 }
 
@@ -337,7 +337,7 @@ static QSqlError qMakeError(const QString& err, QSqlError::ErrorType type,
 {
     int nativeCode = -1;
     QString message = qODBCWarn(p, &nativeCode);
-    return QSqlError(QLatin1String("QODBC3: ") + err, message, type,
+    return QSqlError(QLatin1String("QODBC: ") + err, message, type,
                      nativeCode != -1 ? QString::number(nativeCode) : QString());
 }
 
@@ -2643,3 +2643,5 @@ bool QODBCDriver::isIdentifierEscaped(const QString &identifier, IdentifierType)
 }
 
 QT_END_NAMESPACE
+
+#include "moc_qsql_odbc_p.cpp"
diff --git a/src/plugins/sqldrivers/psql/.prev_CMakeLists.txt b/src/plugins/sqldrivers/psql/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..f3cec6d302
--- /dev/null
+++ b/src/plugins/sqldrivers/psql/.prev_CMakeLists.txt
@@ -0,0 +1,24 @@
+# Generated from psql.pro.
+
+#####################################################################
+## QPSQLDriverPlugin Plugin:
+#####################################################################
+
+qt_add_plugin(QPSQLDriverPlugin
+    OUTPUT_NAME qsqlpsql
+    TYPE sqldrivers
+    SOURCES
+        main.cpp
+        qsql_psql.cpp qsql_psql_p.h
+    DEFINES
+        QT_NO_CAST_FROM_ASCII
+        QT_NO_CAST_TO_ASCII
+    PUBLIC_LIBRARIES
+        PostgreSQL::PostgreSQL
+        Qt::Core
+        Qt::CorePrivate
+        Qt::SqlPrivate
+)
+
+#### Keys ignored in scope 1:.:.:psql.pro:<TRUE>:
+# OTHER_FILES = "psql.json"
diff --git a/src/plugins/sqldrivers/psql/CMakeLists.txt b/src/plugins/sqldrivers/psql/CMakeLists.txt
new file mode 100644
index 0000000000..03a2dc69c3
--- /dev/null
+++ b/src/plugins/sqldrivers/psql/CMakeLists.txt
@@ -0,0 +1,29 @@
+# Generated from psql.pro.
+
+# FIXME cmake FindPostgreSQL is more exhaustive than the check we have for libpq-fe.h
+# it also checks for catalog/pg_type.h which is a more internal include, we should
+# add a way to tell cmake FindPostgreSQL to optionally only look for the libpq-fe.h one
+qt_find_package(PostgreSQL) # special case
+
+#####################################################################
+## QPSQLDriverPlugin Plugin:
+#####################################################################
+
+qt_add_plugin(QPSQLDriverPlugin
+    OUTPUT_NAME qsqlpsql
+    TYPE sqldrivers
+    SOURCES
+        main.cpp
+        qsql_psql.cpp qsql_psql_p.h
+    DEFINES
+        QT_NO_CAST_FROM_ASCII
+        QT_NO_CAST_TO_ASCII
+    PUBLIC_LIBRARIES
+        PostgreSQL::PostgreSQL
+        Qt::Core
+        Qt::CorePrivate
+        Qt::SqlPrivate
+)
+
+#### Keys ignored in scope 1:.:.:psql.pro:<TRUE>:
+# OTHER_FILES = "psql.json"
diff --git a/src/plugins/sqldrivers/psql/main.cpp b/src/plugins/sqldrivers/psql/main.cpp
index a0862a238a..c31e6f64b7 100644
--- a/src/plugins/sqldrivers/psql/main.cpp
+++ b/src/plugins/sqldrivers/psql/main.cpp
@@ -61,7 +61,7 @@ QPSQLDriverPlugin::QPSQLDriverPlugin()
 
 QSqlDriver* QPSQLDriverPlugin::create(const QString &name)
 {
-    if (name == QLatin1String("QPSQL") || name == QLatin1String("QPSQL7"))
+    if (name == QLatin1String("QPSQL"))
         return new QPSQLDriver;
     return nullptr;
 }
diff --git a/src/plugins/sqldrivers/psql/psql.json b/src/plugins/sqldrivers/psql/psql.json
index 1579b99160..07092a33e7 100644
--- a/src/plugins/sqldrivers/psql/psql.json
+++ b/src/plugins/sqldrivers/psql/psql.json
@@ -1,3 +1,3 @@
 {
-    "Keys": [ "QPSQL7", "QPSQL" ]
+    "Keys": [ "QPSQL" ]
 }
diff --git a/src/plugins/sqldrivers/psql/qsql_psql.cpp b/src/plugins/sqldrivers/psql/qsql_psql.cpp
index 38bf355856..d2c57bcddc 100644
--- a/src/plugins/sqldrivers/psql/qsql_psql.cpp
+++ b/src/plugins/sqldrivers/psql/qsql_psql.cpp
@@ -1668,12 +1668,6 @@ void QPSQLDriver::_q_handleNotification(int)
             if (notify->extra)
                 payload = d->isUtf8 ? QString::fromUtf8(notify->extra) : QString::fromLatin1(notify->extra);
 #endif
-#if QT_DEPRECATED_SINCE(5, 15)
-QT_WARNING_PUSH
-QT_WARNING_DISABLE_DEPRECATED
-            emit notification(name);
-QT_WARNING_POP
-#endif
             QSqlDriver::NotificationSource source = (notify->be_pid == PQbackendPID(d->connection)) ? QSqlDriver::SelfSource : QSqlDriver::OtherSource;
             emit notification(name, source, payload);
         }
diff --git a/src/plugins/sqldrivers/sqldrivers.pro b/src/plugins/sqldrivers/sqldrivers.pro
index 8a9ae46f82..f1db8f65a2 100644
--- a/src/plugins/sqldrivers/sqldrivers.pro
+++ b/src/plugins/sqldrivers/sqldrivers.pro
@@ -8,9 +8,7 @@ sqldrivers_standalone {
 qtConfig(sql-psql)     : SUBDIRS += psql
 qtConfig(sql-mysql)    : SUBDIRS += mysql
 qtConfig(sql-odbc)     : SUBDIRS += odbc
-qtConfig(sql-tds)      : SUBDIRS += tds
 qtConfig(sql-oci)      : SUBDIRS += oci
 qtConfig(sql-db2)      : SUBDIRS += db2
 qtConfig(sql-sqlite)   : SUBDIRS += sqlite
-qtConfig(sql-sqlite2)  : SUBDIRS += sqlite2
 qtConfig(sql-ibase)    : SUBDIRS += ibase
diff --git a/src/plugins/sqldrivers/sqlite/.prev_CMakeLists.txt b/src/plugins/sqldrivers/sqlite/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..d258c23821
--- /dev/null
+++ b/src/plugins/sqldrivers/sqlite/.prev_CMakeLists.txt
@@ -0,0 +1,93 @@
+# Generated from sqlite.pro.
+
+#####################################################################
+## QSQLiteDriverPlugin Plugin:
+#####################################################################
+
+qt_add_plugin(QSQLiteDriverPlugin
+    OUTPUT_NAME qsqlite
+    TYPE sqldrivers
+    SOURCES
+        qsql_sqlite.cpp qsql_sqlite_p.h
+        smain.cpp
+    DEFINES
+        QT_NO_CAST_FROM_ASCII
+        QT_NO_CAST_TO_ASCII
+    PUBLIC_LIBRARIES
+        Qt::Core
+        Qt::CorePrivate
+        Qt::SqlPrivate
+)
+
+#### Keys ignored in scope 1:.:.:sqlite.pro:<TRUE>:
+# OTHER_FILES = "sqlite.json"
+# QT_FOR_CONFIG = "sqldrivers-private"
+
+## Scopes:
+#####################################################################
+
+qt_extend_target(QSQLiteDriverPlugin CONDITION QT_FEATURE_system_sqlite
+    PUBLIC_LIBRARIES
+        sqlite
+)
+
+qt_extend_target(QSQLiteDriverPlugin CONDITION NOT QT_FEATURE_system_sqlite
+    SOURCES
+        ../../../3rdparty/sqlite/sqlite3.c
+    DEFINES
+        SQLITE_ENABLE_COLUMN_METADATA
+        SQLITE_ENABLE_FTS3
+        SQLITE_ENABLE_FTS3_PARENTHESIS
+        SQLITE_ENABLE_FTS5
+        SQLITE_ENABLE_JSON1
+        SQLITE_ENABLE_RTREE
+        SQLITE_OMIT_COMPLETE
+    INCLUDE_DIRECTORIES
+        ../../../3rdparty/sqlite
+)
+
+qt_extend_target(QSQLiteDriverPlugin CONDITION CMAKE_BUILD_TYPE STREQUAL Release AND NOT QT_FEATURE_system_sqlite
+    DEFINES
+        NDEBUG
+)
+
+qt_extend_target(QSQLiteDriverPlugin CONDITION NOT CONFIG___contains___largefile AND NOT QT_FEATURE_system_sqlite
+    DEFINES
+        SQLITE_DISABLE_LFS
+)
+
+qt_extend_target(QSQLiteDriverPlugin CONDITION QT_FEATURE_posix_fallocate AND NOT QT_FEATURE_system_sqlite
+    DEFINES
+        HAVE_POSIX_FALLOCATE=1
+)
+
+qt_extend_target(QSQLiteDriverPlugin CONDITION WINRT AND NOT QT_FEATURE_system_sqlite
+    DEFINES
+        SQLITE_OS_WINRT
+)
+
+#### Keys ignored in scope 8:.:../../../3rdparty:../../../3rdparty/sqlite.pri:WINRT:
+# QMAKE_CFLAGS = "-Gy"
+
+qt_extend_target(QSQLiteDriverPlugin CONDITION QNX AND NOT QT_FEATURE_system_sqlite
+    DEFINES
+        _QNX_SOURCE
+)
+
+qt_extend_target(QSQLiteDriverPlugin CONDITION UNIX AND NOT QT_FEATURE_system_sqlite AND NOT WINRT AND NOT winphone
+    DEFINES
+        HAVE_USLEEP=1
+)
+
+qt_extend_target(QSQLiteDriverPlugin CONDITION QT_FEATURE_dlopen AND NOT QT_FEATURE_system_sqlite
+    PUBLIC_LIBRARIES
+        ${CMAKE_DL_LIBS}
+)
+
+qt_extend_target(QSQLiteDriverPlugin CONDITION NOT QT_FEATURE_dlopen AND NOT QT_FEATURE_system_sqlite
+    DEFINES
+        SQLITE_OMIT_LOAD_EXTENSION
+)
+
+#### Keys ignored in scope 13:.:../../../3rdparty:../../../3rdparty/sqlite.pri:INTEGRITY:
+# QMAKE_CFLAGS = "-include" "qplatformdefs.h"
diff --git a/src/plugins/sqldrivers/sqlite/CMakeLists.txt b/src/plugins/sqldrivers/sqlite/CMakeLists.txt
new file mode 100644
index 0000000000..d1453638b3
--- /dev/null
+++ b/src/plugins/sqldrivers/sqlite/CMakeLists.txt
@@ -0,0 +1,34 @@
+# Generated from sqlite.pro.
+
+#####################################################################
+## QSQLiteDriverPlugin Plugin:
+#####################################################################
+
+qt_add_plugin(QSQLiteDriverPlugin
+    OUTPUT_NAME qsqlite
+    TYPE sqldrivers
+    SOURCES
+        qsql_sqlite.cpp qsql_sqlite_p.h
+        smain.cpp
+    DEFINES
+        QT_NO_CAST_FROM_ASCII
+        QT_NO_CAST_TO_ASCII
+    LIBRARIES # special case
+        SQLite::SQLite3 # special case
+    PUBLIC_LIBRARIES
+        Qt::Core
+        Qt::CorePrivate
+        Qt::SqlPrivate
+)
+
+#### Keys ignored in scope 1:.:.:sqlite.pro:<TRUE>:
+# OTHER_FILES = "sqlite.json"
+# QT_FOR_CONFIG = "sqldrivers-private"
+
+## Scopes:
+#####################################################################
+
+# special case begin
+# Remove non-system-sqlite code
+# qt_extend_target(qsqlite CONDITION QT_FEATURE_system_sqlite
+# special case end
diff --git a/src/plugins/sqldrivers/sqlite/qsql_sqlite.cpp b/src/plugins/sqldrivers/sqlite/qsql_sqlite.cpp
index 5eb9e7d2f8..27e7d02472 100644
--- a/src/plugins/sqldrivers/sqlite/qsql_sqlite.cpp
+++ b/src/plugins/sqldrivers/sqlite/qsql_sqlite.cpp
@@ -1034,15 +1034,8 @@ QStringList QSQLiteDriver::subscribedToNotifications() const
 void QSQLiteDriver::handleNotification(const QString &tableName, qint64 rowid)
 {
     Q_D(const QSQLiteDriver);
-    if (d->notificationid.contains(tableName)) {
-#if QT_DEPRECATED_SINCE(5, 15)
-QT_WARNING_PUSH
-QT_WARNING_DISABLE_DEPRECATED
-        emit notification(tableName);
-QT_WARNING_POP
-#endif
+    if (d->notificationid.contains(tableName))
         emit notification(tableName, QSqlDriver::UnknownSource, QVariant(rowid));
-    }
 }
 
 QT_END_NAMESPACE
diff --git a/src/plugins/sqldrivers/sqlite2/README b/src/plugins/sqldrivers/sqlite2/README
deleted file mode 100644
index 899361a6f5..0000000000
--- a/src/plugins/sqldrivers/sqlite2/README
+++ /dev/null
@@ -1,6 +0,0 @@
-You will need the SQLite development headers and libraries installed
-before compiling this plugin.
-
-See the Qt SQL documentation for more information on compiling Qt SQL
-driver plugins (sql-driver.html).
-
diff --git a/src/plugins/sqldrivers/sqlite2/qsql_sqlite2.cpp b/src/plugins/sqldrivers/sqlite2/qsql_sqlite2.cpp
deleted file mode 100644
index b7bcd044ab..0000000000
--- a/src/plugins/sqldrivers/sqlite2/qsql_sqlite2.cpp
+++ /dev/null
@@ -1,615 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtSql module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qsql_sqlite2_p.h"
-
-#include <qcoreapplication.h>
-#include <qvariant.h>
-#include <qdatetime.h>
-#include <qfile.h>
-#include <qsqlerror.h>
-#include <qsqlfield.h>
-#include <qsqlindex.h>
-#include <qsqlquery.h>
-#include <QtSql/private/qsqlcachedresult_p.h>
-#include <QtSql/private/qsqldriver_p.h>
-#include <qstringlist.h>
-#include <qvector.h>
-
-#if !defined Q_OS_WIN
-# include <unistd.h>
-#endif
-#include <sqlite.h>
-
-typedef struct sqlite_vm sqlite_vm;
-
-Q_DECLARE_OPAQUE_POINTER(sqlite_vm*)
-Q_DECLARE_METATYPE(sqlite_vm*)
-
-Q_DECLARE_OPAQUE_POINTER(sqlite*)
-Q_DECLARE_METATYPE(sqlite*)
-
-QT_BEGIN_NAMESPACE
-
-static QVariant::Type nameToType(const QString& typeName)
-{
-    QString tName = typeName.toUpper();
-    if (tName.startsWith(QLatin1String("INT")))
-        return QVariant::Int;
-    if (tName.startsWith(QLatin1String("FLOAT")) || tName.startsWith(QLatin1String("NUMERIC")))
-        return QVariant::Double;
-    if (tName.startsWith(QLatin1String("BOOL")))
-        return QVariant::Bool;
-    // SQLite is typeless - consider everything else as string
-    return QVariant::String;
-}
-
-class QSQLite2DriverPrivate : public QSqlDriverPrivate
-{
-    Q_DECLARE_PUBLIC(QSQLite2Driver)
-
-public:
-    QSQLite2DriverPrivate();
-    sqlite *access;
-    bool utf8;
-};
-
-QSQLite2DriverPrivate::QSQLite2DriverPrivate() : QSqlDriverPrivate(), access(0)
-{
-    utf8 = (qstrcmp(sqlite_encoding, "UTF-8") == 0);
-    dbmsType = QSqlDriver::SQLite;
-}
-
-class QSQLite2ResultPrivate;
-
-class QSQLite2Result : public QSqlCachedResult
-{
-    Q_DECLARE_PRIVATE(QSQLite2Result)
-    friend class QSQLite2Driver;
-
-public:
-    explicit QSQLite2Result(const QSQLite2Driver* db);
-    ~QSQLite2Result();
-    QVariant handle() const override;
-
-protected:
-    bool gotoNext(QSqlCachedResult::ValueCache &row, int idx) override;
-    bool reset(const QString &query) override;
-    int size() override;
-    int numRowsAffected() override;
-    QSqlRecord record() const override;
-    void detachFromResultSet() override;
-    void virtual_hook(int id, void *data) override;
-};
-
-class QSQLite2ResultPrivate: public QSqlCachedResultPrivate
-{
-    Q_DECLARE_PUBLIC(QSQLite2Result)
-
-public:
-    Q_DECLARE_SQLDRIVER_PRIVATE(QSQLite2Driver);
-    QSQLite2ResultPrivate(QSQLite2Result *q, const QSQLite2Driver *drv);
-    void cleanup();
-    bool fetchNext(QSqlCachedResult::ValueCache &values, int idx, bool initialFetch);
-    bool isSelect();
-    // initializes the recordInfo and the cache
-    void init(const char **cnames, int numCols);
-    void finalize();
-
-    // and we have too keep our own struct for the data (sqlite works via
-    // callback.
-    const char *currentTail;
-    sqlite_vm *currentMachine;
-
-    bool skippedStatus; // the status of the fetchNext() that's skipped
-    bool skipRow; // skip the next fetchNext()?
-    QSqlRecord rInf;
-    QVector<QVariant> firstRow;
-};
-
-QSQLite2ResultPrivate::QSQLite2ResultPrivate(QSQLite2Result *q, const QSQLite2Driver *drv)
-    : QSqlCachedResultPrivate(q, drv),
-      currentTail(0),
-      currentMachine(0),
-      skippedStatus(false),
-      skipRow(false)
-{
-}
-
-void QSQLite2ResultPrivate::cleanup()
-{
-    Q_Q(QSQLite2Result);
-    finalize();
-    rInf.clear();
-    currentTail = 0;
-    currentMachine = 0;
-    skippedStatus = false;
-    skipRow = false;
-    q->setAt(QSql::BeforeFirstRow);
-    q->setActive(false);
-    q->cleanup();
-}
-
-void QSQLite2ResultPrivate::finalize()
-{
-    Q_Q(QSQLite2Result);
-    if (!currentMachine)
-        return;
-
-    char* err = 0;
-    int res = sqlite_finalize(currentMachine, &err);
-    if (err) {
-        q->setLastError(QSqlError(QCoreApplication::translate("QSQLite2Result",
-                                  "Unable to fetch results"), QString::fromLatin1(err),
-                                  QSqlError::StatementError,
-                                  res != -1 ? QString::number(res) : QString()));
-        sqlite_freemem(err);
-    }
-    currentMachine = 0;
-}
-
-// called on first fetch
-void QSQLite2ResultPrivate::init(const char **cnames, int numCols)
-{
-    Q_Q(QSQLite2Result);
-    if (!cnames)
-        return;
-
-    rInf.clear();
-    if (numCols <= 0)
-        return;
-    q->init(numCols);
-
-    for (int i = 0; i < numCols; ++i) {
-        const char* lastDot = strrchr(cnames[i], '.');
-        const char* fieldName = lastDot ? lastDot + 1 : cnames[i];
-
-        //remove quotations around the field name if any
-        QString fieldStr = QString::fromLatin1(fieldName);
-        QLatin1Char quote('\"');
-        if ( fieldStr.length() > 2 && fieldStr.startsWith(quote) && fieldStr.endsWith(quote)) {
-            fieldStr = fieldStr.mid(1);
-            fieldStr.chop(1);
-        }
-        rInf.append(QSqlField(fieldStr,
-                              nameToType(QString::fromLatin1(cnames[i+numCols]))));
-    }
-}
-
-bool QSQLite2ResultPrivate::fetchNext(QSqlCachedResult::ValueCache &values, int idx, bool initialFetch)
-{
-    Q_Q(QSQLite2Result);
-    // may be caching.
-    const char **fvals;
-    const char **cnames;
-    int colNum;
-    int res;
-    int i;
-
-    if (skipRow) {
-        // already fetched
-        Q_ASSERT(!initialFetch);
-        skipRow = false;
-        for(int i=0;i<firstRow.count(); i++)
-            values[i] = firstRow[i];
-        return skippedStatus;
-    }
-    skipRow = initialFetch;
-
-    if (!currentMachine)
-        return false;
-
-    // keep trying while busy, wish I could implement this better.
-    while ((res = sqlite_step(currentMachine, &colNum, &fvals, &cnames)) == SQLITE_BUSY) {
-        // sleep instead requesting result again immidiately.
-#if defined Q_OS_WIN
-        Sleep(1000);
-#else
-        sleep(1);
-#endif
-    }
-
-    if(initialFetch) {
-        firstRow.clear();
-        firstRow.resize(colNum);
-    }
-
-    switch(res) {
-    case SQLITE_ROW:
-        // check to see if should fill out columns
-        if (rInf.isEmpty())
-            // must be first call.
-            init(cnames, colNum);
-        if (!fvals)
-            return false;
-        if (idx < 0 && !initialFetch)
-            return true;
-        for (i = 0; i < colNum; ++i)
-            values[i + idx] = drv_d_func()->utf8 ? QString::fromUtf8(fvals[i]) : QString::fromLatin1(fvals[i]);
-        return true;
-    case SQLITE_DONE:
-        if (rInf.isEmpty())
-            // must be first call.
-            init(cnames, colNum);
-        q->setAt(QSql::AfterLastRow);
-        return false;
-    case SQLITE_ERROR:
-    case SQLITE_MISUSE:
-    default:
-        // something wrong, don't get col info, but still return false
-        finalize(); // finalize to get the error message.
-        q->setAt(QSql::AfterLastRow);
-        return false;
-    }
-    return false;
-}
-
-QSQLite2Result::QSQLite2Result(const QSQLite2Driver* db)
-    : QSqlCachedResult(*new QSQLite2ResultPrivate(this, db))
-{
-}
-
-QSQLite2Result::~QSQLite2Result()
-{
-    Q_D(QSQLite2Result);
-    d->cleanup();
-}
-
-void QSQLite2Result::virtual_hook(int id, void *data)
-{
-    QSqlCachedResult::virtual_hook(id, data);
-}
-
-/*
-   Execute \a query.
-*/
-bool QSQLite2Result::reset (const QString& query)
-{
-    Q_D(QSQLite2Result);
-    // this is where we build a query.
-    if (!driver())
-        return false;
-    if (!driver()-> isOpen() || driver()->isOpenError())
-        return false;
-
-    d->cleanup();
-
-    // Um, ok.  callback based so.... pass private static function for this.
-    setSelect(false);
-    char *err = 0;
-    int res = sqlite_compile(d->drv_d_func()->access,
-                                d->drv_d_func()->utf8 ? query.toUtf8().constData()
-                                        : query.toLatin1().constData(),
-                                &(d->currentTail),
-                                &(d->currentMachine),
-                                &err);
-    if (res != SQLITE_OK || err) {
-        setLastError(QSqlError(QCoreApplication::translate("QSQLite2Result",
-                     "Unable to execute statement"), QString::fromLatin1(err),
-                     QSqlError::StatementError, res));
-        sqlite_freemem(err);
-    }
-    //if (*d->currentTail != '\000' then there is more sql to eval
-    if (!d->currentMachine) {
-        setActive(false);
-        return false;
-    }
-    // we have to fetch one row to find out about
-    // the structure of the result set
-    d->skippedStatus = d->fetchNext(d->firstRow, 0, true);
-    if (lastError().isValid()) {
-        setSelect(false);
-        setActive(false);
-        return false;
-    }
-    setSelect(!d->rInf.isEmpty());
-    setActive(true);
-    return true;
-}
-
-bool QSQLite2Result::gotoNext(QSqlCachedResult::ValueCache& row, int idx)
-{
-    Q_D(QSQLite2Result);
-    return d->fetchNext(row, idx, false);
-}
-
-int QSQLite2Result::size()
-{
-    return -1;
-}
-
-int QSQLite2Result::numRowsAffected()
-{
-    Q_D(QSQLite2Result);
-    return sqlite_changes(d->drv_d_func()->access);
-}
-
-QSqlRecord QSQLite2Result::record() const
-{
-    Q_D(const QSQLite2Result);
-    if (!isActive() || !isSelect())
-        return QSqlRecord();
-    return d->rInf;
-}
-
-void QSQLite2Result::detachFromResultSet()
-{
-    Q_D(QSQLite2Result);
-    d->finalize();
-}
-
-QVariant QSQLite2Result::handle() const
-{
-    Q_D(const QSQLite2Result);
-    return QVariant::fromValue(d->currentMachine);
-}
-
-/////////////////////////////////////////////////////////
-
-QSQLite2Driver::QSQLite2Driver(QObject *parent)
-  : QSqlDriver(*new QSQLite2DriverPrivate, parent)
-{
-}
-
-QSQLite2Driver::QSQLite2Driver(sqlite *connection, QObject *parent)
-    : QSqlDriver(*new QSQLite2DriverPrivate, parent)
-{
-    Q_D(QSQLite2Driver);
-    d->access = connection;
-    setOpen(true);
-    setOpenError(false);
-}
-
-
-QSQLite2Driver::~QSQLite2Driver()
-{
-}
-
-bool QSQLite2Driver::hasFeature(DriverFeature f) const
-{
-    Q_D(const QSQLite2Driver);
-    switch (f) {
-    case Transactions:
-    case SimpleLocking:
-        return true;
-    case Unicode:
-        return d->utf8;
-    default:
-        return false;
-    }
-}
-
-/*
-   SQLite dbs have no user name, passwords, hosts or ports.
-   just file names.
-*/
-bool QSQLite2Driver::open(const QString & db, const QString &, const QString &, const QString &, int, const QString &)
-{
-    Q_D(QSQLite2Driver);
-    if (isOpen())
-        close();
-
-    if (db.isEmpty())
-        return false;
-
-    char* err = 0;
-    d->access = sqlite_open(QFile::encodeName(db), 0, &err);
-    if (err) {
-        setLastError(QSqlError(tr("Error opening database"), QString::fromLatin1(err),
-                     QSqlError::ConnectionError));
-        sqlite_freemem(err);
-        err = 0;
-    }
-
-    if (d->access) {
-        setOpen(true);
-        setOpenError(false);
-        return true;
-    }
-    setOpenError(true);
-    return false;
-}
-
-void QSQLite2Driver::close()
-{
-    Q_D(QSQLite2Driver);
-    if (isOpen()) {
-        sqlite_close(d->access);
-        d->access = 0;
-        setOpen(false);
-        setOpenError(false);
-    }
-}
-
-QSqlResult *QSQLite2Driver::createResult() const
-{
-    return new QSQLite2Result(this);
-}
-
-bool QSQLite2Driver::beginTransaction()
-{
-    Q_D(QSQLite2Driver);
-    if (!isOpen() || isOpenError())
-        return false;
-
-    char* err;
-    int res = sqlite_exec(d->access, "BEGIN", 0, this, &err);
-
-    if (res == SQLITE_OK)
-        return true;
-
-    setLastError(QSqlError(tr("Unable to begin transaction"),
-                           QString::fromLatin1(err), QSqlError::TransactionError, res));
-    sqlite_freemem(err);
-    return false;
-}
-
-bool QSQLite2Driver::commitTransaction()
-{
-    Q_D(QSQLite2Driver);
-    if (!isOpen() || isOpenError())
-        return false;
-
-    char* err;
-    int res = sqlite_exec(d->access, "COMMIT", 0, this, &err);
-
-    if (res == SQLITE_OK)
-        return true;
-
-    setLastError(QSqlError(tr("Unable to commit transaction"),
-                QString::fromLatin1(err), QSqlError::TransactionError, res));
-    sqlite_freemem(err);
-    return false;
-}
-
-bool QSQLite2Driver::rollbackTransaction()
-{
-    Q_D(QSQLite2Driver);
-    if (!isOpen() || isOpenError())
-        return false;
-
-    char* err;
-    int res = sqlite_exec(d->access, "ROLLBACK", 0, this, &err);
-
-    if (res == SQLITE_OK)
-        return true;
-
-    setLastError(QSqlError(tr("Unable to rollback transaction"),
-                           QString::fromLatin1(err), QSqlError::TransactionError, res));
-    sqlite_freemem(err);
-    return false;
-}
-
-QStringList QSQLite2Driver::tables(QSql::TableType type) const
-{
-    QStringList res;
-    if (!isOpen())
-        return res;
-
-    QSqlQuery q(createResult());
-    q.setForwardOnly(true);
-    if ((type & QSql::Tables) && (type & QSql::Views))
-        q.exec(QLatin1String("SELECT name FROM sqlite_master WHERE type='table' OR type='view'"));
-    else if (type & QSql::Tables)
-        q.exec(QLatin1String("SELECT name FROM sqlite_master WHERE type='table'"));
-    else if (type & QSql::Views)
-        q.exec(QLatin1String("SELECT name FROM sqlite_master WHERE type='view'"));
-
-    if (q.isActive()) {
-        while(q.next())
-            res.append(q.value(0).toString());
-    }
-
-    if (type & QSql::SystemTables) {
-        // there are no internal tables beside this one:
-        res.append(QLatin1String("sqlite_master"));
-    }
-
-    return res;
-}
-
-QSqlIndex QSQLite2Driver::primaryIndex(const QString &tblname) const
-{
-    QSqlRecord rec(record(tblname)); // expensive :(
-
-    if (!isOpen())
-        return QSqlIndex();
-
-    QSqlQuery q(createResult());
-    q.setForwardOnly(true);
-    QString table = tblname;
-    if (isIdentifierEscaped(table, QSqlDriver::TableName))
-        table = stripDelimiters(table, QSqlDriver::TableName);
-    // finrst find a UNIQUE INDEX
-    q.exec(QLatin1String("PRAGMA index_list('") + table + QLatin1String("');"));
-    QString indexname;
-    while(q.next()) {
-        if (q.value(2).toInt()==1) {
-            indexname = q.value(1).toString();
-            break;
-        }
-    }
-    if (indexname.isEmpty())
-        return QSqlIndex();
-
-    q.exec(QLatin1String("PRAGMA index_info('") + indexname + QLatin1String("');"));
-
-    QSqlIndex index(table, indexname);
-    while(q.next()) {
-        QString name = q.value(2).toString();
-        QVariant::Type type = QVariant::Invalid;
-        if (rec.contains(name))
-            type = rec.field(name).type();
-        index.append(QSqlField(name, type, tblname));
-    }
-    return index;
-}
-
-QSqlRecord QSQLite2Driver::record(const QString &tbl) const
-{
-    if (!isOpen())
-        return QSqlRecord();
-    QString table = tbl;
-    if (isIdentifierEscaped(tbl, QSqlDriver::TableName))
-        table = stripDelimiters(table, QSqlDriver::TableName);
-
-    QSqlQuery q(createResult());
-    q.setForwardOnly(true);
-    q.exec(QLatin1String("SELECT * FROM ") + tbl + QLatin1String(" LIMIT 1"));
-    return q.record();
-}
-
-QVariant QSQLite2Driver::handle() const
-{
-    Q_D(const QSQLite2Driver);
-    return QVariant::fromValue(d->access);
-}
-
-QString QSQLite2Driver::escapeIdentifier(const QString &identifier, IdentifierType /*type*/) const
-{
-    QString res = identifier;
-    if(!identifier.isEmpty() && !identifier.startsWith(QLatin1Char('"')) && !identifier.endsWith(QLatin1Char('"')) ) {
-        res.replace(QLatin1Char('"'), QLatin1String("\"\""));
-        res.prepend(QLatin1Char('"')).append(QLatin1Char('"'));
-        res.replace(QLatin1Char('.'), QLatin1String("\".\""));
-    }
-    return res;
-}
-
-QT_END_NAMESPACE
diff --git a/src/plugins/sqldrivers/sqlite2/qsql_sqlite2_p.h b/src/plugins/sqldrivers/sqlite2/qsql_sqlite2_p.h
deleted file mode 100644
index 57db0a4d47..0000000000
--- a/src/plugins/sqldrivers/sqlite2/qsql_sqlite2_p.h
+++ /dev/null
@@ -1,109 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtSql module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QSQL_SQLITE2_H
-#define QSQL_SQLITE2_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include <QtSql/qsqldriver.h>
-
-#if defined (Q_OS_WIN32)
-# include <QtCore/qt_windows.h>
-#endif
-
-struct sqlite;
-
-#ifdef QT_PLUGIN
-#define Q_EXPORT_SQLDRIVER_SQLITE2
-#else
-#define Q_EXPORT_SQLDRIVER_SQLITE2 Q_SQL_EXPORT
-#endif
-
-QT_BEGIN_NAMESPACE
-
-class QSqlResult;
-class QSQLite2DriverPrivate;
-
-class Q_EXPORT_SQLDRIVER_SQLITE2 QSQLite2Driver : public QSqlDriver
-{
-    friend class QSQLite2ResultPrivate;
-    Q_DECLARE_PRIVATE(QSQLite2Driver)
-    Q_OBJECT
-public:
-    explicit QSQLite2Driver(QObject *parent = nullptr);
-    explicit QSQLite2Driver(sqlite *connection, QObject *parent = nullptr);
-    ~QSQLite2Driver();
-    bool hasFeature(DriverFeature f) const override;
-    bool open(const QString &db,
-                   const QString &user,
-                   const QString &password,
-                   const QString &host,
-                   int port,
-                   const QString &connOpts) override;
-    bool open(const QString &db,
-            const QString &user,
-            const QString &password,
-            const QString &host,
-            int port) { return open(db, user, password, host, port, QString()); }
-    void close() override;
-    QSqlResult *createResult() const override;
-    bool beginTransaction() override;
-    bool commitTransaction() override;
-    bool rollbackTransaction() override;
-    QStringList tables(QSql::TableType) const override;
-
-    QSqlRecord record(const QString &tablename) const override;
-    QSqlIndex primaryIndex(const QString &table) const override;
-    QVariant handle() const override;
-    QString escapeIdentifier(const QString &identifier, IdentifierType) const override;
-};
-
-QT_END_NAMESPACE
-
-#endif // QSQL_SQLITE2_H
diff --git a/src/plugins/sqldrivers/sqlite2/smain.cpp b/src/plugins/sqldrivers/sqlite2/smain.cpp
deleted file mode 100644
index 7d971d6e5a..0000000000
--- a/src/plugins/sqldrivers/sqlite2/smain.cpp
+++ /dev/null
@@ -1,74 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the plugins of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <qsqldriverplugin.h>
-#include <qstringlist.h>
-#include "qsql_sqlite2_p.h"
-
-QT_BEGIN_NAMESPACE
-
-// ### Qt6: remove, obsolete since 5.14
-class QSQLite2DriverPlugin : public QSqlDriverPlugin
-{
-    Q_OBJECT
-    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QSqlDriverFactoryInterface" FILE "sqlite2.json")
-
-public:
-    QSQLite2DriverPlugin();
-
-    QSqlDriver* create(const QString &);
-};
-
-QSQLite2DriverPlugin::QSQLite2DriverPlugin()
-    : QSqlDriverPlugin()
-{
-}
-
-QSqlDriver* QSQLite2DriverPlugin::create(const QString &name)
-{
-    if (name == QLatin1String("QSQLITE2")) {
-        QSQLite2Driver* driver = new QSQLite2Driver();
-        return driver;
-    }
-    return 0;
-}
-
-QT_END_NAMESPACE
-
-#include "smain.moc"
diff --git a/src/plugins/sqldrivers/sqlite2/sqlite2.json b/src/plugins/sqldrivers/sqlite2/sqlite2.json
deleted file mode 100644
index 47bdae4d60..0000000000
--- a/src/plugins/sqldrivers/sqlite2/sqlite2.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "Keys": [ "QSQLITE2" ]
-}
diff --git a/src/plugins/sqldrivers/sqlite2/sqlite2.pro b/src/plugins/sqldrivers/sqlite2/sqlite2.pro
deleted file mode 100644
index 721facb5b8..0000000000
--- a/src/plugins/sqldrivers/sqlite2/sqlite2.pro
+++ /dev/null
@@ -1,11 +0,0 @@
-TARGET = qsqlite2
-
-HEADERS += $$PWD/qsql_sqlite2_p.h
-SOURCES += $$PWD/qsql_sqlite2.cpp $$PWD/smain.cpp
-
-QMAKE_USE += sqlite2
-
-OTHER_FILES += sqlite2.json
-
-PLUGIN_CLASS_NAME = QSQLite2DriverPlugin
-include(../qsqldriverbase.pri)
diff --git a/src/plugins/sqldrivers/tds/README b/src/plugins/sqldrivers/tds/README
deleted file mode 100644
index 3d27ed46d2..0000000000
--- a/src/plugins/sqldrivers/tds/README
+++ /dev/null
@@ -1,6 +0,0 @@
-You will need the dblib development headers and libraries installed before
-compiling this plugin.
-
-See the Qt SQL documentation for more information on compiling Qt SQL
-driver plugins (sql-driver.html).
-
diff --git a/src/plugins/sqldrivers/tds/main.cpp b/src/plugins/sqldrivers/tds/main.cpp
deleted file mode 100644
index 18efb22ea4..0000000000
--- a/src/plugins/sqldrivers/tds/main.cpp
+++ /dev/null
@@ -1,81 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the plugins of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#define Q_UUIDIMPL
-#include <qsqldriverplugin.h>
-#include <qstringlist.h>
-#ifdef Q_OS_WIN32    // We assume that MS SQL Server is used. Set Q_USE_SYBASE to force Sybase.
-// Conflicting declarations of LPCBYTE in sqlfront.h and winscard.h
-#define _WINSCARD_H_
-#include <windows.h>
-#endif
-#include "qsql_tds_p.h"
-
-QT_BEGIN_NAMESPACE
-
-
-// ### Qt6: remove, obsolete since 4.7
-class QTDSDriverPlugin : public QSqlDriverPlugin
-{
-    Q_OBJECT
-    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QSqlDriverFactoryInterface" FILE "tds.json")
-
-public:
-    QTDSDriverPlugin();
-
-    QSqlDriver* create(const QString &);
-};
-
-QTDSDriverPlugin::QTDSDriverPlugin()
-    : QSqlDriverPlugin()
-{
-}
-
-QSqlDriver* QTDSDriverPlugin::create(const QString &name)
-{
-    if (name == QLatin1String("QTDS") || name == QLatin1String("QTDS7")) {
-        QTDSDriver* driver = new QTDSDriver();
-        return driver;
-    }
-    return 0;
-}
-
-QT_END_NAMESPACE
-
-#include "main.moc"
diff --git a/src/plugins/sqldrivers/tds/qsql_tds.cpp b/src/plugins/sqldrivers/tds/qsql_tds.cpp
deleted file mode 100644
index 9c8d242028..0000000000
--- a/src/plugins/sqldrivers/tds/qsql_tds.cpp
+++ /dev/null
@@ -1,881 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtSql module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qsql_tds_p.h"
-
-#include <qglobal.h>
-#ifdef Q_OS_WIN32    // We assume that MS SQL Server is used. Set Q_USE_SYBASE to force Sybase.
-// Conflicting declarations of LPCBYTE in sqlfront.h and winscard.h
-#define _WINSCARD_H_
-#include <windows.h>
-#else
-#define Q_USE_SYBASE
-#endif
-
-#include <qvariant.h>
-#include <qdatetime.h>
-#include <qhash.h>
-#include <qregexp.h>
-#include <qsqlerror.h>
-#include <qsqlfield.h>
-#include <qsqlindex.h>
-#include <qsqlquery.h>
-#include <QtSql/private/qsqlcachedresult_p.h>
-#include <QtSql/private/qsqldriver_p.h>
-#include <qstringlist.h>
-#include <qvector.h>
-
-#include <stdlib.h>
-
-Q_DECLARE_OPAQUE_POINTER(LOGINREC*)
-Q_DECLARE_OPAQUE_POINTER(DBPROCESS*)
-
-QT_BEGIN_NAMESPACE
-
-#ifdef DBNTWIN32
-#define QMSGHANDLE DBMSGHANDLE_PROC
-#define QERRHANDLE DBERRHANDLE_PROC
-#define QTDSCHAR SQLCHAR
-#define QTDSDATETIME4 SQLDATETIM4
-#define QTDSDATETIME SQLDATETIME
-#define QTDSDATETIME_N SQLDATETIMN
-#define QTDSDECIMAL SQLDECIMAL
-#define QTDSFLT4 SQLFLT4
-#define QTDSFLT8 SQLFLT8
-#define QTDSFLT8_N SQLFLTN
-#define QTDSINT1 SQLINT1
-#define QTDSINT2 SQLINT2
-#define QTDSINT4 SQLINT4
-#define QTDSINT4_N SQLINTN
-#define QTDSMONEY4 SQLMONEY4
-#define QTDSMONEY SQLMONEY
-#define QTDSMONEY_N SQLMONEYN
-#define QTDSNUMERIC SQLNUMERIC
-#define QTDSTEXT SQLTEXT
-#define QTDSVARCHAR SQLVARCHAR
-#define QTDSBIT SQLBIT
-#define QTDSBINARY SQLBINARY
-#define QTDSVARBINARY SQLVARBINARY
-#define QTDSIMAGE SQLIMAGE
-#else
-#define QMSGHANDLE MHANDLEFUNC
-#define QERRHANDLE EHANDLEFUNC
-#define QTDSCHAR SYBCHAR
-#define QTDSDATETIME4 SYBDATETIME4
-#define QTDSDATETIME SYBDATETIME
-#define QTDSDATETIME_N SYBDATETIMN
-#define QTDSDECIMAL SYBDECIMAL
-#define QTDSFLT8 SYBFLT8
-#define QTDSFLT8_N SYBFLTN
-#define QTDSFLT4 SYBREAL
-#define QTDSINT1 SYBINT1
-#define QTDSINT2 SYBINT2
-#define QTDSINT4 SYBINT4
-#define QTDSINT4_N SYBINTN
-#define QTDSMONEY4 SYBMONEY4
-#define QTDSMONEY SYBMONEY
-#define QTDSMONEY_N SYBMONEYN
-#define QTDSNUMERIC SYBNUMERIC
-#define QTDSTEXT SYBTEXT
-#define QTDSVARCHAR SYBVARCHAR
-#define QTDSBIT SYBBIT
-#define QTDSBINARY SYBBINARY
-#define QTDSVARBINARY SYBVARBINARY
-#define QTDSIMAGE SYBIMAGE
-// magic numbers not defined anywhere in Sybase headers
-#define QTDSDECIMAL_2 55
-#define QTDSNUMERIC_2 63
-#endif  //DBNTWIN32
-
-#define TDS_CURSOR_SIZE 50
-
-// workaround for FreeTDS
-#ifndef CS_PUBLIC
-#define CS_PUBLIC
-#endif
-
-QSqlError qMakeError(const QString& err, QSqlError::ErrorType type, int errNo = -1)
-{
-    return QSqlError(QLatin1String("QTDS: ") + err, QString(), type,
-                     errNo != -1 ? QString::number(errNo) : QString());
-}
-
-class QTDSDriverPrivate : public QSqlDriverPrivate
-{
-    Q_DECLARE_PUBLIC(QTDSDriver)
-
-public:
-    QTDSDriverPrivate() : QSqlDriverPrivate(), login(0), initialized(false) { dbmsType = QSqlDriver::Sybase; }
-    LOGINREC* login;  // login information
-    QString hostName;
-    QString db;
-    bool initialized;
-};
-
-struct QTDSColumnData
-{
-    void *data;
-    DBINT nullbind;
-};
-Q_DECLARE_TYPEINFO(QTDSColumnData, Q_MOVABLE_TYPE);
-
-class QTDSResultPrivate;
-
-class QTDSResult : public QSqlCachedResult
-{
-    Q_DECLARE_PRIVATE(QTDSResult)
-
-public:
-    explicit QTDSResult(const QTDSDriver* db);
-    ~QTDSResult();
-    QVariant handle() const override;
-
-protected:
-    void cleanup();
-    bool reset(const QString &query) override;
-    int size() override;
-    int numRowsAffected() override;
-    bool gotoNext(QSqlCachedResult::ValueCache &values, int index) override;
-    QSqlRecord record() const override;
-};
-
-class QTDSResultPrivate: public QSqlCachedResultPrivate
-{
-    Q_DECLARE_PUBLIC(QTDSResult)
-
-public:
-    Q_DECLARE_SQLDRIVER_PRIVATE(QTDSDriver)
-    QTDSResultPrivate(QTDSResult *q, const QTDSDriver *drv)
-        : QSqlCachedResultPrivate(q, drv),
-          login(0),
-          dbproc(0) {}
-    LOGINREC* login;  // login information
-    DBPROCESS* dbproc; // connection from app to server
-    QSqlError lastError;
-    void addErrorMsg(QString& errMsg) { errorMsgs.append(errMsg); }
-    QString getErrorMsgs() { return errorMsgs.join(QLatin1String("\n")); }
-    void clearErrorMsgs() { errorMsgs.clear(); }
-    QVector<QTDSColumnData> buffer;
-    QSqlRecord rec;
-
-private:
-    QStringList errorMsgs;
-};
-
-typedef QHash<DBPROCESS *, QTDSResultPrivate *> QTDSErrorHash;
-Q_GLOBAL_STATIC(QTDSErrorHash, errs)
-
-extern "C" {
-static int CS_PUBLIC qTdsMsgHandler (DBPROCESS* dbproc,
-                            DBINT msgno,
-                            int msgstate,
-                            int severity,
-                            char* msgtext,
-                            char* srvname,
-                            char* /*procname*/,
-                            int line)
-{
-    QTDSResultPrivate* p = errs()->value(dbproc);
-
-    if (!p) {
-//        ### umm... temporary disabled since this throws a lot of warnings...
-//        qWarning("QTDSDriver warning (%d): [%s] from server [%s]", msgstate, msgtext, srvname);
-        return INT_CANCEL;
-    }
-
-    if (severity > 0) {
-        QString errMsg = QString::fromLatin1("%1 (Msg %2, Level %3, State %4, Server %5, Line %6)")
-                         .arg(QString::fromLatin1(msgtext))
-                         .arg(msgno)
-                         .arg(severity)
-                         .arg(msgstate)
-                         .arg(QString::fromLatin1(srvname))
-                         .arg(line);
-        p->addErrorMsg(errMsg);
-        if (severity > 10) {
-            // Severe messages are really errors in the sense of lastError
-            errMsg = p->getErrorMsgs();
-            p->lastError = qMakeError(errMsg, QSqlError::UnknownError, msgno);
-            p->clearErrorMsgs();
-        }
-    }
-
-    return INT_CANCEL;
-}
-
-static int CS_PUBLIC qTdsErrHandler(DBPROCESS* dbproc,
-                                int /*severity*/,
-                                int dberr,
-                                int /*oserr*/,
-                                char* dberrstr,
-                                char* oserrstr)
-{
-    QTDSResultPrivate* p = errs()->value(dbproc);
-    if (!p) {
-        qWarning("QTDSDriver error (%d): [%s] [%s]", dberr, dberrstr, oserrstr);
-        return INT_CANCEL;
-    }
-    /*
-     * If the process is dead or NULL and
-     * we are not in the middle of logging in...
-     */
-    if((dbproc == NULL || DBDEAD(dbproc))) {
-        qWarning("QTDSDriver error (%d): [%s] [%s]", dberr, dberrstr, oserrstr);
-        return INT_CANCEL;
-    }
-
-    const QString errMsg = QLatin1String(dberrstr) + QLatin1Char(' ')
-                         + QLatin1String(oserrstr) + QLatin1Char('\n')
-                         + p->getErrorMsgs();
-    p->lastError = qMakeError(errMsg, QSqlError::UnknownError, dberr);
-    p->clearErrorMsgs();
-
-    return INT_CANCEL ;
-}
-
-} //extern "C"
-
-
-QVariant::Type qDecodeTDSType(int type)
-{
-    QVariant::Type t = QVariant::Invalid;
-    switch (type) {
-    case QTDSCHAR:
-    case QTDSTEXT:
-    case QTDSVARCHAR:
-        t = QVariant::String;
-        break;
-    case QTDSINT1:
-    case QTDSINT2:
-    case QTDSINT4:
-    case QTDSINT4_N:
-    case QTDSBIT:
-        t = QVariant::Int;
-        break;
-    case QTDSFLT4:
-    case QTDSFLT8:
-    case QTDSFLT8_N:
-    case QTDSMONEY4:
-    case QTDSMONEY:
-    case QTDSDECIMAL:
-    case QTDSNUMERIC:
-#ifdef QTDSNUMERIC_2
-    case QTDSNUMERIC_2:
-#endif
-#ifdef QTDSDECIMAL_2
-    case QTDSDECIMAL_2:
-#endif
-    case QTDSMONEY_N:
-        t = QVariant::Double;
-        break;
-    case QTDSDATETIME4:
-    case QTDSDATETIME:
-    case QTDSDATETIME_N:
-        t = QVariant::DateTime;
-        break;
-    case QTDSBINARY:
-    case QTDSVARBINARY:
-    case QTDSIMAGE:
-        t = QVariant::ByteArray;
-        break;
-    default:
-        t = QVariant::Invalid;
-        break;
-    }
-    return t;
-}
-
-QVariant::Type qFieldType(QTDSResultPrivate* d, int i)
-{
-    QVariant::Type type = qDecodeTDSType(dbcoltype(d->dbproc, i+1));
-    return type;
-}
-
-
-QTDSResult::QTDSResult(const QTDSDriver* db)
-    : QSqlCachedResult(*new QTDSResultPrivate(this, db))
-{
-    Q_D(QTDSResult);
-    d->login = d->drv_d_func()->login;
-
-    d->dbproc = dbopen(d->login, const_cast<char*>(d->drv_d_func()->hostName.toLatin1().constData()));
-    if (!d->dbproc)
-        return;
-    if (dbuse(d->dbproc, const_cast<char*>(d->drv_d_func()->db.toLatin1().constData())) == FAIL)
-        return;
-
-    // insert d in error handler dict
-    errs()->insert(d->dbproc, d);
-    dbcmd(d->dbproc, "set quoted_identifier on");
-    dbsqlexec(d->dbproc);
-}
-
-QTDSResult::~QTDSResult()
-{
-    Q_D(QTDSResult);
-    cleanup();
-    if (d->dbproc)
-        dbclose(d->dbproc);
-    errs()->remove(d->dbproc);
-}
-
-void QTDSResult::cleanup()
-{
-    Q_D(QTDSResult);
-    d->clearErrorMsgs();
-    d->rec.clear();
-    for (int i = 0; i < d->buffer.size(); ++i)
-        free(d->buffer.at(i).data);
-    d->buffer.clear();
-    // "can" stands for "cancel"... very clever.
-    dbcanquery(d->dbproc);
-    dbfreebuf(d->dbproc);
-
-    QSqlCachedResult::cleanup();
-}
-
-QVariant QTDSResult::handle() const
-{
-    Q_D(const QTDSResult);
-    return QVariant(qRegisterMetaType<DBPROCESS *>("DBPROCESS*"), &d->dbproc);
-}
-
-static inline bool qIsNull(const QTDSColumnData &p)
-{
-    return p.nullbind == -1;
-}
-
-bool QTDSResult::gotoNext(QSqlCachedResult::ValueCache &values, int index)
-{
-    Q_D(QTDSResult);
-    STATUS stat = dbnextrow(d->dbproc);
-    if (stat == NO_MORE_ROWS) {
-        setAt(QSql::AfterLastRow);
-        return false;
-    }
-    if ((stat == FAIL) || (stat == BUF_FULL)) {
-        setLastError(d->lastError);
-        return false;
-    }
-
-    if (index < 0)
-        return true;
-
-    for (int i = 0; i < d->rec.count(); ++i) {
-        int idx = index + i;
-        switch (d->rec.field(i).type()) {
-            case QVariant::DateTime:
-                if (qIsNull(d->buffer.at(i))) {
-                    values[idx] = QVariant(QVariant::DateTime);
-                } else {
-                    DBDATETIME *bdt = (DBDATETIME*) d->buffer.at(i).data;
-                    QDate date = QDate::fromString(QLatin1String("1900-01-01"), Qt::ISODate);
-                    QTime time = QTime::fromString(QLatin1String("00:00:00"), Qt::ISODate);
-                    values[idx] = QDateTime(date.addDays(bdt->dtdays), time.addMSecs(int(bdt->dttime / 0.3)));
-                }
-                break;
-            case QVariant::Int:
-                if (qIsNull(d->buffer.at(i)))
-                    values[idx] = QVariant(QVariant::Int);
-                else
-                    values[idx] = *((int*)d->buffer.at(i).data);
-                break;
-            case QVariant::Double:
-            case QVariant::String:
-                if (qIsNull(d->buffer.at(i)))
-                    values[idx] = QVariant(QVariant::String);
-                else
-                    values[idx] = QString::fromLocal8Bit((const char*)d->buffer.at(i).data).trimmed();
-                break;
-            case QVariant::ByteArray: {
-                if (qIsNull(d->buffer.at(i)))
-                    values[idx] = QVariant(QVariant::ByteArray);
-                else
-                    values[idx] = QByteArray((const char*)d->buffer.at(i).data);
-                break;
-            }
-            default:
-                // should never happen, and we already fired
-                // a warning while binding.
-                values[idx] = QVariant();
-                break;
-        }
-    }
-
-    return true;
-}
-
-bool QTDSResult::reset (const QString& query)
-{
-    Q_D(QTDSResult);
-    cleanup();
-    if (!driver() || !driver()-> isOpen() || driver()->isOpenError())
-        return false;
-    setActive(false);
-    setAt(QSql::BeforeFirstRow);
-    if (dbcmd(d->dbproc, const_cast<char*>(query.toLocal8Bit().constData())) == FAIL) {
-        setLastError(d->lastError);
-        return false;
-    }
-
-    if (dbsqlexec(d->dbproc) == FAIL) {
-        setLastError(d->lastError);
-        dbfreebuf(d->dbproc);
-        return false;
-    }
-    if (dbresults(d->dbproc) != SUCCEED) {
-        setLastError(d->lastError);
-        dbfreebuf(d->dbproc);
-        return false;
-    }
-
-    setSelect((DBCMDROW(d->dbproc) == SUCCEED)); // decide whether or not we are dealing with a SELECT query
-    int numCols = dbnumcols(d->dbproc);
-    if (numCols > 0) {
-        d->buffer.resize(numCols);
-        init(numCols);
-    }
-    for (int i = 0; i < numCols; ++i) {
-        int dbType = dbcoltype(d->dbproc, i+1);
-        QVariant::Type vType = qDecodeTDSType(dbType);
-        QSqlField f(QString::fromLatin1(dbcolname(d->dbproc, i+1)), vType);
-        f.setSqlType(dbType);
-        f.setLength(dbcollen(d->dbproc, i+1));
-        d->rec.append(f);
-
-        RETCODE ret = -1;
-        void* p = 0;
-        switch (vType) {
-        case QVariant::Int:
-            p = malloc(4);
-            ret = dbbind(d->dbproc, i+1, INTBIND, (DBINT) 4, (unsigned char *)p);
-            break;
-        case QVariant::Double:
-            // use string binding to prevent loss of precision
-            p = malloc(50);
-            ret = dbbind(d->dbproc, i+1, STRINGBIND, 50, (unsigned char *)p);
-            break;
-        case QVariant::String:
-            p = malloc(dbcollen(d->dbproc, i+1) + 1);
-            ret = dbbind(d->dbproc, i+1, STRINGBIND, DBINT(dbcollen(d->dbproc, i+1) + 1), (unsigned char *)p);
-            break;
-        case QVariant::DateTime:
-            p = malloc(8);
-            ret = dbbind(d->dbproc, i+1, DATETIMEBIND, (DBINT) 8, (unsigned char *)p);
-            break;
-        case QVariant::ByteArray:
-            p = malloc(dbcollen(d->dbproc, i+1) + 1);
-            ret = dbbind(d->dbproc, i+1, BINARYBIND, DBINT(dbcollen(d->dbproc, i+1) + 1), (unsigned char *)p);
-            break;
-        default: //don't bind the field since we do not support it
-            qWarning("QTDSResult::reset: Unsupported type for field \"%s\"", dbcolname(d->dbproc, i+1));
-            break;
-        }
-        if (ret == SUCCEED) {
-            d->buffer[i].data = p;
-            ret = dbnullbind(d->dbproc, i+1, &d->buffer[i].nullbind);
-        } else {
-            d->buffer[i].data = 0;
-            d->buffer[i].nullbind = 0;
-            free(p);
-        }
-        if ((ret != SUCCEED) && (ret != -1)) {
-            setLastError(d->lastError);
-            return false;
-        }
-    }
-
-    setActive(true);
-    return true;
-}
-
-int QTDSResult::size()
-{
-    return -1;
-}
-
-int QTDSResult::numRowsAffected()
-{
-    Q_D(const QTDSResult);
-#ifdef DBNTWIN32
-    if (dbiscount(d->dbproc)) {
-        return DBCOUNT(d->dbproc);
-    }
-    return -1;
-#else
-    return DBCOUNT(d->dbproc);
-#endif
-}
-
-QSqlRecord QTDSResult::record() const
-{
-    Q_D(const QTDSResult);
-    return d->rec;
-}
-
-///////////////////////////////////////////////////////////////////
-
-QTDSDriver::QTDSDriver(QObject* parent)
-    : QSqlDriver(*new QTDSDriverPrivate, parent)
-{
-    init();
-}
-
-QTDSDriver::QTDSDriver(LOGINREC* rec, const QString& host, const QString &db, QObject* parent)
-    : QSqlDriver(*new QTDSDriverPrivate, parent)
-{
-    Q_D(QTDSDriver);
-    init();
-    d->login = rec;
-    d->hostName = host;
-    d->db = db;
-    if (rec) {
-        setOpen(true);
-        setOpenError(false);
-    }
-}
-
-QVariant QTDSDriver::handle() const
-{
-    Q_D(const QTDSDriver);
-    return QVariant(qRegisterMetaType<LOGINREC *>("LOGINREC*"), &d->login);
-}
-
-void QTDSDriver::init()
-{
-    Q_D(QTDSDriver);
-    d->initialized = (dbinit() == SUCCEED);
-    // the following two code-lines will fail compilation on some FreeTDS versions
-    // just comment them out if you have FreeTDS (you won't get any errors and warnings then)
-    dberrhandle((QERRHANDLE)qTdsErrHandler);
-    dbmsghandle((QMSGHANDLE)qTdsMsgHandler);
-}
-
-QTDSDriver::~QTDSDriver()
-{
-    dberrhandle(0);
-    dbmsghandle(0);
-    // dbexit also calls dbclose if necessary
-    dbexit();
-}
-
-bool QTDSDriver::hasFeature(DriverFeature f) const
-{
-    switch (f) {
-    case Transactions:
-    case QuerySize:
-    case Unicode:
-    case SimpleLocking:
-    case EventNotifications:
-    case MultipleResultSets:
-        return false;
-    case BLOB:
-        return true;
-    default:
-        return false;
-    }
-}
-
-bool QTDSDriver::open(const QString & db,
-                       const QString & user,
-                       const QString & password,
-                       const QString & host,
-                       int /*port*/,
-                       const QString& /*connOpts*/)
-{
-    Q_D(QTDSDriver);
-    if (isOpen())
-        close();
-    if (!d->initialized) {
-        setOpenError(true);
-        return false;
-    }
-    d->login = dblogin();
-    if (!d->login) {
-        setOpenError(true);
-        return false;
-    }
-    DBSETLPWD(d->login, const_cast<char*>(password.toLocal8Bit().constData()));
-    DBSETLUSER(d->login, const_cast<char*>(user.toLocal8Bit().constData()));
-
-    // Now, try to open and use the database. If this fails, return false.
-    DBPROCESS* dbproc;
-
-    dbproc = dbopen(d->login, const_cast<char*>(host.toLatin1().constData()));
-    if (!dbproc) {
-        setLastError(qMakeError(tr("Unable to open connection"), QSqlError::ConnectionError, -1));
-        setOpenError(true);
-        return false;
-    }
-    if (dbuse(dbproc, const_cast<char*>(db.toLatin1().constData())) == FAIL) {
-        setLastError(qMakeError(tr("Unable to use database"), QSqlError::ConnectionError, -1));
-        setOpenError(true);
-        return false;
-    }
-    dbclose( dbproc );
-
-    setOpen(true);
-    setOpenError(false);
-    d->hostName = host;
-    d->db = db;
-    return true;
-}
-
-void QTDSDriver::close()
-{
-    Q_D(QTDSDriver);
-    if (isOpen()) {
-#ifdef Q_USE_SYBASE
-        dbloginfree(d->login);
-#else
-        dbfreelogin(d->login);
-#endif
-        d->login = 0;
-        setOpen(false);
-        setOpenError(false);
-    }
-}
-
-QSqlResult *QTDSDriver::createResult() const
-{
-    return new QTDSResult(this);
-}
-
-bool QTDSDriver::beginTransaction()
-{
-    return false;
-/*
-    if (!isOpen()) {
-        qWarning("QTDSDriver::beginTransaction: Database not open");
-        return false;
-    }
-    if (dbcmd(d->dbproc, "BEGIN TRANSACTION") == FAIL) {
-        setLastError(d->lastError);
-        dbfreebuf(d->dbproc);
-        return false;
-    }
-    if (dbsqlexec(d->dbproc) == FAIL) {
-        setLastError(d->lastError);
-        dbfreebuf(d->dbproc);
-        return false;
-    }
-    while(dbresults(d->dbproc) == NO_MORE_RESULTS) {}
-    dbfreebuf(d->dbproc);
-    inTransaction = true;
-    return true;
-*/
-}
-
-bool QTDSDriver::commitTransaction()
-{
-    return false;
-/*
-    if (!isOpen()) {
-        qWarning("QTDSDriver::commitTransaction: Database not open");
-        return false;
-    }
-    if (dbcmd(d->dbproc, "COMMIT TRANSACTION") == FAIL) {
-        setLastError(d->lastError);
-        dbfreebuf(d->dbproc);
-        return false;
-    }
-    if (dbsqlexec(d->dbproc) == FAIL) {
-        setLastError(d->lastError);
-        dbfreebuf(d->dbproc);
-        return false;
-    }
-    while(dbresults(d->dbproc) == NO_MORE_RESULTS) {}
-    dbfreebuf(d->dbproc);
-    inTransaction = false;
-    return true;
-*/
-}
-
-bool QTDSDriver::rollbackTransaction()
-{
-    return false;
-/*
-    if (!isOpen()) {
-        qWarning("QTDSDriver::rollbackTransaction: Database not open");
-        return false;
-    }
-    if (dbcmd(d->dbproc, "ROLLBACK TRANSACTION") == FAIL) {
-        setLastError(d->lastError);
-        dbfreebuf(d->dbproc);
-        return false;
-    }
-    if (dbsqlexec(d->dbproc) == FAIL) {
-        setLastError(d->lastError);
-        dbfreebuf(d->dbproc);
-        return false;
-    }
-    while(dbresults(d->dbproc) == NO_MORE_RESULTS) {}
-    dbfreebuf(d->dbproc);
-    inTransaction = false;
-    return true;
-*/
-}
-
-QSqlRecord QTDSDriver::record(const QString& tablename) const
-{
-    QSqlRecord info;
-    if (!isOpen())
-        return info;
-    QSqlQuery t(createResult());
-    t.setForwardOnly(true);
-
-    QString table = tablename;
-    if (isIdentifierEscaped(table, QSqlDriver::TableName))
-        table = stripDelimiters(table, QSqlDriver::TableName);
-
-    QString stmt (QLatin1String("select name, type, length, prec from syscolumns "
-                   "where id = (select id from sysobjects where name = '%1')"));
-    t.exec(stmt.arg(table));
-    while (t.next()) {
-        QSqlField f(t.value(0).toString().simplified(), qDecodeTDSType(t.value(1).toInt()), tablename);
-        f.setLength(t.value(2).toInt());
-        f.setPrecision(t.value(3).toInt());
-        f.setSqlType(t.value(1).toInt());
-        info.append(f);
-    }
-    return info;
-}
-
-QStringList QTDSDriver::tables(QSql::TableType type) const
-{
-    QStringList list;
-
-    if (!isOpen())
-        return list;
-
-    QStringList typeFilter;
-
-    if (type & QSql::Tables)
-        typeFilter += QLatin1String("type='U'");
-    if (type & QSql::SystemTables)
-        typeFilter += QLatin1String("type='S'");
-    if (type & QSql::Views)
-        typeFilter += QLatin1String("type='V'");
-
-    if (typeFilter.isEmpty())
-        return list;
-
-    QSqlQuery t(createResult());
-    t.setForwardOnly(true);
-    t.exec(QLatin1String("select name from sysobjects where ") + typeFilter.join(QLatin1String(" or ")));
-    while (t.next())
-        list.append(t.value(0).toString().simplified());
-
-    return list;
-}
-
-QString QTDSDriver::formatValue(const QSqlField &field,
-                                  bool trim) const
-{
-    QString r;
-    if (field.isNull())
-        r = QLatin1String("NULL");
-    else if (field.type() == QVariant::DateTime) {
-        if (field.value().toDateTime().isValid()){
-            r = field.value().toDateTime().toString(u"yyyyMMdd hh:mm:ss");
-            r.prepend(QLatin1String("'"));
-            r.append(QLatin1String("'"));
-        } else
-            r = QLatin1String("NULL");
-    } else if (field.type() == QVariant::ByteArray) {
-        QByteArray ba = field.value().toByteArray();
-        QString res;
-        static const char hexchars[] = "0123456789abcdef";
-        for (int i = 0; i < ba.size(); ++i) {
-            uchar s = (uchar) ba[i];
-            res += QLatin1Char(hexchars[s >> 4]);
-            res += QLatin1Char(hexchars[s & 0x0f]);
-        }
-        r = QLatin1String("0x") + res;
-    } else {
-        r = QSqlDriver::formatValue(field, trim);
-    }
-    return r;
-}
-
-QSqlIndex QTDSDriver::primaryIndex(const QString& tablename) const
-{
-    QSqlRecord rec = record(tablename);
-
-    QString table = tablename;
-    if (isIdentifierEscaped(table, QSqlDriver::TableName))
-        table = stripDelimiters(table, QSqlDriver::TableName);
-
-    QSqlIndex idx(table);
-    if ((!isOpen()) || (table.isEmpty()))
-        return QSqlIndex();
-
-    QSqlQuery t(createResult());
-    t.setForwardOnly(true);
-    t.exec(QString::fromLatin1("sp_helpindex '%1'").arg(table));
-    if (t.next()) {
-        QStringList fNames = t.value(2).toString().simplified().split(QLatin1Char(','));
-        QRegExp regx(QLatin1String("\\s*(\\S+)(?:\\s+(DESC|desc))?\\s*"));
-        for(QStringList::Iterator it = fNames.begin(); it != fNames.end(); ++it) {
-            regx.indexIn(*it);
-            QSqlField f(regx.cap(1), rec.field(regx.cap(1)).type(), tablename);
-            if (regx.cap(2).toLower() == QLatin1String("desc")) {
-                idx.append(f, true);
-            } else {
-                idx.append(f, false);
-            }
-        }
-        idx.setName(t.value(0).toString().simplified());
-    }
-    return idx;
-}
-
-QString QTDSDriver::escapeIdentifier(const QString &identifier, IdentifierType type) const
-{
-    Q_UNUSED(type)
-    QString res = identifier;
-    if(!identifier.isEmpty() && !identifier.startsWith(QLatin1Char('"')) && !identifier.endsWith(QLatin1Char('"')) ) {
-        res.replace(QLatin1Char('"'), QLatin1String("\"\""));
-        res.prepend(QLatin1Char('"')).append(QLatin1Char('"'));
-        res.replace(QLatin1Char('.'), QLatin1String("\".\""));
-    }
-    return res;
-}
-
-QT_END_NAMESPACE
diff --git a/src/plugins/sqldrivers/tds/qsql_tds_p.h b/src/plugins/sqldrivers/tds/qsql_tds_p.h
deleted file mode 100644
index b72fababbb..0000000000
--- a/src/plugins/sqldrivers/tds/qsql_tds_p.h
+++ /dev/null
@@ -1,120 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtSql module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QSQL_TDS_H
-#define QSQL_TDS_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include <QtSql/qsqldriver.h>
-
-#ifdef Q_OS_WIN32
-#define WIN32_LEAN_AND_MEAN
-#ifndef Q_USE_SYBASE
-#define DBNTWIN32 // indicates 32bit windows dblib
-#endif
-#include <winsock2.h>
-#include <QtCore/qt_windows.h>
-#include <sqlfront.h>
-#include <sqldb.h>
-#define CS_PUBLIC
-#else
-#include <sybfront.h>
-#include <sybdb.h>
-#endif //Q_OS_WIN32
-
-#ifdef QT_PLUGIN
-#define Q_EXPORT_SQLDRIVER_TDS
-#else
-#define Q_EXPORT_SQLDRIVER_TDS Q_SQL_EXPORT
-#endif
-
-QT_BEGIN_NAMESPACE
-
-class QSqlResult;
-class QTDSDriverPrivate;
-
-class Q_EXPORT_SQLDRIVER_TDS QTDSDriver : public QSqlDriver
-{
-    Q_DECLARE_PRIVATE(QTDSDriver)
-    Q_OBJECT
-    friend class QTDSResultPrivate;
-public:
-    explicit QTDSDriver(QObject* parent = nullptr);
-    QTDSDriver(LOGINREC* rec, const QString& host, const QString &db, QObject* parent = nullptr);
-    ~QTDSDriver();
-    bool hasFeature(DriverFeature f) const override;
-    bool open(const QString &db,
-               const QString &user,
-               const QString &password,
-               const QString &host,
-               int port,
-               const QString &connOpts) override;
-    void close() override;
-    QStringList tables(QSql::TableType) const override;
-    QSqlResult *createResult() const override;
-    QSqlRecord record(const QString &tablename) const override;
-    QSqlIndex primaryIndex(const QString &tablename) const override;
-
-    QString formatValue(const QSqlField &field,
-                         bool trimStrings) const override;
-    QVariant handle() const override;
-
-    QString escapeIdentifier(const QString &identifier, IdentifierType type) const override;
-
-protected:
-    bool beginTransaction() override;
-    bool commitTransaction() override;
-    bool rollbackTransaction() override;
-private:
-    void init();
-};
-
-QT_END_NAMESPACE
-
-#endif // QSQL_TDS_H
diff --git a/src/plugins/sqldrivers/tds/tds.json b/src/plugins/sqldrivers/tds/tds.json
deleted file mode 100644
index 35955db9fa..0000000000
--- a/src/plugins/sqldrivers/tds/tds.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "Keys": [ "QTDS7", "QTDS" ]
-}
diff --git a/src/plugins/sqldrivers/tds/tds.pro b/src/plugins/sqldrivers/tds/tds.pro
deleted file mode 100644
index 67bc0f5c48..0000000000
--- a/src/plugins/sqldrivers/tds/tds.pro
+++ /dev/null
@@ -1,11 +0,0 @@
-TARGET = qsqltds
-
-HEADERS += $$PWD/qsql_tds_p.h
-SOURCES += $$PWD/qsql_tds.cpp $$PWD/main.cpp
-
-QMAKE_USE += tds
-
-OTHER_FILES += tds.json
-
-PLUGIN_CLASS_NAME = QTDSDriverPlugin
-include(../qsqldriverbase.pri)
diff --git a/src/plugins/styles/.prev_CMakeLists.txt b/src/plugins/styles/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..73329915f6
--- /dev/null
+++ b/src/plugins/styles/.prev_CMakeLists.txt
@@ -0,0 +1,11 @@
+# Generated from styles.pro.
+
+if(QT_FEATURE_style_android)
+    add_subdirectory(android)
+endif()
+if(QT_FEATURE_style_mac)
+    add_subdirectory(mac)
+endif()
+if(QT_FEATURE_style_windowsvista)
+    add_subdirectory(windowsvista)
+endif()
diff --git a/src/plugins/styles/CMakeLists.txt b/src/plugins/styles/CMakeLists.txt
new file mode 100644
index 0000000000..d24e3daff8
--- /dev/null
+++ b/src/plugins/styles/CMakeLists.txt
@@ -0,0 +1,11 @@
+# Generated from styles.pro.
+
+if(QT_FEATURE_style_android)
+    # add_subdirectory(android) # special case TODO
+endif()
+if(QT_FEATURE_style_mac)
+    add_subdirectory(mac)
+endif()
+if(QT_FEATURE_style_windowsvista)
+    add_subdirectory(windowsvista)
+endif()
diff --git a/src/plugins/styles/android/qandroidstyle.cpp b/src/plugins/styles/android/qandroidstyle.cpp
index 086df92322..1d0838daec 100644
--- a/src/plugins/styles/android/qandroidstyle.cpp
+++ b/src/plugins/styles/android/qandroidstyle.cpp
@@ -248,7 +248,7 @@ QAndroidStyle::ItemType QAndroidStyle::qtControl(QStyle::PrimitiveElement primit
     case QStyle::PE_FrameLineEdit:
         return QC_EditText;
 
-    case QStyle::PE_IndicatorViewItemCheck:
+    case QStyle::PE_IndicatorItemViewItemCheck:
     case QStyle::PE_IndicatorCheckBox:
         return QC_Checkbox;
 
diff --git a/src/plugins/styles/mac/CMakeLists.txt b/src/plugins/styles/mac/CMakeLists.txt
new file mode 100644
index 0000000000..140d4e4c93
--- /dev/null
+++ b/src/plugins/styles/mac/CMakeLists.txt
@@ -0,0 +1,23 @@
+# Generated from mac.pro.
+
+#####################################################################
+## QMacStylePlugin Plugin:
+#####################################################################
+
+qt_add_plugin(QMacStylePlugin
+    OUTPUT_NAME qmacstyle
+    TYPE styles
+    SOURCES
+        main.mm
+        qmacstyle_mac.mm qmacstyle_mac_p.h
+        qmacstyle_mac_p_p.h
+    LIBRARIES
+        ${FWAppKit}
+    PUBLIC_LIBRARIES
+        Qt::Core
+        Qt::Gui
+        Qt::WidgetsPrivate
+)
+
+#### Keys ignored in scope 1:.:.:mac.pro:<TRUE>:
+# DISTFILES = "macstyle.json"
diff --git a/src/plugins/styles/mac/qmacstyle_mac.mm b/src/plugins/styles/mac/qmacstyle_mac.mm
index d5ad1a8ca0..f473c3cbe3 100644
--- a/src/plugins/styles/mac/qmacstyle_mac.mm
+++ b/src/plugins/styles/mac/qmacstyle_mac.mm
@@ -854,7 +854,8 @@ static inline int qt_mac_aqua_get_metric(QAquaMetric m)
     return qt_mac_aqua_metrics[m];
 }
 
-static QSize qt_aqua_get_known_size(QStyle::ContentsType ct, const QWidget *widg, QSize szHint,
+static QSize qt_aqua_get_known_size(QStyle::ContentsType ct, const QStyleOption *opt,
+                                    const QWidget *widg, QSize szHint,
                                     QStyleHelper::WidgetSizePolicy sz)
 {
     QSize ret(-1, -1);
@@ -918,12 +919,9 @@ static QSize qt_aqua_get_known_size(QStyle::ContentsType ct, const QWidget *widg
     switch (ct) {
 #if QT_CONFIG(pushbutton)
     case QStyle::CT_PushButton: {
-        const QPushButton *psh = qobject_cast<const QPushButton *>(widg);
-        // If this comparison is false, then the widget was not a push button.
-        // This is bad and there's very little we can do since we were requested to find a
-        // sensible size for a widget that pretends to be a QPushButton but is not.
-        if(psh) {
-            QString buttonText = qt_mac_removeMnemonics(psh->text());
+        const QStyleOptionButton *btn = qstyleoption_cast<const QStyleOptionButton *>(opt);
+        if (btn) {
+            QString buttonText = qt_mac_removeMnemonics(btn->text);
             if (buttonText.contains(QLatin1Char('\n')))
                 ret = QSize(-1, -1);
             else if (sz == QStyleHelper::SizeLarge)
@@ -933,11 +931,11 @@ static QSize qt_aqua_get_known_size(QStyle::ContentsType ct, const QWidget *widg
             else if (sz == QStyleHelper::SizeMini)
                 ret = QSize(-1, qt_mac_aqua_get_metric(MiniPushButtonHeight));
 
-            if (!psh->icon().isNull()){
+            if (!btn->icon.isNull()){
                 // If the button got an icon, and the icon is larger than the
                 // button, we can't decide on a default size
                 ret.setWidth(-1);
-                if (ret.height() < psh->iconSize().height())
+                if (ret.height() < btn->iconSize.height())
                     ret.setHeight(-1);
             }
             else if (buttonText == QLatin1String("OK") || buttonText == QLatin1String("Cancel")){
@@ -951,18 +949,7 @@ static QSize qt_aqua_get_known_size(QStyle::ContentsType ct, const QWidget *widg
                 // or accept button (i.e., rightmost) and cancel button have the same width.
                 ret.setWidth(69);
             }
-        } else {
-            // The only sensible thing to do is to return whatever the style suggests...
-            if (sz == QStyleHelper::SizeLarge)
-                ret = QSize(-1, qt_mac_aqua_get_metric(PushButtonHeight));
-            else if (sz == QStyleHelper::SizeSmall)
-                ret = QSize(-1, qt_mac_aqua_get_metric(SmallPushButtonHeight));
-            else if (sz == QStyleHelper::SizeMini)
-                ret = QSize(-1, qt_mac_aqua_get_metric(MiniPushButtonHeight));
-            else
-                // Since there's no default size we return the large size...
-                ret = QSize(-1, qt_mac_aqua_get_metric(PushButtonHeight));
-         }
+        }
 #endif
 #if 0 //Not sure we are applying the rules correctly for RadioButtons/CheckBoxes --Sam
     } else if (ct == QStyle::CT_RadioButton) {
@@ -1018,19 +1005,19 @@ static QSize qt_aqua_get_known_size(QStyle::ContentsType ct, const QWidget *widg
             int width = 0, height = 0;
             if (szHint == QSize(-1, -1)) { //just 'guess'..
 #if QT_CONFIG(toolbutton)
-                const QToolButton *bt = qobject_cast<const QToolButton *>(widg);
+                const QStyleOptionToolButton *bt = qstyleoption_cast<const QStyleOptionToolButton *>(opt);
                 // If this conversion fails then the widget was not what it claimed to be.
                 if(bt) {
-                    if (!bt->icon().isNull()) {
-                        QSize iconSize = bt->iconSize();
-                        QSize pmSize = bt->icon().actualSize(QSize(32, 32), QIcon::Normal);
+                    if (!bt->icon.isNull()) {
+                        QSize iconSize = bt->iconSize;
+                        QSize pmSize = bt->icon.actualSize(QSize(32, 32), QIcon::Normal);
                         width = qMax(width, qMax(iconSize.width(), pmSize.width()));
                         height = qMax(height, qMax(iconSize.height(), pmSize.height()));
                     }
-                    if (!bt->text().isNull() && bt->toolButtonStyle() != Qt::ToolButtonIconOnly) {
-                        int text_width = bt->fontMetrics().horizontalAdvance(bt->text()),
-                           text_height = bt->fontMetrics().height();
-                        if (bt->toolButtonStyle() == Qt::ToolButtonTextUnderIcon) {
+                    if (!bt->text.isNull() && bt->toolButtonStyle != Qt::ToolButtonIconOnly) {
+                        int text_width = bt->fontMetrics.horizontalAdvance(bt->text),
+                           text_height = bt->fontMetrics.height();
+                        if (bt->toolButtonStyle == Qt::ToolButtonTextUnderIcon) {
                             width = qMax(width, text_width);
                             height += text_height;
                         } else {
@@ -1056,37 +1043,37 @@ static QSize qt_aqua_get_known_size(QStyle::ContentsType ct, const QWidget *widg
         break;
     case QStyle::CT_Slider: {
         int w = -1;
-        const QSlider *sld = qobject_cast<const QSlider *>(widg);
+        const QStyleOptionSlider *sld = qstyleoption_cast<const QStyleOptionSlider *>(opt);
         // If this conversion fails then the widget was not what it claimed to be.
         if(sld) {
             if (sz == QStyleHelper::SizeLarge) {
-                if (sld->orientation() == Qt::Horizontal) {
+                if (sld->orientation == Qt::Horizontal) {
                     w = qt_mac_aqua_get_metric(HSliderHeight);
-                    if (sld->tickPosition() != QSlider::NoTicks)
+                    if (sld->tickPosition != QSlider::NoTicks)
                         w += qt_mac_aqua_get_metric(HSliderTickHeight);
                 } else {
                     w = qt_mac_aqua_get_metric(VSliderWidth);
-                    if (sld->tickPosition() != QSlider::NoTicks)
+                    if (sld->tickPosition != QSlider::NoTicks)
                         w += qt_mac_aqua_get_metric(VSliderTickWidth);
                 }
             } else if (sz == QStyleHelper::SizeSmall) {
-                if (sld->orientation() == Qt::Horizontal) {
+                if (sld->orientation == Qt::Horizontal) {
                     w = qt_mac_aqua_get_metric(SmallHSliderHeight);
-                    if (sld->tickPosition() != QSlider::NoTicks)
+                    if (sld->tickPosition != QSlider::NoTicks)
                         w += qt_mac_aqua_get_metric(SmallHSliderTickHeight);
                 } else {
                     w = qt_mac_aqua_get_metric(SmallVSliderWidth);
-                    if (sld->tickPosition() != QSlider::NoTicks)
+                    if (sld->tickPosition != QSlider::NoTicks)
                         w += qt_mac_aqua_get_metric(SmallVSliderTickWidth);
                 }
             } else if (sz == QStyleHelper::SizeMini) {
-                if (sld->orientation() == Qt::Horizontal) {
+                if (sld->orientation == Qt::Horizontal) {
                     w = qt_mac_aqua_get_metric(MiniHSliderHeight);
-                    if (sld->tickPosition() != QSlider::NoTicks)
+                    if (sld->tickPosition != QSlider::NoTicks)
                         w += qt_mac_aqua_get_metric(MiniHSliderTickHeight);
                 } else {
                     w = qt_mac_aqua_get_metric(MiniVSliderWidth);
-                    if (sld->tickPosition() != QSlider::NoTicks)
+                    if (sld->tickPosition != QSlider::NoTicks)
                         w += qt_mac_aqua_get_metric(MiniVSliderTickWidth);
                 }
             }
@@ -1098,7 +1085,7 @@ static QSize qt_aqua_get_known_size(QStyle::ContentsType ct, const QWidget *widg
             w = qt_mac_aqua_get_metric(HSliderHeight);
             w += qt_mac_aqua_get_metric(HSliderTickHeight);
         }
-        if (sld->orientation() == Qt::Horizontal)
+        if (sld->orientation == Qt::Horizontal)
             ret.setHeight(w);
         else
             ret.setWidth(w);
@@ -1496,9 +1483,9 @@ QStyleHelper::WidgetSizePolicy QMacStylePrivate::aquaSizeConstrain(const QStyleO
         return QStyleHelper::SizeDefault;
     }
 
-    QSize large = qt_aqua_get_known_size(ct, widg, szHint, QStyleHelper::SizeLarge),
-          small = qt_aqua_get_known_size(ct, widg, szHint, QStyleHelper::SizeSmall),
-          mini  = qt_aqua_get_known_size(ct, widg, szHint, QStyleHelper::SizeMini);
+    QSize large = qt_aqua_get_known_size(ct, option, widg, szHint, QStyleHelper::SizeLarge),
+          small = qt_aqua_get_known_size(ct, option, widg, szHint, QStyleHelper::SizeSmall),
+          mini  = qt_aqua_get_known_size(ct, option, widg, szHint, QStyleHelper::SizeMini);
     bool guess_size = false;
     QStyleHelper::WidgetSizePolicy ret = QStyleHelper::SizeDefault;
     QStyleHelper::WidgetSizePolicy wsp = QStyleHelper::widgetSizePolicy(widg);
@@ -2489,7 +2476,7 @@ int QMacStyle::pixelMetric(PixelMetric metric, const QStyleOption *opt, const QW
             aSize = QStyleHelper::SizeSmall;
         else
             aSize = QStyleHelper::SizeLarge;
-        const QSize size = qt_aqua_get_known_size(CT_SizeGrip, widget, QSize(), aSize);
+        const QSize size = qt_aqua_get_known_size(CT_SizeGrip, opt, widget, QSize(), aSize);
         ret = size.width();
         break; }
     case PM_MdiSubWindowFrameWidth:
@@ -2766,12 +2753,12 @@ int QMacStyle::styleHint(StyleHint sh, const QStyleOption *opt, const QWidget *w
             }
 
             const QRgb *sptr = (QRgb*)img.bits(), *srow;
-            const int sbpl = img.bytesPerLine();
+            const qsizetype sbpl = img.bytesPerLine();
             const int w = sbpl/4, h = img.height();
 
             QImage img_mask(img.width(), img.height(), QImage::Format_ARGB32);
             QRgb *dptr = (QRgb*)img_mask.bits(), *drow;
-            const int dbpl = img_mask.bytesPerLine();
+            const qsizetype dbpl = img_mask.bytesPerLine();
 
             for (int y = 0; y < h; ++y) {
                 srow = sptr+((y*sbpl)/4);
@@ -3262,7 +3249,7 @@ void QMacStyle::drawPrimitive(PrimitiveElement pe, const QStyleOption *opt, QPai
 
         CGContextRestoreGState(cg);
         break; }
-    case PE_IndicatorViewItemCheck:
+    case PE_IndicatorItemViewItemCheck:
     case PE_IndicatorRadioButton:
     case PE_IndicatorCheckBox: {
         const bool isEnabled = opt->state & State_Enabled;
diff --git a/src/plugins/styles/windowsvista/CMakeLists.txt b/src/plugins/styles/windowsvista/CMakeLists.txt
new file mode 100644
index 0000000000..008fa624fe
--- /dev/null
+++ b/src/plugins/styles/windowsvista/CMakeLists.txt
@@ -0,0 +1,27 @@
+# Generated from windowsvista.pro.
+
+#####################################################################
+## QWindowsVistaStylePlugin Plugin:
+#####################################################################
+
+qt_add_plugin(QWindowsVistaStylePlugin
+    OUTPUT_NAME qwindowsvistastyle
+    TYPE styles
+    SOURCES
+        main.cpp
+        qwindowsvistastyle.cpp qwindowsvistastyle_p.h
+        qwindowsvistastyle_p_p.h
+        qwindowsxpstyle.cpp qwindowsxpstyle_p.h
+        qwindowsxpstyle_p_p.h
+    LIBRARIES
+        gdi32
+        user32
+        uxtheme
+    PUBLIC_LIBRARIES
+        Qt::Core
+        Qt::Gui
+        Qt::WidgetsPrivate
+)
+
+#### Keys ignored in scope 1:.:.:windowsvista.pro:<TRUE>:
+# DISTFILES = "windowsvistastyle.json"
diff --git a/src/printsupport/CMakeLists.txt b/src/printsupport/CMakeLists.txt
new file mode 100644
index 0000000000..c11b9d8b15
--- /dev/null
+++ b/src/printsupport/CMakeLists.txt
@@ -0,0 +1,180 @@
+# Generated from printsupport.pro.
+
+#####################################################################
+## PrintSupport Module:
+#####################################################################
+
+qt_add_module(PrintSupport
+    PLUGIN_TYPES printsupport
+    SOURCES
+        kernel/qpaintengine_alpha.cpp kernel/qpaintengine_alpha_p.h
+        kernel/qplatformprintdevice.cpp kernel/qplatformprintdevice.h
+        kernel/qplatformprintersupport.cpp kernel/qplatformprintersupport.h
+        kernel/qplatformprintplugin.cpp kernel/qplatformprintplugin.h
+        kernel/qprint_p.h
+        kernel/qprintdevice.cpp kernel/qprintdevice_p.h
+        kernel/qprintengine.h
+        kernel/qprintengine_pdf.cpp
+        kernel/qprinter.cpp kernel/qprinter.h kernel/qprinter_p.h
+        kernel/qprinterinfo.cpp kernel/qprinterinfo.h kernel/qprinterinfo_p.h
+        kernel/qtprintsupportglobal.h kernel/qtprintsupportglobal_p.h
+    DEFINES
+        QT_NO_FOREACH
+        QT_NO_USING_NAMESPACE
+    INCLUDE_DIRECTORIES
+        dialogs
+        widgets
+    LIBRARIES
+        Qt::CorePrivate
+        Qt::GuiPrivate
+        Qt::WidgetsPrivate
+    PUBLIC_LIBRARIES
+        Qt::Core
+        Qt::Gui
+        Qt::Widgets
+    PRIVATE_MODULE_INTERFACE
+        Qt::CorePrivate
+        Qt::GuiPrivate
+        Qt::WidgetsPrivate
+)
+
+#### Keys ignored in scope 1:.:.:printsupport.pro:<TRUE>:
+# QMAKE_LIBS = "$$QMAKE_LIBS_PRINTSUPPORT"
+
+## Scopes:
+#####################################################################
+
+qt_extend_target(PrintSupport CONDITION QT_FEATURE_printpreviewwidget
+    SOURCES
+        kernel/qpaintengine_preview.cpp kernel/qpaintengine_preview_p.h
+        widgets/qprintpreviewwidget.cpp widgets/qprintpreviewwidget.h
+)
+
+qt_extend_target(PrintSupport CONDITION WIN32
+    SOURCES
+        kernel/qprintengine_win.cpp kernel/qprintengine_win_p.h
+)
+
+qt_extend_target(PrintSupport CONDITION WIN32 AND NOT WINRT
+    LIBRARIES
+        comdlg32
+        gdi32
+        user32
+        winspool
+)
+
+qt_extend_target(PrintSupport CONDITION QT_FEATURE_cups AND UNIX AND NOT APPLE
+    SOURCES
+        kernel/qcups.cpp kernel/qcups_p.h
+)
+
+qt_extend_target(PrintSupport CONDITION QT_FEATURE_cupsjobwidget AND UNIX AND NOT APPLE
+    SOURCES
+        widgets/qcupsjobwidget.cpp widgets/qcupsjobwidget.ui widgets/qcupsjobwidget_p.h
+    ENABLE_AUTOGEN_TOOLS
+        uic
+)
+
+qt_extend_target(PrintSupport CONDITION QT_FEATURE_printdialog
+    SOURCES
+        dialogs/qabstractprintdialog.cpp dialogs/qabstractprintdialog.h dialogs/qabstractprintdialog_p.h
+        dialogs/qpagesetupdialog.cpp dialogs/qpagesetupdialog.h dialogs/qpagesetupdialog_p.h
+        dialogs/qpagesetupwidget.ui
+        dialogs/qprintdialog.h
+    ENABLE_AUTOGEN_TOOLS
+        uic
+)
+
+if(QT_FEATURE_printdialog)
+    # Resources:
+    set(qprintdialog_resource_files
+        "images/fit-page-24.png"
+        "images/fit-page-32.png"
+        "images/fit-width-24.png"
+        "images/fit-width-32.png"
+        "images/go-first-24.png"
+        "images/go-first-32.png"
+        "images/go-last-24.png"
+        "images/go-last-32.png"
+        "images/go-next-24.png"
+        "images/go-next-32.png"
+        "images/go-previous-24.png"
+        "images/go-previous-32.png"
+        "images/layout-landscape-24.png"
+        "images/layout-landscape-32.png"
+        "images/layout-portrait-24.png"
+        "images/layout-portrait-32.png"
+        "images/page-setup-24.png"
+        "images/page-setup-32.png"
+        "images/print-24.png"
+        "images/print-32.png"
+        "images/view-page-multi-24.png"
+        "images/view-page-multi-32.png"
+        "images/view-page-one-24.png"
+        "images/view-page-one-32.png"
+        "images/view-page-sided-24.png"
+        "images/view-page-sided-32.png"
+        "images/zoom-in-24.png"
+        "images/zoom-in-32.png"
+        "images/zoom-out-24.png"
+        "images/zoom-out-32.png"
+    )
+
+    qt_add_resource(PrintSupport "qprintdialog"
+        PREFIX
+            "/qt-project.org/dialogs/qprintpreviewdialog"
+        BASE
+            "dialogs"
+        FILES
+            ${qprintdialog_resource_files}
+    )
+    set(qprintdialog1_resource_files
+        "images/status-color.png"
+        "images/status-gray-scale.png"
+    )
+
+    qt_add_resource(PrintSupport "qprintdialog1"
+        PREFIX
+            "/qt-project.org/dialogs/qprintdialog"
+        BASE
+            "dialogs"
+        FILES
+            ${qprintdialog1_resource_files}
+    )
+endif()
+
+qt_extend_target(PrintSupport CONDITION APPLE_OSX AND QT_FEATURE_printdialog
+    SOURCES
+        dialogs/qpagesetupdialog_mac.mm
+        dialogs/qprintdialog_mac.mm
+    LIBRARIES
+        ${FWAppKit}
+)
+
+qt_extend_target(PrintSupport CONDITION QT_FEATURE_printdialog AND WIN32
+    SOURCES
+        dialogs/qpagesetupdialog_win.cpp
+        dialogs/qprintdialog_win.cpp
+)
+
+qt_extend_target(PrintSupport CONDITION QT_FEATURE_printdialog AND UNIX AND NOT APPLE
+    SOURCES
+        dialogs/qpagesetupdialog_unix.cpp dialogs/qpagesetupdialog_unix_p.h
+        dialogs/qprintdialog_unix.cpp
+        dialogs/qprintpropertieswidget.ui
+        dialogs/qprintsettingsoutput.ui
+        dialogs/qprintwidget.ui
+    INCLUDE_DIRECTORIES
+        ${QT_SOURCE_TREE}/src/plugins/printsupport/cups
+    ENABLE_AUTOGEN_TOOLS
+        uic
+)
+
+qt_extend_target(PrintSupport CONDITION QT_FEATURE_printpreviewdialog
+    SOURCES
+        dialogs/qprintpreviewdialog.cpp dialogs/qprintpreviewdialog.h
+)
+qt_add_docs(PrintSupport
+    doc/qtprintsupport.qdocconf
+)
+
diff --git a/src/printsupport/configure.cmake b/src/printsupport/configure.cmake
new file mode 100644
index 0000000000..c9b5f74750
--- /dev/null
+++ b/src/printsupport/configure.cmake
@@ -0,0 +1,58 @@
+
+
+#### Inputs
+
+
+
+#### Libraries
+
+qt_find_package(Cups PROVIDED_TARGETS Cups::Cups)
+
+
+#### Tests
+
+
+
+#### Features
+
+qt_feature("cups" PUBLIC PRIVATE
+    SECTION "Painting"
+    LABEL "CUPS"
+    PURPOSE "Provides support for the Common Unix Printing System."
+    CONDITION Cups_FOUND AND QT_FEATURE_printer AND QT_FEATURE_datestring
+)
+qt_feature_definition("cups" "QT_NO_CUPS" NEGATE VALUE "1")
+qt_feature("cupsjobwidget" PUBLIC PRIVATE
+    SECTION "Widgets"
+    LABEL "CUPS job control widget"
+    CONDITION ( QT_FEATURE_buttongroup ) AND ( QT_FEATURE_calendarwidget ) AND ( QT_FEATURE_checkbox ) AND ( QT_FEATURE_combobox ) AND ( QT_FEATURE_cups ) AND ( QT_FEATURE_datetimeedit ) AND ( QT_FEATURE_groupbox ) AND ( QT_FEATURE_tablewidget )
+)
+qt_feature_definition("cupsjobwidget" "QT_NO_CUPSJOBWIDGET" NEGATE VALUE "1")
+qt_feature("printer" PUBLIC
+    SECTION "Painting"
+    LABEL "QPrinter"
+    PURPOSE "Provides a printer backend of QPainter."
+    CONDITION NOT APPLE_UIKIT AND NOT WINRT AND QT_FEATURE_picture AND QT_FEATURE_temporaryfile AND QT_FEATURE_pdf
+)
+qt_feature_definition("printer" "QT_NO_PRINTER" NEGATE VALUE "1")
+qt_feature("printpreviewwidget" PUBLIC
+    SECTION "Widgets"
+    LABEL "QPrintPreviewWidget"
+    PURPOSE "Provides a widget for previewing page layouts for printer output."
+    CONDITION QT_FEATURE_graphicsview AND QT_FEATURE_printer AND QT_FEATURE_mainwindow
+)
+qt_feature_definition("printpreviewwidget" "QT_NO_PRINTPREVIEWWIDGET" NEGATE VALUE "1")
+qt_feature("printdialog" PUBLIC
+    SECTION "Dialogs"
+    LABEL "QPrintDialog"
+    PURPOSE "Provides a dialog widget for specifying printer configuration."
+    CONDITION ( QT_FEATURE_buttongroup ) AND ( QT_FEATURE_checkbox ) AND ( QT_FEATURE_combobox ) AND ( QT_FEATURE_dialog ) AND ( QT_FEATURE_datetimeedit ) AND ( QT_FEATURE_dialogbuttonbox ) AND ( QT_FEATURE_printer ) AND ( QT_FEATURE_radiobutton ) AND ( QT_FEATURE_spinbox ) AND ( QT_FEATURE_tabwidget ) AND ( QT_FEATURE_treeview )
+)
+qt_feature_definition("printdialog" "QT_NO_PRINTDIALOG" NEGATE VALUE "1")
+qt_feature("printpreviewdialog" PUBLIC
+    SECTION "Dialogs"
+    LABEL "QPrintPreviewDialog"
+    PURPOSE "Provides a dialog for previewing and configuring page layouts for printer output."
+    CONDITION QT_FEATURE_printpreviewwidget AND QT_FEATURE_printdialog AND QT_FEATURE_toolbar AND QT_FEATURE_formlayout
+)
+qt_feature_definition("printpreviewdialog" "QT_NO_PRINTPREVIEWDIALOG" NEGATE VALUE "1")
diff --git a/src/printsupport/dialogs/qpagesetupdialog_unix.cpp b/src/printsupport/dialogs/qpagesetupdialog_unix.cpp
index 78e5b8d1ef..2b7c0ce6ec 100644
--- a/src/printsupport/dialogs/qpagesetupdialog_unix.cpp
+++ b/src/printsupport/dialogs/qpagesetupdialog_unix.cpp
@@ -274,21 +274,21 @@ QPageSetupWidget::QPageSetupWidget(QWidget *parent)
     initUnits();
     initPagesPerSheet();
 
-    connect(m_ui.unitCombo, QOverload<int>::of(&QComboBox::activated), this, &QPageSetupWidget::unitChanged);
+    connect(m_ui.unitCombo, &QComboBox::activated, this, &QPageSetupWidget::unitChanged);
 
-    connect(m_ui.pageSizeCombo, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &QPageSetupWidget::pageSizeChanged);
-    connect(m_ui.pageWidth, QOverload<double>::of(&QDoubleSpinBox::valueChanged), this, &QPageSetupWidget::pageSizeChanged);
-    connect(m_ui.pageHeight, QOverload<double>::of(&QDoubleSpinBox::valueChanged), this, &QPageSetupWidget::pageSizeChanged);
+    connect(m_ui.pageSizeCombo, &QComboBox::currentIndexChanged, this, &QPageSetupWidget::pageSizeChanged);
+    connect(m_ui.pageWidth, &QDoubleSpinBox::valueChanged, this, &QPageSetupWidget::pageSizeChanged);
+    connect(m_ui.pageHeight, &QDoubleSpinBox::valueChanged, this, &QPageSetupWidget::pageSizeChanged);
 
-    connect(m_ui.leftMargin, QOverload<double>::of(&QDoubleSpinBox::valueChanged), this, &QPageSetupWidget::leftMarginChanged);
-    connect(m_ui.topMargin, QOverload<double>::of(&QDoubleSpinBox::valueChanged), this, &QPageSetupWidget::topMarginChanged);
-    connect(m_ui.rightMargin, QOverload<double>::of(&QDoubleSpinBox::valueChanged), this, &QPageSetupWidget::rightMarginChanged);
-    connect(m_ui.bottomMargin, QOverload<double>::of(&QDoubleSpinBox::valueChanged), this, &QPageSetupWidget::bottomMarginChanged);
+    connect(m_ui.leftMargin, &QDoubleSpinBox::valueChanged, this, &QPageSetupWidget::leftMarginChanged);
+    connect(m_ui.topMargin, &QDoubleSpinBox::valueChanged, this, &QPageSetupWidget::topMarginChanged);
+    connect(m_ui.rightMargin, &QDoubleSpinBox::valueChanged, this, &QPageSetupWidget::rightMarginChanged);
+    connect(m_ui.bottomMargin, &QDoubleSpinBox::valueChanged, this, &QPageSetupWidget::bottomMarginChanged);
 
     connect(m_ui.portrait, &QRadioButton::clicked, this, &QPageSetupWidget::pageOrientationChanged);
     connect(m_ui.landscape, &QRadioButton::clicked, this, &QPageSetupWidget::pageOrientationChanged);
 
-    connect(m_ui.pagesPerSheetCombo, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &QPageSetupWidget::pagesPerSheetChanged);
+    connect(m_ui.pagesPerSheetCombo, &QComboBox::currentIndexChanged, this, &QPageSetupWidget::pagesPerSheetChanged);
 }
 
 // Init the Units combo box
diff --git a/src/printsupport/dialogs/qprintdialog_unix.cpp b/src/printsupport/dialogs/qprintdialog_unix.cpp
index bf77666c41..f3b47bcbd2 100644
--- a/src/printsupport/dialogs/qprintdialog_unix.cpp
+++ b/src/printsupport/dialogs/qprintdialog_unix.cpp
@@ -487,7 +487,7 @@ bool QPrintPropertiesDialog::createAdvancedOptionsWidget()
 
                         if (choicesCb->count() > 1) {
 
-                            connect(choicesCb, QOverload<int>::of(&QComboBox::currentIndexChanged), this, setPpdOptionFromCombo);
+                            connect(choicesCb, &QComboBox::currentIndexChanged, this, setPpdOptionFromCombo);
 
                             // We need an extra label at the end to show the conflict warning
                             QWidget *choicesCbWithLabel = new QWidget();
diff --git a/src/printsupport/kernel/qcups.cpp b/src/printsupport/kernel/qcups.cpp
index 0fc8cdd1b7..ab9b2889e2 100644
--- a/src/printsupport/kernel/qcups.cpp
+++ b/src/printsupport/kernel/qcups.cpp
@@ -167,7 +167,7 @@ ppd_option_t *QCUPSSupport::findPpdOption(const char *optionName, QPrintDevice *
     return nullptr;
 }
 
-void QCUPSSupport::setJobHold(QPrinter *printer, const JobHoldUntil jobHold, const QTime &holdUntilTime)
+void QCUPSSupport::setJobHold(QPrinter *printer, const JobHoldUntil jobHold, QTime holdUntilTime)
 {
     const QString jobHoldUntilArgument = jobHoldToString(jobHold, holdUntilTime);
     if (!jobHoldUntilArgument.isEmpty()) {
diff --git a/src/printsupport/kernel/qcups_p.h b/src/printsupport/kernel/qcups_p.h
index 57ec281383..4d72230b90 100644
--- a/src/printsupport/kernel/qcups_p.h
+++ b/src/printsupport/kernel/qcups_p.h
@@ -137,7 +137,7 @@ public:
     static void clearCupsOption(QPrinter *printer, const QString &option);
     static void clearCupsOptions(QPrinter *printer);
 
-    static void setJobHold(QPrinter *printer, const JobHoldUntil jobHold = NoHold, const QTime &holdUntilTime = QTime());
+    static void setJobHold(QPrinter *printer, const JobHoldUntil jobHold = NoHold, QTime holdUntilTime = QTime());
     static void setJobBilling(QPrinter *printer, const QString &jobBilling = QString());
     static void setJobPriority(QPrinter *printer, int priority = 50);
     static void setBannerPages(QPrinter *printer, const BannerPage startBannerPage, const BannerPage endBannerPage);
@@ -159,7 +159,7 @@ public:
 
     struct JobHoldUntilWithTime
     {
-        JobHoldUntilWithTime(JobHoldUntil jh = NoHold, const QTime &t = QTime())
+        JobHoldUntilWithTime(JobHoldUntil jh = NoHold, QTime t = QTime())
             : jobHold(jh), time(t) {}
 
         JobHoldUntil jobHold;
diff --git a/src/printsupport/widgets/qcupsjobwidget.cpp b/src/printsupport/widgets/qcupsjobwidget.cpp
index 456ed9db19..43729d1fc6 100644
--- a/src/printsupport/widgets/qcupsjobwidget.cpp
+++ b/src/printsupport/widgets/qcupsjobwidget.cpp
@@ -125,7 +125,7 @@ void QCupsJobWidget::initJobHold()
     m_ui.jobHoldComboBox->addItem(tr("Weekend (Saturday to Sunday)"),  QVariant::fromValue(QCUPSSupport::Weekend));
     m_ui.jobHoldComboBox->addItem(tr("Specific Time"),                 QVariant::fromValue(QCUPSSupport::SpecificTime));
 
-    connect(m_ui.jobHoldComboBox, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &QCupsJobWidget::toggleJobHoldTime);
+    connect(m_ui.jobHoldComboBox, &QComboBox::currentIndexChanged, this, &QCupsJobWidget::toggleJobHoldTime);
 
     QCUPSSupport::JobHoldUntilWithTime jobHoldWithTime;
 
@@ -138,7 +138,7 @@ void QCupsJobWidget::initJobHold()
     toggleJobHoldTime();
 }
 
-void QCupsJobWidget::setJobHold(QCUPSSupport::JobHoldUntil jobHold, const QTime &holdUntilTime)
+void QCupsJobWidget::setJobHold(QCUPSSupport::JobHoldUntil jobHold, QTime holdUntilTime)
 {
     if (jobHold == QCUPSSupport::SpecificTime && holdUntilTime.isNull()) {
         jobHold = QCUPSSupport::NoHold;
diff --git a/src/printsupport/widgets/qcupsjobwidget_p.h b/src/printsupport/widgets/qcupsjobwidget_p.h
index 42da9c7580..d73f116a69 100644
--- a/src/printsupport/widgets/qcupsjobwidget_p.h
+++ b/src/printsupport/widgets/qcupsjobwidget_p.h
@@ -83,7 +83,7 @@ private Q_SLOTS:
 
 private:
 
-    void setJobHold(QCUPSSupport::JobHoldUntil jobHold = QCUPSSupport::NoHold, const QTime &holdUntilTime = QTime());
+    void setJobHold(QCUPSSupport::JobHoldUntil jobHold = QCUPSSupport::NoHold, QTime holdUntilTime = QTime());
     QCUPSSupport::JobHoldUntil jobHold() const;
     QTime jobHoldTime() const;
 
diff --git a/src/sql/CMakeLists.txt b/src/sql/CMakeLists.txt
new file mode 100644
index 0000000000..1bf3a3df2a
--- /dev/null
+++ b/src/sql/CMakeLists.txt
@@ -0,0 +1,57 @@
+# Generated from sql.pro.
+
+#####################################################################
+## Sql Module:
+#####################################################################
+
+qt_add_module(Sql
+    PLUGIN_TYPES sqldrivers
+    SOURCES
+        kernel/qsqlcachedresult.cpp kernel/qsqlcachedresult_p.h
+        kernel/qsqldatabase.cpp kernel/qsqldatabase.h
+        kernel/qsqldriver.cpp kernel/qsqldriver.h kernel/qsqldriver_p.h
+        kernel/qsqldriverplugin.cpp kernel/qsqldriverplugin.h
+        kernel/qsqlerror.cpp kernel/qsqlerror.h
+        kernel/qsqlfield.cpp kernel/qsqlfield.h
+        kernel/qsqlindex.cpp kernel/qsqlindex.h
+        kernel/qsqlnulldriver_p.h
+        kernel/qsqlquery.cpp kernel/qsqlquery.h
+        kernel/qsqlrecord.cpp kernel/qsqlrecord.h
+        kernel/qsqlresult.cpp kernel/qsqlresult.h kernel/qsqlresult_p.h
+        kernel/qtsqlglobal.h kernel/qtsqlglobal_p.h
+    DEFINES
+        QT_NO_CAST_FROM_ASCII
+        QT_NO_FOREACH
+        QT_NO_USING_NAMESPACE
+    LIBRARIES
+        Qt::CorePrivate
+    PUBLIC_LIBRARIES
+        Qt::Core
+    PRIVATE_MODULE_INTERFACE
+        Qt::CorePrivate
+    PRECOMPILED_HEADER
+        "../corelib/global/qt_pch.h"
+)
+
+#### Keys ignored in scope 1:.:.:sql.pro:<TRUE>:
+# SQL_P = "sql"
+
+## Scopes:
+#####################################################################
+
+qt_extend_target(Sql CONDITION MSVC AND (TEST_architecture_arch STREQUAL "i386")
+    LINK_OPTIONS
+        "/BASE:0x62000000"
+)
+
+qt_extend_target(Sql CONDITION QT_FEATURE_sqlmodel
+    SOURCES
+        models/qsqlquerymodel.cpp models/qsqlquerymodel.h models/qsqlquerymodel_p.h
+        models/qsqlrelationaldelegate.cpp models/qsqlrelationaldelegate.h
+        models/qsqlrelationaltablemodel.cpp models/qsqlrelationaltablemodel.h
+        models/qsqltablemodel.cpp models/qsqltablemodel.h models/qsqltablemodel_p.h
+)
+qt_add_docs(Sql
+    doc/qtsql.qdocconf
+)
+
diff --git a/src/sql/configure.cmake b/src/sql/configure.cmake
new file mode 100644
index 0000000000..545b542d6b
--- /dev/null
+++ b/src/sql/configure.cmake
@@ -0,0 +1,21 @@
+
+
+#### Inputs
+
+
+
+#### Libraries
+
+
+
+#### Tests
+
+
+
+#### Features
+
+qt_feature("sqlmodel" PUBLIC
+    LABEL "SQL item models"
+    PURPOSE "Provides item model classes backed by SQL databases."
+    CONDITION QT_FEATURE_itemmodel
+)
diff --git a/src/sql/doc/snippets/code/doc_src_sql-driver.cpp b/src/sql/doc/snippets/code/doc_src_sql-driver.cpp
index 54576733bf..3757ba2eff 100644
--- a/src/sql/doc/snippets/code/doc_src_sql-driver.cpp
+++ b/src/sql/doc/snippets/code/doc_src_sql-driver.cpp
@@ -130,7 +130,7 @@ while (query1.next()) {
 
 
 //! [39]
-QSqlDatabase db = QSqlDatabase::addDatabase("QODBC3");
+QSqlDatabase db = QSqlDatabase::addDatabase("QODBC");
 QString connectString = QStringLiteral(
     "DRIVER=/path/to/installation/libodbcHDB.so;"
     "SERVERNODE=hostname:port;"
diff --git a/src/sql/doc/snippets/code/doc_src_sql-driver.qdoc b/src/sql/doc/snippets/code/doc_src_sql-driver.qdoc
index b869b309b7..df4aa0fb34 100644
--- a/src/sql/doc/snippets/code/doc_src_sql-driver.qdoc
+++ b/src/sql/doc/snippets/code/doc_src_sql-driver.qdoc
@@ -54,7 +54,7 @@
 Database options:
 
   -sql-<driver> ........ Enable SQL <driver> plugin. Supported drivers:
-                         db2 ibase mysql oci odbc psql sqlite2 sqlite tds
+                         db2 ibase mysql oci odbc psql sqlite
                          [all auto]
   -sqlite .............. Select used sqlite3 [system/qt]
 
@@ -146,21 +146,6 @@ nmake install
 //! [15]
 
 
-//! [16]
-cd $QTDIR/qtbase/src/plugins/sqldrivers
-qmake -- TDS_PREFIX=$SYBASE
-make sub-tds
-//! [16]
-
-
-//! [17]
-cd %QTDIR%\qtbase\src\plugins\sqldrivers
-qmake
-nmake sub-tds
-nmake install
-//! [17]
-
-
 //! [18]
 cd $QTDIR/qtbase/src/plugins/sqldrivers
 qmake -- DB2_PREFIX=$DB2DIR
@@ -235,7 +220,7 @@ make sub-oci
 
 //! [35]
 QSqlDatabase: QPSQL driver not loaded
-QSqlDatabase: available drivers: QSQLITE QMYSQL QMYSQL3 QMARIADB QODBC QODBC3 QPSQL QPSQL7
+QSqlDatabase: available drivers: QSQLITE QMYSQL QMARIADB QODBC QPSQL
 Could not create database object
 //! [35]
 
@@ -271,8 +256,6 @@ Checking for MySQL... yes
 Checking for OCI (Oracle)... no
 Checking for ODBC... yes
 Checking for PostgreSQL... no
-Checking for SQLite (version 2)... no
-Checking for TDS (Sybase)... no
 Done running configuration tests.
 
 Configure summary:
@@ -284,10 +267,8 @@ Qt Sql Drivers:
   OCI (Oracle) ........................... no
   ODBC ................................... yes
   PostgreSQL ............................. no
-  SQLite2 ................................ no
   SQLite ................................. yes
     Using system provided SQLite ......... no
-  TDS (Sybase) ........................... no
 
 Qt is now configured for building. Just run 'mingw32-make'.
 Once everything is built, you must run 'mingw32-make install'.
diff --git a/src/sql/doc/src/qsqldatatype-table.qdoc b/src/sql/doc/src/qsqldatatype-table.qdoc
index aafbed6096..1c5ab741c9 100644
--- a/src/sql/doc/src/qsqldatatype-table.qdoc
+++ b/src/sql/doc/src/qsqldatatype-table.qdoc
@@ -502,67 +502,4 @@
         \li The value is a BLOB of data, stored exactly as it was input.
         \li Mapped to QByteArray
   \endtable
-
-  \section2 Sybase Adaptive Server Data Types
-
-  \table 90%
-    \header
-        \li Sybase Adaptive Server data type
-        \li SQL type description
-        \li Recommended input (C++ or Qt data type)
-    \row
-        \li BINARY
-        \li Describes a fixed-length binary value up to 255 bytes in size.
-        \li Mapped to QByteArray
-    \row
-        \li CHAR
-        \li Character String
-        \li Mapped to QString
-    \row
-        \li DATETIME
-        \li Date and time. Range: 1753-01-01 00:00:00 through 9999-12-31 23:59:59.
-        \li Mapped to QDateTime
-    \row
-        \li NCHAR
-        \li Character String of fixed length
-        \li Mapped to QString
-    \row
-        \li NVARACHAR
-        \li Character String of variable length
-        \li Mapped to QString
-    \row
-        \li VARCHAR
-        \li Character String of fixed length
-        \li Mapped to QString
-    \row
-        \li CLOB
-        \li Character large string object
-        \li Mapped to QString
-    \row
-        \li TIMESTAMP
-        \li A unique number within a database
-        \li Mapped to QString
-    \row
-        \li SMALLDATETIME
-        \li Date and time. Range: 1900-01-01 00:00 through 2079-12-31 23:59
-        \li Mapped to QDateTime
-    \row
-        \li UNICHAR
-        \li Character String of fixed length.(Unicode)
-        \li Mapped to QString
-    \row
-        \li UNIVARCHAR
-        \li Character String of variable length.(Unicode)
-        \li Mapped to QString
-    \row
-        \li VARBINARY
-        \li Describes a variable-length binary value up to 255 bytes in size
-        \li Mapped to QByteArray
-  \endtable
-
-  \section2 SQLite Version 2
-
-  SQLite version 2 is "typeless". This means that you can store any kind of
-  data you want in any column of any table, regardless of the declared
-  data type of that column. We recommend that you map the data to QString.
 */
diff --git a/src/sql/doc/src/sql-driver.qdoc b/src/sql/doc/src/sql-driver.qdoc
index 7736591ae9..28e17d2301 100644
--- a/src/sql/doc/src/sql-driver.qdoc
+++ b/src/sql/doc/src/sql-driver.qdoc
@@ -54,9 +54,7 @@
          \li Open Database Connectivity (ODBC) - Microsoft SQL Server and other
             ODBC-compliant databases
     \row \li \l{#QPSQL}{QPSQL} \li PostgreSQL (versions 7.3 and above)
-    \row \li \l{#QSQLITE2}{QSQLITE2} \li SQLite version 2 \note obsolete since Qt 5.14
     \row \li \l{#QSQLITE}{QSQLITE} \li SQLite version 3
-    \row \li \l{#QTDS}{QTDS} \li Sybase Adaptive Server \note obsolete since Qt 4.7
     \endtable
 
     SQLite is the in-process database system with the best test coverage
@@ -504,49 +502,6 @@
     in your installation package. It must be placed in the same folder
     as the application executable.
 
-    \target QTDS
-    \section2 QTDS for Sybase Adaptive Server
-
-    \note TDS is no longer used by MS Sql Server, and is superseded by
-    \l{QODBC}{ODBC}. QTDS is obsolete from Qt 4.7.
-
-    It is not possible to set the port with QSqlDatabase::setPort() due to limitations in the
-    Sybase client library. Refer to the Sybase documentation for information on how to set up
-    a Sybase client configuration file to enable connections to databases on non-default ports.
-
-    \section3 How to Build the QTDS Plugin on Unix and \macos
-
-    Under Unix, two libraries are available which support the TDS protocol:
-
-    \list
-    \li FreeTDS, a free implementation of the TDS protocol
-      (\l{http://www.freetds.org}).
-
-    \li Sybase Open Client, available from \l{https://support.sap.com}.
-    \endlist
-
-    Regardless of which library you use, the shared object file
-    \c{libsybdb.so} is needed. Set the \c SYBASE environment variable to
-    point to the directory where you installed the client library and
-    execute \c{qmake}:
-
-    \snippet code/doc_src_sql-driver.qdoc 16
-
-    \section3 How to Build the QDTS Plugin on Windows
-
-    You can either use the DB-Library supplied by Microsoft or the Sybase
-    Open Client (\l{https://support.sap.com}). Configure will try to find
-    NTWDBLIB.LIB to build the plugin:
-
-    \snippet code/doc_src_sql-driver.qdoc 17
-
-    By default, the Microsoft library is used on Windows. If you want to
-    force the use of the Sybase Open Client, you must define \c
-    Q_USE_SYBASE in \c{%QTDIR%\qtbase\src\plugins\sqldrivers\tds\qsql_tds.cpp}.
-
-    If you are not using a Microsoft compiler, replace \c nmake
-    with \c mingw32-make in the line above.
-
     \target QDB2
     \section2 QDB2 for IBM DB2 (Version 7.1 and Above)
 
@@ -575,13 +530,6 @@
     If you are not using a Microsoft compiler, replace \c nmake
     with \c mingw32-make in the line above.
 
-    \target QSQLITE2
-    \section2 QSQLITE2 for SQLite Version 2
-
-    The Qt SQLite 2 plugin is offered for compatibility. Whenever
-    possible, use the \l{#QSQLITE}{version 3 plugin} instead. The
-    build instructions for version 3 apply to version 2 as well.
-
     \target QSQLITE
     \section2 QSQLITE for SQLite (Version 3 and Above)
 
diff --git a/src/sql/kernel/qsqlcachedresult.cpp b/src/sql/kernel/qsqlcachedresult.cpp
index c335d7d8fe..1e76154f82 100644
--- a/src/sql/kernel/qsqlcachedresult.cpp
+++ b/src/sql/kernel/qsqlcachedresult.cpp
@@ -60,14 +60,6 @@ QT_BEGIN_NAMESPACE
 
 static const uint initial_cache_size = 128;
 
-QSqlCachedResultPrivate::QSqlCachedResultPrivate(QSqlCachedResult *q, const QSqlDriver *drv)
-    : QSqlResultPrivate(q, drv),
-      rowCacheEnd(0),
-      colCount(0),
-      atEnd(false)
-{
-}
-
 void QSqlCachedResultPrivate::cleanup()
 {
     cache.clear();
diff --git a/src/sql/kernel/qsqlcachedresult_p.h b/src/sql/kernel/qsqlcachedresult_p.h
index 543a902554..1bca1fd090 100644
--- a/src/sql/kernel/qsqlcachedresult_p.h
+++ b/src/sql/kernel/qsqlcachedresult_p.h
@@ -101,7 +101,8 @@ class Q_SQL_EXPORT QSqlCachedResultPrivate: public QSqlResultPrivate
     Q_DECLARE_PUBLIC(QSqlCachedResult)
 
 public:
-    QSqlCachedResultPrivate(QSqlCachedResult *q, const QSqlDriver *drv);
+    using QSqlResultPrivate::QSqlResultPrivate;
+
     bool canSeek(int i) const;
     inline int cacheCount() const;
     void init(int count, bool fo);
@@ -110,9 +111,9 @@ public:
     void revertLast();
 
     QSqlCachedResult::ValueCache cache;
-    int rowCacheEnd;
-    int colCount;
-    bool atEnd;
+    int rowCacheEnd = 0;
+    int colCount = 0;
+    bool atEnd = false;
 };
 
 QT_END_NAMESPACE
diff --git a/src/sql/kernel/qsqldatabase.cpp b/src/sql/kernel/qsqldatabase.cpp
index 32338c1fe2..094943ca31 100644
--- a/src/sql/kernel/qsqldatabase.cpp
+++ b/src/sql/kernel/qsqldatabase.cpp
@@ -619,8 +619,6 @@ QStringList QSqlDatabase::connectionNames()
     \row \li QODBC    \li ODBC Driver (includes Microsoft SQL Server)
     \row \li QPSQL    \li PostgreSQL Driver
     \row \li QSQLITE  \li SQLite version 3 or above
-    \row \li QSQLITE2 \li SQLite version 2
-    \row \li QTDS     \li Sybase Adaptive Server
     \endtable
 
     Additional third party drivers, including your own custom
@@ -1185,7 +1183,7 @@ QSqlRecord QSqlDatabase::record(const QString& tablename) const
     \li service
     \endlist
 
-    \header \li DB2 \li OCI \li TDS
+    \header \li DB2 \li OCI
     \row
 
     \li
@@ -1200,9 +1198,6 @@ QSqlRecord QSqlDatabase::record(const QString& tablename) const
     \li OCI_ATTR_PREFETCH_MEMORY
     \endlist
 
-    \li
-    \e none
-
     \header \li SQLite \li Interbase
     \row
 
@@ -1327,11 +1322,6 @@ bool QSqlDatabase::isDriverAvailable(const QString& name)
     \li SQLHANDLE environment, SQLHANDLE connection
     \li \c qsql_db2.cpp
     \row
-    \li QTDS
-    \li QTDSDriver
-    \li LOGINREC *loginRecord, DBPROCESS *dbProcess, const QString &hostName
-    \li \c qsql_tds.cpp
-    \row
     \li QSQLITE
     \li QSQLiteDriver
     \li sqlite *connection
@@ -1343,11 +1333,6 @@ bool QSqlDatabase::isDriverAvailable(const QString& name)
     \li \c qsql_ibase.cpp
     \endtable
 
-    The host name (or service name) is needed when constructing the
-    QTDSDriver for creating new connections for internal queries. This
-    is to prevent blocking when several QSqlQuery objects are used
-    simultaneously.
-
     \warning Adding a database connection with the same connection
     name as an existing connection, causes the existing connection to
     be replaced by the new one.
diff --git a/src/sql/kernel/qsqldriver.cpp b/src/sql/kernel/qsqldriver.cpp
index d1c9057aac..8753352617 100644
--- a/src/sql/kernel/qsqldriver.cpp
+++ b/src/sql/kernel/qsqldriver.cpp
@@ -51,11 +51,10 @@ QT_BEGIN_NAMESPACE
 static QString prepareIdentifier(const QString &identifier,
         QSqlDriver::IdentifierType type, const QSqlDriver *driver)
 {
-    Q_ASSERT( driver != nullptr );
+    Q_ASSERT(driver != nullptr);
     QString ret = identifier;
-    if (!driver->isIdentifierEscaped(identifier, type)) {
+    if (!driver->isIdentifierEscaped(identifier, type))
         ret = driver->escapeIdentifier(identifier, type);
-    }
     return ret;
 }
 
@@ -102,20 +101,6 @@ QSqlDriver::~QSqlDriver()
 }
 
 /*!
-    \since 4.4
-
-    \fn QSqlDriver::notification(const QString &name)
-
-    This signal is emitted when the database posts an event notification
-    that the driver subscribes to. \a name identifies the event notification.
-
-    \sa subscribeToNotification()
-
-    \obsolete use QSqlDriver::notification(const QString &name, QSqlDriver::NotificationSource source, const QVariant &payload)
-              instead
-*/
-
-/*!
     \since 5.0
 
     \fn QSqlDriver::notification(const QString &name, QSqlDriver::NotificationSource source, const QVariant & payload)
diff --git a/src/sql/kernel/qsqldriver.h b/src/sql/kernel/qsqldriver.h
index ca9f7dc51e..31de63be15 100644
--- a/src/sql/kernel/qsqldriver.h
+++ b/src/sql/kernel/qsqldriver.h
@@ -100,7 +100,7 @@ public:
     virtual QStringList tables(QSql::TableType tableType) const;
     virtual QSqlIndex primaryIndex(const QString &tableName) const;
     virtual QSqlRecord record(const QString &tableName) const;
-    virtual QString formatValue(const QSqlField& field, bool trimStrings = false) const;
+    virtual QString formatValue(const QSqlField &field, bool trimStrings = false) const;
 
     virtual QString escapeIdentifier(const QString &identifier, IdentifierType type) const;
     virtual QString sqlStatement(StatementType type, const QString &tableName,
@@ -113,12 +113,12 @@ public:
     virtual void close() = 0;
     virtual QSqlResult *createResult() const = 0;
 
-    virtual bool open(const QString& db,
-                      const QString& user = QString(),
-                      const QString& password = QString(),
-                      const QString& host = QString(),
+    virtual bool open(const QString &db,
+                      const QString &user = QString(),
+                      const QString &password = QString(),
+                      const QString &host = QString(),
                       int port = -1,
-                      const QString& connOpts = QString()) = 0;
+                      const QString &connOpts = QString()) = 0;
     virtual bool subscribeToNotification(const QString &name);
     virtual bool unsubscribeFromNotification(const QString &name);
     virtual QStringList subscribedToNotifications() const;
@@ -135,10 +135,6 @@ public Q_SLOTS:
     virtual bool cancelQuery();
 
 Q_SIGNALS:
-#if QT_DEPRECATED_SINCE(5, 15)
-    QT_DEPRECATED_X("Use the 3-args version of notification() instead.")
-    void notification(const QString &name);
-#endif
     void notification(const QString &name, QSqlDriver::NotificationSource source, const QVariant &payload);
 
 protected:
diff --git a/src/sql/kernel/qsqlindex.cpp b/src/sql/kernel/qsqlindex.cpp
index 60b0ef6965..5781f24b5c 100644
--- a/src/sql/kernel/qsqlindex.cpp
+++ b/src/sql/kernel/qsqlindex.cpp
@@ -44,9 +44,6 @@
 
 QT_BEGIN_NAMESPACE
 
-// ### Qt 6: remove the static assertion, the 'sorts' field was changed from QList to QVector in Qt 5.6
-Q_STATIC_ASSERT((sizeof(QList<bool>) == sizeof(QVector<bool>)));
-
 /*!
     \class QSqlIndex
     \brief The QSqlIndex class provides functions to manipulate and
diff --git a/src/sql/kernel/qsqlquery.cpp b/src/sql/kernel/qsqlquery.cpp
index 34a3ba3755..ce6c997919 100644
--- a/src/sql/kernel/qsqlquery.cpp
+++ b/src/sql/kernel/qsqlquery.cpp
@@ -261,7 +261,7 @@ QSqlQuery::QSqlQuery(const QSqlQuery& other)
 /*!
     \internal
 */
-static void qInit(QSqlQuery *q, const QString& query, QSqlDatabase db)
+static void qInit(QSqlQuery *q, const QString& query, const QSqlDatabase &db)
 {
     QSqlDatabase database = db;
     if (!database.isValid())
@@ -281,7 +281,7 @@ static void qInit(QSqlQuery *q, const QString& query, QSqlDatabase db)
 
     \sa QSqlDatabase
 */
-QSqlQuery::QSqlQuery(const QString& query, QSqlDatabase db)
+QSqlQuery::QSqlQuery(const QString& query, const QSqlDatabase &db)
 {
     d = QSqlQueryPrivate::shared_null();
     qInit(this, query, db);
@@ -294,7 +294,7 @@ QSqlQuery::QSqlQuery(const QString& query, QSqlDatabase db)
     \sa QSqlDatabase
 */
 
-QSqlQuery::QSqlQuery(QSqlDatabase db)
+QSqlQuery::QSqlQuery(const QSqlDatabase &db)
 {
     d = QSqlQueryPrivate::shared_null();
     qInit(this, QString(), db);
diff --git a/src/sql/kernel/qsqlquery.h b/src/sql/kernel/qsqlquery.h
index cbbc25c4ec..3be04c492c 100644
--- a/src/sql/kernel/qsqlquery.h
+++ b/src/sql/kernel/qsqlquery.h
@@ -59,8 +59,8 @@ class Q_SQL_EXPORT QSqlQuery
 {
 public:
     explicit QSqlQuery(QSqlResult *r);
-    explicit QSqlQuery(const QString& query = QString(), QSqlDatabase db = QSqlDatabase());
-    explicit QSqlQuery(QSqlDatabase db);
+    explicit QSqlQuery(const QString& query = QString(), const QSqlDatabase &db = QSqlDatabase());
+    explicit QSqlQuery(const QSqlDatabase &db);
     QSqlQuery(const QSqlQuery& other);
     QSqlQuery& operator=(const QSqlQuery& other);
     ~QSqlQuery();
diff --git a/src/sql/kernel/qsqlresult_p.h b/src/sql/kernel/qsqlresult_p.h
index fe13bcc33f..3b9697046d 100644
--- a/src/sql/kernel/qsqlresult_p.h
+++ b/src/sql/kernel/qsqlresult_p.h
@@ -79,9 +79,9 @@ class Q_SQL_EXPORT QSqlResultPrivate
 public:
     QSqlResultPrivate(QSqlResult *q, const QSqlDriver *drv)
       : q_ptr(q),
-        sqldriver(const_cast<QSqlDriver*>(drv))
+        sqldriver(const_cast<QSqlDriver *>(drv))
     { }
-    virtual ~QSqlResultPrivate() { }
+    virtual ~QSqlResultPrivate() = default;
 
     void clearValues()
     {
@@ -104,7 +104,7 @@ public:
     void clear()
     {
         clearValues();
-        clearIndex();;
+        clearIndex();
     }
 
     virtual QString fieldSerial(int) const;
@@ -116,22 +116,23 @@ public:
     QPointer<QSqlDriver> sqldriver;
     QString sql;
     QSqlError error;
-    QSql::NumericalPrecisionPolicy precisionPolicy = QSql::LowPrecisionDouble;
-    QSqlResult::BindingSyntax binds = QSqlResult::PositionalBinding;
-    int idx = QSql::BeforeFirstRow;
-    int bindCount = 0;
-    bool active = false;
-    bool isSel = false;
-    bool forwardOnly = false;
 
     QString executedQuery;
     QHash<int, QSql::ParamType> types;
     QVector<QVariant> values;
-    typedef QHash<QString, QVector<int> > IndexMap;
+    using IndexMap = QHash<QString, QVector<int> >;
     IndexMap indexes;
 
-    typedef QVector<QHolder> QHolderVector;
+    using QHolderVector = QVector<QHolder>;
     QHolderVector holders;
+
+    QSqlResult::BindingSyntax binds = QSqlResult::PositionalBinding;
+    QSql::NumericalPrecisionPolicy precisionPolicy = QSql::LowPrecisionDouble;
+    int idx = QSql::BeforeFirstRow;
+    int bindCount = 0;
+    bool active = false;
+    bool isSel = false;
+    bool forwardOnly = false;
 };
 
 QT_END_NAMESPACE
diff --git a/src/sql/models/qsqlrelationaltablemodel.cpp b/src/sql/models/qsqlrelationaltablemodel.cpp
index 20adec6a3b..4f5f00bf96 100644
--- a/src/sql/models/qsqlrelationaltablemodel.cpp
+++ b/src/sql/models/qsqlrelationaltablemodel.cpp
@@ -161,7 +161,7 @@ struct QRelation
 class QRelatedTableModel : public QSqlTableModel
 {
 public:
-    QRelatedTableModel(QRelation *rel, QObject *parent = nullptr, QSqlDatabase db = QSqlDatabase());
+    QRelatedTableModel(QRelation *rel, QObject *parent = nullptr, const QSqlDatabase &db = QSqlDatabase());
     bool select() override;
 private:
     bool firstSelect;
@@ -245,7 +245,7 @@ bool QRelation::isValid()
 
 
 
-QRelatedTableModel::QRelatedTableModel(QRelation *rel, QObject *parent, QSqlDatabase db) :
+QRelatedTableModel::QRelatedTableModel(QRelation *rel, QObject *parent, const QSqlDatabase &db) :
     QSqlTableModel(parent, db), firstSelect(true), relation(rel)
 {
 }
@@ -410,7 +410,7 @@ void QSqlRelationalTableModelPrivate::clearCache()
     and the database connection to \a db. If \a db is not valid, the
     default database connection will be used.
 */
-QSqlRelationalTableModel::QSqlRelationalTableModel(QObject *parent, QSqlDatabase db)
+QSqlRelationalTableModel::QSqlRelationalTableModel(QObject *parent, const QSqlDatabase &db)
     : QSqlTableModel(*new QSqlRelationalTableModelPrivate, parent, db)
 {
 }
diff --git a/src/sql/models/qsqlrelationaltablemodel.h b/src/sql/models/qsqlrelationaltablemodel.h
index 1929bd320a..2ebadaabd1 100644
--- a/src/sql/models/qsqlrelationaltablemodel.h
+++ b/src/sql/models/qsqlrelationaltablemodel.h
@@ -91,7 +91,7 @@ public:
     };
 
     explicit QSqlRelationalTableModel(QObject *parent = nullptr,
-                                      QSqlDatabase db = QSqlDatabase());
+                                      const QSqlDatabase &db = QSqlDatabase());
     virtual ~QSqlRelationalTableModel();
 
     QVariant data(const QModelIndex &item, int role = Qt::DisplayRole) const override;
diff --git a/src/sql/models/qsqltablemodel.cpp b/src/sql/models/qsqltablemodel.cpp
index 7d2421d34e..941735767d 100644
--- a/src/sql/models/qsqltablemodel.cpp
+++ b/src/sql/models/qsqltablemodel.cpp
@@ -291,7 +291,7 @@ bool QSqlTableModelPrivate::exec(const QString &stmt, bool prepStatement,
 
     The default edit strategy is \l OnRowChange.
 */
-QSqlTableModel::QSqlTableModel(QObject *parent, QSqlDatabase db)
+QSqlTableModel::QSqlTableModel(QObject *parent, const QSqlDatabase &db)
     : QSqlQueryModel(*new QSqlTableModelPrivate, parent)
 {
     Q_D(QSqlTableModel);
@@ -300,7 +300,7 @@ QSqlTableModel::QSqlTableModel(QObject *parent, QSqlDatabase db)
 
 /*!  \internal
 */
-QSqlTableModel::QSqlTableModel(QSqlTableModelPrivate &dd, QObject *parent, QSqlDatabase db)
+QSqlTableModel::QSqlTableModel(QSqlTableModelPrivate &dd, QObject *parent, const QSqlDatabase &db)
     : QSqlQueryModel(dd, parent)
 {
     Q_D(QSqlTableModel);
diff --git a/src/sql/models/qsqltablemodel.h b/src/sql/models/qsqltablemodel.h
index eba27e60ec..1ac8bd9b04 100644
--- a/src/sql/models/qsqltablemodel.h
+++ b/src/sql/models/qsqltablemodel.h
@@ -62,7 +62,7 @@ class Q_SQL_EXPORT QSqlTableModel: public QSqlQueryModel
 public:
     enum EditStrategy {OnFieldChange, OnRowChange, OnManualSubmit};
 
-    explicit QSqlTableModel(QObject *parent = nullptr, QSqlDatabase db = QSqlDatabase());
+    explicit QSqlTableModel(QObject *parent = nullptr, const QSqlDatabase &db = QSqlDatabase());
     virtual ~QSqlTableModel();
 
     virtual void setTable(const QString &tableName);
@@ -127,7 +127,7 @@ Q_SIGNALS:
     void beforeDelete(int row);
 
 protected:
-    QSqlTableModel(QSqlTableModelPrivate &dd, QObject *parent = nullptr, QSqlDatabase db = QSqlDatabase());
+    QSqlTableModel(QSqlTableModelPrivate &dd, QObject *parent = nullptr, const QSqlDatabase &db = QSqlDatabase());
 
     virtual bool updateRowInTable(int row, const QSqlRecord &values);
     virtual bool insertRowIntoTable(const QSqlRecord &values);
diff --git a/src/src.pro b/src/src.pro
index 592f0cf644..3dc92e7811 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -134,7 +134,11 @@ src_widgets.depends = src_corelib src_gui src_tools_uic src_platformheaders
 
 src_opengl.subdir = $$PWD/opengl
 src_opengl.target = sub-opengl
-src_opengl.depends = src_gui src_widgets
+src_opengl.depends = src_gui
+
+src_openglwidgets.subdir = $$PWD/openglwidgets
+src_openglwidgets.target = sub-openglwidgets
+src_openglwidgets.depends = src_opengl src_widgets
 
 src_openglextensions.subdir = $$PWD/openglextensions
 src_openglextensions.target = sub-openglextensions
@@ -217,7 +221,12 @@ qtConfig(gui) {
         TOOLS += src_tools_qvkgen
     }
     SUBDIRS += src_gui src_platformsupport src_platformheaders
-    qtConfig(opengl): SUBDIRS += src_openglextensions
+    qtConfig(opengl) {
+        SUBDIRS += src_openglextensions
+        SUBDIRS += src_opengl
+        src_plugins.depends += src_opengl
+        src_platformsupport.depends += src_opengl
+    }
     src_plugins.depends += src_gui src_platformsupport src_platformheaders
     src_testlib.depends += src_gui      # if QtGui is enabled, QtTest requires QtGui's headers
     qtConfig(widgets) {
@@ -230,8 +239,7 @@ qtConfig(gui) {
             src_plugins.depends += src_printsupport
         }
         qtConfig(opengl) {
-            SUBDIRS += src_opengl
-            src_plugins.depends += src_opengl
+            SUBDIRS += src_openglwidgets
         }
     }
 }
diff --git a/src/testlib/.prev_CMakeLists.txt b/src/testlib/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..8279b0719b
--- /dev/null
+++ b/src/testlib/.prev_CMakeLists.txt
@@ -0,0 +1,146 @@
+# Generated from testlib.pro.
+
+#####################################################################
+## Test Module:
+#####################################################################
+
+qt_add_module(Test
+    QMAKE_MODULE_CONFIG console testlib_defines
+    EXCEPTIONS
+    SOURCES
+        qabstracttestlogger.cpp qabstracttestlogger_p.h
+        qasciikey.cpp
+        qbenchmark.cpp qbenchmark.h qbenchmark_p.h
+        qbenchmarkevent.cpp qbenchmarkevent_p.h
+        qbenchmarkmeasurement.cpp qbenchmarkmeasurement_p.h
+        qbenchmarkmetric.cpp qbenchmarkmetric.h qbenchmarkmetric_p.h
+        qbenchmarkperfevents.cpp qbenchmarkperfevents_p.h
+        qbenchmarktimemeasurers_p.h
+        qcsvbenchmarklogger.cpp qcsvbenchmarklogger_p.h
+        qjunittestlogger.cpp qjunittestlogger_p.h
+        qplaintestlogger.cpp qplaintestlogger_p.h
+        qsignaldumper.cpp qsignaldumper_p.h
+        qsignalspy.h
+        qtaptestlogger.cpp qtaptestlogger_p.h
+        qteamcitylogger.cpp qteamcitylogger_p.h
+        qtest.h
+        qtest_gui.h
+        qtest_network.h
+        qtest_widgets.h
+        qtestaccessible.h
+        qtestassert.h
+        qtestblacklist.cpp qtestblacklist_p.h
+        qtestcase.cpp qtestcase.h
+        qtestcoreelement_p.h
+        qtestcorelist_p.h
+        qtestdata.cpp qtestdata.h
+        qtestelement.cpp qtestelement_p.h
+        qtestelementattribute.cpp qtestelementattribute_p.h
+        qtestevent.h
+        qtesteventloop.h
+        qtesthelpers_p.h
+        qtestjunitstreamer.cpp qtestjunitstreamer_p.h
+        qtestkeyboard.h
+        qtestlog.cpp qtestlog_p.h
+        qtestmouse.cpp qtestmouse.h
+        qtestresult.cpp qtestresult_p.h
+        qtestspontaneevent.h
+        qtestsystem.h
+        qtesttable.cpp qtesttable_p.h
+        qtesttouch.h
+        qttestglobal.h
+        qxmltestlogger.cpp qxmltestlogger_p.h
+    DEFINES
+        QT_NO_CAST_FROM_ASCII
+        QT_NO_CAST_TO_ASCII
+        QT_NO_DATASTREAM
+        QT_NO_FOREACH
+    LIBRARIES
+        Qt::CorePrivate
+    PUBLIC_LIBRARIES
+        Qt::Core
+    PRIVATE_MODULE_INTERFACE
+        Qt::CorePrivate
+    COMPILE_OPTIONS
+        --cs-exclude-file-abs-wildcard=${QT_SOURCE_TREE}/*
+        --cs-include-file-abs-wildcard=*/src/testlib/*
+        --cs-mcc
+        --cs-mcdc
+    LINK_OPTIONS
+        "$$COVERAGE_OPTIONS"
+)
+
+#### Keys ignored in scope 1:.:.:testlib.pro:<TRUE>:
+# MODULE_CONFIG = "console" "testlib_defines"
+
+## Scopes:
+#####################################################################
+
+#### Keys ignored in scope 2:.:.:testlib.pro:UNIX AND NOT embedded:
+# QMAKE_PKGCONFIG_DESCRIPTION = "Qt" "Unit" "Testing" "Library"
+
+qt_extend_target(Test CONDITION QT_FEATURE_itemmodeltester
+    SOURCES
+        qabstractitemmodeltester.cpp qabstractitemmodeltester.h
+)
+
+qt_extend_target(Test CONDITION QT_FEATURE_valgrind
+    SOURCES
+        qbenchmarkvalgrind.cpp qbenchmarkvalgrind_p.h
+)
+
+qt_extend_target(Test CONDITION embedded
+    COMPILE_OPTIONS
+        -fno-rtti
+)
+
+qt_extend_target(Test CONDITION APPLE
+    SOURCES
+        qappletestlogger.cpp qappletestlogger_p.h
+    PUBLIC_LIBRARIES
+        ${FWSecurity}
+)
+
+qt_extend_target(Test CONDITION APPLE_OSX
+    SOURCES
+        qtestutil_macos.mm qtestutil_macos_p.h
+    PUBLIC_LIBRARIES
+        ${FWAppKit}
+        ${FWApplicationServices}
+        ${FWFoundation}
+        ${FWIOKit}
+)
+
+qt_extend_target(Test CONDITION (APPLE) AND (OFF AND NOT lessThan(QMAKE_XCODE_VERSION, "6.0"))
+    SOURCES
+        qxctestlogger.mm qxctestlogger_p.h
+    DEFINES
+        HAVE_XCTEST
+    PUBLIC_LIBRARIES
+        ${FWFoundation}
+)
+
+qt_extend_target(Test CONDITION ((APPLE) AND (OFF AND NOT lessThan(QMAKE_XCODE_VERSION, "6.0"))) AND (NOT QMAKE_MAC_SDK_PLATFORM_PATH_ISEMPTY)
+    COMPILE_OPTIONS
+        -F/Developer/Library/Frameworks
+    LINK_OPTIONS
+        "-F$${platform_dev_frameworks_path}"
+        "-weak_framework"
+        "XCTest"
+)
+
+#### Keys ignored in scope 9:.:.:testlib.pro:NOT QMAKE_MAC_SDK_PLATFORM_PATH_ISEMPTY:
+# MODULE_CONFIG = "xctest"
+
+#### Keys ignored in scope 10:.:.:testlib.pro:NOT TARGET Qt::Gui:
+# HEADERSCLEAN_EXCLUDE = "qtest_gui.h" "qtestaccessible.h" "qtestkeyboard.h" "qtestmouse.h" "qtesttouch.h"
+
+#### Keys ignored in scope 11:.:.:testlib.pro:NOT TARGET Qt::Widgets:
+# HEADERSCLEAN_EXCLUDE = "qtest_widgets.h"
+
+#### Keys ignored in scope 12:.:.:testlib.pro:NOT TARGET Qt::Network:
+# HEADERSCLEAN_EXCLUDE = "qtest_network.h"
+qt_add_docs(Test
+    doc/qttestlib.qdocconf
+)
+
diff --git a/src/testlib/CMakeLists.txt b/src/testlib/CMakeLists.txt
new file mode 100644
index 0000000000..8e2a3caafa
--- /dev/null
+++ b/src/testlib/CMakeLists.txt
@@ -0,0 +1,132 @@
+# Generated from testlib.pro.
+
+#####################################################################
+## Test Module:
+#####################################################################
+
+qt_add_module(Test
+    CONFIG_MODULE_NAME testlib # special case
+    EXCEPTIONS
+    SOURCES
+        qabstracttestlogger.cpp qabstracttestlogger_p.h
+        qasciikey.cpp
+        qbenchmark.cpp qbenchmark.h qbenchmark_p.h
+        qbenchmarkevent.cpp qbenchmarkevent_p.h
+        qbenchmarkmeasurement.cpp qbenchmarkmeasurement_p.h
+        qbenchmarkmetric.cpp qbenchmarkmetric.h qbenchmarkmetric_p.h
+        qbenchmarkperfevents.cpp qbenchmarkperfevents_p.h
+        qbenchmarktimemeasurers_p.h
+        qcsvbenchmarklogger.cpp qcsvbenchmarklogger_p.h
+        qjunittestlogger.cpp qjunittestlogger_p.h
+        qplaintestlogger.cpp qplaintestlogger_p.h
+        qsignaldumper.cpp qsignaldumper_p.h
+        qsignalspy.h
+        qtaptestlogger.cpp qtaptestlogger_p.h
+        qteamcitylogger.cpp qteamcitylogger_p.h
+        qtest.h
+        qtest_gui.h
+        qtest_network.h
+        qtest_widgets.h
+        qtestaccessible.h
+        qtestassert.h
+        qtestblacklist.cpp qtestblacklist_p.h
+        qtestcase.cpp qtestcase.h
+        qtestcoreelement_p.h
+        qtestcorelist_p.h
+        qtestdata.cpp qtestdata.h
+        qtestelement.cpp qtestelement_p.h
+        qtestelementattribute.cpp qtestelementattribute_p.h
+        qtestevent.h
+        qtesteventloop.h
+        qtesthelpers_p.h
+        qtestjunitstreamer.cpp qtestjunitstreamer_p.h
+        qtestkeyboard.h
+        qtestlog.cpp qtestlog_p.h
+        qtestmouse.cpp qtestmouse.h
+        qtestresult.cpp qtestresult_p.h
+        qtestspontaneevent.h
+        qtestsystem.h
+        qtesttable.cpp qtesttable_p.h
+        qtesttouch.h
+        qttestglobal.h
+        qxmltestlogger.cpp qxmltestlogger_p.h
+    DEFINES
+        QT_NO_CAST_FROM_ASCII
+        QT_NO_CAST_TO_ASCII
+        QT_NO_DATASTREAM
+        QT_NO_FOREACH
+        QT_BUILD_TESTLIB_LIB # special case
+    LIBRARIES
+        Qt::CorePrivate
+    PUBLIC_LIBRARIES
+        Qt::Core
+    PRIVATE_MODULE_INTERFACE
+        Qt::CorePrivate
+    # special case begin
+    # remove COMPILE_OPTIONS, LINK_OPTIONS, COVERAGE_OPTIONS
+    # figure out how it should be handled.
+    # special case end
+)
+
+#### Keys ignored in scope 1:.:.:testlib.pro:<TRUE>:
+# MODULE_CONFIG = "console" "testlib_defines"
+
+## Scopes:
+#####################################################################
+
+#### Keys ignored in scope 2:.:.:testlib.pro:UNIX AND NOT embedded:
+# QMAKE_PKGCONFIG_DESCRIPTION = "Qt" "Unit" "Testing" "Library"
+
+qt_extend_target(Test CONDITION QT_FEATURE_itemmodeltester
+    SOURCES
+        qabstractitemmodeltester.cpp qabstractitemmodeltester.h
+)
+
+qt_extend_target(Test CONDITION QT_FEATURE_valgrind
+    SOURCES
+        qbenchmarkvalgrind.cpp qbenchmarkvalgrind_p.h
+)
+
+qt_extend_target(Test CONDITION embedded
+    COMPILE_OPTIONS
+        -fno-rtti
+)
+
+qt_extend_target(Test CONDITION APPLE
+    SOURCES
+        qappletestlogger.cpp qappletestlogger_p.h
+    PUBLIC_LIBRARIES
+        ${FWSecurity}
+)
+
+qt_extend_target(Test CONDITION APPLE_OSX
+    SOURCES
+        qtestutil_macos.mm qtestutil_macos_p.h
+    PUBLIC_LIBRARIES
+        ${FWAppKit}
+        ${FWApplicationServices}
+        ${FWFoundation}
+        ${FWIOKit}
+)
+
+# special case begin
+# Do not bother with disabled stuff:
+# extend_target(Test CONDITION (APPLE_OSX) AND (OFF AND NOT lessThan(QMAKE_XCODE_VERSION, "6.0")) ...
+# extend_target(Test CONDITION ((APPLE_OSX) AND (OFF AND NOT lessThan(QMAKE_XCODE_VERSION, "6.0"))) AND (NOT QMAKE_MAC_SDK_PLATFORM_PATH_ISEMPTY) ...
+# special case end
+
+#### Keys ignored in scope 9:.:.:testlib.pro:NOT QMAKE_MAC_SDK_PLATFORM_PATH_ISEMPTY:
+# MODULE_CONFIG = "xctest"
+
+#### Keys ignored in scope 10:.:.:testlib.pro:NOT TARGET Qt::Gui:
+# HEADERSCLEAN_EXCLUDE = "qtest_gui.h" "qtestaccessible.h" "qtestkeyboard.h" "qtestmouse.h" "qtesttouch.h"
+
+#### Keys ignored in scope 11:.:.:testlib.pro:NOT TARGET Qt::Widgets:
+# HEADERSCLEAN_EXCLUDE = "qtest_widgets.h"
+
+#### Keys ignored in scope 12:.:.:testlib.pro:NOT TARGET Qt::Network:
+# HEADERSCLEAN_EXCLUDE = "qtest_network.h"
+qt_add_docs(Test
+    doc/qttestlib.qdocconf
+)
+
diff --git a/src/testlib/Qt5TestConfigExtras.cmake.in b/src/testlib/Qt5TestConfigExtras.cmake.in
deleted file mode 100644
index 2a575958ae..0000000000
--- a/src/testlib/Qt5TestConfigExtras.cmake.in
+++ /dev/null
@@ -1,5 +0,0 @@
-
-set_property(TARGET Qt5::Test
-  APPEND PROPERTY
-    INTERFACE_COMPILE_DEFINITIONS QT_TESTCASE_BUILDDIR=\\\"\${CMAKE_BINARY_DIR}\\\"
-)
diff --git a/src/testlib/configure.cmake b/src/testlib/configure.cmake
new file mode 100644
index 0000000000..b02487223c
--- /dev/null
+++ b/src/testlib/configure.cmake
@@ -0,0 +1,31 @@
+
+
+#### Inputs
+
+
+
+#### Libraries
+
+
+
+#### Tests
+
+
+
+#### Features
+
+qt_feature("testlib_selfcover" PUBLIC
+    LABEL "Coverage testing of testlib itself"
+    PURPOSE "Gauges how thoroughly testlib's selftest exercises testlib's code"
+    AUTODETECT OFF
+)
+qt_feature("itemmodeltester" PUBLIC
+    LABEL "Tester for item models"
+    PURPOSE "Provides a utility to test item models."
+    CONDITION QT_FEATURE_itemmodel
+)
+qt_feature("valgrind" PUBLIC
+    LABEL "Valgrind"
+    PURPOSE "Profiling support with callgrind."
+    CONDITION ( LINUX OR APPLE ) AND QT_FEATURE_process AND QT_FEATURE_regularexpression
+)
diff --git a/src/testlib/qtestblacklist.cpp b/src/testlib/qtestblacklist.cpp
index 9b7c2495d4..91258e9ec4 100644
--- a/src/testlib/qtestblacklist.cpp
+++ b/src/testlib/qtestblacklist.cpp
@@ -190,10 +190,20 @@ static QSet<QByteArray> activeConditions()
     if (!distributionName.isEmpty()) {
         if (result.find(distributionName) == result.end())
             result.insert(distributionName);
+        // backwards compatibility with Qt 5
+        if (distributionName == "macos") {
+            if (result.find(distributionName) == result.end())
+                result.insert("osx");
+        }
         if (!distributionRelease.isEmpty()) {
             QByteArray versioned = distributionName + "-" + distributionRelease;
             if (result.find(versioned) == result.end())
                 result.insert(versioned);
+            if (distributionName == "macos") {
+                QByteArray versioned = "osx-" + distributionRelease;
+                if (result.find(versioned) == result.end())
+                    result.insert(versioned);
+            }
         }
     }
 
diff --git a/src/testlib/qtestcase.cpp b/src/testlib/qtestcase.cpp
index 20c370dc38..fc6b22f062 100644
--- a/src/testlib/qtestcase.cpp
+++ b/src/testlib/qtestcase.cpp
@@ -2162,7 +2162,8 @@ QSharedPointer<QTemporaryDir> QTest::qExtractTestData(const QString &dirName)
 /*! \internal
  */
 
-QString QTest::qFindTestData(const QString& base, const char *file, int line, const char *builddir)
+QString QTest::qFindTestData(const QString& base, const char *file, int line, const char *builddir,
+                             const char *sourcedir)
 {
     QString found;
 
@@ -2272,6 +2273,20 @@ QString QTest::qFindTestData(const QString& base, const char *file, int line, co
         }
     }
 
+    // 7. Try the supplied source directory
+    if (found.isEmpty() && sourcedir) {
+        const QString candidate = QFile::decodeName(sourcedir) % QLatin1Char('/') % base;
+        if (QFileInfo::exists(candidate)) {
+            found = candidate;
+        } else if (QTestLog::verboseLevel() >= 2) {
+            QTestLog::info(qPrintable(
+                QString::fromLatin1("testdata %1 not found in supplied source directory [%2]")
+                    .arg(base, QDir::toNativeSeparators(candidate))),
+                file, line);
+        }
+    }
+
+
     if (found.isEmpty()) {
         QTest::qWarn(qPrintable(
             QString::fromLatin1("testdata %1 could not be located!").arg(base)),
@@ -2287,9 +2302,10 @@ QString QTest::qFindTestData(const QString& base, const char *file, int line, co
 
 /*! \internal
  */
-QString QTest::qFindTestData(const char *base, const char *file, int line, const char *builddir)
+QString QTest::qFindTestData(const char *base, const char *file, int line, const char *builddir,
+                             const char *sourcedir)
 {
-    return qFindTestData(QFile::decodeName(base), file, line, builddir);
+    return qFindTestData(QFile::decodeName(base), file, line, builddir, sourcedir);
 }
 
 /*! \internal
diff --git a/src/testlib/qtestcase.h b/src/testlib/qtestcase.h
index e1518708e8..0498681670 100644
--- a/src/testlib/qtestcase.h
+++ b/src/testlib/qtestcase.h
@@ -213,8 +213,13 @@ do {\
     QTest::qWarn(static_cast<const char *>(msg), __FILE__, __LINE__)
 
 #ifdef QT_TESTCASE_BUILDDIR
+
+#ifndef QT_TESTCASE_SOURCEDIR
+#define QT_TESTCASE_SOURCEDIR nullptr
+#endif
+
 # define QFINDTESTDATA(basepath)\
-    QTest::qFindTestData(basepath, __FILE__, __LINE__, QT_TESTCASE_BUILDDIR)
+    QTest::qFindTestData(basepath, __FILE__, __LINE__, QT_TESTCASE_BUILDDIR, QT_TESTCASE_SOURCEDIR)
 #else
 # define QFINDTESTDATA(basepath)\
     QTest::qFindTestData(basepath, __FILE__, __LINE__)
@@ -309,8 +314,8 @@ namespace QTest
 #if QT_CONFIG(temporaryfile)
     Q_TESTLIB_EXPORT QSharedPointer<QTemporaryDir> qExtractTestData(const QString &dirName);
 #endif
-    Q_TESTLIB_EXPORT QString qFindTestData(const char* basepath, const char* file = nullptr, int line = 0, const char* builddir = nullptr);
-    Q_TESTLIB_EXPORT QString qFindTestData(const QString& basepath, const char* file = nullptr, int line = 0, const char* builddir = nullptr);
+    Q_TESTLIB_EXPORT QString qFindTestData(const char* basepath, const char* file = nullptr, int line = 0, const char* builddir = nullptr, const char* sourcedir = nullptr);
+    Q_TESTLIB_EXPORT QString qFindTestData(const QString& basepath, const char* file = nullptr, int line = 0, const char* builddir = nullptr, const char *sourcedir = nullptr);
 
     Q_TESTLIB_EXPORT void *qData(const char *tagName, int typeId);
     Q_TESTLIB_EXPORT void *qGlobalData(const char *tagName, int typeId);
diff --git a/src/testlib/qtestkeyboard.h b/src/testlib/qtestkeyboard.h
index e8a7e0d5f5..1882c858c1 100644
--- a/src/testlib/qtestkeyboard.h
+++ b/src/testlib/qtestkeyboard.h
@@ -54,7 +54,9 @@
 #include <QtGui/qguiapplication.h>
 #include <QtGui/qwindow.h>
 #include <QtGui/qevent.h>
-#include <QtGui/qkeysequence.h>
+#if QT_CONFIG(shortcut)
+#  include <QtGui/qkeysequence.h>
+#endif
 
 #ifdef QT_WIDGETS_LIB
 #include <QtWidgets/qwidget.h>
diff --git a/src/tools/CMakeLists.txt b/src/tools/CMakeLists.txt
new file mode 100644
index 0000000000..425a99b552
--- /dev/null
+++ b/src/tools/CMakeLists.txt
@@ -0,0 +1,13 @@
+add_subdirectory(uic)
+if (QT_FEATURE_dbus)
+    add_subdirectory(qdbuscpp2xml)
+    add_subdirectory(qdbusxml2cpp)
+endif()
+add_subdirectory(qlalr)
+add_subdirectory(qvkgen)
+
+# Only include the following tools when performing a host build
+if(NOT CMAKE_CROSSCOMPILING)
+    add_subdirectory(androiddeployqt)
+    add_subdirectory(androidtestrunner)
+endif()
diff --git a/src/tools/androiddeployqt/.prev_CMakeLists.txt b/src/tools/androiddeployqt/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..e445201b82
--- /dev/null
+++ b/src/tools/androiddeployqt/.prev_CMakeLists.txt
@@ -0,0 +1,27 @@
+# Generated from androiddeployqt.pro.
+
+#####################################################################
+## androiddeployqt Binary:
+#####################################################################
+
+qt_add_executable(androiddeployqt
+    SOURCES
+        main.cpp
+    DEFINES
+        QT_NO_CAST_FROM_ASCII
+        QT_NO_CAST_TO_ASCII
+        QT_NO_FOREACH
+    PUBLIC_LIBRARIES
+        Qt::Gui
+)
+
+#### Keys ignored in scope 1:.:.:androiddeployqt.pro:<TRUE>:
+# _OPTION = "host_build"
+
+## Scopes:
+#####################################################################
+
+qt_extend_target(androiddeployqt CONDITION windows
+    COMPILE_OPTIONS
+        -U__STRICT_ANSI__
+)
diff --git a/src/tools/androiddeployqt/CMakeLists.txt b/src/tools/androiddeployqt/CMakeLists.txt
new file mode 100644
index 0000000000..d47e10efd2
--- /dev/null
+++ b/src/tools/androiddeployqt/CMakeLists.txt
@@ -0,0 +1,27 @@
+# Generated from androiddeployqt.pro.
+
+#####################################################################
+## androiddeployqt Binary:
+#####################################################################
+
+qt_add_executable(androiddeployqt
+    SOURCES
+        main.cpp
+    DEFINES
+        QT_NO_CAST_FROM_ASCII
+        QT_NO_CAST_TO_ASCII
+        QT_NO_FOREACH
+    PUBLIC_LIBRARIES
+        Qt::Core # special case
+)
+
+#### Keys ignored in scope 1:.:.:androiddeployqt.pro:<TRUE>:
+# _OPTION = "host_build"
+
+## Scopes:
+#####################################################################
+
+qt_extend_target(androiddeployqt CONDITION windows
+    COMPILE_OPTIONS
+        -U__STRICT_ANSI__
+)
diff --git a/src/tools/androiddeployqt/main.cpp b/src/tools/androiddeployqt/main.cpp
index 97e5c9eb69..3531e762fa 100644
--- a/src/tools/androiddeployqt/main.cpp
+++ b/src/tools/androiddeployqt/main.cpp
@@ -128,6 +128,7 @@ struct Options
         , jarSigner(false)
         , installApk(false)
         , uninstallApk(false)
+        , qmlImportScannerBinaryPath()
     {}
 
     enum DeploymentMechanism
@@ -231,6 +232,9 @@ struct Options
     QStringList initClasses;
     QStringList permissions;
     QStringList features;
+
+    // Override qml import scanner path
+    QString qmlImportScannerBinaryPath;
 };
 
 static const QHash<QByteArray, QByteArray> elfArchitecures = {
@@ -523,6 +527,8 @@ Options parseOptions()
             options.jarSigner = true;
         } else if (argument.compare(QLatin1String("--aux-mode"), Qt::CaseInsensitive) == 0) {
             options.auxMode = true;
+        } else if (argument.compare(QLatin1String("--qml-importscanner-binary"), Qt::CaseInsensitive) == 0) {
+            options.qmlImportScannerBinaryPath = arguments.at(++i).trimmed();
         }
     }
 
@@ -606,6 +612,10 @@ void printHelp()
                     "       dependencies into the build directory and update the XML templates.\n"
                     "       The project will not be built or installed.\n"
                     "    --apk <path/where/to/copy/the/apk>: Path where to copy the built apk.\n"
+                    "    --qml-importscanner-binary <path/to/qmlimportscanner>: Override the\n"
+                    "       default qmlimportscanner binary path. By default the\n"
+                    "       qmlimportscanner binary is located using the Qt directory\n"
+                    "       specified in the input file.\n"
                     "    --help: Displays this information.\n\n",
                     qPrintable(QCoreApplication::arguments().at(0))
             );
@@ -927,6 +937,12 @@ bool readInputFile(Options *options)
     }
 
     {
+        const QJsonValue qmlImportScannerBinaryPath = jsonObject.value(QLatin1String("qml-importscanner-binary"));
+        if (!qmlImportScannerBinaryPath.isUndefined())
+            options->qmlImportScannerBinaryPath = qmlImportScannerBinaryPath.toString();
+    }
+
+    {
         const QJsonValue applicationBinary = jsonObject.value(QLatin1String("application-binary"));
         if (applicationBinary.isUndefined()) {
             fprintf(stderr, "No application binary defined in json file.\n");
@@ -1703,10 +1719,15 @@ bool scanImports(Options *options, QSet<QString> *usedDependencies)
     if (options->verbose)
         fprintf(stdout, "Scanning for QML imports.\n");
 
-    QString qmlImportScanner = options->qtInstallDirectory + QLatin1String("/bin/qmlimportscanner");
+    QString qmlImportScanner;
+    if (!options->qmlImportScannerBinaryPath.isEmpty()) {
+        qmlImportScanner = options->qmlImportScannerBinaryPath;
+    } else {
+        options->qtInstallDirectory + QLatin1String("/bin/qmlimportscanner");
 #if defined(Q_OS_WIN32)
-    qmlImportScanner += QLatin1String(".exe");
+        qmlImportScanner += QLatin1String(".exe");
 #endif
+    }
 
     if (!QFile::exists(qmlImportScanner)) {
         fprintf(stderr, "qmlimportscanner not found: %s\n", qPrintable(qmlImportScanner));
diff --git a/src/tools/androidtestrunner/CMakeLists.txt b/src/tools/androidtestrunner/CMakeLists.txt
new file mode 100644
index 0000000000..d7ec4a66fa
--- /dev/null
+++ b/src/tools/androidtestrunner/CMakeLists.txt
@@ -0,0 +1,27 @@
+# Generated from androidtestrunner.pro.
+
+#####################################################################
+## androidtestrunner Binary:
+#####################################################################
+
+qt_add_executable(androidtestrunner
+    SOURCES
+        main.cpp
+    DEFINES
+        QT_NO_CAST_FROM_ASCII
+        QT_NO_CAST_TO_ASCII
+        QT_NO_FOREACH
+    PUBLIC_LIBRARIES
+        Qt::Gui
+)
+
+#### Keys ignored in scope 1:.:.:androidtestrunner.pro:<TRUE>:
+# _OPTION = "host_build"
+
+## Scopes:
+#####################################################################
+
+qt_extend_target(androidtestrunner CONDITION windows
+    COMPILE_OPTIONS
+        -U__STRICT_ANSI__
+)
diff --git a/src/tools/androidtestrunner/main.cpp b/src/tools/androidtestrunner/main.cpp
index 5471db3afd..f25d2c2de9 100644
--- a/src/tools/androidtestrunner/main.cpp
+++ b/src/tools/androidtestrunner/main.cpp
@@ -51,6 +51,7 @@ struct Options
 {
     bool helpRequested = false;
     bool verbose = false;
+    bool skipAddInstallRoot = false;
     std::chrono::seconds timeout{300}; // 5minutes
     QString androidDeployQtCommand;
     QString buildPath;
@@ -233,6 +234,8 @@ static bool parseOptions()
                 g_options.helpRequested = true;
             else
                 g_options.activity = arguments.at(++i);
+        } else if (argument.compare(QStringLiteral("--skip-install-root"), Qt::CaseInsensitive) == 0) {
+            g_options.skipAddInstallRoot = true;
         } else if (argument.compare(QStringLiteral("--timeout"), Qt::CaseInsensitive) == 0) {
             if (i + 1 == arguments.size())
                 g_options.helpRequested = true;
@@ -283,6 +286,7 @@ static void printHelp()
                     "       If make is missing make sure the --path is set.\n"
                     "    --apk <apk path>: If the apk is specified and if exists, we'll skip\n"
                     "       the package building.\n"
+                    "    --skip-install-root: Do not append INSTALL_ROOT=... to the make command.\n"
                     "    -- arguments that will be passed to the test application.\n"
                     "    --verbose: Prints out information during processing.\n"
                     "    --help: Displays this information.\n\n",
@@ -452,10 +456,17 @@ int main(int argc, char *argv[])
         }
     } else {
         if (!g_options.makeCommand.isEmpty()) {
-            // we need to run make INSTALL_ROOT=path install to install the application file(s) first
-            if (!execCommand(QStringLiteral("%1 INSTALL_ROOT=%2 install")
-                             .arg(g_options.makeCommand, QDir::toNativeSeparators(g_options.buildPath)), nullptr, g_options.verbose)) {
-                return 1;
+            if (!g_options.skipAddInstallRoot) {
+                // we need to run make INSTALL_ROOT=path install to install the application file(s) first
+                if (!execCommand(QStringLiteral("%1 INSTALL_ROOT=%2 install")
+                                 .arg(g_options.makeCommand, QDir::toNativeSeparators(g_options.buildPath)), nullptr, g_options.verbose)) {
+                    return 1;
+                }
+            } else {
+                if (!execCommand(QStringLiteral("%1")
+                                 .arg(g_options.makeCommand), nullptr, g_options.verbose)) {
+                    return 1;
+                }
             }
         }
 
diff --git a/src/tools/bootstrap/.prev_CMakeLists.txt b/src/tools/bootstrap/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..be8c0e22d8
--- /dev/null
+++ b/src/tools/bootstrap/.prev_CMakeLists.txt
@@ -0,0 +1,223 @@
+# Generated from bootstrap.pro.
+
+#####################################################################
+## Bootstrap Module:
+#####################################################################
+
+qt_add_module(Bootstrap
+    STATIC
+    INTERNAL_MODULE
+    NO_SYNC_QT
+    QMAKE_MODULE_CONFIG gc_binaries
+    SOURCES
+        ../../corelib/codecs/qlatincodec.cpp
+        ../../corelib/codecs/qtextcodec.cpp
+        ../../corelib/codecs/qutfcodec.cpp
+        ../../corelib/global/qendian.cpp
+        ../../corelib/global/qglobal.cpp
+        ../../corelib/global/qlogging.cpp
+        ../../corelib/global/qmalloc.cpp
+        ../../corelib/global/qnumeric.cpp
+        ../../corelib/global/qoperatingsystemversion.cpp
+        ../../corelib/global/qrandom.cpp
+        ../../corelib/io/qabstractfileengine.cpp
+        ../../corelib/io/qbuffer.cpp
+        ../../corelib/io/qdebug.cpp
+        ../../corelib/io/qdir.cpp
+        ../../corelib/io/qdiriterator.cpp
+        ../../corelib/io/qfile.cpp
+        ../../corelib/io/qfiledevice.cpp
+        ../../corelib/io/qfileinfo.cpp
+        ../../corelib/io/qfilesystemengine.cpp
+        ../../corelib/io/qfilesystementry.cpp
+        ../../corelib/io/qfsfileengine.cpp
+        ../../corelib/io/qfsfileengine_iterator.cpp
+        ../../corelib/io/qiodevice.cpp
+        ../../corelib/io/qipaddress.cpp
+        ../../corelib/io/qloggingcategory.cpp
+        ../../corelib/io/qloggingregistry.cpp
+        ../../corelib/io/qresource.cpp
+        ../../corelib/io/qsavefile.cpp
+        ../../corelib/io/qstandardpaths.cpp
+        ../../corelib/io/qtemporarydir.cpp
+        ../../corelib/io/qtemporaryfile.cpp
+        ../../corelib/io/qurl.cpp
+        ../../corelib/io/qurlidna.cpp
+        ../../corelib/io/qurlquery.cpp
+        ../../corelib/io/qurlrecode.cpp
+        ../../corelib/kernel/qcoreapplication.cpp
+        ../../corelib/kernel/qcoreglobaldata.cpp
+        ../../corelib/kernel/qmetatype.cpp
+        ../../corelib/kernel/qsharedmemory.cpp
+        ../../corelib/kernel/qsystemerror.cpp
+        ../../corelib/kernel/qsystemsemaphore.cpp
+        ../../corelib/kernel/qvariant.cpp
+        ../../corelib/plugin/quuid.cpp
+        ../../corelib/serialization/qcborcommon.cpp
+        ../../corelib/serialization/qcborstreamwriter.cpp
+        ../../corelib/serialization/qcborvalue.cpp
+        ../../corelib/serialization/qdatastream.cpp
+        ../../corelib/serialization/qjsonarray.cpp
+        ../../corelib/serialization/qjsoncbor.cpp
+        ../../corelib/serialization/qjsondocument.cpp
+        ../../corelib/serialization/qjsonobject.cpp
+        ../../corelib/serialization/qjsonparser.cpp
+        ../../corelib/serialization/qjsonvalue.cpp
+        ../../corelib/serialization/qjsonwriter.cpp
+        ../../corelib/serialization/qtextstream.cpp
+        ../../corelib/serialization/qxmlstream.cpp
+        ../../corelib/serialization/qxmlutils.cpp
+        ../../corelib/text/qbytearray.cpp
+        ../../corelib/text/qbytearraylist.cpp
+        ../../corelib/text/qbytearraymatcher.cpp
+        ../../corelib/text/qlocale.cpp
+        ../../corelib/text/qlocale_tools.cpp
+        ../../corelib/text/qregexp.cpp
+        ../../corelib/text/qstring.cpp
+        ../../corelib/text/qstring_compat.cpp
+        ../../corelib/text/qstringbuilder.cpp
+        ../../corelib/text/qstringlist.cpp
+        ../../corelib/text/qstringview.cpp
+        ../../corelib/text/qvsnprintf.cpp
+        ../../corelib/time/qcalendar.cpp
+        ../../corelib/time/qdatetime.cpp
+        ../../corelib/time/qgregoriancalendar.cpp
+        ../../corelib/time/qromancalendar.cpp
+        ../../corelib/tools/qarraydata.cpp
+        ../../corelib/tools/qbitarray.cpp
+        ../../corelib/tools/qcommandlineoption.cpp
+        ../../corelib/tools/qcommandlineparser.cpp
+        ../../corelib/tools/qcryptographichash.cpp
+        ../../corelib/tools/qhash.cpp
+        ../../corelib/tools/qline.cpp
+        ../../corelib/tools/qmap.cpp
+        ../../corelib/tools/qpoint.cpp
+        ../../corelib/tools/qrect.cpp
+        ../../corelib/tools/qringbuffer.cpp
+        ../../corelib/tools/qsize.cpp
+        ../../corelib/tools/qversionnumber.cpp
+        ../../xml/dom/qdom.cpp
+        ../../xml/sax/qxml.cpp
+    DEFINES
+        QT_BOOTSTRAPPED
+        QT_NO_CAST_FROM_ASCII
+        QT_NO_CAST_TO_ASCII
+        QT_NO_FOREACH
+        QT_VERSION_MAJOR=
+        QT_VERSION_MINOR=
+        QT_VERSION_PATCH=
+        QT_VERSION_STR=\"\"
+    PUBLIC_DEFINES
+        QT_BOOTSTRAPPED
+        QT_NO_CAST_TO_ASCII
+        QT_VERSION_MAJOR=
+        QT_VERSION_MINOR=
+        QT_VERSION_PATCH=
+        QT_VERSION_STR=\"\"
+    INCLUDE_DIRECTORIES
+        ..
+        ../../3rdparty/tinycbor/src
+)
+
+#### Keys ignored in scope 1:.:.:bootstrap.pro:<TRUE>:
+# INSTALLS = "lib"
+# MODULE_CONFIG = "gc_binaries"
+# MODULE_INCNAME = "QtCore" "QtXml"
+# _OPTION = "host_build"
+# lib.CONFIG = "dummy_install"
+
+## Scopes:
+#####################################################################
+
+qt_extend_target(Bootstrap CONDITION UNIX
+    SOURCES
+        ../../corelib/io/qfilesystemengine_unix.cpp
+        ../../corelib/io/qfilesystemiterator_unix.cpp
+        ../../corelib/io/qfsfileengine_unix.cpp
+        ../../corelib/kernel/qcore_unix.cpp
+        ../../corelib/kernel/qsharedmemory_posix.cpp
+        ../../corelib/kernel/qsharedmemory_systemv.cpp
+        ../../corelib/kernel/qsharedmemory_unix.cpp
+        ../../corelib/kernel/qsystemsemaphore_posix.cpp
+        ../../corelib/kernel/qsystemsemaphore_systemv.cpp
+        ../../corelib/kernel/qsystemsemaphore_unix.cpp
+)
+
+qt_extend_target(Bootstrap CONDITION WIN32
+    SOURCES
+        ../../corelib/global/qoperatingsystemversion_win.cpp
+        ../../corelib/io/qfilesystemengine_win.cpp
+        ../../corelib/io/qfilesystemiterator_win.cpp
+        ../../corelib/io/qfsfileengine_win.cpp
+        ../../corelib/io/qstandardpaths_win.cpp
+        ../../corelib/kernel/qcoreapplication_win.cpp
+        ../../corelib/kernel/qsharedmemory_win.cpp
+        ../../corelib/kernel/qsystemsemaphore_win.cpp
+        ../../corelib/kernel/qwinregistry.cpp
+        ../../corelib/plugin/qsystemlibrary.cpp
+    PUBLIC_LIBRARIES
+        advapi32
+        netapi32
+        ole32
+        shell32
+        user32
+)
+
+qt_extend_target(Bootstrap CONDITION APPLE
+    SOURCES
+        ../../corelib/global/qoperatingsystemversion_darwin.mm
+        ../../corelib/kernel/qcore_foundation.mm
+        ../../corelib/kernel/qcore_mac.cpp
+        ../../corelib/kernel/qcore_mac_objc.mm
+        ../../corelib/kernel/qcoreapplication_mac.cpp
+    PUBLIC_LIBRARIES
+        ${FWFoundation}
+)
+
+qt_extend_target(Bootstrap CONDITION APPLE_OSX
+    SOURCES
+        ../../corelib/io/qstandardpaths_mac.mm
+    LIBRARIES
+        ${FWCoreServices}
+)
+
+qt_extend_target(Bootstrap CONDITION APPLE_UIKIT
+    LIBRARIES
+        ${FWUIKit}
+)
+
+qt_extend_target(Bootstrap CONDITION UNIX AND NOT APPLE_OSX
+    SOURCES
+        ../../corelib/io/qstandardpaths_unix.cpp
+)
+
+qt_extend_target(Bootstrap CONDITION CMAKE_CROSSCOMPILING OR NOT QT_FEATURE_system_zlib
+    SOURCES
+        ../../3rdparty/zlib/src/adler32.c
+        ../../3rdparty/zlib/src/compress.c
+        ../../3rdparty/zlib/src/crc32.c
+        ../../3rdparty/zlib/src/deflate.c
+        ../../3rdparty/zlib/src/gzclose.c
+        ../../3rdparty/zlib/src/gzlib.c
+        ../../3rdparty/zlib/src/gzread.c
+        ../../3rdparty/zlib/src/gzwrite.c
+        ../../3rdparty/zlib/src/infback.c
+        ../../3rdparty/zlib/src/inffast.c
+        ../../3rdparty/zlib/src/inflate.c
+        ../../3rdparty/zlib/src/inftrees.c
+        ../../3rdparty/zlib/src/trees.c
+        ../../3rdparty/zlib/src/uncompr.c
+        ../../3rdparty/zlib/src/zutil.c
+    INCLUDE_DIRECTORIES
+        ../../3rdparty/zlib/src
+)
+
+qt_extend_target(Bootstrap CONDITION QT_FEATURE_system_zlib AND NOT CMAKE_CROSSCOMPILING
+    LIBRARIES
+        ZLIB::ZLIB
+)
+
+qt_extend_target(Bootstrap CONDITION WIN32 AND mingw
+    PUBLIC_LIBRARIES
+        uuid
+)
diff --git a/src/tools/bootstrap/CMakeLists.txt b/src/tools/bootstrap/CMakeLists.txt
new file mode 100644
index 0000000000..c9deb2c4f5
--- /dev/null
+++ b/src/tools/bootstrap/CMakeLists.txt
@@ -0,0 +1,230 @@
+# Generated from bootstrap.pro.
+
+#####################################################################
+## Bootstrap Module:
+#####################################################################
+
+# special case begin
+# The bootstrap library has a few manual tweaks compared to other
+# libraries.
+add_library(Bootstrap STATIC)
+# special case end
+qt_extend_target(Bootstrap
+    SOURCES
+        ../../corelib/codecs/qlatincodec.cpp
+        ../../corelib/codecs/qtextcodec.cpp
+        ../../corelib/codecs/qutfcodec.cpp
+        ../../corelib/global/qendian.cpp
+        ../../corelib/global/qglobal.cpp
+        ../../corelib/global/qlogging.cpp
+        ../../corelib/global/qmalloc.cpp
+        ../../corelib/global/qnumeric.cpp
+        ../../corelib/global/qoperatingsystemversion.cpp
+        ../../corelib/global/qrandom.cpp
+        ../../corelib/io/qabstractfileengine.cpp
+        ../../corelib/io/qbuffer.cpp
+        ../../corelib/io/qdebug.cpp
+        ../../corelib/io/qdir.cpp
+        ../../corelib/io/qdiriterator.cpp
+        ../../corelib/io/qfile.cpp
+        ../../corelib/io/qfiledevice.cpp
+        ../../corelib/io/qfileinfo.cpp
+        ../../corelib/io/qfilesystemengine.cpp
+        ../../corelib/io/qfilesystementry.cpp
+        ../../corelib/io/qfsfileengine.cpp
+        ../../corelib/io/qfsfileengine_iterator.cpp
+        ../../corelib/io/qiodevice.cpp
+        ../../corelib/io/qipaddress.cpp
+        ../../corelib/io/qloggingcategory.cpp
+        ../../corelib/io/qloggingregistry.cpp
+        ../../corelib/io/qresource.cpp
+        ../../corelib/io/qsavefile.cpp
+        ../../corelib/io/qstandardpaths.cpp
+        ../../corelib/io/qtemporarydir.cpp
+        ../../corelib/io/qtemporaryfile.cpp
+        ../../corelib/io/qurl.cpp
+        ../../corelib/io/qurlidna.cpp
+        ../../corelib/io/qurlquery.cpp
+        ../../corelib/io/qurlrecode.cpp
+        ../../corelib/kernel/qcoreapplication.cpp
+        ../../corelib/kernel/qcoreglobaldata.cpp
+        ../../corelib/kernel/qmetatype.cpp
+        ../../corelib/kernel/qsharedmemory.cpp
+        ../../corelib/kernel/qsystemerror.cpp
+        ../../corelib/kernel/qsystemsemaphore.cpp
+        ../../corelib/kernel/qvariant.cpp
+        ../../corelib/plugin/quuid.cpp
+        ../../corelib/serialization/qcborcommon.cpp
+        ../../corelib/serialization/qcborstreamwriter.cpp
+        ../../corelib/serialization/qcborvalue.cpp
+        ../../corelib/serialization/qdatastream.cpp
+        ../../corelib/serialization/qjsonarray.cpp
+        ../../corelib/serialization/qjsoncbor.cpp
+        ../../corelib/serialization/qjsondocument.cpp
+        ../../corelib/serialization/qjsonobject.cpp
+        ../../corelib/serialization/qjsonparser.cpp
+        ../../corelib/serialization/qjsonvalue.cpp
+        ../../corelib/serialization/qjsonwriter.cpp
+        ../../corelib/serialization/qtextstream.cpp
+        ../../corelib/serialization/qxmlstream.cpp
+        ../../corelib/serialization/qxmlutils.cpp
+        ../../corelib/text/qbytearray.cpp
+        ../../corelib/text/qbytearraylist.cpp
+        ../../corelib/text/qbytearraymatcher.cpp
+        ../../corelib/text/qlocale.cpp
+        ../../corelib/text/qlocale_tools.cpp
+        ../../corelib/text/qregexp.cpp
+        ../../corelib/text/qstring.cpp
+        ../../corelib/text/qstring_compat.cpp
+        ../../corelib/text/qstringbuilder.cpp
+        ../../corelib/text/qstringlist.cpp
+        ../../corelib/text/qstringview.cpp
+        ../../corelib/text/qvsnprintf.cpp
+        ../../corelib/time/qcalendar.cpp
+        ../../corelib/time/qdatetime.cpp
+        ../../corelib/time/qgregoriancalendar.cpp
+        ../../corelib/time/qromancalendar.cpp
+        ../../corelib/tools/qarraydata.cpp
+        ../../corelib/tools/qbitarray.cpp
+        ../../corelib/tools/qcommandlineoption.cpp
+        ../../corelib/tools/qcommandlineparser.cpp
+        ../../corelib/tools/qcryptographichash.cpp
+        ../../corelib/tools/qhash.cpp
+        ../../corelib/tools/qline.cpp
+        ../../corelib/tools/qmap.cpp
+        ../../corelib/tools/qpoint.cpp
+        ../../corelib/tools/qrect.cpp
+        ../../corelib/tools/qringbuffer.cpp
+        ../../corelib/tools/qsize.cpp
+        ../../corelib/tools/qversionnumber.cpp
+        ../../xml/dom/qdom.cpp
+        ../../xml/sax/qxml.cpp
+    PUBLIC_DEFINES # special case
+        QT_VERSION_MAJOR=${PROJECT_VERSION_MAJOR} # special case
+        QT_VERSION_MINOR=${PROJECT_VERSION_MINOR} # special case
+        QT_VERSION_PATCH=${PROJECT_VERSION_PATCH} # special case
+        QT_VERSION_STR="${PROJECT_VERSION}" # special case
+        QT_USE_QSTRINGBUILDER # special case
+        QT_BOOTSTRAPPED
+        QT_NO_CAST_FROM_ASCII
+        QT_NO_CAST_TO_ASCII
+        QT_NO_FOREACH
+    INCLUDE_DIRECTORIES
+        ..
+        ../../3rdparty/tinycbor/src
+    PUBLIC_INCLUDE_DIRECTORIES  # special case
+        $<TARGET_PROPERTY:Core,INCLUDE_DIRECTORIES> # special case
+        $<TARGET_PROPERTY:Xml,INCLUDE_DIRECTORIES> # special case
+    PUBLIC_LIBRARIES  # special case
+        Qt::Platform # special case
+)
+
+#### Keys ignored in scope 1:.:.:bootstrap.pro:<TRUE>:
+# INSTALLS = "lib"
+# MODULE_CONFIG = "gc_binaries"
+# MODULE_INCNAME = "QtCore" "QtXml"
+# _OPTION = "host_build"
+# lib.CONFIG = "dummy_install"
+
+## Scopes:
+#####################################################################
+
+qt_extend_target(Bootstrap CONDITION UNIX
+    SOURCES
+        ../../corelib/io/qfilesystemengine_unix.cpp
+        ../../corelib/io/qfilesystemiterator_unix.cpp
+        ../../corelib/io/qfsfileengine_unix.cpp
+        ../../corelib/kernel/qcore_unix.cpp
+        ../../corelib/kernel/qsharedmemory_posix.cpp
+        ../../corelib/kernel/qsharedmemory_systemv.cpp
+        ../../corelib/kernel/qsharedmemory_unix.cpp
+        ../../corelib/kernel/qsystemsemaphore_posix.cpp
+        ../../corelib/kernel/qsystemsemaphore_systemv.cpp
+        ../../corelib/kernel/qsystemsemaphore_unix.cpp
+)
+
+qt_extend_target(Bootstrap CONDITION WIN32
+    SOURCES
+        ../../corelib/global/qoperatingsystemversion_win.cpp
+        ../../corelib/io/qfilesystemengine_win.cpp
+        ../../corelib/io/qfilesystemiterator_win.cpp
+        ../../corelib/io/qfsfileengine_win.cpp
+        ../../corelib/io/qstandardpaths_win.cpp
+        ../../corelib/kernel/qcoreapplication_win.cpp
+        ../../corelib/kernel/qsharedmemory_win.cpp
+        ../../corelib/kernel/qsystemsemaphore_win.cpp
+        ../../corelib/kernel/qwinregistry.cpp
+        ../../corelib/plugin/qsystemlibrary.cpp
+    PUBLIC_LIBRARIES
+        advapi32
+        netapi32
+        ole32
+        shell32
+        user32
+)
+
+qt_extend_target(Bootstrap CONDITION APPLE
+    SOURCES
+        ../../corelib/global/qoperatingsystemversion_darwin.mm
+        ../../corelib/kernel/qcore_foundation.mm
+        ../../corelib/kernel/qcore_mac.cpp
+        ../../corelib/kernel/qcore_mac_objc.mm
+        ../../corelib/kernel/qcoreapplication_mac.cpp
+    PUBLIC_LIBRARIES
+        ${FWFoundation}
+)
+
+qt_extend_target(Bootstrap CONDITION APPLE_OSX
+    SOURCES
+        ../../corelib/io/qstandardpaths_mac.mm
+    LIBRARIES
+        ${FWCoreServices}
+)
+
+qt_extend_target(Bootstrap CONDITION APPLE_UIKIT
+    LIBRARIES
+        ${FWUIKit}
+)
+
+qt_extend_target(Bootstrap CONDITION UNIX AND NOT APPLE_OSX
+    SOURCES
+        ../../corelib/io/qstandardpaths_unix.cpp
+)
+
+qt_extend_target(Bootstrap CONDITION CMAKE_CROSSCOMPILING OR NOT QT_FEATURE_system_zlib
+    SOURCES
+        ../../3rdparty/zlib/src/adler32.c
+        ../../3rdparty/zlib/src/compress.c
+        ../../3rdparty/zlib/src/crc32.c
+        ../../3rdparty/zlib/src/deflate.c
+        ../../3rdparty/zlib/src/gzclose.c
+        ../../3rdparty/zlib/src/gzlib.c
+        ../../3rdparty/zlib/src/gzread.c
+        ../../3rdparty/zlib/src/gzwrite.c
+        ../../3rdparty/zlib/src/infback.c
+        ../../3rdparty/zlib/src/inffast.c
+        ../../3rdparty/zlib/src/inflate.c
+        ../../3rdparty/zlib/src/inftrees.c
+        ../../3rdparty/zlib/src/trees.c
+        ../../3rdparty/zlib/src/uncompr.c
+        ../../3rdparty/zlib/src/zutil.c
+    INCLUDE_DIRECTORIES
+        ../../3rdparty/zlib/src
+)
+
+qt_extend_target(Bootstrap CONDITION QT_FEATURE_system_zlib AND NOT CMAKE_CROSSCOMPILING
+    LIBRARIES
+        ZLIB::ZLIB
+)
+
+qt_extend_target(Bootstrap CONDITION WIN32 AND mingw
+    PUBLIC_LIBRARIES
+        uuid
+)
+
+# special case begin
+qt_internal_add_link_flags_gc_sections(Bootstrap PUBLIC)
+set_target_properties(Bootstrap PROPERTIES AUTOMOC OFF AUTOUIC OFF AUTORCC OFF)
+qt_internal_add_target_aliases(Bootstrap)
+qt_enable_msvc_cplusplus_define(Bootstrap PUBLIC)
+# special case end
diff --git a/src/tools/bootstrap/bootstrap.pro b/src/tools/bootstrap/bootstrap.pro
index bfd199a8ba..b68bed436e 100644
--- a/src/tools/bootstrap/bootstrap.pro
+++ b/src/tools/bootstrap/bootstrap.pro
@@ -103,7 +103,6 @@ SOURCES += \
            ../../corelib/tools/qcommandlineoption.cpp \
            ../../corelib/tools/qcryptographichash.cpp \
            ../../corelib/tools/qhash.cpp \
-           ../../corelib/tools/qlist.cpp \
            ../../corelib/tools/qmap.cpp \
            ../../corelib/tools/qringbuffer.cpp \
            ../../corelib/tools/qpoint.cpp \
diff --git a/src/tools/cmake_automoc_parser/CMakeLists.txt b/src/tools/cmake_automoc_parser/CMakeLists.txt
new file mode 100644
index 0000000000..73303215bb
--- /dev/null
+++ b/src/tools/cmake_automoc_parser/CMakeLists.txt
@@ -0,0 +1,18 @@
+#####################################################################
+## moc Tool:
+#####################################################################
+
+qt_add_tool(cmake_automoc_parser
+    BOOTSTRAP
+    TOOLS_TARGET Core # special case
+    SOURCES
+        main.cpp
+    DEFINES
+        QT_MOC
+        QT_NO_CAST_FROM_ASCII
+        QT_NO_CAST_FROM_BYTEARRAY
+        QT_NO_COMPRESS
+        QT_NO_FOREACH
+    INCLUDE_DIRECTORIES
+        ${CMAKE_CURRENT_SOURCE_DIR}
+)
diff --git a/src/tools/cmake_automoc_parser/main.cpp b/src/tools/cmake_automoc_parser/main.cpp
new file mode 100644
index 0000000000..60eb4b2977
--- /dev/null
+++ b/src/tools/cmake_automoc_parser/main.cpp
@@ -0,0 +1,399 @@
+/****************************************************************************
+**
+** Copyright (C) 2019 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the tools applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:GPL-EXCEPT$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 as published by the Free Software
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtCore/qglobal.h>
+
+#include <cstdio>
+#include <cstdlib>
+
+#include <qfile.h>
+#include <qjsonarray.h>
+#include <qjsondocument.h>
+#include <qjsonobject.h>
+#include <qdir.h>
+#include <qstring.h>
+#include <qhash.h>
+#include <qvector.h>
+#include <qstack.h>
+#include <qdebug.h>
+#include <qset.h>
+#include <qmap.h>
+#include <qcoreapplication.h>
+#include <qcommandlineoption.h>
+#include <qcommandlineparser.h>
+
+QT_BEGIN_NAMESPACE
+
+using AutoGenHeaderMap = QMap<QString, QString>;
+using AutoGenSourcesList = QVector<QString>;
+
+static bool readAutogenInfoJson(AutoGenHeaderMap &headers, AutoGenSourcesList &sources,
+                                QStringList &headerExts, const QString &autoGenInfoJsonPath)
+{
+    QFile file(autoGenInfoJsonPath);
+    if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) {
+        fprintf(stderr, "Could not open: %s\n", qPrintable(autoGenInfoJsonPath));
+        return false;
+    }
+
+    const QByteArray contents = file.readAll();
+    file.close();
+
+    QJsonParseError error;
+    QJsonDocument doc = QJsonDocument::fromJson(contents, &error);
+
+    if (error.error != QJsonParseError::NoError) {
+        fprintf(stderr, "Failed to parse json file: %s\n", qPrintable(autoGenInfoJsonPath));
+        return false;
+    }
+
+    QJsonObject rootObject = doc.object();
+    QJsonValue headersValue = rootObject.value(QLatin1String("HEADERS"));
+    QJsonValue sourcesValue = rootObject.value(QLatin1String("SOURCES"));
+    QJsonValue headerExtValue = rootObject.value(QLatin1String("HEADER_EXTENSIONS"));
+
+    if (!headersValue.isArray() || !sourcesValue.isArray() || !headerExtValue.isArray()) {
+        fprintf(stderr,
+                "%s layout does not match the expected layout. This most likely means that file "
+                "format changed or this file is not a product of CMake's AutoGen process.\n",
+                qPrintable(autoGenInfoJsonPath));
+        return false;
+    }
+
+    QJsonArray headersArray = headersValue.toArray();
+    QJsonArray sourcesArray = sourcesValue.toArray();
+    QJsonArray headerExtArray = headerExtValue.toArray();
+
+    for (const auto &value : headersArray) {
+        QJsonArray entry_array = value.toArray();
+        if (entry_array.size() > 2) {
+            // Array[0] : header path
+            // Array[2] : Location of the generated moc file for this header
+            // if no source file includes it
+            headers.insert(entry_array[0].toString(), entry_array[2].toString());
+        }
+    }
+
+    sources.reserve(sourcesArray.size());
+    for (const auto &value : sourcesArray) {
+        QJsonArray entry_array = value.toArray();
+        if (entry_array.size() > 1) {
+            sources.push_back(entry_array[0].toString());
+        }
+    }
+
+    headerExts.reserve(headerExtArray.size());
+    for (const auto &value : headerExtArray) {
+        headerExts.push_back(value.toString());
+    }
+
+    return true;
+}
+
+struct ParseCacheEntry
+{
+    QStringList mocFiles;
+    QStringList mocIncludes;
+};
+
+using ParseCacheMap = QMap<QString, ParseCacheEntry>;
+
+static bool readParseCache(ParseCacheMap &entries, const QString &parseCacheFilePath)
+{
+
+    QFile file(parseCacheFilePath);
+    if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) {
+        fprintf(stderr, "Could not open: %s\n", qPrintable(parseCacheFilePath));
+        return false;
+    }
+
+    QString source;
+    QStringList mocEntries;
+    QStringList mocIncludes;
+
+    // File format
+    // ....
+    // header/source path N
+    //  mmc:Q_OBJECT| mcc:Q_GADGET # This file has been mocked
+    //  miu:moc_....cpp # Path of the moc.cpp file generated for the above file
+    //  relative to TARGET_BINARY_DIR/TARGET_autgen/include directory. Not
+    //  present for headers.
+    //  mid: ....moc # Path of .moc file generated for the above file relative
+    //  to TARGET_BINARY_DIR/TARGET_autogen/include directory.
+    //  uic: UI related info, ignored
+    //  mdp: Moc dependencies, ignored
+    //  udp: UI dependencies, ignored
+    // header/source path N + 1
+    // ....
+
+    QTextStream textStream(&file);
+    const QString mmcKey = QString(QLatin1String(" mmc:"));
+    const QString miuKey = QString(QLatin1String(" miu:"));
+    const QString uicKey = QString(QLatin1String(" uic:"));
+    const QString midKey = QString(QLatin1String(" mid:"));
+    const QString mdpKey = QString(QLatin1String(" mdp:"));
+    const QString udpKey = QString(QLatin1String(" udp:"));
+    QString line;
+    bool mmc_key_found = false;
+    while (textStream.readLineInto(&line)) {
+        if (!line.startsWith(QLatin1Char(' '))) {
+            if (!mocEntries.isEmpty() || mmc_key_found || !mocIncludes.isEmpty()) {
+                entries.insert(source,
+                               ParseCacheEntry { std::move(mocEntries), std::move(mocIncludes) });
+                source.clear();
+                mmc_key_found = false;
+            }
+            source = line;
+        } else if (line.startsWith(mmcKey)) {
+            mmc_key_found = true;
+        } else if (line.startsWith(miuKey)) {
+            mocIncludes.push_back(line.right(line.size() - miuKey.size()));
+        } else if (line.startsWith(midKey)) {
+            mocEntries.push_back(line.right(line.size() - midKey.size()));
+        } else if (line.startsWith(uicKey) || line.startsWith(mdpKey) || line.startsWith(udpKey)) {
+            // nothing to do ignore
+            continue;
+        } else {
+            fprintf(stderr, "Unhandled line entry \"%s\" in %s\n", qPrintable(line),
+                    qPrintable(parseCacheFilePath));
+            return false;
+        }
+    }
+
+    // Check if last entry has any data left to processed
+    if (!mocEntries.isEmpty() || !mocIncludes.isEmpty() || mmc_key_found) {
+        entries.insert(source, ParseCacheEntry { std::move(mocEntries), std::move(mocIncludes) });
+    }
+
+    file.close();
+    return true;
+}
+
+static bool readJsonFiles(QVector<QString> &entries, const QString &filePath)
+{
+
+    QFile file(filePath);
+    if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) {
+        fprintf(stderr, "Could not open: %s\n", qPrintable(filePath));
+        return false;
+    }
+
+    QTextStream textStream(&file);
+    QString line;
+    while (textStream.readLineInto(&line)) {
+        entries.push_back(line);
+    }
+    file.close();
+    return true;
+}
+
+static bool writeJsonFiles(const QVector<QString> &fileList, const QString &fileListFilePath)
+{
+    QFile file(fileListFilePath);
+    if (!file.open(QIODevice::WriteOnly | QIODevice::Text)) {
+        fprintf(stderr, "Could not open: %s\n", qPrintable(fileListFilePath));
+        return false;
+    }
+
+    QTextStream textStream(&file);
+    for (const auto &file : fileList) {
+        textStream << file << Qt::endl;
+    }
+
+    file.close();
+    return true;
+}
+
+int main(int argc, char **argv)
+{
+
+    QCoreApplication app(argc, argv);
+    QCommandLineParser parser;
+    parser.setApplicationDescription(QStringLiteral("Qt CMake Autogen parser tool"));
+
+    parser.addHelpOption();
+    parser.setSingleDashWordOptionMode(QCommandLineParser::ParseAsLongOptions);
+
+    QCommandLineOption outputFileOption(QStringLiteral("output-file-path"));
+    outputFileOption.setDescription(
+            QStringLiteral("Output file where the meta type file list will be written."));
+    outputFileOption.setValueName(QStringLiteral("output file"));
+    parser.addOption(outputFileOption);
+
+    QCommandLineOption cmakeAutogenCacheFileOption(QStringLiteral("cmake-autogen-cache-file"));
+    cmakeAutogenCacheFileOption.setDescription(
+            QStringLiteral("Location of the CMake AutoGen ParseCache.txt file."));
+    cmakeAutogenCacheFileOption.setValueName(QStringLiteral("CMake AutoGen ParseCache.txt file"));
+    parser.addOption(cmakeAutogenCacheFileOption);
+
+    QCommandLineOption cmakeAutogenInfoFileOption(QStringLiteral("cmake-autogen-info-file"));
+    cmakeAutogenInfoFileOption.setDescription(
+            QStringLiteral("Location of the CMake AutoGen AutogenInfo.json file."));
+    cmakeAutogenInfoFileOption.setValueName(QStringLiteral("CMake AutoGen AutogenInfo.json file"));
+    parser.addOption(cmakeAutogenInfoFileOption);
+
+    QCommandLineOption cmakeAutogenIncludeDirOption(
+            QStringLiteral("cmake-autogen-include-dir-path"));
+    cmakeAutogenIncludeDirOption.setDescription(
+            QStringLiteral("Location of the CMake AutoGen include directory."));
+    cmakeAutogenIncludeDirOption.setValueName(QStringLiteral("CMake AutoGen include directory"));
+    parser.addOption(cmakeAutogenIncludeDirOption);
+
+    QCommandLineOption isMultiConfigOption(
+            QStringLiteral("cmake-multi-config"));
+    isMultiConfigOption.setDescription(
+            QStringLiteral("Set this option when using CMake with a multi-config generator"));
+    parser.addOption(isMultiConfigOption);
+
+    QStringList arguments = QCoreApplication::arguments();
+    parser.process(arguments);
+
+    if (!parser.isSet(outputFileOption) || !parser.isSet(cmakeAutogenInfoFileOption)
+        || !parser.isSet(cmakeAutogenCacheFileOption)
+        || !parser.isSet(cmakeAutogenIncludeDirOption)) {
+        parser.showHelp(1);
+        return EXIT_FAILURE;
+    }
+
+    // Read source files from AutogenInfo.json
+    AutoGenHeaderMap autoGenHeaders;
+    AutoGenSourcesList autoGenSources;
+    QStringList headerExtList;
+    if (!readAutogenInfoJson(autoGenHeaders, autoGenSources, headerExtList,
+                             parser.value(cmakeAutogenInfoFileOption))) {
+        return EXIT_FAILURE;
+    }
+
+    ParseCacheMap parseCacheEntries;
+    if (!readParseCache(parseCacheEntries, parser.value(cmakeAutogenCacheFileOption))) {
+        return EXIT_FAILURE;
+    }
+
+    const QString cmakeIncludeDir = parser.value(cmakeAutogenIncludeDirOption);
+
+    // Algorithm description
+    // 1) For each source from the AutoGenSources list check if there is a parse
+    // cache entry.
+    // 1a) If an entry was wound there exists an moc_...cpp file somewhere.
+    // Remove the header file from the AutoGenHeader files
+    // 1b) For every matched source entry, check the moc includes as it is
+    // possible for a source file to include moc files from other headers.
+    // Remove the header from AutoGenHeaders
+    // 2) For every remaining header in AutoGenHeaders, check if there is an
+    // entry for it in the parse cache. Use the value for the location of the
+    // moc.json file
+
+    QVector<QString> jsonFileList;
+    QDir dir(cmakeIncludeDir);
+    jsonFileList.reserve(autoGenSources.size());
+
+    // 1) Process sources
+    for (const auto &source : autoGenSources) {
+        auto it = parseCacheEntries.find(source);
+        if (it == parseCacheEntries.end()) {
+            continue;
+        }
+
+        const QFileInfo fileInfo(source);
+        const QString base = fileInfo.path() + fileInfo.completeBaseName();
+        // 1a) erase header
+        for (const auto &ext : headerExtList) {
+            const QString headerPath = base + QLatin1Char('.') + ext;
+            auto it = autoGenHeaders.find(headerPath);
+            if (it != autoGenHeaders.end()) {
+                autoGenHeaders.erase(it);
+                break;
+            }
+        }
+        // Add extra moc files
+        for (const auto &mocFile : it.value().mocFiles) {
+            jsonFileList.push_back(dir.filePath(mocFile) + QLatin1String(".json"));
+        }
+        // Add main moc files
+        for (const auto &mocFile : it.value().mocIncludes) {
+            jsonFileList.push_back(dir.filePath(mocFile) + QLatin1String(".json"));
+            // 1b) Locate this header and delete it
+            constexpr int mocKeyLen = 4; // length of "moc_"
+            const QString headerBaseName =
+                    QFileInfo(mocFile.right(mocFile.size() - mocKeyLen)).completeBaseName();
+            bool breakFree = false;
+            for (auto &ext : headerExtList) {
+                const QString headerSuffix = headerBaseName + QLatin1Char('.') + ext;
+                for (auto it = autoGenHeaders.begin(); it != autoGenHeaders.end(); ++it) {
+                    if (it.key().endsWith(headerSuffix)
+                        && QFileInfo(it.key()).completeBaseName() == headerBaseName) {
+                        autoGenHeaders.erase(it);
+                        breakFree = true;
+                        break;
+                    }
+                }
+                if (breakFree) {
+                    break;
+                }
+            }
+        }
+    }
+
+    // 2) Process headers
+    const bool isMultiConfig = parser.isSet(isMultiConfigOption);
+    for (auto mapIt = autoGenHeaders.begin(); mapIt != autoGenHeaders.end(); ++mapIt) {
+        auto it = parseCacheEntries.find(mapIt.key());
+        if (it == parseCacheEntries.end()) {
+            continue;
+        }
+        const QString pathPrefix = !isMultiConfig
+            ? QStringLiteral("../")
+            : QString();
+        const QString jsonPath =
+                dir.filePath(pathPrefix + mapIt.value() + QLatin1String(".json"));
+        jsonFileList.push_back(jsonPath);
+    }
+
+    // Sort for consistent checks across runs
+    jsonFileList.sort();
+
+    // Read Previous file list (if any)
+    const QString fileListFilePath = parser.value(outputFileOption);
+    QVector<QString> previousList;
+    QFile prev_file(fileListFilePath);
+
+    // Only try to open file if it exists to avoid error messages
+    if (prev_file.exists()) {
+        (void)readJsonFiles(previousList, fileListFilePath);
+    }
+
+    if (previousList != jsonFileList || !QFile(fileListFilePath).exists()) {
+        if (!writeJsonFiles(jsonFileList, fileListFilePath)) {
+            return EXIT_FAILURE;
+        }
+    }
+
+    return EXIT_SUCCESS;
+}
+
+QT_END_NAMESPACE
diff --git a/src/tools/moc/.prev_CMakeLists.txt b/src/tools/moc/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..ffadd2e2be
--- /dev/null
+++ b/src/tools/moc/.prev_CMakeLists.txt
@@ -0,0 +1,35 @@
+# Generated from moc.pro.
+
+#####################################################################
+## moc Tool:
+#####################################################################
+
+qt_add_tool(moc
+    BOOTSTRAP
+    SOURCES
+        cbordevice.h
+        collectjson.cpp collectjson.h
+        generator.cpp generator.h
+        main.cpp
+        moc.cpp moc.h
+        outputrevision.h
+        parser.cpp parser.h
+        preprocessor.cpp preprocessor.h
+        qdatetime_p.h
+        symbols.h
+        token.cpp token.h
+        utils.h
+    DEFINES
+        QT_MOC
+        QT_NO_CAST_FROM_ASCII
+        QT_NO_CAST_FROM_BYTEARRAY
+        QT_NO_COMPRESS
+        QT_NO_FOREACH
+    INCLUDE_DIRECTORIES
+        ${CMAKE_CURRENT_SOURCE_DIR}
+        ../../3rdparty/tinycbor/src
+)
+
+#### Keys ignored in scope 1:.:.:moc.pro:<TRUE>:
+# QMAKE_TARGET_DESCRIPTION = "Qt Meta Object Compiler"
+# _OPTION = "host_build"
diff --git a/src/tools/moc/CMakeLists.txt b/src/tools/moc/CMakeLists.txt
new file mode 100644
index 0000000000..c9786674f1
--- /dev/null
+++ b/src/tools/moc/CMakeLists.txt
@@ -0,0 +1,36 @@
+# Generated from moc.pro.
+
+#####################################################################
+## moc Tool:
+#####################################################################
+
+qt_add_tool(moc
+    BOOTSTRAP
+    TOOLS_TARGET Core # special case
+    SOURCES
+        cbordevice.h
+        collectjson.cpp collectjson.h
+        generator.cpp generator.h
+        main.cpp
+        moc.cpp moc.h
+        outputrevision.h
+        parser.cpp parser.h
+        preprocessor.cpp preprocessor.h
+        # qdatetime_p.h special case remove
+        symbols.h
+        token.cpp token.h
+        utils.h
+    DEFINES
+        QT_MOC
+        QT_NO_CAST_FROM_ASCII
+        QT_NO_CAST_FROM_BYTEARRAY
+        QT_NO_COMPRESS
+        QT_NO_FOREACH
+    INCLUDE_DIRECTORIES
+        ${CMAKE_CURRENT_SOURCE_DIR}
+        ../../3rdparty/tinycbor/src
+)
+
+#### Keys ignored in scope 1:.:.:moc.pro:<TRUE>:
+# QMAKE_TARGET_DESCRIPTION = "Qt Meta Object Compiler"
+# _OPTION = "host_build"
diff --git a/src/tools/moc/collectjson.cpp b/src/tools/moc/collectjson.cpp
index 4029bca5e9..fe499151cb 100644
--- a/src/tools/moc/collectjson.cpp
+++ b/src/tools/moc/collectjson.cpp
@@ -83,7 +83,9 @@ int collectJson(const QStringList &jsonFiles, const QString &outputFile)
         }
     }
 
-    for (const QString &jsonFile: jsonFiles) {
+    QStringList jsonFilesSorted = jsonFiles;
+    jsonFilesSorted.sort();
+    for (const QString &jsonFile : qAsConst(jsonFilesSorted)) {
         QFile f(jsonFile);
         if (!f.open(QIODevice::ReadOnly)) {
             fprintf(stderr, "Error opening %s for reading\n", qPrintable(jsonFile));
diff --git a/src/tools/moc/generator.cpp b/src/tools/moc/generator.cpp
index 7264b5bf66..078eea257d 100644
--- a/src/tools/moc/generator.cpp
+++ b/src/tools/moc/generator.cpp
@@ -194,7 +194,6 @@ static bool qualifiedNameEquals(const QByteArray &qualifiedName, const QByteArra
 
 void Generator::generateCode()
 {
-    bool isQt = (cdef->classname == "Qt");
     bool isQObject = (cdef->classname == "QObject");
     bool isConstructible = !cdef->constructorList.isEmpty();
 
@@ -237,7 +236,7 @@ void Generator::generateCode()
 //
     const int constCharArraySizeLimit = 65535;
     fprintf(out, "struct qt_meta_stringdata_%s_t {\n", qualifiedClassNameIdentifier.constData());
-    fprintf(out, "    QByteArrayData data[%d];\n", strings.size());
+    fprintf(out, "    const uint offsetsAndSize[%d];\n", strings.size()*2);
     {
         int stringDataLength = 0;
         int stringDataCounter = 0;
@@ -260,11 +259,8 @@ void Generator::generateCode()
     // stringdata.stringdata member, and 2) the stringdata.data index of the
     // QByteArrayData being defined. This calculation relies on the
     // QByteArrayData::data() implementation returning simply "this + offset".
-    fprintf(out, "#define QT_MOC_LITERAL(idx, ofs, len) \\\n"
-            "    Q_STATIC_BYTE_ARRAY_DATA_HEADER_INITIALIZER_WITH_OFFSET(len, \\\n"
-            "    qptrdiff(offsetof(qt_meta_stringdata_%s_t, stringdata0) + ofs \\\n"
-            "        - idx * sizeof(QByteArrayData)) \\\n"
-            "    )\n",
+    fprintf(out, "#define QT_MOC_LITERAL(ofs, len) \\\n"
+            "    uint(offsetof(qt_meta_stringdata_%s_t, stringdata0) + ofs), len \n",
             qualifiedClassNameIdentifier.constData());
 
     fprintf(out, "static const qt_meta_stringdata_%s_t qt_meta_stringdata_%s = {\n",
@@ -274,7 +270,7 @@ void Generator::generateCode()
         int idx = 0;
         for (int i = 0; i < strings.size(); ++i) {
             const QByteArray &str = strings.at(i);
-            fprintf(out, "QT_MOC_LITERAL(%d, %d, %d)", i, idx, str.length());
+            fprintf(out, "QT_MOC_LITERAL(%d, %d)", idx, str.length());
             if (i != strings.size() - 1)
                 fputc(',', out);
             const QByteArray comment = str.length() > 32 ? str.left(29) + "..." : str;
@@ -452,7 +448,7 @@ void Generator::generateCode()
 //
 // Generate internal qt_static_metacall() function
 //
-    const bool hasStaticMetaCall = !isQt &&
+    const bool hasStaticMetaCall =
             (cdef->hasQObject || !cdef->methodList.isEmpty()
              || !cdef->propertyList.isEmpty() || !cdef->constructorList.isEmpty());
     if (hasStaticMetaCall)
@@ -480,7 +476,7 @@ void Generator::generateCode()
         QByteArray unqualifiedScope = p.type.left(s);
 
         // The scope may be a namespace for example, so it's only safe to include scopes that are known QObjects (QTBUG-2151)
-        QHash<QByteArray, QByteArray>::ConstIterator scopeIt;
+        QMultiHash<QByteArray, QByteArray>::ConstIterator scopeIt;
 
         QByteArray thisScope = cdef->qualified;
         do {
@@ -534,10 +530,7 @@ void Generator::generateCode()
 //
 // Finally create and initialize the static meta object
 //
-    if (isQt)
-        fprintf(out, "QT_INIT_METAOBJECT const QMetaObject QObject::staticQtMetaObject = { {\n");
-    else
-        fprintf(out, "QT_INIT_METAOBJECT const QMetaObject %s::staticMetaObject = { {\n", cdef->qualified.constData());
+    fprintf(out, "QT_INIT_METAOBJECT const QMetaObject %s::staticMetaObject = { {\n", cdef->qualified.constData());
 
     if (isQObject)
         fprintf(out, "    nullptr,\n");
@@ -547,7 +540,7 @@ void Generator::generateCode()
         fprintf(out, "    QtPrivate::MetaObjectForType<%s>::value(),\n", purestSuperClass.constData());
     else
         fprintf(out, "    nullptr,\n");
-    fprintf(out, "    qt_meta_stringdata_%s.data,\n"
+    fprintf(out, "    qt_meta_stringdata_%s.offsetsAndSize,\n"
             "    qt_meta_data_%s,\n", qualifiedClassNameIdentifier.constData(),
             qualifiedClassNameIdentifier.constData());
     if (hasStaticMetaCall)
@@ -559,10 +552,19 @@ void Generator::generateCode()
         fprintf(out, "    nullptr,\n");
     else
         fprintf(out, "    qt_meta_extradata_%s,\n", qualifiedClassNameIdentifier.constData());
-    fprintf(out, "    nullptr\n} };\n\n");
 
-    if(isQt)
-        return;
+    if (cdef->propertyList.isEmpty()) {
+        fprintf(out, "    nullptr,\n");
+    } else {
+        fprintf(out, "qt_metaTypeArray<\n");
+        for (int i = 0; i < cdef->propertyList.count(); ++i) {
+            const PropertyDef &p = cdef->propertyList.at(i);
+            fprintf(out, "%s%s", i == 0 ? "" : ", ", p.type.data());
+        }
+        fprintf(out, ">,\n");
+    }
+
+    fprintf(out, "    nullptr\n} };\n\n");
 
     if (!cdef->hasQObject)
         return;
@@ -1221,18 +1223,22 @@ void Generator::generateStaticMetacall()
             fprintf(out, "%s(", f.name.constData());
             int offset = 1;
 
-            int argsCount = f.arguments.count();
-            for (int j = 0; j < argsCount; ++j) {
-                const ArgumentDef &a = f.arguments.at(j);
-                if (j)
-                    fprintf(out, ",");
-                fprintf(out, "(*reinterpret_cast< %s>(_a[%d]))",a.typeNameForCast.constData(), offset++);
-                isUsed_a = true;
-            }
-            if (f.isPrivateSignal) {
-                if (argsCount > 0)
-                    fprintf(out, ", ");
-                fprintf(out, "%s", "QPrivateSignal()");
+            if (f.isRawSlot) {
+                fprintf(out, "QMethodRawArguments{ _a }");
+            } else {
+                int argsCount = f.arguments.count();
+                for (int j = 0; j < argsCount; ++j) {
+                    const ArgumentDef &a = f.arguments.at(j);
+                    if (j)
+                        fprintf(out, ",");
+                    fprintf(out, "(*reinterpret_cast< %s>(_a[%d]))",a.typeNameForCast.constData(), offset++);
+                    isUsed_a = true;
+                }
+                if (f.isPrivateSignal) {
+                    if (argsCount > 0)
+                        fprintf(out, ", ");
+                    fprintf(out, "%s", "QPrivateSignal()");
+                }
             }
             fprintf(out, ");");
             if (f.normalizedType != "void") {
diff --git a/src/tools/moc/keywords.cpp b/src/tools/moc/keywords.cpp
index 7da8d94efc..cc7d747f5b 100644
--- a/src/tools/moc/keywords.cpp
+++ b/src/tools/moc/keywords.cpp
@@ -30,12 +30,12 @@
 // DO NOT EDIT.
 
 static const short keyword_trans[][128] = {
-    {0,0,0,0,0,0,0,0,0,568,565,0,0,0,0,0,
+    {0,0,0,0,0,0,0,0,0,579,576,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-     568,252,566,569,8,38,239,567,25,26,236,234,30,235,27,237,
+     579,252,577,580,8,38,239,578,25,26,236,234,30,235,27,237,
      22,22,22,22,22,22,22,22,22,22,34,41,23,39,24,43,
      0,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,
-     8,21,8,8,8,8,8,8,8,8,8,31,571,32,238,8,
+     8,21,8,8,8,8,8,8,8,8,8,31,582,32,238,8,
      0,1,2,3,4,5,6,7,8,9,8,8,10,11,12,13,
      14,8,15,16,17,18,19,20,8,8,8,36,245,37,248,0},
     {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -177,7 +177,7 @@ static const short keyword_trans[][128] = {
     {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,42,0,0,0,28,0,
-     574,574,574,574,574,574,574,574,574,574,0,0,0,0,0,0,
+     585,585,585,585,585,585,585,585,585,585,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -336,7 +336,7 @@ static const short keyword_trans[][128] = {
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
     {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-     0,0,0,0,0,0,0,0,0,0,573,0,0,0,0,572,
+     0,0,0,0,0,0,0,0,0,0,584,0,0,0,0,583,
      0,0,0,0,0,0,0,0,0,0,0,0,0,258,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -378,7 +378,7 @@ static const short keyword_trans[][128] = {
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-     0,0,0,475,424,408,416,380,0,484,0,0,0,0,364,358,
+     0,0,0,475,424,408,416,380,0,484,0,0,0,565,364,358,
      386,0,557,472,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
@@ -1021,11 +1021,22 @@ static const struct
     {CHARACTER, 0, 79, 563, CHARACTER},
     {CHARACTER, 0, 78, 564, CHARACTER},
     {Q_REVISION_TOKEN, 0, 0, 0, CHARACTER},
+    {CHARACTER, 0, 79, 566, CHARACTER},
+    {CHARACTER, 0, 67, 567, CHARACTER},
+    {CHARACTER, 0, 95, 568, CHARACTER},
+    {CHARACTER, 0, 73, 569, CHARACTER},
+    {CHARACTER, 0, 78, 570, CHARACTER},
+    {CHARACTER, 0, 67, 571, CHARACTER},
+    {CHARACTER, 0, 76, 572, CHARACTER},
+    {CHARACTER, 0, 85, 573, CHARACTER},
+    {CHARACTER, 0, 68, 574, CHARACTER},
+    {CHARACTER, 0, 69, 575, CHARACTER},
+    {Q_MOC_INCLUDE_TOKEN, 0, 0, 0, CHARACTER},
     {NEWLINE, 0, 0, 0, NOTOKEN},
     {QUOTE, 0, 0, 0, NOTOKEN},
     {SINGLEQUOTE, 0, 0, 0, NOTOKEN},
     {WHITESPACE, 0, 0, 0, NOTOKEN},
-    {HASH, 0, 35, 570, HASH},
+    {HASH, 0, 35, 581, HASH},
     {PP_HASHHASH, 0, 0, 0, NOTOKEN},
     {BACKSLASH, 0, 0, 0, NOTOKEN},
     {CPP_COMMENT, 0, 0, 0, NOTOKEN},
diff --git a/src/tools/moc/moc.cpp b/src/tools/moc/moc.cpp
index c175d1d86d..03976771e5 100644
--- a/src/tools/moc/moc.cpp
+++ b/src/tools/moc/moc.cpp
@@ -43,30 +43,9 @@
 QT_BEGIN_NAMESPACE
 
 // only moc needs this function
-static QByteArray normalizeType(const QByteArray &ba, bool fixScope = false)
+static QByteArray normalizeType(const QByteArray &ba)
 {
-    const char *s = ba.constData();
-    int len = ba.size();
-    char stackbuf[64];
-    char *buf = (len >= 64 ? new char[len + 1] : stackbuf);
-    char *d = buf;
-    char last = 0;
-    while(*s && is_space(*s))
-        s++;
-    while (*s) {
-        while (*s && !is_space(*s))
-            last = *d++ = *s++;
-        while (*s && is_space(*s))
-            s++;
-        if (*s && ((is_ident_char(*s) && is_ident_char(last))
-                   || ((*s == ':') && (last == '<')))) {
-            last = *d++ = ' ';
-        }
-    }
-    *d = '\0';
-    QByteArray result = normalizeTypeInternal(buf, d, fixScope);
-    if (buf != stackbuf)
-        delete [] buf;
+    QByteArray result = normalizeTypeInternal(ba.constBegin(), ba.constEnd());
     return result;
 }
 
@@ -328,6 +307,11 @@ void Moc::parseFunctionArguments(FunctionDef *def)
         def->arguments.removeLast();
         def->isPrivateSignal = true;
     }
+    if (def->arguments.size() == 1
+        && def->arguments.constLast().normalizedType == "QMethodRawArguments") {
+        def->arguments.removeLast();
+        def->isRawSlot = true;
+    }
 }
 
 bool Moc::testFunctionAttribute(FunctionDef *def)
@@ -371,17 +355,42 @@ bool Moc::skipCxxAttributes()
     return false;
 }
 
-bool Moc::testFunctionRevision(FunctionDef *def)
+QTypeRevision Moc::parseRevision()
 {
-    if (test(Q_REVISION_TOKEN)) {
-        next(LPAREN);
-        QByteArray revision = lexemUntil(RPAREN);
-        revision.remove(0, 1);
-        revision.chop(1);
+    next(LPAREN);
+    QByteArray revisionString = lexemUntil(RPAREN);
+    revisionString.remove(0, 1);
+    revisionString.chop(1);
+    const QList<QByteArray> majorMinor = revisionString.split(',');
+    switch (majorMinor.length()) {
+    case 1: {
         bool ok = false;
-        def->revision = revision.toInt(&ok);
-        if (!ok || def->revision < 0)
+        const int revision = revisionString.toInt(&ok);
+        if (!ok || !QTypeRevision::isValidSegment(revision))
             error("Invalid revision");
+        return QTypeRevision::fromMinorVersion(revision);
+    }
+    case 2: { // major.minor
+        bool ok = false;
+        const int major = majorMinor[0].toInt(&ok);
+        if (!ok || !QTypeRevision::isValidSegment(major))
+            error("Invalid major version");
+        const int minor = majorMinor[1].toInt(&ok);
+        if (!ok || !QTypeRevision::isValidSegment(minor))
+            error("Invalid minor version");
+        return QTypeRevision::fromVersion(major, minor);
+    }
+    default:
+        error("Invalid revision");
+        return QTypeRevision();
+    }
+}
+
+bool Moc::testFunctionRevision(FunctionDef *def)
+{
+
+    if (test(Q_REVISION_TOKEN)) {
+        def->revision = parseRevision().toEncodedVersion<int>();
         return true;
     }
 
@@ -648,6 +657,11 @@ void Moc::parse()
                             case Q_CLASSINFO_TOKEN:
                                 parseClassInfo(&def);
                                 break;
+                            case Q_MOC_INCLUDE_TOKEN:
+                                // skip it, the namespace is parsed twice
+                                next(LPAREN);
+                                lexemUntil(RPAREN);
+                                break;
                             case ENUM: {
                                 EnumDef enumDef;
                                 if (parseEnum(&enumDef))
@@ -691,6 +705,9 @@ void Moc::parse()
             case Q_DECLARE_METATYPE_TOKEN:
                 parseDeclareMetatype();
                 break;
+            case Q_MOC_INCLUDE_TOKEN:
+                parseMocInclude();
+                break;
             case USING:
                 if (test(NAMESPACE)) {
                     while (test(SCOPE) || test(IDENTIFIER))
@@ -823,6 +840,9 @@ void Moc::parse()
                 case Q_CLASSINFO_TOKEN:
                     parseClassInfo(&def);
                     break;
+                case Q_MOC_INCLUDE_TOKEN:
+                    parseMocInclude();
+                    break;
                 case Q_INTERFACES_TOKEN:
                     parseInterfaces(&def);
                     break;
@@ -1084,17 +1104,9 @@ void Moc::generate(FILE *out, FILE *jsonOutput)
 
 void Moc::parseSlots(ClassDef *def, FunctionDef::Access access)
 {
-    int defaultRevision = -1;
-    if (test(Q_REVISION_TOKEN)) {
-        next(LPAREN);
-        QByteArray revision = lexemUntil(RPAREN);
-        revision.remove(0, 1);
-        revision.chop(1);
-        bool ok = false;
-        defaultRevision = revision.toInt(&ok);
-        if (!ok || defaultRevision < 0)
-            error("Invalid revision");
-    }
+    QTypeRevision defaultRevision;
+    if (test(Q_REVISION_TOKEN))
+        defaultRevision = parseRevision();
 
     next(COLON);
     while (inClass(def) && hasNext()) {
@@ -1123,8 +1135,8 @@ void Moc::parseSlots(ClassDef *def, FunctionDef::Access access)
             continue;
         if (funcDef.revision > 0) {
             ++def->revisionedMethods;
-        } else if (defaultRevision != -1) {
-            funcDef.revision = defaultRevision;
+        } else if (defaultRevision.isValid()) {
+            funcDef.revision = defaultRevision.toEncodedVersion<int>();
             ++def->revisionedMethods;
         }
         def->slotList += funcDef;
@@ -1138,17 +1150,9 @@ void Moc::parseSlots(ClassDef *def, FunctionDef::Access access)
 
 void Moc::parseSignals(ClassDef *def)
 {
-    int defaultRevision = -1;
-    if (test(Q_REVISION_TOKEN)) {
-        next(LPAREN);
-        QByteArray revision = lexemUntil(RPAREN);
-        revision.remove(0, 1);
-        revision.chop(1);
-        bool ok = false;
-        defaultRevision = revision.toInt(&ok);
-        if (!ok || defaultRevision < 0)
-            error("Invalid revision");
-    }
+    QTypeRevision defaultRevision;
+    if (test(Q_REVISION_TOKEN))
+        defaultRevision = parseRevision();
 
     next(COLON);
     while (inClass(def) && hasNext()) {
@@ -1179,8 +1183,8 @@ void Moc::parseSignals(ClassDef *def)
             error("Not a signal declaration");
         if (funcDef.revision > 0) {
             ++def->revisionedMethods;
-        } else if (defaultRevision != -1) {
-            funcDef.revision = defaultRevision;
+        } else if (defaultRevision.isValid()) {
+            funcDef.revision = defaultRevision.toEncodedVersion<int>();
             ++def->revisionedMethods;
         }
         def->signalList += funcDef;
@@ -1241,6 +1245,10 @@ void Moc::createPropertyDef(PropertyDef &propDef)
         } else if (l[0] == 'R' && l == "REQUIRED") {
             propDef.required = true;
             continue;
+        } else if (l[0] == 'R' && l == "REVISION" && test(LPAREN)) {
+            prev();
+            propDef.revision = parseRevision().toEncodedVersion<int>();
+            continue;
         }
 
         QByteArray v, v2;
@@ -1273,9 +1281,10 @@ void Moc::createPropertyDef(PropertyDef &propDef)
                 propDef.reset = v + v2;
             else if (l == "REVISION") {
                 bool ok = false;
-                propDef.revision = v.toInt(&ok);
-                if (!ok || propDef.revision < 0)
+                const int minor = v.toInt(&ok);
+                if (!ok || !QTypeRevision::isValidSegment(minor))
                     error(1);
+                propDef.revision = QTypeRevision::fromMinorVersion(minor).toEncodedVersion<int>();
             } else
                 error(2);
             break;
@@ -1483,6 +1492,8 @@ void Moc::parseClassInfo(BaseDef *def)
     next(COMMA);
     if (test(STRING_LITERAL)) {
         infoDef.value = symbol().unquotedLexem();
+    } else if (test(Q_REVISION_TOKEN)) {
+        infoDef.value = QByteArray::number(parseRevision().toEncodedVersion<quint16>());
     } else {
         // support Q_CLASSINFO("help", QT_TR_NOOP("blah"))
         next(IDENTIFIER);
@@ -1560,6 +1571,16 @@ void Moc::parseDeclareMetatype()
     metaTypes.append(typeName);
 }
 
+void Moc::parseMocInclude()
+{
+    next(LPAREN);
+    QByteArray include = lexemUntil(RPAREN);
+    // remove parentheses
+    include.remove(0, 1);
+    include.chop(1);
+    includeFiles.append(include);
+}
+
 void Moc::parseSlotInPrivate(ClassDef *def, FunctionDef::Access access)
 {
     next(LPAREN);
diff --git a/src/tools/moc/moc.h b/src/tools/moc/moc.h
index a3e20a061e..743749433f 100644
--- a/src/tools/moc/moc.h
+++ b/src/tools/moc/moc.h
@@ -36,6 +36,7 @@
 #include <qjsondocument.h>
 #include <qjsonarray.h>
 #include <qjsonobject.h>
+#include <qversionnumber.h>
 #include <stdio.h>
 #include <ctype.h>
 
@@ -115,6 +116,7 @@ struct FunctionDef
     bool isConstructor = false;
     bool isDestructor = false;
     bool isAbstract = false;
+    bool isRawSlot = false;
 
     QJsonObject toJson() const;
     static void accessToJson(QJsonObject *obj, Access acs);
@@ -257,6 +259,7 @@ public:
     void parseInterfaces(ClassDef *def);
     void parseDeclareInterface();
     void parseDeclareMetatype();
+    void parseMocInclude();
     void parseSlotInPrivate(ClassDef *def, FunctionDef::Access access);
     void parsePrivateProperty(ClassDef *def);
 
@@ -270,6 +273,7 @@ public:
     bool testFunctionAttribute(FunctionDef *def);
     bool testFunctionAttribute(Token tok, FunctionDef *def);
     bool testFunctionRevision(FunctionDef *def);
+    QTypeRevision parseRevision();
 
     bool skipCxxAttributes();
 
diff --git a/src/tools/moc/token.h b/src/tools/moc/token.h
index 0cc163f9e4..c11ec6a38c 100644
--- a/src/tools/moc/token.h
+++ b/src/tools/moc/token.h
@@ -179,6 +179,7 @@ QT_BEGIN_NAMESPACE
     F(Q_SCRIPTABLE_TOKEN) \
     F(Q_PRIVATE_PROPERTY_TOKEN) \
     F(Q_REVISION_TOKEN) \
+    F(Q_MOC_INCLUDE_TOKEN) \
     F(SPECIAL_TREATMENT_MARK) \
     F(MOC_INCLUDE_BEGIN) \
     F(MOC_INCLUDE_END) \
diff --git a/src/tools/moc/util/generate_keywords.cpp b/src/tools/moc/util/generate_keywords.cpp
index 9248e9e2e7..c2cfe37fab 100644
--- a/src/tools/moc/util/generate_keywords.cpp
+++ b/src/tools/moc/util/generate_keywords.cpp
@@ -243,6 +243,7 @@ static const Keyword keywords[] = {
     { "Q_SCRIPTABLE", "Q_SCRIPTABLE_TOKEN" },
     { "Q_PRIVATE_PROPERTY", "Q_PRIVATE_PROPERTY_TOKEN" },
     { "Q_REVISION", "Q_REVISION_TOKEN" },
+    { "Q_MOC_INCLUDE", "Q_MOC_INCLUDE_TOKEN" },
     { "\n", "NEWLINE" },
     { "\"", "QUOTE" },
     { "\'", "SINGLEQUOTE" },
diff --git a/src/tools/qdbuscpp2xml/.prev_CMakeLists.txt b/src/tools/qdbuscpp2xml/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..58a8ea2b08
--- /dev/null
+++ b/src/tools/qdbuscpp2xml/.prev_CMakeLists.txt
@@ -0,0 +1,45 @@
+# Generated from qdbuscpp2xml.pro.
+
+#####################################################################
+## qdbuscpp2xml Tool:
+#####################################################################
+
+qt_add_tool(qdbuscpp2xml
+    SOURCES
+        ../moc/cbordevice.h
+        ../moc/collectjson.cpp ../moc/collectjson.h
+        ../moc/generator.cpp ../moc/generator.h
+        ../moc/moc.cpp ../moc/moc.h
+        ../moc/outputrevision.h
+        ../moc/parser.cpp ../moc/parser.h
+        ../moc/preprocessor.cpp ../moc/preprocessor.h
+        ../moc/symbols.h
+        ../moc/token.cpp ../moc/token.h
+        ../moc/utils.h
+        qdbuscpp2xml.cpp
+    DEFINES
+        QT_NO_CAST_FROM_ASCII
+        QT_NO_FOREACH
+    INCLUDE_DIRECTORIES
+        ../moc
+        ../moc/../../3rdparty/tinycbor/src
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+)
+
+#### Keys ignored in scope 1:.:.:qdbuscpp2xml.pro:<TRUE>:
+# QMAKE_TARGET_DESCRIPTION = "Qt D-Bus C++ to XML Compiler"
+# _OPTION = "host_build"
+
+## Scopes:
+#####################################################################
+
+qt_extend_target(qdbuscpp2xml CONDITION force_bootstrap
+    PUBLIC_LIBRARIES
+        bootstrap_dbusPrivate
+)
+
+qt_extend_target(qdbuscpp2xml CONDITION NOT force_bootstrap
+    PUBLIC_LIBRARIES
+        Qt::DBusPrivate
+)
diff --git a/src/tools/qdbuscpp2xml/CMakeLists.txt b/src/tools/qdbuscpp2xml/CMakeLists.txt
new file mode 100644
index 0000000000..46582793a1
--- /dev/null
+++ b/src/tools/qdbuscpp2xml/CMakeLists.txt
@@ -0,0 +1,48 @@
+# Generated from qdbuscpp2xml.pro.
+
+#####################################################################
+## qdbuscpp2xml Tool:
+#####################################################################
+
+qt_add_tool(qdbuscpp2xml
+    TOOLS_TARGET DBus # special case
+    SOURCES
+        ../moc/cbordevice.h
+        ../moc/collectjson.cpp ../moc/collectjson.h
+        ../moc/generator.cpp ../moc/generator.h
+        ../moc/moc.cpp ../moc/moc.h
+        ../moc/outputrevision.h
+        ../moc/parser.cpp ../moc/parser.h
+        ../moc/preprocessor.cpp ../moc/preprocessor.h
+        ../moc/symbols.h
+        ../moc/token.cpp ../moc/token.h
+        ../moc/utils.h
+        qdbuscpp2xml.cpp
+    DEFINES
+        QT_NO_CAST_FROM_ASCII
+        QT_NO_FOREACH
+    INCLUDE_DIRECTORIES
+        ../moc
+        ../moc/../../3rdparty/tinycbor/src
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::DBusPrivate
+    # COMPILE_OPTIONS  # special case
+    #     "$$QT_HOST_CFLAGS_DBUS"
+    # QMAKE_TARGET_DESCRIPTION = "Qt D-Bus C++ to XML Compiler"
+    # _LOADED = "qt_tool"
+    # _OPTION = "host_build"
+)
+
+#### Keys ignored in scope 1:.:.:qdbuscpp2xml.pro:<TRUE>:
+# QMAKE_TARGET_DESCRIPTION = "Qt D-Bus C++ to XML Compiler"
+# _OPTION = "host_build"
+
+## Scopes:
+#####################################################################
+
+# special case begin
+# extend_target(qdbuscpp2xml CONDITION force_bootstrap [...])
+# extend_target(qdbuscpp2xml CONDITION NOT force_bootstrap [...])
+# special case end
+
diff --git a/src/tools/qdbusxml2cpp/.prev_CMakeLists.txt b/src/tools/qdbusxml2cpp/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..ce9438b207
--- /dev/null
+++ b/src/tools/qdbusxml2cpp/.prev_CMakeLists.txt
@@ -0,0 +1,32 @@
+# Generated from qdbusxml2cpp.pro.
+
+#####################################################################
+## qdbusxml2cpp Tool:
+#####################################################################
+
+qt_add_tool(qdbusxml2cpp
+    SOURCES
+        qdbusxml2cpp.cpp
+    DEFINES
+        QT_NO_CAST_FROM_ASCII
+        QT_NO_FOREACH
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+)
+
+#### Keys ignored in scope 1:.:.:qdbusxml2cpp.pro:<TRUE>:
+# QMAKE_TARGET_DESCRIPTION = "Qt D-Bus XML to C++ Compiler"
+# _OPTION = "host_build"
+
+## Scopes:
+#####################################################################
+
+qt_extend_target(qdbusxml2cpp CONDITION NOT force_bootstrap
+    PUBLIC_LIBRARIES
+        Qt::DBusPrivate
+)
+
+qt_extend_target(qdbusxml2cpp CONDITION force_bootstrap
+    PUBLIC_LIBRARIES
+        bootstrap_dbusPrivate
+)
diff --git a/src/tools/qdbusxml2cpp/CMakeLists.txt b/src/tools/qdbusxml2cpp/CMakeLists.txt
new file mode 100644
index 0000000000..63700f0b6b
--- /dev/null
+++ b/src/tools/qdbusxml2cpp/CMakeLists.txt
@@ -0,0 +1,35 @@
+# Generated from qdbusxml2cpp.pro.
+
+#####################################################################
+## qdbusxml2cpp Tool:
+#####################################################################
+
+qt_add_tool(qdbusxml2cpp
+    TOOLS_TARGET DBus # special case
+    SOURCES
+        qdbusxml2cpp.cpp
+    DEFINES
+        QT_NO_CAST_FROM_ASCII
+        QT_NO_FOREACH
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::DBusPrivate
+    # COMPILE_OPTIONS  # special case
+    #     "$$QT_HOST_CFLAGS_DBUS"
+    # QMAKE_TARGET_DESCRIPTION = "Qt D-Bus XML to C++ Compiler"
+    # _LOADED = "qt_tool"
+    # _OPTION = "host_build"
+)
+
+#### Keys ignored in scope 1:.:.:qdbusxml2cpp.pro:<TRUE>:
+# QMAKE_TARGET_DESCRIPTION = "Qt D-Bus XML to C++ Compiler"
+# _OPTION = "host_build"
+
+## Scopes:
+#####################################################################
+
+# special case begin
+# extend_target(qdbusxml2cpp CONDITION NOT force_bootstrap [...])
+# extend_target(qdbusxml2cpp CONDITION NOT QT_FEATURE_commandlineparser AND NOT force_bootstrap [...])
+# extend_target(qdbusxml2cpp CONDITION force_bootstrap [...])
+# special case end
diff --git a/src/tools/qdbusxml2cpp/qdbusxml2cpp.cpp b/src/tools/qdbusxml2cpp/qdbusxml2cpp.cpp
index 9825596f3d..0493265164 100644
--- a/src/tools/qdbusxml2cpp/qdbusxml2cpp.cpp
+++ b/src/tools/qdbusxml2cpp/qdbusxml2cpp.cpp
@@ -72,9 +72,8 @@ static const char includeList[] =
 
 static const char forwardDeclarations[] =
     "QT_BEGIN_NAMESPACE\n"
+    "#include <QtCore/qcontainerfwd.h>\n"
     "class QByteArray;\n"
-    "template<class T> class QList;\n"
-    "template<class Key, class Value> class QMap;\n"
     "class QString;\n"
     "class QStringList;\n"
     "class QVariant;\n"
diff --git a/src/tools/qlalr/.prev_CMakeLists.txt b/src/tools/qlalr/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..9ff8a54ce4
--- /dev/null
+++ b/src/tools/qlalr/.prev_CMakeLists.txt
@@ -0,0 +1,26 @@
+# Generated from qlalr.pro.
+
+#####################################################################
+## qlalr Tool:
+#####################################################################
+
+qt_add_tool(qlalr
+    SOURCES
+        compress.cpp compress.h
+        cppgenerator.cpp cppgenerator.h
+        dotgraph.cpp dotgraph.h
+        grammar.cpp grammar_p.h
+        lalr.cpp lalr.h
+        main.cpp
+        parsetable.cpp parsetable.h
+        recognizer.cpp recognizer.h
+    DEFINES
+        QT_NO_FOREACH
+    PUBLIC_LIBRARIES
+        Qt::Gui
+)
+
+#### Keys ignored in scope 1:.:.:qlalr.pro:<TRUE>:
+# OTHER_FILES = "lalr.g"
+# QMAKE_TARGET_DESCRIPTION = "Qt Look Ahead LR Parser Generator"
+# _OPTION = "host_build"
diff --git a/src/tools/qlalr/CMakeLists.txt b/src/tools/qlalr/CMakeLists.txt
new file mode 100644
index 0000000000..437c8d918f
--- /dev/null
+++ b/src/tools/qlalr/CMakeLists.txt
@@ -0,0 +1,27 @@
+# Generated from qlalr.pro.
+
+#####################################################################
+## qlalr Tool:
+#####################################################################
+
+qt_add_tool(qlalr
+    TOOLS_TARGET Core # special case
+    SOURCES
+        compress.cpp compress.h
+        cppgenerator.cpp cppgenerator.h
+        dotgraph.cpp dotgraph.h
+        grammar.cpp grammar_p.h
+        lalr.cpp lalr.h
+        main.cpp
+        parsetable.cpp parsetable.h
+        recognizer.cpp recognizer.h
+    DEFINES
+        QT_NO_FOREACH
+    PUBLIC_LIBRARIES
+        Qt::Core # special case
+)
+
+#### Keys ignored in scope 1:.:.:qlalr.pro:<TRUE>:
+# OTHER_FILES = "lalr.g"
+# QMAKE_TARGET_DESCRIPTION = "Qt Look Ahead LR Parser Generator"
+# _OPTION = "host_build"
diff --git a/src/tools/qlalr/lalr.h b/src/tools/qlalr/lalr.h
index 473ea89769..16c957624f 100644
--- a/src/tools/qlalr/lalr.h
+++ b/src/tools/qlalr/lalr.h
@@ -32,7 +32,6 @@
 #include <QtCore/qset.h>
 #include <QtCore/qstack.h>
 #include <QtCore/qmap.h>
-#include <QtCore/qlinkedlist.h>
 #include <QtCore/qstring.h>
 #include <QtCore/qtextstream.h>
 #include <QtCore/qpair.h>
diff --git a/src/tools/qvkgen/.prev_CMakeLists.txt b/src/tools/qvkgen/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..994b97a9f1
--- /dev/null
+++ b/src/tools/qvkgen/.prev_CMakeLists.txt
@@ -0,0 +1,16 @@
+# Generated from qvkgen.pro.
+
+#####################################################################
+## qvkgen Tool:
+#####################################################################
+
+qt_add_tool(qvkgen
+    SOURCES
+        qvkgen.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+)
+
+#### Keys ignored in scope 1:.:.:qvkgen.pro:<TRUE>:
+# QMAKE_TARGET_DESCRIPTION = "Qt Vulkan Header Generator"
+# _OPTION = "host_build"
diff --git a/src/tools/qvkgen/CMakeLists.txt b/src/tools/qvkgen/CMakeLists.txt
new file mode 100644
index 0000000000..0f72a8b633
--- /dev/null
+++ b/src/tools/qvkgen/CMakeLists.txt
@@ -0,0 +1,17 @@
+# Generated from qvkgen.pro.
+
+#####################################################################
+## qvkgen Tool:
+#####################################################################
+
+qt_add_tool(qvkgen
+    TOOLS_TARGET Gui # special case
+    SOURCES
+        qvkgen.cpp
+    PUBLIC_LIBRARIES
+        Qt::Core # special case
+)
+
+#### Keys ignored in scope 1:.:.:qvkgen.pro:<TRUE>:
+# QMAKE_TARGET_DESCRIPTION = "Qt Vulkan Header Generator"
+# _OPTION = "host_build"
diff --git a/src/tools/rcc/.prev_CMakeLists.txt b/src/tools/rcc/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..307f08bfa7
--- /dev/null
+++ b/src/tools/rcc/.prev_CMakeLists.txt
@@ -0,0 +1,37 @@
+# Generated from rcc.pro.
+
+#####################################################################
+## rcc Tool:
+#####################################################################
+
+qt_add_tool(rcc
+    BOOTSTRAP
+    SOURCES
+        main.cpp
+        rcc.cpp rcc.h
+    DEFINES
+        QT_NO_CAST_FROM_ASCII
+        QT_NO_FOREACH
+        QT_RCC
+    INCLUDE_DIRECTORIES
+        ${CMAKE_CURRENT_SOURCE_DIR}
+)
+
+#### Keys ignored in scope 1:.:.:rcc.pro:<TRUE>:
+# QMAKE_TARGET_DESCRIPTION = "Qt Resource Compiler"
+# _OPTION = "host_build"
+
+## Scopes:
+#####################################################################
+
+qt_extend_target(rcc CONDITION QT_FEATURE_zstd AND NOT CMAKE_CROSSCOMPILING
+    DEFINES
+        QT_FEATURE_zstd=1
+    LIBRARIES
+        ZSTD::ZSTD
+)
+
+qt_extend_target(rcc CONDITION CMAKE_CROSSCOMPILING OR NOT QT_FEATURE_zstd
+    DEFINES
+        QT_FEATURE_zstd=-1
+)
diff --git a/src/tools/rcc/CMakeLists.txt b/src/tools/rcc/CMakeLists.txt
new file mode 100644
index 0000000000..e7f45314c3
--- /dev/null
+++ b/src/tools/rcc/CMakeLists.txt
@@ -0,0 +1,38 @@
+# Generated from rcc.pro.
+
+#####################################################################
+## rcc Tool:
+#####################################################################
+
+qt_add_tool(rcc
+    BOOTSTRAP
+    TOOLS_TARGET Core # special case
+    SOURCES
+        main.cpp
+        rcc.cpp rcc.h
+    DEFINES
+        QT_NO_CAST_FROM_ASCII
+        QT_NO_FOREACH
+        QT_RCC
+    INCLUDE_DIRECTORIES
+        ${CMAKE_CURRENT_SOURCE_DIR}
+)
+
+#### Keys ignored in scope 1:.:.:rcc.pro:<TRUE>:
+# QMAKE_TARGET_DESCRIPTION = "Qt Resource Compiler"
+# _OPTION = "host_build"
+
+## Scopes:
+#####################################################################
+
+qt_extend_target(rcc CONDITION QT_FEATURE_zstd AND NOT CMAKE_CROSSCOMPILING
+    DEFINES
+        QT_FEATURE_zstd=1
+    LIBRARIES
+        ZSTD::ZSTD
+)
+
+qt_extend_target(rcc CONDITION CMAKE_CROSSCOMPILING OR NOT QT_FEATURE_zstd
+    DEFINES
+        QT_FEATURE_zstd=-1
+)
diff --git a/src/tools/rcc/rcc.cpp b/src/tools/rcc/rcc.cpp
index 7188c81300..5bd1fba272 100644
--- a/src/tools/rcc/rcc.cpp
+++ b/src/tools/rcc/rcc.cpp
@@ -744,10 +744,9 @@ bool RCCResourceLibrary::addFile(const QString &alias, const RCCFileInfo &file)
     const QString filename = nodes.at(nodes.size()-1);
     RCCFileInfo *s = new RCCFileInfo(file);
     s->m_parent = parent;
-    typedef QHash<QString, RCCFileInfo*>::const_iterator ChildConstIterator;
-    const ChildConstIterator cbegin = parent->m_children.constFind(filename);
-    const ChildConstIterator cend = parent->m_children.constEnd();
-    for (ChildConstIterator it = cbegin; it != cend; ++it) {
+    auto cbegin = parent->m_children.constFind(filename);
+    auto cend = parent->m_children.constEnd();
+    for (auto it = cbegin; it != cend; ++it) {
         if (it.key() == filename && it.value()->m_language == s->m_language &&
             it.value()->m_country == s->m_country) {
             for (const QString &name : qAsConst(m_fileNames)) {
@@ -823,7 +822,7 @@ QStringList RCCResourceLibrary::dataFiles() const
     pending.push(m_root);
     while (!pending.isEmpty()) {
         RCCFileInfo *file = pending.pop();
-        for (QHash<QString, RCCFileInfo*>::iterator it = file->m_children.begin();
+        for (auto it = file->m_children.begin();
             it != file->m_children.end(); ++it) {
             RCCFileInfo *child = it.value();
             if (child->m_flags & RCCFileInfo::Directory)
@@ -838,10 +837,9 @@ QStringList RCCResourceLibrary::dataFiles() const
 // Determine map of resource identifier (':/newPrefix/images/p1.png') to file via recursion
 static void resourceDataFileMapRecursion(const RCCFileInfo *m_root, const QString &path, RCCResourceLibrary::ResourceDataFileMap &m)
 {
-    typedef QHash<QString, RCCFileInfo*>::const_iterator ChildConstIterator;
     const QChar slash = QLatin1Char('/');
-    const ChildConstIterator cend = m_root->m_children.constEnd();
-    for (ChildConstIterator it = m_root->m_children.constBegin(); it != cend; ++it) {
+    const auto cend = m_root->m_children.constEnd();
+    for (auto it = m_root->m_children.constBegin(); it != cend; ++it) {
         const RCCFileInfo *child = it.value();
         const QString childName = path + slash + child->m_name;
         if (child->m_flags & RCCFileInfo::Directory) {
@@ -1149,8 +1147,7 @@ bool RCCResourceLibrary::writeDataBlobs()
     QString errorMessage;
     while (!pending.isEmpty()) {
         RCCFileInfo *file = pending.pop();
-        for (QHash<QString, RCCFileInfo*>::iterator it = file->m_children.begin();
-            it != file->m_children.end(); ++it) {
+        for (auto it = file->m_children.cbegin(); it != file->m_children.cend(); ++it) {
             RCCFileInfo *child = it.value();
             if (child->m_flags & RCCFileInfo::Directory)
                 pending.push(child);
@@ -1214,8 +1211,7 @@ bool RCCResourceLibrary::writeDataNames()
     qint64 offset = 0;
     while (!pending.isEmpty()) {
         RCCFileInfo *file = pending.pop();
-        for (QHash<QString, RCCFileInfo*>::iterator it = file->m_children.begin();
-            it != file->m_children.end(); ++it) {
+        for (auto it = file->m_children.cbegin(); it != file->m_children.cend(); ++it) {
             RCCFileInfo *child = it.value();
             if (child->m_flags & RCCFileInfo::Directory)
                 pending.push(child);
diff --git a/src/tools/tracegen/.prev_CMakeLists.txt b/src/tools/tracegen/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..87bcf362d6
--- /dev/null
+++ b/src/tools/tracegen/.prev_CMakeLists.txt
@@ -0,0 +1,20 @@
+# Generated from tracegen.pro.
+
+#####################################################################
+## tracegen Tool:
+#####################################################################
+
+qt_add_tool(tracegen
+    BOOTSTRAP
+    SOURCES
+        etw.cpp etw.h
+        helpers.cpp helpers.h
+        lttng.cpp lttng.h
+        panic.cpp panic.h
+        provider.cpp provider.h
+        qtheaders.cpp qtheaders.h
+        tracegen.cpp
+)
+
+#### Keys ignored in scope 1:.:.:tracegen.pro:<TRUE>:
+# _OPTION = "host_build"
diff --git a/src/tools/tracegen/CMakeLists.txt b/src/tools/tracegen/CMakeLists.txt
new file mode 100644
index 0000000000..0f12f823c4
--- /dev/null
+++ b/src/tools/tracegen/CMakeLists.txt
@@ -0,0 +1,21 @@
+# Generated from tracegen.pro.
+
+#####################################################################
+## tracegen Tool:
+#####################################################################
+
+qt_add_tool(tracegen
+    BOOTSTRAP
+    TOOLS_TARGET Core # special case
+    SOURCES
+        etw.cpp etw.h
+        helpers.cpp helpers.h
+        lttng.cpp lttng.h
+        panic.cpp panic.h
+        provider.cpp provider.h
+        qtheaders.cpp qtheaders.h
+        tracegen.cpp
+)
+
+#### Keys ignored in scope 1:.:.:tracegen.pro:<TRUE>:
+# _OPTION = "host_build"
diff --git a/src/tools/uic/.prev_CMakeLists.txt b/src/tools/uic/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..4cd28d7070
--- /dev/null
+++ b/src/tools/uic/.prev_CMakeLists.txt
@@ -0,0 +1,44 @@
+# Generated from uic.pro.
+
+#####################################################################
+## uic Tool:
+#####################################################################
+
+qt_add_tool(uic
+    SOURCES
+        cpp/cppwritedeclaration.cpp cpp/cppwritedeclaration.h
+        cpp/cppwriteincludes.cpp cpp/cppwriteincludes.h
+        cpp/cppwriteinitialization.cpp cpp/cppwriteinitialization.h
+        customwidgetsinfo.cpp customwidgetsinfo.h
+        databaseinfo.cpp databaseinfo.h
+        driver.cpp driver.h
+        main.cpp
+        option.h
+        python/pythonwritedeclaration.cpp python/pythonwritedeclaration.h
+        python/pythonwriteimports.cpp python/pythonwriteimports.h
+        shared/language.cpp shared/language.h
+        treewalker.cpp treewalker.h
+        ui4.cpp ui4.h
+        uic.cpp uic.h
+        utils.h
+        validator.cpp validator.h
+    DEFINES
+        QT_NO_CAST_FROM_ASCII
+        QT_NO_FOREACH
+        QT_UIC
+    INCLUDE_DIRECTORIES
+        ${CMAKE_CURRENT_SOURCE_DIR}
+        ${PROJECT_BINARY_DIR}/src/tools/uic
+        cpp
+        python
+        shared
+    PUBLIC_LIBRARIES
+        Qt::Gui
+)
+
+#### Keys ignored in scope 1:.:.:uic.pro:<TRUE>:
+# QMAKE_TARGET_DESCRIPTION = "Qt User Interface Compiler"
+# _OPTION = "host_build"
+
+## Scopes:
+#####################################################################
diff --git a/src/tools/uic/CMakeLists.txt b/src/tools/uic/CMakeLists.txt
new file mode 100644
index 0000000000..21fd232349
--- /dev/null
+++ b/src/tools/uic/CMakeLists.txt
@@ -0,0 +1,45 @@
+# Generated from uic.pro.
+
+#####################################################################
+## uic Tool:
+#####################################################################
+
+qt_add_tool(uic
+    TOOLS_TARGET Widgets # special case
+    SOURCES
+        cpp/cppwritedeclaration.cpp cpp/cppwritedeclaration.h
+        cpp/cppwriteincludes.cpp cpp/cppwriteincludes.h
+        cpp/cppwriteinitialization.cpp cpp/cppwriteinitialization.h
+        customwidgetsinfo.cpp customwidgetsinfo.h
+        databaseinfo.cpp databaseinfo.h
+        driver.cpp driver.h
+        main.cpp
+        option.h
+        python/pythonwritedeclaration.cpp python/pythonwritedeclaration.h
+        python/pythonwriteimports.cpp python/pythonwriteimports.h
+        shared/language.cpp shared/language.h
+        treewalker.cpp treewalker.h
+        ui4.cpp ui4.h
+        uic.cpp uic.h
+        utils.h
+        validator.cpp validator.h
+    DEFINES
+        QT_NO_CAST_FROM_ASCII
+        QT_NO_FOREACH
+        QT_UIC
+    INCLUDE_DIRECTORIES
+        ${CMAKE_CURRENT_SOURCE_DIR}
+        # ${PROJECT_BINARY_DIR}/src/tools/uic # special case remove
+        cpp
+        python
+        shared
+    #PUBLIC_LIBRARIES # special case remove
+        #Qt::Gui # special case remove
+)
+
+#### Keys ignored in scope 1:.:.:uic.pro:<TRUE>:
+# QMAKE_TARGET_DESCRIPTION = "Qt User Interface Compiler"
+# _OPTION = "host_build"
+
+## Scopes:
+#####################################################################
diff --git a/src/tools/uic/cpp/cppwriteinitialization.h b/src/tools/uic/cpp/cppwriteinitialization.h
index ab996a2800..0a6ddbb3c8 100644
--- a/src/tools/uic/cpp/cppwriteinitialization.h
+++ b/src/tools/uic/cpp/cppwriteinitialization.h
@@ -85,7 +85,7 @@ namespace CPP {
 
 struct WriteInitialization : public TreeWalker
 {
-    using DomPropertyList = QList<DomProperty*>;
+    using DomPropertyList = QVector<DomProperty*>;
     using DomPropertyMap = QHash<QString, DomProperty*>;
 
     WriteInitialization(Uic *uic);
diff --git a/src/tools/uic/main.cpp b/src/tools/uic/main.cpp
index d6c63de869..6f342fb398 100644
--- a/src/tools/uic/main.cpp
+++ b/src/tools/uic/main.cpp
@@ -80,10 +80,6 @@ int runUic(int argc, char *argv[])
     noImplicitIncludesOption.setDescription(QStringLiteral("Disable generation of #include-directives."));
     parser.addOption(noImplicitIncludesOption);
 
-    QCommandLineOption noStringLiteralOption(QStringList() << QStringLiteral("s") << QStringLiteral("no-stringliteral"));
-    noStringLiteralOption.setDescription(QStringLiteral("Deprecated. The use of this option won't take any effect."));
-    parser.addOption(noStringLiteralOption);
-
     QCommandLineOption postfixOption(QStringLiteral("postfix"));
     postfixOption.setDescription(QStringLiteral("Postfix to add to all generated classnames."));
     postfixOption.setValueName(QStringLiteral("postfix"));
@@ -134,9 +130,6 @@ int runUic(int argc, char *argv[])
     }
     language::setLanguage(language);
 
-    if (parser.isSet(noStringLiteralOption))
-        fprintf(stderr, "The -s, --no-stringliteral option is deprecated and it won't take any effect.\n");
-
     QString inputFile;
     if (!parser.positionalArguments().isEmpty())
         inputFile = parser.positionalArguments().at(0);
diff --git a/src/tools/uic/qclass_lib_map.h b/src/tools/uic/qclass_lib_map.h
index 8cebe65a00..5793b3ad13 100644
--- a/src/tools/uic/qclass_lib_map.h
+++ b/src/tools/uic/qclass_lib_map.h
@@ -194,13 +194,6 @@ QT_CLASS_LIB(QHashIterator, QtCore, qhash.h)
 QT_CLASS_LIB(QMutableHashIterator, QtCore, qhash.h)
 QT_CLASS_LIB(QLine, QtCore, qline.h)
 QT_CLASS_LIB(QLineF, QtCore, qline.h)
-QT_CLASS_LIB(QLinkedListData, QtCore, qlinkedlist.h)
-QT_CLASS_LIB(QLinkedListNode, QtCore, qlinkedlist.h)
-QT_CLASS_LIB(QLinkedList, QtCore, qlinkedlist.h)
-QT_CLASS_LIB(QLinkedListIterator, QtCore, qlinkedlist.h)
-QT_CLASS_LIB(QMutableLinkedListIterator, QtCore, qlinkedlist.h)
-QT_CLASS_LIB(QLinkedListIterator, QtCore, qlinkedlist.h)
-QT_CLASS_LIB(QMutableLinkedListIterator, QtCore, qlinkedlist.h)
 QT_CLASS_LIB(QListData, QtCore, qlist.h)
 QT_CLASS_LIB(QList, QtCore, qlist.h)
 QT_CLASS_LIB(QListIterator, QtCore, qlist.h)
@@ -319,21 +312,6 @@ QT_CLASS_LIB(QMacGLCompatTypes, QtOpenGL, qgl.h)
 QT_CLASS_LIB(QMacCompatGLint, QtOpenGL, qgl.h)
 QT_CLASS_LIB(QMacCompatGLuint, QtOpenGL, qgl.h)
 QT_CLASS_LIB(QMacCompatGLenum, QtOpenGL, qgl.h)
-QT_CLASS_LIB(QGLFormat, QtOpenGL, qgl.h)
-QT_CLASS_LIB(QGLContext, QtOpenGL, qgl.h)
-QT_CLASS_LIB(QGLWidget, QtOpenGL, qgl.h)
-QT_CLASS_LIB(QOpenGLWidget,QtWidgets,qopenglwidget.h)
-QT_CLASS_LIB(QGLBuffer, QtOpenGL, qglbuffer.h)
-QT_CLASS_LIB(QGLColormap, QtOpenGL, qglcolormap.h)
-QT_CLASS_LIB(QGLFramebufferObject, QtOpenGL, qglframebufferobject.h)
-QT_CLASS_LIB(QGLFramebufferObjectFormat, QtOpenGL, qglframebufferobject.h)
-QT_CLASS_LIB(QGLFunctions, QtOpenGL, qglfunctions.h)
-QT_CLASS_LIB(QGLFunctionsPrivate, QtOpenGL, qglfunctions.h)
-QT_CLASS_LIB(QGLPixelBuffer, QtOpenGL, qglpixelbuffer.h)
-QT_CLASS_LIB(QGLScreenSurfaceFunctions, QtOpenGL, qglscreen_qws.h)
-QT_CLASS_LIB(QGLScreen, QtOpenGL, qglscreen_qws.h)
-QT_CLASS_LIB(QGLShader, QtOpenGL, qglshaderprogram.h)
-QT_CLASS_LIB(QGLShaderProgram, QtOpenGL, qglshaderprogram.h)
 QT_CLASS_LIB(QDomImplementation, QtXml, qdom.h)
 QT_CLASS_LIB(QDomNode, QtXml, qdom.h)
 QT_CLASS_LIB(QDomNodeList, QtXml, qdom.h)
@@ -635,7 +613,6 @@ QT_CLASS_LIB(QIconEngineFactoryInterface, QtGui, qiconengineplugin.h)
 QT_CLASS_LIB(QIconEnginePlugin, QtGui, qiconengineplugin.h)
 QT_CLASS_LIB(QIconEngineFactoryInterfaceV2, QtGui, qiconengineplugin.h)
 QT_CLASS_LIB(QIconEnginePluginV2, QtGui, qiconengineplugin.h)
-QT_CLASS_LIB(QImageTextKeyLang, QtGui, qimage.h)
 QT_CLASS_LIB(QImage, QtGui, qimage.h)
 QT_CLASS_LIB(QImageIOHandler, QtGui, qimageiohandler.h)
 QT_CLASS_LIB(QImageIOHandlerFactoryInterface, QtGui, qimageiohandler.h)
@@ -644,9 +621,6 @@ QT_CLASS_LIB(QImageReader, QtGui, qimagereader.h)
 QT_CLASS_LIB(QImageWriter, QtGui, qimagewriter.h)
 QT_CLASS_LIB(QMovie, QtGui, qmovie.h)
 QT_CLASS_LIB(QPicture, QtGui, qpicture.h)
-QT_CLASS_LIB(QPictureIO, QtGui, qpicture.h)
-QT_CLASS_LIB(QPictureFormatInterface, QtGui, qpictureformatplugin.h)
-QT_CLASS_LIB(QPictureFormatPlugin, QtGui, qpictureformatplugin.h)
 QT_CLASS_LIB(QPixmap, QtGui, qpixmap.h)
 QT_CLASS_LIB(QPixmapCache, QtGui, qpixmapcache.h)
 QT_CLASS_LIB(QAbstractItemDelegate, QtWidgets, qabstractitemdelegate.h)
diff --git a/src/tools/uic/ui4.cpp b/src/tools/uic/ui4.cpp
index f52a8bd7d4..ed00e2c3fd 100644
--- a/src/tools/uic/ui4.cpp
+++ b/src/tools/uic/ui4.cpp
@@ -862,13 +862,13 @@ void DomActionGroup::setElementActionGroup(const QVector<DomActionGroup *> &a)
     m_actionGroup = a;
 }
 
-void DomActionGroup::setElementProperty(const QList<DomProperty *> &a)
+void DomActionGroup::setElementProperty(const QVector<DomProperty *> &a)
 {
     m_children |= Property;
     m_property = a;
 }
 
-void DomActionGroup::setElementAttribute(const QList<DomProperty *> &a)
+void DomActionGroup::setElementAttribute(const QVector<DomProperty *> &a)
 {
     m_children |= Attribute;
     m_attribute = a;
@@ -944,13 +944,13 @@ void DomAction::write(QXmlStreamWriter &writer, const QString &tagName) const
     writer.writeEndElement();
 }
 
-void DomAction::setElementProperty(const QList<DomProperty *> &a)
+void DomAction::setElementProperty(const QVector<DomProperty *> &a)
 {
     m_children |= Property;
     m_property = a;
 }
 
-void DomAction::setElementAttribute(const QList<DomProperty *> &a)
+void DomAction::setElementAttribute(const QVector<DomProperty *> &a)
 {
     m_children |= Attribute;
     m_attribute = a;
@@ -1058,13 +1058,13 @@ void DomButtonGroup::write(QXmlStreamWriter &writer, const QString &tagName) con
     writer.writeEndElement();
 }
 
-void DomButtonGroup::setElementProperty(const QList<DomProperty *> &a)
+void DomButtonGroup::setElementProperty(const QVector<DomProperty *> &a)
 {
     m_children |= Property;
     m_property = a;
 }
 
-void DomButtonGroup::setElementAttribute(const QList<DomProperty *> &a)
+void DomButtonGroup::setElementAttribute(const QVector<DomProperty *> &a)
 {
     m_children |= Attribute;
     m_attribute = a;
@@ -1717,13 +1717,13 @@ void DomLayout::write(QXmlStreamWriter &writer, const QString &tagName) const
     writer.writeEndElement();
 }
 
-void DomLayout::setElementProperty(const QList<DomProperty *> &a)
+void DomLayout::setElementProperty(const QVector<DomProperty *> &a)
 {
     m_children |= Property;
     m_property = a;
 }
 
-void DomLayout::setElementAttribute(const QList<DomProperty *> &a)
+void DomLayout::setElementAttribute(const QVector<DomProperty *> &a)
 {
     m_children |= Attribute;
     m_attribute = a;
@@ -1938,7 +1938,7 @@ void DomRow::write(QXmlStreamWriter &writer, const QString &tagName) const
     writer.writeEndElement();
 }
 
-void DomRow::setElementProperty(const QList<DomProperty *> &a)
+void DomRow::setElementProperty(const QVector<DomProperty *> &a)
 {
     m_children |= Property;
     m_property = a;
@@ -1983,7 +1983,7 @@ void DomColumn::write(QXmlStreamWriter &writer, const QString &tagName) const
     writer.writeEndElement();
 }
 
-void DomColumn::setElementProperty(const QList<DomProperty *> &a)
+void DomColumn::setElementProperty(const QVector<DomProperty *> &a)
 {
     m_children |= Property;
     m_property = a;
@@ -2059,7 +2059,7 @@ void DomItem::write(QXmlStreamWriter &writer, const QString &tagName) const
     writer.writeEndElement();
 }
 
-void DomItem::setElementProperty(const QList<DomProperty *> &a)
+void DomItem::setElementProperty(const QVector<DomProperty *> &a)
 {
     m_children |= Property;
     m_property = a;
@@ -2268,13 +2268,13 @@ void DomWidget::setElementClass(const QStringList &a)
     m_class = a;
 }
 
-void DomWidget::setElementProperty(const QList<DomProperty *> &a)
+void DomWidget::setElementProperty(const QVector<DomProperty *> &a)
 {
     m_children |= Property;
     m_property = a;
 }
 
-void DomWidget::setElementAttribute(const QList<DomProperty *> &a)
+void DomWidget::setElementAttribute(const QVector<DomProperty *> &a)
 {
     m_children |= Attribute;
     m_attribute = a;
@@ -2386,7 +2386,7 @@ void DomSpacer::write(QXmlStreamWriter &writer, const QString &tagName) const
     writer.writeEndElement();
 }
 
-void DomSpacer::setElementProperty(const QList<DomProperty *> &a)
+void DomSpacer::setElementProperty(const QVector<DomProperty *> &a)
 {
     m_children |= Property;
     m_property = a;
@@ -5984,7 +5984,7 @@ void DomDesignerData::write(QXmlStreamWriter &writer, const QString &tagName) co
     writer.writeEndElement();
 }
 
-void DomDesignerData::setElementProperty(const QList<DomProperty *> &a)
+void DomDesignerData::setElementProperty(const QVector<DomProperty *> &a)
 {
     m_children |= Property;
     m_property = a;
diff --git a/src/tools/uic/ui4.h b/src/tools/uic/ui4.h
index 94cdb40b6f..90b17f7027 100644
--- a/src/tools/uic/ui4.h
+++ b/src/tools/uic/ui4.h
@@ -472,11 +472,11 @@ public:
     inline QVector<DomActionGroup *> elementActionGroup() const { return m_actionGroup; }
     void setElementActionGroup(const QVector<DomActionGroup *> &a);
 
-    inline QList<DomProperty*> elementProperty() const { return m_property; }
-    void setElementProperty(const QList<DomProperty *> &a);
+    inline QVector<DomProperty *> elementProperty() const { return m_property; }
+    void setElementProperty(const QVector<DomProperty *> &a);
 
-    inline QList<DomProperty*> elementAttribute() const { return m_attribute; }
-    void setElementAttribute(const QList<DomProperty *> &a);
+    inline QVector<DomProperty *> elementAttribute() const { return m_attribute; }
+    void setElementAttribute(const QVector<DomProperty *> &a);
 
 private:
     // attribute data
@@ -487,8 +487,8 @@ private:
     uint m_children = 0;
     QVector<DomAction *> m_action;
     QVector<DomActionGroup *> m_actionGroup;
-    QList<DomProperty*> m_property;
-    QList<DomProperty*> m_attribute;
+    QVector<DomProperty *> m_property;
+    QVector<DomProperty *> m_attribute;
 
     enum Child {
         Action = 1,
@@ -519,11 +519,11 @@ public:
     inline void clearAttributeMenu() { m_has_attr_menu = false; }
 
     // child element accessors
-    inline QList<DomProperty*> elementProperty() const { return m_property; }
-    void setElementProperty(const QList<DomProperty *> &a);
+    inline QVector<DomProperty *> elementProperty() const { return m_property; }
+    void setElementProperty(const QVector<DomProperty *> &a);
 
-    inline QList<DomProperty*> elementAttribute() const { return m_attribute; }
-    void setElementAttribute(const QList<DomProperty *> &a);
+    inline QVector<DomProperty *> elementAttribute() const { return m_attribute; }
+    void setElementAttribute(const QVector<DomProperty *> &a);
 
 private:
     // attribute data
@@ -535,8 +535,8 @@ private:
 
     // child element data
     uint m_children = 0;
-    QList<DomProperty*> m_property;
-    QList<DomProperty*> m_attribute;
+    QVector<DomProperty *> m_property;
+    QVector<DomProperty *> m_attribute;
 
     enum Child {
         Property = 1,
@@ -581,11 +581,11 @@ public:
     inline void clearAttributeName() { m_has_attr_name = false; }
 
     // child element accessors
-    inline QList<DomProperty*> elementProperty() const { return m_property; }
-    void setElementProperty(const QList<DomProperty *> &a);
+    inline QVector<DomProperty *> elementProperty() const { return m_property; }
+    void setElementProperty(const QVector<DomProperty *> &a);
 
-    inline QList<DomProperty*> elementAttribute() const { return m_attribute; }
-    void setElementAttribute(const QList<DomProperty *> &a);
+    inline QVector<DomProperty *> elementAttribute() const { return m_attribute; }
+    void setElementAttribute(const QVector<DomProperty *> &a);
 
 private:
     // attribute data
@@ -594,8 +594,8 @@ private:
 
     // child element data
     uint m_children = 0;
-    QList<DomProperty*> m_property;
-    QList<DomProperty*> m_attribute;
+    QVector<DomProperty *> m_property;
+    QVector<DomProperty *> m_attribute;
 
     enum Child {
         Property = 1,
@@ -891,11 +891,11 @@ public:
     inline void clearAttributeColumnMinimumWidth() { m_has_attr_columnMinimumWidth = false; }
 
     // child element accessors
-    inline QList<DomProperty*> elementProperty() const { return m_property; }
-    void setElementProperty(const QList<DomProperty *> &a);
+    inline QVector<DomProperty *> elementProperty() const { return m_property; }
+    void setElementProperty(const QVector<DomProperty *> &a);
 
-    inline QList<DomProperty*> elementAttribute() const { return m_attribute; }
-    void setElementAttribute(const QList<DomProperty *> &a);
+    inline QVector<DomProperty *> elementAttribute() const { return m_attribute; }
+    void setElementAttribute(const QVector<DomProperty *> &a);
 
     inline QVector<DomLayoutItem *> elementItem() const { return m_item; }
     void setElementItem(const QVector<DomLayoutItem *> &a);
@@ -925,8 +925,8 @@ private:
 
     // child element data
     uint m_children = 0;
-    QList<DomProperty*> m_property;
-    QList<DomProperty*> m_attribute;
+    QVector<DomProperty *> m_property;
+    QVector<DomProperty *> m_attribute;
     QVector<DomLayoutItem *> m_item;
 
     enum Child {
@@ -1023,14 +1023,14 @@ public:
     void write(QXmlStreamWriter &writer, const QString &tagName = QString()) const;
 
     // child element accessors
-    inline QList<DomProperty*> elementProperty() const { return m_property; }
-    void setElementProperty(const QList<DomProperty *> &a);
+    inline QVector<DomProperty *> elementProperty() const { return m_property; }
+    void setElementProperty(const QVector<DomProperty *> &a);
 
 private:
 
     // child element data
     uint m_children = 0;
-    QList<DomProperty*> m_property;
+    QVector<DomProperty *> m_property;
 
     enum Child {
         Property = 1
@@ -1047,14 +1047,14 @@ public:
     void write(QXmlStreamWriter &writer, const QString &tagName = QString()) const;
 
     // child element accessors
-    inline QList<DomProperty*> elementProperty() const { return m_property; }
-    void setElementProperty(const QList<DomProperty *> &a);
+    inline QVector<DomProperty *> elementProperty() const { return m_property; }
+    void setElementProperty(const QVector<DomProperty *> &a);
 
 private:
 
     // child element data
     uint m_children = 0;
-    QList<DomProperty*> m_property;
+    QVector<DomProperty *> m_property;
 
     enum Child {
         Property = 1
@@ -1082,8 +1082,8 @@ public:
     inline void clearAttributeColumn() { m_has_attr_column = false; }
 
     // child element accessors
-    inline QList<DomProperty*> elementProperty() const { return m_property; }
-    void setElementProperty(const QList<DomProperty *> &a);
+    inline QVector<DomProperty *> elementProperty() const { return m_property; }
+    void setElementProperty(const QVector<DomProperty *> &a);
 
     inline QVector<DomItem *> elementItem() const { return m_item; }
     void setElementItem(const QVector<DomItem *> &a);
@@ -1098,7 +1098,7 @@ private:
 
     // child element data
     uint m_children = 0;
-    QList<DomProperty*> m_property;
+    QVector<DomProperty *> m_property;
     QVector<DomItem *> m_item;
 
     enum Child {
@@ -1136,11 +1136,11 @@ public:
     inline QStringList elementClass() const { return m_class; }
     void setElementClass(const QStringList &a);
 
-    inline QList<DomProperty*> elementProperty() const { return m_property; }
-    void setElementProperty(const QList<DomProperty *> &a);
+    inline QVector<DomProperty *> elementProperty() const { return m_property; }
+    void setElementProperty(const QVector<DomProperty *> &a);
 
-    inline QList<DomProperty*> elementAttribute() const { return m_attribute; }
-    void setElementAttribute(const QList<DomProperty *> &a);
+    inline QVector<DomProperty *> elementAttribute() const { return m_attribute; }
+    void setElementAttribute(const QVector<DomProperty *> &a);
 
     inline QVector<DomRow *> elementRow() const { return m_row; }
     void setElementRow(const QVector<DomRow *> &a);
@@ -1183,8 +1183,8 @@ private:
     // child element data
     uint m_children = 0;
     QStringList m_class;
-    QList<DomProperty*> m_property;
-    QList<DomProperty*> m_attribute;
+    QVector<DomProperty *> m_property;
+    QVector<DomProperty *> m_attribute;
     QVector<DomRow *> m_row;
     QVector<DomColumn *> m_column;
     QVector<DomItem *> m_item;
@@ -1227,8 +1227,8 @@ public:
     inline void clearAttributeName() { m_has_attr_name = false; }
 
     // child element accessors
-    inline QList<DomProperty*> elementProperty() const { return m_property; }
-    void setElementProperty(const QList<DomProperty *> &a);
+    inline QVector<DomProperty *> elementProperty() const { return m_property; }
+    void setElementProperty(const QVector<DomProperty *> &a);
 
 private:
     // attribute data
@@ -1237,7 +1237,7 @@ private:
 
     // child element data
     uint m_children = 0;
-    QList<DomProperty*> m_property;
+    QVector<DomProperty *> m_property;
 
     enum Child {
         Property = 1
@@ -2805,14 +2805,14 @@ public:
     void write(QXmlStreamWriter &writer, const QString &tagName = QString()) const;
 
     // child element accessors
-    inline QList<DomProperty*> elementProperty() const { return m_property; }
-    void setElementProperty(const QList<DomProperty *> &a);
+    inline QVector<DomProperty *> elementProperty() const { return m_property; }
+    void setElementProperty(const QVector<DomProperty *> &a);
 
 private:
 
     // child element data
     uint m_children = 0;
-    QList<DomProperty*> m_property;
+    QVector<DomProperty *> m_property;
 
     enum Child {
         Property = 1
diff --git a/src/tools/uic/utils.h b/src/tools/uic/utils.h
index 34c4ab23d4..bd543c7bb7 100644
--- a/src/tools/uic/utils.h
+++ b/src/tools/uic/utils.h
@@ -42,7 +42,7 @@ inline bool toBool(const QString &str)
 inline QString toString(const DomString *str)
 { return str ? str->text() : QString(); }
 
-inline QHash<QString, DomProperty *> propertyMap(const QList<DomProperty *> &properties)
+inline QHash<QString, DomProperty *> propertyMap(const QVector<DomProperty *> &properties)
 {
     QHash<QString, DomProperty *> map;
     for (DomProperty *p : properties)
diff --git a/src/widgets/.prev_CMakeLists.txt b/src/widgets/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..51e8f8064d
--- /dev/null
+++ b/src/widgets/.prev_CMakeLists.txt
@@ -0,0 +1,841 @@
+# Generated from widgets.pro.
+
+#####################################################################
+## Widgets Module:
+#####################################################################
+
+qt_add_module(Widgets
+    GENERATE_METATYPES
+    QMAKE_MODULE_CONFIG uic
+    PLUGIN_TYPES styles
+    SOURCES
+        itemviews/qfileiconprovider.cpp itemviews/qfileiconprovider.h itemviews/qfileiconprovider_p.h
+        kernel/qapplication.cpp kernel/qapplication.h kernel/qapplication_p.h
+        kernel/qboxlayout.cpp kernel/qboxlayout.h
+        kernel/qdesktopwidget.cpp kernel/qdesktopwidget.h kernel/qdesktopwidget_p.h
+        kernel/qgesture.cpp kernel/qgesture.h kernel/qgesture_p.h
+        kernel/qgesturemanager.cpp kernel/qgesturemanager_p.h
+        kernel/qgesturerecognizer.cpp kernel/qgesturerecognizer.h
+        kernel/qgridlayout.cpp kernel/qgridlayout.h
+        kernel/qlayout.cpp kernel/qlayout.h kernel/qlayout_p.h
+        kernel/qlayoutengine.cpp kernel/qlayoutengine_p.h
+        kernel/qlayoutitem.cpp kernel/qlayoutitem.h
+        kernel/qsizepolicy.cpp kernel/qsizepolicy.h
+        kernel/qstackedlayout.cpp kernel/qstackedlayout.h
+        kernel/qstandardgestures.cpp kernel/qstandardgestures_p.h
+        kernel/qtestsupport_widgets.cpp kernel/qtestsupport_widgets.h
+        kernel/qtwidgetsglobal.h kernel/qtwidgetsglobal_p.h
+        kernel/qwidget.cpp kernel/qwidget.h kernel/qwidget_p.h
+        kernel/qwidgetrepaintmanager.cpp kernel/qwidgetrepaintmanager_p.h
+        kernel/qwidgetsvariant.cpp
+        kernel/qwidgetwindow.cpp kernel/qwidgetwindow_p.h
+        kernel/qwindowcontainer.cpp kernel/qwindowcontainer_p.h
+        styles/qcommonstyle.cpp styles/qcommonstyle.h styles/qcommonstyle_p.h
+        styles/qcommonstylepixmaps_p.h
+        styles/qdrawutil.cpp styles/qdrawutil.h
+        styles/qpixmapstyle.cpp styles/qpixmapstyle_p.h
+        styles/qpixmapstyle_p_p.h
+        styles/qproxystyle.cpp styles/qproxystyle.h styles/qproxystyle_p.h
+        styles/qstyle.cpp styles/qstyle.h
+        styles/qstylefactory.cpp styles/qstylefactory.h
+        styles/qstylehelper.cpp styles/qstylehelper_p.h
+        styles/qstyleoption.cpp styles/qstyleoption.h
+        styles/qstylepainter.cpp styles/qstylepainter.h
+        styles/qstyleplugin.cpp styles/qstyleplugin.h
+        styles/qstylesheetstyle.cpp styles/qstylesheetstyle_p.h
+        styles/qstylesheetstyle_default.cpp
+        util/qcolormap.cpp util/qcolormap.h
+        util/qsystemtrayicon.cpp util/qsystemtrayicon.h util/qsystemtrayicon_p.h
+        widgets/qabstractscrollarea.cpp widgets/qabstractscrollarea.h widgets/qabstractscrollarea_p.h
+        widgets/qfocusframe.cpp widgets/qfocusframe.h
+        widgets/qframe.cpp widgets/qframe.h widgets/qframe_p.h
+        widgets/qwidgetanimator.cpp widgets/qwidgetanimator_p.h
+    DEFINES
+        QT_NO_USING_NAMESPACE
+    INCLUDE_DIRECTORIES
+        dialogs
+    LIBRARIES
+        Qt::CorePrivate
+        Qt::GuiPrivate
+    PUBLIC_LIBRARIES
+        Qt::Core
+        Qt::Gui
+    PRIVATE_MODULE_INTERFACE
+        Qt::CorePrivate
+        Qt::GuiPrivate
+    PRECOMPILED_HEADER
+        "kernel/qt_widgets_pch.h"
+)
+
+# Resources:
+set(qstyle_resource_files
+    "images/cdr-128.png"
+    "images/cdr-16.png"
+    "images/cdr-32.png"
+    "images/cleartext-16.png"
+    "images/cleartext-32.png"
+    "images/closedock-10.png"
+    "images/closedock-16.png"
+    "images/closedock-20.png"
+    "images/closedock-32.png"
+    "images/closedock-48.png"
+    "images/closedock-64.png"
+    "images/computer-16.png"
+    "images/computer-32.png"
+    "images/desktop-16.png"
+    "images/desktop-32.png"
+    "images/dirclosed-128.png"
+    "images/dirclosed-16.png"
+    "images/dirclosed-32.png"
+    "images/dirlink-128.png"
+    "images/dirlink-16.png"
+    "images/dirlink-32.png"
+    "images/diropen-128.png"
+    "images/diropen-16.png"
+    "images/diropen-32.png"
+    "images/down-128.png"
+    "images/down-16.png"
+    "images/down-32.png"
+    "images/dvd-128.png"
+    "images/dvd-16.png"
+    "images/dvd-32.png"
+    "images/file-128.png"
+    "images/file-16.png"
+    "images/file-32.png"
+    "images/filecontents-128.png"
+    "images/filecontents-16.png"
+    "images/filecontents-32.png"
+    "images/fileinfo-128.png"
+    "images/fileinfo-16.png"
+    "images/fileinfo-32.png"
+    "images/filelink-128.png"
+    "images/filelink-16.png"
+    "images/filelink-32.png"
+    "images/floppy-128.png"
+    "images/floppy-16.png"
+    "images/floppy-32.png"
+    "images/fontbitmap-16.png"
+    "images/fonttruetype-16.png"
+    "images/fusion_groupbox.png"
+    "images/harddrive-128.png"
+    "images/harddrive-16.png"
+    "images/harddrive-32.png"
+    "images/left-128.png"
+    "images/left-16.png"
+    "images/left-32.png"
+    "images/media-pause-16.png"
+    "images/media-pause-32.png"
+    "images/media-play-16.png"
+    "images/media-play-32.png"
+    "images/media-seek-backward-16.png"
+    "images/media-seek-backward-32.png"
+    "images/media-seek-forward-16.png"
+    "images/media-seek-forward-32.png"
+    "images/media-skip-backward-16.png"
+    "images/media-skip-backward-32.png"
+    "images/media-skip-forward-16.png"
+    "images/media-skip-forward-32.png"
+    "images/media-stop-16.png"
+    "images/media-stop-32.png"
+    "images/media-volume-16.png"
+    "images/media-volume-muted-16.png"
+    "images/networkdrive-128.png"
+    "images/networkdrive-16.png"
+    "images/networkdrive-32.png"
+    "images/newdirectory-128.png"
+    "images/newdirectory-16.png"
+    "images/newdirectory-32.png"
+    "images/normalizedockup-10.png"
+    "images/normalizedockup-16.png"
+    "images/normalizedockup-20.png"
+    "images/normalizedockup-32.png"
+    "images/normalizedockup-48.png"
+    "images/normalizedockup-64.png"
+    "images/parentdir-128.png"
+    "images/parentdir-16.png"
+    "images/parentdir-32.png"
+    "images/refresh-24.png"
+    "images/refresh-32.png"
+    "images/right-128.png"
+    "images/right-16.png"
+    "images/right-32.png"
+    "images/standardbutton-apply-128.png"
+    "images/standardbutton-apply-16.png"
+    "images/standardbutton-apply-32.png"
+    "images/standardbutton-cancel-128.png"
+    "images/standardbutton-cancel-16.png"
+    "images/standardbutton-cancel-32.png"
+    "images/standardbutton-clear-128.png"
+    "images/standardbutton-clear-16.png"
+    "images/standardbutton-clear-32.png"
+    "images/standardbutton-close-128.png"
+    "images/standardbutton-close-16.png"
+    "images/standardbutton-close-32.png"
+    "images/standardbutton-closetab-16.png"
+    "images/standardbutton-closetab-down-16.png"
+    "images/standardbutton-closetab-hover-16.png"
+    "images/standardbutton-delete-128.png"
+    "images/standardbutton-delete-16.png"
+    "images/standardbutton-delete-32.png"
+    "images/standardbutton-help-128.png"
+    "images/standardbutton-help-16.png"
+    "images/standardbutton-help-32.png"
+    "images/standardbutton-no-128.png"
+    "images/standardbutton-no-16.png"
+    "images/standardbutton-no-32.png"
+    "images/standardbutton-ok-128.png"
+    "images/standardbutton-ok-16.png"
+    "images/standardbutton-ok-32.png"
+    "images/standardbutton-open-128.png"
+    "images/standardbutton-open-16.png"
+    "images/standardbutton-open-32.png"
+    "images/standardbutton-save-128.png"
+    "images/standardbutton-save-16.png"
+    "images/standardbutton-save-32.png"
+    "images/standardbutton-yes-128.png"
+    "images/standardbutton-yes-16.png"
+    "images/standardbutton-yes-32.png"
+    "images/stop-24.png"
+    "images/stop-32.png"
+    "images/titlebar-contexthelp-16.png"
+    "images/titlebar-contexthelp-32.png"
+    "images/titlebar-contexthelp-48.png"
+    "images/titlebar-max-16.png"
+    "images/titlebar-max-32.png"
+    "images/titlebar-max-48.png"
+    "images/titlebar-min-16.png"
+    "images/titlebar-min-32.png"
+    "images/titlebar-min-48.png"
+    "images/titlebar-shade-16.png"
+    "images/titlebar-shade-32.png"
+    "images/titlebar-shade-48.png"
+    "images/titlebar-unshade-16.png"
+    "images/titlebar-unshade-32.png"
+    "images/titlebar-unshade-48.png"
+    "images/toolbar-ext-h-16.png"
+    "images/toolbar-ext-h-32.png"
+    "images/toolbar-ext-h-8.png"
+    "images/toolbar-ext-h-rtl-16.png"
+    "images/toolbar-ext-h-rtl-32.png"
+    "images/toolbar-ext-h-rtl-8.png"
+    "images/toolbar-ext-v-10.png"
+    "images/toolbar-ext-v-20.png"
+    "images/toolbar-ext-v-5.png"
+    "images/trash-128.png"
+    "images/trash-16.png"
+    "images/trash-32.png"
+    "images/up-128.png"
+    "images/up-16.png"
+    "images/up-32.png"
+    "images/viewdetailed-128.png"
+    "images/viewdetailed-16.png"
+    "images/viewdetailed-32.png"
+    "images/viewlist-128.png"
+    "images/viewlist-16.png"
+    "images/viewlist-32.png"
+)
+
+qt_add_resource(Widgets "qstyle"
+    PREFIX
+        "/qt-project.org/styles/commonstyle"
+    BASE
+        "styles"
+    FILES
+        ${qstyle_resource_files}
+)
+set_source_files_properties("styles/images/closedock-down-macstyle-16.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/closedock-down-16.png"
+)
+set_source_files_properties("styles/images/closedock-macstyle-16.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/closedock-16.png"
+)
+set_source_files_properties("styles/images/dockdock-down-macstyle-16.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/dockdock-down-16.png"
+)
+set_source_files_properties("styles/images/dockdock-macstyle-16.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/dockdock-16.png"
+)
+set_source_files_properties("styles/images/toolbar-ext-macstyle.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/toolbar-ext.png"
+)
+set_source_files_properties("styles/images/toolbar-ext-macstyle@2x.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/toolbar-ext@2x.png"
+)
+set(qstyle1_resource_files
+    "images/closedock-down-macstyle-16.png"
+    "images/closedock-macstyle-16.png"
+    "images/dockdock-down-macstyle-16.png"
+    "images/dockdock-macstyle-16.png"
+    "images/toolbar-ext-macstyle.png"
+    "images/toolbar-ext-macstyle@2x.png"
+)
+
+qt_add_resource(Widgets "qstyle1"
+    PREFIX
+        "/qt-project.org/styles/macstyle"
+    BASE
+        "styles"
+    FILES
+        ${qstyle1_resource_files}
+)
+
+if(QT_FEATURE_reduce_relocations AND UNIX AND GCC)
+    target_link_options(Widgets PRIVATE
+                        "LINKER:--dynamic-list=${CMAKE_CURRENT_LIST_DIR}/QtWidgets.dynlist")
+endif()
+
+#### Keys ignored in scope 1:.:.:widgets.pro:<TRUE>:
+# MODULE_CONFIG = "uic"
+# QMAKE_LIBS = "$$QMAKE_LIBS_GUI"
+
+## Scopes:
+#####################################################################
+
+qt_extend_target(Widgets CONDITION MSVC AND (TEST_architecture_arch STREQUAL "i386")
+    LINK_OPTIONS
+        "/BASE:0x65000000"
+)
+
+qt_extend_target(Widgets CONDITION APPLE_OSX
+    SOURCES
+        kernel/qmacgesturerecognizer.cpp kernel/qmacgesturerecognizer_p.h
+        widgets/qmaccocoaviewcontainer_mac.h widgets/qmaccocoaviewcontainer_mac.mm
+        widgets/qmacnativewidget_mac.h widgets/qmacnativewidget_mac.mm
+    LIBRARIES
+        ${FWAppKit}
+        z
+)
+
+qt_extend_target(Widgets CONDITION WIN32 AND NOT WINRT
+    LIBRARIES
+        dwmapi
+        shell32
+        uxtheme
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_graphicseffect
+    SOURCES
+        effects/qgraphicseffect.cpp effects/qgraphicseffect.h effects/qgraphicseffect_p.h
+        effects/qpixmapfilter.cpp effects/qpixmapfilter_p.h
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_action
+    SOURCES
+        kernel/qaction.cpp kernel/qaction.h kernel/qaction_p.h
+        kernel/qactiongroup.cpp kernel/qactiongroup.h
+        kernel/qwidgetaction.cpp kernel/qwidgetaction.h kernel/qwidgetaction_p.h
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_formlayout
+    SOURCES
+        kernel/qformlayout.cpp kernel/qformlayout.h
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_shortcut
+    SOURCES
+        kernel/qshortcut.cpp kernel/qshortcut.h
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_tooltip
+    SOURCES
+        kernel/qtooltip.cpp kernel/qtooltip.h
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_whatsthis
+    SOURCES
+        kernel/qwhatsthis.cpp kernel/qwhatsthis.h
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_animation
+    SOURCES
+        styles/qstyleanimation.cpp styles/qstyleanimation_p.h
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_style_windows
+    SOURCES
+        styles/qwindowsstyle.cpp styles/qwindowsstyle_p.h
+        styles/qwindowsstyle_p_p.h
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_style_fusion
+    SOURCES
+        styles/qfusionstyle.cpp styles/qfusionstyle_p.h
+        styles/qfusionstyle_p_p.h
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_abstractbutton
+    SOURCES
+        widgets/qabstractbutton.cpp widgets/qabstractbutton.h widgets/qabstractbutton_p.h
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_abstractslider
+    SOURCES
+        widgets/qabstractslider.cpp widgets/qabstractslider.h widgets/qabstractslider_p.h
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_buttongroup
+    SOURCES
+        widgets/qbuttongroup.cpp widgets/qbuttongroup.h widgets/qbuttongroup_p.h
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_calendarwidget
+    SOURCES
+        widgets/qcalendarwidget.cpp widgets/qcalendarwidget.h
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_checkbox
+    SOURCES
+        widgets/qcheckbox.cpp widgets/qcheckbox.h
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_combobox
+    SOURCES
+        widgets/qcombobox.cpp widgets/qcombobox.h widgets/qcombobox_p.h
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_commandlinkbutton
+    SOURCES
+        widgets/qcommandlinkbutton.cpp widgets/qcommandlinkbutton.h
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_datetimeedit
+    SOURCES
+        widgets/qdatetimeedit.cpp widgets/qdatetimeedit.h widgets/qdatetimeedit_p.h
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_dial
+    SOURCES
+        widgets/qdial.cpp widgets/qdial.h
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_dockwidget
+    SOURCES
+        widgets/qdockarealayout.cpp widgets/qdockarealayout_p.h
+        widgets/qdockwidget.cpp widgets/qdockwidget.h widgets/qdockwidget_p.h
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_effects
+    SOURCES
+        widgets/qeffects.cpp widgets/qeffects_p.h
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_fontcombobox
+    SOURCES
+        widgets/qfontcombobox.cpp widgets/qfontcombobox.h
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_groupbox
+    SOURCES
+        widgets/qgroupbox.cpp widgets/qgroupbox.h
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_keysequenceedit
+    SOURCES
+        widgets/qkeysequenceedit.cpp widgets/qkeysequenceedit.h widgets/qkeysequenceedit_p.h
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_label
+    SOURCES
+        widgets/qlabel.cpp widgets/qlabel.h widgets/qlabel_p.h
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_lcdnumber
+    SOURCES
+        widgets/qlcdnumber.cpp widgets/qlcdnumber.h
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_lineedit
+    SOURCES
+        widgets/qlineedit.cpp widgets/qlineedit.h widgets/qlineedit_p.cpp widgets/qlineedit_p.h
+        widgets/qwidgetlinecontrol.cpp widgets/qwidgetlinecontrol_p.h
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_mainwindow
+    SOURCES
+        widgets/qmainwindow.cpp widgets/qmainwindow.h
+        widgets/qmainwindowlayout.cpp widgets/qmainwindowlayout_p.h
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_mdiarea
+    SOURCES
+        widgets/qmdiarea.cpp widgets/qmdiarea.h widgets/qmdiarea_p.h
+        widgets/qmdisubwindow.cpp widgets/qmdisubwindow.h widgets/qmdisubwindow_p.h
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_menu
+    SOURCES
+        widgets/qmenu.cpp widgets/qmenu.h widgets/qmenu_p.h
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_menubar
+    SOURCES
+        widgets/qmenubar.cpp widgets/qmenubar.h widgets/qmenubar_p.h
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_progressbar
+    SOURCES
+        widgets/qprogressbar.cpp widgets/qprogressbar.h
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_pushbutton
+    SOURCES
+        widgets/qpushbutton.cpp widgets/qpushbutton.h widgets/qpushbutton_p.h
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_radiobutton
+    SOURCES
+        widgets/qradiobutton.cpp widgets/qradiobutton.h
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_resizehandler
+    SOURCES
+        widgets/qwidgetresizehandler.cpp widgets/qwidgetresizehandler_p.h
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_dialogbuttonbox
+    SOURCES
+        widgets/qdialogbuttonbox.cpp widgets/qdialogbuttonbox.h
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_rubberband
+    SOURCES
+        widgets/qrubberband.cpp widgets/qrubberband.h
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_scrollarea
+    SOURCES
+        widgets/qscrollarea.cpp widgets/qscrollarea.h widgets/qscrollarea_p.h
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_scrollbar
+    SOURCES
+        widgets/qscrollbar.cpp widgets/qscrollbar.h widgets/qscrollbar_p.h
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_sizegrip
+    SOURCES
+        widgets/qsizegrip.cpp widgets/qsizegrip.h
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_slider
+    SOURCES
+        widgets/qslider.cpp widgets/qslider.h
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_spinbox
+    SOURCES
+        widgets/qabstractspinbox.cpp widgets/qabstractspinbox.h widgets/qabstractspinbox_p.h
+        widgets/qspinbox.cpp widgets/qspinbox.h
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_splashscreen
+    SOURCES
+        widgets/qsplashscreen.cpp widgets/qsplashscreen.h
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_splitter
+    SOURCES
+        widgets/qsplitter.cpp widgets/qsplitter.h widgets/qsplitter_p.h
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_stackedwidget
+    SOURCES
+        widgets/qstackedwidget.cpp widgets/qstackedwidget.h
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_statusbar
+    SOURCES
+        widgets/qstatusbar.cpp widgets/qstatusbar.h
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_tabbar
+    SOURCES
+        widgets/qtabbar.cpp widgets/qtabbar.h widgets/qtabbar_p.h
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_textedit
+    SOURCES
+        widgets/qplaintextedit.cpp widgets/qplaintextedit.h widgets/qplaintextedit_p.h
+        widgets/qtextedit.cpp widgets/qtextedit.h widgets/qtextedit_p.h
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_textbrowser
+    SOURCES
+        widgets/qtextbrowser.cpp widgets/qtextbrowser.h
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_tabwidget
+    SOURCES
+        widgets/qtabwidget.cpp widgets/qtabwidget.h
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_toolbar
+    SOURCES
+        widgets/qtoolbar.cpp widgets/qtoolbar.h widgets/qtoolbar_p.h
+        widgets/qtoolbararealayout.cpp widgets/qtoolbararealayout_p.h
+        widgets/qtoolbarlayout.cpp widgets/qtoolbarlayout_p.h
+        widgets/qtoolbarseparator.cpp widgets/qtoolbarseparator_p.h
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_toolbox
+    SOURCES
+        widgets/qtoolbox.cpp widgets/qtoolbox.h
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_toolbutton
+    SOURCES
+        widgets/qtoolbarextension.cpp widgets/qtoolbarextension_p.h
+        widgets/qtoolbutton.cpp widgets/qtoolbutton.h
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_widgettextcontrol
+    SOURCES
+        widgets/qwidgettextcontrol.cpp widgets/qwidgettextcontrol_p.h
+        widgets/qwidgettextcontrol_p_p.h
+)
+
+qt_extend_target(Widgets CONDITION APPLE_OSX AND (QT_FEATURE_menu OR QT_FEATURE_menubar)
+    SOURCES
+        widgets/qmenu_mac.mm
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_colordialog
+    SOURCES
+        dialogs/qcolordialog.cpp dialogs/qcolordialog.h
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_dialog
+    SOURCES
+        dialogs/qdialog.cpp dialogs/qdialog.h dialogs/qdialog_p.h
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_errormessage
+    SOURCES
+        dialogs/qerrormessage.cpp dialogs/qerrormessage.h
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_filedialog
+    SOURCES
+        dialogs/qfiledialog.cpp dialogs/qfiledialog.h dialogs/qfiledialog.ui dialogs/qfiledialog_p.h
+        dialogs/qsidebar.cpp dialogs/qsidebar_p.h
+    ENABLE_AUTOGEN_TOOLS
+        uic
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_filesystemmodel
+    SOURCES
+        dialogs/qfileinfogatherer.cpp dialogs/qfileinfogatherer_p.h
+        dialogs/qfilesystemmodel.cpp dialogs/qfilesystemmodel.h dialogs/qfilesystemmodel_p.h
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_fontdialog
+    SOURCES
+        dialogs/qfontdialog.cpp dialogs/qfontdialog.h dialogs/qfontdialog_p.h
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_fscompleter
+    SOURCES
+        dialogs/qfscompleter_p.h
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_inputdialog
+    SOURCES
+        dialogs/qinputdialog.cpp dialogs/qinputdialog.h
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_messagebox
+    SOURCES
+        dialogs/qmessagebox.cpp dialogs/qmessagebox.h
+)
+
+if(QT_FEATURE_messagebox)
+    # Resources:
+    set(qmessagebox_resource_files
+        "images/qtlogo-64.png"
+    )
+
+    qt_add_resource(Widgets "qmessagebox"
+        PREFIX
+            "/qt-project.org/qmessagebox"
+        BASE
+            "dialogs"
+        FILES
+            ${qmessagebox_resource_files}
+    )
+endif()
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_progressdialog
+    SOURCES
+        dialogs/qprogressdialog.cpp dialogs/qprogressdialog.h
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_wizard
+    SOURCES
+        dialogs/qwizard.cpp dialogs/qwizard.h
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_wizard AND WIN32
+    SOURCES
+        dialogs/qwizard_win.cpp dialogs/qwizard_win_p.h
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_accessibility
+    SOURCES
+        accessible/complexwidgets.cpp accessible/complexwidgets_p.h
+        accessible/qaccessiblemenu.cpp accessible/qaccessiblemenu_p.h
+        accessible/qaccessiblewidget.cpp accessible/qaccessiblewidget.h
+        accessible/qaccessiblewidgetfactory.cpp accessible/qaccessiblewidgetfactory_p.h
+        accessible/qaccessiblewidgets.cpp accessible/qaccessiblewidgets_p.h
+        accessible/rangecontrols.cpp accessible/rangecontrols_p.h
+        accessible/simplewidgets.cpp accessible/simplewidgets_p.h
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_accessibility AND QT_FEATURE_itemviews
+    SOURCES
+        accessible/itemviews.cpp accessible/itemviews_p.h
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_itemviews
+    SOURCES
+        itemviews/qabstractitemdelegate.cpp itemviews/qabstractitemdelegate.h itemviews/qabstractitemdelegate_p.h
+        itemviews/qabstractitemview.cpp itemviews/qabstractitemview.h itemviews/qabstractitemview_p.h
+        itemviews/qbsptree.cpp itemviews/qbsptree_p.h
+        itemviews/qheaderview.cpp itemviews/qheaderview.h itemviews/qheaderview_p.h
+        itemviews/qitemdelegate.cpp itemviews/qitemdelegate.h
+        itemviews/qitemeditorfactory.cpp itemviews/qitemeditorfactory.h itemviews/qitemeditorfactory_p.h
+        itemviews/qstyleditemdelegate.cpp itemviews/qstyleditemdelegate.h
+        itemviews/qwidgetitemdata_p.h
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_columnview
+    SOURCES
+        itemviews/qcolumnview.cpp itemviews/qcolumnview.h itemviews/qcolumnview_p.h
+        itemviews/qcolumnviewgrip.cpp itemviews/qcolumnviewgrip_p.h
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_datawidgetmapper
+    SOURCES
+        itemviews/qdatawidgetmapper.cpp itemviews/qdatawidgetmapper.h
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_dirmodel
+    SOURCES
+        itemviews/qdirmodel.cpp itemviews/qdirmodel.h
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_listview
+    SOURCES
+        itemviews/qlistview.cpp itemviews/qlistview.h itemviews/qlistview_p.h
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_listwidget
+    SOURCES
+        itemviews/qlistwidget.cpp itemviews/qlistwidget.h itemviews/qlistwidget_p.h
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_tableview
+    SOURCES
+        itemviews/qtableview.cpp itemviews/qtableview.h itemviews/qtableview_p.h
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_tablewidget
+    SOURCES
+        itemviews/qtablewidget.cpp itemviews/qtablewidget.h itemviews/qtablewidget_p.h
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_treeview
+    SOURCES
+        itemviews/qtreeview.cpp itemviews/qtreeview.h itemviews/qtreeview_p.h
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_treewidget
+    SOURCES
+        itemviews/qtreewidget.cpp itemviews/qtreewidget.h itemviews/qtreewidget_p.h
+        itemviews/qtreewidgetitemiterator.cpp itemviews/qtreewidgetitemiterator.h
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_graphicsview
+    SOURCES
+        graphicsview/qgraph_p.h
+        graphicsview/qgraphicsanchorlayout.cpp graphicsview/qgraphicsanchorlayout.h graphicsview/qgraphicsanchorlayout_p.cpp graphicsview/qgraphicsanchorlayout_p.h
+        graphicsview/qgraphicsgridlayout.cpp graphicsview/qgraphicsgridlayout.h
+        graphicsview/qgraphicsgridlayoutengine.cpp graphicsview/qgraphicsgridlayoutengine_p.h
+        graphicsview/qgraphicsitem.cpp graphicsview/qgraphicsitem.h graphicsview/qgraphicsitem_p.h
+        graphicsview/qgraphicslayout.cpp graphicsview/qgraphicslayout.h graphicsview/qgraphicslayout_p.cpp graphicsview/qgraphicslayout_p.h
+        graphicsview/qgraphicslayoutitem.cpp graphicsview/qgraphicslayoutitem.h graphicsview/qgraphicslayoutitem_p.h
+        graphicsview/qgraphicslayoutstyleinfo.cpp graphicsview/qgraphicslayoutstyleinfo_p.h
+        graphicsview/qgraphicslinearlayout.cpp graphicsview/qgraphicslinearlayout.h
+        graphicsview/qgraphicsproxywidget.cpp graphicsview/qgraphicsproxywidget.h graphicsview/qgraphicsproxywidget_p.h
+        graphicsview/qgraphicsscene.cpp graphicsview/qgraphicsscene.h graphicsview/qgraphicsscene_p.h
+        graphicsview/qgraphicsscene_bsp.cpp graphicsview/qgraphicsscene_bsp_p.h
+        graphicsview/qgraphicsscenebsptreeindex.cpp graphicsview/qgraphicsscenebsptreeindex_p.h
+        graphicsview/qgraphicssceneevent.cpp graphicsview/qgraphicssceneevent.h
+        graphicsview/qgraphicssceneindex.cpp graphicsview/qgraphicssceneindex_p.h
+        graphicsview/qgraphicsscenelinearindex.cpp graphicsview/qgraphicsscenelinearindex_p.h
+        graphicsview/qgraphicstransform.cpp graphicsview/qgraphicstransform.h graphicsview/qgraphicstransform_p.h
+        graphicsview/qgraphicsview.cpp graphicsview/qgraphicsview.h graphicsview/qgraphicsview_p.h
+        graphicsview/qgraphicswidget.cpp graphicsview/qgraphicswidget.h graphicsview/qgraphicswidget_p.cpp graphicsview/qgraphicswidget_p.h
+        graphicsview/qsimplex_p.cpp graphicsview/qsimplex_p.h
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_easingcurve AND QT_FEATURE_graphicsview
+    SOURCES
+        graphicsview/qgraphicsitemanimation.cpp graphicsview/qgraphicsitemanimation.h
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_completer
+    SOURCES
+        util/qcompleter.cpp util/qcompleter.h util/qcompleter_p.h
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_scroller
+    SOURCES
+        util/qflickgesture.cpp util/qflickgesture_p.h
+        util/qscroller.cpp util/qscroller.h util/qscroller_p.h
+        util/qscrollerproperties.cpp util/qscrollerproperties.h util/qscrollerproperties_p.h
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_undocommand
+    SOURCES
+        util/qundostack.cpp util/qundostack.h util/qundostack_p.h
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_undogroup
+    SOURCES
+        util/qundogroup.cpp util/qundogroup.h
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_undoview
+    SOURCES
+        util/qundoview.cpp util/qundoview.h
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_xcb
+    SOURCES
+        util/qsystemtrayicon_x11.cpp
+)
+
+qt_extend_target(Widgets CONDITION NOT QT_FEATURE_xcb
+    SOURCES
+        util/qsystemtrayicon_qpa.cpp
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_statemachine
+    SOURCES
+        statemachine/qguistatemachine.cpp
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_qeventtransition
+    SOURCES
+        statemachine/qbasickeyeventtransition.cpp statemachine/qbasickeyeventtransition_p.h
+        statemachine/qbasicmouseeventtransition.cpp statemachine/qbasicmouseeventtransition_p.h
+        statemachine/qkeyeventtransition.cpp statemachine/qkeyeventtransition.h
+        statemachine/qmouseeventtransition.cpp statemachine/qmouseeventtransition.h
+)
+
+
+qt_create_tracepoints(Widgets qtwidgets.tracepoints)
+qt_add_docs(Widgets
+    doc/qtwidgets.qdocconf
+)
+
diff --git a/src/widgets/CMakeLists.txt b/src/widgets/CMakeLists.txt
new file mode 100644
index 0000000000..b3c015f3db
--- /dev/null
+++ b/src/widgets/CMakeLists.txt
@@ -0,0 +1,843 @@
+# Generated from widgets.pro.
+
+#####################################################################
+## Widgets Module:
+#####################################################################
+
+qt_add_module(Widgets
+    GENERATE_METATYPES
+    QMAKE_MODULE_CONFIG uic
+    PLUGIN_TYPES styles
+    SOURCES
+        itemviews/qfileiconprovider.cpp itemviews/qfileiconprovider.h itemviews/qfileiconprovider_p.h
+        kernel/qapplication.cpp kernel/qapplication.h kernel/qapplication_p.h
+        kernel/qboxlayout.cpp kernel/qboxlayout.h
+        kernel/qdesktopwidget.cpp kernel/qdesktopwidget.h kernel/qdesktopwidget_p.h
+        kernel/qgesture.cpp kernel/qgesture.h kernel/qgesture_p.h
+        kernel/qgesturemanager.cpp kernel/qgesturemanager_p.h
+        kernel/qgesturerecognizer.cpp kernel/qgesturerecognizer.h
+        kernel/qgridlayout.cpp kernel/qgridlayout.h
+        kernel/qlayout.cpp kernel/qlayout.h kernel/qlayout_p.h
+        kernel/qlayoutengine.cpp kernel/qlayoutengine_p.h
+        kernel/qlayoutitem.cpp kernel/qlayoutitem.h
+        kernel/qsizepolicy.cpp kernel/qsizepolicy.h
+        kernel/qstackedlayout.cpp kernel/qstackedlayout.h
+        kernel/qstandardgestures.cpp kernel/qstandardgestures_p.h
+        kernel/qtestsupport_widgets.cpp kernel/qtestsupport_widgets.h
+        kernel/qtwidgetsglobal.h kernel/qtwidgetsglobal_p.h
+        kernel/qwidget.cpp kernel/qwidget.h kernel/qwidget_p.h
+        kernel/qwidgetrepaintmanager.cpp kernel/qwidgetrepaintmanager_p.h
+        kernel/qwidgetsvariant.cpp
+        kernel/qwidgetwindow.cpp kernel/qwidgetwindow_p.h
+        kernel/qwindowcontainer.cpp kernel/qwindowcontainer_p.h
+        styles/qcommonstyle.cpp styles/qcommonstyle.h styles/qcommonstyle_p.h
+        styles/qcommonstylepixmaps_p.h
+        styles/qdrawutil.cpp styles/qdrawutil.h
+        styles/qpixmapstyle.cpp styles/qpixmapstyle_p.h
+        styles/qpixmapstyle_p_p.h
+        styles/qproxystyle.cpp styles/qproxystyle.h styles/qproxystyle_p.h
+        styles/qstyle.cpp styles/qstyle.h
+        styles/qstylefactory.cpp styles/qstylefactory.h
+        styles/qstylehelper.cpp styles/qstylehelper_p.h
+        styles/qstyleoption.cpp styles/qstyleoption.h
+        styles/qstylepainter.cpp styles/qstylepainter.h
+        styles/qstyleplugin.cpp styles/qstyleplugin.h
+        styles/qstylesheetstyle.cpp styles/qstylesheetstyle_p.h
+        styles/qstylesheetstyle_default.cpp
+        util/qcolormap.cpp util/qcolormap.h
+        util/qsystemtrayicon.cpp util/qsystemtrayicon.h util/qsystemtrayicon_p.h
+        widgets/qabstractscrollarea.cpp widgets/qabstractscrollarea.h widgets/qabstractscrollarea_p.h
+        widgets/qfocusframe.cpp widgets/qfocusframe.h
+        widgets/qframe.cpp widgets/qframe.h widgets/qframe_p.h
+        widgets/qwidgetanimator.cpp widgets/qwidgetanimator_p.h
+    DEFINES
+        QT_NO_USING_NAMESPACE
+    INCLUDE_DIRECTORIES
+        dialogs
+    LIBRARIES
+        Qt::CorePrivate
+        Qt::GuiPrivate
+    PUBLIC_LIBRARIES
+        Qt::Core
+        Qt::Gui
+    PRIVATE_MODULE_INTERFACE
+        Qt::CorePrivate
+        Qt::GuiPrivate
+    PRECOMPILED_HEADER
+        "kernel/qt_widgets_pch.h"
+)
+
+add_dependencies(Widgets ${QT_CMAKE_EXPORT_NAMESPACE}::uic)  # special case
+
+# Resources:
+set(qstyle_resource_files
+    "images/cdr-128.png"
+    "images/cdr-16.png"
+    "images/cdr-32.png"
+    "images/cleartext-16.png"
+    "images/cleartext-32.png"
+    "images/closedock-10.png"
+    "images/closedock-16.png"
+    "images/closedock-20.png"
+    "images/closedock-32.png"
+    "images/closedock-48.png"
+    "images/closedock-64.png"
+    "images/computer-16.png"
+    "images/computer-32.png"
+    "images/desktop-16.png"
+    "images/desktop-32.png"
+    "images/dirclosed-128.png"
+    "images/dirclosed-16.png"
+    "images/dirclosed-32.png"
+    "images/dirlink-128.png"
+    "images/dirlink-16.png"
+    "images/dirlink-32.png"
+    "images/diropen-128.png"
+    "images/diropen-16.png"
+    "images/diropen-32.png"
+    "images/down-128.png"
+    "images/down-16.png"
+    "images/down-32.png"
+    "images/dvd-128.png"
+    "images/dvd-16.png"
+    "images/dvd-32.png"
+    "images/file-128.png"
+    "images/file-16.png"
+    "images/file-32.png"
+    "images/filecontents-128.png"
+    "images/filecontents-16.png"
+    "images/filecontents-32.png"
+    "images/fileinfo-128.png"
+    "images/fileinfo-16.png"
+    "images/fileinfo-32.png"
+    "images/filelink-128.png"
+    "images/filelink-16.png"
+    "images/filelink-32.png"
+    "images/floppy-128.png"
+    "images/floppy-16.png"
+    "images/floppy-32.png"
+    "images/fontbitmap-16.png"
+    "images/fonttruetype-16.png"
+    "images/fusion_groupbox.png"
+    "images/harddrive-128.png"
+    "images/harddrive-16.png"
+    "images/harddrive-32.png"
+    "images/left-128.png"
+    "images/left-16.png"
+    "images/left-32.png"
+    "images/media-pause-16.png"
+    "images/media-pause-32.png"
+    "images/media-play-16.png"
+    "images/media-play-32.png"
+    "images/media-seek-backward-16.png"
+    "images/media-seek-backward-32.png"
+    "images/media-seek-forward-16.png"
+    "images/media-seek-forward-32.png"
+    "images/media-skip-backward-16.png"
+    "images/media-skip-backward-32.png"
+    "images/media-skip-forward-16.png"
+    "images/media-skip-forward-32.png"
+    "images/media-stop-16.png"
+    "images/media-stop-32.png"
+    "images/media-volume-16.png"
+    "images/media-volume-muted-16.png"
+    "images/networkdrive-128.png"
+    "images/networkdrive-16.png"
+    "images/networkdrive-32.png"
+    "images/newdirectory-128.png"
+    "images/newdirectory-16.png"
+    "images/newdirectory-32.png"
+    "images/normalizedockup-10.png"
+    "images/normalizedockup-16.png"
+    "images/normalizedockup-20.png"
+    "images/normalizedockup-32.png"
+    "images/normalizedockup-48.png"
+    "images/normalizedockup-64.png"
+    "images/parentdir-128.png"
+    "images/parentdir-16.png"
+    "images/parentdir-32.png"
+    "images/refresh-24.png"
+    "images/refresh-32.png"
+    "images/right-128.png"
+    "images/right-16.png"
+    "images/right-32.png"
+    "images/standardbutton-apply-128.png"
+    "images/standardbutton-apply-16.png"
+    "images/standardbutton-apply-32.png"
+    "images/standardbutton-cancel-128.png"
+    "images/standardbutton-cancel-16.png"
+    "images/standardbutton-cancel-32.png"
+    "images/standardbutton-clear-128.png"
+    "images/standardbutton-clear-16.png"
+    "images/standardbutton-clear-32.png"
+    "images/standardbutton-close-128.png"
+    "images/standardbutton-close-16.png"
+    "images/standardbutton-close-32.png"
+    "images/standardbutton-closetab-16.png"
+    "images/standardbutton-closetab-down-16.png"
+    "images/standardbutton-closetab-hover-16.png"
+    "images/standardbutton-delete-128.png"
+    "images/standardbutton-delete-16.png"
+    "images/standardbutton-delete-32.png"
+    "images/standardbutton-help-128.png"
+    "images/standardbutton-help-16.png"
+    "images/standardbutton-help-32.png"
+    "images/standardbutton-no-128.png"
+    "images/standardbutton-no-16.png"
+    "images/standardbutton-no-32.png"
+    "images/standardbutton-ok-128.png"
+    "images/standardbutton-ok-16.png"
+    "images/standardbutton-ok-32.png"
+    "images/standardbutton-open-128.png"
+    "images/standardbutton-open-16.png"
+    "images/standardbutton-open-32.png"
+    "images/standardbutton-save-128.png"
+    "images/standardbutton-save-16.png"
+    "images/standardbutton-save-32.png"
+    "images/standardbutton-yes-128.png"
+    "images/standardbutton-yes-16.png"
+    "images/standardbutton-yes-32.png"
+    "images/stop-24.png"
+    "images/stop-32.png"
+    "images/titlebar-contexthelp-16.png"
+    "images/titlebar-contexthelp-32.png"
+    "images/titlebar-contexthelp-48.png"
+    "images/titlebar-max-16.png"
+    "images/titlebar-max-32.png"
+    "images/titlebar-max-48.png"
+    "images/titlebar-min-16.png"
+    "images/titlebar-min-32.png"
+    "images/titlebar-min-48.png"
+    "images/titlebar-shade-16.png"
+    "images/titlebar-shade-32.png"
+    "images/titlebar-shade-48.png"
+    "images/titlebar-unshade-16.png"
+    "images/titlebar-unshade-32.png"
+    "images/titlebar-unshade-48.png"
+    "images/toolbar-ext-h-16.png"
+    "images/toolbar-ext-h-32.png"
+    "images/toolbar-ext-h-8.png"
+    "images/toolbar-ext-h-rtl-16.png"
+    "images/toolbar-ext-h-rtl-32.png"
+    "images/toolbar-ext-h-rtl-8.png"
+    "images/toolbar-ext-v-10.png"
+    "images/toolbar-ext-v-20.png"
+    "images/toolbar-ext-v-5.png"
+    "images/trash-128.png"
+    "images/trash-16.png"
+    "images/trash-32.png"
+    "images/up-128.png"
+    "images/up-16.png"
+    "images/up-32.png"
+    "images/viewdetailed-128.png"
+    "images/viewdetailed-16.png"
+    "images/viewdetailed-32.png"
+    "images/viewlist-128.png"
+    "images/viewlist-16.png"
+    "images/viewlist-32.png"
+)
+
+qt_add_resource(Widgets "qstyle"
+    PREFIX
+        "/qt-project.org/styles/commonstyle"
+    BASE
+        "styles"
+    FILES
+        ${qstyle_resource_files}
+)
+set_source_files_properties("styles/images/closedock-down-macstyle-16.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/closedock-down-16.png"
+)
+set_source_files_properties("styles/images/closedock-macstyle-16.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/closedock-16.png"
+)
+set_source_files_properties("styles/images/dockdock-down-macstyle-16.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/dockdock-down-16.png"
+)
+set_source_files_properties("styles/images/dockdock-macstyle-16.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/dockdock-16.png"
+)
+set_source_files_properties("styles/images/toolbar-ext-macstyle.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/toolbar-ext.png"
+)
+set_source_files_properties("styles/images/toolbar-ext-macstyle@2x.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/toolbar-ext@2x.png"
+)
+set(qstyle1_resource_files
+    "images/closedock-down-macstyle-16.png"
+    "images/closedock-macstyle-16.png"
+    "images/dockdock-down-macstyle-16.png"
+    "images/dockdock-macstyle-16.png"
+    "images/toolbar-ext-macstyle.png"
+    "images/toolbar-ext-macstyle@2x.png"
+)
+
+qt_add_resource(Widgets "qstyle1"
+    PREFIX
+        "/qt-project.org/styles/macstyle"
+    BASE
+        "styles"
+    FILES
+        ${qstyle1_resource_files}
+)
+
+if(QT_FEATURE_reduce_relocations AND UNIX AND GCC)
+    target_link_options(Widgets PRIVATE
+                        "LINKER:--dynamic-list=${CMAKE_CURRENT_LIST_DIR}/QtWidgets.dynlist")
+endif()
+
+#### Keys ignored in scope 1:.:.:widgets.pro:<TRUE>:
+# MODULE_CONFIG = "uic"
+# QMAKE_LIBS = "$$QMAKE_LIBS_GUI"
+
+## Scopes:
+#####################################################################
+
+qt_extend_target(Widgets CONDITION MSVC AND (TEST_architecture_arch STREQUAL "i386")
+    LINK_OPTIONS
+        "/BASE:0x65000000"
+)
+
+qt_extend_target(Widgets CONDITION APPLE_OSX
+    SOURCES
+        kernel/qmacgesturerecognizer.cpp kernel/qmacgesturerecognizer_p.h
+        widgets/qmaccocoaviewcontainer_mac.h widgets/qmaccocoaviewcontainer_mac.mm
+        widgets/qmacnativewidget_mac.h widgets/qmacnativewidget_mac.mm
+    LIBRARIES
+        ${FWAppKit}
+        z
+)
+
+qt_extend_target(Widgets CONDITION WIN32 AND NOT WINRT
+    LIBRARIES
+        dwmapi
+        shell32
+        uxtheme
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_graphicseffect
+    SOURCES
+        effects/qgraphicseffect.cpp effects/qgraphicseffect.h effects/qgraphicseffect_p.h
+        effects/qpixmapfilter.cpp effects/qpixmapfilter_p.h
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_action
+    SOURCES
+        kernel/qaction.cpp kernel/qaction.h kernel/qaction_p.h
+        kernel/qactiongroup.cpp kernel/qactiongroup.h
+        kernel/qwidgetaction.cpp kernel/qwidgetaction.h kernel/qwidgetaction_p.h
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_formlayout
+    SOURCES
+        kernel/qformlayout.cpp kernel/qformlayout.h
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_shortcut
+    SOURCES
+        kernel/qshortcut.cpp kernel/qshortcut.h
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_tooltip
+    SOURCES
+        kernel/qtooltip.cpp kernel/qtooltip.h
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_whatsthis
+    SOURCES
+        kernel/qwhatsthis.cpp kernel/qwhatsthis.h
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_animation
+    SOURCES
+        styles/qstyleanimation.cpp styles/qstyleanimation_p.h
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_style_windows
+    SOURCES
+        styles/qwindowsstyle.cpp styles/qwindowsstyle_p.h
+        styles/qwindowsstyle_p_p.h
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_style_fusion
+    SOURCES
+        styles/qfusionstyle.cpp styles/qfusionstyle_p.h
+        styles/qfusionstyle_p_p.h
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_abstractbutton
+    SOURCES
+        widgets/qabstractbutton.cpp widgets/qabstractbutton.h widgets/qabstractbutton_p.h
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_abstractslider
+    SOURCES
+        widgets/qabstractslider.cpp widgets/qabstractslider.h widgets/qabstractslider_p.h
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_buttongroup
+    SOURCES
+        widgets/qbuttongroup.cpp widgets/qbuttongroup.h widgets/qbuttongroup_p.h
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_calendarwidget
+    SOURCES
+        widgets/qcalendarwidget.cpp widgets/qcalendarwidget.h
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_checkbox
+    SOURCES
+        widgets/qcheckbox.cpp widgets/qcheckbox.h
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_combobox
+    SOURCES
+        widgets/qcombobox.cpp widgets/qcombobox.h widgets/qcombobox_p.h
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_commandlinkbutton
+    SOURCES
+        widgets/qcommandlinkbutton.cpp widgets/qcommandlinkbutton.h
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_datetimeedit
+    SOURCES
+        widgets/qdatetimeedit.cpp widgets/qdatetimeedit.h widgets/qdatetimeedit_p.h
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_dial
+    SOURCES
+        widgets/qdial.cpp widgets/qdial.h
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_dockwidget
+    SOURCES
+        widgets/qdockarealayout.cpp widgets/qdockarealayout_p.h
+        widgets/qdockwidget.cpp widgets/qdockwidget.h widgets/qdockwidget_p.h
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_effects
+    SOURCES
+        widgets/qeffects.cpp widgets/qeffects_p.h
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_fontcombobox
+    SOURCES
+        widgets/qfontcombobox.cpp widgets/qfontcombobox.h
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_groupbox
+    SOURCES
+        widgets/qgroupbox.cpp widgets/qgroupbox.h
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_keysequenceedit
+    SOURCES
+        widgets/qkeysequenceedit.cpp widgets/qkeysequenceedit.h widgets/qkeysequenceedit_p.h
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_label
+    SOURCES
+        widgets/qlabel.cpp widgets/qlabel.h widgets/qlabel_p.h
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_lcdnumber
+    SOURCES
+        widgets/qlcdnumber.cpp widgets/qlcdnumber.h
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_lineedit
+    SOURCES
+        widgets/qlineedit.cpp widgets/qlineedit.h widgets/qlineedit_p.cpp widgets/qlineedit_p.h
+        widgets/qwidgetlinecontrol.cpp widgets/qwidgetlinecontrol_p.h
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_mainwindow
+    SOURCES
+        widgets/qmainwindow.cpp widgets/qmainwindow.h
+        widgets/qmainwindowlayout.cpp widgets/qmainwindowlayout_p.h
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_mdiarea
+    SOURCES
+        widgets/qmdiarea.cpp widgets/qmdiarea.h widgets/qmdiarea_p.h
+        widgets/qmdisubwindow.cpp widgets/qmdisubwindow.h widgets/qmdisubwindow_p.h
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_menu
+    SOURCES
+        widgets/qmenu.cpp widgets/qmenu.h widgets/qmenu_p.h
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_menubar
+    SOURCES
+        widgets/qmenubar.cpp widgets/qmenubar.h widgets/qmenubar_p.h
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_progressbar
+    SOURCES
+        widgets/qprogressbar.cpp widgets/qprogressbar.h
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_pushbutton
+    SOURCES
+        widgets/qpushbutton.cpp widgets/qpushbutton.h widgets/qpushbutton_p.h
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_radiobutton
+    SOURCES
+        widgets/qradiobutton.cpp widgets/qradiobutton.h
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_resizehandler
+    SOURCES
+        widgets/qwidgetresizehandler.cpp widgets/qwidgetresizehandler_p.h
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_dialogbuttonbox
+    SOURCES
+        widgets/qdialogbuttonbox.cpp widgets/qdialogbuttonbox.h
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_rubberband
+    SOURCES
+        widgets/qrubberband.cpp widgets/qrubberband.h
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_scrollarea
+    SOURCES
+        widgets/qscrollarea.cpp widgets/qscrollarea.h widgets/qscrollarea_p.h
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_scrollbar
+    SOURCES
+        widgets/qscrollbar.cpp widgets/qscrollbar.h widgets/qscrollbar_p.h
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_sizegrip
+    SOURCES
+        widgets/qsizegrip.cpp widgets/qsizegrip.h
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_slider
+    SOURCES
+        widgets/qslider.cpp widgets/qslider.h
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_spinbox
+    SOURCES
+        widgets/qabstractspinbox.cpp widgets/qabstractspinbox.h widgets/qabstractspinbox_p.h
+        widgets/qspinbox.cpp widgets/qspinbox.h
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_splashscreen
+    SOURCES
+        widgets/qsplashscreen.cpp widgets/qsplashscreen.h
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_splitter
+    SOURCES
+        widgets/qsplitter.cpp widgets/qsplitter.h widgets/qsplitter_p.h
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_stackedwidget
+    SOURCES
+        widgets/qstackedwidget.cpp widgets/qstackedwidget.h
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_statusbar
+    SOURCES
+        widgets/qstatusbar.cpp widgets/qstatusbar.h
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_tabbar
+    SOURCES
+        widgets/qtabbar.cpp widgets/qtabbar.h widgets/qtabbar_p.h
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_textedit
+    SOURCES
+        widgets/qplaintextedit.cpp widgets/qplaintextedit.h widgets/qplaintextedit_p.h
+        widgets/qtextedit.cpp widgets/qtextedit.h widgets/qtextedit_p.h
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_textbrowser
+    SOURCES
+        widgets/qtextbrowser.cpp widgets/qtextbrowser.h
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_tabwidget
+    SOURCES
+        widgets/qtabwidget.cpp widgets/qtabwidget.h
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_toolbar
+    SOURCES
+        widgets/qtoolbar.cpp widgets/qtoolbar.h widgets/qtoolbar_p.h
+        widgets/qtoolbararealayout.cpp widgets/qtoolbararealayout_p.h
+        widgets/qtoolbarlayout.cpp widgets/qtoolbarlayout_p.h
+        widgets/qtoolbarseparator.cpp widgets/qtoolbarseparator_p.h
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_toolbox
+    SOURCES
+        widgets/qtoolbox.cpp widgets/qtoolbox.h
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_toolbutton
+    SOURCES
+        widgets/qtoolbarextension.cpp widgets/qtoolbarextension_p.h
+        widgets/qtoolbutton.cpp widgets/qtoolbutton.h
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_widgettextcontrol
+    SOURCES
+        widgets/qwidgettextcontrol.cpp widgets/qwidgettextcontrol_p.h
+        widgets/qwidgettextcontrol_p_p.h
+)
+
+qt_extend_target(Widgets CONDITION APPLE_OSX AND (QT_FEATURE_menu OR QT_FEATURE_menubar)
+    SOURCES
+        widgets/qmenu_mac.mm
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_colordialog
+    SOURCES
+        dialogs/qcolordialog.cpp dialogs/qcolordialog.h
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_dialog
+    SOURCES
+        dialogs/qdialog.cpp dialogs/qdialog.h dialogs/qdialog_p.h
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_errormessage
+    SOURCES
+        dialogs/qerrormessage.cpp dialogs/qerrormessage.h
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_filedialog
+    SOURCES
+        dialogs/qfiledialog.cpp dialogs/qfiledialog.h dialogs/qfiledialog.ui dialogs/qfiledialog_p.h
+        dialogs/qsidebar.cpp dialogs/qsidebar_p.h
+    ENABLE_AUTOGEN_TOOLS
+        uic
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_filesystemmodel
+    SOURCES
+        dialogs/qfileinfogatherer.cpp dialogs/qfileinfogatherer_p.h
+        dialogs/qfilesystemmodel.cpp dialogs/qfilesystemmodel.h dialogs/qfilesystemmodel_p.h
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_fontdialog
+    SOURCES
+        dialogs/qfontdialog.cpp dialogs/qfontdialog.h dialogs/qfontdialog_p.h
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_fscompleter
+    SOURCES
+        dialogs/qfscompleter_p.h
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_inputdialog
+    SOURCES
+        dialogs/qinputdialog.cpp dialogs/qinputdialog.h
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_messagebox
+    SOURCES
+        dialogs/qmessagebox.cpp dialogs/qmessagebox.h
+)
+
+if(QT_FEATURE_messagebox)
+    # Resources:
+    set(qmessagebox_resource_files
+        "images/qtlogo-64.png"
+    )
+
+    qt_add_resource(Widgets "qmessagebox"
+        PREFIX
+            "/qt-project.org/qmessagebox"
+        BASE
+            "dialogs"
+        FILES
+            ${qmessagebox_resource_files}
+    )
+endif()
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_progressdialog
+    SOURCES
+        dialogs/qprogressdialog.cpp dialogs/qprogressdialog.h
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_wizard
+    SOURCES
+        dialogs/qwizard.cpp dialogs/qwizard.h
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_wizard AND WIN32
+    SOURCES
+        dialogs/qwizard_win.cpp dialogs/qwizard_win_p.h
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_accessibility
+    SOURCES
+        accessible/complexwidgets.cpp accessible/complexwidgets_p.h
+        accessible/qaccessiblemenu.cpp accessible/qaccessiblemenu_p.h
+        accessible/qaccessiblewidget.cpp accessible/qaccessiblewidget.h
+        accessible/qaccessiblewidgetfactory.cpp accessible/qaccessiblewidgetfactory_p.h
+        accessible/qaccessiblewidgets.cpp accessible/qaccessiblewidgets_p.h
+        accessible/rangecontrols.cpp accessible/rangecontrols_p.h
+        accessible/simplewidgets.cpp accessible/simplewidgets_p.h
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_accessibility AND QT_FEATURE_itemviews
+    SOURCES
+        accessible/itemviews.cpp accessible/itemviews_p.h
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_itemviews
+    SOURCES
+        itemviews/qabstractitemdelegate.cpp itemviews/qabstractitemdelegate.h itemviews/qabstractitemdelegate_p.h
+        itemviews/qabstractitemview.cpp itemviews/qabstractitemview.h itemviews/qabstractitemview_p.h
+        itemviews/qbsptree.cpp itemviews/qbsptree_p.h
+        itemviews/qheaderview.cpp itemviews/qheaderview.h itemviews/qheaderview_p.h
+        itemviews/qitemdelegate.cpp itemviews/qitemdelegate.h
+        itemviews/qitemeditorfactory.cpp itemviews/qitemeditorfactory.h itemviews/qitemeditorfactory_p.h
+        itemviews/qstyleditemdelegate.cpp itemviews/qstyleditemdelegate.h
+        itemviews/qwidgetitemdata_p.h
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_columnview
+    SOURCES
+        itemviews/qcolumnview.cpp itemviews/qcolumnview.h itemviews/qcolumnview_p.h
+        itemviews/qcolumnviewgrip.cpp itemviews/qcolumnviewgrip_p.h
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_datawidgetmapper
+    SOURCES
+        itemviews/qdatawidgetmapper.cpp itemviews/qdatawidgetmapper.h
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_dirmodel
+    SOURCES
+        itemviews/qdirmodel.cpp itemviews/qdirmodel.h
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_listview
+    SOURCES
+        itemviews/qlistview.cpp itemviews/qlistview.h itemviews/qlistview_p.h
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_listwidget
+    SOURCES
+        itemviews/qlistwidget.cpp itemviews/qlistwidget.h itemviews/qlistwidget_p.h
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_tableview
+    SOURCES
+        itemviews/qtableview.cpp itemviews/qtableview.h itemviews/qtableview_p.h
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_tablewidget
+    SOURCES
+        itemviews/qtablewidget.cpp itemviews/qtablewidget.h itemviews/qtablewidget_p.h
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_treeview
+    SOURCES
+        itemviews/qtreeview.cpp itemviews/qtreeview.h itemviews/qtreeview_p.h
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_treewidget
+    SOURCES
+        itemviews/qtreewidget.cpp itemviews/qtreewidget.h itemviews/qtreewidget_p.h
+        itemviews/qtreewidgetitemiterator.cpp itemviews/qtreewidgetitemiterator.h
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_graphicsview
+    SOURCES
+        graphicsview/qgraph_p.h
+        graphicsview/qgraphicsanchorlayout.cpp graphicsview/qgraphicsanchorlayout.h graphicsview/qgraphicsanchorlayout_p.cpp graphicsview/qgraphicsanchorlayout_p.h
+        graphicsview/qgraphicsgridlayout.cpp graphicsview/qgraphicsgridlayout.h
+        graphicsview/qgraphicsgridlayoutengine.cpp graphicsview/qgraphicsgridlayoutengine_p.h
+        graphicsview/qgraphicsitem.cpp graphicsview/qgraphicsitem.h graphicsview/qgraphicsitem_p.h
+        graphicsview/qgraphicslayout.cpp graphicsview/qgraphicslayout.h graphicsview/qgraphicslayout_p.cpp graphicsview/qgraphicslayout_p.h
+        graphicsview/qgraphicslayoutitem.cpp graphicsview/qgraphicslayoutitem.h graphicsview/qgraphicslayoutitem_p.h
+        graphicsview/qgraphicslayoutstyleinfo.cpp graphicsview/qgraphicslayoutstyleinfo_p.h
+        graphicsview/qgraphicslinearlayout.cpp graphicsview/qgraphicslinearlayout.h
+        graphicsview/qgraphicsproxywidget.cpp graphicsview/qgraphicsproxywidget.h graphicsview/qgraphicsproxywidget_p.h
+        graphicsview/qgraphicsscene.cpp graphicsview/qgraphicsscene.h graphicsview/qgraphicsscene_p.h
+        graphicsview/qgraphicsscene_bsp.cpp graphicsview/qgraphicsscene_bsp_p.h
+        graphicsview/qgraphicsscenebsptreeindex.cpp graphicsview/qgraphicsscenebsptreeindex_p.h
+        graphicsview/qgraphicssceneevent.cpp graphicsview/qgraphicssceneevent.h
+        graphicsview/qgraphicssceneindex.cpp graphicsview/qgraphicssceneindex_p.h
+        graphicsview/qgraphicsscenelinearindex.cpp graphicsview/qgraphicsscenelinearindex_p.h
+        graphicsview/qgraphicstransform.cpp graphicsview/qgraphicstransform.h graphicsview/qgraphicstransform_p.h
+        graphicsview/qgraphicsview.cpp graphicsview/qgraphicsview.h graphicsview/qgraphicsview_p.h
+        graphicsview/qgraphicswidget.cpp graphicsview/qgraphicswidget.h graphicsview/qgraphicswidget_p.cpp graphicsview/qgraphicswidget_p.h
+        graphicsview/qsimplex_p.cpp graphicsview/qsimplex_p.h
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_easingcurve AND QT_FEATURE_graphicsview
+    SOURCES
+        graphicsview/qgraphicsitemanimation.cpp graphicsview/qgraphicsitemanimation.h
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_completer
+    SOURCES
+        util/qcompleter.cpp util/qcompleter.h util/qcompleter_p.h
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_scroller
+    SOURCES
+        util/qflickgesture.cpp util/qflickgesture_p.h
+        util/qscroller.cpp util/qscroller.h util/qscroller_p.h
+        util/qscrollerproperties.cpp util/qscrollerproperties.h util/qscrollerproperties_p.h
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_undocommand
+    SOURCES
+        util/qundostack.cpp util/qundostack.h util/qundostack_p.h
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_undogroup
+    SOURCES
+        util/qundogroup.cpp util/qundogroup.h
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_undoview
+    SOURCES
+        util/qundoview.cpp util/qundoview.h
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_xcb
+    SOURCES
+        util/qsystemtrayicon_x11.cpp
+)
+
+qt_extend_target(Widgets CONDITION NOT QT_FEATURE_xcb
+    SOURCES
+        util/qsystemtrayicon_qpa.cpp
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_statemachine
+    SOURCES
+        statemachine/qguistatemachine.cpp
+)
+
+qt_extend_target(Widgets CONDITION QT_FEATURE_qeventtransition
+    SOURCES
+        statemachine/qbasickeyeventtransition.cpp statemachine/qbasickeyeventtransition_p.h
+        statemachine/qbasicmouseeventtransition.cpp statemachine/qbasicmouseeventtransition_p.h
+        statemachine/qkeyeventtransition.cpp statemachine/qkeyeventtransition.h
+        statemachine/qmouseeventtransition.cpp statemachine/qmouseeventtransition.h
+)
+
+
+qt_create_tracepoints(Widgets qtwidgets.tracepoints)
+qt_add_docs(Widgets
+    doc/qtwidgets.qdocconf
+)
+
diff --git a/src/widgets/Qt5WidgetsConfigExtras.cmake.in b/src/widgets/Qt5WidgetsConfigExtras.cmake.in
deleted file mode 100644
index 236d1d4159..0000000000
--- a/src/widgets/Qt5WidgetsConfigExtras.cmake.in
+++ /dev/null
@@ -1,30 +0,0 @@
-
-if (NOT TARGET Qt5::uic)
-    add_executable(Qt5::uic IMPORTED)
-
-!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
-    set(imported_location \"${_qt5Widgets_install_prefix}/$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\")
-!!ELSE
-    set(imported_location \"$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\")
-!!ENDIF
-    _qt5_Widgets_check_file_exists(${imported_location})
-
-    set_target_properties(Qt5::uic PROPERTIES
-        IMPORTED_LOCATION ${imported_location}
-    )
-endif()
-
-include(\"${CMAKE_CURRENT_LIST_DIR}/Qt5Widgets_AccessibleFactory.cmake\" OPTIONAL)
-
-set(Qt5Widgets_UIC_EXECUTABLE Qt5::uic)
-
-# Create versionless tool targets.
-foreach(__qt_tool uic)
-    if(NOT \"${QT_NO_CREATE_VERSIONLESS_TARGETS}\" AND NOT TARGET Qt::${__qt_tool}
-       AND TARGET Qt5::${__qt_tool})
-        add_executable(Qt::${__qt_tool} IMPORTED)
-        get_target_property(__qt_imported_location Qt5::${__qt_tool} IMPORTED_LOCATION)
-        set_target_properties(Qt::${__qt_tool}
-                              PROPERTIES IMPORTED_LOCATION \"${__qt_imported_location}\")
-    endif()
-endforeach()
diff --git a/src/widgets/Qt5WidgetsMacros.cmake b/src/widgets/Qt5WidgetsMacros.cmake
deleted file mode 100644
index 35d2a2dc54..0000000000
--- a/src/widgets/Qt5WidgetsMacros.cmake
+++ /dev/null
@@ -1,80 +0,0 @@
-#=============================================================================
-# Copyright 2005-2011 Kitware, Inc.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# * Redistributions of source code must retain the above copyright
-#   notice, this list of conditions and the following disclaimer.
-#
-# * Redistributions in binary form must reproduce the above copyright
-#   notice, this list of conditions and the following disclaimer in the
-#   documentation and/or other materials provided with the distribution.
-#
-# * Neither the name of Kitware, Inc. nor the names of its
-#   contributors may be used to endorse or promote products derived
-#   from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#=============================================================================
-
-######################################
-#
-#       Macros for building Qt files
-#
-######################################
-
-include(CMakeParseArguments)
-
-
-# qt5_wrap_ui(outfiles inputfile ... )
-
-function(qt5_wrap_ui outfiles )
-    set(options)
-    set(oneValueArgs)
-    set(multiValueArgs OPTIONS)
-
-    cmake_parse_arguments(_WRAP_UI "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
-
-    set(ui_files ${_WRAP_UI_UNPARSED_ARGUMENTS})
-    set(ui_options ${_WRAP_UI_OPTIONS})
-
-    foreach(it ${ui_files})
-        get_filename_component(outfile ${it} NAME_WE)
-        get_filename_component(infile ${it} ABSOLUTE)
-        set(outfile ${CMAKE_CURRENT_BINARY_DIR}/ui_${outfile}.h)
-        add_custom_command(OUTPUT ${outfile}
-          COMMAND ${Qt5Widgets_UIC_EXECUTABLE}
-          ARGS ${ui_options} -o ${outfile} ${infile}
-          MAIN_DEPENDENCY ${infile} VERBATIM)
-        set_source_files_properties(${infile} PROPERTIES SKIP_AUTOUIC ON)
-        set_source_files_properties(${outfile} PROPERTIES SKIP_AUTOMOC ON)
-        set_source_files_properties(${outfile} PROPERTIES SKIP_AUTOUIC ON)
-        list(APPEND ${outfiles} ${outfile})
-    endforeach()
-    set(${outfiles} ${${outfiles}} PARENT_SCOPE)
-endfunction()
-
-# This will override the CMake upstream command, because that one is for Qt 3.
-if(NOT QT_NO_CREATE_VERSIONLESS_FUNCTIONS)
-    function(qt_wrap_ui outfiles)
-        if(QT_DEFAULT_MAJOR_VERSION EQUAL 5)
-            qt5_wrap_ui("${outfiles}" ${ARGN})
-        elseif(QT_DEFAULT_MAJOR_VERSION EQUAL 6)
-            qt6_wrap_ui("${outfiles}" ${ARGN})
-        endif()
-        set("${outfiles}" "${${outfiles}}" PARENT_SCOPE)
-    endfunction()
-endif()
diff --git a/src/widgets/Qt6WidgetsMacros.cmake b/src/widgets/Qt6WidgetsMacros.cmake
new file mode 100644
index 0000000000..aa8133ba47
--- /dev/null
+++ b/src/widgets/Qt6WidgetsMacros.cmake
@@ -0,0 +1,81 @@
+#=============================================================================
+# Copyright 2005-2011 Kitware, Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# * Redistributions of source code must retain the above copyright
+#   notice, this list of conditions and the following disclaimer.
+#
+# * Redistributions in binary form must reproduce the above copyright
+#   notice, this list of conditions and the following disclaimer in the
+#   documentation and/or other materials provided with the distribution.
+#
+# * Neither the name of Kitware, Inc. nor the names of its
+#   contributors may be used to endorse or promote products derived
+#   from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#=============================================================================
+
+######################################
+#
+#       Macros for building Qt files
+#
+######################################
+
+include(CMakeParseArguments)
+
+
+# qt6_wrap_ui(outfiles inputfile ... )
+
+function(qt6_wrap_ui outfiles )
+    set(options)
+    set(oneValueArgs)
+    set(multiValueArgs OPTIONS)
+
+    cmake_parse_arguments(_WRAP_UI "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
+
+    set(ui_files ${_WRAP_UI_UNPARSED_ARGUMENTS})
+    set(ui_options ${_WRAP_UI_OPTIONS})
+
+    foreach(it ${ui_files})
+        get_filename_component(outfile ${it} NAME_WE)
+        get_filename_component(infile ${it} ABSOLUTE)
+        set(outfile ${CMAKE_CURRENT_BINARY_DIR}/ui_${outfile}.h)
+        add_custom_command(OUTPUT ${outfile}
+          DEPENDS ${QT_CMAKE_EXPORT_NAMESPACE}::uic
+          COMMAND ${QT_CMAKE_EXPORT_NAMESPACE}::uic
+          ARGS ${ui_options} -o ${outfile} ${infile}
+          MAIN_DEPENDENCY ${infile} VERBATIM)
+        set_source_files_properties(${infile} PROPERTIES SKIP_AUTOUIC ON)
+        set_source_files_properties(${outfile} PROPERTIES SKIP_AUTOMOC ON)
+        set_source_files_properties(${outfile} PROPERTIES SKIP_AUTOUIC ON)
+        list(APPEND ${outfiles} ${outfile})
+    endforeach()
+    set(${outfiles} ${${outfiles}} PARENT_SCOPE)
+endfunction()
+
+# This will override the CMake upstream command, because that one is for Qt 3.
+if(NOT QT_NO_CREATE_VERSIONLESS_FUNCTIONS)
+    function(qt_wrap_ui outfiles)
+        if(QT_DEFAULT_MAJOR_VERSION EQUAL 5)
+            qt5_wrap_ui("${outfiles}" ${ARGN})
+        elseif(QT_DEFAULT_MAJOR_VERSION EQUAL 6)
+            qt6_wrap_ui("${outfiles}" ${ARGN})
+        endif()
+        set("${outfiles}" "${${outfiles}}" PARENT_SCOPE)
+    endfunction()
+endif()
diff --git a/src/widgets/accessible/qaccessiblewidget.cpp b/src/widgets/accessible/qaccessiblewidget.cpp
index 68ad855c7c..1a7372728d 100644
--- a/src/widgets/accessible/qaccessiblewidget.cpp
+++ b/src/widgets/accessible/qaccessiblewidget.cpp
@@ -41,7 +41,6 @@
 
 #ifndef QT_NO_ACCESSIBILITY
 
-#include "qaction.h"
 #include "qapplication.h"
 #if QT_CONFIG(groupbox)
 #include "qgroupbox.h"
diff --git a/src/widgets/accessible/rangecontrols.cpp b/src/widgets/accessible/rangecontrols.cpp
index b5b8608418..6c12b553b4 100644
--- a/src/widgets/accessible/rangecontrols.cpp
+++ b/src/widgets/accessible/rangecontrols.cpp
@@ -254,7 +254,6 @@ QAccessibleSpinBox::QAccessibleSpinBox(QWidget *w)
 {
     Q_ASSERT(spinBox());
     addControllingSignal(QLatin1String("valueChanged(int)"));
-    addControllingSignal(QLatin1String("valueChanged(QString)"));
 }
 
 /*!
@@ -272,7 +271,6 @@ QAccessibleDoubleSpinBox::QAccessibleDoubleSpinBox(QWidget *widget)
 {
     Q_ASSERT(qobject_cast<QDoubleSpinBox *>(widget));
     addControllingSignal(QLatin1String("valueChanged(double)"));
-    addControllingSignal(QLatin1String("valueChanged(QString)"));
 }
 
 /*!
diff --git a/src/widgets/configure.cmake b/src/widgets/configure.cmake
new file mode 100644
index 0000000000..25af8aea8a
--- /dev/null
+++ b/src/widgets/configure.cmake
@@ -0,0 +1,563 @@
+
+
+#### Inputs
+
+
+
+#### Libraries
+
+qt_find_package(GTK3 PROVIDED_TARGETS PkgConfig::GTK3)
+
+
+#### Tests
+
+
+
+#### Features
+
+qt_feature("gtk3" PRIVATE
+    LABEL "GTK+"
+    AUTODETECT NOT APPLE
+    CONDITION QT_FEATURE_glib AND GTK3_FOUND
+)
+qt_feature("style-fusion" PRIVATE
+    LABEL "Fusion"
+)
+qt_feature("style-mac" PRIVATE
+    LABEL "macOS"
+    CONDITION APPLE_OSX AND QT_FEATURE_animation
+)
+qt_feature("style-windows" PRIVATE
+    LABEL "Windows"
+)
+qt_feature("style-windowsvista" PRIVATE
+    LABEL "WindowsVista"
+    CONDITION QT_FEATURE_style_windows AND QT_FEATURE_animation AND WIN32 AND NOT WINRT
+)
+qt_feature("style-android" PRIVATE
+    LABEL "Android"
+    AUTODETECT ANDROID
+)
+qt_feature("style-stylesheet" PUBLIC
+    SECTION "Styles"
+    LABEL "QStyleSheetStyle"
+    PURPOSE "Provides a widget style which is configurable via CSS."
+    CONDITION QT_FEATURE_style_windows AND QT_FEATURE_properties AND QT_FEATURE_cssparser
+)
+qt_feature_definition("style-stylesheet" "QT_NO_STYLE_STYLESHEET" NEGATE VALUE "1")
+qt_feature("effects" PRIVATE
+    SECTION "Kernel"
+    LABEL "Effects"
+    PURPOSE "Provides special widget effects (e.g. fading and scrolling)."
+)
+qt_feature("filesystemmodel" PUBLIC
+    SECTION "File I/O"
+    LABEL "QFileSystemModel"
+    PURPOSE "Provides a data model for the local filesystem."
+    CONDITION QT_FEATURE_itemmodel
+)
+qt_feature_definition("filesystemmodel" "QT_NO_FILESYSTEMMODEL" NEGATE VALUE "1")
+qt_feature("itemviews" PUBLIC
+    SECTION "ItemViews"
+    LABEL "The Model/View Framework"
+    PURPOSE "Provides the model/view architecture managing the relationship between data and the way it is presented to the user."
+    CONDITION QT_FEATURE_itemmodel AND QT_FEATURE_scrollarea
+)
+qt_feature_definition("itemviews" "QT_NO_ITEMVIEWS" NEGATE VALUE "1")
+qt_feature("treewidget" PUBLIC
+    SECTION "Widgets"
+    LABEL "QTreeWidget"
+    PURPOSE "Provides views using tree models."
+    CONDITION QT_FEATURE_treeview
+)
+qt_feature_definition("treewidget" "QT_NO_TREEWIDGET" NEGATE VALUE "1")
+qt_feature("listwidget" PUBLIC
+    SECTION "Widgets"
+    LABEL "QListWidget"
+    PURPOSE "Provides item-based list widgets."
+    CONDITION QT_FEATURE_listview
+)
+qt_feature_definition("listwidget" "QT_NO_LISTWIDGET" NEGATE VALUE "1")
+qt_feature("tablewidget" PUBLIC
+    SECTION "Widgets"
+    LABEL "QTableWidget"
+    PURPOSE "Provides item-based table views."
+    CONDITION QT_FEATURE_tableview
+)
+qt_feature_definition("tablewidget" "QT_NO_TABLEWIDGET" NEGATE VALUE "1")
+qt_feature("abstractbutton" PUBLIC
+    SECTION "Widgets"
+    LABEL "QAbstractButton"
+    PURPOSE "Abstract base class of button widgets, providing functionality common to buttons."
+)
+qt_feature("commandlinkbutton" PUBLIC
+    SECTION "Widgets"
+    LABEL "QCommandLinkButton"
+    PURPOSE "Provides a Vista style command link button."
+    CONDITION QT_FEATURE_pushbutton
+)
+qt_feature("datetimeedit" PUBLIC
+    SECTION "Widgets"
+    LABEL "QDateTimeEdit"
+    PURPOSE "Supports editing dates and times."
+    CONDITION QT_FEATURE_calendarwidget AND QT_FEATURE_datestring AND QT_FEATURE_textdate AND QT_FEATURE_datetimeparser
+)
+qt_feature_definition("datetimeedit" "QT_NO_DATETIMEEDIT" NEGATE VALUE "1")
+qt_feature("stackedwidget" PUBLIC
+    SECTION "Widgets"
+    LABEL "QStackedWidget"
+    PURPOSE "Provides stacked widgets."
+)
+qt_feature_definition("stackedwidget" "QT_NO_STACKEDWIDGET" NEGATE VALUE "1")
+qt_feature("textbrowser" PUBLIC
+    SECTION "Widgets"
+    LABEL "QTextBrowser"
+    PURPOSE "Supports HTML document browsing."
+    CONDITION QT_FEATURE_textedit
+)
+qt_feature_definition("textbrowser" "QT_NO_TEXTBROWSER" NEGATE VALUE "1")
+qt_feature("splashscreen" PUBLIC
+    SECTION "Widgets"
+    LABEL "QSplashScreen"
+    PURPOSE "Supports splash screens that can be shown during application startup."
+)
+qt_feature_definition("splashscreen" "QT_NO_SPLASHSCREEN" NEGATE VALUE "1")
+qt_feature("splitter" PUBLIC
+    SECTION "Widgets"
+    LABEL "QSplitter"
+    PURPOSE "Provides user controlled splitter widgets."
+)
+qt_feature_definition("splitter" "QT_NO_SPLITTER" NEGATE VALUE "1")
+qt_feature("widgettextcontrol" PRIVATE
+    SECTION "Widgets"
+    LABEL "QWidgetTextControl"
+    PURPOSE "Provides text control functionality to other widgets."
+)
+qt_feature("label" PUBLIC
+    SECTION "Widgets"
+    LABEL "QLabel"
+    PURPOSE "Provides a text or image display."
+    CONDITION QT_FEATURE_widgettextcontrol
+)
+qt_feature("formlayout" PUBLIC
+    SECTION "Widgets"
+    LABEL "QFormLayout"
+    PURPOSE "Manages forms of input widgets and their associated labels."
+    CONDITION QT_FEATURE_label
+)
+qt_feature("lcdnumber" PUBLIC
+    SECTION "Widgets"
+    LABEL "QLCDNumber"
+    PURPOSE "Provides LCD-like digits."
+)
+qt_feature_definition("lcdnumber" "QT_NO_LCDNUMBER" NEGATE VALUE "1")
+qt_feature("menu" PUBLIC
+    SECTION "Widgets"
+    LABEL "QMenu"
+    PURPOSE "Provides popup-menus."
+    CONDITION QT_FEATURE_action AND QT_FEATURE_pushbutton
+)
+qt_feature_definition("menu" "QT_NO_MENU" NEGATE VALUE "1")
+qt_feature("lineedit" PUBLIC
+    SECTION "Widgets"
+    LABEL "QLineEdit"
+    PURPOSE "Provides single-line edits."
+    CONDITION QT_FEATURE_widgettextcontrol
+)
+qt_feature_definition("lineedit" "QT_NO_LINEEDIT" NEGATE VALUE "1")
+qt_feature("radiobutton" PUBLIC
+    SECTION "Widgets"
+    LABEL "QRadioButton"
+    PURPOSE "Provides a radio button with a text label."
+    CONDITION QT_FEATURE_abstractbutton
+)
+qt_feature("spinbox" PUBLIC
+    SECTION "Widgets"
+    LABEL "QSpinBox"
+    PURPOSE "Provides spin boxes handling integers and discrete sets of values."
+    CONDITION QT_FEATURE_lineedit AND QT_FEATURE_validator
+)
+qt_feature_definition("spinbox" "QT_NO_SPINBOX" NEGATE VALUE "1")
+qt_feature("tabbar" PUBLIC
+    SECTION "Widgets"
+    LABEL "QTabBar"
+    PURPOSE "Provides tab bars, e.g., for use in tabbed dialogs."
+    CONDITION QT_FEATURE_toolbutton
+)
+qt_feature_definition("tabbar" "QT_NO_TABBAR" NEGATE VALUE "1")
+qt_feature("tabwidget" PUBLIC
+    SECTION "Widgets"
+    LABEL "QTabWidget"
+    PURPOSE "Supports stacking tabbed widgets."
+    CONDITION QT_FEATURE_tabbar AND QT_FEATURE_stackedwidget
+)
+qt_feature_definition("tabwidget" "QT_NO_TABWIDGET" NEGATE VALUE "1")
+qt_feature("combobox" PUBLIC
+    SECTION "Widgets"
+    LABEL "QComboBox"
+    PURPOSE "Provides drop-down boxes presenting a list of options to the user."
+    CONDITION QT_FEATURE_lineedit AND QT_FEATURE_standarditemmodel AND QT_FEATURE_listview
+)
+qt_feature_definition("combobox" "QT_NO_COMBOBOX" NEGATE VALUE "1")
+qt_feature("fontcombobox" PUBLIC
+    SECTION "Widgets"
+    LABEL "QFontComboBox"
+    PURPOSE "Provides a combobox that lets the user select a font family."
+    CONDITION QT_FEATURE_combobox AND QT_FEATURE_stringlistmodel
+)
+qt_feature_definition("fontcombobox" "QT_NO_FONTCOMBOBOX" NEGATE VALUE "1")
+qt_feature("checkbox" PUBLIC
+    SECTION "Widgets"
+    LABEL "QCheckBox("
+    PURPOSE "Provides a checkbox with a text label."
+    CONDITION QT_FEATURE_abstractbutton
+)
+qt_feature("pushbutton" PUBLIC
+    SECTION "Widgets"
+    LABEL "QPushButton"
+    PURPOSE "Provides a command button."
+    CONDITION QT_FEATURE_abstractbutton AND QT_FEATURE_action
+)
+qt_feature("toolbutton" PUBLIC
+    SECTION "Widgets"
+    LABEL "QToolButton"
+    PURPOSE "Provides quick-access buttons to commands and options."
+    CONDITION QT_FEATURE_abstractbutton AND QT_FEATURE_action
+)
+qt_feature_definition("toolbutton" "QT_NO_TOOLBUTTON" NEGATE VALUE "1")
+qt_feature("toolbar" PUBLIC
+    SECTION "Widgets"
+    LABEL "QToolBar"
+    PURPOSE "Provides movable panels containing a set of controls."
+    CONDITION QT_FEATURE_mainwindow
+)
+qt_feature_definition("toolbar" "QT_NO_TOOLBAR" NEGATE VALUE "1")
+qt_feature("toolbox" PUBLIC
+    SECTION "Widgets"
+    LABEL "QToolBox"
+    PURPOSE "Provides columns of tabbed widget items."
+    CONDITION QT_FEATURE_toolbutton AND QT_FEATURE_scrollarea
+)
+qt_feature_definition("toolbox" "QT_NO_TOOLBOX" NEGATE VALUE "1")
+qt_feature("groupbox" PUBLIC
+    SECTION "Widgets"
+    LABEL "QGroupBox"
+    PURPOSE "Provides widget grouping boxes with frames."
+)
+qt_feature_definition("groupbox" "QT_NO_GROUPBOX" NEGATE VALUE "1")
+qt_feature("buttongroup" PUBLIC
+    SECTION "Widgets"
+    LABEL "QButtonGroup"
+    PURPOSE "Supports organizing groups of button widgets."
+    CONDITION QT_FEATURE_abstractbutton AND QT_FEATURE_groupbox
+)
+qt_feature_definition("buttongroup" "QT_NO_BUTTONGROUP" NEGATE VALUE "1")
+qt_feature("mainwindow" PUBLIC
+    SECTION "Widgets"
+    LABEL "QMainWindow"
+    PURPOSE "Provides main application windows."
+    CONDITION QT_FEATURE_menu AND QT_FEATURE_resizehandler AND QT_FEATURE_toolbutton
+)
+qt_feature_definition("mainwindow" "QT_NO_MAINWINDOW" NEGATE VALUE "1")
+qt_feature("dockwidget" PUBLIC
+    SECTION "Widgets"
+    LABEL "QDockwidget"
+    PURPOSE "Supports docking widgets inside a QMainWindow or floated as a top-level window on the desktop."
+    CONDITION QT_FEATURE_mainwindow
+)
+qt_feature_definition("dockwidget" "QT_NO_DOCKWIDGET" NEGATE VALUE "1")
+qt_feature("mdiarea" PUBLIC
+    SECTION "Widgets"
+    LABEL "QMdiArea"
+    PURPOSE "Provides an area in which MDI windows are displayed."
+    CONDITION QT_FEATURE_scrollarea
+)
+qt_feature_definition("mdiarea" "QT_NO_MDIAREA" NEGATE VALUE "1")
+qt_feature("resizehandler" PUBLIC
+    SECTION "Widgets"
+    LABEL "QWidgetResizeHandler"
+    PURPOSE "Provides an internal resize handler for dock widgets."
+)
+qt_feature_definition("resizehandler" "QT_NO_RESIZEHANDLER" NEGATE VALUE "1")
+qt_feature("statusbar" PUBLIC
+    SECTION "Widgets"
+    LABEL "QStatusBar"
+    PURPOSE "Supports presentation of status information."
+)
+qt_feature_definition("statusbar" "QT_NO_STATUSBAR" NEGATE VALUE "1")
+qt_feature("menubar" PUBLIC
+    SECTION "Widgets"
+    LABEL "QMenuBar"
+    PURPOSE "Provides pull-down menu items."
+    CONDITION QT_FEATURE_menu AND QT_FEATURE_toolbutton
+)
+qt_feature_definition("menubar" "QT_NO_MENUBAR" NEGATE VALUE "1")
+qt_feature("contextmenu" PUBLIC
+    SECTION "Widgets"
+    LABEL "Context menus"
+    PURPOSE "Adds pop-up menus on right mouse click to numerous widgets."
+    CONDITION QT_FEATURE_menu
+)
+qt_feature_definition("contextmenu" "QT_NO_CONTEXTMENU" NEGATE VALUE "1")
+qt_feature("progressbar" PUBLIC
+    SECTION "Widgets"
+    LABEL "QProgressBar"
+    PURPOSE "Supports presentation of operation progress."
+)
+qt_feature_definition("progressbar" "QT_NO_PROGRESSBAR" NEGATE VALUE "1")
+qt_feature("abstractslider" PUBLIC
+    SECTION "Widgets"
+    LABEL "QAbstractSlider"
+    PURPOSE "Common super class for widgets like QScrollBar, QSlider and QDial."
+)
+qt_feature("slider" PUBLIC
+    SECTION "Widgets"
+    LABEL "QSlider"
+    PURPOSE "Provides sliders controlling a bounded value."
+    CONDITION QT_FEATURE_abstractslider
+)
+qt_feature_definition("slider" "QT_NO_SLIDER" NEGATE VALUE "1")
+qt_feature("scrollbar" PUBLIC
+    SECTION "Widgets"
+    LABEL "QScrollBar"
+    PURPOSE "Provides scrollbars allowing the user access parts of a document that is larger than the widget used to display it."
+    CONDITION QT_FEATURE_slider
+)
+qt_feature_definition("scrollbar" "QT_NO_SCROLLBAR" NEGATE VALUE "1")
+qt_feature("dial" PUBLIC
+    SECTION "Widgets"
+    LABEL "QDial"
+    PURPOSE "Provides a rounded range control, e.g., like a speedometer."
+    CONDITION QT_FEATURE_slider
+)
+qt_feature_definition("dial" "QT_NO_DIAL" NEGATE VALUE "1")
+qt_feature("scrollarea" PUBLIC
+    SECTION "Widgets"
+    LABEL "QScrollArea"
+    PURPOSE "Supports scrolling views onto widgets."
+    CONDITION QT_FEATURE_scrollbar
+)
+qt_feature_definition("scrollarea" "QT_NO_SCROLLAREA" NEGATE VALUE "1")
+qt_feature("scroller" PUBLIC
+    SECTION "Widgets"
+    LABEL "QScroller"
+    PURPOSE "Enables kinetic scrolling for any scrolling widget or graphics item."
+    CONDITION QT_FEATURE_easingcurve
+)
+qt_feature("graphicsview" PUBLIC
+    SECTION "Widgets"
+    LABEL "QGraphicsView"
+    PURPOSE "Provides a canvas/sprite framework."
+    CONDITION QT_FEATURE_scrollarea AND QT_FEATURE_widgettextcontrol
+)
+qt_feature_definition("graphicsview" "QT_NO_GRAPHICSVIEW" NEGATE VALUE "1")
+qt_feature("graphicseffect" PUBLIC
+    SECTION "Widgets"
+    LABEL "QGraphicsEffect"
+    PURPOSE "Provides various graphics effects."
+    CONDITION QT_FEATURE_graphicsview
+)
+qt_feature_definition("graphicseffect" "QT_NO_GRAPHICSEFFECT" NEGATE VALUE "1")
+qt_feature("textedit" PUBLIC
+    SECTION "Widgets"
+    LABEL "QTextEdit"
+    PURPOSE "Supports rich text editing."
+    CONDITION QT_FEATURE_scrollarea AND QT_FEATURE_properties AND QT_FEATURE_widgettextcontrol
+)
+qt_feature_definition("textedit" "QT_NO_TEXTEDIT" NEGATE VALUE "1")
+qt_feature("syntaxhighlighter" PUBLIC
+    SECTION "Widgets"
+    LABEL "QSyntaxHighlighter"
+    PURPOSE "Supports custom syntax highlighting."
+    CONDITION QT_FEATURE_textedit
+)
+qt_feature_definition("syntaxhighlighter" "QT_NO_SYNTAXHIGHLIGHTER" NEGATE VALUE "1")
+qt_feature("rubberband" PUBLIC
+    SECTION "Widgets"
+    LABEL "QRubberBand"
+    PURPOSE "Supports using rubberbands to indicate selections and boundaries."
+)
+qt_feature_definition("rubberband" "QT_NO_RUBBERBAND" NEGATE VALUE "1")
+qt_feature("tooltip" PUBLIC
+    SECTION "Widgets"
+    LABEL "QToolTip"
+    PURPOSE "Supports presentation of tooltips."
+    CONDITION QT_FEATURE_label
+)
+qt_feature_definition("tooltip" "QT_NO_TOOLTIP" NEGATE VALUE "1")
+qt_feature("statustip" PUBLIC
+    SECTION "Widgets"
+    LABEL "Status Tip"
+    PURPOSE "Supports status tip functionality and events."
+)
+qt_feature_definition("statustip" "QT_NO_STATUSTIP" NEGATE VALUE "1")
+qt_feature("sizegrip" PUBLIC
+    SECTION "Widgets"
+    LABEL "QSizeGrip"
+    PURPOSE "Provides corner-grips for resizing top-level windows."
+)
+qt_feature_definition("sizegrip" "QT_NO_SIZEGRIP" NEGATE VALUE "1")
+qt_feature("calendarwidget" PUBLIC
+    SECTION "Widgets"
+    LABEL "QCalendarWidget"
+    PURPOSE "Provides a monthly based calendar widget allowing the user to select a date."
+    CONDITION ( QT_FEATURE_label ) AND ( QT_FEATURE_menu ) AND ( QT_FEATURE_pushbutton ) AND ( QT_FEATURE_spinbox ) AND ( QT_FEATURE_tableview ) AND ( QT_FEATURE_textdate ) AND ( QT_FEATURE_toolbutton )
+)
+qt_feature_definition("calendarwidget" "QT_NO_CALENDARWIDGET" NEGATE VALUE "1")
+qt_feature("keysequenceedit" PUBLIC
+    SECTION "Widgets"
+    LABEL "QKeySequenceEdit"
+    PURPOSE "Provides a widget for editing QKeySequences."
+    CONDITION QT_FEATURE_lineedit AND QT_FEATURE_shortcut
+)
+qt_feature_definition("keysequenceedit" "QT_NO_KEYSEQUENCEEDIT" NEGATE VALUE "1")
+qt_feature("dialog" PUBLIC
+    SECTION "Dialogs"
+    LABEL "QDialog"
+    PURPOSE "Base class of dialog windows."
+)
+qt_feature("dialogbuttonbox" PUBLIC
+    SECTION "Dialogs"
+    LABEL "QDialogButtonBox"
+    PURPOSE "Presents buttons in a layout that is appropriate for the current widget style."
+    CONDITION QT_FEATURE_dialog AND QT_FEATURE_pushbutton
+)
+qt_feature("messagebox" PUBLIC
+    SECTION "Dialogs"
+    LABEL "QMessageBox"
+    PURPOSE "Provides message boxes displaying informative messages and simple questions."
+    CONDITION ( QT_FEATURE_checkbox ) AND ( QT_FEATURE_dialog ) AND ( QT_FEATURE_dialogbuttonbox ) AND ( QT_FEATURE_label ) AND ( QT_FEATURE_pushbutton )
+)
+qt_feature_definition("messagebox" "QT_NO_MESSAGEBOX" NEGATE VALUE "1")
+qt_feature("colordialog" PUBLIC
+    SECTION "Dialogs"
+    LABEL "QColorDialog"
+    PURPOSE "Provides a dialog widget for specifying colors."
+    CONDITION ( QT_FEATURE_dialog ) AND ( QT_FEATURE_dialogbuttonbox ) AND ( QT_FEATURE_label ) AND ( QT_FEATURE_pushbutton ) AND ( QT_FEATURE_spinbox )
+)
+qt_feature_definition("colordialog" "QT_NO_COLORDIALOG" NEGATE VALUE "1")
+qt_feature("filedialog" PUBLIC
+    SECTION "Dialogs"
+    LABEL "QFileDialog"
+    PURPOSE "Provides a dialog widget for selecting files or directories."
+    CONDITION ( QT_FEATURE_buttongroup ) AND ( QT_FEATURE_combobox ) AND ( QT_FEATURE_dialog ) AND ( QT_FEATURE_dialogbuttonbox ) AND ( QT_FEATURE_dirmodel ) AND ( QT_FEATURE_label ) AND ( QT_FEATURE_proxymodel ) AND ( QT_FEATURE_splitter ) AND ( QT_FEATURE_stackedwidget ) AND ( QT_FEATURE_treeview ) AND ( QT_FEATURE_toolbutton )
+)
+qt_feature_definition("filedialog" "QT_NO_FILEDIALOG" NEGATE VALUE "1")
+qt_feature("fontdialog" PUBLIC
+    SECTION "Dialogs"
+    LABEL "QFontDialog"
+    PURPOSE "Provides a dialog widget for selecting fonts."
+    CONDITION ( QT_FEATURE_checkbox ) AND ( QT_FEATURE_combobox ) AND ( QT_FEATURE_dialog ) AND ( QT_FEATURE_dialogbuttonbox ) AND ( QT_FEATURE_groupbox ) AND ( QT_FEATURE_label ) AND ( QT_FEATURE_pushbutton ) AND ( QT_FEATURE_stringlistmodel ) AND ( QT_FEATURE_validator )
+)
+qt_feature_definition("fontdialog" "QT_NO_FONTDIALOG" NEGATE VALUE "1")
+qt_feature("progressdialog" PUBLIC
+    SECTION "Dialogs"
+    LABEL "QProgressDialog"
+    PURPOSE "Provides feedback on the progress of a slow operation."
+    CONDITION ( QT_FEATURE_dialog ) AND ( QT_FEATURE_label ) AND ( QT_FEATURE_pushbutton ) AND ( QT_FEATURE_progressbar )
+)
+qt_feature_definition("progressdialog" "QT_NO_PROGRESSDIALOG" NEGATE VALUE "1")
+qt_feature("inputdialog" PUBLIC
+    SECTION "Dialogs"
+    LABEL "QInputDialog"
+    PURPOSE "Provides a simple convenience dialog to get a single value from the user."
+    CONDITION ( QT_FEATURE_combobox ) AND ( QT_FEATURE_dialog ) AND ( QT_FEATURE_dialogbuttonbox ) AND ( QT_FEATURE_label ) AND ( QT_FEATURE_pushbutton ) AND ( QT_FEATURE_spinbox ) AND ( QT_FEATURE_stackedwidget ) AND ( QT_FEATURE_textedit )
+)
+qt_feature_definition("inputdialog" "QT_NO_INPUTDIALOG" NEGATE VALUE "1")
+qt_feature("errormessage" PUBLIC
+    SECTION "Dialogs"
+    LABEL "QErrorMessage"
+    PURPOSE "Provides an error message display dialog."
+    CONDITION ( QT_FEATURE_checkbox ) AND ( QT_FEATURE_dialog ) AND ( QT_FEATURE_textedit ) AND ( QT_FEATURE_label ) AND ( QT_FEATURE_pushbutton ) AND ( QT_FEATURE_textedit )
+)
+qt_feature_definition("errormessage" "QT_NO_ERRORMESSAGE" NEGATE VALUE "1")
+qt_feature("wizard" PUBLIC
+    SECTION "Dialogs"
+    LABEL "QWizard"
+    PURPOSE "Provides a framework for multi-page click-through dialogs."
+    CONDITION ( QT_FEATURE_dialog ) AND ( QT_FEATURE_pushbutton ) AND ( QT_FEATURE_properties ) AND ( QT_FEATURE_label )
+)
+qt_feature_definition("wizard" "QT_NO_WIZARD" NEGATE VALUE "1")
+qt_feature("dirmodel" PUBLIC
+    SECTION "ItemViews"
+    LABEL "QDirModel"
+    PURPOSE "Provides a data model for the local filesystem."
+    CONDITION QT_FEATURE_itemviews AND QT_FEATURE_filesystemmodel
+)
+qt_feature_definition("dirmodel" "QT_NO_DIRMODEL" NEGATE VALUE "1")
+qt_feature("listview" PUBLIC
+    SECTION "ItemViews"
+    LABEL "QListView"
+    PURPOSE "Provides a list or icon view onto a model."
+    CONDITION QT_FEATURE_itemviews
+)
+qt_feature_definition("listview" "QT_NO_LISTVIEW" NEGATE VALUE "1")
+qt_feature("tableview" PUBLIC
+    SECTION "ItemViews"
+    LABEL "QTableView"
+    PURPOSE "Provides a default model/view implementation of a table view."
+    CONDITION QT_FEATURE_itemviews
+)
+qt_feature_definition("tableview" "QT_NO_TABLEVIEW" NEGATE VALUE "1")
+qt_feature("treeview" PUBLIC
+    SECTION "ItemViews"
+    LABEL "QTreeView"
+    PURPOSE "Provides a default model/view implementation of a tree view."
+    CONDITION QT_FEATURE_itemviews
+)
+qt_feature_definition("treeview" "QT_NO_TREEVIEW" NEGATE VALUE "1")
+qt_feature("datawidgetmapper" PUBLIC
+    SECTION "ItemViews"
+    LABEL "QDataWidgetMapper"
+    PURPOSE "Provides mapping between a section of a data model to widgets."
+    CONDITION QT_FEATURE_itemviews AND QT_FEATURE_properties
+)
+qt_feature_definition("datawidgetmapper" "QT_NO_DATAWIDGETMAPPER" NEGATE VALUE "1")
+qt_feature("columnview" PUBLIC
+    SECTION "ItemViews"
+    LABEL "QColumnView"
+    PURPOSE "Provides a model/view implementation of a column view."
+    CONDITION QT_FEATURE_listview
+)
+qt_feature_definition("columnview" "QT_NO_COLUMNVIEW" NEGATE VALUE "1")
+qt_feature("completer" PUBLIC
+    SECTION "Utilities"
+    LABEL "QCompleter"
+    PURPOSE "Provides completions based on an item model."
+    CONDITION QT_FEATURE_proxymodel AND QT_FEATURE_itemviews
+)
+qt_feature_definition("completer" "QT_NO_COMPLETER" NEGATE VALUE "1")
+qt_feature("fscompleter" PUBLIC
+    SECTION "Utilities"
+    LABEL "QFSCompleter"
+    PURPOSE "Provides file name completion in QFileDialog."
+    CONDITION QT_FEATURE_filesystemmodel AND QT_FEATURE_completer
+)
+qt_feature_definition("fscompleter" "QT_NO_FSCOMPLETER" NEGATE VALUE "1")
+qt_feature("undocommand" PUBLIC
+    SECTION "Utilities"
+    LABEL "QUndoCommand"
+    PURPOSE "Applies (redo or) undo of a single change in a document."
+)
+qt_feature_definition("undocommand" "QT_NO_UNDOCOMMAND" NEGATE VALUE "1")
+qt_feature("undostack" PUBLIC
+    SECTION "Utilities"
+    LABEL "QUndoStack"
+    PURPOSE "Provides the ability to (redo or) undo a list of changes in a document."
+    CONDITION QT_FEATURE_undocommand
+)
+qt_feature_definition("undostack" "QT_NO_UNDOSTACK" NEGATE VALUE "1")
+qt_feature("undogroup" PUBLIC
+    SECTION "Utilities"
+    LABEL "QUndoGroup"
+    PURPOSE "Provides the ability to cluster QUndoCommands."
+    CONDITION QT_FEATURE_undostack
+)
+qt_feature_definition("undogroup" "QT_NO_UNDOGROUP" NEGATE VALUE "1")
+qt_feature("undoview" PUBLIC
+    SECTION "Utilities"
+    LABEL "QUndoView"
+    PURPOSE "Provides a widget which shows the contents of an undo stack."
+    CONDITION QT_FEATURE_undostack AND QT_FEATURE_listview
+)
+qt_feature_definition("undoview" "QT_NO_UNDOVIEW" NEGATE VALUE "1")
diff --git a/src/widgets/configure.json b/src/widgets/configure.json
index 0a68f082a2..cab120098a 100644
--- a/src/widgets/configure.json
+++ b/src/widgets/configure.json
@@ -26,14 +26,6 @@
         }
     },
 
-    "tests": {
-        "uxtheme": {
-            "label": "uxtheme.h",
-            "type": "files",
-            "files": [ "uxtheme.h" ]
-        }
-    },
-
     "features": {
         "gtk3": {
             "label": "GTK+",
@@ -56,7 +48,7 @@
         },
         "style-windowsvista": {
             "label": "WindowsVista",
-            "condition": "features.style-windows && features.animation && config.win32 && !config.winrt && tests.uxtheme",
+            "condition": "features.style-windows && features.animation && config.win32 && !config.winrt",
             "output": [ "privateFeature", "styles" ]
         },
         "style-android": {
diff --git a/src/widgets/dialogs/qfiledialog.cpp b/src/widgets/dialogs/qfiledialog.cpp
index add8e6db91..882ad8a5a6 100644
--- a/src/widgets/dialogs/qfiledialog.cpp
+++ b/src/widgets/dialogs/qfiledialog.cpp
@@ -49,7 +49,9 @@
 #include <qfontmetrics.h>
 #include <qaction.h>
 #include <qheaderview.h>
-#include <qshortcut.h>
+#if QT_CONFIG(shortcut)
+#  include <qshortcut.h>
+#endif
 #include <qgridlayout.h>
 #if QT_CONFIG(menu)
 #include <qmenu.h>
@@ -344,7 +346,9 @@ Q_GLOBAL_STATIC(QUrl, lastVisitedDir)
 
 QT_BEGIN_INCLUDE_NAMESPACE
 #include <QMetaEnum>
-#include <qshortcut.h>
+#if QT_CONFIG(shortcut)
+#  include <qshortcut.h>
+#endif
 QT_END_INCLUDE_NAMESPACE
 
 /*!
@@ -2015,6 +2019,9 @@ QStringList QFileDialog::history() const
     Sets the item delegate used to render items in the views in the
     file dialog to the given \a delegate.
 
+    Any existing delegate will be removed, but not deleted. QFileDialog
+    does not take ownership of \a delegate.
+
     \warning You should not share the same instance of a delegate between views.
     Doing so can cause incorrect or unintuitive editing behavior since each
     view connected to a given delegate may receive the \l{QAbstractItemDelegate::}{closeEditor()}
@@ -3122,7 +3129,7 @@ void QFileDialogPrivate::createWidgets()
     QObject::connect(qFileDialogUi->buttonBox, SIGNAL(rejected()), q, SLOT(reject()));
 
     qFileDialogUi->lookInCombo->setFileDialogPrivate(this);
-    QObject::connect(qFileDialogUi->lookInCombo, SIGNAL(activated(QString)), q, SLOT(_q_goToDirectory(QString)));
+    QObject::connect(qFileDialogUi->lookInCombo, SIGNAL(textActivated(QString)), q, SLOT(_q_goToDirectory(QString)));
 
     qFileDialogUi->lookInCombo->setInsertPolicy(QComboBox::NoInsert);
     qFileDialogUi->lookInCombo->setDuplicatesEnabled(false);
@@ -3152,7 +3159,7 @@ void QFileDialogPrivate::createWidgets()
     qFileDialogUi->fileTypeCombo->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
     QObject::connect(qFileDialogUi->fileTypeCombo, SIGNAL(activated(int)),
                      q, SLOT(_q_useNameFilter(int)));
-    QObject::connect(qFileDialogUi->fileTypeCombo, SIGNAL(activated(QString)),
+    QObject::connect(qFileDialogUi->fileTypeCombo, SIGNAL(textActivated(QString)),
                      q, SIGNAL(filterSelected(QString)));
 
     qFileDialogUi->listView->setFileDialogPrivate(this);
diff --git a/src/widgets/dialogs/qinputdialog.cpp b/src/widgets/dialogs/qinputdialog.cpp
index eeb0613d79..479e45ff56 100644
--- a/src/widgets/dialogs/qinputdialog.cpp
+++ b/src/widgets/dialogs/qinputdialog.cpp
@@ -300,7 +300,7 @@ void QInputDialogPrivate::ensureComboBox()
         comboBox->hide();
         QObject::connect(comboBox, SIGNAL(editTextChanged(QString)),
                          q, SLOT(_q_textChanged(QString)));
-        QObject::connect(comboBox, SIGNAL(currentIndexChanged(QString)),
+        QObject::connect(comboBox, SIGNAL(currentTextChanged(QString)),
                          q, SLOT(_q_textChanged(QString)));
     }
 }
diff --git a/src/widgets/dialogs/qprogressdialog.cpp b/src/widgets/dialogs/qprogressdialog.cpp
index 40548e22a5..aaa4430c39 100644
--- a/src/widgets/dialogs/qprogressdialog.cpp
+++ b/src/widgets/dialogs/qprogressdialog.cpp
@@ -39,7 +39,9 @@
 
 #include "qprogressdialog.h"
 
-#include "qshortcut.h"
+#if QT_CONFIG(shortcut)
+#  include "qshortcut.h"
+#endif
 #include "qpainter.h"
 #include "qdrawutil.h"
 #include "qlabel.h"
diff --git a/src/widgets/doc/snippets/javastyle.cpp b/src/widgets/doc/snippets/javastyle.cpp
index ca6866376b..1d18b45c37 100644
--- a/src/widgets/doc/snippets/javastyle.cpp
+++ b/src/widgets/doc/snippets/javastyle.cpp
@@ -2130,7 +2130,7 @@ void JavaStyle::drawPrimitive(PrimitiveElement element,
             painter->restore();
             break;
         }
-        case PE_IndicatorViewItemCheck: {
+        case PE_IndicatorItemViewItemCheck: {
             break;
         }
         case PE_FrameWindow: {
diff --git a/src/widgets/doc/snippets/qstackedlayout/main.cpp b/src/widgets/doc/snippets/qstackedlayout/main.cpp
index 9c61939dee..181eed87db 100644
--- a/src/widgets/doc/snippets/qstackedlayout/main.cpp
+++ b/src/widgets/doc/snippets/qstackedlayout/main.cpp
@@ -74,7 +74,7 @@ Widget::Widget(QWidget *parent)
     pageComboBox->addItem(tr("Page 1"));
     pageComboBox->addItem(tr("Page 2"));
     pageComboBox->addItem(tr("Page 3"));
-    connect(pageComboBox, QOverload<int>::of(&QComboBox::activated),
+    connect(pageComboBox, &QComboBox::activated,
             stackedLayout, &QStackedLayout::setCurrentIndex);
 //! [1]
 
diff --git a/src/widgets/doc/snippets/qstackedwidget/main.cpp b/src/widgets/doc/snippets/qstackedwidget/main.cpp
index 077c281830..c68a992332 100644
--- a/src/widgets/doc/snippets/qstackedwidget/main.cpp
+++ b/src/widgets/doc/snippets/qstackedwidget/main.cpp
@@ -74,7 +74,7 @@ Widget::Widget(QWidget *parent)
     pageComboBox->addItem(tr("Page 1"));
     pageComboBox->addItem(tr("Page 2"));
     pageComboBox->addItem(tr("Page 3"));
-    connect(pageComboBox, QOverload<int>::of(&QComboBox::activated),
+    connect(pageComboBox, &QComboBox::activated,
             stackedWidget, &QStackedWidget::setCurrentIndex);
 
 //! [1] //! [2]
diff --git a/src/widgets/doc/src/graphicsview.qdoc b/src/widgets/doc/src/graphicsview.qdoc
index 33f480b0bf..f1f848d6df 100644
--- a/src/widgets/doc/src/graphicsview.qdoc
+++ b/src/widgets/doc/src/graphicsview.qdoc
@@ -117,7 +117,7 @@
         of a scene. You can attach several views to the same scene, to provide
         several viewports into the same data set. The view widget is a scroll
         area, and provides scroll bars for navigating through large scenes. To
-        enable OpenGL support, you can set a QGLWidget as the viewport by
+        enable OpenGL support, you can set a QOpenGLWidget as the viewport by
         calling QGraphicsView::setViewport().
 
         \snippet graphicsview.cpp 1
@@ -436,10 +436,10 @@
 
       \section2 OpenGL Rendering
 
-        To enable OpenGL rendering, you simply set a new QGLWidget as the
+        To enable OpenGL rendering, you simply set a new QOpenGLWidget as the
         viewport of QGraphicsView by calling QGraphicsView::setViewport(). If
         you want OpenGL with antialiasing, you need OpenGL sample buffer
-        support (see QGLFormat::sampleBuffers()).
+        support (see QSurfaceFormat::samples()).
 
         Example:
 
diff --git a/src/widgets/doc/src/widgets-and-layouts/styles.qdoc b/src/widgets/doc/src/widgets-and-layouts/styles.qdoc
index 645da5bca2..faaf4e5479 100644
--- a/src/widgets/doc/src/widgets-and-layouts/styles.qdoc
+++ b/src/widgets/doc/src/widgets-and-layouts/styles.qdoc
@@ -1837,7 +1837,7 @@
     item views keep the dimensions on individual sections. Also
     note that the delegates may use the style to paint decorations
     and frames around items. QItemDelegate, for instance, draws
-    \c PE_FrameFocusRect and \c PE_IndicatorViewItemCheck.
+    \c PE_FrameFocusRect and \c PE_IndicatorItemViewItemCheck.
 
     \image javastyle/header.png
 
diff --git a/src/widgets/effects/qpixmapfilter.cpp b/src/widgets/effects/qpixmapfilter.cpp
index 1f899c2660..705871719f 100644
--- a/src/widgets/effects/qpixmapfilter.cpp
+++ b/src/widgets/effects/qpixmapfilter.cpp
@@ -784,11 +784,11 @@ Q_WIDGETS_EXPORT QImage qt_halfScaled(const QImage &source)
         dest.setDevicePixelRatio(source.devicePixelRatioF());
 
         const uchar *src = reinterpret_cast<const uchar*>(const_cast<const QImage &>(srcImage).bits());
-        int sx = srcImage.bytesPerLine();
-        int sx2 = sx << 1;
+        qsizetype sx = srcImage.bytesPerLine();
+        qsizetype sx2 = sx << 1;
 
         uchar *dst = reinterpret_cast<uchar*>(dest.bits());
-        int dx = dest.bytesPerLine();
+        qsizetype dx = dest.bytesPerLine();
         int ww = dest.width();
         int hh = dest.height();
 
@@ -806,11 +806,11 @@ Q_WIDGETS_EXPORT QImage qt_halfScaled(const QImage &source)
         dest.setDevicePixelRatio(source.devicePixelRatioF());
 
         const uchar *src = reinterpret_cast<const uchar*>(const_cast<const QImage &>(srcImage).bits());
-        int sx = srcImage.bytesPerLine();
-        int sx2 = sx << 1;
+        qsizetype sx = srcImage.bytesPerLine();
+        qsizetype sx2 = sx << 1;
 
         uchar *dst = reinterpret_cast<uchar*>(dest.bits());
-        int dx = dest.bytesPerLine();
+        qsizetype dx = dest.bytesPerLine();
         int ww = dest.width();
         int hh = dest.height();
 
@@ -843,11 +843,11 @@ Q_WIDGETS_EXPORT QImage qt_halfScaled(const QImage &source)
     dest.setDevicePixelRatio(source.devicePixelRatioF());
 
     const quint32 *src = reinterpret_cast<const quint32*>(const_cast<const QImage &>(srcImage).bits());
-    int sx = srcImage.bytesPerLine() >> 2;
-    int sx2 = sx << 1;
+    qsizetype sx = srcImage.bytesPerLine() >> 2;
+    qsizetype sx2 = sx << 1;
 
     quint32 *dst = reinterpret_cast<quint32*>(dest.bits());
-    int dx = dest.bytesPerLine() >> 2;
+    qsizetype dx = dest.bytesPerLine() >> 2;
     int ww = dest.width();
     int hh = dest.height();
 
diff --git a/src/widgets/effects/qpixmapfilter_p.h b/src/widgets/effects/qpixmapfilter_p.h
index c56acb8a24..2a6e7f5db0 100644
--- a/src/widgets/effects/qpixmapfilter_p.h
+++ b/src/widgets/effects/qpixmapfilter_p.h
@@ -109,7 +109,6 @@ public:
     void draw(QPainter *painter, const QPointF &dest, const QPixmap &src, const QRectF &srcRect = QRectF()) const override;
 
 private:
-    friend class QGLPixmapConvolutionFilter;
     friend class QVGPixmapConvolutionFilter;
     const qreal *convolutionKernel() const;
     int rows() const;
@@ -135,9 +134,6 @@ public:
 
     QRectF boundingRectFor(const QRectF &rect) const override;
     void draw(QPainter *painter, const QPointF &dest, const QPixmap &src, const QRectF &srcRect = QRectF()) const override;
-
-private:
-    friend class QGLPixmapBlurFilter;
 };
 
 class QPixmapColorizeFilterPrivate;
diff --git a/src/widgets/graphicsview/qgraphicsanchorlayout_p.cpp b/src/widgets/graphicsview/qgraphicsanchorlayout_p.cpp
index af0ee3d38c..c5c24adde3 100644
--- a/src/widgets/graphicsview/qgraphicsanchorlayout_p.cpp
+++ b/src/widgets/graphicsview/qgraphicsanchorlayout_p.cpp
@@ -41,7 +41,6 @@
 
 #include <QtWidgets/qwidget.h>
 #include <QtWidgets/qapplication.h>
-#include <QtCore/qlinkedlist.h>
 #include <QtCore/qstack.h>
 
 #ifdef QT_DEBUG
diff --git a/src/widgets/graphicsview/qgraphicsgridlayoutengine.cpp b/src/widgets/graphicsview/qgraphicsgridlayoutengine.cpp
index 5797d9e539..3dd1b1652a 100644
--- a/src/widgets/graphicsview/qgraphicsgridlayoutengine.cpp
+++ b/src/widgets/graphicsview/qgraphicsgridlayoutengine.cpp
@@ -42,29 +42,9 @@
 #include "qgraphicslayoutitem_p.h"
 #include "qgraphicslayout_p.h"
 #include "qgraphicswidget.h"
-#include <private/qgraphicswidget_p.h>
 
 QT_BEGIN_NAMESPACE
 
-bool QGraphicsGridLayoutEngineItem::isHidden() const
-{
-    if (QGraphicsItem *item = q_layoutItem->graphicsItem())
-        return QGraphicsItemPrivate::get(item)->explicitlyHidden;
-    return false;
-}
-
-/*!
-  \internal
-
-  If this returns true, the layout will arrange just as if the item was never added to the layout.
-  (Note that this shouldn't lead to a "double spacing" where the item was hidden)
-  ### Qt6: Move to QGraphicsLayoutItem and make virtual
-*/
-bool QGraphicsGridLayoutEngineItem::isIgnored() const
-{
-    return isHidden() && !q_layoutItem->sizePolicy().retainSizeWhenHidden();
-}
-
 /*
   returns \c true if the size policy returns \c true for either hasHeightForWidth()
   or hasWidthForHeight()
@@ -83,6 +63,16 @@ Qt::Orientation QGraphicsGridLayoutEngineItem::dynamicConstraintOrientation() co
         return Qt::Horizontal;
 }
 
+/*!
+  \internal
+
+  If this returns true, the layout will arrange just as if the item was never added to the layout.
+  (Note that this shouldn't lead to a "double spacing" where the item was hidden)
+*/
+bool QGraphicsGridLayoutEngineItem::isEmpty() const
+{
+    return q_layoutItem->isEmpty();
+}
 
 void QGraphicsGridLayoutEngine::setAlignment(QGraphicsLayoutItem *graphicsLayoutItem, Qt::Alignment alignment)
 {
diff --git a/src/widgets/graphicsview/qgraphicsgridlayoutengine_p.h b/src/widgets/graphicsview/qgraphicsgridlayoutengine_p.h
index 2f2c547977..a3e42c7b77 100644
--- a/src/widgets/graphicsview/qgraphicsgridlayoutengine_p.h
+++ b/src/widgets/graphicsview/qgraphicsgridlayoutengine_p.h
@@ -89,10 +89,6 @@ public:
         return q_layoutItem->effectiveSizeHint(which, constraint);
     }
 
-    bool isHidden() const;
-
-    virtual bool isIgnored() const override;
-
     virtual void setGeometry(const QRectF &rect) override
     {
          q_layoutItem->setGeometry(rect);
@@ -101,6 +97,8 @@ public:
     virtual bool hasDynamicConstraint() const override;
     virtual Qt::Orientation dynamicConstraintOrientation() const override;
 
+    virtual bool isEmpty() const override;
+
     QGraphicsLayoutItem *layoutItem() const { return q_layoutItem; }
 
 protected:
diff --git a/src/widgets/graphicsview/qgraphicsitem.cpp b/src/widgets/graphicsview/qgraphicsitem.cpp
index 38cab60fc2..af4443fa00 100644
--- a/src/widgets/graphicsview/qgraphicsitem.cpp
+++ b/src/widgets/graphicsview/qgraphicsitem.cpp
@@ -530,9 +530,6 @@
     setEnabled() in itemChange() as this notification is delivered. The return
     value is ignored.
 
-    \value ItemMatrixChange The item's affine transformation matrix is
-    changing. This value is obsolete; you can use ItemTransformChange instead.
-
     \value ItemPositionChange The item's position changes. This notification
     is sent if the ItemSendsGeometryChanges flag is enabled, and when the
     item's local position changes, relative to its parent (i.e., as a result
@@ -1506,7 +1503,7 @@ void QGraphicsItemPrivate::initStyleOption(QStyleOptionGraphicsItem *option, con
         return;
 
     // Initialize QStyleOptionGraphicsItem specific values (matrix, exposedRect).
-    option->matrix = worldTransform.toAffine(); //### discards perspective
+    option->matrix = worldTransform; //### discards perspective
 
     if (!allItems) {
         // Determine the item's exposed area
@@ -1580,13 +1577,8 @@ QGraphicsItem::~QGraphicsItem()
         p->wasDeleted = true;
         if (p->declarativeData) {
             p->wasDeleted = true; // needed, so that destroying the declarative data does the right thing
-            if (static_cast<QAbstractDeclarativeDataImpl*>(p->declarativeData)->ownedByQml1) {
-                if (QAbstractDeclarativeData::destroyed_qml1)
-                    QAbstractDeclarativeData::destroyed_qml1(p->declarativeData, o);
-            } else {
-                if (QAbstractDeclarativeData::destroyed)
-                    QAbstractDeclarativeData::destroyed(p->declarativeData, o);
-            }
+            if (QAbstractDeclarativeData::destroyed)
+                QAbstractDeclarativeData::destroyed(p->declarativeData, o);
             p->declarativeData = nullptr;
             p->wasDeleted = false;
         }
@@ -4002,24 +3994,6 @@ void QGraphicsItem::ensureVisible(const QRectF &rect, int xmargin, int ymargin)
     ensureVisible(QRectF(\a x, \a y, \a w, \a h), \a xmargin, \a ymargin).
 */
 
-#if QT_DEPRECATED_SINCE(5, 13)
-/*!
-    \obsolete
-
-    Returns the item's affine transformation matrix. This is a subset or the
-    item's full transformation matrix, and might not represent the item's full
-    transformation.
-
-    Use transform() instead.
-
-    \sa setTransform(), sceneTransform()
-*/
-QMatrix QGraphicsItem::matrix() const
-{
-    return transform().toAffine();
-}
-#endif
-
 /*!
     \since 4.3
 
@@ -4328,22 +4302,6 @@ void QGraphicsItem::setTransformOriginPoint(const QPointF &origin)
     \sa setTransformOriginPoint(), {Transformations}
 */
 
-
-#if QT_DEPRECATED_SINCE(5, 13)
-/*!
-    \obsolete
-
-    Use sceneTransform() instead.
-
-    \sa transform(), setTransform(), scenePos(), {The Graphics View Coordinate System}
-*/
-QMatrix QGraphicsItem::sceneMatrix() const
-{
-    d_ptr->ensureSceneTransform();
-    return d_ptr->sceneTransform.toAffine();
-}
-#endif
-
 /*!
     \since 4.3
 
@@ -4554,50 +4512,6 @@ QTransform QGraphicsItem::itemTransform(const QGraphicsItem *other, bool *ok) co
     return x;
 }
 
-#if QT_DEPRECATED_SINCE(5, 13)
-QT_WARNING_PUSH
-QT_WARNING_DISABLE_DEPRECATED
-/*!
-    \obsolete
-
-    Sets the item's affine transformation matrix. This is a subset or the
-    item's full transformation matrix, and might not represent the item's full
-    transformation.
-
-    Use setTransform() instead.
-
-    \sa transform(), {The Graphics View Coordinate System}
-*/
-void QGraphicsItem::setMatrix(const QMatrix &matrix, bool combine)
-{
-    if (!d_ptr->transformData)
-        d_ptr->transformData = new QGraphicsItemPrivate::TransformData;
-
-    QTransform newTransform(combine ? QTransform(matrix) * d_ptr->transformData->transform : QTransform(matrix));
-    if (d_ptr->transformData->transform == newTransform)
-        return;
-
-    // Update and set the new transformation.
-    if (!(d_ptr->flags & ItemSendsGeometryChanges)) {
-        d_ptr->setTransformHelper(newTransform);
-        return;
-    }
-
-    // Notify the item that the transformation matrix is changing.
-    const QVariant newMatrixVariant = QVariant::fromValue<QMatrix>(newTransform.toAffine());
-    newTransform = QTransform(qvariant_cast<QMatrix>(itemChange(ItemMatrixChange, newMatrixVariant)));
-    if (d_ptr->transformData->transform == newTransform)
-        return;
-
-    // Update and set the new transformation.
-    d_ptr->setTransformHelper(newTransform);
-
-    // Send post-notification.
-    itemChange(ItemTransformHasChanged, QVariant::fromValue<QTransform>(newTransform));
-}
-QT_WARNING_POP
-#endif
-
 /*!
     \since 4.3
 
@@ -4651,18 +4565,6 @@ void QGraphicsItem::setTransform(const QTransform &matrix, bool combine)
     d_ptr->sendScenePosChange();
 }
 
-#if QT_DEPRECATED_SINCE(5, 13)
-/*!
-    \obsolete
-
-    Use resetTransform() instead.
-*/
-void QGraphicsItem::resetMatrix()
-{
-    resetTransform();
-}
-#endif
-
 /*!
     \since 4.3
 
@@ -11531,14 +11433,6 @@ QDebug operator<<(QDebug debug, QGraphicsItem::GraphicsItemChange change)
     case QGraphicsItem::ItemFlagsHaveChanged:
         str = "ItemFlagsHaveChanged";
         break;
-#if QT_DEPRECATED_SINCE(5, 14)
-QT_WARNING_PUSH
-QT_WARNING_DISABLE_DEPRECATED
-    case QGraphicsItem::ItemMatrixChange:
-        str = "ItemMatrixChange";
-        break;
-QT_WARNING_POP
-#endif
     case QGraphicsItem::ItemParentChange:
         str = "ItemParentChange";
         break;
diff --git a/src/widgets/graphicsview/qgraphicsitem.h b/src/widgets/graphicsview/qgraphicsitem.h
index d66a4917e5..c78d31bbd4 100644
--- a/src/widgets/graphicsview/qgraphicsitem.h
+++ b/src/widgets/graphicsview/qgraphicsitem.h
@@ -71,7 +71,6 @@ class QGraphicsTransform;
 class QGraphicsWidget;
 class QInputMethodEvent;
 class QKeyEvent;
-class QMatrix;
 class QMenu;
 class QPainter;
 class QPen;
@@ -110,9 +109,6 @@ public:
 
     enum GraphicsItemChange {
         ItemPositionChange,
-#if QT_DEPRECATED_SINCE(5, 14)
-        ItemMatrixChange Q_DECL_ENUMERATOR_DEPRECATED_X("Use ItemTransformChange instead"),
-#endif
         ItemVisibleChange = 2,
         ItemEnabledChange,
         ItemSelectedChange,
@@ -285,16 +281,6 @@ public:
     inline void ensureVisible(qreal x, qreal y, qreal w, qreal h, int xmargin = 50, int ymargin = 50);
 
     // Local transformation
-#if QT_DEPRECATED_SINCE(5, 13)
-    QT_DEPRECATED_X("Use transform() instead")
-    QMatrix matrix() const;
-    QT_DEPRECATED_X("Use sceneTransform() instead")
-    QMatrix sceneMatrix() const;
-    QT_DEPRECATED_X("Use setTransform() instead")
-    void setMatrix(const QMatrix &matrix, bool combine = false);
-    QT_DEPRECATED_X("Use resetTransform() instead")
-    void resetMatrix();
-#endif
     QTransform transform() const;
     QTransform sceneTransform() const;
     QTransform deviceTransform(const QTransform &viewportTransform) const;
diff --git a/src/widgets/graphicsview/qgraphicsitemanimation.cpp b/src/widgets/graphicsview/qgraphicsitemanimation.cpp
index 1c5dbf265c..45b4871e24 100644
--- a/src/widgets/graphicsview/qgraphicsitemanimation.cpp
+++ b/src/widgets/graphicsview/qgraphicsitemanimation.cpp
@@ -87,7 +87,6 @@
 #include <QtCore/qpoint.h>
 #include <QtCore/qpointer.h>
 #include <QtCore/qpair.h>
-#include <QtGui/qmatrix.h>
 
 #include <algorithm>
 
@@ -294,19 +293,6 @@ QList<QPair<qreal, QPointF> > QGraphicsItemAnimation::posList() const
     return list;
 }
 
-#if QT_DEPRECATED_SINCE(5, 14)
-/*!
-  Returns the matrix used to transform the item at the specified \a step value.
-
-  \obsolete Use transformAt() instead
-*/
-QMatrix QGraphicsItemAnimation::matrixAt(qreal step) const
-{
-    check_step_valid(step, "matrixAt");
-    return transformAt(step).toAffine();
-}
-#endif
-
 /*!
   Returns the transform used for the item at the specified \a step value.
 
diff --git a/src/widgets/graphicsview/qgraphicsitemanimation.h b/src/widgets/graphicsview/qgraphicsitemanimation.h
index 3051fb2e2b..af54dfff93 100644
--- a/src/widgets/graphicsview/qgraphicsitemanimation.h
+++ b/src/widgets/graphicsview/qgraphicsitemanimation.h
@@ -48,7 +48,6 @@ QT_REQUIRE_CONFIG(graphicsview);
 QT_BEGIN_NAMESPACE
 
 class QGraphicsItem;
-class QMatrix;
 class QPointF;
 class QTimeLine;
 class QTransform;
@@ -72,10 +71,6 @@ public:
     QList<QPair<qreal, QPointF> > posList() const;
     void setPosAt(qreal step, const QPointF &pos);
 
-#if QT_DEPRECATED_SINCE(5, 14)
-    QT_DEPRECATED_X("Use transformAt() instead")
-    QMatrix matrixAt(qreal step) const;
-#endif
     QTransform transformAt(qreal step) const;
 
     qreal rotationAt(qreal step) const;
diff --git a/src/widgets/graphicsview/qgraphicslayoutitem.cpp b/src/widgets/graphicsview/qgraphicslayoutitem.cpp
index 8694dcb36b..2c484321e4 100644
--- a/src/widgets/graphicsview/qgraphicslayoutitem.cpp
+++ b/src/widgets/graphicsview/qgraphicslayoutitem.cpp
@@ -45,6 +45,7 @@
 #include "qgraphicslayoutitem_p.h"
 #include "qwidget.h"
 #include "qgraphicswidget.h"
+#include "qgraphicsitem_p.h"
 
 #include <QtDebug>
 
@@ -826,6 +827,22 @@ void QGraphicsLayoutItem::updateGeometry()
 }
 
 /*!
+ * returns \c true if this item is empty, i.e whether it has no content and
+ * should not occupy any space.
+ *
+ * The default implementation returns true if the item has been hidden unless
+ * its size policy has retainSizeWhenHidden set to \c true
+ */
+bool QGraphicsLayoutItem::isEmpty() const
+{
+    bool isHidden = false;
+    if (QGraphicsItem *item = graphicsItem())
+        isHidden = QGraphicsItemPrivate::get(item)->explicitlyHidden;
+
+    return isHidden && !sizePolicy().retainSizeWhenHidden();
+}
+
+/*!
     Returns the parent of this QGraphicsLayoutItem, or \nullptr if there is
     no parent, or if the parent does not inherit from QGraphicsLayoutItem
     (QGraphicsLayoutItem is often used through multiple inheritance with
diff --git a/src/widgets/graphicsview/qgraphicslayoutitem.h b/src/widgets/graphicsview/qgraphicslayoutitem.h
index 86a0a87361..04905c7654 100644
--- a/src/widgets/graphicsview/qgraphicslayoutitem.h
+++ b/src/widgets/graphicsview/qgraphicslayoutitem.h
@@ -94,6 +94,7 @@ public:
 
     virtual void updateGeometry();
 
+    virtual bool isEmpty() const;
     QGraphicsLayoutItem *parentLayoutItem() const;
     void setParentLayoutItem(QGraphicsLayoutItem *parent);
 
diff --git a/src/widgets/graphicsview/qgraphicsscene.h b/src/widgets/graphicsview/qgraphicsscene.h
index 3ba9bddc32..e459b80970 100644
--- a/src/widgets/graphicsview/qgraphicsscene.h
+++ b/src/widgets/graphicsview/qgraphicsscene.h
@@ -53,7 +53,6 @@ QT_REQUIRE_CONFIG(graphicsview);
 
 QT_BEGIN_NAMESPACE
 
-template<typename T> class QList;
 class QFocusEvent;
 class QFont;
 class QFontMetrics;
diff --git a/src/widgets/graphicsview/qgraphicssceneindex_p.h b/src/widgets/graphicsview/qgraphicssceneindex_p.h
index b494c52671..e13c2a3cd3 100644
--- a/src/widgets/graphicsview/qgraphicssceneindex_p.h
+++ b/src/widgets/graphicsview/qgraphicssceneindex_p.h
@@ -67,7 +67,6 @@ QT_BEGIN_NAMESPACE
 class QGraphicsSceneIndexPrivate;
 class QPointF;
 class QRectF;
-template<typename T> class QList;
 
 typedef bool (*QGraphicsSceneIndexIntersector)(const QGraphicsItem *item, const QRectF &exposeRect, Qt::ItemSelectionMode mode,
                                                const QTransform &deviceTransform, const void *data);
diff --git a/src/widgets/graphicsview/qgraphicsview.cpp b/src/widgets/graphicsview/qgraphicsview.cpp
index a75f1ab24b..a744847f33 100644
--- a/src/widgets/graphicsview/qgraphicsview.cpp
+++ b/src/widgets/graphicsview/qgraphicsview.cpp
@@ -292,7 +292,6 @@ static const int QGRAPHICSVIEW_PREALLOC_STYLE_OPTIONS = 503; // largest prime <
 #include <QtGui/qevent.h>
 #include <QtWidgets/qlayout.h>
 #include <QtGui/qtransform.h>
-#include <QtGui/qmatrix.h>
 #include <QtGui/qpainter.h>
 #include <QtWidgets/qscrollbar.h>
 #include <QtWidgets/qstyleoption.h>
@@ -1824,75 +1823,6 @@ void QGraphicsView::setSceneRect(const QRectF &rect)
     d->recalculateContentSize();
 }
 
-#if QT_DEPRECATED_SINCE(5, 15)
-
-/*!
-    \obsolete
-
-    Use transform() instead.
-
-    Returns the current transformation matrix for the view. If no current
-    transformation is set, the identity matrix is returned.
-
-    \sa setMatrix(), transform(), rotate(), scale(), shear(), translate()
-*/
-QMatrix QGraphicsView::matrix() const
-{
-    Q_D(const QGraphicsView);
-    return d->matrix.toAffine();
-}
-
-/*!
-    \obsolete
-
-    Use setTransform() instead.
-
-    Sets the view's current transformation matrix to \a matrix.
-
-    If \a combine is true, then \a matrix is combined with the current matrix;
-    otherwise, \a matrix \e replaces the current matrix. \a combine is false
-    by default.
-
-    The transformation matrix tranforms the scene into view coordinates. Using
-    the default transformation, provided by the identity matrix, one pixel in
-    the view represents one unit in the scene (e.g., a 10x10 rectangular item
-    is drawn using 10x10 pixels in the view). If a 2x2 scaling matrix is
-    applied, the scene will be drawn in 1:2 (e.g., a 10x10 rectangular item is
-    then drawn using 20x20 pixels in the view).
-
-    Example:
-
-    \snippet code/src_gui_graphicsview_qgraphicsview.cpp 3
-
-    To simplify interation with items using a transformed view, QGraphicsView
-    provides mapTo... and mapFrom... functions that can translate between
-    scene and view coordinates. For example, you can call mapToScene() to map
-    a view coordinate to a floating point scene coordinate, or mapFromScene()
-    to map from floating point scene coordinates to view coordinates.
-
-    \sa matrix(), setTransform(), rotate(), scale(), shear(), translate()
-*/
-void QGraphicsView::setMatrix(const QMatrix &matrix, bool combine)
-{
-    setTransform(QTransform(matrix), combine);
-}
-
-/*!
-    \obsolete
-
-    Use resetTransform() instead.
-
-    Resets the view transformation matrix to the identity matrix.
-
-    \sa resetTransform()
-*/
-void QGraphicsView::resetMatrix()
-{
-    resetTransform();
-}
-
-#endif // QT_DEPRECATED_SINCE(5, 15)
-
 /*!
     Rotates the current view transformation \a angle degrees clockwise.
 
@@ -2806,7 +2736,7 @@ void QGraphicsView::setupViewport(QWidget *widget)
         return;
     }
 
-    const bool isGLWidget = widget->inherits("QGLWidget") || widget->inherits("QOpenGLWidget");
+    const bool isGLWidget = widget->inherits("QOpenGLWidget");
 
     d->accelerateScrolling = !(isGLWidget);
 
diff --git a/src/widgets/graphicsview/qgraphicsview.h b/src/widgets/graphicsview/qgraphicsview.h
index e98ec52d8f..4c0b70bdd7 100644
--- a/src/widgets/graphicsview/qgraphicsview.h
+++ b/src/widgets/graphicsview/qgraphicsview.h
@@ -165,11 +165,6 @@ public:
     void setSceneRect(const QRectF &rect);
     inline void setSceneRect(qreal x, qreal y, qreal w, qreal h);
 
-#if QT_DEPRECATED_SINCE(5, 15)
-    QT_DEPRECATED_X("Use transform()") QMatrix matrix() const;
-    QT_DEPRECATED_X("Use setTransform()") void setMatrix(const QMatrix &matrix, bool combine = false);
-    QT_DEPRECATED_X("Use resetTransform()") void resetMatrix();
-#endif // QT_DEPRECATED_SINCE(5, 15)
     QTransform transform() const;
     QTransform viewportTransform() const;
     bool isTransformed() const;
diff --git a/src/widgets/graphicsview/qgraphicswidget.h b/src/widgets/graphicsview/qgraphicswidget.h
index 8223b921c9..6c5171cc02 100644
--- a/src/widgets/graphicsview/qgraphicswidget.h
+++ b/src/widgets/graphicsview/qgraphicswidget.h
@@ -42,6 +42,9 @@
 
 #include <QtWidgets/qtwidgetsglobal.h>
 #include <QtGui/qfont.h>
+#if QT_CONFIG(action)
+#  include <QtWidgets/qaction.h>
+#endif
 #include <QtWidgets/qgraphicslayoutitem.h>
 #include <QtWidgets/qgraphicsitem.h>
 #include <QtGui/qpalette.h>
diff --git a/src/widgets/itemviews/qdatawidgetmapper.cpp b/src/widgets/itemviews/qdatawidgetmapper.cpp
index 24039c42f6..74100c077e 100644
--- a/src/widgets/itemviews/qdatawidgetmapper.cpp
+++ b/src/widgets/itemviews/qdatawidgetmapper.cpp
@@ -383,6 +383,9 @@ QAbstractItemModel *QDataWidgetMapper::model() const
     data from the model into the widget and from the widget to the model,
     using QAbstractItemDelegate::setEditorData() and QAbstractItemDelegate::setModelData().
 
+    Any existing delegate will be removed, but not deleted. QDataWidgetMapper
+    does not take ownership of \a delegate.
+
     The delegate also decides when to apply data and when to change the editor,
     using QAbstractItemDelegate::commitData() and QAbstractItemDelegate::closeEditor().
 
diff --git a/src/widgets/itemviews/qlistwidget.cpp b/src/widgets/itemviews/qlistwidget.cpp
index c9379f9a8a..4aca923151 100644
--- a/src/widgets/itemviews/qlistwidget.cpp
+++ b/src/widgets/itemviews/qlistwidget.cpp
@@ -112,7 +112,7 @@ void QListModel::insert(int row, QListWidgetItem *item)
         QList<QListWidgetItem*>::iterator it;
         it = sortedInsertionIterator(items.begin(), items.end(),
                                      item->view->sortOrder(), item);
-        row = qMax(it - items.begin(), 0);
+        row = qMax<qsizetype>(it - items.begin(), 0);
     } else {
         if (row < 0)
             row = 0;
@@ -398,7 +398,7 @@ void QListModel::ensureSorted(int column, Qt::SortOrder order, int start, int en
             --tmpitepos;
         lit = tmp.begin() + tmpitepos;
         lit = sortedInsertionIterator(lit, tmp.end(), order, item);
-        int newRow = qMax(lit - tmp.begin(), 0);
+        int newRow = qMax<qsizetype>(lit - tmp.begin(), 0);
         lit = tmp.insert(lit, item);
         if (newRow != oldRow) {
             changed = true;
diff --git a/src/widgets/itemviews/qtreewidget.cpp b/src/widgets/itemviews/qtreewidget.cpp
index 0d4c391e1c..3bd77b340b 100644
--- a/src/widgets/itemviews/qtreewidget.cpp
+++ b/src/widgets/itemviews/qtreewidget.cpp
@@ -648,7 +648,7 @@ void QTreeModel::ensureSorted(int column, Qt::SortOrder order,
         lit = lst.begin() + tmpitepos;
 
         lit = sortedInsertionIterator(lit, lst.end(), order, item);
-        int newRow = qMax(lit - lst.begin(), 0);
+        int newRow = qMax<qsizetype>(lit - lst.begin(), 0);
 
         if ((newRow < oldRow) && !(*item < *lst.at(oldRow - 1)) && !(*lst.at(oldRow - 1) < *item ))
             newRow = oldRow;
diff --git a/src/widgets/kernel/kernel.pri b/src/widgets/kernel/kernel.pri
index 693af7eb80..a960280959 100644
--- a/src/widgets/kernel/kernel.pri
+++ b/src/widgets/kernel/kernel.pri
@@ -7,9 +7,6 @@ KERNEL_P= kernel
 HEADERS += \
         kernel/qtwidgetsglobal.h \
         kernel/qtwidgetsglobal_p.h \
-        kernel/qaction.h \
-        kernel/qaction_p.h \
-	kernel/qactiongroup.h \
 	kernel/qapplication.h \
 	kernel/qapplication_p.h \
         kernel/qwidgetrepaintmanager_p.h \
@@ -20,13 +17,10 @@ HEADERS += \
 	kernel/qlayout_p.h \
 	kernel/qlayoutengine_p.h \
 	kernel/qlayoutitem.h \
-        kernel/qshortcut.h \
-	kernel/qsizepolicy.h \
+        kernel/qsizepolicy.h \
         kernel/qstackedlayout.h \
         kernel/qwidget.h \
         kernel/qwidget_p.h \
-	kernel/qwidgetaction.h \
-	kernel/qwidgetaction_p.h \
 	kernel/qgesture.h \
 	kernel/qgesture_p.h \
 	kernel/qstandardgestures_p.h \
@@ -38,8 +32,6 @@ HEADERS += \
         kernel/qtestsupport_widgets.h
 
 SOURCES += \
-	kernel/qaction.cpp \
-	kernel/qactiongroup.cpp \
 	kernel/qapplication.cpp \
         kernel/qwidgetrepaintmanager.cpp \
         kernel/qboxlayout.cpp \
@@ -47,11 +39,9 @@ SOURCES += \
         kernel/qlayout.cpp \
 	kernel/qlayoutengine.cpp \
 	kernel/qlayoutitem.cpp \
-        kernel/qshortcut.cpp \
         kernel/qsizepolicy.cpp \
         kernel/qstackedlayout.cpp \
 	kernel/qwidget.cpp \
-	kernel/qwidgetaction.cpp \
 	kernel/qgesture.cpp \
 	kernel/qstandardgestures.cpp \
 	kernel/qgesturerecognizer.cpp \
@@ -67,9 +57,15 @@ macx: {
     SOURCES += kernel/qmacgesturerecognizer.cpp
 }
 
-qtConfig(opengl) {
-    HEADERS += kernel/qopenglwidget.h
-    SOURCES += kernel/qopenglwidget.cpp
+qtConfig(action) {
+    HEADERS += kernel/qaction.h \
+               kernel/qaction_p.h \
+               kernel/qactiongroup.h \
+               kernel/qwidgetaction.h \
+               kernel/qwidgetaction_p.h
+    SOURCES += kernel/qaction.cpp \
+               kernel/qactiongroup.cpp \
+               kernel/qwidgetaction.cpp
 }
 
 qtConfig(formlayout) {
@@ -77,6 +73,11 @@ qtConfig(formlayout) {
     SOURCES += kernel/qformlayout.cpp
 }
 
+qtConfig(shortcut) {
+    HEADERS += kernel/qshortcut.h
+    SOURCES += kernel/qshortcut.cpp
+}
+
 qtConfig(tooltip) {
     HEADERS += kernel/qtooltip.h
     SOURCES += kernel/qtooltip.cpp
diff --git a/src/widgets/kernel/qaction.cpp b/src/widgets/kernel/qaction.cpp
index 64b0d69f6d..934fe576d1 100644
--- a/src/widgets/kernel/qaction.cpp
+++ b/src/widgets/kernel/qaction.cpp
@@ -40,52 +40,29 @@
 #include "qaction.h"
 #include "qactiongroup.h"
 
-#ifndef QT_NO_ACTION
 #include "qaction_p.h"
 #include "qapplication.h"
 #include "qevent.h"
 #include "qlist.h"
 #include "qstylehints.h"
-#include <private/qshortcutmap_p.h>
+#if QT_CONFIG(shortcut)
+#  include <private/qshortcutmap_p.h>
+#endif
 #include <private/qguiapplication_p.h>
 #if QT_CONFIG(menu)
 #include <private/qmenu_p.h>
 #endif
 #include <private/qdebug_p.h>
 
-#define QAPP_CHECK(functionName) \
-    if (Q_UNLIKELY(!QCoreApplication::instance())) { \
-        qWarning("QAction: Initialize Q(Gui)Application before calling '" functionName "'."); \
-        return; \
-    }
 
 QT_BEGIN_NAMESPACE
 
-/*
-  internal: guesses a descriptive text from a text suited for a menu entry
- */
-static QString qt_strippedText(QString s)
-{
-    s.remove(QLatin1String("..."));
-    for (int i = 0; i < s.size(); ++i) {
-        if (s.at(i) == QLatin1Char('&'))
-            s.remove(i, 1);
-    }
-    return s.trimmed();
-}
-
-
-QActionPrivate::QActionPrivate() :
 #if QT_CONFIG(shortcut)
-    autorepeat(1),
-#endif
-    enabled(1), forceDisabled(0), visible(1), forceInvisible(0), checkable(0),
-    checked(0), separator(0), fontSet(false),
-    iconVisibleInMenu(-1), shortcutVisibleInContextMenu(-1)
+QShortcutMap::ContextMatcher QActionPrivate::contextMatcher() const
 {
+    return qWidgetShortcutContextMatcher;
 }
-
-QActionPrivate::~QActionPrivate() = default;
+#endif // QT_CONFIG(shortcut)
 
 bool QActionPrivate::showStatusText(QWidget *widget, const QString &str)
 {
@@ -102,84 +79,6 @@ bool QActionPrivate::showStatusText(QWidget *widget, const QString &str)
     return false;
 }
 
-void QActionPrivate::sendDataChanged()
-{
-    Q_Q(QAction);
-    QActionEvent e(QEvent::ActionChanged, q);
-    for (int i = 0; i < widgets.size(); ++i) {
-        QWidget *w = widgets.at(i);
-        QCoreApplication::sendEvent(w, &e);
-    }
-#if QT_CONFIG(graphicsview)
-    for (int i = 0; i < graphicsWidgets.size(); ++i) {
-        QGraphicsWidget *w = graphicsWidgets.at(i);
-        QCoreApplication::sendEvent(w, &e);
-    }
-#endif
-    QCoreApplication::sendEvent(q, &e);
-
-    emit q->changed();
-}
-
-#if QT_CONFIG(shortcut)
-void QActionPrivate::redoGrab(QShortcutMap &map)
-{
-    Q_Q(QAction);
-    if (shortcutId)
-        map.removeShortcut(shortcutId, q);
-    if (shortcut.isEmpty())
-        return;
-    shortcutId = map.addShortcut(q, shortcut, shortcutContext, qWidgetShortcutContextMatcher);
-    if (!enabled)
-        map.setShortcutEnabled(false, shortcutId, q);
-    if (!autorepeat)
-        map.setShortcutAutoRepeat(false, shortcutId, q);
-}
-
-void QActionPrivate::redoGrabAlternate(QShortcutMap &map)
-{
-    Q_Q(QAction);
-    for(int i = 0; i < alternateShortcutIds.count(); ++i) {
-        if (const int id = alternateShortcutIds.at(i))
-            map.removeShortcut(id, q);
-    }
-    alternateShortcutIds.clear();
-    if (alternateShortcuts.isEmpty())
-        return;
-    for(int i = 0; i < alternateShortcuts.count(); ++i) {
-        const QKeySequence& alternate = alternateShortcuts.at(i);
-        if (!alternate.isEmpty())
-            alternateShortcutIds.append(map.addShortcut(q, alternate, shortcutContext, qWidgetShortcutContextMatcher));
-        else
-            alternateShortcutIds.append(0);
-    }
-    if (!enabled) {
-        for(int i = 0; i < alternateShortcutIds.count(); ++i) {
-            const int id = alternateShortcutIds.at(i);
-            map.setShortcutEnabled(false, id, q);
-        }
-    }
-    if (!autorepeat) {
-        for(int i = 0; i < alternateShortcutIds.count(); ++i) {
-            const int id = alternateShortcutIds.at(i);
-            map.setShortcutAutoRepeat(false, id, q);
-        }
-    }
-}
-
-void QActionPrivate::setShortcutEnabled(bool enable, QShortcutMap &map)
-{
-    Q_Q(QAction);
-    if (shortcutId)
-        map.setShortcutEnabled(enable, shortcutId, q);
-    for(int i = 0; i < alternateShortcutIds.count(); ++i) {
-        if (const int id = alternateShortcutIds.at(i))
-            map.setShortcutEnabled(enable, id, q);
-    }
-}
-#endif // QT_NO_SHORTCUT
-
-
 /*!
     \class QAction
     \brief The QAction class provides an abstract user interface
@@ -323,12 +222,26 @@ QAction::QAction(const QIcon &icon, const QString &text, QObject* parent)
     \internal
 */
 QAction::QAction(QActionPrivate &dd, QObject *parent)
-    : QObject(dd, parent)
+    : QGuiAction(dd, parent)
+{
+}
+
+/*!
+  \reimp
+*/
+
+bool QAction::event(QEvent *e)
 {
     Q_D(QAction);
-    d->group = qobject_cast<QActionGroup *>(parent);
-    if (d->group)
-        d->group->addAction(this);
+    if (e->type() == QEvent::ActionChanged) {
+        for (auto w : qAsConst(d->widgets))
+            QCoreApplication::sendEvent(w, e);
+#if QT_CONFIG(graphicsview)
+        for (auto gw :  qAsConst(d->graphicsWidgets))
+            QCoreApplication::sendEvent(gw, e);
+#endif
+    }
+    return QGuiAction::event(e);
 }
 
 /*!
@@ -368,190 +281,6 @@ QList<QGraphicsWidget *> QAction::associatedGraphicsWidgets() const
 }
 #endif
 
-#if QT_CONFIG(shortcut)
-/*!
-    \property QAction::shortcut
-    \brief the action's primary shortcut key
-
-    Valid keycodes for this property can be found in \l Qt::Key and
-    \l Qt::Modifier. There is no default shortcut key.
-*/
-void QAction::setShortcut(const QKeySequence &shortcut)
-{
-    QAPP_CHECK("setShortcut");
-
-    Q_D(QAction);
-    if (d->shortcut == shortcut)
-        return;
-
-    d->shortcut = shortcut;
-    d->redoGrab(QGuiApplicationPrivate::instance()->shortcutMap);
-    d->sendDataChanged();
-}
-
-/*!
-    \since 4.2
-
-    Sets \a shortcuts as the list of shortcuts that trigger the
-    action. The first element of the list is the primary shortcut.
-
-    \sa shortcut
-*/
-void QAction::setShortcuts(const QList<QKeySequence> &shortcuts)
-{
-    Q_D(QAction);
-
-    QList <QKeySequence> listCopy = shortcuts;
-
-    QKeySequence primary;
-    if (!listCopy.isEmpty())
-        primary = listCopy.takeFirst();
-
-    if (d->shortcut == primary && d->alternateShortcuts == listCopy)
-        return;
-
-    QAPP_CHECK("setShortcuts");
-
-    d->shortcut = primary;
-    d->alternateShortcuts = listCopy;
-    d->redoGrab(QGuiApplicationPrivate::instance()->shortcutMap);
-    d->redoGrabAlternate(QGuiApplicationPrivate::instance()->shortcutMap);
-    d->sendDataChanged();
-}
-
-/*!
-    \since 4.2
-
-    Sets a platform dependent list of shortcuts based on the \a key.
-    The result of calling this function will depend on the currently running platform.
-    Note that more than one shortcut can assigned by this action.
-    If only the primary shortcut is required, use setShortcut instead.
-
-    \sa QKeySequence::keyBindings()
-*/
-void QAction::setShortcuts(QKeySequence::StandardKey key)
-{
-    QList <QKeySequence> list = QKeySequence::keyBindings(key);
-    setShortcuts(list);
-}
-
-/*!
-    Returns the primary shortcut.
-
-    \sa setShortcuts()
-*/
-QKeySequence QAction::shortcut() const
-{
-    Q_D(const QAction);
-    return d->shortcut;
-}
-
-/*!
-    \since 4.2
-
-    Returns the list of shortcuts, with the primary shortcut as
-    the first element of the list.
-
-    \sa setShortcuts()
-*/
-QList<QKeySequence> QAction::shortcuts() const
-{
-    Q_D(const QAction);
-    QList <QKeySequence> shortcuts;
-    if (!d->shortcut.isEmpty())
-        shortcuts << d->shortcut;
-    if (!d->alternateShortcuts.isEmpty())
-        shortcuts << d->alternateShortcuts;
-    return shortcuts;
-}
-
-/*!
-    \property QAction::shortcutContext
-    \brief the context for the action's shortcut
-
-    Valid values for this property can be found in \l Qt::ShortcutContext.
-    The default value is Qt::WindowShortcut.
-*/
-void QAction::setShortcutContext(Qt::ShortcutContext context)
-{
-    Q_D(QAction);
-    if (d->shortcutContext == context)
-        return;
-    QAPP_CHECK("setShortcutContext");
-    d->shortcutContext = context;
-    d->redoGrab(QGuiApplicationPrivate::instance()->shortcutMap);
-    d->redoGrabAlternate(QGuiApplicationPrivate::instance()->shortcutMap);
-    d->sendDataChanged();
-}
-
-Qt::ShortcutContext QAction::shortcutContext() const
-{
-    Q_D(const QAction);
-    return d->shortcutContext;
-}
-
-/*!
-    \property QAction::autoRepeat
-    \brief whether the action can auto repeat
-    \since 4.2
-
-    If true, the action will auto repeat when the keyboard shortcut
-    combination is held down, provided that keyboard auto repeat is
-    enabled on the system.
-    The default value is true.
-*/
-void QAction::setAutoRepeat(bool on)
-{
-    Q_D(QAction);
-    if (d->autorepeat == on)
-        return;
-    QAPP_CHECK("setAutoRepeat");
-    d->autorepeat = on;
-    d->redoGrab(QGuiApplicationPrivate::instance()->shortcutMap);
-    d->redoGrabAlternate(QGuiApplicationPrivate::instance()->shortcutMap);
-    d->sendDataChanged();
-}
-
-bool QAction::autoRepeat() const
-{
-    Q_D(const QAction);
-    return d->autorepeat;
-}
-#endif // QT_NO_SHORTCUT
-
-/*!
-    \property QAction::font
-    \brief the action's font
-
-    The font property is used to render the text set on the
-    QAction. The font will can be considered a hint as it will not be
-    consulted in all cases based upon application and style.
-
-    By default, this property contains the application's default font.
-
-    \sa QAction::setText(), QStyle
-*/
-void QAction::setFont(const QFont &font)
-{
-    Q_D(QAction);
-    if (d->font == font)
-        return;
-
-    d->fontSet = true;
-    d->font = font;
-    d->sendDataChanged();
-}
-
-QFont QAction::font() const
-{
-    Q_D(const QAction);
-    return d->font;
-}
-
-
-/*!
-    Destroys the object and frees allocated resources.
-*/
 QAction::~QAction()
 {
     Q_D(QAction);
@@ -565,76 +294,17 @@ QAction::~QAction()
         w->removeAction(this);
     }
 #endif
-    if (d->group)
-        d->group->removeAction(this);
-#if QT_CONFIG(shortcut)
-    if (d->shortcutId && qApp) {
-        QGuiApplicationPrivate::instance()->shortcutMap.removeShortcut(d->shortcutId, this);
-        for(int i = 0; i < d->alternateShortcutIds.count(); ++i) {
-            const int id = d->alternateShortcutIds.at(i);
-            QGuiApplicationPrivate::instance()->shortcutMap.removeShortcut(id, this);
-        }
-    }
-#endif
 }
 
 /*!
-  Sets this action group to \a group. The action will be automatically
-  added to the group's list of actions.
-
-  Actions within the group will be mutually exclusive.
-
-  \sa QActionGroup, QAction::actionGroup()
-*/
-void QAction::setActionGroup(QActionGroup *group)
-{
-    Q_D(QAction);
-    if(group == d->group)
-        return;
+   Returns the action group for this action. If no action group manages
+   this action then \nullptr will be returned.
 
-    if(d->group)
-        d->group->removeAction(this);
-    d->group = group;
-    if(group)
-        group->addAction(this);
-    d->sendDataChanged();
-}
-
-/*!
-  Returns the action group for this action. If no action group manages
-  this action then 0 will be returned.
-
-  \sa QActionGroup, QAction::setActionGroup()
-*/
+   \sa QActionGroup, QAction::setActionGroup()
+ */
 QActionGroup *QAction::actionGroup() const
 {
-    Q_D(const QAction);
-    return d->group;
-}
-
-
-/*!
-    \property QAction::icon
-    \brief the action's icon
-
-    In toolbars, the icon is used as the tool button icon; in menus,
-    it is displayed to the left of the menu text. There is no default
-    icon.
-
-    If a null icon (QIcon::isNull()) is passed into this function,
-    the icon of the action is cleared.
-*/
-void QAction::setIcon(const QIcon &icon)
-{
-    Q_D(QAction);
-    d->icon = icon;
-    d->sendDataChanged();
-}
-
-QIcon QAction::icon() const
-{
-    Q_D(const QAction);
-    return d->icon;
+    return static_cast<QActionGroup *>(guiActionGroup());
 }
 
 #if QT_CONFIG(menu)
@@ -667,460 +337,6 @@ void QAction::setMenu(QMenu *menu)
 #endif // QT_CONFIG(menu)
 
 /*!
-  If \a b is true then this action will be considered a separator.
-
-  How a separator is represented depends on the widget it is inserted
-  into. Under most circumstances the text, submenu, and icon will be
-  ignored for separator actions.
-
-  \sa QAction::isSeparator()
-*/
-void QAction::setSeparator(bool b)
-{
-    Q_D(QAction);
-    if (d->separator == b)
-        return;
-
-    d->separator = b;
-    d->sendDataChanged();
-}
-
-/*!
-  Returns \c true if this action is a separator action; otherwise it
-  returns \c false.
-
-  \sa QAction::setSeparator()
-*/
-bool QAction::isSeparator() const
-{
-    Q_D(const QAction);
-    return d->separator;
-}
-
-/*!
-    \property QAction::text
-    \brief the action's descriptive text
-
-    If the action is added to a menu, the menu option will consist of
-    the icon (if there is one), the text, and the shortcut (if there
-    is one). If the text is not explicitly set in the constructor, or
-    by using setText(), the action's description icon text will be
-    used as text. There is no default text.
-
-    \sa iconText
-*/
-void QAction::setText(const QString &text)
-{
-    Q_D(QAction);
-    if (d->text == text)
-        return;
-
-    d->text = text;
-    d->sendDataChanged();
-}
-
-QString QAction::text() const
-{
-    Q_D(const QAction);
-    QString s = d->text;
-    if(s.isEmpty()) {
-        s = d->iconText;
-        s.replace(QLatin1Char('&'), QLatin1String("&&"));
-    }
-    return s;
-}
-
-
-
-
-
-/*!
-    \property QAction::iconText
-    \brief the action's descriptive icon text
-
-    If QToolBar::toolButtonStyle is set to a value that permits text to
-    be displayed, the text defined held in this property appears as a
-    label in the relevant tool button.
-
-    It also serves as the default text in menus and tooltips if the action
-    has not been defined with setText() or setToolTip(), and will
-    also be used in toolbar buttons if no icon has been defined using setIcon().
-
-    If the icon text is not explicitly set, the action's normal text will be
-    used for the icon text.
-
-    By default, this property contains an empty string.
-
-    \sa setToolTip(), setStatusTip()
-*/
-void QAction::setIconText(const QString &text)
-{
-    Q_D(QAction);
-    if (d->iconText == text)
-        return;
-
-    d->iconText = text;
-    d->sendDataChanged();
-}
-
-QString QAction::iconText() const
-{
-    Q_D(const QAction);
-    if (d->iconText.isEmpty())
-        return qt_strippedText(d->text);
-    return d->iconText;
-}
-
-/*!
-    \property QAction::toolTip
-    \brief the action's tooltip
-
-    This text is used for the tooltip. If no tooltip is specified,
-    the action's text is used.
-
-    By default, this property contains the action's text.
-
-    \sa setStatusTip(), setShortcut()
-*/
-void QAction::setToolTip(const QString &tooltip)
-{
-    Q_D(QAction);
-    if (d->tooltip == tooltip)
-        return;
-
-    d->tooltip = tooltip;
-    d->sendDataChanged();
-}
-
-QString QAction::toolTip() const
-{
-    Q_D(const QAction);
-    if (d->tooltip.isEmpty()) {
-        if (!d->text.isEmpty())
-            return qt_strippedText(d->text);
-        return qt_strippedText(d->iconText);
-    }
-    return d->tooltip;
-}
-
-/*!
-    \property QAction::statusTip
-    \brief the action's status tip
-
-    The status tip is displayed on all status bars provided by the
-    action's top-level parent widget.
-
-    By default, this property contains an empty string.
-
-    \sa setToolTip(), showStatusText()
-*/
-void QAction::setStatusTip(const QString &statustip)
-{
-    Q_D(QAction);
-    if (d->statustip == statustip)
-        return;
-
-    d->statustip = statustip;
-    d->sendDataChanged();
-}
-
-QString QAction::statusTip() const
-{
-    Q_D(const QAction);
-    return d->statustip;
-}
-
-/*!
-    \property QAction::whatsThis
-    \brief the action's "What's This?" help text
-
-    The "What's This?" text is used to provide a brief description of
-    the action. The text may contain rich text. There is no default
-    "What's This?" text.
-
-    \sa QWhatsThis
-*/
-void QAction::setWhatsThis(const QString &whatsthis)
-{
-    Q_D(QAction);
-    if (d->whatsthis == whatsthis)
-        return;
-
-    d->whatsthis = whatsthis;
-    d->sendDataChanged();
-}
-
-QString QAction::whatsThis() const
-{
-    Q_D(const QAction);
-    return d->whatsthis;
-}
-
-/*!
-    \enum QAction::Priority
-    \since 4.6
-
-    This enum defines priorities for actions in user interface.
-
-    \value LowPriority The action should not be prioritized in
-    the user interface.
-
-    \value NormalPriority
-
-    \value HighPriority The action should be prioritized in
-    the user interface.
-
-    \sa priority
-*/
-
-
-/*!
-    \property QAction::priority
-    \since 4.6
-
-    \brief the actions's priority in the user interface.
-
-    This property can be set to indicate how the action should be prioritized
-    in the user interface.
-
-    For instance, when toolbars have the Qt::ToolButtonTextBesideIcon
-    mode set, then actions with LowPriority will not show the text
-    labels.
-*/
-void QAction::setPriority(Priority priority)
-{
-    Q_D(QAction);
-    if (d->priority == priority)
-        return;
-
-    d->priority = priority;
-    d->sendDataChanged();
-}
-
-QAction::Priority QAction::priority() const
-{
-    Q_D(const QAction);
-    return d->priority;
-}
-
-/*!
-    \property QAction::checkable
-    \brief whether the action is a checkable action
-
-    A checkable action is one which has an on/off state. For example,
-    in a word processor, a Bold toolbar button may be either on or
-    off. An action which is not a toggle action is a command action;
-    a command action is simply executed, e.g. file save.
-    By default, this property is \c false.
-
-    In some situations, the state of one toggle action should depend
-    on the state of others. For example, "Left Align", "Center" and
-    "Right Align" toggle actions are mutually exclusive. To achieve
-    exclusive toggling, add the relevant toggle actions to a
-    QActionGroup with the QActionGroup::exclusive property set to
-    true.
-
-    \sa QAction::setChecked()
-*/
-void QAction::setCheckable(bool b)
-{
-    Q_D(QAction);
-    if (d->checkable == b)
-        return;
-
-    d->checkable = b;
-    d->checked = false;
-    d->sendDataChanged();
-}
-
-bool QAction::isCheckable() const
-{
-    Q_D(const QAction);
-    return d->checkable;
-}
-
-/*!
-    \fn void QAction::toggle()
-
-    This is a convenience function for the \l checked property.
-    Connect to it to change the checked state to its opposite state.
-*/
-void QAction::toggle()
-{
-    Q_D(QAction);
-    setChecked(!d->checked);
-}
-
-/*!
-    \property QAction::checked
-    \brief whether the action is checked.
-
-    Only checkable actions can be checked.  By default, this is false
-    (the action is unchecked).
-
-    \note The notifier signal for this property is toggled(). As toggling
-    a QAction changes its state, it will also emit a changed() signal.
-
-    \sa checkable, toggled()
-*/
-void QAction::setChecked(bool b)
-{
-    Q_D(QAction);
-    if (!d->checkable || d->checked == b)
-        return;
-
-    QPointer<QAction> guard(this);
-    d->checked = b;
-    d->sendDataChanged();
-    if (guard)
-        emit toggled(b);
-}
-
-bool QAction::isChecked() const
-{
-    Q_D(const QAction);
-    return d->checked;
-}
-
-/*!
-    \fn void QAction::setDisabled(bool b)
-
-    This is a convenience function for the \l enabled property, that
-    is useful for signals--slots connections. If \a b is true the
-    action is disabled; otherwise it is enabled.
-*/
-
-/*!
-    \property QAction::enabled
-    \brief whether the action is enabled
-
-    Disabled actions cannot be chosen by the user. They do not
-    disappear from menus or toolbars, but they are displayed in a way
-    which indicates that they are unavailable. For example, they might
-    be displayed using only shades of gray.
-
-    \uicontrol{What's This?} help on disabled actions is still available, provided
-    that the QAction::whatsThis property is set.
-
-    An action will be disabled when all widgets to which it is added
-    (with QWidget::addAction()) are disabled or not visible. When an
-    action is disabled, it is not possible to trigger it through its
-    shortcut.
-
-    By default, this property is \c true (actions are enabled).
-
-    \sa text
-*/
-void QAction::setEnabled(bool b)
-{
-    Q_D(QAction);
-    if (b == d->enabled && b != d->forceDisabled)
-        return;
-    d->forceDisabled = !b;
-    if (b && (!d->visible || (d->group && !d->group->isEnabled())))
-        return;
-    QAPP_CHECK("setEnabled");
-    d->enabled = b;
-#if QT_CONFIG(shortcut)
-    d->setShortcutEnabled(b, QGuiApplicationPrivate::instance()->shortcutMap);
-#endif
-    d->sendDataChanged();
-}
-
-bool QAction::isEnabled() const
-{
-    Q_D(const QAction);
-    return d->enabled;
-}
-
-/*!
-    \property QAction::visible
-    \brief whether the action can be seen (e.g. in menus and toolbars)
-
-    If \e visible is true the action can be seen (e.g. in menus and
-    toolbars) and chosen by the user; if \e visible is false the
-    action cannot be seen or chosen by the user.
-
-    Actions which are not visible are \e not grayed out; they do not
-    appear at all.
-
-    By default, this property is \c true (actions are visible).
-*/
-void QAction::setVisible(bool b)
-{
-    Q_D(QAction);
-    if (b == d->visible && b != d->forceInvisible)
-        return;
-    QAPP_CHECK("setVisible");
-    d->forceInvisible = !b;
-    d->visible = b;
-    d->enabled = b && !d->forceDisabled && (!d->group || d->group->isEnabled()) ;
-#if QT_CONFIG(shortcut)
-    d->setShortcutEnabled(d->enabled, QGuiApplicationPrivate::instance()->shortcutMap);
-#endif
-    d->sendDataChanged();
-}
-
-
-bool QAction::isVisible() const
-{
-    Q_D(const QAction);
-    return d->visible;
-}
-
-/*!
-  \reimp
-*/
-bool
-QAction::event(QEvent *e)
-{
-#if QT_CONFIG(shortcut)
-    if (e->type() == QEvent::Shortcut) {
-        QShortcutEvent *se = static_cast<QShortcutEvent *>(e);
-        Q_ASSERT_X(se->key() == d_func()->shortcut || d_func()->alternateShortcuts.contains(se->key()),
-                   "QAction::event",
-                   "Received shortcut event from incorrect shortcut");
-        if (se->isAmbiguous())
-            qWarning("QAction::event: Ambiguous shortcut overload: %s", se->key().toString(QKeySequence::NativeText).toLatin1().constData());
-        else
-            activate(Trigger);
-        return true;
-    }
-#endif
-    return QObject::event(e);
-}
-
-/*!
-  Returns the user data as set in QAction::setData.
-
-  \sa setData()
-*/
-QVariant
-QAction::data() const
-{
-    Q_D(const QAction);
-    return d->userData;
-}
-
-/*!
-  \fn void QAction::setData(const QVariant &userData)
-
-  Sets the action's internal data to the given \a userData.
-
-  \sa data()
-*/
-void
-QAction::setData(const QVariant &data)
-{
-    Q_D(QAction);
-    if (d->userData == data)
-        return;
-    d->userData = data;
-    d->sendDataChanged();
-}
-
-
-/*!
   Updates the relevant status bar for the \a widget specified by sending a
   QStatusTipEvent to its parent widget. Returns \c true if an event was sent;
   otherwise returns \c false.
@@ -1135,233 +351,4 @@ QAction::showStatusText(QWidget *widget)
     return d_func()->showStatusText(widget, statusTip());
 }
 
-/*!
-  Sends the relevant signals for ActionEvent \a event.
-
-  Action based widgets use this API to cause the QAction
-  to emit signals as well as emitting their own.
-*/
-void QAction::activate(ActionEvent event)
-{
-    Q_D(QAction);
-    if(event == Trigger) {
-        QPointer<QObject> guard = this;
-        if(d->checkable) {
-            // the checked action of an exclusive group may not be unchecked
-            if (d->checked && (d->group
-                               && d->group->exclusionPolicy() == QActionGroup::ExclusionPolicy::Exclusive
-                               && d->group->checkedAction() == this)) {
-                if (!guard.isNull())
-                    emit triggered(true);
-                return;
-            }
-            setChecked(!d->checked);
-        }
-        if (!guard.isNull())
-            emit triggered(d->checked);
-    } else if(event == Hover) {
-        emit hovered();
-    }
-}
-
-/*!
-    \fn void QAction::triggered(bool checked)
-
-    This signal is emitted when an action is activated by the user;
-    for example, when the user clicks a menu option, toolbar button,
-    or presses an action's shortcut key combination, or when trigger()
-    was called. Notably, it is \e not emitted when setChecked() or
-    toggle() is called.
-
-    If the action is checkable, \a checked is true if the action is
-    checked, or false if the action is unchecked.
-
-    \sa QAction::activate(), QAction::toggled(), checked
-*/
-
-/*!
-    \fn void QAction::toggled(bool checked)
-
-    This signal is emitted whenever a checkable action changes its
-    isChecked() status. This can be the result of a user interaction,
-    or because setChecked() was called. As setChecked() changes the
-    QAction, it emits changed() in addition to toggled().
-
-    \a checked is true if the action is checked, or false if the
-    action is unchecked.
-
-    \sa QAction::activate(), QAction::triggered(), checked
-*/
-
-/*!
-    \fn void QAction::hovered()
-
-    This signal is emitted when an action is highlighted by the user;
-    for example, when the user pauses with the cursor over a menu option,
-    toolbar button, or presses an action's shortcut key combination.
-
-    \sa QAction::activate()
-*/
-
-/*!
-    \fn void QAction::changed()
-
-    This signal is emitted when an action has changed. If you
-    are only interested in actions in a given widget, you can
-    watch for QWidget::actionEvent() sent with an
-    QEvent::ActionChanged.
-
-    \sa QWidget::actionEvent()
-*/
-
-/*!
-    \enum QAction::ActionEvent
-
-    This enum type is used when calling QAction::activate()
-
-    \value Trigger this will cause the QAction::triggered() signal to be emitted.
-
-    \value Hover this will cause the QAction::hovered() signal to be emitted.
-*/
-
-/*!
-    \property QAction::menuRole
-    \brief the action's menu role
-    \since 4.2
-
-    This indicates what role the action serves in the application menu on
-    \macos. By default all actions have the TextHeuristicRole, which means that
-    the action is added based on its text (see QMenuBar for more information).
-
-    The menu role can only be changed before the actions are put into the menu
-    bar in \macos (usually just before the first application window is
-    shown).
-*/
-void QAction::setMenuRole(MenuRole menuRole)
-{
-    Q_D(QAction);
-    if (d->menuRole == menuRole)
-        return;
-
-    d->menuRole = menuRole;
-    d->sendDataChanged();
-}
-
-QAction::MenuRole QAction::menuRole() const
-{
-    Q_D(const QAction);
-    return d->menuRole;
-}
-
-/*!
-    \property QAction::iconVisibleInMenu
-    \brief Whether or not an action should show an icon in a menu
-    \since 4.4
-
-    In some applications, it may make sense to have actions with icons in the
-    toolbar, but not in menus. If true, the icon (if valid) is shown in the menu, when it
-    is false, it is not shown.
-
-    The default is to follow whether the Qt::AA_DontShowIconsInMenus attribute
-    is set for the application. Explicitly settings this property overrides
-    the presence (or abscence) of the attribute.
-
-    For example:
-    \snippet code/src_gui_kernel_qaction.cpp 0
-
-    \sa QAction::icon, QCoreApplication::setAttribute()
-*/
-void QAction::setIconVisibleInMenu(bool visible)
-{
-    Q_D(QAction);
-    if (d->iconVisibleInMenu == -1 || visible != bool(d->iconVisibleInMenu)) {
-        int oldValue = d->iconVisibleInMenu;
-        d->iconVisibleInMenu = visible;
-        // Only send data changed if we really need to.
-        if (oldValue != -1
-            || visible == !QCoreApplication::testAttribute(Qt::AA_DontShowIconsInMenus)) {
-            d->sendDataChanged();
-        }
-    }
-}
-
-bool QAction::isIconVisibleInMenu() const
-{
-    Q_D(const QAction);
-    if (d->iconVisibleInMenu == -1) {
-        return !QCoreApplication::testAttribute(Qt::AA_DontShowIconsInMenus);
-    }
-    return d->iconVisibleInMenu;
-}
-
-/*!
-    \property QAction::shortcutVisibleInContextMenu
-    \brief Whether or not an action should show a shortcut in a context menu
-    \since 5.10
-
-    In some applications, it may make sense to have actions with shortcuts in
-    context menus. If true, the shortcut (if valid) is shown when the action is
-    shown via a context menu, when it is false, it is not shown.
-
-    The default is to follow whether the Qt::AA_DontShowShortcutsInContextMenus attribute
-    is set for the application, falling back to the widget style hint.
-    Explicitly setting this property overrides the presence (or abscence) of the attribute.
-
-    \sa QAction::shortcut, QCoreApplication::setAttribute()
-*/
-void QAction::setShortcutVisibleInContextMenu(bool visible)
-{
-    Q_D(QAction);
-    if (d->shortcutVisibleInContextMenu == -1 || visible != bool(d->shortcutVisibleInContextMenu)) {
-        int oldValue = d->shortcutVisibleInContextMenu;
-        d->shortcutVisibleInContextMenu = visible;
-        // Only send data changed if we really need to.
-        if (oldValue != -1
-            || visible == !QCoreApplication::testAttribute(Qt::AA_DontShowShortcutsInContextMenus)) {
-            d->sendDataChanged();
-        }
-    }
-}
-
-bool QAction::isShortcutVisibleInContextMenu() const
-{
-    Q_D(const QAction);
-    if (d->shortcutVisibleInContextMenu == -1) {
-        return !QCoreApplication::testAttribute(Qt::AA_DontShowShortcutsInContextMenus)
-            && QGuiApplication::styleHints()->showShortcutsInContextMenus();
-    }
-    return d->shortcutVisibleInContextMenu;
-}
-
-#ifndef QT_NO_DEBUG_STREAM
-Q_WIDGETS_EXPORT QDebug operator<<(QDebug d, const QAction *action)
-{
-    QDebugStateSaver saver(d);
-    d.nospace();
-    d << "QAction(" << static_cast<const void *>(action);
-    if (action) {
-        d << " text=" << action->text();
-        if (!action->toolTip().isEmpty())
-            d << " toolTip=" << action->toolTip();
-        if (action->isCheckable())
-            d << " checked=" << action->isChecked();
-#if QT_CONFIG(shortcut)
-        if (!action->shortcut().isEmpty())
-            d << " shortcut=" << action->shortcut();
-#endif
-        d << " menuRole=";
-        QtDebugUtils::formatQEnum(d, action->menuRole());
-        d << " visible=" << action->isVisible();
-    } else {
-        d << '0';
-    }
-    d << ')';
-    return d;
-}
-#endif // QT_NO_DEBUG_STREAM
-
 QT_END_NAMESPACE
-
-#include "moc_qaction.cpp"
-
-#endif // QT_NO_ACTION
diff --git a/src/widgets/kernel/qaction.h b/src/widgets/kernel/qaction.h
index 258a1ea0a0..808ee9065d 100644
--- a/src/widgets/kernel/qaction.h
+++ b/src/widgets/kernel/qaction.h
@@ -41,137 +41,39 @@
 #define QACTION_H
 
 #include <QtWidgets/qtwidgetsglobal.h>
-#include <QtGui/qkeysequence.h>
+#include <QtGui/qguiaction.h>
 #include <QtCore/qstring.h>
 #include <QtWidgets/qwidget.h>
 #include <QtCore/qvariant.h>
-#include <QtGui/qicon.h>
-
-QT_BEGIN_NAMESPACE
 
+QT_REQUIRE_CONFIG(action);
 
-#ifndef QT_NO_ACTION
+QT_BEGIN_NAMESPACE
 
 class QMenu;
 class QActionGroup;
 class QActionPrivate;
 class QGraphicsWidget;
 
-class Q_WIDGETS_EXPORT QAction : public QObject
+class Q_WIDGETS_EXPORT QAction : public QGuiAction
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(QAction)
-
-    Q_PROPERTY(bool checkable READ isCheckable WRITE setCheckable NOTIFY changed)
-    Q_PROPERTY(bool checked READ isChecked WRITE setChecked NOTIFY toggled)
-    Q_PROPERTY(bool enabled READ isEnabled WRITE setEnabled NOTIFY changed)
-    Q_PROPERTY(QIcon icon READ icon WRITE setIcon NOTIFY changed)
-    Q_PROPERTY(QString text READ text WRITE setText NOTIFY changed)
-    Q_PROPERTY(QString iconText READ iconText WRITE setIconText NOTIFY changed)
-    Q_PROPERTY(QString toolTip READ toolTip WRITE setToolTip NOTIFY changed)
-    Q_PROPERTY(QString statusTip READ statusTip WRITE setStatusTip NOTIFY changed)
-    Q_PROPERTY(QString whatsThis READ whatsThis WRITE setWhatsThis NOTIFY changed)
-    Q_PROPERTY(QFont font READ font WRITE setFont NOTIFY changed)
-#if QT_CONFIG(shortcut)
-    Q_PROPERTY(QKeySequence shortcut READ shortcut WRITE setShortcut NOTIFY changed)
-    Q_PROPERTY(Qt::ShortcutContext shortcutContext READ shortcutContext WRITE setShortcutContext NOTIFY changed)
-    Q_PROPERTY(bool autoRepeat READ autoRepeat WRITE setAutoRepeat NOTIFY changed)
-#endif
-    Q_PROPERTY(bool visible READ isVisible WRITE setVisible NOTIFY changed)
-    Q_PROPERTY(MenuRole menuRole READ menuRole WRITE setMenuRole NOTIFY changed)
-    Q_PROPERTY(bool iconVisibleInMenu READ isIconVisibleInMenu WRITE setIconVisibleInMenu NOTIFY changed)
-    Q_PROPERTY(bool shortcutVisibleInContextMenu READ isShortcutVisibleInContextMenu WRITE setShortcutVisibleInContextMenu NOTIFY changed)
-    Q_PROPERTY(Priority priority READ priority WRITE setPriority)
-
 public:
-    // note this is copied into qplatformmenu.h, which must stay in sync
-    enum MenuRole { NoRole = 0, TextHeuristicRole, ApplicationSpecificRole, AboutQtRole,
-                    AboutRole, PreferencesRole, QuitRole };
-    Q_ENUM(MenuRole)
-    enum Priority { LowPriority = 0,
-                    NormalPriority = 128,
-                    HighPriority = 256};
-    Q_ENUM(Priority)
-    explicit QAction(QObject *parent = nullptr);
-    explicit QAction(const QString &text, QObject *parent = nullptr);
-    explicit QAction(const QIcon &icon, const QString &text, QObject *parent = nullptr);
-
+    QAction(QObject* parent = nullptr);
+    QAction(const QString &text, QObject* parent = nullptr);
+    QAction(const QIcon &icon, const QString &text, QObject* parent);
     ~QAction();
 
-    void setActionGroup(QActionGroup *group);
     QActionGroup *actionGroup() const;
-    void setIcon(const QIcon &icon);
-    QIcon icon() const;
-
-    void setText(const QString &text);
-    QString text() const;
-
-    void setIconText(const QString &text);
-    QString iconText() const;
-
-    void setToolTip(const QString &tip);
-    QString toolTip() const;
-
-    void setStatusTip(const QString &statusTip);
-    QString statusTip() const;
-
-    void setWhatsThis(const QString &what);
-    QString whatsThis() const;
-
-    void setPriority(Priority priority);
-    Priority priority() const;
 
 #if QT_CONFIG(menu)
     QMenu *menu() const;
     void setMenu(QMenu *menu);
 #endif
 
-    void setSeparator(bool b);
-    bool isSeparator() const;
-
-#if QT_CONFIG(shortcut)
-    void setShortcut(const QKeySequence &shortcut);
-    QKeySequence shortcut() const;
-
-    void setShortcuts(const QList<QKeySequence> &shortcuts);
-    void setShortcuts(QKeySequence::StandardKey);
-    QList<QKeySequence> shortcuts() const;
-
-    void setShortcutContext(Qt::ShortcutContext context);
-    Qt::ShortcutContext shortcutContext() const;
-
-    void setAutoRepeat(bool);
-    bool autoRepeat() const;
-#endif
-
-    void setFont(const QFont &font);
-    QFont font() const;
-
-    void setCheckable(bool);
-    bool isCheckable() const;
-
-    QVariant data() const;
-    void setData(const QVariant &var);
-
-    bool isChecked() const;
-
-    bool isEnabled() const;
-
-    bool isVisible() const;
-
-    enum ActionEvent { Trigger, Hover };
-    void activate(ActionEvent event);
     bool showStatusText(QWidget *widget = nullptr);
 
-    void setMenuRole(MenuRole menuRole);
-    MenuRole menuRole() const;
-
-    void setIconVisibleInMenu(bool visible);
-    bool isIconVisibleInMenu() const;
-
-    void setShortcutVisibleInContextMenu(bool show);
-    bool isShortcutVisibleInContextMenu() const;
-
     QWidget *parentWidget() const;
 
     QList<QWidget *> associatedWidgets() const;
@@ -180,30 +82,14 @@ public:
 #endif
 
 protected:
-    bool event(QEvent *) override;
     QAction(QActionPrivate &dd, QObject *parent);
-
-public Q_SLOTS:
-    void trigger() { activate(Trigger); }
-    void hover() { activate(Hover); }
-    void setChecked(bool);
-    void toggle();
-    void setEnabled(bool);
-    inline void setDisabled(bool b) { setEnabled(!b); }
-    void setVisible(bool);
-
-Q_SIGNALS:
-    void changed();
-    void triggered(bool checked = false);
-    void hovered();
-    void toggled(bool);
+    bool event(QEvent *) override;
 
 private:
     Q_DISABLE_COPY(QAction)
 
     friend class QGraphicsWidget;
     friend class QWidget;
-    friend class QActionGroup;
     friend class QMenu;
     friend class QMenuPrivate;
     friend class QMenuBar;
@@ -221,8 +107,6 @@ QT_BEGIN_INCLUDE_NAMESPACE
 #include <QtWidgets/qactiongroup.h>
 QT_END_INCLUDE_NAMESPACE
 
-#endif // QT_NO_ACTION
-
 QT_END_NAMESPACE
 
 #endif // QACTION_H
diff --git a/src/widgets/kernel/qaction_p.h b/src/widgets/kernel/qaction_p.h
index 6b6ca8076f..b865769372 100644
--- a/src/widgets/kernel/qaction_p.h
+++ b/src/widgets/kernel/qaction_p.h
@@ -52,6 +52,7 @@
 //
 
 #include <QtWidgets/private/qtwidgetsglobal_p.h>
+#include <QtGui/private/qguiaction_p.h>
 #include "QtWidgets/qaction.h"
 #if QT_CONFIG(menu)
 #include "QtWidgets/qmenu.h"
@@ -68,12 +69,15 @@ QT_BEGIN_NAMESPACE
 
 class QShortcutMap;
 
-class Q_WIDGETS_EXPORT QActionPrivate : public QObjectPrivate
+class Q_WIDGETS_EXPORT QActionPrivate : public QGuiActionPrivate
 {
     Q_DECLARE_PUBLIC(QAction)
 public:
-    QActionPrivate();
-    ~QActionPrivate();
+    QActionPrivate() = default;
+
+#if QT_CONFIG(shortcut)
+    QShortcutMap::ContextMatcher contextMatcher() const override;
+#endif
 
     static QActionPrivate *get(QAction *q)
     {
@@ -82,50 +86,11 @@ public:
 
     bool showStatusText(QWidget *w, const QString &str);
 
-    QPointer<QActionGroup> group;
-    QString text;
-    QString iconText;
-    QIcon icon;
-    QString tooltip;
-    QString statustip;
-    QString whatsthis;
-#if QT_CONFIG(shortcut)
-    QKeySequence shortcut;
-    QList<QKeySequence> alternateShortcuts;
-#endif
-    QVariant userData;
-#if QT_CONFIG(shortcut)
-    int shortcutId = 0;
-    QVector<int> alternateShortcutIds;
-    Qt::ShortcutContext shortcutContext = Qt::WindowShortcut;
-    uint autorepeat : 1;
-#endif
-    QFont font;
     QPointer<QMenu> menu;
-    uint enabled : 1, forceDisabled : 1;
-    uint visible : 1, forceInvisible : 1;
-    uint checkable : 1;
-    uint checked : 1;
-    uint separator : 1;
-    uint fontSet : 1;
-
-    int iconVisibleInMenu : 2;  // Only has values -1, 0, and 1
-    int shortcutVisibleInContextMenu : 2; // Only has values -1, 0, and 1
-
-    QAction::MenuRole menuRole = QAction::TextHeuristicRole;
-    QAction::Priority priority = QAction::NormalPriority;
-
     QWidgetList widgets;
 #if QT_CONFIG(graphicsview)
     QList<QGraphicsWidget *> graphicsWidgets;
 #endif
-#if QT_CONFIG(shortcut)
-    void redoGrab(QShortcutMap &map);
-    void redoGrabAlternate(QShortcutMap &map);
-    void setShortcutEnabled(bool enable, QShortcutMap &map);
-#endif // QT_NO_SHORTCUT
-
-    void sendDataChanged();
 };
 
 #endif // QT_NO_ACTION
diff --git a/src/widgets/kernel/qactiongroup.cpp b/src/widgets/kernel/qactiongroup.cpp
index d51fb778c4..cc900cbb0f 100644
--- a/src/widgets/kernel/qactiongroup.cpp
+++ b/src/widgets/kernel/qactiongroup.cpp
@@ -38,70 +38,32 @@
 ****************************************************************************/
 
 #include "qactiongroup.h"
+#include <QtGui/private/qguiactiongroup_p.h>
 
-#ifndef QT_NO_ACTION
-
-#include "qaction_p.h"
-#include "qevent.h"
-#include "qlist.h"
+#include "qaction.h"
 
 QT_BEGIN_NAMESPACE
 
-class QActionGroupPrivate : public QObjectPrivate
+class QActionGroupPrivate : public QGuiActionGroupPrivate
 {
     Q_DECLARE_PUBLIC(QActionGroup)
 public:
-    QActionGroupPrivate() : enabled(1),
-                            visible(1),
-                            exclusionPolicy(QActionGroup::ExclusionPolicy::Exclusive)
-    {
-    }
-    QList<QAction *> actions;
-    QPointer<QAction> current;
-    uint enabled : 1;
-    uint visible : 1;
-    QActionGroup::ExclusionPolicy exclusionPolicy;
-
-private:
-    void _q_actionTriggered();  //private slot
-    void _q_actionChanged();    //private slot
-    void _q_actionHovered();    //private slot
+     void emitSignal(Signal, QGuiAction *) override;
 };
 
-void QActionGroupPrivate::_q_actionChanged()
+void QActionGroupPrivate::emitSignal(Signal s, QGuiAction *action)
 {
     Q_Q(QActionGroup);
-    QAction *action = qobject_cast<QAction*>(q->sender());
-    Q_ASSERT_X(action != nullptr, "QActionGroup::_q_actionChanged", "internal error");
-    if (exclusionPolicy != QActionGroup::ExclusionPolicy::None) {
-        if (action->isChecked()) {
-            if (action != current) {
-                if(current)
-                    current->setChecked(false);
-                current = action;
-            }
-        } else if (action == current) {
-            current = nullptr;
-        }
+    switch (s) {
+    case QGuiActionGroupPrivate::Triggered:
+        emit q->triggered(static_cast<QAction *>(action));
+        break;
+    case QGuiActionGroupPrivate::Hovered:
+        emit q->hovered(static_cast<QAction *>(action));
+        break;
     }
 }
 
-void QActionGroupPrivate::_q_actionTriggered()
-{
-    Q_Q(QActionGroup);
-    QAction *action = qobject_cast<QAction*>(q->sender());
-    Q_ASSERT_X(action != nullptr, "QActionGroup::_q_actionTriggered", "internal error");
-    emit q->triggered(action);
-}
-
-void QActionGroupPrivate::_q_actionHovered()
-{
-    Q_Q(QActionGroup);
-    QAction *action = qobject_cast<QAction*>(q->sender());
-    Q_ASSERT_X(action != nullptr, "QActionGroup::_q_actionHovered", "internal error");
-    emit q->hovered(action);
-}
-
 /*!
     \class QActionGroup
     \brief The QActionGroup class groups actions together.
@@ -154,27 +116,6 @@ void QActionGroupPrivate::_q_actionHovered()
 */
 
 /*!
-    \enum QActionGroup::ExclusionPolicy
-
-    This enum specifies the different policies that can be used to
-    control how the group performs exclusive checking on checkable actions.
-
-    \value None
-           The actions in the group can be checked independently of each other.
-
-    \value Exclusive
-           Exactly one action can be checked at any one time.
-           This is the default policy.
-
-    \value ExclusiveOptional
-           At most one action can be checked at any one time. The actions
-           can also be all unchecked.
-
-    \sa exclusionPolicy
-    \since 5.14
-*/
-
-/*!
     Constructs an action group for the \a parent object.
 
     The action group is exclusive by default. Call setExclusive(false)
@@ -182,53 +123,24 @@ void QActionGroupPrivate::_q_actionHovered()
     but allow unchecking the active action call instead
     setExclusionPolicy(QActionGroup::ExclusionPolicy::ExclusiveOptional)
 */
-QActionGroup::QActionGroup(QObject* parent) : QObject(*new QActionGroupPrivate, parent)
+QActionGroup::QActionGroup(QObject* parent) :
+    QGuiActionGroup(*new QActionGroupPrivate, parent)
 {
 }
 
 /*!
     Destroys the action group.
 */
-QActionGroup::~QActionGroup()
+QActionGroup::~QActionGroup() = default;
+
+QAction *QActionGroup::checkedAction() const
 {
+    return static_cast<QAction *>(checkedGuiAction());
 }
 
-/*!
-    \fn QAction *QActionGroup::addAction(QAction *action)
-
-    Adds the \a action to this group, and returns it.
-
-    Normally an action is added to a group by creating it with the
-    group as its parent, so this function is not usually used.
-
-    \sa QAction::setActionGroup()
-*/
-QAction *QActionGroup::addAction(QAction* a)
+QAction *QActionGroup::addAction(QAction *a)
 {
-    Q_D(QActionGroup);
-    if(!d->actions.contains(a)) {
-        d->actions.append(a);
-        QObject::connect(a, SIGNAL(triggered()), this, SLOT(_q_actionTriggered()));
-        QObject::connect(a, SIGNAL(changed()), this, SLOT(_q_actionChanged()));
-        QObject::connect(a, SIGNAL(hovered()), this, SLOT(_q_actionHovered()));
-    }
-    if(!a->d_func()->forceDisabled) {
-        a->setEnabled(d->enabled);
-        a->d_func()->forceDisabled = false;
-    }
-    if(!a->d_func()->forceInvisible) {
-        a->setVisible(d->visible);
-        a->d_func()->forceInvisible = false;
-    }
-    if(a->isChecked())
-        d->current = a;
-    QActionGroup *oldGroup = a->d_func()->group;
-    if(oldGroup != this) {
-        if (oldGroup)
-            oldGroup->removeAction(a);
-        a->d_func()->group = this;
-        a->d_func()->sendDataChanged();
-    }
+    QGuiActionGroup::addAction(a);
     return a;
 }
 
@@ -261,185 +173,16 @@ QAction *QActionGroup::addAction(const QIcon &icon, const QString &text)
 }
 
 /*!
-  Removes the \a action from this group. The action will have no
-  parent as a result.
-
-  \sa QAction::setActionGroup()
-*/
-void QActionGroup::removeAction(QAction *action)
-{
-    Q_D(QActionGroup);
-    if (d->actions.removeAll(action)) {
-        if (action == d->current)
-            d->current = nullptr;
-        QObject::disconnect(action, SIGNAL(triggered()), this, SLOT(_q_actionTriggered()));
-        QObject::disconnect(action, SIGNAL(changed()), this, SLOT(_q_actionChanged()));
-        QObject::disconnect(action, SIGNAL(hovered()), this, SLOT(_q_actionHovered()));
-        action->d_func()->group = nullptr;
-    }
-}
-
-/*!
     Returns the list of this groups's actions. This may be empty.
 */
 QList<QAction*> QActionGroup::actions() const
 {
-    Q_D(const QActionGroup);
-    return d->actions;
+    QList<QAction*> result;
+    const auto baseActions = guiActions();
+    result.reserve(baseActions.size());
+    for (auto baseAction : baseActions)
+        result.append(static_cast<QAction*>(baseAction));
+    return result;
 }
 
-/*!
-    \brief Enable or disable the group exclusion checking
-
-    This is a convenience method that calls
-    setExclusionPolicy(ExclusionPolicy::Exclusive) when \a b is true,
-    else setExclusionPolicy(QActionGroup::ExclusionPolicy::None).
-
-    \sa QActionGroup::exclusionPolicy
-*/
-void QActionGroup::setExclusive(bool b)
-{
-    setExclusionPolicy(b ? QActionGroup::ExclusionPolicy::Exclusive
-                         : QActionGroup::ExclusionPolicy::None);
-}
-
-/*!
-    \brief Returns true if the group is exclusive
-
-    The group is exclusive if the ExclusionPolicy is either Exclusive
-    or ExclusionOptional.
-
-*/
-bool QActionGroup::isExclusive() const
-{
-    return exclusionPolicy() != QActionGroup::ExclusionPolicy::None;
-}
-
-/*!
-    \property QActionGroup::exclusionPolicy
-    \brief This property holds the group exclusive checking policy
-
-    If exclusionPolicy is set to Exclusive, only one checkable
-    action in the action group can ever be active at any time. If the user
-    chooses another checkable action in the group, the one they chose becomes
-    active and the one that was active becomes inactive. If exclusionPolicy is
-    set to ExclusionOptional the group is exclusive but the active checkable
-    action in the group can be unchecked leaving the group with no actions
-    checked.
-
-    \sa QAction::checkable
-    \since 5.14
-*/
-void QActionGroup::setExclusionPolicy(QActionGroup::ExclusionPolicy policy)
-{
-    Q_D(QActionGroup);
-    d->exclusionPolicy = policy;
-}
-
-QActionGroup::ExclusionPolicy QActionGroup::exclusionPolicy() const
-{
-    Q_D(const QActionGroup);
-    return d->exclusionPolicy;
-}
-
-/*!
-    \fn void QActionGroup::setDisabled(bool b)
-
-    This is a convenience function for the \l enabled property, that
-    is useful for signals--slots connections. If \a b is true the
-    action group is disabled; otherwise it is enabled.
-*/
-
-/*!
-    \property QActionGroup::enabled
-    \brief whether the action group is enabled
-
-    Each action in the group will be enabled or disabled unless it
-    has been explicitly disabled.
-
-    \sa QAction::setEnabled()
-*/
-void QActionGroup::setEnabled(bool b)
-{
-    Q_D(QActionGroup);
-    d->enabled = b;
-    for (auto action : qAsConst(d->actions)) {
-        if (!action->d_func()->forceDisabled) {
-            action->setEnabled(b);
-            action->d_func()->forceDisabled = false;
-        }
-    }
-}
-
-bool QActionGroup::isEnabled() const
-{
-    Q_D(const QActionGroup);
-    return d->enabled;
-}
-
-/*!
-  Returns the currently checked action in the group, or \nullptr if
-  none are checked.
-*/
-QAction *QActionGroup::checkedAction() const
-{
-    Q_D(const QActionGroup);
-    return d->current;
-}
-
-/*!
-    \property QActionGroup::visible
-    \brief whether the action group is visible
-
-    Each action in the action group will match the visible state of
-    this group unless it has been explicitly hidden.
-
-    \sa QAction::setEnabled()
-*/
-void QActionGroup::setVisible(bool b)
-{
-    Q_D(QActionGroup);
-    d->visible = b;
-    for (auto action : qAsConst(d->actions)) {
-        if (!action->d_func()->forceInvisible) {
-            action->setVisible(b);
-            action->d_func()->forceInvisible = false;
-        }
-    }
-}
-
-bool QActionGroup::isVisible() const
-{
-    Q_D(const QActionGroup);
-    return d->visible;
-}
-
-/*!
-    \fn void QActionGroup::triggered(QAction *action)
-
-    This signal is emitted when the given \a action in the action
-    group is activated by the user; for example, when the user clicks
-    a menu option, toolbar button, or presses an action's shortcut key
-    combination.
-
-    Connect to this signal for command actions.
-
-    \sa QAction::activate()
-*/
-
-/*!
-    \fn void QActionGroup::hovered(QAction *action)
-
-    This signal is emitted when the given \a action in the action
-    group is highlighted by the user; for example, when the user
-    pauses with the cursor over a menu option, toolbar button, or
-    presses an action's shortcut key combination.
-
-    \sa QAction::activate()
-*/
-
 QT_END_NAMESPACE
-
-#include "moc_qactiongroup.cpp"
-
-#endif // QT_NO_ACTION
diff --git a/src/widgets/kernel/qactiongroup.h b/src/widgets/kernel/qactiongroup.h
index 90f488bedb..0a6a85f093 100644
--- a/src/widgets/kernel/qactiongroup.h
+++ b/src/widgets/kernel/qactiongroup.h
@@ -41,54 +41,31 @@
 #define QACTIONGROUP_H
 
 #include <QtWidgets/qtwidgetsglobal.h>
+#include <QtGui/qguiactiongroup.h>
 #include <QtWidgets/qaction.h>
 
-QT_BEGIN_NAMESPACE
-
+QT_REQUIRE_CONFIG(action);
 
-#ifndef QT_NO_ACTION
+QT_BEGIN_NAMESPACE
 
 class QActionGroupPrivate;
 
-class Q_WIDGETS_EXPORT QActionGroup : public QObject
+class Q_WIDGETS_EXPORT QActionGroup : public QGuiActionGroup
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(QActionGroup)
 
-    Q_PROPERTY(QActionGroup::ExclusionPolicy exclusionPolicy READ exclusionPolicy WRITE setExclusionPolicy)
-    Q_PROPERTY(bool enabled READ isEnabled WRITE setEnabled)
-    Q_PROPERTY(bool visible READ isVisible WRITE setVisible)
-
 public:
-    enum class ExclusionPolicy {
-        None,
-        Exclusive,
-        ExclusiveOptional
-    };
-    Q_ENUM(ExclusionPolicy)
-
     explicit QActionGroup(QObject* parent);
     ~QActionGroup();
 
-    QAction *addAction(QAction* a);
-    QAction *addAction(const QString &text);
-    QAction *addAction(const QIcon &icon, const QString &text);
-    void removeAction(QAction *a);
-    QList<QAction*> actions() const;
-
     QAction *checkedAction() const;
-    bool isExclusive() const;
-    bool isEnabled() const;
-    bool isVisible() const;
-    ExclusionPolicy exclusionPolicy() const;
 
+    QAction *addAction(QAction *a);
+    QAction *addAction(const QString &text);
+    QAction *addAction(const QIcon &icon, const QString &text);
 
-public Q_SLOTS:
-    void setEnabled(bool);
-    inline void setDisabled(bool b) { setEnabled(!b); }
-    void setVisible(bool);
-    void setExclusive(bool);
-    void setExclusionPolicy(ExclusionPolicy policy);
+    QList<QAction*> actions() const;
 
 Q_SIGNALS:
     void triggered(QAction *);
@@ -96,13 +73,8 @@ Q_SIGNALS:
 
 private:
     Q_DISABLE_COPY(QActionGroup)
-    Q_PRIVATE_SLOT(d_func(), void _q_actionTriggered())
-    Q_PRIVATE_SLOT(d_func(), void _q_actionChanged())
-    Q_PRIVATE_SLOT(d_func(), void _q_actionHovered())
 };
 
-#endif // QT_NO_ACTION
-
 QT_END_NAMESPACE
 
 #endif // QACTIONGROUP_H
diff --git a/src/widgets/kernel/qapplication.h b/src/widgets/kernel/qapplication.h
index 6de72899f1..4ecfe64b60 100644
--- a/src/widgets/kernel/qapplication.h
+++ b/src/widgets/kernel/qapplication.h
@@ -58,7 +58,6 @@ class QDesktopWidget;
 class QStyle;
 class QEventLoop;
 class QIcon;
-template <typename T> class QList;
 class QLocale;
 class QPlatformNativeInterface;
 
diff --git a/src/widgets/kernel/qopenglwidget.cpp b/src/widgets/kernel/qopenglwidget.cpp
deleted file mode 100644
index 9b4955320b..0000000000
--- a/src/widgets/kernel/qopenglwidget.cpp
+++ /dev/null
@@ -1,1471 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWidgets module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qopenglwidget.h"
-#include <QtGui/QOpenGLContext>
-#include <QtGui/QOpenGLFramebufferObject>
-#include <QtGui/QOffscreenSurface>
-#include <QtGui/QOpenGLFunctions>
-#include <QtGui/QWindow>
-#include <QtGui/QGuiApplication>
-#include <QtGui/QScreen>
-#include <QtGui/QOpenGLPaintDevice>
-#include <QtGui/qpa/qplatformwindow.h>
-#include <QtGui/qpa/qplatformintegration.h>
-#include <QtGui/private/qguiapplication_p.h>
-#include <QtGui/private/qopenglextensions_p.h>
-#include <QtGui/private/qfont_p.h>
-#include <QtGui/private/qopenglpaintdevice_p.h>
-#include <QtGui/private/qopenglcontext_p.h>
-#include <QtWidgets/private/qwidget_p.h>
-
-QT_BEGIN_NAMESPACE
-
-/*!
-  \class QOpenGLWidget
-  \inmodule QtWidgets
-  \since 5.4
-
-  \brief The QOpenGLWidget class is a widget for rendering OpenGL graphics.
-
-  QOpenGLWidget provides functionality for displaying OpenGL graphics
-  integrated into a Qt application. It is very simple to use: Make
-  your class inherit from it and use the subclass like any other
-  QWidget, except that you have the choice between using QPainter and
-  standard OpenGL rendering commands.
-
-  QOpenGLWidget provides three convenient virtual functions that you
-  can reimplement in your subclass to perform the typical OpenGL
-  tasks:
-
-  \list
-  \li paintGL() - Renders the OpenGL scene. Gets called whenever the widget
-  needs to be updated.
-  \li resizeGL() - Sets up the OpenGL viewport, projection, etc. Gets
-  called whenever the widget has been resized (and also when it
-  is shown for the first time because all newly created widgets get a
-  resize event automatically).
-  \li initializeGL() - Sets up the OpenGL resources and state. Gets called
-  once before the first time resizeGL() or paintGL() is called.
-  \endlist
-
-  If you need to trigger a repaint from places other than paintGL() (a
-  typical example is when using \l{QTimer}{timers} to animate scenes),
-  you should call the widget's update() function to schedule an update.
-
-  Your widget's OpenGL rendering context is made current when
-  paintGL(), resizeGL(), or initializeGL() is called. If you need to
-  call the standard OpenGL API functions from other places (e.g. in
-  your widget's constructor or in your own paint functions), you
-  must call makeCurrent() first.
-
-  All rendering happens into an OpenGL framebuffer
-  object. makeCurrent() ensure that it is bound in the context. Keep
-  this in mind when creating and binding additional framebuffer
-  objects in the rendering code in paintGL(). Never re-bind the
-  framebuffer with ID 0. Instead, call defaultFramebufferObject() to
-  get the ID that should be bound.
-
-  QOpenGLWidget allows using different OpenGL versions and profiles
-  when the platform supports it. Just set the requested format via
-  setFormat(). Keep in mind however that having multiple QOpenGLWidget
-  instances in the same window requires that they all use the same
-  format, or at least formats that do not make the contexts
-  non-sharable. To overcome this issue, prefer using
-  QSurfaceFormat::setDefaultFormat() instead of setFormat().
-
-  \note Calling QSurfaceFormat::setDefaultFormat() before constructing
-  the QApplication instance is mandatory on some platforms (for example,
-  \macos) when an OpenGL core profile context is requested. This is to
-  ensure that resource sharing between contexts stays functional as all
-  internal contexts are created using the correct version and profile.
-
-  \section1 Painting Techniques
-
-  As described above, subclass QOpenGLWidget to render pure 3D content in the
-  following way:
-
-  \list
-
-  \li Reimplement the initializeGL() and resizeGL() functions to
-  set up the OpenGL state and provide a perspective transformation.
-
-  \li Reimplement paintGL() to paint the 3D scene, calling only
-  OpenGL functions.
-
-  \endlist
-
-  It is also possible to draw 2D graphics onto a QOpenGLWidget subclass using QPainter:
-
-  \list
-
-  \li In paintGL(), instead of issuing OpenGL commands, construct a QPainter
-      object for use on the widget.
-
-  \li Draw primitives using QPainter's member functions.
-
-  \li Direct OpenGL commands can still be issued. However, you must make sure
-  these are enclosed by a call to the painter's beginNativePainting() and
-  endNativePainting().
-
-  \endlist
-
-  When performing drawing using QPainter only, it is also possible to perform
-  the painting like it is done for ordinary widgets: by reimplementing paintEvent().
-
-  \list
-
-  \li Reimplement the paintEvent() function.
-
-  \li Construct a QPainter object targeting the widget. Either pass the widget to the
-  constructor or the QPainter::begin() function.
-
-  \li Draw primitives using QPainter's member functions.
-
-  \li Painting finishes then the QPainter instance is destroyed. Alternatively,
-  call QPainter::end() explicitly.
-
-  \endlist
-
-  \section1 OpenGL Function Calls, Headers and QOpenGLFunctions
-
-  When making OpenGL function calls, it is strongly recommended to avoid calling
-  the functions directly. Instead, prefer using QOpenGLFunctions (when making
-  portable applications) or the versioned variants (for example,
-  QOpenGLFunctions_3_2_Core and similar, when targeting modern, desktop-only
-  OpenGL). This way the application will work correctly in all Qt build
-  configurations, including the ones that perform dynamic OpenGL implementation
-  loading which means applications are not directly linking to an GL
-  implementation and thus direct function calls are not feasible.
-
-  In paintGL() the current context is always accessible by caling
-  QOpenGLContext::currentContext(). From this context an already initialized,
-  ready-to-be-used QOpenGLFunctions instance is retrievable by calling
-  QOpenGLContext::functions(). An alternative to prefixing every GL call is to
-  inherit from QOpenGLFunctions and call
-  QOpenGLFunctions::initializeOpenGLFunctions() in initializeGL().
-
-  As for the OpenGL headers, note that in most cases there will be no need to
-  directly include any headers like GL.h. The OpenGL-related Qt headers will
-  include qopengl.h which will in turn include an appropriate header for the
-  system. This might be an OpenGL ES 3.x or 2.0 header, the highest version that
-  is available, or a system-provided gl.h. In addition, a copy of the extension
-  headers (called glext.h on some systems) is provided as part of Qt both for
-  OpenGL and OpenGL ES. These will get included automatically on platforms where
-  feasible. This means that constants and function pointer typedefs from ARB,
-  EXT, OES extensions are automatically available.
-
-  \section1 Code Examples
-
-  To get started, the simplest QOpenGLWidget subclass could like like the following:
-
-  \snippet code/doc_gui_widgets_qopenglwidget.cpp 0
-
-  Alternatively, the prefixing of each and every OpenGL call can be avoided by deriving
-  from QOpenGLFunctions instead:
-
-  \snippet code/doc_gui_widgets_qopenglwidget.cpp 1
-
-  To get a context compatible with a given OpenGL version or profile, or to
-  request depth and stencil buffers, call setFormat():
-
-  \snippet code/doc_gui_widgets_qopenglwidget.cpp 2
-
-  With OpenGL 3.0+ contexts, when portability is not important, the versioned
-  QOpenGLFunctions variants give easy access to all the modern OpenGL functions
-  available in a given version:
-
-  \snippet code/doc_gui_widgets_qopenglwidget.cpp 3
-
-  As described above, it is simpler and more robust to set the requested format
-  globally so that it applies to all windows and contexts during the lifetime of
-  the application. Below is an example of this:
-
-  \snippet code/doc_gui_widgets_qopenglwidget.cpp 6
-
-  \section1 Relation to QGLWidget
-
-  The legacy QtOpenGL module (classes prefixed with QGL) provides a widget
-  called QGLWidget. QOpenGLWidget is intended to be a modern replacement for
-  it. Therefore, especially in new applications, the general recommendation is
-  to use QOpenGLWidget.
-
-  While the API is very similar, there is an important difference between the
-  two: QOpenGLWidget always renders offscreen, using framebuffer
-  objects. QGLWidget on the other hand uses a native window and surface. The
-  latter causes issues when using it in complex user interfaces since, depending
-  on the platform, such native child widgets may have various limitations,
-  regarding stacking orders for example. QOpenGLWidget avoids this by not
-  creating a separate native window.
-
-  Due to being backed by a framebuffer object, the behavior of QOpenGLWidget is
-  very similar to QOpenGLWindow with the update behavior set to \c
-  PartialUpdateBlit or \c PartialUpdateBlend. This means that the contents are
-  preserved between paintGL() calls so that incremental rendering is
-  possible. With QGLWidget (and naturally QOpenGLWindow with the default update
-  behavior) this is usually not the case because swapping the buffers leaves the
-  back buffer with undefined contents.
-
-  \note Most applications do not need incremental rendering because they will
-  render everything in the view on every paint call. In this case it is
-  important to call glClear() as early as possible in paintGL(). This helps
-  mobile GPUs that use a tile-based architecture to recognize that the tile
-  buffer does not need to be reloaded with the framebuffer's previous
-  contents. Omitting the clear call can lead to significant performance drops on
-  such systems.
-
-  \note Avoid calling winId() on a QOpenGLWidget. This function triggers the creation of
-  a native window, resulting in reduced performance and possibly rendering glitches.
-
-  \section1 Differences to QGLWidget
-
-  Besides the main conceptual difference of being backed by a framebuffer object, there
-  are a number of smaller, internal differences between QOpenGLWidget and the older
-  QGLWidget:
-
-  \list
-
-  \li OpenGL state when invoking paintGL(). QOpenGLWidget sets up the viewport via
-  glViewport(). It does not perform any clearing.
-
-  \li Clearing when starting to paint via QPainter. Unlike regular widgets, QGLWidget
-  defaulted to a value of \c true for
-  \l{QWidget::autoFillBackground()}{autoFillBackground}. It then performed clearing to the
-  palette's background color every time QPainter::begin() was used. QOpenGLWidget does not
-  follow this: \l{QWidget::autoFillBackground()}{autoFillBackground} defaults to false,
-  like for any other widget. The only exception is when being used as a viewport for other
-  widgets like QGraphicsView. In such a case autoFillBackground will be automatically set
-  to true to ensure compatibility with QGLWidget-based viewports.
-
-  \endlist
-
-  \section1 Multisampling
-
-  To enable multisampling, set the number of requested samples on the
-  QSurfaceFormat that is passed to setFormat(). On systems that do not support
-  it the request may get ignored.
-
-  Multisampling support requires support for multisampled renderbuffers and
-  framebuffer blits. On OpenGL ES 2.0 implementations it is likely that these
-  will not be present. This means that multisampling will not be available. With
-  modern OpenGL versions and OpenGL ES 3.0 and up this is usually not a problem
-  anymore.
-
-  \section1 Threading
-
-  Performing offscreen rendering on worker threads, for example to generate
-  textures that are then used in the GUI/main thread in paintGL(), are supported
-  by exposing the widget's QOpenGLContext so that additional contexts sharing
-  with it can be created on each thread.
-
-  Drawing directly to the QOpenGLWidget's framebuffer outside the GUI/main
-  thread is possible by reimplementing paintEvent() to do nothing. The context's
-  thread affinity has to be changed via QObject::moveToThread(). After that,
-  makeCurrent() and doneCurrent() are usable on the worker thread. Be careful to
-  move the context back to the GUI/main thread afterwards.
-
-  Unlike QGLWidget, triggering a buffer swap just for the QOpenGLWidget is not
-  possible since there is no real, onscreen native surface for it. Instead, it
-  is up to the widget stack to manage composition and buffer swaps on the gui
-  thread. When a thread is done updating the framebuffer, call update() \b{on
-  the GUI/main thread} to schedule composition.
-
-  Extra care has to be taken to avoid using the framebuffer when the GUI/main
-  thread is performing compositing. The signals aboutToCompose() and
-  frameSwapped() will be emitted when the composition is starting and
-  ending. They are emitted on the GUI/main thread. This means that by using a
-  direct connection aboutToCompose() can block the GUI/main thread until the
-  worker thread has finished its rendering. After that, the worker thread must
-  perform no further rendering until the frameSwapped() signal is emitted. If
-  this is not acceptable, the worker thread has to implement a double buffering
-  mechanism. This involves drawing using an alternative render target, that is
-  fully controlled by the thread, e.g. an additional framebuffer object, and
-  blitting to the QOpenGLWidget's framebuffer at a suitable time.
-
-  \section1 Context Sharing
-
-  When multiple QOpenGLWidgets are added as children to the same top-level
-  widget, their contexts will share with each other. This does not apply for
-  QOpenGLWidget instances that belong to different windows.
-
-  This means that all QOpenGLWidgets in the same window can access each other's
-  sharable resources, like textures, and there is no need for an extra "global
-  share" context, as was the case with QGLWidget.
-
-  To set up sharing between QOpenGLWidget instances belonging to different
-  windows, set the Qt::AA_ShareOpenGLContexts application attribute before
-  instantiating QApplication. This will trigger sharing between all
-  QOpenGLWidget instances without any further steps.
-
-  Creating extra QOpenGLContext instances that share resources like textures
-  with the QOpenGLWidget's context is also possible. Simply pass the pointer
-  returned from context() to QOpenGLContext::setShareContext() before calling
-  QOpenGLContext::create(). The resulting context can also be used on a
-  different thread, allowing threaded generation of textures and asynchronous
-  texture uploads.
-
-  Note that QOpenGLWidget expects a standard conformant implementation of
-  resource sharing when it comes to the underlying graphics drivers. For
-  example, some drivers, in particular for mobile and embedded hardware, have
-  issues with setting up sharing between an existing context and others that are
-  created later. Some other drivers may behave in unexpected ways when trying to
-  utilize shared resources between different threads.
-
-  \section1 Resource Initialization and Cleanup
-
-  The QOpenGLWidget's associated OpenGL context is guaranteed to be current
-  whenever initializeGL() and paintGL() are invoked. Do not attempt to create
-  OpenGL resources before initializeGL() is called. For example, attempting to
-  compile shaders, initialize vertex buffer objects or upload texture data will
-  fail when done in a subclass's constructor. These operations must be deferred
-  to initializeGL(). Some of Qt's OpenGL helper classes, like QOpenGLBuffer or
-  QOpenGLVertexArrayObject, have a matching deferred behavior: they can be
-  instantiated without a context, but all initialization is deferred until a
-  create(), or similar, call. This means that they can be used as normal
-  (non-pointer) member variables in a QOpenGLWidget subclass, but the create()
-  or similar function can only be called from initializeGL(). Be aware however
-  that not all classes are designed like this. When in doubt, make the member
-  variable a pointer and create and destroy the instance dynamically in
-  initializeGL() and the destructor, respectively.
-
-  Releasing the resources also needs the context to be current. Therefore
-  destructors that perform such cleanup are expected to call makeCurrent()
-  before moving on to destroy any OpenGL resources or wrappers. Avoid deferred
-  deletion via \l{QObject::deleteLater()}{deleteLater()} or the parenting
-  mechanism of QObject. There is no guarantee the correct context will be
-  current at the time the instance in question is really destroyed.
-
-  A typical subclass will therefore often look like the following when it comes
-  to resource initialization and destruction:
-
-  \snippet code/doc_gui_widgets_qopenglwidget.cpp 4
-
-  This is naturally not the only possible solution. One alternative is to use
-  the \l{QOpenGLContext::aboutToBeDestroyed()}{aboutToBeDestroyed()} signal of
-  QOpenGLContext. By connecting a slot, using direct connection, to this signal,
-  it is possible to perform cleanup whenever the underlying native context
-  handle, or the entire QOpenGLContext instance, is going to be released. The
-  following snippet is in principle equivalent to the previous one:
-
-  \snippet code/doc_gui_widgets_qopenglwidget.cpp 5
-
-  \note For widgets that change their associated top-level window multiple times
-  during their lifetime, a combined approach is essential. Whenever the widget
-  or a parent of it gets reparented so that the top-level window becomes
-  different, the widget's associated context is destroyed and a new one is
-  created. This is then followed by a call to initializeGL() where all OpenGL
-  resources must get reinitialized. Due to this the only option to perform
-  proper cleanup is to connect to the context's aboutToBeDestroyed()
-  signal. Note that the context in question may not be the current one when the
-  signal gets emitted. Therefore it is good practice to call makeCurrent() in
-  the connected slot. Additionally, the same cleanup steps must be performed
-  from the derived class' destructor, since the slot connected to the signal
-  will not get invoked when the widget is being destroyed.
-
-  \note When Qt::AA_ShareOpenGLContexts is set, the widget's context never
-  changes, not even when reparenting because the widget's associated texture is
-  guaranteed to be accessible also from the new top-level's context.
-
-  Proper cleanup is especially important due to context sharing. Even though
-  each QOpenGLWidget's associated context is destroyed together with the
-  QOpenGLWidget, the sharable resources in that context, like textures, will
-  stay valid until the top-level window, in which the QOpenGLWidget lived, is
-  destroyed. Additionally, settings like Qt::AA_ShareOpenGLContexts and some Qt
-  modules may trigger an even wider scope for sharing contexts, potentially
-  leading to keeping the resources in question alive for the entire lifetime of
-  the application. Therefore the safest and most robust is always to perform
-  explicit cleanup for all resources and resource wrappers used in the
-  QOpenGLWidget.
-
-  \section1 Limitations
-
-  Putting other widgets underneath and making the QOpenGLWidget transparent will
-  not lead to the expected results: The widgets underneath will not be
-  visible. This is because in practice the QOpenGLWidget is drawn before all
-  other regular, non-OpenGL widgets, and so see-through type of solutions are
-  not feasible. Other type of layouts, like having widgets on top of the
-  QOpenGLWidget, will function as expected.
-
-  When absolutely necessary, this limitation can be overcome by setting the
-  Qt::WA_AlwaysStackOnTop attribute on the QOpenGLWidget. Be aware however that
-  this breaks stacking order, for example it will not be possible to have other
-  widgets on top of the QOpenGLWidget, so it should only be used in situations
-  where a semi-transparent QOpenGLWidget with other widgets visible underneath
-  is required.
-
-  Note that this does not apply when there are no other widgets underneath and
-  the intention is to have a semi-transparent window. In that case the
-  traditional approach of setting Qt::WA_TranslucentBackground
-  on the top-level window is sufficient. Note that if the transparent areas are
-  only desired in the QOpenGLWidget, then Qt::WA_NoSystemBackground will need
-  to be turned back to \c false after enabling Qt::WA_TranslucentBackground.
-  Additionally, requesting an alpha channel for the QOpenGLWidget's context via
-  setFormat() may be necessary too, depending on the system.
-
-  QOpenGLWidget supports multiple update behaviors, just like QOpenGLWindow. In
-  preserved mode the rendered content from the previous paintGL() call is
-  available in the next one, allowing incremental rendering. In non-preserved
-  mode the content is lost and paintGL() implementations are expected to redraw
-  everything in the view.
-
-  Before Qt 5.5 the default behavior of QOpenGLWidget was to preserve the
-  rendered contents between paintGL() calls. Since Qt 5.5 the default behavior
-  is non-preserved because this provides better performance and the majority of
-  applications have no need for the previous content. This also resembles the
-  semantics of an OpenGL-based QWindow and matches the default behavior of
-  QOpenGLWindow in that the color and ancillary buffers are invalidated for
-  each frame. To restore the preserved behavior, call setUpdateBehavior() with
-  \c PartialUpdate.
-
-  \section1 Alternatives
-
-  Adding a QOpenGLWidget into a window turns on OpenGL-based
-  compositing for the entire window.  In some special cases this may
-  not be ideal, and the old QGLWidget-style behavior with a separate,
-  native child window is desired. Desktop applications that understand
-  the limitations of this approach (for example when it comes to
-  overlaps, transparency, scroll views and MDI areas), can use
-  QOpenGLWindow with QWidget::createWindowContainer(). This is a
-  modern alternative to QGLWidget and is faster than QOpenGLWidget due
-  to the lack of the additional composition step. It is strongly
-  recommended to limit the usage of this approach to cases where there
-  is no other choice. Note that this option is not suitable for most
-  embedded and mobile platforms, and it is known to have issues on
-  certain desktop platforms (e.g. \macos) too. The stable,
-  cross-platform solution is always QOpenGLWidget.
-
-  \e{OpenGL is a trademark of Silicon Graphics, Inc. in the United States and other
-  countries.}
-
-  \sa QOpenGLFunctions, QOpenGLWindow, Qt::AA_ShareOpenGLContexts, UpdateBehavior
-*/
-
-/*!
-    \fn void QOpenGLWidget::aboutToCompose()
-
-    This signal is emitted when the widget's top-level window is about to begin
-    composing the textures of its QOpenGLWidget children and the other widgets.
-*/
-
-/*!
-    \fn void QOpenGLWidget::frameSwapped()
-
-    This signal is emitted after the widget's top-level window has finished
-    composition and returned from its potentially blocking
-    QOpenGLContext::swapBuffers() call.
-*/
-
-/*!
-    \fn void QOpenGLWidget::aboutToResize()
-
-    This signal is emitted when the widget's size is changed and therefore the
-    framebuffer object is going to be recreated.
-*/
-
-/*!
-    \fn void QOpenGLWidget::resized()
-
-    This signal is emitted right after the framebuffer object has been recreated
-    due to resizing the widget.
-*/
-
-/*!
-    \enum QOpenGLWidget::UpdateBehavior
-    \since 5.5
-
-    This enum describes the update semantics of QOpenGLWidget.
-
-    \value NoPartialUpdate QOpenGLWidget will discard the
-    contents of the color buffer and the ancillary buffers after the
-    QOpenGLWidget is rendered to screen. This is the same behavior that can be
-    expected by calling QOpenGLContext::swapBuffers with a default opengl
-    enabled QWindow as the argument. NoPartialUpdate can have some performance
-    benefits on certain hardware architectures common in the mobile and
-    embedded space when a framebuffer object is used as the rendering target.
-    The framebuffer object is invalidated between frames with
-    glDiscardFramebufferEXT if supported or a glClear. Please see the
-    documentation of EXT_discard_framebuffer for more information:
-    https://www.khronos.org/registry/gles/extensions/EXT/EXT_discard_framebuffer.txt
-
-    \value PartialUpdate The framebuffer objects color buffer and ancillary
-    buffers are not invalidated between frames.
-
-    \sa updateBehavior(), setUpdateBehavior()
-*/
-
-class QOpenGLWidgetPaintDevicePrivate : public QOpenGLPaintDevicePrivate
-{
-public:
-    QOpenGLWidgetPaintDevicePrivate(QOpenGLWidget *widget)
-        : QOpenGLPaintDevicePrivate(QSize()),
-          w(widget) { }
-
-    void beginPaint() override;
-    void endPaint() override;
-
-    QOpenGLWidget *w;
-};
-
-class QOpenGLWidgetPaintDevice : public QOpenGLPaintDevice
-{
-public:
-    QOpenGLWidgetPaintDevice(QOpenGLWidget *widget)
-        : QOpenGLPaintDevice(*new QOpenGLWidgetPaintDevicePrivate(widget)) { }
-    void ensureActiveTarget() override;
-};
-
-class QOpenGLWidgetPrivate : public QWidgetPrivate
-{
-    Q_DECLARE_PUBLIC(QOpenGLWidget)
-public:
-    QOpenGLWidgetPrivate()
-        : context(nullptr),
-          fbo(nullptr),
-          resolvedFbo(nullptr),
-          surface(nullptr),
-          initialized(false),
-          fakeHidden(false),
-          inBackingStorePaint(false),
-          hasBeenComposed(false),
-          flushPending(false),
-          paintDevice(nullptr),
-          updateBehavior(QOpenGLWidget::NoPartialUpdate),
-          requestedSamples(0),
-          inPaintGL(false),
-          textureFormat(0)
-    {
-        requestedFormat = QSurfaceFormat::defaultFormat();
-    }
-
-    void reset();
-    void recreateFbo();
-
-    GLuint textureId() const override;
-    QPlatformTextureList::Flags textureListFlags() override;
-
-    void initialize();
-    void invokeUserPaint();
-    void render();
-
-    void invalidateFbo();
-
-    QImage grabFramebuffer() override;
-    void beginBackingStorePainting() override { inBackingStorePaint = true; }
-    void endBackingStorePainting() override { inBackingStorePaint = false; }
-    void beginCompose() override;
-    void endCompose() override;
-    void initializeViewportFramebuffer() override;
-    void resizeViewportFramebuffer() override;
-    void resolveSamples() override;
-
-    QOpenGLContext *context;
-    QOpenGLFramebufferObject *fbo;
-    QOpenGLFramebufferObject *resolvedFbo;
-    QOffscreenSurface *surface;
-    bool initialized;
-    bool fakeHidden;
-    bool inBackingStorePaint;
-    bool hasBeenComposed;
-    bool flushPending;
-    QOpenGLPaintDevice *paintDevice;
-    QSurfaceFormat requestedFormat;
-    QOpenGLWidget::UpdateBehavior updateBehavior;
-    int requestedSamples;
-    bool inPaintGL;
-    GLenum textureFormat;
-};
-
-void QOpenGLWidgetPaintDevicePrivate::beginPaint()
-{
-    // NB! autoFillBackground is and must be false by default. Otherwise we would clear on
-    // every QPainter begin() which is not desirable. This is only for legacy use cases,
-    // like using QOpenGLWidget as the viewport of a graphics view, that expect clearing
-    // with the palette's background color.
-    if (w->autoFillBackground()) {
-        QOpenGLFunctions *f = QOpenGLContext::currentContext()->functions();
-        if (w->format().hasAlpha()) {
-            f->glClearColor(0, 0, 0, 0);
-        } else {
-            QColor c = w->palette().brush(w->backgroundRole()).color();
-            float alpha = c.alphaF();
-            f->glClearColor(c.redF() * alpha, c.greenF() * alpha, c.blueF() * alpha, alpha);
-        }
-        f->glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
-    }
-}
-
-void QOpenGLWidgetPaintDevicePrivate::endPaint()
-{
-    QOpenGLWidgetPrivate *wd = static_cast<QOpenGLWidgetPrivate *>(QWidgetPrivate::get(w));
-    if (!wd->initialized)
-        return;
-
-    if (!wd->inPaintGL)
-        QOpenGLContextPrivate::get(wd->context)->defaultFboRedirect = 0;
-}
-
-void QOpenGLWidgetPaintDevice::ensureActiveTarget()
-{
-    QOpenGLWidgetPaintDevicePrivate *d = static_cast<QOpenGLWidgetPaintDevicePrivate *>(d_ptr.data());
-    QOpenGLWidgetPrivate *wd = static_cast<QOpenGLWidgetPrivate *>(QWidgetPrivate::get(d->w));
-    if (!wd->initialized)
-        return;
-
-    if (QOpenGLContext::currentContext() != wd->context)
-        d->w->makeCurrent();
-    else
-        wd->fbo->bind();
-
-    if (!wd->inPaintGL)
-        QOpenGLContextPrivate::get(wd->context)->defaultFboRedirect = wd->fbo->handle();
-
-    // When used as a viewport, drawing is done via opening a QPainter on the widget
-    // without going through paintEvent(). We will have to make sure a glFlush() is done
-    // before the texture is accessed also in this case.
-    wd->flushPending = true;
-}
-
-GLuint QOpenGLWidgetPrivate::textureId() const
-{
-    return resolvedFbo ? resolvedFbo->texture() : (fbo ? fbo->texture() : 0);
-}
-
-#ifndef GL_SRGB
-#define GL_SRGB 0x8C40
-#endif
-#ifndef GL_SRGB8
-#define GL_SRGB8 0x8C41
-#endif
-#ifndef GL_SRGB_ALPHA
-#define GL_SRGB_ALPHA 0x8C42
-#endif
-#ifndef GL_SRGB8_ALPHA8
-#define GL_SRGB8_ALPHA8 0x8C43
-#endif
-
-QPlatformTextureList::Flags QOpenGLWidgetPrivate::textureListFlags()
-{
-    QPlatformTextureList::Flags flags = QWidgetPrivate::textureListFlags();
-    switch (textureFormat) {
-    case GL_SRGB:
-    case GL_SRGB8:
-    case GL_SRGB_ALPHA:
-    case GL_SRGB8_ALPHA8:
-        flags |= QPlatformTextureList::TextureIsSrgb;
-        break;
-    default:
-        break;
-    }
-    return flags;
-}
-
-void QOpenGLWidgetPrivate::reset()
-{
-    Q_Q(QOpenGLWidget);
-
-    // Destroy the OpenGL resources first. These need the context to be current.
-    if (initialized)
-        q->makeCurrent();
-
-    delete paintDevice;
-    paintDevice = nullptr;
-    delete fbo;
-    fbo = nullptr;
-    delete resolvedFbo;
-    resolvedFbo = nullptr;
-
-    if (initialized)
-        q->doneCurrent();
-
-    // Delete the context first, then the surface. Slots connected to
-    // the context's aboutToBeDestroyed() may still call makeCurrent()
-    // to perform some cleanup.
-    delete context;
-    context = nullptr;
-    delete surface;
-    surface = nullptr;
-    initialized = fakeHidden = inBackingStorePaint = false;
-}
-
-void QOpenGLWidgetPrivate::recreateFbo()
-{
-    Q_Q(QOpenGLWidget);
-
-    emit q->aboutToResize();
-
-    context->makeCurrent(surface);
-
-    delete fbo;
-    fbo = nullptr;
-    delete resolvedFbo;
-    resolvedFbo = nullptr;
-
-    int samples = requestedSamples;
-    QOpenGLExtensions *extfuncs = static_cast<QOpenGLExtensions *>(context->functions());
-    if (!extfuncs->hasOpenGLExtension(QOpenGLExtensions::FramebufferMultisample))
-        samples = 0;
-
-    QOpenGLFramebufferObjectFormat format;
-    format.setAttachment(QOpenGLFramebufferObject::CombinedDepthStencil);
-    format.setSamples(samples);
-    if (textureFormat)
-        format.setInternalTextureFormat(textureFormat);
-
-    const QSize deviceSize = q->size() * q->devicePixelRatioF();
-    fbo = new QOpenGLFramebufferObject(deviceSize, format);
-    if (samples > 0)
-        resolvedFbo = new QOpenGLFramebufferObject(deviceSize);
-
-    textureFormat = fbo->format().internalTextureFormat();
-
-    fbo->bind();
-    context->functions()->glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
-    flushPending = true; // Make sure the FBO is initialized before use
-
-    paintDevice->setSize(deviceSize);
-    paintDevice->setDevicePixelRatio(q->devicePixelRatioF());
-
-    emit q->resized();
-}
-
-void QOpenGLWidgetPrivate::beginCompose()
-{
-    Q_Q(QOpenGLWidget);
-    if (flushPending) {
-        flushPending = false;
-        q->makeCurrent();
-        static_cast<QOpenGLExtensions *>(context->functions())->flushShared();
-    }
-    hasBeenComposed = true;
-    emit q->aboutToCompose();
-}
-
-void QOpenGLWidgetPrivate::endCompose()
-{
-    Q_Q(QOpenGLWidget);
-    emit q->frameSwapped();
-}
-
-void QOpenGLWidgetPrivate::initialize()
-{
-    Q_Q(QOpenGLWidget);
-    if (initialized)
-        return;
-
-    // If no global shared context get our toplevel's context with which we
-    // will share in order to make the texture usable by the underlying window's backingstore.
-    QWidget *tlw = q->window();
-    QOpenGLContext *shareContext = qt_gl_global_share_context();
-    if (!shareContext)
-        shareContext = get(tlw)->shareContext();
-    // If shareContext is null, showing content on-screen will not work.
-    // However, offscreen rendering and grabFramebuffer() will stay fully functional.
-
-    // Do not include the sample count. Requesting a multisampled context is not necessary
-    // since we render into an FBO, never to an actual surface. What's more, attempting to
-    // create a pbuffer with a multisampled config crashes certain implementations. Just
-    // avoid the entire hassle, the result is the same.
-    requestedSamples = requestedFormat.samples();
-    requestedFormat.setSamples(0);
-
-    QScopedPointer<QOpenGLContext> ctx(new QOpenGLContext);
-    ctx->setFormat(requestedFormat);
-    if (shareContext) {
-        ctx->setShareContext(shareContext);
-        ctx->setScreen(shareContext->screen());
-    }
-    if (Q_UNLIKELY(!ctx->create())) {
-        qWarning("QOpenGLWidget: Failed to create context");
-        return;
-    }
-
-    // Propagate settings that make sense only for the tlw. Note that this only
-    // makes sense for properties that get picked up even after the native
-    // window is created.
-    if (tlw->windowHandle()) {
-        QSurfaceFormat tlwFormat = tlw->windowHandle()->format();
-        if (requestedFormat.swapInterval() != tlwFormat.swapInterval()) {
-            // Most platforms will pick up the changed swap interval on the next
-            // makeCurrent or swapBuffers.
-            tlwFormat.setSwapInterval(requestedFormat.swapInterval());
-            tlw->windowHandle()->setFormat(tlwFormat);
-        }
-        if (requestedFormat.swapBehavior() != tlwFormat.swapBehavior()) {
-            tlwFormat.setSwapBehavior(requestedFormat.swapBehavior());
-            tlw->windowHandle()->setFormat(tlwFormat);
-        }
-    }
-
-    // The top-level window's surface is not good enough since it causes way too
-    // much trouble with regards to the QSurfaceFormat for example. So just like
-    // in QQuickWidget, use a dedicated QOffscreenSurface.
-    surface = new QOffscreenSurface;
-    surface->setFormat(ctx->format());
-    surface->setScreen(ctx->screen());
-    surface->create();
-
-    if (Q_UNLIKELY(!ctx->makeCurrent(surface))) {
-        qWarning("QOpenGLWidget: Failed to make context current");
-        return;
-    }
-
-    paintDevice = new QOpenGLWidgetPaintDevice(q);
-    paintDevice->setSize(q->size() * q->devicePixelRatioF());
-    paintDevice->setDevicePixelRatio(q->devicePixelRatioF());
-
-    context = ctx.take();
-    initialized = true;
-
-    q->initializeGL();
-}
-
-void QOpenGLWidgetPrivate::resolveSamples()
-{
-    Q_Q(QOpenGLWidget);
-    if (resolvedFbo) {
-        q->makeCurrent();
-        QRect rect(QPoint(0, 0), fbo->size());
-        QOpenGLFramebufferObject::blitFramebuffer(resolvedFbo, rect, fbo, rect);
-        flushPending = true;
-    }
-}
-
-void QOpenGLWidgetPrivate::invokeUserPaint()
-{
-    Q_Q(QOpenGLWidget);
-
-    QOpenGLContext *ctx = QOpenGLContext::currentContext();
-    Q_ASSERT(ctx && fbo);
-
-    QOpenGLFunctions *f = ctx->functions();
-    QOpenGLContextPrivate::get(ctx)->defaultFboRedirect = fbo->handle();
-
-    f->glViewport(0, 0, q->width() * q->devicePixelRatioF(), q->height() * q->devicePixelRatioF());
-    inPaintGL = true;
-    q->paintGL();
-    inPaintGL = false;
-    flushPending = true;
-
-    QOpenGLContextPrivate::get(ctx)->defaultFboRedirect = 0;
-}
-
-void QOpenGLWidgetPrivate::render()
-{
-    Q_Q(QOpenGLWidget);
-
-    if (fakeHidden || !initialized)
-        return;
-
-    q->makeCurrent();
-
-    if (updateBehavior == QOpenGLWidget::NoPartialUpdate && hasBeenComposed) {
-        invalidateFbo();
-        hasBeenComposed = false;
-    }
-
-    invokeUserPaint();
-}
-
-void QOpenGLWidgetPrivate::invalidateFbo()
-{
-    QOpenGLExtensions *f = static_cast<QOpenGLExtensions *>(QOpenGLContext::currentContext()->functions());
-    if (f->hasOpenGLExtension(QOpenGLExtensions::DiscardFramebuffer)) {
-        const int gl_color_attachment0 = 0x8CE0;  // GL_COLOR_ATTACHMENT0
-        const int gl_depth_attachment = 0x8D00;   // GL_DEPTH_ATTACHMENT
-        const int gl_stencil_attachment = 0x8D20; // GL_STENCIL_ATTACHMENT
-#ifdef Q_OS_WASM
-        // webgl does not allow separate depth and stencil attachments
-        // QTBUG-69913
-        const int gl_depth_stencil_attachment = 0x821A; // GL_DEPTH_STENCIL_ATTACHMENT
-
-        const GLenum attachments[] = {
-            gl_color_attachment0, gl_depth_attachment, gl_stencil_attachment, gl_depth_stencil_attachment
-        };
-#else
-        const GLenum attachments[] = {
-            gl_color_attachment0, gl_depth_attachment, gl_stencil_attachment
-        };
-#endif
-        f->glDiscardFramebufferEXT(GL_FRAMEBUFFER, sizeof attachments / sizeof *attachments, attachments);
-    } else {
-        f->glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
-    }
-}
-
-extern Q_GUI_EXPORT QImage qt_gl_read_framebuffer(const QSize &size, bool alpha_format, bool include_alpha);
-
-QImage QOpenGLWidgetPrivate::grabFramebuffer()
-{
-    Q_Q(QOpenGLWidget);
-
-    initialize();
-    if (!initialized)
-        return QImage();
-
-    if (!fbo) // could be completely offscreen, without ever getting a resize event
-        recreateFbo();
-
-    if (!inPaintGL)
-        render();
-
-    if (resolvedFbo) {
-        resolveSamples();
-        resolvedFbo->bind();
-    } else {
-        q->makeCurrent();
-    }
-
-    const bool hasAlpha = q->format().hasAlpha();
-    QImage res = qt_gl_read_framebuffer(q->size() * q->devicePixelRatioF(), hasAlpha, hasAlpha);
-    res.setDevicePixelRatio(q->devicePixelRatioF());
-
-    // While we give no guarantees of what is going to be left bound, prefer the
-    // multisample fbo instead of the resolved one. Clients may continue to
-    // render straight after calling this function.
-    if (resolvedFbo)
-        q->makeCurrent();
-
-    return res;
-}
-
-void QOpenGLWidgetPrivate::initializeViewportFramebuffer()
-{
-    Q_Q(QOpenGLWidget);
-    // Legacy behavior for compatibility with QGLWidget when used as a graphics view
-    // viewport: enable clearing on each painter begin.
-    q->setAutoFillBackground(true);
-}
-
-void QOpenGLWidgetPrivate::resizeViewportFramebuffer()
-{
-    Q_Q(QOpenGLWidget);
-    if (!initialized)
-        return;
-
-    if (!fbo || q->size() * q->devicePixelRatioF() != fbo->size()) {
-        recreateFbo();
-        q->update();
-    }
-}
-
-/*!
-  Constructs a widget which is a child of \a parent, with widget flags set to \a f.
- */
-QOpenGLWidget::QOpenGLWidget(QWidget *parent, Qt::WindowFlags f)
-    : QWidget(*(new QOpenGLWidgetPrivate), parent, f)
-{
-    Q_D(QOpenGLWidget);
-    if (Q_UNLIKELY(!QGuiApplicationPrivate::platformIntegration()->hasCapability(QPlatformIntegration::RasterGLSurface)))
-        qWarning("QOpenGLWidget is not supported on this platform.");
-    else
-        d->setRenderToTexture();
-}
-
-/*!
-  Destroys the QOpenGLWidget instance, freeing its resources.
-
-  The QOpenGLWidget's context is made current in the destructor, allowing for
-  safe destruction of any child object that may need to release OpenGL
-  resources belonging to the context provided by this widget.
-
-  \warning if you have objects wrapping OpenGL resources (such as
-  QOpenGLBuffer, QOpenGLShaderProgram, etc.) as members of a OpenGLWidget
-  subclass, you may need to add a call to makeCurrent() in that subclass'
-  destructor as well. Due to the rules of C++ object destruction, those objects
-  will be destroyed \e{before} calling this function (but after that the
-  destructor of the subclass has run), therefore making the OpenGL context
-  current in this function happens too late for their safe disposal.
-
-  \sa makeCurrent
-*/
-QOpenGLWidget::~QOpenGLWidget()
-{
-    Q_D(QOpenGLWidget);
-    d->reset();
-}
-
-/*!
-  Sets this widget's update behavior to \a updateBehavior.
-  \since 5.5
-*/
-void QOpenGLWidget::setUpdateBehavior(UpdateBehavior updateBehavior)
-{
-    Q_D(QOpenGLWidget);
-    d->updateBehavior = updateBehavior;
-}
-
-/*!
-  \return the update behavior of the widget.
-  \since 5.5
-*/
-QOpenGLWidget::UpdateBehavior QOpenGLWidget::updateBehavior() const
-{
-    Q_D(const QOpenGLWidget);
-    return d->updateBehavior;
-}
-
-/*!
-  Sets the requested surface \a format.
-
-  When the format is not explicitly set via this function, the format returned by
-  QSurfaceFormat::defaultFormat() will be used. This means that when having multiple
-  OpenGL widgets, individual calls to this function can be replaced by one single call to
-  QSurfaceFormat::setDefaultFormat() before creating the first widget.
-
-  \note Requesting an alpha buffer via this function will not lead to the
-  desired results when the intention is to make other widgets beneath visible.
-  Instead, use Qt::WA_AlwaysStackOnTop to enable semi-transparent QOpenGLWidget
-  instances with other widgets visible underneath. Keep in mind however that
-  this breaks the stacking order, so it will no longer be possible to have
-  other widgets on top of the QOpenGLWidget.
-
-  \sa format(), Qt::WA_AlwaysStackOnTop, QSurfaceFormat::setDefaultFormat()
- */
-void QOpenGLWidget::setFormat(const QSurfaceFormat &format)
-{
-    Q_D(QOpenGLWidget);
-    if (Q_UNLIKELY(d->initialized)) {
-        qWarning("QOpenGLWidget: Already initialized, setting the format has no effect");
-        return;
-    }
-
-    d->requestedFormat = format;
-}
-
-/*!
-    Returns the context and surface format used by this widget and its toplevel
-    window.
-
-    After the widget and its toplevel have both been created, resized and shown,
-    this function will return the actual format of the context. This may differ
-    from the requested format if the request could not be fulfilled by the
-    platform. It is also possible to get larger color buffer sizes than
-    requested.
-
-    When the widget's window and the related OpenGL resources are not yet
-    initialized, the return value is the format that has been set via
-    setFormat().
-
-    \sa setFormat(), context()
- */
-QSurfaceFormat QOpenGLWidget::format() const
-{
-    Q_D(const QOpenGLWidget);
-    return d->initialized ? d->context->format() : d->requestedFormat;
-}
-
-/*!
-    Sets a custom internal texture format of \a texFormat.
-
-    When working with sRGB framebuffers, it will be necessary to specify a
-    format like \c{GL_SRGB8_ALPHA8}. This can be achieved by calling this
-    function.
-
-    \note This function has no effect if called after the widget has already
-    been shown and thus it performed initialization.
-
-    \note This function will typically have to be used in combination with a
-    QSurfaceFormat::setDefaultFormat() call that sets the color space to
-    QSurfaceFormat::sRGBColorSpace.
-
-    \since 5.10
- */
-void QOpenGLWidget::setTextureFormat(GLenum texFormat)
-{
-    Q_D(QOpenGLWidget);
-    if (Q_UNLIKELY(d->initialized)) {
-        qWarning("QOpenGLWidget: Already initialized, setting the internal texture format has no effect");
-        return;
-    }
-
-    d->textureFormat = texFormat;
-}
-
-/*!
-    \return the active internal texture format if the widget has already
-    initialized, the requested format if one was set but the widget has not yet
-    been made visible, or \nullptr if setTextureFormat() was not called and the
-    widget has not yet been made visible.
-
-    \since 5.10
- */
-GLenum QOpenGLWidget::textureFormat() const
-{
-    Q_D(const QOpenGLWidget);
-    return d->textureFormat;
-}
-
-/*!
-  \return \e true if the widget and OpenGL resources, like the context, have
-  been successfully initialized. Note that the return value is always false
-  until the widget is shown.
-*/
-bool QOpenGLWidget::isValid() const
-{
-    Q_D(const QOpenGLWidget);
-    return d->initialized && d->context->isValid();
-}
-
-/*!
-  Prepares for rendering OpenGL content for this widget by making the
-  corresponding context current and binding the framebuffer object in that
-  context.
-
-  It is not necessary to call this function in most cases, because it
-  is called automatically before invoking paintGL().
-
-  \sa context(), paintGL(), doneCurrent()
- */
-void QOpenGLWidget::makeCurrent()
-{
-    Q_D(QOpenGLWidget);
-    if (!d->initialized)
-        return;
-
-    d->context->makeCurrent(d->surface);
-
-    if (d->fbo) // there may not be one if we are in reset()
-        d->fbo->bind();
-}
-
-/*!
-  Releases the context.
-
-  It is not necessary to call this function in most cases, since the
-  widget will make sure the context is bound and released properly
-  when invoking paintGL().
- */
-void QOpenGLWidget::doneCurrent()
-{
-    Q_D(QOpenGLWidget);
-    if (!d->initialized)
-        return;
-
-    d->context->doneCurrent();
-}
-
-/*!
-  \return The QOpenGLContext used by this widget or \c 0 if not yet initialized.
-
-  \note The context and the framebuffer object used by the widget changes when
-  reparenting the widget via setParent().
-
-  \sa QOpenGLContext::setShareContext(), defaultFramebufferObject()
- */
-QOpenGLContext *QOpenGLWidget::context() const
-{
-    Q_D(const QOpenGLWidget);
-    return d->context;
-}
-
-/*!
-  \return The framebuffer object handle or \c 0 if not yet initialized.
-
-  \note The framebuffer object belongs to the context returned by context()
-  and may not be accessible from other contexts.
-
-  \note The context and the framebuffer object used by the widget changes when
-  reparenting the widget via setParent(). In addition, the framebuffer object
-  changes on each resize.
-
-  \sa context()
- */
-GLuint QOpenGLWidget::defaultFramebufferObject() const
-{
-    Q_D(const QOpenGLWidget);
-    return d->fbo ? d->fbo->handle() : 0;
-}
-
-/*!
-  This virtual function is called once before the first call to
-  paintGL() or resizeGL(). Reimplement it in a subclass.
-
-  This function should set up any required OpenGL resources and state.
-
-  There is no need to call makeCurrent() because this has already been
-  done when this function is called. Note however that the framebuffer
-  is not yet available at this stage, so avoid issuing draw calls from
-  here. Defer such calls to paintGL() instead.
-
-  \sa paintGL(), resizeGL()
-*/
-void QOpenGLWidget::initializeGL()
-{
-}
-
-/*!
-  This virtual function is called whenever the widget has been
-  resized. Reimplement it in a subclass. The new size is passed in
-  \a w and \a h.
-
-  There is no need to call makeCurrent() because this has already been
-  done when this function is called. Additionally, the framebuffer is
-  also bound.
-
-  \sa initializeGL(), paintGL()
-*/
-void QOpenGLWidget::resizeGL(int w, int h)
-{
-    Q_UNUSED(w);
-    Q_UNUSED(h);
-}
-
-/*!
-  This virtual function is called whenever the widget needs to be
-  painted. Reimplement it in a subclass.
-
-  There is no need to call makeCurrent() because this has already
-  been done when this function is called.
-
-  Before invoking this function, the context and the framebuffer are
-  bound, and the viewport is set up by a call to glViewport(). No
-  other state is set and no clearing or drawing is performed by the
-  framework.
-
-  \sa initializeGL(), resizeGL()
-*/
-void QOpenGLWidget::paintGL()
-{
-}
-
-/*!
-  Handles resize events that are passed in the \a e event parameter.
-  Calls the virtual function resizeGL().
-
-  \note Avoid overriding this function in derived classes. If that is not
-  feasible, make sure that QOpenGLWidget's implementation is invoked
-  too. Otherwise the underlying framebuffer object and related resources will
-  not get resized properly and will lead to incorrect rendering.
-*/
-void QOpenGLWidget::resizeEvent(QResizeEvent *e)
-{
-    Q_D(QOpenGLWidget);
-
-    if (e->size().isEmpty()) {
-        d->fakeHidden = true;
-        return;
-    }
-    d->fakeHidden = false;
-
-    d->initialize();
-    if (!d->initialized)
-        return;
-
-    d->recreateFbo();
-    resizeGL(width(), height());
-    d->sendPaintEvent(QRect(QPoint(0, 0), size()));
-}
-
-/*!
-  Handles paint events.
-
-  Calling QWidget::update() will lead to sending a paint event \a e,
-  and thus invoking this function. (NB this is asynchronous and will
-  happen at some point after returning from update()). This function
-  will then, after some preparation, call the virtual paintGL() to
-  update the contents of the QOpenGLWidget's framebuffer. The widget's
-  top-level window will then composite the framebuffer's texture with
-  the rest of the window.
-*/
-void QOpenGLWidget::paintEvent(QPaintEvent *e)
-{
-    Q_UNUSED(e);
-    Q_D(QOpenGLWidget);
-    if (!d->initialized)
-        return;
-
-    if (updatesEnabled())
-        d->render();
-}
-
-/*!
-  Renders and returns a 32-bit RGB image of the framebuffer.
-
-  \note This is a potentially expensive operation because it relies on glReadPixels()
-  to read back the pixels. This may be slow and can stall the GPU pipeline.
-*/
-QImage QOpenGLWidget::grabFramebuffer()
-{
-    Q_D(QOpenGLWidget);
-    return d->grabFramebuffer();
-}
-
-/*!
-  \internal
-*/
-int QOpenGLWidget::metric(QPaintDevice::PaintDeviceMetric metric) const
-{
-    Q_D(const QOpenGLWidget);
-    if (d->inBackingStorePaint)
-        return QWidget::metric(metric);
-
-    auto window = d->windowHandle(QWidgetPrivate::WindowHandleMode::TopLevel);
-    QScreen *screen = window ? window->screen() : QGuiApplication::primaryScreen();
-
-    const float dpmx = qt_defaultDpiX() * 100. / 2.54;
-    const float dpmy = qt_defaultDpiY() * 100. / 2.54;
-
-    switch (metric) {
-    case PdmWidth:
-        return width();
-    case PdmHeight:
-        return height();
-    case PdmDepth:
-        return 32;
-    case PdmWidthMM:
-        if (screen)
-            return width() * screen->physicalSize().width() / screen->geometry().width();
-        else
-            return width() * 1000 / dpmx;
-    case PdmHeightMM:
-        if (screen)
-            return height() * screen->physicalSize().height() / screen->geometry().height();
-        else
-            return height() * 1000 / dpmy;
-    case PdmNumColors:
-        return 0;
-    case PdmDpiX:
-        if (screen)
-            return qRound(screen->logicalDotsPerInchX());
-        else
-            return qRound(dpmx * 0.0254);
-    case PdmDpiY:
-        if (screen)
-            return qRound(screen->logicalDotsPerInchY());
-        else
-            return qRound(dpmy * 0.0254);
-    case PdmPhysicalDpiX:
-        if (screen)
-            return qRound(screen->physicalDotsPerInchX());
-        else
-            return qRound(dpmx * 0.0254);
-    case PdmPhysicalDpiY:
-        if (screen)
-            return qRound(screen->physicalDotsPerInchY());
-        else
-            return qRound(dpmy * 0.0254);
-    case PdmDevicePixelRatio:
-        if (window)
-            return int(window->devicePixelRatio());
-        else
-            return 1.0;
-    case PdmDevicePixelRatioScaled:
-        if (window)
-            return int(window->devicePixelRatio() * devicePixelRatioFScale());
-        else
-            return int(devicePixelRatioFScale());
-    default:
-        qWarning("QOpenGLWidget::metric(): unknown metric %d", metric);
-        return 0;
-    }
-}
-
-/*!
-  \internal
-*/
-QPaintDevice *QOpenGLWidget::redirected(QPoint *p) const
-{
-    Q_D(const QOpenGLWidget);
-    if (d->inBackingStorePaint)
-        return QWidget::redirected(p);
-
-    return d->paintDevice;
-}
-
-/*!
-  \internal
-*/
-QPaintEngine *QOpenGLWidget::paintEngine() const
-{
-    Q_D(const QOpenGLWidget);
-    // QWidget needs to "punch a hole" into the backingstore. This needs the
-    // normal paint engine and device, not the GL one. So in this mode, behave
-    // like a normal widget.
-    if (d->inBackingStorePaint)
-        return QWidget::paintEngine();
-
-    if (!d->initialized)
-        return nullptr;
-
-    return d->paintDevice->paintEngine();
-}
-
-/*!
-  \internal
-*/
-bool QOpenGLWidget::event(QEvent *e)
-{
-    Q_D(QOpenGLWidget);
-    switch (e->type()) {
-    case QEvent::WindowChangeInternal:
-        if (QCoreApplication::testAttribute(Qt::AA_ShareOpenGLContexts))
-            break;
-        if (d->initialized)
-            d->reset();
-        if (isHidden())
-            break;
-        Q_FALLTHROUGH();
-    case QEvent::Show: // reparenting may not lead to a resize so reinitalize on Show too
-        if (d->initialized && window()->windowHandle()
-                && d->context->shareContext() != QWidgetPrivate::get(window())->shareContext())
-        {
-            // Special case: did grabFramebuffer() for a hidden widget that then became visible.
-            // Recreate all resources since the context now needs to share with the TLW's.
-            if (!QCoreApplication::testAttribute(Qt::AA_ShareOpenGLContexts))
-                d->reset();
-        }
-        if (!d->initialized && !size().isEmpty() && window()->windowHandle()) {
-            d->initialize();
-            if (d->initialized)
-                d->recreateFbo();
-        }
-        break;
-    case QEvent::ScreenChangeInternal:
-        if (d->initialized && d->paintDevice->devicePixelRatioF() != devicePixelRatioF())
-            d->recreateFbo();
-        break;
-    default:
-        break;
-    }
-    return QWidget::event(e);
-}
-
-QT_END_NAMESPACE
-
-#include "moc_qopenglwidget.cpp"
diff --git a/src/widgets/kernel/qopenglwidget.h b/src/widgets/kernel/qopenglwidget.h
deleted file mode 100644
index 9eb4a9ba5a..0000000000
--- a/src/widgets/kernel/qopenglwidget.h
+++ /dev/null
@@ -1,115 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWidgets module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QOPENGLWIDGET_H
-#define QOPENGLWIDGET_H
-
-#include <QtWidgets/qtwidgetsglobal.h>
-
-#ifndef QT_NO_OPENGL
-
-#include <QtWidgets/QWidget>
-#include <QtGui/QSurfaceFormat>
-#include <QtGui/qopengl.h>
-
-QT_BEGIN_NAMESPACE
-
-class QOpenGLWidgetPrivate;
-
-class Q_WIDGETS_EXPORT QOpenGLWidget : public QWidget
-{
-    Q_OBJECT
-    Q_DECLARE_PRIVATE(QOpenGLWidget)
-
-public:
-    enum UpdateBehavior {
-        NoPartialUpdate,
-        PartialUpdate
-    };
-
-    explicit QOpenGLWidget(QWidget* parent = nullptr, Qt::WindowFlags f = Qt::WindowFlags());
-    ~QOpenGLWidget();
-
-    void setUpdateBehavior(UpdateBehavior updateBehavior);
-    UpdateBehavior updateBehavior() const;
-
-    void setFormat(const QSurfaceFormat &format);
-    QSurfaceFormat format() const;
-
-    GLenum textureFormat() const;
-    void setTextureFormat(GLenum texFormat);
-
-    bool isValid() const;
-
-    void makeCurrent();
-    void doneCurrent();
-
-    QOpenGLContext *context() const;
-    GLuint defaultFramebufferObject() const;
-
-    QImage grabFramebuffer();
-
-Q_SIGNALS:
-    void aboutToCompose();
-    void frameSwapped();
-    void aboutToResize();
-    void resized();
-
-protected:
-    virtual void initializeGL();
-    virtual void resizeGL(int w, int h);
-    virtual void paintGL();
-
-    void paintEvent(QPaintEvent *e) override;
-    void resizeEvent(QResizeEvent *e) override;
-    bool event(QEvent *e) override;
-
-    int metric(QPaintDevice::PaintDeviceMetric metric) const override;
-    QPaintDevice *redirected(QPoint *p) const override;
-    QPaintEngine *paintEngine() const override;
-
-private:
-    Q_DISABLE_COPY(QOpenGLWidget)
-};
-
-QT_END_NAMESPACE
-
-#endif // QT_NO_OPENGL
-
-#endif // QOPENGLWIDGET_H
diff --git a/src/widgets/kernel/qshortcut.cpp b/src/widgets/kernel/qshortcut.cpp
index 039699a004..4a2f8d66c2 100644
--- a/src/widgets/kernel/qshortcut.cpp
+++ b/src/widgets/kernel/qshortcut.cpp
@@ -40,7 +40,6 @@
 #include "qshortcut.h"
 #include "private/qwidget_p.h"
 
-#ifndef QT_NO_SHORTCUT
 #include <qevent.h>
 #if QT_CONFIG(whatsthis)
 #include <qwhatsthis.h>
@@ -53,25 +52,21 @@
 #endif
 #include <qapplication.h>
 #include <private/qapplication_p.h>
+#include "private/qguishortcut_p.h"
 #include <private/qshortcutmap_p.h>
-#include <private/qaction_p.h>
+#if QT_CONFIG(action)
+#  include <private/qaction_p.h>
+#endif
 #include <private/qwidgetwindow_p.h>
 #include <qpa/qplatformmenu.h>
 
 QT_BEGIN_NAMESPACE
 
-#define QAPP_CHECK(functionName) \
-    if (Q_UNLIKELY(!qApp)) {                                            \
-        qWarning("QShortcut: Initialize QApplication before calling '" functionName "'."); \
-        return; \
-    }
-
-
 static bool correctWidgetContext(Qt::ShortcutContext context, QWidget *w, QWidget *active_window);
 #if QT_CONFIG(graphicsview)
 static bool correctGraphicsWidgetContext(Qt::ShortcutContext context, QGraphicsWidget *w, QWidget *active_window);
 #endif
-#ifndef QT_NO_ACTION
+#if QT_CONFIG(action)
 static bool correctActionContext(Qt::ShortcutContext context, QAction *a, QWidget *active_window);
 #endif
 
@@ -108,7 +103,7 @@ bool qWidgetShortcutContextMatcher(QObject *object, Qt::ShortcutContext context)
     if (!active_window)
         return false;
 
-#ifndef QT_NO_ACTION
+#if QT_CONFIG(action)
     if (auto a = qobject_cast<QAction *>(object))
         return correctActionContext(context, a, active_window);
 #endif
@@ -284,7 +279,7 @@ static bool correctGraphicsWidgetContext(Qt::ShortcutContext context, QGraphicsW
 }
 #endif
 
-#ifndef QT_NO_ACTION
+#if QT_CONFIG(action)
 static bool correctActionContext(Qt::ShortcutContext context, QAction *a, QWidget *active_window)
 {
     const QWidgetList &widgets = static_cast<QActionPrivate *>(QObjectPrivate::get(a))->widgets;
@@ -332,7 +327,7 @@ static bool correctActionContext(Qt::ShortcutContext context, QAction *a, QWidge
 #endif
     return false;
 }
-#endif // QT_NO_ACTION
+#endif // QT_CONFIG(action)
 
 
 /*!
@@ -395,29 +390,62 @@ static bool correctActionContext(Qt::ShortcutContext context, QAction *a, QWidge
     Returns the shortcut's parent widget.
 */
 
-/*!
-    \fn void QShortcut::activated()
+/*
+    \internal
+    Private data accessed through d-pointer.
+*/
+class QShortcutPrivate : public QGuiShortcutPrivate
+{
+    Q_DECLARE_PUBLIC(QShortcut)
+public:
+    QShortcutPrivate() = default;
 
-    This signal is emitted when the user types the shortcut's key
-    sequence.
+    QShortcutMap::ContextMatcher contextMatcher() const override
+    { return qWidgetShortcutContextMatcher; }
 
-    \sa activatedAmbiguously()
-*/
+    bool handleWhatsThis() override;
 
-/*!
-    \fn void QShortcut::activatedAmbiguously()
+    QString sc_whatsthis;
+};
 
-    When a key sequence is being typed at the keyboard, it is said to
-    be ambiguous as long as it matches the start of more than one
-    shortcut.
+bool QShortcutPrivate::handleWhatsThis()
+{
+#if QT_CONFIG(whatsthis)
+    const bool result = QWhatsThis::inWhatsThisMode();
+    if (result)
+        QWhatsThis::showText(QCursor::pos(), sc_whatsthis);
+    return result;
+#else
+    return false;
+#endif
+}
 
-    When a shortcut's key sequence is completed,
-    activatedAmbiguously() is emitted if the key sequence is still
-    ambiguous (i.e., it is the start of one or more other shortcuts).
-    The activated() signal is not emitted in this case.
+/*!
+    Constructs a QShortcut object for the \a parent widget. Since no
+    shortcut key sequence is specified, the shortcut will not emit any
+    signals.
 
-    \sa activated()
+    \sa setKey()
 */
+QShortcut::QShortcut(QWidget *parent)
+    : QGuiShortcut(*new QShortcutPrivate, parent)
+{
+}
+
+/*!
+    Constructs a QShortcut object for the \a parent widget. The shortcut
+    operates on its parent, listening for \l{QShortcutEvent}s that
+    match the \a key sequence. Depending on the ambiguity of the
+    event, the shortcut will call the \a member function, or the \a
+    ambiguousMember function, if the key press was in the shortcut's
+    \a shortcutContext.
+*/
+QShortcut::QShortcut(const QKeySequence &key, QWidget *parent,
+                     const char *member, const char *ambiguousMember,
+                     Qt::ShortcutContext shortcutContext)
+    : QGuiShortcut(*new QShortcutPrivate, key, parent, member, ambiguousMember, shortcutContext)
+{
+}
 
 /*!
     \fn template<typename Functor>
@@ -489,177 +517,6 @@ static bool correctActionContext(Qt::ShortcutContext context, QAction *a, QWidge
     will not be called.
 */
 
-/*
-    \internal
-    Private data accessed through d-pointer.
-*/
-class QShortcutPrivate : public QObjectPrivate
-{
-    Q_DECLARE_PUBLIC(QShortcut)
-public:
-    QShortcutPrivate() = default;
-    QKeySequence sc_sequence;
-    Qt::ShortcutContext sc_context = Qt::WindowShortcut;
-    bool sc_enabled = true;
-    bool sc_autorepeat = true;
-    int sc_id = 0;
-    QString sc_whatsthis;
-    void redoGrab(QShortcutMap &map);
-};
-
-void QShortcutPrivate::redoGrab(QShortcutMap &map)
-{
-    Q_Q(QShortcut);
-    if (Q_UNLIKELY(!parent)) {
-        qWarning("QShortcut: No widget parent defined");
-        return;
-    }
-
-    if (sc_id)
-        map.removeShortcut(sc_id, q);
-    if (sc_sequence.isEmpty())
-        return;
-    sc_id = map.addShortcut(q, sc_sequence, sc_context, qWidgetShortcutContextMatcher);
-    if (!sc_enabled)
-        map.setShortcutEnabled(false, sc_id, q);
-    if (!sc_autorepeat)
-        map.setShortcutAutoRepeat(false, sc_id, q);
-}
-
-/*!
-    Constructs a QShortcut object for the \a parent widget. Since no
-    shortcut key sequence is specified, the shortcut will not emit any
-    signals.
-
-    \sa setKey()
-*/
-QShortcut::QShortcut(QWidget *parent)
-    : QObject(*new QShortcutPrivate, parent)
-{
-    Q_ASSERT(parent != nullptr);
-}
-
-/*!
-    Constructs a QShortcut object for the \a parent widget. The shortcut
-    operates on its parent, listening for \l{QShortcutEvent}s that
-    match the \a key sequence. Depending on the ambiguity of the
-    event, the shortcut will call the \a member function, or the \a
-    ambiguousMember function, if the key press was in the shortcut's
-    \a shortcutContext.
-*/
-QShortcut::QShortcut(const QKeySequence &key, QWidget *parent,
-                     const char *member, const char *ambiguousMember,
-                     Qt::ShortcutContext shortcutContext)
-    : QShortcut(parent)
-{
-    QAPP_CHECK("QShortcut");
-
-    Q_D(QShortcut);
-    d->sc_context = shortcutContext;
-    d->sc_sequence = key;
-    d->redoGrab(QGuiApplicationPrivate::instance()->shortcutMap);
-    if (member)
-        connect(this, SIGNAL(activated()), parent, member);
-    if (ambiguousMember)
-        connect(this, SIGNAL(activatedAmbiguously()), parent, ambiguousMember);
-}
-
-/*!
-    Destroys the shortcut.
-*/
-QShortcut::~QShortcut()
-{
-    Q_D(QShortcut);
-    if (qApp)
-        QGuiApplicationPrivate::instance()->shortcutMap.removeShortcut(d->sc_id, this);
-}
-
-/*!
-    \property QShortcut::key
-    \brief the shortcut's key sequence
-
-    This is a key sequence with an optional combination of Shift, Ctrl,
-    and Alt. The key sequence may be supplied in a number of ways:
-
-    \snippet code/src_gui_kernel_qshortcut.cpp 1
-
-    By default, this property contains an empty key sequence.
-*/
-void QShortcut::setKey(const QKeySequence &key)
-{
-    Q_D(QShortcut);
-    if (d->sc_sequence == key)
-        return;
-    QAPP_CHECK("setKey");
-    d->sc_sequence = key;
-    d->redoGrab(QGuiApplicationPrivate::instance()->shortcutMap);
-}
-
-QKeySequence QShortcut::key() const
-{
-    Q_D(const QShortcut);
-    return d->sc_sequence;
-}
-
-/*!
-    \property QShortcut::enabled
-    \brief whether the shortcut is enabled
-
-    An enabled shortcut emits the activated() or activatedAmbiguously()
-    signal when a QShortcutEvent occurs that matches the shortcut's
-    key() sequence.
-
-    If the application is in \c WhatsThis mode the shortcut will not emit
-    the signals, but will show the "What's This?" text instead.
-
-    By default, this property is \c true.
-
-    \sa whatsThis
-*/
-void QShortcut::setEnabled(bool enable)
-{
-    Q_D(QShortcut);
-    if (d->sc_enabled == enable)
-        return;
-    QAPP_CHECK("setEnabled");
-    d->sc_enabled = enable;
-    QGuiApplicationPrivate::instance()->shortcutMap.setShortcutEnabled(enable, d->sc_id, this);
-}
-
-bool QShortcut::isEnabled() const
-{
-    Q_D(const QShortcut);
-    return d->sc_enabled;
-}
-
-/*!
-    \property QShortcut::context
-    \brief the context in which the shortcut is valid
-
-    A shortcut's context decides in which circumstances a shortcut is
-    allowed to be triggered. The normal context is Qt::WindowShortcut,
-    which allows the shortcut to trigger if the parent (the widget
-    containing the shortcut) is a subwidget of the active top-level
-    window.
-
-    By default, this property is set to Qt::WindowShortcut.
-*/
-void QShortcut::setContext(Qt::ShortcutContext context)
-{
-    Q_D(QShortcut);
-    if(d->sc_context == context)
-        return;
-    QAPP_CHECK("setContext");
-    d->sc_context = context;
-    d->redoGrab(QGuiApplicationPrivate::instance()->shortcutMap);
-}
-
-Qt::ShortcutContext QShortcut::context() const
-{
-    Q_D(const QShortcut);
-    return d->sc_context;
-}
-
 /*!
     \property QShortcut::whatsThis
     \brief the shortcut's "What's This?" help text
@@ -687,67 +544,8 @@ QString QShortcut::whatsThis() const
 }
 
 /*!
-    \property QShortcut::autoRepeat
-    \brief whether the shortcut can auto repeat
-    \since 4.2
-
-    If true, the shortcut will auto repeat when the keyboard shortcut
-    combination is held down, provided that keyboard auto repeat is
-    enabled on the system.
-    The default value is true.
-*/
-void QShortcut::setAutoRepeat(bool on)
-{
-    Q_D(QShortcut);
-    if (d->sc_autorepeat == on)
-        return;
-    QAPP_CHECK("setAutoRepeat");
-    d->sc_autorepeat = on;
-    QGuiApplicationPrivate::instance()->shortcutMap.setShortcutAutoRepeat(on, d->sc_id, this);
-}
-
-bool QShortcut::autoRepeat() const
-{
-    Q_D(const QShortcut);
-    return d->sc_autorepeat;
-}
-
-/*!
-    Returns the shortcut's ID.
-
-    \sa QShortcutEvent::shortcutId()
-*/
-int QShortcut::id() const
-{
-    Q_D(const QShortcut);
-    return d->sc_id;
-}
-
-/*!
-    \internal
+    Destroys the shortcut.
 */
-bool QShortcut::event(QEvent *e)
-{
-    Q_D(QShortcut);
-    if (d->sc_enabled && e->type() == QEvent::Shortcut) {
-        auto se = static_cast<QShortcutEvent *>(e);
-        if (se->shortcutId() == d->sc_id && se->key() == d->sc_sequence){
-#if QT_CONFIG(whatsthis)
-            if (QWhatsThis::inWhatsThisMode()) {
-                QWhatsThis::showText(QCursor::pos(), d->sc_whatsthis);
-            } else
-#endif
-            if (se->isAmbiguous())
-                emit activatedAmbiguously();
-            else
-                emit activated();
-            return true;
-        }
-    }
-    return QObject::event(e);
-}
-#endif // QT_NO_SHORTCUT
+QShortcut::~QShortcut() = default;
 
 QT_END_NAMESPACE
-
-#include "moc_qshortcut.cpp"
diff --git a/src/widgets/kernel/qshortcut.h b/src/widgets/kernel/qshortcut.h
index 384f1967c9..a519a8696a 100644
--- a/src/widgets/kernel/qshortcut.h
+++ b/src/widgets/kernel/qshortcut.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2019 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtWidgets module of the Qt Toolkit.
@@ -42,28 +42,23 @@
 
 #include <QtWidgets/qtwidgetsglobal.h>
 #include <QtWidgets/qwidget.h>
-#include <QtGui/qkeysequence.h>
-
-QT_BEGIN_NAMESPACE
+#include <QtGui/qguishortcut.h>
 
+QT_REQUIRE_CONFIG(shortcut);
 
-#ifndef QT_NO_SHORTCUT
+QT_BEGIN_NAMESPACE
 
 class QShortcutPrivate;
-class Q_WIDGETS_EXPORT QShortcut : public QObject
+class Q_WIDGETS_EXPORT QShortcut : public QGuiShortcut
 {
     Q_OBJECT
-    Q_DECLARE_PRIVATE(QShortcut)
-    Q_PROPERTY(QKeySequence key READ key WRITE setKey)
     Q_PROPERTY(QString whatsThis READ whatsThis WRITE setWhatsThis)
-    Q_PROPERTY(bool enabled READ isEnabled WRITE setEnabled)
-    Q_PROPERTY(bool autoRepeat READ autoRepeat WRITE setAutoRepeat)
-    Q_PROPERTY(Qt::ShortcutContext context READ context WRITE setContext)
+    Q_DECLARE_PRIVATE(QShortcut)
 public:
     explicit QShortcut(QWidget *parent);
-    QShortcut(const QKeySequence &key, QWidget *parent,
-              const char *member = nullptr, const char *ambiguousMember = nullptr,
-              Qt::ShortcutContext shortcutContext = Qt::WindowShortcut);
+    explicit QShortcut(const QKeySequence& key, QWidget *parent,
+                       const char *member = nullptr, const char *ambiguousMember = nullptr,
+                       Qt::ShortcutContext shortcutContext = Qt::WindowShortcut);
 #ifdef Q_CLANG_QDOC
     template<typename Functor>
     QShortcut(const QKeySequence &key, QWidget *parent,
@@ -126,36 +121,13 @@ public:
 #endif
     ~QShortcut();
 
-    void setKey(const QKeySequence& key);
-    QKeySequence key() const;
-
-    void setEnabled(bool enable);
-    bool isEnabled() const;
-
-    void setContext(Qt::ShortcutContext context);
-    Qt::ShortcutContext context() const;
-
     void setWhatsThis(const QString &text);
     QString whatsThis() const;
 
-    void setAutoRepeat(bool on);
-    bool autoRepeat() const;
-
-    int id() const;
-
     inline QWidget *parentWidget() const
     { return static_cast<QWidget *>(QObject::parent()); }
-
-Q_SIGNALS:
-    void activated();
-    void activatedAmbiguously();
-
-protected:
-    bool event(QEvent *e) override;
 };
 
-#endif // QT_NO_SHORTCUT
-
 QT_END_NAMESPACE
 
 #endif // QSHORTCUT_H
diff --git a/src/widgets/kernel/qt_widgets_pch.h b/src/widgets/kernel/qt_widgets_pch.h
index b70941950b..3551f19e80 100644
--- a/src/widgets/kernel/qt_widgets_pch.h
+++ b/src/widgets/kernel/qt_widgets_pch.h
@@ -53,7 +53,9 @@
 #include <qabstractbutton.h>
 #include <qabstractscrollarea.h>
 #include <qabstractslider.h>
-#include <qaction.h>
+#if QT_CONFIG(action)
+#  include <qaction.h>
+#endif
 #include <qcommonstyle.h>
 #include <qlayout.h>
 #include <qstyle.h>
diff --git a/src/widgets/kernel/qwidget.cpp b/src/widgets/kernel/qwidget.cpp
index 691a169269..03d6ea31e9 100644
--- a/src/widgets/kernel/qwidget.cpp
+++ b/src/widgets/kernel/qwidget.cpp
@@ -88,7 +88,9 @@
 
 #include "qwidget_p.h"
 #include <QtGui/private/qwindow_p.h>
-#include "qaction_p.h"
+#if QT_CONFIG(action)
+#  include "qaction_p.h"
+#endif
 #include "qlayout_p.h"
 #if QT_CONFIG(graphicsview)
 #include "QtWidgets/qgraphicsproxywidget.h"
@@ -192,7 +194,15 @@ QWidgetPrivate::QWidgetPrivate(int version)
         return;
     }
 
-    checkForIncompatibleLibraryVersion(version);
+#ifdef QT_BUILD_INTERNAL
+    // Don't check the version parameter in internal builds.
+    // This allows incompatible versions to be loaded, possibly for testing.
+    Q_UNUSED(version);
+#else
+    if (Q_UNLIKELY(version != QObjectPrivateVersion))
+        qFatal("Cannot mix incompatible Qt library (version 0x%x) with this library (version 0x%x)",
+                version, QObjectPrivateVersion);
+#endif
 
     isWidget = true;
     memset(high_attributes, 0, sizeof(high_attributes));
@@ -1506,13 +1516,8 @@ QWidget::~QWidget()
 
     if (d->declarativeData) {
         d->wasDeleted = true; // needed, so that destroying the declarative data does the right thing
-        if (static_cast<QAbstractDeclarativeDataImpl*>(d->declarativeData)->ownedByQml1) {
-            if (QAbstractDeclarativeData::destroyed_qml1)
-                QAbstractDeclarativeData::destroyed_qml1(d->declarativeData, this);
-        } else {
-            if (QAbstractDeclarativeData::destroyed)
-                QAbstractDeclarativeData::destroyed(d->declarativeData, this);
-        }
+        if (QAbstractDeclarativeData::destroyed)
+            QAbstractDeclarativeData::destroyed(d->declarativeData, this);
         d->declarativeData = nullptr;                 // don't activate again in ~QObject
         d->wasDeleted = false;
     }
@@ -4374,7 +4379,7 @@ void QWidget::setPalette(const QPalette &palette)
     widget's palette are implicitly imposed on this widget by the user). Note
     that this font does not take into account the palette set on \a w itself.
 */
-QPalette QWidgetPrivate::naturalWidgetPalette(uint inheritedMask) const
+QPalette QWidgetPrivate::naturalWidgetPalette(QPalette::ResolveMask inheritedMask) const
 {
     Q_Q(const QWidget);
 
@@ -4911,9 +4916,6 @@ void qt_qpa_set_cursor(QWidget *w, bool force)
 
     \note To obtain the contents of a QOpenGLWidget, use QOpenGLWidget::grabFramebuffer()
     instead.
-
-    \note To obtain the contents of a QGLWidget (deprecated), use
-    QGLWidget::grabFrameBuffer() or QGLWidget::renderPixmap() instead.
 */
 void QWidget::render(QPaintDevice *target, const QPoint &targetOffset,
                      const QRegion &sourceRegion, RenderFlags renderFlags)
diff --git a/src/widgets/kernel/qwidget.h b/src/widgets/kernel/qwidget.h
index 415a738eb4..9ea4301428 100644
--- a/src/widgets/kernel/qwidget.h
+++ b/src/widgets/kernel/qwidget.h
@@ -53,7 +53,9 @@
 #include <QtGui/qregion.h>
 #include <QtGui/qbrush.h>
 #include <QtGui/qcursor.h>
-#include <QtGui/qkeysequence.h>
+#if QT_CONFIG(shortcut)
+#  include <QtGui/qkeysequence.h>
+#endif
 
 #ifdef QT_INCLUDE_COMPAT
 #include <QtGui/qevent.h>
@@ -713,9 +715,6 @@ private:
     friend class QLayout;
     friend class QWidgetItem;
     friend class QWidgetItemV2;
-    friend class QGLContext;
-    friend class QGLWidget;
-    friend class QGLWindowSurface;
     friend class QX11PaintEngine;
     friend class QWin32PaintEngine;
     friend class QShortcutPrivate;
diff --git a/src/widgets/kernel/qwidget_p.h b/src/widgets/kernel/qwidget_p.h
index 2597017318..3c29b48973 100644
--- a/src/widgets/kernel/qwidget_p.h
+++ b/src/widgets/kernel/qwidget_p.h
@@ -299,7 +299,7 @@ public:
 
     void setPalette_helper(const QPalette &);
     void resolvePalette();
-    QPalette naturalWidgetPalette(uint inheritedMask) const;
+    QPalette naturalWidgetPalette(QPalette::ResolveMask inheritedMask) const;
 
     void setMask_sys(const QRegion &);
 
@@ -673,7 +673,7 @@ public:
     uint directFontResolveMask;
     uint inheritedFontResolveMask;
     decltype(std::declval<QPalette>().resolve()) directPaletteResolveMask;
-    uint inheritedPaletteResolveMask;
+    QPalette::ResolveMask inheritedPaletteResolveMask;
     short leftmargin;
     short topmargin;
     short rightmargin;
diff --git a/src/widgets/kernel/qwidgetaction.cpp b/src/widgets/kernel/qwidgetaction.cpp
index 9649e51b92..12250983f7 100644
--- a/src/widgets/kernel/qwidgetaction.cpp
+++ b/src/widgets/kernel/qwidgetaction.cpp
@@ -40,7 +40,6 @@
 #include "qwidgetaction.h"
 #include "qdebug.h"
 
-#ifndef QT_NO_ACTION
 #include "qwidgetaction_p.h"
 
 QT_BEGIN_NAMESPACE
@@ -282,5 +281,3 @@ QList<QWidget *> QWidgetAction::createdWidgets() const
 QT_END_NAMESPACE
 
 #include "moc_qwidgetaction.cpp"
-
-#endif // QT_NO_ACTION
diff --git a/src/widgets/kernel/qwidgetaction.h b/src/widgets/kernel/qwidgetaction.h
index 4769332a23..4d302e8c61 100644
--- a/src/widgets/kernel/qwidgetaction.h
+++ b/src/widgets/kernel/qwidgetaction.h
@@ -43,10 +43,9 @@
 #include <QtWidgets/qtwidgetsglobal.h>
 #include <QtWidgets/qaction.h>
 
-QT_BEGIN_NAMESPACE
-
+QT_REQUIRE_CONFIG(action);
 
-#ifndef QT_NO_ACTION
+QT_BEGIN_NAMESPACE
 
 class QWidgetActionPrivate;
 
@@ -78,8 +77,6 @@ private:
     friend class QToolBar;
 };
 
-#endif // QT_NO_ACTION
-
 QT_END_NAMESPACE
 
 #endif // QWIDGETACTION_H
diff --git a/src/widgets/kernel/qwidgetaction_p.h b/src/widgets/kernel/qwidgetaction_p.h
index 1fbcf236a1..0e633a65e4 100644
--- a/src/widgets/kernel/qwidgetaction_p.h
+++ b/src/widgets/kernel/qwidgetaction_p.h
@@ -54,6 +54,8 @@
 #include <QtWidgets/private/qtwidgetsglobal_p.h>
 #include "private/qaction_p.h"
 
+QT_REQUIRE_CONFIG(action);
+
 QT_BEGIN_NAMESPACE
 
 class QWidgetActionPrivate : public QActionPrivate
diff --git a/src/widgets/kernel/qwidgetsvariant.cpp b/src/widgets/kernel/qwidgetsvariant.cpp
index edb166e8d5..45a3bb3f7a 100644
--- a/src/widgets/kernel/qwidgetsvariant.cpp
+++ b/src/widgets/kernel/qwidgetsvariant.cpp
@@ -48,36 +48,6 @@
 QT_BEGIN_NAMESPACE
 
 namespace {
-static void construct(QVariant::Private *x, const void *copy)
-{
-    switch (x->type) {
-    case QMetaType::QSizePolicy:
-        v_construct<QSizePolicy>(x, copy);
-        break;
-    default:
-        qWarning("Trying to construct an instance of an invalid type, type id: %i", x->type);
-        x->type = QMetaType::UnknownType;
-        return;
-    }
-    x->is_null = !copy;
-}
-
-static void clear(QVariant::Private *d)
-{
-    switch (d->type) {
-    case QMetaType::QSizePolicy:
-        v_clear<QSizePolicy>(d);
-        break;
-    default:
-        Q_ASSERT(false);
-        return;
-    }
-
-    d->type = QMetaType::UnknownType;
-    d->is_null = true;
-    d->is_shared = false;
-}
-
 
 static bool isNull(const QVariant::Private *)
 {
@@ -86,8 +56,8 @@ static bool isNull(const QVariant::Private *)
 
 static bool compare(const QVariant::Private *a, const QVariant::Private *b)
 {
-    Q_ASSERT(a->type == b->type);
-    switch(a->type) {
+    Q_ASSERT(a->type() == b->type());
+    switch (a->type().id()) {
     case QMetaType::QSizePolicy:
         return *v_cast<QSizePolicy>(a) == *v_cast<QSizePolicy>(b);
     default:
@@ -110,19 +80,17 @@ static bool convert(const QVariant::Private *d, int type, void *result, bool *ok
 static void streamDebug(QDebug dbg, const QVariant &v)
 {
     QVariant::Private *d = const_cast<QVariant::Private *>(&v.data_ptr());
-    switch (d->type) {
+    switch (d->type().id()) {
     case QMetaType::QSizePolicy:
         dbg.nospace() << *v_cast<QSizePolicy>(d);
         break;
     default:
-        dbg.nospace() << "QMetaType::Type(" << d->type << ')';
+        dbg.nospace() << "QMetaType::Type(" << d->type().id() << ')';
     }
 }
 #endif
 
 static const QVariant::Handler widgets_handler = {
-    construct,
-    clear,
     isNull,
 #ifndef QT_NO_DATASTREAM
     nullptr,
@@ -138,23 +106,42 @@ static const QVariant::Handler widgets_handler = {
 #endif
 };
 
-#define QT_IMPL_METATYPEINTERFACE_WIDGETS_TYPES(MetaTypeName, MetaTypeId, RealName) \
-    QT_METATYPE_INTERFACE_INIT(RealName),
+static const struct : QMetaTypeModuleHelper
+{
+    QtPrivate::QMetaTypeInterface *interfaceForType(int type) const override {
+        switch (type) {
+            QT_FOR_EACH_STATIC_WIDGETS_CLASS(QT_METATYPE_CONVERT_ID_TO_TYPE)
+            default: return nullptr;
+        }
+    }
+#ifndef QT_NO_DATASTREAM
+    bool save(QDataStream &stream, int type, const void *data) const override {
+        switch (type) {
+            QT_FOR_EACH_STATIC_WIDGETS_CLASS(QT_METATYPE_DATASTREAM_SAVE)
+            default: return false;
+        }
+    }
+    bool load(QDataStream &stream, int type, void *data) const override {
+        switch (type) {
+            QT_FOR_EACH_STATIC_WIDGETS_CLASS(QT_METATYPE_DATASTREAM_LOAD)
+            default: return false;
+        }
+    }
+#endif
+
+}  qVariantWidgetsHelper;
 
-static const QMetaTypeInterface qVariantWidgetsHelper[] = {
-    QT_FOR_EACH_STATIC_WIDGETS_CLASS(QT_IMPL_METATYPEINTERFACE_WIDGETS_TYPES)
-};
 
 #undef QT_IMPL_METATYPEINTERFACE_WIDGETS_TYPES
 
 }  // namespace
 
-extern Q_CORE_EXPORT const QMetaTypeInterface *qMetaTypeWidgetsHelper;
+extern Q_CORE_EXPORT const QMetaTypeModuleHelper *qMetaTypeWidgetsHelper;
 
 void qRegisterWidgetsVariant()
 {
     qRegisterMetaType<QWidget*>();
-    qMetaTypeWidgetsHelper = qVariantWidgetsHelper;
+    qMetaTypeWidgetsHelper = &qVariantWidgetsHelper;
     QVariantPrivate::registerHandler(QModulesPrivate::Widgets, &widgets_handler);
 }
 Q_CONSTRUCTOR_FUNCTION(qRegisterWidgetsVariant)
diff --git a/src/widgets/styles/qfusionstyle.cpp b/src/widgets/styles/qfusionstyle.cpp
index ce5f084618..4427d69944 100644
--- a/src/widgets/styles/qfusionstyle.cpp
+++ b/src/widgets/styles/qfusionstyle.cpp
@@ -3191,7 +3191,7 @@ QSize QFusionStyle::sizeFromContents(ContentsType type, const QStyleOption *opti
         break;
     case CT_MenuItem:
         if (const QStyleOptionMenuItem *menuItem = qstyleoption_cast<const QStyleOptionMenuItem *>(option)) {
-            int w = newSize.width();
+            int w = size.width(); // Don't rely of QCommonStyle's width calculation here
             int maxpmw = menuItem->maxIconWidth;
             int tabSpacing = 20;
             if (menuItem->text.contains(QLatin1Char('\t')))
diff --git a/src/widgets/styles/qstyle.cpp b/src/widgets/styles/qstyle.cpp
index 5570d59276..69167a1fe2 100644
--- a/src/widgets/styles/qstyle.cpp
+++ b/src/widgets/styles/qstyle.cpp
@@ -638,7 +638,6 @@ void QStyle::drawItemPixmap(QPainter *painter, const QRect &rect, int alignment,
     indicator or button bevel.
 
     \omitvalue PE_IndicatorViewItemCheck
-    \value PE_FrameStatusBar  Obsolete. Use PE_FrameStatusBarItem instead.
 
     \value PE_PanelButtonCommand  Button used to initiate an action, for
         example, a QPushButton.
diff --git a/src/widgets/styles/qstyle.h b/src/widgets/styles/qstyle.h
index 5be1b4b290..5844251ae5 100644
--- a/src/widgets/styles/qstyle.h
+++ b/src/widgets/styles/qstyle.h
@@ -142,9 +142,6 @@ public:
         PE_FrameLineEdit,
         PE_FrameMenu,
         PE_FrameStatusBarItem,
-#if QT_DEPRECATED_SINCE(5, 13) // ### Qt 6: remove
-        PE_FrameStatusBar Q_DECL_ENUMERATOR_DEPRECATED = PE_FrameStatusBarItem,
-#endif
         PE_FrameTabWidget,
         PE_FrameWindow,
         PE_FrameButtonBevel,
@@ -165,9 +162,6 @@ public:
         PE_IndicatorBranch,
         PE_IndicatorButtonDropDown,
         PE_IndicatorItemViewItemCheck,
-#if QT_DEPRECATED_SINCE(5, 13) // ### Qt 6: remove
-        PE_IndicatorViewItemCheck Q_DECL_ENUMERATOR_DEPRECATED = PE_IndicatorItemViewItemCheck,
-#endif
         PE_IndicatorCheckBox,
         PE_IndicatorDockWidgetResizeHandle,
         PE_IndicatorHeaderArrow,
diff --git a/src/widgets/styles/qstyleanimation.cpp b/src/widgets/styles/qstyleanimation.cpp
index b9202eae69..ce3b6ce34a 100644
--- a/src/widgets/styles/qstyleanimation.cpp
+++ b/src/widgets/styles/qstyleanimation.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2020 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtWidgets module of the Qt Toolkit.
@@ -87,7 +87,7 @@ QTime QStyleAnimation::startTime() const
     return _startTime;
 }
 
-void QStyleAnimation::setStartTime(const QTime &time)
+void QStyleAnimation::setStartTime(QTime time)
 {
     _startTime = time;
 }
@@ -266,7 +266,7 @@ static QImage blendedImage(const QImage &start, const QImage &end, float alpha)
     const int ia = 256 - a;
     const int sw = start.width();
     const int sh = start.height();
-    const int bpl = start.bytesPerLine();
+    const qsizetype bpl = start.bytesPerLine();
     switch (start.depth()) {
     case 32:
         {
diff --git a/src/widgets/styles/qstyleanimation_p.h b/src/widgets/styles/qstyleanimation_p.h
index d28fc6ebab..0971289756 100644
--- a/src/widgets/styles/qstyleanimation_p.h
+++ b/src/widgets/styles/qstyleanimation_p.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2020 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtWidgets module of the Qt Toolkit.
@@ -77,7 +77,7 @@ public:
     void setDelay(int delay);
 
     QTime startTime() const;
-    void setStartTime(const QTime &time);
+    void setStartTime(QTime time);
 
     enum FrameRate {
         DefaultFps,
diff --git a/src/widgets/styles/qstyleoption.cpp b/src/widgets/styles/qstyleoption.cpp
index 95232dd97b..356092074c 100644
--- a/src/widgets/styles/qstyleoption.cpp
+++ b/src/widgets/styles/qstyleoption.cpp
@@ -1776,7 +1776,7 @@ QStyleOptionMenuItem::QStyleOptionMenuItem(int version)
     \value Exclusive The item is an exclusive check item (like a radio button).
     \value NonExclusive The item is a non-exclusive check item (like a check box).
 
-    \sa checkType, QAction::checkable, QAction::checked, QActionGroup::exclusionPolicy
+    \sa checkType, QGuiAction::checkable, QGuiAction::checked, QGuiActionGroup::exclusionPolicy
 */
 
 /*!
@@ -3763,7 +3763,7 @@ qreal QStyleOptionGraphicsItem::levelOfDetailFromTransform(const QTransform &wor
      \brief the complete transformation matrix for the item
      \obsolete
 
-     The QMatrix provided through this member does include information about
+     The QTransform provided through this member does include information about
      any perspective transformations applied to the view or item. To get the
      correct transformation matrix, use QPainter::transform() on the painter
      passed into the QGraphicsItem::paint() implementation.
@@ -3774,7 +3774,7 @@ qreal QStyleOptionGraphicsItem::levelOfDetailFromTransform(const QTransform &wor
      item drawing.
 
      To find the dimensions of an item in screen coordinates (i.e., pixels),
-     you can use the mapping functions of QMatrix, such as QMatrix::map().
+     you can use the mapping functions of QTransform, such as QTransform::map().
 
      This member is only initialized for items that have the
      QGraphicsItem::ItemUsesExtendedStyleOption flag set.
diff --git a/src/widgets/styles/qstyleoption.h b/src/widgets/styles/qstyleoption.h
index a8ce3b465e..a93f0c7ca6 100644
--- a/src/widgets/styles/qstyleoption.h
+++ b/src/widgets/styles/qstyleoption.h
@@ -47,7 +47,7 @@
 #include <QtWidgets/qabstractspinbox.h>
 #endif
 #include <QtGui/qicon.h>
-#include <QtGui/qmatrix.h>
+#include <QtGui/qtransform.h>
 #if QT_CONFIG(slider)
 #include <QtWidgets/qslider.h>
 #endif
@@ -693,7 +693,7 @@ public:
     enum StyleOptionVersion { Version = 1 };
 
     QRectF exposedRect;
-    QMatrix matrix;
+    QTransform matrix;
     qreal levelOfDetail;
 
     QStyleOptionGraphicsItem();
diff --git a/src/widgets/styles/qstylesheetstyle_p.h b/src/widgets/styles/qstylesheetstyle_p.h
index c5266558af..3c3503b964 100644
--- a/src/widgets/styles/qstylesheetstyle_p.h
+++ b/src/widgets/styles/qstylesheetstyle_p.h
@@ -194,7 +194,7 @@ public:
     template <typename T>
     struct Tampered {
         T oldWidgetValue;
-        uint resolveMask;
+        decltype(std::declval<T>().resolve()) resolveMask;
 
         // only call this function on an rvalue *this (it mangles oldWidgetValue)
         T reverted(T current)
@@ -214,7 +214,7 @@ public:
 };
 template <typename T>
 class QTypeInfo<QStyleSheetStyleCaches::Tampered<T>>
-    : QTypeInfoMerger<QStyleSheetStyleCaches::Tampered<T>, T> {};
+    : public QTypeInfoMerger<QStyleSheetStyleCaches::Tampered<T>, T> {};
 
 
 // Returns a QStyleSheet from the given style.
diff --git a/src/widgets/util/qundostack.cpp b/src/widgets/util/qundostack.cpp
index f188b8298a..8974f11a13 100644
--- a/src/widgets/util/qundostack.cpp
+++ b/src/widgets/util/qundostack.cpp
@@ -443,7 +443,7 @@ const QUndoCommand *QUndoCommand::child(int index) const
     \sa QUndoCommand, QUndoView
 */
 
-#ifndef QT_NO_ACTION
+#if QT_CONFIG(action)
 
 QUndoAction::QUndoAction(const QString &prefix, QObject *parent)
     : QAction(parent)
@@ -473,7 +473,7 @@ void QUndoAction::setTextFormat(const QString &textFormat, const QString &defaul
     m_defaultText = defaultText;
 }
 
-#endif // QT_NO_ACTION
+#endif // QT_CONFIG(action)
 
 /*! \internal
     Sets the current index to \a idx, emitting appropriate signals. If \a clean is true,
diff --git a/src/widgets/util/qundostack_p.h b/src/widgets/util/qundostack_p.h
index 05c9e0d27e..c44cdd6603 100644
--- a/src/widgets/util/qundostack_p.h
+++ b/src/widgets/util/qundostack_p.h
@@ -44,7 +44,9 @@
 #include <private/qobject_p.h>
 #include <QtCore/qlist.h>
 #include <QtCore/qstring.h>
-#include <QtWidgets/qaction.h>
+#if QT_CONFIG(action)
+#  include <QtWidgets/qaction.h>
+#endif
 
 #include "qundostack.h"
 
diff --git a/src/widgets/widgets/qabstractbutton.cpp b/src/widgets/widgets/qabstractbutton.cpp
index 7961d0a21b..77ffda10b0 100644
--- a/src/widgets/widgets/qabstractbutton.cpp
+++ b/src/widgets/widgets/qabstractbutton.cpp
@@ -52,7 +52,6 @@
 #include "qpainter.h"
 #include "qapplication.h"
 #include "qstyle.h"
-#include "qaction.h"
 #ifndef QT_NO_ACCESSIBILITY
 #include "qaccessible.h"
 #endif
@@ -414,16 +413,8 @@ void QAbstractButtonPrivate::emitClicked()
     QPointer<QAbstractButton> guard(q);
     emit q->clicked(checked);
 #if QT_CONFIG(buttongroup)
-    if (guard && group) {
-#if QT_DEPRECATED_SINCE(5, 15)
-QT_WARNING_PUSH
-QT_WARNING_DISABLE_DEPRECATED
-        emit group->buttonClicked(group->id(q));
-        if (guard && group)
-QT_WARNING_POP
-#endif
-            emit group->buttonClicked(q);
-    }
+    if (guard && group)
+        emit group->buttonClicked(q);
 #endif
 }
 
@@ -433,16 +424,8 @@ void QAbstractButtonPrivate::emitPressed()
     QPointer<QAbstractButton> guard(q);
     emit q->pressed();
 #if QT_CONFIG(buttongroup)
-    if (guard && group) {
-#if QT_DEPRECATED_SINCE(5, 15)
-QT_WARNING_PUSH
-QT_WARNING_DISABLE_DEPRECATED
-        emit group->buttonPressed(group->id(q));
-        if (guard && group)
-QT_WARNING_POP
-#endif
-            emit group->buttonPressed(q);
-    }
+    if (guard && group)
+        emit group->buttonPressed(q);
 #endif
 }
 
@@ -452,16 +435,8 @@ void QAbstractButtonPrivate::emitReleased()
     QPointer<QAbstractButton> guard(q);
     emit q->released();
 #if QT_CONFIG(buttongroup)
-    if (guard && group) {
-#if QT_DEPRECATED_SINCE(5, 15)
-QT_WARNING_PUSH
-QT_WARNING_DISABLE_DEPRECATED
-        emit group->buttonReleased(group->id(q));
-        if (guard && group)
-QT_WARNING_POP
-#endif
-            emit group->buttonReleased(q);
-    }
+    if (guard && group)
+        emit group->buttonReleased(q);
 #endif
 }
 
@@ -471,16 +446,8 @@ void QAbstractButtonPrivate::emitToggled(bool checked)
     QPointer<QAbstractButton> guard(q);
     emit q->toggled(checked);
 #if QT_CONFIG(buttongroup)
-    if (guard && group) {
-#if QT_DEPRECATED_SINCE(5, 15)
-QT_WARNING_PUSH
-QT_WARNING_DISABLE_DEPRECATED
-        emit group->buttonToggled(group->id(q), checked);
-        if (guard && group)
-QT_WARNING_POP
-#endif
-            emit group->buttonToggled(q, checked);
-    }
+    if (guard && group)
+        emit group->buttonToggled(q, checked);
 #endif
 }
 
diff --git a/src/widgets/widgets/qabstractbutton.h b/src/widgets/widgets/qabstractbutton.h
index 50c94654f3..d44da2f4f3 100644
--- a/src/widgets/widgets/qabstractbutton.h
+++ b/src/widgets/widgets/qabstractbutton.h
@@ -42,7 +42,9 @@
 
 #include <QtWidgets/qtwidgetsglobal.h>
 #include <QtGui/qicon.h>
-#include <QtGui/qkeysequence.h>
+#if QT_CONFIG(shortcut)
+#  include <QtGui/qkeysequence.h>
+#endif
 #include <QtWidgets/qwidget.h>
 
 QT_REQUIRE_CONFIG(abstractbutton);
diff --git a/src/widgets/widgets/qbuttongroup.cpp b/src/widgets/widgets/qbuttongroup.cpp
index 9162029cdb..1368c721ad 100644
--- a/src/widgets/widgets/qbuttongroup.cpp
+++ b/src/widgets/widgets/qbuttongroup.cpp
@@ -163,16 +163,6 @@ void QButtonGroup::setExclusive(bool exclusive)
 */
 
 /*!
-    \fn void QButtonGroup::buttonClicked(int id)
-    \obsolete
-
-    This signal is emitted when a button with the given \a id is
-    clicked.
-
-    \sa checkedButton(), QAbstractButton::clicked()
-*/
-
-/*!
     \fn void QButtonGroup::buttonPressed(QAbstractButton *button)
     \since 4.2
 
@@ -182,17 +172,6 @@ void QButtonGroup::setExclusive(bool exclusive)
 */
 
 /*!
-    \fn void QButtonGroup::buttonPressed(int id)
-    \since 4.2
-    \obsolete
-
-    This signal is emitted when a button with the given \a id is
-    pressed down.
-
-    \sa QAbstractButton::pressed()
-*/
-
-/*!
     \fn void QButtonGroup::buttonReleased(QAbstractButton *button)
     \since 4.2
 
@@ -202,17 +181,6 @@ void QButtonGroup::setExclusive(bool exclusive)
 */
 
 /*!
-    \fn void QButtonGroup::buttonReleased(int id)
-    \since 4.2
-    \obsolete
-
-    This signal is emitted when a button with the given \a id is
-    released.
-
-    \sa QAbstractButton::released()
-*/
-
-/*!
     \fn void QButtonGroup::buttonToggled(QAbstractButton *button, bool checked)
     \since 5.2
 
@@ -222,17 +190,6 @@ void QButtonGroup::setExclusive(bool exclusive)
     \sa QAbstractButton::toggled()
 */
 
-/*!
-    \fn void QButtonGroup::buttonToggled(int id, bool checked)
-    \since 5.2
-    \obsolete
-
-    This signal is emitted when a button with the given \a id is toggled.
-    \a checked is true if the button is checked, or false if the button is unchecked.
-
-    \sa QAbstractButton::toggled()
-*/
-
 
 /*!
     Adds the given \a button to the button group. If \a id is -1,
diff --git a/src/widgets/widgets/qbuttongroup.h b/src/widgets/widgets/qbuttongroup.h
index 2989dcb4ba..838bf8abce 100644
--- a/src/widgets/widgets/qbuttongroup.h
+++ b/src/widgets/widgets/qbuttongroup.h
@@ -81,16 +81,6 @@ Q_SIGNALS:
     void buttonPressed(QAbstractButton *);
     void buttonReleased(QAbstractButton *);
     void buttonToggled(QAbstractButton *, bool);
-#if QT_DEPRECATED_SINCE(5, 15)
-    QT_DEPRECATED_VERSION_X_5_15("Use QButtonGroup::buttonClicked(QAbstractButton *) instead")
-    void buttonClicked(int);
-    QT_DEPRECATED_VERSION_X_5_15("Use QButtonGroup::buttonPressed(QAbstractButton *) instead")
-    void buttonPressed(int);
-    QT_DEPRECATED_VERSION_X_5_15("Use QButtonGroup::buttonReleased(QAbstractButton *) instead")
-    void buttonReleased(int);
-    QT_DEPRECATED_VERSION_X_5_15("Use QButtonGroup::buttonToggled(QAbstractButton *, bool) instead")
-    void buttonToggled(int, bool);
-#endif
 
 private:
     Q_DISABLE_COPY(QButtonGroup)
diff --git a/src/widgets/widgets/qcalendarwidget.cpp b/src/widgets/widgets/qcalendarwidget.cpp
index 570ec72377..e7dddef766 100644
--- a/src/widgets/widgets/qcalendarwidget.cpp
+++ b/src/widgets/widgets/qcalendarwidget.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2019 The Qt Company Ltd.
+** Copyright (C) 2020 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtWidgets module of the Qt Toolkit.
@@ -2311,7 +2311,7 @@ QSize QCalendarWidget::minimumSizeHint() const
     Paints the cell specified by the given \a date, using the given \a painter and \a rect.
 */
 
-void QCalendarWidget::paintCell(QPainter *painter, const QRect &rect, const QDate &date) const
+void QCalendarWidget::paintCell(QPainter *painter, QRect rect, QDate date) const
 {
     Q_D(const QCalendarWidget);
     d->m_delegate->paintCell(painter, rect, date);
@@ -2334,7 +2334,7 @@ QDate QCalendarWidget::selectedDate() const
     return d->m_model->m_date;
 }
 
-void QCalendarWidget::setSelectedDate(const QDate &date)
+void QCalendarWidget::setSelectedDate(QDate date)
 {
     Q_D(QCalendarWidget);
     if (d->m_model->m_date == date && date == d->getCurrentDate())
@@ -2543,7 +2543,7 @@ QDate QCalendarWidget::minimumDate() const
     return d->m_model->m_minimumDate;
 }
 
-void QCalendarWidget::setMinimumDate(const QDate &date)
+void QCalendarWidget::setMinimumDate(QDate date)
 {
     Q_D(QCalendarWidget);
     if (!date.isValid() || d->m_model->m_minimumDate == date)
@@ -2594,7 +2594,7 @@ QDate QCalendarWidget::maximumDate() const
     return d->m_model->m_maximumDate;
 }
 
-void QCalendarWidget::setMaximumDate(const QDate &date)
+void QCalendarWidget::setMaximumDate(QDate date)
 {
     Q_D(QCalendarWidget);
     if (!date.isValid() || d->m_model->m_maximumDate == date)
@@ -2632,7 +2632,7 @@ void QCalendarWidget::setMaximumDate(const QDate &date)
     \sa setMinimumDate(), setMaximumDate()
 */
 
-void QCalendarWidget::setDateRange(const QDate &min, const QDate &max)
+void QCalendarWidget::setDateRange(QDate min, QDate max)
 {
     Q_D(QCalendarWidget);
     if (d->m_model->m_minimumDate == min && d->m_model->m_maximumDate == max)
@@ -2900,7 +2900,7 @@ QMap<QDate, QTextCharFormat> QCalendarWidget::dateTextFormat() const
     Returns a QTextCharFormat for \a date. The char format can be be
     empty if the date is not renderd specially.
 */
-QTextCharFormat QCalendarWidget::dateTextFormat(const QDate &date) const
+QTextCharFormat QCalendarWidget::dateTextFormat(QDate date) const
 {
     Q_D(const QCalendarWidget);
     return d->m_model->m_dateFormats.value(date);
@@ -2911,7 +2911,7 @@ QTextCharFormat QCalendarWidget::dateTextFormat(const QDate &date) const
 
     If \a date is null, all date formats are cleared.
 */
-void QCalendarWidget::setDateTextFormat(const QDate &date, const QTextCharFormat &format)
+void QCalendarWidget::setDateTextFormat(QDate date, const QTextCharFormat &format)
 {
     Q_D(QCalendarWidget);
     if (date.isNull())
@@ -2989,7 +2989,7 @@ void QCalendarWidget::setDateEditAcceptDelay(int delay)
 
     \sa updateCells(), yearShown(), monthShown()
 */
-void QCalendarWidget::updateCell(const QDate &date)
+void QCalendarWidget::updateCell(QDate date)
 {
     if (Q_UNLIKELY(!date.isValid())) {
         qWarning("QCalendarWidget::updateCell: Invalid date");
@@ -3048,7 +3048,7 @@ void QCalendarWidget::updateCells()
 */
 
 /*!
-    \fn void QCalendarWidget::activated(const QDate &date)
+    \fn void QCalendarWidget::activated(QDate date)
 
     This signal is emitted whenever the user presses the Return or
     Enter key or double-clicks a \a date in the calendar
@@ -3056,7 +3056,7 @@ void QCalendarWidget::updateCells()
 */
 
 /*!
-    \fn void QCalendarWidget::clicked(const QDate &date)
+    \fn void QCalendarWidget::clicked(QDate date)
 
     This signal is emitted when a mouse button is clicked. The date
     the mouse was clicked on is specified by \a date. The signal is
diff --git a/src/widgets/widgets/qcalendarwidget.h b/src/widgets/widgets/qcalendarwidget.h
index 08825a0ff3..70cf574a81 100644
--- a/src/widgets/widgets/qcalendarwidget.h
+++ b/src/widgets/widgets/qcalendarwidget.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2018 The Qt Company Ltd.
+** Copyright (C) 2020 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtWidgets module of the Qt Toolkit.
@@ -101,10 +101,10 @@ public:
     int monthShown() const;
 
     QDate minimumDate() const;
-    void setMinimumDate(const QDate &date);
+    void setMinimumDate(QDate date);
 
     QDate maximumDate() const;
-    void setMaximumDate(const QDate &date);
+    void setMaximumDate(QDate date);
 
     Qt::DayOfWeek firstDayOfWeek() const;
     void setFirstDayOfWeek(Qt::DayOfWeek dayOfWeek);
@@ -131,8 +131,8 @@ public:
     void setWeekdayTextFormat(Qt::DayOfWeek dayOfWeek, const QTextCharFormat &format);
 
     QMap<QDate, QTextCharFormat> dateTextFormat() const;
-    QTextCharFormat dateTextFormat(const QDate &date) const;
-    void setDateTextFormat(const QDate &date, const QTextCharFormat &format);
+    QTextCharFormat dateTextFormat(QDate date) const;
+    void setDateTextFormat(QDate date, const QTextCharFormat &format);
 
     bool isDateEditEnabled() const;
     void setDateEditEnabled(bool enable);
@@ -147,13 +147,13 @@ protected:
     void resizeEvent(QResizeEvent * event) override;
     void keyPressEvent(QKeyEvent * event) override;
 
-    virtual void paintCell(QPainter *painter, const QRect &rect, const QDate &date) const;
-    void updateCell(const QDate &date);
+    virtual void paintCell(QPainter *painter, QRect rect, QDate date) const;
+    void updateCell(QDate date);
     void updateCells();
 
 public Q_SLOTS:
-    void setSelectedDate(const QDate &date);
-    void setDateRange(const QDate &min, const QDate &max);
+    void setSelectedDate(QDate date);
+    void setDateRange(QDate min, QDate max);
     void setCurrentPage(int year, int month);
     void setGridVisible(bool show);
     void setNavigationBarVisible(bool visible);
@@ -166,17 +166,17 @@ public Q_SLOTS:
 
 Q_SIGNALS:
     void selectionChanged();
-    void clicked(const QDate &date);
-    void activated(const QDate &date);
+    void clicked(QDate date);
+    void activated(QDate date);
     void currentPageChanged(int year, int month);
 
 private:
     Q_DECLARE_PRIVATE(QCalendarWidget)
     Q_DISABLE_COPY(QCalendarWidget)
 
-    Q_PRIVATE_SLOT(d_func(), void _q_slotShowDate(const QDate &date))
-    Q_PRIVATE_SLOT(d_func(), void _q_slotChangeDate(const QDate &date))
-    Q_PRIVATE_SLOT(d_func(), void _q_slotChangeDate(const QDate &date, bool changeMonth))
+    Q_PRIVATE_SLOT(d_func(), void _q_slotShowDate(QDate date))
+    Q_PRIVATE_SLOT(d_func(), void _q_slotChangeDate(QDate date))
+    Q_PRIVATE_SLOT(d_func(), void _q_slotChangeDate(QDate date, bool changeMonth))
     Q_PRIVATE_SLOT(d_func(), void _q_editingFinished())
     Q_PRIVATE_SLOT(d_func(), void _q_prevMonthClicked())
     Q_PRIVATE_SLOT(d_func(), void _q_nextMonthClicked())
diff --git a/src/widgets/widgets/qcombobox.cpp b/src/widgets/widgets/qcombobox.cpp
index df8e7b4a3f..47993b8f3b 100644
--- a/src/widgets/widgets/qcombobox.cpp
+++ b/src/widgets/widgets/qcombobox.cpp
@@ -905,20 +905,9 @@ QStyleOptionComboBox QComboBoxPrivateContainer::comboStyleOption() const
     The item's \a index is passed. Note that this signal is sent even
     when the choice is not changed. If you need to know when the
     choice actually changes, use signal currentIndexChanged().
-
 */
 
 /*!
-    \fn void QComboBox::activated(const QString &text)
-
-    This signal is sent when the user chooses an item in the combobox.
-    The item's \a text is passed. Note that this signal is sent even
-    when the choice is not changed. If you need to know when the
-    choice actually changes, use signal currentIndexChanged().
-
-    \obsolete Use QComboBox::textActivated() instead
-*/
-/*!
     \fn void QComboBox::textActivated(const QString &text)
     \since 5.14
 
@@ -936,14 +925,6 @@ QStyleOptionComboBox QComboBoxPrivateContainer::comboStyleOption() const
 */
 
 /*!
-    \fn void QComboBox::highlighted(const QString &text)
-
-    This signal is sent when an item in the combobox popup list is
-    highlighted by the user. The item's \a text is passed.
-
-    \obsolete Use textHighlighted() instead
-*/
-/*!
     \fn void QComboBox::textHighlighted(const QString &text)
     \since 5.14
 
@@ -952,29 +933,6 @@ QStyleOptionComboBox QComboBoxPrivateContainer::comboStyleOption() const
 */
 
 /*!
-    \fn void QComboBox::currentIndexChanged(int index)
-    \since 4.1
-
-    This signal is sent whenever the currentIndex in the combobox
-    changes either through user interaction or programmatically. The
-    item's \a index is passed or -1 if the combobox becomes empty or the
-    currentIndex was reset.
-
-    \obsolete Use currentIndexChanged(int index, const QString &text) instead
-*/
-
-/*!
-    \fn void QComboBox::currentIndexChanged(const QString &text)
-    \since 4.1
-
-    This signal is sent whenever the currentIndex in the combobox
-    changes either through user interaction or programmatically.  The
-    item's \a text is passed.
-
-    \obsolete Use currentIndexChanged(int index, const QString &text) instead
-*/
-
-/*!
     \fn void QComboBox::currentIndexChanged(int index, const QString &text)
     \since 5.15
 
@@ -1438,12 +1396,6 @@ void QComboBoxPrivate::emitActivated(const QModelIndex &index)
     QString text(itemText(index));
     emit q->activated(index.row());
     emit q->textActivated(text);
-#if QT_DEPRECATED_SINCE(5, 15)
-QT_WARNING_PUSH
-QT_WARNING_DISABLE_DEPRECATED
-    emit q->activated(text);
-QT_WARNING_POP
-#endif
 }
 
 void QComboBoxPrivate::_q_emitHighlighted(const QModelIndex &index)
@@ -1454,25 +1406,12 @@ void QComboBoxPrivate::_q_emitHighlighted(const QModelIndex &index)
     QString text(itemText(index));
     emit q->highlighted(index.row());
     emit q->textHighlighted(text);
-#if QT_DEPRECATED_SINCE(5, 15)
-QT_WARNING_PUSH
-QT_WARNING_DISABLE_DEPRECATED
-    emit q->highlighted(text);
-QT_WARNING_POP
-#endif
 }
 
 void QComboBoxPrivate::_q_emitCurrentIndexChanged(const QModelIndex &index)
 {
     Q_Q(QComboBox);
     const QString text = itemText(index);
-#if QT_DEPRECATED_SINCE(5, 15)
-    QT_WARNING_PUSH
-    QT_WARNING_DISABLE_DEPRECATED
-    emit q->currentIndexChanged(index.row());
-    emit q->currentIndexChanged(text);
-    QT_WARNING_POP
-#endif
     emit q->currentIndexChanged(index.row(), text);
     // signal lineEdit.textChanged already connected to signal currentTextChanged, so don't emit double here
     if (!lineEdit)
@@ -2129,6 +2068,9 @@ QAbstractItemDelegate *QComboBox::itemDelegate() const
     Sets the item \a delegate for the popup list view.
     The combobox takes ownership of the delegate.
 
+    Any existing delegate will be removed, but not deleted. QComboBox
+    does not take ownership of \a delegate.
+
     \warning You should not share the same instance of a delegate between comboboxes,
     widget mappers or views. Doing so can cause incorrect or unintuitive editing behavior
     since each view connected to a given delegate may receive the
@@ -2143,7 +2085,6 @@ void QComboBox::setItemDelegate(QAbstractItemDelegate *delegate)
         qWarning("QComboBox::setItemDelegate: cannot set a 0 delegate");
         return;
     }
-    delete view()->itemDelegate();
     view()->setItemDelegate(delegate);
 }
 
diff --git a/src/widgets/widgets/qcombobox.h b/src/widgets/widgets/qcombobox.h
index e0b213bc89..99816954fa 100644
--- a/src/widgets/widgets/qcombobox.h
+++ b/src/widgets/widgets/qcombobox.h
@@ -173,7 +173,7 @@ public:
     void setItemDelegate(QAbstractItemDelegate *delegate);
 
     QAbstractItemModel *model() const;
-    void setModel(QAbstractItemModel *model);
+    virtual void setModel(QAbstractItemModel *model);
 
     QModelIndex rootModelIndex() const;
     void setRootModelIndex(const QModelIndex &index);
@@ -233,20 +233,8 @@ Q_SIGNALS:
     void textActivated(const QString &);
     void highlighted(int index);
     void textHighlighted(const QString &);
-#if QT_DEPRECATED_SINCE(5, 15)
-    QT_DEPRECATED_VERSION_X_5_15("Use currentIndexChanged(int, const QString &) instead")
-    void currentIndexChanged(int index);
-    QT_DEPRECATED_VERSION_X_5_15("Use currentIndexChanged(int, const QString &) instead")
-    void currentIndexChanged(const QString &);
-#endif
     void currentIndexChanged(int index, const QString &text);
     void currentTextChanged(const QString &);
-#if QT_DEPRECATED_SINCE(5, 15)
-    QT_DEPRECATED_VERSION_X(5, 15, "Use textActivated() instead")
-    void activated(const QString &);
-    QT_DEPRECATED_VERSION_X(5, 15, "Use textHighlighted() instead")
-    void highlighted(const QString &);
-#endif
 
 protected:
     void focusInEvent(QFocusEvent *e) override;
diff --git a/src/widgets/widgets/qdatetimeedit.cpp b/src/widgets/widgets/qdatetimeedit.cpp
index c52bb89f28..105318ba20 100644
--- a/src/widgets/widgets/qdatetimeedit.cpp
+++ b/src/widgets/widgets/qdatetimeedit.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2019 The Qt Company Ltd.
+** Copyright (C) 2020 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtWidgets module of the Qt Toolkit.
@@ -53,6 +53,9 @@
 #include <qlayout.h>
 #include <qset.h>
 #include <qstyle.h>
+#if QT_CONFIG(timezone)
+#include <QTimeZone>
+#endif
 
 #include <algorithm>
 
@@ -130,14 +133,14 @@ QT_BEGIN_NAMESPACE
 */
 
 /*!
-  \fn void QDateTimeEdit::timeChanged(const QTime &time)
+  \fn void QDateTimeEdit::timeChanged(QTime time)
 
   This signal is emitted whenever the time is changed. The new time
   is passed in \a time.
 */
 
 /*!
-  \fn void QDateTimeEdit::dateChanged(const QDate &date)
+  \fn void QDateTimeEdit::dateChanged(QDate date)
 
   This signal is emitted whenever the date is changed. The new date
   is passed in \a date.
@@ -168,13 +171,13 @@ QDateTimeEdit::QDateTimeEdit(const QDateTime &datetime, QWidget *parent)
 }
 
 /*!
-  \fn QDateTimeEdit::QDateTimeEdit(const QDate &date, QWidget *parent)
+  \fn QDateTimeEdit::QDateTimeEdit(QDate date, QWidget *parent)
 
   Constructs an empty date time editor with a \a parent.
   The value is set to \a date.
 */
 
-QDateTimeEdit::QDateTimeEdit(const QDate &date, QWidget *parent)
+QDateTimeEdit::QDateTimeEdit(QDate date, QWidget *parent)
     : QAbstractSpinBox(*new QDateTimeEditPrivate, parent)
 {
     Q_D(QDateTimeEdit);
@@ -182,13 +185,13 @@ QDateTimeEdit::QDateTimeEdit(const QDate &date, QWidget *parent)
 }
 
 /*!
-  \fn QDateTimeEdit::QDateTimeEdit(const QTime &time, QWidget *parent)
+  \fn QDateTimeEdit::QDateTimeEdit(QTime time, QWidget *parent)
 
   Constructs an empty date time editor with a \a parent.
   The value is set to \a time.
 */
 
-QDateTimeEdit::QDateTimeEdit(const QTime &time, QWidget *parent)
+QDateTimeEdit::QDateTimeEdit(QTime time, QWidget *parent)
     : QAbstractSpinBox(*new QDateTimeEditPrivate, parent)
 {
     Q_D(QDateTimeEdit);
@@ -226,8 +229,8 @@ QDateTimeEdit::~QDateTimeEdit()
   \property QDateTimeEdit::dateTime
   \brief The QDateTime that is set in the QDateTimeEdit.
 
-  When setting this property the timespec of the QDateTimeEdit remains the same
-  and the timespec of the new QDateTime is ignored.
+  When setting this property, the new QDateTime is converted to the timespec of
+  the QDateTimeEdit, which thus remains unchanged.
 
   By default, this property is set to the start of 2000 CE. It can only be set
   to a valid QDateTime value. If any operation causes this property to have an
@@ -251,11 +254,14 @@ void QDateTimeEdit::setDateTime(const QDateTime &datetime)
 {
     Q_D(QDateTimeEdit);
     if (datetime.isValid()) {
+        QDateTime when = d->convertTimeSpec(datetime);
+        Q_ASSERT(when.timeSpec() == d->spec);
+
         d->clearCache();
-        const QDate date = datetime.date();
+        const QDate date = when.date();
         if (!(d->sections & DateSections_Mask))
             setDateRange(date, date);
-        d->setValue(QDateTime(date, datetime.time(), d->spec), EmitIfChanged);
+        d->setValue(when, EmitIfChanged);
     }
 }
 
@@ -277,7 +283,7 @@ QDate QDateTimeEdit::date() const
     return d->value.toDate();
 }
 
-void QDateTimeEdit::setDate(const QDate &date)
+void QDateTimeEdit::setDate(QDate date)
 {
     Q_D(QDateTimeEdit);
     if (date.isValid()) {
@@ -314,7 +320,7 @@ QTime QDateTimeEdit::time() const
     return d->value.toTime();
 }
 
-void QDateTimeEdit::setTime(const QTime &time)
+void QDateTimeEdit::setTime(QTime time)
 {
     Q_D(QDateTimeEdit);
     if (time.isValid()) {
@@ -477,7 +483,7 @@ QDate QDateTimeEdit::minimumDate() const
     return d->minimum.toDate();
 }
 
-void QDateTimeEdit::setMinimumDate(const QDate &min)
+void QDateTimeEdit::setMinimumDate(QDate min)
 {
     Q_D(QDateTimeEdit);
     if (min.isValid() && min >= QDATETIMEEDIT_DATE_MIN) {
@@ -517,7 +523,7 @@ QDate QDateTimeEdit::maximumDate() const
     return d->maximum.toDate();
 }
 
-void QDateTimeEdit::setMaximumDate(const QDate &max)
+void QDateTimeEdit::setMaximumDate(QDate max)
 {
     Q_D(QDateTimeEdit);
     if (max.isValid())
@@ -554,7 +560,7 @@ QTime QDateTimeEdit::minimumTime() const
     return d->minimum.toTime();
 }
 
-void QDateTimeEdit::setMinimumTime(const QTime &min)
+void QDateTimeEdit::setMinimumTime(QTime min)
 {
     Q_D(QDateTimeEdit);
     if (min.isValid()) {
@@ -592,7 +598,7 @@ QTime QDateTimeEdit::maximumTime() const
     return d->maximum.toTime();
 }
 
-void QDateTimeEdit::setMaximumTime(const QTime &max)
+void QDateTimeEdit::setMaximumTime(QTime max)
 {
     Q_D(QDateTimeEdit);
     if (max.isValid()) {
@@ -628,7 +634,7 @@ void QDateTimeEdit::clearMaximumTime()
   \sa minimumDate, maximumDate, setDateTimeRange(), QDate::isValid()
 */
 
-void QDateTimeEdit::setDateRange(const QDate &min, const QDate &max)
+void QDateTimeEdit::setDateRange(QDate min, QDate max)
 {
     Q_D(QDateTimeEdit);
     if (min.isValid() && max.isValid()) {
@@ -662,7 +668,7 @@ void QDateTimeEdit::setDateRange(const QDate &min, const QDate &max)
   \sa minimumTime, maximumTime, setDateTimeRange(), QTime::isValid()
 */
 
-void QDateTimeEdit::setTimeRange(const QTime &min, const QTime &max)
+void QDateTimeEdit::setTimeRange(QTime min, QTime max)
 {
     Q_D(QDateTimeEdit);
     if (min.isValid() && max.isValid()) {
@@ -1592,7 +1598,7 @@ QTimeEdit::QTimeEdit(QWidget *parent)
   to \a time.
 */
 
-QTimeEdit::QTimeEdit(const QTime &time, QWidget *parent)
+QTimeEdit::QTimeEdit(QTime time, QWidget *parent)
     : QDateTimeEdit(time, QMetaType::QTime, parent)
 {
     connect(this, &QTimeEdit::timeChanged, this, &QTimeEdit::userTimeChanged);
@@ -1612,7 +1618,7 @@ QTimeEdit::~QTimeEdit()
 */
 
 /*!
-  \fn void QTimeEdit::userTimeChanged(const QTime &time)
+  \fn void QTimeEdit::userTimeChanged(QTime time)
 
   This signal only exists to fully implement the time Q_PROPERTY on the class.
   Normally timeChanged should be used instead.
@@ -1662,7 +1668,7 @@ QDateEdit::QDateEdit(QWidget *parent)
   to \a date.
 */
 
-QDateEdit::QDateEdit(const QDate &date, QWidget *parent)
+QDateEdit::QDateEdit(QDate date, QWidget *parent)
     : QDateTimeEdit(date, QMetaType::QDate, parent)
 {
     connect(this, &QDateEdit::dateChanged, this, &QDateEdit::userDateChanged);
@@ -1682,7 +1688,7 @@ QDateEdit::~QDateEdit()
 */
 
 /*!
-  \fn void QDateEdit::userDateChanged(const QDate &date)
+  \fn void QDateEdit::userDateChanged(QDate date)
 
   This signal only exists to fully implement the date Q_PROPERTY on the class.
   Normally dateChanged should be used instead.
@@ -1724,6 +1730,25 @@ QDateTimeEditPrivate::QDateTimeEditPrivate()
 #endif
 }
 
+QDateTime QDateTimeEditPrivate::convertTimeSpec(const QDateTime &datetime)
+{
+    Q_ASSERT(value.toDateTime().timeSpec() == spec);
+    switch (spec) {
+    case Qt::UTC:
+        return datetime.toUTC();
+    case Qt::LocalTime:
+        return datetime.toLocalTime();
+    case Qt::OffsetFromUTC:
+        return datetime.toOffsetFromUtc(value.toDateTime().offsetFromUtc());
+#if QT_CONFIG(timezone)
+    case Qt::TimeZone:
+        return datetime.toTimeZone(value.toDateTime().timeZone());
+#endif
+    }
+    Q_UNREACHABLE();
+}
+
+// FIXME: architecturaly incompatible with OffsetFromUTC or TimeZone as spec (QTBUG-80417).
 void QDateTimeEditPrivate::updateTimeSpec()
 {
     minimum = minimum.toDateTime().toTimeSpec(spec);
@@ -2366,33 +2391,6 @@ void QDateTimeEdit::paintEvent(QPaintEvent *event)
     style()->drawComplexControl(QStyle::CC_ComboBox, &optCombo, &p, this);
 }
 
-/*
-    Returns the string for AM and PM markers.
-
-    If a translation for "AM" and "PM" is installed, then use that.
-    Otherwise, use the default implementation, which uses the locale.
-*/
-QString QDateTimeEditPrivate::getAmPmText(AmPm ap, Case cs) const
-{
-    QString original;
-    QString translated;
-    if (ap == AmText) {
-        original = QLatin1String(cs == UpperCase ? "AM" : "am");
-        translated = (cs == UpperCase ? QDateTimeParser::tr("AM") : QDateTimeParser::tr("am"));
-    } else {
-        original = QLatin1String(cs == UpperCase ? "PM" : "pm");
-        translated = (cs == UpperCase ? QDateTimeParser::tr("PM") : QDateTimeParser::tr("pm"));
-    }
-
-    // This logic fails if a translation exists but doesn't change the string,
-    // which we can accept as a corner-case for which a locale-derived answer
-    // will be acceptable.
-    if (original != translated)
-        return translated;
-
-    return QDateTimeParser::getAmPmText(ap, cs);
-}
-
 int QDateTimeEditPrivate::absoluteIndex(QDateTimeEdit::Section s, int index) const
 {
     for (int i=0; i<sectionNodes.size(); ++i) {
diff --git a/src/widgets/widgets/qdatetimeedit.h b/src/widgets/widgets/qdatetimeedit.h
index 8905ad4a9c..aafdee1ea8 100644
--- a/src/widgets/widgets/qdatetimeedit.h
+++ b/src/widgets/widgets/qdatetimeedit.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2020 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtWidgets module of the Qt Toolkit.
@@ -95,8 +95,8 @@ public:
 
     explicit QDateTimeEdit(QWidget *parent = nullptr);
     explicit QDateTimeEdit(const QDateTime &dt, QWidget *parent = nullptr);
-    explicit QDateTimeEdit(const QDate &d, QWidget *parent = nullptr);
-    explicit QDateTimeEdit(const QTime &t, QWidget *parent = nullptr);
+    explicit QDateTimeEdit(QDate d, QWidget *parent = nullptr);
+    explicit QDateTimeEdit(QTime t, QWidget *parent = nullptr);
     ~QDateTimeEdit();
 
     QDateTime dateTime() const;
@@ -117,24 +117,24 @@ public:
     void setDateTimeRange(const QDateTime &min, const QDateTime &max);
 
     QDate minimumDate() const;
-    void setMinimumDate(const QDate &min);
+    void setMinimumDate(QDate min);
     void clearMinimumDate();
 
     QDate maximumDate() const;
-    void setMaximumDate(const QDate &max);
+    void setMaximumDate(QDate max);
     void clearMaximumDate();
 
-    void setDateRange(const QDate &min, const QDate &max);
+    void setDateRange(QDate min, QDate max);
 
     QTime minimumTime() const;
-    void setMinimumTime(const QTime &min);
+    void setMinimumTime(QTime min);
     void clearMinimumTime();
 
     QTime maximumTime() const;
-    void setMaximumTime(const QTime &max);
+    void setMaximumTime(QTime max);
     void clearMaximumTime();
 
-    void setTimeRange(const QTime &min, const QTime &max);
+    void setTimeRange(QTime min, QTime max);
 
     Sections displayedSections() const;
     Section currentSection() const;
@@ -170,13 +170,13 @@ public:
     bool event(QEvent *event) override;
 Q_SIGNALS:
     void dateTimeChanged(const QDateTime &dateTime);
-    void timeChanged(const QTime &time);
-    void dateChanged(const QDate &date);
+    void timeChanged(QTime time);
+    void dateChanged(QDate date);
 
 public Q_SLOTS:
     void setDateTime(const QDateTime &dateTime);
-    void setDate(const QDate &date);
-    void setTime(const QTime &time);
+    void setDate(QDate date);
+    void setTime(QTime time);
 
 protected:
     void keyPressEvent(QKeyEvent *event) override;
@@ -212,11 +212,11 @@ class Q_WIDGETS_EXPORT QTimeEdit : public QDateTimeEdit
     Q_PROPERTY(QTime time READ time WRITE setTime NOTIFY userTimeChanged USER true)
 public:
     explicit QTimeEdit(QWidget *parent = nullptr);
-    explicit QTimeEdit(const QTime &time, QWidget *parent = nullptr);
+    explicit QTimeEdit(QTime time, QWidget *parent = nullptr);
     ~QTimeEdit();
 
 Q_SIGNALS:
-    void userTimeChanged(const QTime &time);
+    void userTimeChanged(QTime time);
 };
 
 class Q_WIDGETS_EXPORT QDateEdit : public QDateTimeEdit
@@ -225,11 +225,11 @@ class Q_WIDGETS_EXPORT QDateEdit : public QDateTimeEdit
     Q_PROPERTY(QDate date READ date WRITE setDate NOTIFY userDateChanged USER true)
 public:
     explicit QDateEdit(QWidget *parent = nullptr);
-    explicit QDateEdit(const QDate &date, QWidget *parent = nullptr);
+    explicit QDateEdit(QDate date, QWidget *parent = nullptr);
     ~QDateEdit();
 
 Q_SIGNALS:
-    void userDateChanged(const QDate &date);
+    void userDateChanged(QDate date);
 };
 
 Q_DECLARE_OPERATORS_FOR_FLAGS(QDateTimeEdit::Sections)
diff --git a/src/widgets/widgets/qdatetimeedit_p.h b/src/widgets/widgets/qdatetimeedit_p.h
index dcf8863c8b..0a4433846f 100644
--- a/src/widgets/widgets/qdatetimeedit_p.h
+++ b/src/widgets/widgets/qdatetimeedit_p.h
@@ -97,7 +97,6 @@ public:
     QDateTime getMinimum() const override { return minimum.toDateTime(); }
     QDateTime getMaximum() const override { return maximum.toDateTime(); }
     QLocale locale() const override { return q_func()->locale(); }
-    QString getAmPmText(AmPm ap, Case cs) const override;
     int cursorPosition() const override { return edit ? edit->cursorPosition() : -1; }
 
     int absoluteIndex(QDateTimeEdit::Section s, int index) const;
@@ -110,6 +109,7 @@ public:
 
     void updateCache(const QVariant &val, const QString &str) const;
 
+    QDateTime convertTimeSpec(const QDateTime &datetime);
     void updateTimeSpec();
     QString valueToText(const QVariant &var) const { return textFromValue(var); }
 
diff --git a/src/widgets/widgets/qeffects.cpp b/src/widgets/widgets/qeffects.cpp
index 074352b736..1f2d3517e8 100644
--- a/src/widgets/widgets/qeffects.cpp
+++ b/src/widgets/widgets/qeffects.cpp
@@ -311,7 +311,7 @@ void QAlphaWidget::alphaBlend()
 
     const int sw = frontImage.width();
     const int sh = frontImage.height();
-    const int bpl = frontImage.bytesPerLine();
+    const qsizetype bpl = frontImage.bytesPerLine();
     switch(frontImage.depth()) {
     case 32:
         {
diff --git a/src/widgets/widgets/qfontcombobox.cpp b/src/widgets/widgets/qfontcombobox.cpp
index 4a99b0f962..cb665de889 100644
--- a/src/widgets/widgets/qfontcombobox.cpp
+++ b/src/widgets/widgets/qfontcombobox.cpp
@@ -427,7 +427,7 @@ QFontComboBox::QFontComboBox(QWidget *parent)
         lview->setUniformItemSizes(true);
     setWritingSystem(QFontDatabase::Any);
 
-    connect(this, SIGNAL(currentIndexChanged(QString)),
+    connect(this, SIGNAL(currentTextChanged(QString)),
             this, SLOT(_q_currentChanged(QString)));
 
     connect(qApp, SIGNAL(fontDatabaseChanged()),
diff --git a/src/widgets/widgets/qlabel.cpp b/src/widgets/widgets/qlabel.cpp
index 992e0cee97..a0b5bdd39f 100644
--- a/src/widgets/widgets/qlabel.cpp
+++ b/src/widgets/widgets/qlabel.cpp
@@ -47,7 +47,6 @@
 #include "qstyle.h"
 #include "qstyleoption.h"
 #include <limits.h>
-#include "qaction.h"
 #include "qclipboard.h"
 #include <qdebug.h>
 #include <qurl.h>
diff --git a/src/widgets/widgets/qlineedit.cpp b/src/widgets/widgets/qlineedit.cpp
index 06b40f9644..0ba3611cfd 100644
--- a/src/widgets/widgets/qlineedit.cpp
+++ b/src/widgets/widgets/qlineedit.cpp
@@ -40,7 +40,9 @@
 #include "qlineedit.h"
 #include "qlineedit_p.h"
 
-#include "qaction.h"
+#if QT_CONFIG(action)
+#  include "qaction.h"
+#endif
 #include "qapplication.h"
 #include "qclipboard.h"
 #if QT_CONFIG(draganddrop)
@@ -78,7 +80,7 @@
 #endif
 #include "private/qstylesheetstyle_p.h"
 
-#ifndef QT_NO_SHORTCUT
+#if QT_CONFIG(shortcut)
 #include "private/qapplication_p.h"
 #include "private/qshortcutmap_p.h"
 #include "qkeysequence.h"
diff --git a/src/widgets/widgets/qlineedit_p.cpp b/src/widgets/widgets/qlineedit_p.cpp
index feb34ef403..29e0ae3b39 100644
--- a/src/widgets/widgets/qlineedit_p.cpp
+++ b/src/widgets/widgets/qlineedit_p.cpp
@@ -47,7 +47,9 @@
 #if QT_CONFIG(draganddrop)
 #include "qdrag.h"
 #endif
-#include "qwidgetaction.h"
+#if QT_CONFIG(action)
+#  include "qwidgetaction.h"
+#endif
 #include "qclipboard.h"
 #ifndef QT_NO_ACCESSIBILITY
 #include "qaccessible.h"
@@ -370,7 +372,7 @@ void QLineEditIconButton::actionEvent(QActionEvent *e)
 {
     switch (e->type()) {
     case QEvent::ActionChanged: {
-        const QAction *action = e->action();
+        const auto *action = e->action();
         if (isVisibleTo(parentWidget()) != action->isVisible()) {
             setVisible(action->isVisible());
             if (QLineEditPrivate *lep = lineEditPrivate())
@@ -545,7 +547,8 @@ void QLineEditPrivate::positionSideWidgets()
     }
 }
 
-QLineEditPrivate::SideWidgetLocation QLineEditPrivate::findSideWidget(const QAction *a) const
+#if QT_CONFIG(action)
+QLineEditPrivate::SideWidgetLocation QLineEditPrivate::findSideWidget(const QGuiAction *a) const
 {
     int i = 0;
     for (const auto &e : leadingSideWidgets) {
@@ -574,12 +577,10 @@ QWidget *QLineEditPrivate::addAction(QAction *newAction, QAction *before, QLineE
     QWidget *w = nullptr;
     // Store flags about QWidgetAction here since removeAction() may be called from ~QAction,
     // in which a qobject_cast<> no longer works.
-#if QT_CONFIG(action)
     if (QWidgetAction *widgetAction = qobject_cast<QWidgetAction *>(newAction)) {
         if ((w = widgetAction->requestWidget(q)))
             flags |= SideWidgetCreatedByWidgetAction;
     }
-#endif
     if (!w) {
 #if QT_CONFIG(toolbutton)
         QLineEditIconButton *toolButton = new QLineEditIconButton(q);
@@ -634,9 +635,8 @@ QWidget *QLineEditPrivate::addAction(QAction *newAction, QAction *before, QLineE
     return w;
 }
 
-void QLineEditPrivate::removeAction(QAction *action)
+void QLineEditPrivate::removeAction(QGuiAction *action)
 {
-#if QT_CONFIG(action)
     Q_Q(QLineEdit);
     const auto location = findSideWidget(action);
     if (!location.isValid())
@@ -652,10 +652,8 @@ void QLineEditPrivate::removeAction(QAction *action)
      if (!hasSideWidgets()) // Last widget, remove connection
          QObject::disconnect(q, SIGNAL(textChanged(QString)), q, SLOT(_q_textChanged(QString)));
      q->update();
-#else
-    Q_UNUSED(action);
-#endif // QT_CONFIG(action)
 }
+#endif // QT_CONFIG(action)
 
 static int effectiveTextMargin(int defaultMargin, const QLineEditPrivate::SideWidgetEntryList &widgets,
                                const QLineEditPrivate::SideWidgetParameters &parameters)
diff --git a/src/widgets/widgets/qlineedit_p.h b/src/widgets/widgets/qlineedit_p.h
index 5ae402b992..9fe571b4bb 100644
--- a/src/widgets/widgets/qlineedit_p.h
+++ b/src/widgets/widgets/qlineedit_p.h
@@ -238,8 +238,10 @@ public:
 
     QString placeholderText;
 
+#if QT_CONFIG(action)
     QWidget *addAction(QAction *newAction, QAction *before, QLineEdit::ActionPosition, int flags = 0);
-    void removeAction(QAction *action);
+    void removeAction(QGuiAction *action);
+#endif
     SideWidgetParameters sideWidgetParameters() const;
     QIcon clearButtonIcon() const;
     void setClearButtonEnabled(bool enabled);
@@ -261,7 +263,9 @@ private:
     };
     friend class QTypeInfo<SideWidgetLocation>;
 
-    SideWidgetLocation findSideWidget(const QAction *a) const;
+#if QT_CONFIG(action)
+    SideWidgetLocation findSideWidget(const QGuiAction *a) const;
+#endif
 
     SideWidgetEntryList leadingSideWidgets;
     SideWidgetEntryList trailingSideWidgets;
diff --git a/src/widgets/widgets/qmainwindow.cpp b/src/widgets/widgets/qmainwindow.cpp
index 4f94b81b19..4bd3e23479 100644
--- a/src/widgets/widgets/qmainwindow.cpp
+++ b/src/widgets/widgets/qmainwindow.cpp
@@ -1349,7 +1349,7 @@ bool QMainWindow::event(QEvent *event)
 
     Note that the Qt 5 implementation has several limitations compared to Qt 4:
     \list
-        \li Use in windows with OpenGL content is not supported. This includes QGLWidget and QOpenGLWidget.
+        \li Use in windows with OpenGL content is not supported. This includes QOpenGLWidget.
         \li Using dockable or movable toolbars may result in painting errors and is not recommended
     \endlist
 
diff --git a/src/widgets/widgets/qmdisubwindow.cpp b/src/widgets/widgets/qmdisubwindow.cpp
index 84568c35db..f8460a4718 100644
--- a/src/widgets/widgets/qmdisubwindow.cpp
+++ b/src/widgets/widgets/qmdisubwindow.cpp
@@ -162,7 +162,9 @@
 #include <QDebug>
 #include <QMdiArea>
 #include <QScopedValueRollback>
-#include <QAction>
+#if QT_CONFIG(action)
+#  include <qaction.h>
+#endif
 #if QT_CONFIG(menu)
 #include <QMenu>
 #endif
@@ -895,7 +897,7 @@ QMdiSubWindowPrivate::QMdiSubWindowPrivate()
 */
 void QMdiSubWindowPrivate::_q_updateStaysOnTopHint()
 {
-#ifndef QT_NO_ACTION
+#if QT_CONFIG(action)
     Q_Q(QMdiSubWindow);
     if (QAction *senderAction = qobject_cast<QAction *>(q->sender())) {
         if (senderAction->isChecked()) {
@@ -906,7 +908,7 @@ void QMdiSubWindowPrivate::_q_updateStaysOnTopHint()
             q->lower();
         }
     }
-#endif // QT_NO_ACTION
+#endif // QT_CONFIG(action)
 }
 
 /*!
diff --git a/src/widgets/widgets/qmenu.cpp b/src/widgets/widgets/qmenu.cpp
index abe4e485c0..cae776159d 100644
--- a/src/widgets/widgets/qmenu.cpp
+++ b/src/widgets/widgets/qmenu.cpp
@@ -157,10 +157,11 @@ public:
         Q_D(QTornOffMenu);
         if(menu != d->causedMenu)
             return;
+        auto action = static_cast<QAction *>(act->action());
         if (act->type() == QEvent::ActionAdded) {
-            insertAction(act->before(), act->action());
+            insertAction(static_cast<QAction *>(act->before()), action);
         } else if (act->type() == QEvent::ActionRemoved)
-            removeAction(act->action());
+            removeAction(action);
     }
     void actionEvent(QActionEvent *e) override
     {
@@ -403,7 +404,9 @@ void QMenuPrivate::updateActionRects(const QRect &screen) const
     //calculate size
     QFontMetrics qfm = q->fontMetrics();
     bool previousWasSeparator = true; // this is true to allow removing the leading separators
+#if QT_CONFIG(shortcut)
     const bool contextMenu = isContextMenu();
+#endif
     for(int i = 0; i <= lastVisibleAction; i++) {
         QAction *action = actions.at(i);
         const bool isSection = action->isSeparator() && (!action->text().isEmpty() || !action->icon().isNull());
@@ -434,12 +437,12 @@ void QMenuPrivate::updateActionRects(const QRect &screen) const
                 if (t != -1) {
                     tabWidth = qMax(int(tabWidth), qfm.horizontalAdvance(s.mid(t+1)));
                     s = s.left(t);
-    #ifndef QT_NO_SHORTCUT
+#if QT_CONFIG(shortcut)
                 } else if (action->isShortcutVisibleInContextMenu() || !contextMenu) {
                     QKeySequence seq = action->shortcut();
                     if (!seq.isEmpty())
                         tabWidth = qMax(int(tabWidth), qfm.horizontalAdvance(seq.toString(QKeySequence::NativeText)));
-    #endif
+#endif
                 }
                 sz.setWidth(fm.boundingRect(QRect(), Qt::TextSingleLine | Qt::TextShowMnemonic, s).width());
                 sz.setHeight(qMax(fm.height(), qfm.height()));
@@ -1769,12 +1772,14 @@ QAction *QMenu::addAction(const QIcon &icon, const QString &text)
 
     \sa QWidget::addAction()
 */
-QAction *QMenu::addAction(const QString &text, const QObject *receiver, const char* member, const QKeySequence &shortcut)
+QAction *QMenu::addAction(const QString &text, const QObject *receiver, const char* member
+#if QT_CONFIG(shortcut)
+                          , const QKeySequence &shortcut
+#endif
+                          )
 {
     QAction *action = new QAction(text, this);
-#ifdef QT_NO_SHORTCUT
-    Q_UNUSED(shortcut);
-#else
+#if QT_CONFIG(shortcut)
     action->setShortcut(shortcut);
 #endif
     QObject::connect(action, SIGNAL(triggered(bool)), receiver, member);
@@ -1862,12 +1867,14 @@ QAction *QMenu::addAction(const QString &text, const QObject *receiver, const ch
     \sa QWidget::addAction()
 */
 QAction *QMenu::addAction(const QIcon &icon, const QString &text, const QObject *receiver,
-                          const char* member, const QKeySequence &shortcut)
+                          const char* member
+#if QT_CONFIG(shortcut)
+                          , const QKeySequence &shortcut
+#endif
+                          )
 {
     QAction *action = new QAction(icon, text, this);
-#ifdef QT_NO_SHORTCUT
-    Q_UNUSED(shortcut);
-#else
+#if QT_CONFIG(shortcut)
     action->setShortcut(shortcut);
 #endif
     QObject::connect(action, SIGNAL(triggered(bool)), receiver, member);
@@ -3559,15 +3566,16 @@ void QMenu::actionEvent(QActionEvent *e)
                 wa->releaseWidget(widget);
             }
         }
-        d->widgetItems.remove(e->action());
+        d->widgetItems.remove(static_cast<QAction *>(e->action()));
     }
 
     if (!d->platformMenu.isNull()) {
+        auto action = static_cast<QAction *>(e->action());
         if (e->type() == QEvent::ActionAdded) {
             QPlatformMenuItem *beforeItem = e->before()
                 ? d->platformMenu->menuItemForTag(reinterpret_cast<quintptr>(e->before()))
                 : nullptr;
-            d->insertActionInPlatformMenu(e->action(), beforeItem);
+            d->insertActionInPlatformMenu(action, beforeItem);
         } else if (e->type() == QEvent::ActionRemoved) {
             QPlatformMenuItem *menuItem = d->platformMenu->menuItemForTag(reinterpret_cast<quintptr>(e->action()));
             d->platformMenu->removeMenuItem(menuItem);
@@ -3575,7 +3583,7 @@ void QMenu::actionEvent(QActionEvent *e)
         } else if (e->type() == QEvent::ActionChanged) {
             QPlatformMenuItem *menuItem = d->platformMenu->menuItemForTag(reinterpret_cast<quintptr>(e->action()));
             if (menuItem) {
-                d->copyActionToPlatformItem(e->action(), menuItem);
+                d->copyActionToPlatformItem(action, menuItem);
                 d->platformMenu->syncMenuItem(menuItem);
             }
         }
diff --git a/src/widgets/widgets/qmenu.h b/src/widgets/widgets/qmenu.h
index 84ab9e027a..35d5a865ff 100644
--- a/src/widgets/widgets/qmenu.h
+++ b/src/widgets/widgets/qmenu.h
@@ -78,8 +78,17 @@ public:
     using QWidget::addAction;
     QAction *addAction(const QString &text);
     QAction *addAction(const QIcon &icon, const QString &text);
-    QAction *addAction(const QString &text, const QObject *receiver, const char* member, const QKeySequence &shortcut = 0);
-    QAction *addAction(const QIcon &icon, const QString &text, const QObject *receiver, const char* member, const QKeySequence &shortcut = 0);
+
+    QAction *addAction(const QString &text, const QObject *receiver, const char* member
+#if QT_CONFIG(shortcut)
+                       , const QKeySequence &shortcut = {}
+#endif
+                       );
+    QAction *addAction(const QIcon &icon, const QString &text, const QObject *receiver, const char* member
+#if QT_CONFIG(shortcut)
+                       , const QKeySequence &shortcut = {}
+#endif
+                       );
 
 #ifdef Q_CLANG_QDOC
     template<typename Functor>
@@ -95,12 +104,14 @@ public:
     template<class Obj, typename Func1>
     inline typename std::enable_if<!std::is_same<const char*, Func1>::value
         && QtPrivate::IsPointerToTypeDerivedFromQObject<Obj*>::Value, QAction *>::type
-        addAction(const QString &text, const Obj *object, Func1 slot, const QKeySequence &shortcut = 0)
+        addAction(const QString &text, const Obj *object, Func1 slot
+#if QT_CONFIG(shortcut)
+                  , const QKeySequence &shortcut = {}
+#endif
+                  )
     {
         QAction *result = addAction(text);
-#ifdef QT_NO_SHORTCUT
-        Q_UNUSED(shortcut)
-#else
+#if QT_CONFIG(shortcut)
         result->setShortcut(shortcut);
 #endif
         connect(result, &QAction::triggered, object, std::move(slot));
@@ -108,12 +119,14 @@ public:
     }
     // addAction(QString): Connect to a functor or function pointer (without context)
     template <typename Func1>
-    inline QAction *addAction(const QString &text, Func1 slot, const QKeySequence &shortcut = 0)
+    inline QAction *addAction(const QString &text, Func1 slot
+#if QT_CONFIG(shortcut)
+                              , const QKeySequence &shortcut = {}
+#endif
+                              )
     {
         QAction *result = addAction(text);
-#ifdef QT_NO_SHORTCUT
-        Q_UNUSED(shortcut)
-#else
+#if QT_CONFIG(shortcut)
         result->setShortcut(shortcut);
 #endif
         connect(result, &QAction::triggered, std::move(slot));
@@ -123,12 +136,15 @@ public:
     template<class Obj, typename Func1>
     inline typename std::enable_if<!std::is_same<const char*, Func1>::value
         && QtPrivate::IsPointerToTypeDerivedFromQObject<Obj*>::Value, QAction *>::type
-        addAction(const QIcon &actionIcon, const QString &text, const Obj *object, Func1 slot, const QKeySequence &shortcut = 0)
+        addAction(const QIcon &actionIcon, const QString &text, const Obj *object, Func1 slot
+#if QT_CONFIG(shortcut)
+                  , const QKeySequence &shortcut = {}
+#endif
+                  )
+
     {
         QAction *result = addAction(actionIcon, text);
-#ifdef QT_NO_SHORTCUT
-        Q_UNUSED(shortcut)
-#else
+#if QT_CONFIG(shortcut)
         result->setShortcut(shortcut);
 #endif
         connect(result, &QAction::triggered, object, std::move(slot));
@@ -136,12 +152,14 @@ public:
     }
     // addAction(QIcon, QString): Connect to a functor or function pointer (without context)
     template <typename Func1>
-    inline QAction *addAction(const QIcon &actionIcon, const QString &text, Func1 slot, const QKeySequence &shortcut = 0)
+    inline QAction *addAction(const QIcon &actionIcon, const QString &text, Func1 slot
+#if QT_CONFIG(shortcut)
+                              , const QKeySequence &shortcut = {}
+#endif
+                              )
     {
         QAction *result = addAction(actionIcon, text);
-#ifdef QT_NO_SHORTCUT
-        Q_UNUSED(shortcut)
-#else
+#if QT_CONFIG(shortcut)
         result->setShortcut(shortcut);
 #endif
         connect(result, &QAction::triggered, std::move(slot));
diff --git a/src/widgets/widgets/qmenubar.cpp b/src/widgets/widgets/qmenubar.cpp
index 8724fa1a19..c8124468df 100644
--- a/src/widgets/widgets/qmenubar.cpp
+++ b/src/widgets/widgets/qmenubar.cpp
@@ -1289,21 +1289,22 @@ void QMenuBar::actionEvent(QActionEvent *e)
         if (!nativeMenuBar)
             return;
 
+        auto action = static_cast<QAction *>(e->action());
         if (e->type() == QEvent::ActionAdded) {
-            QPlatformMenu *menu = d->getPlatformMenu(e->action());
+            QPlatformMenu *menu = d->getPlatformMenu(action);
             if (menu) {
-                d->copyActionToPlatformMenu(e->action(), menu);
+                d->copyActionToPlatformMenu(action, menu);
 
-                QPlatformMenu *beforeMenu = d->findInsertionPlatformMenu(e->action());
+                QPlatformMenu *beforeMenu = d->findInsertionPlatformMenu(action);
                 d->platformMenuBar->insertMenu(menu, beforeMenu);
             }
         } else if (e->type() == QEvent::ActionRemoved) {
-            QPlatformMenu *menu = d->getPlatformMenu(e->action());
+            QPlatformMenu *menu = d->getPlatformMenu(action);
             if (menu)
                 d->platformMenuBar->removeMenu(menu);
         } else if (e->type() == QEvent::ActionChanged) {
             QPlatformMenu *cur = d->platformMenuBar->menuForTag(reinterpret_cast<quintptr>(e->action()));
-            QPlatformMenu *menu = d->getPlatformMenu(e->action());
+            QPlatformMenu *menu = d->getPlatformMenu(action);
 
             // the menu associated with the action can change, need to
             // remove and/or insert the new platform menu
@@ -1311,13 +1312,13 @@ void QMenuBar::actionEvent(QActionEvent *e)
                 if (cur)
                     d->platformMenuBar->removeMenu(cur);
                 if (menu) {
-                    d->copyActionToPlatformMenu(e->action(), menu);
+                    d->copyActionToPlatformMenu(action, menu);
 
-                    QPlatformMenu *beforeMenu = d->findInsertionPlatformMenu(e->action());
+                    QPlatformMenu *beforeMenu = d->findInsertionPlatformMenu(action);
                     d->platformMenuBar->insertMenu(menu, beforeMenu);
                 }
             } else if (menu) {
-                d->copyActionToPlatformMenu(e->action(), menu);
+                d->copyActionToPlatformMenu(action, menu);
                 d->platformMenuBar->syncMenu(menu);
             }
         }
diff --git a/src/widgets/widgets/qspinbox.cpp b/src/widgets/widgets/qspinbox.cpp
index cbd600ec6c..6ac2e1cec2 100644
--- a/src/widgets/widgets/qspinbox.cpp
+++ b/src/widgets/widgets/qspinbox.cpp
@@ -191,17 +191,6 @@ public:
     The new text is passed in \a text with prefix() and suffix().
 */
 
-#if QT_DEPRECATED_SINCE(5, 14)
-/*!
-    \fn void QSpinBox::valueChanged(const QString &text)
-
-    \overload
-    \obsolete Use textChanged(QString) instead
-
-    The new value is passed in \a text with prefix() and suffix().
-*/
-#endif
-
 /*!
     Constructs a spin box with 0 as minimum value and 99 as maximum value, a
     step value of 1. The value is initially set to 0. It is parented to \a
@@ -663,17 +652,6 @@ void QSpinBox::fixup(QString &input) const
     The new text is passed in \a text with prefix() and suffix().
 */
 
-#if QT_DEPRECATED_SINCE(5, 14)
-/*!
-    \fn void QDoubleSpinBox::valueChanged(const QString &text);
-
-    \overload
-    \obsolete Use textChanged(QString) instead
-
-    The new value is passed in \a text with prefix() and suffix().
-*/
-#endif
-
 /*!
     Constructs a spin box with 0.0 as minimum value and 99.99 as maximum value,
     a step value of 1.0 and a precision of 2 decimal places. The value is
@@ -1095,12 +1073,6 @@ void QSpinBoxPrivate::emitSignals(EmitPolicy ep, const QVariant &old)
     if (ep != NeverEmit) {
         pendingEmit = false;
         if (ep == AlwaysEmit || value != old) {
-#if QT_DEPRECATED_SINCE(5, 14)
-QT_WARNING_PUSH
-QT_WARNING_DISABLE_DEPRECATED
-            emit q->valueChanged(edit->displayText());
-QT_WARNING_POP
-#endif
             emit q->textChanged(edit->displayText());
             emit q->valueChanged(value.toInt());
         }
@@ -1252,12 +1224,6 @@ void QDoubleSpinBoxPrivate::emitSignals(EmitPolicy ep, const QVariant &old)
     if (ep != NeverEmit) {
         pendingEmit = false;
         if (ep == AlwaysEmit || value != old) {
-#if QT_DEPRECATED_SINCE(5, 14)
-QT_WARNING_PUSH
-QT_WARNING_DISABLE_DEPRECATED
-            emit q->valueChanged(edit->displayText());
-QT_WARNING_POP
-#endif
             emit q->textChanged(edit->displayText());
             emit q->valueChanged(value.toDouble());
         }
diff --git a/src/widgets/widgets/qspinbox.h b/src/widgets/widgets/qspinbox.h
index 762dd4a46a..be5357b028 100644
--- a/src/widgets/widgets/qspinbox.h
+++ b/src/widgets/widgets/qspinbox.h
@@ -107,10 +107,6 @@ public Q_SLOTS:
 Q_SIGNALS:
     void valueChanged(int);
     void textChanged(const QString &);
-#if QT_DEPRECATED_SINCE(5, 14)
-    QT_DEPRECATED_X("Use textChanged(QString) instead")
-    void valueChanged(const QString &);
-#endif
 
 private:
     Q_DISABLE_COPY(QSpinBox)
@@ -173,10 +169,6 @@ public Q_SLOTS:
 Q_SIGNALS:
     void valueChanged(double);
     void textChanged(const QString &);
-#if QT_DEPRECATED_SINCE(5, 14)
-    QT_DEPRECATED_X("Use textChanged(QString) instead")
-    void valueChanged(const QString &);
-#endif
 
 private:
     Q_DISABLE_COPY(QDoubleSpinBox)
diff --git a/src/widgets/widgets/qsplitter.h b/src/widgets/widgets/qsplitter.h
index ec980d9ee3..658914ae39 100644
--- a/src/widgets/widgets/qsplitter.h
+++ b/src/widgets/widgets/qsplitter.h
@@ -50,7 +50,6 @@ QT_BEGIN_NAMESPACE
 
 class QSplitterPrivate;
 class QTextStream;
-template <typename T> class QList;
 
 class QSplitterHandle;
 
diff --git a/src/widgets/widgets/qtextbrowser.cpp b/src/widgets/widgets/qtextbrowser.cpp
index 78fde94fad..dac7a9a608 100644
--- a/src/widgets/widgets/qtextbrowser.cpp
+++ b/src/widgets/widgets/qtextbrowser.cpp
@@ -156,11 +156,6 @@ public:
     {
         Q_Q(QTextBrowser);
         emit q->highlighted(url);
-#if QT_DEPRECATED_SINCE(5, 15)
-QT_WARNING_PUSH
-QT_WARNING_DISABLE_DEPRECATED
-        emit q->highlighted(url.toString());
-#endif
     }
 };
 Q_DECLARE_TYPEINFO(QTextBrowserPrivate::HistoryEntry, Q_MOVABLE_TYPE);
@@ -927,16 +922,6 @@ void QTextBrowser::doSetSource(const QUrl &url, QTextDocument::ResourceType type
     anchor is passed in \a link.
 */
 
-/*!  \fn void QTextBrowser::highlighted(const QString &link)
-     \overload
-     \obsolete
-
-     Convenience signal that allows connecting to a slot
-     that takes just a QString, like for example QStatusBar's
-     message().
-*/
-
-
 /*!
     \fn void QTextBrowser::anchorClicked(const QUrl &link)
 
diff --git a/src/widgets/widgets/qtextbrowser.h b/src/widgets/widgets/qtextbrowser.h
index 4b3ec491ee..7f02999b02 100644
--- a/src/widgets/widgets/qtextbrowser.h
+++ b/src/widgets/widgets/qtextbrowser.h
@@ -107,10 +107,6 @@ Q_SIGNALS:
     void historyChanged();
     void sourceChanged(const QUrl &);
     void highlighted(const QUrl &);
-#if QT_DEPRECATED_SINCE(5, 15)
-    QT_DEPRECATED_VERSION_X_5_15("Use QTextBrowser::highlighted(QUrl) instead")
-    void highlighted(const QString &);
-#endif
     void anchorClicked(const QUrl &);
 
 protected:
diff --git a/src/widgets/widgets/qtoolbar.cpp b/src/widgets/widgets/qtoolbar.cpp
index b4e90c7d71..f35c02f2fb 100644
--- a/src/widgets/widgets/qtoolbar.cpp
+++ b/src/widgets/widgets/qtoolbar.cpp
@@ -961,7 +961,7 @@ QAction *QToolBar::actionAt(const QPoint &p) const
 void QToolBar::actionEvent(QActionEvent *event)
 {
     Q_D(QToolBar);
-    QAction *action = event->action();
+    auto action = static_cast<QAction *>(event->action());
     QWidgetAction *widgetAction = qobject_cast<QWidgetAction *>(action);
 
     switch (event->type()) {
diff --git a/src/widgets/widgets/qtoolbarlayout.cpp b/src/widgets/widgets/qtoolbarlayout.cpp
index d77ba3c13e..93aded6876 100644
--- a/src/widgets/widgets/qtoolbarlayout.cpp
+++ b/src/widgets/widgets/qtoolbarlayout.cpp
@@ -207,7 +207,7 @@ void QToolBarLayout::insertAction(int index, QAction *action)
     }
 }
 
-int QToolBarLayout::indexOf(QAction *action) const
+int QToolBarLayout::indexOf(const QGuiAction *action) const
 {
     for (int i = 0; i < items.count(); ++i) {
         if (items.at(i)->action == action)
diff --git a/src/widgets/widgets/qtoolbarlayout_p.h b/src/widgets/widgets/qtoolbarlayout_p.h
index b5dc121b93..1a406a3d29 100644
--- a/src/widgets/widgets/qtoolbarlayout_p.h
+++ b/src/widgets/widgets/qtoolbarlayout_p.h
@@ -96,7 +96,7 @@ public:
     QSize sizeHint() const override;
 
     void insertAction(int index, QAction *action);
-    int indexOf(QAction *action) const;
+    int indexOf(const QGuiAction *action) const;
     using QLayout::indexOf; // bring back the hidden members
 
     bool layoutActions(const QSize &size);
diff --git a/src/widgets/widgets/qtoolbutton.cpp b/src/widgets/widgets/qtoolbutton.cpp
index 314c6ab40c..cfa4782d78 100644
--- a/src/widgets/widgets/qtoolbutton.cpp
+++ b/src/widgets/widgets/qtoolbutton.cpp
@@ -466,7 +466,7 @@ void QToolButton::paintEvent(QPaintEvent *)
 void QToolButton::actionEvent(QActionEvent *event)
 {
     Q_D(QToolButton);
-    QAction *action = event->action();
+    auto action = static_cast<QAction *>(event->action());
     switch (event->type()) {
     case QEvent::ActionChanged:
         if (action == d->defaultAction)
diff --git a/src/widgets/widgets/qwidgettextcontrol.cpp b/src/widgets/widgets/qwidgettextcontrol.cpp
index 45ab384036..b68a216af5 100644
--- a/src/widgets/widgets/qwidgettextcontrol.cpp
+++ b/src/widgets/widgets/qwidgettextcontrol.cpp
@@ -92,7 +92,7 @@
 #include <QtGui/qaccessible.h>
 #include <QtCore/qmetaobject.h>
 
-#ifndef QT_NO_SHORTCUT
+#if QT_CONFIG(shortcut)
 #include "private/qapplication_p.h"
 #include "private/qshortcutmap_p.h"
 #include <qkeysequence.h>
@@ -2512,7 +2512,7 @@ void QWidgetTextControl::setExtraSelections(const QList<QTextEdit::ExtraSelectio
         emit updateRequest(r);
     }
 
-    for (QHash<int, int>::iterator it = hash.begin(); it != hash.end(); ++it) {
+    for (auto it = hash.cbegin(); it != hash.cend(); ++it) {
         const QAbstractTextDocumentLayout::Selection &esel = d->extraSelections.at(it.value());
         QRectF r = selectionRect(esel.cursor);
         if (esel.format.boolProperty(QTextFormat::FullWidthSelection)) {
diff --git a/src/winmain/.prev_CMakeLists.txt b/src/winmain/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..a6077dd467
--- /dev/null
+++ b/src/winmain/.prev_CMakeLists.txt
@@ -0,0 +1,48 @@
+# Generated from winmain.pro.
+
+#####################################################################
+## qtLibraryTarget$$TARGET$$QT_LIBINFIX Module:
+#####################################################################
+
+add_qt_module(qtLibraryTarget$$TARGET$$QT_LIBINFIX
+    STATIC
+    DEFINES
+        QT_NO_FOREACH
+    PUBLIC_LIBRARIES
+        Qt::Core
+)
+
+#### Keys ignored in scope 1:.:.:winmain.pro:<TRUE>:
+# CONFIG = "static"
+# DESTDIR = "$$QT.core.libs"
+# TEMPLATE = "lib"
+# _LOADED = "qt_installs" "qt_targets" "qt_build_paths" "qt_common"
+
+## Scopes:
+#####################################################################
+
+#### Keys ignored in scope 3:.:.:winmain.pro:QT_FEATURE_debug_and_release:
+# CONFIG = "build_all"
+
+#### Keys ignored in scope 4:.:.:winmain.pro:MSVC:
+# QMAKE_CFLAGS_DEBUG = "--Zi" "-Z7"
+
+extend_target(qtLibraryTarget$$TARGET$$QT_LIBINFIX CONDITION mingw
+    DEFINES
+        QT_NEEDS_QMAIN
+)
+
+extend_target(qtLibraryTarget$$TARGET$$QT_LIBINFIX CONDITION WINRT
+    SOURCES
+        qtmain_winrt.cpp
+)
+
+extend_target(qtLibraryTarget$$TARGET$$QT_LIBINFIX CONDITION NOT WINRT
+    SOURCES
+        qtmain_win.cpp
+    LIBRARIES
+        shell32
+)
+
+#### Keys ignored in scope 10:.:.:winmain.pro:else:
+# CONFIG = "-qt"
diff --git a/src/winmain/CMakeLists.txt b/src/winmain/CMakeLists.txt
new file mode 100644
index 0000000000..fb48fec5a3
--- /dev/null
+++ b/src/winmain/CMakeLists.txt
@@ -0,0 +1,28 @@
+# special case begin
+# special case skip regeneration
+if (NOT WIN32)
+    return()
+endif()
+
+qt_add_module(WinMain
+  STATIC
+  NO_SYNC_QT
+  NO_MODULE_HEADERS
+  DEFINES
+      QT_NO_FOREACH
+  INCLUDE_DIRECTORIES
+      $<TARGET_PROPERTY:Qt::Core,INTERFACE_INCLUDE_DIRECTORIES>
+)
+
+qt_extend_target(WinMain CONDITION WINRT
+    SOURCES qtmain_winrt.cpp
+)
+
+qt_extend_target(WinMain CONDITION NOT WINRT
+    SOURCES qtmain_win.cpp
+)
+
+qt_extend_target(WinMain CONDITION MINGW
+    DEFINES QT_NEEDS_QMAIN
+)
+# special case end
diff --git a/src/xml/CMakeLists.txt b/src/xml/CMakeLists.txt
new file mode 100644
index 0000000000..8b79b9df45
--- /dev/null
+++ b/src/xml/CMakeLists.txt
@@ -0,0 +1,34 @@
+# Generated from xml.pro.
+
+#####################################################################
+## Xml Module:
+#####################################################################
+
+qt_add_module(Xml
+    SOURCES
+        dom/qdom.cpp dom/qdom.h dom/qdom_p.h
+        dom/qdomhelpers.cpp dom/qdomhelpers_p.h
+        qtxmlglobal.h
+        sax/qxml.cpp sax/qxml.h sax/qxml_p.h
+    DEFINES
+        QT_NO_FOREACH
+        QT_NO_USING_NAMESPACE
+    LIBRARIES
+        Qt::CorePrivate
+    PUBLIC_LIBRARIES
+        Qt::Core
+    PRIVATE_MODULE_INTERFACE
+        Qt::CorePrivate
+)
+
+## Scopes:
+#####################################################################
+
+qt_extend_target(Xml CONDITION MSVC AND (TEST_architecture_arch STREQUAL "i386")
+    LINK_OPTIONS
+        "/BASE:0x61000000"
+)
+qt_add_docs(Xml
+    doc/qtxml.qdocconf
+)
+
diff --git a/src/xml/configure.cmake b/src/xml/configure.cmake
new file mode 100644
index 0000000000..25a7de5aa2
--- /dev/null
+++ b/src/xml/configure.cmake
@@ -0,0 +1,22 @@
+
+
+#### Inputs
+
+
+
+#### Libraries
+
+
+
+#### Tests
+
+
+
+#### Features
+
+qt_feature("dom" PUBLIC
+    SECTION "File I/O"
+    LABEL "DOM"
+    PURPOSE "Supports the Document Object Model."
+)
+qt_feature_definition("dom" "QT_NO_DOM" NEGATE VALUE "1")
diff --git a/src/xml/dom/qdom.cpp b/src/xml/dom/qdom.cpp
index f63bf47e3e..39cf0c2653 100644
--- a/src/xml/dom/qdom.cpp
+++ b/src/xml/dom/qdom.cpp
@@ -2551,7 +2551,7 @@ QDomNamedNodeMapPrivate* QDomNamedNodeMapPrivate::clone(QDomNodePrivate* p)
     m->readonly = readonly;
     m->appendToParent = appendToParent;
 
-    QHash<QString, QDomNodePrivate*>::const_iterator it = map.constBegin();
+    auto it = map.constBegin();
     for (; it != map.constEnd(); ++it) {
         QDomNodePrivate *new_node = (*it)->cloneNode();
         new_node->setParent(p);
@@ -2567,7 +2567,7 @@ void QDomNamedNodeMapPrivate::clearMap()
 {
     // Dereference all of our children if we took references
     if (!appendToParent) {
-        QHash<QString, QDomNodePrivate *>::const_iterator it = map.constBegin();
+        auto it = map.constBegin();
         for (; it != map.constEnd(); ++it)
             if (!(*it)->ref.deref())
                 delete *it;
@@ -2583,7 +2583,7 @@ QDomNodePrivate* QDomNamedNodeMapPrivate::namedItem(const QString& name) const
 
 QDomNodePrivate* QDomNamedNodeMapPrivate::namedItemNS(const QString& nsURI, const QString& localName) const
 {
-    QHash<QString, QDomNodePrivate *>::const_iterator it = map.constBegin();
+    auto it = map.constBegin();
     QDomNodePrivate *n;
     for (; it != map.constEnd(); ++it) {
         n = *it;
@@ -3099,11 +3099,11 @@ void QDomDocumentTypePrivate::save(QTextStream& s, int, int indent) const
     if (entities->length()>0 || notations->length()>0) {
         s << " [" << Qt::endl;
 
-        QHash<QString, QDomNodePrivate *>::const_iterator it2 = notations->map.constBegin();
+        auto it2 = notations->map.constBegin();
         for (; it2 != notations->map.constEnd(); ++it2)
             (*it2)->save(s, 0, indent);
 
-        QHash<QString, QDomNodePrivate *>::const_iterator it = entities->map.constBegin();
+        auto it = entities->map.constBegin();
         for (; it != entities->map.constEnd(); ++it)
             (*it)->save(s, 0, indent);
 
@@ -4089,7 +4089,7 @@ void QDomElementPrivate::save(QTextStream& s, int depth, int indent) const
     /* Write out attributes. */
     if (!m_attr->map.isEmpty()) {
         QDuplicateTracker<QString> outputtedPrefixes;
-        QHash<QString, QDomNodePrivate *>::const_iterator it = m_attr->map.constBegin();
+        auto it = m_attr->map.constBegin();
         for (; it != m_attr->map.constEnd(); ++it) {
             s << ' ';
             if (it.value()->namespaceURI.isNull()) {
@@ -4477,7 +4477,7 @@ bool QDomElement::hasAttribute(const QString& name) const
 
     \sa setAttributeNS(), attributeNodeNS(), setAttributeNodeNS(), attribute()
 */
-QString QDomElement::attributeNS(const QString nsURI, const QString& localName, const QString& defValue) const
+QString QDomElement::attributeNS(const QString& nsURI, const QString& localName, const QString& defValue) const
 {
     if (!impl)
         return defValue;
@@ -4496,7 +4496,7 @@ QString QDomElement::attributeNS(const QString nsURI, const QString& localName,
 
     \sa attributeNS(), setAttributeNodeNS(), setAttribute()
 */
-void QDomElement::setAttributeNS(const QString nsURI, const QString& qName, const QString& value)
+void QDomElement::setAttributeNS(const QString& nsURI, const QString& qName, const QString& value)
 {
     if (!impl)
         return;
@@ -4504,13 +4504,13 @@ void QDomElement::setAttributeNS(const QString nsURI, const QString& qName, cons
 }
 
 /*!
-  \fn void QDomElement::setAttributeNS(const QString nsURI, const QString& qName, int value)
+  \fn void QDomElement::setAttributeNS(const QString& nsURI, const QString& qName, int value)
 
     \overload
 */
 
 /*!
-  \fn void QDomElement::setAttributeNS(const QString nsURI, const QString& qName, uint value)
+  \fn void QDomElement::setAttributeNS(const QString& nsURI, const QString& qName, uint value)
 
     \overload
 */
@@ -4518,7 +4518,7 @@ void QDomElement::setAttributeNS(const QString nsURI, const QString& qName, cons
 /*!
     \overload
 */
-void QDomElement::setAttributeNS(const QString nsURI, const QString& qName, qlonglong value)
+void QDomElement::setAttributeNS(const QString& nsURI, const QString& qName, qlonglong value)
 {
     if (!impl)
         return;
@@ -4530,7 +4530,7 @@ void QDomElement::setAttributeNS(const QString nsURI, const QString& qName, qlon
 /*!
     \overload
 */
-void QDomElement::setAttributeNS(const QString nsURI, const QString& qName, qulonglong value)
+void QDomElement::setAttributeNS(const QString& nsURI, const QString& qName, qulonglong value)
 {
     if (!impl)
         return;
@@ -4542,7 +4542,7 @@ void QDomElement::setAttributeNS(const QString nsURI, const QString& qName, qulo
 /*!
     \overload
 */
-void QDomElement::setAttributeNS(const QString nsURI, const QString& qName, double value)
+void QDomElement::setAttributeNS(const QString& nsURI, const QString& qName, double value)
 {
     if (!impl)
         return;
diff --git a/src/xml/dom/qdom.h b/src/xml/dom/qdom.h
index d50c5e8394..9f34290121 100644
--- a/src/xml/dom/qdom.h
+++ b/src/xml/dom/qdom.h
@@ -508,15 +508,15 @@ public:
     QDomNodeList elementsByTagName(const QString& tagname) const;
     bool hasAttribute(const QString& name) const;
 
-    QString attributeNS(const QString nsURI, const QString& localName, const QString& defValue = QString()) const;
-    void setAttributeNS(const QString nsURI, const QString& qName, const QString& value);
-    inline void setAttributeNS(const QString nsURI, const QString& qName, int value)
+    QString attributeNS(const QString& nsURI, const QString& localName, const QString& defValue = QString()) const;
+    void setAttributeNS(const QString& nsURI, const QString& qName, const QString& value);
+    inline void setAttributeNS(const QString& nsURI, const QString& qName, int value)
         { setAttributeNS(nsURI, qName, qlonglong(value)); }
-    inline void setAttributeNS(const QString nsURI, const QString& qName, uint value)
+    inline void setAttributeNS(const QString& nsURI, const QString& qName, uint value)
         { setAttributeNS(nsURI, qName, qulonglong(value)); }
-    void setAttributeNS(const QString nsURI, const QString& qName, qlonglong value);
-    void setAttributeNS(const QString nsURI, const QString& qName, qulonglong value);
-    void setAttributeNS(const QString nsURI, const QString& qName, double value);
+    void setAttributeNS(const QString& nsURI, const QString& qName, qlonglong value);
+    void setAttributeNS(const QString& nsURI, const QString& qName, qulonglong value);
+    void setAttributeNS(const QString& nsURI, const QString& qName, double value);
     void removeAttributeNS(const QString& nsURI, const QString& localName);
     QDomAttr attributeNodeNS(const QString& nsURI, const QString& localName);
     QDomAttr setAttributeNodeNS(const QDomAttr& newAttr);
diff --git a/sync.profile b/sync.profile
index 0292bf0dc2..1a567c3059 100644
--- a/sync.profile
+++ b/sync.profile
@@ -3,6 +3,7 @@
     "QtWidgets" => "$basedir/src/widgets",
     "QtPrintSupport" => "$basedir/src/printsupport",
     "QtOpenGL" => "$basedir/src/opengl",
+    "QtOpenGLWidgets" => "$basedir/src/openglwidgets",
     "QtCore" => "$basedir/src/corelib",
     "QtXml" => "$basedir/src/xml",
     "QtSql" => "$basedir/src/sql",
@@ -29,6 +30,7 @@
     "QtKmsSupport" => "$basedir/src/platformsupport/kmsconvenience",
     "QtEdidSupport" => "$basedir/src/platformsupport/edid",
     "QtVulkanSupport" => "$basedir/src/platformsupport/vkconvenience",
+    "QtLinuxOfonoSupport" => "$basedir/src/platformsupport/linuxofono",
     "QtPlatformHeaders" => "$basedir/src/platformheaders",
     "QtANGLE/KHR" => "!$basedir/src/3rdparty/angle/include/KHR",
     "QtANGLE/GLES2" => "!$basedir/src/3rdparty/angle/include/GLES2",
@@ -52,6 +54,7 @@
     "qconfig.h" => "QtConfig",
     "qplugin.h" => "QtPlugin",
     "qalgorithms.h" => "QtAlgorithms",
+    "qlist.h" => "QList",
     "qcontainerfwd.h" => "QtContainerFwd",
     "qdebug.h" => "QtDebug",
     "qevent.h" => "QtEvents",
diff --git a/tests/.prev_CMakeLists.txt b/tests/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..221413713e
--- /dev/null
+++ b/tests/.prev_CMakeLists.txt
@@ -0,0 +1,7 @@
+# Generated from tests.pro.
+
+if(QT_BUILD_STANDALONE_TESTS)
+    # Add qt_find_package calls for extra dependencies that need to be found when building
+    # the standalone tests here.
+endif()
+qt_build_tests()
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
new file mode 100644
index 0000000000..d1a395c9f3
--- /dev/null
+++ b/tests/CMakeLists.txt
@@ -0,0 +1,13 @@
+# Generated from tests.pro.
+
+if(QT_BUILD_STANDALONE_TESTS)
+    # Add qt_find_package calls for extra dependencies that need to be found when building
+    # the standalone tests here.
+    # special case begin
+    qt_find_package(WrapDBus1 PROVIDED_TARGETS dbus-1)
+    qt_find_package(ICU COMPONENTS i18n uc data PROVIDED_TARGETS ICU::i18n ICU::uc ICU::data)
+    qt_find_package(Threads PROVIDED_TARGETS Threads::Threads)
+    qt_find_package(OpenSSL PROVIDED_TARGETS OpenSSL::OpenSSL)
+    # special case end
+endif()
+qt_build_tests()
diff --git a/tests/auto/CMakeLists.txt b/tests/auto/CMakeLists.txt
new file mode 100644
index 0000000000..64996503eb
--- /dev/null
+++ b/tests/auto/CMakeLists.txt
@@ -0,0 +1,66 @@
+# Generated from auto.pro.
+
+add_subdirectory(corelib)
+if (QT_FEATURE_dbus)
+    set(run_dbus_tests ON)
+    if(NOT CMAKE_CROSSCOMPILING AND TARGET Qt::DBus)
+        execute_process(COMMAND dbus-send --session --type=signal / local.AutotestCheck.Hello
+            RESULT_VARIABLE dbus_session_test
+            OUTPUT_QUIET ERROR_QUIET)
+        if(NOT "${dbus_session_test}" STREQUAL "0")
+            set(run_dbus_tests OFF)
+            if(QT_FEATURE_dbus_linked)
+                message(WARNING
+                    " QtDBus is enabled but session bus is not available for testing.\n"
+                    " Please check the installation. Skipping QtDBus tests.")
+            else()
+                message(WARNING
+                    " QtDBus is enabled with runtime support, but session bus is not available.\n"
+                    " Skipping QtDBus tests.")
+            endif()
+        endif()
+    endif()
+    if(run_dbus_tests)
+        add_subdirectory(dbus)
+    endif()
+endif()
+if (TARGET Qt::Gui)
+    add_subdirectory(gui)
+endif()
+
+# special case begin
+# Build only corelib and gui tests when targeting uikit (iOS),
+# because the script can't handle the SUBDIRS assignment well.
+if (APPLE_UIKIT)
+    return()
+endif()
+# special case end
+
+if (TARGET Qt::Network AND NOT WINRT)
+     add_subdirectory(network)
+endif()
+if (TARGET Qt::OpenGL AND NOT WINRT)
+     add_subdirectory(opengl)
+endif()
+if (TARGET Qt::Sql)
+     add_subdirectory(sql)
+endif()
+add_subdirectory(testlib)
+if (NOT CMAKE_CROSSCOMPILE AND QT_FEATURE_process)
+     add_subdirectory(tools)
+endif()
+if (TARGET Qt::Xml)
+     add_subdirectory(xml)
+endif()
+if (TARGET Qt::Concurrent)
+     add_subdirectory(concurrent)
+endif()
+add_subdirectory(other)
+if (TARGET Qt::Widgets)
+     add_subdirectory(widgets)
+endif()
+if (TARGET Qt::PrintSupport)
+     add_subdirectory(printsupport)
+endif()
+# add_subdirectory(cmake) ## FIXME: Does this still make sense in this form?
+# add_subdirectory(installed_cmake) ## FIXME: Does this still make sense in this form?
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
index 9eb741edac..c9d1da8649 100644
--- a/tests/auto/auto.pro
+++ b/tests/auto/auto.pro
@@ -1,5 +1,9 @@
 TEMPLATE = subdirs
 
+# Tests with developer-build started failing on qemu-armv7/armv8 after commit
+# b88acae7a8e773c307e44f84da037d01d19e60f7 in qt5.
+boot2qt:qtConfig(private_tests): return()
+
 SUBDIRS += \
     corelib \
     dbus \
diff --git a/tests/auto/concurrent/CMakeLists.txt b/tests/auto/concurrent/CMakeLists.txt
new file mode 100644
index 0000000000..ae1e256bbd
--- /dev/null
+++ b/tests/auto/concurrent/CMakeLists.txt
@@ -0,0 +1,8 @@
+# Generated from concurrent.pro.
+
+add_subdirectory(qtconcurrentfilter)
+add_subdirectory(qtconcurrentiteratekernel)
+add_subdirectory(qtconcurrentmap)
+add_subdirectory(qtconcurrentmedian)
+add_subdirectory(qtconcurrentrun)
+add_subdirectory(qtconcurrentthreadengine)
diff --git a/tests/auto/concurrent/qtconcurrentfilter/.prev_CMakeLists.txt b/tests/auto/concurrent/qtconcurrentfilter/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..62b0308851
--- /dev/null
+++ b/tests/auto/concurrent/qtconcurrentfilter/.prev_CMakeLists.txt
@@ -0,0 +1,14 @@
+# Generated from qtconcurrentfilter.pro.
+
+#####################################################################
+## tst_qtconcurrentfilter Test:
+#####################################################################
+
+add_qt_test(tst_qtconcurrentfilter
+    SOURCES
+        tst_qtconcurrentfilter.cpp
+    DEFINES
+        -QT_NO_LINKED_LIST
+    PUBLIC_LIBRARIES
+        Qt::Concurrent
+)
diff --git a/tests/auto/concurrent/qtconcurrentfilter/CMakeLists.txt b/tests/auto/concurrent/qtconcurrentfilter/CMakeLists.txt
new file mode 100644
index 0000000000..9da443a3f9
--- /dev/null
+++ b/tests/auto/concurrent/qtconcurrentfilter/CMakeLists.txt
@@ -0,0 +1,15 @@
+# Generated from qtconcurrentfilter.pro.
+
+#####################################################################
+## tst_qtconcurrentfilter Test:
+#####################################################################
+
+add_qt_test(tst_qtconcurrentfilter
+    SOURCES
+        tst_qtconcurrentfilter.cpp
+    DEFINES
+        # -QT_NO_LINKED_LIST # special case remove until figured out how to deal with this
+        QT_STRICT_ITERATORS
+    PUBLIC_LIBRARIES
+        Qt::Concurrent
+)
diff --git a/tests/auto/concurrent/qtconcurrentfilter/qtconcurrentfilter.pro b/tests/auto/concurrent/qtconcurrentfilter/qtconcurrentfilter.pro
index 15345d40db..f2e3e0c8e1 100644
--- a/tests/auto/concurrent/qtconcurrentfilter/qtconcurrentfilter.pro
+++ b/tests/auto/concurrent/qtconcurrentfilter/qtconcurrentfilter.pro
@@ -2,5 +2,3 @@ CONFIG += testcase
 TARGET = tst_qtconcurrentfilter
 QT = core testlib concurrent
 SOURCES = tst_qtconcurrentfilter.cpp
-DEFINES += QT_STRICT_ITERATORS
-DEFINES -= QT_NO_LINKED_LIST
diff --git a/tests/auto/concurrent/qtconcurrentfilter/tst_qtconcurrentfilter.cpp b/tests/auto/concurrent/qtconcurrentfilter/tst_qtconcurrentfilter.cpp
index 84ebd46886..e6ac829230 100644
--- a/tests/auto/concurrent/qtconcurrentfilter/tst_qtconcurrentfilter.cpp
+++ b/tests/auto/concurrent/qtconcurrentfilter/tst_qtconcurrentfilter.cpp
@@ -28,7 +28,6 @@
 #include <qtconcurrentfilter.h>
 #include <QCoreApplication>
 #include <QList>
-#include <QLinkedList>
 #include <QtTest/QtTest>
 
 #include "../qtconcurrentmap/functions.h"
@@ -63,18 +62,6 @@ void tst_QtConcurrentFilter::filter()
         QCOMPARE(list, QList<int>() << 2 << 4);
     }
     {
-        QLinkedList<int> linkedList;
-        linkedList << 1 << 2 << 3 << 4;
-        QtConcurrent::filter(linkedList, KeepEvenIntegers()).waitForFinished();
-        QCOMPARE(linkedList, QLinkedList<int>() << 2 << 4);
-    }
-    {
-        QLinkedList<int> linkedList;
-        linkedList << 1 << 2 << 3 << 4;
-        QtConcurrent::blockingFilter(linkedList, KeepEvenIntegers());
-        QCOMPARE(linkedList, QLinkedList<int>() << 2 << 4);
-    }
-    {
         QVector<int> vector;
         vector << 1 << 2 << 3 << 4;
         QtConcurrent::filter(vector, KeepEvenIntegers()).waitForFinished();
@@ -100,18 +87,6 @@ void tst_QtConcurrentFilter::filter()
         QtConcurrent::blockingFilter(list, keepEvenIntegers);
         QCOMPARE(list, QList<int>() << 2 << 4);
     }
-    {
-        QLinkedList<int> linkedList;
-        linkedList << 1 << 2 << 3 << 4;
-        QtConcurrent::filter(linkedList, keepEvenIntegers).waitForFinished();
-        QCOMPARE(linkedList, QLinkedList<int>() << 2 << 4);
-    }
-    {
-        QLinkedList<int> linkedList;
-        linkedList << 1 << 2 << 3 << 4;
-        QtConcurrent::blockingFilter(linkedList, keepEvenIntegers);
-        QCOMPARE(linkedList, QLinkedList<int>() << 2 << 4);
-    }
 
     // bound function
     {
@@ -126,18 +101,6 @@ void tst_QtConcurrentFilter::filter()
         QtConcurrent::blockingFilter(list, keepEvenIntegers);
         QCOMPARE(list, QList<int>() << 2 << 4);
     }
-    {
-        QLinkedList<int> linkedList;
-        linkedList << 1 << 2 << 3 << 4;
-        QtConcurrent::filter(linkedList, keepEvenIntegers).waitForFinished();
-        QCOMPARE(linkedList, QLinkedList<int>() << 2 << 4);
-    }
-    {
-        QLinkedList<int> linkedList;
-        linkedList << 1 << 2 << 3 << 4;
-        QtConcurrent::blockingFilter(linkedList, keepEvenIntegers);
-        QCOMPARE(linkedList, QLinkedList<int>() << 2 << 4);
-    }
 
     // member
     {
@@ -152,18 +115,6 @@ void tst_QtConcurrentFilter::filter()
         QtConcurrent::blockingFilter(list, &Number::isEven);
         QCOMPARE(list, QList<Number>() << 2 << 4);
     }
-    {
-        QLinkedList<Number> linkedList;
-        linkedList << 1 << 2 << 3 << 4;
-        QtConcurrent::filter(linkedList, &Number::isEven).waitForFinished();
-        QCOMPARE(linkedList, QLinkedList<Number>() << 2 << 4);
-    }
-    {
-        QLinkedList<Number> linkedList;
-        linkedList << 1 << 2 << 3 << 4;
-        QtConcurrent::blockingFilter(linkedList, &Number::isEven);
-        QCOMPARE(linkedList, QLinkedList<Number>() << 2 << 4);
-    }
 }
 
 void tst_QtConcurrentFilter::filtered()
@@ -219,19 +170,6 @@ void tst_QtConcurrentFilter::filtered()
         QCOMPARE(f.results(), QList<int>() << 2 << 4);
     }
 
-    {
-        QLinkedList<int> linkedList;
-        linkedList << 1 << 2 << 3 << 4;
-        QLinkedList<int> linkedList2 = QtConcurrent::blockingFiltered(linkedList, KeepEvenIntegers());
-        QCOMPARE(linkedList2, QLinkedList<int>() << 2 << 4);
-    }
-    {
-        QLinkedList<int> linkedList;
-        linkedList << 1 << 2 << 3 << 4;
-        QFuture<int> f = QtConcurrent::filtered(linkedList, KeepEvenIntegers());
-        QCOMPARE(f.results(), QList<int>() << 2 << 4);
-    }
-
     // function
     {
         QFuture<int> f = QtConcurrent::filtered(list, keepEvenIntegers);
@@ -351,172 +289,6 @@ void tst_QtConcurrentFilter::filtered()
                                                            &Number::isEven);
         QCOMPARE(list2, QList<Number>() << 2 << 4);
     }
-
-    // same thing on linked lists
-
-    QLinkedList<int> linkedList;
-    linkedList << 1 << 2 << 3 << 4;
-
-    // functor
-    {
-        QFuture<int> f = QtConcurrent::filtered(linkedList, KeepEvenIntegers());
-        QList<int> linkedList2 = f.results();
-        QCOMPARE(linkedList2, QList<int>() << 2 << 4);
-    }
-    {
-        QFuture<int> f = QtConcurrent::filtered(linkedList.begin(),
-                                                linkedList.end(),
-                                                KeepEvenIntegers());
-        QList<int> linkedList2 = f.results();
-        QCOMPARE(linkedList2, QList<int>() << 2 << 4);
-    }
-    {
-        QFuture<int> f = QtConcurrent::filtered(linkedList.constBegin(),
-                                                linkedList.constEnd(),
-                                                KeepEvenIntegers());
-        QList<int> linkedList2 = f.results();
-        QCOMPARE(linkedList2, QList<int>() << 2 << 4);
-    }
-    {
-        QLinkedList<int> linkedList2 = QtConcurrent::blockingFiltered(linkedList, KeepEvenIntegers());
-        QCOMPARE(linkedList2, QLinkedList<int>() << 2 << 4);
-    }
-    {
-        QLinkedList<int> linkedList2 = QtConcurrent::blockingFiltered<QLinkedList<int> >(linkedList.begin(),
-                                                                                         linkedList.end(),
-                                                                                         KeepEvenIntegers());
-        QCOMPARE(linkedList2, QLinkedList<int>() << 2 << 4);
-    }
-    {
-        QLinkedList<int> linkedList2 = QtConcurrent::blockingFiltered<QLinkedList<int> >(linkedList.constBegin(),
-                                                                                         linkedList.constEnd(),
-                                                                                         KeepEvenIntegers());
-        QCOMPARE(linkedList2, QLinkedList<int>() << 2 << 4);
-    }
-
-    // function
-    {
-        QFuture<int> f = QtConcurrent::filtered(linkedList, keepEvenIntegers);
-        QList<int> linkedList2 = f.results();
-        QCOMPARE(linkedList2, QList<int>() << 2 << 4);
-    }
-    {
-        QFuture<int> f = QtConcurrent::filtered(linkedList.begin(),
-                                                linkedList.end(),
-                                                keepEvenIntegers);
-        QList<int> linkedList2 = f.results();
-        QCOMPARE(linkedList2, QList<int>() << 2 << 4);
-    }
-    {
-        QFuture<int> f = QtConcurrent::filtered(linkedList.constBegin(),
-                                                linkedList.constEnd(),
-                                                keepEvenIntegers);
-        QList<int> linkedList2 = f.results();
-        QCOMPARE(linkedList2, QList<int>() << 2 << 4);
-    }
-    {
-        QLinkedList<int> linkedList2 = QtConcurrent::blockingFiltered(linkedList, keepEvenIntegers);
-        QCOMPARE(linkedList2, QLinkedList<int>() << 2 << 4);
-    }
-    {
-        QLinkedList<int> linkedList2 = QtConcurrent::blockingFiltered<QLinkedList<int> >(linkedList.begin(),
-                                                                                         linkedList.end(),
-                                                                                         keepEvenIntegers);
-        QCOMPARE(linkedList2, QLinkedList<int>() << 2 << 4);
-    }
-    {
-        QLinkedList<int> linkedList2 = QtConcurrent::blockingFiltered<QLinkedList<int> >(linkedList.constBegin(),
-                                                                                         linkedList.constEnd(),
-                                                                                         keepEvenIntegers);
-        QCOMPARE(linkedList2, QLinkedList<int>() << 2 << 4);
-    }
-
-    // bound function
-    {
-        QFuture<int> f = QtConcurrent::filtered(linkedList, keepEvenIntegers);
-        QList<int> linkedList2 = f.results();
-        QCOMPARE(linkedList2, QList<int>() << 2 << 4);
-    }
-    {
-        QFuture<int> f = QtConcurrent::filtered(linkedList.begin(),
-                                                linkedList.end(),
-                                                keepEvenIntegers);
-        QList<int> linkedList2 = f.results();
-        QCOMPARE(linkedList2, QList<int>() << 2 << 4);
-    }
-    {
-        QFuture<int> f = QtConcurrent::filtered(linkedList.constBegin(),
-                                                linkedList.constEnd(),
-                                                keepEvenIntegers);
-        QList<int> linkedList2 = f.results();
-        QCOMPARE(linkedList2, QList<int>() << 2 << 4);
-    }
-    {
-        QLinkedList<int> linkedList2 = QtConcurrent::blockingFiltered(linkedList, keepEvenIntegers);
-        QCOMPARE(linkedList2, QLinkedList<int>() << 2 << 4);
-    }
-    {
-        QLinkedList<int> linkedList2 = QtConcurrent::blockingFiltered<QLinkedList<int> >(linkedList.begin(),
-                                                                                         linkedList.end(),
-                                                                                         keepEvenIntegers);
-        QCOMPARE(linkedList2, QLinkedList<int>() << 2 << 4);
-    }
-    {
-        QLinkedList<int> linkedList2 = QtConcurrent::blockingFiltered<QLinkedList<int> >(linkedList.constBegin(),
-                                                                                         linkedList.constEnd(),
-                                                                                         keepEvenIntegers);
-        QCOMPARE(linkedList2, QLinkedList<int>() << 2 << 4);
-    }
-
-    // const member function
-    {
-        QLinkedList<Number> integers;
-        integers << 1 << 2 << 3 << 4;
-        QFuture<Number> f = QtConcurrent::filtered(integers, &Number::isEven);
-        QList<Number> linkedList2 = f.results();
-        QCOMPARE(linkedList2, QList<Number>() << 2 << 4);
-    }
-    {
-        QLinkedList<Number> integers;
-        integers << 1 << 2 << 3 << 4;
-        QFuture<Number> f = QtConcurrent::filtered(integers.begin(),
-                                                   integers.end(),
-                                                   &Number::isEven);
-        QList<Number> linkedList2 = f.results();
-        QCOMPARE(linkedList2, QList<Number>() << 2 << 4);
-    }
-    {
-        QLinkedList<Number> integers;
-        integers << 1 << 2 << 3 << 4;
-        QFuture<Number> f = QtConcurrent::filtered(integers.constBegin(),
-                                                   integers.constEnd(),
-                                                   &Number::isEven);
-        QList<Number> linkedList2 = f.results();
-        QCOMPARE(linkedList2, QList<Number>() << 2 << 4);
-    }
-    {
-        QLinkedList<Number> integers;
-        integers << 1 << 2 << 3 << 4;
-        QLinkedList<Number> linkedList2 = QtConcurrent::blockingFiltered(integers, &Number::isEven);
-        QCOMPARE(linkedList2, QLinkedList<Number>() << 2 << 4);
-    }
-    {
-        QLinkedList<Number> integers;
-        integers << 1 << 2 << 3 << 4;
-        QLinkedList<Number> linkedList2 = QtConcurrent::blockingFiltered<QLinkedList<Number> >(integers.begin(),
-                                                                                               integers.end(),
-                                                                                               &Number::isEven);
-        QCOMPARE(linkedList2, QLinkedList<Number>() << 2 << 4);
-    }
-    {
-        QLinkedList<Number> integers;
-        integers << 1 << 2 << 3 << 4;
-        QLinkedList<Number> linkedList2 =
-            QtConcurrent::blockingFiltered<QLinkedList<Number> >(integers.constBegin(),
-                                                                 integers.constEnd(),
-                                                                 &Number::isEven);
-        QCOMPARE(linkedList2, QLinkedList<Number>() << 2 << 4);
-    }
 }
 
 void tst_QtConcurrentFilter::filteredReduced()
@@ -714,16 +486,17 @@ void tst_QtConcurrentFilter::filteredReduced()
         QCOMPARE(sum, 6);
     }
 
+    auto push_back = static_cast<void (QVector<int>::*)(const int &)>(&QVector<int>::push_back);
     // functor-member
     {
-        QList<int> list2 = QtConcurrent::filteredReduced(list, KeepEvenIntegers(), &QList<int>::push_back, QtConcurrent::OrderedReduce);
+        QList<int> list2 = QtConcurrent::filteredReduced(list, KeepEvenIntegers(), push_back, QtConcurrent::OrderedReduce);
         QCOMPARE(list2, QList<int>() << 2 << 4);
     }
     {
         QList<int> list2 = QtConcurrent::filteredReduced(list.begin(),
                                                          list.end(),
                                                          KeepEvenIntegers(),
-                                                         &QList<int>::push_back,
+                                                         push_back,
                                                          QtConcurrent::OrderedReduce);
         QCOMPARE(list2, QList<int>() << 2 << 4);
     }
@@ -731,19 +504,19 @@ void tst_QtConcurrentFilter::filteredReduced()
         QList<int> list2 = QtConcurrent::filteredReduced(list.constBegin(),
                                                          list.constEnd(),
                                                          KeepEvenIntegers(),
-                                                         &QList<int>::push_back,
+                                                         push_back,
                                                          QtConcurrent::OrderedReduce);
         QCOMPARE(list2, QList<int>() << 2 << 4);
     }
     {
-        QList<int> list2 = QtConcurrent::blockingFilteredReduced(list, KeepEvenIntegers(), &QList<int>::push_back, QtConcurrent::OrderedReduce);
+        QList<int> list2 = QtConcurrent::blockingFilteredReduced(list, KeepEvenIntegers(), push_back, QtConcurrent::OrderedReduce);
         QCOMPARE(list2, QList<int>() << 2 << 4);
     }
     {
         QList<int> list2 = QtConcurrent::blockingFilteredReduced(list.begin(),
                                                                  list.end(),
                                                                  KeepEvenIntegers(),
-                                                                 &QList<int>::push_back,
+                                                                 push_back,
                                                                  QtConcurrent::OrderedReduce);
         QCOMPARE(list2, QList<int>() << 2 << 4);
     }
@@ -751,7 +524,7 @@ void tst_QtConcurrentFilter::filteredReduced()
         QList<int> list2 = QtConcurrent::blockingFilteredReduced(list.constBegin(),
                                                                  list.constEnd(),
                                                                  KeepEvenIntegers(),
-                                                                 &QList<int>::push_back,
+                                                                 push_back,
                                                                  QtConcurrent::OrderedReduce);
         QCOMPARE(list2, QList<int>() << 2 << 4);
     }
@@ -805,12 +578,15 @@ void tst_QtConcurrentFilter::filteredReduced()
     }
 
     // member-member
+
+    auto push_back_number = static_cast<void (QVector<Number>::*)(const Number &)>(&QVector<Number>::push_back);
+
     {
         QList<Number> numbers;
         numbers << 1 << 2 << 3 << 4;
         QList<Number> list2 = QtConcurrent::filteredReduced(numbers,
                                                             &Number::isEven,
-                                                            &QList<Number>::push_back, QtConcurrent::OrderedReduce);
+                                                            push_back_number, QtConcurrent::OrderedReduce);
         QCOMPARE(list2, QList<Number>() << 2 << 4);
     }
     {
@@ -819,7 +595,7 @@ void tst_QtConcurrentFilter::filteredReduced()
         QList<Number> list2 = QtConcurrent::filteredReduced(numbers.begin(),
                                                             numbers.end(),
                                                             &Number::isEven,
-                                                            &QList<Number>::push_back,
+                                                            push_back_number,
                                                             QtConcurrent::OrderedReduce);
         QCOMPARE(list2, QList<Number>() << 2 << 4);
     }
@@ -829,7 +605,7 @@ void tst_QtConcurrentFilter::filteredReduced()
         QList<Number> list2 = QtConcurrent::filteredReduced(numbers.constBegin(),
                                                             numbers.constEnd(),
                                                             &Number::isEven,
-                                                            &QList<Number>::push_back,
+                                                            push_back_number,
                                                             QtConcurrent::OrderedReduce);
         QCOMPARE(list2, QList<Number>() << 2 << 4);
     }
@@ -838,7 +614,7 @@ void tst_QtConcurrentFilter::filteredReduced()
         numbers << 1 << 2 << 3 << 4;
         QList<Number> list2 = QtConcurrent::blockingFilteredReduced(numbers,
                                                                     &Number::isEven,
-                                                                    &QList<Number>::push_back, QtConcurrent::OrderedReduce);
+                                                                    push_back_number, QtConcurrent::OrderedReduce);
         QCOMPARE(list2, QList<Number>() << 2 << 4);
     }
     {
@@ -847,7 +623,7 @@ void tst_QtConcurrentFilter::filteredReduced()
         QList<Number> list2 = QtConcurrent::blockingFilteredReduced(numbers.begin(),
                                                                     numbers.end(),
                                                                     &Number::isEven,
-                                                                    &QList<Number>::push_back,
+                                                                    push_back_number,
                                                                     QtConcurrent::OrderedReduce);
         QCOMPARE(list2, QList<Number>() << 2 << 4);
     }
@@ -857,21 +633,21 @@ void tst_QtConcurrentFilter::filteredReduced()
         QList<Number> list2 = QtConcurrent::blockingFilteredReduced(numbers.constBegin(),
                                                                     numbers.constEnd(),
                                                                     &Number::isEven,
-                                                                    &QList<Number>::push_back,
+                                                                    push_back_number,
                                                                     QtConcurrent::OrderedReduce);
         QCOMPARE(list2, QList<Number>() << 2 << 4);
     }
 
     // function-member
     {
-        QList<int> list2 = QtConcurrent::filteredReduced(list, keepEvenIntegers, &QList<int>::push_back, QtConcurrent::OrderedReduce);
+        QList<int> list2 = QtConcurrent::filteredReduced(list, keepEvenIntegers, push_back, QtConcurrent::OrderedReduce);
         QCOMPARE(list2, QList<int>() << 2 << 4);
     }
     {
         QList<int> list2 = QtConcurrent::filteredReduced(list.begin(),
                                                          list.end(),
                                                          keepEvenIntegers,
-                                                         &QList<int>::push_back,
+                                                         push_back,
                                                          QtConcurrent::OrderedReduce);
         QCOMPARE(list2, QList<int>() << 2 << 4);
     }
@@ -879,19 +655,19 @@ void tst_QtConcurrentFilter::filteredReduced()
         QList<int> list2 = QtConcurrent::filteredReduced(list.constBegin(),
                                                          list.constEnd(),
                                                          keepEvenIntegers,
-                                                         &QList<int>::push_back,
+                                                         push_back,
                                                          QtConcurrent::OrderedReduce);
         QCOMPARE(list2, QList<int>() << 2 << 4);
     }
     {
-        QList<int> list2 = QtConcurrent::blockingFilteredReduced(list, keepEvenIntegers, &QList<int>::push_back, QtConcurrent::OrderedReduce);
+        QList<int> list2 = QtConcurrent::blockingFilteredReduced(list, keepEvenIntegers, push_back, QtConcurrent::OrderedReduce);
         QCOMPARE(list2, QList<int>() << 2 << 4);
     }
     {
         QList<int> list2 = QtConcurrent::blockingFilteredReduced(list.begin(),
                                                                  list.end(),
                                                                  keepEvenIntegers,
-                                                                 &QList<int>::push_back,
+                                                                 push_back,
                                                                  QtConcurrent::OrderedReduce);
         QCOMPARE(list2, QList<int>() << 2 << 4);
     }
@@ -899,7 +675,7 @@ void tst_QtConcurrentFilter::filteredReduced()
         QList<int> list2 = QtConcurrent::blockingFilteredReduced(list.constBegin(),
                                                                  list.constEnd(),
                                                                  keepEvenIntegers,
-                                                                 &QList<int>::push_back,
+                                                                 push_back,
                                                                  QtConcurrent::OrderedReduce);
         QCOMPARE(list2, QList<int>() << 2 << 4);
     }
@@ -952,432 +728,6 @@ void tst_QtConcurrentFilter::filteredReduced()
         QCOMPARE(sum, 6);
     }
 
-    // same as above on linked lists
-    QLinkedList<int> linkedList;
-    linkedList << 1 << 2 << 3 << 4;
-    QLinkedList<Number> numberLinkedList;
-    numberLinkedList << 1 << 2 << 3 << 4;
-
-    // functor-functor
-    {
-        int sum = QtConcurrent::filteredReduced<int>(linkedList, KeepEvenIntegers(), IntSumReduce());
-        QCOMPARE(sum, 6);
-
-        int sum2 = QtConcurrent::filteredReduced<int>(linkedList, keepEvenIntegers, intSumReduce);
-        QCOMPARE(sum2, 6);
-    }
-    {
-        int sum = QtConcurrent::filteredReduced<int>(linkedList.begin(),
-                                                     linkedList.end(),
-                                                     KeepEvenIntegers(),
-                                                     IntSumReduce());
-        QCOMPARE(sum, 6);
-
-        int sum2 = QtConcurrent::filteredReduced<int>(linkedList.begin(),
-                                                      linkedList.end(),
-                                                      keepEvenIntegers,
-                                                      intSumReduce);
-        QCOMPARE(sum2, 6);
-    }
-    {
-        int sum = QtConcurrent::filteredReduced<int>(linkedList.constBegin(),
-                                                     linkedList.constEnd(),
-                                                     KeepEvenIntegers(),
-                                                     IntSumReduce());
-        QCOMPARE(sum, 6);
-
-        int sum2 = QtConcurrent::filteredReduced<int>(linkedList.constBegin(),
-                                                      linkedList.constEnd(),
-                                                      keepEvenIntegers,
-                                                      intSumReduce);
-        QCOMPARE(sum2, 6);
-    }
-    {
-        int sum = QtConcurrent::blockingFilteredReduced<int>(linkedList, KeepEvenIntegers(), IntSumReduce());
-        QCOMPARE(sum, 6);
-
-        int sum2 = QtConcurrent::blockingFilteredReduced<int>(linkedList, keepEvenIntegers, intSumReduce);
-        QCOMPARE(sum2, 6);
-    }
-    {
-        int sum = QtConcurrent::blockingFilteredReduced<int>(linkedList.begin(),
-                                                             linkedList.end(),
-                                                             KeepEvenIntegers(),
-                                                             IntSumReduce());
-        QCOMPARE(sum, 6);
-
-        int sum2 = QtConcurrent::blockingFilteredReduced<int>(linkedList.begin(),
-                                                              linkedList.end(),
-                                                              keepEvenIntegers,
-                                                              intSumReduce);
-        QCOMPARE(sum2, 6);
-    }
-    {
-        int sum = QtConcurrent::blockingFilteredReduced<int>(linkedList.constBegin(),
-                                                             linkedList.constEnd(),
-                                                             KeepEvenIntegers(),
-                                                             IntSumReduce());
-        QCOMPARE(sum, 6);
-
-        int sum2 = QtConcurrent::blockingFilteredReduced<int>(linkedList.constBegin(),
-                                                              linkedList.constEnd(),
-                                                              keepEvenIntegers,
-                                                              intSumReduce);
-        QCOMPARE(sum2, 6);
-    }
-
-    // function-functor
-    {
-        int sum = QtConcurrent::filteredReduced<int>(linkedList, keepEvenIntegers, IntSumReduce());
-        QCOMPARE(sum, 6);
-    }
-    {
-        int sum = QtConcurrent::filteredReduced<int>(linkedList.begin(),
-                                                     linkedList.end(),
-                                                     keepEvenIntegers,
-                                                     IntSumReduce());
-        QCOMPARE(sum, 6);
-    }
-    {
-        int sum = QtConcurrent::filteredReduced<int>(linkedList.constBegin(),
-                                                     linkedList.constEnd(),
-                                                     keepEvenIntegers,
-                                                     IntSumReduce());
-        QCOMPARE(sum, 6);
-    }
-    {
-        int sum = QtConcurrent::blockingFilteredReduced<int>(linkedList, keepEvenIntegers, IntSumReduce());
-        QCOMPARE(sum, 6);
-    }
-    {
-        int sum = QtConcurrent::blockingFilteredReduced<int>(linkedList.begin(),
-                                                             linkedList.end(),
-                                                             keepEvenIntegers,
-                                                             IntSumReduce());
-        QCOMPARE(sum, 6);
-    }
-    {
-        int sum = QtConcurrent::blockingFilteredReduced<int>(linkedList.constBegin(),
-                                                             linkedList.constEnd(),
-                                                             keepEvenIntegers,
-                                                             IntSumReduce());
-        QCOMPARE(sum, 6);
-    }
-
-    // functor-function
-    {
-        int sum = QtConcurrent::filteredReduced(linkedList, KeepEvenIntegers(), intSumReduce);
-        QCOMPARE(sum, 6);
-    }
-    {
-        int sum = QtConcurrent::filteredReduced(linkedList.begin(),
-                                                linkedList.end(),
-                                                KeepEvenIntegers(),
-                                                intSumReduce);
-        QCOMPARE(sum, 6);
-    }
-    {
-        int sum = QtConcurrent::filteredReduced(linkedList.constBegin(),
-                                                linkedList.constEnd(),
-                                                KeepEvenIntegers(),
-                                                intSumReduce);
-        QCOMPARE(sum, 6);
-    }
-    {
-        int sum = QtConcurrent::blockingFilteredReduced(linkedList, KeepEvenIntegers(), intSumReduce);
-        QCOMPARE(sum, 6);
-    }
-    {
-        int sum = QtConcurrent::blockingFilteredReduced(linkedList.begin(),
-                                                        linkedList.end(),
-                                                        KeepEvenIntegers(),
-                                                        intSumReduce);
-        QCOMPARE(sum, 6);
-    }
-    {
-        int sum = QtConcurrent::blockingFilteredReduced(linkedList.constBegin(),
-                                                        linkedList.constEnd(),
-                                                        KeepEvenIntegers(),
-                                                        intSumReduce);
-        QCOMPARE(sum, 6);
-    }
-
-    // function-function
-    {
-        int sum = QtConcurrent::filteredReduced(linkedList, keepEvenIntegers, intSumReduce);
-        QCOMPARE(sum, 6);
-    }
-    {
-        int sum = QtConcurrent::filteredReduced(linkedList.begin(),
-                                                linkedList.end(),
-                                                keepEvenIntegers,
-                                                intSumReduce);
-        QCOMPARE(sum, 6);
-    }
-    {
-        int sum = QtConcurrent::filteredReduced(linkedList.constBegin(),
-                                                linkedList.constEnd(),
-                                                keepEvenIntegers,
-                                                intSumReduce);
-        QCOMPARE(sum, 6);
-    }
-    {
-        int sum = QtConcurrent::blockingFilteredReduced(linkedList, keepEvenIntegers, intSumReduce);
-        QCOMPARE(sum, 6);
-    }
-    {
-        int sum = QtConcurrent::blockingFilteredReduced(linkedList.begin(),
-                                                        linkedList.end(),
-                                                        keepEvenIntegers,
-                                                        intSumReduce);
-        QCOMPARE(sum, 6);
-    }
-    {
-        int sum = QtConcurrent::blockingFilteredReduced(linkedList.constBegin(),
-                                                        linkedList.constEnd(),
-                                                        keepEvenIntegers,
-                                                        intSumReduce);
-        QCOMPARE(sum, 6);
-    }
-
-    // functor-member
-    {
-        QLinkedList<int> linkedList2 = QtConcurrent::filteredReduced(linkedList, KeepEvenIntegers(), &QLinkedList<int>::append, QtConcurrent::OrderedReduce);
-        QCOMPARE(linkedList2, QLinkedList<int>() << 2 << 4);
-    }
-    {
-        QLinkedList<int> linkedList2 = QtConcurrent::filteredReduced(linkedList.begin(),
-                                                                     linkedList.end(),
-                                                                     KeepEvenIntegers(),
-                                                                     &QLinkedList<int>::append,
-                                                                     QtConcurrent::OrderedReduce);
-        QCOMPARE(linkedList2, QLinkedList<int>() << 2 << 4);
-    }
-    {
-        QLinkedList<int> linkedList2 = QtConcurrent::filteredReduced(linkedList.constBegin(),
-                                                                     linkedList.constEnd(),
-                                                                     KeepEvenIntegers(),
-                                                                     &QLinkedList<int>::append,
-                                                                     QtConcurrent::OrderedReduce);
-        QCOMPARE(linkedList2, QLinkedList<int>() << 2 << 4);
-    }
-    {
-        QLinkedList<int> linkedList2 = QtConcurrent::blockingFilteredReduced(linkedList, KeepEvenIntegers(), &QLinkedList<int>::append, QtConcurrent::OrderedReduce);
-        QCOMPARE(linkedList2, QLinkedList<int>() << 2 << 4);
-    }
-    {
-        QLinkedList<int> linkedList2 = QtConcurrent::blockingFilteredReduced(linkedList.begin(),
-                                                                             linkedList.end(),
-                                                                             KeepEvenIntegers(),
-                                                                             &QLinkedList<int>::append,
-                                                                             QtConcurrent::OrderedReduce);
-        QCOMPARE(linkedList2, QLinkedList<int>() << 2 << 4);
-    }
-    {
-        QLinkedList<int> linkedList2 = QtConcurrent::blockingFilteredReduced(linkedList.constBegin(),
-                                                                             linkedList.constEnd(),
-                                                                             KeepEvenIntegers(),
-                                                                             &QLinkedList<int>::append,
-                                                                             QtConcurrent::OrderedReduce);
-        QCOMPARE(linkedList2, QLinkedList<int>() << 2 << 4);
-    }
-
-    // member-functor
-    {
-        int sum = QtConcurrent::filteredReduced<int>(numberLinkedList, &Number::isEven, NumberSumReduce());
-        QCOMPARE(sum, 6);
-
-        int sum2 = QtConcurrent::filteredReduced<int>(QLinkedList<Number>(numberLinkedList),
-                                                      &Number::isEven,
-                                                      NumberSumReduce());
-        QCOMPARE(sum2, 6);
-    }
-    {
-        int sum = QtConcurrent::filteredReduced<int>(numberLinkedList.begin(),
-                                                     numberLinkedList.end(),
-                                                     &Number::isEven,
-                                                     NumberSumReduce());
-        QCOMPARE(sum, 6);
-    }
-    {
-        int sum = QtConcurrent::filteredReduced<int>(numberLinkedList.constBegin(),
-                                                     numberLinkedList.constEnd(),
-                                                     &Number::isEven,
-                                                     NumberSumReduce());
-        QCOMPARE(sum, 6);
-    }
-    {
-        int sum = QtConcurrent::blockingFilteredReduced<int>(numberLinkedList, &Number::isEven, NumberSumReduce());
-        QCOMPARE(sum, 6);
-
-        int sum2 = QtConcurrent::blockingFilteredReduced<int>(QLinkedList<Number>(numberLinkedList),
-                                                              &Number::isEven,
-                                                              NumberSumReduce());
-        QCOMPARE(sum2, 6);
-    }
-    {
-        int sum = QtConcurrent::blockingFilteredReduced<int>(numberLinkedList.begin(),
-                                                             numberLinkedList.end(),
-                                                             &Number::isEven,
-                                                             NumberSumReduce());
-        QCOMPARE(sum, 6);
-    }
-    {
-        int sum = QtConcurrent::blockingFilteredReduced<int>(numberLinkedList.constBegin(),
-                                                             numberLinkedList.constEnd(),
-                                                             &Number::isEven,
-                                                             NumberSumReduce());
-        QCOMPARE(sum, 6);
-    }
-
-    // member-member
-    {
-        QLinkedList<Number> numbers;
-        numbers << 1 << 2 << 3 << 4;
-        QLinkedList<Number> linkedList2 = QtConcurrent::filteredReduced(numbers,
-                                                                        &Number::isEven,
-                                                                        &QLinkedList<Number>::append, QtConcurrent::OrderedReduce);
-        QCOMPARE(linkedList2, QLinkedList<Number>() << 2 << 4);
-    }
-    {
-        QLinkedList<Number> numbers;
-        numbers << 1 << 2 << 3 << 4;
-        QLinkedList<Number> linkedList2 = QtConcurrent::filteredReduced(numbers.begin(),
-                                                                        numbers.end(),
-                                                                        &Number::isEven,
-                                                                        &QLinkedList<Number>::append,
-                                                                        QtConcurrent::OrderedReduce);
-        QCOMPARE(linkedList2, QLinkedList<Number>() << 2 << 4);
-    }
-    {
-        QLinkedList<Number> numbers;
-        numbers << 1 << 2 << 3 << 4;
-        QLinkedList<Number> linkedList2 = QtConcurrent::filteredReduced(numbers.constBegin(),
-                                                                        numbers.constEnd(),
-                                                                        &Number::isEven,
-                                                                        &QLinkedList<Number>::append,
-                                                                        QtConcurrent::OrderedReduce);
-        QCOMPARE(linkedList2, QLinkedList<Number>() << 2 << 4);
-    }
-    {
-        QLinkedList<Number> numbers;
-        numbers << 1 << 2 << 3 << 4;
-        QLinkedList<Number> linkedList2 = QtConcurrent::blockingFilteredReduced(numbers,
-                                                                                &Number::isEven,
-                                                                                &QLinkedList<Number>::append, QtConcurrent::OrderedReduce);
-        QCOMPARE(linkedList2, QLinkedList<Number>() << 2 << 4);
-    }
-    {
-        QLinkedList<Number> numbers;
-        numbers << 1 << 2 << 3 << 4;
-        QLinkedList<Number> linkedList2 = QtConcurrent::blockingFilteredReduced(numbers.begin(),
-                                                                                numbers.end(),
-                                                                                &Number::isEven,
-                                                                                &QLinkedList<Number>::append,
-                                                                                QtConcurrent::OrderedReduce);
-        QCOMPARE(linkedList2, QLinkedList<Number>() << 2 << 4);
-    }
-    {
-        QLinkedList<Number> numbers;
-        numbers << 1 << 2 << 3 << 4;
-        QLinkedList<Number> linkedList2 = QtConcurrent::blockingFilteredReduced(numbers.constBegin(),
-                                                                                numbers.constEnd(),
-                                                                                &Number::isEven,
-                                                                                &QLinkedList<Number>::append,
-                                                                                QtConcurrent::OrderedReduce);
-        QCOMPARE(linkedList2, QLinkedList<Number>() << 2 << 4);
-    }
-
-    // function-member
-    {
-        QLinkedList<int> linkedList2 = QtConcurrent::filteredReduced(linkedList, keepEvenIntegers, &QLinkedList<int>::append, QtConcurrent::OrderedReduce);
-        QCOMPARE(linkedList2, QLinkedList<int>() << 2 << 4);
-    }
-    {
-        QLinkedList<int> linkedList2 = QtConcurrent::filteredReduced(linkedList.begin(),
-                                                                     linkedList.end(),
-                                                                     keepEvenIntegers,
-                                                                     &QLinkedList<int>::append,
-                                                                     QtConcurrent::OrderedReduce);
-        QCOMPARE(linkedList2, QLinkedList<int>() << 2 << 4);
-    }
-    {
-        QLinkedList<int> linkedList2 = QtConcurrent::filteredReduced(linkedList.constBegin(),
-                                                                     linkedList.constEnd(),
-                                                                     keepEvenIntegers,
-                                                                     &QLinkedList<int>::append,
-                                                                     QtConcurrent::OrderedReduce);
-        QCOMPARE(linkedList2, QLinkedList<int>() << 2 << 4);
-    }
-    {
-        QLinkedList<int> linkedList2 = QtConcurrent::blockingFilteredReduced(linkedList, keepEvenIntegers, &QLinkedList<int>::append, QtConcurrent::OrderedReduce);
-        QCOMPARE(linkedList2, QLinkedList<int>() << 2 << 4);
-    }
-    {
-        QLinkedList<int> linkedList2 = QtConcurrent::blockingFilteredReduced(linkedList.begin(),
-                                                                             linkedList.end(),
-                                                                             keepEvenIntegers,
-                                                                             &QLinkedList<int>::append,
-                                                                             QtConcurrent::OrderedReduce);
-        QCOMPARE(linkedList2, QLinkedList<int>() << 2 << 4);
-    }
-    {
-        QLinkedList<int> linkedList2 = QtConcurrent::blockingFilteredReduced(linkedList.constBegin(),
-                                                                             linkedList.constEnd(),
-                                                                             keepEvenIntegers,
-                                                                             &QLinkedList<int>::append,
-                                                                             QtConcurrent::OrderedReduce);
-        QCOMPARE(linkedList2, QLinkedList<int>() << 2 << 4);
-    }
-
-    // member-function
-    {
-        int sum = QtConcurrent::filteredReduced(numberLinkedList, &Number::isEven, numberSumReduce);
-        QCOMPARE(sum, 6);
-
-        int sum2 = QtConcurrent::filteredReduced(QLinkedList<Number>(numberLinkedList),
-                                                 &Number::isEven,
-                                                 numberSumReduce);
-        QCOMPARE(sum2, 6);
-    }
-    {
-        int sum = QtConcurrent::filteredReduced(numberLinkedList.begin(),
-                                                numberLinkedList.end(),
-                                                &Number::isEven,
-                                                numberSumReduce);
-        QCOMPARE(sum, 6);
-    }
-    {
-        int sum = QtConcurrent::filteredReduced(numberLinkedList.constBegin(),
-                                                numberLinkedList.constEnd(),
-                                                &Number::isEven,
-                                                numberSumReduce);
-        QCOMPARE(sum, 6);
-    }
-    {
-        int sum = QtConcurrent::blockingFilteredReduced(numberLinkedList, &Number::isEven, numberSumReduce);
-        QCOMPARE(sum, 6);
-
-        int sum2 = QtConcurrent::blockingFilteredReduced(QLinkedList<Number>(numberLinkedList),
-                                                         &Number::isEven,
-                                                         numberSumReduce);
-        QCOMPARE(sum2, 6);
-    }
-    {
-        int sum = QtConcurrent::blockingFilteredReduced(numberLinkedList.begin(),
-                                                        numberLinkedList.end(),
-                                                        &Number::isEven,
-                                                        numberSumReduce);
-        QCOMPARE(sum, 6);
-    }
-    {
-        int sum = QtConcurrent::blockingFilteredReduced(numberLinkedList.constBegin(),
-                                                        numberLinkedList.constEnd(),
-                                                        &Number::isEven,
-                                                        numberSumReduce);
-        QCOMPARE(sum, 6);
-    }
-
     // ### the same as above, with an initial result value
 }
 
diff --git a/tests/auto/concurrent/qtconcurrentiteratekernel/CMakeLists.txt b/tests/auto/concurrent/qtconcurrentiteratekernel/CMakeLists.txt
new file mode 100644
index 0000000000..af44d66642
--- /dev/null
+++ b/tests/auto/concurrent/qtconcurrentiteratekernel/CMakeLists.txt
@@ -0,0 +1,12 @@
+# Generated from qtconcurrentiteratekernel.pro.
+
+#####################################################################
+## tst_qtconcurrentiteratekernel Test:
+#####################################################################
+
+add_qt_test(tst_qtconcurrentiteratekernel
+    SOURCES
+        tst_qtconcurrentiteratekernel.cpp
+    PUBLIC_LIBRARIES
+        Qt::Concurrent
+)
diff --git a/tests/auto/concurrent/qtconcurrentmap/.prev_CMakeLists.txt b/tests/auto/concurrent/qtconcurrentmap/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..be51bf09bd
--- /dev/null
+++ b/tests/auto/concurrent/qtconcurrentmap/.prev_CMakeLists.txt
@@ -0,0 +1,17 @@
+# Generated from qtconcurrentmap.pro.
+
+#####################################################################
+## tst_qtconcurrentmap Test:
+#####################################################################
+
+add_qt_test(tst_qtconcurrentmap
+    SOURCES
+        tst_qtconcurrentmap.cpp
+    DEFINES
+        -QT_NO_LINKED_LIST
+    PUBLIC_LIBRARIES
+        Qt::Concurrent
+)
+
+## Scopes:
+#####################################################################
diff --git a/tests/auto/concurrent/qtconcurrentmap/CMakeLists.txt b/tests/auto/concurrent/qtconcurrentmap/CMakeLists.txt
new file mode 100644
index 0000000000..8ae79db0cf
--- /dev/null
+++ b/tests/auto/concurrent/qtconcurrentmap/CMakeLists.txt
@@ -0,0 +1,18 @@
+# Generated from qtconcurrentmap.pro.
+
+#####################################################################
+## tst_qtconcurrentmap Test:
+#####################################################################
+
+add_qt_test(tst_qtconcurrentmap
+    SOURCES
+        tst_qtconcurrentmap.cpp
+    DEFINES
+        # -QT_NO_LINKED_LIST # special case remove until we figure this out
+        QT_STRICT_ITERATORS
+    PUBLIC_LIBRARIES
+        Qt::Concurrent
+)
+
+## Scopes:
+#####################################################################
diff --git a/tests/auto/concurrent/qtconcurrentmap/qtconcurrentmap.pro b/tests/auto/concurrent/qtconcurrentmap/qtconcurrentmap.pro
index 717d103e44..bbadd1ada1 100644
--- a/tests/auto/concurrent/qtconcurrentmap/qtconcurrentmap.pro
+++ b/tests/auto/concurrent/qtconcurrentmap/qtconcurrentmap.pro
@@ -2,8 +2,6 @@ CONFIG += testcase
 TARGET = tst_qtconcurrentmap
 QT = core testlib concurrent
 SOURCES = tst_qtconcurrentmap.cpp
-DEFINES += QT_STRICT_ITERATORS
-DEFINES -= QT_NO_LINKED_LIST
 
 # Force C++17 if available
 contains(QT_CONFIG, c++1z): CONFIG += c++1z
diff --git a/tests/auto/concurrent/qtconcurrentmap/tst_qtconcurrentmap.cpp b/tests/auto/concurrent/qtconcurrentmap/tst_qtconcurrentmap.cpp
index 383de0b2ce..fbcac35fee 100644
--- a/tests/auto/concurrent/qtconcurrentmap/tst_qtconcurrentmap.cpp
+++ b/tests/auto/concurrent/qtconcurrentmap/tst_qtconcurrentmap.cpp
@@ -164,38 +164,6 @@ void tst_QtConcurrentMap::map()
         QCOMPARE(list, QList<int>() << 1 << 2 << 3);
     }
 
-    // Linked lists and forward iterators
-    {
-        QLinkedList<int> list;
-        list << 1 << 2 << 3;
-
-        // functor
-        QtConcurrent::map(list, MultiplyBy2InPlace()).waitForFinished();
-        QCOMPARE(list, QLinkedList<int>() << 2 << 4 << 6);
-        QtConcurrent::map(list.begin(), list.end(), MultiplyBy2InPlace()).waitForFinished();
-        QCOMPARE(list, QLinkedList<int>() << 4 << 8 << 12);
-
-        // function
-        QtConcurrent::map(list, multiplyBy2InPlace).waitForFinished();
-        QCOMPARE(list, QLinkedList<int>() << 8 << 16 << 24);
-        QtConcurrent::map(list.begin(), list.end(), multiplyBy2InPlace).waitForFinished();
-        QCOMPARE(list, QLinkedList<int>() << 16 << 32 << 48);
-
-        // bound function
-        QtConcurrent::map(list, multiplyBy2InPlace).waitForFinished();
-        QCOMPARE(list, QLinkedList<int>() << 32 << 64 << 96);
-        QtConcurrent::map(list.begin(), list.end(), multiplyBy2InPlace).waitForFinished();
-        QCOMPARE(list, QLinkedList<int>() << 64 << 128 << 192);
-
-        // member function
-        QLinkedList<Number> numberList;
-        numberList << 1 << 2 << 3;
-        QtConcurrent::map(numberList, &Number::multiplyBy2).waitForFinished();
-        QCOMPARE(numberList, QLinkedList<Number>() << 2 << 4 << 6);
-        QtConcurrent::map(numberList.begin(), numberList.end(), &Number::multiplyBy2).waitForFinished();
-        QCOMPARE(numberList, QLinkedList<Number>() << 4 << 8 << 12);
-    }
-
 #if 0
     // not allowed: map() with immutable sequences makes no sense
     {
@@ -296,38 +264,6 @@ void tst_QtConcurrentMap::blocking_map()
         QCOMPARE(list, QList<int>() << 1 << 2 << 3);
     }
 
-    // Linked lists and forward iterators
-    {
-        QLinkedList<int> list;
-        list << 1 << 2 << 3;
-
-        // functor
-        QtConcurrent::blockingMap(list, MultiplyBy2InPlace());
-        QCOMPARE(list, QLinkedList<int>() << 2 << 4 << 6);
-        QtConcurrent::blockingMap(list.begin(), list.end(), MultiplyBy2InPlace());
-        QCOMPARE(list, QLinkedList<int>() << 4 << 8 << 12);
-
-        // function
-        QtConcurrent::blockingMap(list, multiplyBy2InPlace);
-        QCOMPARE(list, QLinkedList<int>() << 8 << 16 << 24);
-        QtConcurrent::blockingMap(list.begin(), list.end(), multiplyBy2InPlace);
-        QCOMPARE(list, QLinkedList<int>() << 16 << 32 << 48);
-
-        // bound function
-        QtConcurrent::blockingMap(list, multiplyBy2InPlace);
-        QCOMPARE(list, QLinkedList<int>() << 32 << 64 << 96);
-        QtConcurrent::blockingMap(list.begin(), list.end(), multiplyBy2InPlace);
-        QCOMPARE(list, QLinkedList<int>() << 64 << 128 << 192);
-
-        // member function
-        QLinkedList<Number> numberList;
-        numberList << 1 << 2 << 3;
-        QtConcurrent::blockingMap(numberList, &Number::multiplyBy2);
-        QCOMPARE(numberList, QLinkedList<Number>() << 2 << 4 << 6);
-        QtConcurrent::blockingMap(numberList.begin(), numberList.end(), &Number::multiplyBy2);
-        QCOMPARE(numberList, QLinkedList<Number>() << 4 << 8 << 12);
-    }
-
 #if 0
     // not allowed: map() with immutable sequences makes no sense
     {
@@ -424,12 +360,8 @@ void tst_QtConcurrentMap::mapped()
 {
     QList<int> list;
     list << 1 << 2 << 3;
-    QLinkedList<int> linkedList;
-    linkedList << 1 << 2 << 3;
     QList<Number> numberList;
     numberList << 1 << 2 << 3;
-    QLinkedList<Number> numberLinkedList;
-    numberLinkedList << 1 << 2 << 3;
 
     // functor
     {
@@ -447,22 +379,6 @@ void tst_QtConcurrentMap::mapped()
         QCOMPARE(list, QList<int>() << 1 << 2 << 3);
         QCOMPARE(list4, QList<int>() << 2 << 4 << 6);
     }
-    {
-        QList<int> list2 = QtConcurrent::mapped(linkedList, MultiplyBy2()).results();
-        QCOMPARE(linkedList, QLinkedList<int>() << 1 << 2 << 3);
-        QCOMPARE(list2, QList<int>() << 2 << 4 << 6);
-
-        QList<int> list3 = QtConcurrent::mapped(linkedList.constBegin(),
-                                                linkedList.constEnd(),
-                                                MultiplyBy2()).results();
-        QCOMPARE(linkedList, QLinkedList<int>() << 1 << 2 << 3);
-        QCOMPARE(list3, QList<int>() << 2 << 4 << 6);
-
-        QList<int> list4 =
-            QtConcurrent::mapped(QLinkedList<int>(linkedList), MultiplyBy2()).results();
-        QCOMPARE(linkedList, QLinkedList<int>() << 1 << 2 << 3);
-        QCOMPARE(list4, QList<int>() << 2 << 4 << 6);
-    }
 
     // function
     {
@@ -480,22 +396,6 @@ void tst_QtConcurrentMap::mapped()
         QCOMPARE(list, QList<int>() << 1 << 2 << 3);
         QCOMPARE(list4, QList<int>() << 2 << 4 << 6);
     }
-    {
-        QList<int> list2 = QtConcurrent::mapped(linkedList, multiplyBy2).results();
-        QCOMPARE(linkedList, QLinkedList<int>() << 1 << 2 << 3);
-        QCOMPARE(list2, QList<int>() << 2 << 4 << 6);
-
-        QList<int> list3 = QtConcurrent::mapped(linkedList.constBegin(),
-                                                linkedList.constEnd(),
-                                                multiplyBy2).results();
-        QCOMPARE(linkedList, QLinkedList<int>() << 1 << 2 << 3);
-        QCOMPARE(list3, QList<int>() << 2 << 4 << 6);
-
-        QList<int> list4 =
-            QtConcurrent::mapped(QLinkedList<int>(linkedList), multiplyBy2).results();
-        QCOMPARE(linkedList, QLinkedList<int>() << 1 << 2 << 3);
-        QCOMPARE(list4, QList<int>() << 2 << 4 << 6);
-    }
 
     // bound function
     {
@@ -513,23 +413,6 @@ void tst_QtConcurrentMap::mapped()
         QCOMPARE(list, QList<int>() << 1 << 2 << 3);
         QCOMPARE(list4, QList<int>() << 2 << 4 << 6);
     }
-    {
-        QList<int> list2 = QtConcurrent::mapped(linkedList, multiplyBy2).results();
-        QCOMPARE(linkedList, QLinkedList<int>() << 1 << 2 << 3);
-        QCOMPARE(list2, QList<int>() << 2 << 4 << 6);
-
-        QList<int> list3 = QtConcurrent::mapped(linkedList.constBegin(),
-                                                linkedList.constEnd(),
-                                                multiplyBy2)
-                           .results();
-        QCOMPARE(linkedList, QLinkedList<int>() << 1 << 2 << 3);
-        QCOMPARE(list3, QList<int>() << 2 << 4 << 6);
-
-        QList<int> list4 = QtConcurrent::mapped(QLinkedList<int>(linkedList), multiplyBy2)
-                           .results();
-        QCOMPARE(linkedList, QLinkedList<int>() << 1 << 2 << 3);
-        QCOMPARE(list4, QList<int>() << 2 << 4 << 6);
-    }
 
     // const member function
     {
@@ -551,25 +434,6 @@ void tst_QtConcurrentMap::mapped()
         QCOMPARE(numberList, QList<Number>() << 1 << 2 << 3);
         QCOMPARE(numberList4, QList<Number>() << 2 << 4 << 6);
     }
-    {
-        QList<Number> numberList2 = QtConcurrent::mapped(numberLinkedList, &Number::multipliedBy2)
-                                    .results();
-        QCOMPARE(numberLinkedList, QLinkedList<Number>() << 1 << 2 << 3);
-        QCOMPARE(numberList2, QList<Number>() << 2 << 4 << 6);
-
-        QList<Number> numberList3 = QtConcurrent::mapped(numberLinkedList.constBegin(),
-                                                         numberLinkedList.constEnd(),
-                                                         &Number::multipliedBy2)
-                                    .results();
-        QCOMPARE(numberLinkedList, QLinkedList<Number>() << 1 << 2 << 3);
-        QCOMPARE(numberList3, QList<Number>() << 2 << 4 << 6);
-
-        QList<Number> numberList4 = QtConcurrent::mapped(QLinkedList<Number>(numberLinkedList),
-                                                         &Number::multipliedBy2)
-                                    .results();
-        QCOMPARE(numberLinkedList, QLinkedList<Number>() << 1 << 2 << 3);
-        QCOMPARE(numberList4, QList<Number>() << 2 << 4 << 6);
-    }
 
     // change the value_type, same container
 
@@ -592,24 +456,6 @@ void tst_QtConcurrentMap::mapped()
         QCOMPARE(list, QList<int>() << 1 << 2 << 3);
         QCOMPARE(list4, QList<double>() << 1.0 << 2.0 << 3.0);
     }
-    {
-        QList<double> list2 = QtConcurrent::mapped(linkedList, IntToDouble()).results();
-        QCOMPARE(linkedList, QLinkedList<int>() << 1 << 2 << 3);
-        QCOMPARE(list2, QList<double>() << 1.0 << 2.0 << 3.0);
-
-        QList<double> list3 = QtConcurrent::mapped(linkedList.constBegin(),
-                                                   linkedList.constEnd(),
-                                                   IntToDouble())
-                              .results();
-        QCOMPARE(linkedList, QLinkedList<int>() << 1 << 2 << 3);
-        QCOMPARE(list3, QList<double>() << 1.0 << 2.0 << 3.0);
-
-        QList<double> list4 = QtConcurrent::mapped(QLinkedList<int>(linkedList),
-                                                   IntToDouble())
-                              .results();
-        QCOMPARE(linkedList, QLinkedList<int>() << 1 << 2 << 3);
-        QCOMPARE(list4, QList<double>() << 1.0 << 2.0 << 3.0);
-    }
 
     // function
     {
@@ -628,23 +474,6 @@ void tst_QtConcurrentMap::mapped()
         QCOMPARE(list, QList<int>() << 1 << 2 << 3);
         QCOMPARE(list4, QList<double>() << 1.0 << 2.0 << 3.0);
     }
-    {
-        QList<double> list2 = QtConcurrent::mapped(linkedList, intToDouble).results();
-        QCOMPARE(linkedList, QLinkedList<int>() << 1 << 2 << 3);
-        QCOMPARE(list2, QList<double>() << 1.0 << 2.0 << 3.0);
-
-        QList<double> list3 = QtConcurrent::mapped(linkedList.constBegin(),
-                                                   linkedList.constEnd(),
-                                                   intToDouble)
-                              .results();
-        QCOMPARE(linkedList, QLinkedList<int>() << 1 << 2 << 3);
-        QCOMPARE(list3, QList<double>() << 1.0 << 2.0 << 3.0);
-
-        QList<double> list4 = QtConcurrent::mapped(QLinkedList<int>(linkedList), intToDouble)
-                              .results();
-        QCOMPARE(linkedList, QLinkedList<int>() << 1 << 2 << 3);
-        QCOMPARE(list4, QList<double>() << 1.0 << 2.0 << 3.0);
-    }
 
     // bound function
     {
@@ -666,25 +495,6 @@ void tst_QtConcurrentMap::mapped()
         QCOMPARE(list, QList<int>() << 1 << 2 << 3);
         QCOMPARE(list4, QList<double>() << 1.0 << 2.0 << 3.0);
     }
-    {
-        QList<double> list2 = QtConcurrent::mapped(linkedList, intToDouble).results();
-        QCOMPARE(linkedList, QLinkedList<int>() << 1 << 2 << 3);
-        QCOMPARE(list2, QList<double>() << 1.0 << 2.0 << 3.0);
-
-        QList<double> list3 = QtConcurrent::mapped(linkedList.constBegin(),
-                                                   linkedList.constEnd(),
-                                                   intToDouble)
-                              .results();
-        QCOMPARE(linkedList, QLinkedList<int>() << 1 << 2 << 3);
-        QCOMPARE(list3, QList<double>() << 1.0 << 2.0 << 3.0);
-
-
-        QList<double> list4 = QtConcurrent::mapped(QLinkedList<int>(linkedList),
-                                                   intToDouble)
-                              .results();
-        QCOMPARE(linkedList, QLinkedList<int>() << 1 << 2 << 3);
-        QCOMPARE(list4, QList<double>() << 1.0 << 2.0 << 3.0);
-    }
 
     // const member function
     {
@@ -704,24 +514,6 @@ void tst_QtConcurrentMap::mapped()
         QCOMPARE(list, QList<int>() << 1 << 2 << 3);
         QCOMPARE(list4, QList<QString>() << "1" << "2" << "3");
     }
-    {
-        QList<QString> list2 = QtConcurrent::mapped(numberLinkedList, &Number::toString).results();
-        QCOMPARE(linkedList, QLinkedList<int>() << 1 << 2 << 3);
-        QCOMPARE(list2, QList<QString>() << "1" << "2" << "3");
-
-        QList<QString> list3 = QtConcurrent::mapped(numberLinkedList.constBegin(),
-                                                    numberLinkedList.constEnd(),
-                                                    &Number::toString)
-                               .results();
-        QCOMPARE(linkedList, QLinkedList<int>() << 1 << 2 << 3);
-        QCOMPARE(list3, QList<QString>() << "1" << "2" << "3");
-
-        QList<QString> list4 = QtConcurrent::mapped(QLinkedList<Number>(numberLinkedList),
-                                                    &Number::toString)
-                               .results();
-        QCOMPARE(linkedList, QLinkedList<int>() << 1 << 2 << 3);
-        QCOMPARE(list4, QList<QString>() << "1" << "2" << "3");
-    }
 
     // change the value_type
     {
@@ -786,12 +578,8 @@ void tst_QtConcurrentMap::blocking_mapped()
 {
     QList<int> list;
     list << 1 << 2 << 3;
-    QLinkedList<int> linkedList;
-    linkedList << 1 << 2 << 3;
     QList<Number> numberList;
     numberList << 1 << 2 << 3;
-    QLinkedList<Number> numberLinkedList;
-    numberLinkedList << 1 << 2 << 3;
 
     // functor
     {
@@ -809,21 +597,6 @@ void tst_QtConcurrentMap::blocking_mapped()
         QCOMPARE(list, QList<int>() << 1 << 2 << 3);
         QCOMPARE(list4, QList<int>() << 2 << 4 << 6);
     }
-    {
-        QLinkedList<int> linkedList2 = QtConcurrent::blockingMapped(linkedList, MultiplyBy2());
-        QCOMPARE(linkedList, QLinkedList<int>() << 1 << 2 << 3);
-        QCOMPARE(linkedList2, QLinkedList<int>() << 2 << 4 << 6);
-
-        QLinkedList<int> linkedList3 = QtConcurrent::blockingMapped<QLinkedList<int> >(linkedList.constBegin(),
-                                                                       linkedList.constEnd(),
-                                                                       MultiplyBy2());
-        QCOMPARE(linkedList, QLinkedList<int>() << 1 << 2 << 3);
-        QCOMPARE(linkedList3, QLinkedList<int>() << 2 << 4 << 6);
-
-        QLinkedList<int> linkedList4 = QtConcurrent::blockingMapped(QLinkedList<int>(linkedList), MultiplyBy2());
-        QCOMPARE(linkedList, QLinkedList<int>() << 1 << 2 << 3);
-        QCOMPARE(linkedList4, QLinkedList<int>() << 2 << 4 << 6);
-    }
 
     // function
     {
@@ -841,21 +614,6 @@ void tst_QtConcurrentMap::blocking_mapped()
         QCOMPARE(list, QList<int>() << 1 << 2 << 3);
         QCOMPARE(list4, QList<int>() << 2 << 4 << 6);
     }
-    {
-        QLinkedList<int> linkedList2 = QtConcurrent::blockingMapped(linkedList, multiplyBy2);
-        QCOMPARE(linkedList, QLinkedList<int>() << 1 << 2 << 3);
-        QCOMPARE(linkedList2, QLinkedList<int>() << 2 << 4 << 6);
-
-        QLinkedList<int> linkedList3 = QtConcurrent::blockingMapped<QLinkedList<int> >(linkedList.constBegin(),
-                                                             linkedList.constEnd(),
-                                                             multiplyBy2);
-        QCOMPARE(linkedList, QLinkedList<int>() << 1 << 2 << 3);
-        QCOMPARE(linkedList3, QLinkedList<int>() << 2 << 4 << 6);
-
-        QLinkedList<int> linkedList4 = QtConcurrent::blockingMapped(QLinkedList<int>(linkedList), multiplyBy2);
-        QCOMPARE(linkedList, QLinkedList<int>() << 1 << 2 << 3);
-        QCOMPARE(linkedList4, QLinkedList<int>() << 2 << 4 << 6);
-    }
 
     // bound function
     {
@@ -873,21 +631,6 @@ void tst_QtConcurrentMap::blocking_mapped()
         QCOMPARE(list, QList<int>() << 1 << 2 << 3);
         QCOMPARE(list4, QList<int>() << 2 << 4 << 6);
     }
-    {
-        QLinkedList<int> linkedList2 = QtConcurrent::blockingMapped(linkedList, multiplyBy2);
-        QCOMPARE(linkedList, QLinkedList<int>() << 1 << 2 << 3);
-        QCOMPARE(linkedList2, QLinkedList<int>() << 2 << 4 << 6);
-
-        QLinkedList<int> linkedList3 = QtConcurrent::blockingMapped<QLinkedList<int> >(linkedList.constBegin(),
-                                                             linkedList.constEnd(),
-                                                             multiplyBy2);
-        QCOMPARE(linkedList, QLinkedList<int>() << 1 << 2 << 3);
-        QCOMPARE(linkedList3, QLinkedList<int>() << 2 << 4 << 6);
-
-        QLinkedList<int> linkedList4 = QtConcurrent::blockingMapped(QLinkedList<int>(linkedList), multiplyBy2);
-        QCOMPARE(linkedList, QLinkedList<int>() << 1 << 2 << 3);
-        QCOMPARE(linkedList4, QLinkedList<int>() << 2 << 4 << 6);
-    }
 
     // const member function
     {
@@ -906,22 +649,6 @@ void tst_QtConcurrentMap::blocking_mapped()
         QCOMPARE(numberList, QList<Number>() << 1 << 2 << 3);
         QCOMPARE(numberList4, QList<Number>() << 2 << 4 << 6);
     }
-    {
-        QLinkedList<Number> numberLinkedList2 = QtConcurrent::blockingMapped(numberLinkedList, &Number::multipliedBy2);
-        QCOMPARE(numberLinkedList, QLinkedList<Number>() << 1 << 2 << 3);
-        QCOMPARE(numberLinkedList2, QLinkedList<Number>() << 2 << 4 << 6);
-
-        QLinkedList<Number> numberLinkedList3 = QtConcurrent::blockingMapped<QLinkedList<Number> >(numberLinkedList.constBegin(),
-                                                                         numberLinkedList.constEnd(),
-                                                                         &Number::multipliedBy2);
-        QCOMPARE(numberLinkedList, QLinkedList<Number>() << 1 << 2 << 3);
-        QCOMPARE(numberLinkedList3, QLinkedList<Number>() << 2 << 4 << 6);
-
-        QLinkedList<Number> numberLinkedList4 = QtConcurrent::blockingMapped(QLinkedList<Number>(numberLinkedList),
-                                                         &Number::multipliedBy2);
-        QCOMPARE(numberLinkedList, QLinkedList<Number>() << 1 << 2 << 3);
-        QCOMPARE(numberLinkedList4, QLinkedList<Number>() << 2 << 4 << 6);
-    }
 
     // change the value_type, same container
 
@@ -942,22 +669,6 @@ void tst_QtConcurrentMap::blocking_mapped()
         QCOMPARE(list, QList<int>() << 1 << 2 << 3);
         QCOMPARE(list4, QList<double>() << 1.0 << 2.0 << 3.0);
     }
-    {
-        QLinkedList<double> linkedList2 = QtConcurrent::blockingMapped<QLinkedList<double> >(linkedList, IntToDouble());
-        QCOMPARE(linkedList, QLinkedList<int>() << 1 << 2 << 3);
-        QCOMPARE(linkedList2, QLinkedList<double>() << 1.0 << 2.0 << 3.0);
-
-        QLinkedList<double> linkedList3 = QtConcurrent::blockingMapped<QLinkedList<double> >(linkedList.constBegin(),
-                                                                   linkedList.constEnd(),
-                                                                   IntToDouble());
-        QCOMPARE(linkedList, QLinkedList<int>() << 1 << 2 << 3);
-        QCOMPARE(linkedList3, QLinkedList<double>() << 1.0 << 2.0 << 3.0);
-
-        QLinkedList<double> linkedList4 = QtConcurrent::blockingMapped<QLinkedList<double> >(QLinkedList<int>(linkedList),
-                                                                   IntToDouble());
-        QCOMPARE(linkedList, QLinkedList<int>() << 1 << 2 << 3);
-        QCOMPARE(linkedList4, QLinkedList<double>() << 1.0 << 2.0 << 3.0);
-    }
 
     // function
     {
@@ -975,21 +686,6 @@ void tst_QtConcurrentMap::blocking_mapped()
         QCOMPARE(list, QList<int>() << 1 << 2 << 3);
         QCOMPARE(list4, QList<double>() << 1.0 << 2.0 << 3.0);
     }
-    {
-        QLinkedList<double> linkedList2 = QtConcurrent::blockingMapped<QLinkedList<double> >(linkedList, intToDouble);
-        QCOMPARE(linkedList, QLinkedList<int>() << 1 << 2 << 3);
-        QCOMPARE(linkedList2, QLinkedList<double>() << 1.0 << 2.0 << 3.0);
-
-        QLinkedList<double> linkedList3 = QtConcurrent::blockingMapped<QLinkedList<double> >(linkedList.constBegin(),
-                                                                   linkedList.constEnd(),
-                                                                   intToDouble);
-        QCOMPARE(linkedList, QLinkedList<int>() << 1 << 2 << 3);
-        QCOMPARE(linkedList3, QLinkedList<double>() << 1.0 << 2.0 << 3.0);
-
-        QLinkedList<double> linkedList4 = QtConcurrent::blockingMapped<QLinkedList<double> >(QLinkedList<int>(linkedList), intToDouble);
-        QCOMPARE(linkedList, QLinkedList<int>() << 1 << 2 << 3);
-        QCOMPARE(linkedList4, QLinkedList<double>() << 1.0 << 2.0 << 3.0);
-    }
 
     // bound function
     {
@@ -1009,23 +705,6 @@ void tst_QtConcurrentMap::blocking_mapped()
         QCOMPARE(list, QList<int>() << 1 << 2 << 3);
         QCOMPARE(list4, QList<double>() << 1.0 << 2.0 << 3.0);
     }
-    {
-        QLinkedList<double> linkedList2 = QtConcurrent::blockingMapped<QLinkedList<double> >(linkedList, intToDouble);
-        QCOMPARE(linkedList, QLinkedList<int>() << 1 << 2 << 3);
-        QCOMPARE(linkedList2, QLinkedList<double>() << 1.0 << 2.0 << 3.0);
-
-        QLinkedList<double> linkedList3 = QtConcurrent::blockingMapped<QLinkedList<double> >(linkedList.constBegin(),
-                                                                   linkedList.constEnd(),
-                                                                   intToDouble);
-        QCOMPARE(linkedList, QLinkedList<int>() << 1 << 2 << 3);
-        QCOMPARE(linkedList3, QLinkedList<double>() << 1.0 << 2.0 << 3.0);
-
-
-        QLinkedList<double> linkedList4 = QtConcurrent::blockingMapped<QLinkedList<double> >(QLinkedList<int>(linkedList),
-                                                                   intToDouble);
-        QCOMPARE(linkedList, QLinkedList<int>() << 1 << 2 << 3);
-        QCOMPARE(linkedList4, QLinkedList<double>() << 1.0 << 2.0 << 3.0);
-    }
 
     // const member function
     {
@@ -1045,23 +724,6 @@ void tst_QtConcurrentMap::blocking_mapped()
         QCOMPARE(list, QList<int>() << 1 << 2 << 3);
         QCOMPARE(list4, QList<QString>() << "1" << "2" << "3");
     }
-    {
-        QLinkedList<QString> linkedList2 =
-            QtConcurrent::blockingMapped<QLinkedList<QString> >(numberLinkedList, &Number::toString);
-        QCOMPARE(linkedList, QLinkedList<int>() << 1 << 2 << 3);
-        QCOMPARE(linkedList2, QLinkedList<QString>() << "1" << "2" << "3");
-
-        QLinkedList<QString> linkedList3 = QtConcurrent::blockingMapped<QLinkedList<QString> >(numberLinkedList.constBegin(),
-                                                                     numberLinkedList.constEnd()
-                                                                     , &Number::toString);
-        QCOMPARE(linkedList, QLinkedList<int>() << 1 << 2 << 3);
-        QCOMPARE(linkedList3, QLinkedList<QString>() << "1" << "2" << "3");
-
-        QLinkedList<QString> linkedList4 =
-            QtConcurrent::blockingMapped<QLinkedList<QString> >(QLinkedList<Number>(numberLinkedList), &Number::toString);
-        QCOMPARE(linkedList, QLinkedList<int>() << 1 << 2 << 3);
-        QCOMPARE(linkedList4, QLinkedList<QString>() << "1" << "2" << "3");
-    }
 
     // change the value_type
     {
@@ -1240,12 +902,8 @@ void tst_QtConcurrentMap::mappedReduced()
 {
     QList<int> list;
     list << 1 << 2 << 3;
-    QLinkedList<int> linkedList;
-    linkedList << 1 << 2 << 3;
     QList<Number> numberList;
     numberList << 1 << 2 << 3;
-    QLinkedList<Number> numberLinkedList;
-    numberLinkedList << 1 << 2 << 3;
 
     // test Q_DECLARE_OPERATORS_FOR_FLAGS
     QtConcurrent::ReduceOptions opt = (QtConcurrent::UnorderedReduce | QtConcurrent::SequentialReduce);
@@ -1277,31 +935,6 @@ void tst_QtConcurrentMap::mappedReduced()
                                                     intSumReduce);
         QCOMPARE(sum6, 14);
     }
-    {
-        int sum = QtConcurrent::mappedReduced<int>(linkedList, IntSquare(), IntSumReduce());
-        QCOMPARE(sum, 14);
-        int sum2 = QtConcurrent::mappedReduced<int>(linkedList.constBegin(),
-                                                    linkedList.constEnd(),
-                                                    IntSquare(),
-                                                    IntSumReduce());
-        QCOMPARE(sum2, 14);
-
-        int sum3 = QtConcurrent::mappedReduced<int>(QLinkedList<int>(linkedList), IntSquare(), IntSumReduce());
-        QCOMPARE(sum3, 14);
-
-        int sum4 = QtConcurrent::mappedReduced<int>(linkedList, intSquare, intSumReduce);
-        QCOMPARE(sum4, 14);
-        int sum5 = QtConcurrent::mappedReduced<int>(linkedList.constBegin(),
-                                                    linkedList.constEnd(),
-                                                    intSquare,
-                                                    intSumReduce);
-        QCOMPARE(sum5, 14);
-
-        int sum6 = QtConcurrent::mappedReduced<int>(QLinkedList<int>(linkedList),
-                                                    intSquare,
-                                                    intSumReduce);
-        QCOMPARE(sum6, 14);
-    }
 
     // function-functor
     {
@@ -1316,18 +949,6 @@ void tst_QtConcurrentMap::mappedReduced()
         int sum3 = QtConcurrent::mappedReduced<int>(QList<int>(list), intSquare, IntSumReduce());
         QCOMPARE(sum3, 14);
     }
-    {
-        int sum = QtConcurrent::mappedReduced<int>(linkedList, intSquare, IntSumReduce());
-        QCOMPARE(sum, 14);
-        int sum2 = QtConcurrent::mappedReduced<int>(linkedList.constBegin(),
-                                                    linkedList.constEnd(),
-                                                    intSquare,
-                                                    IntSumReduce());
-        QCOMPARE(sum2, 14);
-
-        int sum3 = QtConcurrent::mappedReduced<int>(QLinkedList<int>(linkedList), intSquare, IntSumReduce());
-        QCOMPARE(sum3, 14);
-    }
 
     // functor-function
     {
@@ -1342,18 +963,6 @@ void tst_QtConcurrentMap::mappedReduced()
         int sum3 = QtConcurrent::mappedReduced(QList<int>(list), IntSquare(), intSumReduce);
         QCOMPARE(sum3, 14);
     }
-    {
-        int sum = QtConcurrent::mappedReduced(linkedList, IntSquare(), intSumReduce);
-        QCOMPARE(sum, 14);
-        int sum2 = QtConcurrent::mappedReduced(linkedList.constBegin(),
-                                               linkedList.constEnd(),
-                                               IntSquare(),
-                                               intSumReduce);
-        QCOMPARE(sum2, 14);
-
-        int sum3 = QtConcurrent::mappedReduced(QLinkedList<int>(linkedList), IntSquare(), intSumReduce);
-        QCOMPARE(sum3, 14);
-    }
 
     // function-function
     {
@@ -1368,24 +977,14 @@ void tst_QtConcurrentMap::mappedReduced()
         int sum3 = QtConcurrent::mappedReduced(QList<int>(list), intSquare, intSumReduce);
         QCOMPARE(sum3, 14);
     }
-    {
-        int sum = QtConcurrent::mappedReduced(linkedList, intSquare, intSumReduce);
-        QCOMPARE(sum, 14);
-        int sum2 = QtConcurrent::mappedReduced(linkedList.constBegin(),
-                                               linkedList.constEnd(),
-                                               intSquare,
-                                               intSumReduce);
-        QCOMPARE(sum2, 14);
 
-        int sum3 = QtConcurrent::mappedReduced(QLinkedList<int>(linkedList), intSquare, intSumReduce);
-        QCOMPARE(sum3, 14);
-    }
+    auto push_back = static_cast<void (QVector<int>::*)(const int &)>(&QVector<int>::push_back);
 
     // functor-member
     {
         QList<int> list2 = QtConcurrent::mappedReduced(list,
                                                        IntSquare(),
-                                                       &QList<int>::push_back,
+                                                       push_back,
                                                        OrderedReduce);
         QCOMPARE(list, QList<int>() << 1 << 2 << 3);
         QCOMPARE(list2, QList<int>() << 1 << 4 << 9);
@@ -1393,41 +992,18 @@ void tst_QtConcurrentMap::mappedReduced()
         QList<int> list3 = QtConcurrent::mappedReduced(list.constBegin(),
                                                        list.constEnd(),
                                                        IntSquare(),
-                                                       &QList<int>::push_back,
+                                                       push_back,
                                                        OrderedReduce);
         QCOMPARE(list, QList<int>() << 1 << 2 << 3);
         QCOMPARE(list3, QList<int>() << 1 << 4 << 9);
 
         QList<int> list4 = QtConcurrent::mappedReduced(QList<int>(list),
                                                        IntSquare(),
-                                                       &QList<int>::push_back,
+                                                       push_back,
                                                        OrderedReduce);
         QCOMPARE(list, QList<int>() << 1 << 2 << 3);
         QCOMPARE(list4, QList<int>() << 1 << 4 << 9);
     }
-    {
-        QLinkedList<int> linkedList2 = QtConcurrent::mappedReduced(linkedList,
-                                                       IntSquare(),
-                                                       &QLinkedList<int>::push_back,
-                                                       OrderedReduce);
-        QCOMPARE(linkedList, QLinkedList<int>() << 1 << 2 << 3);
-        QCOMPARE(linkedList2, QLinkedList<int>() << 1 << 4 << 9);
-
-        QLinkedList<int> linkedList3 = QtConcurrent::mappedReduced(linkedList.constBegin(),
-                                                       linkedList.constEnd(),
-                                                       IntSquare(),
-                                                       &QLinkedList<int>::push_back,
-                                                       OrderedReduce);
-        QCOMPARE(linkedList, QLinkedList<int>() << 1 << 2 << 3);
-        QCOMPARE(linkedList3, QLinkedList<int>() << 1 << 4 << 9);
-
-        QLinkedList<int> linkedList4 = QtConcurrent::mappedReduced(QLinkedList<int>(linkedList),
-                                                       IntSquare(),
-                                                       &QLinkedList<int>::push_back,
-                                                       OrderedReduce);
-        QCOMPARE(linkedList, QLinkedList<int>() << 1 << 2 << 3);
-        QCOMPARE(linkedList4, QLinkedList<int>() << 1 << 4 << 9);
-    }
 
     // member-functor
     {
@@ -1444,66 +1020,33 @@ void tst_QtConcurrentMap::mappedReduced()
                                                     IntSumReduce());
         QCOMPARE(sum3, 6);
     }
-    {
-        int sum = QtConcurrent::mappedReduced<int>(numberLinkedList, &Number::toInt, IntSumReduce());
-        QCOMPARE(sum, 6);
-        int sum2 = QtConcurrent::mappedReduced<int>(numberLinkedList.constBegin(),
-                                                    numberLinkedList.constEnd(),
-                                                    &Number::toInt,
-                                                    IntSumReduce());
-        QCOMPARE(sum2, 6);
-
-        int sum3 = QtConcurrent::mappedReduced<int>(QLinkedList<Number>(numberLinkedList),
-                                                    &Number::toInt,
-                                                    IntSumReduce());
-        QCOMPARE(sum3, 6);
-    }
 
     // member-member
     {
         QList<int> list2 = QtConcurrent::mappedReduced(numberList,
                                                        &Number::toInt,
-                                                       &QList<int>::push_back,
+                                                       push_back,
                                                        OrderedReduce);
         QCOMPARE(list2, QList<int>() << 1 << 2 << 3);
 
         QList<int> list3 = QtConcurrent::mappedReduced(numberList.constBegin(),
                                                        numberList.constEnd(),
                                                        &Number::toInt,
-                                                       &QList<int>::push_back,
+                                                       push_back,
                                                        OrderedReduce);
         QCOMPARE(list3, QList<int>() << 1 << 2 << 3);
 
         QList<int> list4 = QtConcurrent::mappedReduced(QList<Number>(numberList),
                                                        &Number::toInt,
-                                                       &QList<int>::push_back, OrderedReduce);
+                                                       push_back, OrderedReduce);
         QCOMPARE(list4, QList<int>() << 1 << 2 << 3);
     }
-    {
-        QLinkedList<int> linkedList2 = QtConcurrent::mappedReduced(numberLinkedList,
-                                                       &Number::toInt,
-                                                       &QLinkedList<int>::push_back,
-                                                       OrderedReduce);
-        QCOMPARE(linkedList2, QLinkedList<int>() << 1 << 2 << 3);
-
-        QLinkedList<int> linkedList3 = QtConcurrent::mappedReduced(numberLinkedList.constBegin(),
-                                                       numberLinkedList.constEnd(),
-                                                       &Number::toInt,
-                                                       &QLinkedList<int>::push_back,
-                                                       OrderedReduce);
-        QCOMPARE(linkedList3, QLinkedList<int>() << 1 << 2 << 3);
-
-        QLinkedList<int> linkedList4 = QtConcurrent::mappedReduced(QLinkedList<Number>(numberLinkedList),
-                                                       &Number::toInt,
-                                                       &QLinkedList<int>::push_back, OrderedReduce);
-        QCOMPARE(linkedList4, QLinkedList<int>() << 1 << 2 << 3);
-    }
 
     // function-member
     {
         QList<int> list2 = QtConcurrent::mappedReduced(list,
                                                        intSquare,
-                                                       &QList<int>::push_back,
+                                                       push_back,
                                                        OrderedReduce);
         QCOMPARE(list, QList<int>() << 1 << 2 << 3);
         QCOMPARE(list2, QList<int>() << 1 << 4 << 9);
@@ -1511,41 +1054,18 @@ void tst_QtConcurrentMap::mappedReduced()
         QList<int> list3 = QtConcurrent::mappedReduced(list.constBegin(),
                                                        list.constEnd(),
                                                        intSquare,
-                                                       &QList<int>::push_back,
+                                                       push_back,
                                                        OrderedReduce);
         QCOMPARE(list, QList<int>() << 1 << 2 << 3);
         QCOMPARE(list3, QList<int>() << 1 << 4 << 9);
 
         QList<int> list4 = QtConcurrent::mappedReduced(QList<int>(list),
                                                        intSquare,
-                                                       &QList<int>::push_back,
+                                                       push_back,
                                                        OrderedReduce);
         QCOMPARE(list, QList<int>() << 1 << 2 << 3);
         QCOMPARE(list4, QList<int>() << 1 << 4 << 9);
     }
-    {
-        QLinkedList<int> linkedList2 = QtConcurrent::mappedReduced(linkedList,
-                                                       intSquare,
-                                                       &QLinkedList<int>::append,
-                                                       OrderedReduce);
-        QCOMPARE(linkedList, QLinkedList<int>() << 1 << 2 << 3);
-        QCOMPARE(linkedList2, QLinkedList<int>() << 1 << 4 << 9);
-
-        QLinkedList<int> linkedList3 = QtConcurrent::mappedReduced(linkedList.constBegin(),
-                                                       linkedList.constEnd(),
-                                                       intSquare,
-                                                       &QLinkedList<int>::append,
-                                                       OrderedReduce);
-        QCOMPARE(linkedList, QLinkedList<int>() << 1 << 2 << 3);
-        QCOMPARE(linkedList3, QLinkedList<int>() << 1 << 4 << 9);
-
-        QLinkedList<int> linkedList4 = QtConcurrent::mappedReduced(QLinkedList<int>(linkedList),
-                                                       intSquare,
-                                                       &QLinkedList<int>::append,
-                                                       OrderedReduce);
-        QCOMPARE(linkedList, QLinkedList<int>() << 1 << 2 << 3);
-        QCOMPARE(linkedList4, QLinkedList<int>() << 1 << 4 << 9);
-    }
 
     // member-function
     {
@@ -1564,56 +1084,6 @@ void tst_QtConcurrentMap::mappedReduced()
                                                intSumReduce);
         QCOMPARE(sum3, 6);
     }
-    {
-        int sum = QtConcurrent::mappedReduced(numberLinkedList,
-                                              &Number::toInt,
-                                              intSumReduce);
-        QCOMPARE(sum, 6);
-        int sum2 = QtConcurrent::mappedReduced(numberLinkedList.constBegin(),
-                                               numberLinkedList.constEnd(),
-                                              &Number::toInt,
-                                              intSumReduce);
-        QCOMPARE(sum2, 6);
-
-        int sum3 = QtConcurrent::mappedReduced(QLinkedList<Number>(numberLinkedList),
-                                               &Number::toInt,
-                                               intSumReduce);
-        QCOMPARE(sum3, 6);
-    }
-
-    // linked lists
-    {
-
-        QLinkedList<int> list;
-        list << 1 << 2 << 3;
-
-        QLinkedList<Number> numberList;
-        numberList << 1 << 2 << 3;
-
-        int sum = QtConcurrent::mappedReduced<int>(list, IntSquare(), IntSumReduce());
-        QCOMPARE(sum, 14);
-        int sum2 = QtConcurrent::mappedReduced<int>(list.constBegin(),
-                                                    list.constEnd(),
-                                                    IntSquare(),
-                                                    IntSumReduce());
-        QCOMPARE(sum2, 14);
-
-        int sum3 = QtConcurrent::mappedReduced<int>(QLinkedList<int>(list), IntSquare(), IntSumReduce());
-        QCOMPARE(sum3, 14);
-
-        int sum4 = QtConcurrent::mappedReduced<int>(list, intSquare, intSumReduce);
-        QCOMPARE(sum4, 14);
-        int sum5 = QtConcurrent::mappedReduced<int>(list.constBegin(),
-                                                    list.constEnd(),
-                                                    intSquare,
-                                                    intSumReduce);
-        QCOMPARE(sum5, 14);
-
-        int sum6 = QtConcurrent::mappedReduced<int>(QLinkedList<int>(list),
-                                                    intSquare,
-                                                    intSumReduce);
-        QCOMPARE(sum6, 14);
-    }
 
     // ### the same as above, with an initial result value
 }
@@ -1622,12 +1092,8 @@ void tst_QtConcurrentMap::blocking_mappedReduced()
 {
     QList<int> list;
     list << 1 << 2 << 3;
-    QLinkedList<int> linkedList;
-    linkedList << 1 << 2 << 3;
     QList<Number> numberList;
     numberList << 1 << 2 << 3;
-    QLinkedList<Number> numberLinkedList;
-    numberLinkedList << 1 << 2 << 3;
 
     // functor-functor
     {
@@ -1655,31 +1121,6 @@ void tst_QtConcurrentMap::blocking_mappedReduced()
                                                     intSumReduce);
         QCOMPARE(sum6, 14);
     }
-    {
-        int sum = QtConcurrent::blockingMappedReduced<int>(linkedList, IntSquare(), IntSumReduce());
-        QCOMPARE(sum, 14);
-        int sum2 = QtConcurrent::blockingMappedReduced<int>(linkedList.constBegin(),
-                                                    linkedList.constEnd(),
-                                                    IntSquare(),
-                                                    IntSumReduce());
-        QCOMPARE(sum2, 14);
-
-        int sum3 = QtConcurrent::blockingMappedReduced<int>(QLinkedList<int>(linkedList), IntSquare(), IntSumReduce());
-        QCOMPARE(sum3, 14);
-
-        int sum4 = QtConcurrent::blockingMappedReduced<int>(linkedList, intSquare, intSumReduce);
-        QCOMPARE(sum4, 14);
-        int sum5 = QtConcurrent::blockingMappedReduced<int>(linkedList.constBegin(),
-                                                    linkedList.constEnd(),
-                                                    intSquare,
-                                                    intSumReduce);
-        QCOMPARE(sum5, 14);
-
-        int sum6 = QtConcurrent::blockingMappedReduced<int>(QLinkedList<int>(linkedList),
-                                                    intSquare,
-                                                    intSumReduce);
-        QCOMPARE(sum6, 14);
-    }
 
     // function-functor
     {
@@ -1694,18 +1135,6 @@ void tst_QtConcurrentMap::blocking_mappedReduced()
         int sum3 = QtConcurrent::blockingMappedReduced<int>(QList<int>(list), intSquare, IntSumReduce());
         QCOMPARE(sum3, 14);
     }
-    {
-        int sum = QtConcurrent::blockingMappedReduced<int>(linkedList, intSquare, IntSumReduce());
-        QCOMPARE(sum, 14);
-        int sum2 = QtConcurrent::blockingMappedReduced<int>(linkedList.constBegin(),
-                                                    linkedList.constEnd(),
-                                                    intSquare,
-                                                    IntSumReduce());
-        QCOMPARE(sum2, 14);
-
-        int sum3 = QtConcurrent::blockingMappedReduced<int>(QLinkedList<int>(linkedList), intSquare, IntSumReduce());
-        QCOMPARE(sum3, 14);
-    }
 
     // functor-function
     {
@@ -1720,18 +1149,6 @@ void tst_QtConcurrentMap::blocking_mappedReduced()
         int sum3 = QtConcurrent::blockingMappedReduced(QList<int>(list), IntSquare(), intSumReduce);
         QCOMPARE(sum3, 14);
     }
-    {
-        int sum = QtConcurrent::blockingMappedReduced(linkedList, IntSquare(), intSumReduce);
-        QCOMPARE(sum, 14);
-        int sum2 = QtConcurrent::blockingMappedReduced(linkedList.constBegin(),
-                                               linkedList.constEnd(),
-                                               IntSquare(),
-                                               intSumReduce);
-        QCOMPARE(sum2, 14);
-
-        int sum3 = QtConcurrent::blockingMappedReduced(QLinkedList<int>(linkedList), IntSquare(), intSumReduce);
-        QCOMPARE(sum3, 14);
-    }
 
     // function-function
     {
@@ -1746,24 +1163,14 @@ void tst_QtConcurrentMap::blocking_mappedReduced()
         int sum3 = QtConcurrent::blockingMappedReduced(QList<int>(list), intSquare, intSumReduce);
         QCOMPARE(sum3, 14);
     }
-    {
-        int sum = QtConcurrent::blockingMappedReduced(linkedList, intSquare, intSumReduce);
-        QCOMPARE(sum, 14);
-        int sum2 = QtConcurrent::blockingMappedReduced(linkedList.constBegin(),
-                                               linkedList.constEnd(),
-                                               intSquare,
-                                               intSumReduce);
-        QCOMPARE(sum2, 14);
 
-        int sum3 = QtConcurrent::blockingMappedReduced(QLinkedList<int>(linkedList), intSquare, intSumReduce);
-        QCOMPARE(sum3, 14);
-    }
+    auto push_back = static_cast<void (QVector<int>::*)(const int &)>(&QVector<int>::push_back);
 
     // functor-member
     {
         QList<int> list2 = QtConcurrent::blockingMappedReduced(list,
                                                        IntSquare(),
-                                                       &QList<int>::push_back,
+                                                       push_back,
                                                        OrderedReduce);
         QCOMPARE(list, QList<int>() << 1 << 2 << 3);
         QCOMPARE(list2, QList<int>() << 1 << 4 << 9);
@@ -1771,41 +1178,18 @@ void tst_QtConcurrentMap::blocking_mappedReduced()
         QList<int> list3 = QtConcurrent::blockingMappedReduced(list.constBegin(),
                                                        list.constEnd(),
                                                        IntSquare(),
-                                                       &QList<int>::push_back,
+                                                       push_back,
                                                        OrderedReduce);
         QCOMPARE(list, QList<int>() << 1 << 2 << 3);
         QCOMPARE(list3, QList<int>() << 1 << 4 << 9);
 
         QList<int> list4 = QtConcurrent::blockingMappedReduced(QList<int>(list),
                                                        IntSquare(),
-                                                       &QList<int>::push_back,
+                                                       push_back,
                                                        OrderedReduce);
         QCOMPARE(list, QList<int>() << 1 << 2 << 3);
         QCOMPARE(list4, QList<int>() << 1 << 4 << 9);
     }
-    {
-        QLinkedList<int> linkedList2 = QtConcurrent::blockingMappedReduced(linkedList,
-                                                       IntSquare(),
-                                                       &QLinkedList<int>::append,
-                                                       OrderedReduce);
-        QCOMPARE(linkedList, QLinkedList<int>() << 1 << 2 << 3);
-        QCOMPARE(linkedList2, QLinkedList<int>() << 1 << 4 << 9);
-
-        QLinkedList<int> linkedList3 = QtConcurrent::blockingMappedReduced(linkedList.constBegin(),
-                                                       linkedList.constEnd(),
-                                                       IntSquare(),
-                                                       &QLinkedList<int>::append,
-                                                       OrderedReduce);
-        QCOMPARE(linkedList, QLinkedList<int>() << 1 << 2 << 3);
-        QCOMPARE(linkedList3, QLinkedList<int>() << 1 << 4 << 9);
-
-        QLinkedList<int> linkedList4 = QtConcurrent::blockingMappedReduced(QLinkedList<int>(linkedList),
-                                                       IntSquare(),
-                                                       &QLinkedList<int>::append,
-                                                       OrderedReduce);
-        QCOMPARE(linkedList, QLinkedList<int>() << 1 << 2 << 3);
-        QCOMPARE(linkedList4, QLinkedList<int>() << 1 << 4 << 9);
-    }
 
     // member-functor
     {
@@ -1823,66 +1207,33 @@ void tst_QtConcurrentMap::blocking_mappedReduced()
                                                               IntSumReduce());
         QCOMPARE(sum3, 6);
     }
-    {
-        int sum = QtConcurrent::blockingMappedReduced<int>(numberLinkedList, &Number::toInt, IntSumReduce());
-        QCOMPARE(sum, 6);
-        int sum2 = QtConcurrent::blockingMappedReduced<int>(numberLinkedList.constBegin(),
-                                                    numberLinkedList.constEnd(),
-                                                    &Number::toInt,
-                                                    IntSumReduce());
-        QCOMPARE(sum2, 6);
-
-        int sum3 = QtConcurrent::blockingMappedReduced<int>(QLinkedList<Number>(numberLinkedList),
-                                                    &Number::toInt,
-                                                    IntSumReduce());
-        QCOMPARE(sum3, 6);
-    }
 
     // member-member
     {
         QList<int> list2 = QtConcurrent::blockingMappedReduced(numberList,
                                                        &Number::toInt,
-                                                       &QList<int>::push_back,
+                                                       push_back,
                                                        OrderedReduce);
         QCOMPARE(list2, QList<int>() << 1 << 2 << 3);
 
         QList<int> list3 = QtConcurrent::blockingMappedReduced(numberList.constBegin(),
                                                        numberList.constEnd(),
                                                        &Number::toInt,
-                                                       &QList<int>::push_back,
+                                                       push_back,
                                                        OrderedReduce);
         QCOMPARE(list3, QList<int>() << 1 << 2 << 3);
 
         QList<int> list4 = QtConcurrent::blockingMappedReduced(QList<Number>(numberList),
                                                        &Number::toInt,
-                                                       &QList<int>::push_back, OrderedReduce);
+                                                       push_back, OrderedReduce);
         QCOMPARE(list4, QList<int>() << 1 << 2 << 3);
     }
-    {
-        QLinkedList<int> linkedList2 = QtConcurrent::blockingMappedReduced(numberLinkedList,
-                                                       &Number::toInt,
-                                                       &QLinkedList<int>::append,
-                                                       OrderedReduce);
-        QCOMPARE(linkedList2, QLinkedList<int>() << 1 << 2 << 3);
-
-        QLinkedList<int> linkedList3 = QtConcurrent::blockingMappedReduced(numberLinkedList.constBegin(),
-                                                       numberLinkedList.constEnd(),
-                                                       &Number::toInt,
-                                                       &QLinkedList<int>::append,
-                                                       OrderedReduce);
-        QCOMPARE(linkedList3, QLinkedList<int>() << 1 << 2 << 3);
-
-        QLinkedList<int> linkedList4 = QtConcurrent::blockingMappedReduced(QLinkedList<Number>(numberLinkedList),
-                                                       &Number::toInt,
-                                                       &QLinkedList<int>::append, OrderedReduce);
-        QCOMPARE(linkedList4, QLinkedList<int>() << 1 << 2 << 3);
-    }
 
     // function-member
     {
         QList<int> list2 = QtConcurrent::blockingMappedReduced(list,
                                                        intSquare,
-                                                       &QList<int>::push_back,
+                                                       push_back,
                                                        OrderedReduce);
         QCOMPARE(list, QList<int>() << 1 << 2 << 3);
         QCOMPARE(list2, QList<int>() << 1 << 4 << 9);
@@ -1890,41 +1241,18 @@ void tst_QtConcurrentMap::blocking_mappedReduced()
         QList<int> list3 = QtConcurrent::blockingMappedReduced(list.constBegin(),
                                                        list.constEnd(),
                                                        intSquare,
-                                                       &QList<int>::push_back,
+                                                       push_back,
                                                        OrderedReduce);
         QCOMPARE(list, QList<int>() << 1 << 2 << 3);
         QCOMPARE(list3, QList<int>() << 1 << 4 << 9);
 
         QList<int> list4 = QtConcurrent::blockingMappedReduced(QList<int>(list),
                                                        intSquare,
-                                                       &QList<int>::push_back,
+                                                       push_back,
                                                        OrderedReduce);
         QCOMPARE(list, QList<int>() << 1 << 2 << 3);
         QCOMPARE(list4, QList<int>() << 1 << 4 << 9);
     }
-    {
-        QLinkedList<int> linkedList2 = QtConcurrent::blockingMappedReduced(linkedList,
-                                                       intSquare,
-                                                       &QLinkedList<int>::append,
-                                                       OrderedReduce);
-        QCOMPARE(linkedList, QLinkedList<int>() << 1 << 2 << 3);
-        QCOMPARE(linkedList2, QLinkedList<int>() << 1 << 4 << 9);
-
-        QLinkedList<int> linkedList3 = QtConcurrent::blockingMappedReduced(linkedList.constBegin(),
-                                                       linkedList.constEnd(),
-                                                       intSquare,
-                                                       &QLinkedList<int>::append,
-                                                       OrderedReduce);
-        QCOMPARE(linkedList, QLinkedList<int>() << 1 << 2 << 3);
-        QCOMPARE(linkedList3, QLinkedList<int>() << 1 << 4 << 9);
-
-        QLinkedList<int> linkedList4 = QtConcurrent::blockingMappedReduced(QLinkedList<int>(linkedList),
-                                                       intSquare,
-                                                       &QLinkedList<int>::append,
-                                                       OrderedReduce);
-        QCOMPARE(linkedList, QLinkedList<int>() << 1 << 2 << 3);
-        QCOMPARE(linkedList4, QLinkedList<int>() << 1 << 4 << 9);
-    }
 
     // member-function
     {
@@ -1943,56 +1271,6 @@ void tst_QtConcurrentMap::blocking_mappedReduced()
                                                intSumReduce);
         QCOMPARE(sum3, 6);
     }
-    {
-        int sum = QtConcurrent::blockingMappedReduced(numberLinkedList,
-                                              &Number::toInt,
-                                              intSumReduce);
-        QCOMPARE(sum, 6);
-        int sum2 = QtConcurrent::blockingMappedReduced(numberLinkedList.constBegin(),
-                                               numberLinkedList.constEnd(),
-                                              &Number::toInt,
-                                              intSumReduce);
-        QCOMPARE(sum2, 6);
-
-        int sum3 = QtConcurrent::blockingMappedReduced(QLinkedList<Number>(numberLinkedList),
-                                               &Number::toInt,
-                                               intSumReduce);
-        QCOMPARE(sum3, 6);
-    }
-
-    // linked lists
-    {
-
-        QLinkedList<int> list;
-        list << 1 << 2 << 3;
-
-        QLinkedList<Number> numberList;
-        numberList << 1 << 2 << 3;
-
-        int sum = QtConcurrent::blockingMappedReduced<int>(list, IntSquare(), IntSumReduce());
-        QCOMPARE(sum, 14);
-        int sum2 = QtConcurrent::blockingMappedReduced<int>(list.constBegin(),
-                                                    list.constEnd(),
-                                                    IntSquare(),
-                                                    IntSumReduce());
-        QCOMPARE(sum2, 14);
-
-        int sum3 = QtConcurrent::blockingMappedReduced<int>(QLinkedList<int>(list), IntSquare(), IntSumReduce());
-        QCOMPARE(sum3, 14);
-
-        int sum4 = QtConcurrent::blockingMappedReduced<int>(list, intSquare, intSumReduce);
-        QCOMPARE(sum4, 14);
-        int sum5 = QtConcurrent::blockingMappedReduced<int>(list.constBegin(),
-                                                    list.constEnd(),
-                                                    intSquare,
-                                                    intSumReduce);
-        QCOMPARE(sum5, 14);
-
-        int sum6 = QtConcurrent::blockingMappedReduced<int>(QLinkedList<int>(list),
-                                                    intSquare,
-                                                    intSumReduce);
-        QCOMPARE(sum6, 14);
-    }
 
     // ### the same as above, with an initial result value
 }
@@ -2118,7 +1396,6 @@ public:
 };
 
 Q_DECLARE_METATYPE(QVector<MemFnTester>);
-Q_DECLARE_METATYPE(QList<MemFnTester>);
 
 void tst_QtConcurrentMap::functionOverloads()
 {
diff --git a/tests/auto/concurrent/qtconcurrentmedian/CMakeLists.txt b/tests/auto/concurrent/qtconcurrentmedian/CMakeLists.txt
new file mode 100644
index 0000000000..27b376a406
--- /dev/null
+++ b/tests/auto/concurrent/qtconcurrentmedian/CMakeLists.txt
@@ -0,0 +1,12 @@
+# Generated from qtconcurrentmedian.pro.
+
+#####################################################################
+## tst_qtconcurrentmedian Test:
+#####################################################################
+
+add_qt_test(tst_qtconcurrentmedian
+    SOURCES
+        tst_qtconcurrentmedian.cpp
+    PUBLIC_LIBRARIES
+        Qt::Concurrent
+)
diff --git a/tests/auto/concurrent/qtconcurrentmedian/qtconcurrentmedian.pro b/tests/auto/concurrent/qtconcurrentmedian/qtconcurrentmedian.pro
index 0d07642028..59e22d24a1 100644
--- a/tests/auto/concurrent/qtconcurrentmedian/qtconcurrentmedian.pro
+++ b/tests/auto/concurrent/qtconcurrentmedian/qtconcurrentmedian.pro
@@ -2,4 +2,3 @@ CONFIG += testcase
 TARGET = tst_qtconcurrentmedian
 QT = core testlib concurrent
 SOURCES = tst_qtconcurrentmedian.cpp
-DEFINES += QT_STRICT_ITERATORS
diff --git a/tests/auto/concurrent/qtconcurrentrun/CMakeLists.txt b/tests/auto/concurrent/qtconcurrentrun/CMakeLists.txt
new file mode 100644
index 0000000000..ca1f616137
--- /dev/null
+++ b/tests/auto/concurrent/qtconcurrentrun/CMakeLists.txt
@@ -0,0 +1,15 @@
+# Generated from qtconcurrentrun.pro.
+
+#####################################################################
+## tst_qtconcurrentrun Test:
+#####################################################################
+
+add_qt_test(tst_qtconcurrentrun
+    SOURCES
+        tst_qtconcurrentrun.cpp
+    PUBLIC_LIBRARIES
+        Qt::Concurrent
+)
+
+## Scopes:
+#####################################################################
diff --git a/tests/auto/concurrent/qtconcurrentthreadengine/CMakeLists.txt b/tests/auto/concurrent/qtconcurrentthreadengine/CMakeLists.txt
new file mode 100644
index 0000000000..e9384c4fb4
--- /dev/null
+++ b/tests/auto/concurrent/qtconcurrentthreadengine/CMakeLists.txt
@@ -0,0 +1,12 @@
+# Generated from qtconcurrentthreadengine.pro.
+
+#####################################################################
+## tst_qtconcurrentthreadengine Test:
+#####################################################################
+
+add_qt_test(tst_qtconcurrentthreadengine
+    SOURCES
+        tst_qtconcurrentthreadengine.cpp
+    PUBLIC_LIBRARIES
+        Qt::Concurrent
+)
diff --git a/tests/auto/corelib/.prev_CMakeLists.txt b/tests/auto/corelib/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..1029b14654
--- /dev/null
+++ b/tests/auto/corelib/.prev_CMakeLists.txt
@@ -0,0 +1,18 @@
+# Generated from corelib.pro.
+
+add_subdirectory(kernel)
+if(NOT APPLE_UIKIT)
+    add_subdirectory(animation)
+    add_subdirectory(codecs)
+    add_subdirectory(global)
+    add_subdirectory(io)
+    add_subdirectory(itemmodels)
+    add_subdirectory(mimetypes)
+    add_subdirectory(plugin)
+    add_subdirectory(serialization)
+    add_subdirectory(statemachine)
+    add_subdirectory(text)
+    add_subdirectory(thread)
+    add_subdirectory(time)
+    add_subdirectory(tools)
+endif()
diff --git a/tests/auto/corelib/CMakeLists.txt b/tests/auto/corelib/CMakeLists.txt
new file mode 100644
index 0000000000..1029b14654
--- /dev/null
+++ b/tests/auto/corelib/CMakeLists.txt
@@ -0,0 +1,18 @@
+# Generated from corelib.pro.
+
+add_subdirectory(kernel)
+if(NOT APPLE_UIKIT)
+    add_subdirectory(animation)
+    add_subdirectory(codecs)
+    add_subdirectory(global)
+    add_subdirectory(io)
+    add_subdirectory(itemmodels)
+    add_subdirectory(mimetypes)
+    add_subdirectory(plugin)
+    add_subdirectory(serialization)
+    add_subdirectory(statemachine)
+    add_subdirectory(text)
+    add_subdirectory(thread)
+    add_subdirectory(time)
+    add_subdirectory(tools)
+endif()
diff --git a/tests/auto/corelib/animation/CMakeLists.txt b/tests/auto/corelib/animation/CMakeLists.txt
new file mode 100644
index 0000000000..ed238bb4f7
--- /dev/null
+++ b/tests/auto/corelib/animation/CMakeLists.txt
@@ -0,0 +1,6 @@
+add_subdirectory(qabstractanimation)
+add_subdirectory(qanimationgroup)
+add_subdirectory(qparallelanimationgroup)
+add_subdirectory(qpauseanimation)
+add_subdirectory(qsequentialanimationgroup)
+add_subdirectory(qvariantanimation)
diff --git a/tests/auto/corelib/animation/qabstractanimation/CMakeLists.txt b/tests/auto/corelib/animation/qabstractanimation/CMakeLists.txt
new file mode 100644
index 0000000000..d5f4a9a016
--- /dev/null
+++ b/tests/auto/corelib/animation/qabstractanimation/CMakeLists.txt
@@ -0,0 +1,10 @@
+# Generated from qabstractanimation.pro.
+
+#####################################################################
+## tst_qabstractanimation Test:
+#####################################################################
+
+add_qt_test(tst_qabstractanimation
+    SOURCES
+        tst_qabstractanimation.cpp
+)
diff --git a/tests/auto/corelib/animation/qanimationgroup/CMakeLists.txt b/tests/auto/corelib/animation/qanimationgroup/CMakeLists.txt
new file mode 100644
index 0000000000..9b165f7983
--- /dev/null
+++ b/tests/auto/corelib/animation/qanimationgroup/CMakeLists.txt
@@ -0,0 +1,10 @@
+# Generated from qanimationgroup.pro.
+
+#####################################################################
+## tst_qanimationgroup Test:
+#####################################################################
+
+add_qt_test(tst_qanimationgroup
+    SOURCES
+        tst_qanimationgroup.cpp
+)
diff --git a/tests/auto/corelib/animation/qparallelanimationgroup/CMakeLists.txt b/tests/auto/corelib/animation/qparallelanimationgroup/CMakeLists.txt
new file mode 100644
index 0000000000..376c9351bd
--- /dev/null
+++ b/tests/auto/corelib/animation/qparallelanimationgroup/CMakeLists.txt
@@ -0,0 +1,10 @@
+# Generated from qparallelanimationgroup.pro.
+
+#####################################################################
+## tst_qparallelanimationgroup Test:
+#####################################################################
+
+add_qt_test(tst_qparallelanimationgroup
+    SOURCES
+        tst_qparallelanimationgroup.cpp
+)
diff --git a/tests/auto/corelib/animation/qpauseanimation/CMakeLists.txt b/tests/auto/corelib/animation/qpauseanimation/CMakeLists.txt
new file mode 100644
index 0000000000..183127519f
--- /dev/null
+++ b/tests/auto/corelib/animation/qpauseanimation/CMakeLists.txt
@@ -0,0 +1,12 @@
+# Generated from qpauseanimation.pro.
+
+#####################################################################
+## tst_qpauseanimation Test:
+#####################################################################
+
+add_qt_test(tst_qpauseanimation
+    SOURCES
+        tst_qpauseanimation.cpp
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+)
diff --git a/tests/auto/corelib/animation/qsequentialanimationgroup/CMakeLists.txt b/tests/auto/corelib/animation/qsequentialanimationgroup/CMakeLists.txt
new file mode 100644
index 0000000000..a3381b06b0
--- /dev/null
+++ b/tests/auto/corelib/animation/qsequentialanimationgroup/CMakeLists.txt
@@ -0,0 +1,10 @@
+# Generated from qsequentialanimationgroup.pro.
+
+#####################################################################
+## tst_qsequentialanimationgroup Test:
+#####################################################################
+
+add_qt_test(tst_qsequentialanimationgroup
+    SOURCES
+        tst_qsequentialanimationgroup.cpp
+)
diff --git a/tests/auto/corelib/animation/qvariantanimation/CMakeLists.txt b/tests/auto/corelib/animation/qvariantanimation/CMakeLists.txt
new file mode 100644
index 0000000000..1c5f9bd03b
--- /dev/null
+++ b/tests/auto/corelib/animation/qvariantanimation/CMakeLists.txt
@@ -0,0 +1,10 @@
+# Generated from qvariantanimation.pro.
+
+#####################################################################
+## tst_qvariantanimation Test:
+#####################################################################
+
+add_qt_test(tst_qvariantanimation
+    SOURCES
+        tst_qvariantanimation.cpp
+)
diff --git a/tests/auto/corelib/codecs/CMakeLists.txt b/tests/auto/corelib/codecs/CMakeLists.txt
new file mode 100644
index 0000000000..272b19f5f8
--- /dev/null
+++ b/tests/auto/corelib/codecs/CMakeLists.txt
@@ -0,0 +1,3 @@
+add_subdirectory(qtextcodec)
+add_subdirectory(utf8)
+
diff --git a/tests/auto/corelib/codecs/qtextcodec/CMakeLists.txt b/tests/auto/corelib/codecs/qtextcodec/CMakeLists.txt
new file mode 100644
index 0000000000..09b46eaa1d
--- /dev/null
+++ b/tests/auto/corelib/codecs/qtextcodec/CMakeLists.txt
@@ -0,0 +1,5 @@
+add_qt_test(tst_qtextcodec SOURCES tst_qtextcodec.cpp)
+
+if(UNIX)
+    add_subdirectory(echo)
+endif()
diff --git a/tests/auto/corelib/codecs/qtextcodec/echo/CMakeLists.txt b/tests/auto/corelib/codecs/qtextcodec/echo/CMakeLists.txt
new file mode 100644
index 0000000000..fc63473cbc
--- /dev/null
+++ b/tests/auto/corelib/codecs/qtextcodec/echo/CMakeLists.txt
@@ -0,0 +1,10 @@
+# Generated from echo.pro.
+
+#####################################################################
+## echo_helper Binary:
+#####################################################################
+
+add_qt_test_helper(echo_helper
+    SOURCES
+        main.cpp
+)
diff --git a/tests/auto/corelib/codecs/utf8/CMakeLists.txt b/tests/auto/corelib/codecs/utf8/CMakeLists.txt
new file mode 100644
index 0000000000..1f794d63d0
--- /dev/null
+++ b/tests/auto/corelib/codecs/utf8/CMakeLists.txt
@@ -0,0 +1,11 @@
+# Generated from utf8.pro.
+
+#####################################################################
+## tst_utf8 Test:
+#####################################################################
+
+add_qt_test(tst_utf8
+    SOURCES
+        tst_utf8.cpp
+        utf8data.cpp
+)
diff --git a/tests/auto/corelib/global/CMakeLists.txt b/tests/auto/corelib/global/CMakeLists.txt
new file mode 100644
index 0000000000..58e083d665
--- /dev/null
+++ b/tests/auto/corelib/global/CMakeLists.txt
@@ -0,0 +1,12 @@
+add_subdirectory(q_func_info)
+add_subdirectory(qflags)
+add_subdirectory(qfloat16)
+add_subdirectory(qgetputenv)
+add_subdirectory(qglobalstatic)
+add_subdirectory(qhooks)
+add_subdirectory(qlogging)
+add_subdirectory(qnumeric)
+add_subdirectory(qrand)
+add_subdirectory(qrandomgenerator)
+add_subdirectory(qtendian)
+
diff --git a/tests/auto/corelib/global/q_func_info/CMakeLists.txt b/tests/auto/corelib/global/q_func_info/CMakeLists.txt
new file mode 100644
index 0000000000..5435c97cf8
--- /dev/null
+++ b/tests/auto/corelib/global/q_func_info/CMakeLists.txt
@@ -0,0 +1,10 @@
+# Generated from q_func_info.pro.
+
+#####################################################################
+## tst_q_func_info Test:
+#####################################################################
+
+add_qt_test(tst_q_func_info
+    SOURCES
+        tst_q_func_info.cpp
+)
diff --git a/tests/auto/corelib/global/qflags/CMakeLists.txt b/tests/auto/corelib/global/qflags/CMakeLists.txt
new file mode 100644
index 0000000000..f1fdb7a5f8
--- /dev/null
+++ b/tests/auto/corelib/global/qflags/CMakeLists.txt
@@ -0,0 +1,13 @@
+# Generated from qflags.pro.
+
+#####################################################################
+## tst_qflags Test:
+#####################################################################
+
+add_qt_test(tst_qflags
+    SOURCES
+        tst_qflags.cpp
+)
+
+## Scopes:
+#####################################################################
diff --git a/tests/auto/corelib/global/qfloat16/CMakeLists.txt b/tests/auto/corelib/global/qfloat16/CMakeLists.txt
new file mode 100644
index 0000000000..36e15d8225
--- /dev/null
+++ b/tests/auto/corelib/global/qfloat16/CMakeLists.txt
@@ -0,0 +1,10 @@
+# Generated from qfloat16.pro.
+
+#####################################################################
+## tst_qfloat16 Test:
+#####################################################################
+
+add_qt_test(tst_qfloat16
+    SOURCES
+        tst_qfloat16.cpp
+)
diff --git a/tests/auto/corelib/global/qgetputenv/CMakeLists.txt b/tests/auto/corelib/global/qgetputenv/CMakeLists.txt
new file mode 100644
index 0000000000..c5f3a53810
--- /dev/null
+++ b/tests/auto/corelib/global/qgetputenv/CMakeLists.txt
@@ -0,0 +1,10 @@
+# Generated from qgetputenv.pro.
+
+#####################################################################
+## tst_qgetputenv Test:
+#####################################################################
+
+add_qt_test(tst_qgetputenv
+    SOURCES
+        tst_qgetputenv.cpp
+)
diff --git a/tests/auto/corelib/global/qglobal/CMakeLists.txt b/tests/auto/corelib/global/qglobal/CMakeLists.txt
new file mode 100644
index 0000000000..1efaaa71d0
--- /dev/null
+++ b/tests/auto/corelib/global/qglobal/CMakeLists.txt
@@ -0,0 +1,14 @@
+# Generated from qglobal.pro.
+
+#####################################################################
+## tst_qglobal Test:
+#####################################################################
+
+add_qt_test(tst_qglobal
+    SOURCES
+        qglobal.c
+        tst_qglobal.cpp
+)
+
+## Scopes:
+#####################################################################
diff --git a/tests/auto/corelib/global/qglobal/tst_qglobal.cpp b/tests/auto/corelib/global/qglobal/tst_qglobal.cpp
index b33dec8a61..047130d5ea 100644
--- a/tests/auto/corelib/global/qglobal/tst_qglobal.cpp
+++ b/tests/auto/corelib/global/qglobal/tst_qglobal.cpp
@@ -49,7 +49,6 @@ private slots:
     void qConstructorFunction();
     void qCoreAppStartupFunction();
     void qCoreAppStartupFunctionRestart();
-    void qAlignOf();
     void integerForSize();
     void qprintable();
     void qprintable_data();
@@ -434,106 +433,6 @@ template <class T> struct AlignmentInStruct { T dummy; };
 typedef int (*fun) ();
 typedef int (Empty::*memFun) ();
 
-#define TEST_AlignOf(type, alignment)                                       \
-    do {                                                                    \
-        TEST_AlignOf_impl(type, alignment);                                 \
-                                                                            \
-        TEST_AlignOf_impl(type &, alignment);                               \
-        TEST_AlignOf_RValueRef(type &&, alignment);                         \
-                                                                            \
-        TEST_AlignOf_impl(type [5], alignment);                             \
-        TEST_AlignOf_impl(type (&) [5], alignment);                         \
-                                                                            \
-        TEST_AlignOf_impl(AlignmentInStruct<type>, alignment);              \
-                                                                            \
-        /* Some internal sanity validation, just for fun */                 \
-        TEST_AlignOf_impl(AlignmentInStruct<type [5]>, alignment);          \
-        TEST_AlignOf_impl(AlignmentInStruct<type &>, Q_ALIGNOF(void *));    \
-        TEST_AlignOf_impl(AlignmentInStruct<type (&) [5]>,                  \
-                Q_ALIGNOF(void *));                                         \
-        TEST_AlignOf_RValueRef(AlignmentInStruct<type &&>,                  \
-                Q_ALIGNOF(void *));                                         \
-    } while (false)                                                         \
-    /**/
-
-#define TEST_AlignOf_RValueRef(type, alignment) \
-        TEST_AlignOf_impl(type, alignment)
-
-#define TEST_AlignOf_impl(type, alignment) \
-    do { \
-        QCOMPARE(Q_ALIGNOF(type), size_t(alignment)); \
-        /* Compare to native operator for compilers that support it,
-           otherwise...  erm... check consistency! :-) */ \
-        QCOMPARE(alignof(type), Q_ALIGNOF(type)); \
-    } while (false)
-    /**/
-
-void tst_QGlobal::qAlignOf()
-{
-    // Built-in types, except 64-bit integers and double
-    TEST_AlignOf(char, 1);
-    TEST_AlignOf(signed char, 1);
-    TEST_AlignOf(unsigned char, 1);
-    TEST_AlignOf(qint8, 1);
-    TEST_AlignOf(quint8, 1);
-    TEST_AlignOf(qint16, 2);
-    TEST_AlignOf(quint16, 2);
-    TEST_AlignOf(qint32, 4);
-    TEST_AlignOf(quint32, 4);
-    TEST_AlignOf(void *, sizeof(void *));
-
-    // Depends on platform and compiler, disabling test for now
-    // TEST_AlignOf(long double, 16);
-
-    // Empty struct
-    TEST_AlignOf(Empty, 1);
-
-    // Function pointers
-    TEST_AlignOf(fun, Q_ALIGNOF(void *));
-    TEST_AlignOf(memFun, Q_ALIGNOF(void *));
-
-
-    // 64-bit integers and double
-    TEST_AlignOf_impl(qint64, 8);
-    TEST_AlignOf_impl(quint64, 8);
-    TEST_AlignOf_impl(double, 8);
-
-    TEST_AlignOf_impl(qint64 &, 8);
-    TEST_AlignOf_impl(quint64 &, 8);
-    TEST_AlignOf_impl(double &, 8);
-
-    TEST_AlignOf_RValueRef(qint64 &&, 8);
-    TEST_AlignOf_RValueRef(quint64 &&, 8);
-    TEST_AlignOf_RValueRef(double &&, 8);
-
-    // 32-bit x86 ABI idiosyncrasies
-#if defined(Q_PROCESSOR_X86_32) && !defined(Q_OS_WIN)
-    TEST_AlignOf_impl(AlignmentInStruct<qint64>, 4);
-#else
-    TEST_AlignOf_impl(AlignmentInStruct<qint64>, 8);
-#endif
-
-    TEST_AlignOf_impl(AlignmentInStruct<quint64>, Q_ALIGNOF(AlignmentInStruct<qint64>));
-    TEST_AlignOf_impl(AlignmentInStruct<double>, Q_ALIGNOF(AlignmentInStruct<qint64>));
-
-    // 32-bit x86 ABI, Clang disagrees with gcc
-#if !defined(Q_PROCESSOR_X86_32) || !defined(Q_CC_CLANG) || defined(Q_OS_ANDROID)
-    TEST_AlignOf_impl(qint64 [5],       Q_ALIGNOF(qint64));
-#else
-    TEST_AlignOf_impl(qint64 [5],       Q_ALIGNOF(AlignmentInStruct<qint64>));
-#endif
-
-    TEST_AlignOf_impl(qint64 (&) [5],   Q_ALIGNOF(qint64 [5]));
-    TEST_AlignOf_impl(quint64 [5],      Q_ALIGNOF(quint64 [5]));
-    TEST_AlignOf_impl(quint64 (&) [5],  Q_ALIGNOF(quint64 [5]));
-    TEST_AlignOf_impl(double [5],       Q_ALIGNOF(double [5]));
-    TEST_AlignOf_impl(double (&) [5],   Q_ALIGNOF(double [5]));
-}
-
-#undef TEST_AlignOf
-#undef TEST_AlignOf_RValueRef
-#undef TEST_AlignOf_impl
-
 void tst_QGlobal::integerForSize()
 {
     // compile-only test:
diff --git a/tests/auto/corelib/global/qglobalstatic/CMakeLists.txt b/tests/auto/corelib/global/qglobalstatic/CMakeLists.txt
new file mode 100644
index 0000000000..7e8eee14d3
--- /dev/null
+++ b/tests/auto/corelib/global/qglobalstatic/CMakeLists.txt
@@ -0,0 +1,15 @@
+# Generated from qglobalstatic.pro.
+
+#####################################################################
+## tst_qglobalstatic Test:
+#####################################################################
+
+add_qt_test(tst_qglobalstatic
+    EXCEPTIONS
+    SOURCES
+        tst_qglobalstatic.cpp
+    DEFINES
+        SRCDIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/\\\"
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+)
diff --git a/tests/auto/corelib/global/qhooks/CMakeLists.txt b/tests/auto/corelib/global/qhooks/CMakeLists.txt
new file mode 100644
index 0000000000..c86faba75f
--- /dev/null
+++ b/tests/auto/corelib/global/qhooks/CMakeLists.txt
@@ -0,0 +1,12 @@
+# Generated from qhooks.pro.
+
+#####################################################################
+## tst_qhooks Test:
+#####################################################################
+
+add_qt_test(tst_qhooks
+    SOURCES
+        tst_qhooks.cpp
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+)
diff --git a/tests/auto/corelib/global/qlogging/CMakeLists.txt b/tests/auto/corelib/global/qlogging/CMakeLists.txt
new file mode 100644
index 0000000000..bd0ab6aeca
--- /dev/null
+++ b/tests/auto/corelib/global/qlogging/CMakeLists.txt
@@ -0,0 +1,25 @@
+if(NOT WINRT)
+    add_qt_executable(qlogging_helper
+        NO_INSTALL # special case
+        OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
+        SOURCES app/main.cpp
+        DEFINES QT_MESSAGELOGCONTEXT
+        LIBRARIES Qt::Core)
+
+    #special case begin
+    # Fixes required for the backtrace stack to be correct
+    if (${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU")
+        target_link_options(qlogging_helper PRIVATE -rdynamic)
+    endif()
+    set_target_properties(qlogging_helper PROPERTIES CXX_VISIBILITY_PRESET default)
+    # special case end
+endif()
+
+add_qt_test(tst_qlogging SOURCES tst_qlogging.cpp
+    DEFINES
+        QT_MESSAGELOGCONTEXT
+        QT_DISABLE_DEPRECATED_BEFORE=0
+        HELPER_BINARY="${CMAKE_CURRENT_BINARY_DIR}/qlogging_helper" # special case
+)
+
+target_compile_definitions(tst_qlogging PRIVATE QT_CMAKE_BUILD) # special case # to fix the binary name
diff --git a/tests/auto/corelib/global/qlogging/test/test.pro b/tests/auto/corelib/global/qlogging/test/test.pro
index 91896d4494..81445247e0 100644
--- a/tests/auto/corelib/global/qlogging/test/test.pro
+++ b/tests/auto/corelib/global/qlogging/test/test.pro
@@ -19,3 +19,4 @@ SOURCES = ../tst_qlogging.cpp
 
 DEFINES += QT_MESSAGELOGCONTEXT
 DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
+DEFINES += HELPER_BINARY=\\\"helper\\\"
diff --git a/tests/auto/corelib/global/qlogging/tst_qlogging.cpp b/tests/auto/corelib/global/qlogging/tst_qlogging.cpp
index 3af637d13a..6c6f3a2168 100644
--- a/tests/auto/corelib/global/qlogging/tst_qlogging.cpp
+++ b/tests/auto/corelib/global/qlogging/tst_qlogging.cpp
@@ -792,10 +792,17 @@ void tst_qmessagehandler::qMessagePattern_data()
 #define QT_NAMESPACE_STR ""
 #endif
 
+
+#ifdef QT_CMAKE_BUILD
+#define BACKTRACE_HELPER_NAME "qlogging_helper"
+#else
+#define BACKTRACE_HELPER_NAME "helper"
+#endif
+
 #ifndef QT_NO_DEBUG
     QTest::newRow("backtrace") << "[%{backtrace}] %{message}" << true << (QList<QByteArray>()
             // MyClass::qt_static_metacall is explicitly marked as hidden in the Q_OBJECT macro
-            << "[MyClass::myFunction|MyClass::mySlot1|?helper?|" QT_NAMESPACE_STR "QMetaMethod::invoke|" QT_NAMESPACE_STR "QMetaObject::invokeMethod] from_a_function 34");
+            << "[MyClass::myFunction|MyClass::mySlot1|?" BACKTRACE_HELPER_NAME "?|" QT_NAMESPACE_STR "QMetaMethod::invoke|" QT_NAMESPACE_STR "QMetaObject::invokeMethod] from_a_function 34");
 #endif
 
     QTest::newRow("backtrace depth,separator") << "[%{backtrace depth=2 separator=\"\n\"}] %{message}" << true << (QList<QByteArray>()
@@ -820,9 +827,9 @@ void tst_qmessagehandler::qMessagePattern()
 
     QProcess process;
 #ifndef Q_OS_ANDROID
-    const QString appExe(QLatin1String("helper"));
+    const QString appExe(QLatin1String(HELPER_BINARY));
 #else
-    const QString appExe(QCoreApplication::applicationDirPath() + QLatin1String("/libhelper.so"));
+    const QString appExe(QCoreApplication::applicationDirPath() + QLatin1String("/lib" BACKTRACE_HELPER_NAME ".so"));
 #endif
 
     //
@@ -870,7 +877,7 @@ void tst_qmessagehandler::setMessagePattern()
 
     QProcess process;
 #ifndef Q_OS_ANDROID
-    const QString appExe(QLatin1String("helper"));
+    const QString appExe(QLatin1String(HELPER_BINARY));
 #else
     const QString appExe(QCoreApplication::applicationDirPath() + QLatin1String("/libhelper.so"));
 #endif
diff --git a/tests/auto/corelib/global/qnumeric/CMakeLists.txt b/tests/auto/corelib/global/qnumeric/CMakeLists.txt
new file mode 100644
index 0000000000..8a857c5622
--- /dev/null
+++ b/tests/auto/corelib/global/qnumeric/CMakeLists.txt
@@ -0,0 +1,26 @@
+# Generated from qnumeric.pro.
+
+#####################################################################
+## tst_qnumeric Test:
+#####################################################################
+
+add_qt_test(tst_qnumeric
+    SOURCES
+        tst_qnumeric.cpp
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+)
+
+## Scopes:
+#####################################################################
+
+extend_target(tst_qnumeric CONDITION ICC
+    COMPILE_OPTIONS
+        -fp-model
+        strict
+)
+
+extend_target(tst_qnumeric CONDITION intel_icl
+    COMPILE_OPTIONS
+        /fp:strict
+)
diff --git a/tests/auto/corelib/global/qrand/CMakeLists.txt b/tests/auto/corelib/global/qrand/CMakeLists.txt
new file mode 100644
index 0000000000..80e8132809
--- /dev/null
+++ b/tests/auto/corelib/global/qrand/CMakeLists.txt
@@ -0,0 +1,10 @@
+# Generated from qrand.pro.
+
+#####################################################################
+## tst_qrand Test:
+#####################################################################
+
+add_qt_test(tst_qrand
+    SOURCES
+        tst_qrand.cpp
+)
diff --git a/tests/auto/corelib/global/qrandomgenerator/CMakeLists.txt b/tests/auto/corelib/global/qrandomgenerator/CMakeLists.txt
new file mode 100644
index 0000000000..edd2efe760
--- /dev/null
+++ b/tests/auto/corelib/global/qrandomgenerator/CMakeLists.txt
@@ -0,0 +1,12 @@
+# Generated from qrandomgenerator.pro.
+
+#####################################################################
+## tst_qrandomgenerator Test:
+#####################################################################
+
+add_qt_test(tst_qrandomgenerator
+    SOURCES
+        tst_qrandomgenerator.cpp
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+)
diff --git a/tests/auto/corelib/global/qrandomgenerator/tst_qrandomgenerator.cpp b/tests/auto/corelib/global/qrandomgenerator/tst_qrandomgenerator.cpp
index 6f9dcc08f9..f997a40119 100644
--- a/tests/auto/corelib/global/qrandomgenerator/tst_qrandomgenerator.cpp
+++ b/tests/auto/corelib/global/qrandomgenerator/tst_qrandomgenerator.cpp
@@ -27,7 +27,6 @@
 ****************************************************************************/
 
 #include <QtTest>
-#include <qlinkedlist.h>
 #include <qobject.h>
 #include <qrandom.h>
 #include <qvector.h>
diff --git a/tests/auto/corelib/global/qtendian/CMakeLists.txt b/tests/auto/corelib/global/qtendian/CMakeLists.txt
new file mode 100644
index 0000000000..9efb17712e
--- /dev/null
+++ b/tests/auto/corelib/global/qtendian/CMakeLists.txt
@@ -0,0 +1,12 @@
+# Generated from qtendian.pro.
+
+#####################################################################
+## tst_qtendian Test:
+#####################################################################
+
+add_qt_test(tst_qtendian
+    SOURCES
+        tst_qtendian.cpp
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+)
diff --git a/tests/auto/corelib/io/.prev_CMakeLists.txt b/tests/auto/corelib/io/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..5baf4c35de
--- /dev/null
+++ b/tests/auto/corelib/io/.prev_CMakeLists.txt
@@ -0,0 +1,56 @@
+# Generated from io.pro.
+
+if(QT_FEATURE_private_tests)
+    add_subdirectory(qabstractfileengine)
+    add_subdirectory(qfileinfo)
+    add_subdirectory(qipaddress)
+    add_subdirectory(qloggingregistry)
+    add_subdirectory(qurlinternal)
+endif()
+add_subdirectory(qbuffer)
+add_subdirectory(qdataurl)
+add_subdirectory(qdiriterator)
+add_subdirectory(qfile)
+add_subdirectory(largefile)
+add_subdirectory(qfileselector)
+add_subdirectory(qfilesystemmetadata)
+add_subdirectory(qloggingcategory)
+add_subdirectory(qnodebug)
+add_subdirectory(qsavefile)
+add_subdirectory(qstandardpaths)
+add_subdirectory(qtemporarydir)
+add_subdirectory(qtemporaryfile)
+add_subdirectory(qurlquery)
+if(TARGET Qt::Concurrent)
+    add_subdirectory(qdebug)
+    add_subdirectory(qlockfile)
+    add_subdirectory(qurl)
+endif()
+if(NOT ANDROID)
+    add_subdirectory(qdir)
+    add_subdirectory(qresourceengine)
+endif()
+if(QT_FEATURE_private_tests OR UNIX)
+    add_subdirectory(qfilesystementry)
+endif()
+if(QT_FEATURE_filesystemwatcher)
+    add_subdirectory(qfilesystemwatcher)
+endif()
+if(TARGET Qt::Network)
+    add_subdirectory(qiodevice)
+endif()
+if(QT_FEATURE_process AND TARGET Qt::Network AND NOT ANDROID)
+    add_subdirectory(qprocess)
+endif()
+if(QT_FEATURE_process)
+    add_subdirectory(qprocess-noapplication)
+endif()
+if(QT_FEATURE_processenvironment)
+    add_subdirectory(qprocessenvironment)
+endif()
+if(QT_FEATURE_settings AND TARGET Qt::Gui)
+    add_subdirectory(qsettings)
+endif()
+if(NOT WINRT)
+    add_subdirectory(qstorageinfo)
+endif()
diff --git a/tests/auto/corelib/io/CMakeLists.txt b/tests/auto/corelib/io/CMakeLists.txt
new file mode 100644
index 0000000000..cb1246c3a2
--- /dev/null
+++ b/tests/auto/corelib/io/CMakeLists.txt
@@ -0,0 +1,56 @@
+# Generated from io.pro.
+
+if(QT_FEATURE_private_tests)
+    add_subdirectory(qabstractfileengine)
+    add_subdirectory(qfileinfo)
+    add_subdirectory(qipaddress)
+    add_subdirectory(qloggingregistry)
+    add_subdirectory(qurlinternal)
+endif()
+add_subdirectory(qbuffer)
+add_subdirectory(qdataurl)
+add_subdirectory(qdiriterator)
+add_subdirectory(qfile)
+add_subdirectory(largefile)
+# add_subdirectory(qfileselector) # special case needs fixes
+add_subdirectory(qfilesystemmetadata)
+add_subdirectory(qloggingcategory)
+add_subdirectory(qnodebug)
+add_subdirectory(qsavefile)
+add_subdirectory(qstandardpaths)
+add_subdirectory(qtemporarydir)
+add_subdirectory(qtemporaryfile)
+add_subdirectory(qurlquery)
+if(TARGET Qt::Concurrent)
+    add_subdirectory(qdebug)
+    add_subdirectory(qlockfile)
+    add_subdirectory(qurl)
+endif()
+if(NOT ANDROID)
+    add_subdirectory(qdir)
+    # add_subdirectory(qresourceengine) # special case needs fixes
+endif()
+if(QT_FEATURE_private_tests OR UNIX)
+    add_subdirectory(qfilesystementry)
+endif()
+if(QT_FEATURE_filesystemwatcher)
+    add_subdirectory(qfilesystemwatcher)
+endif()
+if(TARGET Qt::Network)
+    add_subdirectory(qiodevice)
+endif()
+if(QT_FEATURE_process AND TARGET Qt::Network AND NOT ANDROID)
+    # add_subdirectory(qprocess) # special case needs fixes
+endif()
+if(QT_FEATURE_process)
+    add_subdirectory(qprocess-noapplication)
+endif()
+if(QT_FEATURE_processenvironment)
+    add_subdirectory(qprocessenvironment)
+endif()
+if(QT_FEATURE_settings AND TARGET Qt::Gui)
+    add_subdirectory(qsettings)
+endif()
+if(NOT WINRT)
+    add_subdirectory(qstorageinfo)
+endif()
diff --git a/tests/auto/corelib/io/largefile/CMakeLists.txt b/tests/auto/corelib/io/largefile/CMakeLists.txt
new file mode 100644
index 0000000000..cb1eba8526
--- /dev/null
+++ b/tests/auto/corelib/io/largefile/CMakeLists.txt
@@ -0,0 +1,13 @@
+# Generated from largefile.pro.
+
+#####################################################################
+## tst_largefile Test:
+#####################################################################
+
+add_qt_test(tst_largefile
+    SOURCES
+        ../../../../shared/emulationdetector.h
+        tst_largefile.cpp
+    INCLUDE_DIRECTORIES
+        ../../../../shared
+)
diff --git a/tests/auto/corelib/io/qabstractfileengine/CMakeLists.txt b/tests/auto/corelib/io/qabstractfileengine/CMakeLists.txt
new file mode 100644
index 0000000000..1b7a11d657
--- /dev/null
+++ b/tests/auto/corelib/io/qabstractfileengine/CMakeLists.txt
@@ -0,0 +1,25 @@
+# Generated from qabstractfileengine.pro.
+
+#####################################################################
+## tst_qabstractfileengine Test:
+#####################################################################
+
+add_qt_test(tst_qabstractfileengine
+    SOURCES
+        tst_qabstractfileengine.cpp
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+)
+
+# Resources:
+set(qabstractfileengine_resource_files
+    "resources/"
+)
+
+add_qt_resource(tst_qabstractfileengine "qabstractfileengine"
+    PREFIX
+        "/tst_qabstractfileengine/"
+    FILES
+        ${qabstractfileengine_resource_files}
+)
+
diff --git a/tests/auto/corelib/io/qbuffer/CMakeLists.txt b/tests/auto/corelib/io/qbuffer/CMakeLists.txt
new file mode 100644
index 0000000000..40502dd004
--- /dev/null
+++ b/tests/auto/corelib/io/qbuffer/CMakeLists.txt
@@ -0,0 +1,10 @@
+# Generated from qbuffer.pro.
+
+#####################################################################
+## tst_qbuffer Test:
+#####################################################################
+
+add_qt_test(tst_qbuffer
+    SOURCES
+        tst_qbuffer.cpp
+)
diff --git a/tests/auto/corelib/io/qdataurl/CMakeLists.txt b/tests/auto/corelib/io/qdataurl/CMakeLists.txt
new file mode 100644
index 0000000000..507852a11e
--- /dev/null
+++ b/tests/auto/corelib/io/qdataurl/CMakeLists.txt
@@ -0,0 +1,12 @@
+# Generated from qdataurl.pro.
+
+#####################################################################
+## tst_qdataurl Test:
+#####################################################################
+
+add_qt_test(tst_qdataurl
+    SOURCES
+        tst_qdataurl.cpp
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+)
diff --git a/tests/auto/corelib/io/qdebug/CMakeLists.txt b/tests/auto/corelib/io/qdebug/CMakeLists.txt
new file mode 100644
index 0000000000..d7fa4fb7cd
--- /dev/null
+++ b/tests/auto/corelib/io/qdebug/CMakeLists.txt
@@ -0,0 +1,12 @@
+# Generated from qdebug.pro.
+
+#####################################################################
+## tst_qdebug Test:
+#####################################################################
+
+add_qt_test(tst_qdebug
+    SOURCES
+        tst_qdebug.cpp
+    PUBLIC_LIBRARIES
+        Qt::Concurrent
+)
diff --git a/tests/auto/corelib/io/qdebug/tst_qdebug.cpp b/tests/auto/corelib/io/qdebug/tst_qdebug.cpp
index 584e66a7db..4260accfd0 100644
--- a/tests/auto/corelib/io/qdebug/tst_qdebug.cpp
+++ b/tests/auto/corelib/io/qdebug/tst_qdebug.cpp
@@ -66,6 +66,7 @@ private slots:
     void resetFormat() const;
     void defaultMessagehandler() const;
     void threadSafety() const;
+    void toString() const;
 };
 
 void tst_QDebug::assignment() const
@@ -740,6 +741,28 @@ void tst_QDebug::threadSafety() const
     }
 }
 
+void tst_QDebug::toString() const
+{
+    // By reference.
+    {
+        MyPoint point(3, 4);
+        QString expectedString;
+        QDebug stream(&expectedString);
+        stream.nospace() << point;
+        QCOMPARE(QDebug::toString(point), expectedString);
+    }
+
+    // By pointer.
+    {
+        QObject qobject;
+        qobject.setObjectName("test");
+        QString expectedString;
+        QDebug stream(&expectedString);
+        stream.nospace() << &qobject;
+        QCOMPARE(QDebug::toString(&qobject), expectedString);
+    }
+}
+
 // Should compile: instentiation of unrelated operator<< should not cause cause compilation
 // error in QDebug operators (QTBUG-47375)
 class TestClassA {};
diff --git a/tests/auto/corelib/io/qdir/CMakeLists.txt b/tests/auto/corelib/io/qdir/CMakeLists.txt
new file mode 100644
index 0000000000..84136283c1
--- /dev/null
+++ b/tests/auto/corelib/io/qdir/CMakeLists.txt
@@ -0,0 +1,99 @@
+# Generated from qdir.pro.
+
+#####################################################################
+## tst_qdir Test:
+#####################################################################
+
+# Collect test data
+list(APPEND test_data "testdir")
+list(APPEND test_data "testData")
+list(APPEND test_data "searchdir")
+list(APPEND test_data "resources")
+list(APPEND test_data "entrylist")
+list(APPEND test_data "types")
+list(APPEND test_data "tst_qdir.cpp")
+
+add_qt_test(tst_qdir
+    SOURCES
+        tst_qdir.cpp
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+    TESTDATA ${test_data}
+)
+
+# Resources:
+set(qdir_resource_files
+    "resources/entryList/"
+)
+
+add_qt_resource(tst_qdir "qdir"
+    PREFIX
+        "/tst_qdir/"
+    FILES
+        ${qdir_resource_files}
+)
+
+
+## Scopes:
+#####################################################################
+
+#### Keys ignored in scope 2:.:.:qdir.pro:APPLE_IOS:
+# QMAKE_INFO_PLIST = "Info.plist"
+
+extend_target(tst_qdir CONDITION CONFIG___contains___builtin_testdata
+    DEFINES
+        BUILTIN_TESTDATA
+)
+
+if(ANDROID AND NOT ANDROID_EMBEDDED)
+    # Resources:
+    set(android_testdata_resource_files
+        "entrylist/directory/dummy"
+        "entrylist/file"
+        "resources/entryList/file1.data"
+        "resources/entryList/file2.data"
+        "resources/entryList/file3.data"
+        "resources/entryList/file4.nothing"
+        "searchdir/subdir1/picker.png"
+        "searchdir/subdir2/picker.png"
+        "testData/empty"
+        "testdir/dir/qdir.pro"
+        "testdir/dir/qrc_qdir.cpp"
+        "testdir/dir/tmp/empty"
+        "testdir/dir/tst_qdir.cpp"
+        "testdir/spaces/foo. bar"
+        "testdir/spaces/foo.bar"
+        "tst_qdir.cpp"
+        "types/a"
+        "types/a.a"
+        "types/a.b"
+        "types/a.c"
+        "types/b"
+        "types/b.a"
+        "types/b.b"
+        "types/b.c"
+        "types/c"
+        "types/c.a"
+        "types/c.b"
+        "types/c.c"
+        "types/d.a/dummy"
+        "types/d.b/dummy"
+        "types/d.c/dummy"
+        "types/d/dummy"
+        "types/e.a/dummy"
+        "types/e.b/dummy"
+        "types/e.c/dummy"
+        "types/e/dummy"
+        "types/f.a/dummy"
+        "types/f.b/dummy"
+        "types/f.c/dummy"
+        "types/f/dummy"
+    )
+
+    add_qt_resource(tst_qdir "android_testdata"
+        PREFIX
+            "/android_testdata"
+        FILES
+            ${android_testdata_resource_files}
+    )
+endif()
diff --git a/tests/auto/corelib/io/qdir/testdir/dir/CMakeLists.txt b/tests/auto/corelib/io/qdir/testdir/dir/CMakeLists.txt
new file mode 100644
index 0000000000..e50fcb60ca
--- /dev/null
+++ b/tests/auto/corelib/io/qdir/testdir/dir/CMakeLists.txt
@@ -0,0 +1,13 @@
+# Generated from qdir.pro.
+
+#####################################################################
+## qdir Binary:
+#####################################################################
+
+add_qt_executable(qdir
+    GUI
+    DEFINES
+        QT_DISABLE_DEPRECATED_BEFORE=0
+    PUBLIC_LIBRARIES
+        Qt::Gui
+)
diff --git a/tests/auto/corelib/io/qdiriterator/CMakeLists.txt b/tests/auto/corelib/io/qdiriterator/CMakeLists.txt
new file mode 100644
index 0000000000..2e120b4621
--- /dev/null
+++ b/tests/auto/corelib/io/qdiriterator/CMakeLists.txt
@@ -0,0 +1,38 @@
+# Generated from qdiriterator.pro.
+
+#####################################################################
+## tst_qdiriterator Test:
+#####################################################################
+
+# Collect test data
+list(APPEND test_data "entrylist")
+
+add_qt_test(tst_qdiriterator
+    SOURCES
+        tst_qdiriterator.cpp
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+    TESTDATA ${test_data}
+)
+
+# Resources:
+set(qdiriterator_resource_files
+    "entrylist/directory/dummy"
+    "entrylist/file"
+)
+
+add_qt_resource(tst_qdiriterator "qdiriterator"
+    PREFIX
+        "/testdata/"
+    FILES
+        ${qdiriterator_resource_files}
+)
+
+
+## Scopes:
+#####################################################################
+
+extend_target(tst_qdiriterator CONDITION CONFIG___contains___builtin_testdata
+    DEFINES
+        BUILTIN_TESTDATA
+)
diff --git a/tests/auto/corelib/io/qfile/.prev_CMakeLists.txt b/tests/auto/corelib/io/qfile/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..b976754629
--- /dev/null
+++ b/tests/auto/corelib/io/qfile/.prev_CMakeLists.txt
@@ -0,0 +1,89 @@
+# Generated from qfile.pro.
+
+#####################################################################
+## tst_qfile Test:
+#####################################################################
+
+# Collect test data
+list(APPEND test_data "BLACKLIST")
+list(APPEND test_data "dosfile.txt")
+list(APPEND test_data "noendofline.txt")
+list(APPEND test_data "testfile.txt")
+list(APPEND test_data "testlog.txt")
+list(APPEND test_data "two.dots.file")
+list(APPEND test_data "tst_qfile.cpp")
+list(APPEND test_data "Makefile")
+list(APPEND test_data "forCopying.txt")
+list(APPEND test_data "forRenaming.txt")
+list(APPEND test_data "resources/file1.ext1")
+
+add_qt_test(tst_qfile
+    SOURCES
+        ../../../../shared/emulationdetector.h
+        tst_qfile.cpp
+    INCLUDE_DIRECTORIES
+        ../../../../shared
+    LIBRARIES
+        Qt::CorePrivate
+    TESTDATA ${test_data}
+)
+
+# Resources:
+set(qfile_resource_files
+    "resources/"
+)
+
+add_qt_resource(tst_qfile "qfile"
+    PREFIX
+        "/tst_qfileinfo/"
+    FILES
+        ${qfile_resource_files}
+)
+set(rename-fallback_resource_files
+    "rename-fallback.qrc"
+)
+
+add_qt_resource(tst_qfile "rename-fallback"
+    PREFIX
+        "/"
+    FILES
+        ${rename-fallback_resource_files}
+)
+set(copy-fallback_resource_files
+    "copy-fallback.qrc"
+)
+
+add_qt_resource(tst_qfile "copy-fallback"
+    PREFIX
+        "/"
+    FILES
+        ${copy-fallback_resource_files}
+)
+
+
+## Scopes:
+#####################################################################
+
+extend_target(tst_qfile CONDITION TARGET Qt::Network
+    PUBLIC_LIBRARIES
+        Qt::Network
+)
+
+extend_target(tst_qfile CONDITION NOT TARGET Qt::Network
+    DEFINES
+        QT_NO_NETWORK
+)
+
+extend_target(tst_qfile CONDITION CONFIG___contains___builtin_testdata
+    DEFINES
+        BUILTIN_TESTDATA
+)
+
+extend_target(tst_qfile CONDITION WIN32 AND NOT WINRT
+    PUBLIC_LIBRARIES
+        ole32
+        uuid
+)
+if(NOT WINRT)
+    add_subdirectory(stdinprocess)
+endif()
diff --git a/tests/auto/corelib/io/qfile/CMakeLists.txt b/tests/auto/corelib/io/qfile/CMakeLists.txt
new file mode 100644
index 0000000000..03b648d76f
--- /dev/null
+++ b/tests/auto/corelib/io/qfile/CMakeLists.txt
@@ -0,0 +1,89 @@
+# Generated from qfile.pro.
+
+#####################################################################
+## tst_qfile Test:
+#####################################################################
+
+# Collect test data
+# list(APPEND test_data "BLACKLIST") # special case remove
+list(APPEND test_data "dosfile.txt")
+list(APPEND test_data "noendofline.txt")
+list(APPEND test_data "testfile.txt")
+list(APPEND test_data "testlog.txt")
+list(APPEND test_data "two.dots.file")
+list(APPEND test_data "tst_qfile.cpp")
+# list(APPEND test_data "Makefile") # special case remove
+list(APPEND test_data "forCopying.txt")
+list(APPEND test_data "forRenaming.txt")
+list(APPEND test_data "resources/file1.ext1")
+
+add_qt_test(tst_qfile
+    SOURCES
+        ../../../../shared/emulationdetector.h
+        tst_qfile.cpp
+    INCLUDE_DIRECTORIES
+        ../../../../shared
+    LIBRARIES
+        Qt::CorePrivate
+    TESTDATA ${test_data}
+)
+
+# Resources:
+set(qfile_resource_files
+    "resources/"
+)
+
+add_qt_resource(tst_qfile "qfile"
+    PREFIX
+        "/tst_qfileinfo/"
+    FILES
+        ${qfile_resource_files}
+)
+set(rename-fallback_resource_files
+    "rename-fallback.qrc"
+)
+
+add_qt_resource(tst_qfile "rename-fallback"
+    PREFIX
+        "/"
+    FILES
+        ${rename-fallback_resource_files}
+)
+set(copy-fallback_resource_files
+    "copy-fallback.qrc"
+)
+
+add_qt_resource(tst_qfile "copy-fallback"
+    PREFIX
+        "/"
+    FILES
+        ${copy-fallback_resource_files}
+)
+
+
+## Scopes:
+#####################################################################
+
+extend_target(tst_qfile CONDITION TARGET Qt::Network
+    PUBLIC_LIBRARIES
+        Qt::Network
+)
+
+extend_target(tst_qfile CONDITION NOT TARGET Qt::Network
+    DEFINES
+        QT_NO_NETWORK
+)
+
+extend_target(tst_qfile CONDITION CONFIG___contains___builtin_testdata
+    DEFINES
+        BUILTIN_TESTDATA
+)
+
+extend_target(tst_qfile CONDITION WIN32 AND NOT WINRT
+    PUBLIC_LIBRARIES
+        ole32
+        uuid
+)
+if(NOT WINRT)
+    add_subdirectory(stdinprocess)
+endif()
diff --git a/tests/auto/corelib/io/qfile/stdinprocess/CMakeLists.txt b/tests/auto/corelib/io/qfile/stdinprocess/CMakeLists.txt
new file mode 100644
index 0000000000..994c2fc268
--- /dev/null
+++ b/tests/auto/corelib/io/qfile/stdinprocess/CMakeLists.txt
@@ -0,0 +1,10 @@
+# Generated from stdinprocess.pro.
+
+#####################################################################
+## stdinprocess_helper Binary:
+#####################################################################
+
+add_qt_test_helper(stdinprocess_helper
+    SOURCES
+        main.cpp
+)
diff --git a/tests/auto/corelib/io/qfileinfo/CMakeLists.txt b/tests/auto/corelib/io/qfileinfo/CMakeLists.txt
new file mode 100644
index 0000000000..a6cf3a38f1
--- /dev/null
+++ b/tests/auto/corelib/io/qfileinfo/CMakeLists.txt
@@ -0,0 +1,47 @@
+# Generated from qfileinfo.pro.
+
+#####################################################################
+## tst_qfileinfo Test:
+#####################################################################
+
+add_qt_test(tst_qfileinfo
+    SOURCES
+        tst_qfileinfo.cpp
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+)
+
+# Resources:
+set(qfileinfo_resource_files
+    "resources/"
+)
+
+add_qt_resource(tst_qfileinfo "qfileinfo"
+    PREFIX
+        "/tst_qfileinfo/"
+    FILES
+        ${qfileinfo_resource_files}
+)
+set(testdata_resource_files
+    "resources/file1"
+    "resources/file1.ext1"
+    "resources/file1.ext1.ext2"
+    "tst_qfileinfo.cpp"
+)
+
+add_qt_resource(tst_qfileinfo "testdata"
+    PREFIX
+        "/testdata"
+    FILES
+        ${testdata_resource_files}
+)
+
+
+## Scopes:
+#####################################################################
+
+extend_target(tst_qfileinfo CONDITION WIN32 AND NOT WINRT
+    PUBLIC_LIBRARIES
+        advapi32
+        netapi32
+)
diff --git a/tests/auto/corelib/io/qfileinfo/tst_qfileinfo.cpp b/tests/auto/corelib/io/qfileinfo/tst_qfileinfo.cpp
index 09ef0ea44f..ebb9a0a44c 100644
--- a/tests/auto/corelib/io/qfileinfo/tst_qfileinfo.cpp
+++ b/tests/auto/corelib/io/qfileinfo/tst_qfileinfo.cpp
@@ -116,7 +116,7 @@ static DWORD createSymbolicLink(const QString &symLinkName, const QString &targe
                            reinterpret_cast<const wchar_t*>(nativeTarget.utf16()), flags) == FALSE) {
         result = GetLastError();
         QTextStream(errorMessage) << "CreateSymbolicLink(" <<  nativeSymLinkName << ", "
-            << nativeTarget << ", 0x" << hex << flags << dec << ") failed with error " << result
+            << nativeTarget << ", 0x" << Qt::hex << flags << Qt::dec << ") failed with error " << result
             << ": " << qt_error_string(int(result));
     }
     return result;
diff --git a/tests/auto/corelib/io/qfileselector/platforms/+unix/+darwin/+mac/+ios/test b/tests/auto/corelib/io/qfileselector/platforms/+unix/+darwin/+ios/test
index e69de29bb2..e69de29bb2 100644
--- a/tests/auto/corelib/io/qfileselector/platforms/+unix/+darwin/+mac/+ios/test
+++ b/tests/auto/corelib/io/qfileselector/platforms/+unix/+darwin/+ios/test
diff --git a/tests/auto/corelib/io/qfileselector/platforms/+unix/+darwin/+mac/+osx/+macos/test b/tests/auto/corelib/io/qfileselector/platforms/+unix/+darwin/+mac/+osx/+macos/test
deleted file mode 100644
index e69de29bb2..0000000000
--- a/tests/auto/corelib/io/qfileselector/platforms/+unix/+darwin/+mac/+osx/+macos/test
+++ /dev/null
diff --git a/tests/auto/corelib/io/qfileselector/platforms/+unix/+darwin/+mac/+osx/test b/tests/auto/corelib/io/qfileselector/platforms/+unix/+darwin/+mac/+osx/test
deleted file mode 100644
index e69de29bb2..0000000000
--- a/tests/auto/corelib/io/qfileselector/platforms/+unix/+darwin/+mac/+osx/test
+++ /dev/null
diff --git a/tests/auto/corelib/io/qfileselector/platforms/+unix/+darwin/+mac/test b/tests/auto/corelib/io/qfileselector/platforms/+unix/+darwin/+mac/test
deleted file mode 100644
index e69de29bb2..0000000000
--- a/tests/auto/corelib/io/qfileselector/platforms/+unix/+darwin/+mac/test
+++ /dev/null
diff --git a/tests/auto/corelib/io/qfileselector/platforms/+unix/+darwin/+mac/+macos/test b/tests/auto/corelib/io/qfileselector/platforms/+unix/+darwin/+macos/test
index e69de29bb2..e69de29bb2 100644
--- a/tests/auto/corelib/io/qfileselector/platforms/+unix/+darwin/+mac/+macos/test
+++ b/tests/auto/corelib/io/qfileselector/platforms/+unix/+darwin/+macos/test
diff --git a/tests/auto/corelib/io/qfileselector/qfileselector.qrc b/tests/auto/corelib/io/qfileselector/qfileselector.qrc
index 54b2e0a0e2..f3b3ede575 100644
--- a/tests/auto/corelib/io/qfileselector/qfileselector.qrc
+++ b/tests/auto/corelib/io/qfileselector/qfileselector.qrc
@@ -1,65 +1,51 @@
-<!DOCTYPE RCC><RCC version="1.0">
-<qresource prefix="/">
-   <file>extras/test</file>
-   <file>extras/test2</file>
-   <file>extras/+custom1/test</file>
-   <file>extras/+custom1/test3</file>
-   <file>extras/+custom2/test</file>
-   <file>extras/+custom3/test</file>
-   <file>extras/+custom3/+custom2/test</file>
-   <file>extras/+custom3/+custom4/test</file>
-   <file>extras/+custom3/+custom5/test</file>
-   <file>extras/+custom5/+custom3/test</file>
-
-   <!-- platforms/test: deepest possible selection -->
-   <file>platforms/test</file>
-   <file>platforms/+unix/+android/test</file>
-   <file>platforms/+unix/+darwin/+mac/+ios/test</file>
-   <file>platforms/+unix/+darwin/+mac/+osx/+macos/test</file>
-   <file>platforms/+unix/+darwin/+mac/+osx/test</file>
-   <file>platforms/+unix/+darwin/+mac/test</file>
-   <file>platforms/+unix/+darwin/test</file>
-   <file>platforms/+unix/+haiku/test</file>
-   <file>platforms/+unix/+linux/test</file>
-   <file>platforms/+unix/+qnx/test</file>
-   <file>platforms/+unix/test</file>
-   <file>platforms/+windows/+wince/test</file>
-   <file>platforms/+windows/+winnt/test</file>
-   <file>platforms/+windows/+winrt/test</file>
-   <file>platforms/+windows/test</file>
-   <file>platforms/+android/test</file>
-   <file>platforms/+ios/test</file>
-   <file>platforms/+macos/test</file>
-   <file>platforms/+osx/test</file>
-   <file>platforms/+darwin/test</file>
-   <file>platforms/+mac/test</file>
-   <file>platforms/+haiku/test</file>
-   <file>platforms/+linux/test</file>
-   <file>platforms/+qnx/test</file>
-   <file>platforms/+wince/test</file>
-   <file>platforms/+winrt/test</file>
-
-   <!-- platforms/test2: shallow selection for the deepest selector -->
-   <file>platforms/test2</file>
-   <file>platforms/+android/test2</file>
-   <file>platforms/+ios/test2</file>
-   <file>platforms/+macos/test2</file>
-   <file>platforms/+haiku/test2</file>
-   <file>platforms/+linux/test2</file>
-   <file>platforms/+qnx/test2</file>
-   <file>platforms/+wince/test2</file>
-   <file>platforms/+winnt/test2</file>
-   <file>platforms/+winrt/test2</file>
-
-   <!-- platforms/test3: selection for the family only -->
-   <file>platforms/test3</file>
-   <file>platforms/+windows/test3</file>
-   <file>platforms/+unix/test3</file>
-
-   <!-- platforms/test4 and 5: special cases for macOS -->
-   <file>platforms/test4</file>
-   <file>platforms/+osx/test4</file>
-   <file>platforms/test5</file>
-   <file>platforms/+mac/test5</file>
-</qresource>
+<RCC>
+    <qresource prefix="/">
+        <file>extras/test</file>
+        <file>extras/test2</file>
+        <file>extras/+custom1/test</file>
+        <file>extras/+custom1/test3</file>
+        <file>extras/+custom2/test</file>
+        <file>extras/+custom3/test</file>
+        <file>extras/+custom3/+custom2/test</file>
+        <file>extras/+custom3/+custom4/test</file>
+        <file>extras/+custom3/+custom5/test</file>
+        <file>extras/+custom5/+custom3/test</file>
+        <file>platforms/test</file>
+        <file>platforms/+unix/+android/test</file>
+        <file>platforms/+unix/+darwin/test</file>
+        <file>platforms/+unix/+haiku/test</file>
+        <file>platforms/+unix/+linux/test</file>
+        <file>platforms/+unix/+qnx/test</file>
+        <file>platforms/+unix/test</file>
+        <file>platforms/+windows/+wince/test</file>
+        <file>platforms/+windows/+winnt/test</file>
+        <file>platforms/+windows/+winrt/test</file>
+        <file>platforms/+windows/test</file>
+        <file>platforms/+android/test</file>
+        <file>platforms/+ios/test</file>
+        <file>platforms/+macos/test</file>
+        <file>platforms/+darwin/test</file>
+        <file>platforms/+haiku/test</file>
+        <file>platforms/+linux/test</file>
+        <file>platforms/+qnx/test</file>
+        <file>platforms/+wince/test</file>
+        <file>platforms/+winrt/test</file>
+        <file>platforms/test2</file>
+        <file>platforms/+android/test2</file>
+        <file>platforms/+ios/test2</file>
+        <file>platforms/+macos/test2</file>
+        <file>platforms/+haiku/test2</file>
+        <file>platforms/+linux/test2</file>
+        <file>platforms/+qnx/test2</file>
+        <file>platforms/+wince/test2</file>
+        <file>platforms/+winnt/test2</file>
+        <file>platforms/+winrt/test2</file>
+        <file>platforms/test3</file>
+        <file>platforms/+windows/test3</file>
+        <file>platforms/+unix/test3</file>
+        <file>platforms/test4</file>
+        <file>platforms/test5</file>
+        <file>platforms/+unix/+darwin/+macos/test</file>
+        <file>platforms/+unix/+darwin/+ios/test</file>
+    </qresource>
 </RCC>
diff --git a/tests/auto/corelib/io/qfileselector/tst_qfileselector.cpp b/tests/auto/corelib/io/qfileselector/tst_qfileselector.cpp
index 11b1fdaeeb..bac7a69e0f 100644
--- a/tests/auto/corelib/io/qfileselector/tst_qfileselector.cpp
+++ b/tests/auto/corelib/io/qfileselector/tst_qfileselector.cpp
@@ -126,14 +126,6 @@ void tst_QFileSelector::basicTest_data()
     QTest::newRow("platform3") << QString(":/platforms/test3") << QStringList()
                                << expectedPlatform3File;
 
-#ifdef Q_OS_MACOS
-    // special case for compatibility code
-    QTest::newRow("osx-compat") << QString(":/platforms/test4") << QStringList()
-                                << ":/platforms/+osx/test4";
-    QTest::newRow("mac-compat") << QString(":/platforms/test5") << QStringList()
-                                << ":/platforms/+mac/test5";
-#endif
-
     QString resourceTestPath(":/extras/test");
     QString custom1("custom1");
     QTest::newRow("custom1-noselector") << resourceTestPath << QStringList()
diff --git a/tests/auto/corelib/io/qfilesystementry/CMakeLists.txt b/tests/auto/corelib/io/qfilesystementry/CMakeLists.txt
new file mode 100644
index 0000000000..e989315bdd
--- /dev/null
+++ b/tests/auto/corelib/io/qfilesystementry/CMakeLists.txt
@@ -0,0 +1,13 @@
+# Generated from qfilesystementry.pro.
+
+#####################################################################
+## tst_qfilesystementry Test:
+#####################################################################
+
+add_qt_test(tst_qfilesystementry
+    SOURCES
+        ${QT_SOURCE_TREE}/src/corelib/io/qfilesystementry.cpp ${QT_SOURCE_TREE}/src/corelib/io/qfilesystementry_p.h
+        tst_qfilesystementry.cpp
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+)
diff --git a/tests/auto/corelib/io/qfilesystemmetadata/CMakeLists.txt b/tests/auto/corelib/io/qfilesystemmetadata/CMakeLists.txt
new file mode 100644
index 0000000000..a237090a48
--- /dev/null
+++ b/tests/auto/corelib/io/qfilesystemmetadata/CMakeLists.txt
@@ -0,0 +1,12 @@
+# Generated from qfilesystemmetadata.pro.
+
+#####################################################################
+## tst_qfilesystemmetadata Test:
+#####################################################################
+
+add_qt_test(tst_qfilesystemmetadata
+    SOURCES
+        tst_qfilesystemmetadata.cpp
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+)
diff --git a/tests/auto/corelib/io/qfilesystemwatcher/CMakeLists.txt b/tests/auto/corelib/io/qfilesystemwatcher/CMakeLists.txt
new file mode 100644
index 0000000000..1dfef5acab
--- /dev/null
+++ b/tests/auto/corelib/io/qfilesystemwatcher/CMakeLists.txt
@@ -0,0 +1,10 @@
+# Generated from qfilesystemwatcher.pro.
+
+#####################################################################
+## tst_qfilesystemwatcher Test:
+#####################################################################
+
+add_qt_test(tst_qfilesystemwatcher
+    SOURCES
+        tst_qfilesystemwatcher.cpp
+)
diff --git a/tests/auto/corelib/io/qiodevice/CMakeLists.txt b/tests/auto/corelib/io/qiodevice/CMakeLists.txt
new file mode 100644
index 0000000000..6b7833ac22
--- /dev/null
+++ b/tests/auto/corelib/io/qiodevice/CMakeLists.txt
@@ -0,0 +1,36 @@
+# Generated from qiodevice.pro.
+
+#####################################################################
+## tst_qiodevice Test:
+#####################################################################
+
+# Collect test data
+list(APPEND test_data "tst_qiodevice.cpp")
+
+add_qt_test(tst_qiodevice
+    SOURCES
+        tst_qiodevice.cpp
+    PUBLIC_LIBRARIES
+        Qt::Network
+    TESTDATA ${test_data}
+)
+
+#### Keys ignored in scope 1:.:.:qiodevice.pro:<TRUE>:
+# MOC_DIR = "tmp"
+
+## Scopes:
+#####################################################################
+
+if(ANDROID AND NOT ANDROID_EMBEDDED)
+    # Resources:
+    set(android_testdata_resource_files
+        "tst_qiodevice.cpp"
+    )
+
+    add_qt_resource(tst_qiodevice "android_testdata"
+        PREFIX
+            "/"
+        FILES
+            ${android_testdata_resource_files}
+    )
+endif()
diff --git a/tests/auto/corelib/io/qipaddress/CMakeLists.txt b/tests/auto/corelib/io/qipaddress/CMakeLists.txt
new file mode 100644
index 0000000000..821cd58bdb
--- /dev/null
+++ b/tests/auto/corelib/io/qipaddress/CMakeLists.txt
@@ -0,0 +1,12 @@
+# Generated from qipaddress.pro.
+
+#####################################################################
+## tst_qipaddress Test:
+#####################################################################
+
+add_qt_test(tst_qipaddress
+    SOURCES
+        tst_qipaddress.cpp
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+)
diff --git a/tests/auto/corelib/io/qlockfile/CMakeLists.txt b/tests/auto/corelib/io/qlockfile/CMakeLists.txt
new file mode 100644
index 0000000000..52bd7bfd8f
--- /dev/null
+++ b/tests/auto/corelib/io/qlockfile/CMakeLists.txt
@@ -0,0 +1,23 @@
+# Generated from qlockfile.pro.
+
+#####################################################################
+## tst_qlockfile Test:
+#####################################################################
+
+add_qt_test(tst_qlockfile
+    SOURCES
+        tst_qlockfile.cpp
+    LIBRARIES
+        Qt::CorePrivate
+    PUBLIC_LIBRARIES
+        Qt::Concurrent
+)
+
+## Scopes:
+#####################################################################
+
+extend_target(tst_qlockfile CONDITION WIN32 AND NOT WINRT
+    PUBLIC_LIBRARIES
+        advapi32
+)
+add_subdirectory(qlockfiletesthelper)
diff --git a/tests/auto/corelib/io/qlockfile/qlockfiletesthelper/.prev_CMakeLists.txt b/tests/auto/corelib/io/qlockfile/qlockfiletesthelper/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..755dc7cf39
--- /dev/null
+++ b/tests/auto/corelib/io/qlockfile/qlockfiletesthelper/.prev_CMakeLists.txt
@@ -0,0 +1,11 @@
+# Generated from qlockfile_test_helper.pro.
+
+#####################################################################
+## qlockfile_test_helper Binary:
+#####################################################################
+
+add_qt_executable(qlockfile_test_helper
+    OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
+    SOURCES
+        qlockfile_test_helper.cpp
+)
diff --git a/tests/auto/corelib/io/qlockfile/qlockfiletesthelper/CMakeLists.txt b/tests/auto/corelib/io/qlockfile/qlockfiletesthelper/CMakeLists.txt
new file mode 100644
index 0000000000..b515037d56
--- /dev/null
+++ b/tests/auto/corelib/io/qlockfile/qlockfiletesthelper/CMakeLists.txt
@@ -0,0 +1,12 @@
+# Generated from qlockfile_test_helper.pro.
+
+#####################################################################
+## qlockfile_test_helper Binary:
+#####################################################################
+
+add_qt_test_helper(qlockfile_test_helper # special case
+    OVERRIDE_OUTPUT_DIRECTORY # special case
+    OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
+    SOURCES
+        qlockfile_test_helper.cpp
+)
diff --git a/tests/auto/corelib/io/qloggingcategory/CMakeLists.txt b/tests/auto/corelib/io/qloggingcategory/CMakeLists.txt
new file mode 100644
index 0000000000..9e1eaf3e4a
--- /dev/null
+++ b/tests/auto/corelib/io/qloggingcategory/CMakeLists.txt
@@ -0,0 +1,15 @@
+# Generated from qloggingcategory.pro.
+
+#####################################################################
+## tst_qloggingcategory Test:
+#####################################################################
+
+add_qt_test(tst_qloggingcategory
+    SOURCES
+        tst_qloggingcategory.cpp
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+)
+
+#### Keys ignored in scope 1:.:.:qloggingcategory.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/auto/corelib/io/qloggingregistry/CMakeLists.txt b/tests/auto/corelib/io/qloggingregistry/CMakeLists.txt
new file mode 100644
index 0000000000..3c42af9d01
--- /dev/null
+++ b/tests/auto/corelib/io/qloggingregistry/CMakeLists.txt
@@ -0,0 +1,36 @@
+# Generated from qloggingregistry.pro.
+
+#####################################################################
+## tst_qloggingregistry Test:
+#####################################################################
+
+# Collect test data
+list(APPEND test_data "qtlogging.ini")
+
+add_qt_test(tst_qloggingregistry
+    SOURCES
+        tst_qloggingregistry.cpp
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+    TESTDATA ${test_data}
+)
+
+#### Keys ignored in scope 1:.:.:qloggingregistry.pro:<TRUE>:
+# TEMPLATE = "app"
+
+## Scopes:
+#####################################################################
+
+if(ANDROID AND NOT ANDROID_EMBEDDED)
+    # Resources:
+    set(android_testdata_resource_files
+        "qtlogging.ini"
+    )
+
+    add_qt_resource(tst_qloggingregistry "android_testdata"
+        PREFIX
+            "/"
+        FILES
+            ${android_testdata_resource_files}
+    )
+endif()
diff --git a/tests/auto/corelib/io/qnodebug/CMakeLists.txt b/tests/auto/corelib/io/qnodebug/CMakeLists.txt
new file mode 100644
index 0000000000..4d1b57e222
--- /dev/null
+++ b/tests/auto/corelib/io/qnodebug/CMakeLists.txt
@@ -0,0 +1,10 @@
+# Generated from qnodebug.pro.
+
+#####################################################################
+## tst_qnodebug Test:
+#####################################################################
+
+add_qt_test(tst_qnodebug
+    SOURCES
+        tst_qnodebug.cpp
+)
diff --git a/tests/auto/corelib/io/qprocess-noapplication/CMakeLists.txt b/tests/auto/corelib/io/qprocess-noapplication/CMakeLists.txt
new file mode 100644
index 0000000000..ce6195fc37
--- /dev/null
+++ b/tests/auto/corelib/io/qprocess-noapplication/CMakeLists.txt
@@ -0,0 +1,10 @@
+# Generated from qprocess-noapplication.pro.
+
+#####################################################################
+## qprocess-noapplication Test:
+#####################################################################
+
+add_qt_test(qprocess-noapplication
+    SOURCES
+        tst_qprocessnoapplication.cpp
+)
diff --git a/tests/auto/corelib/io/qprocess/tst_qprocess.cpp b/tests/auto/corelib/io/qprocess/tst_qprocess.cpp
index 3de1bef789..f0fd3768a7 100644
--- a/tests/auto/corelib/io/qprocess/tst_qprocess.cpp
+++ b/tests/auto/corelib/io/qprocess/tst_qprocess.cpp
@@ -42,8 +42,6 @@
 #include <QtNetwork/QHostInfo>
 #include <stdlib.h>
 
-typedef void (QProcess::*QProcessFinishedSignal1)(int);
-typedef void (QProcess::*QProcessFinishedSignal2)(int, QProcess::ExitStatus);
 typedef void (QProcess::*QProcessErrorSignal)(QProcess::ProcessError);
 
 class tst_QProcess : public QObject
@@ -152,7 +150,6 @@ private slots:
     void failToStartEmptyArgs();
 
 #if QT_DEPRECATED_SINCE(5, 13)
-    void crashTest2_deprecated();
     void restartProcessDeadlock_deprecated();
     void waitForReadyReadInAReadyReadSlot_deprecated();
     void finishProcessBeforeReadingDone_deprecated();
@@ -350,7 +347,7 @@ void tst_QProcess::crashTest()
     qRegisterMetaType<QProcess::ExitStatus>("QProcess::ExitStatus");
 
     QSignalSpy spy(process.data(), &QProcess::errorOccurred);
-    QSignalSpy spy2(process.data(), static_cast<QProcessFinishedSignal2>(&QProcess::finished));
+    QSignalSpy spy2(process.data(), &QProcess::finished);
     QVERIFY(spy.isValid());
     QVERIFY(spy2.isValid());
 
@@ -393,13 +390,12 @@ void tst_QProcess::crashTest2()
     qRegisterMetaType<QProcess::ExitStatus>("QProcess::ExitStatus");
 
     QSignalSpy spy(&process, static_cast<QProcessErrorSignal>(&QProcess::errorOccurred));
-    QSignalSpy spy2(&process, static_cast<QProcessFinishedSignal2>(&QProcess::finished));
+    QSignalSpy spy2(&process, &QProcess::finished);
 
     QVERIFY(spy.isValid());
     QVERIFY(spy2.isValid());
 
-    QObject::connect(&process, static_cast<QProcessFinishedSignal2>(&QProcess::finished),
-                     this, &tst_QProcess::exitLoopSlot);
+    QObject::connect(&process, &QProcess::finished, this, &tst_QProcess::exitLoopSlot);
 
     QTestEventLoop::instance().enterLoop(30);
     if (QTestEventLoop::instance().timeout())
@@ -724,15 +720,14 @@ void tst_QProcess::restartProcessDeadlock()
     // process in the finished() connected slot causes a deadlock
     // because of the way QProcessManager uses its locks.
     QProcess process;
-    connect(&process, static_cast<QProcessFinishedSignal2>(&QProcess::finished),
-            this, &tst_QProcess::restartProcess);
+    connect(&process, &QProcess::finished, this, &tst_QProcess::restartProcess);
 
     process.start("testProcessEcho/testProcessEcho");
 
     QCOMPARE(process.write("", 1), qlonglong(1));
     QVERIFY(process.waitForFinished(5000));
 
-    QObject::disconnect(&process, static_cast<QProcessFinishedSignal2>(&QProcess::finished), nullptr, nullptr);
+    QObject::disconnect(&process, &QProcess::finished, nullptr, nullptr);
 
     QCOMPARE(process.write("", 1), qlonglong(1));
     QVERIFY(process.waitForFinished(5000));
@@ -931,8 +926,7 @@ public:
 
     SoftExitProcess(int n) : waitedForFinished(false), n(n), killing(false)
     {
-        connect(this, static_cast<QProcessFinishedSignal2>(&QProcess::finished),
-                this, &SoftExitProcess::finishedSlot);
+        connect(this, &QProcess::finished, this, &SoftExitProcess::finishedSlot);
 
         switch (n) {
         case 0:
@@ -1177,8 +1171,7 @@ protected:
         exitCode = 90210;
 
         QProcess process;
-        connect(&process, static_cast<QProcessFinishedSignal2>(&QProcess::finished),
-                this, &TestThread::catchExitCode, Qt::DirectConnection);
+        connect(&process, &QProcess::finished, this, &TestThread::catchExitCode, Qt::DirectConnection);
 
         process.start("testProcessEcho/testProcessEcho");
 
@@ -1251,8 +1244,7 @@ void tst_QProcess::waitForReadyReadInAReadyReadSlot()
 {
     QProcess process;
     connect(&process, &QIODevice::readyRead, this, &tst_QProcess::waitForReadyReadInAReadyReadSlotSlot);
-    connect(&process, static_cast<QProcessFinishedSignal2>(&QProcess::finished),
-            this, &tst_QProcess::exitLoopSlot);
+    connect(&process, &QProcess::finished, this, &tst_QProcess::exitLoopSlot);
     bytesAvailable = 0;
 
     process.start("testProcessEcho/testProcessEcho");
@@ -1490,7 +1482,7 @@ void tst_QProcess::failToStart()
     QProcess process;
     QSignalSpy stateSpy(&process, &QProcess::stateChanged);
     QSignalSpy errorSpy(&process, &QProcess::errorOccurred);
-    QSignalSpy finishedSpy(&process, static_cast<QProcessFinishedSignal2>(&QProcess::finished));
+    QSignalSpy finishedSpy(&process, &QProcess::finished);
     QVERIFY(stateSpy.isValid());
     QVERIFY(errorSpy.isValid());
     QVERIFY(finishedSpy.isValid());
@@ -1499,10 +1491,6 @@ void tst_QProcess::failToStart()
     QSignalSpy errorSpy2(&process, static_cast<QProcessErrorSignal>(&QProcess::error));
     QVERIFY(errorSpy2.isValid());
 #endif
-#if QT_DEPRECATED_SINCE(5, 13)
-    QSignalSpy finishedSpy2(&process, static_cast<QProcessFinishedSignal1>(&QProcess::finished));
-    QVERIFY(finishedSpy2.isValid());
-#endif
 
 // OS X and HP-UX have a really low default process limit (~100), so spawning
 // to many processes here will cause test failures later on.
@@ -1548,9 +1536,6 @@ void tst_QProcess::failToStart()
 #if QT_DEPRECATED_SINCE(5, 6)
             QCOMPARE(errorSpy2.count(), j * attempts + i + 1);
 #endif
-#if QT_DEPRECATED_SINCE(5, 13)
-            QCOMPARE(finishedSpy2.count(), 0);
-#endif
 
             int it = j * attempts + i + 1;
 
@@ -1569,7 +1554,7 @@ void tst_QProcess::failToStartWithWait()
     QProcess process;
     QEventLoop loop;
     QSignalSpy errorSpy(&process, &QProcess::errorOccurred);
-    QSignalSpy finishedSpy(&process, static_cast<QProcessFinishedSignal2>(&QProcess::finished));
+    QSignalSpy finishedSpy(&process, &QProcess::finished);
     QVERIFY(errorSpy.isValid());
     QVERIFY(finishedSpy.isValid());
 
@@ -1577,10 +1562,6 @@ void tst_QProcess::failToStartWithWait()
     QSignalSpy errorSpy2(&process, static_cast<QProcessErrorSignal>(&QProcess::error));
     QVERIFY(errorSpy2.isValid());
 #endif
-#if QT_DEPRECATED_SINCE(5, 13)
-    QSignalSpy finishedSpy2(&process, static_cast<QProcessFinishedSignal1>(&QProcess::finished));
-    QVERIFY(finishedSpy2.isValid());
-#endif
 
     for (int i = 0; i < 50; ++i) {
         process.start("/blurp", QStringList() << "-v" << "-debug");
@@ -1592,10 +1573,6 @@ void tst_QProcess::failToStartWithWait()
 #if QT_DEPRECATED_SINCE(5, 6)
         QCOMPARE(errorSpy2.count(), i + 1);
 #endif
-#if QT_DEPRECATED_SINCE(5, 13)
-        QCOMPARE(finishedSpy2.count(), 0);
-#endif
-
     }
 }
 
@@ -1607,7 +1584,7 @@ void tst_QProcess::failToStartWithEventLoop()
     QProcess process;
     QEventLoop loop;
     QSignalSpy errorSpy(&process, &QProcess::errorOccurred);
-    QSignalSpy finishedSpy(&process, static_cast<QProcessFinishedSignal2>(&QProcess::finished));
+    QSignalSpy finishedSpy(&process, &QProcess::finished);
     QVERIFY(errorSpy.isValid());
     QVERIFY(finishedSpy.isValid());
 
@@ -1615,10 +1592,6 @@ void tst_QProcess::failToStartWithEventLoop()
     QSignalSpy errorSpy2(&process, static_cast<QProcessErrorSignal>(&QProcess::error));
     QVERIFY(errorSpy2.isValid());
 #endif
-#if QT_DEPRECATED_SINCE(5, 13)
-    QSignalSpy finishedSpy2(&process, static_cast<QProcessFinishedSignal1>(&QProcess::finished));
-    QVERIFY(finishedSpy2.isValid());
-#endif
 
     // The error signal may be emitted before start() returns
     connect(&process, &QProcess::errorOccurred, &loop, &QEventLoop::quit, Qt::QueuedConnection);
@@ -1635,9 +1608,6 @@ void tst_QProcess::failToStartWithEventLoop()
 #if QT_DEPRECATED_SINCE(5, 6)
         QCOMPARE(errorSpy2.count(), i + 1);
 #endif
-#if QT_DEPRECATED_SINCE(5, 13)
-        QCOMPARE(finishedSpy2.count(), 0);
-#endif
     }
 }
 
@@ -1912,7 +1882,7 @@ void tst_QProcess::waitForReadyReadForNonexistantProcess()
 
     QProcess process;
     QSignalSpy errorSpy(&process, &QProcess::errorOccurred);
-    QSignalSpy finishedSpy(&process, static_cast<QProcessFinishedSignal2>(&QProcess::finished));
+    QSignalSpy finishedSpy(&process, &QProcess::finished);
     QVERIFY(errorSpy.isValid());
     QVERIFY(finishedSpy.isValid());
 
@@ -1920,10 +1890,6 @@ void tst_QProcess::waitForReadyReadForNonexistantProcess()
     QSignalSpy errorSpy2(&process, static_cast<QProcessErrorSignal>(&QProcess::error));
         QVERIFY(errorSpy2.isValid());
 #endif
-#if QT_DEPRECATED_SINCE(5, 13)
-    QSignalSpy finishedSpy1(&process, static_cast<QProcessFinishedSignal1>(&QProcess::finished));
-    QVERIFY(finishedSpy1.isValid());
-#endif
 
     QVERIFY(!process.waitForReadyRead()); // used to crash
     process.start("doesntexist");
@@ -1935,9 +1901,6 @@ void tst_QProcess::waitForReadyReadForNonexistantProcess()
     QCOMPARE(errorSpy2.count(), 1);
     QCOMPARE(errorSpy2.at(0).at(0).toInt(), 0);
 #endif
-#if QT_DEPRECATED_SINCE(5, 13)
-    QCOMPARE(finishedSpy1.count(), 0);
-#endif
 }
 
 void tst_QProcess::setStandardInputFile()
@@ -2390,7 +2353,7 @@ void tst_QProcess::onlyOneStartedSignal()
     QProcess process;
 
     QSignalSpy spyStarted(&process,  &QProcess::started);
-    QSignalSpy spyFinished(&process, static_cast<QProcessFinishedSignal2>(&QProcess::finished));
+    QSignalSpy spyFinished(&process, &QProcess::finished);
 
     QVERIFY(spyStarted.isValid());
     QVERIFY(spyFinished.isValid());
@@ -2433,8 +2396,7 @@ void tst_QProcess::finishProcessBeforeReadingDone()
     QProcess process;
     BlockOnReadStdOut blocker(&process);
     QEventLoop loop;
-    connect(&process, static_cast<QProcessFinishedSignal2>(&QProcess::finished),
-            &loop, &QEventLoop::quit);
+    connect(&process, &QProcess::finished, &loop, &QEventLoop::quit);
     process.start("testProcessOutput/testProcessOutput");
     QVERIFY(process.waitForStarted());
     loop.exec();
@@ -2581,52 +2543,20 @@ void tst_QProcess::processEventsInAReadyReadSlot()
 
 #if QT_DEPRECATED_SINCE(5, 13)
 
-void tst_QProcess::crashTest2_deprecated()
-{
-    QProcess process;
-    process.start("testProcessCrash/testProcessCrash");
-    QVERIFY(process.waitForStarted(5000));
-
-    qRegisterMetaType<QProcess::ProcessError>("QProcess::ProcessError");
-    qRegisterMetaType<QProcess::ExitStatus>("QProcess::ExitStatus");
-
-    QSignalSpy spy(&process, static_cast<QProcessErrorSignal>(&QProcess::errorOccurred));
-    QSignalSpy spy2(&process, static_cast<QProcessFinishedSignal2>(&QProcess::finished));
-
-    QVERIFY(spy.isValid());
-    QVERIFY(spy2.isValid());
-
-    QObject::connect(&process, static_cast<QProcessFinishedSignal1>(&QProcess::finished),
-                     this, &tst_QProcess::exitLoopSlot);
-
-    QTestEventLoop::instance().enterLoop(30);
-    if (QTestEventLoop::instance().timeout())
-        QFAIL("Failed to detect crash : operation timed out");
-
-    QCOMPARE(spy.count(), 1);
-    QCOMPARE(*static_cast<const QProcess::ProcessError *>(spy.at(0).at(0).constData()), QProcess::Crashed);
-
-    QCOMPARE(spy2.count(), 1);
-    QCOMPARE(*static_cast<const QProcess::ExitStatus *>(spy2.at(0).at(1).constData()), QProcess::CrashExit);
-
-    QCOMPARE(process.exitStatus(), QProcess::CrashExit);
-}
-
 void tst_QProcess::restartProcessDeadlock_deprecated()
 {
     // The purpose of this test is to detect whether restarting a
     // process in the finished() connected slot causes a deadlock
     // because of the way QProcessManager uses its locks.
     QProcess process;
-    connect(&process, static_cast<QProcessFinishedSignal1>(&QProcess::finished),
-            this, &tst_QProcess::restartProcess);
+    connect(&process, &QProcess::finished, this, &tst_QProcess::restartProcess);
 
     process.start("testProcessEcho/testProcessEcho");
 
     QCOMPARE(process.write("", 1), qlonglong(1));
     QVERIFY(process.waitForFinished(5000));
 
-    QObject::disconnect(&process, static_cast<QProcessFinishedSignal1>(&QProcess::finished), nullptr, nullptr);
+    QObject::disconnect(&process, &QProcess::finished, nullptr, nullptr);
 
     QCOMPARE(process.write("", 1), qlonglong(1));
     QVERIFY(process.waitForFinished(5000));
@@ -2638,8 +2568,7 @@ void tst_QProcess::waitForReadyReadInAReadyReadSlot_deprecated()
 {
     QProcess process;
     connect(&process, &QIODevice::readyRead, this, &tst_QProcess::waitForReadyReadInAReadyReadSlotSlot);
-    connect(&process, static_cast<QProcessFinishedSignal1>(&QProcess::finished),
-            this, &tst_QProcess::exitLoopSlot);
+    connect(&process, &QProcess::finished, this, &tst_QProcess::exitLoopSlot);
     bytesAvailable = 0;
 
     process.start("testProcessEcho/testProcessEcho");
@@ -2665,8 +2594,7 @@ void tst_QProcess::finishProcessBeforeReadingDone_deprecated()
     QProcess process;
     BlockOnReadStdOut blocker(&process);
     QEventLoop loop;
-    connect(&process, static_cast<QProcessFinishedSignal1>(&QProcess::finished),
-            &loop, &QEventLoop::quit);
+    connect(&process, &QProcess::finished, &loop, &QEventLoop::quit);
     process.start("testProcessOutput/testProcessOutput");
     QVERIFY(process.waitForStarted());
     loop.exec();
diff --git a/tests/auto/corelib/io/qprocessenvironment/CMakeLists.txt b/tests/auto/corelib/io/qprocessenvironment/CMakeLists.txt
new file mode 100644
index 0000000000..dbcd8c8172
--- /dev/null
+++ b/tests/auto/corelib/io/qprocessenvironment/CMakeLists.txt
@@ -0,0 +1,10 @@
+# Generated from qprocessenvironment.pro.
+
+#####################################################################
+## tst_qprocessenvironment Test:
+#####################################################################
+
+add_qt_test(tst_qprocessenvironment
+    SOURCES
+        tst_qprocessenvironment.cpp
+)
diff --git a/tests/auto/corelib/io/qsavefile/CMakeLists.txt b/tests/auto/corelib/io/qsavefile/CMakeLists.txt
new file mode 100644
index 0000000000..aec5da1f99
--- /dev/null
+++ b/tests/auto/corelib/io/qsavefile/CMakeLists.txt
@@ -0,0 +1,14 @@
+# Generated from qsavefile.pro.
+
+#####################################################################
+## tst_qsavefile Test:
+#####################################################################
+
+# Collect test data
+list(APPEND test_data "tst_qsavefile.cpp")
+
+add_qt_test(tst_qsavefile
+    SOURCES
+        tst_qsavefile.cpp
+    TESTDATA ${test_data}
+)
diff --git a/tests/auto/corelib/io/qsettings/CMakeLists.txt b/tests/auto/corelib/io/qsettings/CMakeLists.txt
new file mode 100644
index 0000000000..161b03b041
--- /dev/null
+++ b/tests/auto/corelib/io/qsettings/CMakeLists.txt
@@ -0,0 +1,50 @@
+# Generated from qsettings.pro.
+
+#####################################################################
+## tst_qsettings Test:
+#####################################################################
+
+add_qt_test(tst_qsettings
+    SOURCES
+        tst_qsettings.cpp
+    DEFINES
+        QT_DISABLE_DEPRECATED_BEFORE=0
+    INCLUDE_DIRECTORIES
+        ../../kernel/qmetatype
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::Gui
+)
+
+# Resources:
+set(qsettings_resource_files
+    "bom.ini"
+    "resourcefile.ini"
+    "resourcefile2.ini"
+    "resourcefile3.ini"
+    "resourcefile4.ini"
+    "resourcefile5.ini"
+    "resourcefile6.plist"
+    "withcomments.ini"
+)
+
+add_qt_resource(tst_qsettings "qsettings"
+    PREFIX
+        "/"
+    FILES
+        ${qsettings_resource_files}
+)
+
+
+## Scopes:
+#####################################################################
+
+extend_target(tst_qsettings CONDITION MSVC
+    PUBLIC_LIBRARIES
+        advapi32
+)
+
+extend_target(tst_qsettings CONDITION APPLE
+    PUBLIC_LIBRARIES
+        ${FWCoreFoundation}
+)
diff --git a/tests/auto/corelib/io/qsettings/tst_qsettings.cpp b/tests/auto/corelib/io/qsettings/tst_qsettings.cpp
index 57bab115bb..427ce1a424 100644
--- a/tests/auto/corelib/io/qsettings/tst_qsettings.cpp
+++ b/tests/auto/corelib/io/qsettings/tst_qsettings.cpp
@@ -39,7 +39,9 @@
 #include <QtCore/QDir>
 #include <QtCore/QThread>
 #include <QtCore/QSysInfo>
-#include <QtGui/QKeySequence>
+#if QT_CONFIG(shortcut)
+#  include <QtGui/QKeySequence>
+#endif
 
 #include <QtCore>
 #include <QtGui>
@@ -1364,6 +1366,7 @@ void tst_QSettings::testVariantTypes()
     dt.setOffsetFromUtc(3600);
     testVal("key14", dt, QDateTime, DateTime);
 
+#if QT_CONFIG(shortcut)
     // We store key sequences as strings instead of binary variant blob, for improved
     // readability in the resulting format.
     if (format >= QSettings::InvalidFormat) {
@@ -1373,6 +1376,7 @@ void tst_QSettings::testVariantTypes()
                 QKeySequence(Qt::ControlModifier + Qt::Key_F1).toString(QKeySequence::NativeText),
                 QString, String);
     }
+#endif // QT_CONFIG(shortcut)
 
 #undef testVal
 }
diff --git a/tests/auto/corelib/io/qstandardpaths/CMakeLists.txt b/tests/auto/corelib/io/qstandardpaths/CMakeLists.txt
new file mode 100644
index 0000000000..5bceaf1d77
--- /dev/null
+++ b/tests/auto/corelib/io/qstandardpaths/CMakeLists.txt
@@ -0,0 +1,26 @@
+# Generated from qstandardpaths.pro.
+
+#####################################################################
+## tst_qstandardpaths Test:
+#####################################################################
+
+# Collect test data
+list(APPEND test_data "tst_qstandardpaths.cpp")
+list(APPEND test_data "qstandardpaths.pro")
+
+add_qt_test(tst_qstandardpaths
+    SOURCES
+        ../../../../shared/emulationdetector.h
+        tst_qstandardpaths.cpp
+    INCLUDE_DIRECTORIES
+        ../../../../shared
+    TESTDATA ${test_data}
+)
+
+## Scopes:
+#####################################################################
+
+extend_target(tst_qstandardpaths CONDITION boot2qt
+    DEFINES
+        SKIP_FINDEXECUTABLE
+)
diff --git a/tests/auto/corelib/io/qstorageinfo/CMakeLists.txt b/tests/auto/corelib/io/qstorageinfo/CMakeLists.txt
new file mode 100644
index 0000000000..08af02dc6c
--- /dev/null
+++ b/tests/auto/corelib/io/qstorageinfo/CMakeLists.txt
@@ -0,0 +1,12 @@
+# Generated from qstorageinfo.pro.
+
+#####################################################################
+## tst_qstorageinfo Test:
+#####################################################################
+
+add_qt_test(tst_qstorageinfo
+    SOURCES
+        tst_qstorageinfo.cpp
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+)
diff --git a/tests/auto/corelib/io/qtemporarydir/CMakeLists.txt b/tests/auto/corelib/io/qtemporarydir/CMakeLists.txt
new file mode 100644
index 0000000000..855495bbbb
--- /dev/null
+++ b/tests/auto/corelib/io/qtemporarydir/CMakeLists.txt
@@ -0,0 +1,15 @@
+# Generated from qtemporarydir.pro.
+
+#####################################################################
+## tst_qtemporarydir Test:
+#####################################################################
+
+add_qt_test(tst_qtemporarydir
+    SOURCES
+        ../../../../shared/emulationdetector.h
+        tst_qtemporarydir.cpp
+    INCLUDE_DIRECTORIES
+        ../../../../shared
+    PUBLIC_LIBRARIES
+        Qt::TestPrivate
+)
diff --git a/tests/auto/corelib/io/qtemporaryfile/CMakeLists.txt b/tests/auto/corelib/io/qtemporaryfile/CMakeLists.txt
new file mode 100644
index 0000000000..af614552cc
--- /dev/null
+++ b/tests/auto/corelib/io/qtemporaryfile/CMakeLists.txt
@@ -0,0 +1,47 @@
+# Generated from qtemporaryfile.pro.
+
+#####################################################################
+## tst_qtemporaryfile Test:
+#####################################################################
+
+# Collect test data
+list(APPEND test_data "tst_qtemporaryfile.cpp")
+
+add_qt_test(tst_qtemporaryfile
+    SOURCES
+        tst_qtemporaryfile.cpp
+    PUBLIC_LIBRARIES
+        Qt::TestPrivate
+    TESTDATA ${test_data}
+)
+
+# Resources:
+set(qtemporaryfile_resource_files
+    "resources/test.txt"
+)
+
+add_qt_resource(tst_qtemporaryfile "qtemporaryfile"
+    PREFIX
+        "/"
+    FILES
+        ${qtemporaryfile_resource_files}
+)
+
+
+## Scopes:
+#####################################################################
+
+if(ANDROID AND NOT ANDROID_EMBEDDED)
+    # Resources:
+    set(android_testdata_resource_files
+        "resources/test.txt"
+        "tst_qtemporaryfile.cpp"
+    )
+
+    add_qt_resource(tst_qtemporaryfile "android_testdata"
+        PREFIX
+            "/android_testdata"
+        FILES
+            ${android_testdata_resource_files}
+    )
+endif()
diff --git a/tests/auto/corelib/io/qurl/CMakeLists.txt b/tests/auto/corelib/io/qurl/CMakeLists.txt
new file mode 100644
index 0000000000..c23ad27cfc
--- /dev/null
+++ b/tests/auto/corelib/io/qurl/CMakeLists.txt
@@ -0,0 +1,20 @@
+# Generated from qurl.pro.
+
+#####################################################################
+## tst_qurl Test:
+#####################################################################
+
+add_qt_test(tst_qurl
+    SOURCES
+        tst_qurl.cpp
+    PUBLIC_LIBRARIES
+        Qt::Concurrent
+)
+
+## Scopes:
+#####################################################################
+
+extend_target(tst_qurl CONDITION APPLE
+    SOURCES
+        tst_qurl_mac.mm
+)
diff --git a/tests/auto/corelib/io/qurl/tst_qurl.cpp b/tests/auto/corelib/io/qurl/tst_qurl.cpp
index ef4325d2ea..8d046d5499 100644
--- a/tests/auto/corelib/io/qurl/tst_qurl.cpp
+++ b/tests/auto/corelib/io/qurl/tst_qurl.cpp
@@ -48,8 +48,6 @@ class tst_QUrl : public QObject
 private slots:
     void initTestCase();
     void cleanupTestCase();
-    void effectiveTLDs_data();
-    void effectiveTLDs();
     void getSetCheck();
     void constructing();
     void hashInPath();
@@ -3387,61 +3385,6 @@ void tst_QUrl::acceptEmptyAuthoritySegments()
     QCOMPARE(QUrl(file_uni_bar, QUrl::StrictMode).toString(), file_triple_bar);
 }
 
-void tst_QUrl::effectiveTLDs_data()
-{
-    // See also: tst_QNetworkCookieJar::setCookiesFromUrl().
-    // in tests/auto/network/access/qnetworkcookiejar/tst_qnetworkcookiejar.cpp
-    QTest::addColumn<QUrl>("domain");
-    QTest::addColumn<QString>("TLD");
-    // TODO: autogenerate test-cases from:
-    // https://raw.githubusercontent.com/publicsuffix/list/master/tests/test_psl.txt
-    // checkPublicSuffix(domain, tail) appears in the list if
-    // either tail is null and domain is public or
-    // tail is the "registrable" part of domain; i.e. its minimal non-public tail.
-
-    QTest::newRow("yes0") << QUrl::fromEncoded("http://test.co.uk") << ".co.uk";
-    QTest::newRow("yes1") << QUrl::fromEncoded("http://test.com") << ".com";
-    QTest::newRow("yes2") << QUrl::fromEncoded("http://www.test.de") << ".de";
-    QTest::newRow("yes3") << QUrl::fromEncoded("http://test.ulm.museum") << ".ulm.museum";
-    QTest::newRow("yes4") << QUrl::fromEncoded("http://www.com.krodsherad.no") << ".krodsherad.no";
-    QTest::newRow("yes5") << QUrl::fromEncoded("http://www.co.uk.1.bg") << ".1.bg";
-    QTest::newRow("yes6") << QUrl::fromEncoded("http://www.com.com.cn") << ".com.cn";
-    QTest::newRow("yes7") << QUrl::fromEncoded("http://www.test.org.ws") << ".org.ws";
-    QTest::newRow("yes9") << QUrl::fromEncoded("http://www.com.co.uk.wallonie.museum") << ".wallonie.museum";
-    QTest::newRow("yes10") << QUrl::fromEncoded("http://www.com.evje-og-hornnes.no") << ".evje-og-hornnes.no";
-    QTest::newRow("yes11") << QUrl::fromEncoded("http://www.bla.kamijima.ehime.jp") << ".kamijima.ehime.jp";
-    QTest::newRow("yes12") << QUrl::fromEncoded("http://www.bla.kakuda.miyagi.jp") << ".kakuda.miyagi.jp";
-    QTest::newRow("yes13") << QUrl::fromEncoded("http://mypage.betainabox.com") << ".betainabox.com";
-    QTest::newRow("yes14") << QUrl::fromEncoded("http://mypage.rhcloud.com") << ".rhcloud.com";
-    QTest::newRow("yes15") << QUrl::fromEncoded("http://mypage.int.az") << ".int.az";
-    QTest::newRow("yes16") << QUrl::fromEncoded("http://anything.pagespeedmobilizer.com") << ".pagespeedmobilizer.com";
-    QTest::newRow("yes17") << QUrl::fromEncoded("http://anything.eu-central-1.compute.amazonaws.com") << ".eu-central-1.compute.amazonaws.com";
-    QTest::newRow("yes18") << QUrl::fromEncoded("http://anything.ltd.hk") << ".ltd.hk";
-    QTest::newRow("trentino.it")
-        << QUrl::fromEncoded("http://any.thing.trentino.it") << ".trentino.it";
-    QTest::newRow("net.ni") << QUrl::fromEncoded("http://test.net.ni") << ".net.ni";
-    QTest::newRow("dyn.cosidns.de")
-        << QUrl::fromEncoded("http://test.dyn.cosidns.de") << ".dyn.cosidns.de";
-    QTest::newRow("freeddns.org")
-        << QUrl::fromEncoded("http://test.freeddns.org") << ".freeddns.org";
-    QTest::newRow("app.os.stg.fedoraproject.org")
-        << QUrl::fromEncoded("http://test.app.os.stg.fedoraproject.org")
-        << ".app.os.stg.fedoraproject.org";
-    QTest::newRow("development.run") << QUrl::fromEncoded("http://test.development.run") << ".development.run";
-    QTest::newRow("crafting.xyz") << QUrl::fromEncoded("http://test.crafting.xyz") << ".crafting.xyz";
-    QTest::newRow("nym.ie") << QUrl::fromEncoded("http://shamus.nym.ie") << ".nym.ie";
-    QTest::newRow("vapor.cloud") << QUrl::fromEncoded("http://test.vapor.cloud") << ".vapor.cloud";
-    QTest::newRow("official.academy") << QUrl::fromEncoded("http://acredited.official.academy") << ".official.academy";
-}
-
-void tst_QUrl::effectiveTLDs()
-{
-    QFETCH(QUrl, domain);
-    QFETCH(QString, TLD);
-    QCOMPARE(domain.topLevelDomain(QUrl::PrettyDecoded), TLD);
-    QCOMPARE(domain.topLevelDomain(QUrl::FullyDecoded), TLD);
-}
-
 void tst_QUrl::lowercasesScheme()
 {
     QUrl url;
diff --git a/tests/auto/corelib/io/qurlinternal/CMakeLists.txt b/tests/auto/corelib/io/qurlinternal/CMakeLists.txt
new file mode 100644
index 0000000000..5ad3bc1919
--- /dev/null
+++ b/tests/auto/corelib/io/qurlinternal/CMakeLists.txt
@@ -0,0 +1,20 @@
+# Generated from qurlinternal.pro.
+
+if(NOT QT_FEATURE_private_tests)
+    return()
+endif()
+
+#####################################################################
+## tst_qurlinternal Test:
+#####################################################################
+
+add_qt_test(tst_qurlinternal
+    SOURCES
+        ../../codecs/utf8/utf8data.cpp
+        tst_qurlinternal.cpp
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+)
+
+#### Keys ignored in scope 1:.:.:qurlinternal.pro:<TRUE>:
+# _REQUIREMENTS = "qtConfig(private_tests)"
diff --git a/tests/auto/corelib/io/qurlinternal/tst_qurlinternal.cpp b/tests/auto/corelib/io/qurlinternal/tst_qurlinternal.cpp
index 5c6e633749..f644979c06 100644
--- a/tests/auto/corelib/io/qurlinternal/tst_qurlinternal.cpp
+++ b/tests/auto/corelib/io/qurlinternal/tst_qurlinternal.cpp
@@ -30,7 +30,6 @@
 #include <QtCore/QUrl>
 #include <QtTest/QtTest>
 
-#include "private/qtldurl_p.h"
 #include "private/qurl_p.h"
 
 // For testsuites
diff --git a/tests/auto/corelib/io/qurlquery/CMakeLists.txt b/tests/auto/corelib/io/qurlquery/CMakeLists.txt
new file mode 100644
index 0000000000..8a0cc54aeb
--- /dev/null
+++ b/tests/auto/corelib/io/qurlquery/CMakeLists.txt
@@ -0,0 +1,14 @@
+# Generated from qurlquery.pro.
+
+#####################################################################
+## tst_qurlquery Test:
+#####################################################################
+
+add_qt_test(tst_qurlquery
+    SOURCES
+        tst_qurlquery.cpp
+    DEFINES
+        SRCDIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/\\\"
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+)
diff --git a/tests/auto/corelib/itemmodels/CMakeLists.txt b/tests/auto/corelib/itemmodels/CMakeLists.txt
new file mode 100644
index 0000000000..6f52ed2600
--- /dev/null
+++ b/tests/auto/corelib/itemmodels/CMakeLists.txt
@@ -0,0 +1,19 @@
+# Generated from itemmodels.pro.
+
+add_subdirectory(qstringlistmodel)
+if(TARGET Qt::Gui)
+    add_subdirectory(qabstractitemmodel)
+    add_subdirectory(qabstractproxymodel)
+    add_subdirectory(qconcatenatetablesproxymodel)
+    add_subdirectory(qidentityproxymodel)
+    add_subdirectory(qitemselectionmodel)
+    add_subdirectory(qsortfilterproxymodel_recursive)
+    add_subdirectory(qtransposeproxymodel)
+endif()
+if(TARGET Qt::Widgets)
+    add_subdirectory(qsortfilterproxymodel_regexp)
+    add_subdirectory(qsortfilterproxymodel_regularexpression)
+endif()
+if(TARGET Qt::Sql AND TARGET Qt::Widgets)
+    add_subdirectory(qitemmodel)
+endif()
diff --git a/tests/auto/corelib/itemmodels/qabstractitemmodel/CMakeLists.txt b/tests/auto/corelib/itemmodels/qabstractitemmodel/CMakeLists.txt
new file mode 100644
index 0000000000..edc7f4321a
--- /dev/null
+++ b/tests/auto/corelib/itemmodels/qabstractitemmodel/CMakeLists.txt
@@ -0,0 +1,17 @@
+# Generated from qabstractitemmodel.pro.
+
+#####################################################################
+## tst_qabstractitemmodel Test:
+#####################################################################
+
+add_qt_test(tst_qabstractitemmodel
+    SOURCES
+        ../../../other/qabstractitemmodelutils/dynamictreemodel.cpp ../../../other/qabstractitemmodelutils/dynamictreemodel.h
+        tst_qabstractitemmodel.cpp
+    DEFINES
+        QT_DISABLE_DEPRECATED_BEFORE=0
+    INCLUDE_DIRECTORIES
+        ../../../other/qabstractitemmodelutils
+    PUBLIC_LIBRARIES
+        Qt::Gui
+)
diff --git a/tests/auto/corelib/itemmodels/qabstractproxymodel/CMakeLists.txt b/tests/auto/corelib/itemmodels/qabstractproxymodel/CMakeLists.txt
new file mode 100644
index 0000000000..f6a443213c
--- /dev/null
+++ b/tests/auto/corelib/itemmodels/qabstractproxymodel/CMakeLists.txt
@@ -0,0 +1,14 @@
+# Generated from qabstractproxymodel.pro.
+
+#####################################################################
+## tst_qabstractproxymodel Test:
+#####################################################################
+
+add_qt_test(tst_qabstractproxymodel
+    SOURCES
+        tst_qabstractproxymodel.cpp
+    DEFINES
+        QT_DISABLE_DEPRECATED_BEFORE=0
+    PUBLIC_LIBRARIES
+        Qt::Gui
+)
diff --git a/tests/auto/corelib/itemmodels/qconcatenatetablesproxymodel/CMakeLists.txt b/tests/auto/corelib/itemmodels/qconcatenatetablesproxymodel/CMakeLists.txt
new file mode 100644
index 0000000000..90b371cb1b
--- /dev/null
+++ b/tests/auto/corelib/itemmodels/qconcatenatetablesproxymodel/CMakeLists.txt
@@ -0,0 +1,12 @@
+# Generated from qconcatenatetablesproxymodel.pro.
+
+#####################################################################
+## tst_qconcatenatetablesproxymodel Test:
+#####################################################################
+
+add_qt_test(tst_qconcatenatetablesproxymodel
+    SOURCES
+        tst_qconcatenatetablesproxymodel.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+)
diff --git a/tests/auto/corelib/itemmodels/qidentityproxymodel/CMakeLists.txt b/tests/auto/corelib/itemmodels/qidentityproxymodel/CMakeLists.txt
new file mode 100644
index 0000000000..c02e7b5ad4
--- /dev/null
+++ b/tests/auto/corelib/itemmodels/qidentityproxymodel/CMakeLists.txt
@@ -0,0 +1,15 @@
+# Generated from qidentityproxymodel.pro.
+
+#####################################################################
+## tst_qidentityproxymodel Test:
+#####################################################################
+
+add_qt_test(tst_qidentityproxymodel
+    SOURCES
+        ../../../other/qabstractitemmodelutils/dynamictreemodel.cpp ../../../other/qabstractitemmodelutils/dynamictreemodel.h
+        tst_qidentityproxymodel.cpp
+    INCLUDE_DIRECTORIES
+        ../../../other/qabstractitemmodelutils
+    PUBLIC_LIBRARIES
+        Qt::Gui
+)
diff --git a/tests/auto/corelib/itemmodels/qitemmodel/CMakeLists.txt b/tests/auto/corelib/itemmodels/qitemmodel/CMakeLists.txt
new file mode 100644
index 0000000000..3baf727cf9
--- /dev/null
+++ b/tests/auto/corelib/itemmodels/qitemmodel/CMakeLists.txt
@@ -0,0 +1,14 @@
+# Generated from qitemmodel.pro.
+
+#####################################################################
+## tst_qitemmodel Test:
+#####################################################################
+
+add_qt_test(tst_qitemmodel
+    SOURCES
+        tst_qitemmodel.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Sql
+        Qt::Widgets
+)
diff --git a/tests/auto/corelib/itemmodels/qitemselectionmodel/CMakeLists.txt b/tests/auto/corelib/itemmodels/qitemselectionmodel/CMakeLists.txt
new file mode 100644
index 0000000000..bd79cba5e2
--- /dev/null
+++ b/tests/auto/corelib/itemmodels/qitemselectionmodel/CMakeLists.txt
@@ -0,0 +1,12 @@
+# Generated from qitemselectionmodel.pro.
+
+#####################################################################
+## tst_qitemselectionmodel Test:
+#####################################################################
+
+add_qt_test(tst_qitemselectionmodel
+    SOURCES
+        tst_qitemselectionmodel.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+)
diff --git a/tests/auto/corelib/itemmodels/qsortfilterproxymodel_recursive/CMakeLists.txt b/tests/auto/corelib/itemmodels/qsortfilterproxymodel_recursive/CMakeLists.txt
new file mode 100644
index 0000000000..59f5d8ae76
--- /dev/null
+++ b/tests/auto/corelib/itemmodels/qsortfilterproxymodel_recursive/CMakeLists.txt
@@ -0,0 +1,14 @@
+# Generated from qsortfilterproxymodel_recursive.pro.
+
+#####################################################################
+## tst_qsortfilterproxymodel_recursive Test:
+#####################################################################
+
+add_qt_test(tst_qsortfilterproxymodel_recursive
+    SOURCES
+        tst_qsortfilterproxymodel_recursive.cpp
+    DEFINES
+        QT_DISABLE_DEPRECATED_BEFORE=0
+    PUBLIC_LIBRARIES
+        Qt::Gui
+)
diff --git a/tests/auto/corelib/itemmodels/qsortfilterproxymodel_regexp/CMakeLists.txt b/tests/auto/corelib/itemmodels/qsortfilterproxymodel_regexp/CMakeLists.txt
new file mode 100644
index 0000000000..8df14a96b1
--- /dev/null
+++ b/tests/auto/corelib/itemmodels/qsortfilterproxymodel_regexp/CMakeLists.txt
@@ -0,0 +1,18 @@
+# Generated from qsortfilterproxymodel_regexp.pro.
+
+#####################################################################
+## tst_qsortfilterproxymodel_regexp Test:
+#####################################################################
+
+add_qt_test(tst_qsortfilterproxymodel_regexp
+    SOURCES
+        ../../../other/qabstractitemmodelutils/dynamictreemodel.cpp ../../../other/qabstractitemmodelutils/dynamictreemodel.h
+        ../qsortfilterproxymodel_common/tst_qsortfilterproxymodel.cpp ../qsortfilterproxymodel_common/tst_qsortfilterproxymodel.h
+        tst_qsortfilterproxymodel_regexp.cpp
+    INCLUDE_DIRECTORIES
+        ../../../other/qabstractitemmodelutils
+        ../qsortfilterproxymodel_common
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+)
diff --git a/tests/auto/corelib/itemmodels/qsortfilterproxymodel_regularexpression/CMakeLists.txt b/tests/auto/corelib/itemmodels/qsortfilterproxymodel_regularexpression/CMakeLists.txt
new file mode 100644
index 0000000000..8bc7f55f7c
--- /dev/null
+++ b/tests/auto/corelib/itemmodels/qsortfilterproxymodel_regularexpression/CMakeLists.txt
@@ -0,0 +1,18 @@
+# Generated from qsortfilterproxymodel_regularexpression.pro.
+
+#####################################################################
+## tst_qsortfilterproxymodel_regularexpression Test:
+#####################################################################
+
+add_qt_test(tst_qsortfilterproxymodel_regularexpression
+    SOURCES
+        ../../../other/qabstractitemmodelutils/dynamictreemodel.cpp ../../../other/qabstractitemmodelutils/dynamictreemodel.h
+        ../qsortfilterproxymodel_common/tst_qsortfilterproxymodel.cpp ../qsortfilterproxymodel_common/tst_qsortfilterproxymodel.h
+        tst_qsortfilterproxymodel_regularexpression.cpp
+    INCLUDE_DIRECTORIES
+        ../../../other/qabstractitemmodelutils
+        ../qsortfilterproxymodel_common
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+)
diff --git a/tests/auto/corelib/itemmodels/qstringlistmodel/CMakeLists.txt b/tests/auto/corelib/itemmodels/qstringlistmodel/CMakeLists.txt
new file mode 100644
index 0000000000..53bfdbe419
--- /dev/null
+++ b/tests/auto/corelib/itemmodels/qstringlistmodel/CMakeLists.txt
@@ -0,0 +1,11 @@
+# Generated from qstringlistmodel.pro.
+
+#####################################################################
+## tst_qstringlistmodel Test:
+#####################################################################
+
+add_qt_test(tst_qstringlistmodel
+    SOURCES
+        qmodellistener.h
+        tst_qstringlistmodel.cpp
+)
diff --git a/tests/auto/corelib/itemmodels/qtransposeproxymodel/CMakeLists.txt b/tests/auto/corelib/itemmodels/qtransposeproxymodel/CMakeLists.txt
new file mode 100644
index 0000000000..ad1b65d348
--- /dev/null
+++ b/tests/auto/corelib/itemmodels/qtransposeproxymodel/CMakeLists.txt
@@ -0,0 +1,12 @@
+# Generated from qtransposeproxymodel.pro.
+
+#####################################################################
+## tst_qtransposeproxymodel Test:
+#####################################################################
+
+add_qt_test(tst_qtransposeproxymodel
+    SOURCES
+        tst_qtransposeproxymodel.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+)
diff --git a/tests/auto/corelib/kernel/.prev_CMakeLists.txt b/tests/auto/corelib/kernel/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..5415a23a98
--- /dev/null
+++ b/tests/auto/corelib/kernel/.prev_CMakeLists.txt
@@ -0,0 +1,40 @@
+# Generated from kernel.pro.
+
+add_subdirectory(qcoreapplication)
+add_subdirectory(qdeadlinetimer)
+add_subdirectory(qelapsedtimer)
+add_subdirectory(qeventdispatcher)
+if(TARGET Qt::Network)
+    add_subdirectory(qeventloop)
+endif()
+add_subdirectory(qmath)
+add_subdirectory(qmetaobject)
+add_subdirectory(qmetaobjectbuilder)
+add_subdirectory(qmetamethod)
+add_subdirectory(qmetaproperty)
+add_subdirectory(qmetatype)
+add_subdirectory(qmetaenum)
+if(TARGET Qt::Gui)
+    add_subdirectory(qmimedata)
+endif()
+if(TARGET Qt::Network AND NOT ANDROID AND NOT APPLE_UIKIT)
+    add_subdirectory(qobject)
+endif()
+add_subdirectory(qpointer)
+if(QT_FEATURE_private_tests AND NOT ANDROID AND NOT APPLE_UIKIT)
+    add_subdirectory(qsharedmemory)
+endif()
+add_subdirectory(qsignalblocker)
+add_subdirectory(qsignalmapper)
+if(QT_FEATURE_private_tests AND TARGET Qt::Network)
+    add_subdirectory(qsocketnotifier)
+endif()
+if(QT_FEATURE_systemsemaphore AND NOT ANDROID AND NOT APPLE_UIKIT)
+    add_subdirectory(qsystemsemaphore)
+endif()
+add_subdirectory(qtimer)
+add_subdirectory(qtranslator)
+add_subdirectory(qvariant)
+if(win32_x_ AND NOT WINRT)
+    add_subdirectory(qwineventnotifier)
+endif()
diff --git a/tests/auto/corelib/kernel/CMakeLists.txt b/tests/auto/corelib/kernel/CMakeLists.txt
new file mode 100644
index 0000000000..9fbe2b8b7a
--- /dev/null
+++ b/tests/auto/corelib/kernel/CMakeLists.txt
@@ -0,0 +1,40 @@
+# Generated from kernel.pro.
+
+# add_subdirectory(qcoreapplication) # special case
+add_subdirectory(qdeadlinetimer)
+add_subdirectory(qelapsedtimer)
+add_subdirectory(qeventdispatcher)
+if(TARGET Qt::Network)
+    add_subdirectory(qeventloop)
+endif()
+add_subdirectory(qmath)
+add_subdirectory(qmetaobject)
+add_subdirectory(qmetaobjectbuilder)
+add_subdirectory(qmetamethod)
+add_subdirectory(qmetaproperty)
+# add_subdirectory(qmetatype) # special case
+add_subdirectory(qmetaenum)
+if(TARGET Qt::Gui)
+    add_subdirectory(qmimedata)
+endif()
+if(TARGET Qt::Network AND NOT ANDROID AND NOT APPLE_UIKIT)
+    # add_subdirectory(qobject) # special case
+endif()
+add_subdirectory(qpointer)
+if(QT_FEATURE_private_tests AND NOT ANDROID AND NOT APPLE_UIKIT)
+    add_subdirectory(qsharedmemory)
+endif()
+add_subdirectory(qsignalblocker)
+add_subdirectory(qsignalmapper)
+if(QT_FEATURE_private_tests AND TARGET Qt::Network)
+    add_subdirectory(qsocketnotifier)
+endif()
+if(QT_FEATURE_systemsemaphore AND NOT ANDROID AND NOT APPLE_UIKIT)
+    add_subdirectory(qsystemsemaphore)
+endif()
+# add_subdirectory(qtimer) # special case
+add_subdirectory(qtranslator)
+add_subdirectory(qvariant)
+if(win32_x_ AND NOT WINRT)
+    add_subdirectory(qwineventnotifier)
+endif()
diff --git a/tests/auto/corelib/kernel/qdeadlinetimer/CMakeLists.txt b/tests/auto/corelib/kernel/qdeadlinetimer/CMakeLists.txt
new file mode 100644
index 0000000000..5feb9ff535
--- /dev/null
+++ b/tests/auto/corelib/kernel/qdeadlinetimer/CMakeLists.txt
@@ -0,0 +1,10 @@
+# Generated from qdeadlinetimer.pro.
+
+#####################################################################
+## tst_qdeadlinetimer Test:
+#####################################################################
+
+add_qt_test(tst_qdeadlinetimer
+    SOURCES
+        tst_qdeadlinetimer.cpp
+)
diff --git a/tests/auto/corelib/kernel/qelapsedtimer/CMakeLists.txt b/tests/auto/corelib/kernel/qelapsedtimer/CMakeLists.txt
new file mode 100644
index 0000000000..e188c94933
--- /dev/null
+++ b/tests/auto/corelib/kernel/qelapsedtimer/CMakeLists.txt
@@ -0,0 +1,10 @@
+# Generated from qelapsedtimer.pro.
+
+#####################################################################
+## tst_qelapsedtimer Test:
+#####################################################################
+
+add_qt_test(tst_qelapsedtimer
+    SOURCES
+        tst_qelapsedtimer.cpp
+)
diff --git a/tests/auto/corelib/kernel/qeventdispatcher/CMakeLists.txt b/tests/auto/corelib/kernel/qeventdispatcher/CMakeLists.txt
new file mode 100644
index 0000000000..4dbabc2d69
--- /dev/null
+++ b/tests/auto/corelib/kernel/qeventdispatcher/CMakeLists.txt
@@ -0,0 +1,10 @@
+# Generated from qeventdispatcher.pro.
+
+#####################################################################
+## tst_qeventdispatcher Test:
+#####################################################################
+
+add_qt_test(tst_qeventdispatcher
+    SOURCES
+        tst_qeventdispatcher.cpp
+)
diff --git a/tests/auto/corelib/kernel/qeventloop/CMakeLists.txt b/tests/auto/corelib/kernel/qeventloop/CMakeLists.txt
new file mode 100644
index 0000000000..ac952f64f7
--- /dev/null
+++ b/tests/auto/corelib/kernel/qeventloop/CMakeLists.txt
@@ -0,0 +1,26 @@
+# Generated from qeventloop.pro.
+
+#####################################################################
+## tst_qeventloop Test:
+#####################################################################
+
+add_qt_test(tst_qeventloop
+    SOURCES
+        tst_qeventloop.cpp
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::Network
+)
+
+## Scopes:
+#####################################################################
+
+extend_target(tst_qeventloop CONDITION WIN32 AND NOT WINRT
+    PUBLIC_LIBRARIES
+        user32
+)
+
+extend_target(tst_qeventloop CONDITION QT_FEATURE_glib
+    DEFINES
+        HAVE_GLIB
+)
diff --git a/tests/auto/corelib/kernel/qmath/CMakeLists.txt b/tests/auto/corelib/kernel/qmath/CMakeLists.txt
new file mode 100644
index 0000000000..5e73597c67
--- /dev/null
+++ b/tests/auto/corelib/kernel/qmath/CMakeLists.txt
@@ -0,0 +1,10 @@
+# Generated from qmath.pro.
+
+#####################################################################
+## tst_qmath Test:
+#####################################################################
+
+add_qt_test(tst_qmath
+    SOURCES
+        tst_qmath.cpp
+)
diff --git a/tests/auto/corelib/kernel/qmetaenum/CMakeLists.txt b/tests/auto/corelib/kernel/qmetaenum/CMakeLists.txt
new file mode 100644
index 0000000000..12c9d9a8a7
--- /dev/null
+++ b/tests/auto/corelib/kernel/qmetaenum/CMakeLists.txt
@@ -0,0 +1,10 @@
+# Generated from qmetaenum.pro.
+
+#####################################################################
+## tst_qmetaenum Test:
+#####################################################################
+
+add_qt_test(tst_qmetaenum
+    SOURCES
+        tst_qmetaenum.cpp
+)
diff --git a/tests/auto/corelib/kernel/qmetamethod/CMakeLists.txt b/tests/auto/corelib/kernel/qmetamethod/CMakeLists.txt
new file mode 100644
index 0000000000..b16101a1a1
--- /dev/null
+++ b/tests/auto/corelib/kernel/qmetamethod/CMakeLists.txt
@@ -0,0 +1,10 @@
+# Generated from qmetamethod.pro.
+
+#####################################################################
+## tst_qmetamethod Test:
+#####################################################################
+
+add_qt_test(tst_qmetamethod
+    SOURCES
+        tst_qmetamethod.cpp
+)
diff --git a/tests/auto/corelib/kernel/qmetaobject/CMakeLists.txt b/tests/auto/corelib/kernel/qmetaobject/CMakeLists.txt
new file mode 100644
index 0000000000..888bfeaa78
--- /dev/null
+++ b/tests/auto/corelib/kernel/qmetaobject/CMakeLists.txt
@@ -0,0 +1,15 @@
+# Generated from qmetaobject.pro.
+
+#####################################################################
+## tst_qmetaobject Test:
+#####################################################################
+
+add_qt_test(tst_qmetaobject
+    SOURCES
+        tst_qmetaobject.cpp
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+)
+
+## Scopes:
+#####################################################################
diff --git a/tests/auto/corelib/kernel/qmetaobject/tst_qmetaobject.cpp b/tests/auto/corelib/kernel/qmetaobject/tst_qmetaobject.cpp
index 60000316cc..9db2bb241a 100644
--- a/tests/auto/corelib/kernel/qmetaobject/tst_qmetaobject.cpp
+++ b/tests/auto/corelib/kernel/qmetaobject/tst_qmetaobject.cpp
@@ -1320,32 +1320,38 @@ void tst_QMetaObject::normalizedSignature_data()
     QTest::newRow("function ptr spaces") << "void foo( void ( * ) ( void ))" << "void foo(void(*)())";
     QTest::newRow("function ptr void*") << "void foo(void(*)(void*))" << "void foo(void(*)(void*))";
     QTest::newRow("function ptr void* spaces") << "void foo( void ( * ) ( void * ))" << "void foo(void(*)(void*))";
-    QTest::newRow("template args") << " void  foo( QMap<a, a>, QList<b>) "
-                                   << "void foo(QMap<a,a>,QList<b>)";
+    QTest::newRow("template args") << " void  foo( QMap<a, a>, QVector<b>) "
+                                   << "void foo(QMap<a,a>,QVector<b>)";
     QTest::newRow("void template args") << " void  foo( Foo<void>, Bar<void> ) "
                                    << "void foo(Foo<void>,Bar<void>)";
     QTest::newRow("void* template args") << " void  foo( Foo<void*>, Bar<void *> ) "
                                    << "void foo(Foo<void*>,Bar<void*>)";
-    QTest::newRow("rettype") << "QList<int, int> foo()" << "QList<int,int>foo()";
+    QTest::newRow("rettype") << "QVector<int, int> foo()" << "QVector<int,int>foo()";
     QTest::newRow("rettype void template") << "Foo<void> foo()" << "Foo<void>foo()";
     QTest::newRow("const rettype") << "const QString *foo()" << "const QString*foo()";
     QTest::newRow("const ref") << "const QString &foo()" << "const QString&foo()";
     QTest::newRow("reference") << "QString &foo()" << "QString&foo()";
     QTest::newRow("const1") << "void foo(QString const *)" << "void foo(const QString*)";
-    QTest::newRow("const2") << "void foo(QString * const)" << "void foo(QString*const)";
+    QTest::newRow("const2") << "void foo(QString * const)" << "void foo(QString*)";
     QTest::newRow("const3") << "void foo(QString const &)" << "void foo(QString)";
     QTest::newRow("const4") << "void foo(const int)" << "void foo(int)";
     QTest::newRow("const5") << "void foo(const int, int const, const int &, int const &)"
                             << "void foo(int,int,int,int)";
-    QTest::newRow("const6") << "void foo(QList<const int>)" << "void foo(QList<const int>)";
-    QTest::newRow("const7") << "void foo(QList<const int*>)" << "void foo(QList<const int*>)";
-    QTest::newRow("const8") << "void foo(QList<int const*>)" << "void foo(QList<const int*>)";
+    QTest::newRow("const6") << "void foo(QVector<const int>)" << "void foo(QVector<const int>)";
+    QTest::newRow("const7") << "void foo(QVector<const int*>)" << "void foo(QVector<const int*>)";
+    QTest::newRow("const8") << "void foo(QVector<int const*>)" << "void foo(QVector<const int*>)";
     QTest::newRow("const9") << "void foo(const Foo<Bar>)" << "void foo(Foo<Bar>)";
     QTest::newRow("const10") << "void foo(Foo<Bar>const)" << "void foo(Foo<Bar>)";
-    QTest::newRow("const11") << "void foo(Foo<Bar> *const)" << "void foo(Foo<Bar>*const)";
-    QTest::newRow("const12") << "void foo(Foo<Bar>const*const *const)" << "void foo(Foo<Bar>*const*const)";
+    QTest::newRow("const11") << "void foo(Foo<Bar> *const)" << "void foo(Foo<Bar>*)";
+    QTest::newRow("const12") << "void foo(Foo<Bar>const*const *const)" << "void foo(const Foo<Bar>*const*)";
     QTest::newRow("const13") << "void foo(const Foo<Bar>&)" << "void foo(Foo<Bar>)";
     QTest::newRow("const14") << "void foo(Foo<Bar>const&)" << "void foo(Foo<Bar>)";
+    QTest::newRow("QList") << "void foo(QList<int>)" << "void foo(QVector<int>)";
+    QTest::newRow("QList1") << "void foo(const Template<QList, MyQList const>)"
+                            << "void foo(Template<QVector,const MyQList>)";
+
+    QTest::newRow("refref") << "const char* foo(const X &&,X const &&, const X* &&) && "
+                            << "const char*foo(const X&&,const X&&,const X*&&)&&";
 
     QTest::newRow("invalid1") << "a( b" << "a(b";
 }
@@ -1367,26 +1373,63 @@ void tst_QMetaObject::normalizedType_data()
     QTest::newRow("white") << "  int  " << "int";
     QTest::newRow("const1") << "int const *" << "const int*";
     QTest::newRow("const2") << "const int *" << "const int*";
-    QTest::newRow("template1") << "QList<int const *>" << "QList<const int*>";
-    QTest::newRow("template2") << "QList<const int *>" << "QList<const int*>";
+    QTest::newRow("template1") << "QVector<int const *>" << "QVector<const int*>";
+    QTest::newRow("template2") << "QVector<const int *>" << "QVector<const int*>";
     QTest::newRow("template3") << "QMap<QString, int>" << "QMap<QString,int>";
     QTest::newRow("template4") << "const QMap<QString, int> &" << "QMap<QString,int>";
-    QTest::newRow("template5") << "QList< ::Foo::Bar>" << "QList< ::Foo::Bar>";
-    QTest::newRow("template6") << "QList<::Foo::Bar>" << "QList<::Foo::Bar>";
-    QTest::newRow("template7") << "QList<QList<int> >" << "QList<QList<int> >";
+    QTest::newRow("template5") << "QVector< ::Foo::Bar>" << "QVector<::Foo::Bar>";
+    QTest::newRow("template6") << "QVector<::Foo::Bar>" << "QVector<::Foo::Bar>";
+    QTest::newRow("template7") << "QVector<QVector<int> >" << "QVector<QVector<int>>";
     QTest::newRow("template8") << "QMap<const int, const short*>" << "QMap<const int,const short*>";
-    QTest::newRow("template9") << "QPair<const QPair<int, int const *> , QPair<QHash<int, const char*>  >  >" << "QPair<const QPair<int,const int*>,QPair<QHash<int,const char*> > >";
+    QTest::newRow("template9") << "QPair<const QPair<int, int const *> , QPair<QHash<int, const char*>  >  >" << "QPair<const QPair<int,const int*>,QPair<QHash<int,const char*>>>";
+    QTest::newRow("template10") << "QList<int const * const> const" << "QVector<const int*const>";
+    QTest::newRow("template11") << " QSharedPointer<QVarLengthArray< QString const, ( 16>> 2 )> > const & "
+        << "QSharedPointer<QVarLengthArray<const QString,(16>>2)>>";
+    QTest::newRow("template_sub") << "X<( Y < 8), (Y >6)> const  & " << "X<(Y<8),(Y>6)>";
     QTest::newRow("value1") << "const QString &" << "QString";
     QTest::newRow("value2") << "QString const &" << "QString";
     QTest::newRow("constInName1") << "constconst" << "constconst";
     QTest::newRow("constInName2") << "constconst*" << "constconst*";
     QTest::newRow("constInName3") << "const constconst&" << "constconst";
-    QTest::newRow("constInName4") << "constconst const*const" << "constconst*const";
+    QTest::newRow("constInName4") << "constconst const*const" << "const constconst*";
     QTest::newRow("class") << "const class foo&" << "foo";
     QTest::newRow("struct") << "const struct foo*" << "const foo*";
     QTest::newRow("struct2") << "struct foo const*" << "const foo*";
     QTest::newRow("enum") << "enum foo" << "foo";
     QTest::newRow("void") << "void" << "void";
+    QTest::newRow("QList") << "QList<int>" << "QVector<int>";
+    QTest::newRow("refref") << "X const*const&&" << "const X*const&&";
+    QTest::newRow("refref2") << "const X<T const&&>&&" << "const X<const T&&>&&";
+    QTest::newRow("long1") << "long unsigned int long" << "unsigned long long";
+    QTest::newRow("long2") << "int signed long" << "long";
+    QTest::newRow("long3") << "long unsigned" << "ulong";
+    QTest::newRow("long double") << " long  double" << "long double";
+    QTest::newRow("signed char") << "char signed" << "signed char";
+    QTest::newRow("unsigned char") << "char unsigned" << "unsigned char";
+    QTest::newRow("signed short") << "short signed" << "short";
+    QTest::newRow("unsigned shot") << "short unsigned" << "unsigned short";
+    QTest::newRow("unsigned shot") << "short unsigned" << "unsigned short";
+    QTest::newRow("array1") << "unsigned int [4]" << "uint[4]";
+    QTest::newRow("array2") << "unsigned int const [4][5]" << "const uint[4][5]";
+    QTest::newRow("array3") << "unsigned[] const" << "uint[]";
+    QTest::newRow("nttp1") << "S<'>', int const> const"
+                           << "S<'>',const int>";
+    QTest::newRow("nttp2") << "S< \"> \\\">const *   \\\\\"  , int const> const"
+                           << "S<\"> \\\">const *   \\\\\",const int>";
+    QTest::newRow("nttp3") << "S<\"Q <\"  , int const> const*"
+                           << "const S<\"Q <\",const int>*";
+    QTest::newRow("nttp4") << "S< 1'2 , int const> const"
+                           << "S<1'2,const int>";
+    QTest::newRow("invalid") << "'const"
+                             << "'const";
+    QTest::newRow("anonym1") << "XX::<unnamed struct>"
+                             << "XX::<unnamed struct>";
+    QTest::newRow("anonym2") << "XX::{unnamed type#1}"
+                             << "XX::{unnamed type#1}";
+    QTest::newRow("anonym3") << "struct XX::<unnamed-type-s>"
+                             << "XX::<unnamed-type-s>";
+    QTest::newRow("anonym4") << "XX::(anonymous struct at ./example.cpp:10:13)"
+                             << "XX::(anonymous struct at./example.cpp:10:13)";
 }
 
 void tst_QMetaObject::normalizedType()
@@ -1395,6 +1438,7 @@ void tst_QMetaObject::normalizedType()
     QFETCH(QString, result);
 
     QCOMPARE(QMetaObject::normalizedType(type.toLatin1()), result.toLatin1());
+    QCOMPARE(QMetaObject::normalizedType(result.toLatin1()), result.toLatin1());
 }
 
 void tst_QMetaObject::customPropertyType()
@@ -1402,13 +1446,15 @@ void tst_QMetaObject::customPropertyType()
     QMetaProperty prop = metaObject()->property(metaObject()->indexOfProperty("value3"));
 
     QCOMPARE(prop.type(), QVariant::UserType);
-    QCOMPARE(prop.userType(), 0);
+    QCOMPARE(prop.userType(), QMetaType::fromType<MyStruct>().id());
+    QCOMPARE(prop.metaType(), QMetaType::fromType<MyStruct>());
 
     qRegisterMetaType<MyStruct>("MyStruct");
     QCOMPARE(prop.userType(), QMetaType::type("MyStruct"));
 
     prop = metaObject()->property(metaObject()->indexOfProperty("value4"));
     QCOMPARE(prop.type(), QVariant::List);
+    QCOMPARE(prop.metaType(), QMetaType::fromType<QList<QVariant>>());
 
     prop = metaObject()->property(metaObject()->indexOfProperty("value5"));
     QCOMPARE(prop.type(), QVariant::List);
diff --git a/tests/auto/corelib/kernel/qmetaobjectbuilder/CMakeLists.txt b/tests/auto/corelib/kernel/qmetaobjectbuilder/CMakeLists.txt
new file mode 100644
index 0000000000..e7586d580b
--- /dev/null
+++ b/tests/auto/corelib/kernel/qmetaobjectbuilder/CMakeLists.txt
@@ -0,0 +1,12 @@
+# Generated from qmetaobjectbuilder.pro.
+
+#####################################################################
+## tst_qmetaobjectbuilder Test:
+#####################################################################
+
+add_qt_test(tst_qmetaobjectbuilder
+    SOURCES
+        tst_qmetaobjectbuilder.cpp
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+)
diff --git a/tests/auto/corelib/kernel/qmetaobjectbuilder/tst_qmetaobjectbuilder.cpp b/tests/auto/corelib/kernel/qmetaobjectbuilder/tst_qmetaobjectbuilder.cpp
index 9fe7d63727..14719f36f8 100644
--- a/tests/auto/corelib/kernel/qmetaobjectbuilder/tst_qmetaobjectbuilder.cpp
+++ b/tests/auto/corelib/kernel/qmetaobjectbuilder/tst_qmetaobjectbuilder.cpp
@@ -1702,9 +1702,10 @@ void tst_QMetaObjectBuilder::classNameFirstInStringData()
     builder.setClassName(QByteArrayLiteral("TestClass"));
     QMetaObject *mo = builder.toMetaObject();
 
-    QByteArrayDataPtr header;
-    header.ptr = const_cast<QByteArrayData*>(mo->d.stringdata);
-    QCOMPARE(QByteArray(header), QByteArrayLiteral("TestClass"));
+    uint offset = mo->d.stringdata[0];
+    uint len = mo->d.stringdata[1];
+    QByteArray className(reinterpret_cast<const char *>(mo->d.stringdata) + offset, len);
+    QCOMPARE(className, QByteArrayLiteral("TestClass"));
 
     free(mo);
 }
diff --git a/tests/auto/corelib/kernel/qmetaproperty/CMakeLists.txt b/tests/auto/corelib/kernel/qmetaproperty/CMakeLists.txt
new file mode 100644
index 0000000000..2d657d5217
--- /dev/null
+++ b/tests/auto/corelib/kernel/qmetaproperty/CMakeLists.txt
@@ -0,0 +1,10 @@
+# Generated from qmetaproperty.pro.
+
+#####################################################################
+## tst_qmetaproperty Test:
+#####################################################################
+
+add_qt_test(tst_qmetaproperty
+    SOURCES
+        tst_qmetaproperty.cpp
+)
diff --git a/tests/auto/corelib/kernel/qmetaproperty/tst_qmetaproperty.cpp b/tests/auto/corelib/kernel/qmetaproperty/tst_qmetaproperty.cpp
index cc67fc7884..43ed535019 100644
--- a/tests/auto/corelib/kernel/qmetaproperty/tst_qmetaproperty.cpp
+++ b/tests/auto/corelib/kernel/qmetaproperty/tst_qmetaproperty.cpp
@@ -138,6 +138,7 @@ void tst_QMetaProperty::gadget()
     const QMetaObject *mo = &MyGadget::staticMetaObject;
     QMetaProperty valueProp = mo->property(mo->indexOfProperty("value"));
     QVERIFY(valueProp.isValid());
+    QCOMPARE(valueProp.metaType(), QMetaType::fromType<QString>());
     {
         MyGadget g;
         QString hello = QLatin1String("hello");
diff --git a/tests/auto/corelib/kernel/qmetatype/.prev_CMakeLists.txt b/tests/auto/corelib/kernel/qmetatype/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..62d517c27d
--- /dev/null
+++ b/tests/auto/corelib/kernel/qmetatype/.prev_CMakeLists.txt
@@ -0,0 +1,42 @@
+# Generated from qmetatype.pro.
+
+#####################################################################
+## tst_qmetatype Test:
+#####################################################################
+
+# Collect test data
+list(APPEND test_data "./typeFlags.bin")
+
+add_qt_test(tst_qmetatype
+    SOURCES
+        tst_qmetatype.cpp
+    DEFINES
+        -QT_NO_LINKED_LIST
+        QT_DISABLE_DEPRECATED_BEFORE=0
+    INCLUDE_DIRECTORIES
+        ../../../other/qvariant_common
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+    TESTDATA ${test_data}
+)
+
+## Scopes:
+#####################################################################
+
+extend_target(tst_qmetatype CONDITION MSVC OR WINRT
+    COMPILE_OPTIONS
+        /bigobj
+)
+
+#### Keys ignored in scope 3:.:.:qmetatype.pro:WINRT:
+# QMAKE_CFLAGS_RELEASE = "--O2"
+# QMAKE_CXXFLAGS_RELEASE = "--O2"
+
+#### Keys ignored in scope 4:.:.:qmetatype.pro:CLANG:
+# QMAKE_CFLAGS_RELEASE = "--O2" "--g"
+# QMAKE_CXXFLAGS_RELEASE = "--O2" "--g"
+
+extend_target(tst_qmetatype CONDITION CLANG AND (TEST_architecture_arch STREQUAL "arm")
+    DEFINES
+        TST_QMETATYPE_BROKEN_COMPILER
+)
diff --git a/tests/auto/corelib/kernel/qmetatype/CMakeLists.txt b/tests/auto/corelib/kernel/qmetatype/CMakeLists.txt
new file mode 100644
index 0000000000..3c9bb97825
--- /dev/null
+++ b/tests/auto/corelib/kernel/qmetatype/CMakeLists.txt
@@ -0,0 +1,42 @@
+# Generated from qmetatype.pro.
+
+#####################################################################
+## tst_qmetatype Test:
+#####################################################################
+
+# Collect test data
+list(APPEND test_data "./typeFlags.bin")
+
+add_qt_test(tst_qmetatype
+    SOURCES
+        tst_qmetatype.cpp
+    DEFINES
+        # -QT_NO_LINKED_LIST # special case remove until we fix this
+        QT_DISABLE_DEPRECATED_BEFORE=0
+    INCLUDE_DIRECTORIES
+        ../../../other/qvariant_common
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+    TESTDATA ${test_data}
+)
+
+## Scopes:
+#####################################################################
+
+extend_target(tst_qmetatype CONDITION MSVC OR WINRT
+    COMPILE_OPTIONS
+        /bigobj
+)
+
+#### Keys ignored in scope 3:.:.:qmetatype.pro:WINRT:
+# QMAKE_CFLAGS_RELEASE = "--O2"
+# QMAKE_CXXFLAGS_RELEASE = "--O2"
+
+#### Keys ignored in scope 4:.:.:qmetatype.pro:CLANG:
+# QMAKE_CFLAGS_RELEASE = "--O2" "--g"
+# QMAKE_CXXFLAGS_RELEASE = "--O2" "--g"
+
+extend_target(tst_qmetatype CONDITION CLANG AND (TEST_architecture_arch STREQUAL "arm")
+    DEFINES
+        TST_QMETATYPE_BROKEN_COMPILER
+)
diff --git a/tests/auto/corelib/kernel/qmetatype/qmetatype.pro b/tests/auto/corelib/kernel/qmetatype/qmetatype.pro
index 4856b138c3..56b8c071c3 100644
--- a/tests/auto/corelib/kernel/qmetatype/qmetatype.pro
+++ b/tests/auto/corelib/kernel/qmetatype/qmetatype.pro
@@ -5,7 +5,6 @@ INCLUDEPATH += $$PWD/../../../other/qvariant_common
 SOURCES = tst_qmetatype.cpp
 TESTDATA=./typeFlags.bin
 DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
-DEFINES -= QT_NO_LINKED_LIST
 
 msvc|winrt {
     # Prevents "fatal error C1128: number of sections exceeded object file format limit".
diff --git a/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp b/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp
index 19b3289390..0d9dfc1c4c 100644
--- a/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp
+++ b/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp
@@ -120,17 +120,18 @@ private slots:
     void constRefs();
     void convertCustomType_data();
     void convertCustomType();
-    void compareCustomType_data();
-    void compareCustomType();
     void compareCustomEqualOnlyType();
     void customDebugStream();
     void unknownType();
     void fromType();
+    void operatorEq_data();
+    void operatorEq();
 };
 
 struct BaseGenericType
 {
     int m_typeId = -1;
+    QMetaType m_metatype;
     virtual void *constructor(int typeId, void *where, const void *copy) = 0;
     virtual void staticMetacallFunction(QMetaObject::Call _c, int _id, void **_a) = 0;
     virtual void saveOperator(QDataStream & out) const = 0;
@@ -302,11 +303,19 @@ void tst_QMetaType::registerGadget(const char *name, const QVector<GadgetPropert
     meta->d.static_metacall = &GadgetsStaticMetacallFunction;
     meta->d.superdata = nullptr;
     const auto flags = QMetaType::WasDeclaredAsMetaType | QMetaType::IsGadget | QMetaType::NeedsConstruction | QMetaType::NeedsDestruction;
-    int gadgetTypeId = QMetaType::registerType(name,
-                                               &GadgetTypedDestructor,
-                                               &GadgetTypedConstructor,
-                                               sizeof(GenericGadgetType),
-                                               flags, meta);
+    using TypeInfo = QtPrivate::QMetaTypeInterface;
+    auto typeInfo = new TypeInfo {
+        0, sizeof(GenericGadgetType), alignof(GenericGadgetType), uint(flags), meta, name, 0,
+        QtPrivate::RefCount{ 0 },
+        [](TypeInfo *self) { delete self; },
+        [](const TypeInfo *self, void *where) { GadgetTypedConstructor(self->typeId, where, nullptr); },
+        [](const TypeInfo *self, void *where, const void *copy) { GadgetTypedConstructor(self->typeId, where, copy); },
+        [](const TypeInfo *self, void *where, void *copy) { GadgetTypedConstructor(self->typeId, where, copy); },
+        [](const TypeInfo *self, void *ptr) { GadgetTypedDestructor(self->typeId, ptr); },
+        nullptr };
+    QMetaType gadgetMetaType(typeInfo);
+    dynamicGadgetProperties->m_metatype = gadgetMetaType;
+    int gadgetTypeId = QMetaType(typeInfo).id();
     QVERIFY(gadgetTypeId > 0);
     QMetaType::registerStreamOperators(gadgetTypeId, &GadgetSaveOperator, &GadgetLoadOperator);
     s_managedTypes[gadgetTypeId] = qMakePair(dynamicGadgetProperties, std::shared_ptr<QMetaObject>{meta, [](QMetaObject *ptr){ ::free(ptr); }});
@@ -392,10 +401,6 @@ protected:
                 ++failureCount;
                 qWarning() << "Wrong metatype returned for" << name;
             }
-            if (QMetaType::typeName(tp) != name) {
-                ++failureCount;
-                qWarning() << "Wrong typeName returned for" << tp;
-            }
             void *buf1 = QMetaType::create(tp, 0);
             void *buf2 = QMetaType::create(tp, buf1);
             void *buf3 = info.create(tp, 0);
@@ -574,11 +579,13 @@ void tst_QMetaType::typeName_data()
     QTest::newRow("124125534") << 124125534 << QString();
 
     // automatic registration
-    QTest::newRow("QList<int>") << ::qMetaTypeId<QList<int> >() << QString::fromLatin1("QList<int>");
     QTest::newRow("QHash<int,int>") << ::qMetaTypeId<QHash<int, int> >() << QString::fromLatin1("QHash<int,int>");
     QTest::newRow("QMap<int,int>") << ::qMetaTypeId<QMap<int, int> >() << QString::fromLatin1("QMap<int,int>");
-    QTest::newRow("QVector<QList<int>>") << ::qMetaTypeId<QVector<QList<int> > >() << QString::fromLatin1("QVector<QList<int> >");
-    QTest::newRow("QVector<QMap<int,int>>") << ::qMetaTypeId<QVector<QMap<int, int> > >() << QString::fromLatin1("QVector<QMap<int,int> >");
+    QTest::newRow("QVector<QMap<int,int>>") << ::qMetaTypeId<QVector<QMap<int, int> > >() << QString::fromLatin1("QVector<QMap<int,int>>");
+
+    // automatic registration with automatic QList to QVector aliasing
+    QTest::newRow("QList<int>") << ::qMetaTypeId<QList<int> >() << QString::fromLatin1("QVector<int>");
+    QTest::newRow("QVector<QList<int>>") << ::qMetaTypeId<QVector<QList<int> > >() << QString::fromLatin1("QVector<QVector<int>>");
 
     QTest::newRow("CustomQObject*") << ::qMetaTypeId<CustomQObject*>() << QString::fromLatin1("CustomQObject*");
     QTest::newRow("CustomGadget") << ::qMetaTypeId<CustomGadget>() << QString::fromLatin1("CustomGadget");
@@ -1006,6 +1013,10 @@ void tst_QMetaType::flagsBinaryCompatibility5_0_data()
     for (int i = 0; i < buffer.size(); i+=2) {
         const quint32 id = buffer.at(i);
         const quint32 flags = buffer.at(i + 1);
+        if (id > QMetaType::LastCoreType)
+            continue; // We do not link against QtGui, so we do longer consider such type as registered
+        if (id == QMetaType::Void)
+            continue; // The meaning of QMetaType::Void has changed in Qt6
         QVERIFY2(QMetaType::isRegistered(id), "A type could not be removed in BC way");
         QTest::newRow(QMetaType::typeName(id)) << id << flags;
     }
@@ -1032,9 +1043,9 @@ static void testConstructHelper()
     typedef typename MetaEnumToType<ID>::Type Type;
     QMetaType info(ID);
     int size = info.sizeOf();
-    void *storage1 = qMallocAligned(size, Q_ALIGNOF(Type));
+    void *storage1 = qMallocAligned(size, alignof(Type));
     void *actual1 = QMetaType::construct(ID, storage1, /*copy=*/0);
-    void *storage2 = qMallocAligned(size, Q_ALIGNOF(Type));
+    void *storage2 = qMallocAligned(size, alignof(Type));
     void *actual2 = info.construct(storage2, /*copy=*/0);
     QCOMPARE(actual1, storage1);
     QCOMPARE(actual2, storage2);
@@ -1158,11 +1169,19 @@ void tst_QMetaType::typedConstruct()
     auto dynamicGadgetProperties = std::make_shared<GenericPODType>();
     dynamicGadgetProperties->podData = myPodTesData;
     const auto flags = QMetaType::NeedsConstruction | QMetaType::NeedsDestruction;
-    int podTypeId = QMetaType::registerType(podTypeName,
-                                               &GadgetTypedDestructor,
-                                               &GadgetTypedConstructor,
-                                               sizeof(GenericGadgetType),
-                                               flags, nullptr);
+    using TypeInfo = QtPrivate::QMetaTypeInterface;
+    auto typeInfo = new TypeInfo {
+        0, sizeof(GenericGadgetType), alignof(GenericGadgetType), uint(flags), nullptr, podTypeName,
+        0, QtPrivate::RefCount{0},
+        [](TypeInfo *self) { delete self; },
+        [](const TypeInfo *self, void *where) { GadgetTypedConstructor(self->typeId, where, nullptr); },
+        [](const TypeInfo *self, void *where, const void *copy) { GadgetTypedConstructor(self->typeId, where, copy); },
+        [](const TypeInfo *self, void *where, void *copy) { GadgetTypedConstructor(self->typeId, where, copy); },
+        [](const TypeInfo *self, void *ptr) { GadgetTypedDestructor(self->typeId, ptr); },
+        nullptr };
+    QMetaType metatype(typeInfo);
+    dynamicGadgetProperties->m_metatype = metatype;
+    int podTypeId = metatype.id();
     QVERIFY(podTypeId > 0);
     QMetaType::registerStreamOperators(podTypeId, &GadgetSaveOperator, &GadgetLoadOperator);
     s_managedTypes[podTypeId] = qMakePair(dynamicGadgetProperties, std::shared_ptr<QMetaObject>{});
@@ -1186,9 +1205,9 @@ static void testConstructCopyHelper()
     QMetaType info(ID);
     int size = QMetaType::sizeOf(ID);
     QCOMPARE(info.sizeOf(), size);
-    void *storage1 = qMallocAligned(size, Q_ALIGNOF(Type));
+    void *storage1 = qMallocAligned(size, alignof(Type));
     void *actual1 = QMetaType::construct(ID, storage1, expected);
-    void *storage2 = qMallocAligned(size, Q_ALIGNOF(Type));
+    void *storage2 = qMallocAligned(size, alignof(Type));
     void *actual2 = info.construct(storage2, expected);
     QCOMPARE(actual1, storage1);
     QCOMPARE(actual2, storage2);
@@ -1309,54 +1328,6 @@ void tst_QMetaType::registerType()
     QCOMPARE(qRegisterMetaType<MyFoo>("MyFoo"), fooId);
 
     QCOMPARE(QMetaType::type("MyFoo"), fooId);
-
-    // cannot unregister built-in types
-    QVERIFY(!QMetaType::unregisterType(QMetaType::QString));
-    QCOMPARE(QMetaType::type("QString"), int(QMetaType::QString));
-    QCOMPARE(QMetaType::type("MyString"), int(QMetaType::QString));
-
-    // cannot unregister declared types
-    QVERIFY(!QMetaType::unregisterType(fooId));
-    QCOMPARE(QMetaType::type("TestSpace::Foo"), fooId);
-    QCOMPARE(QMetaType::type("MyFoo"), fooId);
-
-    // test unregistration of dynamic types (used by Qml)
-    int unregId = QMetaType::registerType("UnregisterMe",
-                                          0,
-                                          0,
-                                          QtMetaTypePrivate::QMetaTypeFunctionHelper<void>::Destruct,
-                                          QtMetaTypePrivate::QMetaTypeFunctionHelper<void>::Construct,
-                                          0, QMetaType::TypeFlags(), 0);
-    QCOMPARE(QMetaType::registerTypedef("UnregisterMeTypedef", unregId), unregId);
-    int unregId2 = QMetaType::registerType("UnregisterMe2",
-                                           0,
-                                           0,
-                                           QtMetaTypePrivate::QMetaTypeFunctionHelper<void>::Destruct,
-                                           QtMetaTypePrivate::QMetaTypeFunctionHelper<void>::Construct,
-                                           0, QMetaType::TypeFlags(), 0);
-    QVERIFY(unregId >= int(QMetaType::User));
-    QCOMPARE(unregId2, unregId + 2);
-
-    QVERIFY(QMetaType::unregisterType(unregId));
-    QCOMPARE(QMetaType::type("UnregisterMe"), 0);
-    QCOMPARE(QMetaType::type("UnregisterMeTypedef"), 0);
-    QCOMPARE(QMetaType::type("UnregisterMe2"), unregId2);
-    QVERIFY(QMetaType::unregisterType(unregId2));
-    QCOMPARE(QMetaType::type("UnregisterMe2"), 0);
-
-    // re-registering should always return the lowest free index
-    QCOMPARE(QMetaType::registerType("UnregisterMe2",
-                                     0,
-                                     0,
-                                     QtMetaTypePrivate::QMetaTypeFunctionHelper<void>::Destruct,
-                                     QtMetaTypePrivate::QMetaTypeFunctionHelper<void>::Construct,
-                                     0, QMetaType::TypeFlags(), 0), unregId);
-    QCOMPARE(QMetaType::registerType("UnregisterMe",
-                                     0,
-                                     0,
-                                     QtMetaTypePrivate::QMetaTypeFunctionHelper<void>::Destruct,
-                                     QtMetaTypePrivate::QMetaTypeFunctionHelper<void>::Construct,
-                                     0, QMetaType::TypeFlags(), 0), unregId + 1);
 }
 
 class IsRegisteredDummyType { };
@@ -1367,7 +1338,7 @@ void tst_QMetaType::isRegistered_data()
     QTest::addColumn<bool>("registered");
 
     // predefined/custom types
-    QTest::newRow("QMetaType::Void") << int(QMetaType::Void) << true;
+    QTest::newRow("QMetaType::Void") << int(QMetaType::Void) << false;
     QTest::newRow("QMetaType::Int") << int(QMetaType::Int) << true;
 
     int dummyTypeId = qRegisterMetaType<IsRegisteredDummyType>("IsRegisteredDummyType");
@@ -1733,8 +1704,8 @@ void tst_QMetaType::automaticTemplateRegistration()
             CONTAINER< __VA_ARGS__ > t; \
             const QVariant v = QVariant::fromValue(t); \
             QByteArray tn = createTypeName(#CONTAINER "<", #__VA_ARGS__); \
-            const int type = QMetaType::type(tn); \
             const int expectedType = ::qMetaTypeId<CONTAINER< __VA_ARGS__ > >(); \
+            const int type = QMetaType::type(tn); \
             QCOMPARE(type, expectedType); \
             QCOMPARE((QMetaType::fromType<CONTAINER< __VA_ARGS__ >>().id()), expectedType); \
         }
@@ -1742,7 +1713,6 @@ void tst_QMetaType::automaticTemplateRegistration()
     #define FOR_EACH_1ARG_TEMPLATE_TYPE(F, TYPE) \
         F(QList, TYPE) \
         F(QVector, TYPE) \
-        F(QLinkedList, TYPE) \
         F(QVector, TYPE) \
         F(QVector, TYPE) \
         F(QQueue, TYPE) \
@@ -1777,7 +1747,7 @@ void tst_QMetaType::automaticTemplateRegistration()
       PRINT_2ARG_TEMPLATE
     )
 
-    CREATE_AND_VERIFY_CONTAINER(QList, QList<QMap<int, QHash<char, QVariantList> > >)
+    CREATE_AND_VERIFY_CONTAINER(QList, QList<QMap<int, QHash<char, QList<QVariant> > > >)
     CREATE_AND_VERIFY_CONTAINER(QVector, void*)
     CREATE_AND_VERIFY_CONTAINER(QVector, const void*)
     CREATE_AND_VERIFY_CONTAINER(QList, void*)
@@ -2017,7 +1987,7 @@ void tst_QMetaType::metaObject_data()
     QTest::newRow("MyGadget") << ::qMetaTypeId<MyGadget>() <<  &MyGadget::staticMetaObject << true << false << false;
     QTest::newRow("MyGadget*") << ::qMetaTypeId<MyGadget*>() << &MyGadget::staticMetaObject << false << true << false;
     QTest::newRow("MyEnum") << ::qMetaTypeId<MyGadget::MyEnum>() <<  &MyGadget::staticMetaObject << false << false << false;
-    QTest::newRow("Qt::ScrollBarPolicy") << ::qMetaTypeId<Qt::ScrollBarPolicy>() <<  &QObject::staticQtMetaObject << false << false << false;
+    QTest::newRow("Qt::ScrollBarPolicy") << ::qMetaTypeId<Qt::ScrollBarPolicy>() <<  &Qt::staticMetaObject << false << false << false;
     QTest::newRow("MyQObjectFromGadget*") << ::qMetaTypeId<MyQObjectFromGadget*>() << &MyQObjectFromGadget::staticMetaObject << false << false << true;
 
     QTest::newRow("GadgetDerivedAndTyped<int>") << ::qMetaTypeId<GadgetDerivedAndTyped<int>>() <<  &GadgetDerivedAndTyped<int>::staticMetaObject << true << false << false;
@@ -2139,7 +2109,7 @@ struct CustomConvertibleType
 };
 
 bool operator<(const CustomConvertibleType &lhs, const CustomConvertibleType &rhs)
-{ return lhs.m_foo < rhs.m_foo; }
+{ return lhs.m_foo.toString() < rhs.m_foo.toString(); }
 bool operator==(const CustomConvertibleType &lhs, const CustomConvertibleType &rhs)
 { return lhs.m_foo == rhs.m_foo; }
 bool operator!=(const CustomConvertibleType &lhs, const CustomConvertibleType &rhs)
@@ -2429,43 +2399,6 @@ void tst_QMetaType::convertCustomType()
     QCOMPARE(v.value<CustomConvertibleType2>().m_foo, testCustom.m_foo);
 }
 
-void tst_QMetaType::compareCustomType_data()
-{
-    QMetaType::registerComparators<CustomConvertibleType>();
-
-    QTest::addColumn<QVariantList>("unsorted");
-    QTest::addColumn<QVariantList>("sorted");
-
-    QTest::newRow("int") << (QVariantList() << 37 << 458 << 1 << 243 << -4 << 383)
-                         << (QVariantList() << -4 << 1 << 37 << 243 << 383 << 458);
-
-    QTest::newRow("dobule") << (QVariantList() << 4934.93 << 0.0 << 302.39 << -39.0)
-                            << (QVariantList() << -39.0 << 0.0 << 302.39 << 4934.93);
-
-    QTest::newRow("QString") << (QVariantList() << "Hello" << "World" << "this" << "is" << "a" << "test")
-                             << (QVariantList() << "a" << "Hello" << "is" << "test" << "this" << "World");
-
-    QTest::newRow("QTime") << (QVariantList() << QTime(14, 39) << QTime(0, 0) << QTime(18, 18) << QTime(9, 27))
-                           << (QVariantList() << QTime(0, 0) << QTime(9, 27) << QTime(14, 39) << QTime(18, 18));
-
-    QTest::newRow("QDate") << (QVariantList() << QDate(2013, 3, 23) << QDate(1900, 12, 1) << QDate(2001, 2, 2) << QDate(1982, 12, 16))
-                           << (QVariantList() << QDate(1900, 12, 1) << QDate(1982, 12, 16) << QDate(2001, 2, 2) << QDate(2013, 3, 23));
-
-    QTest::newRow("mixed")   << (QVariantList() << "Hello" << "World" << QChar('a') << 38 << QChar('z') << -39 << 4.6)
-                             << (QVariantList() << -39 << 4.6 << 38 << QChar('a') << "Hello" << "World" << QChar('z'));
-
-    QTest::newRow("custom") << (QVariantList() << QVariant::fromValue(CustomConvertibleType(1)) << QVariant::fromValue(CustomConvertibleType(100)) << QVariant::fromValue(CustomConvertibleType(50)))
-                            << (QVariantList() << QVariant::fromValue(CustomConvertibleType(1)) << QVariant::fromValue(CustomConvertibleType(50)) << QVariant::fromValue(CustomConvertibleType(100)));
-}
-
-void tst_QMetaType::compareCustomType()
-{
-    QFETCH(QVariantList, unsorted);
-    QFETCH(QVariantList, sorted);
-    std::sort(unsorted.begin(), unsorted.end());
-    QCOMPARE(unsorted, sorted);
-}
-
 void tst_QMetaType::compareCustomEqualOnlyType()
 {
     int metaTypeId = qRegisterMetaType<CustomEqualsOnlyType>();
@@ -2487,11 +2420,6 @@ void tst_QMetaType::compareCustomEqualOnlyType()
     QCOMPARE(variant100, variant100x);
     QCOMPARE(variant100, variant100);
 
-    // compare always fails
-    QVERIFY(!(variant50 < variant50));
-    QVERIFY(!(variant50 < variant100));
-    QVERIFY(!(variant100 < variant50));
-
     // check QMetaType::compare works/doesn't crash for equals only comparators
     bool wasSuccess = QMetaType::compare(variant50.constData(), variant50.constData(),
                                           metaTypeId, &result);
@@ -2588,7 +2516,8 @@ void tst_QMetaType::fromType()
         QCOMPARE(QMetaType::fromType<RealType>(), QMetaType(MetaTypeId)); \
         QVERIFY(QMetaType::fromType<RealType>() == QMetaType(MetaTypeId)); \
         QVERIFY(!(QMetaType::fromType<RealType>() != QMetaType(MetaTypeId))); \
-        QCOMPARE(QMetaType::fromType<RealType>().id(), MetaTypeId);
+        if (MetaTypeId != QMetaType::Void) \
+            QCOMPARE(QMetaType::fromType<RealType>().id(), MetaTypeId);
 
     FOR_EACH_CORE_METATYPE(FROMTYPE_CHECK)
 
@@ -2600,6 +2529,50 @@ void tst_QMetaType::fromType()
     #undef FROMTYPE_CHECK
 }
 
+template<char X, typename T = void>
+struct CharTemplate
+{
+    struct
+    {
+        int a;
+    } x;
+};
+
+void tst_QMetaType::operatorEq_data()
+{
+    QTest::addColumn<QMetaType>("typeA");
+    QTest::addColumn<QMetaType>("typeB");
+    QTest::addColumn<bool>("eq");
+
+    QTest::newRow("String") << QMetaType(QMetaType::QString)
+                            << QMetaType::fromType<const QString &>() << true;
+    QTest::newRow("void1") << QMetaType(QMetaType::UnknownType) << QMetaType::fromType<void>()
+                           << true;
+    QTest::newRow("void2") << QMetaType::fromType<const void>() << QMetaType::fromType<void>()
+                           << true;
+    QTest::newRow("vec1") << QMetaType::fromType<QVector<const int *>>()
+                          << QMetaType::fromType<QVector<const int *>>() << true;
+    QTest::newRow("vec2") << QMetaType::fromType<QVector<const int *>>()
+                          << QMetaType::fromType<QVector<int *>>() << false;
+    QTest::newRow("char1") << QMetaType::fromType<CharTemplate<'>'>>()
+                           << QMetaType::fromType<CharTemplate<'>', void>>() << true;
+    QTest::newRow("annon1") << QMetaType::fromType<decltype(CharTemplate<'>'>::x)>()
+                            << QMetaType::fromType<decltype(CharTemplate<'>'>::x)>() << true;
+    QTest::newRow("annon2") << QMetaType::fromType<decltype(CharTemplate<'>'>::x)>()
+                            << QMetaType::fromType<decltype(CharTemplate<'<'>::x)>() << false;
+}
+
+void tst_QMetaType::operatorEq()
+{
+    QFETCH(QMetaType, typeA);
+    QFETCH(QMetaType, typeB);
+    QFETCH(bool, eq);
+
+    QCOMPARE(typeA == typeB, eq);
+    QCOMPARE(typeB == typeA, eq);
+    QCOMPARE(typeA != typeB, !eq);
+    QCOMPARE(typeB != typeA, !eq);
+}
 
 // Compile-time test, it should be possible to register function pointer types
 class Undefined;
diff --git a/tests/auto/corelib/kernel/qmetatype/typeFlags.bin b/tests/auto/corelib/kernel/qmetatype/typeFlags.bin
index 7009be98a2..0aa282efc9 100644
--- a/tests/auto/corelib/kernel/qmetatype/typeFlags.bin
+++ b/tests/auto/corelib/kernel/qmetatype/typeFlags.bin
diff --git a/tests/auto/corelib/kernel/qmimedata/CMakeLists.txt b/tests/auto/corelib/kernel/qmimedata/CMakeLists.txt
new file mode 100644
index 0000000000..b4965302dd
--- /dev/null
+++ b/tests/auto/corelib/kernel/qmimedata/CMakeLists.txt
@@ -0,0 +1,12 @@
+# Generated from qmimedata.pro.
+
+#####################################################################
+## tst_qmimedata Test:
+#####################################################################
+
+add_qt_test(tst_qmimedata
+    SOURCES
+        tst_qmimedata.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+)
diff --git a/tests/auto/corelib/kernel/qobject/CMakeLists.txt b/tests/auto/corelib/kernel/qobject/CMakeLists.txt
new file mode 100644
index 0000000000..3be3287532
--- /dev/null
+++ b/tests/auto/corelib/kernel/qobject/CMakeLists.txt
@@ -0,0 +1,29 @@
+# Generated from qobject.pro.
+
+#####################################################################
+## tst_qobject Test:
+#####################################################################
+
+add_qt_test(tst_qobject
+    SOURCES
+        tst_qobject.cpp
+    DEFINES
+        QT_DISABLE_DEPRECATED_BEFORE=0
+    LIBRARIES
+        Qt::CorePrivate
+    PUBLIC_LIBRARIES
+        Qt::Network
+)
+
+#### Keys ignored in scope 3:.:.:test.pro:<TRUE>:
+# CONFIG = "testcase" "console"
+
+## Scopes:
+#####################################################################
+
+#### Keys ignored in scope 4:.:.:test.pro:QT_CONFIG___contains___c++1z:
+# CONFIG = "c++1z"
+
+if(NOT WINRT)
+    add_subdirectory(signalbug)
+endif()
diff --git a/tests/auto/corelib/kernel/qobject/signalbug/CMakeLists.txt b/tests/auto/corelib/kernel/qobject/signalbug/CMakeLists.txt
new file mode 100644
index 0000000000..e798028b1b
--- /dev/null
+++ b/tests/auto/corelib/kernel/qobject/signalbug/CMakeLists.txt
@@ -0,0 +1,10 @@
+# Generated from signalbug.pro.
+
+#####################################################################
+## signalbug_helper Binary:
+#####################################################################
+
+add_qt_test_helper(signalbug_helper
+    SOURCES
+        signalbug.cpp signalbug.h
+)
diff --git a/tests/auto/corelib/kernel/qobject/tst_qobject.cpp b/tests/auto/corelib/kernel/qobject/tst_qobject.cpp
index 63d06497ce..05599f9585 100644
--- a/tests/auto/corelib/kernel/qobject/tst_qobject.cpp
+++ b/tests/auto/corelib/kernel/qobject/tst_qobject.cpp
@@ -81,9 +81,6 @@ private slots:
     void senderTest();
     void declareInterface();
     void qpointerResetBeforeDestroyedSignal();
-#ifndef QT_NO_USERDATA
-    void testUserData();
-#endif
     void childDeletesItsSibling();
     void dynamicProperties();
     void floatProperty();
@@ -463,7 +460,7 @@ void tst_QObject::connectSlotsByName()
     sender.setObjectName("Sender");
 
     QTest::ignoreMessage(QtWarningMsg, "QMetaObject::connectSlotsByName: No matching signal for on_child_signal()");
-    QTest::ignoreMessage(QtWarningMsg, "QMetaObject::connectSlotsByName: Connecting slot on_Sender_signalManyParams() with the first of the following compatible signals: (\"signalManyParams(int,int,int,QString,bool)\", \"signalManyParams(int,int,int,QString,bool,bool)\")");
+    QTest::ignoreMessage(QtWarningMsg, "QMetaObject::connectSlotsByName: Connecting slot on_Sender_signalManyParams() with the first of the following compatible signals: QVector(\"signalManyParams(int,int,int,QString,bool)\", \"signalManyParams(int,int,int,QString,bool,bool)\")");
     QMetaObject::connectSlotsByName(&receiver);
 
     receiver.called_slots.clear();
@@ -1917,7 +1914,7 @@ void tst_QObject::property()
     property = mo->property(mo->indexOfProperty("alpha"));
     QVERIFY(property.isEnumType());
     QCOMPARE(property.typeName(), "Alpha");
-    QCOMPARE(property.type(), QVariant::Int);
+    QCOMPARE(property.userType(), QMetaType::fromType<PropertyObject::Alpha>().id());
 
     QVariant var = object.property("alpha");
     QVERIFY(!var.isNull());
@@ -1928,7 +1925,8 @@ void tst_QObject::property()
     QCOMPARE(object.property("alpha").toInt(), int(PropertyObject::Alpha2));
     QVERIFY(object.setProperty("alpha", "Alpha1"));
     QCOMPARE(object.property("alpha").toInt(), int(PropertyObject::Alpha1));
-    QVERIFY(!object.setProperty("alpha", QVariant()));
+    QVERIFY(object.setProperty("alpha", QVariant()));
+    QCOMPARE(object.property("alpha").toInt(), 0);
 
     QVERIFY(mo->indexOfProperty("number") != -1);
     QCOMPARE(object.property("number").toInt(), 0);
@@ -1998,7 +1996,7 @@ void tst_QObject::property()
     property = mo->property(mo->indexOfProperty("priority"));
     QVERIFY(property.isEnumType());
     QCOMPARE(property.typeName(), "Priority");
-    QCOMPARE(property.type(), QVariant::Int);
+    QCOMPARE(property.userType(), QMetaType::fromType<PropertyObject::Priority>().id());
 
     var = object.property("priority");
     QVERIFY(!var.isNull());
@@ -2009,7 +2007,8 @@ void tst_QObject::property()
     QCOMPARE(object.property("priority").toInt(), int(PropertyObject::VeryHigh));
     QVERIFY(object.setProperty("priority", "High"));
     QCOMPARE(object.property("priority").toInt(), int(PropertyObject::High));
-    QVERIFY(!object.setProperty("priority", QVariant()));
+    QVERIFY(object.setProperty("priority", QVariant()));
+    QCOMPARE(object.property("priority").toInt(), 0);
 
     // now it's registered, so it works as expected
     int priorityMetaTypeId = qRegisterMetaType<PropertyObject::Priority>("PropertyObject::Priority");
@@ -2031,7 +2030,8 @@ void tst_QObject::property()
     QCOMPARE(qvariant_cast<PropertyObject::Priority>(object.property("priority")), PropertyObject::VeryHigh);
     QVERIFY(object.setProperty("priority", "High"));
     QCOMPARE(qvariant_cast<PropertyObject::Priority>(object.property("priority")), PropertyObject::High);
-    QVERIFY(!object.setProperty("priority", QVariant()));
+    QVERIFY(object.setProperty("priority", QVariant()));
+    QCOMPARE(object.property("priority").toInt(), 0);
 
     var = object.property("priority");
     QCOMPARE(qvariant_cast<PropertyObject::Priority>(var), PropertyObject::High);
@@ -2341,51 +2341,6 @@ void tst_QObject::declareInterface()
 
 }
 
-#ifndef QT_NO_USERDATA
-class CustomData : public QObjectUserData
-{
-public:
-    int id;
-};
-
-void tst_QObject::testUserData()
-{
-    const int USER_DATA_COUNT = 100;
-    int user_data_ids[USER_DATA_COUNT];
-
-    // Register a few
-    for (int i=0; i<USER_DATA_COUNT; ++i) {
-        user_data_ids[i] = QObject::registerUserData();
-    }
-
-    // Randomize the table a bit
-    for (int i=0; i<100; ++i) {
-        int p1 = QRandomGenerator::global()->bounded(USER_DATA_COUNT);
-        int p2 = QRandomGenerator::global()->bounded(USER_DATA_COUNT);
-
-        int tmp = user_data_ids[p1];
-        user_data_ids[p1] = user_data_ids[p2];
-        user_data_ids[p2] = tmp;
-    }
-
-    // insert the user data into an object
-    QObject my_test_object;
-    for (int i=0; i<USER_DATA_COUNT; ++i) {
-        CustomData *data = new CustomData;
-        data->id = user_data_ids[i];
-        my_test_object.setUserData(data->id, data);
-    }
-
-    // verify that all ids and positions are matching
-    for (int i=0; i<USER_DATA_COUNT; ++i) {
-        int id = user_data_ids[i];
-        CustomData *data = static_cast<CustomData *>(my_test_object.userData(id));
-        QVERIFY(data != nullptr);
-        QCOMPARE(data->id, id);
-    }
-}
-#endif // QT_NO_USERDATA
-
 class DestroyedListener : public QObject
 {
     Q_OBJECT
@@ -6974,8 +6929,7 @@ void tst_QObject::noDeclarativeParentChangedOnDestruction()
     QObject *parent = new QObject;
     QObject *child = new QObject;
 
-    QAbstractDeclarativeDataImpl dummy;
-    dummy.ownedByQml1 = false;
+    QAbstractDeclarativeData dummy;
     QObjectPrivate::get(child)->declarativeData = &dummy;
 
     parentChangeCalled = false;
diff --git a/tests/auto/corelib/kernel/qpointer/CMakeLists.txt b/tests/auto/corelib/kernel/qpointer/CMakeLists.txt
new file mode 100644
index 0000000000..804a3a9def
--- /dev/null
+++ b/tests/auto/corelib/kernel/qpointer/CMakeLists.txt
@@ -0,0 +1,18 @@
+# Generated from qpointer.pro.
+
+#####################################################################
+## tst_qpointer Test:
+#####################################################################
+
+add_qt_test(tst_qpointer
+    SOURCES
+        tst_qpointer.cpp
+)
+
+## Scopes:
+#####################################################################
+
+extend_target(tst_qpointer CONDITION TARGET Qt::Widgets
+    PUBLIC_LIBRARIES
+        Qt::Widgets
+)
diff --git a/tests/auto/corelib/kernel/qsharedmemory/CMakeLists.txt b/tests/auto/corelib/kernel/qsharedmemory/CMakeLists.txt
new file mode 100644
index 0000000000..366e76d034
--- /dev/null
+++ b/tests/auto/corelib/kernel/qsharedmemory/CMakeLists.txt
@@ -0,0 +1,30 @@
+# Generated from qsharedmemory.pro.
+
+
+if(QT_FEATURE_sharedmemory)
+    #####################################################################
+    ## tst_qsharedmemory Test:
+    #####################################################################
+
+    add_qt_test(tst_qsharedmemory
+        SOURCES
+            tst_qsharedmemory.cpp
+        LIBRARIES
+            Qt::CorePrivate
+    )
+
+#### Keys ignored in scope 4:.:.:test.pro:<TRUE>:
+    # CONFIG = "testcase"
+
+    ## Scopes:
+    #####################################################################
+
+    extend_target(tst_qsharedmemory CONDITION LINUX
+    PUBLIC_LIBRARIES
+        rt
+    )
+
+    if(NOT WINRT)
+        add_subdirectory(producerconsumer)
+    endif()
+endif()
diff --git a/tests/auto/corelib/kernel/qsharedmemory/producerconsumer/CMakeLists.txt b/tests/auto/corelib/kernel/qsharedmemory/producerconsumer/CMakeLists.txt
new file mode 100644
index 0000000000..2e16a673b1
--- /dev/null
+++ b/tests/auto/corelib/kernel/qsharedmemory/producerconsumer/CMakeLists.txt
@@ -0,0 +1,12 @@
+# Generated from producerconsumer.pro.
+
+#####################################################################
+## producerconsumer_helper Binary:
+#####################################################################
+
+add_qt_test_helper(producerconsumer_helper
+    SOURCES
+        main.cpp
+    PUBLIC_LIBRARIES
+        Qt::Test
+)
diff --git a/tests/auto/corelib/kernel/qsignalblocker/CMakeLists.txt b/tests/auto/corelib/kernel/qsignalblocker/CMakeLists.txt
new file mode 100644
index 0000000000..ae86137c94
--- /dev/null
+++ b/tests/auto/corelib/kernel/qsignalblocker/CMakeLists.txt
@@ -0,0 +1,10 @@
+# Generated from qsignalblocker.pro.
+
+#####################################################################
+## tst_qsignalblocker Test:
+#####################################################################
+
+add_qt_test(tst_qsignalblocker
+    SOURCES
+        tst_qsignalblocker.cpp
+)
diff --git a/tests/auto/corelib/kernel/qsignalmapper/CMakeLists.txt b/tests/auto/corelib/kernel/qsignalmapper/CMakeLists.txt
new file mode 100644
index 0000000000..1360e76ea1
--- /dev/null
+++ b/tests/auto/corelib/kernel/qsignalmapper/CMakeLists.txt
@@ -0,0 +1,10 @@
+# Generated from qsignalmapper.pro.
+
+#####################################################################
+## tst_qsignalmapper Test:
+#####################################################################
+
+add_qt_test(tst_qsignalmapper
+    SOURCES
+        tst_qsignalmapper.cpp
+)
diff --git a/tests/auto/corelib/kernel/qsocketnotifier/CMakeLists.txt b/tests/auto/corelib/kernel/qsocketnotifier/CMakeLists.txt
new file mode 100644
index 0000000000..cb847dc503
--- /dev/null
+++ b/tests/auto/corelib/kernel/qsocketnotifier/CMakeLists.txt
@@ -0,0 +1,38 @@
+# Generated from qsocketnotifier.pro.
+
+if(NOT QT_FEATURE_private_tests)
+    return()
+endif()
+
+#####################################################################
+## tst_qsocketnotifier Test:
+#####################################################################
+
+add_qt_test(tst_qsocketnotifier
+    SOURCES
+        tst_qsocketnotifier.cpp
+    INCLUDE_DIRECTORIES
+        ${QT_SOURCE_TREE}/src/network
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::Network
+        Qt::NetworkPrivate
+)
+
+#### Keys ignored in scope 1:.:.:qsocketnotifier.pro:<TRUE>:
+# _REQUIREMENTS = "qtConfig(private_tests)"
+
+## Scopes:
+#####################################################################
+
+extend_target(tst_qsocketnotifier CONDITION WIN32
+    PUBLIC_LIBRARIES
+        ws2_32
+)
+
+extend_target(tst_qsocketnotifier CONDITION QT_FEATURE_reduce_exports AND UNIX
+    SOURCES
+        ${QT_SOURCE_TREE}/src/network/socket/qabstractsocketengine.cpp ${QT_SOURCE_TREE}/src/network/socket/qabstractsocketengine_p.h
+        ${QT_SOURCE_TREE}/src/network/socket/qnativesocketengine.cpp ${QT_SOURCE_TREE}/src/network/socket/qnativesocketengine_p.h
+        ${QT_SOURCE_TREE}/src/network/socket/qnativesocketengine_unix.cpp
+)
diff --git a/tests/auto/corelib/kernel/qsystemsemaphore/CMakeLists.txt b/tests/auto/corelib/kernel/qsystemsemaphore/CMakeLists.txt
new file mode 100644
index 0000000000..1e6889eec0
--- /dev/null
+++ b/tests/auto/corelib/kernel/qsystemsemaphore/CMakeLists.txt
@@ -0,0 +1,20 @@
+# Generated from qsystemsemaphore.pro.
+
+add_subdirectory(acquirerelease)
+#####################################################################
+## tst_qsystemsemaphore Test:
+#####################################################################
+
+add_qt_test(tst_qsystemsemaphore
+    SOURCES
+        tst_qsystemsemaphore.cpp
+)
+
+#### Keys ignored in scope 2:.:.:test.pro:<TRUE>:
+# CONFIG = "testcase"
+
+## Scopes:
+#####################################################################
+
+#### Keys ignored in scope 3:.:.:test.pro:WIN32:
+# CONFIG = "console"
diff --git a/tests/auto/corelib/kernel/qsystemsemaphore/acquirerelease/CMakeLists.txt b/tests/auto/corelib/kernel/qsystemsemaphore/acquirerelease/CMakeLists.txt
new file mode 100644
index 0000000000..ddce7297d2
--- /dev/null
+++ b/tests/auto/corelib/kernel/qsystemsemaphore/acquirerelease/CMakeLists.txt
@@ -0,0 +1,12 @@
+# Generated from acquirerelease.pro.
+
+#####################################################################
+## acquirerelease_helper Binary:
+#####################################################################
+
+add_qt_test_helper(acquirerelease_helper
+    SOURCES
+        main.cpp
+    PUBLIC_LIBRARIES
+        Qt::Test
+)
diff --git a/tests/auto/corelib/kernel/qtimer/CMakeLists.txt b/tests/auto/corelib/kernel/qtimer/CMakeLists.txt
new file mode 100644
index 0000000000..84585751ac
--- /dev/null
+++ b/tests/auto/corelib/kernel/qtimer/CMakeLists.txt
@@ -0,0 +1,15 @@
+# Generated from qtimer.pro.
+
+#####################################################################
+## tst_qtimer Test:
+#####################################################################
+
+add_qt_test(tst_qtimer
+    SOURCES
+        tst_qtimer.cpp
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+)
+
+## Scopes:
+#####################################################################
diff --git a/tests/auto/corelib/kernel/qtranslator/CMakeLists.txt b/tests/auto/corelib/kernel/qtranslator/CMakeLists.txt
new file mode 100644
index 0000000000..79e44bc928
--- /dev/null
+++ b/tests/auto/corelib/kernel/qtranslator/CMakeLists.txt
@@ -0,0 +1,47 @@
+# Generated from qtranslator.pro.
+
+#####################################################################
+## tst_qtranslator Test:
+#####################################################################
+
+add_qt_test(tst_qtranslator
+    SOURCES
+        tst_qtranslator.cpp
+)
+
+# Resources:
+set(qtranslator_resource_files
+    "hellotr_empty.qm"
+    "hellotr_la.qm"
+)
+
+add_qt_resource(tst_qtranslator "qtranslator"
+    PREFIX
+        "/tst_qtranslator"
+    FILES
+        ${qtranslator_resource_files}
+)
+
+
+## Scopes:
+#####################################################################
+
+if(ANDROID AND NOT ANDROID_EMBEDDED)
+    # Resources:
+    set(android_testdata_resource_files
+        "dependencies_la.qm"
+        "hellotr_empty.qm"
+        "hellotr_la.qm"
+        "msgfmt_from_po.qm"
+    )
+
+    add_qt_resource(tst_qtranslator "android_testdata"
+        PREFIX
+            "/android_testdata"
+        FILES
+            ${android_testdata_resource_files}
+    )
+endif()
+
+#### Keys ignored in scope 3:.:.:qtranslator.pro:else:
+# TESTDATA = "dependencies_la.qm" "hellotr_empty.qm" "hellotr_la.qm" "msgfmt_from_po.qm"
diff --git a/tests/auto/corelib/kernel/qvariant/.prev_CMakeLists.txt b/tests/auto/corelib/kernel/qvariant/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..dc676d11fe
--- /dev/null
+++ b/tests/auto/corelib/kernel/qvariant/.prev_CMakeLists.txt
@@ -0,0 +1,34 @@
+# Generated from qvariant.pro.
+
+#####################################################################
+## tst_qvariant Test:
+#####################################################################
+
+add_qt_test(tst_qvariant
+    SOURCES
+        tst_qvariant.cpp
+    DEFINES
+        -QT_NO_LINKED_LIST
+        QT_DISABLE_DEPRECATED_BEFORE=0
+    INCLUDE_DIRECTORIES
+        ../../../other/qvariant_common
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+)
+
+# Resources:
+set(qvariant_resource_files
+    "stream/qt4.9/"
+    "stream/qt5.0/"
+)
+
+add_qt_resource(tst_qvariant "qvariant"
+    PREFIX
+        "/"
+    FILES
+        ${qvariant_resource_files}
+)
+
+
+## Scopes:
+#####################################################################
diff --git a/tests/auto/corelib/kernel/qvariant/CMakeLists.txt b/tests/auto/corelib/kernel/qvariant/CMakeLists.txt
new file mode 100644
index 0000000000..dff731cfc2
--- /dev/null
+++ b/tests/auto/corelib/kernel/qvariant/CMakeLists.txt
@@ -0,0 +1,34 @@
+# Generated from qvariant.pro.
+
+#####################################################################
+## tst_qvariant Test:
+#####################################################################
+
+add_qt_test(tst_qvariant
+    SOURCES
+        tst_qvariant.cpp
+    DEFINES
+        # -QT_NO_LINKED_LIST # special case remove until we fix this
+        QT_DISABLE_DEPRECATED_BEFORE=0
+    INCLUDE_DIRECTORIES
+        ../../../other/qvariant_common
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+)
+
+# Resources:
+set(qvariant_resource_files
+    "stream/qt4.9/"
+    "stream/qt5.0/"
+)
+
+add_qt_resource(tst_qvariant "qvariant"
+    PREFIX
+        "/"
+    FILES
+        ${qvariant_resource_files}
+)
+
+
+## Scopes:
+#####################################################################
diff --git a/tests/auto/corelib/kernel/qvariant/qvariant.pro b/tests/auto/corelib/kernel/qvariant/qvariant.pro
index 0b5280df86..a620be0091 100644
--- a/tests/auto/corelib/kernel/qvariant/qvariant.pro
+++ b/tests/auto/corelib/kernel/qvariant/qvariant.pro
@@ -5,7 +5,6 @@ INCLUDEPATH += $$PWD/../../../other/qvariant_common
 SOURCES = tst_qvariant.cpp
 RESOURCES += qvariant.qrc
 DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
-DEFINES -= QT_NO_LINKED_LIST
 qtConfig(c++14): CONFIG += c++14
 qtConfig(c++1z): CONFIG += c++1z
 !qtConfig(doubleconversion):!qtConfig(system-doubleconversion) {
diff --git a/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp b/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp
index 5af1353a0f..1b3bc8a627 100644
--- a/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp
+++ b/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp
@@ -49,7 +49,6 @@
 #if __has_include(<variant>) && __cplusplus >= 201703L
 #include <variant>
 #endif
-#include <QLinkedList>
 #include <QRegularExpression>
 #include <QDir>
 #include <QBuffer>
@@ -190,8 +189,6 @@ private slots:
     void operator_eq_eq_data();
     void operator_eq_eq();
     void operator_eq_eq_rhs();
-    void compareNumbers_data() const;
-    void compareNumbers() const;
 
     void typeName_data();
     void typeName();
@@ -270,9 +267,6 @@ private slots:
 
     void enums();
     void metaEnums();
-    void compareSanity_data();
-    void compareSanity();
-    void compareRich();
 
     void nullConvert();
 
@@ -355,13 +349,13 @@ void tst_QVariant::constructor_invalid()
 
     QFETCH(uint, typeId);
     {
-        QTest::ignoreMessage(QtWarningMsg, QRegularExpression("^Trying to construct an instance of an invalid type, type id:"));
+        QTest::ignoreMessage(QtWarningMsg, QRegularExpression("^Trying to construct an instance of an invalid type"));
         QVariant variant(static_cast<QVariant::Type>(typeId));
         QVERIFY(!variant.isValid());
         QCOMPARE(variant.userType(), int(QMetaType::UnknownType));
     }
     {
-        QTest::ignoreMessage(QtWarningMsg, QRegularExpression("^Trying to construct an instance of an invalid type, type id:"));
+        QTest::ignoreMessage(QtWarningMsg, QRegularExpression("^Trying to construct an instance of an invalid type"));
         QVariant variant(typeId, /* copy */ 0);
         QVERIFY(!variant.isValid());
         QCOMPARE(variant.userType(), int(QMetaType::UnknownType));
@@ -1439,10 +1433,7 @@ void tst_QVariant::checkDataStream()
     const int typeId = QMetaType::LastCoreType + 1;
     QVERIFY(!QMetaType::isRegistered(typeId));
 
-    QByteArray errorMessage("Trying to construct an instance of an invalid type, type id: ");
-    errorMessage.append(QString::number(typeId, 10));
-
-    QTest::ignoreMessage(QtWarningMsg, errorMessage.constData());
+    QTest::ignoreMessage(QtWarningMsg, QRegularExpression("^Trying to construct an instance of an invalid type"));
     QByteArray settingsHex("000000");
     settingsHex.append(QString::number(typeId, 16));
     settingsHex.append("ffffffffff");
@@ -1732,344 +1723,6 @@ void tst_QVariant::operator_eq_eq_rhs()
 #endif
 }
 
-void tst_QVariant::compareNumbers_data() const
-{
-    typedef signed char schar;
-    QTest::addColumn<QVariant>("v1");
-    QTest::addColumn<QVariant>("v2");
-    QTest::addColumn<int>("expected");
-
-    // sanity checking: same types
-    QTest::newRow("bool1") << QVariant(false) << QVariant(false) << 0;
-    QTest::newRow("bool2") << QVariant(true) << QVariant(true) << 0;
-    QTest::newRow("bool3") << QVariant(false) << QVariant(true) << -1;
-    QTest::newRow("bool4") << QVariant(true) << QVariant(false) << +1;
-
-    QTest::newRow("char1") << QVariant::fromValue(char(0)) << QVariant::fromValue(char(0)) << 0;
-    QTest::newRow("char2") << QVariant::fromValue(CHAR_MAX) << QVariant::fromValue(CHAR_MAX) << 0;
-    QTest::newRow("char3") << QVariant::fromValue(CHAR_MIN) << QVariant::fromValue(CHAR_MIN) << 0;
-    QTest::newRow("char4") << QVariant::fromValue(CHAR_MIN) << QVariant::fromValue(CHAR_MAX) << -1;
-    QTest::newRow("char5") << QVariant::fromValue(CHAR_MAX) << QVariant::fromValue(CHAR_MIN) << +1;
-
-    QTest::newRow("schar1") << QVariant::fromValue(schar(0)) << QVariant::fromValue(schar(0)) << 0;
-    QTest::newRow("schar2") << QVariant::fromValue(SCHAR_MAX) << QVariant::fromValue(SCHAR_MAX) << 0;
-    QTest::newRow("schar3") << QVariant::fromValue(SCHAR_MIN) << QVariant::fromValue(SCHAR_MIN) << 0;
-    QTest::newRow("schar4") << QVariant::fromValue(SCHAR_MIN) << QVariant::fromValue(SCHAR_MAX) << -1;
-    QTest::newRow("schar5") << QVariant::fromValue(SCHAR_MAX) << QVariant::fromValue(SCHAR_MIN) << +1;
-
-    QTest::newRow("uchar1") << QVariant::fromValue(uchar(0)) << QVariant::fromValue(uchar(0)) << 0;
-    QTest::newRow("uchar2") << QVariant::fromValue(UCHAR_MAX) << QVariant::fromValue(UCHAR_MAX) << 0;
-    QTest::newRow("uchar3") << QVariant::fromValue(uchar(0)) << QVariant::fromValue(UCHAR_MAX) << -1;
-    QTest::newRow("uchar4") << QVariant::fromValue(UCHAR_MAX) << QVariant::fromValue(uchar(0)) << +1;
-
-    QTest::newRow("short1") << QVariant::fromValue(short(0)) << QVariant::fromValue(short(0)) << 0;
-    QTest::newRow("short2") << QVariant::fromValue(SHRT_MAX) << QVariant::fromValue(SHRT_MAX) << 0;
-    QTest::newRow("short3") << QVariant::fromValue(SHRT_MIN) << QVariant::fromValue(SHRT_MIN) << 0;
-    QTest::newRow("short4") << QVariant::fromValue(SHRT_MIN) << QVariant::fromValue(SHRT_MAX) << -1;
-    QTest::newRow("short5") << QVariant::fromValue(SHRT_MAX) << QVariant::fromValue(SHRT_MIN) << +1;
-
-    QTest::newRow("ushort1") << QVariant::fromValue(ushort(0)) << QVariant::fromValue(ushort(0)) << 0;
-    QTest::newRow("ushort2") << QVariant::fromValue(USHRT_MAX) << QVariant::fromValue(USHRT_MAX) << 0;
-    QTest::newRow("ushort3") << QVariant::fromValue(ushort(0)) << QVariant::fromValue(USHRT_MAX) << -1;
-    QTest::newRow("ushort4") << QVariant::fromValue(USHRT_MAX) << QVariant::fromValue(ushort(0)) << +1;
-
-    QTest::newRow("int1") << QVariant::fromValue(int(0)) << QVariant::fromValue(int(0)) << 0;
-    QTest::newRow("int2") << QVariant::fromValue(INT_MAX) << QVariant::fromValue(INT_MAX) << 0;
-    QTest::newRow("int3") << QVariant::fromValue(INT_MIN) << QVariant::fromValue(INT_MIN) << 0;
-    QTest::newRow("int4") << QVariant::fromValue(INT_MIN) << QVariant::fromValue(INT_MAX) << -1;
-    QTest::newRow("int5") << QVariant::fromValue(INT_MAX) << QVariant::fromValue(INT_MIN) << +1;
-
-    QTest::newRow("uint1") << QVariant::fromValue(uint(0)) << QVariant::fromValue(uint(0)) << 0;
-    QTest::newRow("uint2") << QVariant::fromValue(UINT_MAX) << QVariant::fromValue(UINT_MAX) << 0;
-    QTest::newRow("uint3") << QVariant::fromValue(uint(0)) << QVariant::fromValue(UINT_MAX) << -1;
-    QTest::newRow("uint4") << QVariant::fromValue(UINT_MAX) << QVariant::fromValue(uint(0)) << +1;
-
-    QTest::newRow("long1") << QVariant::fromValue(long(0)) << QVariant::fromValue(long(0)) << 0;
-    QTest::newRow("long2") << QVariant::fromValue(LONG_MAX) << QVariant::fromValue(LONG_MAX) << 0;
-    QTest::newRow("long3") << QVariant::fromValue(LONG_MIN) << QVariant::fromValue(LONG_MIN) << 0;
-    QTest::newRow("long4") << QVariant::fromValue(LONG_MIN) << QVariant::fromValue(LONG_MAX) << -1;
-    QTest::newRow("long5") << QVariant::fromValue(LONG_MAX) << QVariant::fromValue(LONG_MIN) << +1;
-
-    QTest::newRow("ulong1") << QVariant::fromValue(ulong(0)) << QVariant::fromValue(ulong(0)) << 0;
-    QTest::newRow("ulong2") << QVariant::fromValue(ULONG_MAX) << QVariant::fromValue(ULONG_MAX) << 0;
-    QTest::newRow("ulong3") << QVariant::fromValue(ulong(0)) << QVariant::fromValue(ULONG_MAX) << -1;
-    QTest::newRow("ulong4") << QVariant::fromValue(ULONG_MAX) << QVariant::fromValue(ulong(0)) << +1;
-
-    QTest::newRow("llong1") << QVariant::fromValue(qlonglong(0)) << QVariant::fromValue(qlonglong(0)) << 0;
-    QTest::newRow("llong2") << QVariant::fromValue(LLONG_MAX) << QVariant::fromValue(LLONG_MAX) << 0;
-    QTest::newRow("llong3") << QVariant::fromValue(LLONG_MIN) << QVariant::fromValue(LLONG_MIN) << 0;
-    QTest::newRow("llong4") << QVariant::fromValue(LLONG_MIN) << QVariant::fromValue(LLONG_MAX) << -1;
-    QTest::newRow("llong5") << QVariant::fromValue(LLONG_MAX) << QVariant::fromValue(LLONG_MIN) << +1;
-
-    QTest::newRow("ullong1") << QVariant::fromValue(qulonglong(0)) << QVariant::fromValue(qulonglong(0)) << 0;
-    QTest::newRow("ullong2") << QVariant::fromValue(ULLONG_MAX) << QVariant::fromValue(ULLONG_MAX) << 0;
-    QTest::newRow("ullong3") << QVariant::fromValue(qulonglong(0)) << QVariant::fromValue(ULLONG_MAX) << -1;
-    QTest::newRow("ullong4") << QVariant::fromValue(ULLONG_MAX) << QVariant::fromValue(qulonglong(0)) << +1;
-
-    QTest::newRow("float1") << QVariant::fromValue(0.f) << QVariant::fromValue(0.f) << 0;
-    QTest::newRow("float2") << QVariant::fromValue(-1.f) << QVariant::fromValue(0.f) << -1;
-    QTest::newRow("float3") << QVariant::fromValue(0.f) << QVariant::fromValue(-1.f) << +1;
-    QTest::newRow("float4") << QVariant::fromValue(-float(qInf())) << QVariant::fromValue(0.f) << -1;
-    QTest::newRow("float5") << QVariant::fromValue(0.f) << QVariant::fromValue(-float(qInf())) << +1;
-    QTest::newRow("float6") << QVariant::fromValue(-float(qInf())) << QVariant::fromValue(-float(qInf())) << 0;
-    QTest::newRow("float7") << QVariant::fromValue(float(qInf())) << QVariant::fromValue(float(qInf())) << 0;
-
-    QTest::newRow("double1") << QVariant::fromValue(0.) << QVariant::fromValue(0.) << 0;
-    QTest::newRow("double2") << QVariant::fromValue(-1.) << QVariant::fromValue(0.) << -1;
-    QTest::newRow("double3") << QVariant::fromValue(0.) << QVariant::fromValue(-1.) << +1;
-    QTest::newRow("double4") << QVariant::fromValue(-qInf()) << QVariant::fromValue(0.) << -1;
-    QTest::newRow("double5") << QVariant::fromValue(0.) << QVariant::fromValue(-qInf()) << +1;
-    QTest::newRow("double6") << QVariant::fromValue(-double(qInf())) << QVariant::fromValue(-qInf()) << 0;
-    QTest::newRow("double7") << QVariant::fromValue(qInf()) << QVariant::fromValue(qInf()) << 0;
-    QTest::newRow("double8") << QVariant::fromValue(-qInf()) << QVariant::fromValue(qInf()) << -1;
-    QTest::newRow("double9") << QVariant::fromValue(qQNaN()) << QVariant::fromValue(0.) << INT_MAX;
-    QTest::newRow("double10") << QVariant::fromValue(0.) << QVariant::fromValue(qQNaN()) << INT_MAX;
-    QTest::newRow("double11") << QVariant::fromValue(qQNaN()) << QVariant::fromValue(qQNaN()) << INT_MAX;
-
-    // mixed comparisons
-    // fp + fp
-    QTest::newRow("float+double1") << QVariant::fromValue(0.f) << QVariant::fromValue(0.) << 0;
-    QTest::newRow("float+double2") << QVariant::fromValue(-1.f) << QVariant::fromValue(0.) << -1;
-    QTest::newRow("float+double3") << QVariant::fromValue(0.f) << QVariant::fromValue(-1.) << +1;
-    QTest::newRow("float+double4") << QVariant::fromValue(-float(qInf())) << QVariant::fromValue(0.) << -1;
-    QTest::newRow("float+double5") << QVariant::fromValue(0.f) << QVariant::fromValue(-qInf()) << +1;
-    QTest::newRow("float+double6") << QVariant::fromValue(-float(qInf())) << QVariant::fromValue(-qInf()) << 0;
-    QTest::newRow("float+double7") << QVariant::fromValue(float(qInf())) << QVariant::fromValue(qInf()) << 0;
-    QTest::newRow("float+double8") << QVariant::fromValue(-float(qInf())) << QVariant::fromValue(qInf()) << -1;
-    QTest::newRow("float+double9") << QVariant::fromValue(qQNaN()) << QVariant::fromValue(0.) << INT_MAX;
-    QTest::newRow("float+double10") << QVariant::fromValue(0.) << QVariant::fromValue(qQNaN()) << INT_MAX;
-    QTest::newRow("float+double11") << QVariant::fromValue(qQNaN()) << QVariant::fromValue(qQNaN()) << INT_MAX;
-
-    // fp + int
-    QTest::newRow("float+int1") << QVariant::fromValue(0.f) << QVariant::fromValue(0) << 0;
-    QTest::newRow("double+int1") << QVariant::fromValue(0.) << QVariant::fromValue(0) << 0;
-    QTest::newRow("float+int2") << QVariant::fromValue(-1.f) << QVariant::fromValue(0) << -1;
-    QTest::newRow("double+int2") << QVariant::fromValue(-1.) << QVariant::fromValue(0) << -1;
-    QTest::newRow("float+int3") << QVariant::fromValue(0.f) << QVariant::fromValue(-1) << +1;
-    QTest::newRow("double+int3") << QVariant::fromValue(0.) << QVariant::fromValue(-1) << +1;
-    QTest::newRow("float+int4") << QVariant::fromValue(1.5f) << QVariant::fromValue(1) << +1;
-    QTest::newRow("double+int4") << QVariant::fromValue(1.5) << QVariant::fromValue(1) << +1;
-    QTest::newRow("double+int5") << QVariant::fromValue(qInf()) << QVariant::fromValue(1) << +1;
-
-    // fp + uint
-    QTest::newRow("float+uint1") << QVariant::fromValue(0.f) << QVariant::fromValue(0U) << 0;
-    QTest::newRow("double+uint1") << QVariant::fromValue(0.) << QVariant::fromValue(0U) << 0;
-    QTest::newRow("float+uint2") << QVariant::fromValue(-1.f) << QVariant::fromValue(0U) << -1;
-    QTest::newRow("double+uint2") << QVariant::fromValue(-1.) << QVariant::fromValue(0U) << -1;
-    QTest::newRow("float+uint3") << QVariant::fromValue(0.f) << QVariant::fromValue(1U) << -1;
-    QTest::newRow("double+uint3") << QVariant::fromValue(0.) << QVariant::fromValue(1U) << -1;
-    QTest::newRow("float+uint4") << QVariant::fromValue(1.5f) << QVariant::fromValue(1U) << +1;
-    QTest::newRow("double+uint4") << QVariant::fromValue(1.5) << QVariant::fromValue(1U) << +1;
-
-    // lower ranked + int
-    QTest::newRow("bool+int1") << QVariant::fromValue(false) << QVariant::fromValue(0) << 0;
-    QTest::newRow("bool+int2") << QVariant::fromValue(false) << QVariant::fromValue(1) << -1;
-    QTest::newRow("bool+int3") << QVariant::fromValue(true) << QVariant::fromValue(0) << +1;
-    QTest::newRow("bool+int4") << QVariant::fromValue(true) << QVariant::fromValue(1) << 0;
-    QTest::newRow("bool+int5") << QVariant::fromValue(true) << QVariant::fromValue(2) << -1;
-
-    QTest::newRow("char+int1") << QVariant::fromValue(char(0)) << QVariant::fromValue(0) << 0;
-    QTest::newRow("char+int2") << QVariant::fromValue(char(0)) << QVariant::fromValue(1) << -1;
-    QTest::newRow("char+int3") << QVariant::fromValue(char(1)) << QVariant::fromValue(0) << +1;
-    QTest::newRow("char+int4") << QVariant::fromValue(char(1)) << QVariant::fromValue(1) << 0;
-    if (std::numeric_limits<char>::is_signed) {
-        QTest::newRow("char+int5") << QVariant::fromValue(char(-1)) << QVariant::fromValue(0) << -1;
-        QTest::newRow("char+int6") << QVariant::fromValue(char(-1)) << QVariant::fromValue(-1) << 0;
-    }
-
-    QTest::newRow("schar+int1") << QVariant::fromValue(schar(0)) << QVariant::fromValue(0) << 0;
-    QTest::newRow("schar+int2") << QVariant::fromValue(schar(0)) << QVariant::fromValue(1) << -1;
-    QTest::newRow("schar+int3") << QVariant::fromValue(schar(1)) << QVariant::fromValue(0) << +1;
-    QTest::newRow("schar+int4") << QVariant::fromValue(schar(1)) << QVariant::fromValue(1) << 0;
-    QTest::newRow("schar+int5") << QVariant::fromValue(schar(-1)) << QVariant::fromValue(0) << -1;
-    QTest::newRow("schar+int6") << QVariant::fromValue(schar(-1)) << QVariant::fromValue(-1) << 0;
-
-    QTest::newRow("uchar+int1") << QVariant::fromValue(uchar(0)) << QVariant::fromValue(0) << 0;
-    QTest::newRow("uchar+int2") << QVariant::fromValue(uchar(0)) << QVariant::fromValue(1) << -1;
-    QTest::newRow("uchar+int3") << QVariant::fromValue(uchar(1)) << QVariant::fromValue(0) << +1;
-    QTest::newRow("uchar+int4") << QVariant::fromValue(uchar(1)) << QVariant::fromValue(1) << 0;
-
-    QTest::newRow("short+int1") << QVariant::fromValue(short(0)) << QVariant::fromValue(0) << 0;
-    QTest::newRow("short+int2") << QVariant::fromValue(short(0)) << QVariant::fromValue(1) << -1;
-    QTest::newRow("short+int3") << QVariant::fromValue(short(1)) << QVariant::fromValue(0) << +1;
-    QTest::newRow("short+int4") << QVariant::fromValue(short(1)) << QVariant::fromValue(1) << 0;
-    QTest::newRow("short+int5") << QVariant::fromValue(short(-1)) << QVariant::fromValue(0) << -1;
-    QTest::newRow("short+int6") << QVariant::fromValue(short(-1)) << QVariant::fromValue(-1) << 0;
-
-    QTest::newRow("ushort+int1") << QVariant::fromValue(ushort(0)) << QVariant::fromValue(0) << 0;
-    QTest::newRow("ushort+int2") << QVariant::fromValue(ushort(0)) << QVariant::fromValue(1) << -1;
-    QTest::newRow("ushort+int3") << QVariant::fromValue(ushort(1)) << QVariant::fromValue(0) << +1;
-    QTest::newRow("ushort+int4") << QVariant::fromValue(ushort(1)) << QVariant::fromValue(1) << 0;
-
-    // lower ranked + uint (without sign change)
-    QTest::newRow("bool+uint1") << QVariant::fromValue(false) << QVariant::fromValue(0U) << 0;
-    QTest::newRow("bool+uint2") << QVariant::fromValue(false) << QVariant::fromValue(1U) << -1;
-    QTest::newRow("bool+uint3") << QVariant::fromValue(true) << QVariant::fromValue(0U) << +1;
-    QTest::newRow("bool+uint4") << QVariant::fromValue(true) << QVariant::fromValue(1U) << 0;
-    QTest::newRow("bool+uint5") << QVariant::fromValue(true) << QVariant::fromValue(2U) << -1;
-
-    QTest::newRow("char+uint1") << QVariant::fromValue(char(0)) << QVariant::fromValue(0U) << 0;
-    QTest::newRow("char+uint2") << QVariant::fromValue(char(0)) << QVariant::fromValue(1U) << -1;
-    QTest::newRow("char+uint3") << QVariant::fromValue(char(1)) << QVariant::fromValue(0U) << +1;
-    QTest::newRow("char+uint4") << QVariant::fromValue(char(1)) << QVariant::fromValue(1U) << 0;
-
-    QTest::newRow("schar+uint1") << QVariant::fromValue(schar(0)) << QVariant::fromValue(0U) << 0;
-    QTest::newRow("schar+uint2") << QVariant::fromValue(schar(0)) << QVariant::fromValue(1U) << -1;
-    QTest::newRow("schar+uint3") << QVariant::fromValue(schar(1)) << QVariant::fromValue(0U) << +1;
-    QTest::newRow("schar+uint4") << QVariant::fromValue(schar(1)) << QVariant::fromValue(1U) << 0;
-
-    QTest::newRow("uchar+uint1") << QVariant::fromValue(uchar(0)) << QVariant::fromValue(0U) << 0;
-    QTest::newRow("uchar+uint2") << QVariant::fromValue(uchar(0)) << QVariant::fromValue(1U) << -1;
-    QTest::newRow("uchar+uint3") << QVariant::fromValue(uchar(1)) << QVariant::fromValue(0U) << +1;
-    QTest::newRow("uchar+uint4") << QVariant::fromValue(uchar(1)) << QVariant::fromValue(1U) << 0;
-
-    QTest::newRow("short+uint1") << QVariant::fromValue(short(0)) << QVariant::fromValue(0U) << 0;
-    QTest::newRow("short+uint2") << QVariant::fromValue(short(0)) << QVariant::fromValue(1U) << -1;
-    QTest::newRow("short+uint3") << QVariant::fromValue(short(1)) << QVariant::fromValue(0U) << +1;
-    QTest::newRow("short+uint4") << QVariant::fromValue(short(1)) << QVariant::fromValue(1U) << 0;
-
-    QTest::newRow("ushort+uint1") << QVariant::fromValue(ushort(0)) << QVariant::fromValue(0U) << 0;
-    QTest::newRow("ushort+uint2") << QVariant::fromValue(ushort(0)) << QVariant::fromValue(1U) << -1;
-    QTest::newRow("ushort+uint3") << QVariant::fromValue(ushort(1)) << QVariant::fromValue(0U) << +1;
-    QTest::newRow("ushort+uint4") << QVariant::fromValue(ushort(1)) << QVariant::fromValue(1U) << 0;
-
-    // int + qlonglong
-    QTest::newRow("int+qlonglong1") << QVariant::fromValue(0) << QVariant::fromValue(Q_INT64_C(0)) << 0;
-    QTest::newRow("int+qlonglong2") << QVariant::fromValue(1) << QVariant::fromValue(Q_INT64_C(0)) << +1;
-    QTest::newRow("int+qlonglong3") << QVariant::fromValue(0) << QVariant::fromValue(Q_INT64_C(1)) << -1;
-    QTest::newRow("int+qlonglong4") << QVariant::fromValue(1) << QVariant::fromValue(Q_INT64_C(1)) << 0;
-    QTest::newRow("int+qlonglong5") << QVariant::fromValue(0) << QVariant::fromValue(Q_INT64_C(-1)) << +1;
-    QTest::newRow("int+qlonglong6") << QVariant::fromValue(-1) << QVariant::fromValue(Q_INT64_C(0)) << -1;
-    QTest::newRow("int+qlonglong7") << QVariant::fromValue(-1) << QVariant::fromValue(Q_INT64_C(-1)) << 0;
-
-    // uint + qulonglong
-    QTest::newRow("uint+qulonglong1") << QVariant::fromValue(0U) << QVariant::fromValue(Q_UINT64_C(0)) << 0;
-    QTest::newRow("uint+qulonglong2") << QVariant::fromValue(1U) << QVariant::fromValue(Q_UINT64_C(0)) << +1;
-    QTest::newRow("uint+qulonglong3") << QVariant::fromValue(0U) << QVariant::fromValue(Q_UINT64_C(1)) << -1;
-    QTest::newRow("uint+qulonglong4") << QVariant::fromValue(1U) << QVariant::fromValue(Q_UINT64_C(1)) << 0;
-
-    // int + uint (without sign change)
-    QTest::newRow("int+uint1") << QVariant::fromValue(0) << QVariant::fromValue(0U) << 0;
-    QTest::newRow("int+uint2") << QVariant::fromValue(1) << QVariant::fromValue(0U) << +1;
-    QTest::newRow("int+uint3") << QVariant::fromValue(0) << QVariant::fromValue(1U) << -1;
-    QTest::newRow("int+uint4") << QVariant::fromValue(1) << QVariant::fromValue(1U) << 0;
-
-    // uint + qlonglong
-    QTest::newRow("uint+qlonglong1") << QVariant::fromValue(0U) << QVariant::fromValue(Q_INT64_C(0)) << 0;
-    QTest::newRow("uint+qlonglong2") << QVariant::fromValue(1U) << QVariant::fromValue(Q_INT64_C(0)) << +1;
-    QTest::newRow("uint+qlonglong3") << QVariant::fromValue(0U) << QVariant::fromValue(Q_INT64_C(1)) << -1;
-    QTest::newRow("uint+qlonglong4") << QVariant::fromValue(1U) << QVariant::fromValue(Q_INT64_C(1)) << 0;
-    QTest::newRow("uint+qlonglong5") << QVariant::fromValue(0U) << QVariant::fromValue(Q_INT64_C(-1)) << +1;
-
-    // boundary conditions
-    QTest::newRow("charmax+intmax") << QVariant::fromValue(CHAR_MAX) << QVariant::fromValue(INT_MAX) << -1;
-    QTest::newRow("charmax+uintmax") << QVariant::fromValue(CHAR_MAX) << QVariant::fromValue(UINT_MAX) << -1;
-    QTest::newRow("scharmax+intmax") << QVariant::fromValue(SCHAR_MAX) << QVariant::fromValue(INT_MAX) << -1;
-    QTest::newRow("scharmax+uintmax") << QVariant::fromValue(SCHAR_MAX) << QVariant::fromValue(UINT_MAX) << -1;
-    QTest::newRow("ucharmax+intmax") << QVariant::fromValue(UCHAR_MAX) << QVariant::fromValue(INT_MAX) << -1;
-    QTest::newRow("ucharmax+uintmax") << QVariant::fromValue(UCHAR_MAX) << QVariant::fromValue(UINT_MAX) << -1;
-    QTest::newRow("shortmax+intmax") << QVariant::fromValue(SHRT_MAX) << QVariant::fromValue(INT_MAX) << -1;
-    QTest::newRow("shortmax+uintmax") << QVariant::fromValue(SHRT_MAX) << QVariant::fromValue(UINT_MAX) << -1;
-    QTest::newRow("ushortmax+intmax") << QVariant::fromValue(USHRT_MAX) << QVariant::fromValue(INT_MAX) << -1;
-    QTest::newRow("ushortmax+uintmax") << QVariant::fromValue(USHRT_MAX) << QVariant::fromValue(UINT_MAX) << -1;
-
-    QTest::newRow("intmin+qlonglongmin") << QVariant::fromValue(INT_MIN) << QVariant::fromValue(LLONG_MIN) << +1;
-    QTest::newRow("intmax+uintmax") << QVariant::fromValue(INT_MAX) << QVariant::fromValue(UINT_MAX) << -1;
-    QTest::newRow("intmax+qlonglongmax") << QVariant::fromValue(INT_MAX) << QVariant::fromValue(LLONG_MAX) << -1;
-    QTest::newRow("uintmax+qlonglongmax") << QVariant::fromValue(UINT_MAX) << QVariant::fromValue(LLONG_MAX) << -1;
-    QTest::newRow("intmax+qulonglongmax") << QVariant::fromValue(INT_MAX) << QVariant::fromValue(ULLONG_MAX) << -1;
-    QTest::newRow("qlonglongmax+qulonglongmax") << QVariant::fromValue(LLONG_MAX) << QVariant::fromValue(ULLONG_MAX) << -1;
-    QTest::newRow("uintmax+qlonglongmin") << QVariant::fromValue(UINT_MAX) << QVariant::fromValue(LLONG_MIN) << +1;
-
-    // check for no sign-extension issues
-    QTest::newRow("ushortmax+intzero") << QVariant::fromValue(USHRT_MAX) << QVariant::fromValue(0) << +1;
-    QTest::newRow("ushortmax+qlonglongzero") << QVariant::fromValue(USHRT_MAX) << QVariant::fromValue(Q_INT64_C(0)) << +1;
-    QTest::newRow("uintmax+qlonglongzero") << QVariant::fromValue(UINT_MAX) << QVariant::fromValue(Q_INT64_C(0)) << +1;
-
-    // sign changes
-    // the tests below check that a signed negative number sign-changes to a non-zero unsigned number and that
-    // signed -1 sign-changes to unsigned maximum (all bits set, ~0). This works on two's complement machines
-    // (all that Qt supports), and would also work on one's complement.
-    if (std::numeric_limits<char>::is_signed) {
-        QTest::newRow("signchange-char+uint") << QVariant::fromValue(char(-1)) << QVariant::fromValue(0U) << +1;
-        QTest::newRow("signchange-char+uintmax") << QVariant::fromValue(char(-1)) << QVariant::fromValue(UINT_MAX) << 0;
-        QTest::newRow("signchange-charmin+uint") << QVariant::fromValue(CHAR_MIN) << QVariant::fromValue(0U) << +1;
-        QTest::newRow("signchange-char+qulonglong") << QVariant::fromValue(char(-1)) << QVariant::fromValue(Q_UINT64_C(0)) << +1;
-        QTest::newRow("signchange-char+qulonglongmax") << QVariant::fromValue(char(-1)) << QVariant::fromValue(ULLONG_MAX) << 0;
-        QTest::newRow("signchange-charmin+qulonglong") << QVariant::fromValue(CHAR_MIN) << QVariant::fromValue(Q_UINT64_C(0)) << +1;
-    }
-    QTest::newRow("signchange-schar+uint") << QVariant::fromValue(schar(-1)) << QVariant::fromValue(0U) << +1;
-    QTest::newRow("signchange-schar+uintmax") << QVariant::fromValue(schar(-1)) << QVariant::fromValue(UINT_MAX) << 0;
-    QTest::newRow("signchange-scharmin+uint") << QVariant::fromValue(SCHAR_MIN) << QVariant::fromValue(0U) << +1;
-    QTest::newRow("signchange-schar+qulonglong") << QVariant::fromValue(schar(-1)) << QVariant::fromValue(Q_UINT64_C(0)) << +1;
-    QTest::newRow("signchange-schar+qulonglongmax") << QVariant::fromValue(schar(-1)) << QVariant::fromValue(ULLONG_MAX) << 0;
-    QTest::newRow("signchange-scharmin+qulonglong") << QVariant::fromValue(SCHAR_MIN) << QVariant::fromValue(Q_UINT64_C(0)) << +1;
-    QTest::newRow("signchange-short+uint") << QVariant::fromValue(short(-1)) << QVariant::fromValue(0U) << +1;
-    QTest::newRow("signchange-short+uintmax") << QVariant::fromValue(short(-1)) << QVariant::fromValue(UINT_MAX) << 0;
-    QTest::newRow("signchange-shortmin+uint") << QVariant::fromValue(SHRT_MIN) << QVariant::fromValue(0U) << +1;
-    QTest::newRow("signchange-short+qulonglong") << QVariant::fromValue(short(-1)) << QVariant::fromValue(Q_UINT64_C(0)) << +1;
-    QTest::newRow("signchange-short+qulonglongmax") << QVariant::fromValue(short(-1)) << QVariant::fromValue(ULLONG_MAX) << 0;
-    QTest::newRow("signchange-shortmin+qulonglong") << QVariant::fromValue(SHRT_MIN) << QVariant::fromValue(Q_UINT64_C(0)) << +1;
-    QTest::newRow("signchange-int+uint") << QVariant::fromValue(-1) << QVariant::fromValue(0U) << +1;
-    QTest::newRow("signchange-int+uintmax") << QVariant::fromValue(-1) << QVariant::fromValue(UINT_MAX) << 0;
-    QTest::newRow("signchange-intmin+uint") << QVariant::fromValue(INT_MIN) << QVariant::fromValue(0U) << +1;
-    QTest::newRow("signchange-int+qulonglong") << QVariant::fromValue(-1) << QVariant::fromValue(Q_UINT64_C(0)) << +1;
-    QTest::newRow("signchange-int+qulonglongmax") << QVariant::fromValue(-1) << QVariant::fromValue(ULLONG_MAX) << 0;
-    QTest::newRow("signchange-intmin+qulonglong") << QVariant::fromValue(INT_MIN) << QVariant::fromValue(Q_UINT64_C(0)) << +1;
-    // no qlonglong+uint, since that should promote to qlonglong and then the comparison is signed (tested above)
-    QTest::newRow("signchange-qlonglong+qulonglong") << QVariant::fromValue(Q_INT64_C(-1)) << QVariant::fromValue(Q_UINT64_C(0)) << +1;
-    QTest::newRow("signchange-qlonglong+qulonglongmax") << QVariant::fromValue(Q_INT64_C(-1)) << QVariant::fromValue(ULLONG_MAX) << 0;
-    QTest::newRow("signchange-qlonglongmin+qulonglong") << QVariant::fromValue(LLONG_MIN) << QVariant::fromValue(Q_UINT64_C(0)) << +1;
-}
-
-void tst_QVariant::compareNumbers() const
-{
-    QFETCH(QVariant, v1);
-    QFETCH(QVariant, v2);
-    QFETCH(int, expected);
-
-    if (expected == -1) {
-        QVERIFY(v1 < v2);
-        QVERIFY(v1 <= v2);
-        QVERIFY(!(v1 == v2));
-        QVERIFY(!(v1 > v2));
-        QVERIFY(!(v1 >= v2));
-
-        QVERIFY(!(v2 < v1));
-        QVERIFY(!(v2 <= v1));
-        QVERIFY(!(v2 == v1));
-        QVERIFY(v2 >= v1);
-        QVERIFY(v2 > v1);
-    } else if (expected == 0) {
-        QVERIFY(!(v1 < v2));
-        QVERIFY(v1 <= v2);
-        QCOMPARE(v1, v2);
-        QVERIFY(!(v1 > v2));
-        QVERIFY(v1 >= v2);
-
-        QVERIFY(!(v2 < v1));
-        QVERIFY(v2 <= v1);
-        QCOMPARE(v2, v1);
-        QVERIFY(v2 >= v1);
-        QVERIFY(!(v2 > v1));
-    } else if (expected == +1) {
-        QVERIFY(!(v1 < v2));
-        QVERIFY(!(v1 <= v2));
-        QVERIFY(!(v1 == v2));
-        QVERIFY(v1 > v2);
-        QVERIFY(v1 >= v2);
-
-        QVERIFY(v2 < v1);
-        QVERIFY(v2 <= v1);
-        QVERIFY(!(v2 == v1));
-        QVERIFY(!(v2 >= v1));
-        QVERIFY(!(v2 > v1));
-    } else {
-        // unorderable (NaN)
-        QVERIFY(!(v1 == v2));
-    }
-}
-
 void tst_QVariant::typeName_data()
 {
     QTest::addColumn<int>("type");
@@ -2116,7 +1769,6 @@ void tst_QVariant::typeName_data()
     QTest::newRow("39") << int(QVariant::RectF) << QByteArray("QRectF");
     QTest::newRow("40") << int(QVariant::PointF) << QByteArray("QPointF");
     QTest::newRow("41") << int(QVariant::RegExp) << QByteArray("QRegExp");
-    QTest::newRow("43") << int(QVariant::Matrix) << QByteArray("QMatrix");
     QTest::newRow("44") << int(QVariant::Transform) << QByteArray("QTransform");
     QTest::newRow("45") << int(QVariant::Hash) << QByteArray("QVariantHash");
     QTest::newRow("46") << int(QVariant::Matrix4x4) << QByteArray("QMatrix4x4");
@@ -2624,16 +2276,6 @@ void tst_QVariant::variantMap()
     QCOMPARE(qvariant_cast<QVariantMap>(v3).value("test").toInt(), 42);
 
     QCOMPARE(v, QVariant(v.toHash()));
-
-    // multi-keys
-    map.insertMulti("test", 47);
-    v = map;
-    map2 = qvariant_cast<QVariantMap>(v);
-    QCOMPARE(map2, map);
-    map2 = v.toMap();
-    QCOMPARE(map2, map);
-
-    QCOMPARE(v, QVariant(v.toHash()));
 }
 
 void tst_QVariant::variantHash()
@@ -2657,16 +2299,6 @@ void tst_QVariant::variantHash()
     QCOMPARE(qvariant_cast<QVariantHash>(v3).value("test").toInt(), 42);
 
     QCOMPARE(v, QVariant(v.toMap()));
-
-    // multi-keys
-    hash.insertMulti("test", 47);
-    v = hash;
-    hash2 = qvariant_cast<QVariantHash>(v);
-    QCOMPARE(hash2, hash);
-    hash2 = v.toHash();
-    QCOMPARE(hash2, hash);
-
-    QCOMPARE(v, QVariant(v.toMap()));
 }
 
 class CustomQObject : public QObject {
@@ -3203,7 +2835,7 @@ void tst_QVariant::loadUnknownUserType()
 
 void tst_QVariant::loadBrokenUserType()
 {
-    QTest::ignoreMessage(QtWarningMsg, "Trying to construct an instance of an invalid type, type id: 127");
+    QTest::ignoreMessage(QtWarningMsg, QRegularExpression("^Trying to construct an instance of an invalid type"));
     char data[] = {0, 0, 0, 127, 0 };
 
     QByteArray ba(data, sizeof(data));
@@ -3408,7 +3040,7 @@ void tst_QVariant::convertIterables() const
         QCOMPARE(QVariant::fromValue(map).value<QVariantHash>().count(), map.count());
         QCOMPARE(QVariant::fromValue(map).value<QVariantMap>().count(), map.count());
 
-        map.insertMulti("3", 5);
+        map.insert("4", 5);
         QCOMPARE(QVariant::fromValue(map).value<QVariantHash>().count(), map.count());
         QCOMPARE(QVariant::fromValue(map).value<QVariantMap>().count(), map.count());
     }
@@ -3418,7 +3050,7 @@ void tst_QVariant::convertIterables() const
         QCOMPARE(QVariant::fromValue(map).value<QVariantHash>().count(), map.count());
         QCOMPARE(QVariant::fromValue(map).value<QVariantMap>().count(), map.count());
 
-        map.insertMulti("3", 5);
+        map.insert("4", 5);
         QCOMPARE(QVariant::fromValue(map).value<QVariantHash>().count(), map.count());
         QCOMPARE(QVariant::fromValue(map).value<QVariantMap>().count(), map.count());
     }
@@ -3428,7 +3060,7 @@ void tst_QVariant::convertIterables() const
         QCOMPARE(QVariant::fromValue(hash).value<QVariantHash>().count(), hash.count());
         QCOMPARE(QVariant::fromValue(hash).value<QVariantMap>().count(), hash.count());
 
-        hash.insertMulti("3", 5);
+        hash.insert("4", 5);
         QCOMPARE(QVariant::fromValue(hash).value<QVariantHash>().count(), hash.count());
         QCOMPARE(QVariant::fromValue(hash).value<QVariantMap>().count(), hash.count());
     }
@@ -3438,7 +3070,7 @@ void tst_QVariant::convertIterables() const
         QCOMPARE(QVariant::fromValue(hash).value<QVariantHash>().count(), hash.count());
         QCOMPARE(QVariant::fromValue(hash).value<QVariantMap>().count(), hash.count());
 
-        hash.insertMulti("3", 5);
+        hash.insert("4", 5);
         QCOMPARE(QVariant::fromValue(hash).value<QVariantHash>().count(), hash.count());
         QCOMPARE(QVariant::fromValue(hash).value<QVariantMap>().count(), hash.count());
     }
@@ -3884,13 +3516,6 @@ void tst_QVariant::moreCustomTypes()
         data << (QSet<int>() << 42);
         PLAY_WITH_VARIANT(data, false, QString(), 0, false);
     }
-
-    {
-        QList<QLinkedList<int> > data;
-        PLAY_WITH_VARIANT(data, false, QString(), 0, false);
-        data << (QLinkedList<int>() << 42);
-        PLAY_WITH_VARIANT(data, false, QString(), 0, false);
-    }
 }
 
 void tst_QVariant::movabilityTest()
@@ -3963,8 +3588,7 @@ Q_DECLARE_METATYPE(Convertible);
 
 struct BigConvertible {
     double d;
-    double dummy;
-    double dummy2;
+    double dummy[sizeof(QVariant) / sizeof(double)];
     operator int() const { return (int)d; }
     operator double() const { return d; }
     operator QString() const { return QString::number(d); }
@@ -4865,86 +4489,6 @@ void tst_QVariant::metaEnums()
     METAENUMS_TEST(MetaEnumTest_Enum8_value);
 }
 
-void tst_QVariant::compareSanity_data()
-{
-    QTest::addColumn<QVariant>("value1");
-    QTest::addColumn<QVariant>("value2");
-
-    QTest::newRow( "int <>/== QUrl" ) << QVariant( 97 ) << QVariant(QUrl("a"));
-    QTest::newRow( "int <>/== QChar" ) << QVariant( 97 ) << QVariant(QChar('a'));
-    QTest::newRow( "int <>/== QString" ) << QVariant( 97 ) << QVariant(QString("a"));
-    QTest::newRow( "QUrl <>/== QChar" ) << QVariant(QUrl("a")) << QVariant(QChar('a'));
-    QTest::newRow( "QUrl <>/== QString" ) << QVariant(QUrl("a")) << QVariant(QString("a"));
-    QTest::newRow( "QChar <>/== QString" ) << QVariant(QChar('a')) << QVariant(QString("a"));
-}
-
-void tst_QVariant::compareSanity()
-{
-    QFETCH(QVariant, value1);
-    QFETCH(QVariant, value2);
-
-    if (value1 == value2) {
-        QVERIFY(!(value1 < value2) && !(value1 > value2));
-    } else {
-        QVERIFY(value1 != value2);
-        QVERIFY((value1 < value2) || (value1 > value2));
-    }
-}
-
-static void richComparison(const QVariant& less, const QVariant& more)
-{
-    QVERIFY(less.type() == more.type());
-
-    QVERIFY(less < more);
-    QVERIFY(!(more < less));
-
-    QVERIFY(more > less);
-    QVERIFY(!(less > more));
-
-    QVERIFY(less <= more);
-    QVERIFY(!(more <= less));
-    QVERIFY(less <= less);
-
-    QVERIFY(more >= less);
-    QVERIFY(!(less >= more));
-    QVERIFY(more >= more);
-}
-
-void tst_QVariant::compareRich()
-{
-    richComparison(QUuid("{49d8ad2a-2ee8-4c3d-949f-1b5a3765ddf0}"),
-                   QUuid("{f6d56824-16e9-4543-a375-add2877c2d05}"));
-    richComparison(QByteArray::fromRawData("a", 1),
-                   QByteArray::fromRawData("b", 1));
-    richComparison(QStringLiteral("a"), QStringLiteral("b"));
-    richComparison(QLatin1String("a"), QLatin1String("b"));
-    richComparison(QChar('a'), QChar('b'));
-    richComparison(QDate(2016, 7, 23), QDate(2016, 7, 24));
-    richComparison(QTime(0, 0), QTime(0, 1));
-    richComparison(QDateTime(QDate(2016, 7, 23), QTime(0, 0)),
-                   QDateTime(QDate(2016, 7, 23), QTime(0, 1)));
-
-    richComparison(QStringList(), QStringList() << QStringLiteral("a"));
-    richComparison(QStringList(), QStringList() << QStringLiteral("a")
-                                                << QStringLiteral("b"));
-    richComparison(QStringList() << QStringLiteral("a"),
-                   QStringList() << QStringLiteral("b"));
-    richComparison(QStringList() << QStringLiteral("a"),
-                   QStringList() << QStringLiteral("b")
-                                 << QStringLiteral("c"));
-    richComparison(QStringList() << QStringLiteral("a")
-                                 << QStringLiteral("c"),
-                   QStringList() << QStringLiteral("b"));
-    richComparison(QStringList() << QStringLiteral("a")
-                                 << QStringLiteral("c"),
-                   QStringList() << QStringLiteral("b")
-                                 << QStringLiteral("d"));
-    richComparison(QStringList() << QStringLiteral("a")
-                                 << QStringLiteral("c"),
-                   QStringList() << QStringLiteral("a")
-                                 << QStringLiteral("d"));
-}
-
 void tst_QVariant::nullConvert()
 {
     // Test quirks with QVariants different types of null states.
diff --git a/tests/auto/corelib/kernel/qwineventnotifier/CMakeLists.txt b/tests/auto/corelib/kernel/qwineventnotifier/CMakeLists.txt
new file mode 100644
index 0000000000..0f287a1652
--- /dev/null
+++ b/tests/auto/corelib/kernel/qwineventnotifier/CMakeLists.txt
@@ -0,0 +1,12 @@
+# Generated from qwineventnotifier.pro.
+
+#####################################################################
+## tst_qwineventnotifier Test:
+#####################################################################
+
+add_qt_test(tst_qwineventnotifier
+    SOURCES
+        tst_qwineventnotifier.cpp
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+)
diff --git a/tests/auto/corelib/mimetypes/CMakeLists.txt b/tests/auto/corelib/mimetypes/CMakeLists.txt
new file mode 100644
index 0000000000..ea0463de36
--- /dev/null
+++ b/tests/auto/corelib/mimetypes/CMakeLists.txt
@@ -0,0 +1,14 @@
+# Generated from mimetypes.pro.
+
+# special case begin
+if(FEATURE_private_tests)
+# special case end
+    add_subdirectory(qmimetype)
+    add_subdirectory(qmimedatabase)
+# special case begin
+endif()
+# special case end
+
+if(NOT QT_FEATURE_private_tests)
+    ### remove_subdirectory("qmimetype")
+endif()
diff --git a/tests/auto/corelib/mimetypes/qmimedatabase/CMakeLists.txt b/tests/auto/corelib/mimetypes/qmimedatabase/CMakeLists.txt
new file mode 100644
index 0000000000..6661952a68
--- /dev/null
+++ b/tests/auto/corelib/mimetypes/qmimedatabase/CMakeLists.txt
@@ -0,0 +1,10 @@
+# Generated from qmimedatabase.pro.
+
+
+if(TARGET Qt::Concurrent)
+    add_subdirectory(qmimedatabase-xml)
+
+    if(UNIX AND NOT APPLE AND NOT QNX)
+        add_subdirectory(qmimedatabase-cache)
+    endif()
+endif()
diff --git a/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-cache/.prev_CMakeLists.txt b/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-cache/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..9dc2ea18bf
--- /dev/null
+++ b/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-cache/.prev_CMakeLists.txt
@@ -0,0 +1,107 @@
+# Generated from qmimedatabase-cache.pro.
+
+if(NOT QT_FEATURE_private_tests)
+    return()
+endif()
+
+#####################################################################
+## tst_qmimedatabase-cache Test:
+#####################################################################
+
+add_qt_test(tst_qmimedatabase-cache
+    SOURCES
+        ../tst_qmimedatabase.h
+        tst_qmimedatabase-cache.cpp
+    PUBLIC_LIBRARIES
+        Qt::Concurrent
+)
+
+# Resources:
+set_source_files_properties("/devel/work/qt-cmake/qtbase/src/corelib/mimetypes/mime/packages/freedesktop.org.xml"
+    PROPERTIES QT_RESOURCE_ALIAS "freedesktop.org.xml"
+)
+set(mimetypes_resource_files
+    "mime/packages/freedesktop.org.xml"
+)
+
+add_qt_resource(tst_qmimedatabase-cache "mimetypes"
+    PREFIX
+        "/qt-project.org/qmime/packages"
+    BASE
+        "/devel/work/qt-cmake/qtbase/src/corelib/mimetypes"
+    FILES
+        ${mimetypes_resource_files}
+)
+set_source_files_properties("../invalid-magic1.xml"
+    PROPERTIES QT_RESOURCE_ALIAS "invalid-magic1.xml"
+)
+set_source_files_properties("../invalid-magic2.xml"
+    PROPERTIES QT_RESOURCE_ALIAS "invalid-magic2.xml"
+)
+set_source_files_properties("../invalid-magic3.xml"
+    PROPERTIES QT_RESOURCE_ALIAS "invalid-magic3.xml"
+)
+set_source_files_properties("../magic-and-hierarchy.foo"
+    PROPERTIES QT_RESOURCE_ALIAS "magic-and-hierarchy.foo"
+)
+set_source_files_properties("../magic-and-hierarchy.xml"
+    PROPERTIES QT_RESOURCE_ALIAS "magic-and-hierarchy.xml"
+)
+set_source_files_properties("../magic-and-hierarchy2.foo"
+    PROPERTIES QT_RESOURCE_ALIAS "magic-and-hierarchy2.foo"
+)
+set_source_files_properties("../qml-again.xml"
+    PROPERTIES QT_RESOURCE_ALIAS "qml-again.xml"
+)
+set_source_files_properties("../test.qml"
+    PROPERTIES QT_RESOURCE_ALIAS "test.qml"
+)
+set_source_files_properties("../text-x-objcsrc.xml"
+    PROPERTIES QT_RESOURCE_ALIAS "text-x-objcsrc.xml"
+)
+set_source_files_properties("../yast2-metapackage-handler-mimetypes.xml"
+    PROPERTIES QT_RESOURCE_ALIAS "yast2-metapackage-handler-mimetypes.xml"
+)
+set(testdata_resource_files
+    "invalid-magic1.xml"
+    "invalid-magic2.xml"
+    "invalid-magic3.xml"
+    "magic-and-hierarchy.foo"
+    "magic-and-hierarchy.xml"
+    "magic-and-hierarchy2.foo"
+    "qml-again.xml"
+    "test.qml"
+    "text-x-objcsrc.xml"
+    "yast2-metapackage-handler-mimetypes.xml"
+)
+
+add_qt_resource(tst_qmimedatabase-cache "testdata"
+    PREFIX
+        "/qt-project.org/qmime"
+    BASE
+        ".."
+    FILES
+        ${testdata_resource_files}
+)
+
+
+#### Keys ignored in scope 1:.:.:qmimedatabase-cache.pro:<TRUE>:
+# _REQUIREMENTS = "qtConfig(private_tests)"
+
+## Scopes:
+#####################################################################
+
+extend_target(tst_qmimedatabase-cache CONDITION GCC
+    COMPILE_OPTIONS
+        -W
+        -Wall
+        -Wextra
+        -Wno-long-long
+        -Wnon-virtual-dtor
+        -Wshadow
+)
+
+extend_target(tst_qmimedatabase-cache CONDITION UNIX AND NOT APPLE AND NOT QNX
+    DEFINES
+        USE_XDG_DATA_DIRS
+)
diff --git a/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-cache/CMakeLists.txt b/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-cache/CMakeLists.txt
new file mode 100644
index 0000000000..7720e4d18e
--- /dev/null
+++ b/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-cache/CMakeLists.txt
@@ -0,0 +1,103 @@
+# Generated from qmimedatabase-cache.pro.
+
+if(NOT QT_FEATURE_private_tests)
+    return()
+endif()
+
+#####################################################################
+## tst_qmimedatabase-cache Test:
+#####################################################################
+
+add_qt_test(tst_qmimedatabase-cache
+    SOURCES
+        ../tst_qmimedatabase.h
+        tst_qmimedatabase-cache.cpp
+    PUBLIC_LIBRARIES
+        Qt::Concurrent
+)
+
+# Resources:
+# special case begin
+# the freedesktop resources are handled manually below via mimetypes_resources.cmake
+#set(mimetypes_resource_files
+    #"mime/packages/freedesktop.org.xml"
+#)
+# special case end
+set_source_files_properties("../invalid-magic1.xml"
+    PROPERTIES QT_RESOURCE_ALIAS "invalid-magic1.xml"
+)
+set_source_files_properties("../invalid-magic2.xml"
+    PROPERTIES QT_RESOURCE_ALIAS "invalid-magic2.xml"
+)
+set_source_files_properties("../invalid-magic3.xml"
+    PROPERTIES QT_RESOURCE_ALIAS "invalid-magic3.xml"
+)
+set_source_files_properties("../magic-and-hierarchy.foo"
+    PROPERTIES QT_RESOURCE_ALIAS "magic-and-hierarchy.foo"
+)
+set_source_files_properties("../magic-and-hierarchy.xml"
+    PROPERTIES QT_RESOURCE_ALIAS "magic-and-hierarchy.xml"
+)
+set_source_files_properties("../magic-and-hierarchy2.foo"
+    PROPERTIES QT_RESOURCE_ALIAS "magic-and-hierarchy2.foo"
+)
+set_source_files_properties("../qml-again.xml"
+    PROPERTIES QT_RESOURCE_ALIAS "qml-again.xml"
+)
+set_source_files_properties("../test.qml"
+    PROPERTIES QT_RESOURCE_ALIAS "test.qml"
+)
+set_source_files_properties("../text-x-objcsrc.xml"
+    PROPERTIES QT_RESOURCE_ALIAS "text-x-objcsrc.xml"
+)
+set_source_files_properties("../yast2-metapackage-handler-mimetypes.xml"
+    PROPERTIES QT_RESOURCE_ALIAS "yast2-metapackage-handler-mimetypes.xml"
+)
+set(testdata_resource_files
+    "invalid-magic1.xml"
+    "invalid-magic2.xml"
+    "invalid-magic3.xml"
+    "magic-and-hierarchy.foo"
+    "magic-and-hierarchy.xml"
+    "magic-and-hierarchy2.foo"
+    "qml-again.xml"
+    "test.qml"
+    "text-x-objcsrc.xml"
+    "yast2-metapackage-handler-mimetypes.xml"
+)
+
+add_qt_resource(tst_qmimedatabase-cache "testdata"
+    PREFIX
+        "/qt-project.org/qmime"
+    BASE
+        ".."
+    FILES
+        ${testdata_resource_files}
+)
+
+# special case begin
+set(corelib_source_dir ../../../../../../src/corelib)
+include(${corelib_source_dir}/mimetypes/mimetypes_resources.cmake)
+corelib_add_mimetypes_resources(tst_qmimedatabase-cache)
+# special case end
+
+#### Keys ignored in scope 1:.:.:qmimedatabase-cache.pro:<TRUE>:
+# _REQUIREMENTS = "qtConfig(private_tests)"
+
+## Scopes:
+#####################################################################
+
+extend_target(tst_qmimedatabase-cache CONDITION GCC
+    COMPILE_OPTIONS
+        -W
+        -Wall
+        -Wextra
+        -Wno-long-long
+        -Wnon-virtual-dtor
+        -Wshadow
+)
+
+extend_target(tst_qmimedatabase-cache CONDITION UNIX AND NOT APPLE AND NOT QNX
+    DEFINES
+        USE_XDG_DATA_DIRS
+)
diff --git a/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-xml/.prev_CMakeLists.txt b/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-xml/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..1672255d29
--- /dev/null
+++ b/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-xml/.prev_CMakeLists.txt
@@ -0,0 +1,107 @@
+# Generated from qmimedatabase-xml.pro.
+
+if(NOT QT_FEATURE_private_tests)
+    return()
+endif()
+
+#####################################################################
+## tst_qmimedatabase-xml Test:
+#####################################################################
+
+add_qt_test(tst_qmimedatabase-xml
+    SOURCES
+        ../tst_qmimedatabase.h
+        tst_qmimedatabase-xml.cpp
+    PUBLIC_LIBRARIES
+        Qt::Concurrent
+)
+
+# Resources:
+set_source_files_properties("/devel/work/qt-cmake/qtbase/src/corelib/mimetypes/mime/packages/freedesktop.org.xml"
+    PROPERTIES QT_RESOURCE_ALIAS "freedesktop.org.xml"
+)
+set(mimetypes_resource_files
+    "mime/packages/freedesktop.org.xml"
+)
+
+add_qt_resource(tst_qmimedatabase-xml "mimetypes"
+    PREFIX
+        "/qt-project.org/qmime/packages"
+    BASE
+        "/devel/work/qt-cmake/qtbase/src/corelib/mimetypes"
+    FILES
+        ${mimetypes_resource_files}
+)
+set_source_files_properties("../invalid-magic1.xml"
+    PROPERTIES QT_RESOURCE_ALIAS "invalid-magic1.xml"
+)
+set_source_files_properties("../invalid-magic2.xml"
+    PROPERTIES QT_RESOURCE_ALIAS "invalid-magic2.xml"
+)
+set_source_files_properties("../invalid-magic3.xml"
+    PROPERTIES QT_RESOURCE_ALIAS "invalid-magic3.xml"
+)
+set_source_files_properties("../magic-and-hierarchy.foo"
+    PROPERTIES QT_RESOURCE_ALIAS "magic-and-hierarchy.foo"
+)
+set_source_files_properties("../magic-and-hierarchy.xml"
+    PROPERTIES QT_RESOURCE_ALIAS "magic-and-hierarchy.xml"
+)
+set_source_files_properties("../magic-and-hierarchy2.foo"
+    PROPERTIES QT_RESOURCE_ALIAS "magic-and-hierarchy2.foo"
+)
+set_source_files_properties("../qml-again.xml"
+    PROPERTIES QT_RESOURCE_ALIAS "qml-again.xml"
+)
+set_source_files_properties("../test.qml"
+    PROPERTIES QT_RESOURCE_ALIAS "test.qml"
+)
+set_source_files_properties("../text-x-objcsrc.xml"
+    PROPERTIES QT_RESOURCE_ALIAS "text-x-objcsrc.xml"
+)
+set_source_files_properties("../yast2-metapackage-handler-mimetypes.xml"
+    PROPERTIES QT_RESOURCE_ALIAS "yast2-metapackage-handler-mimetypes.xml"
+)
+set(testdata_resource_files
+    "invalid-magic1.xml"
+    "invalid-magic2.xml"
+    "invalid-magic3.xml"
+    "magic-and-hierarchy.foo"
+    "magic-and-hierarchy.xml"
+    "magic-and-hierarchy2.foo"
+    "qml-again.xml"
+    "test.qml"
+    "text-x-objcsrc.xml"
+    "yast2-metapackage-handler-mimetypes.xml"
+)
+
+add_qt_resource(tst_qmimedatabase-xml "testdata"
+    PREFIX
+        "/qt-project.org/qmime"
+    BASE
+        ".."
+    FILES
+        ${testdata_resource_files}
+)
+
+
+#### Keys ignored in scope 1:.:.:qmimedatabase-xml.pro:<TRUE>:
+# _REQUIREMENTS = "qtConfig(private_tests)"
+
+## Scopes:
+#####################################################################
+
+extend_target(tst_qmimedatabase-xml CONDITION GCC
+    COMPILE_OPTIONS
+        -W
+        -Wall
+        -Wextra
+        -Wno-long-long
+        -Wnon-virtual-dtor
+        -Wshadow
+)
+
+extend_target(tst_qmimedatabase-xml CONDITION UNIX AND NOT APPLE AND NOT QNX
+    DEFINES
+        USE_XDG_DATA_DIRS
+)
diff --git a/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-xml/CMakeLists.txt b/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-xml/CMakeLists.txt
new file mode 100644
index 0000000000..cf8e349226
--- /dev/null
+++ b/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-xml/CMakeLists.txt
@@ -0,0 +1,103 @@
+# Generated from qmimedatabase-xml.pro.
+
+if(NOT QT_FEATURE_private_tests)
+    return()
+endif()
+
+#####################################################################
+## tst_qmimedatabase-xml Test:
+#####################################################################
+
+add_qt_test(tst_qmimedatabase-xml
+    SOURCES
+        ../tst_qmimedatabase.h
+        tst_qmimedatabase-xml.cpp
+    PUBLIC_LIBRARIES
+        Qt::Concurrent
+)
+
+# Resources:
+# special case begin
+# the freedesktop resources are handled manually below via mimetypes_resources.cmake
+#set(mimetypes_resource_files
+    #"mime/packages/freedesktop.org.xml"
+#)
+# special case end
+set_source_files_properties("../invalid-magic1.xml"
+    PROPERTIES QT_RESOURCE_ALIAS "invalid-magic1.xml"
+)
+set_source_files_properties("../invalid-magic2.xml"
+    PROPERTIES QT_RESOURCE_ALIAS "invalid-magic2.xml"
+)
+set_source_files_properties("../invalid-magic3.xml"
+    PROPERTIES QT_RESOURCE_ALIAS "invalid-magic3.xml"
+)
+set_source_files_properties("../magic-and-hierarchy.foo"
+    PROPERTIES QT_RESOURCE_ALIAS "magic-and-hierarchy.foo"
+)
+set_source_files_properties("../magic-and-hierarchy.xml"
+    PROPERTIES QT_RESOURCE_ALIAS "magic-and-hierarchy.xml"
+)
+set_source_files_properties("../magic-and-hierarchy2.foo"
+    PROPERTIES QT_RESOURCE_ALIAS "magic-and-hierarchy2.foo"
+)
+set_source_files_properties("../qml-again.xml"
+    PROPERTIES QT_RESOURCE_ALIAS "qml-again.xml"
+)
+set_source_files_properties("../test.qml"
+    PROPERTIES QT_RESOURCE_ALIAS "test.qml"
+)
+set_source_files_properties("../text-x-objcsrc.xml"
+    PROPERTIES QT_RESOURCE_ALIAS "text-x-objcsrc.xml"
+)
+set_source_files_properties("../yast2-metapackage-handler-mimetypes.xml"
+    PROPERTIES QT_RESOURCE_ALIAS "yast2-metapackage-handler-mimetypes.xml"
+)
+set(testdata_resource_files
+    "invalid-magic1.xml"
+    "invalid-magic2.xml"
+    "invalid-magic3.xml"
+    "magic-and-hierarchy.foo"
+    "magic-and-hierarchy.xml"
+    "magic-and-hierarchy2.foo"
+    "qml-again.xml"
+    "test.qml"
+    "text-x-objcsrc.xml"
+    "yast2-metapackage-handler-mimetypes.xml"
+)
+
+add_qt_resource(tst_qmimedatabase-xml "testdata"
+    PREFIX
+        "/qt-project.org/qmime"
+    BASE
+        ".."
+    FILES
+        ${testdata_resource_files}
+)
+
+# special case begin
+set(corelib_source_dir ../../../../../../src/corelib)
+include(${corelib_source_dir}/mimetypes/mimetypes_resources.cmake)
+corelib_add_mimetypes_resources(tst_qmimedatabase-xml)
+# special case end
+
+#### Keys ignored in scope 1:.:.:qmimedatabase-xml.pro:<TRUE>:
+# _REQUIREMENTS = "qtConfig(private_tests)"
+
+## Scopes:
+#####################################################################
+
+extend_target(tst_qmimedatabase-xml CONDITION GCC
+    COMPILE_OPTIONS
+        -W
+        -Wall
+        -Wextra
+        -Wno-long-long
+        -Wnon-virtual-dtor
+        -Wshadow
+)
+
+extend_target(tst_qmimedatabase-xml CONDITION UNIX AND NOT APPLE AND NOT QNX
+    DEFINES
+        USE_XDG_DATA_DIRS
+)
diff --git a/tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.cpp b/tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.cpp
index 4ad09203ac..7e3642752e 100644
--- a/tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.cpp
+++ b/tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.cpp
@@ -73,12 +73,12 @@ static inline QString testSuiteWarning()
     str << "\nCannot find the shared-mime-info test suite\nstarting from: "
         << QDir::toNativeSeparators(QDir::currentPath()) << "\n"
            "cd " << QDir::toNativeSeparators(QStringLiteral("tests/auto/corelib/mimetypes/qmimedatabase")) << "\n"
-           "wget http://cgit.freedesktop.org/xdg/shared-mime-info/snapshot/Release-1-10.zip\n"
-           "unzip Release-1-10.zip\n";
+           "wget https://gitlab.freedesktop.org/xdg/shared-mime-info/-/archive/Release-1-10/shared-mime-info-Release-1-10.zip\n"
+           "unzip shared-mime-info-Release-1-10.zip\n";
 #ifdef Q_OS_WIN
-    str << "mkdir testfiles\nxcopy /s Release-1-10 s-m-i\n";
+    str << "mkdir testfiles\nxcopy /s shared-mime-info-Release-1-10 s-m-i\n";
 #else
-    str << "ln -s Release-1-10 s-m-i\n";
+    str << "ln -s shared-mime-info-Release-1-10 s-m-i\n";
 #endif
     return result;
 }
diff --git a/tests/auto/corelib/mimetypes/qmimetype/CMakeLists.txt b/tests/auto/corelib/mimetypes/qmimetype/CMakeLists.txt
new file mode 100644
index 0000000000..990835c86a
--- /dev/null
+++ b/tests/auto/corelib/mimetypes/qmimetype/CMakeLists.txt
@@ -0,0 +1,12 @@
+# Generated from qmimetype.pro.
+
+#####################################################################
+## tst_qmimetype Test:
+#####################################################################
+
+add_qt_test(tst_qmimetype
+    SOURCES
+        tst_qmimetype.cpp
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+)
diff --git a/tests/auto/corelib/plugin/CMakeLists.txt b/tests/auto/corelib/plugin/CMakeLists.txt
new file mode 100644
index 0000000000..710d471e8a
--- /dev/null
+++ b/tests/auto/corelib/plugin/CMakeLists.txt
@@ -0,0 +1,13 @@
+# Generated from plugin.pro.
+
+if(QT_BUILD_SHARED_LIBS)
+    add_subdirectory(qfactoryloader)
+endif()
+add_subdirectory(quuid)
+if(QT_FEATURE_library)
+    add_subdirectory(qpluginloader)
+    add_subdirectory(qlibrary)
+endif()
+if(QT_BUILD_SHARED_LIBS AND QT_FEATURE_library)
+    add_subdirectory(qplugin)
+endif()
diff --git a/tests/auto/corelib/plugin/qfactoryloader/CMakeLists.txt b/tests/auto/corelib/plugin/qfactoryloader/CMakeLists.txt
new file mode 100644
index 0000000000..6263be15a2
--- /dev/null
+++ b/tests/auto/corelib/plugin/qfactoryloader/CMakeLists.txt
@@ -0,0 +1,5 @@
+# Generated from qfactoryloader.pro.
+
+add_subdirectory(plugin1)
+add_subdirectory(plugin2)
+add_subdirectory(test)
diff --git a/tests/auto/corelib/plugin/qfactoryloader/plugin1/CMakeLists.txt b/tests/auto/corelib/plugin/qfactoryloader/plugin1/CMakeLists.txt
new file mode 100644
index 0000000000..940dcc2b09
--- /dev/null
+++ b/tests/auto/corelib/plugin/qfactoryloader/plugin1/CMakeLists.txt
@@ -0,0 +1,36 @@
+# Generated from plugin1.pro.
+
+#####################################################################
+## plugin1 Generic Library:
+#####################################################################
+
+add_cmake_library(plugin1
+    MODULE
+    INSTALL_DIRECTORY "${INSTALL_TESTSDIR}/tst_qfactoryloader/bin"
+    OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../bin"
+    SOURCES
+        plugin1.cpp plugin1.h
+    PUBLIC_LIBRARIES
+        Qt::Core
+)
+
+#### Keys ignored in scope 1:.:.:plugin1.pro:<TRUE>:
+# INSTALLS = "target"
+# TEMPLATE = "lib"
+# target.path = "$$[QT_INSTALL_TESTS]/tst_qfactoryloader/bin"
+
+## Scopes:
+#####################################################################
+
+#### Keys ignored in scope 6:.:..:../winrt.pri:(CMAKE_BUILD_TYPE STREQUAL Debug):
+# DESTDIR = "../debug/bin"
+
+#### Keys ignored in scope 7:.:..:../winrt.pri:else:
+# DESTDIR = "../release/bin"
+
+extend_target(plugin1 CONDITION NOT QT_FEATURE_library
+    DEFINES
+        QT_STATICPLUGIN
+)
+
+qt_autogen_tools_initial_setup(plugin1)
diff --git a/tests/auto/corelib/plugin/qfactoryloader/plugin2/CMakeLists.txt b/tests/auto/corelib/plugin/qfactoryloader/plugin2/CMakeLists.txt
new file mode 100644
index 0000000000..2df999c292
--- /dev/null
+++ b/tests/auto/corelib/plugin/qfactoryloader/plugin2/CMakeLists.txt
@@ -0,0 +1,36 @@
+# Generated from plugin2.pro.
+
+#####################################################################
+## plugin2 Generic Library:
+#####################################################################
+
+add_cmake_library(plugin2
+    MODULE
+    INSTALL_DIRECTORY "${INSTALL_TESTSDIR}/tst_qfactoryloader/bin"
+    OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../bin"
+    SOURCES
+        plugin2.cpp plugin2.h
+    PUBLIC_LIBRARIES
+        Qt::Core
+)
+
+#### Keys ignored in scope 1:.:.:plugin2.pro:<TRUE>:
+# INSTALLS = "target"
+# TEMPLATE = "lib"
+# target.path = "$$[QT_INSTALL_TESTS]/tst_qfactoryloader/bin"
+
+## Scopes:
+#####################################################################
+
+#### Keys ignored in scope 6:.:..:../winrt.pri:(CMAKE_BUILD_TYPE STREQUAL Debug):
+# DESTDIR = "../debug/bin"
+
+#### Keys ignored in scope 7:.:..:../winrt.pri:else:
+# DESTDIR = "../release/bin"
+
+extend_target(plugin2 CONDITION NOT QT_FEATURE_library
+    DEFINES
+        QT_STATICPLUGIN
+)
+
+qt_autogen_tools_initial_setup(plugin2)
diff --git a/tests/auto/corelib/plugin/qfactoryloader/test/.prev_CMakeLists.txt b/tests/auto/corelib/plugin/qfactoryloader/test/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..454b6c061a
--- /dev/null
+++ b/tests/auto/corelib/plugin/qfactoryloader/test/.prev_CMakeLists.txt
@@ -0,0 +1,42 @@
+# Generated from test.pro.
+
+#####################################################################
+## tst_qfactoryloader Test:
+#####################################################################
+
+add_qt_test(tst_qfactoryloader
+    OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../"
+    SOURCES
+        ../plugin1/plugininterface1.h
+        ../plugin2/plugininterface2.h
+        ../tst_qfactoryloader.cpp
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+)
+
+## Scopes:
+#####################################################################
+
+extend_target(tst_qfactoryloader CONDITION NOT QT_FEATURE_library
+    PUBLIC_LIBRARIES
+        # Remove: L
+        ../bin/
+        plugin1
+        plugin2
+)
+
+if(ANDROID)
+    # Resources:
+    set(qmake_libs_resource_files
+        ${CMAKE_CURRENT_BINARY_DIR}/../bin
+    )
+
+    add_qt_resource(tst_qfactoryloader "qmake_libs"
+        PREFIX
+            "android_test_data"
+        BASE
+            "${CMAKE_CURRENT_BINARY_DIR}/.."
+        FILES
+            ${qmake_libs_resource_files}
+    )
+endif()
diff --git a/tests/auto/corelib/plugin/qfactoryloader/test/CMakeLists.txt b/tests/auto/corelib/plugin/qfactoryloader/test/CMakeLists.txt
new file mode 100644
index 0000000000..d532eeeb4b
--- /dev/null
+++ b/tests/auto/corelib/plugin/qfactoryloader/test/CMakeLists.txt
@@ -0,0 +1,68 @@
+# Generated from test.pro.
+
+#####################################################################
+## tst_qfactoryloader Test:
+#####################################################################
+
+add_qt_test(tst_qfactoryloader
+    OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../"
+    SOURCES
+        ../plugin1/plugininterface1.h
+        ../plugin2/plugininterface2.h
+        ../tst_qfactoryloader.cpp
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+)
+
+## Scopes:
+#####################################################################
+
+# special case begin
+if (NOT QT_FEATURE_library)
+    target_link_directories(tst_qfactoryloader PRIVATE "${CMAKE_CURRENT_BINARY_DIR}../bin")
+endif()
+# special case end
+
+extend_target(tst_qfactoryloader CONDITION NOT QT_FEATURE_library
+    PUBLIC_LIBRARIES
+        # Remove: L
+        # special case begin
+        # this part is handled as a special case above
+        # ../bin/
+        # special case end
+)
+
+if(ANDROID)
+    # special case begin
+    set_source_files_properties(
+        ${CMAKE_CURRENT_BINARY_DIR}/../bin/libplugin1.so
+        PROPERTIES QT_RESOURCE_TARGET_DEPENDENCY plugin1
+    )
+
+    set_source_files_properties(
+        ${CMAKE_CURRENT_BINARY_DIR}/../bin/libplugin2.so
+        PROPERTIES QT_RESOURCE_TARGET_DEPENDENCY plugin2
+    )
+    # Resources:
+    if (ANDROID)
+        set(qmake_libs_resource_files
+            bin/libplugin1_${CMAKE_ANDROID_ARCH_ABI}.so
+            bin/libplugin2_${CMAKE_ANDROID_ARCH_ABI}.so
+        )
+    else()
+        set(qmake_libs_resource_files
+            bin/libplugin1.so
+            bin/libplugin2.so
+        )
+    endif()
+    # special case end
+
+    add_qt_resource(tst_qfactoryloader "qmake_libs"
+        PREFIX
+            "android_test_data"
+        BASE
+            "${CMAKE_CURRENT_BINARY_DIR}/.."
+        FILES
+            ${qmake_libs_resource_files}
+    )
+endif()
diff --git a/tests/auto/corelib/plugin/qlibrary/CMakeLists.txt b/tests/auto/corelib/plugin/qlibrary/CMakeLists.txt
new file mode 100644
index 0000000000..c0faebc91d
--- /dev/null
+++ b/tests/auto/corelib/plugin/qlibrary/CMakeLists.txt
@@ -0,0 +1,5 @@
+# Generated from qlibrary.pro.
+
+add_subdirectory(lib)
+add_subdirectory(lib2)
+add_subdirectory(tst)
diff --git a/tests/auto/corelib/plugin/qlibrary/lib/.prev_CMakeLists.txt b/tests/auto/corelib/plugin/qlibrary/lib/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..6dbbd7a060
--- /dev/null
+++ b/tests/auto/corelib/plugin/qlibrary/lib/.prev_CMakeLists.txt
@@ -0,0 +1,34 @@
+# Generated from lib.pro.
+
+#####################################################################
+## mylib Generic Library:
+#####################################################################
+
+add_cmake_library(mylib
+    SHARED
+    INSTALL_DIRECTORY "${INSTALL_TESTSDIR}/tst_qlibrary"
+    OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../"
+    SOURCES
+        mylib.c
+    PUBLIC_LIBRARIES
+        Qt::Core
+)
+
+#### Keys ignored in scope 1:.:.:lib.pro:<TRUE>:
+# INSTALLS = "target"
+# TEMPLATE = "lib"
+# target.path = "$$[QT_INSTALL_TESTS]/tst_qlibrary"
+
+## Scopes:
+#####################################################################
+
+extend_target(mylib CONDITION MSVC
+    DEFINES
+        WIN32_MSVC
+)
+
+#### Keys ignored in scope 4:.:.:lib.pro:(CMAKE_BUILD_TYPE STREQUAL Debug):
+# DESTDIR = "../debug/"
+
+#### Keys ignored in scope 5:.:.:lib.pro:else:
+# DESTDIR = "../release/"
diff --git a/tests/auto/corelib/plugin/qlibrary/lib/CMakeLists.txt b/tests/auto/corelib/plugin/qlibrary/lib/CMakeLists.txt
new file mode 100644
index 0000000000..f2de91635a
--- /dev/null
+++ b/tests/auto/corelib/plugin/qlibrary/lib/CMakeLists.txt
@@ -0,0 +1,43 @@
+# Generated from lib.pro.
+
+#####################################################################
+## mylib Generic Library:
+#####################################################################
+
+add_cmake_library(mylib
+    SHARED
+    INSTALL_DIRECTORY "${INSTALL_TESTSDIR}/tst_qlibrary"
+    OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../"
+    SOURCES
+        mylib.c
+    PUBLIC_LIBRARIES
+        Qt::Core
+)
+
+# special case begin
+set_target_properties(mylib PROPERTIES
+    VERSION 1.0.0
+    SOVERSION 1
+    C_VISIBILITY_PRESET "default"
+    CXX_VISIBILITY_PRESET "default"
+)
+# special case end
+
+#### Keys ignored in scope 1:.:.:lib.pro:<TRUE>:
+# INSTALLS = "target"
+# TEMPLATE = "lib"
+# target.path = "$$[QT_INSTALL_TESTS]/tst_qlibrary"
+
+## Scopes:
+#####################################################################
+
+extend_target(mylib CONDITION MSVC
+    DEFINES
+        WIN32_MSVC
+)
+
+#### Keys ignored in scope 4:.:.:lib.pro:(CMAKE_BUILD_TYPE STREQUAL Debug):
+# DESTDIR = "../debug/"
+
+#### Keys ignored in scope 5:.:.:lib.pro:else:
+# DESTDIR = "../release/"
diff --git a/tests/auto/corelib/plugin/qlibrary/lib2/CMakeLists.txt b/tests/auto/corelib/plugin/qlibrary/lib2/CMakeLists.txt
new file mode 100644
index 0000000000..716ad488d0
--- /dev/null
+++ b/tests/auto/corelib/plugin/qlibrary/lib2/CMakeLists.txt
@@ -0,0 +1,104 @@
+# Generated from lib2.pro.
+
+#####################################################################
+## mylib Generic Library:
+#####################################################################
+
+add_cmake_library(mylib2 # special case
+    SHARED
+    INSTALL_DIRECTORY "${INSTALL_TESTSDIR}tst_qlibrary"
+    #OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../" # special case
+    SOURCES
+        mylib.c
+    PUBLIC_LIBRARIES
+        Qt::Core
+)
+
+# special case begin
+# This test is very "annoying" to get working with CMake as it involves having
+# two targets with the same name on the parent scope, which is not possible with
+# CMake. Furthermore, on UNIX, this version of the library should override the
+# root symlink (libmylib.so) to point to version 2.
+# Since we can't build two targets with the same name and in the same directory,
+# we build mylib2 in it's own directory and manually copy and create the
+# symlinks in the parent directory.
+# Finally we also need to create a libmylib.so2 file in the parent directory.
+#
+set_target_properties(mylib2 PROPERTIES
+    OUTPUT_NAME mylib
+)
+set_target_properties(mylib2 PROPERTIES
+    VERSION 2.0.0
+    SOVERSION 2
+    C_VISIBILITY_PRESET "default"
+    CXX_VISIBILITY_PRESET "default"
+)
+if (UNIX)
+    add_dependencies(mylib2 mylib)
+    add_custom_command(TARGET mylib2 POST_BUILD
+        COMMAND ${CMAKE_COMMAND} -E copy_if_different
+            $<TARGET_FILE:mylib2>
+            "${CMAKE_CURRENT_BINARY_DIR}/../system.qt.test.mylib.so"
+        COMMAND ${CMAKE_COMMAND} -E copy_if_different
+            $<TARGET_FILE:mylib2>
+            "${CMAKE_CURRENT_BINARY_DIR}/../libmylib.so.2.0.0"
+        COMMAND ${CMAKE_COMMAND} -E create_symlink
+            "${CMAKE_CURRENT_BINARY_DIR}/../libmylib.so.2.0.0"
+            "${CMAKE_CURRENT_BINARY_DIR}/../libmylib.so.2"
+        COMMAND ${CMAKE_COMMAND} -E remove
+            "${CMAKE_CURRENT_BINARY_DIR}/../libmylib.so"
+        COMMAND ${CMAKE_COMMAND} -E create_symlink
+            "${CMAKE_CURRENT_BINARY_DIR}/../libmylib.so.2.0.0"
+            "${CMAKE_CURRENT_BINARY_DIR}/../libmylib.so"
+        COMMAND ${CMAKE_COMMAND} -E create_symlink
+            "${CMAKE_CURRENT_BINARY_DIR}/../libmylib.so.2.0.0"
+            "${CMAKE_CURRENT_BINARY_DIR}/../libmylib.so2"
+    )
+else() #Win32
+    add_custom_command(TARGET mylib2 POST_BUILD
+        COMMAND ${CMAKE_COMMAND} -E copy_if_different
+            $<TARGET_FILE:mylib2>
+            "${CMAKE_CURRENT_BINARY_DIR}/../system.qt.test.mylib.dll"
+        COMMAND ${CMAKE_COMMAND} -E copy_if_different
+            $<TARGET_FILE:mylib2>
+            "${CMAKE_CURRENT_BINARY_DIR}/../mylib.dl2"
+    )
+endif()
+# special case end
+
+#### Keys ignored in scope 1:.:.:lib2.pro:<TRUE>:
+# INSTALLS = "target" "renamed_target"
+# QMAKE_POST_LINK = "$$member(QMAKE_POST_LINK, 0, -2)"
+# TEMPLATE = "lib"
+# VERSION = "2"
+# renamed_target.extra = "$$member(renamed_target.extra, 0, -2)"
+# renamed_target.path = "$$target.path"
+# target.path = "$$[QT_INSTALL_TESTS]$${QMAKE_DIR_SEP}tst_qlibrary"
+
+## Scopes:
+#####################################################################
+
+extend_target(mylib2 CONDITION MSVC # special case
+    DEFINES
+        WIN32_MSVC
+)
+
+#### Keys ignored in scope 3:.:.:lib2.pro:WIN32:
+# DESTDIR = "../$$BUILD_FOLDER/"
+# files = "$$BUILD_FOLDER$${QMAKE_DIR_SEP}mylib.dl2" "$$BUILD_FOLDER$${QMAKE_DIR_SEP}system.qt.test.mylib.dll"
+
+#### Keys ignored in scope 4:.:.:lib2.pro:(CMAKE_BUILD_TYPE STREQUAL Debug):
+# BUILD_FOLDER = "debug"
+
+#### Keys ignored in scope 5:.:.:lib2.pro:else:
+# BUILD_FOLDER = "release"
+
+#### Keys ignored in scope 6:.:.:lib2.pro:TEMPLATE___contains___vc._x_:
+# src = "$(TargetPath)"
+
+#### Keys ignored in scope 7:.:.:lib2.pro:else:
+# src = "$(DESTDIR_TARGET)"
+
+#### Keys ignored in scope 8:.:.:lib2.pro:else:
+# files = "libmylib.so2" "system.qt.test.mylib.so"
+# src = "$(DESTDIR)$(TARGET)"
diff --git a/tests/auto/corelib/plugin/qlibrary/tst/.prev_CMakeLists.txt b/tests/auto/corelib/plugin/qlibrary/tst/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..ac6515ba63
--- /dev/null
+++ b/tests/auto/corelib/plugin/qlibrary/tst/.prev_CMakeLists.txt
@@ -0,0 +1,37 @@
+# Generated from tst.pro.
+
+#####################################################################
+## tst_qlibrary Test:
+#####################################################################
+
+# Collect test data
+list(APPEND test_data "../library_path/invalid.so")
+
+add_qt_test(tst_qlibrary
+    OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../"
+    SOURCES
+        ../tst_qlibrary.cpp
+    TESTDATA ${test_data}
+)
+
+## Scopes:
+#####################################################################
+
+if(ANDROID)
+    # Resources:
+    set(qmake_libs_resource_files
+        ${CMAKE_CURRENT_BINARY_DIR}/../libmylib.prl
+        ${CMAKE_CURRENT_BINARY_DIR}/../libmylib.so
+        ${CMAKE_CURRENT_BINARY_DIR}/../libmylib.so2
+        ${CMAKE_CURRENT_BINARY_DIR}/../system.qt.test.mylib.so
+    )
+
+    add_qt_resource(tst_qlibrary "qmake_libs"
+        PREFIX
+            "android_test_data"
+        BASE
+            "${CMAKE_CURRENT_BINARY_DIR}/.."
+        FILES
+            ${qmake_libs_resource_files}
+    )
+endif()
diff --git a/tests/auto/corelib/plugin/qlibrary/tst/CMakeLists.txt b/tests/auto/corelib/plugin/qlibrary/tst/CMakeLists.txt
new file mode 100644
index 0000000000..e6086a982f
--- /dev/null
+++ b/tests/auto/corelib/plugin/qlibrary/tst/CMakeLists.txt
@@ -0,0 +1,50 @@
+# Generated from tst.pro.
+
+#####################################################################
+## tst_qlibrary Test:
+#####################################################################
+
+# Collect test data
+list(APPEND test_data "../library_path/invalid.so")
+
+add_qt_test(tst_qlibrary
+    OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../"
+    SOURCES
+        ../tst_qlibrary.cpp
+    TESTDATA ${test_data}
+)
+
+## Scopes:
+#####################################################################
+
+if(ANDROID)
+    # special case begin
+    set_source_files_properties(
+        ${CMAKE_CURRENT_BINARY_DIR}/../libmylib.so
+        PROPERTIES QT_RESOURCE_TARGET_DEPENDENCY mylib
+    )
+    set_source_files_properties(
+        ${CMAKE_CURRENT_BINARY_DIR}/../libmylib.so2
+        ${CMAKE_CURRENT_BINARY_DIR}/../system.qt.test.mylib.so
+        PROPERTIES QT_RESOURCE_TARGET_DEPENDENCY mylib2
+    )
+    # special case end
+    # Resources:
+    set(qmake_libs_resource_files
+        # special case begin
+        #libmylib.prl
+        libmylib.so
+        libmylib.so2
+        system.qt.test.mylib.so
+        # special case end
+    )
+
+    add_qt_resource(tst_qlibrary "qmake_libs"
+        PREFIX
+            "android_test_data"
+        BASE
+            "${CMAKE_CURRENT_BINARY_DIR}/.."
+        FILES
+            ${qmake_libs_resource_files}
+    )
+endif()
diff --git a/tests/auto/corelib/plugin/qplugin/.prev_CMakeLists.txt b/tests/auto/corelib/plugin/qplugin/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..7e6ccc966d
--- /dev/null
+++ b/tests/auto/corelib/plugin/qplugin/.prev_CMakeLists.txt
@@ -0,0 +1,3 @@
+# Generated from qplugin.pro.
+
+add_subdirectory(invalidplugin)
diff --git a/tests/auto/corelib/plugin/qplugin/CMakeLists.txt b/tests/auto/corelib/plugin/qplugin/CMakeLists.txt
new file mode 100644
index 0000000000..b2829099aa
--- /dev/null
+++ b/tests/auto/corelib/plugin/qplugin/CMakeLists.txt
@@ -0,0 +1,27 @@
+# Generated from qplugin.pro.
+
+add_subdirectory(invalidplugin)
+
+# special case begin
+add_subdirectory(debugplugin)
+add_subdirectory(releaseplugin)
+
+# The contents below are generated from ./tst_qplugin.pro
+# Collect test data
+file(GLOB_RECURSE test_data_glob
+    RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+    plugins/*)
+list(APPEND test_data ${test_data_glob})
+
+add_qt_test(tst_qplugin
+    SOURCES
+        tst_qplugin.cpp
+    LIBRARIES
+        Qt::CorePrivate
+    TESTDATA ${test_data}
+)
+
+target_compile_definitions(tst_qplugin PRIVATE CMAKE_BUILD=1)
+
+add_dependencies(tst_qplugin invalidplugin debugplugin releaseplugin)
+# special case end
diff --git a/tests/auto/corelib/plugin/qplugin/debugplugin/CMakeLists.txt b/tests/auto/corelib/plugin/qplugin/debugplugin/CMakeLists.txt
new file mode 100644
index 0000000000..ab32e5e364
--- /dev/null
+++ b/tests/auto/corelib/plugin/qplugin/debugplugin/CMakeLists.txt
@@ -0,0 +1,19 @@
+# Generated from debugplugin.pro.
+
+#####################################################################
+## debugplugin Generic Library:
+#####################################################################
+
+add_cmake_library(debugplugin
+    MODULE
+    OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../plugins"
+    SOURCES
+        main.cpp
+    PUBLIC_LIBRARIES
+        Qt::Core
+)
+
+#### Keys ignored in scope 1:.:.:debugplugin.pro:<TRUE>:
+# TEMPLATE = "lib"
+
+qt_autogen_tools_initial_setup(debugplugin)
diff --git a/tests/auto/corelib/plugin/qplugin/invalidplugin/CMakeLists.txt b/tests/auto/corelib/plugin/qplugin/invalidplugin/CMakeLists.txt
new file mode 100644
index 0000000000..c3eb37d930
--- /dev/null
+++ b/tests/auto/corelib/plugin/qplugin/invalidplugin/CMakeLists.txt
@@ -0,0 +1,19 @@
+# Generated from invalidplugin.pro.
+
+#####################################################################
+## invalidplugin Generic Library:
+#####################################################################
+
+add_cmake_library(invalidplugin
+    MODULE
+    OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../plugins"
+    SOURCES
+        main.cpp
+    PUBLIC_LIBRARIES
+        Qt::Core
+)
+
+#### Keys ignored in scope 1:.:.:invalidplugin.pro:<TRUE>:
+# TEMPLATE = "lib"
+
+qt_autogen_tools_initial_setup(invalidplugin)
diff --git a/tests/auto/corelib/plugin/qplugin/releaseplugin/CMakeLists.txt b/tests/auto/corelib/plugin/qplugin/releaseplugin/CMakeLists.txt
new file mode 100644
index 0000000000..893386bc6b
--- /dev/null
+++ b/tests/auto/corelib/plugin/qplugin/releaseplugin/CMakeLists.txt
@@ -0,0 +1,19 @@
+# Generated from releaseplugin.pro.
+
+#####################################################################
+## releaseplugin Generic Library:
+#####################################################################
+
+add_cmake_library(releaseplugin
+    MODULE
+    OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../plugins"
+    SOURCES
+        main.cpp
+    PUBLIC_LIBRARIES
+        Qt::Core
+)
+
+#### Keys ignored in scope 1:.:.:releaseplugin.pro:<TRUE>:
+# TEMPLATE = "lib"
+
+qt_autogen_tools_initial_setup(releaseplugin)
diff --git a/tests/auto/corelib/plugin/qplugin/tst_qplugin.cpp b/tests/auto/corelib/plugin/qplugin/tst_qplugin.cpp
index aa85a7c35b..644b8b700d 100644
--- a/tests/auto/corelib/plugin/qplugin/tst_qplugin.cpp
+++ b/tests/auto/corelib/plugin/qplugin/tst_qplugin.cpp
@@ -81,6 +81,9 @@ void tst_QPlugin::loadDebugPlugin()
         QObject *object = loader.instance();
         QVERIFY(object != 0);
 #else
+#  if defined(CMAKE_BUILD) && defined(QT_NO_DEBUG)
+    QSKIP("Skipping test as it is not possible to disable build targets based on configuration with CMake");
+#  endif
         // loading a plugin is dependent on which lib we are running against
 #  if defined(QT_NO_DEBUG)
         // release build, we cannot load debug plugins
@@ -111,6 +114,9 @@ void tst_QPlugin::loadReleasePlugin()
         QObject *object = loader.instance();
         QVERIFY(object != 0);
 #else
+#  if defined(CMAKE_BUILD) && !defined(QT_NO_DEBUG)
+    QSKIP("Skipping test as it is not possible to disable build targets based on configuration with CMake");
+#  endif
         // loading a plugin is dependent on which lib we are running against
 #  if defined(QT_NO_DEBUG)
         // release build, we can load debug plugins
diff --git a/tests/auto/corelib/plugin/qpluginloader/CMakeLists.txt b/tests/auto/corelib/plugin/qpluginloader/CMakeLists.txt
new file mode 100644
index 0000000000..ba7d375e3b
--- /dev/null
+++ b/tests/auto/corelib/plugin/qpluginloader/CMakeLists.txt
@@ -0,0 +1,12 @@
+# Generated from qpluginloader.pro.
+
+add_subdirectory(lib)
+add_subdirectory(staticplugin)
+add_subdirectory(theplugin)
+add_subdirectory(tst)
+if(UNIX AND NOT ANDROID AND NOT APPLE)
+    add_subdirectory(almostplugin)
+endif()
+if(APPLE_OSX AND QT_FEATURE_private_tests AND TARGET Qt::Gui)
+    add_subdirectory(machtest)
+endif()
diff --git a/tests/auto/corelib/plugin/qpluginloader/almostplugin/.prev_CMakeLists.txt b/tests/auto/corelib/plugin/qpluginloader/almostplugin/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..5e42a1aef0
--- /dev/null
+++ b/tests/auto/corelib/plugin/qpluginloader/almostplugin/.prev_CMakeLists.txt
@@ -0,0 +1,30 @@
+# Generated from almostplugin.pro.
+
+#####################################################################
+## almostplugin Generic Library:
+#####################################################################
+
+add_cmake_library(almostplugin
+    MODULE
+    INSTALL_DIRECTORY "${INSTALL_TESTSDIR}/tst_qpluginloader/bin"
+    OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../bin"
+    SOURCES
+        almostplugin.cpp almostplugin.h
+    PUBLIC_LIBRARIES
+        Qt::Core
+)
+
+#### Keys ignored in scope 1:.:.:almostplugin.pro:<TRUE>:
+# INSTALLS = "target"
+# TEMPLATE = "lib"
+# target.path = "$$[QT_INSTALL_TESTS]/tst_qpluginloader/bin"
+
+## Scopes:
+#####################################################################
+
+extend_target(almostplugin CONDITION GCC
+    LINK_OPTIONS
+        "--Wl,--no-undefined"
+)
+
+qt_autogen_tools_initial_setup(almostplugin)
diff --git a/tests/auto/corelib/plugin/qpluginloader/almostplugin/CMakeLists.txt b/tests/auto/corelib/plugin/qpluginloader/almostplugin/CMakeLists.txt
new file mode 100644
index 0000000000..5208a70c9d
--- /dev/null
+++ b/tests/auto/corelib/plugin/qpluginloader/almostplugin/CMakeLists.txt
@@ -0,0 +1,32 @@
+# Generated from almostplugin.pro.
+
+#####################################################################
+## almostplugin Generic Library:
+#####################################################################
+
+add_cmake_library(almostplugin
+    MODULE
+    INSTALL_DIRECTORY "${INSTALL_TESTSDIR}/tst_qpluginloader/bin"
+    OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../bin"
+    SOURCES
+        almostplugin.cpp almostplugin.h
+    PUBLIC_LIBRARIES
+        Qt::Core
+)
+
+#### Keys ignored in scope 1:.:.:almostplugin.pro:<TRUE>:
+# INSTALLS = "target"
+# TEMPLATE = "lib"
+# target.path = "$$[QT_INSTALL_TESTS]/tst_qpluginloader/bin"
+
+## Scopes:
+#####################################################################
+
+qt_autogen_tools_initial_setup(almostplugin)
+# special case begin
+# We want the opposite of this
+#extend_target(almostplugin CONDITION GCC
+#    LINK_OPTIONS
+#        "--Wl,--no-undefined"
+#)
+# special case end
diff --git a/tests/auto/corelib/plugin/qpluginloader/lib/.prev_CMakeLists.txt b/tests/auto/corelib/plugin/qpluginloader/lib/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..74945fc6d8
--- /dev/null
+++ b/tests/auto/corelib/plugin/qpluginloader/lib/.prev_CMakeLists.txt
@@ -0,0 +1,34 @@
+# Generated from lib.pro.
+
+#####################################################################
+## tst_qpluginloaderlib Generic Library:
+#####################################################################
+
+add_cmake_library(tst_qpluginloaderlib
+    SHARED
+    INSTALL_DIRECTORY "${INSTALL_TESTSDIR}/tst_qpluginloader/bin"
+    OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../bin"
+    SOURCES
+        mylib.c
+    PUBLIC_LIBRARIES
+        Qt::Core
+)
+
+#### Keys ignored in scope 1:.:.:lib.pro:<TRUE>:
+# INSTALLS = "target"
+# TEMPLATE = "lib"
+# target.path = "$$[QT_INSTALL_TESTS]/tst_qpluginloader/bin"
+
+## Scopes:
+#####################################################################
+
+#### Keys ignored in scope 6:.:..:../winrt.pri:(CMAKE_BUILD_TYPE STREQUAL Debug):
+# DESTDIR = "../debug/bin"
+
+#### Keys ignored in scope 7:.:..:../winrt.pri:else:
+# DESTDIR = "../release/bin"
+
+extend_target(tst_qpluginloaderlib CONDITION MSVC
+    DEFINES
+        WIN32_MSVC
+)
diff --git a/tests/auto/corelib/plugin/qpluginloader/lib/CMakeLists.txt b/tests/auto/corelib/plugin/qpluginloader/lib/CMakeLists.txt
new file mode 100644
index 0000000000..8d723cf3ce
--- /dev/null
+++ b/tests/auto/corelib/plugin/qpluginloader/lib/CMakeLists.txt
@@ -0,0 +1,41 @@
+# Generated from lib.pro.
+
+#####################################################################
+## tst_qpluginloaderlib Generic Library:
+#####################################################################
+
+add_cmake_library(tst_qpluginloaderlib
+    SHARED
+    INSTALL_DIRECTORY "${INSTALL_TESTSDIR}/tst_qpluginloader/bin"
+    OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../bin"
+    SOURCES
+        mylib.c
+    PUBLIC_LIBRARIES
+        Qt::Core
+)
+
+#### Keys ignored in scope 1:.:.:lib.pro:<TRUE>:
+# INSTALLS = "target"
+# TEMPLATE = "lib"
+# target.path = "$$[QT_INSTALL_TESTS]/tst_qpluginloader/bin"
+
+## Scopes:
+#####################################################################
+
+#### Keys ignored in scope 6:.:..:../winrt.pri:(CMAKE_BUILD_TYPE STREQUAL Debug):
+# DESTDIR = "../debug/bin"
+
+#### Keys ignored in scope 7:.:..:../winrt.pri:else:
+# DESTDIR = "../release/bin"
+
+extend_target(tst_qpluginloaderlib CONDITION MSVC
+    DEFINES
+        WIN32_MSVC
+)
+
+# special case begin
+set_target_properties(tst_qpluginloaderlib PROPERTIES
+    C_VISIBILITY_PRESET "default"
+    CXX_VISIBILITY_PRESET "default"
+)
+# special case end
diff --git a/tests/auto/corelib/plugin/qpluginloader/machtest/CMakeLists.txt b/tests/auto/corelib/plugin/qpluginloader/machtest/CMakeLists.txt
new file mode 100644
index 0000000000..05cd044aa3
--- /dev/null
+++ b/tests/auto/corelib/plugin/qpluginloader/machtest/CMakeLists.txt
@@ -0,0 +1,2 @@
+# Generated from machtest.pro.
+
diff --git a/tests/auto/corelib/plugin/qpluginloader/staticplugin/.prev_CMakeLists.txt b/tests/auto/corelib/plugin/qpluginloader/staticplugin/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..bfc30d7c1d
--- /dev/null
+++ b/tests/auto/corelib/plugin/qpluginloader/staticplugin/.prev_CMakeLists.txt
@@ -0,0 +1,23 @@
+# Generated from staticplugin.pro.
+
+#####################################################################
+## staticplugin Generic Library:
+#####################################################################
+
+add_cmake_library(staticplugin
+    STATIC
+    SOURCES
+        main.cpp
+    PUBLIC_LIBRARIES
+        Qt::Core
+    MOC_OPTIONS
+        "-M"
+        "ExtraMetaData=StaticPlugin"
+        "-M"
+        "ExtraMetaData=foo"
+)
+
+#### Keys ignored in scope 1:.:.:staticplugin.pro:<TRUE>:
+# TEMPLATE = "lib"
+
+qt_autogen_tools_initial_setup(staticplugin)
diff --git a/tests/auto/corelib/plugin/qpluginloader/staticplugin/CMakeLists.txt b/tests/auto/corelib/plugin/qpluginloader/staticplugin/CMakeLists.txt
new file mode 100644
index 0000000000..fb9d365d74
--- /dev/null
+++ b/tests/auto/corelib/plugin/qpluginloader/staticplugin/CMakeLists.txt
@@ -0,0 +1,25 @@
+# Generated from staticplugin.pro.
+
+#####################################################################
+## staticplugin Generic Library:
+#####################################################################
+
+add_cmake_library(staticplugin
+    STATIC
+    SOURCES
+        main.cpp
+    PUBLIC_LIBRARIES
+        Qt::Core
+    MOC_OPTIONS
+        "-M"
+        "ExtraMetaData=StaticPlugin"
+        "-M"
+        "ExtraMetaData=foo"
+)
+
+#### Keys ignored in scope 1:.:.:staticplugin.pro:<TRUE>:
+# TEMPLATE = "lib"
+
+qt_autogen_tools_initial_setup(staticplugin)
+
+target_compile_definitions(staticplugin PRIVATE QT_STATICPLUGIN)
diff --git a/tests/auto/corelib/plugin/qpluginloader/theplugin/CMakeLists.txt b/tests/auto/corelib/plugin/qpluginloader/theplugin/CMakeLists.txt
new file mode 100644
index 0000000000..5389790fba
--- /dev/null
+++ b/tests/auto/corelib/plugin/qpluginloader/theplugin/CMakeLists.txt
@@ -0,0 +1,31 @@
+# Generated from theplugin.pro.
+
+#####################################################################
+## theplugin Generic Library:
+#####################################################################
+
+add_cmake_library(theplugin
+    MODULE
+    INSTALL_DIRECTORY "${INSTALL_TESTSDIR}/tst_qpluginloader/bin"
+    OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../bin"
+    SOURCES
+        theplugin.cpp theplugin.h
+    PUBLIC_LIBRARIES
+        Qt::Core
+)
+
+#### Keys ignored in scope 1:.:.:theplugin.pro:<TRUE>:
+# INSTALLS = "target"
+# TEMPLATE = "lib"
+# target.path = "$$[QT_INSTALL_TESTS]/tst_qpluginloader/bin"
+
+## Scopes:
+#####################################################################
+
+#### Keys ignored in scope 5:.:..:../winrt.pri:(CMAKE_BUILD_TYPE STREQUAL Debug):
+# DESTDIR = "../debug/bin"
+
+#### Keys ignored in scope 6:.:..:../winrt.pri:else:
+# DESTDIR = "../release/bin"
+
+qt_autogen_tools_initial_setup(theplugin)
diff --git a/tests/auto/corelib/plugin/qpluginloader/tst/.prev_CMakeLists.txt b/tests/auto/corelib/plugin/qpluginloader/tst/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..8bef975168
--- /dev/null
+++ b/tests/auto/corelib/plugin/qpluginloader/tst/.prev_CMakeLists.txt
@@ -0,0 +1,45 @@
+# Generated from tst.pro.
+
+#####################################################################
+## tst_qpluginloader Test:
+#####################################################################
+
+# Collect test data
+list(APPEND test_data "../elftest")
+list(APPEND test_data "../machtest")
+
+add_qt_test(tst_qpluginloader
+    OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../"
+    SOURCES
+        ../fakeplugin.cpp
+        ../theplugin/plugininterface.h
+        ../tst_qpluginloader.cpp
+    PUBLIC_LIBRARIES
+        staticplugin
+    TESTDATA ${test_data}
+)
+
+## Scopes:
+#####################################################################
+
+extend_target(tst_qpluginloader CONDITION QT_FEATURE_private_tests
+    LIBRARIES
+        Qt::CorePrivate
+    PUBLIC_LIBRARIES
+        Qt::Core
+)
+
+extend_target(tst_qpluginloader CONDITION CMAKE_BUILD_TYPE STREQUAL Debug AND WIN32 AND debug_and_release
+    PUBLIC_LIBRARIES
+        # Remove: L../staticplugin/debug
+)
+
+extend_target(tst_qpluginloader CONDITION WIN32 AND debug_and_release AND NOT CMAKE_BUILD_TYPE STREQUAL Debug
+    PUBLIC_LIBRARIES
+        # Remove: L../staticplugin/release
+)
+
+extend_target(tst_qpluginloader CONDITION UNIX OR NOT debug_and_release
+    PUBLIC_LIBRARIES
+        # Remove: L../staticplugin
+)
diff --git a/tests/auto/corelib/plugin/qpluginloader/tst/CMakeLists.txt b/tests/auto/corelib/plugin/qpluginloader/tst/CMakeLists.txt
new file mode 100644
index 0000000000..c1c0d4b02b
--- /dev/null
+++ b/tests/auto/corelib/plugin/qpluginloader/tst/CMakeLists.txt
@@ -0,0 +1,43 @@
+# Generated from tst.pro.
+
+#####################################################################
+## tst_qpluginloader Test:
+#####################################################################
+
+# Collect test data
+list(APPEND test_data "../elftest")
+list(APPEND test_data "../machtest")
+
+add_qt_test(tst_qpluginloader
+    OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../"
+    SOURCES
+        ../fakeplugin.cpp
+        ../theplugin/plugininterface.h
+        ../tst_qpluginloader.cpp
+    PUBLIC_LIBRARIES
+        staticplugin
+    TESTDATA ${test_data}
+)
+
+## Scopes:
+#####################################################################
+
+extend_target(tst_qpluginloader CONDITION QT_FEATURE_private_tests
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+)
+
+extend_target(tst_qpluginloader CONDITION CMAKE_BUILD_TYPE STREQUAL Debug AND WIN32 AND debug_and_release
+    PUBLIC_LIBRARIES
+        # Remove: L../staticplugin/debug
+)
+
+extend_target(tst_qpluginloader CONDITION WIN32 AND debug_and_release AND NOT CMAKE_BUILD_TYPE STREQUAL Debug
+    PUBLIC_LIBRARIES
+        # Remove: L../staticplugin/release
+)
+
+extend_target(tst_qpluginloader CONDITION UNIX OR NOT debug_and_release
+    PUBLIC_LIBRARIES
+        # Remove: L../staticplugin
+)
diff --git a/tests/auto/corelib/plugin/quuid/CMakeLists.txt b/tests/auto/corelib/plugin/quuid/CMakeLists.txt
new file mode 100644
index 0000000000..91e75fe0ae
--- /dev/null
+++ b/tests/auto/corelib/plugin/quuid/CMakeLists.txt
@@ -0,0 +1,4 @@
+# Generated from quuid.pro.
+
+add_subdirectory(testProcessUniqueness)
+add_subdirectory(test)
diff --git a/tests/auto/corelib/plugin/quuid/test/.prev_CMakeLists.txt b/tests/auto/corelib/plugin/quuid/test/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..c635f6479c
--- /dev/null
+++ b/tests/auto/corelib/plugin/quuid/test/.prev_CMakeLists.txt
@@ -0,0 +1,29 @@
+# Generated from test.pro.
+
+#####################################################################
+## tst_quuid Test:
+#####################################################################
+
+add_qt_test(tst_quuid
+    SOURCES
+        ../tst_quuid.cpp
+)
+
+## Scopes:
+#####################################################################
+
+extend_target(tst_quuid CONDITION APPLE
+    SOURCES
+        ../tst_quuid_darwin.mm
+    PUBLIC_LIBRARIES
+        ${FWFoundation}
+)
+
+#### Keys ignored in scope 4:.:.:test.pro:(CMAKE_BUILD_TYPE STREQUAL Debug):
+# DESTDIR = "../debug"
+
+#### Keys ignored in scope 5:.:.:test.pro:else:
+# DESTDIR = "../release"
+
+#### Keys ignored in scope 6:.:.:test.pro:else:
+# DESTDIR = ".."
diff --git a/tests/auto/corelib/plugin/quuid/test/CMakeLists.txt b/tests/auto/corelib/plugin/quuid/test/CMakeLists.txt
new file mode 100644
index 0000000000..5707dfa5a1
--- /dev/null
+++ b/tests/auto/corelib/plugin/quuid/test/CMakeLists.txt
@@ -0,0 +1,30 @@
+# Generated from test.pro.
+
+#####################################################################
+## tst_quuid Test:
+#####################################################################
+
+add_qt_test(tst_quuid
+    OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../" # special case
+    SOURCES
+        ../tst_quuid.cpp
+)
+
+## Scopes:
+#####################################################################
+
+extend_target(tst_quuid CONDITION APPLE
+    SOURCES
+        ../tst_quuid_darwin.mm
+    PUBLIC_LIBRARIES
+        ${FWFoundation}
+)
+
+#### Keys ignored in scope 4:.:.:test.pro:(CMAKE_BUILD_TYPE STREQUAL Debug):
+# DESTDIR = "../debug"
+
+#### Keys ignored in scope 5:.:.:test.pro:else:
+# DESTDIR = "../release"
+
+#### Keys ignored in scope 6:.:.:test.pro:else:
+# DESTDIR = ".."
diff --git a/tests/auto/corelib/plugin/quuid/testProcessUniqueness/CMakeLists.txt b/tests/auto/corelib/plugin/quuid/testProcessUniqueness/CMakeLists.txt
new file mode 100644
index 0000000000..39ff85c466
--- /dev/null
+++ b/tests/auto/corelib/plugin/quuid/testProcessUniqueness/CMakeLists.txt
@@ -0,0 +1,12 @@
+# Generated from testProcessUniqueness.pro.
+
+#####################################################################
+## testProcessUniqueness Binary:
+#####################################################################
+
+add_qt_executable(testProcessUniqueness
+    INSTALL_DIRECTORY "${INSTALL_TESTSDIR}/tst_quuid/testProcessUniqueness"
+    OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
+    SOURCES
+        main.cpp
+)
diff --git a/tests/auto/corelib/serialization/CMakeLists.txt b/tests/auto/corelib/serialization/CMakeLists.txt
new file mode 100644
index 0000000000..f6af7fa256
--- /dev/null
+++ b/tests/auto/corelib/serialization/CMakeLists.txt
@@ -0,0 +1,17 @@
+# Generated from serialization.pro.
+
+add_subdirectory(json)
+add_subdirectory(qcborstreamreader)
+add_subdirectory(qcborstreamwriter)
+add_subdirectory(qcborvalue)
+add_subdirectory(qcborvalue_json)
+add_subdirectory(qdatastream_core_pixmap)
+if(TARGET Qt::Gui)
+    add_subdirectory(qdatastream)
+endif()
+if(TARGET Qt::Network)
+    add_subdirectory(qtextstream)
+endif()
+if(TARGET Qt::Network AND TARGET Qt::Xml)
+    add_subdirectory(qxmlstream)
+endif()
diff --git a/tests/auto/corelib/serialization/json/CMakeLists.txt b/tests/auto/corelib/serialization/json/CMakeLists.txt
new file mode 100644
index 0000000000..b38b6223ed
--- /dev/null
+++ b/tests/auto/corelib/serialization/json/CMakeLists.txt
@@ -0,0 +1,36 @@
+# Generated from json.pro.
+
+#####################################################################
+## tst_json Test:
+#####################################################################
+
+add_qt_test(tst_json
+    SOURCES
+        tst_qtjson.cpp
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+)
+
+## Scopes:
+#####################################################################
+
+#### Keys ignored in scope 2:.:.:json.pro:NOT ANDROID:
+# TESTDATA = "bom.json" "test.json" "test.bjson" "test3.json" "test2.json"
+
+if(ANDROID)
+    # Resources:
+    set(json_resource_files
+        "bom.json"
+        "test.bjson"
+        "test.json"
+        "test2.json"
+        "test3.json"
+    )
+
+    add_qt_resource(tst_json "json"
+        PREFIX
+            "/"
+        FILES
+            ${json_resource_files}
+    )
+endif()
diff --git a/tests/auto/corelib/serialization/json/tst_qtjson.cpp b/tests/auto/corelib/serialization/json/tst_qtjson.cpp
index 45f815f810..4c85482c6a 100644
--- a/tests/auto/corelib/serialization/json/tst_qtjson.cpp
+++ b/tests/auto/corelib/serialization/json/tst_qtjson.cpp
@@ -52,6 +52,8 @@ private Q_SLOTS:
     void testNumbers_3();
     void testNumbers_4();
 
+    void testNumberComparisons();
+
     void testObjectSimple();
     void testObjectSmallKeys();
     void testArraySimple();
@@ -218,26 +220,32 @@ void tst_QtJson::testNumbers()
     {
         int numbers[] = {
             0,
-            -1,
             1,
+            2,
+            -1,
+            -2,
+            (1<<25),
             (1<<26),
             (1<<27),
             (1<<28),
+            -(1<<25),
             -(1<<26),
             -(1<<27),
             -(1<<28),
             (1<<26) - 1,
             (1<<27) - 1,
             (1<<28) - 1,
+            (1<<29) - 1,
             -((1<<26) - 1),
             -((1<<27) - 1),
-            -((1<<28) - 1)
+            -((1<<28) - 1),
+            -((1<<29) - 1)
         };
         int n = sizeof(numbers)/sizeof(int);
 
         QJsonArray array;
         for (int i = 0; i < n; ++i)
-            array.append((double)numbers[i]);
+            array.append(numbers[i]);
 
         QByteArray serialized = QJsonDocument(array).toJson();
         QJsonDocument json = QJsonDocument::fromJson(serialized);
@@ -246,8 +254,10 @@ void tst_QtJson::testNumbers()
         QCOMPARE(array.size(), array2.size());
         for (int i = 0; i < array.size(); ++i) {
             QCOMPARE(array.at(i).type(), QJsonValue::Double);
+            QCOMPARE(array.at(i).toInt(), numbers[i]);
             QCOMPARE(array.at(i).toDouble(), (double)numbers[i]);
             QCOMPARE(array2.at(i).type(), QJsonValue::Double);
+            QCOMPARE(array2.at(i).toInt(), numbers[i]);
             QCOMPARE(array2.at(i).toDouble(), (double)numbers[i]);
         }
     }
@@ -255,8 +265,10 @@ void tst_QtJson::testNumbers()
     {
         qint64 numbers[] = {
             0,
-            -1,
             1,
+            2,
+            -1,
+            -2,
             (1ll<<54),
             (1ll<<55),
             (1ll<<56),
@@ -266,15 +278,21 @@ void tst_QtJson::testNumbers()
             (1ll<<54) - 1,
             (1ll<<55) - 1,
             (1ll<<56) - 1,
+            (1ll<<57) - 1,
+            (1ll<<58) - 1,
+            (1ll<<59) + 1001,
             -((1ll<<54) - 1),
             -((1ll<<55) - 1),
-            -((1ll<<56) - 1)
+            -((1ll<<56) - 1),
+            -((1ll<<57) - 1),
+            -((1ll<<58) - 1),
+            -((1ll<<59) + 1001),
         };
         int n = sizeof(numbers)/sizeof(qint64);
 
         QJsonArray array;
         for (int i = 0; i < n; ++i)
-            array.append((double)numbers[i]);
+            array.append(QJsonValue(numbers[i]));
 
         QByteArray serialized = QJsonDocument(array).toJson();
         QJsonDocument json = QJsonDocument::fromJson(serialized);
@@ -283,8 +301,10 @@ void tst_QtJson::testNumbers()
         QCOMPARE(array.size(), array2.size());
         for (int i = 0; i < array.size(); ++i) {
             QCOMPARE(array.at(i).type(), QJsonValue::Double);
+            QCOMPARE(array.at(i).toInteger(), numbers[i]);
             QCOMPARE(array.at(i).toDouble(), (double)numbers[i]);
             QCOMPARE(array2.at(i).type(), QJsonValue::Double);
+            QCOMPARE(array2.at(i).toInteger(), numbers[i]);
             QCOMPARE(array2.at(i).toDouble(), (double)numbers[i]);
         }
     }
@@ -422,6 +442,46 @@ void tst_QtJson::testNumbers_4()
             "    -18446744073709552000\n"
             "]\n";
     QCOMPARE(json, expected);
+
+    QJsonArray array2;
+    array2 << QJsonValue(Q_INT64_C(+1000000000000000));
+    array2 << QJsonValue(Q_INT64_C(-1000000000000000));
+    array2 << QJsonValue(Q_INT64_C(+9007199254740992));
+    array2 << QJsonValue(Q_INT64_C(-9007199254740992));
+    array2 << QJsonValue(Q_INT64_C(+9223372036854775807));
+    array2 << QJsonValue(Q_INT64_C(-9223372036854775807));
+    const QByteArray json2(QJsonDocument(array2).toJson());
+    const QByteArray expected2 =
+            "[\n"
+            "    1000000000000000,\n"
+            "    -1000000000000000,\n"
+            "    9007199254740992,\n"
+            "    -9007199254740992,\n"
+            "    9223372036854775807,\n"
+            "    -9223372036854775807\n"
+            "]\n";
+    QCOMPARE(json2, expected2);
+}
+
+void tst_QtJson::testNumberComparisons()
+{
+    // QJsonValues created using doubles only have double precision
+    QJsonValue llMinDbl(-9223372036854775807.0);
+    QJsonValue llMinPlus1Dbl(-9223372036854775806.0);
+    QCOMPARE(llMinDbl == llMinPlus1Dbl, -9223372036854775807.0 == -9223372036854775806.0); // true
+
+    // QJsonValues created using qint64 have full qint64 precision
+    QJsonValue llMin(Q_INT64_C(-9223372036854775807));
+    QJsonValue llMinPlus1(Q_INT64_C(-9223372036854775806));
+    QCOMPARE(llMin == llMinPlus1, Q_INT64_C(-9223372036854775807) == Q_INT64_C(-9223372036854775806)); // false
+
+    // The different storage formats should be able to compare as their C++ versions (all true)
+    QCOMPARE(llMin == llMinDbl, Q_INT64_C(-9223372036854775807) == -9223372036854775807.0);
+    QCOMPARE(llMinDbl == llMin, -9223372036854775807.0 == Q_INT64_C(-9223372036854775807));
+    QCOMPARE(llMinPlus1 == llMinPlus1Dbl, Q_INT64_C(-9223372036854775806) == -9223372036854775806.0);
+    QCOMPARE(llMinPlus1Dbl == llMinPlus1, -9223372036854775806.0 == Q_INT64_C(-9223372036854775806));
+    QCOMPARE(llMinPlus1 == llMinDbl, Q_INT64_C(-9223372036854775806) == -9223372036854775807.0);
+    QCOMPARE(llMinPlus1Dbl == llMin, -9223372036854775806.0 == Q_INT64_C(-9223372036854775807));
 }
 
 void tst_QtJson::testObjectSimple()
@@ -1162,8 +1222,8 @@ void tst_QtJson::fromVariant_data()
     bool boolValue = true;
     int intValue = -1;
     uint uintValue = 1;
-    long long longlongValue = -2;
-    unsigned long long ulonglongValue = 2;
+    qlonglong longlongValue = -2;
+    qulonglong ulonglongValue = 2;
     float floatValue = 3.3f;
     double doubleValue = 4.4;
     QString stringValue("str");
@@ -1209,7 +1269,7 @@ void tst_QtJson::fromVariant_data()
     QTest::newRow("nullptr") << QVariant::fromValue(nullptr) <<  QJsonValue(QJsonValue::Null);
     QTest::newRow("bool") << QVariant(boolValue) <<  QJsonValue(boolValue);
     QTest::newRow("int") << QVariant(intValue) <<  QJsonValue(intValue);
-    QTest::newRow("uint") << QVariant(uintValue) <<  QJsonValue(static_cast<double>(uintValue));
+    QTest::newRow("uint") << QVariant(uintValue) <<  QJsonValue(static_cast<qint64>(uintValue));
     QTest::newRow("longlong") << QVariant(longlongValue) <<  QJsonValue(longlongValue);
     QTest::newRow("ulonglong") << QVariant(ulonglongValue) <<  QJsonValue(static_cast<double>(ulonglongValue));
     QTest::newRow("float") << QVariant(floatValue) <<  QJsonValue(floatValue);
diff --git a/tests/auto/corelib/serialization/qcborstreamreader/CMakeLists.txt b/tests/auto/corelib/serialization/qcborstreamreader/CMakeLists.txt
new file mode 100644
index 0000000000..198cca8435
--- /dev/null
+++ b/tests/auto/corelib/serialization/qcborstreamreader/CMakeLists.txt
@@ -0,0 +1,15 @@
+# Generated from qcborstreamreader.pro.
+
+#####################################################################
+## tst_qcborstreamreader Test:
+#####################################################################
+
+add_qt_test(tst_qcborstreamreader
+    SOURCES
+        tst_qcborstreamreader.cpp
+    DEFINES
+        SRCDIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/\\\"
+    INCLUDE_DIRECTORIES
+        ../../../../../src/3rdparty/tinycbor/src
+        ../../../../../src/3rdparty/tinycbor/tests/parser
+)
diff --git a/tests/auto/corelib/serialization/qcborstreamwriter/CMakeLists.txt b/tests/auto/corelib/serialization/qcborstreamwriter/CMakeLists.txt
new file mode 100644
index 0000000000..9265df415e
--- /dev/null
+++ b/tests/auto/corelib/serialization/qcborstreamwriter/CMakeLists.txt
@@ -0,0 +1,14 @@
+# Generated from qcborstreamwriter.pro.
+
+#####################################################################
+## tst_qcborstreamwriter Test:
+#####################################################################
+
+add_qt_test(tst_qcborstreamwriter
+    SOURCES
+        tst_qcborstreamwriter.cpp
+    DEFINES
+        SRCDIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/\\\"
+    INCLUDE_DIRECTORIES
+        ../../../../../src/3rdparty/tinycbor/tests/encoder
+)
diff --git a/tests/auto/corelib/serialization/qcborvalue/CMakeLists.txt b/tests/auto/corelib/serialization/qcborvalue/CMakeLists.txt
new file mode 100644
index 0000000000..66cb80c56a
--- /dev/null
+++ b/tests/auto/corelib/serialization/qcborvalue/CMakeLists.txt
@@ -0,0 +1,15 @@
+# Generated from qcborvalue.pro.
+
+#####################################################################
+## tst_qcborvalue Test:
+#####################################################################
+
+add_qt_test(tst_qcborvalue
+    SOURCES
+        tst_qcborvalue.cpp
+    DEFINES
+        SRCDIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/\\\"
+    INCLUDE_DIRECTORIES
+        ../../../../../src/3rdparty/tinycbor/src
+        ../../../../../src/3rdparty/tinycbor/tests/parser
+)
diff --git a/tests/auto/corelib/serialization/qcborvalue_json/CMakeLists.txt b/tests/auto/corelib/serialization/qcborvalue_json/CMakeLists.txt
new file mode 100644
index 0000000000..0346d2d0e0
--- /dev/null
+++ b/tests/auto/corelib/serialization/qcborvalue_json/CMakeLists.txt
@@ -0,0 +1,12 @@
+# Generated from qcborvalue_json.pro.
+
+#####################################################################
+## tst_qcborvalue_json Test:
+#####################################################################
+
+add_qt_test(tst_qcborvalue_json
+    SOURCES
+        tst_qcborvalue_json.cpp
+    DEFINES
+        SRCDIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/\\\"
+)
diff --git a/tests/auto/corelib/serialization/qcborvalue_json/tst_qcborvalue_json.cpp b/tests/auto/corelib/serialization/qcborvalue_json/tst_qcborvalue_json.cpp
index 56245a7173..76f2bb924a 100644
--- a/tests/auto/corelib/serialization/qcborvalue_json/tst_qcborvalue_json.cpp
+++ b/tests/auto/corelib/serialization/qcborvalue_json/tst_qcborvalue_json.cpp
@@ -97,9 +97,12 @@ void tst_QCborValue_Json::toVariant_data()
     add(1, 1, 1);
     add(-1, -1, -1);
     add(0., 0., 0.);
+    add(2., 2., 2.);
     add(1.25, 1.25, 1.25);
     add(-1.25, -1.25, -1.25);
     add("Hello", "Hello", "Hello");
+    add(std::numeric_limits<qint64>::max(), std::numeric_limits<qint64>::max(), std::numeric_limits<qint64>::max());
+    add(std::numeric_limits<qint64>::min(), std::numeric_limits<qint64>::min(), std::numeric_limits<qint64>::min());
 
     // converts to string in JSON:
     add(QByteArray("Hello"), QByteArray("Hello"), "SGVsbG8");
@@ -123,14 +126,6 @@ void tst_QCborValue_Json::toVariant_data()
                                 << QVariant(qQNaN())
                                 << QJsonValue();
 
-    // large integral values lose precision in JSON
-    QTest::newRow("Integer:max") << QCborValue(std::numeric_limits<qint64>::max())
-                                 << QVariant(std::numeric_limits<qint64>::max())
-                                 << QJsonValue(std::numeric_limits<qint64>::max());
-    QTest::newRow("Integer:min") << QCborValue(std::numeric_limits<qint64>::min())
-                                 << QVariant(std::numeric_limits<qint64>::min())
-                                 << QJsonValue(std::numeric_limits<qint64>::min());
-
     // empty arrays and maps
     add(QCborArray(), QVariantList(), QJsonArray());
     add(QCborMap(), QVariantMap(), QJsonObject());
@@ -257,6 +252,10 @@ void tst_QCborValue_Json::fromJson_data()
     QTest::newRow("0") << QCborValue(0) << QJsonValue(0.);
     QTest::newRow("1") << QCborValue(1) << QJsonValue(1);
     QTest::newRow("1.5") << QCborValue(1.5) << QJsonValue(1.5);
+    QTest::newRow("Integer:max") << QCborValue(std::numeric_limits<qint64>::max())
+                                 << QJsonValue(std::numeric_limits<qint64>::max());
+    QTest::newRow("Integer:min") << QCborValue(std::numeric_limits<qint64>::min())
+                                 << QJsonValue(std::numeric_limits<qint64>::min());
     QTest::newRow("string") << QCborValue("Hello") << QJsonValue("Hello");
     QTest::newRow("array") << QCborValue(QCborValue::Array) << QJsonValue(QJsonValue::Array);
     QTest::newRow("map") << QCborValue(QCborValue::Map) << QJsonValue(QJsonValue::Object);
diff --git a/tests/auto/corelib/serialization/qdatastream/.prev_CMakeLists.txt b/tests/auto/corelib/serialization/qdatastream/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..1402aed9ab
--- /dev/null
+++ b/tests/auto/corelib/serialization/qdatastream/.prev_CMakeLists.txt
@@ -0,0 +1,35 @@
+# Generated from qdatastream.pro.
+
+#####################################################################
+## tst_qdatastream Test:
+#####################################################################
+
+# Collect test data
+list(APPEND test_data "datastream.q42")
+
+add_qt_test(tst_qdatastream
+    SOURCES
+        tst_qdatastream.cpp
+    DEFINES
+        -QT_NO_LINKED_LIST
+    PUBLIC_LIBRARIES
+        Qt::Gui
+    TESTDATA ${test_data}
+)
+
+## Scopes:
+#####################################################################
+
+if(ANDROID AND NOT ANDROID_EMBEDDED)
+    # Resources:
+    set(testdata_resource_files
+        "datastream.q42"
+    )
+
+    add_qt_resource(tst_qdatastream "testdata"
+        PREFIX
+            "/"
+        FILES
+            ${testdata_resource_files}
+    )
+endif()
diff --git a/tests/auto/corelib/serialization/qdatastream/CMakeLists.txt b/tests/auto/corelib/serialization/qdatastream/CMakeLists.txt
new file mode 100644
index 0000000000..2bb2e842e8
--- /dev/null
+++ b/tests/auto/corelib/serialization/qdatastream/CMakeLists.txt
@@ -0,0 +1,35 @@
+# Generated from qdatastream.pro.
+
+#####################################################################
+## tst_qdatastream Test:
+#####################################################################
+
+# Collect test data
+list(APPEND test_data "datastream.q42")
+
+add_qt_test(tst_qdatastream
+    SOURCES
+        tst_qdatastream.cpp
+    DEFINES
+        # -QT_NO_LINKED_LIST # special case remove
+    PUBLIC_LIBRARIES
+        Qt::Gui
+    TESTDATA ${test_data}
+)
+
+## Scopes:
+#####################################################################
+
+if(ANDROID AND NOT ANDROID_EMBEDDED)
+    # Resources:
+    set(testdata_resource_files
+        "datastream.q42"
+    )
+
+    add_qt_resource(tst_qdatastream "testdata"
+        PREFIX
+            "/"
+        FILES
+            ${testdata_resource_files}
+    )
+endif()
diff --git a/tests/auto/corelib/serialization/qdatastream/qdatastream.pro b/tests/auto/corelib/serialization/qdatastream/qdatastream.pro
index 469d689f3f..25f8b889a0 100644
--- a/tests/auto/corelib/serialization/qdatastream/qdatastream.pro
+++ b/tests/auto/corelib/serialization/qdatastream/qdatastream.pro
@@ -3,8 +3,6 @@ TARGET = tst_qdatastream
 QT += testlib
 SOURCES = tst_qdatastream.cpp
 
-DEFINES -= QT_NO_LINKED_LIST
-
 TESTDATA += datastream.q42
 
 android:!android-embedded {
diff --git a/tests/auto/corelib/serialization/qdatastream/tst_qdatastream.cpp b/tests/auto/corelib/serialization/qdatastream/tst_qdatastream.cpp
index aed84cb14e..5fc4343cd9 100644
--- a/tests/auto/corelib/serialization/qdatastream/tst_qdatastream.cpp
+++ b/tests/auto/corelib/serialization/qdatastream/tst_qdatastream.cpp
@@ -121,9 +121,15 @@ private slots:
     void stream_Map_data();
     void stream_Map();
 
+    void stream_MultiMap_data();
+    void stream_MultiMap();
+
     void stream_Hash_data();
     void stream_Hash();
 
+    void stream_MultiHash_data();
+    void stream_MultiHash();
+
     void stream_qint64_data();
     void stream_qint64();
 
@@ -180,7 +186,7 @@ private slots:
 
     void status_QHash_QMap();
 
-    void status_QLinkedList_QList_QVector();
+    void status_QList_QVector();
 
     void streamToAndFromQByteArray();
 
@@ -230,7 +236,9 @@ private:
     void writeQRegularExpression(QDataStream *dev);
 #endif
     void writeMap(QDataStream* dev);
+    void writeMultiMap(QDataStream* dev);
     void writeHash(QDataStream* dev);
+    void writeMultiHash(QDataStream* dev);
     void writeqint64(QDataStream *s);
     void writeQIcon(QDataStream *s);
     void writeQEasingCurve(QDataStream *s);
@@ -262,7 +270,9 @@ private:
     void readQRegularExpression(QDataStream *s);
 #endif
     void readMap(QDataStream *s);
+    void readMultiMap(QDataStream *s);
     void readHash(QDataStream *s);
+    void readMultiHash(QDataStream *s);
     void readqint64(QDataStream *s);
     void readQIcon(QDataStream *s);
     void readQEasingCurve(QDataStream *s);
@@ -292,7 +302,8 @@ static int NColorRoles[] = {
     QPalette::ToolTipText + 1,     // Qt_5_4, Qt_5_5
     QPalette::ToolTipText + 1,     // Qt_5_6, Qt_5_7, Qt_5_8, Qt_5_9, Qt_5_10, Qt_5_11
     QPalette::PlaceholderText + 1, // Qt_5_12
-    QPalette::PlaceholderText + 1, // Qt_5_13
+    QPalette::PlaceholderText + 1, // Qt_5_13, Qt_5_14, Qt_5_15
+    QPalette::PlaceholderText + 1, // Qt_6_0
     0                              // add the correct value for Qt_5_14 here later
 };
 
@@ -650,16 +661,10 @@ static Map MapData(int index)
         map.insert(2, "bbb");
         map.insert(3, "cccccc");
         break;
-    case 2:
-        map.insert(1, "a");
-        map.insert(2, "one");
-        map.insertMulti(2, "two");
-        map.insertMulti(2, "three");
-        map.insert(3, "cccccc");
     }
     return map;
 }
-#define MAX_MAP_DATA 3
+#define MAX_MAP_DATA 2
 
 void tst_QDataStream::stream_Map_data()
 {
@@ -689,6 +694,60 @@ void tst_QDataStream::readMap(QDataStream *s)
     QCOMPARE(S, test);
 }
 
+typedef QMultiMap<int, QString> MultiMap;
+
+static MultiMap MultiMapData(int index)
+{
+    MultiMap map;
+
+    switch (index) {
+    case 0:
+    default:
+        break;
+    case 1:
+        map.insert(1, "a");
+        map.insert(2, "bbb");
+        map.insert(3, "cccccc");
+        break;
+    case 2:
+        map.insert(1, "a");
+        map.insert(2, "one");
+        map.insert(2, "two");
+        map.insert(2, "three");
+        map.insert(3, "cccccc");
+    }
+    return map;
+}
+#define MAX_MULTIMAP_DATA 3
+
+void tst_QDataStream::stream_MultiMap_data()
+{
+    stream_data(MAX_MULTIMAP_DATA);
+}
+
+void tst_QDataStream::stream_MultiMap()
+{
+    STREAM_IMPL(MultiMap);
+}
+
+void tst_QDataStream::writeMultiMap(QDataStream* s)
+{
+    MultiMap test(MultiMapData(dataIndex(QTest::currentDataTag())));
+    *s << test;
+    *s << test;
+}
+
+void tst_QDataStream::readMultiMap(QDataStream *s)
+{
+    MultiMap S;
+    MultiMap test(MultiMapData(dataIndex(QTest::currentDataTag())));
+
+    *s >> S;
+    QCOMPARE(S, test);
+    *s >> S;
+    QCOMPARE(S, test);
+}
+
 // ************************************
 
 typedef QHash<int, QString> Hash;
@@ -706,16 +765,10 @@ static Hash HashData(int index)
         map.insert(2, "bbb");
         map.insert(3, "cccccc");
         break;
-    case 2:
-        map.insert(1, "a");
-        map.insert(2, "one");
-        map.insertMulti(2, "two");
-        map.insertMulti(2, "three");
-        map.insert(3, "cccccc");
     }
     return map;
 }
-#define MAX_HASH_DATA 3
+#define MAX_HASH_DATA 2
 
 void tst_QDataStream::stream_Hash_data()
 {
@@ -745,6 +798,60 @@ void tst_QDataStream::readHash(QDataStream *s)
     QCOMPARE(S, test);
 }
 
+typedef QMultiHash<int, QString> MultiHash;
+
+static MultiHash MultiHashData(int index)
+{
+    MultiHash map;
+
+    switch (index) {
+    case 0:
+    default:
+        break;
+    case 1:
+        map.insert(1, "a");
+        map.insert(2, "bbb");
+        map.insert(3, "cccccc");
+        break;
+    case 2:
+        map.insert(1, "a");
+        map.insert(2, "one");
+        map.insert(2, "two");
+        map.insert(2, "three");
+        map.insert(3, "cccccc");
+    }
+    return map;
+}
+#define MAX_MULTIHASH_DATA 3
+
+void tst_QDataStream::stream_MultiHash_data()
+{
+    stream_data(MAX_HASH_DATA);
+}
+
+void tst_QDataStream::stream_MultiHash()
+{
+    STREAM_IMPL(MultiHash);
+}
+
+void tst_QDataStream::writeMultiHash(QDataStream* s)
+{
+    MultiHash test(MultiHashData(dataIndex(QTest::currentDataTag())));
+    *s << test;
+    *s << test;
+}
+
+void tst_QDataStream::readMultiHash(QDataStream *s)
+{
+    MultiHash S;
+    MultiHash test(MultiHashData(dataIndex(QTest::currentDataTag())));
+
+    *s >> S;
+    QCOMPARE(S, test);
+    *s >> S;
+    QCOMPARE(S, test);
+}
+
 // ************************************
 
 static QEasingCurve QEasingCurveData(int index)
@@ -2327,6 +2434,7 @@ void tst_QDataStream::setVersion()
     QDataStream latest;
     QFETCH(int, vers);
 
+#if QT_CONFIG(shortcut)
     /*
         Test QKeySequence.
     */
@@ -2351,6 +2459,7 @@ void tst_QDataStream::setVersion()
         }
         QCOMPARE(deadbeef, 0xDEADBEEF);
     }
+#endif // QT_CONFIG(shortcut)
 
     /*
         Test QPalette.
@@ -3064,24 +3173,6 @@ void tst_QDataStream::status_QHash_QMap()
             } \
         } \
         { \
-            LinkedList expectedLinkedList; \
-            for (int i = 0; i < expectedList.count(); ++i) \
-                expectedLinkedList << expectedList.at(i); \
-            QByteArray ba = byteArray; \
-            QDataStream stream(&ba, QIODevice::ReadOnly); \
-            if (inTransaction) \
-                stream.startTransaction(); \
-            stream.setStatus(initialStatus); \
-            stream >> linkedList; \
-            QCOMPARE((int)stream.status(), (int)expectedStatus); \
-            if (!inTransaction || stream.commitTransaction()) { \
-                QCOMPARE(linkedList.size(), expectedLinkedList.size()); \
-                QCOMPARE(linkedList, expectedLinkedList); \
-            } else { \
-                QVERIFY(linkedList.isEmpty()); \
-            } \
-        } \
-        { \
             Vector expectedVector; \
             for (int i = 0; i < expectedList.count(); ++i) \
                 expectedVector << expectedList.at(i); \
@@ -3103,12 +3194,10 @@ void tst_QDataStream::status_QHash_QMap()
             break; \
     }
 
-void tst_QDataStream::status_QLinkedList_QList_QVector()
+void tst_QDataStream::status_QList_QVector()
 {
-    typedef QLinkedList<QString> LinkedList;
     typedef QList<QString> List;
     typedef QVector<QString> Vector;
-    LinkedList linkedList;
     List list;
     Vector vector;
 
@@ -3209,7 +3298,7 @@ void tst_QDataStream::streamRealDataTypes()
             stream.setVersion(QDataStream::Qt_4_2);
             stream << qreal(0) << qreal(1.0) << qreal(1.1) << qreal(3.14) << qreal(-3.14) << qreal(-1);
             stream << QPointF(3, 5) << QRectF(-1, -2, 3, 4) << (QPolygonF() << QPointF(0, 0) << QPointF(1, 2));
-            stream << QMatrix().rotate(90).scale(2, 2);
+            stream << QTransform().rotate(90).scale(2, 2).asAffineMatrix();
             stream << path;
             stream << picture;
             stream << QTextLength(QTextLength::VariableLength, 1.5);
@@ -3223,7 +3312,7 @@ void tst_QDataStream::streamRealDataTypes()
         QPointF point;
         QRectF rect;
         QPolygonF polygon;
-        QMatrix matrix;
+        QTransform transform;
         QPainterPath p;
         QPicture pict;
         QTextLength textLength;
@@ -3273,8 +3362,9 @@ void tst_QDataStream::streamRealDataTypes()
         QCOMPARE(rect, QRectF(-1, -2, 3, 4));
         stream >> polygon;
         QCOMPARE((QVector<QPointF> &)polygon, (QPolygonF() << QPointF(0, 0) << QPointF(1, 2)));
+        auto matrix = transform.asAffineMatrix();
         stream >> matrix;
-        QCOMPARE(matrix, QMatrix().rotate(90).scale(2, 2));
+        QCOMPARE(transform, QTransform().rotate(90).scale(2, 2));
         stream >> p;
         QCOMPARE(p, path);
         if (i == 1) {
@@ -3296,10 +3386,7 @@ void tst_QDataStream::streamRealDataTypes()
         QCOMPARE(col, color);
         stream >> rGrad;
         QCOMPARE(rGrad.style(), radialBrush.style());
-QT_WARNING_PUSH
-QT_WARNING_DISABLE_DEPRECATED
-        QCOMPARE(rGrad.matrix(), radialBrush.matrix());
-QT_WARNING_POP
+        QCOMPARE(rGrad.transform(), radialBrush.transform());
         QCOMPARE(rGrad.gradient()->type(), radialBrush.gradient()->type());
         QCOMPARE(rGrad.gradient()->stops(), radialBrush.gradient()->stops());
         QCOMPARE(rGrad.gradient()->spread(), radialBrush.gradient()->spread());
@@ -3308,10 +3395,7 @@ QT_WARNING_POP
         QCOMPARE(((QRadialGradient *)rGrad.gradient())->radius(), ((QRadialGradient *)radialBrush.gradient())->radius());
         stream >> cGrad;
         QCOMPARE(cGrad.style(), conicalBrush.style());
-QT_WARNING_PUSH
-QT_WARNING_DISABLE_DEPRECATED
-        QCOMPARE(cGrad.matrix(), conicalBrush.matrix());
-QT_WARNING_POP
+        QCOMPARE(cGrad.transform(), conicalBrush.transform());
         QCOMPARE(cGrad.gradient()->type(), conicalBrush.gradient()->type());
         QCOMPARE(cGrad.gradient()->stops(), conicalBrush.gradient()->stops());
         QCOMPARE(cGrad.gradient()->spread(), conicalBrush.gradient()->spread());
diff --git a/tests/auto/corelib/serialization/qdatastream_core_pixmap/CMakeLists.txt b/tests/auto/corelib/serialization/qdatastream_core_pixmap/CMakeLists.txt
new file mode 100644
index 0000000000..55e8c164e5
--- /dev/null
+++ b/tests/auto/corelib/serialization/qdatastream_core_pixmap/CMakeLists.txt
@@ -0,0 +1,12 @@
+# Generated from qdatastream_core_pixmap.pro.
+
+#####################################################################
+## tst_qdatastream_core_pixmap Test:
+#####################################################################
+
+add_qt_test(tst_qdatastream_core_pixmap
+    SOURCES
+        tst_qdatastream_core_pixmap.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+)
diff --git a/tests/auto/corelib/serialization/qtextstream/CMakeLists.txt b/tests/auto/corelib/serialization/qtextstream/CMakeLists.txt
new file mode 100644
index 0000000000..15798c963f
--- /dev/null
+++ b/tests/auto/corelib/serialization/qtextstream/CMakeLists.txt
@@ -0,0 +1,6 @@
+# Generated from qtextstream.pro.
+
+add_subdirectory(test)
+add_subdirectory(stdinProcess)
+add_subdirectory(readAllStdinProcess)
+add_subdirectory(readLineStdinProcess)
diff --git a/tests/auto/corelib/serialization/qtextstream/readAllStdinProcess/CMakeLists.txt b/tests/auto/corelib/serialization/qtextstream/readAllStdinProcess/CMakeLists.txt
new file mode 100644
index 0000000000..f377c97c2d
--- /dev/null
+++ b/tests/auto/corelib/serialization/qtextstream/readAllStdinProcess/CMakeLists.txt
@@ -0,0 +1,12 @@
+# Generated from readAllStdinProcess.pro.
+
+#####################################################################
+## readAllStdinProcess Binary:
+#####################################################################
+
+add_qt_executable(readAllStdinProcess
+    INSTALL_DIRECTORY "${INSTALL_TESTSDIR}/tst_qtextstream/readAllStdinProcess"
+    OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
+    SOURCES
+        main.cpp
+)
diff --git a/tests/auto/corelib/serialization/qtextstream/readLineStdinProcess/CMakeLists.txt b/tests/auto/corelib/serialization/qtextstream/readLineStdinProcess/CMakeLists.txt
new file mode 100644
index 0000000000..ae899e55df
--- /dev/null
+++ b/tests/auto/corelib/serialization/qtextstream/readLineStdinProcess/CMakeLists.txt
@@ -0,0 +1,12 @@
+# Generated from readLineStdinProcess.pro.
+
+#####################################################################
+## readLineStdinProcess Binary:
+#####################################################################
+
+add_qt_executable(readLineStdinProcess
+    INSTALL_DIRECTORY "${INSTALL_TESTSDIR}/tst_qtextstream/readLineStdinProcess"
+    OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
+    SOURCES
+        main.cpp
+)
diff --git a/tests/auto/corelib/serialization/qtextstream/stdinProcess/CMakeLists.txt b/tests/auto/corelib/serialization/qtextstream/stdinProcess/CMakeLists.txt
new file mode 100644
index 0000000000..fed74b64c2
--- /dev/null
+++ b/tests/auto/corelib/serialization/qtextstream/stdinProcess/CMakeLists.txt
@@ -0,0 +1,12 @@
+# Generated from stdinProcess.pro.
+
+#####################################################################
+## stdinProcess Binary:
+#####################################################################
+
+add_qt_executable(stdinProcess
+    INSTALL_DIRECTORY "${INSTALL_TESTSDIR}/tst_qtextstream/stdinProcess"
+    OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
+    SOURCES
+        main.cpp
+)
diff --git a/tests/auto/corelib/serialization/qtextstream/test/CMakeLists.txt b/tests/auto/corelib/serialization/qtextstream/test/CMakeLists.txt
new file mode 100644
index 0000000000..21ba0d47fb
--- /dev/null
+++ b/tests/auto/corelib/serialization/qtextstream/test/CMakeLists.txt
@@ -0,0 +1,56 @@
+# Generated from test.pro.
+
+#####################################################################
+## tst_qtextstream Test:
+#####################################################################
+
+# Collect test data
+list(APPEND test_data "../rfc3261.txt")
+list(APPEND test_data "../shift-jis.txt")
+list(APPEND test_data "../task113817.txt")
+list(APPEND test_data "../qtextstream.qrc")
+list(APPEND test_data "../tst_qtextstream.cpp")
+list(APPEND test_data "../resources")
+list(APPEND test_data "../BLACKLIST")
+
+add_qt_test(tst_qtextstream
+    OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../"
+    SOURCES
+        ../../../../../shared/emulationdetector.h
+        ../tst_qtextstream.cpp
+    INCLUDE_DIRECTORIES
+        ../../../../../shared
+    PUBLIC_LIBRARIES
+        Qt::Network
+    TESTDATA ${test_data}
+)
+
+# Resources:
+set_source_files_properties("../resources/big_endian/"
+    PROPERTIES QT_RESOURCE_ALIAS "resources/big_endian/"
+)
+set_source_files_properties("../resources/little_endian/"
+    PROPERTIES QT_RESOURCE_ALIAS "resources/little_endian/"
+)
+set(qtextstream_resource_files
+    "resources/big_endian/"
+    "resources/little_endian/"
+)
+
+add_qt_resource(tst_qtextstream "qtextstream"
+    PREFIX
+        "/tst_textstream/"
+    BASE
+        ".."
+    FILES
+        ${qtextstream_resource_files}
+)
+
+
+## Scopes:
+#####################################################################
+
+extend_target(tst_qtextstream CONDITION builtin_testdata
+    DEFINES
+        BUILTIN_TESTDATA
+)
diff --git a/tests/auto/corelib/serialization/qtextstream/tst_qtextstream.cpp b/tests/auto/corelib/serialization/qtextstream/tst_qtextstream.cpp
index 6381ce5ed0..6565924f58 100644
--- a/tests/auto/corelib/serialization/qtextstream/tst_qtextstream.cpp
+++ b/tests/auto/corelib/serialization/qtextstream/tst_qtextstream.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2020 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the test suite of the Qt Toolkit.
@@ -2449,8 +2449,8 @@ void tst_QTextStream::generateRealNumbersDataWrite()
     QTest::newRow("0") << 0.0 << QByteArray("0") << QByteArray("0");
     QTest::newRow("3.14") << 3.14 << QByteArray("3.14") << QByteArray("3.14");
     QTest::newRow("-3.14") << -3.14 << QByteArray("-3.14") << QByteArray("-3.14");
-    QTest::newRow("1.2e+10") << 1.2e+10 << QByteArray("1.2e+10") << QByteArray("1.2e+10");
-    QTest::newRow("-1.2e+10") << -1.2e+10 << QByteArray("-1.2e+10") << QByteArray("-1.2e+10");
+    QTest::newRow("1.2e+10") << 1.2e+10 << QByteArray("1.2e+10") << QByteArray("1.2E+10");
+    QTest::newRow("-1.2e+10") << -1.2e+10 << QByteArray("-1.2e+10") << QByteArray("-1.2E+10");
     QTest::newRow("12345") << 12345. << QByteArray("12345") << QByteArray("12,345");
 }
 
diff --git a/tests/auto/corelib/serialization/qxmlstream/CMakeLists.txt b/tests/auto/corelib/serialization/qxmlstream/CMakeLists.txt
new file mode 100644
index 0000000000..0339b57c71
--- /dev/null
+++ b/tests/auto/corelib/serialization/qxmlstream/CMakeLists.txt
@@ -0,0 +1,18 @@
+# Generated from qxmlstream.pro.
+
+#####################################################################
+## tst_qxmlstream Test:
+#####################################################################
+
+# Collect test data
+list(APPEND test_data "data")
+list(APPEND test_data "XML-Test-Suite")
+
+add_qt_test(tst_qxmlstream
+    SOURCES
+        tst_qxmlstream.cpp
+    PUBLIC_LIBRARIES
+        Qt::Network
+        Qt::Xml
+    TESTDATA ${test_data}
+)
diff --git a/tests/auto/corelib/statemachine/CMakeLists.txt b/tests/auto/corelib/statemachine/CMakeLists.txt
new file mode 100644
index 0000000000..52c956cd03
--- /dev/null
+++ b/tests/auto/corelib/statemachine/CMakeLists.txt
@@ -0,0 +1,2 @@
+add_subdirectory(qstate)
+
diff --git a/tests/auto/corelib/statemachine/qstate/CMakeLists.txt b/tests/auto/corelib/statemachine/qstate/CMakeLists.txt
new file mode 100644
index 0000000000..e269f7191a
--- /dev/null
+++ b/tests/auto/corelib/statemachine/qstate/CMakeLists.txt
@@ -0,0 +1,10 @@
+# Generated from qstate.pro.
+
+#####################################################################
+## tst_qstate Test:
+#####################################################################
+
+add_qt_test(tst_qstate
+    SOURCES
+        tst_qstate.cpp
+)
diff --git a/tests/auto/corelib/text/CMakeLists.txt b/tests/auto/corelib/text/CMakeLists.txt
new file mode 100644
index 0000000000..dd51385aa6
--- /dev/null
+++ b/tests/auto/corelib/text/CMakeLists.txt
@@ -0,0 +1,22 @@
+# Generated from text.pro.
+
+# add_subdirectory(qbytearray) # special case not ported
+add_subdirectory(qbytearraylist)
+# add_subdirectory(qbytearraymatcher) # special case not ported
+add_subdirectory(qbytedatabuffer)
+# add_subdirectory(qchar) # special case not ported
+# add_subdirectory(qcollator) # special case not ported
+# add_subdirectory(qlatin1string) # special case not ported
+# add_subdirectory(qlocale) # special case not ported
+add_subdirectory(qregexp)
+add_subdirectory(qregularexpression)
+# add_subdirectory(qstring) # special case not ported
+add_subdirectory(qstring_no_cast_from_bytearray)
+# add_subdirectory(qstringapisymmetry) # special case not ported
+# add_subdirectory(qstringbuilder) # special case not ported
+add_subdirectory(qstringiterator)
+add_subdirectory(qstringlist)
+add_subdirectory(qstringmatcher)
+add_subdirectory(qstringref)
+# add_subdirectory(qstringview) # special case not ported
+# add_subdirectory(qtextboundaryfinder) # special case not ported
diff --git a/tests/auto/corelib/text/qbytearray/tst_qbytearray.cpp b/tests/auto/corelib/text/qbytearray/tst_qbytearray.cpp
index 48dd7a241e..e3009a78fb 100644
--- a/tests/auto/corelib/text/qbytearray/tst_qbytearray.cpp
+++ b/tests/auto/corelib/text/qbytearray/tst_qbytearray.cpp
@@ -149,36 +149,17 @@ private slots:
     void stdString();
 };
 
-static const struct StaticByteArrays {
-    struct Standard {
-        QByteArrayData data;
-        const char string[8];
-    } standard;
-    struct NotNullTerminated {
-        QByteArrayData data;
-        const char string[8];
-    } notNullTerminated;
-    struct Shifted {
-        QByteArrayData data;
-        const char dummy;  // added to change offset of string
-        const char string[8];
-    } shifted;
-    struct ShiftedNotNullTerminated {
-        QByteArrayData data;
-        const char dummy;  // added to change offset of string
-        const char string[8];
-    } shiftedNotNullTerminated;
-
-} statics = {{Q_STATIC_BYTE_ARRAY_DATA_HEADER_INITIALIZER(4), "data"}
-             ,{Q_STATIC_BYTE_ARRAY_DATA_HEADER_INITIALIZER(4), "dataBAD"}
-             ,{Q_STATIC_BYTE_ARRAY_DATA_HEADER_INITIALIZER_WITH_OFFSET(4, sizeof(QByteArrayData) + sizeof(char)), 0, "data"}
-             ,{Q_STATIC_BYTE_ARRAY_DATA_HEADER_INITIALIZER_WITH_OFFSET(4, sizeof(QByteArrayData) + sizeof(char)), 0, "dataBAD"}
-            };
-
-static const QByteArrayDataPtr staticStandard = { const_cast<QByteArrayData *>(&statics.standard.data) };
-static const QByteArrayDataPtr staticNotNullTerminated = { const_cast<QByteArrayData *>(&statics.notNullTerminated.data) };
-static const QByteArrayDataPtr staticShifted = { const_cast<QByteArrayData *>(&statics.shifted.data) };
-static const QByteArrayDataPtr staticShiftedNotNullTerminated = { const_cast<QByteArrayData *>(&statics.shiftedNotNullTerminated.data) };
+static const QArrayData staticDataFlags = { Q_BASIC_ATOMIC_INITIALIZER(-1), QArrayData::StaticDataFlags, 0 };
+static const QByteArray::DataPointer staticStandard = {
+    static_cast<QTypedArrayData<char> *>(const_cast<QArrayData *>(&staticDataFlags)),
+    const_cast<char *>("data"),
+    4
+};
+static const QByteArray::DataPointer staticNotNullTerminated = {
+    static_cast<QTypedArrayData<char> *>(const_cast<QArrayData *>(&staticDataFlags)),
+    const_cast<char *>("dataBAD"),
+    4
+};
 
 template <class T> const T &verifyZeroTermination(const T &t) { return t; }
 
@@ -186,11 +167,10 @@ QByteArray verifyZeroTermination(const QByteArray &ba)
 {
     // This test does some evil stuff, it's all supposed to work.
 
-    QByteArray::DataPtr baDataPtr = const_cast<QByteArray &>(ba).data_ptr();
+    QByteArray::DataPointer baDataPtr = const_cast<QByteArray &>(ba).data_ptr();
 
     // Skip if isStatic() or fromRawData(), as those offer no guarantees
-    if (baDataPtr->ref.isStatic()
-            || baDataPtr->offset != QByteArray().data_ptr()->offset)
+    if (baDataPtr->isStatic() || baDataPtr->flags() & QArrayData::RawDataType)
         return ba;
 
     int baSize = ba.size();
@@ -201,7 +181,7 @@ QByteArray verifyZeroTermination(const QByteArray &ba)
                 .arg(baTerminator, 2, 16, QChar('0')).toLatin1();
 
     // Skip mutating checks on shared strings
-    if (baDataPtr->ref.isShared())
+    if (baDataPtr->isShared())
         return ba;
 
     const char *baData = ba.constData();
@@ -253,11 +233,11 @@ void tst_QByteArray::qChecksum_data()
     QTest::addColumn<uint>("checksum");
 
     // Examples from ISO 14443-3
-    QTest::newRow("1") << QByteArray("\x00\x00")         << 2U << Qt::ChecksumItuV41  << 0x1EA0U;
-    QTest::newRow("2") << QByteArray("\x12\x34")         << 2U << Qt::ChecksumItuV41  << 0xCF26U;
-    QTest::newRow("3") << QByteArray("\x00\x00\x00")     << 3U << Qt::ChecksumIso3309 << 0xC6CCU;
-    QTest::newRow("4") << QByteArray("\x0F\xAA\xFF")     << 3U << Qt::ChecksumIso3309 << 0xD1FCU;
-    QTest::newRow("5") << QByteArray("\x0A\x12\x34\x56") << 4U << Qt::ChecksumIso3309 << 0xF62CU;
+    QTest::newRow("1") << QByteArray("\x00\x00", 2)         << 2U << Qt::ChecksumItuV41  << 0x1EA0U;
+    QTest::newRow("2") << QByteArray("\x12\x34", 2)         << 2U << Qt::ChecksumItuV41  << 0xCF26U;
+    QTest::newRow("3") << QByteArray("\x00\x00\x00", 3)     << 3U << Qt::ChecksumIso3309 << 0xC6CCU;
+    QTest::newRow("4") << QByteArray("\x0F\xAA\xFF", 3)     << 3U << Qt::ChecksumIso3309 << 0xD1FCU;
+    QTest::newRow("5") << QByteArray("\x0A\x12\x34\x56", 4) << 4U << Qt::ChecksumIso3309 << 0xF62CU;
 }
 
 void tst_QByteArray::qChecksum()
@@ -267,6 +247,7 @@ void tst_QByteArray::qChecksum()
     QFETCH(Qt::ChecksumType, standard);
     QFETCH(uint, checksum);
 
+    QCOMPARE(data.length(), int(len));
     if (standard == Qt::ChecksumIso3309) {
         QCOMPARE(::qChecksum(data.constData(), len), static_cast<quint16>(checksum));
     }
@@ -1054,9 +1035,7 @@ void tst_QByteArray::prependExtended_data()
     QTest::addColumn<QByteArray>("array");
     QTest::newRow("literal") << QByteArray(QByteArrayLiteral("data"));
     QTest::newRow("standard") << QByteArray(staticStandard);
-    QTest::newRow("shifted") << QByteArray(staticShifted);
     QTest::newRow("notNullTerminated") << QByteArray(staticNotNullTerminated);
-    QTest::newRow("shiftedNotNullTerminated") << QByteArray(staticShiftedNotNullTerminated);
     QTest::newRow("non static data") << QByteArray("data");
     QTest::newRow("from raw data") << QByteArray::fromRawData("data", 4);
     QTest::newRow("from raw data not terminated") << QByteArray::fromRawData("dataBAD", 4);
@@ -2122,21 +2101,13 @@ void tst_QByteArray::repeated_data() const
         << QByteArray(staticStandard)
         << QByteArray("datadatadatadata")
         << 4;
-    QTest::newRow("static shifted not null terminated")
-        << QByteArray(staticShiftedNotNullTerminated)
-        << QByteArray("datadatadatadata")
-        << 4;
-    QTest::newRow("static shifted")
-        << QByteArray(staticShifted)
-        << QByteArray("datadatadatadata")
-        << 4;
 }
 
 void tst_QByteArray::byteRefDetaching() const
 {
     {
         QByteArray str = "str";
-        QByteArray copy;
+        QByteArray copy = str;
         copy[0] = 'S';
 
         QCOMPARE(str, QByteArray("str"));
@@ -2266,7 +2237,7 @@ void tst_QByteArray::movablity()
     const int newSize = size + 2;
     const bool newIsEmpty = false;
     const bool newIsNull = false;
-    const int newCapacity = 16;
+    const int newCapacity = memSpace.capacity();
 
     // move back memSpace -> array
     array.~QByteArray();
@@ -2301,8 +2272,7 @@ void tst_QByteArray::literals()
 
     QVERIFY(str.length() == 4);
     QVERIFY(str == "abcd");
-    QVERIFY(str.data_ptr()->ref.isStatic());
-    QVERIFY(str.data_ptr()->offset == sizeof(QByteArrayData));
+    QVERIFY(str.data_ptr()->isStatic());
 
     const char *s = str.constData();
     QByteArray str2 = str;
diff --git a/tests/auto/corelib/text/qbytearraylist/CMakeLists.txt b/tests/auto/corelib/text/qbytearraylist/CMakeLists.txt
new file mode 100644
index 0000000000..780216a38c
--- /dev/null
+++ b/tests/auto/corelib/text/qbytearraylist/CMakeLists.txt
@@ -0,0 +1,10 @@
+# Generated from qbytearraylist.pro.
+
+#####################################################################
+## tst_qbytearraylist Test:
+#####################################################################
+
+add_qt_test(tst_qbytearraylist
+    SOURCES
+        tst_qbytearraylist.cpp
+)
diff --git a/tests/auto/corelib/text/qbytedatabuffer/CMakeLists.txt b/tests/auto/corelib/text/qbytedatabuffer/CMakeLists.txt
new file mode 100644
index 0000000000..c9cd01231b
--- /dev/null
+++ b/tests/auto/corelib/text/qbytedatabuffer/CMakeLists.txt
@@ -0,0 +1,12 @@
+# Generated from qbytedatabuffer.pro.
+
+#####################################################################
+## tst_qbytedatabuffer Test:
+#####################################################################
+
+add_qt_test(tst_qbytedatabuffer
+    SOURCES
+        tst_qbytedatabuffer.cpp
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+)
diff --git a/tests/auto/corelib/text/qlocale/tst_qlocale.cpp b/tests/auto/corelib/text/qlocale/tst_qlocale.cpp
index ec85a6c5c6..a70b07e389 100644
--- a/tests/auto/corelib/text/qlocale/tst_qlocale.cpp
+++ b/tests/auto/corelib/text/qlocale/tst_qlocale.cpp
@@ -59,6 +59,7 @@
 #endif
 
 Q_DECLARE_METATYPE(QLocale::FormatType)
+Q_DECLARE_METATYPE(QStringView)
 
 class tst_QLocale : public QObject
 {
@@ -95,6 +96,7 @@ private slots:
     void long_long_conversion_extra();
     void testInfAndNan();
     void fpExceptions();
+    void negativeZero_data();
     void negativeZero();
     void dayOfWeek();
     void dayOfWeek_data();
@@ -1060,8 +1062,8 @@ void tst_QLocale::doubleToString_data()
 
     QTest::newRow("de_DE 3,4 f 1") << QString("de_DE") << QString("3,4")     << 3.4 << 'f' << 1;
     QTest::newRow("de_DE 3,4 f -") << QString("de_DE") << QString("3,4")     << 3.4 << 'f' << shortest;
-    QTest::newRow("de_DE 3,4 e 1") << QString("de_DE") << QString("3,4e+00") << 3.4 << 'e' << 1;
-    QTest::newRow("de_DE 3,4 e -") << QString("de_DE") << QString("3,4e+00") << 3.4 << 'e' << shortest;
+    QTest::newRow("de_DE 3,4 e 1") << QString("de_DE") << QString("3,4E+00") << 3.4 << 'e' << 1;
+    QTest::newRow("de_DE 3,4 e -") << QString("de_DE") << QString("3,4E+00") << 3.4 << 'e' << shortest;
     QTest::newRow("de_DE 3,4 g 2") << QString("de_DE") << QString("3,4")     << 3.4 << 'g' << 2;
     QTest::newRow("de_DE 3,4 g -") << QString("de_DE") << QString("3,4")     << 3.4 << 'g' << shortest;
 
@@ -1081,8 +1083,8 @@ void tst_QLocale::doubleToString_data()
 
     QTest::newRow("de_DE 0,035003945 f 9") << QString("de_DE") << QString("0,035003945")   << 0.035003945 << 'f' << 9;
     QTest::newRow("de_DE 0,035003945 f -") << QString("de_DE") << QString("0,035003945")   << 0.035003945 << 'f' << shortest;
-    QTest::newRow("de_DE 0,035003945 e 7") << QString("de_DE") << QString("3,5003945e-02") << 0.035003945 << 'e' << 7;
-    QTest::newRow("de_DE 0,035003945 e -") << QString("de_DE") << QString("3,5003945e-02") << 0.035003945 << 'e' << shortest;
+    QTest::newRow("de_DE 0,035003945 e 7") << QString("de_DE") << QString("3,5003945E-02") << 0.035003945 << 'e' << 7;
+    QTest::newRow("de_DE 0,035003945 e -") << QString("de_DE") << QString("3,5003945E-02") << 0.035003945 << 'e' << shortest;
     QTest::newRow("de_DE 0,035003945 g 8") << QString("de_DE") << QString("0,035003945")   << 0.035003945 << 'g' << 8;
     QTest::newRow("de_DE 0,035003945 g -") << QString("de_DE") << QString("0,035003945")   << 0.035003945 << 'g' << shortest;
 
@@ -1102,10 +1104,10 @@ void tst_QLocale::doubleToString_data()
 
     QTest::newRow("de_DE 0,000003945 f 9") << QString("de_DE") << QString("0,000003945") << 0.000003945 << 'f' << 9;
     QTest::newRow("de_DE 0,000003945 f -") << QString("de_DE") << QString("0,000003945") << 0.000003945 << 'f' << shortest;
-    QTest::newRow("de_DE 0,000003945 e 3") << QString("de_DE") << QString("3,945e-06")   << 0.000003945 << 'e' << 3;
-    QTest::newRow("de_DE 0,000003945 e -") << QString("de_DE") << QString("3,945e-06")   << 0.000003945 << 'e' << shortest;
-    QTest::newRow("de_DE 0,000003945 g 4") << QString("de_DE") << QString("3,945e-06")   << 0.000003945 << 'g' << 4;
-    QTest::newRow("de_DE 0,000003945 g -") << QString("de_DE") << QString("3,945e-06")   << 0.000003945 << 'g' << shortest;
+    QTest::newRow("de_DE 0,000003945 e 3") << QString("de_DE") << QString("3,945E-06")   << 0.000003945 << 'e' << 3;
+    QTest::newRow("de_DE 0,000003945 e -") << QString("de_DE") << QString("3,945E-06")   << 0.000003945 << 'e' << shortest;
+    QTest::newRow("de_DE 0,000003945 g 4") << QString("de_DE") << QString("3,945E-06")   << 0.000003945 << 'g' << 4;
+    QTest::newRow("de_DE 0,000003945 g -") << QString("de_DE") << QString("3,945E-06")   << 0.000003945 << 'g' << shortest;
 
     QTest::newRow("C 12456789012 f 3")  << QString("C") << QString("12456789012.000")     << 12456789012.0 << 'f' << 3;
     QTest::newRow("C 12456789012 e 13") << QString("C") << QString("1.2456789012000e+10") << 12456789012.0 << 'e' << 13;
@@ -1122,8 +1124,8 @@ void tst_QLocale::doubleToString_data()
 
     QTest::newRow("de_DE 12456789012 f 0")  << QString("de_DE") << QString("12.456.789.012")   << 12456789012.0 << 'f' << 0;
     QTest::newRow("de_DE 12456789012 f -")  << QString("de_DE") << QString("12.456.789.012")   << 12456789012.0 << 'f' << shortest;
-    QTest::newRow("de_DE 12456789012 e 10") << QString("de_DE") << QString("1,2456789012e+10") << 12456789012.0 << 'e' << 10;
-    QTest::newRow("de_DE 12456789012 e -")  << QString("de_DE") << QString("1,2456789012e+10") << 12456789012.0 << 'e' << shortest;
+    QTest::newRow("de_DE 12456789012 e 10") << QString("de_DE") << QString("1,2456789012E+10") << 12456789012.0 << 'e' << 10;
+    QTest::newRow("de_DE 12456789012 e -")  << QString("de_DE") << QString("1,2456789012E+10") << 12456789012.0 << 'e' << shortest;
     QTest::newRow("de_DE 12456789012 g 11") << QString("de_DE") << QString("12.456.789.012")   << 12456789012.0 << 'g' << 11;
     QTest::newRow("de_DE 12456789012 g -")  << QString("de_DE") << QString("12.456.789.012")   << 12456789012.0 << 'g' << shortest;
 }
@@ -1422,13 +1424,32 @@ void tst_QLocale::fpExceptions()
 #endif
 }
 
+void tst_QLocale::negativeZero_data()
+{
+    QTest::addColumn<QLocale::Language>("language");
+    QTest::addColumn<QLocale::Script>("script");
+    QTest::addColumn<QLocale::Country>("territory");
+    QTest::addColumn<QStringView>("expect");
+
+    QTest::newRow("C")
+        << QLocale::C << QLocale::AnyScript << QLocale::AnyCountry
+        << QStringView(u"0");
+    QTest::newRow("Arabic")
+        << QLocale::Arabic << QLocale::ArabicScript << QLocale::AnyCountry
+        << QStringView(u"\u0660");
+    QTest::newRow("Chakma")
+        << QLocale::Chakma << QLocale::ChakmaScript << QLocale::AnyCountry
+        << QStringView(u"\xD804\xDD36"); // A surrogate pair.
+}
+
 void tst_QLocale::negativeZero()
 {
-    double negativeZero( 0.0 ); // Initialise to zero.
-    uchar *ptr = (uchar *)&negativeZero;
-    ptr[QSysInfo::ByteOrder == QSysInfo::BigEndian ? 0 : 7] = 0x80;
-    QString s = QString::number(negativeZero);
-    QCOMPARE(s, QString("0"));
+    QFETCH(QLocale::Language, language);
+    QFETCH(QLocale::Script, script);
+    QFETCH(QLocale::Country, territory);
+    QFETCH(QStringView, expect);
+    QLocale locale(language, script, territory);
+    QCOMPARE(locale.toString(std::copysign(0.0, -1.0)), expect);
 }
 
 void tst_QLocale::dayOfWeek_data()
@@ -1900,15 +1921,14 @@ void tst_QLocale::macDefaultLocale()
     // On OS X the decimal point and group separator are configurable
     // independently of the locale. Verify that they have one of the
     // allowed values and are not the same.
-    QVERIFY(locale.decimalPoint() == QChar('.') || locale.decimalPoint() == QChar(','));
-    if (!(locale.numberOptions() & QLocale::OmitGroupSeparator)) {
-        QVERIFY(locale.groupSeparator() == QChar(',')
-             || locale.groupSeparator() == QChar('.')
-             || locale.groupSeparator() == QChar('\xA0') // no-breaking space
-             || locale.groupSeparator() == QChar('\'')
-             || locale.groupSeparator() == QChar());
-        QVERIFY(locale.decimalPoint() != locale.groupSeparator());
-    }
+    QVERIFY(locale.decimalPoint() == QStringView(u".")
+            || locale.decimalPoint() == QStringView(u","));
+    QVERIFY(locale.groupSeparator() == QStringView(u",")
+         || locale.groupSeparator() == QStringView(u".")
+         || locale.groupSeparator() == QStringView(u"\xA0") // no-breaking space
+         || locale.groupSeparator() == QStringView(u"'")
+         || locale.groupSeparator().isEmpty());
+    QVERIFY(locale.decimalPoint() != locale.groupSeparator());
 
     // make sure we are using the system to parse them
     QCOMPARE(locale.toString(1234.56), systemLocaleFormatNumber(QString("1,234.56")));
@@ -2049,8 +2069,8 @@ void tst_QLocale::windowsDefaultLocale()
     QLocale locale = QLocale::system();
 
     // make sure we are seeing the system's format strings
-    QCOMPARE(locale.decimalPoint(), QChar('@'));
-    QCOMPARE(locale.groupSeparator(), QChar('?'));
+    QCOMPARE(locale.decimalPoint(), QStringView(u"@"));
+    QCOMPARE(locale.groupSeparator(), QStringView(u"?"));
     QCOMPARE(locale.dateFormat(QLocale::ShortFormat), shortDateFormat);
     QCOMPARE(locale.dateFormat(QLocale::LongFormat), longDateFormat);
     QCOMPARE(locale.timeFormat(QLocale::ShortFormat), shortTimeFormat);
diff --git a/tests/auto/corelib/text/qregexp/CMakeLists.txt b/tests/auto/corelib/text/qregexp/CMakeLists.txt
new file mode 100644
index 0000000000..e14979d7fe
--- /dev/null
+++ b/tests/auto/corelib/text/qregexp/CMakeLists.txt
@@ -0,0 +1,10 @@
+# Generated from qregexp.pro.
+
+#####################################################################
+## tst_qregexp Test:
+#####################################################################
+
+add_qt_test(tst_qregexp
+    SOURCES
+        tst_qregexp.cpp
+)
diff --git a/tests/auto/corelib/text/qregularexpression/CMakeLists.txt b/tests/auto/corelib/text/qregularexpression/CMakeLists.txt
new file mode 100644
index 0000000000..b1ee1ff7de
--- /dev/null
+++ b/tests/auto/corelib/text/qregularexpression/CMakeLists.txt
@@ -0,0 +1,10 @@
+# Generated from qregularexpression.pro.
+
+#####################################################################
+## tst_qregularexpression Test:
+#####################################################################
+
+add_qt_test(tst_qregularexpression
+    SOURCES
+        tst_qregularexpression.cpp
+)
diff --git a/tests/auto/corelib/text/qstring/tst_qstring.cpp b/tests/auto/corelib/text/qstring/tst_qstring.cpp
index 7072cb9516..2c02fb2264 100644
--- a/tests/auto/corelib/text/qstring/tst_qstring.cpp
+++ b/tests/auto/corelib/text/qstring/tst_qstring.cpp
@@ -607,11 +607,10 @@ QString verifyZeroTermination(const QString &str)
 {
     // This test does some evil stuff, it's all supposed to work.
 
-    QString::DataPtr strDataPtr = const_cast<QString &>(str).data_ptr();
+    QString::DataPointer strDataPtr = const_cast<QString &>(str).data_ptr();
 
     // Skip if isStatic() or fromRawData(), as those offer no guarantees
-    if (strDataPtr->ref.isStatic()
-            || strDataPtr->offset != QString().data_ptr()->offset)
+    if (strDataPtr->isStatic() || !strDataPtr->isMutable())
         return str;
 
     int strSize = str.size();
@@ -622,7 +621,7 @@ QString verifyZeroTermination(const QString &str)
                 .arg(strTerminator.unicode(), 4, 16, QChar('0'));
 
     // Skip mutating checks on shared strings
-    if (strDataPtr->ref.isShared())
+    if (strDataPtr->isShared())
         return str;
 
     const QChar *strData = str.constData();
@@ -986,28 +985,6 @@ void tst_QString::acc_01()
     f[7]='F';
     QCOMPARE(text[7],'!');
 
-    a="";
-    a[0]='A';
-    QCOMPARE(a, QLatin1String("A"));
-    QCOMPARE(a.length(),1);
-    a[1]='B';
-    QCOMPARE(a, QLatin1String("AB"));
-    QCOMPARE(a.length(),2);
-    a[2]='C';
-    QCOMPARE(a, QLatin1String("ABC"));
-    QCOMPARE(a.length(),3);
-    a = QString();
-    QVERIFY(a.isNull());
-    a[0]='A';
-    QCOMPARE(a, QLatin1String("A"));
-    QCOMPARE(a.length(),1);
-    a[1]='B';
-    QCOMPARE(a, QLatin1String("AB"));
-    QCOMPARE(a.length(),2);
-    a[2]='C';
-    QCOMPARE(a, QLatin1String("ABC"));
-    QCOMPARE(a.length(),3);
-
     a="123";
     b="456";
     a[0]=a[1];
@@ -4110,8 +4087,9 @@ void tst_QString::setRawData()
     QVERIFY(cstr.constData() == ptr);
     QVERIFY(cstr == QString(ptr, 1));
 
+    QSKIP("This is currently not working.");
     // This actually tests the recycling of the shared data object
-    QString::DataPtr csd = cstr.data_ptr();
+    QString::DataPointer csd = cstr.data_ptr();
     cstr.setRawData(ptr2, 1);
     QVERIFY(cstr.isDetached());
     QVERIFY(cstr.constData() == ptr2);
@@ -4955,13 +4933,14 @@ void tst_QString::arg()
 
 void tst_QString::number()
 {
-    QCOMPARE( QString::number(int(0)), QLatin1String("0") );
-    QCOMPARE( QString::number((unsigned int)(11)), QLatin1String("11") );
-    QCOMPARE( QString::number(-22L), QLatin1String("-22") );
-    QCOMPARE( QString::number(333UL), QLatin1String("333") );
-    QCOMPARE( QString::number(4.4), QLatin1String("4.4") );
-    QCOMPARE( QString::number(Q_INT64_C(-555)), QLatin1String("-555") );
-    QCOMPARE( QString::number(Q_UINT64_C(6666)), QLatin1String("6666") );
+    QCOMPARE(QString::number(int(0)), QLatin1String("0"));
+    QCOMPARE(QString::number(std::copysign(0.0, -1.0)), QLatin1String("0"));
+    QCOMPARE(QString::number((unsigned int)(11)), QLatin1String("11"));
+    QCOMPARE(QString::number(-22L), QLatin1String("-22"));
+    QCOMPARE(QString::number(333UL), QLatin1String("333"));
+    QCOMPARE(QString::number(4.4), QLatin1String("4.4"));
+    QCOMPARE(QString::number(Q_INT64_C(-555)), QLatin1String("-555"));
+    QCOMPARE(QString::number(Q_UINT64_C(6666)), QLatin1String("6666"));
 
 #ifndef QT_NO_DOUBLECONVERSION // snprintf_l is too stupid for this
     QCOMPARE( QString::number(12.05, 'f', 1), QString("12.1") );
@@ -6463,7 +6442,7 @@ void tst_QString::QCharRefDetaching() const
 {
     {
         QString str = QString::fromLatin1("str");
-        QString copy;
+        QString copy = str;
         copy[0] = QLatin1Char('S');
 
         QCOMPARE(str, QString::fromLatin1("str"));
@@ -6684,8 +6663,7 @@ void tst_QString::literals()
 
     QVERIFY(str.length() == 4);
     QVERIFY(str == QLatin1String("abcd"));
-    QVERIFY(str.data_ptr()->ref.isStatic());
-    QVERIFY(str.data_ptr()->offset == sizeof(QStringData));
+    QVERIFY(str.data_ptr()->isStatic());
 
     const QChar *s = str.constData();
     QString str2 = str;
diff --git a/tests/auto/corelib/text/qstring_no_cast_from_bytearray/CMakeLists.txt b/tests/auto/corelib/text/qstring_no_cast_from_bytearray/CMakeLists.txt
new file mode 100644
index 0000000000..d0285cce3c
--- /dev/null
+++ b/tests/auto/corelib/text/qstring_no_cast_from_bytearray/CMakeLists.txt
@@ -0,0 +1,12 @@
+# Generated from qstring_no_cast_from_bytearray.pro.
+
+#####################################################################
+## tst_qstring_no_cast_from_bytearray Test:
+#####################################################################
+
+add_qt_test(tst_qstring_no_cast_from_bytearray
+    SOURCES
+        tst_qstring_no_cast_from_bytearray.cpp
+    DEFINES
+        QT_NO_CAST_FROM_BYTEARRAY
+)
diff --git a/tests/auto/corelib/text/qstringbuilder/qstringbuilder1/CMakeLists.txt b/tests/auto/corelib/text/qstringbuilder/qstringbuilder1/CMakeLists.txt
new file mode 100644
index 0000000000..959f04f07e
--- /dev/null
+++ b/tests/auto/corelib/text/qstringbuilder/qstringbuilder1/CMakeLists.txt
@@ -0,0 +1,10 @@
+# Generated from qstringbuilder1.pro.
+
+#####################################################################
+## tst_qstringbuilder1 Test:
+#####################################################################
+
+add_qt_test(tst_qstringbuilder1
+    SOURCES
+        tst_qstringbuilder1.cpp
+)
diff --git a/tests/auto/corelib/text/qstringbuilder/qstringbuilder2/CMakeLists.txt b/tests/auto/corelib/text/qstringbuilder/qstringbuilder2/CMakeLists.txt
new file mode 100644
index 0000000000..ff9dfd4ce1
--- /dev/null
+++ b/tests/auto/corelib/text/qstringbuilder/qstringbuilder2/CMakeLists.txt
@@ -0,0 +1,10 @@
+# Generated from qstringbuilder2.pro.
+
+#####################################################################
+## tst_qstringbuilder2 Test:
+#####################################################################
+
+add_qt_test(tst_qstringbuilder2
+    SOURCES
+        tst_qstringbuilder2.cpp
+)
diff --git a/tests/auto/corelib/text/qstringbuilder/qstringbuilder3/CMakeLists.txt b/tests/auto/corelib/text/qstringbuilder/qstringbuilder3/CMakeLists.txt
new file mode 100644
index 0000000000..810004cc7d
--- /dev/null
+++ b/tests/auto/corelib/text/qstringbuilder/qstringbuilder3/CMakeLists.txt
@@ -0,0 +1,10 @@
+# Generated from qstringbuilder3.pro.
+
+#####################################################################
+## tst_qstringbuilder3 Test:
+#####################################################################
+
+add_qt_test(tst_qstringbuilder3
+    SOURCES
+        tst_qstringbuilder3.cpp
+)
diff --git a/tests/auto/corelib/text/qstringbuilder/qstringbuilder4/CMakeLists.txt b/tests/auto/corelib/text/qstringbuilder/qstringbuilder4/CMakeLists.txt
new file mode 100644
index 0000000000..1ad6d02418
--- /dev/null
+++ b/tests/auto/corelib/text/qstringbuilder/qstringbuilder4/CMakeLists.txt
@@ -0,0 +1,10 @@
+# Generated from qstringbuilder4.pro.
+
+#####################################################################
+## tst_qstringbuilder4 Test:
+#####################################################################
+
+add_qt_test(tst_qstringbuilder4
+    SOURCES
+        tst_qstringbuilder4.cpp
+)
diff --git a/tests/auto/corelib/text/qstringiterator/CMakeLists.txt b/tests/auto/corelib/text/qstringiterator/CMakeLists.txt
new file mode 100644
index 0000000000..e3388ee1b9
--- /dev/null
+++ b/tests/auto/corelib/text/qstringiterator/CMakeLists.txt
@@ -0,0 +1,12 @@
+# Generated from qstringiterator.pro.
+
+#####################################################################
+## tst_qstringiterator Test:
+#####################################################################
+
+add_qt_test(tst_qstringiterator
+    SOURCES
+        tst_qstringiterator.cpp
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+)
diff --git a/tests/auto/corelib/text/qstringlist/CMakeLists.txt b/tests/auto/corelib/text/qstringlist/CMakeLists.txt
new file mode 100644
index 0000000000..aff8b59c15
--- /dev/null
+++ b/tests/auto/corelib/text/qstringlist/CMakeLists.txt
@@ -0,0 +1,10 @@
+# Generated from qstringlist.pro.
+
+#####################################################################
+## tst_qstringlist Test:
+#####################################################################
+
+add_qt_test(tst_qstringlist
+    SOURCES
+        tst_qstringlist.cpp
+)
diff --git a/tests/auto/corelib/text/qstringmatcher/CMakeLists.txt b/tests/auto/corelib/text/qstringmatcher/CMakeLists.txt
new file mode 100644
index 0000000000..15616a0b13
--- /dev/null
+++ b/tests/auto/corelib/text/qstringmatcher/CMakeLists.txt
@@ -0,0 +1,12 @@
+# Generated from qstringmatcher.pro.
+
+#####################################################################
+## tst_qstringmatcher Test:
+#####################################################################
+
+add_qt_test(tst_qstringmatcher
+    SOURCES
+        tst_qstringmatcher.cpp
+    DEFINES
+        QT_NO_CAST_TO_ASCII
+)
diff --git a/tests/auto/corelib/text/qstringref/CMakeLists.txt b/tests/auto/corelib/text/qstringref/CMakeLists.txt
new file mode 100644
index 0000000000..961f37c93d
--- /dev/null
+++ b/tests/auto/corelib/text/qstringref/CMakeLists.txt
@@ -0,0 +1,10 @@
+# Generated from qstringref.pro.
+
+#####################################################################
+## tst_qstringref Test:
+#####################################################################
+
+add_qt_test(tst_qstringref
+    SOURCES
+        tst_qstringref.cpp
+)
diff --git a/tests/auto/corelib/text/qstringref/tst_qstringref.cpp b/tests/auto/corelib/text/qstringref/tst_qstringref.cpp
index dcc825942d..e1fa32f568 100644
--- a/tests/auto/corelib/text/qstringref/tst_qstringref.cpp
+++ b/tests/auto/corelib/text/qstringref/tst_qstringref.cpp
@@ -87,6 +87,7 @@ private slots:
     void mid();
     void split_data();
     void split();
+    void nullToString();
 };
 
 static QStringRef emptyRef()
@@ -2177,6 +2178,18 @@ void tst_QStringRef::split()
     }
 }
 
+void tst_QStringRef::nullToString()
+{
+    QStringRef nullRef;
+    QVERIFY(nullRef.isNull());
+    QVERIFY(nullRef.toString().isNull());
+
+    QString str;
+    nullRef = &str;
+    QVERIFY(nullRef.isNull());
+    QVERIFY(nullRef.toString().isNull());
+}
+
 QTEST_APPLESS_MAIN(tst_QStringRef)
 
 #include "tst_qstringref.moc"
diff --git a/tests/auto/corelib/thread/CMakeLists.txt b/tests/auto/corelib/thread/CMakeLists.txt
new file mode 100644
index 0000000000..d07c583a77
--- /dev/null
+++ b/tests/auto/corelib/thread/CMakeLists.txt
@@ -0,0 +1,24 @@
+# Generated from thread.pro.
+
+if(QT_FEATURE_thread)
+    add_subdirectory(qatomicint)
+    add_subdirectory(qatomicinteger)
+    add_subdirectory(qatomicpointer)
+    add_subdirectory(qresultstore)
+    add_subdirectory(qfuture)
+    add_subdirectory(qfuturesynchronizer)
+    add_subdirectory(qmutex)
+    add_subdirectory(qmutexlocker)
+    add_subdirectory(qreadlocker)
+    add_subdirectory(qreadwritelock)
+    add_subdirectory(qsemaphore)
+    add_subdirectory(qthread)
+    add_subdirectory(qthreadonce)
+    add_subdirectory(qthreadpool)
+    add_subdirectory(qthreadstorage)
+    add_subdirectory(qwaitcondition)
+    add_subdirectory(qwritelocker)
+endif()
+if(TARGET Qt::Concurrent)
+    add_subdirectory(qfuturewatcher)
+endif()
diff --git a/tests/auto/corelib/thread/qatomicint/CMakeLists.txt b/tests/auto/corelib/thread/qatomicint/CMakeLists.txt
new file mode 100644
index 0000000000..1a084fb28c
--- /dev/null
+++ b/tests/auto/corelib/thread/qatomicint/CMakeLists.txt
@@ -0,0 +1,10 @@
+# Generated from qatomicint.pro.
+
+#####################################################################
+## tst_qatomicint Test:
+#####################################################################
+
+add_qt_test(tst_qatomicint
+    SOURCES
+        tst_qatomicint.cpp
+)
diff --git a/tests/auto/corelib/thread/qatomicint/tst_qatomicint.cpp b/tests/auto/corelib/thread/qatomicint/tst_qatomicint.cpp
index bef491d5f0..22ee7d17b7 100644
--- a/tests/auto/corelib/thread/qatomicint/tst_qatomicint.cpp
+++ b/tests/auto/corelib/thread/qatomicint/tst_qatomicint.cpp
@@ -237,28 +237,23 @@ template <typename T> struct TypeInStruct { T type; };
 
 void tst_QAtomicInt::alignment()
 {
-#ifdef Q_ALIGNOF
-    // this will cause a build error if the alignment isn't the same
-    char dummy1[Q_ALIGNOF(QBasicAtomicInt) == Q_ALIGNOF(TypeInStruct<int>) ? 1 : -1];
-    char dummy2[Q_ALIGNOF(QAtomicInt) == Q_ALIGNOF(TypeInStruct<int>) ? 1 : -1];
-    (void)dummy1; (void)dummy2;
+    Q_STATIC_ASSERT(alignof(QBasicAtomicInt) == alignof(TypeInStruct<int>));
+    Q_STATIC_ASSERT(alignof(QBasicAtomicInt) == alignof(TypeInStruct<int>));
 
 #ifdef Q_ATOMIC_INT32_IS_SUPPORTED
-    QCOMPARE(Q_ALIGNOF(QBasicAtomicInteger<int>), Q_ALIGNOF(TypeInStruct<int>));
+    QCOMPARE(alignof(QBasicAtomicInteger<int>), alignof(TypeInStruct<int>));
 #endif
 
 #ifdef Q_ATOMIC_INT16_IS_SUPPORTED
-    QCOMPARE(Q_ALIGNOF(QBasicAtomicInteger<short>), Q_ALIGNOF(TypeInStruct<short>));
+    QCOMPARE(alignof(QBasicAtomicInteger<short>), alignof(TypeInStruct<short>));
 #endif
 
 #ifdef Q_ATOMIC_INT8_IS_SUPPORTED
-    QCOMPARE(Q_ALIGNOF(QBasicAtomicInteger<char>), Q_ALIGNOF(TypeInStruct<char>));
+    QCOMPARE(alignof(QBasicAtomicInteger<char>), alignof(TypeInStruct<char>));
 #endif
 
 #ifdef Q_ATOMIC_INT64_IS_SUPPORTED
-    QCOMPARE(Q_ALIGNOF(QBasicAtomicInteger<qlonglong>), Q_ALIGNOF(TypeInStruct<qlonglong>));
-#endif
-
+    QCOMPARE(alignof(QBasicAtomicInteger<qlonglong>), alignof(TypeInStruct<qlonglong>));
 #endif
 }
 
diff --git a/tests/auto/corelib/thread/qatomicinteger/CMakeLists.txt b/tests/auto/corelib/thread/qatomicinteger/CMakeLists.txt
new file mode 100644
index 0000000000..8f0637a4d2
--- /dev/null
+++ b/tests/auto/corelib/thread/qatomicinteger/CMakeLists.txt
@@ -0,0 +1,18 @@
+# Generated from qatomicinteger.pro.
+
+add_subdirectory(char)
+add_subdirectory(char16_t)
+add_subdirectory(char32_t)
+add_subdirectory(int)
+add_subdirectory(long)
+add_subdirectory(qlonglong)
+add_subdirectory(qptrdiff)
+add_subdirectory(quintptr)
+add_subdirectory(qulonglong)
+add_subdirectory(schar)
+add_subdirectory(short)
+add_subdirectory(uchar)
+add_subdirectory(uint)
+add_subdirectory(ulong)
+add_subdirectory(ushort)
+add_subdirectory(wchar_t)
diff --git a/tests/auto/corelib/thread/qatomicinteger/char/CMakeLists.txt b/tests/auto/corelib/thread/qatomicinteger/char/CMakeLists.txt
new file mode 100644
index 0000000000..6ccaf3291d
--- /dev/null
+++ b/tests/auto/corelib/thread/qatomicinteger/char/CMakeLists.txt
@@ -0,0 +1,13 @@
+# Generated from char.pro.
+
+#####################################################################
+## tst_qatomicinteger_char Test:
+#####################################################################
+
+add_qt_test(tst_qatomicinteger_char
+    SOURCES
+        ../tst_qatomicinteger.cpp
+    DEFINES
+        QATOMIC_TEST_TYPE=char
+        tst_QAtomicIntegerXX=tst_QAtomicInteger_char
+)
diff --git a/tests/auto/corelib/thread/qatomicinteger/char16_t/CMakeLists.txt b/tests/auto/corelib/thread/qatomicinteger/char16_t/CMakeLists.txt
new file mode 100644
index 0000000000..d57d4b89dc
--- /dev/null
+++ b/tests/auto/corelib/thread/qatomicinteger/char16_t/CMakeLists.txt
@@ -0,0 +1,13 @@
+# Generated from char16_t.pro.
+
+#####################################################################
+## tst_qatomicinteger_char16_t Test:
+#####################################################################
+
+add_qt_test(tst_qatomicinteger_char16_t
+    SOURCES
+        ../tst_qatomicinteger.cpp
+    DEFINES
+        QATOMIC_TEST_TYPE=char16_t
+        tst_QAtomicIntegerXX=tst_QAtomicInteger_char16_t
+)
diff --git a/tests/auto/corelib/thread/qatomicinteger/char32_t/CMakeLists.txt b/tests/auto/corelib/thread/qatomicinteger/char32_t/CMakeLists.txt
new file mode 100644
index 0000000000..7e04c7864b
--- /dev/null
+++ b/tests/auto/corelib/thread/qatomicinteger/char32_t/CMakeLists.txt
@@ -0,0 +1,13 @@
+# Generated from char32_t.pro.
+
+#####################################################################
+## tst_qatomicinteger_char32_t Test:
+#####################################################################
+
+add_qt_test(tst_qatomicinteger_char32_t
+    SOURCES
+        ../tst_qatomicinteger.cpp
+    DEFINES
+        QATOMIC_TEST_TYPE=char32_t
+        tst_QAtomicIntegerXX=tst_QAtomicInteger_char32_t
+)
diff --git a/tests/auto/corelib/thread/qatomicinteger/int/CMakeLists.txt b/tests/auto/corelib/thread/qatomicinteger/int/CMakeLists.txt
new file mode 100644
index 0000000000..16332fcf3b
--- /dev/null
+++ b/tests/auto/corelib/thread/qatomicinteger/int/CMakeLists.txt
@@ -0,0 +1,13 @@
+# Generated from int.pro.
+
+#####################################################################
+## tst_qatomicinteger_int Test:
+#####################################################################
+
+add_qt_test(tst_qatomicinteger_int
+    SOURCES
+        ../tst_qatomicinteger.cpp
+    DEFINES
+        QATOMIC_TEST_TYPE=int
+        tst_QAtomicIntegerXX=tst_QAtomicInteger_int
+)
diff --git a/tests/auto/corelib/thread/qatomicinteger/long/CMakeLists.txt b/tests/auto/corelib/thread/qatomicinteger/long/CMakeLists.txt
new file mode 100644
index 0000000000..17c2510ac2
--- /dev/null
+++ b/tests/auto/corelib/thread/qatomicinteger/long/CMakeLists.txt
@@ -0,0 +1,13 @@
+# Generated from long.pro.
+
+#####################################################################
+## tst_qatomicinteger_long Test:
+#####################################################################
+
+add_qt_test(tst_qatomicinteger_long
+    SOURCES
+        ../tst_qatomicinteger.cpp
+    DEFINES
+        QATOMIC_TEST_TYPE=long
+        tst_QAtomicIntegerXX=tst_QAtomicInteger_long
+)
diff --git a/tests/auto/corelib/thread/qatomicinteger/qlonglong/CMakeLists.txt b/tests/auto/corelib/thread/qatomicinteger/qlonglong/CMakeLists.txt
new file mode 100644
index 0000000000..021b865e67
--- /dev/null
+++ b/tests/auto/corelib/thread/qatomicinteger/qlonglong/CMakeLists.txt
@@ -0,0 +1,13 @@
+# Generated from qlonglong.pro.
+
+#####################################################################
+## tst_qatomicinteger_qlonglong Test:
+#####################################################################
+
+add_qt_test(tst_qatomicinteger_qlonglong
+    SOURCES
+        ../tst_qatomicinteger.cpp
+    DEFINES
+        QATOMIC_TEST_TYPE=qlonglong
+        tst_QAtomicIntegerXX=tst_QAtomicInteger_qlonglong
+)
diff --git a/tests/auto/corelib/thread/qatomicinteger/qptrdiff/CMakeLists.txt b/tests/auto/corelib/thread/qatomicinteger/qptrdiff/CMakeLists.txt
new file mode 100644
index 0000000000..4beff29882
--- /dev/null
+++ b/tests/auto/corelib/thread/qatomicinteger/qptrdiff/CMakeLists.txt
@@ -0,0 +1,13 @@
+# Generated from qptrdiff.pro.
+
+#####################################################################
+## tst_qatomicinteger_qptrdiff Test:
+#####################################################################
+
+add_qt_test(tst_qatomicinteger_qptrdiff
+    SOURCES
+        ../tst_qatomicinteger.cpp
+    DEFINES
+        QATOMIC_TEST_TYPE=qptrdiff
+        tst_QAtomicIntegerXX=tst_QAtomicInteger_qptrdiff
+)
diff --git a/tests/auto/corelib/thread/qatomicinteger/quintptr/CMakeLists.txt b/tests/auto/corelib/thread/qatomicinteger/quintptr/CMakeLists.txt
new file mode 100644
index 0000000000..a5f9b7aef3
--- /dev/null
+++ b/tests/auto/corelib/thread/qatomicinteger/quintptr/CMakeLists.txt
@@ -0,0 +1,13 @@
+# Generated from quintptr.pro.
+
+#####################################################################
+## tst_qatomicinteger_quintptr Test:
+#####################################################################
+
+add_qt_test(tst_qatomicinteger_quintptr
+    SOURCES
+        ../tst_qatomicinteger.cpp
+    DEFINES
+        QATOMIC_TEST_TYPE=quintptr
+        tst_QAtomicIntegerXX=tst_QAtomicInteger_quintptr
+)
diff --git a/tests/auto/corelib/thread/qatomicinteger/qulonglong/CMakeLists.txt b/tests/auto/corelib/thread/qatomicinteger/qulonglong/CMakeLists.txt
new file mode 100644
index 0000000000..d2e1c31856
--- /dev/null
+++ b/tests/auto/corelib/thread/qatomicinteger/qulonglong/CMakeLists.txt
@@ -0,0 +1,13 @@
+# Generated from qulonglong.pro.
+
+#####################################################################
+## tst_qatomicinteger_qulonglong Test:
+#####################################################################
+
+add_qt_test(tst_qatomicinteger_qulonglong
+    SOURCES
+        ../tst_qatomicinteger.cpp
+    DEFINES
+        QATOMIC_TEST_TYPE=qulonglong
+        tst_QAtomicIntegerXX=tst_QAtomicInteger_qulonglong
+)
diff --git a/tests/auto/corelib/thread/qatomicinteger/schar/CMakeLists.txt b/tests/auto/corelib/thread/qatomicinteger/schar/CMakeLists.txt
new file mode 100644
index 0000000000..9354bbe2e2
--- /dev/null
+++ b/tests/auto/corelib/thread/qatomicinteger/schar/CMakeLists.txt
@@ -0,0 +1,13 @@
+# Generated from schar.pro.
+
+#####################################################################
+## tst_qatomicinteger_schar Test:
+#####################################################################
+
+add_qt_test(tst_qatomicinteger_schar
+    SOURCES
+        ../tst_qatomicinteger.cpp
+    DEFINES
+        QATOMIC_TEST_TYPE=schar
+        tst_QAtomicIntegerXX=tst_QAtomicInteger_schar
+)
diff --git a/tests/auto/corelib/thread/qatomicinteger/short/CMakeLists.txt b/tests/auto/corelib/thread/qatomicinteger/short/CMakeLists.txt
new file mode 100644
index 0000000000..07143ed431
--- /dev/null
+++ b/tests/auto/corelib/thread/qatomicinteger/short/CMakeLists.txt
@@ -0,0 +1,13 @@
+# Generated from short.pro.
+
+#####################################################################
+## tst_qatomicinteger_short Test:
+#####################################################################
+
+add_qt_test(tst_qatomicinteger_short
+    SOURCES
+        ../tst_qatomicinteger.cpp
+    DEFINES
+        QATOMIC_TEST_TYPE=short
+        tst_QAtomicIntegerXX=tst_QAtomicInteger_short
+)
diff --git a/tests/auto/corelib/thread/qatomicinteger/uchar/CMakeLists.txt b/tests/auto/corelib/thread/qatomicinteger/uchar/CMakeLists.txt
new file mode 100644
index 0000000000..ebc64efea5
--- /dev/null
+++ b/tests/auto/corelib/thread/qatomicinteger/uchar/CMakeLists.txt
@@ -0,0 +1,13 @@
+# Generated from uchar.pro.
+
+#####################################################################
+## tst_qatomicinteger_uchar Test:
+#####################################################################
+
+add_qt_test(tst_qatomicinteger_uchar
+    SOURCES
+        ../tst_qatomicinteger.cpp
+    DEFINES
+        QATOMIC_TEST_TYPE=uchar
+        tst_QAtomicIntegerXX=tst_QAtomicInteger_uchar
+)
diff --git a/tests/auto/corelib/thread/qatomicinteger/uint/CMakeLists.txt b/tests/auto/corelib/thread/qatomicinteger/uint/CMakeLists.txt
new file mode 100644
index 0000000000..561274da9d
--- /dev/null
+++ b/tests/auto/corelib/thread/qatomicinteger/uint/CMakeLists.txt
@@ -0,0 +1,13 @@
+# Generated from uint.pro.
+
+#####################################################################
+## tst_qatomicinteger_uint Test:
+#####################################################################
+
+add_qt_test(tst_qatomicinteger_uint
+    SOURCES
+        ../tst_qatomicinteger.cpp
+    DEFINES
+        QATOMIC_TEST_TYPE=uint
+        tst_QAtomicIntegerXX=tst_QAtomicInteger_uint
+)
diff --git a/tests/auto/corelib/thread/qatomicinteger/ulong/CMakeLists.txt b/tests/auto/corelib/thread/qatomicinteger/ulong/CMakeLists.txt
new file mode 100644
index 0000000000..c859818838
--- /dev/null
+++ b/tests/auto/corelib/thread/qatomicinteger/ulong/CMakeLists.txt
@@ -0,0 +1,13 @@
+# Generated from ulong.pro.
+
+#####################################################################
+## tst_qatomicinteger_ulong Test:
+#####################################################################
+
+add_qt_test(tst_qatomicinteger_ulong
+    SOURCES
+        ../tst_qatomicinteger.cpp
+    DEFINES
+        QATOMIC_TEST_TYPE=ulong
+        tst_QAtomicIntegerXX=tst_QAtomicInteger_ulong
+)
diff --git a/tests/auto/corelib/thread/qatomicinteger/ushort/CMakeLists.txt b/tests/auto/corelib/thread/qatomicinteger/ushort/CMakeLists.txt
new file mode 100644
index 0000000000..6608390b8e
--- /dev/null
+++ b/tests/auto/corelib/thread/qatomicinteger/ushort/CMakeLists.txt
@@ -0,0 +1,13 @@
+# Generated from ushort.pro.
+
+#####################################################################
+## tst_qatomicinteger_ushort Test:
+#####################################################################
+
+add_qt_test(tst_qatomicinteger_ushort
+    SOURCES
+        ../tst_qatomicinteger.cpp
+    DEFINES
+        QATOMIC_TEST_TYPE=ushort
+        tst_QAtomicIntegerXX=tst_QAtomicInteger_ushort
+)
diff --git a/tests/auto/corelib/thread/qatomicinteger/wchar_t/CMakeLists.txt b/tests/auto/corelib/thread/qatomicinteger/wchar_t/CMakeLists.txt
new file mode 100644
index 0000000000..9c7e17f1bd
--- /dev/null
+++ b/tests/auto/corelib/thread/qatomicinteger/wchar_t/CMakeLists.txt
@@ -0,0 +1,13 @@
+# Generated from wchar_t.pro.
+
+#####################################################################
+## tst_qatomicinteger_wchar_t Test:
+#####################################################################
+
+add_qt_test(tst_qatomicinteger_wchar_t
+    SOURCES
+        ../tst_qatomicinteger.cpp
+    DEFINES
+        QATOMIC_TEST_TYPE=wchar_t
+        tst_QAtomicIntegerXX=tst_QAtomicInteger_wchar_t
+)
diff --git a/tests/auto/corelib/thread/qatomicpointer/CMakeLists.txt b/tests/auto/corelib/thread/qatomicpointer/CMakeLists.txt
new file mode 100644
index 0000000000..f400ad7b2e
--- /dev/null
+++ b/tests/auto/corelib/thread/qatomicpointer/CMakeLists.txt
@@ -0,0 +1,10 @@
+# Generated from qatomicpointer.pro.
+
+#####################################################################
+## tst_qatomicpointer Test:
+#####################################################################
+
+add_qt_test(tst_qatomicpointer
+    SOURCES
+        tst_qatomicpointer.cpp
+)
diff --git a/tests/auto/corelib/thread/qatomicpointer/tst_qatomicpointer.cpp b/tests/auto/corelib/thread/qatomicpointer/tst_qatomicpointer.cpp
index a699cf6202..9e12e7ccce 100644
--- a/tests/auto/corelib/thread/qatomicpointer/tst_qatomicpointer.cpp
+++ b/tests/auto/corelib/thread/qatomicpointer/tst_qatomicpointer.cpp
@@ -108,11 +108,7 @@ void tst_QAtomicPointer::warningFree()
 
 void tst_QAtomicPointer::alignment()
 {
-#ifdef Q_ALIGNOF
-    // this will cause a build error if the alignment isn't the same
-    char dummy[Q_ALIGNOF(QBasicAtomicPointer<void>) == Q_ALIGNOF(void*) ? 1 : -1];
-    (void)dummy;
-#endif
+    Q_STATIC_ASSERT(alignof(QBasicAtomicPointer<void>) == alignof(void*));
 }
 
 void tst_QAtomicPointer::constructor()
diff --git a/tests/auto/corelib/thread/qfuture/.prev_CMakeLists.txt b/tests/auto/corelib/thread/qfuture/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..671eeef665
--- /dev/null
+++ b/tests/auto/corelib/thread/qfuture/.prev_CMakeLists.txt
@@ -0,0 +1,14 @@
+# Generated from qfuture.pro.
+
+#####################################################################
+## tst_qfuture Test:
+#####################################################################
+
+add_qt_test(tst_qfuture
+    SOURCES
+        tst_qfuture.cpp
+    DEFINES
+        -QT_NO_JAVA_STYLE_ITERATORS
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+)
diff --git a/tests/auto/corelib/thread/qfuture/CMakeLists.txt b/tests/auto/corelib/thread/qfuture/CMakeLists.txt
new file mode 100644
index 0000000000..db1afabc0d
--- /dev/null
+++ b/tests/auto/corelib/thread/qfuture/CMakeLists.txt
@@ -0,0 +1,15 @@
+# Generated from qfuture.pro.
+
+#####################################################################
+## tst_qfuture Test:
+#####################################################################
+
+add_qt_test(tst_qfuture
+    SOURCES
+        tst_qfuture.cpp
+    DEFINES
+        # -QT_NO_JAVA_STYLE_ITERATORS # special case
+        QT_STRICT_ITERATORS
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+)
diff --git a/tests/auto/corelib/thread/qfuture/qfuture.pro b/tests/auto/corelib/thread/qfuture/qfuture.pro
index 1f21130af7..fe097edf20 100644
--- a/tests/auto/corelib/thread/qfuture/qfuture.pro
+++ b/tests/auto/corelib/thread/qfuture/qfuture.pro
@@ -2,5 +2,4 @@ CONFIG += testcase
 TARGET = tst_qfuture
 QT = core core-private testlib
 SOURCES = tst_qfuture.cpp
-DEFINES += QT_STRICT_ITERATORS
 DEFINES -= QT_NO_JAVA_STYLE_ITERATORS
diff --git a/tests/auto/corelib/thread/qfuturesynchronizer/CMakeLists.txt b/tests/auto/corelib/thread/qfuturesynchronizer/CMakeLists.txt
new file mode 100644
index 0000000000..54e3eb861d
--- /dev/null
+++ b/tests/auto/corelib/thread/qfuturesynchronizer/CMakeLists.txt
@@ -0,0 +1,10 @@
+# Generated from qfuturesynchronizer.pro.
+
+#####################################################################
+## tst_qfuturesynchronizer Test:
+#####################################################################
+
+add_qt_test(tst_qfuturesynchronizer
+    SOURCES
+        tst_qfuturesynchronizer.cpp
+)
diff --git a/tests/auto/corelib/thread/qfuturewatcher/CMakeLists.txt b/tests/auto/corelib/thread/qfuturewatcher/CMakeLists.txt
new file mode 100644
index 0000000000..c27412daac
--- /dev/null
+++ b/tests/auto/corelib/thread/qfuturewatcher/CMakeLists.txt
@@ -0,0 +1,13 @@
+# Generated from qfuturewatcher.pro.
+
+#####################################################################
+## tst_qfuturewatcher Test:
+#####################################################################
+
+add_qt_test(tst_qfuturewatcher
+    SOURCES
+        tst_qfuturewatcher.cpp
+    PUBLIC_LIBRARIES
+        Qt::Concurrent
+        Qt::CorePrivate
+)
diff --git a/tests/auto/corelib/thread/qmutex/CMakeLists.txt b/tests/auto/corelib/thread/qmutex/CMakeLists.txt
new file mode 100644
index 0000000000..536802f127
--- /dev/null
+++ b/tests/auto/corelib/thread/qmutex/CMakeLists.txt
@@ -0,0 +1,18 @@
+# Generated from qmutex.pro.
+
+#####################################################################
+## tst_qmutex Test:
+#####################################################################
+
+add_qt_test(tst_qmutex
+    SOURCES
+        tst_qmutex.cpp
+)
+
+## Scopes:
+#####################################################################
+
+extend_target(tst_qmutex CONDITION WIN32
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+)
diff --git a/tests/auto/corelib/thread/qmutexlocker/CMakeLists.txt b/tests/auto/corelib/thread/qmutexlocker/CMakeLists.txt
new file mode 100644
index 0000000000..a07548a494
--- /dev/null
+++ b/tests/auto/corelib/thread/qmutexlocker/CMakeLists.txt
@@ -0,0 +1,10 @@
+# Generated from qmutexlocker.pro.
+
+#####################################################################
+## tst_qmutexlocker Test:
+#####################################################################
+
+add_qt_test(tst_qmutexlocker
+    SOURCES
+        tst_qmutexlocker.cpp
+)
diff --git a/tests/auto/corelib/thread/qreadlocker/CMakeLists.txt b/tests/auto/corelib/thread/qreadlocker/CMakeLists.txt
new file mode 100644
index 0000000000..c52bc24491
--- /dev/null
+++ b/tests/auto/corelib/thread/qreadlocker/CMakeLists.txt
@@ -0,0 +1,10 @@
+# Generated from qreadlocker.pro.
+
+#####################################################################
+## tst_qreadlocker Test:
+#####################################################################
+
+add_qt_test(tst_qreadlocker
+    SOURCES
+        tst_qreadlocker.cpp
+)
diff --git a/tests/auto/corelib/thread/qreadwritelock/CMakeLists.txt b/tests/auto/corelib/thread/qreadwritelock/CMakeLists.txt
new file mode 100644
index 0000000000..3de89adb2d
--- /dev/null
+++ b/tests/auto/corelib/thread/qreadwritelock/CMakeLists.txt
@@ -0,0 +1,10 @@
+# Generated from qreadwritelock.pro.
+
+#####################################################################
+## tst_qreadwritelock Test:
+#####################################################################
+
+add_qt_test(tst_qreadwritelock
+    SOURCES
+        tst_qreadwritelock.cpp
+)
diff --git a/tests/auto/corelib/thread/qresultstore/CMakeLists.txt b/tests/auto/corelib/thread/qresultstore/CMakeLists.txt
new file mode 100644
index 0000000000..f630bdc43b
--- /dev/null
+++ b/tests/auto/corelib/thread/qresultstore/CMakeLists.txt
@@ -0,0 +1,12 @@
+# Generated from qresultstore.pro.
+
+#####################################################################
+## tst_qresultstore Test:
+#####################################################################
+
+add_qt_test(tst_qresultstore
+    SOURCES
+        tst_qresultstore.cpp
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+)
diff --git a/tests/auto/corelib/thread/qresultstore/qresultstore.pro b/tests/auto/corelib/thread/qresultstore/qresultstore.pro
index bbebe0976b..80e79b1c1a 100644
--- a/tests/auto/corelib/thread/qresultstore/qresultstore.pro
+++ b/tests/auto/corelib/thread/qresultstore/qresultstore.pro
@@ -2,4 +2,3 @@ CONFIG += testcase
 TARGET = tst_qresultstore
 QT = core-private testlib
 SOURCES = tst_qresultstore.cpp
-DEFINES += QT_STRICT_ITERATORS
diff --git a/tests/auto/corelib/thread/qsemaphore/CMakeLists.txt b/tests/auto/corelib/thread/qsemaphore/CMakeLists.txt
new file mode 100644
index 0000000000..3aaa71423e
--- /dev/null
+++ b/tests/auto/corelib/thread/qsemaphore/CMakeLists.txt
@@ -0,0 +1,10 @@
+# Generated from qsemaphore.pro.
+
+#####################################################################
+## tst_qsemaphore Test:
+#####################################################################
+
+add_qt_test(tst_qsemaphore
+    SOURCES
+        tst_qsemaphore.cpp
+)
diff --git a/tests/auto/corelib/thread/qthread/.prev_CMakeLists.txt b/tests/auto/corelib/thread/qthread/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..749a5e9734
--- /dev/null
+++ b/tests/auto/corelib/thread/qthread/.prev_CMakeLists.txt
@@ -0,0 +1,16 @@
+# Generated from qthread.pro.
+
+#####################################################################
+## tst_qthread Test:
+#####################################################################
+
+add_qt_test(tst_qthread
+    SOURCES
+        ../../../../shared/emulationdetector.h
+        tst_qthread.cpp
+    INCLUDE_DIRECTORIES
+        ../../../../shared
+)
+
+## Scopes:
+#####################################################################
diff --git a/tests/auto/corelib/thread/qthread/CMakeLists.txt b/tests/auto/corelib/thread/qthread/CMakeLists.txt
new file mode 100644
index 0000000000..a21e239c35
--- /dev/null
+++ b/tests/auto/corelib/thread/qthread/CMakeLists.txt
@@ -0,0 +1,18 @@
+# Generated from qthread.pro.
+
+#####################################################################
+## tst_qthread Test:
+#####################################################################
+
+add_qt_test(tst_qthread
+    SOURCES
+        ../../../../shared/emulationdetector.h
+        tst_qthread.cpp
+    INCLUDE_DIRECTORIES
+        ../../../../shared
+    LIBRARIES # special case
+        Threads::Threads # special case
+)
+
+## Scopes:
+#####################################################################
diff --git a/tests/auto/corelib/thread/qthreadonce/CMakeLists.txt b/tests/auto/corelib/thread/qthreadonce/CMakeLists.txt
new file mode 100644
index 0000000000..c29b4e640a
--- /dev/null
+++ b/tests/auto/corelib/thread/qthreadonce/CMakeLists.txt
@@ -0,0 +1,11 @@
+# Generated from qthreadonce.pro.
+
+#####################################################################
+## tst_qthreadonce Test:
+#####################################################################
+
+add_qt_test(tst_qthreadonce
+    SOURCES
+        qthreadonce.cpp
+        tst_qthreadonce.cpp
+)
diff --git a/tests/auto/corelib/thread/qthreadpool/CMakeLists.txt b/tests/auto/corelib/thread/qthreadpool/CMakeLists.txt
new file mode 100644
index 0000000000..bc3fca1b6a
--- /dev/null
+++ b/tests/auto/corelib/thread/qthreadpool/CMakeLists.txt
@@ -0,0 +1,10 @@
+# Generated from qthreadpool.pro.
+
+#####################################################################
+## tst_qthreadpool Test:
+#####################################################################
+
+add_qt_test(tst_qthreadpool
+    SOURCES
+        tst_qthreadpool.cpp
+)
diff --git a/tests/auto/corelib/thread/qthreadstorage/CMakeLists.txt b/tests/auto/corelib/thread/qthreadstorage/CMakeLists.txt
new file mode 100644
index 0000000000..52a928863c
--- /dev/null
+++ b/tests/auto/corelib/thread/qthreadstorage/CMakeLists.txt
@@ -0,0 +1,21 @@
+# special case skip regeneration
+# Generated from qthreadstorage.pro.
+
+#####################################################################
+## tst_qthreadstorage Test:
+#####################################################################
+
+add_qt_test(tst_qthreadstorage
+    SOURCES
+        tst_qthreadstorage.cpp
+    LIBRARIES # special case
+        Threads::Threads # special case
+
+)
+
+## Scopes:
+#####################################################################
+
+if(NOT ANDROID AND NOT WINRT)
+    add_subdirectory(crashonexit)
+endif()
diff --git a/tests/auto/corelib/thread/qthreadstorage/crashonexit/.prev_CMakeLists.txt b/tests/auto/corelib/thread/qthreadstorage/crashonexit/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..87ae29a04c
--- /dev/null
+++ b/tests/auto/corelib/thread/qthreadstorage/crashonexit/.prev_CMakeLists.txt
@@ -0,0 +1,15 @@
+# Generated from crashonexit.pro.
+
+#####################################################################
+## crashonexit Binary:
+#####################################################################
+
+add_qt_executable(crashonexit
+    OUTPUT_DIRECTORY "${INSTALL_TESTSDIR}/tst_qthreadstorage/crashonexit"
+    INSTALL_DIRECTORY "${INSTALL_TESTSDIR}/tst_qthreadstorage/crashonexit"
+    SOURCES
+        crashOnExit.cpp
+)
+
+## Scopes:
+#####################################################################
diff --git a/tests/auto/corelib/thread/qthreadstorage/crashonexit/CMakeLists.txt b/tests/auto/corelib/thread/qthreadstorage/crashonexit/CMakeLists.txt
new file mode 100644
index 0000000000..b2bac9713a
--- /dev/null
+++ b/tests/auto/corelib/thread/qthreadstorage/crashonexit/CMakeLists.txt
@@ -0,0 +1,15 @@
+# Generated from crashonexit.pro.
+
+#####################################################################
+## crashonexit Binary:
+#####################################################################
+
+add_qt_executable(crashOnExit_helper
+    OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/.." # special case
+    INSTALL_DIRECTORY "${INSTALL_TESTSDIR}/tst_qthreadstorage/crashOnExit_helper" # special case
+    SOURCES
+        crashOnExit.cpp
+)
+
+## Scopes:
+#####################################################################
diff --git a/tests/auto/corelib/thread/qwaitcondition/CMakeLists.txt b/tests/auto/corelib/thread/qwaitcondition/CMakeLists.txt
new file mode 100644
index 0000000000..76f8b33aa4
--- /dev/null
+++ b/tests/auto/corelib/thread/qwaitcondition/CMakeLists.txt
@@ -0,0 +1,10 @@
+# Generated from qwaitcondition.pro.
+
+#####################################################################
+## tst_qwaitcondition Test:
+#####################################################################
+
+add_qt_test(tst_qwaitcondition
+    SOURCES
+        tst_qwaitcondition.cpp
+)
diff --git a/tests/auto/corelib/thread/qwritelocker/CMakeLists.txt b/tests/auto/corelib/thread/qwritelocker/CMakeLists.txt
new file mode 100644
index 0000000000..00a9809174
--- /dev/null
+++ b/tests/auto/corelib/thread/qwritelocker/CMakeLists.txt
@@ -0,0 +1,10 @@
+# Generated from qwritelocker.pro.
+
+#####################################################################
+## tst_qwritelocker Test:
+#####################################################################
+
+add_qt_test(tst_qwritelocker
+    SOURCES
+        tst_qwritelocker.cpp
+)
diff --git a/tests/auto/corelib/time/CMakeLists.txt b/tests/auto/corelib/time/CMakeLists.txt
new file mode 100644
index 0000000000..ed990d1979
--- /dev/null
+++ b/tests/auto/corelib/time/CMakeLists.txt
@@ -0,0 +1,7 @@
+# Generated from time.pro.
+
+add_subdirectory(qcalendar)
+add_subdirectory(qdate)
+add_subdirectory(qdatetime)
+add_subdirectory(qtime)
+add_subdirectory(qtimezone)
diff --git a/tests/auto/corelib/time/qcalendar/CMakeLists.txt b/tests/auto/corelib/time/qcalendar/CMakeLists.txt
new file mode 100644
index 0000000000..1e59a1f0b0
--- /dev/null
+++ b/tests/auto/corelib/time/qcalendar/CMakeLists.txt
@@ -0,0 +1,10 @@
+# Generated from qcalendar.pro.
+
+#####################################################################
+## tst_qcalendar Test:
+#####################################################################
+
+add_qt_test(tst_qcalendar
+    SOURCES
+        tst_qcalendar.cpp
+)
diff --git a/tests/auto/corelib/time/qdate/CMakeLists.txt b/tests/auto/corelib/time/qdate/CMakeLists.txt
new file mode 100644
index 0000000000..b39828b5df
--- /dev/null
+++ b/tests/auto/corelib/time/qdate/CMakeLists.txt
@@ -0,0 +1,12 @@
+# Generated from qdate.pro.
+
+#####################################################################
+## tst_qdate Test:
+#####################################################################
+
+add_qt_test(tst_qdate
+    SOURCES
+        tst_qdate.cpp
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+)
diff --git a/tests/auto/corelib/time/qdate/tst_qdate.cpp b/tests/auto/corelib/time/qdate/tst_qdate.cpp
index 274bf4f6f0..402c2c74d4 100644
--- a/tests/auto/corelib/time/qdate/tst_qdate.cpp
+++ b/tests/auto/corelib/time/qdate/tst_qdate.cpp
@@ -1159,10 +1159,8 @@ void tst_QDate::fromStringDateFormat_data()
         << Qt::RFC2822Date << QDate();
     QTest::newRow("RFC 2822 invalid year") << QString::fromLatin1("13 Fev 0000 13:24:51 +0100")
         << Qt::RFC2822Date << QDate();
-    // Test invalid characters (currently ignoring trailing junk, but see QTBUG-80038).
     QTest::newRow("RFC 2822 invalid character at end")
-        << QString::fromLatin1("01 Jan 2012 08:00:00 +0100!")
-        << Qt::RFC2822Date << QDate(2012, 1, 1);
+        << QString::fromLatin1("01 Jan 2012 08:00:00 +0100!") << Qt::RFC2822Date << QDate();
     QTest::newRow("RFC 2822 invalid character at front")
         << QString::fromLatin1("!01 Jan 2012 08:00:00 +0100") << Qt::RFC2822Date << QDate();
     QTest::newRow("RFC 2822 invalid character both ends")
@@ -1189,10 +1187,10 @@ void tst_QDate::fromStringDateFormat_data()
     // No time specified
     QTest::newRow("RFC 850 and 1036 date only") << QString::fromLatin1("Fri Nov 01 2002")
         << Qt::RFC2822Date << QDate(2002, 11, 1);
-    // Test invalid characters (currently ignoring trailing junk, but see QTBUG-80038).
+    // Test invalid characters.
     QTest::newRow("RFC 850 and 1036 invalid character at end")
         << QString::fromLatin1("Sun Jan 01 08:00:00 2012 +0100!")
-        << Qt::RFC2822Date << QDate(2012, 1, 1);
+        << Qt::RFC2822Date << QDate();
     QTest::newRow("RFC 850 and 1036 invalid character at front")
         << QString::fromLatin1("!Sun Jan 01 08:00:00 2012 +0100")
         << Qt::RFC2822Date << QDate();
diff --git a/tests/auto/corelib/time/qdatetime/CMakeLists.txt b/tests/auto/corelib/time/qdatetime/CMakeLists.txt
new file mode 100644
index 0000000000..e992936e60
--- /dev/null
+++ b/tests/auto/corelib/time/qdatetime/CMakeLists.txt
@@ -0,0 +1,26 @@
+# Generated from qdatetime.pro.
+
+#####################################################################
+## tst_qdatetime Test:
+#####################################################################
+
+add_qt_test(tst_qdatetime
+    SOURCES
+        tst_qdatetime.cpp
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+)
+
+## Scopes:
+#####################################################################
+
+#### Keys ignored in scope 2:.:.:qdatetime.pro:MSVC:
+# QMAKE_CFLAGS_RELEASE = "--O1"
+# QMAKE_CXXFLAGS_RELEASE = "--O1"
+
+extend_target(tst_qdatetime CONDITION APPLE
+    SOURCES
+        tst_qdatetime_mac.mm
+    PUBLIC_LIBRARIES
+        ${FWFoundation}
+)
diff --git a/tests/auto/corelib/time/qdatetime/tst_qdatetime.cpp b/tests/auto/corelib/time/qdatetime/tst_qdatetime.cpp
index 26ad91271d..a6a68b66ed 100644
--- a/tests/auto/corelib/time/qdatetime/tst_qdatetime.cpp
+++ b/tests/auto/corelib/time/qdatetime/tst_qdatetime.cpp
@@ -2397,11 +2397,8 @@ void tst_QDateTime::fromStringDateFormat_data()
         << Qt::RFC2822Date << QDateTime(QDate(1970, 1, 1), QTime(0, 12, 34), Qt::UTC);
     QTest::newRow("RFC 2822 with day +0000") << QString::fromLatin1("Thu, 01 Jan 1970 00:12:34 +0000")
         << Qt::RFC2822Date << QDateTime(QDate(1970, 1, 1), QTime(0, 12, 34), Qt::UTC);
-    // Should be invalid, but current implementation would just ignore the
-    // offset as trailing junk if we insist on the space:
     QTest::newRow("RFC 2822 missing space before +0100")
-        << QString::fromLatin1("Thu, 01 Jan 1970 00:12:34+0100") << Qt::RFC2822Date
-        << QDateTime(QDate(1970, 1, 1), QTime(0, 12, 34), Qt::OffsetFromUTC, 3600);
+        << QString::fromLatin1("Thu, 01 Jan 1970 00:12:34+0100") << Qt::RFC2822Date << QDateTime();
     // No timezone assume UTC
     QTest::newRow("RFC 2822 no timezone") << QString::fromLatin1("01 Jan 1970 00:12:34")
         << Qt::RFC2822Date << QDateTime(QDate(1970, 1, 1), QTime(0, 12, 34), Qt::UTC);
@@ -2417,10 +2414,10 @@ void tst_QDateTime::fromStringDateFormat_data()
         << Qt::RFC2822Date << invalidDateTime();
     QTest::newRow("RFC 2822 invalid year") << QString::fromLatin1("13 Fev 0000 13:24:51 +0100")
         << Qt::RFC2822Date << invalidDateTime();
-    // Test invalid characters (currently ignoring trailing junk, but see QTBUG-80038).
+    // Test invalid characters.
     QTest::newRow("RFC 2822 invalid character at end")
         << QString::fromLatin1("01 Jan 2012 08:00:00 +0100!")
-        << Qt::RFC2822Date << QDateTime(QDate(2012, 1, 1), QTime(7, 0, 0, 0), Qt::UTC);
+        << Qt::RFC2822Date << QDateTime();
     QTest::newRow("RFC 2822 invalid character at front")
         << QString::fromLatin1("!01 Jan 2012 08:00:00 +0100")
         << Qt::RFC2822Date << invalidDateTime();
@@ -2458,10 +2455,10 @@ void tst_QDateTime::fromStringDateFormat_data()
     QTest::newRow("RFC 850 and 1036 date only")
         << QString::fromLatin1("Fri Nov 01 2002")
         << Qt::RFC2822Date << invalidDateTime();
-    // Test invalid characters (currently ignoring trailing junk, but see QTBUG-80038).
+    // Test invalid characters.
     QTest::newRow("RFC 850 and 1036 invalid character at end")
         << QString::fromLatin1("Sun Jan 01 08:00:00 2012 +0100!")
-        << Qt::RFC2822Date << QDateTime(QDate(2012, 1, 1), QTime(7, 0, 0, 0), Qt::UTC);
+        << Qt::RFC2822Date << QDateTime();
     QTest::newRow("RFC 850 and 1036 invalid character at front")
         << QString::fromLatin1("!Sun Jan 01 08:00:00 2012 +0100")
         << Qt::RFC2822Date << invalidDateTime();
diff --git a/tests/auto/corelib/time/qtime/CMakeLists.txt b/tests/auto/corelib/time/qtime/CMakeLists.txt
new file mode 100644
index 0000000000..ef224b45e3
--- /dev/null
+++ b/tests/auto/corelib/time/qtime/CMakeLists.txt
@@ -0,0 +1,10 @@
+# Generated from qtime.pro.
+
+#####################################################################
+## tst_qtime Test:
+#####################################################################
+
+add_qt_test(tst_qtime
+    SOURCES
+        tst_qtime.cpp
+)
diff --git a/tests/auto/corelib/time/qtime/tst_qtime.cpp b/tests/auto/corelib/time/qtime/tst_qtime.cpp
index 027232f6d5..9af5fa5e8e 100644
--- a/tests/auto/corelib/time/qtime/tst_qtime.cpp
+++ b/tests/auto/corelib/time/qtime/tst_qtime.cpp
@@ -646,17 +646,19 @@ void tst_QTime::fromStringDateFormat_data()
         << Qt::RFC2822Date << invalidTime();
     QTest::newRow("RFC 2822 with day date only") << QString::fromLatin1("Fri, 01 Nov 2002")
         << Qt::RFC2822Date << invalidTime();
-    // Test invalid month, day, year
+    // Test invalid month, day, year are ignored:
     QTest::newRow("RFC 2822 invalid month name") << QString::fromLatin1("13 Fev 1987 13:24:51 +0100")
         << Qt::RFC2822Date << QTime(13, 24, 51);
-    QTest::newRow("RFC 2822 invalid day") << QString::fromLatin1("36 Fev 1987 13:24:51 +0100")
+    QTest::newRow("RFC 2822 invalid day") << QString::fromLatin1("36 Feb 1987 13:24:51 +0100")
         << Qt::RFC2822Date << QTime(13, 24, 51);
-    QTest::newRow("RFC 2822 invalid year") << QString::fromLatin1("13 Fev 0000 13:24:51 +0100")
+    QTest::newRow("RFC 2822 invalid day name") << QString::fromLatin1("Mud, 23 Feb 1987 13:24:51 +0100")
         << Qt::RFC2822Date << QTime(13, 24, 51);
-    // Test invalid characters (currently ignoring trailing junk, but see QTBUG-80038).
+    QTest::newRow("RFC 2822 invalid year") << QString::fromLatin1("13 Feb 0000 13:24:51 +0100")
+        << Qt::RFC2822Date << QTime(13, 24, 51);
+    // Test invalid characters:
     QTest::newRow("RFC 2822 invalid character at end")
         << QString::fromLatin1("01 Jan 2012 08:00:00 +0100!")
-        << Qt::RFC2822Date << QTime(8, 0, 0);
+        << Qt::RFC2822Date << invalidTime();
     QTest::newRow("RFC 2822 invalid character at front")
         << QString::fromLatin1("!01 Jan 2012 08:00:00 +0100")
         << Qt::RFC2822Date << invalidTime();
@@ -687,10 +689,10 @@ void tst_QTime::fromStringDateFormat_data()
     // No time specified
     QTest::newRow("RFC 850 and 1036 date only") << QString::fromLatin1("Fri Nov 01 2002")
         << Qt::RFC2822Date << invalidTime();
-    // Test invalid characters (currently ignoring trailing junk, but see QTBUG-80038).
+    // Test invalid characters.
     QTest::newRow("RFC 850 and 1036 invalid character at end")
         << QString::fromLatin1("Sun Jan 01 08:00:00 2012 +0100!")
-        << Qt::RFC2822Date << QTime(8, 0, 0);
+        << Qt::RFC2822Date << invalidTime();
     QTest::newRow("RFC 850 and 1036 invalid character at front")
         << QString::fromLatin1("!Sun Jan 01 08:00:00 2012 +0100")
         << Qt::RFC2822Date << invalidTime();
diff --git a/tests/auto/corelib/time/qtimezone/CMakeLists.txt b/tests/auto/corelib/time/qtimezone/CMakeLists.txt
new file mode 100644
index 0000000000..d95a2ac767
--- /dev/null
+++ b/tests/auto/corelib/time/qtimezone/CMakeLists.txt
@@ -0,0 +1,27 @@
+# Generated from qtimezone.pro.
+
+#####################################################################
+## tst_qtimezone Test:
+#####################################################################
+
+add_qt_test(tst_qtimezone
+    SOURCES
+        tst_qtimezone.cpp
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+)
+
+## Scopes:
+#####################################################################
+
+extend_target(tst_qtimezone CONDITION QT_FEATURE_icu
+    LIBRARIES
+        ICU::i18n ICU::uc ICU::data
+)
+
+extend_target(tst_qtimezone CONDITION APPLE
+    SOURCES
+        tst_qtimezone_darwin.mm
+    PUBLIC_LIBRARIES
+        ${FWFoundation}
+)
diff --git a/tests/auto/corelib/tools/CMakeLists.txt b/tests/auto/corelib/tools/CMakeLists.txt
new file mode 100644
index 0000000000..f1967c3664
--- /dev/null
+++ b/tests/auto/corelib/tools/CMakeLists.txt
@@ -0,0 +1,49 @@
+# Generated from tools.pro.
+
+# add_subdirectory(collections) # special case not ported
+# add_subdirectory(containerapisymmetry) # special case not ported
+add_subdirectory(qalgorithms)
+add_subdirectory(qarraydata)
+# add_subdirectory(qarraydata_strictiterators) # special case not ported
+add_subdirectory(qbitarray)
+add_subdirectory(qcache)
+add_subdirectory(qcommandlineparser)
+add_subdirectory(qcontiguouscache)
+# add_subdirectory(qcryptographichash) # special case not ported
+add_subdirectory(qeasingcurve)
+add_subdirectory(qexplicitlyshareddatapointer)
+# add_subdirectory(qfreelist) # special case not ported
+add_subdirectory(qhash)
+# add_subdirectory(qhash_strictiterators) # special case not ported
+add_subdirectory(qhashfunctions)
+# add_subdirectory(qline) # special case not ported
+# add_subdirectory(qlist) # special case no longer exists
+# add_subdirectory(qlist_strictiterators) # special case not ported
+add_subdirectory(qmakearray)
+add_subdirectory(qmap)
+# add_subdirectory(qmap_strictiterators) # special case not ported
+add_subdirectory(qmargins)
+add_subdirectory(qmessageauthenticationcode)
+# add_subdirectory(qoffsetstringarray) # special case not ported
+add_subdirectory(qpair)
+add_subdirectory(qpoint)
+add_subdirectory(qpointf)
+add_subdirectory(qqueue)
+add_subdirectory(qrect)
+add_subdirectory(qringbuffer)
+add_subdirectory(qscopedpointer)
+add_subdirectory(qscopedvaluerollback)
+add_subdirectory(qscopeguard)
+add_subdirectory(qset)
+# add_subdirectory(qsharedpointer) # special case not ported
+add_subdirectory(qsize)
+add_subdirectory(qsizef)
+add_subdirectory(qstl)
+add_subdirectory(qtimeline)
+add_subdirectory(qvarlengtharray)
+# add_subdirectory(qvector) # special case not ported
+# add_subdirectory(qvector_strictiterators) # special case not ported
+# add_subdirectory(qversionnumber) # special case not ported
+if(APPLE)
+    # add_subdirectory(qmacautoreleasepool) # special case not ported
+endif()
diff --git a/tests/auto/corelib/tools/collections/collections.pro b/tests/auto/corelib/tools/collections/collections.pro
index e0f9f0a0ea..0182a0c837 100644
--- a/tests/auto/corelib/tools/collections/collections.pro
+++ b/tests/auto/corelib/tools/collections/collections.pro
@@ -4,6 +4,4 @@ SOURCES  += tst_collections.cpp
 QT = core testlib
 
 # This test does not work with strict iterators
-DEFINES -= QT_NO_LINKED_LIST
-DEFINES -= QT_STRICT_ITERATORS
 DEFINES -= QT_NO_JAVA_STYLE_ITERATORS
diff --git a/tests/auto/corelib/tools/collections/tst_collections.cpp b/tests/auto/corelib/tools/collections/tst_collections.cpp
index e79a4dba29..6fcf726c21 100644
--- a/tests/auto/corelib/tools/collections/tst_collections.cpp
+++ b/tests/auto/corelib/tools/collections/tst_collections.cpp
@@ -32,7 +32,6 @@
 
 static QCache<int, int> *cacheX;
 static QHash<int, int> *hashX;
-static QLinkedList<int> *linkedListX;
 static QList<int> *listX;
 static QMap<int, int> *mapX;
 static QMultiHash<int, int> *multiHashX;
@@ -49,7 +48,6 @@ void foo()
 {
     cacheX = 0;
     hashX = 0;
-    linkedListX = 0;
     listX = 0;
     mapX = 0;
     multiHashX = 0;
@@ -71,7 +69,6 @@ void foo()
 #include "qbytearray.h"
 #include "qcache.h"
 #include "qhash.h"
-#include "qlinkedlist.h"
 #include "qlist.h"
 #include "qmap.h"
 #include "qpair.h"
@@ -84,10 +81,6 @@ void foo()
 #include "qvector.h"
 #include "qqueue.h"
 
-QT_BEGIN_NAMESPACE
-template class QList<int>;
-QT_END_NAMESPACE
-
 class tst_Collections : public QObject
 {
     Q_OBJECT
@@ -96,7 +89,6 @@ private slots:
     void typeinfo();
     void qstring();
     void list();
-    void linkedList();
     void vector();
     void byteArray();
     void stack();
@@ -109,7 +101,6 @@ private slots:
 #endif
     void pair();
     void sharableQList();
-    void sharableQLinkedList();
     void sharableQVector();
     void sharableQMap();
     void sharableQHash();
@@ -121,8 +112,6 @@ private slots:
     void vector_stl();
     void list_stl_data();
     void list_stl();
-    void linkedlist_stl_data();
-    void linkedlist_stl();
     void q_init();
     void pointersize();
     void containerInstantiation();
@@ -551,19 +540,12 @@ void tst_Collections::list()
         list << "foo" << "bar";
         QVERIFY(!list.isEmpty());
 
-        list.insert(-1, "lessthanzero");
-        QCOMPARE(list.at(0), QString("lessthanzero"));
-
         list.insert(0, "atzero");
         QCOMPARE(list.at(0), QString("atzero"));
 
         int listCount = list.count();
         list.insert(listCount, "atcount");
         QCOMPARE(list.at(listCount), QString("atcount"));
-
-        listCount = list.count();
-        list.insert(listCount + 1, "beyondcount");
-        QCOMPARE(list.at(listCount), QString("beyondcount"));
     }
 
     {
@@ -736,228 +718,6 @@ void tst_Collections::list()
     }
 }
 
-void tst_Collections::linkedList()
-{
-    {
-        QLinkedList<int> list;
-        QVERIFY(list.isEmpty());
-        list.append(1);
-        list.push_back(2);
-        list += (3);
-        list << 4 << 5 << 6;
-        QVERIFY(!list.isEmpty());
-        QVERIFY(list.size() == 6);
-        {
-            int sum = 0;
-            QLinkedListIterator<int> i = list;
-            while (i.hasNext()) {
-                sum += i.next();
-            }
-            QVERIFY(sum == 21);
-        }
-        {
-            int sum = 0;
-            QLinkedList<int>::const_iterator i = list.begin();
-            while (i != list.end())
-                sum += *i++;
-            QVERIFY(sum == 21);
-        }
-        {
-            QMutableLinkedListIterator<int> i = list;
-            while (i.hasNext())
-                i.setValue(2*i.next());
-        }
-        {
-            int sum = 0;
-            QLinkedListIterator<int> i = list;
-            i.toBack();
-            while (i.hasPrevious())
-                sum += i.previous();
-            QVERIFY(sum == 2*21);
-        }
-        {
-            QMutableLinkedListIterator<int> i = list;
-            i.toBack();
-            while (i.hasPrevious())
-                i.setValue(2*i.previous());
-        }
-        {
-            int sum = 0;
-            QLinkedListIterator<int> i = list;
-            i.toBack();
-            while (i.hasPrevious())
-                sum += i.previous();
-            QVERIFY(sum == 2*2*21);
-        }
-        {
-            QMutableLinkedListIterator<int> i = list;
-            while (i.hasNext()) {
-                int a = i.next();
-                i.insert(a);
-            }
-        }
-        {
-            int sum = 0;
-            QLinkedList<int>::iterator i = list.begin();
-            while (i != list.end())
-                sum += *i++;
-            QVERIFY(sum == 2*2*2*21);
-        }
-        {
-            int duplicates = 0;
-            QLinkedListIterator<int> i = list;
-            while (i.hasNext()) {
-                int a = i.next();
-                if (i.hasNext() && a == i.peekNext())
-                    duplicates++;
-            }
-            QVERIFY(duplicates == 6);
-        }
-        {
-            int duplicates = 0;
-            QLinkedListIterator<int> i = list;
-            i.toBack();
-            while (i.hasPrevious()) {
-                int a = i.previous();
-                if (i.hasPrevious() && a == i.peekPrevious())
-                    duplicates++;
-            }
-            QVERIFY(duplicates == 6);
-        }
-        {
-            QMutableLinkedListIterator<int> i = list;
-            while (i.hasNext()) {
-                int a = i.next();
-                if (i.hasNext() &&
-                     i.peekNext() == a)
-                    i.remove();
-            }
-        }
-        {
-            int duplicates = 0;
-            QMutableLinkedListIterator<int> i = list;
-            i.toBack();
-            while (i.hasPrevious()) {
-                int a = i.previous();
-                if (i.hasPrevious() && a == i.peekPrevious())
-                    duplicates++;
-            }
-            QVERIFY(duplicates == 0);
-        }
-        {
-            QVERIFY(list.size() == 6);
-            QMutableLinkedListIterator<int> i = list;
-            while (i.hasNext()) {
-                int a = i.peekNext();
-                i.insert(42);
-                QVERIFY(i.peekPrevious() == 42 && i.peekNext() == a);
-                i.next();
-            }
-            QVERIFY(list.size() == 12);
-            i.toFront();
-            while (i.findNext(42))
-                i.remove();
-        }
-        {
-            QLinkedList<int> l;
-            l << 4 << 8 << 12 << 16 << 20 << 24;
-            QVERIFY(l == list);
-            QLinkedList<int> copy = list;
-            list += list;
-            QVERIFY(l != list && l.size() == list.size()/2 && l == copy);
-            l += copy;
-            QVERIFY(l == list);
-            list = copy;
-        }
-        {
-            QLinkedList<int> copy = list;
-            list.prepend(999);
-            list.append(999);
-            QVERIFY(list.contains(999));
-            QVERIFY(list.count(999) == 2);
-            list.removeAll(999);
-            QVERIFY(list == copy);
-        }
-        {
-            QLinkedList<QString> list;
-            list << "one" << "two" << "three" << "four" << "five" << "six";
-            while (!list.isEmpty())
-                list.removeAll(list.first());
-        }
-        {
-            QLinkedList<QString> list;
-            list << "one" << "two" << "one" << "two";
-            QVERIFY(!list.removeOne("three"));
-            QVERIFY(list.removeOne("two"));
-            QCOMPARE(list, QLinkedList<QString>() << "one" << "one" << "two");;
-            QVERIFY(list.removeOne("two"));
-            QCOMPARE(list, QLinkedList<QString>() << "one" << "one");
-            QVERIFY(!list.removeOne("two"));
-            QCOMPARE(list, QLinkedList<QString>() << "one" << "one");
-            QVERIFY(list.removeOne("one"));
-            QCOMPARE(list, QLinkedList<QString>() << "one");
-            QVERIFY(list.removeOne("one"));
-            QVERIFY(list.isEmpty());
-            QVERIFY(!list.removeOne("one"));
-            QVERIFY(list.isEmpty());
-        }
-        {
-            list.clear();
-            QVERIFY(list.isEmpty());
-            QVERIFY(list.begin() == list.end());
-            QLinkedListIterator<int> i(list);
-            QVERIFY(!i.hasNext() && !i.hasPrevious());
-        }
-    }
-
-    {
-        QLinkedList<QString> list;
-        list.append("Hello");
-
-        QLinkedList<QString>::iterator it = list.begin();
-        QVERIFY((*it)[0] == QChar('H'));
-        QVERIFY(it->constData()[0] == QChar('H'));
-        it->replace(QChar('H'), QChar('X'));
-        QCOMPARE(list.first(), QLatin1String("Xello"));
-
-        QLinkedList<QString>::const_iterator cit = list.constBegin();
-        QCOMPARE((*cit).toLower(), QLatin1String("xello"));
-        QCOMPARE(cit->toUpper(), QLatin1String("XELLO"));
-
-        cit = list.cbegin();
-        QCOMPARE((*cit).toLower(), QLatin1String("xello"));
-        QCOMPARE(cit->toUpper(), QLatin1String("XELLO"));
-    }
-
-    {
-        QLinkedList<QString> list;
-        list << "alpha" << "beta";
-        list += list;
-        QVERIFY(list.size() == 4);
-        QCOMPARE(*list.begin(), QLatin1String("alpha"));
-        QCOMPARE(*(list.begin() + 1), QLatin1String("beta"));
-        QCOMPARE(*(list.begin() + 2), QLatin1String("alpha"));
-        QCOMPARE(*(list.begin() + 3), QLatin1String("beta"));
-    }
-
-    {
-        QLinkedList<int> a;
-        QCOMPARE(a.startsWith(1), false);
-        QCOMPARE(a.endsWith(1), false);
-        a.append(1);
-        QCOMPARE(a.startsWith(1), true);
-        QCOMPARE(a.startsWith(2), false);
-        QCOMPARE(a.endsWith(1), true);
-        QCOMPARE(a.endsWith(2), false);
-        a.append(2);
-        QCOMPARE(a.startsWith(1), true);
-        QCOMPARE(a.startsWith(2), false);
-        QCOMPARE(a.endsWith(1), false);
-        QCOMPARE(a.endsWith(2), true);
-    }
-};
-
-
 void tst_Collections::vector()
 {
     QVector<int> v1;
@@ -1562,12 +1322,12 @@ void tst_Collections::hash()
     }
 
     {
-        QHash<int, QString> hash1, hash2;
-        hash1.insertMulti(1, "Alpha");
-        hash1.insertMulti(1, "Gamma");
-        hash2.insertMulti(1, "Beta");
-        hash2.insertMulti(1, "Gamma");
-        hash2.insertMulti(1, "Gamma");
+        QMultiHash<int, QString> hash1, hash2;
+        hash1.insert(1, "Alpha");
+        hash1.insert(1, "Gamma");
+        hash2.insert(1, "Beta");
+        hash2.insert(1, "Gamma");
+        hash2.insert(1, "Gamma");
 
         hash1.unite(hash2);
         QCOMPARE(hash1.size(), 5);
@@ -1997,15 +1757,6 @@ void tst_Collections::qstring()
     QVERIFY(null.isNull());
     QVERIFY(!nonNull.isNull());
 
-#if QT_DEPRECATED_SINCE(5, 9)
-    QVERIFY(null == QString::null);
-    QVERIFY(QString::null  == null);
-    QVERIFY(nonNull != QString::null);
-    QVERIFY(QString::null != nonNull);
-    QVERIFY(null == nonNull);
-    QVERIFY(QString::null == QString::null);
-#endif
-
     QString fill = "123";
     fill.fill('a');
     QCOMPARE(fill, QLatin1String("aaa"));
@@ -2331,18 +2082,6 @@ void populate(QList<int> &container)
 }
 
 template <>
-void populate(QLinkedList<int> &container)
-{
-    container << 1 << 2 << 4 << 8;
-}
-
-template <>
-void populate(QVector<int> &container)
-{
-    container << 1 << 2 << 4 << 8;
-}
-
-template <>
 void populate(QMap<int, int> &container)
 {
     container.insert(1, 1);
@@ -2431,11 +2170,6 @@ void tst_Collections::sharableQList()
     TEST_SEQUENTIAL_CONTAINER(List);
 }
 
-void tst_Collections::sharableQLinkedList()
-{
-    TEST_SEQUENTIAL_CONTAINER(LinkedList);
-}
-
 void tst_Collections::sharableQVector()
 {
     TEST_SEQUENTIAL_CONTAINER(Vector);
@@ -2727,8 +2461,10 @@ void testMapLikeStlIterators()
     QString t;
     fake.insert(k, t);
 
-    typename Container::iterator i1 = fake.begin(), i2 = i1 + 1;
-    typename Container::const_iterator c1 = i1, c2 = c1 + 1;
+    typename Container::iterator i1 = fake.begin(), i2 = i1;
+    ++i2;
+    typename Container::const_iterator c1 = i1, c2 = c1;
+    ++c2;
 
     QVERIFY(i1 == i1);
     QVERIFY(i1 == c1);
@@ -2738,8 +2474,6 @@ void testMapLikeStlIterators()
     QVERIFY(i2 == c2);
     QVERIFY(c2 == i2);
     QVERIFY(c2 == c2);
-    QVERIFY(1 + i1 == i1 + 1);
-    QVERIFY(1 + c1 == c1 + 1);
 
     QVERIFY(i1 != i2);
     QVERIFY(i1 != c2);
@@ -2755,7 +2489,6 @@ void tst_Collections::constAndNonConstStlIterators()
 {
     testListLikeStlIterators<QList<int> >();
     testListLikeStlIterators<QStringList >();
-    testLinkedListLikeStlIterators<QLinkedList<int> >();
     testListLikeStlIterators<QVector<int> >();
     testMapLikeStlIterators<QMap<QString, QString> >();
     testMapLikeStlIterators<QMultiMap<QString, QString> >();
@@ -2798,31 +2531,6 @@ void tst_Collections::vector_stl()
     QCOMPARE(QVector<QString>(stdVector.begin(), stdVector.end()), vector);
 }
 
-void tst_Collections::linkedlist_stl_data()
-{
-    list_stl_data();
-}
-
-void tst_Collections::linkedlist_stl()
-{
-    QFETCH(QStringList, elements);
-
-    QLinkedList<QString> list;
-    for (int i = 0; i < elements.count(); ++i)
-        list << elements.at(i);
-
-    std::list<QString> stdList = list.toStdList();
-
-    QCOMPARE(int(stdList.size()), elements.size());
-
-    std::list<QString>::const_iterator it = stdList.begin();
-    QLinkedList<QString>::const_iterator it2 = list.cbegin();
-    for (uint j = 0; j < stdList.size(); ++j, ++it, ++it2)
-        QCOMPARE(*it, *it2);
-
-    QCOMPARE(QLinkedList<QString>::fromStdList(stdList), list);
-}
-
 void tst_Collections::list_stl_data()
 {
     QTest::addColumn<QStringList>("elements");
@@ -2950,10 +2658,6 @@ void instantiateMutableIterationContainer()
     it = container.begin();
     it = container.end();
     Q_UNUSED(it)
-
-    // QSet lacks count(T).
-    const ValueType value = ValueType();
-    container.count(value);
 }
 
 template <typename ContainerType, typename ValueType>
@@ -2961,10 +2665,9 @@ void instantiateSequence()
 {
     instantiateMutableIterationContainer<ContainerType, ValueType>();
 
-// QVector lacks removeAll(T)
-//    ValueType value = ValueType();
-//    ContainerType container;
-//    container.removeAll(value);
+    ValueType value = ValueType();
+    ContainerType container;
+    container.removeAll(value);
 }
 
 template <typename ContainerType, typename ValueType>
@@ -3037,11 +2740,10 @@ void instantiatePairAssociative()
     constContainer.keys();
     container.remove(key);
     container.take(key);
-    container.unite(constContainer);
+    container.insert(constContainer);
     container.value(key);
     container.value(key, value);
     container.values();
-    container.values(key);
     container[key];
     const int foo = constContainer[key];
     Q_UNUSED(foo);
@@ -3070,15 +2772,6 @@ void tst_Collections::containerInstantiation()
     typedef QSet<EqualsComparable> Set;
     instantiateAssociative<Set, EqualsComparable>();
 
-    //Instantiate QLinkedList member functions.
-    typedef QLinkedList<EqualsComparable> LinkedList;
-    instantiateSequence<LinkedList, EqualsComparable> ();
-    {
-        EqualsComparable value;
-        LinkedList list;
-        list.removeAll(value);
-    }
-
     //Instantiate QList member functions.
     typedef QList<EqualsComparable> List;
     instantiateRandomAccess<List, EqualsComparable>();
@@ -3185,7 +2878,6 @@ void tst_Collections::containerTypedefs()
     testContainerTypedefs(QVector<int>());
     testContainerTypedefs(QStack<int>());
     testContainerTypedefs(QList<int>());
-    testContainerTypedefs(QLinkedList<int>());
     testContainerTypedefs(QQueue<int>());
 
     testPairAssociativeContainerTypedefs(QMap<int, int>());
@@ -3207,16 +2899,13 @@ void tst_Collections::forwardDeclared()
     { typedef QMultiMap<Key1, T1> C; C *x = 0; C::iterator i; C::const_iterator j; Q_UNUSED(x) }
     { typedef QPair<T1, T2> C; C *x = 0; Q_UNUSED(x) }
     { typedef QList<T1> C; C *x = 0; C::iterator i; C::const_iterator j; Q_UNUSED(x) }
-    { typedef QLinkedList<T1> C; C *x = 0; C::iterator i; C::const_iterator j; Q_UNUSED(x) }
     { typedef QVector<T1> C; C *x = 0; C::iterator i; C::const_iterator j; Q_UNUSED(x) Q_UNUSED(i) Q_UNUSED(j) }
     { typedef QStack<T1> C; C *x = 0; C::iterator i; C::const_iterator j; Q_UNUSED(x) Q_UNUSED(i) Q_UNUSED(j) }
     { typedef QQueue<T1> C; C *x = 0; C::iterator i; C::const_iterator j; Q_UNUSED(x) }
     { typedef QSet<T1> C; C *x = 0; /* C::iterator i; */ C::const_iterator j; Q_UNUSED(x) }
 }
 
-#if defined(Q_ALIGNOF) && defined(Q_DECL_ALIGN)
-
-class Q_DECL_ALIGN(4) Aligned4
+class alignas(4) Aligned4
 {
     char i;
 public:
@@ -3228,7 +2917,7 @@ public:
     inline bool operator<(const Aligned4 &other) const { return i < other.i; }
     friend inline int qHash(const Aligned4 &a) { return qHash(a.i); }
 };
-Q_STATIC_ASSERT(Q_ALIGNOF(Aligned4) % 4 == 0);
+Q_STATIC_ASSERT(alignof(Aligned4) % 4 == 0);
 
 #if defined(Q_PROCESSOR_ARM)
 #  if defined(Q_COMPILER_ALIGNAS) && defined(__BIGGEST_ALIGNMENT__)
@@ -3242,7 +2931,7 @@ Q_STATIC_ASSERT(Q_ALIGNOF(Aligned4) % 4 == 0);
 #  define BIGGEST_ALIGNMENT_TO_TEST 128
 #endif
 
-class Q_DECL_ALIGN(BIGGEST_ALIGNMENT_TO_TEST) AlignedBiggest
+class alignas(BIGGEST_ALIGNMENT_TO_TEST) AlignedBiggest
 {
     char i;
 public:
@@ -3254,7 +2943,7 @@ public:
     inline bool operator<(const AlignedBiggest &other) const { return i < other.i; }
     friend inline int qHash(const AlignedBiggest &a) { return qHash(a.i); }
 };
-Q_STATIC_ASSERT(Q_ALIGNOF(AlignedBiggest) % BIGGEST_ALIGNMENT_TO_TEST == 0);
+Q_STATIC_ASSERT(alignof(AlignedBiggest) % BIGGEST_ALIGNMENT_TO_TEST == 0);
 
 template<typename C>
 void testVectorAlignment()
@@ -3325,13 +3014,6 @@ void tst_Collections::alignment()
     testAssociativeContainerAlignment<QHash<AlignedBiggest, AlignedBiggest> >();
 }
 
-#else
-void tst_Collections::alignment()
-{
-    QSKIP("Compiler doesn't support necessary extension keywords");
-}
-#endif
-
 #ifndef QT_NO_TEMPLATE_TEMPLATE_PARAMETERS
 
 template<template<class> class C>
@@ -3441,7 +3123,6 @@ void tst_Collections::QTBUG13079_collectionInsideCollection()
     QTBUG13079_collectionInsideCollectionImpl<QVector>();
     QTBUG13079_collectionInsideCollectionImpl<QStack>();
     QTBUG13079_collectionInsideCollectionImpl<QList>();
-    QTBUG13079_collectionInsideCollectionImpl<QLinkedList>();
     QTBUG13079_collectionInsideCollectionImpl<QQueue>();
 
     {
@@ -3510,9 +3191,6 @@ void tst_Collections::foreach_2()
     QCOMPARE(varl1.count(), intlist.count());
     QCOMPARE(varl2.count(), intlist.count());
     QCOMPARE(varl3.count(), intlist.count());
-    foreach_test_arrays(varl1);
-    foreach_test_arrays(varl2);
-    foreach_test_arrays(varl3);
 
     QVarLengthArray<QString> varl4;
     QVarLengthArray<QString, 3> varl5;
@@ -3525,9 +3203,6 @@ void tst_Collections::foreach_2()
     QCOMPARE(varl4.count(), strlist.count());
     QCOMPARE(varl5.count(), strlist.count());
     QCOMPARE(varl6.count(), strlist.count());
-    foreach_test_arrays(varl4);
-    foreach_test_arrays(varl5);
-    foreach_test_arrays(varl6);
 }
 
 struct IntOrString
@@ -3615,30 +3290,8 @@ template<class Container> void insert_remove_loop_impl()
 }
 
 
-//Add insert(int, int, T) so it has the same interface as QVector and QVarLengthArray for the test.
 template<typename T>
-struct ExtList : QList<T> {
-    using QList<T>::insert;
-    void insert(int before, int n, const T&x) {
-        while (n--) {
-            this->insert(before, x );
-        }
-    }
-    void insert(typename QList<T>::iterator before, int n, const T&x) {
-        while (n--) {
-            before = this->insert(before, x);
-        }
-    }
-
-    void remove(int i) {
-        this->removeAt(i);
-    }
-    void remove(int i, int n) {
-        while (n--) {
-            this->removeAt(i);
-        }
-    }
-};
+using ExtList = QList<T>;
 
 void tst_Collections::insert_remove_loop()
 {
diff --git a/tests/auto/corelib/tools/containerapisymmetry/containerapisymmetry.pro b/tests/auto/corelib/tools/containerapisymmetry/containerapisymmetry.pro
index e46d51761e..c114014bf4 100644
--- a/tests/auto/corelib/tools/containerapisymmetry/containerapisymmetry.pro
+++ b/tests/auto/corelib/tools/containerapisymmetry/containerapisymmetry.pro
@@ -2,7 +2,3 @@ CONFIG += testcase
 TARGET = tst_containerapisymmetry
 SOURCES  += tst_containerapisymmetry.cpp
 QT = core testlib
-
-# This test does not work with strict iterators
-DEFINES -= QT_STRICT_ITERATORS
-DEFINES -= QT_NO_LINKED_LIST
diff --git a/tests/auto/corelib/tools/containerapisymmetry/tst_containerapisymmetry.cpp b/tests/auto/corelib/tools/containerapisymmetry/tst_containerapisymmetry.cpp
index 88c0c5055c..fe6e82e19c 100644
--- a/tests/auto/corelib/tools/containerapisymmetry/tst_containerapisymmetry.cpp
+++ b/tests/auto/corelib/tools/containerapisymmetry/tst_containerapisymmetry.cpp
@@ -29,7 +29,6 @@
 #include <QtTest/QtTest>
 
 #include "qbytearray.h"
-#include "qlinkedlist.h"
 #include "qlist.h"
 #include "qstring.h"
 #include "qvarlengtharray.h"
@@ -324,11 +323,6 @@ private Q_SLOTS:
 #endif
     }
 
-    void ranged_ctor_QLinkedList_int() { ranged_ctor_non_associative_impl<QLinkedList<int>>(); }
-    void ranged_ctor_QLinkedList_Movable() { ranged_ctor_non_associative_impl<QLinkedList<Movable>>(); }
-    void ranged_ctor_QLinkedList_Complex() { ranged_ctor_non_associative_impl<QLinkedList<Complex>>(); }
-    void ranged_ctor_QLinkedList_duplicates_strategy() { non_associative_container_duplicates_strategy<QLinkedList>(); }
-
     void ranged_ctor_std_set_int() { ranged_ctor_non_associative_impl<std::set<int>>(); }
     void ranged_ctor_std_set_Movable() { ranged_ctor_non_associative_impl<std::set<Movable>>(); }
     void ranged_ctor_std_set_Complex() { ranged_ctor_non_associative_impl<std::set<Complex>>(); }
@@ -482,7 +476,6 @@ private Q_SLOTS:
     void front_back_std_vector() { front_back_impl<std::vector<int>>(); }
     void front_back_QVector() { front_back_impl<QVector<int>>(); }
     void front_back_QList() { front_back_impl<QList<qintptr>>(); }
-    void front_back_QLinkedList() { front_back_impl<QLinkedList<int>>(); }
     void front_back_QVarLengthArray() { front_back_impl<QVarLengthArray<int>>(); }
     void front_back_QString() { front_back_impl<QString>(); }
     void front_back_QStringRef() { front_back_impl<QStringRef>(); }
@@ -580,9 +573,6 @@ template<typename ... T>
 struct ContainerDuplicatedValuesStrategy<VarLengthArray<T...>> : ContainerAcceptsDuplicateValues {};
 
 template<typename ... T>
-struct ContainerDuplicatedValuesStrategy<QList<T...>> : ContainerAcceptsDuplicateValues {};
-
-template<typename ... T>
 struct ContainerDuplicatedValuesStrategy<std::list<T...>> : ContainerAcceptsDuplicateValues {};
 
 #if COMPILER_HAS_STDLIB_INCLUDE(<forward_list>)
@@ -590,9 +580,6 @@ template<typename ... T>
 struct ContainerDuplicatedValuesStrategy<std::forward_list<T...>> : ContainerAcceptsDuplicateValues {};
 #endif
 
-template<typename ... T>
-struct ContainerDuplicatedValuesStrategy<QLinkedList<T...>> : ContainerAcceptsDuplicateValues {};
-
 // assuming https://cplusplus.github.io/LWG/lwg-active.html#2844 resolution
 template<typename ... T>
 struct ContainerDuplicatedValuesStrategy<std::set<T...>> : ContainerRejectsDuplicateValues {};
@@ -798,8 +785,6 @@ template <> QStringView   make(int size) { return QStringView(s_string).left(siz
 template <> QLatin1String make(int size) { return QLatin1String("\1\2\3\4\5\6\7", size); }
 
 template <typename T> T clean(T &&t) { return std::forward<T>(t); }
-inline QChar clean(QCharRef ch) { return ch; }
-inline char clean(QByteRef ch) { return ch; }
 inline char clean(QLatin1Char ch) { return ch.toLatin1(); }
 
 template <typename Container>
diff --git a/tests/auto/corelib/tools/qalgorithms/CMakeLists.txt b/tests/auto/corelib/tools/qalgorithms/CMakeLists.txt
new file mode 100644
index 0000000000..14b7c95f4b
--- /dev/null
+++ b/tests/auto/corelib/tools/qalgorithms/CMakeLists.txt
@@ -0,0 +1,10 @@
+# Generated from qalgorithms.pro.
+
+#####################################################################
+## tst_qalgorithms Test:
+#####################################################################
+
+add_qt_test(tst_qalgorithms
+    SOURCES
+        tst_qalgorithms.cpp
+)
diff --git a/tests/auto/corelib/tools/qarraydata/CMakeLists.txt b/tests/auto/corelib/tools/qarraydata/CMakeLists.txt
new file mode 100644
index 0000000000..f68c3714aa
--- /dev/null
+++ b/tests/auto/corelib/tools/qarraydata/CMakeLists.txt
@@ -0,0 +1,11 @@
+# Generated from qarraydata.pro.
+
+#####################################################################
+## tst_qarraydata Test:
+#####################################################################
+
+add_qt_test(tst_qarraydata
+    SOURCES
+        simplevector.h
+        tst_qarraydata.cpp
+)
diff --git a/tests/auto/corelib/tools/qarraydata/simplevector.h b/tests/auto/corelib/tools/qarraydata/simplevector.h
index 9dd8b05796..94cee5d887 100644
--- a/tests/auto/corelib/tools/qarraydata/simplevector.h
+++ b/tests/auto/corelib/tools/qarraydata/simplevector.h
@@ -76,25 +76,32 @@ public:
     {
     }
 
-    explicit SimpleVector(Data *ptr)
-        : d(ptr)
+    template <size_t N>
+    explicit SimpleVector(QStaticArrayData<T, N> &ptr)
+        : d(static_cast<Data *>(&ptr.header), ptr.data, N)
+    {
+    }
+
+    SimpleVector(Data *header, T *data, size_t len = 0)
+        : d(header, data, len)
+    {
+    }
+
+    explicit SimpleVector(QPair<Data*, T*> ptr, size_t len = 0)
+        : d(ptr, len)
     {
     }
 
-    bool empty() const { return d->size == 0; }
+    bool empty() const { return d.size == 0; }
     bool isNull() const { return d.isNull(); }
     bool isEmpty() const { return this->empty(); }
 
-    bool isStatic() const { return d->ref.isStatic(); }
-    bool isShared() const { return d->ref.isShared(); }
+    bool isStatic() const { return d->isStatic(); }
+    bool isShared() const { return d->isShared(); }
     bool isSharedWith(const SimpleVector &other) const { return d == other.d; }
-#if !defined(QT_NO_UNSHARABLE_CONTAINERS)
-    bool isSharable() const { return d->ref.isSharable(); }
-    void setSharable(bool sharable) { d.setSharable(sharable); }
-#endif
 
-    size_t size() const { return d->size; }
-    size_t capacity() const { return d->alloc; }
+    size_t size() const { return d.size; }
+    size_t capacity() const { return d->constAllocatedCapacity(); }
 
     iterator begin() { detach(); return d->begin(); }
     iterator end() { detach(); return d->end(); }
@@ -143,10 +150,10 @@ public:
             return;
 
         if (n <= capacity()) {
-            if (d->capacityReserved)
+            if (d->flags() & Data::CapacityReserved)
                 return;
-            if (!d->ref.isShared()) {
-                d->capacityReserved = 1;
+            if (!d->isShared()) {
+                d->flags() |= Data::CapacityReserved;
                 return;
             }
         }
@@ -163,7 +170,7 @@ public:
         if (size() == newSize)
             return;
 
-        if (d.needsDetach() || newSize > capacity()) {
+        if (d->needsDetach() || newSize > capacity()) {
             SimpleVector detached(Data::allocate(
                         d->detachCapacity(newSize), d->detachFlags()));
             if (newSize) {
@@ -199,11 +206,11 @@ public:
             return;
 
         T *const begin = d->begin();
-        if (d.needsDetach()
+        if (d->needsDetach()
                 || capacity() - size() < size_t(last - first)) {
             SimpleVector detached(Data::allocate(
                         d->detachCapacity(size() + (last - first)),
-                        d->detachFlags() | Data::Grow));
+                        d->detachFlags() | Data::GrowsForward));
 
             detached.d->copyAppend(first, last);
             detached.d->copyAppend(begin, begin + d->size);
@@ -220,11 +227,11 @@ public:
         if (first == last)
             return;
 
-        if (d.needsDetach()
+        if (d->needsDetach()
                 || capacity() - size() < size_t(last - first)) {
             SimpleVector detached(Data::allocate(
                         d->detachCapacity(size() + (last - first)),
-                        d->detachFlags() | Data::Grow));
+                        d->detachFlags() | Data::GrowsForward));
 
             if (d->size) {
                 const T *const begin = constBegin();
@@ -260,11 +267,11 @@ public:
         const iterator begin = d->begin();
         const iterator where = begin + position;
         const iterator end = begin + d->size;
-        if (d.needsDetach()
+        if (d->needsDetach()
                 || capacity() - size() < size_t(last - first)) {
             SimpleVector detached(Data::allocate(
                         d->detachCapacity(size() + (last - first)),
-                        d->detachFlags() | Data::Grow));
+                        d->detachFlags() | Data::GrowsForward));
 
             if (position)
                 detached.d->copyAppend(begin, where);
@@ -298,7 +305,7 @@ public:
         const T *const begin = d->begin();
         const T *const end = begin + d->size;
 
-        if (d.needsDetach()) {
+        if (d->needsDetach()) {
             SimpleVector detached(Data::allocate(
                         d->detachCapacity(size() - (last - first)),
                         d->detachFlags()));
@@ -332,7 +339,7 @@ public:
     }
 
     static SimpleVector fromRawData(const T *data, size_t size,
-            QArrayData::AllocationOptions options = Data::Default)
+            QArrayData::ArrayOptions options = Data::DefaultRawFlags)
     {
         return SimpleVector(Data::fromRawData(data, size, options));
     }
diff --git a/tests/auto/corelib/tools/qarraydata/tst_qarraydata.cpp b/tests/auto/corelib/tools/qarraydata/tst_qarraydata.cpp
index 25e2f21d03..1366eebf97 100644
--- a/tests/auto/corelib/tools/qarraydata/tst_qarraydata.cpp
+++ b/tests/auto/corelib/tools/qarraydata/tst_qarraydata.cpp
@@ -37,11 +37,8 @@ struct SharedNullVerifier
 {
     SharedNullVerifier()
     {
-        Q_ASSERT(QArrayData::shared_null[0].ref.isStatic());
-        Q_ASSERT(QArrayData::shared_null[0].ref.isShared());
-#if !defined(QT_NO_UNSHARABLE_CONTAINERS)
-        Q_ASSERT(QArrayData::shared_null[0].ref.isSharable());
-#endif
+        Q_ASSERT(QArrayData::shared_null[0].isStatic());
+        Q_ASSERT(QArrayData::shared_null[0].isShared());
     }
 };
 
@@ -59,7 +56,6 @@ class tst_QArrayData : public QObject
 private slots:
     void referenceCounting();
     void sharedNullEmpty();
-    void staticData();
     void simpleVector();
     void simpleVectorReserve_data();
     void simpleVectorReserve();
@@ -73,8 +69,6 @@ private slots:
     void gccBug43247();
     void arrayOps();
     void arrayOps2();
-    void setSharable_data();
-    void setSharable();
     void fromRawData_data();
     void fromRawData();
     void literals();
@@ -89,70 +83,42 @@ void tst_QArrayData::referenceCounting()
 {
     {
         // Reference counting initialized to 1 (owned)
-        QArrayData array = { { Q_BASIC_ATOMIC_INITIALIZER(1) }, 0, 0, 0, 0 };
+        QArrayData array = { Q_BASIC_ATOMIC_INITIALIZER(1), QArrayData::DefaultRawFlags, 0 };
 
-        QCOMPARE(array.ref.atomic.loadRelaxed(), 1);
+        QCOMPARE(array.ref_.loadRelaxed(), 1);
 
-        QVERIFY(!array.ref.isStatic());
-#if !defined(QT_NO_UNSHARABLE_CONTAINERS)
-        QVERIFY(array.ref.isSharable());
-#endif
+        QVERIFY(!array.isStatic());
 
-        QVERIFY(array.ref.ref());
-        QCOMPARE(array.ref.atomic.loadRelaxed(), 2);
+        QVERIFY(array.ref());
+        QCOMPARE(array.ref_.loadRelaxed(), 2);
 
-        QVERIFY(array.ref.deref());
-        QCOMPARE(array.ref.atomic.loadRelaxed(), 1);
+        QVERIFY(array.deref());
+        QCOMPARE(array.ref_.loadRelaxed(), 1);
 
-        QVERIFY(array.ref.ref());
-        QCOMPARE(array.ref.atomic.loadRelaxed(), 2);
+        QVERIFY(array.ref());
+        QCOMPARE(array.ref_.loadRelaxed(), 2);
 
-        QVERIFY(array.ref.deref());
-        QCOMPARE(array.ref.atomic.loadRelaxed(), 1);
+        QVERIFY(array.deref());
+        QCOMPARE(array.ref_.loadRelaxed(), 1);
 
-        QVERIFY(!array.ref.deref());
-        QCOMPARE(array.ref.atomic.loadRelaxed(), 0);
+        QVERIFY(!array.deref());
+        QCOMPARE(array.ref_.loadRelaxed(), 0);
 
         // Now would be a good time to free/release allocated data
     }
-
-#if !defined(QT_NO_UNSHARABLE_CONTAINERS)
-    {
-        // Reference counting initialized to 0 (non-sharable)
-        QArrayData array = { { Q_BASIC_ATOMIC_INITIALIZER(0) }, 0, 0, 0, 0 };
-
-        QCOMPARE(array.ref.atomic.loadRelaxed(), 0);
-
-        QVERIFY(!array.ref.isStatic());
-        QVERIFY(!array.ref.isSharable());
-
-        QVERIFY(!array.ref.ref());
-        // Reference counting fails, data should be copied
-        QCOMPARE(array.ref.atomic.loadRelaxed(), 0);
-
-        QVERIFY(!array.ref.deref());
-        QCOMPARE(array.ref.atomic.loadRelaxed(), 0);
-
-        // Free/release data
-    }
-#endif
-
     {
         // Reference counting initialized to -1 (static read-only data)
-        QArrayData array = { Q_REFCOUNT_INITIALIZE_STATIC, 0, 0, 0, 0 };
+        QArrayData array = { Q_BASIC_ATOMIC_INITIALIZER(-1), QArrayData::StaticDataFlags, 0 };
 
-        QCOMPARE(array.ref.atomic.loadRelaxed(), -1);
+        QCOMPARE(array.ref_.loadRelaxed(), -1);
 
-        QVERIFY(array.ref.isStatic());
-#if !defined(QT_NO_UNSHARABLE_CONTAINERS)
-        QVERIFY(array.ref.isSharable());
-#endif
+        QVERIFY(array.isStatic());
 
-        QVERIFY(array.ref.ref());
-        QCOMPARE(array.ref.atomic.loadRelaxed(), -1);
+        QVERIFY(array.ref());
+        QCOMPARE(array.ref_.loadRelaxed(), -1);
 
-        QVERIFY(array.ref.deref());
-        QCOMPARE(array.ref.atomic.loadRelaxed(), -1);
+        QVERIFY(array.deref());
+        QCOMPARE(array.ref_.loadRelaxed(), -1);
 
     }
 }
@@ -160,74 +126,39 @@ void tst_QArrayData::referenceCounting()
 void tst_QArrayData::sharedNullEmpty()
 {
     QArrayData *null = const_cast<QArrayData *>(QArrayData::shared_null);
-    QArrayData *empty = QArrayData::allocate(1, Q_ALIGNOF(QArrayData), 0);
-
-    QVERIFY(null->ref.isStatic());
-    QVERIFY(null->ref.isShared());
+    QArrayData *empty;
+    QArrayData::allocate(&empty, 1, alignof(QArrayData), 0);
 
-    QVERIFY(empty->ref.isStatic());
-    QVERIFY(empty->ref.isShared());
+    QVERIFY(null->isStatic());
+    QVERIFY(null->isShared());
 
-    QCOMPARE(null->ref.atomic.loadRelaxed(), -1);
-    QCOMPARE(empty->ref.atomic.loadRelaxed(), -1);
+    QVERIFY(empty->isStatic());
+    QVERIFY(empty->isShared());
 
-#if !defined(QT_NO_UNSHARABLE_CONTAINERS)
-    QVERIFY(null->ref.isSharable());
-    QVERIFY(empty->ref.isSharable());
-#endif
+    QCOMPARE(null->ref_.loadRelaxed(), -1);
+    QCOMPARE(empty->ref_.loadRelaxed(), -1);
 
-    QVERIFY(null->ref.ref());
-    QVERIFY(empty->ref.ref());
+    QCOMPARE(null->ref_.loadRelaxed(), -1);
+    QCOMPARE(empty->ref_.loadRelaxed(), -1);
 
-    QCOMPARE(null->ref.atomic.loadRelaxed(), -1);
-    QCOMPARE(empty->ref.atomic.loadRelaxed(), -1);
+    QVERIFY(null->deref());
+    QVERIFY(empty->deref());
 
-    QVERIFY(null->ref.deref());
-    QVERIFY(empty->ref.deref());
-
-    QCOMPARE(null->ref.atomic.loadRelaxed(), -1);
-    QCOMPARE(empty->ref.atomic.loadRelaxed(), -1);
+    QCOMPARE(null->ref_.loadRelaxed(), -1);
+    QCOMPARE(empty->ref_.loadRelaxed(), -1);
 
     QVERIFY(null != empty);
 
-    QCOMPARE(null->size, 0);
-    QCOMPARE(null->alloc, 0u);
-    QCOMPARE(null->capacityReserved, 0u);
+    QCOMPARE(null->allocatedCapacity(), size_t(0));
 
-    QCOMPARE(empty->size, 0);
-    QCOMPARE(empty->alloc, 0u);
-    QCOMPARE(empty->capacityReserved, 0u);
-}
-
-void tst_QArrayData::staticData()
-{
-    QStaticArrayData<char, 10> charArray = {
-        Q_STATIC_ARRAY_DATA_HEADER_INITIALIZER(char, 10),
-        { 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j' }
-    };
-    QStaticArrayData<int, 10> intArray = {
-        Q_STATIC_ARRAY_DATA_HEADER_INITIALIZER(int, 10),
-        { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 }
-    };
-    QStaticArrayData<double, 10> doubleArray = {
-        Q_STATIC_ARRAY_DATA_HEADER_INITIALIZER(double, 10),
-        { 0.f, 1.f, 2.f, 3.f, 4.f, 5.f, 6.f, 7.f, 8.f, 9.f }
-    };
-
-    QCOMPARE(charArray.header.size, 10);
-    QCOMPARE(intArray.header.size, 10);
-    QCOMPARE(doubleArray.header.size, 10);
-
-    QCOMPARE(charArray.header.data(), reinterpret_cast<void *>(&charArray.data));
-    QCOMPARE(intArray.header.data(), reinterpret_cast<void *>(&intArray.data));
-    QCOMPARE(doubleArray.header.data(), reinterpret_cast<void *>(&doubleArray.data));
+    QCOMPARE(empty->allocatedCapacity(), size_t(0));
 }
 
 void tst_QArrayData::simpleVector()
 {
-    QArrayData data0 = { Q_REFCOUNT_INITIALIZE_STATIC, 0, 0, 0, 0 };
+    QArrayData data0 = { Q_BASIC_ATOMIC_INITIALIZER(-1), QArrayData::StaticDataFlags, 0 };
     QStaticArrayData<int, 7> data1 = {
-            Q_STATIC_ARRAY_DATA_HEADER_INITIALIZER(int, 7),
+            { Q_BASIC_ATOMIC_INITIALIZER(-1), QArrayData::StaticDataFlags, 0 },
             { 0, 1, 2, 3, 4, 5, 6 }
         };
 
@@ -235,10 +166,10 @@ void tst_QArrayData::simpleVector()
 
     SimpleVector<int> v1;
     SimpleVector<int> v2(v1);
-    SimpleVector<int> v3(static_cast<QTypedArrayData<int> *>(&data0));
-    SimpleVector<int> v4(static_cast<QTypedArrayData<int> *>(&data1.header));
-    SimpleVector<int> v5(static_cast<QTypedArrayData<int> *>(&data0));
-    SimpleVector<int> v6(static_cast<QTypedArrayData<int> *>(&data1.header));
+    SimpleVector<int> v3(static_cast<QTypedArrayData<int> *>(&data0), 0, 0);
+    SimpleVector<int> v4(data1);
+    SimpleVector<int> v5(static_cast<QTypedArrayData<int> *>(&data0), 0, 0);
+    SimpleVector<int> v6(data1);
     SimpleVector<int> v7(10, 5);
     SimpleVector<int> v8(array, array + sizeof(array)/sizeof(*array));
 
@@ -302,17 +233,6 @@ void tst_QArrayData::simpleVector()
     QVERIFY(!v7.isShared());
     QVERIFY(!v8.isShared());
 
-#if !defined(QT_NO_UNSHARABLE_CONTAINERS)
-    QVERIFY(v1.isSharable());
-    QVERIFY(v2.isSharable());
-    QVERIFY(v3.isSharable());
-    QVERIFY(v4.isSharable());
-    QVERIFY(v5.isSharable());
-    QVERIFY(v6.isSharable());
-    QVERIFY(v7.isSharable());
-    QVERIFY(v8.isSharable());
-#endif
-
     QVERIFY(v1.isSharedWith(v2));
     QVERIFY(v1.isSharedWith(v3));
     QVERIFY(v1.isSharedWith(v4));
@@ -494,71 +414,6 @@ void tst_QArrayData::simpleVector()
 
     for (int i = 0; i < 120; ++i)
         QCOMPARE(v1[i], v8[i % 10]);
-
-#if !defined(QT_NO_UNSHARABLE_CONTAINERS)
-    {
-        v7.setSharable(true);
-        QVERIFY(v7.isSharable());
-
-        SimpleVector<int> copy1(v7);
-        QVERIFY(copy1.isSharedWith(v7));
-
-        v7.setSharable(false);
-        QVERIFY(!v7.isSharable());
-
-        QVERIFY(!copy1.isSharedWith(v7));
-        QCOMPARE(v7.size(), copy1.size());
-        for (size_t i = 0; i < copy1.size(); ++i)
-            QCOMPARE(v7[i], copy1[i]);
-
-        SimpleVector<int> clone(v7);
-        QVERIFY(!clone.isSharedWith(v7));
-        QCOMPARE(clone.size(), copy1.size());
-        for (size_t i = 0; i < copy1.size(); ++i)
-            QCOMPARE(clone[i], copy1[i]);
-
-        v7.setSharable(true);
-        QVERIFY(v7.isSharable());
-
-        SimpleVector<int> copy2(v7);
-        QVERIFY(copy2.isSharedWith(v7));
-    }
-
-    {
-        SimpleVector<int> null;
-        SimpleVector<int> empty(0, 5);
-
-        QVERIFY(null.isSharable());
-        QVERIFY(empty.isSharable());
-
-        null.setSharable(true);
-        empty.setSharable(true);
-
-        QVERIFY(null.isSharable());
-        QVERIFY(empty.isSharable());
-
-        QVERIFY(null.isEmpty());
-        QVERIFY(empty.isEmpty());
-
-        null.setSharable(false);
-        empty.setSharable(false);
-
-        QVERIFY(!null.isSharable());
-        QVERIFY(!empty.isSharable());
-
-        QVERIFY(null.isEmpty());
-        QVERIFY(empty.isEmpty());
-
-        null.setSharable(true);
-        empty.setSharable(true);
-
-        QVERIFY(null.isSharable());
-        QVERIFY(empty.isSharable());
-
-        QVERIFY(null.isEmpty());
-        QVERIFY(empty.isEmpty());
-    }
-#endif
 }
 
 Q_DECLARE_METATYPE(SimpleVector<int>)
@@ -574,11 +429,13 @@ void tst_QArrayData::simpleVectorReserve_data()
     QTest::newRow("non-empty") << SimpleVector<int>(5, 42) << size_t(5) << size_t(5);
 
     static const QStaticArrayData<int, 15> array = {
-        Q_STATIC_ARRAY_DATA_HEADER_INITIALIZER(int, 15),
+        { Q_BASIC_ATOMIC_INITIALIZER(-1), QArrayData::StaticDataFlags, 0 },
         { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 } };
-    QArrayDataPointerRef<int> p = {
+    const QArrayDataPointerRef<int> p = {
          static_cast<QTypedArrayData<int> *>(
-            const_cast<QArrayData *>(&array.header)) };
+            const_cast<QArrayData *>(&array.header)),
+        const_cast<int *>(array.data),
+        sizeof(array.data) / sizeof(array.data[0]) };
 
     QTest::newRow("static") << SimpleVector<int>(p) << size_t(0) << size_t(15);
     QTest::newRow("raw-data") << SimpleVector<int>::fromRawData(array.data, 15) << size_t(0) << size_t(15);
@@ -641,15 +498,14 @@ struct Deallocator
 };
 
 Q_DECLARE_METATYPE(const QArrayData *)
-Q_DECLARE_METATYPE(QArrayData::AllocationOptions)
+Q_DECLARE_METATYPE(QArrayData::ArrayOptions)
 
 void tst_QArrayData::allocate_data()
 {
     QTest::addColumn<size_t>("objectSize");
     QTest::addColumn<size_t>("alignment");
-    QTest::addColumn<QArrayData::AllocationOptions>("allocateOptions");
+    QTest::addColumn<QArrayData::ArrayOptions>("allocateOptions");
     QTest::addColumn<bool>("isCapacityReserved");
-    QTest::addColumn<bool>("isSharable");       // ### Qt6: remove
     QTest::addColumn<const QArrayData *>("commonEmpty");
 
     struct {
@@ -657,35 +513,24 @@ void tst_QArrayData::allocate_data()
         size_t objectSize;
         size_t alignment;
     } types[] = {
-        { "char", sizeof(char), Q_ALIGNOF(char) },
-        { "short", sizeof(short), Q_ALIGNOF(short) },
-        { "void *", sizeof(void *), Q_ALIGNOF(void *) }
+        { "char", sizeof(char), alignof(char) },
+        { "short", sizeof(short), alignof(short) },
+        { "void *", sizeof(void *), alignof(void *) }
     };
 
-    QArrayData *shared_empty = QArrayData::allocate(0, Q_ALIGNOF(QArrayData), 0);
+    QArrayData *shared_empty;
+    QArrayData::allocate(&shared_empty, 1, alignof(QArrayData), 0);
     QVERIFY(shared_empty);
 
-#if !defined(QT_NO_UNSHARABLE_CONTAINERS)
-    QArrayData *unsharable_empty = QArrayData::allocate(0, Q_ALIGNOF(QArrayData), 0, QArrayData::Unsharable);
-    QVERIFY(unsharable_empty);
-#endif
-
     struct {
         char const *description;
-        QArrayData::AllocationOptions allocateOptions;
+        QArrayData::ArrayOptions allocateOptions;
         bool isCapacityReserved;
-        bool isSharable;
         const QArrayData *commonEmpty;
     } options[] = {
-        { "Default", QArrayData::Default, false, true, shared_empty },
-        { "Reserved", QArrayData::CapacityReserved, true, true, shared_empty },
-#if !defined(QT_NO_UNSHARABLE_CONTAINERS)
-        { "Reserved | Unsharable",
-            QArrayData::CapacityReserved | QArrayData::Unsharable, true, false,
-            unsharable_empty },
-        { "Unsharable", QArrayData::Unsharable, false, false, unsharable_empty },
-#endif
-        { "Grow", QArrayData::Grow, false, true, shared_empty }
+        { "Default", QArrayData::DefaultAllocationFlags, false, shared_empty },
+        { "Reserved", QArrayData::CapacityReserved, true, shared_empty },
+        { "Grow", QArrayData::GrowsForward, false, shared_empty }
     };
 
     for (size_t i = 0; i < sizeof(types)/sizeof(types[0]); ++i)
@@ -696,47 +541,45 @@ void tst_QArrayData::allocate_data()
                         + QLatin1String(options[j].description)))
                 << types[i].objectSize << types[i].alignment
                 << options[j].allocateOptions << options[j].isCapacityReserved
-                << options[j].isSharable << options[j].commonEmpty;
+                << options[j].commonEmpty;
 }
 
 void tst_QArrayData::allocate()
 {
     QFETCH(size_t, objectSize);
     QFETCH(size_t, alignment);
-    QFETCH(QArrayData::AllocationOptions, allocateOptions);
+    QFETCH(QArrayData::ArrayOptions, allocateOptions);
     QFETCH(bool, isCapacityReserved);
     QFETCH(const QArrayData *, commonEmpty);
 
     // Minimum alignment that can be requested is that of QArrayData.
     // Typically, this alignment is sizeof(void *) and ensured by malloc.
-    size_t minAlignment = qMax(alignment, Q_ALIGNOF(QArrayData));
+    size_t minAlignment = qMax(alignment, alignof(QArrayData));
 
     // Shared Empty
-    QCOMPARE(QArrayData::allocate(objectSize, minAlignment, 0,
-                QArrayData::AllocationOptions(allocateOptions)), commonEmpty);
+    QArrayData *empty;
+    QCOMPARE((QArrayData::allocate(&empty, objectSize, minAlignment, 0,
+                QArrayData::ArrayOptions(allocateOptions)), empty), commonEmpty);
 
     Deallocator keeper(objectSize, minAlignment);
     keeper.headers.reserve(1024);
 
     for (int capacity = 1; capacity <= 1024; capacity <<= 1) {
-        QArrayData *data = QArrayData::allocate(objectSize, minAlignment,
-                capacity, QArrayData::AllocationOptions(allocateOptions));
+        QArrayData *data;
+        void *dataPointer = QArrayData::allocate(&data, objectSize, minAlignment,
+                capacity, QArrayData::ArrayOptions(allocateOptions));
+
         keeper.headers.append(data);
 
-        QCOMPARE(data->size, 0);
-        if (allocateOptions & QArrayData::Grow)
-            QVERIFY(data->alloc > uint(capacity));
+        if (allocateOptions & QArrayData::GrowsForward)
+            QVERIFY(data->allocatedCapacity() > uint(capacity));
         else
-            QCOMPARE(data->alloc, uint(capacity));
-        QCOMPARE(data->capacityReserved, uint(isCapacityReserved));
-#if !defined(QT_NO_UNSHARABLE_CONTAINERS)
-        QFETCH(bool, isSharable);
-        QCOMPARE(data->ref.isSharable(), isSharable);
-#endif
+            QCOMPARE(data->allocatedCapacity(), size_t(capacity));
+        QCOMPARE(bool(data->flags & QArrayData::CapacityReserved), isCapacityReserved);
 
         // Check that the allocated array can be used. Best tested with a
         // memory checker, such as valgrind, running.
-        ::memset(data->data(), 'A', objectSize * capacity);
+        ::memset(dataPointer, 'A', objectSize * capacity);
     }
 }
 
@@ -744,47 +587,40 @@ void tst_QArrayData::reallocate()
 {
     QFETCH(size_t, objectSize);
     QFETCH(size_t, alignment);
-    QFETCH(QArrayData::AllocationOptions, allocateOptions);
+    QFETCH(QArrayData::ArrayOptions, allocateOptions);
     QFETCH(bool, isCapacityReserved);
 
-    // Maximum alignment that can be requested is that of QArrayData,
-    // otherwise, we can't use reallocate().
-    Q_ASSERT(alignment <= Q_ALIGNOF(QArrayData));
-
     // Minimum alignment that can be requested is that of QArrayData.
     // Typically, this alignment is sizeof(void *) and ensured by malloc.
-    size_t minAlignment = qMax(alignment, Q_ALIGNOF(QArrayData));
+    size_t minAlignment = qMax(alignment, alignof(QArrayData));
 
     int capacity = 10;
     Deallocator keeper(objectSize, minAlignment);
-    QArrayData *data = QArrayData::allocate(objectSize, minAlignment, capacity,
-                                            QArrayData::AllocationOptions(allocateOptions) & ~QArrayData::Grow);
+    QArrayData *data;
+    void *dataPointer = QArrayData::allocate(&data, objectSize, minAlignment, capacity,
+                                             QArrayData::ArrayOptions(allocateOptions) & ~QArrayData::GrowsForward);
     keeper.headers.append(data);
 
-    memset(data->data(), 'A', objectSize * capacity);
-    data->size = capacity;
+    memset(dataPointer, 'A', objectSize * capacity);
 
     // now try to reallocate
     int newCapacity = 40;
-    data = QArrayData::reallocateUnaligned(data, objectSize, newCapacity,
-                                           QArrayData::AllocationOptions(allocateOptions));
+    auto pair = QArrayData::reallocateUnaligned(data, dataPointer, objectSize, newCapacity,
+                                                QArrayData::ArrayOptions(allocateOptions));
+    data = pair.first;
+    dataPointer = pair.second;
     QVERIFY(data);
     keeper.headers.clear();
     keeper.headers.append(data);
 
-    QCOMPARE(data->size, capacity);
-    if (allocateOptions & QArrayData::Grow)
-        QVERIFY(data->alloc > uint(newCapacity));
+    if (allocateOptions & QArrayData::GrowsForward)
+        QVERIFY(data->allocatedCapacity() > size_t(newCapacity));
     else
-        QCOMPARE(data->alloc, uint(newCapacity));
-    QCOMPARE(data->capacityReserved, uint(isCapacityReserved));
-#if !defined(QT_NO_UNSHARABLE_CONTAINERS)
-    QFETCH(bool, isSharable);
-    QCOMPARE(data->ref.isSharable(), isSharable);
-#endif
+        QCOMPARE(data->allocatedCapacity(), size_t(newCapacity));
+    QCOMPARE(!(data->flags & QArrayData::CapacityReserved), !isCapacityReserved);
 
     for (int i = 0; i < capacity; ++i)
-        QCOMPARE(static_cast<char *>(data->data())[i], 'A');
+        QCOMPARE(static_cast<char *>(dataPointer)[i], 'A');
 }
 
 class Unaligned
@@ -808,95 +644,52 @@ void tst_QArrayData::alignment()
 
     // Minimum alignment that can be requested is that of QArrayData.
     // Typically, this alignment is sizeof(void *) and ensured by malloc.
-    size_t minAlignment = qMax(alignment, Q_ALIGNOF(QArrayData));
+    size_t minAlignment = qMax(alignment, alignof(QArrayData));
 
     Deallocator keeper(sizeof(Unaligned), minAlignment);
     keeper.headers.reserve(100);
 
     for (int i = 0; i < 100; ++i) {
-        QArrayData *data = QArrayData::allocate(sizeof(Unaligned),
-                minAlignment, 8, QArrayData::Default);
+        QArrayData *data;
+        void *dataPointer = QArrayData::allocate(&data, sizeof(Unaligned),
+                minAlignment, 8, QArrayData::DefaultAllocationFlags);
         keeper.headers.append(data);
 
         QVERIFY(data);
-        QCOMPARE(data->size, 0);
-        QVERIFY(data->alloc >= uint(8));
+        QVERIFY(data->allocatedCapacity() >= uint(8));
 
         // These conditions should hold as long as header and array are
         // allocated together
-        QVERIFY(data->offset >= qptrdiff(sizeof(QArrayData)));
-        QVERIFY(data->offset <= qptrdiff(sizeof(QArrayData)
-                    + minAlignment - Q_ALIGNOF(QArrayData)));
+        qptrdiff offset = reinterpret_cast<char *>(dataPointer) -
+                reinterpret_cast<char *>(data);
+        QVERIFY(offset >= qptrdiff(sizeof(QArrayData)));
+        QVERIFY(offset <= qptrdiff(sizeof(QArrayData)
+                    + minAlignment - alignof(QArrayData)));
 
         // Data is aligned
-        QCOMPARE(quintptr(quintptr(data->data()) % alignment), quintptr(0u));
+        QCOMPARE(quintptr(quintptr(dataPointer) % alignment), quintptr(0u));
 
         // Check that the allocated array can be used. Best tested with a
         // memory checker, such as valgrind, running.
-        ::memset(data->data(), 'A', sizeof(Unaligned) * 8);
+        ::memset(dataPointer, 'A', sizeof(Unaligned) * 8);
     }
 }
 
 void tst_QArrayData::typedData()
 {
-    QStaticArrayData<int, 10> data = {
-            Q_STATIC_ARRAY_DATA_HEADER_INITIALIZER(int, 10),
-            { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 }
-        };
-    QCOMPARE(data.header.size, 10);
-
-    {
-        QTypedArrayData<int> *array =
-            static_cast<QTypedArrayData<int> *>(&data.header);
-        QCOMPARE(array->data(), data.data);
-
-        int j = 0;
-        for (QTypedArrayData<int>::iterator iter = array->begin();
-                iter != array->end(); ++iter, ++j)
-            QCOMPARE((const int *)iter, data.data + j);
-        QCOMPARE(j, 10);
-    }
-
-    {
-        const QTypedArrayData<int> *array =
-            static_cast<const QTypedArrayData<int> *>(&data.header);
-
-        QCOMPARE(array->data(), data.data);
-
-        int j = 0;
-        for (QTypedArrayData<int>::const_iterator iter = array->begin();
-                iter != array->end(); ++iter, ++j)
-            QCOMPARE((const int *)iter, data.data + j);
-        QCOMPARE(j, 10);
-    }
-
-    {
-        QTypedArrayData<int> *null = QTypedArrayData<int>::sharedNull();
-        QTypedArrayData<int> *empty = QTypedArrayData<int>::allocate(0);
-
-        QVERIFY(null != empty);
-
-        QCOMPARE(null->size, 0);
-        QCOMPARE(empty->size, 0);
-
-        QCOMPARE(null->begin(), null->end());
-        QCOMPARE(empty->begin(), empty->end());
-    }
-
-
     {
         Deallocator keeper(sizeof(char),
-                Q_ALIGNOF(QTypedArrayData<char>::AlignmentDummy));
-        QArrayData *array = QTypedArrayData<char>::allocate(10);
+                alignof(QTypedArrayData<char>::AlignmentDummy));
+        QPair<QTypedArrayData<char> *, char *> pair = QTypedArrayData<char>::allocate(10);
+        QArrayData *array = pair.first;
         keeper.headers.append(array);
 
         QVERIFY(array);
-        QCOMPARE(array->size, 0);
-        QCOMPARE(array->alloc, 10u);
+        QCOMPARE(array->allocatedCapacity(), size_t(10));
 
         // Check that the allocated array can be used. Best tested with a
         // memory checker, such as valgrind, running.
-        ::memset(array->data(), 0, 10 * sizeof(char));
+        ::memset(pair.second, 0, 10 * sizeof(char));
 
         keeper.headers.clear();
         QTypedArrayData<short>::deallocate(array);
@@ -906,17 +699,17 @@ void tst_QArrayData::typedData()
 
     {
         Deallocator keeper(sizeof(short),
-                Q_ALIGNOF(QTypedArrayData<short>::AlignmentDummy));
-        QArrayData *array = QTypedArrayData<short>::allocate(10);
+                alignof(QTypedArrayData<short>::AlignmentDummy));
+        QPair<QTypedArrayData<short> *, short *> pair = QTypedArrayData<short>::allocate(10);
+        QArrayData *array = pair.first;
         keeper.headers.append(array);
 
         QVERIFY(array);
-        QCOMPARE(array->size, 0);
-        QCOMPARE(array->alloc, 10u);
+        QCOMPARE(array->allocatedCapacity(), size_t(10));
 
         // Check that the allocated array can be used. Best tested with a
         // memory checker, such as valgrind, running.
-        ::memset(array->data(), 0, 10 * sizeof(short));
+        ::memset(pair.second, 0, 10 * sizeof(short));
 
         keeper.headers.clear();
         QTypedArrayData<short>::deallocate(array);
@@ -926,17 +719,17 @@ void tst_QArrayData::typedData()
 
     {
         Deallocator keeper(sizeof(double),
-                Q_ALIGNOF(QTypedArrayData<double>::AlignmentDummy));
-        QArrayData *array = QTypedArrayData<double>::allocate(10);
+                alignof(QTypedArrayData<double>::AlignmentDummy));
+        QPair<QTypedArrayData<double> *, double *> pair = QTypedArrayData<double>::allocate(10);
+        QArrayData *array = pair.first;
         keeper.headers.append(array);
 
         QVERIFY(array);
-        QCOMPARE(array->size, 0);
-        QCOMPARE(array->alloc, 10u);
+        QCOMPARE(array->allocatedCapacity(), size_t(10));
 
         // Check that the allocated array can be used. Best tested with a
         // memory checker, such as valgrind, running.
-        ::memset(array->data(), 0, 10 * sizeof(double));
+        ::memset(pair.second, 0, 10 * sizeof(double));
 
         keeper.headers.clear();
         QTypedArrayData<double>::deallocate(array);
@@ -1354,136 +1147,6 @@ static inline bool arrayIsFilledWith(const QArrayDataPointer<int> &array,
     return true;
 }
 
-void tst_QArrayData::setSharable_data()
-{
-#if !defined(QT_NO_UNSHARABLE_CONTAINERS)
-    QTest::addColumn<QArrayDataPointer<int> >("array");
-    QTest::addColumn<size_t>("size");
-    QTest::addColumn<size_t>("capacity");
-    QTest::addColumn<bool>("isCapacityReserved");
-    QTest::addColumn<int>("fillValue");
-
-    QArrayDataPointer<int> null;
-    QArrayDataPointer<int> empty; empty.clear();
-
-    static QStaticArrayData<int, 10> staticArrayData = {
-            Q_STATIC_ARRAY_DATA_HEADER_INITIALIZER(int, 10),
-            { 3, 3, 3, 3, 3, 3, 3, 3, 3, 3 }
-        };
-
-    QArrayDataPointer<int> emptyReserved(QTypedArrayData<int>::allocate(5,
-                QArrayData::CapacityReserved));
-    QArrayDataPointer<int> nonEmpty(QTypedArrayData<int>::allocate(5,
-                QArrayData::Default));
-    QArrayDataPointer<int> nonEmptyExtraCapacity(
-            QTypedArrayData<int>::allocate(10, QArrayData::Default));
-    QArrayDataPointer<int> nonEmptyReserved(QTypedArrayData<int>::allocate(15,
-                QArrayData::CapacityReserved));
-    QArrayDataPointer<int> staticArray(
-            static_cast<QTypedArrayData<int> *>(&staticArrayData.header));
-    QArrayDataPointer<int> rawData(
-            QTypedArrayData<int>::fromRawData(staticArrayData.data, 10));
-
-    nonEmpty->copyAppend(5, 1);
-    nonEmptyExtraCapacity->copyAppend(5, 1);
-    nonEmptyReserved->copyAppend(7, 2);
-
-    QTest::newRow("shared-null") << null << size_t(0) << size_t(0) << false << 0;
-    QTest::newRow("shared-empty") << empty << size_t(0) << size_t(0) << false << 0;
-    // unsharable-empty implicitly tested in shared-empty
-    QTest::newRow("empty-reserved") << emptyReserved << size_t(0) << size_t(5) << true << 0;
-    QTest::newRow("non-empty") << nonEmpty << size_t(5) << size_t(5) << false << 1;
-    QTest::newRow("non-empty-extra-capacity") << nonEmptyExtraCapacity << size_t(5) << size_t(10) << false << 1;
-    QTest::newRow("non-empty-reserved") << nonEmptyReserved << size_t(7) << size_t(15) << true << 2;
-    QTest::newRow("static-array") << staticArray << size_t(10) << size_t(0) << false << 3;
-    QTest::newRow("raw-data") << rawData << size_t(10) << size_t(0) << false << 3;
-#endif
-}
-
-void tst_QArrayData::setSharable()
-{
-#if !defined(QT_NO_UNSHARABLE_CONTAINERS)
-    QFETCH(QArrayDataPointer<int>, array);
-    QFETCH(size_t, size);
-    QFETCH(size_t, capacity);
-    QFETCH(bool, isCapacityReserved);
-    QFETCH(int, fillValue);
-
-    QVERIFY(array->ref.isShared()); // QTest has a copy
-    QVERIFY(array->ref.isSharable());
-
-    QCOMPARE(size_t(array->size), size);
-    QCOMPARE(size_t(array->alloc), capacity);
-    QCOMPARE(bool(array->capacityReserved), isCapacityReserved);
-    QVERIFY(arrayIsFilledWith(array, fillValue, size));
-
-    // shared-null becomes shared-empty, may otherwise detach
-    array.setSharable(true);
-
-    QVERIFY(array->ref.isSharable());
-    QVERIFY(arrayIsFilledWith(array, fillValue, size));
-
-    {
-        QArrayDataPointer<int> copy(array);
-        QVERIFY(array->ref.isShared());
-        QVERIFY(array->ref.isSharable());
-        QCOMPARE(copy.data(), array.data());
-    }
-
-    // Unshare, must detach
-    array.setSharable(false);
-
-    // Immutability (alloc == 0) is lost on detach, as is additional capacity
-    // if capacityReserved flag is not set.
-    if ((capacity == 0 && size != 0)
-            || (!isCapacityReserved && capacity > size))
-        capacity = size;
-
-    QVERIFY(!array->ref.isShared());
-    QVERIFY(!array->ref.isSharable());
-
-    QCOMPARE(size_t(array->size), size);
-    QCOMPARE(size_t(array->alloc), capacity);
-    QCOMPARE(bool(array->capacityReserved), isCapacityReserved);
-    QVERIFY(arrayIsFilledWith(array, fillValue, size));
-
-    {
-        QArrayDataPointer<int> copy(array);
-        QVERIFY(!array->ref.isShared());
-        QVERIFY(!array->ref.isSharable());
-
-        // Null/empty is always shared
-        QCOMPARE(copy->ref.isShared(), !(size || isCapacityReserved));
-        QVERIFY(copy->ref.isSharable());
-
-        QCOMPARE(size_t(copy->size), size);
-        QCOMPARE(size_t(copy->alloc), capacity);
-        QCOMPARE(bool(copy->capacityReserved), isCapacityReserved);
-        QVERIFY(arrayIsFilledWith(copy, fillValue, size));
-    }
-
-    // Make sharable, again
-    array.setSharable(true);
-
-    QCOMPARE(array->ref.isShared(), !(size || isCapacityReserved));
-    QVERIFY(array->ref.isSharable());
-
-    QCOMPARE(size_t(array->size), size);
-    QCOMPARE(size_t(array->alloc), capacity);
-    QCOMPARE(bool(array->capacityReserved), isCapacityReserved);
-    QVERIFY(arrayIsFilledWith(array, fillValue, size));
-
-    {
-        QArrayDataPointer<int> copy(array);
-        QVERIFY(array->ref.isShared());
-        QCOMPARE(copy.data(), array.data());
-    }
-
-    QCOMPARE(array->ref.isShared(), !(size || isCapacityReserved));
-    QVERIFY(array->ref.isSharable());
-#endif
-}
-
 struct ResetOnDtor
 {
     ResetOnDtor()
@@ -1517,7 +1180,7 @@ void fromRawData_impl()
     {
         // Default: Immutable, sharable
         SimpleVector<T> raw = SimpleVector<T>::fromRawData(array,
-                sizeof(array)/sizeof(array[0]), QArrayData::Default);
+                sizeof(array)/sizeof(array[0]), QArrayData::DefaultRawFlags);
 
         QCOMPARE(raw.size(), size_t(11));
         QCOMPARE((const T *)raw.constBegin(), array);
@@ -1531,37 +1194,6 @@ void fromRawData_impl()
         QCOMPARE(raw.back(), T(11));
         QVERIFY((const T *)raw.constBegin() != array);
     }
-
-#if !defined(QT_NO_UNSHARABLE_CONTAINERS)
-    {
-        // Immutable, unsharable
-        SimpleVector<T> raw = SimpleVector<T>::fromRawData(array,
-                sizeof(array)/sizeof(array[0]), QArrayData::Unsharable);
-
-        QCOMPARE(raw.size(), size_t(11));
-        QCOMPARE((const T *)raw.constBegin(), array);
-        QCOMPARE((const T *)raw.constEnd(), (const T *)(array + sizeof(array)/sizeof(array[0])));
-
-        SimpleVector<T> copy(raw);
-        QVERIFY(!copy.isSharedWith(raw));
-        QVERIFY(!raw.isShared());
-
-        QCOMPARE(copy.size(), size_t(11));
-
-        for (size_t i = 0; i < 11; ++i) {
-            QCOMPARE(const_(copy)[i], const_(raw)[i]);
-            QCOMPARE(const_(copy)[i], T(i + 1));
-        }
-
-        QCOMPARE(raw.size(), size_t(11));
-        QCOMPARE((const T *)raw.constBegin(), array);
-        QCOMPARE((const T *)raw.constEnd(), (const T *)(array + sizeof(array)/sizeof(array[0])));
-
-        // Detach
-        QCOMPARE(raw.back(), T(11));
-        QVERIFY((const T *)raw.constBegin() != array);
-    }
-#endif
 }
 
 void tst_QArrayData::fromRawData_data()
@@ -1593,17 +1225,17 @@ void tst_QArrayData::literals()
 {
     {
         QArrayDataPointer<char> d = Q_ARRAY_LITERAL(char, "ABCDEFGHIJ");
-        QCOMPARE(d->size, 10 + 1);
+        QCOMPARE(d.size, 10u + 1u);
         for (int i = 0; i < 10; ++i)
-            QCOMPARE(d->data()[i], char('A' + i));
+            QCOMPARE(d.data()[i], char('A' + i));
     }
 
     {
         // wchar_t is not necessarily 2-bytes
         QArrayDataPointer<wchar_t> d = Q_ARRAY_LITERAL(wchar_t, L"ABCDEFGHIJ");
-        QCOMPARE(d->size, 10 + 1);
+        QCOMPARE(d.size, 10u + 1u);
         for (int i = 0; i < 10; ++i)
-            QCOMPARE(d->data()[i], wchar_t('A' + i));
+            QCOMPARE(d.data()[i], wchar_t('A' + i));
     }
 
     {
@@ -1615,10 +1247,6 @@ void tst_QArrayData::literals()
         // v.capacity() is unspecified, for now
 
         QVERIFY(v.isStatic());
-
-#if !defined(QT_NO_UNSHARABLE_CONTAINERS)
-        QVERIFY(v.isSharable());
-#endif
         QCOMPARE((void*)(const char*)(v.constBegin() + v.size()), (void*)(const char*)v.constEnd());
 
         for (int i = 0; i < 10; ++i)
@@ -1645,26 +1273,26 @@ void tst_QArrayData::variadicLiterals()
     {
         QArrayDataPointer<int> d =
             Q_ARRAY_LITERAL(int, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9);
-        QCOMPARE(d->size, 10);
+        QCOMPARE(d.size, 10u);
         for (int i = 0; i < 10; ++i)
-            QCOMPARE(d->data()[i], i);
+            QCOMPARE(d.data()[i], i);
     }
 
     {
         QArrayDataPointer<char> d = Q_ARRAY_LITERAL(char,
                 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J');
-        QCOMPARE(d->size, 10);
+        QCOMPARE(d.size, 10u);
         for (int i = 0; i < 10; ++i)
-            QCOMPARE(d->data()[i], char('A' + i));
+            QCOMPARE(d.data()[i], char('A' + i));
     }
 
     {
         QArrayDataPointer<const char *> d = Q_ARRAY_LITERAL(const char *,
                 "A", "B", "C", "D", "E", "F", "G", "H", "I", "J");
-        QCOMPARE(d->size, 10);
+        QCOMPARE(d.size, 10u);
         for (int i = 0; i < 10; ++i) {
-            QCOMPARE(d->data()[i][0], char('A' + i));
-            QCOMPARE(d->data()[i][1], '\0');
+            QCOMPARE(d.data()[i][0], char('A' + i));
+            QCOMPARE(d.data()[i][1], '\0');
         }
     }
 
@@ -1677,10 +1305,6 @@ void tst_QArrayData::variadicLiterals()
         // v.capacity() is unspecified, for now
 
         QVERIFY(v.isStatic());
-
-#if !defined(QT_NO_UNSHARABLE_CONTAINERS)
-        QVERIFY(v.isSharable());
-#endif
         QCOMPARE((const int *)(v.constBegin() + v.size()), (const int *)v.constEnd());
 
         for (int i = 0; i < 7; ++i)
diff --git a/tests/auto/corelib/tools/qarraydata_strictiterators/qarraydata_strictiterators.pro b/tests/auto/corelib/tools/qarraydata_strictiterators/qarraydata_strictiterators.pro
deleted file mode 100644
index b01fbd84d1..0000000000
--- a/tests/auto/corelib/tools/qarraydata_strictiterators/qarraydata_strictiterators.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-include(../qarraydata/qarraydata.pro)
-TARGET = tst_qarraydata_strictiterators
-DEFINES += QT_STRICT_ITERATORS=1 tst_QArrayData=tst_QArrayData_StrictIterators
diff --git a/tests/auto/corelib/tools/qbitarray/CMakeLists.txt b/tests/auto/corelib/tools/qbitarray/CMakeLists.txt
new file mode 100644
index 0000000000..65150c02a2
--- /dev/null
+++ b/tests/auto/corelib/tools/qbitarray/CMakeLists.txt
@@ -0,0 +1,10 @@
+# Generated from qbitarray.pro.
+
+#####################################################################
+## tst_qbitarray Test:
+#####################################################################
+
+add_qt_test(tst_qbitarray
+    SOURCES
+        tst_qbitarray.cpp
+)
diff --git a/tests/auto/corelib/tools/qbitarray/tst_qbitarray.cpp b/tests/auto/corelib/tools/qbitarray/tst_qbitarray.cpp
index 9a7c099228..b2c7915aa0 100644
--- a/tests/auto/corelib/tools/qbitarray/tst_qbitarray.cpp
+++ b/tests/auto/corelib/tools/qbitarray/tst_qbitarray.cpp
@@ -86,6 +86,9 @@ private slots:
     void resize();
     void fromBits_data();
     void fromBits();
+
+    void toUInt32_data();
+    void toUInt32();
 };
 
 void tst_QBitArray::size_data()
@@ -667,5 +670,95 @@ void tst_QBitArray::fromBits()
     QCOMPARE(QBitArray::fromBits(fromBits.bits(), fromBits.size()), expected);
 }
 
+void tst_QBitArray::toUInt32_data()
+{
+    QTest::addColumn<QBitArray>("data");
+    QTest::addColumn<int>("endianness");
+    QTest::addColumn<bool>("check");
+    QTest::addColumn<quint32>("result");
+
+    QTest::newRow("ctor")           << QBitArray()
+                                    << static_cast<int>(QSysInfo::Endian::LittleEndian)
+                                    << true
+                                    << quint32(0);
+
+    QTest::newRow("empty")          << QBitArray(0)
+                                    << static_cast<int>(QSysInfo::Endian::LittleEndian)
+                                    << true
+                                    << quint32(0);
+
+    QTest::newRow("LittleEndian4")  << QStringToQBitArray(QString("0111"))
+                                    << static_cast<int>(QSysInfo::Endian::LittleEndian)
+                                    << true
+                                    << quint32(14);
+
+    QTest::newRow("BigEndian4")     << QStringToQBitArray(QString("0111"))
+                                    << static_cast<int>(QSysInfo::Endian::BigEndian)
+                                    << true
+                                    << quint32(7);
+
+    QTest::newRow("LittleEndian8")  << QStringToQBitArray(QString("01111111"))
+                                    << static_cast<int>(QSysInfo::Endian::LittleEndian)
+                                    << true
+                                    << quint32(254);
+
+    QTest::newRow("BigEndian8")     << QStringToQBitArray(QString("01111111"))
+                                    << static_cast<int>(QSysInfo::Endian::BigEndian)
+                                    << true
+                                    << quint32(127);
+
+    QTest::newRow("LittleEndian16") << QStringToQBitArray(QString("0111111111111111"))
+                                    << static_cast<int>(QSysInfo::Endian::LittleEndian)
+                                    << true
+                                    << quint32(65534);
+
+    QTest::newRow("BigEndian16")    << QStringToQBitArray(QString("0111111111111111"))
+                                    << static_cast<int>(QSysInfo::Endian::BigEndian)
+                                    << true
+                                    << quint32(32767);
+
+    QTest::newRow("LittleEndian31") << QBitArray(31, true)
+                                    << static_cast<int>(QSysInfo::Endian::LittleEndian)
+                                    << true
+                                    << quint32(2147483647);
+
+    QTest::newRow("BigEndian31")    << QBitArray(31, true)
+                                    << static_cast<int>(QSysInfo::Endian::BigEndian)
+                                    << true
+                                    << quint32(2147483647);
+
+    QTest::newRow("LittleEndian32") << QBitArray(32, true)
+                                    << static_cast<int>(QSysInfo::Endian::LittleEndian)
+                                    << true
+                                    << quint32(4294967295);
+
+    QTest::newRow("BigEndian32")    << QBitArray(32, true)
+                                    << static_cast<int>(QSysInfo::Endian::BigEndian)
+                                    << true
+                                    << quint32(4294967295);
+
+    QTest::newRow("LittleEndian33") << QBitArray(33, true)
+                                    << static_cast<int>(QSysInfo::Endian::LittleEndian)
+                                    << false
+                                    << quint32(0);
+
+    QTest::newRow("BigEndian33")    << QBitArray(33, true)
+                                    << static_cast<int>(QSysInfo::Endian::BigEndian)
+                                    << false
+                                    << quint32(0);
+}
+
+void tst_QBitArray::toUInt32()
+{
+    QFETCH(QBitArray, data);
+    QFETCH(int, endianness);
+    QFETCH(bool, check);
+    QFETCH(quint32, result);
+    bool ok = false;
+
+    QCOMPARE(data.toUInt32(static_cast<QSysInfo::Endian>(endianness), &ok), result);
+    QCOMPARE(ok, check);
+}
+
 QTEST_APPLESS_MAIN(tst_QBitArray)
 #include "tst_qbitarray.moc"
diff --git a/tests/auto/corelib/tools/qcache/CMakeLists.txt b/tests/auto/corelib/tools/qcache/CMakeLists.txt
new file mode 100644
index 0000000000..50fb2372c3
--- /dev/null
+++ b/tests/auto/corelib/tools/qcache/CMakeLists.txt
@@ -0,0 +1,10 @@
+# Generated from qcache.pro.
+
+#####################################################################
+## tst_qcache Test:
+#####################################################################
+
+add_qt_test(tst_qcache
+    SOURCES
+        tst_qcache.cpp
+)
diff --git a/tests/auto/corelib/tools/qcommandlineparser/CMakeLists.txt b/tests/auto/corelib/tools/qcommandlineparser/CMakeLists.txt
new file mode 100644
index 0000000000..2fc50a7d89
--- /dev/null
+++ b/tests/auto/corelib/tools/qcommandlineparser/CMakeLists.txt
@@ -0,0 +1,11 @@
+# Generated from qcommandlineparser.pro.
+
+#####################################################################
+## tst_qcommandlineparser Test:
+#####################################################################
+
+add_qt_test(tst_qcommandlineparser
+    SOURCES
+        tst_qcommandlineparser.cpp
+)
+add_subdirectory(testhelper)
diff --git a/tests/auto/corelib/tools/qcommandlineparser/testhelper/CMakeLists.txt b/tests/auto/corelib/tools/qcommandlineparser/testhelper/CMakeLists.txt
new file mode 100644
index 0000000000..3d0989d841
--- /dev/null
+++ b/tests/auto/corelib/tools/qcommandlineparser/testhelper/CMakeLists.txt
@@ -0,0 +1,11 @@
+# Generated from qcommandlineparser_test_helper.pro.
+
+#####################################################################
+## qcommandlineparser_test_helper Binary:
+#####################################################################
+
+add_qt_executable(qcommandlineparser_test_helper
+    OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
+    SOURCES
+        qcommandlineparser_test_helper.cpp
+)
diff --git a/tests/auto/corelib/tools/qcontiguouscache/CMakeLists.txt b/tests/auto/corelib/tools/qcontiguouscache/CMakeLists.txt
new file mode 100644
index 0000000000..bce8ce11bd
--- /dev/null
+++ b/tests/auto/corelib/tools/qcontiguouscache/CMakeLists.txt
@@ -0,0 +1,10 @@
+# Generated from qcontiguouscache.pro.
+
+#####################################################################
+## tst_qcontiguouscache Test:
+#####################################################################
+
+add_qt_test(tst_qcontiguouscache
+    SOURCES
+        tst_qcontiguouscache.cpp
+)
diff --git a/tests/auto/corelib/tools/qeasingcurve/CMakeLists.txt b/tests/auto/corelib/tools/qeasingcurve/CMakeLists.txt
new file mode 100644
index 0000000000..c2611921ab
--- /dev/null
+++ b/tests/auto/corelib/tools/qeasingcurve/CMakeLists.txt
@@ -0,0 +1,10 @@
+# Generated from qeasingcurve.pro.
+
+#####################################################################
+## tst_qeasingcurve Test:
+#####################################################################
+
+add_qt_test(tst_qeasingcurve
+    SOURCES
+        tst_qeasingcurve.cpp
+)
diff --git a/tests/auto/corelib/tools/qexplicitlyshareddatapointer/CMakeLists.txt b/tests/auto/corelib/tools/qexplicitlyshareddatapointer/CMakeLists.txt
new file mode 100644
index 0000000000..cacc36beaa
--- /dev/null
+++ b/tests/auto/corelib/tools/qexplicitlyshareddatapointer/CMakeLists.txt
@@ -0,0 +1,10 @@
+# Generated from qexplicitlyshareddatapointer.pro.
+
+#####################################################################
+## tst_qexplicitlyshareddatapointer Test:
+#####################################################################
+
+add_qt_test(tst_qexplicitlyshareddatapointer
+    SOURCES
+        tst_qexplicitlyshareddatapointer.cpp
+)
diff --git a/tests/auto/corelib/tools/qflatmap/qflatmap.pro b/tests/auto/corelib/tools/qflatmap/qflatmap.pro
new file mode 100644
index 0000000000..3927cee30c
--- /dev/null
+++ b/tests/auto/corelib/tools/qflatmap/qflatmap.pro
@@ -0,0 +1,4 @@
+CONFIG += testcase
+TARGET = tst_qflatmap
+QT = core-private testlib
+SOURCES = tst_qflatmap.cpp
diff --git a/tests/auto/corelib/tools/qflatmap/tst_qflatmap.cpp b/tests/auto/corelib/tools/qflatmap/tst_qflatmap.cpp
new file mode 100644
index 0000000000..a5ae6f5f44
--- /dev/null
+++ b/tests/auto/corelib/tools/qflatmap/tst_qflatmap.cpp
@@ -0,0 +1,453 @@
+/****************************************************************************
+**
+** Copyright (C) 2020 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:GPL-EXCEPT$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 as published by the Free Software
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtTest/QtTest>
+
+#include <private/qflatmap_p.h>
+#include <qbytearray.h>
+#include <qstring.h>
+#include <qstringview.h>
+#include <qvarlengtharray.h>
+#include <qvector.h>
+
+#include <algorithm>
+#include <list>
+#include <tuple>
+
+class tst_QFlatMap : public QObject
+{
+    Q_OBJECT
+private slots:
+    void constructing();
+    void constAccess();
+    void insertion();
+    void removal();
+    void extraction();
+    void iterators();
+    void statefulComparator();
+    void transparency();
+    void viewIterators();
+    void varLengthArray();
+};
+
+void tst_QFlatMap::constructing()
+{
+    using Map = QFlatMap<int, QByteArray>;
+    Map fmDefault;
+    QVERIFY(fmDefault.isEmpty());
+    QCOMPARE(fmDefault.size(), Map::size_type(0));
+    QCOMPARE(fmDefault.size(), fmDefault.count());
+
+    auto key_compare = fmDefault.key_comp();
+    auto selfbuilt_value_compare
+            = [&key_compare](const Map::value_type &a, const Map::value_type &b)
+              {
+                  return key_compare(a.first, b.first);
+              };
+    auto value_compare = fmDefault.value_comp();
+
+    Map::key_container_type kv = { 6, 2, 1 };
+    Map::mapped_container_type mv = { "foo", "bar", "baz" };
+    Map fmCopy{kv, mv};
+    QCOMPARE(fmCopy.size(), Map::size_type(3));
+    QVERIFY(std::is_sorted(fmCopy.begin(), fmCopy.end(), selfbuilt_value_compare));
+    QVERIFY(std::is_sorted(fmCopy.begin(), fmCopy.end(), value_compare));
+
+    Map fmMove{
+        Map::key_container_type{ 6, 2, 1 },
+        Map::mapped_container_type{ "foo", "bar", "baz" }
+    };
+    QCOMPARE(fmMove.size(), Map::size_type(3));
+    QVERIFY(std::is_sorted(fmMove.begin(), fmMove.end(), value_compare));
+
+    auto fmInitList = Map{ { 1, 2 }, { "foo", "bar" } };
+    QVERIFY(std::is_sorted(fmInitList.begin(), fmInitList.end(), value_compare));
+
+    auto fmRange = Map(fmCopy.begin(), fmCopy.end());
+    QVERIFY(std::is_sorted(fmRange.begin(), fmRange.end(), value_compare));
+
+    kv.clear();
+    mv.clear();
+    std::vector<Map::value_type> sv;
+    for (auto it = fmRange.begin(); it != fmRange.end(); ++it) {
+        kv.push_back(it->first);
+        mv.push_back(it->second);
+        sv.push_back(*it);
+    }
+    auto fmFromSortedVectorCopy = Map(Qt::OrderedUniqueRange, kv, mv);
+    auto fmFromSortedVectorMove = Map(Qt::OrderedUniqueRange, Map::key_container_type(kv),
+                                      Map::mapped_container_type(mv));
+    auto fmFromSortedInitList = Map(Qt::OrderedUniqueRange, { { 1, "foo" }, { 2, "bar" } });
+    auto fmFromSortedRange = Map(Qt::OrderedUniqueRange, sv.begin(), sv.end());
+}
+
+void tst_QFlatMap::constAccess()
+{
+    using Map = QFlatMap<QByteArray, QByteArray>;
+    const Map m{ { { "foo", "FOO" }, { "bar", "BAR" } } };
+
+    const std::vector<Map::value_type> v{ { "foo", "FOO" }, { "bar", "BAR" } };
+
+    QCOMPARE(m.value("foo").data(), "FOO");
+    QCOMPARE(m.value("bar").data(), "BAR");
+    QCOMPARE(m.value("nix"), QByteArray());
+    QCOMPARE(m.value("nix", "NIX").data(), "NIX");
+    QCOMPARE(m["foo"].data(), "FOO");
+    QCOMPARE(m["bar"].data(), "BAR");
+    QCOMPARE(m["nix"], QByteArray());
+    QVERIFY(m.contains("foo"));
+    QVERIFY(!m.contains("nix"));
+}
+
+void tst_QFlatMap::insertion()
+{
+    using Map = QFlatMap<QByteArray, QByteArray>;
+    Map m;
+    QByteArray foo = "foo";
+    m[foo] = foo.toUpper();
+    m["bar"] = "BAR";
+    m["baz"] = "BAZ";
+    QVERIFY(m.insert("oof", "eek").second);
+    QVERIFY(!m.insert("oof", "OOF").second);
+    const std::vector<Map::value_type> container = { { "bla", "BLA" }, { "blubb", "BLUBB" } };
+    m.insert(container.begin(), container.end());
+    QCOMPARE(m.value("foo").data(), "FOO");
+    QCOMPARE(m.value("bar").data(), "BAR");
+    QCOMPARE(m.value("baz").data(), "BAZ");
+    QCOMPARE(m.value("oof").data(), "OOF");
+    QCOMPARE(m.value("bla").data(), "BLA");
+    QCOMPARE(m.value("blubb").data(), "BLUBB");
+
+    Map::value_type a1[] = { { "narf", "NARF" },
+                             { "zort", "ZORT" },
+                             { "troz", "TROZ" } };
+    Map::value_type a2[] = { { "gnampf", "GNAMPF" },
+                             { "narf", "NARFFFF" },
+                             { "narf", "NARFFFFF" },
+                             { "narf", "NARFFFFFF" } };
+    m.insert(std::begin(a1), std::end(a1));
+    m.insert(Qt::OrderedUniqueRange, std::begin(a2), std::end(a2));
+    QCOMPARE(m.size(), 10);
+    QCOMPARE(m.value("narf").data(), "NARFFFFFF");
+    QCOMPARE(m.value("gnampf").data(), "GNAMPF");
+}
+
+void tst_QFlatMap::extraction()
+{
+    using Map = QFlatMap<int, QByteArray>;
+    Map::key_container_type expectedKeys = { 1, 2, 3 };
+    Map::mapped_container_type expectedValues = { "een", "twee", "dree" };
+    Map m(expectedKeys, expectedValues);
+    auto keys = m.keys();
+    auto values = m.values();
+    QCOMPARE(keys, expectedKeys);
+    QCOMPARE(values, expectedValues);
+    Map::containers c = std::move(m).extract();
+    QCOMPARE(c.keys, expectedKeys);
+    QCOMPARE(c.values, expectedValues);
+}
+
+void tst_QFlatMap::iterators()
+{
+    using Map = QFlatMap<int, QByteArray>;
+    auto m = Map{ { 1, "foo" }, { 2, "bar" }, { 3, "baz" } };
+    {
+        // forward / backward
+        Map::iterator a = m.begin();
+        QVERIFY(a != m.end());
+        QCOMPARE(a.key(), 1);
+        QCOMPARE(a.value(), "foo");
+        ++a;
+        QCOMPARE(a.key(), 2);
+        QCOMPARE(a.value(), "bar");
+        Map::iterator b = a++;
+        QCOMPARE(std::tie(a.key(), a.value()), std::make_tuple(3, "baz"));
+        QCOMPARE(std::tie(b.key(), b.value()), std::make_tuple(2, "bar"));
+        QCOMPARE(++a, m.end());
+        --a;
+        QCOMPARE(std::tie(a.key(), a.value()), std::make_tuple(3, "baz"));
+        a.value() = "buzz";
+        b = a--;
+        QCOMPARE(std::tie(a.key(), a.value()), std::make_tuple(2, "bar"));
+        QCOMPARE(std::tie(b.key(), b.value()), std::make_tuple(3, "buzz"));
+        b.value() = "baz";
+
+        // random access
+        a = m.begin();
+        a += 2;
+        QCOMPARE(std::tie(a.key(), a.value()), std::make_tuple(3, "baz"));
+        a = m.begin() + 1;
+        QCOMPARE(std::tie(a.key(), a.value()), std::make_tuple(2, "bar"));
+        a = 1 + m.begin();
+        QCOMPARE(std::tie(a.key(), a.value()), std::make_tuple(2, "bar"));
+        a = m.end() - 1;
+        QCOMPARE(std::tie(a.key(), a.value()), std::make_tuple(3, "baz"));
+        b = m.end();
+        b -= 1;
+        QCOMPARE(std::tie(b.key(), b.value()), std::make_tuple(3, "baz"));
+        QCOMPARE(m.end() - m.begin(), m.size());
+
+        // comparison
+        a = m.begin() + m.size() - 1;
+        b = m.end() - 1;
+        QVERIFY(a == b);
+        a = m.begin();
+        b = m.end();
+        QVERIFY(a < b);
+        QVERIFY(a <= b);
+        QVERIFY(b > a);
+        QVERIFY(b >= a);
+        a = b;
+        QVERIFY(!(a < b));
+        QVERIFY(a <= b);
+        QVERIFY(!(b > a));
+        QVERIFY(b >= a);
+
+        // de-referencing
+        a = m.begin();
+        auto ref0 = *a;
+        QCOMPARE(ref0.first, 1);
+        QCOMPARE(ref0.second, "foo");
+        auto ref1 = a[1];
+        QCOMPARE(ref1.first, 2);
+        QCOMPARE(ref1.second, "bar");
+    }
+    {
+        // forward / backward
+        Map::const_iterator a = m.cbegin();
+        QVERIFY(a != m.cend());
+        QCOMPARE(a.key(), 1);
+        QCOMPARE(a.value(), "foo");
+        ++a;
+        QCOMPARE(a.key(), 2);
+        QCOMPARE(a.value(), "bar");
+        Map::const_iterator b = a++;
+        QCOMPARE(std::tie(a.key(), a.value()), std::make_tuple(3, "baz"));
+        QCOMPARE(std::tie(b.key(), b.value()), std::make_tuple(2, "bar"));
+        QCOMPARE(++a, m.cend());
+        --a;
+        QCOMPARE(std::tie(a.key(), a.value()), std::make_tuple(3, "baz"));
+        b = a--;
+        QCOMPARE(std::tie(a.key(), a.value()), std::make_tuple(2, "bar"));
+
+        // random access
+        a = m.cbegin();
+        a += 2;
+        QCOMPARE(std::tie(a.key(), a.value()), std::make_tuple(3, "baz"));
+        a = m.cbegin() + 1;
+        QCOMPARE(std::tie(a.key(), a.value()), std::make_tuple(2, "bar"));
+        a = 1 + m.cbegin();
+        QCOMPARE(std::tie(a.key(), a.value()), std::make_tuple(2, "bar"));
+        a = m.cend() - 1;
+        QCOMPARE(std::tie(a.key(), a.value()), std::make_tuple(3, "baz"));
+        b = m.cend();
+        b -= 1;
+        QCOMPARE(std::tie(b.key(), b.value()), std::make_tuple(3, "baz"));
+        QCOMPARE(m.cend() - m.cbegin(), m.size());
+
+        // comparison
+        a = m.cbegin() + m.size() - 1;
+        b = m.cend() - 1;
+        QVERIFY(a == b);
+        a = m.cbegin();
+        b = m.cend();
+        QVERIFY(a < b);
+        QVERIFY(a <= b);
+        QVERIFY(b > a);
+        QVERIFY(b >= a);
+        a = b;
+        QVERIFY(!(a < b));
+        QVERIFY(a <= b);
+        QVERIFY(!(b > a));
+        QVERIFY(b >= a);
+
+        // de-referencing
+        a = m.cbegin();
+        auto ref0 = *a;
+        QCOMPARE(ref0.first, 1);
+        QCOMPARE(ref0.second, "foo");
+        auto ref1 = a[1];
+        QCOMPARE(ref1.first, 2);
+        QCOMPARE(ref1.second, "bar");
+    }
+    {
+        Map::iterator it = m.begin();
+        Map::const_iterator cit = it;
+        Q_UNUSED(it);
+        Q_UNUSED(cit);
+    }
+    {
+        std::list<Map::value_type> revlst;
+        std::copy(m.begin(), m.end(), std::front_inserter(revlst));
+        std::vector<Map::value_type> v0;
+        std::copy(revlst.begin(), revlst.end(), std::back_inserter(v0));
+        std::vector<Map::value_type> v1;
+        std::copy(m.rbegin(), m.rend(), std::back_inserter(v1));
+        const Map cm = m;
+        std::vector<Map::value_type> v2;
+        std::copy(cm.rbegin(), cm.rend(), std::back_inserter(v2));
+        std::vector<Map::value_type> v3;
+        std::copy(m.crbegin(), m.crend(), std::back_inserter(v3));
+        QCOMPARE(v0, v1);
+        QCOMPARE(v1, v2);
+        QCOMPARE(v2, v3);
+    }
+}
+
+void tst_QFlatMap::removal()
+{
+    using Map = QFlatMap<int, QByteArray>;
+    Map m({ { 2, "bar" }, { 3, "baz" }, { 1, "foo" } });
+    QCOMPARE(m.value(2).data(), "bar");
+    QCOMPARE(m.take(2).data(), "bar");
+    QVERIFY(!m.contains(2));
+    QCOMPARE(m.size(), Map::size_type(2));
+    QVERIFY(m.remove(1));
+    QVERIFY(!m.contains(1));
+    QVERIFY(!m.remove(1));
+    QCOMPARE(m.size(), Map::size_type(1));
+    m.clear();
+    QVERIFY(m.isEmpty());
+    QVERIFY(m.empty());
+
+    m[1] = "een";
+    m[2] = "twee";
+    m[3] = "dree";
+    auto it = m.lower_bound(1);
+    QCOMPARE(it.key(), 1);
+    it = m.erase(it);
+    QCOMPARE(it.key(), 2);
+    QVERIFY(!m.contains(1));
+}
+
+void tst_QFlatMap::statefulComparator()
+{
+    struct CountingCompare {
+        mutable int count = 0;
+
+        bool operator()(const QString &lhs, const QString &rhs) const
+        {
+            ++count;
+            return lhs < rhs;
+        }
+    };
+
+    using Map = QFlatMap<QString, QString, CountingCompare>;
+    auto m1 = Map{ { "en", "een"}, { "to", "twee" }, { "tre", "dree" } };
+    QVERIFY(m1.key_comp().count > 0);
+    auto m2 = Map(m1.key_comp());
+    QCOMPARE(m2.key_comp().count, m1.key_comp().count);
+    m2.insert(m1.begin(), m1.end());
+    QVERIFY(m2.key_comp().count > m1.key_comp().count);
+}
+
+void tst_QFlatMap::transparency()
+{
+    struct StringViewCompare
+    {
+        using is_transparent = void;
+        bool operator()(const QStringView &lhs, const QStringView &rhs) const
+        {
+            return lhs < rhs;
+        }
+    };
+
+    using Map = QFlatMap<QString, QString, StringViewCompare>;
+    auto m = Map{ { "one", "een" }, { "two", "twee" }, { "three", "dree" } };
+
+    const QString numbers = "one two three";
+    const QStringView sv1{numbers.constData(), 3};
+    const QStringView sv2{numbers.constData() + 4, 3};
+    const QStringView sv3{numbers.constData() + 8, 5};
+    QCOMPARE(m.lower_bound(sv1).value(), "een");
+    QCOMPARE(m.lower_bound(sv2).value(), "twee");
+    QCOMPARE(m.lower_bound(sv3).value(), "dree");
+}
+
+void tst_QFlatMap::viewIterators()
+{
+    using Map = QFlatMap<QByteArray, QByteArray>;
+    Map m({ { "yksi", "een"}, { "kaksi", "twee" }, { "kolme", "dree" } });
+    {
+        std::vector<QByteArray> keys;
+        std::transform(m.begin(), m.end(), std::back_inserter(keys),
+                       [](const Map::value_type &v)
+                       {
+                           return v.first;
+                       });
+        auto it = keys.begin();
+        QCOMPARE(*it, "kaksi");
+        QCOMPARE(it->length(), 5);
+        ++it;
+        QCOMPARE(*it, "kolme");
+        it++;
+        QCOMPARE(*it, "yksi");
+        ++it;
+        QCOMPARE(it, keys.end());
+        --it;
+        QCOMPARE(*it, "yksi");
+        it--;
+        QCOMPARE(*it, "kolme");
+    }
+    {
+        std::vector<QByteArray> values;
+        std::transform(m.begin(), m.end(), std::back_inserter(values),
+                       [](const Map::value_type &v)
+                       {
+                           return v.second;
+                       });
+        auto it = values.begin();
+        QCOMPARE(*it, "twee");
+        QCOMPARE(it->length(), 4);
+        ++it;
+        QCOMPARE(*it, "dree");
+        it++;
+        QCOMPARE(*it, "een");
+        ++it;
+        QCOMPARE(it, values.end());
+        --it;
+        QCOMPARE(*it, "een");
+        it--;
+        QCOMPARE(*it, "dree");
+    }
+}
+
+void tst_QFlatMap::varLengthArray()
+{
+    using Map = QFlatMap<int, QByteArray, std::less<int>,
+                         QVarLengthArray<int, 1024>, QVarLengthArray<QByteArray, 1024>>;
+    Map m{ { 2, "twee" } };
+    m.insert(1, "een");
+    m.remove(1);
+    QVERIFY(!m.isEmpty());
+    m.remove(2);
+    QVERIFY(m.isEmpty());
+}
+
+QTEST_APPLESS_MAIN(tst_QFlatMap)
+#include "tst_qflatmap.moc"
diff --git a/tests/auto/corelib/tools/qhash/.prev_CMakeLists.txt b/tests/auto/corelib/tools/qhash/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..5dfeedb322
--- /dev/null
+++ b/tests/auto/corelib/tools/qhash/.prev_CMakeLists.txt
@@ -0,0 +1,12 @@
+# Generated from qhash.pro.
+
+#####################################################################
+## tst_qhash Test:
+#####################################################################
+
+add_qt_test(tst_qhash
+    SOURCES
+        tst_qhash.cpp
+    DEFINES
+        -QT_NO_JAVA_STYLE_ITERATORS
+)
diff --git a/tests/auto/corelib/tools/qhash/CMakeLists.txt b/tests/auto/corelib/tools/qhash/CMakeLists.txt
new file mode 100644
index 0000000000..32edf72073
--- /dev/null
+++ b/tests/auto/corelib/tools/qhash/CMakeLists.txt
@@ -0,0 +1,12 @@
+# Generated from qhash.pro.
+
+#####################################################################
+## tst_qhash Test:
+#####################################################################
+
+add_qt_test(tst_qhash
+    SOURCES
+        tst_qhash.cpp
+    DEFINES
+        #-QT_NO_JAVA_STYLE_ITERATORS # special case remove
+)
diff --git a/tests/auto/corelib/tools/qhash/tst_qhash.cpp b/tests/auto/corelib/tools/qhash/tst_qhash.cpp
index b98ac38288..4052eff0ae 100644
--- a/tests/auto/corelib/tools/qhash/tst_qhash.cpp
+++ b/tests/auto/corelib/tools/qhash/tst_qhash.cpp
@@ -451,20 +451,6 @@ void tst_QHash::insert1()
         QCOMPARE(hash.find(searchKey).value(), id01.id);  // last-inserted value
         QCOMPARE(hash.find(searchKey).key().id, id00.id); // but first-inserted key
     }
-    {
-        QMultiHash<IdentityTracker, int> hash;
-        QCOMPARE(hash.size(), 0);
-        const int dummy = -1;
-        IdentityTracker id00 = {0, 0}, id01 = {0, 1}, searchKey = {0, dummy};
-        QCOMPARE(hash.insert(id00, id00.id).key().id, id00.id);
-        QCOMPARE(hash.size(), 1);
-        QCOMPARE(hash.insert(id01, id01.id).key().id, id01.id);
-        QCOMPARE(hash.size(), 2);
-        QMultiHash<IdentityTracker, int>::const_iterator pos = hash.constFind(searchKey);
-        QCOMPARE(pos.value(), pos.key().id); // key fits to value it was inserted with
-        ++pos;
-        QCOMPARE(pos.value(), pos.key().id); // key fits to value it was inserted with
-    }
 }
 
 void tst_QHash::erase()
@@ -491,13 +477,15 @@ void tst_QHash::erase()
         ++n;
     }
     QVERIFY(n == 3);
-    QHash<int, int> h2;
-    h2.insertMulti(20, 41);
-    h2.insertMulti(20, 42);
+
+    QMultiHash<int, int> h2;
+    h2.insert(20, 41);
+    h2.insert(20, 42);
     QVERIFY(h2.size() == 2);
-    it1 = h2.erase(h2.begin());
-    it1 = h2.erase(h2.begin());
-    QVERIFY(it1 == h2.end());
+    auto bit = h2.begin();
+    auto mit = h2.erase(bit);
+    mit = h2.erase(h2.begin());
+    QVERIFY(mit == h2.end());
 }
 
 void tst_QHash::key()
@@ -631,14 +619,15 @@ void tst_QHash::find()
     QCOMPARE(map1.find(1).value(), QLatin1String("Mayer"));
     QCOMPARE(map1.find(2).value(), QLatin1String("Hej"));
 
-    for(i = 3; i < 10; ++i) {
+    QMultiHash<int, QString> multiMap(map1);
+    for (i = 3; i < 10; ++i) {
         compareString = testString.arg(i);
-        map1.insertMulti(4, compareString);
+        multiMap.insert(4, compareString);
     }
 
-    QHash<int, QString>::const_iterator it=map1.constFind(4);
+    auto it = multiMap.constFind(4);
 
-    for(i = 9; i > 2 && it != map1.constEnd() && it.key() == 4; --i) {
+    for (i = 9; i > 2 && it != multiMap.constEnd() && it.key() == 4; --i) {
         compareString = testString.arg(i);
         QVERIFY(it.value() == compareString);
         ++it;
@@ -664,14 +653,15 @@ void tst_QHash::constFind()
     QCOMPARE(map1.constFind(1).value(), QLatin1String("Mayer"));
     QCOMPARE(map1.constFind(2).value(), QLatin1String("Hej"));
 
-    for(i = 3; i < 10; ++i) {
+    QMultiHash<int, QString> multiMap(map1);
+    for (i = 3; i < 10; ++i) {
         compareString = testString.arg(i);
-        map1.insertMulti(4, compareString);
+        multiMap.insert(4, compareString);
     }
 
-    QHash<int, QString>::const_iterator it=map1.constFind(4);
+    auto it = multiMap.constFind(4);
 
-    for(i = 9; i > 2 && it != map1.constEnd() && it.key() == 4; --i) {
+    for (i = 9; i > 2 && it != multiMap.constEnd() && it.key() == 4; --i) {
         compareString = testString.arg(i);
         QVERIFY(it.value() == compareString);
         ++it;
@@ -689,9 +679,9 @@ void tst_QHash::contains()
     map1.insert(1, "one");
     QVERIFY(map1.contains(1));
 
-    for(i=2; i < 100; ++i)
+    for (i=2; i < 100; ++i)
         map1.insert(i, "teststring");
-    for(i=99; i > 1; --i)
+    for (i=99; i > 1; --i)
         QVERIFY(map1.contains(i));
 
     map1.remove(43);
@@ -855,33 +845,33 @@ void tst_QHash::operator_eq()
     // regardless of insertion or iteration order
 
     {
-        QHash<int, int> a;
-        QHash<int, int> b;
+        QMultiHash<int, int> a;
+        QMultiHash<int, int> b;
 
-        a.insertMulti(0, 0);
-        a.insertMulti(0, 1);
+        a.insert(0, 0);
+        a.insert(0, 1);
 
-        b.insertMulti(0, 1);
-        b.insertMulti(0, 0);
+        b.insert(0, 1);
+        b.insert(0, 0);
 
         QVERIFY(a == b);
         QVERIFY(!(a != b));
     }
 
     {
-        QHash<int, int> a;
-        QHash<int, int> b;
+        QMultiHash<int, int> a;
+        QMultiHash<int, int> b;
 
         enum { Count = 100 };
 
         for (int key = 0; key < Count; ++key) {
             for (int value = 0; value < Count; ++value)
-                a.insertMulti(key, value);
+                a.insert(key, value);
         }
 
         for (int key = Count - 1; key >= 0; --key) {
             for (int value = 0; value < Count; ++value)
-                b.insertMulti(key, value);
+                b.insert(key, value);
         }
 
         QVERIFY(a == b);
@@ -889,8 +879,8 @@ void tst_QHash::operator_eq()
     }
 
     {
-        QHash<int, int> a;
-        QHash<int, int> b;
+        QMultiHash<int, int> a;
+        QMultiHash<int, int> b;
 
         enum {
             Count = 100,
@@ -900,7 +890,7 @@ void tst_QHash::operator_eq()
 
         for (int key = 0; key < Count; ++key) {
             for (int value = 0; value < Count; ++value)
-                a.insertMulti(key, value);
+                a.insert(key, value);
         }
 
         // Generates two permutations of [0, Count) for the keys and values,
@@ -909,7 +899,7 @@ void tst_QHash::operator_eq()
         for (int k = 0; k < Count; ++k) {
            const int key = (k * KeyStep) % Count;
            for (int v = 0; v < Count; ++v)
-               b.insertMulti(key, (v * ValueStep) % Count);
+               b.insert(key, (v * ValueStep) % Count);
         }
 
         QVERIFY(a == b);
@@ -923,10 +913,10 @@ void tst_QHash::compare()
     QString testString = "Teststring %1";
     int i;
 
-    for(i = 0; i < 1000; ++i)
+    for (i = 0; i < 1000; ++i)
         hash1.insert(i,testString.arg(i));
 
-    for(--i; i >= 0; --i)
+    for (--i; i >= 0; --i)
         hash2.insert(i,testString.arg(i));
 
     hash1.squeeze();
@@ -947,39 +937,39 @@ void tst_QHash::compare()
 
 void tst_QHash::compare2()
 {
-    QHash<int, int> a;
-    QHash<int, int> b;
+    QMultiHash<int, int> a;
+    QMultiHash<int, int> b;
 
-    a.insertMulti(17, 1);
-    a.insertMulti(17 * 2, 1);
-    b.insertMulti(17 * 2, 1);
-    b.insertMulti(17, 1);
+    a.insert(17, 1);
+    a.insert(17 * 2, 1);
+    b.insert(17 * 2, 1);
+    b.insert(17, 1);
     QVERIFY(a == b);
     QVERIFY(b == a);
 
-    a.insertMulti(17, 2);
-    a.insertMulti(17 * 2, 3);
-    b.insertMulti(17 * 2, 3);
-    b.insertMulti(17, 2);
+    a.insert(17, 2);
+    a.insert(17 * 2, 3);
+    b.insert(17 * 2, 3);
+    b.insert(17, 2);
     QVERIFY(a == b);
     QVERIFY(b == a);
 
-    a.insertMulti(17, 4);
-    a.insertMulti(17 * 2, 5);
-    b.insertMulti(17 * 2, 4);
-    b.insertMulti(17, 5);
+    a.insert(17, 4);
+    a.insert(17 * 2, 5);
+    b.insert(17 * 2, 4);
+    b.insert(17, 5);
     QVERIFY(!(a == b));
     QVERIFY(!(b == a));
 
     a.clear();
     b.clear();
-    a.insertMulti(1, 1);
-    a.insertMulti(1, 2);
-    a.insertMulti(1, 3);
-    b.insertMulti(1, 1);
-    b.insertMulti(1, 2);
-    b.insertMulti(1, 3);
-    b.insertMulti(1, 4);
+    a.insert(1, 1);
+    a.insert(1, 2);
+    a.insert(1, 3);
+    b.insert(1, 1);
+    b.insert(1, 2);
+    b.insert(1, 3);
+    b.insert(1, 4);
     QVERIFY(!(a == b));
     QVERIFY(!(b == a));
 }
@@ -993,7 +983,7 @@ void tst_QHash::iterators()
     QString testString1;
     int i;
 
-    for(i = 1; i < 100; ++i)
+    for (i = 1; i < 100; ++i)
         hash.insert(i, testString.arg(i));
 
     //to get some chaos in the hash
@@ -1010,18 +1000,13 @@ void tst_QHash::iterators()
 
     QVERIFY(stlIt.value() == testMap.value(1));
 
-    stlIt+=5;
+    for (int i = 0; i < 5; ++i)
+        ++stlIt;
     QVERIFY(stlIt.value() == testMap.value(6));
 
     stlIt++;
     QVERIFY(stlIt.value() == testMap.value(7));
 
-    stlIt-=3;
-    QVERIFY(stlIt.value() == testMap.value(4));
-
-    stlIt--;
-    QVERIFY(stlIt.value() == testMap.value(3));
-
     testMap.clear();
 
     //STL-Style const-iterators
@@ -1035,18 +1020,13 @@ void tst_QHash::iterators()
 
     QVERIFY(cstlIt.value() == testMap.value(1));
 
-    cstlIt+=5;
+    for (int i = 0; i < 5; ++i)
+        ++cstlIt;
     QVERIFY(cstlIt.value() == testMap.value(6));
 
     cstlIt++;
     QVERIFY(cstlIt.value() == testMap.value(7));
 
-    cstlIt-=3;
-    QVERIFY(cstlIt.value() == testMap.value(4));
-
-    cstlIt--;
-    QVERIFY(cstlIt.value() == testMap.value(3));
-
     testMap.clear();
 
     //Java-Style iterators
@@ -1068,14 +1048,7 @@ void tst_QHash::iterators()
         QVERIFY(javaIt.value() == testMap.value(i));
     }
 
-    ++i;
-    while(javaIt.hasPrevious()) {
-        --i;
-        javaIt.previous();
-        QVERIFY(javaIt.value() == testMap.value(i));
-    }
-
-    //peekNext()  peekPrevious()
+    //peekNext()
     javaIt.toFront();
     javaIt.next();
     while(javaIt.hasNext()) {
@@ -1083,14 +1056,6 @@ void tst_QHash::iterators()
         testString1 = javaIt.peekNext().value();
         javaIt.next();
         QVERIFY(javaIt.value() == testString1);
-        QCOMPARE(javaIt.peekPrevious().value(), testString1);
-    }
-    while(javaIt.hasPrevious()) {
-        testString = javaIt.value();
-        testString1 = javaIt.peekPrevious().value();
-        javaIt.previous();
-        QVERIFY(javaIt.value() == testString1);
-        QCOMPARE(javaIt.peekNext().value(), testString1);
     }
 }
 
@@ -1115,9 +1080,15 @@ void tst_QHash::keyIterator()
     QVERIFY(key_it != hash.keyEnd());
     QCOMPARE(*key_it, it.key());
     QCOMPARE(*(key_it++), (it++).key());
-    QCOMPARE(*(key_it--), (it--).key());
-    QCOMPARE(*(++key_it), (++it).key());
-    QCOMPARE(*(--key_it), (--it).key());
+    if (key_it != hash.keyEnd()) {
+        QVERIFY(it != hash.end());
+        ++key_it;
+        ++it;
+        if (key_it != hash.keyEnd())
+            QCOMPARE(*key_it, it.key());
+        else
+            QVERIFY(it == hash.end());
+    }
 
     QCOMPARE(std::count(hash.keyBegin(), hash.keyEnd(), 99), 1);
 
@@ -1162,19 +1133,11 @@ void tst_QHash::keyValueIterator()
 
     ++it;
     ++key_value_it;
-    QCOMPARE(*key_value_it, entry_type(it.key(), it.value()));
-
-    --it;
-    --key_value_it;
-    QCOMPARE(*key_value_it, entry_type(it.key(), it.value()));
-
-    ++it;
-    ++key_value_it;
-    QCOMPARE(*key_value_it, entry_type(it.key(), it.value()));
+    if (it != hash.end())
+        QCOMPARE(*key_value_it, entry_type(it.key(), it.value()));
+    else
+        QVERIFY(key_value_it == hash.constKeyValueEnd());
 
-    --it;
-    --key_value_it;
-    QCOMPARE(*key_value_it, entry_type(it.key(), it.value()));
     key = 99;
     value = 99 * 100;
     QCOMPARE(std::count(hash.constKeyValueBegin(), hash.constKeyValueEnd(), entry_type(key, value)), 1);
@@ -1184,9 +1147,9 @@ void tst_QHash::rehash_isnt_quadratic()
 {
     // this test should be incredibly slow if rehash() is quadratic
     for (int j = 0; j < 5; ++j) {
-        QHash<int, int> testHash;
+        QMultiHash<int, int> testHash;
         for (int i = 0; i < 500000; ++i)
-            testHash.insertMulti(1, 1);
+            testHash.insert(1, 1);
     }
 }
 
@@ -1330,27 +1293,27 @@ QList<T> sorted(const QList<T> &list)
 
 void tst_QHash::keys_values_uniqueKeys()
 {
-    QHash<QString, int> hash;
+    QMultiHash<QString, int> hash;
     QVERIFY(hash.uniqueKeys().isEmpty());
     QVERIFY(hash.keys().isEmpty());
     QVERIFY(hash.values().isEmpty());
 
-    hash.insertMulti("alpha", 1);
+    hash.insert("alpha", 1);
     QVERIFY(sorted(hash.keys()) == (QList<QString>() << "alpha"));
     QVERIFY(hash.keys() == hash.uniqueKeys());
     QVERIFY(hash.values() == (QList<int>() << 1));
 
-    hash.insertMulti("beta", -2);
+    hash.insert("beta", -2);
     QVERIFY(sorted(hash.keys()) == (QList<QString>() << "alpha" << "beta"));
     QVERIFY(hash.keys() == hash.uniqueKeys());
     QVERIFY(sorted(hash.values()) == sorted(QList<int>() << 1 << -2));
 
-    hash.insertMulti("alpha", 2);
+    hash.insert("alpha", 2);
     QVERIFY(sorted(hash.uniqueKeys()) == (QList<QString>() << "alpha" << "beta"));
     QVERIFY(sorted(hash.keys()) == (QList<QString>() << "alpha" << "alpha" << "beta"));
     QVERIFY(sorted(hash.values()) == sorted(QList<int>() << 2 << 1 << -2));
 
-    hash.insertMulti("beta", 4);
+    hash.insert("beta", 4);
     QVERIFY(sorted(hash.uniqueKeys()) == (QList<QString>() << "alpha" << "beta"));
     QVERIFY(sorted(hash.keys()) == (QList<QString>() << "alpha" << "alpha" << "beta" << "beta"));
     QVERIFY(sorted(hash.values()) == sorted(QList<int>() << 2 << 1 << 4 << -2));
@@ -1373,13 +1336,6 @@ void tst_QHash::noNeedlessRehashes()
 void tst_QHash::const_shared_null()
 {
     QHash<int, QString> hash2;
-#if !defined(QT_NO_UNSHARABLE_CONTAINERS)
-    QHash<int, QString> hash1;
-    hash1.setSharable(false);
-    QVERIFY(hash1.isDetached());
-
-    hash2.setSharable(true);
-#endif
     QVERIFY(!hash2.isDetached());
 }
 
@@ -1511,14 +1467,14 @@ void tst_QHash::initializerList()
 
 void tst_QHash::eraseValidIteratorOnSharedHash()
 {
-    QHash<int, int> a, b;
+    QMultiHash<int, int> a, b;
     a.insert(10, 10);
-    a.insertMulti(10, 25);
-    a.insertMulti(10, 30);
+    a.insert(10, 25);
+    a.insert(10, 30);
     a.insert(20, 20);
     a.insert(40, 40);
 
-    QHash<int, int>::iterator i = a.begin();
+    auto i = a.begin();
     while (i.value() != 25)
         ++i;
 
@@ -1540,7 +1496,7 @@ void tst_QHash::eraseValidIteratorOnSharedHash()
 
 void tst_QHash::equal_range()
 {
-    QHash<int, QString> hash;
+    QMultiHash<int, QString> hash;
 
     auto result = hash.equal_range(0);
     QCOMPARE(result.first, hash.end());
@@ -1553,7 +1509,7 @@ void tst_QHash::equal_range()
     QCOMPARE(result.first, hash.find(1));
     QVERIFY(std::distance(result.first, result.second) == 1);
 
-    QHash<int, int> h1;
+    QMultiHash<int, int> h1;
     {
         auto p = h1.equal_range(0);
         QVERIFY(p.first == p.second);
@@ -1604,7 +1560,7 @@ void tst_QHash::equal_range()
         QVERIFY(p2.first == m1.begin() || p2.second == m1.end());
     }
 
-    const QHash<int, int> ch1 = h1;
+    const QMultiHash<int, int> ch1 = h1;
     {
         auto p1 = ch1.equal_range(9);
         QVERIFY(p1.first == p1.second);
@@ -1630,10 +1586,10 @@ void tst_QHash::equal_range()
         QVERIFY(p2.first == cm1.cbegin() || p2.second == cm1.cend());
     }
 
-    QHash<int, int> h2;
+    QMultiHash<int, int> h2;
     for (int i = 0; i < 8; ++i)
         for (int j = 0; j < 8; ++j)
-            h2.insertMulti(i, i*j);
+            h2.insert(i, i*j);
 
     for (int i = 0; i < 8; ++i) {
         auto pair = h2.equal_range(i);
@@ -1699,21 +1655,6 @@ void tst_QHash::insert_hash()
         QCOMPARE(hash[2], 5);
         QCOMPARE(hash[7], 55);
     }
-    {
-        // This will use a QMultiHash and then insert that into QHash,
-        // the ordering is undefined so we won't test that but make
-        // sure this isn't adding multiple entries with the same key
-        // to the QHash.
-        QHash<int, int> hash;
-        QMultiHash<int, int> hash2;
-        hash2.insert(0, 5);
-        hash2.insert(0, 6);
-        hash2.insert(0, 7);
-
-        hash.insert(hash2);
-
-        QCOMPARE(hash.count(), 1);
-    }
 }
 
 QTEST_APPLESS_MAIN(tst_QHash)
diff --git a/tests/auto/corelib/tools/qhash_strictiterators/qhash_strictiterators.pro b/tests/auto/corelib/tools/qhash_strictiterators/qhash_strictiterators.pro
deleted file mode 100644
index 715e9bf0c9..0000000000
--- a/tests/auto/corelib/tools/qhash_strictiterators/qhash_strictiterators.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-include(../qhash/qhash.pro)
-TARGET = tst_qhash_strictiterators
-DEFINES += QT_STRICT_ITERATORS tst_QHash=tst_QHash_StrictIterators
diff --git a/tests/auto/corelib/tools/qhashfunctions/CMakeLists.txt b/tests/auto/corelib/tools/qhashfunctions/CMakeLists.txt
new file mode 100644
index 0000000000..87d109f997
--- /dev/null
+++ b/tests/auto/corelib/tools/qhashfunctions/CMakeLists.txt
@@ -0,0 +1,10 @@
+# Generated from qhashfunctions.pro.
+
+#####################################################################
+## tst_qhashfunctions Test:
+#####################################################################
+
+add_qt_test(tst_qhashfunctions
+    SOURCES
+        tst_qhashfunctions.cpp
+)
diff --git a/tests/auto/corelib/tools/qlinkedlist/qlinkedlist.pro b/tests/auto/corelib/tools/qlinkedlist/qlinkedlist.pro
deleted file mode 100644
index c53d553d6d..0000000000
--- a/tests/auto/corelib/tools/qlinkedlist/qlinkedlist.pro
+++ /dev/null
@@ -1,7 +0,0 @@
-CONFIG += testcase
-TARGET = tst_qlinkedlist
-QT = core testlib
-qtConfig(c++14): CONFIG += c++14
-qtConfig(c++1z): CONFIG += c++1z
-SOURCES = tst_qlinkedlist.cpp
-DEFINES -= QT_NO_LINKED_LIST
diff --git a/tests/auto/corelib/tools/qlinkedlist/tst_qlinkedlist.cpp b/tests/auto/corelib/tools/qlinkedlist/tst_qlinkedlist.cpp
deleted file mode 100644
index df42b5dea9..0000000000
--- a/tests/auto/corelib/tools/qlinkedlist/tst_qlinkedlist.cpp
+++ /dev/null
@@ -1,1133 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <QtTest/QtTest>
-#include <QLinkedList>
-
-struct Movable
-{
-    Movable(char input = 'j') : i(input), state(Constructed)
-    {
-        ++liveCount;
-    }
-    Movable(const Movable &other)
-        : i(other.i)
-        , state(Constructed)
-    {
-        check(other.state, Constructed);
-        ++liveCount;
-    }
-
-    ~Movable()
-    {
-        check(state, Constructed);
-        i = 0;
-        --liveCount;
-        state = Destructed;
-    }
-
-    bool operator ==(const Movable &other) const
-    {
-        check(state, Constructed);
-        check(other.state, Constructed);
-        return i == other.i;
-    }
-
-    Movable &operator=(const Movable &other)
-    {
-        check(state, Constructed);
-        check(other.state, Constructed);
-        i = other.i;
-        return *this;
-    }
-    char i;
-
-    static int getLiveCount() { return liveCount; }
-private:
-    static int liveCount;
-
-    enum State { Constructed = 106, Destructed = 110 };
-    State state;
-
-    static void check(const State state1, const State state2)
-    {
-        QCOMPARE(int(state1), int(state2));
-    }
-};
-
-int Movable::liveCount = 0;
-
-QT_BEGIN_NAMESPACE
-Q_DECLARE_TYPEINFO(Movable, Q_MOVABLE_TYPE);
-QT_END_NAMESPACE
-
-Q_DECLARE_METATYPE(Movable);
-
-Q_DECLARE_METATYPE(QLinkedList<int>);
-
-
-int qHash(const Movable& movable)
-{
-    return qHash(movable.i);
-}
-
-struct Complex
-{
-    Complex(int val = 0)
-        : value(val)
-        , checkSum(this)
-    {
-        ++liveCount;
-    }
-
-    Complex(Complex const &other)
-        : value(other.value)
-        , checkSum(this)
-    {
-        ++liveCount;
-    }
-
-    Complex &operator=(Complex const &other)
-    {
-        check(); other.check();
-
-        value = other.value;
-        return *this;
-    }
-
-    ~Complex()
-    {
-        --liveCount;
-        check();
-    }
-
-    operator int() const { return value; }
-
-    bool operator==(Complex const &other) const
-    {
-        check(); other.check();
-        return value == other.value;
-    }
-
-    void check() const
-    {
-        QVERIFY(this == checkSum);
-    }
-
-    static int getLiveCount() { return liveCount; }
-private:
-    static int liveCount;
-
-    int value;
-    void *checkSum;
-};
-
-int Complex::liveCount = 0;
-
-Q_DECLARE_METATYPE(Complex);
-
-// Tests depend on the fact that:
-Q_STATIC_ASSERT(!QTypeInfo<int>::isStatic);
-Q_STATIC_ASSERT(!QTypeInfo<int>::isComplex);
-Q_STATIC_ASSERT(!QTypeInfo<Movable>::isStatic);
-Q_STATIC_ASSERT(QTypeInfo<Movable>::isComplex);
-Q_STATIC_ASSERT(QTypeInfo<Complex>::isStatic);
-Q_STATIC_ASSERT(QTypeInfo<Complex>::isComplex);
-
-class tst_QLinkedList : public QObject
-{
-    Q_OBJECT
-private slots:
-    void eraseValidIteratorsOnSharedList() const;
-    void insertWithIteratorsOnSharedList() const;
-    void lengthInt() const;
-    void lengthMovable() const;
-    void lengthComplex() const;
-    void lengthSignature() const;
-    void firstInt() const;
-    void firstMovable() const;
-    void firstComplex() const;
-    void lastInt() const;
-    void lastMovable() const;
-    void lastComplex() const;
-    void beginInt() const;
-    void beginMovable() const;
-    void beginComplex() const;
-    void endInt() const;
-    void endMovable() const;
-    void endComplex() const;
-    void containsInt() const;
-    void containsMovable() const;
-    void containsComplex() const;
-    void countInt() const;
-    void countMovable() const;
-    void countComplex() const;
-    void cpp17ctad() const;
-    void emptyInt() const;
-    void emptyMovable() const;
-    void emptyComplex() const;
-    void endsWithInt() const;
-    void endsWithMovable() const;
-    void endsWithComplex() const;
-    void removeAllInt() const;
-    void removeAllMovable() const;
-    void removeAllComplex() const;
-    void removeOneInt() const;
-    void removeOneMovable() const;
-    void removeOneComplex() const;
-    void reverseIterators() const;
-    void startsWithInt() const;
-    void startsWithMovable() const;
-    void startsWithComplex() const;
-    void takeFirstInt() const;
-    void takeFirstMovable() const;
-    void takeFirstComplex() const;
-    void takeLastInt() const;
-    void takeLastMovable() const;
-    void takeLastComplex() const;
-    void toStdListInt() const;
-    void toStdListMovable() const;
-    void toStdListComplex() const;
-    void testOperatorsInt() const;
-    void testOperatorsMovable() const;
-    void testOperatorsComplex() const;
-    void testSTLIteratorsInt() const;
-    void testSTLIteratorsMovable() const;
-    void testSTLIteratorsComplex() const;
-
-    void initializeList() const;
-
-    void constSharedNullInt() const;
-    void constSharedNullMovable() const;
-    void constSharedNullComplex() const;
-
-    void setSharableInt() const;
-private:
-    template<typename T> void length() const;
-    template<typename T> void first() const;
-    template<typename T> void last() const;
-    template<typename T> void begin() const;
-    template<typename T> void end() const;
-    template<typename T> void contains() const;
-    template<typename T> void count() const;
-    template<typename T> void empty() const;
-    template<typename T> void endsWith() const;
-    template<typename T> void move() const;
-    template<typename T> void removeAll() const;
-    template<typename T> void removeOne() const;
-    template<typename T> void startsWith() const;
-    template<typename T> void swap() const;
-    template<typename T> void takeFirst() const;
-    template<typename T> void takeLast() const;
-    template<typename T> void toStdList() const;
-    template<typename T> void value() const;
-
-    template<typename T> void testOperators() const;
-    template<typename T> void testSTLIterators() const;
-
-    template<typename T> void constSharedNull() const;
-
-    int dummyForGuard;
-};
-
-template<typename T> struct SimpleValue
-{
-    static T at(int index)
-    {
-        return values[index % maxSize];
-    }
-    static const uint maxSize = 7;
-    static const T values[maxSize];
-};
-
-template<>
-const int SimpleValue<int>::values[] = { 10, 20, 30, 40, 100, 101, 102 };
-template<>
-const Movable SimpleValue<Movable>::values[] = { 10, 20, 30, 40, 100, 101, 102 };
-template<>
-const Complex SimpleValue<Complex>::values[] = { 10, 20, 30, 40, 100, 101, 102 };
-
-// Make some macros for the tests to use in order to be slightly more readable...
-#define T_FOO SimpleValue<T>::at(0)
-#define T_BAR SimpleValue<T>::at(1)
-#define T_BAZ SimpleValue<T>::at(2)
-#define T_CAT SimpleValue<T>::at(3)
-#define T_DOG SimpleValue<T>::at(4)
-#define T_BLAH SimpleValue<T>::at(5)
-#define T_WEEE SimpleValue<T>::at(6)
-
-template<typename T>
-void tst_QLinkedList::length() const
-{
-    /* Empty list. */
-    {
-        const QLinkedList<T> list;
-        QCOMPARE(list.size(), 0);
-    }
-
-    /* One entry. */
-    {
-        QLinkedList<T> list;
-        list.append(T_FOO);
-        QCOMPARE(list.size(), 1);
-    }
-
-    /* Two entries. */
-    {
-        QLinkedList<T> list;
-        list.append(T_FOO);
-        list.append(T_BAR);
-        QCOMPARE(list.size(), 2);
-    }
-
-    /* Three entries. */
-    {
-        QLinkedList<T> list;
-        list.append(T_FOO);
-        list.append(T_BAR);
-        list.append(T_BAZ);
-        QCOMPARE(list.size(), 3);
-    }
-}
-
-void tst_QLinkedList::eraseValidIteratorsOnSharedList() const
-{
-    QLinkedList<int> a, b;
-    a.append(5);
-    a.append(10);
-    a.append(20);
-    a.append(20);
-    a.append(20);
-    a.append(20);
-    a.append(30);
-
-    QLinkedList<int>::iterator i = a.begin();
-    ++i;
-    ++i;
-    ++i;
-    b = a;
-    QLinkedList<int>::iterator r = a.erase(i);
-    QCOMPARE(b.size(), 7);
-    QCOMPARE(a.size(), 6);
-    --r;
-    --r;
-    QCOMPARE(*r, 10); // Ensure that number 2 instance was removed;
-}
-
-void tst_QLinkedList::insertWithIteratorsOnSharedList() const
-{
-    QLinkedList<int> a, b;
-    a.append(5);
-    a.append(10);
-    a.append(20);
-    QLinkedList<int>::iterator i = a.begin();
-    ++i;
-    ++i;
-    b = a;
-
-    QLinkedList<int>::iterator i2 = a.insert(i, 15);
-    QCOMPARE(b.size(), 3);
-    QCOMPARE(a.size(), 4);
-    --i2;
-    QCOMPARE(*i2, 10);
-}
-
-void tst_QLinkedList::lengthInt() const
-{
-    length<int>();
-}
-
-void tst_QLinkedList::lengthMovable() const
-{
-    const int liveCount = Movable::getLiveCount();
-    length<Movable>();
-    QCOMPARE(liveCount, Movable::getLiveCount());
-}
-
-void tst_QLinkedList::lengthComplex() const
-{
-    const int liveCount = Complex::getLiveCount();
-    length<Complex>();
-    QCOMPARE(liveCount, Complex::getLiveCount());
-}
-
-void tst_QLinkedList::lengthSignature() const
-{
-    /* Constness. */
-    {
-        const QLinkedList<int> list;
-        /* The function should be const. */
-        list.size();
-    }
-}
-
-template<typename T>
-void tst_QLinkedList::first() const
-{
-    QLinkedList<T> list;
-    list << T_FOO << T_BAR;
-
-    QCOMPARE(list.first(), T_FOO);
-
-    // remove an item, make sure it still works
-    list.pop_front();
-    QVERIFY(list.size() == 1);
-    QCOMPARE(list.first(), T_BAR);
-}
-
-void tst_QLinkedList::firstInt() const
-{
-    first<int>();
-}
-
-void tst_QLinkedList::firstMovable() const
-{
-    const int liveCount = Movable::getLiveCount();
-    first<Movable>();
-    QCOMPARE(liveCount, Movable::getLiveCount());
-}
-
-void tst_QLinkedList::firstComplex() const
-{
-    const int liveCount = Complex::getLiveCount();
-    first<Complex>();
-    QCOMPARE(liveCount, Complex::getLiveCount());
-}
-
-template<typename T>
-void tst_QLinkedList::last() const
-{
-    QLinkedList<T> list;
-    list << T_FOO << T_BAR;
-
-    QCOMPARE(list.last(), T_BAR);
-
-    // remove an item, make sure it still works
-    list.pop_back();
-    QVERIFY(list.size() == 1);
-    QCOMPARE(list.last(), T_FOO);
-}
-
-void tst_QLinkedList::lastInt() const
-{
-    last<int>();
-}
-
-void tst_QLinkedList::lastMovable() const
-{
-    const int liveCount = Movable::getLiveCount();
-    last<Movable>();
-    QCOMPARE(liveCount, Movable::getLiveCount());
-}
-
-void tst_QLinkedList::lastComplex() const
-{
-    const int liveCount = Complex::getLiveCount();
-    last<Complex>();
-    QCOMPARE(liveCount, Complex::getLiveCount());
-}
-
-template<typename T>
-void tst_QLinkedList::begin() const
-{
-    QLinkedList<T> list;
-    list << T_FOO << T_BAR;
-
-    QCOMPARE(*list.begin(), T_FOO);
-
-    // remove an item, make sure it still works
-    list.pop_front();
-    QVERIFY(list.size() == 1);
-    QCOMPARE(*list.begin(), T_BAR);
-}
-
-void tst_QLinkedList::beginInt() const
-{
-    begin<int>();
-}
-
-void tst_QLinkedList::beginMovable() const
-{
-    const int liveCount = Movable::getLiveCount();
-    begin<Movable>();
-    QCOMPARE(liveCount, Movable::getLiveCount());
-}
-
-void tst_QLinkedList::beginComplex() const
-{
-    const int liveCount = Complex::getLiveCount();
-    begin<Complex>();
-    QCOMPARE(liveCount, Complex::getLiveCount());
-}
-
-template<typename T>
-void tst_QLinkedList::end() const
-{
-    QLinkedList<T> list;
-    list << T_FOO << T_BAR;
-
-    QCOMPARE(*--list.end(), T_BAR);
-
-    // remove an item, make sure it still works
-    list.pop_back();
-    QVERIFY(list.size() == 1);
-    QCOMPARE(*--list.end(), T_FOO);
-}
-
-void tst_QLinkedList::endInt() const
-{
-    end<int>();
-}
-
-void tst_QLinkedList::endMovable() const
-{
-    const int liveCount = Movable::getLiveCount();
-    end<Movable>();
-    QCOMPARE(liveCount, Movable::getLiveCount());
-}
-
-void tst_QLinkedList::endComplex() const
-{
-    const int liveCount = Complex::getLiveCount();
-    end<Complex>();
-    QCOMPARE(liveCount, Complex::getLiveCount());
-}
-
-template<typename T>
-void tst_QLinkedList::contains() const
-{
-    QLinkedList<T> list;
-    list << T_FOO << T_BAR << T_BAZ;
-
-    QVERIFY(list.contains(T_FOO));
-    QVERIFY(list.contains(T_BLAH) != true);
-
-    // add it and make sure it matches
-    list.append(T_BLAH);
-    QVERIFY(list.contains(T_BLAH));
-}
-
-void tst_QLinkedList::containsInt() const
-{
-    contains<int>();
-}
-
-void tst_QLinkedList::containsMovable() const
-{
-    const int liveCount = Movable::getLiveCount();
-    contains<Movable>();
-    QCOMPARE(liveCount, Movable::getLiveCount());
-}
-
-void tst_QLinkedList::containsComplex() const
-{
-    const int liveCount = Complex::getLiveCount();
-    contains<Complex>();
-    QCOMPARE(liveCount, Complex::getLiveCount());
-}
-
-template<typename T>
-void tst_QLinkedList::count() const
-{
-    QLinkedList<T> list;
-
-    // starts empty
-    QVERIFY(list.count() == 0);
-
-    // goes up
-    list.append(T_FOO);
-    QVERIFY(list.count() == 1);
-
-    // and up
-    list.append(T_BAR);
-    QVERIFY(list.count() == 2);
-
-    // and down
-    list.pop_back();
-    QVERIFY(list.count() == 1);
-
-    // and empty. :)
-    list.pop_back();
-    QVERIFY(list.count() == 0);
-}
-
-void tst_QLinkedList::countInt() const
-{
-    count<int>();
-}
-
-void tst_QLinkedList::countMovable() const
-{
-    const int liveCount = Movable::getLiveCount();
-    count<Movable>();
-    QCOMPARE(liveCount, Movable::getLiveCount());
-}
-
-void tst_QLinkedList::countComplex() const
-{
-    const int liveCount = Complex::getLiveCount();
-    count<Complex>();
-    QCOMPARE(liveCount, Complex::getLiveCount());
-}
-
-void tst_QLinkedList::cpp17ctad() const
-{
-#ifdef __cpp_deduction_guides
-#define QVERIFY_IS_LIST_OF(obj, Type) \
-    QVERIFY2((std::is_same<decltype(obj), QLinkedList<Type>>::value), \
-             QMetaType::typeName(qMetaTypeId<decltype(obj)::value_type>()))
-#define CHECK(Type, One, Two, Three) \
-    do { \
-        const Type v[] = {One, Two, Three}; \
-        QLinkedList v1 = {One, Two, Three}; \
-        QVERIFY_IS_LIST_OF(v1, Type); \
-        QLinkedList v2(v1.begin(), v1.end()); \
-        QVERIFY_IS_LIST_OF(v2, Type); \
-        QLinkedList v3(std::begin(v), std::end(v)); \
-        QVERIFY_IS_LIST_OF(v3, Type); \
-    } while (false) \
-    /*end*/
-    CHECK(int, 1, 2, 3);
-    CHECK(double, 1.0, 2.0, 3.0);
-    CHECK(QString, QStringLiteral("one"), QStringLiteral("two"), QStringLiteral("three"));
-#undef QVERIFY_IS_LIST_OF
-#undef CHECK
-#else
-    QSKIP("This test requires C++17 Constructor Template Argument Deduction support enabled in the compiler.");
-#endif
-}
-
-template<typename T>
-void tst_QLinkedList::empty() const
-{
-    QLinkedList<T> list;
-
-    // make sure it starts empty
-    QVERIFY(list.empty());
-
-    // and doesn't stay empty
-    list.append(T_FOO);
-    QVERIFY(!list.empty());
-
-    // and goes back to being empty
-    list.pop_back();
-    QVERIFY(list.empty());
-}
-
-void tst_QLinkedList::emptyInt() const
-{
-    empty<int>();
-}
-
-void tst_QLinkedList::emptyMovable() const
-{
-    const int liveCount = Movable::getLiveCount();
-    empty<Movable>();
-    QCOMPARE(liveCount, Movable::getLiveCount());
-}
-
-void tst_QLinkedList::emptyComplex() const
-{
-    const int liveCount = Complex::getLiveCount();
-    empty<Complex>();
-    QCOMPARE(liveCount, Complex::getLiveCount());
-}
-
-template<typename T>
-void tst_QLinkedList::endsWith() const
-{
-    QLinkedList<T> list;
-    list << T_FOO << T_BAR << T_BAZ;
-
-    // test it returns correctly in both cases
-    QVERIFY(list.endsWith(T_BAZ));
-    QVERIFY(!list.endsWith(T_BAR));
-
-    // remove an item and make sure the end item changes
-    list.pop_back();
-    QVERIFY(list.endsWith(T_BAR));
-}
-
-void tst_QLinkedList::endsWithInt() const
-{
-    endsWith<int>();
-}
-
-void tst_QLinkedList::endsWithMovable() const
-{
-    const int liveCount = Movable::getLiveCount();
-    endsWith<Movable>();
-    QCOMPARE(liveCount, Movable::getLiveCount());
-}
-
-void tst_QLinkedList::endsWithComplex() const
-{
-    const int liveCount = Complex::getLiveCount();
-    endsWith<Complex>();
-    QCOMPARE(liveCount, Complex::getLiveCount());
-}
-
-template<typename T>
-void tst_QLinkedList::removeAll() const
-{
-    QLinkedList<T> list;
-    list << T_FOO << T_BAR << T_BAZ;
-
-    // remove one instance
-    list.removeAll(T_BAR);
-    QCOMPARE(list, QLinkedList<T>() << T_FOO << T_BAZ);
-
-    // many instances
-    list << T_FOO << T_BAR << T_BAZ << T_FOO << T_BAR << T_BAZ << T_FOO << T_BAR << T_BAZ;
-    list.removeAll(T_BAR);
-    QCOMPARE(list, QLinkedList<T>() << T_FOO << T_BAZ << T_FOO << T_BAZ << T_FOO << T_BAZ << T_FOO << T_BAZ);
-
-    // try remove something that doesn't exist
-    list.removeAll(T_WEEE);
-    QCOMPARE(list, QLinkedList<T>() << T_FOO << T_BAZ << T_FOO << T_BAZ << T_FOO << T_BAZ << T_FOO << T_BAZ);
-}
-
-void tst_QLinkedList::removeAllInt() const
-{
-    removeAll<int>();
-}
-
-void tst_QLinkedList::removeAllMovable() const
-{
-    const int liveCount = Movable::getLiveCount();
-    removeAll<Movable>();
-    QCOMPARE(liveCount, Movable::getLiveCount());
-}
-
-void tst_QLinkedList::removeAllComplex() const
-{
-    const int liveCount = Complex::getLiveCount();
-    removeAll<Complex>();
-    QCOMPARE(liveCount, Complex::getLiveCount());
-}
-
-template<typename T>
-void tst_QLinkedList::removeOne() const
-{
-    QLinkedList<T> list;
-    list << T_FOO << T_BAR << T_BAZ;
-
-    // middle
-    list.removeOne(T_BAR);
-    QCOMPARE(list, QLinkedList<T>() << T_FOO << T_BAZ);
-
-    // start
-    list.removeOne(T_FOO);
-    QCOMPARE(list, QLinkedList<T>() << T_BAZ);
-
-    // last
-    list.removeOne(T_BAZ);
-    QCOMPARE(list, QLinkedList<T>());
-
-    // make sure it really only removes one :)
-    list << T_FOO << T_FOO;
-    list.removeOne(T_FOO);
-    QCOMPARE(list, QLinkedList<T>() << T_FOO);
-
-    // try remove something that doesn't exist
-    list.removeOne(T_WEEE);
-    QCOMPARE(list, QLinkedList<T>() << T_FOO);
-}
-
-void tst_QLinkedList::removeOneInt() const
-{
-    removeOne<int>();
-}
-
-void tst_QLinkedList::removeOneMovable() const
-{
-    const int liveCount = Movable::getLiveCount();
-    removeOne<Movable>();
-    QCOMPARE(liveCount, Movable::getLiveCount());
-}
-
-void tst_QLinkedList::removeOneComplex() const
-{
-    const int liveCount = Complex::getLiveCount();
-    removeOne<Complex>();
-    QCOMPARE(liveCount, Complex::getLiveCount());
-}
-
-void tst_QLinkedList::reverseIterators() const
-{
-    QLinkedList<int> l;
-    l << 1 << 2 << 3 << 4;
-    QLinkedList<int> lr = l;
-    std::reverse(lr.begin(), lr.end());
-    const QLinkedList<int> &clr = lr;
-    QVERIFY(std::equal(l.begin(), l.end(), lr.rbegin()));
-    QVERIFY(std::equal(l.begin(), l.end(), lr.crbegin()));
-    QVERIFY(std::equal(l.begin(), l.end(), clr.rbegin()));
-    QVERIFY(std::equal(lr.rbegin(), lr.rend(), l.begin()));
-    QVERIFY(std::equal(lr.crbegin(), lr.crend(), l.begin()));
-    QVERIFY(std::equal(clr.rbegin(), clr.rend(), l.begin()));
-}
-
-template<typename T>
-void tst_QLinkedList::startsWith() const
-{
-    QLinkedList<T> list;
-    list << T_FOO << T_BAR << T_BAZ;
-
-    // make sure it starts ok
-    QVERIFY(list.startsWith(T_FOO));
-
-    // remove an item
-    list.removeFirst();
-    QVERIFY(list.startsWith(T_BAR));
-}
-
-void tst_QLinkedList::startsWithInt() const
-{
-    startsWith<int>();
-}
-
-void tst_QLinkedList::startsWithMovable() const
-{
-    const int liveCount = Movable::getLiveCount();
-    startsWith<Movable>();
-    QCOMPARE(liveCount, Movable::getLiveCount());
-}
-
-void tst_QLinkedList::startsWithComplex() const
-{
-    const int liveCount = Complex::getLiveCount();
-    startsWith<Complex>();
-    QCOMPARE(liveCount, Complex::getLiveCount());
-}
-
-template<typename T>
-void tst_QLinkedList::takeFirst() const
-{
-    QLinkedList<T> list;
-    list << T_FOO << T_BAR << T_BAZ;
-
-    QCOMPARE(list.takeFirst(), T_FOO);
-    QVERIFY(list.size() == 2);
-    QCOMPARE(list.takeFirst(), T_BAR);
-    QVERIFY(list.size() == 1);
-    QCOMPARE(list.takeFirst(), T_BAZ);
-    QVERIFY(list.size() == 0);
-}
-
-void tst_QLinkedList::takeFirstInt() const
-{
-    takeFirst<int>();
-}
-
-void tst_QLinkedList::takeFirstMovable() const
-{
-    const int liveCount = Movable::getLiveCount();
-    takeFirst<Movable>();
-    QCOMPARE(liveCount, Movable::getLiveCount());
-}
-
-void tst_QLinkedList::takeFirstComplex() const
-{
-    const int liveCount = Complex::getLiveCount();
-    takeFirst<Complex>();
-    QCOMPARE(liveCount, Complex::getLiveCount());
-}
-
-template<typename T>
-void tst_QLinkedList::takeLast() const
-{
-    QLinkedList<T> list;
-    list << T_FOO << T_BAR << T_BAZ;
-
-    QCOMPARE(list.takeLast(), T_BAZ);
-    QCOMPARE(list.takeLast(), T_BAR);
-    QCOMPARE(list.takeLast(), T_FOO);
-}
-
-void tst_QLinkedList::takeLastInt() const
-{
-    takeLast<int>();
-}
-
-void tst_QLinkedList::takeLastMovable() const
-{
-    const int liveCount = Movable::getLiveCount();
-    takeLast<Movable>();
-    QCOMPARE(liveCount, Movable::getLiveCount());
-}
-
-void tst_QLinkedList::takeLastComplex() const
-{
-    const int liveCount = Complex::getLiveCount();
-    takeLast<Complex>();
-    QCOMPARE(liveCount, Complex::getLiveCount());
-}
-
-template<typename T>
-void tst_QLinkedList::toStdList() const
-{
-    QLinkedList<T> list;
-    list << T_FOO << T_BAR << T_BAZ;
-
-    // yuck.
-    std::list<T> slist;
-    slist.push_back(T_FOO);
-    slist.push_back(T_BAR);
-    slist.push_back(T_BAZ);
-
-    QCOMPARE(list.toStdList(), slist);
-    QCOMPARE(list, QLinkedList<T>() << T_FOO << T_BAR << T_BAZ);
-}
-
-void tst_QLinkedList::toStdListInt() const
-{
-    toStdList<int>();
-}
-
-void tst_QLinkedList::toStdListMovable() const
-{
-    const int liveCount = Movable::getLiveCount();
-    toStdList<Movable>();
-    QCOMPARE(liveCount, Movable::getLiveCount());
-}
-
-void tst_QLinkedList::toStdListComplex() const
-{
-    const int liveCount = Complex::getLiveCount();
-    toStdList<Complex>();
-    QCOMPARE(liveCount, Complex::getLiveCount());
-}
-
-template<typename T>
-void tst_QLinkedList::testOperators() const
-{
-    QLinkedList<T> list;
-    list << T_FOO << T_BAR << T_BAZ;
-
-    QLinkedList<T> listtwo;
-    listtwo << T_FOO << T_BAR << T_BAZ;
-
-    // test equal
-    QVERIFY(list == listtwo);
-
-    // not equal
-    listtwo.append(T_CAT);
-    QVERIFY(list != listtwo);
-
-    // +=
-    list += listtwo;
-    QVERIFY(list.size() == 7);
-    QVERIFY(listtwo.size() == 4);
-    QCOMPARE(list, QLinkedList<T>() << T_FOO << T_BAR << T_BAZ
-        << T_FOO << T_BAR << T_BAZ << T_CAT);
-
-    // =
-    list = listtwo;
-    QCOMPARE(list, listtwo);
-    QCOMPARE(list, QLinkedList<T>() << T_FOO << T_BAR << T_BAZ << T_CAT);
-}
-
-void tst_QLinkedList::testOperatorsInt() const
-{
-    testOperators<int>();
-}
-
-void tst_QLinkedList::testOperatorsMovable() const
-{
-    const int liveCount = Movable::getLiveCount();
-    testOperators<Movable>();
-    QCOMPARE(liveCount, Movable::getLiveCount());
-}
-
-void tst_QLinkedList::testOperatorsComplex() const
-{
-    const int liveCount = Complex::getLiveCount();
-    testOperators<Complex>();
-    QCOMPARE(liveCount, Complex::getLiveCount());
-}
-
-template<typename T>
-void tst_QLinkedList::testSTLIterators() const
-{
-    QLinkedList<T> list;
-
-    // create a list
-    list << T_FOO << T_BAR << T_BAZ;
-    typename QLinkedList<T>::iterator it = list.begin();
-    QCOMPARE(*it, T_FOO); it++;
-    QCOMPARE(*it, T_BAR); it++;
-    QCOMPARE(*it, T_BAZ); it++;
-    QCOMPARE(it, list.end()); it--;
-
-    // walk backwards
-    QCOMPARE(*it, T_BAZ); it--;
-    QCOMPARE(*it, T_BAR); it--;
-    QCOMPARE(*it, T_FOO);
-
-    // test erase
-    it = list.erase(it);
-    QVERIFY(list.size() == 2);
-    QCOMPARE(*it, T_BAR);
-
-    // test multiple erase
-    it = list.erase(it, it + 2);
-    QVERIFY(list.size() == 0);
-    QCOMPARE(it, list.end());
-
-    // insert again
-    it = list.insert(it, T_FOO);
-    QVERIFY(list.size() == 1);
-    QCOMPARE(*it, T_FOO);
-
-    // insert again
-    it = list.insert(it, T_BAR);
-    QVERIFY(list.size() == 2);
-    QCOMPARE(*it++, T_BAR);
-    QCOMPARE(*it, T_FOO);
-}
-
-void tst_QLinkedList::testSTLIteratorsInt() const
-{
-    testSTLIterators<int>();
-}
-
-void tst_QLinkedList::testSTLIteratorsMovable() const
-{
-    const int liveCount = Movable::getLiveCount();
-    testSTLIterators<Movable>();
-    QCOMPARE(liveCount, Movable::getLiveCount());
-}
-
-void tst_QLinkedList::testSTLIteratorsComplex() const
-{
-    const int liveCount = Complex::getLiveCount();
-    testSTLIterators<Complex>();
-    QCOMPARE(liveCount, Complex::getLiveCount());
-}
-
-void tst_QLinkedList::initializeList() const
-{
-    QLinkedList<int> v1 { 2, 3, 4 };
-    QCOMPARE(v1, QLinkedList<int>() << 2 << 3 << 4);
-    QCOMPARE(v1, (QLinkedList<int> { 2, 3, 4}));
-
-    QLinkedList<QLinkedList<int>> v2{ v1, { 1 }, QLinkedList<int>(), { 2, 3, 4 }  };
-    QLinkedList<QLinkedList<int>> v3;
-    v3 << v1 << (QLinkedList<int>() << 1) << QLinkedList<int>() << v1;
-    QCOMPARE(v3, v2);
-}
-
-
-template<typename T>
-void tst_QLinkedList::constSharedNull() const
-{
-    QLinkedList<T> list2;
-#if !defined(QT_NO_UNSHARABLE_CONTAINERS)
-    QLinkedList<T> list1;
-    list1.setSharable(false);
-    QVERIFY(list1.isDetached());
-
-    list2.setSharable(true);
-#endif
-    QVERIFY(!list2.isDetached());
-}
-
-void tst_QLinkedList::constSharedNullInt() const
-{
-    constSharedNull<int>();
-}
-
-void tst_QLinkedList::constSharedNullMovable() const
-{
-    const int liveCount = Movable::getLiveCount();
-    constSharedNull<Movable>();
-    QCOMPARE(liveCount, Movable::getLiveCount());
-}
-
-void tst_QLinkedList::constSharedNullComplex() const
-{
-    const int liveCount = Complex::getLiveCount();
-    constSharedNull<Complex>();
-    QCOMPARE(liveCount, Complex::getLiveCount());
-}
-
-
-void tst_QLinkedList::setSharableInt() const
-{
-#if !defined(QT_NO_UNSHARABLE_CONTAINERS)
-    QLinkedList<int> orglist;
-    orglist << 0 << 1 << 2 << 3 << 4 << 5;
-    int size = 6;
-
-    QLinkedList<int> list;
-    list = orglist;
-
-    QVERIFY(!list.isDetached());
-    list.setSharable(true);
-
-    QCOMPARE(list.size(), size);
-
-    {
-        QLinkedList<int> copy(list);
-        QVERIFY(!copy.isDetached());
-        QVERIFY(copy.isSharedWith(list));
-    }
-
-    list.setSharable(false);
-    QVERIFY(list.isDetached() || list.isSharedWith(QLinkedList<int>()));
-
-    {
-        QLinkedList<int> copy(list);
-
-        QVERIFY(copy.isDetached() || copy.isSharedWith(QLinkedList<int>()));
-        QCOMPARE(copy.size(), size);
-        QCOMPARE(copy, list);
-    }
-
-    list.setSharable(true);
-
-    {
-        QLinkedList<int> copy(list);
-
-        QVERIFY(!copy.isDetached());
-        QVERIFY(copy.isSharedWith(list));
-    }
-
-    QLinkedList<int>::const_iterator it = list.constBegin();
-    for (int i = 0; i < list.size(); ++i) {
-        QCOMPARE(int(*it), i);
-        ++it;
-    }
-
-    QCOMPARE(list.size(), size);
-#endif
-}
-
-QTEST_APPLESS_MAIN(tst_QLinkedList)
-#include "tst_qlinkedlist.moc"
diff --git a/tests/auto/corelib/tools/qlist/.gitignore b/tests/auto/corelib/tools/qlist/.gitignore
deleted file mode 100644
index df208b6e78..0000000000
--- a/tests/auto/corelib/tools/qlist/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-tst_qlist
diff --git a/tests/auto/corelib/tools/qlist/qlist.pro b/tests/auto/corelib/tools/qlist/qlist.pro
deleted file mode 100644
index 118c607880..0000000000
--- a/tests/auto/corelib/tools/qlist/qlist.pro
+++ /dev/null
@@ -1,6 +0,0 @@
-CONFIG += testcase
-TARGET = tst_qlist
-QT = core testlib
-qtConfig(c++14): CONFIG += c++14
-qtConfig(c++1z): CONFIG += c++1z
-SOURCES = $$PWD/tst_qlist.cpp
diff --git a/tests/auto/corelib/tools/qlist/tst_qlist.cpp b/tests/auto/corelib/tools/qlist/tst_qlist.cpp
deleted file mode 100644
index cc9a3a16d1..0000000000
--- a/tests/auto/corelib/tools/qlist/tst_qlist.cpp
+++ /dev/null
@@ -1,2115 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-
-#include <QtTest/QtTest>
-#include <QList>
-
-template <typename T, class MemoryLayout>
-class is_qlist_array_memory_layout {
-    struct No { char c; };
-    struct Yes { No n[2]; };
-    Q_STATIC_ASSERT(sizeof(No) != sizeof(Yes));
-    static No check(...);
-    static Yes check(MemoryLayout);
-public:
-    enum { value = sizeof(check(typename QList<T>::MemoryLayout())) == sizeof(Yes) };
-};
-
-struct Movable {
-    Movable(char input = 'j')
-        : i(input)
-        , state(Constructed)
-    {
-        ++liveCount;
-    }
-    Movable(const Movable &other)
-        : i(other.i)
-        , state(Constructed)
-    {
-        check(other.state, Constructed);
-        ++liveCount;
-    }
-
-    ~Movable()
-    {
-        check(state, Constructed);
-        i = 0;
-        --liveCount;
-        state = Destructed;
-    }
-
-    bool operator ==(const Movable &other) const
-    {
-        check(state, Constructed);
-        check(other.state, Constructed);
-        return i == other.i;
-    }
-
-    bool operator<(const Movable &other) const
-    {
-        check(state, Constructed);
-        check(other.state, Constructed);
-        return i < other.i;
-    }
-
-    Movable &operator=(const Movable &other)
-    {
-        check(state, Constructed);
-        check(other.state, Constructed);
-        i = other.i;
-        return *this;
-    }
-    char i;
-
-    static int getLiveCount() { return liveCount; }
-private:
-    static int liveCount;
-
-    enum State { Constructed = 106, Destructed = 110 };
-    uchar state;
-
-    static void check(const uchar state1, const uchar state2)
-    {
-        QCOMPARE(state1, state2);
-    }
-};
-
-Q_STATIC_ASSERT(sizeof(Movable) < sizeof(void*));
-
-int Movable::liveCount = 0;
-
-QT_BEGIN_NAMESPACE
-Q_DECLARE_TYPEINFO(Movable, Q_MOVABLE_TYPE);
-QT_END_NAMESPACE
-
-Q_DECLARE_METATYPE(Movable);
-
-int qHash(const Movable& movable)
-{
-    return qHash(movable.i);
-}
-
-struct Optimal
-{
-    Optimal(char input = 'j')
-        : i(input),
-          state(Constructed)
-    {
-        ++liveCount;
-    }
-    Optimal(const Optimal &other)
-        : i(other.i),
-          state(Constructed)
-    {
-        check(other.state, Constructed);
-        ++liveCount;
-    }
-
-    ~Optimal()
-    {
-        check(state, Constructed);
-        i = 0;
-        --liveCount;
-        state = Destructed;
-    }
-
-    bool operator ==(const Optimal &other) const
-    {
-        check(state, Constructed);
-        check(other.state, Constructed);
-        return i == other.i;
-    }
-
-    bool operator<(const Optimal &other) const
-    {
-        check(state, Constructed);
-        check(other.state, Constructed);
-        return i < other.i;
-    }
-
-    Optimal &operator=(const Optimal &other)
-    {
-        check(state, Constructed);
-        check(other.state, Constructed);
-        i = other.i;
-        return *this;
-    }
-    char i;
-
-    static int getLiveCount() { return liveCount; }
-private:
-    static int liveCount;
-
-    enum State { Constructed = 106, Destructed = 110 };
-    uchar state;
-    char padding[sizeof(void*) - 2];
-
-    static void check(const uchar state1, const uchar state2)
-    {
-        QCOMPARE(state1, state2);
-    }
-};
-
-Q_STATIC_ASSERT(sizeof(Optimal) == sizeof(void*));
-
-int Optimal::liveCount = 0;
-
-QT_BEGIN_NAMESPACE
-Q_DECLARE_TYPEINFO(Optimal, Q_MOVABLE_TYPE);
-QT_END_NAMESPACE
-
-Q_DECLARE_METATYPE(Optimal);
-
-int qHash(const Optimal& key)
-{
-    return qHash(key.i);
-}
-
-struct Complex
-{
-    Complex(int val = 0)
-        : value(val)
-        , checkSum(this)
-    {
-        ++liveCount;
-    }
-
-    Complex(Complex const &other)
-        : value(other.value)
-        , checkSum(this)
-    {
-        ++liveCount;
-    }
-
-    Complex &operator=(Complex const &other)
-    {
-        check(); other.check();
-
-        value = other.value;
-        return *this;
-    }
-
-    ~Complex()
-    {
-        --liveCount;
-        check();
-    }
-
-    operator int() const { return value; }
-
-    bool operator==(Complex const &other) const
-    {
-        check(); other.check();
-        return value == other.value;
-    }
-
-    bool operator<(Complex const &other) const
-    {
-        check(); other.check();
-        return value < other.value;
-    }
-
-    void check() const
-    {
-        QVERIFY(this == checkSum);
-    }
-
-    static int getLiveCount() { return liveCount; }
-private:
-    static int liveCount;
-
-    int value;
-    void *checkSum;
-};
-
-int Complex::liveCount = 0;
-
-Q_DECLARE_METATYPE(Complex);
-
-// Tests depend on the fact that:
-Q_STATIC_ASSERT(!QTypeInfo<int>::isStatic);
-Q_STATIC_ASSERT(!QTypeInfo<int>::isComplex);
-Q_STATIC_ASSERT(!QTypeInfo<Movable>::isStatic);
-Q_STATIC_ASSERT(QTypeInfo<Movable>::isComplex);
-Q_STATIC_ASSERT(!QTypeInfo<Optimal>::isStatic);
-Q_STATIC_ASSERT(QTypeInfo<Optimal>::isComplex);
-Q_STATIC_ASSERT(QTypeInfo<Complex>::isStatic);
-Q_STATIC_ASSERT(QTypeInfo<Complex>::isComplex);
-// iow:
-Q_STATIC_ASSERT(( is_qlist_array_memory_layout<int, QListData::NotIndirectLayout>       ::value));
-Q_STATIC_ASSERT((!is_qlist_array_memory_layout<int, QListData::IndirectLayout>          ::value));
-
-Q_STATIC_ASSERT((!is_qlist_array_memory_layout<Optimal, QListData::InlineWithPaddingLayout> ::value));
-Q_STATIC_ASSERT((!is_qlist_array_memory_layout<Optimal, QListData::NotArrayCompatibleLayout>::value));
-Q_STATIC_ASSERT(( is_qlist_array_memory_layout<Optimal, QListData::NotIndirectLayout>       ::value));
-Q_STATIC_ASSERT(( is_qlist_array_memory_layout<Optimal, QListData::ArrayCompatibleLayout>   ::value));
-Q_STATIC_ASSERT((!is_qlist_array_memory_layout<Optimal, QListData::IndirectLayout>          ::value));
-
-Q_STATIC_ASSERT(( is_qlist_array_memory_layout<Movable, QListData::InlineWithPaddingLayout> ::value));
-Q_STATIC_ASSERT(( is_qlist_array_memory_layout<Movable, QListData::NotArrayCompatibleLayout>::value));
-Q_STATIC_ASSERT(( is_qlist_array_memory_layout<Movable, QListData::NotIndirectLayout>       ::value));
-Q_STATIC_ASSERT((!is_qlist_array_memory_layout<Movable, QListData::ArrayCompatibleLayout>   ::value));
-Q_STATIC_ASSERT((!is_qlist_array_memory_layout<Movable, QListData::IndirectLayout>          ::value));
-
-Q_STATIC_ASSERT((!is_qlist_array_memory_layout<Complex, QListData::InlineWithPaddingLayout> ::value));
-Q_STATIC_ASSERT(( is_qlist_array_memory_layout<Complex, QListData::NotArrayCompatibleLayout>::value));
-Q_STATIC_ASSERT((!is_qlist_array_memory_layout<Complex, QListData::NotIndirectLayout>       ::value));
-Q_STATIC_ASSERT((!is_qlist_array_memory_layout<Complex, QListData::ArrayCompatibleLayout>   ::value));
-Q_STATIC_ASSERT(( is_qlist_array_memory_layout<Complex, QListData::IndirectLayout>          ::value));
-
-class tst_QList : public QObject
-{
-    Q_OBJECT
-
-private slots:
-    void lengthOptimal() const;
-    void lengthMovable() const;
-    void lengthComplex() const;
-    void lengthSignature() const;
-    void appendOptimal() const;
-    void appendMovable() const;
-    void appendComplex() const;
-    void prepend() const;
-    void midOptimal() const;
-    void midMovable() const;
-    void midComplex() const;
-    void atOptimal() const;
-    void atMovable() const;
-    void atComplex() const;
-    void firstOptimal() const;
-    void firstMovable() const;
-    void firstComplex() const;
-    void lastOptimal() const;
-    void lastMovable() const;
-    void lastComplex() const;
-    void constFirst() const;
-    void constLast() const;
-    void cpp17ctad() const;
-    void beginOptimal() const;
-    void beginMovable() const;
-    void beginComplex() const;
-    void endOptimal() const;
-    void endMovable() const;
-    void endComplex() const;
-    void containsOptimal() const;
-    void containsMovable() const;
-    void containsComplex() const;
-    void countOptimal() const;
-    void countMovable() const;
-    void countComplex() const;
-    void emptyOptimal() const;
-    void emptyMovable() const;
-    void emptyComplex() const;
-    void endsWithOptimal() const;
-    void endsWithMovable() const;
-    void endsWithComplex() const;
-    void lastIndexOfOptimal() const;
-    void lastIndexOfMovable() const;
-    void lastIndexOfComplex() const;
-    void moveOptimal() const;
-    void moveMovable() const;
-    void moveComplex() const;
-    void removeAllOptimal() const;
-    void removeAllMovable() const;
-    void removeAllComplex() const;
-    void removeAtOptimal() const;
-    void removeAtMovable() const;
-    void removeAtComplex() const;
-    void removeOneOptimal() const;
-    void removeOneMovable() const;
-    void removeOneComplex() const;
-    void replaceOptimal() const;
-    void replaceMovable() const;
-    void replaceComplex() const;
-    void reverseIteratorsOptimal() const;
-    void reverseIteratorsMovable() const;
-    void reverseIteratorsComplex() const;
-    void startsWithOptimal() const;
-    void startsWithMovable() const;
-    void startsWithComplex() const;
-    void swapOptimal() const;
-    void swapMovable() const;
-    void swapComplex() const;
-    void takeAtOptimal() const;
-    void takeAtMovable() const;
-    void takeAtComplex() const;
-    void takeFirstOptimal() const;
-    void takeFirstMovable() const;
-    void takeFirstComplex() const;
-    void takeLastOptimal() const;
-    void takeLastMovable() const;
-    void takeLastComplex() const;
-#if QT_VERSION < QT_VERSION_CHECK(6,0,0)
-    void toSetOptimal() const;
-    void toSetMovable() const;
-    void toSetComplex() const;
-    void toStdListOptimal() const;
-    void toStdListMovable() const;
-    void toStdListComplex() const;
-#endif
-    void toVectorOptimal() const;
-    void toVectorMovable() const;
-    void toVectorComplex() const;
-    void valueOptimal() const;
-    void valueMovable() const;
-    void valueComplex() const;
-
-    void testOperatorsOptimal() const;
-    void testOperatorsMovable() const;
-    void testOperatorsComplex() const;
-    void testSTLIteratorsOptimal() const;
-    void testSTLIteratorsMovable() const;
-    void testSTLIteratorsComplex() const;
-
-    void initializeList() const;
-
-    void constSharedNullOptimal() const;
-    void constSharedNullMovable() const;
-    void constSharedNullComplex() const;
-    void setSharableInt_data() const;
-    void setSharableInt() const;
-    void setSharableComplex_data() const;
-    void setSharableComplex() const;
-    void eraseValidIteratorsOnSharedList() const;
-    void insertWithValidIteratorsOnSharedList() const;
-
-    void qhashOptimal() const { qhash<Optimal>(); }
-    void qhashMovable() const { qhash<Movable>(); }
-    void qhashComplex() const { qhash<Complex>(); }
-    void reserve() const;
-private:
-    template<typename T> void length() const;
-    template<typename T> void append() const;
-    template<typename T> void mid() const;
-    template<typename T> void at() const;
-    template<typename T> void first() const;
-    template<typename T> void last() const;
-    template<typename T> void begin() const;
-    template<typename T> void end() const;
-    template<typename T> void contains() const;
-    template<typename T> void count() const;
-    template<typename T> void empty() const;
-    template<typename T> void endsWith() const;
-    template<typename T> void lastIndexOf() const;
-    template<typename T> void move() const;
-    template<typename T> void qhash() const;
-    template<typename T> void removeAll() const;
-    template<typename T> void removeAt() const;
-    template<typename T> void removeOne() const;
-    template<typename T> void replace() const;
-    template<typename T> void reverseIterators() const;
-    template<typename T> void startsWith() const;
-    template<typename T> void swap() const;
-    template<typename T> void takeAt() const;
-    template<typename T> void takeFirst() const;
-    template<typename T> void takeLast() const;
-#if QT_VERSION < QT_VERSION_CHECK(6,0,0)
-    template<typename T> void toSet() const;
-    template<typename T> void toStdList() const;
-#endif
-    template<typename T> void toVector() const;
-    template<typename T> void value() const;
-
-    template<typename T> void testOperators() const;
-    template<typename T> void testSTLIterators() const;
-
-    template<typename T> void constSharedNull() const;
-
-    int dummyForGuard;
-};
-
-template<typename T> struct SimpleValue
-{
-    static T at(int index)
-    {
-        return values[index % maxSize];
-    }
-    static const uint maxSize = 7;
-    static const T values[maxSize];
-};
-
-template<>
-const Optimal SimpleValue<Optimal>::values[] = { 10, 20, 30, 40, 100, 101, 102 };
-template<>
-const Movable SimpleValue<Movable>::values[] = { 10, 20, 30, 40, 100, 101, 102 };
-template<>
-const Complex SimpleValue<Complex>::values[] = { 10, 20, 30, 40, 100, 101, 102 };
-
-// Make some macros for the tests to use in order to be slightly more readable...
-#define T_FOO SimpleValue<T>::at(0)
-#define T_BAR SimpleValue<T>::at(1)
-#define T_BAZ SimpleValue<T>::at(2)
-#define T_CAT SimpleValue<T>::at(3)
-#define T_DOG SimpleValue<T>::at(4)
-#define T_BLAH SimpleValue<T>::at(5)
-#define T_WEEE SimpleValue<T>::at(6)
-
-template<typename T>
-void tst_QList::length() const
-{
-    /* Empty list. */
-    {
-        const QList<T> list;
-        QCOMPARE(list.length(), 0);
-    }
-
-    /* One entry. */
-    {
-        QList<T> list;
-        list.append(T_FOO);
-        QCOMPARE(list.length(), 1);
-    }
-
-    /* Two entries. */
-    {
-        QList<T> list;
-        list.append(T_FOO);
-        list.append(T_BAR);
-        QCOMPARE(list.length(), 2);
-    }
-
-    /* Three entries. */
-    {
-        QList<T> list;
-        list.append(T_FOO);
-        list.append(T_BAR);
-        list.append(T_BAZ);
-        QCOMPARE(list.length(), 3);
-    }
-}
-
-void tst_QList::lengthOptimal() const
-{
-    const int liveCount = Optimal::getLiveCount();
-    length<Optimal>();
-    QCOMPARE(liveCount, Optimal::getLiveCount());
-}
-
-void tst_QList::lengthMovable() const
-{
-    const int liveCount = Movable::getLiveCount();
-    length<Movable>();
-    QCOMPARE(liveCount, Movable::getLiveCount());
-}
-
-void tst_QList::lengthComplex() const
-{
-    const int liveCount = Complex::getLiveCount();
-    length<Complex>();
-    QCOMPARE(liveCount, Complex::getLiveCount());
-}
-
-void tst_QList::lengthSignature() const
-{
-    /* Constness. */
-    {
-        const QList<int> list;
-        /* The function should be const. */
-        list.length();
-    }
-}
-
-template<typename T>
-void tst_QList::append() const
-{
-    /* test append(const QList<T> &) function */
-    T one(T_FOO);
-    T two(T_BAR);
-    T three(T_BAZ);
-    T four(T_CAT);
-    QList<T> list1;
-    QList<T> list2;
-    QList<T> listTotal;
-    list1.append(one);
-    list1.append(two);
-    list2.append(three);
-    list2.append(four);
-    list1.append(list2);
-    listTotal.append(one);
-    listTotal.append(two);
-    listTotal.append(three);
-    listTotal.append(four);
-    QCOMPARE(list1, listTotal);
-}
-
-void tst_QList::appendOptimal() const
-{
-    const int liveCount = Optimal::getLiveCount();
-    append<Optimal>();
-    QCOMPARE(liveCount, Optimal::getLiveCount());
-}
-
-void tst_QList::appendMovable() const
-{
-    const int liveCount = Movable::getLiveCount();
-    append<Movable>();
-    QCOMPARE(liveCount, Movable::getLiveCount());
-}
-
-void tst_QList::appendComplex() const
-{
-    const int liveCount = Complex::getLiveCount();
-    append<Complex>();
-    QCOMPARE(liveCount, Complex::getLiveCount());
-}
-
-void tst_QList::prepend() const
-{
-    QList<int *> list;
-    int *t1 = new int(0);
-    list.prepend(t1);
-    QVERIFY(list.size() == 1);
-    QVERIFY(list.at(0) == t1);
-    int *t2 = new int(0);
-    list.prepend(t2);
-    QVERIFY(list.size() == 2);
-    QVERIFY(list.at(0) == t2);
-    QVERIFY(list.at(1) == t1);
-    int *t3 = new int(0);
-    list.prepend(t3);
-    QVERIFY(list.size() == 3);
-    QVERIFY(list.at(0) == t3);
-    QVERIFY(list.at(1) == t2);
-    QVERIFY(list.at(2) == t1);
-    list.removeAll(t2);
-    delete t2;
-    QVERIFY(list.size() == 2);
-    QVERIFY(list.at(0) == t3);
-    QVERIFY(list.at(1) == t1);
-    int *t4 = new int(0);
-    list.prepend(t4);
-    QVERIFY(list.size() == 3);
-    QVERIFY(list.at(0) == t4);
-    QVERIFY(list.at(1) == t3);
-    QVERIFY(list.at(2) == t1);
-    qDeleteAll(list);
-    list.clear();
-}
-
-template<typename T>
-void tst_QList::mid() const
-{
-    QList<T> list;
-    list << T_FOO << T_BAR << T_BAZ << T_CAT << T_DOG << T_BLAH << T_WEEE;
-
-    QCOMPARE(list.mid(3, 3),
-        QList<T>() << T_CAT << T_DOG << T_BLAH);
-
-    QList<T> list1;
-    QCOMPARE(list1.mid(1, 1).length(), 0);
-}
-
-void tst_QList::midOptimal() const
-{
-    const int liveCount = Optimal::getLiveCount();
-    mid<Optimal>();
-    QCOMPARE(liveCount, Optimal::getLiveCount());
-}
-
-void tst_QList::midMovable() const
-{
-    const int liveCount = Movable::getLiveCount();
-    mid<Movable>();
-    QCOMPARE(liveCount, Movable::getLiveCount());
-}
-
-void tst_QList::midComplex() const
-{
-    const int liveCount = Complex::getLiveCount();
-    mid<Complex>();
-    QCOMPARE(liveCount, Complex::getLiveCount());
-}
-
-template<typename T>
-void tst_QList::at() const
-{
-    // test at() and make sure it functions correctly with some simple list manipulation.
-    QList<T> list;
-
-    // create a list
-    list << T_FOO << T_BAR << T_BAZ;
-    QVERIFY(list.size() == 3);
-    QCOMPARE(list.at(0), T_FOO);
-    QCOMPARE(list.at(1), T_BAR);
-    QCOMPARE(list.at(2), T_BAZ);
-
-    // append an item
-    list << T_CAT;
-    QVERIFY(list.size() == 4);
-    QCOMPARE(list.at(0), T_FOO);
-    QCOMPARE(list.at(1), T_BAR);
-    QCOMPARE(list.at(2), T_BAZ);
-    QCOMPARE(list.at(3), T_CAT);
-
-    // remove an item
-    list.removeAt(1);
-    QVERIFY(list.size() == 3);
-    QCOMPARE(list.at(0), T_FOO);
-    QCOMPARE(list.at(1), T_BAZ);
-    QCOMPARE(list.at(2), T_CAT);
-}
-
-void tst_QList::atOptimal() const
-{
-    const int liveCount = Optimal::getLiveCount();
-    at<Optimal>();
-    QCOMPARE(liveCount, Optimal::getLiveCount());
-}
-
-void tst_QList::atMovable() const
-{
-    const int liveCount = Movable::getLiveCount();
-    at<Movable>();
-    QCOMPARE(liveCount, Movable::getLiveCount());
-}
-
-void tst_QList::atComplex() const
-{
-    const int liveCount = Complex::getLiveCount();
-    at<Complex>();
-    QCOMPARE(liveCount, Complex::getLiveCount());
-}
-
-template<typename T>
-void tst_QList::first() const
-{
-    QList<T> list;
-    list << T_FOO << T_BAR;
-
-    QCOMPARE(list.first(), T_FOO);
-
-    // remove an item, make sure it still works
-    list.pop_front();
-    QVERIFY(list.size() == 1);
-    QCOMPARE(list.first(), T_BAR);
-}
-
-void tst_QList::firstOptimal() const
-{
-    const int liveCount = Optimal::getLiveCount();
-    first<Optimal>();
-    QCOMPARE(liveCount, Optimal::getLiveCount());
-}
-
-void tst_QList::firstMovable() const
-{
-    const int liveCount = Movable::getLiveCount();
-    first<Movable>();
-    QCOMPARE(liveCount, Movable::getLiveCount());
-}
-
-void tst_QList::firstComplex() const
-{
-    const int liveCount = Complex::getLiveCount();
-    first<Complex>();
-    QCOMPARE(liveCount, Complex::getLiveCount());
-}
-
-void tst_QList::constFirst() const
-{
-    // Based on tst_QVector::constFirst()
-    QList<int> list;
-    list << 69 << 42 << 3;
-
-    // test it starts ok
-    QCOMPARE(list.constFirst(), 69);
-    QVERIFY(list.isDetached());
-
-    QList<int> listCopy = list;
-    QVERIFY(!list.isDetached());
-    QVERIFY(!listCopy.isDetached());
-    QVERIFY(list.isSharedWith(listCopy));
-    QVERIFY(listCopy.isSharedWith(list));
-
-    QCOMPARE(list.constFirst(), 69);
-    QCOMPARE(listCopy.constFirst(), 69);
-
-    QVERIFY(!list.isDetached());
-    QVERIFY(!listCopy.isDetached());
-    QVERIFY(list.isSharedWith(listCopy));
-    QVERIFY(listCopy.isSharedWith(list));
-
-    // test removal changes
-    list.removeAt(0);
-    QVERIFY(list.isDetached());
-    QVERIFY(!list.isSharedWith(listCopy));
-    QCOMPARE(list.constFirst(), 42);
-    QCOMPARE(listCopy.constFirst(), 69);
-
-    listCopy = list;
-    QVERIFY(!list.isDetached());
-    QVERIFY(!listCopy.isDetached());
-    QVERIFY(list.isSharedWith(listCopy));
-    QVERIFY(listCopy.isSharedWith(list));
-
-    QCOMPARE(list.constFirst(), 42);
-    QCOMPARE(listCopy.constFirst(), 42);
-
-    QVERIFY(!list.isDetached());
-    QVERIFY(!listCopy.isDetached());
-    QVERIFY(list.isSharedWith(listCopy));
-    QVERIFY(listCopy.isSharedWith(list));
-
-    // test prepend changes
-    list.prepend(23);
-    QVERIFY(list.isDetached());
-    QVERIFY(!list.isSharedWith(listCopy));
-    QCOMPARE(list.constFirst(), 23);
-    QCOMPARE(listCopy.constFirst(), 42);
-
-    listCopy = list;
-    QVERIFY(!list.isDetached());
-    QVERIFY(!listCopy.isDetached());
-    QVERIFY(list.isSharedWith(listCopy));
-    QVERIFY(listCopy.isSharedWith(list));
-
-    QCOMPARE(list.constFirst(), 23);
-    QCOMPARE(listCopy.constFirst(), 23);
-
-    QVERIFY(!list.isDetached());
-    QVERIFY(!listCopy.isDetached());
-    QVERIFY(list.isSharedWith(listCopy));
-    QVERIFY(listCopy.isSharedWith(list));
-}
-
-void tst_QList::constLast() const
-{
-    // Based on tst_QVector::constLast()
-    QList<int> list;
-    list << 69 << 42 << 3;
-
-    // test it starts ok
-    QCOMPARE(list.constLast(), 3);
-    QVERIFY(list.isDetached());
-
-    QList<int> listCopy = list;
-    QVERIFY(!list.isDetached());
-    QVERIFY(!listCopy.isDetached());
-    QVERIFY(list.isSharedWith(listCopy));
-    QVERIFY(listCopy.isSharedWith(list));
-
-    QCOMPARE(list.constLast(), 3);
-    QCOMPARE(listCopy.constLast(), 3);
-
-    QVERIFY(!list.isDetached());
-    QVERIFY(!listCopy.isDetached());
-    QVERIFY(list.isSharedWith(listCopy));
-    QVERIFY(listCopy.isSharedWith(list));
-
-    // test removal changes
-    list.removeLast();
-    QVERIFY(list.isDetached());
-    QVERIFY(!list.isSharedWith(listCopy));
-    QCOMPARE(list.constLast(), 42);
-    QCOMPARE(listCopy.constLast(), 3);
-
-    listCopy = list;
-    QVERIFY(!list.isDetached());
-    QVERIFY(!listCopy.isDetached());
-    QVERIFY(list.isSharedWith(listCopy));
-    QVERIFY(listCopy.isSharedWith(list));
-
-    QCOMPARE(list.constLast(), 42);
-    QCOMPARE(listCopy.constLast(), 42);
-
-    QVERIFY(!list.isDetached());
-    QVERIFY(!listCopy.isDetached());
-    QVERIFY(list.isSharedWith(listCopy));
-    QVERIFY(listCopy.isSharedWith(list));
-
-    // test prepend changes
-    list.append(23);
-    QVERIFY(list.isDetached());
-    QVERIFY(!list.isSharedWith(listCopy));
-    QCOMPARE(list.constLast(), 23);
-    QCOMPARE(listCopy.constLast(), 42);
-
-    listCopy = list;
-    QVERIFY(!list.isDetached());
-    QVERIFY(!listCopy.isDetached());
-    QVERIFY(list.isSharedWith(listCopy));
-    QVERIFY(listCopy.isSharedWith(list));
-
-    QCOMPARE(list.constLast(), 23);
-    QCOMPARE(listCopy.constLast(), 23);
-
-    QVERIFY(!list.isDetached());
-    QVERIFY(!listCopy.isDetached());
-    QVERIFY(list.isSharedWith(listCopy));
-    QVERIFY(listCopy.isSharedWith(list));
-}
-
-void tst_QList::cpp17ctad() const
-{
-#ifdef __cpp_deduction_guides
-#define QVERIFY_IS_LIST_OF(obj, Type) \
-    QVERIFY2((std::is_same<decltype(obj), QList<Type>>::value), \
-             QMetaType::typeName(qMetaTypeId<decltype(obj)::value_type>()))
-#define CHECK(Type, One, Two, Three) \
-    do { \
-        const Type v[] = {One, Two, Three}; \
-        QList v1 = {One, Two, Three}; \
-        QVERIFY_IS_LIST_OF(v1, Type); \
-        QList v2(v1.begin(), v1.end()); \
-        QVERIFY_IS_LIST_OF(v2, Type); \
-        QList v3(std::begin(v), std::end(v)); \
-        QVERIFY_IS_LIST_OF(v3, Type); \
-    } while (false) \
-    /*end*/
-    CHECK(int, 1, 2, 3);
-    CHECK(double, 1.0, 2.0, 3.0);
-    CHECK(QString, QStringLiteral("one"), QStringLiteral("two"), QStringLiteral("three"));
-#undef QVERIFY_IS_LIST_OF
-#undef CHECK
-#else
-    QSKIP("This test requires C++17 Constructor Template Argument Deduction support enabled in the compiler.");
-#endif
-}
-
-template<typename T>
-void tst_QList::last() const
-{
-    QList<T> list;
-    list << T_FOO << T_BAR;
-
-    QCOMPARE(list.last(), T_BAR);
-
-    // remove an item, make sure it still works
-    list.pop_back();
-    QVERIFY(list.size() == 1);
-    QCOMPARE(list.last(), T_FOO);
-}
-
-void tst_QList::lastOptimal() const
-{
-    const int liveCount = Optimal::getLiveCount();
-    last<Optimal>();
-    QCOMPARE(liveCount, Optimal::getLiveCount());
-}
-
-void tst_QList::lastMovable() const
-{
-    const int liveCount = Movable::getLiveCount();
-    last<Movable>();
-    QCOMPARE(liveCount, Movable::getLiveCount());
-}
-
-void tst_QList::lastComplex() const
-{
-    const int liveCount = Complex::getLiveCount();
-    last<Complex>();
-    QCOMPARE(liveCount, Complex::getLiveCount());
-}
-
-template<typename T>
-void tst_QList::begin() const
-{
-    QList<T> list;
-    list << T_FOO << T_BAR;
-
-    QCOMPARE(*list.begin(), T_FOO);
-
-    // remove an item, make sure it still works
-    list.pop_front();
-    QVERIFY(list.size() == 1);
-    QCOMPARE(*list.begin(), T_BAR);
-}
-
-void tst_QList::beginOptimal() const
-{
-    const int liveCount = Optimal::getLiveCount();
-    begin<Optimal>();
-    QCOMPARE(liveCount, Optimal::getLiveCount());
-}
-
-void tst_QList::beginMovable() const
-{
-    const int liveCount = Movable::getLiveCount();
-    begin<Movable>();
-    QCOMPARE(liveCount, Movable::getLiveCount());
-}
-
-void tst_QList::beginComplex() const
-{
-    const int liveCount = Complex::getLiveCount();
-    begin<Complex>();
-    QCOMPARE(liveCount, Complex::getLiveCount());
-}
-
-template<typename T>
-void tst_QList::end() const
-{
-    QList<T> list;
-    list << T_FOO << T_BAR;
-
-    QCOMPARE(*--list.end(), T_BAR);
-
-    // remove an item, make sure it still works
-    list.pop_back();
-    QVERIFY(list.size() == 1);
-    QCOMPARE(*--list.end(), T_FOO);
-}
-
-void tst_QList::endOptimal() const
-{
-    const int liveCount = Optimal::getLiveCount();
-    end<Optimal>();
-    QCOMPARE(liveCount, Optimal::getLiveCount());
-}
-
-void tst_QList::endMovable() const
-{
-    const int liveCount = Movable::getLiveCount();
-    end<Movable>();
-    QCOMPARE(liveCount, Movable::getLiveCount());
-}
-
-void tst_QList::endComplex() const
-{
-    const int liveCount = Complex::getLiveCount();
-    end<Complex>();
-    QCOMPARE(liveCount, Complex::getLiveCount());
-}
-
-template<typename T>
-void tst_QList::contains() const
-{
-    QList<T> list;
-    list << T_FOO << T_BAR << T_BAZ;
-
-    QVERIFY(list.contains(T_FOO));
-    QVERIFY(list.contains(T_BLAH) != true);
-
-    // add it and make sure it matches
-    list.append(T_BLAH);
-    QVERIFY(list.contains(T_BLAH));
-}
-
-void tst_QList::containsOptimal() const
-{
-    const int liveCount = Optimal::getLiveCount();
-    contains<Optimal>();
-    QCOMPARE(liveCount, Optimal::getLiveCount());
-}
-
-void tst_QList::containsMovable() const
-{
-    const int liveCount = Movable::getLiveCount();
-    contains<Movable>();
-    QCOMPARE(liveCount, Movable::getLiveCount());
-}
-
-void tst_QList::containsComplex() const
-{
-    const int liveCount = Complex::getLiveCount();
-    contains<Complex>();
-    QCOMPARE(liveCount, Complex::getLiveCount());
-}
-
-template<typename T>
-void tst_QList::count() const
-{
-    QList<T> list;
-
-    // starts empty
-    QVERIFY(list.count() == 0);
-
-    // goes up
-    list.append(T_FOO);
-    QVERIFY(list.count() == 1);
-
-    // and up
-    list.append(T_BAR);
-    QVERIFY(list.count() == 2);
-
-    // and down
-    list.pop_back();
-    QVERIFY(list.count() == 1);
-
-    // and empty. :)
-    list.pop_back();
-    QVERIFY(list.count() == 0);
-}
-
-void tst_QList::countOptimal() const
-{
-    const int liveCount = Optimal::getLiveCount();
-    count<Optimal>();
-    QCOMPARE(liveCount, Optimal::getLiveCount());
-}
-
-void tst_QList::countMovable() const
-{
-    const int liveCount = Movable::getLiveCount();
-    count<Movable>();
-    QCOMPARE(liveCount, Movable::getLiveCount());
-}
-
-void tst_QList::countComplex() const
-{
-    const int liveCount = Complex::getLiveCount();
-    count<Complex>();
-    QCOMPARE(liveCount, Complex::getLiveCount());
-}
-
-template<typename T>
-void tst_QList::empty() const
-{
-    QList<T> list;
-
-    // make sure it starts empty
-    QVERIFY(list.empty());
-
-    // and doesn't stay empty
-    list.append(T_FOO);
-    QVERIFY(!list.empty());
-
-    // and goes back to being empty
-    list.pop_back();
-    QVERIFY(list.empty());
-}
-
-void tst_QList::emptyOptimal() const
-{
-    const int liveCount = Optimal::getLiveCount();
-    empty<Optimal>();
-    QCOMPARE(liveCount, Optimal::getLiveCount());
-}
-
-void tst_QList::emptyMovable() const
-{
-    const int liveCount = Movable::getLiveCount();
-    empty<Movable>();
-    QCOMPARE(liveCount, Movable::getLiveCount());
-}
-
-void tst_QList::emptyComplex() const
-{
-    const int liveCount = Complex::getLiveCount();
-    empty<Complex>();
-    QCOMPARE(liveCount, Complex::getLiveCount());
-}
-
-template<typename T>
-void tst_QList::endsWith() const
-{
-    QList<T> list;
-    list << T_FOO << T_BAR << T_BAZ;
-
-    // test it returns correctly in both cases
-    QVERIFY(list.endsWith(T_BAZ));
-    QVERIFY(!list.endsWith(T_BAR));
-
-    // remove an item and make sure the end item changes
-    list.pop_back();
-    QVERIFY(list.endsWith(T_BAR));
-}
-
-void tst_QList::endsWithOptimal() const
-{
-    const int liveCount = Optimal::getLiveCount();
-    endsWith<Optimal>();
-    QCOMPARE(liveCount, Optimal::getLiveCount());
-}
-
-void tst_QList::endsWithMovable() const
-{
-    const int liveCount = Movable::getLiveCount();
-    endsWith<Movable>();
-    QCOMPARE(liveCount, Movable::getLiveCount());
-}
-
-void tst_QList::endsWithComplex() const
-{
-    const int liveCount = Complex::getLiveCount();
-    endsWith<Complex>();
-    QCOMPARE(liveCount, Complex::getLiveCount());
-}
-
-template<typename T>
-void tst_QList::lastIndexOf() const
-{
-    QList<T> list;
-    list << T_FOO << T_BAR << T_BAZ;
-
-    // one instance of the target item
-    QVERIFY(list.lastIndexOf(T_BAZ) == 2);
-
-    // shouldn't find this
-    QVERIFY(list.lastIndexOf(T_WEEE) == -1);
-
-    // multiple instances
-    list.append(T_BAZ);
-    list.append(T_BAZ);
-    QVERIFY(list.lastIndexOf(T_BAZ) == 4);
-
-    // search from the middle to find the last one
-    QVERIFY(list.lastIndexOf(T_BAZ, 3) == 3);
-
-    // try to find none
-    QVERIFY(list.lastIndexOf(T_BAZ, 1) == -1);
-}
-
-void tst_QList::lastIndexOfOptimal() const
-{
-    const int liveCount = Optimal::getLiveCount();
-    lastIndexOf<Optimal>();
-    QCOMPARE(liveCount, Optimal::getLiveCount());
-}
-
-void tst_QList::lastIndexOfMovable() const
-{
-    const int liveCount = Movable::getLiveCount();
-    lastIndexOf<Movable>();
-    QCOMPARE(liveCount, Movable::getLiveCount());
-}
-
-void tst_QList::lastIndexOfComplex() const
-{
-    const int liveCount = Complex::getLiveCount();
-    lastIndexOf<Complex>();
-    QCOMPARE(liveCount, Complex::getLiveCount());
-}
-
-template<typename T>
-void tst_QList::move() const
-{
-    QList<T> list;
-    list << T_FOO << T_BAR << T_BAZ;
-
-    // move an item
-    list.move(0, list.count() - 1);
-    QCOMPARE(list, QList<T>() << T_BAR << T_BAZ << T_FOO);
-
-    // move it back
-    list.move(list.count() - 1, 0);
-    QCOMPARE(list, QList<T>() << T_FOO << T_BAR << T_BAZ);
-
-    // move an item in the middle
-    list.move(1, 0);
-    QCOMPARE(list, QList<T>() << T_BAR << T_FOO << T_BAZ);
-}
-
-void tst_QList::moveOptimal() const
-{
-    const int liveCount = Optimal::getLiveCount();
-    move<Optimal>();
-    QCOMPARE(liveCount, Optimal::getLiveCount());
-}
-
-void tst_QList::moveMovable() const
-{
-    const int liveCount = Movable::getLiveCount();
-    move<Movable>();
-    QCOMPARE(liveCount, Movable::getLiveCount());
-}
-
-void tst_QList::moveComplex() const
-{
-    const int liveCount = Complex::getLiveCount();
-    move<Complex>();
-    QCOMPARE(liveCount, Complex::getLiveCount());
-}
-
-template<typename T>
-void tst_QList::removeAll() const
-{
-    QList<T> list;
-    list << T_FOO << T_BAR << T_BAZ;
-
-    // remove one instance
-    list.removeAll(T_BAR);
-    QCOMPARE(list, QList<T>() << T_FOO << T_BAZ);
-
-    // many instances
-    list << T_FOO << T_BAR << T_BAZ << T_FOO << T_BAR << T_BAZ << T_FOO << T_BAR << T_BAZ;
-    list.removeAll(T_BAR);
-    QCOMPARE(list, QList<T>() << T_FOO << T_BAZ << T_FOO << T_BAZ << T_FOO << T_BAZ << T_FOO << T_BAZ);
-
-    // try remove something that doesn't exist
-    list.removeAll(T_WEEE);
-    QCOMPARE(list, QList<T>() << T_FOO << T_BAZ << T_FOO << T_BAZ << T_FOO << T_BAZ << T_FOO << T_BAZ);
-}
-
-void tst_QList::removeAllOptimal() const
-{
-    const int liveCount = Optimal::getLiveCount();
-    removeAll<Optimal>();
-    QCOMPARE(liveCount, Optimal::getLiveCount());
-}
-
-void tst_QList::removeAllMovable() const
-{
-    const int liveCount = Movable::getLiveCount();
-    removeAll<Movable>();
-    QCOMPARE(liveCount, Movable::getLiveCount());
-}
-
-void tst_QList::removeAllComplex() const
-{
-    const int liveCount = Complex::getLiveCount();
-    removeAll<Complex>();
-    QCOMPARE(liveCount, Complex::getLiveCount());
-}
-
-template<typename T>
-void tst_QList::removeAt() const
-{
-    QList<T> list;
-    list << T_FOO << T_BAR << T_BAZ;
-
-    // middle
-    list.removeAt(1);
-    QCOMPARE(list, QList<T>() << T_FOO << T_BAZ);
-
-    // start
-    list.removeAt(0);
-    QCOMPARE(list, QList<T>() << T_BAZ);
-
-    // final
-    list.removeAt(0);
-    QCOMPARE(list, QList<T>());
-}
-
-void tst_QList::removeAtOptimal() const
-{
-    const int liveCount = Optimal::getLiveCount();
-    removeAt<Optimal>();
-    QCOMPARE(liveCount, Optimal::getLiveCount());
-}
-
-void tst_QList::removeAtMovable() const
-{
-    const int liveCount = Movable::getLiveCount();
-    removeAt<Movable>();
-    QCOMPARE(liveCount, Movable::getLiveCount());
-}
-
-void tst_QList::removeAtComplex() const
-{
-    const int liveCount = Complex::getLiveCount();
-    removeAt<Complex>();
-    QCOMPARE(liveCount, Complex::getLiveCount());
-}
-
-template<typename T>
-void tst_QList::removeOne() const
-{
-    QList<T> list;
-    list << T_FOO << T_BAR << T_BAZ;
-
-    // middle
-    list.removeOne(T_BAR);
-    QCOMPARE(list, QList<T>() << T_FOO << T_BAZ);
-
-    // start
-    list.removeOne(T_FOO);
-    QCOMPARE(list, QList<T>() << T_BAZ);
-
-    // last
-    list.removeOne(T_BAZ);
-    QCOMPARE(list, QList<T>());
-
-    // make sure it really only removes one :)
-    list << T_FOO << T_FOO;
-    list.removeOne(T_FOO);
-    QCOMPARE(list, QList<T>() << T_FOO);
-
-    // try remove something that doesn't exist
-    list.removeOne(T_WEEE);
-    QCOMPARE(list, QList<T>() << T_FOO);
-}
-
-void tst_QList::removeOneOptimal() const
-{
-    const int liveCount = Optimal::getLiveCount();
-    removeOne<Optimal>();
-    QCOMPARE(liveCount, Optimal::getLiveCount());
-}
-
-void tst_QList::removeOneMovable() const
-{
-    const int liveCount = Movable::getLiveCount();
-    removeOne<Movable>();
-    QCOMPARE(liveCount, Movable::getLiveCount());
-}
-
-void tst_QList::removeOneComplex() const
-{
-    const int liveCount = Complex::getLiveCount();
-    removeOne<Complex>();
-    QCOMPARE(liveCount, Complex::getLiveCount());
-}
-
-template<typename T>
-void tst_QList::replace() const
-{
-    QList<T> list;
-    list << T_FOO << T_BAR << T_BAZ;
-
-    // start
-    list.replace(0, T_CAT);
-    QCOMPARE(list, QList<T>() << T_CAT
-        << T_BAR << T_BAZ);
-
-    // middle
-    list.replace(1, T_DOG);
-    QCOMPARE(list, QList<T>() << T_CAT
-        << T_DOG << T_BAZ);
-
-    // end
-    list.replace(2, T_BLAH);
-    QCOMPARE(list, QList<T>() << T_CAT
-        << T_DOG << T_BLAH);
-}
-
-void tst_QList::replaceOptimal() const
-{
-    const int liveCount = Optimal::getLiveCount();
-    replace<Optimal>();
-    QCOMPARE(liveCount, Optimal::getLiveCount());
-}
-
-void tst_QList::replaceMovable() const
-{
-    const int liveCount = Movable::getLiveCount();
-    replace<Movable>();
-    QCOMPARE(liveCount, Movable::getLiveCount());
-}
-
-void tst_QList::replaceComplex() const
-{
-    const int liveCount = Complex::getLiveCount();
-    replace<Complex>();
-    QCOMPARE(liveCount, Complex::getLiveCount());
-}
-
-template<typename T>
-void tst_QList::reverseIterators() const
-{
-    QList<T> v;
-    v << T_CAT << T_DOG << T_BLAH << T_BAZ;
-    QList<T> vr = v;
-    std::reverse(vr.begin(), vr.end());
-    const QList<T> &cvr = vr;
-    QVERIFY(std::equal(v.begin(), v.end(), vr.rbegin()));
-    QVERIFY(std::equal(v.begin(), v.end(), vr.crbegin()));
-    QVERIFY(std::equal(v.begin(), v.end(), cvr.rbegin()));
-    QVERIFY(std::equal(vr.rbegin(), vr.rend(), v.begin()));
-    QVERIFY(std::equal(vr.crbegin(), vr.crend(), v.begin()));
-    QVERIFY(std::equal(cvr.rbegin(), cvr.rend(), v.begin()));
-}
-
-void tst_QList::reverseIteratorsOptimal() const
-{
-    const int liveCount = Optimal::getLiveCount();
-    reverseIterators<Optimal>();
-    QCOMPARE(liveCount, Optimal::getLiveCount());
-}
-
-void tst_QList::reverseIteratorsMovable() const
-{
-    const int liveCount = Movable::getLiveCount();
-    reverseIterators<Movable>();
-    QCOMPARE(liveCount, Movable::getLiveCount());
-}
-
-void tst_QList::reverseIteratorsComplex() const
-{
-    const int liveCount = Complex::getLiveCount();
-    reverseIterators<Complex>();
-    QCOMPARE(liveCount, Complex::getLiveCount());
-}
-
-template<typename T>
-void tst_QList::startsWith() const
-{
-    QList<T> list;
-    list << T_FOO << T_BAR << T_BAZ;
-
-    // make sure it starts ok
-    QVERIFY(list.startsWith(T_FOO));
-
-    // remove an item
-    list.removeFirst();
-    QVERIFY(list.startsWith(T_BAR));
-}
-
-void tst_QList::startsWithOptimal() const
-{
-    const int liveCount = Optimal::getLiveCount();
-    startsWith<Optimal>();
-    QCOMPARE(liveCount, Optimal::getLiveCount());
-}
-
-void tst_QList::startsWithMovable() const
-{
-    const int liveCount = Movable::getLiveCount();
-    startsWith<Movable>();
-    QCOMPARE(liveCount, Movable::getLiveCount());
-}
-
-void tst_QList::startsWithComplex() const
-{
-    const int liveCount = Complex::getLiveCount();
-    startsWith<Complex>();
-    QCOMPARE(liveCount, Complex::getLiveCount());
-}
-
-template<typename T>
-void tst_QList::swap() const
-{
-    QList<T> list;
-    list << T_FOO << T_BAR << T_BAZ;
-
-    // swap
-    list.swapItemsAt(0, 2);
-    QCOMPARE(list, QList<T>() << T_BAZ << T_BAR << T_FOO);
-
-    // swap again
-    list.swapItemsAt(1, 2);
-    QCOMPARE(list, QList<T>() << T_BAZ << T_FOO << T_BAR);
-
-    QList<T> list2;
-    list2 << T_DOG << T_BLAH;
-
-    list.swap(list2);
-    QCOMPARE(list,  QList<T>() << T_DOG << T_BLAH);
-    QCOMPARE(list2, QList<T>() << T_BAZ << T_FOO << T_BAR);
-}
-
-void tst_QList::swapOptimal() const
-{
-    const int liveCount = Optimal::getLiveCount();
-    swap<Optimal>();
-    QCOMPARE(liveCount, Optimal::getLiveCount());
-}
-
-void tst_QList::swapMovable() const
-{
-    const int liveCount = Movable::getLiveCount();
-    swap<Movable>();
-    QCOMPARE(liveCount, Movable::getLiveCount());
-}
-
-void tst_QList::swapComplex() const
-{
-    const int liveCount = Complex::getLiveCount();
-    swap<Complex>();
-    QCOMPARE(liveCount, Complex::getLiveCount());
-}
-
-template<typename T>
-void tst_QList::takeAt() const
-{
-    QList<T> list;
-    list << T_FOO << T_BAR << T_BAZ;
-
-    QCOMPARE(list.takeAt(0), T_FOO);
-    QVERIFY(list.size() == 2);
-    QCOMPARE(list.takeAt(1), T_BAZ);
-    QVERIFY(list.size() == 1);
-    QCOMPARE(list.takeAt(0), T_BAR);
-    QVERIFY(list.size() == 0);
-}
-
-void tst_QList::takeAtOptimal() const
-{
-    const int liveCount = Optimal::getLiveCount();
-    takeAt<Optimal>();
-    QCOMPARE(liveCount, Optimal::getLiveCount());
-}
-
-void tst_QList::takeAtMovable() const
-{
-    const int liveCount = Movable::getLiveCount();
-    takeAt<Movable>();
-    QCOMPARE(liveCount, Movable::getLiveCount());
-}
-
-void tst_QList::takeAtComplex() const
-{
-    const int liveCount = Complex::getLiveCount();
-    takeAt<Complex>();
-    QCOMPARE(liveCount, Complex::getLiveCount());
-}
-
-template<typename T>
-void tst_QList::takeFirst() const
-{
-    QList<T> list;
-    list << T_FOO << T_BAR << T_BAZ;
-
-    QCOMPARE(list.takeFirst(), T_FOO);
-    QVERIFY(list.size() == 2);
-    QCOMPARE(list.takeFirst(), T_BAR);
-    QVERIFY(list.size() == 1);
-    QCOMPARE(list.takeFirst(), T_BAZ);
-    QVERIFY(list.size() == 0);
-}
-
-void tst_QList::takeFirstOptimal() const
-{
-    const int liveCount = Optimal::getLiveCount();
-    takeFirst<Optimal>();
-    QCOMPARE(liveCount, Optimal::getLiveCount());
-}
-
-void tst_QList::takeFirstMovable() const
-{
-    const int liveCount = Movable::getLiveCount();
-    takeFirst<Movable>();
-    QCOMPARE(liveCount, Movable::getLiveCount());
-}
-
-void tst_QList::takeFirstComplex() const
-{
-    const int liveCount = Complex::getLiveCount();
-    takeFirst<Complex>();
-    QCOMPARE(liveCount, Complex::getLiveCount());
-}
-
-template<typename T>
-void tst_QList::takeLast() const
-{
-    QList<T> list;
-    list << T_FOO << T_BAR << T_BAZ;
-
-    QCOMPARE(list.takeLast(), T_BAZ);
-    QCOMPARE(list.takeLast(), T_BAR);
-    QCOMPARE(list.takeLast(), T_FOO);
-}
-
-void tst_QList::takeLastOptimal() const
-{
-    const int liveCount = Optimal::getLiveCount();
-    takeLast<Optimal>();
-    QCOMPARE(liveCount, Optimal::getLiveCount());
-}
-
-void tst_QList::takeLastMovable() const
-{
-    const int liveCount = Movable::getLiveCount();
-    takeLast<Movable>();
-    QCOMPARE(liveCount, Movable::getLiveCount());
-}
-
-void tst_QList::takeLastComplex() const
-{
-    const int liveCount = Complex::getLiveCount();
-    takeLast<Complex>();
-    QCOMPARE(liveCount, Complex::getLiveCount());
-}
-
-#if QT_VERSION < QT_VERSION_CHECK(6,0,0)
-template<typename T>
-void tst_QList::toSet() const
-{
-    QList<T> list;
-    list << T_FOO << T_BAR << T_BAZ;
-
-    // no duplicates
-    QCOMPARE(list.toSet(), QSet<T>() << T_FOO << T_BAR << T_BAZ);
-    QCOMPARE(list, QList<T>() << T_FOO << T_BAR << T_BAZ);
-
-    // duplicates (is this more of a QSet test?)
-    list << T_FOO << T_BAR << T_BAZ;
-    QCOMPARE(list.toSet(), QSet<T>() << T_FOO << T_BAR << T_BAZ);
-    QCOMPARE(list, QList<T>() << T_FOO << T_BAR << T_BAZ
-        << T_FOO << T_BAR << T_BAZ);
-}
-
-void tst_QList::toSetOptimal() const
-{
-    const int liveCount = Optimal::getLiveCount();
-    toSet<Optimal>();
-    QCOMPARE(liveCount, Optimal::getLiveCount());
-}
-
-void tst_QList::toSetMovable() const
-{
-    const int liveCount = Movable::getLiveCount();
-    toSet<Movable>();
-    QCOMPARE(liveCount, Movable::getLiveCount());
-}
-
-void tst_QList::toSetComplex() const
-{
-    const int liveCount = Complex::getLiveCount();
-    toSet<Complex>();
-    QCOMPARE(liveCount, Complex::getLiveCount());
-}
-
-template<typename T>
-void tst_QList::toStdList() const
-{
-    QList<T> list;
-    list << T_FOO << T_BAR << T_BAZ;
-
-    // yuck.
-    std::list<T> slist;
-    slist.push_back(T_FOO);
-    slist.push_back(T_BAR);
-    slist.push_back(T_BAZ);
-
-    QCOMPARE(list.toStdList(), slist);
-    QCOMPARE(list, QList<T>() << T_FOO << T_BAR << T_BAZ);
-}
-
-void tst_QList::toStdListOptimal() const
-{
-    const int liveCount = Optimal::getLiveCount();
-    toStdList<Optimal>();
-    QCOMPARE(liveCount, Optimal::getLiveCount());
-}
-
-void tst_QList::toStdListMovable() const
-{
-    const int liveCount = Movable::getLiveCount();
-    toStdList<Movable>();
-    QCOMPARE(liveCount, Movable::getLiveCount());
-}
-
-void tst_QList::toStdListComplex() const
-{
-    const int liveCount = Complex::getLiveCount();
-    toStdList<Complex>();
-    QCOMPARE(liveCount, Complex::getLiveCount());
-}
-#endif
-
-template<typename T>
-void tst_QList::toVector() const
-{
-    QList<T> list;
-    list << T_FOO << T_BAR << T_BAZ;
-
-    QCOMPARE(list.toVector(), QVector<T>() << T_FOO << T_BAR << T_BAZ);
-}
-
-void tst_QList::toVectorOptimal() const
-{
-    const int liveCount = Optimal::getLiveCount();
-    toVector<Optimal>();
-    QCOMPARE(liveCount, Optimal::getLiveCount());
-}
-
-void tst_QList::toVectorMovable() const
-{
-    const int liveCount = Movable::getLiveCount();
-    toVector<Movable>();
-    QCOMPARE(liveCount, Movable::getLiveCount());
-}
-
-void tst_QList::toVectorComplex() const
-{
-    const int liveCount = Complex::getLiveCount();
-    toVector<Complex>();
-    QCOMPARE(liveCount, Complex::getLiveCount());
-}
-
-template<typename T>
-void tst_QList::value() const
-{
-    QList<T> list;
-    list << T_FOO << T_BAR << T_BAZ;
-
-    // test real values
-    QCOMPARE(list.value(0), T_FOO);
-    QCOMPARE(list.value(2), T_BAZ);
-
-    // test empty default
-    QCOMPARE(list.value(3), T());
-    QCOMPARE(list.value(-1), T());
-
-    // test defaults
-    T defaultT(T_WEEE);
-    QCOMPARE(list.value(-1, defaultT), defaultT);
-    QCOMPARE(list.value(3, defaultT), defaultT);
-}
-
-void tst_QList::valueOptimal() const
-{
-    const int liveCount = Optimal::getLiveCount();
-    value<Optimal>();
-    QCOMPARE(liveCount, Optimal::getLiveCount());
-}
-
-void tst_QList::valueMovable() const
-{
-    const int liveCount = Movable::getLiveCount();
-    value<Movable>();
-    QCOMPARE(liveCount, Movable::getLiveCount());
-}
-
-void tst_QList::valueComplex() const
-{
-    const int liveCount = Complex::getLiveCount();
-    value<Complex>();
-    QCOMPARE(liveCount, Complex::getLiveCount());
-}
-
-template<typename T>
-void tst_QList::testOperators() const
-{
-    QList<T> list;
-    list << T_FOO << T_BAR << T_BAZ;
-
-    QList<T> listtwo;
-    listtwo << T_FOO << T_BAR << T_BAZ;
-
-    // test equal
-    QVERIFY(list == listtwo);
-
-    // not equal
-    listtwo.append(T_CAT);
-    QVERIFY(list != listtwo);
-
-    // +=
-    list += listtwo;
-    QVERIFY(list.size() == 7);
-    QVERIFY(listtwo.size() == 4);
-    QCOMPARE(list, QList<T>() << T_FOO << T_BAR << T_BAZ
-        << T_FOO << T_BAR << T_BAZ << T_CAT);
-
-    // =
-    list = listtwo;
-    QCOMPARE(list, listtwo);
-    QCOMPARE(list, QList<T>() << T_FOO << T_BAR << T_BAZ << T_CAT);
-
-    // []
-    QCOMPARE(list[0], T_FOO);
-    QCOMPARE(list[list.size() - 1], T_CAT);
-
-    // <, >, <=, >=
-    QVERIFY(!(list <  listtwo));
-    QVERIFY(!(list >  listtwo));
-    QVERIFY(  list <= listtwo);
-    QVERIFY(  list >= listtwo);
-    listtwo.push_back(T_CAT);
-    QVERIFY(  list <  listtwo);
-    QVERIFY(!(list >  listtwo));
-    QVERIFY(  list <= listtwo);
-    QVERIFY(!(list >= listtwo));
-    QVERIFY(listtwo >  list);
-    QVERIFY(listtwo >= list);
-}
-
-void tst_QList::testOperatorsOptimal() const
-{
-    const int liveCount = Optimal::getLiveCount();
-    testOperators<Optimal>();
-    QCOMPARE(liveCount, Optimal::getLiveCount());
-}
-
-void tst_QList::testOperatorsMovable() const
-{
-    const int liveCount = Movable::getLiveCount();
-    testOperators<Movable>();
-    QCOMPARE(liveCount, Movable::getLiveCount());
-}
-
-void tst_QList::testOperatorsComplex() const
-{
-    const int liveCount = Complex::getLiveCount();
-    testOperators<Complex>();
-    QCOMPARE(liveCount, Complex::getLiveCount());
-}
-
-template<typename T>
-void tst_QList::testSTLIterators() const
-{
-    QList<T> list;
-
-    // create a list
-    list << T_FOO << T_BAR << T_BAZ;
-    typename QList<T>::iterator it = list.begin();
-    QCOMPARE(*it, T_FOO); it++;
-    QCOMPARE(*it, T_BAR); it++;
-    QCOMPARE(*it, T_BAZ); it++;
-    QCOMPARE(it, list.end()); it--;
-
-    // walk backwards
-    QCOMPARE(*it, T_BAZ); it--;
-    QCOMPARE(*it, T_BAR); it--;
-    QCOMPARE(*it, T_FOO);
-
-    // test erase
-    it = list.erase(it);
-    QVERIFY(list.size() == 2);
-    QCOMPARE(*it, T_BAR);
-
-    // test multiple erase
-    it = list.erase(it, it + 2);
-    QVERIFY(list.size() == 0);
-    QCOMPARE(it, list.end());
-
-    // insert again
-    it = list.insert(it, T_FOO);
-    QVERIFY(list.size() == 1);
-    QCOMPARE(*it, T_FOO);
-
-    // insert again
-    it = list.insert(it, T_BAR);
-    QVERIFY(list.size() == 2);
-    QCOMPARE(*it++, T_BAR);
-    QCOMPARE(*it, T_FOO);
-}
-
-void tst_QList::testSTLIteratorsOptimal() const
-{
-    const int liveCount = Optimal::getLiveCount();
-    testSTLIterators<Optimal>();
-    QCOMPARE(liveCount, Optimal::getLiveCount());
-}
-
-void tst_QList::testSTLIteratorsMovable() const
-{
-    const int liveCount = Movable::getLiveCount();
-    testSTLIterators<Movable>();
-    QCOMPARE(liveCount, Movable::getLiveCount());
-}
-
-void tst_QList::testSTLIteratorsComplex() const
-{
-    const int liveCount = Complex::getLiveCount();
-    testSTLIterators<Complex>();
-    QCOMPARE(liveCount, Complex::getLiveCount());
-}
-
-void tst_QList::initializeList() const
-{
-    QList<int> v1{2,3,4};
-    QCOMPARE(v1, QList<int>() << 2 << 3 << 4);
-    QCOMPARE(v1, (QList<int>{2,3,4}));
-
-    QList<QList<int>> v2{ v1, {1}, QList<int>(), {2,3,4}  };
-    QList<QList<int>> v3;
-    v3 << v1 << (QList<int>() << 1) << QList<int>() << v1;
-    QCOMPARE(v3, v2);
-}
-
-template<typename T>
-void tst_QList::constSharedNull() const
-{
-    QList<T> list2;
-#if !defined(QT_NO_UNSHARABLE_CONTAINERS)
-    QList<T> list1;
-    list1.setSharable(false);
-    QVERIFY(list1.isDetached());
-
-    list2.setSharable(true);
-#endif
-    QVERIFY(!list2.isDetached());
-}
-
-void tst_QList::constSharedNullOptimal() const
-{
-    const int liveCount = Optimal::getLiveCount();
-    constSharedNull<Optimal>();
-    QCOMPARE(liveCount, Optimal::getLiveCount());
-}
-
-void tst_QList::constSharedNullMovable() const
-{
-    const int liveCount = Movable::getLiveCount();
-    constSharedNull<Movable>();
-    QCOMPARE(liveCount, Movable::getLiveCount());
-}
-
-void tst_QList::constSharedNullComplex() const
-{
-    const int liveCount = Complex::getLiveCount();
-    constSharedNull<Complex>();
-    QCOMPARE(liveCount, Complex::getLiveCount());
-}
-
-template <class T>
-void generateSetSharableData()
-{
-#if !defined(QT_NO_UNSHARABLE_CONTAINERS)
-    QTest::addColumn<QList<T> >("list");
-    QTest::addColumn<int>("size");
-
-    QTest::newRow("null") << QList<T>() << 0;
-    QTest::newRow("non-empty") << (QList<T>() << T(0) << T(1) << T(2) << T(3) << T(4)) << 5;
-#endif
-}
-
-template <class T>
-void runSetSharableTest()
-{
-#if !defined(QT_NO_UNSHARABLE_CONTAINERS)
-    QFETCH(QList<T>, list);
-    QFETCH(int, size);
-
-    QVERIFY(!list.isDetached()); // Shared with QTest
-
-    list.setSharable(true);
-
-    QCOMPARE(list.size(), size);
-
-    {
-        QList<T> copy(list);
-        QVERIFY(!copy.isDetached());
-        QVERIFY(copy.isSharedWith(list));
-    }
-
-    list.setSharable(false);
-    QVERIFY(list.isDetached() || list.isSharedWith(QList<T>()));
-
-    {
-        QList<T> copy(list);
-
-        QVERIFY(copy.isDetached() || copy.isSharedWith(QList<T>()));
-        QCOMPARE(copy.size(), size);
-        QCOMPARE(copy, list);
-    }
-
-    list.setSharable(true);
-
-    {
-        QList<T> copy(list);
-
-        QVERIFY(!copy.isDetached());
-        QVERIFY(copy.isSharedWith(list));
-    }
-
-    for (int i = 0; i < list.size(); ++i)
-        QCOMPARE(int(list[i]), i);
-
-    QCOMPARE(list.size(), size);
-#endif
-}
-
-void tst_QList::setSharableInt_data() const
-{
-    generateSetSharableData<int>();
-}
-
-void tst_QList::setSharableComplex_data() const
-{
-    generateSetSharableData<Complex>();
-}
-
-void tst_QList::setSharableInt() const
-{
-    runSetSharableTest<int>();
-}
-
-void tst_QList::setSharableComplex() const
-{
-    runSetSharableTest<Complex>();
-}
-
-void tst_QList::eraseValidIteratorsOnSharedList() const
-{
-    QList<int> a, b;
-    a.push_back(10);
-    a.push_back(20);
-    a.push_back(30);
-    QList<int>::iterator i = a.begin();
-    ++i;
-    b = a;
-    a.erase(i);
-    QCOMPARE(b.size(), 3);
-    QCOMPARE(a.size(), 2);
-    QCOMPARE(a.at(0), 10);
-    QCOMPARE(a.at(1), 30);
-
-    a.push_back(40);
-    a.push_back(50);
-    a.push_back(60);
-    QCOMPARE(a.size(), 5);
-    i = a.begin();
-    b = a;
-    ++i;
-    QList<int>::iterator j = i;
-    ++j;
-    ++j;
-    a.erase(i, j); // remove 3 elements
-    QCOMPARE(b.size(), 5);
-    QCOMPARE(a.size(), 3);
-    QCOMPARE(a.at(0), 10);
-    QCOMPARE(a.at(1), 50);
-}
-
-void tst_QList::insertWithValidIteratorsOnSharedList() const
-{
-    QList<int> a, b;
-    a.push_back(10);
-    a.push_back(20);
-    a.push_back(30);
-    QList<int>::iterator i = a.begin();
-    ++i;
-    b = a;
-    a.insert(i, 15);
-    QCOMPARE(a.size(), b.size() + 1);
-    QCOMPARE(b.at(1), 20);
-    QCOMPARE(a.at(1), 15);
-}
-
-template <typename T>
-void tst_QList::qhash() const
-{
-    QList<T> l1, l2;
-    QCOMPARE(qHash(l1), qHash(l2));
-    l1 << T_BAR;
-    l2 << T_BAR;
-    QCOMPARE(qHash(l1), qHash(l2));
-}
-
-void tst_QList::reserve() const
-{
-    // Note:
-    // This test depends on QList's current behavior that ints are stored in the array itself.
-    // This test would not work for QList<Complex>.
-    int capacity = 100;
-    QList<int> list;
-    list.reserve(capacity);
-    list << 0;
-    int *data = &list[0];
-
-    for (int i = 1; i < capacity; i++) {
-        list << i;
-        QCOMPARE(&list.at(0), data);
-    }
-
-    QList<int> copy = list;
-    list.reserve(capacity / 2);
-    QCOMPARE(list.size(), capacity); // we didn't shrink the size!
-
-    copy = list;
-    list.reserve(capacity * 2);
-    QCOMPARE(list.size(), capacity);
-    QVERIFY(&list.at(0) != data);
-}
-
-QTEST_APPLESS_MAIN(tst_QList)
-#include "tst_qlist.moc"
diff --git a/tests/auto/corelib/tools/qlist_strictiterators/qlist_strictiterators.pro b/tests/auto/corelib/tools/qlist_strictiterators/qlist_strictiterators.pro
deleted file mode 100644
index e39ad38919..0000000000
--- a/tests/auto/corelib/tools/qlist_strictiterators/qlist_strictiterators.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-include(../qlist/qlist.pro)
-TARGET = tst_qlist_strictiterators
-DEFINES += QT_STRICT_ITERATORS tst_QList=tst_QList_StrictIterators
diff --git a/tests/auto/corelib/tools/qmakearray/CMakeLists.txt b/tests/auto/corelib/tools/qmakearray/CMakeLists.txt
new file mode 100644
index 0000000000..36b20c3b4f
--- /dev/null
+++ b/tests/auto/corelib/tools/qmakearray/CMakeLists.txt
@@ -0,0 +1,12 @@
+# Generated from qmakearray.pro.
+
+#####################################################################
+## tst_qmakearray Test:
+#####################################################################
+
+add_qt_test(tst_qmakearray
+    SOURCES
+        tst_qmakearray.cpp
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+)
diff --git a/tests/auto/corelib/tools/qmap/.prev_CMakeLists.txt b/tests/auto/corelib/tools/qmap/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..96378d3278
--- /dev/null
+++ b/tests/auto/corelib/tools/qmap/.prev_CMakeLists.txt
@@ -0,0 +1,12 @@
+# Generated from qmap.pro.
+
+#####################################################################
+## tst_qmap Test:
+#####################################################################
+
+add_qt_test(tst_qmap
+    SOURCES
+        tst_qmap.cpp
+    DEFINES
+        -QT_NO_JAVA_STYLE_ITERATORS
+)
diff --git a/tests/auto/corelib/tools/qmap/CMakeLists.txt b/tests/auto/corelib/tools/qmap/CMakeLists.txt
new file mode 100644
index 0000000000..677159ae0d
--- /dev/null
+++ b/tests/auto/corelib/tools/qmap/CMakeLists.txt
@@ -0,0 +1,12 @@
+# Generated from qmap.pro.
+
+#####################################################################
+## tst_qmap Test:
+#####################################################################
+
+add_qt_test(tst_qmap
+    SOURCES
+        tst_qmap.cpp
+    DEFINES
+        #-QT_NO_JAVA_STYLE_ITERATORS # special case remove
+)
diff --git a/tests/auto/corelib/tools/qmap/tst_qmap.cpp b/tests/auto/corelib/tools/qmap/tst_qmap.cpp
index c3a8a88f0c..1638ebc992 100644
--- a/tests/auto/corelib/tools/qmap/tst_qmap.cpp
+++ b/tests/auto/corelib/tools/qmap/tst_qmap.cpp
@@ -68,7 +68,6 @@ private slots:
     void const_shared_null();
 
     void equal_range();
-    void setSharable();
 
     void insert();
     void insertMap();
@@ -1066,13 +1065,6 @@ void tst_QMap::qmultimap_specific()
 void tst_QMap::const_shared_null()
 {
     QMap<int, QString> map2;
-#if !defined(QT_NO_UNSHARABLE_CONTAINERS)
-    QMap<int, QString> map1;
-    map1.setSharable(false);
-    QVERIFY(map1.isDetached());
-
-    map2.setSharable(true);
-#endif
     QVERIFY(!map2.isDetached());
 }
 
@@ -1161,61 +1153,6 @@ const T &const_(const T &t)
     return t;
 }
 
-void tst_QMap::setSharable()
-{
-#if !defined(QT_NO_UNSHARABLE_CONTAINERS)
-    QMap<int, QString> map;
-
-    map.insert(1, "um");
-    map.insert(2, "dois");
-    map.insert(4, "quatro");
-    map.insert(5, "cinco");
-
-    map.setSharable(true);
-    QCOMPARE(map.size(), 4);
-    QCOMPARE(const_(map)[4], QString("quatro"));
-
-    {
-        QMap<int, QString> copy(map);
-
-        QVERIFY(!map.isDetached());
-        QVERIFY(copy.isSharedWith(map));
-        sanityCheckTree(copy, __LINE__);
-    }
-
-    map.setSharable(false);
-    sanityCheckTree(map, __LINE__);
-    QVERIFY(map.isDetached());
-    QCOMPARE(map.size(), 4);
-    QCOMPARE(const_(map)[4], QString("quatro"));
-
-    {
-        QMap<int, QString> copy(map);
-
-        QVERIFY(map.isDetached());
-        QVERIFY(copy.isDetached());
-
-        QCOMPARE(copy.size(), 4);
-        QCOMPARE(const_(copy)[4], QString("quatro"));
-
-        QCOMPARE(map, copy);
-        sanityCheckTree(map, __LINE__);
-        sanityCheckTree(copy, __LINE__);
-    }
-
-    map.setSharable(true);
-    QCOMPARE(map.size(), 4);
-    QCOMPARE(const_(map)[4], QString("quatro"));
-
-    {
-        QMap<int, QString> copy(map);
-
-        QVERIFY(!map.isDetached());
-        QVERIFY(copy.isSharedWith(map));
-    }
-#endif
-}
-
 void tst_QMap::insert()
 {
     QMap<QString, float> map;
@@ -1510,17 +1447,16 @@ void tst_QMap::testInsertMultiWithHint()
 {
     QMap<int, int> map;
 
-    typedef QMap<int, int>::const_iterator cite; // Hack since we define QT_STRICT_ITERATORS
-    map.insertMulti(cite(map.end()), 64, 65);
+    map.insertMulti(map.end(), 64, 65);
     map[128] = 129;
     map[256] = 257;
     sanityCheckTree(map, __LINE__);
 
-    map.insertMulti(cite(map.end()), 512, 513);
-    map.insertMulti(cite(map.end()), 512, 513 * 2);
+    map.insertMulti(map.end(), 512, 513);
+    map.insertMulti(map.end(), 512, 513 * 2);
     sanityCheckTree(map, __LINE__);
     QCOMPARE(map.size(), 5);
-    map.insertMulti(cite(map.end()), 256, 258); // wrong hint
+    map.insertMulti(map.end(), 256, 258); // wrong hint
     sanityCheckTree(map, __LINE__);
     QCOMPARE(map.size(), 6);
 
@@ -1532,23 +1468,23 @@ void tst_QMap::testInsertMultiWithHint()
     sanityCheckTree(map, __LINE__);
     QCOMPARE(map.size(), 8);
 
-    j = map.insertMulti(cite(j), 68, 259);
+    j = map.insertMulti(j, 68, 259);
     sanityCheckTree(map, __LINE__);
     QCOMPARE(map.size(), 9);
 
-    j = map.insertMulti(cite(j), 67, 67);
+    j = map.insertMulti(j, 67, 67);
     sanityCheckTree(map, __LINE__);
     QCOMPARE(map.size(), 10);
 
-    i = map.insertMulti(cite(i), 256, 259);
+    i = map.insertMulti(i, 256, 259);
     sanityCheckTree(map, __LINE__);
     QCOMPARE(map.size(), 11);
 
-    i = map.insertMulti(cite(i), 256, 260);
+    i = map.insertMulti(i, 256, 260);
     sanityCheckTree(map, __LINE__);
     QCOMPARE(map.size(), 12);
 
-    map.insertMulti(cite(i), 64, 67);
+    map.insertMulti(i, 64, 67);
     sanityCheckTree(map, __LINE__);
     QCOMPARE(map.size(), 13);
 
diff --git a/tests/auto/corelib/tools/qmap_strictiterators/qmap_strictiterators.pro b/tests/auto/corelib/tools/qmap_strictiterators/qmap_strictiterators.pro
deleted file mode 100644
index 6c1f4727c1..0000000000
--- a/tests/auto/corelib/tools/qmap_strictiterators/qmap_strictiterators.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-include(../qmap/qmap.pro)
-TARGET = tst_qmap_strictiterators
-DEFINES += QT_STRICT_ITERATORS tst_QMap=tst_QMap_StrictIterators
diff --git a/tests/auto/corelib/tools/qmargins/CMakeLists.txt b/tests/auto/corelib/tools/qmargins/CMakeLists.txt
new file mode 100644
index 0000000000..632e5dc8d2
--- /dev/null
+++ b/tests/auto/corelib/tools/qmargins/CMakeLists.txt
@@ -0,0 +1,10 @@
+# Generated from qmargins.pro.
+
+#####################################################################
+## tst_qmargins Test:
+#####################################################################
+
+add_qt_test(tst_qmargins
+    SOURCES
+        tst_qmargins.cpp
+)
diff --git a/tests/auto/corelib/tools/qmessageauthenticationcode/CMakeLists.txt b/tests/auto/corelib/tools/qmessageauthenticationcode/CMakeLists.txt
new file mode 100644
index 0000000000..6e142facfb
--- /dev/null
+++ b/tests/auto/corelib/tools/qmessageauthenticationcode/CMakeLists.txt
@@ -0,0 +1,10 @@
+# Generated from qmessageauthenticationcode.pro.
+
+#####################################################################
+## tst_qmessageauthenticationcode Test:
+#####################################################################
+
+add_qt_test(tst_qmessageauthenticationcode
+    SOURCES
+        tst_qmessageauthenticationcode.cpp
+)
diff --git a/tests/auto/corelib/tools/qoffsetstringarray/qoffsetstringarray.pro b/tests/auto/corelib/tools/qoffsetstringarray/qoffsetstringarray.pro
index c8e6a8e05a..6c00f4f081 100644
--- a/tests/auto/corelib/tools/qoffsetstringarray/qoffsetstringarray.pro
+++ b/tests/auto/corelib/tools/qoffsetstringarray/qoffsetstringarray.pro
@@ -1,6 +1,5 @@
 CONFIG += testcase
 TARGET = tst_qoffsetstringarray
 QT = core testlib core-private
-CONFIG += c++11
 CONFIG += strict_c++
 SOURCES = $$PWD/tst_qoffsetstringarray.cpp
diff --git a/tests/auto/corelib/tools/qpair/CMakeLists.txt b/tests/auto/corelib/tools/qpair/CMakeLists.txt
new file mode 100644
index 0000000000..4c226f5a02
--- /dev/null
+++ b/tests/auto/corelib/tools/qpair/CMakeLists.txt
@@ -0,0 +1,13 @@
+# Generated from qpair.pro.
+
+#####################################################################
+## tst_qpair Test:
+#####################################################################
+
+add_qt_test(tst_qpair
+    SOURCES
+        tst_qpair.cpp
+)
+
+## Scopes:
+#####################################################################
diff --git a/tests/auto/corelib/tools/qpoint/CMakeLists.txt b/tests/auto/corelib/tools/qpoint/CMakeLists.txt
new file mode 100644
index 0000000000..6ef68c30cb
--- /dev/null
+++ b/tests/auto/corelib/tools/qpoint/CMakeLists.txt
@@ -0,0 +1,10 @@
+# Generated from qpoint.pro.
+
+#####################################################################
+## tst_qpoint Test:
+#####################################################################
+
+add_qt_test(tst_qpoint
+    SOURCES
+        tst_qpoint.cpp
+)
diff --git a/tests/auto/corelib/tools/qpointf/CMakeLists.txt b/tests/auto/corelib/tools/qpointf/CMakeLists.txt
new file mode 100644
index 0000000000..b1784d999f
--- /dev/null
+++ b/tests/auto/corelib/tools/qpointf/CMakeLists.txt
@@ -0,0 +1,10 @@
+# Generated from qpointf.pro.
+
+#####################################################################
+## tst_qpointf Test:
+#####################################################################
+
+add_qt_test(tst_qpointf
+    SOURCES
+        tst_qpointf.cpp
+)
diff --git a/tests/auto/corelib/tools/qqueue/CMakeLists.txt b/tests/auto/corelib/tools/qqueue/CMakeLists.txt
new file mode 100644
index 0000000000..6d1aeda5b2
--- /dev/null
+++ b/tests/auto/corelib/tools/qqueue/CMakeLists.txt
@@ -0,0 +1,10 @@
+# Generated from qqueue.pro.
+
+#####################################################################
+## tst_qqueue Test:
+#####################################################################
+
+add_qt_test(tst_qqueue
+    SOURCES
+        tst_qqueue.cpp
+)
diff --git a/tests/auto/corelib/tools/qrect/CMakeLists.txt b/tests/auto/corelib/tools/qrect/CMakeLists.txt
new file mode 100644
index 0000000000..47b8aced46
--- /dev/null
+++ b/tests/auto/corelib/tools/qrect/CMakeLists.txt
@@ -0,0 +1,10 @@
+# Generated from qrect.pro.
+
+#####################################################################
+## tst_qrect Test:
+#####################################################################
+
+add_qt_test(tst_qrect
+    SOURCES
+        tst_qrect.cpp
+)
diff --git a/tests/auto/corelib/tools/qringbuffer/CMakeLists.txt b/tests/auto/corelib/tools/qringbuffer/CMakeLists.txt
new file mode 100644
index 0000000000..4bab92b0c6
--- /dev/null
+++ b/tests/auto/corelib/tools/qringbuffer/CMakeLists.txt
@@ -0,0 +1,12 @@
+# Generated from qringbuffer.pro.
+
+#####################################################################
+## tst_qringbuffer Test:
+#####################################################################
+
+add_qt_test(tst_qringbuffer
+    SOURCES
+        tst_qringbuffer.cpp
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+)
diff --git a/tests/auto/corelib/tools/qscopedpointer/CMakeLists.txt b/tests/auto/corelib/tools/qscopedpointer/CMakeLists.txt
new file mode 100644
index 0000000000..141bab267b
--- /dev/null
+++ b/tests/auto/corelib/tools/qscopedpointer/CMakeLists.txt
@@ -0,0 +1,10 @@
+# Generated from qscopedpointer.pro.
+
+#####################################################################
+## tst_qscopedpointer Test:
+#####################################################################
+
+add_qt_test(tst_qscopedpointer
+    SOURCES
+        tst_qscopedpointer.cpp
+)
diff --git a/tests/auto/corelib/tools/qscopedvaluerollback/CMakeLists.txt b/tests/auto/corelib/tools/qscopedvaluerollback/CMakeLists.txt
new file mode 100644
index 0000000000..e23a4d55f9
--- /dev/null
+++ b/tests/auto/corelib/tools/qscopedvaluerollback/CMakeLists.txt
@@ -0,0 +1,10 @@
+# Generated from qscopedvaluerollback.pro.
+
+#####################################################################
+## tst_qscopedvaluerollback Test:
+#####################################################################
+
+add_qt_test(tst_qscopedvaluerollback
+    SOURCES
+        tst_qscopedvaluerollback.cpp
+)
diff --git a/tests/auto/corelib/tools/qscopeguard/CMakeLists.txt b/tests/auto/corelib/tools/qscopeguard/CMakeLists.txt
new file mode 100644
index 0000000000..11b425448b
--- /dev/null
+++ b/tests/auto/corelib/tools/qscopeguard/CMakeLists.txt
@@ -0,0 +1,13 @@
+# Generated from qscopeguard.pro.
+
+#####################################################################
+## tst_qscopeguard Test:
+#####################################################################
+
+add_qt_test(tst_qscopeguard
+    SOURCES
+        tst_qscopeguard.cpp
+)
+
+## Scopes:
+#####################################################################
diff --git a/tests/auto/corelib/tools/qscopeguard/tst_qscopeguard.cpp b/tests/auto/corelib/tools/qscopeguard/tst_qscopeguard.cpp
index e5393f694e..4bb4113845 100644
--- a/tests/auto/corelib/tools/qscopeguard/tst_qscopeguard.cpp
+++ b/tests/auto/corelib/tools/qscopeguard/tst_qscopeguard.cpp
@@ -100,9 +100,11 @@ void tst_QScopeGuard::construction()
     QScopeGuard fromFunctionPointer(&func);
     QScopeGuard fromNonVoidFunction(intFunc);
     QScopeGuard fromNoDiscardFunction(noDiscardFunc);
+#ifndef __apple_build_version__
     QScopeGuard fromStdFunction{std::function(func)};
     std::function stdFunction(func);
     QScopeGuard fromNamedStdFunction(stdFunction);
+#endif
 #else
     QSKIP("This test requires C++17 Class Template Argument Deduction support enabled in the compiler.");
 #endif
diff --git a/tests/auto/corelib/tools/qset/.prev_CMakeLists.txt b/tests/auto/corelib/tools/qset/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..68a8f64822
--- /dev/null
+++ b/tests/auto/corelib/tools/qset/.prev_CMakeLists.txt
@@ -0,0 +1,15 @@
+# Generated from qset.pro.
+
+#####################################################################
+## tst_qset Test:
+#####################################################################
+
+add_qt_test(tst_qset
+    SOURCES
+        tst_qset.cpp
+    DEFINES
+        -QT_NO_JAVA_STYLE_ITERATORS
+)
+
+## Scopes:
+#####################################################################
diff --git a/tests/auto/corelib/tools/qset/CMakeLists.txt b/tests/auto/corelib/tools/qset/CMakeLists.txt
new file mode 100644
index 0000000000..a423e4aa23
--- /dev/null
+++ b/tests/auto/corelib/tools/qset/CMakeLists.txt
@@ -0,0 +1,15 @@
+# Generated from qset.pro.
+
+#####################################################################
+## tst_qset Test:
+#####################################################################
+
+add_qt_test(tst_qset
+    SOURCES
+        tst_qset.cpp
+    #DEFINES # special case remove
+        #-QT_NO_JAVA_STYLE_ITERATORS # special case remove
+)
+
+## Scopes:
+#####################################################################
diff --git a/tests/auto/corelib/tools/qset/tst_qset.cpp b/tests/auto/corelib/tools/qset/tst_qset.cpp
index 8a545712a2..0ca8be7fa3 100644
--- a/tests/auto/corelib/tools/qset/tst_qset.cpp
+++ b/tests/auto/corelib/tools/qset/tst_qset.cpp
@@ -26,8 +26,6 @@
 **
 ****************************************************************************/
 
-//#define QT_STRICT_ITERATORS
-
 #include <QtTest/QtTest>
 #include <qset.h>
 #include <qdebug.h>
@@ -61,7 +59,6 @@ private slots:
     void begin();
     void end();
     void insert();
-    void reverseIterators();
     void setOperations();
     void stlIterator();
     void stlMutableIterator();
@@ -579,21 +576,6 @@ void tst_QSet::insert()
     }
 }
 
-void tst_QSet::reverseIterators()
-{
-    QSet<int> s;
-    s << 1 << 17 << 61 << 127 << 911;
-    std::vector<int> v(s.begin(), s.end());
-    std::reverse(v.begin(), v.end());
-    const QSet<int> &cs = s;
-    QVERIFY(std::equal(v.begin(), v.end(), s.rbegin()));
-    QVERIFY(std::equal(v.begin(), v.end(), s.crbegin()));
-    QVERIFY(std::equal(v.begin(), v.end(), cs.rbegin()));
-    QVERIFY(std::equal(s.rbegin(), s.rend(), v.begin()));
-    QVERIFY(std::equal(s.crbegin(), s.crend(), v.begin()));
-    QVERIFY(std::equal(cs.rbegin(), cs.rend(), v.begin()));
-}
-
 void tst_QSet::setOperations()
 {
     QSet<QString> set1, set2;
@@ -707,16 +689,6 @@ void tst_QSet::stlIterator()
         }
         QVERIFY(sum == 24999 * 25000 / 2);
     }
-
-    {
-        int sum = 0;
-        QSet<QString>::const_iterator i = set1.end();
-        while (i != set1.begin()) {
-            --i;
-            sum += toNumber(*i);
-        }
-        QVERIFY(sum == 24999 * 25000 / 2);
-    }
 }
 
 void tst_QSet::stlMutableIterator()
@@ -736,21 +708,10 @@ void tst_QSet::stlMutableIterator()
     }
 
     {
-        int sum = 0;
-        QSet<QString>::iterator i = set1.end();
-        while (i != set1.begin()) {
-            --i;
-            sum += toNumber(*i);
-        }
-        QVERIFY(sum == 24999 * 25000 / 2);
-    }
-
-    {
         QSet<QString> set2 = set1;
         QSet<QString> set3 = set2;
 
         QSet<QString>::iterator i = set2.begin();
-        QSet<QString>::iterator j = set3.begin();
 
         while (i != set2.end()) {
             i = set2.erase(i);
@@ -758,24 +719,7 @@ void tst_QSet::stlMutableIterator()
         QVERIFY(set2.isEmpty());
         QVERIFY(!set3.isEmpty());
 
-        j = set3.end();
-        while (j != set3.begin()) {
-            j--;
-            if (j + 1 != set3.end())
-                set3.erase(j + 1);
-        }
-        if (set3.begin() != set3.end())
-            set3.erase(set3.begin());
-
-        QVERIFY(set2.isEmpty());
-        QVERIFY(set3.isEmpty());
-
-// #if QT_VERSION >= 0x050000
-//         i = set2.insert("foo");
-// #else
-        QSet<QString>::const_iterator k = set2.insert("foo");
-        i = reinterpret_cast<QSet<QString>::iterator &>(k);
-// #endif
+        i = set2.insert("foo");
         QCOMPARE(*i, QLatin1String("foo"));
     }
 }
@@ -804,47 +748,6 @@ void tst_QSet::javaIterator()
         QVERIFY(sum == 24999 * 25000 / 2);
     }
 
-    {
-        int sum = 0;
-        QSetIterator<QString> i(set1);
-        while (i.hasNext()) {
-            i.next();
-            sum += toNumber(i.peekPrevious());
-        }
-        QVERIFY(sum == 24999 * 25000 / 2);
-    }
-
-    {
-        int sum = 0;
-        QSetIterator<QString> i(set1);
-        i.toBack();
-        while (i.hasPrevious())
-            sum += toNumber(i.previous());
-        QVERIFY(sum == 24999 * 25000 / 2);
-    }
-
-    {
-        int sum = 0;
-        QSetIterator<QString> i(set1);
-        i.toBack();
-        while (i.hasPrevious()) {
-            sum += toNumber(i.peekPrevious());
-            i.previous();
-        }
-        QVERIFY(sum == 24999 * 25000 / 2);
-    }
-
-    {
-        int sum = 0;
-        QSetIterator<QString> i(set1);
-        i.toBack();
-        while (i.hasPrevious()) {
-            i.previous();
-            sum += toNumber(i.peekNext());
-        }
-        QVERIFY(sum == 24999 * 25000 / 2);
-    }
-
     int sum1 = 0;
     int sum2 = 0;
     QSetIterator<QString> i(set1);
@@ -899,52 +802,10 @@ void tst_QSet::javaMutableIterator()
     }
 
     {
-        int sum = 0;
-        QMutableSetIterator<QString> i(set1);
-        while (i.hasNext()) {
-            i.next();
-            sum += toNumber(i.peekPrevious());
-        }
-        QVERIFY(sum == 24999 * 25000 / 2);
-    }
-
-    {
-        int sum = 0;
-        QMutableSetIterator<QString> i(set1);
-        i.toBack();
-        while (i.hasPrevious())
-            sum += toNumber(i.previous());
-        QVERIFY(sum == 24999 * 25000 / 2);
-    }
-
-    {
-        int sum = 0;
-        QMutableSetIterator<QString> i(set1);
-        i.toBack();
-        while (i.hasPrevious()) {
-            sum += toNumber(i.peekPrevious());
-            i.previous();
-        }
-        QVERIFY(sum == 24999 * 25000 / 2);
-    }
-
-    {
-        int sum = 0;
-        QMutableSetIterator<QString> i(set1);
-        i.toBack();
-        while (i.hasPrevious()) {
-            i.previous();
-            sum += toNumber(i.peekNext());
-        }
-        QVERIFY(sum == 24999 * 25000 / 2);
-    }
-
-    {
         QSet<QString> set2 = set1;
         QSet<QString> set3 = set2;
 
         QMutableSetIterator<QString> i(set2);
-        QMutableSetIterator<QString> j(set3);
 
         while (i.hasNext()) {
             i.next();
@@ -952,14 +813,6 @@ void tst_QSet::javaMutableIterator()
         }
         QVERIFY(set2.isEmpty());
         QVERIFY(!set3.isEmpty());
-
-        j.toBack();
-        while (j.hasPrevious()) {
-            j.previous();
-            j.remove();
-        }
-        QVERIFY(set2.isEmpty());
-        QVERIFY(set3.isEmpty());
     }
 }
 
diff --git a/tests/auto/corelib/tools/qsharedpointer/tst_qsharedpointer.cpp b/tests/auto/corelib/tools/qsharedpointer/tst_qsharedpointer.cpp
index a9fd282ac9..8a621cd5d9 100644
--- a/tests/auto/corelib/tools/qsharedpointer/tst_qsharedpointer.cpp
+++ b/tests/auto/corelib/tools/qsharedpointer/tst_qsharedpointer.cpp
@@ -2155,7 +2155,7 @@ void tst_QSharedPointer::threadStressTest()
     }
 }
 
-template<typename Container, bool Ordered>
+template<typename Container, bool Ordered, bool Multi>
 void hashAndMapTest()
 {
     typedef typename Container::key_type Key;
@@ -2200,26 +2200,30 @@ void hashAndMapTest()
         QVERIFY(it == c.end());
     }
 
-    c.insertMulti(k1, Value(47));
-    it = c.find(k1);
-    QVERIFY(it != c.end());
-    QCOMPARE(it.key(), k1);
-    ++it;
-    QVERIFY(it != c.end());
-    QCOMPARE(it.key(), k1);
-    ++it;
-    if (Ordered)
-        QVERIFY(it == c.end());
+    if (Multi) {
+        c.insert(k1, Value(47));
+        it = c.find(k1);
+        QVERIFY(it != c.end());
+        QCOMPARE(it.key(), k1);
+        ++it;
+        QVERIFY(it != c.end());
+        QCOMPARE(it.key(), k1);
+        ++it;
+        if (Ordered)
+            QVERIFY(it == c.end());
+    }
 }
 
 void tst_QSharedPointer::map()
 {
-    hashAndMapTest<QMap<QSharedPointer<int>, int>, true>();
+    hashAndMapTest<QMap<QSharedPointer<int>, int>, true, false>();
+    hashAndMapTest<QMultiMap<QSharedPointer<int>, int>, true, true>();
 }
 
 void tst_QSharedPointer::hash()
 {
-    hashAndMapTest<QHash<QSharedPointer<int>, int>, false>();
+    hashAndMapTest<QHash<QSharedPointer<int>, int>, false, false>();
+    hashAndMapTest<QMultiHash<QSharedPointer<int>, int>, false, true>();
 }
 
 void tst_QSharedPointer::validConstructs()
diff --git a/tests/auto/corelib/tools/qsize/CMakeLists.txt b/tests/auto/corelib/tools/qsize/CMakeLists.txt
new file mode 100644
index 0000000000..f516941180
--- /dev/null
+++ b/tests/auto/corelib/tools/qsize/CMakeLists.txt
@@ -0,0 +1,10 @@
+# Generated from qsize.pro.
+
+#####################################################################
+## tst_qsize Test:
+#####################################################################
+
+add_qt_test(tst_qsize
+    SOURCES
+        tst_qsize.cpp
+)
diff --git a/tests/auto/corelib/tools/qsizef/CMakeLists.txt b/tests/auto/corelib/tools/qsizef/CMakeLists.txt
new file mode 100644
index 0000000000..d767ca92d7
--- /dev/null
+++ b/tests/auto/corelib/tools/qsizef/CMakeLists.txt
@@ -0,0 +1,10 @@
+# Generated from qsizef.pro.
+
+#####################################################################
+## tst_qsizef Test:
+#####################################################################
+
+add_qt_test(tst_qsizef
+    SOURCES
+        tst_qsizef.cpp
+)
diff --git a/tests/auto/corelib/tools/qstl/CMakeLists.txt b/tests/auto/corelib/tools/qstl/CMakeLists.txt
new file mode 100644
index 0000000000..975ddfe0b5
--- /dev/null
+++ b/tests/auto/corelib/tools/qstl/CMakeLists.txt
@@ -0,0 +1,10 @@
+# Generated from qstl.pro.
+
+#####################################################################
+## tst_qstl Test:
+#####################################################################
+
+add_qt_test(tst_qstl
+    SOURCES
+        tst_qstl.cpp
+)
diff --git a/tests/auto/corelib/tools/qtimeline/CMakeLists.txt b/tests/auto/corelib/tools/qtimeline/CMakeLists.txt
new file mode 100644
index 0000000000..802cd56305
--- /dev/null
+++ b/tests/auto/corelib/tools/qtimeline/CMakeLists.txt
@@ -0,0 +1,10 @@
+# Generated from qtimeline.pro.
+
+#####################################################################
+## tst_qtimeline Test:
+#####################################################################
+
+add_qt_test(tst_qtimeline
+    SOURCES
+        tst_qtimeline.cpp
+)
diff --git a/tests/auto/corelib/tools/qvarlengtharray/CMakeLists.txt b/tests/auto/corelib/tools/qvarlengtharray/CMakeLists.txt
new file mode 100644
index 0000000000..17989ae31d
--- /dev/null
+++ b/tests/auto/corelib/tools/qvarlengtharray/CMakeLists.txt
@@ -0,0 +1,13 @@
+# Generated from qvarlengtharray.pro.
+
+#####################################################################
+## tst_qvarlengtharray Test:
+#####################################################################
+
+add_qt_test(tst_qvarlengtharray
+    SOURCES
+        tst_qvarlengtharray.cpp
+)
+
+## Scopes:
+#####################################################################
diff --git a/tests/auto/corelib/tools/qvarlengtharray/tst_qvarlengtharray.cpp b/tests/auto/corelib/tools/qvarlengtharray/tst_qvarlengtharray.cpp
index a1d0100f96..6220cc766a 100644
--- a/tests/auto/corelib/tools/qvarlengtharray/tst_qvarlengtharray.cpp
+++ b/tests/auto/corelib/tools/qvarlengtharray/tst_qvarlengtharray.cpp
@@ -827,7 +827,7 @@ void tst_QVarLengthArray::operators()
 
     // +=: not provided, emulate
     //myvla += myvlatwo;
-    Q_FOREACH (const QString &s, myvlatwo)
+    for (const QString &s : qAsConst(myvlatwo))
         myvla.push_back(s);
     QCOMPARE(myvla, combined);
 
diff --git a/tests/auto/corelib/tools/qvector/tst_qvector.cpp b/tests/auto/corelib/tools/qvector/tst_qvector.cpp
index 08d5a8cd50..6ae312fb8d 100644
--- a/tests/auto/corelib/tools/qvector/tst_qvector.cpp
+++ b/tests/auto/corelib/tools/qvector/tst_qvector.cpp
@@ -104,7 +104,7 @@ private:
 
     static void check(const State state1, const State state2)
     {
-        QCOMPARE(state1, state2);
+        QCOMPARE(int(state1), int(state2));
     }
 };
 
@@ -174,7 +174,7 @@ private:
     {
         // check if c object has been moved
         QCOMPARE(c, c->that);
-        QCOMPARE(c->state, Constructed);
+        QCOMPARE(int(c->state), int(Constructed));
     }
 };
 QAtomicInt Custom::counter = 0;
@@ -307,22 +307,11 @@ private slots:
 
     void reserve();
     void reserveZero();
-    void reallocAfterCopy_data();
-    void reallocAfterCopy();
     void initializeListInt();
     void initializeListMovable();
     void initializeListCustom();
 
     void const_shared_null();
-#if 1
-    // ### Qt6 remove this section
-    void setSharableInt_data();
-    void setSharableInt();
-    void setSharableMovable_data();
-    void setSharableMovable();
-    void setSharableCustom_data();
-    void setSharableCustom();
-#endif
 
     void detachInt() const;
     void detachMovable() const;
@@ -335,6 +324,18 @@ private slots:
 
     void swapItemsAt() const;
 
+    void emplaceInt();
+    void emplaceCustom();
+    void emplaceMovable();
+    void emplaceConsistentWithStdVectorInt();
+    void emplaceConsistentWithStdVectorCustom();
+    void emplaceConsistentWithStdVectorMovable();
+    void emplaceReturnsIterator();
+    void emplaceBack();
+    void emplaceBackReturnsRef();
+    void emplaceWithElementFromTheSameContainer();
+    void emplaceWithElementFromTheSameContainer_data();
+
 private:
     template<typename T> void copyConstructor() const;
     template<typename T> void add() const;
@@ -358,10 +359,10 @@ private:
     template<typename T> void size() const;
     template<typename T> void swap() const;
     template<typename T> void initializeList();
-    template<typename T> void setSharable_data() const;
-    template<typename T> void setSharable() const;
     template<typename T> void detach() const;
     template<typename T> void detachThreadSafety() const;
+    template<typename T> void emplaceImpl() const;
+    template<typename T> void emplaceConsistentWithStdVectorImpl() const;
 };
 
 
@@ -467,24 +468,6 @@ void tst_QVector::copyConstructor() const
         QVector<T> v2(v1);
         QCOMPARE(v1, v2);
     }
-#if !defined(QT_NO_UNSHARABLE_CONTAINERS)
-    // ### Qt6 remove this section
-    {
-        QVector<T> v1;
-        v1.setSharable(false);
-        QVector<T> v2(v1);
-        QVERIFY(!v1.isSharedWith(v2));
-        QCOMPARE(v1, v2);
-    }
-    {
-        QVector<T> v1;
-        v1 << value1 << value2 << value3 << value4;
-        v1.setSharable(false);
-        QVector<T> v2(v1);
-        QVERIFY(!v1.isSharedWith(v2));
-        QCOMPARE(v1, v2);
-    }
-#endif
 }
 
 void tst_QVector::copyConstructorInt() const
@@ -665,17 +648,6 @@ void tst_QVector::append() const
         QVERIFY(v.size() == 3);
         QCOMPARE(v.at(v.size() - 1), SimpleValue<T>::at(0));
     }
-#if !defined(QT_NO_UNSHARABLE_CONTAINERS)
-    // ### Qt6 remove this section
-    {
-        QVector<T> v(2);
-        v.reserve(12);
-        v.setSharable(false);
-        v.append(SimpleValue<T>::at(0));
-        QVERIFY(v.size() == 3);
-        QCOMPARE(v.last(), SimpleValue<T>::at(0));
-    }
-#endif
     {
         QVector<int> v;
         v << 1 << 2 << 3;
@@ -766,16 +738,12 @@ void tst_QVector::capacity() const
     myvec.remove(3);
     myvec.remove(3);
     myvec.remove(3);
-    // TODO: is this a safe assumption? presumably it won't release memory until shrink(), but can we asser that is true?
-    QVERIFY(myvec.capacity() >= 6);
     myvec.squeeze();
     QVERIFY(myvec.capacity() >= 3);
 
     myvec.remove(0);
     myvec.remove(0);
     myvec.remove(0);
-    // TODO: as above note
-    QVERIFY(myvec.capacity() >= 3);
     myvec.squeeze();
     QVERIFY(myvec.capacity() == 0);
 }
@@ -1019,20 +987,9 @@ void tst_QVector::endsWith() const
 template<typename T>
 void tst_QVector::eraseEmpty() const
 {
-    {
-        QVector<T> v;
-        v.erase(v.begin(), v.end());
-        QCOMPARE(v.size(), 0);
-    }
-#if !defined(QT_NO_UNSHARABLE_CONTAINERS)
-    // ### Qt6 remove this section
-    {
-        QVector<T> v;
-        v.setSharable(false);
-        v.erase(v.begin(), v.end());
-        QCOMPARE(v.size(), 0);
-    }
-#endif
+    QVector<T> v;
+    v.erase(v.begin(), v.end());
+    QCOMPARE(v.size(), 0);
 }
 
 void tst_QVector::eraseEmptyInt() const
@@ -1057,22 +1014,10 @@ void tst_QVector::eraseEmptyCustom() const
 template<typename T>
 void tst_QVector::eraseEmptyReserved() const
 {
-    {
-        QVector<T> v;
-        v.reserve(10);
-        v.erase(v.begin(), v.end());
-        QCOMPARE(v.size(), 0);
-    }
-#if !defined(QT_NO_UNSHARABLE_CONTAINERS)
-    // ### Qt6 remove this section
-    {
-        QVector<T> v;
-        v.reserve(10);
-        v.setSharable(false);
-        v.erase(v.begin(), v.end());
-        QCOMPARE(v.size(), 0);
-    }
-#endif
+    QVector<T> v;
+    v.reserve(10);
+    v.erase(v.begin(), v.end());
+    QCOMPARE(v.size(), 0);
 }
 
 void tst_QVector::eraseEmptyReservedInt() const
@@ -1179,21 +1124,6 @@ void tst_QVector::erase(bool shared) const
         if (shared)
             QCOMPARE(SimpleValue<T>::vector(12), *svc.copy);
     }
-#if !defined(QT_NO_UNSHARABLE_CONTAINERS)
-    // ### Qt6 remove this section
-    {
-        QVector<T> v = SimpleValue<T>::vector(10);
-        SharedVectorChecker<T> svc(v, shared);
-        v.setSharable(false);
-        SharedVectorChecker<T> svc2(v, shared);
-        v.erase(v.begin() + 3);
-        QCOMPARE(v.size(), 9);
-        v.erase(v.begin(), v.end() - 1);
-        QCOMPARE(v.size(), 1);
-        if (shared)
-            QCOMPARE(SimpleValue<T>::vector(10), *svc.copy);
-    }
-#endif
 }
 
 void tst_QVector::eraseInt() const
@@ -1266,18 +1196,6 @@ template<typename T> void tst_QVector::eraseReserved() const
         v.erase(v.begin() + 1, v.end() - 1);
         QCOMPARE(v.size(), 2);
     }
-#if !defined(QT_NO_UNSHARABLE_CONTAINERS)
-    // ### Qt6 remove this section
-    {
-        QVector<T> v(10);
-        v.reserve(16);
-        v.setSharable(false);
-        v.erase(v.begin() + 3);
-        QCOMPARE(v.size(), 9);
-        v.erase(v.begin(), v.end() - 1);
-        QCOMPARE(v.size(), 1);
-    }
-#endif
 }
 
 void tst_QVector::eraseReservedInt() const
@@ -2019,33 +1937,6 @@ void tst_QVector::resizePOD_data() const
     QTest::newRow("emptyReserved") << emptyReserved << 10;
     QTest::newRow("nonEmpty") << nonEmpty << 10;
     QTest::newRow("nonEmptyReserved") << nonEmptyReserved << 10;
-
-#if !defined(QT_NO_UNSHARABLE_CONTAINERS)
-    // ### Qt6 remove this section
-    QVector<int> nullNotShared;
-    QVector<int> emptyNotShared(0, 5);
-    QVector<int> emptyReservedNotShared;
-    QVector<int> nonEmptyNotShared;
-    QVector<int> nonEmptyReservedNotShared;
-
-    emptyReservedNotShared.reserve(10);
-    nonEmptyReservedNotShared.reserve(15);
-    nonEmptyNotShared << 0 << 1 << 2 << 3 << 4;
-    nonEmptyReservedNotShared << 0 << 1 << 2 << 3 << 4 << 5 << 6;
-    QVERIFY(emptyReservedNotShared.capacity() >= 10);
-    QVERIFY(nonEmptyReservedNotShared.capacity() >= 15);
-
-    emptyNotShared.setSharable(false);
-    emptyReservedNotShared.setSharable(false);
-    nonEmptyNotShared.setSharable(false);
-    nonEmptyReservedNotShared.setSharable(false);
-
-    QTest::newRow("nullNotShared") << nullNotShared << 10;
-    QTest::newRow("emptyNotShared") << emptyNotShared << 10;
-    QTest::newRow("emptyReservedNotShared") << emptyReservedNotShared << 10;
-    QTest::newRow("nonEmptyNotShared") << nonEmptyNotShared << 10;
-    QTest::newRow("nonEmptyReservedNotShared") << nonEmptyReservedNotShared << 10;
-#endif
 }
 
 void tst_QVector::resizePOD() const
@@ -2094,33 +1985,6 @@ void tst_QVector::resizeComplexMovable_data() const
     QTest::newRow("emptyReserved") << emptyReserved << 10;
     QTest::newRow("nonEmpty") << nonEmpty << 10;
     QTest::newRow("nonEmptyReserved") << nonEmptyReserved << 10;
-
-#if !defined(QT_NO_UNSHARABLE_CONTAINERS)
-    // ### Qt6 remove this section
-    QVector<Movable> nullNotShared;
-    QVector<Movable> emptyNotShared(0, 'Q');
-    QVector<Movable> emptyReservedNotShared;
-    QVector<Movable> nonEmptyNotShared;
-    QVector<Movable> nonEmptyReservedNotShared;
-
-    emptyReservedNotShared.reserve(10);
-    nonEmptyReservedNotShared.reserve(15);
-    nonEmptyNotShared << '0' << '1' << '2' << '3' << '4';
-    nonEmptyReservedNotShared << '0' << '1' << '2' << '3' << '4' << '5' << '6';
-    QVERIFY(emptyReservedNotShared.capacity() >= 10);
-    QVERIFY(nonEmptyReservedNotShared.capacity() >= 15);
-
-    emptyNotShared.setSharable(false);
-    emptyReservedNotShared.setSharable(false);
-    nonEmptyNotShared.setSharable(false);
-    nonEmptyReservedNotShared.setSharable(false);
-
-    QTest::newRow("nullNotShared") << nullNotShared << 10;
-    QTest::newRow("emptyNotShared") << emptyNotShared << 10;
-    QTest::newRow("emptyReservedNotShared") << emptyReservedNotShared << 10;
-    QTest::newRow("nonEmptyNotShared") << nonEmptyNotShared << 10;
-    QTest::newRow("nonEmptyReservedNotShared") << nonEmptyReservedNotShared << 10;
-#endif
 }
 
 void tst_QVector::resizeComplexMovable() const
@@ -2173,33 +2037,6 @@ void tst_QVector::resizeComplex_data() const
     QTest::newRow("emptyReserved") << emptyReserved << 10;
     QTest::newRow("nonEmpty") << nonEmpty << 10;
     QTest::newRow("nonEmptyReserved") << nonEmptyReserved << 10;
-
-#if !defined(QT_NO_UNSHARABLE_CONTAINERS)
-    // ### Qt6 remove this section
-    QVector<Custom> nullNotShared;
-    QVector<Custom> emptyNotShared(0, '0');
-    QVector<Custom> emptyReservedNotShared;
-    QVector<Custom> nonEmptyNotShared;
-    QVector<Custom> nonEmptyReservedNotShared;
-
-    emptyReservedNotShared.reserve(10);
-    nonEmptyReservedNotShared.reserve(15);
-    nonEmptyNotShared << '0' << '1' << '2' << '3' << '4';
-    nonEmptyReservedNotShared << '0' << '1' << '2' << '3' << '4' << '5' << '6';
-    QVERIFY(emptyReservedNotShared.capacity() >= 10);
-    QVERIFY(nonEmptyReservedNotShared.capacity() >= 15);
-
-    emptyNotShared.setSharable(false);
-    emptyReservedNotShared.setSharable(false);
-    nonEmptyNotShared.setSharable(false);
-    nonEmptyReservedNotShared.setSharable(false);
-
-    QTest::newRow("nullNotShared") << nullNotShared << 10;
-    QTest::newRow("emptyNotShared") << emptyNotShared << 10;
-    QTest::newRow("emptyReservedNotShared") << emptyReservedNotShared << 10;
-    QTest::newRow("nonEmptyNotShared") << nonEmptyNotShared << 10;
-    QTest::newRow("nonEmptyReservedNotShared") << nonEmptyReservedNotShared << 10;
-#endif
 }
 
 void tst_QVector::resizeComplex() const
@@ -2512,87 +2349,6 @@ void tst_QVector::reserveZero()
     QVERIFY(vec.capacity() >= 1);
 }
 
-// This is a regression test for QTBUG-11763, where memory would be reallocated
-// soon after copying a QVector.
-void tst_QVector::reallocAfterCopy_data()
-{
-    QTest::addColumn<int>("capacity");
-    QTest::addColumn<int>("fill_size");
-    QTest::addColumn<int>("func_id");
-    QTest::addColumn<int>("result1");
-    QTest::addColumn<int>("result2");
-    QTest::addColumn<int>("result3");
-    QTest::addColumn<int>("result4");
-
-    int result1, result2, result3, result4;
-    int fill_size;
-    for (int i = 70; i <= 100; i += 10) {
-        const QByteArray prefix = "reallocAfterCopy:" + QByteArray::number(i) + ',';
-        fill_size = i - 20;
-        for (int j = 0; j <= 3; j++) {
-            if (j == 0) { // append
-                result1 = i;
-                result2 = i;
-                result3 = i - 19;
-                result4 = i - 20;
-            } else if (j == 1) { // insert(0)
-                result1 = i;
-                result2 = i;
-                result3 = i - 19;
-                result4 = i - 20;
-            } else if (j == 2) { // insert(20)
-                result1 = i;
-                result2 = i;
-                result3 = i - 19;
-                result4 = i - 20;
-            } else if (j == 3) { // insert(0, 10)
-                result1 = i;
-                result2 = i;
-                result3 = i - 10;
-                result4 = i - 20;
-            }
-            QTest::newRow((prefix + QByteArray::number(j)).constData())
-                    << i << fill_size << j << result1 << result2 << result3 << result4;
-        }
-    }
-}
-
-void tst_QVector::reallocAfterCopy()
-{
-    QFETCH(int, capacity);
-    QFETCH(int, fill_size);
-    QFETCH(int, func_id);
-    QFETCH(int, result1);
-    QFETCH(int, result2);
-    QFETCH(int, result3);
-    QFETCH(int, result4);
-
-    QVector<qreal> v1;
-    QVector<qreal> v2;
-
-    v1.reserve(capacity);
-    v1.resize(0);
-    v1.fill(qreal(1.0), fill_size);
-
-    v2 = v1;
-
-    // no need to test begin() and end(), there is a detach() in them
-    if (func_id == 0) {
-        v1.append(qreal(1.0)); //push_back is same as append
-    } else if (func_id == 1) {
-        v1.insert(0, qreal(1.0)); //push_front is same as prepend, insert(0)
-    } else if (func_id == 2) {
-        v1.insert(20, qreal(1.0));
-    } else if (func_id == 3) {
-        v1.insert(0, 10, qreal(1.0));
-    }
-
-    QCOMPARE(v1.capacity(), result1);
-    QCOMPARE(v2.capacity(), result2);
-    QCOMPARE(v1.size(), result3);
-    QCOMPARE(v2.size(), result4);
-}
-
 template<typename T>
 void tst_QVector::initializeList()
 {
@@ -2636,154 +2392,9 @@ void tst_QVector::initializeListCustom()
 void tst_QVector::const_shared_null()
 {
     QVector<int> v2;
-#if !defined(QT_NO_UNSHARABLE_CONTAINERS)
-    // ### Qt6 remove this section
-    QVector<int> v1;
-    v1.setSharable(false);
-    QVERIFY(v1.isDetached());
-
-    v2.setSharable(true);
-#endif
     QVERIFY(!v2.isDetached());
 }
 
-#if !defined(QT_NO_UNSHARABLE_CONTAINERS)
-// ### Qt6 remove this section
-template<typename T>
-void tst_QVector::setSharable_data() const
-{
-    QTest::addColumn<QVector<T> >("vector");
-    QTest::addColumn<int>("size");
-    QTest::addColumn<int>("capacity");
-    QTest::addColumn<bool>("isCapacityReserved");
-
-    QVector<T> null;
-    QVector<T> empty(0, SimpleValue<T>::at(1));
-    QVector<T> emptyReserved;
-    QVector<T> nonEmpty;
-    QVector<T> nonEmptyReserved;
-
-    emptyReserved.reserve(10);
-    nonEmptyReserved.reserve(15);
-
-    nonEmpty << SimpleValue<T>::at(0) << SimpleValue<T>::at(1) << SimpleValue<T>::at(2) << SimpleValue<T>::at(3) << SimpleValue<T>::at(4);
-    nonEmptyReserved << SimpleValue<T>::at(0) << SimpleValue<T>::at(1) << SimpleValue<T>::at(2) << SimpleValue<T>::at(3) << SimpleValue<T>::at(4) << SimpleValue<T>::at(5) << SimpleValue<T>::at(6);
-
-    QVERIFY(emptyReserved.capacity() >= 10);
-    QVERIFY(nonEmptyReserved.capacity() >= 15);
-
-    QTest::newRow("null") << null << 0 << 0 << false;
-    QTest::newRow("empty") << empty << 0 << 0 << false;
-    QTest::newRow("empty, Reserved") << emptyReserved << 0 << 10 << true;
-    QTest::newRow("non-empty") << nonEmpty << 5 << 0 << false;
-    QTest::newRow("non-empty, Reserved") << nonEmptyReserved << 7 << 15 << true;
-}
-
-template<typename T>
-void tst_QVector::setSharable() const
-{
-    QFETCH(QVector<T>, vector);
-    QFETCH(int, size);
-    QFETCH(int, capacity);
-    QFETCH(bool, isCapacityReserved);
-
-    QVERIFY(!vector.isDetached()); // Shared with QTest
-
-    vector.setSharable(true);
-
-    QCOMPARE(vector.size(), size);
-    if (isCapacityReserved)
-        QVERIFY2(vector.capacity() >= capacity,
-                qPrintable(QString("Capacity is %1, expected at least %2.")
-                    .arg(vector.capacity())
-                    .arg(capacity)));
-
-    {
-        QVector<T> copy(vector);
-
-        QVERIFY(!copy.isDetached());
-        QVERIFY(copy.isSharedWith(vector));
-    }
-
-    vector.setSharable(false);
-    QVERIFY(vector.isDetached() || vector.isSharedWith(QVector<T>()));
-
-    {
-        QVector<T> copy(vector);
-
-        QVERIFY(copy.isDetached() || copy.isEmpty() || copy.isSharedWith(QVector<T>()));
-        QCOMPARE(copy.size(), size);
-        if (isCapacityReserved)
-            QVERIFY2(copy.capacity() >= capacity,
-                    qPrintable(QString("Capacity is %1, expected at least %2.")
-                        .arg(copy.capacity())
-                        .arg(capacity)));
-        QCOMPARE(copy, vector);
-    }
-
-    vector.setSharable(true);
-
-    {
-        QVector<T> copy(vector);
-
-        QVERIFY(!copy.isDetached());
-        QVERIFY(copy.isSharedWith(vector));
-    }
-
-    for (int i = 0; i < vector.size(); ++i)
-        QCOMPARE(vector[i], SimpleValue<T>::at(i));
-
-    QCOMPARE(vector.size(), size);
-    if (isCapacityReserved)
-        QVERIFY2(vector.capacity() >= capacity,
-                qPrintable(QString("Capacity is %1, expected at least %2.")
-                    .arg(vector.capacity())
-                    .arg(capacity)));
-}
-#else
-template<typename T> void tst_QVector::setSharable_data() const
-{
-}
-
-template<typename T> void tst_QVector::setSharable() const
-{
-}
-#endif
-
-void tst_QVector::setSharableInt_data()
-{
-    setSharable_data<int>();
-}
-
-void tst_QVector::setSharableMovable_data()
-{
-    setSharable_data<Movable>();
-}
-
-void tst_QVector::setSharableCustom_data()
-{
-    setSharable_data<Custom>();
-}
-
-void tst_QVector::setSharableInt()
-{
-    setSharable<int>();
-}
-
-void tst_QVector::setSharableMovable()
-{
-    const int instancesCount = Movable::counter.loadAcquire();
-    setSharable<Movable>();
-    QCOMPARE(instancesCount, Movable::counter.loadAcquire());
-}
-
-void tst_QVector::setSharableCustom()
-{
-    const int instancesCount = Custom::counter.loadAcquire();
-    setSharable<Custom>();
-    QCOMPARE(instancesCount, Custom::counter.loadAcquire());
-}
-
 template<typename T>
 void tst_QVector::detach() const
 {
@@ -2791,7 +2402,7 @@ void tst_QVector::detach() const
         // detach an empty vector
         QVector<T> v;
         v.detach();
-        QVERIFY(v.isDetached());
+        QVERIFY(!v.isDetached());
         QCOMPARE(v.size(), 0);
         QCOMPARE(v.capacity(), 0);
     }
@@ -2801,7 +2412,7 @@ void tst_QVector::detach() const
         QVector<T> ref(v);
         QVERIFY(!v.isDetached());
         v.detach();
-        QVERIFY(v.isDetached());
+        QVERIFY(!v.isDetached());
         QCOMPARE(v.size(), 0);
         QCOMPARE(v.capacity(), 0);
     }
@@ -3048,5 +2659,172 @@ void tst_QVector::swapItemsAt() const
     QCOMPARE(copy.at(2), 2);
 }
 
+void tst_QVector::emplaceInt()
+{
+    emplaceImpl<int>();
+}
+
+void tst_QVector::emplaceCustom()
+{
+    emplaceImpl<Custom>();
+}
+
+void tst_QVector::emplaceMovable()
+{
+    emplaceImpl<Movable>();
+}
+
+void tst_QVector::emplaceConsistentWithStdVectorInt()
+{
+    emplaceConsistentWithStdVectorImpl<int>();
+}
+
+void tst_QVector::emplaceConsistentWithStdVectorCustom()
+{
+    emplaceConsistentWithStdVectorImpl<Custom>();
+}
+
+void tst_QVector::emplaceConsistentWithStdVectorMovable()
+{
+    emplaceConsistentWithStdVectorImpl<Movable>();
+}
+
+void tst_QVector::emplaceReturnsIterator()
+{
+    QVector<Movable> vec;
+
+    vec.emplace(0, 'k')->i = 'p';
+
+    QCOMPARE(vec[0].i, 'p');
+}
+
+void tst_QVector::emplaceBack()
+{
+    QScopedValueRollback<QAtomicInt> rollback(Movable::counter, 0);
+
+    QVector<Movable> vec;
+
+    vec.emplaceBack('k');
+
+    QCOMPARE(Movable::counter, 1);
+}
+
+void tst_QVector::emplaceBackReturnsRef()
+{
+    QVector<Movable> vec;
+
+    vec.emplaceBack('k').i = 'p';
+
+    QCOMPARE(vec.at(0).i, 'p');
+}
+
+void tst_QVector::emplaceWithElementFromTheSameContainer()
+{
+    QFETCH(int, elementPos);
+    QFETCH(int, insertPos);
+    QFETCH(bool, doCopy);
+
+    QVector<QString> vec {"a", "b", "c", "d", "e"};
+    const QString e = vec[elementPos];
+
+    if (doCopy)
+        vec.emplace(insertPos, vec[elementPos]);
+    else
+        vec.emplace(insertPos, std::move(vec[elementPos]));
+
+    QCOMPARE(vec[insertPos], e);
+}
+
+void tst_QVector::emplaceWithElementFromTheSameContainer_data()
+{
+    QTest::addColumn<int>("elementPos");
+    QTest::addColumn<int>("insertPos");
+    QTest::addColumn<bool>("doCopy");
+
+    for (int i = 0; i < 2; ++i) {
+        const bool doCopy = i == 0;
+        const char *opName = doCopy ? "copy" : "move";
+
+        QTest::addRow("%s: begin  -> end"   , opName) << 0 << 5 << doCopy;
+        QTest::addRow("%s: begin  -> middle", opName) << 0 << 2 << doCopy;
+        QTest::addRow("%s: middle -> begin" , opName) << 2 << 0 << doCopy;
+        QTest::addRow("%s: middle -> end"   , opName) << 2 << 5 << doCopy;
+        QTest::addRow("%s: end    -> middle", opName) << 4 << 2 << doCopy;
+        QTest::addRow("%s: end    -> begin" , opName) << 4 << 0 << doCopy;
+    }
+}
+
+template<typename T>
+void tst_QVector::emplaceImpl() const
+{
+    QVector<T> vec {'a', 'b', 'c', 'd'};
+
+    vec.emplace(2, 'k');
+
+    QCOMPARE(vec[2], T('k'));
+}
+
+template <class T>
+static void vecEq(const QVector<T> &qVec, const std::vector<T> &stdVec)
+{
+    QCOMPARE(std::size_t(qVec.size()), stdVec.size());
+    QVERIFY(std::equal(qVec.begin(), qVec.end(), stdVec.begin(), stdVec.end()));
+}
+
+template <class T>
+static void squeezeVec(QVector<T> &qVec, std::vector<T> &stdVec)
+{
+    qVec.squeeze();
+    stdVec.shrink_to_fit();
+}
+
+template<typename T>
+void tst_QVector::emplaceConsistentWithStdVectorImpl() const
+{
+    QVector<T> qVec {'a', 'b', 'c', 'd', 'e'};
+    std::vector<T> stdVec {'a', 'b', 'c', 'd', 'e'};
+    vecEq(qVec, stdVec);
+
+    qVec.emplaceBack('f');
+    stdVec.emplace_back('f');
+    vecEq(qVec, stdVec);
+
+    qVec.emplace(3, 'g');
+    stdVec.emplace(stdVec.begin() + 3, 'g');
+    vecEq(qVec, stdVec);
+
+    qVec.emplaceBack(std::move(qVec[0]));
+    stdVec.emplace_back(std::move(stdVec[0]));
+    vecEq(qVec, stdVec);
+
+    squeezeVec(qVec, stdVec);
+
+    qVec.emplaceBack(std::move(qVec[1]));
+    stdVec.emplace_back(std::move(stdVec[1]));
+    vecEq(qVec, stdVec);
+
+    squeezeVec(qVec, stdVec);
+
+    qVec.emplace(3, std::move(qVec[5]));
+    stdVec.emplace(stdVec.begin() + 3, std::move(stdVec[5]));
+    vecEq(qVec, stdVec);
+
+    qVec.emplaceBack(qVec[3]);
+    stdVec.emplace_back(stdVec[3]);
+    vecEq(qVec, stdVec);
+
+    squeezeVec(qVec, stdVec);
+
+    qVec.emplaceBack(qVec[4]);
+    stdVec.emplace_back(stdVec[4]);
+    vecEq(qVec, stdVec);
+
+    squeezeVec(qVec, stdVec);
+
+    qVec.emplace(5, qVec[7]);
+    stdVec.emplace(stdVec.begin() + 5, stdVec[7]);
+    vecEq(qVec, stdVec);
+}
+
 QTEST_MAIN(tst_QVector)
 #include "tst_qvector.moc"
diff --git a/tests/auto/corelib/tools/qvector_strictiterators/qvector_strictiterators.pro b/tests/auto/corelib/tools/qvector_strictiterators/qvector_strictiterators.pro
deleted file mode 100644
index d6cad86aac..0000000000
--- a/tests/auto/corelib/tools/qvector_strictiterators/qvector_strictiterators.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-include(../qvector/qvector.pro)
-TARGET = tst_qvector_strictiterators
-DEFINES += QT_STRICT_ITERATORS=1 tst_QVector=tst_QVector_StrictIterators
diff --git a/tests/auto/corelib/tools/qversionnumber/tst_qversionnumber.cpp b/tests/auto/corelib/tools/qversionnumber/tst_qversionnumber.cpp
index 7c4d1071ce..928bd365fd 100644
--- a/tests/auto/corelib/tools/qversionnumber/tst_qversionnumber.cpp
+++ b/tests/auto/corelib/tools/qversionnumber/tst_qversionnumber.cpp
@@ -81,6 +81,10 @@ private slots:
     void serialize();
     void moveSemantics();
     void qtVersion();
+    void qTypeRevision_data();
+    void qTypeRevision();
+    void qTypeRevisionTypes();
+    void qTypeRevisionComparison();
 };
 
 void tst_QVersionNumber::singleInstanceData()
@@ -645,6 +649,153 @@ void tst_QVersionNumber::qtVersion()
     QCOMPARE(v.toString(), QString(qVersion()));
 }
 
+template<typename Integer>
+void compileTestRevisionMajorMinor()
+{
+    const Integer major = 8;
+    const Integer minor = 4;
+
+    const QTypeRevision r2 = QTypeRevision::fromVersion(major, minor);
+    QCOMPARE(r2.majorVersion(), 8);
+    QCOMPARE(r2.minorVersion(), 4);
+
+    const QTypeRevision r3 = QTypeRevision::fromMajorVersion(major);
+    QCOMPARE(r3.majorVersion(), 8);
+    QVERIFY(!r3.hasMinorVersion());
+
+    const QTypeRevision r4 = QTypeRevision::fromMinorVersion(minor);
+    QVERIFY(!r4.hasMajorVersion());
+    QCOMPARE(r4.minorVersion(), 4);
+}
+
+
+template<typename Integer>
+void compileTestRevision()
+{
+    if (std::is_signed<Integer>::value)
+        compileTestRevision<typename QIntegerForSize<sizeof(Integer) / 2>::Signed>();
+    else
+        compileTestRevision<typename QIntegerForSize<sizeof(Integer) / 2>::Unsigned>();
+
+    const Integer value = 0x0510;
+    const QTypeRevision r = QTypeRevision::fromEncodedVersion(value);
+
+    QCOMPARE(r.majorVersion(), 5);
+    QCOMPARE(r.minorVersion(), 16);
+    QCOMPARE(r.toEncodedVersion<Integer>(), value);
+
+    compileTestRevisionMajorMinor<Integer>();
+}
+
+template<>
+void compileTestRevision<qint16>()
+{
+    compileTestRevisionMajorMinor<quint8>();
+}
+
+template<>
+void compileTestRevision<quint8>()
+{
+    compileTestRevisionMajorMinor<quint8>();
+}
+
+template<>
+void compileTestRevision<qint8>()
+{
+    compileTestRevisionMajorMinor<qint8>();
+}
+
+void tst_QVersionNumber::qTypeRevision_data()
+{
+    QTest::addColumn<QTypeRevision>("revision");
+    QTest::addColumn<bool>("valid");
+    QTest::addColumn<int>("major");
+    QTest::addColumn<int>("minor");
+
+    QTest::addRow("Qt revision") << QTypeRevision::fromVersion(QT_VERSION_MAJOR, QT_VERSION_MINOR)
+                                 << true << QT_VERSION_MAJOR << QT_VERSION_MINOR;
+    QTest::addRow("invalid")     << QTypeRevision() << false << 0xff << 0xff;
+    QTest::addRow("major")       << QTypeRevision::fromMajorVersion(6) << true << 6 << 0xff;
+    QTest::addRow("minor")       << QTypeRevision::fromMinorVersion(15) << true << 0xff << 15;
+    QTest::addRow("zero")        << QTypeRevision::fromVersion(0, 0) << true << 0 << 0;
+
+    // We're intentionally not testing negative numbers.
+    // There are asserts against negative numbers in QTypeRevision.
+    // You must not pass them as major or minor versions, or values.
+}
+
+void tst_QVersionNumber::qTypeRevision()
+{
+    const QTypeRevision other = QTypeRevision::fromVersion(127, 128);
+
+    QFETCH(QTypeRevision, revision);
+
+    QFETCH(bool, valid);
+    QFETCH(int, major);
+    QFETCH(int, minor);
+
+    QCOMPARE(revision.isValid(), valid);
+    QCOMPARE(revision.majorVersion(), major);
+    QCOMPARE(revision.minorVersion(), minor);
+
+    QCOMPARE(revision.hasMajorVersion(), QTypeRevision::isValidSegment(major));
+    QCOMPARE(revision.hasMinorVersion(), QTypeRevision::isValidSegment(minor));
+
+    const QTypeRevision copy = QTypeRevision::fromEncodedVersion(revision.toEncodedVersion<int>());
+    QCOMPARE(copy, revision);
+
+    QVERIFY(revision != other);
+    QVERIFY(copy != other);
+}
+
+void tst_QVersionNumber::qTypeRevisionTypes()
+{
+    compileTestRevision<quint64>();
+    compileTestRevision<qint64>();
+
+    QVERIFY(!QTypeRevision::isValidSegment(0xff));
+    QVERIFY(!QTypeRevision::isValidSegment(-1));
+
+    const QTypeRevision maxRevision = QTypeRevision::fromVersion(254, 254);
+    QVERIFY(maxRevision.hasMajorVersion());
+    QVERIFY(maxRevision.hasMinorVersion());
+}
+
+void tst_QVersionNumber::qTypeRevisionComparison()
+{
+    const QTypeRevision revisions[] = {
+        QTypeRevision::zero(),
+        QTypeRevision::fromMajorVersion(0),
+        QTypeRevision::fromVersion(0, 1),
+        QTypeRevision::fromVersion(0, 20),
+        QTypeRevision::fromMinorVersion(0),
+        QTypeRevision(),
+        QTypeRevision::fromMinorVersion(1),
+        QTypeRevision::fromMinorVersion(20),
+        QTypeRevision::fromVersion(1, 0),
+        QTypeRevision::fromMajorVersion(1),
+        QTypeRevision::fromVersion(1, 1),
+        QTypeRevision::fromVersion(1, 20),
+        QTypeRevision::fromVersion(20, 0),
+        QTypeRevision::fromMajorVersion(20),
+        QTypeRevision::fromVersion(20, 1),
+        QTypeRevision::fromVersion(20, 20),
+    };
+
+    const int length = sizeof(revisions) / sizeof(QTypeRevision);
+
+    for (int i = 0; i < length; ++i) {
+        for (int j = 0; j < length; ++j) {
+            QCOMPARE(revisions[i] == revisions[j], i == j);
+            QCOMPARE(revisions[i] != revisions[j], i != j);
+            QCOMPARE(revisions[i] < revisions[j], i < j);
+            QCOMPARE(revisions[i] > revisions[j], i > j);
+            QCOMPARE(revisions[i] <= revisions[j], i <= j);
+            QCOMPARE(revisions[i] >= revisions[j], i >= j);
+        }
+    }
+}
+
 QTEST_APPLESS_MAIN(tst_QVersionNumber)
 
 #include "tst_qversionnumber.moc"
diff --git a/tests/auto/corelib/tools/tools.pro b/tests/auto/corelib/tools/tools.pro
index 49b2a1f075..e51be90100 100644
--- a/tests/auto/corelib/tools/tools.pro
+++ b/tests/auto/corelib/tools/tools.pro
@@ -4,7 +4,6 @@ SUBDIRS=\
     containerapisymmetry \
     qalgorithms \
     qarraydata \
-    qarraydata_strictiterators \
     qbitarray \
     qcache \
     qcommandlineparser \
@@ -12,17 +11,13 @@ SUBDIRS=\
     qcryptographichash \
     qeasingcurve \
     qexplicitlyshareddatapointer \
+    qflatmap \
     qfreelist \
     qhash \
-    qhash_strictiterators \
     qhashfunctions \
     qline \
-    qlinkedlist \
-    qlist \
-    qlist_strictiterators \
     qmakearray \
     qmap \
-    qmap_strictiterators \
     qmargins \
     qmessageauthenticationcode \
     qoffsetstringarray \
@@ -43,7 +38,6 @@ SUBDIRS=\
     qtimeline \
     qvarlengtharray \
     qvector \
-    qvector_strictiterators \
     qversionnumber
 
 darwin: SUBDIRS += qmacautoreleasepool
diff --git a/tests/auto/dbus/CMakeLists.txt b/tests/auto/dbus/CMakeLists.txt
new file mode 100644
index 0000000000..1b5022454a
--- /dev/null
+++ b/tests/auto/dbus/CMakeLists.txt
@@ -0,0 +1,29 @@
+# Generated from dbus.pro.
+
+add_subdirectory(qdbusconnection_delayed)
+add_subdirectory(qdbusconnection)
+add_subdirectory(qdbusconnection_no_app)
+add_subdirectory(qdbusconnection_no_bus)
+add_subdirectory(qdbusconnection_no_libdbus)
+add_subdirectory(qdbusconnection_spyhook)
+add_subdirectory(qdbuscontext)
+add_subdirectory(qdbuslocalcalls)
+add_subdirectory(qdbusmetaobject)
+add_subdirectory(qdbusmetatype)
+add_subdirectory(qdbuspendingcall)
+add_subdirectory(qdbuspendingreply)
+add_subdirectory(qdbusreply)
+add_subdirectory(qdbusservicewatcher)
+add_subdirectory(qdbustype)
+add_subdirectory(qdbusthreading)
+if(QT_FEATURE_process)
+    add_subdirectory(qdbusabstractadaptor)
+    add_subdirectory(qdbusabstractinterface)
+    add_subdirectory(qdbusinterface)
+endif()
+if(QT_FEATURE_private_tests AND QT_FEATURE_process)
+    add_subdirectory(qdbusmarshall)
+endif()
+if(TARGET Qt::Xml)
+    add_subdirectory(qdbusxmlparser)
+endif()
diff --git a/tests/auto/dbus/qdbusabstractadaptor/CMakeLists.txt b/tests/auto/dbus/qdbusabstractadaptor/CMakeLists.txt
new file mode 100644
index 0000000000..a97accb925
--- /dev/null
+++ b/tests/auto/dbus/qdbusabstractadaptor/CMakeLists.txt
@@ -0,0 +1,14 @@
+
+# Generated from qdbusabstractadaptor.pro.
+
+add_subdirectory(qmyserver)
+
+add_qt_test(tst_qdbusabstractadaptor
+    SOURCES
+        myobject.h
+        tst_qdbusabstractadaptor.cpp
+    LIBRARIES
+        Qt::CorePrivate
+        Qt::DBus
+)
+
diff --git a/tests/auto/dbus/qdbusabstractadaptor/qmyserver/.prev_CMakeLists.txt b/tests/auto/dbus/qdbusabstractadaptor/qmyserver/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..caea7b1e64
--- /dev/null
+++ b/tests/auto/dbus/qdbusabstractadaptor/qmyserver/.prev_CMakeLists.txt
@@ -0,0 +1,14 @@
+# Generated from qmyserver.pro.
+
+#####################################################################
+## qmyserver Binary:
+#####################################################################
+
+add_qt_executable(qmyserver
+    OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
+    SOURCES
+        ../myobject.h
+        qmyserver.cpp
+    PUBLIC_LIBRARIES
+        Qt::DBus
+)
diff --git a/tests/auto/dbus/qdbusabstractadaptor/qmyserver/CMakeLists.txt b/tests/auto/dbus/qdbusabstractadaptor/qmyserver/CMakeLists.txt
new file mode 100644
index 0000000000..839b952591
--- /dev/null
+++ b/tests/auto/dbus/qdbusabstractadaptor/qmyserver/CMakeLists.txt
@@ -0,0 +1,15 @@
+# Generated from qmyserver.pro.
+
+#####################################################################
+## qmyserver Binary:
+#####################################################################
+
+add_qt_executable(qmyserver
+    OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
+    NO_INSTALL # special case
+    SOURCES
+        ../myobject.h
+        qmyserver.cpp
+    PUBLIC_LIBRARIES
+        Qt::DBus
+)
diff --git a/tests/auto/dbus/qdbusabstractinterface/CMakeLists.txt b/tests/auto/dbus/qdbusabstractinterface/CMakeLists.txt
new file mode 100644
index 0000000000..facac1a7fc
--- /dev/null
+++ b/tests/auto/dbus/qdbusabstractinterface/CMakeLists.txt
@@ -0,0 +1,21 @@
+# Generated from qdbusabstractinterface.pro.
+
+add_subdirectory(qpinger)
+
+add_qt_test(tst_qdbusabstractinterface
+    SOURCES
+        interface.cpp
+        tst_qdbusabstractinterface.cpp
+    LIBRARIES
+        Qt::Core
+        Qt::DBus
+)
+
+extend_target(tst_qdbusabstractinterface
+    DBUS_INTERFACE_SOURCES
+        org.qtproject.QtDBus.Pinger.xml
+    DBUS_INTERFACE_BASENAME
+        pinger_interface
+    DBUS_INTERFACE_FLAGS
+        -i interface.h
+)
diff --git a/tests/auto/dbus/qdbusabstractinterface/qdbusabstractinterface/.prev_CMakeLists.txt b/tests/auto/dbus/qdbusabstractinterface/qdbusabstractinterface/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..ee5a7c4003
--- /dev/null
+++ b/tests/auto/dbus/qdbusabstractinterface/qdbusabstractinterface/.prev_CMakeLists.txt
@@ -0,0 +1,18 @@
+# Generated from qdbusabstractinterface.pro.
+
+#####################################################################
+## tst_qdbusabstractinterface Test:
+#####################################################################
+
+add_qt_test(tst_qdbusabstractinterface
+    OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../"
+    SOURCES
+        ../interface.cpp ../interface.h
+        ../tst_qdbusabstractinterface.cpp
+    DBUS_INTERFACE_SOURCES
+        ../org.qtproject.QtDBus.Pinger.xml
+    DBUS_INTERFACE_FLAGS
+        "-i" "../interface.h"
+    PUBLIC_LIBRARIES
+        Qt::DBus
+)
diff --git a/tests/auto/dbus/qdbusabstractinterface/qdbusabstractinterface/CMakeLists.txt b/tests/auto/dbus/qdbusabstractinterface/qdbusabstractinterface/CMakeLists.txt
new file mode 100644
index 0000000000..3df1ff8177
--- /dev/null
+++ b/tests/auto/dbus/qdbusabstractinterface/qdbusabstractinterface/CMakeLists.txt
@@ -0,0 +1,9 @@
+# Generated from qdbusabstractinterface.pro.
+
+#####################################################################
+## tst_qdbusabstractinterface Test:
+#####################################################################
+# special case begin
+# this test can not be generated here. It needs to be set up in the
+# parent directory
+# special case end
diff --git a/tests/auto/dbus/qdbusabstractinterface/qpinger/.prev_CMakeLists.txt b/tests/auto/dbus/qdbusabstractinterface/qpinger/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..4e2b5fe567
--- /dev/null
+++ b/tests/auto/dbus/qdbusabstractinterface/qpinger/.prev_CMakeLists.txt
@@ -0,0 +1,14 @@
+# Generated from qpinger.pro.
+
+#####################################################################
+## qpinger Binary:
+#####################################################################
+
+add_qt_executable(qpinger
+    OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
+    SOURCES
+        ../interface.cpp ../interface.h
+        qpinger.cpp
+    PUBLIC_LIBRARIES
+        Qt::DBus
+)
diff --git a/tests/auto/dbus/qdbusabstractinterface/qpinger/CMakeLists.txt b/tests/auto/dbus/qdbusabstractinterface/qpinger/CMakeLists.txt
new file mode 100644
index 0000000000..47e3cfbb69
--- /dev/null
+++ b/tests/auto/dbus/qdbusabstractinterface/qpinger/CMakeLists.txt
@@ -0,0 +1,15 @@
+# Generated from qpinger.pro.
+
+#####################################################################
+## qpinger Binary:
+#####################################################################
+
+add_qt_executable(qpinger
+    OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
+    NO_INSTALL # special case
+    SOURCES
+        ../interface.cpp ../interface.h
+        qpinger.cpp
+    PUBLIC_LIBRARIES
+        Qt::DBus
+)
diff --git a/tests/auto/dbus/qdbusconnection/CMakeLists.txt b/tests/auto/dbus/qdbusconnection/CMakeLists.txt
new file mode 100644
index 0000000000..b1927e5d10
--- /dev/null
+++ b/tests/auto/dbus/qdbusconnection/CMakeLists.txt
@@ -0,0 +1,12 @@
+# Generated from qdbusconnection.pro.
+
+#####################################################################
+## tst_qdbusconnection Test:
+#####################################################################
+
+add_qt_test(tst_qdbusconnection
+    SOURCES
+        tst_qdbusconnection.cpp tst_qdbusconnection.h
+    PUBLIC_LIBRARIES
+        Qt::DBus
+)
diff --git a/tests/auto/dbus/qdbusconnection_delayed/CMakeLists.txt b/tests/auto/dbus/qdbusconnection_delayed/CMakeLists.txt
new file mode 100644
index 0000000000..0602c67fbb
--- /dev/null
+++ b/tests/auto/dbus/qdbusconnection_delayed/CMakeLists.txt
@@ -0,0 +1,14 @@
+# Generated from qdbusconnection_delayed.pro.
+
+#####################################################################
+## tst_qdbusconnection_delayed Test:
+#####################################################################
+
+add_qt_test(tst_qdbusconnection_delayed
+    SOURCES
+        tst_qdbusconnection_delayed.cpp
+    DEFINES
+        SRCDIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/\\\"
+    PUBLIC_LIBRARIES
+        Qt::DBus
+)
diff --git a/tests/auto/dbus/qdbusconnection_no_app/CMakeLists.txt b/tests/auto/dbus/qdbusconnection_no_app/CMakeLists.txt
new file mode 100644
index 0000000000..061c59579d
--- /dev/null
+++ b/tests/auto/dbus/qdbusconnection_no_app/CMakeLists.txt
@@ -0,0 +1,16 @@
+# Generated from qdbusconnection_no_app.pro.
+
+#####################################################################
+## tst_qdbusconnection_no_app Test:
+#####################################################################
+
+add_qt_test(tst_qdbusconnection_no_app
+    SOURCES
+        ../qdbusconnection/tst_qdbusconnection.h
+        tst_qdbusconnection_no_app.cpp
+    DEFINES
+        SRCDIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/\\\"
+        tst_QDBusConnection=tst_QDBusConnection_NoApplication
+    PUBLIC_LIBRARIES
+        Qt::DBus
+)
diff --git a/tests/auto/dbus/qdbusconnection_no_bus/CMakeLists.txt b/tests/auto/dbus/qdbusconnection_no_bus/CMakeLists.txt
new file mode 100644
index 0000000000..b05ac03b2d
--- /dev/null
+++ b/tests/auto/dbus/qdbusconnection_no_bus/CMakeLists.txt
@@ -0,0 +1,12 @@
+# Generated from qdbusconnection_no_bus.pro.
+
+#####################################################################
+## tst_qdbusconnection_no_bus Test:
+#####################################################################
+
+add_qt_test(tst_qdbusconnection_no_bus
+    SOURCES
+        tst_qdbusconnection_no_bus.cpp
+    PUBLIC_LIBRARIES
+        Qt::DBus
+)
diff --git a/tests/auto/dbus/qdbusconnection_no_libdbus/CMakeLists.txt b/tests/auto/dbus/qdbusconnection_no_libdbus/CMakeLists.txt
new file mode 100644
index 0000000000..c372f16d12
--- /dev/null
+++ b/tests/auto/dbus/qdbusconnection_no_libdbus/CMakeLists.txt
@@ -0,0 +1,15 @@
+# Generated from qdbusconnection_no_libdbus.pro.
+
+#####################################################################
+## tst_qdbusconnection_no_libdbus Test:
+#####################################################################
+
+add_qt_test(tst_qdbusconnection_no_libdbus
+    SOURCES
+        ../qdbusconnection_no_bus/tst_qdbusconnection_no_bus.cpp
+    DEFINES
+        SIMULATE_LOAD_FAIL
+        tst_QDBusConnectionNoBus=tst_QDBusConnectionNoLibDBus1
+    PUBLIC_LIBRARIES
+        Qt::DBus
+)
diff --git a/tests/auto/dbus/qdbusconnection_no_libdbus/tst_qdbusconnection_no_libdbus.cpp b/tests/auto/dbus/qdbusconnection_no_libdbus/tst_qdbusconnection_no_libdbus.cpp
new file mode 100644
index 0000000000..e93b8aa609
--- /dev/null
+++ b/tests/auto/dbus/qdbusconnection_no_libdbus/tst_qdbusconnection_no_libdbus.cpp
@@ -0,0 +1,73 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:GPL-EXCEPT$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 as published by the Free Software
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#include <qcoreapplication.h>
+#include <qdebug.h>
+
+#include <QtTest/QtTest>
+#include <QtDBus/QtDBus>
+
+#include <stdlib.h>
+
+/* This test uses an appless main, to ensure that no D-Bus stuff is implicitly done
+   It also sets the magic "QT_SIMULATE_DBUS_LIBFAIL" env variable, that is only available
+   in developer builds. That env variable simulates a D-Bus library load fail.
+
+   In no case should the QDBus module crash because D-Bus libs couldn't be loaded */
+
+class tst_QDBusConnectionNoBus : public QObject
+{
+    Q_OBJECT
+
+public:
+    tst_QDBusConnectionNoBus()
+    {
+        qputenv("DBUS_SESSION_BUS_ADDRESS", "unix:abstract=/tmp/does_not_exist");
+#ifdef SIMULATE_LOAD_FAIL
+        qputenv("QT_SIMULATE_DBUS_LIBFAIL", "1");
+#endif
+    }
+
+private slots:
+    void connectToBus();
+};
+
+
+void tst_QDBusConnectionNoBus::connectToBus()
+{
+    int argc = 0;
+    QCoreApplication app(argc, 0);
+
+    QDBusConnection con = QDBusConnection::sessionBus();
+
+    QVERIFY(!con.isConnected()); // if we didn't crash here, the test passed :)
+}
+
+QTEST_APPLESS_MAIN(tst_QDBusConnectionNoBus)
+
+#include "tst_qdbusconnection_no_libdbus.moc"
+
diff --git a/tests/auto/dbus/qdbusconnection_spyhook/CMakeLists.txt b/tests/auto/dbus/qdbusconnection_spyhook/CMakeLists.txt
new file mode 100644
index 0000000000..0005c36c36
--- /dev/null
+++ b/tests/auto/dbus/qdbusconnection_spyhook/CMakeLists.txt
@@ -0,0 +1,16 @@
+# Generated from qdbusconnection_spyhook.pro.
+
+#####################################################################
+## tst_qdbusconnection_spyhook Test:
+#####################################################################
+
+add_qt_test(tst_qdbusconnection_spyhook
+    SOURCES
+        ../qdbusconnection/tst_qdbusconnection.h
+        tst_qdbusconnection_spyhook.cpp
+    DEFINES
+        SRCDIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/\\\"
+        tst_QDBusConnection=tst_QDBusConnection_SpyHook
+    PUBLIC_LIBRARIES
+        Qt::DBus
+)
diff --git a/tests/auto/dbus/qdbuscontext/CMakeLists.txt b/tests/auto/dbus/qdbuscontext/CMakeLists.txt
new file mode 100644
index 0000000000..d8adf50bd2
--- /dev/null
+++ b/tests/auto/dbus/qdbuscontext/CMakeLists.txt
@@ -0,0 +1,12 @@
+# Generated from qdbuscontext.pro.
+
+#####################################################################
+## tst_qdbuscontext Test:
+#####################################################################
+
+add_qt_test(tst_qdbuscontext
+    SOURCES
+        tst_qdbuscontext.cpp
+    PUBLIC_LIBRARIES
+        Qt::DBus
+)
diff --git a/tests/auto/dbus/qdbusinterface/CMakeLists.txt b/tests/auto/dbus/qdbusinterface/CMakeLists.txt
new file mode 100644
index 0000000000..c96944cd56
--- /dev/null
+++ b/tests/auto/dbus/qdbusinterface/CMakeLists.txt
@@ -0,0 +1,41 @@
+# Generated from qdbusinterface.pro.
+
+# special case begin
+add_subdirectory(qmyserver)
+
+#####################################################################
+## ../tst_qdbusinterface Test:
+#####################################################################
+
+add_qt_test(tst_qdbusinterface
+    SOURCES
+        myobject.h
+        tst_qdbusinterface.cpp
+    LIBRARIES
+        Qt::CorePrivate
+        Qt::DBusPrivate
+    PUBLIC_LIBRARIES
+        Qt::Core
+        Qt::DBus
+)
+
+#### Keys ignored in scope 1:.:.:qdbusinterface.pro:<TRUE>:
+# CONFIG = "testcase"
+# DESTDIR = "./"
+
+## Scopes:
+#####################################################################
+
+extend_target(tst_qdbusinterface CONDITION QT_FEATURE_dbus_linked
+    DEFINES
+        QT_LINKED_LIBDBUS
+    PUBLIC_LIBRARIES
+        dbus-1
+)
+
+extend_target(tst_qdbusinterface CONDITION NOT QT_FEATURE_dbus_linked
+    SOURCES
+        ../../../../src/dbus/qdbus_symbols.cpp
+)
+
+# special case end
diff --git a/tests/auto/dbus/qdbusinterface/qmyserver/.prev_CMakeLists.txt b/tests/auto/dbus/qdbusinterface/qmyserver/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..671403999b
--- /dev/null
+++ b/tests/auto/dbus/qdbusinterface/qmyserver/.prev_CMakeLists.txt
@@ -0,0 +1,14 @@
+# Generated from qmyserver.pro.
+
+#####################################################################
+## qmyserver_qdbusinterface Binary:
+#####################################################################
+
+add_qt_executable(qmyserver_qdbusinterface
+    OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
+    SOURCES
+        ../myobject.h
+        qmyserver.cpp
+    PUBLIC_LIBRARIES
+        Qt::DBus
+)
diff --git a/tests/auto/dbus/qdbusinterface/qmyserver/CMakeLists.txt b/tests/auto/dbus/qdbusinterface/qmyserver/CMakeLists.txt
new file mode 100644
index 0000000000..de633f2aa9
--- /dev/null
+++ b/tests/auto/dbus/qdbusinterface/qmyserver/CMakeLists.txt
@@ -0,0 +1,15 @@
+# Generated from qmyserver.pro.
+
+#####################################################################
+## qmyserver_qdbusinterface Binary:
+#####################################################################
+
+add_qt_executable(qmyserver_qdbusinterface
+    OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
+    NO_INSTALL # special case
+    SOURCES
+        ../myobject.h
+        qmyserver.cpp
+    PUBLIC_LIBRARIES
+        Qt::DBus
+)
diff --git a/tests/auto/dbus/qdbusinterface/qmyserver/qmyserver.pro b/tests/auto/dbus/qdbusinterface/qmyserver/qmyserver.pro
index 8f2d261899..406f3d7d36 100644
--- a/tests/auto/dbus/qdbusinterface/qmyserver/qmyserver.pro
+++ b/tests/auto/dbus/qdbusinterface/qmyserver/qmyserver.pro
@@ -1,6 +1,6 @@
 SOURCES = qmyserver.cpp
 HEADERS = ../myobject.h
-TARGET = qmyserver
+TARGET = qmyserver_qdbusinterface
 DESTDIR = ./
 QT = core dbus
 CONFIG -= app_bundle
diff --git a/tests/auto/dbus/qdbusinterface/tst_qdbusinterface.cpp b/tests/auto/dbus/qdbusinterface/tst_qdbusinterface.cpp
index 05480c6dd2..e416266b5f 100644
--- a/tests/auto/dbus/qdbusinterface/tst_qdbusinterface.cpp
+++ b/tests/auto/dbus/qdbusinterface/tst_qdbusinterface.cpp
@@ -31,6 +31,7 @@
 #include <qcoreapplication.h>
 #include <qmetatype.h>
 #include <QtTest/QtTest>
+#include <QtCore/qregularexpression.h>
 #include <QtCore/qvariant.h>
 #include <QtDBus/QtDBus>
 #include <QtDBus/private/qdbus_symbols_p.h>
@@ -270,7 +271,7 @@ void tst_QDBusInterface::initTestCase()
 #  define EXE ""
 #endif
     proc.setProcessChannelMode(QProcess::ForwardedErrorChannel);
-    proc.start(QFINDTESTDATA("qmyserver/qmyserver" EXE));
+    proc.start(QFINDTESTDATA("qmyserver/qmyserver_qdbusinterface" EXE)); // FIXME CMake: This is most probably wrong now since the binary ends up in bin/ not in the build tree
     QVERIFY2(proc.waitForStarted(), qPrintable(proc.errorString()));
     QVERIFY(proc.waitForReadyRead());
 
@@ -451,14 +452,16 @@ void tst_QDBusInterface::introspectVirtualObject()
     QDBusMessage message = QDBusMessage::createMethodCall(con.baseService(), path, "org.freedesktop.DBus.Introspectable", "Introspect");
     QDBusMessage reply = con.call(message, QDBus::Block, 5000);
     QVERIFY(reply.arguments().at(0).toString().contains(
-        QRegExp("<node>.*zitroneneis.*<interface name=") ));
+            QRegularExpression("<node>.*zitroneneis.*<interface name=",
+                               QRegularExpression::DotMatchesEverythingOption)));
 
     QDBusMessage message2 = QDBusMessage::createMethodCall(con.baseService(), path + "/foo", "org.freedesktop.DBus.Introspectable", "Introspect");
     QDBusMessage reply2 = con.call(message2, QDBus::Block, 5000);
     QVERIFY(reply2.arguments().at(0).toString().contains(
-        QRegExp("<node>.*<interface name=\"org.qtproject.QtDBus.VirtualObject\">"
-                ".*<method name=\"klingeling\" />\n"
-                ".*</interface>.*<interface name=") ));
+            QRegularExpression("<node>.*<interface name=\"org.qtproject.QtDBus.VirtualObject\">"
+                               ".*<method name=\"klingeling\" />\n"
+                               ".*</interface>.*<interface name=",
+                               QRegularExpression::DotMatchesEverythingOption)));
 }
 
 void tst_QDBusInterface::callMethod()
diff --git a/tests/auto/dbus/qdbuslocalcalls/CMakeLists.txt b/tests/auto/dbus/qdbuslocalcalls/CMakeLists.txt
new file mode 100644
index 0000000000..c65b48f948
--- /dev/null
+++ b/tests/auto/dbus/qdbuslocalcalls/CMakeLists.txt
@@ -0,0 +1,12 @@
+# Generated from qdbuslocalcalls.pro.
+
+#####################################################################
+## tst_qdbuslocalcalls Test:
+#####################################################################
+
+add_qt_test(tst_qdbuslocalcalls
+    SOURCES
+        tst_qdbuslocalcalls.cpp
+    PUBLIC_LIBRARIES
+        Qt::DBus
+)
diff --git a/tests/auto/dbus/qdbusmarshall/CMakeLists.txt b/tests/auto/dbus/qdbusmarshall/CMakeLists.txt
new file mode 100644
index 0000000000..aabeae0f4a
--- /dev/null
+++ b/tests/auto/dbus/qdbusmarshall/CMakeLists.txt
@@ -0,0 +1,4 @@
+# Generated from qdbusmarshall.pro.
+
+add_subdirectory(qpong)
+add_subdirectory(qdbusmarshall)
diff --git a/tests/auto/dbus/qdbusmarshall/qdbusmarshall/.prev_CMakeLists.txt b/tests/auto/dbus/qdbusmarshall/qdbusmarshall/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..fc5f59990f
--- /dev/null
+++ b/tests/auto/dbus/qdbusmarshall/qdbusmarshall/.prev_CMakeLists.txt
@@ -0,0 +1,29 @@
+# Generated from qdbusmarshall.pro.
+
+#####################################################################
+## tst_qdbusmarshall Test:
+#####################################################################
+
+add_qt_test(tst_qdbusmarshall
+    OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../"
+    SOURCES
+        ../tst_qdbusmarshall.cpp
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::DBusPrivate
+)
+
+## Scopes:
+#####################################################################
+
+extend_target(tst_qdbusmarshall CONDITION QT_FEATURE_dbus_linked
+    DEFINES
+        QT_LINKED_LIBDBUS
+    PUBLIC_LIBRARIES
+        dbus-1
+)
+
+extend_target(tst_qdbusmarshall CONDITION NOT QT_FEATURE_dbus_linked
+    SOURCES
+        ../../../../../src/dbus/qdbus_symbols.cpp
+)
diff --git a/tests/auto/dbus/qdbusmarshall/qdbusmarshall/CMakeLists.txt b/tests/auto/dbus/qdbusmarshall/qdbusmarshall/CMakeLists.txt
new file mode 100644
index 0000000000..bd615ab900
--- /dev/null
+++ b/tests/auto/dbus/qdbusmarshall/qdbusmarshall/CMakeLists.txt
@@ -0,0 +1,33 @@
+# Generated from qdbusmarshall.pro.
+
+#####################################################################
+## tst_qdbusmarshall Test:
+#####################################################################
+
+add_qt_test(tst_qdbusmarshall
+    OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../"
+    SOURCES
+        ../tst_qdbusmarshall.cpp
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::DBusPrivate
+)
+
+## Scopes:
+#####################################################################
+
+# special case begin
+# This test case interacts with dbus code directly via the private
+# headers. The include path is also not exposed via Qt:DBus.
+# special case end
+extend_target(tst_qdbusmarshall CONDITION QT_FEATURE_dbus_linked
+    DEFINES
+        QT_LINKED_LIBDBUS
+    PUBLIC_LIBRARIES
+        dbus-1
+)
+
+extend_target(tst_qdbusmarshall CONDITION NOT QT_FEATURE_dbus_linked
+    SOURCES
+        ../../../../../src/dbus/qdbus_symbols.cpp
+)
diff --git a/tests/auto/dbus/qdbusmarshall/qpong/CMakeLists.txt b/tests/auto/dbus/qdbusmarshall/qpong/CMakeLists.txt
new file mode 100644
index 0000000000..e53c11aabe
--- /dev/null
+++ b/tests/auto/dbus/qdbusmarshall/qpong/CMakeLists.txt
@@ -0,0 +1,13 @@
+# Generated from qpong.pro.
+
+#####################################################################
+## qpong Binary:
+#####################################################################
+
+add_qt_executable(qpong
+    OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
+    SOURCES
+        qpong.cpp
+    PUBLIC_LIBRARIES
+        Qt::DBus
+)
diff --git a/tests/auto/dbus/qdbusmetaobject/CMakeLists.txt b/tests/auto/dbus/qdbusmetaobject/CMakeLists.txt
new file mode 100644
index 0000000000..31cf3aff44
--- /dev/null
+++ b/tests/auto/dbus/qdbusmetaobject/CMakeLists.txt
@@ -0,0 +1,12 @@
+# Generated from qdbusmetaobject.pro.
+
+#####################################################################
+## tst_qdbusmetaobject Test:
+#####################################################################
+
+add_qt_test(tst_qdbusmetaobject
+    SOURCES
+        tst_qdbusmetaobject.cpp
+    PUBLIC_LIBRARIES
+        Qt::DBusPrivate
+)
diff --git a/tests/auto/dbus/qdbusmetaobject/tst_qdbusmetaobject.cpp b/tests/auto/dbus/qdbusmetaobject/tst_qdbusmetaobject.cpp
index a4afae4b46..2a39a73a5a 100644
--- a/tests/auto/dbus/qdbusmetaobject/tst_qdbusmetaobject.cpp
+++ b/tests/auto/dbus/qdbusmetaobject/tst_qdbusmetaobject.cpp
@@ -394,7 +394,6 @@ void tst_QDBusMetaObject::types()
         QCOMPARE(constructed.name(), expected.name());
         QCOMPARE(constructed.parameterCount(), expected.parameterCount());
         QCOMPARE(constructed.parameterNames(), expected.parameterNames());
-        QCOMPARE(constructed.parameterTypes(), expected.parameterTypes());
         for (int j = 0; j < constructed.parameterCount(); ++j)
             QCOMPARE(constructed.parameterType(j), expected.parameterType(j));
         QCOMPARE(constructed.tag(), expected.tag());
diff --git a/tests/auto/dbus/qdbusmetatype/CMakeLists.txt b/tests/auto/dbus/qdbusmetatype/CMakeLists.txt
new file mode 100644
index 0000000000..1bc7871f8c
--- /dev/null
+++ b/tests/auto/dbus/qdbusmetatype/CMakeLists.txt
@@ -0,0 +1,12 @@
+# Generated from qdbusmetatype.pro.
+
+#####################################################################
+## tst_qdbusmetatype Test:
+#####################################################################
+
+add_qt_test(tst_qdbusmetatype
+    SOURCES
+        tst_qdbusmetatype.cpp
+    PUBLIC_LIBRARIES
+        Qt::DBus
+)
diff --git a/tests/auto/dbus/qdbusmetatype/tst_qdbusmetatype.cpp b/tests/auto/dbus/qdbusmetatype/tst_qdbusmetatype.cpp
index 4b926dcd05..ec3e71ac8f 100644
--- a/tests/auto/dbus/qdbusmetatype/tst_qdbusmetatype.cpp
+++ b/tests/auto/dbus/qdbusmetatype/tst_qdbusmetatype.cpp
@@ -402,7 +402,7 @@ void tst_QDBusMetaType::invalidTypes()
     else if (qstrcmp(QTest::currentDataTag(), "Invalid7") == 0)
         QTest::ignoreMessage(QtWarningMsg, "QDBusMarshaller: type `Invalid7' produces invalid D-BUS signature `()' (Did you forget to call beginStructure() ?)");
     else if (qstrcmp(QTest::currentDataTag(), "QList<Invalid0>") == 0)
-        QTest::ignoreMessage(QtWarningMsg, "QDBusMarshaller: type `QList<Invalid0>' produces invalid D-BUS signature `a' (Did you forget to call beginStructure() ?)");
+        QTest::ignoreMessage(QtWarningMsg, "QDBusMarshaller: type `QVector<Invalid0>' produces invalid D-BUS signature `a' (Did you forget to call beginStructure() ?)");
 
     staticTypes();
     staticTypes();              // run twice: the error messages should be printed once only
diff --git a/tests/auto/dbus/qdbuspendingcall/CMakeLists.txt b/tests/auto/dbus/qdbuspendingcall/CMakeLists.txt
new file mode 100644
index 0000000000..d432fd3f6c
--- /dev/null
+++ b/tests/auto/dbus/qdbuspendingcall/CMakeLists.txt
@@ -0,0 +1,12 @@
+# Generated from qdbuspendingcall.pro.
+
+#####################################################################
+## tst_qdbuspendingcall Test:
+#####################################################################
+
+add_qt_test(tst_qdbuspendingcall
+    SOURCES
+        tst_qdbuspendingcall.cpp
+    PUBLIC_LIBRARIES
+        Qt::DBus
+)
diff --git a/tests/auto/dbus/qdbuspendingreply/CMakeLists.txt b/tests/auto/dbus/qdbuspendingreply/CMakeLists.txt
new file mode 100644
index 0000000000..f6ff6afe8c
--- /dev/null
+++ b/tests/auto/dbus/qdbuspendingreply/CMakeLists.txt
@@ -0,0 +1,12 @@
+# Generated from qdbuspendingreply.pro.
+
+#####################################################################
+## tst_qdbuspendingreply Test:
+#####################################################################
+
+add_qt_test(tst_qdbuspendingreply
+    SOURCES
+        tst_qdbuspendingreply.cpp
+    PUBLIC_LIBRARIES
+        Qt::DBus
+)
diff --git a/tests/auto/dbus/qdbusreply/CMakeLists.txt b/tests/auto/dbus/qdbusreply/CMakeLists.txt
new file mode 100644
index 0000000000..11770e16d5
--- /dev/null
+++ b/tests/auto/dbus/qdbusreply/CMakeLists.txt
@@ -0,0 +1,12 @@
+# Generated from qdbusreply.pro.
+
+#####################################################################
+## tst_qdbusreply Test:
+#####################################################################
+
+add_qt_test(tst_qdbusreply
+    SOURCES
+        tst_qdbusreply.cpp
+    PUBLIC_LIBRARIES
+        Qt::DBus
+)
diff --git a/tests/auto/dbus/qdbusservicewatcher/CMakeLists.txt b/tests/auto/dbus/qdbusservicewatcher/CMakeLists.txt
new file mode 100644
index 0000000000..436629ab80
--- /dev/null
+++ b/tests/auto/dbus/qdbusservicewatcher/CMakeLists.txt
@@ -0,0 +1,12 @@
+# Generated from qdbusservicewatcher.pro.
+
+#####################################################################
+## tst_qdbusservicewatcher Test:
+#####################################################################
+
+add_qt_test(tst_qdbusservicewatcher
+    SOURCES
+        tst_qdbusservicewatcher.cpp
+    PUBLIC_LIBRARIES
+        Qt::DBus
+)
diff --git a/tests/auto/dbus/qdbusthreading/CMakeLists.txt b/tests/auto/dbus/qdbusthreading/CMakeLists.txt
new file mode 100644
index 0000000000..1c8f8a6053
--- /dev/null
+++ b/tests/auto/dbus/qdbusthreading/CMakeLists.txt
@@ -0,0 +1,12 @@
+# Generated from qdbusthreading.pro.
+
+#####################################################################
+## tst_qdbusthreading Test:
+#####################################################################
+
+add_qt_test(tst_qdbusthreading
+    SOURCES
+        tst_qdbusthreading.cpp
+    PUBLIC_LIBRARIES
+        Qt::DBus
+)
diff --git a/tests/auto/dbus/qdbustype/CMakeLists.txt b/tests/auto/dbus/qdbustype/CMakeLists.txt
new file mode 100644
index 0000000000..34456d6331
--- /dev/null
+++ b/tests/auto/dbus/qdbustype/CMakeLists.txt
@@ -0,0 +1,28 @@
+# Generated from qdbustype.pro.
+
+#####################################################################
+## tst_qdbustype Test:
+#####################################################################
+
+add_qt_test(tst_qdbustype
+    SOURCES
+        tst_qdbustype.cpp
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::DBusPrivate
+)
+
+## Scopes:
+#####################################################################
+
+extend_target(tst_qdbustype CONDITION QT_FEATURE_dbus_linked
+    DEFINES
+        QT_LINKED_LIBDBUS
+    PUBLIC_LIBRARIES
+        dbus-1
+)
+
+extend_target(tst_qdbustype CONDITION NOT QT_FEATURE_dbus_linked
+    SOURCES
+        ../../../../src/dbus/qdbus_symbols.cpp
+)
diff --git a/tests/auto/dbus/qdbusxmlparser/CMakeLists.txt b/tests/auto/dbus/qdbusxmlparser/CMakeLists.txt
new file mode 100644
index 0000000000..879f8d28e4
--- /dev/null
+++ b/tests/auto/dbus/qdbusxmlparser/CMakeLists.txt
@@ -0,0 +1,14 @@
+# Generated from qdbusxmlparser.pro.
+
+#####################################################################
+## tst_qdbusxmlparser Test:
+#####################################################################
+
+add_qt_test(tst_qdbusxmlparser
+    SOURCES
+        tst_qdbusxmlparser.cpp
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::DBusPrivate
+        Qt::Xml
+)
diff --git a/tests/auto/gui/.prev_CMakeLists.txt b/tests/auto/gui/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..8cbfa78aad
--- /dev/null
+++ b/tests/auto/gui/.prev_CMakeLists.txt
@@ -0,0 +1,19 @@
+# Generated from gui.pro.
+
+add_subdirectory(kernel)
+if(NOT APPLE_UIKIT)
+    add_subdirectory(image)
+    add_subdirectory(math3d)
+    add_subdirectory(painting)
+    add_subdirectory(text)
+    add_subdirectory(util)
+    add_subdirectory(itemmodels)
+    add_subdirectory(rhi)
+endif()
+if(QT_FEATURE_opengl AND NOT APPLE_UIKIT AND NOT WINRT)
+    add_subdirectory(qopenglconfig)
+    add_subdirectory(qopengl)
+endif()
+if(QT_FEATURE_vulkan AND NOT APPLE_UIKIT)
+    add_subdirectory(qvulkan)
+endif()
diff --git a/tests/auto/gui/CMakeLists.txt b/tests/auto/gui/CMakeLists.txt
new file mode 100644
index 0000000000..9a1312bd48
--- /dev/null
+++ b/tests/auto/gui/CMakeLists.txt
@@ -0,0 +1,19 @@
+# Generated from gui.pro.
+
+add_subdirectory(kernel)
+if(NOT APPLE_UIKIT)
+    add_subdirectory(image)
+    add_subdirectory(math3d)
+    add_subdirectory(painting)
+    add_subdirectory(text)
+    add_subdirectory(util)
+    add_subdirectory(itemmodels)
+    add_subdirectory(rhi)
+endif()
+if(QT_FEATURE_opengl AND NOT APPLE_UIKIT AND NOT WINRT)
+     add_subdirectory(qopenglconfig)
+     add_subdirectory(qopengl)
+endif()
+if(QT_FEATURE_vulkan AND NOT APPLE_UIKIT)
+    add_subdirectory(qvulkan)
+endif()
diff --git a/tests/auto/gui/image/CMakeLists.txt b/tests/auto/gui/image/CMakeLists.txt
new file mode 100644
index 0000000000..8ae016a8f8
--- /dev/null
+++ b/tests/auto/gui/image/CMakeLists.txt
@@ -0,0 +1,17 @@
+# Generated from image.pro.
+
+if(TARGET Qt::Network)
+    add_subdirectory(qimagereader)
+endif()
+add_subdirectory(qicoimageformat)
+add_subdirectory(qpixmap)
+add_subdirectory(qimage)
+add_subdirectory(qimageiohandler)
+add_subdirectory(qimagewriter)
+add_subdirectory(qmovie)
+add_subdirectory(qpicture)
+add_subdirectory(qicon)
+add_subdirectory(qiconhighdpi)
+if(QT_FEATURE_private_tests)
+    add_subdirectory(qpixmapcache)
+endif()
diff --git a/tests/auto/gui/image/qicoimageformat/CMakeLists.txt b/tests/auto/gui/image/qicoimageformat/CMakeLists.txt
new file mode 100644
index 0000000000..0c8393631a
--- /dev/null
+++ b/tests/auto/gui/image/qicoimageformat/CMakeLists.txt
@@ -0,0 +1,49 @@
+# Generated from qicoimageformat.pro.
+
+#####################################################################
+## tst_qicoimageformat Test:
+#####################################################################
+
+# Collect test data
+file(GLOB_RECURSE test_data_glob
+    RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+    icons/*)
+list(APPEND test_data ${test_data_glob})
+
+add_qt_test(tst_qicoimageformat
+    SOURCES
+        tst_qicoimageformat.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+    TESTDATA ${test_data}
+)
+
+## Scopes:
+#####################################################################
+
+if(ANDROID)
+    # Resources:
+    set(qicoimageformat_resource_files
+        "icons/invalid/35floppy.ico"
+        "icons/valid/35FLOPPY.ICO"
+        "icons/valid/AddPerfMon.ico"
+        "icons/valid/App.ico"
+        "icons/valid/Obj_N2_Internal_Mem.ico"
+        "icons/valid/Qt.ico"
+        "icons/valid/Status_Play.ico"
+        "icons/valid/TIMER01.ICO"
+        "icons/valid/WORLD.ico"
+        "icons/valid/WORLDH.ico"
+        "icons/valid/abcardWindow.ico"
+        "icons/valid/semitransparent.ico"
+        "icons/valid/trolltechlogo_tiny.ico"
+        "icons/valid/yellow.cur"
+    )
+
+    add_qt_resource(tst_qicoimageformat "qicoimageformat"
+        PREFIX
+            "/"
+        FILES
+            ${qicoimageformat_resource_files}
+    )
+endif()
diff --git a/tests/auto/gui/image/qicon/CMakeLists.txt b/tests/auto/gui/image/qicon/CMakeLists.txt
new file mode 100644
index 0000000000..81f5390d79
--- /dev/null
+++ b/tests/auto/gui/image/qicon/CMakeLists.txt
@@ -0,0 +1,94 @@
+# Generated from qicon.pro.
+
+#####################################################################
+## tst_qicon Test:
+#####################################################################
+
+# Collect test data
+file(GLOB_RECURSE test_data_glob
+    RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+    icons/*)
+list(APPEND test_data ${test_data_glob})
+file(GLOB_RECURSE test_data_glob
+    RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+    second_icons/*)
+list(APPEND test_data ${test_data_glob})
+file(GLOB_RECURSE test_data_glob
+    RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+    fallback_icons/*)
+list(APPEND test_data ${test_data_glob})
+file(GLOB_RECURSE test_data_glob
+    RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+    *.png)
+list(APPEND test_data ${test_data_glob})
+file(GLOB_RECURSE test_data_glob
+    RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+    *.svg)
+list(APPEND test_data ${test_data_glob})
+file(GLOB_RECURSE test_data_glob
+    RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+    *.svgz)
+list(APPEND test_data ${test_data_glob})
+
+add_qt_test(tst_qicon
+    SOURCES
+        tst_qicon.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+    TESTDATA ${test_data}
+)
+
+# Resources:
+set(tst_qicon_resource_files
+    "./fallback_icons/red.png"
+    "./icons/testtheme/16x16/actions/appointment-new.png"
+    "./icons/testtheme/22x22/actions/appointment-new.png"
+    "./icons/testtheme/index.theme"
+    "./icons/testtheme/scalable/actions/svg-only.svg"
+    "./icons/themeparent/16x16/actions/address-book-new.png"
+    "./icons/themeparent/16x16/actions/appointment-new.png"
+    "./icons/themeparent/22x22/actions/address-book-new.png"
+    "./icons/themeparent/22x22/actions/appointment-new.png"
+    "./icons/themeparent/32x32/actions/address-book-new.png"
+    "./icons/themeparent/32x32/actions/appointment-new.png"
+    "./icons/themeparent/icon-theme.cache"
+    "./icons/themeparent/index.theme"
+    "./icons/themeparent/scalable/actions/address-book-new.svg"
+    "./icons/themeparent/scalable/actions/appointment-new.svg"
+    "./second_icons/testtheme/32x32/actions/appointment-new.png"
+    "./styles/commonstyle/images/standardbutton-open-128.png"
+    "./styles/commonstyle/images/standardbutton-open-16.png"
+    "./styles/commonstyle/images/standardbutton-open-32.png"
+    "./styles/commonstyle/images/standardbutton-save-128.png"
+    "./styles/commonstyle/images/standardbutton-save-16.png"
+    "./styles/commonstyle/images/standardbutton-save-32.png"
+    "image.png"
+    "rect.png"
+    "tst_qicon.cpp"
+)
+
+add_qt_resource(tst_qicon "tst_qicon"
+    PREFIX
+        "/"
+    FILES
+        ${tst_qicon_resource_files}
+)
+set(qmake_immediate_resource_files
+    "tst_qicon.cpp"
+)
+
+add_qt_resource(tst_qicon "qmake_immediate"
+    PREFIX
+        "/"
+    FILES
+        ${qmake_immediate_resource_files}
+)
+
+
+## Scopes:
+#####################################################################
+
+extend_target(tst_qicon CONDITION TARGET Qt::Widgets
+    PUBLIC_LIBRARIES
+        Qt::Widgets
+)
diff --git a/tests/auto/gui/image/qiconhighdpi/CMakeLists.txt b/tests/auto/gui/image/qiconhighdpi/CMakeLists.txt
new file mode 100644
index 0000000000..6f6aaedca5
--- /dev/null
+++ b/tests/auto/gui/image/qiconhighdpi/CMakeLists.txt
@@ -0,0 +1,37 @@
+# Generated from qiconhighdpi.pro.
+
+#####################################################################
+## tst_qiconhighdpi Test:
+#####################################################################
+
+# Collect test data
+file(GLOB_RECURSE test_data_glob
+    RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+    icons/*)
+list(APPEND test_data ${test_data_glob})
+
+add_qt_test(tst_qiconhighdpi
+    SOURCES
+        tst_qiconhighdpi.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+    TESTDATA ${test_data}
+)
+
+# Resources:
+set(tst_qiconhighdpi_resource_files
+    "icons/misc/button.9.png"
+    "icons/misc/button@2x.9.png"
+    "icons/testtheme/16x16/actions/appointment-new.png"
+    "icons/testtheme/22x22/actions/appointment-new.png"
+    "icons/testtheme/22x22@2/actions/appointment-new.png"
+    "icons/testtheme/index.theme"
+)
+
+add_qt_resource(tst_qiconhighdpi "tst_qiconhighdpi"
+    PREFIX
+        "/"
+    FILES
+        ${tst_qiconhighdpi_resource_files}
+)
+
diff --git a/tests/auto/gui/image/qimage/CMakeLists.txt b/tests/auto/gui/image/qimage/CMakeLists.txt
new file mode 100644
index 0000000000..865f1124b9
--- /dev/null
+++ b/tests/auto/gui/image/qimage/CMakeLists.txt
@@ -0,0 +1,66 @@
+# Generated from qimage.pro.
+
+#####################################################################
+## tst_qimage Test:
+#####################################################################
+
+# Collect test data
+file(GLOB_RECURSE test_data_glob
+    RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+    images/*)
+list(APPEND test_data ${test_data_glob})
+
+add_qt_test(tst_qimage
+    SOURCES
+        tst_qimage.cpp
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::Gui
+        Qt::GuiPrivate
+    TESTDATA ${test_data}
+)
+
+## Scopes:
+#####################################################################
+
+if(ANDROID AND NOT ANDROID_EMBEDDED)
+    # Resources:
+    set(qimage_resource_files
+        "images/image.bmp"
+        "images/image.gif"
+        "images/image.ico"
+        "images/image.jpg"
+        "images/image.pbm"
+        "images/image.pgm"
+        "images/image.png"
+        "images/image.ppm"
+        "images/image.xbm"
+        "images/image.xpm"
+        "images/jpeg_exif_orientation_value_1.jpg"
+        "images/jpeg_exif_orientation_value_2.jpg"
+        "images/jpeg_exif_orientation_value_3.jpg"
+        "images/jpeg_exif_orientation_value_4.jpg"
+        "images/jpeg_exif_orientation_value_5.jpg"
+        "images/jpeg_exif_orientation_value_6.jpg"
+        "images/jpeg_exif_orientation_value_7.jpg"
+        "images/jpeg_exif_orientation_value_8.jpg"
+    )
+
+    add_qt_resource(tst_qimage "qimage"
+        PREFIX
+            "/"
+        FILES
+            ${qimage_resource_files}
+    )
+endif()
+
+extend_target(tst_qimage CONDITION WIN32 AND NOT WINRT
+    PUBLIC_LIBRARIES
+        gdi32
+        user32
+)
+
+extend_target(tst_qimage CONDITION APPLE
+    PUBLIC_LIBRARIES
+        ${FWCoreGraphics}
+)
diff --git a/tests/auto/gui/image/qimageiohandler/CMakeLists.txt b/tests/auto/gui/image/qimageiohandler/CMakeLists.txt
new file mode 100644
index 0000000000..23e5e98b16
--- /dev/null
+++ b/tests/auto/gui/image/qimageiohandler/CMakeLists.txt
@@ -0,0 +1,12 @@
+# Generated from qimageiohandler.pro.
+
+#####################################################################
+## tst_qimageiohandler Test:
+#####################################################################
+
+add_qt_test(tst_qimageiohandler
+    SOURCES
+        tst_qimageiohandler.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+)
diff --git a/tests/auto/gui/image/qimagereader/CMakeLists.txt b/tests/auto/gui/image/qimagereader/CMakeLists.txt
new file mode 100644
index 0000000000..8a96fa18cf
--- /dev/null
+++ b/tests/auto/gui/image/qimagereader/CMakeLists.txt
@@ -0,0 +1,65 @@
+# Generated from qimagereader.pro.
+
+#####################################################################
+## tst_qimagereader Test:
+#####################################################################
+
+# Collect test data
+file(GLOB_RECURSE test_data_glob
+    RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+    images/*)
+list(APPEND test_data ${test_data_glob})
+file(GLOB_RECURSE test_data_glob
+    RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+    baseline/*)
+list(APPEND test_data ${test_data_glob})
+
+add_qt_test(tst_qimagereader
+    SOURCES
+        tst_qimagereader.cpp
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::Gui
+        Qt::GuiPrivate
+        Qt::Network
+    TESTDATA ${test_data}
+)
+
+file(GLOB resource_glob_0 RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "images/*")
+foreach(file IN LISTS resource_glob_0)
+    set_source_files_properties("${CMAKE_CURRENT_SOURCE_DIR}/${file}" PROPERTIES QT_RESOURCE_ALIAS "${file}")
+endforeach()
+
+# Resources:
+set(qmake_immediate_resource_files
+    ${resource_glob_0}
+)
+
+add_qt_resource(tst_qimagereader "qmake_immediate"
+    PREFIX
+        "/"
+    FILES
+        ${qmake_immediate_resource_files}
+)
+
+
+#### Keys ignored in scope 1:.:.:qimagereader.pro:<TRUE>:
+# MOC_DIR = "tmp"
+
+## Scopes:
+#####################################################################
+
+if(ANDROID AND NOT ANDROID_EMBEDDED)
+    # Resources:
+    set(android_testdata_resource_files
+        "images/kollada-noext"
+        "images/trans.gif"
+    )
+
+    add_qt_resource(tst_qimagereader "android_testdata"
+        PREFIX
+            "/"
+        FILES
+            ${android_testdata_resource_files}
+    )
+endif()
diff --git a/tests/auto/gui/image/qimagewriter/CMakeLists.txt b/tests/auto/gui/image/qimagewriter/CMakeLists.txt
new file mode 100644
index 0000000000..1a04dfbce0
--- /dev/null
+++ b/tests/auto/gui/image/qimagewriter/CMakeLists.txt
@@ -0,0 +1,50 @@
+# Generated from qimagewriter.pro.
+
+#####################################################################
+## tst_qimagewriter Test:
+#####################################################################
+
+# Collect test data
+file(GLOB_RECURSE test_data_glob
+    RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+    images/*)
+list(APPEND test_data ${test_data_glob})
+
+add_qt_test(tst_qimagewriter
+    SOURCES
+        tst_qimagewriter.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+    TESTDATA ${test_data}
+)
+
+#### Keys ignored in scope 1:.:.:qimagewriter.pro:<TRUE>:
+# MOC_DIR = "tmp"
+
+## Scopes:
+#####################################################################
+
+if(ANDROID AND NOT ANDROID_EMBEDDED)
+    # Resources:
+    set(qimagewriter_resource_files
+        "images/YCbCr_cmyk.jpg"
+        "images/YCbCr_rgb.jpg"
+        "images/beavis.jpg"
+        "images/colorful.bmp"
+        "images/earth.gif"
+        "images/font.bmp"
+        "images/gnus.xbm"
+        "images/kollada.png"
+        "images/marble.xpm"
+        "images/ship63.pbm"
+        "images/teapot.ppm"
+        "images/trolltech.gif"
+    )
+
+    add_qt_resource(tst_qimagewriter "qimagewriter"
+        PREFIX
+            "/"
+        FILES
+            ${qimagewriter_resource_files}
+    )
+endif()
diff --git a/tests/auto/gui/image/qimagewriter/tst_qimagewriter.cpp b/tests/auto/gui/image/qimagewriter/tst_qimagewriter.cpp
index aaa8475c74..247f6443c1 100644
--- a/tests/auto/gui/image/qimagewriter/tst_qimagewriter.cpp
+++ b/tests/auto/gui/image/qimagewriter/tst_qimagewriter.cpp
@@ -94,8 +94,8 @@ private:
 
 static void initializePadding(QImage *image)
 {
-    int effectiveBytesPerLine = (image->width() * image->depth() + 7) / 8;
-    int paddingBytes = image->bytesPerLine() - effectiveBytesPerLine;
+    qsizetype effectiveBytesPerLine = (qsizetype(image->width()) * image->depth() + 7) / 8;
+    qsizetype paddingBytes = image->bytesPerLine() - effectiveBytesPerLine;
     if (paddingBytes == 0)
         return;
     for (int y = 0; y < image->height(); ++y) {
diff --git a/tests/auto/gui/image/qmovie/CMakeLists.txt b/tests/auto/gui/image/qmovie/CMakeLists.txt
new file mode 100644
index 0000000000..bc841b5d29
--- /dev/null
+++ b/tests/auto/gui/image/qmovie/CMakeLists.txt
@@ -0,0 +1,56 @@
+# Generated from qmovie.pro.
+
+#####################################################################
+## tst_qmovie Test:
+#####################################################################
+
+# Collect test data
+file(GLOB_RECURSE test_data_glob
+    RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+    animations/*)
+list(APPEND test_data ${test_data_glob})
+
+add_qt_test(tst_qmovie
+    SOURCES
+        tst_qmovie.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+    TESTDATA ${test_data}
+)
+
+# Resources:
+set(resources_resource_files
+    "animations/comicsecard.gif"
+    "animations/corrupt.gif"
+    "animations/trolltech.gif"
+)
+
+add_qt_resource(tst_qmovie "resources"
+    PREFIX
+        "/"
+    FILES
+        ${resources_resource_files}
+)
+
+
+#### Keys ignored in scope 1:.:.:qmovie.pro:<TRUE>:
+# MOC_DIR = "tmp"
+# QT_FOR_CONFIG = "gui-private"
+
+## Scopes:
+#####################################################################
+
+extend_target(tst_qmovie CONDITION TARGET Qt::Widgets
+    PUBLIC_LIBRARIES
+        Qt::Widgets
+)
+
+extend_target(tst_qmovie CONDITION QT_FEATURE_gif
+    DEFINES
+        QTEST_HAVE_GIF
+)
+
+extend_target(tst_qmovie CONDITION QT_FEATURE_jpeg
+    DEFINES
+        QTEST_HAVE_JPEG
+)
diff --git a/tests/auto/gui/image/qpicture/CMakeLists.txt b/tests/auto/gui/image/qpicture/CMakeLists.txt
new file mode 100644
index 0000000000..625d19b3a5
--- /dev/null
+++ b/tests/auto/gui/image/qpicture/CMakeLists.txt
@@ -0,0 +1,12 @@
+# Generated from qpicture.pro.
+
+#####################################################################
+## tst_qpicture Test:
+#####################################################################
+
+add_qt_test(tst_qpicture
+    SOURCES
+        tst_qpicture.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+)
diff --git a/tests/auto/gui/image/qpicture/tst_qpicture.cpp b/tests/auto/gui/image/qpicture/tst_qpicture.cpp
index ec6bb8dcee..6287960457 100644
--- a/tests/auto/gui/image/qpicture/tst_qpicture.cpp
+++ b/tests/auto/gui/image/qpicture/tst_qpicture.cpp
@@ -37,6 +37,8 @@
 #include <qscreen.h>
 #include <limits.h>
 
+#ifndef QT_NO_PICTURE
+
 class tst_QPicture : public QObject
 {
     Q_OBJECT
@@ -45,7 +47,6 @@ public:
     tst_QPicture();
 
 private slots:
-    void getSetCheck();
     void devType();
     void paintingActive();
     void boundingRect();
@@ -56,31 +57,6 @@ private slots:
     void boundaryValues();
 };
 
-// Testing get/set functions
-void tst_QPicture::getSetCheck()
-{
-    QPictureIO obj1;
-    // const QPicture & QPictureIO::picture()
-    // void QPictureIO::setPicture(const QPicture &)
-    // const char * QPictureIO::format()
-    // void QPictureIO::setFormat(const char *)
-    const char var2[] = "PNG";
-    obj1.setFormat(var2);
-    QCOMPARE(var2, obj1.format());
-    obj1.setFormat((char *)0);
-    // The format is stored internally in a QString, so return is always a valid char *
-    QVERIFY(QString(obj1.format()).isEmpty());
-
-    // const char * QPictureIO::parameters()
-    // void QPictureIO::setParameters(const char *)
-    const char var3[] = "Bogus data";
-    obj1.setParameters(var3);
-    QCOMPARE(var3, obj1.parameters());
-    obj1.setParameters((char *)0);
-    // The format is stored internally in a QString, so return is always a valid char *
-    QVERIFY(QString(obj1.parameters()).isEmpty());
-}
-
 tst_QPicture::tst_QPicture()
 {
 }
@@ -316,6 +292,7 @@ void tst_QPicture::boundaryValues()
     painter.end();
 }
 
-
 QTEST_MAIN(tst_QPicture)
 #include "tst_qpicture.moc"
+
+#endif // QT_NO_PICTURE
diff --git a/tests/auto/gui/image/qpixmap/CMakeLists.txt b/tests/auto/gui/image/qpixmap/CMakeLists.txt
new file mode 100644
index 0000000000..f6a83aa0da
--- /dev/null
+++ b/tests/auto/gui/image/qpixmap/CMakeLists.txt
@@ -0,0 +1,107 @@
+# Generated from qpixmap.pro.
+
+#####################################################################
+## tst_qpixmap Test:
+#####################################################################
+
+# Collect test data
+file(GLOB_RECURSE test_data_glob
+    RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+    convertFromImage/*)
+list(APPEND test_data ${test_data_glob})
+file(GLOB_RECURSE test_data_glob
+    RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+    convertFromToHICON/*)
+list(APPEND test_data ${test_data_glob})
+file(GLOB_RECURSE test_data_glob
+    RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+    loadFromData/*)
+list(APPEND test_data ${test_data_glob})
+file(GLOB_RECURSE test_data_glob
+    RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+    images/*)
+list(APPEND test_data ${test_data_glob})
+
+add_qt_test(tst_qpixmap
+    SOURCES
+        tst_qpixmap.cpp
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::Gui
+        Qt::GuiPrivate
+    TESTDATA ${test_data}
+)
+
+# Resources:
+set(qpixmap_resource_files
+    "convertFromImage/task31722_0/img1.png"
+    "convertFromImage/task31722_0/img2.png"
+    "convertFromImage/task31722_1/img1.png"
+    "convertFromImage/task31722_1/img2.png"
+    "convertFromToHICON/icon_32bpp.ico"
+    "convertFromToHICON/icon_32bpp_16x16.png"
+    "convertFromToHICON/icon_32bpp_256x256.png"
+    "convertFromToHICON/icon_32bpp_32x32.png"
+    "convertFromToHICON/icon_32bpp_48x48.png"
+    "convertFromToHICON/icon_8bpp.ico"
+    "convertFromToHICON/icon_8bpp_16x16.png"
+    "convertFromToHICON/icon_8bpp_32x32.png"
+    "convertFromToHICON/icon_8bpp_48x48.png"
+    "images/designer.png"
+    "images/dx_-10_dy_-10_50_50_100_100.png"
+    "images/dx_-10_dy_-10_x_y_w_h.png"
+    "images/dx_-10_dy_0_50_50_100_100.png"
+    "images/dx_-10_dy_0_x_y_w_h.png"
+    "images/dx_-128_dy_-128_x_y_w_h.png"
+    "images/dx_-128_dy_0_x_y_w_h.png"
+    "images/dx_0_dy_-10_50_50_100_100.png"
+    "images/dx_0_dy_-10_x_y_w_h.png"
+    "images/dx_0_dy_-128_x_y_w_h.png"
+    "images/dx_0_dy_0_50_50_100_100.png"
+    "images/dx_0_dy_0_null.png"
+    "images/dx_0_dy_0_x_y_w_h.png"
+    "images/dx_0_dy_10_50_50_100_100.png"
+    "images/dx_0_dy_10_x_y_w_h.png"
+    "images/dx_0_dy_128_x_y_w_h.png"
+    "images/dx_0_dy_1_null.png"
+    "images/dx_10_dy_0_50_50_100_100.png"
+    "images/dx_10_dy_0_x_y_w_h.png"
+    "images/dx_10_dy_10_50_50_100_100.png"
+    "images/dx_10_dy_10_x_y_w_h.png"
+    "images/dx_128_dy_0_x_y_w_h.png"
+    "images/dx_128_dy_128_64_64_128_128.png"
+    "images/dx_128_dy_128_x_y_w_h.png"
+    "images/dx_1_dy_0_null.png"
+    "loadFromData/designer_argb32.png"
+    "loadFromData/designer_indexed8_no_alpha.gif"
+    "loadFromData/designer_indexed8_no_alpha.png"
+    "loadFromData/designer_indexed8_no_alpha_animated.gif"
+    "loadFromData/designer_indexed8_with_alpha.gif"
+    "loadFromData/designer_indexed8_with_alpha.png"
+    "loadFromData/designer_indexed8_with_alpha_animated.gif"
+    "loadFromData/designer_rgb32.jpg"
+    "loadFromData/designer_rgb32.png"
+)
+
+add_qt_resource(tst_qpixmap "qpixmap"
+    PREFIX
+        "/"
+    FILES
+        ${qpixmap_resource_files}
+)
+
+
+## Scopes:
+#####################################################################
+
+extend_target(tst_qpixmap CONDITION TARGET Qt::Widgets
+    PUBLIC_LIBRARIES
+        Qt::Widgets
+        Qt::WidgetsPrivate
+)
+
+extend_target(tst_qpixmap CONDITION WIN32 AND NOT WINRT
+    PUBLIC_LIBRARIES
+        gdi32
+        user32
+)
diff --git a/tests/auto/gui/image/qpixmapcache/CMakeLists.txt b/tests/auto/gui/image/qpixmapcache/CMakeLists.txt
new file mode 100644
index 0000000000..ef73f60ca6
--- /dev/null
+++ b/tests/auto/gui/image/qpixmapcache/CMakeLists.txt
@@ -0,0 +1,13 @@
+# Generated from qpixmapcache.pro.
+
+#####################################################################
+## tst_qpixmapcache Test:
+#####################################################################
+
+add_qt_test(tst_qpixmapcache
+    SOURCES
+        tst_qpixmapcache.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::GuiPrivate
+)
diff --git a/tests/auto/gui/itemmodels/CMakeLists.txt b/tests/auto/gui/itemmodels/CMakeLists.txt
new file mode 100644
index 0000000000..196168b1b2
--- /dev/null
+++ b/tests/auto/gui/itemmodels/CMakeLists.txt
@@ -0,0 +1,4 @@
+add_subdirectory("qstandarditem")
+if (QT_FEATURE_widgets)
+#    add_subdirectory("qstandarditemmodel")
+endif()
diff --git a/tests/auto/gui/itemmodels/qstandarditem/CMakeLists.txt b/tests/auto/gui/itemmodels/qstandarditem/CMakeLists.txt
new file mode 100644
index 0000000000..8a19f6afaf
--- /dev/null
+++ b/tests/auto/gui/itemmodels/qstandarditem/CMakeLists.txt
@@ -0,0 +1,12 @@
+# Generated from qstandarditem.pro.
+
+#####################################################################
+## tst_qstandarditem Test:
+#####################################################################
+
+add_qt_test(tst_qstandarditem
+    SOURCES
+        tst_qstandarditem.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+)
diff --git a/tests/auto/gui/kernel/CMakeLists.txt b/tests/auto/gui/kernel/CMakeLists.txt
new file mode 100644
index 0000000000..b2397bed19
--- /dev/null
+++ b/tests/auto/gui/kernel/CMakeLists.txt
@@ -0,0 +1,38 @@
+# Generated from kernel.pro.
+
+add_subdirectory(qbackingstore)
+add_subdirectory(qcursor)
+add_subdirectory(qdrag)
+add_subdirectory(qevent)
+add_subdirectory(qfileopenevent)
+add_subdirectory(qguieventdispatcher)
+add_subdirectory(qguimetatype)
+add_subdirectory(qguitimer)
+add_subdirectory(qguivariant)
+add_subdirectory(qinputmethod)
+add_subdirectory(qkeyevent)
+add_subdirectory(qkeysequence)
+add_subdirectory(qmouseevent)
+add_subdirectory(qpalette)
+add_subdirectory(qscreen)
+add_subdirectory(qsurfaceformat)
+add_subdirectory(qwindow)
+add_subdirectory(qguiapplication)
+add_subdirectory(qpixelformat)
+add_subdirectory(qrasterwindow)
+if(NOT ANDROID AND NOT APPLE_UIKIT)
+    add_subdirectory(qclipboard)
+endif()
+if(TARGET Qt::Network)
+    add_subdirectory(qguieventloop)
+endif()
+if(TARGET Qt::Widgets)
+    add_subdirectory(qmouseevent_modal)
+    add_subdirectory(qtouchevent)
+endif()
+if(QT_FEATURE_opengl)
+    add_subdirectory(qopenglwindow)
+endif()
+if(TARGET Qt::Network AND WIN32 AND NOT WINRT)
+    add_subdirectory(noqteventloop)
+endif()
diff --git a/tests/auto/gui/kernel/kernel.pro b/tests/auto/gui/kernel/kernel.pro
index 42135dae24..106e9050b8 100644
--- a/tests/auto/gui/kernel/kernel.pro
+++ b/tests/auto/gui/kernel/kernel.pro
@@ -4,11 +4,14 @@ SUBDIRS=\
    qclipboard \
    qcursor \
    qdrag \
+   qguiaction \
+   qguiactiongroup \
    qevent \
    qfileopenevent \
    qguieventdispatcher \
    qguieventloop \
    qguimetatype \
+   qguishortcut \
    qguitimer \
    qguivariant \
    qhighdpiscaling \
@@ -29,6 +32,12 @@ SUBDIRS=\
 
 win32:!winrt:qtHaveModule(network): SUBDIRS += noqteventloop
 
+!qtConfig(shortcut): SUBDIRS -= \
+   qkeysequence \
+   qguishortcut \
+   qguimetatype \
+   qguivariant
+
 !qtHaveModule(widgets): SUBDIRS -= \
    qmouseevent_modal \
    qtouchevent
@@ -36,6 +45,10 @@ win32:!winrt:qtHaveModule(network): SUBDIRS += noqteventloop
 !qtHaveModule(network): SUBDIRS -= \
    qguieventloop
 
+!qtConfig(action): SUBDIRS -= \
+   qguiaction \
+   qguiactiongroup
+
 !qtConfig(highdpiscaling): SUBDIRS -= qhighdpiscaling
 
 !qtConfig(opengl): SUBDIRS -= qopenglwindow
diff --git a/tests/auto/gui/kernel/noqteventloop/CMakeLists.txt b/tests/auto/gui/kernel/noqteventloop/CMakeLists.txt
new file mode 100644
index 0000000000..82de116f8d
--- /dev/null
+++ b/tests/auto/gui/kernel/noqteventloop/CMakeLists.txt
@@ -0,0 +1,23 @@
+# Generated from noqteventloop.pro.
+
+#####################################################################
+## tst_noqteventloop Test:
+#####################################################################
+
+add_qt_test(tst_noqteventloop
+    SOURCES
+        tst_noqteventloop.cpp
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::Gui
+        Qt::GuiPrivate
+        Qt::Network
+)
+
+## Scopes:
+#####################################################################
+
+extend_target(tst_noqteventloop CONDITION QT_FEATURE_dynamicgl AND WIN32 AND NOT WINRT
+    PUBLIC_LIBRARIES
+        user32
+)
diff --git a/tests/auto/gui/kernel/qbackingstore/CMakeLists.txt b/tests/auto/gui/kernel/qbackingstore/CMakeLists.txt
new file mode 100644
index 0000000000..639e88fb4c
--- /dev/null
+++ b/tests/auto/gui/kernel/qbackingstore/CMakeLists.txt
@@ -0,0 +1,14 @@
+# Generated from qbackingstore.pro.
+
+#####################################################################
+## tst_qbackingstore Test:
+#####################################################################
+
+add_qt_test(tst_qbackingstore
+    SOURCES
+        tst_qbackingstore.cpp
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::Gui
+        Qt::GuiPrivate
+)
diff --git a/tests/auto/gui/kernel/qclipboard/CMakeLists.txt b/tests/auto/gui/kernel/qclipboard/CMakeLists.txt
new file mode 100644
index 0000000000..b795d32520
--- /dev/null
+++ b/tests/auto/gui/kernel/qclipboard/CMakeLists.txt
@@ -0,0 +1,7 @@
+# Generated from qclipboard.pro.
+
+add_subdirectory(test)
+if(NOT WINRT)
+    add_subdirectory(copier)
+    add_subdirectory(paster)
+endif()
diff --git a/tests/auto/gui/kernel/qclipboard/copier/CMakeLists.txt b/tests/auto/gui/kernel/qclipboard/copier/CMakeLists.txt
new file mode 100644
index 0000000000..4595093b3b
--- /dev/null
+++ b/tests/auto/gui/kernel/qclipboard/copier/CMakeLists.txt
@@ -0,0 +1,26 @@
+# Generated from copier.pro.
+
+#####################################################################
+## copier Binary:
+#####################################################################
+
+# special case begin
+set(win32_args)
+if (WIN32)
+    set(win32_args OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}")
+endif()
+# special case end
+
+add_qt_executable(copier
+    ${win32_args} # special case
+    SOURCES
+        main.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+)
+
+## Scopes:
+#####################################################################
+
+#### Keys ignored in scope 2:.:.:copier.pro:WIN32:
+# DESTDIR = "../copier"
diff --git a/tests/auto/gui/kernel/qclipboard/paster/CMakeLists.txt b/tests/auto/gui/kernel/qclipboard/paster/CMakeLists.txt
new file mode 100644
index 0000000000..b9f118929c
--- /dev/null
+++ b/tests/auto/gui/kernel/qclipboard/paster/CMakeLists.txt
@@ -0,0 +1,26 @@
+# Generated from paster.pro.
+
+#####################################################################
+## paster Binary:
+#####################################################################
+
+# special case begin
+set(win32_args)
+if (WIN32)
+    set(win32_args OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}")
+endif()
+# special case end
+
+add_qt_executable(paster
+    ${win32_args} # special case
+    SOURCES
+        main.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+)
+
+## Scopes:
+#####################################################################
+
+#### Keys ignored in scope 2:.:.:paster.pro:WIN32:
+# DESTDIR = "../paster"
diff --git a/tests/auto/gui/kernel/qclipboard/test/.prev_CMakeLists.txt b/tests/auto/gui/kernel/qclipboard/test/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..620ef96a5b
--- /dev/null
+++ b/tests/auto/gui/kernel/qclipboard/test/.prev_CMakeLists.txt
@@ -0,0 +1,24 @@
+# Generated from test.pro.
+
+#####################################################################
+## tst_qclipboard Test:
+#####################################################################
+
+add_qt_test(tst_qclipboard
+    OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../"
+    SOURCES
+        ../tst_qclipboard.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+)
+
+## Scopes:
+#####################################################################
+
+extend_target(tst_qclipboard CONDITION APPLE_OSX
+    PUBLIC_LIBRARIES
+        ${FWAppKit}
+)
+
+#### Keys ignored in scope 6:.:.:test.pro:NOT ANDROID AND NOT WINRT:
+# TEST_HELPER_INSTALLS = "../copier/copier" "../paster/paster"
diff --git a/tests/auto/gui/kernel/qclipboard/test/CMakeLists.txt b/tests/auto/gui/kernel/qclipboard/test/CMakeLists.txt
new file mode 100644
index 0000000000..620ef96a5b
--- /dev/null
+++ b/tests/auto/gui/kernel/qclipboard/test/CMakeLists.txt
@@ -0,0 +1,24 @@
+# Generated from test.pro.
+
+#####################################################################
+## tst_qclipboard Test:
+#####################################################################
+
+add_qt_test(tst_qclipboard
+    OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../"
+    SOURCES
+        ../tst_qclipboard.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+)
+
+## Scopes:
+#####################################################################
+
+extend_target(tst_qclipboard CONDITION APPLE_OSX
+    PUBLIC_LIBRARIES
+        ${FWAppKit}
+)
+
+#### Keys ignored in scope 6:.:.:test.pro:NOT ANDROID AND NOT WINRT:
+# TEST_HELPER_INSTALLS = "../copier/copier" "../paster/paster"
diff --git a/tests/auto/gui/kernel/qcursor/CMakeLists.txt b/tests/auto/gui/kernel/qcursor/CMakeLists.txt
new file mode 100644
index 0000000000..8f4062a42a
--- /dev/null
+++ b/tests/auto/gui/kernel/qcursor/CMakeLists.txt
@@ -0,0 +1,12 @@
+# Generated from qcursor.pro.
+
+#####################################################################
+## tst_qcursor Test:
+#####################################################################
+
+add_qt_test(tst_qcursor
+    SOURCES
+        tst_qcursor.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+)
diff --git a/tests/auto/gui/kernel/qdrag/CMakeLists.txt b/tests/auto/gui/kernel/qdrag/CMakeLists.txt
new file mode 100644
index 0000000000..84bceaf0de
--- /dev/null
+++ b/tests/auto/gui/kernel/qdrag/CMakeLists.txt
@@ -0,0 +1,12 @@
+# Generated from qdrag.pro.
+
+#####################################################################
+## tst_qdrag Test:
+#####################################################################
+
+add_qt_test(tst_qdrag
+    SOURCES
+        tst_qdrag.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+)
diff --git a/tests/auto/gui/kernel/qevent/CMakeLists.txt b/tests/auto/gui/kernel/qevent/CMakeLists.txt
new file mode 100644
index 0000000000..01d6db7225
--- /dev/null
+++ b/tests/auto/gui/kernel/qevent/CMakeLists.txt
@@ -0,0 +1,10 @@
+# Generated from qevent.pro.
+
+#####################################################################
+## tst_qevent Test:
+#####################################################################
+
+add_qt_test(tst_qevent
+    SOURCES
+        tst_qevent.cpp
+)
diff --git a/tests/auto/gui/kernel/qfileopenevent/CMakeLists.txt b/tests/auto/gui/kernel/qfileopenevent/CMakeLists.txt
new file mode 100644
index 0000000000..2404833737
--- /dev/null
+++ b/tests/auto/gui/kernel/qfileopenevent/CMakeLists.txt
@@ -0,0 +1,4 @@
+# Generated from qfileopenevent.pro.
+
+add_subdirectory(test)
+add_subdirectory(qfileopeneventexternal)
diff --git a/tests/auto/gui/kernel/qfileopenevent/qfileopeneventexternal/CMakeLists.txt b/tests/auto/gui/kernel/qfileopenevent/qfileopeneventexternal/CMakeLists.txt
new file mode 100644
index 0000000000..0c50f7ff56
--- /dev/null
+++ b/tests/auto/gui/kernel/qfileopenevent/qfileopeneventexternal/CMakeLists.txt
@@ -0,0 +1,16 @@
+# Generated from qfileopeneventexternal.pro.
+
+#####################################################################
+## qfileopeneventexternal Binary:
+#####################################################################
+
+add_qt_executable(qfileopeneventexternal
+    GUI
+    SOURCES
+        qfileopeneventexternal.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+)
+
+#### Keys ignored in scope 1:.:.:qfileopeneventexternal.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/auto/gui/kernel/qfileopenevent/test/CMakeLists.txt b/tests/auto/gui/kernel/qfileopenevent/test/CMakeLists.txt
new file mode 100644
index 0000000000..6695ef42b3
--- /dev/null
+++ b/tests/auto/gui/kernel/qfileopenevent/test/CMakeLists.txt
@@ -0,0 +1,12 @@
+# Generated from test.pro.
+
+#####################################################################
+## tst_qfileopenevent Test:
+#####################################################################
+
+add_qt_test(tst_qfileopenevent
+    SOURCES
+        tst_qfileopenevent.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+)
diff --git a/tests/auto/widgets/kernel/qaction/.gitignore b/tests/auto/gui/kernel/qguiaction/.gitignore
index bf81f5bf2c..bf81f5bf2c 100644
--- a/tests/auto/widgets/kernel/qaction/.gitignore
+++ b/tests/auto/gui/kernel/qguiaction/.gitignore
diff --git a/tests/auto/gui/kernel/qguiaction/qguiaction.pro b/tests/auto/gui/kernel/qguiaction/qguiaction.pro
new file mode 100644
index 0000000000..2a39636119
--- /dev/null
+++ b/tests/auto/gui/kernel/qguiaction/qguiaction.pro
@@ -0,0 +1,4 @@
+CONFIG += testcase
+TARGET = tst_qguiaction
+QT += gui-private core-private testlib
+SOURCES += tst_qguiaction.cpp
diff --git a/tests/auto/gui/kernel/qguiaction/tst_qguiaction.cpp b/tests/auto/gui/kernel/qguiaction/tst_qguiaction.cpp
new file mode 100644
index 0000000000..cc607c644f
--- /dev/null
+++ b/tests/auto/gui/kernel/qguiaction/tst_qguiaction.cpp
@@ -0,0 +1,277 @@
+/****************************************************************************
+**
+** Copyright (C) 2019 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:GPL-EXCEPT$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 as published by the Free Software
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtTest/QtTest>
+
+#include <qguiapplication.h>
+#include <qevent.h>
+#include <qguiaction.h>
+#include <qguiactiongroup.h>
+#include <qpa/qplatformtheme.h>
+
+#include <private/qguiapplication_p.h>
+
+class tst_QGuiAction : public QObject
+{
+    Q_OBJECT
+
+public:
+    tst_QGuiAction();
+
+private slots:
+    void cleanup();
+    void getSetCheck();
+    void setText_data();
+    void setText();
+    void setIconText_data() { setText_data(); }
+    void setIconText();
+#if QT_CONFIG(shortcut)
+    void setStandardKeys();
+    void task200823_tooltip();
+#endif
+    void task229128TriggeredSignalWithoutActiongroup();
+    void setData();
+    void setEnabledSetVisible();
+    void setCheckabledSetChecked();
+
+private:
+    const int m_keyboardScheme;
+};
+
+tst_QGuiAction::tst_QGuiAction()
+    : m_keyboardScheme(QGuiApplicationPrivate::platformTheme()->themeHint(QPlatformTheme::KeyboardScheme).toInt())
+{
+}
+
+void tst_QGuiAction::cleanup()
+{
+    QVERIFY(QGuiApplication::topLevelWindows().isEmpty());
+}
+
+// Testing get/set functions
+void tst_QGuiAction::getSetCheck()
+{
+    QGuiAction obj1(nullptr);
+    // QActionGroup * QAction::actionGroup()
+    // void QAction::setActionGroup(QActionGroup *)
+    auto var1 = new QGuiActionGroup(nullptr);
+    obj1.setActionGroup(var1);
+    QCOMPARE(var1, obj1.guiActionGroup());
+    obj1.setActionGroup(nullptr);
+    QCOMPARE(obj1.guiActionGroup(), nullptr);
+    delete var1;
+
+    QCOMPARE(obj1.priority(), QGuiAction::NormalPriority);
+    obj1.setPriority(QGuiAction::LowPriority);
+    QCOMPARE(obj1.priority(), QGuiAction::LowPriority);
+}
+
+void tst_QGuiAction::setText_data()
+{
+    QTest::addColumn<QString>("text");
+    QTest::addColumn<QString>("iconText");
+    QTest::addColumn<QString>("textFromIconText");
+
+    //next we fill it with data
+    QTest::newRow("Normal") << "Action" << "Action" << "Action";
+    QTest::newRow("Ampersand") << "Search && Destroy" << "Search & Destroy" << "Search && Destroy";
+    QTest::newRow("Mnemonic and ellipsis") << "O&pen File ..." << "Open File" << "Open File";
+}
+
+void tst_QGuiAction::setText()
+{
+    QFETCH(QString, text);
+
+    QGuiAction action(nullptr);
+    action.setText(text);
+
+    QCOMPARE(action.text(), text);
+
+    QFETCH(QString, iconText);
+    QCOMPARE(action.iconText(), iconText);
+}
+
+void tst_QGuiAction::setIconText()
+{
+    QFETCH(QString, iconText);
+
+    QGuiAction action(nullptr);
+    action.setIconText(iconText);
+    QCOMPARE(action.iconText(), iconText);
+
+    QFETCH(QString, textFromIconText);
+    QCOMPARE(action.text(), textFromIconText);
+}
+
+#if QT_CONFIG(shortcut)
+
+//basic testing of standard keys
+void tst_QGuiAction::setStandardKeys()
+{
+    QGuiAction act(nullptr);
+    act.setShortcut(QKeySequence("CTRL+L"));
+    QList<QKeySequence> list;
+    act.setShortcuts(list);
+    act.setShortcuts(QKeySequence::Copy);
+    QCOMPARE(act.shortcut(), act.shortcuts().constFirst());
+
+    QList<QKeySequence> expected;
+    const QKeySequence ctrlC = QKeySequence(QStringLiteral("CTRL+C"));
+    const QKeySequence ctrlInsert = QKeySequence(QStringLiteral("CTRL+INSERT"));
+    switch (m_keyboardScheme) {
+    case QPlatformTheme::MacKeyboardScheme:
+        expected  << ctrlC;
+        break;
+    case QPlatformTheme::WindowsKeyboardScheme:
+        expected  << ctrlC << ctrlInsert;
+        break;
+    default: // X11
+        expected  << ctrlC << ctrlInsert << QKeySequence(QStringLiteral("F16"));
+        break;
+    }
+
+    QCOMPARE(act.shortcuts(), expected);
+}
+
+void tst_QGuiAction::task200823_tooltip()
+{
+    const QScopedPointer<QGuiAction> action(new QGuiAction("foo", nullptr));
+    QString shortcut("ctrl+o");
+    action->setShortcut(shortcut);
+
+    // we want a non-standard tooltip that shows the shortcut
+    action->setToolTip(action->text() + QLatin1String(" (") + action->shortcut().toString() + QLatin1Char(')'));
+
+    QString ref = QLatin1String("foo (") + QKeySequence(shortcut).toString() + QLatin1Char(')');
+    QCOMPARE(action->toolTip(), ref);
+}
+
+#endif // QT_CONFIG(shortcut)
+
+void tst_QGuiAction::task229128TriggeredSignalWithoutActiongroup()
+{
+    // test without a group
+    const QScopedPointer<QGuiAction> actionWithoutGroup(new QGuiAction("Test", nullptr));
+    QSignalSpy spyWithoutGroup(actionWithoutGroup.data(), QOverload<bool>::of(&QGuiAction::triggered));
+    QCOMPARE(spyWithoutGroup.count(), 0);
+    actionWithoutGroup->trigger();
+    // signal should be emitted
+    QCOMPARE(spyWithoutGroup.count(), 1);
+
+    // it is now a checkable checked action
+    actionWithoutGroup->setCheckable(true);
+    actionWithoutGroup->setChecked(true);
+    spyWithoutGroup.clear();
+    QCOMPARE(spyWithoutGroup.count(), 0);
+    actionWithoutGroup->trigger();
+    // signal should be emitted
+    QCOMPARE(spyWithoutGroup.count(), 1);
+}
+
+void tst_QGuiAction::setData() // QTBUG-62006
+{
+    QGuiAction act(nullptr);
+    QSignalSpy spy(&act, &QGuiAction::changed);
+    QCOMPARE(act.data(), QVariant());
+    QCOMPARE(spy.count(), 0);
+    act.setData(QVariant());
+    QCOMPARE(spy.count(), 0);
+
+    act.setData(-1);
+    QCOMPARE(spy.count(), 1);
+    act.setData(-1);
+    QCOMPARE(spy.count(), 1);
+}
+
+void tst_QGuiAction::setEnabledSetVisible()
+{
+    QGuiAction action(nullptr);
+    QSignalSpy spy(&action, &QGuiAction::enabledChanged);
+    QVERIFY(action.isEnabled());
+    QVERIFY(action.isVisible());
+    QCOMPARE(spy.count(), 0);
+    action.setVisible(false);
+    QVERIFY(!action.isEnabled());
+    QVERIFY(!action.isVisible());
+    QCOMPARE(spy.count(), 1);
+    action.setEnabled(false);
+    QVERIFY(!action.isEnabled());
+    QVERIFY(!action.isVisible());
+    QCOMPARE(spy.count(), 1);
+    action.setVisible(true);
+    QVERIFY(!action.isEnabled());
+    QVERIFY(action.isVisible());
+    QCOMPARE(spy.count(), 1);
+    action.resetEnabled();
+    QVERIFY(action.isEnabled());
+    QCOMPARE(spy.count(), 2);
+}
+
+void tst_QGuiAction::setCheckabledSetChecked()
+{
+    QGuiAction action(nullptr);
+    QSignalSpy changedSpy(&action, &QGuiAction::changed);
+    QSignalSpy checkedSpy(&action, &QGuiAction::toggled);
+    QSignalSpy checkableSpy(&action, &QGuiAction::checkableChanged);
+    QVERIFY(!action.isCheckable());
+    QVERIFY(!action.isChecked());
+    QCOMPARE(changedSpy.count(), 0);
+    QCOMPARE(checkedSpy.count(), 0);
+    QCOMPARE(checkableSpy.count(), 0);
+
+    action.setCheckable(true);
+    QVERIFY(action.isCheckable());
+    QVERIFY(!action.isChecked());
+    QCOMPARE(changedSpy.count(), 1);
+    QCOMPARE(checkedSpy.count(), 0);
+    QCOMPARE(checkableSpy.count(), 1);
+
+    action.setChecked(true);
+    QVERIFY(action.isCheckable());
+    QVERIFY(action.isChecked());
+    QCOMPARE(changedSpy.count(), 2);
+    QCOMPARE(checkedSpy.count(), 1);
+    QCOMPARE(checkableSpy.count(), 1);
+
+    action.setCheckable(false);
+    QVERIFY(!action.isCheckable());
+    QVERIFY(!action.isChecked());
+    QCOMPARE(changedSpy.count(), 3);
+    QCOMPARE(checkedSpy.count(), 2);
+    QCOMPARE(checkableSpy.count(), 2);
+
+    action.setCheckable(true);
+    QVERIFY(action.isCheckable());
+    QVERIFY(action.isChecked());
+    QCOMPARE(changedSpy.count(), 4);
+    QCOMPARE(checkedSpy.count(), 3);
+    QCOMPARE(checkableSpy.count(), 3);
+}
+
+QTEST_MAIN(tst_QGuiAction)
+#include "tst_qguiaction.moc"
diff --git a/tests/auto/gui/kernel/qguiactiongroup/.gitignore b/tests/auto/gui/kernel/qguiactiongroup/.gitignore
new file mode 100644
index 0000000000..daba003e96
--- /dev/null
+++ b/tests/auto/gui/kernel/qguiactiongroup/.gitignore
@@ -0,0 +1 @@
+tst_qactiongroup
diff --git a/tests/auto/gui/kernel/qguiactiongroup/qguiactiongroup.pro b/tests/auto/gui/kernel/qguiactiongroup/qguiactiongroup.pro
new file mode 100644
index 0000000000..7fd64e70f1
--- /dev/null
+++ b/tests/auto/gui/kernel/qguiactiongroup/qguiactiongroup.pro
@@ -0,0 +1,4 @@
+CONFIG += testcase
+TARGET = tst_qactiongroup
+QT += testlib
+SOURCES += tst_qguiactiongroup.cpp
diff --git a/tests/auto/gui/kernel/qguiactiongroup/tst_qguiactiongroup.cpp b/tests/auto/gui/kernel/qguiactiongroup/tst_qguiactiongroup.cpp
new file mode 100644
index 0000000000..1ac14280fb
--- /dev/null
+++ b/tests/auto/gui/kernel/qguiactiongroup/tst_qguiactiongroup.cpp
@@ -0,0 +1,235 @@
+/****************************************************************************
+**
+** Copyright (C) 2019 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:GPL-EXCEPT$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 as published by the Free Software
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtTest/QtTest>
+
+#include <qguiaction.h>
+#include <qguiactiongroup.h>
+
+class tst_QGuiActionGroup : public QObject
+{
+    Q_OBJECT
+
+private slots:
+    void cleanup() { QVERIFY(QGuiApplication::topLevelWindows().isEmpty()); }
+    void enabledPropagation();
+    void visiblePropagation();
+    void exclusive();
+    void exclusiveOptional();
+    void testActionInTwoQActionGroup();
+    void unCheckCurrentAction();
+};
+
+void tst_QGuiActionGroup::enabledPropagation()
+{
+    QGuiActionGroup testActionGroup(nullptr);
+
+    auto childAction = new QGuiAction( &testActionGroup );
+    auto anotherChildAction = new QGuiAction( &testActionGroup );
+    auto freeAction = new QGuiAction(nullptr);
+
+    QVERIFY( testActionGroup.isEnabled() );
+    QVERIFY( childAction->isEnabled() );
+
+    testActionGroup.setEnabled( false );
+    QVERIFY( !testActionGroup.isEnabled() );
+    QVERIFY( !childAction->isEnabled() );
+    QVERIFY( !anotherChildAction->isEnabled() );
+
+    childAction->setEnabled(true);
+    QVERIFY( !childAction->isEnabled());
+
+    anotherChildAction->setEnabled( false );
+
+    testActionGroup.setEnabled( true );
+    QVERIFY( testActionGroup.isEnabled() );
+    QVERIFY( childAction->isEnabled() );
+    QVERIFY( !anotherChildAction->isEnabled() );
+
+    testActionGroup.setEnabled( false );
+    auto lastChildAction = new QGuiAction(&testActionGroup);
+
+    QVERIFY(!lastChildAction->isEnabled());
+    testActionGroup.setEnabled( true );
+    QVERIFY(lastChildAction->isEnabled());
+
+    freeAction->setEnabled(false);
+    testActionGroup.addAction(freeAction);
+    QVERIFY(!freeAction->isEnabled());
+    delete freeAction;
+}
+
+void tst_QGuiActionGroup::visiblePropagation()
+{
+    QGuiActionGroup testActionGroup(nullptr);
+
+    auto childAction = new QGuiAction( &testActionGroup );
+    auto anotherChildAction = new QGuiAction( &testActionGroup );
+    auto freeAction = new QGuiAction(nullptr);
+
+    QVERIFY( testActionGroup.isVisible() );
+    QVERIFY( childAction->isVisible() );
+
+    testActionGroup.setVisible( false );
+    QVERIFY( !testActionGroup.isVisible() );
+    QVERIFY( !childAction->isVisible() );
+    QVERIFY( !anotherChildAction->isVisible() );
+
+    anotherChildAction->setVisible(false);
+
+    testActionGroup.setVisible( true );
+    QVERIFY( testActionGroup.isVisible() );
+    QVERIFY( childAction->isVisible() );
+
+    QVERIFY( !anotherChildAction->isVisible() );
+
+    testActionGroup.setVisible( false );
+    auto lastChildAction = new QGuiAction(&testActionGroup);
+
+    QVERIFY(!lastChildAction->isVisible());
+    testActionGroup.setVisible( true );
+    QVERIFY(lastChildAction->isVisible());
+
+    freeAction->setVisible(false);
+    testActionGroup.addAction(freeAction);
+    QVERIFY(!freeAction->isVisible());
+    delete freeAction;
+}
+
+void tst_QGuiActionGroup::exclusive()
+{
+    QGuiActionGroup group(nullptr);
+    group.setExclusive(false);
+    QVERIFY( !group.isExclusive() );
+
+    auto actOne = new QGuiAction(&group);
+    actOne->setCheckable( true );
+    auto actTwo = new QGuiAction(&group);
+    actTwo->setCheckable( true );
+    auto actThree = new QGuiAction(&group);
+    actThree->setCheckable( true );
+
+    group.setExclusive( true );
+    QVERIFY( !actOne->isChecked() );
+    QVERIFY( !actTwo->isChecked() );
+    QVERIFY( !actThree->isChecked() );
+
+    actOne->setChecked( true );
+    QVERIFY( actOne->isChecked() );
+    QVERIFY( !actTwo->isChecked() );
+    QVERIFY( !actThree->isChecked() );
+
+    actTwo->setChecked( true );
+    QVERIFY( !actOne->isChecked() );
+    QVERIFY( actTwo->isChecked() );
+    QVERIFY( !actThree->isChecked() );
+}
+
+void tst_QGuiActionGroup::exclusiveOptional()
+{
+    QGuiActionGroup group(0);
+    group.setExclusive(true);
+    QVERIFY( group.isExclusive() );
+
+    auto actOne = new QGuiAction(&group);
+    actOne->setCheckable( true );
+    auto actTwo = new QGuiAction(&group);
+    actTwo->setCheckable( true );
+    auto actThree = new QGuiAction(&group);
+    actThree->setCheckable( true );
+
+    QVERIFY( !actOne->isChecked() );
+    QVERIFY( !actTwo->isChecked() );
+    QVERIFY( !actThree->isChecked() );
+
+    actOne->trigger();
+    QVERIFY( actOne->isChecked() );
+    QVERIFY( !actTwo->isChecked() );
+    QVERIFY( !actThree->isChecked() );
+
+    actOne->trigger();
+    QVERIFY( actOne->isChecked() );
+    QVERIFY( !actTwo->isChecked() );
+    QVERIFY( !actThree->isChecked() );
+
+    group.setExclusionPolicy(QGuiActionGroup::ExclusionPolicy::ExclusiveOptional);
+    QVERIFY( group.isExclusive() );
+
+    actOne->trigger();
+    QVERIFY( !actOne->isChecked() );
+    QVERIFY( !actTwo->isChecked() );
+    QVERIFY( !actThree->isChecked() );
+
+    actTwo->trigger();
+    QVERIFY( !actOne->isChecked() );
+    QVERIFY( actTwo->isChecked() );
+    QVERIFY( !actThree->isChecked() );
+
+    actTwo->trigger();
+    QVERIFY( !actOne->isChecked() );
+    QVERIFY( !actTwo->isChecked() );
+    QVERIFY( !actThree->isChecked() );
+}
+
+void tst_QGuiActionGroup::testActionInTwoQActionGroup()
+{
+    QGuiAction action1("Action 1", this);
+
+    QGuiActionGroup group1(this);
+    QGuiActionGroup group2(this);
+
+    group1.addAction(&action1);
+    group2.addAction(&action1);
+
+    QCOMPARE(action1.guiActionGroup(), &group2);
+    QCOMPARE(group2.guiActions().constFirst(), &action1);
+    QCOMPARE(group1.guiActions().isEmpty(), true);
+}
+
+void tst_QGuiActionGroup::unCheckCurrentAction()
+{
+    QGuiActionGroup group(nullptr);
+    QGuiAction action1(&group) ,action2(&group);
+    action1.setCheckable(true);
+    action2.setCheckable(true);
+    QVERIFY(!action1.isChecked());
+    QVERIFY(!action2.isChecked());
+    action1.setChecked(true);
+    QVERIFY(action1.isChecked());
+    QVERIFY(!action2.isChecked());
+    auto current = group.checkedGuiAction();
+    QCOMPARE(current, &action1);
+    current->setChecked(false);
+    QVERIFY(!action1.isChecked());
+    QVERIFY(!action2.isChecked());
+    QVERIFY(!group.checkedGuiAction());
+}
+
+
+QTEST_MAIN(tst_QGuiActionGroup)
+#include "tst_qguiactiongroup.moc"
diff --git a/tests/auto/gui/kernel/qguiapplication/.prev_CMakeLists.txt b/tests/auto/gui/kernel/qguiapplication/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..30a6436ece
--- /dev/null
+++ b/tests/auto/gui/kernel/qguiapplication/.prev_CMakeLists.txt
@@ -0,0 +1,45 @@
+# Generated from qguiapplication.pro.
+
+if(NOT QT_FEATURE_private_tests)
+    return()
+endif()
+
+#####################################################################
+## tst_qguiapplication Test:
+#####################################################################
+
+add_qt_test(tst_qguiapplication
+    SOURCES
+        tst_qcoreapplication.cpp tst_qcoreapplication.h
+        tst_qguiapplication.cpp
+    DEFINES
+        QT_DISABLE_DEPRECATED_BEFORE=0x050E00
+    INCLUDE_DIRECTORIES
+        ../../../corelib/kernel/qcoreapplication
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::GuiPrivate
+)
+
+# Resources:
+set(tst_qguiapplication_resource_files
+    "icons/appicon.png"
+    "icons/usericon.png"
+)
+
+add_qt_resource(tst_qguiapplication "tst_qguiapplication"
+    PREFIX
+        "/"
+    FILES
+        ${tst_qguiapplication_resource_files}
+)
+
+
+## Scopes:
+#####################################################################
+
+#### Keys ignored in scope 3:.:../../../corelib/kernel/qcoreapplication:../../../corelib/kernel/qcoreapplication/qcoreapplication.pro:WIN32:
+# VERSION = "1.2.3.4"
+
+#### Keys ignored in scope 4:.:../../../corelib/kernel/qcoreapplication:../../../corelib/kernel/qcoreapplication/qcoreapplication.pro:else:
+# VERSION = "1.2.3"
diff --git a/tests/auto/gui/kernel/qguiapplication/BLACKLIST b/tests/auto/gui/kernel/qguiapplication/BLACKLIST
index e6ffe78ae3..58ca7bf782 100644
--- a/tests/auto/gui/kernel/qguiapplication/BLACKLIST
+++ b/tests/auto/gui/kernel/qguiapplication/BLACKLIST
@@ -1,3 +1,6 @@
 [focusObject]
 ubuntu-16.04
 opensuse-42.3
+
+[quitOnLastWindowClosedMulti]
+macos ci
diff --git a/tests/auto/gui/kernel/qguiapplication/CMakeLists.txt b/tests/auto/gui/kernel/qguiapplication/CMakeLists.txt
new file mode 100644
index 0000000000..24fa6572c1
--- /dev/null
+++ b/tests/auto/gui/kernel/qguiapplication/CMakeLists.txt
@@ -0,0 +1,55 @@
+# Generated from qguiapplication.pro.
+
+if(NOT QT_FEATURE_private_tests)
+    return()
+endif()
+
+#####################################################################
+## tst_qguiapplication Test:
+#####################################################################
+
+# special case begin
+if (WIN32)
+    set(target_version "1.2.3.4")
+else()
+    set(target_version "1.2.3")
+endif()
+# special case end
+
+add_qt_test(tst_qguiapplication
+    VERSION ${target_version}
+    SOURCES
+        ../../../corelib/kernel/qcoreapplication/tst_qcoreapplication.cpp ../../../corelib/kernel/qcoreapplication/tst_qcoreapplication.h # special case
+        tst_qguiapplication.cpp
+    DEFINES
+        QT_DISABLE_DEPRECATED_BEFORE=0x050E00
+    INCLUDE_DIRECTORIES
+        ../../../corelib/kernel/qcoreapplication
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::GuiPrivate
+        Threads::Threads # special case
+)
+
+# Resources:
+set(tst_qguiapplication_resource_files
+    "icons/appicon.png"
+    "icons/usericon.png"
+)
+
+add_qt_resource(tst_qguiapplication "tst_qguiapplication"
+    PREFIX
+        "/"
+    FILES
+        ${tst_qguiapplication_resource_files}
+)
+
+
+## Scopes:
+#####################################################################
+
+#### Keys ignored in scope 3:.:../../../corelib/kernel/qcoreapplication:../../../corelib/kernel/qcoreapplication/qcoreapplication.pro:WIN32:
+# VERSION = "1.2.3.4"
+
+#### Keys ignored in scope 4:.:../../../corelib/kernel/qcoreapplication:../../../corelib/kernel/qcoreapplication/qcoreapplication.pro:else:
+# VERSION = "1.2.3"
diff --git a/tests/auto/gui/kernel/qguieventdispatcher/CMakeLists.txt b/tests/auto/gui/kernel/qguieventdispatcher/CMakeLists.txt
new file mode 100644
index 0000000000..eb36e0ece7
--- /dev/null
+++ b/tests/auto/gui/kernel/qguieventdispatcher/CMakeLists.txt
@@ -0,0 +1,12 @@
+# Generated from qguieventdispatcher.pro.
+
+#####################################################################
+## tst_qguieventdispatcher Test:
+#####################################################################
+
+add_qt_test(tst_qguieventdispatcher
+    SOURCES
+        ../../../corelib/kernel/qeventdispatcher/tst_qeventdispatcher.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+)
diff --git a/tests/auto/gui/kernel/qguieventloop/.prev_CMakeLists.txt b/tests/auto/gui/kernel/qguieventloop/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..c4daa5a310
--- /dev/null
+++ b/tests/auto/gui/kernel/qguieventloop/.prev_CMakeLists.txt
@@ -0,0 +1,28 @@
+# Generated from qguieventloop.pro.
+
+#####################################################################
+## tst_qguieventloop Test:
+#####################################################################
+
+add_qt_test(tst_qguieventloop
+    SOURCES
+        ../../../corelib/kernel/qeventloop/tst_qeventloop.cpp
+    LIBRARIES
+        Qt::CorePrivate
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Network
+)
+
+## Scopes:
+#####################################################################
+
+extend_target(tst_qguieventloop CONDITION WIN32 AND NOT WINRT
+    PUBLIC_LIBRARIES
+        user32
+)
+
+extend_target(tst_qguieventloop CONDITION QT_FEATURE_glib
+    DEFINES
+        HAVE_GLIB
+)
diff --git a/tests/auto/gui/kernel/qguieventloop/CMakeLists.txt b/tests/auto/gui/kernel/qguieventloop/CMakeLists.txt
new file mode 100644
index 0000000000..de9a876e9d
--- /dev/null
+++ b/tests/auto/gui/kernel/qguieventloop/CMakeLists.txt
@@ -0,0 +1,27 @@
+# Generated from qguieventloop.pro.
+
+#####################################################################
+## tst_qguieventloop Test:
+#####################################################################
+
+add_qt_test(tst_qguieventloop
+    SOURCES
+        ../../../corelib/kernel/qeventloop/tst_qeventloop.cpp
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::Gui
+        Qt::Network
+)
+
+## Scopes:
+#####################################################################
+
+extend_target(tst_qguieventloop CONDITION WIN32 AND NOT WINRT
+    PUBLIC_LIBRARIES
+        user32
+)
+
+extend_target(tst_qguieventloop CONDITION QT_FEATURE_glib
+    DEFINES
+        HAVE_GLIB
+)
diff --git a/tests/auto/gui/kernel/qguimetatype/CMakeLists.txt b/tests/auto/gui/kernel/qguimetatype/CMakeLists.txt
new file mode 100644
index 0000000000..3701b3983a
--- /dev/null
+++ b/tests/auto/gui/kernel/qguimetatype/CMakeLists.txt
@@ -0,0 +1,12 @@
+# Generated from qguimetatype.pro.
+
+#####################################################################
+## tst_qguimetatype Test:
+#####################################################################
+
+add_qt_test(tst_qguimetatype
+    SOURCES
+        tst_qguimetatype.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+)
diff --git a/tests/auto/gui/kernel/qguimetatype/tst_qguimetatype.cpp b/tests/auto/gui/kernel/qguimetatype/tst_qguimetatype.cpp
index 81f0183728..f0c5bf79a7 100644
--- a/tests/auto/gui/kernel/qguimetatype/tst_qguimetatype.cpp
+++ b/tests/auto/gui/kernel/qguimetatype/tst_qguimetatype.cpp
@@ -67,7 +67,6 @@ private slots:
     F(QPen, QPen) \
     F(QTextLength, QTextLength) \
     F(QTextFormat, QTextFormat) \
-    F(QMatrix, QMatrix) \
     F(QTransform, QTransform) \
     F(QMatrix4x4, QMatrix4x4) \
     F(QVector2D, QVector2D) \
@@ -181,9 +180,13 @@ template<> struct TestValueFactory<QMetaType::QCursor> {
     static QCursor *create() { return new QCursor(Qt::WaitCursor); }
 };
 #endif
+
+#if QT_CONFIG(shortcut)
 template<> struct TestValueFactory<QMetaType::QKeySequence> {
     static QKeySequence *create() { return new QKeySequence(QKeySequence::Close); }
 };
+#endif
+
 template<> struct TestValueFactory<QMetaType::QPen> {
     static QPen *create() { return new QPen(Qt::DashDotDotLine); }
 };
@@ -193,14 +196,6 @@ template<> struct TestValueFactory<QMetaType::QTextLength> {
 template<> struct TestValueFactory<QMetaType::QTextFormat> {
     static QTextFormat *create() { return new QTextFormat(QTextFormat::FrameFormat); }
 };
-#if QT_DEPRECATED_SINCE(5, 15)
-QT_WARNING_PUSH
-QT_WARNING_DISABLE_DEPRECATED
-template<> struct TestValueFactory<QMetaType::QMatrix> {
-    static QMatrix *create() { return new QMatrix(10, 20, 30, 40, 50, 60); }
-};
-QT_WARNING_POP
-#endif
 template<> struct TestValueFactory<QMetaType::QTransform> {
     static QTransform *create() { return new QTransform(10, 20, 30, 40, 50, 60); }
 };
@@ -317,30 +312,10 @@ void tst_QGuiMetaType::sizeOf()
     QCOMPARE(QMetaType::sizeOf(type), size);
 }
 
-#ifndef Q_ALIGNOF
-template<uint N>
-struct RoundToNextHighestPowerOfTwo
-{
-private:
-    enum { V1 = N-1 };
-    enum { V2 = V1 | (V1 >> 1) };
-    enum { V3 = V2 | (V2 >> 2) };
-    enum { V4 = V3 | (V3 >> 4) };
-    enum { V5 = V4 | (V4 >> 8) };
-    enum { V6 = V5 | (V5 >> 16) };
-public:
-    enum { Value = V6 + 1 };
-};
-#endif
-
 template<class T>
 struct TypeAlignment
 {
-#ifdef Q_ALIGNOF
-    enum { Value = Q_ALIGNOF(T) };
-#else
-    enum { Value = RoundToNextHighestPowerOfTwo<sizeof(T)>::Value };
-#endif
+    enum { Value = alignof(T) };
 };
 
 void tst_QGuiMetaType::flags_data()
diff --git a/tests/auto/gui/kernel/qguishortcut/qguishortcut.pro b/tests/auto/gui/kernel/qguishortcut/qguishortcut.pro
new file mode 100644
index 0000000000..1417dee213
--- /dev/null
+++ b/tests/auto/gui/kernel/qguishortcut/qguishortcut.pro
@@ -0,0 +1,4 @@
+CONFIG += testcase
+TARGET = tst_qguishortcut
+QT += testlib
+SOURCES += tst_qguishortcut.cpp
diff --git a/tests/auto/gui/kernel/qguishortcut/tst_qguishortcut.cpp b/tests/auto/gui/kernel/qguishortcut/tst_qguishortcut.cpp
new file mode 100644
index 0000000000..bc3fb9862d
--- /dev/null
+++ b/tests/auto/gui/kernel/qguishortcut/tst_qguishortcut.cpp
@@ -0,0 +1,82 @@
+/****************************************************************************
+**
+** Copyright (C) 2019 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:GPL-EXCEPT$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 as published by the Free Software
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtTest/QtTest>
+#include <QtGui/qguiapplication.h>
+#include <QtGui/qguishortcut.h>
+#include <QtGui/qpainter.h>
+#include <QtGui/qrasterwindow.h>
+#include <QtGui/qscreen.h>
+#include <QtGui/qwindow.h>
+
+class tst_QGuiShortcut : public QObject
+{
+    Q_OBJECT
+public:
+
+private slots:
+    void trigger();
+};
+
+class ColoredWindow : public QRasterWindow {
+public:
+    ColoredWindow(QColor c) : m_color(c) {}
+
+protected:
+    void paintEvent(QPaintEvent *event) override;
+
+private:
+    const QColor m_color;
+};
+
+void ColoredWindow::paintEvent(QPaintEvent *)
+{
+    QPainter p(this);
+    p.fillRect(QRect(QPoint(), size()), m_color);
+}
+
+static void sendKey(QWindow *target, Qt::Key k, char c, Qt::KeyboardModifiers modifiers)
+{
+    QTest::sendKeyEvent(QTest::Press, target, k, c, modifiers);
+    QTest::sendKeyEvent(QTest::Release, target, k, c, modifiers);
+}
+
+void tst_QGuiShortcut::trigger()
+{
+    ColoredWindow w(Qt::yellow);
+    w.setTitle(QTest::currentTestFunction());
+    w.resize(QGuiApplication::primaryScreen()->size() / 4);
+    new QGuiShortcut(Qt::CTRL + Qt::Key_Q, &w, SLOT(close()));
+    w.show();
+    QVERIFY(QTest::qWaitForWindowExposed(&w));
+    sendKey(&w, Qt::Key_Q, 'q', Qt::ControlModifier);
+    QTRY_VERIFY(!w.isVisible());
+}
+
+QTEST_MAIN(tst_QGuiShortcut)
+#include "tst_qguishortcut.moc"
diff --git a/tests/auto/gui/kernel/qguitimer/.prev_CMakeLists.txt b/tests/auto/gui/kernel/qguitimer/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..c4e5117e8c
--- /dev/null
+++ b/tests/auto/gui/kernel/qguitimer/.prev_CMakeLists.txt
@@ -0,0 +1,13 @@
+# Generated from qguitimer.pro.
+
+#####################################################################
+## tst_qguitimer Test:
+#####################################################################
+
+add_qt_test(tst_qguitimer
+    SOURCES
+        ../../../corelib/kernel/qtimer/tst_qtimer.cpp
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::Gui
+)
diff --git a/tests/auto/gui/kernel/qguitimer/CMakeLists.txt b/tests/auto/gui/kernel/qguitimer/CMakeLists.txt
new file mode 100644
index 0000000000..2be3339fe3
--- /dev/null
+++ b/tests/auto/gui/kernel/qguitimer/CMakeLists.txt
@@ -0,0 +1,14 @@
+# Generated from qguitimer.pro.
+
+#####################################################################
+## tst_qguitimer Test:
+#####################################################################
+
+add_qt_test(tst_qguitimer
+    SOURCES
+        ../../../corelib/kernel/qtimer/tst_qtimer.cpp
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::Gui
+        Threads::Threads # special case
+)
diff --git a/tests/auto/gui/kernel/qguivariant/CMakeLists.txt b/tests/auto/gui/kernel/qguivariant/CMakeLists.txt
new file mode 100644
index 0000000000..3a0adab6e3
--- /dev/null
+++ b/tests/auto/gui/kernel/qguivariant/CMakeLists.txt
@@ -0,0 +1,4 @@
+# Generated from qguivariant.pro.
+
+add_subdirectory(test)
+add_subdirectory(no_application)
diff --git a/tests/auto/gui/kernel/qguivariant/no_application/CMakeLists.txt b/tests/auto/gui/kernel/qguivariant/no_application/CMakeLists.txt
new file mode 100644
index 0000000000..8261212801
--- /dev/null
+++ b/tests/auto/gui/kernel/qguivariant/no_application/CMakeLists.txt
@@ -0,0 +1,12 @@
+# Generated from no_application.pro.
+
+#####################################################################
+## no_application Test:
+#####################################################################
+
+add_qt_test(no_application
+    SOURCES
+        main.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+)
diff --git a/tests/auto/gui/kernel/qguivariant/test/CMakeLists.txt b/tests/auto/gui/kernel/qguivariant/test/CMakeLists.txt
new file mode 100644
index 0000000000..af2cea60e6
--- /dev/null
+++ b/tests/auto/gui/kernel/qguivariant/test/CMakeLists.txt
@@ -0,0 +1,38 @@
+# Generated from test.pro.
+
+#####################################################################
+## tst_qguivariant Test:
+#####################################################################
+
+add_qt_test(tst_qguivariant
+    SOURCES
+        tst_qguivariant.cpp
+    INCLUDE_DIRECTORIES
+        ../../../../other/qvariant_common
+    PUBLIC_LIBRARIES
+        Qt::Gui
+)
+
+# Resources:
+set(tst_qguivariant_resource_files
+    "black.png"
+    "black2.png"
+)
+
+add_qt_resource(tst_qguivariant "tst_qguivariant"
+    PREFIX
+        "/"
+    FILES
+        ${tst_qguivariant_resource_files}
+)
+set(qguivariant_resource_files
+    "data"
+)
+
+add_qt_resource(tst_qguivariant "qguivariant"
+    PREFIX
+        "/"
+    FILES
+        ${qguivariant_resource_files}
+)
+
diff --git a/tests/auto/gui/kernel/qguivariant/test/tst_qguivariant.cpp b/tests/auto/gui/kernel/qguivariant/test/tst_qguivariant.cpp
index 8b301c145a..12998add71 100644
--- a/tests/auto/gui/kernel/qguivariant/test/tst_qguivariant.cpp
+++ b/tests/auto/gui/kernel/qguivariant/test/tst_qguivariant.cpp
@@ -36,7 +36,6 @@
 #include <qcursor.h>
 #include <qimage.h>
 #include <qicon.h>
-#include <qmatrix.h>
 #include <qmatrix4x4.h>
 #include <qpen.h>
 #include <qpolygon.h>
@@ -87,8 +86,6 @@ private slots:
     void toBrush_data();
     void toBrush();
 
-    void matrix();
-
     void transform();
 
     void matrix4x4();
@@ -402,24 +399,6 @@ void tst_QGuiVariant::toString()
     QCOMPARE( str, result );
 }
 
-#if QT_DEPRECATED_SINCE(5, 15)
-QT_WARNING_PUSH
-QT_WARNING_DISABLE_DEPRECATED
-void tst_QGuiVariant::matrix()
-{
-    QVariant variant;
-    QMatrix matrix = qvariant_cast<QMatrix>(variant);
-    QVERIFY(matrix.isIdentity());
-    variant.setValue(QMatrix().rotate(90));
-    QCOMPARE(QMatrix().rotate(90), qvariant_cast<QMatrix>(variant));
-
-    void *mmatrix = QMetaType::create(QVariant::Matrix, 0);
-    QVERIFY(mmatrix);
-    QMetaType::destroy(QVariant::Matrix, mmatrix);
-}
-QT_WARNING_POP
-#endif
-
 void tst_QGuiVariant::matrix4x4()
 {
     QVariant variant;
@@ -711,7 +690,6 @@ void tst_QGuiVariant::implicitConstruction()
     F(Pen) \
     F(TextLength) \
     F(TextFormat) \
-    F(Matrix) \
     F(Transform) \
     F(Matrix4x4) \
     F(Vector2D) \
diff --git a/tests/auto/gui/kernel/qinputmethod/CMakeLists.txt b/tests/auto/gui/kernel/qinputmethod/CMakeLists.txt
new file mode 100644
index 0000000000..2eee15b816
--- /dev/null
+++ b/tests/auto/gui/kernel/qinputmethod/CMakeLists.txt
@@ -0,0 +1,14 @@
+# Generated from qinputmethod.pro.
+
+#####################################################################
+## tst_qinputmethod Test:
+#####################################################################
+
+add_qt_test(tst_qinputmethod
+    SOURCES
+        tst_qinputmethod.cpp
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::Gui
+        Qt::GuiPrivate
+)
diff --git a/tests/auto/gui/kernel/qkeyevent/CMakeLists.txt b/tests/auto/gui/kernel/qkeyevent/CMakeLists.txt
new file mode 100644
index 0000000000..2e36795375
--- /dev/null
+++ b/tests/auto/gui/kernel/qkeyevent/CMakeLists.txt
@@ -0,0 +1,12 @@
+# Generated from qkeyevent.pro.
+
+#####################################################################
+## tst_qkeyevent Test:
+#####################################################################
+
+add_qt_test(tst_qkeyevent
+    SOURCES
+        tst_qkeyevent.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+)
diff --git a/tests/auto/gui/kernel/qkeyevent/tst_qkeyevent.cpp b/tests/auto/gui/kernel/qkeyevent/tst_qkeyevent.cpp
index 87a47bd93b..6a928cac7a 100644
--- a/tests/auto/gui/kernel/qkeyevent/tst_qkeyevent.cpp
+++ b/tests/auto/gui/kernel/qkeyevent/tst_qkeyevent.cpp
@@ -64,8 +64,10 @@ public:
 
 private slots:
     void basicEventDelivery();
+#if QT_CONFIG(shortcut)
     void modifiers_data();
     void modifiers();
+#endif
 };
 
 tst_QKeyEvent::tst_QKeyEvent()
@@ -128,6 +130,8 @@ static QByteArray modifiersTestRowName(const QString &keySequence)
     return result;
 }
 
+#if QT_CONFIG(shortcut)
+
 void tst_QKeyEvent::modifiers_data()
 {
     struct Modifier
@@ -198,5 +202,7 @@ void tst_QKeyEvent::modifiers()
     }
 }
 
+#endif // QT_CONFIG(shortcut)
+
 QTEST_MAIN(tst_QKeyEvent)
 #include "tst_qkeyevent.moc"
diff --git a/tests/auto/gui/kernel/qkeysequence/CMakeLists.txt b/tests/auto/gui/kernel/qkeysequence/CMakeLists.txt
new file mode 100644
index 0000000000..07e480c9dd
--- /dev/null
+++ b/tests/auto/gui/kernel/qkeysequence/CMakeLists.txt
@@ -0,0 +1,28 @@
+# Generated from qkeysequence.pro.
+
+#####################################################################
+## tst_qkeysequence Test:
+#####################################################################
+
+add_qt_test(tst_qkeysequence
+    SOURCES
+        tst_qkeysequence.cpp
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::Gui
+        Qt::GuiPrivate
+)
+
+# Resources:
+set(qkeysequence_resource_files
+    "keys_de.qm"
+    "qt_de.qm"
+)
+
+add_qt_resource(tst_qkeysequence "qkeysequence"
+    PREFIX
+        "/"
+    FILES
+        ${qkeysequence_resource_files}
+)
+
diff --git a/tests/auto/gui/kernel/qmouseevent/CMakeLists.txt b/tests/auto/gui/kernel/qmouseevent/CMakeLists.txt
new file mode 100644
index 0000000000..4e1081c6ad
--- /dev/null
+++ b/tests/auto/gui/kernel/qmouseevent/CMakeLists.txt
@@ -0,0 +1,12 @@
+# Generated from qmouseevent.pro.
+
+#####################################################################
+## tst_qmouseevent Test:
+#####################################################################
+
+add_qt_test(tst_qmouseevent
+    SOURCES
+        tst_qmouseevent.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+)
diff --git a/tests/auto/gui/kernel/qmouseevent_modal/CMakeLists.txt b/tests/auto/gui/kernel/qmouseevent_modal/CMakeLists.txt
new file mode 100644
index 0000000000..c7f447ffeb
--- /dev/null
+++ b/tests/auto/gui/kernel/qmouseevent_modal/CMakeLists.txt
@@ -0,0 +1,13 @@
+# Generated from qmouseevent_modal.pro.
+
+#####################################################################
+## tst_qmouseevent_modal Test:
+#####################################################################
+
+add_qt_test(tst_qmouseevent_modal
+    SOURCES
+        tst_qmouseevent_modal.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+)
diff --git a/tests/auto/gui/kernel/qopenglwindow/CMakeLists.txt b/tests/auto/gui/kernel/qopenglwindow/CMakeLists.txt
new file mode 100644
index 0000000000..4176be9840
--- /dev/null
+++ b/tests/auto/gui/kernel/qopenglwindow/CMakeLists.txt
@@ -0,0 +1,15 @@
+# Generated from qopenglwindow.pro.
+
+#####################################################################
+## tst_qopenglwindow Test:
+#####################################################################
+
+add_qt_test(tst_qopenglwindow
+    SOURCES
+        tst_qopenglwindow.cpp
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::Gui
+        Qt::GuiPrivate
+        Qt::OpenGL
+)
diff --git a/tests/auto/gui/kernel/qopenglwindow/qopenglwindow.pro b/tests/auto/gui/kernel/qopenglwindow/qopenglwindow.pro
index 759b608c93..28b12f0677 100644
--- a/tests/auto/gui/kernel/qopenglwindow/qopenglwindow.pro
+++ b/tests/auto/gui/kernel/qopenglwindow/qopenglwindow.pro
@@ -1,6 +1,6 @@
 CONFIG += testcase
 TARGET = tst_qopenglwindow
 
-QT += core-private gui-private testlib
+QT += opengl core-private gui-private testlib
 
 SOURCES  += tst_qopenglwindow.cpp
diff --git a/tests/auto/gui/kernel/qopenglwindow/tst_qopenglwindow.cpp b/tests/auto/gui/kernel/qopenglwindow/tst_qopenglwindow.cpp
index 9c36b6898a..2785d57a42 100644
--- a/tests/auto/gui/kernel/qopenglwindow/tst_qopenglwindow.cpp
+++ b/tests/auto/gui/kernel/qopenglwindow/tst_qopenglwindow.cpp
@@ -26,7 +26,7 @@
 **
 ****************************************************************************/
 
-#include <QtGui/QOpenGLWindow>
+#include <QtOpenGL/QOpenGLWindow>
 #include <QtTest/QtTest>
 #include <QtGui/QOpenGLFunctions>
 #include <QtGui/QOpenGLContext>
diff --git a/tests/auto/gui/kernel/qpalette/CMakeLists.txt b/tests/auto/gui/kernel/qpalette/CMakeLists.txt
new file mode 100644
index 0000000000..4bd2ce7cc5
--- /dev/null
+++ b/tests/auto/gui/kernel/qpalette/CMakeLists.txt
@@ -0,0 +1,12 @@
+# Generated from qpalette.pro.
+
+#####################################################################
+## tst_qpalette Test:
+#####################################################################
+
+add_qt_test(tst_qpalette
+    SOURCES
+        tst_qpalette.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+)
diff --git a/tests/auto/gui/kernel/qpalette/tst_qpalette.cpp b/tests/auto/gui/kernel/qpalette/tst_qpalette.cpp
index 6ce6422f48..04343727bb 100644
--- a/tests/auto/gui/kernel/qpalette/tst_qpalette.cpp
+++ b/tests/auto/gui/kernel/qpalette/tst_qpalette.cpp
@@ -41,6 +41,12 @@ private Q_SLOTS:
     void copySemantics();
     void moveSemantics();
     void setBrush();
+
+    void isBrushSet();
+    void setAllPossibleBrushes();
+    void noBrushesSetForDefaultPalette();
+    void cannotCheckIfInvalidBrushSet();
+    void checkIfBrushForCurrentGroupSet();
 };
 
 void tst_QPalette::roleValues_data()
@@ -118,23 +124,35 @@ void tst_QPalette::resolve()
     QVERIFY(p2ResolvedTo1 != p2);
 }
 
+
+static void compareAllPaletteData(const QPalette &firstPalette, const QPalette &secondPalette)
+{
+    QCOMPARE(firstPalette, secondPalette);
+
+    // For historical reasons, operator== compares only brushes, but it's not enough for proper
+    // comparison after move/copy, because some additional data can also be moved/copied.
+    // Let's compare this data here.
+    QCOMPARE(firstPalette.resolve(), secondPalette.resolve());
+    QCOMPARE(firstPalette.currentColorGroup(), secondPalette.currentColorGroup());
+}
+
 void tst_QPalette::copySemantics()
 {
     QPalette src(Qt::red), dst;
     const QPalette control = src; // copy construction
     QVERIFY(src != dst);
     QVERIFY(!src.isCopyOf(dst));
-    QCOMPARE(src, control);
+    compareAllPaletteData(src, control);
     QVERIFY(src.isCopyOf(control));
     dst = src; // copy assignment
-    QCOMPARE(dst, src);
-    QCOMPARE(dst, control);
+    compareAllPaletteData(dst, src);
+    compareAllPaletteData(dst, control);
     QVERIFY(dst.isCopyOf(src));
 
     dst = QPalette(Qt::green);
     QVERIFY(dst != src);
     QVERIFY(dst != control);
-    QCOMPARE(src, control);
+    compareAllPaletteData(src, control);
     QVERIFY(!dst.isCopyOf(src));
     QVERIFY(src.isCopyOf(control));
 }
@@ -144,13 +162,13 @@ void tst_QPalette::moveSemantics()
     QPalette src(Qt::red), dst;
     const QPalette control = src;
     QVERIFY(src != dst);
-    QCOMPARE(src, control);
+    compareAllPaletteData(src, control);
     QVERIFY(!dst.isCopyOf(src));
     QVERIFY(!dst.isCopyOf(control));
     dst = std::move(src); // move assignment
     QVERIFY(!dst.isCopyOf(src)); // isCopyOf() works on moved-from palettes, too
     QVERIFY(dst.isCopyOf(control));
-    QCOMPARE(dst, control);
+    compareAllPaletteData(dst, control);
     src = control; // check moved-from 'src' can still be assigned to (doesn't crash)
     QVERIFY(src.isCopyOf(dst));
     QVERIFY(src.isCopyOf(control));
@@ -158,7 +176,7 @@ void tst_QPalette::moveSemantics()
     QVERIFY(!src.isCopyOf(dst));
     QVERIFY(!src.isCopyOf(dst2));
     QVERIFY(!src.isCopyOf(control));
-    QCOMPARE(dst2, control);
+    compareAllPaletteData(dst2, control);
     QVERIFY(dst2.isCopyOf(dst));
     QVERIFY(dst2.isCopyOf(control));
     // check moved-from 'src' can still be destroyed (doesn't crash)
@@ -194,5 +212,62 @@ void tst_QPalette::setBrush()
     QVERIFY(pp.isCopyOf(p));
 }
 
+void tst_QPalette::isBrushSet()
+{
+    QPalette p;
+
+    // Set only one color group
+    p.setBrush(QPalette::Active, QPalette::Mid, QBrush(Qt::red));
+    QVERIFY(p.isBrushSet(QPalette::Active, QPalette::Mid));
+    QVERIFY(!p.isBrushSet(QPalette::Inactive, QPalette::Mid));
+    QVERIFY(!p.isBrushSet(QPalette::Disabled, QPalette::Mid));
+
+    // Set all color groups
+    p.setBrush(QPalette::LinkVisited, QBrush(Qt::green));
+    QVERIFY(p.isBrushSet(QPalette::Active, QPalette::LinkVisited));
+    QVERIFY(p.isBrushSet(QPalette::Inactive, QPalette::LinkVisited));
+    QVERIFY(p.isBrushSet(QPalette::Disabled, QPalette::LinkVisited));
+}
+
+void tst_QPalette::setAllPossibleBrushes()
+{
+    QPalette p;
+
+    QCOMPARE(p.resolve(), QPalette::ResolveMask(0));
+
+    for (int r = 0; r < QPalette::NColorRoles; ++r) {
+        p.setBrush(QPalette::All, QPalette::ColorRole(r), Qt::red);
+    }
+
+    for (int r = 0; r < QPalette::NColorRoles; ++r) {
+        for (int g = 0; g < QPalette::NColorGroups; ++g) {
+            QVERIFY(p.isBrushSet(QPalette::ColorGroup(g), QPalette::ColorRole(r)));
+        }
+    }
+}
+
+void tst_QPalette::noBrushesSetForDefaultPalette()
+{
+    QCOMPARE(QPalette().resolve(), QPalette::ResolveMask(0));
+}
+
+void tst_QPalette::cannotCheckIfInvalidBrushSet()
+{
+    QPalette p(Qt::red);
+
+    QVERIFY(!p.isBrushSet(QPalette::All, QPalette::LinkVisited));
+    QVERIFY(!p.isBrushSet(QPalette::Active, QPalette::NColorRoles));
+}
+
+void tst_QPalette::checkIfBrushForCurrentGroupSet()
+{
+    QPalette p;
+
+    p.setCurrentColorGroup(QPalette::Disabled);
+    p.setBrush(QPalette::Current, QPalette::Link, QBrush(Qt::yellow));
+
+    QVERIFY(p.isBrushSet(QPalette::Current, QPalette::Link));
+}
+
 QTEST_MAIN(tst_QPalette)
 #include "tst_qpalette.moc"
diff --git a/tests/auto/gui/kernel/qpixelformat/CMakeLists.txt b/tests/auto/gui/kernel/qpixelformat/CMakeLists.txt
new file mode 100644
index 0000000000..43deb02af1
--- /dev/null
+++ b/tests/auto/gui/kernel/qpixelformat/CMakeLists.txt
@@ -0,0 +1,12 @@
+# Generated from qpixelformat.pro.
+
+#####################################################################
+## tst_qpixelformat Test:
+#####################################################################
+
+add_qt_test(tst_qpixelformat
+    SOURCES
+        tst_qpixelformat.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+)
diff --git a/tests/auto/gui/kernel/qrasterwindow/CMakeLists.txt b/tests/auto/gui/kernel/qrasterwindow/CMakeLists.txt
new file mode 100644
index 0000000000..9b586ce4c8
--- /dev/null
+++ b/tests/auto/gui/kernel/qrasterwindow/CMakeLists.txt
@@ -0,0 +1,14 @@
+# Generated from qrasterwindow.pro.
+
+#####################################################################
+## tst_qrasterwindow Test:
+#####################################################################
+
+add_qt_test(tst_qrasterwindow
+    SOURCES
+        tst_qrasterwindow.cpp
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::Gui
+        Qt::GuiPrivate
+)
diff --git a/tests/auto/gui/kernel/qscreen/CMakeLists.txt b/tests/auto/gui/kernel/qscreen/CMakeLists.txt
new file mode 100644
index 0000000000..dd54db4753
--- /dev/null
+++ b/tests/auto/gui/kernel/qscreen/CMakeLists.txt
@@ -0,0 +1,14 @@
+# Generated from qscreen.pro.
+
+#####################################################################
+## tst_qscreen Test:
+#####################################################################
+
+add_qt_test(tst_qscreen
+    SOURCES
+        tst_qscreen.cpp
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::Gui
+        Qt::GuiPrivate
+)
diff --git a/tests/auto/gui/kernel/qsurfaceformat/CMakeLists.txt b/tests/auto/gui/kernel/qsurfaceformat/CMakeLists.txt
new file mode 100644
index 0000000000..d12e1da106
--- /dev/null
+++ b/tests/auto/gui/kernel/qsurfaceformat/CMakeLists.txt
@@ -0,0 +1,14 @@
+# Generated from qsurfaceformat.pro.
+
+#####################################################################
+## tst_qsurfaceformat Test:
+#####################################################################
+
+add_qt_test(tst_qsurfaceformat
+    SOURCES
+        tst_qsurfaceformat.cpp
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::Gui
+        Qt::GuiPrivate
+)
diff --git a/tests/auto/gui/kernel/qtouchevent/CMakeLists.txt b/tests/auto/gui/kernel/qtouchevent/CMakeLists.txt
new file mode 100644
index 0000000000..7d489e3066
--- /dev/null
+++ b/tests/auto/gui/kernel/qtouchevent/CMakeLists.txt
@@ -0,0 +1,14 @@
+# Generated from qtouchevent.pro.
+
+#####################################################################
+## tst_qtouchevent Test:
+#####################################################################
+
+add_qt_test(tst_qtouchevent
+    SOURCES
+        tst_qtouchevent.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::GuiPrivate
+        Qt::Widgets
+)
diff --git a/tests/auto/gui/kernel/qwindow/CMakeLists.txt b/tests/auto/gui/kernel/qwindow/CMakeLists.txt
new file mode 100644
index 0000000000..cfd17219bd
--- /dev/null
+++ b/tests/auto/gui/kernel/qwindow/CMakeLists.txt
@@ -0,0 +1,22 @@
+# Generated from qwindow.pro.
+
+#####################################################################
+## tst_qwindow Test:
+#####################################################################
+
+add_qt_test(tst_qwindow
+    SOURCES
+        tst_qwindow.cpp
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::Gui
+        Qt::GuiPrivate
+)
+
+## Scopes:
+#####################################################################
+
+extend_target(tst_qwindow CONDITION QT_FEATURE_dynamicgl AND WIN32 AND NOT WINRT
+    PUBLIC_LIBRARIES
+        user32
+)
diff --git a/tests/auto/gui/math3d/CMakeLists.txt b/tests/auto/gui/math3d/CMakeLists.txt
new file mode 100644
index 0000000000..91e59874b7
--- /dev/null
+++ b/tests/auto/gui/math3d/CMakeLists.txt
@@ -0,0 +1,3 @@
+add_subdirectory("qquaternion")
+add_subdirectory("qvectornd")
+add_subdirectory("qmatrixnxn")
diff --git a/tests/auto/gui/math3d/qmatrixnxn/CMakeLists.txt b/tests/auto/gui/math3d/qmatrixnxn/CMakeLists.txt
new file mode 100644
index 0000000000..71daeba361
--- /dev/null
+++ b/tests/auto/gui/math3d/qmatrixnxn/CMakeLists.txt
@@ -0,0 +1,14 @@
+# Generated from qmatrixnxn.pro.
+
+#####################################################################
+## tst_qmatrixnxn Test:
+#####################################################################
+
+add_qt_test(tst_qmatrixnxn
+    SOURCES
+        tst_qmatrixnxn.cpp
+    DEFINES
+        QT_DISABLE_DEPRECATED_BEFORE=0
+    PUBLIC_LIBRARIES
+        Qt::Gui
+)
diff --git a/tests/auto/gui/math3d/qmatrixnxn/tst_qmatrixnxn.cpp b/tests/auto/gui/math3d/qmatrixnxn/tst_qmatrixnxn.cpp
index 3c4f2f2e75..c39fd7f7bc 100644
--- a/tests/auto/gui/math3d/qmatrixnxn/tst_qmatrixnxn.cpp
+++ b/tests/auto/gui/math3d/qmatrixnxn/tst_qmatrixnxn.cpp
@@ -139,12 +139,11 @@ private slots:
 
     void convertGeneric();
 
-    void optimize_data();
-    void optimize();
+//    void optimize_data();
+//    void optimize();
 
     void columnsAndRows();
 
-    void convertQMatrix();
     void convertQTransform();
 
     void fill();
@@ -2882,6 +2881,7 @@ void tst_QMatrixNxN::convertGeneric()
 #endif
 }
 
+/*
 // Copy of "flagBits" in qmatrix4x4.h.
 enum {
     Identity        = 0x0000, // Identity matrix
@@ -3015,7 +3015,7 @@ void tst_QMatrixNxN::optimize()
 
     QCOMPARE(reinterpret_cast<Matrix4x4 *>(&m)->flagBits, flagBits);
 }
-
+*/
 void tst_QMatrixNxN::columnsAndRows()
 {
     QMatrix4x4 m1(uniqueValues4);
@@ -3061,58 +3061,6 @@ void tst_QMatrixNxN::columnsAndRows()
     QVERIFY(m1.row(3) == QVector4D(4, 8, 12, 16));
 }
 
-#if QT_DEPRECATED_SINCE(5, 15)
-QT_WARNING_PUSH
-QT_WARNING_DISABLE_DEPRECATED
-// Test converting QMatrix objects into QMatrix4x4 and then
-// checking that transformations in the original perform the
-// equivalent transformations in the new matrix.
-void tst_QMatrixNxN::convertQMatrix()
-{
-    QMatrix m1;
-    m1.translate(-3.5, 2.0);
-    QPointF p1 = m1.map(QPointF(100.0, 150.0));
-    QCOMPARE(p1.x(), 100.0 - 3.5);
-    QCOMPARE(p1.y(), 150.0 + 2.0);
-
-    QMatrix4x4 m2(m1);
-    QPointF p2 = m2 * QPointF(100.0, 150.0);
-    QCOMPARE((double)p2.x(), 100.0 - 3.5);
-    QCOMPARE((double)p2.y(), 150.0 + 2.0);
-    QCOMPARE(m1, m2.toAffine());
-
-    QMatrix m3;
-    m3.scale(1.5, -2.0);
-    QPointF p3 = m3.map(QPointF(100.0, 150.0));
-    QCOMPARE(p3.x(), 1.5 * 100.0);
-    QCOMPARE(p3.y(), -2.0 * 150.0);
-
-    QMatrix4x4 m4(m3);
-    QPointF p4 = m4 * QPointF(100.0, 150.0);
-    QCOMPARE((double)p4.x(), 1.5 * 100.0);
-    QCOMPARE((double)p4.y(), -2.0 * 150.0);
-    QCOMPARE(m3, m4.toAffine());
-
-    QMatrix m5;
-    m5.rotate(45.0);
-    QPointF p5 = m5.map(QPointF(100.0, 150.0));
-
-    QMatrix4x4 m6(m5);
-    QPointF p6 = m6 * QPointF(100.0, 150.0);
-    QVERIFY(qFuzzyCompare(float(p5.x()), float(p6.x())));
-    QVERIFY(qFuzzyCompare(float(p5.y()), float(p6.y())));
-
-    QMatrix m7 = m6.toAffine();
-    QVERIFY(qFuzzyCompare(float(m5.m11()), float(m7.m11())));
-    QVERIFY(qFuzzyCompare(float(m5.m12()), float(m7.m12())));
-    QVERIFY(qFuzzyCompare(float(m5.m21()), float(m7.m21())));
-    QVERIFY(qFuzzyCompare(float(m5.m22()), float(m7.m22())));
-    QVERIFY(qFuzzyCompare(float(m5.dx()), float(m7.dx())));
-    QVERIFY(qFuzzyCompare(float(m5.dy()), float(m7.dy())));
-}
-QT_WARNING_POP
-#endif
-
 // Test converting QTransform objects into QMatrix4x4 and then
 // checking that transformations in the original perform the
 // equivalent transformations in the new matrix.
diff --git a/tests/auto/gui/math3d/qquaternion/CMakeLists.txt b/tests/auto/gui/math3d/qquaternion/CMakeLists.txt
new file mode 100644
index 0000000000..77d035cbf9
--- /dev/null
+++ b/tests/auto/gui/math3d/qquaternion/CMakeLists.txt
@@ -0,0 +1,12 @@
+# Generated from qquaternion.pro.
+
+#####################################################################
+## tst_qquaternion Test:
+#####################################################################
+
+add_qt_test(tst_qquaternion
+    SOURCES
+        tst_qquaternion.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+)
diff --git a/tests/auto/gui/math3d/qvectornd/CMakeLists.txt b/tests/auto/gui/math3d/qvectornd/CMakeLists.txt
new file mode 100644
index 0000000000..5d8a373234
--- /dev/null
+++ b/tests/auto/gui/math3d/qvectornd/CMakeLists.txt
@@ -0,0 +1,12 @@
+# Generated from qvectornd.pro.
+
+#####################################################################
+## tst_qvectornd Test:
+#####################################################################
+
+add_qt_test(tst_qvectornd
+    SOURCES
+        tst_qvectornd.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+)
diff --git a/tests/auto/gui/painting/CMakeLists.txt b/tests/auto/gui/painting/CMakeLists.txt
new file mode 100644
index 0000000000..7cb4c55cee
--- /dev/null
+++ b/tests/auto/gui/painting/CMakeLists.txt
@@ -0,0 +1,19 @@
+# Generated from painting.pro.
+
+add_subdirectory("qpainterpath")
+add_subdirectory("qpainterpathstroker")
+# add_subdirectory("qcolor")
+# add_subdirectory("qbrush")
+# add_subdirectory("qregion")
+# add_subdirectory("qpagelayout")
+add_subdirectory("qpagesize")
+# add_subdirectory("qpainter")
+if (QT_FEATURE_private_tests)
+    # not converted yet
+    #add_subdirectory("qpathclipper")
+endif()
+# add_subdirectory("qpdfwriter")
+add_subdirectory("qpen")
+add_subdirectory("qpaintengine")
+# add_subdirectory("qtransform")
+# add_subdirectory("qpolygon")
diff --git a/tests/auto/gui/painting/painting.pro b/tests/auto/gui/painting/painting.pro
index 26e84c1b15..3fdb0db760 100644
--- a/tests/auto/gui/painting/painting.pro
+++ b/tests/auto/gui/painting/painting.pro
@@ -14,7 +14,6 @@ SUBDIRS=\
    qpen \
    qpaintengine \
    qtransform \
-   qwmatrix \
    qpolygon \
 
 !qtConfig(private_tests): SUBDIRS -= \
diff --git a/tests/auto/gui/painting/qcolor/tst_qcolor.cpp b/tests/auto/gui/painting/qcolor/tst_qcolor.cpp
index 07c820dc86..f8502c1e2f 100644
--- a/tests/auto/gui/painting/qcolor/tst_qcolor.cpp
+++ b/tests/auto/gui/painting/qcolor/tst_qcolor.cpp
@@ -1032,6 +1032,15 @@ void tst_QColor::setRgbF()
             QCOMPARE(qfloat16(b2), qfloat16(b));
         }
     }
+    QVERIFY(color.isValid());
+    QColor invalidRgb = color;
+    QColor invalidRgbF = color;
+    QTest::ignoreMessage(QtWarningMsg, "QColor::setRgb: RGB parameters out of range");
+    invalidRgb.setRgb(-1, -1, -1);
+    QTest::ignoreMessage(QtWarningMsg, "QColor::setRgb: RGB parameters out of range");
+    invalidRgbF.setRgb(-1, -1, -1, -1);
+    QVERIFY(!invalidRgb.isValid());
+    QVERIFY(!invalidRgbF.isValid());
 }
 
 void tst_QColor::setRgba()
@@ -1146,6 +1155,16 @@ void tst_QColor::setHsv()
             QCOMPARE(v2, v);
         }
     }
+    QVERIFY(color.isValid());
+    QVERIFY(color.isValid());
+    QColor invalidHsv = color;
+    QColor invalidHsvF = color;
+    QTest::ignoreMessage(QtWarningMsg, "QColor::setHsv: HSV parameters out of range");
+    invalidHsv.setHsv(-1, -1, -1);
+    QTest::ignoreMessage(QtWarningMsg, "QColor::setHsvF: HSV parameters out of range");
+    invalidHsvF.setHsvF(-1, -1, -1);
+    QVERIFY(!invalidHsv.isValid());
+    QVERIFY(!invalidHsvF.isValid());
 }
 
 void tst_QColor::setCmyk()
@@ -1271,6 +1290,15 @@ void tst_QColor::setCmyk()
             QCOMPARE(k2, k);
         }
     }
+    QVERIFY(color.isValid());
+    QColor invalidCmyk = color;
+    QColor invalidCmykF = color;
+    QTest::ignoreMessage(QtWarningMsg, "QColor::setCmyk: CMYK parameters out of range");
+    invalidCmyk.setCmyk(-1, -1, -1, -1, -1);
+    QTest::ignoreMessage(QtWarningMsg, "QColor::setCmykF: CMYK parameters out of range");
+    invalidCmykF.setCmykF(-1, -1, -1, -1, -1);
+    QVERIFY(!invalidCmyk.isValid());
+    QVERIFY(!invalidCmykF.isValid());
 }
 
 void tst_QColor::setHsl()
@@ -1372,6 +1400,15 @@ void tst_QColor::setHsl()
             QCOMPARE(l2, l);
         }
     }
+    QVERIFY(color.isValid());
+    QColor invalidHsl = color;
+    QColor invalidHslF = color;
+    QTest::ignoreMessage(QtWarningMsg, "QColor::setHsl: HSL parameters out of range");
+    invalidHsl.setHsl(-1, -1, -1, -1);
+    QTest::ignoreMessage(QtWarningMsg, "QColor::setHslF: HSL parameters out of range");
+    invalidHslF.setHslF(-1, -1, -1, -1);
+    QVERIFY(!invalidHsl.isValid());
+    QVERIFY(!invalidHslF.isValid());
 }
 
 void tst_QColor::toRgb_data()
diff --git a/tests/auto/gui/painting/qpagesize/CMakeLists.txt b/tests/auto/gui/painting/qpagesize/CMakeLists.txt
new file mode 100644
index 0000000000..260abfbc0f
--- /dev/null
+++ b/tests/auto/gui/painting/qpagesize/CMakeLists.txt
@@ -0,0 +1,14 @@
+# Generated from qpagesize.pro.
+
+#####################################################################
+## tst_qpagesize Test:
+#####################################################################
+
+add_qt_test(tst_qpagesize
+    SOURCES
+        tst_qpagesize.cpp
+    DEFINES
+        QT_USE_USING_NAMESPACE
+    PUBLIC_LIBRARIES
+        Qt::Gui
+)
diff --git a/tests/auto/gui/painting/qpaintengine/CMakeLists.txt b/tests/auto/gui/painting/qpaintengine/CMakeLists.txt
new file mode 100644
index 0000000000..8125a98d3e
--- /dev/null
+++ b/tests/auto/gui/painting/qpaintengine/CMakeLists.txt
@@ -0,0 +1,12 @@
+# Generated from qpaintengine.pro.
+
+#####################################################################
+## tst_qpaintengine Test:
+#####################################################################
+
+add_qt_test(tst_qpaintengine
+    SOURCES
+        tst_qpaintengine.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+)
diff --git a/tests/auto/gui/painting/qpainter/tst_qpainter.cpp b/tests/auto/gui/painting/qpainter/tst_qpainter.cpp
index 9eb62ceab2..7418f447e6 100644
--- a/tests/auto/gui/painting/qpainter/tst_qpainter.cpp
+++ b/tests/auto/gui/painting/qpainter/tst_qpainter.cpp
@@ -140,7 +140,7 @@ private slots:
 
     void setWindow();
 
-    void combinedMatrix();
+    void combinedTransform();
     void renderHints();
 
     void disableEnableClipping();
@@ -1692,7 +1692,7 @@ void tst_QPainter::setWindow()
     QVERIFY(195 < painted.height() && painted.height() < 205); // correct value is around 200
 }
 
-void tst_QPainter::combinedMatrix()
+void tst_QPainter::combinedTransform()
 {
     QPixmap pm(64, 64);
 
@@ -1703,15 +1703,7 @@ void tst_QPainter::combinedMatrix()
     p.translate(0.5, 0.5);
 
     QTransform ct = p.combinedTransform();
-#if QT_DEPRECATED_SINCE(5, 13)
-QT_WARNING_PUSH
-QT_WARNING_DISABLE_DEPRECATED
-    QMatrix cm = p.combinedMatrix();
-    QCOMPARE(cm, ct.toAffine());
-QT_WARNING_POP
-#endif
-
-    QPointF pt = QPointF(0, 0) * ct.toAffine();
+    QPointF pt = QPointF(0, 0) * ct;
 
     QCOMPARE(pt.x(), 48.0);
     QCOMPARE(pt.y(), 16.0);
@@ -4067,7 +4059,7 @@ void tst_QPainter::drawPolygon()
     path.moveTo(2, 34);
     path.lineTo(34, 2);
 
-    QPolygonF poly = stroker.createStroke(path).toFillPolygon(QTransform());
+    QPolygonF poly = stroker.createStroke(path).toFillPolygon();
 
     img.fill(0xffffffff);
     QPainter p(&img);
@@ -4135,24 +4127,12 @@ void tst_QPainter::inactivePainter()
     p.setClipRegion(region);
     p.setClipping(true);
 
-#if QT_DEPRECATED_SINCE(5, 13)
-QT_WARNING_PUSH
-QT_WARNING_DISABLE_DEPRECATED
-    p.combinedMatrix();
-QT_WARNING_POP
-#endif
     p.combinedTransform();
 
     p.compositionMode();
     p.setCompositionMode(QPainter::CompositionMode_Plus);
 
     p.device();
-#if QT_DEPRECATED_SINCE(5, 13)
-QT_WARNING_PUSH
-QT_WARNING_DISABLE_DEPRECATED
-    p.deviceMatrix();
-QT_WARNING_POP
-#endif
     p.deviceTransform();
 
     p.font();
@@ -4176,12 +4156,6 @@ QT_WARNING_POP
     p.setRenderHint(QPainter::Antialiasing, true);
     p.setRenderHints(QPainter::Antialiasing | QPainter::SmoothPixmapTransform, false);
 
-#if QT_DEPRECATED_SINCE(5, 13)
-QT_WARNING_PUSH
-QT_WARNING_DISABLE_DEPRECATED
-    p.resetMatrix();
-QT_WARNING_POP
-#endif
     p.resetTransform();
     p.rotate(1);
     p.scale(2, 2);
@@ -4197,13 +4171,9 @@ QT_WARNING_POP
     p.window();
     p.setWindow(QRect(10, 10, 620, 460));
 
-#if QT_DEPRECATED_SINCE(5, 13)
-QT_WARNING_PUSH
-QT_WARNING_DISABLE_DEPRECATED
-    p.worldMatrix();
-    p.setWorldMatrix(QMatrix().translate(43, 21), true);
-QT_WARNING_POP
-#endif
+    p.worldTransform();
+    p.setWorldTransform(QTransform().translate(43, 21), true);
+
     p.setWorldMatrixEnabled(true);
 
     p.transform();
diff --git a/tests/auto/gui/painting/qpainterpath/CMakeLists.txt b/tests/auto/gui/painting/qpainterpath/CMakeLists.txt
new file mode 100644
index 0000000000..c2c88cc258
--- /dev/null
+++ b/tests/auto/gui/painting/qpainterpath/CMakeLists.txt
@@ -0,0 +1,12 @@
+# Generated from qpainterpath.pro.
+
+#####################################################################
+## tst_qpainterpath Test:
+#####################################################################
+
+add_qt_test(tst_qpainterpath
+    SOURCES
+        tst_qpainterpath.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+)
diff --git a/tests/auto/gui/painting/qpainterpathstroker/CMakeLists.txt b/tests/auto/gui/painting/qpainterpathstroker/CMakeLists.txt
new file mode 100644
index 0000000000..a1c5f6547f
--- /dev/null
+++ b/tests/auto/gui/painting/qpainterpathstroker/CMakeLists.txt
@@ -0,0 +1,12 @@
+# Generated from qpainterpathstroker.pro.
+
+#####################################################################
+## tst_qpainterpathstroker Test:
+#####################################################################
+
+add_qt_test(tst_qpainterpathstroker
+    SOURCES
+        tst_qpainterpathstroker.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+)
diff --git a/tests/auto/gui/painting/qpen/CMakeLists.txt b/tests/auto/gui/painting/qpen/CMakeLists.txt
new file mode 100644
index 0000000000..d096f7a6ce
--- /dev/null
+++ b/tests/auto/gui/painting/qpen/CMakeLists.txt
@@ -0,0 +1,12 @@
+# Generated from qpen.pro.
+
+#####################################################################
+## tst_qpen Test:
+#####################################################################
+
+add_qt_test(tst_qpen
+    SOURCES
+        tst_qpen.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+)
diff --git a/tests/auto/gui/painting/qtransform/tst_qtransform.cpp b/tests/auto/gui/painting/qtransform/tst_qtransform.cpp
index 78638a7518..97c6ad60b8 100644
--- a/tests/auto/gui/painting/qtransform/tst_qtransform.cpp
+++ b/tests/auto/gui/painting/qtransform/tst_qtransform.cpp
@@ -46,8 +46,6 @@ private slots:
     void qhash();
     void translate();
     void scale();
-    void matrix();
-    void testOffset();
     void types();
     void types2_data();
     void types2();
@@ -372,67 +370,6 @@ void tst_QTransform::scale()
     QVERIFY( QTransform::fromScale( 1, 1 ) == QTransform());
 }
 
-#if QT_DEPRECATED_SINCE(5, 15)
-QT_WARNING_PUSH
-QT_WARNING_DISABLE_DEPRECATED
-void tst_QTransform::matrix()
-{
-    QMatrix mat1;
-    mat1.scale(0.3, 0.7);
-    mat1.translate(53.3, 94.4);
-    mat1.rotate(45);
-
-    QMatrix mat2;
-    mat2.rotate(33);
-    mat2.scale(0.6, 0.6);
-    mat2.translate(13.333, 7.777);
-
-    QTransform tran1(mat1);
-    QTransform tran2(mat2);
-    QTransform dummy;
-    dummy.setMatrix(mat1.m11(), mat1.m12(), 0,
-                    mat1.m21(), mat1.m22(), 0,
-                    mat1.dx(), mat1.dy(), 1);
-
-    QCOMPARE(tran1, dummy);
-    QCOMPARE(tran1.inverted(), dummy.inverted());
-    QCOMPARE(tran1.inverted(), QTransform(mat1.inverted()));
-    QCOMPARE(tran2.inverted(), QTransform(mat2.inverted()));
-
-    QMatrix mat3 = mat1 * mat2;
-    QTransform tran3 = tran1 * tran2;
-    QCOMPARE(QTransform(mat3), tran3);
-
-    /* QMatrix::operator==() doesn't use qFuzzyCompare(), which
-     * on win32-g++ results in a failure. So we work around it by
-     * calling QTranform::operator==(), which performs a fuzzy compare. */
-    QCOMPARE(QTransform(mat3), QTransform(tran3.toAffine()));
-
-    QTransform tranInv = tran1.inverted();
-    QMatrix   matInv = mat1.inverted();
-
-    QRect rect(43, 70, 200, 200);
-    QPoint pt(43, 66);
-    QCOMPARE(tranInv.mapRect(rect), matInv.mapRect(rect));
-    QCOMPARE(tranInv.map(pt), matInv.map(pt));
-
-    QPainterPath path;
-    path.moveTo(55, 60);
-    path.lineTo(110, 110);
-    path.quadTo(220, 50, 10, 20);
-    path.closeSubpath();
-    QCOMPARE(tranInv.map(path), matInv.map(path));
-}
-
-void tst_QTransform::testOffset()
-{
-    QTransform trans;
-    const QMatrix &aff = trans.toAffine();
-    QCOMPARE((void*)(&aff), (void*)(&trans));
-}
-QT_WARNING_POP
-#endif
-
 void tst_QTransform::types()
 {
     QTransform m1;
diff --git a/tests/auto/gui/painting/qwmatrix/qwmatrix.pro b/tests/auto/gui/painting/qwmatrix/qwmatrix.pro
deleted file mode 100644
index de6454025c..0000000000
--- a/tests/auto/gui/painting/qwmatrix/qwmatrix.pro
+++ /dev/null
@@ -1,6 +0,0 @@
-CONFIG += testcase
-TARGET = tst_qwmatrix
-SOURCES  += tst_qwmatrix.cpp
-QT += testlib
-
-unix:!darwin:!haiku:!integrity: LIBS += -lm
diff --git a/tests/auto/gui/painting/qwmatrix/tst_qwmatrix.cpp b/tests/auto/gui/painting/qwmatrix/tst_qwmatrix.cpp
deleted file mode 100644
index 281639c27a..0000000000
--- a/tests/auto/gui/painting/qwmatrix/tst_qwmatrix.cpp
+++ /dev/null
@@ -1,334 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-
-#include <QtTest/QtTest>
-#include <qmatrix.h>
-#include <qmath.h>
-#include <qpolygon.h>
-
-#if QT_DEPRECATED_SINCE(5, 15)
-QT_WARNING_PUSH
-QT_WARNING_DISABLE_DEPRECATED
-
-class tst_QWMatrix : public QObject
-{
-    Q_OBJECT
-
-private slots:
-    void mapRect_data();
-    void mapToPolygon_data();
-    void mapRect();
-    void operator_star_qwmatrix();
-    void assignments();
-    void mapToPolygon();
-    void translate();
-    void scale();
-    void mapPolygon();
-
-private:
-    void mapping_data();
-};
-
-void tst_QWMatrix::mapRect_data()
-{
-    mapping_data();
-}
-
-void tst_QWMatrix::mapToPolygon_data()
-{
-    mapping_data();
-}
-
-void tst_QWMatrix::mapping_data()
-{
-    //create the testtable instance and define the elements
-    QTest::addColumn<QMatrix>("matrix");
-    QTest::addColumn<QRect>("src");
-    QTest::addColumn<QPolygon>("res");
-
-    //next we fill it with data
-
-    // identity
-    QTest::newRow( "identity" ) << QMatrix( 1, 0, 0, 1, 0, 0 )
-                                << QRect( 10, 20, 30, 40 )
-                                << QPolygon( QRect( 10, 20, 30, 40 ) );
-    // scaling
-    QTest::newRow( "scale 0" )  << QMatrix( 2, 0, 0, 2, 0, 0 )
-                                << QRect( 10, 20, 30, 40 )
-                                << QPolygon( QRect( 20, 40, 60, 80 ) );
-    QTest::newRow( "scale 1" )  << QMatrix( 10, 0, 0, 10, 0, 0 )
-                                << QRect( 10, 20, 30, 40 )
-                                << QPolygon( QRect( 100, 200, 300, 400 ) );
-    // mirroring
-    QTest::newRow( "mirror 0" ) << QMatrix( -1, 0, 0, 1, 0, 0 )
-                                << QRect( 10, 20, 30, 40 )
-                                << QPolygon( QRect( -40, 20, 30, 40 ) );
-    QTest::newRow( "mirror 1" ) << QMatrix( 1, 0, 0, -1, 0, 0 )
-                                << QRect( 10, 20, 30, 40 )
-                                << QPolygon( QRect( 10, -60, 30, 40 ) );
-    QTest::newRow( "mirror 2" ) << QMatrix( -1, 0, 0, -1, 0, 0 )
-                                << QRect( 10, 20, 30, 40 )
-                                << QPolygon( QRect( -40, -60, 30, 40 ) );
-    QTest::newRow( "mirror 3" ) << QMatrix( -2, 0, 0, -2, 0, 0 )
-                                << QRect( 10, 20, 30, 40 )
-                                << QPolygon( QRect( -80, -120, 60, 80 ) );
-    QTest::newRow( "mirror 4" ) << QMatrix( -10, 0, 0, -10, 0, 0 )
-                                << QRect( 10, 20, 30, 40 )
-                                << QPolygon( QRect( -400, -600, 300, 400 ) );
-    QTest::newRow( "mirror 5" ) << QMatrix( -1, 0, 0, 1, 0, 0 )
-                                << QRect( 0, 0, 30, 40 )
-                                << QPolygon( QRect( -30, 0, 30, 40 ) );
-    QTest::newRow( "mirror 6" ) << QMatrix( 1, 0, 0, -1, 0, 0 )
-                                << QRect( 0, 0, 30, 40 )
-                                << QPolygon( QRect( 0, -40, 30, 40 ) );
-    QTest::newRow( "mirror 7" ) << QMatrix( -1, 0, 0, -1, 0, 0 )
-                                << QRect( 0, 0, 30, 40 )
-                                << QPolygon( QRect( -30, -40, 30, 40 ) );
-    QTest::newRow( "mirror 8" ) << QMatrix( -2, 0, 0, -2, 0, 0 )
-                                << QRect( 0, 0, 30, 40 )
-                                << QPolygon( QRect( -60, -80, 60, 80 ) );
-    QTest::newRow( "mirror 9" ) << QMatrix( -10, 0, 0, -10, 0, 0 )
-                                << QRect( 0, 0, 30, 40 )
-                                << QPolygon( QRect( -300, -400, 300, 400 ) );
-
-    const auto rotate = [](qreal degrees) {
-        const qreal rad = qDegreesToRadians(degrees);
-        return QMatrix(std::cos(rad), -std::sin(rad),
-                       std::sin(rad),  std::cos(rad), 0, 0);
-    };
-
-    // rotations
-    QTest::newRow( "rot 0 a" )  << rotate(0.)
-                                << QRect( 0, 0, 30, 40 )
-                                << QPolygon ( QRect( 0, 0, 30, 40 ) );
-    QTest::newRow( "rot 0 b" )  << rotate(0.00001f)
-                                << QRect( 0, 0, 30, 40 )
-                                << QPolygon ( QRect( 0, 0, 30, 40 ) );
-    QTest::newRow( "rot 0 c" )  << rotate(0.)
-                                << QRect( 10, 20, 30, 40 )
-                                << QPolygon ( QRect( 10, 20, 30, 40 ) );
-    QTest::newRow( "rot 0 d" )  << rotate(0.00001f)
-                                << QRect( 10, 20, 30, 40 )
-                                << QPolygon ( QRect( 10, 20, 30, 40 ) );
-
-#if 0
-    const auto rotScale = [](qreal degrees, qreal scale) {
-        const qreal rad = qDegreesToRadians(degrees);
-        return QMatrix(scale * std::cos(rad), -scale * std::sin(rad),
-                       scale * std::sin(rad),  scale * std::cos(rad), 0, 0);
-    };
-    // rotations with scaling
-    QTest::newRow( "rotscale 90 a" )  << rotScale(90., 10)
-                                      << QRect( 0, 0, 30, 40 )
-                                      << QPolygon( QRect( 0, -299, 400, 300 ) );
-    QTest::newRow( "rotscale 90 b" )  << rotScale(90.00001, 10)
-                                      << QRect( 0, 0, 30, 40 )
-                                      << QPolygon( QRect( 0, -299, 400, 300 ) );
-    QTest::newRow( "rotscale 90 c" )  << rotScale(90., 10)
-                                      << QRect( 10, 20, 30, 40 )
-                                      << QPolygon( QRect( 200, -399, 400, 300 ) );
-    QTest::newRow( "rotscale 90 d" )  << rotScale(90.00001, 10)
-                                      << QRect( 10, 20, 30, 40 )
-                                      << QPolygon( QRect( 200, -399, 400, 300 ) );
-
-    QTest::newRow( "rotscale 180 a" )  << rotScale(180., 10)
-                                       << QRect( 0, 0, 30, 40 )
-                                       << QPolygon( QRect( -299, -399, 300, 400 ) );
-    QTest::newRow( "rotscale 180 b" )  << rotScale(180.000001, 10)
-                                       << QRect( 0, 0, 30, 40 )
-                                       << QPolygon( QRect( -299, -399, 300, 400 ) );
-    QTest::newRow( "rotscale 180 c" )  << rotScale(180., 10)
-                                       << QRect( 10, 20, 30, 40 )
-                                       << QPolygon( QRect( -399, -599, 300, 400 ) );
-    QTest::newRow( "rotscale 180 d" )  << rotScale(180.000001, 10)
-                                       << QRect( 10, 20, 30, 40 )
-                                       << QPolygon( QRect( -399, -599, 300, 400 ) );
-
-    QTest::newRow( "rotscale 270 a" )  << rotScale(270., 10)
-                                       << QRect( 0, 0, 30, 40 )
-                                       << QPolygon( QRect( -399, 00, 400, 300 ) );
-    QTest::newRow( "rotscale 270 b" )  << rotScale(270.0000001, 10)
-                                       << QRect( 0, 0, 30, 40 )
-                                       << QPolygon( QRect( -399, 00, 400, 300 ) );
-    QTest::newRow( "rotscale 270 c" )  << rotScale(270., 10)
-                                       << QRect( 10, 20, 30, 40 )
-                                       << QPolygon( QRect( -599, 100, 400, 300 ) );
-    QTest::newRow( "rotscale 270 d" )  << rotScale(270.000001, 10)
-                                       << QRect( 10, 20, 30, 40 )
-                                       << QPolygon( QRect( -599, 100, 400, 300 ) );
-
-    // rotations that are not multiples of 90 degrees. mapRect returns the bounding rect here.
-    QTest::newRow( "rot 45 a" )  << rotate(45)
-                                 << QRect( 0, 0, 10, 10 )
-                                 << QPolygon( QRect( 0, -7, 14, 14 ) );
-    QTest::newRow( "rot 45 b" )  << rotate(45)
-                                 << QRect( 10, 20, 30, 40 )
-                                 << QPolygon( QRect( 21, -14, 49, 49 ) );
-    QTest::newRow( "rot 45 c" )  << rotScale(45, 10)
-                                 << QRect( 0, 0, 10, 10 )
-                                 << QPolygon( QRect( 0, -70, 141, 141 ) );
-    QTest::newRow( "rot 45 d" )  << rotScale(45, 10)
-                                 << QRect( 10, 20, 30, 40 )
-                                 << QPolygon( QRect( 212, -141, 495, 495 ) );
-
-    QTest::newRow( "rot -45 a" )  << rotate(-45)
-                                  << QRect( 0, 0, 10, 10 )
-                                  << QPolygon( QRect( -7, 0, 14, 14 ) );
-    QTest::newRow( "rot -45 b" )  << rotate(-45)
-                                  << QRect( 10, 20, 30, 40 )
-                                  << QPolygon( QRect( -35, 21, 49, 49 ) );
-    QTest::newRow( "rot -45 c" )  << rotScale(-45, 10)
-                                  << QRect( 0, 0, 10, 10 )
-                                  << QPolygon( QRect( -70, 0, 141, 141 ) );
-    QTest::newRow( "rot -45 d" )  << rotScale(-45, 10)
-                                  << QRect( 10, 20, 30, 40 )
-                                  << QPolygon( QRect( -353, 212, 495, 495 ) );
-#endif
-}
-
-void tst_QWMatrix::mapRect()
-{
-    QFETCH( QMatrix, matrix );
-    QFETCH( QRect, src );
-//     qDebug( "got src: %d/%d (%d/%d), matrix=[ %f %f %f %f %f %f ]",
-//         src.x(), src.y(), src.width(), src.height(),
-//         matrix.m11(), matrix.m12(), matrix.m21(), matrix.m22(), matrix.dx(), matrix.dy() );
-    QTEST( QPolygon( matrix.mapRect(src) ), "res" );
-}
-
-void tst_QWMatrix::operator_star_qwmatrix()
-{
-    QMatrix m1( 2, 3, 4, 5, 6, 7 );
-    QMatrix m2( 3, 4, 5, 6, 7, 8 );
-
-    QMatrix result1x2( 21, 26, 37, 46, 60, 74 );
-    QMatrix result2x1( 22, 29, 34, 45, 52, 68);
-
-    QMatrix product12 = m1*m2;
-    QMatrix product21 = m2*m1;
-
-    QVERIFY( product12==result1x2 );
-    QVERIFY( product21==result2x1 );
-}
-
-
-void tst_QWMatrix::assignments()
-{
-    QMatrix m;
-    m.scale(2, 3);
-    m.rotate(45);
-    m.shear(4, 5);
-
-    QMatrix c1(m);
-
-    QCOMPARE(m.m11(), c1.m11());
-    QCOMPARE(m.m12(), c1.m12());
-    QCOMPARE(m.m21(), c1.m21());
-    QCOMPARE(m.m22(), c1.m22());
-    QCOMPARE(m.dx(), c1.dx());
-    QCOMPARE(m.dy(), c1.dy());
-
-    QMatrix c2 = m;
-    QCOMPARE(m.m11(), c2.m11());
-    QCOMPARE(m.m12(), c2.m12());
-    QCOMPARE(m.m21(), c2.m21());
-    QCOMPARE(m.m22(), c2.m22());
-    QCOMPARE(m.dx(),  c2.dx());
-    QCOMPARE(m.dy(),  c2.dy());
-}
-
-
-void tst_QWMatrix::mapToPolygon()
-{
-    QFETCH( QMatrix, matrix );
-    QFETCH( QRect, src );
-    QFETCH( QPolygon, res );
-
-    QCOMPARE( matrix.mapToPolygon( src ), res );
-}
-
-
-void tst_QWMatrix::translate()
-{
-    QMatrix m( 1, 2, 3, 4, 5, 6 );
-    QMatrix res2( m );
-    QMatrix res( 1, 2, 3, 4, 75, 106 );
-    m.translate( 10,  20 );
-    QVERIFY( m == res );
-    m.translate( -10,  -20 );
-    QVERIFY( m == res2 );
-}
-
-void tst_QWMatrix::scale()
-{
-    QMatrix m( 1, 2, 3, 4, 5, 6 );
-    QMatrix res2( m );
-    QMatrix res( 10, 20, 60, 80, 5, 6 );
-    m.scale( 10,  20 );
-    QVERIFY( m == res );
-    m.scale( 1./10.,  1./20. );
-    QVERIFY( m == res2 );
-}
-
-void tst_QWMatrix::mapPolygon()
-{
-    QPolygon poly;
-    poly << QPoint(0, 0) << QPoint(1, 1) << QPoint(100, 1) << QPoint(1, 100) << QPoint(-1, -1) << QPoint(-1000, 1000);
-
-    {
-        QMatrix m;
-        m.rotate(90);
-
-        // rotating 90 degrees four times should result in original poly
-        QPolygon mapped = m.map(m.map(m.map(m.map(poly))));
-        QCOMPARE(mapped, poly);
-
-        QMatrix m2;
-        m2.scale(10, 10);
-        QMatrix m3;
-        m3.scale(0.1, 0.1);
-
-        mapped = m3.map(m2.map(poly));
-        QCOMPARE(mapped, poly);
-    }
-
-    {
-        QMatrix m(1, 2, 3, 4, 5, 6);
-
-        QPolygon mapped = m.map(poly);
-        for (int i = 0; i < mapped.size(); ++i)
-            QCOMPARE(mapped.at(i), m.map(poly.at(i)));
-    }
-}
-
-QT_WARNING_POP
-#endif
-
-QTEST_APPLESS_MAIN(tst_QWMatrix)
-#include "tst_qwmatrix.moc"
diff --git a/tests/auto/gui/qopengl/CMakeLists.txt b/tests/auto/gui/qopengl/CMakeLists.txt
new file mode 100644
index 0000000000..1c7c9b6ec0
--- /dev/null
+++ b/tests/auto/gui/qopengl/CMakeLists.txt
@@ -0,0 +1,23 @@
+# Generated from qopengl.pro.
+
+#####################################################################
+## tst_qopengl Test:
+#####################################################################
+
+add_qt_test(tst_qopengl
+    SOURCES
+        tst_qopengl.cpp
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::Gui
+        Qt::GuiPrivate
+        Qt::OpenGL
+)
+
+## Scopes:
+#####################################################################
+
+extend_target(tst_qopengl CONDITION LINUX AND QT_FEATURE_xcb AND QT_FEATURE_xcb_glx_plugin
+    DEFINES
+        USE_GLX
+)
diff --git a/tests/auto/gui/qopengl/qopengl.pro b/tests/auto/gui/qopengl/qopengl.pro
index 722c99ee0b..604aa59d8a 100644
--- a/tests/auto/gui/qopengl/qopengl.pro
+++ b/tests/auto/gui/qopengl/qopengl.pro
@@ -4,7 +4,7 @@
 
 CONFIG += testcase
 TARGET = tst_qopengl
-QT += gui-private core-private testlib
+QT += opengl gui-private core-private testlib
 
 SOURCES   += tst_qopengl.cpp
 
diff --git a/tests/auto/gui/qopengl/tst_qopengl.cpp b/tests/auto/gui/qopengl/tst_qopengl.cpp
index ede1e58a53..8dd8b95daf 100644
--- a/tests/auto/gui/qopengl/tst_qopengl.cpp
+++ b/tests/auto/gui/qopengl/tst_qopengl.cpp
@@ -26,22 +26,21 @@
 **
 ****************************************************************************/
 
-
+#include <QtOpenGL/QOpenGLFramebufferObject>
+#include <QtOpenGL/QOpenGLPaintDevice>
+#include <QtOpenGL/QOpenGLTexture>
+#include <QtOpenGL/qopengltextureblitter.h>
+#include <QtOpenGL/QOpenGLVertexArrayObject>
+#include <QtOpenGL/QOpenGLBuffer>
 #include <QtGui/private/qopenglcontext_p.h>
-#include <QtGui/QOpenGLFramebufferObject>
 #include <QtGui/QOpenGLFunctions>
 #include <QtGui/QOpenGLFunctions_4_2_Core>
-#include <QtGui/QOpenGLVertexArrayObject>
-#include <QtGui/QOpenGLBuffer>
-#include <QtGui/QOpenGLPaintDevice>
-#include <QtGui/QOpenGLTexture>
 #include <QtGui/QPainter>
 #include <QtGui/QScreen>
 #include <QtGui/QWindow>
 #include <QtGui/QOffscreenSurface>
 #include <QtGui/QGenericMatrix>
 #include <QtGui/QMatrix4x4>
-#include <QtGui/qopengltextureblitter.h>
 #include <QtGui/private/qguiapplication_p.h>
 #include <QtGui/private/qopenglextensions_p.h>
 #include <qpa/qplatformintegration.h>
diff --git a/tests/auto/gui/qopenglconfig/CMakeLists.txt b/tests/auto/gui/qopenglconfig/CMakeLists.txt
new file mode 100644
index 0000000000..26ce58d98c
--- /dev/null
+++ b/tests/auto/gui/qopenglconfig/CMakeLists.txt
@@ -0,0 +1,18 @@
+# Generated from qopenglconfig.pro.
+
+#####################################################################
+## tst_qopenglconfig Test:
+#####################################################################
+
+# Collect test data
+list(APPEND test_data "buglist.json")
+
+add_qt_test(tst_qopenglconfig
+    SOURCES
+        tst_qopenglconfig.cpp
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::Gui
+        Qt::GuiPrivate
+    TESTDATA ${test_data}
+)
diff --git a/tests/auto/gui/qvulkan/CMakeLists.txt b/tests/auto/gui/qvulkan/CMakeLists.txt
new file mode 100644
index 0000000000..6316aa8f68
--- /dev/null
+++ b/tests/auto/gui/qvulkan/CMakeLists.txt
@@ -0,0 +1,14 @@
+# Generated from qvulkan.pro.
+
+#####################################################################
+## tst_qvulkan Test:
+#####################################################################
+
+add_qt_test(tst_qvulkan
+    SOURCES
+        tst_qvulkan.cpp
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::Gui
+        Qt::GuiPrivate
+)
diff --git a/tests/auto/gui/rhi/CMakeLists.txt b/tests/auto/gui/rhi/CMakeLists.txt
new file mode 100644
index 0000000000..786e121f00
--- /dev/null
+++ b/tests/auto/gui/rhi/CMakeLists.txt
@@ -0,0 +1,4 @@
+# Generated from rhi.pro.
+
+add_subdirectory(qshader)
+add_subdirectory(qrhi)
diff --git a/tests/auto/gui/rhi/qrhi/CMakeLists.txt b/tests/auto/gui/rhi/qrhi/CMakeLists.txt
new file mode 100644
index 0000000000..8c3026c176
--- /dev/null
+++ b/tests/auto/gui/rhi/qrhi/CMakeLists.txt
@@ -0,0 +1,26 @@
+# Generated from qrhi.pro.
+
+#####################################################################
+## tst_qrhi Test:
+#####################################################################
+
+add_qt_test(tst_qrhi
+    SOURCES
+        tst_qrhi.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::GuiPrivate
+)
+
+# Resources:
+set(qrhi_resource_files
+    "data"
+)
+
+add_qt_resource(tst_qrhi "qrhi"
+    PREFIX
+        "/"
+    FILES
+        ${qrhi_resource_files}
+)
+
diff --git a/tests/auto/gui/rhi/qshader/CMakeLists.txt b/tests/auto/gui/rhi/qshader/CMakeLists.txt
new file mode 100644
index 0000000000..472fc3b7e4
--- /dev/null
+++ b/tests/auto/gui/rhi/qshader/CMakeLists.txt
@@ -0,0 +1,26 @@
+# Generated from qshader.pro.
+
+#####################################################################
+## tst_qshader Test:
+#####################################################################
+
+add_qt_test(tst_qshader
+    SOURCES
+        tst_qshader.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::GuiPrivate
+)
+
+# Resources:
+set(qshader_resource_files
+    "data"
+)
+
+add_qt_resource(tst_qshader "qshader"
+    PREFIX
+        "/"
+    FILES
+        ${qshader_resource_files}
+)
+
diff --git a/tests/auto/gui/text/CMakeLists.txt b/tests/auto/gui/text/CMakeLists.txt
new file mode 100644
index 0000000000..8326190831
--- /dev/null
+++ b/tests/auto/gui/text/CMakeLists.txt
@@ -0,0 +1,41 @@
+# Generated from text.pro.
+
+add_subdirectory(qabstracttextdocumentlayout)
+add_subdirectory(qfont)
+add_subdirectory(qfontdatabase)
+add_subdirectory(qfontmetrics)
+add_subdirectory(qglyphrun)
+add_subdirectory(qrawfont)
+add_subdirectory(qstatictext)
+add_subdirectory(qsyntaxhighlighter)
+add_subdirectory(qtextblock)
+add_subdirectory(qtextcursor)
+add_subdirectory(qtextdocumentfragment)
+add_subdirectory(qtextdocumentlayout)
+add_subdirectory(qtextformat)
+add_subdirectory(qtextlist)
+add_subdirectory(qtextobject)
+add_subdirectory(qtextscriptengine)
+add_subdirectory(qtexttable)
+add_subdirectory(qinputcontrol)
+if(QT_FEATURE_private_tests AND TARGET Qt::Xml)
+    add_subdirectory(qcssparser)
+endif()
+if(QT_FEATURE_private_tests)
+    add_subdirectory(qfontcache)
+    add_subdirectory(qtextlayout)
+    add_subdirectory(qzip)
+    add_subdirectory(qtextodfwriter)
+endif()
+if(TARGET Qt::Xml)
+    add_subdirectory(qtextdocument)
+endif()
+if(QT_FEATURE_private_tests AND UNIX)
+    add_subdirectory(qtextpiecetable)
+endif()
+if(QT_FEATURE_textmarkdownreader)
+    add_subdirectory(qtextmarkdownimporter)
+endif()
+if(QT_FEATURE_private_tests AND QT_FEATURE_textmarkdownwriter)
+    add_subdirectory(qtextmarkdownwriter)
+endif()
diff --git a/tests/auto/gui/text/qabstracttextdocumentlayout/CMakeLists.txt b/tests/auto/gui/text/qabstracttextdocumentlayout/CMakeLists.txt
new file mode 100644
index 0000000000..62d4ce9d32
--- /dev/null
+++ b/tests/auto/gui/text/qabstracttextdocumentlayout/CMakeLists.txt
@@ -0,0 +1,12 @@
+# Generated from qabstracttextdocumentlayout.pro.
+
+#####################################################################
+## tst_qabstracttextdocumentlayout Test:
+#####################################################################
+
+add_qt_test(tst_qabstracttextdocumentlayout
+    SOURCES
+        tst_qabstracttextdocumentlayout.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+)
diff --git a/tests/auto/gui/text/qcssparser/CMakeLists.txt b/tests/auto/gui/text/qcssparser/CMakeLists.txt
new file mode 100644
index 0000000000..09e1672bc4
--- /dev/null
+++ b/tests/auto/gui/text/qcssparser/CMakeLists.txt
@@ -0,0 +1,57 @@
+# Generated from qcssparser.pro.
+
+if(NOT QT_FEATURE_private_tests)
+    return()
+endif()
+
+#####################################################################
+## tst_qcssparser Test:
+#####################################################################
+
+# Collect test data
+list(APPEND test_data "testdata")
+
+add_qt_test(tst_qcssparser
+    SOURCES
+        tst_qcssparser.cpp
+    DEFINES
+        SRCDIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}\\\"
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::GuiPrivate
+        Qt::Xml
+    TESTDATA ${test_data}
+)
+
+#### Keys ignored in scope 1:.:.:qcssparser.pro:<TRUE>:
+# _REQUIREMENTS = "qtConfig(private_tests)"
+
+## Scopes:
+#####################################################################
+
+if(ANDROID)
+    # Resources:
+    set(testdata_resource_files
+        "testdata/scanner/comments/input"
+        "testdata/scanner/comments/output"
+        "testdata/scanner/comments2/input"
+        "testdata/scanner/comments2/output"
+        "testdata/scanner/comments3/input"
+        "testdata/scanner/comments3/output"
+        "testdata/scanner/comments4/input"
+        "testdata/scanner/comments4/output"
+        "testdata/scanner/quotedstring/input"
+        "testdata/scanner/quotedstring/output"
+        "testdata/scanner/simple/input"
+        "testdata/scanner/simple/output"
+        "testdata/scanner/unicode/input"
+        "testdata/scanner/unicode/output"
+    )
+
+    add_qt_resource(tst_qcssparser "testdata"
+        PREFIX
+            "/"
+        FILES
+            ${testdata_resource_files}
+    )
+endif()
diff --git a/tests/auto/gui/text/qfont/CMakeLists.txt b/tests/auto/gui/text/qfont/CMakeLists.txt
new file mode 100644
index 0000000000..a04f8365b1
--- /dev/null
+++ b/tests/auto/gui/text/qfont/CMakeLists.txt
@@ -0,0 +1,35 @@
+# Generated from qfont.pro.
+
+#####################################################################
+## tst_qfont Test:
+#####################################################################
+
+add_qt_test(tst_qfont
+    SOURCES
+        tst_qfont.cpp
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::Gui
+        Qt::GuiPrivate
+)
+
+# Resources:
+set(testfont_resource_files
+    "weirdfont.otf"
+)
+
+add_qt_resource(tst_qfont "testfont"
+    PREFIX
+        "/"
+    FILES
+        ${testfont_resource_files}
+)
+
+
+## Scopes:
+#####################################################################
+
+extend_target(tst_qfont CONDITION TARGET Qt::Widgets
+    PUBLIC_LIBRARIES
+        Qt::Widgets
+)
diff --git a/tests/auto/gui/text/qfontcache/CMakeLists.txt b/tests/auto/gui/text/qfontcache/CMakeLists.txt
new file mode 100644
index 0000000000..84f6373328
--- /dev/null
+++ b/tests/auto/gui/text/qfontcache/CMakeLists.txt
@@ -0,0 +1,14 @@
+# Generated from qfontcache.pro.
+
+#####################################################################
+## tst_qfontcache Test:
+#####################################################################
+
+add_qt_test(tst_qfontcache
+    SOURCES
+        tst_qfontcache.cpp
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::Gui
+        Qt::GuiPrivate
+)
diff --git a/tests/auto/gui/text/qfontdatabase/CMakeLists.txt b/tests/auto/gui/text/qfontdatabase/CMakeLists.txt
new file mode 100644
index 0000000000..65c6224a00
--- /dev/null
+++ b/tests/auto/gui/text/qfontdatabase/CMakeLists.txt
@@ -0,0 +1,47 @@
+# Generated from qfontdatabase.pro.
+
+#####################################################################
+## tst_qfontdatabase Test:
+#####################################################################
+
+# Collect test data
+list(APPEND test_data "LED_REAL.TTF")
+
+add_qt_test(tst_qfontdatabase
+    SOURCES
+        tst_qfontdatabase.cpp
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::Gui
+        Qt::GuiPrivate
+    TESTDATA ${test_data}
+)
+
+# Resources:
+set_source_files_properties("../../../shared/resources/testfont.ttf"
+    PROPERTIES QT_RESOURCE_ALIAS "testfont.ttf"
+)
+set_source_files_properties("../../../shared/resources/testfont_condensed.ttf"
+    PROPERTIES QT_RESOURCE_ALIAS "testfont_condensed.ttf"
+)
+set_source_files_properties("../../../shared/resources/testfont_italic.ttf"
+    PROPERTIES QT_RESOURCE_ALIAS "testfont_italic.ttf"
+)
+set_source_files_properties("../../../shared/resources/testfont_open.otf"
+    PROPERTIES QT_RESOURCE_ALIAS "testfont_open.otf"
+)
+set(testdata_resource_files
+    "../../../shared/resources/testfont.ttf"
+    "../../../shared/resources/testfont_condensed.ttf"
+    "../../../shared/resources/testfont_italic.ttf"
+    "../../../shared/resources/testfont_open.otf"
+    "LED_REAL.TTF"
+)
+
+add_qt_resource(tst_qfontdatabase "testdata"
+    PREFIX
+        "/"
+    FILES
+        ${testdata_resource_files}
+)
+
diff --git a/tests/auto/gui/text/qfontmetrics/CMakeLists.txt b/tests/auto/gui/text/qfontmetrics/CMakeLists.txt
new file mode 100644
index 0000000000..029f5d5ce3
--- /dev/null
+++ b/tests/auto/gui/text/qfontmetrics/CMakeLists.txt
@@ -0,0 +1,31 @@
+# Generated from qfontmetrics.pro.
+
+#####################################################################
+## tst_qfontmetrics Test:
+#####################################################################
+
+add_qt_test(tst_qfontmetrics
+    SOURCES
+        tst_qfontmetrics.cpp
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::Gui
+        Qt::GuiPrivate
+)
+
+# Resources:
+set_source_files_properties("../../../shared/resources/testfont.ttf"
+    PROPERTIES QT_RESOURCE_ALIAS "testfont.ttf"
+)
+set(testfont_resource_files
+    "../../../shared/resources/testfont.ttf"
+    "ucs4font.ttf"
+)
+
+add_qt_resource(tst_qfontmetrics "testfont"
+    PREFIX
+        "/fonts"
+    FILES
+        ${testfont_resource_files}
+)
+
diff --git a/tests/auto/gui/text/qglyphrun/CMakeLists.txt b/tests/auto/gui/text/qglyphrun/CMakeLists.txt
new file mode 100644
index 0000000000..8efcfc0cf9
--- /dev/null
+++ b/tests/auto/gui/text/qglyphrun/CMakeLists.txt
@@ -0,0 +1,28 @@
+# Generated from qglyphrun.pro.
+
+#####################################################################
+## tst_qglyphrun Test:
+#####################################################################
+
+add_qt_test(tst_qglyphrun
+    SOURCES
+        tst_qglyphrun.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+)
+
+# Resources:
+set_source_files_properties("../../../shared/resources/test.ttf"
+    PROPERTIES QT_RESOURCE_ALIAS "test.ttf"
+)
+set(testdata_resource_files
+    "../../../shared/resources/test.ttf"
+)
+
+add_qt_resource(tst_qglyphrun "testdata"
+    PREFIX
+        "/"
+    FILES
+        ${testdata_resource_files}
+)
+
diff --git a/tests/auto/gui/text/qinputcontrol/CMakeLists.txt b/tests/auto/gui/text/qinputcontrol/CMakeLists.txt
new file mode 100644
index 0000000000..e544fb313c
--- /dev/null
+++ b/tests/auto/gui/text/qinputcontrol/CMakeLists.txt
@@ -0,0 +1,13 @@
+# Generated from qinputcontrol.pro.
+
+#####################################################################
+## tst_qinputcontrol Test:
+#####################################################################
+
+add_qt_test(tst_qinputcontrol
+    SOURCES
+        tst_qinputcontrol.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::GuiPrivate
+)
diff --git a/tests/auto/gui/text/qrawfont/CMakeLists.txt b/tests/auto/gui/text/qrawfont/CMakeLists.txt
new file mode 100644
index 0000000000..5044866c49
--- /dev/null
+++ b/tests/auto/gui/text/qrawfont/CMakeLists.txt
@@ -0,0 +1,32 @@
+# Generated from qrawfont.pro.
+
+#####################################################################
+## tst_qrawfont Test:
+#####################################################################
+
+add_qt_test(tst_qrawfont
+    SOURCES
+        tst_qrawfont.cpp
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::Gui
+        Qt::GuiPrivate
+)
+
+# Resources:
+set_source_files_properties("../../../shared/resources/testfont.ttf"
+    PROPERTIES QT_RESOURCE_ALIAS "testfont.ttf"
+)
+set(testdata_resource_files
+    "../../../shared/resources/testfont.ttf"
+    "testfont_bold_italic.ttf"
+    "testfont_os2_v1.ttf"
+)
+
+add_qt_resource(tst_qrawfont "testdata"
+    PREFIX
+        "/"
+    FILES
+        ${testdata_resource_files}
+)
+
diff --git a/tests/auto/gui/text/qstatictext/CMakeLists.txt b/tests/auto/gui/text/qstatictext/CMakeLists.txt
new file mode 100644
index 0000000000..80eef2f254
--- /dev/null
+++ b/tests/auto/gui/text/qstatictext/CMakeLists.txt
@@ -0,0 +1,21 @@
+# Generated from qstatictext.pro.
+
+#####################################################################
+## tst_qstatictext Test:
+#####################################################################
+
+add_qt_test(tst_qstatictext
+    SOURCES
+        tst_qstatictext.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+)
+
+## Scopes:
+#####################################################################
+
+extend_target(tst_qstatictext CONDITION QT_FEATURE_private_tests
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::GuiPrivate
+)
diff --git a/tests/auto/gui/text/qsyntaxhighlighter/CMakeLists.txt b/tests/auto/gui/text/qsyntaxhighlighter/CMakeLists.txt
new file mode 100644
index 0000000000..c4ea8b4a1e
--- /dev/null
+++ b/tests/auto/gui/text/qsyntaxhighlighter/CMakeLists.txt
@@ -0,0 +1,20 @@
+# Generated from qsyntaxhighlighter.pro.
+
+#####################################################################
+## tst_qsyntaxhighlighter Test:
+#####################################################################
+
+add_qt_test(tst_qsyntaxhighlighter
+    SOURCES
+        tst_qsyntaxhighlighter.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+)
+
+## Scopes:
+#####################################################################
+
+extend_target(tst_qsyntaxhighlighter CONDITION TARGET Qt::Widgets
+    PUBLIC_LIBRARIES
+        Qt::Widgets
+)
diff --git a/tests/auto/gui/text/qtextblock/CMakeLists.txt b/tests/auto/gui/text/qtextblock/CMakeLists.txt
new file mode 100644
index 0000000000..18e0be18c6
--- /dev/null
+++ b/tests/auto/gui/text/qtextblock/CMakeLists.txt
@@ -0,0 +1,14 @@
+# Generated from qtextblock.pro.
+
+#####################################################################
+## tst_qtextblock Test:
+#####################################################################
+
+add_qt_test(tst_qtextblock
+    SOURCES
+        tst_qtextblock.cpp
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::Gui
+        Qt::GuiPrivate
+)
diff --git a/tests/auto/gui/text/qtextcursor/CMakeLists.txt b/tests/auto/gui/text/qtextcursor/CMakeLists.txt
new file mode 100644
index 0000000000..78b6ed191d
--- /dev/null
+++ b/tests/auto/gui/text/qtextcursor/CMakeLists.txt
@@ -0,0 +1,14 @@
+# Generated from qtextcursor.pro.
+
+#####################################################################
+## tst_qtextcursor Test:
+#####################################################################
+
+add_qt_test(tst_qtextcursor
+    SOURCES
+        tst_qtextcursor.cpp
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::Gui
+        Qt::GuiPrivate
+)
diff --git a/tests/auto/gui/text/qtextdocument/CMakeLists.txt b/tests/auto/gui/text/qtextdocument/CMakeLists.txt
new file mode 100644
index 0000000000..7ea22d3fb0
--- /dev/null
+++ b/tests/auto/gui/text/qtextdocument/CMakeLists.txt
@@ -0,0 +1,16 @@
+# Generated from qtextdocument.pro.
+
+#####################################################################
+## tst_qtextdocument Test:
+#####################################################################
+
+add_qt_test(tst_qtextdocument
+    SOURCES
+        common.h
+        tst_qtextdocument.cpp
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::Gui
+        Qt::GuiPrivate
+        Qt::Xml
+)
diff --git a/tests/auto/gui/text/qtextdocumentfragment/CMakeLists.txt b/tests/auto/gui/text/qtextdocumentfragment/CMakeLists.txt
new file mode 100644
index 0000000000..f92a82a262
--- /dev/null
+++ b/tests/auto/gui/text/qtextdocumentfragment/CMakeLists.txt
@@ -0,0 +1,14 @@
+# Generated from qtextdocumentfragment.pro.
+
+#####################################################################
+## tst_qtextdocumentfragment Test:
+#####################################################################
+
+add_qt_test(tst_qtextdocumentfragment
+    SOURCES
+        tst_qtextdocumentfragment.cpp
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::Gui
+        Qt::GuiPrivate
+)
diff --git a/tests/auto/gui/text/qtextdocumentlayout/CMakeLists.txt b/tests/auto/gui/text/qtextdocumentlayout/CMakeLists.txt
new file mode 100644
index 0000000000..c7212209ee
--- /dev/null
+++ b/tests/auto/gui/text/qtextdocumentlayout/CMakeLists.txt
@@ -0,0 +1,20 @@
+# Generated from qtextdocumentlayout.pro.
+
+#####################################################################
+## tst_qtextdocumentlayout Test:
+#####################################################################
+
+add_qt_test(tst_qtextdocumentlayout
+    SOURCES
+        tst_qtextdocumentlayout.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+)
+
+## Scopes:
+#####################################################################
+
+extend_target(tst_qtextdocumentlayout CONDITION TARGET Qt::Widgets
+    PUBLIC_LIBRARIES
+        Qt::Widgets
+)
diff --git a/tests/auto/gui/text/qtextformat/CMakeLists.txt b/tests/auto/gui/text/qtextformat/CMakeLists.txt
new file mode 100644
index 0000000000..be7653abd4
--- /dev/null
+++ b/tests/auto/gui/text/qtextformat/CMakeLists.txt
@@ -0,0 +1,14 @@
+# Generated from qtextformat.pro.
+
+#####################################################################
+## tst_qtextformat Test:
+#####################################################################
+
+add_qt_test(tst_qtextformat
+    SOURCES
+        tst_qtextformat.cpp
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::Gui
+        Qt::GuiPrivate
+)
diff --git a/tests/auto/gui/text/qtextlayout/CMakeLists.txt b/tests/auto/gui/text/qtextlayout/CMakeLists.txt
new file mode 100644
index 0000000000..c87d5bdd4d
--- /dev/null
+++ b/tests/auto/gui/text/qtextlayout/CMakeLists.txt
@@ -0,0 +1,14 @@
+# Generated from qtextlayout.pro.
+
+#####################################################################
+## tst_qtextlayout Test:
+#####################################################################
+
+add_qt_test(tst_qtextlayout
+    SOURCES
+        tst_qtextlayout.cpp
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::Gui
+        Qt::GuiPrivate
+)
diff --git a/tests/auto/gui/text/qtextlist/CMakeLists.txt b/tests/auto/gui/text/qtextlist/CMakeLists.txt
new file mode 100644
index 0000000000..f22de38a8c
--- /dev/null
+++ b/tests/auto/gui/text/qtextlist/CMakeLists.txt
@@ -0,0 +1,15 @@
+# Generated from qtextlist.pro.
+
+#####################################################################
+## tst_qtextlist Test:
+#####################################################################
+
+add_qt_test(tst_qtextlist
+    SOURCES
+        ../qtextdocument/common.h
+        tst_qtextlist.cpp
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::Gui
+        Qt::GuiPrivate
+)
diff --git a/tests/auto/gui/text/qtextmarkdownimporter/CMakeLists.txt b/tests/auto/gui/text/qtextmarkdownimporter/CMakeLists.txt
new file mode 100644
index 0000000000..6a1043c89f
--- /dev/null
+++ b/tests/auto/gui/text/qtextmarkdownimporter/CMakeLists.txt
@@ -0,0 +1,21 @@
+# Generated from qtextmarkdownimporter.pro.
+
+#####################################################################
+## tst_qtextmarkdownimporter Test:
+#####################################################################
+
+# Collect test data
+list(APPEND test_data "data/thematicBreaks.md")
+list(APPEND test_data "data/headingBulletsContinuations.md")
+
+add_qt_test(tst_qtextmarkdownimporter
+    SOURCES
+        tst_qtextmarkdownimporter.cpp
+    DEFINES
+        SRCDIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}\\\"
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::Gui
+        Qt::GuiPrivate
+    TESTDATA ${test_data}
+)
diff --git a/tests/auto/gui/text/qtextmarkdownwriter/CMakeLists.txt b/tests/auto/gui/text/qtextmarkdownwriter/CMakeLists.txt
new file mode 100644
index 0000000000..7360b40994
--- /dev/null
+++ b/tests/auto/gui/text/qtextmarkdownwriter/CMakeLists.txt
@@ -0,0 +1,21 @@
+# Generated from qtextmarkdownwriter.pro.
+
+#####################################################################
+## tst_qtextmarkdownwriter Test:
+#####################################################################
+
+# Collect test data
+list(APPEND test_data "data/example.md")
+list(APPEND test_data "data/blockquotes.md")
+
+add_qt_test(tst_qtextmarkdownwriter
+    SOURCES
+        tst_qtextmarkdownwriter.cpp
+    DEFINES
+        SRCDIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}\\\"
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::Gui
+        Qt::GuiPrivate
+    TESTDATA ${test_data}
+)
diff --git a/tests/auto/gui/text/qtextobject/CMakeLists.txt b/tests/auto/gui/text/qtextobject/CMakeLists.txt
new file mode 100644
index 0000000000..b8d7f7b548
--- /dev/null
+++ b/tests/auto/gui/text/qtextobject/CMakeLists.txt
@@ -0,0 +1,20 @@
+# Generated from qtextobject.pro.
+
+#####################################################################
+## tst_qtextobject Test:
+#####################################################################
+
+add_qt_test(tst_qtextobject
+    SOURCES
+        tst_qtextobject.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+)
+
+## Scopes:
+#####################################################################
+
+extend_target(tst_qtextobject CONDITION TARGET Qt::Widgets
+    PUBLIC_LIBRARIES
+        Qt::Widgets
+)
diff --git a/tests/auto/gui/text/qtextodfwriter/CMakeLists.txt b/tests/auto/gui/text/qtextodfwriter/CMakeLists.txt
new file mode 100644
index 0000000000..18c84e5a45
--- /dev/null
+++ b/tests/auto/gui/text/qtextodfwriter/CMakeLists.txt
@@ -0,0 +1,16 @@
+# Generated from qtextodfwriter.pro.
+
+#####################################################################
+## tst_qtextodfwriter Test:
+#####################################################################
+
+add_qt_test(tst_qtextodfwriter
+    SOURCES
+        tst_qtextodfwriter.cpp
+    DEFINES
+        SRCDIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}\\\"
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::Gui
+        Qt::GuiPrivate
+)
diff --git a/tests/auto/gui/text/qtextpiecetable/CMakeLists.txt b/tests/auto/gui/text/qtextpiecetable/CMakeLists.txt
new file mode 100644
index 0000000000..5fb8db5405
--- /dev/null
+++ b/tests/auto/gui/text/qtextpiecetable/CMakeLists.txt
@@ -0,0 +1,25 @@
+# Generated from qtextpiecetable.pro.
+
+if(WIN32)
+    return()
+endif()
+if(NOT QT_FEATURE_private_tests)
+    return()
+endif()
+
+#####################################################################
+## tst_qtextpiecetable Test:
+#####################################################################
+
+add_qt_test(tst_qtextpiecetable
+    SOURCES
+        ../qtextdocument/common.h
+        tst_qtextpiecetable.cpp
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::Gui
+        Qt::GuiPrivate
+)
+
+#### Keys ignored in scope 1:.:.:qtextpiecetable.pro:<TRUE>:
+# _REQUIREMENTS = "!win32" "qtConfig(private_tests)"
diff --git a/tests/auto/gui/text/qtextscriptengine/CMakeLists.txt b/tests/auto/gui/text/qtextscriptengine/CMakeLists.txt
new file mode 100644
index 0000000000..8d94e33b6c
--- /dev/null
+++ b/tests/auto/gui/text/qtextscriptengine/CMakeLists.txt
@@ -0,0 +1,14 @@
+# Generated from qtextscriptengine.pro.
+
+#####################################################################
+## tst_qtextscriptengine Test:
+#####################################################################
+
+add_qt_test(tst_qtextscriptengine
+    SOURCES
+        tst_qtextscriptengine.cpp
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::Gui
+        Qt::GuiPrivate
+)
diff --git a/tests/auto/gui/text/qtextscriptengine/generate/CMakeLists.txt b/tests/auto/gui/text/qtextscriptengine/generate/CMakeLists.txt
new file mode 100644
index 0000000000..b2434569d4
--- /dev/null
+++ b/tests/auto/gui/text/qtextscriptengine/generate/CMakeLists.txt
@@ -0,0 +1,17 @@
+# Generated from generate.pro.
+
+#####################################################################
+## generate Binary:
+#####################################################################
+
+add_qt_executable(generate
+    GUI
+    SOURCES
+        main.cpp
+    INCLUDE_DIRECTORIES
+        .
+        /usr/include/freetype2
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::Gui
+)
diff --git a/tests/auto/gui/text/qtextscriptengine/tst_qtextscriptengine.cpp b/tests/auto/gui/text/qtextscriptengine/tst_qtextscriptengine.cpp
index 0371f51961..348042bacb 100644
--- a/tests/auto/gui/text/qtextscriptengine/tst_qtextscriptengine.cpp
+++ b/tests/auto/gui/text/qtextscriptengine/tst_qtextscriptengine.cpp
@@ -1217,9 +1217,6 @@ void tst_QTextScriptEngine::thaiWithZWJ()
     QFont font(QStringLiteral("Waree"));
     font.setStyleStrategy(QFont::NoFontMerging);
 
-    if (QFontInfo(font).styleName() != QStringLiteral("Book"))
-        QSKIP("couldn't find 'Waree Book' font");
-
     QString s(QString::fromUtf8("\xe0\xb8\xa3\xe2\x80\x8d\xe0\xb8\xa3\xe2\x80"
                                 "\x8c\x2e\xe0\xb8\xa3\x2e\xe2\x80\x9c\xe0\xb8"
                                 "\xa3\xe2\x80\xa6\xe0\xb8\xa3\xe2\x80\x9d\xe0"
diff --git a/tests/auto/gui/text/qtexttable/CMakeLists.txt b/tests/auto/gui/text/qtexttable/CMakeLists.txt
new file mode 100644
index 0000000000..de82c94233
--- /dev/null
+++ b/tests/auto/gui/text/qtexttable/CMakeLists.txt
@@ -0,0 +1,21 @@
+# Generated from qtexttable.pro.
+
+#####################################################################
+## tst_qtexttable Test:
+#####################################################################
+
+add_qt_test(tst_qtexttable
+    SOURCES
+        tst_qtexttable.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::GuiPrivate
+)
+
+## Scopes:
+#####################################################################
+
+extend_target(tst_qtexttable CONDITION TARGET Qt::Widgets
+    PUBLIC_LIBRARIES
+        Qt::Widgets
+)
diff --git a/tests/auto/gui/text/qzip/CMakeLists.txt b/tests/auto/gui/text/qzip/CMakeLists.txt
new file mode 100644
index 0000000000..dfeb968cc1
--- /dev/null
+++ b/tests/auto/gui/text/qzip/CMakeLists.txt
@@ -0,0 +1,35 @@
+# Generated from qzip.pro.
+
+#####################################################################
+## tst_qzip Test:
+#####################################################################
+
+# Collect test data
+list(APPEND test_data "testdata")
+
+add_qt_test(tst_qzip
+    SOURCES
+        tst_qzip.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::GuiPrivate
+    TESTDATA ${test_data}
+)
+
+## Scopes:
+#####################################################################
+
+if(ANDROID)
+    # Resources:
+    set(testdata_resource_files
+        "testdata/symlink.zip"
+        "testdata/test.zip"
+    )
+
+    add_qt_resource(tst_qzip "testdata"
+        PREFIX
+            "/"
+        FILES
+            ${testdata_resource_files}
+    )
+endif()
diff --git a/tests/auto/gui/util/CMakeLists.txt b/tests/auto/gui/util/CMakeLists.txt
new file mode 100644
index 0000000000..4e0a6b7e25
--- /dev/null
+++ b/tests/auto/gui/util/CMakeLists.txt
@@ -0,0 +1,13 @@
+# Generated from util.pro.
+
+add_subdirectory(qdesktopservices)
+add_subdirectory(qdoublevalidator)
+add_subdirectory(qintvalidator)
+add_subdirectory(qregexpvalidator)
+add_subdirectory(qregularexpressionvalidator)
+add_subdirectory(qshadergenerator)
+add_subdirectory(qshadergraph)
+add_subdirectory(qshadergraphloader)
+add_subdirectory(qshadernodes)
+add_subdirectory(qshadernodesloader)
+add_subdirectory(qtexturefilereader)
diff --git a/tests/auto/gui/util/qdesktopservices/.prev_CMakeLists.txt b/tests/auto/gui/util/qdesktopservices/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..8163ec80b6
--- /dev/null
+++ b/tests/auto/gui/util/qdesktopservices/.prev_CMakeLists.txt
@@ -0,0 +1,14 @@
+# Generated from qdesktopservices.pro.
+
+#####################################################################
+## tst_qdesktopservices Test:
+#####################################################################
+
+add_qt_test(tst_qdesktopservices
+    SOURCES
+        tst_qdesktopservices.cpp
+    DEFINES
+        QT_DISABLE_DEPRECATED_BEFORE=0
+    PUBLIC_LIBRARIES
+        Qt::Gui
+)
diff --git a/tests/auto/gui/util/qdesktopservices/CMakeLists.txt b/tests/auto/gui/util/qdesktopservices/CMakeLists.txt
new file mode 100644
index 0000000000..c62cecac30
--- /dev/null
+++ b/tests/auto/gui/util/qdesktopservices/CMakeLists.txt
@@ -0,0 +1,14 @@
+# Generated from qdesktopservices.pro.
+
+#####################################################################
+## tst_qdesktopservices Test:
+#####################################################################
+
+add_qt_test(tst_qdesktopservices
+    SOURCES
+        tst_qdesktopservices.cpp
+    DEFINES
+        # QT_DISABLE_DEPRECATED_BEFORE=0 # special case
+    PUBLIC_LIBRARIES
+        Qt::Gui
+)
diff --git a/tests/auto/gui/util/qdoublevalidator/CMakeLists.txt b/tests/auto/gui/util/qdoublevalidator/CMakeLists.txt
new file mode 100644
index 0000000000..6cccd082a9
--- /dev/null
+++ b/tests/auto/gui/util/qdoublevalidator/CMakeLists.txt
@@ -0,0 +1,12 @@
+# Generated from qdoublevalidator.pro.
+
+#####################################################################
+## tst_qdoublevalidator Test:
+#####################################################################
+
+add_qt_test(tst_qdoublevalidator
+    SOURCES
+        tst_qdoublevalidator.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+)
diff --git a/tests/auto/gui/util/qintvalidator/CMakeLists.txt b/tests/auto/gui/util/qintvalidator/CMakeLists.txt
new file mode 100644
index 0000000000..69a5503d8e
--- /dev/null
+++ b/tests/auto/gui/util/qintvalidator/CMakeLists.txt
@@ -0,0 +1,12 @@
+# Generated from qintvalidator.pro.
+
+#####################################################################
+## tst_qintvalidator Test:
+#####################################################################
+
+add_qt_test(tst_qintvalidator
+    SOURCES
+        tst_qintvalidator.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+)
diff --git a/tests/auto/gui/util/qregexpvalidator/CMakeLists.txt b/tests/auto/gui/util/qregexpvalidator/CMakeLists.txt
new file mode 100644
index 0000000000..4f7d7da0c2
--- /dev/null
+++ b/tests/auto/gui/util/qregexpvalidator/CMakeLists.txt
@@ -0,0 +1,12 @@
+# Generated from qregexpvalidator.pro.
+
+#####################################################################
+## tst_qregexpvalidator Test:
+#####################################################################
+
+add_qt_test(tst_qregexpvalidator
+    SOURCES
+        tst_qregexpvalidator.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+)
diff --git a/tests/auto/gui/util/qregularexpressionvalidator/CMakeLists.txt b/tests/auto/gui/util/qregularexpressionvalidator/CMakeLists.txt
new file mode 100644
index 0000000000..8633a171e5
--- /dev/null
+++ b/tests/auto/gui/util/qregularexpressionvalidator/CMakeLists.txt
@@ -0,0 +1,12 @@
+# Generated from qregularexpressionvalidator.pro.
+
+#####################################################################
+## tst_qregularexpressionvalidator Test:
+#####################################################################
+
+add_qt_test(tst_qregularexpressionvalidator
+    SOURCES
+        tst_qregularexpressionvalidator.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+)
diff --git a/tests/auto/gui/util/qshadergenerator/CMakeLists.txt b/tests/auto/gui/util/qshadergenerator/CMakeLists.txt
new file mode 100644
index 0000000000..e9cb62377f
--- /dev/null
+++ b/tests/auto/gui/util/qshadergenerator/CMakeLists.txt
@@ -0,0 +1,13 @@
+# Generated from qshadergenerator.pro.
+
+#####################################################################
+## tst_qshadergenerator Test:
+#####################################################################
+
+add_qt_test(tst_qshadergenerator
+    SOURCES
+        tst_qshadergenerator.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::GuiPrivate
+)
diff --git a/tests/auto/gui/util/qshadergraph/CMakeLists.txt b/tests/auto/gui/util/qshadergraph/CMakeLists.txt
new file mode 100644
index 0000000000..ede24f2a40
--- /dev/null
+++ b/tests/auto/gui/util/qshadergraph/CMakeLists.txt
@@ -0,0 +1,13 @@
+# Generated from qshadergraph.pro.
+
+#####################################################################
+## tst_qshadergraph Test:
+#####################################################################
+
+add_qt_test(tst_qshadergraph
+    SOURCES
+        tst_qshadergraph.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::GuiPrivate
+)
diff --git a/tests/auto/gui/util/qshadergraphloader/CMakeLists.txt b/tests/auto/gui/util/qshadergraphloader/CMakeLists.txt
new file mode 100644
index 0000000000..caf863d42d
--- /dev/null
+++ b/tests/auto/gui/util/qshadergraphloader/CMakeLists.txt
@@ -0,0 +1,13 @@
+# Generated from qshadergraphloader.pro.
+
+#####################################################################
+## tst_qshadergraphloader Test:
+#####################################################################
+
+add_qt_test(tst_qshadergraphloader
+    SOURCES
+        tst_qshadergraphloader.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::GuiPrivate
+)
diff --git a/tests/auto/gui/util/qshadernodes/CMakeLists.txt b/tests/auto/gui/util/qshadernodes/CMakeLists.txt
new file mode 100644
index 0000000000..d7cc14b09c
--- /dev/null
+++ b/tests/auto/gui/util/qshadernodes/CMakeLists.txt
@@ -0,0 +1,13 @@
+# Generated from qshadernodes.pro.
+
+#####################################################################
+## tst_qshadernodes Test:
+#####################################################################
+
+add_qt_test(tst_qshadernodes
+    SOURCES
+        tst_qshadernodes.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::GuiPrivate
+)
diff --git a/tests/auto/gui/util/qshadernodesloader/CMakeLists.txt b/tests/auto/gui/util/qshadernodesloader/CMakeLists.txt
new file mode 100644
index 0000000000..e381af4f7b
--- /dev/null
+++ b/tests/auto/gui/util/qshadernodesloader/CMakeLists.txt
@@ -0,0 +1,13 @@
+# Generated from qshadernodesloader.pro.
+
+#####################################################################
+## tst_qshadernodesloader Test:
+#####################################################################
+
+add_qt_test(tst_qshadernodesloader
+    SOURCES
+        tst_qshadernodesloader.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::GuiPrivate
+)
diff --git a/tests/auto/gui/util/qshadernodesloader/tst_qshadernodesloader.cpp b/tests/auto/gui/util/qshadernodesloader/tst_qshadernodesloader.cpp
index 4782e40ed8..ec1bd87a32 100644
--- a/tests/auto/gui/util/qshadernodesloader/tst_qshadernodesloader.cpp
+++ b/tests/auto/gui/util/qshadernodesloader/tst_qshadernodesloader.cpp
@@ -272,6 +272,10 @@ void tst_QShaderNodesLoader::shouldLoadFromJsonStream_data()
 
     QTest::newRow("NotOpen") << createBuffer(smallJson, QIODevice::NotOpen) << NodeHash() << QShaderNodesLoader::Error;
     QTest::newRow("CorrectJSON") << createBuffer(smallJson) << smallProtos << QShaderNodesLoader::Ready;
+
+    // These types are normaly registered by QShaderGraphLoader
+    qRegisterMetaType<QShaderLanguage::StorageQualifier>();
+    qRegisterMetaType<QShaderLanguage::VariableType>();
 }
 
 void tst_QShaderNodesLoader::shouldLoadFromJsonStream()
diff --git a/tests/auto/gui/util/qtexturefilereader/CMakeLists.txt b/tests/auto/gui/util/qtexturefilereader/CMakeLists.txt
new file mode 100644
index 0000000000..3b6d99c0e8
--- /dev/null
+++ b/tests/auto/gui/util/qtexturefilereader/CMakeLists.txt
@@ -0,0 +1,30 @@
+# Generated from qtexturefilereader.pro.
+
+#####################################################################
+## tst_qtexturefilereader Test:
+#####################################################################
+
+add_qt_test(tst_qtexturefilereader
+    SOURCES
+        tst_qtexturefilereader.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::GuiPrivate
+)
+
+# Resources:
+set(qtexturefilereader_resource_files
+    "texturefiles/car.ktx"
+    "texturefiles/car_mips.ktx"
+    "texturefiles/newlogo.astc"
+    "texturefiles/newlogo_srgb.astc"
+    "texturefiles/pattern.pkm"
+)
+
+add_qt_resource(tst_qtexturefilereader "qtexturefilereader"
+    PREFIX
+        "/"
+    FILES
+        ${qtexturefilereader_resource_files}
+)
+
diff --git a/tests/auto/network/CMakeLists.txt b/tests/auto/network/CMakeLists.txt
new file mode 100644
index 0000000000..b7ba3de688
--- /dev/null
+++ b/tests/auto/network/CMakeLists.txt
@@ -0,0 +1,21 @@
+# Generated from network.pro.
+# special case begin
+# SSL library include path is not propagated with private tests which results in
+# test not being able to find the ssl header when they are not in the standard
+# include paths
+if (QT_FEATURE_private_tests)
+    if (QT_FEATURE_openssl AND QT_FEATURE_openssl_linked AND QT_FEATURE_ssl)
+        include_directories($<TARGET_PROPERTY:OpenSSL::SSL,INTERFACE_INCLUDE_DIRECTORIES>)
+    endif()
+
+    if (QT_FEATURE_openssl AND QT_FEATURE_ssl AND NOT QT_FEATURE_openssl_linked)
+        include_directories($<TARGET_PROPERTY:${INSTALL_CMAKE_NAMESPACE}::SSL_nolink,INTERFACE_INCLUDE_DIRECTORIES>)
+    endif()
+endif()
+# special case end
+
+add_subdirectory(access)
+add_subdirectory(bearer)
+add_subdirectory(kernel)
+add_subdirectory(ssl)
+add_subdirectory(socket)
diff --git a/tests/auto/network/access/CMakeLists.txt b/tests/auto/network/access/CMakeLists.txt
new file mode 100644
index 0000000000..432c19ec81
--- /dev/null
+++ b/tests/auto/network/access/CMakeLists.txt
@@ -0,0 +1,22 @@
+# Generated from access.pro.
+
+add_subdirectory(qnetworkdiskcache)
+add_subdirectory(qnetworkcookiejar)
+add_subdirectory(qnetworkaccessmanager)
+add_subdirectory(qnetworkcookie)
+add_subdirectory(qnetworkrequest)
+add_subdirectory(qnetworkreply)
+add_subdirectory(qnetworkcachemetadata)
+add_subdirectory(qabstractnetworkcache)
+
+
+if(QT_FEATURE_private_tests)
+    add_subdirectory(qhttpnetworkconnection)
+    add_subdirectory(qhttpnetworkreply)
+    add_subdirectory(hpack)
+    add_subdirectory(http2)
+    add_subdirectory(hsts)
+endif()
+if(QT_FEATURE_ftp AND QT_FEATURE_private_tests)
+    add_subdirectory(qftp)
+endif()
diff --git a/tests/auto/network/access/access.pro b/tests/auto/network/access/access.pro
index b140b5e9f2..b451a2ccc6 100644
--- a/tests/auto/network/access/access.pro
+++ b/tests/auto/network/access/access.pro
@@ -1,4 +1,6 @@
 TEMPLATE=subdirs
+QT_FOR_CONFIG += network
+
 SUBDIRS=\
    qnetworkdiskcache \
    qnetworkcookiejar \
@@ -7,9 +9,7 @@ SUBDIRS=\
    qnetworkrequest \
    qhttpnetworkconnection \
    qnetworkreply \
-   spdy \
    qnetworkcachemetadata \
-   qftp \
    qhttpnetworkreply \
    qabstractnetworkcache \
    hpack \
@@ -19,7 +19,8 @@ SUBDIRS=\
 !qtConfig(private_tests): SUBDIRS -= \
           qhttpnetworkconnection \
           qhttpnetworkreply \
-          qftp \
           hpack \
           http2 \
           hsts
+
+qtConfig(ftp): qtConfig(private_tests): SUBDIRS += qftp
diff --git a/tests/auto/network/access/hpack/CMakeLists.txt b/tests/auto/network/access/hpack/CMakeLists.txt
new file mode 100644
index 0000000000..e1c5c1a469
--- /dev/null
+++ b/tests/auto/network/access/hpack/CMakeLists.txt
@@ -0,0 +1,17 @@
+# Generated from hpack.pro.
+
+#####################################################################
+## tst_hpack Test:
+#####################################################################
+
+add_qt_test(tst_hpack
+    SOURCES
+        tst_hpack.cpp
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::Network
+        Qt::NetworkPrivate
+)
+
+#### Keys ignored in scope 1:.:.:hpack.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/auto/network/access/hsts/CMakeLists.txt b/tests/auto/network/access/hsts/CMakeLists.txt
new file mode 100644
index 0000000000..804ebedf61
--- /dev/null
+++ b/tests/auto/network/access/hsts/CMakeLists.txt
@@ -0,0 +1,17 @@
+# Generated from hsts.pro.
+
+#####################################################################
+## tst_qhsts Test:
+#####################################################################
+
+add_qt_test(tst_qhsts
+    SOURCES
+        tst_qhsts.cpp
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::Network
+        Qt::NetworkPrivate
+)
+
+#### Keys ignored in scope 1:.:.:hsts.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/auto/network/access/http2/CMakeLists.txt b/tests/auto/network/access/http2/CMakeLists.txt
new file mode 100644
index 0000000000..51c7c18eac
--- /dev/null
+++ b/tests/auto/network/access/http2/CMakeLists.txt
@@ -0,0 +1,20 @@
+# Generated from http2.pro.
+
+#####################################################################
+## tst_http2 Test:
+#####################################################################
+
+add_qt_test(tst_http2
+    SOURCES
+        ../../../../shared/emulationdetector.h
+        http2srv.cpp http2srv.h
+        tst_http2.cpp
+    DEFINES
+        SRCDIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/\\\"
+    INCLUDE_DIRECTORIES
+        ../../../../shared
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::Network
+        Qt::NetworkPrivate
+)
diff --git a/tests/auto/network/access/http2/tst_http2.cpp b/tests/auto/network/access/http2/tst_http2.cpp
index 6f94692cb1..904cfd52b0 100644
--- a/tests/auto/network/access/http2/tst_http2.cpp
+++ b/tests/auto/network/access/http2/tst_http2.cpp
@@ -939,13 +939,6 @@ void tst_Http2::replyFinished()
         QVERIFY(http2Used.isValid());
         QVERIFY(http2Used.toBool());
 
-        const QVariant spdyUsed(reply->attribute(QNetworkRequest::SpdyWasUsedAttribute));
-        if (!spdyUsed.isValid() || spdyUsed.toBool())
-            stopEventLoop();
-
-        QVERIFY(spdyUsed.isValid());
-        QVERIFY(!spdyUsed.toBool());
-
         const QVariant code(reply->attribute(QNetworkRequest::HttpStatusCodeAttribute));
         if (!code.isValid() || !code.canConvert<int>() || code.value<int>() != 200)
             stopEventLoop();
diff --git a/tests/auto/network/access/qabstractnetworkcache/CMakeLists.txt b/tests/auto/network/access/qabstractnetworkcache/CMakeLists.txt
new file mode 100644
index 0000000000..07128e40bb
--- /dev/null
+++ b/tests/auto/network/access/qabstractnetworkcache/CMakeLists.txt
@@ -0,0 +1,22 @@
+# Generated from qabstractnetworkcache.pro.
+
+#####################################################################
+## tst_qabstractnetworkcache Test:
+#####################################################################
+
+# Collect test data
+file(GLOB_RECURSE test_data_glob
+    RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+    tests/*)
+list(APPEND test_data ${test_data_glob})
+
+add_qt_test(tst_qabstractnetworkcache
+    SOURCES
+        tst_qabstractnetworkcache.cpp
+    PUBLIC_LIBRARIES
+        Qt::Network
+    TESTDATA ${test_data}
+)
+
+#### Keys ignored in scope 1:.:.:qabstractnetworkcache.pro:<TRUE>:
+# QT_TEST_SERVER_LIST = "apache2"
diff --git a/tests/auto/network/access/qftp/CMakeLists.txt b/tests/auto/network/access/qftp/CMakeLists.txt
new file mode 100644
index 0000000000..877c3a229b
--- /dev/null
+++ b/tests/auto/network/access/qftp/CMakeLists.txt
@@ -0,0 +1,25 @@
+# Generated from qftp.pro.
+
+if(NOT QT_FEATURE_ftp)
+    return()
+endif()
+if(NOT QT_FEATURE_private_tests)
+    return()
+endif()
+
+#####################################################################
+## tst_qftp Test:
+#####################################################################
+
+add_qt_test(tst_qftp
+    SOURCES
+        tst_qftp.cpp
+    PUBLIC_LIBRARIES
+        Qt::Network
+        Qt::NetworkPrivate
+)
+
+#### Keys ignored in scope 1:.:.:qftp.pro:<TRUE>:
+# QT_FOR_CONFIG = "network"
+# QT_TEST_SERVER_LIST = "vsftpd" "ftp-proxy" "squid" "danted"
+# _REQUIREMENTS = "qtConfig(ftp)" "qtConfig(private_tests)"
diff --git a/tests/auto/network/access/qftp/qftp.pro b/tests/auto/network/access/qftp/qftp.pro
index c78020c5f8..ad610316df 100644
--- a/tests/auto/network/access/qftp/qftp.pro
+++ b/tests/auto/network/access/qftp/qftp.pro
@@ -1,7 +1,9 @@
 CONFIG += testcase
 TARGET = tst_qftp
 SOURCES  += tst_qftp.cpp
+QT_FOR_CONFIG += network
 
+requires(qtConfig(ftp))
 requires(qtConfig(private_tests))
 QT = core network network-private testlib
 
diff --git a/tests/auto/network/access/qhttpnetworkconnection/CMakeLists.txt b/tests/auto/network/access/qhttpnetworkconnection/CMakeLists.txt
new file mode 100644
index 0000000000..6ab8876c82
--- /dev/null
+++ b/tests/auto/network/access/qhttpnetworkconnection/CMakeLists.txt
@@ -0,0 +1,21 @@
+# Generated from qhttpnetworkconnection.pro.
+
+if(NOT QT_FEATURE_private_tests)
+    return()
+endif()
+
+#####################################################################
+## tst_qhttpnetworkconnection Test:
+#####################################################################
+
+add_qt_test(tst_qhttpnetworkconnection
+    SOURCES
+        tst_qhttpnetworkconnection.cpp
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::NetworkPrivate
+)
+
+#### Keys ignored in scope 1:.:.:qhttpnetworkconnection.pro:<TRUE>:
+# QT_TEST_SERVER_LIST = "apache2"
+# _REQUIREMENTS = "qtConfig(private_tests)"
diff --git a/tests/auto/network/access/qhttpnetworkreply/CMakeLists.txt b/tests/auto/network/access/qhttpnetworkreply/CMakeLists.txt
new file mode 100644
index 0000000000..8c68a18da6
--- /dev/null
+++ b/tests/auto/network/access/qhttpnetworkreply/CMakeLists.txt
@@ -0,0 +1,20 @@
+# Generated from qhttpnetworkreply.pro.
+
+if(NOT QT_FEATURE_private_tests)
+    return()
+endif()
+
+#####################################################################
+## tst_qhttpnetworkreply Test:
+#####################################################################
+
+add_qt_test(tst_qhttpnetworkreply
+    SOURCES
+        tst_qhttpnetworkreply.cpp
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::NetworkPrivate
+)
+
+#### Keys ignored in scope 1:.:.:qhttpnetworkreply.pro:<TRUE>:
+# _REQUIREMENTS = "qtConfig(private_tests)"
diff --git a/tests/auto/network/access/qnetworkaccessmanager/CMakeLists.txt b/tests/auto/network/access/qnetworkaccessmanager/CMakeLists.txt
new file mode 100644
index 0000000000..4b58c449c6
--- /dev/null
+++ b/tests/auto/network/access/qnetworkaccessmanager/CMakeLists.txt
@@ -0,0 +1,12 @@
+# Generated from qnetworkaccessmanager.pro.
+
+#####################################################################
+## tst_qnetworkaccessmanager Test:
+#####################################################################
+
+add_qt_test(tst_qnetworkaccessmanager
+    SOURCES
+        tst_qnetworkaccessmanager.cpp
+    PUBLIC_LIBRARIES
+        Qt::Network
+)
diff --git a/tests/auto/network/access/qnetworkcachemetadata/CMakeLists.txt b/tests/auto/network/access/qnetworkcachemetadata/CMakeLists.txt
new file mode 100644
index 0000000000..08e80d8e0d
--- /dev/null
+++ b/tests/auto/network/access/qnetworkcachemetadata/CMakeLists.txt
@@ -0,0 +1,12 @@
+# Generated from qnetworkcachemetadata.pro.
+
+#####################################################################
+## tst_qnetworkcachemetadata Test:
+#####################################################################
+
+add_qt_test(tst_qnetworkcachemetadata
+    SOURCES
+        tst_qnetworkcachemetadata.cpp
+    PUBLIC_LIBRARIES
+        Qt::Network
+)
diff --git a/tests/auto/network/access/qnetworkcookie/CMakeLists.txt b/tests/auto/network/access/qnetworkcookie/CMakeLists.txt
new file mode 100644
index 0000000000..ab90a61bb3
--- /dev/null
+++ b/tests/auto/network/access/qnetworkcookie/CMakeLists.txt
@@ -0,0 +1,12 @@
+# Generated from qnetworkcookie.pro.
+
+#####################################################################
+## tst_qnetworkcookie Test:
+#####################################################################
+
+add_qt_test(tst_qnetworkcookie
+    SOURCES
+        tst_qnetworkcookie.cpp
+    PUBLIC_LIBRARIES
+        Qt::Network
+)
diff --git a/tests/auto/network/access/qnetworkcookiejar/CMakeLists.txt b/tests/auto/network/access/qnetworkcookiejar/CMakeLists.txt
new file mode 100644
index 0000000000..929388a10a
--- /dev/null
+++ b/tests/auto/network/access/qnetworkcookiejar/CMakeLists.txt
@@ -0,0 +1,18 @@
+# Generated from qnetworkcookiejar.pro.
+
+#####################################################################
+## tst_qnetworkcookiejar Test:
+#####################################################################
+
+# Collect test data
+list(APPEND test_data "parser.json")
+
+add_qt_test(tst_qnetworkcookiejar
+    SOURCES
+        tst_qnetworkcookiejar.cpp
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::Network
+        Qt::NetworkPrivate
+    TESTDATA ${test_data}
+)
diff --git a/tests/auto/network/access/qnetworkdiskcache/CMakeLists.txt b/tests/auto/network/access/qnetworkdiskcache/CMakeLists.txt
new file mode 100644
index 0000000000..b206686139
--- /dev/null
+++ b/tests/auto/network/access/qnetworkdiskcache/CMakeLists.txt
@@ -0,0 +1,12 @@
+# Generated from qnetworkdiskcache.pro.
+
+#####################################################################
+## tst_qnetworkdiskcache Test:
+#####################################################################
+
+add_qt_test(tst_qnetworkdiskcache
+    SOURCES
+        tst_qnetworkdiskcache.cpp
+    PUBLIC_LIBRARIES
+        Qt::Network
+)
diff --git a/tests/auto/network/access/qnetworkreply/BLACKLIST b/tests/auto/network/access/qnetworkreply/BLACKLIST
index 801ac65d71..a2c6224ce0 100644
--- a/tests/auto/network/access/qnetworkreply/BLACKLIST
+++ b/tests/auto/network/access/qnetworkreply/BLACKLIST
@@ -15,8 +15,6 @@ linux
 # QTBUG-71953
 [getFromHttp]
 * !android !winrt
-[getFromHttp:success-external]
-*
 [getFromHttpIntoBuffer]
 osx
 [getFromHttpIntoBuffer2]
diff --git a/tests/auto/network/access/qnetworkreply/CMakeLists.txt b/tests/auto/network/access/qnetworkreply/CMakeLists.txt
new file mode 100644
index 0000000000..f7efa8f7f3
--- /dev/null
+++ b/tests/auto/network/access/qnetworkreply/CMakeLists.txt
@@ -0,0 +1,7 @@
+# Generated from qnetworkreply.pro.
+
+add_subdirectory(test)
+
+if(NOT WINRT)
+    add_subdirectory(echo)
+endif()
diff --git a/tests/auto/network/access/qnetworkreply/echo/.prev_CMakeLists.txt b/tests/auto/network/access/qnetworkreply/echo/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..e43272d7e8
--- /dev/null
+++ b/tests/auto/network/access/qnetworkreply/echo/.prev_CMakeLists.txt
@@ -0,0 +1,10 @@
+# Generated from echo.pro.
+
+#####################################################################
+## echo Binary:
+#####################################################################
+
+add_qt_executable(echo
+    SOURCES
+        main.cpp
+)
diff --git a/tests/auto/network/access/qnetworkreply/echo/CMakeLists.txt b/tests/auto/network/access/qnetworkreply/echo/CMakeLists.txt
new file mode 100644
index 0000000000..f260b97b8d
--- /dev/null
+++ b/tests/auto/network/access/qnetworkreply/echo/CMakeLists.txt
@@ -0,0 +1,11 @@
+# Generated from echo.pro.
+
+#####################################################################
+## echo Binary:
+#####################################################################
+
+add_qt_executable(echo
+    OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
+    SOURCES
+        main.cpp
+)
diff --git a/tests/auto/network/access/qnetworkreply/test/CMakeLists.txt b/tests/auto/network/access/qnetworkreply/test/CMakeLists.txt
new file mode 100644
index 0000000000..ef017edf58
--- /dev/null
+++ b/tests/auto/network/access/qnetworkreply/test/CMakeLists.txt
@@ -0,0 +1,60 @@
+# Generated from test.pro.
+
+#####################################################################
+## tst_qnetworkreply Test:
+#####################################################################
+
+# Collect test data
+list(APPEND test_data "../empty")
+list(APPEND test_data "../rfc3252.txt")
+list(APPEND test_data "../resource")
+list(APPEND test_data "../bigfile")
+file(GLOB_RECURSE test_data_glob
+    RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+    ../*.jpg)
+list(APPEND test_data ${test_data_glob})
+list(APPEND test_data "../certs")
+list(APPEND test_data "../index.html")
+list(APPEND test_data "../smb-file.txt")
+
+add_qt_test(tst_qnetworkreply
+    OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../" # special case
+    SOURCES
+        ../../../../../shared/emulationdetector.h
+        ../tst_qnetworkreply.cpp
+    INCLUDE_DIRECTORIES
+        ../../../../../shared
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::NetworkPrivate
+    TESTDATA ${test_data}
+)
+
+# Resources:
+set_source_files_properties("../resource"
+    PROPERTIES QT_RESOURCE_ALIAS "resource"
+)
+set(qnetworkreply_resource_files
+    "resource"
+)
+
+add_qt_resource(tst_qnetworkreply "qnetworkreply"
+    PREFIX
+        "/"
+    BASE
+        ".."
+    FILES
+        ${qnetworkreply_resource_files}
+)
+
+
+#### Keys ignored in scope 1:.:.:test.pro:<TRUE>:
+# QT_FOR_CONFIG = "gui-private"
+# QT_TEST_SERVER_LIST = "vsftpd" "apache2" "ftp-proxy" "danted" "squid"
+# testcase.timeout = "600"
+
+## Scopes:
+#####################################################################
+
+#### Keys ignored in scope 2:.:.:test.pro:NOT ANDROID AND NOT WINRT:
+# TEST_HELPER_INSTALLS = "../echo/echo"
diff --git a/tests/auto/network/access/qnetworkreply/test/test.pro b/tests/auto/network/access/qnetworkreply/test/test.pro
index 4cc1f6431e..d3385c1929 100644
--- a/tests/auto/network/access/qnetworkreply/test/test.pro
+++ b/tests/auto/network/access/qnetworkreply/test/test.pro
@@ -4,7 +4,7 @@ CONFIG -= debug_and_release_target
 INCLUDEPATH += ../../../../../shared/
 HEADERS += ../../../../../shared/emulationdetector.h
 SOURCES  += ../tst_qnetworkreply.cpp
-TARGET = ../tst_qnetworkreply
+TARGET = tst_qnetworkreply
 
 QT = core-private network-private testlib
 QT_FOR_CONFIG += gui-private
diff --git a/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp b/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp
index 65f355ca25..5d46002a7c 100644
--- a/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp
+++ b/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp
@@ -219,9 +219,11 @@ private Q_SLOTS:
     void getFromFile();
     void getFromFileSpecial_data();
     void getFromFileSpecial();
+#if QT_CONFIG(ftp)
     void getFromFtp_data();
     void getFromFtp();
     void getFromFtpAfterError();    // QTBUG-40797
+#endif
     void getFromHttp_data();
     void getFromHttp();
     void getErrors_data();
@@ -232,9 +234,11 @@ private Q_SLOTS:
 #endif // !QT_NO_NETWORKPROXY
     void putToFile_data();
     void putToFile();
+#if QT_CONFIG(ftp)
     void putToFtp_data();
     void putToFtp();
     void putToFtpWithInvalidCredentials();    // QTBUG-40622
+#endif
     void putToHttp_data();
     void putToHttp();
     void putToHttpSynchronous_data();
@@ -275,9 +279,11 @@ private Q_SLOTS:
     void ioGetFromFileSpecial();
     void ioGetFromFile_data();
     void ioGetFromFile();
+#if QT_CONFIG(ftp)
     void ioGetFromFtp_data();
     void ioGetFromFtp();
     void ioGetFromFtpWithReuse();
+#endif
     void ioGetFromHttp();
 
     void ioGetFromBuiltinHttp_data();
@@ -319,8 +325,10 @@ private Q_SLOTS:
     void ioPutToFileFromLocalSocket();
     void ioPutToFileFromProcess_data();
     void ioPutToFileFromProcess();
+#if QT_CONFIG(ftp)
     void ioPutToFtpFromFile_data();
     void ioPutToFtpFromFile();
+#endif
     void ioPutToHttpFromFile_data();
     void ioPutToHttpFromFile();
     void ioPostToHttpFromFile_data();
@@ -466,8 +474,10 @@ private Q_SLOTS:
     void closeDuringDownload_data();
     void closeDuringDownload();
 
+#if QT_CONFIG(ftp)
     void ftpAuthentication_data();
     void ftpAuthentication();
+#endif
 
     void emitErrorForAllReplies(); // QTBUG-36890
 
@@ -1852,6 +1862,7 @@ void tst_QNetworkReply::getFromFileSpecial()
     QCOMPARE(reply->readAll(), resource.readAll());
 }
 
+#if QT_CONFIG(ftp)
 void tst_QNetworkReply::getFromFtp_data()
 {
     QTest::addColumn<QString>("referenceName");
@@ -1904,6 +1915,7 @@ void tst_QNetworkReply::getFromFtpAfterError()
     QCOMPARE(validReply->header(QNetworkRequest::ContentLengthHeader).toLongLong(), reference.size());
     QCOMPARE(validReply->readAll(), reference.readAll());
 }
+#endif
 
 void tst_QNetworkReply::getFromHttp_data()
 {
@@ -1914,10 +1926,6 @@ void tst_QNetworkReply::getFromHttp_data()
         << testDataDir + "/rfc3252.txt"
         << "http://" + QtNetworkSettings::httpServerName() + "/qtest/rfc3252.txt";
 
-    QTest::newRow("success-external")
-        << testDataDir + "/rfc3252.txt"
-        << "http://www.ietf.org/rfc/rfc3252.txt";
-
     QTest::newRow("bigfile-internal")
         << testDataDir + "/bigfile"
         << "http://" + QtNetworkSettings::httpServerName() + "/qtest/bigfile";
@@ -2077,6 +2085,7 @@ void tst_QNetworkReply::getErrors_data()
         QTest::newRow("file-permissions") << "file:" + filePermissionFileName
                                           << int(QNetworkReply::ContentAccessDenied) << 0 << true;
 
+#if QT_CONFIG(ftp)
     // ftp: errors
     QTest::newRow("ftp-host") << "ftp://invalid.test.qt-project.org/foo.txt"
                               << int(QNetworkReply::HostNotFoundError) << 0 << true;
@@ -2090,6 +2099,7 @@ void tst_QNetworkReply::getErrors_data()
                                            << int(QNetworkReply::ContentAccessDenied) << 0 << true;
     QTest::newRow("ftp-exist") << "ftp://" + QtNetworkSettings::ftpServerName() + "/pub/this-file-doesnt-exist.txt"
                                << int(QNetworkReply::ContentNotFoundError) << 0 << true;
+#endif
 
     // http: errors
     QTest::newRow("http-host") << "http://invalid.test.qt-project.org/"
@@ -2143,9 +2153,11 @@ void tst_QNetworkReply::getErrors()
     QVERIFY2(waitResult != Timeout, msgGetErrors(waitResult, reply));
 
     QFETCH(int, error);
+#if QT_CONFIG(ftp)
     QEXPECT_FAIL("ftp-is-dir", "QFtp cannot provide enough detail", Abort);
     // the line below is not necessary
     QEXPECT_FAIL("ftp-dir-not-readable", "QFtp cannot provide enough detail", Abort);
+#endif
     QCOMPARE(reply->error(), QNetworkReply::NetworkError(error));
 
     QTEST(reply->readAll().isEmpty(), "dataIsEmpty");
@@ -2215,6 +2227,7 @@ void tst_QNetworkReply::putToFile()
     QCOMPARE(contents, data);
 }
 
+#if QT_CONFIG(ftp)
 void tst_QNetworkReply::putToFtp_data()
 {
     putToFile_data();
@@ -2287,6 +2300,7 @@ void tst_QNetworkReply::putToFtpWithInvalidCredentials()
         r->close();
     }
 }
+#endif
 
 void tst_QNetworkReply::putToHttp_data()
 {
@@ -3287,6 +3301,7 @@ void tst_QNetworkReply::ioGetFromFile()
     QCOMPARE(reader.data, data);
 }
 
+#if QT_CONFIG(ftp)
 void tst_QNetworkReply::ioGetFromFtp_data()
 {
     QTest::addColumn<QString>("fileName");
@@ -3353,6 +3368,7 @@ void tst_QNetworkReply::ioGetFromFtpWithReuse()
     QCOMPARE(reader1.data, referenceData);
     QCOMPARE(reader2.data, referenceData);
 }
+#endif
 
 void tst_QNetworkReply::ioGetFromHttp()
 {
@@ -4209,6 +4225,7 @@ void tst_QNetworkReply::ioGetWithManyProxies_data()
         << "http://" + QtNetworkSettings::httpServerName() + "/qtest/rfc3252.txt"
         << QNetworkReply::NoError;
 
+#if QT_CONFIG(ftp)
     // FTP request with FTP caching proxy
     proxyList.clear();
     proxyList << QNetworkProxy(QNetworkProxy::FtpCachingProxy, QtNetworkSettings::ftpProxyServerName(), 2121);
@@ -4227,6 +4244,7 @@ void tst_QNetworkReply::ioGetWithManyProxies_data()
         << proxyList << proxyList.at(0)
         << "ftp://" + QtNetworkSettings::ftpServerName() + "/qtest/rfc3252.txt"
         << QNetworkReply::NoError;
+#endif
 
 #ifndef QT_NO_SSL
     // HTTPS with HTTP transparent proxy
@@ -4256,6 +4274,7 @@ void tst_QNetworkReply::ioGetWithManyProxies_data()
         << "http://" + QtNetworkSettings::httpServerName() + "/qtest/rfc3252.txt"
         << QNetworkReply::ProxyNotFoundError;
 
+#if QT_CONFIG(ftp)
     // FTP request with HTTP caching proxy
     proxyList.clear();
     proxyList << QNetworkProxy(QNetworkProxy::HttpCachingProxy, QtNetworkSettings::httpProxyServerName(), 3129);
@@ -4272,6 +4291,7 @@ void tst_QNetworkReply::ioGetWithManyProxies_data()
         << proxyList << QNetworkProxy()
         << "ftp://" + QtNetworkSettings::ftpServerName() + "/qtest/rfc3252.txt"
         << QNetworkReply::ProxyNotFoundError;
+#endif
 
 #ifndef QT_NO_SSL
     // HTTPS with HTTP caching proxy
@@ -4339,6 +4359,7 @@ void tst_QNetworkReply::ioGetWithManyProxies_data()
         << "http://" + QtNetworkSettings::httpServerName() + "/qtest/rfc3252.txt"
         << QNetworkReply::NoError;
 
+#if QT_CONFIG(ftp)
     // FTP request with HTTP Caching + FTP
     proxyList.clear();
     proxyList << QNetworkProxy(QNetworkProxy::HttpCachingProxy, QtNetworkSettings::httpProxyServerName(), 3129)
@@ -4347,6 +4368,7 @@ void tst_QNetworkReply::ioGetWithManyProxies_data()
         << proxyList << proxyList.at(1) // second proxy should be used
         << "ftp://" + QtNetworkSettings::ftpServerName() + "/qtest/rfc3252.txt"
         << QNetworkReply::NoError;
+#endif
 
 #ifndef QT_NO_SSL
     // HTTPS request with HTTP Caching + HTTP transparent
@@ -4407,7 +4429,9 @@ void tst_QNetworkReply::ioGetWithManyProxies()
 #endif
 
     QFETCH(QNetworkReply::NetworkError, expectedError);
+#if QT_CONFIG(ftp)
     QEXPECT_FAIL("ftp-on-socks", "QFtp is too limited and won't accept non-FTP proxies", Abort);
+#endif
     QCOMPARE(reply->error(), expectedError);
 
     // Verify that the factory was called properly
@@ -4423,8 +4447,10 @@ void tst_QNetworkReply::ioGetWithManyProxies()
         if (proxyUsed.type() == QNetworkProxy::NoProxy) {
             QCOMPARE(authspy.count(), 0);
         } else {
+#if QT_CONFIG(ftp)
             if (QByteArray(QTest::currentDataTag()).startsWith("ftp-"))
                 return;         // No authentication with current FTP or with FTP proxies
+#endif
             QCOMPARE(authspy.count(), 1);
             QCOMPARE(qvariant_cast<QNetworkProxy>(authspy.at(0).at(0)), proxyUsed);
         }
@@ -4605,6 +4631,7 @@ void tst_QNetworkReply::ioPutToFileFromProcess()
 #endif // QT_CONFIG(process)
 }
 
+#if QT_CONFIG(ftp)
 void tst_QNetworkReply::ioPutToFtpFromFile_data()
 {
     ioPutToFileFromFile_data();
@@ -4653,6 +4680,7 @@ void tst_QNetworkReply::ioPutToFtpFromFile()
     QTestEventLoop::instance().enterLoop(10);
     QObject::disconnect(r, SIGNAL(finished()), &QTestEventLoop::instance(), SLOT(exitLoop()));
 }
+#endif
 
 void tst_QNetworkReply::ioPutToHttpFromFile_data()
 {
@@ -8025,7 +8053,9 @@ void tst_QNetworkReply::closeDuringDownload_data()
 {
     QTest::addColumn<QUrl>("url");
     QTest::newRow("http") << QUrl("http://" + QtNetworkSettings::httpServerName() + "/bigfile");
+#if QT_CONFIG(ftp)
     QTest::newRow("ftp") << QUrl("ftp://" + QtNetworkSettings::ftpServerName() + "/qtest/bigfile");
+#endif
 }
 
 void tst_QNetworkReply::closeDuringDownload()
@@ -8043,6 +8073,7 @@ void tst_QNetworkReply::closeDuringDownload()
     QVERIFY(destroySpy.wait());
 }
 
+#if QT_CONFIG(ftp)
 void tst_QNetworkReply::ftpAuthentication_data()
 {
     QTest::addColumn<QString>("referenceName");
@@ -8069,6 +8100,7 @@ void tst_QNetworkReply::ftpAuthentication()
     QCOMPARE(reply->url(), request.url());
     QCOMPARE(reply->error(), QNetworkReply::NetworkError(error));
 }
+#endif
 
 void tst_QNetworkReply::emitErrorForAllReplies() // QTBUG-36890
 {
@@ -8112,7 +8144,9 @@ void tst_QNetworkReply::backgroundRequest_data()
 
     QUrl httpurl("http://" + QtNetworkSettings::httpServerName());
     QUrl httpsurl("https://" + QtNetworkSettings::httpServerName());
+#if QT_CONFIG(ftp)
     QUrl ftpurl("ftp://" + QtNetworkSettings::ftpServerName() + "/qtest/rfc3252.txt");
+#endif
 
     QTest::newRow("http, fg, normal") << httpurl << false << (int)QNetworkSession::NoPolicy << QNetworkReply::NoError;
     QTest::newRow("http, bg, normal") << httpurl << true << (int)QNetworkSession::NoPolicy << QNetworkReply::NoError;
@@ -8126,10 +8160,12 @@ void tst_QNetworkReply::backgroundRequest_data()
     QTest::newRow("https, bg, nobg") << httpsurl << true << (int)QNetworkSession::NoBackgroundTrafficPolicy << QNetworkReply::BackgroundRequestNotAllowedError;
 #endif
 
+#if QT_CONFIG(ftp)
     QTest::newRow("ftp, fg, normal") << ftpurl << false << (int)QNetworkSession::NoPolicy << QNetworkReply::NoError;
     QTest::newRow("ftp, bg, normal") << ftpurl << true << (int)QNetworkSession::NoPolicy << QNetworkReply::NoError;
     QTest::newRow("ftp, fg, nobg") << ftpurl << false << (int)QNetworkSession::NoBackgroundTrafficPolicy << QNetworkReply::NoError;
     QTest::newRow("ftp, bg, nobg") << ftpurl << true << (int)QNetworkSession::NoBackgroundTrafficPolicy << QNetworkReply::BackgroundRequestNotAllowedError;
+#endif
 #endif // !QT_NO_BEARERMANAGEMENT
 }
 #endif
@@ -8184,7 +8220,9 @@ void tst_QNetworkReply::backgroundRequestInterruption_data()
 
     QUrl httpurl("http://" + QtNetworkSettings::httpServerName() + "/qtest/mediumfile");
     QUrl httpsurl("https://" + QtNetworkSettings::httpServerName() + "/qtest/mediumfile");
+#if QT_CONFIG(ftp)
     QUrl ftpurl("ftp://" + QtNetworkSettings::ftpServerName() + "/qtest/bigfile");
+#endif
 
     QTest::newRow("http, fg, nobg") << httpurl << false << QNetworkReply::NoError;
     QTest::newRow("http, bg, nobg") << httpurl << true << QNetworkReply::BackgroundRequestNotAllowedError;
@@ -8194,9 +8232,10 @@ void tst_QNetworkReply::backgroundRequestInterruption_data()
     QTest::newRow("https, bg, nobg") << httpsurl << true  << QNetworkReply::BackgroundRequestNotAllowedError;
 #endif
 
+#if QT_CONFIG(ftp)
     QTest::newRow("ftp, fg, nobg") << ftpurl << false << QNetworkReply::NoError;
     QTest::newRow("ftp, bg, nobg") << ftpurl << true << QNetworkReply::BackgroundRequestNotAllowedError;
-
+#endif
 }
 #endif
 
@@ -8260,13 +8299,17 @@ void tst_QNetworkReply::backgroundRequestConnectInBackground_data()
     QTest::addColumn<bool>("background");
 
     QUrl httpurl("http://" + QtNetworkSettings::httpServerName());
+#if QT_CONFIG(ftp)
     QUrl ftpurl("ftp://" + QtNetworkSettings::ftpServerName() + "/qtest/rfc3252.txt");
+#endif
 
     QTest::newRow("http, fg") << httpurl << false;
     QTest::newRow("http, bg") << httpurl << true;
 
+#if QT_CONFIG(ftp)
     QTest::newRow("ftp, fg") << ftpurl << false;
     QTest::newRow("ftp, bg") << ftpurl << true;
+#endif
 }
 #endif
 
@@ -9192,7 +9235,9 @@ void tst_QNetworkReply::autoDeleteRepliesAttribute_data()
 
     QTest::newRow("http") << QUrl("http://QInvalidDomain.qt/test");
     QTest::newRow("https") << QUrl("https://QInvalidDomain.qt/test");
+#if QT_CONFIG(ftp)
     QTest::newRow("ftp") << QUrl("ftp://QInvalidDomain.qt/test");
+#endif
     QTest::newRow("file") << QUrl("file:///thisfolderdoesn'texist/probably.txt");
 #ifdef Q_OS_WIN
     // Only supported on windows.
diff --git a/tests/auto/network/access/qnetworkrequest/CMakeLists.txt b/tests/auto/network/access/qnetworkrequest/CMakeLists.txt
new file mode 100644
index 0000000000..f089c5a43e
--- /dev/null
+++ b/tests/auto/network/access/qnetworkrequest/CMakeLists.txt
@@ -0,0 +1,12 @@
+# Generated from qnetworkrequest.pro.
+
+#####################################################################
+## tst_qnetworkrequest Test:
+#####################################################################
+
+add_qt_test(tst_qnetworkrequest
+    SOURCES
+        tst_qnetworkrequest.cpp
+    PUBLIC_LIBRARIES
+        Qt::Network
+)
diff --git a/tests/auto/network/access/spdy/BLACKLIST b/tests/auto/network/access/spdy/BLACKLIST
deleted file mode 100644
index 5cf79327be..0000000000
--- a/tests/auto/network/access/spdy/BLACKLIST
+++ /dev/null
@@ -1,7 +0,0 @@
-[download]
-opensuse-leap
-[upload]
-opensuse-leap
-ubuntu-18.04
-b2qt
-
diff --git a/tests/auto/network/access/spdy/spdy.pro b/tests/auto/network/access/spdy/spdy.pro
deleted file mode 100644
index cdbe60a19b..0000000000
--- a/tests/auto/network/access/spdy/spdy.pro
+++ /dev/null
@@ -1,7 +0,0 @@
-CONFIG += testcase
-TARGET = tst_spdy
-SOURCES  += tst_spdy.cpp
-
-QT = core core-private network network-private testlib
-
-win32:CONFIG += insignificant_test # QTBUG-47128
diff --git a/tests/auto/network/access/spdy/tst_spdy.cpp b/tests/auto/network/access/spdy/tst_spdy.cpp
deleted file mode 100644
index 5701f4911c..0000000000
--- a/tests/auto/network/access/spdy/tst_spdy.cpp
+++ /dev/null
@@ -1,694 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 BlackBerry Limited. All rights reserved.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-
-#include <QtTest/QtTest>
-#include <QtNetwork/QNetworkAccessManager>
-#include <QtNetwork/QNetworkReply>
-#include <QtNetwork/QHttpPart>
-#include <QtNetwork/QHttpMultiPart>
-#include <QtNetwork/QNetworkProxy>
-#include <QtNetwork/QAuthenticator>
-#if defined(QT_BUILD_INTERNAL) && !defined(QT_NO_OPENSSL)
-#include <QtNetwork/private/qsslsocket_openssl_p.h>
-#endif // QT_BUILD_INTERNAL && !QT_NO_OPENSSL
-
-#include "../../../network-settings.h"
-
-Q_DECLARE_METATYPE(QAuthenticator*)
-
-class tst_Spdy: public QObject
-{
-    Q_OBJECT
-
-public:
-    tst_Spdy();
-    ~tst_Spdy();
-
-private Q_SLOTS:
-    void initTestCase();
-    void settingsAndNegotiation_data();
-    void settingsAndNegotiation();
-#ifndef QT_NO_NETWORKPROXY
-    void download_data();
-    void download();
-#endif // !QT_NO_NETWORKPROXY
-    void headerFields();
-#ifndef QT_NO_NETWORKPROXY
-    void upload_data();
-    void upload();
-    void errors_data();
-    void errors();
-#endif // !QT_NO_NETWORKPROXY
-    void multipleRequests_data();
-    void multipleRequests();
-
-private:
-    QNetworkAccessManager m_manager;
-    int m_multipleRequestsCount;
-    int m_multipleRepliesFinishedCount;
-    const QString m_rfc3252FilePath;
-
-protected Q_SLOTS:
-    void proxyAuthenticationRequired(const QNetworkProxy &, QAuthenticator *authenticator);
-    void multipleRequestsFinishedSlot();
-};
-
-tst_Spdy::tst_Spdy()
-    : m_rfc3252FilePath(QFINDTESTDATA("../qnetworkreply/rfc3252.txt"))
-{
-#if defined(QT_BUILD_INTERNAL) && !defined(QT_NO_SSL) && OPENSSL_VERSION_NUMBER >= 0x1000100fL && !defined(OPENSSL_NO_TLSEXT) && !defined(OPENSSL_NO_NEXTPROTONEG)
-    qRegisterMetaType<QNetworkReply *>(); // for QSignalSpy
-    qRegisterMetaType<QAuthenticator *>();
-
-    connect(&m_manager, SIGNAL(proxyAuthenticationRequired(const QNetworkProxy &, QAuthenticator *)),
-            this, SLOT(proxyAuthenticationRequired(const QNetworkProxy &, QAuthenticator *)));
-#else
-    QSKIP("Qt built withouth OpenSSL, or the OpenSSL version is too old");
-#endif // defined(QT_BUILD_INTERNAL) && !defined(QT_NO_SSL) ...
-}
-
-tst_Spdy::~tst_Spdy()
-{
-}
-
-void tst_Spdy::initTestCase()
-{
-    QVERIFY(!m_rfc3252FilePath.isEmpty());
-    if (!QtNetworkSettings::verifyTestNetworkSettings())
-        QSKIP("No network test server available");
-}
-
-void tst_Spdy::settingsAndNegotiation_data()
-{
-    QTest::addColumn<QUrl>("url");
-    QTest::addColumn<bool>("setAttribute");
-    QTest::addColumn<bool>("enabled");
-    QTest::addColumn<QByteArray>("expectedProtocol");
-    QTest::addColumn<QByteArray>("expectedContent");
-
-    QTest::newRow("default-settings") << QUrl("https://" + QtNetworkSettings::serverName()
-                                              + "/qtest/cgi-bin/echo.cgi?1")
-                                      << false << false << QByteArray()
-                                      << QByteArray("1");
-
-    QTest::newRow("http-url") << QUrl("http://" + QtNetworkSettings::serverName()
-                                      + "/qtest/cgi-bin/echo.cgi?1")
-                              << true << true << QByteArray()
-                              << QByteArray("1");
-
-    QTest::newRow("spdy-disabled") << QUrl("https://" + QtNetworkSettings::serverName()
-                                           + "/qtest/cgi-bin/echo.cgi?1")
-                                   << true << false << QByteArray()
-                                   << QByteArray("1");
-
-#ifndef QT_NO_OPENSSL
-    QTest::newRow("spdy-enabled") << QUrl("https://" + QtNetworkSettings::serverName()
-                                     + "/qtest/cgi-bin/echo.cgi?1")
-                                  << true << true << QByteArray(QSslConfiguration::NextProtocolSpdy3_0)
-                             << QByteArray("1");
-#endif // QT_NO_OPENSSL
-}
-
-void tst_Spdy::settingsAndNegotiation()
-{
-    QFETCH(QUrl, url);
-    QFETCH(bool, setAttribute);
-    QFETCH(bool, enabled);
-
-    QNetworkRequest request(url);
-
-    if (setAttribute) {
-        request.setAttribute(QNetworkRequest::SpdyAllowedAttribute, QVariant(enabled));
-    }
-
-    QNetworkReply *reply = m_manager.get(request);
-    reply->ignoreSslErrors();
-    QSignalSpy metaDataChangedSpy(reply, SIGNAL(metaDataChanged()));
-    QSignalSpy readyReadSpy(reply, SIGNAL(readyRead()));
-    QSignalSpy finishedSpy(reply, SIGNAL(finished()));
-
-    QObject::connect(reply, SIGNAL(finished()), &QTestEventLoop::instance(), SLOT(exitLoop()));
-    QSignalSpy finishedManagerSpy(&m_manager, SIGNAL(finished(QNetworkReply*)));
-
-    QTestEventLoop::instance().enterLoop(15);
-    QVERIFY(!QTestEventLoop::instance().timeout());
-
-    QFETCH(QByteArray, expectedProtocol);
-
-#ifndef QT_NO_OPENSSL
-    bool expectedSpdyUsed = (expectedProtocol == QSslConfiguration::NextProtocolSpdy3_0);
-    QCOMPARE(reply->attribute(QNetworkRequest::SpdyWasUsedAttribute).toBool(), expectedSpdyUsed);
-#endif // QT_NO_OPENSSL
-
-    QCOMPARE(metaDataChangedSpy.count(), 1);
-    QCOMPARE(finishedSpy.count(), 1);
-
-    int statusCode = reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
-    QCOMPARE(statusCode, 200);
-
-    QByteArray content = reply->readAll();
-
-    QFETCH(QByteArray, expectedContent);
-    QCOMPARE(expectedContent, content);
-
-#ifndef QT_NO_OPENSSL
-    QSslConfiguration::NextProtocolNegotiationStatus expectedStatus =
-            (expectedProtocol.isEmpty())
-            ? QSslConfiguration::NextProtocolNegotiationNone
-            : QSslConfiguration::NextProtocolNegotiationNegotiated;
-    QCOMPARE(reply->sslConfiguration().nextProtocolNegotiationStatus(),
-             expectedStatus);
-
-    QCOMPARE(reply->sslConfiguration().nextNegotiatedProtocol(), expectedProtocol);
-#endif // QT_NO_OPENSSL
-}
-
-void tst_Spdy::proxyAuthenticationRequired(const QNetworkProxy &/*proxy*/,
-                                           QAuthenticator *authenticator)
-{
-    authenticator->setUser("qsockstest");
-    authenticator->setPassword("password");
-}
-
-#ifndef QT_NO_NETWORKPROXY
-void tst_Spdy::download_data()
-{
-    QTest::addColumn<QUrl>("url");
-    QTest::addColumn<QString>("fileName");
-    QTest::addColumn<QNetworkProxy>("proxy");
-
-    QTest::newRow("mediumfile") << QUrl("https://" + QtNetworkSettings::serverName()
-                                        + "/qtest/rfc3252.txt")
-                                << m_rfc3252FilePath
-                                << QNetworkProxy();
-
-    QHostInfo hostInfo = QHostInfo::fromName(QtNetworkSettings::serverName());
-    QString proxyserver = hostInfo.addresses().first().toString();
-
-    QTest::newRow("mediumfile-http-proxy") << QUrl("https://" + QtNetworkSettings::serverName()
-                                                   + "/qtest/rfc3252.txt")
-                                           << m_rfc3252FilePath
-                                           << QNetworkProxy(QNetworkProxy::HttpProxy, proxyserver, 3128);
-
-    QTest::newRow("mediumfile-http-proxy-auth") << QUrl("https://" + QtNetworkSettings::serverName()
-                                                        + "/qtest/rfc3252.txt")
-                                                << m_rfc3252FilePath
-                                                << QNetworkProxy(QNetworkProxy::HttpProxy,
-                                                                 proxyserver, 3129);
-
-    QTest::newRow("mediumfile-socks-proxy") << QUrl("https://" + QtNetworkSettings::serverName()
-                                                    + "/qtest/rfc3252.txt")
-                                            << m_rfc3252FilePath
-                                            << QNetworkProxy(QNetworkProxy::Socks5Proxy, proxyserver, 1080);
-
-    QTest::newRow("mediumfile-socks-proxy-auth") << QUrl("https://" + QtNetworkSettings::serverName()
-                                                         + "/qtest/rfc3252.txt")
-                                                 << m_rfc3252FilePath
-                                                 << QNetworkProxy(QNetworkProxy::Socks5Proxy,
-                                                                  proxyserver, 1081);
-
-    QTest::newRow("bigfile") << QUrl("https://" + QtNetworkSettings::serverName()
-                                      + "/qtest/bigfile")
-                             << QFINDTESTDATA("../qnetworkreply/bigfile")
-                             << QNetworkProxy();
-}
-
-void tst_Spdy::download()
-{
-    QFETCH(QUrl, url);
-    QFETCH(QString, fileName);
-    QFETCH(QNetworkProxy, proxy);
-
-    QNetworkRequest request(url);
-    request.setAttribute(QNetworkRequest::SpdyAllowedAttribute, true);
-
-    if (proxy.type() != QNetworkProxy::DefaultProxy) {
-        m_manager.setProxy(proxy);
-    }
-    QNetworkReply *reply = m_manager.get(request);
-    reply->ignoreSslErrors();
-    QSignalSpy metaDataChangedSpy(reply, SIGNAL(metaDataChanged()));
-    QSignalSpy downloadProgressSpy(reply, SIGNAL(downloadProgress(qint64, qint64)));
-    QSignalSpy readyReadSpy(reply, SIGNAL(readyRead()));
-    QSignalSpy finishedSpy(reply, SIGNAL(finished()));
-
-    QObject::connect(reply, SIGNAL(finished()), &QTestEventLoop::instance(), SLOT(exitLoop()));
-    QSignalSpy finishedManagerSpy(&m_manager, SIGNAL(finished(QNetworkReply*)));
-    QSignalSpy proxyAuthRequiredSpy(&m_manager, SIGNAL(
-                                        proxyAuthenticationRequired(const QNetworkProxy &,
-                                                                    QAuthenticator *)));
-
-    QTestEventLoop::instance().enterLoop(15);
-    QVERIFY(!QTestEventLoop::instance().timeout());
-
-    QCOMPARE(finishedManagerSpy.count(), 1);
-    QCOMPARE(metaDataChangedSpy.count(), 1);
-    QCOMPARE(finishedSpy.count(), 1);
-    QVERIFY(downloadProgressSpy.count() > 0);
-    QVERIFY(readyReadSpy.count() > 0);
-
-    QVERIFY(proxyAuthRequiredSpy.count() <= 1);
-
-    QCOMPARE(reply->error(), QNetworkReply::NoError);
-    QCOMPARE(reply->attribute(QNetworkRequest::SpdyWasUsedAttribute).toBool(), true);
-    QCOMPARE(reply->attribute(QNetworkRequest::ConnectionEncryptedAttribute).toBool(), true);
-    QCOMPARE(reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt(), 200);
-
-    QFile file(fileName);
-    QVERIFY(file.open(QIODevice::ReadOnly));
-
-    qint64 contentLength = reply->header(QNetworkRequest::ContentLengthHeader).toLongLong();
-    qint64 expectedContentLength = file.bytesAvailable();
-    QCOMPARE(contentLength, expectedContentLength);
-
-    QByteArray expectedContent = file.readAll();
-    QByteArray content = reply->readAll();
-    QCOMPARE(content, expectedContent);
-
-    reply->deleteLater();
-    m_manager.setProxy(QNetworkProxy()); // reset
-}
-#endif // !QT_NO_NETWORKPROXY
-
-void tst_Spdy::headerFields()
-{
-    QUrl url(QUrl("https://" + QtNetworkSettings::serverName()));
-    QNetworkRequest request(url);
-    request.setAttribute(QNetworkRequest::SpdyAllowedAttribute, true);
-
-    QNetworkReply *reply = m_manager.get(request);
-    reply->ignoreSslErrors();
-
-    QObject::connect(reply, SIGNAL(finished()), &QTestEventLoop::instance(), SLOT(exitLoop()));
-
-    QTestEventLoop::instance().enterLoop(15);
-    QVERIFY(!QTestEventLoop::instance().timeout());
-
-    QCOMPARE(reply->rawHeader("Content-Type"), QByteArray("text/html"));
-    QVERIFY(reply->rawHeader("Content-Length").toInt() > 0);
-    QVERIFY(reply->rawHeader("server").contains("Apache"));
-
-    QCOMPARE(reply->header(QNetworkRequest::ContentTypeHeader).toByteArray(), QByteArray("text/html"));
-    QVERIFY(reply->header(QNetworkRequest::ContentLengthHeader).toLongLong() > 0);
-    QVERIFY(reply->header(QNetworkRequest::LastModifiedHeader).toDateTime().isValid());
-    QVERIFY(reply->header(QNetworkRequest::ServerHeader).toByteArray().contains("Apache"));
-}
-
-static inline QByteArray md5sum(const QByteArray &data)
-{
-    return QCryptographicHash::hash(data, QCryptographicHash::Md5).toHex().append('\n');
-}
-
-#ifndef QT_NO_NETWORKPROXY
-void tst_Spdy::upload_data()
-{
-    QTest::addColumn<QUrl>("url");
-    QTest::addColumn<QByteArray>("data");
-    QTest::addColumn<QByteArray>("uploadMethod");
-    QTest::addColumn<QObject *>("uploadObject");
-    QTest::addColumn<QByteArray>("md5sum");
-    QTest::addColumn<QNetworkProxy>("proxy");
-
-
-    // 1. test uploading of byte arrays
-
-    QUrl md5Url("https://" + QtNetworkSettings::serverName() + "/qtest/cgi-bin/md5sum.cgi");
-
-    QByteArray data;
-    data = "";
-    QObject *dummyObject = 0;
-    QTest::newRow("empty") << md5Url << data << QByteArray("POST") << dummyObject
-                           << md5sum(data) << QNetworkProxy();
-
-    data = "This is a normal message.";
-    QTest::newRow("generic") << md5Url << data << QByteArray("POST") << dummyObject
-                             << md5sum(data) << QNetworkProxy();
-
-    data = "This is a message to show that Qt rocks!\r\n\n";
-    QTest::newRow("small") << md5Url << data << QByteArray("POST") << dummyObject
-                           << md5sum(data) << QNetworkProxy();
-
-    data = QByteArray("abcd\0\1\2\abcd",12);
-    QTest::newRow("with-nul") << md5Url << data << QByteArray("POST") << dummyObject
-                              << md5sum(data) << QNetworkProxy();
-
-    data = QByteArray(4097, '\4');
-    QTest::newRow("4k+1") << md5Url << data << QByteArray("POST") << dummyObject
-                          << md5sum(data)<< QNetworkProxy();
-
-    QHostInfo hostInfo = QHostInfo::fromName(QtNetworkSettings::serverName());
-    QString proxyserver = hostInfo.addresses().first().toString();
-
-    QTest::newRow("4k+1-with-http-proxy") << md5Url << data << QByteArray("POST") << dummyObject
-                                          << md5sum(data)
-                                          << QNetworkProxy(QNetworkProxy::HttpProxy, proxyserver, 3128);
-
-    QTest::newRow("4k+1-with-http-proxy-auth") << md5Url << data << QByteArray("POST") << dummyObject
-                                               << md5sum(data)
-                                               << QNetworkProxy(QNetworkProxy::HttpProxy,
-                                                                proxyserver, 3129);
-
-    QTest::newRow("4k+1-with-socks-proxy") << md5Url << data << QByteArray("POST") << dummyObject
-                                           << md5sum(data)
-                                           << QNetworkProxy(QNetworkProxy::Socks5Proxy, proxyserver, 1080);
-
-    QTest::newRow("4k+1-with-socks-proxy-auth") << md5Url << data << QByteArray("POST") << dummyObject
-                                                << md5sum(data)
-                                                << QNetworkProxy(QNetworkProxy::Socks5Proxy,
-                                                                 proxyserver, 1081);
-
-    data = QByteArray(128*1024+1, '\177');
-    QTest::newRow("128k+1") << md5Url << data << QByteArray("POST") << dummyObject
-                            << md5sum(data) << QNetworkProxy();
-
-    data = QByteArray(128*1024+1, '\177');
-    QTest::newRow("128k+1-put") << md5Url << data << QByteArray("PUT") << dummyObject
-                                << md5sum(data) << QNetworkProxy();
-
-    data = QByteArray(2*1024*1024+1, '\177');
-    QTest::newRow("2MB+1") << md5Url << data << QByteArray("POST") << dummyObject
-                           << md5sum(data) << QNetworkProxy();
-
-
-    // 2. test uploading of files
-
-    QFile *file = new QFile(m_rfc3252FilePath);
-    file->open(QIODevice::ReadOnly);
-    QTest::newRow("file-26K") << md5Url << QByteArray() << QByteArray("POST")
-                              << static_cast<QObject *>(file)
-                              << QByteArray("b3e32ac459b99d3f59318f3ac31e4bee\n") << QNetworkProxy();
-
-    QFile *file2 = new QFile(QFINDTESTDATA("../qnetworkreply/image1.jpg"));
-    file2->open(QIODevice::ReadOnly);
-    QTest::newRow("file-1MB") << md5Url << QByteArray() << QByteArray("POST")
-                              << static_cast<QObject *>(file2)
-                              << QByteArray("87ef3bb319b004ba9e5e9c9fa713776e\n") << QNetworkProxy();
-
-
-    // 3. test uploading of multipart
-
-    QUrl multiPartUrl("https://" + QtNetworkSettings::serverName() + "/qtest/cgi-bin/multipart.cgi");
-
-    QHttpPart imagePart31;
-    imagePart31.setHeader(QNetworkRequest::ContentTypeHeader, QVariant("image/jpeg"));
-    imagePart31.setHeader(QNetworkRequest::ContentDispositionHeader, QVariant("form-data; name=\"testImage1\""));
-    imagePart31.setRawHeader("Content-Location", "http://my.test.location.tld");
-    imagePart31.setRawHeader("Content-ID", "my@id.tld");
-    QFile *file31 = new QFile(QFINDTESTDATA("../qnetworkreply/image1.jpg"));
-    file31->open(QIODevice::ReadOnly);
-    imagePart31.setBodyDevice(file31);
-    QHttpMultiPart *imageMultiPart3 = new QHttpMultiPart(QHttpMultiPart::FormDataType);
-    imageMultiPart3->append(imagePart31);
-    file31->setParent(imageMultiPart3);
-    QHttpPart imagePart32;
-    imagePart32.setHeader(QNetworkRequest::ContentTypeHeader, QVariant("image/jpeg"));
-    imagePart32.setHeader(QNetworkRequest::ContentDispositionHeader, QVariant("form-data; name=\"testImage2\""));
-    QFile *file32 = new QFile(QFINDTESTDATA("../qnetworkreply/image2.jpg"));
-    file32->open(QIODevice::ReadOnly);
-    imagePart32.setBodyDevice(file31); // check that resetting works
-    imagePart32.setBodyDevice(file32);
-    imageMultiPart3->append(imagePart32);
-    file32->setParent(imageMultiPart3);
-    QHttpPart imagePart33;
-    imagePart33.setHeader(QNetworkRequest::ContentTypeHeader, QVariant("image/jpeg"));
-    imagePart33.setHeader(QNetworkRequest::ContentDispositionHeader, QVariant("form-data; name=\"testImage3\""));
-    QFile *file33 = new QFile(QFINDTESTDATA("../qnetworkreply/image3.jpg"));
-    file33->open(QIODevice::ReadOnly);
-    imagePart33.setBodyDevice(file33);
-    imageMultiPart3->append(imagePart33);
-    file33->setParent(imageMultiPart3);
-    QByteArray expectedData = "content type: multipart/form-data; boundary=\""
-            + imageMultiPart3->boundary();
-    expectedData.append("\"\nkey: testImage1, value: 87ef3bb319b004ba9e5e9c9fa713776e\n"
-            "key: testImage2, value: 483761b893f7fb1bd2414344cd1f3dfb\n"
-            "key: testImage3, value: ab0eb6fd4fcf8b4436254870b4513033\n");
-
-    QTest::newRow("multipart-3images") << multiPartUrl << QByteArray() << QByteArray("POST")
-                                       << static_cast<QObject *>(imageMultiPart3) << expectedData
-                                       << QNetworkProxy();
-}
-
-void tst_Spdy::upload()
-{
-    QFETCH(QUrl, url);
-    QNetworkRequest request(url);
-    request.setAttribute(QNetworkRequest::SpdyAllowedAttribute, true);
-
-    QFETCH(QByteArray, data);
-    QFETCH(QByteArray, uploadMethod);
-    QFETCH(QObject *, uploadObject);
-    QFETCH(QNetworkProxy, proxy);
-
-    if (proxy.type() != QNetworkProxy::DefaultProxy) {
-        m_manager.setProxy(proxy);
-    }
-
-    QNetworkReply *reply;
-    QHttpMultiPart *multiPart = 0;
-
-    if (uploadObject) {
-        // upload via device
-        if (QIODevice *device = qobject_cast<QIODevice *>(uploadObject)) {
-            reply = m_manager.post(request, device);
-        } else if ((multiPart = qobject_cast<QHttpMultiPart *>(uploadObject))) {
-            reply = m_manager.post(request, multiPart);
-        } else {
-            QFAIL("got unknown upload device");
-        }
-    } else {
-        // upload via byte array
-        if (uploadMethod == "PUT") {
-            reply = m_manager.put(request, data);
-        } else {
-            reply = m_manager.post(request, data);
-        }
-    }
-
-    reply->ignoreSslErrors();
-    QSignalSpy metaDataChangedSpy(reply, SIGNAL(metaDataChanged()));
-    QSignalSpy uploadProgressSpy(reply, SIGNAL(uploadProgress(qint64, qint64)));
-    QSignalSpy readyReadSpy(reply, SIGNAL(readyRead()));
-    QSignalSpy finishedSpy(reply, SIGNAL(finished()));
-
-    QObject::connect(reply, SIGNAL(finished()), &QTestEventLoop::instance(), SLOT(exitLoop()));
-    QSignalSpy finishedManagerSpy(&m_manager, SIGNAL(finished(QNetworkReply*)));
-
-    QTestEventLoop::instance().enterLoop(20);
-    QVERIFY(!QTestEventLoop::instance().timeout());
-
-    QCOMPARE(finishedManagerSpy.count(), 1);
-    QCOMPARE(metaDataChangedSpy.count(), 1);
-    QCOMPARE(finishedSpy.count(), 1);
-    QVERIFY(uploadProgressSpy.count() > 0);
-    QVERIFY(readyReadSpy.count() > 0);
-
-    QCOMPARE(reply->error(), QNetworkReply::NoError);
-    QCOMPARE(reply->attribute(QNetworkRequest::SpdyWasUsedAttribute).toBool(), true);
-    QCOMPARE(reply->attribute(QNetworkRequest::ConnectionEncryptedAttribute).toBool(), true);
-    QCOMPARE(reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt(), 200);
-
-    qint64 contentLength = reply->header(QNetworkRequest::ContentLengthHeader).toLongLong();
-    if (!multiPart) // script to test multiparts does not return a content length
-        QCOMPARE(contentLength, 33); // 33 bytes for md5 sums (including new line)
-
-    QFETCH(QByteArray, md5sum);
-    QByteArray content = reply->readAll();
-    QCOMPARE(content, md5sum);
-
-    reply->deleteLater();
-    if (uploadObject)
-        uploadObject->deleteLater();
-
-    m_manager.setProxy(QNetworkProxy()); // reset
-}
-
-void tst_Spdy::errors_data()
-{
-    QTest::addColumn<QUrl>("url");
-    QTest::addColumn<QNetworkProxy>("proxy");
-    QTest::addColumn<bool>("ignoreSslErrors");
-    QTest::addColumn<int>("expectedReplyError");
-
-    QTest::newRow("http-404") << QUrl("https://" + QtNetworkSettings::serverName() + "/non-existent-url")
-                              << QNetworkProxy() << true << int(QNetworkReply::ContentNotFoundError);
-
-    QTest::newRow("ssl-errors") << QUrl("https://" + QtNetworkSettings::serverName())
-                                << QNetworkProxy() << false << int(QNetworkReply::SslHandshakeFailedError);
-
-    QTest::newRow("host-not-found") << QUrl("https://this-host-does-not.exist")
-                                    << QNetworkProxy()
-                                    << true << int(QNetworkReply::HostNotFoundError);
-
-    QTest::newRow("proxy-not-found") << QUrl("https://" + QtNetworkSettings::serverName())
-                                     << QNetworkProxy(QNetworkProxy::HttpProxy,
-                                                      "https://this-host-does-not.exist", 3128)
-                                     << true << int(QNetworkReply::HostNotFoundError);
-
-    QHostInfo hostInfo = QHostInfo::fromName(QtNetworkSettings::serverName());
-    QString proxyserver = hostInfo.addresses().first().toString();
-
-    QTest::newRow("proxy-unavailable") << QUrl("https://" + QtNetworkSettings::serverName())
-                                       << QNetworkProxy(QNetworkProxy::HttpProxy, proxyserver, 10)
-                                       << true << int(QNetworkReply::UnknownNetworkError);
-
-    QTest::newRow("no-proxy-credentials") << QUrl("https://" + QtNetworkSettings::serverName())
-                                          << QNetworkProxy(QNetworkProxy::HttpProxy, proxyserver, 3129)
-                                          << true << int(QNetworkReply::ProxyAuthenticationRequiredError);
-}
-
-void tst_Spdy::errors()
-{
-    QFETCH(QUrl, url);
-    QFETCH(QNetworkProxy, proxy);
-    QFETCH(bool, ignoreSslErrors);
-    QFETCH(int, expectedReplyError);
-
-    QNetworkRequest request(url);
-    request.setAttribute(QNetworkRequest::SpdyAllowedAttribute, true);
-
-    disconnect(&m_manager, SIGNAL(proxyAuthenticationRequired(const QNetworkProxy &, QAuthenticator *)),
-               0, 0);
-    if (proxy.type() != QNetworkProxy::DefaultProxy) {
-        m_manager.setProxy(proxy);
-    }
-    QNetworkReply *reply = m_manager.get(request);
-    if (ignoreSslErrors)
-        reply->ignoreSslErrors();
-    QSignalSpy finishedSpy(reply, SIGNAL(finished()));
-    QSignalSpy errorSpy(reply, SIGNAL(error(QNetworkReply::NetworkError)));
-
-    QObject::connect(reply, SIGNAL(finished()), &QTestEventLoop::instance(), SLOT(exitLoop()));
-
-    QTestEventLoop::instance().enterLoop(15);
-    QVERIFY(!QTestEventLoop::instance().timeout());
-
-    QCOMPARE(finishedSpy.count(), 1);
-    QCOMPARE(errorSpy.count(), 1);
-
-    QCOMPARE(reply->error(), static_cast<QNetworkReply::NetworkError>(expectedReplyError));
-
-    m_manager.setProxy(QNetworkProxy()); // reset
-    m_manager.clearAccessCache(); // e.g. to get an SSL error we need a new connection
-    connect(&m_manager, SIGNAL(proxyAuthenticationRequired(const QNetworkProxy &, QAuthenticator *)),
-            this, SLOT(proxyAuthenticationRequired(const QNetworkProxy &, QAuthenticator *)),
-            Qt::UniqueConnection); // reset
-}
-#endif // !QT_NO_NETWORKPROXY
-
-void tst_Spdy::multipleRequests_data()
-{
-    QTest::addColumn<QList<QUrl> >("urls");
-
-    QString baseUrl = "https://" + QtNetworkSettings::serverName() + "/qtest/cgi-bin/echo.cgi?";
-    QList<QUrl> urls;
-    for (int a = 1; a <= 50; ++a)
-        urls.append(QUrl(baseUrl + QLatin1String(QByteArray::number(a))));
-
-    QTest::newRow("one-request") << urls.mid(0, 1);
-    QTest::newRow("two-requests") << urls.mid(0, 2);
-    QTest::newRow("ten-requests") << urls.mid(0, 10);
-    QTest::newRow("twenty-requests") << urls.mid(0, 20);
-    QTest::newRow("fifty-requests") << urls;
-}
-
-void tst_Spdy::multipleRequestsFinishedSlot()
-{
-    m_multipleRepliesFinishedCount++;
-    if (m_multipleRepliesFinishedCount == m_multipleRequestsCount)
-        QTestEventLoop::instance().exitLoop();
-}
-
-void tst_Spdy::multipleRequests()
-{
-    QFETCH(QList<QUrl>, urls);
-    m_multipleRequestsCount = urls.count();
-    m_multipleRepliesFinishedCount = 0;
-
-    QList<QNetworkReply *> replies;
-    QList<QSignalSpy *> metaDataChangedSpies;
-    QList<QSignalSpy *> readyReadSpies;
-    QList<QSignalSpy *> finishedSpies;
-
-    foreach (const QUrl &url, urls) {
-        QNetworkRequest request(url);
-        request.setAttribute(QNetworkRequest::SpdyAllowedAttribute, true);
-        QNetworkReply *reply = m_manager.get(request);
-        replies.append(reply);
-        reply->ignoreSslErrors();
-        QObject::connect(reply, SIGNAL(finished()), this, SLOT(multipleRequestsFinishedSlot()));
-        QSignalSpy *metaDataChangedSpy = new QSignalSpy(reply, SIGNAL(metaDataChanged()));
-        metaDataChangedSpies << metaDataChangedSpy;
-        QSignalSpy *readyReadSpy = new QSignalSpy(reply, SIGNAL(readyRead()));
-        readyReadSpies << readyReadSpy;
-        QSignalSpy *finishedSpy = new QSignalSpy(reply, SIGNAL(finished()));
-        finishedSpies << finishedSpy;
-    }
-
-    QSignalSpy finishedManagerSpy(&m_manager, SIGNAL(finished(QNetworkReply*)));
-
-    QTestEventLoop::instance().enterLoop(15);
-    QVERIFY(!QTestEventLoop::instance().timeout());
-
-    QCOMPARE(finishedManagerSpy.count(), m_multipleRequestsCount);
-
-    for (int a = 0; a < replies.count(); ++a) {
-
-#ifndef QT_NO_OPENSSL
-        QCOMPARE(replies.at(a)->sslConfiguration().nextProtocolNegotiationStatus(),
-                 QSslConfiguration::NextProtocolNegotiationNegotiated);
-        QCOMPARE(replies.at(a)->sslConfiguration().nextNegotiatedProtocol(),
-                 QByteArray(QSslConfiguration::NextProtocolSpdy3_0));
-#endif // QT_NO_OPENSSL
-
-        QCOMPARE(replies.at(a)->error(), QNetworkReply::NoError);
-        QCOMPARE(replies.at(a)->attribute(QNetworkRequest::SpdyWasUsedAttribute).toBool(), true);
-        QCOMPARE(replies.at(a)->attribute(QNetworkRequest::ConnectionEncryptedAttribute).toBool(), true);
-        QCOMPARE(replies.at(a)->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt(), 200);
-
-        // using the echo script, a request to "echo.cgi?1" will return a body of "1"
-        QByteArray expectedContent = replies.at(a)->url().query().toUtf8();
-        QByteArray content = replies.at(a)->readAll();
-        QCOMPARE(expectedContent, content);
-
-        QCOMPARE(metaDataChangedSpies.at(a)->count(), 1);
-        metaDataChangedSpies.at(a)->deleteLater();
-
-        QCOMPARE(finishedSpies.at(a)->count(), 1);
-        finishedSpies.at(a)->deleteLater();
-
-        QVERIFY(readyReadSpies.at(a)->count() > 0);
-        readyReadSpies.at(a)->deleteLater();
-
-        replies.at(a)->deleteLater();
-    }
-}
-
-QTEST_MAIN(tst_Spdy)
-
-#include "tst_spdy.moc"
diff --git a/tests/auto/network/bearer/CMakeLists.txt b/tests/auto/network/bearer/CMakeLists.txt
new file mode 100644
index 0000000000..4b593aab0a
--- /dev/null
+++ b/tests/auto/network/bearer/CMakeLists.txt
@@ -0,0 +1,6 @@
+# Generated from bearer.pro.
+
+add_subdirectory(qnetworkconfiguration)
+add_subdirectory(qnetworkconfigurationmanager)
+add_subdirectory(qnetworkconfigurationmanagerqappless)
+add_subdirectory(qnetworksession)
diff --git a/tests/auto/network/bearer/qnetworkconfiguration/CMakeLists.txt b/tests/auto/network/bearer/qnetworkconfiguration/CMakeLists.txt
new file mode 100644
index 0000000000..1db8bb1e6b
--- /dev/null
+++ b/tests/auto/network/bearer/qnetworkconfiguration/CMakeLists.txt
@@ -0,0 +1,13 @@
+# Generated from qnetworkconfiguration.pro.
+
+#####################################################################
+## tst_qnetworkconfiguration Test:
+#####################################################################
+
+add_qt_test(tst_qnetworkconfiguration
+    SOURCES
+        ../qbearertestcommon.h
+        tst_qnetworkconfiguration.cpp
+    PUBLIC_LIBRARIES
+        Qt::Network
+)
diff --git a/tests/auto/network/bearer/qnetworkconfigurationmanager/CMakeLists.txt b/tests/auto/network/bearer/qnetworkconfigurationmanager/CMakeLists.txt
new file mode 100644
index 0000000000..355bd4898a
--- /dev/null
+++ b/tests/auto/network/bearer/qnetworkconfigurationmanager/CMakeLists.txt
@@ -0,0 +1,13 @@
+# Generated from qnetworkconfigurationmanager.pro.
+
+#####################################################################
+## tst_qnetworkconfigurationmanager Test:
+#####################################################################
+
+add_qt_test(tst_qnetworkconfigurationmanager
+    SOURCES
+        ../qbearertestcommon.h
+        tst_qnetworkconfigurationmanager.cpp
+    PUBLIC_LIBRARIES
+        Qt::Network
+)
diff --git a/tests/auto/network/bearer/qnetworkconfigurationmanagerqappless/CMakeLists.txt b/tests/auto/network/bearer/qnetworkconfigurationmanagerqappless/CMakeLists.txt
new file mode 100644
index 0000000000..dcf18785bf
--- /dev/null
+++ b/tests/auto/network/bearer/qnetworkconfigurationmanagerqappless/CMakeLists.txt
@@ -0,0 +1,13 @@
+# Generated from qnetworkconfigurationmanagerqappless.pro.
+
+#####################################################################
+## tst_qnetworkconfigurationmanagerqappless Test:
+#####################################################################
+
+add_qt_test(tst_qnetworkconfigurationmanagerqappless
+    SOURCES
+        ../qbearertestcommon.h
+        tst_qnetworkconfigurationmanagerqappless.cpp
+    PUBLIC_LIBRARIES
+        Qt::Network
+)
diff --git a/tests/auto/network/bearer/qnetworksession/CMakeLists.txt b/tests/auto/network/bearer/qnetworksession/CMakeLists.txt
new file mode 100644
index 0000000000..99c3483e6c
--- /dev/null
+++ b/tests/auto/network/bearer/qnetworksession/CMakeLists.txt
@@ -0,0 +1,7 @@
+# Generated from qnetworksession.pro.
+
+add_subdirectory(test)
+
+if(NOT WINRT)
+    add_subdirectory(lackey)
+endif()
diff --git a/tests/auto/network/bearer/qnetworksession/lackey/CMakeLists.txt b/tests/auto/network/bearer/qnetworksession/lackey/CMakeLists.txt
new file mode 100644
index 0000000000..c2d0d59d57
--- /dev/null
+++ b/tests/auto/network/bearer/qnetworksession/lackey/CMakeLists.txt
@@ -0,0 +1,13 @@
+# Generated from lackey.pro.
+
+#####################################################################
+## lackey Binary:
+#####################################################################
+
+add_qt_executable(lackey
+    OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
+    SOURCES
+        main.cpp
+    PUBLIC_LIBRARIES
+        Qt::Network
+)
diff --git a/tests/auto/network/bearer/qnetworksession/test/.prev_CMakeLists.txt b/tests/auto/network/bearer/qnetworksession/test/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..e164bccbdf
--- /dev/null
+++ b/tests/auto/network/bearer/qnetworksession/test/.prev_CMakeLists.txt
@@ -0,0 +1,29 @@
+# Generated from test.pro.
+
+#####################################################################
+## tst_qnetworksession Test:
+#####################################################################
+
+add_qt_test(tst_qnetworksession
+    SOURCES
+        ../../qbearertestcommon.h
+        tst_qnetworksession.cpp
+    PUBLIC_LIBRARIES
+        Qt::Network
+        Qt::NetworkPrivate
+)
+
+## Scopes:
+#####################################################################
+
+#### Keys ignored in scope 3:.:.:test.pro:(CMAKE_BUILD_TYPE STREQUAL Debug):
+# DESTDIR = "../debug"
+
+#### Keys ignored in scope 4:.:.:test.pro:else:
+# DESTDIR = "../release"
+
+#### Keys ignored in scope 5:.:.:test.pro:else:
+# DESTDIR = ".."
+
+#### Keys ignored in scope 6:.:.:test.pro:NOT ANDROID AND NOT WINRT:
+# TEST_HELPER_INSTALLS = "../lackey/lackey"
diff --git a/tests/auto/network/bearer/qnetworksession/test/CMakeLists.txt b/tests/auto/network/bearer/qnetworksession/test/CMakeLists.txt
new file mode 100644
index 0000000000..c86966600d
--- /dev/null
+++ b/tests/auto/network/bearer/qnetworksession/test/CMakeLists.txt
@@ -0,0 +1,30 @@
+# Generated from test.pro.
+
+#####################################################################
+## tst_qnetworksession Test:
+#####################################################################
+
+add_qt_test(tst_qnetworksession
+    OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../" # special case
+    SOURCES
+        ../../qbearertestcommon.h
+        tst_qnetworksession.cpp
+    PUBLIC_LIBRARIES
+        Qt::Network
+        Qt::NetworkPrivate
+)
+
+## Scopes:
+#####################################################################
+
+#### Keys ignored in scope 3:.:.:test.pro:(CMAKE_BUILD_TYPE STREQUAL Debug):
+# DESTDIR = "../debug"
+
+#### Keys ignored in scope 4:.:.:test.pro:else:
+# DESTDIR = "../release"
+
+#### Keys ignored in scope 5:.:.:test.pro:else:
+# DESTDIR = ".."
+
+#### Keys ignored in scope 6:.:.:test.pro:NOT ANDROID AND NOT WINRT:
+# TEST_HELPER_INSTALLS = "../lackey/lackey"
diff --git a/tests/auto/network/kernel/CMakeLists.txt b/tests/auto/network/kernel/CMakeLists.txt
new file mode 100644
index 0000000000..c1082f60b7
--- /dev/null
+++ b/tests/auto/network/kernel/CMakeLists.txt
@@ -0,0 +1,19 @@
+add_subdirectory(qdnslookup)
+add_subdirectory(qdnslookup_appless)
+add_subdirectory(qnetworkinterface)
+add_subdirectory(qnetworkdatagram)
+add_subdirectory(qnetworkaddressentry)
+add_subdirectory(qhostaddress)
+
+if(NOT WINRT)
+    add_subdirectory(qnetworkproxy)
+    add_subdirectory(qnetworkproxyfactory)
+endif()
+
+if(QT_FEATURE_private_tests)
+    add_subdirectory(qauthenticator)
+
+    if(NOT APPLE_OSX)
+        add_subdirectory(qhostinfo)
+    endif()
+endif()
diff --git a/tests/auto/network/kernel/qauthenticator/CMakeLists.txt b/tests/auto/network/kernel/qauthenticator/CMakeLists.txt
new file mode 100644
index 0000000000..f461591884
--- /dev/null
+++ b/tests/auto/network/kernel/qauthenticator/CMakeLists.txt
@@ -0,0 +1,21 @@
+# Generated from qauthenticator.pro.
+
+if(NOT QT_FEATURE_private_tests)
+    return()
+endif()
+
+#####################################################################
+## tst_qauthenticator Test:
+#####################################################################
+
+add_qt_test(tst_qauthenticator
+    SOURCES
+        tst_qauthenticator.cpp
+    DEFINES
+        SRCDIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/\\\"
+    PUBLIC_LIBRARIES
+        Qt::NetworkPrivate
+)
+
+#### Keys ignored in scope 1:.:.:qauthenticator.pro:<TRUE>:
+# _REQUIREMENTS = "qtConfig(private_tests)"
diff --git a/tests/auto/network/kernel/qdnslookup/CMakeLists.txt b/tests/auto/network/kernel/qdnslookup/CMakeLists.txt
new file mode 100644
index 0000000000..896b4431d8
--- /dev/null
+++ b/tests/auto/network/kernel/qdnslookup/CMakeLists.txt
@@ -0,0 +1,12 @@
+# Generated from qdnslookup.pro.
+
+#####################################################################
+## tst_qdnslookup Test:
+#####################################################################
+
+add_qt_test(tst_qdnslookup
+    SOURCES
+        tst_qdnslookup.cpp
+    PUBLIC_LIBRARIES
+        Qt::Network
+)
diff --git a/tests/auto/network/kernel/qdnslookup_appless/CMakeLists.txt b/tests/auto/network/kernel/qdnslookup_appless/CMakeLists.txt
new file mode 100644
index 0000000000..847e1a6d90
--- /dev/null
+++ b/tests/auto/network/kernel/qdnslookup_appless/CMakeLists.txt
@@ -0,0 +1,12 @@
+# Generated from qdnslookup_appless.pro.
+
+#####################################################################
+## tst_qdnslookup_appless Test:
+#####################################################################
+
+add_qt_test(tst_qdnslookup_appless
+    SOURCES
+        tst_qdnslookup_appless.cpp
+    PUBLIC_LIBRARIES
+        Qt::Network
+)
diff --git a/tests/auto/network/kernel/qhostaddress/CMakeLists.txt b/tests/auto/network/kernel/qhostaddress/CMakeLists.txt
new file mode 100644
index 0000000000..f967625d38
--- /dev/null
+++ b/tests/auto/network/kernel/qhostaddress/CMakeLists.txt
@@ -0,0 +1,20 @@
+# Generated from qhostaddress.pro.
+
+#####################################################################
+## tst_qhostaddress Test:
+#####################################################################
+
+add_qt_test(tst_qhostaddress
+    SOURCES
+        tst_qhostaddress.cpp
+    PUBLIC_LIBRARIES
+        Qt::NetworkPrivate
+)
+
+## Scopes:
+#####################################################################
+
+extend_target(tst_qhostaddress CONDITION WIN32
+    PUBLIC_LIBRARIES
+        ws2_32
+)
diff --git a/tests/auto/network/kernel/qhostinfo/CMakeLists.txt b/tests/auto/network/kernel/qhostinfo/CMakeLists.txt
new file mode 100644
index 0000000000..19eae0611d
--- /dev/null
+++ b/tests/auto/network/kernel/qhostinfo/CMakeLists.txt
@@ -0,0 +1,31 @@
+# Generated from qhostinfo.pro.
+
+if(NOT QT_FEATURE_private_tests)
+    return()
+endif()
+
+#####################################################################
+## tst_qhostinfo Test:
+#####################################################################
+
+add_qt_test(tst_qhostinfo
+    SOURCES
+        tst_qhostinfo.cpp
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::NetworkPrivate
+)
+
+#### Keys ignored in scope 1:.:.:qhostinfo.pro:<TRUE>:
+# _REQUIREMENTS = "qtConfig(private_tests)"
+
+## Scopes:
+#####################################################################
+
+extend_target(tst_qhostinfo CONDITION WIN32
+    PUBLIC_LIBRARIES
+        ws2_32
+)
+
+#### Keys ignored in scope 3:.:.:qhostinfo.pro:WINRT:
+# WINRT_MANIFEST.capabilities = "internetClientServer"
diff --git a/tests/auto/network/kernel/qnetworkaddressentry/CMakeLists.txt b/tests/auto/network/kernel/qnetworkaddressentry/CMakeLists.txt
new file mode 100644
index 0000000000..5a72d4e4a5
--- /dev/null
+++ b/tests/auto/network/kernel/qnetworkaddressentry/CMakeLists.txt
@@ -0,0 +1,12 @@
+# Generated from qnetworkaddressentry.pro.
+
+#####################################################################
+## tst_qnetworkaddressentry Test:
+#####################################################################
+
+add_qt_test(tst_qnetworkaddressentry
+    SOURCES
+        tst_qnetworkaddressentry.cpp
+    PUBLIC_LIBRARIES
+        Qt::Network
+)
diff --git a/tests/auto/network/kernel/qnetworkdatagram/CMakeLists.txt b/tests/auto/network/kernel/qnetworkdatagram/CMakeLists.txt
new file mode 100644
index 0000000000..ae24d32917
--- /dev/null
+++ b/tests/auto/network/kernel/qnetworkdatagram/CMakeLists.txt
@@ -0,0 +1,12 @@
+# Generated from qnetworkdatagram.pro.
+
+#####################################################################
+## tst_qnetworkdatagram Test:
+#####################################################################
+
+add_qt_test(tst_qnetworkdatagram
+    SOURCES
+        tst_qnetworkdatagram.cpp
+    PUBLIC_LIBRARIES
+        Qt::Network
+)
diff --git a/tests/auto/network/kernel/qnetworkinterface/CMakeLists.txt b/tests/auto/network/kernel/qnetworkinterface/CMakeLists.txt
new file mode 100644
index 0000000000..f23a17f077
--- /dev/null
+++ b/tests/auto/network/kernel/qnetworkinterface/CMakeLists.txt
@@ -0,0 +1,15 @@
+# Generated from qnetworkinterface.pro.
+
+#####################################################################
+## tst_qnetworkinterface Test:
+#####################################################################
+
+add_qt_test(tst_qnetworkinterface
+    SOURCES
+        ../../../../shared/emulationdetector.h
+        tst_qnetworkinterface.cpp
+    INCLUDE_DIRECTORIES
+        ../../../../shared
+    PUBLIC_LIBRARIES
+        Qt::Network
+)
diff --git a/tests/auto/network/kernel/qnetworkproxy/CMakeLists.txt b/tests/auto/network/kernel/qnetworkproxy/CMakeLists.txt
new file mode 100644
index 0000000000..e0cbe133af
--- /dev/null
+++ b/tests/auto/network/kernel/qnetworkproxy/CMakeLists.txt
@@ -0,0 +1,12 @@
+# Generated from qnetworkproxy.pro.
+
+#####################################################################
+## tst_qnetworkproxy Test:
+#####################################################################
+
+add_qt_test(tst_qnetworkproxy
+    SOURCES
+        tst_qnetworkproxy.cpp
+    PUBLIC_LIBRARIES
+        Qt::Network
+)
diff --git a/tests/auto/network/kernel/qnetworkproxyfactory/CMakeLists.txt b/tests/auto/network/kernel/qnetworkproxyfactory/CMakeLists.txt
new file mode 100644
index 0000000000..ecacd338ab
--- /dev/null
+++ b/tests/auto/network/kernel/qnetworkproxyfactory/CMakeLists.txt
@@ -0,0 +1,12 @@
+# Generated from qnetworkproxyfactory.pro.
+
+#####################################################################
+## tst_qnetworkproxyfactory Test:
+#####################################################################
+
+add_qt_test(tst_qnetworkproxyfactory
+    SOURCES
+        tst_qnetworkproxyfactory.cpp
+    PUBLIC_LIBRARIES
+        Qt::NetworkPrivate
+)
diff --git a/tests/auto/network/socket/CMakeLists.txt b/tests/auto/network/socket/CMakeLists.txt
new file mode 100644
index 0000000000..5019e47140
--- /dev/null
+++ b/tests/auto/network/socket/CMakeLists.txt
@@ -0,0 +1,20 @@
+# Generated from socket.pro.
+
+add_subdirectory(qudpsocket)
+### add_subdirectory(qlocalsocket)
+add_subdirectory(qtcpserver)
+add_subdirectory(qabstractsocket)
+
+if(QT_FEATURE_private_tests)
+    add_subdirectory(platformsocketengine)
+    add_subdirectory(qtcpsocket)
+
+    if(NOT WINRT)
+        add_subdirectory(qhttpsocketengine)
+        add_subdirectory(qsocks5socketengine)
+    endif()
+endif()
+
+if(QT_FEATURE_sctp)
+    add_subdirectory(qsctpsocket)
+endif()
diff --git a/tests/auto/network/socket/platformsocketengine/CMakeLists.txt b/tests/auto/network/socket/platformsocketengine/CMakeLists.txt
new file mode 100644
index 0000000000..1dece78966
--- /dev/null
+++ b/tests/auto/network/socket/platformsocketengine/CMakeLists.txt
@@ -0,0 +1,38 @@
+# Generated from platformsocketengine.pro.
+
+if(NOT QT_FEATURE_private_tests)
+    return()
+endif()
+
+#####################################################################
+## tst_platformsocketengine Test:
+#####################################################################
+
+add_qt_test(tst_platformsocketengine
+    SOURCES
+        tst_platformsocketengine.cpp
+    INCLUDE_DIRECTORIES
+        ${QT_SOURCE_TREE}/src/network
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::NetworkPrivate
+)
+
+#### Keys ignored in scope 1:.:.:platformsocketengine.pro:<TRUE>:
+# MOC_DIR = "tmp"
+# _REQUIREMENTS = "qtConfig(private_tests)"
+
+## Scopes:
+#####################################################################
+
+extend_target(tst_platformsocketengine CONDITION WIN32
+    PUBLIC_LIBRARIES
+        ws2_32
+)
+
+extend_target(tst_platformsocketengine CONDITION QT_FEATURE_reduce_exports AND UNIX
+    SOURCES
+        ${QT_SOURCE_TREE}/src/network/socket/qabstractsocketengine.cpp ${QT_SOURCE_TREE}/src/network/socket/qabstractsocketengine_p.h
+        ${QT_SOURCE_TREE}/src/network/socket/qnativesocketengine.cpp ${QT_SOURCE_TREE}/src/network/socket/qnativesocketengine_p.h
+        ${QT_SOURCE_TREE}/src/network/socket/qnativesocketengine_unix.cpp
+)
diff --git a/tests/auto/network/socket/platformsocketengine/platformsocketengine.pri b/tests/auto/network/socket/platformsocketengine/platformsocketengine.pri
index 868439de6a..df43a60065 100644
--- a/tests/auto/network/socket/platformsocketengine/platformsocketengine.pri
+++ b/tests/auto/network/socket/platformsocketengine/platformsocketengine.pri
@@ -9,5 +9,7 @@ win32: QMAKE_USE += ws2_32
 unix:qtConfig(reduce_exports) {
     SOURCES += $$QNETWORK_SRC/socket/qnativesocketengine_unix.cpp
     SOURCES += $$QNETWORK_SRC/socket/qnativesocketengine.cpp
+    HEADERS += $$QNETWORK_SRC/socket/qnativesocketengine_p.h
     SOURCES += $$QNETWORK_SRC/socket/qabstractsocketengine.cpp
+    HEADERS += $$QNETWORK_SRC/socket/qabstractsocketengine_p.h
 }
diff --git a/tests/auto/network/socket/qabstractsocket/CMakeLists.txt b/tests/auto/network/socket/qabstractsocket/CMakeLists.txt
new file mode 100644
index 0000000000..ca7d64a2ff
--- /dev/null
+++ b/tests/auto/network/socket/qabstractsocket/CMakeLists.txt
@@ -0,0 +1,12 @@
+# Generated from qabstractsocket.pro.
+
+#####################################################################
+## tst_qabstractsocket Test:
+#####################################################################
+
+add_qt_test(tst_qabstractsocket
+    SOURCES
+        tst_qabstractsocket.cpp
+    PUBLIC_LIBRARIES
+        Qt::Network
+)
diff --git a/tests/auto/network/socket/qhttpsocketengine/CMakeLists.txt b/tests/auto/network/socket/qhttpsocketengine/CMakeLists.txt
new file mode 100644
index 0000000000..6aeec0a983
--- /dev/null
+++ b/tests/auto/network/socket/qhttpsocketengine/CMakeLists.txt
@@ -0,0 +1,41 @@
+# Generated from qhttpsocketengine.pro.
+
+if(NOT QT_FEATURE_private_tests)
+    return()
+endif()
+
+#####################################################################
+## tst_qhttpsocketengine Test:
+#####################################################################
+
+add_qt_test(tst_qhttpsocketengine
+    SOURCES
+        tst_qhttpsocketengine.cpp
+    INCLUDE_DIRECTORIES
+        ${QT_SOURCE_TREE}/src/network
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::NetworkPrivate
+)
+
+#### Keys ignored in scope 1:.:.:qhttpsocketengine.pro:<TRUE>:
+# MOC_DIR = "tmp"
+# _REQUIREMENTS = "qtConfig(private_tests)"
+
+## Scopes:
+#####################################################################
+
+#### Keys ignored in scope 2:.:.:qhttpsocketengine.pro:LINUX:
+# QT_TEST_SERVER_LIST = "squid" "danted" "cyrus" "apache2"
+
+extend_target(tst_qhttpsocketengine CONDITION WIN32
+    PUBLIC_LIBRARIES
+        ws2_32
+)
+
+extend_target(tst_qhttpsocketengine CONDITION QT_FEATURE_reduce_exports AND UNIX
+    SOURCES
+        ${QT_SOURCE_TREE}/src/network/socket/qabstractsocketengine.cpp ${QT_SOURCE_TREE}/src/network/socket/qabstractsocketengine_p.h
+        ${QT_SOURCE_TREE}/src/network/socket/qnativesocketengine.cpp ${QT_SOURCE_TREE}/src/network/socket/qnativesocketengine_p.h
+        ${QT_SOURCE_TREE}/src/network/socket/qnativesocketengine_unix.cpp
+)
diff --git a/tests/auto/network/socket/qlocalsocket/CMakeLists.txt b/tests/auto/network/socket/qlocalsocket/CMakeLists.txt
new file mode 100644
index 0000000000..97466174f9
--- /dev/null
+++ b/tests/auto/network/socket/qlocalsocket/CMakeLists.txt
@@ -0,0 +1,4 @@
+# Generated from qlocalsocket.pro.
+
+add_subdirectory(test)
+add_subdirectory(socketprocess)
diff --git a/tests/auto/network/socket/qlocalsocket/socketprocess/CMakeLists.txt b/tests/auto/network/socket/qlocalsocket/socketprocess/CMakeLists.txt
new file mode 100644
index 0000000000..cb339eb2fa
--- /dev/null
+++ b/tests/auto/network/socket/qlocalsocket/socketprocess/CMakeLists.txt
@@ -0,0 +1,14 @@
+# Generated from socketprocess.pro.
+
+#####################################################################
+## socketprocess Binary:
+#####################################################################
+
+add_qt_executable(socketprocess
+    OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
+    SOURCES
+        main.cpp
+    PUBLIC_LIBRARIES
+        Qt::Network
+        Qt::Test
+)
diff --git a/tests/auto/network/socket/qlocalsocket/test/CMakeLists.txt b/tests/auto/network/socket/qlocalsocket/test/CMakeLists.txt
new file mode 100644
index 0000000000..eb427796ae
--- /dev/null
+++ b/tests/auto/network/socket/qlocalsocket/test/CMakeLists.txt
@@ -0,0 +1,28 @@
+# Generated from test.pro.
+
+#####################################################################
+## tst_qlocalsocket Test:
+#####################################################################
+
+add_qt_test(tst_qlocalsocket
+    SOURCES
+        ../tst_qlocalsocket.cpp
+    DEFINES
+        QLOCALSERVER_DEBUG
+        QLOCALSOCKET_DEBUG
+        SRCDIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../\\\"
+    PUBLIC_LIBRARIES
+        Qt::Network
+)
+
+## Scopes:
+#####################################################################
+
+#### Keys ignored in scope 3:.:.:test.pro:(CMAKE_BUILD_TYPE STREQUAL Debug):
+# DESTDIR = "../debug"
+
+#### Keys ignored in scope 4:.:.:test.pro:else:
+# DESTDIR = "../release"
+
+#### Keys ignored in scope 5:.:.:test.pro:else:
+# DESTDIR = ".."
diff --git a/tests/auto/network/socket/qsctpsocket/CMakeLists.txt b/tests/auto/network/socket/qsctpsocket/CMakeLists.txt
new file mode 100644
index 0000000000..d272d018b6
--- /dev/null
+++ b/tests/auto/network/socket/qsctpsocket/CMakeLists.txt
@@ -0,0 +1,12 @@
+# Generated from qsctpsocket.pro.
+
+#####################################################################
+## tst_qsctpsocket Test:
+#####################################################################
+
+add_qt_test(tst_qsctpsocket
+    SOURCES
+        tst_qsctpsocket.cpp
+    PUBLIC_LIBRARIES
+        Qt::Network
+)
diff --git a/tests/auto/network/socket/qsocks5socketengine/CMakeLists.txt b/tests/auto/network/socket/qsocks5socketengine/CMakeLists.txt
new file mode 100644
index 0000000000..fd58b931e6
--- /dev/null
+++ b/tests/auto/network/socket/qsocks5socketengine/CMakeLists.txt
@@ -0,0 +1,41 @@
+# Generated from qsocks5socketengine.pro.
+
+if(NOT QT_FEATURE_private_tests)
+    return()
+endif()
+
+#####################################################################
+## tst_qsocks5socketengine Test:
+#####################################################################
+
+add_qt_test(tst_qsocks5socketengine
+    SOURCES
+        tst_qsocks5socketengine.cpp
+    INCLUDE_DIRECTORIES
+        ${QT_SOURCE_TREE}/src/network
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::NetworkPrivate
+)
+
+#### Keys ignored in scope 1:.:.:qsocks5socketengine.pro:<TRUE>:
+# MOC_DIR = "tmp"
+# _REQUIREMENTS = "qtConfig(private_tests)"
+
+## Scopes:
+#####################################################################
+
+#### Keys ignored in scope 2:.:.:qsocks5socketengine.pro:LINUX:
+# QT_TEST_SERVER_LIST = "danted" "apache2" "cyrus"
+
+extend_target(tst_qsocks5socketengine CONDITION WIN32
+    PUBLIC_LIBRARIES
+        ws2_32
+)
+
+extend_target(tst_qsocks5socketengine CONDITION QT_FEATURE_reduce_exports AND UNIX
+    SOURCES
+        ${QT_SOURCE_TREE}/src/network/socket/qabstractsocketengine.cpp ${QT_SOURCE_TREE}/src/network/socket/qabstractsocketengine_p.h
+        ${QT_SOURCE_TREE}/src/network/socket/qnativesocketengine.cpp ${QT_SOURCE_TREE}/src/network/socket/qnativesocketengine_p.h
+        ${QT_SOURCE_TREE}/src/network/socket/qnativesocketengine_unix.cpp
+)
diff --git a/tests/auto/network/socket/qtcpserver/CMakeLists.txt b/tests/auto/network/socket/qtcpserver/CMakeLists.txt
new file mode 100644
index 0000000000..01f6c8b672
--- /dev/null
+++ b/tests/auto/network/socket/qtcpserver/CMakeLists.txt
@@ -0,0 +1,4 @@
+# Generated from qtcpserver.pro.
+
+add_subdirectory(test)
+add_subdirectory(crashingServer)
diff --git a/tests/auto/network/socket/qtcpserver/crashingServer/CMakeLists.txt b/tests/auto/network/socket/qtcpserver/crashingServer/CMakeLists.txt
new file mode 100644
index 0000000000..ad291f2ad8
--- /dev/null
+++ b/tests/auto/network/socket/qtcpserver/crashingServer/CMakeLists.txt
@@ -0,0 +1,16 @@
+# Generated from crashingServer.pro.
+
+#####################################################################
+## crashingServer Binary:
+#####################################################################
+
+add_qt_executable(crashingServer
+    OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
+    SOURCES
+        main.cpp
+    PUBLIC_LIBRARIES
+        Qt::Network
+)
+
+## Scopes:
+#####################################################################
diff --git a/tests/auto/network/socket/qtcpserver/test/CMakeLists.txt b/tests/auto/network/socket/qtcpserver/test/CMakeLists.txt
new file mode 100644
index 0000000000..b559024724
--- /dev/null
+++ b/tests/auto/network/socket/qtcpserver/test/CMakeLists.txt
@@ -0,0 +1,27 @@
+# Generated from test.pro.
+
+#####################################################################
+## tst_qtcpserver Test:
+#####################################################################
+
+add_qt_test(tst_qtcpserver
+    OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../" # special case
+    SOURCES
+        ../tst_qtcpserver.cpp
+    PUBLIC_LIBRARIES
+        Qt::Network
+)
+
+#### Keys ignored in scope 1:.:.:test.pro:<TRUE>:
+# MOC_DIR = "tmp"
+
+## Scopes:
+#####################################################################
+
+extend_target(tst_qtcpserver CONDITION WIN32
+    PUBLIC_LIBRARIES
+        ws2_32
+)
+
+#### Keys ignored in scope 6:.:.:test.pro:LINUX:
+# QT_TEST_SERVER_LIST = "danted" "cyrus" "squid" "ftp-proxy"
diff --git a/tests/auto/network/socket/qtcpserver/test/test.pro b/tests/auto/network/socket/qtcpserver/test/test.pro
index 7e2e60a1e3..491ff28cdc 100644
--- a/tests/auto/network/socket/qtcpserver/test/test.pro
+++ b/tests/auto/network/socket/qtcpserver/test/test.pro
@@ -3,13 +3,13 @@ SOURCES  += ../tst_qtcpserver.cpp
 
 win32: QMAKE_USE += ws2_32
 
-TARGET = ../tst_qtcpserver
+TARGET = tst_qtcpserver
 
 win32 {
   CONFIG(debug, debug|release) {
-    TARGET = ../../debug/tst_qtcpserver
+    TARGET = ../debug/tst_qtcpserver
 } else {
-    TARGET = ../../release/tst_qtcpserver
+    TARGET = ../release/tst_qtcpserver
   }
 }
 
diff --git a/tests/auto/network/socket/qtcpsocket/CMakeLists.txt b/tests/auto/network/socket/qtcpsocket/CMakeLists.txt
new file mode 100644
index 0000000000..b3ad79cba9
--- /dev/null
+++ b/tests/auto/network/socket/qtcpsocket/CMakeLists.txt
@@ -0,0 +1,7 @@
+# Generated from qtcpsocket.pro.
+
+add_subdirectory(test)
+
+if(NOT VXWORKS)
+    add_subdirectory(stressTest)
+endif()
diff --git a/tests/auto/network/socket/qtcpsocket/stressTest/CMakeLists.txt b/tests/auto/network/socket/qtcpsocket/stressTest/CMakeLists.txt
new file mode 100644
index 0000000000..da9d3a324f
--- /dev/null
+++ b/tests/auto/network/socket/qtcpsocket/stressTest/CMakeLists.txt
@@ -0,0 +1,19 @@
+# Generated from stressTest.pro.
+
+#####################################################################
+## stressTest Binary:
+#####################################################################
+
+add_qt_executable(stressTest
+    OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
+    SOURCES
+        Test.cpp Test.h
+        main.cpp
+    PUBLIC_LIBRARIES
+        Qt::Network
+        Qt::Test
+)
+
+#### Keys ignored in scope 1:.:.:stressTest.pro:<TRUE>:
+# MOC_DIR = ".moc/"
+# TMP_DIR = ".tmp/"
diff --git a/tests/auto/network/socket/qtcpsocket/test/.prev_CMakeLists.txt b/tests/auto/network/socket/qtcpsocket/test/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..61b8d25736
--- /dev/null
+++ b/tests/auto/network/socket/qtcpsocket/test/.prev_CMakeLists.txt
@@ -0,0 +1,33 @@
+# Generated from test.pro.
+
+#####################################################################
+## tst_qtcpsocket Test:
+#####################################################################
+
+add_qt_test(tst_qtcpsocket
+    SOURCES
+        ../tst_qtcpsocket.cpp
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::NetworkPrivate
+)
+
+## Scopes:
+#####################################################################
+
+extend_target(tst_qtcpsocket CONDITION WIN32
+    PUBLIC_LIBRARIES
+        ws2_32
+)
+
+#### Keys ignored in scope 4:.:.:test.pro:(CMAKE_BUILD_TYPE STREQUAL Debug):
+# DESTDIR = "../debug"
+
+#### Keys ignored in scope 5:.:.:test.pro:else:
+# DESTDIR = "../release"
+
+#### Keys ignored in scope 6:.:.:test.pro:else:
+# DESTDIR = "../"
+
+#### Keys ignored in scope 7:.:.:test.pro:LINUX:
+# QT_TEST_SERVER_LIST = "danted" "squid" "apache2" "ftp-proxy" "vsftpd" "iptables" "cyrus"
diff --git a/tests/auto/network/socket/qtcpsocket/test/CMakeLists.txt b/tests/auto/network/socket/qtcpsocket/test/CMakeLists.txt
new file mode 100644
index 0000000000..57fafe7a04
--- /dev/null
+++ b/tests/auto/network/socket/qtcpsocket/test/CMakeLists.txt
@@ -0,0 +1,39 @@
+# Generated from test.pro.
+
+#####################################################################
+## tst_qtcpsocket Test:
+#####################################################################
+
+add_qt_test(tst_qtcpsocket
+    SOURCES
+        ../tst_qtcpsocket.cpp
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::NetworkPrivate
+)
+
+## Scopes:
+#####################################################################
+
+extend_target(tst_qtcpsocket CONDITION WIN32
+    PUBLIC_LIBRARIES
+        ws2_32
+)
+
+# special case begin
+set(THREADS_PREFER_PTHREAD_FLAG 1)
+find_package(Threads)
+target_link_libraries(tst_qtcpsocket PRIVATE Threads::Threads)
+# special case end
+
+#### Keys ignored in scope 4:.:.:test.pro:(CMAKE_BUILD_TYPE STREQUAL Debug):
+# DESTDIR = "../debug"
+
+#### Keys ignored in scope 5:.:.:test.pro:else:
+# DESTDIR = "../release"
+
+#### Keys ignored in scope 6:.:.:test.pro:else:
+# DESTDIR = "../"
+
+#### Keys ignored in scope 7:.:.:test.pro:LINUX:
+# QT_TEST_SERVER_LIST = "danted" "squid" "apache2" "ftp-proxy" "vsftpd" "iptables" "cyrus"
diff --git a/tests/auto/network/socket/qudpsocket/CMakeLists.txt b/tests/auto/network/socket/qudpsocket/CMakeLists.txt
new file mode 100644
index 0000000000..b9d0646e58
--- /dev/null
+++ b/tests/auto/network/socket/qudpsocket/CMakeLists.txt
@@ -0,0 +1,4 @@
+# Generated from qudpsocket.pro.
+
+add_subdirectory(test)
+add_subdirectory(clientserver)
diff --git a/tests/auto/network/socket/qudpsocket/clientserver/CMakeLists.txt b/tests/auto/network/socket/qudpsocket/clientserver/CMakeLists.txt
new file mode 100644
index 0000000000..8b594c6913
--- /dev/null
+++ b/tests/auto/network/socket/qudpsocket/clientserver/CMakeLists.txt
@@ -0,0 +1,13 @@
+# Generated from clientserver.pro.
+
+#####################################################################
+## clientserver Binary:
+#####################################################################
+
+add_qt_executable(clientserver
+    OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
+    SOURCES
+        main.cpp
+    PUBLIC_LIBRARIES
+        Qt::Network
+)
diff --git a/tests/auto/network/socket/qudpsocket/test/CMakeLists.txt b/tests/auto/network/socket/qudpsocket/test/CMakeLists.txt
new file mode 100644
index 0000000000..3c2df284fc
--- /dev/null
+++ b/tests/auto/network/socket/qudpsocket/test/CMakeLists.txt
@@ -0,0 +1,34 @@
+# Generated from test.pro.
+
+#####################################################################
+## tst_qudpsocket Test:
+#####################################################################
+
+add_qt_test(tst_qudpsocket
+    OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../" # special case
+    SOURCES
+        ../tst_qudpsocket.cpp
+    INCLUDE_DIRECTORIES
+        ../../../../../shared
+    PUBLIC_LIBRARIES
+        Qt::Network
+)
+
+#### Keys ignored in scope 1:.:.:test.pro:<TRUE>:
+# MOC_DIR = "tmp"
+# testcase.timeout = "800"
+
+## Scopes:
+#####################################################################
+
+#### Keys ignored in scope 3:.:.:test.pro:(CMAKE_BUILD_TYPE STREQUAL Debug):
+# DESTDIR = "../debug"
+
+#### Keys ignored in scope 4:.:.:test.pro:else:
+# DESTDIR = "../release"
+
+#### Keys ignored in scope 5:.:.:test.pro:else:
+# DESTDIR = "../"
+
+#### Keys ignored in scope 6:.:.:test.pro:LINUX:
+# QT_TEST_SERVER_LIST = "danted" "echo"
diff --git a/tests/auto/network/socket/qudpsocket/udpServer/.prev_CMakeLists.txt b/tests/auto/network/socket/qudpsocket/udpServer/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..be9819466f
--- /dev/null
+++ b/tests/auto/network/socket/qudpsocket/udpServer/.prev_CMakeLists.txt
@@ -0,0 +1,12 @@
+# Generated from udpServer.pro.
+
+#####################################################################
+## udpServer Binary:
+#####################################################################
+
+add_qt_executable(udpServer
+    SOURCES
+        main.cpp
+    PUBLIC_LIBRARIES
+        Qt::Network
+)
diff --git a/tests/auto/network/socket/qudpsocket/udpServer/CMakeLists.txt b/tests/auto/network/socket/qudpsocket/udpServer/CMakeLists.txt
new file mode 100644
index 0000000000..d9da87126f
--- /dev/null
+++ b/tests/auto/network/socket/qudpsocket/udpServer/CMakeLists.txt
@@ -0,0 +1,13 @@
+# Generated from udpServer.pro.
+
+#####################################################################
+## udpServer Binary:
+#####################################################################
+
+add_qt_executable(udpServer
+    OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/./" # special case
+    SOURCES
+        main.cpp
+    PUBLIC_LIBRARIES
+        Qt::Network
+)
diff --git a/tests/auto/network/ssl/CMakeLists.txt b/tests/auto/network/ssl/CMakeLists.txt
new file mode 100644
index 0000000000..c10cfabbf4
--- /dev/null
+++ b/tests/auto/network/ssl/CMakeLists.txt
@@ -0,0 +1,36 @@
+# Generated from ssl.pro.
+
+add_subdirectory(qpassworddigestor)
+add_subdirectory(qsslcertificate)
+add_subdirectory(qsslcipher)
+add_subdirectory(qsslellipticcurve)
+add_subdirectory(qsslerror)
+add_subdirectory(qsslkey)
+
+if(QT_FEATURE_ssl)
+
+    if(QT_FEATURE_private_tests)
+        add_subdirectory(qsslsocket)
+        if(NOT WINRT)
+            add_subdirectory(qsslsocket_onDemandCertificates_member)
+            add_subdirectory(qsslsocket_onDemandCertificates_static)
+        endif()
+
+        if(QT_FEATURE_dtls)
+            add_subdirectory(qdtlscookie)
+            add_subdirectory(qdtls)
+        endif()
+
+        if(QT_FEATURE_ocsp)
+            add_subdirectory(qocsp)
+        endif()
+    endif()
+endif()
+
+if(QT_FEATURE_ssl)
+
+    if(QT_FEATURE_private_tests)
+        add_subdirectory(qasn1element)
+        add_subdirectory(qssldiffiehellmanparameters)
+    endif()
+endif()
diff --git a/tests/auto/network/ssl/qasn1element/CMakeLists.txt b/tests/auto/network/ssl/qasn1element/CMakeLists.txt
new file mode 100644
index 0000000000..aa9ff58012
--- /dev/null
+++ b/tests/auto/network/ssl/qasn1element/CMakeLists.txt
@@ -0,0 +1,13 @@
+# Generated from qasn1element.pro.
+
+#####################################################################
+## tst_qasn1element Test:
+#####################################################################
+
+add_qt_test(tst_qasn1element
+    SOURCES
+        tst_qasn1element.cpp
+    PUBLIC_LIBRARIES
+        Qt::Network
+        Qt::NetworkPrivate
+)
diff --git a/tests/auto/network/ssl/qdtls/CMakeLists.txt b/tests/auto/network/ssl/qdtls/CMakeLists.txt
new file mode 100644
index 0000000000..77bf65f199
--- /dev/null
+++ b/tests/auto/network/ssl/qdtls/CMakeLists.txt
@@ -0,0 +1,25 @@
+# Generated from qdtls.pro.
+
+#####################################################################
+## tst_qdtls Test:
+#####################################################################
+
+# Collect test data
+list(APPEND test_data "certs")
+
+add_qt_test(tst_qdtls
+    SOURCES
+        tst_qdtls.cpp
+    PUBLIC_LIBRARIES
+        Qt::NetworkPrivate
+    TESTDATA ${test_data}
+)
+
+## Scopes:
+#####################################################################
+
+#### Keys ignored in scope 3:.:.:qdtls.pro:(CMAKE_BUILD_TYPE STREQUAL Debug):
+# DESTDIR = "debug"
+
+#### Keys ignored in scope 4:.:.:qdtls.pro:else:
+# DESTDIR = "release"
diff --git a/tests/auto/network/ssl/qdtls/tst_qdtls.cpp b/tests/auto/network/ssl/qdtls/tst_qdtls.cpp
index 5d79b0f26b..3bbde484ce 100644
--- a/tests/auto/network/ssl/qdtls/tst_qdtls.cpp
+++ b/tests/auto/network/ssl/qdtls/tst_qdtls.cpp
@@ -162,7 +162,6 @@ Q_DECLARE_METATYPE(QSslSocket::SslMode)
 Q_DECLARE_METATYPE(QSslSocket::PeerVerifyMode)
 Q_DECLARE_METATYPE(QList<QSslCertificate>)
 Q_DECLARE_METATYPE(QSslKey)
-Q_DECLARE_METATYPE(QVector<QSslError>)
 
 QT_BEGIN_NAMESPACE
 
diff --git a/tests/auto/network/ssl/qdtlscookie/CMakeLists.txt b/tests/auto/network/ssl/qdtlscookie/CMakeLists.txt
new file mode 100644
index 0000000000..827716c3b7
--- /dev/null
+++ b/tests/auto/network/ssl/qdtlscookie/CMakeLists.txt
@@ -0,0 +1,21 @@
+# Generated from qdtlscookie.pro.
+
+#####################################################################
+## tst_qdtlscookie Test:
+#####################################################################
+
+add_qt_test(tst_qdtlscookie
+    SOURCES
+        tst_qdtlscookie.cpp
+    PUBLIC_LIBRARIES
+        Qt::NetworkPrivate
+)
+
+## Scopes:
+#####################################################################
+
+#### Keys ignored in scope 3:.:.:qdtlscookie.pro:(CMAKE_BUILD_TYPE STREQUAL Debug):
+# DESTDIR = "debug"
+
+#### Keys ignored in scope 4:.:.:qdtlscookie.pro:else:
+# DESTDIR = "release"
diff --git a/tests/auto/network/ssl/qocsp/CMakeLists.txt b/tests/auto/network/ssl/qocsp/CMakeLists.txt
new file mode 100644
index 0000000000..399711f9a0
--- /dev/null
+++ b/tests/auto/network/ssl/qocsp/CMakeLists.txt
@@ -0,0 +1,22 @@
+# Generated from qocsp.pro.
+
+#####################################################################
+## tst_qocsp Test:
+#####################################################################
+
+add_qt_test(tst_qocsp
+    SOURCES
+        tst_qocsp.cpp
+    PUBLIC_LIBRARIES
+        Qt::Network
+        Qt::NetworkPrivate
+)
+
+## Scopes:
+#####################################################################
+
+#### Keys ignored in scope 3:.:.:qocsp.pro:(CMAKE_BUILD_TYPE STREQUAL Debug):
+# DESTDIR = "debug"
+
+#### Keys ignored in scope 4:.:.:qocsp.pro:else:
+# DESTDIR = "release"
diff --git a/tests/auto/network/ssl/qocsp/tst_qocsp.cpp b/tests/auto/network/ssl/qocsp/tst_qocsp.cpp
index edd1c24547..27476f451e 100644
--- a/tests/auto/network/ssl/qocsp/tst_qocsp.cpp
+++ b/tests/auto/network/ssl/qocsp/tst_qocsp.cpp
@@ -60,7 +60,6 @@ using VectorOfErrors = QT_PREPEND_NAMESPACE(QVector<SslError>);
 using Latin1String = QT_PREPEND_NAMESPACE(QLatin1String);
 
 Q_DECLARE_METATYPE(SslError)
-Q_DECLARE_METATYPE(VectorOfErrors)
 Q_DECLARE_METATYPE(Latin1String)
 
 QT_BEGIN_NAMESPACE
diff --git a/tests/auto/network/ssl/qpassworddigestor/CMakeLists.txt b/tests/auto/network/ssl/qpassworddigestor/CMakeLists.txt
new file mode 100644
index 0000000000..e0997fc26e
--- /dev/null
+++ b/tests/auto/network/ssl/qpassworddigestor/CMakeLists.txt
@@ -0,0 +1,12 @@
+# Generated from qpassworddigestor.pro.
+
+#####################################################################
+## tst_qpassworddigestor Test:
+#####################################################################
+
+add_qt_test(tst_qpassworddigestor
+    SOURCES
+        tst_qpassworddigestor.cpp
+    PUBLIC_LIBRARIES
+        Qt::Network
+)
diff --git a/tests/auto/network/ssl/qsslcertificate/.prev_CMakeLists.txt b/tests/auto/network/ssl/qsslcertificate/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..1509c2e809
--- /dev/null
+++ b/tests/auto/network/ssl/qsslcertificate/.prev_CMakeLists.txt
@@ -0,0 +1,31 @@
+# Generated from qsslcertificate.pro.
+
+#####################################################################
+## tst_qsslcertificate Test:
+#####################################################################
+
+# Collect test data
+file(GLOB_RECURSE test_data_glob
+    RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+    certificates/*)
+list(APPEND test_data ${test_data_glob})
+file(GLOB_RECURSE test_data_glob
+    RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+    more-certificates/*)
+list(APPEND test_data ${test_data_glob})
+file(GLOB_RECURSE test_data_glob
+    RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+    verify-certs/*)
+list(APPEND test_data ${test_data_glob})
+file(GLOB_RECURSE test_data_glob
+    RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+    pkcs12/*)
+list(APPEND test_data ${test_data_glob})
+
+add_qt_test(tst_qsslcertificate
+    SOURCES
+        tst_qsslcertificate.cpp
+    PUBLIC_LIBRARIES
+        Qt::Network
+    TESTDATA ${test_data}
+)
diff --git a/tests/auto/network/ssl/qsslcertificate/CMakeLists.txt b/tests/auto/network/ssl/qsslcertificate/CMakeLists.txt
new file mode 100644
index 0000000000..4b8fefc499
--- /dev/null
+++ b/tests/auto/network/ssl/qsslcertificate/CMakeLists.txt
@@ -0,0 +1,38 @@
+# Generated from qsslcertificate.pro.
+
+#####################################################################
+## tst_qsslcertificate Test:
+#####################################################################
+
+# special case begin
+# This test requires private tests to properly build
+if (NOT QT_FEATURE_private_tests)
+    return()
+endif()
+# special case end
+
+# Collect test data
+file(GLOB_RECURSE test_data_glob
+    RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+    certificates/*)
+list(APPEND test_data ${test_data_glob})
+file(GLOB_RECURSE test_data_glob
+    RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+    more-certificates/*)
+list(APPEND test_data ${test_data_glob})
+file(GLOB_RECURSE test_data_glob
+    RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+    verify-certs/*)
+list(APPEND test_data ${test_data_glob})
+file(GLOB_RECURSE test_data_glob
+    RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+    pkcs12/*)
+list(APPEND test_data ${test_data_glob})
+
+add_qt_test(tst_qsslcertificate
+    SOURCES
+        tst_qsslcertificate.cpp
+    PUBLIC_LIBRARIES
+        Qt::Network
+    TESTDATA ${test_data}
+)
diff --git a/tests/auto/network/ssl/qsslcipher/CMakeLists.txt b/tests/auto/network/ssl/qsslcipher/CMakeLists.txt
new file mode 100644
index 0000000000..44e0e78220
--- /dev/null
+++ b/tests/auto/network/ssl/qsslcipher/CMakeLists.txt
@@ -0,0 +1,21 @@
+# Generated from qsslcipher.pro.
+
+#####################################################################
+## tst_qsslcipher Test:
+#####################################################################
+
+add_qt_test(tst_qsslcipher
+    SOURCES
+        tst_qsslcipher.cpp
+    PUBLIC_LIBRARIES
+        Qt::Network
+)
+
+## Scopes:
+#####################################################################
+
+#### Keys ignored in scope 3:.:.:qsslcipher.pro:(CMAKE_BUILD_TYPE STREQUAL Debug):
+# DESTDIR = "debug"
+
+#### Keys ignored in scope 4:.:.:qsslcipher.pro:else:
+# DESTDIR = "release"
diff --git a/tests/auto/network/ssl/qssldiffiehellmanparameters/CMakeLists.txt b/tests/auto/network/ssl/qssldiffiehellmanparameters/CMakeLists.txt
new file mode 100644
index 0000000000..f6785a6736
--- /dev/null
+++ b/tests/auto/network/ssl/qssldiffiehellmanparameters/CMakeLists.txt
@@ -0,0 +1,12 @@
+# Generated from qssldiffiehellmanparameters.pro.
+
+#####################################################################
+## tst_qssldiffiehellmanparameters Test:
+#####################################################################
+
+add_qt_test(tst_qssldiffiehellmanparameters
+    SOURCES
+        tst_qssldiffiehellmanparameters.cpp
+    PUBLIC_LIBRARIES
+        Qt::Network
+)
diff --git a/tests/auto/network/ssl/qsslellipticcurve/CMakeLists.txt b/tests/auto/network/ssl/qsslellipticcurve/CMakeLists.txt
new file mode 100644
index 0000000000..4df88ff305
--- /dev/null
+++ b/tests/auto/network/ssl/qsslellipticcurve/CMakeLists.txt
@@ -0,0 +1,12 @@
+# Generated from qsslellipticcurve.pro.
+
+#####################################################################
+## tst_qsslellipticcurve Test:
+#####################################################################
+
+add_qt_test(tst_qsslellipticcurve
+    SOURCES
+        tst_qsslellipticcurve.cpp
+    PUBLIC_LIBRARIES
+        Qt::Network
+)
diff --git a/tests/auto/network/ssl/qsslerror/CMakeLists.txt b/tests/auto/network/ssl/qsslerror/CMakeLists.txt
new file mode 100644
index 0000000000..e8b07ab049
--- /dev/null
+++ b/tests/auto/network/ssl/qsslerror/CMakeLists.txt
@@ -0,0 +1,21 @@
+# Generated from qsslerror.pro.
+
+#####################################################################
+## tst_qsslerror Test:
+#####################################################################
+
+add_qt_test(tst_qsslerror
+    SOURCES
+        tst_qsslerror.cpp
+    PUBLIC_LIBRARIES
+        Qt::Network
+)
+
+## Scopes:
+#####################################################################
+
+#### Keys ignored in scope 3:.:.:qsslerror.pro:(CMAKE_BUILD_TYPE STREQUAL Debug):
+# DESTDIR = "debug"
+
+#### Keys ignored in scope 4:.:.:qsslerror.pro:else:
+# DESTDIR = "release"
diff --git a/tests/auto/network/ssl/qsslkey/CMakeLists.txt b/tests/auto/network/ssl/qsslkey/CMakeLists.txt
new file mode 100644
index 0000000000..04634d1997
--- /dev/null
+++ b/tests/auto/network/ssl/qsslkey/CMakeLists.txt
@@ -0,0 +1,32 @@
+# Generated from qsslkey.pro.
+
+#####################################################################
+## tst_qsslkey Test:
+#####################################################################
+
+# Collect test data
+file(GLOB_RECURSE test_data_glob
+    RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+    keys/*)
+list(APPEND test_data ${test_data_glob})
+file(GLOB_RECURSE test_data_glob
+    RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+    rsa-*.pem)
+list(APPEND test_data ${test_data_glob})
+
+add_qt_test(tst_qsslkey
+    SOURCES
+        tst_qsslkey.cpp
+    PUBLIC_LIBRARIES
+        Qt::Network
+    TESTDATA ${test_data}
+)
+
+## Scopes:
+#####################################################################
+
+extend_target(tst_qsslkey CONDITION QT_FEATURE_private_tests
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::NetworkPrivate
+)
diff --git a/tests/auto/network/ssl/qsslsocket/CMakeLists.txt b/tests/auto/network/ssl/qsslsocket/CMakeLists.txt
new file mode 100644
index 0000000000..99ec2ad823
--- /dev/null
+++ b/tests/auto/network/ssl/qsslsocket/CMakeLists.txt
@@ -0,0 +1,38 @@
+# Generated from qsslsocket.pro.
+
+if(NOT QT_FEATURE_private_tests)
+    return()
+endif()
+
+#####################################################################
+## tst_qsslsocket Test:
+#####################################################################
+
+# Collect test data
+list(APPEND test_data "certs")
+
+add_qt_test(tst_qsslsocket
+    SOURCES
+        tst_qsslsocket.cpp
+    DEFINES
+        SRCDIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/\\\"
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::NetworkPrivate
+    TESTDATA ${test_data}
+)
+
+#### Keys ignored in scope 1:.:.:qsslsocket.pro:<TRUE>:
+# _REQUIREMENTS = "qtConfig(private_tests)"
+
+## Scopes:
+#####################################################################
+
+#### Keys ignored in scope 3:.:.:qsslsocket.pro:(CMAKE_BUILD_TYPE STREQUAL Debug):
+# DESTDIR = "debug"
+
+#### Keys ignored in scope 4:.:.:qsslsocket.pro:else:
+# DESTDIR = "release"
+
+#### Keys ignored in scope 5:.:.:qsslsocket.pro:LINUX:
+# QT_TEST_SERVER_LIST = "squid" "danted" "cyrus" "apache2" "echo"
diff --git a/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp b/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp
index 23495436eb..c793a6a98b 100644
--- a/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp
+++ b/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp
@@ -73,7 +73,7 @@ typedef QSharedPointer<QSslSocket> QSslSocketPtr;
 #else
 #define FLUKE_CERTIFICATE_ERROR QSslError::CertificateUntrusted
 #endif
-#endif // QT_NO_SSL
+#endif // QT_NO_OPENSSL
 
 // Detect ALPN (Application-Layer Protocol Negotiation) support
 #undef ALPN_SUPPORTED // Undef the variable first to be safe
@@ -259,10 +259,14 @@ private slots:
     void signatureAlgorithm();
 #endif
 
-    void disabledProtocols_data();
-    void disabledProtocols();
+    void unsupportedProtocols_data();
+    void unsupportedProtocols();
 
     void oldErrorsOnSocketReuse();
+#if QT_CONFIG(openssl)
+    void alertMissingCertificate();
+    void alertInvalidCertificate();
+#endif // openssl
 
     void setEmptyDefaultConfiguration(); // this test should be last
 
@@ -337,6 +341,8 @@ tst_QSslSocket::tst_QSslSocket()
     qRegisterMetaType<QSslError>("QSslError");
     qRegisterMetaType<QAbstractSocket::SocketState>("QAbstractSocket::SocketState");
     qRegisterMetaType<QAbstractSocket::SocketError>("QAbstractSocket::SocketError");
+    qRegisterMetaType<QAlertLevel>("QAlertLevel");
+    qRegisterMetaType<QAlertType>("QAlertType");
 
 #ifndef QT_NO_OPENSSL
     qRegisterMetaType<QSslPreSharedKeyAuthenticator *>();
@@ -1180,25 +1186,6 @@ void tst_QSslSocket::protocol()
         QCOMPARE(socket->protocol(), QSsl::AnyProtocol);
         socket->abort();
     }
-    {
-        // qt-test-server allows TlsV1, so it allows TlsV1SslV3
-        socket->setProtocol(QSsl::TlsV1SslV3);
-        QCOMPARE(socket->protocol(), QSsl::TlsV1SslV3);
-        socket->connectToHostEncrypted(QtNetworkSettings::httpServerName(), 443);
-        if (setProxy && !socket->waitForEncrypted())
-            QSKIP("Skipping flaky test - See QTBUG-29941");
-        QCOMPARE(socket->protocol(), QSsl::TlsV1SslV3);
-        socket->abort();
-        QCOMPARE(socket->protocol(), QSsl::TlsV1SslV3);
-        socket->connectToHost(QtNetworkSettings::httpServerName(), 443);
-        if (setProxy && !socket->waitForConnected())
-            QSKIP("Skipping flaky test - See QTBUG-29941");
-        socket->startClientEncryption();
-        if (setProxy && !socket->waitForEncrypted())
-            QSKIP("Skipping flaky test - See QTBUG-29941");
-        QCOMPARE(socket->protocol(), QSsl::TlsV1SslV3);
-        socket->abort();
-    }
 }
 
 class SslServer : public QTcpServer
@@ -1230,6 +1217,8 @@ public:
 
 signals:
     void socketError(QAbstractSocket::SocketError);
+    void gotAlert(QAlertLevel level, QAlertType type, const QString &message);
+    void alertSent(QAlertLevel level, QAlertType type, const QString &message);
 
 protected:
     void incomingConnection(qintptr socketDescriptor)
@@ -1241,6 +1230,8 @@ protected:
         if (ignoreSslErrors)
             connect(socket, SIGNAL(sslErrors(QList<QSslError>)), this, SLOT(ignoreErrorSlot()));
         connect(socket, SIGNAL(errorOccurred(QAbstractSocket::SocketError)), this, SIGNAL(socketError(QAbstractSocket::SocketError)));
+        connect(socket, &QSslSocket::alertReceived, this, &SslServer::gotAlert);
+        connect(socket, &QSslSocket::alertSent, this, &SslServer::alertSent);
 
         QFile file(m_keyFile);
         QVERIFY(file.open(QIODevice::ReadOnly));
@@ -1304,20 +1295,13 @@ void tst_QSslSocket::protocolServerSide_data()
     QTest::addColumn<bool>("works");
 
     QTest::newRow("tls1.0-tls1.0") << QSsl::TlsV1_0 << QSsl::TlsV1_0 << true;
-    QTest::newRow("tls1ssl3-tls1ssl3") << QSsl::TlsV1SslV3 << QSsl::TlsV1SslV3 << true;
     QTest::newRow("any-any") << QSsl::AnyProtocol << QSsl::AnyProtocol << true;
     QTest::newRow("secure-secure") << QSsl::SecureProtocols << QSsl::SecureProtocols << true;
 
-    QTest::newRow("tls1-tls1ssl3") << QSsl::TlsV1_0 << QSsl::TlsV1SslV3 << true;
     QTest::newRow("tls1.0-secure") << QSsl::TlsV1_0 << QSsl::SecureProtocols << true;
     QTest::newRow("tls1.0-any") << QSsl::TlsV1_0 << QSsl::AnyProtocol << true;
 
-    QTest::newRow("tls1ssl3-tls1.0") << QSsl::TlsV1SslV3 << QSsl::TlsV1_0 << true;
-    QTest::newRow("tls1ssl3-secure") << QSsl::TlsV1SslV3 << QSsl::SecureProtocols << true;
-    QTest::newRow("tls1ssl3-any") << QSsl::TlsV1SslV3 << QSsl::AnyProtocol << true;
-
     QTest::newRow("secure-tls1.0") << QSsl::SecureProtocols << QSsl::TlsV1_0 << true;
-    QTest::newRow("secure-tls1ssl3") << QSsl::SecureProtocols << QSsl::TlsV1SslV3 << true;
     QTest::newRow("secure-any") << QSsl::SecureProtocols << QSsl::AnyProtocol << true;
 
     QTest::newRow("tls1.0orlater-tls1.0") << QSsl::TlsV1_0OrLater << QSsl::TlsV1_0 << true;
@@ -1349,7 +1333,6 @@ void tst_QSslSocket::protocolServerSide_data()
 #endif // TLS1_3_VERSION
 
     QTest::newRow("any-tls1.0") << QSsl::AnyProtocol << QSsl::TlsV1_0 << true;
-    QTest::newRow("any-tls1ssl3") << QSsl::AnyProtocol << QSsl::TlsV1SslV3 << true;
     QTest::newRow("any-secure") << QSsl::AnyProtocol << QSsl::SecureProtocols << true;
 }
 
@@ -4326,27 +4309,30 @@ void tst_QSslSocket::forwardReadChannelFinished()
 
 #endif // QT_NO_OPENSSL
 
-void tst_QSslSocket::disabledProtocols_data()
+void tst_QSslSocket::unsupportedProtocols_data()
 {
-    QTest::addColumn<QSsl::SslProtocol>("disabledProtocol");
-    QTest::newRow("SslV2") << QSsl::SslV2;
-    QTest::newRow("SslV3") << QSsl::SslV3;
+    QTest::addColumn<QSsl::SslProtocol>("unsupportedProtocol");
+    QTest::newRow("DtlsV1_0") << QSsl::DtlsV1_0;
+    QTest::newRow("DtlsV1_2") << QSsl::DtlsV1_2;
+    QTest::newRow("DtlsV1_0OrLater") << QSsl::DtlsV1_0OrLater;
+    QTest::newRow("DtlsV1_2OrLater") << QSsl::DtlsV1_2OrLater;
+    QTest::newRow("UnknownProtocol") << QSsl::UnknownProtocol;
 }
 
-void tst_QSslSocket::disabledProtocols()
+void tst_QSslSocket::unsupportedProtocols()
 {
     QFETCH_GLOBAL(const bool, setProxy);
     if (setProxy)
         return;
 
-    QFETCH(const QSsl::SslProtocol, disabledProtocol);
+    QFETCH(const QSsl::SslProtocol, unsupportedProtocol);
     const int timeoutMS = 500;
     // Test a client socket.
     {
         // 0. connectToHostEncrypted: client-side, non-blocking API, error is discovered
         // early, preventing any real connection from ever starting.
         QSslSocket socket;
-        socket.setProtocol(disabledProtocol);
+        socket.setProtocol(unsupportedProtocol);
         QCOMPARE(socket.error(), QAbstractSocket::UnknownSocketError);
         socket.connectToHostEncrypted(QStringLiteral("doesnotmatter.org"), 1010);
         QCOMPARE(socket.error(), QAbstractSocket::SslInvalidUserDataError);
@@ -4364,7 +4350,7 @@ void tst_QSslSocket::disabledProtocols()
         socket.connectToHost(QHostAddress::LocalHost, server.serverPort());
         QVERIFY(socket.waitForConnected(timeoutMS));
 
-        socket.setProtocol(disabledProtocol);
+        socket.setProtocol(unsupportedProtocol);
         socket.startClientEncryption();
         QCOMPARE(socket.error(), QAbstractSocket::SslInvalidUserDataError);
     }
@@ -4378,7 +4364,7 @@ void tst_QSslSocket::disabledProtocols()
     // and then calls startServerEncryption() (which must fall).
     {
         SslServer server;
-        server.protocol = disabledProtocol;
+        server.protocol = unsupportedProtocol;
         QVERIFY(server.listen());
 
         QTestEventLoop loop;
@@ -4443,6 +4429,119 @@ void tst_QSslSocket::oldErrorsOnSocketReuse()
 
 #endif // QT_NO_SSL
 
+#if QT_CONFIG(openssl)
+
+void (QSslSocket::*const tlsErrorSignal)(const QList<QSslError> &) = &QSslSocket::sslErrors;
+void (QAbstractSocket::*const socketErrorSignal)(QAbstractSocket::SocketError) = &QAbstractSocket::error;
+
+void tst_QSslSocket::alertMissingCertificate()
+{
+    // In this test we want a server to abort the connection due to the failing
+    // client authentication. The server expected to send an alert before closing
+    // the connection, and the client expected to receive this alert and report it.
+
+    QFETCH_GLOBAL(const bool, setProxy);
+    if (setProxy) // Not what we test here, bail out.
+        return;
+
+    SslServer server;
+    if (!server.listen(QHostAddress::LocalHost))
+        QSKIP("SslServer::listen() returned false");
+
+    // We want a certificate request to be sent to the client:
+    server.peerVerifyMode = QSslSocket::VerifyPeer;
+    // The only way we can force OpenSSL to send an alert - is to use
+    // a special option (so we fail before handshake is finished):
+    server.config.setMissingCertificateIsFatal(true);
+
+    QSslSocket clientSocket;
+    connect(&clientSocket, tlsErrorSignal, [&clientSocket](const QList<QSslError> &errors){
+        qDebug() << "ERR";
+        clientSocket.ignoreSslErrors(errors);
+    });
+
+    QSignalSpy serverSpy(&server, &SslServer::alertSent);
+    QSignalSpy clientSpy(&clientSocket, &QSslSocket::alertReceived);
+
+    clientSocket.connectToHostEncrypted(server.serverAddress().toString(), server.serverPort());
+
+    QTestEventLoop runner;
+    QTimer::singleShot(500, [&runner](){
+        runner.exitLoop();
+    });
+
+    int waitFor = 2;
+    auto earlyQuitter = [&runner, &waitFor](QAbstractSocket::SocketError) {
+        if (!--waitFor)
+            runner.exitLoop();
+    };
+
+    // Presumably, RemoteHostClosedError for the client and SslHandshakeError
+    // for the server:
+    connect(&clientSocket, socketErrorSignal, earlyQuitter);
+    connect(&server, &SslServer::socketError, earlyQuitter);
+
+    runner.enterLoopMSecs(1000);
+
+    QVERIFY(serverSpy.count() > 0);
+    QVERIFY(clientSpy.count() > 0);
+    QVERIFY(server.socket && !server.socket->isEncrypted());
+    QVERIFY(!clientSocket.isEncrypted());
+}
+
+void tst_QSslSocket::alertInvalidCertificate()
+{
+    // In this test a client will not ignore verification errors,
+    // it also will do 'early' checks, meaning the reported and
+    // not ignored _during_ the hanshake, not after. This ensures
+    // OpenSSL sends an alert.
+    QFETCH_GLOBAL(const bool, setProxy);
+    if (setProxy) // Not what we test here, bail out.
+        return;
+
+    SslServer server;
+    if (!server.listen(QHostAddress::LocalHost))
+        QSKIP("SslServer::listen() returned false");
+
+    QSslSocket clientSocket;
+    auto configuration = QSslConfiguration::defaultConfiguration();
+    configuration.setHandshakeMustInterruptOnError(true);
+    QVERIFY(configuration.handshakeMustInterruptOnError());
+    clientSocket.setSslConfiguration(configuration);
+
+    QSignalSpy serverSpy(&server, &SslServer::gotAlert);
+    QSignalSpy clientSpy(&clientSocket, &QSslSocket::alertSent);
+    QSignalSpy interruptedSpy(&clientSocket, &QSslSocket::handshakeInterruptedOnError);
+
+    clientSocket.connectToHostEncrypted(server.serverAddress().toString(), server.serverPort());
+
+    QTestEventLoop runner;
+    QTimer::singleShot(500, [&runner](){
+        runner.exitLoop();
+    });
+
+    int waitFor = 2;
+    auto earlyQuitter = [&runner, &waitFor](QAbstractSocket::SocketError) {
+        if (!--waitFor)
+            runner.exitLoop();
+    };
+
+    // Presumably, RemoteHostClosedError for the server and SslHandshakeError
+    // for the client:
+    connect(&clientSocket, socketErrorSignal, earlyQuitter);
+    connect(&server, &SslServer::socketError, earlyQuitter);
+
+    runner.enterLoopMSecs(1000);
+
+    QVERIFY(serverSpy.count() > 0);
+    QVERIFY(clientSpy.count() > 0);
+    QVERIFY(interruptedSpy.count() > 0);
+    QVERIFY(server.socket && !server.socket->isEncrypted());
+    QVERIFY(!clientSocket.isEncrypted());
+}
+
+#endif // openssl
+
 QTEST_MAIN(tst_QSslSocket)
 
 #include "tst_qsslsocket.moc"
diff --git a/tests/auto/network/ssl/qsslsocket_onDemandCertificates_member/CMakeLists.txt b/tests/auto/network/ssl/qsslsocket_onDemandCertificates_member/CMakeLists.txt
new file mode 100644
index 0000000000..c377e0a46a
--- /dev/null
+++ b/tests/auto/network/ssl/qsslsocket_onDemandCertificates_member/CMakeLists.txt
@@ -0,0 +1,35 @@
+# Generated from qsslsocket_onDemandCertificates_member.pro.
+
+if(NOT QT_FEATURE_private_tests)
+    return()
+endif()
+
+#####################################################################
+## tst_qsslsocket_onDemandCertificates_member Test:
+#####################################################################
+
+add_qt_test(tst_qsslsocket_onDemandCertificates_member
+    SOURCES
+        tst_qsslsocket_onDemandCertificates_member.cpp
+    DEFINES
+        SRCDIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/\\\"
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::NetworkPrivate
+)
+
+#### Keys ignored in scope 1:.:.:qsslsocket_onDemandCertificates_member.pro:<TRUE>:
+# _REQUIREMENTS = "qtConfig(private_tests)"
+# testcase.timeout = "300"
+
+## Scopes:
+#####################################################################
+
+#### Keys ignored in scope 3:.:.:qsslsocket_onDemandCertificates_member.pro:(CMAKE_BUILD_TYPE STREQUAL Debug):
+# DESTDIR = "debug"
+
+#### Keys ignored in scope 4:.:.:qsslsocket_onDemandCertificates_member.pro:else:
+# DESTDIR = "release"
+
+#### Keys ignored in scope 5:.:.:qsslsocket_onDemandCertificates_member.pro:LINUX:
+# QT_TEST_SERVER_LIST = "squid" "danted"
diff --git a/tests/auto/network/ssl/qsslsocket_onDemandCertificates_static/CMakeLists.txt b/tests/auto/network/ssl/qsslsocket_onDemandCertificates_static/CMakeLists.txt
new file mode 100644
index 0000000000..f3a3178879
--- /dev/null
+++ b/tests/auto/network/ssl/qsslsocket_onDemandCertificates_static/CMakeLists.txt
@@ -0,0 +1,34 @@
+# Generated from qsslsocket_onDemandCertificates_static.pro.
+
+if(NOT QT_FEATURE_private_tests)
+    return()
+endif()
+
+#####################################################################
+## tst_qsslsocket_onDemandCertificates_static Test:
+#####################################################################
+
+add_qt_test(tst_qsslsocket_onDemandCertificates_static
+    SOURCES
+        tst_qsslsocket_onDemandCertificates_static.cpp
+    DEFINES
+        SRCDIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/\\\"
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::NetworkPrivate
+)
+
+#### Keys ignored in scope 1:.:.:qsslsocket_onDemandCertificates_static.pro:<TRUE>:
+# _REQUIREMENTS = "qtConfig(private_tests)"
+
+## Scopes:
+#####################################################################
+
+#### Keys ignored in scope 3:.:.:qsslsocket_onDemandCertificates_static.pro:(CMAKE_BUILD_TYPE STREQUAL Debug):
+# DESTDIR = "debug"
+
+#### Keys ignored in scope 4:.:.:qsslsocket_onDemandCertificates_static.pro:else:
+# DESTDIR = "release"
+
+#### Keys ignored in scope 5:.:.:qsslsocket_onDemandCertificates_static.pro:LINUX:
+# QT_TEST_SERVER_LIST = "squid" "danted"
diff --git a/tests/auto/opengl/CMakeLists.txt b/tests/auto/opengl/CMakeLists.txt
new file mode 100644
index 0000000000..7281d56838
--- /dev/null
+++ b/tests/auto/opengl/CMakeLists.txt
@@ -0,0 +1 @@
+# Generated from opengl.pro.
diff --git a/tests/auto/opengl/opengl.pro b/tests/auto/opengl/opengl.pro
index 963cda170d..a220deae24 100644
--- a/tests/auto/opengl/opengl.pro
+++ b/tests/auto/opengl/opengl.pro
@@ -1,6 +1,2 @@
-TEMPLATE=subdirs
-SUBDIRS=\
-    qgl \
-    qglbuffer \
-    qglfunctions \
-    qglthreads \
+TEMPLATE = subdirs
+#SUBDIRS =
diff --git a/tests/auto/opengl/qgl/.gitignore b/tests/auto/opengl/qgl/.gitignore
deleted file mode 100644
index bb6e921035..0000000000
--- a/tests/auto/opengl/qgl/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-tst_qgl
diff --git a/tests/auto/opengl/qgl/BLACKLIST b/tests/auto/opengl/qgl/BLACKLIST
deleted file mode 100644
index ec75ea16eb..0000000000
--- a/tests/auto/opengl/qgl/BLACKLIST
+++ /dev/null
@@ -1,8 +0,0 @@
-[graphicsViewClipping]
-ubuntu-16.04
-rhel-7.6
-opensuse-leap
-ubuntu-18.04
-rhel-7.4
-opensuse-42.3
-
diff --git a/tests/auto/opengl/qgl/qgl.pro b/tests/auto/opengl/qgl/qgl.pro
deleted file mode 100644
index af930c5be7..0000000000
--- a/tests/auto/opengl/qgl/qgl.pro
+++ /dev/null
@@ -1,11 +0,0 @@
-############################################################
-# Project file for autotest for file qgl.h
-############################################################
-
-CONFIG += testcase
-TARGET = tst_qgl
-requires(qtHaveModule(opengl))
-QT += widgets widgets-private opengl-private gui-private core-private testlib
-
-SOURCES   += tst_qgl.cpp
-RESOURCES  = qgl.qrc
diff --git a/tests/auto/opengl/qgl/qgl.qrc b/tests/auto/opengl/qgl/qgl.qrc
deleted file mode 100644
index 70f425c1b9..0000000000
--- a/tests/auto/opengl/qgl/qgl.qrc
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE RCC><RCC version="1.0">
-<qresource>
-    <file alias="designer.png">../../gui/image/qpixmap/images/designer.png</file>
-</qresource>
-</RCC>
diff --git a/tests/auto/opengl/qgl/tst_qgl.cpp b/tests/auto/opengl/qgl/tst_qgl.cpp
deleted file mode 100644
index 3cc9592fb1..0000000000
--- a/tests/auto/opengl/qgl/tst_qgl.cpp
+++ /dev/null
@@ -1,2524 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-
-#include <QtTest/QtTest>
-
-#include <qcoreapplication.h>
-#include <qdebug.h>
-#include <qgl.h>
-#include <qglpixelbuffer.h>
-#include <qglframebufferobject.h>
-#include <qglcolormap.h>
-#include <qpaintengine.h>
-#include <qopenglfunctions.h>
-#include <qopenglframebufferobject.h>
-#include <qopenglpaintdevice.h>
-
-#include <QGraphicsView>
-#include <QGraphicsProxyWidget>
-#include <QVBoxLayout>
-
-#ifdef QT_BUILD_INTERNAL
-#include <qpa/qplatformpixmap.h>
-#include <QtOpenGL/private/qgl_p.h>
-#include <QtGui/private/qimage_p.h>
-#include <QtGui/private/qimagepixmapcleanuphooks_p.h>
-#include <QtGui/private/qopenglextensions_p.h>
-#endif
-
-class tst_QGL : public QObject
-{
-Q_OBJECT
-
-public:
-    tst_QGL();
-    virtual ~tst_QGL();
-
-    static void initMain();
-
-private slots:
-    void initTestCase();
-    void getSetCheck();
-#ifdef QT_BUILD_INTERNAL
-    void qglContextDefaultBindTexture();
-    void openGLVersionCheck();
-    void shareRegister();
-    void textureCleanup();
-#endif
-    void partialGLWidgetUpdates_data();
-    void partialGLWidgetUpdates();
-    void glWidgetWithAlpha();
-    void glWidgetRendering();
-    void glFBOSimpleRendering();
-    void glFBORendering();
-    void currentFboSync();
-    void multipleFBOInterleavedRendering();
-    void glFBOUseInGLWidget();
-    void glPBufferRendering();
-    void glWidgetReparent();
-    void glWidgetRenderPixmap();
-    void colormap();
-    void fboFormat();
-    void testDontCrashOnDanglingResources();
-    void replaceClipping();
-    void clipTest();
-    void destroyFBOAfterContext();
-    void threadImages();
-    void nullRectCrash();
-    void graphicsViewClipping();
-    void extensions();
-};
-
-tst_QGL::tst_QGL()
-{
-}
-
-tst_QGL::~tst_QGL()
-{
-}
-
-void tst_QGL::initMain()
-{
-    QCoreApplication::setAttribute(Qt::AA_DisableHighDpiScaling);
-}
-
-void tst_QGL::initTestCase()
-{
-    QGLWidget glWidget;
-    if (!glWidget.isValid())
-        QSKIP("QGL is not supported on the test system");
-}
-
-class MyGLContext : public QGLContext
-{
-public:
-    MyGLContext(const QGLFormat& format) : QGLContext(format) {}
-    bool windowCreated() const { return QGLContext::windowCreated(); }
-    void setWindowCreated(bool on) { QGLContext::setWindowCreated(on); }
-    bool initialized() const { return QGLContext::initialized(); }
-    void setInitialized(bool on) { QGLContext::setInitialized(on); }
-};
-
-class MyGLWidget : public QGLWidget
-{
-public:
-    MyGLWidget() : QGLWidget() {}
-    bool autoBufferSwap() const { return QGLWidget::autoBufferSwap(); }
-    void setAutoBufferSwap(bool on) { QGLWidget::setAutoBufferSwap(on); }
-};
-
-static int appDefaultDepth()
-{
-    static int depth = 0;
-    if (depth == 0) {
-        QPixmap pm(1, 1);
-        depth = pm.depth();
-    }
-    return depth;
-}
-
-// Using INT_MIN and INT_MAX will cause failures on systems
-// where "int" is 64-bit, so use the explicit values instead.
-#define TEST_INT_MIN    (-2147483647 - 1)
-#define TEST_INT_MAX    2147483647
-
-// Testing get/set functions
-void tst_QGL::getSetCheck()
-{
-    QGLFormat obj1;
-    // int QGLFormat::depthBufferSize()
-    // void QGLFormat::setDepthBufferSize(int)
-    QCOMPARE(-1, obj1.depthBufferSize());
-    obj1.setDepthBufferSize(0);
-    QCOMPARE(0, obj1.depthBufferSize());
-    QTest::ignoreMessage(QtWarningMsg, "QGLFormat::setDepthBufferSize: Cannot set negative depth buffer size -2147483648");
-    obj1.setDepthBufferSize(TEST_INT_MIN);
-    QCOMPARE(0, obj1.depthBufferSize()); // Makes no sense with a negative buffer size
-    obj1.setDepthBufferSize(3);
-    QTest::ignoreMessage(QtWarningMsg, "QGLFormat::setDepthBufferSize: Cannot set negative depth buffer size -1");
-    obj1.setDepthBufferSize(-1);
-    QCOMPARE(3, obj1.depthBufferSize());
-    obj1.setDepthBufferSize(TEST_INT_MAX);
-    QCOMPARE(TEST_INT_MAX, obj1.depthBufferSize());
-
-    // int QGLFormat::accumBufferSize()
-    // void QGLFormat::setAccumBufferSize(int)
-    QCOMPARE(-1, obj1.accumBufferSize());
-    obj1.setAccumBufferSize(0);
-    QCOMPARE(0, obj1.accumBufferSize());
-    QTest::ignoreMessage(QtWarningMsg, "QGLFormat::setAccumBufferSize: Cannot set negative accumulate buffer size -2147483648");
-    obj1.setAccumBufferSize(TEST_INT_MIN);
-    QCOMPARE(0, obj1.accumBufferSize()); // Makes no sense with a negative buffer size
-    obj1.setAccumBufferSize(3);
-    QTest::ignoreMessage(QtWarningMsg, "QGLFormat::setAccumBufferSize: Cannot set negative accumulate buffer size -1");
-    obj1.setAccumBufferSize(-1);
-    QCOMPARE(3, obj1.accumBufferSize());
-    obj1.setAccumBufferSize(TEST_INT_MAX);
-    QCOMPARE(TEST_INT_MAX, obj1.accumBufferSize());
-
-    // int QGLFormat::redBufferSize()
-    // void QGLFormat::setRedBufferSize(int)
-    QCOMPARE(-1, obj1.redBufferSize());
-    obj1.setRedBufferSize(0);
-    QCOMPARE(0, obj1.redBufferSize());
-    QTest::ignoreMessage(QtWarningMsg, "QGLFormat::setRedBufferSize: Cannot set negative red buffer size -2147483648");
-    obj1.setRedBufferSize(TEST_INT_MIN);
-    QCOMPARE(0, obj1.redBufferSize()); // Makes no sense with a negative buffer size
-    obj1.setRedBufferSize(3);
-    QTest::ignoreMessage(QtWarningMsg, "QGLFormat::setRedBufferSize: Cannot set negative red buffer size -1");
-    obj1.setRedBufferSize(-1);
-    QCOMPARE(3, obj1.redBufferSize());
-    obj1.setRedBufferSize(TEST_INT_MAX);
-    QCOMPARE(TEST_INT_MAX, obj1.redBufferSize());
-
-    // int QGLFormat::greenBufferSize()
-    // void QGLFormat::setGreenBufferSize(int)
-    QCOMPARE(-1, obj1.greenBufferSize());
-    obj1.setGreenBufferSize(0);
-    QCOMPARE(0, obj1.greenBufferSize());
-    QTest::ignoreMessage(QtWarningMsg, "QGLFormat::setGreenBufferSize: Cannot set negative green buffer size -2147483648");
-    obj1.setGreenBufferSize(TEST_INT_MIN);
-    QCOMPARE(0, obj1.greenBufferSize()); // Makes no sense with a negative buffer size
-    obj1.setGreenBufferSize(3);
-    QTest::ignoreMessage(QtWarningMsg, "QGLFormat::setGreenBufferSize: Cannot set negative green buffer size -1");
-    obj1.setGreenBufferSize(-1);
-    QCOMPARE(3, obj1.greenBufferSize());
-    obj1.setGreenBufferSize(TEST_INT_MAX);
-    QCOMPARE(TEST_INT_MAX, obj1.greenBufferSize());
-
-    // int QGLFormat::blueBufferSize()
-    // void QGLFormat::setBlueBufferSize(int)
-    QCOMPARE(-1, obj1.blueBufferSize());
-    obj1.setBlueBufferSize(0);
-    QCOMPARE(0, obj1.blueBufferSize());
-    QTest::ignoreMessage(QtWarningMsg, "QGLFormat::setBlueBufferSize: Cannot set negative blue buffer size -2147483648");
-    obj1.setBlueBufferSize(TEST_INT_MIN);
-    QCOMPARE(0, obj1.blueBufferSize()); // Makes no sense with a negative buffer size
-    obj1.setBlueBufferSize(3);
-    QTest::ignoreMessage(QtWarningMsg, "QGLFormat::setBlueBufferSize: Cannot set negative blue buffer size -1");
-    obj1.setBlueBufferSize(-1);
-    QCOMPARE(3, obj1.blueBufferSize());
-    obj1.setBlueBufferSize(TEST_INT_MAX);
-    QCOMPARE(TEST_INT_MAX, obj1.blueBufferSize());
-
-    // int QGLFormat::alphaBufferSize()
-    // void QGLFormat::setAlphaBufferSize(int)
-    QCOMPARE(-1, obj1.alphaBufferSize());
-    QCOMPARE(false, obj1.alpha());
-    QVERIFY(!obj1.testOption(QGL::AlphaChannel));
-    QVERIFY(obj1.testOption(QGL::NoAlphaChannel));
-    obj1.setAlphaBufferSize(1);
-    QCOMPARE(true, obj1.alpha());   // setAlphaBufferSize() enables alpha.
-    QCOMPARE(1, obj1.alphaBufferSize());
-    QTest::ignoreMessage(QtWarningMsg, "QGLFormat::setAlphaBufferSize: Cannot set negative alpha buffer size -2147483648");
-    obj1.setAlphaBufferSize(TEST_INT_MIN);
-    QCOMPARE(1, obj1.alphaBufferSize()); // Makes no sense with a negative buffer size
-    obj1.setAlphaBufferSize(3);
-    QTest::ignoreMessage(QtWarningMsg, "QGLFormat::setAlphaBufferSize: Cannot set negative alpha buffer size -1");
-    obj1.setAlphaBufferSize(-1);
-    QCOMPARE(3, obj1.alphaBufferSize());
-    obj1.setAlphaBufferSize(TEST_INT_MAX);
-    QCOMPARE(TEST_INT_MAX, obj1.alphaBufferSize());
-
-    // int QGLFormat::stencilBufferSize()
-    // void QGLFormat::setStencilBufferSize(int)
-    QCOMPARE(-1, obj1.stencilBufferSize());
-    obj1.setStencilBufferSize(1);
-    QCOMPARE(1, obj1.stencilBufferSize());
-    QTest::ignoreMessage(QtWarningMsg, "QGLFormat::setStencilBufferSize: Cannot set negative stencil buffer size -2147483648");
-    obj1.setStencilBufferSize(TEST_INT_MIN);
-    QCOMPARE(1, obj1.stencilBufferSize()); // Makes no sense with a negative buffer size
-    obj1.setStencilBufferSize(3);
-    QTest::ignoreMessage(QtWarningMsg, "QGLFormat::setStencilBufferSize: Cannot set negative stencil buffer size -1");
-    obj1.setStencilBufferSize(-1);
-    QCOMPARE(3, obj1.stencilBufferSize());
-    obj1.setStencilBufferSize(TEST_INT_MAX);
-    QCOMPARE(TEST_INT_MAX, obj1.stencilBufferSize());
-
-    // bool QGLFormat::sampleBuffers()
-    // void QGLFormat::setSampleBuffers(bool)
-    QCOMPARE(false, obj1.sampleBuffers());
-    QVERIFY(!obj1.testOption(QGL::SampleBuffers));
-    QVERIFY(obj1.testOption(QGL::NoSampleBuffers));
-
-    obj1.setSampleBuffers(false);
-    QCOMPARE(false, obj1.sampleBuffers());
-    QVERIFY(obj1.testOption(QGL::NoSampleBuffers));
-    obj1.setSampleBuffers(true);
-    QCOMPARE(true, obj1.sampleBuffers());
-    QVERIFY(obj1.testOption(QGL::SampleBuffers));
-
-    // int QGLFormat::samples()
-    // void QGLFormat::setSamples(int)
-    QCOMPARE(-1, obj1.samples());
-    obj1.setSamples(0);
-    QCOMPARE(0, obj1.samples());
-    QTest::ignoreMessage(QtWarningMsg, "QGLFormat::setSamples: Cannot have negative number of samples per pixel -2147483648");
-    obj1.setSamples(TEST_INT_MIN);
-    QCOMPARE(0, obj1.samples());  // Makes no sense with a negative sample size
-    obj1.setSamples(3);
-    QTest::ignoreMessage(QtWarningMsg, "QGLFormat::setSamples: Cannot have negative number of samples per pixel -1");
-    obj1.setSamples(-1);
-    QCOMPARE(3, obj1.samples());
-    obj1.setSamples(TEST_INT_MAX);
-    QCOMPARE(TEST_INT_MAX, obj1.samples());
-
-    // int QGLFormat::swapInterval()
-    // void QGLFormat::setSwapInterval(int)
-    QCOMPARE(-1, obj1.swapInterval());
-    obj1.setSwapInterval(0);
-    QCOMPARE(0, obj1.swapInterval());
-    obj1.setSwapInterval(TEST_INT_MIN);
-    QCOMPARE(TEST_INT_MIN, obj1.swapInterval());
-    obj1.setSwapInterval(-1);
-    QCOMPARE(-1, obj1.swapInterval());
-    obj1.setSwapInterval(TEST_INT_MAX);
-    QCOMPARE(TEST_INT_MAX, obj1.swapInterval());
-
-    // bool QGLFormat::doubleBuffer()
-    // void QGLFormat::setDoubleBuffer(bool)
-    QCOMPARE(true, obj1.doubleBuffer());
-    QVERIFY(obj1.testOption(QGL::DoubleBuffer));
-    QVERIFY(!obj1.testOption(QGL::SingleBuffer));
-    obj1.setDoubleBuffer(false);
-    QCOMPARE(false, obj1.doubleBuffer());
-    QVERIFY(!obj1.testOption(QGL::DoubleBuffer));
-    QVERIFY(obj1.testOption(QGL::SingleBuffer));
-    obj1.setDoubleBuffer(true);
-    QCOMPARE(true, obj1.doubleBuffer());
-    QVERIFY(obj1.testOption(QGL::DoubleBuffer));
-    QVERIFY(!obj1.testOption(QGL::SingleBuffer));
-
-    // bool QGLFormat::depth()
-    // void QGLFormat::setDepth(bool)
-    QCOMPARE(true, obj1.depth());
-    QVERIFY(obj1.testOption(QGL::DepthBuffer));
-    QVERIFY(!obj1.testOption(QGL::NoDepthBuffer));
-    obj1.setDepth(false);
-    QCOMPARE(false, obj1.depth());
-    QVERIFY(!obj1.testOption(QGL::DepthBuffer));
-    QVERIFY(obj1.testOption(QGL::NoDepthBuffer));
-    obj1.setDepth(true);
-    QCOMPARE(true, obj1.depth());
-    QVERIFY(obj1.testOption(QGL::DepthBuffer));
-    QVERIFY(!obj1.testOption(QGL::NoDepthBuffer));
-
-    // bool QGLFormat::rgba()
-    // void QGLFormat::setRgba(bool)
-    QCOMPARE(true, obj1.rgba());
-    QVERIFY(obj1.testOption(QGL::Rgba));
-    QVERIFY(!obj1.testOption(QGL::ColorIndex));
-    obj1.setRgba(false);
-    QCOMPARE(false, obj1.rgba());
-    QVERIFY(!obj1.testOption(QGL::Rgba));
-    QVERIFY(obj1.testOption(QGL::ColorIndex));
-    obj1.setRgba(true);
-    QCOMPARE(true, obj1.rgba());
-    QVERIFY(obj1.testOption(QGL::Rgba));
-    QVERIFY(!obj1.testOption(QGL::ColorIndex));
-
-    // bool QGLFormat::alpha()
-    // void QGLFormat::setAlpha(bool)
-    QVERIFY(obj1.testOption(QGL::AlphaChannel));
-    QVERIFY(!obj1.testOption(QGL::NoAlphaChannel));
-    obj1.setAlpha(false);
-    QCOMPARE(false, obj1.alpha());
-    QVERIFY(!obj1.testOption(QGL::AlphaChannel));
-    QVERIFY(obj1.testOption(QGL::NoAlphaChannel));
-    obj1.setAlpha(true);
-    QCOMPARE(true, obj1.alpha());
-    QVERIFY(obj1.testOption(QGL::AlphaChannel));
-    QVERIFY(!obj1.testOption(QGL::NoAlphaChannel));
-
-    // bool QGLFormat::accum()
-    // void QGLFormat::setAccum(bool)
-    obj1.setAccumBufferSize(0);
-    QCOMPARE(false, obj1.accum());
-    QVERIFY(!obj1.testOption(QGL::AccumBuffer));
-    QVERIFY(obj1.testOption(QGL::NoAccumBuffer));
-    obj1.setAccum(false);
-    QCOMPARE(false, obj1.accum());
-    QVERIFY(!obj1.testOption(QGL::AccumBuffer));
-    QVERIFY(obj1.testOption(QGL::NoAccumBuffer));
-    obj1.setAccum(true);
-    QCOMPARE(true, obj1.accum());
-    QVERIFY(obj1.testOption(QGL::AccumBuffer));
-    QVERIFY(!obj1.testOption(QGL::NoAccumBuffer));
-
-    // bool QGLFormat::stencil()
-    // void QGLFormat::setStencil(bool)
-    QCOMPARE(true, obj1.stencil());
-    QVERIFY(obj1.testOption(QGL::StencilBuffer));
-    QVERIFY(!obj1.testOption(QGL::NoStencilBuffer));
-    obj1.setStencil(false);
-    QCOMPARE(false, obj1.stencil());
-    QVERIFY(!obj1.testOption(QGL::StencilBuffer));
-    QVERIFY(obj1.testOption(QGL::NoStencilBuffer));
-    obj1.setStencil(true);
-    QCOMPARE(true, obj1.stencil());
-    QVERIFY(obj1.testOption(QGL::StencilBuffer));
-    QVERIFY(!obj1.testOption(QGL::NoStencilBuffer));
-
-    // bool QGLFormat::stereo()
-    // void QGLFormat::setStereo(bool)
-    QCOMPARE(false, obj1.stereo());
-    QVERIFY(!obj1.testOption(QGL::StereoBuffers));
-    QVERIFY(obj1.testOption(QGL::NoStereoBuffers));
-    obj1.setStereo(false);
-    QCOMPARE(false, obj1.stereo());
-    QVERIFY(!obj1.testOption(QGL::StereoBuffers));
-    QVERIFY(obj1.testOption(QGL::NoStereoBuffers));
-    obj1.setStereo(true);
-    QCOMPARE(true, obj1.stereo());
-    QVERIFY(obj1.testOption(QGL::StereoBuffers));
-    QVERIFY(!obj1.testOption(QGL::NoStereoBuffers));
-
-    // bool QGLFormat::directRendering()
-    // void QGLFormat::setDirectRendering(bool)
-    QCOMPARE(true, obj1.directRendering());
-    QVERIFY(obj1.testOption(QGL::DirectRendering));
-    QVERIFY(!obj1.testOption(QGL::IndirectRendering));
-    obj1.setDirectRendering(false);
-    QCOMPARE(false, obj1.directRendering());
-    QVERIFY(!obj1.testOption(QGL::DirectRendering));
-    QVERIFY(obj1.testOption(QGL::IndirectRendering));
-    obj1.setDirectRendering(true);
-    QCOMPARE(true, obj1.directRendering());
-    QVERIFY(obj1.testOption(QGL::DirectRendering));
-    QVERIFY(!obj1.testOption(QGL::IndirectRendering));
-
-    // bool QGLFormat::overlay()
-    // void QGLFormat::setOverlay(bool)
-    QCOMPARE(false, obj1.hasOverlay());
-    QVERIFY(!obj1.testOption(QGL::HasOverlay));
-    QVERIFY(obj1.testOption(QGL::NoOverlay));
-    obj1.setOverlay(false);
-    QCOMPARE(false, obj1.hasOverlay());
-    QVERIFY(!obj1.testOption(QGL::HasOverlay));
-    QVERIFY(obj1.testOption(QGL::NoOverlay));
-    obj1.setOverlay(true);
-    QCOMPARE(true, obj1.hasOverlay());
-    QVERIFY(obj1.testOption(QGL::HasOverlay));
-    QVERIFY(!obj1.testOption(QGL::NoOverlay));
-
-    // int QGLFormat::plane()
-    // void QGLFormat::setPlane(int)
-    QCOMPARE(0, obj1.plane());
-    obj1.setPlane(0);
-    QCOMPARE(0, obj1.plane());
-    obj1.setPlane(TEST_INT_MIN);
-    QCOMPARE(TEST_INT_MIN, obj1.plane());
-    obj1.setPlane(TEST_INT_MAX);
-    QCOMPARE(TEST_INT_MAX, obj1.plane());
-
-    // int QGLFormat::major/minorVersion()
-    // void QGLFormat::setVersion(int, int)
-    QCOMPARE(obj1.majorVersion(), 2);
-    QCOMPARE(obj1.minorVersion(), 0);
-    obj1.setVersion(3, 2);
-    QCOMPARE(obj1.majorVersion(), 3);
-    QCOMPARE(obj1.minorVersion(), 2);
-    QTest::ignoreMessage(QtWarningMsg, "QGLFormat::setVersion: Cannot set zero or negative version number 0.1");
-    obj1.setVersion(0, 1);
-    QCOMPARE(obj1.majorVersion(), 3);
-    QCOMPARE(obj1.minorVersion(), 2);
-    QTest::ignoreMessage(QtWarningMsg, "QGLFormat::setVersion: Cannot set zero or negative version number 3.-1");
-    obj1.setVersion(3, -1);
-    QCOMPARE(obj1.majorVersion(), 3);
-    QCOMPARE(obj1.minorVersion(), 2);
-    obj1.setVersion(TEST_INT_MAX, TEST_INT_MAX - 1);
-    QCOMPARE(obj1.majorVersion(), TEST_INT_MAX);
-    QCOMPARE(obj1.minorVersion(), TEST_INT_MAX - 1);
-
-
-    // operator== and operator!= for QGLFormat
-    QGLFormat format1;
-    QGLFormat format2;
-
-    QCOMPARE(format1, format2);
-    QVERIFY(!(format1 != format2));
-    format1.setDoubleBuffer(false);
-    QVERIFY(!(format1 == format2));
-    QVERIFY(format1 != format2);
-    format2.setDoubleBuffer(false);
-    QCOMPARE(format1, format2);
-    QVERIFY(!(format1 != format2));
-
-    format1.setDepthBufferSize(8);
-    QVERIFY(!(format1 == format2));
-    QVERIFY(format1 != format2);
-    format2.setDepthBufferSize(8);
-    QCOMPARE(format1, format2);
-    QVERIFY(!(format1 != format2));
-
-    format1.setAccumBufferSize(8);
-    QVERIFY(!(format1 == format2));
-    QVERIFY(format1 != format2);
-    format2.setAccumBufferSize(8);
-    QCOMPARE(format1, format2);
-    QVERIFY(!(format1 != format2));
-
-    format1.setRedBufferSize(8);
-    QVERIFY(!(format1 == format2));
-    QVERIFY(format1 != format2);
-    format2.setRedBufferSize(8);
-    QCOMPARE(format1, format2);
-    QVERIFY(!(format1 != format2));
-
-    format1.setGreenBufferSize(8);
-    QVERIFY(!(format1 == format2));
-    QVERIFY(format1 != format2);
-    format2.setGreenBufferSize(8);
-    QCOMPARE(format1, format2);
-    QVERIFY(!(format1 != format2));
-
-    format1.setBlueBufferSize(8);
-    QVERIFY(!(format1 == format2));
-    QVERIFY(format1 != format2);
-    format2.setBlueBufferSize(8);
-    QCOMPARE(format1, format2);
-    QVERIFY(!(format1 != format2));
-
-    format1.setAlphaBufferSize(8);
-    QVERIFY(!(format1 == format2));
-    QVERIFY(format1 != format2);
-    format2.setAlphaBufferSize(8);
-    QCOMPARE(format1, format2);
-    QVERIFY(!(format1 != format2));
-
-    format1.setStencilBufferSize(8);
-    QVERIFY(!(format1 == format2));
-    QVERIFY(format1 != format2);
-    format2.setStencilBufferSize(8);
-    QCOMPARE(format1, format2);
-    QVERIFY(!(format1 != format2));
-
-    format1.setSamples(8);
-    QVERIFY(!(format1 == format2));
-    QVERIFY(format1 != format2);
-    format2.setSamples(8);
-    QCOMPARE(format1, format2);
-    QVERIFY(!(format1 != format2));
-
-    format1.setSwapInterval(8);
-    QVERIFY(!(format1 == format2));
-    QVERIFY(format1 != format2);
-    format2.setSwapInterval(8);
-    QCOMPARE(format1, format2);
-    QVERIFY(!(format1 != format2));
-
-    format1.setPlane(8);
-    QVERIFY(!(format1 == format2));
-    QVERIFY(format1 != format2);
-    format2.setPlane(8);
-    QCOMPARE(format1, format2);
-    QVERIFY(!(format1 != format2));
-
-    format1.setVersion(3, 2);
-    QVERIFY(!(format1 == format2));
-    QVERIFY(format1 != format2);
-    format2.setVersion(3, 2);
-    QCOMPARE(format1, format2);
-    QVERIFY(!(format1 != format2));
-
-    format1.setProfile(QGLFormat::CoreProfile);
-    QVERIFY(!(format1 == format2));
-    QVERIFY(format1 != format2);
-    format2.setProfile(QGLFormat::CoreProfile);
-    QCOMPARE(format1, format2);
-    QVERIFY(!(format1 != format2));
-
-    format1.setOption(QGL::NoDeprecatedFunctions);
-    QVERIFY(!(format1 == format2));
-    QVERIFY(format1 != format2);
-    format2.setOption(QGL::NoDeprecatedFunctions);
-    QCOMPARE(format1, format2);
-    QVERIFY(!(format1 != format2));
-
-    // Copy constructor and assignment for QGLFormat.
-    QGLFormat format3(format1);
-    QGLFormat format4;
-    QCOMPARE(format1, format3);
-    QVERIFY(format1 != format4);
-    format4 = format1;
-    QCOMPARE(format1, format4);
-
-    // Check that modifying a copy doesn't affect the original.
-    format3.setRedBufferSize(16);
-    format4.setPlane(16);
-    QCOMPARE(format1.redBufferSize(), 8);
-    QCOMPARE(format1.plane(), 8);
-
-    // Check the QGLFormat constructor that takes an option list.
-    QGLFormat format5
-        (QGL::DepthBuffer | QGL::StereoBuffers | QGL::ColorIndex, 3);
-    QVERIFY(format5.depth());
-    QVERIFY(format5.stereo());
-    QVERIFY(format5.doubleBuffer());        // From defaultFormat()
-    QVERIFY(!format5.hasOverlay());         // From defaultFormat()
-    QVERIFY(!format5.rgba());
-    QCOMPARE(format5.plane(), 3);
-
-    // The default format should be the same as QGLFormat().
-    QCOMPARE(QGLFormat::defaultFormat(), QGLFormat());
-
-    // Modify the default format and check that it was changed.
-    QGLFormat::setDefaultFormat(format1);
-    QCOMPARE(QGLFormat::defaultFormat(), format1);
-
-    // Restore the default format.
-    QGLFormat::setDefaultFormat(QGLFormat());
-    QCOMPARE(QGLFormat::defaultFormat(), QGLFormat());
-
-    // Check the default overlay format's expected values.
-    QGLFormat overlay(QGLFormat::defaultOverlayFormat());
-    QCOMPARE(overlay.depthBufferSize(), -1);
-    QCOMPARE(overlay.accumBufferSize(), -1);
-    QCOMPARE(overlay.redBufferSize(), -1);
-    QCOMPARE(overlay.greenBufferSize(), -1);
-    QCOMPARE(overlay.blueBufferSize(), -1);
-    QCOMPARE(overlay.alphaBufferSize(), -1);
-    QCOMPARE(overlay.samples(), -1);
-    QCOMPARE(overlay.swapInterval(), -1);
-    QCOMPARE(overlay.plane(), 1);
-    QVERIFY(!overlay.sampleBuffers());
-    QVERIFY(!overlay.doubleBuffer());
-    QVERIFY(!overlay.depth());
-    QVERIFY(!overlay.rgba());
-    QVERIFY(!overlay.alpha());
-    QVERIFY(!overlay.accum());
-    QVERIFY(!overlay.stencil());
-    QVERIFY(!overlay.stereo());
-    QVERIFY(overlay.directRendering()); // Only option that should be on.
-    QVERIFY(!overlay.hasOverlay());     // Overlay doesn't need an overlay!
-
-    // Modify the default overlay format and check that it was changed.
-    QGLFormat::setDefaultOverlayFormat(format1);
-    QCOMPARE(QGLFormat::defaultOverlayFormat(), format1);
-
-    // Restore the default overlay format.
-    QGLFormat::setDefaultOverlayFormat(overlay);
-    QCOMPARE(QGLFormat::defaultOverlayFormat(), overlay);
-
-    MyGLContext obj2(obj1);
-    // bool QGLContext::windowCreated()
-    // void QGLContext::setWindowCreated(bool)
-    obj2.setWindowCreated(false);
-    QCOMPARE(false, obj2.windowCreated());
-    obj2.setWindowCreated(true);
-    QCOMPARE(true, obj2.windowCreated());
-
-    // bool QGLContext::initialized()
-    // void QGLContext::setInitialized(bool)
-    obj2.setInitialized(false);
-    QCOMPARE(false, obj2.initialized());
-    obj2.setInitialized(true);
-    QCOMPARE(true, obj2.initialized());
-
-    MyGLWidget obj3;
-    // bool QGLWidget::autoBufferSwap()
-    // void QGLWidget::setAutoBufferSwap(bool)
-    obj3.setAutoBufferSwap(false);
-    QCOMPARE(false, obj3.autoBufferSwap());
-    obj3.setAutoBufferSwap(true);
-    QCOMPARE(true, obj3.autoBufferSwap());
-}
-
-#ifdef QT_BUILD_INTERNAL
-QT_BEGIN_NAMESPACE
-extern QGLFormat::OpenGLVersionFlags qOpenGLVersionFlagsFromString(const QString &versionString);
-QT_END_NAMESPACE
-#endif
-
-#ifdef QT_BUILD_INTERNAL
-void tst_QGL::openGLVersionCheck()
-{
-    QString versionString;
-    QGLFormat::OpenGLVersionFlags expectedFlag;
-    QGLFormat::OpenGLVersionFlags versionFlag;
-
-    versionString = "1.1 Irix 6.5";
-    expectedFlag = QGLFormat::OpenGL_Version_1_1;
-    versionFlag = qOpenGLVersionFlagsFromString(versionString);
-    QCOMPARE(versionFlag, expectedFlag);
-
-    versionString = "1.2 Microsoft";
-    expectedFlag = QGLFormat::OpenGL_Version_1_2 | QGLFormat::OpenGL_Version_1_1;
-    versionFlag = qOpenGLVersionFlagsFromString(versionString);
-    QCOMPARE(versionFlag, expectedFlag);
-
-    versionString = "1.2.1";
-    expectedFlag = QGLFormat::OpenGL_Version_1_2 | QGLFormat::OpenGL_Version_1_1;
-    versionFlag = qOpenGLVersionFlagsFromString(versionString);
-    QCOMPARE(versionFlag, expectedFlag);
-
-    versionString = "1.3 NVIDIA";
-    expectedFlag = QGLFormat::OpenGL_Version_1_3 | QGLFormat::OpenGL_Version_1_2 | QGLFormat::OpenGL_Version_1_1;
-    versionFlag = qOpenGLVersionFlagsFromString(versionString);
-    QCOMPARE(versionFlag, expectedFlag);
-
-    versionString = "1.4";
-    expectedFlag = QGLFormat::OpenGL_Version_1_4 | QGLFormat::OpenGL_Version_1_3 | QGLFormat::OpenGL_Version_1_2 | QGLFormat::OpenGL_Version_1_1;
-    versionFlag = qOpenGLVersionFlagsFromString(versionString);
-    QCOMPARE(versionFlag, expectedFlag);
-
-    versionString = "1.5 NVIDIA";
-    expectedFlag = QGLFormat::OpenGL_Version_1_5 | QGLFormat::OpenGL_Version_1_4 | QGLFormat::OpenGL_Version_1_3 | QGLFormat::OpenGL_Version_1_2 | QGLFormat::OpenGL_Version_1_1;
-    versionFlag = qOpenGLVersionFlagsFromString(versionString);
-    QCOMPARE(versionFlag, expectedFlag);
-
-    versionString = "2.0.2 NVIDIA 87.62";
-    expectedFlag = QGLFormat::OpenGL_Version_2_0 | QGLFormat::OpenGL_Version_1_5 | QGLFormat::OpenGL_Version_1_4 | QGLFormat::OpenGL_Version_1_3 | QGLFormat::OpenGL_Version_1_2 | QGLFormat::OpenGL_Version_1_1;
-    versionFlag = qOpenGLVersionFlagsFromString(versionString);
-    QCOMPARE(versionFlag, expectedFlag);
-
-    versionString = "2.1 NVIDIA";
-    expectedFlag = QGLFormat::OpenGL_Version_2_1 | QGLFormat::OpenGL_Version_2_0 | QGLFormat::OpenGL_Version_1_5 | QGLFormat::OpenGL_Version_1_4 | QGLFormat::OpenGL_Version_1_3 | QGLFormat::OpenGL_Version_1_2 | QGLFormat::OpenGL_Version_1_1;
-    versionFlag = qOpenGLVersionFlagsFromString(versionString);
-    QCOMPARE(versionFlag, expectedFlag);
-
-    versionString = "2.1";
-    expectedFlag = QGLFormat::OpenGL_Version_2_1 | QGLFormat::OpenGL_Version_2_0 | QGLFormat::OpenGL_Version_1_5 | QGLFormat::OpenGL_Version_1_4 | QGLFormat::OpenGL_Version_1_3 | QGLFormat::OpenGL_Version_1_2 | QGLFormat::OpenGL_Version_1_1;
-    versionFlag = qOpenGLVersionFlagsFromString(versionString);
-    QCOMPARE(versionFlag, expectedFlag);
-
-    versionString = "OpenGL ES-CM 1.0 ATI";
-    expectedFlag = QGLFormat::OpenGL_ES_Common_Version_1_0 | QGLFormat::OpenGL_ES_CommonLite_Version_1_0;
-    versionFlag = qOpenGLVersionFlagsFromString(versionString);
-    QCOMPARE(versionFlag, expectedFlag);
-
-    versionString = "OpenGL ES-CL 1.0 ATI";
-    expectedFlag = QGLFormat::OpenGL_ES_CommonLite_Version_1_0;
-    versionFlag = qOpenGLVersionFlagsFromString(versionString);
-    QCOMPARE(versionFlag, expectedFlag);
-
-    versionString = "OpenGL ES-CM 1.1 ATI";
-    expectedFlag = QGLFormat::OpenGL_ES_Common_Version_1_1 | QGLFormat::OpenGL_ES_CommonLite_Version_1_1 | QGLFormat::OpenGL_ES_Common_Version_1_0 | QGLFormat::OpenGL_ES_CommonLite_Version_1_0;
-    versionFlag = qOpenGLVersionFlagsFromString(versionString);
-    QCOMPARE(versionFlag, expectedFlag);
-
-    versionString = "OpenGL ES-CL 1.1 ATI";
-    expectedFlag = QGLFormat::OpenGL_ES_CommonLite_Version_1_1 | QGLFormat::OpenGL_ES_CommonLite_Version_1_0;
-    versionFlag = qOpenGLVersionFlagsFromString(versionString);
-    QCOMPARE(versionFlag, expectedFlag);
-
-    versionString = "OpenGL ES 2.0 ATI";
-    expectedFlag = QGLFormat::OpenGL_ES_Version_2_0;
-    versionFlag = qOpenGLVersionFlagsFromString(versionString);
-    QCOMPARE(versionFlag, expectedFlag);
-
-    versionString = "3.0";
-    expectedFlag = QGLFormat::OpenGL_Version_3_0 | QGLFormat::OpenGL_Version_2_1 | QGLFormat::OpenGL_Version_2_0 | QGLFormat::OpenGL_Version_1_5 | QGLFormat::OpenGL_Version_1_4 | QGLFormat::OpenGL_Version_1_3 | QGLFormat::OpenGL_Version_1_2 | QGLFormat::OpenGL_Version_1_1;
-    versionFlag = qOpenGLVersionFlagsFromString(versionString);
-    QCOMPARE(versionFlag, expectedFlag);
-
-    QGLWidget glWidget;
-    glWidget.show();
-    glWidget.makeCurrent();
-
-    // This is unfortunately the only test we can make on the actual openGLVersionFlags()
-    // However, the complicated parts are in openGLVersionFlags(const QString &versionString)
-    // tested above
-
-#if defined(QT_OPENGL_ES_2)
-    QVERIFY(QGLFormat::openGLVersionFlags() & QGLFormat::OpenGL_ES_Version_2_0);
-#else
-    if (QOpenGLContext::currentContext()->isOpenGLES())
-        QVERIFY(QGLFormat::openGLVersionFlags() & QGLFormat::OpenGL_ES_Version_2_0);
-    else
-        QVERIFY(QGLFormat::openGLVersionFlags() & QGLFormat::OpenGL_Version_1_1);
-#endif //defined(QT_OPENGL_ES_2)
-}
-#endif //QT_BUILD_INTERNAL
-
-static bool fuzzyComparePixels(const QRgb testPixel, const QRgb refPixel, const char* file, int line, int x = -1, int y = -1)
-{
-    static int maxFuzz = 1;
-    static bool maxFuzzSet = false;
-
-    // On 16 bpp systems, we need to allow for more fuzz:
-    if (!maxFuzzSet) {
-        maxFuzzSet = true;
-        if (appDefaultDepth() < 24)
-            maxFuzz = 32;
-    }
-
-    int redFuzz = qAbs(qRed(testPixel) - qRed(refPixel));
-    int greenFuzz = qAbs(qGreen(testPixel) - qGreen(refPixel));
-    int blueFuzz = qAbs(qBlue(testPixel) - qBlue(refPixel));
-    int alphaFuzz = qAbs(qAlpha(testPixel) - qAlpha(refPixel));
-
-    if (refPixel != 0 && testPixel == 0) {
-        QString msg;
-        if (x >= 0) {
-            msg = QString("Test pixel [%1, %2] is null (black) when it should be (%3,%4,%5,%6)")
-                            .arg(x).arg(y)
-                            .arg(qRed(refPixel)).arg(qGreen(refPixel)).arg(qBlue(refPixel)).arg(qAlpha(refPixel));
-        } else {
-            msg = QString("Test pixel is null (black) when it should be (%2,%3,%4,%5)")
-                            .arg(qRed(refPixel)).arg(qGreen(refPixel)).arg(qBlue(refPixel)).arg(qAlpha(refPixel));
-        }
-
-        QTest::qFail(msg.toLatin1(), file, line);
-        return false;
-    }
-
-    if (redFuzz > maxFuzz || greenFuzz > maxFuzz || blueFuzz > maxFuzz || alphaFuzz > maxFuzz) {
-        QString msg;
-
-        if (x >= 0)
-            msg = QString("Pixel [%1,%2]: ").arg(x).arg(y);
-        else
-            msg = QString("Pixel ");
-
-        msg += QString("Max fuzz (%1) exceeded: (%2,%3,%4,%5) vs (%6,%7,%8,%9)")
-                      .arg(maxFuzz)
-                      .arg(qRed(testPixel)).arg(qGreen(testPixel)).arg(qBlue(testPixel)).arg(qAlpha(testPixel))
-                      .arg(qRed(refPixel)).arg(qGreen(refPixel)).arg(qBlue(refPixel)).arg(qAlpha(refPixel));
-        QTest::qFail(msg.toLatin1(), file, line);
-        return false;
-    }
-    return true;
-}
-
-static void fuzzyCompareImages(const QImage &testImage, const QImage &referenceImage, const char* file, int line)
-{
-    QCOMPARE(testImage.width(), referenceImage.width());
-    QCOMPARE(testImage.height(), referenceImage.height());
-
-    for (int y = 0; y < testImage.height(); y++) {
-        for (int x = 0; x < testImage.width(); x++) {
-            if (!fuzzyComparePixels(testImage.pixel(x, y), referenceImage.pixel(x, y), file, line, x, y)) {
-                // Might as well save the images for easier debugging:
-                referenceImage.save("referenceImage.png");
-                testImage.save("testImage.png");
-                return;
-            }
-        }
-    }
-}
-
-#define QFUZZY_COMPARE_IMAGES(A,B) \
-            fuzzyCompareImages(A, B, __FILE__, __LINE__)
-
-#define QFUZZY_COMPARE_PIXELS(A,B) \
-            fuzzyComparePixels(A, B, __FILE__, __LINE__)
-
-class UnclippedWidget : public QWidget
-{
-public:
-    bool painted;
-
-    UnclippedWidget()
-        : painted(false)
-    {
-    }
-
-    void paintEvent(QPaintEvent *)
-    {
-        QPainter p(this);
-        p.fillRect(rect().adjusted(-1000, -1000, 1000, 1000), Qt::black);
-
-        painted = true;
-    }
-};
-
-void tst_QGL::graphicsViewClipping()
-{
-    const int size = 64;
-    UnclippedWidget *widget = new UnclippedWidget;
-    widget->setFixedSize(size, size);
-
-    QGraphicsScene scene;
-
-    scene.addWidget(widget)->setPos(0, 0);
-
-    QGraphicsView view(&scene);
-    // Use Qt::Tool as fully decorated windows have a minimum width of 160 on Windows.
-    view.setWindowFlags(view.windowFlags() | Qt::Tool);
-    view.setBackgroundBrush(Qt::white);
-    view.resize(2*size, 2*size);
-
-    QGLWidget *viewport = new QGLWidget;
-    view.setViewport(viewport);
-    view.show();
-    qApp->setActiveWindow(&view);
-
-    if (!viewport->isValid())
-        return;
-
-    scene.setSceneRect(view.viewport()->rect());
-
-    QVERIFY(QTest::qWaitForWindowExposed(view.viewport()->windowHandle()));
-    #ifdef Q_OS_MAC
-        // The black rectangle jumps from the center to the upper left for some reason.
-        QTest::qWait(100);
-    #endif
-
-    QTRY_VERIFY(widget->painted);
-
-    QImage image = viewport->grabFrameBuffer();
-    QImage expected = image;
-
-    QPainter p(&expected);
-    p.fillRect(expected.rect(), Qt::white);
-    p.fillRect(QRect(0, 0, size, size), Qt::black);
-    p.end();
-
-    QFUZZY_COMPARE_IMAGES(image, expected);
-}
-
-void tst_QGL::partialGLWidgetUpdates_data()
-{
-    QTest::addColumn<bool>("doubleBufferedContext");
-    QTest::addColumn<bool>("autoFillBackground");
-    QTest::addColumn<bool>("supportsPartialUpdates");
-
-    QTest::newRow("Double buffered context") << true << true << false;
-    QTest::newRow("Double buffered context without auto-fill background") << true << false << false;
-    QTest::newRow("Single buffered context") << false << true << false;
-    QTest::newRow("Single buffered context without auto-fill background") << false << false << true;
-}
-
-void tst_QGL::partialGLWidgetUpdates()
-{
-    QFETCH(bool, doubleBufferedContext);
-    QFETCH(bool, autoFillBackground);
-    QFETCH(bool, supportsPartialUpdates);
-
-    class MyGLWidget : public QGLWidget
-    {
-        public:
-            QRegion paintEventRegion;
-            void paintEvent(QPaintEvent *e)
-            {
-                paintEventRegion = e->region();
-            }
-    };
-
-    QGLFormat format = QGLFormat::defaultFormat();
-    format.setDoubleBuffer(doubleBufferedContext);
-    QGLFormat::setDefaultFormat(format);
-
-    MyGLWidget widget;
-    widget.setFixedSize(150, 150);
-    widget.setAutoFillBackground(autoFillBackground);
-    widget.show();
-    QVERIFY(QTest::qWaitForWindowExposed(&widget));
-    QCoreApplication::processEvents(); // Process all queued paint events
-
-    if (widget.format().doubleBuffer() != doubleBufferedContext)
-        QSKIP("Platform does not support requested format");
-
-    widget.paintEventRegion = QRegion();
-    widget.repaint(50, 50, 50, 50);
-
-    if (supportsPartialUpdates)
-        QCOMPARE(widget.paintEventRegion, QRegion(50, 50, 50, 50));
-    else
-        QCOMPARE(widget.paintEventRegion, QRegion(widget.rect()));
-}
-
-
-// This tests that rendering to a QGLPBuffer using QPainter works.
-void tst_QGL::glPBufferRendering()
-{
-    if (!QGLPixelBuffer::hasOpenGLPbuffers())
-        QSKIP("QGLPixelBuffer not supported on this platform");
-
-    QGLPixelBuffer* pbuf = new QGLPixelBuffer(128, 128);
-
-    QPainter p;
-    bool begun = p.begin(pbuf);
-    QVERIFY(begun);
-
-    QPaintEngine::Type engineType = p.paintEngine()->type();
-    QVERIFY(engineType == QPaintEngine::OpenGL || engineType == QPaintEngine::OpenGL2);
-
-    p.fillRect(0, 0, 128, 128, Qt::red);
-    p.fillRect(32, 32, 64, 64, Qt::blue);
-    p.end();
-
-    QImage fb = pbuf->toImage();
-    delete pbuf;
-
-    QImage reference(128, 128, fb.format());
-    p.begin(&reference);
-    p.fillRect(0, 0, 128, 128, Qt::red);
-    p.fillRect(32, 32, 64, 64, Qt::blue);
-    p.end();
-
-    QFUZZY_COMPARE_IMAGES(fb, reference);
-}
-
-void tst_QGL::glWidgetWithAlpha()
-{
-    QGLWidget* w = new QGLWidget(QGLFormat(QGL::AlphaChannel));
-    w->show();
-    QVERIFY(QTest::qWaitForWindowExposed(w));
-
-    delete w;
-}
-
-
-void qt_opengl_draw_test_pattern(QPainter* painter, int width, int height)
-{
-    QPainterPath intersectingPath;
-    intersectingPath.moveTo(0, 0);
-    intersectingPath.lineTo(100, 0);
-    intersectingPath.lineTo(0, 100);
-    intersectingPath.lineTo(100, 100);
-    intersectingPath.closeSubpath();
-
-    QPainterPath trianglePath;
-    trianglePath.moveTo(50, 0);
-    trianglePath.lineTo(100, 100);
-    trianglePath.lineTo(0, 100);
-    trianglePath.closeSubpath();
-
-    painter->setTransform(QTransform()); // reset xform
-    painter->fillRect(-1, -1, width+2, height+2, Qt::red); // Background
-    painter->translate(14, 14);
-    painter->fillPath(intersectingPath, Qt::blue); // Test stencil buffer works
-    painter->translate(128, 0);
-    painter->setClipPath(trianglePath); // Test depth buffer works
-    painter->setTransform(QTransform()); // reset xform ready for fill
-    painter->fillRect(-1, -1, width+2, height+2, Qt::green);
-}
-
-void qt_opengl_check_test_pattern(const QImage& img)
-{
-    // As we're doing more than trivial painting, we can't just compare to
-    // an image rendered with raster. Instead, we sample at well-defined
-    // test-points:
-    QFUZZY_COMPARE_PIXELS(img.pixel(39, 64), QColor(Qt::red).rgb());
-    QFUZZY_COMPARE_PIXELS(img.pixel(89, 64), QColor(Qt::red).rgb());
-    QFUZZY_COMPARE_PIXELS(img.pixel(64, 39), QColor(Qt::blue).rgb());
-    QFUZZY_COMPARE_PIXELS(img.pixel(64, 89), QColor(Qt::blue).rgb());
-
-    QFUZZY_COMPARE_PIXELS(img.pixel(167, 39), QColor(Qt::red).rgb());
-    QFUZZY_COMPARE_PIXELS(img.pixel(217, 39), QColor(Qt::red).rgb());
-    QFUZZY_COMPARE_PIXELS(img.pixel(192, 64), QColor(Qt::green).rgb());
-}
-
-class GLWidget : public QGLWidget
-{
-public:
-    GLWidget(QWidget* p = 0)
-            : QGLWidget(p), beginOk(false), engineType(QPaintEngine::MaxUser) {}
-    bool beginOk;
-    QPaintEngine::Type engineType;
-    void paintGL()
-    {
-        QPainter p;
-        beginOk = p.begin(this);
-        QPaintEngine* pe = p.paintEngine();
-        engineType = pe->type();
-
-        qt_opengl_draw_test_pattern(&p, width(), height());
-
-        // No p.end() or swap buffers, should be done automatically
-    }
-
-};
-
-void tst_QGL::glWidgetRendering()
-{
-    GLWidget w;
-    w.resize(256, 128);
-    w.show();
-
-    QVERIFY(QTest::qWaitForWindowExposed(&w));
-
-    QVERIFY(w.beginOk);
-    QVERIFY(w.engineType == QPaintEngine::OpenGL || w.engineType == QPaintEngine::OpenGL2);
-
-#if defined(Q_OS_QNX)
-    // glReadPixels reads from the back buffer. On QNX the buffer is not preserved
-    // after a buffer swap. This is why we have to swap the buffer explicitly before calling
-    // grabFrameBuffer to retrieve the content of the front buffer.
-    w.swapBuffers();
-#endif
-    QImage fb = w.grabFrameBuffer(false);
-    qt_opengl_check_test_pattern(fb);
-}
-
-void tst_QGL::glFBOSimpleRendering()
-{
-    if (!QGLFramebufferObject::hasOpenGLFramebufferObjects())
-        QSKIP("QGLFramebufferObject not supported on this platform");
-
-    QGLWidget glw;
-    glw.makeCurrent();
-
-    // No multisample with combined depth/stencil attachment:
-    QGLFramebufferObjectFormat fboFormat;
-    fboFormat.setAttachment(QGLFramebufferObject::NoAttachment);
-
-    QGLFramebufferObject *fbo = new QGLFramebufferObject(200, 100, fboFormat);
-
-    fbo->bind();
-
-    QOpenGLFunctions *funcs = QOpenGLContext::currentContext()->functions();
-    funcs->glClearColor(1.0, 0.0, 0.0, 1.0);
-    funcs->glClear(GL_COLOR_BUFFER_BIT);
-    funcs->glFinish();
-
-    QImage fb = fbo->toImage().convertToFormat(QImage::Format_RGB32);
-    QImage reference(fb.size(), QImage::Format_RGB32);
-    reference.fill(0xffff0000);
-
-    QFUZZY_COMPARE_IMAGES(fb, reference);
-
-    delete fbo;
-}
-
-// NOTE: This tests that CombinedDepthStencil attachment works by assuming the
-//       GL2 engine is being used and is implemented the same way as it was when
-//       this autotest was written. If this is not the case, there may be some
-//       false-positives: I.e. The test passes when either the depth or stencil
-//       buffer is actually missing. But that's probably ok anyway.
-void tst_QGL::glFBORendering()
-{
-#if defined(Q_OS_QNX)
-    QSKIP("Reading the QGLFramebufferObject is unsupported on this platform");
-#endif
-    if (!QGLFramebufferObject::hasOpenGLFramebufferObjects())
-        QSKIP("QGLFramebufferObject not supported on this platform");
-
-    QGLWidget glw;
-    glw.makeCurrent();
-
-    // No multisample with combined depth/stencil attachment:
-    QGLFramebufferObjectFormat fboFormat;
-    fboFormat.setAttachment(QGLFramebufferObject::CombinedDepthStencil);
-
-    // Don't complicate things by using NPOT:
-    QGLFramebufferObject *fbo = new QGLFramebufferObject(256, 128, fboFormat);
-
-    if (fbo->attachment() != QGLFramebufferObject::CombinedDepthStencil) {
-        delete fbo;
-        QSKIP("FBOs missing combined depth~stencil support");
-    }
-
-    QPainter fboPainter;
-    bool painterBegun = fboPainter.begin(fbo);
-    QVERIFY(painterBegun);
-
-    qt_opengl_draw_test_pattern(&fboPainter, fbo->width(), fbo->height());
-
-    fboPainter.end();
-
-    QImage fb = fbo->toImage().convertToFormat(QImage::Format_RGB32);
-    delete fbo;
-
-    qt_opengl_check_test_pattern(fb);
-}
-
-class QOpenGLFramebufferObjectPaintDevice : public QOpenGLPaintDevice
-{
-public:
-    QOpenGLFramebufferObjectPaintDevice(int width, int height)
-        : QOpenGLPaintDevice(width, height)
-        , m_fbo(width, height, QOpenGLFramebufferObject::CombinedDepthStencil)
-    {
-    }
-
-    void ensureActiveTarget()
-    {
-        m_fbo.bind();
-    }
-
-    QImage toImage() const
-    {
-        return m_fbo.toImage();
-    }
-
-private:
-    QOpenGLFramebufferObject m_fbo;
-};
-
-void tst_QGL::currentFboSync()
-{
-    if (!QGLFramebufferObject::hasOpenGLFramebufferObjects())
-        QSKIP("QGLFramebufferObject not supported on this platform");
-
-#if defined(Q_OS_QNX)
-    QSKIP("Reading the QGLFramebufferObject is unsupported on this platform");
-#endif
-
-    QGLWidget glw;
-    glw.makeCurrent();
-
-    // For some reason we offer inter-operatibility between QGL and QOpenGL
-    // paint engines. (?!) Let's check if the two engines can be used to perform
-    // drawing in turns on different targets within the same context.
-
-    {
-        QGLFramebufferObject fbo1(256, 256, QGLFramebufferObject::CombinedDepthStencil);
-
-        QOpenGLFramebufferObjectPaintDevice fbo2(256, 256);
-
-        QImage sourceImage(256, 256, QImage::Format_ARGB32_Premultiplied);
-        QPainter sourcePainter(&sourceImage);
-        qt_opengl_draw_test_pattern(&sourcePainter, 256, 256);
-
-        QPainter fbo1Painter(&fbo1);
-
-        QPainter fbo2Painter(&fbo2);
-        fbo2Painter.drawImage(0, 0, sourceImage);
-        fbo2Painter.end();
-
-        QImage fbo2Image = fbo2.toImage();
-
-        fbo1Painter.drawImage(0, 0, sourceImage);
-        fbo1Painter.end();
-
-        QGLFramebufferObject::bindDefault();
-
-        // Convert the QGLFBO's result since QOpenGLFBO uses a wider
-        // variety of possible return formats.
-        QCOMPARE(fbo1.toImage().convertToFormat(fbo2Image.format()), fbo2Image);
-    }
-
-    {
-        QGLFramebufferObject fbo1(512, 512, QGLFramebufferObject::CombinedDepthStencil);
-
-        QOpenGLFramebufferObjectPaintDevice fbo2(256, 256);
-
-        QImage sourceImage(256, 256, QImage::Format_ARGB32_Premultiplied);
-        QPainter sourcePainter(&sourceImage);
-        qt_opengl_draw_test_pattern(&sourcePainter, 256, 256);
-
-        QPainter fbo2Painter(&fbo2);
-        fbo2Painter.drawImage(0, 0, sourceImage);
-        QImage fbo2Image1 = fbo2.toImage();
-        fbo2Painter.fillRect(0, 0, 256, 256, Qt::white);
-
-        QPainter fbo1Painter(&fbo1);
-        fbo1Painter.drawImage(0, 0, sourceImage);
-        fbo1Painter.end();
-
-        // check that the OpenGL paint engine now knows it needs to sync
-        fbo2Painter.drawImage(0, 0, sourceImage);
-        QImage fbo2Image2 = fbo2.toImage();
-
-        fbo2Painter.end();
-
-        QCOMPARE(fbo2Image1, fbo2Image2);
-    }
-}
-
-// Tests multiple QPainters active on different FBOs at the same time, with
-// interleaving painting. Performance-wise, this is sub-optimal, but it still
-// has to work flawlessly
-void tst_QGL::multipleFBOInterleavedRendering()
-{
-    if (!QGLFramebufferObject::hasOpenGLFramebufferObjects())
-        QSKIP("QGLFramebufferObject not supported on this platform");
-
-    QGLWidget glw;
-    glw.makeCurrent();
-
-    // No multisample with combined depth/stencil attachment:
-    QGLFramebufferObjectFormat fboFormat;
-    fboFormat.setAttachment(QGLFramebufferObject::CombinedDepthStencil);
-
-    QGLFramebufferObject *fbo1 = new QGLFramebufferObject(256, 128, fboFormat);
-    QGLFramebufferObject *fbo2 = new QGLFramebufferObject(256, 128, fboFormat);
-    QGLFramebufferObject *fbo3 = new QGLFramebufferObject(256, 128, fboFormat);
-
-    if ( (fbo1->attachment() != QGLFramebufferObject::CombinedDepthStencil) ||
-         (fbo2->attachment() != QGLFramebufferObject::CombinedDepthStencil) ||
-         (fbo3->attachment() != QGLFramebufferObject::CombinedDepthStencil)    )
-    {
-        delete fbo1;
-        delete fbo2;
-        delete fbo3;
-        QSKIP("FBOs missing combined depth~stencil support");
-    }
-
-    QPainter fbo1Painter;
-    QPainter fbo2Painter;
-    QPainter fbo3Painter;
-
-    QVERIFY(fbo1Painter.begin(fbo1));
-    QVERIFY(fbo2Painter.begin(fbo2));
-    QVERIFY(fbo3Painter.begin(fbo3));
-
-    // Confirm we're using the GL2 engine, as interleaved rendering isn't supported
-    // on the GL1 engine:
-    if (fbo1Painter.paintEngine()->type() != QPaintEngine::OpenGL2)
-        QSKIP("Interleaved GL rendering requires OpenGL 2.0 or higher");
-
-    QPainterPath intersectingPath;
-    intersectingPath.moveTo(0, 0);
-    intersectingPath.lineTo(100, 0);
-    intersectingPath.lineTo(0, 100);
-    intersectingPath.lineTo(100, 100);
-    intersectingPath.closeSubpath();
-
-    QPainterPath trianglePath;
-    trianglePath.moveTo(50, 0);
-    trianglePath.lineTo(100, 100);
-    trianglePath.lineTo(0, 100);
-    trianglePath.closeSubpath();
-
-    fbo1Painter.fillRect(0, 0, fbo1->width(), fbo1->height(), Qt::red); // Background
-    fbo2Painter.fillRect(0, 0, fbo2->width(), fbo2->height(), Qt::green); // Background
-    fbo3Painter.fillRect(0, 0, fbo3->width(), fbo3->height(), Qt::blue); // Background
-
-    fbo1Painter.translate(14, 14);
-    fbo2Painter.translate(14, 14);
-    fbo3Painter.translate(14, 14);
-
-    fbo1Painter.fillPath(intersectingPath, Qt::blue); // Test stencil buffer works
-    fbo2Painter.fillPath(intersectingPath, Qt::red); // Test stencil buffer works
-    fbo3Painter.fillPath(intersectingPath, Qt::green); // Test stencil buffer works
-
-    fbo1Painter.translate(128, 0);
-    fbo2Painter.translate(128, 0);
-    fbo3Painter.translate(128, 0);
-
-    fbo1Painter.setClipPath(trianglePath);
-    fbo2Painter.setClipPath(trianglePath);
-    fbo3Painter.setClipPath(trianglePath);
-
-    fbo1Painter.setTransform(QTransform()); // reset xform
-    fbo2Painter.setTransform(QTransform()); // reset xform
-    fbo3Painter.setTransform(QTransform()); // reset xform
-
-    fbo1Painter.fillRect(0, 0, fbo1->width(), fbo1->height(), Qt::green);
-    fbo2Painter.fillRect(0, 0, fbo2->width(), fbo2->height(), Qt::blue);
-    fbo3Painter.fillRect(0, 0, fbo3->width(), fbo3->height(), Qt::red);
-
-    fbo1Painter.end();
-    fbo2Painter.end();
-    fbo3Painter.end();
-
-    QImage fb1 = fbo1->toImage().convertToFormat(QImage::Format_RGB32);
-    QImage fb2 = fbo2->toImage().convertToFormat(QImage::Format_RGB32);
-    QImage fb3 = fbo3->toImage().convertToFormat(QImage::Format_RGB32);
-    delete fbo1;
-    delete fbo2;
-    delete fbo3;
-
-    // As we're doing more than trivial painting, we can't just compare to
-    // an image rendered with raster. Instead, we sample at well-defined
-    // test-points:
-    QFUZZY_COMPARE_PIXELS(fb1.pixel(39, 64), QColor(Qt::red).rgb());
-    QFUZZY_COMPARE_PIXELS(fb1.pixel(89, 64), QColor(Qt::red).rgb());
-    QFUZZY_COMPARE_PIXELS(fb1.pixel(64, 39), QColor(Qt::blue).rgb());
-    QFUZZY_COMPARE_PIXELS(fb1.pixel(64, 89), QColor(Qt::blue).rgb());
-    QFUZZY_COMPARE_PIXELS(fb1.pixel(167, 39), QColor(Qt::red).rgb());
-    QFUZZY_COMPARE_PIXELS(fb1.pixel(217, 39), QColor(Qt::red).rgb());
-    QFUZZY_COMPARE_PIXELS(fb1.pixel(192, 64), QColor(Qt::green).rgb());
-
-    QFUZZY_COMPARE_PIXELS(fb2.pixel(39, 64), QColor(Qt::green).rgb());
-    QFUZZY_COMPARE_PIXELS(fb2.pixel(89, 64), QColor(Qt::green).rgb());
-    QFUZZY_COMPARE_PIXELS(fb2.pixel(64, 39), QColor(Qt::red).rgb());
-    QFUZZY_COMPARE_PIXELS(fb2.pixel(64, 89), QColor(Qt::red).rgb());
-    QFUZZY_COMPARE_PIXELS(fb2.pixel(167, 39), QColor(Qt::green).rgb());
-    QFUZZY_COMPARE_PIXELS(fb2.pixel(217, 39), QColor(Qt::green).rgb());
-    QFUZZY_COMPARE_PIXELS(fb2.pixel(192, 64), QColor(Qt::blue).rgb());
-
-    QFUZZY_COMPARE_PIXELS(fb3.pixel(39, 64), QColor(Qt::blue).rgb());
-    QFUZZY_COMPARE_PIXELS(fb3.pixel(89, 64), QColor(Qt::blue).rgb());
-    QFUZZY_COMPARE_PIXELS(fb3.pixel(64, 39), QColor(Qt::green).rgb());
-    QFUZZY_COMPARE_PIXELS(fb3.pixel(64, 89), QColor(Qt::green).rgb());
-    QFUZZY_COMPARE_PIXELS(fb3.pixel(167, 39), QColor(Qt::blue).rgb());
-    QFUZZY_COMPARE_PIXELS(fb3.pixel(217, 39), QColor(Qt::blue).rgb());
-    QFUZZY_COMPARE_PIXELS(fb3.pixel(192, 64), QColor(Qt::red).rgb());
-}
-
-class FBOUseInGLWidget : public QGLWidget
-{
-public:
-    bool widgetPainterBeginOk;
-    bool fboPainterBeginOk;
-    QImage fboImage;
-protected:
-    void paintEvent(QPaintEvent*)
-    {
-        QPainter widgetPainter;
-        widgetPainterBeginOk = widgetPainter.begin(this);
-        QGLFramebufferObjectFormat fboFormat;
-        fboFormat.setAttachment(QGLFramebufferObject::NoAttachment);
-        QGLFramebufferObject *fbo = new QGLFramebufferObject(100, 100, fboFormat);
-
-        QPainter fboPainter;
-        fboPainterBeginOk = fboPainter.begin(fbo);
-        fboPainter.fillRect(-1, -1, 130, 130, Qt::red);
-        fboPainter.end();
-        fboImage = fbo->toImage();
-
-        widgetPainter.fillRect(-1, -1, width()+2, height()+2, Qt::blue);
-
-        delete fbo;
-    }
-
-};
-
-void tst_QGL::glFBOUseInGLWidget()
-{
-    if (!QGLFramebufferObject::hasOpenGLFramebufferObjects())
-        QSKIP("QGLFramebufferObject not supported on this platform");
-
-    FBOUseInGLWidget w;
-    w.resize(100, 100);
-    w.showNormal();
-
-    QVERIFY(QTest::qWaitForWindowExposed(&w));
-
-    QVERIFY(w.widgetPainterBeginOk);
-    QVERIFY(w.fboPainterBeginOk);
-
-#if defined(Q_OS_QNX)
-    // glReadPixels reads from the back buffer. On QNX the buffer is not preserved
-    // after a buffer swap. This is why we have to swap the buffer explicitly before calling
-    // grabFrameBuffer to retrieve the content of the front buffer
-    w.swapBuffers();
-#endif
-
-    QImage widgetFB = w.grabFrameBuffer(false);
-    QImage widgetReference(widgetFB.size(), widgetFB.format());
-    widgetReference.fill(0xff0000ff);
-    QFUZZY_COMPARE_IMAGES(widgetFB, widgetReference);
-
-    QImage fboReference(w.fboImage.size(), w.fboImage.format());
-    fboReference.fill(0xffff0000);
-    QFUZZY_COMPARE_IMAGES(w.fboImage, fboReference);
-}
-
-void tst_QGL::glWidgetReparent()
-{
-    // Try it as a top-level first:
-    GLWidget *widget = new GLWidget;
-    widget->setObjectName(QStringLiteral("glWidget1"));
-    widget->setGeometry(0, 0, 200, 30);
-    widget->show();
-
-    QWidget grandParentWidget;
-    grandParentWidget.setObjectName(QStringLiteral("grandParentWidget"));
-    grandParentWidget.setPalette(Qt::blue);
-    QVBoxLayout grandParentLayout(&grandParentWidget);
-
-    QWidget parentWidget(&grandParentWidget);
-    parentWidget.setObjectName(QStringLiteral("parentWidget"));
-    grandParentLayout.addWidget(&parentWidget);
-    parentWidget.setPalette(Qt::green);
-    parentWidget.setAutoFillBackground(true);
-    QVBoxLayout parentLayout(&parentWidget);
-
-    grandParentWidget.setGeometry(0, 100, 200, 200);
-    grandParentWidget.show();
-
-    QVERIFY(QTest::qWaitForWindowExposed(widget));
-    QVERIFY(QTest::qWaitForWindowExposed(&grandParentWidget));
-
-    QVERIFY(parentWidget.children().count() == 1); // The layout
-
-    // Now both widgets should be created & shown, time to re-parent:
-    parentLayout.addWidget(widget);
-
-    QVERIFY(QTest::qWaitForWindowExposed(&grandParentWidget));
-
-    QVERIFY(parentWidget.children().count() == 2); // Layout & glwidget
-    QVERIFY(parentWidget.children().contains(widget));
-    QTRY_VERIFY(widget->height() > 30);
-
-    delete widget;
-
-    QVERIFY(QTest::qWaitForWindowExposed(&grandParentWidget));
-
-    QVERIFY(parentWidget.children().count() == 1); // The layout
-
-    // Now do pretty much the same thing, but don't show the
-    // widget first:
-    widget = new GLWidget;
-    widget->setObjectName(QStringLiteral("glWidget2"));
-    parentLayout.addWidget(widget);
-
-    QVERIFY(QTest::qWaitForWindowExposed(&grandParentWidget));
-
-    QVERIFY(parentWidget.children().count() == 2); // Layout & glwidget
-    QVERIFY(parentWidget.children().contains(widget));
-    QVERIFY(widget->height() > 30);
-
-    delete widget;
-}
-
-class RenderPixmapWidget : public QGLWidget
-{
-protected:
-    void initializeGL() {
-        // Set some gl state:
-        QOpenGLContext::currentContext()->functions()->glClearColor(1.0, 0.0, 0.0, 1.0);
-    }
-
-    void paintGL() {
-        QOpenGLContext::currentContext()->functions()->glClear(GL_COLOR_BUFFER_BIT);
-    }
-};
-
-void tst_QGL::glWidgetRenderPixmap()
-{
-    RenderPixmapWidget *w = new RenderPixmapWidget;
-
-    QSize pmSize = QSize(100, 100);
-    QPixmap pm = w->renderPixmap(pmSize.width(), pmSize.height(), false);
-
-    delete w;
-
-    QImage fb = pm.toImage().convertToFormat(QImage::Format_RGB32);
-    QImage reference(pmSize, QImage::Format_RGB32);
-    reference.fill(0xffff0000);
-
-    QFUZZY_COMPARE_IMAGES(fb, reference);
-}
-
-class ColormapExtended : public QGLColormap
-{
-public:
-    ColormapExtended() {}
-
-    Qt::HANDLE handle() { return QGLColormap::handle(); }
-    void setHandle(Qt::HANDLE handle) { QGLColormap::setHandle(handle); }
-};
-
-void tst_QGL::colormap()
-{
-    // Check the properties of the default empty colormap.
-    QGLColormap cmap1;
-    QVERIFY(cmap1.isEmpty());
-    QCOMPARE(cmap1.size(), 0);
-    QCOMPARE(cmap1.entryRgb(0), QRgb(0));
-    QCOMPARE(cmap1.entryRgb(-1), QRgb(0));
-    QCOMPARE(cmap1.entryRgb(100), QRgb(0));
-    QVERIFY(!cmap1.entryColor(0).isValid());
-    QVERIFY(!cmap1.entryColor(-1).isValid());
-    QVERIFY(!cmap1.entryColor(100).isValid());
-    QCOMPARE(cmap1.find(qRgb(255, 0, 0)), -1);
-    QCOMPARE(cmap1.findNearest(qRgb(255, 0, 0)), -1);
-
-    // Set an entry and re-test.
-    cmap1.setEntry(56, qRgb(255, 0, 0));
-    // The colormap is still considered "empty" even though it
-    // has entries in it now.  The isEmpty() method is used to
-    // detect when the colormap is in use by a GL widget,
-    // not to detect when it is empty!
-    QVERIFY(cmap1.isEmpty());
-    QCOMPARE(cmap1.size(), 256);
-    QCOMPARE(cmap1.entryRgb(0), QRgb(0));
-    QVERIFY(cmap1.entryColor(0) == QColor(0, 0, 0, 255));
-    QVERIFY(cmap1.entryRgb(56) == qRgb(255, 0, 0));
-    QVERIFY(cmap1.entryColor(56) == QColor(255, 0, 0, 255));
-    QCOMPARE(cmap1.find(qRgb(255, 0, 0)), 56);
-    QCOMPARE(cmap1.findNearest(qRgb(255, 0, 0)), 56);
-
-    // Set some more entries.
-    static QRgb const colors[] = {
-        qRgb(255, 0, 0),
-        qRgb(0, 255, 0),
-        qRgb(255, 255, 255),
-        qRgb(0, 0, 255),
-        qRgb(0, 0, 0)
-    };
-    cmap1.setEntry(57, QColor(0, 255, 0));
-    cmap1.setEntries(3, colors + 2, 58);
-    cmap1.setEntries(5, colors, 251);
-    int idx;
-    for (idx = 0; idx < 5; ++idx) {
-        QVERIFY(cmap1.entryRgb(56 + idx) == colors[idx]);
-        QVERIFY(cmap1.entryColor(56 + idx) == QColor(colors[idx]));
-        QVERIFY(cmap1.entryRgb(251 + idx) == colors[idx]);
-        QVERIFY(cmap1.entryColor(251 + idx) == QColor(colors[idx]));
-    }
-    QCOMPARE(cmap1.size(), 256);
-
-    // Perform color lookups.
-    QCOMPARE(cmap1.find(qRgb(255, 0, 0)), 56);
-    QCOMPARE(cmap1.find(qRgb(0, 0, 0)), 60); // Actually finds 0, 0, 0, 255.
-    QCOMPARE(cmap1.find(qRgba(0, 0, 0, 0)), 0);
-    QCOMPARE(cmap1.find(qRgb(0, 255, 0)), 57);
-    QCOMPARE(cmap1.find(qRgb(255, 255, 255)), 58);
-    QCOMPARE(cmap1.find(qRgb(0, 0, 255)), 59);
-    QCOMPARE(cmap1.find(qRgb(140, 0, 0)), -1);
-    QCOMPARE(cmap1.find(qRgb(0, 140, 0)), -1);
-    QCOMPARE(cmap1.find(qRgb(0, 0, 140)), -1);
-    QCOMPARE(cmap1.find(qRgb(64, 0, 0)), -1);
-    QCOMPARE(cmap1.find(qRgb(0, 64, 0)), -1);
-    QCOMPARE(cmap1.find(qRgb(0, 0, 64)), -1);
-    QCOMPARE(cmap1.findNearest(qRgb(255, 0, 0)), 56);
-    QCOMPARE(cmap1.findNearest(qRgb(0, 0, 0)), 60);
-    QCOMPARE(cmap1.findNearest(qRgba(0, 0, 0, 0)), 0);
-    QCOMPARE(cmap1.findNearest(qRgb(0, 255, 0)), 57);
-    QCOMPARE(cmap1.findNearest(qRgb(255, 255, 255)), 58);
-    QCOMPARE(cmap1.findNearest(qRgb(0, 0, 255)), 59);
-    QCOMPARE(cmap1.findNearest(qRgb(140, 0, 0)), 56);
-    QCOMPARE(cmap1.findNearest(qRgb(0, 140, 0)), 57);
-    QCOMPARE(cmap1.findNearest(qRgb(0, 0, 140)), 59);
-    QCOMPARE(cmap1.findNearest(qRgb(64, 0, 0)), 0);
-    QCOMPARE(cmap1.findNearest(qRgb(0, 64, 0)), 0);
-    QCOMPARE(cmap1.findNearest(qRgb(0, 0, 64)), 0);
-
-    // Make some copies of the colormap and check that they are the same.
-    QGLColormap cmap2(cmap1);
-    QGLColormap cmap3;
-    cmap3 = cmap1;
-    QVERIFY(cmap2.isEmpty());
-    QVERIFY(cmap3.isEmpty());
-    QCOMPARE(cmap2.size(), 256);
-    QCOMPARE(cmap3.size(), 256);
-    for (idx = 0; idx < 256; ++idx) {
-        QCOMPARE(cmap1.entryRgb(idx), cmap2.entryRgb(idx));
-        QCOMPARE(cmap1.entryRgb(idx), cmap3.entryRgb(idx));
-    }
-
-    // Modify an entry in one of the copies and recheck the original.
-    cmap2.setEntry(45, qRgb(255, 0, 0));
-    for (idx = 0; idx < 256; ++idx) {
-        if (idx != 45)
-            QCOMPARE(cmap1.entryRgb(idx), cmap2.entryRgb(idx));
-        else
-            QCOMPARE(cmap2.entryRgb(45), qRgb(255, 0, 0));
-        QCOMPARE(cmap1.entryRgb(idx), cmap3.entryRgb(idx));
-    }
-
-    // Check that setting the handle will cause isEmpty() to work right.
-    ColormapExtended cmap4;
-    cmap4.setEntry(56, qRgb(255, 0, 0));
-    QVERIFY(cmap4.isEmpty());
-    QCOMPARE(cmap4.size(), 256);
-    cmap4.setHandle(Qt::HANDLE(42));
-    QCOMPARE(cmap4.handle(), Qt::HANDLE(42));
-    QVERIFY(!cmap4.isEmpty());
-    QCOMPARE(cmap4.size(), 256);
-}
-
-#ifndef GL_TEXTURE_3D
-#define GL_TEXTURE_3D 0x806F
-#endif
-
-#ifndef GL_RGB16
-#define GL_RGB16 0x8054
-#endif
-
-void tst_QGL::fboFormat()
-{
-    // Check the initial conditions.
-    QGLFramebufferObjectFormat format1;
-    QCOMPARE(format1.samples(), 0);
-    QCOMPARE(format1.attachment(), QGLFramebufferObject::NoAttachment);
-    QCOMPARE(int(format1.textureTarget()), int(GL_TEXTURE_2D));
-    int expectedFormat =
-#ifdef QT_OPENGL_ES_2
-        GL_RGBA;
-#else
-        QOpenGLContext::openGLModuleType() != QOpenGLContext::LibGL ? GL_RGBA : GL_RGBA8;
-#endif
-    QCOMPARE(int(format1.internalTextureFormat()), expectedFormat);
-
-    // Modify the values and re-check.
-    format1.setSamples(8);
-    format1.setAttachment(QGLFramebufferObject::CombinedDepthStencil);
-    format1.setTextureTarget(GL_TEXTURE_3D);
-    format1.setInternalTextureFormat(GL_RGB16);
-    QCOMPARE(format1.samples(), 8);
-    QCOMPARE(format1.attachment(), QGLFramebufferObject::CombinedDepthStencil);
-    QCOMPARE(int(format1.textureTarget()), int(GL_TEXTURE_3D));
-    QCOMPARE(int(format1.internalTextureFormat()), int(GL_RGB16));
-
-    // Make copies and check that they are the same.
-    QGLFramebufferObjectFormat format2(format1);
-    QGLFramebufferObjectFormat format3;
-    QCOMPARE(format2.samples(), 8);
-    QCOMPARE(format2.attachment(), QGLFramebufferObject::CombinedDepthStencil);
-    QCOMPARE(int(format2.textureTarget()), int(GL_TEXTURE_3D));
-    QCOMPARE(int(format2.internalTextureFormat()), int(GL_RGB16));
-    format3 = format1;
-    QCOMPARE(format3.samples(), 8);
-    QCOMPARE(format3.attachment(), QGLFramebufferObject::CombinedDepthStencil);
-    QCOMPARE(int(format3.textureTarget()), int(GL_TEXTURE_3D));
-    QCOMPARE(int(format3.internalTextureFormat()), int(GL_RGB16));
-
-    // Modify the copies and check that the original is unchanged.
-    format2.setSamples(9);
-    format3.setTextureTarget(GL_TEXTURE_2D);
-    QCOMPARE(format1.samples(), 8);
-    QCOMPARE(format1.attachment(), QGLFramebufferObject::CombinedDepthStencil);
-    QCOMPARE(int(format1.textureTarget()), int(GL_TEXTURE_3D));
-    QCOMPARE(int(format1.internalTextureFormat()), int(GL_RGB16));
-
-    // operator== and operator!= for QGLFramebufferObjectFormat.
-    QGLFramebufferObjectFormat format1c;
-    QGLFramebufferObjectFormat format2c;
-
-    QCOMPARE(format1c, format2c);
-    QVERIFY(!(format1c != format2c));
-    format1c.setSamples(8);
-    QVERIFY(!(format1c == format2c));
-    QVERIFY(format1c != format2c);
-    format2c.setSamples(8);
-    QCOMPARE(format1c, format2c);
-    QVERIFY(!(format1c != format2c));
-
-    format1c.setAttachment(QGLFramebufferObject::CombinedDepthStencil);
-    QVERIFY(!(format1c == format2c));
-    QVERIFY(format1c != format2c);
-    format2c.setAttachment(QGLFramebufferObject::CombinedDepthStencil);
-    QCOMPARE(format1c, format2c);
-    QVERIFY(!(format1c != format2c));
-
-    format1c.setTextureTarget(GL_TEXTURE_3D);
-    QVERIFY(!(format1c == format2c));
-    QVERIFY(format1c != format2c);
-    format2c.setTextureTarget(GL_TEXTURE_3D);
-    QCOMPARE(format1c, format2c);
-    QVERIFY(!(format1c != format2c));
-
-    format1c.setInternalTextureFormat(GL_RGB16);
-    QVERIFY(!(format1c == format2c));
-    QVERIFY(format1c != format2c);
-    format2c.setInternalTextureFormat(GL_RGB16);
-    QCOMPARE(format1c, format2c);
-    QVERIFY(!(format1c != format2c));
-
-    QGLFramebufferObjectFormat format3c(format1c);
-    QGLFramebufferObjectFormat format4c;
-    QCOMPARE(format1c, format3c);
-    QVERIFY(!(format1c != format3c));
-    format3c.setInternalTextureFormat(
-#ifdef QT_OPENGL_ES_2
-        GL_RGBA
-#else
-        QOpenGLContext::openGLModuleType() != QOpenGLContext::LibGL ? GL_RGBA : GL_RGBA8
-#endif
-        );
-    QVERIFY(!(format1c == format3c));
-    QVERIFY(format1c != format3c);
-
-    format4c = format1c;
-    QCOMPARE(format1c, format4c);
-    QVERIFY(!(format1c != format4c));
-    format4c.setInternalTextureFormat(
-#ifdef QT_OPENGL_ES_2
-        GL_RGBA
-#else
-        QOpenGLContext::openGLModuleType() != QOpenGLContext::LibGL ? GL_RGBA : GL_RGBA8
-#endif
-        );
-    QVERIFY(!(format1c == format4c));
-    QVERIFY(format1c != format4c);
-}
-
-void tst_QGL::testDontCrashOnDanglingResources()
-{
-    // We have a number of Q_GLOBAL_STATICS inside the Qt OpenGL
-    // module. This test is verify that we don't crash as a result of
-    // them calling into libgl on application shutdown.
-    QWidget *widget = new UnclippedWidget();
-    widget->show();
-    qApp->processEvents();
-    widget->hide();
-}
-
-class ReplaceClippingGLWidget : public QGLWidget
-{
-public:
-    void paint(QPainter *painter)
-    {
-        painter->fillRect(rect(), Qt::white);
-
-        QPainterPath path;
-        path.addRect(0, 0, 100, 100);
-        path.addRect(50, 50, 100, 100);
-
-        painter->setClipRect(0, 0, 150, 150);
-        painter->fillPath(path, Qt::red);
-
-        painter->translate(150, 150);
-        painter->setClipRect(0, 0, 150, 150);
-        painter->fillPath(path, Qt::red);
-    }
-
-protected:
-    void paintEvent(QPaintEvent*)
-    {
-        // clear the stencil with junk
-        QOpenGLFunctions *funcs = QOpenGLContext::currentContext()->functions();
-        funcs->glStencilMask(0xFFFF);
-        funcs->glClearStencil(0xFFFF);
-        funcs->glDisable(GL_STENCIL_TEST);
-        funcs->glDisable(GL_SCISSOR_TEST);
-        funcs->glClear(GL_STENCIL_BUFFER_BIT);
-
-        QPainter painter(this);
-        paint(&painter);
-    }
-};
-
-void tst_QGL::replaceClipping()
-{
-    ReplaceClippingGLWidget glw;
-    glw.resize(300, 300);
-    glw.show();
-
-    QVERIFY(QTest::qWaitForWindowExposed(&glw));
-
-    QImage reference(300, 300, QImage::Format_RGB32);
-    QPainter referencePainter(&reference);
-    glw.paint(&referencePainter);
-    referencePainter.end();
-
-#if defined(Q_OS_QNX)
-    // glReadPixels reads from the back buffer. On QNX the buffer is not preserved
-    // after a buffer swap. This is why we have to swap the buffer explicitly before calling
-    // grabFrameBuffer to retrieve the content of the front buffer
-    glw.swapBuffers();
-#endif
-    const QImage widgetFB = glw.grabFrameBuffer(false).convertToFormat(QImage::Format_RGB32);
-
-    // Sample pixels in a grid pattern which avoids false failures due to
-    // off-by-one pixel errors on some buggy GL implementations
-    for (int x = 25; x < reference.width(); x += 50) {
-        for (int y = 25; y < reference.width(); y += 50) {
-            QFUZZY_COMPARE_PIXELS(widgetFB.pixel(x, y), reference.pixel(x, y));
-        }
-    }
-}
-
-class ClipTestGLWidget : public QGLWidget
-{
-public:
-    void paint(QPainter *painter)
-    {
-        painter->fillRect(-1, -1, width()+2, height()+2, Qt::white);
-        painter->setClipRect(10, 10, width()-20, height()-20);
-        painter->fillRect(rect(), Qt::cyan);
-
-        painter->save();
-        painter->setClipRect(10, 10, 100, 100, Qt::IntersectClip);
-
-        painter->fillRect(rect(), Qt::blue);
-
-        painter->save();
-        painter->setClipRect(10, 10, 50, 50, Qt::IntersectClip);
-        painter->fillRect(rect(), Qt::red);
-        painter->restore();
-        painter->fillRect(0, 0, 40, 40, Qt::white);
-        painter->save();
-
-        painter->setClipRect(0, 0, 35, 35, Qt::IntersectClip);
-        painter->fillRect(rect(), Qt::black);
-        painter->restore();
-
-        painter->fillRect(0, 0, 30, 30, Qt::magenta);
-
-        painter->save();
-        painter->setClipRect(60, 10, 50, 50, Qt::ReplaceClip);
-        painter->fillRect(rect(), Qt::green);
-        painter->restore();
-
-        painter->restore();
-
-        painter->translate(100, 100);
-
-        {
-            QPainterPath path;
-            path.addRect(10, 10, 100, 100);
-            path.addRect(10, 10, 10, 10);
-            painter->setClipPath(path, Qt::IntersectClip);
-        }
-
-        painter->fillRect(rect(), Qt::blue);
-
-        painter->save();
-        {
-            QPainterPath path;
-            path.addRect(10, 10, 50, 50);
-            path.addRect(10, 10, 10, 10);
-            painter->setClipPath(path, Qt::IntersectClip);
-        }
-        painter->fillRect(rect(), Qt::red);
-        painter->restore();
-        painter->fillRect(0, 0, 40, 40, Qt::white);
-        painter->save();
-
-        {
-            QPainterPath path;
-            path.addRect(0, 0, 35, 35);
-            path.addRect(10, 10, 10, 10);
-            painter->setClipPath(path, Qt::IntersectClip);
-        }
-        painter->fillRect(rect(), Qt::black);
-        painter->restore();
-
-        painter->fillRect(0, 0, 30, 30, Qt::magenta);
-
-        painter->save();
-        {
-            QPainterPath path;
-            path.addRect(60, 10, 50, 50);
-            path.addRect(10, 10, 10, 10);
-            painter->setClipPath(path, Qt::ReplaceClip);
-        }
-        painter->fillRect(rect(), Qt::green);
-        painter->restore();
-    }
-
-protected:
-    void paintEvent(QPaintEvent*)
-    {
-        QPainter painter(this);
-        paint(&painter);
-    }
-};
-
-void tst_QGL::clipTest()
-{
-    ClipTestGLWidget glw;
-    glw.resize(220, 220);
-    glw.showNormal();
-
-    QVERIFY(QTest::qWaitForWindowExposed(&glw));
-
-    QImage reference(glw.size(), QImage::Format_RGB32);
-    QPainter referencePainter(&reference);
-    glw.paint(&referencePainter);
-    referencePainter.end();
-
-#if defined(Q_OS_QNX)
-    // glReadPixels reads from the back buffer. On QNX the buffer is not preserved
-    // after a buffer swap. This is why we have to swap the buffer explicitly before calling
-    // grabFrameBuffer to retrieve the content of the front buffer
-    glw.swapBuffers();
-#endif
-    const QImage widgetFB = glw.grabFrameBuffer(false).convertToFormat(QImage::Format_RGB32);
-
-    // Sample pixels in a grid pattern which avoids false failures due to
-    // off-by-one pixel errors on some buggy GL implementations
-    for (int x = 2; x < reference.width(); x += 5) {
-        for (int y = 2; y < reference.height(); y += 5) {
-            QFUZZY_COMPARE_PIXELS(widgetFB.pixel(x, y), reference.pixel(x, y));
-        }
-    }
-}
-
-void tst_QGL::destroyFBOAfterContext()
-{
-    if (!QGLFramebufferObject::hasOpenGLFramebufferObjects())
-        QSKIP("QGLFramebufferObject not supported on this platform");
-
-    QGLWidget *glw = new QGLWidget();
-    glw->makeCurrent();
-
-    // No multisample with combined depth/stencil attachment:
-    QGLFramebufferObjectFormat fboFormat;
-    fboFormat.setAttachment(QGLFramebufferObject::CombinedDepthStencil);
-
-    // Don't complicate things by using NPOT:
-    QGLFramebufferObject *fbo = new QGLFramebufferObject(256, 128, fboFormat);
-
-    // The handle should be valid until the context is destroyed.
-    QVERIFY(fbo->handle() != 0);
-    QVERIFY(fbo->isValid());
-
-    delete glw;
-
-    // The handle should now be zero.
-    QVERIFY(!fbo->handle());
-    QVERIFY(!fbo->isValid());
-
-    delete fbo;
-}
-
-#ifdef QT_BUILD_INTERNAL
-
-class tst_QGLResource
-{
-public:
-    tst_QGLResource(const QGLContext * = 0) {}
-    ~tst_QGLResource() { ++deletions; }
-
-    static int deletions;
-};
-
-int tst_QGLResource::deletions = 0;
-
-#ifdef TODO
-Q_GLOBAL_STATIC(QOpenGLContextGroupResource<tst_QGLResource>, qt_shared_test)
-#endif //TODO
-#endif // QT_BUILD_INTERNAL
-
-#ifdef QT_BUILD_INTERNAL
-void tst_QGL::shareRegister()
-{
-#ifdef TODO
-    // Create a context.
-    QGLWidget *glw1 = new QGLWidget();
-    glw1->makeCurrent();
-
-    // Nothing should be sharing with glw1's context yet.
-    QVERIFY(!glw1->isSharing());
-
-    // Create a guard for the first context.
-    QOpenGLSharedResourceGuard guard(glw1->context()->contextHandle());
-    QCOMPARE(guard.id(), 0);
-    guard.setId(3);
-    QCOMPARE(guard.id(), 3);
-
-    // Request a tst_QGLResource object for the first context.
-    tst_QGLResource *res1 = qt_shared_test()->value(glw1->context()->contextHandle());
-    QVERIFY(res1);
-    QCOMPARE(qt_shared_test()->value(glw1->context()->contextHandle()), res1);
-
-    // Create another context that shares with the first.
-    QVERIFY(!glw1->isSharing());
-    QGLWidget *glw2 = new QGLWidget(0, glw1);
-    if (!glw2->isSharing()) {
-        delete glw2;
-        delete glw1;
-        QSKIP("Context sharing is not supported");
-    }
-    QVERIFY(glw1->isSharing());
-    QVERIFY(glw1->context() != glw2->context());
-
-    // Check that the first context's resource is also on the second.
-    QCOMPARE(qt_shared_test()->value(glw1->context()), res1);
-    QCOMPARE(qt_shared_test()->value(glw2->context()), res1);
-
-    // Guard should still be the same.
-    QCOMPARE(guard.context(), glw1->context());
-    QCOMPARE(guard.id(), 3);
-
-    // Check the sharing relationships.
-    QVERIFY(QGLContext::areSharing(glw1->context(), glw1->context()));
-    QVERIFY(QGLContext::areSharing(glw2->context(), glw2->context()));
-    QVERIFY(QGLContext::areSharing(glw1->context(), glw2->context()));
-    QVERIFY(QGLContext::areSharing(glw2->context(), glw1->context()));
-    QVERIFY(!QGLContext::areSharing(0, glw2->context()));
-    QVERIFY(!QGLContext::areSharing(glw1->context(), 0));
-    QVERIFY(!QGLContext::areSharing(0, 0));
-
-    // Create a third context, not sharing with the others.
-    QGLWidget *glw3 = new QGLWidget();
-    QVERIFY(!glw3->isSharing());
-
-    // Create a guard on the standalone context.
-    QGLSharedResourceGuard guard3(glw3->context());
-    guard3.setId(5);
-
-    // Request a resource to the third context.
-    tst_QGLResource *res3 = qt_shared_test()->value(glw3->context());
-    QVERIFY(res3);
-    QCOMPARE(qt_shared_test()->value(glw1->context()), res1);
-    QCOMPARE(qt_shared_test()->value(glw2->context()), res1);
-    QCOMPARE(qt_shared_test()->value(glw3->context()), res3);
-
-    // Check the sharing relationships again.
-    QVERIFY(QGLContext::areSharing(glw1->context(), glw1->context()));
-    QVERIFY(QGLContext::areSharing(glw2->context(), glw2->context()));
-    QVERIFY(QGLContext::areSharing(glw1->context(), glw2->context()));
-    QVERIFY(QGLContext::areSharing(glw2->context(), glw1->context()));
-    QVERIFY(!QGLContext::areSharing(glw1->context(), glw3->context()));
-    QVERIFY(!QGLContext::areSharing(glw2->context(), glw3->context()));
-    QVERIFY(!QGLContext::areSharing(glw3->context(), glw1->context()));
-    QVERIFY(!QGLContext::areSharing(glw3->context(), glw2->context()));
-    QVERIFY(QGLContext::areSharing(glw3->context(), glw3->context()));
-    QVERIFY(!QGLContext::areSharing(0, glw2->context()));
-    QVERIFY(!QGLContext::areSharing(glw1->context(), 0));
-    QVERIFY(!QGLContext::areSharing(0, glw3->context()));
-    QVERIFY(!QGLContext::areSharing(glw3->context(), 0));
-    QVERIFY(!QGLContext::areSharing(0, 0));
-
-    // Shared guard should still be the same.
-    QCOMPARE(guard.context(), glw1->context());
-    QCOMPARE(guard.id(), 3);
-
-    // Delete the first context.
-    delete glw1;
-
-    // The second context should no longer register as sharing.
-    QVERIFY(!glw2->isSharing());
-
-    // The first context's resource should transfer to the second context.
-    QCOMPARE(tst_QGLResource::deletions, 0);
-    QCOMPARE(qt_shared_test()->value(glw2->context()), res1);
-    QCOMPARE(qt_shared_test()->value(glw3->context()), res3);
-
-    // Shared guard should now be the second context, with the id the same.
-    QCOMPARE(guard.context(), glw2->context());
-    QCOMPARE(guard.id(), 3);
-    QCOMPARE(guard3.context(), glw3->context());
-    QCOMPARE(guard3.id(), 5);
-
-    // Clean up and check that the resources are properly deleted.
-    delete glw2;
-    QCOMPARE(tst_QGLResource::deletions, 1);
-    delete glw3;
-    QCOMPARE(tst_QGLResource::deletions, 2);
-
-    // Guards should now be null and the id zero.
-    QVERIFY(guard.context() == 0);
-    QVERIFY(guard.id() == 0);
-    QVERIFY(guard3.context() == 0);
-    QVERIFY(guard3.id() == 0);
-#endif //TODO
-}
-#endif
-
-// Tests QGLContext::bindTexture with default options
-#ifdef QT_BUILD_INTERNAL
-void tst_QGL::qglContextDefaultBindTexture()
-{
-    QGLWidget w;
-    w.makeCurrent();
-    QGLContext *ctx = const_cast<QGLContext*>(w.context());
-
-    QImage *boundImage = new QImage(256, 256, QImage::Format_RGB32);
-    boundImage->fill(0xFFFFFFFF);
-    QPixmap *boundPixmap = new QPixmap(256, 256);
-    boundPixmap->fill(Qt::red);
-
-    int startCacheItemCount = QGLTextureCache::instance()->size();
-
-    GLuint boundImageTextureId = ctx->bindTexture(*boundImage);
-    GLuint boundPixmapTextureId = ctx->bindTexture(*boundPixmap);
-
-    // Make sure the image & pixmap have been added to the cache:
-    QCOMPARE(QGLTextureCache::instance()->size(), startCacheItemCount+2);
-
-    // Make sure the image & pixmap have the is_cached flag set:
-    QVERIFY(QImagePixmapCleanupHooks::isImageCached(*boundImage));
-    QVERIFY(QImagePixmapCleanupHooks::isPixmapCached(*boundPixmap));
-
-    QOpenGLFunctions *funcs = QOpenGLContext::currentContext()->functions();
-    // Make sure the texture IDs returned are valid:
-    QCOMPARE(funcs->glIsTexture(boundImageTextureId), GLboolean(GL_TRUE));
-    QCOMPARE(funcs->glIsTexture(boundPixmapTextureId), GLboolean(GL_TRUE));
-
-    // Make sure the textures are still valid after we delete the image/pixmap:
-    // Also check that although the textures are left intact, the cache entries are removed:
-    delete boundImage;
-    boundImage = 0;
-    QCOMPARE(funcs->glIsTexture(boundImageTextureId), GLboolean(GL_TRUE));
-    QCOMPARE(QGLTextureCache::instance()->size(), startCacheItemCount+1);
-    delete boundPixmap;
-    boundPixmap = 0;
-    QCOMPARE(funcs->glIsTexture(boundPixmapTextureId), GLboolean(GL_TRUE));
-    QCOMPARE(QGLTextureCache::instance()->size(), startCacheItemCount);
-
-    // Finally, make sure QGLContext::deleteTexture deletes the texture IDs:
-    ctx->deleteTexture(boundImageTextureId);
-    ctx->deleteTexture(boundPixmapTextureId);
-    QCOMPARE(funcs->glIsTexture(boundImageTextureId), GLboolean(GL_FALSE));
-    QCOMPARE(funcs->glIsTexture(boundPixmapTextureId), GLboolean(GL_FALSE));
-}
-#endif
-
-#ifdef QT_BUILD_INTERNAL
-void tst_QGL::textureCleanup()
-{
-    QGLWidget w;
-    w.resize(200,200);
-    w.show();
-    QVERIFY(QTest::qWaitForWindowExposed(&w));
-    w.makeCurrent();
-
-    // Test pixmaps which have been loaded via QPixmapCache are removed from the texture cache
-    // when the pixmap cache is cleared
-    {
-        int startCacheItemCount = QGLTextureCache::instance()->size();
-        QPainter p(&w);
-
-        QPixmap boundPixmap(":designer.png");
-
-        QCOMPARE(QGLTextureCache::instance()->size(), startCacheItemCount);
-
-        p.drawPixmap(0, 0, boundPixmap);
-        QCOMPARE(QGLTextureCache::instance()->size(), startCacheItemCount+1);
-
-        // Need to call end for the GL2 paint engine to release references to pixmap if using tfp
-        p.end();
-
-        QCOMPARE(QGLTextureCache::instance()->size(), startCacheItemCount+1);
-
-        // Check that the texture doesn't get removed from the cache when the pixmap is cleared
-        // as it should still be in the cache:
-        boundPixmap = QPixmap();
-        QCOMPARE(QGLTextureCache::instance()->size(), startCacheItemCount+1);
-
-        QPixmapCache::clear();
-        QCOMPARE(QGLTextureCache::instance()->size(), startCacheItemCount);
-    }
-
-    // Test pixmaps which have been loaded via QPixmapCache are removed from the texture cache
-    // when they are explicitly removed from the pixmap cache
-    {
-        int startCacheItemCount = QGLTextureCache::instance()->size();
-        QPainter p(&w);
-
-        QPixmap boundPixmap(128, 128);
-        QString cacheKey = QString::fromLatin1("myPixmap");
-        QPixmapCache::insert(cacheKey, boundPixmap);
-
-        QCOMPARE(QGLTextureCache::instance()->size(), startCacheItemCount);
-
-        p.drawPixmap(0, 0, boundPixmap);
-        QCOMPARE(QGLTextureCache::instance()->size(), startCacheItemCount+1);
-
-        // Need to call end for the GL2 paint engine to release references to pixmap if using tfp
-        p.end();
-
-        QCOMPARE(QGLTextureCache::instance()->size(), startCacheItemCount+1);
-
-        // Check that the texture doesn't get removed from the cache when the pixmap is cleared
-        // as it should still be in the cache:
-        boundPixmap = QPixmap();
-        QCOMPARE(QGLTextureCache::instance()->size(), startCacheItemCount+1);
-
-        // Finally, we check that the texture cache entry is removed when we remove the
-        // pixmap cache entry, which should hold the last reference:
-        QPixmapCache::remove(cacheKey);
-        QCOMPARE(QGLTextureCache::instance()->size(), startCacheItemCount);
-    }
-
-    // Check images & pixmaps are removed from the cache when they are deleted
-    {
-        int startCacheItemCount = QGLTextureCache::instance()->size();
-        QPainter p(&w);
-
-        QImage *boundImage = new QImage(256, 256, QImage::Format_RGB32);
-        boundImage->fill(0xFFFFFFFF);
-        QPixmap *boundPixmap = new QPixmap(256, 256);
-        boundPixmap->fill(Qt::red);
-
-        QCOMPARE(QGLTextureCache::instance()->size(), startCacheItemCount);
-
-        p.drawImage(0, 0, *boundImage);
-        QCOMPARE(QGLTextureCache::instance()->size(), startCacheItemCount+1);
-
-        p.drawPixmap(0, 0, *boundPixmap);
-        QCOMPARE(QGLTextureCache::instance()->size(), startCacheItemCount+2);
-
-        // Need to call end for the GL2 paint engine to release references to pixmap if using tfp
-        p.end();
-
-        QCOMPARE(QGLTextureCache::instance()->size(), startCacheItemCount+2);
-
-        delete boundImage;
-        boundImage = 0;
-        QCOMPARE(QGLTextureCache::instance()->size(), startCacheItemCount+1);
-
-        delete boundPixmap;
-        boundPixmap = 0;
-        QCOMPARE(QGLTextureCache::instance()->size(), startCacheItemCount);
-    }
-
-    // Check images & pixmaps are removed from the cache when they are assigned to
-    {
-        int startCacheItemCount = QGLTextureCache::instance()->size();
-        QPainter p(&w);
-
-        QImage boundImage(256, 256, QImage::Format_RGB32);
-        boundImage.fill(0xFFFFFFFF);
-        QPixmap boundPixmap(256, 256);
-        boundPixmap.fill(Qt::red);
-
-        QCOMPARE(QGLTextureCache::instance()->size(), startCacheItemCount);
-
-        p.drawImage(0, 0, boundImage);
-        QCOMPARE(QGLTextureCache::instance()->size(), startCacheItemCount+1);
-
-        p.drawPixmap(0, 0, boundPixmap);
-        QCOMPARE(QGLTextureCache::instance()->size(), startCacheItemCount+2);
-
-        // Need to call end for the GL2 paint engine to release references to pixmap if using tfp
-        p.end();
-
-        QCOMPARE(QGLTextureCache::instance()->size(), startCacheItemCount+2);
-
-        boundImage = QImage(64, 64, QImage::Format_RGB32);
-        QCOMPARE(QGLTextureCache::instance()->size(), startCacheItemCount+1);
-
-        boundPixmap = QPixmap(64, 64);
-        QCOMPARE(QGLTextureCache::instance()->size(), startCacheItemCount);
-    }
-
-    // Check images & pixmaps are removed from the cache when they are modified (detached)
-    {
-        int startCacheItemCount = QGLTextureCache::instance()->size();
-        QPainter p(&w);
-
-        QImage boundImage(256, 256, QImage::Format_RGB32);
-        boundImage.fill(0xFFFFFFFF);
-        QPixmap boundPixmap(256, 256);
-        boundPixmap.fill(Qt::red);
-
-        QCOMPARE(QGLTextureCache::instance()->size(), startCacheItemCount);
-
-        p.drawImage(0, 0, boundImage);
-        QCOMPARE(QGLTextureCache::instance()->size(), startCacheItemCount+1);
-
-        p.drawPixmap(0, 0, boundPixmap);
-        QCOMPARE(QGLTextureCache::instance()->size(), startCacheItemCount+2);
-
-        // Need to call end for the GL2 paint engine to release references to pixmap if using tfp
-        p.end();
-
-        QCOMPARE(QGLTextureCache::instance()->size(), startCacheItemCount+2);
-
-        boundImage.fill(0x00000000);
-        QCOMPARE(QGLTextureCache::instance()->size(), startCacheItemCount+1);
-
-        boundPixmap.fill(Qt::blue);
-        QCOMPARE(QGLTextureCache::instance()->size(), startCacheItemCount);
-    }
-
-    // Check that images/pixmaps aren't removed from the cache if a shallow copy has been made
-    QImage copyOfImage;
-    QPixmap copyOfPixmap;
-    int startCacheItemCount = QGLTextureCache::instance()->size();
-    {
-        QPainter p(&w);
-
-        QImage boundImage(256, 256, QImage::Format_RGB32);
-        boundImage.fill(0xFFFFFFFF);
-        QPixmap boundPixmap(256, 256);
-        boundPixmap.fill(Qt::red);
-
-        QCOMPARE(QGLTextureCache::instance()->size(), startCacheItemCount);
-
-        p.drawImage(0, 0, boundImage);
-        QCOMPARE(QGLTextureCache::instance()->size(), startCacheItemCount+1);
-
-        p.drawPixmap(0, 0, boundPixmap);
-        QCOMPARE(QGLTextureCache::instance()->size(), startCacheItemCount+2);
-
-        // Need to call end for the GL2 paint engine to release references to pixmap if using tfp
-        p.end();
-
-        copyOfImage = boundImage;
-        copyOfPixmap = boundPixmap;
-        QCOMPARE(QGLTextureCache::instance()->size(), startCacheItemCount+2);
-    } // boundImage & boundPixmap would have been deleted when they went out of scope
-    QCOMPARE(QGLTextureCache::instance()->size(), startCacheItemCount+2);
-
-    copyOfImage = QImage();
-    QCOMPARE(QGLTextureCache::instance()->size(), startCacheItemCount+1);
-
-    copyOfPixmap = QPixmap();
-    QCOMPARE(QGLTextureCache::instance()->size(), startCacheItemCount);
-}
-#endif
-
-namespace ThreadImages {
-
-class Producer : public QObject
-{
-    Q_OBJECT
-public:
-    Producer()
-    {
-        startTimer(20);
-
-        QThread *thread = new QThread;
-        thread->start();
-
-        connect(this, SIGNAL(destroyed()), thread, SLOT(quit()));
-
-        moveToThread(thread);
-        connect(thread, SIGNAL(finished()), thread, SLOT(deleteLater()));
-    }
-
-signals:
-    void imageReady(const QImage &image);
-
-protected:
-    void timerEvent(QTimerEvent *)
-    {
-        QImage image(256, 256, QImage::Format_RGB32);
-        QLinearGradient g(0, 0, 0, 256);
-        g.setColorAt(0, QColor(255, 180, 180));
-        g.setColorAt(1, Qt::white);
-        g.setSpread(QGradient::ReflectSpread);
-
-        QBrush brush(g);
-        brush.setTransform(QTransform::fromTranslate(0, delta));
-        delta += 10;
-
-        QPainter p(&image);
-        p.fillRect(image.rect(), brush);
-
-        if (images.size() > 10)
-            images.removeFirst();
-
-        images.append(image);
-
-        emit imageReady(image);
-    }
-
-private:
-    QList<QImage> images;
-    int delta;
-};
-
-
-class DisplayWidget : public QGLWidget
-{
-    Q_OBJECT
-public:
-    DisplayWidget(QWidget *parent) : QGLWidget(parent) {}
-    void paintEvent(QPaintEvent *)
-    {
-        QPainter p(this);
-        p.drawImage(rect(), m_image);
-    }
-
-public slots:
-    void setImage(const QImage &image)
-    {
-        m_image = image;
-        update();
-    }
-
-private:
-    QImage m_image;
-};
-
-class Widget : public QWidget
-{
-    Q_OBJECT
-public:
-    Widget()
-        : iterations(0)
-        , display(0)
-        , producer(new Producer)
-    {
-        startTimer(400);
-        connect(this, SIGNAL(destroyed()), producer, SLOT(deleteLater()));
-    }
-
-    int iterations;
-
-protected:
-    void timerEvent(QTimerEvent *)
-    {
-        ++iterations;
-
-        delete display;
-        display = new DisplayWidget(this);
-        connect(producer, SIGNAL(imageReady(QImage)), display, SLOT(setImage(QImage)));
-
-        display->setGeometry(rect());
-        display->show();
-    }
-
-private:
-    DisplayWidget *display;
-    Producer *producer;
-};
-
-}
-
-void tst_QGL::threadImages()
-{
-    ThreadImages::Widget *widget = new ThreadImages::Widget;
-    widget->show();
-
-    while (widget->iterations <= 5) {
-        qApp->processEvents();
-    }
-
-    delete widget;
-}
-
-void tst_QGL::nullRectCrash()
-{
-    if (!QGLFramebufferObject::hasOpenGLFramebufferObjects())
-        QSKIP("QGLFramebufferObject not supported on this platform");
-
-    QGLWidget glw;
-    glw.makeCurrent();
-
-    QGLFramebufferObjectFormat fboFormat;
-    fboFormat.setAttachment(QGLFramebufferObject::CombinedDepthStencil);
-
-    QGLFramebufferObject *fbo = new QGLFramebufferObject(128, 128, fboFormat);
-
-    QPainter fboPainter(fbo);
-
-    fboPainter.setPen(QPen(QColor(255, 127, 127, 127), 2));
-    fboPainter.setBrush(QColor(127, 255, 127, 127));
-    fboPainter.drawRect(QRectF());
-
-    fboPainter.end();
-}
-
-void tst_QGL::extensions()
-{
-    QGLWidget glw;
-    glw.makeCurrent();
-
-    QOpenGLContext *ctx = QOpenGLContext::currentContext();
-    QVERIFY(ctx);
-    QOpenGLFunctions *funcs = ctx->functions();
-    QVERIFY(funcs);
-    QSurfaceFormat format = ctx->format();
-
-#ifdef QT_BUILD_INTERNAL
-    QOpenGLExtensions *exts = static_cast<QOpenGLExtensions *>(funcs);
-    QOpenGLExtensions::OpenGLExtensions allExts = exts->openGLExtensions();
-    // Mipmapping is always available in GL2/GLES2+. Verify this.
-    if (format.majorVersion() >= 2)
-        QVERIFY(allExts.testFlag(QOpenGLExtensions::GenerateMipmap));
-#endif
-
-    // Now look for some features should always be available in a given version.
-    QOpenGLFunctions::OpenGLFeatures allFeatures = funcs->openGLFeatures();
-    QVERIFY(allFeatures.testFlag(QOpenGLFunctions::Multitexture));
-    if (format.majorVersion() >= 2) {
-        QVERIFY(allFeatures.testFlag(QOpenGLFunctions::Shaders));
-        QVERIFY(allFeatures.testFlag(QOpenGLFunctions::Buffers));
-        QVERIFY(allFeatures.testFlag(QOpenGLFunctions::Multisample));
-        QVERIFY(!ctx->isOpenGLES() || allFeatures.testFlag(QOpenGLFunctions::Framebuffers));
-        QVERIFY(allFeatures.testFlag(QOpenGLFunctions::NPOTTextures)
-                && allFeatures.testFlag(QOpenGLFunctions::NPOTTextureRepeat));
-        if (ctx->isOpenGLES()) {
-            QVERIFY(!allFeatures.testFlag(QOpenGLFunctions::FixedFunctionPipeline));
-            QVERIFY(allFeatures.testFlag(QOpenGLFunctions::Framebuffers));
-        }
-    }
-    if (format.majorVersion() >= 3)
-        QVERIFY(allFeatures.testFlag(QOpenGLFunctions::Framebuffers));
-}
-
-QTEST_MAIN(tst_QGL)
-#include "tst_qgl.moc"
diff --git a/tests/auto/opengl/qglbuffer/qglbuffer.pro b/tests/auto/opengl/qglbuffer/qglbuffer.pro
deleted file mode 100644
index f12a191f79..0000000000
--- a/tests/auto/opengl/qglbuffer/qglbuffer.pro
+++ /dev/null
@@ -1,10 +0,0 @@
-############################################################
-# Project file for autotest for file qglbuffer.h
-############################################################
-
-CONFIG += testcase
-TARGET = tst_qglbuffer
-requires(qtHaveModule(opengl))
-QT += opengl widgets testlib
-
-SOURCES += tst_qglbuffer.cpp
diff --git a/tests/auto/opengl/qglbuffer/tst_qglbuffer.cpp b/tests/auto/opengl/qglbuffer/tst_qglbuffer.cpp
deleted file mode 100644
index c7d26e757f..0000000000
--- a/tests/auto/opengl/qglbuffer/tst_qglbuffer.cpp
+++ /dev/null
@@ -1,257 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtOpenGL module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <QtTest/QtTest>
-#include <QtOpenGL/qgl.h>
-#include <QtOpenGL/qglbuffer.h>
-
-class tst_QGLBuffer : public QObject
-{
-    Q_OBJECT
-public:
-    tst_QGLBuffer() {}
-    ~tst_QGLBuffer() {}
-
-private slots:
-    void vertexBuffer_data();
-    void vertexBuffer();
-    void indexBuffer_data();
-    void indexBuffer();
-    void bufferSharing();
-
-private:
-    void testBuffer(QGLBuffer::Type type);
-};
-
-void tst_QGLBuffer::vertexBuffer_data()
-{
-    QTest::addColumn<int>("usagePattern");
-
-    QTest::newRow("StreamDraw") << int(QGLBuffer::StreamDraw);
-    QTest::newRow("StaticDraw") << int(QGLBuffer::StaticDraw);
-    QTest::newRow("DynamicDraw") << int(QGLBuffer::DynamicDraw);
-}
-
-void tst_QGLBuffer::vertexBuffer()
-{
-    testBuffer(QGLBuffer::VertexBuffer);
-}
-
-void tst_QGLBuffer::indexBuffer_data()
-{
-    vertexBuffer_data();
-}
-
-void tst_QGLBuffer::indexBuffer()
-{
-    testBuffer(QGLBuffer::IndexBuffer);
-}
-
-void tst_QGLBuffer::testBuffer(QGLBuffer::Type type)
-{
-    QFETCH(int, usagePattern);
-
-    QGLWidget w;
-    w.makeCurrent();
-
-    // Create the local object, but not the buffer in the server.
-    QGLBuffer buffer(type);
-    QCOMPARE(buffer.usagePattern(), QGLBuffer::StaticDraw);
-    buffer.setUsagePattern(QGLBuffer::UsagePattern(usagePattern));
-
-    // Check the initial state.
-    QCOMPARE(buffer.type(), type);
-    QVERIFY(!buffer.isCreated());
-    QCOMPARE(buffer.bufferId(), GLuint(0));
-    QCOMPARE(buffer.usagePattern(), QGLBuffer::UsagePattern(usagePattern));
-    QCOMPARE(buffer.size(), -1);
-
-    // Should not be able to bind it yet because it isn't created.
-    QVERIFY(!buffer.bind());
-
-    // Create the buffer - if this fails, then assume that the
-    // GL implementation does not support buffers at all.
-    if (!buffer.create())
-        QSKIP("Buffers are not supported on this platform");
-
-    // Should now have a buffer id.
-    QVERIFY(buffer.bufferId() != 0);
-
-    // Bind the buffer and upload some data.
-    QVERIFY(buffer.bind());
-    static GLfloat const data[] = {1, 2, 3, 4, 5, 6, 7, 8, 9};
-    buffer.allocate(data, sizeof(data));
-
-    // Check the buffer size.
-    QCOMPARE(buffer.size(), int(sizeof(data)));
-
-    // Map the buffer and read back its contents.
-    bool haveMap = false;
-    GLfloat *mapped = reinterpret_cast<GLfloat *>
-        (buffer.map(QGLBuffer::ReadOnly));
-    if (mapped) {
-        for (int index = 0; index < 9; ++index)
-            QCOMPARE(mapped[index], data[index]);
-        buffer.unmap();
-        haveMap = true;
-    } else {
-        qWarning("QGLBuffer::map() is not supported on this platform");
-    }
-
-    // Read back the buffer contents using read().
-    bool haveRead = false;
-    GLfloat readdata[9];
-    if (buffer.read(0, readdata, sizeof(readdata))) {
-        for (int index = 0; index < 9; ++index)
-            QCOMPARE(readdata[index], data[index]);
-        haveRead = true;
-    } else {
-        qWarning("QGLBuffer::read() is not supported on this platform");
-    }
-
-    // Write some different data to a specific location and check it.
-    static GLfloat const diffdata[] = {11, 12, 13};
-    buffer.write(sizeof(GLfloat) * 3, diffdata, sizeof(diffdata));
-    if (haveMap) {
-        mapped = reinterpret_cast<GLfloat *>(buffer.map(QGLBuffer::ReadOnly));
-        QVERIFY(mapped != 0);
-        for (int index = 0; index < 9; ++index) {
-            if (index >= 3 && index <= 5)
-                QCOMPARE(mapped[index], diffdata[index - 3]);
-            else
-                QCOMPARE(mapped[index], data[index]);
-        }
-        buffer.unmap();
-    }
-    if (haveRead) {
-        QVERIFY(buffer.read(0, readdata, sizeof(readdata)));
-        for (int index = 0; index < 9; ++index) {
-            if (index >= 3 && index <= 5)
-                QCOMPARE(readdata[index], diffdata[index - 3]);
-            else
-                QCOMPARE(readdata[index], data[index]);
-        }
-    }
-
-    // Write to the buffer using the return value from map.
-    if (haveMap) {
-        mapped = reinterpret_cast<GLfloat *>(buffer.map(QGLBuffer::WriteOnly));
-        QVERIFY(mapped != 0);
-        mapped[6] = 14;
-        buffer.unmap();
-
-        mapped = reinterpret_cast<GLfloat *>(buffer.map(QGLBuffer::ReadOnly));
-        QVERIFY(mapped != 0);
-        static GLfloat const diff2data[] = {11, 12, 13, 14};
-        for (int index = 0; index < 9; ++index) {
-            if (index >= 3 && index <= 6)
-                QCOMPARE(mapped[index], diff2data[index - 3]);
-            else
-                QCOMPARE(mapped[index], data[index]);
-        }
-        buffer.unmap();
-    }
-
-    // Resize the buffer.
-    buffer.allocate(sizeof(GLfloat) * 20);
-    QCOMPARE(buffer.size(), int(sizeof(GLfloat) * 20));
-    buffer.allocate(0, sizeof(GLfloat) * 32);
-    QCOMPARE(buffer.size(), int(sizeof(GLfloat) * 32));
-
-    // Release the buffer.
-    buffer.release();
-}
-
-void tst_QGLBuffer::bufferSharing()
-{
-#if defined(Q_OS_WIN)
-    // Needs investigation on Windows: QTBUG-29692
-    QSKIP("Unreproducible timeout on Windows (MSVC/MinGW) CI bots");
-#endif
-
-#if defined(Q_OS_QNX)
-    QSKIP("Crashes on QNX when destroying the second QGLWidget (see QTBUG-38275)");
-#endif
-
-    QGLWidget *w1 = new QGLWidget();
-    w1->makeCurrent();
-
-    QGLWidget *w2 = new QGLWidget(0, w1);
-    if (!w2->isSharing()) {
-        delete w2;
-        delete w1;
-        QSKIP("Context sharing is not supported on this platform");
-    }
-
-    // Bind the buffer in the first context and write some data to it.
-    QGLBuffer buffer(QGLBuffer::VertexBuffer);
-    if (!buffer.create())
-        QSKIP("Buffers are not supported on this platform");
-    QVERIFY(buffer.isCreated());
-    QVERIFY(buffer.bind());
-    static GLfloat const data[] = {1, 2, 3, 4, 5, 6, 7, 8, 9};
-    buffer.allocate(data, sizeof(data));
-    QCOMPARE(buffer.size(), int(sizeof(data)));
-    buffer.release();
-
-    // Bind the buffer in the second context and read back the data.
-    w2->makeCurrent();
-    QVERIFY(buffer.bind());
-    QCOMPARE(buffer.size(), int(sizeof(data)));
-    GLfloat readdata[9];
-    if (buffer.read(0, readdata, sizeof(readdata))) {
-        for (int index = 0; index < 9; ++index)
-            QCOMPARE(readdata[index], data[index]);
-    }
-    buffer.release();
-
-    // Delete the first context.
-    delete w1;
-
-    // Make the second context current again because deleting the first
-    // one will call doneCurrent() even though it wasn't current!
-    w2->makeCurrent();
-
-    // The buffer should still be valid in the second context.
-    QVERIFY(buffer.bufferId() != 0);
-    QVERIFY(buffer.isCreated());
-    QVERIFY(buffer.bind());
-    QCOMPARE(buffer.size(), int(sizeof(data)));
-    buffer.release();
-
-    // Delete the second context.
-    delete w2;
-
-    // The buffer should now be invalid.
-    QCOMPARE(buffer.bufferId(), GLuint(0));
-    QVERIFY(!buffer.isCreated());
-}
-
-QTEST_MAIN(tst_QGLBuffer)
-
-#include "tst_qglbuffer.moc"
diff --git a/tests/auto/opengl/qglfunctions/qglfunctions.pro b/tests/auto/opengl/qglfunctions/qglfunctions.pro
deleted file mode 100644
index 9b349eaf34..0000000000
--- a/tests/auto/opengl/qglfunctions/qglfunctions.pro
+++ /dev/null
@@ -1,6 +0,0 @@
-CONFIG += testcase
-TARGET = tst_qglfunctions
-requires(qtHaveModule(opengl))
-QT += opengl widgets testlib
-
-SOURCES += tst_qglfunctions.cpp
diff --git a/tests/auto/opengl/qglfunctions/tst_qglfunctions.cpp b/tests/auto/opengl/qglfunctions/tst_qglfunctions.cpp
deleted file mode 100644
index 93d06659c9..0000000000
--- a/tests/auto/opengl/qglfunctions/tst_qglfunctions.cpp
+++ /dev/null
@@ -1,233 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtOpenGL module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <QtTest/QtTest>
-#include <QtOpenGL/qglfunctions.h>
-
-class tst_QGLFunctions : public QObject
-{
-    Q_OBJECT
-public:
-    tst_QGLFunctions() {}
-    ~tst_QGLFunctions() {}
-
-private slots:
-    void features();
-    void multitexture();
-    void blendColor();
-
-private:
-    static bool hasExtension(const char *name);
-};
-
-bool tst_QGLFunctions::hasExtension(const char *name)
-{
-    QString extensions =
-        QString::fromLatin1
-            (reinterpret_cast<const char *>(QOpenGLContext::currentContext()->functions()->glGetString(GL_EXTENSIONS)));
-    return extensions.split(QLatin1Char(' ')).contains
-        (QString::fromLatin1(name));
-}
-
-// Check that the reported features are consistent with the platform.
-void tst_QGLFunctions::features()
-{
-    // Before being associated with a context, there should be
-    // no features enabled.
-    QGLFunctions funcs;
-    QVERIFY(!funcs.openGLFeatures());
-    QVERIFY(!funcs.hasOpenGLFeature(QGLFunctions::Multitexture));
-    QVERIFY(!funcs.hasOpenGLFeature(QGLFunctions::Shaders));
-    QVERIFY(!funcs.hasOpenGLFeature(QGLFunctions::Buffers));
-    QVERIFY(!funcs.hasOpenGLFeature(QGLFunctions::Framebuffers));
-    QVERIFY(!funcs.hasOpenGLFeature(QGLFunctions::BlendColor));
-    QVERIFY(!funcs.hasOpenGLFeature(QGLFunctions::BlendEquation));
-    QVERIFY(!funcs.hasOpenGLFeature(QGLFunctions::BlendEquationSeparate));
-    QVERIFY(!funcs.hasOpenGLFeature(QGLFunctions::BlendFuncSeparate));
-    QVERIFY(!funcs.hasOpenGLFeature(QGLFunctions::BlendSubtract));
-    QVERIFY(!funcs.hasOpenGLFeature(QGLFunctions::CompressedTextures));
-    QVERIFY(!funcs.hasOpenGLFeature(QGLFunctions::Multisample));
-    QVERIFY(!funcs.hasOpenGLFeature(QGLFunctions::StencilSeparate));
-    QVERIFY(!funcs.hasOpenGLFeature(QGLFunctions::NPOTTextures));
-
-    // Make a context current.
-    QGLWidget glw;
-    if (!glw.isValid())
-        QSKIP("Could not create a GL context");
-    glw.makeCurrent();
-    funcs.initializeGLFunctions();
-
-    // Validate the features against what we expect for this platform.
-    if (QOpenGLContext::currentContext()->isOpenGLES()) {
-#if !defined(QT_OPENGL_ES) || defined(QT_OPENGL_ES_2)
-        QGLFunctions::OpenGLFeatures allFeatures =
-            (QGLFunctions::Multitexture |
-             QGLFunctions::Shaders |
-             QGLFunctions::Buffers |
-             QGLFunctions::Framebuffers |
-             QGLFunctions::BlendColor |
-             QGLFunctions::BlendEquation |
-             QGLFunctions::BlendEquationSeparate |
-             QGLFunctions::BlendFuncSeparate |
-             QGLFunctions::BlendSubtract |
-             QGLFunctions::CompressedTextures |
-             QGLFunctions::Multisample |
-             QGLFunctions::StencilSeparate |
-             QGLFunctions::NPOTTextures);
-        QVERIFY((funcs.openGLFeatures() & allFeatures) == allFeatures);
-        QVERIFY(funcs.hasOpenGLFeature(QGLFunctions::Multitexture));
-        QVERIFY(funcs.hasOpenGLFeature(QGLFunctions::Shaders));
-        QVERIFY(funcs.hasOpenGLFeature(QGLFunctions::Buffers));
-        QVERIFY(funcs.hasOpenGLFeature(QGLFunctions::Framebuffers));
-        QVERIFY(funcs.hasOpenGLFeature(QGLFunctions::BlendColor));
-        QVERIFY(funcs.hasOpenGLFeature(QGLFunctions::BlendEquation));
-        QVERIFY(funcs.hasOpenGLFeature(QGLFunctions::BlendEquationSeparate));
-        QVERIFY(funcs.hasOpenGLFeature(QGLFunctions::BlendFuncSeparate));
-        QVERIFY(funcs.hasOpenGLFeature(QGLFunctions::BlendSubtract));
-        QVERIFY(funcs.hasOpenGLFeature(QGLFunctions::CompressedTextures));
-        QVERIFY(funcs.hasOpenGLFeature(QGLFunctions::Multisample));
-        QVERIFY(funcs.hasOpenGLFeature(QGLFunctions::StencilSeparate));
-        QVERIFY(funcs.hasOpenGLFeature(QGLFunctions::NPOTTextures));
-#elif defined(QT_OPENGL_ES) && !defined(QT_OPENGL_ES_2)
-        QVERIFY(funcs.hasOpenGLFeature(QGLFunctions::Multitexture));
-        QVERIFY(funcs.hasOpenGLFeature(QGLFunctions::Buffers));
-        QVERIFY(funcs.hasOpenGLFeature(QGLFunctions::CompressedTextures));
-        QVERIFY(funcs.hasOpenGLFeature(QGLFunctions::Multisample));
-
-        QVERIFY(!funcs.hasOpenGLFeature(QGLFunctions::Shaders));
-        QVERIFY(!funcs.hasOpenGLFeature(QGLFunctions::BlendColor));
-        QVERIFY(!funcs.hasOpenGLFeature(QGLFunctions::StencilSeparate));
-
-        QCOMPARE(funcs.hasOpenGLFeature(QGLFunctions::Framebuffers),
-                 hasExtension("GL_OES_framebuffer_object"));
-        QCOMPARE(funcs.hasOpenGLFeature(QGLFunctions::BlendEquationSeparate),
-                 hasExtension("GL_OES_blend_equation_separate"));
-        QCOMPARE(funcs.hasOpenGLFeature(QGLFunctions::BlendFuncSeparate),
-                 hasExtension("GL_OES_blend_func_separate"));
-        QCOMPARE(funcs.hasOpenGLFeature(QGLFunctions::BlendSubtract),
-                 hasExtension("GL_OES_blend_subtract"));
-        QCOMPARE(funcs.hasOpenGLFeature(QGLFunctions::NPOTTextures),
-                 hasExtension("GL_OES_texture_npot"));
-#endif
-    } else {
-        // We check for both the extension name and the minimum OpenGL version
-        // for the feature.  This will help us catch situations where a platform
-        // doesn't list an extension by name but does have the feature by virtue
-        // of its version number.
-        QGLFormat::OpenGLVersionFlags versions = QGLFormat::openGLVersionFlags();
-        QCOMPARE(funcs.hasOpenGLFeature(QGLFunctions::Multitexture),
-                 hasExtension("GL_ARB_multitexture") ||
-                 (versions & QGLFormat::OpenGL_Version_1_3) != 0);
-        QCOMPARE(funcs.hasOpenGLFeature(QGLFunctions::Shaders),
-                 hasExtension("GL_ARB_shader_objects") ||
-                 (versions & QGLFormat::OpenGL_Version_2_0) != 0);
-        QCOMPARE(funcs.hasOpenGLFeature(QGLFunctions::Buffers),
-                 (versions & QGLFormat::OpenGL_Version_1_5) != 0);
-        QCOMPARE(funcs.hasOpenGLFeature(QGLFunctions::Framebuffers),
-                 hasExtension("GL_EXT_framebuffer_object") ||
-                 hasExtension("GL_ARB_framebuffer_object"));
-        QCOMPARE(funcs.hasOpenGLFeature(QGLFunctions::BlendColor),
-                 hasExtension("GL_EXT_blend_color") ||
-                 (versions & QGLFormat::OpenGL_Version_1_2) != 0);
-        QCOMPARE(funcs.hasOpenGLFeature(QGLFunctions::BlendEquation),
-                 (versions & QGLFormat::OpenGL_Version_1_2) != 0);
-        QCOMPARE(funcs.hasOpenGLFeature(QGLFunctions::BlendEquationSeparate),
-                 hasExtension("GL_EXT_blend_equation_separate") ||
-                 (versions & QGLFormat::OpenGL_Version_2_0) != 0);
-        QCOMPARE(funcs.hasOpenGLFeature(QGLFunctions::BlendFuncSeparate),
-                 hasExtension("GL_EXT_blend_func_separate") ||
-                 (versions & QGLFormat::OpenGL_Version_1_4) != 0);
-        QCOMPARE(funcs.hasOpenGLFeature(QGLFunctions::BlendSubtract),
-                 hasExtension("GL_EXT_blend_subtract"));
-        QCOMPARE(funcs.hasOpenGLFeature(QGLFunctions::CompressedTextures),
-                 hasExtension("GL_ARB_texture_compression") ||
-                 (versions & QGLFormat::OpenGL_Version_1_3) != 0);
-        QCOMPARE(funcs.hasOpenGLFeature(QGLFunctions::Multisample),
-                 hasExtension("GL_ARB_multisample") ||
-                 (versions & QGLFormat::OpenGL_Version_1_3) != 0);
-        QCOMPARE(funcs.hasOpenGLFeature(QGLFunctions::StencilSeparate),
-                 (versions & QGLFormat::OpenGL_Version_2_0) != 0);
-        QCOMPARE(funcs.hasOpenGLFeature(QGLFunctions::NPOTTextures),
-                 hasExtension("GL_ARB_texture_non_power_of_two") ||
-                 (versions & QGLFormat::OpenGL_Version_2_0) != 0);
-    }
-}
-
-// Verify that the multitexture functions appear to resolve and work.
-void tst_QGLFunctions::multitexture()
-{
-    QOpenGLFunctions funcs;
-    QGLWidget glw;
-    if (!glw.isValid())
-        QSKIP("Could not create a GL context");
-    glw.makeCurrent();
-    funcs.initializeOpenGLFunctions();
-
-    if (!funcs.hasOpenGLFeature(QOpenGLFunctions::Multitexture))
-        QSKIP("Multitexture functions are not supported");
-
-    funcs.glActiveTexture(GL_TEXTURE1);
-
-    GLint active = 0;
-    funcs.glGetIntegerv(GL_ACTIVE_TEXTURE, &active);
-    QCOMPARE(active, GL_TEXTURE1);
-
-    funcs.glActiveTexture(GL_TEXTURE0);
-
-    active = 0;
-    funcs.glGetIntegerv(GL_ACTIVE_TEXTURE, &active);
-    QCOMPARE(active, GL_TEXTURE0);
-}
-
-// Verify that the glBlendColor() function appears to resolve and work.
-void tst_QGLFunctions::blendColor()
-{
-    QOpenGLFunctions funcs;
-    QGLWidget glw;
-    if (!glw.isValid())
-        QSKIP("Could not create a GL context");
-    glw.makeCurrent();
-    funcs.initializeOpenGLFunctions();
-
-    if (!funcs.hasOpenGLFeature(QOpenGLFunctions::BlendColor))
-        QSKIP("glBlendColor() is not supported");
-
-    funcs.glBlendColor(0.0f, 1.0f, 0.0f, 1.0f);
-
-    GLfloat colors[4] = {0.5f, 0.5f, 0.5f, 0.5f};
-    funcs.glGetFloatv(GL_BLEND_COLOR, colors);
-
-    QCOMPARE(colors[0], 0.0f);
-    QCOMPARE(colors[1], 1.0f);
-    QCOMPARE(colors[2], 0.0f);
-    QCOMPARE(colors[3], 1.0f);
-}
-
-QTEST_MAIN(tst_QGLFunctions)
-
-#include "tst_qglfunctions.moc"
diff --git a/tests/auto/opengl/qglthreads/qglthreads.pro b/tests/auto/opengl/qglthreads/qglthreads.pro
deleted file mode 100644
index 9aa21fb3a2..0000000000
--- a/tests/auto/opengl/qglthreads/qglthreads.pro
+++ /dev/null
@@ -1,7 +0,0 @@
-CONFIG += testcase
-TARGET = tst_qglthreads
-requires(qtHaveModule(opengl))
-QT += opengl widgets testlib gui-private core-private
-
-HEADERS += tst_qglthreads.h
-SOURCES += tst_qglthreads.cpp
diff --git a/tests/auto/opengl/qglthreads/tst_qglthreads.cpp b/tests/auto/opengl/qglthreads/tst_qglthreads.cpp
deleted file mode 100644
index e12f6d9c18..0000000000
--- a/tests/auto/opengl/qglthreads/tst_qglthreads.cpp
+++ /dev/null
@@ -1,687 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <QtTest/QtTest>
-#include <QtCore/QtCore>
-#include <QtGui/QtGui>
-#include <private/qguiapplication_p.h>
-#include <qpa/qplatformintegration.h>
-#include <QtWidgets/QApplication>
-#include <QtOpenGL/QtOpenGL>
-#include <qelapsedtimer.h>
-#include "tst_qglthreads.h"
-
-#ifndef QT_OPENGL_ES_2
-#include <QtGui/QOpenGLFunctions_1_0>
-#endif
-
-#define RUNNING_TIME 5000
-
-tst_QGLThreads::tst_QGLThreads(QObject *parent)
-    : QObject(parent)
-{
-}
-
-/*
-
-   swapInThread
-
-   The purpose of this testcase is to verify that it is possible to do rendering into
-   a GL context from the GUI thread, then swap the contents in from a background thread.
-
-   The usecase for this is to have the background thread do the waiting for vertical
-   sync while the GUI thread is idle.
-
-   Currently the locking is handled directly in the paintEvent(). For the actual usecase
-   in Qt, the locking is done in the windowsurface before starting any drawing while
-   unlocking is done after all drawing has been done.
- */
-
-
-class SwapThread : public QThread
-{
-    Q_OBJECT
-public:
-    SwapThread(QGLWidget *widget)
-        : m_context(widget->context())
-        , m_swapTriggered(false)
-    {
-        moveToThread(this);
-    }
-
-    void run() {
-        QElapsedTimer timer;
-        timer.start();
-        while (timer.elapsed() < RUNNING_TIME) {
-            lock();
-            waitForReadyToSwap();
-
-            m_context->makeCurrent();
-            m_context->swapBuffers();
-            m_context->doneCurrent();
-
-            m_context->moveToThread(qApp->thread());
-
-            signalSwapDone();
-            unlock();
-        }
-
-        m_swapTriggered = false;
-    }
-
-    void lock() { m_mutex.lock(); }
-    void unlock() { m_mutex.unlock(); }
-
-    void waitForSwapDone() { if (m_swapTriggered) m_swapDone.wait(&m_mutex); }
-    void waitForReadyToSwap() { if (!m_swapTriggered) m_readyToSwap.wait(&m_mutex); }
-
-    void signalReadyToSwap()
-    {
-        if (!isRunning())
-            return;
-        m_readyToSwap.wakeAll();
-        m_swapTriggered = true;
-    }
-
-    void signalSwapDone()
-    {
-        m_swapTriggered = false;
-        m_swapDone.wakeAll();
-    }
-
-private:
-    QGLContext *m_context;
-    QMutex m_mutex;
-    QWaitCondition m_readyToSwap;
-    QWaitCondition m_swapDone;
-
-    bool m_swapTriggered;
-};
-
-class ForegroundWidget : public QGLWidget
-{
-public:
-    ForegroundWidget(const QGLFormat &format)
-        : QGLWidget(format), m_thread(0)
-    {
-        setAutoBufferSwap(false);
-    }
-
-    void resizeEvent(QResizeEvent *e)
-    {
-        m_thread->lock();
-        QGLWidget::resizeEvent(e);
-        m_thread->unlock();
-    }
-
-    void paintEvent(QPaintEvent *)
-    {
-        m_thread->lock();
-        m_thread->waitForSwapDone();
-
-        makeCurrent();
-        QPainter p(this);
-        p.fillRect(rect(), QColor(QRandomGenerator::global()->bounded(256), QRandomGenerator::global()->bounded(256), QRandomGenerator::global()->bounded(256)));
-        p.setPen(Qt::red);
-        p.setFont(QFont("SansSerif", 24));
-        p.drawText(rect(), Qt::AlignCenter, "This is an autotest");
-        p.end();
-        doneCurrent();
-
-        if (m_thread->isRunning()) {
-            context()->moveToThread(m_thread);
-            m_thread->signalReadyToSwap();
-        }
-
-        m_thread->unlock();
-
-        update();
-    }
-
-    void setThread(SwapThread *thread) {
-        m_thread = thread;
-    }
-
-    SwapThread *m_thread;
-};
-
-void tst_QGLThreads::swapInThread()
-{
-    if (!QGuiApplicationPrivate::platformIntegration()->hasCapability(QPlatformIntegration::ThreadedOpenGL))
-        QSKIP("No platformsupport for ThreadedOpenGL");
-    QGLFormat format;
-    format.setSwapInterval(1);
-    ForegroundWidget widget(format);
-    SwapThread thread(&widget);
-    widget.setThread(&thread);
-    widget.show();
-
-    QVERIFY(QTest::qWaitForWindowExposed(&widget));
-    thread.start();
-
-    while (thread.isRunning()) {
-        qApp->processEvents();
-    }
-
-    widget.hide();
-
-    QVERIFY(true);
-}
-
-/*
-   renderInThread
-
-   This test sets up a scene and renders it in a different thread.
-   For simplicity, the scene is simply a bunch of rectangles, but
-   if that works, we're in good shape..
- */
-
-static inline float qrandom() { return (QRandomGenerator::global()->bounded(100)) / 100.f; }
-
-void renderAScene(int w, int h)
-{
-    QOpenGLFunctions *funcs = QOpenGLContext::currentContext()->functions();
-
-    if (QOpenGLContext::currentContext()->isOpenGLES()) {
-        Q_UNUSED(w);
-        Q_UNUSED(h);
-        QGLShaderProgram program;
-        program.addShaderFromSourceCode(QGLShader::Vertex, "attribute highp vec2 pos; void main() { gl_Position = vec4(pos.xy, 1.0, 1.0); }");
-        program.addShaderFromSourceCode(QGLShader::Fragment, "uniform lowp vec4 color; void main() { gl_FragColor = color; }");
-        program.bindAttributeLocation("pos", 0);
-        program.bind();
-
-        funcs->glEnableVertexAttribArray(0);
-
-        for (int i=0; i<1000; ++i) {
-            GLfloat pos[] = {
-                (QRandomGenerator::global()->bounded(100)) / 100.f,
-                (QRandomGenerator::global()->bounded(100)) / 100.f,
-                (QRandomGenerator::global()->bounded(100)) / 100.f,
-                (QRandomGenerator::global()->bounded(100)) / 100.f,
-                (QRandomGenerator::global()->bounded(100)) / 100.f,
-                (QRandomGenerator::global()->bounded(100)) / 100.f
-            };
-
-            funcs->glVertexAttribPointer(0, 2, GL_FLOAT, GL_FALSE, 0, pos);
-            funcs->glDrawArrays(GL_TRIANGLE_STRIP, 0, 3);
-        }
-    } else {
-#ifndef QT_OPENGL_ES_2
-        QOpenGLFunctions_1_0 *gl1funcs = QOpenGLContext::currentContext()->versionFunctions<QOpenGLFunctions_1_0>();
-        gl1funcs->initializeOpenGLFunctions();
-
-        gl1funcs->glViewport(0, 0, w, h);
-
-        gl1funcs->glMatrixMode(GL_PROJECTION);
-        gl1funcs->glLoadIdentity();
-        gl1funcs->glFrustum(0, w, h, 0, 1, 100);
-        gl1funcs->glTranslated(0, 0, -1);
-
-        gl1funcs->glMatrixMode(GL_MODELVIEW);
-        gl1funcs->glLoadIdentity();
-
-        for (int i=0;i<1000; ++i) {
-            gl1funcs->glBegin(GL_TRIANGLES);
-            gl1funcs->glColor3f(qrandom(), qrandom(), qrandom());
-            gl1funcs->glVertex2f(qrandom() * w, qrandom() * h);
-            gl1funcs->glColor3f(qrandom(), qrandom(), qrandom());
-            gl1funcs->glVertex2f(qrandom() * w, qrandom() * h);
-            gl1funcs->glColor3f(qrandom(), qrandom(), qrandom());
-            gl1funcs->glVertex2f(qrandom() * w, qrandom() * h);
-            gl1funcs->glEnd();
-        }
-#endif
-    }
-}
-
-class ThreadSafeGLWidget : public QGLWidget
-{
-public:
-    ThreadSafeGLWidget(QWidget *parent = 0) : QGLWidget(parent) {}
-    void paintEvent(QPaintEvent *)
-    {
-        // ignored as we're anyway swapping as fast as we can
-    };
-
-    void resizeEvent(QResizeEvent *e)
-    {
-        mutex.lock();
-        newSize = e->size();
-        mutex.unlock();
-    };
-
-    QMutex mutex;
-    QSize newSize;
-};
-
-class SceneRenderingThread : public QThread
-{
-    Q_OBJECT
-public:
-    SceneRenderingThread(ThreadSafeGLWidget *widget)
-        : m_widget(widget)
-    {
-        moveToThread(this);
-        m_size = widget->size();
-    }
-
-    void run() {
-        QElapsedTimer timer;
-        timer.start();
-        failure = false;
-
-        while (timer.elapsed() < RUNNING_TIME && !failure) {
-
-            m_widget->makeCurrent();
-
-            m_widget->mutex.lock();
-            QSize s = m_widget->newSize;
-            m_widget->mutex.unlock();
-
-            QOpenGLFunctions *funcs = QOpenGLContext::currentContext()->functions();
-            if (s != m_size) {
-                funcs->glViewport(0, 0, s.width(), s.height());
-            }
-
-            if (QGLContext::currentContext() != m_widget->context()) {
-                failure = true;
-                break;
-            }
-
-            funcs->glClear(GL_COLOR_BUFFER_BIT);
-
-            int w = m_widget->width();
-            int h = m_widget->height();
-
-            renderAScene(w, h);
-
-            int color;
-            funcs->glReadPixels(w / 2, h / 2, 1, 1, GL_RGBA, GL_UNSIGNED_BYTE, &color);
-
-            m_widget->swapBuffers();
-        }
-
-        m_widget->doneCurrent();
-    }
-
-    bool failure;
-
-private:
-    ThreadSafeGLWidget *m_widget;
-    QSize m_size;
-};
-
-void tst_QGLThreads::renderInThread_data()
-{
-    QTest::addColumn<bool>("resize");
-    QTest::addColumn<bool>("update");
-
-    QTest::newRow("basic") << false << false;
-    QTest::newRow("with-resize") << true << false;
-    QTest::newRow("with-update") << false << true;
-    QTest::newRow("with-resize-and-update") << true << true;
-}
-
-void tst_QGLThreads::renderInThread()
-{
-    if (!QGuiApplicationPrivate::platformIntegration()->hasCapability(QPlatformIntegration::ThreadedOpenGL))
-        QSKIP("No platformsupport for ThreadedOpenGL");
-
-    QFETCH(bool, resize);
-    QFETCH(bool, update);
-
-#if defined(Q_OS_MACOS)
-    if (resize)
-        QSKIP("gldSetZero crashes in render thread, QTBUG-68524");
-#endif
-
-    ThreadSafeGLWidget widget;
-    widget.resize(200, 200);
-    SceneRenderingThread thread(&widget);
-
-    widget.show();
-    QVERIFY(QTest::qWaitForWindowExposed(&widget));
-    widget.doneCurrent();
-
-    widget.context()->moveToThread(&thread);
-
-    thread.start();
-
-    int value = 10;
-    while (thread.isRunning()) {
-        if (resize)
-            widget.resize(200 + value, 200 + value);
-        if (update)
-            widget.update(100 + value, 100 + value, 20, 20);
-        qApp->processEvents();
-        value = -value;
-
-        QThread::msleep(100);
-    }
-
-    QVERIFY(!thread.failure);
-}
-
-class Device
-{
-public:
-    virtual ~Device() {}
-    virtual QPaintDevice *realPaintDevice() = 0;
-    virtual void prepareDevice() {}
-    virtual void moveToThread(QThread *) {}
-};
-
-class GLWidgetWrapper : public Device
-{
-public:
-    GLWidgetWrapper() {
-        widget.resize(150, 150);
-        widget.show();
-        QVERIFY(QTest::qWaitForWindowExposed(&widget));
-        widget.doneCurrent();
-    }
-    QPaintDevice *realPaintDevice() { return &widget; }
-    void moveToThread(QThread *thread) { widget.context()->moveToThread(thread); }
-
-    ThreadSafeGLWidget widget;
-};
-
-class PixmapWrapper : public Device
-{
-public:
-    PixmapWrapper() { pixmap = new QPixmap(512, 512); }
-    ~PixmapWrapper() { delete pixmap; }
-    QPaintDevice *realPaintDevice() { return pixmap; }
-
-    QPixmap *pixmap;
-};
-
-class PixelBufferWrapper : public Device
-{
-public:
-    PixelBufferWrapper() { pbuffer = new QGLPixelBuffer(512, 512); }
-    ~PixelBufferWrapper() { delete pbuffer; }
-    QPaintDevice *realPaintDevice() { return pbuffer; }
-    void moveToThread(QThread *thread) { pbuffer->context()->moveToThread(thread); }
-
-    QGLPixelBuffer *pbuffer;
-};
-
-
-class FrameBufferObjectWrapper : public Device
-{
-public:
-    FrameBufferObjectWrapper() {
-        widget.makeCurrent();
-        fbo = new QGLFramebufferObject(512, 512);
-        widget.doneCurrent();
-    }
-    ~FrameBufferObjectWrapper() { delete fbo; }
-    QPaintDevice *realPaintDevice() { return fbo; }
-    void prepareDevice() { widget.makeCurrent(); }
-    void moveToThread(QThread *thread) { widget.context()->moveToThread(thread); }
-
-    ThreadSafeGLWidget widget;
-    QGLFramebufferObject *fbo;
-};
-
-
-class ThreadPainter : public QObject
-{
-    Q_OBJECT
-public:
-    ThreadPainter(Device *pd) : device(pd), fail(true) {
-        pixmap = QPixmap(40, 40);
-        pixmap.fill(Qt::green);
-        QPainter p(&pixmap);
-        p.drawLine(0, 0, 40, 40);
-        p.drawLine(0, 40, 40, 0);
-    }
-
-public slots:
-    void draw() {
-        bool beginFailed = false;
-        QElapsedTimer timer;
-        timer.start();
-        int rotAngle = 10;
-        device->prepareDevice();
-        QPaintDevice *paintDevice = device->realPaintDevice();
-        QSize s(paintDevice->width(), paintDevice->height());
-        while (timer.elapsed() < RUNNING_TIME) {
-            QPainter p;
-            if (!p.begin(paintDevice)) {
-                beginFailed = true;
-                break;
-            }
-            p.translate(s.width()/2, s.height()/2);
-            p.rotate(rotAngle);
-            p.translate(-s.width()/2, -s.height()/2);
-            p.fillRect(0, 0, s.width(), s.height(), Qt::red);
-            QRect rect(QPoint(0, 0), s);
-            p.drawPixmap(10, 10, pixmap);
-            p.drawTiledPixmap(50, 50, 100, 100, pixmap);
-            p.drawText(rect.center(), "This is a piece of text");
-            p.end();
-            rotAngle += 2;
-            QThread::msleep(20);
-        }
-
-        device->moveToThread(qApp->thread());
-
-        fail = beginFailed;
-        QThread::currentThread()->quit();
-    }
-
-    bool failed() { return fail; }
-
-private:
-    QPixmap pixmap;
-    Device *device;
-    bool fail;
-};
-
-template <class T>
-class PaintThreadManager
-{
-public:
-    PaintThreadManager(int count) : numThreads(count)
-    {
-        for (int i=0; i<numThreads; ++i)
-            devices.append(new T);
-        // Wait until resize events are processed on the internal
-        // QGLWidgets of the buffers to suppress errors
-        // about makeCurrent() from the wrong thread.
-        QCoreApplication::processEvents();
-        for (int i=0; i<numThreads; ++i) {
-            devices.append(new T);
-            threads.append(new QThread);
-            painters.append(new ThreadPainter(devices.at(i)));
-            painters.at(i)->moveToThread(threads.at(i));
-            painters.at(i)->connect(threads.at(i), SIGNAL(started()), painters.at(i), SLOT(draw()));
-            devices.at(i)->moveToThread(threads.at(i));
-        }
-    }
-
-    ~PaintThreadManager() {
-        qDeleteAll(threads);
-        qDeleteAll(painters);
-        qDeleteAll(devices);
-    }
-
-
-    void start() {
-        for (int i=0; i<numThreads; ++i)
-            threads.at(i)->start();
-    }
-
-    bool areRunning() {
-        bool running = false;
-        for (int i=0; i<numThreads; ++i){
-            if (threads.at(i)->isRunning())
-                running = true;
-        }
-
-        return running;
-    }
-
-    bool failed() {
-        for (int i=0; i<numThreads; ++i) {
-            if (painters.at(i)->failed())
-                return true;
-        }
-
-        return false;
-    }
-
-private:
-    QList<QThread *> threads;
-    QList<Device *> devices;
-    QList<ThreadPainter *> painters;
-    int numThreads;
-};
-
-/*
-   This test uses QPainter to draw onto different QGLWidgets in
-   different threads at the same time. The ThreadSafeGLWidget is
-   necessary to handle paint and resize events that might come from
-   the main thread at any time while the test is running. The resize
-   and paint events would cause makeCurrent() calls to be issued from
-   within the QGLWidget while the widget's context was current in
-   another thread, which would cause errors.
-*/
-void tst_QGLThreads::painterOnGLWidgetInThread()
-{
-    //QTBUG-46446 tst_qglthreads is unstable on windows 7
-    if (QGuiApplication::platformName().compare("windows 7", Qt::CaseInsensitive))
-        QSKIP("Doesn't work on this platform. QTBUG-46446");
-    if (!QGuiApplicationPrivate::platformIntegration()->hasCapability(QPlatformIntegration::ThreadedOpenGL))
-        QSKIP("No platformsupport for ThreadedOpenGL");
-    if (!((QGLFormat::openGLVersionFlags() & QGLFormat::OpenGL_Version_2_0) ||
-          (QGLFormat::openGLVersionFlags() & QGLFormat::OpenGL_ES_Version_2_0))) {
-        QSKIP("The OpenGL based threaded QPainter tests requires OpenGL/ES 2.0.");
-    }
-
-    PaintThreadManager<GLWidgetWrapper> painterThreads(5);
-    painterThreads.start();
-
-    while (painterThreads.areRunning()) {
-        qApp->processEvents();
-        QThread::msleep(100);
-    }
-    QVERIFY(!painterThreads.failed());
-}
-
-/*
-   This test uses QPainter to draw onto different QPixmaps in
-   different threads at the same time.
-*/
-void tst_QGLThreads::painterOnPixmapInThread()
-{
-    if (!QGuiApplicationPrivate::platformIntegration()->hasCapability(QPlatformIntegration::ThreadedOpenGL)
-        || !QGuiApplicationPrivate::platformIntegration()->hasCapability(QPlatformIntegration::ThreadedPixmaps))
-        QSKIP("No platformsupport for ThreadedOpenGL or ThreadedPixmaps");
-    PaintThreadManager<PixmapWrapper> painterThreads(5);
-    painterThreads.start();
-
-    while (painterThreads.areRunning()) {
-        qApp->processEvents();
-        QThread::msleep(100);
-    }
-    QVERIFY(!painterThreads.failed());
-}
-
-/* This test uses QPainter to draw onto different QGLPixelBuffer
-   objects in different threads at the same time.
-*/
-void tst_QGLThreads::painterOnPboInThread()
-{
-    //QTBUG-46446 tst_qglthreads is unstable on windows 7
-    if (QGuiApplication::platformName().compare("windows 7", Qt::CaseInsensitive))
-        QSKIP("Doesn't work on this platform. QTBUG-46446");
-    if (!QGuiApplicationPrivate::platformIntegration()->hasCapability(QPlatformIntegration::ThreadedOpenGL))
-        QSKIP("No platformsupport for ThreadedOpenGL");
-    if (!((QGLFormat::openGLVersionFlags() & QGLFormat::OpenGL_Version_2_0) ||
-          (QGLFormat::openGLVersionFlags() & QGLFormat::OpenGL_ES_Version_2_0))) {
-        QSKIP("The OpenGL based threaded QPainter tests requires OpenGL/ES 2.0.");
-    }
-
-    if (!QGLPixelBuffer::hasOpenGLPbuffers()) {
-        QSKIP("This system doesn't support pbuffers.");
-    }
-
-    PaintThreadManager<PixelBufferWrapper> painterThreads(5);
-    painterThreads.start();
-
-    while (painterThreads.areRunning()) {
-        qApp->processEvents();
-        QThread::msleep(100);
-    }
-    QVERIFY(!painterThreads.failed());
-}
-
-/* This test uses QPainter to draw onto different
-   QGLFramebufferObjects (bound in a QGLWidget's context) in different
-   threads at the same time.
-*/
-void tst_QGLThreads::painterOnFboInThread()
-{
-    //QTBUG-46446 tst_qglthreads is unstable on windows 7
-    if (QGuiApplication::platformName().compare("windows 7", Qt::CaseInsensitive))
-        QSKIP("Doesn't work on this platform. QTBUG-46446");
-    if (!QGuiApplicationPrivate::platformIntegration()->hasCapability(QPlatformIntegration::ThreadedOpenGL))
-        QSKIP("No platformsupport for ThreadedOpenGL");
-    if (!((QGLFormat::openGLVersionFlags() & QGLFormat::OpenGL_Version_2_0) ||
-          (QGLFormat::openGLVersionFlags() & QGLFormat::OpenGL_ES_Version_2_0))) {
-        QSKIP("The OpenGL based threaded QPainter tests requires OpenGL/ES 2.0.");
-    }
-
-    if (!QGLFramebufferObject::hasOpenGLFramebufferObjects()) {
-        QSKIP("This system doesn't support framebuffer objects.");
-    }
-
-    PaintThreadManager<FrameBufferObjectWrapper> painterThreads(5);
-    painterThreads.start();
-
-    while (painterThreads.areRunning()) {
-        qApp->processEvents();
-        QThread::msleep(100);
-    }
-    QVERIFY(!painterThreads.failed());
-}
-
-int main(int argc, char **argv)
-{
-    QApplication app(argc, argv);
-    QTEST_DISABLE_KEYPAD_NAVIGATION \
-
-    tst_QGLThreads tc;
-    return QTest::qExec(&tc, argc, argv);
-}
-
-#include "tst_qglthreads.moc"
diff --git a/tests/auto/opengl/qglthreads/tst_qglthreads.h b/tests/auto/opengl/qglthreads/tst_qglthreads.h
deleted file mode 100644
index e4b496c163..0000000000
--- a/tests/auto/opengl/qglthreads/tst_qglthreads.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef TST_QGLTHREADS_H
-#define TST_QGLTHREADS_H
-
-#include <QObject>
-
-class tst_QGLThreads : public QObject
-{
-Q_OBJECT
-public:
-    explicit tst_QGLThreads(QObject *parent = 0);
-
-private slots:
-    void swapInThread();
-
-    void renderInThread_data();
-    void renderInThread();
-    void painterOnGLWidgetInThread();
-    void painterOnPixmapInThread();
-    void painterOnPboInThread();
-    void painterOnFboInThread();
-};
-
-#endif // TST_QGLTHREADS_H
diff --git a/tests/auto/other/CMakeLists.txt b/tests/auto/other/CMakeLists.txt
new file mode 100644
index 0000000000..e1d3c0e839
--- /dev/null
+++ b/tests/auto/other/CMakeLists.txt
@@ -0,0 +1,49 @@
+# Generated from other.pro.
+
+if(NOT cross_compile)
+    add_subdirectory(compiler)
+    # add_subdirectory(atwrapper) <- does not exist # special case
+endif()
+if(TARGET Qt::Widgets)
+    add_subdirectory(gestures)
+    add_subdirectory(languagechange)
+    add_subdirectory(qfocusevent)
+    add_subdirectory(qsharedpointer_and_qwidget)
+    # add_subdirectory(windowsmobile) <- does not exist # special case
+endif()
+if(TARGET Qt::Network AND TARGET Qt::Widgets AND NOT WINRT)
+    add_subdirectory(lancelot)
+    add_subdirectory(qnetworkaccessmanager_and_qprogressdialog)
+endif()
+if(APPLE_OSX AND TARGET Qt::Gui AND TARGET Qt::Widgets)
+    add_subdirectory(macgui)
+    add_subdirectory(macplist)
+    add_subdirectory(qaccessibilitymac)
+endif()
+if(TARGET Qt::Gui)
+    add_subdirectory(qcomplextext)
+endif()
+if(QT_FEATURE_process AND TARGET Qt::Gui)
+    add_subdirectory(qprocess_and_guieventloop)
+endif()
+if(QT_FEATURE_accessibility AND TARGET Qt::Gui AND TARGET Qt::Widgets AND NOT WINRT)
+    add_subdirectory(qaccessibility)
+endif()
+if(QT_FEATURE_accessibility_atspi_bridge AND TARGET Qt::Gui AND TARGET Qt::Widgets)
+    #add_subdirectory(qaccessibilitylinux) # special case # This test is broken
+endif()
+if(TARGET Qt::Network AND NOT WINRT)
+    add_subdirectory(networkselftest)
+endif()
+if(APPLE_OSX AND TARGET Qt::Gui)
+    add_subdirectory(macnativeevents)
+endif()
+if(embedded)
+    add_subdirectory(qdirectpainter)
+endif()
+if(ANDROID)
+    add_subdirectory(android)
+endif()
+if(QT_FEATURE_xkbcommon)
+    add_subdirectory(xkbkeyboard)
+endif()
diff --git a/tests/auto/other/android/CMakeLists.txt b/tests/auto/other/android/CMakeLists.txt
new file mode 100644
index 0000000000..e59111bb40
--- /dev/null
+++ b/tests/auto/other/android/CMakeLists.txt
@@ -0,0 +1,19 @@
+# Generated from android.pro.
+
+#####################################################################
+## tst_android Test:
+#####################################################################
+
+add_qt_test(tst_android
+    SOURCES
+        tst_android.cpp
+)
+
+if(ANDROID)
+    set_property(TARGET tst_android APPEND PROPERTY QT_ANDROID_PACKAGE_SOURCE_DIR
+        ${CMAKE_CURRENT_SOURCE_DIR}/testdata
+    )
+endif()
+
+#### Keys ignored in scope 1:.:.:android.pro:<TRUE>:
+# DISTFILES = "testdata/assets/test.txt"
diff --git a/tests/auto/other/compiler/.prev_CMakeLists.txt b/tests/auto/other/compiler/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..6824640d93
--- /dev/null
+++ b/tests/auto/other/compiler/.prev_CMakeLists.txt
@@ -0,0 +1,16 @@
+# Generated from compiler.pro.
+
+#####################################################################
+## tst_compiler Test:
+#####################################################################
+
+add_qt_test(tst_compiler
+    SOURCES
+        baseclass.cpp baseclass.h
+        derivedclass.cpp derivedclass.h
+        othersource.cpp
+        tst_compiler.cpp
+)
+
+## Scopes:
+#####################################################################
diff --git a/tests/auto/other/compiler/CMakeLists.txt b/tests/auto/other/compiler/CMakeLists.txt
new file mode 100644
index 0000000000..1849b7ec2c
--- /dev/null
+++ b/tests/auto/other/compiler/CMakeLists.txt
@@ -0,0 +1,17 @@
+# Generated from compiler.pro.
+
+#####################################################################
+## tst_compiler Test:
+#####################################################################
+
+add_qt_test(tst_compiler
+    EXCEPTIONS # special case
+    SOURCES
+        baseclass.cpp baseclass.h
+        derivedclass.cpp derivedclass.h
+        othersource.cpp
+        tst_compiler.cpp
+)
+
+## Scopes:
+#####################################################################
diff --git a/tests/auto/other/compiler/tst_compiler.cpp b/tests/auto/other/compiler/tst_compiler.cpp
index de15f4c62d..78026665be 100644
--- a/tests/auto/other/compiler/tst_compiler.cpp
+++ b/tests/auto/other/compiler/tst_compiler.cpp
@@ -634,7 +634,7 @@ void tst_Compiler::cxx11_alignas()
     struct S {
         alignas(double) char c;
     };
-    QCOMPARE(Q_ALIGNOF(S), Q_ALIGNOF(double));
+    QCOMPARE(alignof(S), alignof(double));
 #endif
 }
 
@@ -1396,7 +1396,7 @@ void tst_Compiler::cxx11_unrestricted_unions()
         ~U() {}
     };
     U u;
-    std::aligned_storage<sizeof(QString), Q_ALIGNOF(QString)> as;
+    std::aligned_storage<sizeof(QString), alignof(QString)> as;
     Q_UNUSED(u);
     Q_UNUSED(as);
 
diff --git a/tests/auto/other/gestures/CMakeLists.txt b/tests/auto/other/gestures/CMakeLists.txt
new file mode 100644
index 0000000000..b1a07e6cb3
--- /dev/null
+++ b/tests/auto/other/gestures/CMakeLists.txt
@@ -0,0 +1,13 @@
+# Generated from gestures.pro.
+
+#####################################################################
+## tst_gestures Test:
+#####################################################################
+
+add_qt_test(tst_gestures
+    SOURCES
+        tst_gestures.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+)
diff --git a/tests/auto/other/lancelot/CMakeLists.txt b/tests/auto/other/lancelot/CMakeLists.txt
new file mode 100644
index 0000000000..6f15ff7990
--- /dev/null
+++ b/tests/auto/other/lancelot/CMakeLists.txt
@@ -0,0 +1,84 @@
+# Generated from lancelot.pro.
+
+#####################################################################
+## tst_lancelot Test:
+#####################################################################
+
+# Collect test data
+file(GLOB_RECURSE test_data_glob
+    RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+    scripts/*)
+list(APPEND test_data ${test_data_glob})
+
+add_qt_test(tst_lancelot
+    SOURCES
+        ../../../baselineserver/shared/baselineprotocol.cpp ../../../baselineserver/shared/baselineprotocol.h
+        ../../../baselineserver/shared/lookup3.cpp
+        ../../../baselineserver/shared/qbaselinetest.cpp ../../../baselineserver/shared/qbaselinetest.h
+        paintcommands.cpp paintcommands.h
+        tst_lancelot.cpp
+    DEFINES
+        QMAKESPEC=\\\"\\\"
+    INCLUDE_DIRECTORIES
+        ../../../baselineserver/shared
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::GuiPrivate
+        Qt::Network
+    TESTDATA ${test_data}
+)
+
+# Resources:
+set(images_resource_files
+    "images/alpha.png"
+    "images/alpha2x2.png"
+    "images/bitmap.png"
+    "images/border.png"
+    "images/borderimage.png"
+    "images/dome_argb32.png"
+    "images/dome_indexed.png"
+    "images/dome_indexed_mask.png"
+    "images/dome_mono.png"
+    "images/dome_mono_128.png"
+    "images/dome_mono_palette.png"
+    "images/dome_rgb32.png"
+    "images/dot.png"
+    "images/face.png"
+    "images/gam030.png"
+    "images/gam045.png"
+    "images/gam056.png"
+    "images/gam100.png"
+    "images/gam200.png"
+    "images/image.png"
+    "images/mask.png"
+    "images/mask_100.png"
+    "images/masked.png"
+    "images/sign.png"
+    "images/solid.png"
+    "images/solid2x2.png"
+    "images/struct-image-01.jpg"
+    "images/struct-image-01.png"
+    "images/zebra.png"
+)
+
+add_qt_resource(tst_lancelot "images"
+    PREFIX
+        "/"
+    FILES
+        ${images_resource_files}
+)
+
+
+## Scopes:
+#####################################################################
+
+extend_target(tst_lancelot CONDITION QT_FEATURE_opengl
+    PUBLIC_LIBRARIES
+        Qt::OpenGL
+)
+
+#### Keys ignored in scope 4:.:../../../baselineserver/shared:../../../baselineserver/shared/qbaselinetest.pri:WIN32:
+# MKSPEC = "$$replace(QMAKESPEC, \\\\, /)"
+
+#### Keys ignored in scope 5:.:../../../baselineserver/shared:../../../baselineserver/shared/qbaselinetest.pri:else:
+# MKSPEC = "$$QMAKESPEC"
diff --git a/tests/auto/other/lancelot/lancelot.pro b/tests/auto/other/lancelot/lancelot.pro
index 6ece7315ed..5b9117983a 100644
--- a/tests/auto/other/lancelot/lancelot.pro
+++ b/tests/auto/other/lancelot/lancelot.pro
@@ -1,6 +1,7 @@
 CONFIG += testcase
 TARGET = tst_lancelot
 QT += testlib gui-private
+qtConfig(opengl): QT += opengl
 
 SOURCES += tst_lancelot.cpp \
            paintcommands.cpp
diff --git a/tests/auto/other/languagechange/CMakeLists.txt b/tests/auto/other/languagechange/CMakeLists.txt
new file mode 100644
index 0000000000..f5c43b0ed1
--- /dev/null
+++ b/tests/auto/other/languagechange/CMakeLists.txt
@@ -0,0 +1,21 @@
+# Generated from languagechange.pro.
+
+#####################################################################
+## tst_languagechange Test:
+#####################################################################
+
+add_qt_test(tst_languagechange
+    SOURCES
+        tst_languagechange.cpp
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::Gui
+        Qt::GuiPrivate
+        Qt::Widgets
+)
+
+## Scopes:
+#####################################################################
+
+#### Keys ignored in scope 2:.:.:languagechange.pro:WIN32:
+# testcase.timeout = "1800"
diff --git a/tests/auto/other/macgui/.prev_CMakeLists.txt b/tests/auto/other/macgui/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..4923568a89
--- /dev/null
+++ b/tests/auto/other/macgui/.prev_CMakeLists.txt
@@ -0,0 +1,32 @@
+# Generated from macgui.pro.
+
+if(NOT APPLE)
+    return()
+endif()
+if(NOT widgets)
+    return()
+endif()
+
+#####################################################################
+## tst_macgui Test:
+#####################################################################
+
+add_qt_test(tst_macgui
+    SOURCES
+        guitest.cpp guitest.h
+        tst_macgui.cpp
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::WidgetsPrivate
+)
+
+#### Keys ignored in scope 1:.:.:macgui.pro:<TRUE>:
+# _REQUIREMENTS = "mac" "widgets"
+
+## Scopes:
+#####################################################################
+
+extend_target(tst_macgui CONDITION APPLE_OSX
+    PUBLIC_LIBRARIES
+        ${FWApplicationServices}
+)
diff --git a/tests/auto/other/macgui/CMakeLists.txt b/tests/auto/other/macgui/CMakeLists.txt
new file mode 100644
index 0000000000..de69c43765
--- /dev/null
+++ b/tests/auto/other/macgui/CMakeLists.txt
@@ -0,0 +1,32 @@
+# Generated from macgui.pro.
+
+if(NOT APPLE)
+    return()
+endif()
+if(NOT TARGET Qt::Widgets) # special case
+    return()
+endif()
+
+#####################################################################
+## tst_macgui Test:
+#####################################################################
+
+add_qt_test(tst_macgui
+    SOURCES
+        guitest.cpp guitest.h
+        tst_macgui.cpp
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::WidgetsPrivate
+)
+
+#### Keys ignored in scope 1:.:.:macgui.pro:<TRUE>:
+# _REQUIREMENTS = "mac" "widgets"
+
+## Scopes:
+#####################################################################
+
+extend_target(tst_macgui CONDITION APPLE_OSX
+    PUBLIC_LIBRARIES
+        ${FWApplicationServices}
+)
diff --git a/tests/auto/other/macnativeevents/CMakeLists.txt b/tests/auto/other/macnativeevents/CMakeLists.txt
new file mode 100644
index 0000000000..167e46055a
--- /dev/null
+++ b/tests/auto/other/macnativeevents/CMakeLists.txt
@@ -0,0 +1,27 @@
+# Generated from macnativeevents.pro.
+
+if(NOT APPLE)
+    return()
+endif()
+
+#####################################################################
+## tst_macnativeevents Test:
+#####################################################################
+
+add_qt_test(tst_macnativeevents
+    SOURCES
+        expectedeventlist.cpp expectedeventlist.h
+        nativeeventlist.cpp nativeeventlist.h
+        qnativeevents.cpp qnativeevents.h
+        qnativeevents_mac.cpp
+        tst_macnativeevents.cpp
+    DEFINES
+        QT_DISABLE_DEPRECATED_BEFORE=0
+    PUBLIC_LIBRARIES
+        ${FWAppKit}
+        Qt::Gui
+        Qt::Widgets
+)
+
+#### Keys ignored in scope 1:.:.:macnativeevents.pro:<TRUE>:
+# _REQUIREMENTS = "mac"
diff --git a/tests/auto/other/macplist/CMakeLists.txt b/tests/auto/other/macplist/CMakeLists.txt
new file mode 100644
index 0000000000..7ebb9d732c
--- /dev/null
+++ b/tests/auto/other/macplist/CMakeLists.txt
@@ -0,0 +1,7 @@
+# Generated from macplist.pro.
+
+if(NOT TARGET Qt::Widgets) # special case
+    return()
+endif()
+add_subdirectory(app)
+add_subdirectory(test)
diff --git a/tests/auto/other/macplist/app/.prev_CMakeLists.txt b/tests/auto/other/macplist/app/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..f04afb4311
--- /dev/null
+++ b/tests/auto/other/macplist/app/.prev_CMakeLists.txt
@@ -0,0 +1,14 @@
+# Generated from app.pro.
+
+#####################################################################
+## app Binary:
+#####################################################################
+
+add_qt_executable(app
+    GUI
+    SOURCES
+        main.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+)
diff --git a/tests/auto/other/macplist/app/CMakeLists.txt b/tests/auto/other/macplist/app/CMakeLists.txt
new file mode 100644
index 0000000000..2effb2aa34
--- /dev/null
+++ b/tests/auto/other/macplist/app/CMakeLists.txt
@@ -0,0 +1,15 @@
+# Generated from app.pro.
+
+#####################################################################
+## app Binary:
+#####################################################################
+
+add_qt_executable(app
+    GUI
+    OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
+    SOURCES
+        main.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+)
diff --git a/tests/auto/other/macplist/test/CMakeLists.txt b/tests/auto/other/macplist/test/CMakeLists.txt
new file mode 100644
index 0000000000..3cb8066adf
--- /dev/null
+++ b/tests/auto/other/macplist/test/CMakeLists.txt
@@ -0,0 +1,16 @@
+# Generated from test.pro.
+
+#####################################################################
+## tst_macplist Test:
+#####################################################################
+
+add_qt_test(tst_macplist
+    OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../"
+    SOURCES
+        ../tst_macplist.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+)
+
+## Scopes:
+#####################################################################
diff --git a/tests/auto/other/networkselftest/CMakeLists.txt b/tests/auto/other/networkselftest/CMakeLists.txt
new file mode 100644
index 0000000000..7765557248
--- /dev/null
+++ b/tests/auto/other/networkselftest/CMakeLists.txt
@@ -0,0 +1,13 @@
+# Generated from networkselftest.pro.
+
+#####################################################################
+## tst_networkselftest Test:
+#####################################################################
+
+add_qt_test(tst_networkselftest
+    SOURCES
+        tst_networkselftest.cpp
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::Network
+)
diff --git a/tests/auto/other/other.pro b/tests/auto/other/other.pro
index 743de1e188..8a99d0eef6 100644
--- a/tests/auto/other/other.pro
+++ b/tests/auto/other/other.pro
@@ -19,7 +19,6 @@ SUBDIRS=\
    qobjectrace \
    qsharedpointer_and_qwidget \
    qprocess_and_guieventloop \
-   qtokenautomaton \
    toolsupport \
 
 !qtHaveModule(gui): SUBDIRS -= \
diff --git a/tests/auto/other/qaccessibility/.prev_CMakeLists.txt b/tests/auto/other/qaccessibility/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..8663e412c4
--- /dev/null
+++ b/tests/auto/other/qaccessibility/.prev_CMakeLists.txt
@@ -0,0 +1,45 @@
+# Generated from qaccessibility.pro.
+
+if(NOT QT_FEATURE_accessibility)
+    return()
+endif()
+
+#####################################################################
+## tst_qaccessibility Test:
+#####################################################################
+
+add_qt_test(tst_qaccessibility
+    SOURCES
+        accessiblewidgets.h
+        tst_qaccessibility.cpp
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::Gui
+        Qt::GuiPrivate
+        Qt::TestPrivate
+        Qt::WidgetsPrivate
+)
+
+#### Keys ignored in scope 1:.:.:qaccessibility.pro:<TRUE>:
+# _REQUIREMENTS = "qtConfig(accessibility)"
+
+## Scopes:
+#####################################################################
+
+extend_target(tst_qaccessibility CONDITION UNIX AND NOT APPLE AND NOT HAIKU AND NOT integity
+    PUBLIC_LIBRARIES
+        m
+)
+
+extend_target(tst_qaccessibility CONDITION WIN32
+    PUBLIC_LIBRARIES
+        ole32
+        oleacc
+        oleaut32
+        uuid
+)
+
+extend_target(tst_qaccessibility CONDITION WIN32 AND NOT WINRT
+    PUBLIC_LIBRARIES
+        Qt::WindowsUIAutomationSupportPrivate
+)
diff --git a/tests/auto/other/qaccessibility/CMakeLists.txt b/tests/auto/other/qaccessibility/CMakeLists.txt
new file mode 100644
index 0000000000..f5f74bbafc
--- /dev/null
+++ b/tests/auto/other/qaccessibility/CMakeLists.txt
@@ -0,0 +1,51 @@
+# Generated from qaccessibility.pro.
+
+if(NOT QT_FEATURE_accessibility)
+    return()
+endif()
+
+# special case begin
+if (WIN32 AND NOT TARGET Qt::WindowsUIAutomationSupport)
+    return()
+endif()
+# special case end
+
+#####################################################################
+## tst_qaccessibility Test:
+#####################################################################
+
+add_qt_test(tst_qaccessibility
+    SOURCES
+        accessiblewidgets.h
+        tst_qaccessibility.cpp
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::Gui
+        Qt::GuiPrivate
+        Qt::TestPrivate
+        Qt::WidgetsPrivate
+)
+
+#### Keys ignored in scope 1:.:.:qaccessibility.pro:<TRUE>:
+# _REQUIREMENTS = "qtConfig(accessibility)"
+
+## Scopes:
+#####################################################################
+
+extend_target(tst_qaccessibility CONDITION UNIX AND NOT APPLE AND NOT HAIKU AND NOT integity
+    PUBLIC_LIBRARIES
+        m
+)
+
+extend_target(tst_qaccessibility CONDITION WIN32
+    PUBLIC_LIBRARIES
+        ole32
+        oleacc
+        oleaut32
+        uuid
+)
+
+extend_target(tst_qaccessibility CONDITION WIN32 AND NOT WINRT
+    PUBLIC_LIBRARIES
+        Qt::WindowsUIAutomationSupportPrivate
+)
diff --git a/tests/auto/other/qaccessibility/tst_qaccessibility.cpp b/tests/auto/other/qaccessibility/tst_qaccessibility.cpp
index fa1fedc189..2a2d4591a1 100644
--- a/tests/auto/other/qaccessibility/tst_qaccessibility.cpp
+++ b/tests/auto/other/qaccessibility/tst_qaccessibility.cpp
@@ -203,11 +203,15 @@ private slots:
     void applicationTest();
     void mainWindowTest();
     void subWindowTest();
+#if QT_CONFIG(shortcut)
     void buttonTest();
+#endif
     void scrollBarTest();
     void tabTest();
     void tabWidgetTest();
+#if QT_CONFIG(shortcut)
     void menuTest();
+#endif
     void spinBoxTest();
     void doubleSpinBoxTest();
     void textEditTest();
@@ -234,8 +238,10 @@ private slots:
     void dockWidgetTest();
     void comboBoxTest();
     void accessibleName();
+#if QT_CONFIG(shortcut)
     void labelTest();
     void accelerators();
+#endif
     void bridgeTest();
     void focusChild();
 
@@ -1027,6 +1033,8 @@ public Q_SLOTS:
     }
 };
 
+#if QT_CONFIG(shortcut)
+
 void tst_QAccessibility::buttonTest()
 {
     QWidget window;
@@ -1199,6 +1207,8 @@ void tst_QAccessibility::buttonTest()
 //    test->release();
 }
 
+#endif // QT_CONFIG(shortcut)
+
 void tst_QAccessibility::scrollBarTest()
 {
     QScrollBar *scrollBar  = new QScrollBar(Qt::Horizontal);
@@ -1408,6 +1418,8 @@ void tst_QAccessibility::tabWidgetTest()
     QTestAccessibility::clearEvents();
 }
 
+#if QT_CONFIG(shortcut)
+
 void tst_QAccessibility::menuTest()
 {
     {
@@ -1618,6 +1630,8 @@ void tst_QAccessibility::menuTest()
     QTestAccessibility::clearEvents();
 }
 
+#endif // QT_CONFIG(shortcut)
+
 void tst_QAccessibility::spinBoxTest()
 {
     QSpinBox * const spinBox = new QSpinBox();
@@ -3630,6 +3644,8 @@ void tst_QAccessibility::comboBoxTest()
     QTestAccessibility::clearEvents();
 }
 
+#if QT_CONFIG(shortcut)
+
 void tst_QAccessibility::labelTest()
 {
     QWidget *window = new QWidget;
@@ -3730,6 +3746,8 @@ void tst_QAccessibility::accelerators()
     QTestAccessibility::clearEvents();
 }
 
+#endif // QT_CONFIG(shortcut)
+
 #ifdef QT_SUPPORTS_IACCESSIBLE2
 static IUnknown *queryIA2(IAccessible *acc, const IID &iid)
 {
diff --git a/tests/auto/other/qaccessibilitylinux/.prev_CMakeLists.txt b/tests/auto/other/qaccessibilitylinux/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..7111e9cf57
--- /dev/null
+++ b/tests/auto/other/qaccessibilitylinux/.prev_CMakeLists.txt
@@ -0,0 +1,19 @@
+# Generated from qaccessibilitylinux.pro.
+
+#####################################################################
+## tst_qaccessibilitylinux Test:
+#####################################################################
+
+add_qt_test(tst_qaccessibilitylinux
+    SOURCES
+        tst_qaccessibilitylinux.cpp
+    DBUS_INTERFACE_SOURCES
+        ../../../../src/platformsupport/linuxaccessibility/dbusxml/Bus.xml
+    PUBLIC_LIBRARIES
+        Qt::AccessibilitySupportPrivate
+        Qt::DBus
+        Qt::Gui
+        Qt::GuiPrivate
+        Qt::LinuxAccessibilitySupportPrivate
+        Qt::Widgets
+)
diff --git a/tests/auto/other/qaccessibilitylinux/CMakeLists.txt b/tests/auto/other/qaccessibilitylinux/CMakeLists.txt
new file mode 100644
index 0000000000..ae6e7c4205
--- /dev/null
+++ b/tests/auto/other/qaccessibilitylinux/CMakeLists.txt
@@ -0,0 +1,32 @@
+# Generated from qaccessibilitylinux.pro.
+# special case begin
+if (NOT QT_FEATURE_accessibility OR NOT TARGET Qt::LinuxAccessibilitySupportPrivate
+        OR (QT_BUILD_STANDALONE_TESTS AND QT_WILL_INSTALL))
+    return()
+endif()
+# special case end
+
+#####################################################################
+## tst_qaccessibilitylinux Test:
+#####################################################################
+
+add_qt_test(tst_qaccessibilitylinux
+    SOURCES
+        tst_qaccessibilitylinux.cpp
+    DBUS_INTERFACE_SOURCES
+        ../../../../src/platformsupport/linuxaccessibility/dbusxml/Bus.xml
+    PUBLIC_LIBRARIES
+        Qt::AccessibilitySupportPrivate
+        Qt::DBus
+        Qt::Gui
+        Qt::GuiPrivate
+        Qt::LinuxAccessibilitySupportPrivate
+        Qt::Widgets
+)
+
+# special case begin
+# require for struct_marshallers_p.h which is included dbus_interface.h
+target_include_directories(tst_qaccessibilitylinux PRIVATE
+    ../../../../src/platformsupport/linuxaccessibility
+)
+# special case end
diff --git a/tests/auto/other/qaccessibilitymac/CMakeLists.txt b/tests/auto/other/qaccessibilitymac/CMakeLists.txt
new file mode 100644
index 0000000000..ab8b9fcb9b
--- /dev/null
+++ b/tests/auto/other/qaccessibilitymac/CMakeLists.txt
@@ -0,0 +1,33 @@
+# Generated from qaccessibilitymac.pro.
+
+if(NOT APPLE)
+    return()
+endif()
+
+#####################################################################
+## tst_qaccessibilitymac Test:
+#####################################################################
+
+add_qt_test(tst_qaccessibilitymac
+    SOURCES
+        tst_qaccessibilitymac.cpp
+        tst_qaccessibilitymac_helpers.h
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+)
+
+#### Keys ignored in scope 1:.:.:qaccessibilitymac.pro:<TRUE>:
+# _REQUIREMENTS = "mac"
+
+## Scopes:
+#####################################################################
+
+extend_target(tst_qaccessibilitymac CONDITION APPLE
+    SOURCES
+        tst_qaccessibilitymac_helpers.mm
+    PUBLIC_LIBRARIES
+        ${FWAppKit}
+        ${FWApplicationServices}
+        ${FWSecurity}
+)
diff --git a/tests/auto/other/qcomplextext/CMakeLists.txt b/tests/auto/other/qcomplextext/CMakeLists.txt
new file mode 100644
index 0000000000..ee504faaf7
--- /dev/null
+++ b/tests/auto/other/qcomplextext/CMakeLists.txt
@@ -0,0 +1,41 @@
+# Generated from qcomplextext.pro.
+
+#####################################################################
+## tst_qcomplextext Test:
+#####################################################################
+
+# Collect test data
+list(APPEND test_data "data")
+
+add_qt_test(tst_qcomplextext
+    SOURCES
+        tst_qcomplextext.cpp
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::Gui
+        Qt::GuiPrivate
+    TESTDATA ${test_data}
+)
+
+## Scopes:
+#####################################################################
+
+if(ANDROID)
+    # Resources:
+    set(android_testdata_resource_files
+        "data/BidiCharacterTest.txt"
+        "data/BidiTest.txt"
+    )
+
+    add_qt_resource(tst_qcomplextext "android_testdata"
+        PREFIX
+            "/android_testdata"
+        FILES
+            ${android_testdata_resource_files}
+    )
+endif()
+
+extend_target(tst_qcomplextext CONDITION builtin_testdata
+    DEFINES
+        BUILTIN_TESTDATA
+)
diff --git a/tests/auto/other/qfocusevent/CMakeLists.txt b/tests/auto/other/qfocusevent/CMakeLists.txt
new file mode 100644
index 0000000000..a2406c034a
--- /dev/null
+++ b/tests/auto/other/qfocusevent/CMakeLists.txt
@@ -0,0 +1,14 @@
+# Generated from qfocusevent.pro.
+
+#####################################################################
+## tst_qfocusevent Test:
+#####################################################################
+
+add_qt_test(tst_qfocusevent
+    SOURCES
+        tst_qfocusevent.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::GuiPrivate
+        Qt::Widgets
+)
diff --git a/tests/auto/other/qfocusevent/tst_qfocusevent.cpp b/tests/auto/other/qfocusevent/tst_qfocusevent.cpp
index 260ba12a97..9285d5b5da 100644
--- a/tests/auto/other/qfocusevent/tst_qfocusevent.cpp
+++ b/tests/auto/other/qfocusevent/tst_qfocusevent.cpp
@@ -91,7 +91,9 @@ private slots:
     void checkReason_BackTab();
     void checkReason_Popup();
     void checkReason_focusWidget();
+#if QT_CONFIG(shortcut)
     void checkReason_Shortcut();
+#endif
     void checkReason_ActiveWindow();
 
 private:
@@ -250,6 +252,8 @@ QT_BEGIN_NAMESPACE
 QT_END_NAMESPACE
 #endif
 
+#if QT_CONFIG(shortcut)
+
 void tst_QFocusEvent::checkReason_Shortcut()
 {
     initWidget();
@@ -288,6 +292,8 @@ void tst_QFocusEvent::checkReason_Shortcut()
 #endif
 }
 
+#endif // QT_CONFIG(shortcut)
+
 void tst_QFocusEvent::checkReason_focusWidget()
 {
     // This test checks that a widget doesn't loose
diff --git a/tests/auto/other/qnetworkaccessmanager_and_qprogressdialog/CMakeLists.txt b/tests/auto/other/qnetworkaccessmanager_and_qprogressdialog/CMakeLists.txt
new file mode 100644
index 0000000000..c4b9b186a1
--- /dev/null
+++ b/tests/auto/other/qnetworkaccessmanager_and_qprogressdialog/CMakeLists.txt
@@ -0,0 +1,14 @@
+# Generated from qnetworkaccessmanager_and_qprogressdialog.pro.
+
+#####################################################################
+## tst_qnetworkaccessmanager_and_qprogressdialog Test:
+#####################################################################
+
+add_qt_test(tst_qnetworkaccessmanager_and_qprogressdialog
+    SOURCES
+        tst_qnetworkaccessmanager_and_qprogressdialog.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Network
+        Qt::Widgets
+)
diff --git a/tests/auto/other/qobjectrace/CMakeLists.txt b/tests/auto/other/qobjectrace/CMakeLists.txt
new file mode 100644
index 0000000000..972fdcfcac
--- /dev/null
+++ b/tests/auto/other/qobjectrace/CMakeLists.txt
@@ -0,0 +1,13 @@
+# Generated from qobjectrace.pro.
+
+#####################################################################
+## qobjectrace Test:
+#####################################################################
+
+add_qt_test(qobjectrace
+    SOURCES
+        ../../../shared/emulationdetector.h
+        tst_qobjectrace.cpp
+    INCLUDE_DIRECTORIES
+        ../../../shared
+)
diff --git a/tests/auto/other/qprocess_and_guieventloop/CMakeLists.txt b/tests/auto/other/qprocess_and_guieventloop/CMakeLists.txt
new file mode 100644
index 0000000000..ccc2c55c13
--- /dev/null
+++ b/tests/auto/other/qprocess_and_guieventloop/CMakeLists.txt
@@ -0,0 +1,13 @@
+# Generated from qprocess_and_guieventloop.pro.
+
+#####################################################################
+## tst_qprocess_and_guieventloop Test:
+#####################################################################
+
+add_qt_test(tst_qprocess_and_guieventloop
+    SOURCES
+        tst_qprocess_and_guieventloop.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+)
+add_subdirectory(write-read-write)
diff --git a/tests/auto/other/qprocess_and_guieventloop/write-read-write/CMakeLists.txt b/tests/auto/other/qprocess_and_guieventloop/write-read-write/CMakeLists.txt
new file mode 100644
index 0000000000..dfea85f3e3
--- /dev/null
+++ b/tests/auto/other/qprocess_and_guieventloop/write-read-write/CMakeLists.txt
@@ -0,0 +1,13 @@
+# Generated from write-read-write.pro.
+
+#####################################################################
+## write-read-write Binary:
+#####################################################################
+
+add_qt_executable(write-read-write
+    OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
+    SOURCES
+        main.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+)
diff --git a/tests/auto/other/qsharedpointer_and_qwidget/CMakeLists.txt b/tests/auto/other/qsharedpointer_and_qwidget/CMakeLists.txt
new file mode 100644
index 0000000000..5175bb68fe
--- /dev/null
+++ b/tests/auto/other/qsharedpointer_and_qwidget/CMakeLists.txt
@@ -0,0 +1,15 @@
+# Generated from qsharedpointer_and_qwidget.pro.
+
+#####################################################################
+## tst_qsharedpointer_and_qwidget Test:
+#####################################################################
+
+add_qt_test(tst_qsharedpointer_and_qwidget
+    SOURCES
+        tst_qsharedpointer_and_qwidget.cpp
+    DEFINES
+        SRCDIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/\\\"
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+)
diff --git a/tests/auto/other/qtokenautomaton/.gitignore b/tests/auto/other/qtokenautomaton/.gitignore
deleted file mode 100644
index 3ec2df3434..0000000000
--- a/tests/auto/other/qtokenautomaton/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-Makefile
-tmp/
-tst_qtokenautomaton
-tst_qtokenautomaton
diff --git a/tests/auto/other/qtokenautomaton/CMakeLists.txt b/tests/auto/other/qtokenautomaton/CMakeLists.txt
new file mode 100644
index 0000000000..f495ddb1c6
--- /dev/null
+++ b/tests/auto/other/qtokenautomaton/CMakeLists.txt
@@ -0,0 +1,16 @@
+# Generated from qtokenautomaton.pro.
+
+#####################################################################
+## tst_qtokenautomaton Test:
+#####################################################################
+
+add_qt_test(tst_qtokenautomaton
+    SOURCES
+        tokenizers/basic/basic.cpp tokenizers/basic/basic.h
+        tokenizers/basicNamespace/basicNamespace.cpp tokenizers/basicNamespace/basicNamespace.h
+        tokenizers/boilerplate/boilerplate.cpp tokenizers/boilerplate/boilerplate.h
+        tokenizers/noNamespace/noNamespace.cpp tokenizers/noNamespace/noNamespace.h
+        tokenizers/noToString/noToString.cpp tokenizers/noToString/noToString.h
+        tokenizers/withNamespace/withNamespace.cpp tokenizers/withNamespace/withNamespace.h
+        tst_qtokenautomaton.cpp
+)
diff --git a/tests/auto/other/qtokenautomaton/generateTokenizers.sh b/tests/auto/other/qtokenautomaton/generateTokenizers.sh
deleted file mode 100755
index aeb2955713..0000000000
--- a/tests/auto/other/qtokenautomaton/generateTokenizers.sh
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/bash
-#############################################################################
-##
-## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: https://www.qt.io/licensing/
-##
-## This file is the build configuration utility of the Qt Toolkit.
-##
-## $QT_BEGIN_LICENSE:GPL-EXCEPT$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see https://www.qt.io/terms-conditions. For further
-## information use the contact form at https://www.qt.io/contact-us.
-##
-## GNU General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU
-## General Public License version 3 as published by the Free Software
-## Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-## included in the packaging of this file. Please review the following
-## information to ensure the GNU General Public License requirements will
-## be met: https://www.gnu.org/licenses/gpl-3.0.html.
-##
-## $QT_END_LICENSE$
-##
-#############################################################################
-
-tokenizers=`find tokenizers/* -type d`
-for tokenizer in $tokenizers; do
-    pushd $tokenizer
-    basename=`basename $tokenizer`
-    xmllint --noout --schema ../../../../../src/xmlpatterns/qtokenautomaton/qtokenautomaton.xsd $basename.xml
-    java net.sf.saxon.Transform -xsl:../../../../../src/xmlpatterns/qtokenautomaton/qautomaton2cpp.xsl $basename.xml
-    popd
-done
diff --git a/tests/auto/other/qtokenautomaton/qtokenautomaton.pro b/tests/auto/other/qtokenautomaton/qtokenautomaton.pro
deleted file mode 100644
index e4d0160f80..0000000000
--- a/tests/auto/other/qtokenautomaton/qtokenautomaton.pro
+++ /dev/null
@@ -1,18 +0,0 @@
-CONFIG += testcase
-TARGET = tst_qtokenautomaton
-SOURCES += tst_qtokenautomaton.cpp                      \
-           tokenizers/basic/basic.cpp                   \
-           tokenizers/basicNamespace/basicNamespace.cpp \
-           tokenizers/boilerplate/boilerplate.cpp       \
-           tokenizers/noNamespace/noNamespace.cpp       \
-           tokenizers/noToString/noToString.cpp         \
-           tokenizers/withNamespace/withNamespace.cpp
-
-HEADERS += tokenizers/basic/basic.h                     \
-           tokenizers/basicNamespace/basicNamespace.h   \
-           tokenizers/boilerplate/boilerplate.h         \
-           tokenizers/noNamespace/noNamespace.h         \
-           tokenizers/noToString/noToString.h           \
-           tokenizers/withNamespace/withNamespace.h
-
-QT = core testlib
diff --git a/tests/auto/other/qtokenautomaton/tokenizers/basic/basic.cpp b/tests/auto/other/qtokenautomaton/tokenizers/basic/basic.cpp
deleted file mode 100644
index b32b1226b2..0000000000
--- a/tests/auto/other/qtokenautomaton/tokenizers/basic/basic.cpp
+++ /dev/null
@@ -1,467 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-/* NOTE: This file is AUTO GENERATED by qtokenautomaton2cpp.xsl. */
-
-#include "basic.h"
-
-QT_BEGIN_NAMESPACE
-
-Basic::Token Basic::classifier3(const QChar *data)
-
-        {
-            if (data[0].unicode() == 100)
-
-
-                    {
-                    
-                            static const unsigned short string[] =
-                            {
-                                101, 102
-                            };
-                            if(memcmp(&data[1], &string, sizeof(QChar) * 2) == 0)
-                        
-
-                return _111;
-            
-                    }
-
-                else if (data[0].unicode() == 97)
-
-
-                    {
-                    
-                            static const unsigned short string[] =
-                            {
-                                98, 99
-                            };
-                            if(memcmp(&data[1], &string, sizeof(QChar) * 2) == 0)
-                        
-
-                return _;
-            
-                    }
-
-                else if (data[0].unicode() == 103)
-
-
-                    {
-                    
-                            static const unsigned short string[] =
-                            {
-                                104, 105
-                            };
-                            if(memcmp(&data[1], &string, sizeof(QChar) * 2) == 0)
-                        
-
-                return wobbly;
-            
-                    }
-
-                
-
-            return NoKeyword;
-        }
-    Basic::Token Basic::classifier4(const QChar *data)
-
-        {
-            if (data[0].unicode() == 70)
-
-
-                    {
-                    if (data[1].unicode() == 70)
-
-
-                    {
-                    if (data[2].unicode() == 70)
-
-
-                    {
-                    if (data[3].unicode() == 70)
-
-
-                    {
-                    
-
-                return FFFF;
-            
-                    }
-
-                else if (data[3].unicode() == 71)
-
-
-                    {
-                    
-
-                return FFFG;
-            
-                    }
-
-                
-                    }
-
-                else if (data[2].unicode() == 71)
-
-
-                    {
-                    if (data[3].unicode() == 70)
-
-
-                    {
-                    
-
-                return FFGF;
-            
-                    }
-
-                else if (data[3].unicode() == 71)
-
-
-                    {
-                    
-
-                return FFGG;
-            
-                    }
-
-                
-                    }
-
-                else if (data[2].unicode() == 76)
-
-
-                    {
-                    
-                            if (data[3].unicode() == 77)
-                        
-
-                return FFLM;
-            
-                    }
-
-                
-                    }
-
-                
-                    }
-
-                
-
-            return NoKeyword;
-        }
-    Basic::Token Basic::classifier9(const QChar *data)
-
-        {
-            
-                            static const unsigned short string[] =
-                            {
-                                111, 110, 101, 58, 99, 111, 108, 111, 110
-                            };
-                            if(memcmp(&data[0], &string, sizeof(QChar) * 9) == 0)
-                        
-
-                return OneColon;
-            
-
-            return NoKeyword;
-        }
-    Basic::Token Basic::classifier14(const QChar *data)
-
-        {
-            if (data[0].unicode() == 119)
-
-
-                    {
-                    
-                            static const unsigned short string[] =
-                            {
-                                101, 45, 104, 97, 118, 101, 45, 100, 97, 115, 104, 101, 115
-                            };
-                            if(memcmp(&data[1], &string, sizeof(QChar) * 13) == 0)
-                        
-
-                return WeHaveDashes;
-            
-                    }
-
-                else if (data[0].unicode() == 99)
-
-
-                    {
-                    
-                            static const unsigned short string[] =
-                            {
-                                111, 108, 111, 110, 58, 105, 110, 58, 110, 97, 109, 101, 58
-                            };
-                            if(memcmp(&data[1], &string, sizeof(QChar) * 13) == 0)
-                        
-
-                return ColonInName;
-            
-                    }
-
-                
-
-            return NoKeyword;
-        }
-    Basic::Token Basic::classifier15(const QChar *data)
-
-        {
-            
-                            static const unsigned short string[] =
-                            {
-                                119, 101, 45, 104, 97, 118, 101, 45, 100, 97, 115, 104, 101, 115, 45
-                            };
-                            if(memcmp(&data[0], &string, sizeof(QChar) * 15) == 0)
-                        
-
-                return WeHaveDashes2;
-            
-
-            return NoKeyword;
-        }
-    Basic::Token Basic::classifier44(const QChar *data)
-
-        {
-            
-                            static const unsigned short string[] =
-                            {
-                                97, 82, 101, 97, 108, 108, 121, 76, 111, 110, 103, 84, 111, 107, 101, 110, 73, 70, 114, 101, 97, 107, 105, 110, 77, 101, 97, 110, 73, 116, 85, 75, 110, 111, 119, 85, 75, 110, 111, 119, 75, 110, 111, 119
-                            };
-                            if(memcmp(&data[0], &string, sizeof(QChar) * 44) == 0)
-                        
-
-                return AReallyLongTokenIFreakinMeanItUKnowUKnowKnow;
-            
-
-            return NoKeyword;
-        }
-    Basic::Token Basic::toToken(const QChar *data, int length)
-            {
-                switch(length)
-                {
-                    
-                        case 3:
-                            return classifier3(data);
-
-                    
-                        case 4:
-                            return classifier4(data);
-
-                    
-                        case 9:
-                            return classifier9(data);
-
-                    
-                        case 14:
-                            return classifier14(data);
-
-                    
-                        case 15:
-                            return classifier15(data);
-
-                    
-                        case 44:
-                            return classifier44(data);
-
-                    
-                        default:
-                            return NoKeyword;
-                }
-            }
-
-            
-                QString Basic::toString(Token token)
-                {
-                    const unsigned short *data = 0;
-                    int length = 0;
-
-                    switch(token)
-                    {
-                    
-                        case AReallyLongTokenIFreakinMeanItUKnowUKnowKnow:
-                        {
-                            static const unsigned short staticallyStoredAReallyLongTokenIFreakinMeanItUKnowUKnowKnow[] =
-                            {
-                            97, 82, 101, 97, 108, 108, 121, 76, 111, 110, 103, 84, 111, 107, 101, 110, 73, 70, 114, 101, 97, 107, 105, 110, 77, 101, 97, 110, 73, 116, 85, 75, 110, 111, 119, 85, 75, 110, 111, 119, 75, 110, 111, 119, 0
-                            };
-                            data = staticallyStoredAReallyLongTokenIFreakinMeanItUKnowUKnowKnow;
-                            length = 44;
-                            break;
-                        }
-                    
-                        case ColonInName:
-                        {
-                            static const unsigned short staticallyStoredColonInName[] =
-                            {
-                            99, 111, 108, 111, 110, 58, 105, 110, 58, 110, 97, 109, 101, 58, 0
-                            };
-                            data = staticallyStoredColonInName;
-                            length = 14;
-                            break;
-                        }
-                    
-                        case FFFF:
-                        {
-                            static const unsigned short staticallyStoredFFFF[] =
-                            {
-                            70, 70, 70, 70, 0
-                            };
-                            data = staticallyStoredFFFF;
-                            length = 4;
-                            break;
-                        }
-                    
-                        case FFFG:
-                        {
-                            static const unsigned short staticallyStoredFFFG[] =
-                            {
-                            70, 70, 70, 71, 0
-                            };
-                            data = staticallyStoredFFFG;
-                            length = 4;
-                            break;
-                        }
-                    
-                        case FFGF:
-                        {
-                            static const unsigned short staticallyStoredFFGF[] =
-                            {
-                            70, 70, 71, 70, 0
-                            };
-                            data = staticallyStoredFFGF;
-                            length = 4;
-                            break;
-                        }
-                    
-                        case FFGG:
-                        {
-                            static const unsigned short staticallyStoredFFGG[] =
-                            {
-                            70, 70, 71, 71, 0
-                            };
-                            data = staticallyStoredFFGG;
-                            length = 4;
-                            break;
-                        }
-                    
-                        case FFLM:
-                        {
-                            static const unsigned short staticallyStoredFFLM[] =
-                            {
-                            70, 70, 76, 77, 0
-                            };
-                            data = staticallyStoredFFLM;
-                            length = 4;
-                            break;
-                        }
-                    
-                        case OneColon:
-                        {
-                            static const unsigned short staticallyStoredOneColon[] =
-                            {
-                            111, 110, 101, 58, 99, 111, 108, 111, 110, 0
-                            };
-                            data = staticallyStoredOneColon;
-                            length = 9;
-                            break;
-                        }
-                    
-                        case WeHaveDashes:
-                        {
-                            static const unsigned short staticallyStoredWeHaveDashes[] =
-                            {
-                            119, 101, 45, 104, 97, 118, 101, 45, 100, 97, 115, 104, 101, 115, 0
-                            };
-                            data = staticallyStoredWeHaveDashes;
-                            length = 14;
-                            break;
-                        }
-                    
-                        case WeHaveDashes2:
-                        {
-                            static const unsigned short staticallyStoredWeHaveDashes2[] =
-                            {
-                            119, 101, 45, 104, 97, 118, 101, 45, 100, 97, 115, 104, 101, 115, 45, 0
-                            };
-                            data = staticallyStoredWeHaveDashes2;
-                            length = 15;
-                            break;
-                        }
-                    
-                        case _:
-                        {
-                            static const unsigned short staticallyStored_[] =
-                            {
-                            97, 98, 99, 0
-                            };
-                            data = staticallyStored_;
-                            length = 3;
-                            break;
-                        }
-                    
-                        case _111:
-                        {
-                            static const unsigned short staticallyStored_111[] =
-                            {
-                            100, 101, 102, 0
-                            };
-                            data = staticallyStored_111;
-                            length = 3;
-                            break;
-                        }
-                    
-                        case wobbly:
-                        {
-                            static const unsigned short staticallyStoredwobbly[] =
-                            {
-                            103, 104, 105, 0
-                            };
-                            data = staticallyStoredwobbly;
-                            length = 3;
-                            break;
-                        }
-                    
-                        default:
-                            /* It's either the default token, or an undefined enum
-                             * value. We silence a compiler warning, and return the
-                             * empty string. */
-                            ;
-                    }
-
-                    union
-                    {
-                        const unsigned short *data;
-                        const QChar *asQChar;
-                    } converter;
-                    converter.data = data;
-
-                    return QString::fromRawData(converter.asQChar, length);
-                }
-            
-QT_END_NAMESPACE
-
diff --git a/tests/auto/other/qtokenautomaton/tokenizers/basic/basic.h b/tests/auto/other/qtokenautomaton/tokenizers/basic/basic.h
deleted file mode 100644
index 51a2809d73..0000000000
--- a/tests/auto/other/qtokenautomaton/tokenizers/basic/basic.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-/* NOTE: This file is AUTO GENERATED by qtokenautomaton2cpp.xsl. */
-
-#ifndef q_Basic_h
-#define q_Basic_h
-
-#include <QtCore/QString>
-
-QT_BEGIN_NAMESPACE
-
-class Basic
-                {
-                public:
-                enum Token
-
-                {
-                NoKeyword,
-AReallyLongTokenIFreakinMeanItUKnowUKnowKnow,
-ColonInName,
-FFFF,
-FFFG,
-FFGF,
-FFGG,
-FFLM,
-OneColon,
-WeHaveDashes,
-WeHaveDashes2,
-_,
-_111,
-wobbly
-                };
-
-                static inline Token toToken(const QString &value);
-static inline Token toToken(const QStringRef &value);
-static Token toToken(const QChar *data, int length);
-static QString toString(Token token);
-
-
-                private:
-                    static inline Token classifier3(const QChar *data);
-static inline Token classifier4(const QChar *data);
-static inline Token classifier9(const QChar *data);
-static inline Token classifier14(const QChar *data);
-static inline Token classifier15(const QChar *data);
-static inline Token classifier44(const QChar *data);
-
-                };
-
-                inline Basic::Token Basic::toToken(const QString &value)
-                {
-                    return toToken(value.constData(), value.length());
-                }
-
-                inline Basic::Token Basic::toToken(const QStringRef &value)
-                {
-                    return toToken(value.constData(), value.length());
-                }
-
-                
-QT_END_NAMESPACE
-
-#endif
diff --git a/tests/auto/other/qtokenautomaton/tokenizers/basic/basic.xml b/tests/auto/other/qtokenautomaton/tokenizers/basic/basic.xml
deleted file mode 100644
index 3d7ac868eb..0000000000
--- a/tests/auto/other/qtokenautomaton/tokenizers/basic/basic.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<tokenAutomaton scope="public"
-                className="Basic"
-                headerFile="basic.h"
-                sourceFile="basic.cpp"
-                defaultToken="NoKeyword"
-                tokenEnum="Token"
-                hasToString="true"
-                includeGuardName="q_Basic_h">
-    <tokens>
-        <token>aReallyLongTokenIFreakinMeanItUKnowUKnowKnow</token>
-        <token>FFFF</token>
-        <token>FFFG</token>
-        <token>FFGF</token>
-        <token>FFGG</token>
-        <token>FFLM</token>
-        <token name="_111">def</token>
-        <token name="_">abc</token>
-        <token name="wobbly">ghi</token>
-        <token>we-have-dashes</token>
-        <token name="WeHaveDashes2">we-have-dashes-</token>
-        <token>colon:in:name:</token>
-        <token>one:colon</token>
-    </tokens>
-</tokenAutomaton>
diff --git a/tests/auto/other/qtokenautomaton/tokenizers/basicNamespace/basicNamespace.cpp b/tests/auto/other/qtokenautomaton/tokenizers/basicNamespace/basicNamespace.cpp
deleted file mode 100644
index dace6be146..0000000000
--- a/tests/auto/other/qtokenautomaton/tokenizers/basicNamespace/basicNamespace.cpp
+++ /dev/null
@@ -1,373 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-/* NOTE: This file is AUTO GENERATED by qtokenautomaton2cpp.xsl. */
-
-#include "basicNamespace.h"
-
-QT_BEGIN_NAMESPACE
-
-using namespace BasicNamespace;
-
-Basic::Token Basic::classifier3(const QChar *data)
-
-        {
-            if (data[0].unicode() == 100)
-
-
-                    {
-                    
-                            static const unsigned short string[] =
-                            {
-                                101, 102
-                            };
-                            if(memcmp(&data[1], &string, sizeof(QChar) * 2) == 0)
-                        
-
-                return _111;
-            
-                    }
-
-                else if (data[0].unicode() == 97)
-
-
-                    {
-                    
-                            static const unsigned short string[] =
-                            {
-                                98, 99
-                            };
-                            if(memcmp(&data[1], &string, sizeof(QChar) * 2) == 0)
-                        
-
-                return _;
-            
-                    }
-
-                else if (data[0].unicode() == 103)
-
-
-                    {
-                    
-                            static const unsigned short string[] =
-                            {
-                                104, 105
-                            };
-                            if(memcmp(&data[1], &string, sizeof(QChar) * 2) == 0)
-                        
-
-                return wobbly;
-            
-                    }
-
-                
-
-            return NoKeyword;
-        }
-    Basic::Token Basic::classifier4(const QChar *data)
-
-        {
-            if (data[0].unicode() == 70)
-
-
-                    {
-                    if (data[1].unicode() == 70)
-
-
-                    {
-                    if (data[2].unicode() == 70)
-
-
-                    {
-                    if (data[3].unicode() == 70)
-
-
-                    {
-                    
-
-                return FFFF;
-            
-                    }
-
-                else if (data[3].unicode() == 71)
-
-
-                    {
-                    
-
-                return FFFG;
-            
-                    }
-
-                
-                    }
-
-                else if (data[2].unicode() == 71)
-
-
-                    {
-                    if (data[3].unicode() == 70)
-
-
-                    {
-                    
-
-                return FFGF;
-            
-                    }
-
-                else if (data[3].unicode() == 71)
-
-
-                    {
-                    
-
-                return FFGG;
-            
-                    }
-
-                
-                    }
-
-                else if (data[2].unicode() == 76)
-
-
-                    {
-                    
-                            if (data[3].unicode() == 77)
-                        
-
-                return FFLM;
-            
-                    }
-
-                
-                    }
-
-                
-                    }
-
-                
-
-            return NoKeyword;
-        }
-    Basic::Token Basic::classifier14(const QChar *data)
-
-        {
-            
-                            static const unsigned short string[] =
-                            {
-                                99, 111, 108, 111, 110, 58, 105, 110, 58, 110, 97, 109, 101, 58
-                            };
-                            if(memcmp(&data[0], &string, sizeof(QChar) * 14) == 0)
-                        
-
-                return ColonInName;
-            
-
-            return NoKeyword;
-        }
-    Basic::Token Basic::classifier44(const QChar *data)
-
-        {
-            
-                            static const unsigned short string[] =
-                            {
-                                97, 82, 101, 97, 108, 108, 121, 76, 111, 110, 103, 84, 111, 107, 101, 110, 73, 70, 114, 101, 97, 107, 105, 110, 77, 101, 97, 110, 73, 116, 85, 75, 110, 111, 119, 85, 75, 110, 111, 119, 75, 110, 111, 119
-                            };
-                            if(memcmp(&data[0], &string, sizeof(QChar) * 44) == 0)
-                        
-
-                return AReallyLongTokenIFreakinMeanItUKnowUKnowKnow;
-            
-
-            return NoKeyword;
-        }
-    Basic::Token Basic::toToken(const QChar *data, int length)
-            {
-                switch(length)
-                {
-                    
-                        case 3:
-                            return classifier3(data);
-
-                    
-                        case 4:
-                            return classifier4(data);
-
-                    
-                        case 14:
-                            return classifier14(data);
-
-                    
-                        case 44:
-                            return classifier44(data);
-
-                    
-                        default:
-                            return NoKeyword;
-                }
-            }
-
-            
-                QString Basic::toString(Token token)
-                {
-                    const unsigned short *data = 0;
-                    int length = 0;
-
-                    switch(token)
-                    {
-                    
-                        case AReallyLongTokenIFreakinMeanItUKnowUKnowKnow:
-                        {
-                            static const unsigned short staticallyStoredAReallyLongTokenIFreakinMeanItUKnowUKnowKnow[] =
-                            {
-                            97, 82, 101, 97, 108, 108, 121, 76, 111, 110, 103, 84, 111, 107, 101, 110, 73, 70, 114, 101, 97, 107, 105, 110, 77, 101, 97, 110, 73, 116, 85, 75, 110, 111, 119, 85, 75, 110, 111, 119, 75, 110, 111, 119, 0
-                            };
-                            data = staticallyStoredAReallyLongTokenIFreakinMeanItUKnowUKnowKnow;
-                            length = 44;
-                            break;
-                        }
-                    
-                        case ColonInName:
-                        {
-                            static const unsigned short staticallyStoredColonInName[] =
-                            {
-                            99, 111, 108, 111, 110, 58, 105, 110, 58, 110, 97, 109, 101, 58, 0
-                            };
-                            data = staticallyStoredColonInName;
-                            length = 14;
-                            break;
-                        }
-                    
-                        case FFFF:
-                        {
-                            static const unsigned short staticallyStoredFFFF[] =
-                            {
-                            70, 70, 70, 70, 0
-                            };
-                            data = staticallyStoredFFFF;
-                            length = 4;
-                            break;
-                        }
-                    
-                        case FFFG:
-                        {
-                            static const unsigned short staticallyStoredFFFG[] =
-                            {
-                            70, 70, 70, 71, 0
-                            };
-                            data = staticallyStoredFFFG;
-                            length = 4;
-                            break;
-                        }
-                    
-                        case FFGF:
-                        {
-                            static const unsigned short staticallyStoredFFGF[] =
-                            {
-                            70, 70, 71, 70, 0
-                            };
-                            data = staticallyStoredFFGF;
-                            length = 4;
-                            break;
-                        }
-                    
-                        case FFGG:
-                        {
-                            static const unsigned short staticallyStoredFFGG[] =
-                            {
-                            70, 70, 71, 71, 0
-                            };
-                            data = staticallyStoredFFGG;
-                            length = 4;
-                            break;
-                        }
-                    
-                        case FFLM:
-                        {
-                            static const unsigned short staticallyStoredFFLM[] =
-                            {
-                            70, 70, 76, 77, 0
-                            };
-                            data = staticallyStoredFFLM;
-                            length = 4;
-                            break;
-                        }
-                    
-                        case _:
-                        {
-                            static const unsigned short staticallyStored_[] =
-                            {
-                            97, 98, 99, 0
-                            };
-                            data = staticallyStored_;
-                            length = 3;
-                            break;
-                        }
-                    
-                        case _111:
-                        {
-                            static const unsigned short staticallyStored_111[] =
-                            {
-                            100, 101, 102, 0
-                            };
-                            data = staticallyStored_111;
-                            length = 3;
-                            break;
-                        }
-                    
-                        case wobbly:
-                        {
-                            static const unsigned short staticallyStoredwobbly[] =
-                            {
-                            103, 104, 105, 0
-                            };
-                            data = staticallyStoredwobbly;
-                            length = 3;
-                            break;
-                        }
-                    
-                        default:
-                            /* It's either the default token, or an undefined enum
-                             * value. We silence a compiler warning, and return the
-                             * empty string. */
-                            ;
-                    }
-
-                    union
-                    {
-                        const unsigned short *data;
-                        const QChar *asQChar;
-                    } converter;
-                    converter.data = data;
-
-                    return QString::fromRawData(converter.asQChar, length);
-                }
-            
-QT_END_NAMESPACE
-
diff --git a/tests/auto/other/qtokenautomaton/tokenizers/basicNamespace/basicNamespace.h b/tests/auto/other/qtokenautomaton/tokenizers/basicNamespace/basicNamespace.h
deleted file mode 100644
index c9c534735e..0000000000
--- a/tests/auto/other/qtokenautomaton/tokenizers/basicNamespace/basicNamespace.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-/* NOTE: This file is AUTO GENERATED by qtokenautomaton2cpp.xsl. */
-
-#ifndef q_BasicNamespace_h
-#define q_BasicNamespace_h
-
-#include <QtCore/QString>
-
-QT_BEGIN_NAMESPACE
-
-namespace BasicNamespace
-                {
-            class Basic
-                {
-                public:
-                enum Token
-
-                {
-                NoKeyword,
-AReallyLongTokenIFreakinMeanItUKnowUKnowKnow,
-ColonInName,
-FFFF,
-FFFG,
-FFGF,
-FFGG,
-FFLM,
-_,
-_111,
-wobbly
-                };
-
-                static inline Token toToken(const QString &value);
-static inline Token toToken(const QStringRef &value);
-static Token toToken(const QChar *data, int length);
-static QString toString(Token token);
-
-
-                private:
-                    static inline Token classifier3(const QChar *data);
-static inline Token classifier4(const QChar *data);
-static inline Token classifier14(const QChar *data);
-static inline Token classifier44(const QChar *data);
-
-                };
-
-                inline Basic::Token Basic::toToken(const QString &value)
-                {
-                    return toToken(value.constData(), value.length());
-                }
-
-                inline Basic::Token Basic::toToken(const QStringRef &value)
-                {
-                    return toToken(value.constData(), value.length());
-                }
-
-                }
-
-QT_END_NAMESPACE
-
-#endif
diff --git a/tests/auto/other/qtokenautomaton/tokenizers/basicNamespace/basicNamespace.xml b/tests/auto/other/qtokenautomaton/tokenizers/basicNamespace/basicNamespace.xml
deleted file mode 100644
index 282ffc292d..0000000000
--- a/tests/auto/other/qtokenautomaton/tokenizers/basicNamespace/basicNamespace.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<tokenAutomaton scope="public"
-                namespace="BasicNamespace"
-                className="Basic"
-                headerFile="basicNamespace.h"
-                sourceFile="basicNamespace.cpp"
-                hasToString="true"
-                tokenEnum="Token"
-                defaultToken="NoKeyword"
-                includeGuardName="q_BasicNamespace_h">
-    <tokens>
-        <token>aReallyLongTokenIFreakinMeanItUKnowUKnowKnow</token>
-        <token>FFFF</token>
-        <token>FFFG</token>
-        <token>FFGF</token>
-        <token>FFGG</token>
-        <token>FFLM</token>
-        <token name="_111">def</token>
-        <token name="_">abc</token>
-        <token name="wobbly">ghi</token>
-        <token>colon:in:name:</token>
-    </tokens>
-</tokenAutomaton>
diff --git a/tests/auto/other/qtokenautomaton/tokenizers/boilerplate/boilerplate.cpp b/tests/auto/other/qtokenautomaton/tokenizers/boilerplate/boilerplate.cpp
deleted file mode 100644
index c24900eed0..0000000000
--- a/tests/auto/other/qtokenautomaton/tokenizers/boilerplate/boilerplate.cpp
+++ /dev/null
@@ -1,373 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-
-/* NOTE: This file is AUTO GENERATED by qtokenautomaton2cpp.xsl. */
-
-#include "boilerplate.h"
-
-QT_BEGIN_NAMESPACE
-
-Boilerplate::Token Boilerplate::classifier3(const QChar *data)
-
-        {
-            if (data[0].unicode() == 100)
-
-
-                    {
-                    
-                            static const unsigned short string[] =
-                            {
-                                101, 102
-                            };
-                            if(memcmp(&data[1], &string, sizeof(QChar) * 2) == 0)
-                        
-
-                return _111;
-            
-                    }
-
-                else if (data[0].unicode() == 97)
-
-
-                    {
-                    
-                            static const unsigned short string[] =
-                            {
-                                98, 99
-                            };
-                            if(memcmp(&data[1], &string, sizeof(QChar) * 2) == 0)
-                        
-
-                return _;
-            
-                    }
-
-                else if (data[0].unicode() == 103)
-
-
-                    {
-                    
-                            static const unsigned short string[] =
-                            {
-                                104, 105
-                            };
-                            if(memcmp(&data[1], &string, sizeof(QChar) * 2) == 0)
-                        
-
-                return wobbly;
-            
-                    }
-
-                
-
-            return NoKeyword;
-        }
-    Boilerplate::Token Boilerplate::classifier4(const QChar *data)
-
-        {
-            if (data[0].unicode() == 70)
-
-
-                    {
-                    if (data[1].unicode() == 70)
-
-
-                    {
-                    if (data[2].unicode() == 70)
-
-
-                    {
-                    if (data[3].unicode() == 70)
-
-
-                    {
-                    
-
-                return FFFF;
-            
-                    }
-
-                else if (data[3].unicode() == 71)
-
-
-                    {
-                    
-
-                return FFFG;
-            
-                    }
-
-                
-                    }
-
-                else if (data[2].unicode() == 71)
-
-
-                    {
-                    if (data[3].unicode() == 70)
-
-
-                    {
-                    
-
-                return FFGF;
-            
-                    }
-
-                else if (data[3].unicode() == 71)
-
-
-                    {
-                    
-
-                return FFGG;
-            
-                    }
-
-                
-                    }
-
-                else if (data[2].unicode() == 76)
-
-
-                    {
-                    
-                            if (data[3].unicode() == 77)
-                        
-
-                return FFLM;
-            
-                    }
-
-                
-                    }
-
-                
-                    }
-
-                
-
-            return NoKeyword;
-        }
-    Boilerplate::Token Boilerplate::classifier14(const QChar *data)
-
-        {
-            
-                            static const unsigned short string[] =
-                            {
-                                99, 111, 108, 111, 110, 58, 105, 110, 58, 110, 97, 109, 101, 58
-                            };
-                            if(memcmp(&data[0], &string, sizeof(QChar) * 14) == 0)
-                        
-
-                return ColonInName;
-            
-
-            return NoKeyword;
-        }
-    Boilerplate::Token Boilerplate::classifier44(const QChar *data)
-
-        {
-            
-                            static const unsigned short string[] =
-                            {
-                                97, 82, 101, 97, 108, 108, 121, 76, 111, 110, 103, 84, 111, 107, 101, 110, 73, 70, 114, 101, 97, 107, 105, 110, 77, 101, 97, 110, 73, 116, 85, 75, 110, 111, 119, 85, 75, 110, 111, 119, 75, 110, 111, 119
-                            };
-                            if(memcmp(&data[0], &string, sizeof(QChar) * 44) == 0)
-                        
-
-                return AReallyLongTokenIFreakinMeanItUKnowUKnowKnow;
-            
-
-            return NoKeyword;
-        }
-    Boilerplate::Token Boilerplate::toToken(const QChar *data, int length)
-            {
-                switch(length)
-                {
-                    
-                        case 3:
-                            return classifier3(data);
-
-                    
-                        case 4:
-                            return classifier4(data);
-
-                    
-                        case 14:
-                            return classifier14(data);
-
-                    
-                        case 44:
-                            return classifier44(data);
-
-                    
-                        default:
-                            return NoKeyword;
-                }
-            }
-
-            
-                QString Boilerplate::toString(Token token)
-                {
-                    const unsigned short *data = 0;
-                    int length = 0;
-
-                    switch(token)
-                    {
-                    
-                        case AReallyLongTokenIFreakinMeanItUKnowUKnowKnow:
-                        {
-                            static const unsigned short staticallyStoredAReallyLongTokenIFreakinMeanItUKnowUKnowKnow[] =
-                            {
-                            97, 82, 101, 97, 108, 108, 121, 76, 111, 110, 103, 84, 111, 107, 101, 110, 73, 70, 114, 101, 97, 107, 105, 110, 77, 101, 97, 110, 73, 116, 85, 75, 110, 111, 119, 85, 75, 110, 111, 119, 75, 110, 111, 119, 0
-                            };
-                            data = staticallyStoredAReallyLongTokenIFreakinMeanItUKnowUKnowKnow;
-                            length = 44;
-                            break;
-                        }
-                    
-                        case ColonInName:
-                        {
-                            static const unsigned short staticallyStoredColonInName[] =
-                            {
-                            99, 111, 108, 111, 110, 58, 105, 110, 58, 110, 97, 109, 101, 58, 0
-                            };
-                            data = staticallyStoredColonInName;
-                            length = 14;
-                            break;
-                        }
-                    
-                        case FFFF:
-                        {
-                            static const unsigned short staticallyStoredFFFF[] =
-                            {
-                            70, 70, 70, 70, 0
-                            };
-                            data = staticallyStoredFFFF;
-                            length = 4;
-                            break;
-                        }
-                    
-                        case FFFG:
-                        {
-                            static const unsigned short staticallyStoredFFFG[] =
-                            {
-                            70, 70, 70, 71, 0
-                            };
-                            data = staticallyStoredFFFG;
-                            length = 4;
-                            break;
-                        }
-                    
-                        case FFGF:
-                        {
-                            static const unsigned short staticallyStoredFFGF[] =
-                            {
-                            70, 70, 71, 70, 0
-                            };
-                            data = staticallyStoredFFGF;
-                            length = 4;
-                            break;
-                        }
-                    
-                        case FFGG:
-                        {
-                            static const unsigned short staticallyStoredFFGG[] =
-                            {
-                            70, 70, 71, 71, 0
-                            };
-                            data = staticallyStoredFFGG;
-                            length = 4;
-                            break;
-                        }
-                    
-                        case FFLM:
-                        {
-                            static const unsigned short staticallyStoredFFLM[] =
-                            {
-                            70, 70, 76, 77, 0
-                            };
-                            data = staticallyStoredFFLM;
-                            length = 4;
-                            break;
-                        }
-                    
-                        case _:
-                        {
-                            static const unsigned short staticallyStored_[] =
-                            {
-                            97, 98, 99, 0
-                            };
-                            data = staticallyStored_;
-                            length = 3;
-                            break;
-                        }
-                    
-                        case _111:
-                        {
-                            static const unsigned short staticallyStored_111[] =
-                            {
-                            100, 101, 102, 0
-                            };
-                            data = staticallyStored_111;
-                            length = 3;
-                            break;
-                        }
-                    
-                        case wobbly:
-                        {
-                            static const unsigned short staticallyStoredwobbly[] =
-                            {
-                            103, 104, 105, 0
-                            };
-                            data = staticallyStoredwobbly;
-                            length = 3;
-                            break;
-                        }
-                    
-                        default:
-                            /* It's either the default token, or an undefined enum
-                             * value. We silence a compiler warning, and return the
-                             * empty string. */
-                            ;
-                    }
-
-                    union
-                    {
-                        const unsigned short *data;
-                        const QChar *asQChar;
-                    } converter;
-                    converter.data = data;
-
-                    return QString::fromRawData(converter.asQChar, length);
-                }
-            
-QT_END_NAMESPACE
-
diff --git a/tests/auto/other/qtokenautomaton/tokenizers/boilerplate/boilerplate.h b/tests/auto/other/qtokenautomaton/tokenizers/boilerplate/boilerplate.h
deleted file mode 100644
index 804942e175..0000000000
--- a/tests/auto/other/qtokenautomaton/tokenizers/boilerplate/boilerplate.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-
-/* NOTE: This file is AUTO GENERATED by qtokenautomaton2cpp.xsl. */
-
-#ifndef q_Basic_h
-#define q_Basic_h
-
-#include <QtCore/QString>
-
-QT_BEGIN_NAMESPACE
-
-class Boilerplate
-                {
-                public:
-                enum Token
-
-                {
-                NoKeyword,
-AReallyLongTokenIFreakinMeanItUKnowUKnowKnow,
-ColonInName,
-FFFF,
-FFFG,
-FFGF,
-FFGG,
-FFLM,
-_,
-_111,
-wobbly
-                };
-
-                static inline Token toToken(const QString &value);
-static inline Token toToken(const QStringRef &value);
-static Token toToken(const QChar *data, int length);
-static QString toString(Token token);
-
-
-                private:
-                    static inline Token classifier3(const QChar *data);
-static inline Token classifier4(const QChar *data);
-static inline Token classifier14(const QChar *data);
-static inline Token classifier44(const QChar *data);
-
-                };
-
-                inline Boilerplate::Token Boilerplate::toToken(const QString &value)
-                {
-                    return toToken(value.constData(), value.length());
-                }
-
-                inline Boilerplate::Token Boilerplate::toToken(const QStringRef &value)
-                {
-                    return toToken(value.constData(), value.length());
-                }
-
-                
-QT_END_NAMESPACE
-
-#endif
diff --git a/tests/auto/other/qtokenautomaton/tokenizers/boilerplate/boilerplate.xml b/tests/auto/other/qtokenautomaton/tokenizers/boilerplate/boilerplate.xml
deleted file mode 100644
index a07f2e321e..0000000000
--- a/tests/auto/other/qtokenautomaton/tokenizers/boilerplate/boilerplate.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<tokenAutomaton scope="public"
-                className="Boilerplate"
-                headerFile="boilerplate.h"
-                sourceFile="boilerplate.cpp"
-                defaultToken="NoKeyword"
-                tokenEnum="Token"
-                hasToString="true"
-                includeGuardName="q_Basic_h">
-    <tokens>
-        <token>aReallyLongTokenIFreakinMeanItUKnowUKnowKnow</token>
-        <token>FFFF</token>
-        <token>FFFG</token>
-        <token>FFGF</token>
-        <token>FFGG</token>
-        <token>FFLM</token>
-        <token name="_111">def</token>
-        <token name="_">abc</token>
-        <token name="wobbly">ghi</token>
-        <token>colon:in:name:</token>
-    </tokens>
-
-    <boilerplate>
-        <prolog>/****************************************************************************
-**
-** Copyright (C) 2017 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-</prolog>
-    </boilerplate>
-</tokenAutomaton>
diff --git a/tests/auto/other/qtokenautomaton/tokenizers/noNamespace/noNamespace.cpp b/tests/auto/other/qtokenautomaton/tokenizers/noNamespace/noNamespace.cpp
deleted file mode 100644
index 879f55fa32..0000000000
--- a/tests/auto/other/qtokenautomaton/tokenizers/noNamespace/noNamespace.cpp
+++ /dev/null
@@ -1,436 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-/* NOTE: This file is AUTO GENERATED by qtokenautomaton2cpp.xsl. */
-
-#include "noNamespace.h"
-
-QT_BEGIN_NAMESPACE
-
-NoNamespace::Token NoNamespace::classifier3(const QChar *data)
-
-        {
-            if (data[0].unicode() == 100)
-
-
-                    {
-                    
-                            static const unsigned short string[] =
-                            {
-                                101, 102
-                            };
-                            if(memcmp(&data[1], &string, sizeof(QChar) * 2) == 0)
-                        
-
-                return _111;
-            
-                    }
-
-                else if (data[0].unicode() == 97)
-
-
-                    {
-                    
-                            static const unsigned short string[] =
-                            {
-                                98, 99
-                            };
-                            if(memcmp(&data[1], &string, sizeof(QChar) * 2) == 0)
-                        
-
-                return _;
-            
-                    }
-
-                else if (data[0].unicode() == 103)
-
-
-                    {
-                    
-                            static const unsigned short string[] =
-                            {
-                                104, 105
-                            };
-                            if(memcmp(&data[1], &string, sizeof(QChar) * 2) == 0)
-                        
-
-                return wobbly;
-            
-                    }
-
-                
-
-            return NoKeyword;
-        }
-    NoNamespace::Token NoNamespace::classifier4(const QChar *data)
-
-        {
-            if (data[0].unicode() == 70)
-
-
-                    {
-                    if (data[1].unicode() == 70)
-
-
-                    {
-                    if (data[2].unicode() == 70)
-
-
-                    {
-                    if (data[3].unicode() == 70)
-
-
-                    {
-                    
-
-                return FFFF;
-            
-                    }
-
-                else if (data[3].unicode() == 71)
-
-
-                    {
-                    
-
-                return FFFG;
-            
-                    }
-
-                
-                    }
-
-                else if (data[2].unicode() == 71)
-
-
-                    {
-                    if (data[3].unicode() == 70)
-
-
-                    {
-                    
-
-                return FFGF;
-            
-                    }
-
-                else if (data[3].unicode() == 71)
-
-
-                    {
-                    
-
-                return FFGG;
-            
-                    }
-
-                
-                    }
-
-                else if (data[2].unicode() == 76)
-
-
-                    {
-                    
-                            if (data[3].unicode() == 77)
-                        
-
-                return FFLM;
-            
-                    }
-
-                
-                    }
-
-                
-                    }
-
-                
-
-            return NoKeyword;
-        }
-    NoNamespace::Token NoNamespace::classifier14(const QChar *data)
-
-        {
-            if (data[0].unicode() == 119)
-
-
-                    {
-                    
-                            static const unsigned short string[] =
-                            {
-                                101, 45, 104, 97, 118, 101, 45, 100, 97, 115, 104, 101, 115
-                            };
-                            if(memcmp(&data[1], &string, sizeof(QChar) * 13) == 0)
-                        
-
-                return WeHaveDashes;
-            
-                    }
-
-                else if (data[0].unicode() == 99)
-
-
-                    {
-                    
-                            static const unsigned short string[] =
-                            {
-                                111, 108, 111, 110, 58, 105, 110, 58, 110, 97, 109, 101, 58
-                            };
-                            if(memcmp(&data[1], &string, sizeof(QChar) * 13) == 0)
-                        
-
-                return ColonInName;
-            
-                    }
-
-                
-
-            return NoKeyword;
-        }
-    NoNamespace::Token NoNamespace::classifier15(const QChar *data)
-
-        {
-            
-                            static const unsigned short string[] =
-                            {
-                                119, 101, 45, 104, 97, 118, 101, 45, 100, 97, 115, 104, 101, 115, 45
-                            };
-                            if(memcmp(&data[0], &string, sizeof(QChar) * 15) == 0)
-                        
-
-                return WeHaveDashes2;
-            
-
-            return NoKeyword;
-        }
-    NoNamespace::Token NoNamespace::classifier44(const QChar *data)
-
-        {
-            
-                            static const unsigned short string[] =
-                            {
-                                97, 82, 101, 97, 108, 108, 121, 76, 111, 110, 103, 84, 111, 107, 101, 110, 73, 70, 114, 101, 97, 107, 105, 110, 77, 101, 97, 110, 73, 116, 85, 75, 110, 111, 119, 85, 75, 110, 111, 119, 75, 110, 111, 119
-                            };
-                            if(memcmp(&data[0], &string, sizeof(QChar) * 44) == 0)
-                        
-
-                return AReallyLongTokenIFreakinMeanItUKnowUKnowKnow;
-            
-
-            return NoKeyword;
-        }
-    NoNamespace::Token NoNamespace::toToken(const QChar *data, int length)
-            {
-                switch(length)
-                {
-                    
-                        case 3:
-                            return classifier3(data);
-
-                    
-                        case 4:
-                            return classifier4(data);
-
-                    
-                        case 14:
-                            return classifier14(data);
-
-                    
-                        case 15:
-                            return classifier15(data);
-
-                    
-                        case 44:
-                            return classifier44(data);
-
-                    
-                        default:
-                            return NoKeyword;
-                }
-            }
-
-            
-                QString NoNamespace::toString(Token token)
-                {
-                    const unsigned short *data = 0;
-                    int length = 0;
-
-                    switch(token)
-                    {
-                    
-                        case AReallyLongTokenIFreakinMeanItUKnowUKnowKnow:
-                        {
-                            static const unsigned short staticallyStoredAReallyLongTokenIFreakinMeanItUKnowUKnowKnow[] =
-                            {
-                            97, 82, 101, 97, 108, 108, 121, 76, 111, 110, 103, 84, 111, 107, 101, 110, 73, 70, 114, 101, 97, 107, 105, 110, 77, 101, 97, 110, 73, 116, 85, 75, 110, 111, 119, 85, 75, 110, 111, 119, 75, 110, 111, 119, 0
-                            };
-                            data = staticallyStoredAReallyLongTokenIFreakinMeanItUKnowUKnowKnow;
-                            length = 44;
-                            break;
-                        }
-                    
-                        case ColonInName:
-                        {
-                            static const unsigned short staticallyStoredColonInName[] =
-                            {
-                            99, 111, 108, 111, 110, 58, 105, 110, 58, 110, 97, 109, 101, 58, 0
-                            };
-                            data = staticallyStoredColonInName;
-                            length = 14;
-                            break;
-                        }
-                    
-                        case FFFF:
-                        {
-                            static const unsigned short staticallyStoredFFFF[] =
-                            {
-                            70, 70, 70, 70, 0
-                            };
-                            data = staticallyStoredFFFF;
-                            length = 4;
-                            break;
-                        }
-                    
-                        case FFFG:
-                        {
-                            static const unsigned short staticallyStoredFFFG[] =
-                            {
-                            70, 70, 70, 71, 0
-                            };
-                            data = staticallyStoredFFFG;
-                            length = 4;
-                            break;
-                        }
-                    
-                        case FFGF:
-                        {
-                            static const unsigned short staticallyStoredFFGF[] =
-                            {
-                            70, 70, 71, 70, 0
-                            };
-                            data = staticallyStoredFFGF;
-                            length = 4;
-                            break;
-                        }
-                    
-                        case FFGG:
-                        {
-                            static const unsigned short staticallyStoredFFGG[] =
-                            {
-                            70, 70, 71, 71, 0
-                            };
-                            data = staticallyStoredFFGG;
-                            length = 4;
-                            break;
-                        }
-                    
-                        case FFLM:
-                        {
-                            static const unsigned short staticallyStoredFFLM[] =
-                            {
-                            70, 70, 76, 77, 0
-                            };
-                            data = staticallyStoredFFLM;
-                            length = 4;
-                            break;
-                        }
-                    
-                        case WeHaveDashes:
-                        {
-                            static const unsigned short staticallyStoredWeHaveDashes[] =
-                            {
-                            119, 101, 45, 104, 97, 118, 101, 45, 100, 97, 115, 104, 101, 115, 0
-                            };
-                            data = staticallyStoredWeHaveDashes;
-                            length = 14;
-                            break;
-                        }
-                    
-                        case WeHaveDashes2:
-                        {
-                            static const unsigned short staticallyStoredWeHaveDashes2[] =
-                            {
-                            119, 101, 45, 104, 97, 118, 101, 45, 100, 97, 115, 104, 101, 115, 45, 0
-                            };
-                            data = staticallyStoredWeHaveDashes2;
-                            length = 15;
-                            break;
-                        }
-                    
-                        case _:
-                        {
-                            static const unsigned short staticallyStored_[] =
-                            {
-                            97, 98, 99, 0
-                            };
-                            data = staticallyStored_;
-                            length = 3;
-                            break;
-                        }
-                    
-                        case _111:
-                        {
-                            static const unsigned short staticallyStored_111[] =
-                            {
-                            100, 101, 102, 0
-                            };
-                            data = staticallyStored_111;
-                            length = 3;
-                            break;
-                        }
-                    
-                        case wobbly:
-                        {
-                            static const unsigned short staticallyStoredwobbly[] =
-                            {
-                            103, 104, 105, 0
-                            };
-                            data = staticallyStoredwobbly;
-                            length = 3;
-                            break;
-                        }
-                    
-                        default:
-                            /* It's either the default token, or an undefined enum
-                             * value. We silence a compiler warning, and return the
-                             * empty string. */
-                            ;
-                    }
-
-                    union
-                    {
-                        const unsigned short *data;
-                        const QChar *asQChar;
-                    } converter;
-                    converter.data = data;
-
-                    return QString::fromRawData(converter.asQChar, length);
-                }
-            
-QT_END_NAMESPACE
-
diff --git a/tests/auto/other/qtokenautomaton/tokenizers/noNamespace/noNamespace.h b/tests/auto/other/qtokenautomaton/tokenizers/noNamespace/noNamespace.h
deleted file mode 100644
index 4029f115f3..0000000000
--- a/tests/auto/other/qtokenautomaton/tokenizers/noNamespace/noNamespace.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-/* NOTE: This file is AUTO GENERATED by qtokenautomaton2cpp.xsl. */
-
-#ifndef q_noNamespace_h
-#define q_noNamespace_h
-
-#include <QtCore/QString>
-
-QT_BEGIN_NAMESPACE
-
-class NoNamespace
-                {
-                public:
-                enum Token
-
-                {
-                NoKeyword,
-AReallyLongTokenIFreakinMeanItUKnowUKnowKnow,
-ColonInName,
-FFFF,
-FFFG,
-FFGF,
-FFGG,
-FFLM,
-WeHaveDashes,
-WeHaveDashes2,
-_,
-_111,
-wobbly
-                };
-
-                static inline Token toToken(const QString &value);
-static inline Token toToken(const QStringRef &value);
-static Token toToken(const QChar *data, int length);
-static QString toString(Token token);
-
-
-                private:
-                    static inline Token classifier3(const QChar *data);
-static inline Token classifier4(const QChar *data);
-static inline Token classifier14(const QChar *data);
-static inline Token classifier15(const QChar *data);
-static inline Token classifier44(const QChar *data);
-
-                };
-
-                inline NoNamespace::Token NoNamespace::toToken(const QString &value)
-                {
-                    return toToken(value.constData(), value.length());
-                }
-
-                inline NoNamespace::Token NoNamespace::toToken(const QStringRef &value)
-                {
-                    return toToken(value.constData(), value.length());
-                }
-
-                
-QT_END_NAMESPACE
-
-#endif
diff --git a/tests/auto/other/qtokenautomaton/tokenizers/noNamespace/noNamespace.xml b/tests/auto/other/qtokenautomaton/tokenizers/noNamespace/noNamespace.xml
deleted file mode 100644
index 67738cd3bd..0000000000
--- a/tests/auto/other/qtokenautomaton/tokenizers/noNamespace/noNamespace.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<tokenAutomaton scope="public"
-                className="NoNamespace"
-                headerFile="noNamespace.h"
-                sourceFile="noNamespace.cpp"
-                defaultToken="NoKeyword"
-                tokenEnum="Token"
-                hasToString="true"
-                includeGuardName="q_noNamespace_h">
-    <tokens>
-        <token>aReallyLongTokenIFreakinMeanItUKnowUKnowKnow</token>
-        <token>FFFF</token>
-        <token>FFFG</token>
-        <token>FFGF</token>
-        <token>FFGG</token>
-        <token>FFLM</token>
-        <token name="_111">def</token>
-        <token name="_">abc</token>
-        <token name="wobbly">ghi</token>
-        <token>we-have-dashes</token>
-        <token name="WeHaveDashes2">we-have-dashes-</token>
-        <token>colon:in:name:</token>
-    </tokens>
-</tokenAutomaton>
diff --git a/tests/auto/other/qtokenautomaton/tokenizers/noToString/noToString.cpp b/tests/auto/other/qtokenautomaton/tokenizers/noToString/noToString.cpp
deleted file mode 100644
index 5be9b3879f..0000000000
--- a/tests/auto/other/qtokenautomaton/tokenizers/noToString/noToString.cpp
+++ /dev/null
@@ -1,238 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-/* NOTE: This file is AUTO GENERATED by qtokenautomaton2cpp.xsl. */
-
-#include "noToString.h"
-
-QT_BEGIN_NAMESPACE
-
-using namespace NoToStringNS;
-
-NoToString::Token NoToString::classifier3(const QChar *data)
-
-        {
-            if (data[0].unicode() == 100)
-
-
-                    {
-                    
-                            static const unsigned short string[] =
-                            {
-                                101, 102
-                            };
-                            if(memcmp(&data[1], &string, sizeof(QChar) * 2) == 0)
-                        
-
-                return _111;
-            
-                    }
-
-                else if (data[0].unicode() == 97)
-
-
-                    {
-                    
-                            static const unsigned short string[] =
-                            {
-                                98, 99
-                            };
-                            if(memcmp(&data[1], &string, sizeof(QChar) * 2) == 0)
-                        
-
-                return _;
-            
-                    }
-
-                else if (data[0].unicode() == 103)
-
-
-                    {
-                    
-                            static const unsigned short string[] =
-                            {
-                                104, 105
-                            };
-                            if(memcmp(&data[1], &string, sizeof(QChar) * 2) == 0)
-                        
-
-                return wobbly;
-            
-                    }
-
-                
-
-            return NoKeyword;
-        }
-    NoToString::Token NoToString::classifier4(const QChar *data)
-
-        {
-            if (data[0].unicode() == 70)
-
-
-                    {
-                    if (data[1].unicode() == 70)
-
-
-                    {
-                    if (data[2].unicode() == 70)
-
-
-                    {
-                    if (data[3].unicode() == 70)
-
-
-                    {
-                    
-
-                return FFFF;
-            
-                    }
-
-                else if (data[3].unicode() == 71)
-
-
-                    {
-                    
-
-                return FFFG;
-            
-                    }
-
-                
-                    }
-
-                else if (data[2].unicode() == 71)
-
-
-                    {
-                    if (data[3].unicode() == 70)
-
-
-                    {
-                    
-
-                return FFGF;
-            
-                    }
-
-                else if (data[3].unicode() == 71)
-
-
-                    {
-                    
-
-                return FFGG;
-            
-                    }
-
-                
-                    }
-
-                else if (data[2].unicode() == 76)
-
-
-                    {
-                    
-                            if (data[3].unicode() == 77)
-                        
-
-                return FFLM;
-            
-                    }
-
-                
-                    }
-
-                
-                    }
-
-                
-
-            return NoKeyword;
-        }
-    NoToString::Token NoToString::classifier14(const QChar *data)
-
-        {
-            
-                            static const unsigned short string[] =
-                            {
-                                99, 111, 108, 111, 110, 58, 105, 110, 58, 110, 97, 109, 101, 58
-                            };
-                            if(memcmp(&data[0], &string, sizeof(QChar) * 14) == 0)
-                        
-
-                return ColonInName;
-            
-
-            return NoKeyword;
-        }
-    NoToString::Token NoToString::classifier44(const QChar *data)
-
-        {
-            
-                            static const unsigned short string[] =
-                            {
-                                97, 82, 101, 97, 108, 108, 121, 76, 111, 110, 103, 84, 111, 107, 101, 110, 73, 70, 114, 101, 97, 107, 105, 110, 77, 101, 97, 110, 73, 116, 85, 75, 110, 111, 119, 85, 75, 110, 111, 119, 75, 110, 111, 119
-                            };
-                            if(memcmp(&data[0], &string, sizeof(QChar) * 44) == 0)
-                        
-
-                return AReallyLongTokenIFreakinMeanItUKnowUKnowKnow;
-            
-
-            return NoKeyword;
-        }
-    NoToString::Token NoToString::toToken(const QChar *data, int length)
-            {
-                switch(length)
-                {
-                    
-                        case 3:
-                            return classifier3(data);
-
-                    
-                        case 4:
-                            return classifier4(data);
-
-                    
-                        case 14:
-                            return classifier14(data);
-
-                    
-                        case 44:
-                            return classifier44(data);
-
-                    
-                        default:
-                            return NoKeyword;
-                }
-            }
-
-            
-QT_END_NAMESPACE
-
diff --git a/tests/auto/other/qtokenautomaton/tokenizers/noToString/noToString.h b/tests/auto/other/qtokenautomaton/tokenizers/noToString/noToString.h
deleted file mode 100644
index dbeb3a9c07..0000000000
--- a/tests/auto/other/qtokenautomaton/tokenizers/noToString/noToString.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-/* NOTE: This file is AUTO GENERATED by qtokenautomaton2cpp.xsl. */
-
-#ifndef q_NoToStringNS_h
-#define q_NoToStringNS_h
-
-#include <QtCore/QString>
-
-QT_BEGIN_NAMESPACE
-
-namespace NoToStringNS
-                {
-            class NoToString
-                {
-                public:
-                enum Token
-
-                {
-                NoKeyword,
-AReallyLongTokenIFreakinMeanItUKnowUKnowKnow,
-ColonInName,
-FFFF,
-FFFG,
-FFGF,
-FFGG,
-FFLM,
-_,
-_111,
-wobbly
-                };
-
-                static inline Token toToken(const QString &value);
-static inline Token toToken(const QStringRef &value);
-static Token toToken(const QChar *data, int length);
-
-
-                private:
-                    static inline Token classifier3(const QChar *data);
-static inline Token classifier4(const QChar *data);
-static inline Token classifier14(const QChar *data);
-static inline Token classifier44(const QChar *data);
-
-                };
-
-                inline NoToString::Token NoToString::toToken(const QString &value)
-                {
-                    return toToken(value.constData(), value.length());
-                }
-
-                inline NoToString::Token NoToString::toToken(const QStringRef &value)
-                {
-                    return toToken(value.constData(), value.length());
-                }
-
-                }
-
-QT_END_NAMESPACE
-
-#endif
diff --git a/tests/auto/other/qtokenautomaton/tokenizers/noToString/noToString.xml b/tests/auto/other/qtokenautomaton/tokenizers/noToString/noToString.xml
deleted file mode 100644
index 99e1644d87..0000000000
--- a/tests/auto/other/qtokenautomaton/tokenizers/noToString/noToString.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<tokenAutomaton scope="public"
-                namespace="NoToStringNS"
-                className="NoToString"
-                headerFile="noToString.h"
-                sourceFile="noToString.cpp"
-                hasToString="false"
-                tokenEnum="Token"
-                defaultToken="NoKeyword"
-                includeGuardName="q_NoToStringNS_h">
-    <tokens>
-        <token>aReallyLongTokenIFreakinMeanItUKnowUKnowKnow</token>
-        <token>FFFF</token>
-        <token>FFFG</token>
-        <token>FFGF</token>
-        <token>FFGG</token>
-        <token>FFLM</token>
-        <token name="_111">def</token>
-        <token name="_">abc</token>
-        <token name="wobbly">ghi</token>
-        <token>colon:in:name:</token>
-    </tokens>
-</tokenAutomaton>
diff --git a/tests/auto/other/qtokenautomaton/tokenizers/withNamespace/withNamespace.cpp b/tests/auto/other/qtokenautomaton/tokenizers/withNamespace/withNamespace.cpp
deleted file mode 100644
index 69c6de2f39..0000000000
--- a/tests/auto/other/qtokenautomaton/tokenizers/withNamespace/withNamespace.cpp
+++ /dev/null
@@ -1,438 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-/* NOTE: This file is AUTO GENERATED by qtokenautomaton2cpp.xsl. */
-
-#include "withNamespace.h"
-
-QT_BEGIN_NAMESPACE
-
-using namespace TheNamespace;
-
-WithNamespace::Token WithNamespace::classifier3(const QChar *data)
-
-        {
-            if (data[0].unicode() == 100)
-
-
-                    {
-                    
-                            static const unsigned short string[] =
-                            {
-                                101, 102
-                            };
-                            if(memcmp(&data[1], &string, sizeof(QChar) * 2) == 0)
-                        
-
-                return _111;
-            
-                    }
-
-                else if (data[0].unicode() == 97)
-
-
-                    {
-                    
-                            static const unsigned short string[] =
-                            {
-                                98, 99
-                            };
-                            if(memcmp(&data[1], &string, sizeof(QChar) * 2) == 0)
-                        
-
-                return _;
-            
-                    }
-
-                else if (data[0].unicode() == 103)
-
-
-                    {
-                    
-                            static const unsigned short string[] =
-                            {
-                                104, 105
-                            };
-                            if(memcmp(&data[1], &string, sizeof(QChar) * 2) == 0)
-                        
-
-                return wobbly;
-            
-                    }
-
-                
-
-            return NoKeyword;
-        }
-    WithNamespace::Token WithNamespace::classifier4(const QChar *data)
-
-        {
-            if (data[0].unicode() == 70)
-
-
-                    {
-                    if (data[1].unicode() == 70)
-
-
-                    {
-                    if (data[2].unicode() == 70)
-
-
-                    {
-                    if (data[3].unicode() == 70)
-
-
-                    {
-                    
-
-                return FFFF;
-            
-                    }
-
-                else if (data[3].unicode() == 71)
-
-
-                    {
-                    
-
-                return FFFG;
-            
-                    }
-
-                
-                    }
-
-                else if (data[2].unicode() == 71)
-
-
-                    {
-                    if (data[3].unicode() == 70)
-
-
-                    {
-                    
-
-                return FFGF;
-            
-                    }
-
-                else if (data[3].unicode() == 71)
-
-
-                    {
-                    
-
-                return FFGG;
-            
-                    }
-
-                
-                    }
-
-                else if (data[2].unicode() == 76)
-
-
-                    {
-                    
-                            if (data[3].unicode() == 77)
-                        
-
-                return FFLM;
-            
-                    }
-
-                
-                    }
-
-                
-                    }
-
-                
-
-            return NoKeyword;
-        }
-    WithNamespace::Token WithNamespace::classifier14(const QChar *data)
-
-        {
-            if (data[0].unicode() == 119)
-
-
-                    {
-                    
-                            static const unsigned short string[] =
-                            {
-                                101, 45, 104, 97, 118, 101, 45, 100, 97, 115, 104, 101, 115
-                            };
-                            if(memcmp(&data[1], &string, sizeof(QChar) * 13) == 0)
-                        
-
-                return WeHaveDashes;
-            
-                    }
-
-                else if (data[0].unicode() == 99)
-
-
-                    {
-                    
-                            static const unsigned short string[] =
-                            {
-                                111, 108, 111, 110, 58, 105, 110, 58, 110, 97, 109, 101, 58
-                            };
-                            if(memcmp(&data[1], &string, sizeof(QChar) * 13) == 0)
-                        
-
-                return ColonInName;
-            
-                    }
-
-                
-
-            return NoKeyword;
-        }
-    WithNamespace::Token WithNamespace::classifier15(const QChar *data)
-
-        {
-            
-                            static const unsigned short string[] =
-                            {
-                                119, 101, 45, 104, 97, 118, 101, 45, 100, 97, 115, 104, 101, 115, 45
-                            };
-                            if(memcmp(&data[0], &string, sizeof(QChar) * 15) == 0)
-                        
-
-                return WeHaveDashes2;
-            
-
-            return NoKeyword;
-        }
-    WithNamespace::Token WithNamespace::classifier44(const QChar *data)
-
-        {
-            
-                            static const unsigned short string[] =
-                            {
-                                97, 82, 101, 97, 108, 108, 121, 76, 111, 110, 103, 84, 111, 107, 101, 110, 73, 70, 114, 101, 97, 107, 105, 110, 77, 101, 97, 110, 73, 116, 85, 75, 110, 111, 119, 85, 75, 110, 111, 119, 75, 110, 111, 119
-                            };
-                            if(memcmp(&data[0], &string, sizeof(QChar) * 44) == 0)
-                        
-
-                return AReallyLongTokenIFreakinMeanItUKnowUKnowKnow;
-            
-
-            return NoKeyword;
-        }
-    WithNamespace::Token WithNamespace::toToken(const QChar *data, int length)
-            {
-                switch(length)
-                {
-                    
-                        case 3:
-                            return classifier3(data);
-
-                    
-                        case 4:
-                            return classifier4(data);
-
-                    
-                        case 14:
-                            return classifier14(data);
-
-                    
-                        case 15:
-                            return classifier15(data);
-
-                    
-                        case 44:
-                            return classifier44(data);
-
-                    
-                        default:
-                            return NoKeyword;
-                }
-            }
-
-            
-                QString WithNamespace::toString(Token token)
-                {
-                    const unsigned short *data = 0;
-                    int length = 0;
-
-                    switch(token)
-                    {
-                    
-                        case AReallyLongTokenIFreakinMeanItUKnowUKnowKnow:
-                        {
-                            static const unsigned short staticallyStoredAReallyLongTokenIFreakinMeanItUKnowUKnowKnow[] =
-                            {
-                            97, 82, 101, 97, 108, 108, 121, 76, 111, 110, 103, 84, 111, 107, 101, 110, 73, 70, 114, 101, 97, 107, 105, 110, 77, 101, 97, 110, 73, 116, 85, 75, 110, 111, 119, 85, 75, 110, 111, 119, 75, 110, 111, 119, 0
-                            };
-                            data = staticallyStoredAReallyLongTokenIFreakinMeanItUKnowUKnowKnow;
-                            length = 44;
-                            break;
-                        }
-                    
-                        case ColonInName:
-                        {
-                            static const unsigned short staticallyStoredColonInName[] =
-                            {
-                            99, 111, 108, 111, 110, 58, 105, 110, 58, 110, 97, 109, 101, 58, 0
-                            };
-                            data = staticallyStoredColonInName;
-                            length = 14;
-                            break;
-                        }
-                    
-                        case FFFF:
-                        {
-                            static const unsigned short staticallyStoredFFFF[] =
-                            {
-                            70, 70, 70, 70, 0
-                            };
-                            data = staticallyStoredFFFF;
-                            length = 4;
-                            break;
-                        }
-                    
-                        case FFFG:
-                        {
-                            static const unsigned short staticallyStoredFFFG[] =
-                            {
-                            70, 70, 70, 71, 0
-                            };
-                            data = staticallyStoredFFFG;
-                            length = 4;
-                            break;
-                        }
-                    
-                        case FFGF:
-                        {
-                            static const unsigned short staticallyStoredFFGF[] =
-                            {
-                            70, 70, 71, 70, 0
-                            };
-                            data = staticallyStoredFFGF;
-                            length = 4;
-                            break;
-                        }
-                    
-                        case FFGG:
-                        {
-                            static const unsigned short staticallyStoredFFGG[] =
-                            {
-                            70, 70, 71, 71, 0
-                            };
-                            data = staticallyStoredFFGG;
-                            length = 4;
-                            break;
-                        }
-                    
-                        case FFLM:
-                        {
-                            static const unsigned short staticallyStoredFFLM[] =
-                            {
-                            70, 70, 76, 77, 0
-                            };
-                            data = staticallyStoredFFLM;
-                            length = 4;
-                            break;
-                        }
-                    
-                        case WeHaveDashes:
-                        {
-                            static const unsigned short staticallyStoredWeHaveDashes[] =
-                            {
-                            119, 101, 45, 104, 97, 118, 101, 45, 100, 97, 115, 104, 101, 115, 0
-                            };
-                            data = staticallyStoredWeHaveDashes;
-                            length = 14;
-                            break;
-                        }
-                    
-                        case WeHaveDashes2:
-                        {
-                            static const unsigned short staticallyStoredWeHaveDashes2[] =
-                            {
-                            119, 101, 45, 104, 97, 118, 101, 45, 100, 97, 115, 104, 101, 115, 45, 0
-                            };
-                            data = staticallyStoredWeHaveDashes2;
-                            length = 15;
-                            break;
-                        }
-                    
-                        case _:
-                        {
-                            static const unsigned short staticallyStored_[] =
-                            {
-                            97, 98, 99, 0
-                            };
-                            data = staticallyStored_;
-                            length = 3;
-                            break;
-                        }
-                    
-                        case _111:
-                        {
-                            static const unsigned short staticallyStored_111[] =
-                            {
-                            100, 101, 102, 0
-                            };
-                            data = staticallyStored_111;
-                            length = 3;
-                            break;
-                        }
-                    
-                        case wobbly:
-                        {
-                            static const unsigned short staticallyStoredwobbly[] =
-                            {
-                            103, 104, 105, 0
-                            };
-                            data = staticallyStoredwobbly;
-                            length = 3;
-                            break;
-                        }
-                    
-                        default:
-                            /* It's either the default token, or an undefined enum
-                             * value. We silence a compiler warning, and return the
-                             * empty string. */
-                            ;
-                    }
-
-                    union
-                    {
-                        const unsigned short *data;
-                        const QChar *asQChar;
-                    } converter;
-                    converter.data = data;
-
-                    return QString::fromRawData(converter.asQChar, length);
-                }
-            
-QT_END_NAMESPACE
-
diff --git a/tests/auto/other/qtokenautomaton/tokenizers/withNamespace/withNamespace.h b/tests/auto/other/qtokenautomaton/tokenizers/withNamespace/withNamespace.h
deleted file mode 100644
index 04d2ba0751..0000000000
--- a/tests/auto/other/qtokenautomaton/tokenizers/withNamespace/withNamespace.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-/* NOTE: This file is AUTO GENERATED by qtokenautomaton2cpp.xsl. */
-
-#ifndef q_withNamespace_h
-#define q_withNamespace_h
-
-#include <QtCore/QString>
-
-QT_BEGIN_NAMESPACE
-
-namespace TheNamespace
-                {
-            class WithNamespace
-                {
-                public:
-                enum Token
-
-                {
-                NoKeyword,
-AReallyLongTokenIFreakinMeanItUKnowUKnowKnow,
-ColonInName,
-FFFF,
-FFFG,
-FFGF,
-FFGG,
-FFLM,
-WeHaveDashes,
-WeHaveDashes2,
-_,
-_111,
-wobbly
-                };
-
-                static inline Token toToken(const QString &value);
-static inline Token toToken(const QStringRef &value);
-static Token toToken(const QChar *data, int length);
-static QString toString(Token token);
-
-
-                private:
-                    static inline Token classifier3(const QChar *data);
-static inline Token classifier4(const QChar *data);
-static inline Token classifier14(const QChar *data);
-static inline Token classifier15(const QChar *data);
-static inline Token classifier44(const QChar *data);
-
-                };
-
-                inline WithNamespace::Token WithNamespace::toToken(const QString &value)
-                {
-                    return toToken(value.constData(), value.length());
-                }
-
-                inline WithNamespace::Token WithNamespace::toToken(const QStringRef &value)
-                {
-                    return toToken(value.constData(), value.length());
-                }
-
-                }
-
-QT_END_NAMESPACE
-
-#endif
diff --git a/tests/auto/other/qtokenautomaton/tokenizers/withNamespace/withNamespace.xml b/tests/auto/other/qtokenautomaton/tokenizers/withNamespace/withNamespace.xml
deleted file mode 100644
index 533eed85b7..0000000000
--- a/tests/auto/other/qtokenautomaton/tokenizers/withNamespace/withNamespace.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<tokenAutomaton scope="public"
-                className="WithNamespace"
-                headerFile="withNamespace.h"
-                sourceFile="withNamespace.cpp"
-                defaultToken="NoKeyword"
-                tokenEnum="Token"
-                hasToString="true"
-                namespace="TheNamespace"
-                includeGuardName="q_withNamespace_h">
-    <tokens>
-        <token>aReallyLongTokenIFreakinMeanItUKnowUKnowKnow</token>
-        <token>FFFF</token>
-        <token>FFFG</token>
-        <token>FFGF</token>
-        <token>FFGG</token>
-        <token>FFLM</token>
-        <token name="_111">def</token>
-        <token name="_">abc</token>
-        <token name="wobbly">ghi</token>
-        <token>we-have-dashes</token>
-        <token name="WeHaveDashes2">we-have-dashes-</token>
-        <token>colon:in:name:</token>
-    </tokens>
-</tokenAutomaton>
diff --git a/tests/auto/other/qtokenautomaton/tst_qtokenautomaton.cpp b/tests/auto/other/qtokenautomaton/tst_qtokenautomaton.cpp
deleted file mode 100644
index d6cc405854..0000000000
--- a/tests/auto/other/qtokenautomaton/tst_qtokenautomaton.cpp
+++ /dev/null
@@ -1,121 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-
-#include <QtTest/QtTest>
-
-#include "tokenizers/basic/basic.h"
-#include "tokenizers/basicNamespace/basicNamespace.h"
-#include "tokenizers/boilerplate/boilerplate.h"
-#include "tokenizers/noToString/noToString.h"
-
-/*!
- \class tst_QTokenAutomaton
- \internal
- \brief Tests the QTokenAutomaton generator.
-
-TODO:
-    - Verify high Unicode codepoints
-    - Verify that signatures are static.
- */
-class tst_QTokenAutomaton : public QObject
-{
-    Q_OBJECT
-
-private Q_SLOTS:
-    void tokenizerBasic() const;
-};
-
-void tst_QTokenAutomaton::tokenizerBasic() const
-{
-    typedef QPair<Basic::Token, QString> TokenPair;
-    typedef QList<TokenPair> TokenPairList;
-
-    /* Tokenizer basic. */
-    {
-        /* All the tokens matching tokens. */
-        {
-            TokenPairList tokens;
-            tokens.append(qMakePair(Basic::_, QString::fromLatin1("abc")));
-            tokens.append(qMakePair(Basic::_111, QString::fromLatin1("def")));
-            tokens.append(qMakePair(Basic::wobbly, QString::fromLatin1("ghi")));
-            tokens.append(qMakePair(Basic::FFFF, QString::fromLatin1("FFFF")));
-            tokens.append(qMakePair(Basic::FFFG, QString::fromLatin1("FFFG")));
-            tokens.append(qMakePair(Basic::FFGG, QString::fromLatin1("FFGG")));
-            tokens.append(qMakePair(Basic::FFGF, QString::fromLatin1("FFGF")));
-            tokens.append(qMakePair(Basic::FFLM, QString::fromLatin1("FFLM")));
-            tokens.append(qMakePair(Basic::AReallyLongTokenIFreakinMeanItUKnowUKnowKnow, QString::fromLatin1("aReallyLongTokenIFreakinMeanItUKnowUKnowKnow")));
-            tokens.append(qMakePair(Basic::WeHaveDashes, QString::fromLatin1("we-have-dashes")));
-            tokens.append(qMakePair(Basic::WeHaveDashes2, QString::fromLatin1("we-have-dashes-")));
-
-            /* toToken(). */
-            for(int i = 0; i < tokens.count(); ++i)
-            {
-                const TokenPair &at = tokens.at(i);
-                /* QString. */
-                QCOMPARE(Basic::toToken(at.second), at.first);
-
-                /* const QChar *, int. */
-                QCOMPARE(Basic::toToken(at.second.constData(), at.second.length()), at.first);
-
-                /* QStringRef. */
-                const QStringRef ref(&at.second);
-                QCOMPARE(Basic::toToken(ref), at.first);
-            }
-
-            /* toString(). */
-            for(int i = 0; i < tokens.count(); ++i)
-            {
-                const TokenPair &at = tokens.at(i);
-                QCOMPARE(Basic::toString(at.first), at.second);
-            }
-        }
-
-        /* Tokens that we don't recognize. */
-        {
-            QStringList tokens;
-            tokens.append(QLatin1String("NO-MATCH"));
-            tokens.append(QLatin1String("NoKeyword"));
-            tokens.append(QString());
-
-            for(int i = 0; i < tokens.count(); ++i)
-                QCOMPARE(Basic::toToken(tokens.at(i)), Basic::NoKeyword);
-        }
-
-        /* Weird values for toToken(). */
-        {
-            QCOMPARE(Basic::toString(Basic::Token(5000)), QString());
-            QCOMPARE(Basic::toString(Basic::NoKeyword), QString());
-        }
-
-    }
-}
-
-QTEST_MAIN(tst_QTokenAutomaton)
-
-#include "tst_qtokenautomaton.moc"
diff --git a/tests/auto/other/toolsupport/CMakeLists.txt b/tests/auto/other/toolsupport/CMakeLists.txt
new file mode 100644
index 0000000000..51af17d866
--- /dev/null
+++ b/tests/auto/other/toolsupport/CMakeLists.txt
@@ -0,0 +1,12 @@
+# Generated from toolsupport.pro.
+
+#####################################################################
+## tst_toolsupport Test:
+#####################################################################
+
+add_qt_test(tst_toolsupport
+    SOURCES
+        tst_toolsupport.cpp
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+)
diff --git a/tests/auto/other/toolsupport/tst_toolsupport.cpp b/tests/auto/other/toolsupport/tst_toolsupport.cpp
index ab7bca8322..9591eca16a 100644
--- a/tests/auto/other/toolsupport/tst_toolsupport.cpp
+++ b/tests/auto/other/toolsupport/tst_toolsupport.cpp
@@ -97,14 +97,14 @@ void tst_toolsupport::offsets_data()
     {
         QTestData &data = QTest::newRow("sizeof(QObjectData)")
                 << sizeof(QObjectData);
-        data << 28 << 48; // vptr + 3 ptr + 2 int + ptr
+        data << 36 << 64; // vptr + 2 ptr + (2*ptr + int) + 2 int + ptr
     }
 
 #if RUN_MEMBER_OFFSET_TEST
     {
         QTestData &data = QTest::newRow("QObjectPrivate::extraData")
                 << pmm_to_offsetof(&QObjectPrivate::extraData);
-        data << 28 << 48;    // sizeof(QObjectData)
+        data << 36 << 64;    // sizeof(QObjectData)
     }
 
     {
@@ -126,9 +126,9 @@ void tst_toolsupport::offsets_data()
 #ifdef Q_PROCESSOR_X86
         // x86 32-bit has weird alignment rules. Refer to QtPrivate::AlignOf in
         // qglobal.h for more details.
-        data << 152 << 224;
+        data << 184 << 288;
 #else
-        data << 156 << 224;
+        data << 188 << 288;
 #endif
     }
 #endif
diff --git a/tests/auto/other/xkbkeyboard/CMakeLists.txt b/tests/auto/other/xkbkeyboard/CMakeLists.txt
new file mode 100644
index 0000000000..93a02eea12
--- /dev/null
+++ b/tests/auto/other/xkbkeyboard/CMakeLists.txt
@@ -0,0 +1,13 @@
+# Generated from xkbkeyboard.pro.
+
+#####################################################################
+## tst_xkbkeyboard Test:
+#####################################################################
+
+add_qt_test(tst_xkbkeyboard
+    SOURCES
+        tst_xkbkeyboard.cpp
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::GuiPrivate
+)
diff --git a/tests/auto/printsupport/CMakeLists.txt b/tests/auto/printsupport/CMakeLists.txt
new file mode 100644
index 0000000000..633c7d5e71
--- /dev/null
+++ b/tests/auto/printsupport/CMakeLists.txt
@@ -0,0 +1,4 @@
+# Generated from printsupport.pro.
+
+add_subdirectory(dialogs)
+add_subdirectory(kernel)
diff --git a/tests/auto/printsupport/dialogs/CMakeLists.txt b/tests/auto/printsupport/dialogs/CMakeLists.txt
new file mode 100644
index 0000000000..548ddc8577
--- /dev/null
+++ b/tests/auto/printsupport/dialogs/CMakeLists.txt
@@ -0,0 +1,3 @@
+# Generated from dialogs.pro.
+
+add_subdirectory(qabstractprintdialog)
diff --git a/tests/auto/printsupport/dialogs/qabstractprintdialog/CMakeLists.txt b/tests/auto/printsupport/dialogs/qabstractprintdialog/CMakeLists.txt
new file mode 100644
index 0000000000..91b699f648
--- /dev/null
+++ b/tests/auto/printsupport/dialogs/qabstractprintdialog/CMakeLists.txt
@@ -0,0 +1,14 @@
+# Generated from qabstractprintdialog.pro.
+
+#####################################################################
+## tst_qabstractprintdialog Test:
+#####################################################################
+
+add_qt_test(tst_qabstractprintdialog
+    SOURCES
+        tst_qabstractprintdialog.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::PrintSupport
+        Qt::Widgets
+)
diff --git a/tests/auto/printsupport/kernel/CMakeLists.txt b/tests/auto/printsupport/kernel/CMakeLists.txt
new file mode 100644
index 0000000000..8154d5e868
--- /dev/null
+++ b/tests/auto/printsupport/kernel/CMakeLists.txt
@@ -0,0 +1,5 @@
+# Generated from kernel.pro.
+
+add_subdirectory(qprintdevice)
+add_subdirectory(qprinter)
+add_subdirectory(qprinterinfo)
diff --git a/tests/auto/printsupport/kernel/qprintdevice/CMakeLists.txt b/tests/auto/printsupport/kernel/qprintdevice/CMakeLists.txt
new file mode 100644
index 0000000000..1ddb49d8e9
--- /dev/null
+++ b/tests/auto/printsupport/kernel/qprintdevice/CMakeLists.txt
@@ -0,0 +1,15 @@
+# Generated from qprintdevice.pro.
+
+#####################################################################
+## tst_qprintdevice Test:
+#####################################################################
+
+add_qt_test(tst_qprintdevice
+    SOURCES
+        tst_qprintdevice.cpp
+    DEFINES
+        QT_USE_USING_NAMESPACE
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::PrintSupportPrivate
+)
diff --git a/tests/auto/printsupport/kernel/qprinter/CMakeLists.txt b/tests/auto/printsupport/kernel/qprinter/CMakeLists.txt
new file mode 100644
index 0000000000..6d15bab349
--- /dev/null
+++ b/tests/auto/printsupport/kernel/qprinter/CMakeLists.txt
@@ -0,0 +1,14 @@
+# Generated from qprinter.pro.
+
+#####################################################################
+## tst_qprinter Test:
+#####################################################################
+
+add_qt_test(tst_qprinter
+    SOURCES
+        tst_qprinter.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::PrintSupport
+        Qt::Widgets
+)
diff --git a/tests/auto/printsupport/kernel/qprinterinfo/CMakeLists.txt b/tests/auto/printsupport/kernel/qprinterinfo/CMakeLists.txt
new file mode 100644
index 0000000000..5923d57ef5
--- /dev/null
+++ b/tests/auto/printsupport/kernel/qprinterinfo/CMakeLists.txt
@@ -0,0 +1,15 @@
+# Generated from qprinterinfo.pro.
+
+#####################################################################
+## tst_qprinterinfo Test:
+#####################################################################
+
+add_qt_test(tst_qprinterinfo
+    SOURCES
+        tst_qprinterinfo.cpp
+    DEFINES
+        QT_USE_USING_NAMESPACE
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::PrintSupport
+)
diff --git a/tests/auto/sql/CMakeLists.txt b/tests/auto/sql/CMakeLists.txt
new file mode 100644
index 0000000000..415d7598ae
--- /dev/null
+++ b/tests/auto/sql/CMakeLists.txt
@@ -0,0 +1,4 @@
+# Generated from sql.pro.
+
+add_subdirectory(kernel)
+add_subdirectory(models)
diff --git a/tests/auto/sql/kernel/CMakeLists.txt b/tests/auto/sql/kernel/CMakeLists.txt
new file mode 100644
index 0000000000..8d3f0b6bc5
--- /dev/null
+++ b/tests/auto/sql/kernel/CMakeLists.txt
@@ -0,0 +1,9 @@
+add_subdirectory(qsqlfield)
+add_subdirectory(qsqldatabase)
+add_subdirectory(qsqlerror)
+add_subdirectory(qsqldriver)
+add_subdirectory(qsqlquery)
+add_subdirectory(qsqlrecord)
+add_subdirectory(qsqlthread)
+add_subdirectory(qsql)
+add_subdirectory(qsqlresult)
diff --git a/tests/auto/sql/kernel/qsql/CMakeLists.txt b/tests/auto/sql/kernel/qsql/CMakeLists.txt
new file mode 100644
index 0000000000..c3c3eac7d2
--- /dev/null
+++ b/tests/auto/sql/kernel/qsql/CMakeLists.txt
@@ -0,0 +1,13 @@
+# Generated from qsql.pro.
+
+#####################################################################
+## tst_qsql Test:
+#####################################################################
+
+add_qt_test(tst_qsql
+    SOURCES
+        tst_qsql.cpp
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::SqlPrivate
+)
diff --git a/tests/auto/sql/kernel/qsqldatabase/CMakeLists.txt b/tests/auto/sql/kernel/qsqldatabase/CMakeLists.txt
new file mode 100644
index 0000000000..ae64269c11
--- /dev/null
+++ b/tests/auto/sql/kernel/qsqldatabase/CMakeLists.txt
@@ -0,0 +1,14 @@
+# Generated from qsqldatabase.pro.
+
+#####################################################################
+## tst_qsqldatabase Test:
+#####################################################################
+
+add_qt_test(tst_qsqldatabase
+    SOURCES
+        tst_qsqldatabase.cpp
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::Sql
+        Qt::SqlPrivate
+)
diff --git a/tests/auto/sql/kernel/qsqldriver/CMakeLists.txt b/tests/auto/sql/kernel/qsqldriver/CMakeLists.txt
new file mode 100644
index 0000000000..30ce3c1053
--- /dev/null
+++ b/tests/auto/sql/kernel/qsqldriver/CMakeLists.txt
@@ -0,0 +1,14 @@
+# Generated from qsqldriver.pro.
+
+#####################################################################
+## tst_qsqldriver Test:
+#####################################################################
+
+add_qt_test(tst_qsqldriver
+    SOURCES
+        tst_qsqldriver.cpp
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::Sql
+        Qt::SqlPrivate
+)
diff --git a/tests/auto/sql/kernel/qsqldriver/tst_qsqldriver.cpp b/tests/auto/sql/kernel/qsqldriver/tst_qsqldriver.cpp
index 15190b0f3e..5fa5c1bb58 100644
--- a/tests/auto/sql/kernel/qsqldriver/tst_qsqldriver.cpp
+++ b/tests/auto/sql/kernel/qsqldriver/tst_qsqldriver.cpp
@@ -143,7 +143,7 @@ void tst_QSqlDriver::record()
     QCOMPARE(rec.count(), fields.size());
 
     QSqlDriver::DbmsType dbType = tst_Databases::getDatabaseType(db);
-    // QTBUG-1363: QSqlField::length() always return -1 when using QODBC3 driver and QSqlDatabase::record()
+    // QTBUG-1363: QSqlField::length() always return -1 when using QODBC driver and QSqlDatabase::record()
     if (dbType == QSqlDriver::MSSqlServer && db.driverName().startsWith("QODBC"))
         QCOMPARE(rec.field(1).length(), 20);
 
diff --git a/tests/auto/sql/kernel/qsqlerror/CMakeLists.txt b/tests/auto/sql/kernel/qsqlerror/CMakeLists.txt
new file mode 100644
index 0000000000..45e7bb383b
--- /dev/null
+++ b/tests/auto/sql/kernel/qsqlerror/CMakeLists.txt
@@ -0,0 +1,12 @@
+# Generated from qsqlerror.pro.
+
+#####################################################################
+## tst_qsqlerror Test:
+#####################################################################
+
+add_qt_test(tst_qsqlerror
+    SOURCES
+        tst_qsqlerror.cpp
+    PUBLIC_LIBRARIES
+        Qt::Sql
+)
diff --git a/tests/auto/sql/kernel/qsqlfield/CMakeLists.txt b/tests/auto/sql/kernel/qsqlfield/CMakeLists.txt
new file mode 100644
index 0000000000..0a570ed1f2
--- /dev/null
+++ b/tests/auto/sql/kernel/qsqlfield/CMakeLists.txt
@@ -0,0 +1,12 @@
+# Generated from qsqlfield.pro.
+
+#####################################################################
+## tst_qsqlfield Test:
+#####################################################################
+
+add_qt_test(tst_qsqlfield
+    SOURCES
+        tst_qsqlfield.cpp
+    PUBLIC_LIBRARIES
+        Qt::Sql
+)
diff --git a/tests/auto/sql/kernel/qsqlquery/CMakeLists.txt b/tests/auto/sql/kernel/qsqlquery/CMakeLists.txt
new file mode 100644
index 0000000000..a5d3c96baa
--- /dev/null
+++ b/tests/auto/sql/kernel/qsqlquery/CMakeLists.txt
@@ -0,0 +1,14 @@
+# Generated from qsqlquery.pro.
+
+#####################################################################
+## tst_qsqlquery Test:
+#####################################################################
+
+add_qt_test(tst_qsqlquery
+    SOURCES
+        tst_qsqlquery.cpp
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::Sql
+        Qt::SqlPrivate
+)
diff --git a/tests/auto/sql/kernel/qsqlrecord/CMakeLists.txt b/tests/auto/sql/kernel/qsqlrecord/CMakeLists.txt
new file mode 100644
index 0000000000..743dc27e9d
--- /dev/null
+++ b/tests/auto/sql/kernel/qsqlrecord/CMakeLists.txt
@@ -0,0 +1,12 @@
+# Generated from qsqlrecord.pro.
+
+#####################################################################
+## tst_qsqlrecord Test:
+#####################################################################
+
+add_qt_test(tst_qsqlrecord
+    SOURCES
+        tst_qsqlrecord.cpp
+    PUBLIC_LIBRARIES
+        Qt::Sql
+)
diff --git a/tests/auto/sql/kernel/qsqlresult/CMakeLists.txt b/tests/auto/sql/kernel/qsqlresult/CMakeLists.txt
new file mode 100644
index 0000000000..c150c8a9d7
--- /dev/null
+++ b/tests/auto/sql/kernel/qsqlresult/CMakeLists.txt
@@ -0,0 +1,15 @@
+# Generated from qsqlresult.pro.
+
+#####################################################################
+## tst_qsqlresult Test:
+#####################################################################
+
+add_qt_test(tst_qsqlresult
+    SOURCES
+        testsqldriver.h
+        tst_qsqlresult.cpp
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::Sql
+        Qt::SqlPrivate
+)
diff --git a/tests/auto/sql/kernel/qsqlthread/CMakeLists.txt b/tests/auto/sql/kernel/qsqlthread/CMakeLists.txt
new file mode 100644
index 0000000000..17e66f42dd
--- /dev/null
+++ b/tests/auto/sql/kernel/qsqlthread/CMakeLists.txt
@@ -0,0 +1,14 @@
+# Generated from qsqlthread.pro.
+
+#####################################################################
+## tst_qsqlthread Test:
+#####################################################################
+
+add_qt_test(tst_qsqlthread
+    SOURCES
+        tst_qsqlthread.cpp
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::Sql
+        Qt::SqlPrivate
+)
diff --git a/tests/auto/sql/models/CMakeLists.txt b/tests/auto/sql/models/CMakeLists.txt
new file mode 100644
index 0000000000..df530443c4
--- /dev/null
+++ b/tests/auto/sql/models/CMakeLists.txt
@@ -0,0 +1,6 @@
+add_subdirectory(qsqlrelationaltablemodel)
+add_subdirectory(qsqltablemodel)
+
+if(TARGET Qt::Widgets)
+    add_subdirectory(qsqlquerymodel)
+endif()
diff --git a/tests/auto/sql/models/qsqlquerymodel/CMakeLists.txt b/tests/auto/sql/models/qsqlquerymodel/CMakeLists.txt
new file mode 100644
index 0000000000..f2da569f8f
--- /dev/null
+++ b/tests/auto/sql/models/qsqlquerymodel/CMakeLists.txt
@@ -0,0 +1,16 @@
+# Generated from qsqlquerymodel.pro.
+
+#####################################################################
+## tst_qsqlquerymodel Test:
+#####################################################################
+
+add_qt_test(tst_qsqlquerymodel
+    SOURCES
+        tst_qsqlquerymodel.cpp
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::Gui
+        Qt::Sql
+        Qt::SqlPrivate
+        Qt::Widgets
+)
diff --git a/tests/auto/sql/models/qsqlrelationaldelegate/CMakeLists.txt b/tests/auto/sql/models/qsqlrelationaldelegate/CMakeLists.txt
new file mode 100644
index 0000000000..caadae1df5
--- /dev/null
+++ b/tests/auto/sql/models/qsqlrelationaldelegate/CMakeLists.txt
@@ -0,0 +1,15 @@
+# Generated from qsqlrelationaldelegate.pro.
+
+#####################################################################
+## tst_qsqlrelationaldelegate Test:
+#####################################################################
+
+add_qt_test(tst_qsqlrelationaldelegate
+    SOURCES
+        tst_qsqlrelationaldelegate.cpp
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::Sql
+        Qt::SqlPrivate
+        Qt::Widgets
+)
diff --git a/tests/auto/sql/models/qsqlrelationaltablemodel/CMakeLists.txt b/tests/auto/sql/models/qsqlrelationaltablemodel/CMakeLists.txt
new file mode 100644
index 0000000000..f695a6173e
--- /dev/null
+++ b/tests/auto/sql/models/qsqlrelationaltablemodel/CMakeLists.txt
@@ -0,0 +1,14 @@
+# Generated from qsqlrelationaltablemodel.pro.
+
+#####################################################################
+## tst_qsqlrelationaltablemodel Test:
+#####################################################################
+
+add_qt_test(tst_qsqlrelationaltablemodel
+    SOURCES
+        tst_qsqlrelationaltablemodel.cpp
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::Sql
+        Qt::SqlPrivate
+)
diff --git a/tests/auto/sql/models/qsqltablemodel/CMakeLists.txt b/tests/auto/sql/models/qsqltablemodel/CMakeLists.txt
new file mode 100644
index 0000000000..f3e703591f
--- /dev/null
+++ b/tests/auto/sql/models/qsqltablemodel/CMakeLists.txt
@@ -0,0 +1,14 @@
+# Generated from qsqltablemodel.pro.
+
+#####################################################################
+## tst_qsqltablemodel Test:
+#####################################################################
+
+add_qt_test(tst_qsqltablemodel
+    SOURCES
+        tst_qsqltablemodel.cpp
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::Sql
+        Qt::SqlPrivate
+)
diff --git a/tests/auto/testlib/.prev_CMakeLists.txt b/tests/auto/testlib/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..194852f91c
--- /dev/null
+++ b/tests/auto/testlib/.prev_CMakeLists.txt
@@ -0,0 +1,8 @@
+# Generated from testlib.pro.
+
+add_subdirectory(outformat)
+add_subdirectory(qsignalspy)
+add_subdirectory(selftests)
+if(TARGET Qt::Widgets)
+    add_subdirectory(qabstractitemmodeltester)
+endif()
diff --git a/tests/auto/testlib/CMakeLists.txt b/tests/auto/testlib/CMakeLists.txt
new file mode 100644
index 0000000000..fd342e82a4
--- /dev/null
+++ b/tests/auto/testlib/CMakeLists.txt
@@ -0,0 +1,8 @@
+# Generated from testlib.pro.
+
+# add_subdirectory(outformat) # special case missing project
+add_subdirectory(qsignalspy)
+# add_subdirectory(selftests) # special case disable because the conversion is broken and hard to fix atm
+if(TARGET Qt::Widgets)
+    add_subdirectory(qabstractitemmodeltester)
+endif()
diff --git a/tests/auto/testlib/qabstractitemmodeltester/CMakeLists.txt b/tests/auto/testlib/qabstractitemmodeltester/CMakeLists.txt
new file mode 100644
index 0000000000..c4c9b7d044
--- /dev/null
+++ b/tests/auto/testlib/qabstractitemmodeltester/CMakeLists.txt
@@ -0,0 +1,16 @@
+# Generated from qabstractitemmodeltester.pro.
+
+#####################################################################
+## qabstractitemmodeltester Test:
+#####################################################################
+
+add_qt_test(qabstractitemmodeltester
+    SOURCES
+        ../../other/qabstractitemmodelutils/dynamictreemodel.cpp ../../other/qabstractitemmodelutils/dynamictreemodel.h
+        tst_qabstractitemmodeltester.cpp
+    INCLUDE_DIRECTORIES
+        ../../other/qabstractitemmodelutils
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+)
diff --git a/tests/auto/testlib/qsignalspy/CMakeLists.txt b/tests/auto/testlib/qsignalspy/CMakeLists.txt
new file mode 100644
index 0000000000..b3832d44fa
--- /dev/null
+++ b/tests/auto/testlib/qsignalspy/CMakeLists.txt
@@ -0,0 +1,10 @@
+# Generated from qsignalspy.pro.
+
+#####################################################################
+## tst_qsignalspy Test:
+#####################################################################
+
+add_qt_test(tst_qsignalspy
+    SOURCES
+        tst_qsignalspy.cpp
+)
diff --git a/tests/auto/testlib/selftests/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..124d2a60a0
--- /dev/null
+++ b/tests/auto/testlib/selftests/.prev_CMakeLists.txt
@@ -0,0 +1,9 @@
+# Generated from selftests.pro.
+
+add_subdirectory(test)
+
+if(NOT WINRT)
+
+    if(TARGET Qt::Gui)
+    endif()
+endif()
diff --git a/tests/auto/testlib/selftests/CMakeLists.txt b/tests/auto/testlib/selftests/CMakeLists.txt
new file mode 100644
index 0000000000..6b7fdb0d53
--- /dev/null
+++ b/tests/auto/testlib/selftests/CMakeLists.txt
@@ -0,0 +1,411 @@
+# Generated from selftests.pro.
+
+# special case begin
+# The whole file is written manually.
+
+if(NOT WINRT)
+    add_subdirectory(assert)
+    add_subdirectory(badxml)
+    add_subdirectory(benchlibcallgrind)
+    add_subdirectory(benchlibcounting)
+    add_subdirectory(benchlibeventcounter)
+    add_subdirectory(benchliboptions)
+    add_subdirectory(benchlibtickcounter)
+    add_subdirectory(benchlibwalltime)
+    add_subdirectory(blacklisted)
+    add_subdirectory(cmptest)
+    add_subdirectory(commandlinedata)
+    add_subdirectory(counting)
+    add_subdirectory(crashes)
+    add_subdirectory(datatable)
+    add_subdirectory(datetime)
+    add_subdirectory(deleteLater)
+    add_subdirectory(deleteLater_noApp)
+    add_subdirectory(differentexec)
+    add_subdirectory(exceptionthrow)
+    add_subdirectory(expectfail)
+    add_subdirectory(failcleanup)
+    add_subdirectory(faildatatype)
+    add_subdirectory(failfetchtype)
+    add_subdirectory(failinit)
+    add_subdirectory(failinitdata)
+    add_subdirectory(fetchbogus)
+    add_subdirectory(findtestdata)
+    add_subdirectory(float)
+    add_subdirectory(globaldata)
+    add_subdirectory(longstring)
+    add_subdirectory(maxwarnings)
+    add_subdirectory(multiexec)
+    add_subdirectory(pairdiagnostics)
+    add_subdirectory(printdatatags)
+    add_subdirectory(printdatatagswithglobaltags)
+    add_subdirectory(qexecstringlist)
+    add_subdirectory(silent)
+    add_subdirectory(signaldumper)
+    add_subdirectory(singleskip)
+    add_subdirectory(skip)
+    add_subdirectory(skipcleanup)
+    add_subdirectory(skipinit)
+    add_subdirectory(skipinitdata)
+    add_subdirectory(sleep)
+    add_subdirectory(strcmp)
+    add_subdirectory(subtest)
+    add_subdirectory(testlib)
+    add_subdirectory(tuplediagnostics)
+    add_subdirectory(verbose1)
+    add_subdirectory(verbose2)
+    add_subdirectory(verifyexceptionthrown)
+    add_subdirectory(warnings)
+    add_subdirectory(watchdog)
+    add_subdirectory(xunit)
+
+    if(TARGET Qt::Gui)
+        add_subdirectory(keyboard)
+        add_subdirectory(mouse)
+    endif()
+endif()
+
+#####################################################################
+## tst_selftests Test:
+#####################################################################
+
+add_qt_test(tst_selftests
+    SOURCES
+        ../../../shared/emulationdetector.h
+        tst_selftests.cpp
+    INCLUDE_DIRECTORIES
+        ../../../shared
+    LIBRARIES
+        Qt::TestPrivate
+)
+
+add_qt_resource(tst_selftests "expected_files" PREFIX "/" FILES
+    expected_assert.lightxml
+    expected_assert.tap
+    expected_assert.teamcity
+    expected_assert.txt
+    expected_assert.xml
+    expected_assert.xunitxml
+    expected_badxml.lightxml
+    expected_badxml.tap
+    expected_badxml.teamcity
+    expected_badxml.txt
+    expected_badxml.xml
+    expected_badxml.xunitxml
+    expected_benchlibcallgrind_0.txt
+    expected_benchlibcallgrind_1.txt
+    expected_benchlibcallgrind.csv
+    expected_benchlibcallgrind.lightxml
+    expected_benchlibcallgrind.tap
+    expected_benchlibcallgrind.teamcity
+    expected_benchlibcallgrind.xml
+    expected_benchlibcallgrind.xunitxml
+    expected_benchlibcounting.csv
+    expected_benchlibcounting.lightxml
+    expected_benchlibcounting.tap
+    expected_benchlibcounting.teamcity
+    expected_benchlibcounting.txt
+    expected_benchlibcounting.xml
+    expected_benchlibcounting.xunitxml
+    expected_benchlibeventcounter.csv
+    expected_benchlibeventcounter.lightxml
+    expected_benchlibeventcounter.tap
+    expected_benchlibeventcounter.teamcity
+    expected_benchlibeventcounter.txt
+    expected_benchlibeventcounter.xml
+    expected_benchlibeventcounter.xunitxml
+    expected_benchliboptions.csv
+    expected_benchliboptions.lightxml
+    expected_benchliboptions.tap
+    expected_benchliboptions.teamcity
+    expected_benchliboptions.txt
+    expected_benchliboptions.xml
+    expected_benchliboptions.xunitxml
+    expected_benchlibtickcounter.csv
+    expected_benchlibtickcounter.lightxml
+    expected_benchlibtickcounter.tap
+    expected_benchlibtickcounter.teamcity
+    expected_benchlibtickcounter.txt
+    expected_benchlibtickcounter.xml
+    expected_benchlibtickcounter.xunitxml
+    expected_benchlibwalltime.csv
+    expected_benchlibwalltime.lightxml
+    expected_benchlibwalltime.tap
+    expected_benchlibwalltime.teamcity
+    expected_benchlibwalltime.txt
+    expected_benchlibwalltime.xml
+    expected_benchlibwalltime.xunitxml
+    expected_blacklisted.lightxml
+    expected_blacklisted.tap
+    expected_blacklisted.teamcity
+    expected_blacklisted.txt
+    expected_blacklisted.xml
+    expected_blacklisted.xunitxml
+    expected_cmptest.lightxml
+    expected_cmptest.tap
+    expected_cmptest.teamcity
+    expected_cmptest.txt
+    expected_cmptest.xml
+    expected_cmptest.xunitxml
+    expected_commandlinedata.lightxml
+    expected_commandlinedata.tap
+    expected_commandlinedata.teamcity
+    expected_commandlinedata.txt
+    expected_commandlinedata.xml
+    expected_commandlinedata.xunitxml
+    expected_counting.lightxml
+    expected_counting.tap
+    expected_counting.teamcity
+    expected_counting.txt
+    expected_counting.xml
+    expected_counting.xunitxml
+    expected_crashes_1.txt
+    expected_crashes_2.txt
+    expected_crashes_3.txt
+    expected_crashes_4.txt
+    expected_crashes_5.txt
+    expected_datatable.lightxml
+    expected_datatable.tap
+    expected_datatable.teamcity
+    expected_datatable.txt
+    expected_datatable.xml
+    expected_datatable.xunitxml
+    expected_datetime.lightxml
+    expected_datetime.tap
+    expected_datetime.teamcity
+    expected_datetime.txt
+    expected_datetime.xml
+    expected_datetime.xunitxml
+    expected_differentexec.lightxml
+    expected_differentexec.tap
+    expected_differentexec.teamcity
+    expected_differentexec.txt
+    expected_differentexec.xml
+    expected_differentexec.xunitxml
+    expected_exceptionthrow.lightxml
+    expected_exceptionthrow.tap
+    expected_exceptionthrow.teamcity
+    expected_exceptionthrow.txt
+    expected_exceptionthrow.xml
+    expected_exceptionthrow.xunitxml
+    expected_expectfail.lightxml
+    expected_expectfail.tap
+    expected_expectfail.teamcity
+    expected_expectfail.txt
+    expected_expectfail.xml
+    expected_expectfail.xunitxml
+    expected_failcleanup.lightxml
+    expected_failcleanup.tap
+    expected_failcleanup.teamcity
+    expected_failcleanup.txt
+    expected_failcleanup.xml
+    expected_failcleanup.xunitxml
+    expected_faildatatype.lightxml
+    expected_faildatatype.tap
+    expected_faildatatype.teamcity
+    expected_faildatatype.txt
+    expected_faildatatype.xml
+    expected_faildatatype.xunitxml
+    expected_failfetchtype.lightxml
+    expected_failfetchtype.tap
+    expected_failfetchtype.teamcity
+    expected_failfetchtype.txt
+    expected_failfetchtype.xml
+    expected_failfetchtype.xunitxml
+    expected_failinitdata.lightxml
+    expected_failinitdata.tap
+    expected_failinitdata.teamcity
+    expected_failinitdata.txt
+    expected_failinitdata.xml
+    expected_failinitdata.xunitxml
+    expected_failinit.lightxml
+    expected_failinit.tap
+    expected_failinit.teamcity
+    expected_failinit.txt
+    expected_failinit.xml
+    expected_failinit.xunitxml
+    expected_fetchbogus.lightxml
+    expected_fetchbogus.tap
+    expected_fetchbogus.teamcity
+    expected_fetchbogus.txt
+    expected_fetchbogus.xml
+    expected_fetchbogus.xunitxml
+    expected_findtestdata.lightxml
+    expected_findtestdata.tap
+    expected_findtestdata.teamcity
+    expected_findtestdata.txt
+    expected_findtestdata.xml
+    expected_findtestdata.xunitxml
+    expected_float.lightxml
+    expected_float.tap
+    expected_float.teamcity
+    expected_float.txt
+    expected_float.xml
+    expected_float.xunitxml
+    expected_globaldata.lightxml
+    expected_globaldata.tap
+    expected_globaldata.teamcity
+    expected_globaldata.txt
+    expected_globaldata.xml
+    expected_globaldata.xunitxml
+    expected_keyboard.lightxml
+    expected_keyboard.tap
+    expected_keyboard.teamcity
+    expected_keyboard.txt
+    expected_keyboard.xml
+    expected_keyboard.xunitxml
+    expected_longstring.lightxml
+    expected_longstring.tap
+    expected_longstring.teamcity
+    expected_longstring.txt
+    expected_longstring.xml
+    expected_longstring.xunitxml
+    expected_maxwarnings.lightxml
+    expected_maxwarnings.tap
+    expected_maxwarnings.teamcity
+    expected_maxwarnings.txt
+    expected_maxwarnings.xml
+    expected_maxwarnings.xunitxml
+    expected_multiexec.lightxml
+    expected_multiexec.tap
+    expected_multiexec.teamcity
+    expected_multiexec.txt
+    expected_multiexec.xml
+    expected_multiexec.xunitxml
+    expected_pairdiagnostics.lightxml
+    expected_pairdiagnostics.tap
+    expected_pairdiagnostics.teamcity
+    expected_pairdiagnostics.txt
+    expected_pairdiagnostics.xml
+    expected_pairdiagnostics.xunitxml
+    expected_printdatatags.txt
+    expected_printdatatagswithglobaltags.txt
+    expected_qexecstringlist.lightxml
+    expected_qexecstringlist.tap
+    expected_qexecstringlist.teamcity
+    expected_qexecstringlist.txt
+    expected_qexecstringlist.xml
+    expected_qexecstringlist.xunitxml
+    expected_signaldumper.lightxml
+    expected_signaldumper.tap
+    expected_signaldumper.teamcity
+    expected_signaldumper.txt
+    expected_signaldumper.xml
+    expected_signaldumper.xunitxml
+    expected_silent.lightxml
+    expected_silent.tap
+    expected_silent.teamcity
+    expected_silent.txt
+    expected_silent.xml
+    expected_silent.xunitxml
+    expected_singleskip.lightxml
+    expected_singleskip.tap
+    expected_singleskip.teamcity
+    expected_singleskip.txt
+    expected_singleskip.xml
+    expected_singleskip.xunitxml
+    expected_skipcleanup.lightxml
+    expected_skipcleanup.tap
+    expected_skipcleanup.teamcity
+    expected_skipcleanup.txt
+    expected_skipcleanup.xml
+    expected_skipcleanup.xunitxml
+    expected_skipinitdata.lightxml
+    expected_skipinitdata.tap
+    expected_skipinitdata.teamcity
+    expected_skipinitdata.txt
+    expected_skipinitdata.xml
+    expected_skipinitdata.xunitxml
+    expected_skipinit.lightxml
+    expected_skipinit.tap
+    expected_skipinit.teamcity
+    expected_skipinit.txt
+    expected_skipinit.xml
+    expected_skipinit.xunitxml
+    expected_skip.lightxml
+    expected_skip.tap
+    expected_skip.teamcity
+    expected_skip.txt
+    expected_skip.xml
+    expected_skip.xunitxml
+    expected_sleep.lightxml
+    expected_sleep.tap
+    expected_sleep.teamcity
+    expected_sleep.txt
+    expected_sleep.xml
+    expected_sleep.xunitxml
+    expected_strcmp.lightxml
+    expected_strcmp.tap
+    expected_strcmp.teamcity
+    expected_strcmp.txt
+    expected_strcmp.xml
+    expected_strcmp.xunitxml
+    expected_subtest.lightxml
+    expected_subtest.tap
+    expected_subtest.teamcity
+    expected_subtest.txt
+    expected_subtest.xml
+    expected_subtest.xunitxml
+    expected_testlib.lightxml
+    expected_testlib.tap
+    expected_testlib.teamcity
+    expected_testlib.txt
+    expected_testlib.xml
+    expected_testlib.xunitxml
+    expected_tuplediagnostics.lightxml
+    expected_tuplediagnostics.tap
+    expected_tuplediagnostics.teamcity
+    expected_tuplediagnostics.txt
+    expected_tuplediagnostics.xml
+    expected_tuplediagnostics.xunitxml
+    expected_verbose1.lightxml
+    expected_verbose1.tap
+    expected_verbose1.teamcity
+    expected_verbose1.txt
+    expected_verbose1.xml
+    expected_verbose1.xunitxml
+    expected_verbose2.lightxml
+    expected_verbose2.tap
+    expected_verbose2.teamcity
+    expected_verbose2.txt
+    expected_verbose2.xml
+    expected_verbose2.xunitxml
+    expected_verifyexceptionthrown.lightxml
+    expected_verifyexceptionthrown.tap
+    expected_verifyexceptionthrown.teamcity
+    expected_verifyexceptionthrown.txt
+    expected_verifyexceptionthrown.xml
+    expected_verifyexceptionthrown.xunitxml
+    expected_warnings.lightxml
+    expected_warnings.tap
+    expected_warnings.teamcity
+    expected_warnings.txt
+    expected_warnings.xml
+    expected_warnings.xunitxml
+    expected_watchdog.lightxml
+    expected_watchdog.tap
+    expected_watchdog.teamcity
+    expected_watchdog.txt
+    expected_watchdog.xml
+    expected_watchdog.xunitxml
+    expected_xunit.lightxml
+    expected_xunit.tap
+    expected_xunit.teamcity
+    expected_xunit.txt
+    expected_xunit.xml
+    expected_xunit.xunitxml
+)
+
+
+#### Keys ignored in scope 1:.:.:test.pro:<TRUE>:
+# CONFIG = "testcase"
+# expected_files.base = "$$PWD/.."
+# expected_files.files = "$$files$$PWD/../expected_*"
+
+## Scopes:
+#####################################################################
+
+#### Keys ignored in scope 5:.:.:test.pro:NOT ANDROID AND NOT WINRT AND for(file,SUBPROGRAMS):
+# TEST_HELPER_INSTALLS = "../$${file}/$${file}"
+
+# special case end
diff --git a/tests/auto/testlib/selftests/assert/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/assert/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..65ef6ac126
--- /dev/null
+++ b/tests/auto/testlib/selftests/assert/.prev_CMakeLists.txt
@@ -0,0 +1,15 @@
+# Generated from assert.pro.
+
+#####################################################################
+## assert Binary:
+#####################################################################
+
+add_qt_executable(assert
+    SOURCES
+        tst_assert.cpp
+    PUBLIC_LIBRARIES
+        Qt::Test
+)
+
+## Scopes:
+#####################################################################
diff --git a/tests/auto/testlib/selftests/assert/CMakeLists.txt b/tests/auto/testlib/selftests/assert/CMakeLists.txt
new file mode 100644
index 0000000000..a2904beb96
--- /dev/null
+++ b/tests/auto/testlib/selftests/assert/CMakeLists.txt
@@ -0,0 +1,17 @@
+# Generated from assert.pro.
+
+#####################################################################
+## assert Binary:
+#####################################################################
+
+add_qt_executable(assert
+    NO_INSTALL # special case
+    OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
+    SOURCES
+        tst_assert.cpp
+    PUBLIC_LIBRARIES
+        Qt::Test
+)
+
+## Scopes:
+#####################################################################
diff --git a/tests/auto/testlib/selftests/badxml/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/badxml/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..755cbecd2e
--- /dev/null
+++ b/tests/auto/testlib/selftests/badxml/.prev_CMakeLists.txt
@@ -0,0 +1,16 @@
+# Generated from badxml.pro.
+
+#####################################################################
+## badxml Binary:
+#####################################################################
+
+add_qt_executable(badxml
+    SOURCES
+        tst_badxml.cpp
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::Test
+)
+
+## Scopes:
+#####################################################################
diff --git a/tests/auto/testlib/selftests/badxml/CMakeLists.txt b/tests/auto/testlib/selftests/badxml/CMakeLists.txt
new file mode 100644
index 0000000000..40870b1983
--- /dev/null
+++ b/tests/auto/testlib/selftests/badxml/CMakeLists.txt
@@ -0,0 +1,18 @@
+# Generated from badxml.pro.
+
+#####################################################################
+## badxml Binary:
+#####################################################################
+
+add_qt_executable(badxml
+    NO_INSTALL # special case
+    OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
+    SOURCES
+        tst_badxml.cpp
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::Test
+)
+
+## Scopes:
+#####################################################################
diff --git a/tests/auto/testlib/selftests/benchlibcallgrind/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/benchlibcallgrind/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..d6f35cd1de
--- /dev/null
+++ b/tests/auto/testlib/selftests/benchlibcallgrind/.prev_CMakeLists.txt
@@ -0,0 +1,15 @@
+# Generated from benchlibcallgrind.pro.
+
+#####################################################################
+## benchlibcallgrind Binary:
+#####################################################################
+
+add_qt_executable(benchlibcallgrind
+    SOURCES
+        tst_benchlibcallgrind.cpp
+    PUBLIC_LIBRARIES
+        Qt::Test
+)
+
+## Scopes:
+#####################################################################
diff --git a/tests/auto/testlib/selftests/benchlibcallgrind/CMakeLists.txt b/tests/auto/testlib/selftests/benchlibcallgrind/CMakeLists.txt
new file mode 100644
index 0000000000..230d11e391
--- /dev/null
+++ b/tests/auto/testlib/selftests/benchlibcallgrind/CMakeLists.txt
@@ -0,0 +1,17 @@
+# Generated from benchlibcallgrind.pro.
+
+#####################################################################
+## benchlibcallgrind Binary:
+#####################################################################
+
+add_qt_executable(benchlibcallgrind
+    NO_INSTALL # special case
+    OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
+    SOURCES
+        tst_benchlibcallgrind.cpp
+    PUBLIC_LIBRARIES
+        Qt::Test
+)
+
+## Scopes:
+#####################################################################
diff --git a/tests/auto/testlib/selftests/benchlibcounting/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/benchlibcounting/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..6b592f7515
--- /dev/null
+++ b/tests/auto/testlib/selftests/benchlibcounting/.prev_CMakeLists.txt
@@ -0,0 +1,15 @@
+# Generated from benchlibcounting.pro.
+
+#####################################################################
+## benchlibcounting Binary:
+#####################################################################
+
+add_qt_executable(benchlibcounting
+    SOURCES
+        tst_benchlibcounting.cpp
+    PUBLIC_LIBRARIES
+        Qt::Test
+)
+
+## Scopes:
+#####################################################################
diff --git a/tests/auto/testlib/selftests/benchlibcounting/CMakeLists.txt b/tests/auto/testlib/selftests/benchlibcounting/CMakeLists.txt
new file mode 100644
index 0000000000..d89d5d8447
--- /dev/null
+++ b/tests/auto/testlib/selftests/benchlibcounting/CMakeLists.txt
@@ -0,0 +1,17 @@
+# Generated from benchlibcounting.pro.
+
+#####################################################################
+## benchlibcounting Binary:
+#####################################################################
+
+add_qt_executable(benchlibcounting
+    NO_INSTALL # special case
+    OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
+    SOURCES
+        tst_benchlibcounting.cpp
+    PUBLIC_LIBRARIES
+        Qt::Test
+)
+
+## Scopes:
+#####################################################################
diff --git a/tests/auto/testlib/selftests/benchlibeventcounter/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/benchlibeventcounter/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..a1c6d6711b
--- /dev/null
+++ b/tests/auto/testlib/selftests/benchlibeventcounter/.prev_CMakeLists.txt
@@ -0,0 +1,15 @@
+# Generated from benchlibeventcounter.pro.
+
+#####################################################################
+## benchlibeventcounter Binary:
+#####################################################################
+
+add_qt_executable(benchlibeventcounter
+    SOURCES
+        tst_benchlibeventcounter.cpp
+    PUBLIC_LIBRARIES
+        Qt::Test
+)
+
+## Scopes:
+#####################################################################
diff --git a/tests/auto/testlib/selftests/benchlibeventcounter/CMakeLists.txt b/tests/auto/testlib/selftests/benchlibeventcounter/CMakeLists.txt
new file mode 100644
index 0000000000..701d3f12fb
--- /dev/null
+++ b/tests/auto/testlib/selftests/benchlibeventcounter/CMakeLists.txt
@@ -0,0 +1,17 @@
+# Generated from benchlibeventcounter.pro.
+
+#####################################################################
+## benchlibeventcounter Binary:
+#####################################################################
+
+add_qt_executable(benchlibeventcounter
+    NO_INSTALL # special case
+    OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
+    SOURCES
+        tst_benchlibeventcounter.cpp
+    PUBLIC_LIBRARIES
+        Qt::Test
+)
+
+## Scopes:
+#####################################################################
diff --git a/tests/auto/testlib/selftests/benchliboptions/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/benchliboptions/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..d38392c896
--- /dev/null
+++ b/tests/auto/testlib/selftests/benchliboptions/.prev_CMakeLists.txt
@@ -0,0 +1,15 @@
+# Generated from benchliboptions.pro.
+
+#####################################################################
+## benchliboptions Binary:
+#####################################################################
+
+add_qt_executable(benchliboptions
+    SOURCES
+        tst_benchliboptions.cpp
+    PUBLIC_LIBRARIES
+        Qt::Test
+)
+
+## Scopes:
+#####################################################################
diff --git a/tests/auto/testlib/selftests/benchliboptions/CMakeLists.txt b/tests/auto/testlib/selftests/benchliboptions/CMakeLists.txt
new file mode 100644
index 0000000000..b2a704cc28
--- /dev/null
+++ b/tests/auto/testlib/selftests/benchliboptions/CMakeLists.txt
@@ -0,0 +1,17 @@
+# Generated from benchliboptions.pro.
+
+#####################################################################
+## benchliboptions Binary:
+#####################################################################
+
+add_qt_executable(benchliboptions
+    NO_INSTALL # special case
+    OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
+    SOURCES
+        tst_benchliboptions.cpp
+    PUBLIC_LIBRARIES
+        Qt::Test
+)
+
+## Scopes:
+#####################################################################
diff --git a/tests/auto/testlib/selftests/benchlibtickcounter/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/benchlibtickcounter/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..3789558508
--- /dev/null
+++ b/tests/auto/testlib/selftests/benchlibtickcounter/.prev_CMakeLists.txt
@@ -0,0 +1,16 @@
+# Generated from benchlibtickcounter.pro.
+
+#####################################################################
+## benchlibtickcounter Binary:
+#####################################################################
+
+add_qt_executable(benchlibtickcounter
+    GUI
+    SOURCES
+        tst_benchlibtickcounter.cpp
+    PUBLIC_LIBRARIES
+        Qt::TestPrivate
+)
+
+## Scopes:
+#####################################################################
diff --git a/tests/auto/testlib/selftests/benchlibtickcounter/CMakeLists.txt b/tests/auto/testlib/selftests/benchlibtickcounter/CMakeLists.txt
new file mode 100644
index 0000000000..1edf2826ad
--- /dev/null
+++ b/tests/auto/testlib/selftests/benchlibtickcounter/CMakeLists.txt
@@ -0,0 +1,18 @@
+# Generated from benchlibtickcounter.pro.
+
+#####################################################################
+## benchlibtickcounter Binary:
+#####################################################################
+
+add_qt_executable(benchlibtickcounter
+    NO_INSTALL # special case
+    OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
+    GUI
+    SOURCES
+        tst_benchlibtickcounter.cpp
+    PUBLIC_LIBRARIES
+        Qt::TestPrivate
+)
+
+## Scopes:
+#####################################################################
diff --git a/tests/auto/testlib/selftests/benchlibwalltime/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/benchlibwalltime/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..0e098ace32
--- /dev/null
+++ b/tests/auto/testlib/selftests/benchlibwalltime/.prev_CMakeLists.txt
@@ -0,0 +1,15 @@
+# Generated from benchlibwalltime.pro.
+
+#####################################################################
+## benchlibwalltime Binary:
+#####################################################################
+
+add_qt_executable(benchlibwalltime
+    SOURCES
+        tst_benchlibwalltime.cpp
+    PUBLIC_LIBRARIES
+        Qt::Test
+)
+
+## Scopes:
+#####################################################################
diff --git a/tests/auto/testlib/selftests/benchlibwalltime/CMakeLists.txt b/tests/auto/testlib/selftests/benchlibwalltime/CMakeLists.txt
new file mode 100644
index 0000000000..7debe80c67
--- /dev/null
+++ b/tests/auto/testlib/selftests/benchlibwalltime/CMakeLists.txt
@@ -0,0 +1,17 @@
+# Generated from benchlibwalltime.pro.
+
+#####################################################################
+## benchlibwalltime Binary:
+#####################################################################
+
+add_qt_executable(benchlibwalltime
+    NO_INSTALL # special case
+    OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
+    SOURCES
+        tst_benchlibwalltime.cpp
+    PUBLIC_LIBRARIES
+        Qt::Test
+)
+
+## Scopes:
+#####################################################################
diff --git a/tests/auto/testlib/selftests/blacklisted/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/blacklisted/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..d1eae1a783
--- /dev/null
+++ b/tests/auto/testlib/selftests/blacklisted/.prev_CMakeLists.txt
@@ -0,0 +1,16 @@
+# Generated from blacklisted.pro.
+
+#####################################################################
+## blacklisted Binary:
+#####################################################################
+
+add_qt_executable(blacklisted
+    GUI
+    SOURCES
+        tst_blacklisted.cpp
+    PUBLIC_LIBRARIES
+        Qt::TestPrivate
+)
+
+## Scopes:
+#####################################################################
diff --git a/tests/auto/testlib/selftests/blacklisted/CMakeLists.txt b/tests/auto/testlib/selftests/blacklisted/CMakeLists.txt
new file mode 100644
index 0000000000..8136abe3ab
--- /dev/null
+++ b/tests/auto/testlib/selftests/blacklisted/CMakeLists.txt
@@ -0,0 +1,18 @@
+# Generated from blacklisted.pro.
+
+#####################################################################
+## blacklisted Binary:
+#####################################################################
+
+add_qt_executable(blacklisted
+    NO_INSTALL # special case
+    OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
+    GUI
+    SOURCES
+        tst_blacklisted.cpp
+    PUBLIC_LIBRARIES
+        Qt::TestPrivate
+)
+
+## Scopes:
+#####################################################################
diff --git a/tests/auto/testlib/selftests/cmptest/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/cmptest/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..417b99571d
--- /dev/null
+++ b/tests/auto/testlib/selftests/cmptest/.prev_CMakeLists.txt
@@ -0,0 +1,20 @@
+# Generated from cmptest.pro.
+
+#####################################################################
+## cmptest Binary:
+#####################################################################
+
+add_qt_executable(cmptest
+    SOURCES
+        tst_cmptest.cpp
+    PUBLIC_LIBRARIES
+        Qt::Test
+)
+
+## Scopes:
+#####################################################################
+
+extend_target(cmptest CONDITION TARGET Qt::Gui
+    PUBLIC_LIBRARIES
+        Qt::Gui
+)
diff --git a/tests/auto/testlib/selftests/cmptest/CMakeLists.txt b/tests/auto/testlib/selftests/cmptest/CMakeLists.txt
new file mode 100644
index 0000000000..b7698c78f7
--- /dev/null
+++ b/tests/auto/testlib/selftests/cmptest/CMakeLists.txt
@@ -0,0 +1,22 @@
+# Generated from cmptest.pro.
+
+#####################################################################
+## cmptest Binary:
+#####################################################################
+
+add_qt_executable(cmptest
+    NO_INSTALL # special case
+    OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
+    SOURCES
+        tst_cmptest.cpp
+    PUBLIC_LIBRARIES
+        Qt::Test
+)
+
+## Scopes:
+#####################################################################
+
+extend_target(cmptest CONDITION TARGET Qt::Gui
+    PUBLIC_LIBRARIES
+        Qt::Gui
+)
diff --git a/tests/auto/testlib/selftests/commandlinedata/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/commandlinedata/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..a49902c26b
--- /dev/null
+++ b/tests/auto/testlib/selftests/commandlinedata/.prev_CMakeLists.txt
@@ -0,0 +1,15 @@
+# Generated from commandlinedata.pro.
+
+#####################################################################
+## commandlinedata Binary:
+#####################################################################
+
+add_qt_executable(commandlinedata
+    SOURCES
+        tst_commandlinedata.cpp
+    PUBLIC_LIBRARIES
+        Qt::Test
+)
+
+## Scopes:
+#####################################################################
diff --git a/tests/auto/testlib/selftests/commandlinedata/CMakeLists.txt b/tests/auto/testlib/selftests/commandlinedata/CMakeLists.txt
new file mode 100644
index 0000000000..76ce86c9a0
--- /dev/null
+++ b/tests/auto/testlib/selftests/commandlinedata/CMakeLists.txt
@@ -0,0 +1,17 @@
+# Generated from commandlinedata.pro.
+
+#####################################################################
+## commandlinedata Binary:
+#####################################################################
+
+add_qt_executable(commandlinedata
+    NO_INSTALL # special case
+    OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
+    SOURCES
+        tst_commandlinedata.cpp
+    PUBLIC_LIBRARIES
+        Qt::Test
+)
+
+## Scopes:
+#####################################################################
diff --git a/tests/auto/testlib/selftests/counting/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/counting/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..8ad3c38e88
--- /dev/null
+++ b/tests/auto/testlib/selftests/counting/.prev_CMakeLists.txt
@@ -0,0 +1,15 @@
+# Generated from counting.pro.
+
+#####################################################################
+## counting Binary:
+#####################################################################
+
+add_qt_executable(counting
+    SOURCES
+        tst_counting.cpp
+    PUBLIC_LIBRARIES
+        Qt::Test
+)
+
+## Scopes:
+#####################################################################
diff --git a/tests/auto/testlib/selftests/counting/CMakeLists.txt b/tests/auto/testlib/selftests/counting/CMakeLists.txt
new file mode 100644
index 0000000000..5afeab937b
--- /dev/null
+++ b/tests/auto/testlib/selftests/counting/CMakeLists.txt
@@ -0,0 +1,17 @@
+# Generated from counting.pro.
+
+#####################################################################
+## counting Binary:
+#####################################################################
+
+add_qt_executable(counting
+    NO_INSTALL # special case
+    OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
+    SOURCES
+        tst_counting.cpp
+    PUBLIC_LIBRARIES
+        Qt::Test
+)
+
+## Scopes:
+#####################################################################
diff --git a/tests/auto/testlib/selftests/crashes/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/crashes/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..2e54976ebc
--- /dev/null
+++ b/tests/auto/testlib/selftests/crashes/.prev_CMakeLists.txt
@@ -0,0 +1,15 @@
+# Generated from crashes.pro.
+
+#####################################################################
+## crashes Binary:
+#####################################################################
+
+add_qt_executable(crashes
+    SOURCES
+        tst_crashes.cpp
+    PUBLIC_LIBRARIES
+        Qt::Test
+)
+
+## Scopes:
+#####################################################################
diff --git a/tests/auto/testlib/selftests/crashes/CMakeLists.txt b/tests/auto/testlib/selftests/crashes/CMakeLists.txt
new file mode 100644
index 0000000000..d1eeffd23c
--- /dev/null
+++ b/tests/auto/testlib/selftests/crashes/CMakeLists.txt
@@ -0,0 +1,17 @@
+# Generated from crashes.pro.
+
+#####################################################################
+## crashes Binary:
+#####################################################################
+
+add_qt_executable(crashes
+    NO_INSTALL # special case
+    OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
+    SOURCES
+        tst_crashes.cpp
+    PUBLIC_LIBRARIES
+        Qt::Test
+)
+
+## Scopes:
+#####################################################################
diff --git a/tests/auto/testlib/selftests/datatable/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/datatable/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..fbe3bfca40
--- /dev/null
+++ b/tests/auto/testlib/selftests/datatable/.prev_CMakeLists.txt
@@ -0,0 +1,15 @@
+# Generated from datatable.pro.
+
+#####################################################################
+## datatable Binary:
+#####################################################################
+
+add_qt_executable(datatable
+    SOURCES
+        tst_datatable.cpp
+    PUBLIC_LIBRARIES
+        Qt::Test
+)
+
+## Scopes:
+#####################################################################
diff --git a/tests/auto/testlib/selftests/datatable/CMakeLists.txt b/tests/auto/testlib/selftests/datatable/CMakeLists.txt
new file mode 100644
index 0000000000..cab1fed123
--- /dev/null
+++ b/tests/auto/testlib/selftests/datatable/CMakeLists.txt
@@ -0,0 +1,17 @@
+# Generated from datatable.pro.
+
+#####################################################################
+## datatable Binary:
+#####################################################################
+
+add_qt_executable(datatable
+    NO_INSTALL # special case
+    OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
+    SOURCES
+        tst_datatable.cpp
+    PUBLIC_LIBRARIES
+        Qt::Test
+)
+
+## Scopes:
+#####################################################################
diff --git a/tests/auto/testlib/selftests/datetime/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/datetime/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..8f0bca0d89
--- /dev/null
+++ b/tests/auto/testlib/selftests/datetime/.prev_CMakeLists.txt
@@ -0,0 +1,15 @@
+# Generated from datetime.pro.
+
+#####################################################################
+## datetime Binary:
+#####################################################################
+
+add_qt_executable(datetime
+    SOURCES
+        tst_datetime.cpp
+    PUBLIC_LIBRARIES
+        Qt::Test
+)
+
+## Scopes:
+#####################################################################
diff --git a/tests/auto/testlib/selftests/datetime/CMakeLists.txt b/tests/auto/testlib/selftests/datetime/CMakeLists.txt
new file mode 100644
index 0000000000..9c04c6f0b8
--- /dev/null
+++ b/tests/auto/testlib/selftests/datetime/CMakeLists.txt
@@ -0,0 +1,17 @@
+# Generated from datetime.pro.
+
+#####################################################################
+## datetime Binary:
+#####################################################################
+
+add_qt_executable(datetime
+    NO_INSTALL # special case
+    OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
+    SOURCES
+        tst_datetime.cpp
+    PUBLIC_LIBRARIES
+        Qt::Test
+)
+
+## Scopes:
+#####################################################################
diff --git a/tests/auto/testlib/selftests/deleteLater/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/deleteLater/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..ce2187af0b
--- /dev/null
+++ b/tests/auto/testlib/selftests/deleteLater/.prev_CMakeLists.txt
@@ -0,0 +1,12 @@
+# Generated from deleteLater.pro.
+
+#####################################################################
+## tst_deleteLater Binary:
+#####################################################################
+
+add_qt_executable(tst_deleteLater
+    SOURCES
+        tst_deleteLater.cpp
+    PUBLIC_LIBRARIES
+        Qt::Test
+)
diff --git a/tests/auto/testlib/selftests/deleteLater/CMakeLists.txt b/tests/auto/testlib/selftests/deleteLater/CMakeLists.txt
new file mode 100644
index 0000000000..78876a9dbb
--- /dev/null
+++ b/tests/auto/testlib/selftests/deleteLater/CMakeLists.txt
@@ -0,0 +1,14 @@
+# Generated from deleteLater.pro.
+
+#####################################################################
+## tst_deleteLater Binary:
+#####################################################################
+
+add_qt_executable(tst_deleteLater
+    NO_INSTALL # special case
+    OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
+    SOURCES
+        tst_deleteLater.cpp
+    PUBLIC_LIBRARIES
+        Qt::Test
+)
diff --git a/tests/auto/testlib/selftests/deleteLater_noApp/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/deleteLater_noApp/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..48be681cbd
--- /dev/null
+++ b/tests/auto/testlib/selftests/deleteLater_noApp/.prev_CMakeLists.txt
@@ -0,0 +1,12 @@
+# Generated from deleteLater_noApp.pro.
+
+#####################################################################
+## tst_deleteLater_noApp Binary:
+#####################################################################
+
+add_qt_executable(tst_deleteLater_noApp
+    SOURCES
+        tst_deleteLater_noApp.cpp
+    PUBLIC_LIBRARIES
+        Qt::Test
+)
diff --git a/tests/auto/testlib/selftests/deleteLater_noApp/CMakeLists.txt b/tests/auto/testlib/selftests/deleteLater_noApp/CMakeLists.txt
new file mode 100644
index 0000000000..ddcd19e8e3
--- /dev/null
+++ b/tests/auto/testlib/selftests/deleteLater_noApp/CMakeLists.txt
@@ -0,0 +1,14 @@
+# Generated from deleteLater_noApp.pro.
+
+#####################################################################
+## tst_deleteLater_noApp Binary:
+#####################################################################
+
+add_qt_executable(tst_deleteLater_noApp
+    NO_INSTALL # special case
+    OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
+    SOURCES
+        tst_deleteLater_noApp.cpp
+    PUBLIC_LIBRARIES
+        Qt::Test
+)
diff --git a/tests/auto/testlib/selftests/differentexec/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/differentexec/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..9cab4de93b
--- /dev/null
+++ b/tests/auto/testlib/selftests/differentexec/.prev_CMakeLists.txt
@@ -0,0 +1,15 @@
+# Generated from differentexec.pro.
+
+#####################################################################
+## differentexec Binary:
+#####################################################################
+
+add_qt_executable(differentexec
+    SOURCES
+        tst_differentexec.cpp
+    PUBLIC_LIBRARIES
+        Qt::Test
+)
+
+## Scopes:
+#####################################################################
diff --git a/tests/auto/testlib/selftests/differentexec/CMakeLists.txt b/tests/auto/testlib/selftests/differentexec/CMakeLists.txt
new file mode 100644
index 0000000000..e5f19c2677
--- /dev/null
+++ b/tests/auto/testlib/selftests/differentexec/CMakeLists.txt
@@ -0,0 +1,17 @@
+# Generated from differentexec.pro.
+
+#####################################################################
+## differentexec Binary:
+#####################################################################
+
+add_qt_executable(differentexec
+    NO_INSTALL # special case
+    OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
+    SOURCES
+        tst_differentexec.cpp
+    PUBLIC_LIBRARIES
+        Qt::Test
+)
+
+## Scopes:
+#####################################################################
diff --git a/tests/auto/testlib/selftests/exceptionthrow/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/exceptionthrow/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..fdd95e0805
--- /dev/null
+++ b/tests/auto/testlib/selftests/exceptionthrow/.prev_CMakeLists.txt
@@ -0,0 +1,16 @@
+# Generated from exceptionthrow.pro.
+
+#####################################################################
+## exceptionthrow Binary:
+#####################################################################
+
+add_qt_executable(exceptionthrow
+    EXCEPTIONS
+    SOURCES
+        tst_exceptionthrow.cpp
+    PUBLIC_LIBRARIES
+        Qt::Test
+)
+
+## Scopes:
+#####################################################################
diff --git a/tests/auto/testlib/selftests/exceptionthrow/CMakeLists.txt b/tests/auto/testlib/selftests/exceptionthrow/CMakeLists.txt
new file mode 100644
index 0000000000..659e2e2ff3
--- /dev/null
+++ b/tests/auto/testlib/selftests/exceptionthrow/CMakeLists.txt
@@ -0,0 +1,18 @@
+# Generated from exceptionthrow.pro.
+
+#####################################################################
+## exceptionthrow Binary:
+#####################################################################
+
+add_qt_executable(exceptionthrow
+    EXCEPTIONS
+    NO_INSTALL # special case
+    OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
+    SOURCES
+        tst_exceptionthrow.cpp
+    PUBLIC_LIBRARIES
+        Qt::Test
+)
+
+## Scopes:
+#####################################################################
diff --git a/tests/auto/testlib/selftests/expected_signaldumper.junitxml b/tests/auto/testlib/selftests/expected_signaldumper.junitxml
index cbf7075ba1..0c03988879 100644
--- a/tests/auto/testlib/selftests/expected_signaldumper.junitxml
+++ b/tests/auto/testlib/selftests/expected_signaldumper.junitxml
@@ -142,12 +142,12 @@
     <!-- message="Signal: SignalSlotClass(_POINTER_) qStringRefSignal ((QString&amp;)@_POINTER_)" type="info" -->
     <!-- message="Signal: SignalSlotClass(_POINTER_) qStringConstRefSignal (QString(Test string))" type="info" -->
     <!-- message="Signal: SignalSlotClass(_POINTER_) qByteArraySignal (QByteArray(Test bytearray))" type="info" -->
-    <!-- message="Signal: SignalSlotClass(_POINTER_) qListSignal (QList&lt;int&gt;())" type="info" -->
+    <!-- message="Signal: SignalSlotClass(_POINTER_) qListSignal (QVector&lt;int&gt;())" type="info" -->
     <!-- message="Signal: SignalSlotClass(_POINTER_) qVectorSignal (QVector&lt;int&gt;())" type="info" -->
     <!-- message="Signal: SignalSlotClass(_POINTER_) qVectorRefSignal ((QVector&lt;int&gt;&amp;)@_POINTER_)" type="info" -->
     <!-- message="Signal: SignalSlotClass(_POINTER_) qVectorConstRefSignal (QVector&lt;int&gt;())" type="info" -->
     <!-- message="Signal: SignalSlotClass(_POINTER_) qVectorConstPointerSignal ((const QVector&lt;int&gt;*)_POINTER_)" type="info" -->
-    <!-- message="Signal: SignalSlotClass(_POINTER_) qVectorPointerConstSignal ()" type="info" -->
+    <!-- message="Signal: SignalSlotClass(_POINTER_) qVectorPointerConstSignal ((QVector&lt;int&gt;*)_POINTER_)" type="info" -->
     <!-- message="Signal: SignalSlotClass(_POINTER_) qVariantSignal (QVariant())" type="info" -->
     <!-- message="Signal: SignalSlotClass(_POINTER_) qVariantSignal (QVariant())" type="info" -->
   </testcase>
@@ -274,12 +274,12 @@
 <![CDATA[Signal: SignalSlotClass(_POINTER_) qStringRefSignal ((QString&)@_POINTER_)]]>
 <![CDATA[Signal: SignalSlotClass(_POINTER_) qStringConstRefSignal (QString(Test string))]]>
 <![CDATA[Signal: SignalSlotClass(_POINTER_) qByteArraySignal (QByteArray(Test bytearray))]]>
-<![CDATA[Signal: SignalSlotClass(_POINTER_) qListSignal (QList<int>())]]>
+<![CDATA[Signal: SignalSlotClass(_POINTER_) qListSignal (QVector<int>())]]>
 <![CDATA[Signal: SignalSlotClass(_POINTER_) qVectorSignal (QVector<int>())]]>
 <![CDATA[Signal: SignalSlotClass(_POINTER_) qVectorRefSignal ((QVector<int>&)@_POINTER_)]]>
 <![CDATA[Signal: SignalSlotClass(_POINTER_) qVectorConstRefSignal (QVector<int>())]]>
 <![CDATA[Signal: SignalSlotClass(_POINTER_) qVectorConstPointerSignal ((const QVector<int>*)_POINTER_)]]>
-<![CDATA[Signal: SignalSlotClass(_POINTER_) qVectorPointerConstSignal ()]]>
+<![CDATA[Signal: SignalSlotClass(_POINTER_) qVectorPointerConstSignal ((QVector<int>*)_POINTER_)]]>
 <![CDATA[Signal: SignalSlotClass(_POINTER_) qVariantSignal (QVariant())]]>
 <![CDATA[Signal: SignalSlotClass(_POINTER_) qVariantSignal (QVariant())]]>
 <![CDATA[Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()]]>
diff --git a/tests/auto/testlib/selftests/expected_signaldumper.lightxml b/tests/auto/testlib/selftests/expected_signaldumper.lightxml
index 443f649bb6..d29319841c 100644
--- a/tests/auto/testlib/selftests/expected_signaldumper.lightxml
+++ b/tests/auto/testlib/selftests/expected_signaldumper.lightxml
@@ -542,7 +542,7 @@
     <Description><![CDATA[Signal: SignalSlotClass(_POINTER_) qByteArraySignal (QByteArray(Test bytearray))]]></Description>
 </Message>
 <Message type="info" file="" line="0">
-    <Description><![CDATA[Signal: SignalSlotClass(_POINTER_) qListSignal (QList<int>())]]></Description>
+    <Description><![CDATA[Signal: SignalSlotClass(_POINTER_) qListSignal (QVector<int>())]]></Description>
 </Message>
 <Message type="info" file="" line="0">
     <Description><![CDATA[Signal: SignalSlotClass(_POINTER_) qVectorSignal (QVector<int>())]]></Description>
@@ -557,7 +557,7 @@
     <Description><![CDATA[Signal: SignalSlotClass(_POINTER_) qVectorConstPointerSignal ((const QVector<int>*)_POINTER_)]]></Description>
 </Message>
 <Message type="info" file="" line="0">
-    <Description><![CDATA[Signal: SignalSlotClass(_POINTER_) qVectorPointerConstSignal ()]]></Description>
+    <Description><![CDATA[Signal: SignalSlotClass(_POINTER_) qVectorPointerConstSignal ((QVector<int>*)_POINTER_)]]></Description>
 </Message>
 <Message type="info" file="" line="0">
     <Description><![CDATA[Signal: SignalSlotClass(_POINTER_) qVariantSignal (QVariant())]]></Description>
diff --git a/tests/auto/testlib/selftests/expected_signaldumper.tap b/tests/auto/testlib/selftests/expected_signaldumper.tap
index e2d664f4f1..bbaaa025c3 100644
--- a/tests/auto/testlib/selftests/expected_signaldumper.tap
+++ b/tests/auto/testlib/selftests/expected_signaldumper.tap
@@ -134,12 +134,12 @@ ok 18 - slotEmittingSignalOldSyntax(queued)
 # Signal: SignalSlotClass(_POINTER_) qStringRefSignal ((QString&)@_POINTER_)
 # Signal: SignalSlotClass(_POINTER_) qStringConstRefSignal (QString(Test string))
 # Signal: SignalSlotClass(_POINTER_) qByteArraySignal (QByteArray(Test bytearray))
-# Signal: SignalSlotClass(_POINTER_) qListSignal (QList<int>())
+# Signal: SignalSlotClass(_POINTER_) qListSignal (QVector<int>())
 # Signal: SignalSlotClass(_POINTER_) qVectorSignal (QVector<int>())
 # Signal: SignalSlotClass(_POINTER_) qVectorRefSignal ((QVector<int>&)@_POINTER_)
 # Signal: SignalSlotClass(_POINTER_) qVectorConstRefSignal (QVector<int>())
 # Signal: SignalSlotClass(_POINTER_) qVectorConstPointerSignal ((const QVector<int>*)_POINTER_)
-# Signal: SignalSlotClass(_POINTER_) qVectorPointerConstSignal ()
+# Signal: SignalSlotClass(_POINTER_) qVectorPointerConstSignal ((QVector<int>*)_POINTER_)
 # Signal: SignalSlotClass(_POINTER_) qVariantSignal (QVariant())
 # Signal: SignalSlotClass(_POINTER_) qVariantSignal (QVariant())
 ok 19 - variousTypes()
diff --git a/tests/auto/testlib/selftests/expected_signaldumper.teamcity b/tests/auto/testlib/selftests/expected_signaldumper.teamcity
index 0fc568e086..dee5aa70ef 100644
--- a/tests/auto/testlib/selftests/expected_signaldumper.teamcity
+++ b/tests/auto/testlib/selftests/expected_signaldumper.teamcity
@@ -54,7 +54,7 @@
 ##teamcity[testStdOut name='slotEmittingSignalOldSyntax(queued)' out='INFO: Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()|nINFO: Signal: QEventDispatcherPlatform(_POINTER_) awake ()|nINFO: Signal: SignalSlotClass(_POINTER_) nestedSignal ()' flowId='tst_Signaldumper']
 ##teamcity[testFinished name='slotEmittingSignalOldSyntax(queued)' flowId='tst_Signaldumper']
 ##teamcity[testStarted name='variousTypes()' flowId='tst_Signaldumper']
-##teamcity[testStdOut name='variousTypes()' out='INFO: Signal: SignalSlotClass(_POINTER_) qStringSignal (QString(Test string))|nINFO: Signal: SignalSlotClass(_POINTER_) qStringRefSignal ((QString&)@_POINTER_)|nINFO: Signal: SignalSlotClass(_POINTER_) qStringConstRefSignal (QString(Test string))|nINFO: Signal: SignalSlotClass(_POINTER_) qByteArraySignal (QByteArray(Test bytearray))|nINFO: Signal: SignalSlotClass(_POINTER_) qListSignal (QList<int>())|nINFO: Signal: SignalSlotClass(_POINTER_) qVectorSignal (QVector<int>())|nINFO: Signal: SignalSlotClass(_POINTER_) qVectorRefSignal ((QVector<int>&)@_POINTER_)|nINFO: Signal: SignalSlotClass(_POINTER_) qVectorConstRefSignal (QVector<int>())|nINFO: Signal: SignalSlotClass(_POINTER_) qVectorConstPointerSignal ((const QVector<int>*)_POINTER_)|nINFO: Signal: SignalSlotClass(_POINTER_) qVectorPointerConstSignal ()|nINFO: Signal: SignalSlotClass(_POINTER_) qVariantSignal (QVariant())|nINFO: Signal: SignalSlotClass(_POINTER_) qVariantSignal (QVariant())' flowId='tst_Signaldumper']
+##teamcity[testStdOut name='variousTypes()' out='INFO: Signal: SignalSlotClass(_POINTER_) qStringSignal (QString(Test string))|nINFO: Signal: SignalSlotClass(_POINTER_) qStringRefSignal ((QString&)@_POINTER_)|nINFO: Signal: SignalSlotClass(_POINTER_) qStringConstRefSignal (QString(Test string))|nINFO: Signal: SignalSlotClass(_POINTER_) qByteArraySignal (QByteArray(Test bytearray))|nINFO: Signal: SignalSlotClass(_POINTER_) qListSignal (QVector<int>())|nINFO: Signal: SignalSlotClass(_POINTER_) qVectorSignal (QVector<int>())|nINFO: Signal: SignalSlotClass(_POINTER_) qVectorRefSignal ((QVector<int>&)@_POINTER_)|nINFO: Signal: SignalSlotClass(_POINTER_) qVectorConstRefSignal (QVector<int>())|nINFO: Signal: SignalSlotClass(_POINTER_) qVectorConstPointerSignal ((const QVector<int>*)_POINTER_)|nINFO: Signal: SignalSlotClass(_POINTER_) qVectorPointerConstSignal ((QVector<int>*)_POINTER_)|nINFO: Signal: SignalSlotClass(_POINTER_) qVariantSignal (QVariant())|nINFO: Signal: SignalSlotClass(_POINTER_) qVariantSignal (QVariant())' flowId='tst_Signaldumper']
 ##teamcity[testFinished name='variousTypes()' flowId='tst_Signaldumper']
 ##teamcity[testStarted name='deletingSender()' flowId='tst_Signaldumper']
 ##teamcity[testStdOut name='deletingSender()' out='INFO: Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()' flowId='tst_Signaldumper']
diff --git a/tests/auto/testlib/selftests/expected_signaldumper.txt b/tests/auto/testlib/selftests/expected_signaldumper.txt
index 0ee8cd38a2..86d817cd5f 100644
--- a/tests/auto/testlib/selftests/expected_signaldumper.txt
+++ b/tests/auto/testlib/selftests/expected_signaldumper.txt
@@ -134,12 +134,12 @@ INFO   : tst_Signaldumper::variousTypes() Signal: SignalSlotClass(_POINTER_) qSt
 INFO   : tst_Signaldumper::variousTypes() Signal: SignalSlotClass(_POINTER_) qStringRefSignal ((QString&)@_POINTER_)
 INFO   : tst_Signaldumper::variousTypes() Signal: SignalSlotClass(_POINTER_) qStringConstRefSignal (QString(Test string))
 INFO   : tst_Signaldumper::variousTypes() Signal: SignalSlotClass(_POINTER_) qByteArraySignal (QByteArray(Test bytearray))
-INFO   : tst_Signaldumper::variousTypes() Signal: SignalSlotClass(_POINTER_) qListSignal (QList<int>())
+INFO   : tst_Signaldumper::variousTypes() Signal: SignalSlotClass(_POINTER_) qListSignal (QVector<int>())
 INFO   : tst_Signaldumper::variousTypes() Signal: SignalSlotClass(_POINTER_) qVectorSignal (QVector<int>())
 INFO   : tst_Signaldumper::variousTypes() Signal: SignalSlotClass(_POINTER_) qVectorRefSignal ((QVector<int>&)@_POINTER_)
 INFO   : tst_Signaldumper::variousTypes() Signal: SignalSlotClass(_POINTER_) qVectorConstRefSignal (QVector<int>())
 INFO   : tst_Signaldumper::variousTypes() Signal: SignalSlotClass(_POINTER_) qVectorConstPointerSignal ((const QVector<int>*)_POINTER_)
-INFO   : tst_Signaldumper::variousTypes() Signal: SignalSlotClass(_POINTER_) qVectorPointerConstSignal ()
+INFO   : tst_Signaldumper::variousTypes() Signal: SignalSlotClass(_POINTER_) qVectorPointerConstSignal ((QVector<int>*)_POINTER_)
 INFO   : tst_Signaldumper::variousTypes() Signal: SignalSlotClass(_POINTER_) qVariantSignal (QVariant())
 INFO   : tst_Signaldumper::variousTypes() Signal: SignalSlotClass(_POINTER_) qVariantSignal (QVariant())
 PASS   : tst_Signaldumper::variousTypes()
diff --git a/tests/auto/testlib/selftests/expected_signaldumper.xml b/tests/auto/testlib/selftests/expected_signaldumper.xml
index f11a0c3ce6..c61832ec4a 100644
--- a/tests/auto/testlib/selftests/expected_signaldumper.xml
+++ b/tests/auto/testlib/selftests/expected_signaldumper.xml
@@ -544,7 +544,7 @@
     <Description><![CDATA[Signal: SignalSlotClass(_POINTER_) qByteArraySignal (QByteArray(Test bytearray))]]></Description>
 </Message>
 <Message type="info" file="" line="0">
-    <Description><![CDATA[Signal: SignalSlotClass(_POINTER_) qListSignal (QList<int>())]]></Description>
+    <Description><![CDATA[Signal: SignalSlotClass(_POINTER_) qListSignal (QVector<int>())]]></Description>
 </Message>
 <Message type="info" file="" line="0">
     <Description><![CDATA[Signal: SignalSlotClass(_POINTER_) qVectorSignal (QVector<int>())]]></Description>
@@ -559,7 +559,7 @@
     <Description><![CDATA[Signal: SignalSlotClass(_POINTER_) qVectorConstPointerSignal ((const QVector<int>*)_POINTER_)]]></Description>
 </Message>
 <Message type="info" file="" line="0">
-    <Description><![CDATA[Signal: SignalSlotClass(_POINTER_) qVectorPointerConstSignal ()]]></Description>
+    <Description><![CDATA[Signal: SignalSlotClass(_POINTER_) qVectorPointerConstSignal ((QVector<int>*)_POINTER_)]]></Description>
 </Message>
 <Message type="info" file="" line="0">
     <Description><![CDATA[Signal: SignalSlotClass(_POINTER_) qVariantSignal (QVariant())]]></Description>
diff --git a/tests/auto/testlib/selftests/expectfail/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/expectfail/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..175bd8129a
--- /dev/null
+++ b/tests/auto/testlib/selftests/expectfail/.prev_CMakeLists.txt
@@ -0,0 +1,15 @@
+# Generated from expectfail.pro.
+
+#####################################################################
+## expectfail Binary:
+#####################################################################
+
+add_qt_executable(expectfail
+    SOURCES
+        tst_expectfail.cpp
+    PUBLIC_LIBRARIES
+        Qt::Test
+)
+
+## Scopes:
+#####################################################################
diff --git a/tests/auto/testlib/selftests/expectfail/CMakeLists.txt b/tests/auto/testlib/selftests/expectfail/CMakeLists.txt
new file mode 100644
index 0000000000..96de8c7a52
--- /dev/null
+++ b/tests/auto/testlib/selftests/expectfail/CMakeLists.txt
@@ -0,0 +1,17 @@
+# Generated from expectfail.pro.
+
+#####################################################################
+## expectfail Binary:
+#####################################################################
+
+add_qt_executable(expectfail
+    NO_INSTALL # special case
+    OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
+    SOURCES
+        tst_expectfail.cpp
+    PUBLIC_LIBRARIES
+        Qt::Test
+)
+
+## Scopes:
+#####################################################################
diff --git a/tests/auto/testlib/selftests/failcleanup/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/failcleanup/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..6369874983
--- /dev/null
+++ b/tests/auto/testlib/selftests/failcleanup/.prev_CMakeLists.txt
@@ -0,0 +1,15 @@
+# Generated from failcleanup.pro.
+
+#####################################################################
+## failcleanup Binary:
+#####################################################################
+
+add_qt_executable(failcleanup
+    SOURCES
+        tst_failcleanup.cpp
+    PUBLIC_LIBRARIES
+        Qt::Test
+)
+
+## Scopes:
+#####################################################################
diff --git a/tests/auto/testlib/selftests/failcleanup/CMakeLists.txt b/tests/auto/testlib/selftests/failcleanup/CMakeLists.txt
new file mode 100644
index 0000000000..6994b454b4
--- /dev/null
+++ b/tests/auto/testlib/selftests/failcleanup/CMakeLists.txt
@@ -0,0 +1,17 @@
+# Generated from failcleanup.pro.
+
+#####################################################################
+## failcleanup Binary:
+#####################################################################
+
+add_qt_executable(failcleanup
+    NO_INSTALL # special case
+    OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
+    SOURCES
+        tst_failcleanup.cpp
+    PUBLIC_LIBRARIES
+        Qt::Test
+)
+
+## Scopes:
+#####################################################################
diff --git a/tests/auto/testlib/selftests/faildatatype/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/faildatatype/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..e03a4333bd
--- /dev/null
+++ b/tests/auto/testlib/selftests/faildatatype/.prev_CMakeLists.txt
@@ -0,0 +1,15 @@
+# Generated from faildatatype.pro.
+
+#####################################################################
+## faildatatype Binary:
+#####################################################################
+
+add_qt_executable(faildatatype
+    SOURCES
+        tst_faildatatype.cpp
+    PUBLIC_LIBRARIES
+        Qt::Test
+)
+
+## Scopes:
+#####################################################################
diff --git a/tests/auto/testlib/selftests/faildatatype/CMakeLists.txt b/tests/auto/testlib/selftests/faildatatype/CMakeLists.txt
new file mode 100644
index 0000000000..0bcf274a89
--- /dev/null
+++ b/tests/auto/testlib/selftests/faildatatype/CMakeLists.txt
@@ -0,0 +1,17 @@
+# Generated from faildatatype.pro.
+
+#####################################################################
+## faildatatype Binary:
+#####################################################################
+
+add_qt_executable(faildatatype
+    NO_INSTALL # special case
+    OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
+    SOURCES
+        tst_faildatatype.cpp
+    PUBLIC_LIBRARIES
+        Qt::Test
+)
+
+## Scopes:
+#####################################################################
diff --git a/tests/auto/testlib/selftests/failfetchtype/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/failfetchtype/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..6ab21d845f
--- /dev/null
+++ b/tests/auto/testlib/selftests/failfetchtype/.prev_CMakeLists.txt
@@ -0,0 +1,15 @@
+# Generated from failfetchtype.pro.
+
+#####################################################################
+## failfetchtype Binary:
+#####################################################################
+
+add_qt_executable(failfetchtype
+    SOURCES
+        tst_failfetchtype.cpp
+    PUBLIC_LIBRARIES
+        Qt::Test
+)
+
+## Scopes:
+#####################################################################
diff --git a/tests/auto/testlib/selftests/failfetchtype/CMakeLists.txt b/tests/auto/testlib/selftests/failfetchtype/CMakeLists.txt
new file mode 100644
index 0000000000..f0d2657be1
--- /dev/null
+++ b/tests/auto/testlib/selftests/failfetchtype/CMakeLists.txt
@@ -0,0 +1,17 @@
+# Generated from failfetchtype.pro.
+
+#####################################################################
+## failfetchtype Binary:
+#####################################################################
+
+add_qt_executable(failfetchtype
+    NO_INSTALL # special case
+    OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
+    SOURCES
+        tst_failfetchtype.cpp
+    PUBLIC_LIBRARIES
+        Qt::Test
+)
+
+## Scopes:
+#####################################################################
diff --git a/tests/auto/testlib/selftests/failinit/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/failinit/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..22817fa186
--- /dev/null
+++ b/tests/auto/testlib/selftests/failinit/.prev_CMakeLists.txt
@@ -0,0 +1,15 @@
+# Generated from failinit.pro.
+
+#####################################################################
+## failinit Binary:
+#####################################################################
+
+add_qt_executable(failinit
+    SOURCES
+        tst_failinit.cpp
+    PUBLIC_LIBRARIES
+        Qt::Test
+)
+
+## Scopes:
+#####################################################################
diff --git a/tests/auto/testlib/selftests/failinit/CMakeLists.txt b/tests/auto/testlib/selftests/failinit/CMakeLists.txt
new file mode 100644
index 0000000000..8eeaa38d20
--- /dev/null
+++ b/tests/auto/testlib/selftests/failinit/CMakeLists.txt
@@ -0,0 +1,17 @@
+# Generated from failinit.pro.
+
+#####################################################################
+## failinit Binary:
+#####################################################################
+
+add_qt_executable(failinit
+    NO_INSTALL # special case
+    OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
+    SOURCES
+        tst_failinit.cpp
+    PUBLIC_LIBRARIES
+        Qt::Test
+)
+
+## Scopes:
+#####################################################################
diff --git a/tests/auto/testlib/selftests/failinitdata/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/failinitdata/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..5d519c9196
--- /dev/null
+++ b/tests/auto/testlib/selftests/failinitdata/.prev_CMakeLists.txt
@@ -0,0 +1,15 @@
+# Generated from failinitdata.pro.
+
+#####################################################################
+## failinitdata Binary:
+#####################################################################
+
+add_qt_executable(failinitdata
+    SOURCES
+        tst_failinitdata.cpp
+    PUBLIC_LIBRARIES
+        Qt::Test
+)
+
+## Scopes:
+#####################################################################
diff --git a/tests/auto/testlib/selftests/failinitdata/CMakeLists.txt b/tests/auto/testlib/selftests/failinitdata/CMakeLists.txt
new file mode 100644
index 0000000000..1d62d62234
--- /dev/null
+++ b/tests/auto/testlib/selftests/failinitdata/CMakeLists.txt
@@ -0,0 +1,17 @@
+# Generated from failinitdata.pro.
+
+#####################################################################
+## failinitdata Binary:
+#####################################################################
+
+add_qt_executable(failinitdata
+    NO_INSTALL # special case
+    OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
+    SOURCES
+        tst_failinitdata.cpp
+    PUBLIC_LIBRARIES
+        Qt::Test
+)
+
+## Scopes:
+#####################################################################
diff --git a/tests/auto/testlib/selftests/fetchbogus/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/fetchbogus/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..af1ea19d32
--- /dev/null
+++ b/tests/auto/testlib/selftests/fetchbogus/.prev_CMakeLists.txt
@@ -0,0 +1,15 @@
+# Generated from fetchbogus.pro.
+
+#####################################################################
+## fetchbogus Binary:
+#####################################################################
+
+add_qt_executable(fetchbogus
+    SOURCES
+        tst_fetchbogus.cpp
+    PUBLIC_LIBRARIES
+        Qt::Test
+)
+
+## Scopes:
+#####################################################################
diff --git a/tests/auto/testlib/selftests/fetchbogus/CMakeLists.txt b/tests/auto/testlib/selftests/fetchbogus/CMakeLists.txt
new file mode 100644
index 0000000000..60c06b3410
--- /dev/null
+++ b/tests/auto/testlib/selftests/fetchbogus/CMakeLists.txt
@@ -0,0 +1,17 @@
+# Generated from fetchbogus.pro.
+
+#####################################################################
+## fetchbogus Binary:
+#####################################################################
+
+add_qt_executable(fetchbogus
+    NO_INSTALL # special case
+    OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
+    SOURCES
+        tst_fetchbogus.cpp
+    PUBLIC_LIBRARIES
+        Qt::Test
+)
+
+## Scopes:
+#####################################################################
diff --git a/tests/auto/testlib/selftests/findtestdata/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/findtestdata/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..dc21a4d25f
--- /dev/null
+++ b/tests/auto/testlib/selftests/findtestdata/.prev_CMakeLists.txt
@@ -0,0 +1,28 @@
+# Generated from findtestdata.pro.
+
+#####################################################################
+## findtestdata Binary:
+#####################################################################
+
+add_qt_executable(findtestdata
+    SOURCES
+        findtestdata.cpp
+    PUBLIC_LIBRARIES
+        Qt::Test
+)
+
+# Resources:
+set(findtestdata_resource_files
+    "qt.conf"
+)
+
+add_qt_resource(findtestdata "findtestdata"
+    PREFIX
+        "/qt/etc/"
+    FILES
+        ${findtestdata_resource_files}
+)
+
+
+## Scopes:
+#####################################################################
diff --git a/tests/auto/testlib/selftests/findtestdata/CMakeLists.txt b/tests/auto/testlib/selftests/findtestdata/CMakeLists.txt
new file mode 100644
index 0000000000..f4987f88a3
--- /dev/null
+++ b/tests/auto/testlib/selftests/findtestdata/CMakeLists.txt
@@ -0,0 +1,30 @@
+# Generated from findtestdata.pro.
+
+#####################################################################
+## findtestdata Binary:
+#####################################################################
+
+add_qt_executable(findtestdata
+    NO_INSTALL # special case
+    OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
+    SOURCES
+        findtestdata.cpp
+    PUBLIC_LIBRARIES
+        Qt::Test
+)
+
+# Resources:
+set(findtestdata_resource_files
+    "qt.conf"
+)
+
+add_qt_resource(findtestdata "findtestdata"
+    PREFIX
+        "/qt/etc/"
+    FILES
+        ${findtestdata_resource_files}
+)
+
+
+## Scopes:
+#####################################################################
diff --git a/tests/auto/testlib/selftests/float/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/float/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..c037179b74
--- /dev/null
+++ b/tests/auto/testlib/selftests/float/.prev_CMakeLists.txt
@@ -0,0 +1,15 @@
+# Generated from float.pro.
+
+#####################################################################
+## float Binary:
+#####################################################################
+
+add_qt_executable(float
+    SOURCES
+        tst_float.cpp
+    PUBLIC_LIBRARIES
+        Qt::Test
+)
+
+## Scopes:
+#####################################################################
diff --git a/tests/auto/testlib/selftests/float/CMakeLists.txt b/tests/auto/testlib/selftests/float/CMakeLists.txt
new file mode 100644
index 0000000000..8a2ee4b76d
--- /dev/null
+++ b/tests/auto/testlib/selftests/float/CMakeLists.txt
@@ -0,0 +1,17 @@
+# Generated from float.pro.
+
+#####################################################################
+## float Binary:
+#####################################################################
+
+add_qt_executable(float
+    NO_INSTALL # special case
+    OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
+    SOURCES
+        tst_float.cpp
+    PUBLIC_LIBRARIES
+        Qt::Test
+)
+
+## Scopes:
+#####################################################################
diff --git a/tests/auto/testlib/selftests/globaldata/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/globaldata/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..1cff8f1b27
--- /dev/null
+++ b/tests/auto/testlib/selftests/globaldata/.prev_CMakeLists.txt
@@ -0,0 +1,15 @@
+# Generated from globaldata.pro.
+
+#####################################################################
+## globaldata Binary:
+#####################################################################
+
+add_qt_executable(globaldata
+    SOURCES
+        tst_globaldata.cpp
+    PUBLIC_LIBRARIES
+        Qt::Test
+)
+
+## Scopes:
+#####################################################################
diff --git a/tests/auto/testlib/selftests/globaldata/CMakeLists.txt b/tests/auto/testlib/selftests/globaldata/CMakeLists.txt
new file mode 100644
index 0000000000..868a637588
--- /dev/null
+++ b/tests/auto/testlib/selftests/globaldata/CMakeLists.txt
@@ -0,0 +1,17 @@
+# Generated from globaldata.pro.
+
+#####################################################################
+## globaldata Binary:
+#####################################################################
+
+add_qt_executable(globaldata
+    NO_INSTALL # special case
+    OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
+    SOURCES
+        tst_globaldata.cpp
+    PUBLIC_LIBRARIES
+        Qt::Test
+)
+
+## Scopes:
+#####################################################################
diff --git a/tests/auto/testlib/selftests/keyboard/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/keyboard/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..86c58467bf
--- /dev/null
+++ b/tests/auto/testlib/selftests/keyboard/.prev_CMakeLists.txt
@@ -0,0 +1,18 @@
+# Generated from keyboard.pro.
+
+#####################################################################
+## keyboard Binary:
+#####################################################################
+
+add_qt_executable(keyboard
+    SOURCES
+        tst_keyboard.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::GuiPrivate
+        Qt::Test
+        Qt::TestPrivate
+)
+
+## Scopes:
+#####################################################################
diff --git a/tests/auto/testlib/selftests/keyboard/CMakeLists.txt b/tests/auto/testlib/selftests/keyboard/CMakeLists.txt
new file mode 100644
index 0000000000..2766c1a36c
--- /dev/null
+++ b/tests/auto/testlib/selftests/keyboard/CMakeLists.txt
@@ -0,0 +1,20 @@
+# Generated from keyboard.pro.
+
+#####################################################################
+## keyboard Binary:
+#####################################################################
+
+add_qt_executable(keyboard
+    NO_INSTALL # special case
+    OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
+    SOURCES
+        tst_keyboard.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::GuiPrivate
+        Qt::Test
+        Qt::TestPrivate
+)
+
+## Scopes:
+#####################################################################
diff --git a/tests/auto/testlib/selftests/longstring/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/longstring/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..9f1c6bc8ad
--- /dev/null
+++ b/tests/auto/testlib/selftests/longstring/.prev_CMakeLists.txt
@@ -0,0 +1,15 @@
+# Generated from longstring.pro.
+
+#####################################################################
+## longstring Binary:
+#####################################################################
+
+add_qt_executable(longstring
+    SOURCES
+        tst_longstring.cpp
+    PUBLIC_LIBRARIES
+        Qt::Test
+)
+
+## Scopes:
+#####################################################################
diff --git a/tests/auto/testlib/selftests/longstring/CMakeLists.txt b/tests/auto/testlib/selftests/longstring/CMakeLists.txt
new file mode 100644
index 0000000000..08002fd20d
--- /dev/null
+++ b/tests/auto/testlib/selftests/longstring/CMakeLists.txt
@@ -0,0 +1,17 @@
+# Generated from longstring.pro.
+
+#####################################################################
+## longstring Binary:
+#####################################################################
+
+add_qt_executable(longstring
+    NO_INSTALL # special case
+    OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
+    SOURCES
+        tst_longstring.cpp
+    PUBLIC_LIBRARIES
+        Qt::Test
+)
+
+## Scopes:
+#####################################################################
diff --git a/tests/auto/testlib/selftests/maxwarnings/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/maxwarnings/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..a05c9afb13
--- /dev/null
+++ b/tests/auto/testlib/selftests/maxwarnings/.prev_CMakeLists.txt
@@ -0,0 +1,15 @@
+# Generated from maxwarnings.pro.
+
+#####################################################################
+## maxwarnings Binary:
+#####################################################################
+
+add_qt_executable(maxwarnings
+    SOURCES
+        maxwarnings.cpp
+    PUBLIC_LIBRARIES
+        Qt::Test
+)
+
+## Scopes:
+#####################################################################
diff --git a/tests/auto/testlib/selftests/maxwarnings/CMakeLists.txt b/tests/auto/testlib/selftests/maxwarnings/CMakeLists.txt
new file mode 100644
index 0000000000..23eaa62629
--- /dev/null
+++ b/tests/auto/testlib/selftests/maxwarnings/CMakeLists.txt
@@ -0,0 +1,17 @@
+# Generated from maxwarnings.pro.
+
+#####################################################################
+## maxwarnings Binary:
+#####################################################################
+
+add_qt_executable(maxwarnings
+    NO_INSTALL # special case
+    OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
+    SOURCES
+        maxwarnings.cpp
+    PUBLIC_LIBRARIES
+        Qt::Test
+)
+
+## Scopes:
+#####################################################################
diff --git a/tests/auto/testlib/selftests/mouse/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/mouse/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..4308195d73
--- /dev/null
+++ b/tests/auto/testlib/selftests/mouse/.prev_CMakeLists.txt
@@ -0,0 +1,18 @@
+# Generated from mouse.pro.
+
+#####################################################################
+## mouse Binary:
+#####################################################################
+
+add_qt_executable(mouse
+    SOURCES
+        tst_mouse.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::GuiPrivate
+        Qt::Test
+        Qt::TestPrivate
+)
+
+## Scopes:
+#####################################################################
diff --git a/tests/auto/testlib/selftests/mouse/CMakeLists.txt b/tests/auto/testlib/selftests/mouse/CMakeLists.txt
new file mode 100644
index 0000000000..9f6b364cec
--- /dev/null
+++ b/tests/auto/testlib/selftests/mouse/CMakeLists.txt
@@ -0,0 +1,20 @@
+# Generated from mouse.pro.
+
+#####################################################################
+## mouse Binary:
+#####################################################################
+
+add_qt_executable(mouse
+    NO_INSTALL # special case
+    OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
+    SOURCES
+        tst_mouse.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::GuiPrivate
+        Qt::Test
+        Qt::TestPrivate
+)
+
+## Scopes:
+#####################################################################
diff --git a/tests/auto/testlib/selftests/multiexec/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/multiexec/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..6c237edd05
--- /dev/null
+++ b/tests/auto/testlib/selftests/multiexec/.prev_CMakeLists.txt
@@ -0,0 +1,15 @@
+# Generated from multiexec.pro.
+
+#####################################################################
+## multiexec Binary:
+#####################################################################
+
+add_qt_executable(multiexec
+    SOURCES
+        tst_multiexec.cpp
+    PUBLIC_LIBRARIES
+        Qt::Test
+)
+
+## Scopes:
+#####################################################################
diff --git a/tests/auto/testlib/selftests/multiexec/CMakeLists.txt b/tests/auto/testlib/selftests/multiexec/CMakeLists.txt
new file mode 100644
index 0000000000..a1174908e5
--- /dev/null
+++ b/tests/auto/testlib/selftests/multiexec/CMakeLists.txt
@@ -0,0 +1,17 @@
+# Generated from multiexec.pro.
+
+#####################################################################
+## multiexec Binary:
+#####################################################################
+
+add_qt_executable(multiexec
+    NO_INSTALL # special case
+    OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
+    SOURCES
+        tst_multiexec.cpp
+    PUBLIC_LIBRARIES
+        Qt::Test
+)
+
+## Scopes:
+#####################################################################
diff --git a/tests/auto/testlib/selftests/pairdiagnostics/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/pairdiagnostics/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..05e8518413
--- /dev/null
+++ b/tests/auto/testlib/selftests/pairdiagnostics/.prev_CMakeLists.txt
@@ -0,0 +1,12 @@
+# Generated from pairdiagnostics.pro.
+
+#####################################################################
+## pairdiagnostics Binary:
+#####################################################################
+
+add_qt_executable(pairdiagnostics
+    SOURCES
+        tst_pairdiagnostics.cpp
+    PUBLIC_LIBRARIES
+        Qt::Test
+)
diff --git a/tests/auto/testlib/selftests/pairdiagnostics/CMakeLists.txt b/tests/auto/testlib/selftests/pairdiagnostics/CMakeLists.txt
new file mode 100644
index 0000000000..a9a48fb3f2
--- /dev/null
+++ b/tests/auto/testlib/selftests/pairdiagnostics/CMakeLists.txt
@@ -0,0 +1,14 @@
+# Generated from pairdiagnostics.pro.
+
+#####################################################################
+## pairdiagnostics Binary:
+#####################################################################
+
+add_qt_executable(pairdiagnostics
+    NO_INSTALL # special case
+    OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
+    SOURCES
+        tst_pairdiagnostics.cpp
+    PUBLIC_LIBRARIES
+        Qt::Test
+)
diff --git a/tests/auto/testlib/selftests/printdatatags/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/printdatatags/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..8c9174ca44
--- /dev/null
+++ b/tests/auto/testlib/selftests/printdatatags/.prev_CMakeLists.txt
@@ -0,0 +1,15 @@
+# Generated from printdatatags.pro.
+
+#####################################################################
+## printdatatags Binary:
+#####################################################################
+
+add_qt_executable(printdatatags
+    SOURCES
+        tst_printdatatags.cpp
+    PUBLIC_LIBRARIES
+        Qt::Test
+)
+
+## Scopes:
+#####################################################################
diff --git a/tests/auto/testlib/selftests/printdatatags/CMakeLists.txt b/tests/auto/testlib/selftests/printdatatags/CMakeLists.txt
new file mode 100644
index 0000000000..7eef1bce09
--- /dev/null
+++ b/tests/auto/testlib/selftests/printdatatags/CMakeLists.txt
@@ -0,0 +1,17 @@
+# Generated from printdatatags.pro.
+
+#####################################################################
+## printdatatags Binary:
+#####################################################################
+
+add_qt_executable(printdatatags
+    NO_INSTALL # special case
+    OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
+    SOURCES
+        tst_printdatatags.cpp
+    PUBLIC_LIBRARIES
+        Qt::Test
+)
+
+## Scopes:
+#####################################################################
diff --git a/tests/auto/testlib/selftests/printdatatagswithglobaltags/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/printdatatagswithglobaltags/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..161051cec4
--- /dev/null
+++ b/tests/auto/testlib/selftests/printdatatagswithglobaltags/.prev_CMakeLists.txt
@@ -0,0 +1,15 @@
+# Generated from printdatatagswithglobaltags.pro.
+
+#####################################################################
+## printdatatagswithglobaltags Binary:
+#####################################################################
+
+add_qt_executable(printdatatagswithglobaltags
+    SOURCES
+        tst_printdatatagswithglobaltags.cpp
+    PUBLIC_LIBRARIES
+        Qt::Test
+)
+
+## Scopes:
+#####################################################################
diff --git a/tests/auto/testlib/selftests/printdatatagswithglobaltags/CMakeLists.txt b/tests/auto/testlib/selftests/printdatatagswithglobaltags/CMakeLists.txt
new file mode 100644
index 0000000000..9baefbaabf
--- /dev/null
+++ b/tests/auto/testlib/selftests/printdatatagswithglobaltags/CMakeLists.txt
@@ -0,0 +1,17 @@
+# Generated from printdatatagswithglobaltags.pro.
+
+#####################################################################
+## printdatatagswithglobaltags Binary:
+#####################################################################
+
+add_qt_executable(printdatatagswithglobaltags
+    NO_INSTALL # special case
+    OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
+    SOURCES
+        tst_printdatatagswithglobaltags.cpp
+    PUBLIC_LIBRARIES
+        Qt::Test
+)
+
+## Scopes:
+#####################################################################
diff --git a/tests/auto/testlib/selftests/qexecstringlist/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/qexecstringlist/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..2a33f2dc4d
--- /dev/null
+++ b/tests/auto/testlib/selftests/qexecstringlist/.prev_CMakeLists.txt
@@ -0,0 +1,15 @@
+# Generated from qexecstringlist.pro.
+
+#####################################################################
+## qexecstringlist Binary:
+#####################################################################
+
+add_qt_executable(qexecstringlist
+    SOURCES
+        tst_qexecstringlist.cpp
+    PUBLIC_LIBRARIES
+        Qt::Test
+)
+
+## Scopes:
+#####################################################################
diff --git a/tests/auto/testlib/selftests/qexecstringlist/CMakeLists.txt b/tests/auto/testlib/selftests/qexecstringlist/CMakeLists.txt
new file mode 100644
index 0000000000..a4aac7f924
--- /dev/null
+++ b/tests/auto/testlib/selftests/qexecstringlist/CMakeLists.txt
@@ -0,0 +1,17 @@
+# Generated from qexecstringlist.pro.
+
+#####################################################################
+## qexecstringlist Binary:
+#####################################################################
+
+add_qt_executable(qexecstringlist
+    NO_INSTALL # special case
+    OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
+    SOURCES
+        tst_qexecstringlist.cpp
+    PUBLIC_LIBRARIES
+        Qt::Test
+)
+
+## Scopes:
+#####################################################################
diff --git a/tests/auto/testlib/selftests/signaldumper/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/signaldumper/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..e5989ba69e
--- /dev/null
+++ b/tests/auto/testlib/selftests/signaldumper/.prev_CMakeLists.txt
@@ -0,0 +1,16 @@
+# Generated from signaldumper.pro.
+
+#####################################################################
+## signaldumper Binary:
+#####################################################################
+
+add_qt_executable(signaldumper
+    GUI
+    SOURCES
+        tst_signaldumper.cpp
+    PUBLIC_LIBRARIES
+        Qt::TestPrivate
+)
+
+## Scopes:
+#####################################################################
diff --git a/tests/auto/testlib/selftests/signaldumper/CMakeLists.txt b/tests/auto/testlib/selftests/signaldumper/CMakeLists.txt
new file mode 100644
index 0000000000..0376ffacd1
--- /dev/null
+++ b/tests/auto/testlib/selftests/signaldumper/CMakeLists.txt
@@ -0,0 +1,18 @@
+# Generated from signaldumper.pro.
+
+#####################################################################
+## signaldumper Binary:
+#####################################################################
+
+add_qt_executable(signaldumper
+    NO_INSTALL # special case
+    OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
+    GUI
+    SOURCES
+        tst_signaldumper.cpp
+    PUBLIC_LIBRARIES
+        Qt::TestPrivate
+)
+
+## Scopes:
+#####################################################################
diff --git a/tests/auto/testlib/selftests/silent/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/silent/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..ebe7d6e299
--- /dev/null
+++ b/tests/auto/testlib/selftests/silent/.prev_CMakeLists.txt
@@ -0,0 +1,16 @@
+# Generated from silent.pro.
+
+#####################################################################
+## silent Binary:
+#####################################################################
+
+add_qt_executable(silent
+    GUI
+    SOURCES
+        tst_silent.cpp
+    PUBLIC_LIBRARIES
+        Qt::TestPrivate
+)
+
+## Scopes:
+#####################################################################
diff --git a/tests/auto/testlib/selftests/silent/CMakeLists.txt b/tests/auto/testlib/selftests/silent/CMakeLists.txt
new file mode 100644
index 0000000000..23916b81e0
--- /dev/null
+++ b/tests/auto/testlib/selftests/silent/CMakeLists.txt
@@ -0,0 +1,18 @@
+# Generated from silent.pro.
+
+#####################################################################
+## silent Binary:
+#####################################################################
+
+add_qt_executable(silent
+    NO_INSTALL # special case
+    OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
+    GUI
+    SOURCES
+        tst_silent.cpp
+    PUBLIC_LIBRARIES
+        Qt::TestPrivate
+)
+
+## Scopes:
+#####################################################################
diff --git a/tests/auto/testlib/selftests/singleskip/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/singleskip/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..60d4984df8
--- /dev/null
+++ b/tests/auto/testlib/selftests/singleskip/.prev_CMakeLists.txt
@@ -0,0 +1,15 @@
+# Generated from singleskip.pro.
+
+#####################################################################
+## singleskip Binary:
+#####################################################################
+
+add_qt_executable(singleskip
+    SOURCES
+        tst_singleskip.cpp
+    PUBLIC_LIBRARIES
+        Qt::Test
+)
+
+## Scopes:
+#####################################################################
diff --git a/tests/auto/testlib/selftests/singleskip/CMakeLists.txt b/tests/auto/testlib/selftests/singleskip/CMakeLists.txt
new file mode 100644
index 0000000000..c3e70ddf72
--- /dev/null
+++ b/tests/auto/testlib/selftests/singleskip/CMakeLists.txt
@@ -0,0 +1,17 @@
+# Generated from singleskip.pro.
+
+#####################################################################
+## singleskip Binary:
+#####################################################################
+
+add_qt_executable(singleskip
+    NO_INSTALL # special case
+    OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
+    SOURCES
+        tst_singleskip.cpp
+    PUBLIC_LIBRARIES
+        Qt::Test
+)
+
+## Scopes:
+#####################################################################
diff --git a/tests/auto/testlib/selftests/skip/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/skip/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..2eaac745a8
--- /dev/null
+++ b/tests/auto/testlib/selftests/skip/.prev_CMakeLists.txt
@@ -0,0 +1,15 @@
+# Generated from skip.pro.
+
+#####################################################################
+## skip Binary:
+#####################################################################
+
+add_qt_executable(skip
+    SOURCES
+        tst_skip.cpp
+    PUBLIC_LIBRARIES
+        Qt::Test
+)
+
+## Scopes:
+#####################################################################
diff --git a/tests/auto/testlib/selftests/skip/CMakeLists.txt b/tests/auto/testlib/selftests/skip/CMakeLists.txt
new file mode 100644
index 0000000000..f282c3e6a3
--- /dev/null
+++ b/tests/auto/testlib/selftests/skip/CMakeLists.txt
@@ -0,0 +1,17 @@
+# Generated from skip.pro.
+
+#####################################################################
+## skip Binary:
+#####################################################################
+
+add_qt_executable(skip
+    NO_INSTALL # special case
+    OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
+    SOURCES
+        tst_skip.cpp
+    PUBLIC_LIBRARIES
+        Qt::Test
+)
+
+## Scopes:
+#####################################################################
diff --git a/tests/auto/testlib/selftests/skipcleanup/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/skipcleanup/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..77673004b2
--- /dev/null
+++ b/tests/auto/testlib/selftests/skipcleanup/.prev_CMakeLists.txt
@@ -0,0 +1,15 @@
+# Generated from skipcleanup.pro.
+
+#####################################################################
+## skipcleanup Binary:
+#####################################################################
+
+add_qt_executable(skipcleanup
+    SOURCES
+        tst_skipcleanup.cpp
+    PUBLIC_LIBRARIES
+        Qt::Test
+)
+
+## Scopes:
+#####################################################################
diff --git a/tests/auto/testlib/selftests/skipcleanup/CMakeLists.txt b/tests/auto/testlib/selftests/skipcleanup/CMakeLists.txt
new file mode 100644
index 0000000000..09fef0967b
--- /dev/null
+++ b/tests/auto/testlib/selftests/skipcleanup/CMakeLists.txt
@@ -0,0 +1,17 @@
+# Generated from skipcleanup.pro.
+
+#####################################################################
+## skipcleanup Binary:
+#####################################################################
+
+add_qt_executable(skipcleanup
+    NO_INSTALL # special case
+    OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
+    SOURCES
+        tst_skipcleanup.cpp
+    PUBLIC_LIBRARIES
+        Qt::Test
+)
+
+## Scopes:
+#####################################################################
diff --git a/tests/auto/testlib/selftests/skipinit/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/skipinit/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..4a36d0fa1c
--- /dev/null
+++ b/tests/auto/testlib/selftests/skipinit/.prev_CMakeLists.txt
@@ -0,0 +1,15 @@
+# Generated from skipinit.pro.
+
+#####################################################################
+## skipinit Binary:
+#####################################################################
+
+add_qt_executable(skipinit
+    SOURCES
+        tst_skipinit.cpp
+    PUBLIC_LIBRARIES
+        Qt::Test
+)
+
+## Scopes:
+#####################################################################
diff --git a/tests/auto/testlib/selftests/skipinit/CMakeLists.txt b/tests/auto/testlib/selftests/skipinit/CMakeLists.txt
new file mode 100644
index 0000000000..47c437d3b7
--- /dev/null
+++ b/tests/auto/testlib/selftests/skipinit/CMakeLists.txt
@@ -0,0 +1,17 @@
+# Generated from skipinit.pro.
+
+#####################################################################
+## skipinit Binary:
+#####################################################################
+
+add_qt_executable(skipinit
+    NO_INSTALL # special case
+    OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
+    SOURCES
+        tst_skipinit.cpp
+    PUBLIC_LIBRARIES
+        Qt::Test
+)
+
+## Scopes:
+#####################################################################
diff --git a/tests/auto/testlib/selftests/skipinitdata/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/skipinitdata/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..7f7773c87c
--- /dev/null
+++ b/tests/auto/testlib/selftests/skipinitdata/.prev_CMakeLists.txt
@@ -0,0 +1,15 @@
+# Generated from skipinitdata.pro.
+
+#####################################################################
+## skipinitdata Binary:
+#####################################################################
+
+add_qt_executable(skipinitdata
+    SOURCES
+        tst_skipinitdata.cpp
+    PUBLIC_LIBRARIES
+        Qt::Test
+)
+
+## Scopes:
+#####################################################################
diff --git a/tests/auto/testlib/selftests/skipinitdata/CMakeLists.txt b/tests/auto/testlib/selftests/skipinitdata/CMakeLists.txt
new file mode 100644
index 0000000000..edbf6c1389
--- /dev/null
+++ b/tests/auto/testlib/selftests/skipinitdata/CMakeLists.txt
@@ -0,0 +1,17 @@
+# Generated from skipinitdata.pro.
+
+#####################################################################
+## skipinitdata Binary:
+#####################################################################
+
+add_qt_executable(skipinitdata
+    NO_INSTALL # special case
+    OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
+    SOURCES
+        tst_skipinitdata.cpp
+    PUBLIC_LIBRARIES
+        Qt::Test
+)
+
+## Scopes:
+#####################################################################
diff --git a/tests/auto/testlib/selftests/sleep/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/sleep/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..c176681068
--- /dev/null
+++ b/tests/auto/testlib/selftests/sleep/.prev_CMakeLists.txt
@@ -0,0 +1,15 @@
+# Generated from sleep.pro.
+
+#####################################################################
+## sleep Binary:
+#####################################################################
+
+add_qt_executable(sleep
+    SOURCES
+        tst_sleep.cpp
+    PUBLIC_LIBRARIES
+        Qt::Test
+)
+
+## Scopes:
+#####################################################################
diff --git a/tests/auto/testlib/selftests/sleep/CMakeLists.txt b/tests/auto/testlib/selftests/sleep/CMakeLists.txt
new file mode 100644
index 0000000000..ea85b03cc1
--- /dev/null
+++ b/tests/auto/testlib/selftests/sleep/CMakeLists.txt
@@ -0,0 +1,17 @@
+# Generated from sleep.pro.
+
+#####################################################################
+## sleep Binary:
+#####################################################################
+
+add_qt_executable(sleep
+    NO_INSTALL # special case
+    OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
+    SOURCES
+        tst_sleep.cpp
+    PUBLIC_LIBRARIES
+        Qt::Test
+)
+
+## Scopes:
+#####################################################################
diff --git a/tests/auto/testlib/selftests/strcmp/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/strcmp/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..ff5b402328
--- /dev/null
+++ b/tests/auto/testlib/selftests/strcmp/.prev_CMakeLists.txt
@@ -0,0 +1,15 @@
+# Generated from strcmp.pro.
+
+#####################################################################
+## strcmp Binary:
+#####################################################################
+
+add_qt_executable(strcmp
+    SOURCES
+        tst_strcmp.cpp
+    PUBLIC_LIBRARIES
+        Qt::Test
+)
+
+## Scopes:
+#####################################################################
diff --git a/tests/auto/testlib/selftests/strcmp/CMakeLists.txt b/tests/auto/testlib/selftests/strcmp/CMakeLists.txt
new file mode 100644
index 0000000000..70a6ccf33d
--- /dev/null
+++ b/tests/auto/testlib/selftests/strcmp/CMakeLists.txt
@@ -0,0 +1,17 @@
+# Generated from strcmp.pro.
+
+#####################################################################
+## strcmp Binary:
+#####################################################################
+
+add_qt_executable(strcmp
+    NO_INSTALL # special case
+    OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
+    SOURCES
+        tst_strcmp.cpp
+    PUBLIC_LIBRARIES
+        Qt::Test
+)
+
+## Scopes:
+#####################################################################
diff --git a/tests/auto/testlib/selftests/subtest/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/subtest/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..dd4ad850c6
--- /dev/null
+++ b/tests/auto/testlib/selftests/subtest/.prev_CMakeLists.txt
@@ -0,0 +1,15 @@
+# Generated from subtest.pro.
+
+#####################################################################
+## subtest Binary:
+#####################################################################
+
+add_qt_executable(subtest
+    SOURCES
+        tst_subtest.cpp
+    PUBLIC_LIBRARIES
+        Qt::Test
+)
+
+## Scopes:
+#####################################################################
diff --git a/tests/auto/testlib/selftests/subtest/CMakeLists.txt b/tests/auto/testlib/selftests/subtest/CMakeLists.txt
new file mode 100644
index 0000000000..c532f7f77c
--- /dev/null
+++ b/tests/auto/testlib/selftests/subtest/CMakeLists.txt
@@ -0,0 +1,17 @@
+# Generated from subtest.pro.
+
+#####################################################################
+## subtest Binary:
+#####################################################################
+
+add_qt_executable(subtest
+    NO_INSTALL # special case
+    OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
+    SOURCES
+        tst_subtest.cpp
+    PUBLIC_LIBRARIES
+        Qt::Test
+)
+
+## Scopes:
+#####################################################################
diff --git a/tests/auto/testlib/selftests/testlib/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/testlib/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..14a5175693
--- /dev/null
+++ b/tests/auto/testlib/selftests/testlib/.prev_CMakeLists.txt
@@ -0,0 +1,15 @@
+# Generated from testlib.pro.
+
+#####################################################################
+## testlib Binary:
+#####################################################################
+
+add_qt_executable(testlib
+    SOURCES
+        tst_testlib.cpp
+    PUBLIC_LIBRARIES
+        Qt::Test
+)
+
+## Scopes:
+#####################################################################
diff --git a/tests/auto/testlib/selftests/testlib/CMakeLists.txt b/tests/auto/testlib/selftests/testlib/CMakeLists.txt
new file mode 100644
index 0000000000..8f23f114bc
--- /dev/null
+++ b/tests/auto/testlib/selftests/testlib/CMakeLists.txt
@@ -0,0 +1,17 @@
+# Generated from testlib.pro.
+
+#####################################################################
+## testlib Binary:
+#####################################################################
+
+add_qt_executable(testlib
+    NO_INSTALL # special case
+    OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
+    SOURCES
+        tst_testlib.cpp
+    PUBLIC_LIBRARIES
+        Qt::Test
+)
+
+## Scopes:
+#####################################################################
diff --git a/tests/auto/testlib/selftests/tuplediagnostics/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/tuplediagnostics/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..7b6b107dff
--- /dev/null
+++ b/tests/auto/testlib/selftests/tuplediagnostics/.prev_CMakeLists.txt
@@ -0,0 +1,12 @@
+# Generated from tuplediagnostics.pro.
+
+#####################################################################
+## tuplediagnostics Binary:
+#####################################################################
+
+add_qt_executable(tuplediagnostics
+    SOURCES
+        tst_tuplediagnostics.cpp
+    PUBLIC_LIBRARIES
+        Qt::Test
+)
diff --git a/tests/auto/testlib/selftests/tuplediagnostics/CMakeLists.txt b/tests/auto/testlib/selftests/tuplediagnostics/CMakeLists.txt
new file mode 100644
index 0000000000..d43bcbfc07
--- /dev/null
+++ b/tests/auto/testlib/selftests/tuplediagnostics/CMakeLists.txt
@@ -0,0 +1,14 @@
+# Generated from tuplediagnostics.pro.
+
+#####################################################################
+## tuplediagnostics Binary:
+#####################################################################
+
+add_qt_executable(tuplediagnostics
+    NO_INSTALL # special case
+    OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
+    SOURCES
+        tst_tuplediagnostics.cpp
+    PUBLIC_LIBRARIES
+        Qt::Test
+)
diff --git a/tests/auto/testlib/selftests/verbose1/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/verbose1/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..9faa977236
--- /dev/null
+++ b/tests/auto/testlib/selftests/verbose1/.prev_CMakeLists.txt
@@ -0,0 +1,15 @@
+# Generated from verbose1.pro.
+
+#####################################################################
+## verbose1 Binary:
+#####################################################################
+
+add_qt_executable(verbose1
+    SOURCES
+        ../counting/tst_counting.cpp
+    PUBLIC_LIBRARIES
+        Qt::Test
+)
+
+## Scopes:
+#####################################################################
diff --git a/tests/auto/testlib/selftests/verbose1/CMakeLists.txt b/tests/auto/testlib/selftests/verbose1/CMakeLists.txt
new file mode 100644
index 0000000000..10f79d2d22
--- /dev/null
+++ b/tests/auto/testlib/selftests/verbose1/CMakeLists.txt
@@ -0,0 +1,17 @@
+# Generated from verbose1.pro.
+
+#####################################################################
+## verbose1 Binary:
+#####################################################################
+
+add_qt_executable(verbose1
+    NO_INSTALL # special case
+    OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
+    SOURCES
+        ../counting/tst_counting.cpp
+    PUBLIC_LIBRARIES
+        Qt::Test
+)
+
+## Scopes:
+#####################################################################
diff --git a/tests/auto/testlib/selftests/verbose2/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/verbose2/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..7b43fc0085
--- /dev/null
+++ b/tests/auto/testlib/selftests/verbose2/.prev_CMakeLists.txt
@@ -0,0 +1,15 @@
+# Generated from verbose2.pro.
+
+#####################################################################
+## verbose2 Binary:
+#####################################################################
+
+add_qt_executable(verbose2
+    SOURCES
+        ../counting/tst_counting.cpp
+    PUBLIC_LIBRARIES
+        Qt::Test
+)
+
+## Scopes:
+#####################################################################
diff --git a/tests/auto/testlib/selftests/verbose2/CMakeLists.txt b/tests/auto/testlib/selftests/verbose2/CMakeLists.txt
new file mode 100644
index 0000000000..138f343178
--- /dev/null
+++ b/tests/auto/testlib/selftests/verbose2/CMakeLists.txt
@@ -0,0 +1,17 @@
+# Generated from verbose2.pro.
+
+#####################################################################
+## verbose2 Binary:
+#####################################################################
+
+add_qt_executable(verbose2
+    NO_INSTALL # special case
+    OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
+    SOURCES
+        ../counting/tst_counting.cpp
+    PUBLIC_LIBRARIES
+        Qt::Test
+)
+
+## Scopes:
+#####################################################################
diff --git a/tests/auto/testlib/selftests/verifyexceptionthrown/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/verifyexceptionthrown/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..f4e20fcfc6
--- /dev/null
+++ b/tests/auto/testlib/selftests/verifyexceptionthrown/.prev_CMakeLists.txt
@@ -0,0 +1,16 @@
+# Generated from verifyexceptionthrown.pro.
+
+#####################################################################
+## verifyexceptionthrown Binary:
+#####################################################################
+
+add_qt_executable(verifyexceptionthrown
+    EXCEPTIONS
+    SOURCES
+        tst_verifyexceptionthrown.cpp
+    PUBLIC_LIBRARIES
+        Qt::Test
+)
+
+## Scopes:
+#####################################################################
diff --git a/tests/auto/testlib/selftests/verifyexceptionthrown/CMakeLists.txt b/tests/auto/testlib/selftests/verifyexceptionthrown/CMakeLists.txt
new file mode 100644
index 0000000000..def296ed7b
--- /dev/null
+++ b/tests/auto/testlib/selftests/verifyexceptionthrown/CMakeLists.txt
@@ -0,0 +1,18 @@
+# Generated from verifyexceptionthrown.pro.
+
+#####################################################################
+## verifyexceptionthrown Binary:
+#####################################################################
+
+add_qt_executable(verifyexceptionthrown
+    EXCEPTIONS
+    NO_INSTALL # special case
+    OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
+    SOURCES
+        tst_verifyexceptionthrown.cpp
+    PUBLIC_LIBRARIES
+        Qt::Test
+)
+
+## Scopes:
+#####################################################################
diff --git a/tests/auto/testlib/selftests/warnings/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/warnings/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..11fb5098d6
--- /dev/null
+++ b/tests/auto/testlib/selftests/warnings/.prev_CMakeLists.txt
@@ -0,0 +1,15 @@
+# Generated from warnings.pro.
+
+#####################################################################
+## warnings Binary:
+#####################################################################
+
+add_qt_executable(warnings
+    SOURCES
+        tst_warnings.cpp
+    PUBLIC_LIBRARIES
+        Qt::Test
+)
+
+## Scopes:
+#####################################################################
diff --git a/tests/auto/testlib/selftests/warnings/CMakeLists.txt b/tests/auto/testlib/selftests/warnings/CMakeLists.txt
new file mode 100644
index 0000000000..32e3bfe68f
--- /dev/null
+++ b/tests/auto/testlib/selftests/warnings/CMakeLists.txt
@@ -0,0 +1,17 @@
+# Generated from warnings.pro.
+
+#####################################################################
+## warnings Binary:
+#####################################################################
+
+add_qt_executable(warnings
+    NO_INSTALL # special case
+    OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
+    SOURCES
+        tst_warnings.cpp
+    PUBLIC_LIBRARIES
+        Qt::Test
+)
+
+## Scopes:
+#####################################################################
diff --git a/tests/auto/testlib/selftests/watchdog/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/watchdog/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..1ea502875e
--- /dev/null
+++ b/tests/auto/testlib/selftests/watchdog/.prev_CMakeLists.txt
@@ -0,0 +1,20 @@
+# Generated from watchdog.pro.
+
+#####################################################################
+## watchdog Binary:
+#####################################################################
+
+add_qt_executable(watchdog
+    SOURCES
+        tst_watchdog.cpp
+    PUBLIC_LIBRARIES
+        Qt::Test
+)
+
+#### Keys ignored in scope 1:.:.:watchdog.pro:<TRUE>:
+# QT_TOOL_ENV = "checkenv"
+# checkenv.name = "QTEST_FUNCTION_TIMEOUT"
+# checkenv.value = "100"
+
+## Scopes:
+#####################################################################
diff --git a/tests/auto/testlib/selftests/watchdog/CMakeLists.txt b/tests/auto/testlib/selftests/watchdog/CMakeLists.txt
new file mode 100644
index 0000000000..84236e2b5e
--- /dev/null
+++ b/tests/auto/testlib/selftests/watchdog/CMakeLists.txt
@@ -0,0 +1,22 @@
+# Generated from watchdog.pro.
+
+#####################################################################
+## watchdog Binary:
+#####################################################################
+
+add_qt_executable(watchdog
+    NO_INSTALL # special case
+    OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
+    SOURCES
+        tst_watchdog.cpp
+    PUBLIC_LIBRARIES
+        Qt::Test
+)
+
+#### Keys ignored in scope 1:.:.:watchdog.pro:<TRUE>:
+# QT_TOOL_ENV = "checkenv"
+# checkenv.name = "QTEST_FUNCTION_TIMEOUT"
+# checkenv.value = "100"
+
+## Scopes:
+#####################################################################
diff --git a/tests/auto/testlib/selftests/xunit/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/xunit/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..6a55c59e00
--- /dev/null
+++ b/tests/auto/testlib/selftests/xunit/.prev_CMakeLists.txt
@@ -0,0 +1,15 @@
+# Generated from xunit.pro.
+
+#####################################################################
+## xunit Binary:
+#####################################################################
+
+add_qt_executable(xunit
+    SOURCES
+        tst_xunit.cpp
+    PUBLIC_LIBRARIES
+        Qt::Test
+)
+
+## Scopes:
+#####################################################################
diff --git a/tests/auto/testlib/selftests/xunit/CMakeLists.txt b/tests/auto/testlib/selftests/xunit/CMakeLists.txt
new file mode 100644
index 0000000000..d47d479bdf
--- /dev/null
+++ b/tests/auto/testlib/selftests/xunit/CMakeLists.txt
@@ -0,0 +1,17 @@
+# Generated from xunit.pro.
+
+#####################################################################
+## xunit Binary:
+#####################################################################
+
+add_qt_executable(xunit
+    NO_INSTALL # special case
+    OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
+    SOURCES
+        tst_xunit.cpp
+    PUBLIC_LIBRARIES
+        Qt::Test
+)
+
+## Scopes:
+#####################################################################
diff --git a/tests/auto/tools/CMakeLists.txt b/tests/auto/tools/CMakeLists.txt
new file mode 100644
index 0000000000..aa45587993
--- /dev/null
+++ b/tests/auto/tools/CMakeLists.txt
@@ -0,0 +1,17 @@
+# Generated from tools.pro.
+
+add_subdirectory(qmakelib)
+# special case begin
+if(NOT WIN32) # @todo: this is broken, see QTBUG-78449
+    add_subdirectory(qmake)
+endif()
+# special case end
+#add_subdirectory(moc)
+#add_subdirectory(rcc)
+if(TARGET Qt::Widgets)
+    add_subdirectory(uic)
+endif()
+if(TARGET Qt::DBus)
+    add_subdirectory(qdbuscpp2xml)
+    add_subdirectory(qdbusxml2cpp)
+endif()
diff --git a/tests/auto/tools/moc/allmocs_baseline_in.json b/tests/auto/tools/moc/allmocs_baseline_in.json
index 27e25dc01c..9cc06dc7bc 100644
--- a/tests/auto/tools/moc/allmocs_baseline_in.json
+++ b/tests/auto/tools/moc/allmocs_baseline_in.json
@@ -2,71 +2,6 @@
     {
         "classes": [
             {
-                "className": "MyBooooooostishClass",
-                "object": true,
-                "qualifiedClassName": "MyBooooooostishClass",
-                "signals": [
-                    {
-                        "access": "public",
-                        "name": "mySignal",
-                        "returnType": "void"
-                    }
-                ],
-                "slots": [
-                    {
-                        "access": "public",
-                        "name": "mySlot",
-                        "returnType": "void"
-                    }
-                ],
-                "superClasses": [
-                    {
-                        "access": "public",
-                        "name": "QObject"
-                    }
-                ]
-            }
-        ],
-        "inputFile": "no-keywords.h",
-        "outputRevision": 67
-    },
-    {
-        "classes": [
-            {
-                "className": "Task87883",
-                "object": true,
-                "qualifiedClassName": "Task87883",
-                "superClasses": [
-                    {
-                        "access": "public",
-                        "name": "QObject"
-                    }
-                ]
-            }
-        ],
-        "inputFile": "task87883.h",
-        "outputRevision": 67
-    },
-    {
-        "classes": [
-            {
-                "className": "IfdefedClass",
-                "object": true,
-                "qualifiedClassName": "IfdefedClass",
-                "superClasses": [
-                    {
-                        "access": "public",
-                        "name": "QObject"
-                    }
-                ]
-            }
-        ],
-        "inputFile": "c-comments.h",
-        "outputRevision": 67
-    },
-    {
-        "classes": [
-            {
                 "className": "BackslashNewlines",
                 "object": true,
                 "qualifiedClassName": "BackslashNewlines",
@@ -91,351 +26,9 @@
     {
         "classes": [
             {
-                "className": "OldStyleCast",
-                "object": true,
-                "qualifiedClassName": "OldStyleCast",
-                "slots": [
-                    {
-                        "access": "public",
-                        "name": "foo",
-                        "returnType": "void"
-                    },
-                    {
-                        "access": "public",
-                        "arguments": [
-                            {
-                                "type": "int"
-                            },
-                            {
-                                "type": "int*"
-                            },
-                            {
-                                "type": "const int*"
-                            },
-                            {
-                                "type": "volatile int*"
-                            },
-                            {
-                                "type": "const int*volatile*"
-                            }
-                        ],
-                        "name": "bar",
-                        "returnType": "int"
-                    },
-                    {
-                        "access": "public",
-                        "arguments": [
-                            {
-                                "type": "int"
-                            },
-                            {
-                                "type": "QObject*const"
-                            }
-                        ],
-                        "name": "slot",
-                        "returnType": "void"
-                    }
-                ],
-                "superClasses": [
-                    {
-                        "access": "public",
-                        "name": "QObject"
-                    }
-                ]
-            }
-        ],
-        "inputFile": "oldstyle-casts.h",
-        "outputRevision": 67
-    },
-    {
-        "classes": [
-            {
-                "className": "SlotsWithVoidTemplateTest",
-                "object": true,
-                "qualifiedClassName": "SlotsWithVoidTemplateTest",
-                "signals": [
-                    {
-                        "access": "public",
-                        "arguments": [
-                            {
-                                "type": "TestTemplate<void>"
-                            }
-                        ],
-                        "name": "mySignal",
-                        "returnType": "void"
-                    },
-                    {
-                        "access": "public",
-                        "name": "myVoidSignal",
-                        "returnType": "void"
-                    },
-                    {
-                        "access": "public",
-                        "name": "myVoidSignal2",
-                        "returnType": "void"
-                    }
-                ],
-                "slots": [
-                    {
-                        "access": "public",
-                        "name": "dummySlot",
-                        "returnType": "void"
-                    },
-                    {
-                        "access": "public",
-                        "name": "dummySlot2",
-                        "returnType": "void"
-                    },
-                    {
-                        "access": "public",
-                        "arguments": [
-                            {
-                                "type": "TestTemplate<void>"
-                            }
-                        ],
-                        "name": "anotherSlot",
-                        "returnType": "void"
-                    },
-                    {
-                        "access": "public",
-                        "name": "mySlot",
-                        "returnType": "TestTemplate<void>"
-                    }
-                ],
-                "superClasses": [
-                    {
-                        "access": "public",
-                        "name": "QObject"
-                    }
-                ]
-            }
-        ],
-        "inputFile": "slots-with-void-template.h",
-        "outputRevision": 67
-    },
-    {
-        "classes": [
-            {
-                "className": "InvokableBeforeReturnType",
-                "methods": [
-                    {
-                        "access": "public",
-                        "name": "foo",
-                        "returnType": "const char*"
-                    }
-                ],
-                "object": true,
-                "qualifiedClassName": "InvokableBeforeReturnType",
-                "superClasses": [
-                    {
-                        "access": "public",
-                        "name": "QObject"
-                    }
-                ]
-            },
-            {
-                "className": "InvokableBeforeInline",
-                "methods": [
-                    {
-                        "access": "public",
-                        "name": "foo",
-                        "returnType": "void"
-                    },
-                    {
-                        "access": "public",
-                        "name": "bar",
-                        "returnType": "void"
-                    }
-                ],
-                "object": true,
-                "qualifiedClassName": "InvokableBeforeInline",
-                "superClasses": [
-                    {
-                        "access": "public",
-                        "name": "QObject"
-                    }
-                ]
-            }
-        ],
-        "inputFile": "qinvokable.h",
-        "outputRevision": 67
-    },
-    {
-        "classes": [
-            {
-                "className": "Bar",
-                "enums": [
-                    {
-                        "alias": "Flag",
-                        "isClass": false,
-                        "isFlag": true,
-                        "name": "Flags",
-                        "values": [
-                            "Read",
-                            "Write"
-                        ]
-                    }
-                ],
-                "object": true,
-                "properties": [
-                    {
-                        "constant": false,
-                        "designable": true,
-                        "final": false,
-                        "name": "flags",
-                        "read": "flags",
-                        "required": false,
-                        "scriptable": true,
-                        "stored": true,
-                        "type": "Flags",
-                        "user": false,
-                        "write": "setFlags"
-                    }
-                ],
-                "qualifiedClassName": "Foo::Bar",
-                "superClasses": [
-                    {
-                        "access": "public",
-                        "name": "QObject"
-                    }
-                ]
-            },
-            {
-                "className": "Baz",
-                "object": true,
-                "properties": [
-                    {
-                        "constant": false,
-                        "designable": true,
-                        "final": false,
-                        "name": "flags",
-                        "read": "flags",
-                        "required": false,
-                        "scriptable": true,
-                        "stored": true,
-                        "type": "Foo::Bar::Flags",
-                        "user": false,
-                        "write": "setFlags"
-                    },
-                    {
-                        "constant": false,
-                        "designable": true,
-                        "final": false,
-                        "name": "flagsList",
-                        "read": "flagsList",
-                        "required": false,
-                        "scriptable": true,
-                        "stored": true,
-                        "type": "QList<Foo::Bar::Flags>",
-                        "user": false,
-                        "write": "setFlagsList"
-                    }
-                ],
-                "qualifiedClassName": "Foo::Baz",
-                "superClasses": [
-                    {
-                        "access": "public",
-                        "name": "QObject"
-                    }
-                ]
-            }
-        ],
-        "inputFile": "namespaced-flags.h",
-        "outputRevision": 67
-    },
-    {
-        "classes": [
-            {
-                "className": "Foo",
-                "object": true,
-                "qualifiedClassName": "BBB::Foo",
-                "signals": [
-                    {
-                        "access": "public",
-                        "arguments": [
-                            {
-                                "type": "QList<QList<int> >"
-                            }
-                        ],
-                        "name": "foo",
-                        "returnType": "void"
-                    },
-                    {
-                        "access": "public",
-                        "arguments": [
-                            {
-                                "type": "QList<QList<int> >"
-                            }
-                        ],
-                        "name": "foo2",
-                        "returnType": "void"
-                    },
-                    {
-                        "access": "public",
-                        "arguments": [
-                            {
-                                "type": "QList< ::AAA::BaseA*>"
-                            }
-                        ],
-                        "name": "bar",
-                        "returnType": "void"
-                    },
-                    {
-                        "access": "public",
-                        "arguments": [
-                            {
-                                "type": "QList< ::AAA::BaseA*>"
-                            }
-                        ],
-                        "name": "bar2",
-                        "returnType": "void"
-                    },
-                    {
-                        "access": "public",
-                        "arguments": [
-                            {
-                                "type": "QList<const  ::AAA::BaseA*>"
-                            }
-                        ],
-                        "name": "bar3",
-                        "returnType": "void"
-                    }
-                ],
-                "superClasses": [
-                    {
-                        "access": "public",
-                        "name": "QObject"
-                    },
-                    {
-                        "access": "public",
-                        "name": "::AAA::BaseA"
-                    }
-                ]
-            }
-        ],
-        "inputFile": "trigraphs.h",
-        "outputRevision": 67
-    },
-    {
-        "classes": [
-            {
-                "classInfos": [
-                    {
-                        "name": "Test",
-                        "value": "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\\x53"
-                    },
-                    {
-                        "name": "Test2",
-                        "value": "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\\123"
-                    },
-                    {
-                        "name": "Test3",
-                        "value": "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\\nb"
-                    }
-                ],
-                "className": "StringLiterals",
+                "className": "IfdefedClass",
                 "object": true,
-                "qualifiedClassName": "StringLiterals",
+                "qualifiedClassName": "IfdefedClass",
                 "superClasses": [
                     {
                         "access": "public",
@@ -444,7 +37,7 @@
                 ]
             }
         ],
-        "inputFile": "escapes-in-string-literals.h",
+        "inputFile": "c-comments.h",
         "outputRevision": 67
     },
     {
@@ -481,487 +74,6 @@
     {
         "classes": [
             {
-                "className": "TestQPrivateSlots",
-                "methods": [
-                    {
-                        "access": "private",
-                        "name": "method1",
-                        "returnType": "void"
-                    }
-                ],
-                "object": true,
-                "qualifiedClassName": "TestQPrivateSlots",
-                "slots": [
-                    {
-                        "access": "private",
-                        "name": "_q_privateslot",
-                        "returnType": "void"
-                    }
-                ],
-                "superClasses": [
-                    {
-                        "access": "public",
-                        "name": "QObject"
-                    }
-                ]
-            }
-        ],
-        "inputFile": "qprivateslots.h",
-        "outputRevision": 67
-    },
-    {
-        "classes": [
-            {
-                "className": "GadgetWithNoEnums",
-                "gadget": true,
-                "qualifiedClassName": "GadgetWithNoEnums"
-            },
-            {
-                "className": "DerivedGadgetWithEnums",
-                "enums": [
-                    {
-                        "isClass": false,
-                        "isFlag": false,
-                        "name": "FooEnum",
-                        "values": [
-                            "FooValue"
-                        ]
-                    }
-                ],
-                "gadget": true,
-                "qualifiedClassName": "DerivedGadgetWithEnums",
-                "superClasses": [
-                    {
-                        "access": "public",
-                        "name": "GadgetWithNoEnums"
-                    }
-                ]
-            }
-        ],
-        "inputFile": "gadgetwithnoenums.h",
-        "outputRevision": 67
-    },
-    {
-        "classes": [
-            {
-                "className": "DirInIncludePath",
-                "interfaces": [
-                    [
-                        {
-                            "className": "MyInterface",
-                            "id": "\"MyInterface\""
-                        }
-                    ]
-                ],
-                "object": true,
-                "qualifiedClassName": "DirInIncludePath",
-                "superClasses": [
-                    {
-                        "access": "public",
-                        "name": "QObject"
-                    },
-                    {
-                        "access": "public",
-                        "name": "MyInterface"
-                    }
-                ]
-            }
-        ],
-        "inputFile": "dir-in-include-path.h",
-        "outputRevision": 67
-    },
-    {
-        "classes": [
-            {
-                "className": "SingleFunctionKeywordBeforeReturnType",
-                "object": true,
-                "qualifiedClassName": "SingleFunctionKeywordBeforeReturnType",
-                "signals": [
-                    {
-                        "access": "public",
-                        "name": "mySignal",
-                        "returnType": "void"
-                    }
-                ],
-                "slots": [
-                    {
-                        "access": "public",
-                        "name": "mySlot",
-                        "returnType": "void"
-                    }
-                ],
-                "superClasses": [
-                    {
-                        "access": "public",
-                        "name": "QObject"
-                    }
-                ]
-            },
-            {
-                "className": "SingleFunctionKeywordBeforeInline",
-                "object": true,
-                "qualifiedClassName": "SingleFunctionKeywordBeforeInline",
-                "signals": [
-                    {
-                        "access": "public",
-                        "name": "mySignal",
-                        "returnType": "void"
-                    }
-                ],
-                "slots": [
-                    {
-                        "access": "public",
-                        "name": "mySlot",
-                        "returnType": "void"
-                    }
-                ],
-                "superClasses": [
-                    {
-                        "access": "public",
-                        "name": "QObject"
-                    }
-                ]
-            },
-            {
-                "className": "SingleFunctionKeywordAfterInline",
-                "object": true,
-                "qualifiedClassName": "SingleFunctionKeywordAfterInline",
-                "signals": [
-                    {
-                        "access": "public",
-                        "name": "mySignal",
-                        "returnType": "void"
-                    }
-                ],
-                "slots": [
-                    {
-                        "access": "public",
-                        "name": "mySlot",
-                        "returnType": "void"
-                    }
-                ],
-                "superClasses": [
-                    {
-                        "access": "public",
-                        "name": "QObject"
-                    }
-                ]
-            }
-        ],
-        "inputFile": "single_function_keyword.h",
-        "outputRevision": 67
-    },
-    {
-        "classes": [
-            {
-                "className": "Task192552",
-                "object": true,
-                "qualifiedClassName": "Task192552",
-                "superClasses": [
-                    {
-                        "access": "public",
-                        "name": "QObject"
-                    }
-                ]
-            }
-        ],
-        "inputFile": "task192552.h",
-        "outputRevision": 67
-    },
-    {
-        "classes": [
-            {
-                "className": "InlineSlotsWithThrowDeclaration",
-                "object": true,
-                "qualifiedClassName": "InlineSlotsWithThrowDeclaration",
-                "slots": [
-                    {
-                        "access": "public",
-                        "name": "a",
-                        "returnType": "void"
-                    },
-                    {
-                        "access": "public",
-                        "name": "b",
-                        "returnType": "void"
-                    },
-                    {
-                        "access": "public",
-                        "name": "c",
-                        "returnType": "void"
-                    },
-                    {
-                        "access": "public",
-                        "name": "d",
-                        "returnType": "void"
-                    },
-                    {
-                        "access": "public",
-                        "name": "e",
-                        "returnType": "void"
-                    }
-                ],
-                "superClasses": [
-                    {
-                        "access": "public",
-                        "name": "QObject"
-                    }
-                ]
-            }
-        ],
-        "inputFile": "task189996.h",
-        "outputRevision": 67
-    },
-    {
-        "classes": [
-            {
-                "className": "TestObject",
-                "object": true,
-                "qualifiedClassName": "NS_A::NS_B::TestObject",
-                "superClasses": [
-                    {
-                        "access": "public",
-                        "name": "QObject"
-                    }
-                ]
-            },
-            {
-                "className": "TestMain",
-                "object": true,
-                "qualifiedClassName": "NS_A::NS_Main::TestMain",
-                "superClasses": [
-                    {
-                        "access": "public",
-                        "name": "QObject"
-                    }
-                ]
-            }
-        ],
-        "inputFile": "task234909.h",
-        "outputRevision": 67
-    },
-    {
-        "classes": [
-            {
-                "className": "TypenameWithUnsigned",
-                "object": true,
-                "qualifiedClassName": "TypenameWithUnsigned",
-                "slots": [
-                    {
-                        "access": "public",
-                        "arguments": [
-                            {
-                                "type": "uint"
-                            }
-                        ],
-                        "name": "a",
-                        "returnType": "void"
-                    },
-                    {
-                        "access": "public",
-                        "arguments": [
-                            {
-                                "name": "u",
-                                "type": "uint"
-                            }
-                        ],
-                        "name": "b",
-                        "returnType": "void"
-                    },
-                    {
-                        "access": "public",
-                        "arguments": [
-                            {
-                                "type": "uint*"
-                            }
-                        ],
-                        "name": "c",
-                        "returnType": "void"
-                    },
-                    {
-                        "access": "public",
-                        "arguments": [
-                            {
-                                "name": "p",
-                                "type": "uint*"
-                            }
-                        ],
-                        "name": "d",
-                        "returnType": "void"
-                    },
-                    {
-                        "access": "public",
-                        "arguments": [
-                            {
-                                "type": "uint&"
-                            }
-                        ],
-                        "name": "e",
-                        "returnType": "void"
-                    },
-                    {
-                        "access": "public",
-                        "arguments": [
-                            {
-                                "name": "r",
-                                "type": "uint&"
-                            }
-                        ],
-                        "name": "f",
-                        "returnType": "void"
-                    },
-                    {
-                        "access": "public",
-                        "arguments": [
-                            {
-                                "type": "unsigned1"
-                            }
-                        ],
-                        "name": "g",
-                        "returnType": "void"
-                    },
-                    {
-                        "access": "public",
-                        "arguments": [
-                            {
-                                "name": "u1",
-                                "type": "unsigned1"
-                            }
-                        ],
-                        "name": "h",
-                        "returnType": "void"
-                    },
-                    {
-                        "access": "public",
-                        "arguments": [
-                            {
-                                "type": "uint"
-                            },
-                            {
-                                "type": "unsigned1"
-                            }
-                        ],
-                        "name": "i",
-                        "returnType": "void"
-                    },
-                    {
-                        "access": "public",
-                        "arguments": [
-                            {
-                                "type": "unsigned1"
-                            },
-                            {
-                                "type": "uint"
-                            }
-                        ],
-                        "name": "j",
-                        "returnType": "void"
-                    },
-                    {
-                        "access": "public",
-                        "arguments": [
-                            {
-                                "type": "unsignedQImage"
-                            }
-                        ],
-                        "name": "k",
-                        "returnType": "void"
-                    },
-                    {
-                        "access": "public",
-                        "arguments": [
-                            {
-                                "name": "uqi",
-                                "type": "unsignedQImage"
-                            }
-                        ],
-                        "name": "l",
-                        "returnType": "void"
-                    }
-                ],
-                "superClasses": [
-                    {
-                        "access": "public",
-                        "name": "QObject"
-                    }
-                ]
-            }
-        ],
-        "inputFile": "task240368.h",
-        "outputRevision": 67
-    },
-    {
-        "classes": [
-            {
-                "className": "PureVirtualSignalsTest",
-                "object": true,
-                "qualifiedClassName": "PureVirtualSignalsTest",
-                "signals": [
-                    {
-                        "access": "public",
-                        "name": "mySignal",
-                        "returnType": "void"
-                    },
-                    {
-                        "access": "public",
-                        "name": "myOtherSignal",
-                        "returnType": "void"
-                    },
-                    {
-                        "access": "public",
-                        "arguments": [
-                            {
-                                "name": "foo",
-                                "type": "int"
-                            }
-                        ],
-                        "name": "mySignal2",
-                        "returnType": "void"
-                    }
-                ],
-                "superClasses": [
-                    {
-                        "access": "public",
-                        "name": "QObject"
-                    }
-                ]
-            },
-            {
-                "className": "PureVirtualSignalsImpl",
-                "object": true,
-                "qualifiedClassName": "PureVirtualSignalsImpl",
-                "signals": [
-                    {
-                        "access": "public",
-                        "name": "mySignal",
-                        "returnType": "void"
-                    },
-                    {
-                        "access": "public",
-                        "arguments": [
-                            {
-                                "name": "foo",
-                                "type": "int"
-                            }
-                        ],
-                        "name": "mySignal2",
-                        "returnType": "void"
-                    }
-                ],
-                "superClasses": [
-                    {
-                        "access": "public",
-                        "name": "PureVirtualSignalsTest"
-                    }
-                ]
-            }
-        ],
-        "inputFile": "pure-virtual-signals.h",
-        "outputRevision": 67
-    },
-    {
-        "classes": [
-            {
                 "className": "CXX11Enums",
                 "enums": [
                     {
@@ -1128,111 +240,6 @@
     {
         "classes": [
             {
-                "className": "FinalTestClassQt",
-                "object": true,
-                "qualifiedClassName": "FinalTestClassQt",
-                "superClasses": [
-                    {
-                        "access": "public",
-                        "name": "QObject"
-                    }
-                ]
-            },
-            {
-                "className": "ExportedFinalTestClassQt",
-                "object": true,
-                "qualifiedClassName": "ExportedFinalTestClassQt",
-                "superClasses": [
-                    {
-                        "access": "public",
-                        "name": "QObject"
-                    }
-                ]
-            },
-            {
-                "className": "ExportedFinalTestClassQtX",
-                "object": true,
-                "qualifiedClassName": "ExportedFinalTestClassQtX",
-                "superClasses": [
-                    {
-                        "access": "public",
-                        "name": "QObject"
-                    }
-                ]
-            },
-            {
-                "className": "FinalTestClassCpp11",
-                "object": true,
-                "qualifiedClassName": "FinalTestClassCpp11",
-                "superClasses": [
-                    {
-                        "access": "public",
-                        "name": "QObject"
-                    }
-                ]
-            },
-            {
-                "className": "ExportedFinalTestClassCpp11",
-                "object": true,
-                "qualifiedClassName": "ExportedFinalTestClassCpp11",
-                "superClasses": [
-                    {
-                        "access": "public",
-                        "name": "QObject"
-                    }
-                ]
-            },
-            {
-                "className": "ExportedFinalTestClassCpp11X",
-                "object": true,
-                "qualifiedClassName": "ExportedFinalTestClassCpp11X",
-                "superClasses": [
-                    {
-                        "access": "public",
-                        "name": "QObject"
-                    }
-                ]
-            },
-            {
-                "className": "SealedTestClass",
-                "object": true,
-                "qualifiedClassName": "SealedTestClass",
-                "superClasses": [
-                    {
-                        "access": "public",
-                        "name": "QObject"
-                    }
-                ]
-            },
-            {
-                "className": "ExportedSealedTestClass",
-                "object": true,
-                "qualifiedClassName": "ExportedSealedTestClass",
-                "superClasses": [
-                    {
-                        "access": "public",
-                        "name": "QObject"
-                    }
-                ]
-            },
-            {
-                "className": "ExportedSealedTestClassX",
-                "object": true,
-                "qualifiedClassName": "ExportedSealedTestClassX",
-                "superClasses": [
-                    {
-                        "access": "public",
-                        "name": "QObject"
-                    }
-                ]
-            }
-        ],
-        "inputFile": "cxx11-final-classes.h",
-        "outputRevision": 67
-    },
-    {
-        "classes": [
-            {
                 "className": "ExplicitOverrideControlBase",
                 "object": true,
                 "qualifiedClassName": "ExplicitOverrideControlBase",
@@ -1536,6 +543,207 @@
     {
         "classes": [
             {
+                "className": "FinalTestClassQt",
+                "object": true,
+                "qualifiedClassName": "FinalTestClassQt",
+                "superClasses": [
+                    {
+                        "access": "public",
+                        "name": "QObject"
+                    }
+                ]
+            },
+            {
+                "className": "ExportedFinalTestClassQt",
+                "object": true,
+                "qualifiedClassName": "ExportedFinalTestClassQt",
+                "superClasses": [
+                    {
+                        "access": "public",
+                        "name": "QObject"
+                    }
+                ]
+            },
+            {
+                "className": "ExportedFinalTestClassQtX",
+                "object": true,
+                "qualifiedClassName": "ExportedFinalTestClassQtX",
+                "superClasses": [
+                    {
+                        "access": "public",
+                        "name": "QObject"
+                    }
+                ]
+            },
+            {
+                "className": "FinalTestClassCpp11",
+                "object": true,
+                "qualifiedClassName": "FinalTestClassCpp11",
+                "superClasses": [
+                    {
+                        "access": "public",
+                        "name": "QObject"
+                    }
+                ]
+            },
+            {
+                "className": "ExportedFinalTestClassCpp11",
+                "object": true,
+                "qualifiedClassName": "ExportedFinalTestClassCpp11",
+                "superClasses": [
+                    {
+                        "access": "public",
+                        "name": "QObject"
+                    }
+                ]
+            },
+            {
+                "className": "ExportedFinalTestClassCpp11X",
+                "object": true,
+                "qualifiedClassName": "ExportedFinalTestClassCpp11X",
+                "superClasses": [
+                    {
+                        "access": "public",
+                        "name": "QObject"
+                    }
+                ]
+            },
+            {
+                "className": "SealedTestClass",
+                "object": true,
+                "qualifiedClassName": "SealedTestClass",
+                "superClasses": [
+                    {
+                        "access": "public",
+                        "name": "QObject"
+                    }
+                ]
+            },
+            {
+                "className": "ExportedSealedTestClass",
+                "object": true,
+                "qualifiedClassName": "ExportedSealedTestClass",
+                "superClasses": [
+                    {
+                        "access": "public",
+                        "name": "QObject"
+                    }
+                ]
+            },
+            {
+                "className": "ExportedSealedTestClassX",
+                "object": true,
+                "qualifiedClassName": "ExportedSealedTestClassX",
+                "superClasses": [
+                    {
+                        "access": "public",
+                        "name": "QObject"
+                    }
+                ]
+            }
+        ],
+        "inputFile": "cxx11-final-classes.h",
+        "outputRevision": 67
+    },
+    {
+        "classes": [
+            {
+                "className": "ClassInNamespace",
+                "enums": [
+                    {
+                        "isClass": false,
+                        "isFlag": false,
+                        "name": "GadEn",
+                        "values": [
+                            "Value"
+                        ]
+                    }
+                ],
+                "gadget": true,
+                "qualifiedClassName": "CXX17Namespace::A::B::C::D::ClassInNamespace"
+            },
+            {
+                "className": "D",
+                "enums": [
+                    {
+                        "isClass": false,
+                        "isFlag": false,
+                        "name": "NamEn",
+                        "values": [
+                            "Value"
+                        ]
+                    }
+                ],
+                "namespace": true,
+                "qualifiedClassName": "CXX17Namespace::A::B::C::D"
+            }
+        ],
+        "inputFile": "cxx17-namespaces.h",
+        "outputRevision": 67
+    },
+    {
+        "classes": [
+            {
+                "className": "DirInIncludePath",
+                "interfaces": [
+                    [
+                        {
+                            "className": "MyInterface",
+                            "id": "\"MyInterface\""
+                        }
+                    ]
+                ],
+                "object": true,
+                "qualifiedClassName": "DirInIncludePath",
+                "superClasses": [
+                    {
+                        "access": "public",
+                        "name": "QObject"
+                    },
+                    {
+                        "access": "public",
+                        "name": "MyInterface"
+                    }
+                ]
+            }
+        ],
+        "inputFile": "dir-in-include-path.h",
+        "outputRevision": 67
+    },
+    {
+        "classes": [
+            {
+                "classInfos": [
+                    {
+                        "name": "Test",
+                        "value": "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\\x53"
+                    },
+                    {
+                        "name": "Test2",
+                        "value": "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\\123"
+                    },
+                    {
+                        "name": "Test3",
+                        "value": "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\\nb"
+                    }
+                ],
+                "className": "StringLiterals",
+                "object": true,
+                "qualifiedClassName": "StringLiterals",
+                "superClasses": [
+                    {
+                        "access": "public",
+                        "name": "QObject"
+                    }
+                ]
+            }
+        ],
+        "inputFile": "escapes-in-string-literals.h",
+        "outputRevision": 67
+    },
+    {
+        "classes": [
+            {
                 "className": "ForwardDeclaredParamClass",
                 "object": true,
                 "qualifiedClassName": "ForwardDeclaredParamClass",
@@ -1737,6 +945,416 @@
     {
         "classes": [
             {
+                "className": "FunctionWithAttributes",
+                "object": true,
+                "qualifiedClassName": "FunctionWithAttributes",
+                "slots": [
+                    {
+                        "access": "public",
+                        "name": "test1",
+                        "returnType": "void"
+                    },
+                    {
+                        "access": "public",
+                        "name": "test2",
+                        "returnType": "void"
+                    }
+                ],
+                "superClasses": [
+                    {
+                        "access": "public",
+                        "name": "QObject"
+                    }
+                ]
+            }
+        ],
+        "inputFile": "function-with-attributes.h",
+        "outputRevision": 67
+    },
+    {
+        "classes": [
+            {
+                "className": "GadgetWithNoEnums",
+                "gadget": true,
+                "qualifiedClassName": "GadgetWithNoEnums"
+            },
+            {
+                "className": "DerivedGadgetWithEnums",
+                "enums": [
+                    {
+                        "isClass": false,
+                        "isFlag": false,
+                        "name": "FooEnum",
+                        "values": [
+                            "FooValue"
+                        ]
+                    }
+                ],
+                "gadget": true,
+                "qualifiedClassName": "DerivedGadgetWithEnums",
+                "superClasses": [
+                    {
+                        "access": "public",
+                        "name": "GadgetWithNoEnums"
+                    }
+                ]
+            }
+        ],
+        "inputFile": "gadgetwithnoenums.h",
+        "outputRevision": 67
+    },
+    {
+        "classes": [
+            {
+                "className": "BaseGadget",
+                "gadget": true,
+                "qualifiedClassName": "GrandParentGadget::BaseGadget"
+            },
+            {
+                "className": "DerivedGadget",
+                "gadget": true,
+                "qualifiedClassName": "GrandParentGadget::DerivedGadget",
+                "superClasses": [
+                    {
+                        "access": "public",
+                        "name": "Derived"
+                    }
+                ]
+            },
+            {
+                "className": "CRTPDerivedGadget",
+                "gadget": true,
+                "qualifiedClassName": "GrandParentGadget::CRTPDerivedGadget",
+                "superClasses": [
+                    {
+                        "access": "public",
+                        "name": "CRTP<CRTPDerivedGadget>"
+                    }
+                ]
+            }
+        ],
+        "inputFile": "grand-parent-gadget-class.h",
+        "outputRevision": 67
+    },
+    {
+        "classes": [
+            {
+                "className": "TestFwdProperties",
+                "object": true,
+                "properties": [
+                    {
+                        "constant": false,
+                        "designable": true,
+                        "final": false,
+                        "name": "prop1",
+                        "read": "getProp1",
+                        "required": false,
+                        "scriptable": true,
+                        "stored": true,
+                        "type": "FwdClass1",
+                        "user": false,
+                        "write": "setProp1"
+                    },
+                    {
+                        "constant": false,
+                        "designable": true,
+                        "final": false,
+                        "name": "prop2",
+                        "read": "getProp2",
+                        "required": false,
+                        "scriptable": true,
+                        "stored": true,
+                        "type": "FwdClass2",
+                        "user": false,
+                        "write": "setProp2"
+                    },
+                    {
+                        "constant": false,
+                        "designable": true,
+                        "final": false,
+                        "name": "prop3",
+                        "read": "getProp3",
+                        "required": false,
+                        "scriptable": true,
+                        "stored": true,
+                        "type": "FwdClass3",
+                        "user": false,
+                        "write": "setProp3"
+                    }
+                ],
+                "qualifiedClassName": "TestFwdProperties",
+                "superClasses": [
+                    {
+                        "access": "public",
+                        "name": "QObject"
+                    }
+                ]
+            },
+            {
+                "className": "SomeRandomNamespace",
+                "namespace": true,
+                "qualifiedClassName": "SomeRandomNamespace"
+            }
+        ],
+        "inputFile": "moc_include.h",
+        "outputRevision": 67
+    },
+    {
+        "classes": [
+            {
+                "className": "FooNamespace",
+                "enums": [
+                    {
+                        "isClass": true,
+                        "isFlag": false,
+                        "name": "Enum1",
+                        "values": [
+                            "Key1",
+                            "Key2"
+                        ]
+                    }
+                ],
+                "namespace": true,
+                "qualifiedClassName": "FooNamespace"
+            },
+            {
+                "className": "FooNestedNamespace",
+                "enums": [
+                    {
+                        "isClass": true,
+                        "isFlag": false,
+                        "name": "Enum2",
+                        "values": [
+                            "Key3",
+                            "Key4"
+                        ]
+                    },
+                    {
+                        "isClass": true,
+                        "isFlag": false,
+                        "name": "Enum3",
+                        "values": [
+                            "Key5",
+                            "Key6"
+                        ]
+                    }
+                ],
+                "namespace": true,
+                "qualifiedClassName": "FooNamespace::FooNestedNamespace"
+            },
+            {
+                "className": "FooMoreNestedNamespace",
+                "enums": [
+                    {
+                        "isClass": true,
+                        "isFlag": false,
+                        "name": "Enum4",
+                        "values": [
+                            "Key7",
+                            "Key8"
+                        ]
+                    }
+                ],
+                "namespace": true,
+                "qualifiedClassName": "FooNamespace::FooNestedNamespace::FooMoreNestedNamespace"
+            }
+        ],
+        "inputFile": "namespace.h",
+        "outputRevision": 67
+    },
+    {
+        "classes": [
+            {
+                "className": "Bar",
+                "enums": [
+                    {
+                        "alias": "Flag",
+                        "isClass": false,
+                        "isFlag": true,
+                        "name": "Flags",
+                        "values": [
+                            "Read",
+                            "Write"
+                        ]
+                    }
+                ],
+                "object": true,
+                "properties": [
+                    {
+                        "constant": false,
+                        "designable": true,
+                        "final": false,
+                        "name": "flags",
+                        "read": "flags",
+                        "required": false,
+                        "scriptable": true,
+                        "stored": true,
+                        "type": "Flags",
+                        "user": false,
+                        "write": "setFlags"
+                    }
+                ],
+                "qualifiedClassName": "Foo::Bar",
+                "superClasses": [
+                    {
+                        "access": "public",
+                        "name": "QObject"
+                    }
+                ]
+            },
+            {
+                "className": "Baz",
+                "object": true,
+                "properties": [
+                    {
+                        "constant": false,
+                        "designable": true,
+                        "final": false,
+                        "name": "flags",
+                        "read": "flags",
+                        "required": false,
+                        "scriptable": true,
+                        "stored": true,
+                        "type": "Foo::Bar::Flags",
+                        "user": false,
+                        "write": "setFlags"
+                    },
+                    {
+                        "constant": false,
+                        "designable": true,
+                        "final": false,
+                        "name": "flagsList",
+                        "read": "flagsList",
+                        "required": false,
+                        "scriptable": true,
+                        "stored": true,
+                        "type": "QVector<Foo::Bar::Flags>",
+                        "user": false,
+                        "write": "setFlagsList"
+                    }
+                ],
+                "qualifiedClassName": "Foo::Baz",
+                "superClasses": [
+                    {
+                        "access": "public",
+                        "name": "QObject"
+                    }
+                ]
+            }
+        ],
+        "inputFile": "namespaced-flags.h",
+        "outputRevision": 67
+    },
+    {
+        "classes": [
+            {
+                "className": "MyBooooooostishClass",
+                "object": true,
+                "qualifiedClassName": "MyBooooooostishClass",
+                "signals": [
+                    {
+                        "access": "public",
+                        "name": "mySignal",
+                        "returnType": "void"
+                    }
+                ],
+                "slots": [
+                    {
+                        "access": "public",
+                        "name": "mySlot",
+                        "returnType": "void"
+                    }
+                ],
+                "superClasses": [
+                    {
+                        "access": "public",
+                        "name": "QObject"
+                    }
+                ]
+            }
+        ],
+        "inputFile": "no-keywords.h",
+        "outputRevision": 67
+    },
+    {
+        "classes": [
+            {
+                "className": "Derived",
+                "gadget": true,
+                "qualifiedClassName": "NonGadgetParent::Derived",
+                "superClasses": [
+                    {
+                        "access": "public",
+                        "name": "Base"
+                    }
+                ]
+            }
+        ],
+        "inputFile": "non-gadget-parent-class.h",
+        "outputRevision": 67
+    },
+    {
+        "classes": [
+            {
+                "className": "OldStyleCast",
+                "object": true,
+                "qualifiedClassName": "OldStyleCast",
+                "slots": [
+                    {
+                        "access": "public",
+                        "name": "foo",
+                        "returnType": "void"
+                    },
+                    {
+                        "access": "public",
+                        "arguments": [
+                            {
+                                "type": "int"
+                            },
+                            {
+                                "type": "int*"
+                            },
+                            {
+                                "type": "const int*"
+                            },
+                            {
+                                "type": "volatile int*"
+                            },
+                            {
+                                "type": "const int*volatile*"
+                            }
+                        ],
+                        "name": "bar",
+                        "returnType": "int"
+                    },
+                    {
+                        "access": "public",
+                        "arguments": [
+                            {
+                                "type": "int"
+                            },
+                            {
+                                "type": "QObject*"
+                            }
+                        ],
+                        "name": "slot",
+                        "returnType": "void"
+                    }
+                ],
+                "superClasses": [
+                    {
+                        "access": "public",
+                        "name": "QObject"
+                    }
+                ]
+            }
+        ],
+        "inputFile": "oldstyle-casts.h",
+        "outputRevision": 67
+    },
+    {
+        "classes": [
+            {
                 "classInfos": [
                     {
                         "name": "TestString",
@@ -1937,18 +1555,46 @@
     {
         "classes": [
             {
-                "className": "FunctionWithAttributes",
+                "className": "TestPluginMetaData",
                 "object": true,
-                "qualifiedClassName": "FunctionWithAttributes",
-                "slots": [
+                "qualifiedClassName": "TestPluginMetaData",
+                "superClasses": [
                     {
                         "access": "public",
-                        "name": "test1",
+                        "name": "QObject"
+                    }
+                ]
+            }
+        ],
+        "inputFile": "plugin_metadata.h",
+        "outputRevision": 67
+    },
+    {
+        "classes": [
+            {
+                "className": "PureVirtualSignalsTest",
+                "object": true,
+                "qualifiedClassName": "PureVirtualSignalsTest",
+                "signals": [
+                    {
+                        "access": "public",
+                        "name": "mySignal",
                         "returnType": "void"
                     },
                     {
                         "access": "public",
-                        "name": "test2",
+                        "name": "myOtherSignal",
+                        "returnType": "void"
+                    },
+                    {
+                        "access": "public",
+                        "arguments": [
+                            {
+                                "name": "foo",
+                                "type": "int"
+                            }
+                        ],
+                        "name": "mySignal2",
                         "returnType": "void"
                     }
                 ],
@@ -1958,17 +1604,76 @@
                         "name": "QObject"
                     }
                 ]
+            },
+            {
+                "className": "PureVirtualSignalsImpl",
+                "object": true,
+                "qualifiedClassName": "PureVirtualSignalsImpl",
+                "signals": [
+                    {
+                        "access": "public",
+                        "name": "mySignal",
+                        "returnType": "void"
+                    },
+                    {
+                        "access": "public",
+                        "arguments": [
+                            {
+                                "name": "foo",
+                                "type": "int"
+                            }
+                        ],
+                        "name": "mySignal2",
+                        "returnType": "void"
+                    }
+                ],
+                "superClasses": [
+                    {
+                        "access": "public",
+                        "name": "PureVirtualSignalsTest"
+                    }
+                ]
             }
         ],
-        "inputFile": "function-with-attributes.h",
+        "inputFile": "pure-virtual-signals.h",
         "outputRevision": 67
     },
     {
         "classes": [
             {
-                "className": "TestPluginMetaData",
+                "className": "InvokableBeforeReturnType",
+                "methods": [
+                    {
+                        "access": "public",
+                        "name": "foo",
+                        "returnType": "const char*"
+                    }
+                ],
                 "object": true,
-                "qualifiedClassName": "TestPluginMetaData",
+                "qualifiedClassName": "InvokableBeforeReturnType",
+                "superClasses": [
+                    {
+                        "access": "public",
+                        "name": "QObject"
+                    }
+                ]
+            },
+            {
+                "className": "InvokableBeforeInline",
+                "methods": [
+                    {
+                        "access": "public",
+                        "name": "foo",
+                        "returnType": "void"
+                    },
+                    {
+                        "access": "public",
+                        "name": "bar",
+                        "returnType": "void"
+                    }
+                ],
+                "object": true,
+                "qualifiedClassName": "InvokableBeforeInline",
                 "superClasses": [
                     {
                         "access": "public",
@@ -1977,25 +1682,29 @@
                 ]
             }
         ],
-        "inputFile": "plugin_metadata.h",
+        "inputFile": "qinvokable.h",
         "outputRevision": 67
     },
     {
         "classes": [
             {
-                "className": "KDAB",
-                "enums": [
+                "className": "TestQPrivateSlots",
+                "methods": [
                     {
-                        "isClass": false,
-                        "isFlag": false,
-                        "name": "Salaries",
-                        "values": [
-                            "Steve"
-                        ]
+                        "access": "private",
+                        "name": "method1",
+                        "returnType": "void"
                     }
                 ],
                 "object": true,
-                "qualifiedClassName": "KDAB",
+                "qualifiedClassName": "TestQPrivateSlots",
+                "slots": [
+                    {
+                        "access": "private",
+                        "name": "_q_privateslot",
+                        "returnType": "void"
+                    }
+                ],
                 "superClasses": [
                     {
                         "access": "public",
@@ -2004,7 +1713,7 @@
                 ]
             }
         ],
-        "inputFile": "single-quote-digit-separator-n3781.h",
+        "inputFile": "qprivateslots.h",
         "outputRevision": 67
     },
     {
@@ -2021,15 +1730,15 @@
                         ]
                     }
                 ],
-                "object": true,
-                "qualifiedClassName": "QTBUG_2151::A",
-                "superClasses": [
-                    {
-                        "access": "public",
-                        "name": "QObject"
-                    }
-                ]
-            },
+                "gadget": true,
+                "qualifiedClassName": "QTBUG_35657::A"
+            }
+        ],
+        "inputFile": "qtbug-35657-gadget.h",
+        "outputRevision": 67
+    },
+    {
+        "classes": [
             {
                 "className": "B",
                 "object": true,
@@ -2047,7 +1756,7 @@
                         "user": false
                     }
                 ],
-                "qualifiedClassName": "QTBUG_2151::B",
+                "qualifiedClassName": "QTBUG_35657::B",
                 "superClasses": [
                     {
                         "access": "public",
@@ -2056,7 +1765,7 @@
                 ]
             }
         ],
-        "inputFile": "related-metaobjects-in-namespaces.h",
+        "inputFile": "related-metaobjects-in-gadget.h",
         "outputRevision": 67
     },
     {
@@ -2073,66 +1782,16 @@
                         ]
                     }
                 ],
-                "gadget": true,
-                "qualifiedClassName": "QTBUG_35657::A"
-            }
-        ],
-        "inputFile": "qtbug-35657-gadget.h",
-        "outputRevision": 67
-    },
-    {
-        "classes": [
-            {
-                "className": "Derived",
-                "gadget": true,
-                "qualifiedClassName": "NonGadgetParent::Derived",
-                "superClasses": [
-                    {
-                        "access": "public",
-                        "name": "Base"
-                    }
-                ]
-            }
-        ],
-        "inputFile": "non-gadget-parent-class.h",
-        "outputRevision": 67
-    },
-    {
-        "classes": [
-            {
-                "className": "BaseGadget",
-                "gadget": true,
-                "qualifiedClassName": "GrandParentGadget::BaseGadget"
-            },
-            {
-                "className": "DerivedGadget",
-                "gadget": true,
-                "qualifiedClassName": "GrandParentGadget::DerivedGadget",
+                "object": true,
+                "qualifiedClassName": "QTBUG_2151::A",
                 "superClasses": [
                     {
                         "access": "public",
-                        "name": "Derived"
+                        "name": "QObject"
                     }
                 ]
             },
             {
-                "className": "CRTPDerivedGadget",
-                "gadget": true,
-                "qualifiedClassName": "GrandParentGadget::CRTPDerivedGadget",
-                "superClasses": [
-                    {
-                        "access": "public",
-                        "name": "CRTP<CRTPDerivedGadget>"
-                    }
-                ]
-            }
-        ],
-        "inputFile": "grand-parent-gadget-class.h",
-        "outputRevision": 67
-    },
-    {
-        "classes": [
-            {
                 "className": "B",
                 "object": true,
                 "properties": [
@@ -2149,7 +1808,7 @@
                         "user": false
                     }
                 ],
-                "qualifiedClassName": "QTBUG_35657::B",
+                "qualifiedClassName": "QTBUG_2151::B",
                 "superClasses": [
                     {
                         "access": "public",
@@ -2158,7 +1817,7 @@
                 ]
             }
         ],
-        "inputFile": "related-metaobjects-in-gadget.h",
+        "inputFile": "related-metaobjects-in-namespaces.h",
         "outputRevision": 67
     },
     {
@@ -2596,100 +2255,460 @@
     {
         "classes": [
             {
-                "className": "FooNamespace",
+                "className": "KDAB",
                 "enums": [
                     {
-                        "isClass": true,
+                        "isClass": false,
                         "isFlag": false,
-                        "name": "Enum1",
+                        "name": "Salaries",
                         "values": [
-                            "Key1",
-                            "Key2"
+                            "Steve"
                         ]
                     }
                 ],
-                "namespace": true,
-                "qualifiedClassName": "FooNamespace"
+                "object": true,
+                "qualifiedClassName": "KDAB",
+                "superClasses": [
+                    {
+                        "access": "public",
+                        "name": "QObject"
+                    }
+                ]
+            }
+        ],
+        "inputFile": "single-quote-digit-separator-n3781.h",
+        "outputRevision": 67
+    },
+    {
+        "classes": [
+            {
+                "className": "SingleFunctionKeywordBeforeReturnType",
+                "object": true,
+                "qualifiedClassName": "SingleFunctionKeywordBeforeReturnType",
+                "signals": [
+                    {
+                        "access": "public",
+                        "name": "mySignal",
+                        "returnType": "void"
+                    }
+                ],
+                "slots": [
+                    {
+                        "access": "public",
+                        "name": "mySlot",
+                        "returnType": "void"
+                    }
+                ],
+                "superClasses": [
+                    {
+                        "access": "public",
+                        "name": "QObject"
+                    }
+                ]
             },
             {
-                "className": "FooNestedNamespace",
-                "enums": [
+                "className": "SingleFunctionKeywordBeforeInline",
+                "object": true,
+                "qualifiedClassName": "SingleFunctionKeywordBeforeInline",
+                "signals": [
                     {
-                        "isClass": true,
-                        "isFlag": false,
-                        "name": "Enum2",
-                        "values": [
-                            "Key3",
-                            "Key4"
-                        ]
-                    },
+                        "access": "public",
+                        "name": "mySignal",
+                        "returnType": "void"
+                    }
+                ],
+                "slots": [
                     {
-                        "isClass": true,
-                        "isFlag": false,
-                        "name": "Enum3",
-                        "values": [
-                            "Key5",
-                            "Key6"
-                        ]
+                        "access": "public",
+                        "name": "mySlot",
+                        "returnType": "void"
                     }
                 ],
-                "namespace": true,
-                "qualifiedClassName": "FooNamespace::FooNestedNamespace"
+                "superClasses": [
+                    {
+                        "access": "public",
+                        "name": "QObject"
+                    }
+                ]
             },
             {
-                "className": "FooMoreNestedNamespace",
-                "enums": [
+                "className": "SingleFunctionKeywordAfterInline",
+                "object": true,
+                "qualifiedClassName": "SingleFunctionKeywordAfterInline",
+                "signals": [
                     {
-                        "isClass": true,
-                        "isFlag": false,
-                        "name": "Enum4",
-                        "values": [
-                            "Key7",
-                            "Key8"
-                        ]
+                        "access": "public",
+                        "name": "mySignal",
+                        "returnType": "void"
                     }
                 ],
-                "namespace": true,
-                "qualifiedClassName": "FooNamespace::FooNestedNamespace::FooMoreNestedNamespace"
+                "slots": [
+                    {
+                        "access": "public",
+                        "name": "mySlot",
+                        "returnType": "void"
+                    }
+                ],
+                "superClasses": [
+                    {
+                        "access": "public",
+                        "name": "QObject"
+                    }
+                ]
             }
         ],
-        "inputFile": "namespace.h",
+        "inputFile": "single_function_keyword.h",
         "outputRevision": 67
     },
     {
         "classes": [
             {
-                "className": "ClassInNamespace",
-                "enums": [
+                "className": "SlotsWithVoidTemplateTest",
+                "object": true,
+                "qualifiedClassName": "SlotsWithVoidTemplateTest",
+                "signals": [
                     {
-                        "isClass": false,
-                        "isFlag": false,
-                        "name": "GadEn",
-                        "values": [
-                            "Value"
-                        ]
+                        "access": "public",
+                        "arguments": [
+                            {
+                                "type": "TestTemplate<void>"
+                            }
+                        ],
+                        "name": "mySignal",
+                        "returnType": "void"
+                    },
+                    {
+                        "access": "public",
+                        "name": "myVoidSignal",
+                        "returnType": "void"
+                    },
+                    {
+                        "access": "public",
+                        "name": "myVoidSignal2",
+                        "returnType": "void"
                     }
                 ],
-                "gadget": true,
-                "qualifiedClassName": "CXX17Namespace::A::B::C::D::ClassInNamespace"
+                "slots": [
+                    {
+                        "access": "public",
+                        "name": "dummySlot",
+                        "returnType": "void"
+                    },
+                    {
+                        "access": "public",
+                        "name": "dummySlot2",
+                        "returnType": "void"
+                    },
+                    {
+                        "access": "public",
+                        "arguments": [
+                            {
+                                "type": "TestTemplate<void>"
+                            }
+                        ],
+                        "name": "anotherSlot",
+                        "returnType": "void"
+                    },
+                    {
+                        "access": "public",
+                        "name": "mySlot",
+                        "returnType": "TestTemplate<void>"
+                    }
+                ],
+                "superClasses": [
+                    {
+                        "access": "public",
+                        "name": "QObject"
+                    }
+                ]
+            }
+        ],
+        "inputFile": "slots-with-void-template.h",
+        "outputRevision": 67
+    },
+    {
+        "classes": [
+            {
+                "className": "Task192552",
+                "object": true,
+                "qualifiedClassName": "Task192552",
+                "superClasses": [
+                    {
+                        "access": "public",
+                        "name": "QObject"
+                    }
+                ]
+            }
+        ],
+        "inputFile": "task192552.h",
+        "outputRevision": 67
+    },
+    {
+        "classes": [
+            {
+                "className": "TestObject",
+                "object": true,
+                "qualifiedClassName": "NS_A::NS_B::TestObject",
+                "superClasses": [
+                    {
+                        "access": "public",
+                        "name": "QObject"
+                    }
+                ]
             },
             {
-                "className": "D",
-                "enums": [
+                "className": "TestMain",
+                "object": true,
+                "qualifiedClassName": "NS_A::NS_Main::TestMain",
+                "superClasses": [
                     {
-                        "isClass": false,
-                        "isFlag": false,
-                        "name": "NamEn",
-                        "values": [
-                            "Value"
-                        ]
+                        "access": "public",
+                        "name": "QObject"
+                    }
+                ]
+            }
+        ],
+        "inputFile": "task234909.h",
+        "outputRevision": 67
+    },
+    {
+        "classes": [
+            {
+                "className": "TypenameWithUnsigned",
+                "object": true,
+                "qualifiedClassName": "TypenameWithUnsigned",
+                "slots": [
+                    {
+                        "access": "public",
+                        "arguments": [
+                            {
+                                "type": "uint"
+                            }
+                        ],
+                        "name": "a",
+                        "returnType": "void"
+                    },
+                    {
+                        "access": "public",
+                        "arguments": [
+                            {
+                                "name": "u",
+                                "type": "uint"
+                            }
+                        ],
+                        "name": "b",
+                        "returnType": "void"
+                    },
+                    {
+                        "access": "public",
+                        "arguments": [
+                            {
+                                "type": "uint*"
+                            }
+                        ],
+                        "name": "c",
+                        "returnType": "void"
+                    },
+                    {
+                        "access": "public",
+                        "arguments": [
+                            {
+                                "name": "p",
+                                "type": "uint*"
+                            }
+                        ],
+                        "name": "d",
+                        "returnType": "void"
+                    },
+                    {
+                        "access": "public",
+                        "arguments": [
+                            {
+                                "type": "uint&"
+                            }
+                        ],
+                        "name": "e",
+                        "returnType": "void"
+                    },
+                    {
+                        "access": "public",
+                        "arguments": [
+                            {
+                                "name": "r",
+                                "type": "uint&"
+                            }
+                        ],
+                        "name": "f",
+                        "returnType": "void"
+                    },
+                    {
+                        "access": "public",
+                        "arguments": [
+                            {
+                                "type": "unsigned1"
+                            }
+                        ],
+                        "name": "g",
+                        "returnType": "void"
+                    },
+                    {
+                        "access": "public",
+                        "arguments": [
+                            {
+                                "name": "u1",
+                                "type": "unsigned1"
+                            }
+                        ],
+                        "name": "h",
+                        "returnType": "void"
+                    },
+                    {
+                        "access": "public",
+                        "arguments": [
+                            {
+                                "type": "uint"
+                            },
+                            {
+                                "type": "unsigned1"
+                            }
+                        ],
+                        "name": "i",
+                        "returnType": "void"
+                    },
+                    {
+                        "access": "public",
+                        "arguments": [
+                            {
+                                "type": "unsigned1"
+                            },
+                            {
+                                "type": "uint"
+                            }
+                        ],
+                        "name": "j",
+                        "returnType": "void"
+                    },
+                    {
+                        "access": "public",
+                        "arguments": [
+                            {
+                                "type": "unsignedQImage"
+                            }
+                        ],
+                        "name": "k",
+                        "returnType": "void"
+                    },
+                    {
+                        "access": "public",
+                        "arguments": [
+                            {
+                                "name": "uqi",
+                                "type": "unsignedQImage"
+                            }
+                        ],
+                        "name": "l",
+                        "returnType": "void"
                     }
                 ],
-                "namespace": true,
-                "qualifiedClassName": "CXX17Namespace::A::B::C::D"
+                "superClasses": [
+                    {
+                        "access": "public",
+                        "name": "QObject"
+                    }
+                ]
             }
         ],
-        "inputFile": "cxx17-namespaces.h",
+        "inputFile": "task240368.h",
+        "outputRevision": 67
+    },
+    {
+        "classes": [
+            {
+                "className": "Task87883",
+                "object": true,
+                "qualifiedClassName": "Task87883",
+                "superClasses": [
+                    {
+                        "access": "public",
+                        "name": "QObject"
+                    }
+                ]
+            }
+        ],
+        "inputFile": "task87883.h",
+        "outputRevision": 67
+    },
+    {
+        "classes": [
+            {
+                "className": "Foo",
+                "object": true,
+                "qualifiedClassName": "BBB::Foo",
+                "signals": [
+                    {
+                        "access": "public",
+                        "arguments": [
+                            {
+                                "type": "QVector<QVector<int>>"
+                            }
+                        ],
+                        "name": "foo",
+                        "returnType": "void"
+                    },
+                    {
+                        "access": "public",
+                        "arguments": [
+                            {
+                                "type": "QVector<QVector<int>>"
+                            }
+                        ],
+                        "name": "foo2",
+                        "returnType": "void"
+                    },
+                    {
+                        "access": "public",
+                        "arguments": [
+                            {
+                                "type": "QVector<::AAA::BaseA*>"
+                            }
+                        ],
+                        "name": "bar",
+                        "returnType": "void"
+                    },
+                    {
+                        "access": "public",
+                        "arguments": [
+                            {
+                                "type": "QVector<::AAA::BaseA*>"
+                            }
+                        ],
+                        "name": "bar2",
+                        "returnType": "void"
+                    },
+                    {
+                        "access": "public",
+                        "arguments": [
+                            {
+                                "type": "QVector<const ::AAA::BaseA*>"
+                            }
+                        ],
+                        "name": "bar3",
+                        "returnType": "void"
+                    }
+                ],
+                "superClasses": [
+                    {
+                        "access": "public",
+                        "name": "QObject"
+                    },
+                    {
+                        "access": "public",
+                        "name": "::AAA::BaseA"
+                    }
+                ]
+            }
+        ],
+        "inputFile": "trigraphs.h",
         "outputRevision": 67
     }
 ]
diff --git a/tests/auto/tools/moc/fwdclass1.h b/tests/auto/tools/moc/fwdclass1.h
new file mode 100644
index 0000000000..a8457cca77
--- /dev/null
+++ b/tests/auto/tools/moc/fwdclass1.h
@@ -0,0 +1,38 @@
+/****************************************************************************
+**
+** Copyright (C) 2020 Olivier Goffart <ogoffart@woboq.com>
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:GPL-EXCEPT$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 as published by the Free Software
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifdef FWDCLASS1_H
+#error "This file can only be included once"
+#endif
+#define FWDCLASS1_H
+
+class FwdClass1
+{
+public:
+    int x;
+};
diff --git a/tests/auto/tools/moc/fwdclass2.h b/tests/auto/tools/moc/fwdclass2.h
new file mode 100644
index 0000000000..650da18116
--- /dev/null
+++ b/tests/auto/tools/moc/fwdclass2.h
@@ -0,0 +1,38 @@
+/****************************************************************************
+**
+** Copyright (C) 2020 Olivier Goffart <ogoffart@woboq.com>
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:GPL-EXCEPT$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 as published by the Free Software
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifdef FWDCLASS2_H
+#error "This file can only be included once"
+#endif
+#define FWDCLASS2_H
+
+class FwdClass2
+{
+public:
+    int x;
+};
diff --git a/tests/auto/tools/moc/fwdclass3.h b/tests/auto/tools/moc/fwdclass3.h
new file mode 100644
index 0000000000..080ac0340d
--- /dev/null
+++ b/tests/auto/tools/moc/fwdclass3.h
@@ -0,0 +1,38 @@
+/****************************************************************************
+**
+** Copyright (C) 2020 Olivier Goffart <ogoffart@woboq.com>
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:GPL-EXCEPT$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 as published by the Free Software
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifdef FWDCLASS3_H
+#error "This file can only be included once"
+#endif
+#define FWDCLASS3_H
+
+class FwdClass3
+{
+public:
+    int x;
+};
diff --git a/tests/auto/tools/moc/moc.pro b/tests/auto/tools/moc/moc.pro
index 1794bafd2c..094c76227b 100644
--- a/tests/auto/tools/moc/moc.pro
+++ b/tests/auto/tools/moc/moc.pro
@@ -15,7 +15,7 @@ cross_compile: DEFINES += MOC_CROSS_COMPILED
 HEADERS += using-namespaces.h no-keywords.h task87883.h c-comments.h backslash-newlines.h oldstyle-casts.h \
            slots-with-void-template.h qinvokable.h namespaced-flags.h trigraphs.h \
            escapes-in-string-literals.h cstyle-enums.h qprivateslots.h gadgetwithnoenums.h \
-           dir-in-include-path.h single_function_keyword.h task192552.h task189996.h \
+           dir-in-include-path.h single_function_keyword.h task192552.h \
            task234909.h task240368.h pure-virtual-signals.h cxx11-enums.h \
            cxx11-final-classes.h \
            cxx11-explicit-override-control.h \
@@ -30,7 +30,8 @@ HEADERS += using-namespaces.h no-keywords.h task87883.h c-comments.h backslash-n
            related-metaobjects-in-gadget.h \
            related-metaobjects-name-conflict.h \
            namespace.h cxx17-namespaces.h \
-           cxx-attributes.h
+           cxx-attributes.h \
+           moc_include.h
 
 # No platform specifics in the JSON files, so that we can compare them
 JSON_HEADERS = $$HEADERS
diff --git a/tests/auto/tools/moc/moc_include.h b/tests/auto/tools/moc/moc_include.h
new file mode 100644
index 0000000000..49b484a0c9
--- /dev/null
+++ b/tests/auto/tools/moc/moc_include.h
@@ -0,0 +1,74 @@
+/****************************************************************************
+**
+** Copyright (C) 2020 Olivier Goffart <ogoffart@woboq.com>
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:GPL-EXCEPT$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 as published by the Free Software
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef MOC_INCLUDE_H
+#define MOC_INCLUDE_H
+
+#include <QObject>
+
+class FwdClass1;
+class FwdClass2;
+class FwdClass3;
+
+Q_MOC_INCLUDE(fwdclass3.h)
+
+namespace SomeRandomNamespace {
+Q_MOC_INCLUDE("fwdclass1.h")
+Q_NAMESPACE
+}
+
+class TestFwdProperties : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(FwdClass1 prop1 WRITE setProp1 READ getProp1)
+    Q_PROPERTY(FwdClass2 prop2 WRITE setProp2 READ getProp2)
+    Q_PROPERTY(FwdClass3 prop3 WRITE setProp3 READ getProp3)
+public:
+    ~TestFwdProperties();
+
+    void setProp1(const FwdClass1 &val);
+    void setProp2(const FwdClass2 &val);
+    void setProp3(const FwdClass3 &val);
+    const FwdClass1 &getProp1() { return *prop1; }
+    const FwdClass2 &getProp2() { return *prop2; }
+    const FwdClass3 &getProp3() { return *prop3; }
+
+    QScopedPointer<FwdClass1> prop1;
+    QScopedPointer<FwdClass2> prop2;
+    QScopedPointer<FwdClass3> prop3;
+
+    Q_MOC_INCLUDE(
+        \
+        "fwdclass2.h"
+    )
+
+};
+
+Q_MOC_INCLUDE(<QString>)
+
+#endif // MOC_INCLUDE_H
diff --git a/tests/auto/tools/moc/task189996.h b/tests/auto/tools/moc/task189996.h
deleted file mode 100644
index f94a051b3a..0000000000
--- a/tests/auto/tools/moc/task189996.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-// inline functions can have throw declarations
-
-#ifndef TASK189996_H
-#define TASK189996_H
-
-#include <QObject>
-
-class InlineSlotsWithThrowDeclaration : public QObject
-{
-    Q_OBJECT
-
-public slots:
-    void a() throw() { }
-    void b() const throw() { }
-    void c() throw();
-    void d() throw(int) { }
-    void e() const throw(int,double) { }
-};
-
-#endif
diff --git a/tests/auto/tools/moc/tst_moc.cpp b/tests/auto/tools/moc/tst_moc.cpp
index 0f801fe902..31fe68a64e 100644
--- a/tests/auto/tools/moc/tst_moc.cpp
+++ b/tests/auto/tools/moc/tst_moc.cpp
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
-** Copyright (C) 2013 Olivier Goffart <ogoffart@woboq.com>
+** Copyright (C) 2020 The Qt Company Ltd.
+** Copyright (C) 2020 Olivier Goffart <ogoffart@woboq.com>
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the test suite of the Qt Toolkit.
@@ -27,13 +27,12 @@
 **
 ****************************************************************************/
 
-
-
 #include <QtTest/QtTest>
 #include <stdio.h>
 #include <qobject.h>
 #include <qmetaobject.h>
 #include <qjsondocument.h>
+#include <qversionnumber.h>
 
 #include "using-namespaces.h"
 #include "assign-namespace.h"
@@ -74,6 +73,11 @@
 #include "cxx17-namespaces.h"
 #include "cxx-attributes.h"
 
+#include "moc_include.h"
+#include "fwdclass1.h"
+#include "fwdclass2.h"
+#include "fwdclass3.h"
+
 #ifdef Q_MOC_RUN
 // check that moc can parse these constructs, they are being used in Windows winsock2.h header
 #define STRING_HASH_HASH(x) ("foo" ## x ## "bar")
@@ -630,7 +634,6 @@ public:
 private slots:
     void initTestCase();
 
-    void slotWithException() throw(MyStruct);
     void dontStripNamespaces();
     void oldStyleCasts();
     void warnOnExtraSignalSlotQualifiaction();
@@ -672,7 +675,6 @@ private slots:
     void templateGtGt();
     void qprivateslots();
     void qprivateproperties();
-    void inlineSlotsWithThrowDeclaration();
     void warnOnPropertyWithoutREAD();
     void constructors();
     void typenameWithUnsigned();
@@ -719,6 +721,7 @@ private slots:
     void cxx17Namespaces();
     void cxxAttributes();
     void mocJsonOutput();
+    void mocInclude();
     void requiredProperties();
 
 signals:
@@ -782,12 +785,6 @@ void tst_Moc::initTestCase()
 #endif
 }
 
-void tst_Moc::slotWithException() throw(MyStruct)
-{
-    // be happy
-    QVERIFY(true);
-}
-
 void tst_Moc::dontStripNamespaces()
 {
     Sender sender;
@@ -822,7 +819,7 @@ void tst_Moc::oldStyleCasts()
 
     QStringList args;
     args << "-c" << "-x" << "c++" << "-Wold-style-cast" << "-I" << "."
-         << "-I" << qtIncludePath << "-o" << "/dev/null" << "-fPIC" << "-std=c++11" << "-";
+         << "-I" << qtIncludePath << "-o" << "/dev/null" << "-fPIC" << "-std=c++1z" << "-";
     proc.start("gcc", args);
     QVERIFY(proc.waitForStarted());
     proc.write(mocOut);
@@ -892,7 +889,7 @@ void tst_Moc::inputFileNameWithDotsButNoExtension()
 
     QStringList args;
     args << "-c" << "-x" << "c++" << "-I" << ".."
-         << "-I" << qtIncludePath << "-o" << "/dev/null" << "-fPIC" << "-std=c++11" << "-";
+         << "-I" << qtIncludePath << "-o" << "/dev/null" << "-fPIC" << "-std=c++1z" << "-";
     proc.start("gcc", args);
     QVERIFY(proc.waitForStarted());
     proc.write(mocOut);
@@ -1172,7 +1169,7 @@ void tst_Moc::ignoreOptionClashes()
     QStringList gccArgs;
     gccArgs << "-c" << "-x" << "c++" << "-I" << ".."
          << "-I" << qtIncludePath << "-I" << includeDir << "-o" << "/dev/null"
-         << "-fPIC" << "-std=c++11" <<  "-";
+         << "-fPIC" << "-std=c++1z" <<  "-";
     proc.start("gcc", gccArgs);
     QVERIFY(proc.waitForStarted());
     proc.write(mocOut);
@@ -1591,21 +1588,6 @@ void tst_Moc::qprivateproperties()
 
 }
 
-#include "task189996.h"
-
-void InlineSlotsWithThrowDeclaration::c() throw() {}
-
-void tst_Moc::inlineSlotsWithThrowDeclaration()
-{
-    InlineSlotsWithThrowDeclaration tst;
-    const QMetaObject *mobj = tst.metaObject();
-    QVERIFY(mobj->indexOfSlot("a()") != -1);
-    QVERIFY(mobj->indexOfSlot("b()") != -1);
-    QVERIFY(mobj->indexOfSlot("c()") != -1);
-    QVERIFY(mobj->indexOfSlot("d()") != -1);
-    QVERIFY(mobj->indexOfSlot("e()") != -1);
-}
-
 void tst_Moc::warnOnPropertyWithoutREAD()
 {
 #ifdef MOC_CROSS_COMPILED
@@ -1845,8 +1827,8 @@ void tst_Moc::QTBUG12260_defaultTemplate()
 {
     QVERIFY(QTBUG12260_defaultTemplate_Object::staticMetaObject.indexOfSlot("doSomething(QHash<QString,QVariant>)") != -1);
     QVERIFY(QTBUG12260_defaultTemplate_Object::staticMetaObject.indexOfSlot("doAnotherThing(bool,bool)") != -1);
-    QVERIFY(QTBUG12260_defaultTemplate_Object::staticMetaObject.indexOfSlot("doSomethingElse(QSharedPointer<QVarLengthArray<QString,(16>>2)> >)") != -1);
-    QVERIFY(QTBUG12260_defaultTemplate_Object::staticMetaObject.indexOfSlot("performSomething(QVector<QList<QString> >,QHash<int,QVector<QString> >)") != -1);
+    QVERIFY(QTBUG12260_defaultTemplate_Object::staticMetaObject.indexOfSlot("doSomethingElse(QSharedPointer<QVarLengthArray<QString,(16>>2)>>)") != -1);
+    QVERIFY(QTBUG12260_defaultTemplate_Object::staticMetaObject.indexOfSlot("performSomething(QVector<QList<QString>>,QHash<int,QVector<QString>>)") != -1);
 }
 
 void tst_Moc::notifyError()
@@ -1867,7 +1849,7 @@ void tst_Moc::notifyError()
 
     QStringList args;
     args << "-c" << "-x" << "c++" << "-I" << "."
-         << "-I" << qtIncludePath << "-o" << "/dev/null" << "-fPIC" << "-std=c++11" << "-";
+         << "-I" << qtIncludePath << "-o" << "/dev/null" << "-fPIC" << "-std=c++1z" << "-";
     proc.start("gcc", args);
     QVERIFY(proc.waitForStarted());
     proc.write(mocOut);
@@ -1914,12 +1896,14 @@ class VersionTest : public QObject
     Q_OBJECT
     Q_PROPERTY(int prop1 READ foo)
     Q_PROPERTY(int prop2 READ foo REVISION 2)
+    Q_PROPERTY(int prop514 READ foo REVISION(5, 14))
 
 public:
     int foo() const { return 0; }
 
     Q_INVOKABLE void method1() {}
     Q_INVOKABLE Q_REVISION(4) void method2() {}
+    Q_INVOKABLE Q_REVISION(6, 0) void method60() {}
 
     enum TestEnum { One, Two };
     Q_ENUM(TestEnum);
@@ -1928,18 +1912,26 @@ public:
 public slots:
     void slot1() {}
     Q_REVISION(3) void slot2() {}
+    Q_REVISION(6, 1) void slot61() {}
 
 signals:
     void signal1();
     Q_REVISION(5) void signal2();
+    Q_REVISION(6, 2) void signal62();
 
 public slots Q_REVISION(6):
     void slot3() {}
     void slot4() {}
 
+public slots Q_REVISION(5, 12):
+    void slot512() {}
+
 signals Q_REVISION(7):
     void signal3();
     void signal4();
+
+signals Q_REVISION(5, 15):
+    void signal515();
 };
 
 // If changed, update VersionTest above
@@ -1948,12 +1940,14 @@ class VersionTestNotify : public QObject
     Q_OBJECT
     Q_PROPERTY(int prop1 READ foo NOTIFY fooChanged)
     Q_PROPERTY(int prop2 READ foo REVISION 2)
+    Q_PROPERTY(int prop514 READ foo REVISION(5, 14))
 
 public:
     int foo() const { return 0; }
 
     Q_INVOKABLE void method1() {}
     Q_INVOKABLE Q_REVISION(4) void method2() {}
+    Q_INVOKABLE Q_REVISION(6, 0) void method60() {}
 
     enum TestEnum { One, Two };
     Q_ENUM(TestEnum);
@@ -1961,19 +1955,27 @@ public:
 public slots:
     void slot1() {}
     Q_REVISION(3) void slot2() {}
+    Q_REVISION(6, 1) void slot61() {}
 
 signals:
     void fooChanged();
     void signal1();
     Q_REVISION(5) void signal2();
+    Q_REVISION(6, 2) void signal62();
 
 public slots Q_REVISION(6):
     void slot3() {}
     void slot4() {}
 
+public slots Q_REVISION(5, 12):
+    void slot512() {}
+
 signals Q_REVISION(7):
     void signal3();
     void signal4();
+
+signals Q_REVISION(5, 15):
+    void signal515();
 };
 
 template <class T>
@@ -1982,32 +1984,58 @@ void tst_Moc::revisions_T()
     int idx = T::staticMetaObject.indexOfProperty("prop1");
     QCOMPARE(T::staticMetaObject.property(idx).revision(), 0);
     idx = T::staticMetaObject.indexOfProperty("prop2");
-    QCOMPARE(T::staticMetaObject.property(idx).revision(), 2);
+    QCOMPARE(T::staticMetaObject.property(idx).revision(),
+             QTypeRevision::fromMinorVersion(2).toEncodedVersion<int>());
+    idx = T::staticMetaObject.indexOfProperty("prop514");
+    QCOMPARE(T::staticMetaObject.property(idx).revision(),
+             QTypeRevision::fromVersion(5, 14).toEncodedVersion<int>());
 
     idx = T::staticMetaObject.indexOfMethod("method1()");
     QCOMPARE(T::staticMetaObject.method(idx).revision(), 0);
     idx = T::staticMetaObject.indexOfMethod("method2()");
-    QCOMPARE(T::staticMetaObject.method(idx).revision(), 4);
+    QCOMPARE(T::staticMetaObject.method(idx).revision(),
+             QTypeRevision::fromMinorVersion(4).toEncodedVersion<int>());
+    idx = T::staticMetaObject.indexOfMethod("method60()");
+    QCOMPARE(T::staticMetaObject.method(idx).revision(),
+             QTypeRevision::fromVersion(6, 0).toEncodedVersion<int>());
 
     idx = T::staticMetaObject.indexOfSlot("slot1()");
     QCOMPARE(T::staticMetaObject.method(idx).revision(), 0);
     idx = T::staticMetaObject.indexOfSlot("slot2()");
-    QCOMPARE(T::staticMetaObject.method(idx).revision(), 3);
+    QCOMPARE(T::staticMetaObject.method(idx).revision(),
+             QTypeRevision::fromMinorVersion(3).toEncodedVersion<int>());
+    idx = T::staticMetaObject.indexOfSlot("slot61()");
+    QCOMPARE(T::staticMetaObject.method(idx).revision(),
+             QTypeRevision::fromVersion(6, 1).toEncodedVersion<int>());
 
     idx = T::staticMetaObject.indexOfSlot("slot3()");
-    QCOMPARE(T::staticMetaObject.method(idx).revision(), 6);
+    QCOMPARE(T::staticMetaObject.method(idx).revision(),
+             QTypeRevision::fromMinorVersion(6).toEncodedVersion<int>());
     idx = T::staticMetaObject.indexOfSlot("slot4()");
-    QCOMPARE(T::staticMetaObject.method(idx).revision(), 6);
+    QCOMPARE(T::staticMetaObject.method(idx).revision(),
+             QTypeRevision::fromMinorVersion(6).toEncodedVersion<int>());
+    idx = T::staticMetaObject.indexOfSlot("slot512()");
+    QCOMPARE(T::staticMetaObject.method(idx).revision(),
+             QTypeRevision::fromVersion(5, 12).toEncodedVersion<int>());
 
     idx = T::staticMetaObject.indexOfSignal("signal1()");
     QCOMPARE(T::staticMetaObject.method(idx).revision(), 0);
     idx = T::staticMetaObject.indexOfSignal("signal2()");
-    QCOMPARE(T::staticMetaObject.method(idx).revision(), 5);
+    QCOMPARE(T::staticMetaObject.method(idx).revision(),
+             QTypeRevision::fromMinorVersion(5).toEncodedVersion<int>());
+    idx = T::staticMetaObject.indexOfSignal("signal62()");
+    QCOMPARE(T::staticMetaObject.method(idx).revision(),
+             QTypeRevision::fromVersion(6, 2).toEncodedVersion<int>());
 
     idx = T::staticMetaObject.indexOfSignal("signal3()");
-    QCOMPARE(T::staticMetaObject.method(idx).revision(), 7);
+    QCOMPARE(T::staticMetaObject.method(idx).revision(),
+             QTypeRevision::fromMinorVersion(7).toEncodedVersion<int>());
     idx = T::staticMetaObject.indexOfSignal("signal4()");
-    QCOMPARE(T::staticMetaObject.method(idx).revision(), 7);
+    QCOMPARE(T::staticMetaObject.method(idx).revision(),
+             QTypeRevision::fromMinorVersion(7).toEncodedVersion<int>());
+    idx = T::staticMetaObject.indexOfSignal("signal515()");
+    QCOMPARE(T::staticMetaObject.method(idx).revision(),
+             QTypeRevision::fromVersion(5, 15).toEncodedVersion<int>());
 
     idx = T::staticMetaObject.indexOfEnumerator("TestEnum");
     QCOMPARE(T::staticMetaObject.enumerator(idx).keyCount(), 2);
@@ -3917,7 +3945,7 @@ void tst_Moc::testQNamespace()
 
     EnumFromNamespaceClass obj;
     const QVariant prop = obj.property("prop");
-    QCOMPARE(prop.type(), QMetaType::Int);
+    QCOMPARE(prop.userType(), QMetaType::fromType<FooNamespace::Enum1>().id());
     QCOMPARE(prop.toInt(), int(FooNamespace::Enum1::Key2));
 }
 
@@ -4026,6 +4054,29 @@ void tst_Moc::mocJsonOutput()
     QVERIFY2(actualOutput == expectedOutput, showPotentialDiff(actualOutput, expectedOutput).constData());
 }
 
+void TestFwdProperties::setProp1(const FwdClass1 &v)
+{
+    prop1.reset(new FwdClass1(v));
+}
+void TestFwdProperties::setProp2(const FwdClass2 &v)
+{
+    prop2.reset(new FwdClass2(v));
+}
+void TestFwdProperties::setProp3(const FwdClass3 &v)
+{
+    prop3.reset(new FwdClass3(v));
+}
+TestFwdProperties::~TestFwdProperties() {}
+
+Q_DECLARE_METATYPE(FwdClass1);
+
+void tst_Moc::mocInclude()
+{
+    TestFwdProperties obj;
+    obj.setProperty("prop1", QVariant::fromValue(FwdClass1 { 45 }));
+    QCOMPARE(obj.prop1->x, 45);
+}
+
 class RequiredTest :public QObject
 {
     Q_OBJECT
diff --git a/tests/auto/tools/qdbuscpp2xml/CMakeLists.txt b/tests/auto/tools/qdbuscpp2xml/CMakeLists.txt
new file mode 100644
index 0000000000..eaceac37b3
--- /dev/null
+++ b/tests/auto/tools/qdbuscpp2xml/CMakeLists.txt
@@ -0,0 +1,26 @@
+# Generated from qdbuscpp2xml.pro.
+
+#####################################################################
+## tst_qdbuscpp2xml Test:
+#####################################################################
+
+add_qt_test(tst_qdbuscpp2xml
+    SOURCES
+        test1.h
+        tst_qdbuscpp2xml.cpp
+    PUBLIC_LIBRARIES
+        Qt::DBus
+)
+
+# Resources:
+set(qdbuscpp2xml_resource_files
+    "test1.h"
+)
+
+add_qt_resource(tst_qdbuscpp2xml "qdbuscpp2xml"
+    PREFIX
+        "/tst_qdbuscpp2xml/"
+    FILES
+        ${qdbuscpp2xml_resource_files}
+)
+
diff --git a/tests/auto/tools/qdbusxml2cpp/CMakeLists.txt b/tests/auto/tools/qdbusxml2cpp/CMakeLists.txt
new file mode 100644
index 0000000000..8095421637
--- /dev/null
+++ b/tests/auto/tools/qdbusxml2cpp/CMakeLists.txt
@@ -0,0 +1,10 @@
+# Generated from qdbusxml2cpp.pro.
+
+#####################################################################
+## tst_qdbusxml2cpp Test:
+#####################################################################
+
+add_qt_test(tst_qdbusxml2cpp
+    SOURCES
+        tst_qdbusxml2cpp.cpp
+)
diff --git a/tests/auto/tools/qmake/.prev_CMakeLists.txt b/tests/auto/tools/qmake/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..c1367ec18f
--- /dev/null
+++ b/tests/auto/tools/qmake/.prev_CMakeLists.txt
@@ -0,0 +1,39 @@
+# Generated from qmake.pro.
+
+#####################################################################
+## tst_qmake Test:
+#####################################################################
+
+# Collect test data
+file(GLOB_RECURSE test_data_glob
+    RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+    testdata/*)
+list(APPEND test_data ${test_data_glob})
+
+add_qt_test(tst_qmake
+    SOURCES
+        testcompiler.cpp testcompiler.h
+        tst_qmake.cpp
+    TESTDATA ${test_data}
+)
+
+## Scopes:
+#####################################################################
+
+#### Keys ignored in scope 2:.:.:qmake.pro:WIN32:
+# testcase.timeout = "900"
+
+extend_target(tst_qmake CONDITION CMAKE_CROSSCOMPILING
+    DEFINES
+        QMAKE_CROSS_COMPILED
+)
+
+extend_target(tst_qmake CONDITION CMAKE_BUILD_TYPE STREQUAL Debug AND debug_and_release
+    DEFINES
+        DEBUG_BUILD
+)
+
+extend_target(tst_qmake CONDITION debug_and_release AND NOT CMAKE_BUILD_TYPE STREQUAL Debug
+    DEFINES
+        RELEASE_BUILD
+)
diff --git a/tests/auto/tools/qmake/CMakeLists.txt b/tests/auto/tools/qmake/CMakeLists.txt
new file mode 100644
index 0000000000..994d5d47d1
--- /dev/null
+++ b/tests/auto/tools/qmake/CMakeLists.txt
@@ -0,0 +1,42 @@
+# Generated from qmake.pro.
+
+#####################################################################
+## tst_qmake Test:
+#####################################################################
+
+# Collect test data
+file(GLOB_RECURSE test_data_glob
+    RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+    testdata/*)
+list(APPEND test_data ${test_data_glob})
+
+add_qt_test(tst_qmake
+    SOURCES
+        testcompiler.cpp testcompiler.h
+        tst_qmake.cpp
+    TESTDATA ${test_data}
+)
+
+## Scopes:
+#####################################################################
+
+#### Keys ignored in scope 2:.:.:qmake.pro:WIN32:
+# testcase.timeout = "900"
+
+extend_target(tst_qmake CONDITION CMAKE_CROSSCOMPILING
+    DEFINES
+        QMAKE_CROSS_COMPILED
+)
+
+# special case begin
+# remove this because it's not needed
+#extend_target(tst_qmake CONDITION CMAKE_BUILD_TYPE STREQUAL Debug AND debug_and_release
+    #DEFINES
+        #DEBUG_BUILD
+#)
+
+#extend_target(tst_qmake CONDITION debug_and_release AND NOT CMAKE_BUILD_TYPE STREQUAL Debug
+    #DEFINES
+        #RELEASE_BUILD
+#)
+# special case end
diff --git a/tests/auto/tools/qmake/tst_qmake.cpp b/tests/auto/tools/qmake/tst_qmake.cpp
index 9b434a7b5b..7f98a0f5a0 100644
--- a/tests/auto/tools/qmake/tst_qmake.cpp
+++ b/tests/auto/tools/qmake/tst_qmake.cpp
@@ -318,6 +318,9 @@ void tst_qmake::subdirs()
 
 void tst_qmake::subdir_via_pro_file_extra_target()
 {
+    if (QProcessEnvironment::systemEnvironment().contains(QStringLiteral("QT_TEST_RUNNING_IN_CTEST")))
+        QSKIP("This test does not run properly when invoked from CTest.");
+
     QString workDir = base_path + "/testdata/subdir_via_pro_file_extra_target";
 
     QDir D;
diff --git a/tests/auto/tools/qmakelib/CMakeLists.txt b/tests/auto/tools/qmakelib/CMakeLists.txt
new file mode 100644
index 0000000000..1e56c81e77
--- /dev/null
+++ b/tests/auto/tools/qmakelib/CMakeLists.txt
@@ -0,0 +1,34 @@
+# Generated from qmakelib.pro.
+
+#####################################################################
+## tst_qmakelib Test:
+#####################################################################
+
+add_qt_test(tst_qmakelib
+    SOURCES
+        ../../../../qmake/library/ioutils.cpp
+        ../../../../qmake/library/proitems.cpp
+        ../../../../qmake/library/qmakebuiltins.cpp
+        ../../../../qmake/library/qmakeevaluator.cpp
+        ../../../../qmake/library/qmakeglobals.cpp
+        ../../../../qmake/library/qmakeparser.cpp
+        ../../../../qmake/library/qmakevfs.cpp
+        ../../../../qmake/library/registry.cpp
+        evaltest.cpp
+        parsertest.cpp
+        tst_qmakelib.cpp tst_qmakelib.h
+    DEFINES
+        PROEVALUATOR_FULL
+        PROEVALUATOR_SETENV
+        PROPARSER_DEBUG
+    INCLUDE_DIRECTORIES
+        ../../../../qmake/library
+)
+
+## Scopes:
+#####################################################################
+
+extend_target(tst_qmakelib CONDITION WIN32
+    PUBLIC_LIBRARIES
+        advapi32
+)
diff --git a/tests/auto/tools/uic/CMakeLists.txt b/tests/auto/tools/uic/CMakeLists.txt
new file mode 100644
index 0000000000..f7d91dccbe
--- /dev/null
+++ b/tests/auto/tools/uic/CMakeLists.txt
@@ -0,0 +1,10 @@
+# Generated from uic.pro.
+
+#####################################################################
+## tst_uic Test:
+#####################################################################
+
+add_qt_test(tst_uic
+    SOURCES
+        tst_uic.cpp
+)
diff --git a/tests/auto/widgets/CMakeLists.txt b/tests/auto/widgets/CMakeLists.txt
new file mode 100644
index 0000000000..5870f28db0
--- /dev/null
+++ b/tests/auto/widgets/CMakeLists.txt
@@ -0,0 +1,10 @@
+# Generated from widgets.pro.
+
+add_subdirectory(dialogs)
+add_subdirectory(effects)
+add_subdirectory(graphicsview)
+add_subdirectory(itemviews)
+add_subdirectory(kernel)
+add_subdirectory(styles)
+add_subdirectory(util)
+add_subdirectory(widgets)
diff --git a/tests/auto/widgets/dialogs/CMakeLists.txt b/tests/auto/widgets/dialogs/CMakeLists.txt
new file mode 100644
index 0000000000..508093e7ad
--- /dev/null
+++ b/tests/auto/widgets/dialogs/CMakeLists.txt
@@ -0,0 +1,19 @@
+add_subdirectory(qcolordialog)
+add_subdirectory(qdialog)
+add_subdirectory(qerrormessage)
+if (NOT WINRT)
+    add_subdirectory(qfiledialog)
+    add_subdirectory(qfiledialog2)
+    add_subdirectory(qmessagebox)
+endif()
+if (NOT CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR NOT WIN32)
+    add_subdirectory(qfilesystemmodel)
+endif()
+add_subdirectory(qfontdialog)
+add_subdirectory(qinputdialog)
+add_subdirectory(qprogressdialog)
+if (QT_FEATURE_private_tests)
+    add_subdirectory(qsidebar)
+endif()
+add_subdirectory(qwizard)
+
diff --git a/tests/auto/widgets/dialogs/qcolordialog/CMakeLists.txt b/tests/auto/widgets/dialogs/qcolordialog/CMakeLists.txt
new file mode 100644
index 0000000000..81ffdeff90
--- /dev/null
+++ b/tests/auto/widgets/dialogs/qcolordialog/CMakeLists.txt
@@ -0,0 +1,13 @@
+# Generated from qcolordialog.pro.
+
+#####################################################################
+## tst_qcolordialog Test:
+#####################################################################
+
+add_qt_test(tst_qcolordialog
+    SOURCES
+        tst_qcolordialog.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+)
diff --git a/tests/auto/widgets/dialogs/qdialog/CMakeLists.txt b/tests/auto/widgets/dialogs/qdialog/CMakeLists.txt
new file mode 100644
index 0000000000..2c003f6fb6
--- /dev/null
+++ b/tests/auto/widgets/dialogs/qdialog/CMakeLists.txt
@@ -0,0 +1,15 @@
+# Generated from qdialog.pro.
+
+#####################################################################
+## tst_qdialog Test:
+#####################################################################
+
+add_qt_test(tst_qdialog
+    SOURCES
+        tst_qdialog.cpp
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::Gui
+        Qt::GuiPrivate
+        Qt::Widgets
+)
diff --git a/tests/auto/widgets/dialogs/qerrormessage/CMakeLists.txt b/tests/auto/widgets/dialogs/qerrormessage/CMakeLists.txt
new file mode 100644
index 0000000000..9463020c66
--- /dev/null
+++ b/tests/auto/widgets/dialogs/qerrormessage/CMakeLists.txt
@@ -0,0 +1,16 @@
+# Generated from qerrormessage.pro.
+
+#####################################################################
+## tst_qerrormessage Test:
+#####################################################################
+
+add_qt_test(tst_qerrormessage
+    SOURCES
+        tst_qerrormessage.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+)
+
+#### Keys ignored in scope 1:.:.:qerrormessage.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/auto/widgets/dialogs/qfiledialog/CMakeLists.txt b/tests/auto/widgets/dialogs/qfiledialog/CMakeLists.txt
new file mode 100644
index 0000000000..7b6d004776
--- /dev/null
+++ b/tests/auto/widgets/dialogs/qfiledialog/CMakeLists.txt
@@ -0,0 +1,18 @@
+# Generated from qfiledialog.pro.
+
+#####################################################################
+## tst_qfiledialog Test:
+#####################################################################
+
+add_qt_test(tst_qfiledialog
+    SOURCES
+        tst_qfiledialog.cpp
+    DEFINES
+        SRCDIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/\\\"
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::Gui
+        Qt::GuiPrivate
+        Qt::Widgets
+        Qt::WidgetsPrivate
+)
diff --git a/tests/auto/widgets/dialogs/qfiledialog2/CMakeLists.txt b/tests/auto/widgets/dialogs/qfiledialog2/CMakeLists.txt
new file mode 100644
index 0000000000..2fb610a784
--- /dev/null
+++ b/tests/auto/widgets/dialogs/qfiledialog2/CMakeLists.txt
@@ -0,0 +1,18 @@
+# Generated from qfiledialog2.pro.
+
+#####################################################################
+## tst_qfiledialog2 Test:
+#####################################################################
+
+add_qt_test(tst_qfiledialog2
+    SOURCES
+        tst_qfiledialog2.cpp
+    DEFINES
+        SRCDIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/\\\"
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::Gui
+        Qt::GuiPrivate
+        Qt::Widgets
+        Qt::WidgetsPrivate
+)
diff --git a/tests/auto/widgets/dialogs/qfilesystemmodel/CMakeLists.txt b/tests/auto/widgets/dialogs/qfilesystemmodel/CMakeLists.txt
new file mode 100644
index 0000000000..38c0547390
--- /dev/null
+++ b/tests/auto/widgets/dialogs/qfilesystemmodel/CMakeLists.txt
@@ -0,0 +1,27 @@
+# Generated from qfilesystemmodel.pro.
+
+#####################################################################
+## tst_qfilesystemmodel Test:
+#####################################################################
+
+add_qt_test(tst_qfilesystemmodel
+    SOURCES
+        ../../../../shared/emulationdetector.h
+        tst_qfilesystemmodel.cpp
+    INCLUDE_DIRECTORIES
+        ../../../../shared
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::Gui
+        Qt::Widgets
+        Qt::WidgetsPrivate
+)
+
+## Scopes:
+#####################################################################
+
+#### Keys ignored in scope 2:.:.:qfilesystemmodel.pro:WIN32:
+# testcase.timeout = "900"
+
+#### Keys ignored in scope 3:.:.:qfilesystemmodel.pro:APPLE_OSX:
+# testcase.timeout = "900"
diff --git a/tests/auto/widgets/dialogs/qfilesystemmodel/tst_qfilesystemmodel.cpp b/tests/auto/widgets/dialogs/qfilesystemmodel/tst_qfilesystemmodel.cpp
index 2c0b3f2bcb..63bf103725 100644
--- a/tests/auto/widgets/dialogs/qfilesystemmodel/tst_qfilesystemmodel.cpp
+++ b/tests/auto/widgets/dialogs/qfilesystemmodel/tst_qfilesystemmodel.cpp
@@ -1071,7 +1071,7 @@ void tst_QFileSystemModel::roleNames()
     QVERIFY(roles.contains(role));
 
     QFETCH(QByteArray, roleName);
-    QCOMPARE(roles.values(role).count(), 1);
+    QCOMPARE(roles.contains(role), true);
     QCOMPARE(roles.value(role), roleName);
 }
 
diff --git a/tests/auto/widgets/dialogs/qfontdialog/CMakeLists.txt b/tests/auto/widgets/dialogs/qfontdialog/CMakeLists.txt
new file mode 100644
index 0000000000..af858c8946
--- /dev/null
+++ b/tests/auto/widgets/dialogs/qfontdialog/CMakeLists.txt
@@ -0,0 +1,39 @@
+# Generated from qfontdialog.pro.
+
+#####################################################################
+## tst_qfontdialog Test:
+#####################################################################
+
+add_qt_test(tst_qfontdialog
+    SOURCES
+        tst_qfontdialog.cpp
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::Gui
+        Qt::GuiPrivate
+        Qt::Widgets
+        Qt::WidgetsPrivate
+)
+
+# Resources:
+set_source_files_properties("../../../shared/resources/test.ttf"
+    PROPERTIES QT_RESOURCE_ALIAS "test.ttf"
+)
+set_source_files_properties("../../../shared/resources/testfont.ttf"
+    PROPERTIES QT_RESOURCE_ALIAS "testfont.ttf"
+)
+set(testfonts_resource_files
+    "../../../shared/resources/test.ttf"
+    "../../../shared/resources/testfont.ttf"
+)
+
+add_qt_resource(tst_qfontdialog "testfonts"
+    PREFIX
+        "/"
+    FILES
+        ${testfonts_resource_files}
+)
+
+
+## Scopes:
+#####################################################################
diff --git a/tests/auto/widgets/dialogs/qinputdialog/CMakeLists.txt b/tests/auto/widgets/dialogs/qinputdialog/CMakeLists.txt
new file mode 100644
index 0000000000..7cd02a04c0
--- /dev/null
+++ b/tests/auto/widgets/dialogs/qinputdialog/CMakeLists.txt
@@ -0,0 +1,13 @@
+# Generated from qinputdialog.pro.
+
+#####################################################################
+## tst_qinputdialog Test:
+#####################################################################
+
+add_qt_test(tst_qinputdialog
+    SOURCES
+        tst_qinputdialog.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::WidgetsPrivate
+)
diff --git a/tests/auto/widgets/dialogs/qmessagebox/CMakeLists.txt b/tests/auto/widgets/dialogs/qmessagebox/CMakeLists.txt
new file mode 100644
index 0000000000..ae12c58ca2
--- /dev/null
+++ b/tests/auto/widgets/dialogs/qmessagebox/CMakeLists.txt
@@ -0,0 +1,18 @@
+# Generated from qmessagebox.pro.
+
+#####################################################################
+## tst_qmessagebox Test:
+#####################################################################
+
+add_qt_test(tst_qmessagebox
+    SOURCES
+        tst_qmessagebox.cpp
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::Gui
+        Qt::GuiPrivate
+        Qt::Widgets
+)
+
+#### Keys ignored in scope 1:.:.:qmessagebox.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/auto/widgets/dialogs/qprogressdialog/CMakeLists.txt b/tests/auto/widgets/dialogs/qprogressdialog/CMakeLists.txt
new file mode 100644
index 0000000000..2f20ff0d81
--- /dev/null
+++ b/tests/auto/widgets/dialogs/qprogressdialog/CMakeLists.txt
@@ -0,0 +1,13 @@
+# Generated from qprogressdialog.pro.
+
+#####################################################################
+## tst_qprogressdialog Test:
+#####################################################################
+
+add_qt_test(tst_qprogressdialog
+    SOURCES
+        tst_qprogressdialog.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+)
diff --git a/tests/auto/widgets/dialogs/qsidebar/CMakeLists.txt b/tests/auto/widgets/dialogs/qsidebar/CMakeLists.txt
new file mode 100644
index 0000000000..d1e2a6686c
--- /dev/null
+++ b/tests/auto/widgets/dialogs/qsidebar/CMakeLists.txt
@@ -0,0 +1,15 @@
+# Generated from qsidebar.pro.
+
+#####################################################################
+## tst_qsidebar Test:
+#####################################################################
+
+add_qt_test(tst_qsidebar
+    SOURCES
+        tst_qsidebar.cpp
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::Gui
+        Qt::Widgets
+        Qt::WidgetsPrivate
+)
diff --git a/tests/auto/widgets/dialogs/qwizard/CMakeLists.txt b/tests/auto/widgets/dialogs/qwizard/CMakeLists.txt
new file mode 100644
index 0000000000..bbe7bddd9d
--- /dev/null
+++ b/tests/auto/widgets/dialogs/qwizard/CMakeLists.txt
@@ -0,0 +1,30 @@
+# Generated from qwizard.pro.
+
+#####################################################################
+## tst_qwizard Test:
+#####################################################################
+
+add_qt_test(tst_qwizard
+    SOURCES
+        tst_qwizard.cpp
+        tst_qwizard_2.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+)
+
+# Resources:
+set(qwizard_resource_files
+    "images/background.png"
+    "images/banner.png"
+    "images/logo.png"
+    "images/watermark.png"
+)
+
+add_qt_resource(tst_qwizard "qwizard"
+    PREFIX
+        "/"
+    FILES
+        ${qwizard_resource_files}
+)
+
diff --git a/tests/auto/widgets/dialogs/qwizard/tst_qwizard.cpp b/tests/auto/widgets/dialogs/qwizard/tst_qwizard.cpp
index 78616009a2..5b7ded0ecb 100644
--- a/tests/auto/widgets/dialogs/qwizard/tst_qwizard.cpp
+++ b/tests/auto/widgets/dialogs/qwizard/tst_qwizard.cpp
@@ -96,8 +96,9 @@ private slots:
     void task248107_backButton();
     void task255350_fieldObjectDestroyed();
     void taskQTBUG_25691_fieldObjectDestroyed2();
+#if QT_CONFIG(shortcut)
     void taskQTBUG_46894_nextButtonShortcut();
-
+#endif
     /*
         Things that could be added:
 
@@ -2703,6 +2704,8 @@ void tst_QWizard::taskQTBUG_25691_fieldObjectDestroyed2()
     ::taskQTBUG_25691_fieldObjectDestroyed2();
 }
 
+#if QT_CONFIG(shortcut)
+
 void tst_QWizard::taskQTBUG_46894_nextButtonShortcut()
 {
     for (int i = 0; i < QWizard::NStyles; ++i) {
@@ -2717,5 +2720,7 @@ void tst_QWizard::taskQTBUG_46894_nextButtonShortcut()
     }
 }
 
+#endif // QT_CONFIG(shortcut)
+
 QTEST_MAIN(tst_QWizard)
 #include "tst_qwizard.moc"
diff --git a/tests/auto/widgets/effects/CMakeLists.txt b/tests/auto/widgets/effects/CMakeLists.txt
new file mode 100644
index 0000000000..2e2045e33e
--- /dev/null
+++ b/tests/auto/widgets/effects/CMakeLists.txt
@@ -0,0 +1,2 @@
+add_subdirectory(qgraphicseffect)
+add_subdirectory(qpixmapfilter)
diff --git a/tests/auto/widgets/effects/qgraphicseffect/CMakeLists.txt b/tests/auto/widgets/effects/qgraphicseffect/CMakeLists.txt
new file mode 100644
index 0000000000..4cdeb6b4e5
--- /dev/null
+++ b/tests/auto/widgets/effects/qgraphicseffect/CMakeLists.txt
@@ -0,0 +1,16 @@
+# Generated from qgraphicseffect.pro.
+
+#####################################################################
+## tst_qgraphicseffect Test:
+#####################################################################
+
+add_qt_test(tst_qgraphicseffect
+    SOURCES
+        tst_qgraphicseffect.cpp
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::Gui
+        Qt::GuiPrivate
+        Qt::Widgets
+        Qt::WidgetsPrivate
+)
diff --git a/tests/auto/widgets/effects/qpixmapfilter/CMakeLists.txt b/tests/auto/widgets/effects/qpixmapfilter/CMakeLists.txt
new file mode 100644
index 0000000000..6ffd2c4029
--- /dev/null
+++ b/tests/auto/widgets/effects/qpixmapfilter/CMakeLists.txt
@@ -0,0 +1,15 @@
+# Generated from qpixmapfilter.pro.
+
+#####################################################################
+## tst_qpixmapfilter Test:
+#####################################################################
+
+add_qt_test(tst_qpixmapfilter
+    SOURCES
+        tst_qpixmapfilter.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::GuiPrivate
+        Qt::Widgets
+        Qt::WidgetsPrivate
+)
diff --git a/tests/auto/widgets/graphicsview/CMakeLists.txt b/tests/auto/widgets/graphicsview/CMakeLists.txt
new file mode 100644
index 0000000000..1f638bd806
--- /dev/null
+++ b/tests/auto/widgets/graphicsview/CMakeLists.txt
@@ -0,0 +1,26 @@
+# Generated from graphicsview.pro.
+
+if(QT_FEATURE_private_tests)
+    add_subdirectory(qgraphicsanchorlayout)
+    add_subdirectory(qgraphicsanchorlayout1)
+    add_subdirectory(qgraphicsitem)
+    add_subdirectory(qgraphicsscene)
+    add_subdirectory(qgraphicssceneindex)
+endif()
+add_subdirectory(qgraphicseffectsource)
+add_subdirectory(qgraphicsgridlayout)
+add_subdirectory(qgraphicsitemanimation)
+add_subdirectory(qgraphicslayout)
+add_subdirectory(qgraphicslayoutitem)
+add_subdirectory(qgraphicslinearlayout)
+add_subdirectory(qgraphicsobject)
+add_subdirectory(qgraphicspixmapitem)
+add_subdirectory(qgraphicspolygonitem)
+add_subdirectory(qgraphicstransform)
+if(QT_FEATURE_style_fusion)
+    add_subdirectory(qgraphicsproxywidget)
+    add_subdirectory(qgraphicswidget)
+endif()
+if(NOT WINRT)
+    add_subdirectory(qgraphicsview)
+endif()
diff --git a/tests/auto/widgets/graphicsview/qgraphicsanchorlayout/CMakeLists.txt b/tests/auto/widgets/graphicsview/qgraphicsanchorlayout/CMakeLists.txt
new file mode 100644
index 0000000000..db323fcb15
--- /dev/null
+++ b/tests/auto/widgets/graphicsview/qgraphicsanchorlayout/CMakeLists.txt
@@ -0,0 +1,16 @@
+# Generated from qgraphicsanchorlayout.pro.
+
+#####################################################################
+## tst_qgraphicsanchorlayout Test:
+#####################################################################
+
+add_qt_test(tst_qgraphicsanchorlayout
+    SOURCES
+        tst_qgraphicsanchorlayout.cpp
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::Gui
+        Qt::GuiPrivate
+        Qt::Widgets
+        Qt::WidgetsPrivate
+)
diff --git a/tests/auto/widgets/graphicsview/qgraphicsanchorlayout1/CMakeLists.txt b/tests/auto/widgets/graphicsview/qgraphicsanchorlayout1/CMakeLists.txt
new file mode 100644
index 0000000000..9d9fc68832
--- /dev/null
+++ b/tests/auto/widgets/graphicsview/qgraphicsanchorlayout1/CMakeLists.txt
@@ -0,0 +1,16 @@
+# Generated from qgraphicsanchorlayout1.pro.
+
+#####################################################################
+## tst_qgraphicsanchorlayout1 Test:
+#####################################################################
+
+add_qt_test(tst_qgraphicsanchorlayout1
+    SOURCES
+        tst_qgraphicsanchorlayout1.cpp
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::Gui
+        Qt::GuiPrivate
+        Qt::Widgets
+        Qt::WidgetsPrivate
+)
diff --git a/tests/auto/widgets/graphicsview/qgraphicseffectsource/CMakeLists.txt b/tests/auto/widgets/graphicsview/qgraphicseffectsource/CMakeLists.txt
new file mode 100644
index 0000000000..ac1ac91f8b
--- /dev/null
+++ b/tests/auto/widgets/graphicsview/qgraphicseffectsource/CMakeLists.txt
@@ -0,0 +1,16 @@
+# Generated from qgraphicseffectsource.pro.
+
+#####################################################################
+## tst_qgraphicseffectsource Test:
+#####################################################################
+
+add_qt_test(tst_qgraphicseffectsource
+    SOURCES
+        tst_qgraphicseffectsource.cpp
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::Gui
+        Qt::GuiPrivate
+        Qt::Widgets
+        Qt::WidgetsPrivate
+)
diff --git a/tests/auto/widgets/graphicsview/qgraphicsgridlayout/CMakeLists.txt b/tests/auto/widgets/graphicsview/qgraphicsgridlayout/CMakeLists.txt
new file mode 100644
index 0000000000..c02f142182
--- /dev/null
+++ b/tests/auto/widgets/graphicsview/qgraphicsgridlayout/CMakeLists.txt
@@ -0,0 +1,13 @@
+# Generated from qgraphicsgridlayout.pro.
+
+#####################################################################
+## tst_qgraphicsgridlayout Test:
+#####################################################################
+
+add_qt_test(tst_qgraphicsgridlayout
+    SOURCES
+        tst_qgraphicsgridlayout.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+)
diff --git a/tests/auto/widgets/graphicsview/qgraphicsitem/CMakeLists.txt b/tests/auto/widgets/graphicsview/qgraphicsitem/CMakeLists.txt
new file mode 100644
index 0000000000..1be66372b6
--- /dev/null
+++ b/tests/auto/widgets/graphicsview/qgraphicsitem/CMakeLists.txt
@@ -0,0 +1,27 @@
+# Generated from qgraphicsitem.pro.
+
+#####################################################################
+## tst_qgraphicsitem Test:
+#####################################################################
+
+add_qt_test(tst_qgraphicsitem
+    SOURCES
+        tst_qgraphicsitem.cpp
+    DEFINES
+        QT_NO_CAST_TO_ASCII
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::Gui
+        Qt::GuiPrivate
+        Qt::TestPrivate
+        Qt::Widgets
+        Qt::WidgetsPrivate
+)
+
+## Scopes:
+#####################################################################
+
+extend_target(tst_qgraphicsitem CONDITION WIN32 AND NOT WINRT
+    PUBLIC_LIBRARIES
+        user32
+)
diff --git a/tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp b/tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp
index 45026170e3..fe6ef5a00a 100644
--- a/tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp
+++ b/tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp
@@ -450,7 +450,9 @@ private slots:
     void modality_keyEvents();
     void itemIsInFront();
     void scenePosChange();
+#if QT_CONFIG(shortcut)
     void textItem_shortcuts();
+#endif
     void scroll();
     void focusHandling_data();
     void focusHandling();
@@ -4494,19 +4496,6 @@ protected:
             break;
         case QGraphicsItem::ItemPositionHasChanged:
             break;
-#if QT_DEPRECATED_SINCE(5, 14)
-        case QGraphicsItem::ItemMatrixChange: {
-#if QT_DEPRECATED_SINCE(5, 13)
-QT_WARNING_PUSH
-QT_WARNING_DISABLE_DEPRECATED
-            QVariant variant;
-            variant.setValue<QMatrix>(matrix());
-            oldValues << variant;
-QT_WARNING_POP
-#endif
-        }
-            break;
-#endif
         case QGraphicsItem::ItemTransformChange: {
             QVariant variant;
             variant.setValue<QTransform>(transform());
@@ -4624,32 +4613,7 @@ void tst_QGraphicsItem::itemChange()
         QCOMPARE(tester.oldValues.constLast(), QVariant(true));
         QCOMPARE(tester.isEnabled(), true);
     }
-#if QT_DEPRECATED_SINCE(5, 13)
     {
-QT_WARNING_PUSH
-QT_WARNING_DISABLE_DEPRECATED // QDesktopWidget::screen()
-        // ItemMatrixChange / ItemTransformHasChanged
-        tester.itemChangeReturnValue.setValue<QMatrix>(QMatrix().rotate(90));
-        tester.setMatrix(QMatrix().translate(50, 0), true);
-        ++changeCount; // notification sent too
-        QCOMPARE(tester.changes.size(), ++changeCount);
-        QCOMPARE(int(tester.changes.at(tester.changes.size() - 2)), int(QGraphicsItem::ItemMatrixChange));
-        QCOMPARE(int(tester.changes.last()), int(QGraphicsItem::ItemTransformHasChanged));
-        QCOMPARE(qvariant_cast<QMatrix>(tester.values.at(tester.values.size() - 2)),
-                 QMatrix().translate(50, 0));
-        QCOMPARE(tester.values.constLast(), QVariant(QTransform(QMatrix().rotate(90))));
-        QVariant variant;
-        variant.setValue<QMatrix>(QMatrix());
-        QCOMPARE(tester.oldValues.constLast(), variant);
-        QCOMPARE(tester.matrix(), QMatrix().rotate(90));
-QT_WARNING_POP
-    }
-#endif
-    {
-        tester.resetTransform();
-        ++changeCount;
-        ++changeCount; // notification sent too
-
         // ItemTransformChange / ItemTransformHasChanged
         tester.itemChangeReturnValue.setValue<QTransform>(QTransform().rotate(90));
         tester.setTransform(QTransform::fromTranslate(50, 0), true);
@@ -8014,21 +7978,10 @@ public:
             //Doesn't use the extended style option so the exposed rect is the boundingRect
             if (!(flags() & QGraphicsItem::ItemUsesExtendedStyleOption)) {
                 QCOMPARE(option->exposedRect, boundingRect());
-#if QT_DEPRECATED_SINCE(5, 13)
-QT_WARNING_PUSH
-QT_WARNING_DISABLE_DEPRECATED
-                QCOMPARE(option->matrix, QMatrix());
-QT_WARNING_POP
-#endif
             } else {
                 QVERIFY(option->exposedRect != QRect());
                 QVERIFY(option->exposedRect != boundingRect());
-#if QT_DEPRECATED_SINCE(5, 13)
-QT_WARNING_PUSH
-QT_WARNING_DISABLE_DEPRECATED
-                QCOMPARE(option->matrix, sceneTransform().toAffine());
-QT_WARNING_POP
-#endif
+                QCOMPARE(option->matrix, sceneTransform());
             }
         }
         QGraphicsRectItem::paint(painter, option, widget);
@@ -10811,6 +10764,8 @@ void tst_QGraphicsItem::scenePosChange()
     QCOMPARE(child2->changes.count(QGraphicsItem::ItemScenePositionHasChanged), 0);
 }
 
+#if QT_CONFIG(shortcut)
+
 void tst_QGraphicsItem::textItem_shortcuts()
 {
     if (!QGuiApplicationPrivate::platformIntegration()->hasCapability(QPlatformIntegration::WindowActivation))
@@ -10850,6 +10805,8 @@ void tst_QGraphicsItem::textItem_shortcuts()
     QTRY_COMPARE(item->textCursor().selectedText(), item->toPlainText());
 }
 
+#endif // QT_CONFIG(shortcut)
+
 void tst_QGraphicsItem::scroll()
 {
     // Create two overlapping rectangles in the scene:
diff --git a/tests/auto/widgets/graphicsview/qgraphicsitemanimation/CMakeLists.txt b/tests/auto/widgets/graphicsview/qgraphicsitemanimation/CMakeLists.txt
new file mode 100644
index 0000000000..179b6c8497
--- /dev/null
+++ b/tests/auto/widgets/graphicsview/qgraphicsitemanimation/CMakeLists.txt
@@ -0,0 +1,15 @@
+# Generated from qgraphicsitemanimation.pro.
+
+#####################################################################
+## tst_qgraphicsitemanimation Test:
+#####################################################################
+
+add_qt_test(tst_qgraphicsitemanimation
+    SOURCES
+        tst_qgraphicsitemanimation.cpp
+    DEFINES
+        QT_NO_CAST_TO_ASCII
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+)
diff --git a/tests/auto/widgets/graphicsview/qgraphicslayout/CMakeLists.txt b/tests/auto/widgets/graphicsview/qgraphicslayout/CMakeLists.txt
new file mode 100644
index 0000000000..9a149f9df1
--- /dev/null
+++ b/tests/auto/widgets/graphicsview/qgraphicslayout/CMakeLists.txt
@@ -0,0 +1,15 @@
+# Generated from qgraphicslayout.pro.
+
+#####################################################################
+## tst_qgraphicslayout Test:
+#####################################################################
+
+add_qt_test(tst_qgraphicslayout
+    SOURCES
+        tst_qgraphicslayout.cpp
+    DEFINES
+        QT_USE_USING_NAMESPACE
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+)
diff --git a/tests/auto/widgets/graphicsview/qgraphicslayoutitem/CMakeLists.txt b/tests/auto/widgets/graphicsview/qgraphicslayoutitem/CMakeLists.txt
new file mode 100644
index 0000000000..56b9f73127
--- /dev/null
+++ b/tests/auto/widgets/graphicsview/qgraphicslayoutitem/CMakeLists.txt
@@ -0,0 +1,13 @@
+# Generated from qgraphicslayoutitem.pro.
+
+#####################################################################
+## tst_qgraphicslayoutitem Test:
+#####################################################################
+
+add_qt_test(tst_qgraphicslayoutitem
+    SOURCES
+        tst_qgraphicslayoutitem.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+)
diff --git a/tests/auto/widgets/graphicsview/qgraphicslinearlayout/CMakeLists.txt b/tests/auto/widgets/graphicsview/qgraphicslinearlayout/CMakeLists.txt
new file mode 100644
index 0000000000..1a44be75a1
--- /dev/null
+++ b/tests/auto/widgets/graphicsview/qgraphicslinearlayout/CMakeLists.txt
@@ -0,0 +1,13 @@
+# Generated from qgraphicslinearlayout.pro.
+
+#####################################################################
+## tst_qgraphicslinearlayout Test:
+#####################################################################
+
+add_qt_test(tst_qgraphicslinearlayout
+    SOURCES
+        tst_qgraphicslinearlayout.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+)
diff --git a/tests/auto/widgets/graphicsview/qgraphicsobject/CMakeLists.txt b/tests/auto/widgets/graphicsview/qgraphicsobject/CMakeLists.txt
new file mode 100644
index 0000000000..0e29191792
--- /dev/null
+++ b/tests/auto/widgets/graphicsview/qgraphicsobject/CMakeLists.txt
@@ -0,0 +1,14 @@
+# Generated from qgraphicsobject.pro.
+
+#####################################################################
+## tst_qgraphicsobject Test:
+#####################################################################
+
+add_qt_test(tst_qgraphicsobject
+    SOURCES
+        tst_qgraphicsobject.cpp
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::Gui
+        Qt::Widgets
+)
diff --git a/tests/auto/widgets/graphicsview/qgraphicspixmapitem/CMakeLists.txt b/tests/auto/widgets/graphicsview/qgraphicspixmapitem/CMakeLists.txt
new file mode 100644
index 0000000000..cca35623e8
--- /dev/null
+++ b/tests/auto/widgets/graphicsview/qgraphicspixmapitem/CMakeLists.txt
@@ -0,0 +1,13 @@
+# Generated from qgraphicspixmapitem.pro.
+
+#####################################################################
+## tst_qgraphicspixmapitem Test:
+#####################################################################
+
+add_qt_test(tst_qgraphicspixmapitem
+    SOURCES
+        tst_qgraphicspixmapitem.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+)
diff --git a/tests/auto/widgets/graphicsview/qgraphicspolygonitem/CMakeLists.txt b/tests/auto/widgets/graphicsview/qgraphicspolygonitem/CMakeLists.txt
new file mode 100644
index 0000000000..86c6965756
--- /dev/null
+++ b/tests/auto/widgets/graphicsview/qgraphicspolygonitem/CMakeLists.txt
@@ -0,0 +1,13 @@
+# Generated from qgraphicspolygonitem.pro.
+
+#####################################################################
+## tst_qgraphicspolygonitem Test:
+#####################################################################
+
+add_qt_test(tst_qgraphicspolygonitem
+    SOURCES
+        tst_qgraphicspolygonitem.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+)
diff --git a/tests/auto/widgets/graphicsview/qgraphicsproxywidget/CMakeLists.txt b/tests/auto/widgets/graphicsview/qgraphicsproxywidget/CMakeLists.txt
new file mode 100644
index 0000000000..accec5ff40
--- /dev/null
+++ b/tests/auto/widgets/graphicsview/qgraphicsproxywidget/CMakeLists.txt
@@ -0,0 +1,18 @@
+# Generated from qgraphicsproxywidget.pro.
+
+#####################################################################
+## tst_qgraphicsproxywidget Test:
+#####################################################################
+
+add_qt_test(tst_qgraphicsproxywidget
+    SOURCES
+        tst_qgraphicsproxywidget.cpp
+    DEFINES
+        QTEST_QPA_MOUSE_HANDLING
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::Gui
+        Qt::GuiPrivate
+        Qt::Widgets
+        Qt::WidgetsPrivate
+)
diff --git a/tests/auto/widgets/graphicsview/qgraphicsscene/CMakeLists.txt b/tests/auto/widgets/graphicsview/qgraphicsscene/CMakeLists.txt
new file mode 100644
index 0000000000..c566b6c1bf
--- /dev/null
+++ b/tests/auto/widgets/graphicsview/qgraphicsscene/CMakeLists.txt
@@ -0,0 +1,77 @@
+# Generated from qgraphicsscene.pro.
+
+#####################################################################
+## tst_qgraphicsscene Test:
+#####################################################################
+
+add_qt_test(tst_qgraphicsscene
+    SOURCES
+        tst_qgraphicsscene.cpp
+    DEFINES
+        QT_NO_CAST_TO_ASCII
+        SRCDIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}\\\"
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::Gui
+        Qt::GuiPrivate
+        Qt::Widgets
+        Qt::WidgetsPrivate
+)
+
+# Resources:
+set(images_resource_files
+    "Ash_European.jpg"
+)
+
+add_qt_resource(tst_qgraphicsscene "images"
+    PREFIX
+        "/"
+    FILES
+        ${images_resource_files}
+)
+set(testdata_resource_files
+    "testData/render/all-all-45-deg-left.png"
+    "testData/render/all-all-45-deg-right.png"
+    "testData/render/all-all-scale-2x.png"
+    "testData/render/all-all-translate-0-50.png"
+    "testData/render/all-all-translate-50-0.png"
+    "testData/render/all-all-untransformed-clip-ellipse.png"
+    "testData/render/all-all-untransformed-clip-rect.png"
+    "testData/render/all-all-untransformed.png"
+    "testData/render/all-bottomleft-untransformed.png"
+    "testData/render/all-bottomright-untransformed.png"
+    "testData/render/all-topleft-untransformed.png"
+    "testData/render/all-topright-untransformed.png"
+    "testData/render/bottom-bottomright-untransformed.png"
+    "testData/render/bottom-topleft-untransformed.png"
+    "testData/render/bottomleft-all-untransformed.png"
+    "testData/render/bottomleft-topleft-untransformed.png"
+    "testData/render/bottomright-all-untransformed.png"
+    "testData/render/bottomright-topleft-untransformed.png"
+    "testData/render/left-bottomright-untransformed.png"
+    "testData/render/left-topleft-untransformed.png"
+    "testData/render/right-bottomright-untransformed.png"
+    "testData/render/right-topleft-untransformed.png"
+    "testData/render/top-bottomright-untransformed.png"
+    "testData/render/top-topleft-untransformed.png"
+    "testData/render/topleft-all-untransformed.png"
+    "testData/render/topleft-topleft-untransformed.png"
+    "testData/render/topright-all-untransformed.png"
+    "testData/render/topright-topleft-untransformed.png"
+)
+
+add_qt_resource(tst_qgraphicsscene "testdata"
+    PREFIX
+        "/"
+    FILES
+        ${testdata_resource_files}
+)
+
+
+## Scopes:
+#####################################################################
+
+extend_target(tst_qgraphicsscene CONDITION WIN32 AND NOT WINRT
+    PUBLIC_LIBRARIES
+        user32
+)
diff --git a/tests/auto/widgets/graphicsview/qgraphicssceneindex/CMakeLists.txt b/tests/auto/widgets/graphicsview/qgraphicssceneindex/CMakeLists.txt
new file mode 100644
index 0000000000..5fa72f7b46
--- /dev/null
+++ b/tests/auto/widgets/graphicsview/qgraphicssceneindex/CMakeLists.txt
@@ -0,0 +1,23 @@
+# Generated from qgraphicssceneindex.pro.
+
+if(NOT QT_FEATURE_private_tests)
+    return()
+endif()
+
+#####################################################################
+## tst_qgraphicssceneindex Test:
+#####################################################################
+
+add_qt_test(tst_qgraphicssceneindex
+    SOURCES
+        tst_qgraphicssceneindex.cpp
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::Gui
+        Qt::GuiPrivate
+        Qt::Widgets
+        Qt::WidgetsPrivate
+)
+
+#### Keys ignored in scope 1:.:.:qgraphicssceneindex.pro:<TRUE>:
+# _REQUIREMENTS = "qtConfig(private_tests)"
diff --git a/tests/auto/widgets/graphicsview/qgraphicstransform/CMakeLists.txt b/tests/auto/widgets/graphicsview/qgraphicstransform/CMakeLists.txt
new file mode 100644
index 0000000000..450c0269f3
--- /dev/null
+++ b/tests/auto/widgets/graphicsview/qgraphicstransform/CMakeLists.txt
@@ -0,0 +1,13 @@
+# Generated from qgraphicstransform.pro.
+
+#####################################################################
+## tst_qgraphicstransform Test:
+#####################################################################
+
+add_qt_test(tst_qgraphicstransform
+    SOURCES
+        tst_qgraphicstransform.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+)
diff --git a/tests/auto/widgets/graphicsview/qgraphicsview/CMakeLists.txt b/tests/auto/widgets/graphicsview/qgraphicsview/CMakeLists.txt
new file mode 100644
index 0000000000..48064c2bf4
--- /dev/null
+++ b/tests/auto/widgets/graphicsview/qgraphicsview/CMakeLists.txt
@@ -0,0 +1,32 @@
+# Generated from qgraphicsview.pro.
+
+#####################################################################
+## tst_qgraphicsview Test:
+#####################################################################
+
+add_qt_test(tst_qgraphicsview
+    SOURCES
+        tst_qgraphicsview.cpp tst_qgraphicsview.h
+        tst_qgraphicsview_2.cpp
+    DEFINES
+        QT_NO_CAST_TO_ASCII
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::Gui
+        Qt::GuiPrivate
+        Qt::TestPrivate
+        Qt::Widgets
+        Qt::WidgetsPrivate
+)
+
+#### Keys ignored in scope 1:.:.:qgraphicsview.pro:<TRUE>:
+# testcase.timeout = "500"
+
+## Scopes:
+#####################################################################
+
+extend_target(tst_qgraphicsview CONDITION QT_FEATURE_opengl
+    PUBLIC_LIBRARIES
+        Qt::OpenGL
+        Qt::OpenGLWidgets
+)
diff --git a/tests/auto/widgets/graphicsview/qgraphicsview/qgraphicsview.pro b/tests/auto/widgets/graphicsview/qgraphicsview/qgraphicsview.pro
index 8ed19697a4..13998d5494 100644
--- a/tests/auto/widgets/graphicsview/qgraphicsview/qgraphicsview.pro
+++ b/tests/auto/widgets/graphicsview/qgraphicsview/qgraphicsview.pro
@@ -4,6 +4,7 @@ TARGET = tst_qgraphicsview
 
 QT += widgets widgets-private testlib
 QT += core-private gui-private testlib-private
+qtConfig(opengl): QT += opengl openglwidgets
 
 SOURCES  += tst_qgraphicsview.cpp tst_qgraphicsview_2.cpp
 HEADERS +=  tst_qgraphicsview.h
diff --git a/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp b/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp
index acf6ce1c68..769836ff62 100644
--- a/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp
+++ b/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp
@@ -48,8 +48,8 @@
 #include <QtWidgets/QBoxLayout>
 #include <QtWidgets/QStyle>
 #include <QtWidgets/QPushButton>
-#ifndef QT_NO_OPENGL
-#include <QtWidgets/QOpenGLWidget>
+#if QT_CONFIG(opengl)
+#include <QtOpenGLWidgets/QOpenGLWidget>
 #endif
 #include <private/qgraphicsscene_p.h>
 #include <private/qgraphicsview_p.h>
@@ -154,7 +154,7 @@ private slots:
     void sceneRect_growing();
     void setSceneRect();
     void viewport();
-#ifndef QT_NO_OPENGL
+#if QT_CONFIG(opengl)
     void openGLViewport();
 #endif
     void dragMode_scrollHand();
@@ -659,7 +659,7 @@ void tst_QGraphicsView::viewport()
     QVERIFY(QTest::qWaitForWindowExposed(&view));
 }
 
-#ifndef QT_NO_OPENGL
+#if QT_CONFIG(opengl)
 void tst_QGraphicsView::openGLViewport()
 {
     if (!QGuiApplicationPrivate::platformIntegration()->hasCapability(QPlatformIntegration::OpenGL))
@@ -2125,8 +2125,8 @@ void tst_QGraphicsView::mapFromScenePath()
     QPainterPath path2;
     path2.addPolygon(polygon2);
 
-    QPolygonF pathPoly = view.mapFromScene(path).toFillPolygon(QTransform());
-    QPolygonF path2Poly = path2.toFillPolygon(QTransform());
+    QPolygonF pathPoly = view.mapFromScene(path).toFillPolygon();
+    QPolygonF path2Poly = path2.toFillPolygon();
 
     for (int i = 0; i < pathPoly.size(); ++i) {
         QVERIFY(qAbs(pathPoly[i].x() - path2Poly[i].x()) < 3);
diff --git a/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview_2.cpp b/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview_2.cpp
index 9550655868..bd470dbcfc 100644
--- a/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview_2.cpp
+++ b/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview_2.cpp
@@ -39,7 +39,6 @@
 Q_DECLARE_METATYPE(ExpectedValueDescription)
 Q_DECLARE_METATYPE(QList<int>)
 Q_DECLARE_METATYPE(QList<QRectF>)
-Q_DECLARE_METATYPE(QMatrix)
 Q_DECLARE_METATYPE(QPainterPath)
 Q_DECLARE_METATYPE(Qt::ScrollBarPolicy)
 Q_DECLARE_METATYPE(ScrollBarCount)
diff --git a/tests/auto/widgets/graphicsview/qgraphicswidget/CMakeLists.txt b/tests/auto/widgets/graphicsview/qgraphicswidget/CMakeLists.txt
new file mode 100644
index 0000000000..7325f7eb21
--- /dev/null
+++ b/tests/auto/widgets/graphicsview/qgraphicswidget/CMakeLists.txt
@@ -0,0 +1,16 @@
+# Generated from qgraphicswidget.pro.
+
+#####################################################################
+## tst_qgraphicswidget Test:
+#####################################################################
+
+add_qt_test(tst_qgraphicswidget
+    SOURCES
+        tst_qgraphicswidget.cpp
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::Gui
+        Qt::GuiPrivate
+        Qt::Widgets
+        Qt::WidgetsPrivate
+)
diff --git a/tests/auto/widgets/itemviews/CMakeLists.txt b/tests/auto/widgets/itemviews/CMakeLists.txt
new file mode 100644
index 0000000000..e7dc78b18c
--- /dev/null
+++ b/tests/auto/widgets/itemviews/CMakeLists.txt
@@ -0,0 +1,21 @@
+# Generated from itemviews.pro.
+
+add_subdirectory(qabstractitemview)
+add_subdirectory(qdatawidgetmapper)
+add_subdirectory(qdirmodel)
+add_subdirectory(qfileiconprovider)
+add_subdirectory(qheaderview)
+add_subdirectory(qitemdelegate)
+add_subdirectory(qitemeditorfactory)
+add_subdirectory(qitemview)
+add_subdirectory(qlistview)
+add_subdirectory(qtableview)
+add_subdirectory(qtablewidget)
+add_subdirectory(qtreeview)
+add_subdirectory(qtreewidget)
+add_subdirectory(qtreewidgetitemiterator)
+
+if(QT_FEATURE_private_tests)
+    add_subdirectory(qcolumnview)
+    add_subdirectory(qlistwidget)
+endif()
diff --git a/tests/auto/widgets/itemviews/qabstractitemview/CMakeLists.txt b/tests/auto/widgets/itemviews/qabstractitemview/CMakeLists.txt
new file mode 100644
index 0000000000..520a0b4b98
--- /dev/null
+++ b/tests/auto/widgets/itemviews/qabstractitemview/CMakeLists.txt
@@ -0,0 +1,15 @@
+# Generated from qabstractitemview.pro.
+
+#####################################################################
+## tst_qabstractitemview Test:
+#####################################################################
+
+add_qt_test(tst_qabstractitemview
+    SOURCES
+        tst_qabstractitemview.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::GuiPrivate
+        Qt::TestPrivate
+        Qt::Widgets
+)
diff --git a/tests/auto/widgets/itemviews/qcolumnview/CMakeLists.txt b/tests/auto/widgets/itemviews/qcolumnview/CMakeLists.txt
new file mode 100644
index 0000000000..d33e3b9c2e
--- /dev/null
+++ b/tests/auto/widgets/itemviews/qcolumnview/CMakeLists.txt
@@ -0,0 +1,18 @@
+# Generated from qcolumnview.pro.
+
+#####################################################################
+## tst_qcolumnview Test:
+#####################################################################
+
+add_qt_test(tst_qcolumnview
+    SOURCES
+        ../../../../shared/fakedirmodel.h
+        tst_qcolumnview.cpp
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::Gui
+        Qt::GuiPrivate
+        Qt::TestPrivate
+        Qt::Widgets
+        Qt::WidgetsPrivate
+)
diff --git a/tests/auto/widgets/itemviews/qdatawidgetmapper/CMakeLists.txt b/tests/auto/widgets/itemviews/qdatawidgetmapper/CMakeLists.txt
new file mode 100644
index 0000000000..f3e4af0c23
--- /dev/null
+++ b/tests/auto/widgets/itemviews/qdatawidgetmapper/CMakeLists.txt
@@ -0,0 +1,13 @@
+# Generated from qdatawidgetmapper.pro.
+
+#####################################################################
+## tst_qdatawidgetmapper Test:
+#####################################################################
+
+add_qt_test(tst_qdatawidgetmapper
+    SOURCES
+        tst_qdatawidgetmapper.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+)
diff --git a/tests/auto/widgets/itemviews/qdirmodel/CMakeLists.txt b/tests/auto/widgets/itemviews/qdirmodel/CMakeLists.txt
new file mode 100644
index 0000000000..d47cc3457d
--- /dev/null
+++ b/tests/auto/widgets/itemviews/qdirmodel/CMakeLists.txt
@@ -0,0 +1,49 @@
+# Generated from qdirmodel.pro.
+
+#####################################################################
+## tst_qdirmodel Test:
+#####################################################################
+
+add_qt_test(tst_qdirmodel
+    SOURCES
+        ../../../../shared/emulationdetector.h
+        tst_qdirmodel.cpp
+    INCLUDE_DIRECTORIES
+        ../../../../shared
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+)
+
+## Scopes:
+#####################################################################
+
+extend_target(tst_qdirmodel CONDITION ANDROID
+    DEFINES
+        SRCDIR=\\\"./\\\"
+)
+
+extend_target(tst_qdirmodel CONDITION NOT ANDROID
+    DEFINES
+        SRCDIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/\\\"
+)
+
+if(ANDROID AND NOT ANDROID_EMBEDDED)
+    # Resources:
+    set(testdata_resource_files
+        "dirtest/test1/dummy"
+        "dirtest/test1/test"
+        "test/file01.tst"
+        "test/file02.tst"
+        "test/file03.tst"
+        "test/file04.tst"
+        "tst_qdirmodel.cpp"
+    )
+
+    add_qt_resource(tst_qdirmodel "testdata"
+        PREFIX
+            "/android_testdata"
+        FILES
+            ${testdata_resource_files}
+    )
+endif()
diff --git a/tests/auto/widgets/itemviews/qdirmodel/tst_qdirmodel.cpp b/tests/auto/widgets/itemviews/qdirmodel/tst_qdirmodel.cpp
index 546b2ab3a8..925c578300 100644
--- a/tests/auto/widgets/itemviews/qdirmodel/tst_qdirmodel.cpp
+++ b/tests/auto/widgets/itemviews/qdirmodel/tst_qdirmodel.cpp
@@ -713,7 +713,7 @@ void tst_QDirModel::roleNames()
     QVERIFY(roles.contains(role));
 
     QFETCH(QByteArray, roleName);
-    QCOMPARE(roles.values(role).count(), 1);
+    QCOMPARE(roles.contains(role), true);
     QCOMPARE(roles.value(role), roleName);
 }
 
diff --git a/tests/auto/widgets/itemviews/qfileiconprovider/CMakeLists.txt b/tests/auto/widgets/itemviews/qfileiconprovider/CMakeLists.txt
new file mode 100644
index 0000000000..024519ad9c
--- /dev/null
+++ b/tests/auto/widgets/itemviews/qfileiconprovider/CMakeLists.txt
@@ -0,0 +1,13 @@
+# Generated from qfileiconprovider.pro.
+
+#####################################################################
+## tst_qfileiconprovider Test:
+#####################################################################
+
+add_qt_test(tst_qfileiconprovider
+    SOURCES
+        tst_qfileiconprovider.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+)
diff --git a/tests/auto/widgets/itemviews/qheaderview/CMakeLists.txt b/tests/auto/widgets/itemviews/qheaderview/CMakeLists.txt
new file mode 100644
index 0000000000..8949ac4957
--- /dev/null
+++ b/tests/auto/widgets/itemviews/qheaderview/CMakeLists.txt
@@ -0,0 +1,18 @@
+# Generated from qheaderview.pro.
+
+#####################################################################
+## tst_qheaderview Test:
+#####################################################################
+
+add_qt_test(tst_qheaderview
+    SOURCES
+        tst_qheaderview.cpp
+    DEFINES
+        QT_DISABLE_DEPRECATED_BEFORE=0
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::Gui
+        Qt::GuiPrivate
+        Qt::Widgets
+        Qt::WidgetsPrivate
+)
diff --git a/tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp b/tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp
index d5813d64ff..bb098f32c2 100644
--- a/tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp
+++ b/tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp
@@ -1744,7 +1744,7 @@ void tst_QHeaderView::restoreQt4State()
     QCOMPARE(h2.length(), old_length);
     QCOMPARE(h2.saveState(), old_state);
 #else
-    QSKIP("Qt4 compatibility no longer needed in Qt6")
+    QSKIP("Qt4 compatibility no longer needed in Qt6");
 #endif
 }
 
diff --git a/tests/auto/widgets/itemviews/qitemdelegate/CMakeLists.txt b/tests/auto/widgets/itemviews/qitemdelegate/CMakeLists.txt
new file mode 100644
index 0000000000..af1bac9ff0
--- /dev/null
+++ b/tests/auto/widgets/itemviews/qitemdelegate/CMakeLists.txt
@@ -0,0 +1,22 @@
+# Generated from qitemdelegate.pro.
+
+#####################################################################
+## tst_qitemdelegate Test:
+#####################################################################
+
+add_qt_test(tst_qitemdelegate
+    SOURCES
+        tst_qitemdelegate.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+        Qt::WidgetsPrivate
+)
+
+## Scopes:
+#####################################################################
+
+extend_target(tst_qitemdelegate CONDITION WIN32 AND NOT WINRT
+    PUBLIC_LIBRARIES
+        user32
+)
diff --git a/tests/auto/widgets/itemviews/qitemeditorfactory/CMakeLists.txt b/tests/auto/widgets/itemviews/qitemeditorfactory/CMakeLists.txt
new file mode 100644
index 0000000000..4dfb46ff4d
--- /dev/null
+++ b/tests/auto/widgets/itemviews/qitemeditorfactory/CMakeLists.txt
@@ -0,0 +1,13 @@
+# Generated from qitemeditorfactory.pro.
+
+#####################################################################
+## tst_qitemeditorfactory Test:
+#####################################################################
+
+add_qt_test(tst_qitemeditorfactory
+    SOURCES
+        tst_qitemeditorfactory.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+)
diff --git a/tests/auto/widgets/itemviews/qitemview/CMakeLists.txt b/tests/auto/widgets/itemviews/qitemview/CMakeLists.txt
new file mode 100644
index 0000000000..b27f456246
--- /dev/null
+++ b/tests/auto/widgets/itemviews/qitemview/CMakeLists.txt
@@ -0,0 +1,13 @@
+# Generated from qitemview.pro.
+
+#####################################################################
+## tst_qitemview Test:
+#####################################################################
+
+add_qt_test(tst_qitemview
+    SOURCES
+        tst_qitemview.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+)
diff --git a/tests/auto/widgets/itemviews/qlistview/CMakeLists.txt b/tests/auto/widgets/itemviews/qlistview/CMakeLists.txt
new file mode 100644
index 0000000000..07c290128e
--- /dev/null
+++ b/tests/auto/widgets/itemviews/qlistview/CMakeLists.txt
@@ -0,0 +1,25 @@
+# Generated from qlistview.pro.
+
+#####################################################################
+## tst_qlistview Test:
+#####################################################################
+
+add_qt_test(tst_qlistview
+    SOURCES
+        tst_qlistview.cpp
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::Gui
+        Qt::GuiPrivate
+        Qt::TestPrivate
+        Qt::Widgets
+        Qt::WidgetsPrivate
+)
+
+## Scopes:
+#####################################################################
+
+extend_target(tst_qlistview CONDITION WIN32 AND NOT WINRT
+    PUBLIC_LIBRARIES
+        user32
+)
diff --git a/tests/auto/widgets/itemviews/qlistwidget/CMakeLists.txt b/tests/auto/widgets/itemviews/qlistwidget/CMakeLists.txt
new file mode 100644
index 0000000000..aebcb4c49e
--- /dev/null
+++ b/tests/auto/widgets/itemviews/qlistwidget/CMakeLists.txt
@@ -0,0 +1,16 @@
+# Generated from qlistwidget.pro.
+
+#####################################################################
+## tst_qlistwidget Test:
+#####################################################################
+
+add_qt_test(tst_qlistwidget
+    SOURCES
+        tst_qlistwidget.cpp
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::Gui
+        Qt::GuiPrivate
+        Qt::Widgets
+        Qt::WidgetsPrivate
+)
diff --git a/tests/auto/widgets/itemviews/qtableview/CMakeLists.txt b/tests/auto/widgets/itemviews/qtableview/CMakeLists.txt
new file mode 100644
index 0000000000..20e50d2de3
--- /dev/null
+++ b/tests/auto/widgets/itemviews/qtableview/CMakeLists.txt
@@ -0,0 +1,17 @@
+# Generated from qtableview.pro.
+
+#####################################################################
+## tst_qtableview Test:
+#####################################################################
+
+add_qt_test(tst_qtableview
+    SOURCES
+        tst_qtableview.cpp
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::Gui
+        Qt::GuiPrivate
+        Qt::TestPrivate
+        Qt::Widgets
+        Qt::WidgetsPrivate
+)
diff --git a/tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp b/tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp
index ea3eb5fd0c..544069243f 100644
--- a/tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp
+++ b/tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp
@@ -331,8 +331,10 @@ private slots:
     void selectColumn_data();
     void selectColumn();
 
+#if QT_CONFIG(shortcut)
     void selectall_data();
     void selectall();
+#endif
 
     void visualRect_data();
     void visualRect();
@@ -1843,6 +1845,8 @@ void tst_QTableView::selectColumn()
         QCOMPARE(view.selectionModel()->selectedIndexes().at(i).column(), column);
 }
 
+#if QT_CONFIG(shortcut)
+
 void tst_QTableView::selectall_data()
 {
     QTest::addColumn<int>("rowCount");
@@ -1999,6 +2003,8 @@ void tst_QTableView::selectall()
     QCOMPARE(view.selectedIndexes().count(), 0);
 }
 
+#endif // QT_CONFIG(shortcut)
+
 void tst_QTableView::visualRect_data()
 {
     QTest::addColumn<int>("rowCount");
diff --git a/tests/auto/widgets/itemviews/qtablewidget/CMakeLists.txt b/tests/auto/widgets/itemviews/qtablewidget/CMakeLists.txt
new file mode 100644
index 0000000000..66344e9d32
--- /dev/null
+++ b/tests/auto/widgets/itemviews/qtablewidget/CMakeLists.txt
@@ -0,0 +1,13 @@
+# Generated from qtablewidget.pro.
+
+#####################################################################
+## tst_qtablewidget Test:
+#####################################################################
+
+add_qt_test(tst_qtablewidget
+    SOURCES
+        tst_qtablewidget.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+)
diff --git a/tests/auto/widgets/itemviews/qtreeview/CMakeLists.txt b/tests/auto/widgets/itemviews/qtreeview/CMakeLists.txt
new file mode 100644
index 0000000000..40a6a1a6d6
--- /dev/null
+++ b/tests/auto/widgets/itemviews/qtreeview/CMakeLists.txt
@@ -0,0 +1,18 @@
+# Generated from qtreeview.pro.
+
+#####################################################################
+## tst_qtreeview Test:
+#####################################################################
+
+add_qt_test(tst_qtreeview
+    SOURCES
+        ../../../../shared/fakedirmodel.h
+        tst_qtreeview.cpp
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::Gui
+        Qt::GuiPrivate
+        Qt::TestPrivate
+        Qt::Widgets
+        Qt::WidgetsPrivate
+)
diff --git a/tests/auto/widgets/itemviews/qtreewidget/CMakeLists.txt b/tests/auto/widgets/itemviews/qtreewidget/CMakeLists.txt
new file mode 100644
index 0000000000..dde2e9d4ab
--- /dev/null
+++ b/tests/auto/widgets/itemviews/qtreewidget/CMakeLists.txt
@@ -0,0 +1,13 @@
+# Generated from qtreewidget.pro.
+
+#####################################################################
+## tst_qtreewidget Test:
+#####################################################################
+
+add_qt_test(tst_qtreewidget
+    SOURCES
+        tst_qtreewidget.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+)
diff --git a/tests/auto/widgets/itemviews/qtreewidgetitemiterator/CMakeLists.txt b/tests/auto/widgets/itemviews/qtreewidgetitemiterator/CMakeLists.txt
new file mode 100644
index 0000000000..65ac8cda8b
--- /dev/null
+++ b/tests/auto/widgets/itemviews/qtreewidgetitemiterator/CMakeLists.txt
@@ -0,0 +1,13 @@
+# Generated from qtreewidgetitemiterator.pro.
+
+#####################################################################
+## tst_qtreewidgetitemiterator Test:
+#####################################################################
+
+add_qt_test(tst_qtreewidgetitemiterator
+    SOURCES
+        tst_qtreewidgetitemiterator.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+)
diff --git a/tests/auto/widgets/kernel/CMakeLists.txt b/tests/auto/widgets/kernel/CMakeLists.txt
new file mode 100644
index 0000000000..51759264b2
--- /dev/null
+++ b/tests/auto/widgets/kernel/CMakeLists.txt
@@ -0,0 +1,23 @@
+# Generated from kernel.pro.
+
+add_subdirectory(qaction)
+add_subdirectory(qactiongroup)
+add_subdirectory(qapplication)
+add_subdirectory(qboxlayout)
+add_subdirectory(qdesktopwidget)
+add_subdirectory(qformlayout)
+add_subdirectory(qgridlayout)
+add_subdirectory(qlayout)
+add_subdirectory(qstackedlayout)
+add_subdirectory(qtooltip)
+add_subdirectory(qwidget)
+add_subdirectory(qwidget_window)
+add_subdirectory(qwidgetaction)
+add_subdirectory(qwidgetmetatype)
+add_subdirectory(qwidgetsvariant)
+add_subdirectory(qwindowcontainer)
+add_subdirectory(qshortcut)
+add_subdirectory(qsizepolicy)
+if(NOT APPLE)
+    add_subdirectory(qgesturerecognizer)
+endif()
diff --git a/tests/auto/widgets/kernel/kernel.pro b/tests/auto/widgets/kernel/kernel.pro
index af85a2bd13..c66c1822b2 100644
--- a/tests/auto/widgets/kernel/kernel.pro
+++ b/tests/auto/widgets/kernel/kernel.pro
@@ -1,7 +1,5 @@
 TEMPLATE=subdirs
 SUBDIRS=\
-   qaction \
-   qactiongroup \
    qapplication \
    qboxlayout \
    qdesktopwidget \
@@ -13,12 +11,19 @@ SUBDIRS=\
    qtooltip \
    qwidget \
    qwidget_window \
-   qwidgetaction \
    qwidgetmetatype \
    qwidgetsvariant \
    qwindowcontainer \
    qshortcut \
    qsizepolicy
 
-darwin:SUBDIRS -= \ # Uses native recognizers
+darwin:SUBDIRS -= \
    qgesturerecognizer \
+
+qtConfig(action):SUBDIRS += \
+   qaction \
+   qactiongroup \
+   qwidgetaction
+
+!qtConfig(shortcut): SUBDIRS -= \
+   qshortcut
diff --git a/tests/auto/widgets/kernel/qaction/CMakeLists.txt b/tests/auto/widgets/kernel/qaction/CMakeLists.txt
new file mode 100644
index 0000000000..469cc4d597
--- /dev/null
+++ b/tests/auto/widgets/kernel/qaction/CMakeLists.txt
@@ -0,0 +1,15 @@
+# Generated from qaction.pro.
+
+#####################################################################
+## tst_qaction Test:
+#####################################################################
+
+add_qt_test(tst_qaction
+    SOURCES
+        tst_qaction.cpp
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::Gui
+        Qt::GuiPrivate
+        Qt::Widgets
+)
diff --git a/tests/auto/widgets/kernel/qaction/tst_qaction.cpp b/tests/auto/widgets/kernel/qaction/tst_qaction.cpp
index 1247f48dd0..cf8539da68 100644
--- a/tests/auto/widgets/kernel/qaction/tst_qaction.cpp
+++ b/tests/auto/widgets/kernel/qaction/tst_qaction.cpp
@@ -50,30 +50,25 @@ public:
 private slots:
     void init();
     void cleanup();
-    void getSetCheck();
-    void setText_data();
-    void setText();
-    void setIconText_data() { setText_data(); }
-    void setIconText();
     void setUnknownFont();
     void actionEvent();
-    void setStandardKeys();
+#if QT_CONFIG(shortcut)
     void alternateShortcuts();
     void enabledVisibleInteraction();
-    void task200823_tooltip();
-    void task229128TriggeredSignalWithoutActiongroup();
+#endif
     void task229128TriggeredSignalWhenInActiongroup();
+#if QT_CONFIG(shortcut)
     void repeat();
-    void setData();
     void keysequence(); // QTBUG-53381
     void disableShortcutsWithBlockedWidgets_data();
     void disableShortcutsWithBlockedWidgets();
     void shortcutFromKeyEvent(); // QTBUG-48325
+#endif
 
 private:
     QEvent::Type m_lastEventType;
     const int m_keyboardScheme;
-    QAction *m_lastAction;
+    QGuiAction *m_lastAction;
 };
 
 tst_QAction::tst_QAction()
@@ -92,33 +87,6 @@ void tst_QAction::cleanup()
     QVERIFY(QApplication::topLevelWidgets().isEmpty());
 }
 
-// Testing get/set functions
-void tst_QAction::getSetCheck()
-{
-    QAction obj1(nullptr);
-    // QActionGroup * QAction::actionGroup()
-    // void QAction::setActionGroup(QActionGroup *)
-    QActionGroup *var1 = new QActionGroup(nullptr);
-    obj1.setActionGroup(var1);
-    QCOMPARE(var1, obj1.actionGroup());
-    obj1.setActionGroup(nullptr);
-    QCOMPARE(obj1.actionGroup(), nullptr);
-    delete var1;
-
-    // QMenu * QAction::menu()
-    // void QAction::setMenu(QMenu *)
-    QMenu *var2 = new QMenu(nullptr);
-    obj1.setMenu(var2);
-    QCOMPARE(var2, obj1.menu());
-    obj1.setMenu(nullptr);
-    QCOMPARE(obj1.menu(), nullptr);
-    delete var2;
-
-    QCOMPARE(obj1.priority(), QAction::NormalPriority);
-    obj1.setPriority(QAction::LowPriority);
-    QCOMPARE(obj1.priority(), QAction::LowPriority);
-}
-
 class MyWidget : public QWidget
 {
     Q_OBJECT
@@ -133,43 +101,6 @@ private:
     tst_QAction *m_test;
 };
 
-void tst_QAction::setText_data()
-{
-    QTest::addColumn<QString>("text");
-    QTest::addColumn<QString>("iconText");
-    QTest::addColumn<QString>("textFromIconText");
-
-    //next we fill it with data
-    QTest::newRow("Normal") << "Action" << "Action" << "Action";
-    QTest::newRow("Ampersand") << "Search && Destroy" << "Search & Destroy" << "Search && Destroy";
-    QTest::newRow("Mnemonic and ellipsis") << "O&pen File ..." << "Open File" << "Open File";
-}
-
-void tst_QAction::setText()
-{
-    QFETCH(QString, text);
-
-    QAction action(nullptr);
-    action.setText(text);
-
-    QCOMPARE(action.text(), text);
-
-    QFETCH(QString, iconText);
-    QCOMPARE(action.iconText(), iconText);
-}
-
-void tst_QAction::setIconText()
-{
-    QFETCH(QString, iconText);
-
-    QAction action(nullptr);
-    action.setIconText(iconText);
-    QCOMPARE(action.iconText(), iconText);
-
-    QFETCH(QString, textFromIconText);
-    QCOMPARE(action.text(), textFromIconText);
-}
-
 void tst_QAction::setUnknownFont() // QTBUG-42728
 {
     QAction action(nullptr);
@@ -221,34 +152,7 @@ void tst_QAction::actionEvent()
     QCOMPARE(m_lastAction, &a);
 }
 
-//basic testing of standard keys
-void tst_QAction::setStandardKeys()
-{
-    QAction act(nullptr);
-    act.setShortcut(QKeySequence("CTRL+L"));
-    QList<QKeySequence> list;
-    act.setShortcuts(list);
-    act.setShortcuts(QKeySequence::Copy);
-    QCOMPARE(act.shortcut(), act.shortcuts().constFirst());
-
-    QList<QKeySequence> expected;
-    const QKeySequence ctrlC = QKeySequence(QStringLiteral("CTRL+C"));
-    const QKeySequence ctrlInsert = QKeySequence(QStringLiteral("CTRL+INSERT"));
-    switch (m_keyboardScheme) {
-    case QPlatformTheme::MacKeyboardScheme:
-        expected  << ctrlC;
-        break;
-    case QPlatformTheme::WindowsKeyboardScheme:
-        expected  << ctrlC << ctrlInsert;
-        break;
-    default: // X11
-        expected  << ctrlC << ctrlInsert << QKeySequence(QStringLiteral("F16"));
-        break;
-    }
-
-    QCOMPARE(act.shortcuts(), expected);
-}
-
+#if QT_CONFIG(shortcut)
 
 void tst_QAction::alternateShortcuts()
 {
@@ -354,38 +258,7 @@ void tst_QAction::enabledVisibleInteraction()
     QCOMPARE(spy.count(), 1); //act is visible and enabled, so trigger
 }
 
-void tst_QAction::task200823_tooltip()
-{
-    const QScopedPointer<QAction> action(new QAction("foo", nullptr));
-    QString shortcut("ctrl+o");
-    action->setShortcut(shortcut);
-
-    // we want a non-standard tooltip that shows the shortcut
-    action->setToolTip(action->text() + QLatin1String(" (") + action->shortcut().toString() + QLatin1Char(')'));
-
-    QString ref = QLatin1String("foo (") + QKeySequence(shortcut).toString() + QLatin1Char(')');
-    QCOMPARE(action->toolTip(), ref);
-}
-
-void tst_QAction::task229128TriggeredSignalWithoutActiongroup()
-{
-    // test without a group
-    const QScopedPointer<QAction> actionWithoutGroup(new QAction("Test", nullptr));
-    QSignalSpy spyWithoutGroup(actionWithoutGroup.data(), QOverload<bool>::of(&QAction::triggered));
-    QCOMPARE(spyWithoutGroup.count(), 0);
-    actionWithoutGroup->trigger();
-    // signal should be emitted
-    QCOMPARE(spyWithoutGroup.count(), 1);
-
-    // it is now a checkable checked action
-    actionWithoutGroup->setCheckable(true);
-    actionWithoutGroup->setChecked(true);
-    spyWithoutGroup.clear();
-    QCOMPARE(spyWithoutGroup.count(), 0);
-    actionWithoutGroup->trigger();
-    // signal should be emitted
-    QCOMPARE(spyWithoutGroup.count(), 1);
-}
+#endif // QT_CONFIG(shortcut)
 
 void tst_QAction::task229128TriggeredSignalWhenInActiongroup()
 {
@@ -408,6 +281,8 @@ void tst_QAction::task229128TriggeredSignalWhenInActiongroup()
     QCOMPARE(actionSpy.count(), 1);
 }
 
+#if QT_CONFIG(shortcut)
+
 void tst_QAction::repeat()
 {
     if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
@@ -452,21 +327,6 @@ void tst_QAction::repeat()
     QCOMPARE(spy.count(), 2);
 }
 
-void tst_QAction::setData() // QTBUG-62006
-{
-    QAction act(nullptr);
-    QSignalSpy spy(&act, &QAction::changed);
-    QCOMPARE(act.data(), QVariant());
-    QCOMPARE(spy.count(), 0);
-    act.setData(QVariant());
-    QCOMPARE(spy.count(), 0);
-
-    act.setData(-1);
-    QCOMPARE(spy.count(), 1);
-    act.setData(-1);
-    QCOMPARE(spy.count(), 1);
-}
-
 void tst_QAction::disableShortcutsWithBlockedWidgets_data()
 {
     QTest::addColumn<Qt::ShortcutContext>("shortcutContext");
@@ -556,5 +416,7 @@ void tst_QAction::shortcutFromKeyEvent()
     QCOMPARE(testWidget.shortcutOverrideCount, 1);
 }
 
+#endif // QT_CONFIG(shortcut)
+
 QTEST_MAIN(tst_QAction)
 #include "tst_qaction.moc"
diff --git a/tests/auto/widgets/kernel/qactiongroup/CMakeLists.txt b/tests/auto/widgets/kernel/qactiongroup/CMakeLists.txt
new file mode 100644
index 0000000000..a55acf2efb
--- /dev/null
+++ b/tests/auto/widgets/kernel/qactiongroup/CMakeLists.txt
@@ -0,0 +1,13 @@
+# Generated from qactiongroup.pro.
+
+#####################################################################
+## tst_qactiongroup Test:
+#####################################################################
+
+add_qt_test(tst_qactiongroup
+    SOURCES
+        tst_qactiongroup.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+)
diff --git a/tests/auto/widgets/kernel/qactiongroup/tst_qactiongroup.cpp b/tests/auto/widgets/kernel/qactiongroup/tst_qactiongroup.cpp
index 524040d003..d3b07ba26a 100644
--- a/tests/auto/widgets/kernel/qactiongroup/tst_qactiongroup.cpp
+++ b/tests/auto/widgets/kernel/qactiongroup/tst_qactiongroup.cpp
@@ -38,166 +38,9 @@ class tst_QActionGroup : public QObject
 
 private slots:
     void cleanup() { QVERIFY(QApplication::topLevelWidgets().isEmpty()); }
-    void enabledPropagation();
-    void visiblePropagation();
-    void exclusive();
-    void exclusiveOptional();
     void separators();
-    void testActionInTwoQActionGroup();
-    void unCheckCurrentAction();
 };
 
-void tst_QActionGroup::enabledPropagation()
-{
-    QActionGroup testActionGroup(nullptr);
-
-    QAction* childAction = new QAction( &testActionGroup );
-    QAction* anotherChildAction = new QAction( &testActionGroup );
-    QAction* freeAction = new QAction(nullptr);
-
-    QVERIFY( testActionGroup.isEnabled() );
-    QVERIFY( childAction->isEnabled() );
-
-    testActionGroup.setEnabled( false );
-    QVERIFY( !testActionGroup.isEnabled() );
-    QVERIFY( !childAction->isEnabled() );
-    QVERIFY( !anotherChildAction->isEnabled() );
-
-    childAction->setEnabled(true);
-    QVERIFY( !childAction->isEnabled());
-
-    anotherChildAction->setEnabled( false );
-
-    testActionGroup.setEnabled( true );
-    QVERIFY( testActionGroup.isEnabled() );
-    QVERIFY( childAction->isEnabled() );
-    QVERIFY( !anotherChildAction->isEnabled() );
-
-    testActionGroup.setEnabled( false );
-    QAction *lastChildAction = new QAction(&testActionGroup);
-
-    QVERIFY(!lastChildAction->isEnabled());
-    testActionGroup.setEnabled( true );
-    QVERIFY(lastChildAction->isEnabled());
-
-    freeAction->setEnabled(false);
-    testActionGroup.addAction(freeAction);
-    QVERIFY(!freeAction->isEnabled());
-    delete freeAction;
-}
-
-void tst_QActionGroup::visiblePropagation()
-{
-    QActionGroup testActionGroup(nullptr);
-
-    QAction* childAction = new QAction( &testActionGroup );
-    QAction* anotherChildAction = new QAction( &testActionGroup );
-    QAction* freeAction = new QAction(nullptr);
-
-    QVERIFY( testActionGroup.isVisible() );
-    QVERIFY( childAction->isVisible() );
-
-    testActionGroup.setVisible( false );
-    QVERIFY( !testActionGroup.isVisible() );
-    QVERIFY( !childAction->isVisible() );
-    QVERIFY( !anotherChildAction->isVisible() );
-
-    anotherChildAction->setVisible(false);
-
-    testActionGroup.setVisible( true );
-    QVERIFY( testActionGroup.isVisible() );
-    QVERIFY( childAction->isVisible() );
-
-    QVERIFY( !anotherChildAction->isVisible() );
-
-    testActionGroup.setVisible( false );
-    QAction *lastChildAction = new QAction(&testActionGroup);
-
-    QVERIFY(!lastChildAction->isVisible());
-    testActionGroup.setVisible( true );
-    QVERIFY(lastChildAction->isVisible());
-
-    freeAction->setVisible(false);
-    testActionGroup.addAction(freeAction);
-    QVERIFY(!freeAction->isVisible());
-    delete freeAction;
-}
-
-void tst_QActionGroup::exclusive()
-{
-    QActionGroup group(nullptr);
-    group.setExclusive(false);
-    QVERIFY( !group.isExclusive() );
-
-    QAction* actOne = new QAction( &group );
-    actOne->setCheckable( true );
-    QAction* actTwo = new QAction( &group );
-    actTwo->setCheckable( true );
-    QAction* actThree = new QAction( &group );
-    actThree->setCheckable( true );
-
-    group.setExclusive( true );
-    QVERIFY( !actOne->isChecked() );
-    QVERIFY( !actTwo->isChecked() );
-    QVERIFY( !actThree->isChecked() );
-
-    actOne->setChecked( true );
-    QVERIFY( actOne->isChecked() );
-    QVERIFY( !actTwo->isChecked() );
-    QVERIFY( !actThree->isChecked() );
-
-    actTwo->setChecked( true );
-    QVERIFY( !actOne->isChecked() );
-    QVERIFY( actTwo->isChecked() );
-    QVERIFY( !actThree->isChecked() );
-}
-
-void tst_QActionGroup::exclusiveOptional()
-{
-    QActionGroup group(0);
-    group.setExclusive(true);
-    QVERIFY( group.isExclusive() );
-
-    QAction* actOne = new QAction( &group );
-    actOne->setCheckable( true );
-    QAction* actTwo = new QAction( &group );
-    actTwo->setCheckable( true );
-    QAction* actThree = new QAction( &group );
-    actThree->setCheckable( true );
-
-    QVERIFY( !actOne->isChecked() );
-    QVERIFY( !actTwo->isChecked() );
-    QVERIFY( !actThree->isChecked() );
-
-    actOne->trigger();
-    QVERIFY( actOne->isChecked() );
-    QVERIFY( !actTwo->isChecked() );
-    QVERIFY( !actThree->isChecked() );
-
-    actOne->trigger();
-    QVERIFY( actOne->isChecked() );
-    QVERIFY( !actTwo->isChecked() );
-    QVERIFY( !actThree->isChecked() );
-
-    group.setExclusionPolicy( QActionGroup::ExclusionPolicy::ExclusiveOptional );
-    QVERIFY( group.isExclusive() );
-
-    actOne->trigger();
-    QVERIFY( !actOne->isChecked() );
-    QVERIFY( !actTwo->isChecked() );
-    QVERIFY( !actThree->isChecked() );
-
-    actTwo->trigger();
-    QVERIFY( !actOne->isChecked() );
-    QVERIFY( actTwo->isChecked() );
-    QVERIFY( !actThree->isChecked() );
-
-    actTwo->trigger();
-    QVERIFY( !actOne->isChecked() );
-    QVERIFY( !actTwo->isChecked() );
-    QVERIFY( !actThree->isChecked() );
-}
-
 void tst_QActionGroup::separators()
 {
     QMainWindow mw;
@@ -233,40 +76,5 @@ void tst_QActionGroup::separators()
     QCOMPARE(menu.actions().size(), 3);
 }
 
-void tst_QActionGroup::testActionInTwoQActionGroup()
-{
-    QAction action1("Action 1", this);
-
-    QActionGroup group1(this);
-    QActionGroup group2(this);
-
-    group1.addAction(&action1);
-    group2.addAction(&action1);
-
-    QCOMPARE(action1.actionGroup(), &group2);
-    QCOMPARE(group2.actions().first(), &action1);
-    QCOMPARE(group1.actions().isEmpty(), true);
-}
-
-void tst_QActionGroup::unCheckCurrentAction()
-{
-    QActionGroup group(nullptr);
-    QAction action1(&group) ,action2(&group);
-    action1.setCheckable(true);
-    action2.setCheckable(true);
-    QVERIFY(!action1.isChecked());
-    QVERIFY(!action2.isChecked());
-    action1.setChecked(true);
-    QVERIFY(action1.isChecked());
-    QVERIFY(!action2.isChecked());
-    QAction *current = group.checkedAction();
-    QCOMPARE(current, &action1);
-    current->setChecked(false);
-    QVERIFY(!action1.isChecked());
-    QVERIFY(!action2.isChecked());
-    QVERIFY(!group.checkedAction());
-}
-
-
 QTEST_MAIN(tst_QActionGroup)
 #include "tst_qactiongroup.moc"
diff --git a/tests/auto/widgets/kernel/qapplication/CMakeLists.txt b/tests/auto/widgets/kernel/qapplication/CMakeLists.txt
new file mode 100644
index 0000000000..8e68089f5e
--- /dev/null
+++ b/tests/auto/widgets/kernel/qapplication/CMakeLists.txt
@@ -0,0 +1,7 @@
+# Generated from qapplication.pro.
+
+add_subdirectory(test)
+if(NOT WINRT)
+    add_subdirectory(desktopsettingsaware)
+    add_subdirectory(modal)
+endif()
diff --git a/tests/auto/widgets/kernel/qapplication/desktopsettingsaware/.prev_CMakeLists.txt b/tests/auto/widgets/kernel/qapplication/desktopsettingsaware/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..df5f5f4e6c
--- /dev/null
+++ b/tests/auto/widgets/kernel/qapplication/desktopsettingsaware/.prev_CMakeLists.txt
@@ -0,0 +1,16 @@
+# Generated from desktopsettingsaware.pro.
+
+#####################################################################
+## desktopsettingsaware Binary:
+#####################################################################
+
+add_qt_executable(desktopsettingsaware
+    SOURCES
+        main.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+)
+
+## Scopes:
+#####################################################################
diff --git a/tests/auto/widgets/kernel/qapplication/desktopsettingsaware/CMakeLists.txt b/tests/auto/widgets/kernel/qapplication/desktopsettingsaware/CMakeLists.txt
new file mode 100644
index 0000000000..98a38da7c0
--- /dev/null
+++ b/tests/auto/widgets/kernel/qapplication/desktopsettingsaware/CMakeLists.txt
@@ -0,0 +1,18 @@
+# Generated from desktopsettingsaware.pro.
+
+#####################################################################
+## desktopsettingsaware Binary:
+#####################################################################
+
+add_qt_executable(desktopsettingsaware_helper # special case
+    SOURCES
+        main.cpp
+    OUTPUT_DIRECTORY # special case
+        ${CMAKE_CURRENT_BINARY_DIR}/.. # special case
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+)
+
+## Scopes:
+#####################################################################
diff --git a/tests/auto/widgets/kernel/qapplication/modal/.prev_CMakeLists.txt b/tests/auto/widgets/kernel/qapplication/modal/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..fc990e790e
--- /dev/null
+++ b/tests/auto/widgets/kernel/qapplication/modal/.prev_CMakeLists.txt
@@ -0,0 +1,17 @@
+# Generated from modal.pro.
+
+#####################################################################
+## modal Binary:
+#####################################################################
+
+add_qt_executable(modal
+    SOURCES
+        base.cpp base.h
+        main.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+)
+
+## Scopes:
+#####################################################################
diff --git a/tests/auto/widgets/kernel/qapplication/modal/CMakeLists.txt b/tests/auto/widgets/kernel/qapplication/modal/CMakeLists.txt
new file mode 100644
index 0000000000..c598ca600a
--- /dev/null
+++ b/tests/auto/widgets/kernel/qapplication/modal/CMakeLists.txt
@@ -0,0 +1,19 @@
+# Generated from modal.pro.
+
+#####################################################################
+## modal Binary:
+#####################################################################
+
+add_qt_executable(modal_helper  # special case
+    SOURCES
+        base.cpp base.h
+        main.cpp
+    OUTPUT_DIRECTORY # special case
+        ${CMAKE_CURRENT_BINARY_DIR}/.. # special case
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+)
+
+## Scopes:
+#####################################################################
diff --git a/tests/auto/widgets/kernel/qapplication/test/.prev_CMakeLists.txt b/tests/auto/widgets/kernel/qapplication/test/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..40e612f0de
--- /dev/null
+++ b/tests/auto/widgets/kernel/qapplication/test/.prev_CMakeLists.txt
@@ -0,0 +1,42 @@
+# Generated from test.pro.
+
+#####################################################################
+## test Test:
+#####################################################################
+
+# Collect test data
+list(APPEND test_data "../test/test.pro")
+list(APPEND test_data "../tmp/README")
+list(APPEND test_data "../modal")
+
+add_qt_test(test
+    SOURCES
+        ../tst_qapplication.cpp
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::Gui
+        Qt::GuiPrivate
+        Qt::Widgets
+        Qt::WidgetsPrivate
+    TESTDATA ${test_data}
+)
+
+## Scopes:
+#####################################################################
+
+extend_target(test CONDITION builtin_testdata
+    DEFINES
+        BUILTIN_TESTDATA
+)
+
+#### Keys ignored in scope 3:.:.:test.pro:NOT ANDROID AND NOT WINRT:
+# SUBPROGRAMS = "desktopsettingsaware" "modal"
+
+#### Keys ignored in scope 6:.:.:test.pro:NOT ANDROID AND NOT WINRT:
+# TEST_HELPER_INSTALLS = "../debug/helper"
+
+#### Keys ignored in scope 8:.:.:test.pro:NOT ANDROID AND NOT WINRT:
+# TEST_HELPER_INSTALLS = "../release/helper"
+
+#### Keys ignored in scope 10:.:.:test.pro:NOT ANDROID AND NOT WINRT:
+# TEST_HELPER_INSTALLS = "../helper"
diff --git a/tests/auto/widgets/kernel/qapplication/test/CMakeLists.txt b/tests/auto/widgets/kernel/qapplication/test/CMakeLists.txt
new file mode 100644
index 0000000000..171ee1b273
--- /dev/null
+++ b/tests/auto/widgets/kernel/qapplication/test/CMakeLists.txt
@@ -0,0 +1,43 @@
+# Generated from test.pro.
+
+#####################################################################
+## test Test:
+#####################################################################
+
+# Collect test data
+list(APPEND test_data "../test/test.pro")
+list(APPEND test_data "../tmp/README")
+list(APPEND test_data "../modal")
+
+add_qt_test(tst_qapplication # special case
+    SOURCES
+        ../tst_qapplication.cpp
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::Gui
+        Qt::GuiPrivate
+        Qt::Widgets
+        Qt::WidgetsPrivate
+    TESTDATA ${test_data}
+    OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/.." # special case
+)
+
+## Scopes:
+#####################################################################
+
+extend_target(tst_qapplication CONDITION builtin_testdata # special case
+    DEFINES
+        BUILTIN_TESTDATA
+)
+
+#### Keys ignored in scope 3:.:.:test.pro:NOT ANDROID AND NOT WINRT:
+# SUBPROGRAMS = "desktopsettingsaware" "modal"
+
+#### Keys ignored in scope 6:.:.:test.pro:NOT ANDROID AND NOT WINRT:
+# TEST_HELPER_INSTALLS = "../debug/helper"
+
+#### Keys ignored in scope 8:.:.:test.pro:NOT ANDROID AND NOT WINRT:
+# TEST_HELPER_INSTALLS = "../release/helper"
+
+#### Keys ignored in scope 10:.:.:test.pro:NOT ANDROID AND NOT WINRT:
+# TEST_HELPER_INSTALLS = "../helper"
diff --git a/tests/auto/widgets/kernel/qboxlayout/CMakeLists.txt b/tests/auto/widgets/kernel/qboxlayout/CMakeLists.txt
new file mode 100644
index 0000000000..901d20f1e3
--- /dev/null
+++ b/tests/auto/widgets/kernel/qboxlayout/CMakeLists.txt
@@ -0,0 +1,14 @@
+# Generated from qboxlayout.pro.
+
+#####################################################################
+## tst_qboxlayout Test:
+#####################################################################
+
+add_qt_test(tst_qboxlayout
+    SOURCES
+        tst_qboxlayout.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::TestPrivate
+        Qt::Widgets
+)
diff --git a/tests/auto/widgets/kernel/qdesktopwidget/CMakeLists.txt b/tests/auto/widgets/kernel/qdesktopwidget/CMakeLists.txt
new file mode 100644
index 0000000000..79790049fe
--- /dev/null
+++ b/tests/auto/widgets/kernel/qdesktopwidget/CMakeLists.txt
@@ -0,0 +1,13 @@
+# Generated from qdesktopwidget.pro.
+
+#####################################################################
+## tst_qdesktopwidget Test:
+#####################################################################
+
+add_qt_test(tst_qdesktopwidget
+    SOURCES
+        tst_qdesktopwidget.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+)
diff --git a/tests/auto/widgets/kernel/qformlayout/CMakeLists.txt b/tests/auto/widgets/kernel/qformlayout/CMakeLists.txt
new file mode 100644
index 0000000000..f786f3331c
--- /dev/null
+++ b/tests/auto/widgets/kernel/qformlayout/CMakeLists.txt
@@ -0,0 +1,15 @@
+# Generated from qformlayout.pro.
+
+#####################################################################
+## tst_qformlayout Test:
+#####################################################################
+
+add_qt_test(tst_qformlayout
+    SOURCES
+        tst_qformlayout.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::TestPrivate
+        Qt::Widgets
+        Qt::WidgetsPrivate
+)
diff --git a/tests/auto/widgets/kernel/qformlayout/tst_qformlayout.cpp b/tests/auto/widgets/kernel/qformlayout/tst_qformlayout.cpp
index c6760000f4..45a35fe4f1 100644
--- a/tests/auto/widgets/kernel/qformlayout/tst_qformlayout.cpp
+++ b/tests/auto/widgets/kernel/qformlayout/tst_qformlayout.cpp
@@ -99,7 +99,9 @@ class tst_QFormLayout : public QObject
 private slots:
     void cleanup();
     void rowCount();
+#if QT_CONFIG(shortcut)
     void buddies();
+#endif
     void getItemPosition();
     void wrapping();
     void spacing();
@@ -190,6 +192,8 @@ void tst_QFormLayout::rowCount()
     //TODO: remove items
 }
 
+#if QT_CONFIG(shortcut)
+
 void tst_QFormLayout::buddies()
 {
     QWidget w;
@@ -218,6 +222,8 @@ void tst_QFormLayout::buddies()
     //TODO: empty label?
 }
 
+#endif // QT_CONFIG(shortcut)
+
 void tst_QFormLayout::getItemPosition()
 {
     QWidget w;
@@ -687,17 +693,21 @@ void tst_QFormLayout::insertRow_QString_QWidget()
     layout->insertRow(-5, "&Name:", fld1);
     QLabel *label1 = qobject_cast<QLabel *>(layout->itemAt(0, QFormLayout::LabelRole)->widget());
     QVERIFY(label1 != 0);
+#if QT_CONFIG(shortcut)
     QCOMPARE(label1->buddy(), fld1);
-
+#endif
     layout->insertRow(0, "&Email:", fld2);
     QLabel *label2 = qobject_cast<QLabel *>(layout->itemAt(0, QFormLayout::LabelRole)->widget());
     QVERIFY(label2 != 0);
+#if QT_CONFIG(shortcut)
     QCOMPARE(label2->buddy(), fld2);
-
+#endif
     layout->insertRow(5, "&Age:", fld3);
     QLabel *label3 = qobject_cast<QLabel *>(layout->itemAt(2, QFormLayout::LabelRole)->widget());
     QVERIFY(label3 != 0);
+#if QT_CONFIG(shortcut)
     QCOMPARE(label3->buddy(), fld3);
+#endif
 }
 
 void tst_QFormLayout::insertRow_QString_QLayout()
@@ -711,21 +721,27 @@ void tst_QFormLayout::insertRow_QString_QLayout()
     layout->insertRow(-5, "&Name:", fld1);
     QLabel *label1 = qobject_cast<QLabel *>(layout->itemAt(0, QFormLayout::LabelRole)->widget());
     QVERIFY(label1 != 0);
+#if QT_CONFIG(shortcut)
     QVERIFY(!label1->buddy());
+#endif
 
     QCOMPARE(layout->rowCount(), 1);
 
     layout->insertRow(0, "&Email:", fld2);
     QLabel *label2 = qobject_cast<QLabel *>(layout->itemAt(0, QFormLayout::LabelRole)->widget());
     QVERIFY(label2 != 0);
+#if QT_CONFIG(shortcut)
     QVERIFY(!label2->buddy());
+#endif
 
     QCOMPARE(layout->rowCount(), 2);
 
     layout->insertRow(5, "&Age:", fld3);
     QLabel *label3 = qobject_cast<QLabel *>(layout->itemAt(2, QFormLayout::LabelRole)->widget());
     QVERIFY(label3 != 0);
+#if QT_CONFIG(shortcut)
     QVERIFY(!label3->buddy());
+#endif
 
     QCOMPARE(layout->rowCount(), 3);
 }
diff --git a/tests/auto/widgets/kernel/qgesturerecognizer/CMakeLists.txt b/tests/auto/widgets/kernel/qgesturerecognizer/CMakeLists.txt
new file mode 100644
index 0000000000..61bf8d303a
--- /dev/null
+++ b/tests/auto/widgets/kernel/qgesturerecognizer/CMakeLists.txt
@@ -0,0 +1,15 @@
+# Generated from qgesturerecognizer.pro.
+
+#####################################################################
+## tst_qgesturerecognizer Test:
+#####################################################################
+
+add_qt_test(tst_qgesturerecognizer
+    SOURCES
+        tst_qgesturerecognizer.cpp
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::Gui
+        Qt::GuiPrivate
+        Qt::Widgets
+)
diff --git a/tests/auto/widgets/kernel/qgridlayout/CMakeLists.txt b/tests/auto/widgets/kernel/qgridlayout/CMakeLists.txt
new file mode 100644
index 0000000000..79995454f7
--- /dev/null
+++ b/tests/auto/widgets/kernel/qgridlayout/CMakeLists.txt
@@ -0,0 +1,20 @@
+# Generated from qgridlayout.pro.
+
+#####################################################################
+## tst_qgridlayout Test:
+#####################################################################
+
+add_qt_test(tst_qgridlayout
+    SOURCES
+        sortdialog.ui
+        tst_qgridlayout.cpp
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::Gui
+        Qt::GuiPrivate
+        Qt::TestPrivate
+        Qt::Widgets
+        Qt::WidgetsPrivate
+    ENABLE_AUTOGEN_TOOLS
+        uic
+)
diff --git a/tests/auto/widgets/kernel/qlayout/CMakeLists.txt b/tests/auto/widgets/kernel/qlayout/CMakeLists.txt
new file mode 100644
index 0000000000..e63a80117f
--- /dev/null
+++ b/tests/auto/widgets/kernel/qlayout/CMakeLists.txt
@@ -0,0 +1,39 @@
+# Generated from qlayout.pro.
+
+#####################################################################
+## tst_qlayout Test:
+#####################################################################
+
+# Collect test data
+file(GLOB_RECURSE test_data_glob
+    RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+    baseline/*)
+list(APPEND test_data ${test_data_glob})
+
+add_qt_test(tst_qlayout
+    SOURCES
+        tst_qlayout.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::TestPrivate
+        Qt::Widgets
+        Qt::WidgetsPrivate
+    TESTDATA ${test_data}
+)
+
+## Scopes:
+#####################################################################
+
+if(ANDROID AND NOT ANDROID_EMBEDDED)
+    # Resources:
+    set(testdata_resource_files
+        "baseline/smartmaxsize"
+    )
+
+    add_qt_resource(tst_qlayout "testdata"
+        PREFIX
+            "/"
+        FILES
+            ${testdata_resource_files}
+    )
+endif()
diff --git a/tests/auto/widgets/kernel/qshortcut/CMakeLists.txt b/tests/auto/widgets/kernel/qshortcut/CMakeLists.txt
new file mode 100644
index 0000000000..5d077c87ec
--- /dev/null
+++ b/tests/auto/widgets/kernel/qshortcut/CMakeLists.txt
@@ -0,0 +1,15 @@
+# Generated from qshortcut.pro.
+
+#####################################################################
+## tst_qshortcut Test:
+#####################################################################
+
+add_qt_test(tst_qshortcut
+    SOURCES
+        tst_qshortcut.cpp
+    INCLUDE_DIRECTORIES
+        ..
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+)
diff --git a/tests/auto/widgets/kernel/qsizepolicy/CMakeLists.txt b/tests/auto/widgets/kernel/qsizepolicy/CMakeLists.txt
new file mode 100644
index 0000000000..582f0d582d
--- /dev/null
+++ b/tests/auto/widgets/kernel/qsizepolicy/CMakeLists.txt
@@ -0,0 +1,17 @@
+# Generated from qsizepolicy.pro.
+
+#####################################################################
+## tst_qsizepolicy Test:
+#####################################################################
+
+add_qt_test(tst_qsizepolicy
+    SOURCES
+        tst_qsizepolicy.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+        Qt::WidgetsPrivate
+)
+
+## Scopes:
+#####################################################################
diff --git a/tests/auto/widgets/kernel/qstackedlayout/CMakeLists.txt b/tests/auto/widgets/kernel/qstackedlayout/CMakeLists.txt
new file mode 100644
index 0000000000..a41957c9a6
--- /dev/null
+++ b/tests/auto/widgets/kernel/qstackedlayout/CMakeLists.txt
@@ -0,0 +1,13 @@
+# Generated from qstackedlayout.pro.
+
+#####################################################################
+## tst_qstackedlayout Test:
+#####################################################################
+
+add_qt_test(tst_qstackedlayout
+    SOURCES
+        tst_qstackedlayout.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+)
diff --git a/tests/auto/widgets/kernel/qtooltip/CMakeLists.txt b/tests/auto/widgets/kernel/qtooltip/CMakeLists.txt
new file mode 100644
index 0000000000..f63b6e63cd
--- /dev/null
+++ b/tests/auto/widgets/kernel/qtooltip/CMakeLists.txt
@@ -0,0 +1,13 @@
+# Generated from qtooltip.pro.
+
+#####################################################################
+## tst_qtooltip Test:
+#####################################################################
+
+add_qt_test(tst_qtooltip
+    SOURCES
+        tst_qtooltip.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+)
diff --git a/tests/auto/widgets/kernel/qwidget/CMakeLists.txt b/tests/auto/widgets/kernel/qwidget/CMakeLists.txt
new file mode 100644
index 0000000000..849dfea52a
--- /dev/null
+++ b/tests/auto/widgets/kernel/qwidget/CMakeLists.txt
@@ -0,0 +1,57 @@
+# Generated from qwidget.pro.
+
+#####################################################################
+## tst_qwidget Test:
+#####################################################################
+
+add_qt_test(tst_qwidget
+    SOURCES
+        tst_qwidget.cpp
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::Gui
+        Qt::GuiPrivate
+        Qt::TestPrivate
+        Qt::Widgets
+        Qt::WidgetsPrivate
+)
+
+# Resources:
+set(qwidget_resource_files
+    "geometry-fullscreen.dat"
+    "geometry-maximized.dat"
+    "geometry.dat"
+)
+
+add_qt_resource(tst_qwidget "qwidget"
+    PREFIX
+        "/"
+    FILES
+        ${qwidget_resource_files}
+)
+
+
+#### Keys ignored in scope 1:.:.:qwidget.pro:<TRUE>:
+# testcase.timeout = "600"
+
+## Scopes:
+#####################################################################
+
+extend_target(tst_qwidget CONDITION AIX
+    COMPILE_OPTIONS
+        -fpermissive
+)
+
+extend_target(tst_qwidget CONDITION APPLE
+    SOURCES
+        tst_qwidget_mac_helpers.mm
+    PUBLIC_LIBRARIES
+        ${FWAppKit}
+        ${FWSecurity}
+)
+
+extend_target(tst_qwidget CONDITION WIN32 AND NOT WINRT
+    PUBLIC_LIBRARIES
+        gdi32
+        user32
+)
diff --git a/tests/auto/widgets/kernel/qwidget_window/CMakeLists.txt b/tests/auto/widgets/kernel/qwidget_window/CMakeLists.txt
new file mode 100644
index 0000000000..201c271103
--- /dev/null
+++ b/tests/auto/widgets/kernel/qwidget_window/CMakeLists.txt
@@ -0,0 +1,16 @@
+# Generated from qwidget_window.pro.
+
+#####################################################################
+## tst_qwidget_window Test:
+#####################################################################
+
+add_qt_test(tst_qwidget_window
+    SOURCES
+        tst_qwidget_window.cpp
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::Gui
+        Qt::GuiPrivate
+        Qt::TestPrivate
+        Qt::Widgets
+)
diff --git a/tests/auto/widgets/kernel/qwidgetaction/CMakeLists.txt b/tests/auto/widgets/kernel/qwidgetaction/CMakeLists.txt
new file mode 100644
index 0000000000..06a4156b57
--- /dev/null
+++ b/tests/auto/widgets/kernel/qwidgetaction/CMakeLists.txt
@@ -0,0 +1,14 @@
+# Generated from qwidgetaction.pro.
+
+#####################################################################
+## tst_qwidgetaction Test:
+#####################################################################
+
+add_qt_test(tst_qwidgetaction
+    SOURCES
+        tst_qwidgetaction.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::TestPrivate
+        Qt::Widgets
+)
diff --git a/tests/auto/widgets/kernel/qwidgetmetatype/CMakeLists.txt b/tests/auto/widgets/kernel/qwidgetmetatype/CMakeLists.txt
new file mode 100644
index 0000000000..dd935fdbd7
--- /dev/null
+++ b/tests/auto/widgets/kernel/qwidgetmetatype/CMakeLists.txt
@@ -0,0 +1,13 @@
+# Generated from qwidgetmetatype.pro.
+
+#####################################################################
+## tst_qwidgetmetatype Test:
+#####################################################################
+
+add_qt_test(tst_qwidgetmetatype
+    SOURCES
+        tst_qwidgetmetatype.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+)
diff --git a/tests/auto/widgets/kernel/qwidgetsvariant/CMakeLists.txt b/tests/auto/widgets/kernel/qwidgetsvariant/CMakeLists.txt
new file mode 100644
index 0000000000..076f66cd78
--- /dev/null
+++ b/tests/auto/widgets/kernel/qwidgetsvariant/CMakeLists.txt
@@ -0,0 +1,15 @@
+# Generated from qwidgetsvariant.pro.
+
+#####################################################################
+## tst_qwidgetsvariant Test:
+#####################################################################
+
+add_qt_test(tst_qwidgetsvariant
+    SOURCES
+        tst_qwidgetsvariant.cpp
+    INCLUDE_DIRECTORIES
+        ../../../other/qvariant_common
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+)
diff --git a/tests/auto/widgets/kernel/qwindowcontainer/CMakeLists.txt b/tests/auto/widgets/kernel/qwindowcontainer/CMakeLists.txt
new file mode 100644
index 0000000000..63b8b44e6f
--- /dev/null
+++ b/tests/auto/widgets/kernel/qwindowcontainer/CMakeLists.txt
@@ -0,0 +1,13 @@
+# Generated from qwindowcontainer.pro.
+
+#####################################################################
+## tst_qwindowcontainer Test:
+#####################################################################
+
+add_qt_test(tst_qwindowcontainer
+    SOURCES
+        tst_qwindowcontainer.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+)
diff --git a/tests/auto/widgets/styles/CMakeLists.txt b/tests/auto/widgets/styles/CMakeLists.txt
new file mode 100644
index 0000000000..4fc260fe39
--- /dev/null
+++ b/tests/auto/widgets/styles/CMakeLists.txt
@@ -0,0 +1,12 @@
+# Generated from styles.pro.
+
+if (APPLE_OSX)
+    add_subdirectory(qmacstyle)
+endif()
+add_subdirectory(qstyle)
+if (NOT APPLE_UIKIT AND NOT ANDROID AND NOT QNX)
+    add_subdirectory(qstyleoption)
+endif()
+if (QT_FEATURE_private_tests)
+    add_subdirectory(qstylesheetstyle)
+endif()
diff --git a/tests/auto/widgets/styles/qmacstyle/CMakeLists.txt b/tests/auto/widgets/styles/qmacstyle/CMakeLists.txt
new file mode 100644
index 0000000000..44053dbe3d
--- /dev/null
+++ b/tests/auto/widgets/styles/qmacstyle/CMakeLists.txt
@@ -0,0 +1,13 @@
+# Generated from qmacstyle.pro.
+
+#####################################################################
+## tst_qmacstyle Test:
+#####################################################################
+
+add_qt_test(tst_qmacstyle
+    SOURCES
+        tst_qmacstyle.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::WidgetsPrivate
+)
diff --git a/tests/auto/widgets/styles/qstyle/CMakeLists.txt b/tests/auto/widgets/styles/qstyle/CMakeLists.txt
new file mode 100644
index 0000000000..21d81113f4
--- /dev/null
+++ b/tests/auto/widgets/styles/qstyle/CMakeLists.txt
@@ -0,0 +1,14 @@
+# Generated from qstyle.pro.
+
+#####################################################################
+## tst_qstyle Test:
+#####################################################################
+
+add_qt_test(tst_qstyle
+    SOURCES
+        tst_qstyle.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::TestPrivate
+        Qt::Widgets
+)
diff --git a/tests/auto/widgets/styles/qstyleoption/CMakeLists.txt b/tests/auto/widgets/styles/qstyleoption/CMakeLists.txt
new file mode 100644
index 0000000000..e174057cbb
--- /dev/null
+++ b/tests/auto/widgets/styles/qstyleoption/CMakeLists.txt
@@ -0,0 +1,16 @@
+# Generated from qstyleoption.pro.
+
+#####################################################################
+## tst_qstyleoption Test:
+#####################################################################
+
+add_qt_test(tst_qstyleoption
+    SOURCES
+        tst_qstyleoption.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+)
+
+#### Keys ignored in scope 1:.:.:qstyleoption.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/auto/widgets/styles/qstylesheetstyle/CMakeLists.txt b/tests/auto/widgets/styles/qstylesheetstyle/CMakeLists.txt
new file mode 100644
index 0000000000..01c4df38fe
--- /dev/null
+++ b/tests/auto/widgets/styles/qstylesheetstyle/CMakeLists.txt
@@ -0,0 +1,37 @@
+# Generated from qstylesheetstyle.pro.
+
+if(NOT QT_FEATURE_private_tests)
+    return()
+endif()
+
+#####################################################################
+## tst_qstylesheetstyle Test:
+#####################################################################
+
+add_qt_test(tst_qstylesheetstyle
+    SOURCES
+        tst_qstylesheetstyle.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::GuiPrivate
+        Qt::TestPrivate
+        Qt::Widgets
+        Qt::WidgetsPrivate
+)
+
+# Resources:
+set(resources_resource_files
+    "images/testimage.png"
+    "images/testimage@2x.png"
+)
+
+add_qt_resource(tst_qstylesheetstyle "resources"
+    PREFIX
+        "/"
+    FILES
+        ${resources_resource_files}
+)
+
+
+#### Keys ignored in scope 1:.:.:qstylesheetstyle.pro:<TRUE>:
+# _REQUIREMENTS = "qtConfig(private_tests)"
diff --git a/tests/auto/widgets/util/CMakeLists.txt b/tests/auto/widgets/util/CMakeLists.txt
new file mode 100644
index 0000000000..0372282e7b
--- /dev/null
+++ b/tests/auto/widgets/util/CMakeLists.txt
@@ -0,0 +1,7 @@
+# Generated from util.pro.
+
+add_subdirectory(qcompleter)
+add_subdirectory(qscroller)
+add_subdirectory(qsystemtrayicon)
+add_subdirectory(qundogroup)
+add_subdirectory(qundostack)
diff --git a/tests/auto/widgets/util/qcompleter/CMakeLists.txt b/tests/auto/widgets/util/qcompleter/CMakeLists.txt
new file mode 100644
index 0000000000..fb87c3beec
--- /dev/null
+++ b/tests/auto/widgets/util/qcompleter/CMakeLists.txt
@@ -0,0 +1,17 @@
+# Generated from qcompleter.pro.
+
+#####################################################################
+## tst_qcompleter Test:
+#####################################################################
+
+add_qt_test(tst_qcompleter
+    SOURCES
+        tst_qcompleter.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::TestPrivate
+        Qt::Widgets
+)
+
+#### Keys ignored in scope 1:.:.:qcompleter.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/auto/widgets/util/qcompleter/tst_qcompleter.cpp b/tests/auto/widgets/util/qcompleter/tst_qcompleter.cpp
index 89c4a74739..fe3e3c7f72 100644
--- a/tests/auto/widgets/util/qcompleter/tst_qcompleter.cpp
+++ b/tests/auto/widgets/util/qcompleter/tst_qcompleter.cpp
@@ -1807,7 +1807,7 @@ void tst_QCompleter::QTBUG_52028_tabAutoCompletes()
     QApplication::setActiveWindow(&w);
     QVERIFY(QTest::qWaitForWindowActive(&w));
 
-    QSignalSpy activatedSpy(&cbox, QOverload<int>::of(&QComboBox::activated));
+    QSignalSpy activatedSpy(&cbox, &QComboBox::activated);
 
     // Tab key will complete but not activate
     cbox.lineEdit()->clear();
@@ -1851,7 +1851,7 @@ void tst_QCompleter::QTBUG_51889_activatedSentTwice()
     QApplication::setActiveWindow(&w);
     QVERIFY(QTest::qWaitForWindowActive(&w));
 
-    QSignalSpy activatedSpy(&cbox, QOverload<int>::of(&QComboBox::activated));
+    QSignalSpy activatedSpy(&cbox, &QComboBox::activated);
 
     // Navigate + enter activates only once (first item)
     cbox.lineEdit()->clear();
diff --git a/tests/auto/widgets/util/qscroller/CMakeLists.txt b/tests/auto/widgets/util/qscroller/CMakeLists.txt
new file mode 100644
index 0000000000..b6c6efcc2f
--- /dev/null
+++ b/tests/auto/widgets/util/qscroller/CMakeLists.txt
@@ -0,0 +1,14 @@
+# Generated from qscroller.pro.
+
+#####################################################################
+## tst_qscroller Test:
+#####################################################################
+
+add_qt_test(tst_qscroller
+    SOURCES
+        tst_qscroller.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::GuiPrivate
+        Qt::Widgets
+)
diff --git a/tests/auto/widgets/util/qsystemtrayicon/CMakeLists.txt b/tests/auto/widgets/util/qsystemtrayicon/CMakeLists.txt
new file mode 100644
index 0000000000..df6efa7281
--- /dev/null
+++ b/tests/auto/widgets/util/qsystemtrayicon/CMakeLists.txt
@@ -0,0 +1,13 @@
+# Generated from qsystemtrayicon.pro.
+
+#####################################################################
+## tst_qsystemtrayicon Test:
+#####################################################################
+
+add_qt_test(tst_qsystemtrayicon
+    SOURCES
+        tst_qsystemtrayicon.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+)
diff --git a/tests/auto/widgets/util/qundogroup/CMakeLists.txt b/tests/auto/widgets/util/qundogroup/CMakeLists.txt
new file mode 100644
index 0000000000..600a7d7da1
--- /dev/null
+++ b/tests/auto/widgets/util/qundogroup/CMakeLists.txt
@@ -0,0 +1,13 @@
+# Generated from qundogroup.pro.
+
+#####################################################################
+## tst_qundogroup Test:
+#####################################################################
+
+add_qt_test(tst_qundogroup
+    SOURCES
+        tst_qundogroup.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+)
diff --git a/tests/auto/widgets/util/qundostack/CMakeLists.txt b/tests/auto/widgets/util/qundostack/CMakeLists.txt
new file mode 100644
index 0000000000..5fc049991f
--- /dev/null
+++ b/tests/auto/widgets/util/qundostack/CMakeLists.txt
@@ -0,0 +1,13 @@
+# Generated from qundostack.pro.
+
+#####################################################################
+## tst_qundostack Test:
+#####################################################################
+
+add_qt_test(tst_qundostack
+    SOURCES
+        tst_qundostack.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+)
diff --git a/tests/auto/widgets/widgets/CMakeLists.txt b/tests/auto/widgets/widgets/CMakeLists.txt
new file mode 100644
index 0000000000..60776f5da2
--- /dev/null
+++ b/tests/auto/widgets/widgets/CMakeLists.txt
@@ -0,0 +1,55 @@
+# Generated from widgets.pro.
+
+add_subdirectory(qabstractbutton)
+add_subdirectory(qabstractscrollarea)
+add_subdirectory(qabstractslider)
+add_subdirectory(qbuttongroup)
+add_subdirectory(qcalendarwidget)
+add_subdirectory(qcheckbox)
+add_subdirectory(qcommandlinkbutton)
+add_subdirectory(qdatetimeedit)
+add_subdirectory(qdial)
+add_subdirectory(qdialogbuttonbox)
+add_subdirectory(qdockwidget)
+add_subdirectory(qdoublespinbox)
+add_subdirectory(qfocusframe)
+add_subdirectory(qfontcombobox)
+add_subdirectory(qframe)
+add_subdirectory(qgroupbox)
+add_subdirectory(qkeysequenceedit)
+add_subdirectory(qlabel)
+add_subdirectory(qlcdnumber)
+add_subdirectory(qlineedit)
+add_subdirectory(qmdiarea)
+add_subdirectory(qmdisubwindow)
+add_subdirectory(qmenu)
+add_subdirectory(qmenubar)
+add_subdirectory(qplaintextedit)
+add_subdirectory(qprogressbar)
+add_subdirectory(qpushbutton)
+add_subdirectory(qradiobutton)
+add_subdirectory(qscrollarea)
+add_subdirectory(qscrollbar)
+add_subdirectory(qsizegrip)
+add_subdirectory(qslider)
+add_subdirectory(qspinbox)
+add_subdirectory(qsplitter)
+add_subdirectory(qstackedwidget)
+add_subdirectory(qstatusbar)
+add_subdirectory(qtabbar)
+add_subdirectory(qtabwidget)
+add_subdirectory(qtextbrowser)
+add_subdirectory(qtoolbox)
+add_subdirectory(qtoolbutton)
+
+if(QT_FEATURE_private_tests)
+    add_subdirectory(qabstractspinbox)
+    add_subdirectory(qcombobox)
+    add_subdirectory(qmainwindow)
+    add_subdirectory(qtextedit)
+    add_subdirectory(qtoolbar)
+endif()
+
+if(NOT WINRT AND QT_FEATURE_opengl)
+    add_subdirectory(qopenglwidget)
+endif()
diff --git a/tests/auto/widgets/widgets/qabstractbutton/CMakeLists.txt b/tests/auto/widgets/widgets/qabstractbutton/CMakeLists.txt
new file mode 100644
index 0000000000..48a174b6e1
--- /dev/null
+++ b/tests/auto/widgets/widgets/qabstractbutton/CMakeLists.txt
@@ -0,0 +1,14 @@
+# Generated from qabstractbutton.pro.
+
+#####################################################################
+## tst_qabstractbutton Test:
+#####################################################################
+
+add_qt_test(tst_qabstractbutton
+    SOURCES
+        tst_qabstractbutton.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::GuiPrivate
+        Qt::Widgets
+)
diff --git a/tests/auto/widgets/widgets/qabstractbutton/tst_qabstractbutton.cpp b/tests/auto/widgets/widgets/qabstractbutton/tst_qabstractbutton.cpp
index eb108a40de..e5a891912f 100644
--- a/tests/auto/widgets/widgets/qabstractbutton/tst_qabstractbutton.cpp
+++ b/tests/auto/widgets/widgets/qabstractbutton/tst_qabstractbutton.cpp
@@ -34,7 +34,9 @@
 #include <qapplication.h>
 #include <qpainter.h>
 #include <qstyleoption.h>
-#include <qkeysequence.h>
+#if QT_CONFIG(shortcut)
+#  include <qkeysequence.h>
+#endif
 #include <qevent.h>
 #include <qgridlayout.h>
 #include <qabstractbutton.h>
@@ -59,7 +61,9 @@ private slots:
     void setText();
     void setIcon();
 
+#if QT_CONFIG(shortcut)
     void setShortcut();
+#endif
 
     void animateClick();
 
@@ -68,7 +72,9 @@ private slots:
     void isChecked();
     void toggled();
     void setEnabled();
+#if QT_CONFIG(shortcut)
     void shortcutEvents();
+#endif
     void stopRepeatTimer();
 
     void mouseReleased(); // QTBUG-53244
@@ -164,8 +170,10 @@ void tst_QAbstractButton::init()
     testWidget->setEnabled( true );
     testWidget->setDown( false );
     testWidget->setAutoRepeat( false );
+#if QT_CONFIG(shortcut)
     QKeySequence seq;
     testWidget->setShortcut( seq );
+#endif
 
     toggle_count = 0;
     press_count = 0;
@@ -336,17 +344,17 @@ void tst_QAbstractButton::setText()
     QCOMPARE( testWidget->text(), QString("simple") );
     testWidget->setText("&ampersand");
     QCOMPARE( testWidget->text(), QString("&ampersand") );
-#ifndef Q_OS_MAC // no mneonics on Mac.
+#if QT_CONFIG(shortcut) && !defined(Q_OS_DARWIN) // no mnemonics on Mac.
     QCOMPARE( testWidget->shortcut(), QKeySequence("ALT+A"));
 #endif
     testWidget->setText("te&st");
     QCOMPARE( testWidget->text(), QString("te&st") );
-#ifndef Q_OS_MAC // no mneonics on Mac.
+#if QT_CONFIG(shortcut) && !defined(Q_OS_DARWIN) // no mnemonics on Mac.
     QCOMPARE( testWidget->shortcut(), QKeySequence("ALT+S"));
 #endif
     testWidget->setText("foo");
     QCOMPARE( testWidget->text(), QString("foo") );
-#ifndef Q_OS_MAC // no mneonics on Mac.
+#if QT_CONFIG(shortcut) && !defined(Q_OS_DARWIN) // no mnemonics on Mac.
     QCOMPARE( testWidget->shortcut(), QKeySequence());
 #endif
 }
@@ -471,6 +479,7 @@ void tst_QAbstractButton::toggled()
     testWidget->setCheckable(false);
 }
 
+#if QT_CONFIG(shortcut)
 void tst_QAbstractButton::setShortcut()
 {
     if (!QGuiApplicationPrivate::platformIntegration()->hasCapability(QPlatformIntegration::WindowActivation))
@@ -502,6 +511,7 @@ void tst_QAbstractButton::setShortcut()
 //     qDebug() << click_count;
 
 }
+#endif // QT_CONFIG(shortcut)
 
 void tst_QAbstractButton::animateClick()
 {
@@ -512,6 +522,8 @@ void tst_QAbstractButton::animateClick()
     QTRY_VERIFY( !testWidget->isDown() );
 }
 
+#if QT_CONFIG(shortcut)
+
 void tst_QAbstractButton::shortcutEvents()
 {
     MyButton button;
@@ -535,6 +547,8 @@ void tst_QAbstractButton::shortcutEvents()
     QCOMPARE(clickedSpy.count(), 3);
 }
 
+#endif // QT_CONFIG(shortcut)
+
 void tst_QAbstractButton::stopRepeatTimer()
 {
     MyButton button;
diff --git a/tests/auto/widgets/widgets/qabstractscrollarea/CMakeLists.txt b/tests/auto/widgets/widgets/qabstractscrollarea/CMakeLists.txt
new file mode 100644
index 0000000000..cb1b2aa936
--- /dev/null
+++ b/tests/auto/widgets/widgets/qabstractscrollarea/CMakeLists.txt
@@ -0,0 +1,13 @@
+# Generated from qabstractscrollarea.pro.
+
+#####################################################################
+## tst_qabstractscrollarea Test:
+#####################################################################
+
+add_qt_test(tst_qabstractscrollarea
+    SOURCES
+        tst_qabstractscrollarea.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+)
diff --git a/tests/auto/widgets/widgets/qabstractslider/CMakeLists.txt b/tests/auto/widgets/widgets/qabstractslider/CMakeLists.txt
new file mode 100644
index 0000000000..0dbbf63239
--- /dev/null
+++ b/tests/auto/widgets/widgets/qabstractslider/CMakeLists.txt
@@ -0,0 +1,14 @@
+# Generated from qabstractslider.pro.
+
+#####################################################################
+## tst_qabstractslider Test:
+#####################################################################
+
+add_qt_test(tst_qabstractslider
+    SOURCES
+        tst_qabstractslider.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::TestPrivate
+        Qt::Widgets
+)
diff --git a/tests/auto/widgets/widgets/qabstractspinbox/CMakeLists.txt b/tests/auto/widgets/widgets/qabstractspinbox/CMakeLists.txt
new file mode 100644
index 0000000000..32c814c535
--- /dev/null
+++ b/tests/auto/widgets/widgets/qabstractspinbox/CMakeLists.txt
@@ -0,0 +1,16 @@
+# Generated from qabstractspinbox.pro.
+
+#####################################################################
+## tst_qabstractspinbox Test:
+#####################################################################
+
+add_qt_test(tst_qabstractspinbox
+    SOURCES
+        tst_qabstractspinbox.cpp
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::Gui
+        Qt::GuiPrivate
+        Qt::TestPrivate
+        Qt::Widgets
+)
diff --git a/tests/auto/widgets/widgets/qbuttongroup/CMakeLists.txt b/tests/auto/widgets/widgets/qbuttongroup/CMakeLists.txt
new file mode 100644
index 0000000000..92d04e0c26
--- /dev/null
+++ b/tests/auto/widgets/widgets/qbuttongroup/CMakeLists.txt
@@ -0,0 +1,13 @@
+# Generated from qbuttongroup.pro.
+
+#####################################################################
+## tst_qbuttongroup Test:
+#####################################################################
+
+add_qt_test(tst_qbuttongroup
+    SOURCES
+        tst_qbuttongroup.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+)
diff --git a/tests/auto/widgets/widgets/qbuttongroup/tst_qbuttongroup.cpp b/tests/auto/widgets/widgets/qbuttongroup/tst_qbuttongroup.cpp
index 279fe49e3a..999cf4a941 100644
--- a/tests/auto/widgets/widgets/qbuttongroup/tst_qbuttongroup.cpp
+++ b/tests/auto/widgets/widgets/qbuttongroup/tst_qbuttongroup.cpp
@@ -297,67 +297,43 @@ void tst_QButtonGroup::testSignals()
 
     qRegisterMetaType<QAbstractButton *>("QAbstractButton *");
     QSignalSpy clickedSpy(&buttons, SIGNAL(buttonClicked(QAbstractButton*)));
-    QSignalSpy clickedIdSpy(&buttons, SIGNAL(buttonClicked(int)));
     QSignalSpy pressedSpy(&buttons, SIGNAL(buttonPressed(QAbstractButton*)));
-    QSignalSpy pressedIdSpy(&buttons, SIGNAL(buttonPressed(int)));
     QSignalSpy releasedSpy(&buttons, SIGNAL(buttonReleased(QAbstractButton*)));
-    QSignalSpy releasedIdSpy(&buttons, SIGNAL(buttonReleased(int)));
 
     pb1.animateClick();
     QTestEventLoop::instance().enterLoop(1);
 
     QCOMPARE(clickedSpy.count(), 1);
-    QCOMPARE(clickedIdSpy.count(), 1);
 
-    int expectedId = -2;
-
-    QCOMPARE(clickedIdSpy.takeFirst().at(0).toInt(), expectedId);
     QCOMPARE(pressedSpy.count(), 1);
-    QCOMPARE(pressedIdSpy.count(), 1);
-    QCOMPARE(pressedIdSpy.takeFirst().at(0).toInt(), expectedId);
     QCOMPARE(releasedSpy.count(), 1);
-    QCOMPARE(releasedIdSpy.count(), 1);
-    QCOMPARE(releasedIdSpy.takeFirst().at(0).toInt(), expectedId);
 
     clickedSpy.clear();
-    clickedIdSpy.clear();
     pressedSpy.clear();
-    pressedIdSpy.clear();
     releasedSpy.clear();
-    releasedIdSpy.clear();
 
     pb2.animateClick();
     QTestEventLoop::instance().enterLoop(1);
 
     QCOMPARE(clickedSpy.count(), 1);
-    QCOMPARE(clickedIdSpy.count(), 1);
-    QCOMPARE(clickedIdSpy.takeFirst().at(0).toInt(), 23);
     QCOMPARE(pressedSpy.count(), 1);
-    QCOMPARE(pressedIdSpy.count(), 1);
-    QCOMPARE(pressedIdSpy.takeFirst().at(0).toInt(), 23);
     QCOMPARE(releasedSpy.count(), 1);
-    QCOMPARE(releasedIdSpy.count(), 1);
-    QCOMPARE(releasedIdSpy.takeFirst().at(0).toInt(), 23);
 
 
     QSignalSpy toggledSpy(&buttons, SIGNAL(buttonToggled(QAbstractButton*, bool)));
-    QSignalSpy toggledIdSpy(&buttons, SIGNAL(buttonToggled(int, bool)));
 
     pb1.setCheckable(true);
     pb2.setCheckable(true);
     pb1.toggle();
     QCOMPARE(toggledSpy.count(), 1);
-    QCOMPARE(toggledIdSpy.count(), 1);
 
     pb2.toggle();
     QCOMPARE(toggledSpy.count(), 3);     // equals 3 since pb1 and pb2 are both toggled
-    QCOMPARE(toggledIdSpy.count(), 3);
 
     pb1.setCheckable(false);
     pb2.setCheckable(false);
     pb1.toggle();
     QCOMPARE(toggledSpy.count(), 3);
-    QCOMPARE(toggledIdSpy.count(), 3);
 }
 
 void tst_QButtonGroup::task106609()
@@ -389,7 +365,6 @@ void tst_QButtonGroup::task106609()
 
     qRegisterMetaType<QAbstractButton*>("QAbstractButton*");
     QSignalSpy spy1(buttons, SIGNAL(buttonClicked(QAbstractButton*)));
-    QSignalSpy spy2(buttons, SIGNAL(buttonClicked(int)));
 
     QApplication::setActiveWindow(&dlg);
     QTRY_COMPARE(QApplication::activeWindow(), static_cast<QWidget*>(&dlg));
@@ -398,8 +373,6 @@ void tst_QButtonGroup::task106609()
     radio1->setChecked(true);
     QTestEventLoop::instance().enterLoop(1);
 
-    //qDebug() << "int:" << spy2.count() << "QAbstractButton*:" << spy1.count();
-    QCOMPARE(spy2.count(), 2);
     QCOMPARE(spy1.count(), 2);
 }
 
@@ -444,11 +417,12 @@ public:
         : group(group)
         , deleteButton(deleteButton)
     {
-        connect(group, SIGNAL(buttonClicked(int)), SLOT(buttonClicked(int)));
+        connect(group, &QButtonGroup::buttonClicked,
+                this, &task209485_ButtonDeleter::buttonClicked);
     }
 
 private slots:
-    void buttonClicked(int)
+    void buttonClicked()
     {
         if (deleteButton)
             group->removeButton(group->buttons().first());
@@ -464,7 +438,7 @@ void tst_QButtonGroup::task209485_removeFromGroupInEventHandler_data()
     QTest::addColumn<bool>("deleteButton");
     QTest::addColumn<int>("signalCount");
     QTest::newRow("buttonPress 1") << true << 1;
-    QTest::newRow("buttonPress 2") << false << 2;
+    QTest::newRow("buttonPress 2") << false << 1;
 }
 
 void tst_QButtonGroup::task209485_removeFromGroupInEventHandler()
@@ -480,12 +454,11 @@ void tst_QButtonGroup::task209485_removeFromGroupInEventHandler()
     task209485_ButtonDeleter buttonDeleter(&group, deleteButton);
 
     QSignalSpy spy1(&group, SIGNAL(buttonClicked(QAbstractButton*)));
-    QSignalSpy spy2(&group, SIGNAL(buttonClicked(int)));
 
     // NOTE: Reintroducing the bug of this task will cause the following line to crash:
     QTest::mouseClick(button, Qt::LeftButton);
 
-    QCOMPARE(spy1.count() + spy2.count(), signalCount);
+    QCOMPARE(spy1.count(), signalCount);
 }
 
 void tst_QButtonGroup::autoIncrementId()
diff --git a/tests/auto/widgets/widgets/qcalendarwidget/CMakeLists.txt b/tests/auto/widgets/widgets/qcalendarwidget/CMakeLists.txt
new file mode 100644
index 0000000000..10e24a1016
--- /dev/null
+++ b/tests/auto/widgets/widgets/qcalendarwidget/CMakeLists.txt
@@ -0,0 +1,13 @@
+# Generated from qcalendarwidget.pro.
+
+#####################################################################
+## tst_qcalendarwidget Test:
+#####################################################################
+
+add_qt_test(tst_qcalendarwidget
+    SOURCES
+        tst_qcalendarwidget.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+)
diff --git a/tests/auto/widgets/widgets/qcheckbox/CMakeLists.txt b/tests/auto/widgets/widgets/qcheckbox/CMakeLists.txt
new file mode 100644
index 0000000000..2418791e5d
--- /dev/null
+++ b/tests/auto/widgets/widgets/qcheckbox/CMakeLists.txt
@@ -0,0 +1,13 @@
+# Generated from qcheckbox.pro.
+
+#####################################################################
+## tst_qcheckbox Test:
+#####################################################################
+
+add_qt_test(tst_qcheckbox
+    SOURCES
+        tst_qcheckbox.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+)
diff --git a/tests/auto/widgets/widgets/qcombobox/CMakeLists.txt b/tests/auto/widgets/widgets/qcombobox/CMakeLists.txt
new file mode 100644
index 0000000000..95fbe14eec
--- /dev/null
+++ b/tests/auto/widgets/widgets/qcombobox/CMakeLists.txt
@@ -0,0 +1,24 @@
+# Generated from qcombobox.pro.
+
+#####################################################################
+## tst_qcombobox Test:
+#####################################################################
+
+# Collect test data
+list(APPEND test_data "qtlogo.png")
+list(APPEND test_data "qtlogoinverted.png")
+
+add_qt_test(tst_qcombobox
+    SOURCES
+        tst_qcombobox.cpp
+    DEFINES
+        QTEST_QPA_MOUSE_HANDLING
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::Gui
+        Qt::GuiPrivate
+        Qt::TestPrivate
+        Qt::Widgets
+        Qt::WidgetsPrivate
+    TESTDATA ${test_data}
+)
diff --git a/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp b/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp
index c5be8a3f16..bd3c6d1f03 100644
--- a/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp
+++ b/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp
@@ -2482,7 +2482,7 @@ void tst_QComboBox::task247863_keyBoardSelection()
   QApplication::setActiveWindow(&combo);
   QTRY_COMPARE(QApplication::activeWindow(), static_cast<QWidget *>(&combo));
 
-  QSignalSpy spy(&combo, SIGNAL(activated(QString)));
+  QSignalSpy spy(&combo, &QComboBox::activated);
   qApp->setEffectEnabled(Qt::UI_AnimateCombo, false);
   QTest::keyClick(&combo, Qt::Key_Space);
   qApp->setEffectEnabled(Qt::UI_AnimateCombo, true);
@@ -2763,7 +2763,7 @@ void tst_QComboBox::resetModel()
     };
     QComboBox cb;
     StringListModel model({"1", "2"});
-    QSignalSpy spy(&cb, QOverload<int, const QString &>::of(&QComboBox::currentIndexChanged));
+    QSignalSpy spy(&cb, &QComboBox::currentIndexChanged);
     QCOMPARE(spy.count(), 0);
     QCOMPARE(cb.currentIndex(), -1); //no selection
 
diff --git a/tests/auto/widgets/widgets/qcommandlinkbutton/CMakeLists.txt b/tests/auto/widgets/widgets/qcommandlinkbutton/CMakeLists.txt
new file mode 100644
index 0000000000..59ba375358
--- /dev/null
+++ b/tests/auto/widgets/widgets/qcommandlinkbutton/CMakeLists.txt
@@ -0,0 +1,13 @@
+# Generated from qcommandlinkbutton.pro.
+
+#####################################################################
+## tst_qcommandlinkbutton Test:
+#####################################################################
+
+add_qt_test(tst_qcommandlinkbutton
+    SOURCES
+        tst_qcommandlinkbutton.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+)
diff --git a/tests/auto/widgets/widgets/qcommandlinkbutton/tst_qcommandlinkbutton.cpp b/tests/auto/widgets/widgets/qcommandlinkbutton/tst_qcommandlinkbutton.cpp
index 0044d33c66..45a23984e0 100644
--- a/tests/auto/widgets/widgets/qcommandlinkbutton/tst_qcommandlinkbutton.cpp
+++ b/tests/auto/widgets/widgets/qcommandlinkbutton/tst_qcommandlinkbutton.cpp
@@ -51,7 +51,9 @@ private slots:
 
     void getSetCheck();
     void pressed();
+#if QT_CONFIG(shortcut)
     void setAccel();
+#endif
     void isCheckable();
     void setDown();
     void popupCrash();
@@ -133,8 +135,10 @@ void tst_QCommandLinkButton::init()
     testWidget->setText("Test");
     testWidget->setDescription("Description text.");
     testWidget->setEnabled( true );
+#if QT_CONFIG(shortcut)
     QKeySequence seq;
     testWidget->setShortcut( seq );
+#endif
 
     resetCounters();
 }
@@ -327,6 +331,8 @@ void tst_QCommandLinkButton::toggled()
     QVERIFY( click_count == 1 );
 }
 
+#if QT_CONFIG(shortcut)
+
 /*
     If we press an accelerator key we ONLY get a pressed signal and
     NOT a released or clicked signal.
@@ -355,6 +361,8 @@ void tst_QCommandLinkButton::setAccel()
     QTest::qWait(200);
 }
 
+#endif // QT_CONFIG(shortcut)
+
 void tst_QCommandLinkButton::animateClick()
 {
     QVERIFY( !testWidget->isDown() );
diff --git a/tests/auto/widgets/widgets/qdatetimeedit/CMakeLists.txt b/tests/auto/widgets/widgets/qdatetimeedit/CMakeLists.txt
new file mode 100644
index 0000000000..8eb294d361
--- /dev/null
+++ b/tests/auto/widgets/widgets/qdatetimeedit/CMakeLists.txt
@@ -0,0 +1,15 @@
+# Generated from qdatetimeedit.pro.
+
+#####################################################################
+## tst_qdatetimeedit Test:
+#####################################################################
+
+add_qt_test(tst_qdatetimeedit
+    SOURCES
+        tst_qdatetimeedit.cpp
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::Gui
+        Qt::Widgets
+        Qt::WidgetsPrivate
+)
diff --git a/tests/auto/widgets/widgets/qdatetimeedit/tst_qdatetimeedit.cpp b/tests/auto/widgets/widgets/qdatetimeedit/tst_qdatetimeedit.cpp
index 4c6cf3588a..9659d89833 100644
--- a/tests/auto/widgets/widgets/qdatetimeedit/tst_qdatetimeedit.cpp
+++ b/tests/auto/widgets/widgets/qdatetimeedit/tst_qdatetimeedit.cpp
@@ -262,6 +262,8 @@ private slots:
     void timeSpec();
     void timeSpecBug();
     void timeSpecInit();
+    void setDateTime_data();
+    void setDateTime();
 
     void monthEdgeCase();
     void setLocale();
@@ -3483,6 +3485,54 @@ void tst_QDateTimeEdit::timeSpecInit()
     QCOMPARE(widget.dateTime(), utc);
 }
 
+void tst_QDateTimeEdit::setDateTime_data()
+{
+    QTest::addColumn<Qt::TimeSpec>("spec");
+    QDateTime localNoon(QDate(2019, 12, 24), QTime(12, 0), Qt::LocalTime);
+#if 0 // Not yet supported
+    QTest::addColumn<int>("offset");
+    QTest::addColumn<QByteArray>("zoneName");
+
+    QTest::newRow("OffsetFromUTC/LocalTime")
+        << Qt::OffsetFromUTC << 7200 << ""
+        << localNoon << localNoon.toOffsetFromUtc(7200);
+#if QT_CONFIG(timezone)
+    QTest::newRow("TimeZone/LocalTime")
+        << Qt::TimeZone << 0 << "Europe/Berlin"
+        << localNoon << localNoon.toTimeZone(QTimeZone("Europe/Berlin"));
+#endif
+#endif // unsupported
+    QTest::addColumn<QDateTime>("store");
+    QTest::addColumn<QDateTime>("expect");
+    QTest::newRow("LocalTime/LocalTime")
+        << Qt::LocalTime // << 0 << ""
+        << localNoon << localNoon;
+    QTest::newRow("LocalTime/UTC")
+        << Qt::LocalTime // << 0 << ""
+        << localNoon.toUTC() << localNoon;
+    QTest::newRow("UTC/LocalTime")
+        << Qt::UTC // << 0 << ""
+        << localNoon << localNoon.toUTC();
+    QTest::newRow("UTC/UTC")
+        << Qt::UTC // << 0 << ""
+        << localNoon.toUTC() << localNoon.toUTC();
+}
+
+void tst_QDateTimeEdit::setDateTime()
+{
+    QFETCH(const Qt::TimeSpec, spec);
+#if 0 // Not yet supported
+    QFETCH(const int, offset);
+    QFETCH(const QByteArray, zoneName);
+#endif // configuring the spec, when OffsetFromUTC or TimeZone
+    QFETCH(const QDateTime, store);
+    QFETCH(const QDateTime, expect);
+    QDateTimeEdit editor;
+    editor.setTimeSpec(spec);
+    editor.setDateTime(store);
+    QCOMPARE(editor.dateTime(), expect);
+}
+
 void tst_QDateTimeEdit::cachedDayTest()
 {
     testWidget->setDisplayFormat("MM/dd");
diff --git a/tests/auto/widgets/widgets/qdial/CMakeLists.txt b/tests/auto/widgets/widgets/qdial/CMakeLists.txt
new file mode 100644
index 0000000000..e725edacb6
--- /dev/null
+++ b/tests/auto/widgets/widgets/qdial/CMakeLists.txt
@@ -0,0 +1,13 @@
+# Generated from qdial.pro.
+
+#####################################################################
+## tst_qdial Test:
+#####################################################################
+
+add_qt_test(tst_qdial
+    SOURCES
+        tst_qdial.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+)
diff --git a/tests/auto/widgets/widgets/qdialogbuttonbox/CMakeLists.txt b/tests/auto/widgets/widgets/qdialogbuttonbox/CMakeLists.txt
new file mode 100644
index 0000000000..c4961f13a1
--- /dev/null
+++ b/tests/auto/widgets/widgets/qdialogbuttonbox/CMakeLists.txt
@@ -0,0 +1,13 @@
+# Generated from qdialogbuttonbox.pro.
+
+#####################################################################
+## tst_qdialogbuttonbox Test:
+#####################################################################
+
+add_qt_test(tst_qdialogbuttonbox
+    SOURCES
+        tst_qdialogbuttonbox.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+)
diff --git a/tests/auto/widgets/widgets/qdockwidget/CMakeLists.txt b/tests/auto/widgets/widgets/qdockwidget/CMakeLists.txt
new file mode 100644
index 0000000000..e2b6cc5942
--- /dev/null
+++ b/tests/auto/widgets/widgets/qdockwidget/CMakeLists.txt
@@ -0,0 +1,16 @@
+# Generated from qdockwidget.pro.
+
+#####################################################################
+## tst_qdockwidget Test:
+#####################################################################
+
+add_qt_test(tst_qdockwidget
+    SOURCES
+        tst_qdockwidget.cpp
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::Gui
+        Qt::GuiPrivate
+        Qt::Widgets
+        Qt::WidgetsPrivate
+)
diff --git a/tests/auto/widgets/widgets/qdoublespinbox/CMakeLists.txt b/tests/auto/widgets/widgets/qdoublespinbox/CMakeLists.txt
new file mode 100644
index 0000000000..b639289db8
--- /dev/null
+++ b/tests/auto/widgets/widgets/qdoublespinbox/CMakeLists.txt
@@ -0,0 +1,13 @@
+# Generated from qdoublespinbox.pro.
+
+#####################################################################
+## tst_qdoublespinbox Test:
+#####################################################################
+
+add_qt_test(tst_qdoublespinbox
+    SOURCES
+        tst_qdoublespinbox.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+)
diff --git a/tests/auto/widgets/widgets/qdoublespinbox/tst_qdoublespinbox.cpp b/tests/auto/widgets/widgets/qdoublespinbox/tst_qdoublespinbox.cpp
index c293a4bdd2..cec2da1d57 100644
--- a/tests/auto/widgets/widgets/qdoublespinbox/tst_qdoublespinbox.cpp
+++ b/tests/auto/widgets/widgets/qdoublespinbox/tst_qdoublespinbox.cpp
@@ -166,7 +166,9 @@ private slots:
 
     void doubleDot();
 
+#if QT_CONFIG(shortcut)
     void undoRedo();
+#endif
 
     void valueFromTextAndValidate_data();
     void valueFromTextAndValidate();
@@ -417,7 +419,7 @@ void tst_QDoubleSpinBox::setTracking()
     spin.setDecimals(decimals);
     spin.show();
 
-    connect(&spin, SIGNAL(valueChanged(QString)), this, SLOT(valueChangedHelper(QString)));
+    connect(&spin, SIGNAL(textChanged(QString)), this, SLOT(valueChangedHelper(QString)));
 
     keys.simulate(&spin);
     QCOMPARE(actualTexts, texts);
@@ -1025,6 +1027,8 @@ void tst_QDoubleSpinBox::doubleDot()
     QCOMPARE(spin.lineEdit()->cursorPosition(), 2);
 }
 
+#if QT_CONFIG(shortcut)
+
 void tst_QDoubleSpinBox::undoRedo()
 {
     //test undo/redo feature (in conjunction with the "undoRedoEnabled" property)
@@ -1073,6 +1077,8 @@ void tst_QDoubleSpinBox::undoRedo()
     QVERIFY(!spin.lineEdit()->isRedoAvailable());
 }
 
+#endif // QT_CONFIG(shortcut)
+
 struct task199226_DoubleSpinBox : public QDoubleSpinBox
 {
     task199226_DoubleSpinBox(QWidget *parent = 0) : QDoubleSpinBox(parent) {}
@@ -1768,7 +1774,7 @@ void tst_QDoubleSpinBox::stepModifierPressAndHold()
     stepModifierStyle->stepModifier = static_cast<Qt::KeyboardModifier>(stepModifier);
     spin.setStyle(stepModifierStyle.data());
 
-    QSignalSpy spy(&spin, QOverload<double>::of(&DoubleSpinBox::valueChanged));
+    QSignalSpy spy(&spin, &DoubleSpinBox::valueChanged);
 
     spin.show();
     QVERIFY(QTest::qWaitForWindowExposed(&spin));
diff --git a/tests/auto/widgets/widgets/qfocusframe/CMakeLists.txt b/tests/auto/widgets/widgets/qfocusframe/CMakeLists.txt
new file mode 100644
index 0000000000..85160faed7
--- /dev/null
+++ b/tests/auto/widgets/widgets/qfocusframe/CMakeLists.txt
@@ -0,0 +1,13 @@
+# Generated from qfocusframe.pro.
+
+#####################################################################
+## tst_qfocusframe Test:
+#####################################################################
+
+add_qt_test(tst_qfocusframe
+    SOURCES
+        tst_qfocusframe.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+)
diff --git a/tests/auto/widgets/widgets/qfontcombobox/CMakeLists.txt b/tests/auto/widgets/widgets/qfontcombobox/CMakeLists.txt
new file mode 100644
index 0000000000..777abc48c5
--- /dev/null
+++ b/tests/auto/widgets/widgets/qfontcombobox/CMakeLists.txt
@@ -0,0 +1,13 @@
+# Generated from qfontcombobox.pro.
+
+#####################################################################
+## tst_qfontcombobox Test:
+#####################################################################
+
+add_qt_test(tst_qfontcombobox
+    SOURCES
+        tst_qfontcombobox.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+)
diff --git a/tests/auto/widgets/widgets/qframe/CMakeLists.txt b/tests/auto/widgets/widgets/qframe/CMakeLists.txt
new file mode 100644
index 0000000000..ae23555fa5
--- /dev/null
+++ b/tests/auto/widgets/widgets/qframe/CMakeLists.txt
@@ -0,0 +1,20 @@
+# Generated from qframe.pro.
+
+#####################################################################
+## tst_qframe Test:
+#####################################################################
+
+# Collect test data
+file(GLOB_RECURSE test_data_glob
+    RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+    images/*)
+list(APPEND test_data ${test_data_glob})
+
+add_qt_test(tst_qframe
+    SOURCES
+        tst_qframe.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+    TESTDATA ${test_data}
+)
diff --git a/tests/auto/widgets/widgets/qgroupbox/CMakeLists.txt b/tests/auto/widgets/widgets/qgroupbox/CMakeLists.txt
new file mode 100644
index 0000000000..09d4623cd9
--- /dev/null
+++ b/tests/auto/widgets/widgets/qgroupbox/CMakeLists.txt
@@ -0,0 +1,13 @@
+# Generated from qgroupbox.pro.
+
+#####################################################################
+## tst_qgroupbox Test:
+#####################################################################
+
+add_qt_test(tst_qgroupbox
+    SOURCES
+        tst_qgroupbox.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+)
diff --git a/tests/auto/widgets/widgets/qkeysequenceedit/CMakeLists.txt b/tests/auto/widgets/widgets/qkeysequenceedit/CMakeLists.txt
new file mode 100644
index 0000000000..c57f8b5c0a
--- /dev/null
+++ b/tests/auto/widgets/widgets/qkeysequenceedit/CMakeLists.txt
@@ -0,0 +1,13 @@
+# Generated from qkeysequenceedit.pro.
+
+#####################################################################
+## tst_qkeysequenceedit Test:
+#####################################################################
+
+add_qt_test(tst_qkeysequenceedit
+    SOURCES
+        tst_qkeysequenceedit.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+)
diff --git a/tests/auto/widgets/widgets/qlabel/CMakeLists.txt b/tests/auto/widgets/widgets/qlabel/CMakeLists.txt
new file mode 100644
index 0000000000..a4fe508a02
--- /dev/null
+++ b/tests/auto/widgets/widgets/qlabel/CMakeLists.txt
@@ -0,0 +1,27 @@
+# Generated from qlabel.pro.
+
+#####################################################################
+## tst_qlabel Test:
+#####################################################################
+
+# Collect test data
+file(GLOB_RECURSE test_data_glob
+    RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+    testdata/*)
+list(APPEND test_data ${test_data_glob})
+file(GLOB_RECURSE test_data_glob
+    RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+    *.png)
+list(APPEND test_data ${test_data_glob})
+
+add_qt_test(tst_qlabel
+    SOURCES
+        tst_qlabel.cpp
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::Gui
+        Qt::GuiPrivate
+        Qt::Widgets
+        Qt::WidgetsPrivate
+    TESTDATA ${test_data}
+)
diff --git a/tests/auto/widgets/widgets/qlabel/tst_qlabel.cpp b/tests/auto/widgets/widgets/qlabel/tst_qlabel.cpp
index f599ac73c6..7760e12cca 100644
--- a/tests/auto/widgets/widgets/qlabel/tst_qlabel.cpp
+++ b/tests/auto/widgets/widgets/qlabel/tst_qlabel.cpp
@@ -68,7 +68,7 @@ private Q_SLOTS:
     void setText_data();
     void setText();
     void setTextFormat();
-#ifndef Q_OS_MAC
+#if QT_CONFIG(shortcut) && !defined(Q_OS_DARWIN)
     void setBuddy();
 #endif
     void setNum();
@@ -88,8 +88,10 @@ private Q_SLOTS:
     void unicodeText_data();
     void unicodeText();
 
+#if QT_CONFIG(shortcut)
     void mnemonic_data();
     void mnemonic();
+#endif
     void selection();
 
 #ifndef QT_NO_CONTEXTMENU
@@ -116,6 +118,7 @@ void tst_QLabel::getSetCheck()
     obj1.setWordWrap(true);
     QCOMPARE(true, obj1.wordWrap());
 
+#if QT_CONFIG(shortcut)
     // QWidget * QLabel::buddy()
     // void QLabel::setBuddy(QWidget *)
     QWidget *var2 = new QWidget();
@@ -124,6 +127,7 @@ void tst_QLabel::getSetCheck()
     obj1.setBuddy((QWidget *)0);
     QCOMPARE((QWidget *)0, obj1.buddy());
     delete var2;
+#endif // QT_CONFIG(shortcut)
 
     // QMovie * QLabel::movie()
     // void QLabel::setMovie(QMovie *)
@@ -153,7 +157,9 @@ void tst_QLabel::cleanupTestCase()
 void tst_QLabel::init()
 {
     testWidget->setTextFormat( Qt::AutoText );
+# if QT_CONFIG(shortcut)
     testWidget->setBuddy( 0 );
+#endif
     testWidget->setIndent( 0 );
     testWidget->setAlignment( Qt::AlignLeft | Qt::AlignVCenter );
     testWidget->setScaledContents( false );
@@ -169,7 +175,7 @@ void tst_QLabel::cleanup()
 }
 
 // Set buddy doesn't make much sense on OS X
-#ifndef Q_OS_MAC
+#if QT_CONFIG(shortcut) && !defined(Q_OS_DARWIN)
 void tst_QLabel::setBuddy()
 {
     testWidget->hide();
@@ -204,7 +210,7 @@ void tst_QLabel::setBuddy()
 
     delete test_box;
 }
-#endif
+#endif // QT_CONFIG(shortcut) && !Q_OS_DARWIN
 
 void tst_QLabel::setText_data()
 {
@@ -469,6 +475,8 @@ void tst_QLabel::unicodeText()
     testWidget->show();
 }
 
+#if QT_CONFIG(shortcut)
+
 void tst_QLabel::mnemonic_data()
 {
     QTest::addColumn<QString>("text");
@@ -513,6 +521,8 @@ void tst_QLabel::mnemonic()
     QCOMPARE(d->shortcutCursor.selectedText(), expectedShortcutCursor);
 }
 
+#endif // QT_CONFIG(shortcut)
+
 void tst_QLabel::selection()
 {
     QLabel label;
diff --git a/tests/auto/widgets/widgets/qlcdnumber/CMakeLists.txt b/tests/auto/widgets/widgets/qlcdnumber/CMakeLists.txt
new file mode 100644
index 0000000000..fbd9ff5913
--- /dev/null
+++ b/tests/auto/widgets/widgets/qlcdnumber/CMakeLists.txt
@@ -0,0 +1,13 @@
+# Generated from qlcdnumber.pro.
+
+#####################################################################
+## tst_qlcdnumber Test:
+#####################################################################
+
+add_qt_test(tst_qlcdnumber
+    SOURCES
+        tst_qlcdnumber.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+)
diff --git a/tests/auto/widgets/widgets/qlineedit/CMakeLists.txt b/tests/auto/widgets/widgets/qlineedit/CMakeLists.txt
new file mode 100644
index 0000000000..f95094aa7d
--- /dev/null
+++ b/tests/auto/widgets/widgets/qlineedit/CMakeLists.txt
@@ -0,0 +1,25 @@
+# Generated from qlineedit.pro.
+
+#####################################################################
+## tst_qlineedit Test:
+#####################################################################
+
+add_qt_test(tst_qlineedit
+    SOURCES
+        tst_qlineedit.cpp
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::Gui
+        Qt::GuiPrivate
+        Qt::TestPrivate
+        Qt::Widgets
+        Qt::WidgetsPrivate
+)
+
+## Scopes:
+#####################################################################
+
+extend_target(tst_qlineedit CONDITION APPLE_OSX
+    PUBLIC_LIBRARIES
+        ${FWAppKit}
+)
diff --git a/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp b/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp
index 6408df3f11..bf31f12958 100644
--- a/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp
+++ b/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp
@@ -56,7 +56,9 @@
 #include <qsortfilterproxymodel.h>
 #include <qdebug.h>
 #include <qscreen.h>
-#include <qshortcut.h>
+#if QT_CONFIG(shortcut)
+#  include <qshortcut.h>
+#endif
 
 #include "qcommonstyle.h"
 #include "qstyleoption.h"
@@ -133,9 +135,11 @@ private slots:
 
     void clearInputMask();
 
+#if QT_CONFIG(shortcut)
     void keypress_inputMask_data();
     void keypress_inputMask();
     void keypress_inputMethod_inputMask();
+#endif
 
     void inputMaskAndValidator_data();
     void inputMaskAndValidator();
@@ -217,7 +221,7 @@ private slots:
     void setSelection_data();
     void setSelection();
 
-#ifndef QT_NO_CLIPBOARD
+#if QT_CONFIG(clipboard) && QT_CONFIG(shortcut)
     void cut();
     void cutWithoutSelection();
 #endif
@@ -297,8 +301,10 @@ private slots:
     void shouldShowPlaceholderText();
     void QTBUG1266_setInputMaskEmittingTextEdited();
 
+#if QT_CONFIG(shortcut)
     void shortcutOverrideOnReadonlyLineEdit_data();
     void shortcutOverrideOnReadonlyLineEdit();
+#endif
     void QTBUG59957_clearButtonLeftmostAction();
     void QTBUG_60319_setInputMaskCheckImSurroundingText();
     void testQuickSelectionWithMouse();
@@ -317,7 +323,9 @@ private:
     void psKeyClick(QWidget *target, Qt::Key key, Qt::KeyboardModifiers pressState = {});
     void psKeyClick(QTestEventList &keys, Qt::Key key, Qt::KeyboardModifiers pressState = {});
     bool unselectingWithLeftOrRightChangesCursorPosition();
+#if QT_CONFIG(shortcut)
     void addKeySequenceStandardKey(QTestEventList &keys, QKeySequence::StandardKey);
+#endif
     QLineEdit *ensureTestWidget();
 
     bool validInput;
@@ -713,6 +721,8 @@ void tst_QLineEdit::clearInputMask()
     QCOMPARE(testWidget->inputMask(), QString());
 }
 
+#if QT_CONFIG(shortcut)
+
 void tst_QLineEdit::keypress_inputMask_data()
 {
     QTest::addColumn<QString>("mask");
@@ -838,6 +848,8 @@ void tst_QLineEdit::keypress_inputMethod_inputMask()
     QCOMPARE(testWidget->text(), QStringLiteral("EE.EE.EE"));
 }
 
+#endif // QT_CONFIG(shortcut)
+
 void tst_QLineEdit::hasAcceptableInputMask_data()
 {
     QTest::addColumn<QString>("optionalMask");
@@ -1989,6 +2001,8 @@ void tst_QLineEdit::psKeyClick(QTestEventList &keys, Qt::Key key, Qt::KeyboardMo
     keys.addKeyClick(key, pressState);
 }
 
+#if QT_CONFIG(shortcut)
+
 void tst_QLineEdit::addKeySequenceStandardKey(QTestEventList &keys, QKeySequence::StandardKey key)
 {
     QKeySequence keyseq = QKeySequence(key);
@@ -1996,6 +2010,8 @@ void tst_QLineEdit::addKeySequenceStandardKey(QTestEventList &keys, QKeySequence
         keys.addKeyClick( Qt::Key( keyseq[i] & ~Qt::KeyboardModifierMask), Qt::KeyboardModifier(keyseq[i] & Qt::KeyboardModifierMask) );
 }
 
+#endif // QT_CONFIG(shortcut)
+
 void tst_QLineEdit::cursorPosition()
 {
     QLineEdit *testWidget = ensureTestWidget();
@@ -3026,7 +3042,7 @@ void tst_QLineEdit::setSelection()
         QCOMPARE(testWidget->cursorPosition(), expectedCursor);
 }
 
-#ifndef QT_NO_CLIPBOARD
+#if QT_CONFIG(clipboard) && QT_CONFIG(shortcut)
 void tst_QLineEdit::cut()
 {
     if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
@@ -3127,7 +3143,7 @@ void tst_QLineEdit::cutWithoutSelection()
         QCOMPARE(clipboard->text(), origText.left(selectionLength));
 }
 
-#endif // !QT_NO_CLIPBOARD
+#endif // QT_CONFIG(clipboard) && QT_CONFIG(shortcut)
 
 class InputMaskValidator : public QValidator
 {
@@ -3975,7 +3991,9 @@ void tst_QLineEdit::taskQTBUG_7395_readOnlyShortcut()
     le.setReadOnly(true);
 
     QAction action(QString::fromLatin1("hello"), &le);
+#if QT_CONFIG(shortcut)
     action.setShortcut(QString::fromLatin1("p"));
+#endif
     QSignalSpy spy(&action, SIGNAL(triggered()));
     le.addAction(&action);
 
@@ -4710,6 +4728,8 @@ void tst_QLineEdit::QTBUG1266_setInputMaskEmittingTextEdited()
     QCOMPARE(spy.count(), 0);
 }
 
+#if QT_CONFIG(shortcut)
+
 void tst_QLineEdit::shortcutOverrideOnReadonlyLineEdit_data()
 {
     QTest::addColumn<QKeySequence>("keySequence");
@@ -4769,6 +4789,8 @@ void tst_QLineEdit::shortcutOverrideOnReadonlyLineEdit()
     QCOMPARE(spy.count(), activationCount);
 }
 
+#endif // QT_CONFIG(shortcut)
+
 void tst_QLineEdit::QTBUG59957_clearButtonLeftmostAction()
 {
 #ifndef QT_BUILD_INTERNAL
diff --git a/tests/auto/widgets/widgets/qmainwindow/CMakeLists.txt b/tests/auto/widgets/widgets/qmainwindow/CMakeLists.txt
new file mode 100644
index 0000000000..55bcf941d0
--- /dev/null
+++ b/tests/auto/widgets/widgets/qmainwindow/CMakeLists.txt
@@ -0,0 +1,14 @@
+# Generated from qmainwindow.pro.
+
+#####################################################################
+## tst_qmainwindow Test:
+#####################################################################
+
+add_qt_test(tst_qmainwindow
+    SOURCES
+        tst_qmainwindow.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+        Qt::WidgetsPrivate
+)
diff --git a/tests/auto/widgets/widgets/qmdiarea/CMakeLists.txt b/tests/auto/widgets/widgets/qmdiarea/CMakeLists.txt
new file mode 100644
index 0000000000..961bd09492
--- /dev/null
+++ b/tests/auto/widgets/widgets/qmdiarea/CMakeLists.txt
@@ -0,0 +1,32 @@
+# Generated from qmdiarea.pro.
+
+#####################################################################
+## tst_qmdiarea Test:
+#####################################################################
+
+add_qt_test(tst_qmdiarea
+    SOURCES
+        tst_qmdiarea.cpp
+    DEFINES
+        QT_NO_CAST_FROM_ASCII
+        QT_NO_CAST_TO_ASCII
+    INCLUDE_DIRECTORIES
+        .
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::GuiPrivate
+        Qt::Widgets
+)
+
+## Scopes:
+#####################################################################
+
+extend_target(tst_qmdiarea CONDITION TARGET Qt::OpenGL
+    PUBLIC_LIBRARIES
+        Qt::OpenGL
+)
+
+extend_target(tst_qmdiarea CONDITION APPLE
+    PUBLIC_LIBRARIES
+        ${FWSecurity}
+)
diff --git a/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp b/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp
index e3b046e448..352a6314f3 100644
--- a/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp
+++ b/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp
@@ -2694,30 +2694,6 @@ void tst_QMdiArea::nativeSubWindows()
     foreach (QMdiSubWindow *subWindow, mdiArea.subWindowList())
             QVERIFY(subWindow->internalWinId());
     }
-
-#ifndef QT_NO_OPENGL
-    {
-    if (!QGLFormat::hasOpenGL())
-        QSKIP("QGL not supported on this platform");
-
-    QMdiArea mdiArea;
-    QGLWidget *glViewport = new QGLWidget;
-    mdiArea.setViewport(glViewport);
-    mdiArea.addSubWindow(new QWidget);
-    mdiArea.addSubWindow(new QWidget);
-    mdiArea.show();
-    QVERIFY(QTest::qWaitForWindowExposed(&mdiArea));
-
-    const QGLContext *context = glViewport->context();
-    if (!context || !context->isValid())
-        QSKIP("QGL is broken, cannot continue test");
-
-    // The viewport and all the sub-windows must be native.
-    QVERIFY(mdiArea.viewport()->internalWinId());
-    foreach (QMdiSubWindow *subWindow, mdiArea.subWindowList())
-        QVERIFY(subWindow->internalWinId());
-    }
-#endif
 }
 
 void tst_QMdiArea::task_209615()
diff --git a/tests/auto/widgets/widgets/qmdisubwindow/CMakeLists.txt b/tests/auto/widgets/widgets/qmdisubwindow/CMakeLists.txt
new file mode 100644
index 0000000000..791d411970
--- /dev/null
+++ b/tests/auto/widgets/widgets/qmdisubwindow/CMakeLists.txt
@@ -0,0 +1,19 @@
+# Generated from qmdisubwindow.pro.
+
+#####################################################################
+## tst_qmdisubwindow Test:
+#####################################################################
+
+add_qt_test(tst_qmdisubwindow
+    SOURCES
+        tst_qmdisubwindow.cpp
+    DEFINES
+        QT_NO_CAST_FROM_ASCII
+        QT_NO_CAST_TO_ASCII
+    INCLUDE_DIRECTORIES
+        .
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+        Qt::WidgetsPrivate
+)
diff --git a/tests/auto/widgets/widgets/qmenu/CMakeLists.txt b/tests/auto/widgets/widgets/qmenu/CMakeLists.txt
new file mode 100644
index 0000000000..a20fe70492
--- /dev/null
+++ b/tests/auto/widgets/widgets/qmenu/CMakeLists.txt
@@ -0,0 +1,30 @@
+# Generated from qmenu.pro.
+
+#####################################################################
+## tst_qmenu Test:
+#####################################################################
+
+add_qt_test(tst_qmenu
+    SOURCES
+        tst_qmenu.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::GuiPrivate
+        Qt::TestPrivate
+        Qt::Widgets
+)
+
+## Scopes:
+#####################################################################
+
+extend_target(tst_qmenu CONDITION APPLE_OSX
+    SOURCES
+        tst_qmenu_mac.mm
+    PUBLIC_LIBRARIES
+        objc
+)
+
+extend_target(tst_qmenu CONDITION NOT APPLE_OSX
+    DEFINES
+        QTEST_QPA_MOUSE_HANDLING
+)
diff --git a/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp b/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp
index d7d3a934f8..8ad4324c9e 100644
--- a/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp
+++ b/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp
@@ -483,7 +483,7 @@ void tst_QMenu::overrideMenuAction()
 
     // On Mac and Windows CE, we need to create native key events to test menu
     // action activation, so skip this part of the test.
-#if !defined(Q_OS_DARWIN)
+#if QT_CONFIG(shortcut) && !defined(Q_OS_DARWIN)
     QAction *aQuit = new QAction("Quit", &w);
     aQuit->setShortcut(QKeySequence("Ctrl+X"));
     m->addAction(aQuit);
@@ -501,7 +501,7 @@ void tst_QMenu::overrideMenuAction()
     //test if the menu still pops out
     QTest::keyClick(&w, Qt::Key_F, Qt::AltModifier);
     QTRY_VERIFY(m->isVisible());
-#endif
+#endif // QT_CONFIG(shortcut) && !Q_OS_DARWIN
 
     delete aFileMenu;
 
@@ -1766,10 +1766,13 @@ void tst_QMenu::QTBUG_61039_menu_shortcuts()
         QSKIP("Window activation is not supported");
 
     QAction *actionKamen = new QAction("Action Kamen");
+#if QT_CONFIG(shortcut)
     actionKamen->setShortcut(QKeySequence(QLatin1String("K")));
-
+#endif
     QAction *actionJoe = new QAction("Action Joe");
+#if QT_CONFIG(shortcut)
     actionJoe->setShortcut(QKeySequence(QLatin1String("Ctrl+J")));
+#endif
 
     QMenu menu;
     menu.addAction(actionKamen);
diff --git a/tests/auto/widgets/widgets/qmenubar/CMakeLists.txt b/tests/auto/widgets/widgets/qmenubar/CMakeLists.txt
new file mode 100644
index 0000000000..43875cd113
--- /dev/null
+++ b/tests/auto/widgets/widgets/qmenubar/CMakeLists.txt
@@ -0,0 +1,24 @@
+# Generated from qmenubar.pro.
+
+#####################################################################
+## tst_qmenubar Test:
+#####################################################################
+
+add_qt_test(tst_qmenubar
+    SOURCES
+        tst_qmenubar.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::TestPrivate
+        Qt::Widgets
+)
+
+## Scopes:
+#####################################################################
+
+extend_target(tst_qmenubar CONDITION APPLE_OSX
+    SOURCES
+        tst_qmenubar_mac.mm
+    PUBLIC_LIBRARIES
+        ${FWAppKit}
+)
diff --git a/tests/auto/widgets/widgets/qmenubar/tst_qmenubar.cpp b/tests/auto/widgets/widgets/qmenubar/tst_qmenubar.cpp
index b255930138..8cbe821a68 100644
--- a/tests/auto/widgets/widgets/qmenubar/tst_qmenubar.cpp
+++ b/tests/auto/widgets/widgets/qmenubar/tst_qmenubar.cpp
@@ -232,19 +232,25 @@ TestMenu tst_QMenuBar::initSimpleMenuBar(QMenuBar *mb, bool forceNonNative) {
     connect(mb, SIGNAL(triggered(QAction*)), this, SLOT(onSimpleActivated(QAction*)));
     QMenu *menu = mb->addMenu(QStringLiteral("&accel"));
     QAction *action = menu->addAction(QStringLiteral("menu1") );
+#if QT_CONFIG(shortcut)
     action->setShortcut(QKeySequence(Qt::ALT + Qt::Key_A));
     action->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_A));
+#endif
     connect(menu, SIGNAL(triggered(QAction*)), this, SLOT(onSimpleActivated(QAction*)));
     result.menus << menu;
     result.actions << action;
 
     menu = mb->addMenu(QStringLiteral("accel1"));
     action = menu->addAction(QStringLiteral("&Open...") );
+#if QT_CONFIG(shortcut)
     action->setShortcut(Qt::Key_O);
+#endif
     result.actions << action;
 
     action = menu->addAction(QStringLiteral("action"));
+#if QT_CONFIG(shortcut)
     action->setShortcut(QKeySequence(Qt::ALT + Qt::Key_Z));
+#endif
     result.actions << action;
 
     result.menus << menu;
@@ -283,7 +289,9 @@ QAction *tst_QMenuBar::createCharacterAction(QMenu *menu, char lowerAscii)
     QAction *action = menu->addAction(text);
     action->setObjectName(text);
     action->setData(QVariant(int(lowerAscii)));
+#if QT_CONFIG(shortcut)
     action->setShortcut(Qt::CTRL + (lowerAscii - 'a' + Qt::Key_A));
+#endif
     connect(action, SIGNAL(triggered()), this, SLOT(onComplexActionTriggered()));
     return action;
 }
@@ -318,7 +326,9 @@ TestMenu tst_QMenuBar::initComplexMenuBar(QMenuBar *mb)
 
     QAction *action = mb->addAction(QStringLiteral("M&enu 3"));
     action->setData(QVariant(3));
+#if QT_CONFIG(shortcut)
     action->setShortcut(Qt::ALT + Qt::Key_J);
+#endif
     connect(action, SIGNAL(triggered()), this, SLOT(onComplexActionTriggered()));
     result.actions << action;
 
@@ -1422,7 +1432,9 @@ void tst_QMenuBar::taskQTBUG4965_escapeEaten()
     menubar.setNativeMenuBar(false);
     QMenu menu("menu1");
     QAction *first = menubar.addMenu(&menu);
+#if QT_CONFIG(shortcut)
     menu.addAction("quit", &menubar, SLOT(close()), QKeySequence("ESC"));
+#endif
     centerOnScreen(&menubar);
     menubar.show();
     QApplication::setActiveWindow(&menubar);
diff --git a/tests/auto/widgets/widgets/qopenglwidget/CMakeLists.txt b/tests/auto/widgets/widgets/qopenglwidget/CMakeLists.txt
new file mode 100644
index 0000000000..c3fdf39fe1
--- /dev/null
+++ b/tests/auto/widgets/widgets/qopenglwidget/CMakeLists.txt
@@ -0,0 +1,18 @@
+# Generated from qopenglwidget.pro.
+
+#####################################################################
+## tst_qopenglwidget Test:
+#####################################################################
+
+add_qt_test(tst_qopenglwidget
+    SOURCES
+        tst_qopenglwidget.cpp
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::Gui
+        Qt::GuiPrivate
+        Qt::OpenGL
+        Qt::OpenGLPrivate
+        Qt::OpenGLWidgets
+        Qt::Widgets
+)
diff --git a/tests/auto/widgets/widgets/qopenglwidget/qopenglwidget.pro b/tests/auto/widgets/widgets/qopenglwidget/qopenglwidget.pro
index 2d4cff9e10..792bbf4529 100644
--- a/tests/auto/widgets/widgets/qopenglwidget/qopenglwidget.pro
+++ b/tests/auto/widgets/widgets/qopenglwidget/qopenglwidget.pro
@@ -1,5 +1,5 @@
 CONFIG += testcase
 TARGET = tst_qopenglwidget
-QT += gui-private core-private testlib widgets
+QT += opengl opengl-private gui-private core-private testlib widgets openglwidgets
 
 SOURCES   += tst_qopenglwidget.cpp
diff --git a/tests/auto/widgets/widgets/qopenglwidget/tst_qopenglwidget.cpp b/tests/auto/widgets/widgets/qopenglwidget/tst_qopenglwidget.cpp
index 17a5fe2cd9..73423d958b 100644
--- a/tests/auto/widgets/widgets/qopenglwidget/tst_qopenglwidget.cpp
+++ b/tests/auto/widgets/widgets/qopenglwidget/tst_qopenglwidget.cpp
@@ -26,7 +26,7 @@
 **
 ****************************************************************************/
 
-#include <QtWidgets/QOpenGLWidget>
+#include <QtOpenGLWidgets/QOpenGLWidget>
 #include <QtGui/QOpenGLFunctions>
 #include <QtGui/QPainter>
 #include <QtGui/QScreen>
diff --git a/tests/auto/widgets/widgets/qplaintextedit/CMakeLists.txt b/tests/auto/widgets/widgets/qplaintextedit/CMakeLists.txt
new file mode 100644
index 0000000000..4106de04de
--- /dev/null
+++ b/tests/auto/widgets/widgets/qplaintextedit/CMakeLists.txt
@@ -0,0 +1,25 @@
+# Generated from qplaintextedit.pro.
+
+#####################################################################
+## tst_qplaintextedit Test:
+#####################################################################
+
+add_qt_test(tst_qplaintextedit
+    SOURCES
+        tst_qplaintextedit.cpp
+    INCLUDE_DIRECTORIES
+        ..
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::GuiPrivate
+        Qt::Widgets
+        Qt::WidgetsPrivate
+)
+
+## Scopes:
+#####################################################################
+
+extend_target(tst_qplaintextedit CONDITION APPLE_OSX
+    PUBLIC_LIBRARIES
+        ${FWAppKit}
+)
diff --git a/tests/auto/widgets/widgets/qprogressbar/CMakeLists.txt b/tests/auto/widgets/widgets/qprogressbar/CMakeLists.txt
new file mode 100644
index 0000000000..f8b3ac38d9
--- /dev/null
+++ b/tests/auto/widgets/widgets/qprogressbar/CMakeLists.txt
@@ -0,0 +1,13 @@
+# Generated from qprogressbar.pro.
+
+#####################################################################
+## tst_qprogressbar Test:
+#####################################################################
+
+add_qt_test(tst_qprogressbar
+    SOURCES
+        tst_qprogressbar.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+)
diff --git a/tests/auto/widgets/widgets/qpushbutton/CMakeLists.txt b/tests/auto/widgets/widgets/qpushbutton/CMakeLists.txt
new file mode 100644
index 0000000000..8d1300de79
--- /dev/null
+++ b/tests/auto/widgets/widgets/qpushbutton/CMakeLists.txt
@@ -0,0 +1,13 @@
+# Generated from qpushbutton.pro.
+
+#####################################################################
+## tst_qpushbutton Test:
+#####################################################################
+
+add_qt_test(tst_qpushbutton
+    SOURCES
+        tst_qpushbutton.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+)
diff --git a/tests/auto/widgets/widgets/qpushbutton/tst_qpushbutton.cpp b/tests/auto/widgets/widgets/qpushbutton/tst_qpushbutton.cpp
index 6f4838be7a..d0ed68c0c8 100644
--- a/tests/auto/widgets/widgets/qpushbutton/tst_qpushbutton.cpp
+++ b/tests/auto/widgets/widgets/qpushbutton/tst_qpushbutton.cpp
@@ -53,7 +53,9 @@ private slots:
     void getSetCheck();
     void autoRepeat();
     void pressed();
+#if QT_CONFIG(shortcut)
     void setAccel();
+#endif
     void isCheckable();
     void setDown();
     void popupCrash();
@@ -65,7 +67,9 @@ private slots:
     void defaultAndAutoDefault();
     void sizeHint_data();
     void sizeHint();
+#if QT_CONFIG(shortcut)
     void taskQTBUG_20191_shortcutWithKeypadModifer();
+#endif
     void emitReleasedAfterChange();
 
 protected slots:
@@ -125,8 +129,10 @@ void tst_QPushButton::init()
     testWidget->setDown( false );
     testWidget->setText("Test");
     testWidget->setEnabled( true );
+#if QT_CONFIG(shortcut)
     QKeySequence seq;
     testWidget->setShortcut( seq );
+#endif
 
     resetCounters();
 }
@@ -318,6 +324,8 @@ void tst_QPushButton::toggled()
     QVERIFY( click_count == 1 );
 }
 
+#if QT_CONFIG(shortcut)
+
 /*
     If we press an accelerator key we ONLY get a pressed signal and
     NOT a released or clicked signal.
@@ -349,6 +357,8 @@ void tst_QPushButton::setAccel()
     QTRY_VERIFY( !testWidget->isDown() );
 }
 
+#endif // QT_CONFIG(shortcut)
+
 void tst_QPushButton::animateClick()
 {
     QVERIFY( !testWidget->isDown() );
@@ -571,6 +581,8 @@ void tst_QPushButton::sizeHint()
     }
 }
 
+#if QT_CONFIG(shortcut)
+
 void tst_QPushButton::taskQTBUG_20191_shortcutWithKeypadModifer()
 {
     // setup a dialog with two buttons
@@ -617,6 +629,8 @@ void tst_QPushButton::taskQTBUG_20191_shortcutWithKeypadModifer()
     QCOMPARE(spy2.count(), 1);
 }
 
+#endif // QT_CONFIG(shortcut)
+
 void tst_QPushButton::emitReleasedAfterChange()
 {
     QPushButton *button1 = new QPushButton("A");
diff --git a/tests/auto/widgets/widgets/qradiobutton/CMakeLists.txt b/tests/auto/widgets/widgets/qradiobutton/CMakeLists.txt
new file mode 100644
index 0000000000..10db8a2db8
--- /dev/null
+++ b/tests/auto/widgets/widgets/qradiobutton/CMakeLists.txt
@@ -0,0 +1,13 @@
+# Generated from qradiobutton.pro.
+
+#####################################################################
+## tst_qradiobutton Test:
+#####################################################################
+
+add_qt_test(tst_qradiobutton
+    SOURCES
+        tst_qradiobutton.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+)
diff --git a/tests/auto/widgets/widgets/qradiobutton/tst_qradiobutton.cpp b/tests/auto/widgets/widgets/qradiobutton/tst_qradiobutton.cpp
index 7123acfdc3..5c7d3bf1e9 100644
--- a/tests/auto/widgets/widgets/qradiobutton/tst_qradiobutton.cpp
+++ b/tests/auto/widgets/widgets/qradiobutton/tst_qradiobutton.cpp
@@ -44,12 +44,16 @@ public:
     virtual ~tst_QRadioButton(){};
 
 private slots:
+#if QT_CONFIG(shortcut)
     void task190739_focus();
+#endif
     void minimumSizeHint();
 
 private:
 };
 
+#if QT_CONFIG(shortcut)
+
 void tst_QRadioButton::task190739_focus()
 {
     if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
@@ -84,6 +88,7 @@ void tst_QRadioButton::task190739_focus()
     QVERIFY(!radio1.hasFocus());
 }
 
+#endif // QT_CONFIG(shortcut)
 
 void tst_QRadioButton::minimumSizeHint()
 {
diff --git a/tests/auto/widgets/widgets/qscrollarea/CMakeLists.txt b/tests/auto/widgets/widgets/qscrollarea/CMakeLists.txt
new file mode 100644
index 0000000000..cdfb32e0a2
--- /dev/null
+++ b/tests/auto/widgets/widgets/qscrollarea/CMakeLists.txt
@@ -0,0 +1,13 @@
+# Generated from qscrollarea.pro.
+
+#####################################################################
+## tst_qscrollarea Test:
+#####################################################################
+
+add_qt_test(tst_qscrollarea
+    SOURCES
+        tst_qscrollarea.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+)
diff --git a/tests/auto/widgets/widgets/qscrollbar/CMakeLists.txt b/tests/auto/widgets/widgets/qscrollbar/CMakeLists.txt
new file mode 100644
index 0000000000..83d091755f
--- /dev/null
+++ b/tests/auto/widgets/widgets/qscrollbar/CMakeLists.txt
@@ -0,0 +1,14 @@
+# Generated from qscrollbar.pro.
+
+#####################################################################
+## tst_qscrollbar Test:
+#####################################################################
+
+add_qt_test(tst_qscrollbar
+    SOURCES
+        tst_qscrollbar.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::TestPrivate
+        Qt::Widgets
+)
diff --git a/tests/auto/widgets/widgets/qsizegrip/CMakeLists.txt b/tests/auto/widgets/widgets/qsizegrip/CMakeLists.txt
new file mode 100644
index 0000000000..d3b28797f2
--- /dev/null
+++ b/tests/auto/widgets/widgets/qsizegrip/CMakeLists.txt
@@ -0,0 +1,15 @@
+# Generated from qsizegrip.pro.
+
+#####################################################################
+## tst_qsizegrip Test:
+#####################################################################
+
+add_qt_test(tst_qsizegrip
+    SOURCES
+        tst_qsizegrip.cpp
+    INCLUDE_DIRECTORIES
+        .
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+)
diff --git a/tests/auto/widgets/widgets/qslider/CMakeLists.txt b/tests/auto/widgets/widgets/qslider/CMakeLists.txt
new file mode 100644
index 0000000000..583f12a1fb
--- /dev/null
+++ b/tests/auto/widgets/widgets/qslider/CMakeLists.txt
@@ -0,0 +1,13 @@
+# Generated from qslider.pro.
+
+#####################################################################
+## tst_qslider Test:
+#####################################################################
+
+add_qt_test(tst_qslider
+    SOURCES
+        tst_qslider.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+)
diff --git a/tests/auto/widgets/widgets/qspinbox/CMakeLists.txt b/tests/auto/widgets/widgets/qspinbox/CMakeLists.txt
new file mode 100644
index 0000000000..826de28cb4
--- /dev/null
+++ b/tests/auto/widgets/widgets/qspinbox/CMakeLists.txt
@@ -0,0 +1,13 @@
+# Generated from qspinbox.pro.
+
+#####################################################################
+## tst_qspinbox Test:
+#####################################################################
+
+add_qt_test(tst_qspinbox
+    SOURCES
+        tst_qspinbox.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+)
diff --git a/tests/auto/widgets/widgets/qspinbox/tst_qspinbox.cpp b/tests/auto/widgets/widgets/qspinbox/tst_qspinbox.cpp
index f8022559b2..a8b47ffc46 100644
--- a/tests/auto/widgets/widgets/qspinbox/tst_qspinbox.cpp
+++ b/tests/auto/widgets/widgets/qspinbox/tst_qspinbox.cpp
@@ -47,7 +47,9 @@
 #include <QLocale>
 #include <QDoubleSpinBox>
 #include <QVBoxLayout>
-#include <QKeySequence>
+#if QT_CONFIG(shortcut)
+#  include <QKeySequence>
+#endif
 #include <QStackedWidget>
 #include <QDebug>
 #include <QStyleOptionSpinBox>
@@ -173,7 +175,10 @@ private slots:
 
     void removeAll();
     void startWithDash();
+
+#if QT_CONFIG(shortcut)
     void undoRedo();
+#endif
 
     void specialValue();
     void textFromValue();
@@ -1025,6 +1030,8 @@ void tst_QSpinBox::startWithDash()
     QCOMPARE(spin.text(), QString("0"));
 }
 
+#if QT_CONFIG(shortcut)
+
 void tst_QSpinBox::undoRedo()
 {
     //test undo/redo feature (in conjunction with the "undoRedoEnabled" property)
@@ -1077,6 +1084,8 @@ void tst_QSpinBox::undoRedo()
     QVERIFY(!spin.lineEdit()->isRedoAvailable());
 }
 
+#endif // QT_CONFIG(shortcut)
+
 void tst_QSpinBox::specialValue()
 {
     if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
@@ -1821,9 +1830,9 @@ void tst_QSpinBox::stepModifierPressAndHold()
     stepModifierStyle->stepModifier = static_cast<Qt::KeyboardModifier>(stepModifier);
     spin.setStyle(stepModifierStyle.data());
 
-    QSignalSpy spy(&spin, QOverload<int>::of(&SpinBox::valueChanged));
+    QSignalSpy spy(&spin, &SpinBox::valueChanged);
     // TODO: remove debug output when QTBUG-69492 is fixed
-    connect(&spin, QOverload<int>::of(&SpinBox::valueChanged), [=]() {
+    connect(&spin, &SpinBox::valueChanged, [=]() {
         qDebug() << QTime::currentTime() << "valueChanged emitted";
     });
 
diff --git a/tests/auto/widgets/widgets/qsplashscreen/CMakeLists.txt b/tests/auto/widgets/widgets/qsplashscreen/CMakeLists.txt
new file mode 100644
index 0000000000..babe84f43e
--- /dev/null
+++ b/tests/auto/widgets/widgets/qsplashscreen/CMakeLists.txt
@@ -0,0 +1,13 @@
+# Generated from qsplashscreen.pro.
+
+#####################################################################
+## tst_qsplashscreen Test:
+#####################################################################
+
+add_qt_test(tst_qsplashscreen
+    SOURCES
+        tst_qsplashscreen.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+)
diff --git a/tests/auto/widgets/widgets/qsplitter/CMakeLists.txt b/tests/auto/widgets/widgets/qsplitter/CMakeLists.txt
new file mode 100644
index 0000000000..98c165f034
--- /dev/null
+++ b/tests/auto/widgets/widgets/qsplitter/CMakeLists.txt
@@ -0,0 +1,18 @@
+# Generated from qsplitter.pro.
+
+#####################################################################
+## tst_qsplitter Test:
+#####################################################################
+
+# Collect test data
+list(APPEND test_data "extradata.txt")
+list(APPEND test_data "setSizes3.dat")
+
+add_qt_test(tst_qsplitter
+    SOURCES
+        tst_qsplitter.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+    TESTDATA ${test_data}
+)
diff --git a/tests/auto/widgets/widgets/qstackedwidget/CMakeLists.txt b/tests/auto/widgets/widgets/qstackedwidget/CMakeLists.txt
new file mode 100644
index 0000000000..37807eb73a
--- /dev/null
+++ b/tests/auto/widgets/widgets/qstackedwidget/CMakeLists.txt
@@ -0,0 +1,13 @@
+# Generated from qstackedwidget.pro.
+
+#####################################################################
+## tst_qstackedwidget Test:
+#####################################################################
+
+add_qt_test(tst_qstackedwidget
+    SOURCES
+        tst_qstackedwidget.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+)
diff --git a/tests/auto/widgets/widgets/qstatusbar/CMakeLists.txt b/tests/auto/widgets/widgets/qstatusbar/CMakeLists.txt
new file mode 100644
index 0000000000..56f3c960fd
--- /dev/null
+++ b/tests/auto/widgets/widgets/qstatusbar/CMakeLists.txt
@@ -0,0 +1,13 @@
+# Generated from qstatusbar.pro.
+
+#####################################################################
+## tst_qstatusbar Test:
+#####################################################################
+
+add_qt_test(tst_qstatusbar
+    SOURCES
+        tst_qstatusbar.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+)
diff --git a/tests/auto/widgets/widgets/qtabbar/CMakeLists.txt b/tests/auto/widgets/widgets/qtabbar/CMakeLists.txt
new file mode 100644
index 0000000000..d23d23d88f
--- /dev/null
+++ b/tests/auto/widgets/widgets/qtabbar/CMakeLists.txt
@@ -0,0 +1,13 @@
+# Generated from qtabbar.pro.
+
+#####################################################################
+## tst_qtabbar Test:
+#####################################################################
+
+add_qt_test(tst_qtabbar
+    SOURCES
+        tst_qtabbar.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+)
diff --git a/tests/auto/widgets/widgets/qtabwidget/CMakeLists.txt b/tests/auto/widgets/widgets/qtabwidget/CMakeLists.txt
new file mode 100644
index 0000000000..9bd0018082
--- /dev/null
+++ b/tests/auto/widgets/widgets/qtabwidget/CMakeLists.txt
@@ -0,0 +1,24 @@
+# Generated from qtabwidget.pro.
+
+#####################################################################
+## tst_qtabwidget Test:
+#####################################################################
+
+add_qt_test(tst_qtabwidget
+    SOURCES
+        tst_qtabwidget.cpp
+    INCLUDE_DIRECTORIES
+        ..
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+        Qt::WidgetsPrivate
+)
+
+## Scopes:
+#####################################################################
+
+extend_target(tst_qtabwidget CONDITION WIN32 AND NOT WINRT
+    PUBLIC_LIBRARIES
+        user32
+)
diff --git a/tests/auto/widgets/widgets/qtextbrowser/CMakeLists.txt b/tests/auto/widgets/widgets/qtextbrowser/CMakeLists.txt
new file mode 100644
index 0000000000..503dc32a83
--- /dev/null
+++ b/tests/auto/widgets/widgets/qtextbrowser/CMakeLists.txt
@@ -0,0 +1,37 @@
+# Generated from qtextbrowser.pro.
+
+#####################################################################
+## tst_qtextbrowser Test:
+#####################################################################
+
+# Collect test data
+file(GLOB_RECURSE test_data_glob
+    RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+    *.html)
+list(APPEND test_data ${test_data_glob})
+file(GLOB_RECURSE test_data_glob
+    RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+    *.md)
+list(APPEND test_data ${test_data_glob})
+list(APPEND test_data "markdown.really")
+file(GLOB_RECURSE test_data_glob
+    RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+    subdir/*)
+list(APPEND test_data ${test_data_glob})
+
+add_qt_test(tst_qtextbrowser
+    SOURCES
+        tst_qtextbrowser.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+    TESTDATA ${test_data}
+)
+
+## Scopes:
+#####################################################################
+
+extend_target(tst_qtextbrowser CONDITION builtin_testdata
+    DEFINES
+        BUILTIN_TESTDATA
+)
diff --git a/tests/auto/widgets/widgets/qtextedit/CMakeLists.txt b/tests/auto/widgets/widgets/qtextedit/CMakeLists.txt
new file mode 100644
index 0000000000..61641707b9
--- /dev/null
+++ b/tests/auto/widgets/widgets/qtextedit/CMakeLists.txt
@@ -0,0 +1,28 @@
+# Generated from qtextedit.pro.
+
+#####################################################################
+## tst_qtextedit Test:
+#####################################################################
+
+# Collect test data
+list(APPEND test_data "fullWidthSelection")
+
+add_qt_test(tst_qtextedit
+    SOURCES
+        tst_qtextedit.cpp
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::Gui
+        Qt::GuiPrivate
+        Qt::Widgets
+        Qt::WidgetsPrivate
+    TESTDATA ${test_data}
+)
+
+## Scopes:
+#####################################################################
+
+extend_target(tst_qtextedit CONDITION APPLE_OSX
+    PUBLIC_LIBRARIES
+        ${FWAppKit}
+)
diff --git a/tests/auto/widgets/widgets/qtextedit/tst_qtextedit.cpp b/tests/auto/widgets/widgets/qtextedit/tst_qtextedit.cpp
index 485a0b0f93..bd287eb225 100644
--- a/tests/auto/widgets/widgets/qtextedit/tst_qtextedit.cpp
+++ b/tests/auto/widgets/widgets/qtextedit/tst_qtextedit.cpp
@@ -2136,7 +2136,7 @@ void tst_QTextEdit::compareWidgetAndImage(QTextEdit &widget, const QString &imag
     QCOMPARE(image.depth(), 32);
     QCOMPARE(original.depth(), image.depth());
 
-    const int bytesPerLine = image.bytesPerLine();
+    const qsizetype bytesPerLine = image.bytesPerLine();
     const int width = image.width();
     const int height = image.height();
 
diff --git a/tests/auto/widgets/widgets/qtoolbar/CMakeLists.txt b/tests/auto/widgets/widgets/qtoolbar/CMakeLists.txt
new file mode 100644
index 0000000000..d3aef03fa1
--- /dev/null
+++ b/tests/auto/widgets/widgets/qtoolbar/CMakeLists.txt
@@ -0,0 +1,15 @@
+# Generated from qtoolbar.pro.
+
+#####################################################################
+## tst_qtoolbar Test:
+#####################################################################
+
+add_qt_test(tst_qtoolbar
+    SOURCES
+        tst_qtoolbar.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::GuiPrivate
+        Qt::Widgets
+        Qt::WidgetsPrivate
+)
diff --git a/tests/auto/widgets/widgets/qtoolbar/tst_qtoolbar.cpp b/tests/auto/widgets/widgets/qtoolbar/tst_qtoolbar.cpp
index 61252831ed..1d5ac7c819 100644
--- a/tests/auto/widgets/widgets/qtoolbar/tst_qtoolbar.cpp
+++ b/tests/auto/widgets/widgets/qtoolbar/tst_qtoolbar.cpp
@@ -40,7 +40,9 @@
 #include <qwidgetaction.h>
 #include <qtoolbutton.h>
 #include <qlineedit.h>
-#include <qkeysequence.h>
+#if QT_CONFIG(shortcut)
+#  include <qkeysequence.h>
+#endif
 #include <qmenu.h>
 #include <qlabel.h>
 #include <private/qtoolbarextension_p.h>
diff --git a/tests/auto/widgets/widgets/qtoolbox/CMakeLists.txt b/tests/auto/widgets/widgets/qtoolbox/CMakeLists.txt
new file mode 100644
index 0000000000..dc3e5d016c
--- /dev/null
+++ b/tests/auto/widgets/widgets/qtoolbox/CMakeLists.txt
@@ -0,0 +1,13 @@
+# Generated from qtoolbox.pro.
+
+#####################################################################
+## tst_qtoolbox Test:
+#####################################################################
+
+add_qt_test(tst_qtoolbox
+    SOURCES
+        tst_qtoolbox.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+)
diff --git a/tests/auto/widgets/widgets/qtoolbutton/CMakeLists.txt b/tests/auto/widgets/widgets/qtoolbutton/CMakeLists.txt
new file mode 100644
index 0000000000..ae36488341
--- /dev/null
+++ b/tests/auto/widgets/widgets/qtoolbutton/CMakeLists.txt
@@ -0,0 +1,13 @@
+# Generated from qtoolbutton.pro.
+
+#####################################################################
+## tst_qtoolbutton Test:
+#####################################################################
+
+add_qt_test(tst_qtoolbutton
+    SOURCES
+        tst_qtoolbutton.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+)
diff --git a/tests/auto/widgets/widgets/widgets.pro b/tests/auto/widgets/widgets/widgets.pro
index c6325aac15..66950fa85a 100644
--- a/tests/auto/widgets/widgets/widgets.pro
+++ b/tests/auto/widgets/widgets/widgets.pro
@@ -47,6 +47,9 @@ SUBDIRS=\
    qtoolbox \
    qtoolbutton \
 
+!qtConfig(shortcut): SUBDIRS -= \
+   qkeysequenceedit
+
 # The following tests depend on private API:
 !qtConfig(private_tests): SUBDIRS -= \
            qabstractspinbox \
diff --git a/tests/auto/xml/CMakeLists.txt b/tests/auto/xml/CMakeLists.txt
new file mode 100644
index 0000000000..703cba344d
--- /dev/null
+++ b/tests/auto/xml/CMakeLists.txt
@@ -0,0 +1,4 @@
+# Generated from xml.pro.
+
+add_subdirectory(dom)
+add_subdirectory(sax)
diff --git a/tests/auto/xml/dom/CMakeLists.txt b/tests/auto/xml/dom/CMakeLists.txt
new file mode 100644
index 0000000000..08a7621e88
--- /dev/null
+++ b/tests/auto/xml/dom/CMakeLists.txt
@@ -0,0 +1,3 @@
+# Generated from dom.pro.
+
+add_subdirectory(qdom)
diff --git a/tests/auto/xml/dom/qdom/CMakeLists.txt b/tests/auto/xml/dom/qdom/CMakeLists.txt
new file mode 100644
index 0000000000..be70ec08cc
--- /dev/null
+++ b/tests/auto/xml/dom/qdom/CMakeLists.txt
@@ -0,0 +1,21 @@
+# Generated from qdom.pro.
+
+#####################################################################
+## tst_qdom Test:
+#####################################################################
+
+# Collect test data
+file(GLOB_RECURSE test_data_glob
+    RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+    testdata/*)
+list(APPEND test_data ${test_data_glob})
+list(APPEND test_data "doubleNamespaces.xml")
+list(APPEND test_data "umlaut.xml")
+
+add_qt_test(tst_qdom
+    SOURCES
+        tst_qdom.cpp
+    PUBLIC_LIBRARIES
+        Qt::Xml
+    TESTDATA ${test_data}
+)
diff --git a/tests/auto/xml/dom/qdom/tst_qdom.cpp b/tests/auto/xml/dom/qdom/tst_qdom.cpp
index a2a5b22cad..9cb06f5185 100644
--- a/tests/auto/xml/dom/qdom/tst_qdom.cpp
+++ b/tests/auto/xml/dom/qdom/tst_qdom.cpp
@@ -33,7 +33,7 @@
 #include <QDebug>
 #include <QFile>
 #include <QList>
-#include <QRegExp>
+#include <QRegularExpression>
 #include <QTextStream>
 #include <QtTest/QtTest>
 #include <QtXml>
@@ -517,10 +517,10 @@ void tst_QDom::save_data()
     QTest::addColumn<int>("indent");
     QTest::addColumn<QString>("res");
 
-    QTest::newRow( "01" ) << doc01 << 0 << QString(doc01).replace( QRegExp(" "), "" );
+    QTest::newRow( "01" ) << doc01 << 0 << QString(doc01).replace( QRegularExpression(" "), "" );
     QTest::newRow( "02" ) << doc01 << 1 << doc01;
-    QTest::newRow( "03" ) << doc01 << 2 << QString(doc01).replace( QRegExp(" "), "  " );
-    QTest::newRow( "04" ) << doc01 << 10 << QString(doc01).replace( QRegExp(" "), "          " );
+    QTest::newRow( "03" ) << doc01 << 2 << QString(doc01).replace( QRegularExpression(" "), "  " );
+    QTest::newRow( "04" ) << doc01 << 10 << QString(doc01).replace( QRegularExpression(" "), "          " );
 }
 
 void tst_QDom::save()
diff --git a/tests/auto/xml/sax/CMakeLists.txt b/tests/auto/xml/sax/CMakeLists.txt
new file mode 100644
index 0000000000..dd826d5e4f
--- /dev/null
+++ b/tests/auto/xml/sax/CMakeLists.txt
@@ -0,0 +1,7 @@
+# Generated from sax.pro.
+
+add_subdirectory(qxml)
+if(TARGET Qt::Network)
+    add_subdirectory(qxmlinputsource)
+    add_subdirectory(qxmlsimplereader)
+endif()
diff --git a/tests/auto/xml/sax/qxml/CMakeLists.txt b/tests/auto/xml/sax/qxml/CMakeLists.txt
new file mode 100644
index 0000000000..bfbf7fe979
--- /dev/null
+++ b/tests/auto/xml/sax/qxml/CMakeLists.txt
@@ -0,0 +1,16 @@
+# Generated from qxml.pro.
+
+#####################################################################
+## tst_qxml Test:
+#####################################################################
+
+# Collect test data
+list(APPEND test_data "0x010D.xml")
+
+add_qt_test(tst_qxml
+    SOURCES
+        tst_qxml.cpp
+    PUBLIC_LIBRARIES
+        Qt::Xml
+    TESTDATA ${test_data}
+)
diff --git a/tests/auto/xml/sax/qxmlinputsource/CMakeLists.txt b/tests/auto/xml/sax/qxmlinputsource/CMakeLists.txt
new file mode 100644
index 0000000000..48ba5f6e3f
--- /dev/null
+++ b/tests/auto/xml/sax/qxmlinputsource/CMakeLists.txt
@@ -0,0 +1,13 @@
+# Generated from qxmlinputsource.pro.
+
+#####################################################################
+## tst_qxmlinputsource Test:
+#####################################################################
+
+add_qt_test(tst_qxmlinputsource
+    SOURCES
+        tst_qxmlinputsource.cpp
+    PUBLIC_LIBRARIES
+        Qt::Network
+        Qt::Xml
+)
diff --git a/tests/auto/xml/sax/qxmlsimplereader/CMakeLists.txt b/tests/auto/xml/sax/qxmlsimplereader/CMakeLists.txt
new file mode 100644
index 0000000000..19fa0a002f
--- /dev/null
+++ b/tests/auto/xml/sax/qxmlsimplereader/CMakeLists.txt
@@ -0,0 +1,27 @@
+# Generated from qxmlsimplereader.pro.
+
+#####################################################################
+## tst_qxmlsimplereader Test:
+#####################################################################
+
+# Collect test data
+file(GLOB_RECURSE test_data_glob
+    RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+    encodings/*)
+list(APPEND test_data ${test_data_glob})
+file(GLOB_RECURSE test_data_glob
+    RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+    xmldocs/*)
+list(APPEND test_data ${test_data_glob})
+
+add_qt_test(tst_qxmlsimplereader
+    SOURCES
+        parser/parser.cpp parser/parser.h
+        tst_qxmlsimplereader.cpp
+    INCLUDE_DIRECTORIES
+        parser
+    PUBLIC_LIBRARIES
+        Qt::Network
+        Qt::Xml
+    TESTDATA ${test_data}
+)
diff --git a/tests/auto/xml/sax/qxmlsimplereader/parser/CMakeLists.txt b/tests/auto/xml/sax/qxmlsimplereader/parser/CMakeLists.txt
new file mode 100644
index 0000000000..6ffb17ac0f
--- /dev/null
+++ b/tests/auto/xml/sax/qxmlsimplereader/parser/CMakeLists.txt
@@ -0,0 +1,19 @@
+# special case skip regeneration
+
+cmake_minimum_required(VERSION 3.14.0)
+
+project(Parser CXX)
+find_package(Qt6 REQUIRED COMPONENTS Core Gui Xml)
+
+add_executable(parser)
+
+target_sources(parser PRIVATE
+    main.cpp
+    parser.cpp
+    parser.h
+)
+
+target_link_libraries(parser PRIVATE
+    Qt::Gui
+    Qt::Xml
+)
diff --git a/tests/baselineserver/shared/baselineprotocol.cpp b/tests/baselineserver/shared/baselineprotocol.cpp
index aa496d6c54..16915b7c02 100644
--- a/tests/baselineserver/shared/baselineprotocol.cpp
+++ b/tests/baselineserver/shared/baselineprotocol.cpp
@@ -223,8 +223,8 @@ quint32       *pb);       /* IN: more seed OUT: secondary hash value */
 quint64 ImageItem::computeChecksum(const QImage &image)
 {
     QImage img(image);
-    const int bpl = img.bytesPerLine();
-    const int padBytes = bpl - (img.width() * img.depth() / 8);
+    const qsizetype bpl = img.bytesPerLine();
+    const int padBytes = bpl - (qsizetype(img.width()) * img.depth() / 8);
     if (padBytes) {
         uchar *p = img.bits() + bpl - padBytes;
         const int h = img.height();
diff --git a/tests/benchmarks/CMakeLists.txt b/tests/benchmarks/CMakeLists.txt
new file mode 100644
index 0000000000..a59ba35e50
--- /dev/null
+++ b/tests/benchmarks/CMakeLists.txt
@@ -0,0 +1,19 @@
+# Generated from benchmarks.pro.
+
+add_subdirectory(corelib)
+add_subdirectory(sql)
+if(TARGET Qt::DBus)
+    add_subdirectory(dbus)
+endif()
+if(TARGET Qt::Gui)
+    add_subdirectory(gui)
+endif()
+if(TARGET Qt::Network)
+    add_subdirectory(network)
+endif()
+if(TARGET Qt::Test)
+    add_subdirectory(testlib)
+endif()
+if(TARGET Qt::Widgets)
+    add_subdirectory(widgets)
+endif()
diff --git a/tests/benchmarks/corelib/CMakeLists.txt b/tests/benchmarks/corelib/CMakeLists.txt
new file mode 100644
index 0000000000..3414c39ef8
--- /dev/null
+++ b/tests/benchmarks/corelib/CMakeLists.txt
@@ -0,0 +1,12 @@
+# Generated from corelib.pro.
+
+add_subdirectory(io)
+add_subdirectory(json)
+add_subdirectory(mimetypes)
+add_subdirectory(kernel)
+add_subdirectory(text)
+add_subdirectory(thread)
+add_subdirectory(time)
+add_subdirectory(tools)
+add_subdirectory(codecs)
+add_subdirectory(plugin)
diff --git a/tests/benchmarks/corelib/codecs/CMakeLists.txt b/tests/benchmarks/corelib/codecs/CMakeLists.txt
new file mode 100644
index 0000000000..56f8edcc9e
--- /dev/null
+++ b/tests/benchmarks/corelib/codecs/CMakeLists.txt
@@ -0,0 +1,3 @@
+# Generated from codecs.pro.
+
+add_subdirectory(qtextcodec)
diff --git a/tests/benchmarks/corelib/codecs/qtextcodec/CMakeLists.txt b/tests/benchmarks/corelib/codecs/qtextcodec/CMakeLists.txt
new file mode 100644
index 0000000000..ea6ed8519b
--- /dev/null
+++ b/tests/benchmarks/corelib/codecs/qtextcodec/CMakeLists.txt
@@ -0,0 +1,15 @@
+# Generated from qtextcodec.pro.
+
+#####################################################################
+## tst_bench_qtextcodec Binary:
+#####################################################################
+
+add_qt_benchmark(tst_bench_qtextcodec
+    SOURCES
+        main.cpp
+    PUBLIC_LIBRARIES
+        Qt::Test
+)
+
+#### Keys ignored in scope 1:.:.:qtextcodec.pro:<TRUE>:
+# TESTDATA = "utf-8.txt"
diff --git a/tests/benchmarks/corelib/io/CMakeLists.txt b/tests/benchmarks/corelib/io/CMakeLists.txt
new file mode 100644
index 0000000000..3419c4a28c
--- /dev/null
+++ b/tests/benchmarks/corelib/io/CMakeLists.txt
@@ -0,0 +1,12 @@
+# Generated from io.pro.
+
+add_subdirectory(qdir)
+add_subdirectory(qdiriterator)
+add_subdirectory(qfile)
+add_subdirectory(qfileinfo)
+add_subdirectory(qiodevice)
+add_subdirectory(qtemporaryfile)
+add_subdirectory(qtextstream)
+if(QT_FEATURE_process)
+    add_subdirectory(qprocess)
+endif()
diff --git a/tests/benchmarks/corelib/io/qdir/10000/CMakeLists.txt b/tests/benchmarks/corelib/io/qdir/10000/CMakeLists.txt
new file mode 100644
index 0000000000..51f603b595
--- /dev/null
+++ b/tests/benchmarks/corelib/io/qdir/10000/CMakeLists.txt
@@ -0,0 +1,15 @@
+# Generated from 10000.pro.
+
+#####################################################################
+## tst_bench_qdir_10000 Binary:
+#####################################################################
+
+add_qt_benchmark(tst_bench_qdir_10000
+    SOURCES
+        bench_qdir_10000.cpp
+    PUBLIC_LIBRARIES
+        Qt::Test
+)
+
+#### Keys ignored in scope 1:.:.:10000.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/benchmarks/corelib/io/qdir/CMakeLists.txt b/tests/benchmarks/corelib/io/qdir/CMakeLists.txt
new file mode 100644
index 0000000000..10185014fa
--- /dev/null
+++ b/tests/benchmarks/corelib/io/qdir/CMakeLists.txt
@@ -0,0 +1,3 @@
+# Generated from qdir.pro.
+
+add_subdirectory(10000)
diff --git a/tests/benchmarks/corelib/io/qdir/tree/CMakeLists.txt b/tests/benchmarks/corelib/io/qdir/tree/CMakeLists.txt
new file mode 100644
index 0000000000..e3102a3389
--- /dev/null
+++ b/tests/benchmarks/corelib/io/qdir/tree/CMakeLists.txt
@@ -0,0 +1,28 @@
+# Generated from tree.pro.
+
+#####################################################################
+## bench_qdir_tree Binary:
+#####################################################################
+
+add_qt_benchmark(bench_qdir_tree
+    SOURCES
+        bench_qdir_tree.cpp
+    PUBLIC_LIBRARIES
+        Qt::Test
+)
+
+# Resources:
+set(bench_qdir_tree_resource_files
+    "4.6.0-list.txt"
+)
+
+add_qt_resource(bench_qdir_tree "bench_qdir_tree"
+    PREFIX
+        "/"
+    FILES
+        ${bench_qdir_tree_resource_files}
+)
+
+
+#### Keys ignored in scope 1:.:.:tree.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/benchmarks/corelib/io/qdiriterator/CMakeLists.txt b/tests/benchmarks/corelib/io/qdiriterator/CMakeLists.txt
new file mode 100644
index 0000000000..b1e86861b6
--- /dev/null
+++ b/tests/benchmarks/corelib/io/qdiriterator/CMakeLists.txt
@@ -0,0 +1,21 @@
+# Generated from qdiriterator.pro.
+
+#####################################################################
+## tst_bench_qdiriterator Binary:
+#####################################################################
+
+add_qt_benchmark(tst_bench_qdiriterator
+    SOURCES
+        main.cpp
+        qfilesystemiterator.cpp qfilesystemiterator.h
+    PUBLIC_LIBRARIES
+        Qt::Test
+)
+
+## Scopes:
+#####################################################################
+
+extend_target(tst_bench_qdiriterator CONDITION (QT_FEATURE_cxx17_filesystem) AND (GCC AND (QMAKE_GCC_MAJOR_VERSION LESS 9))
+    LINK_OPTIONS
+        "-lstdc++fs"
+)
diff --git a/tests/benchmarks/corelib/io/qdiriterator/main.cpp b/tests/benchmarks/corelib/io/qdiriterator/main.cpp
index eae752d99a..5b10a4a689 100644
--- a/tests/benchmarks/corelib/io/qdiriterator/main.cpp
+++ b/tests/benchmarks/corelib/io/qdiriterator/main.cpp
@@ -44,9 +44,15 @@
 
 #include "qfilesystemiterator.h"
 
+#if QT_CONFIG(cxx17_filesystem)
+#include <filesystem>
+#endif
+
 class tst_qdiriterator : public QObject
 {
     Q_OBJECT
+
+    void data();
 private slots:
     void posix();
     void posix_data() { data(); }
@@ -54,7 +60,8 @@ private slots:
     void diriterator_data() { data(); }
     void fsiterator();
     void fsiterator_data() { data(); }
-    void data();
+    void stdRecursiveDirectoryIterator();
+    void stdRecursiveDirectoryIterator_data() { data(); }
 };
 
 
@@ -235,6 +242,28 @@ void tst_qdiriterator::fsiterator()
     qDebug() << count;
 }
 
+void tst_qdiriterator::stdRecursiveDirectoryIterator()
+{
+#if QT_CONFIG(cxx17_filesystem)
+    QFETCH(QByteArray, dirpath);
+
+    int count = 0;
+
+    QBENCHMARK {
+        int c = 0;
+        for (auto obj : std::filesystem::recursive_directory_iterator(dirpath.data())) {
+            if (obj.is_directory())
+                continue;
+            c++;
+        }
+        count = c;
+    }
+    qDebug() << count;
+#else
+    QSKIP("Not supported.");
+#endif
+}
+
 QTEST_MAIN(tst_qdiriterator)
 
 #include "main.moc"
diff --git a/tests/benchmarks/corelib/io/qdiriterator/qdiriterator.pro b/tests/benchmarks/corelib/io/qdiriterator/qdiriterator.pro
index 061b22a5d1..609a578321 100644
--- a/tests/benchmarks/corelib/io/qdiriterator/qdiriterator.pro
+++ b/tests/benchmarks/corelib/io/qdiriterator/qdiriterator.pro
@@ -3,6 +3,12 @@ TARGET = tst_bench_qdiriterator
 QT = core testlib
 
 CONFIG += release
+# Enable c++17 support for std::filesystem
+qtConfig(cxx17_filesystem) {
+    CONFIG += c++17
+    gcc:lessThan(QMAKE_GCC_MAJOR_VERSION, 9): \
+        QMAKE_LFLAGS += -lstdc++fs
+}
 
 SOURCES += main.cpp qfilesystemiterator.cpp
 HEADERS += qfilesystemiterator.h
diff --git a/tests/benchmarks/corelib/io/qfile/CMakeLists.txt b/tests/benchmarks/corelib/io/qfile/CMakeLists.txt
new file mode 100644
index 0000000000..7d1e19d75a
--- /dev/null
+++ b/tests/benchmarks/corelib/io/qfile/CMakeLists.txt
@@ -0,0 +1,24 @@
+# Generated from qfile.pro.
+
+#####################################################################
+## tst_bench_qfile Binary:
+#####################################################################
+
+add_qt_benchmark(tst_bench_qfile
+    SOURCES
+        main.cpp
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::Test
+)
+
+#### Keys ignored in scope 1:.:.:qfile.pro:<TRUE>:
+# TEMPLATE = "app"
+
+## Scopes:
+#####################################################################
+
+extend_target(tst_bench_qfile CONDITION WIN32
+    DEFINES
+        _CRT_SECURE_NO_WARNINGS
+)
diff --git a/tests/benchmarks/corelib/io/qfileinfo/CMakeLists.txt b/tests/benchmarks/corelib/io/qfileinfo/CMakeLists.txt
new file mode 100644
index 0000000000..195419f52e
--- /dev/null
+++ b/tests/benchmarks/corelib/io/qfileinfo/CMakeLists.txt
@@ -0,0 +1,16 @@
+# Generated from qfileinfo.pro.
+
+#####################################################################
+## tst_bench_qfileinfo Binary:
+#####################################################################
+
+add_qt_benchmark(tst_bench_qfileinfo
+    SOURCES
+        main.cpp
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::Test
+)
+
+#### Keys ignored in scope 1:.:.:qfileinfo.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/benchmarks/corelib/io/qiodevice/CMakeLists.txt b/tests/benchmarks/corelib/io/qiodevice/CMakeLists.txt
new file mode 100644
index 0000000000..7663bdb99d
--- /dev/null
+++ b/tests/benchmarks/corelib/io/qiodevice/CMakeLists.txt
@@ -0,0 +1,15 @@
+# Generated from qiodevice.pro.
+
+#####################################################################
+## tst_bench_qiodevice Binary:
+#####################################################################
+
+add_qt_benchmark(tst_bench_qiodevice
+    SOURCES
+        main.cpp
+    PUBLIC_LIBRARIES
+        Qt::Test
+)
+
+#### Keys ignored in scope 1:.:.:qiodevice.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/benchmarks/corelib/io/qprocess/CMakeLists.txt b/tests/benchmarks/corelib/io/qprocess/CMakeLists.txt
new file mode 100644
index 0000000000..d599539142
--- /dev/null
+++ b/tests/benchmarks/corelib/io/qprocess/CMakeLists.txt
@@ -0,0 +1,4 @@
+# Generated from qprocess.pro.
+
+add_subdirectory(testProcessLoopback)
+add_subdirectory(test)
diff --git a/tests/benchmarks/corelib/io/qprocess/test/CMakeLists.txt b/tests/benchmarks/corelib/io/qprocess/test/CMakeLists.txt
new file mode 100644
index 0000000000..00bbe74c2d
--- /dev/null
+++ b/tests/benchmarks/corelib/io/qprocess/test/CMakeLists.txt
@@ -0,0 +1,13 @@
+# Generated from test.pro.
+
+#####################################################################
+## tst_bench_qprocess Binary:
+#####################################################################
+
+add_qt_benchmark(tst_bench_qprocess
+    SOURCES
+        ../tst_bench_qprocess.cpp
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::Test
+)
diff --git a/tests/benchmarks/corelib/io/qprocess/testProcessLoopback/CMakeLists.txt b/tests/benchmarks/corelib/io/qprocess/testProcessLoopback/CMakeLists.txt
new file mode 100644
index 0000000000..44b18a4826
--- /dev/null
+++ b/tests/benchmarks/corelib/io/qprocess/testProcessLoopback/CMakeLists.txt
@@ -0,0 +1,21 @@
+# Generated from testProcessLoopback.pro.
+
+#####################################################################
+## testProcessLoopback Binary:
+#####################################################################
+
+add_qt_benchmark(testProcessLoopback
+    OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
+    SOURCES
+        main.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+)
+
+## Scopes:
+#####################################################################
+
+extend_target(testProcessLoopback CONDITION WINRT
+    LINK_OPTIONS
+        "/ENTRY:mainCRTStartup"
+)
diff --git a/tests/benchmarks/corelib/io/qtemporaryfile/CMakeLists.txt b/tests/benchmarks/corelib/io/qtemporaryfile/CMakeLists.txt
new file mode 100644
index 0000000000..82b885bb17
--- /dev/null
+++ b/tests/benchmarks/corelib/io/qtemporaryfile/CMakeLists.txt
@@ -0,0 +1,15 @@
+# Generated from qtemporaryfile.pro.
+
+#####################################################################
+## tst_bench_qtemporaryfile Binary:
+#####################################################################
+
+add_qt_benchmark(tst_bench_qtemporaryfile
+    SOURCES
+        main.cpp
+    PUBLIC_LIBRARIES
+        Qt::Test
+)
+
+#### Keys ignored in scope 1:.:.:qtemporaryfile.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/benchmarks/corelib/io/qtextstream/CMakeLists.txt b/tests/benchmarks/corelib/io/qtextstream/CMakeLists.txt
new file mode 100644
index 0000000000..6dd11f1bbb
--- /dev/null
+++ b/tests/benchmarks/corelib/io/qtextstream/CMakeLists.txt
@@ -0,0 +1,15 @@
+# Generated from qtextstream.pro.
+
+#####################################################################
+## tst_bench_qtextstream Binary:
+#####################################################################
+
+add_qt_benchmark(tst_bench_qtextstream
+    SOURCES
+        main.cpp
+    PUBLIC_LIBRARIES
+        Qt::Test
+)
+
+#### Keys ignored in scope 1:.:.:qtextstream.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/benchmarks/corelib/io/qurl/CMakeLists.txt b/tests/benchmarks/corelib/io/qurl/CMakeLists.txt
new file mode 100644
index 0000000000..26d98b7eb4
--- /dev/null
+++ b/tests/benchmarks/corelib/io/qurl/CMakeLists.txt
@@ -0,0 +1,23 @@
+# Generated from qurl.pro.
+
+#####################################################################
+## tst_qurl Binary:
+#####################################################################
+
+add_qt_benchmark(tst_qurl
+    SOURCES
+        main.cpp
+    PUBLIC_LIBRARIES
+        Qt::Test
+)
+
+#### Keys ignored in scope 1:.:.:qurl.pro:<TRUE>:
+# TEMPLATE = "app"
+
+## Scopes:
+#####################################################################
+
+extend_target(tst_qurl CONDITION WIN32
+    DEFINES
+        _CRT_SECURE_NO_WARNINGS
+)
diff --git a/tests/benchmarks/corelib/json/CMakeLists.txt b/tests/benchmarks/corelib/json/CMakeLists.txt
new file mode 100644
index 0000000000..312cae8a45
--- /dev/null
+++ b/tests/benchmarks/corelib/json/CMakeLists.txt
@@ -0,0 +1,15 @@
+# Generated from json.pro.
+
+#####################################################################
+## tst_bench_qtbinaryjson Binary:
+#####################################################################
+
+add_qt_benchmark(tst_bench_qtbinaryjson
+    SOURCES
+        tst_bench_qtbinaryjson.cpp
+    PUBLIC_LIBRARIES
+        Qt::Test
+)
+
+#### Keys ignored in scope 1:.:.:json.pro:<TRUE>:
+# TESTDATA = "numbers.json" "test.json"
diff --git a/tests/benchmarks/corelib/kernel/CMakeLists.txt b/tests/benchmarks/corelib/kernel/CMakeLists.txt
new file mode 100644
index 0000000000..2b41ea30f7
--- /dev/null
+++ b/tests/benchmarks/corelib/kernel/CMakeLists.txt
@@ -0,0 +1,11 @@
+# Generated from kernel.pro.
+
+add_subdirectory(events)
+add_subdirectory(qmetatype)
+add_subdirectory(qvariant)
+add_subdirectory(qcoreapplication)
+add_subdirectory(qtimer_vs_qmetaobject)
+if(TARGET Qt::Widgets)
+    add_subdirectory(qmetaobject)
+    add_subdirectory(qobject)
+endif()
diff --git a/tests/benchmarks/corelib/kernel/events/CMakeLists.txt b/tests/benchmarks/corelib/kernel/events/CMakeLists.txt
new file mode 100644
index 0000000000..1e35891126
--- /dev/null
+++ b/tests/benchmarks/corelib/kernel/events/CMakeLists.txt
@@ -0,0 +1,15 @@
+# Generated from events.pro.
+
+#####################################################################
+## tst_bench_events Binary:
+#####################################################################
+
+add_qt_benchmark(tst_bench_events
+    SOURCES
+        main.cpp
+    PUBLIC_LIBRARIES
+        Qt::Test
+)
+
+#### Keys ignored in scope 1:.:.:events.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/benchmarks/corelib/kernel/qcoreapplication/CMakeLists.txt b/tests/benchmarks/corelib/kernel/qcoreapplication/CMakeLists.txt
new file mode 100644
index 0000000000..173b3b9077
--- /dev/null
+++ b/tests/benchmarks/corelib/kernel/qcoreapplication/CMakeLists.txt
@@ -0,0 +1,15 @@
+# Generated from qcoreapplication.pro.
+
+#####################################################################
+## tst_bench_qcoreapplication Binary:
+#####################################################################
+
+add_qt_benchmark(tst_bench_qcoreapplication
+    SOURCES
+        main.cpp
+    PUBLIC_LIBRARIES
+        Qt::Test
+)
+
+#### Keys ignored in scope 1:.:.:qcoreapplication.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/benchmarks/corelib/kernel/qmetaobject/CMakeLists.txt b/tests/benchmarks/corelib/kernel/qmetaobject/CMakeLists.txt
new file mode 100644
index 0000000000..e6da0721d3
--- /dev/null
+++ b/tests/benchmarks/corelib/kernel/qmetaobject/CMakeLists.txt
@@ -0,0 +1,17 @@
+# Generated from qmetaobject.pro.
+
+#####################################################################
+## tst_bench_qmetaobject Binary:
+#####################################################################
+
+add_qt_benchmark(tst_bench_qmetaobject
+    SOURCES
+        main.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Test
+        Qt::Widgets
+)
+
+#### Keys ignored in scope 1:.:.:qmetaobject.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/benchmarks/corelib/kernel/qmetatype/CMakeLists.txt b/tests/benchmarks/corelib/kernel/qmetatype/CMakeLists.txt
new file mode 100644
index 0000000000..00ca47aadc
--- /dev/null
+++ b/tests/benchmarks/corelib/kernel/qmetatype/CMakeLists.txt
@@ -0,0 +1,15 @@
+# Generated from qmetatype.pro.
+
+#####################################################################
+## tst_bench_qmetatype Binary:
+#####################################################################
+
+add_qt_benchmark(tst_bench_qmetatype
+    SOURCES
+        tst_qmetatype.cpp
+    PUBLIC_LIBRARIES
+        Qt::Test
+)
+
+#### Keys ignored in scope 1:.:.:qmetatype.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/benchmarks/corelib/kernel/qobject/CMakeLists.txt b/tests/benchmarks/corelib/kernel/qobject/CMakeLists.txt
new file mode 100644
index 0000000000..4644708b54
--- /dev/null
+++ b/tests/benchmarks/corelib/kernel/qobject/CMakeLists.txt
@@ -0,0 +1,18 @@
+# Generated from qobject.pro.
+
+#####################################################################
+## tst_bench_qobject Binary:
+#####################################################################
+
+add_qt_benchmark(tst_bench_qobject
+    SOURCES
+        main.cpp
+        object.cpp object.h
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Test
+        Qt::Widgets
+)
+
+#### Keys ignored in scope 1:.:.:qobject.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/benchmarks/corelib/kernel/qobject/main.cpp b/tests/benchmarks/corelib/kernel/qobject/main.cpp
index 04ca69ad3b..918227f74e 100644
--- a/tests/benchmarks/corelib/kernel/qobject/main.cpp
+++ b/tests/benchmarks/corelib/kernel/qobject/main.cpp
@@ -51,8 +51,55 @@ private slots:
     void connect_disconnect_benchmark_data();
     void connect_disconnect_benchmark();
     void receiver_destroyed_benchmark();
+
+    void stdAllocator();
 };
 
+class QObjectUsingStandardAllocator : public QObject
+{
+    Q_OBJECT
+public:
+    QObjectUsingStandardAllocator()
+    {
+    }
+};
+
+template<class T>
+inline void allocator()
+{
+    // We need to allocate certain amount of objects otherwise the new implementation
+    // may re-use the previous allocation, hiding the somehow high cost of allocation. It
+    // also helps us to reduce the noise ratio, which is high for memory allocation.
+    //
+    // The check depends on memory allocation performance, which is quite non-deterministic.
+    // When a new memory is requested, the new operator, depending on implementation, is trying
+    // to re-use existing, already allocated for the process memory. If there is not enough, it
+    // asks OS to give more. Of course the first case is faster then the second. In the same
+    // time, from an application perspective the first is also more likely.
+    //
+    // As a result, depending on which use-case one wants to test, it may be recommended to run this
+    // test in separation from others, to "force" expensive code path in the memory allocation.
+    //
+    // The time based results are heavily affected by background noise. One really needs to
+    // prepare OS (no other tasks, CPU and RAM reservations) to run this test, or use
+    // instruction counting which seems to be less fragile.
+
+    const int count = 256 * 1024;
+
+    QScopedPointer<T> objects[count];
+    QBENCHMARK_ONCE {
+        for (int i = 0; i < count; ++i)
+            objects[i].reset(new T);
+        for (int i = 0; i < count; ++i)
+            objects[i].reset();
+    }
+}
+
+void QObjectBenchmark::stdAllocator()
+{
+    allocator<QObjectUsingStandardAllocator>();
+}
+
 struct Functor {
     void operator()(){}
 };
diff --git a/tests/benchmarks/corelib/kernel/qtimer_vs_qmetaobject/.prev_CMakeLists.txt b/tests/benchmarks/corelib/kernel/qtimer_vs_qmetaobject/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..4160fe7e36
--- /dev/null
+++ b/tests/benchmarks/corelib/kernel/qtimer_vs_qmetaobject/.prev_CMakeLists.txt
@@ -0,0 +1,17 @@
+# Generated from qtimer_vs_qmetaobject.pro.
+
+#####################################################################
+## qtimer_vs_qmetaobject Binary:
+#####################################################################
+
+add_qt_benchmark(qtimer_vs_qmetaobject
+    SOURCES
+        tst_qtimer_vs_qmetaobject.cpp
+    INCLUDE_DIRECTORIES
+        .
+    PUBLIC_LIBRARIES
+        Qt::Test
+)
+
+#### Keys ignored in scope 1:.:.:qtimer_vs_qmetaobject.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/benchmarks/corelib/kernel/qtimer_vs_qmetaobject/CMakeLists.txt b/tests/benchmarks/corelib/kernel/qtimer_vs_qmetaobject/CMakeLists.txt
new file mode 100644
index 0000000000..c76c4dca18
--- /dev/null
+++ b/tests/benchmarks/corelib/kernel/qtimer_vs_qmetaobject/CMakeLists.txt
@@ -0,0 +1,18 @@
+# Generated from qtimer_vs_qmetaobject.pro.
+
+#####################################################################
+## qtimer_vs_qmetaobject Binary:
+#####################################################################
+
+add_qt_benchmark(qtimer_vs_qmetaobject
+    SOURCES
+        tst_qtimer_vs_qmetaobject.cpp
+    INCLUDE_DIRECTORIES
+        .
+    PUBLIC_LIBRARIES
+        Qt::Test
+        Threads::Threads # special case
+)
+
+#### Keys ignored in scope 1:.:.:qtimer_vs_qmetaobject.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/benchmarks/corelib/kernel/qvariant/CMakeLists.txt b/tests/benchmarks/corelib/kernel/qvariant/CMakeLists.txt
new file mode 100644
index 0000000000..5e5230566d
--- /dev/null
+++ b/tests/benchmarks/corelib/kernel/qvariant/CMakeLists.txt
@@ -0,0 +1,21 @@
+# Generated from qvariant.pro.
+
+#####################################################################
+## tst_bench_qvariant Binary:
+#####################################################################
+
+add_qt_benchmark(tst_bench_qvariant
+    SOURCES
+        tst_qvariant.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Test
+)
+
+## Scopes:
+#####################################################################
+
+extend_target(tst_bench_qvariant CONDITION NOT TARGET Qt::Gui
+    PUBLIC_LIBRARIES
+        # Remove: gui
+)
diff --git a/tests/benchmarks/corelib/mimetypes/CMakeLists.txt b/tests/benchmarks/corelib/mimetypes/CMakeLists.txt
new file mode 100644
index 0000000000..c825780e69
--- /dev/null
+++ b/tests/benchmarks/corelib/mimetypes/CMakeLists.txt
@@ -0,0 +1,3 @@
+# Generated from mimetypes.pro.
+
+add_subdirectory(qmimedatabase)
diff --git a/tests/benchmarks/corelib/mimetypes/qmimedatabase/CMakeLists.txt b/tests/benchmarks/corelib/mimetypes/qmimedatabase/CMakeLists.txt
new file mode 100644
index 0000000000..7d6b6dc4f8
--- /dev/null
+++ b/tests/benchmarks/corelib/mimetypes/qmimedatabase/CMakeLists.txt
@@ -0,0 +1,12 @@
+# Generated from qmimedatabase.pro.
+
+#####################################################################
+## tst_bench_qmimedatabase Binary:
+#####################################################################
+
+add_qt_benchmark(tst_bench_qmimedatabase
+    SOURCES
+        main.cpp
+    PUBLIC_LIBRARIES
+        Qt::Test
+)
diff --git a/tests/benchmarks/corelib/plugin/CMakeLists.txt b/tests/benchmarks/corelib/plugin/CMakeLists.txt
new file mode 100644
index 0000000000..3ae12b23f5
--- /dev/null
+++ b/tests/benchmarks/corelib/plugin/CMakeLists.txt
@@ -0,0 +1,3 @@
+# Generated from plugin.pro.
+
+add_subdirectory(quuid)
diff --git a/tests/benchmarks/corelib/plugin/quuid/CMakeLists.txt b/tests/benchmarks/corelib/plugin/quuid/CMakeLists.txt
new file mode 100644
index 0000000000..2251914957
--- /dev/null
+++ b/tests/benchmarks/corelib/plugin/quuid/CMakeLists.txt
@@ -0,0 +1,15 @@
+# Generated from quuid.pro.
+
+#####################################################################
+## tst_bench_quuid Binary:
+#####################################################################
+
+add_qt_benchmark(tst_bench_quuid
+    SOURCES
+        tst_quuid.cpp
+    PUBLIC_LIBRARIES
+        Qt::Test
+)
+
+#### Keys ignored in scope 1:.:.:quuid.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/benchmarks/corelib/text/CMakeLists.txt b/tests/benchmarks/corelib/text/CMakeLists.txt
new file mode 100644
index 0000000000..8319d1bf3b
--- /dev/null
+++ b/tests/benchmarks/corelib/text/CMakeLists.txt
@@ -0,0 +1,10 @@
+# Generated from text.pro.
+
+add_subdirectory(qbytearray)
+add_subdirectory(qchar)
+add_subdirectory(qlocale)
+add_subdirectory(qstringbuilder)
+add_subdirectory(qstringlist)
+if(GCC)
+    add_subdirectory(qstring)
+endif()
diff --git a/tests/benchmarks/corelib/text/qbytearray/CMakeLists.txt b/tests/benchmarks/corelib/text/qbytearray/CMakeLists.txt
new file mode 100644
index 0000000000..9c7fae62eb
--- /dev/null
+++ b/tests/benchmarks/corelib/text/qbytearray/CMakeLists.txt
@@ -0,0 +1,16 @@
+# Generated from qbytearray.pro.
+
+#####################################################################
+## tst_bench_qbytearray Binary:
+#####################################################################
+
+add_qt_benchmark(tst_bench_qbytearray
+    SOURCES
+        main.cpp
+    PUBLIC_LIBRARIES
+        Qt::Test
+)
+
+#### Keys ignored in scope 1:.:.:qbytearray.pro:<TRUE>:
+# TEMPLATE = "app"
+# TESTDATA = "main.cpp"
diff --git a/tests/benchmarks/corelib/text/qchar/CMakeLists.txt b/tests/benchmarks/corelib/text/qchar/CMakeLists.txt
new file mode 100644
index 0000000000..ba99813d2b
--- /dev/null
+++ b/tests/benchmarks/corelib/text/qchar/CMakeLists.txt
@@ -0,0 +1,12 @@
+# Generated from qchar.pro.
+
+#####################################################################
+## tst_bench_qchar Binary:
+#####################################################################
+
+add_qt_benchmark(tst_bench_qchar
+    SOURCES
+        main.cpp
+    PUBLIC_LIBRARIES
+        Qt::Test
+)
diff --git a/tests/benchmarks/corelib/text/qlocale/CMakeLists.txt b/tests/benchmarks/corelib/text/qlocale/CMakeLists.txt
new file mode 100644
index 0000000000..7e67472013
--- /dev/null
+++ b/tests/benchmarks/corelib/text/qlocale/CMakeLists.txt
@@ -0,0 +1,12 @@
+# Generated from qlocale.pro.
+
+#####################################################################
+## tst_bench_qlocale Binary:
+#####################################################################
+
+add_qt_benchmark(tst_bench_qlocale
+    SOURCES
+        main.cpp
+    PUBLIC_LIBRARIES
+        Qt::Test
+)
diff --git a/tests/benchmarks/corelib/text/qregexp/CMakeLists.txt b/tests/benchmarks/corelib/text/qregexp/CMakeLists.txt
new file mode 100644
index 0000000000..e1dcd5c131
--- /dev/null
+++ b/tests/benchmarks/corelib/text/qregexp/CMakeLists.txt
@@ -0,0 +1,46 @@
+# Generated from qregexp.pro.
+
+#####################################################################
+## tst_bench_qregexp Binary:
+#####################################################################
+
+add_qt_benchmark(tst_bench_qregexp
+    EXCEPTIONS
+    SOURCES
+        main.cpp
+    PUBLIC_LIBRARIES
+        Qt::Test
+)
+
+# Resources:
+set(qregexp_resource_files
+    "main.cpp"
+)
+
+add_qt_resource(tst_bench_qregexp "qregexp"
+    PREFIX
+        "/"
+    FILES
+        ${qregexp_resource_files}
+)
+
+
+#### Keys ignored in scope 1:.:.:qregexp.pro:<TRUE>:
+# TEMPLATE = "app"
+
+## Scopes:
+#####################################################################
+
+extend_target(tst_bench_qregexp CONDITION TARGET Qt::Script AND NOT pcre
+    DEFINES
+        HAVE_JSC
+    PUBLIC_LIBRARIES
+        Qt::Script
+)
+
+extend_target(tst_bench_qregexp CONDITION (NOT QNX) AND (EXISTS _ss_[QT_SYSROOT]/usr/include/boost/regex.hpp)
+    DEFINES
+        HAVE_BOOST
+    PUBLIC_LIBRARIES
+        boost_regex
+)
diff --git a/tests/benchmarks/corelib/text/qstring/CMakeLists.txt b/tests/benchmarks/corelib/text/qstring/CMakeLists.txt
new file mode 100644
index 0000000000..2999cb4682
--- /dev/null
+++ b/tests/benchmarks/corelib/text/qstring/CMakeLists.txt
@@ -0,0 +1,12 @@
+# Generated from qstring.pro.
+
+#####################################################################
+## tst_bench_qstring Binary:
+#####################################################################
+
+add_qt_benchmark(tst_bench_qstring
+    SOURCES
+        main.cpp
+    PUBLIC_LIBRARIES
+        Qt::Test
+)
diff --git a/tests/benchmarks/corelib/text/qstringbuilder/CMakeLists.txt b/tests/benchmarks/corelib/text/qstringbuilder/CMakeLists.txt
new file mode 100644
index 0000000000..e326414d7a
--- /dev/null
+++ b/tests/benchmarks/corelib/text/qstringbuilder/CMakeLists.txt
@@ -0,0 +1,18 @@
+# Generated from qstringbuilder.pro.
+
+#####################################################################
+## tst_bench_qstringbuilder Binary:
+#####################################################################
+
+add_qt_benchmark(tst_bench_qstringbuilder
+    SOURCES
+        main.cpp
+    PUBLIC_LIBRARIES
+        Qt::Test
+    COMPILE_OPTIONS
+        -g
+)
+
+#### Keys ignored in scope 1:.:.:qstringbuilder.pro:<TRUE>:
+# QMAKE_CFLAGS = "-g"
+# TEMPLATE = "app"
diff --git a/tests/benchmarks/corelib/text/qstringlist/CMakeLists.txt b/tests/benchmarks/corelib/text/qstringlist/CMakeLists.txt
new file mode 100644
index 0000000000..a341f1aaa8
--- /dev/null
+++ b/tests/benchmarks/corelib/text/qstringlist/CMakeLists.txt
@@ -0,0 +1,12 @@
+# Generated from qstringlist.pro.
+
+#####################################################################
+## tst_bench_qstringlist Binary:
+#####################################################################
+
+add_qt_benchmark(tst_bench_qstringlist
+    SOURCES
+        main.cpp
+    PUBLIC_LIBRARIES
+        Qt::Test
+)
diff --git a/tests/benchmarks/corelib/thread/CMakeLists.txt b/tests/benchmarks/corelib/thread/CMakeLists.txt
new file mode 100644
index 0000000000..dc257262a3
--- /dev/null
+++ b/tests/benchmarks/corelib/thread/CMakeLists.txt
@@ -0,0 +1,7 @@
+# Generated from thread.pro.
+
+add_subdirectory(qmutex)
+add_subdirectory(qreadwritelock)
+add_subdirectory(qthreadstorage)
+add_subdirectory(qthreadpool)
+add_subdirectory(qwaitcondition)
diff --git a/tests/benchmarks/corelib/thread/qmutex/CMakeLists.txt b/tests/benchmarks/corelib/thread/qmutex/CMakeLists.txt
new file mode 100644
index 0000000000..71226282ab
--- /dev/null
+++ b/tests/benchmarks/corelib/thread/qmutex/CMakeLists.txt
@@ -0,0 +1,15 @@
+# Generated from qmutex.pro.
+
+#####################################################################
+## tst_bench_qmutex Binary:
+#####################################################################
+
+add_qt_benchmark(tst_bench_qmutex
+    SOURCES
+        tst_qmutex.cpp
+    PUBLIC_LIBRARIES
+        Qt::Test
+)
+
+#### Keys ignored in scope 1:.:.:qmutex.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/benchmarks/corelib/thread/qreadwritelock/CMakeLists.txt b/tests/benchmarks/corelib/thread/qreadwritelock/CMakeLists.txt
new file mode 100644
index 0000000000..d582dba8db
--- /dev/null
+++ b/tests/benchmarks/corelib/thread/qreadwritelock/CMakeLists.txt
@@ -0,0 +1,16 @@
+# Generated from qreadwritelock.pro.
+
+#####################################################################
+## tst_bench_qreadwritelock Binary:
+#####################################################################
+
+add_qt_benchmark(tst_bench_qreadwritelock
+    SOURCES
+        tst_qreadwritelock.cpp
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::Test
+)
+
+#### Keys ignored in scope 1:.:.:qreadwritelock.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/benchmarks/corelib/thread/qthreadpool/CMakeLists.txt b/tests/benchmarks/corelib/thread/qthreadpool/CMakeLists.txt
new file mode 100644
index 0000000000..00dbc9c298
--- /dev/null
+++ b/tests/benchmarks/corelib/thread/qthreadpool/CMakeLists.txt
@@ -0,0 +1,15 @@
+# Generated from qthreadpool.pro.
+
+#####################################################################
+## tst_bench_qthreadpool Binary:
+#####################################################################
+
+add_qt_benchmark(tst_bench_qthreadpool
+    SOURCES
+        tst_qthreadpool.cpp
+    PUBLIC_LIBRARIES
+        Qt::Test
+)
+
+#### Keys ignored in scope 1:.:.:qthreadpool.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/benchmarks/corelib/thread/qthreadstorage/CMakeLists.txt b/tests/benchmarks/corelib/thread/qthreadstorage/CMakeLists.txt
new file mode 100644
index 0000000000..ed60ec4495
--- /dev/null
+++ b/tests/benchmarks/corelib/thread/qthreadstorage/CMakeLists.txt
@@ -0,0 +1,15 @@
+# Generated from qthreadstorage.pro.
+
+#####################################################################
+## tst_bench_qthreadstorage Binary:
+#####################################################################
+
+add_qt_benchmark(tst_bench_qthreadstorage
+    SOURCES
+        tst_qthreadstorage.cpp
+    PUBLIC_LIBRARIES
+        Qt::Test
+)
+
+#### Keys ignored in scope 1:.:.:qthreadstorage.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/benchmarks/corelib/thread/qwaitcondition/CMakeLists.txt b/tests/benchmarks/corelib/thread/qwaitcondition/CMakeLists.txt
new file mode 100644
index 0000000000..4de82d7cc9
--- /dev/null
+++ b/tests/benchmarks/corelib/thread/qwaitcondition/CMakeLists.txt
@@ -0,0 +1,15 @@
+# Generated from qwaitcondition.pro.
+
+#####################################################################
+## tst_bench_qwaitcondition Binary:
+#####################################################################
+
+add_qt_benchmark(tst_bench_qwaitcondition
+    SOURCES
+        tst_qwaitcondition.cpp
+    PUBLIC_LIBRARIES
+        Qt::Test
+)
+
+#### Keys ignored in scope 1:.:.:qwaitcondition.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/benchmarks/corelib/time/CMakeLists.txt b/tests/benchmarks/corelib/time/CMakeLists.txt
new file mode 100644
index 0000000000..086650edb6
--- /dev/null
+++ b/tests/benchmarks/corelib/time/CMakeLists.txt
@@ -0,0 +1,5 @@
+# Generated from time.pro.
+
+add_subdirectory(qdate)
+add_subdirectory(qdatetime)
+add_subdirectory(qtimezone)
diff --git a/tests/benchmarks/corelib/time/qdate/CMakeLists.txt b/tests/benchmarks/corelib/time/qdate/CMakeLists.txt
new file mode 100644
index 0000000000..7ae18a42f5
--- /dev/null
+++ b/tests/benchmarks/corelib/time/qdate/CMakeLists.txt
@@ -0,0 +1,12 @@
+# Generated from qdate.pro.
+
+#####################################################################
+## tst_bench_qdate Binary:
+#####################################################################
+
+add_qt_benchmark(tst_bench_qdate
+    SOURCES
+        tst_bench_qdate.cpp
+    PUBLIC_LIBRARIES
+        Qt::Test
+)
diff --git a/tests/benchmarks/corelib/time/qdatetime/CMakeLists.txt b/tests/benchmarks/corelib/time/qdatetime/CMakeLists.txt
new file mode 100644
index 0000000000..b44f1a5bfc
--- /dev/null
+++ b/tests/benchmarks/corelib/time/qdatetime/CMakeLists.txt
@@ -0,0 +1,12 @@
+# Generated from qdatetime.pro.
+
+#####################################################################
+## tst_bench_qdatetime Binary:
+#####################################################################
+
+add_qt_benchmark(tst_bench_qdatetime
+    SOURCES
+        main.cpp
+    PUBLIC_LIBRARIES
+        Qt::Test
+)
diff --git a/tests/benchmarks/corelib/time/qtimezone/CMakeLists.txt b/tests/benchmarks/corelib/time/qtimezone/CMakeLists.txt
new file mode 100644
index 0000000000..60e8ceba13
--- /dev/null
+++ b/tests/benchmarks/corelib/time/qtimezone/CMakeLists.txt
@@ -0,0 +1,12 @@
+# Generated from qtimezone.pro.
+
+#####################################################################
+## tst_bench_qtimezone Binary:
+#####################################################################
+
+add_qt_benchmark(tst_bench_qtimezone
+    SOURCES
+        main.cpp
+    PUBLIC_LIBRARIES
+        Qt::Test
+)
diff --git a/tests/benchmarks/corelib/tools/CMakeLists.txt b/tests/benchmarks/corelib/tools/CMakeLists.txt
new file mode 100644
index 0000000000..6aed3d0f90
--- /dev/null
+++ b/tests/benchmarks/corelib/tools/CMakeLists.txt
@@ -0,0 +1,13 @@
+# Generated from tools.pro.
+
+add_subdirectory(containers-associative)
+add_subdirectory(containers-sequential)
+add_subdirectory(qcontiguouscache)
+add_subdirectory(qcryptographichash)
+add_subdirectory(qlist)
+add_subdirectory(qmap)
+add_subdirectory(qrect)
+add_subdirectory(qringbuffer)
+add_subdirectory(qstack)
+add_subdirectory(qvector)
+add_subdirectory(qalgorithms)
diff --git a/tests/benchmarks/corelib/tools/containers-associative/CMakeLists.txt b/tests/benchmarks/corelib/tools/containers-associative/CMakeLists.txt
new file mode 100644
index 0000000000..0e2dace380
--- /dev/null
+++ b/tests/benchmarks/corelib/tools/containers-associative/CMakeLists.txt
@@ -0,0 +1,15 @@
+# Generated from containers-associative.pro.
+
+#####################################################################
+## tst_bench_containers-associative Binary:
+#####################################################################
+
+add_qt_benchmark(tst_bench_containers-associative
+    SOURCES
+        main.cpp
+    PUBLIC_LIBRARIES
+        Qt::Test
+)
+
+#### Keys ignored in scope 1:.:.:containers-associative.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/benchmarks/corelib/tools/containers-sequential/CMakeLists.txt b/tests/benchmarks/corelib/tools/containers-sequential/CMakeLists.txt
new file mode 100644
index 0000000000..40f455752e
--- /dev/null
+++ b/tests/benchmarks/corelib/tools/containers-sequential/CMakeLists.txt
@@ -0,0 +1,15 @@
+# Generated from containers-sequential.pro.
+
+#####################################################################
+## tst_bench_containers-sequential Binary:
+#####################################################################
+
+add_qt_benchmark(tst_bench_containers-sequential
+    SOURCES
+        main.cpp
+    PUBLIC_LIBRARIES
+        Qt::Test
+)
+
+#### Keys ignored in scope 1:.:.:containers-sequential.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/benchmarks/corelib/tools/qalgorithms/CMakeLists.txt b/tests/benchmarks/corelib/tools/qalgorithms/CMakeLists.txt
new file mode 100644
index 0000000000..99c6a7061d
--- /dev/null
+++ b/tests/benchmarks/corelib/tools/qalgorithms/CMakeLists.txt
@@ -0,0 +1,12 @@
+# Generated from qalgorithms.pro.
+
+#####################################################################
+## tst_bench_qalgorithms Binary:
+#####################################################################
+
+add_qt_benchmark(tst_bench_qalgorithms
+    SOURCES
+        tst_qalgorithms.cpp
+    PUBLIC_LIBRARIES
+        Qt::Test
+)
diff --git a/tests/benchmarks/corelib/tools/qchar/CMakeLists.txt b/tests/benchmarks/corelib/tools/qchar/CMakeLists.txt
new file mode 100644
index 0000000000..c51e2a0059
--- /dev/null
+++ b/tests/benchmarks/corelib/tools/qchar/CMakeLists.txt
@@ -0,0 +1 @@
+add_qt_test(tst_bench_qchar SOURCES main.cpp)
diff --git a/tests/benchmarks/corelib/tools/qcontiguouscache/CMakeLists.txt b/tests/benchmarks/corelib/tools/qcontiguouscache/CMakeLists.txt
new file mode 100644
index 0000000000..126c0e7a50
--- /dev/null
+++ b/tests/benchmarks/corelib/tools/qcontiguouscache/CMakeLists.txt
@@ -0,0 +1,12 @@
+# Generated from qcontiguouscache.pro.
+
+#####################################################################
+## tst_bench_qcontiguouscache Binary:
+#####################################################################
+
+add_qt_benchmark(tst_bench_qcontiguouscache
+    SOURCES
+        main.cpp
+    PUBLIC_LIBRARIES
+        Qt::Test
+)
diff --git a/tests/benchmarks/corelib/tools/qcryptographichash/CMakeLists.txt b/tests/benchmarks/corelib/tools/qcryptographichash/CMakeLists.txt
new file mode 100644
index 0000000000..1400027c1f
--- /dev/null
+++ b/tests/benchmarks/corelib/tools/qcryptographichash/CMakeLists.txt
@@ -0,0 +1,12 @@
+# Generated from qcryptographichash.pro.
+
+#####################################################################
+## tst_bench_qcryptographichash Binary:
+#####################################################################
+
+add_qt_benchmark(tst_bench_qcryptographichash
+    SOURCES
+        main.cpp
+    PUBLIC_LIBRARIES
+        Qt::Test
+)
diff --git a/tests/benchmarks/corelib/tools/qdatetime/CMakeLists.txt b/tests/benchmarks/corelib/tools/qdatetime/CMakeLists.txt
new file mode 100644
index 0000000000..6875fdd613
--- /dev/null
+++ b/tests/benchmarks/corelib/tools/qdatetime/CMakeLists.txt
@@ -0,0 +1 @@
+add_qt_test(tst_bench_qdatetime SOURCES main.cpp)
diff --git a/tests/benchmarks/corelib/tools/qhash/CMakeLists.txt b/tests/benchmarks/corelib/tools/qhash/CMakeLists.txt
new file mode 100644
index 0000000000..5b3a0fe5f5
--- /dev/null
+++ b/tests/benchmarks/corelib/tools/qhash/CMakeLists.txt
@@ -0,0 +1,15 @@
+# Generated from qhash.pro.
+
+#####################################################################
+## tst_hash Binary:
+#####################################################################
+
+add_qt_benchmark(tst_hash
+    SOURCES
+        main.cpp
+        outofline.cpp
+    INCLUDE_DIRECTORIES
+        .
+    PUBLIC_LIBRARIES
+        Qt::Test
+)
diff --git a/tests/benchmarks/corelib/tools/qlist/CMakeLists.txt b/tests/benchmarks/corelib/tools/qlist/CMakeLists.txt
new file mode 100644
index 0000000000..ba40760910
--- /dev/null
+++ b/tests/benchmarks/corelib/tools/qlist/CMakeLists.txt
@@ -0,0 +1,12 @@
+# Generated from qlist.pro.
+
+#####################################################################
+## tst_bench_qlist Binary:
+#####################################################################
+
+add_qt_benchmark(tst_bench_qlist
+    SOURCES
+        main.cpp
+    PUBLIC_LIBRARIES
+        Qt::Test
+)
diff --git a/tests/benchmarks/corelib/tools/qlocale/CMakeLists.txt b/tests/benchmarks/corelib/tools/qlocale/CMakeLists.txt
new file mode 100644
index 0000000000..b8a23bc757
--- /dev/null
+++ b/tests/benchmarks/corelib/tools/qlocale/CMakeLists.txt
@@ -0,0 +1 @@
+add_qt_test(tst_bench_qlocale SOURCES main.cpp)
diff --git a/tests/benchmarks/corelib/tools/qmap/CMakeLists.txt b/tests/benchmarks/corelib/tools/qmap/CMakeLists.txt
new file mode 100644
index 0000000000..a98c7d7157
--- /dev/null
+++ b/tests/benchmarks/corelib/tools/qmap/CMakeLists.txt
@@ -0,0 +1,14 @@
+# Generated from qmap.pro.
+
+#####################################################################
+## tst_bench_qmap Binary:
+#####################################################################
+
+add_qt_benchmark(tst_bench_qmap
+    SOURCES
+        main.cpp
+    INCLUDE_DIRECTORIES
+        .
+    PUBLIC_LIBRARIES
+        Qt::Test
+)
diff --git a/tests/benchmarks/corelib/tools/qrect/CMakeLists.txt b/tests/benchmarks/corelib/tools/qrect/CMakeLists.txt
new file mode 100644
index 0000000000..4218092a88
--- /dev/null
+++ b/tests/benchmarks/corelib/tools/qrect/CMakeLists.txt
@@ -0,0 +1,15 @@
+# Generated from qrect.pro.
+
+#####################################################################
+## tst_bench_qrect Binary:
+#####################################################################
+
+add_qt_benchmark(tst_bench_qrect
+    SOURCES
+        main.cpp
+    PUBLIC_LIBRARIES
+        Qt::Test
+)
+
+#### Keys ignored in scope 1:.:.:qrect.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/benchmarks/corelib/tools/qringbuffer/CMakeLists.txt b/tests/benchmarks/corelib/tools/qringbuffer/CMakeLists.txt
new file mode 100644
index 0000000000..e0323b90db
--- /dev/null
+++ b/tests/benchmarks/corelib/tools/qringbuffer/CMakeLists.txt
@@ -0,0 +1,16 @@
+# Generated from qringbuffer.pro.
+
+#####################################################################
+## tst_bench_qringbuffer Binary:
+#####################################################################
+
+add_qt_benchmark(tst_bench_qringbuffer
+    SOURCES
+        main.cpp
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::Test
+)
+
+#### Keys ignored in scope 1:.:.:qringbuffer.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/benchmarks/corelib/tools/qset/CMakeLists.txt b/tests/benchmarks/corelib/tools/qset/CMakeLists.txt
new file mode 100644
index 0000000000..40ee622f89
--- /dev/null
+++ b/tests/benchmarks/corelib/tools/qset/CMakeLists.txt
@@ -0,0 +1,12 @@
+# Generated from qset.pro.
+
+#####################################################################
+## tst_qset Binary:
+#####################################################################
+
+add_qt_benchmark(tst_qset
+    SOURCES
+        main.cpp
+    PUBLIC_LIBRARIES
+        Qt::Test
+)
diff --git a/tests/benchmarks/corelib/tools/qstack/CMakeLists.txt b/tests/benchmarks/corelib/tools/qstack/CMakeLists.txt
new file mode 100644
index 0000000000..530d55b19b
--- /dev/null
+++ b/tests/benchmarks/corelib/tools/qstack/CMakeLists.txt
@@ -0,0 +1,13 @@
+# Generated from qstack.pro.
+
+#####################################################################
+## tst_bench_stack Binary:
+#####################################################################
+
+add_qt_benchmark(tst_bench_stack
+    SOURCES
+        main.cpp
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::Test
+)
diff --git a/tests/benchmarks/corelib/tools/qstring/CMakeLists.txt b/tests/benchmarks/corelib/tools/qstring/CMakeLists.txt
new file mode 100644
index 0000000000..1dd6678e8e
--- /dev/null
+++ b/tests/benchmarks/corelib/tools/qstring/CMakeLists.txt
@@ -0,0 +1 @@
+add_qt_test(tst_bench_qstring SOURCES main.cpp)
diff --git a/tests/benchmarks/corelib/tools/qtimezone/CMakeLists.txt b/tests/benchmarks/corelib/tools/qtimezone/CMakeLists.txt
new file mode 100644
index 0000000000..3947ae1c5e
--- /dev/null
+++ b/tests/benchmarks/corelib/tools/qtimezone/CMakeLists.txt
@@ -0,0 +1 @@
+add_qt_test(tst_bench_qtimezone SOURCES main.cpp)
diff --git a/tests/benchmarks/corelib/tools/qvector/CMakeLists.txt b/tests/benchmarks/corelib/tools/qvector/CMakeLists.txt
new file mode 100644
index 0000000000..0cc9b24236
--- /dev/null
+++ b/tests/benchmarks/corelib/tools/qvector/CMakeLists.txt
@@ -0,0 +1,16 @@
+# Generated from qvector.pro.
+
+#####################################################################
+## tst_bench_vector Binary:
+#####################################################################
+
+add_qt_benchmark(tst_bench_vector
+    SOURCES
+        main.cpp
+        outofline.cpp
+    INCLUDE_DIRECTORIES
+        .
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::Test
+)
diff --git a/tests/benchmarks/corelib/tools/qvector/outofline.cpp b/tests/benchmarks/corelib/tools/qvector/outofline.cpp
index 76a4edaa10..7182a43008 100644
--- a/tests/benchmarks/corelib/tools/qvector/outofline.cpp
+++ b/tests/benchmarks/corelib/tools/qvector/outofline.cpp
@@ -54,7 +54,7 @@ QVector<double> mixedvector_fill_and_return_helper()
     std::vector<double> v(N);
     for (int i = 0; i != N; ++i)
         v[i] = i;
-    return QVector<double>::fromStdVector(v);
+    return QVector<double>(v.begin(), v.end());
 }
 
 
diff --git a/tests/benchmarks/corelib/tools/qvector/qrawvector.h b/tests/benchmarks/corelib/tools/qvector/qrawvector.h
index 16a911c63a..9ad5f771bd 100644
--- a/tests/benchmarks/corelib/tools/qvector/qrawvector.h
+++ b/tests/benchmarks/corelib/tools/qvector/qrawvector.h
@@ -130,78 +130,9 @@ public:
     bool contains(const T &t) const;
     int count(const T &t) const;
 
-#ifdef QT_STRICT_ITERATORS
-    class iterator {
-    public:
-        T *i;
-        typedef std::random_access_iterator_tag  iterator_category;
-        typedef ptrdiff_t difference_type;
-        typedef T value_type;
-        typedef T *pointer;
-        typedef T &reference;
-
-        inline iterator() : i(0) {}
-        inline iterator(T *n) : i(n) {}
-        inline iterator(const iterator &o): i(o.i){}
-        inline T &operator*() const { return *i; }
-        inline T *operator->() const { return i; }
-        inline T &operator[](int j) const { return *(i + j); }
-        inline bool operator==(const iterator &o) const { return i == o.i; }
-        inline bool operator!=(const iterator &o) const { return i != o.i; }
-        inline bool operator<(const iterator& other) const { return i < other.i; }
-        inline bool operator<=(const iterator& other) const { return i <= other.i; }
-        inline bool operator>(const iterator& other) const { return i > other.i; }
-        inline bool operator>=(const iterator& other) const { return i >= other.i; }
-        inline iterator &operator++() { ++i; return *this; }
-        inline iterator operator++(int) { T *n = i; ++i; return n; }
-        inline iterator &operator--() { i--; return *this; }
-        inline iterator operator--(int) { T *n = i; i--; return n; }
-        inline iterator &operator+=(int j) { i+=j; return *this; }
-        inline iterator &operator-=(int j) { i-=j; return *this; }
-        inline iterator operator+(int j) const { return iterator(i+j); }
-        inline iterator operator-(int j) const { return iterator(i-j); }
-        inline int operator-(iterator j) const { return i - j.i; }
-    };
-    friend class iterator;
-
-    class const_iterator {
-    public:
-        T *i;
-        typedef std::random_access_iterator_tag  iterator_category;
-        typedef ptrdiff_t difference_type;
-        typedef T value_type;
-        typedef const T *pointer;
-        typedef const T &reference;
-
-        inline const_iterator() : i(0) {}
-        inline const_iterator(T *n) : i(n) {}
-        inline const_iterator(const const_iterator &o): i(o.i) {}
-        inline explicit const_iterator(const iterator &o): i(o.i) {}
-        inline const T &operator*() const { return *i; }
-        inline const T *operator->() const { return i; }
-        inline const T &operator[](int j) const { return *(i + j); }
-        inline bool operator==(const const_iterator &o) const { return i == o.i; }
-        inline bool operator!=(const const_iterator &o) const { return i != o.i; }
-        inline bool operator<(const const_iterator& other) const { return i < other.i; }
-        inline bool operator<=(const const_iterator& other) const { return i <= other.i; }
-        inline bool operator>(const const_iterator& other) const { return i > other.i; }
-        inline bool operator>=(const const_iterator& other) const { return i >= other.i; }
-        inline const_iterator &operator++() { ++i; return *this; }
-        inline const_iterator operator++(int) { T *n = i; ++i; return n; }
-        inline const_iterator &operator--() { i--; return *this; }
-        inline const_iterator operator--(int) { T *n = i; i--; return n; }
-        inline const_iterator &operator+=(int j) { i+=j; return *this; }
-        inline const_iterator &operator-=(int j) { i+=j; return *this; }
-        inline const_iterator operator+(int j) const { return const_iterator(i+j); }
-        inline const_iterator operator-(int j) const { return const_iterator(i-j); }
-        inline int operator-(const_iterator j) const { return i - j.i; }
-    };
-    friend class const_iterator;
-#else
     // STL-style
     typedef T *iterator;
     typedef const T *const_iterator;
-#endif
     inline iterator begin() { return m_begin; }
     inline const_iterator begin() const { return m_begin; }
     inline const_iterator constBegin() const { return m_begin; }
@@ -280,11 +211,7 @@ private:
     }
     static Q_DECL_CONSTEXPR int alignOfTypedData()
     {
-#ifdef Q_ALIGNOF
-        return Q_ALIGNOF(AlignmentDummy);
-#else
-        return sizeof(void *);
-#endif
+        return alignof(AlignmentDummy);
     }
 
 public:
diff --git a/tests/benchmarks/dbus/CMakeLists.txt b/tests/benchmarks/dbus/CMakeLists.txt
new file mode 100644
index 0000000000..cd246922a1
--- /dev/null
+++ b/tests/benchmarks/dbus/CMakeLists.txt
@@ -0,0 +1,6 @@
+# Generated from dbus.pro.
+
+add_subdirectory(qdbustype)
+if(QT_FEATURE_process)
+    add_subdirectory(qdbusperformance)
+endif()
diff --git a/tests/benchmarks/dbus/qdbusperformance/CMakeLists.txt b/tests/benchmarks/dbus/qdbusperformance/CMakeLists.txt
new file mode 100644
index 0000000000..5d79f36090
--- /dev/null
+++ b/tests/benchmarks/dbus/qdbusperformance/CMakeLists.txt
@@ -0,0 +1,4 @@
+# Generated from qdbusperformance.pro.
+
+add_subdirectory(server)
+add_subdirectory(test)
diff --git a/tests/benchmarks/dbus/qdbusperformance/server/CMakeLists.txt b/tests/benchmarks/dbus/qdbusperformance/server/CMakeLists.txt
new file mode 100644
index 0000000000..a3b5e98d4a
--- /dev/null
+++ b/tests/benchmarks/dbus/qdbusperformance/server/CMakeLists.txt
@@ -0,0 +1,15 @@
+# Generated from server.pro.
+
+#####################################################################
+## server Binary:
+#####################################################################
+
+add_qt_benchmark(server
+    GUI
+    OUTPUT_DIRECTORY "."
+    SOURCES
+        ../serverobject.h
+        server.cpp
+    PUBLIC_LIBRARIES
+        Qt::DBus
+)
diff --git a/tests/benchmarks/dbus/qdbusperformance/test/CMakeLists.txt b/tests/benchmarks/dbus/qdbusperformance/test/CMakeLists.txt
new file mode 100644
index 0000000000..dadca9412c
--- /dev/null
+++ b/tests/benchmarks/dbus/qdbusperformance/test/CMakeLists.txt
@@ -0,0 +1,14 @@
+# Generated from test.pro.
+
+#####################################################################
+## tst_qdbusperformance Binary:
+#####################################################################
+
+add_qt_benchmark(tst_qdbusperformance
+    SOURCES
+        ../serverobject.h
+        ../tst_qdbusperformance.cpp
+    PUBLIC_LIBRARIES
+        Qt::DBus
+        Qt::Test
+)
diff --git a/tests/benchmarks/dbus/qdbustype/CMakeLists.txt b/tests/benchmarks/dbus/qdbustype/CMakeLists.txt
new file mode 100644
index 0000000000..fb250f9f00
--- /dev/null
+++ b/tests/benchmarks/dbus/qdbustype/CMakeLists.txt
@@ -0,0 +1,29 @@
+# Generated from qdbustype.pro.
+
+#####################################################################
+## tst_bench_qdbustype Binary:
+#####################################################################
+
+add_qt_benchmark(tst_bench_qdbustype
+    SOURCES
+        main.cpp
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::DBusPrivate
+        Qt::Test
+)
+
+## Scopes:
+#####################################################################
+
+extend_target(tst_bench_qdbustype CONDITION QT_FEATURE_dbus_linked
+    DEFINES
+        QT_LINKED_LIBDBUS
+    PUBLIC_LIBRARIES
+        dbus-1
+)
+
+extend_target(tst_bench_qdbustype CONDITION NOT QT_FEATURE_dbus_linked
+    SOURCES
+        ../../../../src/dbus/qdbus_symbols.cpp
+)
diff --git a/tests/benchmarks/gui/CMakeLists.txt b/tests/benchmarks/gui/CMakeLists.txt
new file mode 100644
index 0000000000..6af9d8e224
--- /dev/null
+++ b/tests/benchmarks/gui/CMakeLists.txt
@@ -0,0 +1,8 @@
+# Generated from gui.pro.
+
+add_subdirectory(animation)
+add_subdirectory(image)
+add_subdirectory(kernel)
+add_subdirectory(math3d)
+add_subdirectory(painting)
+add_subdirectory(text)
diff --git a/tests/benchmarks/gui/animation/CMakeLists.txt b/tests/benchmarks/gui/animation/CMakeLists.txt
new file mode 100644
index 0000000000..6190f29a65
--- /dev/null
+++ b/tests/benchmarks/gui/animation/CMakeLists.txt
@@ -0,0 +1,5 @@
+# Generated from animation.pro.
+
+if(TARGET Qt::Widgets)
+    add_subdirectory(qanimation)
+endif()
diff --git a/tests/benchmarks/gui/animation/qanimation/CMakeLists.txt b/tests/benchmarks/gui/animation/qanimation/CMakeLists.txt
new file mode 100644
index 0000000000..38b4c50db8
--- /dev/null
+++ b/tests/benchmarks/gui/animation/qanimation/CMakeLists.txt
@@ -0,0 +1,17 @@
+# Generated from qanimation.pro.
+
+#####################################################################
+## tst_bench_qanimation Binary:
+#####################################################################
+
+add_qt_benchmark(tst_bench_qanimation
+    SOURCES
+        dummyanimation.cpp dummyanimation.h
+        dummyobject.cpp dummyobject.h
+        main.cpp
+        rectanimation.cpp rectanimation.h
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Test
+        Qt::Widgets
+)
diff --git a/tests/benchmarks/gui/image/CMakeLists.txt b/tests/benchmarks/gui/image/CMakeLists.txt
new file mode 100644
index 0000000000..77cfeedc3e
--- /dev/null
+++ b/tests/benchmarks/gui/image/CMakeLists.txt
@@ -0,0 +1,8 @@
+# Generated from image.pro.
+
+add_subdirectory(blendbench)
+add_subdirectory(qimageconversion)
+add_subdirectory(qimagereader)
+add_subdirectory(qimagescale)
+add_subdirectory(qpixmap)
+add_subdirectory(qpixmapcache)
diff --git a/tests/benchmarks/gui/image/blendbench/CMakeLists.txt b/tests/benchmarks/gui/image/blendbench/CMakeLists.txt
new file mode 100644
index 0000000000..3599a51371
--- /dev/null
+++ b/tests/benchmarks/gui/image/blendbench/CMakeLists.txt
@@ -0,0 +1,16 @@
+# Generated from blendbench.pro.
+
+#####################################################################
+## tst_bench_blendbench Binary:
+#####################################################################
+
+add_qt_benchmark(tst_bench_blendbench
+    SOURCES
+        main.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Test
+)
+
+#### Keys ignored in scope 1:.:.:blendbench.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/benchmarks/gui/image/qimageconversion/CMakeLists.txt b/tests/benchmarks/gui/image/qimageconversion/CMakeLists.txt
new file mode 100644
index 0000000000..d9b481ca46
--- /dev/null
+++ b/tests/benchmarks/gui/image/qimageconversion/CMakeLists.txt
@@ -0,0 +1,30 @@
+# Generated from qimageconversion.pro.
+
+#####################################################################
+## tst_bench_imageConversion Binary:
+#####################################################################
+
+add_qt_benchmark(tst_bench_imageConversion
+    SOURCES
+        tst_qimageconversion.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Test
+)
+
+#### Keys ignored in scope 1:.:.:qimageconversion.pro:<TRUE>:
+# QT_FOR_CONFIG = "gui-private"
+# TEMPLATE = "app"
+
+## Scopes:
+#####################################################################
+
+extend_target(tst_bench_imageConversion CONDITION QT_FEATURE_gif
+    DEFINES
+        QTEST_HAVE_GIF
+)
+
+extend_target(tst_bench_imageConversion CONDITION QT_FEATURE_jpeg
+    DEFINES
+        QTEST_HAVE_JPEG
+)
diff --git a/tests/benchmarks/gui/image/qimagereader/CMakeLists.txt b/tests/benchmarks/gui/image/qimagereader/CMakeLists.txt
new file mode 100644
index 0000000000..be72a44187
--- /dev/null
+++ b/tests/benchmarks/gui/image/qimagereader/CMakeLists.txt
@@ -0,0 +1,31 @@
+# Generated from qimagereader.pro.
+
+#####################################################################
+## tst_bench_qimagereader Binary:
+#####################################################################
+
+add_qt_benchmark(tst_bench_qimagereader
+    SOURCES
+        tst_qimagereader.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Test
+)
+
+#### Keys ignored in scope 1:.:.:qimagereader.pro:<TRUE>:
+# QT_FOR_CONFIG = "gui-private"
+# TEMPLATE = "app"
+# TESTDATA = "images/*"
+
+## Scopes:
+#####################################################################
+
+extend_target(tst_bench_qimagereader CONDITION QT_FEATURE_gif
+    DEFINES
+        QTEST_HAVE_GIF
+)
+
+extend_target(tst_bench_qimagereader CONDITION QT_FEATURE_jpeg
+    DEFINES
+        QTEST_HAVE_JPEG
+)
diff --git a/tests/benchmarks/gui/image/qimagescale/CMakeLists.txt b/tests/benchmarks/gui/image/qimagescale/CMakeLists.txt
new file mode 100644
index 0000000000..cbf3e5459b
--- /dev/null
+++ b/tests/benchmarks/gui/image/qimagescale/CMakeLists.txt
@@ -0,0 +1,16 @@
+# Generated from qimagescale.pro.
+
+#####################################################################
+## tst_bench_imageScale Binary:
+#####################################################################
+
+add_qt_benchmark(tst_bench_imageScale
+    SOURCES
+        tst_qimagescale.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Test
+)
+
+#### Keys ignored in scope 1:.:.:qimagescale.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/benchmarks/gui/image/qpixmap/CMakeLists.txt b/tests/benchmarks/gui/image/qpixmap/CMakeLists.txt
new file mode 100644
index 0000000000..e75703f33d
--- /dev/null
+++ b/tests/benchmarks/gui/image/qpixmap/CMakeLists.txt
@@ -0,0 +1,17 @@
+# Generated from qpixmap.pro.
+
+#####################################################################
+## tst_bench_qpixmap Binary:
+#####################################################################
+
+add_qt_benchmark(tst_bench_qpixmap
+    SOURCES
+        tst_qpixmap.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::GuiPrivate
+        Qt::Test
+)
+
+#### Keys ignored in scope 1:.:.:qpixmap.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/benchmarks/gui/image/qpixmapcache/CMakeLists.txt b/tests/benchmarks/gui/image/qpixmapcache/CMakeLists.txt
new file mode 100644
index 0000000000..46347ef94a
--- /dev/null
+++ b/tests/benchmarks/gui/image/qpixmapcache/CMakeLists.txt
@@ -0,0 +1,16 @@
+# Generated from qpixmapcache.pro.
+
+#####################################################################
+## tst_bench_qpixmapcache Binary:
+#####################################################################
+
+add_qt_benchmark(tst_bench_qpixmapcache
+    SOURCES
+        tst_qpixmapcache.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Test
+)
+
+#### Keys ignored in scope 1:.:.:qpixmapcache.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/benchmarks/gui/kernel/CMakeLists.txt b/tests/benchmarks/gui/kernel/CMakeLists.txt
new file mode 100644
index 0000000000..451b12388d
--- /dev/null
+++ b/tests/benchmarks/gui/kernel/CMakeLists.txt
@@ -0,0 +1,4 @@
+# Generated from kernel.pro.
+
+add_subdirectory(qguimetatype)
+add_subdirectory(qguivariant)
diff --git a/tests/benchmarks/gui/kernel/qguimetatype/CMakeLists.txt b/tests/benchmarks/gui/kernel/qguimetatype/CMakeLists.txt
new file mode 100644
index 0000000000..cf250cdaf6
--- /dev/null
+++ b/tests/benchmarks/gui/kernel/qguimetatype/CMakeLists.txt
@@ -0,0 +1,16 @@
+# Generated from qguimetatype.pro.
+
+#####################################################################
+## tst_bench_qguimetatype Binary:
+#####################################################################
+
+add_qt_benchmark(tst_bench_qguimetatype
+    SOURCES
+        tst_qguimetatype.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Test
+)
+
+#### Keys ignored in scope 1:.:.:qguimetatype.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/benchmarks/gui/kernel/qguivariant/CMakeLists.txt b/tests/benchmarks/gui/kernel/qguivariant/CMakeLists.txt
new file mode 100644
index 0000000000..0a6ddda456
--- /dev/null
+++ b/tests/benchmarks/gui/kernel/qguivariant/CMakeLists.txt
@@ -0,0 +1,16 @@
+# Generated from qguivariant.pro.
+
+#####################################################################
+## tst_bench_qguivariant Binary:
+#####################################################################
+
+add_qt_benchmark(tst_bench_qguivariant
+    SOURCES
+        tst_qguivariant.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Test
+)
+
+#### Keys ignored in scope 1:.:.:qguivariant.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/benchmarks/gui/math3d/CMakeLists.txt b/tests/benchmarks/gui/math3d/CMakeLists.txt
new file mode 100644
index 0000000000..53e56a83a3
--- /dev/null
+++ b/tests/benchmarks/gui/math3d/CMakeLists.txt
@@ -0,0 +1,4 @@
+# Generated from math3d.pro.
+
+add_subdirectory(qmatrix4x4)
+add_subdirectory(qquaternion)
diff --git a/tests/benchmarks/gui/math3d/qmatrix4x4/CMakeLists.txt b/tests/benchmarks/gui/math3d/qmatrix4x4/CMakeLists.txt
new file mode 100644
index 0000000000..8d594ef1e7
--- /dev/null
+++ b/tests/benchmarks/gui/math3d/qmatrix4x4/CMakeLists.txt
@@ -0,0 +1,16 @@
+# Generated from qmatrix4x4.pro.
+
+#####################################################################
+## tst_bench_qmatrix4x4 Binary:
+#####################################################################
+
+add_qt_benchmark(tst_bench_qmatrix4x4
+    SOURCES
+        tst_qmatrix4x4.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Test
+)
+
+#### Keys ignored in scope 1:.:.:qmatrix4x4.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/benchmarks/gui/math3d/qquaternion/CMakeLists.txt b/tests/benchmarks/gui/math3d/qquaternion/CMakeLists.txt
new file mode 100644
index 0000000000..2409a6c43a
--- /dev/null
+++ b/tests/benchmarks/gui/math3d/qquaternion/CMakeLists.txt
@@ -0,0 +1,16 @@
+# Generated from qquaternion.pro.
+
+#####################################################################
+## tst_bench_qquaternion Binary:
+#####################################################################
+
+add_qt_benchmark(tst_bench_qquaternion
+    SOURCES
+        tst_qquaternion.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Test
+)
+
+#### Keys ignored in scope 1:.:.:qquaternion.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/benchmarks/gui/painting/CMakeLists.txt b/tests/benchmarks/gui/painting/CMakeLists.txt
new file mode 100644
index 0000000000..080fe582f2
--- /dev/null
+++ b/tests/benchmarks/gui/painting/CMakeLists.txt
@@ -0,0 +1,11 @@
+# Generated from painting.pro.
+
+add_subdirectory(drawtexture)
+add_subdirectory(qcolor)
+add_subdirectory(qregion)
+add_subdirectory(qtransform)
+add_subdirectory(lancebench)
+if(TARGET Qt::Widgets)
+    add_subdirectory(qpainter)
+    add_subdirectory(qtbench)
+endif()
diff --git a/tests/benchmarks/gui/painting/drawtexture/CMakeLists.txt b/tests/benchmarks/gui/painting/drawtexture/CMakeLists.txt
new file mode 100644
index 0000000000..add15f25fb
--- /dev/null
+++ b/tests/benchmarks/gui/painting/drawtexture/CMakeLists.txt
@@ -0,0 +1,17 @@
+# Generated from drawtexture.pro.
+
+#####################################################################
+## tst_bench_drawtexture Binary:
+#####################################################################
+
+add_qt_benchmark(tst_bench_drawtexture
+    SOURCES
+        tst_drawtexture.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::GuiPrivate
+        Qt::Test
+)
+
+#### Keys ignored in scope 1:.:.:drawtexture.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/benchmarks/gui/painting/lancebench/CMakeLists.txt b/tests/benchmarks/gui/painting/lancebench/CMakeLists.txt
new file mode 100644
index 0000000000..677a3d98d4
--- /dev/null
+++ b/tests/benchmarks/gui/painting/lancebench/CMakeLists.txt
@@ -0,0 +1,157 @@
+# Generated from lancebench.pro.
+
+#####################################################################
+## tst_bench_lancebench Binary:
+#####################################################################
+
+add_qt_benchmark(tst_bench_lancebench
+    SOURCES
+        ../../../../auto/other/lancelot/paintcommands.cpp ../../../../auto/other/lancelot/paintcommands.h
+        tst_lancebench.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::GuiPrivate
+        Qt::Test
+)
+
+# Resources:
+set_source_files_properties("../../../../auto/other/lancelot/images/alpha.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/alpha.png"
+)
+set_source_files_properties("../../../../auto/other/lancelot/images/alpha2x2.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/alpha2x2.png"
+)
+set_source_files_properties("../../../../auto/other/lancelot/images/bitmap.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/bitmap.png"
+)
+set_source_files_properties("../../../../auto/other/lancelot/images/border.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/border.png"
+)
+set_source_files_properties("../../../../auto/other/lancelot/images/borderimage.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/borderimage.png"
+)
+set_source_files_properties("../../../../auto/other/lancelot/images/dome_argb32.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/dome_argb32.png"
+)
+set_source_files_properties("../../../../auto/other/lancelot/images/dome_indexed.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/dome_indexed.png"
+)
+set_source_files_properties("../../../../auto/other/lancelot/images/dome_indexed_mask.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/dome_indexed_mask.png"
+)
+set_source_files_properties("../../../../auto/other/lancelot/images/dome_mono.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/dome_mono.png"
+)
+set_source_files_properties("../../../../auto/other/lancelot/images/dome_mono_128.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/dome_mono_128.png"
+)
+set_source_files_properties("../../../../auto/other/lancelot/images/dome_mono_palette.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/dome_mono_palette.png"
+)
+set_source_files_properties("../../../../auto/other/lancelot/images/dome_rgb32.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/dome_rgb32.png"
+)
+set_source_files_properties("../../../../auto/other/lancelot/images/dot.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/dot.png"
+)
+set_source_files_properties("../../../../auto/other/lancelot/images/face.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/face.png"
+)
+set_source_files_properties("../../../../auto/other/lancelot/images/gam030.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/gam030.png"
+)
+set_source_files_properties("../../../../auto/other/lancelot/images/gam045.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/gam045.png"
+)
+set_source_files_properties("../../../../auto/other/lancelot/images/gam056.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/gam056.png"
+)
+set_source_files_properties("../../../../auto/other/lancelot/images/gam100.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/gam100.png"
+)
+set_source_files_properties("../../../../auto/other/lancelot/images/gam200.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/gam200.png"
+)
+set_source_files_properties("../../../../auto/other/lancelot/images/image.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/image.png"
+)
+set_source_files_properties("../../../../auto/other/lancelot/images/mask.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/mask.png"
+)
+set_source_files_properties("../../../../auto/other/lancelot/images/mask_100.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/mask_100.png"
+)
+set_source_files_properties("../../../../auto/other/lancelot/images/masked.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/masked.png"
+)
+set_source_files_properties("../../../../auto/other/lancelot/images/sign.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/sign.png"
+)
+set_source_files_properties("../../../../auto/other/lancelot/images/solid.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/solid.png"
+)
+set_source_files_properties("../../../../auto/other/lancelot/images/solid2x2.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/solid2x2.png"
+)
+set_source_files_properties("../../../../auto/other/lancelot/images/struct-image-01.jpg"
+    PROPERTIES QT_RESOURCE_ALIAS "images/struct-image-01.jpg"
+)
+set_source_files_properties("../../../../auto/other/lancelot/images/struct-image-01.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/struct-image-01.png"
+)
+set_source_files_properties("../../../../auto/other/lancelot/images/zebra.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/zebra.png"
+)
+set(images_resource_files
+    "images/alpha.png"
+    "images/alpha2x2.png"
+    "images/bitmap.png"
+    "images/border.png"
+    "images/borderimage.png"
+    "images/dome_argb32.png"
+    "images/dome_indexed.png"
+    "images/dome_indexed_mask.png"
+    "images/dome_mono.png"
+    "images/dome_mono_128.png"
+    "images/dome_mono_palette.png"
+    "images/dome_rgb32.png"
+    "images/dot.png"
+    "images/face.png"
+    "images/gam030.png"
+    "images/gam045.png"
+    "images/gam056.png"
+    "images/gam100.png"
+    "images/gam200.png"
+    "images/image.png"
+    "images/mask.png"
+    "images/mask_100.png"
+    "images/masked.png"
+    "images/sign.png"
+    "images/solid.png"
+    "images/solid2x2.png"
+    "images/struct-image-01.jpg"
+    "images/struct-image-01.png"
+    "images/zebra.png"
+)
+
+add_qt_resource(tst_bench_lancebench "images"
+    PREFIX
+        "/"
+    BASE
+        "../../../../auto/other/lancelot"
+    FILES
+        ${images_resource_files}
+)
+
+
+#### Keys ignored in scope 1:.:.:lancebench.pro:<TRUE>:
+# TEMPLATE = "app"
+# TESTDATA = "../../../../auto/other/lancelot/scripts/*"
+
+## Scopes:
+#####################################################################
+
+extend_target(tst_bench_lancebench CONDITION QT_FEATURE_opengl
+    PUBLIC_LIBRARIES
+        Qt::OpenGL
+)
diff --git a/tests/benchmarks/gui/painting/lancebench/lancebench.pro b/tests/benchmarks/gui/painting/lancebench/lancebench.pro
index 6458c50861..5647d26de3 100644
--- a/tests/benchmarks/gui/painting/lancebench/lancebench.pro
+++ b/tests/benchmarks/gui/painting/lancebench/lancebench.pro
@@ -2,7 +2,7 @@ TEMPLATE = app
 TARGET = tst_bench_lancebench
 
 QT += testlib gui-private
-
+qtConfig(opengl): QT += opengl
 
 SOURCES += tst_lancebench.cpp
 
diff --git a/tests/benchmarks/gui/painting/qcolor/CMakeLists.txt b/tests/benchmarks/gui/painting/qcolor/CMakeLists.txt
new file mode 100644
index 0000000000..d5367704ae
--- /dev/null
+++ b/tests/benchmarks/gui/painting/qcolor/CMakeLists.txt
@@ -0,0 +1,17 @@
+# Generated from qcolor.pro.
+
+#####################################################################
+## tst_bench_qcolor Binary:
+#####################################################################
+
+add_qt_benchmark(tst_bench_qcolor
+    SOURCES
+        tst_qcolor.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::GuiPrivate
+        Qt::Test
+)
+
+#### Keys ignored in scope 1:.:.:qcolor.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/benchmarks/gui/painting/qpainter/CMakeLists.txt b/tests/benchmarks/gui/painting/qpainter/CMakeLists.txt
new file mode 100644
index 0000000000..a4e3242409
--- /dev/null
+++ b/tests/benchmarks/gui/painting/qpainter/CMakeLists.txt
@@ -0,0 +1,19 @@
+# Generated from qpainter.pro.
+
+#####################################################################
+## tst_bench_qpainter Binary:
+#####################################################################
+
+add_qt_benchmark(tst_bench_qpainter
+    SOURCES
+        tst_qpainter.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::GuiPrivate
+        Qt::Test
+        Qt::Widgets
+        Qt::WidgetsPrivate
+)
+
+#### Keys ignored in scope 1:.:.:qpainter.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/benchmarks/gui/painting/qregion/CMakeLists.txt b/tests/benchmarks/gui/painting/qregion/CMakeLists.txt
new file mode 100644
index 0000000000..e864a1f61d
--- /dev/null
+++ b/tests/benchmarks/gui/painting/qregion/CMakeLists.txt
@@ -0,0 +1,16 @@
+# Generated from qregion.pro.
+
+#####################################################################
+## tst_bench_qregion Binary:
+#####################################################################
+
+add_qt_benchmark(tst_bench_qregion
+    SOURCES
+        main.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Test
+)
+
+#### Keys ignored in scope 1:.:.:qregion.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/benchmarks/gui/painting/qtbench/CMakeLists.txt b/tests/benchmarks/gui/painting/qtbench/CMakeLists.txt
new file mode 100644
index 0000000000..009deeb528
--- /dev/null
+++ b/tests/benchmarks/gui/painting/qtbench/CMakeLists.txt
@@ -0,0 +1,17 @@
+# Generated from qtbench.pro.
+
+#####################################################################
+## tst_bench_qtbench Binary:
+#####################################################################
+
+add_qt_benchmark(tst_bench_qtbench
+    SOURCES
+        tst_qtbench.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Test
+        Qt::Widgets
+)
+
+#### Keys ignored in scope 1:.:.:qtbench.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/benchmarks/gui/painting/qtransform/CMakeLists.txt b/tests/benchmarks/gui/painting/qtransform/CMakeLists.txt
new file mode 100644
index 0000000000..aa24b4a19e
--- /dev/null
+++ b/tests/benchmarks/gui/painting/qtransform/CMakeLists.txt
@@ -0,0 +1,16 @@
+# Generated from qtransform.pro.
+
+#####################################################################
+## tst_bench_qtransform Binary:
+#####################################################################
+
+add_qt_benchmark(tst_bench_qtransform
+    SOURCES
+        tst_qtransform.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Test
+)
+
+#### Keys ignored in scope 1:.:.:qtransform.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/benchmarks/gui/text/CMakeLists.txt b/tests/benchmarks/gui/text/CMakeLists.txt
new file mode 100644
index 0000000000..630f01091d
--- /dev/null
+++ b/tests/benchmarks/gui/text/CMakeLists.txt
@@ -0,0 +1,5 @@
+# Generated from text.pro.
+
+add_subdirectory(qfontmetrics)
+add_subdirectory(qtext)
+add_subdirectory(qtextdocument)
diff --git a/tests/benchmarks/gui/text/qfontmetrics/CMakeLists.txt b/tests/benchmarks/gui/text/qfontmetrics/CMakeLists.txt
new file mode 100644
index 0000000000..af42a93d27
--- /dev/null
+++ b/tests/benchmarks/gui/text/qfontmetrics/CMakeLists.txt
@@ -0,0 +1,16 @@
+# Generated from qfontmetrics.pro.
+
+#####################################################################
+## tst_bench_QFontMetrics Binary:
+#####################################################################
+
+add_qt_benchmark(tst_bench_QFontMetrics
+    SOURCES
+        main.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Test
+)
+
+#### Keys ignored in scope 1:.:.:qfontmetrics.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/benchmarks/gui/text/qtext/CMakeLists.txt b/tests/benchmarks/gui/text/qtext/CMakeLists.txt
new file mode 100644
index 0000000000..b2380c8316
--- /dev/null
+++ b/tests/benchmarks/gui/text/qtext/CMakeLists.txt
@@ -0,0 +1,18 @@
+# Generated from qtext.pro.
+
+#####################################################################
+## tst_bench_QText Binary:
+#####################################################################
+
+add_qt_benchmark(tst_bench_QText
+    SOURCES
+        main.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::GuiPrivate
+        Qt::Test
+)
+
+#### Keys ignored in scope 1:.:.:qtext.pro:<TRUE>:
+# TEMPLATE = "app"
+# TESTDATA = "bidi.txt"
diff --git a/tests/benchmarks/gui/text/qtextdocument/CMakeLists.txt b/tests/benchmarks/gui/text/qtextdocument/CMakeLists.txt
new file mode 100644
index 0000000000..eb1f633d9b
--- /dev/null
+++ b/tests/benchmarks/gui/text/qtextdocument/CMakeLists.txt
@@ -0,0 +1,17 @@
+# Generated from qtextdocument.pro.
+
+#####################################################################
+## tst_bench_QTextDocument Binary:
+#####################################################################
+
+add_qt_benchmark(tst_bench_QTextDocument
+    SOURCES
+        main.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::GuiPrivate
+        Qt::Test
+)
+
+#### Keys ignored in scope 1:.:.:qtextdocument.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/benchmarks/network/CMakeLists.txt b/tests/benchmarks/network/CMakeLists.txt
new file mode 100644
index 0000000000..4175518f34
--- /dev/null
+++ b/tests/benchmarks/network/CMakeLists.txt
@@ -0,0 +1,23 @@
+# Generated from network.pro.
+
+# special case begin
+# SSL library include path is not propagated with private tests which results in
+# test not being able to find the ssl header when they are not in the standard
+# include paths
+if (QT_FEATURE_private_tests)
+    if (QT_FEATURE_openssl AND QT_FEATURE_openssl_linked AND QT_FEATURE_ssl)
+        include_directories($<TARGET_PROPERTY:OpenSSL::SSL,INTERFACE_INCLUDE_DIRECTORIES>)
+    endif()
+
+    if (QT_FEATURE_openssl AND QT_FEATURE_ssl AND NOT QT_FEATURE_openssl_linked)
+        include_directories($<TARGET_PROPERTY:${INSTALL_CMAKE_NAMESPACE}::SSL_nolink,INTERFACE_INCLUDE_DIRECTORIES>)
+    endif()
+endif()
+# special case end
+
+add_subdirectory(access)
+add_subdirectory(kernel)
+add_subdirectory(socket)
+if(QT_FEATURE_openssl)
+    add_subdirectory(ssl)
+endif()
diff --git a/tests/benchmarks/network/access/CMakeLists.txt b/tests/benchmarks/network/access/CMakeLists.txt
new file mode 100644
index 0000000000..58f72cd248
--- /dev/null
+++ b/tests/benchmarks/network/access/CMakeLists.txt
@@ -0,0 +1,6 @@
+# Generated from access.pro.
+
+add_subdirectory(qfile_vs_qnetworkaccessmanager)
+add_subdirectory(qnetworkreply)
+add_subdirectory(qnetworkreply_from_cache)
+add_subdirectory(qnetworkdiskcache)
diff --git a/tests/benchmarks/network/access/qfile_vs_qnetworkaccessmanager/CMakeLists.txt b/tests/benchmarks/network/access/qfile_vs_qnetworkaccessmanager/CMakeLists.txt
new file mode 100644
index 0000000000..abfb0206d3
--- /dev/null
+++ b/tests/benchmarks/network/access/qfile_vs_qnetworkaccessmanager/CMakeLists.txt
@@ -0,0 +1,16 @@
+# Generated from qfile_vs_qnetworkaccessmanager.pro.
+
+#####################################################################
+## tst_bench_qfile_vs_qnetworkaccessmanager Binary:
+#####################################################################
+
+add_qt_benchmark(tst_bench_qfile_vs_qnetworkaccessmanager
+    SOURCES
+        main.cpp
+    PUBLIC_LIBRARIES
+        Qt::Network
+        Qt::Test
+)
+
+#### Keys ignored in scope 1:.:.:qfile_vs_qnetworkaccessmanager.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/benchmarks/network/access/qfile_vs_qnetworkaccessmanager/main.cpp b/tests/benchmarks/network/access/qfile_vs_qnetworkaccessmanager/main.cpp
index 46bb1791b4..1f3f38eaaf 100644
--- a/tests/benchmarks/network/access/qfile_vs_qnetworkaccessmanager/main.cpp
+++ b/tests/benchmarks/network/access/qfile_vs_qnetworkaccessmanager/main.cpp
@@ -105,7 +105,7 @@ void qfile_vs_qnetworkaccessmanager::qnamFileRead()
     }
 
     qint64 elapsed = t.elapsed();
-    qDebug() << endl << "Finished!";
+    qDebug() << Qt::endl << "Finished!";
     qDebug() << "Bytes:" << size;
     qDebug() << "Speed:" <<  (qreal(size*iterations) / 1024.0) / (qreal(elapsed) / 1000.0) << "KB/sec";
 }
@@ -138,7 +138,7 @@ void qfile_vs_qnetworkaccessmanager::qnamImmediateFileRead()
     }
 
     qint64 elapsed = t.elapsed();
-    qDebug() << endl << "Finished!";
+    qDebug() << Qt::endl << "Finished!";
     qDebug() << "Bytes:" << size;
     qDebug() << "Speed:" <<  (qreal(size*iterations) / 1024.0) / (qreal(elapsed) / 1000.0) << "KB/sec";
 }
@@ -167,7 +167,7 @@ void qfile_vs_qnetworkaccessmanager::qfileFileRead()
     }
 
     qint64 elapsed = t.elapsed();
-    qDebug() << endl << "Finished!";
+    qDebug() << Qt::endl << "Finished!";
     qDebug() << "Bytes:" << size;
     qDebug() << "Speed:" <<  (qreal(size*iterations) / 1024.0) / (qreal(elapsed) / 1000.0) << "KB/sec";
 }
diff --git a/tests/benchmarks/network/access/qnetworkdiskcache/CMakeLists.txt b/tests/benchmarks/network/access/qnetworkdiskcache/CMakeLists.txt
new file mode 100644
index 0000000000..d70d2756a9
--- /dev/null
+++ b/tests/benchmarks/network/access/qnetworkdiskcache/CMakeLists.txt
@@ -0,0 +1,16 @@
+# Generated from qnetworkdiskcache.pro.
+
+#####################################################################
+## tst_bench_qnetworkdiskcache Binary:
+#####################################################################
+
+add_qt_benchmark(tst_bench_qnetworkdiskcache
+    SOURCES
+        tst_qnetworkdiskcache.cpp
+    PUBLIC_LIBRARIES
+        Qt::Network
+        Qt::Test
+)
+
+#### Keys ignored in scope 1:.:.:qnetworkdiskcache.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/benchmarks/network/access/qnetworkreply/CMakeLists.txt b/tests/benchmarks/network/access/qnetworkreply/CMakeLists.txt
new file mode 100644
index 0000000000..c77f7b56f8
--- /dev/null
+++ b/tests/benchmarks/network/access/qnetworkreply/CMakeLists.txt
@@ -0,0 +1,18 @@
+# Generated from qnetworkreply.pro.
+
+#####################################################################
+## tst_bench_qnetworkreply Binary:
+#####################################################################
+
+add_qt_benchmark(tst_bench_qnetworkreply
+    SOURCES
+        tst_qnetworkreply.cpp
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::Network
+        Qt::NetworkPrivate
+        Qt::Test
+)
+
+#### Keys ignored in scope 1:.:.:qnetworkreply.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/benchmarks/network/access/qnetworkreply/tst_qnetworkreply.cpp b/tests/benchmarks/network/access/qnetworkreply/tst_qnetworkreply.cpp
index bcd354ebee..95ee094f00 100644
--- a/tests/benchmarks/network/access/qnetworkreply/tst_qnetworkreply.cpp
+++ b/tests/benchmarks/network/access/qnetworkreply/tst_qnetworkreply.cpp
@@ -545,15 +545,10 @@ void tst_qnetworkreply::echoPerformance()
 void tst_qnetworkreply::preConnectEncrypted()
 {
     QFETCH(int, sleepTime);
-    QFETCH(QSslConfiguration, sslConfiguration);
-    bool spdyEnabled = !sslConfiguration.isNull();
-
     QString hostName = QLatin1String("www.google.com");
 
     QNetworkAccessManager manager;
     QNetworkRequest request(QUrl("https://" + hostName));
-    if (spdyEnabled)
-        request.setAttribute(QNetworkRequest::SpdyAllowedAttribute, true);
 
     // make sure we have a full request including
     // DNS lookup, TCP and SSL handshakes
@@ -579,12 +574,7 @@ void tst_qnetworkreply::preConnectEncrypted()
     manager.clearAccessCache();
 
     // now try to make the connection beforehand
-    if (spdyEnabled) {
-        request.setAttribute(QNetworkRequest::SpdyAllowedAttribute, true);
-        manager.connectToHostEncrypted(hostName, 443, sslConfiguration);
-    } else {
-        manager.connectToHostEncrypted(hostName);
-    }
+    manager.connectToHostEncrypted(hostName);
     QTestEventLoop::instance().enterLoopMSecs(sleepTime);
 
     // now make another request and hopefully use the existing connection
@@ -592,8 +582,6 @@ void tst_qnetworkreply::preConnectEncrypted()
     QNetworkReply *preConnectReply = normalResult.first;
     QVERIFY(!QTestEventLoop::instance().timeout());
     QVERIFY(preConnectReply->error() == QNetworkReply::NoError);
-    bool spdyWasUsed = preConnectReply->attribute(QNetworkRequest::SpdyWasUsedAttribute).toBool();
-    QCOMPARE(spdyEnabled, spdyWasUsed);
     qint64 preConnectElapsed = preConnectResult.second;
     qDebug() << request.url().toString() << "full request:" << normalElapsed
              << "ms, pre-connect request:" << preConnectElapsed << "ms, difference:"
@@ -606,27 +594,11 @@ void tst_qnetworkreply::preConnectEncrypted_data()
 {
 #ifndef QT_NO_OPENSSL
     QTest::addColumn<int>("sleepTime");
-    QTest::addColumn<QSslConfiguration>("sslConfiguration");
-
     // start a new normal request after preconnecting is done
-    QTest::newRow("HTTPS-2secs") << 2000 << QSslConfiguration();
+    QTest::newRow("HTTPS-2secs") << 2000;
 
     // start a new normal request while preconnecting is in-flight
-    QTest::newRow("HTTPS-100ms") << 100 << QSslConfiguration();
-
-    QSslConfiguration spdySslConf = QSslConfiguration::defaultConfiguration();
-    QList<QByteArray> nextProtocols = QList<QByteArray>()
-            << QSslConfiguration::NextProtocolSpdy3_0
-            << QSslConfiguration::NextProtocolHttp1_1;
-    spdySslConf.setAllowedNextProtocols(nextProtocols);
-
-#if defined(QT_BUILD_INTERNAL) && !defined(QT_NO_SSL) && OPENSSL_VERSION_NUMBER >= 0x1000100fL && !defined(OPENSSL_NO_TLSEXT) && !defined(OPENSSL_NO_NEXTPROTONEG)
-    // start a new SPDY request while preconnecting is done
-    QTest::newRow("SPDY-2secs") << 2000 << spdySslConf;
-
-    // start a new SPDY request while preconnecting is in-flight
-    QTest::newRow("SPDY-100ms") << 100 << spdySslConf;
-#endif // defined (QT_BUILD_INTERNAL) && !defined(QT_NO_SSL) ...
+    QTest::newRow("HTTPS-100ms") << 100;
 #endif // QT_NO_OPENSSL
 }
 
diff --git a/tests/benchmarks/network/access/qnetworkreply_from_cache/CMakeLists.txt b/tests/benchmarks/network/access/qnetworkreply_from_cache/CMakeLists.txt
new file mode 100644
index 0000000000..57cfebb1ff
--- /dev/null
+++ b/tests/benchmarks/network/access/qnetworkreply_from_cache/CMakeLists.txt
@@ -0,0 +1,13 @@
+# Generated from qnetworkreply_from_cache.pro.
+
+#####################################################################
+## tst_bench_qnetworkreply_from_cache Binary:
+#####################################################################
+
+add_qt_benchmark(tst_bench_qnetworkreply_from_cache
+    SOURCES
+        tst_qnetworkreply_from_cache.cpp
+    PUBLIC_LIBRARIES
+        Qt::Network
+        Qt::Test
+)
diff --git a/tests/benchmarks/network/kernel/CMakeLists.txt b/tests/benchmarks/network/kernel/CMakeLists.txt
new file mode 100644
index 0000000000..13a7caecdb
--- /dev/null
+++ b/tests/benchmarks/network/kernel/CMakeLists.txt
@@ -0,0 +1,5 @@
+# Generated from kernel.pro.
+
+if(QT_FEATURE_private_tests)
+    add_subdirectory(qhostinfo)
+endif()
diff --git a/tests/benchmarks/network/kernel/qhostinfo/CMakeLists.txt b/tests/benchmarks/network/kernel/qhostinfo/CMakeLists.txt
new file mode 100644
index 0000000000..f234b5d7a4
--- /dev/null
+++ b/tests/benchmarks/network/kernel/qhostinfo/CMakeLists.txt
@@ -0,0 +1,18 @@
+# Generated from qhostinfo.pro.
+
+#####################################################################
+## tst_bench_qhostinfo Binary:
+#####################################################################
+
+add_qt_benchmark(tst_bench_qhostinfo
+    SOURCES
+        main.cpp
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::Network
+        Qt::NetworkPrivate
+        Qt::Test
+)
+
+#### Keys ignored in scope 1:.:.:qhostinfo.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/benchmarks/network/socket/CMakeLists.txt b/tests/benchmarks/network/socket/CMakeLists.txt
new file mode 100644
index 0000000000..6d54bc05f5
--- /dev/null
+++ b/tests/benchmarks/network/socket/CMakeLists.txt
@@ -0,0 +1,4 @@
+# Generated from socket.pro.
+
+add_subdirectory(qtcpserver)
+add_subdirectory(qudpsocket)
diff --git a/tests/benchmarks/network/socket/qtcpserver/CMakeLists.txt b/tests/benchmarks/network/socket/qtcpserver/CMakeLists.txt
new file mode 100644
index 0000000000..7e1eab88a9
--- /dev/null
+++ b/tests/benchmarks/network/socket/qtcpserver/CMakeLists.txt
@@ -0,0 +1,16 @@
+# Generated from qtcpserver.pro.
+
+#####################################################################
+## tst_bench_qtcpserver Binary:
+#####################################################################
+
+add_qt_benchmark(tst_bench_qtcpserver
+    SOURCES
+        tst_qtcpserver.cpp
+    PUBLIC_LIBRARIES
+        Qt::Network
+        Qt::Test
+)
+
+#### Keys ignored in scope 1:.:.:qtcpserver.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/benchmarks/network/socket/qudpsocket/CMakeLists.txt b/tests/benchmarks/network/socket/qudpsocket/CMakeLists.txt
new file mode 100644
index 0000000000..58b4ab17d4
--- /dev/null
+++ b/tests/benchmarks/network/socket/qudpsocket/CMakeLists.txt
@@ -0,0 +1,16 @@
+# Generated from qudpsocket.pro.
+
+#####################################################################
+## tst_bench_qudpsocket Binary:
+#####################################################################
+
+add_qt_benchmark(tst_bench_qudpsocket
+    SOURCES
+        tst_qudpsocket.cpp
+    PUBLIC_LIBRARIES
+        Qt::Network
+        Qt::Test
+)
+
+#### Keys ignored in scope 1:.:.:qudpsocket.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/benchmarks/network/ssl/CMakeLists.txt b/tests/benchmarks/network/ssl/CMakeLists.txt
new file mode 100644
index 0000000000..bc469359f1
--- /dev/null
+++ b/tests/benchmarks/network/ssl/CMakeLists.txt
@@ -0,0 +1,3 @@
+# Generated from ssl.pro.
+
+add_subdirectory(qsslsocket)
diff --git a/tests/benchmarks/network/ssl/qsslsocket/CMakeLists.txt b/tests/benchmarks/network/ssl/qsslsocket/CMakeLists.txt
new file mode 100644
index 0000000000..7a127b071d
--- /dev/null
+++ b/tests/benchmarks/network/ssl/qsslsocket/CMakeLists.txt
@@ -0,0 +1,16 @@
+# Generated from qsslsocket.pro.
+
+#####################################################################
+## tst_bench_qsslsocket Binary:
+#####################################################################
+
+add_qt_benchmark(tst_bench_qsslsocket
+    SOURCES
+        tst_qsslsocket.cpp
+    PUBLIC_LIBRARIES
+        Qt::Network
+        Qt::Test
+)
+
+#### Keys ignored in scope 1:.:.:qsslsocket.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/benchmarks/opengl/main.cpp b/tests/benchmarks/opengl/main.cpp
deleted file mode 100644
index 0886c0e55b..0000000000
--- a/tests/benchmarks/opengl/main.cpp
+++ /dev/null
@@ -1,412 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-#include <QtGui>
-#include <QtOpenGL>
-
-#include <qtest.h>
-
-#include <private/qpaintengine_opengl_p.h>
-
-class OpenGLBench : public QObject
-{
-    Q_OBJECT
-
-private slots:
-    void initTestCase();
-    void cleanupTestCase();
-
-    void imageDrawing_data();
-    void imageDrawing();
-
-    void pathDrawing_data();
-    void pathDrawing();
-
-    void painterOverhead();
-
-    void startupCost_data();
-    void startupCost();
-
-    void lineDrawing();
-
-    void textDrawing_data();
-    void textDrawing();
-
-    void clippedPainting_data();
-    void clippedPainting();
-
-    void gradients_data();
-    void gradients();
-
-    void textureUpload_data();
-    void textureUpload();
-
-
-private:
-    QGLPixelBuffer *pb;
-};
-
-void OpenGLBench::initTestCase()
-{
-    pb = new QGLPixelBuffer(512, 512);
-
-    QPainter p(pb);
-    p.setRenderHint(QPainter::Antialiasing);
-
-    p.drawImage(0, 0, QImage(256, 256, QImage::Format_ARGB32_Premultiplied));
-}
-
-void OpenGLBench::cleanupTestCase()
-{
-    delete pb;
-}
-
-void OpenGLBench::imageDrawing_data()
-{
-    QTest::addColumn<bool>("smoothPixmapTransform");
-    QTest::addColumn<bool>("highQualityAntialiasing");
-    QTest::addColumn<bool>("pixmap");
-
-    for (int i = 0; i < (1 << 3); ++i) {
-        bool smoothPixmapTransform = i & 1;
-        bool highQualityAntialiasing = i & 2;
-        bool pixmap = i & 4;
-
-        QTest::newRow(QString("pixmap=%1 highQualityAntialiasing=%2 smoothPixmapTransform=%3")
-                      .arg(pixmap).arg(highQualityAntialiasing).arg(smoothPixmapTransform).toLatin1().data())
-            << pixmap << highQualityAntialiasing << smoothPixmapTransform;
-    }
-}
-
-void OpenGLBench::imageDrawing()
-{
-    QFETCH(bool, smoothPixmapTransform);
-    QFETCH(bool, highQualityAntialiasing);
-    QFETCH(bool, pixmap);
-
-    QImage img;
-    QPixmap pm;
-
-    if (pixmap)
-        pm = QPixmap(800, 800);
-    else
-        img = QImage(800, 800, QImage::Format_ARGB32_Premultiplied);
-
-    QPainter p(pb);
-    p.setRenderHint(QPainter::SmoothPixmapTransform, smoothPixmapTransform);
-    p.setRenderHint(QPainter::Antialiasing, highQualityAntialiasing);
-
-    QBENCHMARK {
-        if (pixmap) {
-            pm.detach();
-            p.drawPixmap(0, 0, pm);
-        } else {
-            img.detach();
-            p.drawImage(0, 0, img);
-        }
-    }
-}
-
-Q_DECLARE_METATYPE(QPainterPath)
-
-void OpenGLBench::pathDrawing_data()
-{
-    QTest::addColumn<QPainterPath>("path");
-    QTest::addColumn<bool>("highQualityAntialiasing");
-
-    QList<QPair<QPainterPath, QLatin1String> > paths;
-
-    {
-        QPainterPath path;
-        path.addRect(-100, -100, 200, 200);
-        paths << qMakePair(path, QLatin1String("plain rect"));
-    }
-
-    {
-        QPainterPath path;
-        path.addRoundedRect(-100, -100, 200, 200, 50, 50);
-        paths << qMakePair(path, QLatin1String("rounded rect"));
-    }
-
-    {
-        QPainterPath path;
-        path.addEllipse(-100, -100, 200, 200);
-        paths << qMakePair(path, QLatin1String("ellipse"));
-    }
-
-    for (int j = 0; j < (1 << 1); ++j) {
-        bool highQualityAntialiasing = j & 1;
-
-        for (int i = 0; i < paths.size(); ++i) {
-            QTest::newRow(QString("path=%1 highQualityAntialiasing=%2")
-                    .arg(paths[i].second).arg(highQualityAntialiasing).toLatin1().data())
-                << paths[i].first << highQualityAntialiasing;
-        }
-    }
-}
-
-void OpenGLBench::pathDrawing()
-{
-    QFETCH(QPainterPath, path);
-    QFETCH(bool, highQualityAntialiasing);
-
-    // warm-up
-    {
-        QPainterPath dummy;
-        dummy.addRect(-1, -1, 2, 2);
-        QPainter p(pb);
-        p.setRenderHint(QPainter::Antialiasing, highQualityAntialiasing);
-        p.translate(pb->width() / 2, pb->height() / 2);
-        p.rotate(30);
-        p.drawPath(dummy);
-        p.end();
-    }
-
-    QPainter p(pb);
-    p.setPen(Qt::NoPen);
-    p.setBrush(Qt::black);
-    p.translate(pb->width() / 2, pb->height() / 2);
-
-    QBENCHMARK {
-        p.setRenderHint(QPainter::Antialiasing, highQualityAntialiasing);
-
-        p.rotate(0.01);
-        p.drawPath(path);
-    }
-}
-
-void OpenGLBench::painterOverhead()
-{
-    QBENCHMARK {
-        QPainter p(pb);
-    }
-}
-
-void OpenGLBench::startupCost_data()
-{
-    QTest::addColumn<bool>("highQualityAntialiasing");
-
-    QTest::newRow("highQualityAntialiasing=0") << false;
-    QTest::newRow("highQualityAntialiasing=1") << true;
-}
-
-void OpenGLBench::startupCost()
-{
-    QFETCH(bool, highQualityAntialiasing);
-    QPainterPath path;
-    path.addRoundedRect(-100, -100, 200, 200, 20, 20);
-    QBENCHMARK {
-        QGLPixelBuffer buffer(512, 512);
-        QPainter p(&buffer);
-        p.setRenderHint(QPainter::Antialiasing, highQualityAntialiasing);
-
-        p.translate(buffer.width() / 2, buffer.height() / 2);
-        p.drawPath(path);
-    }
-}
-
-void OpenGLBench::lineDrawing()
-{
-    QPainter p(pb);
-
-    QBENCHMARK {
-        p.drawLine(10, 10, 500, 500);
-    }
-}
-
-void OpenGLBench::textDrawing_data()
-{
-    QTest::addColumn<int>("lines");
-
-    int lines[] = { 1, 2, 4, 8, 16, 32, 64, 128 };
-
-    QTest::newRow("text lines=1 (warmup run)") << 1;
-    for (unsigned int i = 0; i < sizeof(lines) / sizeof(int); ++i)
-        QTest::newRow(QString("text lines=%0").arg(lines[i]).toLatin1().data()) << lines[i];
-}
-
-void OpenGLBench::textDrawing()
-{
-    QPainter p(pb);
-
-    QFETCH(int, lines);
-
-    p.translate(0, 16);
-    QBENCHMARK {
-        for (int i = 0; i < lines; ++i)
-            p.drawText(0, i, "Hello World!");
-    }
-}
-
-void OpenGLBench::clippedPainting_data()
-{
-    QTest::addColumn<QPainterPath>("path");
-
-    QRectF rect = QRectF(0, 0, pb->width(), pb->height()).adjusted(5, 5, -5, -5);
-
-    {
-        QPainterPath path;
-        path.addRect(rect);
-        QTest::newRow("rect path") << path;
-    }
-
-    {
-        QPainterPath path;
-        path.addRoundedRect(rect, 5, 5);
-        QTest::newRow("rounded rect path") << path;
-    }
-
-    {
-        QPainterPath path;
-        path.addEllipse(rect);
-        QTest::newRow("ellipse path") << path;
-    }
-}
-
-void OpenGLBench::clippedPainting()
-{
-    QFETCH(QPainterPath, path);
-
-    QBENCHMARK {
-        QPainter p(pb);
-        p.setPen(Qt::NoPen);
-        p.setBrush(Qt::black);
-
-        p.setClipPath(path);
-        p.drawRect(0, 0, pb->width(), pb->height());
-    }
-}
-
-Q_DECLARE_METATYPE(QGradient::Type)
-
-void OpenGLBench::gradients_data()
-{
-    QTest::addColumn<QGradient::Type>("gradientType");
-    QTest::addColumn<bool>("objectBoundingMode");
-
-    QTest::newRow("warmup run") << QGradient::LinearGradient << false;
-
-    QTest::newRow("linear gradient") << QGradient::LinearGradient << false;
-    QTest::newRow("radial gradient") << QGradient::RadialGradient << false;
-    QTest::newRow("conical gradient") << QGradient::ConicalGradient << false;
-
-    QTest::newRow("linear gradient, object bounding mode") << QGradient::LinearGradient << true;
-    QTest::newRow("radial gradient, object bounding mode") << QGradient::RadialGradient << true;
-    QTest::newRow("conical gradient, object bounding mode") << QGradient::ConicalGradient << true;
-}
-
-void OpenGLBench::gradients()
-{
-    QFETCH(QGradient::Type, gradientType);
-    QFETCH(bool, objectBoundingMode);
-
-    QPointF a;
-    QPointF b = objectBoundingMode ? QPointF(1, 1) : QPointF(pb->width(), pb->height());
-
-    QGradient gradient;
-    switch (gradientType) {
-    case QGradient::LinearGradient:
-        gradient = QLinearGradient(a, b);
-        break;
-    case QGradient::RadialGradient:
-        gradient = QRadialGradient(a, b.x() / 2, b);
-        break;
-    case QGradient::ConicalGradient:
-        gradient = QConicalGradient((a + b)/2, 0);
-        break;
-    default:
-        break;
-    }
-
-    if (objectBoundingMode)
-        gradient.setCoordinateMode(QGradient::ObjectBoundingMode);
-
-    gradient.setColorAt(0, Qt::red);
-    gradient.setColorAt(0.2, Qt::blue);
-    gradient.setColorAt(0.4, Qt::transparent);
-    gradient.setColorAt(0.6, Qt::green);
-    gradient.setColorAt(0.8, Qt::black);
-    gradient.setColorAt(1, Qt::white);
-
-    QPainter p(pb);
-
-    QBENCHMARK {
-        p.fillRect(0, 0, pb->width(), pb->height(), gradient);
-        glFinish();
-    }
-}
-
-void OpenGLBench::textureUpload_data()
-{
-    QTest::addColumn<int>("size");
-    QTest::addColumn<int>("flags");
-    QTest::addColumn<int>("format");
-
-    int sizes[] = { 8, 10, 16, 20, 32, 50, 64, 100, 128, 200, 256, 500, 512, 1000, 1024, 2000, 2048, -1 };
-    int flags[] = { QGLContext::InternalBindOption,
-                  QGLContext::DefaultBindOption,
-                  -1 };
-    int formats[] = { GL_RGB, GL_RGBA, -1 };
-
-    for (int s = 0; sizes[s] != -1; ++s) {
-        for (int f = 0; flags[f] != -1; ++f) {
-            for (int a = 0; formats[a] != -1; ++a) {
-                QByteArray name;
-                name.append("size=").append(QByteArray::number(sizes[s]));
-                name.append(", flags=").append(f == 0 ? "internal" : "default");
-                name.append(", format=").append(a == 0 ? "RGB" : "RGBA");
-                QTest::newRow(name.constData()) << sizes[s] << flags[f] << formats[a];
-            }
-        }
-    }
-}
-
-void OpenGLBench::textureUpload()
-{
-    QFETCH(int, size);
-    QFETCH(int, flags);
-    QFETCH(int, format);
-
-    QPixmap pixmap(size, size);
-
-    if (format == GL_RGB)
-        pixmap.fill(Qt::red);
-    else
-        pixmap.fill(Qt::transparent);
-
-    pb->makeCurrent();
-    QGLContext *context = const_cast<QGLContext *>(QGLContext::currentContext());
-    QTime time;
-
-    time.start();
-    context->bindTexture(pixmap, GL_TEXTURE_2D, format, (QGLContext::BindOptions) flags);
-    QTest::setBenchmarkResult(time.elapsed(), QTest::WalltimeMilliseconds);
-}
-
-QTEST_MAIN(OpenGLBench)
-
-#include "main.moc"
diff --git a/tests/benchmarks/opengl/opengl.pro b/tests/benchmarks/opengl/opengl.pro
deleted file mode 100644
index 04e75065fd..0000000000
--- a/tests/benchmarks/opengl/opengl.pro
+++ /dev/null
@@ -1,9 +0,0 @@
-TEMPLATE = app
-TARGET = tst_bench_opengl
-
-QT += core-private gui-private opengl opengl-private testlib
-
-SOURCES += main.cpp
-
-include(../trusted-benchmarks.pri)
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/benchmarks/plugins/imageformats/jpeg/CMakeLists.txt b/tests/benchmarks/plugins/imageformats/jpeg/CMakeLists.txt
new file mode 100644
index 0000000000..63262d19ce
--- /dev/null
+++ b/tests/benchmarks/plugins/imageformats/jpeg/CMakeLists.txt
@@ -0,0 +1,17 @@
+# Generated from jpeg.pro.
+
+#####################################################################
+## jpeg Binary:
+#####################################################################
+
+add_qt_benchmark(jpeg
+    SOURCES
+        jpeg.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Test
+)
+
+#### Keys ignored in scope 1:.:.:jpeg.pro:<TRUE>:
+# TEMPLATE = "app"
+# TESTDATA = "n900.jpeg"
diff --git a/tests/benchmarks/sql/CMakeLists.txt b/tests/benchmarks/sql/CMakeLists.txt
new file mode 100644
index 0000000000..c4d96e338d
--- /dev/null
+++ b/tests/benchmarks/sql/CMakeLists.txt
@@ -0,0 +1,3 @@
+# Generated from sql.pro.
+
+add_subdirectory(kernel)
diff --git a/tests/benchmarks/sql/kernel/CMakeLists.txt b/tests/benchmarks/sql/kernel/CMakeLists.txt
new file mode 100644
index 0000000000..86108db75d
--- /dev/null
+++ b/tests/benchmarks/sql/kernel/CMakeLists.txt
@@ -0,0 +1,4 @@
+# Generated from kernel.pro.
+
+add_subdirectory(qsqlquery)
+add_subdirectory(qsqlrecord)
diff --git a/tests/benchmarks/sql/kernel/qsqlquery/CMakeLists.txt b/tests/benchmarks/sql/kernel/qsqlquery/CMakeLists.txt
new file mode 100644
index 0000000000..95e3aca221
--- /dev/null
+++ b/tests/benchmarks/sql/kernel/qsqlquery/CMakeLists.txt
@@ -0,0 +1,15 @@
+# Generated from qsqlquery.pro.
+
+#####################################################################
+## tst_bench_qsqlquery Binary:
+#####################################################################
+
+add_qt_benchmark(tst_bench_qsqlquery
+    SOURCES
+        main.cpp
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::Sql
+        Qt::SqlPrivate
+        Qt::Test
+)
diff --git a/tests/benchmarks/sql/kernel/qsqlrecord/CMakeLists.txt b/tests/benchmarks/sql/kernel/qsqlrecord/CMakeLists.txt
new file mode 100644
index 0000000000..b55d46984f
--- /dev/null
+++ b/tests/benchmarks/sql/kernel/qsqlrecord/CMakeLists.txt
@@ -0,0 +1,15 @@
+# Generated from qsqlrecord.pro.
+
+#####################################################################
+## tst_bench_qsqlrecord Binary:
+#####################################################################
+
+add_qt_benchmark(tst_bench_qsqlrecord
+    SOURCES
+        tst_qsqlrecord.cpp
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::Sql
+        Qt::SqlPrivate
+        Qt::Test
+)
diff --git a/tests/benchmarks/testlib/CMakeLists.txt b/tests/benchmarks/testlib/CMakeLists.txt
new file mode 100644
index 0000000000..e7bd29b564
--- /dev/null
+++ b/tests/benchmarks/testlib/CMakeLists.txt
@@ -0,0 +1,3 @@
+# Generated from testlib.pro.
+
+add_subdirectory(tostring)
diff --git a/tests/benchmarks/testlib/tostring/CMakeLists.txt b/tests/benchmarks/testlib/tostring/CMakeLists.txt
new file mode 100644
index 0000000000..76c0f1db1c
--- /dev/null
+++ b/tests/benchmarks/testlib/tostring/CMakeLists.txt
@@ -0,0 +1,12 @@
+# Generated from tostring.pro.
+
+#####################################################################
+## tst_bench_tostring Binary:
+#####################################################################
+
+add_qt_benchmark(tst_bench_tostring
+    SOURCES
+        tst_tostring.cpp
+    PUBLIC_LIBRARIES
+        Qt::Test
+)
diff --git a/tests/benchmarks/widgets/CMakeLists.txt b/tests/benchmarks/widgets/CMakeLists.txt
new file mode 100644
index 0000000000..bf543e664d
--- /dev/null
+++ b/tests/benchmarks/widgets/CMakeLists.txt
@@ -0,0 +1,7 @@
+# Generated from widgets.pro.
+
+add_subdirectory(graphicsview)
+add_subdirectory(itemviews)
+add_subdirectory(kernel)
+add_subdirectory(styles)
+add_subdirectory(widgets)
diff --git a/tests/benchmarks/widgets/graphicsview/CMakeLists.txt b/tests/benchmarks/widgets/graphicsview/CMakeLists.txt
new file mode 100644
index 0000000000..3928328a98
--- /dev/null
+++ b/tests/benchmarks/widgets/graphicsview/CMakeLists.txt
@@ -0,0 +1,10 @@
+# Generated from graphicsview.pro.
+
+add_subdirectory(functional)
+add_subdirectory(qgraphicsanchorlayout)
+add_subdirectory(qgraphicsitem)
+add_subdirectory(qgraphicslayout)
+add_subdirectory(qgraphicslinearlayout)
+add_subdirectory(qgraphicsscene)
+add_subdirectory(qgraphicsview)
+add_subdirectory(qgraphicswidget)
diff --git a/tests/benchmarks/widgets/graphicsview/functional/CMakeLists.txt b/tests/benchmarks/widgets/graphicsview/functional/CMakeLists.txt
new file mode 100644
index 0000000000..20e4286a6e
--- /dev/null
+++ b/tests/benchmarks/widgets/graphicsview/functional/CMakeLists.txt
@@ -0,0 +1,2 @@
+# Generated from functional.pro.
+
diff --git a/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/CMakeLists.txt b/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/CMakeLists.txt
new file mode 100644
index 0000000000..8fac5c3497
--- /dev/null
+++ b/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/CMakeLists.txt
@@ -0,0 +1,367 @@
+# Generated from GraphicsViewBenchmark.pro.
+
+#####################################################################
+## tst_GraphicsViewBenchmark Binary:
+#####################################################################
+
+add_qt_benchmark(tst_GraphicsViewBenchmark
+    SOURCES
+        main.cpp
+        widgets/abstractitemcontainer.cpp widgets/abstractitemcontainer.h
+        widgets/abstractitemview.cpp widgets/abstractitemview.h
+        widgets/abstractscrollarea.cpp widgets/abstractscrollarea.h
+        widgets/abstractviewitem.cpp widgets/abstractviewitem.h
+        widgets/backgrounditem.cpp widgets/backgrounditem.h
+        widgets/button.cpp widgets/button.h
+        widgets/commandline.cpp widgets/commandline.h
+        widgets/dummydatagen.cpp widgets/dummydatagen.h
+        widgets/gvbwidget.cpp widgets/gvbwidget.h
+        widgets/iconitem.cpp widgets/iconitem.h
+        widgets/itemrecyclinglist.cpp widgets/itemrecyclinglist.h
+        widgets/itemrecyclinglistview.cpp widgets/itemrecyclinglistview.h
+        widgets/label.cpp widgets/label.h
+        widgets/listitem.cpp widgets/listitem.h
+        widgets/listitemcache.cpp widgets/listitemcache.h
+        widgets/listitemcontainer.cpp widgets/listitemcontainer.h
+        widgets/listmodel.cpp widgets/listmodel.h
+        widgets/listwidget.cpp widgets/listwidget.h
+        widgets/mainview.cpp widgets/mainview.h
+        widgets/menu.cpp widgets/menu.h
+        widgets/recycledlistitem.cpp widgets/recycledlistitem.h
+        widgets/scrollbar.cpp widgets/scrollbar.h
+        widgets/scroller.cpp widgets/scroller.h widgets/scroller_p.h
+        widgets/settings.cpp widgets/settings.h
+        widgets/simplelist.cpp widgets/simplelist.h
+        widgets/simplelistview.cpp widgets/simplelistview.h
+        widgets/theme.cpp widgets/theme.h
+        widgets/themeevent.cpp widgets/themeevent.h
+        widgets/topbar.cpp widgets/topbar.h
+    INCLUDE_DIRECTORIES
+        widgets
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Svg
+        Qt::Test
+)
+
+# Resources:
+set_source_files_properties("resources/blue_SVG/blue_background_360x640px.svg"
+    PROPERTIES QT_RESOURCE_ALIAS "background.svg"
+)
+set_source_files_properties("resources/blue_SVG/blue_background_horisontal_640x360px.svg"
+    PROPERTIES QT_RESOURCE_ALIAS "background_horisontal.svg"
+)
+set_source_files_properties("resources/blue_SVG/blue_contact_default_icon_52x52px.svg"
+    PROPERTIES QT_RESOURCE_ALIAS "contact_default_icon.svg"
+)
+set_source_files_properties("resources/blue_SVG/blue_contact_list_divider_360x76px.svg"
+    PROPERTIES QT_RESOURCE_ALIAS "contact_list_divider.svg"
+)
+set_source_files_properties("resources/blue_SVG/blue_contact_list_highlighter_360x76px.svg"
+    PROPERTIES QT_RESOURCE_ALIAS "contact_list_highlighter.svg"
+)
+set_source_files_properties("resources/blue_SVG/blue_contact_status_idle_33x33px.svg"
+    PROPERTIES QT_RESOURCE_ALIAS "contact_status_idle.svg"
+)
+set_source_files_properties("resources/blue_SVG/blue_contact_status_offline_33x33px.svg"
+    PROPERTIES QT_RESOURCE_ALIAS "contact_status_offline.svg"
+)
+set_source_files_properties("resources/blue_SVG/blue_contact_status_online_33x33px.svg"
+    PROPERTIES QT_RESOURCE_ALIAS "contact_status_online.svg"
+)
+set_source_files_properties("resources/blue_SVG/blue_scroll_16x80px.svg"
+    PROPERTIES QT_RESOURCE_ALIAS "scroll.svg"
+)
+set_source_files_properties("resources/blue_SVG/blue_scrollbar_7x14px.svg"
+    PROPERTIES QT_RESOURCE_ALIAS "scrollbar.svg"
+)
+set_source_files_properties("resources/blue_SVG/blue_status_field_left_14x24px.svg"
+    PROPERTIES QT_RESOURCE_ALIAS "status_field_left.svg"
+)
+set_source_files_properties("resources/blue_SVG/blue_status_field_middle_14x24px.svg"
+    PROPERTIES QT_RESOURCE_ALIAS "status_field_middle.svg"
+)
+set_source_files_properties("resources/blue_SVG/blue_status_field_right_14x24px.svg"
+    PROPERTIES QT_RESOURCE_ALIAS "status_field_right.svg"
+)
+set_source_files_properties("resources/blue_SVG/blue_topbar_356x96px.svg"
+    PROPERTIES QT_RESOURCE_ALIAS "topbar.svg"
+)
+set_source_files_properties("resources/blue_SVG/blue_topbar_horisontal_636x96px.svg"
+    PROPERTIES QT_RESOURCE_ALIAS "topbar_horisontal.svg"
+)
+set_source_files_properties("resources/blue_SVG/blue_user_default_icon_68x68px.svg"
+    PROPERTIES QT_RESOURCE_ALIAS "user_default_icon.svg"
+)
+set_source_files_properties("resources/blue_SVG/blue_user_status_idle_38x38px.svg"
+    PROPERTIES QT_RESOURCE_ALIAS "user_status_idle.svg"
+)
+set_source_files_properties("resources/blue_SVG/blue_user_status_offline_38x38px.svg"
+    PROPERTIES QT_RESOURCE_ALIAS "user_status_offline.svg"
+)
+set_source_files_properties("resources/blue_SVG/blue_user_status_online_38x38px.svg"
+    PROPERTIES QT_RESOURCE_ALIAS "user_status_online.svg"
+)
+set(GraphicsViewBenchmark_resource_files
+    "resources/blue_SVG/blue_background_360x640px.svg"
+    "resources/blue_SVG/blue_background_horisontal_640x360px.svg"
+    "resources/blue_SVG/blue_contact_default_icon_52x52px.svg"
+    "resources/blue_SVG/blue_contact_list_divider_360x76px.svg"
+    "resources/blue_SVG/blue_contact_list_highlighter_360x76px.svg"
+    "resources/blue_SVG/blue_contact_status_idle_33x33px.svg"
+    "resources/blue_SVG/blue_contact_status_offline_33x33px.svg"
+    "resources/blue_SVG/blue_contact_status_online_33x33px.svg"
+    "resources/blue_SVG/blue_scroll_16x80px.svg"
+    "resources/blue_SVG/blue_scrollbar_7x14px.svg"
+    "resources/blue_SVG/blue_status_field_left_14x24px.svg"
+    "resources/blue_SVG/blue_status_field_middle_14x24px.svg"
+    "resources/blue_SVG/blue_status_field_right_14x24px.svg"
+    "resources/blue_SVG/blue_topbar_356x96px.svg"
+    "resources/blue_SVG/blue_topbar_horisontal_636x96px.svg"
+    "resources/blue_SVG/blue_user_default_icon_68x68px.svg"
+    "resources/blue_SVG/blue_user_status_idle_38x38px.svg"
+    "resources/blue_SVG/blue_user_status_offline_38x38px.svg"
+    "resources/blue_SVG/blue_user_status_online_38x38px.svg"
+)
+
+add_qt_resource(tst_GraphicsViewBenchmark "GraphicsViewBenchmark"
+    PREFIX
+        "/themes/blue"
+    FILES
+        ${GraphicsViewBenchmark_resource_files}
+)
+set_source_files_properties("resources/blue_SVG/blue_contact_status_idle_33x33px.svg"
+    PROPERTIES QT_RESOURCE_ALIAS "contact_status_idle.svg"
+)
+set_source_files_properties("resources/blue_SVG/blue_contact_status_offline_33x33px.svg"
+    PROPERTIES QT_RESOURCE_ALIAS "contact_status_offline.svg"
+)
+set_source_files_properties("resources/blue_SVG/blue_contact_status_online_33x33px.svg"
+    PROPERTIES QT_RESOURCE_ALIAS "contact_status_online.svg"
+)
+set_source_files_properties("resources/lime_SVG/lime_background_360x640px.svg"
+    PROPERTIES QT_RESOURCE_ALIAS "background.svg"
+)
+set_source_files_properties("resources/lime_SVG/lime_background_horisontal_640x360px.svg"
+    PROPERTIES QT_RESOURCE_ALIAS "background_horisontal.svg"
+)
+set_source_files_properties("resources/lime_SVG/lime_contact_default_icon_53x53px.svg"
+    PROPERTIES QT_RESOURCE_ALIAS "contact_default_icon.svg"
+)
+set_source_files_properties("resources/lime_SVG/lime_contact_default_icon_highlight_53x53px.svg"
+    PROPERTIES QT_RESOURCE_ALIAS "contact_default_icon_highlight.svg"
+)
+set_source_files_properties("resources/lime_SVG/lime_contact_list_divider_360x76px.svg"
+    PROPERTIES QT_RESOURCE_ALIAS "contact_list_divider.svg"
+)
+set_source_files_properties("resources/lime_SVG/lime_contact_list_highlighter_357x80px.svg"
+    PROPERTIES QT_RESOURCE_ALIAS "contact_list_highlighter.svg"
+)
+set_source_files_properties("resources/lime_SVG/lime_scroll_5x80px.svg"
+    PROPERTIES QT_RESOURCE_ALIAS "scroll.svg"
+)
+set_source_files_properties("resources/lime_SVG/lime_scrollbar_5x14px.svg"
+    PROPERTIES QT_RESOURCE_ALIAS "scrollbar.svg"
+)
+set_source_files_properties("resources/lime_SVG/lime_status_field_left_14x24px.svg"
+    PROPERTIES QT_RESOURCE_ALIAS "status_field_left.svg"
+)
+set_source_files_properties("resources/lime_SVG/lime_status_field_middle_10x24px.svg"
+    PROPERTIES QT_RESOURCE_ALIAS "status_field_middle.svg"
+)
+set_source_files_properties("resources/lime_SVG/lime_status_field_right_14x24px.svg"
+    PROPERTIES QT_RESOURCE_ALIAS "status_field_right.svg"
+)
+set_source_files_properties("resources/lime_SVG/lime_topbar_356x96px.svg"
+    PROPERTIES QT_RESOURCE_ALIAS "topbar.svg"
+)
+set_source_files_properties("resources/lime_SVG/lime_topbar_horisontal_636x96px.svg"
+    PROPERTIES QT_RESOURCE_ALIAS "topbar_horisontal.svg"
+)
+set_source_files_properties("resources/lime_SVG/lime_user_default_icon_84x68px.svg"
+    PROPERTIES QT_RESOURCE_ALIAS "user_default_icon.svg"
+)
+set_source_files_properties("resources/lime_SVG/lime_user_status_idle_24x24px.svg"
+    PROPERTIES QT_RESOURCE_ALIAS "user_status_idle.svg"
+)
+set_source_files_properties("resources/lime_SVG/lime_user_status_offline_24x24px.svg"
+    PROPERTIES QT_RESOURCE_ALIAS "user_status_offline.svg"
+)
+set_source_files_properties("resources/lime_SVG/lime_user_status_online_24x24px.svg"
+    PROPERTIES QT_RESOURCE_ALIAS "user_status_online.svg"
+)
+set(GraphicsViewBenchmark1_resource_files
+    "resources/blue_SVG/blue_contact_status_idle_33x33px.svg"
+    "resources/blue_SVG/blue_contact_status_offline_33x33px.svg"
+    "resources/blue_SVG/blue_contact_status_online_33x33px.svg"
+    "resources/lime_SVG/lime_background_360x640px.svg"
+    "resources/lime_SVG/lime_background_horisontal_640x360px.svg"
+    "resources/lime_SVG/lime_contact_default_icon_53x53px.svg"
+    "resources/lime_SVG/lime_contact_default_icon_highlight_53x53px.svg"
+    "resources/lime_SVG/lime_contact_list_divider_360x76px.svg"
+    "resources/lime_SVG/lime_contact_list_highlighter_357x80px.svg"
+    "resources/lime_SVG/lime_scroll_5x80px.svg"
+    "resources/lime_SVG/lime_scrollbar_5x14px.svg"
+    "resources/lime_SVG/lime_status_field_left_14x24px.svg"
+    "resources/lime_SVG/lime_status_field_middle_10x24px.svg"
+    "resources/lime_SVG/lime_status_field_right_14x24px.svg"
+    "resources/lime_SVG/lime_topbar_356x96px.svg"
+    "resources/lime_SVG/lime_topbar_horisontal_636x96px.svg"
+    "resources/lime_SVG/lime_user_default_icon_84x68px.svg"
+    "resources/lime_SVG/lime_user_status_idle_24x24px.svg"
+    "resources/lime_SVG/lime_user_status_offline_24x24px.svg"
+    "resources/lime_SVG/lime_user_status_online_24x24px.svg"
+)
+
+add_qt_resource(tst_GraphicsViewBenchmark "GraphicsViewBenchmark1"
+    PREFIX
+        "/themes/lime"
+    FILES
+        ${GraphicsViewBenchmark1_resource_files}
+)
+set_source_files_properties("resources/avatars/avatar_man_001_58x58.png"
+    PROPERTIES QT_RESOURCE_ALIAS "avatar_001.png"
+)
+set_source_files_properties("resources/avatars/avatar_man_002_58x58.png"
+    PROPERTIES QT_RESOURCE_ALIAS "avatar_002.png"
+)
+set_source_files_properties("resources/avatars/avatar_man_003_58x58.png"
+    PROPERTIES QT_RESOURCE_ALIAS "avatar_003.png"
+)
+set_source_files_properties("resources/avatars/avatar_man_004_58x58.png"
+    PROPERTIES QT_RESOURCE_ALIAS "avatar_004.png"
+)
+set_source_files_properties("resources/avatars/avatar_man_005_58x58.png"
+    PROPERTIES QT_RESOURCE_ALIAS "avatar_005.png"
+)
+set_source_files_properties("resources/avatars/avatar_man_006_58x58.png"
+    PROPERTIES QT_RESOURCE_ALIAS "avatar_006.png"
+)
+set_source_files_properties("resources/avatars/avatar_man_007_58x58.png"
+    PROPERTIES QT_RESOURCE_ALIAS "avatar_007.png"
+)
+set_source_files_properties("resources/avatars/avatar_man_008_58x58.png"
+    PROPERTIES QT_RESOURCE_ALIAS "avatar_008.png"
+)
+set_source_files_properties("resources/avatars/avatar_man_009_58x58.png"
+    PROPERTIES QT_RESOURCE_ALIAS "avatar_009.png"
+)
+set_source_files_properties("resources/avatars/avatar_man_010_58x58.png"
+    PROPERTIES QT_RESOURCE_ALIAS "avatar_010.png"
+)
+set_source_files_properties("resources/avatars/avatar_picture_001_58x58.png"
+    PROPERTIES QT_RESOURCE_ALIAS "avatar_011.png"
+)
+set_source_files_properties("resources/avatars/avatar_picture_002_58x58.png"
+    PROPERTIES QT_RESOURCE_ALIAS "avatar_012.png"
+)
+set_source_files_properties("resources/avatars/avatar_picture_003_58x58.png"
+    PROPERTIES QT_RESOURCE_ALIAS "avatar_013.png"
+)
+set_source_files_properties("resources/avatars/avatar_picture_004_58x58.png"
+    PROPERTIES QT_RESOURCE_ALIAS "avatar_014.png"
+)
+set_source_files_properties("resources/avatars/avatar_picture_005_58x58.png"
+    PROPERTIES QT_RESOURCE_ALIAS "avatar_015.png"
+)
+set_source_files_properties("resources/avatars/avatar_woman_001_58x58.png"
+    PROPERTIES QT_RESOURCE_ALIAS "avatar_016.png"
+)
+set_source_files_properties("resources/avatars/avatar_woman_002_58x58.png"
+    PROPERTIES QT_RESOURCE_ALIAS "avatar_017.png"
+)
+set_source_files_properties("resources/avatars/avatar_woman_003_58x58.png"
+    PROPERTIES QT_RESOURCE_ALIAS "avatar_018.png"
+)
+set_source_files_properties("resources/avatars/avatar_woman_004_58x58.png"
+    PROPERTIES QT_RESOURCE_ALIAS "avatar_019.png"
+)
+set_source_files_properties("resources/avatars/avatar_woman_005_58x58.png"
+    PROPERTIES QT_RESOURCE_ALIAS "avatar_020.png"
+)
+set_source_files_properties("resources/avatars/avatar_woman_006_58x58.png"
+    PROPERTIES QT_RESOURCE_ALIAS "avatar_021.png"
+)
+set_source_files_properties("resources/avatars/avatar_woman_007_58x58.png"
+    PROPERTIES QT_RESOURCE_ALIAS "avatar_022.png"
+)
+set_source_files_properties("resources/avatars/avatar_woman_008_58x58.png"
+    PROPERTIES QT_RESOURCE_ALIAS "avatar_023.png"
+)
+set_source_files_properties("resources/avatars/avatar_woman_009_58x58.png"
+    PROPERTIES QT_RESOURCE_ALIAS "avatar_024.png"
+)
+set_source_files_properties("resources/avatars/avatar_woman_010_58x58.png"
+    PROPERTIES QT_RESOURCE_ALIAS "avatar_025.png"
+)
+set(GraphicsViewBenchmark2_resource_files
+    "resources/avatars/avatar_man_001_58x58.png"
+    "resources/avatars/avatar_man_002_58x58.png"
+    "resources/avatars/avatar_man_003_58x58.png"
+    "resources/avatars/avatar_man_004_58x58.png"
+    "resources/avatars/avatar_man_005_58x58.png"
+    "resources/avatars/avatar_man_006_58x58.png"
+    "resources/avatars/avatar_man_007_58x58.png"
+    "resources/avatars/avatar_man_008_58x58.png"
+    "resources/avatars/avatar_man_009_58x58.png"
+    "resources/avatars/avatar_man_010_58x58.png"
+    "resources/avatars/avatar_picture_001_58x58.png"
+    "resources/avatars/avatar_picture_002_58x58.png"
+    "resources/avatars/avatar_picture_003_58x58.png"
+    "resources/avatars/avatar_picture_004_58x58.png"
+    "resources/avatars/avatar_picture_005_58x58.png"
+    "resources/avatars/avatar_woman_001_58x58.png"
+    "resources/avatars/avatar_woman_002_58x58.png"
+    "resources/avatars/avatar_woman_003_58x58.png"
+    "resources/avatars/avatar_woman_004_58x58.png"
+    "resources/avatars/avatar_woman_005_58x58.png"
+    "resources/avatars/avatar_woman_006_58x58.png"
+    "resources/avatars/avatar_woman_007_58x58.png"
+    "resources/avatars/avatar_woman_008_58x58.png"
+    "resources/avatars/avatar_woman_009_58x58.png"
+    "resources/avatars/avatar_woman_010_58x58.png"
+)
+
+add_qt_resource(tst_GraphicsViewBenchmark "GraphicsViewBenchmark2"
+    PREFIX
+        "/avatars"
+    FILES
+        ${GraphicsViewBenchmark2_resource_files}
+)
+set_source_files_properties("resources/contacts/areacodes.txt"
+    PROPERTIES QT_RESOURCE_ALIAS "areacodes.txt"
+)
+set_source_files_properties("resources/contacts/firstnamesF.txt"
+    PROPERTIES QT_RESOURCE_ALIAS "firstnamesF.txt"
+)
+set_source_files_properties("resources/contacts/firstnamesM.txt"
+    PROPERTIES QT_RESOURCE_ALIAS "firstnamesM.txt"
+)
+set_source_files_properties("resources/contacts/lastnames.txt"
+    PROPERTIES QT_RESOURCE_ALIAS "lastnames.txt"
+)
+set(GraphicsViewBenchmark3_resource_files
+    "resources/contacts/areacodes.txt"
+    "resources/contacts/firstnamesF.txt"
+    "resources/contacts/firstnamesM.txt"
+    "resources/contacts/lastnames.txt"
+)
+
+add_qt_resource(tst_GraphicsViewBenchmark "GraphicsViewBenchmark3"
+    PREFIX
+        "/contact"
+    FILES
+        ${GraphicsViewBenchmark3_resource_files}
+)
+
+
+#### Keys ignored in scope 1:.:.:GraphicsViewBenchmark.pro:<TRUE>:
+# TEMPLATE = "app"
+
+## Scopes:
+#####################################################################
+
+extend_target(tst_GraphicsViewBenchmark CONDITION TARGET Qt::OpenGL
+    PUBLIC_LIBRARIES
+        Qt::OpenGL
+)
diff --git a/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/GraphicsViewBenchmark.pro b/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/GraphicsViewBenchmark.pro
index ded6a06795..addb60433b 100644
--- a/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/GraphicsViewBenchmark.pro
+++ b/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/GraphicsViewBenchmark.pro
@@ -1,7 +1,7 @@
 TEMPLATE = app
 
 QT += svg testlib
-qtHaveModule(opengl): QT += opengl
+qtHaveModule(opengl): QT += opengl openglwidgets
 
 HEADERS += widgets/gvbwidget.h \
         widgets/abstractscrollarea.h \
diff --git a/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/main.cpp b/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/main.cpp
index 87ab80d74f..907a320d76 100644
--- a/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/main.cpp
+++ b/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/main.cpp
@@ -28,9 +28,8 @@
 
 
 #include <QtTest/QtTest>
-#include <QtGui/qgraphicsview.h>
 #include <QtGui/qpixmapcache.h>
-#include <QtGui/qdesktopwidget.h>
+#include <QtGui/QScreen>
 
 #include "mainview.h"
 #include "dummydatagen.h"
@@ -308,7 +307,8 @@ void tst_GraphicsViewBenchmark::initTestCase()
     if (mSettings->size().width() > 0 && mSettings->size().height() > 0) {
         mMainView->resize(mSettings->size().width(), mSettings->size().height());
         mMainView->show();
-    } else if (QApplication::desktop()->width() < 360 || QApplication::desktop()->height() < 640) {
+    } else if (QGuiApplication::primaryScreen()->geometry().width() < 360
+            || QGuiApplication::primaryScreen()->geometry().height() < 640) {
         mMainView->showFullScreen();
     } else {
         mMainView->resize(360, 640);
@@ -326,7 +326,7 @@ void tst_GraphicsViewBenchmark::initTestCase()
     currentListSize = -1;
     currentListType = None;
 
-    QVERIFY(QTest::qWaitForWindowShown(mMainView));
+    QVERIFY(QTest::qWaitForWindowExposed(mMainView));
 }
 
 void tst_GraphicsViewBenchmark::cleanupTestCase()
@@ -760,7 +760,8 @@ int main(int argc, char *argv[])
         if (settings.size().width() > 0 && settings.size().height() > 0) {
             view.resize(settings.size().width(), settings.size().height());
             view.show();
-        } else if (QApplication::desktop()->width() < 360 || QApplication::desktop()->height() < 640) {
+        } else if (QGuiApplication::primaryScreen()->geometry().width() < 360
+                || QApplication::primaryScreen()->geometry().height() < 640) {
             view.showFullScreen();
         } else {
             view.resize(360, 640);
diff --git a/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/button.cpp b/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/button.cpp
index b8bd55789d..98bf9f8521 100644
--- a/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/button.cpp
+++ b/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/button.cpp
@@ -26,10 +26,12 @@
 **
 ****************************************************************************/
 
-#include <QtGui>
 #include "button.h"
 #include "theme.h"
 
+#include <QtGui>
+#include <QGraphicsSceneMouseEvent>
+
 static const int MinTextWidthAsChars = 8;
 
 class ButtonPrivate {
diff --git a/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/listmodel.cpp b/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/listmodel.cpp
index fe87a2abc4..933af2f770 100644
--- a/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/listmodel.cpp
+++ b/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/listmodel.cpp
@@ -78,7 +78,7 @@ bool ListModel::setData(const QModelIndex &index, const QVariant &value, int rol
 void ListModel::clear()
 {
     m_items.clear();
-    reset();
+    clear();
 }
 
 QModelIndex ListModel::index(int row, int column, const QModelIndex &parent) const
diff --git a/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/mainview.cpp b/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/mainview.cpp
index 8f7736010d..f2423cb899 100644
--- a/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/mainview.cpp
+++ b/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/mainview.cpp
@@ -30,7 +30,7 @@
 #include <QApplication>
 #include <QGraphicsLinearLayout>
 #ifndef QT_NO_OPENGL
-#include <QGLWidget>
+#include <QtOpenGLWidgets/QOpenGLWidget>
 #endif
 #include <QObject>
 
@@ -253,10 +253,10 @@ void MainView::construct()
     if (m_enableOpenGL) {
         qDebug() << "OpenGL enabled";
         m_scene->setSortCacheEnabled(false);
-        setViewport(new QGLWidget);
+        setViewport(new QOpenGLWidget);
 
         // Qt doc says: This is the preferred update mode for
-        // viewports that do not support partial updates, such as QGLWidget...
+        // viewports that do not support partial updates, such as QOpenGLWidget...
         setViewportUpdateMode(QGraphicsView::FullViewportUpdate);
     } else
 #endif
diff --git a/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/simplelistview.cpp b/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/simplelistview.cpp
index 67f34859c1..7ff089fa1e 100644
--- a/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/simplelistview.cpp
+++ b/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/simplelistview.cpp
@@ -26,8 +26,6 @@
 **
 ****************************************************************************/
 
-#include <QtGui>
-
 #include "simplelistview.h"
 #include "scrollbar.h"
 #include "simplelistview.h"
@@ -36,6 +34,10 @@
 #include "listitemcache.h"
 #include "theme.h"
 
+#include <QtGui>
+#include <QGraphicsGridLayout>
+#include <QGraphicsSceneResizeEvent>
+
 class SimpleListViewPrivate
 {
     Q_DECLARE_PUBLIC(SimpleListView)
diff --git a/tests/benchmarks/widgets/graphicsview/qgraphicsanchorlayout/CMakeLists.txt b/tests/benchmarks/widgets/graphicsview/qgraphicsanchorlayout/CMakeLists.txt
new file mode 100644
index 0000000000..4f526cc7b1
--- /dev/null
+++ b/tests/benchmarks/widgets/graphicsview/qgraphicsanchorlayout/CMakeLists.txt
@@ -0,0 +1,17 @@
+# Generated from qgraphicsanchorlayout.pro.
+
+#####################################################################
+## tst_bench_qgraphicsanchorlayout Binary:
+#####################################################################
+
+add_qt_benchmark(tst_bench_qgraphicsanchorlayout
+    SOURCES
+        tst_qgraphicsanchorlayout.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Test
+        Qt::Widgets
+)
+
+#### Keys ignored in scope 1:.:.:qgraphicsanchorlayout.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/benchmarks/widgets/graphicsview/qgraphicsitem/CMakeLists.txt b/tests/benchmarks/widgets/graphicsview/qgraphicsitem/CMakeLists.txt
new file mode 100644
index 0000000000..a63c37e323
--- /dev/null
+++ b/tests/benchmarks/widgets/graphicsview/qgraphicsitem/CMakeLists.txt
@@ -0,0 +1,17 @@
+# Generated from qgraphicsitem.pro.
+
+#####################################################################
+## tst_bench_qgraphicsitem Binary:
+#####################################################################
+
+add_qt_benchmark(tst_bench_qgraphicsitem
+    SOURCES
+        tst_qgraphicsitem.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Test
+        Qt::Widgets
+)
+
+#### Keys ignored in scope 1:.:.:qgraphicsitem.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/benchmarks/widgets/graphicsview/qgraphicslayout/CMakeLists.txt b/tests/benchmarks/widgets/graphicsview/qgraphicslayout/CMakeLists.txt
new file mode 100644
index 0000000000..84f277df1b
--- /dev/null
+++ b/tests/benchmarks/widgets/graphicsview/qgraphicslayout/CMakeLists.txt
@@ -0,0 +1,17 @@
+# Generated from qgraphicslayout.pro.
+
+#####################################################################
+## tst_bench_qgraphicslayout Binary:
+#####################################################################
+
+add_qt_benchmark(tst_bench_qgraphicslayout
+    SOURCES
+        tst_qgraphicslayout.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Test
+        Qt::Widgets
+)
+
+#### Keys ignored in scope 1:.:.:qgraphicslayout.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/benchmarks/widgets/graphicsview/qgraphicslinearlayout/CMakeLists.txt b/tests/benchmarks/widgets/graphicsview/qgraphicslinearlayout/CMakeLists.txt
new file mode 100644
index 0000000000..ab88de5bec
--- /dev/null
+++ b/tests/benchmarks/widgets/graphicsview/qgraphicslinearlayout/CMakeLists.txt
@@ -0,0 +1,17 @@
+# Generated from qgraphicslinearlayout.pro.
+
+#####################################################################
+## tst_bench_qgraphicslinearlayout Binary:
+#####################################################################
+
+add_qt_benchmark(tst_bench_qgraphicslinearlayout
+    SOURCES
+        tst_qgraphicslinearlayout.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Test
+        Qt::Widgets
+)
+
+#### Keys ignored in scope 1:.:.:qgraphicslinearlayout.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/benchmarks/widgets/graphicsview/qgraphicsscene/CMakeLists.txt b/tests/benchmarks/widgets/graphicsview/qgraphicsscene/CMakeLists.txt
new file mode 100644
index 0000000000..0c72479efd
--- /dev/null
+++ b/tests/benchmarks/widgets/graphicsview/qgraphicsscene/CMakeLists.txt
@@ -0,0 +1,17 @@
+# Generated from qgraphicsscene.pro.
+
+#####################################################################
+## tst_bench_qgraphicsscene Binary:
+#####################################################################
+
+add_qt_benchmark(tst_bench_qgraphicsscene
+    SOURCES
+        tst_qgraphicsscene.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Test
+        Qt::Widgets
+)
+
+#### Keys ignored in scope 1:.:.:qgraphicsscene.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/benchmarks/widgets/graphicsview/qgraphicsview/CMakeLists.txt b/tests/benchmarks/widgets/graphicsview/qgraphicsview/CMakeLists.txt
new file mode 100644
index 0000000000..d98e3dba19
--- /dev/null
+++ b/tests/benchmarks/widgets/graphicsview/qgraphicsview/CMakeLists.txt
@@ -0,0 +1,55 @@
+# Generated from qgraphicsview.pro.
+
+#####################################################################
+## tst_bench_qgraphicsview Binary:
+#####################################################################
+
+add_qt_benchmark(tst_bench_qgraphicsview
+    SOURCES
+        chiptester/chip.cpp chiptester/chip.h
+        chiptester/chiptester.cpp chiptester/chiptester.h
+        tst_qgraphicsview.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Test
+        Qt::Widgets
+)
+
+# Resources:
+set(qgraphicsview_resource_files
+    "images/designer.png"
+    "images/wine-big.jpeg"
+    "images/wine.jpeg"
+    "random.data"
+)
+
+add_qt_resource(tst_bench_qgraphicsview "qgraphicsview"
+    PREFIX
+        "/"
+    FILES
+        ${qgraphicsview_resource_files}
+)
+set(images_resource_files
+    "qt4logo.png"
+)
+
+add_qt_resource(tst_bench_qgraphicsview "images"
+    PREFIX
+        "/"
+    BASE
+        "chiptester"
+    FILES
+        ${images_resource_files}
+)
+
+
+#### Keys ignored in scope 1:.:.:qgraphicsview.pro:<TRUE>:
+# TEMPLATE = "app"
+
+## Scopes:
+#####################################################################
+
+extend_target(tst_bench_qgraphicsview CONDITION TARGET Qt::OpenGL
+    PUBLIC_LIBRARIES
+        Qt::OpenGL
+)
diff --git a/tests/benchmarks/widgets/graphicsview/qgraphicsview/benchapps/chipTest/CMakeLists.txt b/tests/benchmarks/widgets/graphicsview/qgraphicsview/benchapps/chipTest/CMakeLists.txt
new file mode 100644
index 0000000000..e5e01a8434
--- /dev/null
+++ b/tests/benchmarks/widgets/graphicsview/qgraphicsview/benchapps/chipTest/CMakeLists.txt
@@ -0,0 +1,48 @@
+# Generated from chip.pro.
+
+#####################################################################
+## chip Binary:
+#####################################################################
+
+add_qt_benchmark(chip
+    GUI
+    SOURCES
+        chip.cpp chip.h
+        main.cpp
+        mainwindow.cpp mainwindow.h
+        view.cpp view.h
+    PUBLIC_LIBRARIES
+        Qt::Gui
+)
+
+# Resources:
+set(images_resource_files
+    "fileprint.png"
+    "qt4logo.png"
+    "rotateleft.png"
+    "rotateright.png"
+    "zoomin.png"
+    "zoomout.png"
+)
+
+add_qt_resource(chip "images"
+    PREFIX
+        "/"
+    FILES
+        ${images_resource_files}
+)
+
+
+#### Keys ignored in scope 1:.:.:chip.pro:<TRUE>:
+# INSTALLS = "target" "sources"
+# sources.files = "$$SOURCES" "$$HEADERS" "$$RESOURCES" "*.png" "*.pro" "*.html" "*.doc" "images"
+# sources.path = "$$[QT_INSTALL_EXAMPLES]/graphicsview/chip"
+# target.path = "$$[QT_INSTALL_EXAMPLES]/graphicsview/chip"
+
+## Scopes:
+#####################################################################
+
+extend_target(chip CONDITION TARGET Qt::OpenGL
+    PUBLIC_LIBRARIES
+        Qt::OpenGL
+)
diff --git a/tests/benchmarks/widgets/graphicsview/qgraphicsview/benchapps/moveItems/CMakeLists.txt b/tests/benchmarks/widgets/graphicsview/qgraphicsview/benchapps/moveItems/CMakeLists.txt
new file mode 100644
index 0000000000..ce86e56722
--- /dev/null
+++ b/tests/benchmarks/widgets/graphicsview/qgraphicsview/benchapps/moveItems/CMakeLists.txt
@@ -0,0 +1,13 @@
+# Generated from moveItems.pro.
+
+#####################################################################
+## moveItems Binary:
+#####################################################################
+
+add_qt_benchmark(moveItems
+    GUI
+    SOURCES
+        main.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+)
diff --git a/tests/benchmarks/widgets/graphicsview/qgraphicsview/benchapps/scrolltest/CMakeLists.txt b/tests/benchmarks/widgets/graphicsview/qgraphicsview/benchapps/scrolltest/CMakeLists.txt
new file mode 100644
index 0000000000..310fcd0622
--- /dev/null
+++ b/tests/benchmarks/widgets/graphicsview/qgraphicsview/benchapps/scrolltest/CMakeLists.txt
@@ -0,0 +1,13 @@
+# Generated from scrolltest.pro.
+
+#####################################################################
+## scrolltest Binary:
+#####################################################################
+
+add_qt_benchmark(scrolltest
+    GUI
+    SOURCES
+        main.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+)
diff --git a/tests/benchmarks/widgets/graphicsview/qgraphicsview/chiptester/chiptester.cpp b/tests/benchmarks/widgets/graphicsview/qgraphicsview/chiptester/chiptester.cpp
index dfa08b6869..1eaa5f6578 100644
--- a/tests/benchmarks/widgets/graphicsview/qgraphicsview/chiptester/chiptester.cpp
+++ b/tests/benchmarks/widgets/graphicsview/qgraphicsview/chiptester/chiptester.cpp
@@ -56,13 +56,6 @@ void ChipTester::setAntialias(bool enabled)
     setRenderHint(QPainter::Antialiasing, enabled);
 }
 
-void ChipTester::setOpenGL(bool enabled)
-{
-#ifndef QT_NO_OPENGL
-    setViewport(enabled ? new QGLWidget(QGLFormat(QGL::SampleBuffers)) : 0);
-#endif
-}
-
 void ChipTester::setOperation(Operation operation)
 {
     this->operation = operation;
diff --git a/tests/benchmarks/widgets/graphicsview/qgraphicsview/chiptester/chiptester.h b/tests/benchmarks/widgets/graphicsview/qgraphicsview/chiptester/chiptester.h
index d85686c94e..e4c9197142 100644
--- a/tests/benchmarks/widgets/graphicsview/qgraphicsview/chiptester/chiptester.h
+++ b/tests/benchmarks/widgets/graphicsview/qgraphicsview/chiptester/chiptester.h
@@ -51,7 +51,6 @@ public:
     ChipTester(QWidget *parent = 0);
 
     void setAntialias(bool enabled);
-    void setOpenGL(bool enabled);
     void runBenchmark();
     void setOperation(Operation operation);
 
diff --git a/tests/benchmarks/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp b/tests/benchmarks/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp
index 9bb5231528..25fc439883 100644
--- a/tests/benchmarks/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp
+++ b/tests/benchmarks/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp
@@ -382,31 +382,22 @@ void tst_QGraphicsView::mapRectFromScene()
 void tst_QGraphicsView::chipTester_data()
 {
     QTest::addColumn<bool>("antialias");
-    QTest::addColumn<bool>("opengl");
     QTest::addColumn<int>("operation");
-    QTest::newRow("rotate, normal") << false << false << 0;
-    QTest::newRow("rotate, normal, antialias") << true << false << 0;
-    QTest::newRow("rotate, opengl") << false << true << 0;
-    QTest::newRow("rotate, opengl, antialias") << true << true << 0;
-    QTest::newRow("zoom, normal") << false << false << 1;
-    QTest::newRow("zoom, normal, antialias") << true << false << 1;
-    QTest::newRow("zoom, opengl") << false << true << 1;
-    QTest::newRow("zoom, opengl, antialias") << true << true << 1;
-    QTest::newRow("translate, normal") << false << false << 2;
-    QTest::newRow("translate, normal, antialias") << true << false << 2;
-    QTest::newRow("translate, opengl") << false << true << 2;
-    QTest::newRow("translate, opengl, antialias") << true << true << 2;
+    QTest::newRow("rotate") << false << 0;
+    QTest::newRow("rotate, antialias") << true << 0;
+    QTest::newRow("zoom") << false << 1;
+    QTest::newRow("zoom, antialias") << true << 1;
+    QTest::newRow("translate") << false << 2;
+    QTest::newRow("translate, antialias") << true << 2;
 }
 
 void tst_QGraphicsView::chipTester()
 {
     QFETCH(bool, antialias);
-    QFETCH(bool, opengl);
     QFETCH(int, operation);
 
     ChipTester tester;
     tester.setAntialias(antialias);
-    tester.setOpenGL(opengl);
     tester.setOperation(ChipTester::Operation(operation));
     tester.show();
     QVERIFY(QTest::qWaitForWindowExposed(&tester));
diff --git a/tests/benchmarks/widgets/graphicsview/qgraphicswidget/CMakeLists.txt b/tests/benchmarks/widgets/graphicsview/qgraphicswidget/CMakeLists.txt
new file mode 100644
index 0000000000..ab16f7081e
--- /dev/null
+++ b/tests/benchmarks/widgets/graphicsview/qgraphicswidget/CMakeLists.txt
@@ -0,0 +1,17 @@
+# Generated from qgraphicswidget.pro.
+
+#####################################################################
+## tst_bench_qgraphicswidget Binary:
+#####################################################################
+
+add_qt_benchmark(tst_bench_qgraphicswidget
+    SOURCES
+        tst_qgraphicswidget.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Test
+        Qt::Widgets
+)
+
+#### Keys ignored in scope 1:.:.:qgraphicswidget.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/benchmarks/widgets/itemviews/CMakeLists.txt b/tests/benchmarks/widgets/itemviews/CMakeLists.txt
new file mode 100644
index 0000000000..76747b527d
--- /dev/null
+++ b/tests/benchmarks/widgets/itemviews/CMakeLists.txt
@@ -0,0 +1,5 @@
+# Generated from itemviews.pro.
+
+add_subdirectory(qtableview)
+add_subdirectory(qheaderview)
+add_subdirectory(qlistview)
diff --git a/tests/benchmarks/widgets/itemviews/qheaderview/CMakeLists.txt b/tests/benchmarks/widgets/itemviews/qheaderview/CMakeLists.txt
new file mode 100644
index 0000000000..6d616d2579
--- /dev/null
+++ b/tests/benchmarks/widgets/itemviews/qheaderview/CMakeLists.txt
@@ -0,0 +1,17 @@
+# Generated from qheaderview.pro.
+
+#####################################################################
+## tst_bench_qheaderview Binary:
+#####################################################################
+
+add_qt_benchmark(tst_bench_qheaderview
+    SOURCES
+        qheaderviewbench.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Test
+        Qt::Widgets
+)
+
+#### Keys ignored in scope 1:.:.:qheaderview.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/benchmarks/widgets/itemviews/qlistview/CMakeLists.txt b/tests/benchmarks/widgets/itemviews/qlistview/CMakeLists.txt
new file mode 100644
index 0000000000..58062db6c0
--- /dev/null
+++ b/tests/benchmarks/widgets/itemviews/qlistview/CMakeLists.txt
@@ -0,0 +1,17 @@
+# Generated from qlistview.pro.
+
+#####################################################################
+## tst_bench_qlistview Binary:
+#####################################################################
+
+add_qt_benchmark(tst_bench_qlistview
+    SOURCES
+        tst_qlistview.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Test
+        Qt::Widgets
+)
+
+#### Keys ignored in scope 1:.:.:qlistview.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/benchmarks/widgets/itemviews/qtableview/CMakeLists.txt b/tests/benchmarks/widgets/itemviews/qtableview/CMakeLists.txt
new file mode 100644
index 0000000000..f0b47692d8
--- /dev/null
+++ b/tests/benchmarks/widgets/itemviews/qtableview/CMakeLists.txt
@@ -0,0 +1,17 @@
+# Generated from qtableview.pro.
+
+#####################################################################
+## tst_bench_qtableview Binary:
+#####################################################################
+
+add_qt_benchmark(tst_bench_qtableview
+    SOURCES
+        tst_qtableview.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Test
+        Qt::Widgets
+)
+
+#### Keys ignored in scope 1:.:.:qtableview.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/benchmarks/widgets/kernel/CMakeLists.txt b/tests/benchmarks/widgets/kernel/CMakeLists.txt
new file mode 100644
index 0000000000..b55b31fe67
--- /dev/null
+++ b/tests/benchmarks/widgets/kernel/CMakeLists.txt
@@ -0,0 +1,4 @@
+# Generated from kernel.pro.
+
+add_subdirectory(qapplication)
+add_subdirectory(qwidget)
diff --git a/tests/benchmarks/widgets/kernel/qapplication/CMakeLists.txt b/tests/benchmarks/widgets/kernel/qapplication/CMakeLists.txt
new file mode 100644
index 0000000000..05bc480302
--- /dev/null
+++ b/tests/benchmarks/widgets/kernel/qapplication/CMakeLists.txt
@@ -0,0 +1,17 @@
+# Generated from qapplication.pro.
+
+#####################################################################
+## tst_bench_qapplication Binary:
+#####################################################################
+
+add_qt_benchmark(tst_bench_qapplication
+    SOURCES
+        main.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Test
+        Qt::Widgets
+)
+
+#### Keys ignored in scope 1:.:.:qapplication.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/benchmarks/widgets/kernel/qwidget/CMakeLists.txt b/tests/benchmarks/widgets/kernel/qwidget/CMakeLists.txt
new file mode 100644
index 0000000000..6165cba25a
--- /dev/null
+++ b/tests/benchmarks/widgets/kernel/qwidget/CMakeLists.txt
@@ -0,0 +1,14 @@
+# Generated from qwidget.pro.
+
+#####################################################################
+## tst_bench_qwidget Binary:
+#####################################################################
+
+add_qt_benchmark(tst_bench_qwidget
+    SOURCES
+        tst_qwidget.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Test
+        Qt::Widgets
+)
diff --git a/tests/benchmarks/widgets/styles/CMakeLists.txt b/tests/benchmarks/widgets/styles/CMakeLists.txt
new file mode 100644
index 0000000000..74e57c5731
--- /dev/null
+++ b/tests/benchmarks/widgets/styles/CMakeLists.txt
@@ -0,0 +1,5 @@
+# Generated from styles.pro.
+
+if(TARGET Qt::Widgets)
+    add_subdirectory(qstylesheetstyle)
+endif()
diff --git a/tests/benchmarks/widgets/styles/qstylesheetstyle/CMakeLists.txt b/tests/benchmarks/widgets/styles/qstylesheetstyle/CMakeLists.txt
new file mode 100644
index 0000000000..13aa6a1f62
--- /dev/null
+++ b/tests/benchmarks/widgets/styles/qstylesheetstyle/CMakeLists.txt
@@ -0,0 +1,17 @@
+# Generated from qstylesheetstyle.pro.
+
+#####################################################################
+## tst_bench_qstylesheetstyle Binary:
+#####################################################################
+
+add_qt_benchmark(tst_bench_qstylesheetstyle
+    SOURCES
+        main.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Test
+        Qt::Widgets
+)
+
+#### Keys ignored in scope 1:.:.:qstylesheetstyle.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/benchmarks/widgets/widgets/CMakeLists.txt b/tests/benchmarks/widgets/widgets/CMakeLists.txt
new file mode 100644
index 0000000000..81a8fccc05
--- /dev/null
+++ b/tests/benchmarks/widgets/widgets/CMakeLists.txt
@@ -0,0 +1,3 @@
+# Generated from widgets.pro.
+
+add_subdirectory(qtextbrowser)
diff --git a/tests/benchmarks/widgets/widgets/qtextbrowser/CMakeLists.txt b/tests/benchmarks/widgets/widgets/qtextbrowser/CMakeLists.txt
new file mode 100644
index 0000000000..983d255787
--- /dev/null
+++ b/tests/benchmarks/widgets/widgets/qtextbrowser/CMakeLists.txt
@@ -0,0 +1,17 @@
+# Generated from qtextbrowser.pro.
+
+#####################################################################
+## tst_bench_QTextBrowser Binary:
+#####################################################################
+
+add_qt_benchmark(tst_bench_QTextBrowser
+    SOURCES
+        main.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Test
+        Qt::Widgets
+)
+
+#### Keys ignored in scope 1:.:.:qtextbrowser.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/manual/CMakeLists.txt b/tests/manual/CMakeLists.txt
new file mode 100644
index 0000000000..d7b45a1d22
--- /dev/null
+++ b/tests/manual/CMakeLists.txt
@@ -0,0 +1,86 @@
+# Generated from manual.pro.
+
+# special case begn
+# Don't build manual tests when targeting iOS.
+if(APPLE_UIKIT)
+    return()
+endif()
+# special case end
+
+add_subdirectory(bearerex)
+add_subdirectory(filetest)
+# special case begin
+# diaglib is broken in dev due to missing
+# QtOpenGL/QGLFunctions headers
+# add_subdirectory(embeddedintoforeignwindow)
+# add_subdirectory(foreignwindows)
+# special case end
+add_subdirectory(gestures)
+# add_subdirectory(highdpi) special case broken in dev
+add_subdirectory(inputmethodhints)
+add_subdirectory(keypadnavigation)
+#add_subdirectory(lance) # special case qgl.h missing
+add_subdirectory(qcursor)
+add_subdirectory(qdesktopservices)
+add_subdirectory(qdesktopwidget)
+add_subdirectory(qgraphicsitem)
+add_subdirectory(qgraphicsitemgroup)
+add_subdirectory(qgraphicslayout/flicker)
+add_subdirectory(qhttpnetworkconnection)
+add_subdirectory(qimagereader)
+add_subdirectory(qlayout)
+add_subdirectory(qlocale)
+add_subdirectory(qmimedatabase)
+add_subdirectory(qnetconmonitor)
+add_subdirectory(qnetworkaccessmanager/qget)
+add_subdirectory(qnetworkconfigurationmanager)
+add_subdirectory(qnetworkconfiguration)
+#special case begin
+if (QT_FEATURE_openssl AND UNIX)
+    add_subdirectory(qnetworkreply)
+endif()
+#special case end
+add_subdirectory(qstorageinfo)
+add_subdirectory(qscreen)
+add_subdirectory(qsslsocket)
+add_subdirectory(qsysinfo)
+add_subdirectory(qtabletevent)
+add_subdirectory(qtexteditlist)
+add_subdirectory(qtexttableborders)
+add_subdirectory(qtbug-8933)
+add_subdirectory(qtbug-52641)
+add_subdirectory(qtouchevent)
+add_subdirectory(touch)
+add_subdirectory(qwidget_zorder)
+add_subdirectory(repaint)
+add_subdirectory(socketengine)
+add_subdirectory(textrendering)
+add_subdirectory(widgets)
+add_subdirectory(windowflags)
+add_subdirectory(windowgeometry)
+add_subdirectory(windowmodality)
+add_subdirectory(widgetgrab)
+add_subdirectory(xembed-raster)
+add_subdirectory(xembed-widgets)
+add_subdirectory(shortcuts)
+add_subdirectory(dialogs)
+add_subdirectory(windowtransparency)
+add_subdirectory(unc)
+add_subdirectory(qtabbar)
+add_subdirectory(rhi)
+if(UNIX)
+    add_subdirectory(network_remote_stresstest)
+    add_subdirectory(network_stresstest)
+endif()
+if(QT_FEATURE_openssl)
+    add_subdirectory(qssloptions)
+endif()
+if(QT_FEATURE_opengl)
+    # add_subdirectory(qopengltextureblitter) special case broken in dev
+endif()
+if(QT_FEATURE_egl AND QT_FEATURE_opengl)
+    # add_subdirectory(qopenglcontext) # special case broken in dev
+endif()
+if(QT_FEATURE_vulkan)
+    add_subdirectory(qvulkaninstance)
+endif()
diff --git a/tests/manual/bearerex/CMakeLists.txt b/tests/manual/bearerex/CMakeLists.txt
new file mode 100644
index 0000000000..3a09ac5358
--- /dev/null
+++ b/tests/manual/bearerex/CMakeLists.txt
@@ -0,0 +1,25 @@
+# Generated from bearerex.pro.
+
+#####################################################################
+## BearerEx Binary:
+#####################################################################
+
+add_qt_manual_test(BearerEx
+    GUI
+    SOURCES
+        bearerex.cpp bearerex.h bearerex.ui
+        datatransferer.cpp datatransferer.h
+        detailedinfodialog.ui
+        main.cpp
+        sessiondialog.ui
+        xqlistwidget.cpp xqlistwidget.h
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Network
+        Qt::Widgets
+    ENABLE_AUTOGEN_TOOLS
+        uic
+)
+
+#### Keys ignored in scope 1:.:.:bearerex.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/manual/cocoa/appicon/CMakeLists.txt b/tests/manual/cocoa/appicon/CMakeLists.txt
new file mode 100644
index 0000000000..5cb97d7c6a
--- /dev/null
+++ b/tests/manual/cocoa/appicon/CMakeLists.txt
@@ -0,0 +1,17 @@
+# Generated from appicon.pro.
+
+#####################################################################
+## appicon Binary:
+#####################################################################
+
+add_qt_manual_test(appicon
+    GUI
+    SOURCES
+        main.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+)
+
+#### Keys ignored in scope 1:.:.:appicon.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/manual/cocoa/menurama/CMakeLists.txt b/tests/manual/cocoa/menurama/CMakeLists.txt
new file mode 100644
index 0000000000..1c39a59fc3
--- /dev/null
+++ b/tests/manual/cocoa/menurama/CMakeLists.txt
@@ -0,0 +1,21 @@
+# Generated from menurama.pro.
+
+#####################################################################
+## Menurama Binary:
+#####################################################################
+
+add_qt_manual_test(Menurama
+    GUI
+    SOURCES
+        main.cpp
+        mainwindow.cpp mainwindow.h mainwindow.ui
+        menuramaapplication.cpp menuramaapplication.h
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+    ENABLE_AUTOGEN_TOOLS
+        uic
+)
+
+#### Keys ignored in scope 1:.:.:menurama.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/manual/cocoa/menurama/menurama.pro b/tests/manual/cocoa/menurama/menurama.pro
index da6f224e0d..f0928be31d 100644
--- a/tests/manual/cocoa/menurama/menurama.pro
+++ b/tests/manual/cocoa/menurama/menurama.pro
@@ -4,9 +4,7 @@
 #
 #-------------------------------------------------
 
-QT       += core gui
-
-greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
+QT       += core gui widgets
 
 TARGET = Menurama
 TEMPLATE = app
diff --git a/tests/manual/cocoa/menus/CMakeLists.txt b/tests/manual/cocoa/menus/CMakeLists.txt
new file mode 100644
index 0000000000..a3fa70ba5d
--- /dev/null
+++ b/tests/manual/cocoa/menus/CMakeLists.txt
@@ -0,0 +1,16 @@
+# Generated from menus.pro.
+
+#####################################################################
+## menus Binary:
+#####################################################################
+
+add_qt_manual_test(menus
+    SOURCES
+        main.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+)
+
+#### Keys ignored in scope 1:.:.:menus.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/manual/cocoa/nativewidgets/CMakeLists.txt b/tests/manual/cocoa/nativewidgets/CMakeLists.txt
new file mode 100644
index 0000000000..cab2da5421
--- /dev/null
+++ b/tests/manual/cocoa/nativewidgets/CMakeLists.txt
@@ -0,0 +1,17 @@
+# Generated from nativewigets.pro.
+
+#####################################################################
+## nativewigets Binary:
+#####################################################################
+
+add_qt_manual_test(nativewigets
+    GUI
+    SOURCES
+        main.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+)
+
+#### Keys ignored in scope 1:.:.:nativewigets.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/manual/cocoa/popups/CMakeLists.txt b/tests/manual/cocoa/popups/CMakeLists.txt
new file mode 100644
index 0000000000..53468edc7c
--- /dev/null
+++ b/tests/manual/cocoa/popups/CMakeLists.txt
@@ -0,0 +1,13 @@
+# Generated from popups.pro.
+
+#####################################################################
+## popups Binary:
+#####################################################################
+
+add_qt_manual_test(popups
+    SOURCES
+        main.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+)
diff --git a/tests/manual/cocoa/qmaccocoaviewcontainer/CMakeLists.txt b/tests/manual/cocoa/qmaccocoaviewcontainer/CMakeLists.txt
new file mode 100644
index 0000000000..95317c520e
--- /dev/null
+++ b/tests/manual/cocoa/qmaccocoaviewcontainer/CMakeLists.txt
@@ -0,0 +1,21 @@
+# Generated from qmaccocoaviewcontainer.pro.
+
+#####################################################################
+## qmaccocoaviewcontainer Binary:
+#####################################################################
+
+add_qt_manual_test(qmaccocoaviewcontainer
+    GUI
+    SOURCES
+        TestMouseMovedNSView.h TestMouseMovedNSView.m
+        main.mm
+    INCLUDE_DIRECTORIES
+        .
+    PUBLIC_LIBRARIES
+        ${FWAppKit}
+        Qt::Gui
+        Qt::Widgets
+)
+
+#### Keys ignored in scope 1:.:.:qmaccocoaviewcontainer.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/manual/cocoa/qsystemtrayicon/CMakeLists.txt b/tests/manual/cocoa/qsystemtrayicon/CMakeLists.txt
new file mode 100644
index 0000000000..73c3157b89
--- /dev/null
+++ b/tests/manual/cocoa/qsystemtrayicon/CMakeLists.txt
@@ -0,0 +1,38 @@
+# Generated from qsystemtrayicon.pro.
+
+#####################################################################
+## qsystemtrayicon Binary:
+#####################################################################
+
+add_qt_manual_test(qsystemtrayicon
+    GUI
+    SOURCES
+        main.cpp
+    INCLUDE_DIRECTORIES
+        .
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+)
+
+# Resources:
+set(icons_resource_files
+    "macsystray16x16.png"
+    "macsystray18x18.png"
+    "macsystray25x15.png"
+    "macsystray32x32.png"
+    "macsystray36x36.png"
+    "macsystray50x30.png"
+    "macsystray64x64.png"
+)
+
+add_qt_resource(qsystemtrayicon "icons"
+    PREFIX
+        "/"
+    FILES
+        ${icons_resource_files}
+)
+
+
+#### Keys ignored in scope 1:.:.:qsystemtrayicon.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/manual/cocoa/qt_on_cocoa/CMakeLists.txt b/tests/manual/cocoa/qt_on_cocoa/CMakeLists.txt
new file mode 100644
index 0000000000..066eefa313
--- /dev/null
+++ b/tests/manual/cocoa/qt_on_cocoa/CMakeLists.txt
@@ -0,0 +1,22 @@
+# Generated from qt_on_cocoa.pro.
+
+#####################################################################
+## qt_on_cocoa Binary:
+#####################################################################
+
+add_qt_manual_test(qt_on_cocoa
+    GUI
+    SOURCES
+        main.mm
+        rasterwindow.cpp rasterwindow.h
+    DEFINES
+        QT_DISABLE_DEPRECATED_BEFORE=0
+    PUBLIC_LIBRARIES
+        ${FWAppKit}
+        Qt::Gui
+        Qt::Quick
+        Qt::Widgets
+)
+
+#### Keys ignored in scope 1:.:.:qt_on_cocoa.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/manual/cocoa/wheelevent/CMakeLists.txt b/tests/manual/cocoa/wheelevent/CMakeLists.txt
new file mode 100644
index 0000000000..305036fa78
--- /dev/null
+++ b/tests/manual/cocoa/wheelevent/CMakeLists.txt
@@ -0,0 +1,20 @@
+# Generated from wheelevent.pro.
+
+#####################################################################
+## wheelevent Binary:
+#####################################################################
+
+add_qt_manual_test(wheelevent
+    GUI
+    SOURCES
+        main.cpp
+        window.cpp window.h
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::Gui
+        Qt::GuiPrivate
+        Qt::Widgets
+)
+
+#### Keys ignored in scope 1:.:.:wheelevent.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/manual/corelib/tools/qhash/main.cpp b/tests/manual/corelib/tools/qhash/main.cpp
index b2c40f2183..298d1777ea 100644
--- a/tests/manual/corelib/tools/qhash/main.cpp
+++ b/tests/manual/corelib/tools/qhash/main.cpp
@@ -27,7 +27,6 @@
 ****************************************************************************/
 
 #include <QDebug>
-//#define QT_STRICT_ITERATORS
 #include <QHash>
 
 void testEraseNoError()
diff --git a/tests/manual/corelib/tools/qlist/main.cpp b/tests/manual/corelib/tools/qlist/main.cpp
index 3f8ade5778..0b54105f5e 100644
--- a/tests/manual/corelib/tools/qlist/main.cpp
+++ b/tests/manual/corelib/tools/qlist/main.cpp
@@ -26,7 +26,6 @@
 **
 ****************************************************************************/
 #include <QDebug>
-//#define QT_STRICT_ITERATORS
 #include <QVector>
 void testErase()
 {
@@ -55,4 +54,4 @@ int main()
     // testErase();
     testInsert();
     return 0;
-}
\ No newline at end of file
+}
diff --git a/tests/manual/corelib/tools/qset/main.cpp b/tests/manual/corelib/tools/qset/main.cpp
index 1066e53e7d..701c8889db 100644
--- a/tests/manual/corelib/tools/qset/main.cpp
+++ b/tests/manual/corelib/tools/qset/main.cpp
@@ -27,7 +27,6 @@
 ****************************************************************************/
 
 #include <QDebug>
-//#define QT_STRICT_ITERATORS
 #include <QSet>
 
 void testErase()
diff --git a/tests/manual/corelib/tools/qvarlengtharray/main.cpp b/tests/manual/corelib/tools/qvarlengtharray/main.cpp
index 8580d97a36..0544bb0c4b 100644
--- a/tests/manual/corelib/tools/qvarlengtharray/main.cpp
+++ b/tests/manual/corelib/tools/qvarlengtharray/main.cpp
@@ -27,7 +27,6 @@
 ****************************************************************************/
 
 #include <QDebug>
-//#define QT_STRICT_ITERATORS
 #include <QVarLengthArray>
 
 void testErase()
diff --git a/tests/manual/corelib/tools/qvector/main.cpp b/tests/manual/corelib/tools/qvector/main.cpp
index e3dc89b149..1b35123f15 100644
--- a/tests/manual/corelib/tools/qvector/main.cpp
+++ b/tests/manual/corelib/tools/qvector/main.cpp
@@ -27,7 +27,6 @@
 ****************************************************************************/
 
 #include <QDebug>
-//#define QT_STRICT_ITERATORS
 #include <QVector>
 
 void testErase()
diff --git a/tests/manual/diaglib/debugproxystyle.cpp b/tests/manual/diaglib/debugproxystyle.cpp
index ed35af5962..809613cd1d 100644
--- a/tests/manual/diaglib/debugproxystyle.cpp
+++ b/tests/manual/diaglib/debugproxystyle.cpp
@@ -68,8 +68,8 @@ QDebug operator<<(QDebug debug, const QStyleOption *option)
     } else {
         debug << "QStyleOption(";
     }
-    debug << "rect=" << option->rect.width() << 'x' << option->rect.height()
-          << forcesign << option->rect.x() << option->rect.y() << noforcesign;
+    debug << "rect=" << option->rect.width() << 'x' << option->rect.height() << Qt::forcesign
+          << option->rect.x() << option->rect.y() << Qt::noforcesign;
     if (option->state != QStyle::State_None)
         debug << ", state=" << option->state;
 #if QT_VERSION >= 0x050000
diff --git a/tests/manual/diaglib/diaglib.pri b/tests/manual/diaglib/diaglib.pri
index b57ee75841..dd5bfa5330 100644
--- a/tests/manual/diaglib/diaglib.pri
+++ b/tests/manual/diaglib/diaglib.pri
@@ -17,20 +17,8 @@ win32:!winrt:  {
     SOURCES += $$PWD/nativewindowdump.cpp
 }
 
-greaterThan(QT_MAJOR_VERSION, 4) {
-    QT += gui-private core-private
-    contains(QT, widgets) {
-        HEADERS += \
-            $$PWD/qwidgetdump.h \
-            $$PWD/debugproxystyle.h \
-            $$PWD/logwidget.h
-
-        SOURCES += \
-            $$PWD/qwidgetdump.cpp \
-            $$PWD/debugproxystyle.cpp \
-            $$PWD/logwidget.cpp
-    }
-} else {
+QT += gui-private core-private
+contains(QT, widgets) {
     HEADERS += \
         $$PWD/qwidgetdump.h \
         $$PWD/debugproxystyle.h \
@@ -40,14 +28,17 @@ greaterThan(QT_MAJOR_VERSION, 4) {
         $$PWD/qwidgetdump.cpp \
         $$PWD/debugproxystyle.cpp \
         $$PWD/logwidget.cpp
+    QT += widgets-private
 }
 
 contains(QT, opengl) {
-HEADERS += \
-    $$PWD/glinfo.h
+    HEADERS += \
+        $$PWD/glinfo.h
 
-SOURCES += \
-    $$PWD/glinfo.cpp
+    SOURCES += \
+        $$PWD/glinfo.cpp
+
+    QT += opengl openglwidgets
 }
 
 DEFINES += QT_DIAG_LIB
diff --git a/tests/manual/diaglib/glinfo.cpp b/tests/manual/diaglib/glinfo.cpp
index a955dd80ac..d8aec5298a 100644
--- a/tests/manual/diaglib/glinfo.cpp
+++ b/tests/manual/diaglib/glinfo.cpp
@@ -28,12 +28,11 @@
 
 #include "glinfo.h"
 
-#include <QtOpenGL/QGLFunctions>
-#include <QtOpenGL/QGLWidget>
+#include <QOpenGLFunctions>
+#include <QtOpenGLWidgets/QOpenGLWidget>
 #if QT_VERSION > 0x050000
 #  if QT_VERSION >= 0x050400
-#    include <QtWidgets/QOpenGLWidget>
-#    include <QtGui/QOpenGLWindow>
+#    include <QtOpenGL/QOpenGLWindow>
 #  else // 5.4
 #    include <QtGui/QWindow>
 #  endif // 5.0..5.4
@@ -63,11 +62,6 @@ static QString glInfo(const QOpenGLContext *ctx)
         + getGlString(ctx, GL_RENDERER);
 }
 
-static QString glInfo(const QGLContext *ctx)
-{
-    return glInfo(ctx->contextHandle());
-}
-
 QString glInfo(const QObject *o)
 {
 #  if QT_VERSION >= 0x050400
@@ -76,11 +70,8 @@ QString glInfo(const QObject *o)
             return glInfo(oglw->context());
         return QString();
     }
-#  endif // 5.4
+
     if (o->isWidgetType()) {
-        if (const QGLWidget *g = qobject_cast<const QGLWidget *>(o))
-            return glInfo(g->context());
-#  if QT_VERSION >= 0x050400
         if (const QOpenGLWidget *g = qobject_cast<const QOpenGLWidget *>(o))
             return glInfo(g->context());
 #  endif // 5.4
diff --git a/tests/manual/diaglib/nativewindowdump_win.cpp b/tests/manual/diaglib/nativewindowdump_win.cpp
index d91e673d1c..6334fcfedd 100644
--- a/tests/manual/diaglib/nativewindowdump_win.cpp
+++ b/tests/manual/diaglib/nativewindowdump_win.cpp
@@ -41,6 +41,8 @@
 #  define WS_EX_NOREDIRECTIONBITMAP 0x00200000L
 #endif
 
+using namespace Qt;
+
 namespace QtDiag {
 
 struct DumpContext {
diff --git a/tests/manual/diaglib/qwidgetdump.cpp b/tests/manual/diaglib/qwidgetdump.cpp
index 5a2966021b..926d2aaf35 100644
--- a/tests/manual/diaglib/qwidgetdump.cpp
+++ b/tests/manual/diaglib/qwidgetdump.cpp
@@ -86,14 +86,16 @@ static void dumpWidgetRecursion(QTextStream &str, const QWidget *w,
     formatWidgetClass(str, w);
     str << ' ' << (w->isVisible() ? "[visible] " : "[hidden] ");
     if (const WId nativeWinId = w->internalWinId())
-        str << "[native: " << hex << showbase << nativeWinId << dec << noshowbase << "] ";
+        str << "[native: " << Qt::hex << Qt::showbase << nativeWinId << Qt::dec << Qt::noshowbase
+            << "] ";
     if (w->isWindow())
         str << "[top] ";
     str << (w->testAttribute(Qt::WA_Mapped) ? "[mapped] " : "[not mapped] ");
     if (w->testAttribute(Qt::WA_DontCreateNativeAncestors))
         str << "[NoNativeAncestors] ";
     if (const int states = w->windowState())
-        str << "windowState=" << hex << showbase << states << dec << noshowbase << ' ';
+        str << "windowState=" << Qt::hex << Qt::showbase << states << Qt::dec << Qt::noshowbase
+            << ' ';
     formatRect(str, w->geometry());
     if (w->isWindow()) {
         str << ' ' << w->logicalDpiX() << "DPI";
diff --git a/tests/manual/diaglib/qwindowdump.cpp b/tests/manual/diaglib/qwindowdump.cpp
index 381b683359..2be26ff142 100644
--- a/tests/manual/diaglib/qwindowdump.cpp
+++ b/tests/manual/diaglib/qwindowdump.cpp
@@ -61,8 +61,8 @@ void formatObject(QTextStream &str, const QObject *o)
 
 void formatRect(QTextStream &str, const QRect &geom)
 {
-    str << geom.width() << 'x' << geom.height()
-        << forcesign << geom.x() << geom.y() << noforcesign;
+    str << geom.width() << 'x' << geom.height() << Qt::forcesign << geom.x() << geom.y()
+        << Qt::noforcesign;
 }
 
 #define debugType(s, type, typeConstant) \
@@ -75,7 +75,7 @@ if (flags & flagConstant) \
 
 void formatWindowFlags(QTextStream &str, Qt::WindowFlags flags)
 {
-    str << showbase << hex << unsigned(flags) << dec << noshowbase;
+    str << Qt::showbase << Qt::hex << unsigned(flags) << Qt::dec << Qt::noshowbase;
     const Qt::WindowFlags windowType = flags & Qt::WindowType_Mask;
     debugFlag(str, flags, Qt::Window)
     debugType(str, windowType, Qt::Dialog)
@@ -123,7 +123,8 @@ void formatWindow(QTextStream &str, const QWindow *w, FormatWindowOptions option
     formatObject(str, w);
     str << ' ' << (w->isVisible() ? "[visible] " : "[hidden] ");
     if (const WId nativeWinId = pw ? pw->winId() : WId(0))
-        str << "[native: " << hex << showbase << nativeWinId << dec << noshowbase << "] ";
+        str << "[native: " << Qt::hex << Qt::showbase << nativeWinId << Qt::dec << Qt::noshowbase
+            << "] ";
     if (w->isTopLevel())
         str << "[top] ";
     if (w->isExposed())
diff --git a/tests/manual/diaglib/textdump.cpp b/tests/manual/diaglib/textdump.cpp
index 383ec4edb0..33455a2a56 100644
--- a/tests/manual/diaglib/textdump.cpp
+++ b/tests/manual/diaglib/textdump.cpp
@@ -408,8 +408,8 @@ struct FormattingContext
 static void formatCharacter(QTextStream &str, const QChar &qc, FormattingContext &context)
 {
     const ushort unicode = qc.unicode();
-    str << "U+" << qSetFieldWidth(4) << qSetPadChar('0') << uppercasedigits << hex << unicode
-        << dec << qSetFieldWidth(0) << ' ';
+    str << "U+" << qSetFieldWidth(4) << qSetPadChar('0') << Qt::uppercasedigits << Qt::hex
+        << unicode << Qt::dec << qSetFieldWidth(0) << ' ';
 
     const EnumLookup *specialChar = enumLookup(unicode, specialCharactersEnumLookup, sizeof(specialCharactersEnumLookup) / sizeof(EnumLookup));
     if (specialChar)
@@ -477,7 +477,7 @@ QString dumpTextAsCode(const QString &text)
 {
     QString result;
     QTextStream str(&result);
-    str << "    QString result;\n" << hex << showbase;
+    str << "    QString result;\n" << Qt::hex << Qt::showbase;
     for (QChar c : text)
         str << "    result += QChar(" << c.unicode() << ");\n";
     str << '\n';
diff --git a/tests/manual/dialogs/CMakeLists.txt b/tests/manual/dialogs/CMakeLists.txt
new file mode 100644
index 0000000000..ef000529a5
--- /dev/null
+++ b/tests/manual/dialogs/CMakeLists.txt
@@ -0,0 +1,38 @@
+# Generated from dialogs.pro.
+
+#####################################################################
+## dialogs Binary:
+#####################################################################
+
+add_qt_manual_test(dialogs
+    GUI
+    SOURCES
+        colordialogpanel.cpp colordialogpanel.h
+        filedialogpanel.cpp filedialogpanel.h
+        fontdialogpanel.cpp fontdialogpanel.h
+        main.cpp
+        messageboxpanel.cpp messageboxpanel.h
+        utils.cpp utils.h
+        wizardpanel.cpp wizardpanel.h
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+)
+
+#### Keys ignored in scope 1:.:.:dialogs.pro:<TRUE>:
+# TEMPLATE = "app"
+
+## Scopes:
+#####################################################################
+
+extend_target(dialogs CONDITION TARGET Qt::PrintSupport
+    PUBLIC_LIBRARIES
+        Qt::PrintSupport
+)
+
+extend_target(dialogs CONDITION NOT (QT_FEATURE_printer EQUAL FALSE)
+    SOURCES
+        printdialogpanel.cpp printdialogpanel.h printdialogpanel.ui
+    ENABLE_AUTOGEN_TOOLS
+        uic
+)
diff --git a/tests/manual/dialogs/dialogs.pro b/tests/manual/dialogs/dialogs.pro
index d765b8cf05..1beedc251e 100644
--- a/tests/manual/dialogs/dialogs.pro
+++ b/tests/manual/dialogs/dialogs.pro
@@ -1,9 +1,5 @@
-QT += core gui
-
-greaterThan(QT_MAJOR_VERSION, 4) {
-    QT += widgets
-    qtHaveModule(printsupport): QT += printsupport
-}
+QT += core gui widgets
+qtHaveModule(printsupport): QT += printsupport
 
 TARGET = dialogs
 TEMPLATE = app
diff --git a/tests/manual/dialogs/messageboxpanel.cpp b/tests/manual/dialogs/messageboxpanel.cpp
index 07b387f988..6a305523ea 100644
--- a/tests/manual/dialogs/messageboxpanel.cpp
+++ b/tests/manual/dialogs/messageboxpanel.cpp
@@ -39,6 +39,8 @@
 #include <QLineEdit>
 #include <QLabel>
 #include <QCheckBox>
+#include <QRegularExpressionValidator>
+#include <QRegularExpression>
 
 MessageBoxPanel::MessageBoxPanel(QWidget *parent) : QWidget(parent)
 ,m_iconComboBox(new QComboBox)
@@ -80,7 +82,7 @@ MessageBoxPanel::MessageBoxPanel(QWidget *parent) : QWidget(parent)
 
     // buttons mask
     optionsLayout->addWidget(new QLabel(QString::fromLatin1("Message box button mask (in hex)")));
-    m_validator = new QRegExpValidator(QRegExp("0[xX]?[0-9a-fA-F]+"), this);
+    m_validator = new QRegularExpressionValidator(QRegularExpression("0[xX]?[0-9a-fA-F]+"), this);
     m_buttonsMask->setMaxLength(10);
     m_buttonsMask->setValidator(m_validator);
     m_buttonsMask->setText(QString::fromLatin1("0x00300400"));
diff --git a/tests/manual/dialogs/printdialogpanel.cpp b/tests/manual/dialogs/printdialogpanel.cpp
index b7447e3d64..dcd8b43bf3 100644
--- a/tests/manual/dialogs/printdialogpanel.cpp
+++ b/tests/manual/dialogs/printdialogpanel.cpp
@@ -190,7 +190,8 @@ QTextStream &operator<<(QTextStream &s, const QSizeF &size)
 
 QTextStream &operator<<(QTextStream &s, const QRectF &rect)
 {
-    s << rect.width() << 'x' << rect.height() << forcesign << rect.x() << rect.y() << noforcesign;
+    s << rect.width() << 'x' << rect.height() << Qt::forcesign << rect.x() << rect.y()
+      << Qt::noforcesign;
     return s;
 }
 
diff --git a/tests/manual/embeddedintoforeignwindow/CMakeLists.txt b/tests/manual/embeddedintoforeignwindow/CMakeLists.txt
new file mode 100644
index 0000000000..02c0893cde
--- /dev/null
+++ b/tests/manual/embeddedintoforeignwindow/CMakeLists.txt
@@ -0,0 +1,57 @@
+# Generated from embeddedintoforeignwindow.pro.
+
+#####################################################################
+## embeddedintoforeignwindow Binary:
+#####################################################################
+
+add_qt_manual_test(embeddedintoforeignwindow
+    SOURCES
+        ../diaglib/eventfilter.cpp ../diaglib/eventfilter.h
+        ../diaglib/nativewindowdump.h
+        ../diaglib/qwindowdump.cpp ../diaglib/qwindowdump.h
+        ../diaglib/textdump.cpp ../diaglib/textdump.h
+        itemwindow.cpp itemwindow.h
+        main.cpp
+    DEFINES
+        QT_DIAG_LIB
+    INCLUDE_DIRECTORIES
+        ../diaglib
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::Gui
+        Qt::GuiPrivate
+)
+
+#### Keys ignored in scope 1:.:.:embeddedintoforeignwindow.pro:<TRUE>:
+# TEMPLATE = "app"
+
+## Scopes:
+#####################################################################
+
+extend_target(embeddedintoforeignwindow CONDITION WIN32 AND NOT WINRT
+    SOURCES
+        ../diaglib/nativewindowdump_win.cpp
+    PUBLIC_LIBRARIES
+        user32
+)
+
+extend_target(embeddedintoforeignwindow CONDITION UNIX OR WINRT
+    SOURCES
+        ../diaglib/nativewindowdump.cpp
+)
+
+extend_target(embeddedintoforeignwindow CONDITION QT_FEATURE_widgets
+    SOURCES
+        ../diaglib/debugproxystyle.cpp ../diaglib/debugproxystyle.h
+        ../diaglib/logwidget.cpp ../diaglib/logwidget.h
+        ../diaglib/qwidgetdump.cpp ../diaglib/qwidgetdump.h
+    PUBLIC_LIBRARIES
+        Qt::WidgetsPrivate
+)
+
+extend_target(embeddedintoforeignwindow CONDITION QT_FEATURE_opengl
+    SOURCES
+        ../diaglib/glinfo.cpp ../diaglib/glinfo.h
+    PUBLIC_LIBRARIES
+        Qt::OpenGL
+)
diff --git a/tests/manual/filetest/CMakeLists.txt b/tests/manual/filetest/CMakeLists.txt
new file mode 100644
index 0000000000..efefc262ef
--- /dev/null
+++ b/tests/manual/filetest/CMakeLists.txt
@@ -0,0 +1,13 @@
+# Generated from filetest.pro.
+
+#####################################################################
+## filetest Binary:
+#####################################################################
+
+add_qt_manual_test(filetest
+    SOURCES
+        main.cpp
+)
+
+#### Keys ignored in scope 1:.:.:filetest.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/manual/foreignwindows/CMakeLists.txt b/tests/manual/foreignwindows/CMakeLists.txt
new file mode 100644
index 0000000000..8a7f525198
--- /dev/null
+++ b/tests/manual/foreignwindows/CMakeLists.txt
@@ -0,0 +1,57 @@
+# Generated from foreignwindows.pro.
+
+#####################################################################
+## foreignwindows Binary:
+#####################################################################
+
+add_qt_manual_test(foreignwindows
+    SOURCES
+        ../diaglib/eventfilter.cpp ../diaglib/eventfilter.h
+        ../diaglib/nativewindowdump.h
+        ../diaglib/qwindowdump.cpp ../diaglib/qwindowdump.h
+        ../diaglib/textdump.cpp ../diaglib/textdump.h
+        main.cpp
+    DEFINES
+        QT_DIAG_LIB
+    INCLUDE_DIRECTORIES
+        ../diaglib
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::Gui
+        Qt::GuiPrivate
+        Qt::Widgets
+)
+
+#### Keys ignored in scope 1:.:.:foreignwindows.pro:<TRUE>:
+# TEMPLATE = "app"
+
+## Scopes:
+#####################################################################
+
+extend_target(foreignwindows CONDITION WIN32 AND NOT WINRT
+    SOURCES
+        ../diaglib/nativewindowdump_win.cpp
+    PUBLIC_LIBRARIES
+        user32
+)
+
+extend_target(foreignwindows CONDITION UNIX OR WINRT
+    SOURCES
+        ../diaglib/nativewindowdump.cpp
+)
+
+extend_target(foreignwindows CONDITION QT_FEATURE_widgets
+    SOURCES
+        ../diaglib/debugproxystyle.cpp ../diaglib/debugproxystyle.h
+        ../diaglib/logwidget.cpp ../diaglib/logwidget.h
+        ../diaglib/qwidgetdump.cpp ../diaglib/qwidgetdump.h
+    PUBLIC_LIBRARIES
+        Qt::WidgetsPrivate
+)
+
+extend_target(foreignwindows CONDITION QT_FEATURE_opengl
+    SOURCES
+        ../diaglib/glinfo.cpp ../diaglib/glinfo.h
+    PUBLIC_LIBRARIES
+        Qt::OpenGL
+)
diff --git a/tests/manual/foreignwindows/foreignwindows.pro b/tests/manual/foreignwindows/foreignwindows.pro
index 15bf2395f8..b78931bf7a 100644
--- a/tests/manual/foreignwindows/foreignwindows.pro
+++ b/tests/manual/foreignwindows/foreignwindows.pro
@@ -1,5 +1,5 @@
 TEMPLATE = app
-QT += widgets
+QT += widgets opengl
 CONFIG += cmdline c++11
 SOURCES += main.cpp
 include(../diaglib/diaglib.pri)
diff --git a/tests/manual/gestures/CMakeLists.txt b/tests/manual/gestures/CMakeLists.txt
new file mode 100644
index 0000000000..7011d3221d
--- /dev/null
+++ b/tests/manual/gestures/CMakeLists.txt
@@ -0,0 +1,4 @@
+# Generated from gestures.pro.
+
+add_subdirectory(graphicsview)
+add_subdirectory(scrollarea)
diff --git a/tests/manual/gestures/graphicsview/CMakeLists.txt b/tests/manual/gestures/graphicsview/CMakeLists.txt
new file mode 100644
index 0000000000..81dc1931aa
--- /dev/null
+++ b/tests/manual/gestures/graphicsview/CMakeLists.txt
@@ -0,0 +1,17 @@
+# Generated from graphicsview.pro.
+
+#####################################################################
+## tst_manual_graphicsview Binary:
+#####################################################################
+
+add_qt_manual_test(tst_manual_graphicsview
+    GUI
+    SOURCES
+        gestures.cpp gestures.h
+        imageitem.cpp imageitem.h
+        main.cpp
+        mousepangesturerecognizer.cpp mousepangesturerecognizer.h
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+)
diff --git a/tests/manual/gestures/graphicsview/graphicsview.pro b/tests/manual/gestures/graphicsview/graphicsview.pro
index 9ecd0b372f..a20c4b3948 100644
--- a/tests/manual/gestures/graphicsview/graphicsview.pro
+++ b/tests/manual/gestures/graphicsview/graphicsview.pro
@@ -1,5 +1,7 @@
 QT += widgets
 
+TARGET = tst_manual_graphicsview
+
 SOURCES += main.cpp \
     imageitem.cpp \
     gestures.cpp \
diff --git a/tests/manual/gestures/scrollarea/CMakeLists.txt b/tests/manual/gestures/scrollarea/CMakeLists.txt
new file mode 100644
index 0000000000..c521c8e2df
--- /dev/null
+++ b/tests/manual/gestures/scrollarea/CMakeLists.txt
@@ -0,0 +1,15 @@
+# Generated from scrollarea.pro.
+
+#####################################################################
+## scrollarea Binary:
+#####################################################################
+
+add_qt_manual_test(scrollarea
+    GUI
+    SOURCES
+        main.cpp
+        mousepangesturerecognizer.cpp mousepangesturerecognizer.h
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+)
diff --git a/tests/manual/highdpi/CMakeLists.txt b/tests/manual/highdpi/CMakeLists.txt
new file mode 100644
index 0000000000..dee2d1ae43
--- /dev/null
+++ b/tests/manual/highdpi/CMakeLists.txt
@@ -0,0 +1,40 @@
+# Generated from highdpi.pro.
+
+#####################################################################
+## highdpi Binary:
+#####################################################################
+
+add_qt_manual_test(highdpi
+    SOURCES
+        dragwidget.cpp dragwidget.h
+        main.cpp
+    DEFINES
+        HAVE_SCREEN_BASE_DPI
+    INCLUDE_DIRECTORIES
+        .
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::GuiPrivate
+        Qt::Widgets
+)
+
+# Resources:
+set(highdpi_resource_files
+    "qticon16.png"
+    "qticon16@2x.png"
+    "qticon16@3x.png"
+    "qticon32.png"
+    "qticon32@2x.png"
+    "qticon64.png"
+)
+
+add_qt_resource(highdpi "highdpi"
+    PREFIX
+        "/"
+    FILES
+        ${highdpi_resource_files}
+)
+
+
+#### Keys ignored in scope 1:.:.:highdpi.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/manual/highdpi/main.cpp b/tests/manual/highdpi/main.cpp
index 0c4b5c88ae..2a9fb6aa0c 100644
--- a/tests/manual/highdpi/main.cpp
+++ b/tests/manual/highdpi/main.cpp
@@ -75,7 +75,7 @@ static QTextStream &operator<<(QTextStream &str, const QSizeF &s)
 
 static QTextStream &operator<<(QTextStream &str, const QRect &r)
 {
-    str << r.width() << 'x' << r.height() << forcesign << r.x() << r.y() << noforcesign;
+    str << r.width() << 'x' << r.height() << Qt::forcesign << r.x() << r.y() << Qt::noforcesign;
     return str;
 }
 
diff --git a/tests/manual/inputmethodhints/CMakeLists.txt b/tests/manual/inputmethodhints/CMakeLists.txt
new file mode 100644
index 0000000000..1bbf7caef8
--- /dev/null
+++ b/tests/manual/inputmethodhints/CMakeLists.txt
@@ -0,0 +1,20 @@
+# Generated from inputmethodhints.pro.
+
+#####################################################################
+## tst_inputmethodhints Binary:
+#####################################################################
+
+add_qt_manual_test(tst_inputmethodhints
+    GUI
+    SOURCES
+        inputmethodhints.cpp inputmethodhints.h inputmethodhints.ui
+        main.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+    ENABLE_AUTOGEN_TOOLS
+        uic
+)
+
+#### Keys ignored in scope 1:.:.:inputmethodhints.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/manual/keypadnavigation/CMakeLists.txt b/tests/manual/keypadnavigation/CMakeLists.txt
new file mode 100644
index 0000000000..8f11ad711c
--- /dev/null
+++ b/tests/manual/keypadnavigation/CMakeLists.txt
@@ -0,0 +1,17 @@
+# Generated from keypadnavigation.pro.
+
+#####################################################################
+## keypadnavigation Binary:
+#####################################################################
+
+add_qt_manual_test(keypadnavigation
+    GUI
+    SOURCES
+        keypadnavigation.ui
+        main.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+    ENABLE_AUTOGEN_TOOLS
+        uic
+)
diff --git a/tests/manual/lance/CMakeLists.txt b/tests/manual/lance/CMakeLists.txt
new file mode 100644
index 0000000000..c59910d363
--- /dev/null
+++ b/tests/manual/lance/CMakeLists.txt
@@ -0,0 +1,175 @@
+# Generated from lance.pro.
+
+#####################################################################
+## lance Binary:
+#####################################################################
+
+add_qt_manual_test(lance
+    SOURCES
+        ../../auto/other/lancelot/paintcommands.cpp ../../auto/other/lancelot/paintcommands.h
+        interactivewidget.cpp interactivewidget.h
+        main.cpp
+        widgets.h
+    INCLUDE_DIRECTORIES
+        .
+        ../../auto/other/lancelot
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::Gui
+        Qt::GuiPrivate
+        Qt::PrintSupport
+        Qt::Widgets
+)
+
+# Resources:
+set(icons_resource_files
+    "enum.png"
+    "tools.png"
+)
+
+add_qt_resource(lance "icons"
+    PREFIX
+        "/icons"
+    FILES
+        ${icons_resource_files}
+)
+set_source_files_properties("../../auto/other/lancelot/images/alpha.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/alpha.png"
+)
+set_source_files_properties("../../auto/other/lancelot/images/alpha2x2.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/alpha2x2.png"
+)
+set_source_files_properties("../../auto/other/lancelot/images/bitmap.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/bitmap.png"
+)
+set_source_files_properties("../../auto/other/lancelot/images/border.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/border.png"
+)
+set_source_files_properties("../../auto/other/lancelot/images/borderimage.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/borderimage.png"
+)
+set_source_files_properties("../../auto/other/lancelot/images/dome_argb32.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/dome_argb32.png"
+)
+set_source_files_properties("../../auto/other/lancelot/images/dome_indexed.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/dome_indexed.png"
+)
+set_source_files_properties("../../auto/other/lancelot/images/dome_indexed_mask.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/dome_indexed_mask.png"
+)
+set_source_files_properties("../../auto/other/lancelot/images/dome_mono.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/dome_mono.png"
+)
+set_source_files_properties("../../auto/other/lancelot/images/dome_mono_128.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/dome_mono_128.png"
+)
+set_source_files_properties("../../auto/other/lancelot/images/dome_mono_palette.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/dome_mono_palette.png"
+)
+set_source_files_properties("../../auto/other/lancelot/images/dome_rgb32.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/dome_rgb32.png"
+)
+set_source_files_properties("../../auto/other/lancelot/images/dot.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/dot.png"
+)
+set_source_files_properties("../../auto/other/lancelot/images/face.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/face.png"
+)
+set_source_files_properties("../../auto/other/lancelot/images/gam030.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/gam030.png"
+)
+set_source_files_properties("../../auto/other/lancelot/images/gam045.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/gam045.png"
+)
+set_source_files_properties("../../auto/other/lancelot/images/gam056.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/gam056.png"
+)
+set_source_files_properties("../../auto/other/lancelot/images/gam100.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/gam100.png"
+)
+set_source_files_properties("../../auto/other/lancelot/images/gam200.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/gam200.png"
+)
+set_source_files_properties("../../auto/other/lancelot/images/image.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/image.png"
+)
+set_source_files_properties("../../auto/other/lancelot/images/mask.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/mask.png"
+)
+set_source_files_properties("../../auto/other/lancelot/images/mask_100.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/mask_100.png"
+)
+set_source_files_properties("../../auto/other/lancelot/images/masked.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/masked.png"
+)
+set_source_files_properties("../../auto/other/lancelot/images/sign.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/sign.png"
+)
+set_source_files_properties("../../auto/other/lancelot/images/solid.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/solid.png"
+)
+set_source_files_properties("../../auto/other/lancelot/images/solid2x2.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/solid2x2.png"
+)
+set_source_files_properties("../../auto/other/lancelot/images/struct-image-01.jpg"
+    PROPERTIES QT_RESOURCE_ALIAS "images/struct-image-01.jpg"
+)
+set_source_files_properties("../../auto/other/lancelot/images/struct-image-01.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/struct-image-01.png"
+)
+set_source_files_properties("../../auto/other/lancelot/images/zebra.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/zebra.png"
+)
+set(images_resource_files
+    "images/alpha.png"
+    "images/alpha2x2.png"
+    "images/bitmap.png"
+    "images/border.png"
+    "images/borderimage.png"
+    "images/dome_argb32.png"
+    "images/dome_indexed.png"
+    "images/dome_indexed_mask.png"
+    "images/dome_mono.png"
+    "images/dome_mono_128.png"
+    "images/dome_mono_palette.png"
+    "images/dome_rgb32.png"
+    "images/dot.png"
+    "images/face.png"
+    "images/gam030.png"
+    "images/gam045.png"
+    "images/gam056.png"
+    "images/gam100.png"
+    "images/gam200.png"
+    "images/image.png"
+    "images/mask.png"
+    "images/mask_100.png"
+    "images/masked.png"
+    "images/sign.png"
+    "images/solid.png"
+    "images/solid2x2.png"
+    "images/struct-image-01.jpg"
+    "images/struct-image-01.png"
+    "images/zebra.png"
+)
+
+add_qt_resource(lance "images"
+    PREFIX
+        "/"
+    BASE
+        "../../auto/other/lancelot"
+    FILES
+        ${images_resource_files}
+)
+
+
+#### Keys ignored in scope 1:.:.:lance.pro:<TRUE>:
+# TEMPLATE = "app"
+
+## Scopes:
+#####################################################################
+
+extend_target(lance CONDITION TARGET Qt::OpenGL
+    PUBLIC_LIBRARIES
+        Qt::OpenGL
+        Qt::OpenGLWidgets
+)
diff --git a/tests/manual/lance/lance.pro b/tests/manual/lance/lance.pro
index 78ca2f56e5..4437cb4539 100644
--- a/tests/manual/lance/lance.pro
+++ b/tests/manual/lance/lance.pro
@@ -2,7 +2,7 @@ LANCELOT_DIR = $$PWD/../../auto/other/lancelot
 CONFIG += cmdline moc
 TEMPLATE = app
 INCLUDEPATH += . $$LANCELOT_DIR
-QT += core-private gui-private widgets printsupport
+QT += core-private gui-private widgets printsupport openglwidgets
 
 HEADERS += widgets.h \
            interactivewidget.h \
diff --git a/tests/manual/lance/main.cpp b/tests/manual/lance/main.cpp
index c8e79f42f0..662fc35ad6 100644
--- a/tests/manual/lance/main.cpp
+++ b/tests/manual/lance/main.cpp
@@ -42,8 +42,9 @@
 #endif
 
 #ifndef QT_NO_OPENGL
-#include <qgl.h>
-#include <QGLPixelBuffer>
+#include <QtOpenGL/QOpenGLFramebufferObjectFormat>
+#include <QtOpenGL/QOpenGLPaintDevice>
+#include <QtOpenGLWidgets/QOpenGLWidget>
 #endif
 
 // #define DO_QWS_DEBUGGING
@@ -89,7 +90,7 @@ static void printHelp()
            "    -imagemono      Paints the files to a monochrome image\n"
            "    -imagewidget    same as image, but with interacion...\n"
 #ifndef QT_NO_OPENGL
-           "    -opengl         Paints the files to a QGLWidget (Qt4 style) on screen\n"
+           "    -opengl         Paints the files to a QOpenGLWidget on screen\n"
            "    -glbuffer       Paints the files to a QOpenGLFrameBufferObject (Qt5 style) \n"
            "    -coreglbuffer   Paints the files to a Core Profile context QOpenGLFrameBufferObject\n"
 #endif
@@ -233,12 +234,11 @@ int main(int argc, char **argv)
     bool verboseMode = false;
 
 #ifndef QT_NO_OPENGL
-    QGLFormat f = QGLFormat::defaultFormat();
-    f.setSampleBuffers(true);
-    f.setStencil(true);
-    f.setAlpha(true);
+    QSurfaceFormat f = QSurfaceFormat::defaultFormat();
+    f.setSamples(1);
+    f.setStencilBufferSize(8);
     f.setAlphaBufferSize(8);
-    QGLFormat::setDefaultFormat(f);
+    QSurfaceFormat::setDefaultFormat(f);
 #endif
 
     char *arg;
@@ -447,14 +447,14 @@ int main(int argc, char **argv)
             }
             case OpenGLType:
             {
-                OnScreenWidget<QGLWidget> *qGLWidget = new OnScreenWidget<QGLWidget>(files.at(j));
-                qGLWidget->setVerboseMode(verboseMode);
-                qGLWidget->setType(type);
-                qGLWidget->setCheckersBackground(checkers_background);
-                qGLWidget->m_commands = content;
-                qGLWidget->resize(width, height);
-                qGLWidget->show();
-                activeWidget = qGLWidget;
+                OnScreenWidget<QOpenGLWidget> *qOpenGLWidget = new OnScreenWidget<QOpenGLWidget>(files.at(j));
+                qOpenGLWidget->setVerboseMode(verboseMode);
+                qOpenGLWidget->setType(type);
+                qOpenGLWidget->setCheckersBackground(checkers_background);
+                qOpenGLWidget->m_commands = content;
+                qOpenGLWidget->resize(width, height);
+                qOpenGLWidget->show();
+                activeWidget = qOpenGLWidget;
                 break;
             }
 #else
diff --git a/tests/manual/manual.pro b/tests/manual/manual.pro
index 42f9878e44..de13bc799e 100644
--- a/tests/manual/manual.pro
+++ b/tests/manual/manual.pro
@@ -67,8 +67,4 @@ qtConfig(opengl) {
 
 win32: SUBDIRS -= network_remote_stresstest network_stresstest
 
-lessThan(QT_MAJOR_VERSION, 5): SUBDIRS -= bearerex lance qnetworkaccessmanager/qget qmimedatabase qnetworkreply \
-qpainfo qscreen  socketengine xembed-raster xembed-widgets windowtransparency \
-embeddedintoforeignwindow foreignwindows
-
 qtConfig(vulkan): SUBDIRS += qvulkaninstance
diff --git a/tests/manual/markdown/CMakeLists.txt b/tests/manual/markdown/CMakeLists.txt
new file mode 100644
index 0000000000..f6e5284eea
--- /dev/null
+++ b/tests/manual/markdown/CMakeLists.txt
@@ -0,0 +1,18 @@
+# Generated from html2md.pro.
+
+#####################################################################
+## html2md Binary:
+#####################################################################
+
+add_qt_manual_test(html2md
+    GUI
+    SOURCES
+        html2md.cpp
+    INCLUDE_DIRECTORIES
+        .
+    PUBLIC_LIBRARIES
+        Qt::Gui
+)
+
+#### Keys ignored in scope 1:.:.:html2md.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/manual/network_remote_stresstest/CMakeLists.txt b/tests/manual/network_remote_stresstest/CMakeLists.txt
new file mode 100644
index 0000000000..46db952b46
--- /dev/null
+++ b/tests/manual/network_remote_stresstest/CMakeLists.txt
@@ -0,0 +1,28 @@
+# Generated from network_remote_stresstest.pro.
+
+#####################################################################
+## tst_network_remote_stresstest Binary:
+#####################################################################
+
+add_qt_manual_test(tst_network_remote_stresstest
+    SOURCES
+        tst_network_remote_stresstest.cpp
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::Network
+        Qt::NetworkPrivate
+        Qt::Test
+)
+
+# Resources:
+set(url-list_resource_files
+    "url-list.txt"
+)
+
+add_qt_resource(tst_network_remote_stresstest "url-list"
+    PREFIX
+        "/"
+    FILES
+        ${url-list_resource_files}
+)
+
diff --git a/tests/manual/network_stresstest/CMakeLists.txt b/tests/manual/network_stresstest/CMakeLists.txt
new file mode 100644
index 0000000000..310c62dae8
--- /dev/null
+++ b/tests/manual/network_stresstest/CMakeLists.txt
@@ -0,0 +1,33 @@
+# Generated from network_stresstest.pro.
+
+#####################################################################
+## tst_network_stresstest Binary:
+#####################################################################
+
+add_qt_manual_test(tst_network_stresstest
+    SOURCES
+        minihttpserver.cpp minihttpserver.h
+        tst_network_stresstest.cpp
+    DEFINES
+        QT_DISABLE_DEPRECATED_BEFORE=0
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::NetworkPrivate
+        Qt::Test
+)
+
+# Resources:
+set(wwwfiles_resource_files
+    "qtest"
+)
+
+add_qt_resource(tst_network_stresstest "wwwfiles"
+    PREFIX
+        "/"
+    FILES
+        ${wwwfiles_resource_files}
+)
+
+
+#### Keys ignored in scope 1:.:.:network_stresstest.pro:<TRUE>:
+# QMAKE_RESOURCE_FLAGS = "-no-compress"
diff --git a/tests/manual/qcursor/CMakeLists.txt b/tests/manual/qcursor/CMakeLists.txt
new file mode 100644
index 0000000000..1824c0c1a4
--- /dev/null
+++ b/tests/manual/qcursor/CMakeLists.txt
@@ -0,0 +1,8 @@
+# Generated from qcursor.pro.
+
+add_subdirectory(allcursors)
+add_subdirectory(childwidget)
+add_subdirectory(childwindow)
+add_subdirectory(childwindowcontainer)
+add_subdirectory(grab_override)
+add_subdirectory(qcursorhighdpi)
diff --git a/tests/manual/qcursor/allcursors/CMakeLists.txt b/tests/manual/qcursor/allcursors/CMakeLists.txt
new file mode 100644
index 0000000000..0452653b86
--- /dev/null
+++ b/tests/manual/qcursor/allcursors/CMakeLists.txt
@@ -0,0 +1,20 @@
+# Generated from allcursors.pro.
+
+#####################################################################
+## tst_allcursors Binary:
+#####################################################################
+
+add_qt_manual_test(tst_allcursors
+    GUI
+    SOURCES
+        main.cpp
+        mainwindow.cpp mainwindow.h mainwindow.ui
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+    ENABLE_AUTOGEN_TOOLS
+        uic
+)
+
+#### Keys ignored in scope 1:.:.:allcursors.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/manual/qcursor/childwidget/CMakeLists.txt b/tests/manual/qcursor/childwidget/CMakeLists.txt
new file mode 100644
index 0000000000..5992cdaf73
--- /dev/null
+++ b/tests/manual/qcursor/childwidget/CMakeLists.txt
@@ -0,0 +1,19 @@
+# Generated from childwidget.pro.
+
+#####################################################################
+## tst_manual_childwidget Binary:
+#####################################################################
+
+add_qt_manual_test(tst_manual_childwidget
+    GUI
+    SOURCES
+        main.cpp
+    INCLUDE_DIRECTORIES
+        .
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+)
+
+#### Keys ignored in scope 1:.:.:childwidget.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/manual/qcursor/childwidget/childwidget.pro b/tests/manual/qcursor/childwidget/childwidget.pro
index 9ca41c5b4f..9492ec2280 100644
--- a/tests/manual/qcursor/childwidget/childwidget.pro
+++ b/tests/manual/qcursor/childwidget/childwidget.pro
@@ -1,5 +1,5 @@
 TEMPLATE = app
-TARGET = childwidget
+TARGET = tst_manual_childwidget
 INCLUDEPATH += .
 QT += widgets
 
diff --git a/tests/manual/qcursor/childwindow/CMakeLists.txt b/tests/manual/qcursor/childwindow/CMakeLists.txt
new file mode 100644
index 0000000000..de2a8dae6d
--- /dev/null
+++ b/tests/manual/qcursor/childwindow/CMakeLists.txt
@@ -0,0 +1,18 @@
+# Generated from childwindow.pro.
+
+#####################################################################
+## childwindow Binary:
+#####################################################################
+
+add_qt_manual_test(childwindow
+    GUI
+    SOURCES
+        main.cpp
+    INCLUDE_DIRECTORIES
+        .
+    PUBLIC_LIBRARIES
+        Qt::Gui
+)
+
+#### Keys ignored in scope 1:.:.:childwindow.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/manual/qcursor/childwindowcontainer/CMakeLists.txt b/tests/manual/qcursor/childwindowcontainer/CMakeLists.txt
new file mode 100644
index 0000000000..70c2bb7431
--- /dev/null
+++ b/tests/manual/qcursor/childwindowcontainer/CMakeLists.txt
@@ -0,0 +1,19 @@
+# Generated from childwindowcontainer.pro.
+
+#####################################################################
+## childwindowcontainer Binary:
+#####################################################################
+
+add_qt_manual_test(childwindowcontainer
+    GUI
+    SOURCES
+        main.cpp
+    INCLUDE_DIRECTORIES
+        .
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+)
+
+#### Keys ignored in scope 1:.:.:childwindowcontainer.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/manual/qcursor/grab_override/CMakeLists.txt b/tests/manual/qcursor/grab_override/CMakeLists.txt
new file mode 100644
index 0000000000..d3ea88de65
--- /dev/null
+++ b/tests/manual/qcursor/grab_override/CMakeLists.txt
@@ -0,0 +1,33 @@
+# Generated from grab_override.pro.
+
+#####################################################################
+## t_cursors Binary:
+#####################################################################
+
+add_qt_manual_test(t_cursors
+    GUI
+    SOURCES
+        main.cpp
+        mainwindow.cpp mainwindow.h mainwindow.ui
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+    ENABLE_AUTOGEN_TOOLS
+        uic
+)
+
+# Resources:
+set(images_resource_files
+    "data/monkey_on_64x64.png"
+)
+
+add_qt_resource(t_cursors "images"
+    PREFIX
+        "/"
+    FILES
+        ${images_resource_files}
+)
+
+
+#### Keys ignored in scope 1:.:.:grab_override.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/manual/qcursor/qcursorhighdpi/CMakeLists.txt b/tests/manual/qcursor/qcursorhighdpi/CMakeLists.txt
new file mode 100644
index 0000000000..9489d0675e
--- /dev/null
+++ b/tests/manual/qcursor/qcursorhighdpi/CMakeLists.txt
@@ -0,0 +1,26 @@
+# Generated from qcursorhighdpi.pro.
+
+#####################################################################
+## qcursorhighdpi Binary:
+#####################################################################
+
+add_qt_manual_test(qcursorhighdpi
+    SOURCES
+        main.cpp
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::Gui
+        Qt::GuiPrivate
+        Qt::Widgets
+)
+
+#### Keys ignored in scope 1:.:.:qcursorhighdpi.pro:<TRUE>:
+# TEMPLATE = "app"
+
+## Scopes:
+#####################################################################
+
+extend_target(qcursorhighdpi CONDITION WIN32
+    PUBLIC_LIBRARIES
+        User32
+)
diff --git a/tests/manual/qcursor/qcursorhighdpi/qcursorhighdpi.pro b/tests/manual/qcursor/qcursorhighdpi/qcursorhighdpi.pro
index 3a8fc25b33..b0a5a75a67 100644
--- a/tests/manual/qcursor/qcursorhighdpi/qcursorhighdpi.pro
+++ b/tests/manual/qcursor/qcursorhighdpi/qcursorhighdpi.pro
@@ -1,6 +1,5 @@
 TEMPLATE = app
-QT = core gui
-greaterThan(QT_MAJOR_VERSION, 4): QT += gui-private core-private widgets
+QT = core gui gui-private core-private widgets
 CONFIG -= app_bundle
 SOURCES += main.cpp
 win32: LIBS += -lUser32
diff --git a/tests/manual/qdesktopservices/CMakeLists.txt b/tests/manual/qdesktopservices/CMakeLists.txt
new file mode 100644
index 0000000000..5d880fcf65
--- /dev/null
+++ b/tests/manual/qdesktopservices/CMakeLists.txt
@@ -0,0 +1,19 @@
+# Generated from qdesktopservices.pro.
+
+#####################################################################
+## tst_manual_qdesktopservices Binary:
+#####################################################################
+
+add_qt_manual_test(tst_manual_qdesktopservices
+    SOURCES
+        tst_qdesktopservices.cpp
+    DEFINES
+        SRCDIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/\\\"
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Test
+)
+
+#### Keys ignored in scope 1:.:.:qdesktopservices.pro:<TRUE>:
+# OTHER_FILES = "test.txt"
+# TEMPLATE = "app"
diff --git a/tests/manual/qdesktopservices/qdesktopservices.pro b/tests/manual/qdesktopservices/qdesktopservices.pro
index baa3c325ff..d2c5703870 100644
--- a/tests/manual/qdesktopservices/qdesktopservices.pro
+++ b/tests/manual/qdesktopservices/qdesktopservices.pro
@@ -1,6 +1,6 @@
 QT       += testlib
 
-TARGET = tst_qdesktopservices
+TARGET = tst_manual_qdesktopservices
 CONFIG   += cmdline
 
 TEMPLATE = app
diff --git a/tests/manual/qdesktopwidget/CMakeLists.txt b/tests/manual/qdesktopwidget/CMakeLists.txt
new file mode 100644
index 0000000000..2034e3c368
--- /dev/null
+++ b/tests/manual/qdesktopwidget/CMakeLists.txt
@@ -0,0 +1,17 @@
+# Generated from qdesktopwidget.pro.
+
+#####################################################################
+## qdesktopwidget Binary:
+#####################################################################
+
+add_qt_manual_test(qdesktopwidget
+    GUI
+    SOURCES
+        main.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+)
+
+#### Keys ignored in scope 1:.:.:qdesktopwidget.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/manual/qgraphicsitem/CMakeLists.txt b/tests/manual/qgraphicsitem/CMakeLists.txt
new file mode 100644
index 0000000000..a75b436e74
--- /dev/null
+++ b/tests/manual/qgraphicsitem/CMakeLists.txt
@@ -0,0 +1,14 @@
+# Generated from qgraphicsitem.pro.
+
+#####################################################################
+## qgraphicsitem Binary:
+#####################################################################
+
+add_qt_manual_test(qgraphicsitem
+    GUI
+    SOURCES
+        main.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+)
diff --git a/tests/manual/qgraphicsitemgroup/CMakeLists.txt b/tests/manual/qgraphicsitemgroup/CMakeLists.txt
new file mode 100644
index 0000000000..8658c933b3
--- /dev/null
+++ b/tests/manual/qgraphicsitemgroup/CMakeLists.txt
@@ -0,0 +1,21 @@
+# Generated from qgraphicsitemgroup.pro.
+
+#####################################################################
+## qgraphicsitemgroup Binary:
+#####################################################################
+
+add_qt_manual_test(qgraphicsitemgroup
+    GUI
+    SOURCES
+        customitem.cpp customitem.h
+        main.cpp
+        widget.cpp widget.h widget.ui
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+    ENABLE_AUTOGEN_TOOLS
+        uic
+)
+
+#### Keys ignored in scope 1:.:.:qgraphicsitemgroup.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/manual/qgraphicslayout/flicker/CMakeLists.txt b/tests/manual/qgraphicslayout/flicker/CMakeLists.txt
new file mode 100644
index 0000000000..0d7fcce687
--- /dev/null
+++ b/tests/manual/qgraphicslayout/flicker/CMakeLists.txt
@@ -0,0 +1,15 @@
+# Generated from flicker.pro.
+
+#####################################################################
+## flicker Binary:
+#####################################################################
+
+add_qt_manual_test(flicker
+    GUI
+    SOURCES
+        main.cpp
+        window.cpp window.h
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+)
diff --git a/tests/manual/qhttpnetworkconnection/CMakeLists.txt b/tests/manual/qhttpnetworkconnection/CMakeLists.txt
new file mode 100644
index 0000000000..7331bf4611
--- /dev/null
+++ b/tests/manual/qhttpnetworkconnection/CMakeLists.txt
@@ -0,0 +1,16 @@
+# Generated from qhttpnetworkconnection.pro.
+
+#####################################################################
+## tst_manual_qhttpnetworkconnection Binary:
+#####################################################################
+
+add_qt_manual_test(tst_manual_qhttpnetworkconnection
+    SOURCES
+        main.cpp
+    PUBLIC_LIBRARIES
+        Qt::Network
+        Qt::Test
+)
+
+#### Keys ignored in scope 1:.:.:qhttpnetworkconnection.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/manual/qhttpnetworkconnection/main.cpp b/tests/manual/qhttpnetworkconnection/main.cpp
index 5b670a51e2..d67d76699c 100644
--- a/tests/manual/qhttpnetworkconnection/main.cpp
+++ b/tests/manual/qhttpnetworkconnection/main.cpp
@@ -58,7 +58,7 @@ void tst_qhttpnetworkconnection::bigRemoteFile()
     QVERIFY(!QTestEventLoop::instance().timeout());
     size = reply->size();
     delete reply;
-    qDebug() << "Finished!" << endl;
+    qDebug() << "Finished!" << Qt::endl;
     qDebug() << "Time:" << t.elapsed() << "msec";
     qDebug() << "Bytes:" << size;
     qDebug() << "Speed:" <<  (size / qreal(1024)) / (t.elapsed() / qreal(1000)) << "KB/sec";
diff --git a/tests/manual/qhttpnetworkconnection/qhttpnetworkconnection.pro b/tests/manual/qhttpnetworkconnection/qhttpnetworkconnection.pro
index 62838785d6..f6763e434d 100644
--- a/tests/manual/qhttpnetworkconnection/qhttpnetworkconnection.pro
+++ b/tests/manual/qhttpnetworkconnection/qhttpnetworkconnection.pro
@@ -1,5 +1,5 @@
 TEMPLATE = app
-TARGET = tst_qhttpnetworkconnection
+TARGET = tst_manual_qhttpnetworkconnection
 
 QT -= gui
 QT += network testlib
diff --git a/tests/manual/qimagereader/CMakeLists.txt b/tests/manual/qimagereader/CMakeLists.txt
new file mode 100644
index 0000000000..9e5869063b
--- /dev/null
+++ b/tests/manual/qimagereader/CMakeLists.txt
@@ -0,0 +1,14 @@
+# Generated from qimagereader.pro.
+
+#####################################################################
+## qimagereader Binary:
+#####################################################################
+
+add_qt_manual_test(qimagereader
+    GUI
+    SOURCES
+        main.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+)
diff --git a/tests/manual/qlayout/CMakeLists.txt b/tests/manual/qlayout/CMakeLists.txt
new file mode 100644
index 0000000000..541dc18857
--- /dev/null
+++ b/tests/manual/qlayout/CMakeLists.txt
@@ -0,0 +1,21 @@
+# Generated from qlayout.pro.
+
+#####################################################################
+## qlayout Binary:
+#####################################################################
+
+add_qt_manual_test(qlayout
+    GUI
+    SOURCES
+        gridwidget.cpp gridwidget.h
+        hbwidget.cpp hbwidget.h
+        main.cpp
+        mainwindow.cpp mainwindow.h
+        vbwidget.cpp vbwidget.h
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+)
+
+#### Keys ignored in scope 1:.:.:qlayout.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/manual/qlocale/CMakeLists.txt b/tests/manual/qlocale/CMakeLists.txt
new file mode 100644
index 0000000000..60519da9a1
--- /dev/null
+++ b/tests/manual/qlocale/CMakeLists.txt
@@ -0,0 +1,22 @@
+# Generated from qlocale.pro.
+
+#####################################################################
+## qlocale Binary:
+#####################################################################
+
+add_qt_manual_test(qlocale
+    GUI
+    SOURCES
+        calendar.cpp calendar.h
+        currency.cpp currency.h
+        dateformats.cpp dateformats.h
+        info.cpp info.h
+        languages.cpp languages.h
+        main.cpp
+        miscellaneous.cpp miscellaneous.h
+        numberformats.cpp numberformats.h
+        window.cpp window.h
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+)
diff --git a/tests/manual/qmetatype/CMakeLists.txt b/tests/manual/qmetatype/CMakeLists.txt
new file mode 100644
index 0000000000..bb5f75092a
--- /dev/null
+++ b/tests/manual/qmetatype/CMakeLists.txt
@@ -0,0 +1,12 @@
+# Generated from qmetatype.pro.
+
+#####################################################################
+## tst_qmetatype_expect_fail Test:
+#####################################################################
+
+add_qt_test(tst_qmetatype_expect_fail
+    GUI
+    SOURCES
+        declare_metatype_noninline.cpp declare_metatype_noninline.h
+        tst_qmetatype.cpp
+)
diff --git a/tests/manual/qmimedatabase/CMakeLists.txt b/tests/manual/qmimedatabase/CMakeLists.txt
new file mode 100644
index 0000000000..038f784ac2
--- /dev/null
+++ b/tests/manual/qmimedatabase/CMakeLists.txt
@@ -0,0 +1,13 @@
+# Generated from qmimedatabase.pro.
+
+#####################################################################
+## qmimedatabase Binary:
+#####################################################################
+
+add_qt_manual_test(qmimedatabase
+    SOURCES
+        main.cpp
+)
+
+#### Keys ignored in scope 1:.:.:qmimedatabase.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/manual/qnetconmonitor/.prev_CMakeLists.txt b/tests/manual/qnetconmonitor/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..ed552bc435
--- /dev/null
+++ b/tests/manual/qnetconmonitor/.prev_CMakeLists.txt
@@ -0,0 +1,16 @@
+# Generated from qnetconmonitor.pro.
+
+#####################################################################
+## qnetconmonitor Binary:
+#####################################################################
+
+add_qt_manual_test(qnetconmonitor
+    SOURCES
+        tst_qnetconmonitor.cpp
+    PUBLIC_LIBRARIES
+        Qt::NetworkPrivate
+        Qt::Test
+)
+
+#### Keys ignored in scope 1:.:.:qnetconmonitor.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/manual/qnetconmonitor/CMakeLists.txt b/tests/manual/qnetconmonitor/CMakeLists.txt
new file mode 100644
index 0000000000..8eda85b783
--- /dev/null
+++ b/tests/manual/qnetconmonitor/CMakeLists.txt
@@ -0,0 +1,22 @@
+# Generated from qnetconmonitor.pro.
+
+#####################################################################
+## qnetconmonitor Binary:
+#####################################################################
+
+# special case begin
+if (NOT QT_FEATURE_private_tests)
+    return()
+endif()
+# special case end
+
+add_qt_manual_test(qnetconmonitor
+    SOURCES
+        tst_qnetconmonitor.cpp
+    PUBLIC_LIBRARIES
+        Qt::NetworkPrivate
+        Qt::Test
+)
+
+#### Keys ignored in scope 1:.:.:qnetconmonitor.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/manual/qnetworkaccessmanager/qget/CMakeLists.txt b/tests/manual/qnetworkaccessmanager/qget/CMakeLists.txt
new file mode 100644
index 0000000000..1d4ffa4b36
--- /dev/null
+++ b/tests/manual/qnetworkaccessmanager/qget/CMakeLists.txt
@@ -0,0 +1,17 @@
+# Generated from qget.pro.
+
+#####################################################################
+## qget Binary:
+#####################################################################
+
+add_qt_manual_test(qget
+    SOURCES
+        downloadmanager.cpp
+        qget.cpp qget.h
+        transferitem.cpp
+    PUBLIC_LIBRARIES
+        Qt::Network
+)
+
+#### Keys ignored in scope 1:.:.:qget.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/manual/qnetworkaccessmanager/qget/qget.cpp b/tests/manual/qnetworkaccessmanager/qget/qget.cpp
index 639506af63..14bdb589ff 100644
--- a/tests/manual/qnetworkaccessmanager/qget/qget.cpp
+++ b/tests/manual/qnetworkaccessmanager/qget/qget.cpp
@@ -39,33 +39,41 @@
 
 void printShortUsage()
 {
-    qDebug() << QCoreApplication::applicationName() << " [options] [list of urls]" << endl
-             << "Get one or more urls using QNetworkAccessManager" << endl
-             << "--help to display detailed usage" << endl;
+    qDebug() << QCoreApplication::applicationName() << " [options] [list of urls]" << Qt::endl
+             << "Get one or more urls using QNetworkAccessManager" << Qt::endl
+             << "--help to display detailed usage" << Qt::endl;
 }
 
 void printUsage()
 {
-    qDebug() << QCoreApplication::applicationName() << " [options] [list of urls]" << endl
-             << "Get one or more urls using QNetworkAccessManager" << endl
+    qDebug() << QCoreApplication::applicationName() << " [options] [list of urls]" << Qt::endl
+             << "Get one or more urls using QNetworkAccessManager" << Qt::endl
              << "Options:"
-             << "--help                             This message" << endl
-             << "--user=<username>                  Set username to use for authentication" << endl
-             << "--password=<password>              Set password to use for authentication" << endl
-             << "--proxy-user=<username>            Set username to use for proxy authentication" << endl
-             << "--proxy-password=<password>        Set password to use for proxy authentication" << endl
-             << "--proxy=on                         Use system proxy (default)" << endl
-             << "--proxy=off                        Don't use system proxy" << endl
-             << "--proxy=<host:port>[,type]         Use specified proxy" << endl
-             << "                   ,http           HTTP proxy (default)" << endl
-             << "                   ,socks          SOCKS5 proxy" << endl
-             << "                   ,ftp            FTP proxy" << endl
-             << "                   ,httpcaching    HTTP caching proxy (no CONNECT method)" << endl
-             << "--headers=filename                 Set request headers from file contents" << endl
-             << "--post=filename                    upload the file to the next url using HTTP POST" << endl
-             << "--put=filename                     upload the file to the next url using HTTP PUT" << endl
-             << "--content-type=<MIME>              set content-type header for upload" << endl
-             << "--serial                           don't run requests in parallel" << endl;
+             << "--help                             This message" << Qt::endl
+             << "--user=<username>                  Set username to use for authentication"
+             << Qt::endl
+             << "--password=<password>              Set password to use for authentication"
+             << Qt::endl
+             << "--proxy-user=<username>            Set username to use for proxy authentication"
+             << Qt::endl
+             << "--proxy-password=<password>        Set password to use for proxy authentication"
+             << Qt::endl
+             << "--proxy=on                         Use system proxy (default)" << Qt::endl
+             << "--proxy=off                        Don't use system proxy" << Qt::endl
+             << "--proxy=<host:port>[,type]         Use specified proxy" << Qt::endl
+             << "                   ,http           HTTP proxy (default)" << Qt::endl
+             << "                   ,socks          SOCKS5 proxy" << Qt::endl
+             << "                   ,ftp            FTP proxy" << Qt::endl
+             << "                   ,httpcaching    HTTP caching proxy (no CONNECT method)"
+             << Qt::endl
+             << "--headers=filename                 Set request headers from file contents"
+             << Qt::endl
+             << "--post=filename                    upload the file to the next url using HTTP POST"
+             << Qt::endl
+             << "--put=filename                     upload the file to the next url using HTTP PUT"
+             << Qt::endl
+             << "--content-type=<MIME>              set content-type header for upload" << Qt::endl
+             << "--serial                           don't run requests in parallel" << Qt::endl;
 }
 
 int main(int argc, char *argv[])
diff --git a/tests/manual/qnetworkconfiguration/CMakeLists.txt b/tests/manual/qnetworkconfiguration/CMakeLists.txt
new file mode 100644
index 0000000000..f843446888
--- /dev/null
+++ b/tests/manual/qnetworkconfiguration/CMakeLists.txt
@@ -0,0 +1,16 @@
+# Generated from qnetworkconfiguration.pro.
+
+#####################################################################
+## tst_manual_qnetworkconfiguration Binary:
+#####################################################################
+
+add_qt_manual_test(tst_manual_qnetworkconfiguration
+    SOURCES
+        main.cpp
+    PUBLIC_LIBRARIES
+        Qt::Network
+        Qt::Test
+)
+
+#### Keys ignored in scope 1:.:.:qnetworkconfiguration.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/manual/qnetworkconfiguration/qnetworkconfiguration.pro b/tests/manual/qnetworkconfiguration/qnetworkconfiguration.pro
index 25ef41b92a..13c229e885 100644
--- a/tests/manual/qnetworkconfiguration/qnetworkconfiguration.pro
+++ b/tests/manual/qnetworkconfiguration/qnetworkconfiguration.pro
@@ -1,5 +1,5 @@
 TEMPLATE = app
-TARGET = tst_qnetworkconfiguration
+TARGET = tst_manual_qnetworkconfiguration
 
 QT -= gui
 QT += network testlib
diff --git a/tests/manual/qnetworkconfigurationmanager/CMakeLists.txt b/tests/manual/qnetworkconfigurationmanager/CMakeLists.txt
new file mode 100644
index 0000000000..4bea8449ff
--- /dev/null
+++ b/tests/manual/qnetworkconfigurationmanager/CMakeLists.txt
@@ -0,0 +1,16 @@
+# Generated from qnetworkconfigurationmanager.pro.
+
+#####################################################################
+## tst_manual_qnetworkconfigurationmanager Binary:
+#####################################################################
+
+add_qt_manual_test(tst_manual_qnetworkconfigurationmanager
+    SOURCES
+        main.cpp
+    PUBLIC_LIBRARIES
+        Qt::Network
+        Qt::Test
+)
+
+#### Keys ignored in scope 1:.:.:qnetworkconfigurationmanager.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/manual/qnetworkconfigurationmanager/qnetworkconfigurationmanager.pro b/tests/manual/qnetworkconfigurationmanager/qnetworkconfigurationmanager.pro
index 8f9314cc96..072b330894 100644
--- a/tests/manual/qnetworkconfigurationmanager/qnetworkconfigurationmanager.pro
+++ b/tests/manual/qnetworkconfigurationmanager/qnetworkconfigurationmanager.pro
@@ -1,5 +1,5 @@
 TEMPLATE = app
-TARGET = tst_qnetworkconfigurationmanager
+TARGET = tst_manual_qnetworkconfigurationmanager
 
 QT -= gui
 QT += network testlib
diff --git a/tests/manual/qnetworkreply/.prev_CMakeLists.txt b/tests/manual/qnetworkreply/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..24854aa64f
--- /dev/null
+++ b/tests/manual/qnetworkreply/.prev_CMakeLists.txt
@@ -0,0 +1,18 @@
+# Generated from qnetworkreply.pro.
+
+#####################################################################
+## tst_manual_qnetworkreply Binary:
+#####################################################################
+
+add_qt_manual_test(tst_manual_qnetworkreply
+    SOURCES
+        main.cpp
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::Network
+        Qt::NetworkPrivate
+        Qt::Test
+)
+
+#### Keys ignored in scope 1:.:.:qnetworkreply.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/manual/qnetworkreply/CMakeLists.txt b/tests/manual/qnetworkreply/CMakeLists.txt
new file mode 100644
index 0000000000..5ac12ced95
--- /dev/null
+++ b/tests/manual/qnetworkreply/CMakeLists.txt
@@ -0,0 +1,24 @@
+# Generated from qnetworkreply.pro.
+
+#####################################################################
+## tst_manual_qnetworkreply Binary:
+#####################################################################
+
+# special case begin
+if (NOT QT_FEATURE_private_tests)
+    return()
+endif()
+# special case end
+
+add_qt_manual_test(tst_manual_qnetworkreply
+    SOURCES
+        main.cpp
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::Network
+        Qt::NetworkPrivate
+        Qt::Test
+)
+
+#### Keys ignored in scope 1:.:.:qnetworkreply.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/manual/qnetworkreply/main.cpp b/tests/manual/qnetworkreply/main.cpp
index 762bfe7b83..1086498553 100644
--- a/tests/manual/qnetworkreply/main.cpp
+++ b/tests/manual/qnetworkreply/main.cpp
@@ -58,9 +58,6 @@ private slots:
     void setSslConfiguration_data();
     void setSslConfiguration();
     void uploadToFacebook();
-    void spdy_data();
-    void spdy();
-    void spdyMultipleRequestsPerHost();
     void proxyAuthentication_data();
     void proxyAuthentication();
     void authentication();
@@ -291,126 +288,6 @@ void tst_qnetworkreply::uploadToFacebook()
     }
 }
 
-void tst_qnetworkreply::spdy_data()
-{
-    QTest::addColumn<QString>("host");
-    QTest::addColumn<bool>("setAttribute");
-    QTest::addColumn<bool>("enabled");
-    QTest::addColumn<QByteArray>("expectedProtocol");
-
-    QList<QString> hosts = QList<QString>()
-            << QStringLiteral("www.google.com") // sends SPDY and 30x redirect
-            << QStringLiteral("www.google.de") // sends SPDY and 200 OK
-            << QStringLiteral("mail.google.com") // sends SPDY and 200 OK
-            << QStringLiteral("www.youtube.com") // sends SPDY and 200 OK
-            << QStringLiteral("www.dropbox.com") // no SPDY, but NPN which selects HTTP
-            << QStringLiteral("www.facebook.com") // sends SPDY and 200 OK
-            << QStringLiteral("graph.facebook.com") // sends SPDY and 200 OK
-            << QStringLiteral("www.twitter.com") // sends SPDY and 30x redirect
-            << QStringLiteral("twitter.com") // sends SPDY and 200 OK
-            << QStringLiteral("api.twitter.com"); // sends SPDY and 200 OK
-
-    foreach (const QString &host, hosts) {
-        QByteArray tag = host.toLocal8Bit();
-        tag.append("-not-used");
-        QTest::newRow(tag)
-                << QStringLiteral("https://") + host
-                << false
-                << false
-                << QByteArray();
-
-        tag = host.toLocal8Bit();
-        tag.append("-disabled");
-        QTest::newRow(tag)
-                << QStringLiteral("https://") + host
-                << true
-                << false
-                << QByteArray();
-
-        if (host != QStringLiteral("api.twitter.com")) { // they don't offer an API over HTTP
-            tag = host.toLocal8Bit();
-            tag.append("-no-https-url");
-            QTest::newRow(tag)
-                    << QStringLiteral("http://") + host
-                    << true
-                    << true
-                    << QByteArray();
-        }
-
-#ifndef QT_NO_OPENSSL
-        tag = host.toLocal8Bit();
-        tag.append("-enabled");
-        QTest::newRow(tag)
-                << QStringLiteral("https://") + host
-                << true
-                << true
-                << (host == QStringLiteral("www.dropbox.com")
-                    ? QByteArray(QSslConfiguration::NextProtocolHttp1_1)
-                    : QByteArray(QSslConfiguration::NextProtocolSpdy3_0));
-#endif // QT_NO_OPENSSL
-    }
-}
-
-void tst_qnetworkreply::spdy()
-{
-#if defined(QT_BUILD_INTERNAL) && !defined(QT_NO_SSL) && OPENSSL_VERSION_NUMBER >= 0x1000100fL && !defined(OPENSSL_NO_TLSEXT) && !defined(OPENSSL_NO_NEXTPROTONEG)
-
-    m_manager.clearAccessCache();
-
-    QFETCH(QString, host);
-    QUrl url(host);
-    QNetworkRequest request(url);
-
-    QFETCH(bool, setAttribute);
-    QFETCH(bool, enabled);
-    if (setAttribute) {
-        request.setAttribute(QNetworkRequest::SpdyAllowedAttribute, QVariant(enabled));
-    }
-
-    QNetworkReply *reply = m_manager.get(request);
-    QObject::connect(reply, SIGNAL(finished()), &QTestEventLoop::instance(), SLOT(exitLoop()));
-
-    QSignalSpy metaDataChangedSpy(reply, SIGNAL(metaDataChanged()));
-    QSignalSpy readyReadSpy(reply, SIGNAL(readyRead()));
-    QSignalSpy finishedSpy(reply, SIGNAL(finished()));
-    QSignalSpy finishedManagerSpy(&m_manager, SIGNAL(finished(QNetworkReply*)));
-
-    QTestEventLoop::instance().enterLoop(15);
-    QVERIFY(!QTestEventLoop::instance().timeout());
-
-    QFETCH(QByteArray, expectedProtocol);
-
-    bool expectedSpdyUsed = (expectedProtocol == QSslConfiguration::NextProtocolSpdy3_0);
-    QCOMPARE(reply->attribute(QNetworkRequest::SpdyWasUsedAttribute).toBool(), expectedSpdyUsed);
-
-    QCOMPARE(metaDataChangedSpy.count(), 1);
-    QCOMPARE(finishedSpy.count(), 1);
-    QCOMPARE(finishedManagerSpy.count(), 1);
-
-    QUrl redirectUrl = reply->header(QNetworkRequest::LocationHeader).toUrl();
-    QByteArray content = reply->readAll();
-
-    int statusCode = reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
-    QVERIFY(statusCode >= 200 && statusCode < 500);
-    if (statusCode == 200 || statusCode >= 400) {
-        QVERIFY(readyReadSpy.count() > 0);
-        QVERIFY(!content.isEmpty());
-    } else if (statusCode >= 300 && statusCode < 400) {
-        QVERIFY(!redirectUrl.isEmpty());
-    }
-
-    QSslConfiguration::NextProtocolNegotiationStatus expectedStatus =
-            expectedProtocol.isNull() ? QSslConfiguration::NextProtocolNegotiationNone
-            : QSslConfiguration::NextProtocolNegotiationNegotiated;
-    QCOMPARE(reply->sslConfiguration().nextProtocolNegotiationStatus(),
-             expectedStatus);
-
-    QCOMPARE(reply->sslConfiguration().nextNegotiatedProtocol(), expectedProtocol);
-#else
-    QSKIP("Qt built withouth OpenSSL, or the OpenSSL version is too old");
-#endif // defined(QT_BUILD_INTERNAL) && !defined(QT_NO_SSL) ...
-}
-
 void tst_qnetworkreply::spdyReplyFinished()
 {
     static int finishedCount = 0;
@@ -420,85 +297,6 @@ void tst_qnetworkreply::spdyReplyFinished()
         QTestEventLoop::instance().exitLoop();
 }
 
-void tst_qnetworkreply::spdyMultipleRequestsPerHost()
-{
-#if defined(QT_BUILD_INTERNAL) && !defined(QT_NO_SSL) && OPENSSL_VERSION_NUMBER >= 0x1000100fL && !defined(OPENSSL_NO_TLSEXT) && !defined(OPENSSL_NO_NEXTPROTONEG)
-
-    QList<QNetworkRequest> requests;
-    requests
-            << QNetworkRequest(QUrl("https://www.facebook.com"))
-            << QNetworkRequest(QUrl("https://www.facebook.com/images/fb_icon_325x325.png"))
-
-            << QNetworkRequest(QUrl("https://www.google.de"))
-            << QNetworkRequest(QUrl("https://www.google.de/preferences?hl=de"))
-            << QNetworkRequest(QUrl("https://www.google.de/intl/de/policies/?fg=1"))
-            << QNetworkRequest(QUrl("https://www.google.de/intl/de/about.html?fg=1"))
-            << QNetworkRequest(QUrl("https://www.google.de/services/?fg=1"))
-            << QNetworkRequest(QUrl("https://www.google.de/intl/de/ads/?fg=1"))
-
-            << QNetworkRequest(QUrl("https://i1.ytimg.com/li/tnHdj3df7iM/default.jpg"))
-            << QNetworkRequest(QUrl("https://i1.ytimg.com/li/7Dr1BKwqctY/default.jpg"))
-            << QNetworkRequest(QUrl("https://i1.ytimg.com/li/hfZhJdhTqX8/default.jpg"))
-            << QNetworkRequest(QUrl("https://i1.ytimg.com/vi/14Nprh8163I/hqdefault.jpg"))
-               ;
-    QList<QNetworkReply *> replies;
-    QList<QSignalSpy *> metaDataChangedSpies;
-    QList<QSignalSpy *> readyReadSpies;
-    QList<QSignalSpy *> finishedSpies;
-
-    QSignalSpy finishedManagerSpy(&m_manager, SIGNAL(finished(QNetworkReply*)));
-
-    foreach (QNetworkRequest request, requests) {
-        request.setAttribute(QNetworkRequest::SpdyAllowedAttribute, true);
-        QNetworkReply *reply = m_manager.get(request);
-        QObject::connect(reply, SIGNAL(finished()), this, SLOT(spdyReplyFinished()));
-        replies << reply;
-        QSignalSpy *metaDataChangedSpy = new QSignalSpy(reply, SIGNAL(metaDataChanged()));
-        metaDataChangedSpies << metaDataChangedSpy;
-        QSignalSpy *readyReadSpy = new QSignalSpy(reply, SIGNAL(readyRead()));
-        readyReadSpies << readyReadSpy;
-        QSignalSpy *finishedSpy = new QSignalSpy(reply, SIGNAL(finished()));
-        finishedSpies << finishedSpy;
-    }
-
-    QCOMPARE(requests.count(), replies.count());
-
-    QTestEventLoop::instance().enterLoop(15);
-    QVERIFY(!QTestEventLoop::instance().timeout());
-
-    QCOMPARE(finishedManagerSpy.count(), requests.count());
-
-    for (int a = 0; a < replies.count(); ++a) {
-
-        QCOMPARE(replies.at(a)->sslConfiguration().nextProtocolNegotiationStatus(),
-                 QSslConfiguration::NextProtocolNegotiationNegotiated);
-        QCOMPARE(replies.at(a)->sslConfiguration().nextNegotiatedProtocol(),
-                 QByteArray(QSslConfiguration::NextProtocolSpdy3_0));
-
-        QCOMPARE(replies.at(a)->error(), QNetworkReply::NoError);
-        QCOMPARE(replies.at(a)->attribute(QNetworkRequest::SpdyWasUsedAttribute).toBool(), true);
-        QCOMPARE(replies.at(a)->attribute(QNetworkRequest::ConnectionEncryptedAttribute).toBool(), true);
-        QCOMPARE(replies.at(a)->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt(), 200);
-
-        QByteArray content = replies.at(a)->readAll();
-        QVERIFY(content.count() > 0);
-
-        QCOMPARE(metaDataChangedSpies.at(a)->count(), 1);
-        metaDataChangedSpies.at(a)->deleteLater();
-
-        QCOMPARE(finishedSpies.at(a)->count(), 1);
-        finishedSpies.at(a)->deleteLater();
-
-        QVERIFY(readyReadSpies.at(a)->count() > 0);
-        readyReadSpies.at(a)->deleteLater();
-
-        replies.at(a)->deleteLater();
-    }
-#else
-    QSKIP("Qt built withouth OpenSSL, or the OpenSSL version is too old");
-#endif // defined(QT_BUILD_INTERNAL) && !defined(QT_NO_SSL) ...
-}
-
 void tst_qnetworkreply::proxyAuthentication_data()
 {
     QTest::addColumn<QUrl>("url");
@@ -587,7 +385,7 @@ void tst_qnetworkreply::npnWithEmptyList() // QTBUG-40714
 
     QUrl url(QStringLiteral("https://www.ossifrage.net/"));
     QNetworkRequest request(url);
-    request.setAttribute(QNetworkRequest::SpdyAllowedAttribute, QVariant(true));
+    request.setAttribute(QNetworkRequest::Http2AllowedAttribute, QVariant(true));
     QNetworkReply *reply = m_manager.get(request);
     QObject::connect(reply, SIGNAL(finished()), &QTestEventLoop::instance(), SLOT(exitLoop()));
 
diff --git a/tests/manual/qnetworkreply/qnetworkreply.pro b/tests/manual/qnetworkreply/qnetworkreply.pro
index eddcbdff1d..2457acd749 100644
--- a/tests/manual/qnetworkreply/qnetworkreply.pro
+++ b/tests/manual/qnetworkreply/qnetworkreply.pro
@@ -1,5 +1,5 @@
 TEMPLATE = app
-TARGET = tst_qnetworkreply
+TARGET = tst_manual_qnetworkreply
 
 QT -= gui
 QT += core-private network network-private testlib
diff --git a/tests/manual/qopenglcontext/CMakeLists.txt b/tests/manual/qopenglcontext/CMakeLists.txt
new file mode 100644
index 0000000000..9cec06ff1e
--- /dev/null
+++ b/tests/manual/qopenglcontext/CMakeLists.txt
@@ -0,0 +1,19 @@
+# Generated from qopenglcontext.pro.
+
+#####################################################################
+## qopenglcontext Binary:
+#####################################################################
+
+add_qt_manual_test(qopenglcontext
+    GUI
+    SOURCES
+        main.cpp
+        qopenglcontextwindow.cpp qopenglcontextwindow.h
+    PUBLIC_LIBRARIES
+        Qt::EglSupportPrivate
+        Qt::Gui
+        Qt::GuiPrivate
+)
+
+#### Keys ignored in scope 1:.:.:qopenglcontext.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/manual/qopengltextureblitter/.prev_CMakeLists.txt b/tests/manual/qopengltextureblitter/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..f56583c1e0
--- /dev/null
+++ b/tests/manual/qopengltextureblitter/.prev_CMakeLists.txt
@@ -0,0 +1,20 @@
+# Generated from qopengltextureblitter.pro.
+
+#####################################################################
+## qopengltextureblitter Binary:
+#####################################################################
+
+add_qt_manual_test(qopengltextureblitter
+    GUI
+    SOURCES
+        main.cpp
+        qopengltextureblitwindow.cpp qopengltextureblitwindow.h
+    INCLUDE_DIRECTORIES
+        .
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::GuiPrivate
+)
+
+#### Keys ignored in scope 1:.:.:qopengltextureblitter.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/manual/qopengltextureblitter/CMakeLists.txt b/tests/manual/qopengltextureblitter/CMakeLists.txt
new file mode 100644
index 0000000000..1fe33049fc
--- /dev/null
+++ b/tests/manual/qopengltextureblitter/CMakeLists.txt
@@ -0,0 +1,21 @@
+# Generated from qopengltextureblitter.pro.
+
+#####################################################################
+## qopengltextureblitter Binary:
+#####################################################################
+
+add_qt_manual_test(qopengltextureblitter
+    GUI
+    SOURCES
+        main.cpp
+        qopengltextureblitwindow.cpp qopengltextureblitwindow.h
+    INCLUDE_DIRECTORIES
+        .
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::GuiPrivate
+        Qt::OpenGL # special case
+)
+
+#### Keys ignored in scope 1:.:.:qopengltextureblitter.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/manual/qopengltextureblitter/qopengltextureblitwindow.cpp b/tests/manual/qopengltextureblitter/qopengltextureblitwindow.cpp
index f4e093a967..f8e033c927 100644
--- a/tests/manual/qopengltextureblitter/qopengltextureblitwindow.cpp
+++ b/tests/manual/qopengltextureblitter/qopengltextureblitwindow.cpp
@@ -29,7 +29,7 @@
 #include "qopengltextureblitwindow.h"
 
 #include <QtGui/QPainter>
-#include <QtGui/QOpenGLTexture>
+#include <QtOpenGL/QOpenGLTexture>
 #include <QtGui/QOpenGLFunctions>
 #include <QtGui/QMatrix4x4>
 
diff --git a/tests/manual/qopenglwidget/openglwidget/CMakeLists.txt b/tests/manual/qopenglwidget/openglwidget/CMakeLists.txt
new file mode 100644
index 0000000000..ffdb888040
--- /dev/null
+++ b/tests/manual/qopenglwidget/openglwidget/CMakeLists.txt
@@ -0,0 +1,21 @@
+# Generated from openglwidget.pro.
+
+#####################################################################
+## openglwidget Binary:
+#####################################################################
+
+add_qt_manual_test(openglwidget
+    GUI
+    SOURCES
+        main.cpp
+        openglwidget.cpp openglwidget.h
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::Gui
+        Qt::GuiPrivate
+        Qt::Widgets
+        Qt::WidgetsPrivate
+)
+
+#### Keys ignored in scope 1:.:.:openglwidget.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/manual/qopenglwindow/multiwindow/CMakeLists.txt b/tests/manual/qopenglwindow/multiwindow/CMakeLists.txt
new file mode 100644
index 0000000000..82acac6aff
--- /dev/null
+++ b/tests/manual/qopenglwindow/multiwindow/CMakeLists.txt
@@ -0,0 +1,16 @@
+# Generated from multiwindow.pro.
+
+#####################################################################
+## multiwindow Binary:
+#####################################################################
+
+add_qt_manual_test(multiwindow
+    GUI
+    SOURCES
+        main.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+)
+
+#### Keys ignored in scope 1:.:.:multiwindow.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/manual/qprintdevice_dump/CMakeLists.txt b/tests/manual/qprintdevice_dump/CMakeLists.txt
new file mode 100644
index 0000000000..f619024286
--- /dev/null
+++ b/tests/manual/qprintdevice_dump/CMakeLists.txt
@@ -0,0 +1,17 @@
+# Generated from qprintdevice_dump.pro.
+
+#####################################################################
+## qprintdevice_dump Binary:
+#####################################################################
+
+add_qt_manual_test(qprintdevice_dump
+    GUI
+    SOURCES
+        main.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::PrintSupportPrivate
+)
+
+#### Keys ignored in scope 1:.:.:qprintdevice_dump.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/manual/qscreen/CMakeLists.txt b/tests/manual/qscreen/CMakeLists.txt
new file mode 100644
index 0000000000..53b431c548
--- /dev/null
+++ b/tests/manual/qscreen/CMakeLists.txt
@@ -0,0 +1,18 @@
+# Generated from qscreen.pro.
+
+#####################################################################
+## qscreen Binary:
+#####################################################################
+
+add_qt_manual_test(qscreen
+    SOURCES
+        main.cpp
+        propertyfield.cpp propertyfield.h
+        propertywatcher.cpp propertywatcher.h
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+)
+
+#### Keys ignored in scope 1:.:.:qscreen.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/manual/qscreen/main.cpp b/tests/manual/qscreen/main.cpp
index 0728d66bf9..ab92216d22 100644
--- a/tests/manual/qscreen/main.cpp
+++ b/tests/manual/qscreen/main.cpp
@@ -192,15 +192,15 @@ static inline QString msgScreenChange(const QWidget *w, const QScreen *oldScreen
     if (!newScreen) {
         result = QLatin1String("Screen changed --> null");
     } else if (!oldScreen) {
-        QTextStream(&result) << "Screen changed null --> \""
-            << newScreen->name() << "\" at " << pos.x() << ',' << pos.y() << " geometry: "
-            << geometry.width() << 'x' << geometry.height() << forcesign << geometry.x()
-            << geometry.y() << '.';
+        QTextStream(&result) << "Screen changed null --> \"" << newScreen->name() << "\" at "
+                             << pos.x() << ',' << pos.y() << " geometry: " << geometry.width()
+                             << 'x' << geometry.height() << Qt::forcesign << geometry.x()
+                             << geometry.y() << '.';
     } else {
         QTextStream(&result) << "Screen changed \"" << oldScreen->name() << "\" --> \""
-            << newScreen->name() << "\" at " << pos.x() << ',' << pos.y() << " geometry: "
-            << geometry.width() << 'x' << geometry.height() << forcesign << geometry.x()
-            << geometry.y() << '.';
+                             << newScreen->name() << "\" at " << pos.x() << ',' << pos.y()
+                             << " geometry: " << geometry.width() << 'x' << geometry.height()
+                             << Qt::forcesign << geometry.x() << geometry.y() << '.';
     }
     return result;
 }
diff --git a/tests/manual/qssloptions/CMakeLists.txt b/tests/manual/qssloptions/CMakeLists.txt
new file mode 100644
index 0000000000..1fe53b9e50
--- /dev/null
+++ b/tests/manual/qssloptions/CMakeLists.txt
@@ -0,0 +1,13 @@
+# Generated from qssloptions.pro.
+
+#####################################################################
+## tst_qssloptions Binary:
+#####################################################################
+
+add_qt_manual_test(tst_qssloptions
+    SOURCES
+        main.cpp
+    PUBLIC_LIBRARIES
+        Qt::Network
+        Qt::Test
+)
diff --git a/tests/manual/qssloptions/main.cpp b/tests/manual/qssloptions/main.cpp
index 0f06071b41..cc65c57f33 100644
--- a/tests/manual/qssloptions/main.cpp
+++ b/tests/manual/qssloptions/main.cpp
@@ -37,13 +37,13 @@ int main(int argc, char **argv)
 
     if (argc < 3) {
         QTextStream out(stdout);
-        out << "Usage: " << argv[0] << " host port [options]" << endl;
-        out << "The options can be one or more of the following:" << endl;
-        out << "enable_empty_fragments" << endl;
-        out << "disable_session_tickets" << endl;
-        out << "disable_compression" << endl;
-        out << "disable_sni" << endl;
-        out << "enable_unsafe_reneg" << endl;
+        out << "Usage: " << argv[0] << " host port [options]" << Qt::endl;
+        out << "The options can be one or more of the following:" << Qt::endl;
+        out << "enable_empty_fragments" << Qt::endl;
+        out << "disable_session_tickets" << Qt::endl;
+        out << "disable_compression" << Qt::endl;
+        out << "disable_sni" << Qt::endl;
+        out << "enable_unsafe_reneg" << Qt::endl;
         return 1;
     }
 
diff --git a/tests/manual/qsslsocket/CMakeLists.txt b/tests/manual/qsslsocket/CMakeLists.txt
new file mode 100644
index 0000000000..bd7c9fc569
--- /dev/null
+++ b/tests/manual/qsslsocket/CMakeLists.txt
@@ -0,0 +1,12 @@
+# Generated from qsslsocket.pro.
+
+#####################################################################
+## tst_manual_qsslsocket Test:
+#####################################################################
+
+add_qt_test(tst_manual_qsslsocket
+    SOURCES
+        main.cpp
+    PUBLIC_LIBRARIES
+        Qt::Network
+)
diff --git a/tests/manual/qsslsocket/qsslsocket.pro b/tests/manual/qsslsocket/qsslsocket.pro
index c297d887ba..511d31898f 100644
--- a/tests/manual/qsslsocket/qsslsocket.pro
+++ b/tests/manual/qsslsocket/qsslsocket.pro
@@ -3,4 +3,4 @@ CONFIG += testcase
 SOURCES += main.cpp
 QT = core network testlib
 
-TARGET = tst_qsslsocket
+TARGET = tst_manual_qsslsocket
diff --git a/tests/manual/qstorageinfo/CMakeLists.txt b/tests/manual/qstorageinfo/CMakeLists.txt
new file mode 100644
index 0000000000..fab2da606b
--- /dev/null
+++ b/tests/manual/qstorageinfo/CMakeLists.txt
@@ -0,0 +1,10 @@
+# Generated from qstorageinfo.pro.
+
+#####################################################################
+## qstorageinfo Binary:
+#####################################################################
+
+add_qt_manual_test(qstorageinfo
+    SOURCES
+        main.cpp
+)
diff --git a/tests/manual/qsysinfo/CMakeLists.txt b/tests/manual/qsysinfo/CMakeLists.txt
new file mode 100644
index 0000000000..cd668a5bf2
--- /dev/null
+++ b/tests/manual/qsysinfo/CMakeLists.txt
@@ -0,0 +1,13 @@
+# Generated from qsysinfo.pro.
+
+#####################################################################
+## qsysinfo Binary:
+#####################################################################
+
+add_qt_manual_test(qsysinfo
+    SOURCES
+        main.cpp
+)
+
+#### Keys ignored in scope 1:.:.:qsysinfo.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/manual/qt_poll/CMakeLists.txt b/tests/manual/qt_poll/CMakeLists.txt
new file mode 100644
index 0000000000..0e19e6a4e3
--- /dev/null
+++ b/tests/manual/qt_poll/CMakeLists.txt
@@ -0,0 +1,16 @@
+# Generated from qt_poll.pro.
+
+#####################################################################
+## tst_qt_poll Test:
+#####################################################################
+
+add_qt_test(tst_qt_poll
+    SOURCES
+        ../../../src/corelib/kernel/qpoll.cpp
+        tst_qt_poll.cpp
+    INCLUDE_DIRECTORIES
+        ../../../src/corelib/kernel
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::Network
+)
diff --git a/tests/manual/qtabbar/CMakeLists.txt b/tests/manual/qtabbar/CMakeLists.txt
new file mode 100644
index 0000000000..a44b6a331a
--- /dev/null
+++ b/tests/manual/qtabbar/CMakeLists.txt
@@ -0,0 +1,20 @@
+# Generated from qtabbar.pro.
+
+#####################################################################
+## qtabbar Binary:
+#####################################################################
+
+add_qt_manual_test(qtabbar
+    GUI
+    SOURCES
+        main.cpp
+        tabbarform.cpp tabbarform.h tabbarform.ui
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+    ENABLE_AUTOGEN_TOOLS
+        uic
+)
+
+#### Keys ignored in scope 1:.:.:qtabbar.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/manual/qtabletevent/CMakeLists.txt b/tests/manual/qtabletevent/CMakeLists.txt
new file mode 100644
index 0000000000..422664e2a4
--- /dev/null
+++ b/tests/manual/qtabletevent/CMakeLists.txt
@@ -0,0 +1,5 @@
+# Generated from qtabletevent.pro.
+
+#add_subdirectory(device_information) # special case no member named 'staticQtMetaObject'
+add_subdirectory(event_compression)
+add_subdirectory(regular_widgets)
diff --git a/tests/manual/qtabletevent/device_information/CMakeLists.txt b/tests/manual/qtabletevent/device_information/CMakeLists.txt
new file mode 100644
index 0000000000..d0e12fac0a
--- /dev/null
+++ b/tests/manual/qtabletevent/device_information/CMakeLists.txt
@@ -0,0 +1,15 @@
+# Generated from device_information.pro.
+
+#####################################################################
+## device_information Binary:
+#####################################################################
+
+add_qt_manual_test(device_information
+    GUI
+    SOURCES
+        main.cpp
+        tabletwidget.cpp tabletwidget.h
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+)
diff --git a/tests/manual/qtabletevent/event_compression/CMakeLists.txt b/tests/manual/qtabletevent/event_compression/CMakeLists.txt
new file mode 100644
index 0000000000..b6cc8032e5
--- /dev/null
+++ b/tests/manual/qtabletevent/event_compression/CMakeLists.txt
@@ -0,0 +1,15 @@
+# Generated from event_compression.pro.
+
+#####################################################################
+## event_compression Binary:
+#####################################################################
+
+add_qt_manual_test(event_compression
+    SOURCES
+        main.cpp
+        mousestatwidget.cpp mousestatwidget.h
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Test
+        Qt::Widgets
+)
diff --git a/tests/manual/qtabletevent/regular_widgets/CMakeLists.txt b/tests/manual/qtabletevent/regular_widgets/CMakeLists.txt
new file mode 100644
index 0000000000..7937aa5d90
--- /dev/null
+++ b/tests/manual/qtabletevent/regular_widgets/CMakeLists.txt
@@ -0,0 +1,17 @@
+# Generated from regular_widgets.pro.
+
+#####################################################################
+## regular_widgets Binary:
+#####################################################################
+
+add_qt_manual_test(regular_widgets
+    GUI
+    SOURCES
+        main.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+)
+
+#### Keys ignored in scope 1:.:.:regular_widgets.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/manual/qtbug-52641/CMakeLists.txt b/tests/manual/qtbug-52641/CMakeLists.txt
new file mode 100644
index 0000000000..7f96b66eaa
--- /dev/null
+++ b/tests/manual/qtbug-52641/CMakeLists.txt
@@ -0,0 +1,17 @@
+# Generated from qtbug-52641.pro.
+
+#####################################################################
+## qtbug-52641 Binary:
+#####################################################################
+
+add_qt_manual_test(qtbug-52641
+    GUI
+    SOURCES
+        main.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+)
+
+#### Keys ignored in scope 1:.:.:qtbug-52641.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/manual/qtbug-8933/CMakeLists.txt b/tests/manual/qtbug-8933/CMakeLists.txt
new file mode 100644
index 0000000000..a5de7687cb
--- /dev/null
+++ b/tests/manual/qtbug-8933/CMakeLists.txt
@@ -0,0 +1,20 @@
+# Generated from qtbug-8933.pro.
+
+#####################################################################
+## qtbug-8933 Binary:
+#####################################################################
+
+add_qt_manual_test(qtbug-8933
+    GUI
+    SOURCES
+        main.cpp
+        widget.cpp widget.h widget.ui
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+    ENABLE_AUTOGEN_TOOLS
+        uic
+)
+
+#### Keys ignored in scope 1:.:.:qtbug-8933.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/manual/qtexteditlist/CMakeLists.txt b/tests/manual/qtexteditlist/CMakeLists.txt
new file mode 100644
index 0000000000..963ffa5441
--- /dev/null
+++ b/tests/manual/qtexteditlist/CMakeLists.txt
@@ -0,0 +1,20 @@
+# Generated from qtexteditlist.pro.
+
+#####################################################################
+## qtexteditlist Binary:
+#####################################################################
+
+add_qt_manual_test(qtexteditlist
+    GUI
+    SOURCES
+        main.cpp
+        widget.cpp widget.h widget.ui
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+    ENABLE_AUTOGEN_TOOLS
+        uic
+)
+
+#### Keys ignored in scope 1:.:.:qtexteditlist.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/manual/qtexteditlist/qtexteditlist.pro b/tests/manual/qtexteditlist/qtexteditlist.pro
index 953333f3ee..972e054445 100644
--- a/tests/manual/qtexteditlist/qtexteditlist.pro
+++ b/tests/manual/qtexteditlist/qtexteditlist.pro
@@ -1,6 +1,6 @@
 #This project can be used to verify QTBUG-5111 case.
 QT       += core gui
-greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
+QT += widgets
 TARGET = qtexteditlist
 TEMPLATE = app
 SOURCES  += main.cpp widget.cpp
diff --git a/tests/manual/qtexttableborders/CMakeLists.txt b/tests/manual/qtexttableborders/CMakeLists.txt
new file mode 100644
index 0000000000..c273b3aeb2
--- /dev/null
+++ b/tests/manual/qtexttableborders/CMakeLists.txt
@@ -0,0 +1,35 @@
+# Generated from qtexttableborders.pro.
+
+#####################################################################
+## qtexttableborders Binary:
+#####################################################################
+
+add_qt_manual_test(qtexttableborders
+    GUI
+    SOURCES
+        main.cpp
+        widget.cpp widget.h widget.ui
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::PrintSupport
+        Qt::Widgets
+    ENABLE_AUTOGEN_TOOLS
+        uic
+)
+
+# Resources:
+set(resources_resource_files
+    "table-border-test-header.html"
+    "table-border-test.html"
+)
+
+add_qt_resource(qtexttableborders "resources"
+    PREFIX
+        "/"
+    FILES
+        ${resources_resource_files}
+)
+
+
+#### Keys ignored in scope 1:.:.:qtexttableborders.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/manual/qtexttableborders/qtexttableborders.pro b/tests/manual/qtexttableborders/qtexttableborders.pro
index 7e454f978d..3805ac6ed0 100644
--- a/tests/manual/qtexttableborders/qtexttableborders.pro
+++ b/tests/manual/qtexttableborders/qtexttableborders.pro
@@ -1,7 +1,6 @@
 #This project can be used to verify QTBUG-36152 case.
-QT       += core gui printsupport
+QT       += core gui printsupport widgets
 CONFIG   += c++11
-greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
 TARGET = qtexttableborders
 TEMPLATE = app
 SOURCES  += main.cpp widget.cpp
diff --git a/tests/manual/qtouchevent/CMakeLists.txt b/tests/manual/qtouchevent/CMakeLists.txt
new file mode 100644
index 0000000000..8cee742ca1
--- /dev/null
+++ b/tests/manual/qtouchevent/CMakeLists.txt
@@ -0,0 +1,18 @@
+# Generated from qtouchevent.pro.
+
+#####################################################################
+## qtouchevent Binary:
+#####################################################################
+
+add_qt_manual_test(qtouchevent
+    SOURCES
+        form.ui
+        main.cpp
+        touchwidget.cpp touchwidget.h
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Test
+        Qt::Widgets
+    ENABLE_AUTOGEN_TOOLS
+        uic
+)
diff --git a/tests/manual/qtouchevent/qtouchevent.pro b/tests/manual/qtouchevent/qtouchevent.pro
index 81384eaf24..4ba921d301 100644
--- a/tests/manual/qtouchevent/qtouchevent.pro
+++ b/tests/manual/qtouchevent/qtouchevent.pro
@@ -1,5 +1,4 @@
-QT += testlib
-greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
+QT += testlib widgets
 SOURCES = main.cpp \
     touchwidget.cpp
 FORMS += form.ui
diff --git a/tests/manual/qvulkaninstance/CMakeLists.txt b/tests/manual/qvulkaninstance/CMakeLists.txt
new file mode 100644
index 0000000000..2071010da1
--- /dev/null
+++ b/tests/manual/qvulkaninstance/CMakeLists.txt
@@ -0,0 +1,17 @@
+# Generated from qvulkaninstance.pro.
+
+#####################################################################
+## qvulkaninstance Binary:
+#####################################################################
+
+add_qt_manual_test(qvulkaninstance
+    GUI
+    SOURCES
+        main.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::GuiPrivate
+)
+
+#### Keys ignored in scope 1:.:.:qvulkaninstance.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/manual/qwidget_zorder/CMakeLists.txt b/tests/manual/qwidget_zorder/CMakeLists.txt
new file mode 100644
index 0000000000..2ae52decac
--- /dev/null
+++ b/tests/manual/qwidget_zorder/CMakeLists.txt
@@ -0,0 +1,14 @@
+# Generated from qwidget_zorder.pro.
+
+#####################################################################
+## qwidget_zorder Binary:
+#####################################################################
+
+add_qt_manual_test(qwidget_zorder
+    GUI
+    SOURCES
+        main.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+)
diff --git a/tests/manual/repaint/CMakeLists.txt b/tests/manual/repaint/CMakeLists.txt
new file mode 100644
index 0000000000..fd579a76a2
--- /dev/null
+++ b/tests/manual/repaint/CMakeLists.txt
@@ -0,0 +1,9 @@
+# Generated from repaint.pro.
+
+add_subdirectory(mainwindow)
+add_subdirectory(scrollarea)
+add_subdirectory(splitter)
+add_subdirectory(tableview)
+add_subdirectory(task141091)
+add_subdirectory(toplevel)
+add_subdirectory(widget)
diff --git a/tests/manual/repaint/mainwindow/CMakeLists.txt b/tests/manual/repaint/mainwindow/CMakeLists.txt
new file mode 100644
index 0000000000..f71b5ddf6c
--- /dev/null
+++ b/tests/manual/repaint/mainwindow/CMakeLists.txt
@@ -0,0 +1,15 @@
+# Generated from mainwindow.pro.
+
+#####################################################################
+## tst_manual_mainwindow Binary:
+#####################################################################
+
+add_qt_manual_test(tst_manual_mainwindow
+    GUI
+    SOURCES
+        ../shared/shared.h
+        main.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+)
diff --git a/tests/manual/repaint/mainwindow/mainwindow.pro b/tests/manual/repaint/mainwindow/mainwindow.pro
index f20e5fe402..419436032c 100644
--- a/tests/manual/repaint/mainwindow/mainwindow.pro
+++ b/tests/manual/repaint/mainwindow/mainwindow.pro
@@ -1,3 +1,4 @@
+TARGET = tst_manual_mainwindow
 QT += widgets
 HEADERS += ../shared/shared.h
 SOURCES += main.cpp
diff --git a/tests/manual/repaint/scrollarea/CMakeLists.txt b/tests/manual/repaint/scrollarea/CMakeLists.txt
new file mode 100644
index 0000000000..9d2d52fd65
--- /dev/null
+++ b/tests/manual/repaint/scrollarea/CMakeLists.txt
@@ -0,0 +1,15 @@
+# Generated from scrollarea.pro.
+
+#####################################################################
+## tst_manual_scrollarea Binary:
+#####################################################################
+
+add_qt_manual_test(tst_manual_scrollarea
+    GUI
+    SOURCES
+        ../shared/shared.h
+        main.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+)
diff --git a/tests/manual/repaint/scrollarea/scrollarea.pro b/tests/manual/repaint/scrollarea/scrollarea.pro
index f20e5fe402..deff158cce 100644
--- a/tests/manual/repaint/scrollarea/scrollarea.pro
+++ b/tests/manual/repaint/scrollarea/scrollarea.pro
@@ -1,3 +1,4 @@
 QT += widgets
+TARGET = tst_manual_scrollarea
 HEADERS += ../shared/shared.h
 SOURCES += main.cpp
diff --git a/tests/manual/repaint/splitter/CMakeLists.txt b/tests/manual/repaint/splitter/CMakeLists.txt
new file mode 100644
index 0000000000..cb1d7aab0b
--- /dev/null
+++ b/tests/manual/repaint/splitter/CMakeLists.txt
@@ -0,0 +1,15 @@
+# Generated from splitter.pro.
+
+#####################################################################
+## splitter Binary:
+#####################################################################
+
+add_qt_manual_test(splitter
+    GUI
+    SOURCES
+        ../shared/shared.h
+        main.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+)
diff --git a/tests/manual/repaint/tableview/CMakeLists.txt b/tests/manual/repaint/tableview/CMakeLists.txt
new file mode 100644
index 0000000000..5c9634db88
--- /dev/null
+++ b/tests/manual/repaint/tableview/CMakeLists.txt
@@ -0,0 +1,15 @@
+# Generated from tableview.pro.
+
+#####################################################################
+## tableview Binary:
+#####################################################################
+
+add_qt_manual_test(tableview
+    GUI
+    SOURCES
+        ../shared/shared.h
+        main.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+)
diff --git a/tests/manual/repaint/task141091/CMakeLists.txt b/tests/manual/repaint/task141091/CMakeLists.txt
new file mode 100644
index 0000000000..3a74ef58de
--- /dev/null
+++ b/tests/manual/repaint/task141091/CMakeLists.txt
@@ -0,0 +1,13 @@
+# Generated from task141091.pro.
+
+#####################################################################
+## task141091 Binary:
+#####################################################################
+
+add_qt_manual_test(task141091
+    SOURCES
+        main.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+)
diff --git a/tests/manual/repaint/toplevel/CMakeLists.txt b/tests/manual/repaint/toplevel/CMakeLists.txt
new file mode 100644
index 0000000000..6b5a3c83a9
--- /dev/null
+++ b/tests/manual/repaint/toplevel/CMakeLists.txt
@@ -0,0 +1,14 @@
+# Generated from toplevel.pro.
+
+#####################################################################
+## tst_manual_toplevel Binary:
+#####################################################################
+
+add_qt_manual_test(tst_manual_toplevel
+    SOURCES
+        ../shared/shared.h
+        main.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+)
diff --git a/tests/manual/repaint/toplevel/toplevel.pro b/tests/manual/repaint/toplevel/toplevel.pro
index a881c24f56..d142fd19bb 100644
--- a/tests/manual/repaint/toplevel/toplevel.pro
+++ b/tests/manual/repaint/toplevel/toplevel.pro
@@ -1,5 +1,6 @@
 CONFIG += console
 QT += widgets
 
+TARGET = tst_manual_toplevel
 HEADERS += ../shared/shared.h
 SOURCES += main.cpp
diff --git a/tests/manual/repaint/widget/CMakeLists.txt b/tests/manual/repaint/widget/CMakeLists.txt
new file mode 100644
index 0000000000..f58c49c9fb
--- /dev/null
+++ b/tests/manual/repaint/widget/CMakeLists.txt
@@ -0,0 +1,15 @@
+# Generated from widget.pro.
+
+#####################################################################
+## widget Binary:
+#####################################################################
+
+add_qt_manual_test(widget
+    GUI
+    SOURCES
+        ../shared/shared.h
+        main.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+)
diff --git a/tests/manual/rhi/CMakeLists.txt b/tests/manual/rhi/CMakeLists.txt
new file mode 100644
index 0000000000..621a307304
--- /dev/null
+++ b/tests/manual/rhi/CMakeLists.txt
@@ -0,0 +1,23 @@
+# Generated from rhi.pro.
+
+add_subdirectory(hellominimalcrossgfxtriangle)
+add_subdirectory(compressedtexture_bc1)
+add_subdirectory(compressedtexture_bc1_subupload)
+add_subdirectory(texuploads)
+add_subdirectory(msaatexture)
+add_subdirectory(msaarenderbuffer)
+add_subdirectory(cubemap)
+add_subdirectory(cubemap_scissor)
+add_subdirectory(multiwindow)
+add_subdirectory(multiwindow_threaded)
+add_subdirectory(triquadcube)
+add_subdirectory(offscreen)
+add_subdirectory(floattexture)
+add_subdirectory(mrt)
+add_subdirectory(shadowmap)
+add_subdirectory(computebuffer)
+add_subdirectory(computeimage)
+add_subdirectory(instancing)
+if(QT_FEATURE_widgets)
+    add_subdirectory(qrhiprof)
+endif()
diff --git a/tests/manual/rhi/compressedtexture_bc1/CMakeLists.txt b/tests/manual/rhi/compressedtexture_bc1/CMakeLists.txt
new file mode 100644
index 0000000000..5da0ad2932
--- /dev/null
+++ b/tests/manual/rhi/compressedtexture_bc1/CMakeLists.txt
@@ -0,0 +1,41 @@
+# Generated from compressedtexture_bc1.pro.
+
+#####################################################################
+## compressedtexture_bc1 Binary:
+#####################################################################
+
+add_qt_manual_test(compressedtexture_bc1
+    GUI
+    SOURCES
+        compressedtexture_bc1.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::GuiPrivate
+)
+
+# Resources:
+set_source_files_properties("../shared/qt256_bc1_9mips.dds"
+    PROPERTIES QT_RESOURCE_ALIAS "qt256_bc1_9mips.dds"
+)
+set_source_files_properties("../shared/texture.frag.qsb"
+    PROPERTIES QT_RESOURCE_ALIAS "texture.frag.qsb"
+)
+set_source_files_properties("../shared/texture.vert.qsb"
+    PROPERTIES QT_RESOURCE_ALIAS "texture.vert.qsb"
+)
+set(compressedtexture_bc1_resource_files
+    "../shared/qt256_bc1_9mips.dds"
+    "../shared/texture.frag.qsb"
+    "../shared/texture.vert.qsb"
+)
+
+add_qt_resource(compressedtexture_bc1 "compressedtexture_bc1"
+    PREFIX
+        "/"
+    FILES
+        ${compressedtexture_bc1_resource_files}
+)
+
+
+#### Keys ignored in scope 1:.:.:compressedtexture_bc1.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/manual/rhi/compressedtexture_bc1_subupload/CMakeLists.txt b/tests/manual/rhi/compressedtexture_bc1_subupload/CMakeLists.txt
new file mode 100644
index 0000000000..bd82a5cb0d
--- /dev/null
+++ b/tests/manual/rhi/compressedtexture_bc1_subupload/CMakeLists.txt
@@ -0,0 +1,45 @@
+# Generated from compressedtexture_bc1_subupload.pro.
+
+#####################################################################
+## compressedtexture_bc1_subupload Binary:
+#####################################################################
+
+add_qt_manual_test(compressedtexture_bc1_subupload
+    GUI
+    SOURCES
+        compressedtexture_bc1_subupload.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::GuiPrivate
+)
+
+# Resources:
+set_source_files_properties("../shared/bwqt224_64_nomips.dds"
+    PROPERTIES QT_RESOURCE_ALIAS "bwqt224_64_nomips.dds"
+)
+set_source_files_properties("../shared/qt256_bc1_9mips.dds"
+    PROPERTIES QT_RESOURCE_ALIAS "qt256_bc1_9mips.dds"
+)
+set_source_files_properties("../shared/texture.frag.qsb"
+    PROPERTIES QT_RESOURCE_ALIAS "texture.frag.qsb"
+)
+set_source_files_properties("../shared/texture.vert.qsb"
+    PROPERTIES QT_RESOURCE_ALIAS "texture.vert.qsb"
+)
+set(compressedtexture_bc1_subupload_resource_files
+    "../shared/bwqt224_64_nomips.dds"
+    "../shared/qt256_bc1_9mips.dds"
+    "../shared/texture.frag.qsb"
+    "../shared/texture.vert.qsb"
+)
+
+add_qt_resource(compressedtexture_bc1_subupload "compressedtexture_bc1_subupload"
+    PREFIX
+        "/"
+    FILES
+        ${compressedtexture_bc1_subupload_resource_files}
+)
+
+
+#### Keys ignored in scope 1:.:.:compressedtexture_bc1_subupload.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/manual/rhi/computebuffer/CMakeLists.txt b/tests/manual/rhi/computebuffer/CMakeLists.txt
new file mode 100644
index 0000000000..e2a959c1e4
--- /dev/null
+++ b/tests/manual/rhi/computebuffer/CMakeLists.txt
@@ -0,0 +1,32 @@
+# Generated from computebuffer.pro.
+
+#####################################################################
+## computebuffer Binary:
+#####################################################################
+
+add_qt_manual_test(computebuffer
+    GUI
+    SOURCES
+        computebuffer.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::GuiPrivate
+)
+
+# Resources:
+set(computebuffer_resource_files
+    "buffer.comp.qsb"
+    "main.frag.qsb"
+    "main.vert.qsb"
+)
+
+add_qt_resource(computebuffer "computebuffer"
+    PREFIX
+        "/"
+    FILES
+        ${computebuffer_resource_files}
+)
+
+
+#### Keys ignored in scope 1:.:.:computebuffer.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/manual/rhi/computeimage/CMakeLists.txt b/tests/manual/rhi/computeimage/CMakeLists.txt
new file mode 100644
index 0000000000..a634f1cf98
--- /dev/null
+++ b/tests/manual/rhi/computeimage/CMakeLists.txt
@@ -0,0 +1,42 @@
+# Generated from computeimage.pro.
+
+#####################################################################
+## computeimage Binary:
+#####################################################################
+
+add_qt_manual_test(computeimage
+    GUI
+    SOURCES
+        computeimage.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::GuiPrivate
+)
+
+# Resources:
+set_source_files_properties("../shared/qt256.png"
+    PROPERTIES QT_RESOURCE_ALIAS "qt256.png"
+)
+set_source_files_properties("../shared/texture.frag.qsb"
+    PROPERTIES QT_RESOURCE_ALIAS "texture.frag.qsb"
+)
+set_source_files_properties("../shared/texture.vert.qsb"
+    PROPERTIES QT_RESOURCE_ALIAS "texture.vert.qsb"
+)
+set(computeimage_resource_files
+    "../shared/qt256.png"
+    "../shared/texture.frag.qsb"
+    "../shared/texture.vert.qsb"
+    "image.comp.qsb"
+)
+
+add_qt_resource(computeimage "computeimage"
+    PREFIX
+        "/"
+    FILES
+        ${computeimage_resource_files}
+)
+
+
+#### Keys ignored in scope 1:.:.:computeimage.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/manual/rhi/cubemap/CMakeLists.txt b/tests/manual/rhi/cubemap/CMakeLists.txt
new file mode 100644
index 0000000000..323ad78170
--- /dev/null
+++ b/tests/manual/rhi/cubemap/CMakeLists.txt
@@ -0,0 +1,32 @@
+# Generated from cubemap.pro.
+
+#####################################################################
+## cubemap Binary:
+#####################################################################
+
+add_qt_manual_test(cubemap
+    GUI
+    SOURCES
+        cubemap.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::GuiPrivate
+)
+
+# Resources:
+set(cubemap_resource_files
+    "c.png"
+    "cubemap.frag.qsb"
+    "cubemap.vert.qsb"
+)
+
+add_qt_resource(cubemap "cubemap"
+    PREFIX
+        "/"
+    FILES
+        ${cubemap_resource_files}
+)
+
+
+#### Keys ignored in scope 1:.:.:cubemap.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/manual/rhi/cubemap_scissor/CMakeLists.txt b/tests/manual/rhi/cubemap_scissor/CMakeLists.txt
new file mode 100644
index 0000000000..519d9dc6ec
--- /dev/null
+++ b/tests/manual/rhi/cubemap_scissor/CMakeLists.txt
@@ -0,0 +1,41 @@
+# Generated from cubemap_scissor.pro.
+
+#####################################################################
+## cubemap_scissor Binary:
+#####################################################################
+
+add_qt_manual_test(cubemap_scissor
+    GUI
+    SOURCES
+        cubemap_scissor.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::GuiPrivate
+)
+
+# Resources:
+set_source_files_properties("../cubemap/c.png"
+    PROPERTIES QT_RESOURCE_ALIAS "c.png"
+)
+set_source_files_properties("../cubemap/cubemap.frag.qsb"
+    PROPERTIES QT_RESOURCE_ALIAS "cubemap.frag.qsb"
+)
+set_source_files_properties("../cubemap/cubemap.vert.qsb"
+    PROPERTIES QT_RESOURCE_ALIAS "cubemap.vert.qsb"
+)
+set(cubemap_scissor_resource_files
+    "../cubemap/c.png"
+    "../cubemap/cubemap.frag.qsb"
+    "../cubemap/cubemap.vert.qsb"
+)
+
+add_qt_resource(cubemap_scissor "cubemap_scissor"
+    PREFIX
+        "/"
+    FILES
+        ${cubemap_scissor_resource_files}
+)
+
+
+#### Keys ignored in scope 1:.:.:cubemap_scissor.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/manual/rhi/floattexture/CMakeLists.txt b/tests/manual/rhi/floattexture/CMakeLists.txt
new file mode 100644
index 0000000000..3368812524
--- /dev/null
+++ b/tests/manual/rhi/floattexture/CMakeLists.txt
@@ -0,0 +1,41 @@
+# Generated from floattexture.pro.
+
+#####################################################################
+## floattexture Binary:
+#####################################################################
+
+add_qt_manual_test(floattexture
+    GUI
+    SOURCES
+        floattexture.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::GuiPrivate
+)
+
+# Resources:
+set_source_files_properties("../shared/OpenfootageNET_fieldairport-512.hdr"
+    PROPERTIES QT_RESOURCE_ALIAS "OpenfootageNET_fieldairport-512.hdr"
+)
+set_source_files_properties("../shared/texture.frag.qsb"
+    PROPERTIES QT_RESOURCE_ALIAS "texture.frag.qsb"
+)
+set_source_files_properties("../shared/texture.vert.qsb"
+    PROPERTIES QT_RESOURCE_ALIAS "texture.vert.qsb"
+)
+set(floattexture_resource_files
+    "../shared/OpenfootageNET_fieldairport-512.hdr"
+    "../shared/texture.frag.qsb"
+    "../shared/texture.vert.qsb"
+)
+
+add_qt_resource(floattexture "floattexture"
+    PREFIX
+        "/"
+    FILES
+        ${floattexture_resource_files}
+)
+
+
+#### Keys ignored in scope 1:.:.:floattexture.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/manual/rhi/hellominimalcrossgfxtriangle/CMakeLists.txt b/tests/manual/rhi/hellominimalcrossgfxtriangle/CMakeLists.txt
new file mode 100644
index 0000000000..8b9d3389f8
--- /dev/null
+++ b/tests/manual/rhi/hellominimalcrossgfxtriangle/CMakeLists.txt
@@ -0,0 +1,38 @@
+# Generated from hellominimalcrossgfxtriangle.pro.
+
+#####################################################################
+## hellominimalcrossgfxtriangle Binary:
+#####################################################################
+
+add_qt_manual_test(hellominimalcrossgfxtriangle
+    SOURCES
+        hellowindow.cpp hellowindow.h
+        main.cpp
+        window.cpp window.h
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::GuiPrivate
+)
+
+# Resources:
+set_source_files_properties("../shared/color.frag.qsb"
+    PROPERTIES QT_RESOURCE_ALIAS "color.frag.qsb"
+)
+set_source_files_properties("../shared/color.vert.qsb"
+    PROPERTIES QT_RESOURCE_ALIAS "color.vert.qsb"
+)
+set(hellominimalcrossgfxtriangle_resource_files
+    "../shared/color.frag.qsb"
+    "../shared/color.vert.qsb"
+)
+
+add_qt_resource(hellominimalcrossgfxtriangle "hellominimalcrossgfxtriangle"
+    PREFIX
+        "/"
+    FILES
+        ${hellominimalcrossgfxtriangle_resource_files}
+)
+
+
+#### Keys ignored in scope 1:.:.:hellominimalcrossgfxtriangle.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/manual/rhi/instancing/CMakeLists.txt b/tests/manual/rhi/instancing/CMakeLists.txt
new file mode 100644
index 0000000000..8c8d0c2a9a
--- /dev/null
+++ b/tests/manual/rhi/instancing/CMakeLists.txt
@@ -0,0 +1,31 @@
+# Generated from instancing.pro.
+
+#####################################################################
+## instancing Binary:
+#####################################################################
+
+add_qt_manual_test(instancing
+    GUI
+    SOURCES
+        instancing.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::GuiPrivate
+)
+
+# Resources:
+set(instancing_resource_files
+    "inst.frag.qsb"
+    "inst.vert.qsb"
+)
+
+add_qt_resource(instancing "instancing"
+    PREFIX
+        "/"
+    FILES
+        ${instancing_resource_files}
+)
+
+
+#### Keys ignored in scope 1:.:.:instancing.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/manual/rhi/mrt/CMakeLists.txt b/tests/manual/rhi/mrt/CMakeLists.txt
new file mode 100644
index 0000000000..db63ebe07d
--- /dev/null
+++ b/tests/manual/rhi/mrt/CMakeLists.txt
@@ -0,0 +1,39 @@
+# Generated from mrt.pro.
+
+#####################################################################
+## mrt Binary:
+#####################################################################
+
+add_qt_manual_test(mrt
+    GUI
+    SOURCES
+        mrt.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::GuiPrivate
+)
+
+# Resources:
+set_source_files_properties("../shared/texture.frag.qsb"
+    PROPERTIES QT_RESOURCE_ALIAS "texture.frag.qsb"
+)
+set_source_files_properties("../shared/texture.vert.qsb"
+    PROPERTIES QT_RESOURCE_ALIAS "texture.vert.qsb"
+)
+set(mrt_resource_files
+    "../shared/texture.frag.qsb"
+    "../shared/texture.vert.qsb"
+    "mrt.frag.qsb"
+    "mrt.vert.qsb"
+)
+
+add_qt_resource(mrt "mrt"
+    PREFIX
+        "/"
+    FILES
+        ${mrt_resource_files}
+)
+
+
+#### Keys ignored in scope 1:.:.:mrt.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/manual/rhi/msaarenderbuffer/CMakeLists.txt b/tests/manual/rhi/msaarenderbuffer/CMakeLists.txt
new file mode 100644
index 0000000000..26aa8798de
--- /dev/null
+++ b/tests/manual/rhi/msaarenderbuffer/CMakeLists.txt
@@ -0,0 +1,45 @@
+# Generated from msaarenderbuffer.pro.
+
+#####################################################################
+## msaarenderbuffer Binary:
+#####################################################################
+
+add_qt_manual_test(msaarenderbuffer
+    GUI
+    SOURCES
+        msaarenderbuffer.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::GuiPrivate
+)
+
+# Resources:
+set_source_files_properties("../shared/color.frag.qsb"
+    PROPERTIES QT_RESOURCE_ALIAS "color.frag.qsb"
+)
+set_source_files_properties("../shared/color.vert.qsb"
+    PROPERTIES QT_RESOURCE_ALIAS "color.vert.qsb"
+)
+set_source_files_properties("../shared/texture.frag.qsb"
+    PROPERTIES QT_RESOURCE_ALIAS "texture.frag.qsb"
+)
+set_source_files_properties("../shared/texture.vert.qsb"
+    PROPERTIES QT_RESOURCE_ALIAS "texture.vert.qsb"
+)
+set(msaarenderbuffer_resource_files
+    "../shared/color.frag.qsb"
+    "../shared/color.vert.qsb"
+    "../shared/texture.frag.qsb"
+    "../shared/texture.vert.qsb"
+)
+
+add_qt_resource(msaarenderbuffer "msaarenderbuffer"
+    PREFIX
+        "/"
+    FILES
+        ${msaarenderbuffer_resource_files}
+)
+
+
+#### Keys ignored in scope 1:.:.:msaarenderbuffer.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/manual/rhi/msaatexture/CMakeLists.txt b/tests/manual/rhi/msaatexture/CMakeLists.txt
new file mode 100644
index 0000000000..5a3c447db4
--- /dev/null
+++ b/tests/manual/rhi/msaatexture/CMakeLists.txt
@@ -0,0 +1,49 @@
+# Generated from msaatexture.pro.
+
+#####################################################################
+## msaatexture Binary:
+#####################################################################
+
+add_qt_manual_test(msaatexture
+    GUI
+    SOURCES
+        msaatexture.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::GuiPrivate
+)
+
+# Resources:
+set_source_files_properties("../shared/color.frag.qsb"
+    PROPERTIES QT_RESOURCE_ALIAS "color.frag.qsb"
+)
+set_source_files_properties("../shared/color.vert.qsb"
+    PROPERTIES QT_RESOURCE_ALIAS "color.vert.qsb"
+)
+set_source_files_properties("../shared/texture.frag.qsb"
+    PROPERTIES QT_RESOURCE_ALIAS "texture.frag.qsb"
+)
+set_source_files_properties("../shared/texture.vert.qsb"
+    PROPERTIES QT_RESOURCE_ALIAS "texture.vert.qsb"
+)
+set_source_files_properties("../shared/texture_ms4.frag.qsb"
+    PROPERTIES QT_RESOURCE_ALIAS "texture_ms4.frag.qsb"
+)
+set(msaatexture_resource_files
+    "../shared/color.frag.qsb"
+    "../shared/color.vert.qsb"
+    "../shared/texture.frag.qsb"
+    "../shared/texture.vert.qsb"
+    "../shared/texture_ms4.frag.qsb"
+)
+
+add_qt_resource(msaatexture "msaatexture"
+    PREFIX
+        "/"
+    FILES
+        ${msaatexture_resource_files}
+)
+
+
+#### Keys ignored in scope 1:.:.:msaatexture.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/manual/rhi/multiwindow/CMakeLists.txt b/tests/manual/rhi/multiwindow/CMakeLists.txt
new file mode 100644
index 0000000000..a3e63b9d06
--- /dev/null
+++ b/tests/manual/rhi/multiwindow/CMakeLists.txt
@@ -0,0 +1,38 @@
+# Generated from multiwindow.pro.
+
+#####################################################################
+## multiwindow Binary:
+#####################################################################
+
+add_qt_manual_test(multiwindow
+    GUI
+    SOURCES
+        multiwindow.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::GuiPrivate
+        Qt::Widgets
+)
+
+# Resources:
+set_source_files_properties("../shared/color.frag.qsb"
+    PROPERTIES QT_RESOURCE_ALIAS "color.frag.qsb"
+)
+set_source_files_properties("../shared/color.vert.qsb"
+    PROPERTIES QT_RESOURCE_ALIAS "color.vert.qsb"
+)
+set(multiwindow_resource_files
+    "../shared/color.frag.qsb"
+    "../shared/color.vert.qsb"
+)
+
+add_qt_resource(multiwindow "multiwindow"
+    PREFIX
+        "/"
+    FILES
+        ${multiwindow_resource_files}
+)
+
+
+#### Keys ignored in scope 1:.:.:multiwindow.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/manual/rhi/multiwindow_threaded/CMakeLists.txt b/tests/manual/rhi/multiwindow_threaded/CMakeLists.txt
new file mode 100644
index 0000000000..f3f220dba6
--- /dev/null
+++ b/tests/manual/rhi/multiwindow_threaded/CMakeLists.txt
@@ -0,0 +1,43 @@
+# Generated from multiwindow_threaded.pro.
+
+#####################################################################
+## multiwindow_threaded Binary:
+#####################################################################
+
+add_qt_manual_test(multiwindow_threaded
+    GUI
+    SOURCES
+        multiwindow_threaded.cpp
+        window.cpp window.h
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::GuiPrivate
+        Qt::Widgets
+)
+
+# Resources:
+set_source_files_properties("../shared/qt256.png"
+    PROPERTIES QT_RESOURCE_ALIAS "qt256.png"
+)
+set_source_files_properties("../shared/texture.frag.qsb"
+    PROPERTIES QT_RESOURCE_ALIAS "texture.frag.qsb"
+)
+set_source_files_properties("../shared/texture.vert.qsb"
+    PROPERTIES QT_RESOURCE_ALIAS "texture.vert.qsb"
+)
+set(multiwindow_threaded_resource_files
+    "../shared/qt256.png"
+    "../shared/texture.frag.qsb"
+    "../shared/texture.vert.qsb"
+)
+
+add_qt_resource(multiwindow_threaded "multiwindow_threaded"
+    PREFIX
+        "/"
+    FILES
+        ${multiwindow_threaded_resource_files}
+)
+
+
+#### Keys ignored in scope 1:.:.:multiwindow_threaded.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/manual/rhi/offscreen/CMakeLists.txt b/tests/manual/rhi/offscreen/CMakeLists.txt
new file mode 100644
index 0000000000..56a9f2661d
--- /dev/null
+++ b/tests/manual/rhi/offscreen/CMakeLists.txt
@@ -0,0 +1,36 @@
+# Generated from offscreen.pro.
+
+#####################################################################
+## offscreen Binary:
+#####################################################################
+
+add_qt_manual_test(offscreen
+    SOURCES
+        offscreen.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::GuiPrivate
+)
+
+# Resources:
+set_source_files_properties("../shared/color.frag.qsb"
+    PROPERTIES QT_RESOURCE_ALIAS "color.frag.qsb"
+)
+set_source_files_properties("../shared/color.vert.qsb"
+    PROPERTIES QT_RESOURCE_ALIAS "color.vert.qsb"
+)
+set(offscreen_resource_files
+    "../shared/color.frag.qsb"
+    "../shared/color.vert.qsb"
+)
+
+add_qt_resource(offscreen "offscreen"
+    PREFIX
+        "/"
+    FILES
+        ${offscreen_resource_files}
+)
+
+
+#### Keys ignored in scope 1:.:.:offscreen.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/manual/rhi/qrhiprof/CMakeLists.txt b/tests/manual/rhi/qrhiprof/CMakeLists.txt
new file mode 100644
index 0000000000..8f4fb3797b
--- /dev/null
+++ b/tests/manual/rhi/qrhiprof/CMakeLists.txt
@@ -0,0 +1,19 @@
+# Generated from qrhiprof.pro.
+
+#####################################################################
+## qrhiprof Binary:
+#####################################################################
+
+add_qt_manual_test(qrhiprof
+    GUI
+    SOURCES
+        qrhiprof.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::GuiPrivate
+        Qt::Network
+        Qt::Widgets
+)
+
+#### Keys ignored in scope 1:.:.:qrhiprof.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/manual/rhi/shadowmap/CMakeLists.txt b/tests/manual/rhi/shadowmap/CMakeLists.txt
new file mode 100644
index 0000000000..d2de92d094
--- /dev/null
+++ b/tests/manual/rhi/shadowmap/CMakeLists.txt
@@ -0,0 +1,33 @@
+# Generated from shadowmap.pro.
+
+#####################################################################
+## shadowmap Binary:
+#####################################################################
+
+add_qt_manual_test(shadowmap
+    GUI
+    SOURCES
+        shadowmap.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::GuiPrivate
+)
+
+# Resources:
+set(shadowmap_resource_files
+    "main.frag.qsb"
+    "main.vert.qsb"
+    "shadowmap.frag.qsb"
+    "shadowmap.vert.qsb"
+)
+
+add_qt_resource(shadowmap "shadowmap"
+    PREFIX
+        "/"
+    FILES
+        ${shadowmap_resource_files}
+)
+
+
+#### Keys ignored in scope 1:.:.:shadowmap.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/manual/rhi/texuploads/CMakeLists.txt b/tests/manual/rhi/texuploads/CMakeLists.txt
new file mode 100644
index 0000000000..2e97336a9d
--- /dev/null
+++ b/tests/manual/rhi/texuploads/CMakeLists.txt
@@ -0,0 +1,41 @@
+# Generated from texuploads.pro.
+
+#####################################################################
+## texuploads Binary:
+#####################################################################
+
+add_qt_manual_test(texuploads
+    GUI
+    SOURCES
+        texuploads.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::GuiPrivate
+)
+
+# Resources:
+set_source_files_properties("../shared/qt256.png"
+    PROPERTIES QT_RESOURCE_ALIAS "qt256.png"
+)
+set_source_files_properties("../shared/texture.frag.qsb"
+    PROPERTIES QT_RESOURCE_ALIAS "texture.frag.qsb"
+)
+set_source_files_properties("../shared/texture.vert.qsb"
+    PROPERTIES QT_RESOURCE_ALIAS "texture.vert.qsb"
+)
+set(texuploads_resource_files
+    "../shared/qt256.png"
+    "../shared/texture.frag.qsb"
+    "../shared/texture.vert.qsb"
+)
+
+add_qt_resource(texuploads "texuploads"
+    PREFIX
+        "/"
+    FILES
+        ${texuploads_resource_files}
+)
+
+
+#### Keys ignored in scope 1:.:.:texuploads.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/manual/rhi/triquadcube/CMakeLists.txt b/tests/manual/rhi/triquadcube/CMakeLists.txt
new file mode 100644
index 0000000000..42ebf1f55f
--- /dev/null
+++ b/tests/manual/rhi/triquadcube/CMakeLists.txt
@@ -0,0 +1,53 @@
+# Generated from triquadcube.pro.
+
+#####################################################################
+## triquadcube Binary:
+#####################################################################
+
+add_qt_manual_test(triquadcube
+    GUI
+    SOURCES
+        quadrenderer.cpp quadrenderer.h
+        texturedcuberenderer.cpp texturedcuberenderer.h
+        triangleoncuberenderer.cpp triangleoncuberenderer.h
+        trianglerenderer.cpp trianglerenderer.h
+        triquadcube.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::GuiPrivate
+)
+
+# Resources:
+set_source_files_properties("../shared/color.frag.qsb"
+    PROPERTIES QT_RESOURCE_ALIAS "color.frag.qsb"
+)
+set_source_files_properties("../shared/color.vert.qsb"
+    PROPERTIES QT_RESOURCE_ALIAS "color.vert.qsb"
+)
+set_source_files_properties("../shared/qt256.png"
+    PROPERTIES QT_RESOURCE_ALIAS "qt256.png"
+)
+set_source_files_properties("../shared/texture.frag.qsb"
+    PROPERTIES QT_RESOURCE_ALIAS "texture.frag.qsb"
+)
+set_source_files_properties("../shared/texture.vert.qsb"
+    PROPERTIES QT_RESOURCE_ALIAS "texture.vert.qsb"
+)
+set(triquadcube_resource_files
+    "../shared/color.frag.qsb"
+    "../shared/color.vert.qsb"
+    "../shared/qt256.png"
+    "../shared/texture.frag.qsb"
+    "../shared/texture.vert.qsb"
+)
+
+add_qt_resource(triquadcube "triquadcube"
+    PREFIX
+        "/"
+    FILES
+        ${triquadcube_resource_files}
+)
+
+
+#### Keys ignored in scope 1:.:.:triquadcube.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/manual/shortcuts/CMakeLists.txt b/tests/manual/shortcuts/CMakeLists.txt
new file mode 100644
index 0000000000..c4ac6b040b
--- /dev/null
+++ b/tests/manual/shortcuts/CMakeLists.txt
@@ -0,0 +1,17 @@
+# Generated from shortcuts.pro.
+
+#####################################################################
+## shortcuts Binary:
+#####################################################################
+
+add_qt_manual_test(shortcuts
+    GUI
+    SOURCES
+        main.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+)
+
+#### Keys ignored in scope 1:.:.:shortcuts.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/manual/socketengine/.prev_CMakeLists.txt b/tests/manual/socketengine/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..61635f7e77
--- /dev/null
+++ b/tests/manual/socketengine/.prev_CMakeLists.txt
@@ -0,0 +1,17 @@
+# Generated from socketengine.pro.
+
+#####################################################################
+## tst_socketengine Binary:
+#####################################################################
+
+add_qt_manual_test(tst_socketengine
+    SOURCES
+        main.cpp
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::NetworkPrivate
+        Qt::Test
+)
+
+#### Keys ignored in scope 1:.:.:socketengine.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/manual/socketengine/CMakeLists.txt b/tests/manual/socketengine/CMakeLists.txt
new file mode 100644
index 0000000000..927955c3db
--- /dev/null
+++ b/tests/manual/socketengine/CMakeLists.txt
@@ -0,0 +1,23 @@
+# Generated from socketengine.pro.
+
+#####################################################################
+## tst_socketengine Binary:
+#####################################################################
+
+# special case begin
+if (NOT QT_FEATURE_private_tests)
+    return()
+endif()
+# special case end
+
+add_qt_manual_test(tst_socketengine
+    SOURCES
+        main.cpp
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::NetworkPrivate
+        Qt::Test
+)
+
+#### Keys ignored in scope 1:.:.:socketengine.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/manual/textrendering/CMakeLists.txt b/tests/manual/textrendering/CMakeLists.txt
new file mode 100644
index 0000000000..788f9fc34f
--- /dev/null
+++ b/tests/manual/textrendering/CMakeLists.txt
@@ -0,0 +1,5 @@
+# Generated from textrendering.pro.
+
+add_subdirectory(glyphshaping)
+add_subdirectory(textperformance)
+add_subdirectory(nativetext)
diff --git a/tests/manual/textrendering/glyphshaping/CMakeLists.txt b/tests/manual/textrendering/glyphshaping/CMakeLists.txt
new file mode 100644
index 0000000000..891503dea1
--- /dev/null
+++ b/tests/manual/textrendering/glyphshaping/CMakeLists.txt
@@ -0,0 +1,19 @@
+# Generated from glyphshaping.pro.
+
+#####################################################################
+## glyphshaping Binary:
+#####################################################################
+
+add_qt_manual_test(glyphshaping
+    GUI
+    SOURCES
+        main.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+)
+
+#### Keys ignored in scope 1:.:.:glyphshaping.pro:<TRUE>:
+# DEPLOYMENT = "glyphshaping_data"
+# glyphshaping_data.files = "$$PWD/glyphshaping_data.xml"
+# glyphshaping_data.path = "."
diff --git a/tests/manual/textrendering/nativetext/CMakeLists.txt b/tests/manual/textrendering/nativetext/CMakeLists.txt
new file mode 100644
index 0000000000..c03a8ed288
--- /dev/null
+++ b/tests/manual/textrendering/nativetext/CMakeLists.txt
@@ -0,0 +1,28 @@
+# Generated from nativetext.pro.
+
+#####################################################################
+## nativetext Binary:
+#####################################################################
+
+add_qt_manual_test(nativetext
+    SOURCES
+        main.cpp
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::Gui
+        Qt::GuiPrivate
+        Qt::Widgets
+)
+
+## Scopes:
+#####################################################################
+
+extend_target(nativetext CONDITION APPLE
+    PUBLIC_LIBRARIES
+        ${FWAppKit}
+        ${FWCoreGraphics}
+        ${FWFoundation}
+    COMPILE_OPTIONS
+        -x
+        objective-c++
+)
diff --git a/tests/manual/textrendering/textperformance/CMakeLists.txt b/tests/manual/textrendering/textperformance/CMakeLists.txt
new file mode 100644
index 0000000000..cf21b4ecac
--- /dev/null
+++ b/tests/manual/textrendering/textperformance/CMakeLists.txt
@@ -0,0 +1,14 @@
+# Generated from textperformance.pro.
+
+#####################################################################
+## textperformance Binary:
+#####################################################################
+
+add_qt_manual_test(textperformance
+    GUI
+    SOURCES
+        main.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+)
diff --git a/tests/manual/touch/CMakeLists.txt b/tests/manual/touch/CMakeLists.txt
new file mode 100644
index 0000000000..5f7e9ec286
--- /dev/null
+++ b/tests/manual/touch/CMakeLists.txt
@@ -0,0 +1,16 @@
+# Generated from touch.pro.
+
+#####################################################################
+## touch Binary:
+#####################################################################
+
+add_qt_manual_test(touch
+    SOURCES
+        main.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+)
+
+#### Keys ignored in scope 1:.:.:touch.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/manual/touch/main.cpp b/tests/manual/touch/main.cpp
index a244230a22..8572e18955 100644
--- a/tests/manual/touch/main.cpp
+++ b/tests/manual/touch/main.cpp
@@ -526,7 +526,7 @@ void MainWindow::updateScreenLabel()
     const QRect geometry = screen->geometry();
     const qreal dpr = screen->devicePixelRatio();
     str << '"' << screen->name() << "\" " << geometry.width() << 'x' << geometry.height()
-        << forcesign << geometry.x() << geometry.y() << noforcesign;
+        << Qt::forcesign << geometry.x() << geometry.y() << Qt::noforcesign;
     if (!qFuzzyCompare(dpr, qreal(1)))
         str << ", dpr=" << dpr;
     m_screenLabel->setText(text);
diff --git a/tests/manual/touch/touch.pro b/tests/manual/touch/touch.pro
index fcb3c47f43..08e3fdcd71 100644
--- a/tests/manual/touch/touch.pro
+++ b/tests/manual/touch/touch.pro
@@ -1,5 +1,4 @@
 TEMPLATE = app
-QT = core gui
-greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
+QT = core gui widgets
 CONFIG -= app_bundle
 SOURCES += main.cpp
diff --git a/tests/manual/touchGraphicsItem/CMakeLists.txt b/tests/manual/touchGraphicsItem/CMakeLists.txt
new file mode 100644
index 0000000000..cc02dcdab2
--- /dev/null
+++ b/tests/manual/touchGraphicsItem/CMakeLists.txt
@@ -0,0 +1,19 @@
+# Generated from touchGraphicsItem.pro.
+
+#####################################################################
+## touchGraphicsItem Binary:
+#####################################################################
+
+add_qt_manual_test(touchGraphicsItem
+    GUI
+    SOURCES
+        main.cpp
+    INCLUDE_DIRECTORIES
+        .
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+)
+
+#### Keys ignored in scope 1:.:.:touchGraphicsItem.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/manual/transientwindow/CMakeLists.txt b/tests/manual/transientwindow/CMakeLists.txt
new file mode 100644
index 0000000000..0356bdcd02
--- /dev/null
+++ b/tests/manual/transientwindow/CMakeLists.txt
@@ -0,0 +1,18 @@
+# Generated from transientwindow.pro.
+
+#####################################################################
+## transientwindow Binary:
+#####################################################################
+
+add_qt_manual_test(transientwindow
+    GUI
+    SOURCES
+        main.cpp
+        mainwindow.cpp mainwindow.h
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+)
+
+#### Keys ignored in scope 1:.:.:transientwindow.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/manual/triangulator/CMakeLists.txt b/tests/manual/triangulator/CMakeLists.txt
new file mode 100644
index 0000000000..f3ebfb28a9
--- /dev/null
+++ b/tests/manual/triangulator/CMakeLists.txt
@@ -0,0 +1,19 @@
+# Generated from triangulator.pro.
+
+#####################################################################
+## triangulator Binary:
+#####################################################################
+
+add_qt_manual_test(triangulator
+    GUI
+    SOURCES
+        main.cpp
+        triviswidget.cpp triviswidget.h
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::GuiPrivate
+        Qt::Widgets
+)
+
+#### Keys ignored in scope 1:.:.:triangulator.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/manual/unc/CMakeLists.txt b/tests/manual/unc/CMakeLists.txt
new file mode 100644
index 0000000000..f63ffe34ad
--- /dev/null
+++ b/tests/manual/unc/CMakeLists.txt
@@ -0,0 +1,17 @@
+# Generated from unc.pro.
+
+#####################################################################
+## unc Binary:
+#####################################################################
+
+add_qt_manual_test(unc
+    GUI
+    SOURCES
+        main.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+)
+
+#### Keys ignored in scope 1:.:.:unc.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/manual/unc/unc.pro b/tests/manual/unc/unc.pro
index 977bd0c177..a1536a03db 100644
--- a/tests/manual/unc/unc.pro
+++ b/tests/manual/unc/unc.pro
@@ -1,5 +1,4 @@
-QT += core gui
-greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
+QT += core gui widgets
 
 TEMPLATE = app
 
diff --git a/tests/manual/widgetgrab/CMakeLists.txt b/tests/manual/widgetgrab/CMakeLists.txt
new file mode 100644
index 0000000000..a556388207
--- /dev/null
+++ b/tests/manual/widgetgrab/CMakeLists.txt
@@ -0,0 +1,17 @@
+# Generated from widgetgrab.pro.
+
+#####################################################################
+## widgetgrab Binary:
+#####################################################################
+
+add_qt_manual_test(widgetgrab
+    GUI
+    SOURCES
+        main.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+)
+
+#### Keys ignored in scope 1:.:.:widgetgrab.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/manual/widgetgrab/widgetgrab.pro b/tests/manual/widgetgrab/widgetgrab.pro
index d206fb1df1..c354711197 100644
--- a/tests/manual/widgetgrab/widgetgrab.pro
+++ b/tests/manual/widgetgrab/widgetgrab.pro
@@ -1,9 +1,5 @@
-QT       += core gui
+QT       += core gui widgets
 TARGET = widgetgrab
 TEMPLATE = app
 
 SOURCES += main.cpp
-
-greaterThan(QT_MAJOR_VERSION, 4) {
-    QT += widgets
-}
diff --git a/tests/manual/widgets/CMakeLists.txt b/tests/manual/widgets/CMakeLists.txt
new file mode 100644
index 0000000000..ac50f6c1ae
--- /dev/null
+++ b/tests/manual/widgets/CMakeLists.txt
@@ -0,0 +1,7 @@
+# Generated from widgets.pro.
+
+add_subdirectory(itemviews)
+add_subdirectory(qgraphicsview)
+add_subdirectory(kernel)
+add_subdirectory(widgets)
+add_subdirectory(styles)
diff --git a/tests/manual/widgets/itemviews/CMakeLists.txt b/tests/manual/widgets/itemviews/CMakeLists.txt
new file mode 100644
index 0000000000..2e6a7e563b
--- /dev/null
+++ b/tests/manual/widgets/itemviews/CMakeLists.txt
@@ -0,0 +1,8 @@
+# Generated from itemviews.pro.
+
+add_subdirectory(delegate)
+add_subdirectory(qconcatenatetablesproxymodel)
+add_subdirectory(qheaderview)
+add_subdirectory(qtreeview)
+add_subdirectory(qtreewidget)
+add_subdirectory(tableview-span-navigation)
diff --git a/tests/manual/widgets/itemviews/autoResizePrecision/tablehorz/CMakeLists.txt b/tests/manual/widgets/itemviews/autoResizePrecision/tablehorz/CMakeLists.txt
new file mode 100644
index 0000000000..8d5730267d
--- /dev/null
+++ b/tests/manual/widgets/itemviews/autoResizePrecision/tablehorz/CMakeLists.txt
@@ -0,0 +1,14 @@
+# Generated from testtable1.pro.
+
+#####################################################################
+## testtable1 Binary:
+#####################################################################
+
+add_qt_manual_test(testtable1
+    GUI
+    SOURCES
+        testtable1.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+)
diff --git a/tests/manual/widgets/itemviews/autoResizePrecision/tablevert/CMakeLists.txt b/tests/manual/widgets/itemviews/autoResizePrecision/tablevert/CMakeLists.txt
new file mode 100644
index 0000000000..ed9f5c98eb
--- /dev/null
+++ b/tests/manual/widgets/itemviews/autoResizePrecision/tablevert/CMakeLists.txt
@@ -0,0 +1,14 @@
+# Generated from testtable2.pro.
+
+#####################################################################
+## testtable2 Binary:
+#####################################################################
+
+add_qt_manual_test(testtable2
+    GUI
+    SOURCES
+        testtable2.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+)
diff --git a/tests/manual/widgets/itemviews/autoResizePrecision/treeview/CMakeLists.txt b/tests/manual/widgets/itemviews/autoResizePrecision/treeview/CMakeLists.txt
new file mode 100644
index 0000000000..33073d3a42
--- /dev/null
+++ b/tests/manual/widgets/itemviews/autoResizePrecision/treeview/CMakeLists.txt
@@ -0,0 +1,14 @@
+# Generated from testtree.pro.
+
+#####################################################################
+## testtree Binary:
+#####################################################################
+
+add_qt_manual_test(testtree
+    GUI
+    SOURCES
+        testtree.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+)
diff --git a/tests/manual/widgets/itemviews/delegate/CMakeLists.txt b/tests/manual/widgets/itemviews/delegate/CMakeLists.txt
new file mode 100644
index 0000000000..533cf4913e
--- /dev/null
+++ b/tests/manual/widgets/itemviews/delegate/CMakeLists.txt
@@ -0,0 +1,17 @@
+# Generated from delegate.pro.
+
+#####################################################################
+## delegate Binary:
+#####################################################################
+
+add_qt_manual_test(delegate
+    GUI
+    SOURCES
+        example.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+)
+
+#### Keys ignored in scope 1:.:.:delegate.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/manual/widgets/itemviews/qconcatenatetablesproxymodel/CMakeLists.txt b/tests/manual/widgets/itemviews/qconcatenatetablesproxymodel/CMakeLists.txt
new file mode 100644
index 0000000000..21c7ed431e
--- /dev/null
+++ b/tests/manual/widgets/itemviews/qconcatenatetablesproxymodel/CMakeLists.txt
@@ -0,0 +1,19 @@
+# Generated from qconcatenatetablesproxymodel.pro.
+
+#####################################################################
+## qconcatenatetablesproxymodel Binary:
+#####################################################################
+
+add_qt_manual_test(qconcatenatetablesproxymodel
+    GUI
+    SOURCES
+        main.cpp
+    INCLUDE_DIRECTORIES
+        .
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+)
+
+#### Keys ignored in scope 1:.:.:qconcatenatetablesproxymodel.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/manual/widgets/itemviews/qheaderview/CMakeLists.txt b/tests/manual/widgets/itemviews/qheaderview/CMakeLists.txt
new file mode 100644
index 0000000000..eeb9913126
--- /dev/null
+++ b/tests/manual/widgets/itemviews/qheaderview/CMakeLists.txt
@@ -0,0 +1,17 @@
+# Generated from qheaderview.pro.
+
+#####################################################################
+## qheaderview Binary:
+#####################################################################
+
+add_qt_manual_test(qheaderview
+    GUI
+    SOURCES
+        qheaderviewtest1.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+)
+
+#### Keys ignored in scope 1:.:.:qheaderview.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/manual/widgets/itemviews/qtreeview/CMakeLists.txt b/tests/manual/widgets/itemviews/qtreeview/CMakeLists.txt
new file mode 100644
index 0000000000..ff69f09cf0
--- /dev/null
+++ b/tests/manual/widgets/itemviews/qtreeview/CMakeLists.txt
@@ -0,0 +1,17 @@
+# Generated from qtreeview.pro.
+
+#####################################################################
+## qtreeview Binary:
+#####################################################################
+
+add_qt_manual_test(qtreeview
+    GUI
+    SOURCES
+        main.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+)
+
+#### Keys ignored in scope 1:.:.:qtreeview.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/manual/widgets/itemviews/qtreewidget/CMakeLists.txt b/tests/manual/widgets/itemviews/qtreewidget/CMakeLists.txt
new file mode 100644
index 0000000000..f6b1a2f7eb
--- /dev/null
+++ b/tests/manual/widgets/itemviews/qtreewidget/CMakeLists.txt
@@ -0,0 +1,18 @@
+# Generated from qtreewidget.pro.
+
+#####################################################################
+## qtreewidget Binary:
+#####################################################################
+
+add_qt_manual_test(qtreewidget
+    GUI
+    SOURCES
+        main.cpp
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::Gui
+        Qt::Widgets
+)
+
+#### Keys ignored in scope 1:.:.:qtreewidget.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/manual/widgets/itemviews/tableview-span-navigation/CMakeLists.txt b/tests/manual/widgets/itemviews/tableview-span-navigation/CMakeLists.txt
new file mode 100644
index 0000000000..f9efb5373d
--- /dev/null
+++ b/tests/manual/widgets/itemviews/tableview-span-navigation/CMakeLists.txt
@@ -0,0 +1,19 @@
+# Generated from tableview-span-navigation.pro.
+
+#####################################################################
+## tableview-span-navigation Binary:
+#####################################################################
+
+add_qt_manual_test(tableview-span-navigation
+    GUI
+    SOURCES
+        main.cpp
+    INCLUDE_DIRECTORIES
+        .
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+)
+
+#### Keys ignored in scope 1:.:.:tableview-span-navigation.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/manual/widgets/kernel/CMakeLists.txt b/tests/manual/widgets/kernel/CMakeLists.txt
new file mode 100644
index 0000000000..9be003391d
--- /dev/null
+++ b/tests/manual/widgets/kernel/CMakeLists.txt
@@ -0,0 +1,5 @@
+# Generated from kernel.pro.
+
+# add_subdirectory(qtooltip) # special case broken in dev
+add_subdirectory(sizeonhide)
+add_subdirectory(layoutreplace)
diff --git a/tests/manual/widgets/kernel/layoutreplace/CMakeLists.txt b/tests/manual/widgets/kernel/layoutreplace/CMakeLists.txt
new file mode 100644
index 0000000000..04b36ee4e3
--- /dev/null
+++ b/tests/manual/widgets/kernel/layoutreplace/CMakeLists.txt
@@ -0,0 +1,14 @@
+# Generated from layoutreplace.pro.
+
+#####################################################################
+## layoutreplace Binary:
+#####################################################################
+
+add_qt_manual_test(layoutreplace
+    GUI
+    SOURCES
+        main.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+)
diff --git a/tests/manual/widgets/kernel/qtooltip/CMakeLists.txt b/tests/manual/widgets/kernel/qtooltip/CMakeLists.txt
new file mode 100644
index 0000000000..2b30e5eeec
--- /dev/null
+++ b/tests/manual/widgets/kernel/qtooltip/CMakeLists.txt
@@ -0,0 +1,14 @@
+# Generated from qtooltip.pro.
+
+#####################################################################
+## qtooltip Binary:
+#####################################################################
+
+add_qt_manual_test(qtooltip
+    SOURCES
+        main.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Test
+        Qt::Widgets
+)
diff --git a/tests/manual/widgets/kernel/sizeonhide/CMakeLists.txt b/tests/manual/widgets/kernel/sizeonhide/CMakeLists.txt
new file mode 100644
index 0000000000..b1f8353a4f
--- /dev/null
+++ b/tests/manual/widgets/kernel/sizeonhide/CMakeLists.txt
@@ -0,0 +1,18 @@
+# Generated from sizeonhide.pro.
+
+#####################################################################
+## sizeonhide Binary:
+#####################################################################
+
+add_qt_manual_test(sizeonhide
+    GUI
+    SOURCES
+        main.cpp
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::Gui
+        Qt::Widgets
+)
+
+#### Keys ignored in scope 1:.:.:sizeonhide.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/manual/widgets/qgraphicsview/CMakeLists.txt b/tests/manual/widgets/qgraphicsview/CMakeLists.txt
new file mode 100644
index 0000000000..5fd7e47ccd
--- /dev/null
+++ b/tests/manual/widgets/qgraphicsview/CMakeLists.txt
@@ -0,0 +1,3 @@
+# Generated from qgraphicsview.pro.
+
+add_subdirectory(rubberband)
diff --git a/tests/manual/widgets/qgraphicsview/rubberband/CMakeLists.txt b/tests/manual/widgets/qgraphicsview/rubberband/CMakeLists.txt
new file mode 100644
index 0000000000..726404679e
--- /dev/null
+++ b/tests/manual/widgets/qgraphicsview/rubberband/CMakeLists.txt
@@ -0,0 +1,17 @@
+# Generated from rubberband.pro.
+
+#####################################################################
+## rubberband Binary:
+#####################################################################
+
+add_qt_manual_test(rubberband
+    GUI
+    SOURCES
+        rubberbandtest.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+)
+
+#### Keys ignored in scope 1:.:.:rubberband.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/manual/widgets/styles/CMakeLists.txt b/tests/manual/widgets/styles/CMakeLists.txt
new file mode 100644
index 0000000000..26fa8317cc
--- /dev/null
+++ b/tests/manual/widgets/styles/CMakeLists.txt
@@ -0,0 +1,15 @@
+# Generated from styles.pro.
+
+#####################################################################
+## tst_manual_styles Binary:
+#####################################################################
+
+add_qt_manual_test(tst_manual_styles
+    SOURCES
+        main.cpp
+    PUBLIC_LIBRARIES
+        Qt::Widgets
+)
+
+#### Keys ignored in scope 1:.:.:styles.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/manual/widgets/styles/styles.pro b/tests/manual/widgets/styles/styles.pro
index d302ae0691..1830e21705 100644
--- a/tests/manual/widgets/styles/styles.pro
+++ b/tests/manual/widgets/styles/styles.pro
@@ -1,5 +1,6 @@
 TEMPLATE = app
 QT = widgets
+TARGET = tst_manual_styles
 CONFIG += cmdline
 CONFIG += c++11
 
diff --git a/tests/manual/widgets/widgets.pro b/tests/manual/widgets/widgets.pro
index e3942a49e9..03aaa880b8 100644
--- a/tests/manual/widgets/widgets.pro
+++ b/tests/manual/widgets/widgets.pro
@@ -1,3 +1,2 @@
 TEMPLATE = subdirs
-SUBDIRS = itemviews qgraphicsview kernel widgets
-greaterThan(QT_MAJOR_VERSION, 4): SUBDIRS += styles
+SUBDIRS = itemviews qgraphicsview kernel widgets styles
diff --git a/tests/manual/widgets/widgets/CMakeLists.txt b/tests/manual/widgets/widgets/CMakeLists.txt
new file mode 100644
index 0000000000..d760abdd59
--- /dev/null
+++ b/tests/manual/widgets/widgets/CMakeLists.txt
@@ -0,0 +1,6 @@
+# Generated from widgets.pro.
+
+add_subdirectory(bigmenucreator)
+add_subdirectory(defaultUpMenuBar)
+add_subdirectory(multiscreen-menus)
+add_subdirectory(qtoolbutton/menuOnMultiScreens)
diff --git a/tests/manual/widgets/widgets/bigmenucreator/CMakeLists.txt b/tests/manual/widgets/widgets/bigmenucreator/CMakeLists.txt
new file mode 100644
index 0000000000..f0161997c0
--- /dev/null
+++ b/tests/manual/widgets/widgets/bigmenucreator/CMakeLists.txt
@@ -0,0 +1,22 @@
+# Generated from bigmenucreator.pro.
+
+#####################################################################
+## BigMenuCreator Binary:
+#####################################################################
+
+add_qt_manual_test(BigMenuCreator
+    GUI
+    SOURCES
+        main.cpp
+        mainwindow.cpp mainwindow.h mainwindow.ui
+    DEFINES
+        QT_DEPRECATED_WARNINGS
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+    ENABLE_AUTOGEN_TOOLS
+        uic
+)
+
+#### Keys ignored in scope 1:.:.:bigmenucreator.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/manual/widgets/widgets/bigmenucreator/bigmenucreator.pro b/tests/manual/widgets/widgets/bigmenucreator/bigmenucreator.pro
index 69fbea3834..408dab6482 100644
--- a/tests/manual/widgets/widgets/bigmenucreator/bigmenucreator.pro
+++ b/tests/manual/widgets/widgets/bigmenucreator/bigmenucreator.pro
@@ -4,9 +4,7 @@
 #
 #-------------------------------------------------
 
-QT       += core gui
-
-greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
+QT       += core gui widgets
 
 TARGET = BigMenuCreator
 TEMPLATE = app
diff --git a/tests/manual/widgets/widgets/defaultUpMenuBar/CMakeLists.txt b/tests/manual/widgets/widgets/defaultUpMenuBar/CMakeLists.txt
new file mode 100644
index 0000000000..8d86672327
--- /dev/null
+++ b/tests/manual/widgets/widgets/defaultUpMenuBar/CMakeLists.txt
@@ -0,0 +1,17 @@
+# Generated from defaultUpMenuBar.pro.
+
+#####################################################################
+## defaultUpMenuBar Binary:
+#####################################################################
+
+add_qt_manual_test(defaultUpMenuBar
+    GUI
+    SOURCES
+        main.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+)
+
+#### Keys ignored in scope 1:.:.:defaultUpMenuBar.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/manual/widgets/widgets/multiscreen-menus/CMakeLists.txt b/tests/manual/widgets/widgets/multiscreen-menus/CMakeLists.txt
new file mode 100644
index 0000000000..b750431d58
--- /dev/null
+++ b/tests/manual/widgets/widgets/multiscreen-menus/CMakeLists.txt
@@ -0,0 +1,20 @@
+# Generated from multiscreen-menus.pro.
+
+#####################################################################
+## multiscreen-menus Binary:
+#####################################################################
+
+add_qt_manual_test(multiscreen-menus
+    GUI
+    SOURCES
+        main.cpp
+        mainwindow.cpp mainwindow.h mainwindow.ui
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+    ENABLE_AUTOGEN_TOOLS
+        uic
+)
+
+#### Keys ignored in scope 1:.:.:multiscreen-menus.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/manual/widgets/widgets/qmainwindow/saveStateSize/CMakeLists.txt b/tests/manual/widgets/widgets/qmainwindow/saveStateSize/CMakeLists.txt
new file mode 100644
index 0000000000..461b595a68
--- /dev/null
+++ b/tests/manual/widgets/widgets/qmainwindow/saveStateSize/CMakeLists.txt
@@ -0,0 +1,17 @@
+# Generated from saveStateSize.pro.
+
+#####################################################################
+## saveStateSize Binary:
+#####################################################################
+
+add_qt_manual_test(saveStateSize
+    GUI
+    SOURCES
+        main.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+)
+
+#### Keys ignored in scope 1:.:.:saveStateSize.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/manual/widgets/widgets/qtoolbutton/menuOnMultiScreens/CMakeLists.txt b/tests/manual/widgets/widgets/qtoolbutton/menuOnMultiScreens/CMakeLists.txt
new file mode 100644
index 0000000000..f49d630de7
--- /dev/null
+++ b/tests/manual/widgets/widgets/qtoolbutton/menuOnMultiScreens/CMakeLists.txt
@@ -0,0 +1,17 @@
+# Generated from menuOnMultiScreens.pro.
+
+#####################################################################
+## menuOnMultiScreens Binary:
+#####################################################################
+
+add_qt_manual_test(menuOnMultiScreens
+    GUI
+    SOURCES
+        main.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+)
+
+#### Keys ignored in scope 1:.:.:menuOnMultiScreens.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/manual/windowchildgeometry/CMakeLists.txt b/tests/manual/windowchildgeometry/CMakeLists.txt
new file mode 100644
index 0000000000..e6f7c232a3
--- /dev/null
+++ b/tests/manual/windowchildgeometry/CMakeLists.txt
@@ -0,0 +1,23 @@
+# Generated from windowchildgeometry.pro.
+
+#####################################################################
+## windowchildgeometry Binary:
+#####################################################################
+
+add_qt_manual_test(windowchildgeometry
+    GUI
+    SOURCES
+        ../windowflags/controls.cpp ../windowflags/controls.h
+        controllerwidget.cpp controllerwidget.h
+        main.cpp
+    DEFINES
+        QT_DISABLE_DEPRECATED_BEFORE=0
+    INCLUDE_DIRECTORIES
+        ../windowflags
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+)
+
+#### Keys ignored in scope 1:.:.:windowchildgeometry.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/manual/windowchildgeometry/windowchildgeometry.pro b/tests/manual/windowchildgeometry/windowchildgeometry.pro
index 921acd8a4e..7722547ce7 100644
--- a/tests/manual/windowchildgeometry/windowchildgeometry.pro
+++ b/tests/manual/windowchildgeometry/windowchildgeometry.pro
@@ -1,5 +1,4 @@
-QT       += core gui
-greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
+QT       += core gui widgets
 TARGET = windowchildgeometry
 TEMPLATE = app
 
diff --git a/tests/manual/windowflags/CMakeLists.txt b/tests/manual/windowflags/CMakeLists.txt
new file mode 100644
index 0000000000..1aba06d9a1
--- /dev/null
+++ b/tests/manual/windowflags/CMakeLists.txt
@@ -0,0 +1,17 @@
+# Generated from windowflags.pro.
+
+#####################################################################
+## tst_manual_windowflags Binary:
+#####################################################################
+
+add_qt_manual_test(tst_manual_windowflags
+    GUI
+    SOURCES
+        controllerwindow.cpp controllerwindow.h
+        controls.cpp controls.h
+        main.cpp
+        previewwindow.cpp previewwindow.h
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+)
diff --git a/tests/manual/windowflags/previewwindow.cpp b/tests/manual/windowflags/previewwindow.cpp
index ef3966830b..893dbc9a41 100644
--- a/tests/manual/windowflags/previewwindow.cpp
+++ b/tests/manual/windowflags/previewwindow.cpp
@@ -48,7 +48,8 @@ void PreviewWindow::paintEvent(QPaintEvent *event)
 
 static void formatWindowFlags(QTextStream &str, Qt::WindowFlags flags)
 {
-    str << "Window flags: " << hex << showbase << unsigned(flags) << noshowbase << dec << ' ';
+    str << "Window flags: " << Qt::hex << Qt::showbase << unsigned(flags) << Qt::noshowbase
+        << Qt::dec << ' ';
     switch (flags & Qt::WindowType_Mask) {
     case Qt::Window:
         str << "Qt::Window";
@@ -125,7 +126,8 @@ static void formatWindowFlags(QTextStream &str, Qt::WindowFlags flags)
 
 static void formatWindowStates(QTextStream &str, Qt::WindowStates states)
 {
-    str << "Window states: " << hex << showbase << unsigned(states) << noshowbase << dec << ' ';
+    str << "Window states: " << Qt::hex << Qt::showbase << unsigned(states) << Qt::noshowbase
+        << Qt::dec << ' ';
     if (states & Qt::WindowActive) {
         str << "Qt::WindowActive ";
         states &= ~Qt::WindowActive;
@@ -150,7 +152,7 @@ static void formatWindowStates(QTextStream &str, Qt::WindowStates states)
 
 QTextStream &operator<<(QTextStream &str, const QRect &r)
 {
-    str << r.width() << 'x' << r.height() << forcesign << r.x() << r.y() << noforcesign;
+    str << r.width() << 'x' << r.height() << Qt::forcesign << r.x() << r.y() << Qt::noforcesign;
     return str;
 }
 
diff --git a/tests/manual/windowflags/windowflags.pro b/tests/manual/windowflags/windowflags.pro
index ba0f75b65c..4cd60ae6cf 100644
--- a/tests/manual/windowflags/windowflags.pro
+++ b/tests/manual/windowflags/windowflags.pro
@@ -1,3 +1,5 @@
+TARGET        = tst_manual_windowflags
+
 HEADERS       = controllerwindow.h \
                 previewwindow.h \
                 controls.h
@@ -7,4 +9,4 @@ SOURCES       = controllerwindow.cpp \
                 main.cpp \
                 controls.cpp
 
-greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
+QT += widgets
diff --git a/tests/manual/windowgeometry/CMakeLists.txt b/tests/manual/windowgeometry/CMakeLists.txt
new file mode 100644
index 0000000000..adeae599fc
--- /dev/null
+++ b/tests/manual/windowgeometry/CMakeLists.txt
@@ -0,0 +1,21 @@
+# Generated from windowgeometry.pro.
+
+#####################################################################
+## windowgeometry Binary:
+#####################################################################
+
+add_qt_manual_test(windowgeometry
+    GUI
+    SOURCES
+        ../windowflags/controls.cpp ../windowflags/controls.h
+        controllerwidget.cpp controllerwidget.h
+        main.cpp
+    INCLUDE_DIRECTORIES
+        ../windowflags
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+)
+
+#### Keys ignored in scope 1:.:.:windowgeometry.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/manual/windowgeometry/windowgeometry.pro b/tests/manual/windowgeometry/windowgeometry.pro
index e717799649..ee99f1950c 100644
--- a/tests/manual/windowgeometry/windowgeometry.pro
+++ b/tests/manual/windowgeometry/windowgeometry.pro
@@ -1,5 +1,4 @@
-QT       += core gui
-greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
+QT       += core gui widgets
 TARGET = windowgeometry
 TEMPLATE = app
 
diff --git a/tests/manual/windowmodality/CMakeLists.txt b/tests/manual/windowmodality/CMakeLists.txt
new file mode 100644
index 0000000000..67e6071add
--- /dev/null
+++ b/tests/manual/windowmodality/CMakeLists.txt
@@ -0,0 +1,19 @@
+# Generated from windowmodality.pro.
+
+#####################################################################
+## windowmodality Binary:
+#####################################################################
+
+add_qt_manual_test(windowmodality
+    GUI
+    SOURCES
+        dialog.ui
+        main.cpp
+        widget.ui
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::PrintSupport
+        Qt::Widgets
+    ENABLE_AUTOGEN_TOOLS
+        uic
+)
diff --git a/tests/manual/windowmodality/windowmodality.pro b/tests/manual/windowmodality/windowmodality.pro
index b29e939d27..973579c508 100644
--- a/tests/manual/windowmodality/windowmodality.pro
+++ b/tests/manual/windowmodality/windowmodality.pro
@@ -1,3 +1,3 @@
 SOURCES = main.cpp
 FORMS = widget.ui dialog.ui
-greaterThan(QT_MAJOR_VERSION, 4): QT += widgets printsupport
+QT += widgets printsupport
diff --git a/tests/manual/windowtransparency/CMakeLists.txt b/tests/manual/windowtransparency/CMakeLists.txt
new file mode 100644
index 0000000000..42de6d67c6
--- /dev/null
+++ b/tests/manual/windowtransparency/CMakeLists.txt
@@ -0,0 +1,13 @@
+# Generated from windowtransparency.pro.
+
+#####################################################################
+## windowtransparency Binary:
+#####################################################################
+
+add_qt_manual_test(windowtransparency
+    SOURCES
+        windowtransparency.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+)
diff --git a/tests/manual/xcb_gl_integration/CMakeLists.txt b/tests/manual/xcb_gl_integration/CMakeLists.txt
new file mode 100644
index 0000000000..e92e47fb8a
--- /dev/null
+++ b/tests/manual/xcb_gl_integration/CMakeLists.txt
@@ -0,0 +1,19 @@
+# Generated from xcb_gl_integration.pro.
+
+#####################################################################
+## xcb_gl_integration Binary:
+#####################################################################
+
+add_qt_manual_test(xcb_gl_integration
+    GUI
+    SOURCES
+        main.cpp
+    INCLUDE_DIRECTORIES
+        .
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::GuiPrivate
+)
+
+#### Keys ignored in scope 1:.:.:xcb_gl_integration.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/manual/xembed-raster/CMakeLists.txt b/tests/manual/xembed-raster/CMakeLists.txt
new file mode 100644
index 0000000000..6c8996e9c1
--- /dev/null
+++ b/tests/manual/xembed-raster/CMakeLists.txt
@@ -0,0 +1,17 @@
+# Generated from xembed-raster.pro.
+
+#####################################################################
+## tst_manual_rasterwindow Binary:
+#####################################################################
+
+add_qt_manual_test(tst_manual_rasterwindow
+    GUI
+    SOURCES
+        main.cpp
+        rasterwindow.cpp rasterwindow.h
+    PUBLIC_LIBRARIES
+        Qt::Gui
+)
+
+#### Keys ignored in scope 1:.:.:xembed-raster.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/manual/xembed-raster/xembed-raster.pro b/tests/manual/xembed-raster/xembed-raster.pro
index adaf9c4d25..4c9fee07b8 100644
--- a/tests/manual/xembed-raster/xembed-raster.pro
+++ b/tests/manual/xembed-raster/xembed-raster.pro
@@ -1,5 +1,5 @@
 TEMPLATE = app
-TARGET= rasterwindow
+TARGET= tst_manual_rasterwindow
 QT += gui
 
 SOURCES += \
diff --git a/tests/manual/xembed-widgets/CMakeLists.txt b/tests/manual/xembed-widgets/CMakeLists.txt
new file mode 100644
index 0000000000..ed8c5355a9
--- /dev/null
+++ b/tests/manual/xembed-widgets/CMakeLists.txt
@@ -0,0 +1,18 @@
+# Generated from xembed-widgets.pro.
+
+#####################################################################
+## tst_manual_lineedits Binary:
+#####################################################################
+
+add_qt_manual_test(tst_manual_lineedits
+    GUI
+    SOURCES
+        main.cpp
+        window.cpp window.h
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+)
+
+#### Keys ignored in scope 1:.:.:xembed-widgets.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/manual/xembed-widgets/xembed-widgets.pro b/tests/manual/xembed-widgets/xembed-widgets.pro
index e406ee47fd..28d13d5b61 100644
--- a/tests/manual/xembed-widgets/xembed-widgets.pro
+++ b/tests/manual/xembed-widgets/xembed-widgets.pro
@@ -1,5 +1,5 @@
 TEMPLATE = app
-TARGET= lineedits
+TARGET= tst_manual_lineedits
 QT += widgets
 
 SOURCES += \
diff --git a/util/cmake/Makefile b/util/cmake/Makefile
new file mode 100644
index 0000000000..2243ad111e
--- /dev/null
+++ b/util/cmake/Makefile
@@ -0,0 +1,20 @@
+
+test: flake8 mypy pytest black_format_check
+
+coverage:
+	pytest --cov .
+
+format:
+	black *.py --line-length 100
+
+black_format_check:
+	black *.py --line-length 100 --check
+
+flake8:
+	flake8 *.py --ignore=E501,E266,E203,W503
+
+pytest:
+	pytest
+
+mypy:
+	mypy --pretty *.py
diff --git a/util/cmake/Pipfile b/util/cmake/Pipfile
new file mode 100644
index 0000000000..21c18f4743
--- /dev/null
+++ b/util/cmake/Pipfile
@@ -0,0 +1,18 @@
+[[source]]
+url = "https://pypi.org/simple"
+verify_ssl = true
+name = "pypi"
+
+[packages]
+pyparsing = "*"
+sympy = "*"
+mypy = "*"
+pytest = "*"
+pytest-cov = "*"
+flake8 = "*"
+portalocker = "*"
+
+[dev-packages]
+
+[requires]
+python_version = "3.7"
diff --git a/util/cmake/README.md b/util/cmake/README.md
new file mode 100644
index 0000000000..e1699d5283
--- /dev/null
+++ b/util/cmake/README.md
@@ -0,0 +1,54 @@
+# CMake Utils
+
+This directory holds scripts to help the porting process from `qmake` to `cmake` for Qt6.
+
+# Requirements
+
+* [Python 3.7](https://www.python.org/downloads/),
+* `pipenv` or `pip` to manage the modules.
+
+## Python modules
+
+Since Python has many ways of handling projects, you have a couple of options to
+install the dependencies of the scripts:
+
+### Using `pipenv`
+
+The dependencies are specified on the `Pipfile`, so you just need to run
+`pipenv install` and that will automatically create a virtual environment
+that you can activate with a `pipenv shell`.
+
+### Using `pip`
+
+It's highly recommended to use a [virtualenvironment](https://virtualenv.pypa.io/en/latest/)
+to avoid conflict with other packages that are already installed: `pip install virtualenv`.
+
+* Create an environment: `virtualenv env`,
+* Activate the environment: `source env/bin/activate`
+  (on Windows: `source env\Scripts\activate.bat`)
+* Install the requirements: `pip install -r requirements.txt`
+
+# Contributing to the scripts
+
+You can verify if the styling of a script complaint with PEP8, with a couple of exceptions:
+
+Install [flake8](http://flake8.pycqa.org/en/latest/) (`pip install flake8`) and run it
+on the script you want to test:
+
+```
+flake8 <file>.py --ignore=E501,E266,W503
+```
+
+* `E501`: Line too long (82>79 characters),
+* `E266`: Too many leading '#' for block comment,
+* `W503`: Line break occurred before a binary operator)
+
+You can also modify the file with an automatic formatter,
+like [black](https://black.readthedocs.io/en/stable/) (`pip install black`),
+and execute it:
+
+```
+black -l 100 <file>.py
+```
+
+Using Qt's maximum line length, 100.
diff --git a/util/cmake/cmakeconversionrate.py b/util/cmake/cmakeconversionrate.py
new file mode 100755
index 0000000000..b87957df6c
--- /dev/null
+++ b/util/cmake/cmakeconversionrate.py
@@ -0,0 +1,141 @@
+#!/usr/bin/env python3
+#############################################################################
+##
+## Copyright (C) 2018 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the plugins of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:GPL-EXCEPT$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 as published by the Free Software
+## Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+from argparse import ArgumentParser
+
+import os
+import re
+import subprocess
+import typing
+
+
+def _parse_commandline():
+    parser = ArgumentParser(description="Calculate the conversion rate to cmake.")
+    parser.add_argument("--debug", dest="debug", action="store_true", help="Turn on debug output")
+    parser.add_argument(
+        "source_directory",
+        metavar="<Source Directory>",
+        type=str,
+        help="The Qt module source directory",
+    )
+    parser.add_argument(
+        "binary_directory",
+        metavar="<CMake build direcotry>",
+        type=str,
+        help="The CMake build directory (might be empty)",
+    )
+
+    return parser.parse_args()
+
+
+def calculate_baseline(source_directory: str, *, debug: bool = False) -> int:
+    if debug:
+        print(f'Scanning "{source_directory}" for qmake-based tests.')
+    result = subprocess.run(
+        '/usr/bin/git grep -E "^\\s*CONFIG\\s*\\+?=.*\\btestcase\\b" | sort -u | wc -l',
+        shell=True,
+        capture_output=True,
+        cwd=source_directory,
+    )
+    return int(result.stdout)
+
+
+def build(source_directory: str, binary_directory: str, *, debug=False) -> None:
+    abs_source = os.path.abspath(source_directory)
+    if not os.path.isdir(binary_directory):
+        os.makedirs(binary_directory)
+    if not os.path.exists(os.path.join(binary_directory, "CMakeCache.txt")):
+
+        if debug:
+            print(f'Running cmake in "{binary_directory}"')
+        result = subprocess.run(["/usr/bin/cmake", "-GNinja", abs_source], cwd=binary_directory)
+        if debug:
+            print(f"CMake return code: {result.returncode}.")
+
+        assert result.returncode == 0
+
+    if debug:
+        print(f'Running ninja in "{binary_directory}".')
+    result = subprocess.run("/usr/bin/ninja", cwd=binary_directory)
+    if debug:
+        print(f"Ninja return code: {result.returncode}.")
+
+    assert result.returncode == 0
+
+
+def test(binary_directory: str, *, debug=False) -> typing.Tuple[int, int]:
+    if debug:
+        print(f'Running ctest in "{binary_directory}".')
+    result = subprocess.run(
+        '/usr/bin/ctest -j 250 | grep "tests passed, "',
+        shell=True,
+        capture_output=True,
+        cwd=binary_directory,
+    )
+    summary = result.stdout.decode("utf-8").replace("\n", "")
+    if debug:
+        print(f"Test summary: {summary} ({result.returncode}).")
+
+    matches = re.fullmatch(r"\d+% tests passed, (\d+) tests failed out of (\d+)", summary)
+    if matches:
+        if debug:
+            print(f"Matches: failed {matches.group(1)}, total {matches.group(2)}.")
+        return (int(matches.group(2)), int(matches.group(2)) - int(matches.group(1)))
+
+    return (0, 0)
+
+
+def main() -> int:
+    args = _parse_commandline()
+
+    base_line = calculate_baseline(args.source_directory, debug=args.debug)
+    if base_line <= 0:
+        print(f"Could not find the qmake baseline in {args.source_directory}.")
+        return 1
+
+    if args.debug:
+        print(f"qmake baseline: {base_line} test binaries.")
+
+    cmake_total = 0
+    cmake_success = 0
+    try:
+        build(args.source_directory, args.binary_directory, debug=args.debug)
+        (cmake_total, cmake_success) = test(args.binary_directory, debug=args.debug)
+    finally:
+        if cmake_total == 0:
+            print("\n\n\nCould not calculate the cmake state.")
+            return 2
+        else:
+            print(f"\n\n\nCMake test conversion rate: {cmake_total/base_line:.2f}.")
+            print(f"CMake test success rate   : {cmake_success/base_line:.2f}.")
+            return 0
+
+
+if __name__ == "__main__":
+    main()
diff --git a/util/cmake/condition_simplifier.py b/util/cmake/condition_simplifier.py
new file mode 100644
index 0000000000..d02e70e489
--- /dev/null
+++ b/util/cmake/condition_simplifier.py
@@ -0,0 +1,237 @@
+#!/usr/bin/env python3
+#############################################################################
+##
+## Copyright (C) 2019 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the plugins of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:GPL-EXCEPT$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 as published by the Free Software
+## Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+
+import re
+from sympy import simplify_logic, And, Or, Not, SympifyError  # type: ignore
+from condition_simplifier_cache import simplify_condition_memoize
+
+
+def _iterate_expr_tree(expr, op, matches):
+    assert expr.func == op
+    keepers = ()
+    for arg in expr.args:
+        if arg in matches:
+            matches = tuple(x for x in matches if x != arg)
+        elif arg == op:
+            (matches, extra_keepers) = _iterate_expr_tree(arg, op, matches)
+            keepers = (*keepers, *extra_keepers)
+        else:
+            keepers = (*keepers, arg)
+    return matches, keepers
+
+
+def _simplify_expressions(expr, op, matches, replacement):
+    for arg in expr.args:
+        expr = expr.subs(arg, _simplify_expressions(arg, op, matches, replacement))
+
+    if expr.func == op:
+        (to_match, keepers) = tuple(_iterate_expr_tree(expr, op, matches))
+        if len(to_match) == 0:
+            # build expression with keepers and replacement:
+            if keepers:
+                start = replacement
+                current_expr = None
+                last_expr = keepers[-1]
+                for repl_arg in keepers[:-1]:
+                    current_expr = op(start, repl_arg)
+                    start = current_expr
+                top_expr = op(start, last_expr)
+            else:
+                top_expr = replacement
+
+            expr = expr.subs(expr, top_expr)
+
+    return expr
+
+
+def _simplify_flavors_in_condition(base: str, flavors, expr):
+    """ Simplify conditions based on the knowledge of which flavors
+        belong to which OS. """
+    base_expr = simplify_logic(base)
+    false_expr = simplify_logic("false")
+    for flavor in flavors:
+        flavor_expr = simplify_logic(flavor)
+        expr = _simplify_expressions(expr, And, (base_expr, flavor_expr), flavor_expr)
+        expr = _simplify_expressions(expr, Or, (base_expr, flavor_expr), base_expr)
+        expr = _simplify_expressions(expr, And, (Not(base_expr), flavor_expr), false_expr)
+    return expr
+
+
+def _simplify_os_families(expr, family_members, other_family_members):
+    for family in family_members:
+        for other in other_family_members:
+            if other in family_members:
+                continue  # skip those in the sub-family
+
+            f_expr = simplify_logic(family)
+            o_expr = simplify_logic(other)
+
+            expr = _simplify_expressions(expr, And, (f_expr, Not(o_expr)), f_expr)
+            expr = _simplify_expressions(expr, And, (Not(f_expr), o_expr), o_expr)
+            expr = _simplify_expressions(expr, And, (f_expr, o_expr), simplify_logic("false"))
+    return expr
+
+
+def _recursive_simplify(expr):
+    """ Simplify the expression as much as possible based on
+        domain knowledge. """
+    input_expr = expr
+
+    # Simplify even further, based on domain knowledge:
+    # windowses = ('WIN32', 'WINRT')
+    apples = ("APPLE_OSX", "APPLE_UIKIT", "APPLE_IOS", "APPLE_TVOS", "APPLE_WATCHOS")
+    bsds = ("FREEBSD", "OPENBSD", "NETBSD")
+    androids = ("ANDROID", "ANDROID_EMBEDDED")
+    unixes = (
+        "APPLE",
+        *apples,
+        "BSD",
+        *bsds,
+        "LINUX",
+        *androids,
+        "HAIKU",
+        "INTEGRITY",
+        "VXWORKS",
+        "QNX",
+        "WASM",
+    )
+
+    unix_expr = simplify_logic("UNIX")
+    win_expr = simplify_logic("WIN32")
+    false_expr = simplify_logic("false")
+    true_expr = simplify_logic("true")
+
+    expr = expr.subs(Not(unix_expr), win_expr)  # NOT UNIX -> WIN32
+    expr = expr.subs(Not(win_expr), unix_expr)  # NOT WIN32 -> UNIX
+
+    # UNIX [OR foo ]OR WIN32 -> ON [OR foo]
+    expr = _simplify_expressions(expr, Or, (unix_expr, win_expr), true_expr)
+    # UNIX  [AND foo ]AND WIN32 -> OFF [AND foo]
+    expr = _simplify_expressions(expr, And, (unix_expr, win_expr), false_expr)
+
+    expr = _simplify_flavors_in_condition("WIN32", ("WINRT",), expr)
+    expr = _simplify_flavors_in_condition("APPLE", apples, expr)
+    expr = _simplify_flavors_in_condition("BSD", bsds, expr)
+    expr = _simplify_flavors_in_condition("UNIX", unixes, expr)
+    expr = _simplify_flavors_in_condition("ANDROID", ("ANDROID_EMBEDDED",), expr)
+
+    # Simplify families of OSes against other families:
+    expr = _simplify_os_families(expr, ("WIN32", "WINRT"), unixes)
+    expr = _simplify_os_families(expr, androids, unixes)
+    expr = _simplify_os_families(expr, ("BSD", *bsds), unixes)
+
+    for family in ("HAIKU", "QNX", "INTEGRITY", "LINUX", "VXWORKS"):
+        expr = _simplify_os_families(expr, (family,), unixes)
+
+    # Now simplify further:
+    expr = simplify_logic(expr)
+
+    while expr != input_expr:
+        input_expr = expr
+        expr = _recursive_simplify(expr)
+
+    return expr
+
+
+@simplify_condition_memoize
+def simplify_condition(condition: str) -> str:
+    input_condition = condition.strip()
+
+    # Map to sympy syntax:
+    condition = " " + input_condition + " "
+    condition = condition.replace("(", " ( ")
+    condition = condition.replace(")", " ) ")
+
+    tmp = ""
+    while tmp != condition:
+        tmp = condition
+
+        condition = condition.replace(" NOT ", " ~ ")
+        condition = condition.replace(" AND ", " & ")
+        condition = condition.replace(" OR ", " | ")
+        condition = condition.replace(" ON ", " true ")
+        condition = condition.replace(" OFF ", " false ")
+        # Replace dashes with a token
+        condition = condition.replace("-", "_dash_")
+
+    # SymPy chokes on expressions that contain two tokens one next to
+    # the other delimited by a space, which are not an operation.
+    # So a CMake condition like "TARGET Foo::Bar" fails the whole
+    # expression simplifying process.
+    # Turn these conditions into a single token so that SymPy can parse
+    # the expression, and thus simplify it.
+    # Do this by replacing and keeping a map of conditions to single
+    # token symbols.
+    # Support both target names without double colons, and with double
+    # colons.
+    pattern = re.compile(r"(TARGET [a-zA-Z]+(?:::[a-zA-Z]+)?)")
+    target_symbol_mapping = {}
+    all_target_conditions = re.findall(pattern, condition)
+    for target_condition in all_target_conditions:
+        # Replace spaces and colons with underscores.
+        target_condition_symbol_name = re.sub("[ :]", "_", target_condition)
+        target_symbol_mapping[target_condition_symbol_name] = target_condition
+        condition = re.sub(target_condition, target_condition_symbol_name, condition)
+
+    # Do similar token mapping for comparison operators.
+    pattern = re.compile(r"([a-zA-Z_0-9]+ (?:STRLESS|STREQUAL|STRGREATER) [a-zA-Z_0-9]+)")
+    comparison_symbol_mapping = {}
+    all_comparisons = re.findall(pattern, condition)
+    for comparison in all_comparisons:
+        # Replace spaces and colons with underscores.
+        comparison_symbol_name = re.sub("[ ]", "_", comparison)
+        comparison_symbol_mapping[comparison_symbol_name] = comparison
+        condition = re.sub(comparison, comparison_symbol_name, condition)
+
+    try:
+        # Generate and simplify condition using sympy:
+        condition_expr = simplify_logic(condition)
+        condition = str(_recursive_simplify(condition_expr))
+
+        # Restore the target conditions.
+        for symbol_name in target_symbol_mapping:
+            condition = re.sub(symbol_name, target_symbol_mapping[symbol_name], condition)
+
+        # Restore comparisons.
+        for comparison in comparison_symbol_mapping:
+            condition = re.sub(comparison, comparison_symbol_mapping[comparison], condition)
+
+        # Map back to CMake syntax:
+        condition = condition.replace("~", "NOT ")
+        condition = condition.replace("&", "AND")
+        condition = condition.replace("|", "OR")
+        condition = condition.replace("True", "ON")
+        condition = condition.replace("False", "OFF")
+        condition = condition.replace("_dash_", "-")
+    except (SympifyError, TypeError, AttributeError):
+        # sympy did not like our input, so leave this condition alone:
+        condition = input_condition
+
+    return condition or "ON"
diff --git a/util/cmake/condition_simplifier_cache.py b/util/cmake/condition_simplifier_cache.py
new file mode 100644
index 0000000000..58cd5b88c5
--- /dev/null
+++ b/util/cmake/condition_simplifier_cache.py
@@ -0,0 +1,183 @@
+#!/usr/bin/env python3
+#############################################################################
+##
+## Copyright (C) 2018 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the plugins of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:GPL-EXCEPT$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 as published by the Free Software
+## Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+
+import atexit
+import hashlib
+import json
+import os
+import sys
+import time
+
+from typing import Any, Callable, Dict
+
+condition_simplifier_cache_enabled = True
+
+
+def set_condition_simplified_cache_enabled(value: bool):
+    global condition_simplifier_cache_enabled
+    condition_simplifier_cache_enabled = value
+
+
+def get_current_file_path() -> str:
+    try:
+        this_file = __file__
+    except NameError:
+        this_file = sys.argv[0]
+    this_file = os.path.abspath(this_file)
+    return this_file
+
+
+def get_cache_location() -> str:
+    this_file = get_current_file_path()
+    dir_path = os.path.dirname(this_file)
+    cache_path = os.path.join(dir_path, ".pro2cmake_cache", "cache.json")
+    return cache_path
+
+
+def get_file_checksum(file_path: str) -> str:
+    try:
+        with open(file_path, "r") as content_file:
+            content = content_file.read()
+    except IOError:
+        content = str(time.time())
+    checksum = hashlib.md5(content.encode("utf-8")).hexdigest()
+    return checksum
+
+
+def get_condition_simplifier_checksum() -> str:
+    current_file_path = get_current_file_path()
+    dir_name = os.path.dirname(current_file_path)
+    condition_simplifier_path = os.path.join(dir_name, "condition_simplifier.py")
+    return get_file_checksum(condition_simplifier_path)
+
+
+def init_cache_dict():
+    return {
+        "checksum": get_condition_simplifier_checksum(),
+        "schema_version": "1",
+        "cache": {"conditions": {}},
+    }
+
+
+def merge_dicts_recursive(a: Dict[str, Any], other: Dict[str, Any]) -> Dict[str, Any]:
+    """Merges values of "other" into "a", mutates a."""
+    for key in other:
+        if key in a:
+            if isinstance(a[key], dict) and isinstance(other[key], dict):
+                merge_dicts_recursive(a[key], other[key])
+            elif a[key] == other[key]:
+                pass
+        else:
+            a[key] = other[key]
+    return a
+
+
+def open_file_safe(file_path: str, mode: str = "r+"):
+    # Use portalocker package for file locking if available,
+    # otherwise print a message to install the package.
+    try:
+        import portalocker  # type: ignore
+
+        file_open_func = portalocker.Lock
+        file_open_args = [file_path]
+        file_open_kwargs = {"mode": mode, "flags": portalocker.LOCK_EX}
+        file_handle = file_open_func(*file_open_args, **file_open_kwargs)
+        return file_handle
+    except ImportError:
+        print(
+            "The conversion script is missing a required package: portalocker. Please run "
+            "python -m pip install -r requirements.txt to install the missing dependency."
+        )
+        exit(1)
+
+
+def simplify_condition_memoize(f: Callable[[str], str]):
+    cache_path = get_cache_location()
+    cache_file_content: Dict[str, Any] = {}
+
+    if os.path.exists(cache_path):
+        try:
+            with open_file_safe(cache_path, mode="r") as cache_file:
+                cache_file_content = json.load(cache_file)
+        except (IOError, ValueError):
+            print(f"Invalid pro2cmake cache file found at: {cache_path}. Removing it.")
+            os.remove(cache_path)
+
+    if not cache_file_content:
+        cache_file_content = init_cache_dict()
+
+    current_checksum = get_condition_simplifier_checksum()
+    if cache_file_content["checksum"] != current_checksum:
+        cache_file_content = init_cache_dict()
+
+    def update_cache_file():
+        if not os.path.exists(cache_path):
+            os.makedirs(os.path.dirname(cache_path), exist_ok=True)
+            # Create the file if it doesn't exist, but don't override
+            # it.
+            with open(cache_path, "a"):
+                pass
+
+        updated_cache = cache_file_content
+
+        with open_file_safe(cache_path, "r+") as cache_file_write_handle:
+            # Read any existing cache content, and truncate the file.
+            cache_file_existing_content = cache_file_write_handle.read()
+            cache_file_write_handle.seek(0)
+            cache_file_write_handle.truncate()
+
+            # Merge the new cache into the old cache if it exists.
+            if cache_file_existing_content:
+                possible_cache = json.loads(cache_file_existing_content)
+                if (
+                    "checksum" in possible_cache
+                    and "schema_version" in possible_cache
+                    and possible_cache["checksum"] == cache_file_content["checksum"]
+                    and possible_cache["schema_version"] == cache_file_content["schema_version"]
+                ):
+                    updated_cache = merge_dicts_recursive(dict(possible_cache), updated_cache)
+
+            json.dump(updated_cache, cache_file_write_handle, indent=4)
+
+            # Flush any buffered writes.
+            cache_file_write_handle.flush()
+            os.fsync(cache_file_write_handle.fileno())
+
+    atexit.register(update_cache_file)
+
+    def helper(condition: str) -> str:
+        if (
+            condition not in cache_file_content["cache"]["conditions"]
+            or not condition_simplifier_cache_enabled
+        ):
+            cache_file_content["cache"]["conditions"][condition] = f(condition)
+        return cache_file_content["cache"]["conditions"][condition]
+
+    return helper
diff --git a/util/cmake/configurejson2cmake.py b/util/cmake/configurejson2cmake.py
new file mode 100755
index 0000000000..f479732406
--- /dev/null
+++ b/util/cmake/configurejson2cmake.py
@@ -0,0 +1,1117 @@
+#!/usr/bin/env python3
+#############################################################################
+##
+## Copyright (C) 2018 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the plugins of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:GPL-EXCEPT$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 as published by the Free Software
+## Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+import json_parser
+import posixpath
+import re
+import sys
+from typing import Optional, Set
+from textwrap import dedent
+
+from helper import (
+    map_qt_library,
+    featureName,
+    map_platform,
+    find_3rd_party_library_mapping,
+    generate_find_package_info,
+)
+
+knownTests = set()  # type: Set[str]
+
+
+class LibraryMapping:
+    def __init__(self, package: str, resultVariable: str, appendFoundSuffix: bool = True) -> None:
+        self.package = package
+        self.resultVariable = resultVariable
+        self.appendFoundSuffix = appendFoundSuffix
+
+
+def map_tests(test: str) -> Optional[str]:
+    testmap = {
+        "c99": "c_std_99 IN_LIST CMAKE_C_COMPILE_FEATURES",
+        "c11": "c_std_11 IN_LIST CMAKE_C_COMPILE_FEATURES",
+        "x86SimdAlways": "ON",  # FIXME: Make this actually do a compile test.
+        "aesni": "TEST_subarch_aes",
+        "avx": "TEST_subarch_avx",
+        "avx2": "TEST_subarch_avx2",
+        "avx512f": "TEST_subarch_avx512f",
+        "avx512cd": "TEST_subarch_avx512cd",
+        "avx512dq": "TEST_subarch_avx512dq",
+        "avx512bw": "TEST_subarch_avx512bw",
+        "avx512er": "TEST_subarch_avx512er",
+        "avx512pf": "TEST_subarch_avx512pf",
+        "avx512vl": "TEST_subarch_avx512vl",
+        "avx512ifma": "TEST_subarch_avx512ifma",
+        "avx512vbmi": "TEST_subarch_avx512vbmi",
+        "avx512vbmi2": "TEST_subarch_avx512vbmi2",
+        "avx512vpopcntdq": "TEST_subarch_avx512vpopcntdq",
+        "avx5124fmaps": "TEST_subarch_avx5124fmaps",
+        "avx5124vnniw": "TEST_subarch_avx5124vnniw",
+        "bmi": "TEST_subarch_bmi",
+        "bmi2": "TEST_subarch_bmi2",
+        "cx16": "TEST_subarch_cx16",
+        "f16c": "TEST_subarch_f16c",
+        "fma": "TEST_subarch_fma",
+        "fma4": "TEST_subarch_fma4",
+        "fsgsbase": "TEST_subarch_fsgsbase",
+        "gfni": "TEST_subarch_gfni",
+        "ibt": "TEST_subarch_ibt",
+        "libclang": "TEST_libclang",
+        "lwp": "TEST_subarch_lwp",
+        "lzcnt": "TEST_subarch_lzcnt",
+        "mmx": "TEST_subarch_mmx",
+        "movbe": "TEST_subarch_movbe",
+        "mpx": "TEST_subarch_mpx",
+        "no-sahf": "TEST_subarch_no_shaf",
+        "pclmul": "TEST_subarch_pclmul",
+        "popcnt": "TEST_subarch_popcnt",
+        "prefetchwt1": "TEST_subarch_prefetchwt1",
+        "prfchw": "TEST_subarch_prfchw",
+        "pdpid": "TEST_subarch_rdpid",
+        "rdpid": "TEST_subarch_rdpid",
+        "rdseed": "TEST_subarch_rdseed",
+        "rdrnd": "TEST_subarch_rdseed",  # FIXME: Is this the right thing?
+        "rtm": "TEST_subarch_rtm",
+        "shani": "TEST_subarch_sha",
+        "shstk": "TEST_subarch_shstk",
+        "sse2": "TEST_subarch_sse2",
+        "sse3": "TEST_subarch_sse3",
+        "ssse3": "TEST_subarch_ssse3",
+        "sse4a": "TEST_subarch_sse4a",
+        "sse4_1": "TEST_subarch_sse4_1",
+        "sse4_2": "TEST_subarch_sse4_2",
+        "tbm": "TEST_subarch_tbm",
+        "xop": "TEST_subarch_xop",
+        "neon": "TEST_subarch_neon",
+        "iwmmxt": "TEST_subarch_iwmmxt",
+        "crc32": "TEST_subarch_crc32",
+        "vis": "TEST_subarch_vis",
+        "vis2": "TEST_subarch_vis2",
+        "vis3": "TEST_subarch_vis3",
+        "dsp": "TEST_subarch_dsp",
+        "dspr2": "TEST_subarch_dspr2",
+        "altivec": "TEST_subarch_altivec",
+        "spe": "TEST_subarch_spe",
+        "vsx": "TEST_subarch_vsx",
+        "posix-iconv": "TEST_posix_iconv",
+        "sun-iconv": "TEST_sun_iconv",
+        "openssl11": '(OPENSSL_VERSION VERSION_GREATER_EQUAL "1.1.0")',
+        "reduce_exports": "CMAKE_CXX_COMPILE_OPTIONS_VISIBILITY",
+        "libinput_axis_api": "ON",
+        "xlib": "X11_FOUND",
+        "wayland-scanner": "WaylandScanner_FOUND",
+    }
+    if test in testmap:
+        return testmap.get(test, None)
+    if test in knownTests:
+        return f"TEST_{featureName(test)}"
+    return None
+
+
+def cm(ctx, *output):
+    txt = ctx["output"]
+    if txt != "" and not txt.endswith("\n"):
+        txt += "\n"
+    txt += "\n".join(output)
+
+    ctx["output"] = txt
+    return ctx
+
+
+def readJsonFromDir(path: str) -> str:
+    path = posixpath.join(path, "configure.json")
+
+    print(f"Reading {path}...")
+    assert posixpath.exists(path)
+
+    parser = json_parser.QMakeSpecificJSONParser()
+    return parser.parse(path)
+
+
+def processFiles(ctx, data):
+    print("  files:")
+    if "files" in data:
+        for (k, v) in data["files"].items():
+            ctx[k] = v
+    return ctx
+
+
+def parseLib(ctx, lib, data, cm_fh, cmake_find_packages_set):
+    newlib = find_3rd_party_library_mapping(lib)
+    if not newlib:
+        print(f'    XXXX Unknown library "{lib}".')
+        return
+
+    if newlib.packageName is None:
+        print(f'    **** Skipping library "{lib}" -- was masked.')
+        return
+
+    print(f"    mapped library {lib} to {newlib.targetName}.")
+
+    # Avoid duplicate find_package calls.
+    if newlib.targetName in cmake_find_packages_set:
+        return
+
+    # If certain libraries are used within a feature, but the feature
+    # is only emitted conditionally with a simple condition (like
+    # 'on Windows' or 'on Linux'), we should enclose the find_package
+    # call for the library into the same condition.
+    emit_if = newlib.emit_if
+
+    # Only look through features if a custom emit_if wasn't provided.
+    if not emit_if:
+        for feature in data["features"]:
+            feature_data = data["features"][feature]
+            if (
+                "condition" in feature_data
+                and f"libs.{lib}" in feature_data["condition"]
+                and "emitIf" in feature_data
+                and "config." in feature_data["emitIf"]
+            ):
+                emit_if = feature_data["emitIf"]
+                break
+
+    if emit_if:
+        emit_if = map_condition(emit_if)
+
+    cmake_find_packages_set.add(newlib.targetName)
+
+    find_package_kwargs = {"emit_if": emit_if}
+    if newlib.is_bundled_with_qt:
+        # If a library is bundled with Qt, it has 2 FindFoo.cmake
+        # modules: WrapFoo and WrapSystemFoo.
+        # FindWrapSystemFoo.cmake will try to find the 'Foo' library in
+        # the usual CMake locations, and will create a
+        # WrapSystemFoo::WrapSystemFoo target pointing to the library.
+        #
+        # FindWrapFoo.cmake will create a WrapFoo::WrapFoo target which
+        # will link either against the WrapSystemFoo or QtBundledFoo
+        # target depending on certain feature values.
+        #
+        # Because the following qt_find_package call is for
+        # configure.cmake consumption, we make the assumption that
+        # configure.cmake is interested in finding the system library
+        # for the purpose of enabling or disabling a system_foo feature.
+        find_package_kwargs["use_system_package_name"] = True
+
+    cm_fh.write(generate_find_package_info(newlib, **find_package_kwargs))
+
+
+def lineify(label, value, quote=True):
+    if value:
+        if quote:
+            escaped_value = value.replace('"', '\\"')
+            return f'    {label} "{escaped_value}"\n'
+        return f"    {label} {value}\n"
+    return ""
+
+
+def map_condition(condition):
+    # Handle NOT:
+    if isinstance(condition, list):
+        condition = "(" + ") AND (".join(condition) + ")"
+    if isinstance(condition, bool):
+        if condition:
+            return "ON"
+        else:
+            return "OFF"
+    assert isinstance(condition, str)
+
+    mapped_features = {"gbm": "gbm_FOUND", "system-xcb": "ON"}
+
+    # Turn foo != "bar" into (NOT foo STREQUAL 'bar')
+    condition = re.sub(r"(.+)\s*!=\s*('.+')", "(! \\1 == \\2)", condition)
+
+    condition = condition.replace("!", "NOT ")
+    condition = condition.replace("&&", " AND ")
+    condition = condition.replace("||", " OR ")
+    condition = condition.replace("==", " STREQUAL ")
+
+    # explicitly handle input.sdk == '':
+    condition = re.sub(r"input\.sdk\s*==\s*''", "NOT INPUT_SDK", condition)
+
+    last_pos = 0
+    mapped_condition = ""
+    has_failed = False
+    for match in re.finditer(r"([a-zA-Z0-9_]+)\.([a-zA-Z0-9_+-]+)", condition):
+        substitution = None
+        # appendFoundSuffix = True
+        if match.group(1) == "libs":
+            libmapping = find_3rd_party_library_mapping(match.group(2))
+
+            if libmapping and libmapping.packageName:
+                substitution = libmapping.packageName
+                if libmapping.resultVariable:
+                    substitution = libmapping.resultVariable
+                if libmapping.appendFoundSuffix:
+                    substitution += "_FOUND"
+
+                # Assume that feature conditions are interested whether
+                # a system library is found, rather than the bundled one
+                # which we always know we can build.
+                if libmapping.is_bundled_with_qt:
+                    substitution = substitution.replace("Wrap", "WrapSystem")
+
+        elif match.group(1) == "features":
+            feature = match.group(2)
+            if feature in mapped_features:
+                substitution = mapped_features.get(feature)
+            else:
+                substitution = f"QT_FEATURE_{featureName(match.group(2))}"
+
+        elif match.group(1) == "subarch":
+            substitution = f"TEST_arch_{'${TEST_architecture_arch}'}_subarch_{match.group(2)}"
+
+        elif match.group(1) == "call":
+            if match.group(2) == "crossCompile":
+                substitution = "CMAKE_CROSSCOMPILING"
+
+        elif match.group(1) == "tests":
+            substitution = map_tests(match.group(2))
+
+        elif match.group(1) == "input":
+            substitution = f"INPUT_{featureName(match.group(2))}"
+
+        elif match.group(1) == "config":
+            substitution = map_platform(match.group(2))
+        elif match.group(1) == "module":
+            substitution = f"TARGET {map_qt_library(match.group(2))}"
+
+        elif match.group(1) == "arch":
+            if match.group(2) == "i386":
+                # FIXME: Does this make sense?
+                substitution = "(TEST_architecture_arch STREQUAL i386)"
+            elif match.group(2) == "x86_64":
+                substitution = "(TEST_architecture_arch STREQUAL x86_64)"
+            elif match.group(2) == "arm":
+                # FIXME: Does this make sense?
+                substitution = "(TEST_architecture_arch STREQUAL arm)"
+            elif match.group(2) == "arm64":
+                # FIXME: Does this make sense?
+                substitution = "(TEST_architecture_arch STREQUAL arm64)"
+            elif match.group(2) == "mips":
+                # FIXME: Does this make sense?
+                substitution = "(TEST_architecture_arch STREQUAL mips)"
+
+        if substitution is None:
+            print(f'    XXXX Unknown condition "{match.group(0)}"')
+            has_failed = True
+        else:
+            mapped_condition += condition[last_pos : match.start(1)] + substitution
+            last_pos = match.end(2)
+
+    mapped_condition += condition[last_pos:]
+
+    # Space out '(' and ')':
+    mapped_condition = mapped_condition.replace("(", " ( ")
+    mapped_condition = mapped_condition.replace(")", " ) ")
+
+    # Prettify:
+    condition = re.sub("\\s+", " ", mapped_condition)
+    condition = condition.strip()
+
+    # Special case for WrapLibClang in qttools
+    condition = condition.replace("TEST_libclang.has_clangcpp", "TEST_libclang")
+
+    if has_failed:
+        condition += " OR FIXME"
+
+    return condition
+
+
+def parseInput(ctx, sinput, data, cm_fh):
+    skip_inputs = {
+        "prefix",
+        "hostprefix",
+        "extprefix",
+        "archdatadir",
+        "bindir",
+        "datadir",
+        "docdir",
+        "examplesdir",
+        "external-hostbindir",
+        "headerdir",
+        "hostbindir",
+        "hostdatadir",
+        "hostlibdir",
+        "importdir",
+        "libdir",
+        "libexecdir",
+        "plugindir",
+        "qmldir",
+        "settingsdir",
+        "sysconfdir",
+        "testsdir",
+        "translationdir",
+        "android-arch",
+        "android-ndk",
+        "android-ndk-host",
+        "android-ndk-platform",
+        "android-sdk",
+        "android-toolchain-version",
+        "android-style-assets",
+        "appstore-compliant",
+        "avx",
+        "avx2",
+        "avx512",
+        "c++std",
+        "ccache",
+        "commercial",
+        "compile-examples",
+        "confirm-license",
+        "dbus",
+        "dbus-runtime",
+        "debug",
+        "debug-and-release",
+        "developer-build",
+        "device",
+        "device-option",
+        "f16c",
+        "force-asserts",
+        "force-debug-info",
+        "force-pkg-config",
+        "framework",
+        "gc-binaries",
+        "gdb-index",
+        "gcc-sysroot",
+        "gcov",
+        "gnumake",
+        "gui",
+        "harfbuzz",
+        "headersclean",
+        "incredibuild-xge",
+        "libudev",
+        "ltcg",
+        "make",
+        "make-tool",
+        "mips_dsp",
+        "mips_dspr2",
+        "mp",
+        "nomake",
+        "opensource",
+        "optimize-debug",
+        "optimize-size",
+        "optimized-qmake",
+        "optimized-tools",
+        "pch",
+        "pkg-config",
+        "platform",
+        "plugin-manifests",
+        "profile",
+        "qreal",
+        "reduce-exports",
+        "reduce-relocations",
+        "release",
+        "rpath",
+        "sanitize",
+        "sdk",
+        "separate-debug-info",
+        "shared",
+        "silent",
+        "qdbus",
+        "sse2",
+        "sse3",
+        "sse4.1",
+        "sse4.2",
+        "ssse3",
+        "static",
+        "static-runtime",
+        "strip",
+        "syncqt",
+        "sysroot",
+        "testcocoon",
+        "use-gold-linker",
+        "warnings-are-errors",
+        "Werror",
+        "widgets",
+        "xplatform",
+        "zlib",
+        "doubleconversion",
+        "eventfd",
+        "glib",
+        "icu",
+        "inotify",
+        "journald",
+        "pcre",
+        "posix-ipc",
+        "pps",
+        "slog2",
+        "syslog",
+        "sqlite",
+    }
+
+    if sinput in skip_inputs:
+        print(f"    **** Skipping input {sinput}: masked.")
+        return
+
+    dtype = data
+    if isinstance(data, dict):
+        dtype = data["type"]
+
+    if dtype == "boolean":
+        print(f"    **** Skipping boolean input {sinput}: masked.")
+        return
+
+    if dtype == "enum":
+        values_line = " ".join(data["values"])
+        cm_fh.write(f"# input {sinput}\n")
+        cm_fh.write(f'set(INPUT_{featureName(sinput)} "undefined" CACHE STRING "")\n')
+        cm_fh.write(
+            f"set_property(CACHE INPUT_{featureName(sinput)} PROPERTY STRINGS undefined {values_line})\n\n"
+        )
+        return
+
+    print(f"    XXXX UNHANDLED INPUT TYPE {dtype} in input description")
+    return
+
+
+#  "tests": {
+#        "cxx11_future": {
+#            "label": "C++11 <future>",
+#            "type": "compile",
+#            "test": {
+#                "include": "future",
+#                "main": [
+#                    "std::future<int> f = std::async([]() { return 42; });",
+#                    "(void)f.get();"
+#                ],
+#                "qmake": "unix:LIBS += -lpthread"
+#            }
+#        },
+def parseTest(ctx, test, data, cm_fh):
+    skip_tests = {
+        "c11",
+        "c99",
+        "gc_binaries",
+        "posix-iconv",
+        "sun-iconv",
+        "precomile_header",
+        "reduce_exports",
+        "separate_debug_info",  # FIXME: see if cmake can do this
+        "gc_binaries",
+        "libinput_axis_api",
+        "wayland-scanner",
+        "xlib",
+    }
+
+    if test in skip_tests:
+        print(f"    **** Skipping features {test}: masked.")
+        return
+
+    if data["type"] == "compile":
+        knownTests.add(test)
+
+        details = data["test"]
+
+        if isinstance(details, str):
+            if not ctx["test_dir"]:
+                print(f"    XXXX UNHANDLED TEST SUB-TYPE {details} in test description")
+                return
+
+            cm_fh.write(
+                f"""
+if(EXISTS "${{CMAKE_CURRENT_SOURCE_DIR}}/{ctx['test_dir']}/{data['test']}/CMakeLists.txt")
+    qt_config_compile_test("{data['test']}"
+                           LABEL "{data['label']}"
+                           PROJECT_PATH "${{CMAKE_CURRENT_SOURCE_DIR}}/{ctx['test_dir']}/{data['test']}")
+endif()
+"""
+            )
+            return
+
+        head = details.get("head", "")
+        if isinstance(head, list):
+            head = "\n".join(head)
+
+        sourceCode = head + "\n"
+
+        include = details.get("include", "")
+        if isinstance(include, list):
+            include = "#include <" + ">\n#include <".join(include) + ">"
+        elif include:
+            include = f"#include <{include}>"
+
+        sourceCode += include + "\n"
+
+        tail = details.get("tail", "")
+        if isinstance(tail, list):
+            tail = "\n".join(tail)
+
+        sourceCode += tail + "\n"
+
+        sourceCode += "int main(int argc, char **argv)\n"
+        sourceCode += "{\n"
+        sourceCode += "    (void)argc; (void)argv;\n"
+        sourceCode += "    /* BEGIN TEST: */\n"
+
+        main = details.get("main", "")
+        if isinstance(main, list):
+            main = "\n".join(main)
+
+        sourceCode += main + "\n"
+
+        sourceCode += "    /* END TEST: */\n"
+        sourceCode += "    return 0;\n"
+        sourceCode += "}\n"
+
+        sourceCode = sourceCode.replace('"', '\\"')
+
+        librariesCmakeName = ""
+        languageStandard = ""
+        qmakeFixme = ""
+
+        cm_fh.write(f"# {test}\n")
+        if "qmake" in details:  # We don't really have many so we can just enumerate them all
+            if details["qmake"] == "unix:LIBS += -lpthread":
+                librariesCmakeName = format(featureName(test)) + "_TEST_LIBRARIES"
+                cm_fh.write("if (UNIX)\n")
+                cm_fh.write("    set(" + librariesCmakeName + " pthread)\n")
+                cm_fh.write("endif()\n")
+            elif details["qmake"] == "linux: LIBS += -lpthread -lrt":
+                librariesCmakeName = format(featureName(test)) + "_TEST_LIBRARIES"
+                cm_fh.write("if (LINUX)\n")
+                cm_fh.write("    set(" + librariesCmakeName + " pthread rt)\n")
+                cm_fh.write("endif()\n")
+            elif details["qmake"] == "!winrt: LIBS += runtimeobject.lib":
+                librariesCmakeName = format(featureName(test)) + "_TEST_LIBRARIES"
+                cm_fh.write("if (NOT WINRT)\n")
+                cm_fh.write("    set(" + librariesCmakeName + " runtimeobject)\n")
+                cm_fh.write("endif()\n")
+            elif details["qmake"] == "CONFIG += c++11":
+                # do nothing we're always in c++11 mode
+                pass
+            elif details["qmake"] == "CONFIG += c++11 c++14":
+                languageStandard = "CXX_STANDARD 14"
+            elif details["qmake"] == "CONFIG += c++11 c++14 c++17":
+                languageStandard = "CXX_STANDARD 17"
+            elif details["qmake"] == "CONFIG += c++11 c++14 c++17 c++2a":
+                languageStandard = "CXX_STANDARD 20"
+            else:
+                qmakeFixme = f"# FIXME: qmake: {details['qmake']}\n"
+
+        library_list = []
+        if "use" in data:
+            for library in data["use"].split(" "):
+                if len(library) == 0:
+                    continue
+
+                mapped_library = find_3rd_party_library_mapping(library)
+                if not mapped_library:
+                    qmakeFixme += f"# FIXME: use: unmapped library: {library}\n"
+                    continue
+                library_list.append(mapped_library.targetName)
+
+        cm_fh.write(f"qt_config_compile_test({featureName(test)}\n")
+        cm_fh.write(lineify("LABEL", data.get("label", "")))
+        if librariesCmakeName != "" or len(library_list) != 0:
+            cm_fh.write("    LIBRARIES\n")
+            if librariesCmakeName != "":
+                cm_fh.write(lineify("", "${" + librariesCmakeName + "}"))
+            if len(library_list) != 0:
+                cm_fh.write("        ")
+                cm_fh.write("\n        ".join(library_list))
+                cm_fh.write("\n")
+        cm_fh.write("    CODE\n")
+        cm_fh.write('"' + sourceCode + '"')
+        if qmakeFixme != "":
+            cm_fh.write(qmakeFixme)
+        if languageStandard != "":
+            cm_fh.write(f"\n    {languageStandard}\n")
+        cm_fh.write(")\n\n")
+
+    elif data["type"] == "libclang":
+        knownTests.add(test)
+
+        cm_fh.write(f"# {test}\n")
+        lib_clang_lib = find_3rd_party_library_mapping("libclang")
+        cm_fh.write(generate_find_package_info(lib_clang_lib))
+        cm_fh.write(
+            dedent(
+                """
+        if(TARGET WrapLibClang::WrapLibClang)
+            set(TEST_libclang "ON" CACHE BOOL "Required libclang version found." FORCE)
+        endif()
+        """
+            )
+        )
+        cm_fh.write("\n")
+
+    elif data["type"] == "x86Simd":
+        knownTests.add(test)
+
+        label = data["label"]
+
+        cm_fh.write(f"# {test}\n")
+        cm_fh.write(f'qt_config_compile_test_x86simd({test} "{label}")\n')
+        cm_fh.write("\n")
+
+    #    "features": {
+    #        "android-style-assets": {
+    #            "label": "Android Style Assets",
+    #            "condition": "config.android",
+    #            "output": [ "privateFeature" ],
+    #            "comment": "This belongs into gui, but the license check needs it here already."
+    #        },
+    else:
+        print(f"    XXXX UNHANDLED TEST TYPE {data['type']} in test description")
+
+
+def parseFeature(ctx, feature, data, cm_fh):
+    # This is *before* the feature name gets normalized! So keep - and + chars, etc.
+    feature_mapping = {
+        "alloc_h": None,  # handled by alloc target
+        "alloc_malloc_h": None,
+        "alloc_stdlib_h": None,
+        "build_all": None,
+        "c11": None,
+        "c89": None,
+        "c99": None,
+        "ccache": None,
+        "compiler-flags": None,
+        "cross_compile": None,
+        "debug_and_release": None,
+        "debug": None,
+        "dlopen": {"condition": "UNIX"},
+        "doubleconversion": None,
+        "enable_gdb_index": None,
+        "enable_new_dtags": None,
+        "force_debug_info": None,
+        "framework": {"condition": "APPLE AND BUILD_SHARED_LIBS"},
+        "gc_binaries": None,
+        "gcc-sysroot": None,
+        "gcov": None,
+        "gnu-libiconv": {
+            "condition": "NOT WIN32 AND NOT QNX AND NOT ANDROID AND NOT APPLE AND TEST_posix_iconv AND NOT TEST_iconv_needlib",
+            "enable": "TEST_posix_iconv AND NOT TEST_iconv_needlib",
+            "disable": "NOT TEST_posix_iconv OR TEST_iconv_needlib",
+        },
+        "GNUmake": None,
+        "harfbuzz": {"condition": "harfbuzz_FOUND"},
+        "host-dbus": None,
+        "iconv": {
+            "condition": "NOT QT_FEATURE_icu AND QT_FEATURE_textcodec AND ( TEST_posix_iconv OR TEST_sun_iconv )"
+        },
+        "incredibuild_xge": None,
+        "jpeg": {"condition": "QT_FEATURE_imageformatplugin AND JPEG_FOUND"},
+        "ltcg": None,
+        "msvc_mp": None,
+        "optimize_debug": None,
+        "optimize_size": None,
+        # special case to enable implicit feature on WIN32, until ANGLE is ported
+        "opengl-desktop": {"autoDetect": ""},
+        # special case to disable implicit feature on WIN32, until ANGLE is ported
+        "opengl-dynamic": {"autoDetect": "OFF"},
+        "opengles2": {  # special case to disable implicit feature on WIN32, until ANGLE is ported
+            "condition": "NOT WIN32 AND ( NOT APPLE_WATCHOS AND NOT QT_FEATURE_opengl_desktop AND GLESv2_FOUND )"
+        },
+        "simulator_and_device": {"condition": "APPLE_UIKIT AND NOT QT_UIKIT_SDK"},
+        "pkg-config": None,
+        "posix_fallocate": None,  # Only needed for sqlite, which we do not want to build
+        "posix-libiconv": {
+            "condition": "NOT WIN32 AND NOT QNX AND NOT ANDROID AND NOT APPLE AND TEST_posix_iconv AND TEST_iconv_needlib",
+            "enable": "TEST_posix_iconv AND TEST_iconv_needlib",
+            "disable": "NOT TEST_posix_iconv OR NOT TEST_iconv_needlib",
+        },
+        "precompile_header": None,
+        "profile": None,
+        "qmakeargs": None,
+        "qpa_default_platform": None,  # Not a bool!
+        "release": None,
+        "release_tools": None,
+        "rpath_dir": None,  # rpath related
+        "rpath": None,
+        "sanitize_address": None,  # sanitizer
+        "sanitize_memory": None,
+        "sanitizer": None,
+        "sanitize_thread": None,
+        "sanitize_undefined": None,
+        "separate_debug_info": None,
+        "shared": None,
+        "silent": None,
+        "sql-sqlite": {"condition": "QT_FEATURE_datestring AND SQLite3_FOUND"},
+        "stack-protector-strong": None,
+        "static": None,
+        "static_runtime": None,
+        "stl": None,  # Do we really need to test for this in 2018?!
+        "strip": None,
+        "sun-libiconv": {
+            "condition": "NOT WIN32 AND NOT QNX AND NOT ANDROID AND NOT APPLE AND TEST_sun_iconv",
+            "enable": "TEST_sun_iconv",
+            "disable": "NOT TEST_sun_iconv",
+        },
+        "system-doubleconversion": None,  # No system libraries anymore!
+        "system-sqlite": None,
+        "system-xcb": None,
+        "tiff": {"condition": "QT_FEATURE_imageformatplugin AND TIFF_FOUND"},
+        "use_gold_linker": None,
+        "verifyspec": None,  # qmake specific...
+        "warnings_are_errors": None,  # FIXME: Do we need these?
+        "webp": {"condition": "QT_FEATURE_imageformatplugin AND WrapWebP_FOUND"},
+        "xkbcommon-system": None,  # another system library, just named a bit different from the rest
+    }
+
+    mapping = feature_mapping.get(feature, {})
+
+    if mapping is None:
+        print(f"    **** Skipping features {feature}: masked.")
+        return
+
+    handled = {
+        "autoDetect",
+        "comment",
+        "condition",
+        "description",
+        "disable",
+        "emitIf",
+        "enable",
+        "label",
+        "output",
+        "purpose",
+        "section",
+    }
+    label = mapping.get("label", data.get("label", ""))
+    purpose = mapping.get("purpose", data.get("purpose", data.get("description", label)))
+    autoDetect = map_condition(mapping.get("autoDetect", data.get("autoDetect", "")))
+    condition = map_condition(mapping.get("condition", data.get("condition", "")))
+    output = mapping.get("output", data.get("output", []))
+    comment = mapping.get("comment", data.get("comment", ""))
+    section = mapping.get("section", data.get("section", ""))
+    enable = map_condition(mapping.get("enable", data.get("enable", "")))
+    disable = map_condition(mapping.get("disable", data.get("disable", "")))
+    emitIf = map_condition(mapping.get("emitIf", data.get("emitIf", "")))
+
+    for k in [k for k in data.keys() if k not in handled]:
+        print(f"    XXXX UNHANDLED KEY {k} in feature description")
+
+    if not output:
+        # feature that is only used in the conditions of other features
+        output = ["internalFeature"]
+
+    publicFeature = False  # #define QT_FEATURE_featurename in public header
+    privateFeature = False  # #define QT_FEATURE_featurename in private header
+    negativeFeature = False  # #define QT_NO_featurename in public header
+    internalFeature = False  # No custom or QT_FEATURE_ defines
+    publicDefine = False  # #define MY_CUSTOM_DEFINE in public header
+    publicConfig = False  # add to CONFIG in public pri file
+    privateConfig = False  # add to CONFIG in private pri file
+    publicQtConfig = False  # add to QT_CONFIG in public pri file
+
+    for o in output:
+        outputType = o
+        if isinstance(o, dict):
+            outputType = o["type"]
+
+        if outputType in ["varAssign", "varAppend", "varRemove"]:
+            continue
+        elif outputType == "define":
+            publicDefine = True
+        elif outputType == "feature":
+            negativeFeature = True
+        elif outputType == "publicFeature":
+            publicFeature = True
+        elif outputType == "privateFeature":
+            privateFeature = True
+        elif outputType == "internalFeature":
+            internalFeature = True
+        elif outputType == "publicConfig":
+            publicConfig = True
+        elif outputType == "privateConfig":
+            privateConfig = True
+        elif outputType == "publicQtConfig":
+            publicQtConfig = True
+        else:
+            print(f"    XXXX UNHANDLED OUTPUT TYPE {outputType} in feature {feature}.")
+            continue
+
+    if not any(
+        [
+            publicFeature,
+            privateFeature,
+            internalFeature,
+            publicDefine,
+            negativeFeature,
+            publicConfig,
+            privateConfig,
+            publicQtConfig,
+        ]
+    ):
+        print(f"    **** Skipping feature {feature}: Not relevant for C++.")
+        return
+
+    normalized_feature_name = featureName(feature)
+
+    def writeFeature(
+        name,
+        publicFeature=False,
+        privateFeature=False,
+        labelAppend="",
+        superFeature=None,
+        autoDetect="",
+    ):
+        if comment:
+            cm_fh.write(f"# {comment}\n")
+
+        cm_fh.write(f'qt_feature("{name}"')
+        if publicFeature:
+            cm_fh.write(" PUBLIC")
+        if privateFeature:
+            cm_fh.write(" PRIVATE")
+        cm_fh.write("\n")
+
+        cm_fh.write(lineify("SECTION", section))
+        cm_fh.write(lineify("LABEL", label + labelAppend))
+        if purpose != label:
+            cm_fh.write(lineify("PURPOSE", purpose))
+        cm_fh.write(lineify("AUTODETECT", autoDetect, quote=False))
+        if superFeature:
+            feature_condition = f"QT_FEATURE_{superFeature}"
+        else:
+            feature_condition = condition
+        cm_fh.write(lineify("CONDITION", feature_condition, quote=False))
+        cm_fh.write(lineify("ENABLE", enable, quote=False))
+        cm_fh.write(lineify("DISABLE", disable, quote=False))
+        cm_fh.write(lineify("EMIT_IF", emitIf, quote=False))
+        cm_fh.write(")\n")
+
+    # Write qt_feature() calls before any qt_feature_definition() calls
+
+    # Default internal feature case.
+    featureCalls = {}
+    featureCalls[feature] = {"name": feature, "labelAppend": "", "autoDetect": autoDetect}
+
+    # Go over all outputs to compute the number of features that have to be declared
+    for o in output:
+        outputType = o
+        name = feature
+
+        # The label append is to provide a unique label for features that have more than one output
+        # with different names.
+        labelAppend = ""
+
+        if isinstance(o, dict):
+            outputType = o["type"]
+            if "name" in o:
+                name = o["name"]
+                labelAppend = f": {o['name']}"
+
+        if outputType not in ["feature", "publicFeature", "privateFeature"]:
+            continue
+        if name not in featureCalls:
+            featureCalls[name] = {"name": name, "labelAppend": labelAppend}
+
+        if name != feature:
+            featureCalls[name]["superFeature"] = normalized_feature_name
+
+        if outputType in ["feature", "publicFeature"]:
+            featureCalls[name]["publicFeature"] = True
+        elif outputType == "privateFeature":
+            featureCalls[name]["privateFeature"] = True
+        elif outputType == "publicConfig":
+            featureCalls[name]["publicConfig"] = True
+        elif outputType == "privateConfig":
+            featureCalls[name]["privateConfig"] = True
+        elif outputType == "publicQtConfig":
+            featureCalls[name]["publicQtConfig"] = True
+
+    # Write the qt_feature() calls from the computed feature map
+    for _, args in featureCalls.items():
+        writeFeature(**args)
+
+    # Write qt_feature_definition() calls
+    for o in output:
+        outputType = o
+        outputArgs = {}
+        if isinstance(o, dict):
+            outputType = o["type"]
+            outputArgs = o
+
+        # Map negative feature to define:
+        if outputType == "feature":
+            outputType = "define"
+            outputArgs = {
+                "name": f"QT_NO_{normalized_feature_name.upper()}",
+                "negative": True,
+                "value": 1,
+                "type": "define",
+            }
+
+        if outputType != "define":
+            continue
+
+        if outputArgs.get("name") is None:
+            print(f"    XXXX DEFINE output without name in feature {feature}.")
+            continue
+
+        out_name = outputArgs.get("name")
+        cm_fh.write(f'qt_feature_definition("{feature}" "{out_name}"')
+        if outputArgs.get("negative", False):
+            cm_fh.write(" NEGATE")
+        if outputArgs.get("value") is not None:
+            cm_fh.write(f' VALUE "{outputArgs.get("value")}"')
+        cm_fh.write(")\n")
+
+    # Write qt_feature_config() calls
+    for o in output:
+        outputType = o
+        name = feature
+        modified_name = name
+
+        outputArgs = {}
+        if isinstance(o, dict):
+            outputType = o["type"]
+            outputArgs = o
+            if "name" in o:
+                modified_name = o["name"]
+
+        if outputType not in ["publicConfig", "privateConfig", "publicQtConfig"]:
+            continue
+
+        config_type = ""
+        if outputType == "publicConfig":
+            config_type = "QMAKE_PUBLIC_CONFIG"
+        elif outputType == "privateConfig":
+            config_type = "QMAKE_PRIVATE_CONFIG"
+        elif outputType == "publicQtConfig":
+            config_type = "QMAKE_PUBLIC_QT_CONFIG"
+
+        if not config_type:
+            print("    XXXX config output without type in feature {}.".format(feature))
+            continue
+
+        cm_fh.write('qt_feature_config("{}" {}'.format(name, config_type))
+        if outputArgs.get("negative", False):
+            cm_fh.write("\n    NEGATE")
+        if modified_name != name:
+            cm_fh.write("\n")
+            cm_fh.write(lineify("NAME", modified_name, quote=True))
+
+        cm_fh.write(")\n")
+
+
+def processInputs(ctx, data, cm_fh):
+    print("  inputs:")
+    if "commandline" not in data:
+        return
+
+    commandLine = data["commandline"]
+    if "options" not in commandLine:
+        return
+
+    for input_option in commandLine["options"]:
+        parseInput(ctx, input_option, commandLine["options"][input_option], cm_fh)
+
+
+def processTests(ctx, data, cm_fh):
+    print("  tests:")
+    if "tests" not in data:
+        return
+
+    for test in data["tests"]:
+        parseTest(ctx, test, data["tests"][test], cm_fh)
+
+
+def processFeatures(ctx, data, cm_fh):
+    print("  features:")
+    if "features" not in data:
+        return
+
+    for feature in data["features"]:
+        parseFeature(ctx, feature, data["features"][feature], cm_fh)
+
+
+def processLibraries(ctx, data, cm_fh):
+    cmake_find_packages_set = set()
+    print("  libraries:")
+    if "libraries" not in data:
+        return
+
+    for lib in data["libraries"]:
+        parseLib(ctx, lib, data, cm_fh, cmake_find_packages_set)
+
+
+def processSubconfigs(path, ctx, data):
+    assert ctx is not None
+    if "subconfigs" in data:
+        for subconf in data["subconfigs"]:
+            subconfDir = posixpath.join(path, subconf)
+            subconfData = readJsonFromDir(subconfDir)
+            subconfCtx = ctx
+            processJson(subconfDir, subconfCtx, subconfData)
+
+
+def processJson(path, ctx, data):
+    ctx["module"] = data.get("module", "global")
+    ctx["test_dir"] = data.get("testDir", "")
+
+    ctx = processFiles(ctx, data)
+
+    with open(posixpath.join(path, "configure.cmake"), "w") as cm_fh:
+        cm_fh.write("\n\n#### Inputs\n\n")
+
+        processInputs(ctx, data, cm_fh)
+
+        cm_fh.write("\n\n#### Libraries\n\n")
+
+        processLibraries(ctx, data, cm_fh)
+
+        cm_fh.write("\n\n#### Tests\n\n")
+
+        processTests(ctx, data, cm_fh)
+
+        cm_fh.write("\n\n#### Features\n\n")
+
+        processFeatures(ctx, data, cm_fh)
+
+        if ctx.get("module") == "global":
+            cm_fh.write(
+                '\nqt_extra_definition("QT_VERSION_STR" "\\"${PROJECT_VERSION}\\"" PUBLIC)\n'
+            )
+            cm_fh.write('qt_extra_definition("QT_VERSION_MAJOR" ${PROJECT_VERSION_MAJOR} PUBLIC)\n')
+            cm_fh.write('qt_extra_definition("QT_VERSION_MINOR" ${PROJECT_VERSION_MINOR} PUBLIC)\n')
+            cm_fh.write('qt_extra_definition("QT_VERSION_PATCH" ${PROJECT_VERSION_PATCH} PUBLIC)\n')
+
+    # do this late:
+    processSubconfigs(path, ctx, data)
+
+
+def main():
+    if len(sys.argv) != 2:
+        print("This scripts needs one directory to process!")
+        quit(1)
+
+    directory = sys.argv[1]
+
+    print(f"Processing: {directory}.")
+
+    data = readJsonFromDir(directory)
+    processJson(directory, {}, data)
+
+
+if __name__ == "__main__":
+    main()
diff --git a/util/cmake/generate_module_map.sh b/util/cmake/generate_module_map.sh
new file mode 100755
index 0000000000..1ca0bfc43c
--- /dev/null
+++ b/util/cmake/generate_module_map.sh
@@ -0,0 +1,38 @@
+#!/usr/bin/bash
+#############################################################################
+##
+## Copyright (C) 2018 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the plugins of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:GPL-EXCEPT$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 as published by the Free Software
+## Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+pro_files=$(find . -name \*.pro)
+
+for f in ${pro_files}; do
+    if grep "^load(qt_module)" "${f}" > /dev/null ; then
+        target=$(grep "TARGET" "${f}" | cut -d'=' -f2 | sed -e "s/\s*//g")
+        module=$(basename ${f})
+        echo "'${module%.pro}': '${target}',"
+    fi
+done
diff --git a/util/cmake/helper.py b/util/cmake/helper.py
new file mode 100644
index 0000000000..9b9f347fff
--- /dev/null
+++ b/util/cmake/helper.py
@@ -0,0 +1,773 @@
+#############################################################################
+##
+## Copyright (C) 2018 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the plugins of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:GPL-EXCEPT$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 as published by the Free Software
+## Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+import re
+import typing
+
+
+class LibraryMapping:
+    def __init__(
+        self,
+        soName: str,
+        packageName: typing.Optional[str],
+        targetName: typing.Optional[str],
+        *,
+        resultVariable: typing.Optional[str] = None,
+        extra: typing.List[str] = [],
+        appendFoundSuffix: bool = True,
+        emit_if: str = "",
+        is_bundled_with_qt: bool = False,
+    ) -> None:
+        self.soName = soName
+        self.packageName = packageName
+        self.resultVariable = resultVariable
+        self.appendFoundSuffix = appendFoundSuffix
+        self.extra = extra
+        self.targetName = targetName
+
+        # True if qt bundles the library sources as part of Qt.
+        self.is_bundled_with_qt = is_bundled_with_qt
+
+        # if emit_if is non-empty, the generated find_package call
+        # for a library will be surrounded by this condition.
+        self.emit_if = emit_if
+
+    def is_qt(self) -> bool:
+        return self.packageName == "Qt" or self.packageName == "Qt5" or self.packageName == "Qt6"
+
+
+_qt_library_map = [
+    # Qt:
+    LibraryMapping(
+        "accessibility_support",
+        "Qt6",
+        "Qt::AccessibilitySupport",
+        extra=["COMPONENTS", "AccessibilitySupport"],
+    ),
+    LibraryMapping(
+        "androidextras", "Qt6", "Qt::AndroidExtras", extra=["COMPONENTS", "AndroidExtras"]
+    ),
+    LibraryMapping("animation", "Qt6", "Qt::3DAnimation", extra=["COMPONENTS", "3DAnimation"]),
+    LibraryMapping(
+        "application-lib", "Qt6", "Qt::AppManApplication", extra=["COMPONENTS", "AppManApplication"]
+    ),
+    LibraryMapping("bluetooth", "Qt6", "Qt::Bluetooth", extra=["COMPONENTS", "Bluetooth"]),
+    LibraryMapping("bootstrap", "Qt6", "Qt::Bootstrap", extra=["COMPONENTS", "Bootstrap"]),
+    # bootstrap-dbus: Not needed in Qt6!
+    LibraryMapping("client", "Qt6", "Qt::WaylandClient", extra=["COMPONENTS", "WaylandClient"]),
+    LibraryMapping(
+        "clipboard_support", "Qt6", "Qt::ClipboardSupport", extra=["COMPONENTS", "ClipboardSupport"]
+    ),
+    LibraryMapping("coap", "Qt6", "Qt::Coap", extra=["COMPONENTS", "Coap"]),
+    LibraryMapping("common-lib", "Qt6", "Qt::AppManCommon", extra=["COMPONENTS", "AppManCommon"]),
+    LibraryMapping(
+        "compositor", "Qt6", "Qt::WaylandCompositor", extra=["COMPONENTS", "WaylandCompositor"]
+    ),
+    LibraryMapping("concurrent", "Qt6", "Qt::Concurrent", extra=["COMPONENTS", "Concurrent"]),
+    LibraryMapping("container", "Qt6", "Qt::AxContainer", extra=["COMPONENTS", "AxContainer"]),
+    LibraryMapping("control", "Qt6", "Qt::AxServer", extra=["COMPONENTS", "AxServer"]),
+    LibraryMapping(
+        "core_headers", "Qt6", "Qt::WebEngineCore", extra=["COMPONENTS", "WebEngineCore"]
+    ),
+    LibraryMapping("core", "Qt6", "Qt::Core", extra=["COMPONENTS", "Core"]),
+    LibraryMapping("coretest", "Qt6", "Qt::3DCoreTest", extra=["COMPONENTS", "3DCoreTest"]),
+    LibraryMapping("crypto-lib", "Qt6", "Qt::AppManCrypto", extra=["COMPONENTS", "AppManCrypto"]),
+    LibraryMapping("dbus", "Qt6", "Qt::DBus", extra=["COMPONENTS", "DBus"]),
+    LibraryMapping("designer", "Qt6", "Qt::Designer", extra=["COMPONENTS", "Designer"]),
+    LibraryMapping(
+        "designercomponents",
+        "Qt6",
+        "Qt::DesignerComponents",
+        extra=["COMPONENTS", "DesignerComponents"],
+    ),
+    LibraryMapping(
+        "devicediscovery",
+        "Qt6",
+        "Qt::DeviceDiscoverySupport",
+        extra=["COMPONENTS", "DeviceDiscoverySupport"],
+    ),
+    LibraryMapping(
+        "devicediscovery_support",
+        "Qt6",
+        "Qt::DeviceDiscoverySupport",
+        extra=["COMPONENTS", "DeviceDiscoverySupport"],
+    ),
+    LibraryMapping("edid", "Qt6", "Qt::EdidSupport", extra=["COMPONENTS", "EdidSupport"]),
+    LibraryMapping("edid_support", "Qt6", "Qt::EdidSupport", extra=["COMPONENTS", "EdidSupport"]),
+    LibraryMapping("eglconvenience", "Qt6", "Qt::EglSupport", extra=["COMPONENTS", "EglSupport"]),
+    LibraryMapping(
+        "eglfsdeviceintegration",
+        "Qt6",
+        "Qt::EglFSDeviceIntegration",
+        extra=["COMPONENTS", "EglFSDeviceIntegration"],
+    ),
+    LibraryMapping(
+        "eglfs_kms_support", "Qt6", "Qt::EglFsKmsSupport", extra=["COMPONENTS", "EglFsKmsSupport"]
+    ),
+    LibraryMapping("egl_support", "Qt6", "Qt::EglSupport", extra=["COMPONENTS", "EglSupport"]),
+    # enginio: Not needed in Qt6!
+    LibraryMapping(
+        "eventdispatchers",
+        "Qt6",
+        "Qt::EventDispatcherSupport",
+        extra=["COMPONENTS", "EventDispatcherSupport"],
+    ),
+    LibraryMapping(
+        "eventdispatcher_support",
+        "Qt6",
+        "Qt::EventDispatcherSupport",
+        extra=["COMPONENTS", "EventDispatcherSupport"],
+    ),
+    LibraryMapping("extras", "Qt6", "Qt::3DExtras", extra=["COMPONENTS", "3DExtras"]),
+    LibraryMapping("fbconvenience", "Qt6", "Qt::FbSupport", extra=["COMPONENTS", "FbSupport"]),
+    LibraryMapping("fb_support", "Qt6", "Qt::FbSupport", extra=["COMPONENTS", "FbSupport"]),
+    LibraryMapping(
+        "fontdatabase_support",
+        "Qt6",
+        "Qt::FontDatabaseSupport",
+        extra=["COMPONENTS", "FontDatabaseSupport"],
+    ),
+    LibraryMapping("gamepad", "Qt6", "Qt::Gamepad", extra=["COMPONENTS", "Gamepad"]),
+    LibraryMapping(
+        "global", "Qt6", "Qt::Core", extra=["COMPONENTS", "Core"]
+    ),  # manually added special case
+    LibraryMapping("glx_support", "Qt6", "Qt::GlxSupport", extra=["COMPONENTS", "GlxSupport"]),
+    LibraryMapping(
+        "graphics_support", "Qt6", "Qt::GraphicsSupport", extra=["COMPONENTS", "GraphicsSupport"]
+    ),
+    LibraryMapping(
+        "gsttools", "Qt6", "Qt::MultimediaGstTools", extra=["COMPONENTS", "MultimediaGstTools"]
+    ),
+    LibraryMapping("gui", "Qt6", "Qt::Gui", extra=["COMPONENTS", "Gui"]),
+    LibraryMapping("help", "Qt6", "Qt::Help", extra=["COMPONENTS", "Help"]),
+    LibraryMapping(
+        "hunspellinputmethod",
+        "Qt6",
+        "Qt::HunspellInputMethod",
+        extra=["COMPONENTS", "HunspellInputMethod"],
+    ),
+    LibraryMapping("input", "Qt6", "Qt::InputSupport", extra=["COMPONENTS", "InputSupport"]),
+    LibraryMapping(
+        "input_support", "Qt6", "Qt::InputSupport", extra=["COMPONENTS", "InputSupport"]
+    ),
+    LibraryMapping(
+        "installer-lib", "Qt6", "Qt::AppManInstaller", extra=["COMPONENTS", "AppManInstaller"]
+    ),
+    LibraryMapping("knx", "Qt6", "Qt::Knx", extra=["COMPONENTS", "Knx"]),
+    LibraryMapping("kmsconvenience", "Qt6", "Qt::KmsSupport", extra=["COMPONENTS", "KmsSupport"]),
+    LibraryMapping("kms_support", "Qt6", "Qt::KmsSupport", extra=["COMPONENTS", "KmsSupport"]),
+    LibraryMapping(
+        "launcher-lib", "Qt6", "Qt::AppManLauncher", extra=["COMPONENTS", "AppManLauncher"]
+    ),
+    LibraryMapping("lib", "Qt6", "Qt::Designer", extra=["COMPONENTS", "Designer"]),
+    LibraryMapping(
+        "linuxaccessibility_support",
+        "Qt6",
+        "Qt::LinuxAccessibilitySupport",
+        extra=["COMPONENTS", "LinuxAccessibilitySupport"],
+    ),
+    LibraryMapping("location", "Qt6", "Qt::Location", extra=["COMPONENTS", "Location"]),
+    LibraryMapping("logic", "Qt6", "Qt::3DLogic", extra=["COMPONENTS", "3DLogic"]),
+    LibraryMapping("macextras", "Qt6", "Qt::MacExtras", extra=["COMPONENTS", "MacExtras"]),
+    LibraryMapping("main-lib", "Qt6", "Qt::AppManMain", extra=["COMPONENTS", "AppManMain"]),
+    LibraryMapping(
+        "manager-lib", "Qt6", "Qt::AppManManager", extra=["COMPONENTS", "AppManManager"]
+    ),
+    LibraryMapping(
+        "monitor-lib", "Qt6", "Qt::AppManMonitor", extra=["COMPONENTS", "AppManMonitor"]
+    ),
+    LibraryMapping("mqtt", "Qt6", "Qt::Mqtt", extra=["COMPONENTS", "Mqtt"]),
+    LibraryMapping("multimedia", "Qt6", "Qt::Multimedia", extra=["COMPONENTS", "Multimedia"]),
+    LibraryMapping(
+        "multimediawidgets",
+        "Qt6",
+        "Qt::MultimediaWidgets",
+        extra=["COMPONENTS", "MultimediaWidgets"],
+    ),
+    LibraryMapping("network", "Qt6", "Qt::Network", extra=["COMPONENTS", "Network"]),
+    LibraryMapping("networkauth", "Qt6", "Qt::NetworkAuth", extra=["COMPONENTS", "NetworkAuth"]),
+    LibraryMapping("nfc", "Qt6", "Qt::Nfc", extra=["COMPONENTS", "Nfc"]),
+    LibraryMapping("oauth", "Qt6", "Qt::NetworkAuth", extra=["COMPONENTS", "NetworkAuth"]),
+    LibraryMapping(
+        "openglextensions", "Qt6", "Qt::OpenGLExtensions", extra=["COMPONENTS", "OpenGLExtensions"]
+    ),
+    LibraryMapping("opengl", "Qt6", "Qt::OpenGL", extra=["COMPONENTS", "OpenGL"]),
+    LibraryMapping("openglwidgets", "Qt6", "Qt::OpenGLWidgets", extra=["COMPONENTS", "OpenGLWidgets"]),
+    LibraryMapping(
+        "package-lib", "Qt6", "Qt::AppManPackage", extra=["COMPONENTS", "AppManPackage"]
+    ),
+    LibraryMapping(
+        "packetprotocol", "Qt6", "Qt::PacketProtocol", extra=["COMPONENTS", "PacketProtocol"]
+    ),
+    LibraryMapping(
+        "particles", "Qt6", "Qt::QuickParticles", extra=["COMPONENTS", "QuickParticles"]
+    ),
+    LibraryMapping(
+        "platformcompositor",
+        "Qt6",
+        "Qt::PlatformCompositorSupport",
+        extra=["COMPONENTS", "PlatformCompositorSupport"],
+    ),
+    LibraryMapping(
+        "platformcompositor_support",
+        "Qt6",
+        "Qt::PlatformCompositorSupport",
+        extra=["COMPONENTS", "PlatformCompositorSupport"],
+    ),
+    LibraryMapping(
+        "plugin-interfaces",
+        "Qt6",
+        "Qt::AppManPluginInterfaces",
+        extra=["COMPONENTS", "AppManPluginInterfaces"],
+    ),
+    LibraryMapping("positioning", "Qt6", "Qt::Positioning", extra=["COMPONENTS", "Positioning"]),
+    LibraryMapping(
+        "positioningquick", "Qt6", "Qt::PositioningQuick", extra=["COMPONENTS", "PositioningQuick"]
+    ),
+    LibraryMapping("printsupport", "Qt6", "Qt::PrintSupport", extra=["COMPONENTS", "PrintSupport"]),
+    LibraryMapping("purchasing", "Qt6", "Qt::Purchasing", extra=["COMPONENTS", "Purchasing"]),
+    LibraryMapping("qmldebug", "Qt6", "Qt::QmlDebug", extra=["COMPONENTS", "QmlDebug"]),
+    LibraryMapping("qmldevtools", "Qt6", "Qt::QmlDevTools", extra=["COMPONENTS", "QmlDevTools"]),
+    LibraryMapping("qml", "Qt6", "Qt::Qml", extra=["COMPONENTS", "Qml"]),
+    LibraryMapping("qmlmodels", "Qt6", "Qt::QmlModels", extra=["COMPONENTS", "QmlModels"]),
+    LibraryMapping("qmltest", "Qt6", "Qt::QuickTest", extra=["COMPONENTS", "QuickTest"]),
+    LibraryMapping(
+        "qtmultimediaquicktools",
+        "Qt6",
+        "Qt::MultimediaQuick",
+        extra=["COMPONENTS", "MultimediaQuick"],
+    ),
+    LibraryMapping(
+        "quick3dassetimport",
+        "Qt6",
+        "Qt::Quick3DAssetImport",
+        extra=["COMPONENTS", "Quick3DAssetImport"],
+    ),
+    LibraryMapping("quick3d", "Qt6", "Qt::Quick3D", extra=["COMPONENTS", "Quick3D"]),
+    LibraryMapping(
+        "quick3drender", "Qt6", "Qt::Quick3DRender", extra=["COMPONENTS", "Quick3DRender"]
+    ),
+    LibraryMapping(
+        "quick3druntimerender",
+        "Qt6",
+        "Qt::Quick3DRuntimeRender",
+        extra=["COMPONENTS", "Quick3DRuntimeRender"],
+    ),
+    LibraryMapping("quick3dutils", "Qt6", "Qt::Quick3DUtils", extra=["COMPONENTS", "Quick3DUtils"]),
+    LibraryMapping(
+        "quickcontrols2", "Qt6", "Qt::QuickControls2", extra=["COMPONENTS", "QuickControls2"]
+    ),
+    LibraryMapping("quick", "Qt6", "Qt::Quick", extra=["COMPONENTS", "Quick"]),
+    LibraryMapping("quickshapes", "Qt6", "Qt::QuickShapes", extra=["COMPONENTS", "QuickShapes"]),
+    LibraryMapping(
+        "quicktemplates2", "Qt6", "Qt::QuickTemplates2", extra=["COMPONENTS", "QuickTemplates2"]
+    ),
+    LibraryMapping("quickwidgets", "Qt6", "Qt::QuickWidgets", extra=["COMPONENTS", "QuickWidgets"]),
+    LibraryMapping("render", "Qt6", "Qt::3DRender", extra=["COMPONENTS", "3DRender"]),
+    LibraryMapping(
+        "remoteobjects", "Qt6", "Qt::RemoteObjects", extra=["COMPONENTS", "RemoteObjects"]
+    ),
+    LibraryMapping("script", "Qt6", "Qt::Script", extra=["COMPONENTS", "Script"]),
+    LibraryMapping("scripttools", "Qt6", "Qt::ScriptTools", extra=["COMPONENTS", "ScriptTools"]),
+    LibraryMapping("scxml", "Qt6", "Qt::Scxml", extra=["COMPONENTS", "Scxml"]),
+    LibraryMapping("sensors", "Qt6", "Qt::Sensors", extra=["COMPONENTS", "Sensors"]),
+    LibraryMapping("serialport", "Qt6", "Qt::SerialPort", extra=["COMPONENTS", "SerialPort"]),
+    LibraryMapping("serialbus", "Qt6", "Qt::SerialBus", extra=["COMPONENTS", "SerialBus"]),
+    LibraryMapping("services", "Qt6", "Qt::ServiceSupport", extra=["COMPONENTS", "ServiceSupport"]),
+    LibraryMapping(
+        "service_support", "Qt6", "Qt::ServiceSupport", extra=["COMPONENTS", "ServiceSupport"]
+    ),
+    LibraryMapping("shadertools", "Qt6", "Qt::ShaderTools", extra=["COMPONENTS", "ShaderTools"]),
+    LibraryMapping("sql", "Qt6", "Qt::Sql", extra=["COMPONENTS", "Sql"]),
+    LibraryMapping("svg", "Qt6", "Qt::Svg", extra=["COMPONENTS", "Svg"]),
+    LibraryMapping("testlib", "Qt6", "Qt::Test", extra=["COMPONENTS", "Test"]),
+    LibraryMapping("texttospeech", "Qt6", "Qt::TextToSpeech", extra=["COMPONENTS", "TextToSpeech"]),
+    LibraryMapping(
+        "theme_support", "Qt6", "Qt::ThemeSupport", extra=["COMPONENTS", "ThemeSupport"]
+    ),
+    LibraryMapping("tts", "Qt6", "Qt::TextToSpeech", extra=["COMPONENTS", "TextToSpeech"]),
+    LibraryMapping("uiplugin", "Qt6", "Qt::UiPlugin", extra=["COMPONENTS", "UiPlugin"]),
+    LibraryMapping("uitools", "Qt6", "Qt::UiTools", extra=["COMPONENTS", "UiTools"]),
+    LibraryMapping(
+        "virtualkeyboard", "Qt6", "Qt::VirtualKeyboard", extra=["COMPONENTS", "VirtualKeyboard"]
+    ),
+    LibraryMapping(
+        "vulkan_support", "Qt6", "Qt::VulkanSupport", extra=["COMPONENTS", "VulkanSupport"]
+    ),
+    LibraryMapping(
+        "waylandclient", "Qt6", "Qt::WaylandClient", extra=["COMPONENTS", "WaylandClient"]
+    ),
+    LibraryMapping(
+        "waylandcompositor",
+        "Qt6",
+        "Qt::WaylandCompositor",
+        extra=["COMPONENTS", "WaylandCompositor"],
+    ),
+    LibraryMapping("webchannel", "Qt6", "Qt::WebChannel", extra=["COMPONENTS", "WebChannel"]),
+    LibraryMapping("webengine", "Qt6", "Qt::WebEngine", extra=["COMPONENTS", "WebEngine"]),
+    LibraryMapping(
+        "webenginewidgets", "Qt6", "Qt::WebEngineWidgets", extra=["COMPONENTS", "WebEngineWidgets"]
+    ),
+    LibraryMapping("websockets", "Qt6", "Qt::WebSockets", extra=["COMPONENTS", "WebSockets"]),
+    LibraryMapping("webview", "Qt6", "Qt::WebView", extra=["COMPONENTS", "WebView"]),
+    LibraryMapping("widgets", "Qt6", "Qt::Widgets", extra=["COMPONENTS", "Widgets"]),
+    LibraryMapping("window-lib", "Qt6", "Qt::AppManWindow", extra=["COMPONENTS", "AppManWindow"]),
+    LibraryMapping(
+        "windowsuiautomation_support",
+        "Qt6",
+        "Qt::WindowsUIAutomationSupport",
+        extra=["COMPONENTS", "WindowsUIAutomationSupport"],
+    ),
+    LibraryMapping("winextras", "Qt6", "Qt::WinExtras", extra=["COMPONENTS", "WinExtras"]),
+    LibraryMapping("x11extras", "Qt6", "Qt::X11Extras", extra=["COMPONENTS", "X11Extras"]),
+    LibraryMapping("xcb_qpa_lib", "Qt6", "Qt::XcbQpa", extra=["COMPONENTS", "XcbQpa"]),
+    LibraryMapping(
+        "xkbcommon_support", "Qt6", "Qt::XkbCommonSupport", extra=["COMPONENTS", "XkbCommonSupport"]
+    ),
+    LibraryMapping("xmlpatterns", "Qt6", "Qt::XmlPatterns", extra=["COMPONENTS", "XmlPatterns"]),
+    LibraryMapping("xml", "Qt6", "Qt::Xml", extra=["COMPONENTS", "Xml"]),
+    LibraryMapping(
+        "qmlworkerscript", "Qt6", "Qt::QmlWorkerScript", extra=["COMPONENTS", "QmlWorkerScript"]
+    ),
+    LibraryMapping(
+        "quickparticles", "Qt6", "Qt::QuickParticles", extra=["COMPONENTS", "QuickParticles"]
+    ),
+    LibraryMapping(
+        "linuxofono_support",
+        "Qt6",
+        "Qt::LinuxOfonoSupport",
+        extra=["COMPONENTS", "LinuxOfonoSupport"],
+    ),
+    LibraryMapping(
+        "linuxofono_support_private",
+        "Qt6",
+        "Qt::LinuxOfonoSupportPrivate",
+        extra=["COMPONENTS", "LinuxOfonoSupportPrivate"],
+    ),
+    LibraryMapping("tools", "Qt6", "Qt::Tools", extra=["COMPONENTS", "Tools"]),
+    LibraryMapping("axcontainer", "Qt6", "Qt::AxContainer", extra=["COMPONENTS", "AxContainer"]),
+    LibraryMapping(
+        "webkitwidgets", "Qt6", "Qt::WebKitWidgets", extra=["COMPONENTS", "WebKitWidgets"]
+    ),
+    LibraryMapping(
+        "zlib", "Qt6", "Qt::Zlib", extra=["COMPONENTS", "Zlib"]
+    )
+]
+
+# Note that the library map is adjusted dynamically further down.
+_library_map = [
+    # 3rd party:
+    LibraryMapping("atspi", "ATSPI2", "PkgConfig::ATSPI2"),
+    LibraryMapping("bluez", "BlueZ", "PkgConfig::BlueZ"),
+    LibraryMapping("corewlan", None, None),
+    LibraryMapping("cups", "Cups", "Cups::Cups"),
+    LibraryMapping("directfb", "DirectFB", "PkgConfig::DirectFB"),
+    LibraryMapping("db2", "DB2", "DB2::DB2"),
+    LibraryMapping("dbus", "WrapDBus1", "dbus-1", resultVariable="DBus1"),
+    LibraryMapping("doubleconversion", None, None),
+    LibraryMapping("drm", "Libdrm", "Libdrm::Libdrm"),
+    LibraryMapping("egl", "EGL", "EGL::EGL"),
+    LibraryMapping("flite", "Flite", "Flite::Flite"),
+    LibraryMapping("flite_alsa", "ALSA", "ALSA::ALSA"),
+    LibraryMapping(
+        "fontconfig", "Fontconfig", "Fontconfig::Fontconfig", resultVariable="FONTCONFIG"
+    ),
+    LibraryMapping(
+        "freetype",
+        "WrapFreetype",
+        "WrapFreetype::WrapFreetype",
+        extra=["REQUIRED"],
+        is_bundled_with_qt=True,
+    ),
+    LibraryMapping("gbm", "gbm", "gbm::gbm"),
+    LibraryMapping("glib", "GLIB2", "GLIB2::GLIB2"),
+    LibraryMapping("gnu_iconv", None, None),
+    LibraryMapping("gtk3", "GTK3", "PkgConfig::GTK3"),
+    LibraryMapping("gssapi", "GSSAPI", "GSSAPI::GSSAPI"),
+    LibraryMapping(
+        "harfbuzz", "WrapHarfbuzz", "WrapHarfbuzz::WrapHarfbuzz", is_bundled_with_qt=True
+    ),
+    LibraryMapping("host_dbus", None, None),
+    LibraryMapping(
+        "icu", "ICU", "ICU::i18n ICU::uc ICU::data", extra=["COMPONENTS", "i18n", "uc", "data"]
+    ),
+    LibraryMapping("journald", "Libsystemd", "PkgConfig::Libsystemd"),
+    LibraryMapping("jpeg", "JPEG", "JPEG::JPEG"),  # see also libjpeg
+    LibraryMapping("libatomic", "Atomic", "Atomic"),
+    LibraryMapping("libclang", "WrapLibClang", "WrapLibClang::WrapLibClang"),
+    LibraryMapping("libdl", None, "${CMAKE_DL_LIBS}"),
+    LibraryMapping("libinput", "Libinput", "Libinput::Libinput"),
+    LibraryMapping("libjpeg", "JPEG", "JPEG::JPEG"),  # see also jpeg
+    LibraryMapping("libpng", "WrapPNG", "WrapPNG::WrapPNG", is_bundled_with_qt=True),
+    LibraryMapping("libproxy", "Libproxy", "PkgConfig::Libproxy"),
+    LibraryMapping("librt", "WrapRt", "WrapRt"),
+    LibraryMapping("libudev", "Libudev", "PkgConfig::Libudev"),
+    LibraryMapping("lttng-ust", "LTTngUST", "LTTng::UST", resultVariable="LTTNGUST"),
+    LibraryMapping("mtdev", "Mtdev", "PkgConfig::Mtdev"),
+    LibraryMapping("mysql", "MySQL", "MySQL::MySQL"),
+    LibraryMapping("odbc", "ODBC", "ODBC::ODBC"),
+    LibraryMapping("opengl_es2", "GLESv2", "GLESv2::GLESv2"),
+    LibraryMapping("opengl", "OpenGL", "OpenGL::GL", resultVariable="OpenGL_OpenGL"),
+    LibraryMapping(
+        "openssl_headers",
+        "OpenSSL",
+        "OpenSSL::SSL_nolink",
+        resultVariable="OPENSSL_INCLUDE_DIR",
+        appendFoundSuffix=False,
+    ),
+    LibraryMapping("openssl", "OpenSSL", "OpenSSL::SSL"),
+    LibraryMapping("oci", "Oracle", "Oracle::OCI"),
+    LibraryMapping(
+        "pcre2", "WrapPCRE2", "WrapPCRE2::WrapPCRE2", extra=["REQUIRED"], is_bundled_with_qt=True
+    ),
+    LibraryMapping("posix_iconv", None, None),
+    LibraryMapping("pps", "PPS", "PPS::PPS"),
+    LibraryMapping("psql", "PostgreSQL", "PostgreSQL::PostgreSQL"),
+    LibraryMapping("slog2", "Slog2", "Slog2::Slog2"),
+    LibraryMapping("speechd", "SpeechDispatcher", "SpeechDispatcher::SpeechDispatcher"),
+    LibraryMapping("sqlite2", None, None),  # No more sqlite2 support in Qt6!
+    LibraryMapping("sqlite3", "SQLite3", "SQLite::SQLite3"),
+    LibraryMapping("sun_iconv", None, None),
+    LibraryMapping("tslib", "Tslib", "PkgConfig::Tslib"),
+    LibraryMapping("udev", "Libudev", "PkgConfig::Libudev"),
+    LibraryMapping("udev", "Libudev", "PkgConfig::Libudev"),  # see also libudev!
+    LibraryMapping("vulkan", "Vulkan", "Vulkan::Vulkan"),
+    LibraryMapping("wayland_server", "Wayland", "Wayland::Server"),  # used in qtbase/src/gui
+    LibraryMapping("wayland-server", "Wayland", "Wayland::Server"),  # used in qtwayland
+    LibraryMapping("wayland-client", "Wayland", "Wayland::Client"),
+    LibraryMapping("wayland-cursor", "Wayland", "Wayland::Cursor"),
+    LibraryMapping("wayland-egl", "Wayland", "Wayland::Egl"),
+    LibraryMapping(
+        "wayland-kms", "Waylandkms", "PkgConfig::Waylandkms"
+    ),  # TODO: check if this actually works
+    LibraryMapping("x11", "X11", "X11::X11"),
+    LibraryMapping("x11sm", "X11", "${X11_SM_LIB} ${X11_ICE_LIB}", resultVariable="X11_SM"),
+    LibraryMapping(
+        "xcb",
+        "XCB",
+        "XCB::XCB",
+        extra=["1.9"],
+        resultVariable="TARGET XCB::XCB",
+        appendFoundSuffix=False,
+    ),
+    LibraryMapping(
+        "xcb_glx", "XCB", "XCB::GLX", extra=["COMPONENTS", "GLX"], resultVariable="XCB_GLX"
+    ),
+    LibraryMapping(
+        "xcb_icccm", "XCB", "XCB::ICCCM", extra=["COMPONENTS", "ICCCM"], resultVariable="XCB_ICCCM"
+    ),
+    LibraryMapping(
+        "xcb_image", "XCB", "XCB::IMAGE", extra=["COMPONENTS", "IMAGE"], resultVariable="XCB_IMAGE"
+    ),
+    LibraryMapping(
+        "xcb_keysyms",
+        "XCB",
+        "XCB::KEYSYMS",
+        extra=["COMPONENTS", "KEYSYMS"],
+        resultVariable="XCB_KEYSYMS",
+    ),
+    LibraryMapping(
+        "xcb_randr", "XCB", "XCB::RANDR", extra=["COMPONENTS", "RANDR"], resultVariable="XCB_RANDR"
+    ),
+    LibraryMapping(
+        "xcb_render",
+        "XCB",
+        "XCB::RENDER",
+        extra=["COMPONENTS", "RENDER"],
+        resultVariable="XCB_RENDER",
+    ),
+    LibraryMapping(
+        "xcb_renderutil",
+        "XCB",
+        "XCB::RENDERUTIL",
+        extra=["COMPONENTS", "RENDERUTIL"],
+        resultVariable="XCB_RENDERUTIL",
+    ),
+    LibraryMapping(
+        "xcb_shape", "XCB", "XCB::SHAPE", extra=["COMPONENTS", "SHAPE"], resultVariable="XCB_SHAPE"
+    ),
+    LibraryMapping(
+        "xcb_shm", "XCB", "XCB::SHM", extra=["COMPONENTS", "SHM"], resultVariable="XCB_SHM"
+    ),
+    LibraryMapping(
+        "xcb_sync", "XCB", "XCB::SYNC", extra=["COMPONENTS", "SYNC"], resultVariable="XCB_SYNC"
+    ),
+    LibraryMapping(
+        "xcb_xfixes",
+        "XCB",
+        "XCB::XFIXES",
+        extra=["COMPONENTS", "XFIXES"],
+        resultVariable="XCB_XFIXES",
+    ),
+    LibraryMapping(
+        "xcb_xinerama",
+        "XCB",
+        "XCB::XINERAMA",
+        extra=["COMPONENTS", "XINERAMA"],
+        resultVariable="XCB_XINERAMA",
+    ),
+    LibraryMapping(
+        "xcb_xinput",
+        "XCB",
+        "XCB::XINPUT",
+        extra=["COMPONENTS", "XINPUT"],
+        resultVariable="XCB_XINPUT",
+    ),
+    LibraryMapping(
+        "xcb_xkb", "XCB", "XCB::XKB", extra=["COMPONENTS", "XKB"], resultVariable="XCB_XKB"
+    ),
+    LibraryMapping("xcb_xlib", "X11_XCB", "X11::XCB"),
+    LibraryMapping("xcomposite", "XComposite", "PkgConfig::XComposite"),
+    LibraryMapping("xkbcommon_evdev", "XKB", "XKB::XKB", extra=["0.4.1"]),  # see also xkbcommon
+    LibraryMapping("xkbcommon_x11", "XKB_COMMON_X11", "PkgConfig::XKB_COMMON_X11", extra=["0.4.1"]),
+    LibraryMapping("xkbcommon", "XKB", "XKB::XKB", extra=["0.4.1"]),
+    LibraryMapping("xlib", "X11", "X11::X11"),
+    LibraryMapping("xrender", "XRender", "PkgConfig::XRender"),
+    LibraryMapping("zlib", "ZLIB", "ZLIB::ZLIB"),
+    LibraryMapping("zstd", "ZSTD", "ZSTD::ZSTD"),
+    LibraryMapping("tiff", "TIFF", "TIFF::TIFF"),
+    LibraryMapping("webp", "WrapWebP", "WrapWebP::WrapWebP"),
+    LibraryMapping("jasper", "WrapJasper", "WrapJasper::WrapJasper"),
+    LibraryMapping("sdl2", "WrapSDL2", "WrapSDL2::WrapSDL2"),
+    LibraryMapping("assimp", "WrapAssimp", "WrapAssimp::WrapAssimp", extra=["5"]),
+]
+
+
+def _adjust_library_map():
+    # Assign a Linux condition on all x and wayland related packages.
+    # We don't want to get pages of package not found messages on
+    # Windows and macOS, and this also improves configure time on
+    # those platforms.
+    linux_package_prefixes = ["xcb", "x11", "xkb", "xrender", "xlib", "wayland"]
+    for i, _ in enumerate(_library_map):
+        if any([_library_map[i].soName.startswith(p) for p in linux_package_prefixes]):
+            _library_map[i].emit_if = "config.linux"
+
+
+_adjust_library_map()
+
+
+def find_3rd_party_library_mapping(soName: str) -> typing.Optional[LibraryMapping]:
+    for i in _library_map:
+        if i.soName == soName:
+            return i
+    return None
+
+
+def find_qt_library_mapping(soName: str) -> typing.Optional[LibraryMapping]:
+    for i in _qt_library_map:
+        if i.soName == soName:
+            return i
+    return None
+
+
+def find_library_info_for_target(targetName: str) -> typing.Optional[LibraryMapping]:
+    qt_target = targetName
+    if targetName.endswith("Private"):
+        qt_target = qt_target[:-7]
+
+    for i in _qt_library_map:
+        if i.targetName == qt_target:
+            return i
+
+    for i in _library_map:
+        if i.targetName == targetName:
+            return i
+
+    return None
+
+
+def featureName(name: str) -> str:
+    replacement_char = "_"
+    if name.startswith("c++"):
+        replacement_char = "x"
+    return re.sub(r"[^a-zA-Z0-9_]", replacement_char, name)
+
+
+def map_qt_library(lib: str) -> str:
+    private = False
+    if lib.endswith("-private"):
+        private = True
+        lib = lib[:-8]
+    mapped = find_qt_library_mapping(lib)
+    qt_name = lib
+    if mapped:
+        assert mapped.targetName  # Qt libs must have a target name set
+        qt_name = mapped.targetName
+    if private:
+        qt_name += "Private"
+    return qt_name
+
+
+platform_mapping = {
+    "win32": "WIN32",
+    "win": "WIN32",
+    "unix": "UNIX",
+    "darwin": "APPLE",
+    "linux": "LINUX",
+    "integrity": "INTEGRITY",
+    "qnx": "QNX",
+    "vxworks": "VXWORKS",
+    "hpux": "HPUX",
+    "nacl": "NACL",
+    "android": "ANDROID",
+    "android-embedded": "ANDROID_EMBEDDED",
+    "uikit": "APPLE_UIKIT",
+    "tvos": "APPLE_TVOS",
+    "watchos": "APPLE_WATCHOS",
+    "winrt": "WINRT",
+    "wasm": "WASM",
+    "emscripten": "EMSCRIPTEN",
+    "msvc": "MSVC",
+    "clang": "CLANG",
+    "gcc": "GCC",
+    "icc": "ICC",
+    "intel_icc": "ICC",
+    "osx": "APPLE_OSX",
+    "ios": "APPLE_IOS",
+    "freebsd": "FREEBSD",
+    "openbsd": "OPENBSD",
+    "netbsd": "NETBSD",
+    "haiku": "HAIKU",
+    "netbsd": "NETBSD",
+    "mac": "APPLE",
+    "macx": "APPLE_OSX",
+    "macos": "APPLE_OSX",
+    "macx-icc": "(APPLE_OSX AND ICC)",
+}
+
+
+def map_platform(platform: str) -> str:
+    """ Return the qmake platform as cmake platform or the unchanged string. """
+    return platform_mapping.get(platform, platform)
+
+
+def is_known_3rd_party_library(lib: str) -> bool:
+    if lib.endswith("/nolink") or lib.endswith("_nolink"):
+        lib = lib[:-7]
+    mapping = find_3rd_party_library_mapping(lib)
+
+    return mapping is not None
+
+
+def map_3rd_party_library(lib: str) -> str:
+    libpostfix = ""
+    if lib.endswith("/nolink"):
+        lib = lib[:-7]
+        libpostfix = "_nolink"
+    mapping = find_3rd_party_library_mapping(lib)
+    if not mapping or not mapping.targetName:
+        return lib
+    return mapping.targetName + libpostfix
+
+
+def generate_find_package_info(
+    lib: LibraryMapping,
+    use_qt_find_package: bool = True,
+    *,
+    indent: int = 0,
+    emit_if: str = "",
+    use_system_package_name: bool = False,
+) -> str:
+    isRequired = False
+
+    extra = lib.extra.copy()
+
+    if "REQUIRED" in extra and use_qt_find_package:
+        isRequired = True
+        extra.remove("REQUIRED")
+
+    cmake_target_name = lib.targetName
+    assert cmake_target_name
+
+    # _nolink or not does not matter at this point:
+    if cmake_target_name.endswith("_nolink") or cmake_target_name.endswith("/nolink"):
+        cmake_target_name = cmake_target_name[:-7]
+
+    initial_package_name = lib.packageName
+    package_name = initial_package_name
+    if use_system_package_name:
+        replace_args = ["Wrap", "WrapSystem"]
+        package_name = package_name.replace(*replace_args)
+        cmake_target_name = cmake_target_name.replace(*replace_args)
+
+    if cmake_target_name and use_qt_find_package:
+        extra += ["PROVIDED_TARGETS", cmake_target_name]
+
+    result = ""
+    one_ind = "    "
+    ind = one_ind * indent
+
+    if use_qt_find_package:
+        if extra:
+            result = f"{ind}qt_find_package({package_name} {' '.join(extra)})\n"
+        else:
+            result = f"{ind}qt_find_package({package_name})\n"
+
+        if isRequired:
+            result += (
+                f"{ind}set_package_properties({initial_package_name} PROPERTIES TYPE REQUIRED)\n"
+            )
+    else:
+        if extra:
+            result = f"{ind}find_package({package_name} {' '.join(extra)})\n"
+        else:
+            result = f"{ind}find_package({package_name})\n"
+
+    # If a package should be found only in certain conditions, wrap
+    # the find_package call within that condition.
+    if emit_if:
+        result = f"if(({emit_if}) OR QT_FIND_ALL_PACKAGES_ALWAYS)\n{one_ind}{result}endif()\n"
+
+    return result
+
+
+def _set_up_py_parsing_nicer_debug_output(pp):
+    indent = -1
+
+    def increase_indent(fn):
+        def wrapper_function(*args):
+            nonlocal indent
+            indent += 1
+            print("> " * indent, end="")
+            return fn(*args)
+
+        return wrapper_function
+
+    def decrease_indent(fn):
+        def wrapper_function(*args):
+            nonlocal indent
+            print("> " * indent, end="")
+            indent -= 1
+            return fn(*args)
+
+        return wrapper_function
+
+    pp._defaultStartDebugAction = increase_indent(pp._defaultStartDebugAction)
+    pp._defaultSuccessDebugAction = decrease_indent(pp._defaultSuccessDebugAction)
+    pp._defaultExceptionDebugAction = decrease_indent(pp._defaultExceptionDebugAction)
diff --git a/util/cmake/json_parser.py b/util/cmake/json_parser.py
new file mode 100644
index 0000000000..a0aaecab9d
--- /dev/null
+++ b/util/cmake/json_parser.py
@@ -0,0 +1,101 @@
+#!/usr/bin/env python3
+#############################################################################
+##
+## Copyright (C) 2019 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the plugins of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:GPL-EXCEPT$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 as published by the Free Software
+## Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+import pyparsing as pp  # type: ignore
+import json
+import re
+from helper import _set_up_py_parsing_nicer_debug_output
+
+_set_up_py_parsing_nicer_debug_output(pp)
+
+
+class QMakeSpecificJSONParser:
+    def __init__(self, *, debug: bool = False) -> None:
+        self.debug = debug
+        self.grammar = self.create_py_parsing_grammar()
+
+    def create_py_parsing_grammar(self):
+        # Keep around all whitespace.
+        pp.ParserElement.setDefaultWhitespaceChars("")
+
+        def add_element(name: str, value: pp.ParserElement):
+            nonlocal self
+            if self.debug:
+                value.setName(name)
+                value.setDebug()
+            return value
+
+        # Our grammar is pretty simple. We want to remove all newlines
+        # inside quoted strings, to make the quoted strings JSON
+        # compliant. So our grammar should skip to the first quote while
+        # keeping everything before it as-is, process the quoted string
+        # skip to the next quote, and repeat that until the end of the
+        # file.
+
+        EOF = add_element("EOF", pp.StringEnd())
+        SkipToQuote = add_element("SkipToQuote", pp.SkipTo('"'))
+        SkipToEOF = add_element("SkipToEOF", pp.SkipTo(EOF))
+
+        def remove_newlines_and_whitespace_in_quoted_string(tokens):
+            first_string = tokens[0]
+            replaced_string = re.sub(r"\n[ ]*", " ", first_string)
+            return replaced_string
+
+        QuotedString = add_element(
+            "QuotedString", pp.QuotedString(quoteChar='"', multiline=True, unquoteResults=False)
+        )
+        QuotedString.setParseAction(remove_newlines_and_whitespace_in_quoted_string)
+
+        QuotedTerm = add_element("QuotedTerm", pp.Optional(SkipToQuote) + QuotedString)
+        Grammar = add_element("Grammar", pp.OneOrMore(QuotedTerm) + SkipToEOF)
+
+        return Grammar
+
+    def parse_file_using_py_parsing(self, file: str):
+        print(f'Pre processing "{file}" using py parsing to remove incorrect newlines.')
+        try:
+            with open(file, "r") as file_fd:
+                contents = file_fd.read()
+
+            parser_result = self.grammar.parseString(contents, parseAll=True)
+            token_list = parser_result.asList()
+            joined_string = "".join(token_list)
+
+            return joined_string
+        except pp.ParseException as pe:
+            print(pe.line)
+            print(" " * (pe.col - 1) + "^")
+            print(pe)
+            raise pe
+
+    def parse(self, file: str):
+        pre_processed_string = self.parse_file_using_py_parsing(file)
+        print(f'Parsing "{file}" using json.loads().')
+        json_parsed = json.loads(pre_processed_string)
+        return json_parsed
diff --git a/util/cmake/pro2cmake.py b/util/cmake/pro2cmake.py
new file mode 100755
index 0000000000..52569b43cf
--- /dev/null
+++ b/util/cmake/pro2cmake.py
@@ -0,0 +1,4151 @@
+#!/usr/bin/env python3
+#############################################################################
+##
+## Copyright (C) 2018 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the plugins of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:GPL-EXCEPT$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 as published by the Free Software
+## Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+
+from __future__ import annotations
+
+import copy
+import os.path
+import posixpath
+import sys
+import re
+import io
+import glob
+
+from condition_simplifier import simplify_condition
+from condition_simplifier_cache import set_condition_simplified_cache_enabled
+
+import pyparsing as pp  # type: ignore
+import xml.etree.ElementTree as ET
+
+from argparse import ArgumentParser
+from textwrap import dedent
+from textwrap import indent as textwrap_indent
+from functools import lru_cache
+from shutil import copyfile
+from collections import defaultdict
+from typing import (
+    List,
+    Optional,
+    Dict,
+    Set,
+    IO,
+    Union,
+    Any,
+    Callable,
+    FrozenSet,
+    Tuple,
+    Match,
+    Type,
+)
+
+from qmake_parser import parseProFile
+from special_case_helper import SpecialCaseHandler
+from helper import (
+    map_qt_library,
+    map_3rd_party_library,
+    is_known_3rd_party_library,
+    featureName,
+    map_platform,
+    find_library_info_for_target,
+    generate_find_package_info,
+    LibraryMapping,
+)
+
+
+cmake_version_string = "3.15.0"
+cmake_api_version = 2
+
+
+def _parse_commandline():
+    parser = ArgumentParser(
+        description="Generate CMakeLists.txt files from ." "pro files.",
+        epilog="Requirements: pip install -r requirements.txt",
+    )
+    parser.add_argument(
+        "--debug", dest="debug", action="store_true", help="Turn on all debug output"
+    )
+    parser.add_argument(
+        "--debug-parser",
+        dest="debug_parser",
+        action="store_true",
+        help="Print debug output from qmake parser.",
+    )
+    parser.add_argument(
+        "--debug-parse-result",
+        dest="debug_parse_result",
+        action="store_true",
+        help="Dump the qmake parser result.",
+    )
+    parser.add_argument(
+        "--debug-parse-dictionary",
+        dest="debug_parse_dictionary",
+        action="store_true",
+        help="Dump the qmake parser result as dictionary.",
+    )
+    parser.add_argument(
+        "--debug-pro-structure",
+        dest="debug_pro_structure",
+        action="store_true",
+        help="Dump the structure of the qmake .pro-file.",
+    )
+    parser.add_argument(
+        "--debug-full-pro-structure",
+        dest="debug_full_pro_structure",
+        action="store_true",
+        help="Dump the full structure of the qmake .pro-file " "(with includes).",
+    )
+    parser.add_argument(
+        "--debug-special-case-preservation",
+        dest="debug_special_case_preservation",
+        action="store_true",
+        help="Show all git commands and file copies.",
+    )
+
+    parser.add_argument(
+        "--is-example",
+        action="store_true",
+        dest="is_example",
+        help="Treat the input .pro file as an example.",
+    )
+    parser.add_argument(
+        "-s",
+        "--skip-special-case-preservation",
+        dest="skip_special_case_preservation",
+        action="store_true",
+        help="Skips behavior to reapply " "special case modifications (requires git in PATH)",
+    )
+    parser.add_argument(
+        "-k",
+        "--keep-temporary-files",
+        dest="keep_temporary_files",
+        action="store_true",
+        help="Don't automatically remove CMakeLists.gen.txt and other " "intermediate files.",
+    )
+
+    parser.add_argument(
+        "-e",
+        "--skip-condition-cache",
+        dest="skip_condition_cache",
+        action="store_true",
+        help="Don't use condition simplifier cache (conversion speed may decrease).",
+    )
+
+    parser.add_argument(
+        "--skip-subdirs-project",
+        dest="skip_subdirs_project",
+        action="store_true",
+        help="Skip converting project if it ends up being a TEMPLATE=subdirs project.",
+    )
+
+    parser.add_argument(
+        "-i",
+        "--ignore-skip-marker",
+        dest="ignore_skip_marker",
+        action="store_true",
+        help="If set, pro file will be converted even if skip marker is found in CMakeLists.txt.",
+    )
+
+    parser.add_argument(
+        "--api-version",
+        dest="api_version",
+        type=int,
+        help="Specify which cmake api version should be generated. 1 or 2, 2 is latest.",
+    )
+
+    parser.add_argument(
+        "files",
+        metavar="<.pro/.pri file>",
+        type=str,
+        nargs="+",
+        help="The .pro/.pri file to process",
+    )
+    return parser.parse_args()
+
+
+def is_top_level_repo_project(project_file_path: str = "") -> bool:
+    qmake_conf_path = find_qmake_conf(project_file_path)
+    qmake_conf_dir_path = os.path.dirname(qmake_conf_path)
+    project_dir_path = os.path.dirname(project_file_path)
+    return qmake_conf_dir_path == project_dir_path
+
+
+def is_top_level_repo_tests_project(project_file_path: str = "") -> bool:
+    qmake_conf_path = find_qmake_conf(project_file_path)
+    qmake_conf_dir_path = os.path.dirname(qmake_conf_path)
+    project_dir_path = os.path.dirname(project_file_path)
+    project_dir_name = os.path.basename(project_dir_path)
+    maybe_same_level_dir_path = os.path.join(project_dir_path, "..")
+    normalized_maybe_same_level_dir_path = os.path.normpath(maybe_same_level_dir_path)
+    return (
+        qmake_conf_dir_path == normalized_maybe_same_level_dir_path and project_dir_name == "tests"
+    )
+
+
+def is_top_level_repo_examples_project(project_file_path: str = "") -> bool:
+    qmake_conf_path = find_qmake_conf(project_file_path)
+    qmake_conf_dir_path = os.path.dirname(qmake_conf_path)
+    project_dir_path = os.path.dirname(project_file_path)
+    project_dir_name = os.path.basename(project_dir_path)
+    maybe_same_level_dir_path = os.path.join(project_dir_path, "..")
+    normalized_maybe_same_level_dir_path = os.path.normpath(maybe_same_level_dir_path)
+    return (
+        qmake_conf_dir_path == normalized_maybe_same_level_dir_path
+        and project_dir_name == "examples"
+    )
+
+
+def is_example_project(project_file_path: str = "") -> bool:
+    qmake_conf_path = find_qmake_conf(project_file_path)
+    qmake_conf_dir_path = os.path.dirname(qmake_conf_path)
+
+    project_relative_path = os.path.relpath(project_file_path, qmake_conf_dir_path)
+    # If the project file is found in a subdir called 'examples'
+    # relative to the repo source dir, then it must be an example, but
+    # some examples contain 3rdparty libraries that do not need to be
+    # built as examples.
+    return project_relative_path.startswith("examples") and "3rdparty" not in project_relative_path
+
+
+def is_config_test_project(project_file_path: str = "") -> bool:
+    qmake_conf_path = find_qmake_conf(project_file_path)
+    qmake_conf_dir_path = os.path.dirname(qmake_conf_path)
+    dir_name_with_qmake_confg = os.path.basename(qmake_conf_dir_path)
+
+    project_relative_path = os.path.relpath(project_file_path, qmake_conf_dir_path)
+    # If the project file is found in a subdir called 'config.tests'
+    # relative to the repo source dir, then it's probably a config test.
+    # Also if the .qmake.conf is found within config.tests dir (like in qtbase)
+    # then the project is probably a config .test
+    return (
+        project_relative_path.startswith("config.tests")
+        or dir_name_with_qmake_confg == "config.tests"
+    )
+
+
+def is_benchmark_project(project_file_path: str = "") -> bool:
+    qmake_conf_path = find_qmake_conf(project_file_path)
+    qmake_conf_dir_path = os.path.dirname(qmake_conf_path)
+
+    project_relative_path = os.path.relpath(project_file_path, qmake_conf_dir_path)
+    # If the project file is found in a subdir called 'tests/benchmarks'
+    # relative to the repo source dir, then it must be a benchmark
+    return project_relative_path.startswith("tests/benchmarks")
+
+
+def is_manual_test_project(project_file_path: str = "") -> bool:
+    qmake_conf_path = find_qmake_conf(project_file_path)
+    qmake_conf_dir_path = os.path.dirname(qmake_conf_path)
+
+    project_relative_path = os.path.relpath(project_file_path, qmake_conf_dir_path)
+    # If the project file is found in a subdir called 'tests/manual'
+    # relative to the repo source dir, then it must be a manual test
+    return project_relative_path.startswith("tests/manual")
+
+
+@lru_cache(maxsize=None)
+def find_qmake_conf(project_file_path: str = "") -> str:
+    if not os.path.isabs(project_file_path):
+        print(
+            f"Warning: could not find .qmake.conf file, given path is not an "
+            f"absolute path: {project_file_path}"
+        )
+        return ""
+
+    cwd = os.path.dirname(project_file_path)
+    file_name = ".qmake.conf"
+
+    while os.path.isdir(cwd):
+        maybe_file = posixpath.join(cwd, file_name)
+        if os.path.isfile(maybe_file):
+            return maybe_file
+        else:
+            last_cwd = cwd
+            cwd = os.path.dirname(cwd)
+            if last_cwd == cwd:
+                # reached the top level directory, stop looking
+                break
+
+    print(f"Warning: could not find .qmake.conf file")
+    return ""
+
+
+def set_up_cmake_api_calls():
+    def nested_dict():
+        return defaultdict(nested_dict)
+
+    api = nested_dict()
+
+    api[1]["qt_extend_target"] = "extend_target"
+    api[1]["qt_add_module"] = "add_qt_module"
+    api[1]["qt_add_plugin"] = "add_qt_plugin"
+    api[1]["qt_add_tool"] = "add_qt_tool"
+    api[1]["qt_add_test"] = "add_qt_test"
+    api[1]["qt_add_test_helper"] = "add_qt_test_helper"
+    api[1]["qt_add_manual_test"] = "add_qt_manual_test"
+    api[1]["qt_add_benchmark"] = "add_qt_benchmark"
+    api[1]["qt_add_executable"] = "add_qt_executable"
+    api[1]["qt_add_simd_part"] = "add_qt_simd_part"
+    api[1]["qt_add_docs"] = "add_qt_docs"
+    api[1]["qt_add_resource"] = "add_qt_resource"
+    api[1]["qt_add_qml_module"] = "add_qml_module"
+    api[1]["qt_add_cmake_library"] = "add_cmake_library"
+
+    api[2]["qt_extend_target"] = "qt_extend_target"
+    api[2]["qt_add_module"] = "qt_add_module"
+    api[2]["qt_add_plugin"] = "qt_add_plugin"
+    api[2]["qt_add_tool"] = "qt_add_tool"
+    api[2]["qt_add_test"] = "qt_add_test"
+    api[2]["qt_add_test_helper"] = "qt_add_test_helper"
+    api[2]["qt_add_manual_test"] = "qt_add_manual_test"
+    api[2]["qt_add_benchmark"] = "qt_add_benchmark"
+    api[2]["qt_add_executable"] = "qt_add_executable"
+    api[2]["qt_add_simd_part"] = "qt_add_simd_part"
+    api[2]["qt_add_docs"] = "qt_add_docs"
+    api[2]["qt_add_resource"] = "qt_add_resource"
+    api[2]["qt_add_qml_module"] = "qt_add_qml_module"
+    api[2]["qt_add_cmake_library"] = "qt_add_cmake_library"
+    api[2]["qt_add_3rdparty_library"] = "qt_add_3rdparty_library"
+
+    return api
+
+
+cmake_api_calls = set_up_cmake_api_calls()
+
+
+def detect_cmake_api_version_used_in_file_content(project_file_path: str) -> Optional[int]:
+    dir_path = os.path.dirname(project_file_path)
+    cmake_project_path = os.path.join(dir_path, "CMakeLists.txt")
+
+    # If file doesn't exist, None implies default version selected by
+    # script.
+    if not os.path.exists(cmake_project_path):
+        return None
+
+    with open(cmake_project_path, "r") as file_fd:
+        contents = file_fd.read()
+
+        new_api_calls = [api_call for api_call in cmake_api_calls[2]]
+        new_api_calls_alternatives = "|".join(new_api_calls)
+        match = re.search(new_api_calls_alternatives, contents)
+
+        # If new style found, return latest api version. Otherwise
+        # the old version.
+        if match:
+            return 2
+        else:
+            return 1
+
+
+def get_cmake_api_call(api_name: str, api_version: Optional[int] = None) -> str:
+    if not api_version:
+        global cmake_api_version
+        api_version = cmake_api_version
+    if not cmake_api_calls[api_version][api_name]:
+        raise RuntimeError(f"No CMake API call {api_name} of version {api_version} found.")
+
+    return cmake_api_calls[api_version][api_name]
+
+
+def process_qrc_file(
+    target: str,
+    filepath: str,
+    base_dir: str = "",
+    project_file_path: str = "",
+    skip_qtquick_compiler: bool = False,
+    retain_qtquick_compiler: bool = False,
+    is_example: bool = False,
+) -> str:
+    assert target
+
+    # Hack to handle QT_SOURCE_TREE. Assume currently that it's the same
+    # as the qtbase source path.
+    qt_source_tree_literal = "${QT_SOURCE_TREE}"
+    if qt_source_tree_literal in filepath:
+        qmake_conf = find_qmake_conf(project_file_path)
+
+        if qmake_conf:
+            qt_source_tree = os.path.dirname(qmake_conf)
+            filepath = filepath.replace(qt_source_tree_literal, qt_source_tree)
+        else:
+            print(
+                f"Warning, could not determine QT_SOURCE_TREE location while trying "
+                f"to find: {filepath}"
+            )
+
+    resource_name = os.path.splitext(os.path.basename(filepath))[0]
+    dir_name = os.path.dirname(filepath)
+    base_dir = posixpath.join("" if base_dir == "." else base_dir, dir_name)
+
+    # Small not very thorough check to see if this a shared qrc resource
+    # pattern is mostly used by the tests.
+    is_parent_path = dir_name.startswith("..")
+    if not os.path.isfile(filepath):
+        raise RuntimeError(f"Invalid file path given to process_qrc_file: {filepath}")
+
+    tree = ET.parse(filepath)
+    root = tree.getroot()
+    assert root.tag == "RCC"
+
+    output = ""
+
+    resource_count = 0
+    for resource in root:
+        assert resource.tag == "qresource"
+        lang = resource.get("lang", "")
+        prefix = resource.get("prefix", "/")
+        if not prefix.startswith("/"):
+            prefix = f"/{prefix}"
+
+        full_resource_name = resource_name + (str(resource_count) if resource_count > 0 else "")
+
+        files: Dict[str, str] = {}
+        for file in resource:
+            path = file.text
+            assert path
+
+            # Get alias:
+            alias = file.get("alias", "")
+            # In cases where examples use shared resources, we set the alias
+            # too the same name of the file, or the applications won't be
+            # be able to locate the resource
+            if not alias and is_parent_path:
+                alias = path
+            files[path] = alias
+
+        output += write_add_qt_resource_call(
+            target,
+            full_resource_name,
+            prefix,
+            base_dir,
+            lang,
+            files,
+            skip_qtquick_compiler,
+            retain_qtquick_compiler,
+            is_example,
+        )
+        resource_count += 1
+
+    return output
+
+
+def write_add_qt_resource_call(
+    target: str,
+    resource_name: str,
+    prefix: Optional[str],
+    base_dir: str,
+    lang: Optional[str],
+    files: Dict[str, str],
+    skip_qtquick_compiler: bool,
+    retain_qtquick_compiler: bool,
+    is_example: bool,
+) -> str:
+    output = ""
+
+    sorted_files = sorted(files.keys())
+
+    assert sorted_files
+
+    for source in sorted_files:
+        alias = files[source]
+        if alias:
+            full_source = posixpath.join(base_dir, source)
+            output += dedent(
+                f"""\
+                set_source_files_properties("{full_source}"
+                    PROPERTIES QT_RESOURCE_ALIAS "{alias}"
+                )
+            """
+            )
+
+    # Quote file paths in case there are spaces.
+    sorted_files_backup = sorted_files
+    sorted_files = []
+    for source in sorted_files_backup:
+        if source.startswith("${"):
+            sorted_files.append(source)
+        else:
+            sorted_files.append(f'"{source}"')
+
+    file_list = "\n            ".join(sorted_files)
+    output += dedent(
+        f"""\
+        set({resource_name}_resource_files
+            {file_list}
+        )\n
+        """
+    )
+    file_list = f"${{{resource_name}_resource_files}}"
+    if skip_qtquick_compiler:
+        output += (
+            f"set_source_files_properties(${{{resource_name}_resource_files}}"
+            " PROPERTIES QT_SKIP_QUICKCOMPILER 1)\n\n"
+        )
+
+    if retain_qtquick_compiler:
+        output += (
+            f"set_source_files_properties(${{{resource_name}_resource_files}}"
+            "PROPERTIES QT_RETAIN_QUICKCOMPILER 1)\n\n"
+        )
+
+    params = ""
+    if lang:
+        params += f'{spaces(1)}LANG\n{spaces(2)}"{lang}"\n'
+    params += f'{spaces(1)}PREFIX\n{spaces(2)}"{prefix}"\n'
+    if base_dir:
+        params += f'{spaces(1)}BASE\n{spaces(2)}"{base_dir}"\n'
+    add_resource_command = ""
+    if is_example:
+        add_resource_command = "qt6_add_resources"
+    else:
+        add_resource_command = get_cmake_api_call("qt_add_resource")
+    output += (
+        f'{add_resource_command}({target} "{resource_name}"\n{params}{spaces(1)}FILES\n'
+        f"{spaces(2)}{file_list}\n)\n"
+    )
+
+    return output
+
+
+class QmlDirFileInfo:
+    def __init__(self, file_path: str, type_name: str) -> None:
+        self.file_path = file_path
+        self.version = ""
+        self.type_name = type_name
+        self.internal = False
+        self.singleton = False
+        self.path = ""
+
+
+class QmlDir:
+    def __init__(self) -> None:
+        self.module = ""
+        self.plugin_name = ""
+        self.plugin_path = ""
+        self.classname = ""
+        self.imports: List[str] = []
+        self.type_names: Dict[str, QmlDirFileInfo] = {}
+        self.type_infos: List[str] = []
+        self.depends: List[Tuple[str, str]] = []
+        self.designer_supported = False
+
+    def __str__(self) -> str:
+        type_infos_line = "    \n".join(self.type_infos)
+        imports_line = "    \n".join(self.imports)
+        string = f"""\
+            module: {self.module}
+            plugin: {self.plugin_name} {self.plugin_path}
+            classname: {self.classname}
+            type_infos:{type_infos_line}
+            imports:{imports_line}
+            dependends:
+            """
+        for dep in self.depends:
+            string += f"    {dep[0]} {dep[1]}\n"
+        string += f"designer supported: {self.designer_supported}\n"
+        string += "type_names:\n"
+        for key in self.type_names:
+            file_info = self.type_names[key]
+            string += (
+                f"    type:{file_info.type_name} "
+                f"version:{file_info.version} "
+                f"path:{file_info.file_path} "
+                f"internal:{file_info.internal} "
+                f"singleton:{file_info.singleton}\n"
+            )
+        return string
+
+    def get_or_create_file_info(self, path: str, type_name: str) -> QmlDirFileInfo:
+        if path not in self.type_names:
+            self.type_names[path] = QmlDirFileInfo(path, type_name)
+        qmldir_file = self.type_names[path]
+        if qmldir_file.type_name != type_name:
+            raise RuntimeError("Registered qmldir file type_name does not match.")
+        return qmldir_file
+
+    def handle_file_internal(self, type_name: str, path: str):
+        qmldir_file = self.get_or_create_file_info(path, type_name)
+        qmldir_file.internal = True
+
+    def handle_file_singleton(self, type_name: str, version: str, path: str):
+        qmldir_file = self.handle_file(type_name, version, path)
+        qmldir_file.singleton = True
+
+    def handle_file(self, type_name: str, version: str, path: str) -> QmlDirFileInfo:
+        qmldir_file = self.get_or_create_file_info(path, type_name)
+        qmldir_file.version = version
+        qmldir_file.type_name = type_name
+        qmldir_file.path = path
+        return qmldir_file
+
+    def from_lines(self, lines: List[str]):
+        for line in lines:
+            self.handle_line(line)
+
+    def from_file(self, path: str):
+        f = open(path, "r")
+        if not f:
+            raise RuntimeError(f"Failed to open qmldir file at: {path}")
+        for line in f:
+            self.handle_line(line)
+
+    def handle_line(self, line: str):
+        if line.startswith("#"):
+            return
+        line = line.strip().replace("\n", "")
+        if len(line) == 0:
+            return
+
+        entries = line.split(" ")
+        if len(entries) == 0:
+            raise RuntimeError("Unexpected QmlDir file line entry")
+        if entries[0] == "module":
+            self.module = entries[1]
+        elif entries[0] == "[singleton]":
+            self.handle_file_singleton(entries[1], entries[2], entries[3])
+        elif entries[0] == "internal":
+            self.handle_file_internal(entries[1], entries[2])
+        elif entries[0] == "plugin":
+            self.plugin_name = entries[1]
+            if len(entries) > 2:
+                self.plugin_path = entries[2]
+        elif entries[0] == "classname":
+            self.classname = entries[1]
+        elif entries[0] == "typeinfo":
+            self.type_infos.append(entries[1])
+        elif entries[0] == "depends":
+            self.depends.append((entries[1], entries[2]))
+        elif entries[0] == "designersupported":
+            self.designer_supported = True
+        elif entries[0] == "import":
+            self.imports.append(entries[1])
+        elif len(entries) == 3:
+            self.handle_file(entries[0], entries[1], entries[2])
+        else:
+            raise RuntimeError(f"Uhandled qmldir entry {line}")
+
+
+def spaces(indent: int) -> str:
+    return "    " * indent
+
+
+def trim_leading_dot(file: str) -> str:
+    while file.startswith("./"):
+        file = file[2:]
+    return file
+
+
+def map_to_file(f: str, scope: Scope, *, is_include: bool = False) -> str:
+    assert "$$" not in f
+
+    if f.startswith("${"):  # Some cmake variable is prepended
+        return f
+
+    base_dir = scope.currentdir if is_include else scope.basedir
+    f = posixpath.join(base_dir, f)
+
+    return trim_leading_dot(f)
+
+
+def handle_vpath(source: str, base_dir: str, vpath: List[str]) -> str:
+    assert "$$" not in source
+
+    if not source:
+        return ""
+
+    if not vpath:
+        return source
+
+    if os.path.exists(os.path.join(base_dir, source)):
+        return source
+
+    variable_pattern = re.compile(r"\$\{[A-Za-z0-9_]+\}")
+    match = re.match(variable_pattern, source)
+    if match:
+        # a complex, variable based path, skipping validation
+        # or resolving
+        return source
+
+    for v in vpath:
+        fullpath = posixpath.join(v, source)
+        if os.path.exists(fullpath):
+            return trim_leading_dot(posixpath.relpath(fullpath, base_dir))
+
+    print(f"    XXXX: Source {source}: Not found.")
+    return f"{source}-NOTFOUND"
+
+
+class Operation:
+    def __init__(self, value: Union[List[str], str], line_no: int = -1) -> None:
+        if isinstance(value, list):
+            self._value = value
+        else:
+            self._value = [str(value)]
+        self._line_no = line_no
+
+    def process(
+        self, key: str, sinput: List[str], transformer: Callable[[List[str]], List[str]]
+    ) -> List[str]:
+        assert False
+
+    def __repr__(self):
+        assert False
+
+    def _dump(self):
+        if not self._value:
+            return "<NOTHING>"
+
+        if not isinstance(self._value, list):
+            return "<NOT A LIST>"
+
+        result = []
+        for i in self._value:
+            if not i:
+                result.append("<NONE>")
+            else:
+                result.append(str(i))
+        return '"' + '", "'.join(result) + '"'
+
+
+class AddOperation(Operation):
+    def process(
+        self, key: str, sinput: List[str], transformer: Callable[[List[str]], List[str]]
+    ) -> List[str]:
+        return sinput + transformer(self._value)
+
+    def __repr__(self):
+        return f"+({self._dump()})"
+
+
+class UniqueAddOperation(Operation):
+    def process(
+        self, key: str, sinput: List[str], transformer: Callable[[List[str]], List[str]]
+    ) -> List[str]:
+        result = sinput
+        for v in transformer(self._value):
+            if v not in result:
+                result.append(v)
+        return result
+
+    def __repr__(self):
+        return f"*({self._dump()})"
+
+
+class ReplaceOperation(Operation):
+    def process(
+        self, key: str, sinput: List[str], transformer: Callable[[List[str]], List[str]]
+    ) -> List[str]:
+        result = []
+        for s in sinput:
+            for v in transformer(self._value):
+                pattern, replacement = self.split_rex(v)
+                result.append(re.sub(pattern, replacement, s))
+        return result
+
+    def split_rex(self, s):
+        pattern = ""
+        replacement = ""
+        if len(s) < 4:
+            return pattern, replacement
+        sep = s[1]
+        s = s[2:]
+        rex = re.compile(f"[^\\\\]{sep}")
+        m = rex.search(s)
+        if not m:
+            return pattern, replacement
+        pattern = s[: m.start() + 1]
+        replacement = s[m.end() :]
+        m = rex.search(replacement)
+        if m:
+            replacement = replacement[: m.start() + 1]
+        return pattern, replacement
+
+    def __repr__(self):
+        return f"*({self._dump()})"
+
+
+class SetOperation(Operation):
+    def process(
+        self, key: str, sinput: List[str], transformer: Callable[[List[str]], List[str]]
+    ) -> List[str]:
+        values = []  # List[str]
+        for v in self._value:
+            if v != f"$${key}":
+                values.append(v)
+            else:
+                values += sinput
+
+        if transformer:
+            return list(transformer(values))
+        else:
+            return values
+
+    def __repr__(self):
+        return f"=({self._dump()})"
+
+
+class RemoveOperation(Operation):
+    def process(
+        self, key: str, sinput: List[str], transformer: Callable[[List[str]], List[str]]
+    ) -> List[str]:
+        sinput_set = set(sinput)
+        value_set = set(self._value)
+        result: List[str] = []
+
+        # Add everything that is not going to get removed:
+        for v in sinput:
+            if v not in value_set:
+                result += [v]
+
+        # Add everything else with removal marker:
+        for v in transformer(self._value):
+            if v not in sinput_set:
+                result += [f"-{v}"]
+
+        return result
+
+    def __repr__(self):
+        return f"-({self._dump()})"
+
+
+# Helper class that stores a list of tuples, representing a scope id and
+# a line number within that scope's project file. The whole list
+# represents the full path location for a certain operation while
+# traversing include()'d scopes. Used for sorting when determining
+# operation order when evaluating operations.
+class OperationLocation(object):
+    def __init__(self):
+        self.list_of_scope_ids_and_line_numbers = []
+
+    def clone_and_append(self, scope_id: int, line_number: int) -> OperationLocation:
+        new_location = OperationLocation()
+        new_location.list_of_scope_ids_and_line_numbers = list(
+            self.list_of_scope_ids_and_line_numbers
+        )
+        new_location.list_of_scope_ids_and_line_numbers.append((scope_id, line_number))
+        return new_location
+
+    def __lt__(self, other: OperationLocation) -> Any:
+        return self.list_of_scope_ids_and_line_numbers < other.list_of_scope_ids_and_line_numbers
+
+    def __repr__(self) -> str:
+        s = ""
+        for t in self.list_of_scope_ids_and_line_numbers:
+            s += f"s{t[0]}:{t[1]} "
+        s = s.strip(" ")
+        return s
+
+
+class Scope(object):
+
+    SCOPE_ID: int = 1
+
+    def __init__(
+        self,
+        *,
+        parent_scope: Optional[Scope],
+        qmake_file: str,
+        condition: str = "",
+        base_dir: str = "",
+        operations: Union[Dict[str, List[Operation]], None] = None,
+        parent_include_line_no: int = -1,
+    ) -> None:
+        if not operations:
+            operations = {
+                "QT_SOURCE_TREE": [SetOperation(["${QT_SOURCE_TREE}"])],
+                "QT_BUILD_TREE": [SetOperation(["${PROJECT_BINARY_DIR}"])],
+                "QTRO_SOURCE_TREE": [SetOperation(["${CMAKE_SOURCE_DIR}"])],
+            }
+
+        self._operations: Dict[str, List[Operation]] = copy.deepcopy(operations)
+        if parent_scope:
+            parent_scope._add_child(self)
+        else:
+            self._parent = None  # type: Optional[Scope]
+            # Only add the  "QT = core gui" Set operation once, on the
+            # very top-level .pro scope, aka it's basedir is empty.
+            if not base_dir:
+                self._operations["QT"] = [SetOperation(["core", "gui"])]
+
+        self._basedir = base_dir
+        if qmake_file:
+            self._currentdir = os.path.dirname(qmake_file) or "."
+        if not self._basedir:
+            self._basedir = self._currentdir
+
+        self._scope_id = Scope.SCOPE_ID
+        Scope.SCOPE_ID += 1
+        self._file = qmake_file
+        self._file_absolute_path = os.path.abspath(qmake_file)
+        self._condition = map_condition(condition)
+        self._children = []  # type: List[Scope]
+        self._included_children = []  # type: List[Scope]
+        self._visited_keys = set()  # type: Set[str]
+        self._total_condition = None  # type: Optional[str]
+        self._parent_include_line_no = parent_include_line_no
+        self._is_public_module = False
+        self._has_private_module = False
+
+    def __repr__(self):
+        return (
+            f"{self._scope_id}:{self._basedir}:{self._currentdir}:{self._file}:"
+            f"{self._condition or '<TRUE>'}"
+        )
+
+    def reset_visited_keys(self):
+        self._visited_keys = set()
+
+    def merge(self, other: "Scope") -> None:
+        assert self != other
+        self._included_children.append(other)
+
+    @property
+    def scope_debug(self) -> bool:
+        merge = self.get_string("PRO2CMAKE_SCOPE_DEBUG").lower()
+        return merge == "1" or merge == "on" or merge == "yes" or merge == "true"
+
+    @property
+    def parent(self) -> Optional[Scope]:
+        return self._parent
+
+    @property
+    def basedir(self) -> str:
+        return self._basedir
+
+    @property
+    def currentdir(self) -> str:
+        return self._currentdir
+
+    @property
+    def is_public_module(self) -> bool:
+        return self._is_public_module
+
+    @property
+    def has_private_module(self) -> bool:
+        return self._has_private_module
+
+    def can_merge_condition(self):
+        if self._condition == "else":
+            return False
+        if self._operations:
+            return False
+
+        child_count = len(self._children)
+        if child_count == 0 or child_count > 2:
+            return False
+        assert child_count != 1 or self._children[0]._condition != "else"
+        return child_count == 1 or self._children[1]._condition == "else"
+
+    def settle_condition(self):
+        new_children: List[Scope] = []
+        for c in self._children:
+            c.settle_condition()
+
+            if c.can_merge_condition():
+                child = c._children[0]
+                child._condition = "({c._condition}) AND ({child._condition})"
+                new_children += c._children
+            else:
+                new_children.append(c)
+        self._children = new_children
+
+    @staticmethod
+    def FromDict(
+        parent_scope: Optional["Scope"],
+        file: str,
+        statements,
+        cond: str = "",
+        base_dir: str = "",
+        project_file_content: str = "",
+        parent_include_line_no: int = -1,
+    ) -> Scope:
+        scope = Scope(
+            parent_scope=parent_scope,
+            qmake_file=file,
+            condition=cond,
+            base_dir=base_dir,
+            parent_include_line_no=parent_include_line_no,
+        )
+        for statement in statements:
+            if isinstance(statement, list):  # Handle skipped parts...
+                assert not statement
+                continue
+
+            operation = statement.get("operation", None)
+            if operation:
+                key = statement.get("key", "")
+                value = statement.get("value", [])
+                assert key != ""
+
+                op_location_start = operation["locn_start"]
+                operation = operation["value"]
+                op_line_no = pp.lineno(op_location_start, project_file_content)
+
+                if operation == "=":
+                    scope._append_operation(key, SetOperation(value, line_no=op_line_no))
+                elif operation == "-=":
+                    scope._append_operation(key, RemoveOperation(value, line_no=op_line_no))
+                elif operation == "+=":
+                    scope._append_operation(key, AddOperation(value, line_no=op_line_no))
+                elif operation == "*=":
+                    scope._append_operation(key, UniqueAddOperation(value, line_no=op_line_no))
+                elif operation == "~=":
+                    scope._append_operation(key, ReplaceOperation(value, line_no=op_line_no))
+                else:
+                    print(f'Unexpected operation "{operation}" in scope "{scope}".')
+                    assert False
+
+                continue
+
+            condition = statement.get("condition", None)
+            if condition:
+                Scope.FromDict(scope, file, statement.get("statements"), condition, scope.basedir)
+
+                else_statements = statement.get("else_statements")
+                if else_statements:
+                    Scope.FromDict(scope, file, else_statements, "else", scope.basedir)
+                continue
+
+            loaded = statement.get("loaded")
+            if loaded:
+                scope._append_operation("_LOADED", UniqueAddOperation(loaded))
+                continue
+
+            option = statement.get("option", None)
+            if option:
+                scope._append_operation("_OPTION", UniqueAddOperation(option))
+                continue
+
+            included = statement.get("included", None)
+            if included:
+                included_location_start = included["locn_start"]
+                included = included["value"]
+                included_line_no = pp.lineno(included_location_start, project_file_content)
+                scope._append_operation(
+                    "_INCLUDED", UniqueAddOperation(included, line_no=included_line_no)
+                )
+                continue
+
+            project_required_condition = statement.get("project_required_condition")
+            if project_required_condition:
+                scope._append_operation("_REQUIREMENTS", AddOperation(project_required_condition))
+
+        scope.settle_condition()
+
+        if scope.scope_debug:
+            print(f"..... [SCOPE_DEBUG]: Created scope {scope}:")
+            scope.dump(indent=1)
+            print("..... [SCOPE_DEBUG]: <<END OF SCOPE>>")
+        return scope
+
+    def _append_operation(self, key: str, op: Operation) -> None:
+        if key in self._operations:
+            self._operations[key].append(op)
+        else:
+            self._operations[key] = [op]
+
+    @property
+    def file(self) -> str:
+        return self._file or ""
+
+    @property
+    def file_absolute_path(self) -> str:
+        return self._file_absolute_path or ""
+
+    @property
+    def generated_cmake_lists_path(self) -> str:
+        assert self.basedir
+        return os.path.join(self.basedir, "CMakeLists.gen.txt")
+
+    @property
+    def original_cmake_lists_path(self) -> str:
+        assert self.basedir
+        return os.path.join(self.basedir, "CMakeLists.txt")
+
+    @property
+    def condition(self) -> str:
+        return self._condition
+
+    @property
+    def total_condition(self) -> Optional[str]:
+        return self._total_condition
+
+    @total_condition.setter
+    def total_condition(self, condition: str) -> None:
+        self._total_condition = condition
+
+    def _add_child(self, scope: "Scope") -> None:
+        scope._parent = self
+        self._children.append(scope)
+
+    @property
+    def children(self) -> List["Scope"]:
+        result = list(self._children)
+        for include_scope in self._included_children:
+            result += include_scope.children
+        return result
+
+    def dump(self, *, indent: int = 0) -> None:
+        ind = spaces(indent)
+        print(f'{ind}Scope "{self}":')
+        if self.total_condition:
+            print(f"{ind}  Total condition = {self.total_condition}")
+        print(f"{ind}  Keys:")
+        keys = self._operations.keys()
+        if not keys:
+            print(f"{ind}    -- NONE --")
+        else:
+            for k in sorted(keys):
+                print(f'{ind}    {k} = "{self._operations.get(k, [])}"')
+        print(f"{ind}  Children:")
+        if not self._children:
+            print(f"{ind}    -- NONE --")
+        else:
+            for c in self._children:
+                c.dump(indent=indent + 1)
+        print(f"{ind}  Includes:")
+        if not self._included_children:
+            print(f"{ind}    -- NONE --")
+        else:
+            for c in self._included_children:
+                c.dump(indent=indent + 1)
+
+    def dump_structure(self, *, structure_type: str = "ROOT", indent: int = 0) -> None:
+        print(f"{spaces(indent)}{structure_type}: {self}")
+        for i in self._included_children:
+            i.dump_structure(structure_type="INCL", indent=indent + 1)
+        for i in self._children:
+            i.dump_structure(structure_type="CHLD", indent=indent + 1)
+
+    @property
+    def keys(self):
+        return self._operations.keys()
+
+    @property
+    def visited_keys(self):
+        return self._visited_keys
+
+    # Traverses a scope and its children, and collects operations
+    # that need to be processed for a certain key.
+    def _gather_operations_from_scope(
+        self,
+        operations_result: List[Dict[str, Any]],
+        current_scope: Scope,
+        op_key: str,
+        current_location: OperationLocation,
+    ):
+        for op in current_scope._operations.get(op_key, []):
+            new_op_location = current_location.clone_and_append(
+                current_scope._scope_id, op._line_no
+            )
+            op_info: Dict[str, Any] = {}
+            op_info["op"] = op
+            op_info["scope"] = current_scope
+            op_info["location"] = new_op_location
+            operations_result.append(op_info)
+
+        for included_child in current_scope._included_children:
+            new_scope_location = current_location.clone_and_append(
+                current_scope._scope_id, included_child._parent_include_line_no
+            )
+            self._gather_operations_from_scope(
+                operations_result, included_child, op_key, new_scope_location
+            )
+
+    # Partially applies a scope argument to a given transformer.
+    @staticmethod
+    def _create_transformer_for_operation(
+        given_transformer: Optional[Callable[[Scope, List[str]], List[str]]],
+        transformer_scope: Scope,
+    ) -> Callable[[List[str]], List[str]]:
+        if given_transformer:
+
+            def wrapped_transformer(values):
+                return given_transformer(transformer_scope, values)
+
+        else:
+
+            def wrapped_transformer(values):
+                return values
+
+        return wrapped_transformer
+
+    def _evalOps(
+        self,
+        key: str,
+        transformer: Optional[Callable[[Scope, List[str]], List[str]]],
+        result: List[str],
+        *,
+        inherit: bool = False,
+    ) -> List[str]:
+        self._visited_keys.add(key)
+
+        # Inherit values from parent scope.
+        # This is a strange edge case which is wrong in principle, because
+        # .pro files are imperative and not declarative. Nevertheless
+        # this fixes certain mappings (e.g. for handling
+        # VERSIONTAGGING_SOURCES in src/corelib/global/global.pri).
+        if self._parent and inherit:
+            result = self._parent._evalOps(key, transformer, result)
+
+        operations_to_run: List[Dict[str, Any]] = []
+        starting_location = OperationLocation()
+        starting_scope = self
+        self._gather_operations_from_scope(
+            operations_to_run, starting_scope, key, starting_location
+        )
+
+        # Sorts the operations based on the location of each operation. Technically compares two
+        # lists of tuples.
+        operations_to_run = sorted(operations_to_run, key=lambda o: o["location"])
+
+        # Process the operations.
+        for op_info in operations_to_run:
+            op_transformer = self._create_transformer_for_operation(transformer, op_info["scope"])
+            result = op_info["op"].process(key, result, op_transformer)
+        return result
+
+    def get(self, key: str, *, ignore_includes: bool = False, inherit: bool = False) -> List[str]:
+        is_same_path = self.currentdir == self.basedir
+        if not is_same_path:
+            relative_path = posixpath.relpath(self.currentdir, self.basedir)
+
+        if key == "QQC2_SOURCE_TREE":
+            qmake_conf_path = find_qmake_conf(os.path.abspath(self.currentdir))
+            qmake_conf_dir_path = os.path.dirname(qmake_conf_path)
+            project_relative_path = os.path.relpath(qmake_conf_dir_path, self.currentdir)
+            return ["${CMAKE_CURRENT_SOURCE_DIR}/" + project_relative_path]
+
+        if key == "QT_ARCH":
+            return ["${CMAKE_SYSTEM_PROCESSOR}"]
+
+        if key == "_PRO_FILE_PWD_":
+            return ["${CMAKE_CURRENT_SOURCE_DIR}"]
+        if key == "PWD":
+            if is_same_path:
+                return ["${CMAKE_CURRENT_SOURCE_DIR}"]
+            else:
+                return [f"${{CMAKE_CURRENT_SOURCE_DIR}}/{relative_path}"]
+        if key == "OUT_PWD":
+            if is_same_path:
+                return ["${CMAKE_CURRENT_BINARY_DIR}"]
+            else:
+                return [f"${{CMAKE_CURRENT_BINARY_DIR}}/{relative_path}"]
+
+        return self._evalOps(key, None, [], inherit=inherit)
+
+    def get_string(self, key: str, default: str = "", inherit: bool = False) -> str:
+        v = self.get(key, inherit=inherit)
+        if len(v) == 0:
+            return default
+        assert len(v) == 1
+        return v[0]
+
+    def _map_files(
+        self, files: List[str], *, use_vpath: bool = True, is_include: bool = False
+    ) -> List[str]:
+
+        expanded_files = []  # type: List[str]
+        for f in files:
+            r = self._expand_value(f)
+            expanded_files += r
+
+        mapped_files = list(
+            map(lambda f: map_to_file(f, self, is_include=is_include), expanded_files)
+        )
+
+        if use_vpath:
+            result = list(
+                map(
+                    lambda f: handle_vpath(f, self.basedir, self.get("VPATH", inherit=True)),
+                    mapped_files,
+                )
+            )
+        else:
+            result = mapped_files
+
+        # strip ${CMAKE_CURRENT_SOURCE_DIR}:
+        result = list(
+            map(lambda f: f[28:] if f.startswith("${CMAKE_CURRENT_SOURCE_DIR}/") else f, result)
+        )
+
+        # strip leading ./:
+        result = list(map(lambda f: trim_leading_dot(f), result))
+
+        return result
+
+    def get_files(
+        self, key: str, *, use_vpath: bool = False, is_include: bool = False
+    ) -> List[str]:
+        def transformer(scope, files):
+            return scope._map_files(files, use_vpath=use_vpath, is_include=is_include)
+
+        return list(self._evalOps(key, transformer, []))
+
+    @staticmethod
+    def _replace_env_var_value(value: Any) -> Any:
+        if not isinstance(value, str):
+            return value
+
+        pattern = re.compile(r"\$\$\(([A-Za-z_][A-Za-z0-9_]*)\)")
+        match = re.search(pattern, value)
+        if match:
+            value = re.sub(pattern, r"$ENV{\1}", value)
+
+        return value
+
+    def _expand_value(self, value: str) -> List[str]:
+        result = value
+        pattern = re.compile(r"\$\$\{?([A-Za-z_][A-Za-z0-9_]*)\}?")
+        match = re.search(pattern, result)
+        while match:
+            old_result = result
+            match_group_0 = match.group(0)
+            if match_group_0 == value:
+                get_result = self.get(match.group(1), inherit=True)
+                if len(get_result) == 1:
+                    result = get_result[0]
+                    result = self._replace_env_var_value(result)
+                else:
+                    # Recursively expand each value from the result list
+                    # returned from self.get().
+                    result_list: List[str] = []
+                    for entry_value in get_result:
+                        result_list += self._expand_value(self._replace_env_var_value(entry_value))
+                    return result_list
+            else:
+                replacement = self.get(match.group(1), inherit=True)
+                replacement_str = replacement[0] if replacement else ""
+                if replacement_str == value:
+                    # we have recursed
+                    replacement_str = ""
+                result = result[: match.start()] + replacement_str + result[match.end() :]
+                result = self._replace_env_var_value(result)
+
+            if result == old_result:
+                return [result]  # Do not go into infinite loop
+
+            match = re.search(pattern, result)
+
+        result = self._replace_env_var_value(result)
+        return [result]
+
+    def expand(self, key: str) -> List[str]:
+        value = self.get(key)
+        result: List[str] = []
+        assert isinstance(value, list)
+        for v in value:
+            result += self._expand_value(v)
+        return result
+
+    def expandString(self, key: str) -> str:
+        result = self._expand_value(self.get_string(key))
+        assert len(result) == 1
+        return result[0]
+
+    def _get_operation_at_index(self, key, index):
+        return self._operations[key][index]
+
+    @property
+    def TEMPLATE(self) -> str:
+        return self.get_string("TEMPLATE", "app")
+
+    def _rawTemplate(self) -> str:
+        return self.get_string("TEMPLATE")
+
+    @property
+    def TARGET(self) -> str:
+        target = self.expandString("TARGET") or os.path.splitext(os.path.basename(self.file))[0]
+        return re.sub(r"\.\./", "", target)
+
+    @property
+    def TARGET_ORIGINAL(self) -> str:
+        return self.expandString("TARGET") or os.path.splitext(os.path.basename(self.file))[0]
+
+    @property
+    def _INCLUDED(self) -> List[str]:
+        return self.get("_INCLUDED")
+
+
+# Given "if(a|b):c" returns "(a|b):c". Uses pyparsing to keep the parentheses
+# balanced.
+def unwrap_if(input_string):
+    # Compute the grammar only once.
+    if not hasattr(unwrap_if, "if_grammar"):
+
+        def handle_expr_with_parentheses(s, l, t):
+            # The following expression unwraps the condition via the
+            # additional info set by originalTextFor, thus returning the
+            # condition without parentheses.
+            condition_without_parentheses = s[t._original_start + 1 : t._original_end - 1]
+
+            # Re-add the parentheses, but with spaces in-between. This
+            # fixes map_condition -> map_platform to apply properly.
+            condition_with_parentheses = "( " + condition_without_parentheses + " )"
+            return condition_with_parentheses
+
+        expr_with_parentheses = pp.originalTextFor(pp.nestedExpr())
+        expr_with_parentheses.setParseAction(handle_expr_with_parentheses)
+
+        if_keyword = pp.Suppress(pp.Keyword("if"))
+        unwrap_if.if_grammar = if_keyword + expr_with_parentheses
+
+    output_string = unwrap_if.if_grammar.transformString(input_string)
+    return output_string
+
+
+def map_condition(condition: str) -> str:
+    # Some hardcoded cases that are too bothersome to generalize.
+    condition = re.sub(
+        r"qtConfig\(opengles\.\)",
+        r"(QT_FEATURE_opengles2 OR QT_FEATURE_opengles3 OR QT_FEATURE_opengles31 OR QT_FEATURE_opengles32)",
+        condition,
+    )
+    condition = re.sub(
+        r"qtConfig\(opengl\(es1\|es2\)\?\)",
+        r"QT_FEATURE_opengl OR QT_FEATURE_opengles2 OR QT_FEATURE_opengles3",
+        condition,
+    )
+    condition = re.sub(r"qtConfig\(opengl\.\*\)", r"QT_FEATURE_opengl", condition)
+    condition = re.sub(r"^win\*$", r"win", condition)
+    condition = re.sub(r"^no-png$", r"NOT QT_FEATURE_png", condition)
+    condition = re.sub(r"contains\(CONFIG, static\)", r"NOT QT_BUILD_SHARED_LIBS", condition)
+    condition = re.sub(r"contains\(QT_CONFIG,\w*shared\)", r"QT_BUILD_SHARED_LIBS", condition)
+    condition = re.sub(r"CONFIG\(osx\)", r"APPLE_OSX", condition)
+
+    def gcc_version_handler(match_obj: Match):
+        operator = match_obj.group(1)
+        version_type = match_obj.group(2)
+        if operator == "equals":
+            operator = "STREQUAL"
+        elif operator == "greaterThan":
+            operator = "STRGREATER"
+        elif operator == "lessThan":
+            operator = "STRLESS"
+
+        version = match_obj.group(3)
+        return f"(QT_COMPILER_VERSION_{version_type} {operator} {version})"
+
+    # TODO: Possibly fix for other compilers.
+    pattern = r"(equals|greaterThan|lessThan)\(QT_GCC_([A-Z]+)_VERSION,[ ]*([0-9]+)\)"
+    condition = re.sub(pattern, gcc_version_handler, condition)
+
+    def windows_sdk_version_handler(match_obj: Match):
+        operator = match_obj.group(1)
+        if operator == "equals":
+            operator = "STREQUAL"
+        elif operator == "greaterThan":
+            operator = "STRGREATER"
+        elif operator == "lessThan":
+            operator = "STRLESS"
+
+        version = match_obj.group(2)
+        return f"(QT_WINDOWS_SDK_VERSION {operator} {version})"
+
+    pattern = r"(equals|greaterThan|lessThan)\(WINDOWS_SDK_VERSION,[ ]*([0-9]+)\)"
+    condition = re.sub(pattern, windows_sdk_version_handler, condition)
+
+    # Generic lessThan|equals|lessThan()
+
+    def generic_version_handler(match_obj: Match):
+        operator = match_obj.group(1)
+        if operator == "equals":
+            operator = "EQUAL"
+        elif operator == "greaterThan":
+            operator = "GREATER"
+        elif operator == "lessThan":
+            operator = "LESS"
+
+        variable = match_obj.group(2)
+        version = match_obj.group(3)
+        return f"({variable} {operator} {version})"
+
+    pattern = r"(equals|greaterThan|lessThan)\(([^,]+?),[ ]*([0-9]+)\)"
+    condition = re.sub(pattern, generic_version_handler, condition)
+
+    # Handle if(...) conditions.
+    condition = unwrap_if(condition)
+
+    condition = re.sub(r"\bisEmpty\s*\((.*?)\)", r"\1_ISEMPTY", condition)
+    condition = re.sub(
+        r"\bcontains\s*\(\s*(?:QT_)?CONFIG\s*,\s*c\+\+(\d+)\)",
+        r"cxx_std_\1 IN_LIST CMAKE_CXX_COMPILE_FEATURES",
+        condition,
+    )
+    condition = re.sub(r'\bcontains\s*\((.*?),\s*"?(.*?)"?\)', r"\1___contains___\2", condition)
+    condition = re.sub(r'\bequals\s*\((.*?),\s*"?(.*?)"?\)', r"\1___equals___\2", condition)
+    condition = re.sub(r'\bisEqual\s*\((.*?),\s*"?(.*?)"?\)', r"\1___equals___\2", condition)
+    condition = re.sub(r"\s*==\s*", "___STREQUAL___", condition)
+    condition = re.sub(r"\bexists\s*\((.*?)\)", r"EXISTS \1", condition)
+
+    # checking mkspec, predating gcc scope in qmake, will then be replaced by platform_mapping in helper.py
+    condition = condition.replace("*-g++*", "GCC")
+    condition = condition.replace("*g++*", "GCC")
+    condition = condition.replace("aix-g++*", "AIX")
+    condition = condition.replace("*-icc*", "ICC")
+    condition = condition.replace("*-clang*", "CLANG")
+    condition = condition.replace("*-llvm", "CLANG")
+    condition = condition.replace("win32-*", "WIN32")
+
+    pattern = r"CONFIG\((debug|release),debug\|release\)"
+    match_result = re.match(pattern, condition)
+    if match_result:
+        build_type = match_result.group(1)
+        if build_type == "debug":
+            build_type = "Debug"
+        elif build_type == "release":
+            build_type = "Release"
+        condition = re.sub(pattern, f"(CMAKE_BUILD_TYPE STREQUAL {build_type})", condition)
+
+    condition = condition.replace("*", "_x_")
+    condition = condition.replace(".$$", "__ss_")
+    condition = condition.replace("$$", "_ss_")
+
+    condition = condition.replace("!", "NOT ")
+    condition = condition.replace("&&", " AND ")
+    condition = condition.replace("|", " OR ")
+
+    # new conditions added by the android multi arch qmake build
+    condition = re.sub(r"(^| )x86((?=[^\w])|$)", "TEST_architecture_arch STREQUAL i386", condition)
+    condition = re.sub(r"(^| )x86_64", " TEST_architecture_arch STREQUAL x86_64", condition)
+    condition = re.sub(r"(^| )arm64-v8a", "TEST_architecture_arch STREQUAL arm64", condition)
+    condition = re.sub(r"(^| )armeabi-v7a", "TEST_architecture_arch STREQUAL arm", condition)
+
+    # some defines replacements
+    condition = re.sub(r"DEFINES___contains___QT_NO_CURSOR", r"(NOT QT_FEATURE_cursor)", condition)
+    condition = re.sub(
+        r"DEFINES___contains___QT_NO_TRANSLATION", r"(NOT QT_FEATURE_translation)", condition
+    )
+    condition = re.sub(r"styles___contains___fusion", r"QT_FEATURE_style_fusion", condition)
+
+    condition = condition.replace("cross_compile", "CMAKE_CROSSCOMPILING")
+
+    cmake_condition = ""
+    for part in condition.split():
+        # some features contain e.g. linux, that should not be
+        # turned upper case
+        feature = re.match(r"(qtConfig|qtHaveModule)\(([a-zA-Z0-9_-]+)\)", part)
+        if feature:
+            if feature.group(1) == "qtHaveModule":
+                part = f"TARGET {map_qt_library(feature.group(2))}"
+            else:
+                feature_name = featureName(feature.group(2))
+                if (
+                    feature_name.startswith("system_")
+                    and is_known_3rd_party_library(feature_name[7:])
+                    and not feature_name.startswith("system_jpeg")
+                    and not feature_name.startswith("system_zlib")
+                ):
+                    part = "ON"
+                elif feature == "dlopen":
+                    part = "ON"
+                else:
+                    part = "QT_FEATURE_" + feature_name
+        else:
+            part = map_platform(part)
+
+        part = part.replace("true", "ON")
+        part = part.replace("false", "OFF")
+        cmake_condition += " " + part
+    return cmake_condition.strip()
+
+
+_path_replacements = {
+    "$$[QT_INSTALL_PREFIX]": "${INSTALL_DIRECTORY}",
+    "$$[QT_INSTALL_EXAMPLES]": "${INSTALL_EXAMPLESDIR}",
+    "$$[QT_INSTALL_TESTS]": "${INSTALL_TESTSDIR}",
+    "$$OUT_PWD": "${CMAKE_CURRENT_BINARY_DIR}",
+}
+
+
+def replace_path_constants(path: str, scope: Scope) -> str:
+    """ Clean up DESTDIR and target.path """
+    if path.startswith("./"):
+        path = f"${{CMAKE_CURRENT_BINARY_DIR}}/{path[2:]}"
+    elif path.startswith("../"):
+        path = f"${{CMAKE_CURRENT_BINARY_DIR}}/{path}"
+    for original, replacement in _path_replacements.items():
+        path = path.replace(original, replacement)
+    path = path.replace("$$TARGET", scope.TARGET)
+    return path
+
+
+def handle_subdir(
+    scope: Scope, cm_fh: IO[str], *, indent: int = 0, is_example: bool = False
+) -> None:
+
+    # Global nested dictionary that will contain sub_dir assignments and their conditions.
+    # Declared as a global in order not to pollute the nested function signatures with giant
+    # type hints.
+    sub_dirs: Dict[str, Dict[str, Set[FrozenSet[str]]]] = {}
+
+    # Collects assignment conditions into global sub_dirs dict.
+    def collect_subdir_info(sub_dir_assignment: str, *, current_conditions: FrozenSet[str] = None):
+        subtraction = sub_dir_assignment.startswith("-")
+        if subtraction:
+            subdir_name = sub_dir_assignment[1:]
+        else:
+            subdir_name = sub_dir_assignment
+        if subdir_name not in sub_dirs:
+            sub_dirs[subdir_name] = {}
+        additions = sub_dirs[subdir_name].get("additions", set())
+        subtractions = sub_dirs[subdir_name].get("subtractions", set())
+        if current_conditions:
+            if subtraction:
+                subtractions.add(current_conditions)
+            else:
+                additions.add(current_conditions)
+        if additions:
+            sub_dirs[subdir_name]["additions"] = additions
+        if subtractions:
+            sub_dirs[subdir_name]["subtractions"] = subtractions
+
+    # Recursive helper that collects subdir info for given scope,
+    # and the children of the given scope.
+    def handle_subdir_helper(
+        scope: Scope,
+        cm_fh: IO[str],
+        *,
+        indent: int = 0,
+        current_conditions: FrozenSet[str] = frozenset(),
+        is_example: bool = False,
+    ):
+        for sd in scope.get_files("SUBDIRS"):
+            # Collect info about conditions and SUBDIR assignments in the
+            # current scope.
+            if os.path.isdir(sd) or sd.startswith("-"):
+                collect_subdir_info(sd, current_conditions=current_conditions)
+            # For the file case, directly write into the file handle.
+            elif os.path.isfile(sd):
+                # Handle cases with SUBDIRS += Foo/bar/z.pro. We want to be able
+                # to generate add_subdirectory(Foo/bar) instead of parsing the full
+                # .pro file in the current CMakeLists.txt. This causes issues
+                # with relative paths in certain projects otherwise.
+                dirname = os.path.dirname(sd)
+                if dirname:
+                    collect_subdir_info(dirname, current_conditions=current_conditions)
+                else:
+                    subdir_result, project_file_content = parseProFile(sd, debug=False)
+                    subdir_scope = Scope.FromDict(
+                        scope,
+                        sd,
+                        subdir_result.asDict().get("statements"),
+                        "",
+                        scope.basedir,
+                        project_file_content=project_file_content,
+                    )
+
+                    do_include(subdir_scope)
+                    cmakeify_scope(subdir_scope, cm_fh, indent=indent, is_example=is_example)
+            else:
+                print(f"    XXXX: SUBDIR {sd} in {scope}: Not found.")
+
+        # Collect info about conditions and SUBDIR assignments in child
+        # scopes, aka recursively call the same function, but with an
+        # updated current_conditions frozen set.
+        for c in scope.children:
+            # Use total_condition for 'else' conditions, otherwise just use the regular value to
+            # simplify the logic.
+            child_conditions = current_conditions
+            child_condition = c.total_condition if c.condition == "else" else c.condition
+            if child_condition:
+                child_conditions = frozenset((*child_conditions, child_condition))
+
+            handle_subdir_helper(
+                c,
+                cm_fh,
+                indent=indent + 1,
+                current_conditions=child_conditions,
+                is_example=is_example,
+            )
+
+    def group_and_print_sub_dirs(scope: Scope, indent: int = 0) -> None:
+        # Simplify conditions, and group
+        # subdirectories with the same conditions.
+        grouped_sub_dirs: Dict[str, List[str]] = {}
+
+        # Wraps each element in the given interable with parentheses,
+        # to make sure boolean simplification happens correctly.
+        def wrap_in_parenthesis(iterable):
+            return [f"({c})" for c in iterable]
+
+        def join_all_conditions(set_of_alternatives):
+            # Elements within one frozen set represent one single
+            # alternative whose pieces are ANDed together.
+            # This is repeated for each alternative that would
+            # enable a subdir, and are thus ORed together.
+            final_str = ""
+            if set_of_alternatives:
+                wrapped_set_of_alternatives = [
+                    wrap_in_parenthesis(alternative) for alternative in set_of_alternatives
+                ]
+                alternatives = [
+                    f'({" AND ".join(alternative)})' for alternative in wrapped_set_of_alternatives
+                ]
+                final_str = " OR ".join(sorted(alternatives))
+            return final_str
+
+        for subdir_name in sub_dirs:
+            additions = sub_dirs[subdir_name].get("additions", set())
+            subtractions = sub_dirs[subdir_name].get("subtractions", set())
+
+            # An empty condition key represents the group of sub dirs
+            # that should be added unconditionally.
+            condition_key = ""
+            if additions or subtractions:
+                addition_str = join_all_conditions(additions)
+                if addition_str:
+                    addition_str = f"({addition_str})"
+                subtraction_str = join_all_conditions(subtractions)
+                if subtraction_str:
+                    subtraction_str = f"NOT ({subtraction_str})"
+
+                condition_str = addition_str
+                if condition_str and subtraction_str:
+                    condition_str += " AND "
+                condition_str += subtraction_str
+                if not condition_str.rstrip("()").strip():
+                    continue
+                condition_simplified = simplify_condition(condition_str)
+                condition_key = condition_simplified
+
+            sub_dir_list_by_key: List[str] = grouped_sub_dirs.get(condition_key, [])
+            sub_dir_list_by_key.append(subdir_name)
+            grouped_sub_dirs[condition_key] = sub_dir_list_by_key
+
+        # Print any requires() blocks.
+        cm_fh.write(expand_project_requirements(scope, skip_message=True))
+
+        # Print the groups.
+        ind = spaces(indent)
+        for condition_key in grouped_sub_dirs:
+            cond_ind = ind
+            if condition_key:
+                cm_fh.write(f"{ind}if({condition_key})\n")
+                cond_ind += "    "
+
+            sub_dir_list_by_key = grouped_sub_dirs.get(condition_key, [])
+            for subdir_name in sub_dir_list_by_key:
+                cm_fh.write(f"{cond_ind}add_subdirectory({subdir_name})\n")
+            if condition_key:
+                cm_fh.write(f"{ind}endif()\n")
+
+    # A set of conditions which will be ANDed together. The set is recreated with more conditions
+    # as the scope deepens.
+    current_conditions: FrozenSet[str] = frozenset()
+
+    # Compute the total condition for scopes. Needed for scopes that
+    # have 'else' as a condition.
+    recursive_evaluate_scope(scope)
+
+    # Do the work.
+    handle_subdir_helper(
+        scope, cm_fh, indent=indent, current_conditions=current_conditions, is_example=is_example
+    )
+    group_and_print_sub_dirs(scope, indent=indent)
+
+
+def sort_sources(sources: List[str]) -> List[str]:
+    to_sort = {}  # type: Dict[str, List[str]]
+    for s in sources:
+        if s is None:
+            continue
+
+        path = os.path.dirname(s)
+        base = os.path.splitext(os.path.basename(s))[0]
+        if base.endswith("_p"):
+            base = base[:-2]
+        sort_name = posixpath.join(path, base)
+
+        array = to_sort.get(sort_name, [])
+        array.append(s)
+
+        to_sort[sort_name] = array
+
+    lines = []
+    for k in sorted(to_sort.keys()):
+        lines.append(" ".join(sorted(to_sort[k])))
+
+    return lines
+
+
+def _map_libraries_to_cmake(
+    libraries: List[str], known_libraries: Set[str], is_example: bool = False
+) -> List[str]:
+    result = []  # type: List[str]
+    is_framework = False
+
+    for lib in libraries:
+        if lib == "-framework":
+            is_framework = True
+            continue
+        if is_framework:
+            if is_example:
+                lib = f'"-framework {lib}"'
+            else:
+                lib = f"${{FW{lib}}}"
+        if lib.startswith("-l"):
+            lib = lib[2:]
+
+        if lib.startswith("-"):
+            lib = f"# Remove: {lib[1:]}"
+        else:
+            lib = map_3rd_party_library(lib)
+
+        if not lib or lib in result or lib in known_libraries:
+            continue
+
+        result.append(lib)
+        is_framework = False
+
+    return result
+
+
+def extract_cmake_libraries(
+    scope: Scope, *, known_libraries: Optional[Set[str]] = None, is_example: bool = False
+) -> Tuple[List[str], List[str]]:
+    if known_libraries is None:
+        known_libraries = set()
+    public_dependencies = []  # type: List[str]
+    private_dependencies = []  # type: List[str]
+
+    for key in ["QMAKE_USE", "LIBS"]:
+        public_dependencies += scope.expand(key)
+    for key in ["QMAKE_USE_PRIVATE", "QMAKE_USE_FOR_PRIVATE", "LIBS_PRIVATE"]:
+        private_dependencies += scope.expand(key)
+
+    for key in ["QT_FOR_PRIVATE", "QT_PRIVATE"]:
+        private_dependencies += [map_qt_library(q) for q in scope.expand(key)]
+
+    for key in ["QT"]:
+        for lib in scope.expand(key):
+            mapped_lib = map_qt_library(lib)
+            public_dependencies.append(mapped_lib)
+
+    return (
+        _map_libraries_to_cmake(public_dependencies, known_libraries, is_example=is_example),
+        _map_libraries_to_cmake(private_dependencies, known_libraries, is_example=is_example),
+    )
+
+
+def write_header(cm_fh: IO[str], name: str, typename: str, *, indent: int = 0):
+    ind = spaces(indent)
+    comment_line = "#" * 69
+    cm_fh.write(f"{ind}{comment_line}\n")
+    cm_fh.write(f"{ind}## {name} {typename}:\n")
+    cm_fh.write(f"{ind}{comment_line}\n\n")
+
+
+def write_scope_header(cm_fh: IO[str], *, indent: int = 0):
+    ind = spaces(indent)
+    comment_line = "#" * 69
+    cm_fh.write(f"\n{ind}## Scopes:\n")
+    cm_fh.write(f"{ind}{comment_line}\n")
+
+
+def write_list(
+    cm_fh: IO[str],
+    entries: List[str],
+    cmake_parameter: str,
+    indent: int = 0,
+    *,
+    header: str = "",
+    footer: str = "",
+    prefix: str = "",
+):
+    if not entries:
+        return
+
+    ind = spaces(indent)
+    extra_indent = ""
+
+    if header:
+        cm_fh.write(f"{ind}{header}")
+        extra_indent += "    "
+    if cmake_parameter:
+        cm_fh.write(f"{ind}{extra_indent}{cmake_parameter}\n")
+        extra_indent += "    "
+    for s in sort_sources(entries):
+        cm_fh.write(f"{ind}{extra_indent}{prefix}{s}\n")
+    if footer:
+        cm_fh.write(f"{ind}{footer}\n")
+
+
+def write_source_file_list(
+    cm_fh: IO[str],
+    scope,
+    cmake_parameter: str,
+    keys: List[str],
+    indent: int = 0,
+    *,
+    header: str = "",
+    footer: str = "",
+):
+    # collect sources
+    sources: List[str] = []
+    for key in keys:
+        sources += scope.get_files(key, use_vpath=True)
+
+    # Remove duplicates, like in the case when NO_PCH_SOURCES ends up
+    # adding the file to SOURCES, but SOURCES might have already
+    # contained it before. Preserves order in Python 3.7+ because
+    # dict keys are ordered.
+    sources = list(dict.fromkeys(sources))
+
+    write_list(cm_fh, sources, cmake_parameter, indent, header=header, footer=footer)
+
+
+def write_all_source_file_lists(
+    cm_fh: IO[str],
+    scope: Scope,
+    header: str,
+    *,
+    indent: int = 0,
+    footer: str = "",
+    extra_keys: Optional[List[str]] = None,
+):
+    if extra_keys is None:
+        extra_keys = []
+    write_source_file_list(
+        cm_fh,
+        scope,
+        header,
+        ["SOURCES", "HEADERS", "OBJECTIVE_SOURCES", "OBJECTIVE_HEADERS", "NO_PCH_SOURCES", "FORMS"]
+        + extra_keys,
+        indent,
+        footer=footer,
+    )
+
+
+def write_defines(
+    cm_fh: IO[str], scope: Scope, cmake_parameter: str, *, indent: int = 0, footer: str = ""
+):
+    defines = scope.expand("DEFINES")
+    defines += [d[2:] for d in scope.expand("QMAKE_CXXFLAGS") if d.startswith("-D")]
+    defines = [
+        d.replace('=\\\\\\"$$PWD/\\\\\\"', '="${CMAKE_CURRENT_SOURCE_DIR}/"') for d in defines
+    ]
+
+    if "qml_debug" in scope.get("CONFIG"):
+        defines.append("QT_QML_DEBUG")
+
+    write_list(cm_fh, defines, cmake_parameter, indent, footer=footer)
+
+
+def write_3rd_party_defines(
+    cm_fh: IO[str], scope: Scope, cmake_parameter: str, *, indent: int = 0, footer: str = ""
+):
+    defines = scope.expand("MODULE_DEFINES")
+    write_list(cm_fh, defines, cmake_parameter, indent, footer=footer)
+
+
+def get_include_paths_helper(scope: Scope, include_var_name: str) -> List[str]:
+    includes = [i.rstrip("/") or ("/") for i in scope.get_files(include_var_name)]
+    return includes
+
+
+def write_include_paths(
+    cm_fh: IO[str], scope: Scope, cmake_parameter: str, *, indent: int = 0, footer: str = ""
+):
+    includes = get_include_paths_helper(scope, "INCLUDEPATH")
+    write_list(cm_fh, includes, cmake_parameter, indent, footer=footer)
+
+
+def write_3rd_party_include_paths(
+    cm_fh: IO[str], scope: Scope, cmake_parameter: str, *, indent: int = 0, footer: str = ""
+):
+    # Used in qt_helper_lib.prf.
+    includes = get_include_paths_helper(scope, "MODULE_INCLUDEPATH")
+
+    # Wrap the includes in BUILD_INTERFACE generator expression, because
+    # the include paths point to a source dir, and CMake will error out
+    # when trying to create consumable exported targets.
+    processed_includes = []
+    for i in includes:
+        # CMake generator expressions don't seem to like relative paths.
+        # Make them absolute relative to the source dir.
+        if not os.path.isabs(i) and not i.startswith("$"):
+            i = f"${{CMAKE_CURRENT_SOURCE_DIR}}/{i}"
+        i = f"$<BUILD_INTERFACE:{i}>"
+        processed_includes.append(i)
+
+    write_list(cm_fh, processed_includes, cmake_parameter, indent, footer=footer)
+
+
+def write_compile_options(
+    cm_fh: IO[str], scope: Scope, cmake_parameter: str, *, indent: int = 0, footer: str = ""
+):
+    compile_options = [d for d in scope.expand("QMAKE_CXXFLAGS") if not d.startswith("-D")]
+
+    write_list(cm_fh, compile_options, cmake_parameter, indent, footer=footer)
+
+
+def write_library_section(
+    cm_fh: IO[str], scope: Scope, *, indent: int = 0, known_libraries: Optional[Set[str]] = None
+):
+    if known_libraries is None:
+        known_libraries = set()
+    public_dependencies, private_dependencies = extract_cmake_libraries(
+        scope, known_libraries=known_libraries
+    )
+
+    is_public_module = scope.is_public_module
+    current_scope = scope
+    while not is_public_module and current_scope.parent:
+        current_scope = current_scope.parent
+        is_public_module = current_scope.is_public_module
+
+    # When handling module dependencies, handle QT += foo-private magic.
+    # This implies:
+    #  target_link_libraries(Module PUBLIC Qt::Foo)
+    #  target_link_libraries(Module PRIVATE Qt::FooPrivate)
+    #  target_link_libraries(ModulePrivate INTERFACE Qt::FooPrivate)
+    if is_public_module:
+        private_module_dep_pattern = re.compile(r"^(Qt::(.+))Private$")
+
+        public_module_public_deps = []
+        public_module_private_deps = private_dependencies
+        private_module_interface_deps = []
+
+        for dep in public_dependencies:
+            match = re.match(private_module_dep_pattern, dep)
+            if match:
+                if match[1] not in public_module_public_deps:
+                    public_module_public_deps.append(match[1])
+                private_module_interface_deps.append(dep)
+                if dep not in public_module_private_deps:
+                    public_module_private_deps.append(dep)
+            else:
+                if dep not in public_module_public_deps:
+                    public_module_public_deps.append(dep)
+        write_list(cm_fh, public_module_private_deps, "LIBRARIES", indent + 1)
+        write_list(cm_fh, public_module_public_deps, "PUBLIC_LIBRARIES", indent + 1)
+        write_list(cm_fh, private_module_interface_deps, "PRIVATE_MODULE_INTERFACE", indent + 1)
+    else:
+        write_list(cm_fh, private_dependencies, "LIBRARIES", indent + 1)
+        write_list(cm_fh, public_dependencies, "PUBLIC_LIBRARIES", indent + 1)
+
+
+def write_autogen_section(cm_fh: IO[str], scope: Scope, *, indent: int = 0):
+    forms = scope.get_files("FORMS")
+    if forms:
+        write_list(cm_fh, ["uic"], "ENABLE_AUTOGEN_TOOLS", indent)
+
+
+def write_sources_section(
+    cm_fh: IO[str], scope: Scope, *, indent: int = 0, known_libraries: Optional[Set[str]] = None
+):
+    if known_libraries is None:
+        known_libraries = set()
+    ind = spaces(indent)
+
+    # mark RESOURCES as visited:
+    scope.get("RESOURCES")
+
+    write_all_source_file_lists(cm_fh, scope, "SOURCES", indent=indent + 1)
+
+    write_source_file_list(cm_fh, scope, "DBUS_ADAPTOR_SOURCES", ["DBUS_ADAPTORS"], indent + 1)
+    dbus_adaptor_flags = scope.expand("QDBUSXML2CPP_ADAPTOR_HEADER_FLAGS")
+    if dbus_adaptor_flags:
+        dbus_adaptor_flags_line = '" "'.join(dbus_adaptor_flags)
+        cm_fh.write(f"{ind}    DBUS_ADAPTOR_FLAGS\n")
+        cm_fh.write(f'{ind}        "{dbus_adaptor_flags_line}"\n')
+
+    write_source_file_list(cm_fh, scope, "DBUS_INTERFACE_SOURCES", ["DBUS_INTERFACES"], indent + 1)
+    dbus_interface_flags = scope.expand("QDBUSXML2CPP_INTERFACE_HEADER_FLAGS")
+    if dbus_interface_flags:
+        dbus_interface_flags_line = '" "'.join(dbus_interface_flags)
+        cm_fh.write(f"{ind}    DBUS_INTERFACE_FLAGS\n")
+        cm_fh.write(f'{ind}        "{dbus_interface_flags_line}"\n')
+
+    write_defines(cm_fh, scope, "DEFINES", indent=indent + 1)
+
+    write_3rd_party_defines(cm_fh, scope, "PUBLIC_DEFINES", indent=indent + 1)
+
+    write_include_paths(cm_fh, scope, "INCLUDE_DIRECTORIES", indent=indent + 1)
+
+    write_3rd_party_include_paths(cm_fh, scope, "PUBLIC_INCLUDE_DIRECTORIES", indent=indent + 1)
+
+    write_library_section(cm_fh, scope, indent=indent, known_libraries=known_libraries)
+
+    write_compile_options(cm_fh, scope, "COMPILE_OPTIONS", indent=indent + 1)
+
+    write_autogen_section(cm_fh, scope, indent=indent + 1)
+
+    link_options = scope.get("QMAKE_LFLAGS")
+    if link_options:
+        cm_fh.write(f"{ind}    LINK_OPTIONS\n")
+        for lo in link_options:
+            cm_fh.write(f'{ind}        "{lo}"\n')
+
+    moc_options = scope.get("QMAKE_MOC_OPTIONS")
+    if moc_options:
+        cm_fh.write(f"{ind}    MOC_OPTIONS\n")
+        for mo in moc_options:
+            cm_fh.write(f'{ind}        "{mo}"\n')
+
+    precompiled_header = scope.get("PRECOMPILED_HEADER")
+    if precompiled_header:
+        cm_fh.write(f"{ind}    PRECOMPILED_HEADER\n")
+        for header in precompiled_header:
+            cm_fh.write(f'{ind}        "{header}"\n')
+
+    no_pch_sources = scope.get("NO_PCH_SOURCES")
+    if no_pch_sources:
+        cm_fh.write(f"{ind}    NO_PCH_SOURCES\n")
+        for source in no_pch_sources:
+            cm_fh.write(f'{ind}        "{source}"\n')
+
+
+def is_simple_condition(condition: str) -> bool:
+    return " " not in condition or (condition.startswith("NOT ") and " " not in condition[4:])
+
+
+def write_ignored_keys(scope: Scope, indent: str) -> str:
+    result = ""
+    ignored_keys = scope.keys - scope.visited_keys
+    for k in sorted(ignored_keys):
+        if k in {
+            "_INCLUDED",
+            "_LOADED",
+            "TARGET",
+            "QMAKE_DOCS",
+            "QT_SOURCE_TREE",
+            "QT_BUILD_TREE",
+            "QTRO_SOURCE_TREE",
+            "TRACEPOINT_PROVIDER",
+            "PLUGIN_TYPE",
+            "PLUGIN_CLASS_NAME",
+            "CLASS_NAME",
+            "MODULE_PLUGIN_TYPES",
+        }:
+            # All these keys are actually reported already
+            continue
+        values = scope.get(k)
+        value_string = "<EMPTY>" if not values else '"' + '" "'.join(scope.get(k)) + '"'
+        result += f"{indent}# {k} = {value_string}\n"
+
+    if result:
+        result = f"\n#### Keys ignored in scope {scope}:\n{result}"
+
+    return result
+
+
+def recursive_evaluate_scope(
+    scope: Scope, parent_condition: str = "", previous_condition: str = ""
+) -> str:
+    current_condition = scope.condition
+    total_condition = current_condition
+    if total_condition == "else":
+        assert previous_condition, f"Else branch without previous condition in: {scope.file}"
+        total_condition = f"NOT ({previous_condition})"
+    if parent_condition:
+        if not total_condition:
+            total_condition = parent_condition
+        else:
+            total_condition = f"({parent_condition}) AND ({total_condition})"
+
+    scope.total_condition = simplify_condition(total_condition)
+
+    prev_condition = ""
+    for c in scope.children:
+        prev_condition = recursive_evaluate_scope(c, total_condition, prev_condition)
+
+    return current_condition
+
+
+def map_to_cmake_condition(condition: str = "") -> str:
+    condition = condition.replace("QTDIR_build", "QT_BUILDING_QT")
+    condition = re.sub(
+        r"\bQT_ARCH___equals___([a-zA-Z_0-9]*)",
+        r'(TEST_architecture_arch STREQUAL "\1")',
+        condition or "",
+    )
+    condition = re.sub(
+        r"\bQT_ARCH___contains___([a-zA-Z_0-9]*)",
+        r'(TEST_architecture_arch STREQUAL "\1")',
+        condition or "",
+    )
+    condition = condition.replace("QT___contains___opengl", "QT_FEATURE_opengl")
+    condition = condition.replace("QT___contains___widgets", "QT_FEATURE_widgets")
+    condition = condition.replace(
+        "DEFINES___contains___QT_NO_PRINTER", "(QT_FEATURE_printer EQUAL FALSE)"
+    )
+    return condition
+
+
+resource_file_expansion_counter = 0
+
+
+def expand_resource_glob(cm_fh: IO[str], expression: str) -> str:
+    global resource_file_expansion_counter
+    r = expression.replace('"', "")
+
+    cm_fh.write(
+        dedent(
+            f"""
+        file(GLOB resource_glob_{resource_file_expansion_counter} RELATIVE "${{CMAKE_CURRENT_SOURCE_DIR}}" "{r}")
+        foreach(file IN LISTS resource_glob_{resource_file_expansion_counter})
+            set_source_files_properties("${{CMAKE_CURRENT_SOURCE_DIR}}/${{file}}" PROPERTIES QT_RESOURCE_ALIAS "${{file}}")
+        endforeach()
+        """
+        )
+    )
+
+    expanded_var = f"${{resource_glob_{resource_file_expansion_counter}}}"
+    resource_file_expansion_counter += 1
+    return expanded_var
+
+
+def write_resources(cm_fh: IO[str], target: str, scope: Scope, indent: int = 0, is_example=False):
+    # vpath = scope.expand('VPATH')
+
+    # Handle QRC files by turning them into qt_add_resource:
+    resources = scope.get_files("RESOURCES")
+    qtquickcompiler_skipped = scope.get_files("QTQUICK_COMPILER_SKIPPED_RESOURCES")
+    qtquickcompiler_retained = scope.get_files("QTQUICK_COMPILER_RETAINED_RESOURCES")
+    qrc_output = ""
+    if resources:
+        standalone_files: List[str] = []
+        for r in resources:
+            skip_qtquick_compiler = r in qtquickcompiler_skipped
+            retain_qtquick_compiler = r in qtquickcompiler_retained
+            if r.endswith(".qrc"):
+                if "${CMAKE_CURRENT_BINARY_DIR}" in r:
+                    cm_fh.write(f"#### Ignored generated resource: {r}")
+                    continue
+                qrc_output += process_qrc_file(
+                    target,
+                    r,
+                    scope.basedir,
+                    scope.file_absolute_path,
+                    skip_qtquick_compiler,
+                    retain_qtquick_compiler,
+                    is_example,
+                )
+            else:
+                immediate_files = {f: "" for f in scope.get_files(f"{r}.files")}
+                if immediate_files:
+                    immediate_files_filtered = []
+                    for f in immediate_files:
+                        if "*" in f:
+                            immediate_files_filtered.append(expand_resource_glob(cm_fh, f))
+                        else:
+                            immediate_files_filtered.append(f)
+                    immediate_files = {f: "" for f in immediate_files_filtered}
+                    scope_prefix = scope.get(f"{r}.prefix")
+                    if scope_prefix:
+                        immediate_prefix = scope_prefix[0]
+                    else:
+                        immediate_prefix = "/"
+                    immediate_base_list = scope.get(f"{r}.base")
+                    assert (
+                        len(immediate_base_list) < 2
+                    ), f"immediate base directory must be at most one entry"
+                    immediate_base = replace_path_constants("".join(immediate_base_list), scope)
+                    immediate_lang = None
+                    immediate_name = f"qmake_{r}"
+                    qrc_output += write_add_qt_resource_call(
+                        target=target,
+                        resource_name=immediate_name,
+                        prefix=immediate_prefix,
+                        base_dir=immediate_base,
+                        lang=immediate_lang,
+                        files=immediate_files,
+                        skip_qtquick_compiler=skip_qtquick_compiler,
+                        retain_qtquick_compiler=retain_qtquick_compiler,
+                        is_example=is_example,
+                    )
+                else:
+                    if "*" in r:
+                        standalone_files.append(expand_resource_glob(cm_fh, r))
+                    else:
+                        # stadalone source file properties need to be set as they
+                        # are parsed.
+                        if skip_qtquick_compiler:
+                            qrc_output += (
+                                f'set_source_files_properties("{r}" PROPERTIES '
+                                f"QT_SKIP_QUICKCOMPILER 1)\n\n"
+                            )
+
+                        if retain_qtquick_compiler:
+                            qrc_output += (
+                                f'set_source_files_properties("{r}" PROPERTIES '
+                                f"QT_RETAIN_QUICKCOMPILER 1)\n\n"
+                            )
+                        standalone_files.append(r)
+
+        if standalone_files:
+            name = "qmake_immediate"
+            prefix = "/"
+            base = ""
+            lang = None
+            files = {f: "" for f in standalone_files}
+            skip_qtquick_compiler = False
+            qrc_output += write_add_qt_resource_call(
+                target=target,
+                resource_name=name,
+                prefix=prefix,
+                base_dir=base,
+                lang=lang,
+                files=files,
+                skip_qtquick_compiler=False,
+                retain_qtquick_compiler=False,
+                is_example=is_example,
+            )
+
+    if qrc_output:
+        str_indent = spaces(indent)
+        cm_fh.write(f"\n{str_indent}# Resources:\n")
+        for line in qrc_output.split("\n"):
+            if line:
+                cm_fh.write(f"{str_indent}{line}\n")
+            else:
+                # do not add spaces to empty lines
+                cm_fh.write("\n")
+
+
+def write_statecharts(cm_fh: IO[str], target: str, scope: Scope, indent: int = 0, is_example=False):
+    sources = scope.get_files("STATECHARTS", use_vpath=True)
+    if not sources:
+        return
+    cm_fh.write("\n# Statecharts:\n")
+    if is_example:
+        cm_fh.write(f"qt6_add_statecharts({target}\n")
+    else:
+        cm_fh.write(f"add_qt_statecharts({target} FILES\n")
+    indent += 1
+    for f in sources:
+        cm_fh.write(f"{spaces(indent)}{f}\n")
+    cm_fh.write(")\n")
+
+
+def write_qlalrsources(cm_fh: IO[str], target: str, scope: Scope, indent: int = 0):
+    sources = scope.get_files("QLALRSOURCES", use_vpath=True)
+    if not sources:
+        return
+    cm_fh.write("\n# QLALR Grammars:\n")
+    cm_fh.write(f"qt_process_qlalr(\n")
+    indent += 1
+    cm_fh.write(f"{spaces(indent)}{target}\n")
+    cm_fh.write(f"{spaces(indent)}{';'.join(sources)}\n")
+    cm_fh.write(f'{spaces(indent)}""\n')
+    cm_fh.write(")\n")
+
+
+def write_repc_files(cm_fh: IO[str], target: str, scope: Scope, indent: int = 0):
+    for t in ["SOURCE", "REPLICA", "MERGED"]:
+        sources = scope.get_files("REPC_" + t, use_vpath=True)
+        if not sources:
+            continue
+        cm_fh.write(f"qt6_add_repc_{t.lower()}({target}\n")
+        indent += 1
+        for f in sources:
+            cm_fh.write(f"{spaces(indent)}{f}\n")
+        cm_fh.write(")\n")
+
+
+def write_generic_cmake_command(cm_fh: IO[str], command_name: str, arguments: List[str]):
+    arguments_str = " ".join(arguments)
+    cm_fh.write(f"{command_name}({arguments_str})\n")
+
+
+def expand_project_requirements(scope: Scope, skip_message: bool = False) -> str:
+    requirements = ""
+    for requirement in scope.get("_REQUIREMENTS"):
+        original_condition = simplify_condition(map_condition(requirement))
+        inverted_requirement = simplify_condition(f"NOT ({map_condition(requirement)})")
+        if not skip_message:
+            message = f"""
+{spaces(7)}message(NOTICE "Skipping the build as the condition \\"{original_condition}\\" is not met.")"""
+        else:
+            message = ""
+        requirements += dedent(
+            f"""\
+                        if({inverted_requirement}){message}
+                            return()
+                        endif()
+"""
+        )
+    return requirements
+
+
+def write_extend_target(cm_fh: IO[str], target: str, scope: Scope, indent: int = 0):
+    ind = spaces(indent)
+    extend_qt_io_string = io.StringIO()
+    write_sources_section(extend_qt_io_string, scope)
+    extend_qt_string = extend_qt_io_string.getvalue()
+
+    assert scope.total_condition, "Cannot write CONDITION when scope.condition is None"
+
+    condition = map_to_cmake_condition(scope.total_condition)
+
+    cmake_api_call = get_cmake_api_call("qt_extend_target")
+    extend_scope = (
+        f"\n{ind}{cmake_api_call}({target} CONDITION"
+        f" {condition}\n"
+        f"{extend_qt_string}{ind})\n"
+    )
+
+    if not extend_qt_string:
+        extend_scope = ""  # Nothing to report, so don't!
+
+    cm_fh.write(extend_scope)
+
+    io_string = io.StringIO()
+    write_resources(io_string, target, scope, indent + 1)
+    resource_string = io_string.getvalue()
+    if len(resource_string) != 0:
+        resource_string = resource_string.strip("\n").rstrip(f"\n{spaces(indent + 1)}")
+        cm_fh.write(f"\n{spaces(indent)}if({condition})\n{resource_string}")
+        cm_fh.write(f"\n{spaces(indent)}endif()\n")
+
+
+def flatten_scopes(scope: Scope) -> List[Scope]:
+    result = [scope]  # type: List[Scope]
+    for c in scope.children:
+        result += flatten_scopes(c)
+    return result
+
+
+def merge_scopes(scopes: List[Scope]) -> List[Scope]:
+    result = []  # type: List[Scope]
+
+    # Merge scopes with their parents:
+    known_scopes = {}  # type: Dict[str, Scope]
+    for scope in scopes:
+        total_condition = scope.total_condition
+        assert total_condition
+        if total_condition == "OFF":
+            # ignore this scope entirely!
+            pass
+        elif total_condition in known_scopes:
+            known_scopes[total_condition].merge(scope)
+        else:
+            # Keep everything else:
+            result.append(scope)
+            known_scopes[total_condition] = scope
+
+    return result
+
+
+def write_simd_part(cm_fh: IO[str], target: str, scope: Scope, indent: int = 0):
+    simd_options = [
+        "sse2",
+        "sse3",
+        "ssse3",
+        "sse4_1",
+        "sse4_2",
+        "aesni",
+        "shani",
+        "avx",
+        "avx2",
+        "avx512f",
+        "avx512cd",
+        "avx512er",
+        "avx512pf",
+        "avx512dq",
+        "avx512bw",
+        "avx512vl",
+        "avx512ifma",
+        "avx512vbmi",
+        "f16c",
+        "rdrnd",
+        "neon",
+        "mips_dsp",
+        "mips_dspr2",
+        "arch_haswell",
+        "avx512common",
+        "avx512core",
+    ]
+
+    simd_io_string = io.StringIO()
+
+    condition = "ON"
+    if scope.total_condition:
+        condition = map_to_cmake_condition(scope.total_condition)
+
+    if condition != "ON":
+        indent += 1
+
+    for simd in simd_options:
+        SIMD = simd.upper()
+        write_source_file_list(
+            simd_io_string,
+            scope,
+            "SOURCES",
+            [f"{SIMD}_HEADERS", f"{SIMD}_SOURCES", f"{SIMD}_C_SOURCES", f"{SIMD}_ASM"],
+            indent=indent,
+            header=f"{get_cmake_api_call('qt_add_simd_part')}({target} SIMD {simd}\n",
+            footer=")\n",
+        )
+
+    simd_string = simd_io_string.getvalue()
+    if simd_string:
+        simd_string = simd_string.rstrip("\n")
+        cond_start = ""
+        cond_end = ""
+        if condition != "ON":
+            cond_start = f"{spaces(indent - 1)}if({condition})"
+            cond_end = f"{spaces(indent - 1)}endif()"
+
+        extend_scope = f"\n{cond_start}\n" f"{simd_string}" f"\n{cond_end}\n"
+        cm_fh.write(extend_scope)
+
+
+def write_reduce_relocations_part(cm_fh: IO[str], target: str, scope: Scope, indent: int = 0):
+    ind = spaces(indent)
+    dynlist_file = scope.get_files("QMAKE_DYNAMIC_LIST_FILE")
+    if dynlist_file:
+        dynlist_path = "${CMAKE_CURRENT_LIST_DIR}/" + dynlist_file[0]
+        cm_fh.write(f'{ind}if(QT_FEATURE_reduce_relocations AND UNIX AND GCC)\n')
+        ind = spaces(indent + 1)
+        cm_fh.write(f'{ind}target_link_options({target} PRIVATE\n')
+        cm_fh.write(f'{ind}                    "LINKER:--dynamic-list={dynlist_path}")\n')
+        ind = spaces(indent)
+        cm_fh.write(f'{ind}endif()\n')
+
+
+def write_android_part(cm_fh: IO[str], target: str, scope: Scope, indent: int = 0):
+    keys = [
+        "ANDROID_BUNDLED_JAR_DEPENDENCIES",
+        "ANDROID_LIB_DEPENDENCIES",
+        "ANDROID_JAR_DEPENDENCIES",
+        "ANDROID_LIB_DEPENDENCY_REPLACEMENTS",
+        "ANDROID_BUNDLED_FILES",
+        "ANDROID_PERMISSIONS",
+        "ANDROID_PACKAGE_SOURCE_DIR",
+    ]
+
+    has_no_values = True
+    for key in keys:
+        value = scope.expand(key)
+        if len(value) != 0:
+            if has_no_values:
+                if scope.condition:
+                    cm_fh.write(f"\n{spaces(indent)}if(ANDROID AND ({scope.condition}))\n")
+                else:
+                    cm_fh.write(f"\n{spaces(indent)}if(ANDROID)\n")
+                indent += 1
+                has_no_values = False
+            cm_fh.write(f"{spaces(indent)}set_property(TARGET {target} APPEND PROPERTY QT_{key}\n")
+            write_list(cm_fh, value, "", indent + 1)
+            cm_fh.write(f"{spaces(indent)})\n")
+    indent -= 1
+
+    if not has_no_values:
+        cm_fh.write(f"{spaces(indent)}endif()\n")
+
+
+def write_wayland_part(cm_fh: IO[str], target: str, scope: Scope, indent: int = 0):
+    client_sources = scope.get_files("WAYLANDCLIENTSOURCES", use_vpath=True)
+    server_sources = scope.get_files("WAYLANDSERVERSOURCES", use_vpath=True)
+    if len(client_sources) == 0 and len(server_sources) == 0:
+        return
+
+    condition = "ON"
+    if scope.total_condition:
+        condition = map_to_cmake_condition(scope.total_condition)
+
+    if condition != "ON":
+        cm_fh.write(f"\n{spaces(indent)}if({condition})\n")
+        indent += 1
+
+    if len(client_sources) != 0:
+        cm_fh.write(f"\n{spaces(indent)}qt6_generate_wayland_protocol_client_sources({target}\n")
+        write_list(
+            cm_fh, client_sources, "FILES", indent + 1, prefix="${CMAKE_CURRENT_SOURCE_DIR}/"
+        )
+        cm_fh.write(f"{spaces(indent)})\n")
+
+    if len(server_sources) != 0:
+        cm_fh.write(f"\n{spaces(indent)}qt6_generate_wayland_protocol_server_sources({target}\n")
+        write_list(
+            cm_fh, server_sources, "FILES", indent + 1, prefix="${CMAKE_CURRENT_SOURCE_DIR}/"
+        )
+        cm_fh.write(f"{spaces(indent)})\n")
+
+    if condition != "ON":
+        indent -= 1
+        cm_fh.write(f"\n{spaces(indent)}endif()\n")
+
+
+def handle_source_subtractions(scopes: List[Scope]):
+    """
+    Handles source subtractions like SOURCES -= painting/qdrawhelper.cpp
+    by creating a new scope with a new condition containing all addition
+    and subtraction conditions.
+
+    Algorithm is as follows:
+    - Go through each scope and find files in SOURCES starting with "-"
+    - Save that file and the scope condition in modified_sources dict.
+    - Remove the file from the found scope (optionally remove the
+      NO_PCH_SOURCES entry for that file as well).
+    - Go through each file in modified_sources dict.
+    - Find scopes where the file is added, remove the file from that
+      scope and save the condition.
+    - Create a new scope just for that file with a new simplified
+      condition that takes all the other conditions into account.
+    """
+
+    def remove_file_from_operation(
+        scope: Scope, ops_key: str, file: str, op_type: Type[Operation]
+    ) -> bool:
+        """
+        Remove a source file from an operation in a scope.
+        Example: remove foo.cpp from any operations that have
+                 ops_key="SOURCES" in "scope", where the operation is of
+                 type "op_type".
+
+        The implementation is very rudimentary and might not work in
+        all cases.
+
+        Returns True if a file was found and removed in any operation.
+        """
+        file_removed = False
+        ops = scope._operations.get(ops_key, list())
+        for op in ops:
+            if not isinstance(op, op_type):
+                continue
+            if file in op._value:
+                op._value.remove(file)
+                file_removed = True
+        for include_child_scope in scope._included_children:
+            file_removed = file_removed or remove_file_from_operation(
+                include_child_scope, ops_key, file, op_type
+            )
+        return file_removed
+
+    def join_all_conditions(set_of_alternatives: Set[str]):
+        final_str = ""
+        if set_of_alternatives:
+            alternatives = [f"({alternative})" for alternative in set_of_alternatives]
+            final_str = " OR ".join(sorted(alternatives))
+        return final_str
+
+    modified_sources: Dict[str, Dict[str, Union[Set[str], bool]]] = {}
+
+    new_scopes = []
+    top_most_scope = scopes[0]
+
+    for scope in scopes:
+        sources = scope.get_files("SOURCES")
+        for file in sources:
+            # Find subtractions.
+            if file.startswith("-"):
+                file_without_minus = file[1:]
+
+                if file_without_minus not in modified_sources:
+                    modified_sources[file_without_minus] = {}
+
+                subtractions = modified_sources[file_without_minus].get("subtractions", set())
+                assert isinstance(subtractions, set)
+
+                # Add the condition to the set of conditions and remove
+                # the file subtraction from the processed scope, which
+                # will be later re-added in a new scope.
+                if scope.condition:
+                    assert scope.total_condition
+                    subtractions.add(scope.total_condition)
+                remove_file_from_operation(scope, "SOURCES", file_without_minus, RemoveOperation)
+                if subtractions:
+                    modified_sources[file_without_minus]["subtractions"] = subtractions
+
+                # In case if the source is also listed in a
+                # NO_PCH_SOURCES operation, remove it from there as
+                # well, and add it back later.
+                no_pch_source_removed = remove_file_from_operation(
+                    scope, "NO_PCH_SOURCES", file_without_minus, AddOperation
+                )
+                if no_pch_source_removed:
+                    modified_sources[file_without_minus]["add_to_no_pch_sources"] = True
+
+    for modified_source in modified_sources:
+        additions = modified_sources[modified_source].get("additions", set())
+        assert isinstance(additions, set), f"Additions must be a set, got {additions} instead."
+        subtractions = modified_sources[modified_source].get("subtractions", set())
+        assert isinstance(
+            subtractions, set
+        ), f"Subtractions must be a set, got {additions} instead."
+        add_to_no_pch_sources = modified_sources[modified_source].get(
+            "add_to_no_pch_sources", False
+        )
+
+        for scope in scopes:
+            sources = scope.get_files("SOURCES")
+            if modified_source in sources:
+                # Remove the source file from any addition operations
+                # that mention it.
+                remove_file_from_operation(scope, "SOURCES", modified_source, AddOperation)
+                if scope.total_condition:
+                    additions.add(scope.total_condition)
+
+        # Construct a condition that takes into account all addition
+        # and subtraction conditions.
+        addition_str = join_all_conditions(additions)
+        if addition_str:
+            addition_str = f"({addition_str})"
+        subtraction_str = join_all_conditions(subtractions)
+        if subtraction_str:
+            subtraction_str = f"NOT ({subtraction_str})"
+
+        condition_str = addition_str
+        if condition_str and subtraction_str:
+            condition_str += " AND "
+        condition_str += subtraction_str
+        condition_simplified = simplify_condition(condition_str)
+
+        # Create a new scope with that condition and add the source
+        # operations.
+        new_scope = Scope(
+            parent_scope=top_most_scope,
+            qmake_file=top_most_scope.file,
+            condition=condition_simplified,
+            base_dir=top_most_scope.basedir,
+        )
+        new_scope.total_condition = condition_simplified
+        new_scope._append_operation("SOURCES", AddOperation([modified_source]))
+        if add_to_no_pch_sources:
+            new_scope._append_operation("NO_PCH_SOURCES", AddOperation([modified_source]))
+
+        new_scopes.append(new_scope)
+
+    # Add all the newly created scopes.
+    scopes += new_scopes
+
+
+def write_main_part(
+    cm_fh: IO[str],
+    name: str,
+    typename: str,
+    cmake_function: str,
+    scope: Scope,
+    *,
+    extra_lines: Optional[List[str]] = None,
+    indent: int = 0,
+    extra_keys: List[str],
+    **kwargs: Any,
+):
+    # Evaluate total condition of all scopes:
+    if extra_lines is None:
+        extra_lines = []
+    recursive_evaluate_scope(scope)
+
+    if "exceptions" in scope.get("CONFIG"):
+        extra_lines.append("EXCEPTIONS")
+
+    # Get a flat list of all scopes but the main one:
+    scopes = flatten_scopes(scope)
+    # total_scopes = len(scopes)
+    # Merge scopes based on their conditions:
+    scopes = merge_scopes(scopes)
+
+    # Handle SOURCES -= foo calls, and merge scopes one more time
+    # because there might have been several files removed with the same
+    # scope condition.
+    handle_source_subtractions(scopes)
+    scopes = merge_scopes(scopes)
+
+    assert len(scopes)
+    assert scopes[0].total_condition == "ON"
+
+    scopes[0].reset_visited_keys()
+    for k in extra_keys:
+        scopes[0].get(k)
+
+    # Now write out the scopes:
+    write_header(cm_fh, name, typename, indent=indent)
+
+    # collect all testdata and insert globbing commands
+    has_test_data = False
+    if typename == "Test":
+        test_data = scope.expand("TESTDATA")
+        if test_data:
+            has_test_data = True
+            cm_fh.write("# Collect test data\n")
+            for data in test_data:
+                if "*" in data:
+                    cm_fh.write(
+                        dedent(
+                            f"""\
+                        {spaces(indent)}file(GLOB_RECURSE test_data_glob
+                        {spaces(indent+1)}RELATIVE ${{CMAKE_CURRENT_SOURCE_DIR}}
+                        {spaces(indent+1)}{data})
+                        """
+                        )
+                    )
+                    cm_fh.write(f"{spaces(indent)}list(APPEND test_data ${{test_data_glob}})\n")
+                else:
+                    cm_fh.write(f'{spaces(indent)}list(APPEND test_data "{data}")\n')
+            cm_fh.write("\n")
+
+    # Check for DESTDIR override
+    destdir = scope.get_string("DESTDIR")
+    if destdir:
+        already_added = False
+        for line in extra_lines:
+            if line.startswith("OUTPUT_DIRECTORY"):
+                already_added = True
+                break
+        if not already_added:
+            destdir = replace_path_constants(destdir, scope)
+            extra_lines.append(f'OUTPUT_DIRECTORY "{destdir}"')
+
+    cm_fh.write(f"{spaces(indent)}{cmake_function}({name}\n")
+    for extra_line in extra_lines:
+        cm_fh.write(f"{spaces(indent)}    {extra_line}\n")
+
+    write_sources_section(cm_fh, scopes[0], indent=indent, **kwargs)
+
+    if has_test_data:
+        cm_fh.write(f"{spaces(indent)}    TESTDATA ${{test_data}}\n")
+    # Footer:
+    cm_fh.write(f"{spaces(indent)})\n")
+
+    write_resources(cm_fh, name, scope, indent)
+
+    write_statecharts(cm_fh, name, scope, indent)
+
+    write_qlalrsources(cm_fh, name, scope, indent)
+
+    write_repc_files(cm_fh, name, scope, indent)
+
+    write_simd_part(cm_fh, name, scope, indent)
+
+    write_reduce_relocations_part(cm_fh, name, scope, indent)
+
+    write_android_part(cm_fh, name, scopes[0], indent)
+
+    write_wayland_part(cm_fh, name, scopes[0], indent)
+
+    if "warn_off" in scope.get("CONFIG"):
+        write_generic_cmake_command(cm_fh, "qt_disable_warnings", [name])
+
+    if "hide_symbols" in scope.get("CONFIG"):
+        write_generic_cmake_command(cm_fh, "qt_set_symbol_visibility_hidden", [name])
+
+    ignored_keys_report = write_ignored_keys(scopes[0], spaces(indent))
+    if ignored_keys_report:
+        cm_fh.write(ignored_keys_report)
+
+    # Scopes:
+    if len(scopes) == 1:
+        return
+
+    write_scope_header(cm_fh, indent=indent)
+
+    for c in scopes[1:]:
+        c.reset_visited_keys()
+        write_android_part(cm_fh, name, c, indent=indent)
+        write_wayland_part(cm_fh, name, c, indent=indent)
+        write_extend_target(cm_fh, name, c, indent=indent)
+        write_simd_part(cm_fh, name, c, indent=indent)
+
+        ignored_keys_report = write_ignored_keys(c, spaces(indent))
+        if ignored_keys_report:
+            cm_fh.write(ignored_keys_report)
+
+
+def write_3rdparty_library(cm_fh: IO[str], scope: Scope, *, indent: int = 0) -> str:
+    # Remove default QT libs.
+    scope._append_operation("QT", RemoveOperation(["core", "gui"]))
+
+    target_name = re.sub(r"^qt", "", scope.TARGET)
+    target_name = target_name.replace("-", "_")
+
+    # Capitalize the first letter for a nicer name.
+    target_name = target_name.title()
+
+    # Prefix with Bundled, to avoid possible duplicate target names
+    # e.g. "BundledFreetype" instead of "freetype".
+    target_name = f"Bundled{target_name}"
+
+    if "dll" in scope.get("CONFIG"):
+        library_type = "SHARED"
+    else:
+        library_type = "STATIC"
+
+    extra_lines = []
+
+    if library_type:
+        extra_lines.append(library_type)
+
+    if "installed" in scope.get("CONFIG"):
+        extra_lines.append("INSTALL")
+
+    write_main_part(
+        cm_fh,
+        target_name,
+        "Generic Library",
+        get_cmake_api_call("qt_add_3rdparty_library"),
+        scope,
+        extra_lines=extra_lines,
+        indent=indent,
+        known_libraries={},
+        extra_keys=[],
+    )
+
+    return target_name
+
+
+def write_generic_library(cm_fh: IO[str], scope: Scope, *, indent: int = 0) -> str:
+
+    target_name = scope.TARGET
+
+    library_type = ""
+
+    if "dll" in scope.get("CONFIG"):
+        library_type = "SHARED"
+
+    is_plugin = False
+    if "plugin" in scope.get("CONFIG"):
+        library_type = "MODULE"
+        is_plugin = True
+
+    # static after plugin in order to handle static library plugins
+    if "static" in scope.get("CONFIG"):
+        library_type = "STATIC"
+
+    extra_lines = []
+
+    if library_type:
+        extra_lines.append(library_type)
+
+    target_path = scope.expandString("target.path")
+    target_path = replace_path_constants(target_path, scope)
+    if target_path:
+        extra_lines.append(f'INSTALL_DIRECTORY "{target_path}"')
+
+    write_main_part(
+        cm_fh,
+        target_name,
+        "Generic Library",
+        get_cmake_api_call("qt_add_cmake_library"),
+        scope,
+        extra_lines=extra_lines,
+        indent=indent,
+        known_libraries={},
+        extra_keys=[],
+    )
+
+    if is_plugin:
+        # Plugins need to be able to run auto moc
+        cm_fh.write(f"\nqt_autogen_tools_initial_setup({target_name})\n")
+
+        if library_type == "STATIC":
+            cm_fh.write(f"\ntarget_compile_definitions({target_name} PRIVATE QT_STATICPLUGIN)\n")
+
+    return target_name
+
+
+def write_module(cm_fh: IO[str], scope: Scope, *, indent: int = 0) -> str:
+    module_name = scope.TARGET
+    if not module_name.startswith("Qt"):
+        print(f"XXXXXX Module name {module_name} does not start with Qt!")
+
+    extra = []
+
+    # A module should be static when 'static' is in CONFIG
+    # or when option(host_build) is used, as described in qt_module.prf.
+    is_static = "static" in scope.get("CONFIG") or "host_build" in scope.get("_OPTION")
+
+    is_public_module = True
+
+    if is_static:
+        extra.append("STATIC")
+    if "internal_module" in scope.get("CONFIG"):
+        is_public_module = False
+        extra.append("INTERNAL_MODULE")
+    if "no_module_headers" in scope.get("CONFIG"):
+        extra.append("NO_MODULE_HEADERS")
+    if "minimal_syncqt" in scope.get("CONFIG"):
+        extra.append("NO_SYNC_QT")
+    if "no_private_module" in scope.get("CONFIG"):
+        extra.append("NO_PRIVATE_MODULE")
+    else:
+        scope._has_private_module = True
+    if "header_module" in scope.get("CONFIG"):
+        extra.append("HEADER_MODULE")
+    if "metatypes" in scope.get("CONFIG") or "qmltypes" in scope.get("CONFIG"):
+        extra.append("GENERATE_METATYPES")
+
+    module_config = scope.get("MODULE_CONFIG")
+    if len(module_config):
+        extra.append(f'QMAKE_MODULE_CONFIG {" ".join(module_config)}')
+
+    module_plugin_types = scope.get_files("MODULE_PLUGIN_TYPES")
+    if module_plugin_types:
+        extra.append(f"PLUGIN_TYPES {' '.join(module_plugin_types)}")
+
+    scope._is_public_module = is_public_module
+
+    target_name = module_name[2:]
+    write_main_part(
+        cm_fh,
+        target_name,
+        "Module",
+        f"{get_cmake_api_call('qt_add_module')}",
+        scope,
+        extra_lines=extra,
+        indent=indent,
+        known_libraries={},
+        extra_keys=[],
+    )
+
+    if "qt_tracepoints" in scope.get("CONFIG"):
+        tracepoints = scope.get_files("TRACEPOINT_PROVIDER")
+        cm_fh.write(
+            f"\n\n{spaces(indent)}qt_create_tracepoints({module_name[2:]} {' '.join(tracepoints)})\n"
+        )
+
+    return target_name
+
+
+def write_tool(cm_fh: IO[str], scope: Scope, *, indent: int = 0) -> str:
+    tool_name = scope.TARGET
+
+    if "force_bootstrap" in scope.get("CONFIG"):
+        extra = ["BOOTSTRAP"]
+
+        # Remove default QT libs.
+        scope._append_operation("QT", RemoveOperation(["core", "gui"]))
+    else:
+        extra = []
+
+    write_main_part(
+        cm_fh,
+        tool_name,
+        "Tool",
+        get_cmake_api_call("qt_add_tool"),
+        scope,
+        indent=indent,
+        known_libraries={"Qt::Core"},
+        extra_lines=extra,
+        extra_keys=["CONFIG"],
+    )
+
+    return tool_name
+
+
+def write_test(cm_fh: IO[str], scope: Scope, gui: bool = False, *, indent: int = 0) -> str:
+    test_name = scope.TARGET
+    assert test_name
+
+    extra = ["GUI"] if gui else []
+    libraries = {"Qt::Core", "Qt::Test"}
+
+    if "qmltestcase" in scope.get("CONFIG"):
+        libraries.add("Qt::QmlTest")
+        extra.append("QMLTEST")
+        importpath = scope.expand("IMPORTPATH")
+        if importpath:
+            extra.append("QML_IMPORTPATH")
+            for path in importpath:
+                extra.append(f'    "{path}"')
+
+    target_original = scope.TARGET_ORIGINAL
+    if target_original and target_original.startswith("../"):
+        extra.append('OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../"')
+
+    requires_content = expand_project_requirements(scope, skip_message=True)
+    if requires_content:
+        requires_content += "\n"
+        cm_fh.write(requires_content)
+
+    write_main_part(
+        cm_fh,
+        test_name,
+        "Test",
+        get_cmake_api_call("qt_add_test"),
+        scope,
+        indent=indent,
+        known_libraries=libraries,
+        extra_lines=extra,
+        extra_keys=[],
+    )
+
+    return test_name
+
+
+def write_binary(cm_fh: IO[str], scope: Scope, gui: bool = False, *, indent: int = 0) -> str:
+    binary_name = scope.TARGET
+    assert binary_name
+
+    is_benchmark = is_benchmark_project(scope.file_absolute_path)
+    is_manual_test = is_manual_test_project(scope.file_absolute_path)
+
+    is_qt_test_helper = "qt_test_helper" in scope.get("_LOADED")
+
+    extra = ["GUI"] if gui and not is_qt_test_helper else []
+    cmake_function_call = get_cmake_api_call("qt_add_executable")
+    extra_keys: List[str] = []
+
+    if is_qt_test_helper:
+        binary_name += "_helper"
+        cmake_function_call = get_cmake_api_call("qt_add_test_helper")
+
+    if is_benchmark:
+        cmake_function_call = get_cmake_api_call("qt_add_benchmark")
+    elif is_manual_test:
+        cmake_function_call = get_cmake_api_call("qt_add_manual_test")
+    else:
+        extra_keys = ["target.path", "INSTALLS"]
+        target_path = scope.get_string("target.path")
+        if target_path:
+            target_path = replace_path_constants(target_path, scope)
+            if not scope.get("DESTDIR"):
+                extra.append(f'OUTPUT_DIRECTORY "{target_path}"')
+            if "target" in scope.get("INSTALLS"):
+                extra.append(f'INSTALL_DIRECTORY "{target_path}"')
+
+    write_main_part(
+        cm_fh,
+        binary_name,
+        "Binary",
+        cmake_function_call,
+        scope,
+        extra_lines=extra,
+        indent=indent,
+        known_libraries={"Qt::Core"},
+        extra_keys=extra_keys,
+    )
+
+    return binary_name
+
+
+def write_find_package_section(
+    cm_fh: IO[str], public_libs: List[str], private_libs: List[str], *, indent: int = 0
+):
+    packages = []  # type: List[LibraryMapping]
+    all_libs = public_libs + private_libs
+
+    for l in all_libs:
+        info = find_library_info_for_target(l)
+        if info and info not in packages:
+            packages.append(info)
+
+    # ind = spaces(indent)
+
+    for p in packages:
+        cm_fh.write(generate_find_package_info(p, use_qt_find_package=False, indent=indent))
+
+    if packages:
+        cm_fh.write("\n")
+
+
+def write_jar(cm_fh: IO[str], scope: Scope, *, indent: int = 0) -> str:
+
+    target = scope.TARGET
+
+    install_dir = scope.expandString("target.path")
+    if not install_dir:
+        raise RuntimeError("Could not locate jar install path")
+    install_dir = install_dir.replace("$$[QT_INSTALL_PREFIX]/", "")
+
+    android_sdk_jar = "${QT_ANDROID_JAR}"
+    android_api_level = scope.get_string("API_VERSION")
+    if android_api_level:
+        cm_fh.write(
+            f'{spaces(indent)}qt_get_android_sdk_jar_for_api("{android_api_level}" android_sdk)\n\n'
+        )
+        android_sdk_jar = "${android_sdk}"
+
+    write_source_file_list(
+        cm_fh, scope, "", ["JAVASOURCES"], indent=indent, header=f"set(java_sources\n", footer=")\n"
+    )
+
+    cm_fh.write(f"{spaces(indent)}add_jar({target}\n")
+    cm_fh.write(f"{spaces(indent+1)}INCLUDE_JARS {android_sdk_jar}\n")
+    cm_fh.write(f"{spaces(indent+1)}SOURCES ${{java_sources}}\n")
+    cm_fh.write(f"{spaces(indent)})\n\n")
+
+    cm_fh.write(f"{spaces(indent)}install_jar({target}\n")
+    cm_fh.write(f"{spaces(indent+1)}DESTINATION {install_dir}\n")
+    cm_fh.write(f"{spaces(indent+1)}COMPONENT Devel\n")
+    cm_fh.write(f"{spaces(indent)})\n\n")
+
+    return target
+
+
+def write_example(
+    cm_fh: IO[str], scope: Scope, gui: bool = False, *, indent: int = 0, is_plugin: bool = False
+) -> str:
+    binary_name = scope.TARGET
+    assert binary_name
+
+    example_install_dir = scope.expandString("target.path")
+    if not example_install_dir:
+        example_install_dir = "examples"
+    example_install_dir = example_install_dir.replace("$$[QT_INSTALL_EXAMPLES]", "examples")
+
+    cm_fh.write(
+        "cmake_minimum_required(VERSION 3.14)\n"
+        f"project({binary_name} LANGUAGES CXX)\n\n"
+        "set(CMAKE_INCLUDE_CURRENT_DIR ON)\n\n"
+        "set(CMAKE_AUTOMOC ON)\n"
+        "set(CMAKE_AUTORCC ON)\n"
+        "set(CMAKE_AUTOUIC ON)\n\n"
+        f'set(INSTALL_EXAMPLEDIR "{example_install_dir}")\n\n'
+    )
+
+    recursive_evaluate_scope(scope)
+
+    # Get a flat list of all scopes but the main one:
+    scopes = flatten_scopes(scope)
+    # Merge scopes based on their conditions:
+    scopes = merge_scopes(scopes)
+    # Handle SOURCES -= foo calls, and merge scopes one more time
+    # because there might have been several files removed with the same
+    # scope condition.
+    handle_source_subtractions(scopes)
+    scopes = merge_scopes(scopes)
+
+    (public_libs, private_libs) = extract_cmake_libraries(scope, is_example=True)
+    write_find_package_section(cm_fh, public_libs, private_libs, indent=indent)
+
+    add_target = ""
+
+    qmldir = None
+    if is_plugin:
+        if "qml" in scope.get("QT"):
+            # Get the uri from the destination directory
+            dest_dir = scope.expandString("DESTDIR")
+            if not dest_dir:
+                dest_dir = "${CMAKE_CURRENT_BINARY_DIR}"
+            else:
+                uri = os.path.basename(dest_dir)
+                dest_dir = f"${{CMAKE_CURRENT_BINARY_DIR}}/{dest_dir}"
+
+            add_target = ""
+
+            qml_dir = None
+            qml_dir_dynamic_imports = False
+
+            qmldir_file_path_list = scope.get_files("qmldir.files")
+            assert len(qmldir_file_path_list) < 2, "File path must only contain one path"
+            qmldir_file_path = qmldir_file_path_list[0] if qmldir_file_path_list else "qmldir"
+            qmldir_file_path = os.path.join(os.getcwd(), qmldir_file_path[0])
+
+            dynamic_qmldir = scope.get("DYNAMIC_QMLDIR")
+            if os.path.exists(qmldir_file_path):
+                qml_dir = QmlDir()
+                qml_dir.from_file(qmldir_file_path)
+            elif dynamic_qmldir:
+                qml_dir = QmlDir()
+                qml_dir.from_lines(dynamic_qmldir)
+                qml_dir_dynamic_imports = True
+
+                add_target += "set(module_dynamic_qml_imports\n    "
+                if len(qml_dir.imports) != 0:
+                    add_target += "\n    ".join(qml_dir.imports)
+                add_target += "\n)\n\n"
+
+                for sc in scopes[1:]:
+                    import_list = []
+                    qml_imports = sc.get("DYNAMIC_QMLDIR")
+                    for qml_import in qml_imports:
+                        if not qml_import.startswith("import "):
+                            raise RuntimeError(
+                                "Only qmldir import statements expected in conditional scope!"
+                            )
+                        import_list.append(qml_import[len("import ") :])
+                    if len(import_list) == 0:
+                        continue
+
+                    assert sc.condition
+
+                    add_target += f"if ({sc.condition})\n"
+                    add_target += f"    list(APPEND module_dynamic_qml_imports\n        "
+                    add_target += "\n        ".join(import_list)
+                    add_target += f"\n    )\nendif()\n\n"
+
+            add_target += dedent(
+                f"""\
+                qt6_add_qml_module({binary_name}
+                    OUTPUT_DIRECTORY "{dest_dir}"
+                    VERSION 1.0
+                    URI "{uri}"
+                    """
+            )
+
+            if qml_dir is not None:
+                if qml_dir.designer_supported:
+                    add_target += "    DESIGNER_SUPPORTED\n"
+                if len(qml_dir.classname) != 0:
+                    add_target += f"    CLASSNAME {qml_dir.classname}\n"
+                if len(qml_dir.depends) != 0:
+                    add_target += "    DEPENDENCIES\n"
+                    for dep in qml_dir.depends:
+                        add_target += f"        {dep[0]}/{dep[1]}\n"
+                if len(qml_dir.type_names) == 0:
+                    add_target += "    SKIP_TYPE_REGISTRATION\n"
+                if len(qml_dir.imports) != 0 and not qml_dir_dynamic_imports:
+                    qml_dir_imports_line = "        \n".join(qml_dir.imports)
+                    add_target += f"    IMPORTS\n{qml_dir_imports_line}"
+                if qml_dir_dynamic_imports:
+                    add_target += "    IMPORTS ${module_dynamic_qml_imports}\n"
+
+            add_target += "    INSTALL_LOCATION ${INSTALL_EXAMPLEDIR}\n)\n\n"
+            add_target += f"target_sources({binary_name} PRIVATE"
+        else:
+            add_target = f"add_library({binary_name} MODULE"
+
+    else:
+        add_target = f'add_{"qt_gui_" if gui else ""}executable({binary_name}'
+
+    write_all_source_file_lists(cm_fh, scope, add_target, indent=0)
+    cm_fh.write(")\n")
+
+    handling_first_scope = True
+
+    for scope in scopes:
+        # write wayland already has condition scope handling
+        write_wayland_part(cm_fh, binary_name, scope, indent=0)
+
+        # The following options do not
+        io_string = io.StringIO()
+        condition_str = ""
+        condition = "ON"
+        if scope.total_condition:
+            condition = map_to_cmake_condition(scope.total_condition)
+
+        if condition != "ON":
+            condition_str = f"\n{spaces(indent)}if({condition})\n"
+            indent += 1
+
+        if not handling_first_scope:
+            target_sources = f"target_sources({binary_name} PUBLIC"
+            write_all_source_file_lists(
+                io_string, scope, target_sources, indent=indent, footer=")\n"
+            )
+
+        write_include_paths(
+            io_string,
+            scope,
+            f"target_include_directories({binary_name} PUBLIC",
+            indent=indent,
+            footer=")\n",
+        )
+        write_defines(
+            io_string,
+            scope,
+            f"target_compile_definitions({binary_name} PUBLIC",
+            indent=indent,
+            footer=")\n",
+        )
+
+        (scope_public_libs, scope_private_libs) = extract_cmake_libraries(scope, is_example=True)
+
+        write_list(
+            io_string,
+            scope_private_libs,
+            "",
+            indent=indent,
+            header=f"target_link_libraries({binary_name} PRIVATE\n",
+            footer=")\n",
+        )
+        write_list(
+            io_string,
+            scope_public_libs,
+            "",
+            indent=indent,
+            header=f"target_link_libraries({binary_name} PUBLIC\n",
+            footer=")\n",
+        )
+        write_compile_options(
+            io_string, scope, f"target_compile_options({binary_name}", indent=indent, footer=")\n"
+        )
+
+        write_resources(io_string, binary_name, scope, indent=indent, is_example=True)
+        write_statecharts(io_string, binary_name, scope, indent=indent, is_example=True)
+        write_repc_files(io_string, binary_name, scope, indent=indent)
+
+        if condition != "ON":
+            indent -= 1
+        string = io_string.getvalue()
+        if len(string) != 0:
+            string = string.rstrip("\n")
+            cm_fh.write(f"{condition_str}{string}\n")
+            if condition != "ON":
+                cm_fh.write(f"{spaces(indent)}endif()\n")
+
+        handling_first_scope = False
+
+    if qmldir:
+        write_qml_plugin_epilogue(cm_fh, binary_name, scope, qmldir, indent)
+
+    cm_fh.write(
+        f"\ninstall(TARGETS {binary_name}\n"
+        f'    RUNTIME DESTINATION "${{INSTALL_EXAMPLEDIR}}"\n'
+        f'    BUNDLE DESTINATION "${{INSTALL_EXAMPLEDIR}}"\n'
+        f'    LIBRARY DESTINATION "${{INSTALL_EXAMPLEDIR}}"\n'
+        f")\n"
+    )
+
+    return binary_name
+
+
+def write_plugin(cm_fh, scope, *, indent: int = 0) -> str:
+    extra = []
+    is_qml_plugin = any("qml_plugin" == s for s in scope.get("_LOADED"))
+    qmake_target_name = scope.TARGET
+
+    # Forward the original Qt5 plugin target name, to correctly name the
+    # final library file name, and also for .prl generation.
+    if qmake_target_name and not is_qml_plugin:
+        extra.append(f"OUTPUT_NAME {qmake_target_name}")
+
+    # In Qt 6 CMake, the CMake target name for a plugin should be the
+    # same as it is in Qt5. qmake in Qt 5 derived the CMake target name
+    # from the "plugin class name", so use that.
+    # If the class name isn't empty, use that as the target name.
+    # Otherwise use the of value qmake TARGET
+    plugin_class_name = scope.get_string("PLUGIN_CLASS_NAME")
+    if plugin_class_name:
+        plugin_name = plugin_class_name
+    else:
+        plugin_name = qmake_target_name
+    assert plugin_name
+
+    # If the target name is derived from the class name, no need to
+    # forward the class name.
+    if plugin_class_name and plugin_class_name != plugin_name:
+        extra.append(f"CLASS_NAME {plugin_class_name}")
+
+    qmldir = None
+    plugin_type = scope.get_string("PLUGIN_TYPE")
+    plugin_function_name = get_cmake_api_call("qt_add_plugin")
+    if plugin_type:
+        extra.append(f"TYPE {plugin_type}")
+    elif is_qml_plugin:
+        plugin_function_name = get_cmake_api_call("qt_add_qml_module")
+        qmldir = write_qml_plugin(cm_fh, plugin_name, scope, indent=indent, extra_lines=extra)
+    else:
+        target_path = scope.expandString("target.path")
+        target_path = replace_path_constants(target_path, scope)
+        if target_path:
+            extra.append(f'INSTALL_DIRECTORY "{target_path}"')
+        else:
+            extra.append("SKIP_INSTALL")
+    if "qmltypes" in scope.get("CONFIG"):
+        extra.append("GENERATE_QMLTYPES")
+
+    if "static" in scope.get("CONFIG"):
+        extra.append("STATIC")
+
+    write_main_part(
+        cm_fh,
+        plugin_name,
+        "Plugin",
+        plugin_function_name,
+        scope,
+        indent=indent,
+        extra_lines=extra,
+        known_libraries={},
+        extra_keys=[],
+    )
+
+    if qmldir:
+        write_qml_plugin_epilogue(cm_fh, plugin_name, scope, qmldir, indent)
+
+    return plugin_name
+
+
+def write_qml_plugin(
+    cm_fh: IO[str],
+    target: str,
+    scope: Scope,
+    *,
+    extra_lines: Optional[List[str]] = None,
+    indent: int = 0,
+    **kwargs: Any,
+) -> Optional[QmlDir]:
+    # Collect other args if available
+    if extra_lines is None:
+        extra_lines = []
+    indent += 2
+
+    target_path = scope.get_string("TARGETPATH")
+    if target_path:
+        uri = target_path.replace("/", ".")
+        import_name = scope.get_string("IMPORT_NAME")
+        # Catch special cases such as foo.QtQuick.2.bar, which when converted
+        # into a target path via cmake will result in foo/QtQuick/2/bar, which is
+        # not what we want. So we supply the target path override.
+        target_path_from_uri = uri.replace(".", "/")
+        if target_path != target_path_from_uri:
+            extra_lines.append(f'TARGET_PATH "{target_path}"')
+        if import_name:
+            extra_lines.append(f'URI "{import_name}"')
+        else:
+            uri = re.sub("\\.\\d+", "", uri)
+            extra_lines.append(f'URI "{uri}"')
+
+    import_version = scope.get_string("IMPORT_VERSION")
+    if import_version:
+        import_version = import_version.replace(
+            "$$QT_MINOR_VERSION", "${CMAKE_PROJECT_VERSION_MINOR}"
+        )
+        extra_lines.append(f'VERSION "{import_version}"')
+
+    plugindump_dep = scope.get_string("QML_PLUGINDUMP_DEPENDENCIES")
+
+    if plugindump_dep:
+        extra_lines.append(f'QML_PLUGINDUMP_DEPENDENCIES "{plugindump_dep}"')
+
+    qml_dir = None
+    qmldir_file_path = os.path.join(os.getcwd(), "qmldir")
+    qml_dir_dynamic_imports = False
+    if os.path.exists(qmldir_file_path):
+        qml_dir = QmlDir()
+        qml_dir.from_file(qmldir_file_path)
+    else:
+        dynamic_qmldir = scope.get("DYNAMIC_QMLDIR")
+        if not dynamic_qmldir:
+            return None
+        qml_dir = QmlDir()
+        qml_dir.from_lines(dynamic_qmldir)
+        qml_dir_dynamic_imports = True
+
+        # Check scopes for conditional entries
+        scopes = flatten_scopes(scope)
+        cm_fh.write("set(module_dynamic_qml_imports\n    ")
+        if len(qml_dir.imports) != 0:
+            cm_fh.write("\n    ".join(qml_dir.imports))
+        cm_fh.write("\n)\n\n")
+
+        for sc in scopes[1:]:
+            import_list = []
+            qml_imports = sc.get("DYNAMIC_QMLDIR")
+            for qml_import in qml_imports:
+                if not qml_import.startswith("import "):
+                    raise RuntimeError(
+                        "Only qmldir import statements expected in conditional scope!"
+                    )
+                import_list.append(qml_import[len("import ") :])
+            if len(import_list) == 0:
+                continue
+
+            assert sc.condition
+
+            cm_fh.write(f"if ({sc.condition})\n")
+            cm_fh.write(f"    list(APPEND module_dynamic_qml_imports\n        ")
+            cm_fh.write("\n        ".join(import_list))
+            cm_fh.write(f"\n    )\nendif()\n\n")
+
+    if qml_dir is not None:
+        if qml_dir.designer_supported:
+            extra_lines.append("DESIGNER_SUPPORTED")
+        if len(qml_dir.classname) != 0:
+            extra_lines.append(f"CLASSNAME {qml_dir.classname}")
+        if len(qml_dir.depends) != 0:
+            extra_lines.append("DEPENDENCIES")
+            for dep in qml_dir.depends:
+                extra_lines.append(f"    {dep[0]}/{dep[1]}")
+        if len(qml_dir.type_names) == 0:
+            extra_lines.append("SKIP_TYPE_REGISTRATION")
+        if len(qml_dir.imports) != 0 and not qml_dir_dynamic_imports:
+            qml_dir_imports_line = "\n        ".join(qml_dir.imports)
+            extra_lines.append("IMPORTS\n        " f"{qml_dir_imports_line}")
+        if qml_dir_dynamic_imports:
+            extra_lines.append("IMPORTS ${module_dynamic_qml_imports}")
+
+    return qml_dir
+
+
+def write_qml_plugin_epilogue(
+    cm_fh: IO[str], target: str, scope: Scope, qmldir: QmlDir, indent: int = 0
+):
+
+    qml_files = scope.get_files("QML_FILES", use_vpath=True)
+    if qml_files:
+
+        indent_0 = spaces(indent)
+        indent_1 = spaces(indent + 1)
+        # Quote file paths in case there are spaces.
+        qml_files_quoted = [f'"{qf}"' for qf in qml_files]
+
+        indented_qml_files = f"\n{indent_1}".join(qml_files_quoted)
+        cm_fh.write(f"\n{indent_0}set(qml_files\n{indent_1}" f"{indented_qml_files}\n)\n")
+
+        for qml_file in qml_files:
+            if qml_file in qmldir.type_names:
+                qmldir_file_info = qmldir.type_names[qml_file]
+                cm_fh.write(f"{indent_0}set_source_files_properties({qml_file} PROPERTIES\n")
+                cm_fh.write(f'{indent_1}QT_QML_SOURCE_VERSION "{qmldir_file_info.version}"\n')
+                # Only write typename if they are different, CMake will infer
+                # the name by default
+                if (
+                    os.path.splitext(os.path.basename(qmldir_file_info.path))[0]
+                    != qmldir_file_info.type_name
+                ):
+                    cm_fh.write(f"{indent_1}QT_QML_SOURCE_TYPENAME {qmldir_file_info.type_name}\n")
+                if qmldir_file_info.singleton:
+                    cm_fh.write(f"{indent_1}QT_QML_SINGLETON_TYPE TRUE\n")
+                if qmldir_file_info.internal:
+                    cm_fh.write(f"{indent_1}QT_QML_INTERNAL_TYPE TRUE\n")
+                cm_fh.write(f"{indent_0})\n")
+
+        cm_fh.write(
+            f"\n{indent_0}qt6_target_qml_files({target}\n{indent_1}FILES\n"
+            f"{spaces(indent+2)}${{qml_files}}\n)\n"
+        )
+
+
+def handle_app_or_lib(
+    scope: Scope, cm_fh: IO[str], *, indent: int = 0, is_example: bool = False
+) -> None:
+    assert scope.TEMPLATE in ("app", "lib")
+
+    config = scope.get("CONFIG")
+    is_jar = "java" in config
+    is_lib = scope.TEMPLATE == "lib"
+    is_qml_plugin = any("qml_plugin" == s for s in scope.get("_LOADED"))
+    is_plugin = "plugin" in config
+    is_qt_plugin = any("qt_plugin" == s for s in scope.get("_LOADED")) or is_qml_plugin
+    target = ""
+    gui = all(
+        val not in config for val in ["console", "cmdline", "-app_bundle"]
+    ) and "testlib" not in scope.expand("QT")
+
+    if is_jar:
+        write_jar(cm_fh, scope, indent=indent)
+    elif "qt_helper_lib" in scope.get("_LOADED"):
+        assert not is_example
+        target = write_3rdparty_library(cm_fh, scope, indent=indent)
+    elif is_example:
+        target = write_example(cm_fh, scope, gui, indent=indent, is_plugin=is_plugin)
+    elif is_qt_plugin:
+        assert not is_example
+        target = write_plugin(cm_fh, scope, indent=indent)
+    elif (is_lib and "qt_module" not in scope.get("_LOADED")) or is_plugin:
+        assert not is_example
+        target = write_generic_library(cm_fh, scope, indent=indent)
+    elif is_lib or "qt_module" in scope.get("_LOADED"):
+        assert not is_example
+        target = write_module(cm_fh, scope, indent=indent)
+    elif "qt_tool" in scope.get("_LOADED"):
+        assert not is_example
+        target = write_tool(cm_fh, scope, indent=indent)
+    else:
+        if "testcase" in config or "testlib" in config or "qmltestcase" in config:
+            assert not is_example
+            target = write_test(cm_fh, scope, gui, indent=indent)
+        else:
+            target = write_binary(cm_fh, scope, gui, indent=indent)
+
+    # ind = spaces(indent)
+    cmake_api_call = get_cmake_api_call("qt_add_docs")
+    write_source_file_list(
+        cm_fh,
+        scope,
+        "",
+        ["QMAKE_DOCS"],
+        indent,
+        header=f"{cmake_api_call}({target}\n",
+        footer=")\n",
+    )
+
+    # Generate qmltypes instruction for anything that may have CONFIG += qmltypes
+    # that is not a qml plugin
+    if "qmltypes" in scope.get("CONFIG") and "qml_plugin" not in scope.get("_LOADED"):
+        cm_fh.write(f"\n{spaces(indent)}set_target_properties({target} PROPERTIES\n")
+        cm_fh.write(f"{spaces(indent+1)}QT_QML_MODULE_INSTALL_QMLTYPES TRUE\n")
+
+        import_version = scope.get_string("IMPORT_VERSION")
+        if not import_version:
+            import_version = scope.get_string("QML_IMPORT_VERSION")
+        if not import_version:
+            import_major_version = scope.get_string("QML_IMPORT_MAJOR_VERSION")
+            import_minor_version = scope.get_string("QML_IMPORT_MINOR_VERSION")
+
+            if not import_major_version and not import_minor_version:
+                raise RuntimeError(f"No QML_IMPORT_VERSION info found for target {target}.")
+
+            if not import_minor_version:
+                import_minor_version = str(0)
+            import_version = f"{import_major_version}.{import_minor_version}"
+
+        if import_version:
+            import_version = import_version.replace(
+                "$$QT_MINOR_VERSION", "${CMAKE_PROJECT_VERSION_MINOR}"
+            )
+            cm_fh.write(f"{spaces(indent+1)}QT_QML_MODULE_VERSION {import_version}\n")
+
+        import_name = scope.expandString("QML_IMPORT_NAME")
+        if import_name:
+            cm_fh.write(f"{spaces(indent+1)}QT_QML_MODULE_URI {import_name}\n")
+
+        target_path = scope.get("TARGETPATH")
+        if target_path:
+            cm_fh.write(f"{spaces(indent+1)}QT_QML_MODULE_TARGET_PATH {target_path}\n")
+
+        install_dir = scope.expandString("QMLTYPES_INSTALL_DIR")
+        if install_dir:
+            install_dir = install_dir.replace("$$[QT_INSTALL_QML]", "${INSTALL_QMLDIR}")
+            cm_fh.write(f'{spaces(indent+1)}QT_QML_MODULE_INSTALL_DIR "{install_dir}"\n')
+
+        cm_fh.write(f"{spaces(indent)})\n\n")
+        cm_fh.write(f"qt6_qml_type_registration({target})\n")
+
+
+def handle_top_level_repo_project(scope: Scope, cm_fh: IO[str]):
+    # qtdeclarative
+    project_file_name = os.path.splitext(os.path.basename(scope.file_absolute_path))[0]
+
+    # declarative
+    file_name_without_qt_prefix = project_file_name[2:]
+
+    # Qt::Declarative
+    qt_lib = map_qt_library(file_name_without_qt_prefix)
+
+    # Found a mapping, adjust name.
+    if qt_lib != file_name_without_qt_prefix:
+        # QtDeclarative
+        qt_lib = re.sub(r":", r"", qt_lib)
+
+        # Declarative
+        qt_lib_no_prefix = qt_lib[2:]
+    else:
+        qt_lib += "_FIXME"
+        qt_lib_no_prefix = qt_lib
+
+    header = dedent(
+        f"""\
+                cmake_minimum_required(VERSION {cmake_version_string})
+
+                project({qt_lib}
+                    VERSION 6.0.0
+                    DESCRIPTION "Qt {qt_lib_no_prefix} Libraries"
+                    HOMEPAGE_URL "https://qt.io/"
+                    LANGUAGES CXX C
+                )
+
+                find_package(Qt6 ${{PROJECT_VERSION}} CONFIG REQUIRED COMPONENTS BuildInternals Core SET_ME_TO_SOMETHING_USEFUL)
+                find_package(Qt6 ${{PROJECT_VERSION}} CONFIG OPTIONAL_COMPONENTS SET_ME_TO_SOMETHING_USEFUL)
+
+                """
+    )
+
+    build_repo = dedent(
+        f"""\
+                qt_build_repo()
+                """
+    )
+
+    cm_fh.write(f"{header}{expand_project_requirements(scope)}{build_repo}")
+
+
+def find_top_level_repo_project_file(project_file_path: str = "") -> Optional[str]:
+    qmake_conf_path = find_qmake_conf(project_file_path)
+    qmake_dir = os.path.dirname(qmake_conf_path)
+
+    # Hope to a programming god that there's only one .pro file at the
+    # top level directory of repository.
+    glob_result = glob.glob(os.path.join(qmake_dir, "*.pro"))
+    if len(glob_result) > 0:
+        return glob_result[0]
+    return None
+
+
+def handle_top_level_repo_tests_project(scope: Scope, cm_fh: IO[str]):
+    top_level_project_path = find_top_level_repo_project_file(scope.file_absolute_path)
+    if top_level_project_path:
+        # qtdeclarative
+        file_name = os.path.splitext(os.path.basename(top_level_project_path))[0]
+
+        # declarative
+        file_name_without_qt = file_name[2:]
+
+        # Qt::Declarative
+        qt_lib = map_qt_library(file_name_without_qt)
+
+        # Found a mapping, adjust name.
+        if qt_lib != file_name_without_qt:
+            # QtDeclarative
+            qt_lib = f'{re.sub(r":", r"", qt_lib)}{"Tests"}'
+        else:
+            qt_lib += "Tests_FIXME"
+    else:
+        qt_lib = "Tests_FIXME"
+
+    requires_content = expand_project_requirements(scope, skip_message=True)
+    if requires_content:
+        requires_content = f"\n\n{textwrap_indent(requires_content, spaces(3))}"
+
+    content = dedent(
+        f"""\
+        if(QT_BUILD_STANDALONE_TESTS)
+            # Add qt_find_package calls for extra dependencies that need to be found when building
+            # the standalone tests here.
+        endif()
+        qt_build_tests()
+"""
+    )
+
+    cm_fh.write(f"{content}")
+
+
+def write_regular_cmake_target_scope_section(
+    scope: Scope, cm_fh: IO[str], indent: int = 0, skip_sources: bool = False
+):
+    if not skip_sources:
+        target_sources = "target_sources(${PROJECT_NAME} PUBLIC"
+        write_all_source_file_lists(cm_fh, scope, target_sources, indent=indent, footer=")")
+
+    write_include_paths(
+        cm_fh,
+        scope,
+        f"target_include_directories(${{PROJECT_NAME}} PUBLIC",
+        indent=indent,
+        footer=")",
+    )
+    write_defines(
+        cm_fh,
+        scope,
+        f"target_compile_definitions(${{PROJECT_NAME}} PUBLIC",
+        indent=indent,
+        footer=")",
+    )
+    (public_libs, private_libs) = extract_cmake_libraries(scope)
+    write_list(
+        cm_fh,
+        private_libs,
+        "",
+        indent=indent,
+        header=f"target_link_libraries(${{PROJECT_NAME}} PRIVATE\n",
+        footer=")",
+    )
+    write_list(
+        cm_fh,
+        public_libs,
+        "",
+        indent=indent,
+        header=f"target_link_libraries(${{PROJECT_NAME}} PUBLIC\n",
+        footer=")",
+    )
+    write_compile_options(
+        cm_fh, scope, f"target_compile_options(${{PROJECT_NAME}}", indent=indent, footer=")"
+    )
+
+
+def handle_config_test_project(scope: Scope, cm_fh: IO[str]):
+    project_name = os.path.splitext(os.path.basename(scope.file_absolute_path))[0]
+    content = (
+        f"cmake_minimum_required(VERSION 3.14.0)\n"
+        f"project(config_test_{project_name} LANGUAGES CXX)\n"
+    )
+    cm_fh.write(f"{content}\n")
+
+    # Remove default QT libs.
+    scope._append_operation("QT", RemoveOperation(["core", "gui"]))
+
+    add_target = f"add_executable(${{PROJECT_NAME}}"
+
+    temp_buffer = io.StringIO()
+    write_all_source_file_lists(temp_buffer, scope, add_target, indent=0)
+    buffer_value = temp_buffer.getvalue()
+
+    if buffer_value:
+        cm_fh.write(buffer_value)
+    else:
+        cm_fh.write(add_target)
+    cm_fh.write(")\n")
+
+    indent = 0
+    write_regular_cmake_target_scope_section(scope, cm_fh, indent, skip_sources=True)
+
+    recursive_evaluate_scope(scope)
+    scopes = flatten_scopes(scope)
+    scopes = merge_scopes(scopes)
+
+    assert len(scopes)
+    assert scopes[0].total_condition == "ON"
+
+    for c in scopes[1:]:
+        extend_scope_io_string = io.StringIO()
+        write_regular_cmake_target_scope_section(c, extend_scope_io_string, indent=indent + 1)
+        extend_string = extend_scope_io_string.getvalue()
+
+        if extend_string:
+            assert c.total_condition, "Cannot write if with empty condition"
+            extend_scope = (
+                f"\nif({map_to_cmake_condition(c.total_condition)})\n"
+                f"{extend_string}"
+                f"endif()\n"
+            )
+            cm_fh.write(extend_scope)
+
+
+def cmakeify_scope(
+    scope: Scope, cm_fh: IO[str], *, indent: int = 0, is_example: bool = False
+) -> None:
+    template = scope.TEMPLATE
+
+    temp_buffer = io.StringIO()
+
+    # Handle top level repo project in a special way.
+    if is_top_level_repo_project(scope.file_absolute_path):
+        handle_top_level_repo_project(scope, temp_buffer)
+    # Same for top-level tests.
+    elif is_top_level_repo_tests_project(scope.file_absolute_path):
+        handle_top_level_repo_tests_project(scope, temp_buffer)
+    elif is_config_test_project(scope.file_absolute_path):
+        handle_config_test_project(scope, temp_buffer)
+    elif template == "subdirs":
+        handle_subdir(scope, temp_buffer, indent=indent, is_example=is_example)
+    elif template in ("app", "lib"):
+        handle_app_or_lib(scope, temp_buffer, indent=indent, is_example=is_example)
+    else:
+        print(f"    XXXX: {scope.file}: Template type {template} not yet supported.")
+
+    buffer_value = temp_buffer.getvalue()
+
+    if is_top_level_repo_examples_project(scope.file_absolute_path):
+        # Wrap top level examples project with some commands which
+        # are necessary to build examples as part of the overall
+        # build.
+        buffer_value = f"qt_examples_build_begin()\n\n{buffer_value}\nqt_examples_build_end()\n"
+
+    cm_fh.write(buffer_value)
+
+
+def generate_new_cmakelists(scope: Scope, *, is_example: bool = False, debug: bool = False) -> None:
+    if debug:
+        print("Generating CMakeLists.gen.txt")
+    with open(scope.generated_cmake_lists_path, "w") as cm_fh:
+        assert scope.file
+        cm_fh.write(f"# Generated from {os.path.basename(scope.file)}.\n\n")
+
+        is_example_heuristic = is_example_project(scope.file_absolute_path)
+        final_is_example_decision = is_example or is_example_heuristic
+        cmakeify_scope(scope, cm_fh, is_example=final_is_example_decision)
+
+
+def do_include(scope: Scope, *, debug: bool = False) -> None:
+    for c in scope.children:
+        do_include(c)
+
+    for include_index, include_file in enumerate(scope.get_files("_INCLUDED", is_include=True)):
+        if not include_file:
+            continue
+        if not os.path.isfile(include_file):
+            generated_config_pri_pattern = re.compile(r"qt.+?-config\.pri$")
+            match_result = re.search(generated_config_pri_pattern, include_file)
+            if not match_result:
+                print(f"    XXXX: Failed to include {include_file}.")
+            continue
+
+        include_op = scope._get_operation_at_index("_INCLUDED", include_index)
+        include_line_no = include_op._line_no
+
+        include_result, project_file_content = parseProFile(include_file, debug=debug)
+        include_scope = Scope.FromDict(
+            None,
+            include_file,
+            include_result.asDict().get("statements"),
+            "",
+            scope.basedir,
+            project_file_content=project_file_content,
+            parent_include_line_no=include_line_no,
+        )  # This scope will be merged into scope!
+
+        do_include(include_scope)
+
+        scope.merge(include_scope)
+
+
+def copy_generated_file_to_final_location(
+    scope: Scope, keep_temporary_files=False, debug: bool = False
+) -> None:
+    if debug:
+        print(f"Copying {scope.generated_cmake_lists_path} to {scope.original_cmake_lists_path}")
+    copyfile(scope.generated_cmake_lists_path, scope.original_cmake_lists_path)
+    if not keep_temporary_files:
+        os.remove(scope.generated_cmake_lists_path)
+
+
+def cmake_project_has_skip_marker(project_file_path: str = "") -> bool:
+    dir_path = os.path.dirname(project_file_path)
+    cmake_project_path = os.path.join(dir_path, "CMakeLists.txt")
+    if not os.path.exists(cmake_project_path):
+        return False
+
+    with open(cmake_project_path, "r") as file_fd:
+        contents = file_fd.read()
+
+    if "# special case skip regeneration" in contents:
+        return True
+
+    return False
+
+
+def should_convert_project(project_file_path: str = "", ignore_skip_marker: bool = False) -> bool:
+    qmake_conf_path = find_qmake_conf(project_file_path)
+    qmake_conf_dir_path = os.path.dirname(qmake_conf_path)
+
+    project_relative_path = os.path.relpath(project_file_path, qmake_conf_dir_path)
+
+    # Skip cmake auto tests, they should not be converted.
+    if project_relative_path.startswith("tests/auto/cmake"):
+        return False
+    if project_relative_path.startswith("tests/auto/installed_cmake"):
+        return False
+
+    # Skip qmake testdata projects.
+    if project_relative_path.startswith("tests/auto/tools/qmake/testdata"):
+        return False
+
+    # Skip certain config tests.
+    config_tests = [
+        # Relative to qtbase/config.tests
+        "arch/arch.pro",
+        "avx512/avx512.pro",
+        "stl/stl.pro",
+        "verifyspec/verifyspec.pro",
+        "x86_simd/x86_simd.pro",
+        # Relative to repo src dir
+        "config.tests/hostcompiler/hostcompiler.pro",
+    ]
+    skip_certain_tests = any(project_relative_path.startswith(c) for c in config_tests)
+    if skip_certain_tests:
+        return False
+
+    # Skip if CMakeLists.txt in the same path as project_file_path has a
+    # special skip marker.
+    if not ignore_skip_marker and cmake_project_has_skip_marker(project_file_path):
+        return False
+
+    return True
+
+
+def should_convert_project_after_parsing(
+    file_scope: Scope, skip_subdirs_project: bool = False
+) -> bool:
+    template = file_scope.TEMPLATE
+    if template == "subdirs" and skip_subdirs_project:
+        return False
+    return True
+
+
+def main() -> None:
+    # Be sure of proper Python version
+    assert sys.version_info >= (3, 7)
+
+    args = _parse_commandline()
+
+    debug_parsing = args.debug_parser or args.debug
+    if args.skip_condition_cache:
+        set_condition_simplified_cache_enabled(False)
+
+    backup_current_dir = os.getcwd()
+
+    for file in args.files:
+        new_current_dir = os.path.dirname(file)
+        file_relative_path = os.path.basename(file)
+        if new_current_dir:
+            os.chdir(new_current_dir)
+
+        project_file_absolute_path = os.path.abspath(file_relative_path)
+        if not should_convert_project(project_file_absolute_path, args.ignore_skip_marker):
+            print(f'Skipping conversion of project: "{project_file_absolute_path}"')
+            continue
+
+        parseresult, project_file_content = parseProFile(file_relative_path, debug=debug_parsing)
+
+        # If CMake api version is given on command line, that means the
+        # user wants to force use that api version.
+        global cmake_api_version
+        if args.api_version:
+            cmake_api_version = args.api_version
+        else:
+            # Otherwise detect the api version in the old CMakeLists.txt
+            # if it exsists.
+            detected_cmake_api_version = detect_cmake_api_version_used_in_file_content(
+                file_relative_path
+            )
+            if detected_cmake_api_version:
+                cmake_api_version = detected_cmake_api_version
+
+        if args.debug_parse_result or args.debug:
+            print("\n\n#### Parser result:")
+            print(parseresult)
+            print("\n#### End of parser result.\n")
+        if args.debug_parse_dictionary or args.debug:
+            print("\n\n####Parser result dictionary:")
+            print(parseresult.asDict())
+            print("\n#### End of parser result dictionary.\n")
+
+        file_scope = Scope.FromDict(
+            None,
+            file_relative_path,
+            parseresult.asDict().get("statements"),
+            project_file_content=project_file_content,
+        )
+
+        if args.debug_pro_structure or args.debug:
+            print("\n\n#### .pro/.pri file structure:")
+            file_scope.dump()
+            print("\n#### End of .pro/.pri file structure.\n")
+
+        do_include(file_scope, debug=debug_parsing)
+
+        if args.debug_full_pro_structure or args.debug:
+            print("\n\n#### Full .pro/.pri file structure:")
+            file_scope.dump()
+            print("\n#### End of full .pro/.pri file structure.\n")
+
+        if not should_convert_project_after_parsing(file_scope, args.skip_subdirs_project):
+            print(f'Skipping conversion of project: "{project_file_absolute_path}"')
+            continue
+
+        generate_new_cmakelists(file_scope, is_example=args.is_example, debug=args.debug)
+
+        copy_generated_file = True
+        if not args.skip_special_case_preservation:
+            debug_special_case = args.debug_special_case_preservation or args.debug
+            handler = SpecialCaseHandler(
+                file_scope.original_cmake_lists_path,
+                file_scope.generated_cmake_lists_path,
+                file_scope.basedir,
+                keep_temporary_files=args.keep_temporary_files,
+                debug=debug_special_case,
+            )
+
+            copy_generated_file = handler.handle_special_cases()
+
+        if copy_generated_file:
+            copy_generated_file_to_final_location(
+                file_scope, keep_temporary_files=args.keep_temporary_files
+            )
+        os.chdir(backup_current_dir)
+
+
+if __name__ == "__main__":
+    main()
diff --git a/util/cmake/pro_conversion_rate.py b/util/cmake/pro_conversion_rate.py
new file mode 100755
index 0000000000..3c0c7e3070
--- /dev/null
+++ b/util/cmake/pro_conversion_rate.py
@@ -0,0 +1,235 @@
+#!/usr/bin/env python3
+#############################################################################
+##
+## Copyright (C) 2019 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the plugins of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:GPL-EXCEPT$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 as published by the Free Software
+## Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+from __future__ import annotations
+
+"""
+This utility script shows statistics about
+converted .pro -> CMakeLists.txt files.
+
+To execute: python3 pro_conversion_rate.py <src dir>
+where <src dir> can be any qt source directory. For better statistics,
+specify a module root source dir (like ./qtbase or ./qtsvg).
+
+"""
+
+from argparse import ArgumentParser
+
+import os
+import typing
+from typing import Dict, Union
+from timeit import default_timer
+
+
+def _parse_commandline():
+    parser = ArgumentParser(description="Find pro files for which there are no CMakeLists.txt.")
+    parser.add_argument(
+        "source_directory", metavar="<src dir>", type=str, help="The source directory"
+    )
+
+    return parser.parse_args()
+
+
+class Blacklist:
+    """ Class to check if a certain dir_name / dir_path is blacklisted """
+
+    def __init__(self, names: typing.List[str], path_parts: typing.List[str]):
+        self.names = names
+        self.path_parts = path_parts
+
+        # The lookup algorithm
+        self.lookup = self.is_blacklisted_part
+        self.tree = None
+
+        try:
+            # If package is available, use Aho-Corasick algorithm,
+            from ahocorapy.keywordtree import KeywordTree  # type: ignore
+
+            self.tree = KeywordTree(case_insensitive=True)
+
+            for p in self.path_parts:
+                self.tree.add(p)
+            self.tree.finalize()
+
+            self.lookup = self.is_blacklisted_part_aho
+        except ImportError:
+            pass
+
+    def is_blacklisted(self, dir_name: str, dir_path: str) -> bool:
+        # First check if exact dir name is blacklisted.
+        if dir_name in self.names:
+            return True
+
+        # Check if a path part is blacklisted (e.g. util/cmake)
+        return self.lookup(dir_path)
+
+    def is_blacklisted_part(self, dir_path: str) -> bool:
+        if any(part in dir_path for part in self.path_parts):
+            return True
+        return False
+
+    def is_blacklisted_part_aho(self, dir_path: str) -> bool:
+        return self.tree.search(dir_path) is not None  # type: ignore
+
+
+def recursive_scan(path: str, extension: str, result_paths: typing.List[str], blacklist: Blacklist):
+    """ Find files ending with a certain extension, filtering out blacklisted entries """
+    try:
+        for entry in os.scandir(path):
+            if entry.is_file() and entry.path.endswith(extension):
+                result_paths.append(entry.path)
+            elif entry.is_dir():
+                if blacklist.is_blacklisted(entry.name, entry.path):
+                    continue
+                recursive_scan(entry.path, extension, result_paths, blacklist)
+    except Exception as e:
+        print(e)
+
+
+def check_for_cmake_project(pro_path: str) -> bool:
+    pro_dir_name = os.path.dirname(pro_path)
+    cmake_project_path = os.path.join(pro_dir_name, "CMakeLists.txt")
+    return os.path.exists(cmake_project_path)
+
+
+def compute_stats(
+    src_path: str,
+    pros_with_missing_project: typing.List[str],
+    total_pros: int,
+    existing_pros: int,
+    missing_pros: int,
+) -> dict:
+    stats: Dict[str, Dict[str, Union[str, int, float]]] = {}
+    stats["total projects"] = {"label": "Total pro files found", "value": total_pros}
+    stats["existing projects"] = {
+        "label": "Existing CMakeLists.txt files found",
+        "value": existing_pros,
+    }
+    stats["missing projects"] = {
+        "label": "Missing CMakeLists.txt files found",
+        "value": missing_pros,
+    }
+    stats["missing examples"] = {"label": "Missing examples", "value": 0}
+    stats["missing tests"] = {"label": "Missing tests", "value": 0}
+    stats["missing src"] = {"label": "Missing src/**/**", "value": 0}
+    stats["missing plugins"] = {"label": "Missing plugins", "value": 0}
+
+    for p in pros_with_missing_project:
+        rel_path = os.path.relpath(p, src_path)
+        if rel_path.startswith("examples"):
+            assert isinstance(stats["missing examples"]["value"], int)
+            stats["missing examples"]["value"] += 1
+        elif rel_path.startswith("tests"):
+            assert isinstance(stats["missing tests"]["value"], int)
+            stats["missing tests"]["value"] += 1
+        elif rel_path.startswith(os.path.join("src", "plugins")):
+            assert isinstance(stats["missing plugins"]["value"], int)
+            stats["missing plugins"]["value"] += 1
+        elif rel_path.startswith("src"):
+            assert isinstance(stats["missing src"]["value"], int)
+            stats["missing src"]["value"] += 1
+
+    for stat in stats:
+        if int(stats[stat]["value"]) > 0:
+            stats[stat]["percentage"] = round(float(stats[stat]["value"]) * 100 / total_pros, 2)
+    return stats
+
+
+def print_stats(
+    src_path: str,
+    pros_with_missing_project: typing.List[str],
+    stats: dict,
+    scan_time: float,
+    script_time: float,
+):
+
+    if stats["total projects"]["value"] == 0:
+        print("No .pro files found. Did you specify a correct source path?")
+        return
+
+    if stats["total projects"]["value"] == stats["existing projects"]["value"]:
+        print("All projects were converted.")
+    else:
+        print("Missing CMakeLists.txt files for the following projects: \n")
+
+        for p in pros_with_missing_project:
+            rel_path = os.path.relpath(p, src_path)
+            print(rel_path)
+
+    print("\nStatistics: \n")
+
+    for stat in stats:
+        if stats[stat]["value"] > 0:
+            print(
+                f"{stats[stat]['label']:<40}: {stats[stat]['value']} ({stats[stat]['percentage']}%)"
+            )
+
+    print(f"\n{'Scan time':<40}: {scan_time:.10f} seconds")
+    print(f"{'Total script time':<40}: {script_time:.10f} seconds")
+
+
+def main():
+    args = _parse_commandline()
+    src_path = os.path.abspath(args.source_directory)
+    pro_paths = []
+
+    extension = ".pro"
+
+    blacklist_names = ["config.tests", "doc", "3rdparty", "angle"]
+    blacklist_path_parts = [os.path.join("util", "cmake")]
+
+    script_start_time = default_timer()
+    blacklist = Blacklist(blacklist_names, blacklist_path_parts)
+
+    scan_time_start = default_timer()
+    recursive_scan(src_path, extension, pro_paths, blacklist)
+    scan_time_end = default_timer()
+    scan_time = scan_time_end - scan_time_start
+
+    total_pros = len(pro_paths)
+
+    pros_with_missing_project = []
+    for pro_path in pro_paths:
+        if not check_for_cmake_project(pro_path):
+            pros_with_missing_project.append(pro_path)
+
+    missing_pros = len(pros_with_missing_project)
+    existing_pros = total_pros - missing_pros
+
+    stats = compute_stats(
+        src_path, pros_with_missing_project, total_pros, existing_pros, missing_pros
+    )
+    script_end_time = default_timer()
+    script_time = script_end_time - script_start_time
+
+    print_stats(src_path, pros_with_missing_project, stats, scan_time, script_time)
+
+
+if __name__ == "__main__":
+    main()
diff --git a/util/cmake/qmake_parser.py b/util/cmake/qmake_parser.py
new file mode 100644
index 0000000000..5cb629a495
--- /dev/null
+++ b/util/cmake/qmake_parser.py
@@ -0,0 +1,388 @@
+#!/usr/bin/env python3
+#############################################################################
+##
+## Copyright (C) 2018 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the plugins of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:GPL-EXCEPT$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 as published by the Free Software
+## Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+import collections
+import os
+import re
+from itertools import chain
+from typing import Tuple
+
+import pyparsing as pp  # type: ignore
+
+from helper import _set_up_py_parsing_nicer_debug_output
+
+_set_up_py_parsing_nicer_debug_output(pp)
+
+
+def fixup_linecontinuation(contents: str) -> str:
+    # Remove all line continuations, aka a backslash followed by
+    # a newline character with an arbitrary amount of whitespace
+    # between the backslash and the newline.
+    # This greatly simplifies the qmake parsing grammar.
+    contents = re.sub(r"([^\t ])\\[ \t]*\n", "\\1 ", contents)
+    contents = re.sub(r"\\[ \t]*\n", "", contents)
+    return contents
+
+
+def fixup_comments(contents: str) -> str:
+    # Get rid of completely commented out lines.
+    # So any line which starts with a '#' char and ends with a new line
+    # will be replaced by a single new line.
+    #
+    # This is needed because qmake syntax is weird. In a multi line
+    # assignment (separated by backslashes and newlines aka
+    # # \\\n ), if any of the lines are completely commented out, in
+    # principle the assignment should fail.
+    #
+    # It should fail because you would have a new line separating
+    # the previous value from the next value, and the next value would
+    # not be interpreted as a value, but as a new token / operation.
+    # qmake is lenient though, and accepts that, so we need to take
+    # care of it as well, as if the commented line didn't exist in the
+    # first place.
+
+    contents = re.sub(r"\n#[^\n]*?\n", "\n", contents, re.DOTALL)
+    return contents
+
+
+def flatten_list(l):
+    """ Flattens an irregular nested list into a simple list."""
+    for el in l:
+        if isinstance(el, collections.abc.Iterable) and not isinstance(el, (str, bytes)):
+            yield from flatten_list(el)
+        else:
+            yield el
+
+
+def handle_function_value(group: pp.ParseResults):
+    function_name = group[0]
+    function_args = group[1]
+    if function_name == "qtLibraryTarget":
+        if len(function_args) > 1:
+            raise RuntimeError(
+                "Don't know what to with more than one function argument "
+                "for $$qtLibraryTarget()."
+            )
+        return str(function_args[0])
+
+    if function_name == "quote":
+        # Do nothing, just return a string result
+        return str(group)
+
+    if function_name == "files":
+        return str(function_args[0])
+
+    if function_name == "basename":
+        if len(function_args) != 1:
+            print(f"XXXX basename with more than one argument")
+        if function_args[0] == "_PRO_FILE_PWD_":
+            return os.path.basename(os.getcwd())
+        print(f"XXXX basename with value other than _PRO_FILE_PWD_")
+        return os.path.basename(str(function_args[0]))
+
+    if isinstance(function_args, pp.ParseResults):
+        function_args = list(flatten_list(function_args.asList()))
+
+    # For other functions, return the whole expression as a string.
+    return f"$${function_name}({' '.join(function_args)})"
+
+
+class QmakeParser:
+    def __init__(self, *, debug: bool = False) -> None:
+        self.debug = debug
+        self._Grammar = self._generate_grammar()
+
+    def _generate_grammar(self):
+        # Define grammar:
+        pp.ParserElement.setDefaultWhitespaceChars(" \t")
+
+        def add_element(name: str, value: pp.ParserElement):
+            nonlocal self
+            if self.debug:
+                value.setName(name)
+                value.setDebug()
+            return value
+
+        EOL = add_element("EOL", pp.Suppress(pp.LineEnd()))
+        Else = add_element("Else", pp.Keyword("else"))
+        Identifier = add_element(
+            "Identifier", pp.Word(f"{pp.alphas}_", bodyChars=pp.alphanums + "_-./")
+        )
+        BracedValue = add_element(
+            "BracedValue",
+            pp.nestedExpr(
+                ignoreExpr=pp.quotedString
+                | pp.QuotedString(
+                    quoteChar="$(", endQuoteChar=")", escQuote="\\", unquoteResults=False
+                )
+            ).setParseAction(lambda s, l, t: ["(", *t[0], ")"]),
+        )
+
+        Substitution = add_element(
+            "Substitution",
+            pp.Combine(
+                pp.Literal("$")
+                + (
+                    (
+                        (pp.Literal("$") + Identifier + pp.Optional(pp.nestedExpr()))
+                        | (pp.Literal("(") + Identifier + pp.Literal(")"))
+                        | (pp.Literal("{") + Identifier + pp.Literal("}"))
+                        | (
+                            pp.Literal("$")
+                            + pp.Literal("{")
+                            + Identifier
+                            + pp.Optional(pp.nestedExpr())
+                            + pp.Literal("}")
+                        )
+                        | (pp.Literal("$") + pp.Literal("[") + Identifier + pp.Literal("]"))
+                    )
+                )
+            ),
+        )
+        LiteralValuePart = add_element(
+            "LiteralValuePart", pp.Word(pp.printables, excludeChars="$#{}()")
+        )
+        SubstitutionValue = add_element(
+            "SubstitutionValue",
+            pp.Combine(pp.OneOrMore(Substitution | LiteralValuePart | pp.Literal("$"))),
+        )
+        FunctionValue = add_element(
+            "FunctionValue",
+            pp.Group(
+                pp.Suppress(pp.Literal("$") + pp.Literal("$"))
+                + Identifier
+                + pp.nestedExpr()  # .setParseAction(lambda s, l, t: ['(', *t[0], ')'])
+            ).setParseAction(lambda s, l, t: handle_function_value(*t)),
+        )
+        Value = add_element(
+            "Value",
+            pp.NotAny(Else | pp.Literal("}") | EOL)
+            + (
+                pp.QuotedString(quoteChar='"', escChar="\\")
+                | FunctionValue
+                | SubstitutionValue
+                | BracedValue
+            ),
+        )
+
+        Values = add_element("Values", pp.ZeroOrMore(Value)("value"))
+
+        Op = add_element(
+            "OP",
+            pp.Literal("=")
+            | pp.Literal("-=")
+            | pp.Literal("+=")
+            | pp.Literal("*=")
+            | pp.Literal("~="),
+        )
+
+        Key = add_element("Key", Identifier)
+
+        Operation = add_element(
+            "Operation", Key("key") + pp.locatedExpr(Op)("operation") + Values("value")
+        )
+        CallArgs = add_element("CallArgs", pp.nestedExpr())
+
+        def parse_call_args(results):
+            out = ""
+            for item in chain(*results):
+                if isinstance(item, str):
+                    out += item
+                else:
+                    out += "(" + parse_call_args(item) + ")"
+            return out
+
+        CallArgs.setParseAction(parse_call_args)
+
+        Load = add_element("Load", pp.Keyword("load") + CallArgs("loaded"))
+        Include = add_element(
+            "Include", pp.Keyword("include") + pp.locatedExpr(CallArgs)("included")
+        )
+        Option = add_element("Option", pp.Keyword("option") + CallArgs("option"))
+        RequiresCondition = add_element("RequiresCondition", pp.originalTextFor(pp.nestedExpr()))
+
+        def parse_requires_condition(s, l, t):
+            # The following expression unwraps the condition via the additional info
+            # set by originalTextFor.
+            condition_without_parentheses = s[t._original_start + 1 : t._original_end - 1]
+
+            # And this replaces the colons with '&&' similar how it's done for 'Condition'.
+            condition_without_parentheses = (
+                condition_without_parentheses.strip().replace(":", " && ").strip(" && ")
+            )
+            return condition_without_parentheses
+
+        RequiresCondition.setParseAction(parse_requires_condition)
+        Requires = add_element(
+            "Requires", pp.Keyword("requires") + RequiresCondition("project_required_condition")
+        )
+
+        # ignore the whole thing...
+        DefineTestDefinition = add_element(
+            "DefineTestDefinition",
+            pp.Suppress(
+                pp.Keyword("defineTest")
+                + CallArgs
+                + pp.nestedExpr(opener="{", closer="}", ignoreExpr=pp.LineEnd())
+            ),
+        )
+
+        # ignore the whole thing...
+        ForLoop = add_element(
+            "ForLoop",
+            pp.Suppress(
+                pp.Keyword("for")
+                + CallArgs
+                + pp.nestedExpr(opener="{", closer="}", ignoreExpr=pp.LineEnd())
+            ),
+        )
+
+        # ignore the whole thing...
+        ForLoopSingleLine = add_element(
+            "ForLoopSingleLine",
+            pp.Suppress(pp.Keyword("for") + CallArgs + pp.Literal(":") + pp.SkipTo(EOL)),
+        )
+
+        # ignore the whole thing...
+        FunctionCall = add_element("FunctionCall", pp.Suppress(Identifier + pp.nestedExpr()))
+
+        Scope = add_element("Scope", pp.Forward())
+
+        Statement = add_element(
+            "Statement",
+            pp.Group(
+                Load
+                | Include
+                | Option
+                | Requires
+                | ForLoop
+                | ForLoopSingleLine
+                | DefineTestDefinition
+                | FunctionCall
+                | Operation
+            ),
+        )
+        StatementLine = add_element("StatementLine", Statement + (EOL | pp.FollowedBy("}")))
+        StatementGroup = add_element(
+            "StatementGroup", pp.ZeroOrMore(StatementLine | Scope | pp.Suppress(EOL))
+        )
+
+        Block = add_element(
+            "Block",
+            pp.Suppress("{")
+            + pp.Optional(EOL)
+            + StatementGroup
+            + pp.Optional(EOL)
+            + pp.Suppress("}")
+            + pp.Optional(EOL),
+        )
+
+        ConditionEnd = add_element(
+            "ConditionEnd",
+            pp.FollowedBy(
+                (pp.Optional(pp.White()) + (pp.Literal(":") | pp.Literal("{") | pp.Literal("|")))
+            ),
+        )
+
+        ConditionPart1 = add_element(
+            "ConditionPart1", (pp.Optional("!") + Identifier + pp.Optional(BracedValue))
+        )
+        ConditionPart2 = add_element("ConditionPart2", pp.CharsNotIn("#{}|:=\\\n"))
+        ConditionPart = add_element(
+            "ConditionPart", (ConditionPart1 ^ ConditionPart2) + ConditionEnd
+        )
+
+        ConditionOp = add_element("ConditionOp", pp.Literal("|") ^ pp.Literal(":"))
+        ConditionWhiteSpace = add_element(
+            "ConditionWhiteSpace", pp.Suppress(pp.Optional(pp.White(" ")))
+        )
+
+        ConditionRepeated = add_element(
+            "ConditionRepeated", pp.ZeroOrMore(ConditionOp + ConditionWhiteSpace + ConditionPart)
+        )
+
+        Condition = add_element("Condition", pp.Combine(ConditionPart + ConditionRepeated))
+        Condition.setParseAction(lambda x: " ".join(x).strip().replace(":", " && ").strip(" && "))
+
+        # Weird thing like write_file(a)|error() where error() is the alternative condition
+        # which happens to be a function call. In this case there is no scope, but our code expects
+        # a scope with a list of statements, so create a fake empty statement.
+        ConditionEndingInFunctionCall = add_element(
+            "ConditionEndingInFunctionCall",
+            pp.Suppress(ConditionOp)
+            + FunctionCall
+            + pp.Empty().setParseAction(lambda x: [[]]).setResultsName("statements"),
+        )
+
+        SingleLineScope = add_element(
+            "SingleLineScope",
+            pp.Suppress(pp.Literal(":")) + pp.Group(Block | (Statement + EOL))("statements"),
+        )
+        MultiLineScope = add_element("MultiLineScope", Block("statements"))
+
+        SingleLineElse = add_element(
+            "SingleLineElse",
+            pp.Suppress(pp.Literal(":")) + (Scope | Block | (Statement + pp.Optional(EOL))),
+        )
+        MultiLineElse = add_element("MultiLineElse", Block)
+        ElseBranch = add_element("ElseBranch", pp.Suppress(Else) + (SingleLineElse | MultiLineElse))
+
+        # Scope is already add_element'ed in the forward declaration above.
+        Scope <<= pp.Group(
+            Condition("condition")
+            + (SingleLineScope | MultiLineScope | ConditionEndingInFunctionCall)
+            + pp.Optional(ElseBranch)("else_statements")
+        )
+
+        Grammar = StatementGroup("statements")
+        Grammar.ignore(pp.pythonStyleComment())
+
+        return Grammar
+
+    def parseFile(self, file: str) -> Tuple[pp.ParseResults, str]:
+        print(f'Parsing "{file}"...')
+        try:
+            with open(file, "r") as file_fd:
+                contents = file_fd.read()
+
+            # old_contents = contents
+            contents = fixup_comments(contents)
+            contents = fixup_linecontinuation(contents)
+            result = self._Grammar.parseString(contents, parseAll=True)
+        except pp.ParseException as pe:
+            print(pe.line)
+            print(f"{' ' * (pe.col-1)}^")
+            print(pe)
+            raise pe
+        return result, contents
+
+
+def parseProFile(file: str, *, debug=False) -> Tuple[pp.ParseResults, str]:
+    parser = QmakeParser(debug=debug)
+    return parser.parseFile(file)
diff --git a/util/cmake/requirements.txt b/util/cmake/requirements.txt
new file mode 100644
index 0000000000..16fb99a08c
--- /dev/null
+++ b/util/cmake/requirements.txt
@@ -0,0 +1,8 @@
+pytest; python_version >= '3.7'
+pytest-cov; python_version >= '3.7'
+mypy; python_version >= '3.7'
+pyparsing; python_version >= '3.7'
+sympy; python_version >= '3.7'
+portalocker; python_version >= '3.7'
+black; python_version >= '3.7'
+
diff --git a/util/cmake/run_pro2cmake.py b/util/cmake/run_pro2cmake.py
new file mode 100755
index 0000000000..4a12c57b83
--- /dev/null
+++ b/util/cmake/run_pro2cmake.py
@@ -0,0 +1,246 @@
+#!/usr/bin/env python3
+#############################################################################
+##
+## Copyright (C) 2018 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the plugins of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:GPL-EXCEPT$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 as published by the Free Software
+## Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+import glob
+import os
+import subprocess
+import concurrent.futures
+import sys
+import typing
+import argparse
+from argparse import ArgumentParser
+
+
+def parse_command_line() -> argparse.Namespace:
+    parser = ArgumentParser(
+        description="Run pro2cmake on all .pro files recursively in given path. "
+        "You can pass additional arguments to the pro2cmake calls by appending "
+        "-- --foo --bar"
+    )
+    parser.add_argument(
+        "--only-existing",
+        dest="only_existing",
+        action="store_true",
+        help="Run pro2cmake only on .pro files that already have a CMakeLists.txt.",
+    )
+    parser.add_argument(
+        "--only-missing",
+        dest="only_missing",
+        action="store_true",
+        help="Run pro2cmake only on .pro files that do not have a CMakeLists.txt.",
+    )
+    parser.add_argument(
+        "--only-qtbase-main-modules",
+        dest="only_qtbase_main_modules",
+        action="store_true",
+        help="Run pro2cmake only on the main modules in qtbase.",
+    )
+    parser.add_argument(
+        "--skip-subdirs-projects",
+        dest="skip_subdirs_projects",
+        action="store_true",
+        help="Don't run pro2cmake on TEMPLATE=subdirs projects.",
+    )
+    parser.add_argument(
+        "--is-example",
+        dest="is_example",
+        action="store_true",
+        help="Run pro2cmake with --is-example flag.",
+    )
+    parser.add_argument(
+        "--count", dest="count", help="How many projects should be converted.", type=int
+    )
+    parser.add_argument(
+        "--offset",
+        dest="offset",
+        help="From the list of found projects, from which project should conversion begin.",
+        type=int,
+    )
+    parser.add_argument(
+        "path", metavar="<path>", type=str, help="The path where to look for .pro files."
+    )
+
+    args, unknown = parser.parse_known_args()
+
+    # Error out when the unknown arguments do not start with a "--",
+    # which implies passing through arguments to pro2cmake.
+    if len(unknown) > 0 and unknown[0] != "--":
+        parser.error("unrecognized arguments: {}".format(" ".join(unknown)))
+    else:
+        args.pro2cmake_args = unknown[1:]
+
+    return args
+
+
+def find_all_pro_files(base_path: str, args: argparse.Namespace):
+    def sorter(pro_file: str) -> str:
+        """ Sorter that tries to prioritize main pro files in a directory. """
+        pro_file_without_suffix = pro_file.rsplit("/", 1)[-1][:-4]
+        dir_name = os.path.dirname(pro_file)
+        if dir_name == ".":
+            dir_name = os.path.basename(os.getcwd())
+        if dir_name.endswith(pro_file_without_suffix):
+            return dir_name
+        return dir_name + "/__" + pro_file
+
+    all_files = []
+    previous_dir_name: typing.Optional[str] = None
+
+    print("Finding .pro files.")
+    glob_result = glob.glob(os.path.join(base_path, "**/*.pro"), recursive=True)
+
+    def cmake_lists_exists_filter(path):
+        path_dir_name = os.path.dirname(path)
+        if os.path.exists(os.path.join(path_dir_name, "CMakeLists.txt")):
+            return True
+        return False
+
+    def cmake_lists_missing_filter(path):
+        return not cmake_lists_exists_filter(path)
+
+    def qtbase_main_modules_filter(path):
+        main_modules = [
+            "corelib",
+            "network",
+            "gui",
+            "widgets",
+            "testlib",
+            "printsupport",
+            "opengl",
+            "sql",
+            "dbus",
+            "concurrent",
+            "xml",
+        ]
+        path_suffixes = [f"src/{m}/{m}.pro" for m in main_modules]
+
+        for path_suffix in path_suffixes:
+            if path.endswith(path_suffix):
+                return True
+        return False
+
+    filter_result = glob_result
+    filter_func = None
+    if args.only_existing:
+        filter_func = cmake_lists_exists_filter
+    elif args.only_missing:
+        filter_func = cmake_lists_missing_filter
+    elif args.only_qtbase_main_modules:
+        filter_func = qtbase_main_modules_filter
+
+    if filter_func:
+        print("Filtering.")
+        filter_result = [p for p in filter_result if filter_func(p)]
+
+    for pro_file in sorted(filter_result, key=sorter):
+        dir_name = os.path.dirname(pro_file)
+        if dir_name == previous_dir_name:
+            print("Skipping:", pro_file)
+        else:
+            all_files.append(pro_file)
+            previous_dir_name = dir_name
+    return all_files
+
+
+def run(all_files: typing.List[str], pro2cmake: str, args: argparse.Namespace) -> typing.List[str]:
+    failed_files = []
+    files_count = len(all_files)
+    workers = os.cpu_count() or 1
+
+    if args.only_qtbase_main_modules:
+        # qtbase main modules take longer than usual to process.
+        workers = 2
+
+    with concurrent.futures.ThreadPoolExecutor(max_workers=workers, initargs=(10,)) as pool:
+        print("Firing up thread pool executor.")
+
+        def _process_a_file(data: typing.Tuple[str, int, int]) -> typing.Tuple[int, str, str]:
+            filename, index, total = data
+            pro2cmake_args = []
+            if sys.platform == "win32":
+                pro2cmake_args.append(sys.executable)
+            pro2cmake_args.append(pro2cmake)
+            if args.is_example:
+                pro2cmake_args.append("--is-example")
+            if args.skip_subdirs_projects:
+                pro2cmake_args.append("--skip-subdirs-project")
+            pro2cmake_args.append(os.path.basename(filename))
+
+            if args.pro2cmake_args:
+                pro2cmake_args += args.pro2cmake_args
+
+            result = subprocess.run(
+                pro2cmake_args,
+                cwd=os.path.dirname(filename),
+                stdout=subprocess.PIPE,
+                stderr=subprocess.STDOUT,
+            )
+            stdout = f"Converted[{index}/{total}]: {filename}\n"
+            return result.returncode, filename, stdout + result.stdout.decode()
+
+        for return_code, filename, stdout in pool.map(
+            _process_a_file,
+            zip(all_files, range(1, files_count + 1), (files_count for _ in all_files)),
+        ):
+            if return_code:
+                failed_files.append(filename)
+            print(stdout)
+
+    return failed_files
+
+
+def main() -> None:
+    args = parse_command_line()
+
+    script_path = os.path.dirname(os.path.abspath(__file__))
+    pro2cmake = os.path.join(script_path, "pro2cmake.py")
+    base_path = args.path
+
+    all_files = find_all_pro_files(base_path, args)
+    if args.offset:
+        all_files = all_files[args.offset :]
+    if args.count:
+        all_files = all_files[: args.count]
+    files_count = len(all_files)
+
+    failed_files = run(all_files, pro2cmake, args)
+    if len(all_files) == 0:
+        print("No files found.")
+
+    if failed_files:
+        print(
+            f"The following files were not successfully "
+            f"converted ({len(failed_files)} of {files_count}):"
+        )
+        for f in failed_files:
+            print(f'    "{f}"')
+
+
+if __name__ == "__main__":
+    main()
diff --git a/util/cmake/special_case_helper.py b/util/cmake/special_case_helper.py
new file mode 100644
index 0000000000..48c7181a04
--- /dev/null
+++ b/util/cmake/special_case_helper.py
@@ -0,0 +1,415 @@
+#!/usr/bin/env python3
+#############################################################################
+##
+## Copyright (C) 2019 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the plugins of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:GPL-EXCEPT$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 as published by the Free Software
+## Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+"""
+This is a helper script that takes care of reapplying special case
+modifications when regenerating a CMakeLists.txt file using
+pro2cmake.py.
+
+It has two modes of operation:
+1) Dumb "special case" block removal and re-application.
+2) Smart "special case" diff application, using a previously generated
+   "clean" CMakeLists.txt as a source. "clean" in this case means a
+   generated file which has no "special case" modifications.
+
+Both modes use a temporary git repository to compute and reapply
+"special case" diffs.
+
+For the first mode to work, the developer has to mark changes
+with "# special case" markers on every line they want to keep. Or
+enclose blocks of code they want to keep between "# special case begin"
+and "# special case end" markers.
+
+For example:
+
+SOURCES
+  foo.cpp
+  bar.cpp # special case
+
+SOURCES
+  foo1.cpp
+  foo2.cpp
+ # special case begin
+  foo3.cpp
+  foo4.cpp
+ # special case end
+
+The second mode, as mentioned, requires a previous "clean"
+CMakeLists.txt file.
+
+The script can then compute the exact diff between
+a "clean" and "modified" (with special cases) file, and reapply that
+diff to a newly generated "CMakeLists.txt" file.
+
+This implies that we always have to keep a "clean" file alongside the
+"modified" project file for each project (corelib, gui, etc.) So we
+have to commit both files to the repository.
+
+If there is no such "clean" file, we can use the first operation mode
+to generate one. After that, we only have to use the second operation
+mode for the project file in question.
+
+When the script is used, the developer only has to take care of fixing
+the newly generated "modified" file. The "clean" file is automatically
+handled and git add'ed by the script, and will be committed together
+with the "modified" file.
+
+
+"""
+
+import re
+import os
+import subprocess
+import filecmp
+import time
+import typing
+import stat
+
+from shutil import copyfile
+from shutil import rmtree
+from textwrap import dedent
+
+
+def remove_special_cases(original: str) -> str:
+    # Remove content between the following markers
+    # '# special case begin' and '# special case end'.
+    # This also remove the markers.
+    replaced = re.sub(
+        r"\n[^#\n]*?#[^\n]*?special case begin.*?#[^\n]*special case end[^\n]*?\n",
+        "\n",
+        original,
+        0,
+        re.DOTALL,
+    )
+
+    # Remove individual lines that have the "# special case" marker.
+    replaced = re.sub(r"\n.*#.*special case[^\n]*\n", "\n", replaced)
+    return replaced
+
+
+def read_content_from_file(file_path: str) -> str:
+    with open(file_path, "r") as file_fd:
+        content = file_fd.read()
+        return content
+
+
+def write_content_to_file(file_path: str, content: str) -> None:
+    with open(file_path, "w") as file_fd:
+        file_fd.write(content)
+
+
+def resolve_simple_git_conflicts(file_path: str, debug=False) -> None:
+    content = read_content_from_file(file_path)
+    # If the conflict represents the addition of a new content hunk,
+    # keep the content and remove the conflict markers.
+    if debug:
+        print("Resolving simple conflicts automatically.")
+    replaced = re.sub(r"\n<<<<<<< HEAD\n=======(.+?)>>>>>>> master\n", r"\1", content, 0, re.DOTALL)
+    write_content_to_file(file_path, replaced)
+
+
+def copyfile_log(src: str, dst: str, debug=False):
+    if debug:
+        print(f"Copying {src} to {dst}.")
+    copyfile(src, dst)
+
+
+def check_if_git_in_path() -> bool:
+    is_win = os.name == "nt"
+    for path in os.environ["PATH"].split(os.pathsep):
+        git_path = os.path.join(path, "git")
+        if is_win:
+            git_path += ".exe"
+        if os.path.isfile(git_path) and os.access(git_path, os.X_OK):
+            return True
+    return False
+
+
+def run_process_quiet(args_string: str, debug=False) -> bool:
+    if debug:
+        print(f'Running command: "{args_string}"')
+    args_list = args_string.split()
+    try:
+        subprocess.run(args_list, check=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
+    except subprocess.CalledProcessError as e:
+        # git merge with conflicts returns with exit code 1, but that's not
+        # an error for us.
+        if "git merge" not in args_string:
+            if debug:
+                print(
+                    dedent(
+                        f"""\
+                             Error while running: "{args_string}"
+                             {e.stdout}"""
+                    )
+                )
+            return False
+    return True
+
+
+def does_file_have_conflict_markers(file_path: str, debug=False) -> bool:
+    if debug:
+        print(f"Checking if {file_path} has no leftover conflict markers.")
+    content_actual = read_content_from_file(file_path)
+    if "<<<<<<< HEAD" in content_actual:
+        print(f"Conflict markers found in {file_path}. " "Please remove or solve them first.")
+        return True
+    return False
+
+
+def create_file_with_no_special_cases(
+    original_file_path: str, no_special_cases_file_path: str, debug=False
+):
+    """
+    Reads content of original CMakeLists.txt, removes all content
+    between "# special case" markers or lines, saves the result into a
+    new file.
+    """
+    content_actual = read_content_from_file(original_file_path)
+    if debug:
+        print(f"Removing special case blocks from {original_file_path}.")
+    content_no_special_cases = remove_special_cases(content_actual)
+
+    if debug:
+        print(
+            f"Saving original contents of {original_file_path} "
+            f"with removed special case blocks to {no_special_cases_file_path}"
+        )
+    write_content_to_file(no_special_cases_file_path, content_no_special_cases)
+
+
+def rm_tree_on_error_handler(func: typing.Callable[..., None], path: str, exception_info: tuple):
+    # If the path is read only, try to make it writable, and try
+    # to remove the path again.
+    if not os.access(path, os.W_OK):
+        os.chmod(path, stat.S_IWRITE)
+        func(path)
+    else:
+        print(f"Error while trying to remove path: {path}. Exception: {exception_info}")
+
+
+class SpecialCaseHandler(object):
+    def __init__(
+        self,
+        original_file_path: str,
+        generated_file_path: str,
+        base_dir: str,
+        keep_temporary_files=False,
+        debug=False,
+    ) -> None:
+        self.base_dir = base_dir
+        self.original_file_path = original_file_path
+        self.generated_file_path = generated_file_path
+        self.keep_temporary_files = keep_temporary_files
+        self.use_heuristic = False
+        self.debug = debug
+
+    @property
+    def prev_file_path(self) -> str:
+        return os.path.join(self.base_dir, ".prev_CMakeLists.txt")
+
+    @property
+    def post_merge_file_path(self) -> str:
+        return os.path.join(self.base_dir, "CMakeLists-post-merge.txt")
+
+    @property
+    def no_special_file_path(self) -> str:
+        return os.path.join(self.base_dir, "CMakeLists.no-special.txt")
+
+    def apply_git_merge_magic(self, no_special_cases_file_path: str) -> None:
+        # Create new folder for temporary repo, and ch dir into it.
+        repo = os.path.join(self.base_dir, "tmp_repo")
+        repo_absolute_path = os.path.abspath(repo)
+        txt = "CMakeLists.txt"
+
+        try:
+            os.mkdir(repo)
+            current_dir = os.getcwd()
+            os.chdir(repo)
+        except Exception as e:
+            print(f"Failed to create temporary directory for temporary git repo. Exception: {e}")
+            raise e
+
+        generated_file_path = os.path.join("..", self.generated_file_path)
+        original_file_path = os.path.join("..", self.original_file_path)
+        no_special_cases_file_path = os.path.join("..", no_special_cases_file_path)
+        post_merge_file_path = os.path.join("..", self.post_merge_file_path)
+
+        try:
+            # Create new repo with the "clean" CMakeLists.txt file.
+            run_process_quiet("git init .", debug=self.debug)
+            run_process_quiet("git config user.name fake", debug=self.debug)
+            run_process_quiet("git config user.email fake@fake", debug=self.debug)
+            copyfile_log(no_special_cases_file_path, txt, debug=self.debug)
+            run_process_quiet(f"git add {txt}", debug=self.debug)
+            run_process_quiet("git commit -m no_special", debug=self.debug)
+            run_process_quiet("git checkout -b no_special", debug=self.debug)
+
+            # Copy the original "modified" file (with the special cases)
+            # and make a new commit.
+            run_process_quiet("git checkout -b original", debug=self.debug)
+            copyfile_log(original_file_path, txt, debug=self.debug)
+            run_process_quiet(f"git add {txt}", debug=self.debug)
+            run_process_quiet("git commit -m original", debug=self.debug)
+
+            # Checkout the commit with "clean" file again, and create a
+            # new branch.
+            run_process_quiet("git checkout no_special", debug=self.debug)
+            run_process_quiet("git checkout -b newly_generated", debug=self.debug)
+
+            # Copy the new "modified" file and make a commit.
+            copyfile_log(generated_file_path, txt, debug=self.debug)
+            run_process_quiet(f"git add {txt}", debug=self.debug)
+            run_process_quiet("git commit -m newly_generated", debug=self.debug)
+
+            # Merge the "old" branch with modifications into the "new"
+            # branch with the newly generated file.
+            run_process_quiet("git merge original", debug=self.debug)
+
+            # Resolve some simple conflicts (just remove the markers)
+            # for cases that don't need intervention.
+            resolve_simple_git_conflicts(txt, debug=self.debug)
+
+            # Copy the resulting file from the merge.
+            copyfile_log(txt, post_merge_file_path)
+        except Exception as e:
+            print(f"Git merge conflict resolution process failed. Exception: {e}")
+            raise e
+        finally:
+            os.chdir(current_dir)
+
+            # Remove the temporary repo.
+            try:
+                if not self.keep_temporary_files:
+                    rmtree(repo_absolute_path, onerror=rm_tree_on_error_handler)
+            except Exception as e:
+                print(f"Error removing temporary repo. Exception: {e}")
+
+    def save_next_clean_file(self):
+        files_are_equivalent = filecmp.cmp(self.generated_file_path, self.post_merge_file_path)
+
+        if not files_are_equivalent:
+            # Before overriding the generated file with the post
+            # merge result, save the new "clean" file for future
+            # regenerations.
+            copyfile_log(self.generated_file_path, self.prev_file_path, debug=self.debug)
+
+            # Attempt to git add until we succeed. It can fail when
+            # run_pro2cmake executes pro2cmake in multiple threads, and git
+            # has acquired the index lock.
+            success = False
+            failed_once = False
+            i = 0
+            while not success and i < 20:
+                success = run_process_quiet(f"git add {self.prev_file_path}", debug=self.debug)
+                if not success:
+                    failed_once = True
+                    i += 1
+                    time.sleep(0.1)
+
+                if failed_once and not success:
+                    if self.debug:
+                        print("Retrying git add, the index.lock was probably acquired.")
+            if failed_once and success:
+                if self.debug:
+                    print("git add succeeded.")
+            elif failed_once and not success:
+                print(f"git add failed. Make sure to git add {self.prev_file_path} yourself.")
+
+    def handle_special_cases_helper(self) -> bool:
+        """
+        Uses git to reapply special case modifications to the "new"
+        generated CMakeLists.gen.txt file.
+
+        If use_heuristic is True, a new file is created from the
+        original file, with special cases removed.
+
+        If use_heuristic is False, an existing "clean" file with no
+        special cases is used from a previous conversion. The "clean"
+        file is expected to be in the same folder as the original one.
+        """
+        try:
+            if does_file_have_conflict_markers(self.original_file_path):
+                return False
+
+            if self.use_heuristic:
+                create_file_with_no_special_cases(
+                    self.original_file_path, self.no_special_file_path
+                )
+                no_special_cases_file_path = self.no_special_file_path
+            else:
+                no_special_cases_file_path = self.prev_file_path
+
+            if self.debug:
+                print(
+                    f"Using git to reapply special case modifications to newly "
+                    f"generated {self.generated_file_path} file"
+                )
+
+            self.apply_git_merge_magic(no_special_cases_file_path)
+            self.save_next_clean_file()
+
+            copyfile_log(self.post_merge_file_path, self.generated_file_path)
+            if not self.keep_temporary_files:
+                os.remove(self.post_merge_file_path)
+            if self.debug:
+                print(
+                    "Special case reapplication using git is complete. "
+                    "Make sure to fix remaining conflict markers."
+                )
+
+        except Exception as e:
+            print(f"Error occurred while trying to reapply special case modifications: {e}")
+            return False
+        finally:
+            if not self.keep_temporary_files and self.use_heuristic:
+                os.remove(self.no_special_file_path)
+
+        return True
+
+    def handle_special_cases(self) -> bool:
+        original_file_exists = os.path.isfile(self.original_file_path)
+        prev_file_exists = os.path.isfile(self.prev_file_path)
+        self.use_heuristic = not prev_file_exists
+
+        git_available = check_if_git_in_path()
+        keep_special_cases = original_file_exists and git_available
+
+        if not git_available:
+            print(
+                "You need to have git in PATH in order to reapply the special "
+                "case modifications."
+            )
+
+        copy_generated_file = True
+
+        if keep_special_cases:
+            copy_generated_file = self.handle_special_cases_helper()
+
+        return copy_generated_file
diff --git a/tests/auto/corelib/io/qfileselector/platforms/+osx/test4 b/util/cmake/tests/__init__.py
index e69de29bb2..e69de29bb2 100644
--- a/tests/auto/corelib/io/qfileselector/platforms/+osx/test4
+++ b/util/cmake/tests/__init__.py
diff --git a/util/cmake/tests/data/comment_scope.pro b/util/cmake/tests/data/comment_scope.pro
new file mode 100644
index 0000000000..be43cad37d
--- /dev/null
+++ b/util/cmake/tests/data/comment_scope.pro
@@ -0,0 +1,6 @@
+# QtCore can't be compiled with -Wl,-no-undefined because it uses the "environ"
+# variable and on FreeBSD and OpenBSD, this variable is in the final executable itself.
+# OpenBSD 6.0 will include environ in libc.
+freebsd|openbsd: QMAKE_LFLAGS_NOUNDEF =
+
+include(animation/animation.pri)
diff --git a/util/cmake/tests/data/complex_assign.pro b/util/cmake/tests/data/complex_assign.pro
new file mode 100644
index 0000000000..d251afcdd5
--- /dev/null
+++ b/util/cmake/tests/data/complex_assign.pro
@@ -0,0 +1,2 @@
+qmake-clean.commands += (cd qmake && $(MAKE) clean ":-(==)-:" '(Foo)' )
+
diff --git a/util/cmake/tests/data/complex_condition.pro b/util/cmake/tests/data/complex_condition.pro
new file mode 100644
index 0000000000..bc3369bd63
--- /dev/null
+++ b/util/cmake/tests/data/complex_condition.pro
@@ -0,0 +1,4 @@
+!system("dbus-send --session --type=signal / local.AutotestCheck.Hello >$$QMAKE_SYSTEM_NULL_DEVICE 2>&1") {
+    SOURCES = dbus.cpp
+}
+
diff --git a/util/cmake/tests/data/complex_values.pro b/util/cmake/tests/data/complex_values.pro
new file mode 100644
index 0000000000..4d747c1dd7
--- /dev/null
+++ b/util/cmake/tests/data/complex_values.pro
@@ -0,0 +1,22 @@
+linux:!static {
+    precompile_header {
+        # we'll get an error if we just use SOURCES +=
+        no_pch_assembler.commands = $$QMAKE_CC -c $(CFLAGS) $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
+        no_pch_assembler.dependency_type = TYPE_C
+        no_pch_assembler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}$${first(QMAKE_EXT_OBJ)}
+        no_pch_assembler.input = NO_PCH_ASM
+        no_pch_assembler.name = compiling[no_pch] ${QMAKE_FILE_IN}
+        silent: no_pch_assembler.commands = @echo compiling[no_pch] ${QMAKE_FILE_IN} && $$no_pch_assembler.commands
+        CMAKE_ANGLE_GLES2_IMPLIB_RELEASE = libGLESv2.$${QMAKE_EXTENSION_STATICLIB}
+        HOST_BINS = $$[QT_HOST_BINS]
+        CMAKE_HOST_DATA_DIR = $$[QT_HOST_DATA/src]/
+        TR_EXCLUDE += ../3rdparty/*
+
+        QMAKE_EXTRA_COMPILERS += no_pch_assembler
+        NO_PCH_ASM += global/minimum-linux.S
+    } else {
+        SOURCES += global/minimum-linux.S
+    }
+    HEADERS += global/minimum-linux_p.h
+}
+
diff --git a/util/cmake/tests/data/condition_without_scope.pro b/util/cmake/tests/data/condition_without_scope.pro
new file mode 100644
index 0000000000..2aa1237c12
--- /dev/null
+++ b/util/cmake/tests/data/condition_without_scope.pro
@@ -0,0 +1,2 @@
+write_file("a", contents)|error()
+
diff --git a/util/cmake/tests/data/contains_scope.pro b/util/cmake/tests/data/contains_scope.pro
new file mode 100644
index 0000000000..0f51350a45
--- /dev/null
+++ b/util/cmake/tests/data/contains_scope.pro
@@ -0,0 +1,4 @@
+contains(DEFINES,QT_EVAL):include(eval.pri)
+
+HOST_BINS = $$[QT_HOST_BINS]
+
diff --git a/util/cmake/tests/data/definetest.pro b/util/cmake/tests/data/definetest.pro
new file mode 100644
index 0000000000..76b63d239f
--- /dev/null
+++ b/util/cmake/tests/data/definetest.pro
@@ -0,0 +1,6 @@
+defineTest(pathIsAbsolute) {
+    p = $$clean_path($$1)
+    !isEmpty(p):isEqual(p, $$absolute_path($$p)): return(true)
+    return(false)
+}
+
diff --git a/util/cmake/tests/data/else.pro b/util/cmake/tests/data/else.pro
new file mode 100644
index 0000000000..bbf9c5ac9f
--- /dev/null
+++ b/util/cmake/tests/data/else.pro
@@ -0,0 +1,6 @@
+
+linux {
+    SOURCES += a.cpp
+} else {
+    SOURCES += b.cpp
+}
diff --git a/util/cmake/tests/data/else2.pro b/util/cmake/tests/data/else2.pro
new file mode 100644
index 0000000000..f2ef36ec28
--- /dev/null
+++ b/util/cmake/tests/data/else2.pro
@@ -0,0 +1,4 @@
+
+osx: A = 1
+else: win32: B = 2
+else: C = 3
diff --git a/util/cmake/tests/data/else3.pro b/util/cmake/tests/data/else3.pro
new file mode 100644
index 0000000000..0de9c2c1d9
--- /dev/null
+++ b/util/cmake/tests/data/else3.pro
@@ -0,0 +1,7 @@
+qtConfig(timezone) {
+  A = 1
+} else:win32 {
+  B = 2
+} else {
+  C = 3
+}
diff --git a/util/cmake/tests/data/else4.pro b/util/cmake/tests/data/else4.pro
new file mode 100644
index 0000000000..9ed676ccfa
--- /dev/null
+++ b/util/cmake/tests/data/else4.pro
@@ -0,0 +1,6 @@
+qtConfig(timezone) {
+  A = 1
+} else:win32: B = 2
+else {
+  C = 3
+}
diff --git a/util/cmake/tests/data/else5.pro b/util/cmake/tests/data/else5.pro
new file mode 100644
index 0000000000..3de76af50a
--- /dev/null
+++ b/util/cmake/tests/data/else5.pro
@@ -0,0 +1,10 @@
+# comments
+qtConfig(timezone) { # bar
+  A = 1
+} else:win32 {
+  B = 2 # foo
+} else { C = 3
+# baz
+   # foobar
+}
+# endcomment
diff --git a/util/cmake/tests/data/else6.pro b/util/cmake/tests/data/else6.pro
new file mode 100644
index 0000000000..9eaa834a19
--- /dev/null
+++ b/util/cmake/tests/data/else6.pro
@@ -0,0 +1,11 @@
+qtConfig(timezone) \
+{
+  A = \
+1
+} \
+else:win32: \
+B = 2 
+else: \
+  C \
+= 3
+
diff --git a/util/cmake/tests/data/else7.pro b/util/cmake/tests/data/else7.pro
new file mode 100644
index 0000000000..e663b1c05e
--- /dev/null
+++ b/util/cmake/tests/data/else7.pro
@@ -0,0 +1,2 @@
+msvc:equals(QT_ARCH, i386): QMAKE_LFLAGS += /BASE:0x65000000
+
diff --git a/util/cmake/tests/data/else8.pro b/util/cmake/tests/data/else8.pro
new file mode 100644
index 0000000000..6d4d5f01ed
--- /dev/null
+++ b/util/cmake/tests/data/else8.pro
@@ -0,0 +1,5 @@
+qtConfig(timezone) { A = 1 } else:win32: {\
+B = 2 \
+} else: \
+  C \
+= 3 \
diff --git a/util/cmake/tests/data/escaped_value.pro b/util/cmake/tests/data/escaped_value.pro
new file mode 100644
index 0000000000..7c95b1fc30
--- /dev/null
+++ b/util/cmake/tests/data/escaped_value.pro
@@ -0,0 +1,2 @@
+MODULE_AUX_INCLUDES = \
+    \$\$QT_MODULE_INCLUDE_BASE/QtANGLE
diff --git a/util/cmake/tests/data/for.pro b/util/cmake/tests/data/for.pro
new file mode 100644
index 0000000000..5751432980
--- /dev/null
+++ b/util/cmake/tests/data/for.pro
@@ -0,0 +1,11 @@
+SOURCES = main.cpp
+for (config, SIMD) {
+    uc = $$upper($$config)
+    DEFINES += QT_COMPILER_SUPPORTS_$${uc}
+
+    add_cflags {
+        cflags = QMAKE_CFLAGS_$${uc}
+        !defined($$cflags, var): error("This compiler does not support $${uc}")
+        QMAKE_CXXFLAGS += $$eval($$cflags)
+    }
+}
diff --git a/util/cmake/tests/data/function_if.pro b/util/cmake/tests/data/function_if.pro
new file mode 100644
index 0000000000..9af018f864
--- /dev/null
+++ b/util/cmake/tests/data/function_if.pro
@@ -0,0 +1,4 @@
+pathIsAbsolute($$CMAKE_HOST_DATA_DIR) {
+    CMAKE_HOST_DATA_DIR = $$[QT_HOST_DATA/src]/
+}
+
diff --git a/util/cmake/tests/data/include.pro b/util/cmake/tests/data/include.pro
new file mode 100644
index 0000000000..22d8a40919
--- /dev/null
+++ b/util/cmake/tests/data/include.pro
@@ -0,0 +1,3 @@
+A = 42
+include(foo)             # load foo
+B=23
diff --git a/util/cmake/tests/data/lc.pro b/util/cmake/tests/data/lc.pro
new file mode 100644
index 0000000000..def80e7c95
--- /dev/null
+++ b/util/cmake/tests/data/lc.pro
@@ -0,0 +1,10 @@
+TEMPLATE=subdirs
+SUBDIRS=\
+   qmacstyle \
+   qstyle \
+   qstyleoption \
+   qstylesheetstyle \
+
+!qtConfig(private_tests): SUBDIRS -= \
+           qstylesheetstyle \
+
diff --git a/util/cmake/tests/data/lc_with_comment.pro b/util/cmake/tests/data/lc_with_comment.pro
new file mode 100644
index 0000000000..176913dfc8
--- /dev/null
+++ b/util/cmake/tests/data/lc_with_comment.pro
@@ -0,0 +1,22 @@
+SUBDIRS = \
+#    dds \
+    tga \
+    wbmp
+
+MYVAR = foo # comment
+MYVAR = foo2# comment
+MYVAR = foo3# comment #
+
+MYVAR = foo4# comment #
+
+##
+#
+#
+##
+
+ #
+ #
+#
+  # #
+
+MYVAR = foo5# comment # #
diff --git a/util/cmake/tests/data/load.pro b/util/cmake/tests/data/load.pro
new file mode 100644
index 0000000000..c9717e9832
--- /dev/null
+++ b/util/cmake/tests/data/load.pro
@@ -0,0 +1,3 @@
+A = 42
+load(foo)# load foo
+B=23
diff --git a/util/cmake/tests/data/multi_condition_divided_by_lc.pro b/util/cmake/tests/data/multi_condition_divided_by_lc.pro
new file mode 100644
index 0000000000..23254231df
--- /dev/null
+++ b/util/cmake/tests/data/multi_condition_divided_by_lc.pro
@@ -0,0 +1,3 @@
+equals(a): \
+        greaterThan(a):flags += 1
+
diff --git a/util/cmake/tests/data/multiline_assign.pro b/util/cmake/tests/data/multiline_assign.pro
new file mode 100644
index 0000000000..42a3d0a674
--- /dev/null
+++ b/util/cmake/tests/data/multiline_assign.pro
@@ -0,0 +1,4 @@
+A = 42 \
+  43 \
+  44
+B=23
diff --git a/util/cmake/tests/data/nested_function_calls.pro b/util/cmake/tests/data/nested_function_calls.pro
new file mode 100644
index 0000000000..5ecc53f1cc
--- /dev/null
+++ b/util/cmake/tests/data/nested_function_calls.pro
@@ -0,0 +1,2 @@
+requires(qtConfig(dlopen))
+
diff --git a/util/cmake/tests/data/quoted.pro b/util/cmake/tests/data/quoted.pro
new file mode 100644
index 0000000000..61682aa0d0
--- /dev/null
+++ b/util/cmake/tests/data/quoted.pro
@@ -0,0 +1,5 @@
+if(linux*|hurd*):!cross_compile:!static:!*-armcc* {
+   prog=$$quote(if (/program interpreter: (.*)]/) { print $1; })
+   DEFINES += ELF_INTERPRETER=\\\"$$system(LC_ALL=C readelf -l /bin/ls | perl -n -e \'$$prog\')\\\"
+}
+
diff --git a/util/cmake/tests/data/single_line_for.pro b/util/cmake/tests/data/single_line_for.pro
new file mode 100644
index 0000000000..806d08a49c
--- /dev/null
+++ b/util/cmake/tests/data/single_line_for.pro
@@ -0,0 +1,4 @@
+for(d, sd): \
+    exists($$d/$${d}.pro): \
+        SUBDIRS += $$d
+
diff --git a/util/cmake/tests/data/sql.pro b/util/cmake/tests/data/sql.pro
new file mode 100644
index 0000000000..a9d7fc7c5a
--- /dev/null
+++ b/util/cmake/tests/data/sql.pro
@@ -0,0 +1,3 @@
+TEMPLATE = subdirs
+SUBDIRS = \
+        kernel \
diff --git a/util/cmake/tests/data/standardpaths.pro b/util/cmake/tests/data/standardpaths.pro
new file mode 100644
index 0000000000..4b45788e4f
--- /dev/null
+++ b/util/cmake/tests/data/standardpaths.pro
@@ -0,0 +1,17 @@
+win32 {
+    !winrt {
+        SOURCES +=io/qstandardpaths_win.cpp 
+    } else {
+        SOURCES +=io/qstandardpaths_winrt.cpp
+    }
+} else:unix {
+    mac {
+        OBJECTIVE_SOURCES += io/qstandardpaths_mac.mm
+    } else:android:!android-embedded {
+        SOURCES += io/qstandardpaths_android.cpp
+    } else:haiku {
+        SOURCES += io/qstandardpaths_haiku.cpp
+    } else {
+        SOURCES += io/qstandardpaths_unix.cpp
+    }
+}
diff --git a/util/cmake/tests/data/unset.pro b/util/cmake/tests/data/unset.pro
new file mode 100644
index 0000000000..7ffb0582f1
--- /dev/null
+++ b/util/cmake/tests/data/unset.pro
@@ -0,0 +1,2 @@
+unset(f16c_cxx)
+
diff --git a/util/cmake/tests/data/value_function.pro b/util/cmake/tests/data/value_function.pro
new file mode 100644
index 0000000000..598e4fadbd
--- /dev/null
+++ b/util/cmake/tests/data/value_function.pro
@@ -0,0 +1,2 @@
+TARGET = Dummy
+TARGET = $$qtLibraryTarget($$TARGET)
diff --git a/util/cmake/tests/test_lc_fixup.py b/util/cmake/tests/test_lc_fixup.py
new file mode 100755
index 0000000000..42094a5288
--- /dev/null
+++ b/util/cmake/tests/test_lc_fixup.py
@@ -0,0 +1,44 @@
+#!/usr/bin/env python3
+#############################################################################
+##
+## Copyright (C) 2018 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the plugins of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:GPL-EXCEPT$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 as published by the Free Software
+## Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+from qmake_parser import fixup_linecontinuation
+
+
+def test_no_change():
+    input = "test \\\nline2\n  line3"
+    output = "test line2\n  line3"
+    result = fixup_linecontinuation(input)
+    assert output == result
+
+
+def test_fix():
+    input = "test \\\t\nline2\\\n  line3\\ \nline4 \\ \t\nline5\\\n\n\n"
+    output = "test line2   line3 line4 line5 \n\n"
+    result = fixup_linecontinuation(input)
+    assert output == result
diff --git a/util/cmake/tests/test_logic_mapping.py b/util/cmake/tests/test_logic_mapping.py
new file mode 100755
index 0000000000..c18c3ddc65
--- /dev/null
+++ b/util/cmake/tests/test_logic_mapping.py
@@ -0,0 +1,186 @@
+#!/usr/bin/env python3
+#############################################################################
+##
+## Copyright (C) 2018 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the plugins of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:GPL-EXCEPT$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 as published by the Free Software
+## Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+from condition_simplifier import simplify_condition
+
+
+def validate_simplify(input: str, expected: str) -> None:
+    output = simplify_condition(input)
+    assert output == expected
+
+
+def validate_simplify_unchanged(input: str) -> None:
+    validate_simplify(input, input)
+
+
+def test_simplify_on():
+    validate_simplify_unchanged('ON')
+
+
+def test_simplify_off():
+    validate_simplify_unchanged('OFF')
+
+
+def test_simplify_not_on():
+    validate_simplify('NOT ON', 'OFF')
+
+
+def test_simplify_not_off():
+    validate_simplify('NOT OFF', 'ON')
+
+
+def test_simplify_isEmpty():
+    validate_simplify_unchanged('isEmpty(foo)')
+
+
+def test_simplify_not_isEmpty():
+    validate_simplify_unchanged('NOT isEmpty(foo)')
+
+
+def test_simplify_simple_and():
+    validate_simplify_unchanged('QT_FEATURE_bar AND QT_FEATURE_foo')
+
+
+def test_simplify_simple_or():
+    validate_simplify_unchanged('QT_FEATURE_bar OR QT_FEATURE_foo')
+
+
+def test_simplify_simple_not():
+    validate_simplify_unchanged('NOT QT_FEATURE_foo')
+
+
+def test_simplify_simple_and_reorder():
+    validate_simplify('QT_FEATURE_foo AND QT_FEATURE_bar', 'QT_FEATURE_bar AND QT_FEATURE_foo')
+
+
+def test_simplify_simple_or_reorder():
+    validate_simplify('QT_FEATURE_foo OR QT_FEATURE_bar', 'QT_FEATURE_bar OR QT_FEATURE_foo')
+
+
+def test_simplify_unix_or_win32():
+    validate_simplify('WIN32 OR UNIX', 'ON')
+
+
+def test_simplify_unix_or_win32_or_foobar_or_barfoo():
+    validate_simplify('WIN32 OR UNIX OR foobar OR barfoo', 'ON')
+
+
+def test_simplify_not_not_bar():
+    validate_simplify('  NOT NOT bar   ', 'bar')
+
+
+def test_simplify_not_unix():
+    validate_simplify('NOT UNIX', 'WIN32')
+
+
+def test_simplify_not_win32():
+    validate_simplify('NOT WIN32', 'UNIX')
+
+
+def test_simplify_unix_and_win32():
+    validate_simplify('WIN32 AND UNIX', 'OFF')
+
+
+def test_simplify_unix_or_win32():
+    validate_simplify('WIN32 OR UNIX', 'ON')
+
+
+def test_simplify_unix_and_win32_or_foobar_or_barfoo():
+    validate_simplify('WIN32 AND foobar AND UNIX AND barfoo', 'OFF')
+
+
+def test_simplify_watchos_and_win32():
+    validate_simplify('APPLE_WATCHOS AND WIN32', 'OFF')
+
+
+def test_simplify_win32_and_watchos():
+    validate_simplify('WIN32 AND APPLE_WATCHOS', 'OFF')
+
+
+def test_simplify_apple_and_appleosx():
+    validate_simplify('APPLE AND APPLE_OSX', 'APPLE_OSX')
+
+
+def test_simplify_apple_or_appleosx():
+    validate_simplify('APPLE OR APPLE_OSX', 'APPLE')
+
+
+def test_simplify_apple_or_appleosx_level1():
+    validate_simplify('foobar AND (APPLE OR APPLE_OSX )', 'APPLE AND foobar')
+
+
+def test_simplify_apple_or_appleosx_level1_double():
+    validate_simplify('foobar AND (APPLE OR APPLE_OSX )', 'APPLE AND foobar')
+
+
+def test_simplify_apple_or_appleosx_level1_double_with_extra_spaces():
+    validate_simplify('foobar AND (APPLE OR APPLE_OSX ) '
+                      'AND ( APPLE_OSX    OR APPLE    )', 'APPLE AND foobar')
+
+
+def test_simplify_apple_or_appleosx_level2():
+    validate_simplify('foobar AND ( ( APPLE OR APPLE_WATCHOS ) '
+                      'OR APPLE_OSX ) AND ( APPLE_OSX    OR APPLE    ) '
+                      'AND ( (WIN32 OR WINRT) OR UNIX) ', 'APPLE AND foobar')
+
+
+def test_simplify_not_apple_and_appleosx():
+    validate_simplify('NOT APPLE AND APPLE_OSX', 'OFF')
+
+
+def test_simplify_unix_and_bar_or_win32():
+    validate_simplify('WIN32 AND bar AND UNIX', 'OFF')
+
+
+def test_simplify_unix_or_bar_or_win32():
+    validate_simplify('WIN32 OR bar OR UNIX', 'ON')
+
+
+def test_simplify_complex_true():
+    validate_simplify('WIN32     OR (    APPLE  OR  UNIX)', 'ON')
+
+
+def test_simplify_apple_unix_freebsd():
+    validate_simplify('(    APPLE  OR  ( UNIX OR FREEBSD ))', 'UNIX')
+
+
+def test_simplify_apple_unix_freebsd_foobar():
+    validate_simplify('(    APPLE  OR  ( UNIX OR FREEBSD ) OR foobar)',
+                      'UNIX OR foobar')
+
+
+def test_simplify_complex_false():
+    validate_simplify('WIN32 AND foobar    AND (    '
+                      'APPLE  OR  ( UNIX OR FREEBSD ))',
+                      'OFF')
+
+
+def test_simplify_android_not_apple():
+    validate_simplify('ANDROID AND NOT ANDROID_EMBEDDED AND NOT APPLE_OSX',
+                      'ANDROID AND NOT ANDROID_EMBEDDED')
diff --git a/util/cmake/tests/test_operations.py b/util/cmake/tests/test_operations.py
new file mode 100755
index 0000000000..c1e5f1b250
--- /dev/null
+++ b/util/cmake/tests/test_operations.py
@@ -0,0 +1,57 @@
+#!/usr/bin/env python3
+#############################################################################
+##
+## Copyright (C) 2018 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the plugins of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:GPL-EXCEPT$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 as published by the Free Software
+## Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+from pro2cmake import AddOperation, SetOperation, UniqueAddOperation, RemoveOperation
+
+def test_add_operation():
+    op = AddOperation(['bar', 'buz'])
+
+    result = op.process(['foo', 'bar'], ['foo', 'bar'], lambda x: x)
+    assert ['foo', 'bar', 'bar', 'buz'] == result
+
+
+def test_uniqueadd_operation():
+    op = UniqueAddOperation(['bar', 'buz'])
+
+    result = op.process(['foo', 'bar'], ['foo', 'bar'], lambda x: x)
+    assert ['foo', 'bar', 'buz'] == result
+
+
+def test_set_operation():
+    op = SetOperation(['bar', 'buz'])
+
+    result = op.process(['foo', 'bar'], ['foo', 'bar'], lambda x: x)
+    assert ['bar', 'buz'] == result
+
+
+def test_remove_operation():
+    op = RemoveOperation(['bar', 'buz'])
+
+    result = op.process(['foo', 'bar'], ['foo', 'bar'], lambda x: x)
+    assert ['foo', '-buz'] == result
diff --git a/util/cmake/tests/test_parsing.py b/util/cmake/tests/test_parsing.py
new file mode 100755
index 0000000000..9acee46007
--- /dev/null
+++ b/util/cmake/tests/test_parsing.py
@@ -0,0 +1,354 @@
+#!/usr/bin/env python3
+#############################################################################
+##
+## Copyright (C) 2018 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the plugins of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:GPL-EXCEPT$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 as published by the Free Software
+## Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+import os
+from qmake_parser import QmakeParser
+
+
+_tests_path = os.path.dirname(os.path.abspath(__file__))
+
+
+def validate_op(key, op, value, to_validate):
+    assert key == to_validate['key']
+    assert op == to_validate['operation']['value']
+    assert value == to_validate.get('value', None)
+
+
+def validate_single_op(key, op, value, to_validate):
+    assert len(to_validate) == 1
+    validate_op(key, op, value, to_validate[0])
+
+
+def evaluate_condition(to_validate):
+    assert 'condition' in to_validate
+    assert 'statements' in to_validate
+
+    return (to_validate['condition'],
+            to_validate['statements'],
+            to_validate.get('else_statements', {}))
+
+
+def validate_default_else_test(file_name):
+    result = parse_file(file_name)
+    assert len(result) == 1
+
+    (cond, if_branch, else_branch) = evaluate_condition(result[0])
+    assert cond == 'qtConfig(timezone)'
+    validate_single_op('A', '=', ['1'], if_branch)
+
+    assert len(else_branch) == 1
+    (cond2, if2_branch, else2_branch) = evaluate_condition(else_branch[0])
+    assert cond2 == 'win32'
+    validate_single_op('B', '=', ['2'], if2_branch)
+    validate_single_op('C', '=', ['3'], else2_branch)
+
+
+def parse_file(file):
+    p = QmakeParser(debug=True)
+    result, _ = p.parseFile(file)
+
+    print('\n\n#### Parser result:')
+    print(result)
+    print('\n#### End of parser result.\n')
+
+    print('\n\n####Parser result dictionary:')
+    print(result.asDict())
+    print('\n#### End of parser result dictionary.\n')
+
+    result_dictionary = result.asDict()
+
+    assert len(result_dictionary) == 1
+
+    return result_dictionary['statements']
+
+
+def test_else():
+    result = parse_file(_tests_path + '/data/else.pro')
+    assert len(result) == 1
+
+    (cond, if_branch, else_branch) = evaluate_condition(result[0])
+
+    assert cond == 'linux'
+    validate_single_op('SOURCES', '+=', ['a.cpp'], if_branch)
+    validate_single_op('SOURCES', '+=', ['b.cpp'], else_branch)
+
+
+def test_else2():
+    result = parse_file(_tests_path + '/data/else2.pro')
+    assert len(result) == 1
+
+    (cond, if_branch, else_branch) = evaluate_condition(result[0])
+    assert cond == 'osx'
+    validate_single_op('A', '=', ['1'], if_branch)
+
+    assert len(else_branch) == 1
+    (cond2, if2_branch, else2_branch) = evaluate_condition(else_branch[0])
+    assert cond2 == 'win32'
+    validate_single_op('B', '=', ['2'], if2_branch)
+
+    validate_single_op('C', '=', ['3'], else2_branch)
+
+
+def test_else3():
+    validate_default_else_test(_tests_path + '/data/else3.pro')
+
+
+def test_else4():
+    validate_default_else_test(_tests_path + '/data/else4.pro')
+
+
+def test_else5():
+    validate_default_else_test(_tests_path + '/data/else5.pro')
+
+
+def test_else6():
+    validate_default_else_test(_tests_path + '/data/else6.pro')
+
+
+def test_else7():
+    result = parse_file(_tests_path + '/data/else7.pro')
+    assert len(result) == 1
+
+
+def test_else8():
+    validate_default_else_test(_tests_path + '/data/else8.pro')
+
+
+def test_multiline_assign():
+    result = parse_file(_tests_path + '/data/multiline_assign.pro')
+    assert len(result) == 2
+    validate_op('A', '=', ['42', '43', '44'], result[0])
+    validate_op('B', '=', ['23'], result[1])
+
+
+def test_include():
+    result = parse_file(_tests_path + '/data/include.pro')
+    assert len(result) == 3
+    validate_op('A', '=', ['42'], result[0])
+    include = result[1]
+    assert len(include) == 1
+    assert 'included' in include
+    assert include['included'].get('value', '') == 'foo'
+    validate_op('B', '=', ['23'], result[2])
+
+
+def test_load():
+    result = parse_file(_tests_path + '/data/load.pro')
+    assert len(result) == 3
+    validate_op('A', '=', ['42'], result[0])
+    load = result[1]
+    assert len(load) == 1
+    assert load.get('loaded', '') == 'foo'
+    validate_op('B', '=', ['23'], result[2])
+
+
+def test_definetest():
+    result = parse_file(_tests_path + '/data/definetest.pro')
+    assert len(result) == 1
+    assert result[0] == []
+
+
+def test_for():
+    result = parse_file(_tests_path + '/data/for.pro')
+    assert len(result) == 2
+    validate_op('SOURCES', '=', ['main.cpp'], result[0])
+    assert result[1] == []
+
+
+def test_single_line_for():
+    result = parse_file(_tests_path + '/data/single_line_for.pro')
+    assert len(result) == 1
+    assert result[0] == []
+
+
+def test_unset():
+    result = parse_file(_tests_path + '/data/unset.pro')
+    assert len(result) == 1
+    assert result[0] == []
+
+
+def test_quoted():
+    result = parse_file(_tests_path + '/data/quoted.pro')
+    assert len(result) == 1
+
+
+def test_complex_values():
+    result = parse_file(_tests_path + '/data/complex_values.pro')
+    assert len(result) == 1
+
+
+def test_function_if():
+    result = parse_file(_tests_path + '/data/function_if.pro')
+    assert len(result) == 1
+
+
+def test_realworld_standardpaths():
+    result = parse_file(_tests_path + '/data/standardpaths.pro')
+
+    (cond, if_branch, else_branch) = evaluate_condition(result[0])
+    assert cond == 'win32'
+    assert len(if_branch) == 1
+    assert len(else_branch) == 1
+
+    # win32:
+    (cond1, if_branch1, else_branch1) = evaluate_condition(if_branch[0])
+    assert cond1 == '!winrt'
+    assert len(if_branch1) == 1
+    validate_op('SOURCES', '+=', ['io/qstandardpaths_win.cpp'], if_branch1[0])
+    assert len(else_branch1) == 1
+    validate_op('SOURCES', '+=', ['io/qstandardpaths_winrt.cpp'], else_branch1[0])
+
+    # unix:
+    (cond2, if_branch2, else_branch2) = evaluate_condition(else_branch[0])
+    assert cond2 == 'unix'
+    assert len(if_branch2) == 1
+    assert len(else_branch2) == 0
+
+    # mac / else:
+    (cond3, if_branch3, else_branch3) = evaluate_condition(if_branch2[0])
+    assert cond3 == 'mac'
+    assert len(if_branch3) == 1
+    validate_op('OBJECTIVE_SOURCES', '+=', ['io/qstandardpaths_mac.mm'], if_branch3[0])
+    assert len(else_branch3) == 1
+
+    # android / else:
+    (cond4, if_branch4, else_branch4) = evaluate_condition(else_branch3[0])
+    assert cond4 == 'android && !android-embedded'
+    assert len(if_branch4) == 1
+    validate_op('SOURCES', '+=', ['io/qstandardpaths_android.cpp'], if_branch4[0])
+    assert len(else_branch4) == 1
+
+    # haiku / else:
+    (cond5, if_branch5, else_branch5) = evaluate_condition(else_branch4[0])
+    assert cond5 == 'haiku'
+    assert len(if_branch5) == 1
+    validate_op('SOURCES', '+=', ['io/qstandardpaths_haiku.cpp'], if_branch5[0])
+    assert len(else_branch5) == 1
+    validate_op('SOURCES', '+=', ['io/qstandardpaths_unix.cpp'], else_branch5[0])
+
+
+def test_realworld_comment_scope():
+    result = parse_file(_tests_path + '/data/comment_scope.pro')
+    assert len(result) == 2
+    (cond, if_branch, else_branch) = evaluate_condition(result[0])
+    assert cond == 'freebsd|openbsd'
+    assert len(if_branch) == 1
+    validate_op('QMAKE_LFLAGS_NOUNDEF', '=', None, if_branch[0])
+
+    assert 'included' in result[1]
+    assert result[1]['included'].get('value', '') == 'animation/animation.pri'
+
+
+def test_realworld_contains_scope():
+    result = parse_file(_tests_path + '/data/contains_scope.pro')
+    assert len(result) == 2
+
+
+def test_realworld_complex_assign():
+    result = parse_file(_tests_path + '/data/complex_assign.pro')
+    assert len(result) == 1
+    validate_op('qmake-clean.commands', '+=', '( cd qmake && $(MAKE) clean ":-(==)-:" \'(Foo)\' )'.split(),
+                result[0])
+
+
+def test_realworld_complex_condition():
+    result = parse_file(_tests_path + '/data/complex_condition.pro')
+    assert len(result) == 1
+    (cond, if_branch, else_branch) = evaluate_condition(result[0])
+    assert cond == '!system("dbus-send --session --type=signal / ' \
+                   'local.AutotestCheck.Hello >$$QMAKE_SYSTEM_NULL_DEVICE ' \
+                   '2>&1")'
+    assert len(if_branch) == 1
+    validate_op('SOURCES', '=', ['dbus.cpp'], if_branch[0])
+
+    assert len(else_branch) == 0
+
+
+def test_realworld_sql():
+    result = parse_file(_tests_path + '/data/sql.pro')
+    assert len(result) == 2
+    validate_op('TEMPLATE', '=', ['subdirs'], result[0])
+    validate_op('SUBDIRS', '=', ['kernel'], result[1])
+
+
+def test_realworld_qtconfig():
+    result = parse_file(_tests_path + '/data/escaped_value.pro')
+    assert len(result) == 1
+    validate_op('MODULE_AUX_INCLUDES', '=', ['\\$\\$QT_MODULE_INCLUDE_BASE/QtANGLE'], result[0])
+
+
+def test_realworld_lc():
+    result = parse_file(_tests_path + '/data/lc.pro')
+    assert len(result) == 3
+
+
+def test_realworld_lc_with_comment_in_between():
+    result = parse_file(_tests_path + '/data/lc_with_comment.pro')
+
+    my_var = result[1]['value'][0]
+    assert my_var == 'foo'
+
+    my_var = result[2]['value'][0]
+    assert my_var == 'foo2'
+
+    my_var = result[3]['value'][0]
+    assert my_var == 'foo3'
+
+    my_var = result[4]['value'][0]
+    assert my_var == 'foo4'
+
+    my_var = result[5]['value'][0]
+    assert my_var == 'foo5'
+
+    sub_dirs = result[0]['value']
+    assert sub_dirs[0] == 'tga'
+    assert sub_dirs[1] == 'wbmp'
+    assert len(result) == 6
+
+
+def test_condition_without_scope():
+    result = parse_file(_tests_path + '/data/condition_without_scope.pro')
+    assert len(result) == 1
+
+
+def test_multi_condition_divided_by_lc():
+    result = parse_file(_tests_path + '/data/multi_condition_divided_by_lc.pro')
+    assert len(result) == 1
+
+
+def test_nested_function_calls():
+    result = parse_file(_tests_path + '/data/nested_function_calls.pro')
+    assert len(result) == 1
+
+def test_value_function():
+    result = parse_file(_tests_path + '/data/value_function.pro')
+    target = result[0]['value'][0]
+    assert target == 'Dummy'
+    value = result[1]['value']
+    assert value[0] == '$$TARGET'
diff --git a/util/cmake/tests/test_scope_handling.py b/util/cmake/tests/test_scope_handling.py
new file mode 100755
index 0000000000..1db8b2a079
--- /dev/null
+++ b/util/cmake/tests/test_scope_handling.py
@@ -0,0 +1,346 @@
+#!/usr/bin/env python3
+#############################################################################
+##
+## Copyright (C) 2018 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the plugins of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:GPL-EXCEPT$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 as published by the Free Software
+## Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+from pro2cmake import Scope, SetOperation, merge_scopes, recursive_evaluate_scope
+
+import pytest
+import typing
+
+ScopeList = typing.List[Scope]
+
+def _map_to_operation(**kwargs):
+    result = {}  # type: typing.Mapping[str, typing.List[SetOperation]]
+    for (key, value) in kwargs.items():
+        result[key] = [SetOperation([value])]
+    return result
+
+
+def _new_scope(*, parent_scope=None, condition='', **kwargs) -> Scope:
+    return Scope(parent_scope=parent_scope,
+                 qmake_file='file1', condition=condition, operations=_map_to_operation(**kwargs))
+
+
+def _evaluate_scopes(scopes: ScopeList) -> ScopeList:
+    for s in scopes:
+        if not s.parent:
+            recursive_evaluate_scope(s)
+    return scopes
+
+
+def _validate(input_scopes: ScopeList, output_scopes: ScopeList):
+    merged_scopes = merge_scopes(input_scopes)
+    assert merged_scopes == output_scopes
+
+
+def test_evaluate_one_scope():
+    scope = _new_scope(condition='QT_FEATURE_foo', test1='bar')
+
+    input_scope = scope
+    recursive_evaluate_scope(scope)
+    assert scope == input_scope
+
+
+def test_evaluate_child_scope():
+    scope = _new_scope(condition='QT_FEATURE_foo', test1='bar')
+    _new_scope(parent_scope=scope, condition='QT_FEATURE_bar', test2='bar')
+
+    input_scope = scope
+    recursive_evaluate_scope(scope)
+
+    assert scope.total_condition == 'QT_FEATURE_foo'
+    assert len(scope.children) == 1
+    assert scope.get_string('test1') == 'bar'
+    assert scope.get_string('test2', 'not found') == 'not found'
+
+    child = scope.children[0]
+    assert child.total_condition == 'QT_FEATURE_bar AND QT_FEATURE_foo'
+    assert child.get_string('test1', 'not found') == 'not found'
+    assert child.get_string('test2') == 'bar'
+
+
+def test_evaluate_two_child_scopes():
+    scope = _new_scope(condition='QT_FEATURE_foo', test1='bar')
+    _new_scope(parent_scope=scope, condition='QT_FEATURE_bar', test2='bar')
+    _new_scope(parent_scope=scope, condition='QT_FEATURE_buz', test3='buz')
+
+    input_scope = scope
+    recursive_evaluate_scope(scope)
+
+    assert scope.total_condition == 'QT_FEATURE_foo'
+    assert len(scope.children) == 2
+    assert scope.get_string('test1') == 'bar'
+    assert scope.get_string('test2', 'not found') == 'not found'
+    assert scope.get_string('test3', 'not found') == 'not found'
+
+    child1 = scope.children[0]
+    assert child1.total_condition == 'QT_FEATURE_bar AND QT_FEATURE_foo'
+    assert child1.get_string('test1', 'not found') == 'not found'
+    assert child1.get_string('test2') == 'bar'
+    assert child1.get_string('test3', 'not found') == 'not found'
+
+    child2 = scope.children[1]
+    assert child2.total_condition == 'QT_FEATURE_buz AND QT_FEATURE_foo'
+    assert child2.get_string('test1', 'not found') == 'not found'
+    assert child2.get_string('test2') == ''
+    assert child2.get_string('test3', 'not found') == 'buz'
+
+
+def test_evaluate_else_child_scopes():
+    scope = _new_scope(condition='QT_FEATURE_foo', test1='bar')
+    _new_scope(parent_scope=scope, condition='QT_FEATURE_bar', test2='bar')
+    _new_scope(parent_scope=scope, condition='else', test3='buz')
+
+    input_scope = scope
+    recursive_evaluate_scope(scope)
+
+    assert scope.total_condition == 'QT_FEATURE_foo'
+    assert len(scope.children) == 2
+    assert scope.get_string('test1') == 'bar'
+    assert scope.get_string('test2', 'not found') == 'not found'
+    assert scope.get_string('test3', 'not found') == 'not found'
+
+    child1 = scope.children[0]
+    assert child1.total_condition == 'QT_FEATURE_bar AND QT_FEATURE_foo'
+    assert child1.get_string('test1', 'not found') == 'not found'
+    assert child1.get_string('test2') == 'bar'
+    assert child1.get_string('test3', 'not found') == 'not found'
+
+    child2 = scope.children[1]
+    assert child2.total_condition == 'QT_FEATURE_foo AND NOT QT_FEATURE_bar'
+    assert child2.get_string('test1', 'not found') == 'not found'
+    assert child2.get_string('test2') == ''
+    assert child2.get_string('test3', 'not found') == 'buz'
+
+
+def test_evaluate_invalid_else_child_scopes():
+    scope = _new_scope(condition='QT_FEATURE_foo', test1='bar')
+    _new_scope(parent_scope=scope, condition='else', test3='buz')
+    _new_scope(parent_scope=scope, condition='QT_FEATURE_bar', test2='bar')
+
+    input_scope = scope
+    with pytest.raises(AssertionError):
+        recursive_evaluate_scope(scope)
+
+
+def test_merge_empty_scope_list():
+    _validate([], [])
+
+
+def test_merge_one_scope():
+    scopes = [_new_scope(test='foo')]
+
+    recursive_evaluate_scope(scopes[0])
+
+    _validate(scopes, scopes)
+
+
+def test_merge_one_on_scope():
+    scopes = [_new_scope(condition='ON', test='foo')]
+
+    recursive_evaluate_scope(scopes[0])
+
+    _validate(scopes, scopes)
+
+
+def test_merge_one_off_scope():
+    scopes = [_new_scope(condition='OFF', test='foo')]
+
+    recursive_evaluate_scope(scopes[0])
+
+    _validate(scopes, [])
+
+
+def test_merge_one_conditioned_scope():
+    scopes = [_new_scope(condition='QT_FEATURE_foo', test='foo')]
+
+    recursive_evaluate_scope(scopes[0])
+
+    _validate(scopes, scopes)
+
+
+def test_merge_two_scopes_with_same_condition():
+    scopes = [_new_scope(condition='QT_FEATURE_bar', test='foo'),
+              _new_scope(condition='QT_FEATURE_bar', test2='bar')]
+
+    recursive_evaluate_scope(scopes[0])
+    recursive_evaluate_scope(scopes[1])
+
+    result = merge_scopes(scopes)
+
+    assert len(result) == 1
+    r0 = result[0]
+    assert r0.total_condition == 'QT_FEATURE_bar'
+    assert r0.get_string('test') == 'foo'
+    assert r0.get_string('test2') == 'bar'
+
+
+def test_merge_three_scopes_two_with_same_condition():
+    scopes = [_new_scope(condition='QT_FEATURE_bar', test='foo'),
+              _new_scope(condition='QT_FEATURE_baz', test1='buz'),
+              _new_scope(condition='QT_FEATURE_bar', test2='bar')]
+
+    recursive_evaluate_scope(scopes[0])
+    recursive_evaluate_scope(scopes[1])
+    recursive_evaluate_scope(scopes[2])
+
+    result = merge_scopes(scopes)
+
+    assert len(result) == 2
+    r0 = result[0]
+    assert r0.total_condition == 'QT_FEATURE_bar'
+    assert r0.get_string('test') == 'foo'
+    assert r0.get_string('test2') == 'bar'
+
+    assert result[1] == scopes[1]
+
+
+def test_merge_two_unrelated_on_off_scopes():
+    scopes = [_new_scope(condition='ON', test='foo'),
+              _new_scope(condition='OFF', test2='bar')]
+
+    recursive_evaluate_scope(scopes[0])
+    recursive_evaluate_scope(scopes[1])
+
+    _validate(scopes, [scopes[0]])
+
+
+def test_merge_two_unrelated_on_off_scopes():
+    scopes = [_new_scope(condition='OFF', test='foo'),
+              _new_scope(condition='ON', test2='bar')]
+
+    recursive_evaluate_scope(scopes[0])
+    recursive_evaluate_scope(scopes[1])
+
+    _validate(scopes, [scopes[1]])
+
+
+def test_merge_parent_child_scopes_with_different_conditions():
+    scope = _new_scope(condition='FOO', test1='parent')
+    scopes = [scope, _new_scope(parent_scope=scope, condition='bar', test2='child')]
+
+    recursive_evaluate_scope(scope)
+
+    _validate(scopes, scopes)
+
+
+def test_merge_parent_child_scopes_with_same_conditions():
+    scope = _new_scope(condition='FOO AND bar', test1='parent')
+    scopes = [scope, _new_scope(parent_scope=scope, condition='FOO AND bar', test2='child')]
+
+    recursive_evaluate_scope(scope)
+
+    result = merge_scopes(scopes)
+
+    assert len(result) == 1
+    r0 = result[0]
+    assert r0.parent == None
+    assert r0.total_condition == 'FOO AND bar'
+    assert r0.get_string('test1') == 'parent'
+    assert r0.get_string('test2') == 'child'
+
+
+def test_merge_parent_child_scopes_with_on_child_condition():
+    scope = _new_scope(condition='FOO AND bar', test1='parent')
+    scopes = [scope, _new_scope(parent_scope=scope, condition='ON', test2='child')]
+
+    recursive_evaluate_scope(scope)
+
+    result = merge_scopes(scopes)
+
+    assert len(result) == 1
+    r0 = result[0]
+    assert r0.parent == None
+    assert r0.total_condition == 'FOO AND bar'
+    assert r0.get_string('test1') == 'parent'
+    assert r0.get_string('test2') == 'child'
+
+
+# Real world examples:
+
+# qstandardpaths selection:
+
+def test_qstandardpaths_scopes():
+    # top level:
+    scope1 = _new_scope(condition='ON', scope_id=1)
+
+    # win32 {
+    scope2 = _new_scope(parent_scope=scope1, condition='WIN32')
+    #     !winrt {
+    #         SOURCES += io/qstandardpaths_win.cpp
+    scope3 = _new_scope(parent_scope=scope2, condition='NOT WINRT',
+                        SOURCES='qsp_win.cpp')
+    #     } else {
+    #         SOURCES += io/qstandardpaths_winrt.cpp
+    scope4 = _new_scope(parent_scope=scope2, condition='else',
+                        SOURCES='qsp_winrt.cpp')
+    #     }
+    # else: unix {
+    scope5 = _new_scope(parent_scope=scope1, condition='else')
+    scope6 = _new_scope(parent_scope=scope5, condition='UNIX')
+    #     mac {
+    #         OBJECTIVE_SOURCES += io/qstandardpaths_mac.mm
+    scope7 = _new_scope(parent_scope=scope6, condition='APPLE_OSX', SOURCES='qsp_mac.mm')
+    #     } else:android:!android-embedded {
+    #         SOURCES += io/qstandardpaths_android.cpp
+    scope8 = _new_scope(parent_scope=scope6, condition='else')
+    scope9 = _new_scope(parent_scope=scope8,
+                        condition='ANDROID AND NOT ANDROID_EMBEDDED',
+                        SOURCES='qsp_android.cpp')
+    #     } else:haiku {
+    #              SOURCES += io/qstandardpaths_haiku.cpp
+    scope10 = _new_scope(parent_scope=scope8, condition='else')
+    scope11 = _new_scope(parent_scope=scope10, condition='HAIKU', SOURCES='qsp_haiku.cpp')
+    #     } else {
+    #         SOURCES +=io/qstandardpaths_unix.cpp
+    scope12 = _new_scope(parent_scope=scope10, condition='else', SOURCES='qsp_unix.cpp')
+    #     }
+    # }
+
+    recursive_evaluate_scope(scope1)
+
+    assert scope1.total_condition == 'ON'
+    assert scope2.total_condition == 'WIN32'
+    assert scope3.total_condition == 'WIN32 AND NOT WINRT'
+    assert scope4.total_condition == 'WINRT'
+    assert scope5.total_condition == 'UNIX'
+    assert scope6.total_condition == 'UNIX'
+    assert scope7.total_condition == 'APPLE_OSX'
+    assert scope8.total_condition == 'UNIX AND NOT APPLE_OSX'
+    assert scope9.total_condition == 'ANDROID AND NOT ANDROID_EMBEDDED'
+    assert scope10.total_condition == 'UNIX AND NOT APPLE_OSX AND (ANDROID_EMBEDDED OR NOT ANDROID)'
+    assert scope11.total_condition == 'HAIKU AND (ANDROID_EMBEDDED OR NOT ANDROID)'
+    assert scope12.total_condition == 'UNIX AND NOT APPLE_OSX AND NOT HAIKU AND (ANDROID_EMBEDDED OR NOT ANDROID)'
+
+def test_recursive_expansion():
+    scope = _new_scope(A='Foo',B='$$A/Bar')
+    assert scope.get_string('A') == 'Foo'
+    assert scope.get_string('B') == '$$A/Bar'
+    assert scope._expand_value('$$B/Source.cpp') == ['Foo/Bar/Source.cpp']
+    assert scope._expand_value('$$B') == ['Foo/Bar']
+
diff --git a/util/corelib/qurl-generateTLDs/main.cpp b/util/corelib/qurl-generateTLDs/main.cpp
index c03da98510..1e104e99c2 100644
--- a/util/corelib/qurl-generateTLDs/main.cpp
+++ b/util/corelib/qurl-generateTLDs/main.cpp
@@ -191,6 +191,6 @@ int main(int argc, char **argv)
     outFile.write(chunks.join(", ").toLatin1());
     outFile.write("};\n");
     outFile.close();
-    printf("Data generated to %s - now revise qtbase/src/corelib/io/qurltlds_p.h to use this data.\n", argv[2]);
+    printf("Data generated to %s - now revise qtbase/src/network/kernel/qurltlds_p.h to use this data.\n", argv[2]);
     return 0;
 }
diff --git a/util/glgen/codegenerator.cpp b/util/glgen/codegenerator.cpp
index 79e889a13e..e1c70f1aea 100644
--- a/util/glgen/codegenerator.cpp
+++ b/util/glgen/codegenerator.cpp
@@ -187,12 +187,12 @@ void CodeGenerator::writeCoreFactoryImplementation(const QString &fileName) cons
     std::sort(versions.begin(), versions.end(), std::greater<Version>());
 
     // Outout the #include statements
-    stream << QStringLiteral("#if !defined(QT_OPENGL_ES_2)") << endl;
+    stream << QStringLiteral("#if !defined(QT_OPENGL_ES_2)") << Qt::endl;
     Q_FOREACH (const Version &classVersion, versions) {
         if (!versionHasProfiles(classVersion)) {
             stream << QString(QStringLiteral("#include \"qopenglfunctions_%1_%2.h\""))
                       .arg(classVersion.major)
-                      .arg(classVersion.minor) << endl;
+                      .arg(classVersion.minor) << Qt::endl;
         } else {
             const QList<VersionProfile::OpenGLProfile> profiles = (QList<VersionProfile::OpenGLProfile>()
                 << VersionProfile::CoreProfile << VersionProfile::CompatibilityProfile);
@@ -204,33 +204,33 @@ void CodeGenerator::writeCoreFactoryImplementation(const QString &fileName) cons
                 stream << QString(QStringLiteral("#include \"qopenglfunctions_%1_%2_%3.h\""))
                           .arg(classVersion.major)
                           .arg(classVersion.minor)
-                          .arg(profileSuffix) << endl;
+                          .arg(profileSuffix) << Qt::endl;
             }
         }
     }
-    stream << QStringLiteral("#else") << endl;
-    stream << QStringLiteral("#include \"qopenglfunctions_es2.h\"") << endl;
-    stream << QStringLiteral("#endif") << endl;
+    stream << QStringLiteral("#else") << Qt::endl;
+    stream << QStringLiteral("#include \"qopenglfunctions_es2.h\"") << Qt::endl;
+    stream << QStringLiteral("#endif") << Qt::endl;
 
-    stream << endl;
+    stream << Qt::endl;
 
-    stream << QStringLiteral("QT_BEGIN_NAMESPACE") << endl << endl;
-    stream << QStringLiteral("QAbstractOpenGLFunctions *QOpenGLVersionFunctionsFactory::create(const QOpenGLVersionProfile &versionProfile)") << endl;
-    stream << QStringLiteral("{") << endl;
-    stream << QStringLiteral("#if !defined(QT_OPENGL_ES_2)") << endl;
-    stream << QStringLiteral("    const int major = versionProfile.version().first;") << endl;
-    stream << QStringLiteral("    const int minor = versionProfile.version().second;") << endl << endl;
+    stream << QStringLiteral("QT_BEGIN_NAMESPACE") << Qt::endl << Qt::endl;
+    stream << QStringLiteral("QAbstractOpenGLFunctions *QOpenGLVersionFunctionsFactory::create(const QOpenGLVersionProfile &versionProfile)") << Qt::endl;
+    stream << QStringLiteral("{") << Qt::endl;
+    stream << QStringLiteral("#if !defined(QT_OPENGL_ES_2)") << Qt::endl;
+    stream << QStringLiteral("    const int major = versionProfile.version().first;") << Qt::endl;
+    stream << QStringLiteral("    const int minor = versionProfile.version().second;") << Qt::endl << Qt::endl;
 
     // Iterate over classes with profiles
-    stream << QStringLiteral("    if (versionProfile.hasProfiles()) {") << endl;
-    stream << QStringLiteral("        switch (versionProfile.profile()) {") << endl;
+    stream << QStringLiteral("    if (versionProfile.hasProfiles()) {") << Qt::endl;
+    stream << QStringLiteral("        switch (versionProfile.profile()) {") << Qt::endl;
     const QList<VersionProfile::OpenGLProfile> profiles = (QList<VersionProfile::OpenGLProfile>()
         << VersionProfile::CoreProfile << VersionProfile::CompatibilityProfile);
     Q_FOREACH (const VersionProfile::OpenGLProfile profile, profiles) {
         const QString caseLabel = profile == VersionProfile::CoreProfile
                                 ? QStringLiteral("QSurfaceFormat::CoreProfile")
                                 : QStringLiteral("QSurfaceFormat::CompatibilityProfile");
-        stream << QString(QStringLiteral("        case %1:")).arg(caseLabel) << endl;
+        stream << QString(QStringLiteral("        case %1:")).arg(caseLabel) << Qt::endl;
 
         int i = 0;
         Q_FOREACH (const Version &classVersion, versions) {
@@ -241,23 +241,23 @@ void CodeGenerator::writeCoreFactoryImplementation(const QString &fileName) cons
             stream << QString(QStringLiteral("            %1 (major == %2 && minor == %3)"))
                       .arg(ifString)
                       .arg(classVersion.major)
-                      .arg(classVersion.minor) << endl;
+                      .arg(classVersion.minor) << Qt::endl;
 
             VersionProfile v;
             v.version = classVersion;
             v.profile = profile;
             stream << QString(QStringLiteral("                return new %1;"))
-                      .arg(generateClassName(v)) << endl;
+                      .arg(generateClassName(v)) << Qt::endl;
         }
 
-        stream << QStringLiteral("            break;") << endl << endl;
+        stream << QStringLiteral("            break;") << Qt::endl << Qt::endl;
     }
 
-    stream << QStringLiteral("        case QSurfaceFormat::NoProfile:") << endl;
-    stream << QStringLiteral("        default:") << endl;
-    stream << QStringLiteral("            break;") << endl;
-    stream << QStringLiteral("        };") << endl;
-    stream << QStringLiteral("    } else {") << endl;
+    stream << QStringLiteral("        case QSurfaceFormat::NoProfile:") << Qt::endl;
+    stream << QStringLiteral("        default:") << Qt::endl;
+    stream << QStringLiteral("            break;") << Qt::endl;
+    stream << QStringLiteral("        };") << Qt::endl;
+    stream << QStringLiteral("    } else {") << Qt::endl;
 
     // Iterate over the legacy classes (no profiles)
     int i = 0;
@@ -269,22 +269,22 @@ void CodeGenerator::writeCoreFactoryImplementation(const QString &fileName) cons
         stream << QString(QStringLiteral("        %1 (major == %2 && minor == %3)"))
                   .arg(ifString)
                   .arg(classVersion.major)
-                  .arg(classVersion.minor) << endl;
+                  .arg(classVersion.minor) << Qt::endl;
 
         VersionProfile v;
         v.version = classVersion;
         stream << QString(QStringLiteral("            return new %1;"))
-                  .arg(generateClassName(v)) << endl;
+                  .arg(generateClassName(v)) << Qt::endl;
     }
 
-    stream << QStringLiteral("    }") << endl;
-    stream << QStringLiteral("    return 0;") << endl;
+    stream << QStringLiteral("    }") << Qt::endl;
+    stream << QStringLiteral("    return 0;") << Qt::endl;
 
-    stream << QStringLiteral("#else") << endl;
-    stream << QStringLiteral("    Q_UNUSED(versionProfile);") << endl;
-    stream << QStringLiteral("    return new QOpenGLFunctions_ES2;") << endl;
-    stream << QStringLiteral("#endif") << endl;
-    stream << QStringLiteral("}") << endl;
+    stream << QStringLiteral("#else") << Qt::endl;
+    stream << QStringLiteral("    Q_UNUSED(versionProfile);") << Qt::endl;
+    stream << QStringLiteral("    return new QOpenGLFunctions_ES2;") << Qt::endl;
+    stream << QStringLiteral("#endif") << Qt::endl;
+    stream << QStringLiteral("}") << Qt::endl;
 
     // Write the postamble
     writePostamble(fileName, stream);
@@ -432,13 +432,13 @@ void CodeGenerator::writeBackendClassDeclaration(QTextStream &stream,
     stream << QString(QStringLiteral("class %1 : public %2"))
               .arg(className)
               .arg(baseClass)
-           << endl;
-    stream << QStringLiteral("{") << endl;
-    stream << QStringLiteral("public:") << endl;
-    stream << QString( QStringLiteral("    %1(QOpenGLContext *context);") ).arg(className) << endl << endl;
+           << Qt::endl;
+    stream << QStringLiteral("{") << Qt::endl;
+    stream << QStringLiteral("public:") << Qt::endl;
+    stream << QString( QStringLiteral("    %1(QOpenGLContext *context);") ).arg(className) << Qt::endl << Qt::endl;
 
     // Output function used for generating key used in QOpenGLContextPrivate
-    stream << QStringLiteral("    static QOpenGLVersionStatus versionStatus();") << endl << endl;
+    stream << QStringLiteral("    static QOpenGLVersionStatus versionStatus();") << Qt::endl << Qt::endl;
 
     // Get the functions needed for this class
     FunctionList functions = m_parser->functionsForVersion(versionProfile);
@@ -448,8 +448,8 @@ void CodeGenerator::writeBackendClassDeclaration(QTextStream &stream,
     // Declare the functions
     writeClassFunctionDeclarations(stream, functionSet, Private);
 
-    stream << QStringLiteral("};") << endl;
-    stream << endl;
+    stream << QStringLiteral("};") << Qt::endl;
+    stream << Qt::endl;
 }
 
 void CodeGenerator::writeBackendClassImplementation(QTextStream &stream,
@@ -457,9 +457,9 @@ void CodeGenerator::writeBackendClassImplementation(QTextStream &stream,
                                                     const QString &baseClass) const
 {
     const QString className = backendClassName(versionProfile);
-    stream << QString(QStringLiteral("%1::%1(QOpenGLContext *context)")).arg(className) << endl;
-    stream << QString(QStringLiteral("    : %1(context)")).arg(baseClass) << endl
-           << QStringLiteral("{") << endl;
+    stream << QString(QStringLiteral("%1::%1(QOpenGLContext *context)")).arg(className) << Qt::endl;
+    stream << QString(QStringLiteral("    : %1(context)")).arg(baseClass) << Qt::endl
+           << QStringLiteral("{") << Qt::endl;
 
     // Resolve the entry points for this set of functions
     // Get the functions needed for this class
@@ -468,18 +468,18 @@ void CodeGenerator::writeBackendClassImplementation(QTextStream &stream,
     functionSet.insert(versionProfile, functions);
     writeEntryPointResolutionCode(stream, functionSet);
 
-    stream << QStringLiteral("}") << endl << endl;
+    stream << QStringLiteral("}") << Qt::endl << Qt::endl;
 
-    stream << QString(QStringLiteral("QOpenGLVersionStatus %1::versionStatus()")).arg(className) << endl;
-    stream << QStringLiteral("{") << endl;
+    stream << QString(QStringLiteral("QOpenGLVersionStatus %1::versionStatus()")).arg(className) << Qt::endl;
+    stream << QStringLiteral("{") << Qt::endl;
     const QString status = versionProfile.profile == VersionProfile::CoreProfile
                          ? QStringLiteral("QOpenGLVersionStatus::CoreStatus")
                          : QStringLiteral("QOpenGLVersionStatus::DeprecatedStatus");
     stream << QString(QStringLiteral("    return QOpenGLVersionStatus(%1, %2, %3);"))
               .arg(versionProfile.version.major)
               .arg(versionProfile.version.minor)
-              .arg(status) << endl;
-    stream << QStringLiteral("}") << endl << endl;
+              .arg(status) << Qt::endl;
+    stream << QStringLiteral("}") << Qt::endl << Qt::endl;
 }
 
 QString CodeGenerator::coreClassFileName(const VersionProfile &versionProfile,
@@ -525,25 +525,25 @@ void CodeGenerator::writePublicClassDeclaration(const QString &baseFileName,
     stream << QString(QStringLiteral("class Q_GUI_EXPORT %1 : public %2"))
               .arg(className)
               .arg(baseClass)
-           << endl;
-    stream << QStringLiteral("{") << endl;
-    stream << QStringLiteral("public:") << endl;
-    stream << QString(QStringLiteral("    %1();")).arg(className) << endl;
-    stream << QString(QStringLiteral("    ~%1();")).arg(className) << endl << endl;
-    stream << QStringLiteral("    bool initializeOpenGLFunctions() override;") << endl << endl;
+           << Qt::endl;
+    stream << QStringLiteral("{") << Qt::endl;
+    stream << QStringLiteral("public:") << Qt::endl;
+    stream << QString(QStringLiteral("    %1();")).arg(className) << Qt::endl;
+    stream << QString(QStringLiteral("    ~%1();")).arg(className) << Qt::endl << Qt::endl;
+    stream << QStringLiteral("    bool initializeOpenGLFunctions() override;") << Qt::endl << Qt::endl;
 
     // Get the functions needed for this class and declare them
     FunctionCollection functionSet = functionCollection(versionProfile);
     writeClassFunctionDeclarations(stream, functionSet, Public);
 
     // isCompatible function and backend variables
-    stream << QStringLiteral("private:") << endl;
-    stream << QStringLiteral("    friend class QOpenGLContext;") << endl << endl;
-    stream << QStringLiteral("    static bool isContextCompatible(QOpenGLContext *context);") << endl;
-    stream << QStringLiteral("    static QOpenGLVersionProfile versionProfile();") << endl << endl;
+    stream << QStringLiteral("private:") << Qt::endl;
+    stream << QStringLiteral("    friend class QOpenGLContext;") << Qt::endl << Qt::endl;
+    stream << QStringLiteral("    static bool isContextCompatible(QOpenGLContext *context);") << Qt::endl;
+    stream << QStringLiteral("    static QOpenGLVersionProfile versionProfile();") << Qt::endl << Qt::endl;
     writeBackendVariableDeclarations(stream, backendsForFunctionCollection(functionSet));
 
-    stream << QStringLiteral("};") << endl << endl;
+    stream << QStringLiteral("};") << Qt::endl << Qt::endl;
 
     // Output the inline functions that forward OpenGL calls to the backends' entry points
     writeClassInlineFunctions(stream, className, functionSet);
@@ -576,11 +576,11 @@ void CodeGenerator::writePublicClassImplementation(const QString &baseFileName,
     writePreamble(templateFileName, stream, versionProfileString);
 
     const QString className = generateClassName(versionProfile, Public);
-    stream << QStringLiteral("/*!") << endl
-           << QStringLiteral("    \\class ") << className << endl
-           << QStringLiteral("    \\inmodule QtGui") << endl
-           << QStringLiteral("    \\since 5.1") << endl
-           << QStringLiteral("    \\wrapper") << endl
+    stream << QStringLiteral("/*!") << Qt::endl
+           << QStringLiteral("    \\class ") << className << Qt::endl
+           << QStringLiteral("    \\inmodule QtGui") << Qt::endl
+           << QStringLiteral("    \\since 5.1") << Qt::endl
+           << QStringLiteral("    \\wrapper") << Qt::endl
            << QStringLiteral("    \\brief The ") << className
            << QString(QStringLiteral(" class provides all functions for OpenGL %1.%2 "))
                 .arg(versionProfile.version.major)
@@ -593,116 +593,116 @@ void CodeGenerator::writePublicClassImplementation(const QString &baseFileName,
         profileSuffix = "specification";
     }
 
-    stream << profileSuffix << QStringLiteral(".") << endl << endl
+    stream << profileSuffix << QStringLiteral(".") << Qt::endl << Qt::endl
            << QStringLiteral("    This class is a wrapper for functions from ")
            << QString(QStringLiteral("OpenGL %1.%2 "))
                 .arg(versionProfile.version.major)
                 .arg(versionProfile.version.minor)
-           << profileSuffix << QStringLiteral(".") << endl
-           << QStringLiteral("    See reference pages on \\l {http://www.opengl.org/sdk/docs/}{opengl.org}") << endl
-           << QStringLiteral("    for function documentation.") << endl << endl
-           << QStringLiteral("    \\sa QAbstractOpenGLFunctions") << endl
-           << QStringLiteral("*/") << endl << endl;
+           << profileSuffix << QStringLiteral(".") << Qt::endl
+           << QStringLiteral("    See reference pages on \\l {http://www.opengl.org/sdk/docs/}{opengl.org}") << Qt::endl
+           << QStringLiteral("    for function documentation.") << Qt::endl << Qt::endl
+           << QStringLiteral("    \\sa QAbstractOpenGLFunctions") << Qt::endl
+           << QStringLiteral("*/") << Qt::endl << Qt::endl;
 
     // Get the data we'll need for this class implementation
     FunctionCollection functionSet = functionCollection(versionProfile);
     QList<VersionProfile> backends = backendsForFunctionCollection(functionSet);
 
     // Output default constructor
-    stream << className << QStringLiteral("::") << className << QStringLiteral("()") << endl;
+    stream << className << QStringLiteral("::") << className << QStringLiteral("()") << Qt::endl;
     stream << QStringLiteral(" : ") << baseClass << QStringLiteral("()");
     Q_FOREACH (const VersionProfile &v, backends)
-        stream << endl << QString(QStringLiteral(" , %1(0)")).arg(backendVariableName(v));
-    stream << endl << QStringLiteral("{") << endl << QStringLiteral("}") << endl << endl;
+        stream << Qt::endl << QString(QStringLiteral(" , %1(0)")).arg(backendVariableName(v));
+    stream << Qt::endl << QStringLiteral("{") << Qt::endl << QStringLiteral("}") << Qt::endl << Qt::endl;
 
     // Output the destructor
-    stream << className << QStringLiteral("::~") << className << QStringLiteral("()") << endl;
-    stream << QStringLiteral("{") << endl;
+    stream << className << QStringLiteral("::~") << className << QStringLiteral("()") << Qt::endl;
+    stream << QStringLiteral("{") << Qt::endl;
     Q_FOREACH (const VersionProfile &v, backends) {
         const QString backendVar = backendVariableName(v);
         const QString backendClass = backendClassName(v);
-        stream << QString(QStringLiteral("    if (%1 && !%1->refs.deref()) {")).arg(backendVar) << endl;
+        stream << QString(QStringLiteral("    if (%1 && !%1->refs.deref()) {")).arg(backendVar) << Qt::endl;
         stream << QString(QStringLiteral("        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(%1->context, %2::versionStatus());"))
                   .arg(backendVar)
-                  .arg(backendClass) << endl;
-        stream << QString(QStringLiteral("        delete %1;")).arg(backendVar) << endl;
-        stream << QStringLiteral("    }") << endl;
+                  .arg(backendClass) << Qt::endl;
+        stream << QString(QStringLiteral("        delete %1;")).arg(backendVar) << Qt::endl;
+        stream << QStringLiteral("    }") << Qt::endl;
     }
-    stream << QStringLiteral("}") << endl << endl;
+    stream << QStringLiteral("}") << Qt::endl << Qt::endl;
 
     // Output the initialize function that creates the backend objects
-    stream << QString(QStringLiteral("bool %1::initializeOpenGLFunctions()")).arg(className) << endl;
-    stream << QStringLiteral("{") << endl;
-
-    stream << QStringLiteral("    if ( isInitialized() )") << endl;
-    stream << QStringLiteral("        return true;") << endl << endl;
-    stream << QStringLiteral("    QOpenGLContext* context = QOpenGLContext::currentContext();") << endl << endl;
-    stream << QStringLiteral("    // If owned by a context object make sure it is current.") << endl;
-    stream << QStringLiteral("    // Also check that current context is capable of resolving all needed functions") << endl;
-    stream << QStringLiteral("    if (((owningContext() && owningContext() == context) || !owningContext())") << endl;
-    stream << QString(QStringLiteral("        && %1::isContextCompatible(context))")).arg(className) << endl;
-    stream << QStringLiteral("    {") << endl;
-    stream << QStringLiteral("        // Associate with private implementation, creating if necessary") << endl;
-    stream << QStringLiteral("        // Function pointers in the backends are resolved at creation time") << endl;
-    stream << QStringLiteral("        QOpenGLVersionFunctionsBackend* d = 0;") << endl;
+    stream << QString(QStringLiteral("bool %1::initializeOpenGLFunctions()")).arg(className) << Qt::endl;
+    stream << QStringLiteral("{") << Qt::endl;
+
+    stream << QStringLiteral("    if ( isInitialized() )") << Qt::endl;
+    stream << QStringLiteral("        return true;") << Qt::endl << Qt::endl;
+    stream << QStringLiteral("    QOpenGLContext* context = QOpenGLContext::currentContext();") << Qt::endl << Qt::endl;
+    stream << QStringLiteral("    // If owned by a context object make sure it is current.") << Qt::endl;
+    stream << QStringLiteral("    // Also check that current context is capable of resolving all needed functions") << Qt::endl;
+    stream << QStringLiteral("    if (((owningContext() && owningContext() == context) || !owningContext())") << Qt::endl;
+    stream << QString(QStringLiteral("        && %1::isContextCompatible(context))")).arg(className) << Qt::endl;
+    stream << QStringLiteral("    {") << Qt::endl;
+    stream << QStringLiteral("        // Associate with private implementation, creating if necessary") << Qt::endl;
+    stream << QStringLiteral("        // Function pointers in the backends are resolved at creation time") << Qt::endl;
+    stream << QStringLiteral("        QOpenGLVersionFunctionsBackend* d = 0;") << Qt::endl;
 
     Q_FOREACH (const VersionProfile &v, backends) {
         const QString backendClass = backendClassName(v);
         const QString backendVar = backendVariableName(v);
         stream << QString(QStringLiteral("        d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, %1::versionStatus());"))
-                  .arg(backendClass) << endl;
-        stream << QStringLiteral("        if (!d) {") << endl;
-        stream << QString(QStringLiteral("            d = new %1(context);")).arg(backendClass) << endl;
+                  .arg(backendClass) << Qt::endl;
+        stream << QStringLiteral("        if (!d) {") << Qt::endl;
+        stream << QString(QStringLiteral("            d = new %1(context);")).arg(backendClass) << Qt::endl;
         stream << QString(QStringLiteral("            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, %1::versionStatus(), d);"))
-                  .arg(backendClass) << endl;
-        stream << QStringLiteral("        }") << endl;
-        stream << QString(QStringLiteral("        %1 = static_cast<%2*>(d);")).arg(backendVar).arg(backendClass) << endl;
-        stream << QStringLiteral("        d->refs.ref();") << endl << endl;
+                  .arg(backendClass) << Qt::endl;
+        stream << QStringLiteral("        }") << Qt::endl;
+        stream << QString(QStringLiteral("        %1 = static_cast<%2*>(d);")).arg(backendVar).arg(backendClass) << Qt::endl;
+        stream << QStringLiteral("        d->refs.ref();") << Qt::endl << Qt::endl;
     }
 
-    stream << QStringLiteral("        QAbstractOpenGLFunctions::initializeOpenGLFunctions();") << endl;
-    stream << QStringLiteral("    }") << endl;
+    stream << QStringLiteral("        QAbstractOpenGLFunctions::initializeOpenGLFunctions();") << Qt::endl;
+    stream << QStringLiteral("    }") << Qt::endl;
 
-    stream << QStringLiteral("    return isInitialized();") << endl;
-    stream << QStringLiteral("}") << endl << endl;
+    stream << QStringLiteral("    return isInitialized();") << Qt::endl;
+    stream << QStringLiteral("}") << Qt::endl << Qt::endl;
 
     // Output the context compatibility check function
-    stream << QString(QStringLiteral("bool %1::isContextCompatible(QOpenGLContext *context)")).arg(className) << endl;
-    stream << QStringLiteral("{") << endl;
-    stream << QStringLiteral("    Q_ASSERT(context);") << endl;
-    stream << QStringLiteral("    QSurfaceFormat f = context->format();") << endl;
-    stream << QStringLiteral("    const QPair<int, int> v = qMakePair(f.majorVersion(), f.minorVersion());") << endl;
+    stream << QString(QStringLiteral("bool %1::isContextCompatible(QOpenGLContext *context)")).arg(className) << Qt::endl;
+    stream << QStringLiteral("{") << Qt::endl;
+    stream << QStringLiteral("    Q_ASSERT(context);") << Qt::endl;
+    stream << QStringLiteral("    QSurfaceFormat f = context->format();") << Qt::endl;
+    stream << QStringLiteral("    const QPair<int, int> v = qMakePair(f.majorVersion(), f.minorVersion());") << Qt::endl;
     stream << QString(QStringLiteral("    if (v < qMakePair(%1, %2))"))
               .arg(versionProfile.version.major)
-              .arg(versionProfile.version.minor) << endl;
-    stream << QStringLiteral("        return false;") << endl << endl;
+              .arg(versionProfile.version.minor) << Qt::endl;
+    stream << QStringLiteral("        return false;") << Qt::endl << Qt::endl;
 
     // If generating a legacy or compatibility profile class we need to ensure that
     // the context does not expose only core functions
     if (versionProfile.profile != VersionProfile::CoreProfile) {
-        stream << QStringLiteral("    if (f.profile() == QSurfaceFormat::CoreProfile)") << endl;
-        stream << QStringLiteral("        return false;") << endl << endl;
+        stream << QStringLiteral("    if (f.profile() == QSurfaceFormat::CoreProfile)") << Qt::endl;
+        stream << QStringLiteral("        return false;") << Qt::endl << Qt::endl;
     }
 
-    stream << QStringLiteral("    return true;") << endl;
-    stream << QStringLiteral("}") << endl << endl;
+    stream << QStringLiteral("    return true;") << Qt::endl;
+    stream << QStringLiteral("}") << Qt::endl << Qt::endl;
 
     // Output static function used as helper in template versionFunctions() function
     // in QOpenGLContext
-    stream << QString(QStringLiteral("QOpenGLVersionProfile %1::versionProfile()")).arg(className) << endl;
-    stream << QStringLiteral("{") << endl;
-    stream << QStringLiteral("    QOpenGLVersionProfile v;") << endl;
+    stream << QString(QStringLiteral("QOpenGLVersionProfile %1::versionProfile()")).arg(className) << Qt::endl;
+    stream << QStringLiteral("{") << Qt::endl;
+    stream << QStringLiteral("    QOpenGLVersionProfile v;") << Qt::endl;
     stream << QString(QStringLiteral("    v.setVersion(%1, %2);"))
               .arg(versionProfile.version.major)
-              .arg(versionProfile.version.minor) << endl;
+              .arg(versionProfile.version.minor) << Qt::endl;
     if (versionProfile.hasProfiles()) {
         const QString profileName = versionProfile.profile == VersionProfile::CoreProfile
                                     ? QStringLiteral("QSurfaceFormat::CoreProfile")
                                     : QStringLiteral("QSurfaceFormat::CompatibilityProfile");
-        stream << QString(QStringLiteral("    v.setProfile(%1);")).arg(profileName) << endl;
+        stream << QString(QStringLiteral("    v.setProfile(%1);")).arg(profileName) << Qt::endl;
     }
-    stream << QStringLiteral("    return v;") << endl;
-    stream << QStringLiteral("}") << endl;
+    stream << QStringLiteral("    return v;") << Qt::endl;
+    stream << QStringLiteral("}") << Qt::endl;
 
     // Write the postamble
     writePostamble(templateFileName, stream);
@@ -718,13 +718,13 @@ void CodeGenerator::writeClassFunctionDeclarations(QTextStream &stream,
                   .arg(version.version.major)
                   .arg(version.version.minor)
                   .arg((version.profile == VersionProfile::CoreProfile) ? QStringLiteral("core") : QStringLiteral("deprecated"))
-               << endl;
+               << Qt::endl;
 
         // Output function declarations
         FunctionList functions = functionSet.value(version);
         Q_FOREACH (const Function &f, functions)
             writeFunctionDeclaration(stream, f, visibility);
-        stream << endl;
+        stream << Qt::endl;
     } // version and profile
 }
 
@@ -751,7 +751,7 @@ void CodeGenerator::writeFunctionDeclaration(QTextStream &stream, const Function
     default:
         signature = QString(QStringLiteral("    %1 (QOPENGLF_APIENTRYP %2)(%3);")).arg(f.returnType).arg(f.name).arg(args);
     }
-    stream << signature << endl;
+    stream << signature << Qt::endl;
 }
 
 void CodeGenerator::writeClassInlineFunctions(QTextStream &stream,
@@ -765,7 +765,7 @@ void CodeGenerator::writeClassInlineFunctions(QTextStream &stream,
                   .arg(version.version.major)
                   .arg(version.version.minor)
                   .arg((version.profile == VersionProfile::CoreProfile) ? QStringLiteral("core") : QStringLiteral("deprecated"))
-               << endl;
+               << Qt::endl;
 
         // Output function declarations
         const QString backendVar = backendVariableName(version);
@@ -773,7 +773,7 @@ void CodeGenerator::writeClassInlineFunctions(QTextStream &stream,
         Q_FOREACH (const Function &f, functions)
             writeInlineFunction(stream, className, backendVar, f);
 
-        stream << endl;
+        stream << Qt::endl;
 
     } // version and profile
 }
@@ -798,7 +798,7 @@ void CodeGenerator::writeInlineFunction(QTextStream &stream, const QString &clas
                         .arg(className)
                         .arg(f.name)
                         .arg(args);
-    stream << signature << endl << QStringLiteral("{") << endl;
+    stream << signature << Qt::endl << QStringLiteral("{") << Qt::endl;
 
     QStringList argumentNames;
     Q_FOREACH (const Argument &arg, f.arguments)
@@ -806,10 +806,10 @@ void CodeGenerator::writeInlineFunction(QTextStream &stream, const QString &clas
     QString argNames = argumentNames.join(", ");
 
     if (f.returnType == QLatin1String("void"))
-        stream << QString(QStringLiteral("    %1->%2(%3);")).arg(backendVar).arg(f.name).arg(argNames) << endl;
+        stream << QString(QStringLiteral("    %1->%2(%3);")).arg(backendVar).arg(f.name).arg(argNames) << Qt::endl;
     else
-        stream << QString(QStringLiteral("    return %1->%2(%3);")).arg(backendVar).arg(f.name).arg(argNames) << endl;
-    stream << QStringLiteral("}") << endl << endl;
+        stream << QString(QStringLiteral("    return %1->%2(%3);")).arg(backendVar).arg(f.name).arg(argNames) << Qt::endl;
+    stream << QStringLiteral("}") << Qt::endl << Qt::endl;
 }
 
 void CodeGenerator::writeEntryPointResolutionCode(QTextStream &stream,
@@ -823,32 +823,32 @@ void CodeGenerator::writeEntryPointResolutionCode(QTextStream &stream,
                   .arg(version.version.major)
                   .arg(version.version.minor)
                   .arg((version.profile == VersionProfile::CoreProfile) ? QStringLiteral("core") : QStringLiteral("deprecated"))
-               << endl;
+               << Qt::endl;
 
         // Output function declarations
         FunctionList functions = functionSet.value(version);
 
         bool useGetProcAddress = (version.version.major == 1 && (version.version.minor == 0 || version.version.minor == 1));
         if (useGetProcAddress) {
-            stream << "#if defined(Q_OS_WIN)" << endl;
+            stream << "#if defined(Q_OS_WIN)" << Qt::endl;
             if (!hasModuleHandle) {
-                stream << "    HMODULE handle = GetModuleHandleA(\"opengl32.dll\");" << endl;
+                stream << "    HMODULE handle = GetModuleHandleA(\"opengl32.dll\");" << Qt::endl;
                 hasModuleHandle = true;
             }
 
             Q_FOREACH (const Function &f, functions)
                 writeEntryPointResolutionStatement(stream, f, QString(), useGetProcAddress);
 
-            stream << "#else" << endl;
+            stream << "#else" << Qt::endl;
         }
 
         Q_FOREACH (const Function &f, functions)
             writeEntryPointResolutionStatement(stream, f);
 
         if (useGetProcAddress)
-            stream << "#endif" << endl;
+            stream << "#endif" << Qt::endl;
 
-        stream << endl;
+        stream << Qt::endl;
 
     } // version and profile
 }
@@ -880,7 +880,7 @@ void CodeGenerator::writeEntryPointResolutionStatement(QTextStream &stream, cons
                     .arg(f.name)
                     .arg(prefix);
     }
-    stream << signature << endl;
+    stream << signature << Qt::endl;
 }
 
 QList<VersionProfile> CodeGenerator::backendsForFunctionCollection(const FunctionCollection &functionSet) const
@@ -923,7 +923,7 @@ void CodeGenerator::writeBackendVariableDeclarations(QTextStream &stream, const
     Q_FOREACH (const VersionProfile &v, backends) {
         const QString className = backendClassName(v);
         const QString varName = backendVariableName(v);
-        stream << QString(QStringLiteral("    %1* %2;")).arg(className).arg(varName) << endl;
+        stream << QString(QStringLiteral("    %1* %2;")).arg(className).arg(varName) << Qt::endl;
     }
 }
 
@@ -982,15 +982,15 @@ void CodeGenerator::writeExtensionClassDeclaration(QTextStream &stream, const QS
     stream << QString(QStringLiteral("class %2 : public %3"))
               .arg(className)
               .arg(baseClass)
-           << endl << "{" << endl << "public:" << endl;
+           << Qt::endl << "{" << Qt::endl << "public:" << Qt::endl;
 
     if (visibility == Public) {
         // Default constructor
-        stream << QStringLiteral("    ") << className << QStringLiteral("();") << endl << endl;
+        stream << QStringLiteral("    ") << className << QStringLiteral("();") << Qt::endl << Qt::endl;
 
         // Base class virtual function(s)
         QString resolveFunction = QStringLiteral("    bool initializeOpenGLFunctions() final;");
-        stream << resolveFunction << endl << endl;
+        stream << resolveFunction << Qt::endl << Qt::endl;
     }
 
     // Output the functions provided by this extension
@@ -1000,12 +1000,12 @@ void CodeGenerator::writeExtensionClassDeclaration(QTextStream &stream, const QS
 
     if (visibility == Public) {
         // Write out the protected ctor
-        stream << endl << QStringLiteral("protected:") << endl;
-        stream << QStringLiteral("    Q_DECLARE_PRIVATE(") << className << QStringLiteral(")") << endl;
+        stream << Qt::endl << QStringLiteral("protected:") << Qt::endl;
+        stream << QStringLiteral("    Q_DECLARE_PRIVATE(") << className << QStringLiteral(")") << Qt::endl;
     }
 
     // End the class declaration
-    stream << QStringLiteral("};") << endl << endl;
+    stream << QStringLiteral("};") << Qt::endl << Qt::endl;
 
     // Output the inline functions for public class
     if (visibility == Public) {
@@ -1033,9 +1033,9 @@ void CodeGenerator::writeExtensionInlineFunction(QTextStream &stream, const QStr
                         .arg(className)
                         .arg(f.name)
                         .arg(args);
-    stream << signature << endl << QStringLiteral("{") << endl;
+    stream << signature << Qt::endl << QStringLiteral("{") << Qt::endl;
 
-    stream << QString(QStringLiteral("    Q_D(%1);")).arg(className) << endl;
+    stream << QString(QStringLiteral("    Q_D(%1);")).arg(className) << Qt::endl;
 
     QStringList argumentNames;
     Q_FOREACH (const Argument &arg, f.arguments)
@@ -1043,10 +1043,10 @@ void CodeGenerator::writeExtensionInlineFunction(QTextStream &stream, const QStr
     QString argNames = argumentNames.join(", ");
 
     if (f.returnType == QStringLiteral("void"))
-        stream << QString(QStringLiteral("    d->%1(%2);")).arg(f.name).arg(argNames) << endl;
+        stream << QString(QStringLiteral("    d->%1(%2);")).arg(f.name).arg(argNames) << Qt::endl;
     else
-        stream << QString(QStringLiteral("    return d->%1(%2);")).arg(f.name).arg(argNames) << endl;
-    stream << QStringLiteral("}") << endl << endl;
+        stream << QString(QStringLiteral("    return d->%1(%2);")).arg(f.name).arg(argNames) << Qt::endl;
+    stream << QStringLiteral("}") << Qt::endl << Qt::endl;
 }
 
 void CodeGenerator::writeExtensionClassImplementation(QTextStream &stream, const QString &extension) const
@@ -1055,30 +1055,30 @@ void CodeGenerator::writeExtensionClassImplementation(QTextStream &stream, const
     const QString privateClassName = generateExtensionClassName(extension, Private);
 
     // Output default constructor
-    stream << className << QStringLiteral("::") << className << QStringLiteral("()") << endl;
-    stream << QStringLiteral(" : QAbstractOpenGLExtension(*(new ") << privateClassName << QStringLiteral("))") << endl;
-    stream << QStringLiteral("{") << endl << QStringLiteral("}") << endl << endl;
+    stream << className << QStringLiteral("::") << className << QStringLiteral("()") << Qt::endl;
+    stream << QStringLiteral(" : QAbstractOpenGLExtension(*(new ") << privateClassName << QStringLiteral("))") << Qt::endl;
+    stream << QStringLiteral("{") << Qt::endl << QStringLiteral("}") << Qt::endl << Qt::endl;
 
 
     // Output function to initialize this class
     stream << QStringLiteral("bool ") << className
-           << QStringLiteral("::initializeOpenGLFunctions()") << endl
-           << QStringLiteral("{") << endl;
+           << QStringLiteral("::initializeOpenGLFunctions()") << Qt::endl
+           << QStringLiteral("{") << Qt::endl;
 
-    stream << QStringLiteral("    if (isInitialized())") << endl;
-    stream << QStringLiteral("        return true;") << endl << endl;
+    stream << QStringLiteral("    if (isInitialized())") << Qt::endl;
+    stream << QStringLiteral("        return true;") << Qt::endl << Qt::endl;
 
-    stream << QStringLiteral("    QOpenGLContext *context = QOpenGLContext::currentContext();") << endl;
-    stream << QStringLiteral("    if (!context) {") << endl;
+    stream << QStringLiteral("    QOpenGLContext *context = QOpenGLContext::currentContext();") << Qt::endl;
+    stream << QStringLiteral("    if (!context) {") << Qt::endl;
     stream << QStringLiteral("        qWarning(\"A current OpenGL context is required to resolve OpenGL extension functions\");")
-           << endl;
-    stream << QStringLiteral("        return false;") << endl;
-    stream << QStringLiteral("    }") << endl << endl;
+           << Qt::endl;
+    stream << QStringLiteral("        return false;") << Qt::endl;
+    stream << QStringLiteral("    }") << Qt::endl << Qt::endl;
 
     // Output code to resolve entry points for this class
-    stream << QStringLiteral("    // Resolve the functions") << endl;
-    stream << QStringLiteral("    Q_D(") << className << QStringLiteral(");") << endl;
-    stream << endl;
+    stream << QStringLiteral("    // Resolve the functions") << Qt::endl;
+    stream << QStringLiteral("    Q_D(") << className << QStringLiteral(");") << Qt::endl;
+    stream << Qt::endl;
 
     // Output function declarations
     QList<Function> functions = m_parser->functionsForExtension(extension);
@@ -1086,11 +1086,11 @@ void CodeGenerator::writeExtensionClassImplementation(QTextStream &stream, const
         writeEntryPointResolutionStatement(stream, f, QStringLiteral("d->"));
 
     // Call the base class implementation
-    stream << QStringLiteral("    QAbstractOpenGLExtension::initializeOpenGLFunctions();") << endl;
+    stream << QStringLiteral("    QAbstractOpenGLExtension::initializeOpenGLFunctions();") << Qt::endl;
 
     // Finish off
-    stream << QStringLiteral("    return true;") << endl;
-    stream << QStringLiteral("}") << endl << endl;
+    stream << QStringLiteral("    return true;") << Qt::endl;
+    stream << QStringLiteral("}") << Qt::endl << Qt::endl;
 }
 
 QString CodeGenerator::generateExtensionClassName(const QString &extension, ClassVisibility visibility) const
diff --git a/util/locale_database/cldr2qlocalexml.py b/util/locale_database/cldr2qlocalexml.py
index a1df872e01..fdb0a34037 100755
--- a/util/locale_database/cldr2qlocalexml.py
+++ b/util/locale_database/cldr2qlocalexml.py
@@ -2,7 +2,7 @@
 # coding=utf8
 #############################################################################
 ##
-## Copyright (C) 2018 The Qt Company Ltd.
+## Copyright (C) 2020 The Qt Company Ltd.
 ## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the test suite of the Qt Toolkit.
@@ -201,14 +201,7 @@ def getNumberSystems(cache={}):
                                  'numberingSystems'):
             # ns has form: [u'numberingSystem', [(u'digits', u'0123456789'), (u'type', u'numeric'), (u'id', u'latn')]]
             entry = dict(ns[1])
-            name = entry[u'id']
-            if u'digits' in entry and ord(entry[u'digits'][0]) > 0xffff:
-                # FIXME, QTBUG-69324: make this redundant:
-                # omit number system if zero doesn't fit in single-char16 UTF-16 :-(
-                sys.stderr.write('skipping number system "%s" [can\'t represent its zero, U+%X]\n'
-                                 % (name, ord(entry[u'digits'][0])))
-            else:
-                cache[name] = entry
+            cache[entry[u'id']] = entry
     return cache
 
 def _generateLocaleInfo(path, language_code, script_code, country_code, variant_code=""):
@@ -309,13 +302,15 @@ def _generateLocaleInfo(path, language_code, script_code, country_code, variant_
     result['list'] = get_number_in_system(path, "numbers/symbols/list", numbering_system)
     result['percent'] = get_number_in_system(path, "numbers/symbols/percentSign", numbering_system)
     try:
-        result['zero'] = getNumberSystems()[numbering_system][u"digits"][0]
+        digits = getNumberSystems()[numbering_system][u"digits"];
+        assert len(digits) == 10 and all(ord(d) - i == ord(digits[0]) for i, d in enumerate(digits))
+        result['zero'] = digits[0]
     except Exception as e:
         sys.stderr.write("Native zero detection problem: %s\n" % repr(e))
         result['zero'] = get_number_in_system(path, "numbers/symbols/nativeZeroDigit", numbering_system)
     result['minus'] = get_number_in_system(path, "numbers/symbols/minusSign", numbering_system)
     result['plus'] = get_number_in_system(path, "numbers/symbols/plusSign", numbering_system)
-    result['exp'] = get_number_in_system(path, "numbers/symbols/exponential", numbering_system).lower()
+    result['exp'] = get_number_in_system(path, "numbers/symbols/exponential", numbering_system)
     result['quotationStart'] = findEntry(path, "delimiters/quotationStart")
     result['quotationEnd'] = findEntry(path, "delimiters/quotationEnd")
     result['alternateQuotationStart'] = findEntry(path, "delimiters/alternateQuotationStart")
@@ -353,13 +348,15 @@ def _generateLocaleInfo(path, language_code, script_code, country_code, variant_
     result['currencySymbol'] = ''
     result['currencyDisplayName'] = ''
     if result['currencyIsoCode']:
-        result['currencySymbol'] = findEntryDef(path, "numbers/currencies/currency[%s]/symbol" % result['currencyIsoCode'])
-        result['currencyDisplayName'] = ';'.join(
-            findEntryDef(path, 'numbers/currencies/currency[' + result['currencyIsoCode']
-                         + ']/displayName' + tail)
-            for tail in ['',] + [
-                '[count=%s]' % x for x in ('zero', 'one', 'two', 'few', 'many', 'other')
-                ]) + ';'
+        stem = "numbers/currencies/currency[%s]/" % result['currencyIsoCode']
+        result['currencySymbol'] = findEntryDef(path, stem + 'symbol')
+        displays = tuple(findEntryDef(path, stem + 'displayName' + tail)
+                         for tail in ('',) + tuple(
+                             '[count=%s]' % x for x in ('zero', 'one', 'two',
+                                                        'few', 'many', 'other')))
+        while displays and not displays[-1]:
+            displays = displays[:-1]
+        result['currencyDisplayName'] = ';'.join(displays)
 
     def findUnitDef(path, stem, fallback=''):
         # The displayName for a quantified unit in en.xml is kByte
@@ -406,7 +403,7 @@ def _generateLocaleInfo(path, language_code, script_code, country_code, variant_
             prop = 'monthContext[' + mode + ']/monthWidth[' + size + ']/'
             result[key + 'Months_' + cal] = ';'.join(
                 findEntry(path, stem + prop + "month[%d]" % i)
-                for i in range(1, 13)) + ';'
+                for i in range(1, 13))
 
     # Day data (for Gregorian, at least):
     stem = 'dates/calendars/calendar[gregorian]/days/'
@@ -415,7 +412,7 @@ def _generateLocaleInfo(path, language_code, script_code, country_code, variant_
         prop = 'dayContext[' + mode + ']/dayWidth[' + size + ']/day'
         result[key + 'Days'] = ';'.join(
             findEntry(path, stem + prop + '[' + day + ']')
-            for day in days) + ';'
+            for day in days)
 
     return Locale(result)
 
@@ -583,6 +580,10 @@ for line in ldml:
     if 'version cldrVersion CDATA #FIXED' in line:
         cldr_version = line.split('"')[1]
 
+if sys.stdout.encoding != 'UTF-8' or (sys.stdout.encoding is None and sys.getdefaultencoding() != 'UTF-8'):
+    reload(sys) # Weirdly, this gets a richer sys module than the plain import got us !
+    sys.setdefaultencoding('UTF-8')
+
 print "<localeDatabase>"
 print "    <version>" + cldr_version + "</version>"
 print "    <languageList>"
diff --git a/util/locale_database/localexml.py b/util/locale_database/localexml.py
index 9b353f5122..85ecb2d6ca 100644
--- a/util/locale_database/localexml.py
+++ b/util/locale_database/localexml.py
@@ -1,7 +1,7 @@
 # coding=utf8
 #############################################################################
 ##
-## Copyright (C) 2018 The Qt Company Ltd.
+## Copyright (C) 2020 The Qt Company Ltd.
 ## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the test suite of the Qt Toolkit.
@@ -43,17 +43,6 @@ def camel(seq):
 def camelCase(words):
     return ''.join(camel(iter(words)))
 
-def ordStr(c):
-    if len(c) == 1:
-        return str(ord(c))
-    raise xpathlite.Error('Unable to handle value "%s"' % addEscapes(c))
-
-# Fix for a problem with QLocale returning a character instead of
-# strings for QLocale::exponential() and others. So we fallback to
-# default values in these cases.
-def fixOrdStr(c, d):
-    return str(ord(c if len(c) == 1 else d))
-
 def startCount(c, text): # strspn
     """First index in text where it doesn't have a character in c"""
     assert text and text[0] in c
@@ -121,18 +110,17 @@ class Locale:
             yield camelCase(('standalone', L, scale))
 
     # Expected to be numbers, read with int():
-    __asint = ("decimal", "group", "zero",
-               "list", "percent", "minus", "plus", "exp",
-               "currencyDigits", "currencyRounding")
-    # Single character; use the code-point number for each:
-    __asord = ("quotationStart", "quotationEnd",
-               "alternateQuotationStart", "alternateQuotationEnd")
+    __asint = ("currencyDigits", "currencyRounding")
     # Convert day-name to Qt day-of-week number:
     __asdow = ("firstDayOfWeek", "weekendStart", "weekendEnd")
     # Convert from CLDR format-strings to QDateTimeParser ones:
     __asfmt = ("longDateFormat", "shortDateFormat", "longTimeFormat", "shortTimeFormat")
     # Just use the raw text:
     __astxt = ("language", "languageEndonym", "script", "country", "countryEndonym",
+               "decimal", "group", "zero",
+               "list", "percent", "minus", "plus", "exp",
+               "quotationStart", "quotationEnd",
+               "alternateQuotationStart", "alternateQuotationEnd",
                "listPatternPartStart", "listPatternPartMiddle",
                "listPatternPartEnd", "listPatternPartTwo", "am", "pm",
                'byte_unit', 'byte_si_quantified', 'byte_iec_quantified',
@@ -154,13 +142,7 @@ class Locale:
         texts.\n"""
         data = {}
         for k in cls.__asint:
-            data['listDelim' if k == 'list' else k] = int(lookup(k))
-
-        for k in cls.__asord:
-            value = lookup(k)
-            assert len(value) == 1, \
-                (k, value, 'value should be exactly one character')
-            data[k] = ord(value)
+            data[k] = int(lookup(k))
 
         for k in cls.__asdow:
             data[k] = cls.__qDoW[lookup(k)]
@@ -169,7 +151,7 @@ class Locale:
             data[k] = convertFormat(lookup(k))
 
         for k in cls.__astxt + tuple(cls.propsMonthDay('days')):
-            data[k] = lookup(k)
+            data['listDelim' if k == 'list' else k] = lookup(k)
 
         for k in cls.propsMonthDay('months'):
             data[k] = dict((cal, lookup('_'.join((k, cal)))) for cal in calendars)
@@ -184,11 +166,8 @@ class Locale:
             print inner + "<%s>" % key + get(key) + "</%s>" % key
             print inner + "<%scode>" % key + get(key + '_code') + "</%scode>" % key
 
-        for key in ('decimal', 'group', 'zero'):
-            print inner + "<%s>" % key + ordStr(get(key)) + "</%s>" % key
-        for key, std in (('list', ';'), ('percent', '%'),
-                         ('minus', '-'), ('plus', '+'), ('exp', 'e')):
-            print inner + "<%s>" % key + fixOrdStr(get(key), std) + "</%s>" % key
+        for key in ('decimal', 'group', 'zero', 'list', 'percent', 'minus', 'plus', 'exp'):
+            print inner + "<%s>" % key + get(key) + "</%s>" % key
 
         for key in ('language_endonym', 'country_endonym',
                     'quotationStart', 'quotationEnd',
@@ -267,7 +246,7 @@ class Locale:
             except KeyError: # Need to add an entry to known, above.
                 print 'Unsupported calendar:', cal
                 raise
-            names, get = data[0] + ('',), data[1:]
+            names, get = data[0], data[1:]
             for n, size in enumerate(sizes):
                 yield ('_'.join((camelCase((size, 'months')), cal)),
                        ';'.join(get[n][0](i, x) for i, x in enumerate(names)))
@@ -279,7 +258,7 @@ class Locale:
     def C(cls, calendars=('gregorian',),
           # Empty entry at end to ensure final separator when join()ed:
           days = ('Sunday', 'Monday', 'Tuesday', 'Wednesday',
-                  'Thursday', 'Friday', 'Saturday', ''),
+                  'Thursday', 'Friday', 'Saturday'),
           quantifiers=('k', 'M', 'G', 'T', 'P', 'E')):
         """Returns an object representing the C locale."""
         return cls(dict(cls.__monthNames(calendars)),
@@ -303,11 +282,11 @@ class Locale:
                    longTimeFormat='HH:mm:ss z', shortTimeFormat='HH:mm:ss',
                    longDays=';'.join(days),
                    shortDays=';'.join(d[:3] for d in days),
-                   narrowDays='7;1;2;3;4;5;6;',
+                   narrowDays='7;1;2;3;4;5;6',
                    standaloneLongDays=';'.join(days),
                    standaloneShortDays=';'.join(d[:3] for d in days),
                    standaloneNarrowDays=';'.join(d[:1] for d in days),
                    currencyIsoCode='', currencySymbol='',
-                   currencyDisplayName=';' * 7,
+                   currencyDisplayName='',
                    currencyDigits=2, currencyRounding=1,
                    currencyFormat='%1%2', currencyNegativeFormat='')
diff --git a/util/locale_database/qlocalexml2cpp.py b/util/locale_database/qlocalexml2cpp.py
index 52e6331569..bb9f138c18 100755
--- a/util/locale_database/qlocalexml2cpp.py
+++ b/util/locale_database/qlocalexml2cpp.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python2
 #############################################################################
 ##
-## Copyright (C) 2018 The Qt Company Ltd.
+## Copyright (C) 2020 The Qt Company Ltd.
 ## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the test suite of the Qt Toolkit.
@@ -259,47 +259,67 @@ def unicode2hex(s):
     return lst
 
 class StringDataToken:
-    def __init__(self, index, length):
-        if index > 0xFFFF or length > 0xFFFF:
-            raise Error("Position exceeds ushort range: %d,%d " % (index, length))
+    def __init__(self, index, length, bits):
+        if index > 0xffff:
+            print "\n\n\n#error Data index is too big!", index
+            raise ValueError("Start-index (%d) exceeds the uint16 range!" % index)
+        if length >= (1 << bits):
+            print "\n\n\n#error Range length is too big!", length
+            raise ValueError("Data size (%d) exceeds the %d-bit range!" % (length, bits))
+
         self.index = index
         self.length = length
-    def __str__(self):
-        return " %d,%d " % (self.index, self.length)
 
 class StringData:
     def __init__(self, name):
         self.data = []
         self.hash = {}
         self.name = name
+        self.text = '' # Used in quick-search for matches in data
 
-    def append(self, s):
-        if s in self.hash:
-            return self.hash[s]
-
-        lst = unicode2hex(s)
-        index = len(self.data)
-        if index > 65535:
-            print "\n\n\n#error Data index is too big!"
-            sys.stderr.write ("\n\n\nERROR: index exceeds the uint16 range! index = %d\n" % index)
-            sys.exit(1)
-        size = len(lst)
-        if size >= 65535:
-            print "\n\n\n#error Data is too big!"
-            sys.stderr.write ("\n\n\nERROR: data size exceeds the uint16 range! size = %d\n" % size)
-            sys.exit(1)
-        token = None
+    def append(self, s, bits=8):
         try:
-            token = StringDataToken(index, size)
-        except Error as e:
-            sys.stderr.write("\n\n\nERROR: %s: on data '%s'" % (e, s))
-            sys.exit(1)
-        self.hash[s] = token
-        self.data += lst
+            token = self.hash[s]
+        except KeyError:
+            token = self.__store(s, bits)
+            self.hash[s] = token
         return token
 
+    def __store(self, s, bits):
+        """Add string s to known data.
+
+        Seeks to avoid duplication, where possible.
+        For example, short-forms may be prefixes of long-forms.
+        """
+        if not s:
+            return StringDataToken(0, 0, bits)
+        ucs2 = unicode2hex(s)
+        try:
+            index = self.text.index(s) - 1
+            matched = 0
+            while matched < len(ucs2):
+                index, matched = self.data.index(ucs2[0], index + 1), 1
+                if index + len(ucs2) >= len(self.data):
+                    raise ValueError # not found after all !
+                while matched < len(ucs2) and self.data[index + matched] == ucs2[matched]:
+                    matched += 1
+        except ValueError:
+            index = len(self.data)
+            self.data += ucs2
+            self.text += s
+
+        assert index >= 0
+        try:
+            return StringDataToken(index, len(ucs2), bits)
+        except ValueError as e:
+            e.args += (self.name, s)
+            raise
+
     def write(self, fd):
-        fd.write("\nstatic const ushort %s[] = {\n" % self.name)
+        if len(self.data) > 0xffff:
+            raise ValueError("Data is too big for quint16 index to its end!" % len(self.data),
+                             self.name)
+        fd.write("\nstatic const char16_t %s[] = {\n" % self.name)
         fd.write(wrap_list(self.data))
         fd.write("\n};\n")
 
@@ -319,7 +339,7 @@ def escapedString(s):
     need_escape = False
     result = ""
     for c in s:
-        if ord(c) < 128 and (not need_escape or ord(c.lower()) < ord('a') or ord(c.lower()) > ord('f')):
+        if ord(c) < 128 and not (need_escape and ord('a') <= ord(c.lower()) <= ord('f')):
             line += c
             need_escape = False
         else:
@@ -361,7 +381,7 @@ def main():
                     for leaf in ('qlocale_data_p.h', 'qlocale.h', 'qlocale.qdoc'))):
         usage()
 
-    (data_temp_file, data_temp_file_path) = tempfile.mkstemp("qlocale_data_p", dir=qtsrcdir)
+    (data_temp_file, data_temp_file_path) = tempfile.mkstemp("qlocale_data_p.h", dir=qtsrcdir)
     data_temp_file = os.fdopen(data_temp_file, "w")
     qlocaledata_file = open(qtsrcdir + "/src/corelib/text/qlocale_data_p.h", "r")
     s = qlocaledata_file.readline()
@@ -426,7 +446,8 @@ def main():
             cmnt_to = cmnt_to + country_map[to_country][1]
 
         data_temp_file.write("    ")
-        data_temp_file.write("{ %3d, %3d, %3d }, { %3d, %3d, %3d }" % (from_language, from_script, from_country, to_language, to_script, to_country))
+        data_temp_file.write("{ %3d, %3d, %3d }, { %3d, %3d, %3d }" %
+                             (from_language, from_script, from_country, to_language, to_script, to_country))
         index += 1
         if index != len(likely_subtags_map):
             data_temp_file.write(",")
@@ -451,6 +472,7 @@ def main():
     data_temp_file.write("};\n\n")
 
     list_pattern_part_data = StringData('list_pattern_part_data')
+    single_character_data = StringData('single_character_data')
     date_format_data = StringData('date_format_data')
     time_format_data = StringData('time_format_data')
     days_data = StringData('days_data')
@@ -470,52 +492,57 @@ def main():
                          + ' lang  ' # IDs
                          + 'script '
                          + '  terr '
-                         + '  dec  ' # Numeric punctuation:
-                         + ' group '
-                         + ' list  ' # List delimiter
-                         + ' prcnt ' # Arithmetic symbols:
-                         + '  zero '
-                         + ' minus '
-                         + ' plus  '
-                         + '  exp  '
-                         # Width 8 + comma - to make space for these wide labels !
-                         + ' quotOpn ' # Quotation marks
-                         + ' quotEnd '
-                         + 'altQtOpn '
-                         + 'altQtEnd '
-                         # Width 11 + comma:
-                         + '  lpStart   ' # List pattern
-                         + '   lpMid    '
-                         + '   lpEnd    '
-                         + '   lpTwo    '
-                         + '   sDtFmt   ' # Date format
-                         + '   lDtFmt   '
-                         + '   sTmFmt   ' # Time format
-                         + '   lTmFmt   '
-                         + '   ssDays   ' # Days
-                         + '   slDays   '
-                         + '   snDays   '
-                         + '    sDays   '
-                         + '    lDays   '
-                         + '    nDays   '
-                         + '     am     ' # am/pm indicators
-                         + '     pm     '
-                         # Width 8 + comma
-                         + '  byte   '
-                         + ' siQuant '
-                         + 'iecQuant '
+
+                         # Range entries (all start-indices, then all sizes):
+                         # Width 5 + comma:
+                         + 'lStrt ' # List pattern
+                         + 'lpMid '
+                         + 'lpEnd '
+                         + 'lPair '
+                         + 'lDelm ' # List delimiter
+                         # Representing numbers:
+                         + ' dec  '
+                         + 'group '
+                         + 'prcnt '
+                         + ' zero '
+                         + 'minus '
+                         + 'plus  '
+                         + ' exp  '
+                         # Quotation marks
+                         + 'qtOpn '
+                         + 'qtEnd '
+                         + 'altQO '
+                         + 'altQE '
+                         + 'lDFmt ' # Date format
+                         + 'sDFmt '
+                         + 'lTFmt ' # Time format
+                         + 'sTFmt '
+                         + 'slDay ' # Day names
+                         + 'lDays '
+                         + 'ssDys '
+                         + 'sDays '
+                         + 'snDay '
+                         + 'nDays '
+                         + '  am  ' # am/pm indicators
+                         + '  pm  '
+                         + ' byte '
+                         + 'siQnt '
+                         + 'iecQn '
+                         + 'crSym ' # Currency formatting:
+                         + 'crDsp '
+                         + 'crFmt '
+                         + 'crFNg '
+                         + 'ntLng ' # Name of language in itself, and of territory:
+                         + 'ntTer '
+                         # Width 3 + comma for each size; no header
+                         + '    ' * 37
+
+                         # Strays (char array, bit-fields):
                          # Width 8+4 + comma
                          + '   currISO   '
-                         # Width 11 + comma:
-                         + '  currSym   ' # Currency formatting:
-                         + ' currDsply  '
-                         + '  currFmt   '
-                         + ' currFmtNeg '
-                         + '  endoLang  ' # Name of language in itself, and of country:
-                         + '  endoCntry '
                          # Width 6 + comma:
-                         + 'curDgt ' # Currency number representation:
-                         + 'curRnd '
+                         + 'curDgt ' # Currency digits
+                         + 'curRnd ' # Currencty rounding (unused: QTBUG-81343)
                          + 'dow1st ' # First day of week
                          + ' wknd+ ' # Week-end start/end days:
                          + ' wknd-'
@@ -531,18 +558,13 @@ def main():
     line_format = ('    { '
                    # Locale-identifier:
                    + '%6d,' * 3
-                   # Numeric formats, list delimiter:
-                   + '%6d,' * 8
-                   # Quotation marks:
-                   + '%8d,' * 4
-                   # List patterns, date/time formats, month/day names, am/pm:
-                   + '%11s,' * 16
-                   # SI/IEC byte-unit abbreviations:
-                   + '%8s,' * 3
+                   # Offsets for starts of ranges:
+                   + '%5d,' * 37
+                   # Sizes for the same:
+                   + '%3d,' * 37
+
                    # Currency ISO code:
                    + ' %10s, '
-                   # Currency and endonyms
-                   + '%11s,' * 6
                    # Currency formatting:
                    + '%6d,%6d'
                    # Day of week and week-end:
@@ -550,62 +572,56 @@ def main():
                    + ' }')
     for key in locale_keys:
         l = locale_map[key]
+        # Sequence of StringDataToken:
+        ranges = (tuple(list_pattern_part_data.append(p) for p in # 5 entries:
+                        (l.listPatternPartStart, l.listPatternPartMiddle,
+                         l.listPatternPartEnd, l.listPatternPartTwo, l.listDelim)) +
+                  tuple(single_character_data.append(p) for p in # 11 entries
+                        (l.decimal, l.group, l.percent, l.zero, l.minus, l.plus, l.exp,
+                         l.quotationStart, l.quotationEnd,
+                         l.alternateQuotationStart, l.alternateQuotationEnd)) +
+                  tuple (date_format_data.append(f) for f in # 2 entries:
+                         (l.longDateFormat, l.shortDateFormat)) +
+                  tuple(time_format_data.append(f) for f in # 2 entries:
+                        (l.longTimeFormat, l.shortTimeFormat)) +
+                  tuple(days_data.append(d) for d in # 6 entries:
+                        (l.standaloneLongDays, l.longDays,
+                         l.standaloneShortDays, l.shortDays,
+                         l.standaloneNarrowDays, l.narrowDays)) +
+                  (am_data.append(l.am), pm_data.append(l.pm)) + # 2 entries:
+                  tuple(byte_unit_data.append(b) for b in # 3 entries:
+                        (l.byte_unit, l.byte_si_quantified, l.byte_iec_quantified)) +
+                  (currency_symbol_data.append(l.currencySymbol),
+                   currency_display_name_data.append(l.currencyDisplayName),
+                   currency_format_data.append(l.currencyFormat),
+                   currency_format_data.append(l.currencyNegativeFormat),
+                   endonyms_data.append(l.languageEndonym),
+                   endonyms_data.append(l.countryEndonym)) # 6 entries
+                  ) # Total: 37 entries
+        assert len(ranges) == 37
+
         data_temp_file.write(line_format
-                    % (key[0], key[1], key[2],
-                        l.decimal,
-                        l.group,
-                        l.listDelim,
-                        l.percent,
-                        l.zero,
-                        l.minus,
-                        l.plus,
-                        l.exp,
-                        l.quotationStart,
-                        l.quotationEnd,
-                        l.alternateQuotationStart,
-                        l.alternateQuotationEnd,
-                        list_pattern_part_data.append(l.listPatternPartStart),
-                        list_pattern_part_data.append(l.listPatternPartMiddle),
-                        list_pattern_part_data.append(l.listPatternPartEnd),
-                        list_pattern_part_data.append(l.listPatternPartTwo),
-                        date_format_data.append(l.shortDateFormat),
-                        date_format_data.append(l.longDateFormat),
-                        time_format_data.append(l.shortTimeFormat),
-                        time_format_data.append(l.longTimeFormat),
-                        days_data.append(l.standaloneShortDays),
-                        days_data.append(l.standaloneLongDays),
-                        days_data.append(l.standaloneNarrowDays),
-                        days_data.append(l.shortDays),
-                        days_data.append(l.longDays),
-                        days_data.append(l.narrowDays),
-                        am_data.append(l.am),
-                        pm_data.append(l.pm),
-                        byte_unit_data.append(l.byte_unit),
-                        byte_unit_data.append(l.byte_si_quantified),
-                        byte_unit_data.append(l.byte_iec_quantified),
-                        currencyIsoCodeData(l.currencyIsoCode),
-                        currency_symbol_data.append(l.currencySymbol),
-                        currency_display_name_data.append(l.currencyDisplayName),
-                        currency_format_data.append(l.currencyFormat),
-                        currency_format_data.append(l.currencyNegativeFormat),
-                        endonyms_data.append(l.languageEndonym),
-                        endonyms_data.append(l.countryEndonym),
+                    % ((key[0], key[1], key[2]) +
+                       tuple(r.index for r in ranges) +
+                       tuple(r.length for r in ranges) +
+                       (currencyIsoCodeData(l.currencyIsoCode),
                         l.currencyDigits,
-                        l.currencyRounding,
+                        l.currencyRounding, # unused (QTBUG-81343)
                         l.firstDayOfWeek,
                         l.weekendStart,
-                        l.weekendEnd)
+                        l.weekendEnd))
                              + ", // %s/%s/%s\n" % (l.language, l.script, l.country))
     data_temp_file.write(line_format # All zeros, matching the format:
-                         % ( (0,) * (3 + 8 + 4) + ("0,0",) * (16 + 3)
+                         % ( (0,) * 3 + (0,) * 37 * 2
                              + (currencyIsoCodeData(0),)
-                             + ("0,0",) * 6 + (0,) * (2 + 3))
-                         + " // trailing 0s\n")
+                             + (0,) * 2
+                             + (0,) * 3)
+                         + " // trailing zeros\n")
     data_temp_file.write("};\n")
 
     # StringData tables:
-    for data in (list_pattern_part_data, date_format_data,
-                 time_format_data, days_data,
+    for data in (list_pattern_part_data, single_character_data,
+                 date_format_data, time_format_data, days_data,
                  byte_unit_data, am_data, pm_data, currency_symbol_data,
                  currency_display_name_data, currency_format_data,
                  endonyms_data):
@@ -735,7 +751,7 @@ def main():
     os.rename(data_temp_file_path, qtsrcdir + "/src/corelib/text/qlocale_data_p.h")
 
     # Generate calendar data
-    calendar_format = '      {%6d,%6d,%6d,{%5s},{%5s},{%5s},{%5s},{%5s},{%5s}}, '
+    calendar_format = '      {%6d,%6d,%6d' + ',%5d' * 6 + ',%3d' * 6 + ' },'
     for calendar, stem in calendars.items():
         months_data = StringData('months_data')
         calendar_data_file = "q%scalendar_data_p.h" % stem
@@ -755,30 +771,38 @@ def main():
                                  + ' lang  '
                                  + ' script'
                                  + ' terr  '
-                                 # Month-name start-end pairs, width 8 (5 plus '{},'):
-                                     + ' sShort '
-                                 + ' sLong  '
-                                 + ' sNarrow'
-                                 + ' short  '
-                                 + ' long   '
-                                 + ' narrow'
-                                 # No trailing space on last; be sure
-                                 # to pad before adding later entries.
+                                 # Month-name start-indices, width 6 (5 + comma):
+                                 + 'sLng '
+                                 + 'long '
+                                 + 'sSrt '
+                                 + 'shrt '
+                                 + 'sNrw '
+                                 + 'naro '
+                                 # No individual headers for the sizes.
+                                 + 'Sizes...'
                                  + '\n')
         for key in locale_keys:
             l = locale_map[key]
+            # Sequence of StringDataToken:
+            try:
+                # Twelve long month names can add up to more than 256 (e.g. kde_TZ: 264)
+                ranges = (tuple(months_data.append(m[calendar], 16) for m in
+                                (l.standaloneLongMonths, l.longMonths)) +
+                          tuple(months_data.append(m[calendar]) for m in
+                                (l.standaloneShortMonths, l.shortMonths,
+                                 l.standaloneNarrowMonths, l.narrowMonths)))
+            except ValueError as e:
+                e.args += (l.language, l.script, l.country, stem)
+                raise
+
             calendar_temp_file.write(
                 calendar_format
-                % (key[0], key[1], key[2],
-                   months_data.append(l.standaloneShortMonths[calendar]),
-                   months_data.append(l.standaloneLongMonths[calendar]),
-                   months_data.append(l.standaloneNarrowMonths[calendar]),
-                   months_data.append(l.shortMonths[calendar]),
-                   months_data.append(l.longMonths[calendar]),
-                   months_data.append(l.narrowMonths[calendar]))
-                + "// %s/%s/%s\n " % (l.language, l.script, l.country))
-        calendar_temp_file.write(calendar_format % ( (0,) * 3 + ('0,0',) * 6 )
-                                      + '// trailing zeros\n')
+                % ((key[0], key[1], key[2]) +
+                   tuple(r.index for r in ranges) +
+                   tuple(r.length for r in ranges))
+                + "// %s/%s/%s\n" % (l.language, l.script, l.country))
+        calendar_temp_file.write(calendar_format % ( (0,) * (3 + 6 * 2) )
+                                 + '// trailing zeros\n')
         calendar_temp_file.write("};\n")
         months_data.write(calendar_temp_file)
         s = calendar_template_file.readline()
@@ -815,9 +839,7 @@ def main():
                              ",\n")
     qlocaleh_temp_file.write("\n")
     qlocaleh_temp_file.write("        LastLanguage = " + language + "\n")
-    qlocaleh_temp_file.write("    };\n")
-
-    qlocaleh_temp_file.write("\n")
+    qlocaleh_temp_file.write("    };\n\n")
 
     # Script enum
     qlocaleh_temp_file.write("    enum Script {\n")
@@ -831,7 +853,7 @@ def main():
                              ",\n")
     qlocaleh_temp_file.write("\n")
     qlocaleh_temp_file.write("        LastScript = " + script + "\n")
-    qlocaleh_temp_file.write("    };\n")
+    qlocaleh_temp_file.write("    };\n\n")
 
     # Country enum
     qlocaleh_temp_file.write("    enum Country {\n")